diff --git a/.asf.yaml b/.asf.yaml
index 40b961dc6e885..a1c6434587703 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -21,10 +21,12 @@ github:
   collaborators:
     - anjakefala
     - benibus
-    - danepitkin
     - davisusanibar
+    - jbonofre
     - js8544
     - vibhatha
+    - zanmato1984
+    - ZhangHuiGui
 
 notifications:
   commits:      commits@arrow.apache.org
diff --git a/.env b/.env
index 298c100c094b0..be35921f94c3a 100644
--- a/.env
+++ b/.env
@@ -56,7 +56,7 @@ UBUNTU=20.04
 CLANG_TOOLS=14
 CUDA=11.2.2
 DASK=latest
-DOTNET=7.0
+DOTNET=8.0
 GCC_VERSION=""
 GO=1.21.8
 STATICCHECK=v0.4.7
@@ -71,12 +71,12 @@ NUMBA=latest
 NUMPY=latest
 PANDAS=latest
 PYTHON=3.8
-R=4.2
+R=4.4
 SPARK=master
 TURBODBC=latest
 
-# These correspond to images on Docker Hub that contain R, e.g. rhub/ubuntu-gcc-release:latest
-R_IMAGE=ubuntu-gcc-release
+# These correspond to images on Docker Hub that contain R, e.g. rhub/ubuntu-release:latest
+R_IMAGE=ubuntu-release
 R_ORG=rhub
 R_TAG=latest
 
@@ -86,21 +86,19 @@ ARROW_R_DEV=TRUE
 R_PRUNE_DEPS=FALSE
 TZ=UTC
 
-# Any non-empty string will install devtoolset-${DEVTOOLSET_VERSION}
-DEVTOOLSET_VERSION=
-
 # Used through docker-compose.yml and serves as the default version for the
 # ci/scripts/install_vcpkg.sh script. Prefer to use short SHAs to keep the
 # docker tags more readable.
-VCPKG="a42af01b72c28a8e1d7b48107b33e4f286a55ef6"    # 2023.11.20 Release
+VCPKG="943c5ef1c8f6b5e6ced092b242c8299caae2ff01"    # 2024.04.26 Release
 
 # This must be updated when we update
 # ci/docker/python-wheel-windows-vs2019.dockerfile.
 # This is a workaround for our CI problem that "archery docker build" doesn't
 # use pulled built images in dev/tasks/python-wheels/github.windows.yml.
-PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2024-03-19
+PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2024-06-18
 
-# Use conanio/${CONAN} for "docker-compose run --rm conan". See
-# https://github.com/conan-io/conan-docker-tools#readme for available
-# images.
-CONAN=gcc10
+# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker-compose run --rm conan".
+# See https://github.com/conan-io/conan-docker-tools#readme and
+# https://hub.docker.com/u/conanio for available images.
+CONAN_BASE=gcc10
+CONAN_VERSION=1.62.0
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e7e544c2b0e62..e495bfd147de6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -37,7 +37,7 @@
 /go/ @zeroshade
 /java/ @lidavidm
 /js/ @domoritz @trxcllnt
-/matlab/ @kevingurney @kou
+/matlab/ @kevingurney @kou @sgilmore10
 /python/pyarrow/_flight.pyx @lidavidm
 /python/pyarrow/**/*gandiva* @wjones127
 /r/ @paleolimbot @thisisnic
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index e96cb8d2eb1e3..7d9ff2f42e887 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -23,30 +23,35 @@ updates:
       interval: "weekly"
     commit-message:
       prefix: "MINOR: [CI] "
+    open-pull-requests-limit: 10
   - package-ecosystem: "gomod"
     directory: "/go/"
     schedule:
       interval: "weekly"
     commit-message:
       prefix: "MINOR: [Go] "
+    open-pull-requests-limit: 10
   - package-ecosystem: "maven"
     directory: "/java/"
     schedule:
       interval: "weekly"
     commit-message:
       prefix: "MINOR: [Java] "
+    open-pull-requests-limit: 10
   - package-ecosystem: "npm"
     directory: "/js/"
     schedule:
       interval: "monthly"
     commit-message:
       prefix: "MINOR: [JS] "
+    open-pull-requests-limit: 10
   - package-ecosystem: "nuget"
     directory: "/csharp/"
     schedule:
       interval: "weekly"
     commit-message:
       prefix: "MINOR: [C#] "
+    open-pull-requests-limit: 10
     ignore:
       - dependency-name: "Microsoft.Extensions.*"
         update-types:
diff --git a/.github/workflows/archery.yml b/.github/workflows/archery.yml
index dbd24796db52b..c698baba2c816 100644
--- a/.github/workflows/archery.yml
+++ b/.github/workflows/archery.yml
@@ -32,7 +32,9 @@ on:
       - 'docker-compose.yml'
 
 env:
+  ARCHERY_DEBUG: 1
   ARCHERY_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
+  ARCHERY_USE_DOCKER_CLI: 1
 
 concurrency:
   group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
@@ -57,9 +59,9 @@ jobs:
         shell: bash
         run: git branch $ARCHERY_DEFAULT_BRANCH origin/$ARCHERY_DEFAULT_BRANCH || true
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v5.1.0
         with:
-          python-version: '3.12'
+          python-version: '3.9'
       - name: Install pygit2 binary wheel
         run: pip install pygit2 --only-binary pygit2
       - name: Install Archery, Crossbow- and Test Dependencies
diff --git a/.github/workflows/comment_bot.yml b/.github/workflows/comment_bot.yml
index 038a468a81276..a34856d2dc81a 100644
--- a/.github/workflows/comment_bot.yml
+++ b/.github/workflows/comment_bot.yml
@@ -41,7 +41,7 @@ jobs:
           # fetch the tags for version number generation
           fetch-depth: 0
       - name: Set up Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: 3.12
       - name: Install Archery and Crossbow dependencies
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index 3036d06d5d7b2..e539fadb859fe 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -21,6 +21,7 @@ on:
   push:
     paths:
       - '.github/workflows/cpp.yml'
+      - 'ci/conda_env_*'
       - 'ci/docker/**'
       - 'ci/scripts/cpp_*'
       - 'ci/scripts/install_azurite.sh'
@@ -31,9 +32,11 @@ on:
       - 'cpp/**'
       - 'docker-compose.yml'
       - 'format/Flight.proto'
+      - 'testing'
   pull_request:
     paths:
       - '.github/workflows/cpp.yml'
+      - 'ci/conda_env_*'
       - 'ci/docker/**'
       - 'ci/scripts/cpp_*'
       - 'ci/scripts/install_azurite.sh'
@@ -44,6 +47,7 @@ on:
       - 'cpp/**'
       - 'docker-compose.yml'
       - 'format/Flight.proto'
+      - 'testing'
 
 concurrency:
   group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
@@ -53,6 +57,7 @@ permissions:
   contents: read
 
 env:
+  ARCHERY_DEBUG: 1
   ARROW_ENABLE_TIMING_TESTS: OFF
   DOCKER_VOLUME_PREFIX: ".docker/"
 
@@ -94,6 +99,7 @@ jobs:
             cat <<JSON >> "$GITHUB_OUTPUT"
           {
             "arch": "arm64v8",
+            "archery-use-docker-cli": "0",
             "clang-tools": "10",
             "image": "ubuntu-cpp",
             "llvm": "10",
@@ -118,6 +124,9 @@ jobs:
         include: ${{ fromJson(needs.docker-targets.outputs.targets) }}
     env:
       ARCH: ${{ matrix.arch }}
+      # By default, use Docker CLI because docker-compose v1 is obsolete,
+      # except where the Docker client version is too old.
+      ARCHERY_USE_DOCKER_CLI: ${{ matrix.archery-use-docker-cli || '1' }}
       ARROW_SIMD_LEVEL: ${{ matrix.simd-level }}
       CLANG_TOOLS: ${{ matrix.clang-tools }}
       LLVM: ${{ matrix.llvm }}
@@ -237,7 +246,7 @@ jobs:
           $(brew --prefix bash)/bin/bash \
             ci/scripts/install_minio.sh latest ${ARROW_HOME}
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: 3.12
       - name: Install Google Cloud Storage Testbench
@@ -458,7 +467,7 @@ jobs:
             https://dl.min.io/server/minio/release/windows-amd64/archive/minio.RELEASE.2022-05-26T05-48-41Z
           chmod +x /usr/local/bin/minio.exe
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: 3.9
       - name: Install Google Cloud Storage Testbench
diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml
index 17ef2de81088f..e4db9f482e206 100644
--- a/.github/workflows/csharp.yml
+++ b/.github/workflows/csharp.yml
@@ -46,7 +46,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dotnet: ['7.0.x']
+        dotnet: ['8.0.x']
     steps:
       - name: Install C#
         uses: actions/setup-dotnet@v4
@@ -74,7 +74,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        dotnet: ['7.0.x']
+        dotnet: ['8.0.x']
     steps:
       - name: Install C#
         uses: actions/setup-dotnet@v4
@@ -94,19 +94,23 @@ jobs:
         run: ci/scripts/csharp_test.sh $(pwd)
 
   macos:
-    name: AMD64 macOS 11 C# ${{ matrix.dotnet }}
-    runs-on: macos-latest
+    name: AMD64 macOS 13 C# ${{ matrix.dotnet }}
+    runs-on: macos-13 # Pending https://github.com/pythonnet/pythonnet/issues/2396
     if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
     timeout-minutes: 15
     strategy:
       fail-fast: false
       matrix:
-        dotnet: ['7.0.x']
+        dotnet: ['8.0.x']
     steps:
       - name: Install C#
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ matrix.dotnet }}
+      - name: Setup Python
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
+        with:
+          python-version: 3.12
       - name: Checkout Arrow
         uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 3a48270a97c9a..5aec3638a8967 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -29,6 +29,10 @@ concurrency:
 permissions:
   contents: read
 
+env:
+  ARCHERY_DEBUG: 1
+  ARCHERY_USE_DOCKER_CLI: 1
+
 jobs:
 
   lint:
@@ -42,7 +46,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: 3.12
       - name: Install pre-commit
@@ -101,22 +105,22 @@ jobs:
         with:
           fetch-depth: 0
       - name: Install Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: '3.12'
       - name: Install Ruby
-        uses: ruby/setup-ruby@250fcd6a742febb1123a77a841497ccaa8b9e939 # v1.152.0
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: ruby
       - name: Install .NET
         uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
       - name: Install Dependencies
         shell: bash
         run: |
           gem install test-unit
-          pip install "cython>=0.29.31" setuptools six pytest jira
+          pip install "cython>=0.29.31" setuptools pytest jira setuptools-scm
       - name: Run Release Test
         env:
           ARROW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 82b43ee2363b5..36a0dc014db8d 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -24,18 +24,20 @@ permissions:
   contents: read
 
 env:
+  ARCHERY_DEBUG: 1
+  ARCHERY_USE_DOCKER_CLI: 1
   ARROW_ENABLE_TIMING_TESTS: OFF
   DOCKER_VOLUME_PREFIX: ".docker/"
 
 jobs:
 
   complete:
-    name: AMD64 Ubuntu 22.04 Complete Documentation
+    name: AMD64 Debian 12 Complete Documentation
     runs-on: ubuntu-latest
     if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
     timeout-minutes: 150
     env:
-      UBUNTU: "22.04"
+      JDK: 17
     steps:
       - name: Checkout Arrow
         uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
@@ -48,10 +50,10 @@ jobs:
         uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
         with:
           path: .docker
-          key: ubuntu-docs-${{ hashFiles('cpp/**') }}
-          restore-keys: ubuntu-docs-
+          key: debian-docs-${{ hashFiles('cpp/**') }}
+          restore-keys: debian-docs-
       - name: Setup Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: 3.12
       - name: Setup Archery
@@ -60,7 +62,8 @@ jobs:
         env:
           ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
           ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
-        run: archery docker run ubuntu-docs
+          JDK: 17
+        run: archery docker run debian-docs
       - name: Docker Push
         if: >-
           success() &&
@@ -71,4 +74,4 @@ jobs:
           ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
           ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
         continue-on-error: true
-        run: archery docker push ubuntu-docs
+        run: archery docker push debian-docs
diff --git a/.github/workflows/docs_light.yml b/.github/workflows/docs_light.yml
index 306fc5135073d..947e2ac21b83c 100644
--- a/.github/workflows/docs_light.yml
+++ b/.github/workflows/docs_light.yml
@@ -31,8 +31,10 @@ on:
 
 permissions:
   contents: read
-  
+
 env:
+  ARCHERY_DEBUG: 1
+  ARCHERY_USE_DOCKER_CLI: 1
   ARROW_ENABLE_TIMING_TESTS: OFF
   DOCKER_VOLUME_PREFIX: ".docker/"
 
@@ -57,7 +59,7 @@ jobs:
           key: conda-docs-${{ hashFiles('cpp/**') }}
           restore-keys: conda-docs-
       - name: Setup Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: 3.12
       - name: Setup Archery
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 7ff781d35e8ec..0d32628859fa0 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -41,6 +41,10 @@ concurrency:
 permissions:
   contents: read
 
+env:
+  ARCHERY_DEBUG: 1
+  ARCHERY_USE_DOCKER_CLI: 1
+
 jobs:
 
   docker-targets:
@@ -75,12 +79,14 @@ jobs:
           {
             "arch-label": "ARM64",
             "arch": "arm64v8",
+            "archery-use-docker-cli": "0",
             "go": "1.21",
             "runs-on": ["self-hosted", "arm", "linux"]
           },
           {
             "arch-label": "ARM64",
             "arch": "arm64v8",
+            "archery-use-docker-cli": "0",
             "go": "1.22",
             "runs-on": ["self-hosted", "arm", "linux"]
           }
@@ -101,6 +107,9 @@ jobs:
         include: ${{ fromJson(needs.docker-targets.outputs.targets) }}
     env:
       ARCH: ${{ matrix.arch }}
+      # By default, use Docker CLI because docker-compose v1 is obsolete,
+      # except where the Docker client version is too old.
+      ARCHERY_USE_DOCKER_CLI: ${{ matrix.archery-use-docker-cli || '1' }}
       GO: ${{ matrix.go }}
     steps:
       - name: Checkout Arrow
@@ -201,7 +210,7 @@ jobs:
           fetch-depth: 0
           submodules: recursive
       - name: Setup Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: 3.8
       - name: Setup Archery
@@ -241,7 +250,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: 3.8
       - name: Setup Archery
@@ -297,8 +306,8 @@ jobs:
         run: ci/scripts/go_test.sh $(pwd)
 
   macos:
-    name: AMD64 macOS 11 Go ${{ matrix.go }}
-    runs-on: macos-latest
+    name: AMD64 macOS 12 Go ${{ matrix.go }}
+    runs-on: macos-12
     if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
     timeout-minutes: 60
     strategy:
@@ -333,7 +342,7 @@ jobs:
           github.event_name == 'push' &&
           github.repository == 'apache/arrow' &&
           github.ref_name == 'main'
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: '3.10'
       - name: Run Benchmarks
@@ -355,8 +364,8 @@ jobs:
 
 
   macos-cgo:
-    name: AMD64 macOS 11 Go ${{ matrix.go }} - CGO
-    runs-on: macos-latest
+    name: AMD64 macOS 12 Go ${{ matrix.go }} - CGO
+    runs-on: macos-12
     if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
     timeout-minutes: 60
     strategy:
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index adb6fb2b57c75..f53f4aeb505d2 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -29,6 +29,7 @@ on:
       - 'js/**'
       - 'cpp/**'
       - 'java/**'
+      - 'csharp/**'
       - 'format/**'
   pull_request:
     paths:
@@ -40,6 +41,7 @@ on:
       - 'integration/**'
       - 'js/**'
       - 'cpp/**'
+      - 'csharp/**'
       - 'java/**'
       - 'format/**'
 
@@ -51,6 +53,8 @@ permissions:
   contents: read
 
 env:
+  ARCHERY_DEBUG: 1
+  ARCHERY_USE_DOCKER_CLI: 1
   DOCKER_VOLUME_PREFIX: ".docker/"
 
 jobs:
@@ -71,6 +75,11 @@ jobs:
         with:
           repository: apache/arrow-rs
           path: rust
+      - name: Checkout Arrow nanoarrow
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+        with:
+          repository: apache/arrow-nanoarrow
+          path: nanoarrow
       - name: Free up disk space
         run: |
           ci/scripts/util_free_space.sh
@@ -81,7 +90,7 @@ jobs:
           key: conda-${{ hashFiles('cpp/**') }}
           restore-keys: conda-
       - name: Setup Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: 3.8
       - name: Setup Archery
@@ -93,6 +102,7 @@ jobs:
         run: >
           archery docker run \
             -e ARCHERY_DEFAULT_BRANCH=${{ github.event.repository.default_branch }} \
+            -e ARCHERY_INTEGRATION_WITH_NANOARROW=1 \
             -e ARCHERY_INTEGRATION_WITH_RUST=1 \
             conda-integration
       - name: Docker Push
diff --git a/.github/workflows/issue_bot.yml b/.github/workflows/issue_bot.yml
index ec614ca1e7c56..2725825b56952 100644
--- a/.github/workflows/issue_bot.yml
+++ b/.github/workflows/issue_bot.yml
@@ -21,7 +21,6 @@ on:
   issues:
     types:
       - opened
-      - edited
 
 permissions:
   contents: read
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index a14977525b6c6..08dbe7c8068c0 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -45,6 +45,8 @@ permissions:
   contents: read
 
 env:
+  ARCHERY_DEBUG: 1
+  ARCHERY_USE_DOCKER_CLI: 1
   DOCKER_VOLUME_PREFIX: ".docker/"
 
 jobs:
@@ -56,8 +58,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        jdk: [8, 11, 17, 21]
-        maven: [3.9.5]
+        jdk: [8, 11, 17, 21, 22]
+        maven: [3.9.6]
         image: [java]
     env:
       JDK: ${{ matrix.jdk }}
@@ -75,7 +77,7 @@ jobs:
           key: maven-${{ hashFiles('java/**') }}
           restore-keys: maven-
       - name: Setup Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: 3.8
       - name: Setup Archery
@@ -84,11 +86,11 @@ jobs:
         env:
           ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
           ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         run: |
           archery docker run \
             -e CI=true \
-            -e "GRADLE_ENTERPRISE_ACCESS_KEY=$GRADLE_ENTERPRISE_ACCESS_KEY" \
+            -e "DEVELOCITY_ACCESS_KEY=$DEVELOCITY_ACCESS_KEY" \
             ${{ matrix.image }}
       - name: Docker Push
         if: >-
@@ -103,9 +105,9 @@ jobs:
         run: archery docker push ${{ matrix.image }}
 
   macos:
-    name: AMD64 macOS 11 Java JDK ${{ matrix.jdk }}
-    runs-on: macos-latest
-    if: github.event_name == 'push'
+    name: AMD64 macOS 12 Java JDK ${{ matrix.jdk }}
+    runs-on: macos-12
+    if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
     timeout-minutes: 30
     strategy:
       fail-fast: false
@@ -125,12 +127,12 @@ jobs:
       - name: Build
         shell: bash
         env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         run: ci/scripts/java_build.sh $(pwd) $(pwd)/build
       - name: Test
         shell: bash
         env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         run: ci/scripts/java_test.sh $(pwd) $(pwd)/build
 
   windows:
@@ -156,10 +158,10 @@ jobs:
       - name: Build
         shell: bash
         env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         run: ci/scripts/java_build.sh $(pwd) $(pwd)/build
       - name: Test
         shell: bash
         env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         run: ci/scripts/java_test.sh $(pwd) $(pwd)/build
diff --git a/.github/workflows/java_jni.yml b/.github/workflows/java_jni.yml
index 46f3381ed0e8f..ea5f8d694a9c6 100644
--- a/.github/workflows/java_jni.yml
+++ b/.github/workflows/java_jni.yml
@@ -45,6 +45,8 @@ permissions:
   contents: read
 
 env:
+  ARCHERY_DEBUG: 1
+  ARCHERY_USE_DOCKER_CLI: 1
   DOCKER_VOLUME_PREFIX: ".docker/"
 
 jobs:
@@ -52,7 +54,7 @@ jobs:
     name: AMD64 manylinux2014 Java JNI
     runs-on: ubuntu-latest
     if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
-    timeout-minutes: 90
+    timeout-minutes: 240
     steps:
       - name: Checkout Arrow
         uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
@@ -69,7 +71,7 @@ jobs:
           key: java-jni-manylinux-2014-${{ hashFiles('cpp/**', 'java/**') }}
           restore-keys: java-jni-manylinux-2014-
       - name: Setup Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: 3.8
       - name: Setup Archery
@@ -109,7 +111,7 @@ jobs:
           key: maven-${{ hashFiles('java/**') }}
           restore-keys: maven-
       - name: Setup Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: 3.8
       - name: Setup Archery
@@ -118,11 +120,11 @@ jobs:
         env:
           ARCHERY_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
           ARCHERY_DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
         run: |
           archery docker run \
             -e CI=true \
-            -e "GRADLE_ENTERPRISE_ACCESS_KEY=$GRADLE_ENTERPRISE_ACCESS_KEY" \
+            -e "DEVELOCITY_ACCESS_KEY=$DEVELOCITY_ACCESS_KEY" \
             conda-python-java-integration
       - name: Docker Push
         if: >-
diff --git a/.github/workflows/java_nightly.yml b/.github/workflows/java_nightly.yml
index c535dc4a07de3..f40d4ce5b42d6 100644
--- a/.github/workflows/java_nightly.yml
+++ b/.github/workflows/java_nightly.yml
@@ -58,7 +58,7 @@ jobs:
           repository: ursacomputing/crossbow
           ref: main
       - name: Set up Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           cache: 'pip'
           python-version: 3.12
diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
index 304eba41e4d37..c11c8254011f6 100644
--- a/.github/workflows/js.yml
+++ b/.github/workflows/js.yml
@@ -38,6 +38,10 @@ concurrency:
 permissions:
   contents: read
 
+env:
+  ARCHERY_DEBUG: 1
+  ARCHERY_USE_DOCKER_CLI: 1
+
 jobs:
 
   docker:
@@ -51,7 +55,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: 3.8
       - name: Setup Archery
@@ -77,10 +81,10 @@ jobs:
         run: archery docker push debian-js
 
   macos:
-    name: AMD64 macOS 11 NodeJS ${{ matrix.node }}
-    runs-on: macos-latest
-    if: github.event_name == 'push'
-    timeout-minutes: 90
+    name: AMD64 macOS 12 NodeJS ${{ matrix.node }}
+    runs-on: macos-12
+    if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
+    timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
@@ -102,15 +106,16 @@ jobs:
           node-version: ${{ matrix.node }}
       - name: Build
         shell: bash
-        run: ci/scripts/js_build.sh $(pwd)
+        run: ci/scripts/js_build.sh $(pwd) build
       - name: Test
         shell: bash
-        run: ci/scripts/js_test.sh $(pwd)
+        run: ci/scripts/js_test.sh $(pwd) build
 
   windows:
     name: AMD64 Windows NodeJS ${{ matrix.node }}
     runs-on: windows-latest
-    if: github.event_name == 'push'
+    if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
+    timeout-minutes: 45
     strategy:
       fail-fast: false
       matrix:
@@ -132,7 +137,7 @@ jobs:
           node-version: ${{ matrix.node }}
       - name: Build
         shell: bash
-        run: ci/scripts/js_build.sh $(pwd)
+        run: ci/scripts/js_build.sh $(pwd) build
       - name: Test
         shell: bash
-        run: ci/scripts/js_test.sh $(pwd)
+        run: ci/scripts/js_test.sh $(pwd) build
diff --git a/.github/workflows/matlab.yml b/.github/workflows/matlab.yml
index eceeb551a0653..ca8280927f4a5 100644
--- a/.github/workflows/matlab.yml
+++ b/.github/workflows/matlab.yml
@@ -42,7 +42,23 @@ jobs:
 
   ubuntu:
     name: AMD64 Ubuntu 20.04 MATLAB
-    runs-on: ubuntu-latest
+    # Explicitly pin the Ubuntu version to 20.04 for the time being because:
+    #
+    #     1. The version of GLIBCXX shipped with Ubuntu 22.04 is not binary compatible
+    #        with the GLIBCXX bundled with MATLAB R2023a. This is a relatively common
+    #        issue.
+    #
+    #        For example, see:
+    #
+    #        https://www.mathworks.com/matlabcentral/answers/1907290-how-to-manually-select-the-libstdc-library-to-use-to-resolve-a-version-glibcxx_-not-found
+    #
+    #     2. The version of GLIBCXX shipped with Ubuntu 22.04 is not binary compatible with
+    #        the version of GLIBCXX shipped with Debian 11. Several of the Arrow community
+    #        members who work on the MATLAB bindings use Debian 11 locally for qualification.
+    #        Using Ubuntu 20.04 eases development workflows for these community members.
+    #
+    # In the future, we can investigate adding support for building against more Linux (e.g. `ubuntu-22.04`) and MATLAB versions (e.g. R2023b).
+    runs-on: ubuntu-20.04
     if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
     steps:
       - name: Check out repository
@@ -54,7 +70,7 @@ jobs:
       - name: Install MATLAB
         uses: matlab-actions/setup-matlab@v2
         with:
-          release: R2023a
+          release: R2024a
       - name: Install ccache
         run: sudo apt-get install ccache
       - name: Setup ccache
@@ -74,24 +90,24 @@ jobs:
         run: ci/scripts/matlab_build.sh $(pwd)
       - name: Run MATLAB Tests
         env:
-          # libarrow.so requires a more recent version of libstdc++.so
-          # than is bundled with MATLAB under <matlabroot>/sys/os/glnxa64.
-          # Therefore, if a MEX function that depends on libarrow.so
-          # is executed within the MATLAB address space, runtime linking
-          # errors will occur. To work around this issue, we can explicitly
-          # force MATLAB to use the system libstdc++.so via LD_PRELOAD.
-          LD_PRELOAD: /usr/lib/x86_64-linux-gnu/libstdc++.so.6
-
           # Add the installation directory to the MATLAB Search Path by
           # setting the MATLABPATH environment variable.
           MATLABPATH: matlab/install/arrow_matlab
         uses: matlab-actions/run-tests@v2
         with:
           select-by-folder: matlab/test
+          strict: true
   macos:
-    name: AMD64 macOS 11 MATLAB
-    runs-on: macos-latest
+    name: ${{ matrix.architecture }} macOS ${{ matrix.macos-version }} MATLAB
+    runs-on: macos-${{ matrix.macos-version }}
     if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
+    strategy:
+      matrix:
+        include:
+            - architecture: AMD64
+              macos-version: "12"
+            - architecture: ARM64
+              macos-version: "14"
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -102,7 +118,7 @@ jobs:
       - name: Install MATLAB
         uses: matlab-actions/setup-matlab@v2
         with:
-          release: R2023a
+          release: R2024a
       - name: Install ccache
         run: brew install ccache
       - name: Setup ccache
@@ -127,7 +143,8 @@ jobs:
           MATLABPATH: matlab/install/arrow_matlab
         uses: matlab-actions/run-tests@v2
         with:
-          select-by-folder: matlab/test 
+          select-by-folder: matlab/test
+          strict: true
   windows:
     name: AMD64 Windows 2022 MATLAB
     runs-on: windows-2022
@@ -140,7 +157,7 @@ jobs:
       - name: Install MATLAB
         uses: matlab-actions/setup-matlab@v2
         with:
-          release: R2023a
+          release: R2024a
       - name: Download Timezone Database
         shell: bash
         run: ci/scripts/download_tz_database.sh
@@ -173,4 +190,5 @@ jobs:
           MATLABPATH: matlab/install/arrow_matlab
         uses: matlab-actions/run-tests@v2
         with:
-          select-by-folder: matlab/test 
+          select-by-folder: matlab/test
+          strict: true
diff --git a/.github/workflows/pr_bot.yml b/.github/workflows/pr_bot.yml
index 6af7dbe7680f5..e589610f536b3 100644
--- a/.github/workflows/pr_bot.yml
+++ b/.github/workflows/pr_bot.yml
@@ -82,7 +82,7 @@ jobs:
           # fetch the tags for version number generation
           fetch-depth: 0
       - name: Set up Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: 3.12
       - name: Install Archery and Crossbow dependencies
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 25d918bcc25aa..a568f8346e7fc 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -41,6 +41,8 @@ permissions:
   contents: read
 
 env:
+  ARCHERY_DEBUG: 1
+  ARCHERY_USE_DOCKER_CLI: 1
   DOCKER_VOLUME_PREFIX: ".docker/"
 
 jobs:
@@ -100,7 +102,7 @@ jobs:
           key: ${{ matrix.cache }}-${{ hashFiles('cpp/**') }}
           restore-keys: ${{ matrix.cache }}-
       - name: Setup Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: 3.8
       - name: Setup Archery
@@ -126,12 +128,20 @@ jobs:
         run: archery docker push ${{ matrix.image }}
 
   macos:
-    name: AMD64 macOS 12 Python 3
-    runs-on: macos-latest
+    name: ${{ matrix.architecture }} macOS ${{ matrix.macos-version }} Python 3
+    runs-on: macos-${{ matrix.macos-version }}
     if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
     timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - architecture: AMD64
+            macos-version: "12"
+          - architecture: ARM64
+            macos-version: "14"
     env:
-      ARROW_HOME: /usr/local
+      ARROW_HOME: /tmp/local
       ARROW_AZURE: ON
       ARROW_DATASET: ON
       ARROW_FLIGHT: ON
@@ -162,7 +172,7 @@ jobs:
           fetch-depth: 0
           submodules: recursive
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: '3.11'
       - name: Install Dependencies
@@ -172,6 +182,19 @@ jobs:
           python -m pip install \
             -r python/requirements-build.txt \
             -r python/requirements-test.txt
+      - name: Setup ccache
+        shell: bash
+        run: ci/scripts/ccache_setup.sh
+      - name: ccache info
+        id: ccache-info
+        shell: bash
+        run: echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
+      - name: Cache ccache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.ccache-info.outputs.cache-dir }}
+          key: python-ccache-macos-${{ matrix.macos-version }}-${{ hashFiles('cpp/**', 'python/**') }}
+          restore-keys: python-ccache-macos-${{ matrix.macos-version }}-
       - name: Build
         shell: bash
         run: |
diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
index 8c47915b7b6d3..6bd940f806775 100644
--- a/.github/workflows/r.yml
+++ b/.github/workflows/r.yml
@@ -51,6 +51,8 @@ permissions:
   contents: read
 
 env:
+  ARCHERY_DEBUG: 1
+  ARCHERY_USE_DOCKER_CLI: 1
   DOCKER_VOLUME_PREFIX: ".docker/"
 
 jobs:
@@ -119,7 +121,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        r: ["4.3"]
+        r: ["4.4"]
         ubuntu: [20.04]
         force-tests: ["true"]
     env:
@@ -142,7 +144,7 @@ jobs:
             ubuntu-${{ matrix.ubuntu }}-r-${{ matrix.r }}-${{ hashFiles('cpp/src/**/*.cc','cpp/src/**/*.h)') }}-
             ubuntu-${{ matrix.ubuntu }}-r-${{ matrix.r }}-
       - name: Setup Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: 3.8
       - name: Setup Archery
@@ -190,12 +192,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { org: "rhub", image: "debian-gcc-devel", tag: "latest", devtoolset: "" }
+          - { org: "rhub", image: "ubuntu-gcc12", tag: "latest" }
     env:
       R_ORG: ${{ matrix.config.org }}
       R_IMAGE: ${{ matrix.config.image }}
       R_TAG: ${{ matrix.config.tag }}
-      DEVTOOLSET_VERSION: ${{ matrix.config.devtoolset }}
     steps:
       - name: Checkout Arrow
         uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
@@ -203,7 +204,7 @@ jobs:
           fetch-depth: 0
           submodules: recursive
       - name: Setup Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: 3.8
       - name: Setup Archery
@@ -369,11 +370,12 @@ jobs:
             MAKEFLAGS = paste0("-j", parallel::detectCores()),
             ARROW_R_DEV = TRUE,
             "_R_CHECK_FORCE_SUGGESTS_" = FALSE,
-            "_R_CHECK_STOP_ON_INVALID_NUMERIC_VERSION_INPUTS_" = TRUE
+            "_R_CHECK_STOP_ON_INVALID_NUMERIC_VERSION_INPUTS_" = TRUE,
+            "_R_CHECK_DONTTEST_EXAMPLES_" = TRUE
           )
           rcmdcheck::rcmdcheck(".",
             build_args = '--no-build-vignettes',
-            args = c('--no-manual', '--as-cran', '--ignore-vignettes', '--run-donttest'),
+            args = c('--no-manual', '--as-cran', '--ignore-vignettes'),
             error_on = 'warning',
             check_dir = 'check',
             timeout = 3600
diff --git a/.github/workflows/r_nightly.yml b/.github/workflows/r_nightly.yml
index 6629b5c8a5673..af5382f90834c 100644
--- a/.github/workflows/r_nightly.yml
+++ b/.github/workflows/r_nightly.yml
@@ -60,7 +60,7 @@ jobs:
           repository: ursacomputing/crossbow
           ref: main
       - name: Set up Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           cache: 'pip'
           python-version: 3.12
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000000000..8d54979502430
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,74 @@
+# 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.
+
+name: Release
+
+on:
+  push:
+    tags:
+      # Trigger workflow when a tag whose name matches the pattern
+      # pattern "apache-arrow-{MAJOR}.{MINOR}.{PATCH}" is pushed.
+      - "apache-arrow-[0-9]+.[0-9]+.[0-9]+"
+
+permissions:
+  contents: write
+
+env:
+  GH_TOKEN: ${{ github.token }}
+
+jobs:
+  publish:
+    name: Publish 
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: Get Tag Name of Latest Release Candidate
+        run: |
+          rc_tag=$(gh release list --repo apache/arrow | \
+                    cut -f3 | \
+                    grep -F "${GITHUB_REF_NAME}-rc" | \
+                    head -n1)
+          echo "Latest Release Candidate Tag: ${rc_tag}"
+          echo "RELEASE_CANDIDATE_TAG_NAME=${rc_tag}" >> ${GITHUB_ENV}
+      - name: Store Version and Release Candidate Number
+        run: |
+          version_with_rc=${RELEASE_CANDIDATE_TAG_NAME#apache-arrow-}
+          version=${version_with_rc%-rc*}
+          rc_num=${version_with_rc#${version}-rc}
+          echo "VERSION_WITH_RC=${version_with_rc}" >> ${GITHUB_ENV}
+          echo "VERSION=${version}" >> ${GITHUB_ENV}
+          echo "RC_NUM=${rc_num}" >> ${GITHUB_ENV}
+      - name: Download Release Candidate Artifacts 
+        run: |
+          mkdir release_candidate_artifacts
+          gh release download ${RELEASE_CANDIDATE_TAG_NAME} --repo apache/arrow --dir release_candidate_artifacts
+      - name: Create Release Title
+        run: |
+          title="Apache Arrow ${VERSION}"
+          echo "RELEASE_TITLE=${title}" >> ${GITHUB_ENV}
+      # Set the release notes to "TODO" temporarily. After the release notes page
+      # (https://arrow.apache.org/release/{VERSION}.html) is published, use 
+      # gh release edit to update the release notes to refer to the newly 
+      # pushed web page. See dev/post/post-05-update-gh-release-notes.sh
+      - name: Create GitHub Release
+        run: |
+          gh release create ${GITHUB_REF_NAME} \
+            --repo apache/arrow \
+            --verify-tag \
+            --title "${RELEASE_TITLE}" \
+            --notes "TODO" \
+            release_candidate_artifacts/*
\ No newline at end of file
diff --git a/.github/workflows/release_candidate.yml b/.github/workflows/release_candidate.yml
new file mode 100644
index 0000000000000..ec732f0eb33e0
--- /dev/null
+++ b/.github/workflows/release_candidate.yml
@@ -0,0 +1,70 @@
+# 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.
+
+name: Release
+
+on:
+  push:
+    tags:
+      # Trigger workflow when a tag whose name matches the pattern
+      # "apache-arrow-{MAJOR}.{MINOR}.{PATCH}-rc{RC_NUM}" is pushed.
+      - "apache-arrow-[0-9]+.[0-9]+.[0-9]+-rc[0-9]+"
+
+permissions:
+  contents: write
+
+env:
+  GH_TOKEN: ${{ github.token }}
+
+jobs:
+  publish:
+    name: Publish 
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps: 
+      - name: Checkout Arrow
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Store Version and Release Candidate Number
+        run: |
+          version_with_rc=${GITHUB_REF_NAME#apache-arrow-}
+          version=${version_with_rc%-rc*}
+          rc_num=${version_with_rc#${version}-rc}
+          echo "VERSION_WITH_RC=${version_with_rc}" >> ${GITHUB_ENV}
+          echo "VERSION=${version}" >> ${GITHUB_ENV}
+          echo "RC_NUM=${rc_num}" >> ${GITHUB_ENV}
+      - name: Create Release Candidate Title
+        run: |
+          title="Apache Arrow ${VERSION} RC${RC_NUM}"
+          echo "RELEASE_CANDIDATE_TITLE=${title}" >> ${GITHUB_ENV}
+      - name: Create Release Candidate Notes
+        run: |
+          release_notes="Release Candidate: ${VERSION} RC${RC_NUM}"
+          echo "RELEASE_CANDIDATE_NOTES=${release_notes}" >> ${GITHUB_ENV}
+      - name: Create Release tarball
+        run: |
+          cd dev/release/ && ./utils-create-release-tarball.sh ${VERSION} ${RC_NUM}
+          echo "RELEASE_TARBALL=apache-arrow-${VERSION}.tar.gz" >> ${GITHUB_ENV}
+      - name: Create GitHub Release
+        run: |
+          gh release create ${GITHUB_REF_NAME} \
+            --verify-tag \
+            --prerelease \
+            --title "${RELEASE_CANDIDATE_TITLE}" \
+            --notes "Release Notes: ${RELEASE_CANDIDATE_NOTES}" \
+            dev/release/${RELEASE_TARBALL}
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index 74d56895f4c34..6a29ec8e72cab 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -53,6 +53,8 @@ permissions:
   contents: read
 
 env:
+  ARCHERY_DEBUG: 1
+  ARCHERY_USE_DOCKER_CLI: 1
   DOCKER_VOLUME_PREFIX: ".docker/"
 
 jobs:
@@ -82,7 +84,7 @@ jobs:
           key: ubuntu-${{ matrix.ubuntu }}-ruby-${{ hashFiles('cpp/**') }}
           restore-keys: ubuntu-${{ matrix.ubuntu }}-ruby-
       - name: Setup Python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
         with:
           python-version: 3.8
       - name: Setup Archery
@@ -115,7 +117,7 @@ jobs:
         run: archery docker push ubuntu-ruby
 
   macos:
-    name: AMD64 macOS 12 GLib & Ruby
+    name: AMD64 macOS 14 GLib & Ruby
     runs-on: macos-latest
     if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
     timeout-minutes: 60
@@ -130,7 +132,7 @@ jobs:
       ARROW_GCS: ON
       ARROW_GLIB_GTK_DOC: true
       ARROW_GLIB_WERROR: true
-      ARROW_HOME: /usr/local
+      ARROW_HOME: /tmp/local
       ARROW_JEMALLOC: OFF
       ARROW_ORC: OFF
       ARROW_PARQUET: ON
@@ -139,7 +141,6 @@ jobs:
       ARROW_WITH_SNAPPY: ON
       ARROW_WITH_ZLIB: ON
       ARROW_WITH_ZSTD: ON
-      XML_CATALOG_FILES: /usr/local/etc/xml/catalog
     steps:
       - name: Checkout Arrow
         uses: actions/checkout@v4
@@ -185,7 +186,7 @@ jobs:
         shell: bash
         run: ci/scripts/ruby_test.sh $(pwd) $(pwd)/build
 
-  windows:
+  windows-mingw:
     name: AMD64 Windows MinGW ${{ matrix.mingw-n-bits }} GLib & Ruby
     runs-on: windows-2019
     if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
@@ -196,9 +197,7 @@ jobs:
         mingw-n-bits:
           - 64
         ruby-version:
-          # TODO: Use the latest Ruby again when we fix GH-39130.
-          # - ruby
-          - "3.1"
+          - ruby
     env:
       ARROW_BUILD_STATIC: OFF
       ARROW_BUILD_TESTS: OFF
@@ -266,7 +265,6 @@ jobs:
           ridk exec bash ci\scripts\cpp_build.sh "${source_dir}" "${build_dir}"
       - name: Build GLib
         run: |
-          $Env:CMAKE_BUILD_PARALLEL_LEVEL = $Env:NUMBER_OF_PROCESSORS
           $source_dir = "$(ridk exec cygpath --unix "$(Get-Location)")"
           $build_dir = "$(ridk exec cygpath --unix "$(Get-Location)\build")"
           $ErrorActionPreference = "Continue"
@@ -304,3 +302,119 @@ jobs:
           $Env:MAKE = "ridk exec make"
           $ErrorActionPreference = "Continue"
           rake -f ruby\Rakefile
+
+  windows-msvc:
+    name: AMD64 Windows MSVC GLib
+    runs-on: windows-2019
+    if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
+    timeout-minutes: 90
+    strategy:
+      fail-fast: false
+    env:
+      ARROW_ACERO: ON
+      ARROW_BOOST_USE_SHARED: OFF
+      ARROW_BUILD_BENCHMARKS: OFF
+      ARROW_BUILD_SHARED: ON
+      ARROW_BUILD_STATIC: OFF
+      ARROW_BUILD_TESTS: OFF
+      ARROW_DATASET: ON
+      ARROW_DEPENDENCY_SOURCE: VCPKG
+      ARROW_DEPENDENCY_USE_SHARED: OFF
+      ARROW_FLIGHT: ON
+      ARROW_FLIGHT_SQL: ON
+      ARROW_GANDIVA: OFF
+      ARROW_GLIB_VAPI: "false"
+      ARROW_HDFS: OFF
+      ARROW_HOME: "${{ github.workspace }}/dist"
+      ARROW_JEMALLOC: OFF
+      ARROW_MIMALLOC: ON
+      ARROW_ORC: OFF
+      ARROW_PARQUET: ON
+      ARROW_SUBSTRAIT: OFF
+      ARROW_USE_GLOG: OFF
+      ARROW_VERBOSE_THIRDPARTY_BUILD: OFF
+      ARROW_WITH_BROTLI: OFF
+      ARROW_WITH_BZ2: OFF
+      ARROW_WITH_LZ4: OFF
+      ARROW_WITH_OPENTELEMETRY: OFF
+      ARROW_WITH_SNAPPY: ON
+      ARROW_WITH_ZLIB: ON
+      ARROW_WITH_ZSTD: ON
+      CMAKE_CXX_STANDARD: "17"
+      CMAKE_GENERATOR: Ninja
+      CMAKE_INSTALL_PREFIX: "${{ github.workspace }}/dist"
+      CMAKE_UNITY_BUILD: ON
+      VCPKG_BINARY_SOURCES: 'clear;nuget,GitHub,readwrite'
+      VCPKG_ROOT: "${{ github.workspace }}/vcpkg"
+      VCPKG_TRIPLET: x64-windows
+    permissions:
+      packages: write
+    steps:
+      - name: Disable Crash Dialogs
+        run: |
+          reg add `
+            "HKCU\SOFTWARE\Microsoft\Windows\Windows Error Reporting" `
+            /v DontShowUI `
+            /t REG_DWORD `
+            /d 1 `
+            /f
+      - name: Checkout Arrow
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: recursive
+      - name: Install vcpkg
+        shell: bash
+        run: |
+          ci/scripts/install_vcpkg.sh "${VCPKG_ROOT}"
+      - name: Install meson
+        run: |
+          python -m pip install meson
+      - name: Install ccache
+        shell: bash
+        run: |
+          ci/scripts/install_ccache.sh 4.6.3 /usr
+      - name: Setup ccache
+        shell: bash
+        run: |
+          ci/scripts/ccache_setup.sh
+      - name: ccache info
+        id: ccache-info
+        shell: bash
+        run: |
+          echo "cache-dir=$(ccache --get-config cache_dir)" >> $GITHUB_OUTPUT
+      - name: Cache ccache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.ccache-info.outputs.cache-dir }}
+          key: glib-ccache-msvc-${{ env.CACHE_VERSION }}-${{ hashFiles('cpp/**') }}
+          restore-keys: glib-ccache-msvc-${{ env.CACHE_VERSION }}-
+        env:
+          # We can invalidate the current cache by updating this.
+          CACHE_VERSION: "2024-05-09"
+      - name: Setup NuGet credentials for vcpkg caching
+        shell: bash
+        run: |
+          $(vcpkg/vcpkg.exe fetch nuget | tail -n 1) \
+            sources add \
+            -source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json" \
+            -storepasswordincleartext \
+            -name "GitHub" \
+            -username "$GITHUB_REPOSITORY_OWNER" \
+            -password "${{ secrets.GITHUB_TOKEN }}"
+          $(vcpkg/vcpkg.exe fetch nuget | tail -n 1) \
+            setapikey "${{ secrets.GITHUB_TOKEN }}" \
+            -source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json"
+      - name: Build C++ vcpkg dependencies
+        run: |
+          vcpkg\vcpkg.exe install --triplet $env:VCPKG_TRIPLET --x-manifest-root cpp --x-install-root build\cpp\vcpkg_installed
+      - name: Build C++
+        shell: cmd
+        run: |
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+          bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
+      - name: Build GLib
+        shell: cmd
+        run: |
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+          bash -c "ci/scripts/c_glib_build.sh $(pwd) $(pwd)/build"
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
index f55e9e77503c0..3f039315b505a 100644
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@@ -41,6 +41,8 @@ permissions:
   contents: read
 
 env:
+  ARCHERY_DEBUG: 1
+  ARCHERY_USE_DOCKER_CLI: 1
   DOCKER_VOLUME_PREFIX: ".docker/"
 
 jobs:
diff --git a/.gitignore b/.gitignore
index c7f5aa90e18e6..52ffa6c6124c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -102,4 +102,9 @@ __debug_bin
 .envrc
 
 # Develocity
-.mvn/.gradle-enterprise/
+java/.mvn/.gradle-enterprise/
+java/.mvn/.develocity/
+
+# rat
+filtered_rat.txt
+rat.txt
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye-arm64/from b/.golangci.yaml
similarity index 77%
rename from dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye-arm64/from
rename to .golangci.yaml
index 34187b2af5a74..7d486a9e85a0a 100644
--- a/dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye-arm64/from
+++ b/.golangci.yaml
@@ -15,4 +15,15 @@
 # specific language governing permissions and limitations
 # under the License.
 
-arm64v8/debian:bullseye
+linters:
+  # Disable all linters.
+  # Default: false
+  disable-all: true
+  # Enable specific linter
+  # https://golangci-lint.run/usage/linters/#enabled-by-default
+  enable:
+    - gofmt
+    - goimports
+
+issues:
+  fix: true
\ No newline at end of file
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2e598e0a95064..9bdd4f487bdec 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -34,13 +34,19 @@ repos:
     hooks:
       - id: hadolint-docker
         name: Docker Format
-        exclude: ^dev/.*$
+        # We can enable this after we fix all existing lint failures.
+        # files: (/Dockerfile|\.dockerfile)$
+        files: >-
+          (
+          ?^ci/docker/python-wheel-windows-test-vs2019\.dockerfile$|
+          )
+        types: []
   - repo: https://github.com/pycqa/flake8
     rev: 6.1.0
     hooks:
       - id: flake8
         name: Python Format
-        files: ^(python|dev|integration)/
+        files: ^(python|dev|c_glib|integration)/
         types:
           - file
           - python
@@ -116,19 +122,42 @@ repos:
         name: CMake Format
         files: >-
           (
+          ?.*CMakeLists\.txt$|
           ?^ci/.*/.*\.cmake$|
           ?^cpp/.*/.*\.cmake\.in$|
           ?^cpp/.*/.*\.cmake$|
-          ?^cpp/.*/CMakeLists\.txt$|
-          ?^go/.*/CMakeLists\.txt$|
-          ?^java/.*/CMakeLists\.txt$|
-          ?^matlab/.*/CMakeLists\.txt$|
-          ?^python/.*/CMakeLists\.txt$|
           )
         exclude: >-
           (
+          ?^ci/conan/all/.*CMakeLists\.txt$|
           ?^cpp/cmake_modules/FindNumPy\.cmake$|
           ?^cpp/cmake_modules/FindPythonLibsNew\.cmake$|
           ?^cpp/cmake_modules/UseCython\.cmake$|
-          ?^cpp/src/arrow/util/config\.h\.cmake$|
+          ?^cpp/src/arrow/util/.*\.h\.cmake$|
           )
+  - repo: https://github.com/sphinx-contrib/sphinx-lint
+    rev: v0.9.1
+    hooks:
+      - id: sphinx-lint
+        files: ^docs/source
+        exclude: ^docs/source/python/generated
+        args: [
+          '--enable',
+          'all',
+          '--disable',
+          'dangling-hyphen,line-too-long',
+        ]
+  - repo: https://github.com/golangci/golangci-lint
+    rev: v1.59.0
+    hooks:
+      # no built-in support for multiple go.mod
+      # https://github.com/golangci/golangci-lint/issues/828
+      - id: golangci-lint-full
+        name: golangci-lint-full-arrow
+        entry: bash -c 'cd go/arrow && golangci-lint run'
+      - id: golangci-lint-full
+        name: golangci-lint-full-parquet
+        entry: bash -c 'cd go/parquet && golangci-lint run'
+      - id: golangci-lint-full
+        name: golangci-lint-full-internal
+        entry: bash -c 'cd go/internal && golangci-lint run'
diff --git a/LICENSE.txt b/LICENSE.txt
index 0423854567b26..7bb1330a1002b 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -2252,3 +2252,10 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+--------------------------------------------------------------------------------
+java/vector/src/main/java/org/apache/arrow/vector/util/IntObjectHashMap.java
+java/vector/src/main/java/org/apache/arrow/vector/util/IntObjectMap.java
+
+These file are derived from code from Netty, which is made available under the
+Apache License 2.0.
diff --git a/c_glib/arrow-cuda-glib/arrow-cuda-glib.h b/c_glib/arrow-cuda-glib/arrow-cuda-glib.h
index b3c7f21087669..572ff92ed9b43 100644
--- a/c_glib/arrow-cuda-glib/arrow-cuda-glib.h
+++ b/c_glib/arrow-cuda-glib/arrow-cuda-glib.h
@@ -21,4 +21,6 @@
 
 #include <arrow-glib/arrow-glib.h>
 
+#include <arrow-cuda-glib/version.h>
+
 #include <arrow-cuda-glib/cuda.h>
diff --git a/c_glib/arrow-cuda-glib/cuda.h b/c_glib/arrow-cuda-glib/cuda.h
index 863743a620bf8..f04a3381259bb 100644
--- a/c_glib/arrow-cuda-glib/cuda.h
+++ b/c_glib/arrow-cuda-glib/cuda.h
@@ -21,9 +21,12 @@
 
 #include <arrow-glib/arrow-glib.h>
 
+#include <arrow-cuda-glib/version.h>
+
 G_BEGIN_DECLS
 
 #define GARROW_CUDA_TYPE_DEVICE_MANAGER (garrow_cuda_device_manager_get_type())
+GARROW_CUDA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GArrowCUDADeviceManager,
                          garrow_cuda_device_manager,
                          GARROW_CUDA,
@@ -35,6 +38,7 @@ struct _GArrowCUDADeviceManagerClass
 };
 
 #define GARROW_CUDA_TYPE_CONTEXT (garrow_cuda_context_get_type())
+GARROW_CUDA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(
   GArrowCUDAContext, garrow_cuda_context, GARROW_CUDA, CONTEXT, GObject)
 struct _GArrowCUDAContextClass
@@ -43,6 +47,7 @@ struct _GArrowCUDAContextClass
 };
 
 #define GARROW_CUDA_TYPE_BUFFER (garrow_cuda_buffer_get_type())
+GARROW_CUDA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(
   GArrowCUDABuffer, garrow_cuda_buffer, GARROW_CUDA, BUFFER, GArrowBuffer)
 struct _GArrowCUDABufferClass
@@ -51,6 +56,7 @@ struct _GArrowCUDABufferClass
 };
 
 #define GARROW_CUDA_TYPE_HOST_BUFFER (garrow_cuda_host_buffer_get_type())
+GARROW_CUDA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GArrowCUDAHostBuffer,
                          garrow_cuda_host_buffer,
                          GARROW_CUDA,
@@ -62,6 +68,7 @@ struct _GArrowCUDAHostBufferClass
 };
 
 #define GARROW_CUDA_TYPE_IPC_MEMORY_HANDLE (garrow_cuda_ipc_memory_handle_get_type())
+GARROW_CUDA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GArrowCUDAIPCMemoryHandle,
                          garrow_cuda_ipc_memory_handle,
                          GARROW_CUDA,
@@ -73,6 +80,7 @@ struct _GArrowCUDAIPCMemoryHandleClass
 };
 
 #define GARROW_CUDA_TYPE_BUFFER_INPUT_STREAM (garrow_cuda_buffer_input_stream_get_type())
+GARROW_CUDA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GArrowCUDABufferInputStream,
                          garrow_cuda_buffer_input_stream,
                          GARROW_CUDA,
@@ -85,6 +93,7 @@ struct _GArrowCUDABufferInputStreamClass
 
 #define GARROW_CUDA_TYPE_BUFFER_OUTPUT_STREAM                                            \
   (garrow_cuda_buffer_output_stream_get_type())
+GARROW_CUDA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GArrowCUDABufferOutputStream,
                          garrow_cuda_buffer_output_stream,
                          GARROW_CUDA,
@@ -95,71 +104,100 @@ struct _GArrowCUDABufferOutputStreamClass
   GArrowOutputStreamClass parent_class;
 };
 
+GARROW_CUDA_AVAILABLE_IN_0_12
 GArrowCUDADeviceManager *
 garrow_cuda_device_manager_new(GError **error);
 
+GARROW_CUDA_AVAILABLE_IN_0_12
 GArrowCUDAContext *
 garrow_cuda_device_manager_get_context(GArrowCUDADeviceManager *manager,
                                        gint gpu_number,
                                        GError **error);
+
+GARROW_CUDA_AVAILABLE_IN_0_12
 gsize
 garrow_cuda_device_manager_get_n_devices(GArrowCUDADeviceManager *manager);
 
+GARROW_CUDA_AVAILABLE_IN_0_12
 gint64
 garrow_cuda_context_get_allocated_size(GArrowCUDAContext *context);
 
+GARROW_CUDA_AVAILABLE_IN_0_12
 GArrowCUDABuffer *
 garrow_cuda_buffer_new(GArrowCUDAContext *context, gint64 size, GError **error);
+
+GARROW_CUDA_AVAILABLE_IN_0_12
 GArrowCUDABuffer *
 garrow_cuda_buffer_new_ipc(GArrowCUDAContext *context,
                            GArrowCUDAIPCMemoryHandle *handle,
                            GError **error);
+
+GARROW_CUDA_AVAILABLE_IN_0_12
 GArrowCUDABuffer *
 garrow_cuda_buffer_new_record_batch(GArrowCUDAContext *context,
                                     GArrowRecordBatch *record_batch,
                                     GError **error);
+
+GARROW_CUDA_AVAILABLE_IN_0_12
 GBytes *
 garrow_cuda_buffer_copy_to_host(GArrowCUDABuffer *buffer,
                                 gint64 position,
                                 gint64 size,
                                 GError **error);
+
+GARROW_CUDA_AVAILABLE_IN_0_12
 gboolean
 garrow_cuda_buffer_copy_from_host(GArrowCUDABuffer *buffer,
                                   const guint8 *data,
                                   gint64 size,
                                   GError **error);
+
+GARROW_CUDA_AVAILABLE_IN_0_12
 GArrowCUDAIPCMemoryHandle *
 garrow_cuda_buffer_export(GArrowCUDABuffer *buffer, GError **error);
+
+GARROW_CUDA_AVAILABLE_IN_0_12
 GArrowCUDAContext *
 garrow_cuda_buffer_get_context(GArrowCUDABuffer *buffer);
+
+GARROW_CUDA_AVAILABLE_IN_0_12
 GArrowRecordBatch *
 garrow_cuda_buffer_read_record_batch(GArrowCUDABuffer *buffer,
                                      GArrowSchema *schema,
                                      GArrowReadOptions *options,
                                      GError **error);
 
+GARROW_CUDA_AVAILABLE_IN_0_12
 GArrowCUDAHostBuffer *
 garrow_cuda_host_buffer_new(gint gpu_number, gint64 size, GError **error);
 
+GARROW_CUDA_AVAILABLE_IN_0_12
 GArrowCUDAIPCMemoryHandle *
 garrow_cuda_ipc_memory_handle_new(const guint8 *data, gsize size, GError **error);
 
+GARROW_CUDA_AVAILABLE_IN_0_12
 GArrowBuffer *
 garrow_cuda_ipc_memory_handle_serialize(GArrowCUDAIPCMemoryHandle *handle,
                                         GError **error);
 
+GARROW_CUDA_AVAILABLE_IN_0_12
 GArrowCUDABufferInputStream *
 garrow_cuda_buffer_input_stream_new(GArrowCUDABuffer *buffer);
 
+GARROW_CUDA_AVAILABLE_IN_0_12
 GArrowCUDABufferOutputStream *
 garrow_cuda_buffer_output_stream_new(GArrowCUDABuffer *buffer);
 
+GARROW_CUDA_AVAILABLE_IN_0_12
 gboolean
 garrow_cuda_buffer_output_stream_set_buffer_size(GArrowCUDABufferOutputStream *stream,
                                                  gint64 size,
                                                  GError **error);
+GARROW_CUDA_AVAILABLE_IN_0_12
 gint64
 garrow_cuda_buffer_output_stream_get_buffer_size(GArrowCUDABufferOutputStream *stream);
+
+GARROW_CUDA_AVAILABLE_IN_0_12
 gint64
 garrow_cuda_buffer_output_stream_get_buffered_size(GArrowCUDABufferOutputStream *stream);
 
diff --git a/c_glib/arrow-cuda-glib/meson.build b/c_glib/arrow-cuda-glib/meson.build
index 88029e6dc2073..47bed70f03b60 100644
--- a/c_glib/arrow-cuda-glib/meson.build
+++ b/c_glib/arrow-cuda-glib/meson.build
@@ -31,10 +31,17 @@ cpp_headers = files(
   'cuda.hpp',
 )
 
+version_h = configure_file(
+  input: 'version.h.in',
+  output: 'version.h',
+  command: [python3, generate_version_header_py, '--library', 'GARROW_CUDA', '--version', version, '--input', '@INPUT@', '--output', '@OUTPUT@'],
+)
+
+c_headers += version_h
+
 headers = c_headers + cpp_headers
 install_headers(headers, subdir: 'arrow-cuda-glib')
 
-
 dependencies = [
   arrow_cuda,
   arrow_glib,
@@ -45,6 +52,7 @@ libarrow_cuda_glib = library('arrow-cuda-glib',
                              dependencies: dependencies,
                              implicit_include_directories: false,
                              include_directories: base_include_directories,
+                             cpp_args: ['-DGARROW_CUDA_COMPILATION'],
                              soversion: so_version,
                              version: library_version)
 arrow_cuda_glib = declare_dependency(link_with: libarrow_cuda_glib,
diff --git a/c_glib/arrow-cuda-glib/version.h.in b/c_glib/arrow-cuda-glib/version.h.in
new file mode 100644
index 0000000000000..0ab5bfd562b41
--- /dev/null
+++ b/c_glib/arrow-cuda-glib/version.h.in
@@ -0,0 +1,159 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <arrow-glib/version.h>
+
+/**
+ * SECTION: version
+ * @section_id: version-macros
+ * @title: Version related macros
+ * @include: arrow-cuda-glib/arrow-cuda-glib.h
+ *
+ * Apache Arrow CUDA GLib provides macros that can be used by C pre-processor.
+ * They are useful to check version related things at compile time.
+ */
+
+/**
+ * GARROW_CUDA_VERSION_MAJOR:
+ *
+ * The major version.
+ *
+ * Since: 17.0.0
+ */
+#define GARROW_CUDA_VERSION_MAJOR (@VERSION_MAJOR@)
+
+/**
+ * GARROW_CUDA_VERSION_MINOR:
+ *
+ * The minor version.
+ *
+ * Since: 17.0.0
+ */
+#define GARROW_CUDA_VERSION_MINOR (@VERSION_MINOR@)
+
+/**
+ * GARROW_CUDA_VERSION_MICRO:
+ *
+ * The micro version.
+ *
+ * Since: 17.0.0
+ */
+#define GARROW_CUDA_VERSION_MICRO (@VERSION_MICRO@)
+
+/**
+ * GARROW_CUDA_VERSION_TAG:
+ *
+ * The version tag. Normally, it's an empty string. It's "SNAPSHOT"
+ * for snapshot version.
+ *
+ * Since: 17.0.0
+ */
+#define GARROW_CUDA_VERSION_TAG   "@VERSION_TAG@"
+
+/**
+ * GARROW_CUDA_VERSION_CHECK:
+ * @major: A major version to check for.
+ * @minor: A minor version to check for.
+ * @micro: A micro version to check for.
+ *
+ * You can use this macro in C pre-processor.
+ *
+ * Returns: %TRUE if the compile time Apache Arrow GLib version is the
+ *   same as or newer than the passed version, %FALSE otherwise.
+ *
+ * Since: 17.0.0
+ */
+#define GARROW_CUDA_VERSION_CHECK(major, minor, micro)       \
+  (GARROW_CUDA_VERSION_MAJOR > (major) ||                    \
+   (GARROW_CUDA_VERSION_MAJOR == (major) &&                  \
+    GARROW_CUDA_VERSION_MINOR > (minor)) ||                  \
+   (GARROW_CUDA_VERSION_MAJOR == (major) &&                  \
+    GARROW_CUDA_VERSION_MINOR == (minor) &&                  \
+    GARROW_CUDA_VERSION_MICRO >= (micro)))
+
+/**
+ * GARROW_CUDA_DISABLE_DEPRECATION_WARNINGS:
+ *
+ * If this macro is defined, no deprecated warnings are produced.
+ *
+ * You must define this macro before including the
+ * arrow-glib/arrow-glib.h header.
+ *
+ * Since: 17.0.0
+ */
+
+#ifdef GARROW_CUDA_DISABLE_DEPRECATION_WARNINGS
+#  define GARROW_CUDA_DEPRECATED
+#  define GARROW_CUDA_DEPRECATED_FOR(function)
+#  define GARROW_CUDA_UNAVAILABLE(major, minor)
+#else
+#  define GARROW_CUDA_DEPRECATED G_DEPRECATED
+#  define GARROW_CUDA_DEPRECATED_FOR(function) G_DEPRECATED_FOR(function)
+#  define GARROW_CUDA_UNAVAILABLE(major, minor) G_UNAVAILABLE(major, minor)
+#endif
+
+@ENCODED_VERSIONS@
+
+/**
+ * GARROW_CUDA_VERSION_MIN_REQUIRED:
+ *
+ * You can use this macro for compile time API version check.
+ *
+ * This macro value must be one of the predefined version macros such
+ * as %GARROW_CUDA_VERSION_0_10.
+ *
+ * If you use any functions that is defined by newer version than
+ * %GARROW_CUDA_VERSION_MIN_REQUIRED, deprecated warnings are produced at
+ * compile time.
+ *
+ * You must define this macro before including the
+ * arrow-cuda-glib/arrow-cuda-glib.h header.
+ *
+ * Since: 17.0.0
+ */
+#ifndef GARROW_CUDA_VERSION_MIN_REQUIRED
+#  define GARROW_CUDA_VERSION_MIN_REQUIRED GARROW_VERSION_MIN_REQUIRED
+#endif
+
+/**
+ * GARROW_CUDA_VERSION_MAX_ALLOWED:
+ *
+ * You can use this macro for compile time API version check.
+ *
+ * This macro value must be one of the predefined version macros such
+ * as %GARROW_CUDA_VERSION_0_10.
+ *
+ * If you use any functions that is defined by newer version than
+ * %GARROW_CUDA_VERSION_MAX_ALLOWED, deprecated warnings are produced at
+ * compile time.
+ *
+ * You must define this macro before including the
+ * arrow-cuda-glib/arrow-cuda-glib.h header.
+ *
+ * Since: 17.0.0
+ */
+#ifndef GARROW_CUDA_VERSION_MAX_ALLOWED
+#  define GARROW_CUDA_VERSION_MAX_ALLOWED GARROW_VERSION_MAX_ALLOWED
+#endif
+
+@VISIBILITY_MACROS@
+
+@AVAILABILITY_MACROS@
diff --git a/c_glib/arrow-dataset-glib/arrow-dataset-glib.h b/c_glib/arrow-dataset-glib/arrow-dataset-glib.h
index 58f4e216cc715..7ebf36ddd2b78 100644
--- a/c_glib/arrow-dataset-glib/arrow-dataset-glib.h
+++ b/c_glib/arrow-dataset-glib/arrow-dataset-glib.h
@@ -21,6 +21,8 @@
 
 #include <arrow-glib/arrow-glib.h>
 
+#include <arrow-dataset-glib/version.h>
+
 #include <arrow-dataset-glib/dataset-factory.h>
 #include <arrow-dataset-glib/dataset.h>
 #include <arrow-dataset-glib/enums.h>
diff --git a/c_glib/arrow-dataset-glib/dataset-definition.h b/c_glib/arrow-dataset-glib/dataset-definition.h
index f278b05a135f5..bc52d6d3663a3 100644
--- a/c_glib/arrow-dataset-glib/dataset-definition.h
+++ b/c_glib/arrow-dataset-glib/dataset-definition.h
@@ -21,9 +21,12 @@
 
 #include <arrow-glib/arrow-glib.h>
 
+#include <arrow-dataset-glib/version.h>
+
 G_BEGIN_DECLS
 
 #define GADATASET_TYPE_DATASET (gadataset_dataset_get_type())
+GADATASET_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GADatasetDataset, gadataset_dataset, GADATASET, DATASET, GObject)
 struct _GADatasetDatasetClass
 {
diff --git a/c_glib/arrow-dataset-glib/dataset-factory.h b/c_glib/arrow-dataset-glib/dataset-factory.h
index 1dc875837fe21..e7d3bc27aea8f 100644
--- a/c_glib/arrow-dataset-glib/dataset-factory.h
+++ b/c_glib/arrow-dataset-glib/dataset-factory.h
@@ -24,6 +24,7 @@
 G_BEGIN_DECLS
 
 #define GADATASET_TYPE_FINISH_OPTIONS (gadataset_finish_options_get_type())
+GADATASET_AVAILABLE_IN_11_0
 G_DECLARE_DERIVABLE_TYPE(
   GADatasetFinishOptions, gadataset_finish_options, GADATASET, FINISH_OPTIONS, GObject)
 struct _GADatasetFinishOptionsClass
@@ -31,11 +32,12 @@ struct _GADatasetFinishOptionsClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_11_0
+GADATASET_AVAILABLE_IN_11_0
 GADatasetFinishOptions *
 gadataset_finish_options_new(void);
 
 #define GADATASET_TYPE_DATASET_FACTORY (gadataset_dataset_factory_get_type())
+GADATASET_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GADatasetDatasetFactory, gadataset_dataset_factory, GADATASET, DATASET_FACTORY, GObject)
 struct _GADatasetDatasetFactoryClass
@@ -43,7 +45,7 @@ struct _GADatasetDatasetFactoryClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_5_0
+GADATASET_AVAILABLE_IN_5_0
 GADatasetDataset *
 gadataset_dataset_factory_finish(GADatasetDatasetFactory *factory,
                                  GADatasetFinishOptions *options,
@@ -51,6 +53,7 @@ gadataset_dataset_factory_finish(GADatasetDatasetFactory *factory,
 
 #define GADATASET_TYPE_FILE_SYSTEM_DATASET_FACTORY                                       \
   (gadataset_file_system_dataset_factory_get_type())
+GADATASET_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GADatasetFileSystemDatasetFactory,
                          gadataset_file_system_dataset_factory,
                          GADATASET,
@@ -61,32 +64,33 @@ struct _GADatasetFileSystemDatasetFactoryClass
   GADatasetDatasetFactoryClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_5_0
+GADATASET_AVAILABLE_IN_5_0
 GADatasetFileSystemDatasetFactory *
 gadataset_file_system_dataset_factory_new(GADatasetFileFormat *file_format);
-GARROW_AVAILABLE_IN_5_0
+GADATASET_AVAILABLE_IN_5_0
 gboolean
 gadataset_file_system_dataset_factory_set_file_system(
   GADatasetFileSystemDatasetFactory *factory,
   GArrowFileSystem *file_system,
   GError **error);
+GADATASET_AVAILABLE_IN_5_0
 gboolean
 gadataset_file_system_dataset_factory_set_file_system_uri(
   GADatasetFileSystemDatasetFactory *factory, const gchar *uri, GError **error);
 
-GARROW_AVAILABLE_IN_5_0
+GADATASET_AVAILABLE_IN_5_0
 gboolean
 gadataset_file_system_dataset_factory_add_path(GADatasetFileSystemDatasetFactory *factory,
                                                const gchar *path,
                                                GError **error);
 /*
-GARROW_AVAILABLE_IN_5_0
+GADATASET_AVAILABLE_IN_5_0
 gboolean
 gadataset_file_system_dataset_factory_add_file(
   GADatasetFileSystemDatasetFactory *factory,
   GArrowFileInfo *file,
   GError **error);
-GARROW_AVAILABLE_IN_5_0
+GADATASET_AVAILABLE_IN_5_0
 gboolean
 gadataset_file_system_dataset_factory_add_selector(
   GADatasetFileSystemDatasetFactory *factory,
@@ -94,7 +98,7 @@ gadataset_file_system_dataset_factory_add_selector(
   GError **error);
 */
 
-GARROW_AVAILABLE_IN_5_0
+GADATASET_AVAILABLE_IN_5_0
 GADatasetFileSystemDataset *
 gadataset_file_system_dataset_factory_finish(GADatasetFileSystemDatasetFactory *factory,
                                              GADatasetFinishOptions *options,
diff --git a/c_glib/arrow-dataset-glib/dataset.cpp b/c_glib/arrow-dataset-glib/dataset.cpp
index 704d6b589ee94..f84e4e3db380a 100644
--- a/c_glib/arrow-dataset-glib/dataset.cpp
+++ b/c_glib/arrow-dataset-glib/dataset.cpp
@@ -19,6 +19,7 @@
 
 #include <arrow-glib/error.hpp>
 #include <arrow-glib/file-system.hpp>
+#include <arrow-glib/reader.hpp>
 #include <arrow-glib/table.hpp>
 
 #include <arrow-dataset-glib/dataset-factory.hpp>
@@ -152,12 +153,46 @@ gadataset_dataset_to_table(GADatasetDataset *dataset, GError **error)
   }
   auto arrow_scanner = *arrow_scanner_result;
   auto arrow_table_result = arrow_scanner->ToTable();
-  if (!garrow::check(error, arrow_scanner_result, "[dataset][to-table]")) {
+  if (!garrow::check(error, arrow_table_result, "[dataset][to-table]")) {
     return NULL;
   }
   return garrow_table_new_raw(&(*arrow_table_result));
 }
 
+/**
+ * gadataset_dataset_to_record_batch_reader:
+ * @dataset: A #GADatasetDataset.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: (transfer full) (nullable):
+ *   A #GArrowRecordBatchReader on success, %NULL on error.
+ *
+ * Since: 17.0.0
+ */
+GArrowRecordBatchReader *
+gadataset_dataset_to_record_batch_reader(GADatasetDataset *dataset, GError **error)
+{
+  auto arrow_dataset = gadataset_dataset_get_raw(dataset);
+  auto arrow_scanner_builder_result = arrow_dataset->NewScan();
+  if (!garrow::check(error,
+                     arrow_scanner_builder_result,
+                     "[dataset][to-record-batch-reader]")) {
+    return nullptr;
+  }
+  auto arrow_scanner_builder = *arrow_scanner_builder_result;
+  auto arrow_scanner_result = arrow_scanner_builder->Finish();
+  if (!garrow::check(error, arrow_scanner_result, "[dataset][to-record-batch-reader]")) {
+    return nullptr;
+  }
+  auto arrow_scanner = *arrow_scanner_result;
+  auto arrow_reader_result = arrow_scanner->ToRecordBatchReader();
+  if (!garrow::check(error, arrow_reader_result, "[dataset][to-record-batch-reader]")) {
+    return nullptr;
+  }
+  auto sources = g_list_prepend(nullptr, dataset);
+  return garrow_record_batch_reader_new_raw(&(*arrow_reader_result), sources);
+}
+
 /**
  * gadataset_dataset_get_type_name:
  * @dataset: A #GADatasetDataset.
diff --git a/c_glib/arrow-dataset-glib/dataset.h b/c_glib/arrow-dataset-glib/dataset.h
index 57f6c7729f073..5b957f0538a2a 100644
--- a/c_glib/arrow-dataset-glib/dataset.h
+++ b/c_glib/arrow-dataset-glib/dataset.h
@@ -25,18 +25,22 @@
 
 G_BEGIN_DECLS
 
-GARROW_AVAILABLE_IN_5_0
+GADATASET_AVAILABLE_IN_5_0
 GADatasetScannerBuilder *
 gadataset_dataset_begin_scan(GADatasetDataset *dataset, GError **error);
-GARROW_AVAILABLE_IN_5_0
+GADATASET_AVAILABLE_IN_5_0
 GArrowTable *
 gadataset_dataset_to_table(GADatasetDataset *dataset, GError **error);
-GARROW_AVAILABLE_IN_5_0
+GADATASET_AVAILABLE_IN_5_0
 gchar *
 gadataset_dataset_get_type_name(GADatasetDataset *dataset);
+GADATASET_AVAILABLE_IN_17_0
+GArrowRecordBatchReader *
+gadataset_dataset_to_record_batch_reader(GADatasetDataset *dataset, GError **error);
 
 #define GADATASET_TYPE_FILE_SYSTEM_DATASET_WRITE_OPTIONS                                 \
   (gadataset_file_system_dataset_write_options_get_type())
+GADATASET_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(GADatasetFileSystemDatasetWriteOptions,
                          gadataset_file_system_dataset_write_options,
                          GADATASET,
@@ -47,11 +51,12 @@ struct _GADatasetFileSystemDatasetWriteOptionsClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_6_0
+GADATASET_AVAILABLE_IN_6_0
 GADatasetFileSystemDatasetWriteOptions *
 gadataset_file_system_dataset_write_options_new(void);
 
 #define GADATASET_TYPE_FILE_SYSTEM_DATASET (gadataset_file_system_dataset_get_type())
+GADATASET_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GADatasetFileSystemDataset,
                          gadataset_file_system_dataset,
                          GADATASET,
@@ -62,7 +67,7 @@ struct _GADatasetFileSystemDatasetClass
   GADatasetDatasetClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_6_0
+GADATASET_AVAILABLE_IN_6_0
 gboolean
 gadataset_file_system_dataset_write_scanner(
   GADatasetScanner *scanner,
diff --git a/c_glib/arrow-dataset-glib/enums.h.template b/c_glib/arrow-dataset-glib/enums.h.template
index b7d3c99c0bef8..8b89a8b031bdc 100644
--- a/c_glib/arrow-dataset-glib/enums.h.template
+++ b/c_glib/arrow-dataset-glib/enums.h.template
@@ -22,6 +22,8 @@
 
 #include <glib-object.h>
 
+#include <arrow-dataset-glib/version.h>
+
 G_BEGIN_DECLS
 /*** END file-header ***/
 
@@ -31,6 +33,7 @@ G_BEGIN_DECLS
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
+GADATASET_AVAILABLE_IN_ALL
 GType @enum_name@_get_type(void) G_GNUC_CONST;
 #define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
 /*** END value-header ***/
diff --git a/c_glib/arrow-dataset-glib/file-format.h b/c_glib/arrow-dataset-glib/file-format.h
index 29487e59d70dd..f70523597e7c6 100644
--- a/c_glib/arrow-dataset-glib/file-format.h
+++ b/c_glib/arrow-dataset-glib/file-format.h
@@ -21,9 +21,12 @@
 
 #include <arrow-glib/arrow-glib.h>
 
+#include <arrow-dataset-glib/version.h>
+
 G_BEGIN_DECLS
 
 #define GADATASET_TYPE_FILE_WRITE_OPTIONS (gadataset_file_write_options_get_type())
+GADATASET_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(GADatasetFileWriteOptions,
                          gadataset_file_write_options,
                          GADATASET,
@@ -35,6 +38,7 @@ struct _GADatasetFileWriteOptionsClass
 };
 
 #define GADATASET_TYPE_FILE_WRITER (gadataset_file_writer_get_type())
+GADATASET_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(
   GADatasetFileWriter, gadataset_file_writer, GADATASET, FILE_WRITER, GObject)
 struct _GADatasetFileWriterClass
@@ -42,21 +46,22 @@ struct _GADatasetFileWriterClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_6_0
+GADATASET_AVAILABLE_IN_6_0
 gboolean
 gadataset_file_writer_write_record_batch(GADatasetFileWriter *writer,
                                          GArrowRecordBatch *record_batch,
                                          GError **error);
-GARROW_AVAILABLE_IN_6_0
+GADATASET_AVAILABLE_IN_6_0
 gboolean
 gadataset_file_writer_write_record_batch_reader(GADatasetFileWriter *writer,
                                                 GArrowRecordBatchReader *reader,
                                                 GError **error);
-GARROW_AVAILABLE_IN_6_0
+GADATASET_AVAILABLE_IN_6_0
 gboolean
 gadataset_file_writer_finish(GADatasetFileWriter *writer, GError **error);
 
 #define GADATASET_TYPE_FILE_FORMAT (gadataset_file_format_get_type())
+GADATASET_AVAILABLE_IN_3_0
 G_DECLARE_DERIVABLE_TYPE(
   GADatasetFileFormat, gadataset_file_format, GADATASET, FILE_FORMAT, GObject)
 struct _GADatasetFileFormatClass
@@ -64,13 +69,13 @@ struct _GADatasetFileFormatClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_3_0
+GADATASET_AVAILABLE_IN_3_0
 gchar *
 gadataset_file_format_get_type_name(GADatasetFileFormat *format);
-GARROW_AVAILABLE_IN_6_0
+GADATASET_AVAILABLE_IN_6_0
 GADatasetFileWriteOptions *
 gadataset_file_format_get_default_write_options(GADatasetFileFormat *format);
-GARROW_AVAILABLE_IN_6_0
+GADATASET_AVAILABLE_IN_6_0
 GADatasetFileWriter *
 gadataset_file_format_open_writer(GADatasetFileFormat *format,
                                   GArrowOutputStream *destination,
@@ -80,12 +85,13 @@ gadataset_file_format_open_writer(GADatasetFileFormat *format,
                                   GADatasetFileWriteOptions *options,
                                   GError **error);
 
-GARROW_AVAILABLE_IN_3_0
+GADATASET_AVAILABLE_IN_3_0
 gboolean
 gadataset_file_format_equal(GADatasetFileFormat *format,
                             GADatasetFileFormat *other_format);
 
 #define GADATASET_TYPE_CSV_FILE_FORMAT (gadataset_csv_file_format_get_type())
+GADATASET_AVAILABLE_IN_3_0
 G_DECLARE_DERIVABLE_TYPE(GADatasetCSVFileFormat,
                          gadataset_csv_file_format,
                          GADATASET,
@@ -96,11 +102,12 @@ struct _GADatasetCSVFileFormatClass
   GADatasetFileFormatClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_3_0
+GADATASET_AVAILABLE_IN_3_0
 GADatasetCSVFileFormat *
 gadataset_csv_file_format_new(void);
 
 #define GADATASET_TYPE_IPC_FILE_FORMAT (gadataset_ipc_file_format_get_type())
+GADATASET_AVAILABLE_IN_3_0
 G_DECLARE_DERIVABLE_TYPE(GADatasetIPCFileFormat,
                          gadataset_ipc_file_format,
                          GADATASET,
@@ -111,11 +118,12 @@ struct _GADatasetIPCFileFormatClass
   GADatasetFileFormatClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_3_0
+GADATASET_AVAILABLE_IN_3_0
 GADatasetIPCFileFormat *
 gadataset_ipc_file_format_new(void);
 
 #define GADATASET_TYPE_PARQUET_FILE_FORMAT (gadataset_parquet_file_format_get_type())
+GADATASET_AVAILABLE_IN_3_0
 G_DECLARE_DERIVABLE_TYPE(GADatasetParquetFileFormat,
                          gadataset_parquet_file_format,
                          GADATASET,
@@ -126,7 +134,7 @@ struct _GADatasetParquetFileFormatClass
   GADatasetFileFormatClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_3_0
+GADATASET_AVAILABLE_IN_3_0
 GADatasetParquetFileFormat *
 gadataset_parquet_file_format_new(void);
 
diff --git a/c_glib/arrow-dataset-glib/fragment.h b/c_glib/arrow-dataset-glib/fragment.h
index 49acc360a3679..80eb9e19df3cc 100644
--- a/c_glib/arrow-dataset-glib/fragment.h
+++ b/c_glib/arrow-dataset-glib/fragment.h
@@ -21,11 +21,14 @@
 
 #include <arrow-glib/arrow-glib.h>
 
+#include <arrow-dataset-glib/version.h>
+
 G_BEGIN_DECLS
 
 /* arrow::dataset::Fragment */
 
 #define GADATASET_TYPE_FRAGMENT (gadataset_fragment_get_type())
+GADATASET_AVAILABLE_IN_4_0
 G_DECLARE_DERIVABLE_TYPE(
   GADatasetFragment, gadataset_fragment, GADATASET, FRAGMENT, GObject)
 struct _GADatasetFragmentClass
@@ -36,6 +39,7 @@ struct _GADatasetFragmentClass
 /* arrow::dataset::InMemoryFragment */
 
 #define GADATASET_TYPE_IN_MEMORY_FRAGMENT (gadataset_in_memory_fragment_get_type())
+GADATASET_AVAILABLE_IN_4_0
 G_DECLARE_DERIVABLE_TYPE(GADatasetInMemoryFragment,
                          gadataset_in_memory_fragment,
                          GADATASET,
@@ -46,7 +50,7 @@ struct _GADatasetInMemoryFragmentClass
   GADatasetFragmentClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_4_0
+GADATASET_AVAILABLE_IN_4_0
 GADatasetInMemoryFragment *
 gadataset_in_memory_fragment_new(GArrowSchema *schema,
                                  GArrowRecordBatch **record_batches,
diff --git a/c_glib/arrow-dataset-glib/meson.build b/c_glib/arrow-dataset-glib/meson.build
index 0c869a4183efa..3425efc5555c8 100644
--- a/c_glib/arrow-dataset-glib/meson.build
+++ b/c_glib/arrow-dataset-glib/meson.build
@@ -17,6 +17,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+project_name = 'arrow-dataset-glib'
+
 sources = files(
   'dataset-factory.cpp',
   'dataset.cpp',
@@ -47,20 +49,27 @@ cpp_headers = files(
   'scanner.hpp',
 )
 
+version_h = configure_file(
+  input: 'version.h.in',
+  output: 'version.h',
+  command: [python3, generate_version_header_py, '--library', 'GADATASET', '--version', version, '--input', '@INPUT@', '--output', '@OUTPUT@'],
+)
+
+c_headers += version_h
+
 enums = gnome.mkenums('enums',
                       sources: c_headers,
                       identifier_prefix: 'GADataset',
                       symbol_prefix: 'gadataset',
                       c_template: 'enums.c.template',
                       h_template: 'enums.h.template',
-                      install_dir: join_paths(include_dir, 'arrow-dataset-glib'),
+                      install_dir: join_paths(include_dir, project_name),
                       install_header: true)
 enums_source = enums[0]
 enums_header = enums[1]
 
-
 headers = c_headers + cpp_headers
-install_headers(headers, subdir: 'arrow-dataset-glib')
+install_headers(headers, subdir: project_name)
 
 dependencies = [
   arrow_dataset,
@@ -72,6 +81,8 @@ libarrow_dataset_glib = library('arrow-dataset-glib',
                                 dependencies: dependencies,
                                 implicit_include_directories: false,
                                 include_directories: base_include_directories,
+                                cpp_args: ['-DGADATASET_COMPILATION'],
+                                c_args: ['-DGADATASET_COMPILATION'],
                                 soversion: so_version,
                                 version: library_version)
 arrow_dataset_glib = declare_dependency(link_with: libarrow_dataset_glib,
diff --git a/c_glib/arrow-dataset-glib/partitioning.h b/c_glib/arrow-dataset-glib/partitioning.h
index ccf476272e429..7671958d88e61 100644
--- a/c_glib/arrow-dataset-glib/partitioning.h
+++ b/c_glib/arrow-dataset-glib/partitioning.h
@@ -21,6 +21,8 @@
 
 #include <arrow-glib/arrow-glib.h>
 
+#include <arrow-dataset-glib/version.h>
+
 G_BEGIN_DECLS
 
 /**
@@ -39,6 +41,7 @@ typedef enum {
 
 #define GADATASET_TYPE_PARTITIONING_FACTORY_OPTIONS                                      \
   (gadataset_partitioning_factory_options_get_type())
+GADATASET_AVAILABLE_IN_11_0
 G_DECLARE_DERIVABLE_TYPE(GADatasetPartitioningFactoryOptions,
                          gadataset_partitioning_factory_options,
                          GADATASET,
@@ -49,11 +52,12 @@ struct _GADatasetPartitioningFactoryOptionsClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_11_0
+GADATASET_AVAILABLE_IN_11_0
 GADatasetPartitioningFactoryOptions *
 gadataset_partitioning_factory_options_new(void);
 
 #define GADATASET_TYPE_PARTITIONING (gadataset_partitioning_get_type())
+GADATASET_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(
   GADatasetPartitioning, gadataset_partitioning, GADATASET, PARTITIONING, GObject)
 struct _GADatasetPartitioningClass
@@ -61,16 +65,17 @@ struct _GADatasetPartitioningClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_6_0
+GADATASET_AVAILABLE_IN_6_0
 gchar *
 gadataset_partitioning_get_type_name(GADatasetPartitioning *partitioning);
 
-GARROW_AVAILABLE_IN_12_0
+GADATASET_AVAILABLE_IN_12_0
 GADatasetPartitioning *
 gadataset_partitioning_create_default(void);
 
 #define GADATASET_TYPE_KEY_VALUE_PARTITIONING_OPTIONS                                    \
   (gadataset_key_value_partitioning_options_get_type())
+GADATASET_AVAILABLE_IN_11_0
 G_DECLARE_DERIVABLE_TYPE(GADatasetKeyValuePartitioningOptions,
                          gadataset_key_value_partitioning_options,
                          GADATASET,
@@ -81,12 +86,13 @@ struct _GADatasetKeyValuePartitioningOptionsClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_11_0
+GADATASET_AVAILABLE_IN_11_0
 GADatasetKeyValuePartitioningOptions *
 gadataset_key_value_partitioning_options_new(void);
 
 #define GADATASET_TYPE_KEY_VALUE_PARTITIONING                                            \
   (gadataset_key_value_partitioning_get_type())
+GADATASET_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(GADatasetKeyValuePartitioning,
                          gadataset_key_value_partitioning,
                          GADATASET,
@@ -99,6 +105,7 @@ struct _GADatasetKeyValuePartitioningClass
 
 #define GADATASET_TYPE_DIRECTORY_PARTITIONING                                            \
   (gadataset_directory_partitioning_get_type())
+GADATASET_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(GADatasetDirectoryPartitioning,
                          gadataset_directory_partitioning,
                          GADATASET,
@@ -109,7 +116,7 @@ struct _GADatasetDirectoryPartitioningClass
   GADatasetKeyValuePartitioningClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_6_0
+GADATASET_AVAILABLE_IN_6_0
 GADatasetDirectoryPartitioning *
 gadataset_directory_partitioning_new(GArrowSchema *schema,
                                      GList *dictionaries,
@@ -118,6 +125,7 @@ gadataset_directory_partitioning_new(GArrowSchema *schema,
 
 #define GADATASET_TYPE_HIVE_PARTITIONING_OPTIONS                                         \
   (gadataset_hive_partitioning_options_get_type())
+GADATASET_AVAILABLE_IN_11_0
 G_DECLARE_DERIVABLE_TYPE(GADatasetHivePartitioningOptions,
                          gadataset_hive_partitioning_options,
                          GADATASET,
@@ -128,11 +136,12 @@ struct _GADatasetHivePartitioningOptionsClass
   GADatasetKeyValuePartitioningOptionsClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_11_0
+GADATASET_AVAILABLE_IN_11_0
 GADatasetHivePartitioningOptions *
 gadataset_hive_partitioning_options_new(void);
 
 #define GADATASET_TYPE_HIVE_PARTITIONING (gadataset_hive_partitioning_get_type())
+GADATASET_AVAILABLE_IN_11_0
 G_DECLARE_DERIVABLE_TYPE(GADatasetHivePartitioning,
                          gadataset_hive_partitioning,
                          GADATASET,
@@ -143,13 +152,13 @@ struct _GADatasetHivePartitioningClass
   GADatasetKeyValuePartitioningClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_11_0
+GADATASET_AVAILABLE_IN_11_0
 GADatasetHivePartitioning *
 gadataset_hive_partitioning_new(GArrowSchema *schema,
                                 GList *dictionaries,
                                 GADatasetHivePartitioningOptions *options,
                                 GError **error);
-GARROW_AVAILABLE_IN_11_0
+GADATASET_AVAILABLE_IN_11_0
 gchar *
 gadataset_hive_partitioning_get_null_fallback(GADatasetHivePartitioning *partitioning);
 
diff --git a/c_glib/arrow-dataset-glib/scanner.cpp b/c_glib/arrow-dataset-glib/scanner.cpp
index 717532db9220f..28af1f16e5968 100644
--- a/c_glib/arrow-dataset-glib/scanner.cpp
+++ b/c_glib/arrow-dataset-glib/scanner.cpp
@@ -128,6 +128,28 @@ gadataset_scanner_to_table(GADatasetScanner *scanner, GError **error)
   }
 }
 
+/**
+ * gadataset_scanner_to_record_batch_reader:
+ * @scanner: A #GADatasetScanner.
+ * @error: (nullable): Return location for a #GError or %NULL.
+ *
+ * Returns: (transfer full) (nullable):
+ *   A #GArrowRecordBatchReader on success, %NULL on error.
+ *
+ * Since: 17.0.0
+ */
+GArrowRecordBatchReader *
+gadataset_scanner_to_record_batch_reader(GADatasetScanner *scanner, GError **error)
+{
+  auto arrow_scanner = gadataset_scanner_get_raw(scanner);
+  auto arrow_reader_result = arrow_scanner->ToRecordBatchReader();
+  if (!garrow::check(error, arrow_reader_result, "[scanner][to-record-batch-reader]")) {
+    return nullptr;
+  }
+  auto sources = g_list_prepend(nullptr, scanner);
+  return garrow_record_batch_reader_new_raw(&(*arrow_reader_result), sources);
+}
+
 typedef struct GADatasetScannerBuilderPrivate_
 {
   std::shared_ptr<arrow::dataset::ScannerBuilder> scanner_builder;
diff --git a/c_glib/arrow-dataset-glib/scanner.h b/c_glib/arrow-dataset-glib/scanner.h
index 3c7432fb268e4..d92eca5ab8420 100644
--- a/c_glib/arrow-dataset-glib/scanner.h
+++ b/c_glib/arrow-dataset-glib/scanner.h
@@ -21,21 +21,28 @@
 
 #include <arrow-dataset-glib/dataset-definition.h>
 #include <arrow-dataset-glib/fragment.h>
+#include <arrow-dataset-glib/version.h>
 
 G_BEGIN_DECLS
 
 #define GADATASET_TYPE_SCANNER (gadataset_scanner_get_type())
+GADATASET_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GADatasetScanner, gadataset_scanner, GADATASET, SCANNER, GObject)
 struct _GADatasetScannerClass
 {
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_5_0
+GADATASET_AVAILABLE_IN_5_0
 GArrowTable *
 gadataset_scanner_to_table(GADatasetScanner *scanner, GError **error);
 
+GADATASET_AVAILABLE_IN_17_0
+GArrowRecordBatchReader *
+gadataset_scanner_to_record_batch_reader(GADatasetScanner *scanner, GError **error);
+
 #define GADATASET_TYPE_SCANNER_BUILDER (gadataset_scanner_builder_get_type())
+GADATASET_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GADatasetScannerBuilder, gadataset_scanner_builder, GADATASET, SCANNER_BUILDER, GObject)
 struct _GADatasetScannerBuilderClass
@@ -43,20 +50,20 @@ struct _GADatasetScannerBuilderClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_5_0
+GADATASET_AVAILABLE_IN_5_0
 GADatasetScannerBuilder *
 gadataset_scanner_builder_new(GADatasetDataset *dataset, GError **error);
-GARROW_AVAILABLE_IN_6_0
+GADATASET_AVAILABLE_IN_6_0
 GADatasetScannerBuilder *
 gadataset_scanner_builder_new_record_batch_reader(GArrowRecordBatchReader *reader);
 
-GARROW_AVAILABLE_IN_6_0
+GADATASET_AVAILABLE_IN_6_0
 gboolean
 gadataset_scanner_builder_set_filter(GADatasetScannerBuilder *builder,
                                      GArrowExpression *expression,
                                      GError **error);
 
-GARROW_AVAILABLE_IN_5_0
+GADATASET_AVAILABLE_IN_5_0
 GADatasetScanner *
 gadataset_scanner_builder_finish(GADatasetScannerBuilder *builder, GError **error);
 
diff --git a/c_glib/arrow-dataset-glib/version.h.in b/c_glib/arrow-dataset-glib/version.h.in
new file mode 100644
index 0000000000000..7e678bda3a875
--- /dev/null
+++ b/c_glib/arrow-dataset-glib/version.h.in
@@ -0,0 +1,159 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <arrow-glib/version.h>
+
+/**
+ * SECTION: version
+ * @section_id: version-macros
+ * @title: Version related macros
+ * @include: arrow-dataset-glib/arrow-dataset-glib.h
+ *
+ * Apache Arrow Dataset GLib provides macros that can be used by C pre-processor.
+ * They are useful to check version related things at compile time.
+ */
+
+/**
+ * GADATASET_VERSION_MAJOR:
+ *
+ * The major version.
+ *
+ * Since: 17.0.0
+ */
+#define GADATASET_VERSION_MAJOR (@VERSION_MAJOR@)
+
+/**
+ * GADATASET_VERSION_MINOR:
+ *
+ * The minor version.
+ *
+ * Since: 17.0.0
+ */
+#define GADATASET_VERSION_MINOR (@VERSION_MINOR@)
+
+/**
+ * GADATASET_VERSION_MICRO:
+ *
+ * The micro version.
+ *
+ * Since: 17.0.0
+ */
+#define GADATASET_VERSION_MICRO (@VERSION_MICRO@)
+
+/**
+ * GADATASET_VERSION_TAG:
+ *
+ * The version tag. Normally, it's an empty string. It's "SNAPSHOT"
+ * for snapshot version.
+ *
+ * Since: 17.0.0
+ */
+#define GADATASET_VERSION_TAG   "@VERSION_TAG@"
+
+/**
+ * GADATASET_VERSION_CHECK:
+ * @major: A major version to check for.
+ * @minor: A minor version to check for.
+ * @micro: A micro version to check for.
+ *
+ * You can use this macro in C pre-processor.
+ *
+ * Returns: %TRUE if the compile time Apache Arrow GLib version is the
+ *   same as or newer than the passed version, %FALSE otherwise.
+ *
+ * Since: 17.0.0
+ */
+#define GADATASET_VERSION_CHECK(major, minor, micro)       \
+  (GADATASET_VERSION_MAJOR > (major) ||                    \
+   (GADATASET_VERSION_MAJOR == (major) &&                  \
+    GADATASET_VERSION_MINOR > (minor)) ||                  \
+   (GADATASET_VERSION_MAJOR == (major) &&                  \
+    GADATASET_VERSION_MINOR == (minor) &&                  \
+    GADATASET_VERSION_MICRO >= (micro)))
+
+/**
+ * GADATASET_DISABLE_DEPRECATION_WARNINGS:
+ *
+ * If this macro is defined, no deprecated warnings are produced.
+ *
+ * You must define this macro before including the
+ * arrow-glib/arrow-glib.h header.
+ *
+ * Since: 17.0.0
+ */
+
+#ifdef GADATASET_DISABLE_DEPRECATION_WARNINGS
+#  define GADATASET_DEPRECATED
+#  define GADATASET_DEPRECATED_FOR(function)
+#  define GADATASET_UNAVAILABLE(major, minor)
+#else
+#  define GADATASET_DEPRECATED G_DEPRECATED
+#  define GADATASET_DEPRECATED_FOR(function) G_DEPRECATED_FOR(function)
+#  define GADATASET_UNAVAILABLE(major, minor) G_UNAVAILABLE(major, minor)
+#endif
+
+@ENCODED_VERSIONS@
+
+/**
+ * GADATASET_VERSION_MIN_REQUIRED:
+ *
+ * You can use this macro for compile time API version check.
+ *
+ * This macro value must be one of the predefined version macros such
+ * as %GADATASET_VERSION_0_10.
+ *
+ * If you use any functions that is defined by newer version than
+ * %GADATASET_VERSION_MIN_REQUIRED, deprecated warnings are produced at
+ * compile time.
+ *
+ * You must define this macro before including the
+ * arrow-dataset-glib/arrow-dataset-glib.h header.
+ *
+ * Since: 17.0.0
+ */
+#ifndef GADATASET_VERSION_MIN_REQUIRED
+#  define GADATASET_VERSION_MIN_REQUIRED GARROW_VERSION_MIN_REQUIRED
+#endif
+
+/**
+ * GADATASET_VERSION_MAX_ALLOWED:
+ *
+ * You can use this macro for compile time API version check.
+ *
+ * This macro value must be one of the predefined version macros such
+ * as %GADATASET_VERSION_0_10.
+ *
+ * If you use any functions that is defined by newer version than
+ * %GADATASET_VERSION_MAX_ALLOWED, deprecated warnings are produced at
+ * compile time.
+ *
+ * You must define this macro before including the
+ * arrow-dataset-glib/arrow-dataset-glib.h header.
+ *
+ * Since: 17.0.0
+ */
+#ifndef GADATASET_VERSION_MAX_ALLOWED
+#  define GADATASET_VERSION_MAX_ALLOWED GARROW_VERSION_MAX_ALLOWED
+#endif
+
+@VISIBILITY_MACROS@
+
+@AVAILABILITY_MACROS@
diff --git a/c_glib/arrow-flight-glib/arrow-flight-glib.h b/c_glib/arrow-flight-glib/arrow-flight-glib.h
index 6fc8f43d8406e..7e973dd125dd4 100644
--- a/c_glib/arrow-flight-glib/arrow-flight-glib.h
+++ b/c_glib/arrow-flight-glib/arrow-flight-glib.h
@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include <arrow-flight-glib/version.h>
+
 #include <arrow-flight-glib/client.h>
 #include <arrow-flight-glib/common.h>
 #include <arrow-flight-glib/server.h>
diff --git a/c_glib/arrow-flight-glib/client.h b/c_glib/arrow-flight-glib/client.h
index f67d58371d583..a91bbe55e3c04 100644
--- a/c_glib/arrow-flight-glib/client.h
+++ b/c_glib/arrow-flight-glib/client.h
@@ -24,6 +24,7 @@
 G_BEGIN_DECLS
 
 #define GAFLIGHT_TYPE_STREAM_READER (gaflight_stream_reader_get_type())
+GAFLIGHT_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightStreamReader,
                          gaflight_stream_reader,
                          GAFLIGHT,
@@ -35,6 +36,7 @@ struct _GAFlightStreamReaderClass
 };
 
 #define GAFLIGHT_TYPE_CALL_OPTIONS (gaflight_call_options_get_type())
+GAFLIGHT_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GAFlightCallOptions, gaflight_call_options, GAFLIGHT, CALL_OPTIONS, GObject)
 struct _GAFlightCallOptionsClass
@@ -42,25 +44,26 @@ struct _GAFlightCallOptionsClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 GAFlightCallOptions *
 gaflight_call_options_new(void);
 
-GARROW_AVAILABLE_IN_9_0
+GAFLIGHT_AVAILABLE_IN_9_0
 void
 gaflight_call_options_add_header(GAFlightCallOptions *options,
                                  const gchar *name,
                                  const gchar *value);
-GARROW_AVAILABLE_IN_9_0
+GAFLIGHT_AVAILABLE_IN_9_0
 void
 gaflight_call_options_clear_headers(GAFlightCallOptions *options);
-GARROW_AVAILABLE_IN_9_0
+GAFLIGHT_AVAILABLE_IN_9_0
 void
 gaflight_call_options_foreach_header(GAFlightCallOptions *options,
                                      GAFlightHeaderFunc func,
                                      gpointer user_data);
 
 #define GAFLIGHT_TYPE_CLIENT_OPTIONS (gaflight_client_options_get_type())
+GAFLIGHT_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GAFlightClientOptions, gaflight_client_options, GAFLIGHT, CLIENT_OPTIONS, GObject)
 struct _GAFlightClientOptionsClass
@@ -68,28 +71,29 @@ struct _GAFlightClientOptionsClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 GAFlightClientOptions *
 gaflight_client_options_new(void);
 
 #define GAFLIGHT_TYPE_CLIENT (gaflight_client_get_type())
+GAFLIGHT_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightClient, gaflight_client, GAFLIGHT, CLIENT, GObject)
 struct _GAFlightClientClass
 {
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 GAFlightClient *
 gaflight_client_new(GAFlightLocation *location,
                     GAFlightClientOptions *options,
                     GError **error);
 
-GARROW_AVAILABLE_IN_8_0
+GAFLIGHT_AVAILABLE_IN_8_0
 gboolean
 gaflight_client_close(GAFlightClient *client, GError **error);
 
-GARROW_AVAILABLE_IN_12_0
+GAFLIGHT_AVAILABLE_IN_12_0
 gboolean
 gaflight_client_authenticate_basic_token(GAFlightClient *client,
                                          const gchar *user,
@@ -99,21 +103,21 @@ gaflight_client_authenticate_basic_token(GAFlightClient *client,
                                          gchar **bearer_value,
                                          GError **error);
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 GList *
 gaflight_client_list_flights(GAFlightClient *client,
                              GAFlightCriteria *criteria,
                              GAFlightCallOptions *options,
                              GError **error);
 
-GARROW_AVAILABLE_IN_9_0
+GAFLIGHT_AVAILABLE_IN_9_0
 GAFlightInfo *
 gaflight_client_get_flight_info(GAFlightClient *client,
                                 GAFlightDescriptor *descriptor,
                                 GAFlightCallOptions *options,
                                 GError **error);
 
-GARROW_AVAILABLE_IN_6_0
+GAFLIGHT_AVAILABLE_IN_6_0
 GAFlightStreamReader *
 gaflight_client_do_get(GAFlightClient *client,
                        GAFlightTicket *ticket,
diff --git a/c_glib/arrow-flight-glib/client.hpp b/c_glib/arrow-flight-glib/client.hpp
index 6d7bdcecf3006..185a28e6dc4bd 100644
--- a/c_glib/arrow-flight-glib/client.hpp
+++ b/c_glib/arrow-flight-glib/client.hpp
@@ -23,17 +23,23 @@
 
 #include <arrow-flight-glib/client.h>
 
+GAFLIGHT_EXTERN
 GAFlightStreamReader *
 gaflight_stream_reader_new_raw(arrow::flight::FlightStreamReader *flight_reader,
                                gboolean is_owner);
 
+GAFLIGHT_EXTERN
 arrow::flight::FlightCallOptions *
 gaflight_call_options_get_raw(GAFlightCallOptions *options);
 
+GAFLIGHT_EXTERN
 arrow::flight::FlightClientOptions *
 gaflight_client_options_get_raw(GAFlightClientOptions *options);
 
+GAFLIGHT_EXTERN
 std::shared_ptr<arrow::flight::FlightClient>
 gaflight_client_get_raw(GAFlightClient *client);
+
+GAFLIGHT_EXTERN
 GAFlightClient *
 gaflight_client_new_raw(std::shared_ptr<arrow::flight::FlightClient> *flight_client);
diff --git a/c_glib/arrow-flight-glib/common.h b/c_glib/arrow-flight-glib/common.h
index fcb23b1885ea7..b1d89f79c357e 100644
--- a/c_glib/arrow-flight-glib/common.h
+++ b/c_glib/arrow-flight-glib/common.h
@@ -21,6 +21,8 @@
 
 #include <arrow-glib/arrow-glib.h>
 
+#include <arrow-flight-glib/version.h>
+
 G_BEGIN_DECLS
 
 typedef void (*GAFlightHeaderFunc)(const gchar *name,
@@ -28,40 +30,43 @@ typedef void (*GAFlightHeaderFunc)(const gchar *name,
                                    gpointer user_data);
 
 #define GAFLIGHT_TYPE_CRITERIA (gaflight_criteria_get_type())
+GAFLIGHT_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightCriteria, gaflight_criteria, GAFLIGHT, CRITERIA, GObject)
 struct _GAFlightCriteriaClass
 {
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 GAFlightCriteria *
 gaflight_criteria_new(GBytes *expression);
 
 #define GAFLIGHT_TYPE_LOCATION (gaflight_location_get_type())
+GAFLIGHT_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightLocation, gaflight_location, GAFLIGHT, LOCATION, GObject)
 struct _GAFlightLocationClass
 {
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 GAFlightLocation *
 gaflight_location_new(const gchar *uri, GError **error);
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 gchar *
 gaflight_location_to_string(GAFlightLocation *location);
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 gchar *
 gaflight_location_get_scheme(GAFlightLocation *location);
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 gboolean
 gaflight_location_equal(GAFlightLocation *location, GAFlightLocation *other_location);
 
 #define GAFLIGHT_TYPE_DESCRIPTOR (gaflight_descriptor_get_type())
+GAFLIGHT_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GAFlightDescriptor, gaflight_descriptor, GAFLIGHT, DESCRIPTOR, GObject)
 struct _GAFlightDescriptorClass
@@ -69,16 +74,17 @@ struct _GAFlightDescriptorClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 gchar *
 gaflight_descriptor_to_string(GAFlightDescriptor *descriptor);
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 gboolean
 gaflight_descriptor_equal(GAFlightDescriptor *descriptor,
                           GAFlightDescriptor *other_descriptor);
 
 #define GAFLIGHT_TYPE_PATH_DESCRIPTOR (gaflight_path_descriptor_get_type())
+GAFLIGHT_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightPathDescriptor,
                          gaflight_path_descriptor,
                          GAFLIGHT,
@@ -89,15 +95,16 @@ struct _GAFlightPathDescriptorClass
   GAFlightDescriptorClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 GAFlightPathDescriptor *
 gaflight_path_descriptor_new(const gchar **paths, gsize n_paths);
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 gchar **
 gaflight_path_descriptor_get_paths(GAFlightPathDescriptor *descriptor);
 
 #define GAFLIGHT_TYPE_COMMAND_DESCRIPTOR (gaflight_command_descriptor_get_type())
+GAFLIGHT_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightCommandDescriptor,
                          gaflight_command_descriptor,
                          GAFLIGHT,
@@ -108,56 +115,59 @@ struct _GAFlightCommandDescriptorClass
   GAFlightDescriptorClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 GAFlightCommandDescriptor *
 gaflight_command_descriptor_new(const gchar *command);
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 gchar *
 gaflight_command_descriptor_get_command(GAFlightCommandDescriptor *descriptor);
 
 #define GAFLIGHT_TYPE_TICKET (gaflight_ticket_get_type())
+GAFLIGHT_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightTicket, gaflight_ticket, GAFLIGHT, TICKET, GObject)
 struct _GAFlightTicketClass
 {
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 GAFlightTicket *
 gaflight_ticket_new(GBytes *data);
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 gboolean
 gaflight_ticket_equal(GAFlightTicket *ticket, GAFlightTicket *other_ticket);
 
 #define GAFLIGHT_TYPE_ENDPOINT (gaflight_endpoint_get_type())
+GAFLIGHT_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightEndpoint, gaflight_endpoint, GAFLIGHT, ENDPOINT, GObject)
 struct _GAFlightEndpointClass
 {
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 GAFlightEndpoint *
 gaflight_endpoint_new(GAFlightTicket *ticket, GList *locations);
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 gboolean
 gaflight_endpoint_equal(GAFlightEndpoint *endpoint, GAFlightEndpoint *other_endpoint);
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 GList *
 gaflight_endpoint_get_locations(GAFlightEndpoint *endpoint);
 
 #define GAFLIGHT_TYPE_INFO (gaflight_info_get_type())
+GAFLIGHT_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightInfo, gaflight_info, GAFLIGHT, INFO, GObject)
 struct _GAFlightInfoClass
 {
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 GAFlightInfo *
 gaflight_info_new(GArrowSchema *schema,
                   GAFlightDescriptor *descriptor,
@@ -166,27 +176,28 @@ gaflight_info_new(GArrowSchema *schema,
                   gint64 total_bytes,
                   GError **error);
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 gboolean
 gaflight_info_equal(GAFlightInfo *info, GAFlightInfo *other_info);
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 GArrowSchema *
 gaflight_info_get_schema(GAFlightInfo *info, GArrowReadOptions *options, GError **error);
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 GAFlightDescriptor *
 gaflight_info_get_descriptor(GAFlightInfo *info);
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 GList *
 gaflight_info_get_endpoints(GAFlightInfo *info);
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 gint64
 gaflight_info_get_total_records(GAFlightInfo *info);
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 gint64
 gaflight_info_get_total_bytes(GAFlightInfo *info);
 
 #define GAFLIGHT_TYPE_STREAM_CHUNK (gaflight_stream_chunk_get_type())
+GAFLIGHT_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(
   GAFlightStreamChunk, gaflight_stream_chunk, GAFLIGHT, STREAM_CHUNK, GObject)
 struct _GAFlightStreamChunkClass
@@ -194,14 +205,15 @@ struct _GAFlightStreamChunkClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_6_0
+GAFLIGHT_AVAILABLE_IN_6_0
 GArrowRecordBatch *
 gaflight_stream_chunk_get_data(GAFlightStreamChunk *chunk);
-GARROW_AVAILABLE_IN_6_0
+GAFLIGHT_AVAILABLE_IN_6_0
 GArrowBuffer *
 gaflight_stream_chunk_get_metadata(GAFlightStreamChunk *chunk);
 
 #define GAFLIGHT_TYPE_RECORD_BATCH_READER (gaflight_record_batch_reader_get_type())
+GAFLIGHT_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightRecordBatchReader,
                          gaflight_record_batch_reader,
                          GAFLIGHT,
@@ -212,11 +224,11 @@ struct _GAFlightRecordBatchReaderClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_6_0
+GAFLIGHT_AVAILABLE_IN_6_0
 GAFlightStreamChunk *
 gaflight_record_batch_reader_read_next(GAFlightRecordBatchReader *reader, GError **error);
 
-GARROW_AVAILABLE_IN_6_0
+GAFLIGHT_AVAILABLE_IN_6_0
 GArrowTable *
 gaflight_record_batch_reader_read_all(GAFlightRecordBatchReader *reader, GError **error);
 
diff --git a/c_glib/arrow-flight-glib/common.hpp b/c_glib/arrow-flight-glib/common.hpp
index b748d6f382184..db56fff579baf 100644
--- a/c_glib/arrow-flight-glib/common.hpp
+++ b/c_glib/arrow-flight-glib/common.hpp
@@ -23,39 +23,59 @@
 
 #include <arrow-flight-glib/common.h>
 
+GAFLIGHT_EXTERN
 GAFlightCriteria *
 gaflight_criteria_new_raw(const arrow::flight::Criteria *flight_criteria);
+
+GAFLIGHT_EXTERN
 arrow::flight::Criteria *
 gaflight_criteria_get_raw(GAFlightCriteria *criteria);
 
+GAFLIGHT_EXTERN
 arrow::flight::Location *
 gaflight_location_get_raw(GAFlightLocation *location);
 
+GAFLIGHT_EXTERN
 GAFlightDescriptor *
 gaflight_descriptor_new_raw(const arrow::flight::FlightDescriptor *flight_descriptor);
+
+GAFLIGHT_EXTERN
 arrow::flight::FlightDescriptor *
 gaflight_descriptor_get_raw(GAFlightDescriptor *descriptor);
 
+GAFLIGHT_EXTERN
 GAFlightTicket *
 gaflight_ticket_new_raw(const arrow::flight::Ticket *flight_ticket);
+
+GAFLIGHT_EXTERN
 arrow::flight::Ticket *
 gaflight_ticket_get_raw(GAFlightTicket *ticket);
 
+GAFLIGHT_EXTERN
 GAFlightEndpoint *
 gaflight_endpoint_new_raw(const arrow::flight::FlightEndpoint *flight_endpoint,
                           GAFlightTicket *ticket);
+
+GAFLIGHT_EXTERN
 arrow::flight::FlightEndpoint *
 gaflight_endpoint_get_raw(GAFlightEndpoint *endpoint);
 
+GAFLIGHT_EXTERN
 GAFlightInfo *
 gaflight_info_new_raw(arrow::flight::FlightInfo *flight_info);
+
+GAFLIGHT_EXTERN
 arrow::flight::FlightInfo *
 gaflight_info_get_raw(GAFlightInfo *info);
 
+GAFLIGHT_EXTERN
 GAFlightStreamChunk *
 gaflight_stream_chunk_new_raw(arrow::flight::FlightStreamChunk *flight_chunk);
+
+GAFLIGHT_EXTERN
 arrow::flight::FlightStreamChunk *
 gaflight_stream_chunk_get_raw(GAFlightStreamChunk *chunk);
 
+GAFLIGHT_EXTERN
 arrow::flight::MetadataRecordBatchReader *
 gaflight_record_batch_reader_get_raw(GAFlightRecordBatchReader *reader);
diff --git a/c_glib/arrow-flight-glib/meson.build b/c_glib/arrow-flight-glib/meson.build
index 70db7400b124a..c1422e0d10a7d 100644
--- a/c_glib/arrow-flight-glib/meson.build
+++ b/c_glib/arrow-flight-glib/meson.build
@@ -37,6 +37,14 @@ cpp_headers = files(
   'server.hpp',
 )
 
+version_h = configure_file(
+  input: 'version.h.in',
+  output: 'version.h',
+  command: [python3, generate_version_header_py, '--library', 'GAFLIGHT', '--version', version, '--input', '@INPUT@', '--output', '@OUTPUT@'],
+)
+
+c_headers += version_h
+
 headers = c_headers + cpp_headers
 install_headers(headers, subdir: 'arrow-flight-glib')
 
@@ -50,6 +58,7 @@ libarrow_flight_glib = library('arrow-flight-glib',
                                dependencies: dependencies,
                                implicit_include_directories: false,
                                include_directories: base_include_directories,
+                               cpp_args: ['-DGAFLIGHT_COMPILATION'],
                                soversion: so_version,
                                version: library_version)
 arrow_flight_glib = declare_dependency(link_with: libarrow_flight_glib,
diff --git a/c_glib/arrow-flight-glib/server.h b/c_glib/arrow-flight-glib/server.h
index 89f5a0a596e9e..7e594febb172f 100644
--- a/c_glib/arrow-flight-glib/server.h
+++ b/c_glib/arrow-flight-glib/server.h
@@ -24,6 +24,7 @@
 G_BEGIN_DECLS
 
 #define GAFLIGHT_TYPE_DATA_STREAM (gaflight_data_stream_get_type())
+GAFLIGHT_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(
   GAFlightDataStream, gaflight_data_stream, GAFLIGHT, DATA_STREAM, GObject)
 struct _GAFlightDataStreamClass
@@ -32,6 +33,7 @@ struct _GAFlightDataStreamClass
 };
 
 #define GAFLIGHT_TYPE_RECORD_BATCH_STREAM (gaflight_record_batch_stream_get_type())
+GAFLIGHT_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightRecordBatchStream,
                          gaflight_record_batch_stream,
                          GAFLIGHT,
@@ -42,12 +44,13 @@ struct _GAFlightRecordBatchStreamClass
   GAFlightDataStreamClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_6_0
+GAFLIGHT_AVAILABLE_IN_6_0
 GAFlightRecordBatchStream *
 gaflight_record_batch_stream_new(GArrowRecordBatchReader *reader,
                                  GArrowWriteOptions *options);
 
 #define GAFLIGHT_TYPE_MESSAGE_READER (gaflight_message_reader_get_type())
+GAFLIGHT_AVAILABLE_IN_14_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightMessageReader,
                          gaflight_message_reader,
                          GAFLIGHT,
@@ -58,11 +61,12 @@ struct _GAFlightMessageReaderClass
   GAFlightRecordBatchReaderClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHT_AVAILABLE_IN_14_0
 GAFlightDescriptor *
 gaflight_message_reader_get_descriptor(GAFlightMessageReader *reader);
 
 #define GAFLIGHT_TYPE_SERVER_CALL_CONTEXT (gaflight_server_call_context_get_type())
+GAFLIGHT_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightServerCallContext,
                          gaflight_server_call_context,
                          GAFLIGHT,
@@ -73,13 +77,14 @@ struct _GAFlightServerCallContextClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHT_AVAILABLE_IN_14_0
 void
 gaflight_server_call_context_foreach_incoming_header(GAFlightServerCallContext *context,
                                                      GAFlightHeaderFunc func,
                                                      gpointer user_data);
 
 #define GAFLIGHT_TYPE_SERVER_AUTH_SENDER (gaflight_server_auth_sender_get_type())
+GAFLIGHT_AVAILABLE_IN_12_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightServerAuthSender,
                          gaflight_server_auth_sender,
                          GAFLIGHT,
@@ -90,13 +95,14 @@ struct _GAFlightServerAuthSenderClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_12_0
+GAFLIGHT_AVAILABLE_IN_12_0
 gboolean
 gaflight_server_auth_sender_write(GAFlightServerAuthSender *sender,
                                   GBytes *message,
                                   GError **error);
 
 #define GAFLIGHT_TYPE_SERVER_AUTH_READER (gaflight_server_auth_reader_get_type())
+GAFLIGHT_AVAILABLE_IN_12_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightServerAuthReader,
                          gaflight_server_auth_reader,
                          GAFLIGHT,
@@ -107,11 +113,12 @@ struct _GAFlightServerAuthReaderClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_12_0
+GAFLIGHT_AVAILABLE_IN_12_0
 GBytes *
 gaflight_server_auth_reader_read(GAFlightServerAuthReader *reader, GError **error);
 
 #define GAFLIGHT_TYPE_SERVER_AUTH_HANDLER (gaflight_server_auth_handler_get_type())
+GAFLIGHT_AVAILABLE_IN_12_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightServerAuthHandler,
                          gaflight_server_auth_handler,
                          GAFLIGHT,
@@ -124,6 +131,7 @@ struct _GAFlightServerAuthHandlerClass
 
 #define GAFLIGHT_TYPE_SERVER_CUSTOM_AUTH_HANDLER                                         \
   (gaflight_server_custom_auth_handler_get_type())
+GAFLIGHT_AVAILABLE_IN_12_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightServerCustomAuthHandler,
                          gaflight_server_custom_auth_handler,
                          GAFLIGHT,
@@ -152,7 +160,7 @@ struct _GAFlightServerCustomAuthHandlerClass
                       GError **error);
 };
 
-GARROW_AVAILABLE_IN_12_0
+GAFLIGHT_AVAILABLE_IN_12_0
 void
 gaflight_server_custom_auth_handler_authenticate(GAFlightServerCustomAuthHandler *handler,
                                                  GAFlightServerCallContext *context,
@@ -160,7 +168,7 @@ gaflight_server_custom_auth_handler_authenticate(GAFlightServerCustomAuthHandler
                                                  GAFlightServerAuthReader *reader,
                                                  GError **error);
 
-GARROW_AVAILABLE_IN_12_0
+GAFLIGHT_AVAILABLE_IN_12_0
 GBytes *
 gaflight_server_custom_auth_handler_is_valid(GAFlightServerCustomAuthHandler *handler,
                                              GAFlightServerCallContext *context,
@@ -168,6 +176,7 @@ gaflight_server_custom_auth_handler_is_valid(GAFlightServerCustomAuthHandler *ha
                                              GError **error);
 
 #define GAFLIGHT_TYPE_SERVER_OPTIONS (gaflight_server_options_get_type())
+GAFLIGHT_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GAFlightServerOptions, gaflight_server_options, GAFLIGHT, SERVER_OPTIONS, GObject)
 struct _GAFlightServerOptionsClass
@@ -175,14 +184,16 @@ struct _GAFlightServerOptionsClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 GAFlightServerOptions *
 gaflight_server_options_new(GAFlightLocation *location);
 
 #define GAFLIGHT_TYPE_SERVABLE (gaflight_servable_get_type())
+GAFLIGHT_AVAILABLE_IN_9_0
 G_DECLARE_INTERFACE(GAFlightServable, gaflight_servable, GAFLIGHT, SERVABLE, GObject)
 
 #define GAFLIGHT_TYPE_SERVER (gaflight_server_get_type())
+GAFLIGHT_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightServer, gaflight_server, GAFLIGHT, SERVER, GObject)
 /**
  * GAFlightServerClass:
@@ -209,34 +220,34 @@ struct _GAFlightServerClass
                                 GError **error);
 };
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 gboolean
 gaflight_server_listen(GAFlightServer *server,
                        GAFlightServerOptions *options,
                        GError **error);
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 gint
 gaflight_server_get_port(GAFlightServer *server);
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 gboolean
 gaflight_server_shutdown(GAFlightServer *server, GError **error);
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 gboolean
 gaflight_server_wait(GAFlightServer *server, GError **error);
 
-GARROW_AVAILABLE_IN_5_0
+GAFLIGHT_AVAILABLE_IN_5_0
 GList *
 gaflight_server_list_flights(GAFlightServer *server,
                              GAFlightServerCallContext *context,
                              GAFlightCriteria *criteria,
                              GError **error);
-GARROW_AVAILABLE_IN_9_0
+GAFLIGHT_AVAILABLE_IN_9_0
 GAFlightInfo *
 gaflight_server_get_flight_info(GAFlightServer *server,
                                 GAFlightServerCallContext *context,
                                 GAFlightDescriptor *request,
                                 GError **error);
-GARROW_AVAILABLE_IN_6_0
+GAFLIGHT_AVAILABLE_IN_6_0
 GAFlightDataStream *
 gaflight_server_do_get(GAFlightServer *server,
                        GAFlightServerCallContext *context,
diff --git a/c_glib/arrow-flight-glib/server.hpp b/c_glib/arrow-flight-glib/server.hpp
index 70da867d5b0e9..ec4815751c8d8 100644
--- a/c_glib/arrow-flight-glib/server.hpp
+++ b/c_glib/arrow-flight-glib/server.hpp
@@ -23,34 +23,49 @@
 
 #include <arrow-flight-glib/server.h>
 
+GAFLIGHT_EXTERN
 arrow::flight::FlightDataStream *
 gaflight_data_stream_get_raw(GAFlightDataStream *stream);
 
+GAFLIGHT_EXTERN
 GAFlightMessageReader *
 gaflight_message_reader_new_raw(arrow::flight::FlightMessageReader *flight_reader,
                                 gboolean is_owner);
+
+GAFLIGHT_EXTERN
 arrow::flight::FlightMessageReader *
 gaflight_message_reader_get_raw(GAFlightMessageReader *reader);
 
+GAFLIGHT_EXTERN
 GAFlightServerCallContext *
 gaflight_server_call_context_new_raw(
   const arrow::flight::ServerCallContext *flight_call_context);
+
+GAFLIGHT_EXTERN
 const arrow::flight::ServerCallContext *
 gaflight_server_call_context_get_raw(GAFlightServerCallContext *call_context);
 
+GAFLIGHT_EXTERN
 GAFlightServerAuthSender *
 gaflight_server_auth_sender_new_raw(arrow::flight::ServerAuthSender *flight_sender);
+
+GAFLIGHT_EXTERN
 arrow::flight::ServerAuthSender *
 gaflight_server_auth_sender_get_raw(GAFlightServerAuthSender *sender);
 
+GAFLIGHT_EXTERN
 GAFlightServerAuthReader *
 gaflight_server_auth_reader_new_raw(arrow::flight::ServerAuthReader *flight_reader);
+
+GAFLIGHT_EXTERN
 arrow::flight::ServerAuthReader *
 gaflight_server_auth_reader_get_raw(GAFlightServerAuthReader *reader);
 
+GAFLIGHT_EXTERN
 std::shared_ptr<arrow::flight::ServerAuthHandler>
 gaflight_server_auth_handler_get_raw(GAFlightServerAuthHandler *handler);
 
+GAFLIGHT_EXTERN
 arrow::flight::FlightServerOptions *
 gaflight_server_options_get_raw(GAFlightServerOptions *options);
 
@@ -61,6 +76,7 @@ struct _GAFlightServableInterface
   arrow::flight::FlightServerBase *(*get_raw)(GAFlightServable *servable);
 };
 
+GAFLIGHT_EXTERN
 arrow::flight::FlightServerBase *
 gaflight_servable_get_raw(GAFlightServable *servable);
 
diff --git a/c_glib/arrow-flight-glib/version.h.in b/c_glib/arrow-flight-glib/version.h.in
new file mode 100644
index 0000000000000..4a42c7f5aa91e
--- /dev/null
+++ b/c_glib/arrow-flight-glib/version.h.in
@@ -0,0 +1,159 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <arrow-glib/version.h>
+
+/**
+ * SECTION: version
+ * @section_id: version-macros
+ * @title: Version related macros
+ * @include: arrow-flight-glib/arrow-flight-glib.h
+ *
+ * Apache Arrow Flight GLib provides macros that can be used by C pre-processor.
+ * They are useful to check version related things at compile time.
+ */
+
+/**
+ * GAFLIGHT_VERSION_MAJOR:
+ *
+ * The major version.
+ *
+ * Since: 17.0.0
+ */
+#define GAFLIGHT_VERSION_MAJOR (@VERSION_MAJOR@)
+
+/**
+ * GAFLIGHT_VERSION_MINOR:
+ *
+ * The minor version.
+ *
+ * Since: 17.0.0
+ */
+#define GAFLIGHT_VERSION_MINOR (@VERSION_MINOR@)
+
+/**
+ * GAFLIGHT_VERSION_MICRO:
+ *
+ * The micro version.
+ *
+ * Since: 17.0.0
+ */
+#define GAFLIGHT_VERSION_MICRO (@VERSION_MICRO@)
+
+/**
+ * GAFLIGHT_VERSION_TAG:
+ *
+ * The version tag. Normally, it's an empty string. It's "SNAPSHOT"
+ * for snapshot version.
+ *
+ * Since: 17.0.0
+ */
+#define GAFLIGHT_VERSION_TAG   "@VERSION_TAG@"
+
+/**
+ * GAFLIGHT_VERSION_CHECK:
+ * @major: A major version to check for.
+ * @minor: A minor version to check for.
+ * @micro: A micro version to check for.
+ *
+ * You can use this macro in C pre-processor.
+ *
+ * Returns: %TRUE if the compile time Apache Arrow GLib version is the
+ *   same as or newer than the passed version, %FALSE otherwise.
+ *
+ * Since: 17.0.0
+ */
+#define GAFLIGHT_VERSION_CHECK(major, minor, micro)       \
+  (GAFLIGHT_VERSION_MAJOR > (major) ||                    \
+   (GAFLIGHT_VERSION_MAJOR == (major) &&                  \
+    GAFLIGHT_VERSION_MINOR > (minor)) ||                  \
+   (GAFLIGHT_VERSION_MAJOR == (major) &&                  \
+    GAFLIGHT_VERSION_MINOR == (minor) &&                  \
+    GAFLIGHT_VERSION_MICRO >= (micro)))
+
+/**
+ * GAFLIGHT_DISABLE_DEPRECATION_WARNINGS:
+ *
+ * If this macro is defined, no deprecated warnings are produced.
+ *
+ * You must define this macro before including the
+ * arrow-glib/arrow-glib.h header.
+ *
+ * Since: 17.0.0
+ */
+
+#ifdef GAFLIGHT_DISABLE_DEPRECATION_WARNINGS
+#  define GAFLIGHT_DEPRECATED
+#  define GAFLIGHT_DEPRECATED_FOR(function)
+#  define GAFLIGHT_UNAVAILABLE(major, minor)
+#else
+#  define GAFLIGHT_DEPRECATED G_DEPRECATED
+#  define GAFLIGHT_DEPRECATED_FOR(function) G_DEPRECATED_FOR(function)
+#  define GAFLIGHT_UNAVAILABLE(major, minor) G_UNAVAILABLE(major, minor)
+#endif
+
+@ENCODED_VERSIONS@
+
+/**
+ * GAFLIGHT_VERSION_MIN_REQUIRED:
+ *
+ * You can use this macro for compile time API version check.
+ *
+ * This macro value must be one of the predefined version macros such
+ * as %GAFLIGHT_VERSION_0_10.
+ *
+ * If you use any functions that is defined by newer version than
+ * %GAFLIGHT_VERSION_MIN_REQUIRED, deprecated warnings are produced at
+ * compile time.
+ *
+ * You must define this macro before including the
+ * arrow-flight-glib/arrow-flight-glib.h header.
+ *
+ * Since: 17.0.0
+ */
+#ifndef GAFLIGHT_VERSION_MIN_REQUIRED
+#  define GAFLIGHT_VERSION_MIN_REQUIRED GARROW_VERSION_MIN_REQUIRED
+#endif
+
+/**
+ * GAFLIGHT_VERSION_MAX_ALLOWED:
+ *
+ * You can use this macro for compile time API version check.
+ *
+ * This macro value must be one of the predefined version macros such
+ * as %GAFLIGHT_VERSION_0_10.
+ *
+ * If you use any functions that is defined by newer version than
+ * %GAFLIGHT_VERSION_MAX_ALLOWED, deprecated warnings are produced at
+ * compile time.
+ *
+ * You must define this macro before including the
+ * arrow-flight-glib/arrow-flight-glib.h header.
+ *
+ * Since: 17.0.0
+ */
+#ifndef GAFLIGHT_VERSION_MAX_ALLOWED
+#  define GAFLIGHT_VERSION_MAX_ALLOWED GARROW_VERSION_MAX_ALLOWED
+#endif
+
+@VISIBILITY_MACROS@
+
+@AVAILABILITY_MACROS@
diff --git a/c_glib/arrow-flight-sql-glib/arrow-flight-sql-glib.h b/c_glib/arrow-flight-sql-glib/arrow-flight-sql-glib.h
index 8ebe39aee57a8..94e72d06f2b47 100644
--- a/c_glib/arrow-flight-sql-glib/arrow-flight-sql-glib.h
+++ b/c_glib/arrow-flight-sql-glib/arrow-flight-sql-glib.h
@@ -19,5 +19,7 @@
 
 #pragma once
 
+#include <arrow-flight-sql-glib/version.h>
+
 #include <arrow-flight-sql-glib/client.h>
 #include <arrow-flight-sql-glib/server.h>
diff --git a/c_glib/arrow-flight-sql-glib/client.h b/c_glib/arrow-flight-sql-glib/client.h
index 9a5a8987f7195..b9e9baf41a59f 100644
--- a/c_glib/arrow-flight-sql-glib/client.h
+++ b/c_glib/arrow-flight-sql-glib/client.h
@@ -21,9 +21,12 @@
 
 #include <arrow-flight-glib/arrow-flight-glib.h>
 
+#include <arrow-flight-sql-glib/version.h>
+
 G_BEGIN_DECLS
 
 #define GAFLIGHTSQL_TYPE_PREPARED_STATEMENT (gaflightsql_prepared_statement_get_type())
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightSQLPreparedStatement,
                          gaflightsql_prepared_statement,
                          GAFLIGHTSQL,
@@ -34,52 +37,53 @@ struct _GAFlightSQLPreparedStatementClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 GAFlightInfo *
 gaflightsql_prepared_statement_execute(GAFlightSQLPreparedStatement *statement,
                                        GAFlightCallOptions *options,
                                        GError **error);
 
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 gint64
 gaflightsql_prepared_statement_execute_update(GAFlightSQLPreparedStatement *statement,
                                               GAFlightCallOptions *options,
                                               GError **error);
 
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 GArrowSchema *
 gaflightsql_prepared_statement_get_parameter_schema(
   GAFlightSQLPreparedStatement *statement);
 
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 GArrowSchema *
 gaflightsql_prepared_statement_get_dataset_schema(
   GAFlightSQLPreparedStatement *statement);
 
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 gboolean
 gaflightsql_prepared_statement_set_record_batch(GAFlightSQLPreparedStatement *statement,
                                                 GArrowRecordBatch *record_batch,
                                                 GError **error);
 
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 gboolean
 gaflightsql_prepared_statement_set_record_batch_reader(
   GAFlightSQLPreparedStatement *statement,
   GArrowRecordBatchReader *reader,
   GError **error);
 
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 gboolean
 gaflightsql_prepared_statement_close(GAFlightSQLPreparedStatement *statement,
                                      GAFlightCallOptions *options,
                                      GError **error);
 
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 gboolean
 gaflightsql_prepared_statement_is_closed(GAFlightSQLPreparedStatement *statement);
 
 #define GAFLIGHTSQL_TYPE_CLIENT (gaflightsql_client_get_type())
+GAFLIGHTSQL_AVAILABLE_IN_9_0
 G_DECLARE_DERIVABLE_TYPE(
   GAFlightSQLClient, gaflightsql_client, GAFLIGHTSQL, CLIENT, GObject)
 struct _GAFlightSQLClientClass
@@ -87,32 +91,32 @@ struct _GAFlightSQLClientClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_9_0
+GAFLIGHTSQL_AVAILABLE_IN_9_0
 GAFlightSQLClient *
 gaflightsql_client_new(GAFlightClient *client);
 
-GARROW_AVAILABLE_IN_9_0
+GAFLIGHTSQL_AVAILABLE_IN_9_0
 GAFlightInfo *
 gaflightsql_client_execute(GAFlightSQLClient *client,
                            const gchar *query,
                            GAFlightCallOptions *options,
                            GError **error);
 
-GARROW_AVAILABLE_IN_13_0
+GAFLIGHTSQL_AVAILABLE_IN_13_0
 gint64
 gaflightsql_client_execute_update(GAFlightSQLClient *client,
                                   const gchar *query,
                                   GAFlightCallOptions *options,
                                   GError **error);
 
-GARROW_AVAILABLE_IN_9_0
+GAFLIGHTSQL_AVAILABLE_IN_9_0
 GAFlightStreamReader *
 gaflightsql_client_do_get(GAFlightSQLClient *client,
                           GAFlightTicket *ticket,
                           GAFlightCallOptions *options,
                           GError **error);
 
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 GAFlightSQLPreparedStatement *
 gaflightsql_client_prepare(GAFlightSQLClient *client,
                            const gchar *query,
diff --git a/c_glib/arrow-flight-sql-glib/meson.build b/c_glib/arrow-flight-sql-glib/meson.build
index e7abc605bb819..d588ba4917c76 100644
--- a/c_glib/arrow-flight-sql-glib/meson.build
+++ b/c_glib/arrow-flight-sql-glib/meson.build
@@ -34,6 +34,14 @@ cpp_headers = files(
   'server.hpp',
 )
 
+version_h = configure_file(
+  input: 'version.h.in',
+  output: 'version.h',
+  command: [python3, generate_version_header_py, '--library', 'GAFLIGHTSQL', '--version', version, '--input', '@INPUT@', '--output', '@OUTPUT@'],
+)
+
+c_headers += version_h
+
 headers = c_headers + cpp_headers
 install_headers(headers, subdir: 'arrow-flight-sql-glib')
 
@@ -47,6 +55,7 @@ libarrow_flight_sql_glib = library('arrow-flight-sql-glib',
                                    dependencies: dependencies,
                                    implicit_include_directories: false,
                                    include_directories: base_include_directories,
+                                   cpp_args: ['-DGAFLIGHTSQL_COMPILATION'],
                                    soversion: so_version,
                                    version: library_version)
 arrow_flight_sql_glib = \
diff --git a/c_glib/arrow-flight-sql-glib/server.h b/c_glib/arrow-flight-sql-glib/server.h
index d6fd7e4d10394..8cf0aace77644 100644
--- a/c_glib/arrow-flight-sql-glib/server.h
+++ b/c_glib/arrow-flight-sql-glib/server.h
@@ -21,9 +21,12 @@
 
 #include <arrow-flight-glib/server.h>
 
+#include <arrow-flight-sql-glib/version.h>
+
 G_BEGIN_DECLS
 
 #define GAFLIGHTSQL_TYPE_COMMAND (gaflightsql_command_get_type())
+GAFLIGHTSQL_AVAILABLE_IN_9_0
 G_DECLARE_DERIVABLE_TYPE(
   GAFlightSQLCommand, gaflightsql_command, GAFLIGHTSQL, COMMAND, GObject)
 struct _GAFlightSQLCommandClass
@@ -32,6 +35,7 @@ struct _GAFlightSQLCommandClass
 };
 
 #define GAFLIGHTSQL_TYPE_STATEMENT_QUERY (gaflightsql_statement_query_get_type())
+GAFLIGHTSQL_AVAILABLE_IN_9_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightSQLStatementQuery,
                          gaflightsql_statement_query,
                          GAFLIGHTSQL,
@@ -42,11 +46,12 @@ struct _GAFlightSQLStatementQueryClass
   GAFlightSQLCommandClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_9_0
+GAFLIGHTSQL_AVAILABLE_IN_9_0
 const gchar *
 gaflightsql_statement_query_get_query(GAFlightSQLStatementQuery *command);
 
 #define GAFLIGHTSQL_TYPE_STATEMENT_UPDATE (gaflightsql_statement_update_get_type())
+GAFLIGHTSQL_AVAILABLE_IN_13_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightSQLStatementUpdate,
                          gaflightsql_statement_update,
                          GAFLIGHTSQL,
@@ -57,12 +62,13 @@ struct _GAFlightSQLStatementUpdateClass
   GAFlightSQLCommandClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_13_0
+GAFLIGHTSQL_AVAILABLE_IN_13_0
 const gchar *
 gaflightsql_statement_update_get_query(GAFlightSQLStatementUpdate *command);
 
 #define GAFLIGHTSQL_TYPE_PREPARED_STATEMENT_UPDATE                                       \
   (gaflightsql_prepared_statement_update_get_type())
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightSQLPreparedStatementUpdate,
                          gaflightsql_prepared_statement_update,
                          GAFLIGHTSQL,
@@ -73,13 +79,14 @@ struct _GAFlightSQLPreparedStatementUpdateClass
   GAFlightSQLCommandClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 GBytes *
 gaflightsql_prepared_statement_update_get_handle(
   GAFlightSQLPreparedStatementUpdate *command);
 
 #define GAFLIGHTSQL_TYPE_STATEMENT_QUERY_TICKET                                          \
   (gaflightsql_statement_query_ticket_get_type())
+GAFLIGHTSQL_AVAILABLE_IN_9_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightSQLStatementQueryTicket,
                          gaflightsql_statement_query_ticket,
                          GAFLIGHTSQL,
@@ -90,15 +97,16 @@ struct _GAFlightSQLStatementQueryTicketClass
   GAFlightSQLCommandClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_9_0
+GAFLIGHTSQL_AVAILABLE_IN_9_0
 GBytes *
 gaflightsql_statement_query_ticket_generate_handle(const gchar *query, GError **error);
-GARROW_AVAILABLE_IN_9_0
+GAFLIGHTSQL_AVAILABLE_IN_9_0
 GBytes *
 gaflightsql_statement_query_ticket_get_handle(GAFlightSQLStatementQueryTicket *command);
 
 #define GAFLIGHTSQL_TYPE_CREATE_PREPARED_STATEMENT_REQUEST                               \
   (gaflightsql_create_prepared_statement_request_get_type())
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightSQLCreatePreparedStatementRequest,
                          gaflightsql_create_prepared_statement_request,
                          GAFLIGHTSQL,
@@ -109,18 +117,19 @@ struct _GAFlightSQLCreatePreparedStatementRequestClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 const gchar *
 gaflightsql_create_prepared_statement_request_get_query(
   GAFlightSQLCreatePreparedStatementRequest *request);
 
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 const gchar *
 gaflightsql_create_prepared_statement_request_get_transaction_id(
   GAFlightSQLCreatePreparedStatementRequest *request);
 
 #define GAFLIGHTSQL_TYPE_CREATE_PREPARED_STATEMENT_RESULT                                \
   (gaflightsql_create_prepared_statement_result_get_type())
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightSQLCreatePreparedStatementResult,
                          gaflightsql_create_prepared_statement_result,
                          GAFLIGHTSQL,
@@ -131,36 +140,37 @@ struct _GAFlightSQLCreatePreparedStatementResultClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 GAFlightSQLCreatePreparedStatementResult *
 gaflightsql_create_prepared_statement_result_new(void);
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 void
 gaflightsql_create_prepared_statement_result_set_dataset_schema(
   GAFlightSQLCreatePreparedStatementResult *result, GArrowSchema *schema);
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 GArrowSchema *
 gaflightsql_create_prepared_statement_result_get_dataset_schema(
   GAFlightSQLCreatePreparedStatementResult *result);
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 void
 gaflightsql_create_prepared_statement_result_set_parameter_schema(
   GAFlightSQLCreatePreparedStatementResult *result, GArrowSchema *schema);
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 GArrowSchema *
 gaflightsql_create_prepared_statement_result_get_parameter_schema(
   GAFlightSQLCreatePreparedStatementResult *result);
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 void
 gaflightsql_create_prepared_statement_result_set_handle(
   GAFlightSQLCreatePreparedStatementResult *result, GBytes *handle);
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 GBytes *
 gaflightsql_create_prepared_statement_result_get_handle(
   GAFlightSQLCreatePreparedStatementResult *result);
 
 #define GAFLIGHTSQL_TYPE_CLOSE_PREPARED_STATEMENT_REQUEST                                \
   (gaflightsql_close_prepared_statement_request_get_type())
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 G_DECLARE_DERIVABLE_TYPE(GAFlightSQLClosePreparedStatementRequest,
                          gaflightsql_close_prepared_statement_request,
                          GAFLIGHTSQL,
@@ -171,12 +181,13 @@ struct _GAFlightSQLClosePreparedStatementRequestClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_14_0
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 GBytes *
 gaflightsql_close_prepared_statement_request_get_handle(
   GAFlightSQLClosePreparedStatementRequest *request);
 
 #define GAFLIGHTSQL_TYPE_SERVER (gaflightsql_server_get_type())
+GAFLIGHTSQL_AVAILABLE_IN_9_0
 G_DECLARE_DERIVABLE_TYPE(
   GAFlightSQLServer, gaflightsql_server, GAFLIGHTSQL, SERVER, GAFlightServer)
 /**
@@ -231,27 +242,27 @@ struct _GAFlightSQLServerClass
                                    GError **error);
 };
 
-GARROW_AVAILABLE_IN_9_0
+GAFLIGHTSQL_AVAILABLE_IN_9_0
 GAFlightInfo *
 gaflightsql_server_get_flight_info_statement(GAFlightSQLServer *server,
                                              GAFlightServerCallContext *context,
                                              GAFlightSQLStatementQuery *command,
                                              GAFlightDescriptor *descriptor,
                                              GError **error);
-GARROW_AVAILABLE_IN_9_0
+GAFLIGHTSQL_AVAILABLE_IN_9_0
 GAFlightDataStream *
 gaflightsql_server_do_get_statement(GAFlightSQLServer *server,
                                     GAFlightServerCallContext *context,
                                     GAFlightSQLStatementQueryTicket *ticket,
                                     GError **error);
-GARROW_AVAILABLE_IN_13_0
+GAFLIGHTSQL_AVAILABLE_IN_13_0
 gint64
 gaflightsql_server_do_put_command_statement_update(GAFlightSQLServer *server,
                                                    GAFlightServerCallContext *context,
                                                    GAFlightSQLStatementUpdate *command,
                                                    GError **error);
-/* We can restore this after we bump version to 14.0.0-SNAPSHOT. */
-/* GARROW_AVAILABLE_IN_14_0 */
+
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 gint64
 gaflightsql_server_do_put_prepared_statement_update(
   GAFlightSQLServer *server,
@@ -259,16 +270,16 @@ gaflightsql_server_do_put_prepared_statement_update(
   GAFlightSQLPreparedStatementUpdate *command,
   GAFlightMessageReader *reader,
   GError **error);
-/* We can restore this after we bump version to 14.0.0-SNAPSHOT. */
-/* GARROW_AVAILABLE_IN_14_0 */
+
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 GAFlightSQLCreatePreparedStatementResult *
 gaflightsql_server_create_prepared_statement(
   GAFlightSQLServer *server,
   GAFlightServerCallContext *context,
   GAFlightSQLCreatePreparedStatementRequest *request,
   GError **error);
-/* We can restore this after we bump version to 14.0.0-SNAPSHOT. */
-/* GARROW_AVAILABLE_IN_14_0 */
+
+GAFLIGHTSQL_AVAILABLE_IN_14_0
 void
 gaflightsql_server_close_prepared_statement(
   GAFlightSQLServer *server,
diff --git a/c_glib/arrow-flight-sql-glib/version.h.in b/c_glib/arrow-flight-sql-glib/version.h.in
new file mode 100644
index 0000000000000..e4373109b9008
--- /dev/null
+++ b/c_glib/arrow-flight-sql-glib/version.h.in
@@ -0,0 +1,159 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <arrow-glib/version.h>
+
+/**
+ * SECTION: version
+ * @section_id: version-macros
+ * @title: Version related macros
+ * @include: arrow-flight-sql-glib/arrow-flight-sql-glib.h
+ *
+ * Apache Arrow Flight SQL GLib provides macros that can be used by C pre-processor.
+ * They are useful to check version related things at compile time.
+ */
+
+/**
+ * GAFLIGHTSQL_VERSION_MAJOR:
+ *
+ * The major version.
+ *
+ * Since: 17.0.0
+ */
+#define GAFLIGHTSQL_VERSION_MAJOR (@VERSION_MAJOR@)
+
+/**
+ * GAFLIGHTSQL_VERSION_MINOR:
+ *
+ * The minor version.
+ *
+ * Since: 17.0.0
+ */
+#define GAFLIGHTSQL_VERSION_MINOR (@VERSION_MINOR@)
+
+/**
+ * GAFLIGHTSQL_VERSION_MICRO:
+ *
+ * The micro version.
+ *
+ * Since: 17.0.0
+ */
+#define GAFLIGHTSQL_VERSION_MICRO (@VERSION_MICRO@)
+
+/**
+ * GAFLIGHTSQL_VERSION_TAG:
+ *
+ * The version tag. Normally, it's an empty string. It's "SNAPSHOT"
+ * for snapshot version.
+ *
+ * Since: 17.0.0
+ */
+#define GAFLIGHTSQL_VERSION_TAG   "@VERSION_TAG@"
+
+/**
+ * GAFLIGHTSQL_VERSION_CHECK:
+ * @major: A major version to check for.
+ * @minor: A minor version to check for.
+ * @micro: A micro version to check for.
+ *
+ * You can use this macro in C pre-processor.
+ *
+ * Returns: %TRUE if the compile time Apache Arrow GLib version is the
+ *   same as or newer than the passed version, %FALSE otherwise.
+ *
+ * Since: 17.0.0
+ */
+#define GAFLIGHTSQL_VERSION_CHECK(major, minor, micro)       \
+  (GAFLIGHTSQL_VERSION_MAJOR > (major) ||                    \
+   (GAFLIGHTSQL_VERSION_MAJOR == (major) &&                  \
+    GAFLIGHTSQL_VERSION_MINOR > (minor)) ||                  \
+   (GAFLIGHTSQL_VERSION_MAJOR == (major) &&                  \
+    GAFLIGHTSQL_VERSION_MINOR == (minor) &&                  \
+    GAFLIGHTSQL_VERSION_MICRO >= (micro)))
+
+/**
+ * GAFLIGHTSQL_DISABLE_DEPRECATION_WARNINGS:
+ *
+ * If this macro is defined, no deprecated warnings are produced.
+ *
+ * You must define this macro before including the
+ * arrow-glib/arrow-glib.h header.
+ *
+ * Since: 17.0.0
+ */
+
+#ifdef GAFLIGHTSQL_DISABLE_DEPRECATION_WARNINGS
+#  define GAFLIGHTSQL_DEPRECATED
+#  define GAFLIGHTSQL_DEPRECATED_FOR(function)
+#  define GAFLIGHTSQL_UNAVAILABLE(major, minor)
+#else
+#  define GAFLIGHTSQL_DEPRECATED G_DEPRECATED
+#  define GAFLIGHTSQL_DEPRECATED_FOR(function) G_DEPRECATED_FOR(function)
+#  define GAFLIGHTSQL_UNAVAILABLE(major, minor) G_UNAVAILABLE(major, minor)
+#endif
+
+@ENCODED_VERSIONS@
+
+/**
+ * GAFLIGHTSQL_VERSION_MIN_REQUIRED:
+ *
+ * You can use this macro for compile time API version check.
+ *
+ * This macro value must be one of the predefined version macros such
+ * as %GAFLIGHTSQL_VERSION_0_10.
+ *
+ * If you use any functions that is defined by newer version than
+ * %GAFLIGHTSQL_VERSION_MIN_REQUIRED, deprecated warnings are produced at
+ * compile time.
+ *
+ * You must define this macro before including the
+ * arrow-flight-sql-glib/arrow-flight-sql-glib.h header.
+ *
+ * Since: 17.0.0
+ */
+#ifndef GAFLIGHTSQL_VERSION_MIN_REQUIRED
+#  define GAFLIGHTSQL_VERSION_MIN_REQUIRED GARROW_VERSION_MIN_REQUIRED
+#endif
+
+/**
+ * GAFLIGHTSQL_VERSION_MAX_ALLOWED:
+ *
+ * You can use this macro for compile time API version check.
+ *
+ * This macro value must be one of the predefined version macros such
+ * as %GAFLIGHTSQL_VERSION_0_10.
+ *
+ * If you use any functions that is defined by newer version than
+ * %GAFLIGHTSQL_VERSION_MAX_ALLOWED, deprecated warnings are produced at
+ * compile time.
+ *
+ * You must define this macro before including the
+ * arrow-flight-sql-glib/arrow-flight-sql-glib.h header.
+ *
+ * Since: 17.0.0
+ */
+#ifndef GAFLIGHTSQL_VERSION_MAX_ALLOWED
+#  define GAFLIGHTSQL_VERSION_MAX_ALLOWED GARROW_VERSION_MAX_ALLOWED
+#endif
+
+@VISIBILITY_MACROS@
+
+@AVAILABILITY_MACROS@
diff --git a/c_glib/arrow-glib/array-builder.cpp b/c_glib/arrow-glib/array-builder.cpp
index b498ecb51cedb..9b7c608ca8a5b 100644
--- a/c_glib/arrow-glib/array-builder.cpp
+++ b/c_glib/arrow-glib/array-builder.cpp
@@ -231,8 +231,8 @@ garrow_array_builder_append_values(GArrowArrayBuilder *builder,
   if (n_remains > 0) {
     ++n_loops;
   }
+  std::vector<uint8_t> data(value_size * chunk_size);
   for (gint64 i = 0; i < n_loops; ++i) {
-    uint8_t data[value_size * chunk_size];
     uint8_t *valid_bytes = nullptr;
     uint8_t valid_bytes_buffer[chunk_size];
     if (is_valids_length > 0) {
@@ -255,7 +255,7 @@ garrow_array_builder_append_values(GArrowArrayBuilder *builder,
         value = values[offset + j];
       }
       if (value) {
-        get_value_function(data + (value_size * j), value, value_size);
+        get_value_function(data.data() + (value_size * j), value, value_size);
       } else {
         is_valid = false;
         if (!valid_bytes) {
@@ -267,7 +267,7 @@ garrow_array_builder_append_values(GArrowArrayBuilder *builder,
         valid_bytes_buffer[j] = is_valid;
       }
     }
-    auto status = arrow_builder->AppendValues(data, n_values, valid_bytes);
+    auto status = arrow_builder->AppendValues(data.data(), n_values, valid_bytes);
     if (!garrow_error_check(error, status, context)) {
       return FALSE;
     }
@@ -1035,13 +1035,13 @@ garrow_boolean_array_builder_append_values(GArrowBooleanArrayBuilder *builder,
                                            gint64 is_valids_length,
                                            GError **error)
 {
-  guint8 arrow_values[values_length];
+  std::vector<guint8> arrow_values(values_length);
   for (gint64 i = 0; i < values_length; ++i) {
     arrow_values[i] = values[i];
   }
   return garrow_array_builder_append_values<arrow::BooleanBuilder>(
     GARROW_ARRAY_BUILDER(builder),
-    arrow_values,
+    arrow_values.data(),
     values_length,
     is_valids,
     is_valids_length,
diff --git a/c_glib/arrow-glib/array-builder.h b/c_glib/arrow-glib/array-builder.h
index 8a1385b9b8c1b..6a0d0154833a7 100644
--- a/c_glib/arrow-glib/array-builder.h
+++ b/c_glib/arrow-glib/array-builder.h
@@ -26,6 +26,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_ARRAY_BUILDER (garrow_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowArrayBuilder, garrow_array_builder, GARROW, ARRAY_BUILDER, GObject)
 struct _GArrowArrayBuilderClass
@@ -33,11 +34,15 @@ struct _GArrowArrayBuilderClass
   GObjectClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDataType *
 garrow_array_builder_get_value_data_type(GArrowArrayBuilder *builder);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowType
 garrow_array_builder_get_value_type(GArrowArrayBuilder *builder);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowArray *
 garrow_array_builder_finish(GArrowArrayBuilder *builder, GError **error);
 
@@ -86,6 +91,7 @@ garrow_array_builder_append_empty_values(GArrowArrayBuilder *builder,
                                          GError **error);
 
 #define GARROW_TYPE_NULL_ARRAY_BUILDER (garrow_null_array_builder_get_type())
+GARROW_AVAILABLE_IN_0_13
 G_DECLARE_DERIVABLE_TYPE(GArrowNullArrayBuilder,
                          garrow_null_array_builder,
                          GARROW,
@@ -114,6 +120,7 @@ garrow_null_array_builder_append_nulls(GArrowNullArrayBuilder *builder,
 #endif
 
 #define GARROW_TYPE_BOOLEAN_ARRAY_BUILDER (garrow_boolean_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowBooleanArrayBuilder,
                          garrow_boolean_array_builder,
                          GARROW,
@@ -124,10 +131,12 @@ struct _GArrowBooleanArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowBooleanArrayBuilder *
 garrow_boolean_array_builder_new(void);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_boolean_array_builder_append_value)
 gboolean
 garrow_boolean_array_builder_append(GArrowBooleanArrayBuilder *builder,
@@ -139,6 +148,8 @@ gboolean
 garrow_boolean_array_builder_append_value(GArrowBooleanArrayBuilder *builder,
                                           gboolean value,
                                           GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_boolean_array_builder_append_values(GArrowBooleanArrayBuilder *builder,
                                            const gboolean *values,
@@ -159,6 +170,7 @@ garrow_boolean_array_builder_append_nulls(GArrowBooleanArrayBuilder *builder,
 #endif
 
 #define GARROW_TYPE_INT_ARRAY_BUILDER (garrow_int_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowIntArrayBuilder,
                          garrow_int_array_builder,
                          GARROW,
@@ -169,10 +181,12 @@ struct _GArrowIntArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowIntArrayBuilder *
 garrow_int_array_builder_new(void);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_int_array_builder_append_value)
 gboolean
 garrow_int_array_builder_append(GArrowIntArrayBuilder *builder,
@@ -184,6 +198,7 @@ gboolean
 garrow_int_array_builder_append_value(GArrowIntArrayBuilder *builder,
                                       gint64 value,
                                       GError **error);
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_int_array_builder_append_values(GArrowIntArrayBuilder *builder,
                                        const gint64 *values,
@@ -192,9 +207,12 @@ garrow_int_array_builder_append_values(GArrowIntArrayBuilder *builder,
                                        gint64 is_valids_length,
                                        GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_int_array_builder_append_null(GArrowIntArrayBuilder *builder, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 gboolean
 garrow_int_array_builder_append_nulls(GArrowIntArrayBuilder *builder,
@@ -203,6 +221,7 @@ garrow_int_array_builder_append_nulls(GArrowIntArrayBuilder *builder,
 #endif
 
 #define GARROW_TYPE_UINT_ARRAY_BUILDER (garrow_uint_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowUIntArrayBuilder,
                          garrow_uint_array_builder,
                          GARROW,
@@ -213,10 +232,12 @@ struct _GArrowUIntArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowUIntArrayBuilder *
 garrow_uint_array_builder_new(void);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_uint_array_builder_append_value)
 gboolean
 garrow_uint_array_builder_append(GArrowUIntArrayBuilder *builder,
@@ -228,6 +249,8 @@ gboolean
 garrow_uint_array_builder_append_value(GArrowUIntArrayBuilder *builder,
                                        guint64 value,
                                        GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_uint_array_builder_append_values(GArrowUIntArrayBuilder *builder,
                                         const guint64 *values,
@@ -236,9 +259,12 @@ garrow_uint_array_builder_append_values(GArrowUIntArrayBuilder *builder,
                                         gint64 is_valids_length,
                                         GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_uint_array_builder_append_null(GArrowUIntArrayBuilder *builder, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 gboolean
 garrow_uint_array_builder_append_nulls(GArrowUIntArrayBuilder *builder,
@@ -247,6 +273,7 @@ garrow_uint_array_builder_append_nulls(GArrowUIntArrayBuilder *builder,
 #endif
 
 #define GARROW_TYPE_INT8_ARRAY_BUILDER (garrow_int8_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowInt8ArrayBuilder,
                          garrow_int8_array_builder,
                          GARROW,
@@ -257,10 +284,12 @@ struct _GArrowInt8ArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowInt8ArrayBuilder *
 garrow_int8_array_builder_new(void);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_int8_array_builder_append_value)
 gboolean
 garrow_int8_array_builder_append(GArrowInt8ArrayBuilder *builder,
@@ -272,6 +301,8 @@ gboolean
 garrow_int8_array_builder_append_value(GArrowInt8ArrayBuilder *builder,
                                        gint8 value,
                                        GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_int8_array_builder_append_values(GArrowInt8ArrayBuilder *builder,
                                         const gint8 *values,
@@ -280,9 +311,12 @@ garrow_int8_array_builder_append_values(GArrowInt8ArrayBuilder *builder,
                                         gint64 is_valids_length,
                                         GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_int8_array_builder_append_null(GArrowInt8ArrayBuilder *builder, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 gboolean
 garrow_int8_array_builder_append_nulls(GArrowInt8ArrayBuilder *builder,
@@ -291,6 +325,7 @@ garrow_int8_array_builder_append_nulls(GArrowInt8ArrayBuilder *builder,
 #endif
 
 #define GARROW_TYPE_UINT8_ARRAY_BUILDER (garrow_uint8_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowUInt8ArrayBuilder,
                          garrow_uint8_array_builder,
                          GARROW,
@@ -301,10 +336,12 @@ struct _GArrowUInt8ArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowUInt8ArrayBuilder *
 garrow_uint8_array_builder_new(void);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_uint8_array_builder_append_value)
 gboolean
 garrow_uint8_array_builder_append(GArrowUInt8ArrayBuilder *builder,
@@ -316,6 +353,8 @@ gboolean
 garrow_uint8_array_builder_append_value(GArrowUInt8ArrayBuilder *builder,
                                         guint8 value,
                                         GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_uint8_array_builder_append_values(GArrowUInt8ArrayBuilder *builder,
                                          const guint8 *values,
@@ -324,9 +363,12 @@ garrow_uint8_array_builder_append_values(GArrowUInt8ArrayBuilder *builder,
                                          gint64 is_valids_length,
                                          GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_uint8_array_builder_append_null(GArrowUInt8ArrayBuilder *builder, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 gboolean
 garrow_uint8_array_builder_append_nulls(GArrowUInt8ArrayBuilder *builder,
@@ -335,6 +377,7 @@ garrow_uint8_array_builder_append_nulls(GArrowUInt8ArrayBuilder *builder,
 #endif
 
 #define GARROW_TYPE_INT16_ARRAY_BUILDER (garrow_int16_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowInt16ArrayBuilder,
                          garrow_int16_array_builder,
                          GARROW,
@@ -345,6 +388,7 @@ struct _GArrowInt16ArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowInt16ArrayBuilder *
 garrow_int16_array_builder_new(void);
 
@@ -360,6 +404,7 @@ gboolean
 garrow_int16_array_builder_append_value(GArrowInt16ArrayBuilder *builder,
                                         gint16 value,
                                         GError **error);
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_int16_array_builder_append_values(GArrowInt16ArrayBuilder *builder,
                                          const gint16 *values,
@@ -368,9 +413,12 @@ garrow_int16_array_builder_append_values(GArrowInt16ArrayBuilder *builder,
                                          gint64 is_valids_length,
                                          GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_int16_array_builder_append_null(GArrowInt16ArrayBuilder *builder, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 gboolean
 garrow_int16_array_builder_append_nulls(GArrowInt16ArrayBuilder *builder,
@@ -379,6 +427,7 @@ garrow_int16_array_builder_append_nulls(GArrowInt16ArrayBuilder *builder,
 #endif
 
 #define GARROW_TYPE_UINT16_ARRAY_BUILDER (garrow_uint16_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowUInt16ArrayBuilder,
                          garrow_uint16_array_builder,
                          GARROW,
@@ -389,10 +438,12 @@ struct _GArrowUInt16ArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowUInt16ArrayBuilder *
 garrow_uint16_array_builder_new(void);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_uint16_array_builder_append_value)
 gboolean
 garrow_uint16_array_builder_append(GArrowUInt16ArrayBuilder *builder,
@@ -404,6 +455,8 @@ gboolean
 garrow_uint16_array_builder_append_value(GArrowUInt16ArrayBuilder *builder,
                                          guint16 value,
                                          GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_uint16_array_builder_append_values(GArrowUInt16ArrayBuilder *builder,
                                           const guint16 *values,
@@ -412,10 +465,13 @@ garrow_uint16_array_builder_append_values(GArrowUInt16ArrayBuilder *builder,
                                           gint64 is_valids_length,
                                           GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_uint16_array_builder_append_null(GArrowUInt16ArrayBuilder *builder,
                                         GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 gboolean
 garrow_uint16_array_builder_append_nulls(GArrowUInt16ArrayBuilder *builder,
@@ -424,6 +480,7 @@ garrow_uint16_array_builder_append_nulls(GArrowUInt16ArrayBuilder *builder,
 #endif
 
 #define GARROW_TYPE_INT32_ARRAY_BUILDER (garrow_int32_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowInt32ArrayBuilder,
                          garrow_int32_array_builder,
                          GARROW,
@@ -434,10 +491,12 @@ struct _GArrowInt32ArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowInt32ArrayBuilder *
 garrow_int32_array_builder_new(void);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_int32_array_builder_append_value)
 gboolean
 garrow_int32_array_builder_append(GArrowInt32ArrayBuilder *builder,
@@ -449,6 +508,8 @@ gboolean
 garrow_int32_array_builder_append_value(GArrowInt32ArrayBuilder *builder,
                                         gint32 value,
                                         GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_int32_array_builder_append_values(GArrowInt32ArrayBuilder *builder,
                                          const gint32 *values,
@@ -457,9 +518,12 @@ garrow_int32_array_builder_append_values(GArrowInt32ArrayBuilder *builder,
                                          gint64 is_valids_length,
                                          GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_int32_array_builder_append_null(GArrowInt32ArrayBuilder *builder, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 gboolean
 garrow_int32_array_builder_append_nulls(GArrowInt32ArrayBuilder *builder,
@@ -468,6 +532,7 @@ garrow_int32_array_builder_append_nulls(GArrowInt32ArrayBuilder *builder,
 #endif
 
 #define GARROW_TYPE_UINT32_ARRAY_BUILDER (garrow_uint32_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowUInt32ArrayBuilder,
                          garrow_uint32_array_builder,
                          GARROW,
@@ -478,10 +543,12 @@ struct _GArrowUInt32ArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowUInt32ArrayBuilder *
 garrow_uint32_array_builder_new(void);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_uint32_array_builder_append_value)
 gboolean
 garrow_uint32_array_builder_append(GArrowUInt32ArrayBuilder *builder,
@@ -493,6 +560,8 @@ gboolean
 garrow_uint32_array_builder_append_value(GArrowUInt32ArrayBuilder *builder,
                                          guint32 value,
                                          GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_uint32_array_builder_append_values(GArrowUInt32ArrayBuilder *builder,
                                           const guint32 *values,
@@ -501,10 +570,13 @@ garrow_uint32_array_builder_append_values(GArrowUInt32ArrayBuilder *builder,
                                           gint64 is_valids_length,
                                           GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_uint32_array_builder_append_null(GArrowUInt32ArrayBuilder *builder,
                                         GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 gboolean
 garrow_uint32_array_builder_append_nulls(GArrowUInt32ArrayBuilder *builder,
@@ -513,6 +585,7 @@ garrow_uint32_array_builder_append_nulls(GArrowUInt32ArrayBuilder *builder,
 #endif
 
 #define GARROW_TYPE_INT64_ARRAY_BUILDER (garrow_int64_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowInt64ArrayBuilder,
                          garrow_int64_array_builder,
                          GARROW,
@@ -523,10 +596,12 @@ struct _GArrowInt64ArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowInt64ArrayBuilder *
 garrow_int64_array_builder_new(void);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_int64_array_builder_append_value)
 gboolean
 garrow_int64_array_builder_append(GArrowInt64ArrayBuilder *builder,
@@ -538,6 +613,8 @@ gboolean
 garrow_int64_array_builder_append_value(GArrowInt64ArrayBuilder *builder,
                                         gint64 value,
                                         GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_int64_array_builder_append_values(GArrowInt64ArrayBuilder *builder,
                                          const gint64 *values,
@@ -546,9 +623,12 @@ garrow_int64_array_builder_append_values(GArrowInt64ArrayBuilder *builder,
                                          gint64 is_valids_length,
                                          GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_int64_array_builder_append_null(GArrowInt64ArrayBuilder *builder, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 gboolean
 garrow_int64_array_builder_append_nulls(GArrowInt64ArrayBuilder *builder,
@@ -557,6 +637,7 @@ garrow_int64_array_builder_append_nulls(GArrowInt64ArrayBuilder *builder,
 #endif
 
 #define GARROW_TYPE_UINT64_ARRAY_BUILDER (garrow_uint64_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowUInt64ArrayBuilder,
                          garrow_uint64_array_builder,
                          GARROW,
@@ -567,10 +648,12 @@ struct _GArrowUInt64ArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowUInt64ArrayBuilder *
 garrow_uint64_array_builder_new(void);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_uint64_array_builder_append_value)
 gboolean
 garrow_uint64_array_builder_append(GArrowUInt64ArrayBuilder *builder,
@@ -582,6 +665,8 @@ gboolean
 garrow_uint64_array_builder_append_value(GArrowUInt64ArrayBuilder *builder,
                                          guint64 value,
                                          GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_uint64_array_builder_append_values(GArrowUInt64ArrayBuilder *builder,
                                           const guint64 *values,
@@ -590,10 +675,13 @@ garrow_uint64_array_builder_append_values(GArrowUInt64ArrayBuilder *builder,
                                           gint64 is_valids_length,
                                           GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_uint64_array_builder_append_null(GArrowUInt64ArrayBuilder *builder,
                                         GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 gboolean
 garrow_uint64_array_builder_append_nulls(GArrowUInt64ArrayBuilder *builder,
@@ -602,6 +690,7 @@ garrow_uint64_array_builder_append_nulls(GArrowUInt64ArrayBuilder *builder,
 #endif
 
 #define GARROW_TYPE_HALF_FLOAT_ARRAY_BUILDER (garrow_half_float_array_builder_get_type())
+GARROW_AVAILABLE_IN_11_0
 G_DECLARE_DERIVABLE_TYPE(GArrowHalfFloatArrayBuilder,
                          garrow_half_float_array_builder,
                          GARROW,
@@ -631,6 +720,7 @@ garrow_half_float_array_builder_append_values(GArrowHalfFloatArrayBuilder *build
                                               GError **error);
 
 #define GARROW_TYPE_FLOAT_ARRAY_BUILDER (garrow_float_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowFloatArrayBuilder,
                          garrow_float_array_builder,
                          GARROW,
@@ -641,10 +731,12 @@ struct _GArrowFloatArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowFloatArrayBuilder *
 garrow_float_array_builder_new(void);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_float_array_builder_append_value)
 gboolean
 garrow_float_array_builder_append(GArrowFloatArrayBuilder *builder,
@@ -656,6 +748,8 @@ gboolean
 garrow_float_array_builder_append_value(GArrowFloatArrayBuilder *builder,
                                         gfloat value,
                                         GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_float_array_builder_append_values(GArrowFloatArrayBuilder *builder,
                                          const gfloat *values,
@@ -664,9 +758,12 @@ garrow_float_array_builder_append_values(GArrowFloatArrayBuilder *builder,
                                          gint64 is_valids_length,
                                          GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_float_array_builder_append_null(GArrowFloatArrayBuilder *builder, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 gboolean
 garrow_float_array_builder_append_nulls(GArrowFloatArrayBuilder *builder,
@@ -675,6 +772,7 @@ garrow_float_array_builder_append_nulls(GArrowFloatArrayBuilder *builder,
 #endif
 
 #define GARROW_TYPE_DOUBLE_ARRAY_BUILDER (garrow_double_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDoubleArrayBuilder,
                          garrow_double_array_builder,
                          GARROW,
@@ -685,10 +783,12 @@ struct _GArrowDoubleArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDoubleArrayBuilder *
 garrow_double_array_builder_new(void);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_double_array_builder_append_value)
 gboolean
 garrow_double_array_builder_append(GArrowDoubleArrayBuilder *builder,
@@ -700,6 +800,8 @@ gboolean
 garrow_double_array_builder_append_value(GArrowDoubleArrayBuilder *builder,
                                          gdouble value,
                                          GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_double_array_builder_append_values(GArrowDoubleArrayBuilder *builder,
                                           const gdouble *values,
@@ -708,10 +810,13 @@ garrow_double_array_builder_append_values(GArrowDoubleArrayBuilder *builder,
                                           gint64 is_valids_length,
                                           GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_double_array_builder_append_null(GArrowDoubleArrayBuilder *builder,
                                         GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 gboolean
 garrow_double_array_builder_append_nulls(GArrowDoubleArrayBuilder *builder,
@@ -720,6 +825,7 @@ garrow_double_array_builder_append_nulls(GArrowDoubleArrayBuilder *builder,
 #endif
 
 #define GARROW_TYPE_BINARY_ARRAY_BUILDER (garrow_binary_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowBinaryArrayBuilder,
                          garrow_binary_array_builder,
                          GARROW,
@@ -730,10 +836,12 @@ struct _GArrowBinaryArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowBinaryArrayBuilder *
 garrow_binary_array_builder_new(void);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_binary_array_builder_append_value)
 gboolean
 garrow_binary_array_builder_append(GArrowBinaryArrayBuilder *builder,
@@ -761,10 +869,12 @@ garrow_binary_array_builder_append_values(GArrowBinaryArrayBuilder *builder,
                                           gint64 is_valids_length,
                                           GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_binary_array_builder_append_null(GArrowBinaryArrayBuilder *builder,
                                         GError **error);
+
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 GARROW_AVAILABLE_IN_0_16
 gboolean
@@ -775,6 +885,7 @@ garrow_binary_array_builder_append_nulls(GArrowBinaryArrayBuilder *builder,
 
 #define GARROW_TYPE_LARGE_BINARY_ARRAY_BUILDER                                           \
   (garrow_large_binary_array_builder_get_type())
+GARROW_AVAILABLE_IN_0_16
 G_DECLARE_DERIVABLE_TYPE(GArrowLargeBinaryArrayBuilder,
                          garrow_large_binary_array_builder,
                          GARROW,
@@ -821,6 +932,7 @@ garrow_large_binary_array_builder_append_nulls(GArrowLargeBinaryArrayBuilder *bu
 #endif
 
 #define GARROW_TYPE_STRING_ARRAY_BUILDER (garrow_string_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowStringArrayBuilder,
                          garrow_string_array_builder,
                          GARROW,
@@ -831,10 +943,12 @@ struct _GArrowStringArrayBuilderClass
   GArrowBinaryArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowStringArrayBuilder *
 garrow_string_array_builder_new(void);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_string_array_builder_append_value)
 gboolean
 garrow_string_array_builder_append(GArrowStringArrayBuilder *builder,
@@ -863,6 +977,7 @@ garrow_string_array_builder_append_string_len(GArrowStringArrayBuilder *builder,
                                               GError **error);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_16_FOR(garrow_string_array_builder_append_strings)
 gboolean
 garrow_string_array_builder_append_values(GArrowStringArrayBuilder *builder,
@@ -883,6 +998,7 @@ garrow_string_array_builder_append_strings(GArrowStringArrayBuilder *builder,
 
 #define GARROW_TYPE_LARGE_STRING_ARRAY_BUILDER                                           \
   (garrow_large_string_array_builder_get_type())
+GARROW_AVAILABLE_IN_0_16
 G_DECLARE_DERIVABLE_TYPE(GArrowLargeStringArrayBuilder,
                          garrow_large_string_array_builder,
                          GARROW,
@@ -919,6 +1035,7 @@ garrow_large_string_array_builder_append_strings(GArrowLargeStringArrayBuilder *
 
 #define GARROW_TYPE_FIXED_SIZE_BINARY_ARRAY_BUILDER                                      \
   (garrow_fixed_size_binary_array_builder_get_type())
+GARROW_AVAILABLE_IN_3_0
 G_DECLARE_DERIVABLE_TYPE(GArrowFixedSizeBinaryArrayBuilder,
                          garrow_fixed_size_binary_array_builder,
                          GARROW,
@@ -963,6 +1080,7 @@ garrow_fixed_size_binary_array_builder_append_values_packed(
   GError **error);
 
 #define GARROW_TYPE_DATE32_ARRAY_BUILDER (garrow_date32_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDate32ArrayBuilder,
                          garrow_date32_array_builder,
                          GARROW,
@@ -973,10 +1091,12 @@ struct _GArrowDate32ArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDate32ArrayBuilder *
 garrow_date32_array_builder_new(void);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_date32_array_builder_append_value)
 gboolean
 garrow_date32_array_builder_append(GArrowDate32ArrayBuilder *builder,
@@ -988,6 +1108,8 @@ gboolean
 garrow_date32_array_builder_append_value(GArrowDate32ArrayBuilder *builder,
                                          gint32 value,
                                          GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_date32_array_builder_append_values(GArrowDate32ArrayBuilder *builder,
                                           const gint32 *values,
@@ -996,10 +1118,13 @@ garrow_date32_array_builder_append_values(GArrowDate32ArrayBuilder *builder,
                                           gint64 is_valids_length,
                                           GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_date32_array_builder_append_null(GArrowDate32ArrayBuilder *builder,
                                         GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 gboolean
 garrow_date32_array_builder_append_nulls(GArrowDate32ArrayBuilder *builder,
@@ -1008,6 +1133,7 @@ garrow_date32_array_builder_append_nulls(GArrowDate32ArrayBuilder *builder,
 #endif
 
 #define GARROW_TYPE_DATE64_ARRAY_BUILDER (garrow_date64_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDate64ArrayBuilder,
                          garrow_date64_array_builder,
                          GARROW,
@@ -1018,10 +1144,12 @@ struct _GArrowDate64ArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDate64ArrayBuilder *
 garrow_date64_array_builder_new(void);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_date64_array_builder_append_value)
 gboolean
 garrow_date64_array_builder_append(GArrowDate64ArrayBuilder *builder,
@@ -1033,6 +1161,8 @@ gboolean
 garrow_date64_array_builder_append_value(GArrowDate64ArrayBuilder *builder,
                                          gint64 value,
                                          GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_date64_array_builder_append_values(GArrowDate64ArrayBuilder *builder,
                                           const gint64 *values,
@@ -1041,10 +1171,13 @@ garrow_date64_array_builder_append_values(GArrowDate64ArrayBuilder *builder,
                                           gint64 is_valids_length,
                                           GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_date64_array_builder_append_null(GArrowDate64ArrayBuilder *builder,
                                         GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 gboolean
 garrow_date64_array_builder_append_nulls(GArrowDate64ArrayBuilder *builder,
@@ -1053,6 +1186,7 @@ garrow_date64_array_builder_append_nulls(GArrowDate64ArrayBuilder *builder,
 #endif
 
 #define GARROW_TYPE_TIMESTAMP_ARRAY_BUILDER (garrow_timestamp_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowTimestampArrayBuilder,
                          garrow_timestamp_array_builder,
                          GARROW,
@@ -1063,10 +1197,12 @@ struct _GArrowTimestampArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowTimestampArrayBuilder *
 garrow_timestamp_array_builder_new(GArrowTimestampDataType *data_type);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_timestamp_array_builder_append_value)
 gboolean
 garrow_timestamp_array_builder_append(GArrowTimestampArrayBuilder *builder,
@@ -1078,6 +1214,8 @@ gboolean
 garrow_timestamp_array_builder_append_value(GArrowTimestampArrayBuilder *builder,
                                             gint64 value,
                                             GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_timestamp_array_builder_append_values(GArrowTimestampArrayBuilder *builder,
                                              const gint64 *values,
@@ -1086,10 +1224,13 @@ garrow_timestamp_array_builder_append_values(GArrowTimestampArrayBuilder *builde
                                              gint64 is_valids_length,
                                              GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_timestamp_array_builder_append_null(GArrowTimestampArrayBuilder *builder,
                                            GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 gboolean
 garrow_timestamp_array_builder_append_nulls(GArrowTimestampArrayBuilder *builder,
@@ -1098,6 +1239,7 @@ garrow_timestamp_array_builder_append_nulls(GArrowTimestampArrayBuilder *builder
 #endif
 
 #define GARROW_TYPE_TIME32_ARRAY_BUILDER (garrow_time32_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowTime32ArrayBuilder,
                          garrow_time32_array_builder,
                          GARROW,
@@ -1108,10 +1250,12 @@ struct _GArrowTime32ArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowTime32ArrayBuilder *
 garrow_time32_array_builder_new(GArrowTime32DataType *data_type);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_time32_array_builder_append_value)
 gboolean
 garrow_time32_array_builder_append(GArrowTime32ArrayBuilder *builder,
@@ -1123,6 +1267,8 @@ gboolean
 garrow_time32_array_builder_append_value(GArrowTime32ArrayBuilder *builder,
                                          gint32 value,
                                          GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_time32_array_builder_append_values(GArrowTime32ArrayBuilder *builder,
                                           const gint32 *values,
@@ -1131,10 +1277,13 @@ garrow_time32_array_builder_append_values(GArrowTime32ArrayBuilder *builder,
                                           gint64 is_valids_length,
                                           GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_time32_array_builder_append_null(GArrowTime32ArrayBuilder *builder,
                                         GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 gboolean
 garrow_time32_array_builder_append_nulls(GArrowTime32ArrayBuilder *builder,
@@ -1143,6 +1292,7 @@ garrow_time32_array_builder_append_nulls(GArrowTime32ArrayBuilder *builder,
 #endif
 
 #define GARROW_TYPE_TIME64_ARRAY_BUILDER (garrow_time64_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowTime64ArrayBuilder,
                          garrow_time64_array_builder,
                          GARROW,
@@ -1153,10 +1303,12 @@ struct _GArrowTime64ArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowTime64ArrayBuilder *
 garrow_time64_array_builder_new(GArrowTime64DataType *data_type);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_time64_array_builder_append_value)
 gboolean
 garrow_time64_array_builder_append(GArrowTime64ArrayBuilder *builder,
@@ -1168,6 +1320,8 @@ gboolean
 garrow_time64_array_builder_append_value(GArrowTime64ArrayBuilder *builder,
                                          gint64 value,
                                          GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_time64_array_builder_append_values(GArrowTime64ArrayBuilder *builder,
                                           const gint64 *values,
@@ -1176,10 +1330,13 @@ garrow_time64_array_builder_append_values(GArrowTime64ArrayBuilder *builder,
                                           gint64 is_valids_length,
                                           GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_time64_array_builder_append_null(GArrowTime64ArrayBuilder *builder,
                                         GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_nulls)
 gboolean
 garrow_time64_array_builder_append_nulls(GArrowTime64ArrayBuilder *builder,
@@ -1189,6 +1346,7 @@ garrow_time64_array_builder_append_nulls(GArrowTime64ArrayBuilder *builder,
 
 #define GARROW_TYPE_MONTH_INTERVAL_ARRAY_BUILDER                                         \
   (garrow_month_interval_array_builder_get_type())
+GARROW_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GArrowMonthIntervalArrayBuilder,
                          garrow_month_interval_array_builder,
                          GARROW,
@@ -1220,6 +1378,7 @@ garrow_month_interval_array_builder_append_values(
 
 #define GARROW_TYPE_DAY_TIME_INTERVAL_ARRAY_BUILDER                                      \
   (garrow_day_time_interval_array_builder_get_type())
+GARROW_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GArrowDayTimeIntervalArrayBuilder,
                          garrow_day_time_interval_array_builder,
                          GARROW,
@@ -1252,6 +1411,7 @@ garrow_day_time_interval_array_builder_append_values(
 
 #define GARROW_TYPE_MONTH_DAY_NANO_INTERVAL_ARRAY_BUILDER                                \
   (garrow_month_day_nano_interval_array_builder_get_type())
+GARROW_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GArrowMonthDayNanoIntervalArrayBuilder,
                          garrow_month_day_nano_interval_array_builder,
                          GARROW,
@@ -1284,6 +1444,7 @@ garrow_month_day_nano_interval_array_builder_append_values(
 
 #define GARROW_TYPE_BINARY_DICTIONARY_ARRAY_BUILDER                                      \
   (garrow_binary_dictionary_array_builder_get_type())
+GARROW_AVAILABLE_IN_2_0
 G_DECLARE_DERIVABLE_TYPE(GArrowBinaryDictionaryArrayBuilder,
                          garrow_binary_dictionary_array_builder,
                          GARROW,
@@ -1350,6 +1511,7 @@ garrow_binary_dictionary_array_builder_reset_full(
 
 #define GARROW_TYPE_STRING_DICTIONARY_ARRAY_BUILDER                                      \
   (garrow_string_dictionary_array_builder_get_type())
+GARROW_AVAILABLE_IN_2_0
 G_DECLARE_DERIVABLE_TYPE(GArrowStringDictionaryArrayBuilder,
                          garrow_string_dictionary_array_builder,
                          GARROW,
@@ -1408,6 +1570,7 @@ garrow_string_dictionary_array_builder_reset_full(
   GArrowStringDictionaryArrayBuilder *builder);
 
 #define GARROW_TYPE_LIST_ARRAY_BUILDER (garrow_list_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowListArrayBuilder,
                          garrow_list_array_builder,
                          GARROW,
@@ -1418,10 +1581,12 @@ struct _GArrowListArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowListArrayBuilder *
 garrow_list_array_builder_new(GArrowListDataType *data_type, GError **error);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_list_array_builder_append_value)
 gboolean
 garrow_list_array_builder_append(GArrowListArrayBuilder *builder, GError **error);
@@ -1430,15 +1595,18 @@ GARROW_AVAILABLE_IN_0_12
 gboolean
 garrow_list_array_builder_append_value(GArrowListArrayBuilder *builder, GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_list_array_builder_append_null(GArrowListArrayBuilder *builder, GError **error);
 #endif
 
+GARROW_AVAILABLE_IN_ALL
 GArrowArrayBuilder *
 garrow_list_array_builder_get_value_builder(GArrowListArrayBuilder *builder);
 
 #define GARROW_TYPE_LARGE_LIST_ARRAY_BUILDER (garrow_large_list_array_builder_get_type())
+GARROW_AVAILABLE_IN_0_16
 G_DECLARE_DERIVABLE_TYPE(GArrowLargeListArrayBuilder,
                          garrow_large_list_array_builder,
                          GARROW,
@@ -1468,6 +1636,7 @@ GArrowArrayBuilder *
 garrow_large_list_array_builder_get_value_builder(GArrowLargeListArrayBuilder *builder);
 
 #define GARROW_TYPE_STRUCT_ARRAY_BUILDER (garrow_struct_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowStructArrayBuilder,
                          garrow_struct_array_builder,
                          GARROW,
@@ -1478,10 +1647,12 @@ struct _GArrowStructArrayBuilderClass
   GArrowArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowStructArrayBuilder *
 garrow_struct_array_builder_new(GArrowStructDataType *data_type, GError **error);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_struct_array_builder_append_value)
 gboolean
 garrow_struct_array_builder_append(GArrowStructArrayBuilder *builder, GError **error);
@@ -1491,6 +1662,7 @@ gboolean
 garrow_struct_array_builder_append_value(GArrowStructArrayBuilder *builder,
                                          GError **error);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_3_0_FOR(garrow_array_builder_append_null)
 gboolean
 garrow_struct_array_builder_append_null(GArrowStructArrayBuilder *builder,
@@ -1498,15 +1670,19 @@ garrow_struct_array_builder_append_null(GArrowStructArrayBuilder *builder,
 #endif
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_12_0_FOR(garrow_array_builder_get_child)
 GArrowArrayBuilder *
 garrow_struct_array_builder_get_field_builder(GArrowStructArrayBuilder *builder, gint i);
+
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_12_0_FOR(garrow_array_builder_get_children)
 GList *
 garrow_struct_array_builder_get_field_builders(GArrowStructArrayBuilder *builder);
 #endif
 
 #define GARROW_TYPE_MAP_ARRAY_BUILDER (garrow_map_array_builder_get_type())
+GARROW_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(GArrowMapArrayBuilder,
                          garrow_map_array_builder,
                          GARROW,
@@ -1554,6 +1730,7 @@ GArrowArrayBuilder *
 garrow_map_array_builder_get_value_builder(GArrowMapArrayBuilder *builder);
 
 #define GARROW_TYPE_DECIMAL128_ARRAY_BUILDER (garrow_decimal128_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDecimal128ArrayBuilder,
                          garrow_decimal128_array_builder,
                          GARROW,
@@ -1564,10 +1741,12 @@ struct _GArrowDecimal128ArrayBuilderClass
   GArrowFixedSizeBinaryArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDecimal128ArrayBuilder *
 garrow_decimal128_array_builder_new(GArrowDecimal128DataType *data_type);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_decimal128_array_builder_append_value)
 gboolean
 garrow_decimal128_array_builder_append(GArrowDecimal128ArrayBuilder *builder,
@@ -1596,6 +1775,7 @@ garrow_decimal128_array_builder_append_null(GArrowDecimal128ArrayBuilder *builde
 #endif
 
 #define GARROW_TYPE_DECIMAL256_ARRAY_BUILDER (garrow_decimal256_array_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDecimal256ArrayBuilder,
                          garrow_decimal256_array_builder,
                          GARROW,
@@ -1606,6 +1786,7 @@ struct _GArrowDecimal256ArrayBuilderClass
   GArrowFixedSizeBinaryArrayBuilderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDecimal256ArrayBuilder *
 garrow_decimal256_array_builder_new(GArrowDecimal256DataType *data_type);
 
@@ -1624,6 +1805,7 @@ garrow_decimal256_array_builder_append_values(GArrowDecimal256ArrayBuilder *buil
                                               GError **error);
 
 #define GARROW_TYPE_UNION_ARRAY_BUILDER (garrow_union_array_builder_get_type())
+GARROW_AVAILABLE_IN_12_0
 G_DECLARE_DERIVABLE_TYPE(GArrowUnionArrayBuilder,
                          garrow_union_array_builder,
                          GARROW,
@@ -1648,6 +1830,7 @@ garrow_union_array_builder_append_value(GArrowUnionArrayBuilder *builder,
 
 #define GARROW_TYPE_DENSE_UNION_ARRAY_BUILDER                                            \
   (garrow_dense_union_array_builder_get_type())
+GARROW_AVAILABLE_IN_12_0
 G_DECLARE_DERIVABLE_TYPE(GArrowDenseUnionArrayBuilder,
                          garrow_dense_union_array_builder,
                          GARROW,
@@ -1664,6 +1847,7 @@ garrow_dense_union_array_builder_new(GArrowDenseUnionDataType *data_type, GError
 
 #define GARROW_TYPE_SPARSE_UNION_ARRAY_BUILDER                                           \
   (garrow_sparse_union_array_builder_get_type())
+GARROW_AVAILABLE_IN_12_0
 G_DECLARE_DERIVABLE_TYPE(GArrowSparseUnionArrayBuilder,
                          garrow_sparse_union_array_builder,
                          GARROW,
diff --git a/c_glib/arrow-glib/basic-array-definition.h b/c_glib/arrow-glib/basic-array-definition.h
index 54642dae018ec..2fa67c09c1cc4 100644
--- a/c_glib/arrow-glib/basic-array-definition.h
+++ b/c_glib/arrow-glib/basic-array-definition.h
@@ -21,9 +21,12 @@
 
 #include <glib-object.h>
 
+#include <arrow-glib/version.h>
+
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_ARRAY (garrow_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowArray, garrow_array, GARROW, ARRAY, GObject)
 struct _GArrowArrayClass
 {
@@ -31,6 +34,7 @@ struct _GArrowArrayClass
 };
 
 #define GARROW_TYPE_EXTENSION_ARRAY (garrow_extension_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowExtensionArray, garrow_extension_array, GARROW, EXTENSION_ARRAY, GArrowArray)
 struct _GArrowExtensionArrayClass
diff --git a/c_glib/arrow-glib/basic-array.h b/c_glib/arrow-glib/basic-array.h
index ee6f40b1ddc24..95679aa37c57a 100644
--- a/c_glib/arrow-glib/basic-array.h
+++ b/c_glib/arrow-glib/basic-array.h
@@ -27,6 +27,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_EQUAL_OPTIONS (garrow_equal_options_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowEqualOptions, garrow_equal_options, GARROW, EQUAL_OPTIONS, GObject)
 struct _GArrowEqualOptionsClass
@@ -52,6 +53,7 @@ garrow_array_export(GArrowArray *array,
                     gpointer *c_abi_schema,
                     GError **error);
 
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_array_equal(GArrowArray *array, GArrowArray *other_array);
 GARROW_AVAILABLE_IN_5_0
@@ -59,8 +61,11 @@ gboolean
 garrow_array_equal_options(GArrowArray *array,
                            GArrowArray *other_array,
                            GArrowEqualOptions *options);
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_array_equal_approx(GArrowArray *array, GArrowArray *other_array);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_array_equal_range(GArrowArray *array,
                          gint64 start_index,
@@ -69,37 +74,60 @@ garrow_array_equal_range(GArrowArray *array,
                          gint64 end_index,
                          GArrowEqualOptions *options);
 
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_array_is_null(GArrowArray *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_array_is_valid(GArrowArray *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_array_get_length(GArrowArray *array);
+
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_array_get_offset(GArrowArray *array);
+
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_array_get_n_nulls(GArrowArray *array);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowBuffer *
 garrow_array_get_null_bitmap(GArrowArray *array);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowDataType *
 garrow_array_get_value_data_type(GArrowArray *array);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowType
 garrow_array_get_value_type(GArrowArray *array);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowArray *
 garrow_array_slice(GArrowArray *array, gint64 offset, gint64 length);
+
+GARROW_AVAILABLE_IN_ALL
 gchar *
 garrow_array_to_string(GArrowArray *array, GError **error);
+
 GARROW_AVAILABLE_IN_0_15
 GArrowArray *
 garrow_array_view(GArrowArray *array, GArrowDataType *return_type, GError **error);
+
 GARROW_AVAILABLE_IN_0_15
 gchar *
 garrow_array_diff_unified(GArrowArray *array, GArrowArray *other_array);
+
 GARROW_AVAILABLE_IN_4_0
 GArrowArray *
 garrow_array_concatenate(GArrowArray *array, GList *other_arrays, GError **error);
 
 #define GARROW_TYPE_NULL_ARRAY (garrow_null_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowNullArray, garrow_null_array, GARROW, NULL_ARRAY, GArrowArray)
 struct _GArrowNullArrayClass
@@ -107,10 +135,12 @@ struct _GArrowNullArrayClass
   GArrowArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowNullArray *
 garrow_null_array_new(gint64 length);
 
 #define GARROW_TYPE_PRIMITIVE_ARRAY (garrow_primitive_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowPrimitiveArray, garrow_primitive_array, GARROW, PRIMITIVE_ARRAY, GArrowArray)
 struct _GArrowPrimitiveArrayClass
@@ -119,6 +149,7 @@ struct _GArrowPrimitiveArrayClass
 };
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_1_0_FOR(garrow_primitive_array_get_data_buffer)
 GArrowBuffer *
 garrow_primitive_array_get_buffer(GArrowPrimitiveArray *array);
@@ -128,6 +159,7 @@ GArrowBuffer *
 garrow_primitive_array_get_data_buffer(GArrowPrimitiveArray *array);
 
 #define GARROW_TYPE_BOOLEAN_ARRAY (garrow_boolean_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowBooleanArray, garrow_boolean_array, GARROW, BOOLEAN_ARRAY, GArrowPrimitiveArray)
 struct _GArrowBooleanArrayClass
@@ -135,18 +167,23 @@ struct _GArrowBooleanArrayClass
   GArrowPrimitiveArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowBooleanArray *
 garrow_boolean_array_new(gint64 length,
                          GArrowBuffer *data,
                          GArrowBuffer *null_bitmap,
                          gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_boolean_array_get_value(GArrowBooleanArray *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean *
 garrow_boolean_array_get_values(GArrowBooleanArray *array, gint64 *length);
 
 #define GARROW_TYPE_NUMERIC_ARRAY (garrow_numeric_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowNumericArray, garrow_numeric_array, GARROW, NUMERIC_ARRAY, GArrowPrimitiveArray)
 struct _GArrowNumericArrayClass
@@ -155,6 +192,7 @@ struct _GArrowNumericArrayClass
 };
 
 #define GARROW_TYPE_INT8_ARRAY (garrow_int8_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowInt8Array, garrow_int8_array, GARROW, INT8_ARRAY, GArrowNumericArray)
 struct _GArrowInt8ArrayClass
@@ -162,18 +200,23 @@ struct _GArrowInt8ArrayClass
   GArrowNumericArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowInt8Array *
 garrow_int8_array_new(gint64 length,
                       GArrowBuffer *data,
                       GArrowBuffer *null_bitmap,
                       gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 gint8
 garrow_int8_array_get_value(GArrowInt8Array *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 const gint8 *
 garrow_int8_array_get_values(GArrowInt8Array *array, gint64 *length);
 
 #define GARROW_TYPE_UINT8_ARRAY (garrow_uint8_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowUInt8Array, garrow_uint8_array, GARROW, UINT8_ARRAY, GArrowNumericArray)
 struct _GArrowUInt8ArrayClass
@@ -181,18 +224,23 @@ struct _GArrowUInt8ArrayClass
   GArrowNumericArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowUInt8Array *
 garrow_uint8_array_new(gint64 length,
                        GArrowBuffer *data,
                        GArrowBuffer *null_bitmap,
                        gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 guint8
 garrow_uint8_array_get_value(GArrowUInt8Array *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 const guint8 *
 garrow_uint8_array_get_values(GArrowUInt8Array *array, gint64 *length);
 
 #define GARROW_TYPE_INT16_ARRAY (garrow_int16_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowInt16Array, garrow_int16_array, GARROW, INT16_ARRAY, GArrowNumericArray)
 struct _GArrowInt16ArrayClass
@@ -200,18 +248,23 @@ struct _GArrowInt16ArrayClass
   GArrowNumericArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowInt16Array *
 garrow_int16_array_new(gint64 length,
                        GArrowBuffer *data,
                        GArrowBuffer *null_bitmap,
                        gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 gint16
 garrow_int16_array_get_value(GArrowInt16Array *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 const gint16 *
 garrow_int16_array_get_values(GArrowInt16Array *array, gint64 *length);
 
 #define GARROW_TYPE_UINT16_ARRAY (garrow_uint16_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowUInt16Array, garrow_uint16_array, GARROW, UINT16_ARRAY, GArrowNumericArray)
 struct _GArrowUInt16ArrayClass
@@ -219,18 +272,23 @@ struct _GArrowUInt16ArrayClass
   GArrowNumericArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowUInt16Array *
 garrow_uint16_array_new(gint64 length,
                         GArrowBuffer *data,
                         GArrowBuffer *null_bitmap,
                         gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 guint16
 garrow_uint16_array_get_value(GArrowUInt16Array *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 const guint16 *
 garrow_uint16_array_get_values(GArrowUInt16Array *array, gint64 *length);
 
 #define GARROW_TYPE_INT32_ARRAY (garrow_int32_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowInt32Array, garrow_int32_array, GARROW, INT32_ARRAY, GArrowNumericArray)
 struct _GArrowInt32ArrayClass
@@ -238,18 +296,23 @@ struct _GArrowInt32ArrayClass
   GArrowNumericArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowInt32Array *
 garrow_int32_array_new(gint64 length,
                        GArrowBuffer *data,
                        GArrowBuffer *null_bitmap,
                        gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 gint32
 garrow_int32_array_get_value(GArrowInt32Array *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 const gint32 *
 garrow_int32_array_get_values(GArrowInt32Array *array, gint64 *length);
 
 #define GARROW_TYPE_UINT32_ARRAY (garrow_uint32_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowUInt32Array, garrow_uint32_array, GARROW, UINT32_ARRAY, GArrowNumericArray)
 struct _GArrowUInt32ArrayClass
@@ -257,18 +320,23 @@ struct _GArrowUInt32ArrayClass
   GArrowNumericArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowUInt32Array *
 garrow_uint32_array_new(gint64 length,
                         GArrowBuffer *data,
                         GArrowBuffer *null_bitmap,
                         gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 guint32
 garrow_uint32_array_get_value(GArrowUInt32Array *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 const guint32 *
 garrow_uint32_array_get_values(GArrowUInt32Array *array, gint64 *length);
 
 #define GARROW_TYPE_INT64_ARRAY (garrow_int64_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowInt64Array, garrow_int64_array, GARROW, INT64_ARRAY, GArrowNumericArray)
 struct _GArrowInt64ArrayClass
@@ -276,18 +344,23 @@ struct _GArrowInt64ArrayClass
   GArrowNumericArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowInt64Array *
 garrow_int64_array_new(gint64 length,
                        GArrowBuffer *data,
                        GArrowBuffer *null_bitmap,
                        gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_int64_array_get_value(GArrowInt64Array *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 const gint64 *
 garrow_int64_array_get_values(GArrowInt64Array *array, gint64 *length);
 
 #define GARROW_TYPE_UINT64_ARRAY (garrow_uint64_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowUInt64Array, garrow_uint64_array, GARROW, UINT64_ARRAY, GArrowNumericArray)
 struct _GArrowUInt64ArrayClass
@@ -295,18 +368,23 @@ struct _GArrowUInt64ArrayClass
   GArrowNumericArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowUInt64Array *
 garrow_uint64_array_new(gint64 length,
                         GArrowBuffer *data,
                         GArrowBuffer *null_bitmap,
                         gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 guint64
 garrow_uint64_array_get_value(GArrowUInt64Array *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 const guint64 *
 garrow_uint64_array_get_values(GArrowUInt64Array *array, gint64 *length);
 
 #define GARROW_TYPE_HALF_FLOAT_ARRAY (garrow_half_float_array_get_type())
+GARROW_AVAILABLE_IN_11_0
 G_DECLARE_DERIVABLE_TYPE(GArrowHalfFloatArray,
                          garrow_half_float_array,
                          GARROW,
@@ -332,6 +410,7 @@ const guint16 *
 garrow_half_float_array_get_values(GArrowHalfFloatArray *array, gint64 *length);
 
 #define GARROW_TYPE_FLOAT_ARRAY (garrow_float_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowFloatArray, garrow_float_array, GARROW, FLOAT_ARRAY, GArrowNumericArray)
 struct _GArrowFloatArrayClass
@@ -339,18 +418,23 @@ struct _GArrowFloatArrayClass
   GArrowNumericArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowFloatArray *
 garrow_float_array_new(gint64 length,
                        GArrowBuffer *data,
                        GArrowBuffer *null_bitmap,
                        gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 gfloat
 garrow_float_array_get_value(GArrowFloatArray *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 const gfloat *
 garrow_float_array_get_values(GArrowFloatArray *array, gint64 *length);
 
 #define GARROW_TYPE_DOUBLE_ARRAY (garrow_double_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowDoubleArray, garrow_double_array, GARROW, DOUBLE_ARRAY, GArrowNumericArray)
 struct _GArrowDoubleArrayClass
@@ -358,18 +442,23 @@ struct _GArrowDoubleArrayClass
   GArrowNumericArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDoubleArray *
 garrow_double_array_new(gint64 length,
                         GArrowBuffer *data,
                         GArrowBuffer *null_bitmap,
                         gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 gdouble
 garrow_double_array_get_value(GArrowDoubleArray *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 const gdouble *
 garrow_double_array_get_values(GArrowDoubleArray *array, gint64 *length);
 
 #define GARROW_TYPE_BINARY_ARRAY (garrow_binary_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowBinaryArray, garrow_binary_array, GARROW, BINARY_ARRAY, GArrowArray)
 struct _GArrowBinaryArrayClass
@@ -377,6 +466,7 @@ struct _GArrowBinaryArrayClass
   GArrowArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowBinaryArray *
 garrow_binary_array_new(gint64 length,
                         GArrowBuffer *value_offsets,
@@ -384,9 +474,12 @@ garrow_binary_array_new(gint64 length,
                         GArrowBuffer *null_bitmap,
                         gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 GBytes *
 garrow_binary_array_get_value(GArrowBinaryArray *array, gint64 i);
+
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_1_0_FOR(garrow_binary_array_get_data_buffer)
 GArrowBuffer *
 garrow_binary_array_get_buffer(GArrowBinaryArray *array);
@@ -394,10 +487,13 @@ garrow_binary_array_get_buffer(GArrowBinaryArray *array);
 GARROW_AVAILABLE_IN_1_0
 GArrowBuffer *
 garrow_binary_array_get_data_buffer(GArrowBinaryArray *array);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowBuffer *
 garrow_binary_array_get_offsets_buffer(GArrowBinaryArray *array);
 
 #define GARROW_TYPE_LARGE_BINARY_ARRAY (garrow_large_binary_array_get_type())
+GARROW_AVAILABLE_IN_0_16
 G_DECLARE_DERIVABLE_TYPE(GArrowLargeBinaryArray,
                          garrow_large_binary_array,
                          GARROW,
@@ -428,11 +524,13 @@ garrow_large_binary_array_get_buffer(GArrowLargeBinaryArray *array);
 GARROW_AVAILABLE_IN_1_0
 GArrowBuffer *
 garrow_large_binary_array_get_data_buffer(GArrowLargeBinaryArray *array);
+
 GARROW_AVAILABLE_IN_0_16
 GArrowBuffer *
 garrow_large_binary_array_get_offsets_buffer(GArrowLargeBinaryArray *array);
 
 #define GARROW_TYPE_STRING_ARRAY (garrow_string_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowStringArray, garrow_string_array, GARROW, STRING_ARRAY, GArrowBinaryArray)
 struct _GArrowStringArrayClass
@@ -440,6 +538,7 @@ struct _GArrowStringArrayClass
   GArrowBinaryArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowStringArray *
 garrow_string_array_new(gint64 length,
                         GArrowBuffer *value_offsets,
@@ -447,10 +546,12 @@ garrow_string_array_new(gint64 length,
                         GArrowBuffer *null_bitmap,
                         gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 gchar *
 garrow_string_array_get_string(GArrowStringArray *array, gint64 i);
 
 #define GARROW_TYPE_LARGE_STRING_ARRAY (garrow_large_string_array_get_type())
+GARROW_AVAILABLE_IN_0_16
 G_DECLARE_DERIVABLE_TYPE(GArrowLargeStringArray,
                          garrow_large_string_array,
                          GARROW,
@@ -474,6 +575,7 @@ gchar *
 garrow_large_string_array_get_string(GArrowLargeStringArray *array, gint64 i);
 
 #define GARROW_TYPE_DATE32_ARRAY (garrow_date32_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowDate32Array, garrow_date32_array, GARROW, DATE32_ARRAY, GArrowNumericArray)
 struct _GArrowDate32ArrayClass
@@ -481,18 +583,23 @@ struct _GArrowDate32ArrayClass
   GArrowNumericArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDate32Array *
 garrow_date32_array_new(gint64 length,
                         GArrowBuffer *data,
                         GArrowBuffer *null_bitmap,
                         gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 gint32
 garrow_date32_array_get_value(GArrowDate32Array *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 const gint32 *
 garrow_date32_array_get_values(GArrowDate32Array *array, gint64 *length);
 
 #define GARROW_TYPE_DATE64_ARRAY (garrow_date64_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowDate64Array, garrow_date64_array, GARROW, DATE64_ARRAY, GArrowNumericArray)
 struct _GArrowDate64ArrayClass
@@ -500,18 +607,23 @@ struct _GArrowDate64ArrayClass
   GArrowNumericArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDate64Array *
 garrow_date64_array_new(gint64 length,
                         GArrowBuffer *data,
                         GArrowBuffer *null_bitmap,
                         gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_date64_array_get_value(GArrowDate64Array *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 const gint64 *
 garrow_date64_array_get_values(GArrowDate64Array *array, gint64 *length);
 
 #define GARROW_TYPE_TIMESTAMP_ARRAY (garrow_timestamp_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowTimestampArray,
                          garrow_timestamp_array,
                          GARROW,
@@ -522,6 +634,7 @@ struct _GArrowTimestampArrayClass
   GArrowNumericArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowTimestampArray *
 garrow_timestamp_array_new(GArrowTimestampDataType *data_type,
                            gint64 length,
@@ -529,12 +642,16 @@ garrow_timestamp_array_new(GArrowTimestampDataType *data_type,
                            GArrowBuffer *null_bitmap,
                            gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_timestamp_array_get_value(GArrowTimestampArray *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 const gint64 *
 garrow_timestamp_array_get_values(GArrowTimestampArray *array, gint64 *length);
 
 #define GARROW_TYPE_TIME32_ARRAY (garrow_time32_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowTime32Array, garrow_time32_array, GARROW, TIME32_ARRAY, GArrowNumericArray)
 struct _GArrowTime32ArrayClass
@@ -542,6 +659,7 @@ struct _GArrowTime32ArrayClass
   GArrowNumericArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowTime32Array *
 garrow_time32_array_new(GArrowTime32DataType *data_type,
                         gint64 length,
@@ -549,12 +667,16 @@ garrow_time32_array_new(GArrowTime32DataType *data_type,
                         GArrowBuffer *null_bitmap,
                         gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 gint32
 garrow_time32_array_get_value(GArrowTime32Array *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 const gint32 *
 garrow_time32_array_get_values(GArrowTime32Array *array, gint64 *length);
 
 #define GARROW_TYPE_TIME64_ARRAY (garrow_time64_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowTime64Array, garrow_time64_array, GARROW, TIME64_ARRAY, GArrowNumericArray)
 struct _GArrowTime64ArrayClass
@@ -562,6 +684,7 @@ struct _GArrowTime64ArrayClass
   GArrowNumericArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowTime64Array *
 garrow_time64_array_new(GArrowTime64DataType *data_type,
                         gint64 length,
@@ -569,12 +692,16 @@ garrow_time64_array_new(GArrowTime64DataType *data_type,
                         GArrowBuffer *null_bitmap,
                         gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_time64_array_get_value(GArrowTime64Array *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 const gint64 *
 garrow_time64_array_get_values(GArrowTime64Array *array, gint64 *length);
 
 #define GARROW_TYPE_MONTH_INTERVAL_ARRAY (garrow_month_interval_array_get_type())
+GARROW_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GArrowMonthIntervalArray,
                          garrow_month_interval_array,
                          GARROW,
@@ -594,11 +721,13 @@ garrow_month_interval_array_new(gint64 length,
 GARROW_AVAILABLE_IN_8_0
 gint32
 garrow_month_interval_array_get_value(GArrowMonthIntervalArray *array, gint64 i);
+
 GARROW_AVAILABLE_IN_8_0
 const gint32 *
 garrow_month_interval_array_get_values(GArrowMonthIntervalArray *array, gint64 *length);
 
 #define GARROW_TYPE_DAY_TIME_INTERVAL_ARRAY (garrow_day_time_interval_array_get_type())
+GARROW_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GArrowDayTimeIntervalArray,
                          garrow_day_time_interval_array,
                          GARROW,
@@ -618,12 +747,14 @@ garrow_day_time_interval_array_new(gint64 length,
 GARROW_AVAILABLE_IN_8_0
 GArrowDayMillisecond *
 garrow_day_time_interval_array_get_value(GArrowDayTimeIntervalArray *array, gint64 i);
+
 GARROW_AVAILABLE_IN_8_0
 GList *
 garrow_day_time_interval_array_get_values(GArrowDayTimeIntervalArray *array);
 
 #define GARROW_TYPE_MONTH_DAY_NANO_INTERVAL_ARRAY                                        \
   (garrow_month_day_nano_interval_array_get_type())
+GARROW_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GArrowMonthDayNanoIntervalArray,
                          garrow_month_day_nano_interval_array,
                          GARROW,
@@ -649,6 +780,7 @@ GList *
 garrow_month_day_nano_interval_array_get_values(GArrowMonthDayNanoIntervalArray *array);
 
 #define GARROW_TYPE_FIXED_SIZE_BINARY_ARRAY (garrow_fixed_size_binary_array_get_type())
+GARROW_AVAILABLE_IN_3_0
 G_DECLARE_DERIVABLE_TYPE(GArrowFixedSizeBinaryArray,
                          garrow_fixed_size_binary_array,
                          GARROW,
@@ -669,14 +801,17 @@ garrow_fixed_size_binary_array_new(GArrowFixedSizeBinaryDataType *data_type,
 GARROW_AVAILABLE_IN_3_0
 gint32
 garrow_fixed_size_binary_array_get_byte_width(GArrowFixedSizeBinaryArray *array);
+
 GARROW_AVAILABLE_IN_3_0
 GBytes *
 garrow_fixed_size_binary_array_get_value(GArrowFixedSizeBinaryArray *array, gint64 i);
+
 GARROW_AVAILABLE_IN_3_0
 GBytes *
 garrow_fixed_size_binary_array_get_values_bytes(GArrowFixedSizeBinaryArray *array);
 
 #define GARROW_TYPE_DECIMAL128_ARRAY (garrow_decimal128_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDecimal128Array,
                          garrow_decimal128_array,
                          GARROW,
@@ -687,12 +822,16 @@ struct _GArrowDecimal128ArrayClass
   GArrowFixedSizeBinaryArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 gchar *
 garrow_decimal128_array_format_value(GArrowDecimal128Array *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowDecimal128 *
 garrow_decimal128_array_get_value(GArrowDecimal128Array *array, gint64 i);
 
 #define GARROW_TYPE_DECIMAL256_ARRAY (garrow_decimal256_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDecimal256Array,
                          garrow_decimal256_array,
                          GARROW,
@@ -703,8 +842,11 @@ struct _GArrowDecimal256ArrayClass
   GArrowFixedSizeBinaryArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 gchar *
 garrow_decimal256_array_format_value(GArrowDecimal256Array *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowDecimal256 *
 garrow_decimal256_array_get_value(GArrowDecimal256Array *array, gint64 i);
 
diff --git a/c_glib/arrow-glib/basic-array.hpp b/c_glib/arrow-glib/basic-array.hpp
index f010cf3db4bc3..b2a7ed6ae075f 100644
--- a/c_glib/arrow-glib/basic-array.hpp
+++ b/c_glib/arrow-glib/basic-array.hpp
@@ -23,22 +23,32 @@
 
 #include <arrow-glib/basic-array.h>
 
+GARROW_EXTERN
 arrow::EqualOptions *
 garrow_equal_options_get_raw(GArrowEqualOptions *equal_options);
 
+GARROW_EXTERN
 GArrowArray *
 garrow_array_new_raw(std::shared_ptr<arrow::Array> *arrow_array);
+
+GARROW_EXTERN
 GArrowArray *
 garrow_array_new_raw(std::shared_ptr<arrow::Array> *arrow_array,
                      const gchar *first_property_name,
                      ...);
+
+GARROW_EXTERN
 GArrowArray *
 garrow_array_new_raw_valist(std::shared_ptr<arrow::Array> *arrow_array,
                             const gchar *first_property_name,
                             va_list args);
+
+GARROW_EXTERN
 GArrowExtensionArray *
 garrow_extension_array_new_raw(std::shared_ptr<arrow::Array> *arrow_array,
                                GArrowArray *storage);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::Array>
 garrow_array_get_raw(GArrowArray *array);
 
diff --git a/c_glib/arrow-glib/basic-data-type.cpp b/c_glib/arrow-glib/basic-data-type.cpp
index 36646a9733cd3..d1c06000065dc 100644
--- a/c_glib/arrow-glib/basic-data-type.cpp
+++ b/c_glib/arrow-glib/basic-data-type.cpp
@@ -1801,6 +1801,8 @@ garrow_extension_data_type_wrap_chunked_array(GArrowExtensionDataType *data_type
   return garrow_chunked_array_new_raw(&arrow_extension_chunked_array);
 }
 
+G_END_DECLS
+
 static std::shared_ptr<arrow::DataType>
 garrow_extension_data_type_get_storage_data_type_raw(GArrowExtensionDataType *data_type)
 {
@@ -1808,8 +1810,6 @@ garrow_extension_data_type_get_storage_data_type_raw(GArrowExtensionDataType *da
   return garrow_data_type_get_raw(priv->storage_data_type);
 }
 
-G_END_DECLS
-
 namespace garrow {
   GExtensionType::GExtensionType(GArrowExtensionDataType *garrow_data_type)
     : arrow::ExtensionType(
diff --git a/c_glib/arrow-glib/basic-data-type.h b/c_glib/arrow-glib/basic-data-type.h
index 01c9e5ef6e40a..77180018c9be8 100644
--- a/c_glib/arrow-glib/basic-data-type.h
+++ b/c_glib/arrow-glib/basic-data-type.h
@@ -28,6 +28,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_DATA_TYPE (garrow_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDataType, garrow_data_type, GARROW, DATA_TYPE, GObject)
 struct _GArrowDataTypeClass
 {
@@ -42,17 +43,24 @@ GARROW_AVAILABLE_IN_6_0
 gpointer
 garrow_data_type_export(GArrowDataType *data_type, GError **error);
 
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_data_type_equal(GArrowDataType *data_type, GArrowDataType *other_data_type);
+
+GARROW_AVAILABLE_IN_ALL
 gchar *
 garrow_data_type_to_string(GArrowDataType *data_type);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowType
 garrow_data_type_get_id(GArrowDataType *data_type);
+
 GARROW_AVAILABLE_IN_3_0
 gchar *
 garrow_data_type_get_name(GArrowDataType *data_type);
 
 #define GARROW_TYPE_FIXED_WIDTH_DATA_TYPE (garrow_fixed_width_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowFixedWidthDataType,
                          garrow_fixed_width_data_type,
                          GARROW,
@@ -63,6 +71,7 @@ struct _GArrowFixedWidthDataTypeClass
   GArrowDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 gint
 garrow_fixed_width_data_type_get_bit_width(GArrowFixedWidthDataType *data_type);
 /* TODO:
@@ -71,6 +80,7 @@ GList *garrow_fixed_width_data_type_get_buffer_layout(GArrowFixedWidthDataType
 */
 
 #define GARROW_TYPE_NULL_DATA_TYPE (garrow_null_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowNullDataType, garrow_null_data_type, GARROW, NULL_DATA_TYPE, GArrowDataType)
 struct _GArrowNullDataTypeClass
@@ -78,10 +88,12 @@ struct _GArrowNullDataTypeClass
   GArrowDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowNullDataType *
 garrow_null_data_type_new(void);
 
 #define GARROW_TYPE_BOOLEAN_DATA_TYPE (garrow_boolean_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowBooleanDataType,
                          garrow_boolean_data_type,
                          GARROW,
@@ -92,10 +104,12 @@ struct _GArrowBooleanDataTypeClass
   GArrowFixedWidthDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowBooleanDataType *
 garrow_boolean_data_type_new(void);
 
 #define GARROW_TYPE_NUMERIC_DATA_TYPE (garrow_numeric_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowNumericDataType,
                          garrow_numeric_data_type,
                          GARROW,
@@ -107,6 +121,7 @@ struct _GArrowNumericDataTypeClass
 };
 
 #define GARROW_TYPE_INTEGER_DATA_TYPE (garrow_integer_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowIntegerDataType,
                          garrow_integer_data_type,
                          GARROW,
@@ -122,6 +137,7 @@ gboolean
 garrow_integer_data_type_is_signed(GArrowIntegerDataType *data_type);
 
 #define GARROW_TYPE_INT8_DATA_TYPE (garrow_int8_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowInt8DataType,
                          garrow_int8_data_type,
                          GARROW,
@@ -132,10 +148,12 @@ struct _GArrowInt8DataTypeClass
   GArrowIntegerDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowInt8DataType *
 garrow_int8_data_type_new(void);
 
 #define GARROW_TYPE_UINT8_DATA_TYPE (garrow_uint8_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowUInt8DataType,
                          garrow_uint8_data_type,
                          GARROW,
@@ -146,10 +164,12 @@ struct _GArrowUInt8DataTypeClass
   GArrowIntegerDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowUInt8DataType *
 garrow_uint8_data_type_new(void);
 
 #define GARROW_TYPE_INT16_DATA_TYPE (garrow_int16_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowInt16DataType,
                          garrow_int16_data_type,
                          GARROW,
@@ -160,10 +180,12 @@ struct _GArrowInt16DataTypeClass
   GArrowIntegerDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowInt16DataType *
 garrow_int16_data_type_new(void);
 
 #define GARROW_TYPE_UINT16_DATA_TYPE (garrow_uint16_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowUInt16DataType,
                          garrow_uint16_data_type,
                          GARROW,
@@ -174,10 +196,12 @@ struct _GArrowUInt16DataTypeClass
   GArrowIntegerDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowUInt16DataType *
 garrow_uint16_data_type_new(void);
 
 #define GARROW_TYPE_INT32_DATA_TYPE (garrow_int32_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowInt32DataType,
                          garrow_int32_data_type,
                          GARROW,
@@ -188,10 +212,12 @@ struct _GArrowInt32DataTypeClass
   GArrowIntegerDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowInt32DataType *
 garrow_int32_data_type_new(void);
 
 #define GARROW_TYPE_UINT32_DATA_TYPE (garrow_uint32_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowUInt32DataType,
                          garrow_uint32_data_type,
                          GARROW,
@@ -202,10 +228,12 @@ struct _GArrowUInt32DataTypeClass
   GArrowIntegerDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowUInt32DataType *
 garrow_uint32_data_type_new(void);
 
 #define GARROW_TYPE_INT64_DATA_TYPE (garrow_int64_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowInt64DataType,
                          garrow_int64_data_type,
                          GARROW,
@@ -216,10 +244,12 @@ struct _GArrowInt64DataTypeClass
   GArrowIntegerDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowInt64DataType *
 garrow_int64_data_type_new(void);
 
 #define GARROW_TYPE_UINT64_DATA_TYPE (garrow_uint64_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowUInt64DataType,
                          garrow_uint64_data_type,
                          GARROW,
@@ -230,10 +260,12 @@ struct _GArrowUInt64DataTypeClass
   GArrowIntegerDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowUInt64DataType *
 garrow_uint64_data_type_new(void);
 
 #define GARROW_TYPE_FLOATING_POINT_DATA_TYPE (garrow_floating_point_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowFloatingPointDataType,
                          garrow_floating_point_data_type,
                          GARROW,
@@ -245,6 +277,7 @@ struct _GArrowFloatingPointDataTypeClass
 };
 
 #define GARROW_TYPE_HALF_FLOAT_DATA_TYPE (garrow_half_float_data_type_get_type())
+GARROW_AVAILABLE_IN_11_0
 G_DECLARE_DERIVABLE_TYPE(GArrowHalfFloatDataType,
                          garrow_half_float_data_type,
                          GARROW,
@@ -260,6 +293,7 @@ GArrowHalfFloatDataType *
 garrow_half_float_data_type_new(void);
 
 #define GARROW_TYPE_FLOAT_DATA_TYPE (garrow_float_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowFloatDataType,
                          garrow_float_data_type,
                          GARROW,
@@ -270,10 +304,12 @@ struct _GArrowFloatDataTypeClass
   GArrowFloatingPointDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowFloatDataType *
 garrow_float_data_type_new(void);
 
 #define GARROW_TYPE_DOUBLE_DATA_TYPE (garrow_double_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDoubleDataType,
                          garrow_double_data_type,
                          GARROW,
@@ -284,10 +320,12 @@ struct _GArrowDoubleDataTypeClass
   GArrowFloatingPointDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDoubleDataType *
 garrow_double_data_type_new(void);
 
 #define GARROW_TYPE_BINARY_DATA_TYPE (garrow_binary_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowBinaryDataType, garrow_binary_data_type, GARROW, BINARY_DATA_TYPE, GArrowDataType)
 struct _GArrowBinaryDataTypeClass
@@ -295,11 +333,13 @@ struct _GArrowBinaryDataTypeClass
   GArrowDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowBinaryDataType *
 garrow_binary_data_type_new(void);
 
 #define GARROW_TYPE_FIXED_SIZE_BINARY_DATA_TYPE                                          \
   (garrow_fixed_size_binary_data_type_get_type())
+GARROW_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GArrowFixedSizeBinaryDataType,
                          garrow_fixed_size_binary_data_type,
                          GARROW,
@@ -319,6 +359,7 @@ garrow_fixed_size_binary_data_type_get_byte_width(
   GArrowFixedSizeBinaryDataType *data_type);
 
 #define GARROW_TYPE_LARGE_BINARY_DATA_TYPE (garrow_large_binary_data_type_get_type())
+GARROW_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(GArrowLargeBinaryDataType,
                          garrow_large_binary_data_type,
                          GARROW,
@@ -334,6 +375,7 @@ GArrowLargeBinaryDataType *
 garrow_large_binary_data_type_new(void);
 
 #define GARROW_TYPE_STRING_DATA_TYPE (garrow_string_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowStringDataType,
                          garrow_string_data_type,
                          GARROW,
@@ -344,10 +386,12 @@ struct _GArrowStringDataTypeClass
   GArrowBinaryDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowStringDataType *
 garrow_string_data_type_new(void);
 
 #define GARROW_TYPE_LARGE_STRING_DATA_TYPE (garrow_large_string_data_type_get_type())
+GARROW_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(GArrowLargeStringDataType,
                          garrow_large_string_data_type,
                          GARROW,
@@ -363,6 +407,7 @@ GArrowLargeStringDataType *
 garrow_large_string_data_type_new(void);
 
 #define GARROW_TYPE_TEMPORAL_DATA_TYPE (garrow_temporal_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowTemporalDataType,
                          garrow_temporal_data_type,
                          GARROW,
@@ -374,6 +419,7 @@ struct _GArrowTemporalDataTypeClass
 };
 
 #define GARROW_TYPE_DATE32_DATA_TYPE (garrow_date32_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDate32DataType,
                          garrow_date32_data_type,
                          GARROW,
@@ -384,10 +430,12 @@ struct _GArrowDate32DataTypeClass
   GArrowTemporalDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDate32DataType *
 garrow_date32_data_type_new(void);
 
 #define GARROW_TYPE_DATE64_DATA_TYPE (garrow_date64_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDate64DataType,
                          garrow_date64_data_type,
                          GARROW,
@@ -398,10 +446,12 @@ struct _GArrowDate64DataTypeClass
   GArrowTemporalDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDate64DataType *
 garrow_date64_data_type_new(void);
 
 #define GARROW_TYPE_TIMESTAMP_DATA_TYPE (garrow_timestamp_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowTimestampDataType,
                          garrow_timestamp_data_type,
                          GARROW,
@@ -412,12 +462,16 @@ struct _GArrowTimestampDataTypeClass
   GArrowTemporalDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowTimestampDataType *
 garrow_timestamp_data_type_new(GArrowTimeUnit unit, GTimeZone *time_zone);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowTimeUnit
 garrow_timestamp_data_type_get_unit(GArrowTimestampDataType *data_type);
 
 #define GARROW_TYPE_TIME_DATA_TYPE (garrow_time_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowTimeDataType,
                          garrow_time_data_type,
                          GARROW,
@@ -428,10 +482,12 @@ struct _GArrowTimeDataTypeClass
   GArrowTemporalDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowTimeUnit
 garrow_time_data_type_get_unit(GArrowTimeDataType *time_data_type);
 
 #define GARROW_TYPE_TIME32_DATA_TYPE (garrow_time32_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowTime32DataType,
                          garrow_time32_data_type,
                          GARROW,
@@ -442,10 +498,12 @@ struct _GArrowTime32DataTypeClass
   GArrowTimeDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowTime32DataType *
 garrow_time32_data_type_new(GArrowTimeUnit unit, GError **error);
 
 #define GARROW_TYPE_TIME64_DATA_TYPE (garrow_time64_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowTime64DataType,
                          garrow_time64_data_type,
                          GARROW,
@@ -456,10 +514,12 @@ struct _GArrowTime64DataTypeClass
   GArrowTimeDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowTime64DataType *
 garrow_time64_data_type_new(GArrowTimeUnit unit, GError **error);
 
 #define GARROW_TYPE_INTERVAL_DATA_TYPE (garrow_interval_data_type_get_type())
+GARROW_AVAILABLE_IN_7_0
 G_DECLARE_DERIVABLE_TYPE(GArrowIntervalDataType,
                          garrow_interval_data_type,
                          GARROW,
@@ -475,6 +535,7 @@ GArrowIntervalType
 garrow_interval_data_type_get_interval_type(GArrowIntervalDataType *type);
 
 #define GARROW_TYPE_MONTH_INTERVAL_DATA_TYPE (garrow_month_interval_data_type_get_type())
+GARROW_AVAILABLE_IN_7_0
 G_DECLARE_DERIVABLE_TYPE(GArrowMonthIntervalDataType,
                          garrow_month_interval_data_type,
                          GARROW,
@@ -491,6 +552,7 @@ garrow_month_interval_data_type_new(void);
 
 #define GARROW_TYPE_DAY_TIME_INTERVAL_DATA_TYPE                                          \
   (garrow_day_time_interval_data_type_get_type())
+GARROW_AVAILABLE_IN_7_0
 G_DECLARE_DERIVABLE_TYPE(GArrowDayTimeIntervalDataType,
                          garrow_day_time_interval_data_type,
                          GARROW,
@@ -507,6 +569,7 @@ garrow_day_time_interval_data_type_new(void);
 
 #define GARROW_TYPE_MONTH_DAY_NANO_INTERVAL_DATA_TYPE                                    \
   (garrow_month_day_nano_interval_data_type_get_type())
+GARROW_AVAILABLE_IN_7_0
 G_DECLARE_DERIVABLE_TYPE(GArrowMonthDayNanoIntervalDataType,
                          garrow_month_day_nano_interval_data_type,
                          GARROW,
@@ -522,6 +585,7 @@ GArrowMonthDayNanoIntervalDataType *
 garrow_month_day_nano_interval_data_type_new(void);
 
 #define GARROW_TYPE_DECIMAL_DATA_TYPE (garrow_decimal_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDecimalDataType,
                          garrow_decimal_data_type,
                          GARROW,
@@ -532,14 +596,20 @@ struct _GArrowDecimalDataTypeClass
   GArrowFixedSizeBinaryDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDecimalDataType *
 garrow_decimal_data_type_new(gint32 precision, gint32 scale, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gint32
 garrow_decimal_data_type_get_precision(GArrowDecimalDataType *decimal_data_type);
+
+GARROW_AVAILABLE_IN_ALL
 gint32
 garrow_decimal_data_type_get_scale(GArrowDecimalDataType *decimal_data_type);
 
 #define GARROW_TYPE_DECIMAL128_DATA_TYPE (garrow_decimal128_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDecimal128DataType,
                          garrow_decimal128_data_type,
                          GARROW,
@@ -559,6 +629,7 @@ GArrowDecimal128DataType *
 garrow_decimal128_data_type_new(gint32 precision, gint32 scale, GError **error);
 
 #define GARROW_TYPE_DECIMAL256_DATA_TYPE (garrow_decimal256_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDecimal256DataType,
                          garrow_decimal256_data_type,
                          GARROW,
@@ -578,6 +649,7 @@ GArrowDecimal256DataType *
 garrow_decimal256_data_type_new(gint32 precision, gint32 scale, GError **error);
 
 #define GARROW_TYPE_EXTENSION_DATA_TYPE (garrow_extension_data_type_get_type())
+GARROW_AVAILABLE_IN_3_0
 G_DECLARE_DERIVABLE_TYPE(GArrowExtensionDataType,
                          garrow_extension_data_type,
                          GARROW,
@@ -628,6 +700,7 @@ garrow_extension_data_type_wrap_chunked_array(GArrowExtensionDataType *data_type
 
 #define GARROW_TYPE_EXTENSION_DATA_TYPE_REGISTRY                                         \
   (garrow_extension_data_type_registry_get_type())
+GARROW_AVAILABLE_IN_3_0
 G_DECLARE_DERIVABLE_TYPE(GArrowExtensionDataTypeRegistry,
                          garrow_extension_data_type_registry,
                          GARROW,
diff --git a/c_glib/arrow-glib/buffer.h b/c_glib/arrow-glib/buffer.h
index 8f93a5ef0ddb2..29308e935aba2 100644
--- a/c_glib/arrow-glib/buffer.h
+++ b/c_glib/arrow-glib/buffer.h
@@ -21,44 +21,70 @@
 
 #include <glib-object.h>
 
+#include <arrow-glib/version.h>
+
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_BUFFER (garrow_buffer_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowBuffer, garrow_buffer, GARROW, BUFFER, GObject)
 struct _GArrowBufferClass
 {
   GObjectClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowBuffer *
 garrow_buffer_new(const guint8 *data, gint64 size);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowBuffer *
 garrow_buffer_new_bytes(GBytes *data);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_buffer_equal(GArrowBuffer *buffer, GArrowBuffer *other_buffer);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_buffer_equal_n_bytes(GArrowBuffer *buffer,
                             GArrowBuffer *other_buffer,
                             gint64 n_bytes);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_buffer_is_mutable(GArrowBuffer *buffer);
+
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_buffer_get_capacity(GArrowBuffer *buffer);
+
+GARROW_AVAILABLE_IN_ALL
 GBytes *
 garrow_buffer_get_data(GArrowBuffer *buffer);
+
+GARROW_AVAILABLE_IN_ALL
 GBytes *
 garrow_buffer_get_mutable_data(GArrowBuffer *buffer);
+
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_buffer_get_size(GArrowBuffer *buffer);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowBuffer *
 garrow_buffer_get_parent(GArrowBuffer *buffer);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowBuffer *
 garrow_buffer_copy(GArrowBuffer *buffer, gint64 start, gint64 size, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowBuffer *
 garrow_buffer_slice(GArrowBuffer *buffer, gint64 offset, gint64 size);
 
 #define GARROW_TYPE_MUTABLE_BUFFER (garrow_mutable_buffer_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowMutableBuffer, garrow_mutable_buffer, GARROW, MUTABLE_BUFFER, GArrowBuffer)
 struct _GArrowMutableBufferClass
@@ -66,12 +92,19 @@ struct _GArrowMutableBufferClass
   GArrowBufferClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowMutableBuffer *
 garrow_mutable_buffer_new(guint8 *data, gint64 size);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowMutableBuffer *
 garrow_mutable_buffer_new_bytes(GBytes *data);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowMutableBuffer *
 garrow_mutable_buffer_slice(GArrowMutableBuffer *buffer, gint64 offset, gint64 size);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_mutable_buffer_set_data(GArrowMutableBuffer *buffer,
                                gint64 offset,
@@ -80,6 +113,7 @@ garrow_mutable_buffer_set_data(GArrowMutableBuffer *buffer,
                                GError **error);
 
 #define GARROW_TYPE_RESIZABLE_BUFFER (garrow_resizable_buffer_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowResizableBuffer,
                          garrow_resizable_buffer,
                          GARROW,
@@ -90,12 +124,17 @@ struct _GArrowResizableBufferClass
   GArrowMutableBufferClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowResizableBuffer *
 garrow_resizable_buffer_new(gint64 initial_size, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_resizable_buffer_resize(GArrowResizableBuffer *buffer,
                                gint64 new_size,
                                GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_resizable_buffer_reserve(GArrowResizableBuffer *buffer,
                                 gint64 new_capacity,
diff --git a/c_glib/arrow-glib/buffer.hpp b/c_glib/arrow-glib/buffer.hpp
index 5d922371c3b6b..7e4d7ecee1c1c 100644
--- a/c_glib/arrow-glib/buffer.hpp
+++ b/c_glib/arrow-glib/buffer.hpp
@@ -23,20 +23,32 @@
 
 #include <arrow-glib/buffer.h>
 
+GARROW_EXTERN
 GArrowBuffer *
 garrow_buffer_new_raw(std::shared_ptr<arrow::Buffer> *arrow_buffer);
+
+GARROW_EXTERN
 GArrowBuffer *
 garrow_buffer_new_raw_bytes(std::shared_ptr<arrow::Buffer> *arrow_buffer, GBytes *data);
+
+GARROW_EXTERN
 GArrowBuffer *
 garrow_buffer_new_raw_parent(std::shared_ptr<arrow::Buffer> *arrow_buffer,
                              GArrowBuffer *parent);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::Buffer>
 garrow_buffer_get_raw(GArrowBuffer *buffer);
 
+GARROW_EXTERN
 GArrowMutableBuffer *
 garrow_mutable_buffer_new_raw(std::shared_ptr<arrow::MutableBuffer> *arrow_buffer);
+
+GARROW_EXTERN
 GArrowMutableBuffer *
 garrow_mutable_buffer_new_raw_bytes(std::shared_ptr<arrow::MutableBuffer> *arrow_buffer,
                                     GBytes *data);
+
+GARROW_EXTERN
 GArrowResizableBuffer *
 garrow_resizable_buffer_new_raw(std::shared_ptr<arrow::ResizableBuffer> *arrow_buffer);
diff --git a/c_glib/arrow-glib/chunked-array-definition.h b/c_glib/arrow-glib/chunked-array-definition.h
index b687735419eeb..744f1077ea754 100644
--- a/c_glib/arrow-glib/chunked-array-definition.h
+++ b/c_glib/arrow-glib/chunked-array-definition.h
@@ -24,6 +24,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_CHUNKED_ARRAY (garrow_chunked_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowChunkedArray, garrow_chunked_array, GARROW, CHUNKED_ARRAY, GObject)
 struct _GArrowChunkedArrayClass
diff --git a/c_glib/arrow-glib/chunked-array.h b/c_glib/arrow-glib/chunked-array.h
index 6ca497942ff2e..712d16504f624 100644
--- a/c_glib/arrow-glib/chunked-array.h
+++ b/c_glib/arrow-glib/chunked-array.h
@@ -24,42 +24,61 @@
 
 G_BEGIN_DECLS
 
+GARROW_AVAILABLE_IN_ALL
 GArrowChunkedArray *
 garrow_chunked_array_new(GList *chunks, GError **error);
+
 GARROW_AVAILABLE_IN_11_0
 GArrowChunkedArray *
 garrow_chunked_array_new_empty(GArrowDataType *data_type, GError **error);
 
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_chunked_array_equal(GArrowChunkedArray *chunked_array,
                            GArrowChunkedArray *other_chunked_array);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDataType *
 garrow_chunked_array_get_value_data_type(GArrowChunkedArray *chunked_array);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowType
 garrow_chunked_array_get_value_type(GArrowChunkedArray *chunked_array);
 
 GARROW_DEPRECATED_IN_0_15_FOR(garrow_chunked_array_get_n_rows)
 guint64
 garrow_chunked_array_get_length(GArrowChunkedArray *chunked_array);
+
 GARROW_AVAILABLE_IN_0_15
 guint64
 garrow_chunked_array_get_n_rows(GArrowChunkedArray *chunked_array);
+
+GARROW_AVAILABLE_IN_ALL
 guint64
 garrow_chunked_array_get_n_nulls(GArrowChunkedArray *chunked_array);
+
+GARROW_AVAILABLE_IN_ALL
 guint
 garrow_chunked_array_get_n_chunks(GArrowChunkedArray *chunked_array);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowArray *
 garrow_chunked_array_get_chunk(GArrowChunkedArray *chunked_array, guint i);
+
+GARROW_AVAILABLE_IN_ALL
 GList *
 garrow_chunked_array_get_chunks(GArrowChunkedArray *chunked_array);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowChunkedArray *
 garrow_chunked_array_slice(GArrowChunkedArray *chunked_array,
                            guint64 offset,
                            guint64 length);
+
+GARROW_AVAILABLE_IN_ALL
 gchar *
 garrow_chunked_array_to_string(GArrowChunkedArray *chunked_array, GError **error);
+
 GARROW_AVAILABLE_IN_4_0
 GArrowArray *
 garrow_chunked_array_combine(GArrowChunkedArray *chunked_array, GError **error);
diff --git a/c_glib/arrow-glib/chunked-array.hpp b/c_glib/arrow-glib/chunked-array.hpp
index 9ce6cc76adfbf..674ef9606b96e 100644
--- a/c_glib/arrow-glib/chunked-array.hpp
+++ b/c_glib/arrow-glib/chunked-array.hpp
@@ -23,10 +23,15 @@
 
 #include <arrow-glib/chunked-array.h>
 
+GARROW_EXTERN
 GArrowChunkedArray *
 garrow_chunked_array_new_raw(std::shared_ptr<arrow::ChunkedArray> *arrow_chunked_array);
+
+GARROW_EXTERN
 GArrowChunkedArray *
 garrow_chunked_array_new_raw(std::shared_ptr<arrow::ChunkedArray> *arrow_chunked_array,
                              GArrowDataType *data_type);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::ChunkedArray>
 garrow_chunked_array_get_raw(GArrowChunkedArray *chunked_array);
diff --git a/c_glib/arrow-glib/codec.h b/c_glib/arrow-glib/codec.h
index 9b8611bb0a7ee..5865634a7d8e4 100644
--- a/c_glib/arrow-glib/codec.h
+++ b/c_glib/arrow-glib/codec.h
@@ -50,20 +50,25 @@ typedef enum {
 } GArrowCompressionType;
 
 #define GARROW_TYPE_CODEC (garrow_codec_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowCodec, garrow_codec, GARROW, CODEC, GObject)
 struct _GArrowCodecClass
 {
   GObjectClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowCodec *
 garrow_codec_new(GArrowCompressionType type, GError **error);
 
+GARROW_AVAILABLE_IN_ALL
 const gchar *
 garrow_codec_get_name(GArrowCodec *codec);
+
 GARROW_AVAILABLE_IN_2_0
 GArrowCompressionType
 garrow_codec_get_compression_type(GArrowCodec *codec);
+
 GARROW_AVAILABLE_IN_2_0
 gint
 garrow_codec_get_compression_level(GArrowCodec *codec);
diff --git a/c_glib/arrow-glib/codec.hpp b/c_glib/arrow-glib/codec.hpp
index f4cfaba18a00e..baea842ddf6b5 100644
--- a/c_glib/arrow-glib/codec.hpp
+++ b/c_glib/arrow-glib/codec.hpp
@@ -23,12 +23,18 @@
 
 #include <arrow-glib/codec.h>
 
+GARROW_EXTERN
 GArrowCompressionType
 garrow_compression_type_from_raw(arrow::Compression::type arrow_type);
+
+GARROW_EXTERN
 arrow::Compression::type
 garrow_compression_type_to_raw(GArrowCompressionType type);
 
+GARROW_EXTERN
 GArrowCodec *
 garrow_codec_new_raw(std::shared_ptr<arrow::util::Codec> *arrow_codec);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::util::Codec>
 garrow_codec_get_raw(GArrowCodec *codec);
diff --git a/c_glib/arrow-glib/composite-array.h b/c_glib/arrow-glib/composite-array.h
index c6e19f1c74e22..b8ba901363d0a 100644
--- a/c_glib/arrow-glib/composite-array.h
+++ b/c_glib/arrow-glib/composite-array.h
@@ -27,6 +27,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_LIST_ARRAY (garrow_list_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowListArray, garrow_list_array, GARROW, LIST_ARRAY, GArrowArray)
 struct _GArrowListArrayClass
@@ -34,6 +35,7 @@ struct _GArrowListArrayClass
   GArrowArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowListArray *
 garrow_list_array_new(GArrowDataType *data_type,
                       gint64 length,
@@ -42,24 +44,32 @@ garrow_list_array_new(GArrowDataType *data_type,
                       GArrowBuffer *null_bitmap,
                       gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDataType *
 garrow_list_array_get_value_type(GArrowListArray *array);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowArray *
 garrow_list_array_get_value(GArrowListArray *array, gint64 i);
+
 GARROW_AVAILABLE_IN_2_0
 GArrowArray *
 garrow_list_array_get_values(GArrowListArray *array);
+
 GARROW_AVAILABLE_IN_2_0
 gint32
 garrow_list_array_get_value_offset(GArrowListArray *array, gint64 i);
+
 GARROW_AVAILABLE_IN_2_0
 gint32
 garrow_list_array_get_value_length(GArrowListArray *array, gint64 i);
+
 GARROW_AVAILABLE_IN_2_0
 const gint32 *
 garrow_list_array_get_value_offsets(GArrowListArray *array, gint64 *n_offsets);
 
 #define GARROW_TYPE_LARGE_LIST_ARRAY (garrow_large_list_array_get_type())
+GARROW_AVAILABLE_IN_0_16
 G_DECLARE_DERIVABLE_TYPE(
   GArrowLargeListArray, garrow_large_list_array, GARROW, LARGE_LIST_ARRAY, GArrowArray)
 struct _GArrowLargeListArrayClass
@@ -79,23 +89,29 @@ garrow_large_list_array_new(GArrowDataType *data_type,
 GARROW_AVAILABLE_IN_0_16
 GArrowDataType *
 garrow_large_list_array_get_value_type(GArrowLargeListArray *array);
+
 GARROW_AVAILABLE_IN_0_16
 GArrowArray *
 garrow_large_list_array_get_value(GArrowLargeListArray *array, gint64 i);
+
 GARROW_AVAILABLE_IN_2_0
 GArrowArray *
 garrow_large_list_array_get_values(GArrowLargeListArray *array);
+
 GARROW_AVAILABLE_IN_2_0
 gint64
 garrow_large_list_array_get_value_offset(GArrowLargeListArray *array, gint64 i);
+
 GARROW_AVAILABLE_IN_2_0
 gint64
 garrow_large_list_array_get_value_length(GArrowLargeListArray *array, gint64 i);
+
 GARROW_AVAILABLE_IN_2_0
 const gint64 *
 garrow_large_list_array_get_value_offsets(GArrowLargeListArray *array, gint64 *n_offsets);
 
 #define GARROW_TYPE_STRUCT_ARRAY (garrow_struct_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowStructArray, garrow_struct_array, GARROW, STRUCT_ARRAY, GArrowArray)
 struct _GArrowStructArrayClass
@@ -103,6 +119,7 @@ struct _GArrowStructArrayClass
   GArrowArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowStructArray *
 garrow_struct_array_new(GArrowDataType *data_type,
                         gint64 length,
@@ -110,9 +127,11 @@ garrow_struct_array_new(GArrowDataType *data_type,
                         GArrowBuffer *null_bitmap,
                         gint64 n_nulls);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowArray *
 garrow_struct_array_get_field(GArrowStructArray *array, gint i);
 
+GARROW_AVAILABLE_IN_ALL
 GList *
 garrow_struct_array_get_fields(GArrowStructArray *array);
 
@@ -121,6 +140,7 @@ GList *
 garrow_struct_array_flatten(GArrowStructArray *array, GError **error);
 
 #define GARROW_TYPE_MAP_ARRAY (garrow_map_array_get_type())
+GARROW_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(
   GArrowMapArray, garrow_map_array, GARROW, MAP_ARRAY, GArrowListArray)
 struct _GArrowMapArrayClass
@@ -134,14 +154,17 @@ garrow_map_array_new(GArrowArray *offsets,
                      GArrowArray *keys,
                      GArrowArray *items,
                      GError **error);
+
 GARROW_AVAILABLE_IN_0_17
 GArrowArray *
 garrow_map_array_get_keys(GArrowMapArray *array);
+
 GARROW_AVAILABLE_IN_0_17
 GArrowArray *
 garrow_map_array_get_items(GArrowMapArray *array);
 
 #define GARROW_TYPE_UNION_ARRAY (garrow_union_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowUnionArray, garrow_union_array, GARROW, UNION_ARRAY, GArrowArray)
 struct _GArrowUnionArrayClass
@@ -152,13 +175,17 @@ struct _GArrowUnionArrayClass
 GARROW_AVAILABLE_IN_12_0
 gint8
 garrow_union_array_get_type_code(GArrowUnionArray *array, gint64 i);
+
 GARROW_AVAILABLE_IN_12_0
 gint
 garrow_union_array_get_child_id(GArrowUnionArray *array, gint64 i);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowArray *
 garrow_union_array_get_field(GArrowUnionArray *array, gint i);
 
 #define GARROW_TYPE_SPARSE_UNION_ARRAY (garrow_sparse_union_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowSparseUnionArray,
                          garrow_sparse_union_array,
                          GARROW,
@@ -169,8 +196,11 @@ struct _GArrowSparseUnionArrayClass
   GArrowUnionArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowSparseUnionArray *
 garrow_sparse_union_array_new(GArrowInt8Array *type_ids, GList *fields, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowSparseUnionArray *
 garrow_sparse_union_array_new_data_type(GArrowSparseUnionDataType *data_type,
                                         GArrowInt8Array *type_ids,
@@ -178,6 +208,7 @@ garrow_sparse_union_array_new_data_type(GArrowSparseUnionDataType *data_type,
                                         GError **error);
 
 #define GARROW_TYPE_DENSE_UNION_ARRAY (garrow_dense_union_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDenseUnionArray,
                          garrow_dense_union_array,
                          GARROW,
@@ -188,22 +219,27 @@ struct _GArrowDenseUnionArrayClass
   GArrowUnionArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDenseUnionArray *
 garrow_dense_union_array_new(GArrowInt8Array *type_ids,
                              GArrowInt32Array *value_offsets,
                              GList *fields,
                              GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowDenseUnionArray *
 garrow_dense_union_array_new_data_type(GArrowDenseUnionDataType *data_type,
                                        GArrowInt8Array *type_ids,
                                        GArrowInt32Array *value_offsets,
                                        GList *fields,
                                        GError **error);
+
 GARROW_AVAILABLE_IN_12_0
 gint32
 garrow_dense_union_array_get_value_offset(GArrowDenseUnionArray *array, gint64 i);
 
 #define GARROW_TYPE_DICTIONARY_ARRAY (garrow_dictionary_array_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowDictionaryArray, garrow_dictionary_array, GARROW, DICTIONARY_ARRAY, GArrowArray)
 struct _GArrowDictionaryArrayClass
@@ -211,22 +247,29 @@ struct _GArrowDictionaryArrayClass
   GArrowArrayClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDictionaryArray *
 garrow_dictionary_array_new(GArrowDataType *data_type,
                             GArrowArray *indices,
                             GArrowArray *dictionary,
                             GError **error);
+GARROW_AVAILABLE_IN_ALL
 GArrowArray *
 garrow_dictionary_array_get_indices(GArrowDictionaryArray *array);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowArray *
 garrow_dictionary_array_get_dictionary(GArrowDictionaryArray *array);
+
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_1_0_FOR(garrow_array_get_value_data_type)
 GArrowDictionaryDataType *
 garrow_dictionary_array_get_dictionary_data_type(GArrowDictionaryArray *array);
 #endif
 
 #define GARROW_TYPE_RUN_END_ENCODED_ARRAY (garrow_run_end_encoded_array_get_type())
+GARROW_AVAILABLE_IN_13_0
 G_DECLARE_DERIVABLE_TYPE(GArrowRunEndEncodedArray,
                          garrow_run_end_encoded_array,
                          GARROW,
@@ -248,9 +291,11 @@ garrow_run_end_encoded_array_new(GArrowDataType *data_type,
 GARROW_AVAILABLE_IN_13_0
 GArrowArray *
 garrow_run_end_encoded_array_get_run_ends(GArrowRunEndEncodedArray *array);
+
 GARROW_AVAILABLE_IN_13_0
 GArrowArray *
 garrow_run_end_encoded_array_get_values(GArrowRunEndEncodedArray *array);
+
 GARROW_AVAILABLE_IN_13_0
 GArrowArray *
 garrow_run_end_encoded_array_get_logical_run_ends(GArrowRunEndEncodedArray *array,
@@ -258,9 +303,11 @@ garrow_run_end_encoded_array_get_logical_run_ends(GArrowRunEndEncodedArray *arra
 GARROW_AVAILABLE_IN_13_0
 GArrowArray *
 garrow_run_end_encoded_array_get_logical_values(GArrowRunEndEncodedArray *array);
+
 GARROW_AVAILABLE_IN_13_0
 gint64
 garrow_run_end_encoded_array_find_physical_offset(GArrowRunEndEncodedArray *array);
+
 GARROW_AVAILABLE_IN_13_0
 gint64
 garrow_run_end_encoded_array_find_physical_length(GArrowRunEndEncodedArray *array);
diff --git a/c_glib/arrow-glib/composite-data-type.h b/c_glib/arrow-glib/composite-data-type.h
index e71d277a305c6..7a0a462af00f9 100644
--- a/c_glib/arrow-glib/composite-data-type.h
+++ b/c_glib/arrow-glib/composite-data-type.h
@@ -27,6 +27,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_LIST_DATA_TYPE (garrow_list_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowListDataType, garrow_list_data_type, GARROW, LIST_DATA_TYPE, GArrowDataType)
 struct _GArrowListDataTypeClass
@@ -34,18 +35,23 @@ struct _GArrowListDataTypeClass
   GArrowDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowListDataType *
 garrow_list_data_type_new(GArrowField *field);
+
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_13_FOR(garrow_list_data_type_get_field)
 GArrowField *
 garrow_list_data_type_get_value_field(GArrowListDataType *list_data_type);
 #endif
+
 GARROW_AVAILABLE_IN_0_13
 GArrowField *
 garrow_list_data_type_get_field(GArrowListDataType *list_data_type);
 
 #define GARROW_TYPE_LARGE_LIST_DATA_TYPE (garrow_large_list_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowLargeListDataType,
                          garrow_large_list_data_type,
                          GARROW,
@@ -59,11 +65,13 @@ struct _GArrowLargeListDataTypeClass
 GARROW_AVAILABLE_IN_0_16
 GArrowLargeListDataType *
 garrow_large_list_data_type_new(GArrowField *field);
+
 GARROW_AVAILABLE_IN_0_16
 GArrowField *
 garrow_large_list_data_type_get_field(GArrowLargeListDataType *large_list_data_type);
 
 #define GARROW_TYPE_STRUCT_DATA_TYPE (garrow_struct_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowStructDataType, garrow_struct_data_type, GARROW, STRUCT_DATA_TYPE, GArrowDataType)
 struct _GArrowStructDataTypeClass
@@ -71,22 +79,34 @@ struct _GArrowStructDataTypeClass
   GArrowDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowStructDataType *
 garrow_struct_data_type_new(GList *fields);
+
+GARROW_AVAILABLE_IN_ALL
 gint
 garrow_struct_data_type_get_n_fields(GArrowStructDataType *struct_data_type);
+
+GARROW_AVAILABLE_IN_ALL
 GList *
 garrow_struct_data_type_get_fields(GArrowStructDataType *struct_data_type);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowField *
 garrow_struct_data_type_get_field(GArrowStructDataType *struct_data_type, gint i);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowField *
 garrow_struct_data_type_get_field_by_name(GArrowStructDataType *struct_data_type,
                                           const gchar *name);
+
+GARROW_AVAILABLE_IN_ALL
 gint
 garrow_struct_data_type_get_field_index(GArrowStructDataType *struct_data_type,
                                         const gchar *name);
 
 #define GARROW_TYPE_MAP_DATA_TYPE (garrow_map_data_type_get_type())
+GARROW_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(
   GArrowMapDataType, garrow_map_data_type, GARROW, MAP_DATA_TYPE, GArrowListDataType)
 struct _GArrowMapDataTypeClass
@@ -105,6 +125,7 @@ GArrowDataType *
 garrow_map_data_type_get_item_type(GArrowMapDataType *map_data_type);
 
 #define GARROW_TYPE_UNION_DATA_TYPE (garrow_union_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowUnionDataType, garrow_union_data_type, GARROW, UNION_DATA_TYPE, GArrowDataType)
 struct _GArrowUnionDataTypeClass
@@ -112,17 +133,25 @@ struct _GArrowUnionDataTypeClass
   GArrowDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 gint
 garrow_union_data_type_get_n_fields(GArrowUnionDataType *union_data_type);
+
+GARROW_AVAILABLE_IN_ALL
 GList *
 garrow_union_data_type_get_fields(GArrowUnionDataType *union_data_type);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowField *
 garrow_union_data_type_get_field(GArrowUnionDataType *union_data_type, gint i);
+
+GARROW_AVAILABLE_IN_ALL
 gint8 *
 garrow_union_data_type_get_type_codes(GArrowUnionDataType *union_data_type,
                                       gsize *n_type_codes);
 
 #define GARROW_TYPE_SPARSE_UNION_DATA_TYPE (garrow_sparse_union_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowSparseUnionDataType,
                          garrow_sparse_union_data_type,
                          GARROW,
@@ -133,10 +162,12 @@ struct _GArrowSparseUnionDataTypeClass
   GArrowUnionDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowSparseUnionDataType *
 garrow_sparse_union_data_type_new(GList *fields, gint8 *type_codes, gsize n_type_codes);
 
 #define GARROW_TYPE_DENSE_UNION_DATA_TYPE (garrow_dense_union_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDenseUnionDataType,
                          garrow_dense_union_data_type,
                          GARROW,
@@ -147,10 +178,12 @@ struct _GArrowDenseUnionDataTypeClass
   GArrowUnionDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDenseUnionDataType *
 garrow_dense_union_data_type_new(GList *fields, gint8 *type_codes, gsize n_type_codes);
 
 #define GARROW_TYPE_DICTIONARY_DATA_TYPE (garrow_dictionary_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDictionaryDataType,
                          garrow_dictionary_data_type,
                          GARROW,
@@ -161,22 +194,29 @@ struct _GArrowDictionaryDataTypeClass
   GArrowFixedWidthDataTypeClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDictionaryDataType *
 garrow_dictionary_data_type_new(GArrowDataType *index_data_type,
                                 GArrowDataType *value_data_type,
                                 gboolean ordered);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowDataType *
 garrow_dictionary_data_type_get_index_data_type(
   GArrowDictionaryDataType *dictionary_data_type);
+
 GARROW_AVAILABLE_IN_0_14
 GArrowDataType *
 garrow_dictionary_data_type_get_value_data_type(
   GArrowDictionaryDataType *dictionary_data_type);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_dictionary_data_type_is_ordered(GArrowDictionaryDataType *dictionary_data_type);
 
 #define GARROW_TYPE_RUN_END_ENCODED_DATA_TYPE                                            \
   (garrow_run_end_encoded_data_type_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowRunEndEncodedDataType,
                          garrow_run_end_encoded_data_type,
                          GARROW,
@@ -195,6 +235,7 @@ GARROW_AVAILABLE_IN_13_0
 GArrowDataType *
 garrow_run_end_encoded_data_type_get_run_end_data_type(
   GArrowRunEndEncodedDataType *data_type);
+
 GARROW_AVAILABLE_IN_13_0
 GArrowDataType *
 garrow_run_end_encoded_data_type_get_value_data_type(
diff --git a/c_glib/arrow-glib/compute-definition.h b/c_glib/arrow-glib/compute-definition.h
index b699e9e99a9fc..a060f16f62cf6 100644
--- a/c_glib/arrow-glib/compute-definition.h
+++ b/c_glib/arrow-glib/compute-definition.h
@@ -21,9 +21,12 @@
 
 #include <glib-object.h>
 
+#include <arrow-glib/version.h>
+
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_FUNCTION_OPTIONS (garrow_function_options_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowFunctionOptions, garrow_function_options, GARROW, FUNCTION_OPTIONS, GObject)
 struct _GArrowFunctionOptionsClass
@@ -32,6 +35,7 @@ struct _GArrowFunctionOptionsClass
 };
 
 #define GARROW_TYPE_CAST_OPTIONS (garrow_cast_options_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowCastOptions, garrow_cast_options, GARROW, CAST_OPTIONS, GArrowFunctionOptions)
 struct _GArrowCastOptionsClass
@@ -40,6 +44,7 @@ struct _GArrowCastOptionsClass
 };
 
 #define GARROW_TYPE_EXPRESSION (garrow_expression_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowExpression, garrow_expression, GARROW, EXPRESSION, GObject)
 struct _GArrowExpressionClass
 {
diff --git a/c_glib/arrow-glib/compute.h b/c_glib/arrow-glib/compute.h
index 029cab136ad8f..54b0ddb014fbb 100644
--- a/c_glib/arrow-glib/compute.h
+++ b/c_glib/arrow-glib/compute.h
@@ -26,6 +26,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_EXECUTE_CONTEXT (garrow_execute_context_get_type())
+GARROW_AVAILABLE_IN_1_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowExecuteContext, garrow_execute_context, GARROW, EXECUTE_CONTEXT, GObject)
 struct _GArrowExecuteContextClass
@@ -46,6 +47,7 @@ gchar *
 garrow_function_options_to_string(GArrowFunctionOptions *options);
 
 #define GARROW_TYPE_FUNCTION_DOC (garrow_function_doc_get_type())
+GARROW_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowFunctionDoc, garrow_function_doc, GARROW, FUNCTION_DOC, GObject)
 struct _GArrowFunctionDocClass
@@ -67,6 +69,7 @@ gchar *
 garrow_function_doc_get_options_class_name(GArrowFunctionDoc *doc);
 
 #define GARROW_TYPE_FUNCTION (garrow_function_get_type())
+GARROW_AVAILABLE_IN_1_0
 G_DECLARE_DERIVABLE_TYPE(GArrowFunction, garrow_function, GARROW, FUNCTION, GObject)
 struct _GArrowFunctionClass
 {
@@ -110,6 +113,7 @@ gchar *
 garrow_function_to_string(GArrowFunction *function);
 
 #define GARROW_TYPE_EXECUTE_NODE_OPTIONS (garrow_execute_node_options_get_type())
+GARROW_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(GArrowExecuteNodeOptions,
                          garrow_execute_node_options,
                          GARROW,
@@ -121,6 +125,7 @@ struct _GArrowExecuteNodeOptionsClass
 };
 
 #define GARROW_TYPE_SOURCE_NODE_OPTIONS (garrow_source_node_options_get_type())
+GARROW_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(GArrowSourceNodeOptions,
                          garrow_source_node_options,
                          GARROW,
@@ -142,6 +147,7 @@ GArrowSourceNodeOptions *
 garrow_source_node_options_new_table(GArrowTable *table);
 
 #define GARROW_TYPE_FILTER_NODE_OPTIONS (garrow_filter_node_options_get_type())
+GARROW_AVAILABLE_IN_12_0
 G_DECLARE_DERIVABLE_TYPE(GArrowFilterNodeOptions,
                          garrow_filter_node_options,
                          GARROW,
@@ -157,6 +163,7 @@ GArrowFilterNodeOptions *
 garrow_filter_node_options_new(GArrowExpression *expression);
 
 #define GARROW_TYPE_PROJECT_NODE_OPTIONS (garrow_project_node_options_get_type())
+GARROW_AVAILABLE_IN_11_0
 G_DECLARE_DERIVABLE_TYPE(GArrowProjectNodeOptions,
                          garrow_project_node_options,
                          GARROW,
@@ -172,6 +179,7 @@ GArrowProjectNodeOptions *
 garrow_project_node_options_new(GList *expressions, gchar **names, gsize n_names);
 
 #define GARROW_TYPE_AGGREGATION (garrow_aggregation_get_type())
+GARROW_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowAggregation, garrow_aggregation, GARROW, AGGREGATION, GObject)
 struct _GArrowAggregationClass
@@ -187,6 +195,7 @@ garrow_aggregation_new(const gchar *function,
                        const gchar *output);
 
 #define GARROW_TYPE_AGGREGATE_NODE_OPTIONS (garrow_aggregate_node_options_get_type())
+GARROW_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(GArrowAggregateNodeOptions,
                          garrow_aggregate_node_options,
                          GARROW,
@@ -205,6 +214,7 @@ garrow_aggregate_node_options_new(GList *aggregations,
                                   GError **error);
 
 #define GARROW_TYPE_SINK_NODE_OPTIONS (garrow_sink_node_options_get_type())
+GARROW_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(GArrowSinkNodeOptions,
                          garrow_sink_node_options,
                          GARROW,
@@ -249,6 +259,7 @@ typedef enum {
 } GArrowJoinType;
 
 #define GARROW_TYPE_HASH_JOIN_NODE_OPTIONS (garrow_hash_join_node_options_get_type())
+GARROW_AVAILABLE_IN_7_0
 G_DECLARE_DERIVABLE_TYPE(GArrowHashJoinNodeOptions,
                          garrow_hash_join_node_options,
                          GARROW,
@@ -281,6 +292,7 @@ garrow_hash_join_node_options_set_right_outputs(GArrowHashJoinNodeOptions *optio
                                                 GError **error);
 
 #define GARROW_TYPE_EXECUTE_NODE (garrow_execute_node_get_type())
+GARROW_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowExecuteNode, garrow_execute_node, GARROW, EXECUTE_NODE, GObject)
 struct _GArrowExecuteNodeClass
@@ -296,6 +308,7 @@ GArrowSchema *
 garrow_execute_node_get_output_schema(GArrowExecuteNode *node);
 
 #define GARROW_TYPE_EXECUTE_PLAN (garrow_execute_plan_get_type())
+GARROW_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowExecutePlan, garrow_execute_plan, GARROW, EXECUTE_PLAN, GObject)
 struct _GArrowExecutePlanClass
@@ -365,10 +378,12 @@ GARROW_AVAILABLE_IN_6_0
 gboolean
 garrow_execute_plan_wait(GArrowExecutePlan *plan, GError **error);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowCastOptions *
 garrow_cast_options_new(void);
 
 #define GARROW_TYPE_SCALAR_AGGREGATE_OPTIONS (garrow_scalar_aggregate_options_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GArrowScalarAggregateOptions,
                          garrow_scalar_aggregate_options,
                          GARROW,
@@ -401,6 +416,7 @@ typedef enum {
 } GArrowCountMode;
 
 #define GARROW_TYPE_COUNT_OPTIONS (garrow_count_options_get_type())
+GARROW_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowCountOptions, garrow_count_options, GARROW, COUNT_OPTIONS, GArrowFunctionOptions)
 struct _GArrowCountOptionsClass
@@ -428,6 +444,7 @@ typedef enum {
 } GArrowFilterNullSelectionBehavior;
 
 #define GARROW_TYPE_FILTER_OPTIONS (garrow_filter_options_get_type())
+GARROW_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(GArrowFilterOptions,
                          garrow_filter_options,
                          GARROW,
@@ -443,6 +460,7 @@ GArrowFilterOptions *
 garrow_filter_options_new(void);
 
 #define GARROW_TYPE_TAKE_OPTIONS (garrow_take_options_get_type())
+GARROW_AVAILABLE_IN_0_14
 G_DECLARE_DERIVABLE_TYPE(
   GArrowTakeOptions, garrow_take_options, GARROW, TAKE_OPTIONS, GArrowFunctionOptions)
 struct _GArrowTakeOptionsClass
@@ -487,6 +505,7 @@ typedef enum /*<prefix=GARROW_NULL_PLACEMENT_>*/ {
 } GArrowNullPlacement;
 
 #define GARROW_TYPE_ARRAY_SORT_OPTIONS (garrow_array_sort_options_get_type())
+GARROW_AVAILABLE_IN_3_0
 G_DECLARE_DERIVABLE_TYPE(GArrowArraySortOptions,
                          garrow_array_sort_options,
                          GARROW,
@@ -506,6 +525,7 @@ garrow_array_sort_options_equal(GArrowArraySortOptions *options,
                                 GArrowArraySortOptions *other_options);
 
 #define GARROW_TYPE_SORT_KEY (garrow_sort_key_get_type())
+GARROW_AVAILABLE_IN_3_0
 G_DECLARE_DERIVABLE_TYPE(GArrowSortKey, garrow_sort_key, GARROW, SORT_KEY, GObject)
 struct _GArrowSortKeyClass
 {
@@ -521,6 +541,7 @@ gboolean
 garrow_sort_key_equal(GArrowSortKey *sort_key, GArrowSortKey *other_sort_key);
 
 #define GARROW_TYPE_SORT_OPTIONS (garrow_sort_options_get_type())
+GARROW_AVAILABLE_IN_3_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowSortOptions, garrow_sort_options, GARROW, SORT_OPTIONS, GArrowFunctionOptions)
 struct _GArrowSortOptionsClass
@@ -545,6 +566,7 @@ void
 garrow_sort_options_add_sort_key(GArrowSortOptions *options, GArrowSortKey *sort_key);
 
 #define GARROW_TYPE_SET_LOOKUP_OPTIONS (garrow_set_lookup_options_get_type())
+GARROW_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(GArrowSetLookupOptions,
                          garrow_set_lookup_options,
                          GARROW,
@@ -560,6 +582,7 @@ GArrowSetLookupOptions *
 garrow_set_lookup_options_new(GArrowDatum *value_set);
 
 #define GARROW_TYPE_VARIANCE_OPTIONS (garrow_variance_options_get_type())
+GARROW_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(GArrowVarianceOptions,
                          garrow_variance_options,
                          GARROW,
@@ -620,6 +643,7 @@ typedef enum {
 } GArrowRoundMode;
 
 #define GARROW_TYPE_ROUND_OPTIONS (garrow_round_options_get_type())
+GARROW_AVAILABLE_IN_7_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowRoundOptions, garrow_round_options, GARROW, ROUND_OPTIONS, GArrowFunctionOptions)
 struct _GArrowRoundOptionsClass
@@ -633,6 +657,7 @@ garrow_round_options_new(void);
 
 #define GARROW_TYPE_ROUND_TO_MULTIPLE_OPTIONS                                            \
   (garrow_round_to_multiple_options_get_type())
+GARROW_AVAILABLE_IN_7_0
 G_DECLARE_DERIVABLE_TYPE(GArrowRoundToMultipleOptions,
                          garrow_round_to_multiple_options,
                          GARROW,
@@ -648,6 +673,7 @@ GArrowRoundToMultipleOptions *
 garrow_round_to_multiple_options_new(void);
 
 #define GARROW_TYPE_MATCH_SUBSTRING_OPTIONS (garrow_match_substring_options_get_type())
+GARROW_AVAILABLE_IN_12_0
 G_DECLARE_DERIVABLE_TYPE(GArrowMatchSubstringOptions,
                          garrow_match_substring_options,
                          GARROW,
@@ -683,6 +709,7 @@ typedef enum /*< underscore_name=garrow_utf8_normalize_form >*/ {
 } GArrowUTF8NormalizeForm;
 
 #define GARROW_TYPE_UTF8_NORMALIZE_OPTIONS (garrow_utf8_normalize_options_get_type())
+GARROW_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GArrowUTF8NormalizeOptions,
                          garrow_utf8_normalize_options,
                          GARROW,
@@ -719,6 +746,7 @@ typedef enum {
 } GArrowQuantileInterpolation;
 
 #define GARROW_TYPE_QUANTILE_OPTIONS (garrow_quantile_options_get_type())
+GARROW_AVAILABLE_IN_9_0
 G_DECLARE_DERIVABLE_TYPE(GArrowQuantileOptions,
                          garrow_quantile_options,
                          GARROW,
@@ -745,6 +773,7 @@ garrow_quantile_options_set_qs(GArrowQuantileOptions *options,
                                gsize n);
 
 #define GARROW_TYPE_INDEX_OPTIONS (garrow_index_options_get_type())
+GARROW_AVAILABLE_IN_12_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowIndexOptions, garrow_index_options, GARROW, INDEX_OPTIONS, GArrowFunctionOptions)
 struct _GArrowIndexOptionsClass
@@ -782,6 +811,7 @@ typedef enum {
 } GArrowRankTiebreaker;
 
 #define GARROW_TYPE_RANK_OPTIONS (garrow_rank_options_get_type())
+GARROW_AVAILABLE_IN_12_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowRankOptions, garrow_rank_options, GARROW, RANK_OPTIONS, GArrowFunctionOptions)
 struct _GArrowRankOptionsClass
@@ -805,18 +835,25 @@ GARROW_AVAILABLE_IN_12_0
 void
 garrow_rank_options_add_sort_key(GArrowRankOptions *options, GArrowSortKey *sort_key);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowArray *
 garrow_array_cast(GArrowArray *array,
                   GArrowDataType *target_data_type,
                   GArrowCastOptions *options,
                   GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowArray *
 garrow_array_unique(GArrowArray *array, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowDictionaryArray *
 garrow_array_dictionary_encode(GArrowArray *array, GError **error);
+
 GARROW_AVAILABLE_IN_0_13
 gint64
 garrow_array_count(GArrowArray *array, GArrowCountOptions *options, GError **error);
+
 GARROW_AVAILABLE_IN_0_13
 GArrowStructArray *
 garrow_array_count_values(GArrowArray *array, GError **error);
@@ -987,6 +1024,7 @@ garrow_record_batch_filter(GArrowRecordBatch *record_batch,
                            GError **error);
 
 #define GARROW_TYPE_RUN_END_ENCODE_OPTIONS (garrow_run_end_encode_options_get_type())
+GARROW_AVAILABLE_IN_13_0
 G_DECLARE_DERIVABLE_TYPE(GArrowRunEndEncodeOptions,
                          garrow_run_end_encode_options,
                          GARROW,
@@ -1011,6 +1049,7 @@ GArrowArray *
 garrow_run_end_encoded_array_decode(GArrowRunEndEncodedArray *array, GError **error);
 
 #define GARROW_TYPE_STRPTIME_OPTIONS (garrow_strptime_options_get_type())
+GARROW_AVAILABLE_IN_16_0
 G_DECLARE_DERIVABLE_TYPE(GArrowStrptimeOptions,
                          garrow_strptime_options,
                          GARROW,
@@ -1026,6 +1065,7 @@ GArrowStrptimeOptions *
 garrow_strptime_options_new(void);
 
 #define GARROW_TYPE_STRFTIME_OPTIONS (garrow_strftime_options_get_type())
+GARROW_AVAILABLE_IN_16_0
 G_DECLARE_DERIVABLE_TYPE(GArrowStrftimeOptions,
                          garrow_strftime_options,
                          GARROW,
@@ -1041,6 +1081,7 @@ GArrowStrftimeOptions *
 garrow_strftime_options_new(void);
 
 #define GARROW_TYPE_SPLIT_PATTERN_OPTIONS (garrow_split_pattern_options_get_type())
+GARROW_AVAILABLE_IN_16_0
 G_DECLARE_DERIVABLE_TYPE(GArrowSplitPatternOptions,
                          garrow_split_pattern_options,
                          GARROW,
@@ -1056,6 +1097,7 @@ GArrowSplitPatternOptions *
 garrow_split_pattern_options_new(void);
 
 #define GARROW_TYPE_STRUCT_FIELD_OPTIONS (garrow_struct_field_options_get_type())
+GARROW_AVAILABLE_IN_16_0
 G_DECLARE_DERIVABLE_TYPE(GArrowStructFieldOptions,
                          garrow_struct_field_options,
                          GARROW,
diff --git a/c_glib/arrow-glib/datum.h b/c_glib/arrow-glib/datum.h
index df5e9a1c2cf4f..fc9a2fe7ab907 100644
--- a/c_glib/arrow-glib/datum.h
+++ b/c_glib/arrow-glib/datum.h
@@ -28,6 +28,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_DATUM (garrow_datum_get_type())
+GARROW_AVAILABLE_IN_1_0
 G_DECLARE_DERIVABLE_TYPE(GArrowDatum, garrow_datum, GARROW, DATUM, GObject)
 struct _GArrowDatumClass
 {
@@ -60,6 +61,7 @@ garrow_datum_to_string(GArrowDatum *datum);
 /* GARROW_TYPE_NONE_DATUM */
 
 #define GARROW_TYPE_SCALAR_DATUM (garrow_scalar_datum_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowScalarDatum, garrow_scalar_datum, GARROW, SCALAR_DATUM, GArrowDatum)
 struct _GArrowScalarDatumClass
@@ -72,6 +74,7 @@ GArrowScalarDatum *
 garrow_scalar_datum_new(GArrowScalar *value);
 
 #define GARROW_TYPE_ARRAY_DATUM (garrow_array_datum_get_type())
+GARROW_AVAILABLE_IN_1_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowArrayDatum, garrow_array_datum, GARROW, ARRAY_DATUM, GArrowDatum)
 struct _GArrowArrayDatumClass
@@ -84,6 +87,7 @@ GArrowArrayDatum *
 garrow_array_datum_new(GArrowArray *value);
 
 #define GARROW_TYPE_CHUNKED_ARRAY_DATUM (garrow_chunked_array_datum_get_type())
+GARROW_AVAILABLE_IN_1_0
 G_DECLARE_DERIVABLE_TYPE(GArrowChunkedArrayDatum,
                          garrow_chunked_array_datum,
                          GARROW,
@@ -99,6 +103,7 @@ GArrowChunkedArrayDatum *
 garrow_chunked_array_datum_new(GArrowChunkedArray *value);
 
 #define GARROW_TYPE_RECORD_BATCH_DATUM (garrow_record_batch_datum_get_type())
+GARROW_AVAILABLE_IN_1_0
 G_DECLARE_DERIVABLE_TYPE(GArrowRecordBatchDatum,
                          garrow_record_batch_datum,
                          GARROW,
@@ -114,6 +119,7 @@ GArrowRecordBatchDatum *
 garrow_record_batch_datum_new(GArrowRecordBatch *value);
 
 #define GARROW_TYPE_TABLE_DATUM (garrow_table_datum_get_type())
+GARROW_AVAILABLE_IN_1_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowTableDatum, garrow_table_datum, GARROW, TABLE_DATUM, GArrowDatum)
 struct _GArrowTableDatumClass
diff --git a/c_glib/arrow-glib/decimal.h b/c_glib/arrow-glib/decimal.h
index b967fa36d5611..f64afa800a19b 100644
--- a/c_glib/arrow-glib/decimal.h
+++ b/c_glib/arrow-glib/decimal.h
@@ -27,6 +27,7 @@ G_BEGIN_DECLS
 
 /* Disabled because it conflicts with GARROW_TYPE_DECIMAL128 in GArrowType. */
 /* #define GARROW_TYPE_DECIMAL128 (garrow_decimal128_get_type()) */
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowDecimal128, garrow_decimal128, GARROW, DECIMAL128, GObject)
 
 struct _GArrowDecimal128Class
@@ -34,8 +35,10 @@ struct _GArrowDecimal128Class
   GObjectClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowDecimal128 *
 garrow_decimal128_new_string(const gchar *data, GError **error);
+GARROW_AVAILABLE_IN_ALL
 GArrowDecimal128 *
 garrow_decimal128_new_integer(const gint64 data);
 GARROW_AVAILABLE_IN_3_0
@@ -62,25 +65,34 @@ GARROW_AVAILABLE_IN_0_12
 gboolean
 garrow_decimal128_greater_than_or_equal(GArrowDecimal128 *decimal,
                                         GArrowDecimal128 *other_decimal);
+GARROW_AVAILABLE_IN_ALL
 gchar *
 garrow_decimal128_to_string_scale(GArrowDecimal128 *decimal, gint32 scale);
+GARROW_AVAILABLE_IN_ALL
 gchar *
 garrow_decimal128_to_string(GArrowDecimal128 *decimal);
 GARROW_AVAILABLE_IN_3_0
 GBytes *
 garrow_decimal128_to_bytes(GArrowDecimal128 *decimal);
+GARROW_AVAILABLE_IN_ALL
 void
 garrow_decimal128_abs(GArrowDecimal128 *decimal);
+GARROW_AVAILABLE_IN_ALL
 void
 garrow_decimal128_negate(GArrowDecimal128 *decimal);
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_decimal128_to_integer(GArrowDecimal128 *decimal);
+GARROW_AVAILABLE_IN_ALL
 GArrowDecimal128 *
 garrow_decimal128_plus(GArrowDecimal128 *left, GArrowDecimal128 *right);
+GARROW_AVAILABLE_IN_ALL
 GArrowDecimal128 *
 garrow_decimal128_minus(GArrowDecimal128 *left, GArrowDecimal128 *right);
+GARROW_AVAILABLE_IN_ALL
 GArrowDecimal128 *
 garrow_decimal128_multiply(GArrowDecimal128 *left, GArrowDecimal128 *right);
+GARROW_AVAILABLE_IN_ALL
 GArrowDecimal128 *
 garrow_decimal128_divide(GArrowDecimal128 *left,
                          GArrowDecimal128 *right,
@@ -95,6 +107,7 @@ garrow_decimal128_rescale(GArrowDecimal128 *decimal,
 
 /* Disabled because it conflicts with GARROW_TYPE_DECIMAL256 in GArrowType. */
 /* #define GARROW_TYPE_DECIMAL256 (garrow_decimal256_get_type()) */
+GARROW_AVAILABLE_IN_3_0
 G_DECLARE_DERIVABLE_TYPE(GArrowDecimal256, garrow_decimal256, GARROW, DECIMAL256, GObject)
 
 struct _GArrowDecimal256Class
diff --git a/c_glib/arrow-glib/enums.h.template b/c_glib/arrow-glib/enums.h.template
index b7d3c99c0bef8..e49b717fb30db 100644
--- a/c_glib/arrow-glib/enums.h.template
+++ b/c_glib/arrow-glib/enums.h.template
@@ -22,6 +22,8 @@
 
 #include <glib-object.h>
 
+#include <arrow-glib/version.h>
+
 G_BEGIN_DECLS
 /*** END file-header ***/
 
@@ -31,6 +33,7 @@ G_BEGIN_DECLS
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
+GARROW_AVAILABLE_IN_ALL
 GType @enum_name@_get_type(void) G_GNUC_CONST;
 #define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
 /*** END value-header ***/
diff --git a/c_glib/arrow-glib/error.h b/c_glib/arrow-glib/error.h
index 4414417a1a25b..e0c6a591a021b 100644
--- a/c_glib/arrow-glib/error.h
+++ b/c_glib/arrow-glib/error.h
@@ -21,6 +21,8 @@
 
 #include <glib-object.h>
 
+#include <arrow-glib/version.h>
+
 G_BEGIN_DECLS
 
 /**
@@ -66,6 +68,7 @@ typedef enum {
 
 #define GARROW_ERROR garrow_error_quark()
 
+GARROW_AVAILABLE_IN_ALL
 GQuark
 garrow_error_quark(void);
 
diff --git a/c_glib/arrow-glib/error.hpp b/c_glib/arrow-glib/error.hpp
index 90a0f3161878e..c2c9b3c63028a 100644
--- a/c_glib/arrow-glib/error.hpp
+++ b/c_glib/arrow-glib/error.hpp
@@ -23,18 +23,26 @@
 
 #include <arrow-glib/error.h>
 
+GARROW_EXTERN
 gboolean
 garrow_error_check(GError **error, const arrow::Status &status, const char *context);
+
+GARROW_EXTERN
 GArrowError
 garrow_error_from_status(const arrow::Status &status);
+
+GARROW_EXTERN
 arrow::StatusCode
 garrow_error_to_status_code(GError *error, arrow::StatusCode default_code);
+
+GARROW_EXTERN
 arrow::Status
 garrow_error_to_status(GError *error,
                        arrow::StatusCode default_code,
                        const char *context);
 
 namespace garrow {
+  GARROW_EXTERN
   gboolean
   check(GError **error, const arrow::Status &status, const char *context);
 
diff --git a/c_glib/arrow-glib/expression.h b/c_glib/arrow-glib/expression.h
index 3141ed4df18b7..5a6bfb456fc64 100644
--- a/c_glib/arrow-glib/expression.h
+++ b/c_glib/arrow-glib/expression.h
@@ -31,6 +31,7 @@ gboolean
 garrow_expression_equal(GArrowExpression *expression, GArrowExpression *other_expression);
 
 #define GARROW_TYPE_LITERAL_EXPRESSION (garrow_literal_expression_get_type())
+GARROW_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(GArrowLiteralExpression,
                          garrow_literal_expression,
                          GARROW,
@@ -46,6 +47,7 @@ GArrowLiteralExpression *
 garrow_literal_expression_new(GArrowDatum *datum);
 
 #define GARROW_TYPE_FIELD_EXPRESSION (garrow_field_expression_get_type())
+GARROW_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(GArrowFieldExpression,
                          garrow_field_expression,
                          GARROW,
@@ -61,6 +63,7 @@ GArrowFieldExpression *
 garrow_field_expression_new(const gchar *reference, GError **error);
 
 #define GARROW_TYPE_CALL_EXPRESSION (garrow_call_expression_get_type())
+GARROW_AVAILABLE_IN_6_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowCallExpression, garrow_call_expression, GARROW, CALL_EXPRESSION, GArrowExpression)
 struct _GArrowCallExpressionClass
diff --git a/c_glib/arrow-glib/expression.hpp b/c_glib/arrow-glib/expression.hpp
index 60d5c9fe2f1bd..cc96badbe67aa 100644
--- a/c_glib/arrow-glib/expression.hpp
+++ b/c_glib/arrow-glib/expression.hpp
@@ -23,7 +23,10 @@
 
 #include <arrow-glib/expression.h>
 
+GARROW_EXTERN
 GArrowExpression *
 garrow_expression_new_raw(const arrow::compute::Expression &arrow_expression);
+
+GARROW_EXTERN
 arrow::compute::Expression *
 garrow_expression_get_raw(GArrowExpression *expression);
diff --git a/c_glib/arrow-glib/field.h b/c_glib/arrow-glib/field.h
index 8de63757878c9..4be13f6135975 100644
--- a/c_glib/arrow-glib/field.h
+++ b/c_glib/arrow-glib/field.h
@@ -24,6 +24,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_FIELD (garrow_field_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowField, garrow_field, GARROW, FIELD, GObject)
 struct _GArrowFieldClass
 {
@@ -34,8 +35,10 @@ GARROW_AVAILABLE_IN_6_0
 GArrowField *
 garrow_field_import(gpointer c_abi_schema, GError **error);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowField *
 garrow_field_new(const gchar *name, GArrowDataType *data_type);
+GARROW_AVAILABLE_IN_ALL
 GArrowField *
 garrow_field_new_full(const gchar *name, GArrowDataType *data_type, gboolean nullable);
 
@@ -43,18 +46,26 @@ GARROW_AVAILABLE_IN_6_0
 gpointer
 garrow_field_export(GArrowField *field, GError **error);
 
+GARROW_AVAILABLE_IN_ALL
 const gchar *
 garrow_field_get_name(GArrowField *field);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowDataType *
 garrow_field_get_data_type(GArrowField *field);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_field_is_nullable(GArrowField *field);
 
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_field_equal(GArrowField *field, GArrowField *other_field);
 
+GARROW_AVAILABLE_IN_ALL
 gchar *
 garrow_field_to_string(GArrowField *field);
+
 GARROW_AVAILABLE_IN_3_0
 gchar *
 garrow_field_to_string_metadata(GArrowField *field, gboolean show_metadata);
diff --git a/c_glib/arrow-glib/file-system.h b/c_glib/arrow-glib/file-system.h
index d3d5fde73fe23..2e500672e145c 100644
--- a/c_glib/arrow-glib/file-system.h
+++ b/c_glib/arrow-glib/file-system.h
@@ -53,6 +53,7 @@ typedef enum {
 /* arrow::fs::FileInfo */
 
 #define GARROW_TYPE_FILE_INFO (garrow_file_info_get_type())
+GARROW_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(GArrowFileInfo, garrow_file_info, GARROW, FILE_INFO, GObject)
 struct _GArrowFileInfoClass
 {
@@ -80,6 +81,7 @@ garrow_file_info_to_string(GArrowFileInfo *file_info);
 /* arrow::fs::FileSelector */
 
 #define GARROW_TYPE_FILE_SELECTOR (garrow_file_selector_get_type())
+GARROW_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(
   GArrowFileSelector, garrow_file_selector, GARROW, FILE_SELECTOR, GObject)
 struct _GArrowFileSelectorClass
@@ -90,6 +92,7 @@ struct _GArrowFileSelectorClass
 /* arrow::fs::FileSystem */
 
 #define GARROW_TYPE_FILE_SYSTEM (garrow_file_system_get_type())
+GARROW_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(
   GArrowFileSystem, garrow_file_system, GARROW, FILE_SYSTEM, GObject)
 struct _GArrowFileSystemClass
@@ -197,6 +200,7 @@ garrow_file_system_open_append_stream(GArrowFileSystem *file_system,
 /* arrow::fs::SubTreeFileSystem */
 
 #define GARROW_TYPE_SUB_TREE_FILE_SYSTEM (garrow_sub_tree_file_system_get_type())
+GARROW_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(GArrowSubTreeFileSystem,
                          garrow_sub_tree_file_system,
                          GARROW,
@@ -215,6 +219,7 @@ garrow_sub_tree_file_system_new(const gchar *base_path,
 /* arrow::fs::SlowFileSystem */
 
 #define GARROW_TYPE_SLOW_FILE_SYSTEM (garrow_slow_file_system_get_type())
+GARROW_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(GArrowSlowFileSystem,
                          garrow_slow_file_system,
                          GARROW,
@@ -244,6 +249,7 @@ garrow_slow_file_system_new_average_latency_and_seed(GArrowFileSystem *base_file
                                                      gint32 seed);
 
 #define GARROW_TYPE_MOCK_FILE_SYSTEM (garrow_mock_file_system_get_type())
+GARROW_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(GArrowMockFileSystem,
                          garrow_mock_file_system,
                          GARROW,
@@ -255,6 +261,7 @@ struct _GArrowMockFileSystemClass
 };
 
 #define GARROW_TYPE_HDFS_FILE_SYSTEM (garrow_hdfs_file_system_get_type())
+GARROW_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(GArrowHDFSFileSystem,
                          garrow_hdfs_file_system,
                          GARROW,
@@ -290,6 +297,7 @@ typedef enum {
 } GArrowS3LogLevel;
 
 #define GARROW_TYPE_S3_GLOBAL_OPTIONS (garrow_s3_global_options_get_type())
+GARROW_AVAILABLE_IN_7_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowS3GlobalOptions, garrow_s3_global_options, GARROW, S3_GLOBAL_OPTIONS, GObject)
 struct _GArrowS3GlobalOptionsClass
@@ -312,6 +320,7 @@ gboolean
 garrow_s3_finalize(GError **error);
 
 #define GARROW_TYPE_S3_FILE_SYSTEM (garrow_s3_file_system_get_type())
+GARROW_AVAILABLE_IN_7_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowS3FileSystem, garrow_s3_file_system, GARROW, S3_FILE_SYSTEM, GArrowFileSystem)
 struct _GArrowS3FileSystemClass
@@ -320,6 +329,7 @@ struct _GArrowS3FileSystemClass
 };
 
 #define GARROW_TYPE_GCS_FILE_SYSTEM (garrow_gcs_file_system_get_type())
+GARROW_AVAILABLE_IN_7_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowGCSFileSystem, garrow_gcs_file_system, GARROW, GCS_FILE_SYSTEM, GArrowFileSystem)
 struct _GArrowGCSFileSystemClass
diff --git a/c_glib/arrow-glib/file-system.hpp b/c_glib/arrow-glib/file-system.hpp
index f41fc6e9c75b0..c535958301c5c 100644
--- a/c_glib/arrow-glib/file-system.hpp
+++ b/c_glib/arrow-glib/file-system.hpp
@@ -23,28 +23,35 @@
 
 #include <arrow-glib/file-system.h>
 
+GARROW_EXTERN
 GArrowFileInfo *
 garrow_file_info_new_raw(const arrow::fs::FileInfo &arrow_file_info);
 
+GARROW_EXTERN
 arrow::fs::FileInfo *
 garrow_file_info_get_raw(GArrowFileInfo *file_info);
 
+GARROW_EXTERN
 GArrowFileSystem *
 garrow_file_system_new_raw(std::shared_ptr<arrow::fs::FileSystem> *arrow_file_system);
 
+GARROW_EXTERN
 std::shared_ptr<arrow::fs::FileSystem>
 garrow_file_system_get_raw(GArrowFileSystem *file_system);
 
+GARROW_EXTERN
 GArrowSubTreeFileSystem *
 garrow_sub_tree_file_system_new_raw(
   std::shared_ptr<arrow::fs::FileSystem> *arrow_file_system,
   GArrowFileSystem *base_file_system);
 
+GARROW_EXTERN
 GArrowSlowFileSystem *
 garrow_slow_file_system_new_raw(std::shared_ptr<arrow::fs::FileSystem> *arrow_file_system,
                                 GArrowFileSystem *base_file_system);
 
 #ifdef ARROW_S3
+GARROW_EXTERN
 arrow::fs::S3GlobalOptions *
 garrow_s3_global_options_get_raw(GArrowS3GlobalOptions *options);
 #endif
diff --git a/c_glib/arrow-glib/file.h b/c_glib/arrow-glib/file.h
index 42afed139463c..799dd83b9c243 100644
--- a/c_glib/arrow-glib/file.h
+++ b/c_glib/arrow-glib/file.h
@@ -27,15 +27,22 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_FILE (garrow_file_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_INTERFACE(GArrowFile, garrow_file, GARROW, FILE, GObject)
 
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_file_close(GArrowFile *file, GError **error);
+
 GARROW_AVAILABLE_IN_0_13
 gboolean
 garrow_file_is_closed(GArrowFile *file);
+
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_file_tell(GArrowFile *file, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowFileMode
 garrow_file_get_mode(GArrowFile *file);
 
diff --git a/c_glib/arrow-glib/input-stream.cpp b/c_glib/arrow-glib/input-stream.cpp
index 03a3f03fff7ce..52c79993e4ca8 100644
--- a/c_glib/arrow-glib/input-stream.cpp
+++ b/c_glib/arrow-glib/input-stream.cpp
@@ -35,6 +35,22 @@
 #include <mutex>
 #include <string_view>
 
+static std::shared_ptr<arrow::io::FileInterface>
+garrow_input_stream_get_raw_file_interface(GArrowFile *file)
+{
+  auto input_stream = GARROW_INPUT_STREAM(file);
+  auto arrow_input_stream = garrow_input_stream_get_raw(input_stream);
+  return arrow_input_stream;
+}
+
+static std::shared_ptr<arrow::io::Readable>
+garrow_input_stream_get_raw_readable_interface(GArrowReadable *readable)
+{
+  auto input_stream = GARROW_INPUT_STREAM(readable);
+  auto arrow_input_stream = garrow_input_stream_get_raw(input_stream);
+  return arrow_input_stream;
+}
+
 G_BEGIN_DECLS
 
 /**
@@ -71,28 +87,12 @@ enum {
   PROP_INPUT_STREAM = 1
 };
 
-static std::shared_ptr<arrow::io::FileInterface>
-garrow_input_stream_get_raw_file_interface(GArrowFile *file)
-{
-  auto input_stream = GARROW_INPUT_STREAM(file);
-  auto arrow_input_stream = garrow_input_stream_get_raw(input_stream);
-  return arrow_input_stream;
-}
-
 static void
 garrow_input_stream_file_interface_init(GArrowFileInterface *iface)
 {
   iface->get_raw = garrow_input_stream_get_raw_file_interface;
 }
 
-static std::shared_ptr<arrow::io::Readable>
-garrow_input_stream_get_raw_readable_interface(GArrowReadable *readable)
-{
-  auto input_stream = GARROW_INPUT_STREAM(readable);
-  auto arrow_input_stream = garrow_input_stream_get_raw(input_stream);
-  return arrow_input_stream;
-}
-
 static void
 garrow_input_stream_readable_interface_init(GArrowReadableInterface *iface)
 {
diff --git a/c_glib/arrow-glib/input-stream.h b/c_glib/arrow-glib/input-stream.h
index 3e2a2ecdbd4fa..676f2f44b0041 100644
--- a/c_glib/arrow-glib/input-stream.h
+++ b/c_glib/arrow-glib/input-stream.h
@@ -30,6 +30,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_INPUT_STREAM (garrow_input_stream_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowInputStream, garrow_input_stream, GARROW, INPUT_STREAM, GInputStream)
 struct _GArrowInputStreamClass
@@ -37,16 +38,22 @@ struct _GArrowInputStreamClass
   GInputStreamClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_input_stream_advance(GArrowInputStream *input_stream,
                             gint64 n_bytes,
                             GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_input_stream_align(GArrowInputStream *input_stream,
                           gint32 alignment,
                           GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowTensor *
 garrow_input_stream_read_tensor(GArrowInputStream *input_stream, GError **error);
+
 GARROW_AVAILABLE_IN_1_0
 GArrowRecordBatch *
 garrow_input_stream_read_record_batch(GArrowInputStream *input_stream,
@@ -55,6 +62,7 @@ garrow_input_stream_read_record_batch(GArrowInputStream *input_stream,
                                       GError **error);
 
 #define GARROW_TYPE_SEEKABLE_INPUT_STREAM (garrow_seekable_input_stream_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowSeekableInputStream,
                          garrow_seekable_input_stream,
                          GARROW,
@@ -65,12 +73,17 @@ struct _GArrowSeekableInputStreamClass
   GArrowInputStreamClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 guint64
 garrow_seekable_input_stream_get_size(GArrowSeekableInputStream *input_stream,
                                       GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_seekable_input_stream_get_support_zero_copy(
   GArrowSeekableInputStream *input_stream);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowBuffer *
 garrow_seekable_input_stream_read_at(GArrowSeekableInputStream *input_stream,
                                      gint64 position,
@@ -89,6 +102,7 @@ garrow_seekable_input_stream_peek(GArrowSeekableInputStream *input_stream,
                                   GError **error);
 
 #define GARROW_TYPE_BUFFER_INPUT_STREAM (garrow_buffer_input_stream_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowBufferInputStream,
                          garrow_buffer_input_stream,
                          GARROW,
@@ -99,13 +113,16 @@ struct _GArrowBufferInputStreamClass
   GArrowSeekableInputStreamClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowBufferInputStream *
 garrow_buffer_input_stream_new(GArrowBuffer *buffer);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowBuffer *
 garrow_buffer_input_stream_get_buffer(GArrowBufferInputStream *input_stream);
 
 #define GARROW_TYPE_FILE_INPUT_STREAM (garrow_file_input_stream_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowFileInputStream,
                          garrow_file_input_stream,
                          GARROW,
@@ -116,15 +133,21 @@ struct _GArrowFileInputStreamClass
   GArrowSeekableInputStreamClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowFileInputStream *
 garrow_file_input_stream_new(const gchar *path, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowFileInputStream *
 garrow_file_input_stream_new_file_descriptor(gint file_descriptor, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gint
 garrow_file_input_stream_get_file_descriptor(GArrowFileInputStream *stream);
 
 #define GARROW_TYPE_MEMORY_MAPPED_INPUT_STREAM                                           \
   (garrow_memory_mapped_input_stream_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowMemoryMappedInputStream,
                          garrow_memory_mapped_input_stream,
                          GARROW,
@@ -135,10 +158,12 @@ struct _GArrowMemoryMappedInputStreamClass
   GArrowSeekableInputStreamClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowMemoryMappedInputStream *
 garrow_memory_mapped_input_stream_new(const gchar *path, GError **error);
 
 #define GARROW_TYPE_GIO_INPUT_STREAM (garrow_gio_input_stream_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowGIOInputStream,
                          garrow_gio_input_stream,
                          GARROW,
@@ -149,15 +174,19 @@ struct _GArrowGIOInputStreamClass
   GArrowSeekableInputStreamClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowGIOInputStream *
 garrow_gio_input_stream_new(GInputStream *gio_input_stream);
+
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 G_GNUC_DEPRECATED
 GInputStream *
 garrow_gio_input_stream_get_raw(GArrowGIOInputStream *input_stream);
 #endif
 
 #define GARROW_TYPE_COMPRESSED_INPUT_STREAM (garrow_compressed_input_stream_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowCompressedInputStream,
                          garrow_compressed_input_stream,
                          GARROW,
@@ -168,6 +197,7 @@ struct _GArrowCompressedInputStreamClass
   GArrowInputStreamClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowCompressedInputStream *
 garrow_compressed_input_stream_new(GArrowCodec *codec,
                                    GArrowInputStream *raw,
diff --git a/c_glib/arrow-glib/input-stream.hpp b/c_glib/arrow-glib/input-stream.hpp
index 7ae759370ddbd..0400398c4777f 100644
--- a/c_glib/arrow-glib/input-stream.hpp
+++ b/c_glib/arrow-glib/input-stream.hpp
@@ -26,34 +26,48 @@
 
 #include <arrow-glib/input-stream.h>
 
+GARROW_EXTERN
 GArrowInputStream *
 garrow_input_stream_new_raw(std::shared_ptr<arrow::io::InputStream> *arrow_input_stream);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::io::InputStream>
 garrow_input_stream_get_raw(GArrowInputStream *input_stream);
 
+GARROW_EXTERN
 GArrowSeekableInputStream *
 garrow_seekable_input_stream_new_raw(
   std::shared_ptr<arrow::io::RandomAccessFile> *arrow_random_access_file);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::io::RandomAccessFile>
 garrow_seekable_input_stream_get_raw(GArrowSeekableInputStream *input_stream);
 
+GARROW_EXTERN
 GArrowBufferInputStream *
 garrow_buffer_input_stream_new_raw(
   std::shared_ptr<arrow::io::BufferReader> *arrow_buffer_reader, GArrowBuffer *buffer);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::io::BufferReader>
 garrow_buffer_input_stream_get_raw(GArrowBufferInputStream *input_stream);
 
+GARROW_EXTERN
 GArrowFileInputStream *
 garrow_file_input_stream_new_raw(std::shared_ptr<arrow::io::ReadableFile> *arrow_stream);
 
+GARROW_EXTERN
 GArrowMemoryMappedInputStream *
 garrow_memory_mapped_input_stream_new_raw(
   std::shared_ptr<arrow::io::MemoryMappedFile> *arrow_stream);
 
+GARROW_EXTERN
 GArrowCompressedInputStream *
 garrow_compressed_input_stream_new_raw(
   std::shared_ptr<arrow::io::CompressedInputStream> *arrow_raw,
   GArrowCodec *codec,
   GArrowInputStream *raw);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::io::InputStream>
 garrow_compressed_input_stream_get_raw(GArrowCompressedInputStream *stream);
diff --git a/c_glib/arrow-glib/interval.h b/c_glib/arrow-glib/interval.h
index a6c9e1ff1e1ef..8c23b9a509bb4 100644
--- a/c_glib/arrow-glib/interval.h
+++ b/c_glib/arrow-glib/interval.h
@@ -26,6 +26,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_DAY_MILLISECOND (garrow_day_millisecond_get_type())
+GARROW_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowDayMillisecond, garrow_day_millisecond, GARROW, DAY_MILLISECOND, GObject)
 
@@ -47,6 +48,7 @@ garrow_day_millisecond_less_than(GArrowDayMillisecond *day_millisecond,
                                  GArrowDayMillisecond *other_day_millisecond);
 
 #define GARROW_TYPE_MONTH_DAY_NANO (garrow_month_day_nano_get_type())
+GARROW_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowMonthDayNano, garrow_month_day_nano, GARROW, MONTH_DAY_NANO, GObject)
 
diff --git a/c_glib/arrow-glib/ipc-options.h b/c_glib/arrow-glib/ipc-options.h
index 418b08f080152..1ddff059d2faf 100644
--- a/c_glib/arrow-glib/ipc-options.h
+++ b/c_glib/arrow-glib/ipc-options.h
@@ -26,6 +26,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_READ_OPTIONS (garrow_read_options_get_type())
+GARROW_AVAILABLE_IN_1_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowReadOptions, garrow_read_options, GARROW, READ_OPTIONS, GObject)
 struct _GArrowReadOptionsClass
@@ -46,6 +47,7 @@ garrow_read_options_set_included_fields(GArrowReadOptions *options,
                                         gsize n_fields);
 
 #define GARROW_TYPE_WRITE_OPTIONS (garrow_write_options_get_type())
+GARROW_AVAILABLE_IN_1_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowWriteOptions, garrow_write_options, GARROW, WRITE_OPTIONS, GObject)
 struct _GArrowWriteOptionsClass
diff --git a/c_glib/arrow-glib/ipc-options.hpp b/c_glib/arrow-glib/ipc-options.hpp
index f57fbd3c11e5a..838d05d41dbac 100644
--- a/c_glib/arrow-glib/ipc-options.hpp
+++ b/c_glib/arrow-glib/ipc-options.hpp
@@ -23,10 +23,14 @@
 
 #include <arrow-glib/ipc-options.h>
 
+GARROW_EXTERN
 arrow::ipc::IpcReadOptions *
 garrow_read_options_get_raw(GArrowReadOptions *options);
+
+GARROW_EXTERN
 arrow::ipc::DictionaryMemo *
 garrow_read_options_get_dictionary_memo_raw(GArrowReadOptions *options);
 
+GARROW_EXTERN
 arrow::ipc::IpcWriteOptions *
 garrow_write_options_get_raw(GArrowWriteOptions *options);
diff --git a/c_glib/arrow-glib/local-file-system.h b/c_glib/arrow-glib/local-file-system.h
index 9af4f8e8b168d..6ad2ee9f231ab 100644
--- a/c_glib/arrow-glib/local-file-system.h
+++ b/c_glib/arrow-glib/local-file-system.h
@@ -27,6 +27,7 @@ G_BEGIN_DECLS
 
 #define GARROW_TYPE_LOCAL_FILE_SYSTEM_OPTIONS                                            \
   (garrow_local_file_system_options_get_type())
+GARROW_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(GArrowLocalFileSystemOptions,
                          garrow_local_file_system_options,
                          GARROW,
@@ -44,6 +45,7 @@ garrow_local_file_system_options_new(void);
 /* arrow::fs::LocalFileSystem */
 
 #define GARROW_TYPE_LOCAL_FILE_SYSTEM (garrow_local_file_system_get_type())
+GARROW_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(GArrowLocalFileSystem,
                          garrow_local_file_system,
                          GARROW,
diff --git a/c_glib/arrow-glib/memory-pool.h b/c_glib/arrow-glib/memory-pool.h
index de2a5d717a183..7da15a9eb1b47 100644
--- a/c_glib/arrow-glib/memory-pool.h
+++ b/c_glib/arrow-glib/memory-pool.h
@@ -21,9 +21,12 @@
 
 #include <glib-object.h>
 
+#include <arrow-glib/version.h>
+
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_MEMORY_POOL (garrow_memory_pool_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowMemoryPool, garrow_memory_pool, GARROW, MEMORY_POOL, GObject)
 struct _GArrowMemoryPoolClass
@@ -31,12 +34,19 @@ struct _GArrowMemoryPoolClass
   GObjectClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowMemoryPool *
 garrow_memory_pool_default();
+
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_memory_pool_get_bytes_allocated(GArrowMemoryPool *memory_pool);
+
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_memory_pool_get_max_memory(GArrowMemoryPool *memory_pool);
+
+GARROW_AVAILABLE_IN_ALL
 gchar *
 garrow_memory_pool_get_backend_name(GArrowMemoryPool *memory_pool);
 
diff --git a/c_glib/arrow-glib/meson.build b/c_glib/arrow-glib/meson.build
index 67909ff22c428..36a8274513ed2 100644
--- a/c_glib/arrow-glib/meson.build
+++ b/c_glib/arrow-glib/meson.build
@@ -205,14 +205,12 @@ cpp_internal_headers = files(
   'internal-index.hpp',
 )
 
-version_h_conf = configuration_data()
-version_h_conf.set('GARROW_VERSION_MAJOR', version_major)
-version_h_conf.set('GARROW_VERSION_MINOR', version_minor)
-version_h_conf.set('GARROW_VERSION_MICRO', version_micro)
-version_h_conf.set('GARROW_VERSION_TAG', version_tag)
-version_h = configure_file(input: 'version.h.in',
-                           output: 'version.h',
-                           configuration: version_h_conf)
+version_h = configure_file(
+  input: 'version.h.in',
+  output: 'version.h',
+  command: [python3, generate_version_header_py, '--library', 'GARROW', '--version', version, '--input', '@INPUT@', '--output', '@OUTPUT@'],
+)
+
 c_headers += version_h
 
 enums = gnome.mkenums('enums',
@@ -226,11 +224,9 @@ enums = gnome.mkenums('enums',
 enums_source = enums[0]
 enums_header = enums[1]
 
-
 headers = c_headers + cpp_headers
 install_headers(headers, subdir: meson.project_name())
 
-
 gobject = dependency('gobject-2.0')
 gobject_libdir = gobject.get_variable(pkgconfig: 'libdir')
 # This is for Homebrew. "pkg-config --cflags gio-2.0" includes the
@@ -253,6 +249,8 @@ libarrow_glib = library('arrow-glib',
                         dependencies: dependencies,
                         implicit_include_directories: false,
                         include_directories: base_include_directories,
+                        cpp_args: ['-DGARROW_COMPILATION'],
+                        c_args: ['-DGARROW_COMPILATION'],
                         soversion: so_version,
                         version: library_version)
 arrow_glib = declare_dependency(link_with: libarrow_glib,
diff --git a/c_glib/arrow-glib/orc-file-reader.h b/c_glib/arrow-glib/orc-file-reader.h
index 20089eb2866c6..4eb3df5242e48 100644
--- a/c_glib/arrow-glib/orc-file-reader.h
+++ b/c_glib/arrow-glib/orc-file-reader.h
@@ -24,6 +24,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_ORC_FILE_READER (garrow_orc_file_reader_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowORCFileReader, garrow_orc_file_reader, GARROW, ORC_FILE_READER, GObject)
 struct _GArrowORCFileReaderClass
@@ -31,10 +32,12 @@ struct _GArrowORCFileReaderClass
   GObjectClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowORCFileReader *
 garrow_orc_file_reader_new(GArrowSeekableInputStream *file, GError **error);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_orc_file_reader_set_field_indices)
 void
 garrow_orc_file_reader_set_field_indexes(GArrowORCFileReader *reader,
@@ -47,6 +50,7 @@ garrow_orc_file_reader_set_field_indices(GArrowORCFileReader *reader,
                                          const gint *field_indices,
                                          guint n_field_indices);
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_12_FOR(garrow_orc_file_reader_get_field_indices)
 const gint *
 garrow_orc_file_reader_get_field_indexes(GArrowORCFileReader *reader,
@@ -56,14 +60,24 @@ GARROW_AVAILABLE_IN_0_12
 const gint *
 garrow_orc_file_reader_get_field_indices(GArrowORCFileReader *reader,
                                          guint *n_field_indices);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowSchema *
 garrow_orc_file_reader_read_type(GArrowORCFileReader *reader, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowTable *
 garrow_orc_file_reader_read_stripes(GArrowORCFileReader *reader, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowRecordBatch *
 garrow_orc_file_reader_read_stripe(GArrowORCFileReader *reader, gint64 i, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_orc_file_reader_get_n_stripes(GArrowORCFileReader *reader);
+
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_orc_file_reader_get_n_rows(GArrowORCFileReader *reader);
 
diff --git a/c_glib/arrow-glib/output-stream.cpp b/c_glib/arrow-glib/output-stream.cpp
index 83de2eb38a72a..d9bdf7ad8b786 100644
--- a/c_glib/arrow-glib/output-stream.cpp
+++ b/c_glib/arrow-glib/output-stream.cpp
@@ -33,6 +33,22 @@
 #include <iostream>
 #include <sstream>
 
+static std::shared_ptr<arrow::io::FileInterface>
+garrow_output_stream_get_raw_file_interface(GArrowFile *file)
+{
+  auto output_stream = GARROW_OUTPUT_STREAM(file);
+  auto arrow_output_stream = garrow_output_stream_get_raw(output_stream);
+  return arrow_output_stream;
+}
+
+static std::shared_ptr<arrow::io::Writable>
+garrow_output_stream_get_raw_writable_interface(GArrowWritable *writable)
+{
+  auto output_stream = GARROW_OUTPUT_STREAM(writable);
+  auto arrow_output_stream = garrow_output_stream_get_raw(output_stream);
+  return arrow_output_stream;
+}
+
 G_BEGIN_DECLS
 
 /**
@@ -65,28 +81,12 @@ enum {
   PROP_OUTPUT_STREAM
 };
 
-static std::shared_ptr<arrow::io::FileInterface>
-garrow_output_stream_get_raw_file_interface(GArrowFile *file)
-{
-  auto output_stream = GARROW_OUTPUT_STREAM(file);
-  auto arrow_output_stream = garrow_output_stream_get_raw(output_stream);
-  return arrow_output_stream;
-}
-
 static void
 garrow_output_stream_file_interface_init(GArrowFileInterface *iface)
 {
   iface->get_raw = garrow_output_stream_get_raw_file_interface;
 }
 
-static std::shared_ptr<arrow::io::Writable>
-garrow_output_stream_get_raw_writable_interface(GArrowWritable *writable)
-{
-  auto output_stream = GARROW_OUTPUT_STREAM(writable);
-  auto arrow_output_stream = garrow_output_stream_get_raw(output_stream);
-  return arrow_output_stream;
-}
-
 static void
 garrow_output_stream_writable_interface_init(GArrowWritableInterface *iface)
 {
diff --git a/c_glib/arrow-glib/output-stream.h b/c_glib/arrow-glib/output-stream.h
index 1b18c08c14a5f..5c8b4b9374fc6 100644
--- a/c_glib/arrow-glib/output-stream.h
+++ b/c_glib/arrow-glib/output-stream.h
@@ -30,6 +30,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_OUTPUT_STREAM (garrow_output_stream_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowOutputStream, garrow_output_stream, GARROW, OUTPUT_STREAM, GObject)
 struct _GArrowOutputStreamClass
@@ -37,8 +38,11 @@ struct _GArrowOutputStreamClass
   GObjectClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_output_stream_align(GArrowOutputStream *stream, gint32 alignment, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_output_stream_write_tensor(GArrowOutputStream *stream,
                                   GArrowTensor *tensor,
@@ -51,6 +55,7 @@ garrow_output_stream_write_record_batch(GArrowOutputStream *stream,
                                         GError **error);
 
 #define GARROW_TYPE_FILE_OUTPUT_STREAM (garrow_file_output_stream_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowFileOutputStream,
                          garrow_file_output_stream,
                          GARROW,
@@ -61,10 +66,12 @@ struct _GArrowFileOutputStreamClass
   GArrowOutputStreamClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowFileOutputStream *
 garrow_file_output_stream_new(const gchar *path, gboolean append, GError **error);
 
 #define GARROW_TYPE_BUFFER_OUTPUT_STREAM (garrow_buffer_output_stream_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowBufferOutputStream,
                          garrow_buffer_output_stream,
                          GARROW,
@@ -75,10 +82,12 @@ struct _GArrowBufferOutputStreamClass
   GArrowOutputStreamClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowBufferOutputStream *
 garrow_buffer_output_stream_new(GArrowResizableBuffer *buffer);
 
 #define GARROW_TYPE_GIO_OUTPUT_STREAM (garrow_gio_output_stream_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowGIOOutputStream,
                          garrow_gio_output_stream,
                          GARROW,
@@ -89,15 +98,19 @@ struct _GArrowGIOOutputStreamClass
   GArrowOutputStreamClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowGIOOutputStream *
 garrow_gio_output_stream_new(GOutputStream *gio_output_stream);
+
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 G_GNUC_DEPRECATED
 GOutputStream *
 garrow_gio_output_stream_get_raw(GArrowGIOOutputStream *output_stream);
 #endif
 
 #define GARROW_TYPE_COMPRESSED_OUTPUT_STREAM (garrow_compressed_output_stream_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowCompressedOutputStream,
                          garrow_compressed_output_stream,
                          GARROW,
@@ -108,6 +121,7 @@ struct _GArrowCompressedOutputStreamClass
   GArrowOutputStreamClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowCompressedOutputStream *
 garrow_compressed_output_stream_new(GArrowCodec *codec,
                                     GArrowOutputStream *raw,
diff --git a/c_glib/arrow-glib/output-stream.hpp b/c_glib/arrow-glib/output-stream.hpp
index e41c65da88d82..515d969efc245 100644
--- a/c_glib/arrow-glib/output-stream.hpp
+++ b/c_glib/arrow-glib/output-stream.hpp
@@ -25,23 +25,32 @@
 
 #include <arrow-glib/output-stream.h>
 
+GARROW_EXTERN
 GArrowOutputStream *
 garrow_output_stream_new_raw(
   std::shared_ptr<arrow::io::OutputStream> *arrow_output_stream);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::io::OutputStream>
 garrow_output_stream_get_raw(GArrowOutputStream *output_stream);
 
+GARROW_EXTERN
 GArrowFileOutputStream *
 garrow_file_output_stream_new_raw(
   std::shared_ptr<arrow::io::FileOutputStream> *arrow_file_output_stream);
+
+GARROW_EXTERN
 GArrowBufferOutputStream *
 garrow_buffer_output_stream_new_raw(
   std::shared_ptr<arrow::io::BufferOutputStream> *arrow_buffer_output_stream);
 
+GARROW_EXTERN
 GArrowCompressedOutputStream *
 garrow_compressed_output_stream_new_raw(
   std::shared_ptr<arrow::io::CompressedOutputStream> *arrow_raw,
   GArrowCodec *codec,
   GArrowOutputStream *raw);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::io::OutputStream>
 garrow_compressed_output_stream_get_raw(GArrowCompressedOutputStream *stream);
diff --git a/c_glib/arrow-glib/readable.h b/c_glib/arrow-glib/readable.h
index d0b1f5b6a99ee..266b45849057e 100644
--- a/c_glib/arrow-glib/readable.h
+++ b/c_glib/arrow-glib/readable.h
@@ -25,10 +25,13 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_READABLE (garrow_readable_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_INTERFACE(GArrowReadable, garrow_readable, GARROW, READABLE, GObject)
 
+GARROW_AVAILABLE_IN_ALL
 GArrowBuffer *
 garrow_readable_read(GArrowReadable *readable, gint64 n_bytes, GError **error);
+
 GARROW_AVAILABLE_IN_0_17
 GBytes *
 garrow_readable_read_bytes(GArrowReadable *readable, gint64 n_bytes, GError **error);
diff --git a/c_glib/arrow-glib/reader.h b/c_glib/arrow-glib/reader.h
index 96e4c5bbb5890..5401aa3bb1fc5 100644
--- a/c_glib/arrow-glib/reader.h
+++ b/c_glib/arrow-glib/reader.h
@@ -29,6 +29,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_RECORD_BATCH_READER (garrow_record_batch_reader_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowRecordBatchReader,
                          garrow_record_batch_reader,
                          GARROW,
@@ -53,22 +54,29 @@ GARROW_AVAILABLE_IN_6_0
 gpointer
 garrow_record_batch_reader_export(GArrowRecordBatchReader *reader, GError **error);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowSchema *
 garrow_record_batch_reader_get_schema(GArrowRecordBatchReader *reader);
+
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 G_GNUC_DEPRECATED_FOR(garrow_record_batch_reader_read_next)
 GArrowRecordBatch *
 garrow_record_batch_reader_get_next_record_batch(GArrowRecordBatchReader *reader,
                                                  GError **error);
 #endif
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 G_GNUC_DEPRECATED_FOR(garrow_record_batch_reader_read_next)
 GArrowRecordBatch *
 garrow_record_batch_reader_read_next_record_batch(GArrowRecordBatchReader *reader,
                                                   GError **error);
 #endif
+
+GARROW_AVAILABLE_IN_ALL
 GArrowRecordBatch *
 garrow_record_batch_reader_read_next(GArrowRecordBatchReader *reader, GError **error);
+
 GARROW_AVAILABLE_IN_6_0
 GArrowTable *
 garrow_record_batch_reader_read_all(GArrowRecordBatchReader *reader, GError **error);
@@ -78,6 +86,7 @@ GList *
 garrow_record_batch_reader_get_sources(GArrowRecordBatchReader *reader);
 
 #define GARROW_TYPE_TABLE_BATCH_READER (garrow_table_batch_reader_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowTableBatchReader,
                          garrow_table_batch_reader,
                          GARROW,
@@ -88,6 +97,7 @@ struct _GArrowTableBatchReaderClass
   GArrowRecordBatchReaderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowTableBatchReader *
 garrow_table_batch_reader_new(GArrowTable *table);
 
@@ -98,6 +108,7 @@ garrow_table_batch_reader_set_max_chunk_size(GArrowTableBatchReader *reader,
 
 #define GARROW_TYPE_RECORD_BATCH_STREAM_READER                                           \
   (garrow_record_batch_stream_reader_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowRecordBatchStreamReader,
                          garrow_record_batch_stream_reader,
                          GARROW,
@@ -108,10 +119,12 @@ struct _GArrowRecordBatchStreamReaderClass
   GArrowRecordBatchReaderClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowRecordBatchStreamReader *
 garrow_record_batch_stream_reader_new(GArrowInputStream *stream, GError **error);
 
 #define GARROW_TYPE_RECORD_BATCH_FILE_READER (garrow_record_batch_file_reader_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowRecordBatchFileReader,
                          garrow_record_batch_file_reader,
                          GARROW,
@@ -122,28 +135,39 @@ struct _GArrowRecordBatchFileReaderClass
   GObjectClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowRecordBatchFileReader *
 garrow_record_batch_file_reader_new(GArrowSeekableInputStream *file, GError **error);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowSchema *
 garrow_record_batch_file_reader_get_schema(GArrowRecordBatchFileReader *reader);
+
+GARROW_AVAILABLE_IN_ALL
 guint
 garrow_record_batch_file_reader_get_n_record_batches(GArrowRecordBatchFileReader *reader);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowMetadataVersion
 garrow_record_batch_file_reader_get_version(GArrowRecordBatchFileReader *reader);
+
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 G_GNUC_DEPRECATED_FOR(garrow_record_batch_file_reader_read_record_batch)
 GArrowRecordBatch *
 garrow_record_batch_file_reader_get_record_batch(GArrowRecordBatchFileReader *reader,
                                                  guint i,
                                                  GError **error);
 #endif
+
+GARROW_AVAILABLE_IN_ALL
 GArrowRecordBatch *
 garrow_record_batch_file_reader_read_record_batch(GArrowRecordBatchFileReader *reader,
                                                   guint i,
                                                   GError **error);
 
 #define GARROW_TYPE_FEATHER_FILE_READER (garrow_feather_file_reader_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowFeatherFileReader,
                          garrow_feather_file_reader,
                          GARROW,
@@ -154,18 +178,26 @@ struct _GArrowFeatherFileReaderClass
   GObjectClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowFeatherFileReader *
 garrow_feather_file_reader_new(GArrowSeekableInputStream *file, GError **error);
 
+GARROW_AVAILABLE_IN_ALL
 gint
 garrow_feather_file_reader_get_version(GArrowFeatherFileReader *reader);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowTable *
 garrow_feather_file_reader_read(GArrowFeatherFileReader *reader, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowTable *
 garrow_feather_file_reader_read_indices(GArrowFeatherFileReader *reader,
                                         const gint *indices,
                                         guint n_indices,
                                         GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowTable *
 garrow_feather_file_reader_read_names(GArrowFeatherFileReader *reader,
                                       const gchar **names,
@@ -173,6 +205,7 @@ garrow_feather_file_reader_read_names(GArrowFeatherFileReader *reader,
                                       GError **error);
 
 #define GARROW_TYPE_CSV_READ_OPTIONS (garrow_csv_read_options_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowCSVReadOptions, garrow_csv_read_options, GARROW, CSV_READ_OPTIONS, GObject)
 struct _GArrowCSVReadOptionsClass
@@ -180,16 +213,23 @@ struct _GArrowCSVReadOptionsClass
   GObjectClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowCSVReadOptions *
 garrow_csv_read_options_new(void);
+
+GARROW_AVAILABLE_IN_ALL
 void
 garrow_csv_read_options_add_column_type(GArrowCSVReadOptions *options,
                                         const gchar *name,
                                         GArrowDataType *data_type);
+GARROW_AVAILABLE_IN_ALL
 void
 garrow_csv_read_options_add_schema(GArrowCSVReadOptions *options, GArrowSchema *schema);
+
+GARROW_AVAILABLE_IN_ALL
 GHashTable *
 garrow_csv_read_options_get_column_types(GArrowCSVReadOptions *options);
+
 GARROW_AVAILABLE_IN_0_14
 void
 garrow_csv_read_options_set_null_values(GArrowCSVReadOptions *options,
@@ -251,16 +291,20 @@ garrow_csv_read_options_add_timestamp_parser(GArrowCSVReadOptions *options,
                                              GArrowTimestampParser *parser);
 
 #define GARROW_TYPE_CSV_READER (garrow_csv_reader_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowCSVReader, garrow_csv_reader, GARROW, CSV_READER, GObject)
 struct _GArrowCSVReaderClass
 {
   GObjectClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowCSVReader *
 garrow_csv_reader_new(GArrowInputStream *input,
                       GArrowCSVReadOptions *options,
                       GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowTable *
 garrow_csv_reader_read(GArrowCSVReader *reader, GError **error);
 
@@ -279,6 +323,7 @@ typedef enum {
 } GArrowJSONReadUnexpectedFieldBehavior;
 
 #define GARROW_TYPE_JSON_READ_OPTIONS (garrow_json_read_options_get_type())
+GARROW_AVAILABLE_IN_0_14
 G_DECLARE_DERIVABLE_TYPE(
   GArrowJSONReadOptions, garrow_json_read_options, GARROW, JSON_READ_OPTIONS, GObject)
 struct _GArrowJSONReadOptionsClass
@@ -291,6 +336,7 @@ GArrowJSONReadOptions *
 garrow_json_read_options_new(void);
 
 #define GARROW_TYPE_JSON_READER (garrow_json_reader_get_type())
+GARROW_AVAILABLE_IN_0_14
 G_DECLARE_DERIVABLE_TYPE(
   GArrowJSONReader, garrow_json_reader, GARROW, JSON_READER, GObject)
 struct _GArrowJSONReaderClass
diff --git a/c_glib/arrow-glib/reader.hpp b/c_glib/arrow-glib/reader.hpp
index 192497ef52e31..beec6766af2e6 100644
--- a/c_glib/arrow-glib/reader.hpp
+++ b/c_glib/arrow-glib/reader.hpp
@@ -27,42 +27,61 @@
 
 #include <arrow-glib/reader.h>
 
+GARROW_EXTERN
 GArrowRecordBatchReader *
 garrow_record_batch_reader_new_raw(
   std::shared_ptr<arrow::ipc::RecordBatchReader> *arrow_reader, GList *sources);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::ipc::RecordBatchReader>
 garrow_record_batch_reader_get_raw(GArrowRecordBatchReader *reader);
 
+GARROW_EXTERN
 GArrowTableBatchReader *
 garrow_table_batch_reader_new_raw(std::shared_ptr<arrow::TableBatchReader> *arrow_reader,
                                   GArrowTable *table);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::TableBatchReader>
 garrow_table_batch_reader_get_raw(GArrowTableBatchReader *reader);
 
+GARROW_EXTERN
 GArrowRecordBatchStreamReader *
 garrow_record_batch_stream_reader_new_raw(
   std::shared_ptr<arrow::ipc::RecordBatchStreamReader> *arrow_reader);
 
+GARROW_EXTERN
 GArrowRecordBatchFileReader *
 garrow_record_batch_file_reader_new_raw(
   std::shared_ptr<arrow::ipc::RecordBatchFileReader> *arrow_reader);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::ipc::RecordBatchFileReader>
 garrow_record_batch_file_reader_get_raw(GArrowRecordBatchFileReader *reader);
 
+GARROW_EXTERN
 GArrowFeatherFileReader *
 garrow_feather_file_reader_new_raw(
   std::shared_ptr<arrow::ipc::feather::Reader> *arrow_reader);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::ipc::feather::Reader>
 garrow_feather_file_reader_get_raw(GArrowFeatherFileReader *reader);
 
+GARROW_EXTERN
 GArrowCSVReader *
 garrow_csv_reader_new_raw(std::shared_ptr<arrow::csv::TableReader> *arrow_reader,
                           GArrowInputStream *input);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::csv::TableReader>
 garrow_csv_reader_get_raw(GArrowCSVReader *reader);
 
+GARROW_EXTERN
 GArrowJSONReader *
 garrow_json_reader_new_raw(std::shared_ptr<arrow::json::TableReader> *arrow_reader,
                            GArrowInputStream *input);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::json::TableReader>
 garrow_json_reader_get_raw(GArrowJSONReader *reader);
diff --git a/c_glib/arrow-glib/record-batch.h b/c_glib/arrow-glib/record-batch.h
index 3c995658224cb..e7ffd83795ed4 100644
--- a/c_glib/arrow-glib/record-batch.h
+++ b/c_glib/arrow-glib/record-batch.h
@@ -26,6 +26,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_RECORD_BATCH (garrow_record_batch_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(
   GArrowRecordBatch, garrow_record_batch, GARROW, RECORD_BATCH, GObject)
 struct _GArrowRecordBatchClass
@@ -37,6 +38,7 @@ GARROW_AVAILABLE_IN_6_0
 GArrowRecordBatch *
 garrow_record_batch_import(gpointer c_abi_array, GArrowSchema *schema, GError **error);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowRecordBatch *
 garrow_record_batch_new(GArrowSchema *schema,
                         guint32 n_rows,
@@ -50,6 +52,7 @@ garrow_record_batch_export(GArrowRecordBatch *record_batch,
                            gpointer *c_abi_schema,
                            GError **error);
 
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_record_batch_equal(GArrowRecordBatch *record_batch,
                           GArrowRecordBatch *other_record_batch);
@@ -59,28 +62,43 @@ garrow_record_batch_equal_metadata(GArrowRecordBatch *record_batch,
                                    GArrowRecordBatch *other_record_batch,
                                    gboolean check_metadata);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowSchema *
 garrow_record_batch_get_schema(GArrowRecordBatch *record_batch);
+
 GARROW_AVAILABLE_IN_0_15
 GArrowArray *
 garrow_record_batch_get_column_data(GArrowRecordBatch *record_batch, gint i);
+
+GARROW_AVAILABLE_IN_ALL
 const gchar *
 garrow_record_batch_get_column_name(GArrowRecordBatch *record_batch, gint i);
+
+GARROW_AVAILABLE_IN_ALL
 guint
 garrow_record_batch_get_n_columns(GArrowRecordBatch *record_batch);
+
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_record_batch_get_n_rows(GArrowRecordBatch *record_batch);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowRecordBatch *
 garrow_record_batch_slice(GArrowRecordBatch *record_batch, gint64 offset, gint64 length);
 
+GARROW_AVAILABLE_IN_ALL
 gchar *
 garrow_record_batch_to_string(GArrowRecordBatch *record_batch, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowRecordBatch *
 garrow_record_batch_add_column(GArrowRecordBatch *record_batch,
                                guint i,
                                GArrowField *field,
                                GArrowArray *column,
                                GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowRecordBatch *
 garrow_record_batch_remove_column(GArrowRecordBatch *record_batch,
                                   guint i,
@@ -92,6 +110,7 @@ garrow_record_batch_serialize(GArrowRecordBatch *record_batch,
                               GError **error);
 
 #define GARROW_TYPE_RECORD_BATCH_ITERATOR (garrow_record_batch_iterator_get_type())
+GARROW_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(GArrowRecordBatchIterator,
                          garrow_record_batch_iterator,
                          GARROW,
diff --git a/c_glib/arrow-glib/record-batch.hpp b/c_glib/arrow-glib/record-batch.hpp
index 4c3e5e8a78231..75c0432b390ba 100644
--- a/c_glib/arrow-glib/record-batch.hpp
+++ b/c_glib/arrow-glib/record-batch.hpp
@@ -23,13 +23,18 @@
 
 #include <arrow-glib/record-batch.h>
 
+GARROW_EXTERN
 GArrowRecordBatch *
 garrow_record_batch_new_raw(std::shared_ptr<arrow::RecordBatch> *arrow_record_batch);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::RecordBatch>
 garrow_record_batch_get_raw(GArrowRecordBatch *record_batch);
 
+GARROW_EXTERN
 GArrowRecordBatchIterator *
 garrow_record_batch_iterator_new_raw(arrow::RecordBatchIterator *arrow_iterator);
 
+GARROW_EXTERN
 arrow::RecordBatchIterator *
 garrow_record_batch_iterator_get_raw(GArrowRecordBatchIterator *iterator);
diff --git a/c_glib/arrow-glib/scalar.cpp b/c_glib/arrow-glib/scalar.cpp
index def6b15148355..f965b4970304b 100644
--- a/c_glib/arrow-glib/scalar.cpp
+++ b/c_glib/arrow-glib/scalar.cpp
@@ -1063,7 +1063,8 @@ garrow_base_binary_scalar_get_value(GArrowBaseBinaryScalar *scalar)
   if (!priv->value) {
     const auto arrow_scalar = std::static_pointer_cast<arrow::BaseBinaryScalar>(
       garrow_scalar_get_raw(GARROW_SCALAR(scalar)));
-    priv->value = garrow_buffer_new_raw(&(arrow_scalar->value));
+    priv->value = garrow_buffer_new_raw(
+      const_cast<std::shared_ptr<arrow::Buffer> *>(&(arrow_scalar->value)));
   }
   return priv->value;
 }
@@ -1983,7 +1984,8 @@ garrow_base_list_scalar_get_value(GArrowBaseListScalar *scalar)
   if (!priv->value) {
     const auto arrow_scalar = std::static_pointer_cast<arrow::BaseListScalar>(
       garrow_scalar_get_raw(GARROW_SCALAR(scalar)));
-    priv->value = garrow_array_new_raw(&(arrow_scalar->value));
+    priv->value = garrow_array_new_raw(
+      const_cast<std::shared_ptr<arrow::Array> *>(&(arrow_scalar->value)));
   }
   return priv->value;
 }
diff --git a/c_glib/arrow-glib/scalar.h b/c_glib/arrow-glib/scalar.h
index b4a6229c62fd1..5f9015d29c61c 100644
--- a/c_glib/arrow-glib/scalar.h
+++ b/c_glib/arrow-glib/scalar.h
@@ -25,6 +25,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_SCALAR (garrow_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GArrowScalar, garrow_scalar, GARROW, SCALAR, GObject)
 struct _GArrowScalarClass
 {
@@ -64,6 +65,7 @@ garrow_scalar_cast(GArrowScalar *scalar,
                    GError **error);
 
 #define GARROW_TYPE_NULL_SCALAR (garrow_null_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowNullScalar, garrow_null_scalar, GARROW, NULL_SCALAR, GArrowScalar)
 struct _GArrowNullScalarClass
@@ -76,6 +78,7 @@ GArrowNullScalar *
 garrow_null_scalar_new(void);
 
 #define GARROW_TYPE_BOOLEAN_SCALAR (garrow_boolean_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowBooleanScalar, garrow_boolean_scalar, GARROW, BOOLEAN_SCALAR, GArrowScalar)
 struct _GArrowBooleanScalarClass
@@ -91,6 +94,7 @@ gboolean
 garrow_boolean_scalar_get_value(GArrowBooleanScalar *scalar);
 
 #define GARROW_TYPE_INT8_SCALAR (garrow_int8_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowInt8Scalar, garrow_int8_scalar, GARROW, INT8_SCALAR, GArrowScalar)
 struct _GArrowInt8ScalarClass
@@ -106,6 +110,7 @@ gint8
 garrow_int8_scalar_get_value(GArrowInt8Scalar *scalar);
 
 #define GARROW_TYPE_INT16_SCALAR (garrow_int16_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowInt16Scalar, garrow_int16_scalar, GARROW, INT16_SCALAR, GArrowScalar)
 struct _GArrowInt16ScalarClass
@@ -121,6 +126,7 @@ gint16
 garrow_int16_scalar_get_value(GArrowInt16Scalar *scalar);
 
 #define GARROW_TYPE_INT32_SCALAR (garrow_int32_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowInt32Scalar, garrow_int32_scalar, GARROW, INT32_SCALAR, GArrowScalar)
 struct _GArrowInt32ScalarClass
@@ -136,6 +142,7 @@ gint32
 garrow_int32_scalar_get_value(GArrowInt32Scalar *scalar);
 
 #define GARROW_TYPE_INT64_SCALAR (garrow_int64_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowInt64Scalar, garrow_int64_scalar, GARROW, INT64_SCALAR, GArrowScalar)
 struct _GArrowInt64ScalarClass
@@ -151,6 +158,7 @@ gint64
 garrow_int64_scalar_get_value(GArrowInt64Scalar *scalar);
 
 #define GARROW_TYPE_UINT8_SCALAR (garrow_uint8_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowUInt8Scalar, garrow_uint8_scalar, GARROW, UINT8_SCALAR, GArrowScalar)
 struct _GArrowUInt8ScalarClass
@@ -166,6 +174,7 @@ guint8
 garrow_uint8_scalar_get_value(GArrowUInt8Scalar *scalar);
 
 #define GARROW_TYPE_UINT16_SCALAR (garrow_uint16_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowUInt16Scalar, garrow_uint16_scalar, GARROW, UINT16_SCALAR, GArrowScalar)
 struct _GArrowUInt16ScalarClass
@@ -181,6 +190,7 @@ guint16
 garrow_uint16_scalar_get_value(GArrowUInt16Scalar *scalar);
 
 #define GARROW_TYPE_UINT32_SCALAR (garrow_uint32_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowUInt32Scalar, garrow_uint32_scalar, GARROW, UINT32_SCALAR, GArrowScalar)
 struct _GArrowUInt32ScalarClass
@@ -196,6 +206,7 @@ guint32
 garrow_uint32_scalar_get_value(GArrowUInt32Scalar *scalar);
 
 #define GARROW_TYPE_UINT64_SCALAR (garrow_uint64_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowUInt64Scalar, garrow_uint64_scalar, GARROW, UINT64_SCALAR, GArrowScalar)
 struct _GArrowUInt64ScalarClass
@@ -211,6 +222,7 @@ guint64
 garrow_uint64_scalar_get_value(GArrowUInt64Scalar *scalar);
 
 #define GARROW_TYPE_HALF_FLOAT_SCALAR (garrow_half_float_scalar_get_type())
+GARROW_AVAILABLE_IN_11_0
 G_DECLARE_DERIVABLE_TYPE(GArrowHalfFloatScalar,
                          garrow_half_float_scalar,
                          GARROW,
@@ -229,6 +241,7 @@ guint16
 garrow_half_float_scalar_get_value(GArrowHalfFloatScalar *scalar);
 
 #define GARROW_TYPE_FLOAT_SCALAR (garrow_float_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowFloatScalar, garrow_float_scalar, GARROW, FLOAT_SCALAR, GArrowScalar)
 struct _GArrowFloatScalarClass
@@ -244,6 +257,7 @@ gfloat
 garrow_float_scalar_get_value(GArrowFloatScalar *scalar);
 
 #define GARROW_TYPE_DOUBLE_SCALAR (garrow_double_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowDoubleScalar, garrow_double_scalar, GARROW, DOUBLE_SCALAR, GArrowScalar)
 struct _GArrowDoubleScalarClass
@@ -259,6 +273,7 @@ gdouble
 garrow_double_scalar_get_value(GArrowDoubleScalar *scalar);
 
 #define GARROW_TYPE_BASE_BINARY_SCALAR (garrow_base_binary_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GArrowBaseBinaryScalar,
                          garrow_base_binary_scalar,
                          GARROW,
@@ -274,6 +289,7 @@ GArrowBuffer *
 garrow_base_binary_scalar_get_value(GArrowBaseBinaryScalar *scalar);
 
 #define GARROW_TYPE_BINARY_SCALAR (garrow_binary_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowBinaryScalar, garrow_binary_scalar, GARROW, BINARY_SCALAR, GArrowBaseBinaryScalar)
 struct _GArrowBinaryScalarClass
@@ -286,6 +302,7 @@ GArrowBinaryScalar *
 garrow_binary_scalar_new(GArrowBuffer *value);
 
 #define GARROW_TYPE_STRING_SCALAR (garrow_string_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowStringScalar, garrow_string_scalar, GARROW, STRING_SCALAR, GArrowBaseBinaryScalar)
 struct _GArrowStringScalarClass
@@ -298,6 +315,7 @@ GArrowStringScalar *
 garrow_string_scalar_new(GArrowBuffer *value);
 
 #define GARROW_TYPE_LARGE_BINARY_SCALAR (garrow_large_binary_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GArrowLargeBinaryScalar,
                          garrow_large_binary_scalar,
                          GARROW,
@@ -313,6 +331,7 @@ GArrowLargeBinaryScalar *
 garrow_large_binary_scalar_new(GArrowBuffer *value);
 
 #define GARROW_TYPE_LARGE_STRING_SCALAR (garrow_large_string_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GArrowLargeStringScalar,
                          garrow_large_string_scalar,
                          GARROW,
@@ -328,6 +347,7 @@ GArrowLargeStringScalar *
 garrow_large_string_scalar_new(GArrowBuffer *value);
 
 #define GARROW_TYPE_FIXED_SIZE_BINARY_SCALAR (garrow_fixed_size_binary_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GArrowFixedSizeBinaryScalar,
                          garrow_fixed_size_binary_scalar,
                          GARROW,
@@ -344,6 +364,7 @@ garrow_fixed_size_binary_scalar_new(GArrowFixedSizeBinaryDataType *data_type,
                                     GArrowBuffer *value);
 
 #define GARROW_TYPE_DATE32_SCALAR (garrow_date32_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowDate32Scalar, garrow_date32_scalar, GARROW, DATE32_SCALAR, GArrowScalar)
 struct _GArrowDate32ScalarClass
@@ -359,6 +380,7 @@ gint32
 garrow_date32_scalar_get_value(GArrowDate32Scalar *scalar);
 
 #define GARROW_TYPE_DATE64_SCALAR (garrow_date64_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowDate64Scalar, garrow_date64_scalar, GARROW, DATE64_SCALAR, GArrowScalar)
 struct _GArrowDate64ScalarClass
@@ -374,6 +396,7 @@ gint64
 garrow_date64_scalar_get_value(GArrowDate64Scalar *scalar);
 
 #define GARROW_TYPE_TIME32_SCALAR (garrow_time32_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowTime32Scalar, garrow_time32_scalar, GARROW, TIME32_SCALAR, GArrowScalar)
 struct _GArrowTime32ScalarClass
@@ -389,6 +412,7 @@ gint32
 garrow_time32_scalar_get_value(GArrowTime32Scalar *scalar);
 
 #define GARROW_TYPE_TIME64_SCALAR (garrow_time64_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowTime64Scalar, garrow_time64_scalar, GARROW, TIME64_SCALAR, GArrowScalar)
 struct _GArrowTime64ScalarClass
@@ -404,6 +428,7 @@ gint64
 garrow_time64_scalar_get_value(GArrowTime64Scalar *scalar);
 
 #define GARROW_TYPE_TIMESTAMP_SCALAR (garrow_timestamp_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowTimestampScalar, garrow_timestamp_scalar, GARROW, TIMESTAMP_SCALAR, GArrowScalar)
 struct _GArrowTimestampScalarClass
@@ -419,6 +444,7 @@ gint64
 garrow_timestamp_scalar_get_value(GArrowTimestampScalar *scalar);
 
 #define GARROW_TYPE_MONTH_INTERVAL_SCALAR (garrow_month_interval_scalar_get_type())
+GARROW_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GArrowMonthIntervalScalar,
                          garrow_month_interval_scalar,
                          GARROW,
@@ -437,6 +463,7 @@ gint32
 garrow_month_interval_scalar_get_value(GArrowMonthIntervalScalar *scalar);
 
 #define GARROW_TYPE_DAY_TIME_INTERVAL_SCALAR (garrow_day_time_interval_scalar_get_type())
+GARROW_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GArrowDayTimeIntervalScalar,
                          garrow_day_time_interval_scalar,
                          GARROW,
@@ -456,6 +483,7 @@ garrow_day_time_interval_scalar_get_value(GArrowDayTimeIntervalScalar *scalar);
 
 #define GARROW_TYPE_MONTH_DAY_NANO_INTERVAL_SCALAR                                       \
   (garrow_month_day_nano_interval_scalar_get_type())
+GARROW_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GArrowMonthDayNanoIntervalScalar,
                          garrow_month_day_nano_interval_scalar,
                          GARROW,
@@ -474,6 +502,7 @@ GArrowMonthDayNano *
 garrow_month_day_nano_interval_scalar_get_value(GArrowMonthDayNanoIntervalScalar *scalar);
 
 #define GARROW_TYPE_DECIMAL128_SCALAR (garrow_decimal128_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GArrowDecimal128Scalar,
                          garrow_decimal128_scalar,
                          GARROW,
@@ -493,6 +522,7 @@ GArrowDecimal128 *
 garrow_decimal128_scalar_get_value(GArrowDecimal128Scalar *scalar);
 
 #define GARROW_TYPE_DECIMAL256_SCALAR (garrow_decimal256_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GArrowDecimal256Scalar,
                          garrow_decimal256_scalar,
                          GARROW,
@@ -512,6 +542,7 @@ GArrowDecimal256 *
 garrow_decimal256_scalar_get_value(GArrowDecimal256Scalar *scalar);
 
 #define GARROW_TYPE_BASE_LIST_SCALAR (garrow_base_list_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowBaseListScalar, garrow_base_list_scalar, GARROW, BASE_LIST_SCALAR, GArrowScalar)
 struct _GArrowBaseListScalarClass
@@ -524,6 +555,7 @@ GArrowArray *
 garrow_base_list_scalar_get_value(GArrowBaseListScalar *scalar);
 
 #define GARROW_TYPE_LIST_SCALAR (garrow_list_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowListScalar, garrow_list_scalar, GARROW, LIST_SCALAR, GArrowBaseListScalar)
 struct _GArrowListScalarClass
@@ -536,6 +568,7 @@ GArrowListScalar *
 garrow_list_scalar_new(GArrowListArray *value);
 
 #define GARROW_TYPE_LARGE_LIST_SCALAR (garrow_large_list_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GArrowLargeListScalar,
                          garrow_large_list_scalar,
                          GARROW,
@@ -551,6 +584,7 @@ GArrowLargeListScalar *
 garrow_large_list_scalar_new(GArrowLargeListArray *value);
 
 #define GARROW_TYPE_MAP_SCALAR (garrow_map_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowMapScalar, garrow_map_scalar, GARROW, MAP_SCALAR, GArrowBaseListScalar)
 struct _GArrowMapScalarClass
@@ -563,6 +597,7 @@ GArrowMapScalar *
 garrow_map_scalar_new(GArrowStructArray *value);
 
 #define GARROW_TYPE_STRUCT_SCALAR (garrow_struct_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowStructScalar, garrow_struct_scalar, GARROW, STRUCT_SCALAR, GArrowScalar)
 struct _GArrowStructScalarClass
@@ -578,6 +613,7 @@ GList *
 garrow_struct_scalar_get_value(GArrowStructScalar *scalar);
 
 #define GARROW_TYPE_UNION_SCALAR (garrow_union_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowUnionScalar, garrow_union_scalar, GARROW, UNION_SCALAR, GArrowScalar)
 struct _GArrowUnionScalarClass
@@ -593,6 +629,7 @@ GArrowScalar *
 garrow_union_scalar_get_value(GArrowUnionScalar *scalar);
 
 #define GARROW_TYPE_SPARSE_UNION_SCALAR (garrow_sparse_union_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GArrowSparseUnionScalar,
                          garrow_sparse_union_scalar,
                          GARROW,
@@ -610,6 +647,7 @@ garrow_sparse_union_scalar_new(GArrowSparseUnionDataType *data_type,
                                GArrowScalar *value);
 
 #define GARROW_TYPE_DENSE_UNION_SCALAR (garrow_dense_union_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(GArrowDenseUnionScalar,
                          garrow_dense_union_scalar,
                          GARROW,
@@ -627,6 +665,7 @@ garrow_dense_union_scalar_new(GArrowDenseUnionDataType *data_type,
                               GArrowScalar *value);
 
 #define GARROW_TYPE_EXTENSION_SCALAR (garrow_extension_scalar_get_type())
+GARROW_AVAILABLE_IN_5_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowExtensionScalar, garrow_extension_scalar, GARROW, EXTENSION_SCALAR, GArrowScalar)
 struct _GArrowExtensionScalarClass
diff --git a/c_glib/arrow-glib/schema.h b/c_glib/arrow-glib/schema.h
index 93cd5bd542cf8..aab740397b7d6 100644
--- a/c_glib/arrow-glib/schema.h
+++ b/c_glib/arrow-glib/schema.h
@@ -24,6 +24,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_SCHEMA (garrow_schema_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowSchema, garrow_schema, GARROW, SCHEMA, GObject)
 struct _GArrowSchemaClass
 {
@@ -34,6 +35,7 @@ GARROW_AVAILABLE_IN_6_0
 GArrowSchema *
 garrow_schema_import(gpointer c_abi_schema, GError **error);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowSchema *
 garrow_schema_new(GList *fields);
 
@@ -41,34 +43,48 @@ GARROW_AVAILABLE_IN_6_0
 gpointer
 garrow_schema_export(GArrowSchema *schema, GError **error);
 
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_schema_equal(GArrowSchema *schema, GArrowSchema *other_schema);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowField *
 garrow_schema_get_field(GArrowSchema *schema, guint i);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowField *
 garrow_schema_get_field_by_name(GArrowSchema *schema, const gchar *name);
 GARROW_AVAILABLE_IN_0_15
 gint
 garrow_schema_get_field_index(GArrowSchema *schema, const gchar *name);
 
+GARROW_AVAILABLE_IN_ALL
 guint
 garrow_schema_n_fields(GArrowSchema *schema);
+
+GARROW_AVAILABLE_IN_ALL
 GList *
 garrow_schema_get_fields(GArrowSchema *schema);
 
+GARROW_AVAILABLE_IN_ALL
 gchar *
 garrow_schema_to_string(GArrowSchema *schema);
+
 GARROW_AVAILABLE_IN_0_17
 gchar *
 garrow_schema_to_string_metadata(GArrowSchema *schema, gboolean show_metadata);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowSchema *
 garrow_schema_add_field(GArrowSchema *schema,
                         guint i,
                         GArrowField *field,
                         GError **error);
+GARROW_AVAILABLE_IN_ALL
 GArrowSchema *
 garrow_schema_remove_field(GArrowSchema *schema, guint i, GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowSchema *
 garrow_schema_replace_field(GArrowSchema *schema,
                             guint i,
diff --git a/c_glib/arrow-glib/schema.hpp b/c_glib/arrow-glib/schema.hpp
index 333f73391c900..ba6c459495461 100644
--- a/c_glib/arrow-glib/schema.hpp
+++ b/c_glib/arrow-glib/schema.hpp
@@ -23,7 +23,10 @@
 
 #include <arrow-glib/schema.h>
 
+GARROW_EXTERN
 GArrowSchema *
 garrow_schema_new_raw(std::shared_ptr<arrow::Schema> *arrow_schema);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::Schema>
 garrow_schema_get_raw(GArrowSchema *schema);
diff --git a/c_glib/arrow-glib/table-builder.h b/c_glib/arrow-glib/table-builder.h
index 0e13352bbdde3..6fad1ae79a40f 100644
--- a/c_glib/arrow-glib/table-builder.h
+++ b/c_glib/arrow-glib/table-builder.h
@@ -26,6 +26,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_RECORD_BATCH_BUILDER (garrow_record_batch_builder_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowRecordBatchBuilder,
                          garrow_record_batch_builder,
                          GARROW,
@@ -36,34 +37,45 @@ struct _GArrowRecordBatchBuilderClass
   GObjectClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowRecordBatchBuilder *
 garrow_record_batch_builder_new(GArrowSchema *schema, GError **error);
 
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_record_batch_builder_get_initial_capacity(GArrowRecordBatchBuilder *builder);
+
+GARROW_AVAILABLE_IN_ALL
 void
 garrow_record_batch_builder_set_initial_capacity(GArrowRecordBatchBuilder *builder,
                                                  gint64 capacity);
+GARROW_AVAILABLE_IN_ALL
 GArrowSchema *
 garrow_record_batch_builder_get_schema(GArrowRecordBatchBuilder *builder);
 
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_13_FOR(garrow_record_batch_builder_get_n_columns)
 gint
 garrow_record_batch_builder_get_n_fields(GArrowRecordBatchBuilder *builder);
 #endif
+
 GARROW_AVAILABLE_IN_0_13
 gint
 garrow_record_batch_builder_get_n_columns(GArrowRecordBatchBuilder *builder);
+
 #ifndef GARROW_DISABLE_DEPRECATED
+GARROW_AVAILABLE_IN_ALL
 GARROW_DEPRECATED_IN_0_13_FOR(garrow_record_batch_builder_get_column_builder)
 GArrowArrayBuilder *
 garrow_record_batch_builder_get_field(GArrowRecordBatchBuilder *builder, gint i);
 #endif
+
 GARROW_AVAILABLE_IN_0_13
 GArrowArrayBuilder *
 garrow_record_batch_builder_get_column_builder(GArrowRecordBatchBuilder *builder, gint i);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowRecordBatch *
 garrow_record_batch_builder_flush(GArrowRecordBatchBuilder *builder, GError **error);
 
diff --git a/c_glib/arrow-glib/table.h b/c_glib/arrow-glib/table.h
index 1bf64d25a4f3f..d790e413df5fc 100644
--- a/c_glib/arrow-glib/table.h
+++ b/c_glib/arrow-glib/table.h
@@ -29,6 +29,7 @@ G_BEGIN_DECLS
 
 #define GARROW_TYPE_TABLE_CONCATENATE_OPTIONS                                            \
   (garrow_table_concatenate_options_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowTableConcatenateOptions,
                          garrow_table_concatenate_options,
                          GARROW,
@@ -44,6 +45,7 @@ GArrowTableConcatenateOptions *
 garrow_table_concatenate_options_new(void);
 
 #define GARROW_TYPE_TABLE (garrow_table_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowTable, garrow_table, GARROW, TABLE, GObject)
 struct _GArrowTableClass
 {
@@ -53,18 +55,21 @@ struct _GArrowTableClass
 GARROW_AVAILABLE_IN_0_12
 GArrowTable *
 garrow_table_new_values(GArrowSchema *schema, GList *values, GError **error);
+
 GARROW_AVAILABLE_IN_0_15
 GArrowTable *
 garrow_table_new_chunked_arrays(GArrowSchema *schema,
                                 GArrowChunkedArray **chunked_arrays,
                                 gsize n_chunked_arrays,
                                 GError **error);
+
 GARROW_AVAILABLE_IN_0_12
 GArrowTable *
 garrow_table_new_arrays(GArrowSchema *schema,
                         GArrowArray **arrays,
                         gsize n_arrays,
                         GError **error);
+
 GARROW_AVAILABLE_IN_0_12
 GArrowTable *
 garrow_table_new_record_batches(GArrowSchema *schema,
@@ -72,22 +77,29 @@ garrow_table_new_record_batches(GArrowSchema *schema,
                                 gsize n_record_batches,
                                 GError **error);
 
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_table_equal(GArrowTable *table, GArrowTable *other_table);
+
 GARROW_AVAILABLE_IN_0_17
 gboolean
 garrow_table_equal_metadata(GArrowTable *table,
                             GArrowTable *other_table,
                             gboolean check_metadata);
 
+GARROW_AVAILABLE_IN_ALL
 GArrowSchema *
 garrow_table_get_schema(GArrowTable *table);
+
 GARROW_AVAILABLE_IN_0_15
 GArrowChunkedArray *
 garrow_table_get_column_data(GArrowTable *table, gint i);
 
+GARROW_AVAILABLE_IN_ALL
 guint
 garrow_table_get_n_columns(GArrowTable *table);
+
+GARROW_AVAILABLE_IN_ALL
 guint64
 garrow_table_get_n_rows(GArrowTable *table);
 
@@ -98,8 +110,11 @@ garrow_table_add_column(GArrowTable *table,
                         GArrowField *field,
                         GArrowChunkedArray *chunked_array,
                         GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowTable *
 garrow_table_remove_column(GArrowTable *table, guint i, GError **error);
+
 GARROW_AVAILABLE_IN_0_15
 GArrowTable *
 garrow_table_replace_column(GArrowTable *table,
@@ -107,22 +122,28 @@ garrow_table_replace_column(GArrowTable *table,
                             GArrowField *field,
                             GArrowChunkedArray *chunked_array,
                             GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gchar *
 garrow_table_to_string(GArrowTable *table, GError **error);
+
 GARROW_AVAILABLE_IN_0_14
 GArrowTable *
 garrow_table_concatenate(GArrowTable *table,
                          GList *other_tables,
                          GArrowTableConcatenateOptions *options,
                          GError **error);
+
 GARROW_AVAILABLE_IN_0_14
 GArrowTable *
 garrow_table_slice(GArrowTable *table, gint64 offset, gint64 length);
+
 GARROW_AVAILABLE_IN_0_16
 GArrowTable *
 garrow_table_combine_chunks(GArrowTable *table, GError **error);
 
 #define GARROW_TYPE_FEATHER_WRITE_PROPERTIES (garrow_feather_write_properties_get_type())
+GARROW_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(GArrowFeatherWriteProperties,
                          garrow_feather_write_properties,
                          GARROW,
diff --git a/c_glib/arrow-glib/table.hpp b/c_glib/arrow-glib/table.hpp
index 3077c2ece9b37..79fc97471a42c 100644
--- a/c_glib/arrow-glib/table.hpp
+++ b/c_glib/arrow-glib/table.hpp
@@ -24,10 +24,14 @@
 
 #include <arrow-glib/table.h>
 
+GARROW_EXTERN
 GArrowTable *
 garrow_table_new_raw(std::shared_ptr<arrow::Table> *arrow_table);
+
+GARROW_EXTERN
 std::shared_ptr<arrow::Table>
 garrow_table_get_raw(GArrowTable *table);
 
+GARROW_EXTERN
 arrow::ipc::feather::WriteProperties *
 garrow_feather_write_properties_get_raw(GArrowFeatherWriteProperties *properties);
diff --git a/c_glib/arrow-glib/tensor.h b/c_glib/arrow-glib/tensor.h
index a6d11b248110e..5971c3af12600 100644
--- a/c_glib/arrow-glib/tensor.h
+++ b/c_glib/arrow-glib/tensor.h
@@ -25,12 +25,14 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_TENSOR (garrow_tensor_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowTensor, garrow_tensor, GARROW, TENSOR, GObject)
 struct _GArrowTensorClass
 {
   GObjectClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowTensor *
 garrow_tensor_new(GArrowDataType *data_type,
                   GArrowBuffer *data,
@@ -40,30 +42,55 @@ garrow_tensor_new(GArrowDataType *data_type,
                   gsize n_strides,
                   gchar **dimension_names,
                   gsize n_dimension_names);
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_tensor_equal(GArrowTensor *tensor, GArrowTensor *other_tensor);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowDataType *
 garrow_tensor_get_value_data_type(GArrowTensor *tensor);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowType
 garrow_tensor_get_value_type(GArrowTensor *tensor);
+
+GARROW_AVAILABLE_IN_ALL
 GArrowBuffer *
 garrow_tensor_get_buffer(GArrowTensor *tensor);
+
+GARROW_AVAILABLE_IN_ALL
 gint64 *
 garrow_tensor_get_shape(GArrowTensor *tensor, gint *n_dimensions);
+
+GARROW_AVAILABLE_IN_ALL
 gint64 *
 garrow_tensor_get_strides(GArrowTensor *tensor, gint *n_strides);
+
+GARROW_AVAILABLE_IN_ALL
 gint
 garrow_tensor_get_n_dimensions(GArrowTensor *tensor);
+
+GARROW_AVAILABLE_IN_ALL
 const gchar *
 garrow_tensor_get_dimension_name(GArrowTensor *tensor, gint i);
+
+GARROW_AVAILABLE_IN_ALL
 gint64
 garrow_tensor_get_size(GArrowTensor *tensor);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_tensor_is_mutable(GArrowTensor *tensor);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_tensor_is_contiguous(GArrowTensor *tensor);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_tensor_is_row_major(GArrowTensor *tensor);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_tensor_is_column_major(GArrowTensor *tensor);
 
diff --git a/c_glib/arrow-glib/timestamp-parser.h b/c_glib/arrow-glib/timestamp-parser.h
index 05cad54746eeb..a7265d6ef46fb 100644
--- a/c_glib/arrow-glib/timestamp-parser.h
+++ b/c_glib/arrow-glib/timestamp-parser.h
@@ -26,6 +26,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_TIMESTAMP_PARSER (garrow_timestamp_parser_get_type())
+GARROW_AVAILABLE_IN_16_0
 G_DECLARE_DERIVABLE_TYPE(
   GArrowTimestampParser, garrow_timestamp_parser, GARROW, TIMESTAMP_PARSER, GObject)
 struct _GArrowTimestampParserClass
@@ -39,6 +40,7 @@ garrow_timestamp_parser_get_kind(GArrowTimestampParser *parser);
 
 #define GARROW_TYPE_STRPTIME_TIMESTAMP_PARSER                                            \
   (garrow_strptime_timestamp_parser_get_type())
+GARROW_AVAILABLE_IN_16_0
 G_DECLARE_DERIVABLE_TYPE(GArrowStrptimeTimestampParser,
                          garrow_strptime_timestamp_parser,
                          GARROW,
@@ -58,6 +60,7 @@ const gchar *
 garrow_strptime_timestamp_parser_get_format(GArrowStrptimeTimestampParser *parser);
 
 #define GARROW_TYPE_ISO8601_TIMESTAMP_PARSER (garrow_iso8601_timestamp_parser_get_type())
+GARROW_AVAILABLE_IN_16_0
 G_DECLARE_DERIVABLE_TYPE(GArrowISO8601TimestampParser,
                          garrow_iso8601_timestamp_parser,
                          GARROW,
diff --git a/c_glib/arrow-glib/version.h.in b/c_glib/arrow-glib/version.h.in
index a83c68a2a16dc..b530a088c8e38 100644
--- a/c_glib/arrow-glib/version.h.in
+++ b/c_glib/arrow-glib/version.h.in
@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include <glib.h>
+
 /**
  * SECTION: version
  * @section_id: version-macros
@@ -36,7 +38,7 @@
  *
  * Since: 0.10.0
  */
-#define GARROW_VERSION_MAJOR (@GARROW_VERSION_MAJOR@)
+#define GARROW_VERSION_MAJOR (@VERSION_MAJOR@)
 
 /**
  * GARROW_VERSION_MINOR:
@@ -45,7 +47,7 @@
  *
  * Since: 0.10.0
  */
-#define GARROW_VERSION_MINOR (@GARROW_VERSION_MINOR@)
+#define GARROW_VERSION_MINOR (@VERSION_MINOR@)
 
 /**
  * GARROW_VERSION_MICRO:
@@ -54,7 +56,7 @@
  *
  * Since: 0.10.0
  */
-#define GARROW_VERSION_MICRO (@GARROW_VERSION_MICRO@)
+#define GARROW_VERSION_MICRO (@VERSION_MICRO@)
 
 /**
  * GARROW_VERSION_TAG:
@@ -64,7 +66,7 @@
  *
  * Since: 0.10.0
  */
-#define GARROW_VERSION_TAG   "@GARROW_VERSION_TAG@"
+#define GARROW_VERSION_TAG   "@VERSION_TAG@"
 
 /**
  * GARROW_VERSION_CHECK:
@@ -108,212 +110,7 @@
 #  define GARROW_UNAVAILABLE(major, minor) G_UNAVAILABLE(major, minor)
 #endif
 
-/**
- * GARROW_VERSION_16_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 16.0.0
- */
-#define GARROW_VERSION_16_0 G_ENCODE_VERSION(16, 0)
-
-/**
- * GARROW_VERSION_15_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 15.0.0
- */
-#define GARROW_VERSION_15_0 G_ENCODE_VERSION(15, 0)
-
-/**
- * GARROW_VERSION_14_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 14.0.0
- */
-#define GARROW_VERSION_14_0 G_ENCODE_VERSION(14, 0)
-
-/**
- * GARROW_VERSION_13_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 13.0.0
- */
-#define GARROW_VERSION_13_0 G_ENCODE_VERSION(13, 0)
-
-/**
- * GARROW_VERSION_12_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 12.0.0
- */
-#define GARROW_VERSION_12_0 G_ENCODE_VERSION(12, 0)
-
-/**
- * GARROW_VERSION_11_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 11.0.0
- */
-#define GARROW_VERSION_11_0 G_ENCODE_VERSION(11, 0)
-
-/**
- * GARROW_VERSION_10_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 10.0.0
- */
-#define GARROW_VERSION_10_0 G_ENCODE_VERSION(10, 0)
-
-/**
- * GARROW_VERSION_9_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 9.0.0
- */
-#define GARROW_VERSION_9_0 G_ENCODE_VERSION(9, 0)
-
-/**
- * GARROW_VERSION_8_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 8.0.0
- */
-#define GARROW_VERSION_8_0 G_ENCODE_VERSION(8, 0)
-
-/**
- * GARROW_VERSION_7_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 7.0.0
- */
-#define GARROW_VERSION_7_0 G_ENCODE_VERSION(7, 0)
-
-/**
- * GARROW_VERSION_6_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 6.0.0
- */
-#define GARROW_VERSION_6_0 G_ENCODE_VERSION(6, 0)
-
-/**
- * GARROW_VERSION_5_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 5.0.0
- */
-#define GARROW_VERSION_5_0 G_ENCODE_VERSION(5, 0)
-
-/**
- * GARROW_VERSION_4_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 4.0.0
- */
-#define GARROW_VERSION_4_0 G_ENCODE_VERSION(4, 0)
-
-/**
- * GARROW_VERSION_3_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 3.0.0
- */
-#define GARROW_VERSION_3_0 G_ENCODE_VERSION(3, 0)
-
-/**
- * GARROW_VERSION_2_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 2.0.0
- */
-#define GARROW_VERSION_2_0 G_ENCODE_VERSION(2, 0)
-
-/**
- * GARROW_VERSION_1_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 1.0.0
- */
-#define GARROW_VERSION_1_0 G_ENCODE_VERSION(1, 0)
-
-/**
- * GARROW_VERSION_0_17:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 0.17.0
- */
-#define GARROW_VERSION_0_17 G_ENCODE_VERSION(0, 17)
-
-/**
- * GARROW_VERSION_0_16:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 0.16.0
- */
-#define GARROW_VERSION_0_16 G_ENCODE_VERSION(0, 16)
-
-/**
- * GARROW_VERSION_0_15:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 0.15.0
- */
-#define GARROW_VERSION_0_15 G_ENCODE_VERSION(0, 15)
-
-/**
- * GARROW_VERSION_0_14:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 0.14.0
- */
-#define GARROW_VERSION_0_14 G_ENCODE_VERSION(0, 14)
-
-/**
- * GARROW_VERSION_0_13:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 0.13.0
- */
-#define GARROW_VERSION_0_13 G_ENCODE_VERSION(0, 13)
-
-/**
- * GARROW_VERSION_0_12:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 0.12.0
- */
-#define GARROW_VERSION_0_12 G_ENCODE_VERSION(0, 12)
-
-/**
- * GARROW_VERSION_0_10:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 0.10.0
- */
-#define GARROW_VERSION_0_10 G_ENCODE_VERSION(0, 10)
+@ENCODED_VERSIONS@
 
 /**
  * GARROW_VERSION_MIN_REQUIRED:
@@ -359,327 +156,6 @@
   G_ENCODE_VERSION(GARROW_VERSION_MAJOR, GARROW_VERSION_MINOR)
 #endif
 
+@VISIBILITY_MACROS@
 
-#define GARROW_AVAILABLE_IN_ALL
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_16_0
-#  define GARROW_DEPRECATED_IN_16_0                GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_16_0_FOR(function)  GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_16_0
-#  define GARROW_DEPRECATED_IN_16_0_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_16_0
-#  define GARROW_AVAILABLE_IN_16_0 GARROW_UNAVAILABLE(16, 0)
-#else
-#  define GARROW_AVAILABLE_IN_16_0
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_15_0
-#  define GARROW_DEPRECATED_IN_15_0                GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_15_0_FOR(function)  GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_15_0
-#  define GARROW_DEPRECATED_IN_15_0_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_15_0
-#  define GARROW_AVAILABLE_IN_15_0 GARROW_UNAVAILABLE(15, 0)
-#else
-#  define GARROW_AVAILABLE_IN_15_0
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_14_0
-#  define GARROW_DEPRECATED_IN_14_0                GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_14_0_FOR(function)  GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_14_0
-#  define GARROW_DEPRECATED_IN_14_0_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_14_0
-#  define GARROW_AVAILABLE_IN_14_0 GARROW_UNAVAILABLE(14, 0)
-#else
-#  define GARROW_AVAILABLE_IN_14_0
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_13_0
-#  define GARROW_DEPRECATED_IN_13_0                GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_13_0_FOR(function)  GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_13_0
-#  define GARROW_DEPRECATED_IN_13_0_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_13_0
-#  define GARROW_AVAILABLE_IN_13_0 GARROW_UNAVAILABLE(13, 0)
-#else
-#  define GARROW_AVAILABLE_IN_13_0
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_12_0
-#  define GARROW_DEPRECATED_IN_12_0                GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_12_0_FOR(function)  GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_12_0
-#  define GARROW_DEPRECATED_IN_12_0_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_12_0
-#  define GARROW_AVAILABLE_IN_12_0 GARROW_UNAVAILABLE(12, 0)
-#else
-#  define GARROW_AVAILABLE_IN_12_0
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_11_0
-#  define GARROW_DEPRECATED_IN_11_0                GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_11_0_FOR(function)  GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_11_0
-#  define GARROW_DEPRECATED_IN_11_0_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_11_0
-#  define GARROW_AVAILABLE_IN_11_0 GARROW_UNAVAILABLE(11, 0)
-#else
-#  define GARROW_AVAILABLE_IN_11_0
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_10_0
-#  define GARROW_DEPRECATED_IN_10_0                GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_10_0_FOR(function)  GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_10_0
-#  define GARROW_DEPRECATED_IN_10_0_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_10_0
-#  define GARROW_AVAILABLE_IN_10_0 GARROW_UNAVAILABLE(10, 0)
-#else
-#  define GARROW_AVAILABLE_IN_10_0
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_9_0
-#  define GARROW_DEPRECATED_IN_9_0                GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_9_0_FOR(function)  GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_9_0
-#  define GARROW_DEPRECATED_IN_9_0_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_9_0
-#  define GARROW_AVAILABLE_IN_9_0 GARROW_UNAVAILABLE(9, 0)
-#else
-#  define GARROW_AVAILABLE_IN_9_0
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_8_0
-#  define GARROW_DEPRECATED_IN_8_0                GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_8_0_FOR(function)  GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_8_0
-#  define GARROW_DEPRECATED_IN_8_0_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_8_0
-#  define GARROW_AVAILABLE_IN_8_0 GARROW_UNAVAILABLE(8, 0)
-#else
-#  define GARROW_AVAILABLE_IN_8_0
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_7_0
-#  define GARROW_DEPRECATED_IN_7_0                GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_7_0_FOR(function)  GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_7_0
-#  define GARROW_DEPRECATED_IN_7_0_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_7_0
-#  define GARROW_AVAILABLE_IN_7_0 GARROW_UNAVAILABLE(7, 0)
-#else
-#  define GARROW_AVAILABLE_IN_7_0
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_6_0
-#  define GARROW_DEPRECATED_IN_6_0                GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_6_0_FOR(function)  GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_6_0
-#  define GARROW_DEPRECATED_IN_6_0_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_6_0
-#  define GARROW_AVAILABLE_IN_6_0 GARROW_UNAVAILABLE(6, 0)
-#else
-#  define GARROW_AVAILABLE_IN_6_0
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_5_0
-#  define GARROW_DEPRECATED_IN_5_0                GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_5_0_FOR(function)  GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_5_0
-#  define GARROW_DEPRECATED_IN_5_0_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_5_0
-#  define GARROW_AVAILABLE_IN_5_0 GARROW_UNAVAILABLE(5, 0)
-#else
-#  define GARROW_AVAILABLE_IN_5_0
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_4_0
-#  define GARROW_DEPRECATED_IN_4_0                GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_4_0_FOR(function)  GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_4_0
-#  define GARROW_DEPRECATED_IN_4_0_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_4_0
-#  define GARROW_AVAILABLE_IN_4_0 GARROW_UNAVAILABLE(4, 0)
-#else
-#  define GARROW_AVAILABLE_IN_4_0
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_3_0
-#  define GARROW_DEPRECATED_IN_3_0                GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_3_0_FOR(function)  GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_3_0
-#  define GARROW_DEPRECATED_IN_3_0_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_3_0
-#  define GARROW_AVAILABLE_IN_3_0 GARROW_UNAVAILABLE(3, 0)
-#else
-#  define GARROW_AVAILABLE_IN_3_0
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_2_0
-#  define GARROW_DEPRECATED_IN_2_0                GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_2_0_FOR(function)  GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_2_0
-#  define GARROW_DEPRECATED_IN_2_0_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_2_0
-#  define GARROW_AVAILABLE_IN_2_0 GARROW_UNAVAILABLE(2, 0)
-#else
-#  define GARROW_AVAILABLE_IN_2_0
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_1_0
-#  define GARROW_DEPRECATED_IN_1_0                GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_1_0_FOR(function)  GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_1_0
-#  define GARROW_DEPRECATED_IN_1_0_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_1_0
-#  define GARROW_AVAILABLE_IN_1_0 GARROW_UNAVAILABLE(1, 0)
-#else
-#  define GARROW_AVAILABLE_IN_1_0
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_0_17
-#  define GARROW_DEPRECATED_IN_0_17               GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_0_17_FOR(function) GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_0_17
-#  define GARROW_DEPRECATED_IN_0_17_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_0_17
-#  define GARROW_AVAILABLE_IN_0_17 GARROW_UNAVAILABLE(0, 17)
-#else
-#  define GARROW_AVAILABLE_IN_0_17
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_0_16
-#  define GARROW_DEPRECATED_IN_0_16               GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_0_16_FOR(function) GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_0_16
-#  define GARROW_DEPRECATED_IN_0_16_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_0_16
-#  define GARROW_AVAILABLE_IN_0_16 GARROW_UNAVAILABLE(0, 16)
-#else
-#  define GARROW_AVAILABLE_IN_0_16
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_0_15
-#  define GARROW_DEPRECATED_IN_0_15               GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_0_15_FOR(function) GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_0_15
-#  define GARROW_DEPRECATED_IN_0_15_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_0_15
-#  define GARROW_AVAILABLE_IN_0_15 GARROW_UNAVAILABLE(0, 15)
-#else
-#  define GARROW_AVAILABLE_IN_0_15
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_0_14
-#  define GARROW_DEPRECATED_IN_0_14               GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_0_14_FOR(function) GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_0_14
-#  define GARROW_DEPRECATED_IN_0_14_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_0_14
-#  define GARROW_AVAILABLE_IN_0_14 GARROW_UNAVAILABLE(0, 14)
-#else
-#  define GARROW_AVAILABLE_IN_0_14
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_0_13
-#  define GARROW_DEPRECATED_IN_0_13               GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_0_13_FOR(function) GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_0_13
-#  define GARROW_DEPRECATED_IN_0_13_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_0_13
-#  define GARROW_AVAILABLE_IN_0_13 GARROW_UNAVAILABLE(0, 13)
-#else
-#  define GARROW_AVAILABLE_IN_0_13
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_0_12
-#  define GARROW_DEPRECATED_IN_0_12               GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_0_12_FOR(function) GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_0_12
-#  define GARROW_DEPRECATED_IN_0_12_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_0_12
-#  define GARROW_AVAILABLE_IN_0_12 GARROW_UNAVAILABLE(0, 12)
-#else
-#  define GARROW_AVAILABLE_IN_0_12
-#endif
-
-#if GARROW_VERSION_MIN_REQUIRED >= GARROW_VERSION_0_10
-#  define GARROW_DEPRECATED_IN_0_10               GARROW_DEPRECATED
-#  define GARROW_DEPRECATED_IN_0_10_FOR(function) GARROW_DEPRECATED_FOR(function)
-#else
-#  define GARROW_DEPRECATED_IN_0_10
-#  define GARROW_DEPRECATED_IN_0_10_FOR(function)
-#endif
-
-#if GARROW_VERSION_MAX_ALLOWED < GARROW_VERSION_0_10
-#  define GARROW_AVAILABLE_IN_0_10 GARROW_UNAVAILABLE(0, 10)
-#else
-#  define GARROW_AVAILABLE_IN_0_10
-#endif
+@AVAILABILITY_MACROS@
diff --git a/c_glib/arrow-glib/writable-file.h b/c_glib/arrow-glib/writable-file.h
index 555705767e4aa..e9aa9122e92fa 100644
--- a/c_glib/arrow-glib/writable-file.h
+++ b/c_glib/arrow-glib/writable-file.h
@@ -24,9 +24,11 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_WRITABLE_FILE (garrow_writable_file_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_INTERFACE(
   GArrowWritableFile, garrow_writable_file, GARROW, WRITABLE_FILE, GObject)
 
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_writable_file_write_at(GArrowWritableFile *writable_file,
                               gint64 position,
diff --git a/c_glib/arrow-glib/writable.h b/c_glib/arrow-glib/writable.h
index a556443967b5a..dcc1e67668e78 100644
--- a/c_glib/arrow-glib/writable.h
+++ b/c_glib/arrow-glib/writable.h
@@ -24,13 +24,17 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_WRITABLE (garrow_writable_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_INTERFACE(GArrowWritable, garrow_writable, GARROW, WRITABLE, GObject)
 
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_writable_write(GArrowWritable *writable,
                       const guint8 *data,
                       gint64 n_bytes,
                       GError **error);
+
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_writable_flush(GArrowWritable *writable, GError **error);
 
diff --git a/c_glib/arrow-glib/writer.h b/c_glib/arrow-glib/writer.h
index 30b0ea987da39..46bbdddec8c9d 100644
--- a/c_glib/arrow-glib/writer.h
+++ b/c_glib/arrow-glib/writer.h
@@ -28,6 +28,7 @@
 G_BEGIN_DECLS
 
 #define GARROW_TYPE_RECORD_BATCH_WRITER (garrow_record_batch_writer_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowRecordBatchWriter,
                          garrow_record_batch_writer,
                          GARROW,
@@ -38,19 +39,23 @@ struct _GArrowRecordBatchWriterClass
   GObjectClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_record_batch_writer_write_record_batch(GArrowRecordBatchWriter *writer,
                                               GArrowRecordBatch *record_batch,
                                               GError **error);
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_record_batch_writer_write_table(GArrowRecordBatchWriter *writer,
                                        GArrowTable *table,
                                        GError **error);
+GARROW_AVAILABLE_IN_ALL
 gboolean
 garrow_record_batch_writer_close(GArrowRecordBatchWriter *writer, GError **error);
 
 #define GARROW_TYPE_RECORD_BATCH_STREAM_WRITER                                           \
   (garrow_record_batch_stream_writer_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowRecordBatchStreamWriter,
                          garrow_record_batch_stream_writer,
                          GARROW,
@@ -61,12 +66,14 @@ struct _GArrowRecordBatchStreamWriterClass
   GArrowRecordBatchWriterClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowRecordBatchStreamWriter *
 garrow_record_batch_stream_writer_new(GArrowOutputStream *sink,
                                       GArrowSchema *schema,
                                       GError **error);
 
 #define GARROW_TYPE_RECORD_BATCH_FILE_WRITER (garrow_record_batch_file_writer_get_type())
+GARROW_AVAILABLE_IN_ALL
 G_DECLARE_DERIVABLE_TYPE(GArrowRecordBatchFileWriter,
                          garrow_record_batch_file_writer,
                          GARROW,
@@ -77,6 +84,7 @@ struct _GArrowRecordBatchFileWriterClass
   GArrowRecordBatchStreamWriterClass parent_class;
 };
 
+GARROW_AVAILABLE_IN_ALL
 GArrowRecordBatchFileWriter *
 garrow_record_batch_file_writer_new(GArrowOutputStream *sink,
                                     GArrowSchema *schema,
diff --git a/c_glib/example/vala/meson.build b/c_glib/example/vala/meson.build
index 474f0b1e9a51a..b7eb86200ddd6 100644
--- a/c_glib/example/vala/meson.build
+++ b/c_glib/example/vala/meson.build
@@ -18,11 +18,15 @@
 # under the License.
 
 if generate_vapi
+  c_flags = [
+    '-Wno-unused-but-set-variable',
+  ]
+  c_flags = meson.get_compiler('c').get_supported_arguments(c_flags)
   vala_example_executable_kwargs = {
     'c_args': [
       '-I' + project_build_root,
       '-I' + project_source_root,
-    ],
+    ] + c_flags,
     'dependencies': [
       arrow_glib_vapi,
       dependency('gio-2.0'),
diff --git a/c_glib/example/vala/read-file.vala b/c_glib/example/vala/read-file.vala
index a0a06275c4b24..287eddac76352 100644
--- a/c_glib/example/vala/read-file.vala
+++ b/c_glib/example/vala/read-file.vala
@@ -119,8 +119,8 @@ void print_array(GArrow.Array array) {
 
 void print_record_batch(GArrow.RecordBatch record_batch) {
     var n_columns = record_batch.get_n_columns();
-    for (var nth_column = 0; nth_column < n_columns; nth_column++) {
-        stdout.printf("columns[%" + int64.FORMAT + "](%s): ",
+    for (int nth_column = 0; nth_column < n_columns; nth_column++) {
+        stdout.printf("columns[%d](%s): ",
                       nth_column,
                       record_batch.get_column_name(nth_column));
         var array = record_batch.get_column_data(nth_column);
diff --git a/c_glib/example/vala/read-stream.vala b/c_glib/example/vala/read-stream.vala
index c58dc848930a8..4520c8609bdaf 100644
--- a/c_glib/example/vala/read-stream.vala
+++ b/c_glib/example/vala/read-stream.vala
@@ -119,8 +119,8 @@ void print_array(GArrow.Array array) {
 
 void print_record_batch(GArrow.RecordBatch record_batch) {
     var n_columns = record_batch.get_n_columns();
-    for (var nth_column = 0; nth_column < n_columns; nth_column++) {
-        stdout.printf("columns[%" + int64.FORMAT + "](%s): ",
+    for (int nth_column = 0; nth_column < n_columns; nth_column++) {
+        stdout.printf("columns[%d](%s): ",
                       nth_column,
                       record_batch.get_column_name(nth_column));
         var array = record_batch.get_column_data(nth_column);
diff --git a/c_glib/gandiva-glib/enums.h.template b/c_glib/gandiva-glib/enums.h.template
index b7d3c99c0bef8..d362e14c1b2cb 100644
--- a/c_glib/gandiva-glib/enums.h.template
+++ b/c_glib/gandiva-glib/enums.h.template
@@ -22,6 +22,8 @@
 
 #include <glib-object.h>
 
+#include <gandiva-glib/version.h>
+
 G_BEGIN_DECLS
 /*** END file-header ***/
 
@@ -31,6 +33,7 @@ G_BEGIN_DECLS
 /*** END file-production ***/
 
 /*** BEGIN value-header ***/
+GGANDIVA_AVAILABLE_IN_ALL
 GType @enum_name@_get_type(void) G_GNUC_CONST;
 #define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
 /*** END value-header ***/
diff --git a/c_glib/gandiva-glib/expression.h b/c_glib/gandiva-glib/expression.h
index f8f061ceb08fa..bb7eb22ac01dc 100644
--- a/c_glib/gandiva-glib/expression.h
+++ b/c_glib/gandiva-glib/expression.h
@@ -26,6 +26,7 @@
 G_BEGIN_DECLS
 
 #define GGANDIVA_TYPE_EXPRESSION (ggandiva_expression_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(
   GGandivaExpression, ggandiva_expression, GGANDIVA, EXPRESSION, GObject)
 
@@ -34,12 +35,16 @@ struct _GGandivaExpressionClass
   GObjectClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaExpression *
 ggandiva_expression_new(GGandivaNode *root_node, GArrowField *result_field);
+
+GGANDIVA_AVAILABLE_IN_0_12
 gchar *
 ggandiva_expression_to_string(GGandivaExpression *expression);
 
 #define GGANDIVA_TYPE_CONDITION (ggandiva_condition_get_type())
+GGANDIVA_AVAILABLE_IN_4_0
 G_DECLARE_DERIVABLE_TYPE(
   GGandivaCondition, ggandiva_condition, GGANDIVA, CONDITION, GGandivaExpression)
 
diff --git a/c_glib/gandiva-glib/filter.h b/c_glib/gandiva-glib/filter.h
index b95981198e0c4..0a2199ccfa106 100644
--- a/c_glib/gandiva-glib/filter.h
+++ b/c_glib/gandiva-glib/filter.h
@@ -25,6 +25,7 @@
 G_BEGIN_DECLS
 
 #define GGANDIVA_TYPE_FILTER (ggandiva_filter_get_type())
+GGANDIVA_AVAILABLE_IN_4_0
 G_DECLARE_DERIVABLE_TYPE(GGandivaFilter, ggandiva_filter, GGANDIVA, FILTER, GObject)
 
 struct _GGandivaFilterClass
@@ -32,8 +33,11 @@ struct _GGandivaFilterClass
   GObjectClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_4_0
 GGandivaFilter *
 ggandiva_filter_new(GArrowSchema *schema, GGandivaCondition *condition, GError **error);
+
+GGANDIVA_AVAILABLE_IN_4_0
 gboolean
 ggandiva_filter_evaluate(GGandivaFilter *filter,
                          GArrowRecordBatch *record_batch,
diff --git a/c_glib/gandiva-glib/function-registry.h b/c_glib/gandiva-glib/function-registry.h
index ed21e120a2533..e13f4b36d28dc 100644
--- a/c_glib/gandiva-glib/function-registry.h
+++ b/c_glib/gandiva-glib/function-registry.h
@@ -24,6 +24,7 @@
 G_BEGIN_DECLS
 
 #define GGANDIVA_TYPE_FUNCTION_REGISTRY (ggandiva_function_registry_get_type())
+GGANDIVA_AVAILABLE_IN_14_0
 G_DECLARE_DERIVABLE_TYPE(GGandivaFunctionRegistry,
                          ggandiva_function_registry,
                          GGANDIVA,
@@ -35,14 +36,20 @@ struct _GGandivaFunctionRegistryClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_15_0
+GGANDIVA_AVAILABLE_IN_15_0
 GGandivaFunctionRegistry *
 ggandiva_function_registry_default(void);
+
+GGANDIVA_AVAILABLE_IN_14_0
 GGandivaFunctionRegistry *
 ggandiva_function_registry_new(void);
+
+GGANDIVA_AVAILABLE_IN_14_0
 GGandivaNativeFunction *
 ggandiva_function_registry_lookup(GGandivaFunctionRegistry *function_registry,
                                   GGandivaFunctionSignature *function_signature);
+
+GGANDIVA_AVAILABLE_IN_14_0
 GList *
 ggandiva_function_registry_get_native_functions(
   GGandivaFunctionRegistry *function_registry);
diff --git a/c_glib/gandiva-glib/function-signature.h b/c_glib/gandiva-glib/function-signature.h
index ef6834ea85723..4fd8cc8a7e761 100644
--- a/c_glib/gandiva-glib/function-signature.h
+++ b/c_glib/gandiva-glib/function-signature.h
@@ -21,9 +21,12 @@
 
 #include <arrow-glib/arrow-glib.h>
 
+#include <gandiva-glib/version.h>
+
 G_BEGIN_DECLS
 
 #define GGANDIVA_TYPE_FUNCTION_SIGNATURE (ggandiva_function_signature_get_type())
+GGANDIVA_AVAILABLE_IN_14_0
 G_DECLARE_DERIVABLE_TYPE(GGandivaFunctionSignature,
                          ggandiva_function_signature,
                          GGANDIVA,
@@ -35,20 +38,31 @@ struct _GGandivaFunctionSignatureClass
   GObjectClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_14_0
 GGandivaFunctionSignature *
 ggandiva_function_signature_new(const gchar *base_name,
                                 GList *parameter_types,
                                 GArrowDataType *return_type);
+
+GGANDIVA_AVAILABLE_IN_14_0
 gboolean
 ggandiva_function_signature_equal(GGandivaFunctionSignature *function_signature,
                                   GGandivaFunctionSignature *other_function_signature);
+
+GGANDIVA_AVAILABLE_IN_14_0
 gchar *
 ggandiva_function_signature_to_string(GGandivaFunctionSignature *function_signature);
+
+GGANDIVA_AVAILABLE_IN_14_0
 GArrowDataType *
 ggandiva_function_signature_get_return_type(
   GGandivaFunctionSignature *function_signature);
+
+GGANDIVA_AVAILABLE_IN_14_0
 gchar *
 ggandiva_function_signature_get_base_name(GGandivaFunctionSignature *function_signature);
+
+GGANDIVA_AVAILABLE_IN_14_0
 GList *
 ggandiva_function_signature_get_param_types(
   GGandivaFunctionSignature *function_signature);
diff --git a/c_glib/gandiva-glib/meson.build b/c_glib/gandiva-glib/meson.build
index d5cab109dcf89..94b923388b7f2 100644
--- a/c_glib/gandiva-glib/meson.build
+++ b/c_glib/gandiva-glib/meson.build
@@ -53,14 +53,12 @@ cpp_headers = files(
   'selection-vector.hpp',
 )
 
-version_h_conf = configuration_data()
-version_h_conf.set('GGANDIVA_VERSION_MAJOR', version_major)
-version_h_conf.set('GGANDIVA_VERSION_MINOR', version_minor)
-version_h_conf.set('GGANDIVA_VERSION_MICRO', version_micro)
-version_h_conf.set('GGANDIVA_VERSION_TAG', version_tag)
-version_h = configure_file(input: 'version.h.in',
-                           output: 'version.h',
-                           configuration: version_h_conf)
+version_h = configure_file(
+  input: 'version.h.in',
+  output: 'version.h',
+  command: [python3, generate_version_header_py, '--library', 'GGANDIVA', '--version', version, '--input', '@INPUT@', '--output', '@OUTPUT@'],
+)
+
 c_headers += version_h
 
 enums = gnome.mkenums('enums',
@@ -87,6 +85,8 @@ libgandiva_glib = library('gandiva-glib',
                           dependencies: dependencies,
                           implicit_include_directories: false,
                           include_directories: base_include_directories,
+                          cpp_args: ['-DGGANDIVA_COMPILATION'],
+                          c_args: ['-DGGANDIVA_COMPILATION'],
                           soversion: so_version,
                           version: library_version)
 gandiva_glib = declare_dependency(link_with: libgandiva_glib,
diff --git a/c_glib/gandiva-glib/native-function.h b/c_glib/gandiva-glib/native-function.h
index 5ceef396ef40c..934d29ab7e33b 100644
--- a/c_glib/gandiva-glib/native-function.h
+++ b/c_glib/gandiva-glib/native-function.h
@@ -40,6 +40,7 @@ typedef enum {
 } GGandivaResultNullableType;
 
 #define GGANDIVA_TYPE_NATIVE_FUNCTION (ggandiva_native_function_get_type())
+GGANDIVA_AVAILABLE_IN_14_0
 G_DECLARE_DERIVABLE_TYPE(
   GGandivaNativeFunction, ggandiva_native_function, GGANDIVA, NATIVE_FUNCTION, GObject)
 
@@ -48,20 +49,33 @@ struct _GGandivaNativeFunctionClass
   GObjectClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_14_0
 GList *
 ggandiva_native_function_get_signatures(GGandivaNativeFunction *native_function);
+
+GGANDIVA_AVAILABLE_IN_14_0
 gboolean
 ggandiva_native_function_equal(GGandivaNativeFunction *native_function,
                                GGandivaNativeFunction *other_native_function);
+
+GGANDIVA_AVAILABLE_IN_14_0
 gchar *
 ggandiva_native_function_to_string(GGandivaNativeFunction *native_function);
+
+GGANDIVA_AVAILABLE_IN_14_0
 GGandivaResultNullableType
 ggandiva_native_function_get_result_nullable_type(
   GGandivaNativeFunction *native_function);
+
+GGANDIVA_AVAILABLE_IN_14_0
 gboolean
 ggandiva_native_function_need_context(GGandivaNativeFunction *native_function);
+
+GGANDIVA_AVAILABLE_IN_14_0
 gboolean
 ggandiva_native_function_need_function_holder(GGandivaNativeFunction *native_function);
+
+GGANDIVA_AVAILABLE_IN_14_0
 gboolean
 ggandiva_native_function_can_return_errors(GGandivaNativeFunction *native_function);
 
diff --git a/c_glib/gandiva-glib/node.h b/c_glib/gandiva-glib/node.h
index 715a3d6ebaf18..1733cac918c51 100644
--- a/c_glib/gandiva-glib/node.h
+++ b/c_glib/gandiva-glib/node.h
@@ -26,6 +26,7 @@
 G_BEGIN_DECLS
 
 #define GGANDIVA_TYPE_NODE (ggandiva_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GGandivaNode, ggandiva_node, GGANDIVA, NODE, GObject)
 
 struct _GGandivaNodeClass
@@ -33,10 +34,12 @@ struct _GGandivaNodeClass
   GObjectClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_16
 gchar *
 ggandiva_node_to_string(GGandivaNode *node);
 
 #define GGANDIVA_TYPE_FIELD_NODE (ggandiva_field_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(
   GGandivaFieldNode, ggandiva_field_node, GGANDIVA, FIELD_NODE, GGandivaNode)
 struct _GGandivaFieldNodeClass
@@ -44,10 +47,12 @@ struct _GGandivaFieldNodeClass
   GGandivaNodeClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaFieldNode *
 ggandiva_field_node_new(GArrowField *field);
 
 #define GGANDIVA_TYPE_FUNCTION_NODE (ggandiva_function_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(
   GGandivaFunctionNode, ggandiva_function_node, GGANDIVA, FUNCTION_NODE, GGandivaNode)
 struct _GGandivaFunctionNodeClass
@@ -55,14 +60,18 @@ struct _GGandivaFunctionNodeClass
   GGandivaNodeClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaFunctionNode *
 ggandiva_function_node_new(const gchar *name,
                            GList *parameters,
                            GArrowDataType *return_type);
+
+GGANDIVA_AVAILABLE_IN_0_12
 GList *
 ggandiva_function_node_get_parameters(GGandivaFunctionNode *node);
 
 #define GGANDIVA_TYPE_LITERAL_NODE (ggandiva_literal_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(
   GGandivaLiteralNode, ggandiva_literal_node, GGANDIVA, LITERAL_NODE, GGandivaNode)
 struct _GGandivaLiteralNodeClass
@@ -71,6 +80,7 @@ struct _GGandivaLiteralNodeClass
 };
 
 #define GGANDIVA_TYPE_NULL_LITERAL_NODE (ggandiva_null_literal_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GGandivaNullLiteralNode,
                          ggandiva_null_literal_node,
                          GGANDIVA,
@@ -81,10 +91,12 @@ struct _GGandivaNullLiteralNodeClass
   GGandivaLiteralNodeClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaNullLiteralNode *
 ggandiva_null_literal_node_new(GArrowDataType *return_type, GError **error);
 
 #define GGANDIVA_TYPE_BOOLEAN_LITERAL_NODE (ggandiva_boolean_literal_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GGandivaBooleanLiteralNode,
                          ggandiva_boolean_literal_node,
                          GGANDIVA,
@@ -95,12 +107,16 @@ struct _GGandivaBooleanLiteralNodeClass
   GGandivaLiteralNodeClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaBooleanLiteralNode *
 ggandiva_boolean_literal_node_new(gboolean value);
+
+GGANDIVA_AVAILABLE_IN_0_12
 gboolean
 ggandiva_boolean_literal_node_get_value(GGandivaBooleanLiteralNode *node);
 
 #define GGANDIVA_TYPE_INT8_LITERAL_NODE (ggandiva_int8_literal_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GGandivaInt8LiteralNode,
                          ggandiva_int8_literal_node,
                          GGANDIVA,
@@ -111,12 +127,16 @@ struct _GGandivaInt8LiteralNodeClass
   GGandivaLiteralNodeClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaInt8LiteralNode *
 ggandiva_int8_literal_node_new(gint8 value);
+
+GGANDIVA_AVAILABLE_IN_0_12
 gint8
 ggandiva_int8_literal_node_get_value(GGandivaInt8LiteralNode *node);
 
 #define GGANDIVA_TYPE_UINT8_LITERAL_NODE (ggandiva_uint8_literal_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GGandivaUInt8LiteralNode,
                          ggandiva_uint8_literal_node,
                          GGANDIVA,
@@ -127,12 +147,16 @@ struct _GGandivaUInt8LiteralNodeClass
   GGandivaLiteralNodeClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaUInt8LiteralNode *
 ggandiva_uint8_literal_node_new(guint8 value);
+
+GGANDIVA_AVAILABLE_IN_0_12
 guint8
 ggandiva_uint8_literal_node_get_value(GGandivaUInt8LiteralNode *node);
 
 #define GGANDIVA_TYPE_INT16_LITERAL_NODE (ggandiva_int16_literal_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GGandivaInt16LiteralNode,
                          ggandiva_int16_literal_node,
                          GGANDIVA,
@@ -143,12 +167,16 @@ struct _GGandivaInt16LiteralNodeClass
   GGandivaLiteralNodeClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaInt16LiteralNode *
 ggandiva_int16_literal_node_new(gint16 value);
+
+GGANDIVA_AVAILABLE_IN_0_12
 gint16
 ggandiva_int16_literal_node_get_value(GGandivaInt16LiteralNode *node);
 
 #define GGANDIVA_TYPE_UINT16_LITERAL_NODE (ggandiva_uint16_literal_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GGandivaUInt16LiteralNode,
                          ggandiva_uint16_literal_node,
                          GGANDIVA,
@@ -159,12 +187,16 @@ struct _GGandivaUInt16LiteralNodeClass
   GGandivaLiteralNodeClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaUInt16LiteralNode *
 ggandiva_uint16_literal_node_new(guint16 value);
+
+GGANDIVA_AVAILABLE_IN_0_12
 guint16
 ggandiva_uint16_literal_node_get_value(GGandivaUInt16LiteralNode *node);
 
 #define GGANDIVA_TYPE_INT32_LITERAL_NODE (ggandiva_int32_literal_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GGandivaInt32LiteralNode,
                          ggandiva_int32_literal_node,
                          GGANDIVA,
@@ -175,12 +207,16 @@ struct _GGandivaInt32LiteralNodeClass
   GGandivaLiteralNodeClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaInt32LiteralNode *
 ggandiva_int32_literal_node_new(gint32 value);
+
+GGANDIVA_AVAILABLE_IN_0_12
 gint32
 ggandiva_int32_literal_node_get_value(GGandivaInt32LiteralNode *node);
 
 #define GGANDIVA_TYPE_UINT32_LITERAL_NODE (ggandiva_uint32_literal_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GGandivaUInt32LiteralNode,
                          ggandiva_uint32_literal_node,
                          GGANDIVA,
@@ -191,12 +227,16 @@ struct _GGandivaUInt32LiteralNodeClass
   GGandivaLiteralNodeClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaUInt32LiteralNode *
 ggandiva_uint32_literal_node_new(guint32 value);
+
+GGANDIVA_AVAILABLE_IN_0_12
 guint32
 ggandiva_uint32_literal_node_get_value(GGandivaUInt32LiteralNode *node);
 
 #define GGANDIVA_TYPE_INT64_LITERAL_NODE (ggandiva_int64_literal_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GGandivaInt64LiteralNode,
                          ggandiva_int64_literal_node,
                          GGANDIVA,
@@ -207,12 +247,16 @@ struct _GGandivaInt64LiteralNodeClass
   GGandivaLiteralNodeClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaInt64LiteralNode *
 ggandiva_int64_literal_node_new(gint64 value);
+
+GGANDIVA_AVAILABLE_IN_0_12
 gint64
 ggandiva_int64_literal_node_get_value(GGandivaInt64LiteralNode *node);
 
 #define GGANDIVA_TYPE_UINT64_LITERAL_NODE (ggandiva_uint64_literal_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GGandivaUInt64LiteralNode,
                          ggandiva_uint64_literal_node,
                          GGANDIVA,
@@ -223,12 +267,16 @@ struct _GGandivaUInt64LiteralNodeClass
   GGandivaLiteralNodeClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaUInt64LiteralNode *
 ggandiva_uint64_literal_node_new(guint64 value);
+
+GGANDIVA_AVAILABLE_IN_0_12
 guint64
 ggandiva_uint64_literal_node_get_value(GGandivaUInt64LiteralNode *node);
 
 #define GGANDIVA_TYPE_FLOAT_LITERAL_NODE (ggandiva_float_literal_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GGandivaFloatLiteralNode,
                          ggandiva_float_literal_node,
                          GGANDIVA,
@@ -239,12 +287,16 @@ struct _GGandivaFloatLiteralNodeClass
   GGandivaLiteralNodeClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaFloatLiteralNode *
 ggandiva_float_literal_node_new(gfloat value);
+
+GGANDIVA_AVAILABLE_IN_0_12
 gfloat
 ggandiva_float_literal_node_get_value(GGandivaFloatLiteralNode *node);
 
 #define GGANDIVA_TYPE_DOUBLE_LITERAL_NODE (ggandiva_double_literal_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GGandivaDoubleLiteralNode,
                          ggandiva_double_literal_node,
                          GGANDIVA,
@@ -255,12 +307,16 @@ struct _GGandivaDoubleLiteralNodeClass
   GGandivaLiteralNodeClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaDoubleLiteralNode *
 ggandiva_double_literal_node_new(gdouble value);
+
+GGANDIVA_AVAILABLE_IN_0_12
 gdouble
 ggandiva_double_literal_node_get_value(GGandivaDoubleLiteralNode *node);
 
 #define GGANDIVA_TYPE_BINARY_LITERAL_NODE (ggandiva_binary_literal_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GGandivaBinaryLiteralNode,
                          ggandiva_binary_literal_node,
                          GGANDIVA,
@@ -271,14 +327,20 @@ struct _GGandivaBinaryLiteralNodeClass
   GGandivaLiteralNodeClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaBinaryLiteralNode *
 ggandiva_binary_literal_node_new(const guint8 *value, gsize size);
+
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaBinaryLiteralNode *
 ggandiva_binary_literal_node_new_bytes(GBytes *value);
+
+GGANDIVA_AVAILABLE_IN_0_12
 GBytes *
 ggandiva_binary_literal_node_get_value(GGandivaBinaryLiteralNode *node);
 
 #define GGANDIVA_TYPE_STRING_LITERAL_NODE (ggandiva_string_literal_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(GGandivaStringLiteralNode,
                          ggandiva_string_literal_node,
                          GGANDIVA,
@@ -289,12 +351,16 @@ struct _GGandivaStringLiteralNodeClass
   GGandivaLiteralNodeClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaStringLiteralNode *
 ggandiva_string_literal_node_new(const gchar *value);
+
+GGANDIVA_AVAILABLE_IN_0_12
 const gchar *
 ggandiva_string_literal_node_get_value(GGandivaStringLiteralNode *node);
 
 #define GGANDIVA_TYPE_IF_NODE (ggandiva_if_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(
   GGandivaIfNode, ggandiva_if_node, GGANDIVA, IF_NODE, GGandivaNode)
 struct _GGandivaIfNodeClass
@@ -302,6 +368,7 @@ struct _GGandivaIfNodeClass
   GGandivaNodeClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaIfNode *
 ggandiva_if_node_new(GGandivaNode *condition_node,
                      GGandivaNode *then_node,
@@ -310,6 +377,7 @@ ggandiva_if_node_new(GGandivaNode *condition_node,
                      GError **error);
 
 #define GGANDIVA_TYPE_BOOLEAN_NODE (ggandiva_boolean_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(
   GGandivaBooleanNode, ggandiva_boolean_node, GGANDIVA, BOOLEAN_NODE, GGandivaNode)
 
@@ -323,6 +391,7 @@ GList *
 ggandiva_boolean_node_get_children(GGandivaBooleanNode *node);
 
 #define GGANDIVA_TYPE_AND_NODE (ggandiva_and_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(
   GGandivaAndNode, ggandiva_and_node, GGANDIVA, AND_NODE, GGandivaBooleanNode)
 struct _GGandivaAndNodeClass
@@ -335,6 +404,7 @@ GGandivaAndNode *
 ggandiva_and_node_new(GList *children);
 
 #define GGANDIVA_TYPE_OR_NODE (ggandiva_or_node_get_type())
+GGANDIVA_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(
   GGandivaOrNode, ggandiva_or_node, GGANDIVA, OR_NODE, GGandivaBooleanNode)
 struct _GGandivaOrNodeClass
diff --git a/c_glib/gandiva-glib/projector.h b/c_glib/gandiva-glib/projector.h
index e0afec5cb1ba1..5fbf9c290beab 100644
--- a/c_glib/gandiva-glib/projector.h
+++ b/c_glib/gandiva-glib/projector.h
@@ -24,6 +24,7 @@
 G_BEGIN_DECLS
 
 #define GGANDIVA_TYPE_PROJECTOR (ggandiva_projector_get_type())
+GGANDIVA_AVAILABLE_IN_0_12
 G_DECLARE_DERIVABLE_TYPE(
   GGandivaProjector, ggandiva_projector, GGANDIVA, PROJECTOR, GObject)
 
@@ -32,14 +33,18 @@ struct _GGandivaProjectorClass
   GObjectClass parent_class;
 };
 
+GGANDIVA_AVAILABLE_IN_0_12
 GGandivaProjector *
 ggandiva_projector_new(GArrowSchema *schema, GList *expressions, GError **error);
+
+GGANDIVA_AVAILABLE_IN_0_12
 GList *
 ggandiva_projector_evaluate(GGandivaProjector *projector,
                             GArrowRecordBatch *record_batch,
                             GError **error);
 
 #define GGANDIVA_TYPE_SELECTABLE_PROJECTOR (ggandiva_selectable_projector_get_type())
+GGANDIVA_AVAILABLE_IN_4_0
 G_DECLARE_DERIVABLE_TYPE(GGandivaSelectableProjector,
                          ggandiva_selectable_projector,
                          GGANDIVA,
diff --git a/c_glib/gandiva-glib/selection-vector.h b/c_glib/gandiva-glib/selection-vector.h
index 6d78192e35e28..558b9b950cf84 100644
--- a/c_glib/gandiva-glib/selection-vector.h
+++ b/c_glib/gandiva-glib/selection-vector.h
@@ -47,6 +47,7 @@ typedef enum {
 } GGandivaSelectionVectorMode;
 
 #define GGANDIVA_TYPE_SELECTION_VECTOR (ggandiva_selection_vector_get_type())
+GGANDIVA_AVAILABLE_IN_4_0
 G_DECLARE_DERIVABLE_TYPE(
   GGandivaSelectionVector, ggandiva_selection_vector, GGANDIVA, SELECTION_VECTOR, GObject)
 
@@ -65,6 +66,7 @@ ggandiva_selection_vector_to_array(GGandivaSelectionVector *selection_vector);
 
 #define GGANDIVA_TYPE_UINT16_SELECTION_VECTOR                                            \
   (ggandiva_uint16_selection_vector_get_type())
+GGANDIVA_AVAILABLE_IN_4_0
 G_DECLARE_DERIVABLE_TYPE(GGandivaUInt16SelectionVector,
                          ggandiva_uint16_selection_vector,
                          GGANDIVA,
@@ -82,6 +84,7 @@ ggandiva_uint16_selection_vector_new(gint64 max_slots, GError **error);
 
 #define GGANDIVA_TYPE_UINT32_SELECTION_VECTOR                                            \
   (ggandiva_uint32_selection_vector_get_type())
+GGANDIVA_AVAILABLE_IN_4_0
 G_DECLARE_DERIVABLE_TYPE(GGandivaUInt32SelectionVector,
                          ggandiva_uint32_selection_vector,
                          GGANDIVA,
@@ -99,6 +102,7 @@ ggandiva_uint32_selection_vector_new(gint64 max_slots, GError **error);
 
 #define GGANDIVA_TYPE_UINT64_SELECTION_VECTOR                                            \
   (ggandiva_uint64_selection_vector_get_type())
+GGANDIVA_AVAILABLE_IN_4_0
 G_DECLARE_DERIVABLE_TYPE(GGandivaUInt64SelectionVector,
                          ggandiva_uint64_selection_vector,
                          GGANDIVA,
diff --git a/c_glib/gandiva-glib/version.h.in b/c_glib/gandiva-glib/version.h.in
index 3c9e87c9d52e1..857c7367bd7e2 100644
--- a/c_glib/gandiva-glib/version.h.in
+++ b/c_glib/gandiva-glib/version.h.in
@@ -38,7 +38,7 @@
  *
  * Since: 1.0.0
  */
-#define GGANDIVA_VERSION_MAJOR (@GGANDIVA_VERSION_MAJOR@)
+#define GGANDIVA_VERSION_MAJOR (@VERSION_MAJOR@)
 
 /**
  * GGANDIVA_VERSION_MINOR:
@@ -47,7 +47,7 @@
  *
  * Since: 1.0.0
  */
-#define GGANDIVA_VERSION_MINOR (@GGANDIVA_VERSION_MINOR@)
+#define GGANDIVA_VERSION_MINOR (@VERSION_MINOR@)
 
 /**
  * GGANDIVA_VERSION_MICRO:
@@ -56,7 +56,7 @@
  *
  * Since: 1.0.0
  */
-#define GGANDIVA_VERSION_MICRO (@GGANDIVA_VERSION_MICRO@)
+#define GGANDIVA_VERSION_MICRO (@VERSION_MICRO@)
 
 /**
  * GGANDIVA_VERSION_TAG:
@@ -66,7 +66,7 @@
  *
  * Since: 1.0.0
  */
-#define GGANDIVA_VERSION_TAG   "@GGANDIVA_VERSION_TAG@"
+#define GGANDIVA_VERSION_TAG   "@VERSION_TAG@"
 
 /**
  * GGANDIVA_VERSION_CHECK:
@@ -110,23 +110,7 @@
 #  define GGANDIVA_UNAVAILABLE(major, minor) G_UNAVAILABLE(major, minor)
 #endif
 
-/**
- * GGANDIVA_VERSION_1_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 1.0.0
- */
-#define GGANDIVA_VERSION_1_0 G_ENCODE_VERSION(1, 0)
-
-/**
- * GGANDIVA_VERSION_4_0:
- *
- * You can use this macro value for compile time API version check.
- *
- * Since: 4.0.0
- */
-#define GGANDIVA_VERSION_4_0 G_ENCODE_VERSION(4, 0)
+@ENCODED_VERSIONS@
 
 /**
  * GGANDIVA_VERSION_MIN_REQUIRED:
@@ -172,47 +156,6 @@
   G_ENCODE_VERSION(GGANDIVA_VERSION_MAJOR, GGANDIVA_VERSION_MINOR)
 #endif
 
+@VISIBILITY_MACROS@
 
-#define GGANDIVA_AVAILABLE_IN_ALL
-
-#if GGANDIVA_VERSION_MIN_REQUIRED >= GGANDIVA_VERSION_4_0
-#  define GGANDIVA_DEPRECATED_IN_4_0                GGANDIVA_DEPRECATED
-#  define GGANDIVA_DEPRECATED_IN_4_0_FOR(function)  GGANDIVA_DEPRECATED_FOR(function)
-#else
-#  define GGANDIVA_DEPRECATED_IN_4_0
-#  define GGANDIVA_DEPRECATED_IN_4_0_FOR(function)
-#endif
-
-#if GGANDIVA_VERSION_MAX_ALLOWED < GGANDIVA_VERSION_4_0
-#  define GGANDIVA_AVAILABLE_IN_4_0 GGANDIVA_UNAVAILABLE(4, 0)
-#else
-#  define GGANDIVA_AVAILABLE_IN_4_0
-#endif
-
-#if GGANDIVA_VERSION_MIN_REQUIRED >= GGANDIVA_VERSION_1_0
-#  define GGANDIVA_DEPRECATED_IN_1_0                GGANDIVA_DEPRECATED
-#  define GGANDIVA_DEPRECATED_IN_1_0_FOR(function)  GGANDIVA_DEPRECATED_FOR(function)
-#else
-#  define GGANDIVA_DEPRECATED_IN_1_0
-#  define GGANDIVA_DEPRECATED_IN_1_0_FOR(function)
-#endif
-
-#if GGANDIVA_VERSION_MAX_ALLOWED < GGANDIVA_VERSION_1_0
-#  define GGANDIVA_AVAILABLE_IN_1_0 GGANDIVA_UNAVAILABLE(1, 0)
-#else
-#  define GGANDIVA_AVAILABLE_IN_1_0
-#endif
-
-#if GGANDIVA_VERSION_MIN_REQUIRED >= GGANDIVA_VERSION_0_17
-#  define GGANDIVA_DEPRECATED_IN_0_17                GGANDIVA_DEPRECATED
-#  define GGANDIVA_DEPRECATED_IN_0_17_FOR(function)  GGANDIVA_DEPRECATED_FOR(function)
-#else
-#  define GGANDIVA_DEPRECATED_IN_0_17
-#  define GGANDIVA_DEPRECATED_IN_0_17_FOR(function)
-#endif
-
-#if GGANDIVA_VERSION_MAX_ALLOWED < GGANDIVA_VERSION_0_17
-#  define GGANDIVA_AVAILABLE_IN_0_17 GGANDIVA_UNAVAILABLE(0, 17)
-#else
-#  define GGANDIVA_AVAILABLE_IN_0_17
-#endif
+@AVAILABILITY_MACROS@
diff --git a/c_glib/meson.build b/c_glib/meson.build
index 04d0129855b20..06aa5b941e77c 100644
--- a/c_glib/meson.build
+++ b/c_glib/meson.build
@@ -26,8 +26,6 @@ project('arrow-glib', 'c', 'cpp',
         # Debian:
         #   https://packages.debian.org/search?keywords=meson
         #
-        #   * bullseye: 0.56.2
-        #   * bullseye-backports:1.0.0
         #   * bookworm: 1.0.0
         #
         # Ubuntu:
@@ -37,7 +35,7 @@ project('arrow-glib', 'c', 'cpp',
         #   * 22.04: 0.61.2
         meson_version: '>=0.53.2')
 
-version = '16.0.0-SNAPSHOT'
+version = '17.0.0-SNAPSHOT'
 if version.endswith('-SNAPSHOT')
   version_numbers = version.split('-')[0].split('.')
   version_tag = version.split('-')[1]
@@ -173,6 +171,10 @@ if cxx.get_id() != 'msvc'
 endif
 add_project_arguments(cxx.get_supported_arguments(cxx_flags), language: 'cpp')
 
+python = import('python')
+python3 = python.find_installation('python3')
+generate_version_header_py = project_source_root / 'tool' / 'generate-version-header.py'
+
 subdir('arrow-glib')
 if arrow_cuda.found()
   subdir('arrow-cuda-glib')
diff --git a/c_glib/parquet-glib/arrow-file-reader.h b/c_glib/parquet-glib/arrow-file-reader.h
index 63c14ac71da86..52d7293bad0fa 100644
--- a/c_glib/parquet-glib/arrow-file-reader.h
+++ b/c_glib/parquet-glib/arrow-file-reader.h
@@ -24,6 +24,7 @@
 G_BEGIN_DECLS
 
 #define GPARQUET_TYPE_ARROW_FILE_READER (gparquet_arrow_file_reader_get_type())
+GPARQUET_AVAILABLE_IN_0_11
 G_DECLARE_DERIVABLE_TYPE(GParquetArrowFileReader,
                          gparquet_arrow_file_reader,
                          GPARQUET,
@@ -34,15 +35,19 @@ struct _GParquetArrowFileReaderClass
   GObjectClass parent_class;
 };
 
+GPARQUET_AVAILABLE_IN_0_11
 GParquetArrowFileReader *
 gparquet_arrow_file_reader_new_arrow(GArrowSeekableInputStream *source, GError **error);
+
+GPARQUET_AVAILABLE_IN_0_11
 GParquetArrowFileReader *
 gparquet_arrow_file_reader_new_path(const gchar *path, GError **error);
 
+GPARQUET_AVAILABLE_IN_0_11
 GArrowTable *
 gparquet_arrow_file_reader_read_table(GParquetArrowFileReader *reader, GError **error);
 
-GARROW_AVAILABLE_IN_1_0
+GPARQUET_AVAILABLE_IN_1_0
 GArrowTable *
 gparquet_arrow_file_reader_read_row_group(GParquetArrowFileReader *reader,
                                           gint row_group_index,
@@ -50,26 +55,30 @@ gparquet_arrow_file_reader_read_row_group(GParquetArrowFileReader *reader,
                                           gsize n_column_indices,
                                           GError **error);
 
+GPARQUET_AVAILABLE_IN_0_12
 GArrowSchema *
 gparquet_arrow_file_reader_get_schema(GParquetArrowFileReader *reader, GError **error);
 
+GPARQUET_AVAILABLE_IN_0_15
 GArrowChunkedArray *
 gparquet_arrow_file_reader_read_column_data(GParquetArrowFileReader *reader,
                                             gint i,
                                             GError **error);
 
+GPARQUET_AVAILABLE_IN_0_11
 gint
 gparquet_arrow_file_reader_get_n_row_groups(GParquetArrowFileReader *reader);
 
-GARROW_AVAILABLE_IN_6_0
+GPARQUET_AVAILABLE_IN_6_0
 gint64
 gparquet_arrow_file_reader_get_n_rows(GParquetArrowFileReader *reader);
 
+GPARQUET_AVAILABLE_IN_0_11
 void
 gparquet_arrow_file_reader_set_use_threads(GParquetArrowFileReader *reader,
                                            gboolean use_threads);
 
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 GParquetFileMetadata *
 gparquet_arrow_file_reader_get_metadata(GParquetArrowFileReader *reader);
 
diff --git a/c_glib/parquet-glib/arrow-file-writer.h b/c_glib/parquet-glib/arrow-file-writer.h
index 592ea4ae3f1ba..71cbfa195e842 100644
--- a/c_glib/parquet-glib/arrow-file-writer.h
+++ b/c_glib/parquet-glib/arrow-file-writer.h
@@ -20,10 +20,12 @@
 #pragma once
 
 #include <arrow-glib/arrow-glib.h>
+#include <parquet-glib/version.h>
 
 G_BEGIN_DECLS
 
 #define GPARQUET_TYPE_WRITER_PROPERTIES (gparquet_writer_properties_get_type())
+GPARQUET_AVAILABLE_IN_0_17
 G_DECLARE_DERIVABLE_TYPE(GParquetWriterProperties,
                          gparquet_writer_properties,
                          GPARQUET,
@@ -34,61 +36,62 @@ struct _GParquetWriterPropertiesClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_0_17
+GPARQUET_AVAILABLE_IN_0_17
 GParquetWriterProperties *
 gparquet_writer_properties_new(void);
-GARROW_AVAILABLE_IN_0_17
+GPARQUET_AVAILABLE_IN_0_17
 void
 gparquet_writer_properties_set_compression(GParquetWriterProperties *properties,
                                            GArrowCompressionType compression_type,
                                            const gchar *path);
-GARROW_AVAILABLE_IN_0_17
+GPARQUET_AVAILABLE_IN_0_17
 GArrowCompressionType
 gparquet_writer_properties_get_compression_path(GParquetWriterProperties *properties,
                                                 const gchar *path);
-GARROW_AVAILABLE_IN_0_17
+GPARQUET_AVAILABLE_IN_0_17
 void
 gparquet_writer_properties_enable_dictionary(GParquetWriterProperties *properties,
                                              const gchar *path);
-GARROW_AVAILABLE_IN_0_17
+GPARQUET_AVAILABLE_IN_0_17
 void
 gparquet_writer_properties_disable_dictionary(GParquetWriterProperties *properties,
                                               const gchar *path);
-GARROW_AVAILABLE_IN_0_17
+GPARQUET_AVAILABLE_IN_0_17
 gboolean
 gparquet_writer_properties_is_dictionary_enabled(GParquetWriterProperties *properties,
                                                  const gchar *path);
-GARROW_AVAILABLE_IN_0_17
+GPARQUET_AVAILABLE_IN_0_17
 void
 gparquet_writer_properties_set_dictionary_page_size_limit(
   GParquetWriterProperties *properties, gint64 limit);
-GARROW_AVAILABLE_IN_0_17
+GPARQUET_AVAILABLE_IN_0_17
 gint64
 gparquet_writer_properties_get_dictionary_page_size_limit(
   GParquetWriterProperties *properties);
-GARROW_AVAILABLE_IN_0_17
+GPARQUET_AVAILABLE_IN_0_17
 void
 gparquet_writer_properties_set_batch_size(GParquetWriterProperties *properties,
                                           gint64 batch_size);
-GARROW_AVAILABLE_IN_0_17
+GPARQUET_AVAILABLE_IN_0_17
 gint64
 gparquet_writer_properties_get_batch_size(GParquetWriterProperties *properties);
-GARROW_AVAILABLE_IN_0_17
+GPARQUET_AVAILABLE_IN_0_17
 void
 gparquet_writer_properties_set_max_row_group_length(GParquetWriterProperties *properties,
                                                     gint64 length);
-GARROW_AVAILABLE_IN_0_17
+GPARQUET_AVAILABLE_IN_0_17
 gint64
 gparquet_writer_properties_get_max_row_group_length(GParquetWriterProperties *properties);
-GARROW_AVAILABLE_IN_0_17
+GPARQUET_AVAILABLE_IN_0_17
 void
 gparquet_writer_properties_set_data_page_size(GParquetWriterProperties *properties,
                                               gint64 data_page_size);
-GARROW_AVAILABLE_IN_0_17
+GPARQUET_AVAILABLE_IN_0_17
 gint64
 gparquet_writer_properties_get_data_page_size(GParquetWriterProperties *properties);
 
 #define GPARQUET_TYPE_ARROW_FILE_WRITER (gparquet_arrow_file_writer_get_type())
+GPARQUET_AVAILABLE_IN_0_11
 G_DECLARE_DERIVABLE_TYPE(GParquetArrowFileWriter,
                          gparquet_arrow_file_writer,
                          GPARQUET,
@@ -99,23 +102,28 @@ struct _GParquetArrowFileWriterClass
   GObjectClass parent_class;
 };
 
+GPARQUET_AVAILABLE_IN_0_11
 GParquetArrowFileWriter *
 gparquet_arrow_file_writer_new_arrow(GArrowSchema *schema,
                                      GArrowOutputStream *sink,
                                      GParquetWriterProperties *writer_properties,
                                      GError **error);
+
+GPARQUET_AVAILABLE_IN_0_11
 GParquetArrowFileWriter *
 gparquet_arrow_file_writer_new_path(GArrowSchema *schema,
                                     const gchar *path,
                                     GParquetWriterProperties *writer_properties,
                                     GError **error);
 
+GPARQUET_AVAILABLE_IN_0_11
 gboolean
 gparquet_arrow_file_writer_write_table(GParquetArrowFileWriter *writer,
                                        GArrowTable *table,
                                        guint64 chunk_size,
                                        GError **error);
 
+GPARQUET_AVAILABLE_IN_0_11
 gboolean
 gparquet_arrow_file_writer_close(GParquetArrowFileWriter *writer, GError **error);
 
diff --git a/c_glib/parquet-glib/meson.build b/c_glib/parquet-glib/meson.build
index 67de0bf2d91fb..a3de1d0933f7f 100644
--- a/c_glib/parquet-glib/meson.build
+++ b/c_glib/parquet-glib/meson.build
@@ -42,10 +42,17 @@ cpp_headers = files(
   'parquet-glib.hpp',
 )
 
+version_h = configure_file(
+  input: 'version.h.in',
+  output: 'version.h',
+  command: [python3, generate_version_header_py, '--library', 'GPARQUET', '--version', version, '--input', '@INPUT@', '--output', '@OUTPUT@'],
+)
+
+c_headers += version_h
+
 headers = c_headers + cpp_headers
 install_headers(headers, subdir: project_name)
 
-
 dependencies = [
   arrow,
   parquet,
@@ -57,6 +64,7 @@ libparquet_glib = library('parquet-glib',
                           dependencies: dependencies,
                           implicit_include_directories: false,
                           include_directories: base_include_directories,
+                          cpp_args: ['-DGPARQUET_COMPILATION'],
                           soversion: so_version,
                           version: library_version)
 parquet_glib = declare_dependency(link_with: libparquet_glib,
diff --git a/c_glib/parquet-glib/metadata.h b/c_glib/parquet-glib/metadata.h
index 1c9fce7cc778d..d79bf009751ca 100644
--- a/c_glib/parquet-glib/metadata.h
+++ b/c_glib/parquet-glib/metadata.h
@@ -24,6 +24,7 @@
 G_BEGIN_DECLS
 
 #define GPARQUET_TYPE_COLUMN_CHUNK_METADATA (gparquet_column_chunk_metadata_get_type())
+GPARQUET_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GParquetColumnChunkMetadata,
                          gparquet_column_chunk_metadata,
                          GPARQUET,
@@ -34,28 +35,29 @@ struct _GParquetColumnChunkMetadataClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gboolean
 gparquet_column_chunk_metadata_equal(GParquetColumnChunkMetadata *metadata,
                                      GParquetColumnChunkMetadata *other_metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint64
 gparquet_column_chunk_metadata_get_total_size(GParquetColumnChunkMetadata *metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint64
 gparquet_column_chunk_metadata_get_total_compressed_size(
   GParquetColumnChunkMetadata *metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint64
 gparquet_column_chunk_metadata_get_file_offset(GParquetColumnChunkMetadata *metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gboolean
 gparquet_column_chunk_metadata_can_decompress(GParquetColumnChunkMetadata *metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 GParquetStatistics *
 gparquet_column_chunk_metadata_get_statistics(GParquetColumnChunkMetadata *metadata);
 
 #define GPARQUET_TYPE_ROW_GROUP_METADATA (gparquet_row_group_metadata_get_type())
+GPARQUET_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GParquetRowGroupMetadata,
                          gparquet_row_group_metadata,
                          GPARQUET,
@@ -66,35 +68,36 @@ struct _GParquetRowGroupMetadataClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gboolean
 gparquet_row_group_metadata_equal(GParquetRowGroupMetadata *metadata,
                                   GParquetRowGroupMetadata *other_metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint
 gparquet_row_group_metadata_get_n_columns(GParquetRowGroupMetadata *metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 GParquetColumnChunkMetadata *
 gparquet_row_group_metadata_get_column_chunk(GParquetRowGroupMetadata *metadata,
                                              gint index,
                                              GError **error);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint64
 gparquet_row_group_metadata_get_n_rows(GParquetRowGroupMetadata *metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint64
 gparquet_row_group_metadata_get_total_size(GParquetRowGroupMetadata *metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint64
 gparquet_row_group_metadata_get_total_compressed_size(GParquetRowGroupMetadata *metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint64
 gparquet_row_group_metadata_get_file_offset(GParquetRowGroupMetadata *metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gboolean
 gparquet_row_group_metadata_can_decompress(GParquetRowGroupMetadata *metadata);
 
 #define GPARQUET_TYPE_FILE_METADATA (gparquet_file_metadata_get_type())
+GPARQUET_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(
   GParquetFileMetadata, gparquet_file_metadata, GPARQUET, FILE_METADATA, GObject)
 struct _GParquetFileMetadataClass
@@ -102,34 +105,34 @@ struct _GParquetFileMetadataClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gboolean
 gparquet_file_metadata_equal(GParquetFileMetadata *metadata,
                              GParquetFileMetadata *other_metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint
 gparquet_file_metadata_get_n_columns(GParquetFileMetadata *metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint
 gparquet_file_metadata_get_n_schema_elements(GParquetFileMetadata *metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint64
 gparquet_file_metadata_get_n_rows(GParquetFileMetadata *metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint
 gparquet_file_metadata_get_n_row_groups(GParquetFileMetadata *metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 GParquetRowGroupMetadata *
 gparquet_file_metadata_get_row_group(GParquetFileMetadata *metadata,
                                      gint index,
                                      GError **error);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 const gchar *
 gparquet_file_metadata_get_created_by(GParquetFileMetadata *metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 guint32
 gparquet_file_metadata_get_size(GParquetFileMetadata *metadata);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gboolean
 gparquet_file_metadata_can_decompress(GParquetFileMetadata *metadata);
 
diff --git a/c_glib/parquet-glib/parquet-glib.h b/c_glib/parquet-glib/parquet-glib.h
index 23659421ce3d8..308adb87a7ed2 100644
--- a/c_glib/parquet-glib/parquet-glib.h
+++ b/c_glib/parquet-glib/parquet-glib.h
@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include <parquet-glib/version.h>
+
 #include <parquet-glib/arrow-file-reader.h>
 #include <parquet-glib/arrow-file-writer.h>
 #include <parquet-glib/metadata.h>
diff --git a/c_glib/parquet-glib/statistics.h b/c_glib/parquet-glib/statistics.h
index f28e2a3713638..25e02df8774b2 100644
--- a/c_glib/parquet-glib/statistics.h
+++ b/c_glib/parquet-glib/statistics.h
@@ -21,9 +21,12 @@
 
 #include <arrow-glib/arrow-glib.h>
 
+#include <parquet-glib/version.h>
+
 G_BEGIN_DECLS
 
 #define GPARQUET_TYPE_STATISTICS (gparquet_statistics_get_type())
+GPARQUET_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(
   GParquetStatistics, gparquet_statistics, GPARQUET, STATISTICS, GObject)
 struct _GParquetStatisticsClass
@@ -31,30 +34,31 @@ struct _GParquetStatisticsClass
   GObjectClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gboolean
 gparquet_statistics_equal(GParquetStatistics *statistics,
                           GParquetStatistics *other_statistics);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gboolean
 gparquet_statistics_has_n_nulls(GParquetStatistics *statistics);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint64
 gparquet_statistics_get_n_nulls(GParquetStatistics *statistics);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gboolean
 gparquet_statistics_has_n_distinct_values(GParquetStatistics *statistics);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint64
 gparquet_statistics_get_n_distinct_values(GParquetStatistics *statistics);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint64
 gparquet_statistics_get_n_values(GParquetStatistics *statistics);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gboolean
 gparquet_statistics_has_min_max(GParquetStatistics *statistics);
 
 #define GPARQUET_TYPE_BOOLEAN_STATISTICS (gparquet_boolean_statistics_get_type())
+GPARQUET_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GParquetBooleanStatistics,
                          gparquet_boolean_statistics,
                          GPARQUET,
@@ -65,14 +69,15 @@ struct _GParquetBooleanStatisticsClass
   GParquetStatisticsClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gboolean
 gparquet_boolean_statistics_get_min(GParquetBooleanStatistics *statistics);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gboolean
 gparquet_boolean_statistics_get_max(GParquetBooleanStatistics *statistics);
 
 #define GPARQUET_TYPE_INT32_STATISTICS (gparquet_int32_statistics_get_type())
+GPARQUET_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GParquetInt32Statistics,
                          gparquet_int32_statistics,
                          GPARQUET,
@@ -83,14 +88,15 @@ struct _GParquetInt32StatisticsClass
   GParquetStatisticsClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint32
 gparquet_int32_statistics_get_min(GParquetInt32Statistics *statistics);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint32
 gparquet_int32_statistics_get_max(GParquetInt32Statistics *statistics);
 
 #define GPARQUET_TYPE_INT64_STATISTICS (gparquet_int64_statistics_get_type())
+GPARQUET_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GParquetInt64Statistics,
                          gparquet_int64_statistics,
                          GPARQUET,
@@ -101,14 +107,15 @@ struct _GParquetInt64StatisticsClass
   GParquetStatisticsClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint64
 gparquet_int64_statistics_get_min(GParquetInt64Statistics *statistics);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gint64
 gparquet_int64_statistics_get_max(GParquetInt64Statistics *statistics);
 
 #define GPARQUET_TYPE_FLOAT_STATISTICS (gparquet_float_statistics_get_type())
+GPARQUET_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GParquetFloatStatistics,
                          gparquet_float_statistics,
                          GPARQUET,
@@ -119,14 +126,15 @@ struct _GParquetFloatStatisticsClass
   GParquetStatisticsClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gfloat
 gparquet_float_statistics_get_min(GParquetFloatStatistics *statistics);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gfloat
 gparquet_float_statistics_get_max(GParquetFloatStatistics *statistics);
 
 #define GPARQUET_TYPE_DOUBLE_STATISTICS (gparquet_double_statistics_get_type())
+GPARQUET_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GParquetDoubleStatistics,
                          gparquet_double_statistics,
                          GPARQUET,
@@ -137,14 +145,15 @@ struct _GParquetDoubleStatisticsClass
   GParquetStatisticsClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gdouble
 gparquet_double_statistics_get_min(GParquetDoubleStatistics *statistics);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 gdouble
 gparquet_double_statistics_get_max(GParquetDoubleStatistics *statistics);
 
 #define GPARQUET_TYPE_BYTE_ARRAY_STATISTICS (gparquet_byte_array_statistics_get_type())
+GPARQUET_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GParquetByteArrayStatistics,
                          gparquet_byte_array_statistics,
                          GPARQUET,
@@ -155,15 +164,16 @@ struct _GParquetByteArrayStatisticsClass
   GParquetStatisticsClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 GBytes *
 gparquet_byte_array_statistics_get_min(GParquetByteArrayStatistics *statistics);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 GBytes *
 gparquet_byte_array_statistics_get_max(GParquetByteArrayStatistics *statistics);
 
 #define GPARQUET_TYPE_FIXED_LENGTH_BYTE_ARRAY_STATISTICS                                 \
   (gparquet_fixed_length_byte_array_statistics_get_type())
+GPARQUET_AVAILABLE_IN_8_0
 G_DECLARE_DERIVABLE_TYPE(GParquetFixedLengthByteArrayStatistics,
                          gparquet_fixed_length_byte_array_statistics,
                          GPARQUET,
@@ -174,11 +184,11 @@ struct _GParquetFixedLengthByteArrayStatisticsClass
   GParquetStatisticsClass parent_class;
 };
 
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 GBytes *
 gparquet_fixed_length_byte_array_statistics_get_min(
   GParquetFixedLengthByteArrayStatistics *statistics);
-GARROW_AVAILABLE_IN_8_0
+GPARQUET_AVAILABLE_IN_8_0
 GBytes *
 gparquet_fixed_length_byte_array_statistics_get_max(
   GParquetFixedLengthByteArrayStatistics *statistics);
diff --git a/c_glib/parquet-glib/version.h.in b/c_glib/parquet-glib/version.h.in
new file mode 100644
index 0000000000000..142b3b83e0f3d
--- /dev/null
+++ b/c_glib/parquet-glib/version.h.in
@@ -0,0 +1,159 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <arrow-glib/version.h>
+
+/**
+ * SECTION: version
+ * @section_id: version-macros
+ * @title: Version related macros
+ * @include: parquet-glib/parquet-glib.h
+ *
+ * Parquet GLib provides macros that can be used by C pre-processor.
+ * They are useful to check version related things at compile time.
+ */
+
+/**
+ * GPARQUET_VERSION_MAJOR:
+ *
+ * The major version.
+ *
+ * Since: 17.0.0
+ */
+#define GPARQUET_VERSION_MAJOR (@VERSION_MAJOR@)
+
+/**
+ * GPARQUET_VERSION_MINOR:
+ *
+ * The minor version.
+ *
+ * Since: 17.0.0
+ */
+#define GPARQUET_VERSION_MINOR (@VERSION_MINOR@)
+
+/**
+ * GPARQUET_VERSION_MICRO:
+ *
+ * The micro version.
+ *
+ * Since: 17.0.0
+ */
+#define GPARQUET_VERSION_MICRO (@VERSION_MICRO@)
+
+/**
+ * GPARQUET_VERSION_TAG:
+ *
+ * The version tag. Normally, it's an empty string. It's "SNAPSHOT"
+ * for snapshot version.
+ *
+ * Since: 17.0.0
+ */
+#define GPARQUET_VERSION_TAG   "@VERSION_TAG@"
+
+/**
+ * GPARQUET_VERSION_CHECK:
+ * @major: A major version to check for.
+ * @minor: A minor version to check for.
+ * @micro: A micro version to check for.
+ *
+ * You can use this macro in C pre-processor.
+ *
+ * Returns: %TRUE if the compile time Apache Arrow GLib version is the
+ *   same as or newer than the passed version, %FALSE otherwise.
+ *
+ * Since: 17.0.0
+ */
+#define GPARQUET_VERSION_CHECK(major, minor, micro)       \
+  (GPARQUET_VERSION_MAJOR > (major) ||                    \
+   (GPARQUET_VERSION_MAJOR == (major) &&                  \
+    GPARQUET_VERSION_MINOR > (minor)) ||                  \
+   (GPARQUET_VERSION_MAJOR == (major) &&                  \
+    GPARQUET_VERSION_MINOR == (minor) &&                  \
+    GPARQUET_VERSION_MICRO >= (micro)))
+
+/**
+ * GPARQUET_DISABLE_DEPRECATION_WARNINGS:
+ *
+ * If this macro is defined, no deprecated warnings are produced.
+ *
+ * You must define this macro before including the
+ * arrow-glib/arrow-glib.h header.
+ *
+ * Since: 17.0.0
+ */
+
+#ifdef GPARQUET_DISABLE_DEPRECATION_WARNINGS
+#  define GPARQUET_DEPRECATED
+#  define GPARQUET_DEPRECATED_FOR(function)
+#  define GPARQUET_UNAVAILABLE(major, minor)
+#else
+#  define GPARQUET_DEPRECATED G_DEPRECATED
+#  define GPARQUET_DEPRECATED_FOR(function) G_DEPRECATED_FOR(function)
+#  define GPARQUET_UNAVAILABLE(major, minor) G_UNAVAILABLE(major, minor)
+#endif
+
+@ENCODED_VERSIONS@
+
+/**
+ * GPARQUET_VERSION_MIN_REQUIRED:
+ *
+ * You can use this macro for compile time API version check.
+ *
+ * This macro value must be one of the predefined version macros such
+ * as %GPARQUET_VERSION_0_10.
+ *
+ * If you use any functions that is defined by newer version than
+ * %GPARQUET_VERSION_MIN_REQUIRED, deprecated warnings are produced at
+ * compile time.
+ *
+ * You must define this macro before including the
+ * parquet-glib/parquet-glib.h header.
+ *
+ * Since: 17.0.0
+ */
+#ifndef GPARQUET_VERSION_MIN_REQUIRED
+#  define GPARQUET_VERSION_MIN_REQUIRED GARROW_VERSION_MIN_REQUIRED
+#endif
+
+/**
+ * GPARQUET_VERSION_MAX_ALLOWED:
+ *
+ * You can use this macro for compile time API version check.
+ *
+ * This macro value must be one of the predefined version macros such
+ * as %GPARQUET_VERSION_0_10.
+ *
+ * If you use any functions that is defined by newer version than
+ * %GPARQUET_VERSION_MAX_ALLOWED, deprecated warnings are produced at
+ * compile time.
+ *
+ * You must define this macro before including the
+ * parquet-glib/parquet-glib.h header.
+ *
+ * Since: 17.0.0
+ */
+#ifndef GPARQUET_VERSION_MAX_ALLOWED
+#  define GPARQUET_VERSION_MAX_ALLOWED GARROW_VERSION_MAX_ALLOWED
+#endif
+
+@VISIBILITY_MACROS@
+
+@AVAILABILITY_MACROS@
diff --git a/c_glib/test/dataset/test-file-system-dataset.rb b/c_glib/test/dataset/test-file-system-dataset.rb
index 0e856b678f860..96deedf6b4eb0 100644
--- a/c_glib/test/dataset/test-file-system-dataset.rb
+++ b/c_glib/test/dataset/test-file-system-dataset.rb
@@ -56,6 +56,22 @@ def test_partitioning
   end
 
   def test_read_write
+    dataset, expected_table = create_dataset
+    assert_equal(expected_table, dataset.to_table)
+  end
+
+  def test_to_record_batch_reader
+    dataset, expected_table = create_dataset
+    reader = dataset.to_record_batch_reader
+    begin
+      assert_equal(expected_table, reader.read_all)
+    ensure
+      # Unref to ensure the reader closes files and we can delete the temp directory
+      reader.unref
+    end
+  end
+
+  def create_dataset
     table = build_table(label: build_string_array(["a", "a", "b", "c"]),
                         count: build_int32_array([1, 10, 2, 3]))
     table_reader = Arrow::TableBatchReader.new(table)
@@ -73,7 +89,8 @@ def test_read_write
     end
     @factory.partition_base_dir = @dir
     dataset = @factory.finish
-    assert_equal(build_table(count: [
+
+    expected_table = build_table(count: [
                                build_int32_array([1, 10]),
                                build_int32_array([2]),
                                build_int32_array([3]),
@@ -82,7 +99,8 @@ def test_read_write
                                build_string_array(["a", "a"]),
                                build_string_array(["b"]),
                                build_string_array(["c"]),
-                             ]),
-                 dataset.to_table)
+                             ])
+
+    return dataset, expected_table
   end
 end
diff --git a/c_glib/test/dataset/test-scanner.rb b/c_glib/test/dataset/test-scanner.rb
index f7702d4905fb6..5dc31eefc5f4c 100644
--- a/c_glib/test/dataset/test-scanner.rb
+++ b/c_glib/test/dataset/test-scanner.rb
@@ -45,4 +45,14 @@ def setup
   def test_to_table
     assert_equal(@table, @scanner.to_table)
   end
+
+  def test_to_record_batch_reader
+    reader = @scanner.to_record_batch_reader
+    begin
+      assert_equal(@table, reader.read_all)
+    ensure
+      # Unref to ensure the reader closes files and we can delete the temp directory
+      reader.unref
+    end
+  end
 end
diff --git a/c_glib/test/parquet/test-arrow-file-reader.rb b/c_glib/test/parquet/test-arrow-file-reader.rb
index 45eb335965434..eff5ad966aea6 100644
--- a/c_glib/test/parquet/test-arrow-file-reader.rb
+++ b/c_glib/test/parquet/test-arrow-file-reader.rb
@@ -20,16 +20,23 @@ class TestParquetArrowFileReader < Test::Unit::TestCase
 
   def setup
     omit("Parquet is required") unless defined?(::Parquet)
-    @file = Tempfile.open(["data", ".parquet"])
-    @a_array = build_string_array(["foo", "bar"])
-    @b_array = build_int32_array([123, 456])
-    @table = build_table("a" => @a_array,
-                         "b" => @b_array)
-    writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
-    chunk_size = 1
-    writer.write_table(@table, chunk_size)
-    writer.close
-    @reader = Parquet::ArrowFileReader.new(@file.path)
+    Tempfile.create(["data", ".parquet"]) do |file|
+      @file = file
+      @a_array = build_string_array(["foo", "bar"])
+      @b_array = build_int32_array([123, 456])
+      @table = build_table("a" => @a_array,
+                           "b" => @b_array)
+      writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
+      chunk_size = 1
+      writer.write_table(@table, chunk_size)
+      writer.close
+      @reader = Parquet::ArrowFileReader.new(@file.path)
+      begin
+        yield
+      ensure
+        @reader.unref
+      end
+    end
   end
 
   def test_schema
diff --git a/c_glib/test/parquet/test-arrow-file-writer.rb b/c_glib/test/parquet/test-arrow-file-writer.rb
index 855527444d063..f899e7273b2a2 100644
--- a/c_glib/test/parquet/test-arrow-file-writer.rb
+++ b/c_glib/test/parquet/test-arrow-file-writer.rb
@@ -20,7 +20,10 @@ class TestParquetArrowFileWriter < Test::Unit::TestCase
 
   def setup
     omit("Parquet is required") unless defined?(::Parquet)
-    @file = Tempfile.open(["data", ".parquet"])
+    Tempfile.create(["data", ".parquet"]) do |file|
+      @file = file
+      yield
+    end
   end
 
   def test_write
@@ -33,14 +36,18 @@ def test_write
     writer.close
 
     reader = Parquet::ArrowFileReader.new(@file.path)
-    reader.use_threads = true
-    assert_equal([
-                   enabled_values.length / chunk_size,
-                   true,
-                 ],
-                 [
-                   reader.n_row_groups,
-                   table.equal_metadata(reader.read_table, false),
-                 ])
+    begin
+      reader.use_threads = true
+      assert_equal([
+                     enabled_values.length / chunk_size,
+                     true,
+                   ],
+                   [
+                     reader.n_row_groups,
+                     table.equal_metadata(reader.read_table, false),
+                   ])
+    ensure
+      reader.unref
+    end
   end
 end
diff --git a/c_glib/test/parquet/test-boolean-statistics.rb b/c_glib/test/parquet/test-boolean-statistics.rb
index 6131a22195cb8..244348641320e 100644
--- a/c_glib/test/parquet/test-boolean-statistics.rb
+++ b/c_glib/test/parquet/test-boolean-statistics.rb
@@ -20,14 +20,22 @@ class TestParquetBooleanStatistics < Test::Unit::TestCase
 
   def setup
     omit("Parquet is required") unless defined?(::Parquet)
-    @file = Tempfile.open(["data", ".parquet"])
-    @table = build_table("boolean" => build_boolean_array([nil, false, true]))
-    writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
-    chunk_size = 1024
-    writer.write_table(@table, chunk_size)
-    writer.close
-    reader = Parquet::ArrowFileReader.new(@file.path)
-    @statistics = reader.metadata.get_row_group(0).get_column_chunk(0).statistics
+    Tempfile.create(["data", ".parquet"]) do |file|
+      @file = file
+      @table = build_table("boolean" => build_boolean_array([nil, false, true]))
+      writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
+      chunk_size = 1024
+      writer.write_table(@table, chunk_size)
+      writer.close
+      reader = Parquet::ArrowFileReader.new(@file.path)
+      begin
+        @statistics =
+          reader.metadata.get_row_group(0).get_column_chunk(0).statistics
+        yield
+      ensure
+        reader.unref
+      end
+    end
   end
 
   test("#min") do
diff --git a/c_glib/test/parquet/test-byte-array-statistics.rb b/c_glib/test/parquet/test-byte-array-statistics.rb
index 50ec409dbce7c..b9693a77fff13 100644
--- a/c_glib/test/parquet/test-byte-array-statistics.rb
+++ b/c_glib/test/parquet/test-byte-array-statistics.rb
@@ -20,14 +20,22 @@ class TestParquetByteArrayStatistics < Test::Unit::TestCase
 
   def setup
     omit("Parquet is required") unless defined?(::Parquet)
-    @file = Tempfile.open(["data", ".parquet"])
-    @table = build_table("string" => build_string_array([nil, "abc", "xyz"]))
-    writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
-    chunk_size = 1024
-    writer.write_table(@table, chunk_size)
-    writer.close
-    reader = Parquet::ArrowFileReader.new(@file.path)
-    @statistics = reader.metadata.get_row_group(0).get_column_chunk(0).statistics
+    Tempfile.create(["data", ".parquet"]) do |file|
+      @file = file
+      @table = build_table("string" => build_string_array([nil, "abc", "xyz"]))
+      writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
+      chunk_size = 1024
+      writer.write_table(@table, chunk_size)
+      writer.close
+      reader = Parquet::ArrowFileReader.new(@file.path)
+      begin
+        @statistics =
+          reader.metadata.get_row_group(0).get_column_chunk(0).statistics
+        yield
+      ensure
+        reader.unref
+      end
+    end
   end
 
   test("#min") do
diff --git a/c_glib/test/parquet/test-column-chunk-metadata.rb b/c_glib/test/parquet/test-column-chunk-metadata.rb
index a93fe85bbfbf1..f0012f0124577 100644
--- a/c_glib/test/parquet/test-column-chunk-metadata.rb
+++ b/c_glib/test/parquet/test-column-chunk-metadata.rb
@@ -20,35 +20,46 @@ class TestParquetColumnChunkMetadata < Test::Unit::TestCase
 
   def setup
     omit("Parquet is required") unless defined?(::Parquet)
-    @file = Tempfile.open(["data", ".parquet"])
-    @string_array = build_string_array([nil, "hello"])
-    fields = [
-      Arrow::Field.new("int8", Arrow::Int8DataType.new),
-      Arrow::Field.new("boolean", Arrow::BooleanDataType.new),
-    ]
-    structs = [
-      {
-        "int8" => -29,
-        "boolean" => true,
-      },
-      nil,
-    ]
-    @struct_array = build_struct_array(fields, structs)
-    @table = build_table("string" => @string_array,
-                         "struct" => @struct_array)
-    writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
-    chunk_size = 1
-    writer.write_table(@table, chunk_size)
-    writer.close
-    reader = Parquet::ArrowFileReader.new(@file.path)
-    @metadata = reader.metadata.get_row_group(0).get_column_chunk(0)
+    Tempfile.create(["data", ".parquet"]) do |file|
+      @file = file
+      @string_array = build_string_array([nil, "hello"])
+      fields = [
+        Arrow::Field.new("int8", Arrow::Int8DataType.new),
+        Arrow::Field.new("boolean", Arrow::BooleanDataType.new),
+      ]
+      structs = [
+        {
+          "int8" => -29,
+          "boolean" => true,
+        },
+        nil,
+      ]
+      @struct_array = build_struct_array(fields, structs)
+      @table = build_table("string" => @string_array,
+                           "struct" => @struct_array)
+      writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
+      chunk_size = 1
+      writer.write_table(@table, chunk_size)
+      writer.close
+      reader = Parquet::ArrowFileReader.new(@file.path)
+      begin
+        @metadata = reader.metadata.get_row_group(0).get_column_chunk(0)
+        yield
+      ensure
+        reader.unref
+      end
+    end
   end
 
   test("#==") do
     reader = Parquet::ArrowFileReader.new(@file.path)
-    other_metadata = reader.metadata.get_row_group(0).get_column_chunk(0)
-    assert do
-      @metadata == other_metadata
+    begin
+      other_metadata = reader.metadata.get_row_group(0).get_column_chunk(0)
+      assert do
+        @metadata == other_metadata
+      end
+    ensure
+      reader.unref
     end
   end
 
diff --git a/c_glib/test/parquet/test-double-statistics.rb b/c_glib/test/parquet/test-double-statistics.rb
index a610fb24a9bdf..6c7a95824570d 100644
--- a/c_glib/test/parquet/test-double-statistics.rb
+++ b/c_glib/test/parquet/test-double-statistics.rb
@@ -20,14 +20,22 @@ class TestParquetDoubleStatistics < Test::Unit::TestCase
 
   def setup
     omit("Parquet is required") unless defined?(::Parquet)
-    @file = Tempfile.open(["data", ".parquet"])
-    @table = build_table("double" => build_double_array([nil, -2.9, 2.9]))
-    writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
-    chunk_size = 1024
-    writer.write_table(@table, chunk_size)
-    writer.close
-    reader = Parquet::ArrowFileReader.new(@file.path)
-    @statistics = reader.metadata.get_row_group(0).get_column_chunk(0).statistics
+    Tempfile.create(["data", ".parquet"]) do |file|
+      @file = file
+      @table = build_table("double" => build_double_array([nil, -2.9, 2.9]))
+      writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
+      chunk_size = 1024
+      writer.write_table(@table, chunk_size)
+      writer.close
+      reader = Parquet::ArrowFileReader.new(@file.path)
+      begin
+        @statistics =
+          reader.metadata.get_row_group(0).get_column_chunk(0).statistics
+        yield
+      ensure
+        reader.unref
+      end
+    end
   end
 
   test("#min") do
diff --git a/c_glib/test/parquet/test-file-metadata.rb b/c_glib/test/parquet/test-file-metadata.rb
index 2bca7e66e0b07..aec3f4ab829b9 100644
--- a/c_glib/test/parquet/test-file-metadata.rb
+++ b/c_glib/test/parquet/test-file-metadata.rb
@@ -20,35 +20,46 @@ class TestParquetFileMetadata < Test::Unit::TestCase
 
   def setup
     omit("Parquet is required") unless defined?(::Parquet)
-    @file = Tempfile.open(["data", ".parquet"])
-    @string_array = build_string_array([nil, "hello"])
-    fields = [
-      Arrow::Field.new("int8", Arrow::Int8DataType.new),
-      Arrow::Field.new("boolean", Arrow::BooleanDataType.new),
-    ]
-    structs = [
-      {
-        "int8" => -29,
-        "boolean" => true,
-      },
-      nil,
-    ]
-    @struct_array = build_struct_array(fields, structs)
-    @table = build_table("string" => @string_array,
-                         "struct" => @struct_array)
-    writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
-    chunk_size = 1
-    writer.write_table(@table, chunk_size)
-    writer.close
-    reader = Parquet::ArrowFileReader.new(@file.path)
-    @metadata = reader.metadata
+    Tempfile.create(["data", ".parquet"]) do |file|
+      @file = file
+      @string_array = build_string_array([nil, "hello"])
+      fields = [
+        Arrow::Field.new("int8", Arrow::Int8DataType.new),
+        Arrow::Field.new("boolean", Arrow::BooleanDataType.new),
+      ]
+      structs = [
+        {
+          "int8" => -29,
+          "boolean" => true,
+        },
+        nil,
+      ]
+      @struct_array = build_struct_array(fields, structs)
+      @table = build_table("string" => @string_array,
+                           "struct" => @struct_array)
+      writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
+      chunk_size = 1
+      writer.write_table(@table, chunk_size)
+      writer.close
+      reader = Parquet::ArrowFileReader.new(@file.path)
+      begin
+        @metadata = reader.metadata
+        yield
+      ensure
+        reader.unref
+      end
+    end
   end
 
   test("#==") do
     reader = Parquet::ArrowFileReader.new(@file.path)
-    other_metadata = reader.metadata
-    assert do
-      @metadata == other_metadata
+    begin
+      other_metadata = reader.metadata
+      assert do
+        @metadata == other_metadata
+      end
+    ensure
+      reader.unref
     end
   end
 
diff --git a/c_glib/test/parquet/test-fixed-length-byte-array-statistics.rb b/c_glib/test/parquet/test-fixed-length-byte-array-statistics.rb
index 87a96d009c509..c2f179627d06a 100644
--- a/c_glib/test/parquet/test-fixed-length-byte-array-statistics.rb
+++ b/c_glib/test/parquet/test-fixed-length-byte-array-statistics.rb
@@ -20,16 +20,24 @@ class TestParquetFixedLengthByteArrayStatistics < Test::Unit::TestCase
 
   def setup
     omit("Parquet is required") unless defined?(::Parquet)
-    @file = Tempfile.open(["data", ".parquet"])
-    data_type = Arrow::FixedSizeBinaryDataType.new(3)
-    array = build_fixed_size_binary_array(data_type, [nil, "abc", "xyz"])
-    @table = build_table("binary" => array)
-    writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
-    chunk_size = 1024
-    writer.write_table(@table, chunk_size)
-    writer.close
-    reader = Parquet::ArrowFileReader.new(@file.path)
-    @statistics = reader.metadata.get_row_group(0).get_column_chunk(0).statistics
+    Tempfile.create(["data", ".parquet"]) do |file|
+      @file = file
+      data_type = Arrow::FixedSizeBinaryDataType.new(3)
+      array = build_fixed_size_binary_array(data_type, [nil, "abc", "xyz"])
+      @table = build_table("binary" => array)
+      writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
+      chunk_size = 1024
+      writer.write_table(@table, chunk_size)
+      writer.close
+      reader = Parquet::ArrowFileReader.new(@file.path)
+      begin
+        @statistics =
+          reader.metadata.get_row_group(0).get_column_chunk(0).statistics
+        yield
+      ensure
+        reader.unref
+      end
+    end
   end
 
   test("#min") do
diff --git a/c_glib/test/parquet/test-float-statistics.rb b/c_glib/test/parquet/test-float-statistics.rb
index 2622a2bb36fe6..7d1a233f53ca0 100644
--- a/c_glib/test/parquet/test-float-statistics.rb
+++ b/c_glib/test/parquet/test-float-statistics.rb
@@ -20,14 +20,22 @@ class TestParquetFloatStatistics < Test::Unit::TestCase
 
   def setup
     omit("Parquet is required") unless defined?(::Parquet)
-    @file = Tempfile.open(["data", ".parquet"])
-    @table = build_table("float" => build_float_array([nil, -2.9, 2.9]))
-    writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
-    chunk_size = 1024
-    writer.write_table(@table, chunk_size)
-    writer.close
-    reader = Parquet::ArrowFileReader.new(@file.path)
-    @statistics = reader.metadata.get_row_group(0).get_column_chunk(0).statistics
+    Tempfile.create(["data", ".parquet"]) do |file|
+      @file = file
+      @table = build_table("float" => build_float_array([nil, -2.9, 2.9]))
+      writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
+      chunk_size = 1024
+      writer.write_table(@table, chunk_size)
+      writer.close
+      reader = Parquet::ArrowFileReader.new(@file.path)
+      begin
+        @statistics =
+          reader.metadata.get_row_group(0).get_column_chunk(0).statistics
+        yield
+      ensure
+        reader.unref
+      end
+    end
   end
 
   test("#min") do
diff --git a/c_glib/test/parquet/test-int32-statistics.rb b/c_glib/test/parquet/test-int32-statistics.rb
index 041f07c74292f..8d41327f88014 100644
--- a/c_glib/test/parquet/test-int32-statistics.rb
+++ b/c_glib/test/parquet/test-int32-statistics.rb
@@ -20,14 +20,22 @@ class TestParquetInt32Statistics < Test::Unit::TestCase
 
   def setup
     omit("Parquet is required") unless defined?(::Parquet)
-    @file = Tempfile.open(["data", ".parquet"])
-    @table = build_table("int32" => build_int32_array([nil, -2, 9]))
-    writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
-    chunk_size = 1024
-    writer.write_table(@table, chunk_size)
-    writer.close
-    reader = Parquet::ArrowFileReader.new(@file.path)
-    @statistics = reader.metadata.get_row_group(0).get_column_chunk(0).statistics
+    Tempfile.create(["data", ".parquet"]) do |file|
+      @file = file
+      @table = build_table("int32" => build_int32_array([nil, -2, 9]))
+      writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
+      chunk_size = 1024
+      writer.write_table(@table, chunk_size)
+      writer.close
+      reader = Parquet::ArrowFileReader.new(@file.path)
+      begin
+        @statistics =
+          reader.metadata.get_row_group(0).get_column_chunk(0).statistics
+        yield
+      ensure
+        reader.unref
+      end
+    end
   end
 
   test("#min") do
diff --git a/c_glib/test/parquet/test-int64-statistics.rb b/c_glib/test/parquet/test-int64-statistics.rb
index 0a014573c1144..81fce8a0bbbbd 100644
--- a/c_glib/test/parquet/test-int64-statistics.rb
+++ b/c_glib/test/parquet/test-int64-statistics.rb
@@ -20,15 +20,23 @@ class TestParquetInt64Statistics < Test::Unit::TestCase
 
   def setup
     omit("Parquet is required") unless defined?(::Parquet)
-    @file = Tempfile.open(["data", ".parquet"])
-    array = build_int64_array([nil, -(2 ** 32), 2 ** 32])
-    @table = build_table("int64" => array)
-    writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
-    chunk_size = 1024
-    writer.write_table(@table, chunk_size)
-    writer.close
-    reader = Parquet::ArrowFileReader.new(@file.path)
-    @statistics = reader.metadata.get_row_group(0).get_column_chunk(0).statistics
+    Tempfile.create(["data", ".parquet"]) do |file|
+      @file = file
+      array = build_int64_array([nil, -(2 ** 32), 2 ** 32])
+      @table = build_table("int64" => array)
+      writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
+      chunk_size = 1024
+      writer.write_table(@table, chunk_size)
+      writer.close
+      reader = Parquet::ArrowFileReader.new(@file.path)
+      begin
+        @statistics =
+          reader.metadata.get_row_group(0).get_column_chunk(0).statistics
+        yield
+      ensure
+        reader.unref
+      end
+    end
   end
 
   test("#min") do
diff --git a/c_glib/test/parquet/test-row-group-metadata.rb b/c_glib/test/parquet/test-row-group-metadata.rb
index e68cb9d11ee62..f238dd3b5774e 100644
--- a/c_glib/test/parquet/test-row-group-metadata.rb
+++ b/c_glib/test/parquet/test-row-group-metadata.rb
@@ -20,35 +20,46 @@ class TestParquetRowGroupMetadata < Test::Unit::TestCase
 
   def setup
     omit("Parquet is required") unless defined?(::Parquet)
-    @file = Tempfile.open(["data", ".parquet"])
-    @string_array = build_string_array([nil, "hello"])
-    fields = [
-      Arrow::Field.new("int8", Arrow::Int8DataType.new),
-      Arrow::Field.new("boolean", Arrow::BooleanDataType.new),
-    ]
-    structs = [
-      {
-        "int8" => -29,
-        "boolean" => true,
-      },
-      nil,
-    ]
-    @struct_array = build_struct_array(fields, structs)
-    @table = build_table("string" => @string_array,
-                         "struct" => @struct_array)
-    writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
-    chunk_size = 1
-    writer.write_table(@table, chunk_size)
-    writer.close
-    reader = Parquet::ArrowFileReader.new(@file.path)
-    @metadata = reader.metadata.get_row_group(0)
+    Tempfile.create(["data", ".parquet"]) do |file|
+      @file = file
+      @string_array = build_string_array([nil, "hello"])
+      fields = [
+        Arrow::Field.new("int8", Arrow::Int8DataType.new),
+        Arrow::Field.new("boolean", Arrow::BooleanDataType.new),
+      ]
+      structs = [
+        {
+          "int8" => -29,
+          "boolean" => true,
+        },
+        nil,
+      ]
+      @struct_array = build_struct_array(fields, structs)
+      @table = build_table("string" => @string_array,
+                           "struct" => @struct_array)
+      writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
+      chunk_size = 1
+      writer.write_table(@table, chunk_size)
+      writer.close
+      reader = Parquet::ArrowFileReader.new(@file.path)
+      begin
+        @metadata = reader.metadata.get_row_group(0)
+        yield
+      ensure
+        reader.unref
+      end
+    end
   end
 
   test("#==") do
     reader = Parquet::ArrowFileReader.new(@file.path)
-    other_metadata = reader.metadata.get_row_group(0)
-    assert do
-      @metadata == other_metadata
+    begin
+      other_metadata = reader.metadata.get_row_group(0)
+      assert do
+        @metadata == other_metadata
+      end
+    ensure
+      reader.unref
     end
   end
 
diff --git a/c_glib/test/parquet/test-statistics.rb b/c_glib/test/parquet/test-statistics.rb
index 0367084c88a49..09a47ac255927 100644
--- a/c_glib/test/parquet/test-statistics.rb
+++ b/c_glib/test/parquet/test-statistics.rb
@@ -20,22 +20,34 @@ class TestParquetStatistics < Test::Unit::TestCase
 
   def setup
     omit("Parquet is required") unless defined?(::Parquet)
-    @file = Tempfile.open(["data", ".parquet"])
-    @table = build_table("int32" => build_int32_array([nil, 2, 2, 9]))
-    writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
-    chunk_size = 1024
-    writer.write_table(@table, chunk_size)
-    writer.close
-    reader = Parquet::ArrowFileReader.new(@file.path)
-    @statistics = reader.metadata.get_row_group(0).get_column_chunk(0).statistics
+    Tempfile.create(["data", ".parquet"]) do |file|
+      @file = file
+      @table = build_table("int32" => build_int32_array([nil, 2, 2, 9]))
+      writer = Parquet::ArrowFileWriter.new(@table.schema, @file.path)
+      chunk_size = 1024
+      writer.write_table(@table, chunk_size)
+      writer.close
+      reader = Parquet::ArrowFileReader.new(@file.path)
+      begin
+        @statistics =
+          reader.metadata.get_row_group(0).get_column_chunk(0).statistics
+        yield
+      ensure
+        reader.unref
+      end
+    end
   end
 
   test("#==") do
     reader = Parquet::ArrowFileReader.new(@file.path)
-    other_statistics =
-      reader.metadata.get_row_group(0).get_column_chunk(0).statistics
-    assert do
-      @statistics == other_statistics
+    begin
+      other_statistics =
+        reader.metadata.get_row_group(0).get_column_chunk(0).statistics
+      assert do
+        @statistics == other_statistics
+      end
+    ensure
+      reader.unref
     end
   end
 
diff --git a/c_glib/test/test-half-float-scalar.rb b/c_glib/test/test-half-float-scalar.rb
index ac41f91ece621..3073d84d796cf 100644
--- a/c_glib/test/test-half-float-scalar.rb
+++ b/c_glib/test/test-half-float-scalar.rb
@@ -41,7 +41,7 @@ def test_equal
   end
 
   def test_to_s
-    assert_equal("[\n  #{@half_float}\n]", @scalar.to_s)
+    assert_equal("1.0009765625", @scalar.to_s)
   end
 
   def test_value
diff --git a/c_glib/tool/generate-version-header.py b/c_glib/tool/generate-version-header.py
new file mode 100755
index 0000000000000..7422432251ff1
--- /dev/null
+++ b/c_glib/tool/generate-version-header.py
@@ -0,0 +1,172 @@
+#!/usr/bin/env python3
+
+# 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.
+
+
+import argparse
+from io import TextIOBase
+from pathlib import Path
+import re
+
+
+def main():
+    parser = argparse.ArgumentParser(
+            description="Generate C header with version macros")
+    parser.add_argument(
+            "--library",
+            required=True,
+            help="The library name to use in macro prefixes")
+    parser.add_argument(
+            "--version",
+            required=True,
+            help="The library version number")
+    parser.add_argument(
+            "--input",
+            type=Path,
+            required=True,
+            help="Path to the input template file")
+    parser.add_argument(
+            "--output",
+            type=Path,
+            required=True,
+            help="Path to the output file to generate")
+
+    args = parser.parse_args()
+
+    with open(args.input, "r", encoding="utf-8") as input_file, \
+            open(args.output, "w", encoding="utf-8") as output_file:
+        write_header(
+                input_file, output_file, args.library, args.version)
+
+
+def write_header(
+        input_file: TextIOBase,
+        output_file: TextIOBase,
+        library_name: str,
+        version: str):
+    if "-" in version:
+        version, version_tag = version.split("-")
+    else:
+        version_tag = ""
+    version_major, version_minor, version_micro = [int(v) for v in version.split(".")]
+
+    encoded_versions = generate_encoded_versions(library_name)
+    visibility_macros = generate_visibility_macros(library_name)
+    availability_macros = generate_availability_macros(library_name)
+
+    replacements = {
+            "VERSION_MAJOR": str(version_major),
+            "VERSION_MINOR": str(version_minor),
+            "VERSION_MICRO": str(version_micro),
+            "VERSION_TAG": version_tag,
+            "ENCODED_VERSIONS": encoded_versions,
+            "VISIBILITY_MACROS": visibility_macros,
+            "AVAILABILITY_MACROS": availability_macros,
+    }
+
+    output_file.write(re.sub(
+        r"@([A-Z_]+)@", lambda match: replacements[match[1]], input_file.read()))
+
+
+def generate_visibility_macros(library: str) -> str:
+    return f"""#if (defined(_WIN32) || defined(__CYGWIN__)) && defined(_MSC_VER) && \
+  !defined({library}_STATIC_COMPILATION)
+#  define {library}_EXPORT __declspec(dllexport)
+#  define {library}_IMPORT __declspec(dllimport)
+#else
+#  define {library}_EXPORT
+#  define {library}_IMPORT
+#endif
+
+#ifdef {library}_COMPILATION
+#  define {library}_API {library}_EXPORT
+#else
+#  define {library}_API {library}_IMPORT
+#endif
+
+#define {library}_EXTERN {library}_API extern"""
+
+
+def generate_encoded_versions(library: str) -> str:
+    macros = []
+
+    for major_version, minor_version in ALL_VERSIONS:
+        macros.append(f"""/**
+ * {library}_VERSION_{major_version}_{minor_version}:
+ *
+ * You can use this macro value for compile time API version check.
+ *
+ * Since: {major_version}.{minor_version}.0
+ */
+#define {library}_VERSION_{major_version}_{minor_version} G_ENCODE_VERSION({major_version}, {minor_version})""")  # noqa: E501
+
+    return "\n\n".join(macros)
+
+
+def generate_availability_macros(library: str) -> str:
+    macros = [f"""#define {library}_AVAILABLE_IN_ALL {library}_EXTERN"""]
+
+    for major_version, minor_version in ALL_VERSIONS:
+        macros.append(f"""#if {library}_VERSION_MIN_REQUIRED >= {library}_VERSION_{major_version}_{minor_version}
+#  define {library}_DEPRECATED_IN_{major_version}_{minor_version}               {library}_DEPRECATED
+#  define {library}_DEPRECATED_IN_{major_version}_{minor_version}_FOR(function) {library}_DEPRECATED_FOR(function)
+#else
+#  define {library}_DEPRECATED_IN_{major_version}_{minor_version}
+#  define {library}_DEPRECATED_IN_{major_version}_{minor_version}_FOR(function)
+#endif
+
+#if {library}_VERSION_MAX_ALLOWED < {library}_VERSION_{major_version}_{minor_version}
+#  define {library}_AVAILABLE_IN_{major_version}_{minor_version} {library}_EXTERN {library}_UNAVAILABLE({major_version}, {minor_version})
+#else
+#  define {library}_AVAILABLE_IN_{major_version}_{minor_version} {library}_EXTERN
+#endif""")  # noqa: E501
+
+    return "\n\n".join(macros)
+
+
+ALL_VERSIONS = [
+        (17, 0),
+        (16, 0),
+        (15, 0),
+        (14, 0),
+        (13, 0),
+        (12, 0),
+        (11, 0),
+        (10, 0),
+        (9, 0),
+        (8, 0),
+        (7, 0),
+        (6, 0),
+        (5, 0),
+        (4, 0),
+        (3, 0),
+        (2, 0),
+        (1, 0),
+        (0, 17),
+        (0, 16),
+        (0, 15),
+        (0, 14),
+        (0, 13),
+        (0, 12),
+        (0, 11),
+        (0, 10),
+]
+
+
+if __name__ == '__main__':
+    main()
diff --git a/c_glib/vcpkg.json b/c_glib/vcpkg.json
new file mode 100644
index 0000000000000..e88d2b8fe30d5
--- /dev/null
+++ b/c_glib/vcpkg.json
@@ -0,0 +1,9 @@
+{
+  "name": "arrow-glib",
+  "version-string": "17.0.0-SNAPSHOT",
+  "dependencies": [
+    "glib",
+    "gobject-introspection",
+    "pkgconf"
+  ]
+}
diff --git a/ci/appveyor-cpp-build.bat b/ci/appveyor-cpp-build.bat
index 8cfa67c437264..f688fbb63a9ad 100644
--- a/ci/appveyor-cpp-build.bat
+++ b/ci/appveyor-cpp-build.bat
@@ -129,7 +129,6 @@ set PYARROW_WITH_ORC=%ARROW_ORC%
 set PYARROW_WITH_PARQUET=ON
 set PYARROW_WITH_PARQUET_ENCRYPTION=ON
 set PYARROW_WITH_S3=%ARROW_S3%
-set PYARROW_WITH_STATIC_BOOST=ON
 set PYARROW_WITH_SUBSTRAIT=ON
 
 set ARROW_HOME=%CONDA_PREFIX%\Library
diff --git a/ci/appveyor-cpp-setup.bat b/ci/appveyor-cpp-setup.bat
index 5c4a11832d5ee..5a9dffa166fb7 100644
--- a/ci/appveyor-cpp-setup.bat
+++ b/ci/appveyor-cpp-setup.bat
@@ -66,6 +66,9 @@ set CONDA_PACKAGES=%CONDA_PACKAGES% --file=ci\conda_env_cpp.txt
 @rem Force conda to use conda-forge
 conda config --add channels conda-forge
 conda config --remove channels defaults
+@rem Ensure using the latest information. If there are invalid caches,
+@rem mamba may use invalid download URL.
+mamba clean --all -y
 @rem Arrow conda environment
 mamba create -n arrow -y -c conda-forge ^
   --file=ci\conda_env_python.txt ^
diff --git a/ci/conan/all/conan_cmake_project_include.cmake b/ci/conan/all/conan_cmake_project_include.cmake
new file mode 100644
index 0000000000000..a6dee0c43461c
--- /dev/null
+++ b/ci/conan/all/conan_cmake_project_include.cmake
@@ -0,0 +1,35 @@
+# MIT License
+#
+# Copyright (c) 2019 Conan.io
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+if(ARROW_S3)
+  find_package(AWSSDK REQUIRED)
+  # Fix issue where scripts expect a variable called "AWSSDK_LINK_LIBRARIES"
+  # which is not defined by the generated AWSSDKConfig.cmake
+  if(NOT DEFINED AWSSDK_LINK_LIBRARIES)
+    set(AWSSDK_LINK_LIBRARIES "${AWSSDK_LIBRARIES}")
+  endif()
+
+  # Causes logic used for generated .pc file to not run
+  # avoiding instropection of target `aws-cpp-sdk::aws-cpp-sdk`
+  # This is fine because the generated .pc file is not of use
+  set(AWSSDK_SOURCE "conan")
+endif()
diff --git a/ci/conan/all/conandata.yml b/ci/conan/all/conandata.yml
index 7402272a4b366..fb75f3995c62e 100644
--- a/ci/conan/all/conandata.yml
+++ b/ci/conan/all/conandata.yml
@@ -21,6 +21,30 @@
 # SOFTWARE.
 
 sources:
+  "15.0.0":
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-15.0.0/apache-arrow-15.0.0.tar.gz?action=download"
+    sha256: "01dd3f70e85d9b5b933ec92c0db8a4ef504a5105f78d2d8622e84279fb45c25d"
+  "14.0.2":
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-14.0.2/apache-arrow-14.0.2.tar.gz?action=download"
+    sha256: "1304dedb41896008b89fe0738c71a95d9b81752efc77fa70f264cb1da15d9bc2"
+  "14.0.1":
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-14.0.1/apache-arrow-14.0.1.tar.gz?action=download"
+    sha256: "5c70eafb1011f9d124bafb328afe54f62cc5b9280b7080e1e3d668f78c0e407e"
+  "14.0.0":
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-14.0.0/apache-arrow-14.0.0.tar.gz?action=download"
+    sha256: "4eb0da50ec071baf15fc163cb48058931e006f1c862c8def0e180fd07d531021"
+  "13.0.0":
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-13.0.0/apache-arrow-13.0.0.tar.gz?action=download"
+    sha256: "35dfda191262a756be934eef8afee8d09762cad25021daa626eb249e251ac9e6"
+  "12.0.1":
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-12.0.1/apache-arrow-12.0.1.tar.gz?action=download"
+    sha256: "3481c411393aa15c75e88d93cf8315faf7f43e180fe0790128d3840d417de858"
+  "12.0.0":
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-12.0.0/apache-arrow-12.0.0.tar.gz?action=download"
+    sha256: "ddd8347882775e53af7d0965a1902b7d8fcd0a030fd14f783d4f85e821352d52"
+  "11.0.0":
+    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-11.0.0/apache-arrow-11.0.0.tar.gz?action=download"
+    sha256: "2dd8f0ea0848a58785628ee3a57675548d509e17213a2f5d72b0d900b43f5430"
   "10.0.1":
     url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-10.0.1/apache-arrow-10.0.1.tar.gz?action=download"
     sha256: "c814e0670112a22c1a6ec03ab420a52ae236a9a42e9e438c3cbd37f37e658fb3"
@@ -36,12 +60,6 @@ sources:
   "7.0.0":
     url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-7.0.0/apache-arrow-7.0.0.tar.gz?action=download"
     sha256: "e8f49b149a15ecef4e40fcfab1b87c113c6b1ee186005c169e5cdf95d31a99de"
-  "2.0.0":
-    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-2.0.0/apache-arrow-2.0.0.tar.gz?action=download"
-    sha256: "be0342cc847bb340d86aeaef43596a0b6c1dbf1ede9c789a503d939e01c71fbe"
-  "1.0.0":
-    url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-1.0.0/apache-arrow-1.0.0.tar.gz?action=download"
-    sha256: "86ddb9feb48203a5aaf9cc4f2827525e20a2ca4d7239e492af17e74532ccf243"
 patches:
   "8.0.1":
     - patch_file: "patches/8.0.0-0005-install-utils.patch"
@@ -64,23 +82,3 @@ patches:
     - patch_file: "patches/7.0.0-0007-fix-cmake.patch"
       patch_description: "use cci package"
       patch_type: "conan"
-  "2.0.0":
-    - patch_file: "patches/2.0.0-0003-fix-shared-msvc.patch"
-      patch_description: "make shared enabled in msvc"
-      patch_type: "official"
-    - patch_file: "patches/2.0.0-0005-gandiva-engine.patch"
-      patch_description: "fix grandiva compilation error"
-      patch_type: "official"
-    - patch_file: "patches/2.0.0-0008-fix-cmake.patch"
-      patch_description: "use cci package"
-      patch_type: "conan"
-  "1.0.0":
-    - patch_file: "patches/1.0.0-0003-fix-shared-msvc.patch"
-      patch_description: "make shared enabled in msvc"
-      patch_type: "official"
-    - patch_file: "patches/1.0.0-0005-fix-make12-namespace.patch"
-      patch_description: "fix ambiguous `make12` function between std and date"
-      patch_type: "official"
-    - patch_file: "patches/1.0.0-0006-fix-cmake.patch"
-      patch_description: "use cci package"
-      patch_type: "conan"
diff --git a/ci/conan/all/conanfile.py b/ci/conan/all/conanfile.py
index 7e87f82e7e018..178cd03da1555 100644
--- a/ci/conan/all/conanfile.py
+++ b/ci/conan/all/conanfile.py
@@ -21,12 +21,12 @@
 # SOFTWARE.
 
 from conan import ConanFile
-from conan.errors import ConanInvalidConfiguration
-from conan.tools.microsoft import is_msvc_static_runtime, is_msvc, check_min_vs
-from conan.tools.files import export_conandata_patches, apply_conandata_patches, get, copy, rmdir
+from conan.errors import ConanInvalidConfiguration, ConanException
 from conan.tools.build import check_min_cppstd, cross_building
-from conan.tools.scm import Version
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
+from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir
+from conan.tools.microsoft import is_msvc, is_msvc_static_runtime
+from conan.tools.scm import Version
 
 import os
 import glob
@@ -39,7 +39,8 @@ class ArrowConan(ConanFile):
     license = ("Apache-2.0",)
     url = "https://github.com/conan-io/conan-center-index"
     homepage = "https://arrow.apache.org/"
-    topics = ("memory", "gandiva", "parquet", "skyhook", "plasma", "hdfs", "csv", "cuda", "gcs", "json", "hive", "s3", "grpc")
+    topics = ("memory", "gandiva", "parquet", "skyhook", "acero", "hdfs", "csv", "cuda", "gcs", "json", "hive", "s3", "grpc")
+    package_type = "library"
     settings = "os", "arch", "compiler", "build_type"
     options = {
         "shared": [True, False],
@@ -48,15 +49,15 @@ class ArrowConan(ConanFile):
         "parquet": ["auto", True, False],
         "substrait": [True, False],
         "skyhook": [True, False],
-        "plasma": [True, False],
+        "acero": [True, False],
         "cli": [True, False],
         "compute": ["auto", True, False],
-        "acero": ["auto", True, False],
         "dataset_modules":  ["auto", True, False],
         "deprecated": [True, False],
         "encryption": [True, False],
         "filesystem_layer":  [True, False],
         "hdfs_bridgs": [True, False],
+        "plasma": [True, False, "deprecated"],
         "simd_level": [None, "default", "sse4_2", "avx2", "avx512", "neon", ],
         "runtime_simd_level": [None, "sse4_2", "avx2", "avx512", "max"],
         "with_backtrace": [True, False],
@@ -70,8 +71,9 @@ class ArrowConan(ConanFile):
         "with_glog": ["auto", True, False],
         "with_grpc": ["auto", True, False],
         "with_jemalloc": ["auto", True, False],
-        "with_mimalloc": ["auto", True, False],
+        "with_mimalloc": [True, False],
         "with_json": [True, False],
+        "with_thrift": ["auto", True, False],
         "with_llvm": ["auto", True, False],
         "with_openssl": ["auto", True, False],
         "with_opentelemetry": [True, False],
@@ -91,43 +93,44 @@ class ArrowConan(ConanFile):
         "shared": False,
         "fPIC": True,
         "gandiva": False,
-        "parquet": "auto",
+        "parquet": False,
         "skyhook": False,
         "substrait": False,
-        "plasma": False,
+        "acero": False,
         "cli": False,
-        "compute": "auto",
-        "acero": "auto",
-        "dataset_modules": "auto",
+        "compute": False,
+        "dataset_modules": False,
         "deprecated": True,
         "encryption": False,
         "filesystem_layer": False,
         "hdfs_bridgs": False,
+        "plasma": "deprecated",
         "simd_level": "default",
         "runtime_simd_level": "max",
         "with_backtrace": False,
-        "with_boost": "auto",
+        "with_boost": False,
         "with_brotli": False,
         "with_bz2": False,
         "with_csv": False,
         "with_cuda": False,
-        "with_flight_rpc": "auto",
+        "with_flight_rpc": False,
         "with_flight_sql": False,
         "with_gcs": False,
-        "with_gflags": "auto",
-        "with_jemalloc": "auto",
+        "with_gflags": False,
+        "with_jemalloc": False,
         "with_mimalloc": False,
-        "with_glog": "auto",
-        "with_grpc": "auto",
+        "with_glog": False,
+        "with_grpc": False,
         "with_json": False,
-        "with_llvm": "auto",
-        "with_openssl": "auto",
+        "with_thrift": False,
+        "with_llvm": False,
+        "with_openssl": False,
         "with_opentelemetry": False,
         "with_orc": False,
-        "with_protobuf": "auto",
-        "with_re2": "auto",
+        "with_protobuf": False,
+        "with_re2": False,
         "with_s3": False,
-        "with_utf8proc": "auto",
+        "with_utf8proc": False,
         "with_lz4": False,
         "with_snappy": False,
         "with_zlib": False,
@@ -136,283 +139,147 @@ class ArrowConan(ConanFile):
     short_paths = True
 
     @property
-    def _minimum_cpp_standard(self):
+    def _min_cppstd(self):
         # arrow >= 10.0.0 requires C++17.
         # https://github.com/apache/arrow/pull/13991
-        return 11 if Version(self.version) < "10.0.0" else 17
+        return "11" if Version(self.version) < "10.0.0" else "17"
 
     @property
     def _compilers_minimum_version(self):
         return {
-            "gcc": "8",
-            "clang": "7",
-            "apple-clang": "10",
-        }
+            "11": {
+                "clang": "3.9",
+            },
+            "17": {
+                "gcc": "8",
+                "clang": "7",
+                "apple-clang": "10",
+                "Visual Studio": "15",
+                "msvc": "191",
+            },
+        }.get(self._min_cppstd, {})
 
     def export_sources(self):
         export_conandata_patches(self)
+        copy(self, "conan_cmake_project_include.cmake", self.recipe_folder, os.path.join(self.export_sources_folder, "src"))
 
     def config_options(self):
         if self.settings.os == "Windows":
             del self.options.fPIC
-        if Version(self.version) < "2.0.0":
-            del self.options.simd_level
-            del self.options.runtime_simd_level
-        elif Version(self.version) < "6.0.0":
-            self.options.simd_level = "sse4_2"
-        if Version(self.version) < "6.0.0":
-            del self.options.with_gcs
-        if Version(self.version) < "7.0.0":
-            del self.options.skyhook
-            del self.options.with_flight_sql
-            del self.options.with_opentelemetry
         if Version(self.version) < "8.0.0":
             del self.options.substrait
+        if is_msvc(self):
+            self.options.with_boost = True
 
     def configure(self):
         if self.options.shared:
             self.options.rm_safe("fPIC")
 
-    def validate(self):
-        if self.info.settings.compiler.cppstd:
-            check_min_cppstd(self, self._minimum_cpp_standard)
-
-        if self._minimum_cpp_standard == 11:
-            if self.info.settings.compiler == "clang" and self.info.settings.compiler.version <= Version("3.9"):
-                raise ConanInvalidConfiguration("This recipe does not support this compiler version")
-        else:
-            check_min_vs(self, 191)
-            if not is_msvc(self):
-                minimum_version = self._compilers_minimum_version.get(str(self.info.settings.compiler), False)
-                if minimum_version and Version(self.info.settings.compiler.version) < minimum_version:
-                    raise ConanInvalidConfiguration(
-                        f"{self.ref} requires C++{self._minimum_cpp_standard}, which your compiler does not support."
-                    )
-
-        if self.options.shared:
-            del self.options.fPIC
-        if self.options.compute == False and not self._compute(True):
-            raise ConanInvalidConfiguration("compute options is required (or choose auto)")
-        if self.options.acero == False and not self._acero(True):
-            raise ConanInvalidConfiguration("acero options is required (or choose auto)")
-        if self.options.parquet == False and self._parquet(True):
-            raise ConanInvalidConfiguration("parquet options is required (or choose auto)")
-        if self.options.dataset_modules == False and self._dataset_modules(True):
-            raise ConanInvalidConfiguration("dataset_modules options is required (or choose auto)")
-        if self.options.get_safe("skyhook", False):
-            raise ConanInvalidConfiguration("CCI has no librados recipe (yet)")
-        if self.options.with_jemalloc == False and self._with_jemalloc(True):
-            raise ConanInvalidConfiguration("with_jemalloc option is required (or choose auto)")
-        if self.options.with_re2 == False and self._with_re2(True):
-            raise ConanInvalidConfiguration("with_re2 option is required (or choose auto)")
-        if self.options.with_protobuf == False and self._with_protobuf(True):
-            raise ConanInvalidConfiguration("with_protobuf option is required (or choose auto)")
-        if self.options.with_gflags == False and self._with_gflags(True):
-            raise ConanInvalidConfiguration("with_gflags options is required (or choose auto)")
-        if self.options.with_flight_rpc == False and self._with_flight_rpc(True):
-            raise ConanInvalidConfiguration("with_flight_rpc options is required (or choose auto)")
-        if self.options.with_grpc == False and self._with_grpc(True):
-            raise ConanInvalidConfiguration("with_grpc options is required (or choose auto)")
-        if self.options.with_boost == False and self._with_boost(True):
-            raise ConanInvalidConfiguration("with_boost options is required (or choose auto)")
-        if self.options.with_openssl == False and self._with_openssl(True):
-            raise ConanInvalidConfiguration("with_openssl options is required (or choose auto)")
-        if self.options.with_llvm == False and self._with_llvm(True):
-            raise ConanInvalidConfiguration("with_llvm options is required (or choose auto)")
-        if self.options.with_cuda:
-            raise ConanInvalidConfiguration("CCI has no cuda recipe (yet)")
-        if self.options.with_orc:
-            raise ConanInvalidConfiguration("CCI has no orc recipe (yet)")
-        if self.options.with_s3 and not self.options["aws-sdk-cpp"].config:
-            raise ConanInvalidConfiguration("arrow:with_s3 requires aws-sdk-cpp:config is True.")
-
-        if self.options.shared and self._with_jemalloc():
-            if self.options["jemalloc"].enable_cxx:
-                raise ConanInvalidConfiguration("jemmalloc.enable_cxx of a static jemalloc must be disabled")
-
-        if Version(self.version) < "6.0.0" and self.options.get_safe("simd_level") == "default":
-            raise ConanInvalidConfiguration(f"In {self.ref}, simd_level options is not supported `default` value.")
-
     def layout(self):
         cmake_layout(self, src_folder="src")
 
-    def _compute(self, required=False):
-        if required or self.options.compute == "auto":
-            return bool(self._parquet()) or bool(self._acero())
-        else:
-            return bool(self.options.compute)
-
-    def _acero(self, required=False):
-        if required or self.options.acero == "auto":
-            return bool(self._dataset_modules())
-        else:
-            return bool(self.options.acero)
-
-    def _parquet(self, required=False):
-        if required or self.options.parquet == "auto":
-            return bool(self.options.get_safe("substrait", False))
-        else:
-            return bool(self.options.parquet)
-
-    def _plasma(self, required=False):
-        if Version(self.version) >= "12.0.0":
-            return False
-        else:
-            return required or self.options.plasma
-
-    def _dataset_modules(self, required=False):
-        if required or self.options.dataset_modules == "auto":
-            return bool(self.options.get_safe("substrait", False))
-        else:
-            return bool(self.options.dataset_modules)
-
-    def _with_jemalloc(self, required=False):
-        if required or self.options.with_jemalloc == "auto":
-            return bool("BSD" in str(self.settings.os))
-        else:
-            return bool(self.options.with_jemalloc)
-
-    def _with_re2(self, required=False):
-        if required or self.options.with_re2 == "auto":
-            if self.options.gandiva or self.options.parquet:
-                return True
-            if Version(self) >= "7.0.0" and (self._compute() or self._dataset_modules()):
-                return True
-            return False
-        else:
-            return bool(self.options.with_re2)
-
-    def _with_protobuf(self, required=False):
-        if required or self.options.with_protobuf == "auto":
-            return bool(self.options.gandiva or self._with_flight_rpc() or self.options.with_orc or self.options.get_safe("substrait", False))
-        else:
-            return bool(self.options.with_protobuf)
-
-    def _with_flight_rpc(self, required=False):
-        if required or self.options.with_flight_rpc == "auto":
-            return bool(self.options.get_safe("with_flight_sql", False))
-        else:
-            return bool(self.options.with_flight_rpc)
-
-    def _with_gflags(self, required=False):
-        if required or self.options.with_gflags == "auto":
-            return bool(self._plasma() or self._with_glog() or self._with_grpc())
-        else:
-            return bool(self.options.with_gflags)
-
-    def _with_glog(self, required=False):
-        if required or self.options.with_glog == "auto":
-            return False
-        else:
-            return bool(self.options.with_glog)
-
-    def _with_grpc(self, required=False):
-        if required or self.options.with_grpc == "auto":
-            return self._with_flight_rpc()
-        else:
-            return bool(self.options.with_grpc)
-
-    def _with_boost(self, required=False):
-        if required or self.options.with_boost == "auto":
-            if self.options.gandiva:
-                return True
-            version = Version(self.version)
-            if version.major == "1":
-                if self._parquet() and self.settings.compiler == "gcc" and self.settings.compiler.version < Version("4.9"):
-                    return True
-            elif version.major >= "2":
-                if is_msvc(self):
-                    return True
-            return False
-        else:
-            return bool(self.options.with_boost)
-
-    def _with_thrift(self, required=False):
-        # No self.options.with_thrift exists
-        return bool(required or self._parquet())
-
-    def _with_utf8proc(self, required=False):
-        if required or self.options.with_utf8proc == "auto":
-            return bool(self._compute() or self.options.gandiva)
-        else:
-            return bool(self.options.with_utf8proc)
-
-    def _with_llvm(self, required=False):
-        if required or self.options.with_llvm == "auto":
-            return bool(self.options.gandiva)
-        else:
-            return bool(self.options.with_llvm)
-
-    def _with_openssl(self, required=False):
-        if required or self.options.with_openssl == "auto":
-            return bool(self.options.encryption or self._with_flight_rpc() or self.options.with_s3)
-        else:
-            return bool(self.options.with_openssl)
-
-    def _with_rapidjson(self):
-        if self.options.with_json:
-            return True
-        if Version(self.version) >= "7.0.0" and self.options.encryption:
-            return True
-        return False
+    def _requires_rapidjson(self):
+        return self.options.with_json or self.options.encryption
 
     def requirements(self):
-        if self._with_thrift():
-            self.requires("zlib/1.2.13")
+        if self.options.with_thrift:
             self.requires("thrift/0.17.0")
-        if self._with_protobuf():
-            self.requires("protobuf/3.21.4")
-        if self._with_jemalloc():
+        if self.options.with_protobuf:
+            self.requires("protobuf/3.21.9")
+        if self.options.with_jemalloc:
             self.requires("jemalloc/5.3.0")
         if self.options.with_mimalloc:
             self.requires("mimalloc/1.7.6")
-        if self._with_boost():
-            self.requires("boost/1.80.0")
-        if self._with_gflags():
+        if self.options.with_boost:
+            self.requires("boost/1.84.0")
+        if self.options.with_gflags:
             self.requires("gflags/2.2.2")
-        if self._with_glog():
+        if self.options.with_glog:
             self.requires("glog/0.6.0")
         if self.options.get_safe("with_gcs"):
             self.requires("google-cloud-cpp/1.40.1")
-        if self._with_grpc():
+        if self.options.with_grpc:
             self.requires("grpc/1.50.0")
-        if self._with_rapidjson():
+        if self._requires_rapidjson():
             self.requires("rapidjson/1.1.0")
-        if self._with_llvm():
+        if self.options.with_llvm:
             self.requires("llvm-core/13.0.0")
-        if self._with_openssl():
+        if self.options.with_openssl:
             # aws-sdk-cpp requires openssl/1.1.1. it uses deprecated functions in openssl/3.0.0
             if self.options.with_s3:
-                self.requires("openssl/1.1.1s")
+                self.requires("openssl/1.1.1w")
             else:
-                self.requires("openssl/1.1.1s")
+                self.requires("openssl/[>=1.1 <4]")
         if self.options.get_safe("with_opentelemetry"):
             self.requires("opentelemetry-cpp/1.7.0")
         if self.options.with_s3:
             self.requires("aws-sdk-cpp/1.9.234")
         if self.options.with_brotli:
-            self.requires("brotli/1.0.9")
+            self.requires("brotli/1.1.0")
         if self.options.with_bz2:
             self.requires("bzip2/1.0.8")
         if self.options.with_lz4:
             self.requires("lz4/1.9.4")
         if self.options.with_snappy:
             self.requires("snappy/1.1.9")
-        if Version(self.version) >= "6.0.0" and \
-            self.options.get_safe("simd_level") != None or \
+        if self.options.get_safe("simd_level") != None or \
             self.options.get_safe("runtime_simd_level") != None:
             self.requires("xsimd/9.0.1")
         if self.options.with_zlib:
-            self.requires("zlib/1.2.13")
+            self.requires("zlib/[>=1.2.11 <2]")
         if self.options.with_zstd:
-            self.requires("zstd/1.5.2")
-        if self._with_re2():
-            self.requires("re2/20220601")
-        if self._with_utf8proc():
+            self.requires("zstd/1.5.5")
+        if self.options.with_re2:
+            self.requires("re2/20230301")
+        if self.options.with_utf8proc:
             self.requires("utf8proc/2.8.0")
         if self.options.with_backtrace:
             self.requires("libbacktrace/cci.20210118")
 
+    def validate(self):
+        # Do not allow options with 'auto' value
+        # TODO: Remove "auto" from the possible values for these options
+        auto_options = [option for option, value in self.options.items() if value == "auto"]
+        if auto_options:
+            raise ConanException("Options with value 'auto' are deprecated. Please set them true/false or use its default value."
+                                 f" Please change the following options: {auto_options}")
+
+        # From https://github.com/conan-io/conan-center-index/pull/23163#issuecomment-2039808851
+        if self.options.gandiva:
+            if not self.options.with_re2:
+                raise ConanException("'with_re2' option should be True when'gandiva=True'")
+            if not self.options.with_boost:
+                raise ConanException("'with_boost' option should be True when'gandiva=True'")
+            if not self.options.with_utf8proc:
+                raise ConanException("'with_utf8proc' option should be True when'gandiva=True'")
+
+        if self.settings.compiler.get_safe("cppstd"):
+            check_min_cppstd(self, self._min_cppstd)
+
+        minimum_version = self._compilers_minimum_version.get(str(self.settings.compiler), False)
+        if minimum_version and Version(self.settings.compiler.version) < minimum_version:
+            raise ConanInvalidConfiguration(
+                f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support."
+            )
+
+        if self.options.get_safe("skyhook", False):
+            raise ConanInvalidConfiguration("CCI has no librados recipe (yet)")
+        if self.options.with_cuda:
+            raise ConanInvalidConfiguration("CCI has no cuda recipe (yet)")
+        if self.options.with_orc:
+            raise ConanInvalidConfiguration("CCI has no orc recipe (yet)")
+        if self.options.with_s3 and not self.dependencies["aws-sdk-cpp"].options.config:
+            raise ConanInvalidConfiguration("arrow:with_s3 requires aws-sdk-cpp:config is True.")
+
+        if self.options.shared and self.options.with_jemalloc:
+            if self.dependencies["jemalloc"].options.enable_cxx:
+                raise ConanInvalidConfiguration("jemmalloc.enable_cxx of a static jemalloc must be disabled")
+
+
+    def build_requirements(self):
+        if Version(self.version) >= "13.0.0":
+            self.tool_requires("cmake/[>=3.16 <4]")
+
     def source(self):
         # START
         # This block should be removed when we update upstream:
@@ -435,17 +302,15 @@ def source(self):
             return
         # END
         get(self, **self.conan_data["sources"][self.version],
-                  filename=f"apache-arrow-{self.version}.tar.gz", destination=self.source_folder, strip_root=True)
+            filename=f"apache-arrow-{self.version}.tar.gz", strip_root=True)
 
     def generate(self):
-        # BUILD_SHARED_LIBS and POSITION_INDEPENDENT_CODE are automatically parsed when self.options.shared or self.options.fPIC exist
         tc = CMakeToolchain(self)
         if cross_building(self):
             cmake_system_processor = {
                 "armv8": "aarch64",
                 "armv8.3": "aarch64",
             }.get(str(self.settings.arch), str(self.settings.arch))
-            tc.variables["CMAKE_SYSTEM_PROCESSOR"] = cmake_system_processor
             if cmake_system_processor == "aarch64":
                 tc.variables["ARROW_CPU_FLAG"] = "armv8"
         if is_msvc(self):
@@ -453,12 +318,10 @@ def generate(self):
         tc.variables["ARROW_DEPENDENCY_SOURCE"] = "SYSTEM"
         tc.variables["ARROW_PACKAGE_KIND"] = "conan" # See https://github.com/conan-io/conan-center-index/pull/14903/files#r1057938314 for details
         tc.variables["ARROW_GANDIVA"] = bool(self.options.gandiva)
-        tc.variables["ARROW_PARQUET"] = self._parquet()
+        tc.variables["ARROW_PARQUET"] = self.options.parquet
         tc.variables["ARROW_SUBSTRAIT"] = bool(self.options.get_safe("substrait", False))
-        if Version(self.version) < "12.0.0":
-            tc.variables["ARROW_PLASMA"] = bool(self._plasma())
-        tc.variables["ARROW_ACERO"] = self._acero()
-        tc.variables["ARROW_DATASET"] = self._dataset_modules()
+        tc.variables["ARROW_ACERO"] = bool(self.options.acero)
+        tc.variables["ARROW_DATASET"] = self.options.dataset_modules
         tc.variables["ARROW_FILESYSTEM"] = bool(self.options.filesystem_layer)
         tc.variables["PARQUET_REQUIRE_ENCRYPTION"] = bool(self.options.encryption)
         tc.variables["ARROW_HDFS"] = bool(self.options.hdfs_bridgs)
@@ -466,12 +329,12 @@ def generate(self):
         tc.variables["ARROW_BUILD_SHARED"] = bool(self.options.shared)
         tc.variables["ARROW_BUILD_STATIC"] = not bool(self.options.shared)
         tc.variables["ARROW_NO_DEPRECATED_API"] = not bool(self.options.deprecated)
-        tc.variables["ARROW_FLIGHT"] = self._with_flight_rpc()
+        tc.variables["ARROW_FLIGHT"] = self.options.with_flight_rpc
         tc.variables["ARROW_FLIGHT_SQL"] = bool(self.options.get_safe("with_flight_sql", False))
-        tc.variables["ARROW_COMPUTE"] = self._compute()
+        tc.variables["ARROW_COMPUTE"] = bool(self.options.compute)
         tc.variables["ARROW_CSV"] = bool(self.options.with_csv)
         tc.variables["ARROW_CUDA"] = bool(self.options.with_cuda)
-        tc.variables["ARROW_JEMALLOC"] = self._with_jemalloc()
+        tc.variables["ARROW_JEMALLOC"] = self.options.with_jemalloc
         tc.variables["jemalloc_SOURCE"] = "SYSTEM"
         tc.variables["ARROW_MIMALLOC"] = bool(self.options.with_mimalloc)
         tc.variables["ARROW_JSON"] = bool(self.options.with_json)
@@ -479,61 +342,58 @@ def generate(self):
         tc.variables["ARROW_GCS"] = bool(self.options.get_safe("with_gcs", False))
         tc.variables["BOOST_SOURCE"] = "SYSTEM"
         tc.variables["Protobuf_SOURCE"] = "SYSTEM"
-        if self._with_protobuf():
-            tc.variables["ARROW_PROTOBUF_USE_SHARED"] = bool(self.options["protobuf"].shared)
+        if self.options.with_protobuf:
+            tc.variables["ARROW_PROTOBUF_USE_SHARED"] = bool(self.dependencies["protobuf"].options.shared)
         tc.variables["gRPC_SOURCE"] = "SYSTEM"
-        if self._with_grpc():
-            tc.variables["ARROW_GRPC_USE_SHARED"] = bool(self.options["grpc"].shared)
+        if self.options.with_grpc:
+            tc.variables["ARROW_GRPC_USE_SHARED"] = bool(self.dependencies["grpc"].options.shared)
 
-        tc.variables["ARROW_USE_GLOG"] = self._with_glog()
+        tc.variables["ARROW_USE_GLOG"] = self.options.with_glog
         tc.variables["GLOG_SOURCE"] = "SYSTEM"
         tc.variables["ARROW_WITH_BACKTRACE"] = bool(self.options.with_backtrace)
         tc.variables["ARROW_WITH_BROTLI"] = bool(self.options.with_brotli)
         tc.variables["brotli_SOURCE"] = "SYSTEM"
         if self.options.with_brotli:
-            tc.variables["ARROW_BROTLI_USE_SHARED"] = bool(self.options["brotli"].shared)
+            tc.variables["ARROW_BROTLI_USE_SHARED"] = bool(self.dependencies["brotli"].options.shared)
         tc.variables["gflags_SOURCE"] = "SYSTEM"
-        if self._with_gflags():
-            tc.variables["ARROW_GFLAGS_USE_SHARED"] = bool(self.options["gflags"].shared)
+        if self.options.with_gflags:
+            tc.variables["ARROW_GFLAGS_USE_SHARED"] = bool(self.dependencies["gflags"].options.shared)
         tc.variables["ARROW_WITH_BZ2"] = bool(self.options.with_bz2)
         tc.variables["BZip2_SOURCE"] = "SYSTEM"
         if self.options.with_bz2:
-            tc.variables["ARROW_BZ2_USE_SHARED"] = bool(self.options["bzip2"].shared)
+            tc.variables["ARROW_BZ2_USE_SHARED"] = bool(self.dependencies["bzip2"].options.shared)
         tc.variables["ARROW_WITH_LZ4"] = bool(self.options.with_lz4)
         tc.variables["lz4_SOURCE"] = "SYSTEM"
         if self.options.with_lz4:
-            tc.variables["ARROW_LZ4_USE_SHARED"] = bool(self.options["lz4"].shared)
+            tc.variables["ARROW_LZ4_USE_SHARED"] = bool(self.dependencies["lz4"].options.shared)
         tc.variables["ARROW_WITH_SNAPPY"] = bool(self.options.with_snappy)
         tc.variables["RapidJSON_SOURCE"] = "SYSTEM"
         tc.variables["Snappy_SOURCE"] = "SYSTEM"
         if self.options.with_snappy:
-            tc.variables["ARROW_SNAPPY_USE_SHARED"] = bool(self.options["snappy"].shared)
+            tc.variables["ARROW_SNAPPY_USE_SHARED"] = bool(self.dependencies["snappy"].options.shared)
         tc.variables["ARROW_WITH_ZLIB"] = bool(self.options.with_zlib)
         tc.variables["re2_SOURCE"] = "SYSTEM"
         tc.variables["ZLIB_SOURCE"] = "SYSTEM"
         tc.variables["xsimd_SOURCE"] = "SYSTEM"
         tc.variables["ARROW_WITH_ZSTD"] = bool(self.options.with_zstd)
-        if Version(self.version) >= "2.0":
-            tc.variables["zstd_SOURCE"] = "SYSTEM"
-            tc.variables["ARROW_SIMD_LEVEL"] = str(self.options.simd_level).upper()
-            tc.variables["ARROW_RUNTIME_SIMD_LEVEL"] = str(self.options.runtime_simd_level).upper()
-        else:
-            tc.variables["ZSTD_SOURCE"] = "SYSTEM"
+        tc.variables["zstd_SOURCE"] = "SYSTEM"
+        tc.variables["ARROW_SIMD_LEVEL"] = str(self.options.simd_level).upper()
+        tc.variables["ARROW_RUNTIME_SIMD_LEVEL"] = str(self.options.runtime_simd_level).upper()
         if self.options.with_zstd:
-            tc.variables["ARROW_ZSTD_USE_SHARED"] = bool(self.options["zstd"].shared)
+            tc.variables["ARROW_ZSTD_USE_SHARED"] = bool(self.dependencies["zstd"].options.shared)
         tc.variables["ORC_SOURCE"] = "SYSTEM"
-        tc.variables["ARROW_WITH_THRIFT"] = self._with_thrift()
+        tc.variables["ARROW_WITH_THRIFT"] = bool(self.options.with_thrift)
         tc.variables["Thrift_SOURCE"] = "SYSTEM"
-        if self._with_thrift():
-            tc.variables["THRIFT_VERSION"] = bool(self.deps_cpp_info["thrift"].version) # a recent thrift does not require boost
-            tc.variables["ARROW_THRIFT_USE_SHARED"] = bool(self.options["thrift"].shared)
-        tc.variables["ARROW_USE_OPENSSL"] = self._with_openssl()
-        if self._with_openssl():
-            tc.variables["OPENSSL_ROOT_DIR"] = self.deps_cpp_info["openssl"].rootpath.replace("\\", "/")
-            tc.variables["ARROW_OPENSSL_USE_SHARED"] = bool(self.options["openssl"].shared)
-        if self._with_boost():
+        if self.options.with_thrift:
+            tc.variables["THRIFT_VERSION"] = bool(self.dependencies["thrift"].ref.version) # a recent thrift does not require boost
+            tc.variables["ARROW_THRIFT_USE_SHARED"] = bool(self.dependencies["thrift"].options.shared)
+        tc.variables["ARROW_USE_OPENSSL"] = self.options.with_openssl
+        if self.options.with_openssl:
+            tc.variables["OPENSSL_ROOT_DIR"] = self.dependencies["openssl"].package_folder.replace("\\", "/")
+            tc.variables["ARROW_OPENSSL_USE_SHARED"] = bool(self.dependencies["openssl"].options.shared)
+        if self.options.with_boost:
             tc.variables["ARROW_USE_BOOST"] = True
-            tc.variables["ARROW_BOOST_USE_SHARED"] = bool(self.options["boost"].shared)
+            tc.variables["ARROW_BOOST_USE_SHARED"] = bool(self.dependencies["boost"].options.shared)
         tc.variables["ARROW_S3"] = bool(self.options.with_s3)
         tc.variables["AWSSDK_SOURCE"] = "SYSTEM"
         tc.variables["ARROW_BUILD_UTILITIES"] = bool(self.options.cli)
@@ -544,16 +404,18 @@ def generate(self):
         tc.variables["ARROW_ENABLE_TIMING_TESTS"] = False
         tc.variables["ARROW_BUILD_BENCHMARKS"] = False
         tc.variables["LLVM_SOURCE"] = "SYSTEM"
-        tc.variables["ARROW_WITH_UTF8PROC"] = self._with_utf8proc()
-        tc.variables["ARROW_BOOST_REQUIRED"] = self._with_boost()
+        tc.variables["ARROW_WITH_UTF8PROC"] = self.options.with_utf8proc
+        tc.variables["ARROW_BOOST_REQUIRED"] = self.options.with_boost
         tc.variables["utf8proc_SOURCE"] = "SYSTEM"
-        if self._with_utf8proc():
-            tc.variables["ARROW_UTF8PROC_USE_SHARED"] = bool(self.options["utf8proc"].shared)
+        if self.options.with_utf8proc:
+            tc.variables["ARROW_UTF8PROC_USE_SHARED"] = bool(self.dependencies["utf8proc"].options.shared)
         tc.variables["BUILD_WARNING_LEVEL"] = "PRODUCTION"
         if is_msvc(self):
-            tc.variables["ARROW_USE_STATIC_CRT"] = "MT" in str(self.settings.compiler.runtime)
-        if self._with_llvm():
-            tc.variables["LLVM_DIR"] = self.deps_cpp_info["llvm-core"].rootpath.replace("\\", "/")
+            tc.variables["ARROW_USE_STATIC_CRT"] = is_msvc_static_runtime(self)
+        if self.options.with_llvm:
+            tc.variables["LLVM_DIR"] = self.dependencies["llvm-core"].package_folder.replace("\\", "/")
+
+        tc.cache_variables["CMAKE_PROJECT_arrow_INCLUDE"] = os.path.join(self.source_folder, "conan_cmake_project_include.cmake")
         tc.generate()
 
         deps = CMakeDeps(self)
@@ -561,10 +423,11 @@ def generate(self):
 
     def _patch_sources(self):
         apply_conandata_patches(self)
-        if "7.0.0" <= Version(self.version) < "10.0.0":
+        if Version(self.version) < "10.0.0":
             for filename in glob.glob(os.path.join(self.source_folder, "cpp", "cmake_modules", "Find*.cmake")):
                 if os.path.basename(filename) not in [
                     "FindArrow.cmake",
+                    "FindArrowAcero.cmake",
                     "FindArrowCUDA.cmake",
                     "FindArrowDataset.cmake",
                     "FindArrowFlight.cmake",
@@ -576,7 +439,6 @@ def _patch_sources(self):
                     "FindArrowTesting.cmake",
                     "FindGandiva.cmake",
                     "FindParquet.cmake",
-                    "FindPlasma.cmake",
                 ]:
                     os.remove(filename)
 
@@ -596,129 +458,106 @@ def package(self):
         rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
         rmdir(self, os.path.join(self.package_folder, "share"))
 
-    def _lib_name(self, name):
-        if is_msvc(self) and not self.options.shared:
-            return "{}_static".format(name)
-        else:
-            return "{}".format(name)
-
-    def package_id(self):
-        self.info.options.with_gflags = self._with_gflags()
-        self.info.options.with_protobuf = self._with_protobuf()
-        self.info.options.with_re2 = self._with_re2()
-        self.info.options.with_jemalloc = self._with_jemalloc()
-        self.info.options.with_openssl = self._with_openssl()
-        self.info.options.with_boost = self._with_boost()
-        self.info.options.with_glog = self._with_glog()
-        self.info.options.with_grpc = self._with_grpc()
-
     def package_info(self):
-        self.cpp_info.filenames["cmake_find_package"] = "Arrow"
-        self.cpp_info.filenames["cmake_find_package_multi"] = "Arrow"
-        self.cpp_info.components["libarrow"].libs = [self._lib_name("arrow")]
-        self.cpp_info.components["libarrow"].names["cmake_find_package"] = "arrow"
-        self.cpp_info.components["libarrow"].names["cmake_find_package_multi"] = "arrow"
-        self.cpp_info.components["libarrow"].names["pkg_config"] = "arrow"
+        # FIXME: fix CMake targets of components
+
+        self.cpp_info.set_property("cmake_file_name", "Arrow")
+
+        suffix = "_static" if is_msvc(self) and not self.options.shared else ""
+
+        self.cpp_info.components["libarrow"].set_property("pkg_config_name", "arrow")
+        self.cpp_info.components["libarrow"].libs = [f"arrow{suffix}"]
         if not self.options.shared:
             self.cpp_info.components["libarrow"].defines = ["ARROW_STATIC"]
             if self.settings.os in ["Linux", "FreeBSD"]:
                 self.cpp_info.components["libarrow"].system_libs = ["pthread", "m", "dl", "rt"]
 
-        if self._parquet():
-            self.cpp_info.components["libparquet"].libs = [self._lib_name("parquet")]
-            self.cpp_info.components["libparquet"].names["cmake_find_package"] = "parquet"
-            self.cpp_info.components["libparquet"].names["cmake_find_package_multi"] = "parquet"
-            self.cpp_info.components["libparquet"].names["pkg_config"] = "parquet"
+        if self.options.parquet:
+            self.cpp_info.components["libparquet"].set_property("pkg_config_name", "parquet")
+            self.cpp_info.components["libparquet"].libs = [f"parquet{suffix}"]
             self.cpp_info.components["libparquet"].requires = ["libarrow"]
             if not self.options.shared:
                 self.cpp_info.components["libparquet"].defines = ["PARQUET_STATIC"]
 
-        if self.options.get_safe("substrait", False):
-            self.cpp_info.components["libarrow_substrait"].libs = [self._lib_name("arrow_substrait")]
-            self.cpp_info.components["libarrow_substrait"].names["cmake_find_package"] = "arrow_substrait"
-            self.cpp_info.components["libarrow_substrait"].names["cmake_find_package_multi"] = "arrow_substrait"
-            self.cpp_info.components["libarrow_substrait"].names["pkg_config"] = "arrow_substrait"
-            self.cpp_info.components["libarrow_substrait"].requires = ["libparquet", "dataset", "acero"]
+        if self.options.get_safe("substrait"):
+            self.cpp_info.components["libarrow_substrait"].set_property("pkg_config_name", "arrow_substrait")
+            self.cpp_info.components["libarrow_substrait"].libs = [f"arrow_substrait{suffix}"]
+            self.cpp_info.components["libarrow_substrait"].requires = ["libparquet", "dataset"]
+
+        # Plasma was deprecated in Arrow 12.0.0
+        del self.options.plasma
 
-        if self._plasma():
-            self.cpp_info.components["libplasma"].libs = [self._lib_name("plasma")]
-            self.cpp_info.components["libplasma"].names["cmake_find_package"] = "plasma"
-            self.cpp_info.components["libplasma"].names["cmake_find_package_multi"] = "plasma"
-            self.cpp_info.components["libplasma"].names["pkg_config"] = "plasma"
-            self.cpp_info.components["libplasma"].requires = ["libarrow"]
+        if self.options.acero:
+            self.cpp_info.components["libacero"].libs = [f"arrow_acero{suffix}"]
+            self.cpp_info.components["libacero"].names["cmake_find_package"] = "acero"
+            self.cpp_info.components["libacero"].names["cmake_find_package_multi"] = "acero"
+            self.cpp_info.components["libacero"].names["pkg_config"] = "acero"
+            self.cpp_info.components["libacero"].requires = ["libarrow"]
 
         if self.options.gandiva:
-            self.cpp_info.components["libgandiva"].libs = [self._lib_name("gandiva")]
-            self.cpp_info.components["libgandiva"].names["cmake_find_package"] = "gandiva"
-            self.cpp_info.components["libgandiva"].names["cmake_find_package_multi"] = "gandiva"
-            self.cpp_info.components["libgandiva"].names["pkg_config"] = "gandiva"
+            self.cpp_info.components["libgandiva"].set_property("pkg_config_name", "gandiva")
+            self.cpp_info.components["libgandiva"].libs = [f"gandiva{suffix}"]
             self.cpp_info.components["libgandiva"].requires = ["libarrow"]
             if not self.options.shared:
                 self.cpp_info.components["libgandiva"].defines = ["GANDIVA_STATIC"]
 
-        if self._with_flight_rpc():
-            self.cpp_info.components["libarrow_flight"].libs = [self._lib_name("arrow_flight")]
-            self.cpp_info.components["libarrow_flight"].names["cmake_find_package"] = "flight_rpc"
-            self.cpp_info.components["libarrow_flight"].names["cmake_find_package_multi"] = "flight_rpc"
-            self.cpp_info.components["libarrow_flight"].names["pkg_config"] = "flight_rpc"
+        if self.options.with_flight_rpc:
+            self.cpp_info.components["libarrow_flight"].set_property("pkg_config_name", "flight_rpc")
+            self.cpp_info.components["libarrow_flight"].libs = [f"arrow_flight{suffix}"]
             self.cpp_info.components["libarrow_flight"].requires = ["libarrow"]
 
         if self.options.get_safe("with_flight_sql"):
-            self.cpp_info.components["libarrow_flight_sql"].libs = [self._lib_name("arrow_flight_sql")]
-            self.cpp_info.components["libarrow_flight_sql"].names["cmake_find_package"] = "flight_sql"
-            self.cpp_info.components["libarrow_flight_sql"].names["cmake_find_package_multi"] = "flight_sql"
-            self.cpp_info.components["libarrow_flight_sql"].names["pkg_config"] = "flight_sql"
+            self.cpp_info.components["libarrow_flight_sql"].set_property("pkg_config_name", "flight_sql")
+            self.cpp_info.components["libarrow_flight_sql"].libs = [f"arrow_flight_sql{suffix}"]
             self.cpp_info.components["libarrow_flight_sql"].requires = ["libarrow", "libarrow_flight"]
 
-        if self._acero():
-            self.cpp_info.components["acero"].libs = ["arrow_acero"]
-
-        if self._dataset_modules():
+        if self.options.dataset_modules:
             self.cpp_info.components["dataset"].libs = ["arrow_dataset"]
+            if self.options.parquet:
+                self.cpp_info.components["dataset"].requires = ["libparquet"]
 
-        if (self.options.cli and (self.options.with_cuda or self._with_flight_rpc() or self._parquet())) or self._plasma():
+        if self.options.cli and (self.options.with_cuda or self.options.with_flight_rpc or self.options.parquet):
             binpath = os.path.join(self.package_folder, "bin")
             self.output.info(f"Appending PATH env var: {binpath}")
             self.env_info.PATH.append(binpath)
 
-        if self._with_boost():
+        if self.options.with_boost:
             if self.options.gandiva:
                 # FIXME: only filesystem component is used
                 self.cpp_info.components["libgandiva"].requires.append("boost::boost")
-            if self._parquet() and self.settings.compiler == "gcc" and self.settings.compiler.version < Version("4.9"):
+            if self.options.parquet and self.settings.compiler == "gcc" and self.settings.compiler.version < Version("4.9"):
                 self.cpp_info.components["libparquet"].requires.append("boost::boost")
-            if Version(self.version) >= "2.0":
-                # FIXME: only headers components is used
-                self.cpp_info.components["libarrow"].requires.append("boost::boost")
-        if self._with_openssl():
+            # FIXME: only headers components is used
+            self.cpp_info.components["libarrow"].requires.append("boost::boost")
+        if self.options.with_openssl:
             self.cpp_info.components["libarrow"].requires.append("openssl::openssl")
-        if self._with_gflags():
+        if self.options.with_gflags:
             self.cpp_info.components["libarrow"].requires.append("gflags::gflags")
-        if self._with_glog():
+        if self.options.with_glog:
             self.cpp_info.components["libarrow"].requires.append("glog::glog")
-        if self._with_jemalloc():
+        if self.options.with_jemalloc:
             self.cpp_info.components["libarrow"].requires.append("jemalloc::jemalloc")
         if self.options.with_mimalloc:
             self.cpp_info.components["libarrow"].requires.append("mimalloc::mimalloc")
-        if self._with_re2():
+        if self.options.with_re2:
             if self.options.gandiva:
                 self.cpp_info.components["libgandiva"].requires.append("re2::re2")
-            if self._parquet():
+            if self.options.parquet:
                 self.cpp_info.components["libparquet"].requires.append("re2::re2")
             self.cpp_info.components["libarrow"].requires.append("re2::re2")
-        if self._with_llvm():
+        if self.options.with_llvm:
             self.cpp_info.components["libgandiva"].requires.append("llvm-core::llvm-core")
-        if self._with_protobuf():
+        if self.options.with_protobuf:
             self.cpp_info.components["libarrow"].requires.append("protobuf::protobuf")
-        if self._with_utf8proc():
+        if self.options.with_utf8proc:
             self.cpp_info.components["libarrow"].requires.append("utf8proc::utf8proc")
-        if self._with_thrift():
+        if self.options.with_thrift:
             self.cpp_info.components["libarrow"].requires.append("thrift::thrift")
         if self.options.with_backtrace:
             self.cpp_info.components["libarrow"].requires.append("libbacktrace::libbacktrace")
         if self.options.with_cuda:
             self.cpp_info.components["libarrow"].requires.append("cuda::cuda")
-        if self._with_rapidjson():
+        if self._requires_rapidjson():
             self.cpp_info.components["libarrow"].requires.append("rapidjson::rapidjson")
         if self.options.with_s3:
             self.cpp_info.components["libarrow"].requires.append("aws-sdk-cpp::s3")
@@ -742,9 +581,32 @@ def package_info(self):
             self.cpp_info.components["libarrow"].requires.append("zlib::zlib")
         if self.options.with_zstd:
             self.cpp_info.components["libarrow"].requires.append("zstd::zstd")
-        if self._with_boost():
+        if self.options.with_boost:
             self.cpp_info.components["libarrow"].requires.append("boost::boost")
-        if self._with_grpc():
+        if self.options.with_grpc:
             self.cpp_info.components["libarrow"].requires.append("grpc::grpc")
-        if self._with_flight_rpc():
+        if self.options.with_flight_rpc:
             self.cpp_info.components["libarrow_flight"].requires.append("protobuf::protobuf")
+
+        # TODO: to remove in conan v2
+        self.cpp_info.filenames["cmake_find_package"] = "Arrow"
+        self.cpp_info.filenames["cmake_find_package_multi"] = "Arrow"
+        self.cpp_info.components["libarrow"].names["cmake_find_package"] = "arrow"
+        self.cpp_info.components["libarrow"].names["cmake_find_package_multi"] = "arrow"
+        if self.options.parquet:
+            self.cpp_info.components["libparquet"].names["cmake_find_package"] = "parquet"
+            self.cpp_info.components["libparquet"].names["cmake_find_package_multi"] = "parquet"
+        if self.options.get_safe("substrait"):
+            self.cpp_info.components["libarrow_substrait"].names["cmake_find_package"] = "arrow_substrait"
+            self.cpp_info.components["libarrow_substrait"].names["cmake_find_package_multi"] = "arrow_substrait"
+        if self.options.gandiva:
+            self.cpp_info.components["libgandiva"].names["cmake_find_package"] = "gandiva"
+            self.cpp_info.components["libgandiva"].names["cmake_find_package_multi"] = "gandiva"
+        if self.options.with_flight_rpc:
+            self.cpp_info.components["libarrow_flight"].names["cmake_find_package"] = "flight_rpc"
+            self.cpp_info.components["libarrow_flight"].names["cmake_find_package_multi"] = "flight_rpc"
+        if self.options.get_safe("with_flight_sql"):
+            self.cpp_info.components["libarrow_flight_sql"].names["cmake_find_package"] = "flight_sql"
+            self.cpp_info.components["libarrow_flight_sql"].names["cmake_find_package_multi"] = "flight_sql"
+        if self.options.cli and (self.options.with_cuda or self.options.with_flight_rpc or self.options.parquet):
+            self.env_info.PATH.append(os.path.join(self.package_folder, "bin"))
diff --git a/ci/conan/config.yml b/ci/conan/config.yml
index be333447f348c..3fa90be6f669a 100644
--- a/ci/conan/config.yml
+++ b/ci/conan/config.yml
@@ -21,6 +21,22 @@
 # SOFTWARE.
 
 versions:
+  "15.0.0":
+    folder: all
+  "14.0.2":
+    folder: all
+  "14.0.1":
+    folder: all
+  "14.0.0":
+    folder: all
+  "13.0.0":
+    folder: all
+  "12.0.1":
+    folder: all
+  "12.0.0":
+    folder: all
+  "11.0.0":
+    folder: all
   "10.0.1":
     folder: all
   "10.0.0":
@@ -31,7 +47,3 @@ versions:
     folder: all
   "7.0.0":
     folder: all
-  "2.0.0":
-    folder: all
-  "1.0.0":
-    folder: all
diff --git a/ci/conda_env_cpp.txt b/ci/conda_env_cpp.txt
index 52e456eaab0cc..f28a24cac8d2d 100644
--- a/ci/conda_env_cpp.txt
+++ b/ci/conda_env_cpp.txt
@@ -21,7 +21,7 @@ azure-identity-cpp>=1.6.0
 azure-storage-blobs-cpp>=12.10.0
 azure-storage-common-cpp>=12.5.0
 azure-storage-files-datalake-cpp>=12.9.0
-benchmark>=1.6.0
+benchmark>=1.6.0,!=1.8.4
 boost-cpp>=1.68.0
 brotli
 bzip2
diff --git a/ci/conda_env_python.txt b/ci/conda_env_python.txt
index 4366e30010389..bf915493de302 100644
--- a/ci/conda_env_python.txt
+++ b/ci/conda_env_python.txt
@@ -26,5 +26,5 @@ numpy>=1.16.6
 pytest
 pytest-faulthandler
 s3fs>=2023.10.0
-setuptools
-setuptools_scm
+setuptools>=64
+setuptools_scm>=8
diff --git a/ci/conda_env_sphinx.txt b/ci/conda_env_sphinx.txt
index 6899f9c36a7f6..4665a32e24bbe 100644
--- a/ci/conda_env_sphinx.txt
+++ b/ci/conda_env_sphinx.txt
@@ -26,8 +26,13 @@ pydata-sphinx-theme=0.14
 sphinx-autobuild
 sphinx-design
 sphinx-copybutton
+sphinx-lint
 sphinxcontrib-jquery
+sphinxcontrib-mermaid
 sphinx==6.2
 # Requirement for doctest-cython
-pytest-cython
+# Needs upper pin of 0.3.0, see:
+# https://github.com/lgpage/pytest-cython/issues/67
+# With 0.3.* bug fix release, the pin can be removed
+pytest-cython==0.2.2
 pandas
diff --git a/ci/docker/conda-integration.dockerfile b/ci/docker/conda-integration.dockerfile
index a747ccbc7262f..30b9cd5199fab 100644
--- a/ci/docker/conda-integration.dockerfile
+++ b/ci/docker/conda-integration.dockerfile
@@ -56,7 +56,7 @@ RUN wget -nv -O - https://dl.google.com/go/go${go}.linux-${arch}.tar.gz | tar -x
 
 ENV DOTNET_ROOT=/opt/dotnet \
     PATH=/opt/dotnet:$PATH
-RUN curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin -Channel 7.0 -InstallDir /opt/dotnet
+RUN curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin -Channel 8.0 -InstallDir /opt/dotnet
 
 ENV ARROW_ACERO=OFF \
     ARROW_AZURE=OFF \
diff --git a/ci/docker/conda-python-substrait.dockerfile b/ci/docker/conda-python-substrait.dockerfile
index 191795f253000..36dd64e51e7ad 100644
--- a/ci/docker/conda-python-substrait.dockerfile
+++ b/ci/docker/conda-python-substrait.dockerfile
@@ -24,11 +24,19 @@ FROM ${repo}:${arch}-conda-python-${python}
 COPY ci/conda_env_python.txt \
      ci/conda_env_sphinx.txt \
      /arrow/ci/
+
+# Note: openjdk is pinned to 17 because the
+# substrait repo currently pins to jdk 17.
+# Newer jdk versions are currently failing
+# due to the recent upgrade to Gradle 8 via
+# install_substrait_consumer.sh.
+# https://github.com/substrait-io/substrait-java/issues/274
 RUN mamba install -q -y \
         --file arrow/ci/conda_env_python.txt \
         --file arrow/ci/conda_env_sphinx.txt \
         $([ "$python" == "3.9" ] && echo "pickle5") \
-        python=${python} openjdk \
+        python=${python} \
+        openjdk=17 \
         nomkl && \
     mamba clean --all
 
diff --git a/ci/docker/debian-12-cpp.dockerfile b/ci/docker/debian-12-cpp.dockerfile
index 7036ddf27d52a..d7a6f9df2c2ee 100644
--- a/ci/docker/debian-12-cpp.dockerfile
+++ b/ci/docker/debian-12-cpp.dockerfile
@@ -119,7 +119,6 @@ ENV ARROW_ACERO=ON \
     ARROW_GANDIVA=ON \
     ARROW_GCS=ON \
     ARROW_HOME=/usr/local \
-    ARROW_NO_DEPRECATED_API=ON \
     ARROW_ORC=ON \
     ARROW_PARQUET=ON \
     ARROW_S3=ON \
diff --git a/ci/docker/linux-apt-docs.dockerfile b/ci/docker/linux-apt-docs.dockerfile
index 76b5ae6f14363..1c916840e071b 100644
--- a/ci/docker/linux-apt-docs.dockerfile
+++ b/ci/docker/linux-apt-docs.dockerfile
@@ -18,21 +18,37 @@
 ARG base
 FROM ${base}
 
-ARG r=4.2
+ARG r=4.4
 ARG jdk=8
 
-# See R install instructions at https://cloud.r-project.org/bin/linux/ubuntu/
+ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
+
+# See R install instructions at https://cloud.r-project.org/bin/linux/
 RUN apt-get update -y && \
     apt-get install -y \
-        dirmngr \
         apt-transport-https \
-        software-properties-common && \
-    wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | \
-        tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc && \
-    add-apt-repository 'deb https://cloud.r-project.org/bin/linux/ubuntu '$(lsb_release -cs)'-cran40/' && \
+        dirmngr \
+        gpg \
+        lsb-release && \
+    gpg --keyserver keyserver.ubuntu.com \
+        --recv-key 95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7 && \
+    gpg --export 95C0FAF38DB3CCAD0C080A7BDC78B2DDEABC47B7 | \
+        gpg --no-default-keyring \
+            --keyring /usr/share/keyrings/cran.gpg \
+            --import - && \
+    echo "deb [signed-by=/usr/share/keyrings/cran.gpg] https://cloud.r-project.org/bin/linux/$(lsb_release -is | tr 'A-Z' 'a-z') $(lsb_release -cs)-cran40/" | \
+        tee /etc/apt/sources.list.d/cran.list && \
+    if [ -f /etc/apt/sources.list.d/debian.sources ]; then \
+        sed -i \
+            -e 's/main$/main contrib non-free non-free-firmware/g' \
+            /etc/apt/sources.list.d/debian.sources; \
+    fi && \
+    apt-get update -y && \
     apt-get install -y --no-install-recommends \
         autoconf-archive \
         automake \
+        chromium \
+        chromium-sandbox \
         curl \
         doxygen \
         gi-docgen \
@@ -48,6 +64,8 @@ RUN apt-get update -y && \
         libxml2-dev \
         meson \
         ninja-build \
+        nodejs \
+        npm \
         nvidia-cuda-toolkit \
         openjdk-${jdk}-jdk-headless \
         pandoc \
@@ -55,9 +73,12 @@ RUN apt-get update -y && \
         r-base=${r}* \
         rsync \
         ruby-dev \
+        sudo \
         wget && \
     apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/* && \
+    PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
+       npm install -g yarn @mermaid-js/mermaid-cli
 
 ENV JAVA_HOME=/usr/lib/jvm/java-${jdk}-openjdk-amd64
 
@@ -68,20 +89,6 @@ RUN /arrow/ci/scripts/util_download_apache.sh \
 ENV PATH=/opt/apache-maven-${maven}/bin:$PATH
 RUN mvn -version
 
-ARG node=16
-RUN apt-get purge -y npm && \
-    apt-get autoremove -y --purge && \
-    wget -q -O - https://deb.nodesource.com/setup_${node}.x | bash - && \
-    apt-get install -y nodejs && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* && \
-    npm install -g yarn
-
-COPY docs/requirements.txt /arrow/docs/
-RUN python3 -m venv ${ARROW_PYTHON_VENV} && \
-    . ${ARROW_PYTHON_VENV}/bin/activate && \
-    pip install -r arrow/docs/requirements.txt
-
 COPY c_glib/Gemfile /arrow/c_glib/
 RUN gem install --no-document bundler && \
     bundle install --gemfile /arrow/c_glib/Gemfile
@@ -98,6 +105,17 @@ COPY r/DESCRIPTION /arrow/r/
 RUN /arrow/ci/scripts/r_deps.sh /arrow && \
     R -e "install.packages('pkgdown')"
 
+RUN useradd --user-group --create-home --groups audio,video arrow
+RUN echo "arrow ALL=(ALL:ALL) NOPASSWD:ALL" | \
+        EDITOR=tee visudo -f /etc/sudoers.d/arrow
+USER arrow
+
+COPY docs/requirements.txt /arrow/docs/
+RUN sudo chown -R arrow: ${ARROW_PYTHON_VENV} && \
+    python3 -m venv ${ARROW_PYTHON_VENV} && \
+    . ${ARROW_PYTHON_VENV}/bin/activate && \
+    pip install -r arrow/docs/requirements.txt
+
 ENV ARROW_ACERO=ON \
     ARROW_AZURE=OFF \
     ARROW_BUILD_STATIC=OFF \
diff --git a/ci/docker/linux-apt-lint.dockerfile b/ci/docker/linux-apt-lint.dockerfile
index 2b94a48871847..9ec80440a3c21 100644
--- a/ci/docker/linux-apt-lint.dockerfile
+++ b/ci/docker/linux-apt-lint.dockerfile
@@ -40,7 +40,7 @@ RUN apt-get update && \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-ARG r=4.2
+ARG r=4.4
 RUN wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | \
         tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc && \
     # NOTE: Only R >= 4.0 is available in this repo
diff --git a/ci/docker/linux-apt-r.dockerfile b/ci/docker/linux-apt-r.dockerfile
index c59766c4a665c..630b96e1007b9 100644
--- a/ci/docker/linux-apt-r.dockerfile
+++ b/ci/docker/linux-apt-r.dockerfile
@@ -27,10 +27,15 @@ ENV R_PRUNE_DEPS=${r_prune_deps}
 ARG r_duckdb_dev=FALSE
 ENV R_DUCKDB_DEV=${r_duckdb_dev}
 
+# This is needed to avoid errors with utf8 characters in some
+# R package's DESCRIPTION files
+# https://github.com/statnmap/HatchedPolygons/issues/4
+ENV LANG=C.UTF-8
+
 # Build R
 # [1] https://www.digitalocean.com/community/tutorials/how-to-install-r-on-ubuntu-18-04
 # [2] https://linuxize.com/post/how-to-install-r-on-ubuntu-18-04/#installing-r-packages-from-cran
-ARG r=3.6
+ARG r=4.4
 RUN apt-get update -y && \
     apt-get install -y \
         dirmngr \
@@ -108,7 +113,6 @@ ENV \
     ARROW_GANDIVA=OFF \
     ARROW_HDFS=OFF \
     ARROW_JSON=ON \
-    ARROW_NO_DEPRECATED_API=ON \
     ARROW_ORC=OFF \
     ARROW_PARQUET=ON \
     ARROW_S3=ON \
diff --git a/ci/docker/linux-r.dockerfile b/ci/docker/linux-r.dockerfile
index d368a6629c587..7b7e989adc0d1 100644
--- a/ci/docker/linux-r.dockerfile
+++ b/ci/docker/linux-r.dockerfile
@@ -27,9 +27,6 @@ ENV R_BIN=${r_bin}
 ARG r_dev=FALSE
 ENV ARROW_R_DEV=${r_dev}
 
-ARG devtoolset_version=
-ENV DEVTOOLSET_VERSION=${devtoolset_version}
-
 ARG r_prune_deps=FALSE
 ENV R_PRUNE_DEPS=${r_prune_deps}
 
diff --git a/ci/docker/python-wheel-manylinux.dockerfile b/ci/docker/python-wheel-manylinux.dockerfile
index b1d9ed5ab88d9..68d4b27d2ca96 100644
--- a/ci/docker/python-wheel-manylinux.dockerfile
+++ b/ci/docker/python-wheel-manylinux.dockerfile
@@ -39,8 +39,7 @@ ENV CPYTHON_VERSION=cp38
 ENV PATH=/opt/python/${CPYTHON_VERSION}-${CPYTHON_VERSION}/bin:${PATH}
 
 # Install CMake
-# AWS SDK doesn't work with CMake=3.22 due to https://gitlab.kitware.com/cmake/cmake/-/issues/22524
-ARG cmake=3.21.4
+ARG cmake=3.29.2
 COPY ci/scripts/install_cmake.sh arrow/ci/scripts/
 RUN /arrow/ci/scripts/install_cmake.sh ${arch} linux ${cmake} /usr/local
 
@@ -99,5 +98,4 @@ SHELL ["/bin/bash", "-i", "-c"]
 ENTRYPOINT ["/bin/bash", "-i", "-c"]
 
 COPY python/requirements-wheel-build.txt /arrow/python/
-# TODO(GH-39848) Remove the `--pre --extra-index-url` for numpy nightly again before the 16.0 release 
-RUN pip install -r /arrow/python/requirements-wheel-build.txt --pre --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
+RUN pip install -r /arrow/python/requirements-wheel-build.txt
diff --git a/ci/docker/python-wheel-windows-test-vs2019.dockerfile b/ci/docker/python-wheel-windows-test-vs2019.dockerfile
index 819324a74e12a..32bbb55e82689 100644
--- a/ci/docker/python-wheel-windows-test-vs2019.dockerfile
+++ b/ci/docker/python-wheel-windows-test-vs2019.dockerfile
@@ -22,6 +22,8 @@
 # contains choco and vs2019 preinstalled
 FROM abrarov/msvc-2019:2.11.0
 
+# hadolint shell=cmd.exe
+
 # Add unix tools to path
 RUN setx path "%path%;C:\Program Files\Git\usr\bin"
 
@@ -40,8 +42,8 @@ RUN (if "%python%"=="3.8" setx PYTHON_VERSION "3.8.10" && setx PATH "%PATH%;C:\P
     (if "%python%"=="3.10" setx PYTHON_VERSION "3.10.11" && setx PATH "%PATH%;C:\Python310;C:\Python310\Scripts") & \
     (if "%python%"=="3.11" setx PYTHON_VERSION "3.11.5" && setx PATH "%PATH%;C:\Python311;C:\Python311\Scripts") & \
     (if "%python%"=="3.12" setx PYTHON_VERSION "3.12.0" && setx PATH "%PATH%;C:\Python312;C:\Python312\Scripts")
-RUN choco install -r -y --no-progress python --version=%PYTHON_VERSION%
-RUN python -m pip install -U pip setuptools
 
 # Install archiver to extract xz archives
-RUN choco install --no-progress -r -y archiver
+RUN choco install -r -y --no-progress python --version=%PYTHON_VERSION% & \
+    python -m pip install --no-cache-dir -U pip setuptools & \
+    choco install --no-progress -r -y archiver
diff --git a/ci/docker/python-wheel-windows-vs2019.dockerfile b/ci/docker/python-wheel-windows-vs2019.dockerfile
index 0ab5071abb86c..ff42de939d91f 100644
--- a/ci/docker/python-wheel-windows-vs2019.dockerfile
+++ b/ci/docker/python-wheel-windows-vs2019.dockerfile
@@ -89,8 +89,7 @@ RUN choco install -r -y --no-progress python --version=%PYTHON_VERSION%
 RUN python -m pip install -U pip setuptools
 
 COPY python/requirements-wheel-build.txt arrow/python/
-# TODO(GH-39848) Remove the `--pre --extra-index-url` for numpy nightly again before the 16.0 release 
-RUN python -m pip install -r arrow/python/requirements-wheel-build.txt --pre --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
+RUN python -m pip install -r arrow/python/requirements-wheel-build.txt
 
 # ENV CLCACHE_DIR="C:\clcache"
 # ENV CLCACHE_COMPRESS=1
diff --git a/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile b/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile
index ae2ba9421cd55..e17c0306f115d 100644
--- a/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile
+++ b/ci/docker/ubuntu-20.04-cpp-minimal.dockerfile
@@ -85,7 +85,6 @@ ENV ARROW_ACERO=ON \
     ARROW_HDFS=ON \
     ARROW_HOME=/usr/local \
     ARROW_INSTALL_NAME_RPATH=OFF \
-    ARROW_NO_DEPRECATED_API=ON \
     ARROW_ORC=ON \
     ARROW_PARQUET=ON \
     ARROW_S3=ON \
diff --git a/ci/docker/ubuntu-20.04-cpp.dockerfile b/ci/docker/ubuntu-20.04-cpp.dockerfile
index 3e3b7ac3a6d99..d78c7a99cf4d6 100644
--- a/ci/docker/ubuntu-20.04-cpp.dockerfile
+++ b/ci/docker/ubuntu-20.04-cpp.dockerfile
@@ -101,6 +101,7 @@ RUN apt-get update -y -q && \
         libutf8proc-dev \
         libxml2-dev \
         libzstd-dev \
+        lld \
         make \
         ninja-build \
         nlohmann-json3-dev \
@@ -157,13 +158,13 @@ ENV absl_SOURCE=BUNDLED \
     ARROW_HDFS=ON \
     ARROW_HOME=/usr/local \
     ARROW_INSTALL_NAME_RPATH=OFF \
-    ARROW_NO_DEPRECATED_API=ON \
     ARROW_ORC=ON \
     ARROW_PARQUET=ON \
     ARROW_S3=ON \
     ARROW_SUBSTRAIT=ON \
     ARROW_USE_ASAN=OFF \
     ARROW_USE_CCACHE=ON \
+    ARROW_USE_LLD=ON \
     ARROW_USE_UBSAN=OFF \
     ARROW_WITH_BROTLI=ON \
     ARROW_WITH_BZ2=ON \
diff --git a/ci/docker/ubuntu-22.04-cpp-minimal.dockerfile b/ci/docker/ubuntu-22.04-cpp-minimal.dockerfile
index dd887a6d00ceb..341d8a87e8661 100644
--- a/ci/docker/ubuntu-22.04-cpp-minimal.dockerfile
+++ b/ci/docker/ubuntu-22.04-cpp-minimal.dockerfile
@@ -85,7 +85,6 @@ ENV ARROW_ACERO=ON \
     ARROW_HDFS=ON \
     ARROW_HOME=/usr/local \
     ARROW_INSTALL_NAME_RPATH=OFF \
-    ARROW_NO_DEPRECATED_API=ON \
     ARROW_ORC=ON \
     ARROW_PARQUET=ON \
     ARROW_S3=ON \
diff --git a/ci/docker/ubuntu-22.04-cpp.dockerfile b/ci/docker/ubuntu-22.04-cpp.dockerfile
index e8416c1378a9a..f12e7456add8e 100644
--- a/ci/docker/ubuntu-22.04-cpp.dockerfile
+++ b/ci/docker/ubuntu-22.04-cpp.dockerfile
@@ -65,6 +65,7 @@ RUN latest_system_llvm=14 && \
 RUN apt-get update -y -q && \
     apt-get install -y -q --no-install-recommends \
         autoconf \
+        bzip2 \
         ca-certificates \
         ccache \
         cmake \
@@ -115,10 +116,20 @@ RUN apt-get update -y -q && \
         rapidjson-dev \
         rsync \
         tzdata \
-        wget && \
+        wget \
+        xz-utils && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists*
 
+# install emscripten using EMSDK
+ARG emscripten_version="3.1.45"
+RUN cd ~ && git clone https://github.com/emscripten-core/emsdk.git && \
+    cd emsdk && \
+    ./emsdk install ${emscripten_version} && \
+    ./emsdk activate ${emscripten_version} && \
+    echo "Installed emsdk to:" ~/emsdk
+
+
 ARG gcc_version=""
 RUN if [ "${gcc_version}" = "" ]; then \
       apt-get update -y -q && \
@@ -151,6 +162,9 @@ RUN if [ "${gcc_version}" = "" ]; then \
       update-alternatives --set c++ /usr/bin/g++; \
     fi
 
+# make sure zlib is cached in the EMSDK folder
+RUN source ~/emsdk/emsdk_env.sh && embuilder --pic build zlib
+
 COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
 RUN /arrow/ci/scripts/install_minio.sh latest /usr/local
 
@@ -182,7 +196,6 @@ ENV absl_SOURCE=BUNDLED \
     ARROW_HDFS=ON \
     ARROW_HOME=/usr/local \
     ARROW_INSTALL_NAME_RPATH=OFF \
-    ARROW_NO_DEPRECATED_API=ON \
     ARROW_ORC=ON \
     ARROW_PARQUET=ON \
     ARROW_S3=ON \
diff --git a/ci/docker/ubuntu-22.04-csharp.dockerfile b/ci/docker/ubuntu-22.04-csharp.dockerfile
index aebbd8fab74e9..4d77ba060b877 100644
--- a/ci/docker/ubuntu-22.04-csharp.dockerfile
+++ b/ci/docker/ubuntu-22.04-csharp.dockerfile
@@ -16,7 +16,7 @@
 # under the License.
 
 ARG arch=amd64
-ARG dotnet=7.0
+ARG dotnet=8.0
 ARG platform=jammy
 FROM mcr.microsoft.com/dotnet/sdk:${dotnet}-${platform}-${arch}
 
diff --git a/ci/docker/ubuntu-24.04-cpp.dockerfile b/ci/docker/ubuntu-24.04-cpp.dockerfile
index 629d532a3dc76..ecfb5e2f5096d 100644
--- a/ci/docker/ubuntu-24.04-cpp.dockerfile
+++ b/ci/docker/ubuntu-24.04-cpp.dockerfile
@@ -29,7 +29,7 @@ RUN echo "debconf debconf/frontend select Noninteractive" | \
 # while debugging package list with docker build.
 ARG clang_tools
 ARG llvm
-RUN latest_system_llvm=14 && \
+RUN latest_system_llvm=18 && \
     if [ ${llvm} -gt ${latest_system_llvm} -o \
          ${clang_tools} -gt ${latest_system_llvm} ]; then \
       apt-get update -y -q && \
@@ -127,7 +127,7 @@ RUN if [ "${gcc_version}" = "" ]; then \
           g++ \
           gcc; \
     else \
-      if [ "${gcc_version}" -gt "12" ]; then \
+      if [ "${gcc_version}" -gt "14" ]; then \
           apt-get update -y -q && \
           apt-get install -y -q --no-install-recommends software-properties-common && \
           add-apt-repository ppa:ubuntu-toolchain-r/volatile; \
@@ -178,7 +178,6 @@ ENV ARROW_ACERO=ON \
     ARROW_HDFS=ON \
     ARROW_HOME=/usr/local \
     ARROW_INSTALL_NAME_RPATH=OFF \
-    ARROW_NO_DEPRECATED_API=ON \
     ARROW_ORC=ON \
     ARROW_PARQUET=ON \
     ARROW_S3=ON \
diff --git a/ci/docker/ubuntu-swift.dockerfile b/ci/docker/ubuntu-swift.dockerfile
index 4789c9188c226..26950b806d1bc 100644
--- a/ci/docker/ubuntu-swift.dockerfile
+++ b/ci/docker/ubuntu-swift.dockerfile
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM swift:5.7.3
+FROM swift:5.9.0
 
 # Go is needed for generating test data
 RUN apt-get update -y -q && \
diff --git a/ci/etc/valgrind-cran.supp b/ci/etc/valgrind-cran.supp
index 4d29220260823..e93c2a3465f79 100644
--- a/ci/etc/valgrind-cran.supp
+++ b/ci/etc/valgrind-cran.supp
@@ -16,7 +16,7 @@
 # under the License.
 
 {
-   # `testthat::skip()`s cause a valgrind error that does not show up on CRAN. 
+   # `testthat::skip()`s cause a valgrind error that does not show up on CRAN.
    <testthat_skip_error>
    Memcheck:Cond
    fun:gregexpr_Regexc
@@ -32,3 +32,21 @@
    fun:getvar
    fun:bcEval
 }
+{
+   # This also doesn't seem to cause issues on CRAN, so suppress it.
+   <Memcheck_possible_leak>
+   Memcheck:Leak
+   match-leak-kinds: possible
+   fun:malloc
+   fun:libdeflate_alloc_compressor
+   fun:do_memCompress
+   fun:bcEval_loop
+   fun:bcEval
+   fun:Rf_eval
+   fun:R_execClosure
+   fun:applyClosure_core
+   fun:Rf_applyClosure
+   fun:Rf_eval
+   fun:do_set
+   fun:Rf_eval
+}
diff --git a/ci/scripts/PKGBUILD b/ci/scripts/PKGBUILD
index dfdf90501f49c..f6bbc78be710e 100644
--- a/ci/scripts/PKGBUILD
+++ b/ci/scripts/PKGBUILD
@@ -18,7 +18,7 @@
 _realname=arrow
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=15.0.2.9000
+pkgver=16.1.0.9000
 pkgrel=8000
 pkgdesc="Apache Arrow is a cross-language development platform for in-memory data (mingw-w64)"
 arch=("any")
diff --git a/ci/scripts/c_glib_build.sh b/ci/scripts/c_glib_build.sh
index c4d2c4fdb5617..059e45e2a1386 100755
--- a/ci/scripts/c_glib_build.sh
+++ b/ci/scripts/c_glib_build.sh
@@ -28,17 +28,42 @@ build_root=${2}
 : ${BUILD_DOCS_C_GLIB:=OFF}
 with_doc=$([ "${BUILD_DOCS_C_GLIB}" == "ON" ] && echo "true" || echo "false")
 
-export PKG_CONFIG_PATH=${ARROW_HOME}/lib/pkgconfig
 
-export CFLAGS="-DARROW_NO_DEPRECATED_API"
-export CXXFLAGS="-DARROW_NO_DEPRECATED_API"
+if [ -n "${MSYSTEM:-}" ]; then
+  # Fix ARROW_HOME when running under MSYS2
+  export ARROW_HOME="$(cygpath --unix "${ARROW_HOME}")"
+fi
+
+export PATH="${ARROW_HOME}/bin:${PATH}"
+
+meson_pkg_config_path="${ARROW_HOME}/lib/pkgconfig"
 
 mkdir -p ${build_dir}
 
+if [ -n "${VCPKG_ROOT:-}" -a -n "${VCPKG_TRIPLET:-}" ]; then
+  vcpkg_install_root="${build_root}/vcpkg_installed"
+  $VCPKG_ROOT/vcpkg install --x-manifest-root=${source_dir} --x-install-root=${vcpkg_install_root}
+  export PKG_CONFIG="${vcpkg_install_root}/${VCPKG_TRIPLET}/tools/pkgconf/pkgconf.exe"
+  meson_pkg_config_path="${vcpkg_install_root}/${VCPKG_TRIPLET}/lib/pkgconfig:${meson_pkg_config_path}"
+  # Configure PATH for libraries required by the gobject-introspection generated binary
+  cpp_vcpkg_install_root="${build_root}/cpp/vcpkg_installed"
+  PATH="${cpp_vcpkg_install_root}/${VCPKG_TRIPLET}/debug/bin:${PATH}"
+  PATH="${cpp_vcpkg_install_root}/${VCPKG_TRIPLET}/bin:${PATH}"
+  export PATH="${vcpkg_install_root}/${VCPKG_TRIPLET}/bin:${PATH}"
+fi
+
+if [ -n "${VCToolsInstallDir:-}" -a -n "${MSYSTEM:-}" ]; then
+  # Meson finds the gnu link.exe instead of MSVC link.exe when running in MSYS2/git bash,
+  # so we need to make sure the MSCV link.exe is first in $PATH
+  export PATH="$(cygpath --unix "${VCToolsInstallDir}")/bin/HostX64/x64:${PATH}"
+fi
+
 # Build with Meson
 meson setup \
+      --backend=ninja \
       --prefix=$ARROW_HOME \
       --libdir=lib \
+      --pkg-config-path="${meson_pkg_config_path}" \
       -Ddoc=${with_doc} \
       -Dvapi=${ARROW_GLIB_VAPI} \
       -Dwerror=${ARROW_GLIB_WERROR} \
diff --git a/ci/scripts/c_glib_test.sh b/ci/scripts/c_glib_test.sh
index f8083c7759d8a..02753872dcb2d 100755
--- a/ci/scripts/c_glib_test.sh
+++ b/ci/scripts/c_glib_test.sh
@@ -24,6 +24,7 @@ build_dir=${2}/c_glib
 
 : ${ARROW_GLIB_VAPI:=true}
 
+export DYLD_LIBRARY_PATH=${ARROW_HOME}/lib:${DYLD_LIBRARY_PATH}
 export LD_LIBRARY_PATH=${ARROW_HOME}/lib:${LD_LIBRARY_PATH}
 export PKG_CONFIG_PATH=${ARROW_HOME}/lib/pkgconfig
 export GI_TYPELIB_PATH=${ARROW_HOME}/lib/girepository-1.0
diff --git a/ci/scripts/conan_build.sh b/ci/scripts/conan_build.sh
index b1ee0a8fc2afd..0ea3fc29192dd 100755
--- a/ci/scripts/conan_build.sh
+++ b/ci/scripts/conan_build.sh
@@ -30,34 +30,39 @@ export CONAN_HOOK_ERROR_LEVEL=40
 conan_args=()
 conan_args+=(--build=missing)
 if [ -n "${ARROW_CONAN_PARQUET:-}" ]; then
-  conan_args+=(--options arrow:parquet=${ARROW_CONAN_PARQUET})
+  conan_args+=(--options arrow/*:parquet=${ARROW_CONAN_PARQUET})
+  conan_args+=(--options arrow/*:with_thrift=${ARROW_CONAN_PARQUET})
+  conan_args+=(--options arrow/*:with_boost=${ARROW_CONAN_PARQUET})
 fi
 if [ -n "${ARROW_CONAN_WITH_BROTLI:-}" ]; then
-  conan_args+=(--options arrow:with_brotli=${ARROW_CONAN_WITH_BROTLI})
+  conan_args+=(--options arrow/*:with_brotli=${ARROW_CONAN_WITH_BROTLI})
 fi
 if [ -n "${ARROW_CONAN_WITH_BZ2:-}" ]; then
-  conan_args+=(--options arrow:with_bz2=${ARROW_CONAN_WITH_BZ2})
+  conan_args+=(--options arrow/*:with_bz2=${ARROW_CONAN_WITH_BZ2})
 fi
 if [ -n "${ARROW_CONAN_WITH_FLIGHT_RPC:-}" ]; then
-  conan_args+=(--options arrow:with_flight_rpc=${ARROW_CONAN_WITH_FLIGHT_RPC})
+  conan_args+=(--options arrow/*:with_flight_rpc=${ARROW_CONAN_WITH_FLIGHT_RPC})
+  conan_args+=(--options arrow/*:with_grpc=${ARROW_CONAN_WITH_FLIGHT_RPC})
+  conan_args+=(--options arrow/*:with_protobuf=${ARROW_CONAN_WITH_FLIGHT_RPC})
+  conan_args+=(--options arrow/*:with_re2=${ARROW_CONAN_WITH_FLIGHT_RPC})
 fi
 if [ -n "${ARROW_CONAN_WITH_GLOG:-}" ]; then
-  conan_args+=(--options arrow:with_glog=${ARROW_CONAN_WITH_GLOG})
+  conan_args+=(--options arrow/*:with_glog=${ARROW_CONAN_WITH_GLOG})
 fi
 if [ -n "${ARROW_CONAN_WITH_JEMALLOC:-}" ]; then
-  conan_args+=(--options arrow:with_jemalloc=${ARROW_CONAN_WITH_JEMALLOC})
+  conan_args+=(--options arrow/*:with_jemalloc=${ARROW_CONAN_WITH_JEMALLOC})
 fi
 if [ -n "${ARROW_CONAN_WITH_JSON:-}" ]; then
-  conan_args+=(--options arrow:with_json=${ARROW_CONAN_WITH_JSON})
+  conan_args+=(--options arrow/*:with_json=${ARROW_CONAN_WITH_JSON})
 fi
 if [ -n "${ARROW_CONAN_WITH_LZ4:-}" ]; then
-  conan_args+=(--options arrow:with_lz4=${ARROW_CONAN_WITH_LZ4})
+  conan_args+=(--options arrow/*:with_lz4=${ARROW_CONAN_WITH_LZ4})
 fi
 if [ -n "${ARROW_CONAN_WITH_SNAPPY:-}" ]; then
-  conan_args+=(--options arrow:with_snappy=${ARROW_CONAN_WITH_SNAPPY})
+  conan_args+=(--options arrow/*:with_snappy=${ARROW_CONAN_WITH_SNAPPY})
 fi
 if [ -n "${ARROW_CONAN_WITH_ZSTD:-}" ]; then
-  conan_args+=(--options arrow:with_zstd=${ARROW_CONAN_WITH_ZSTD})
+  conan_args+=(--options arrow/*:with_zstd=${ARROW_CONAN_WITH_ZSTD})
 fi
 
 version=$(grep '^set(ARROW_VERSION ' ${ARROW_HOME}/cpp/CMakeLists.txt | \
diff --git a/ci/scripts/cpp_build.sh b/ci/scripts/cpp_build.sh
index 1e09924a5e576..3ee7fbd9d19cd 100755
--- a/ci/scripts/cpp_build.sh
+++ b/ci/scripts/cpp_build.sh
@@ -92,112 +92,134 @@ esac
 mkdir -p ${build_dir}
 pushd ${build_dir}
 
-cmake \
-  -Dabsl_SOURCE=${absl_SOURCE:-} \
-  -DARROW_ACERO=${ARROW_ACERO:-OFF} \
-  -DARROW_AZURE=${ARROW_AZURE:-OFF} \
-  -DARROW_BOOST_USE_SHARED=${ARROW_BOOST_USE_SHARED:-ON} \
-  -DARROW_BUILD_BENCHMARKS_REFERENCE=${ARROW_BUILD_BENCHMARKS:-OFF} \
-  -DARROW_BUILD_BENCHMARKS=${ARROW_BUILD_BENCHMARKS:-OFF} \
-  -DARROW_BUILD_EXAMPLES=${ARROW_BUILD_EXAMPLES:-OFF} \
-  -DARROW_BUILD_INTEGRATION=${ARROW_BUILD_INTEGRATION:-OFF} \
-  -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED:-ON} \
-  -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC:-ON} \
-  -DARROW_BUILD_TESTS=${ARROW_BUILD_TESTS:-OFF} \
-  -DARROW_BUILD_UTILITIES=${ARROW_BUILD_UTILITIES:-ON} \
-  -DARROW_COMPUTE=${ARROW_COMPUTE:-ON} \
-  -DARROW_CSV=${ARROW_CSV:-ON} \
-  -DARROW_CUDA=${ARROW_CUDA:-OFF} \
-  -DARROW_CXXFLAGS=${ARROW_CXXFLAGS:-} \
-  -DARROW_CXX_FLAGS_DEBUG="${ARROW_CXX_FLAGS_DEBUG:-}" \
-  -DARROW_CXX_FLAGS_RELEASE="${ARROW_CXX_FLAGS_RELEASE:-}" \
-  -DARROW_CXX_FLAGS_RELWITHDEBINFO="${ARROW_CXX_FLAGS_RELWITHDEBINFO:-}" \
-  -DARROW_C_FLAGS_DEBUG="${ARROW_C_FLAGS_DEBUG:-}" \
-  -DARROW_C_FLAGS_RELEASE="${ARROW_C_FLAGS_RELEASE:-}" \
-  -DARROW_C_FLAGS_RELWITHDEBINFO="${ARROW_C_FLAGS_RELWITHDEBINFO:-}" \
-  -DARROW_DATASET=${ARROW_DATASET:-OFF} \
-  -DARROW_DEPENDENCY_SOURCE=${ARROW_DEPENDENCY_SOURCE:-AUTO} \
-  -DARROW_ENABLE_THREADING=${ARROW_ENABLE_THREADING:-ON} \
-  -DARROW_ENABLE_TIMING_TESTS=${ARROW_ENABLE_TIMING_TESTS:-ON} \
-  -DARROW_EXTRA_ERROR_CONTEXT=${ARROW_EXTRA_ERROR_CONTEXT:-OFF} \
-  -DARROW_FILESYSTEM=${ARROW_FILESYSTEM:-ON} \
-  -DARROW_FLIGHT=${ARROW_FLIGHT:-OFF} \
-  -DARROW_FLIGHT_SQL=${ARROW_FLIGHT_SQL:-OFF} \
-  -DARROW_FUZZING=${ARROW_FUZZING:-OFF} \
-  -DARROW_GANDIVA_PC_CXX_FLAGS=${ARROW_GANDIVA_PC_CXX_FLAGS:-} \
-  -DARROW_GANDIVA=${ARROW_GANDIVA:-OFF} \
-  -DARROW_GCS=${ARROW_GCS:-OFF} \
-  -DARROW_HDFS=${ARROW_HDFS:-ON} \
-  -DARROW_INSTALL_NAME_RPATH=${ARROW_INSTALL_NAME_RPATH:-ON} \
-  -DARROW_JEMALLOC=${ARROW_JEMALLOC:-ON} \
-  -DARROW_JSON=${ARROW_JSON:-ON} \
-  -DARROW_LARGE_MEMORY_TESTS=${ARROW_LARGE_MEMORY_TESTS:-OFF} \
-  -DARROW_MIMALLOC=${ARROW_MIMALLOC:-OFF} \
-  -DARROW_NO_DEPRECATED_API=${ARROW_NO_DEPRECATED_API:-OFF} \
-  -DARROW_ORC=${ARROW_ORC:-OFF} \
-  -DARROW_PARQUET=${ARROW_PARQUET:-OFF} \
-  -DARROW_RUNTIME_SIMD_LEVEL=${ARROW_RUNTIME_SIMD_LEVEL:-MAX} \
-  -DARROW_S3=${ARROW_S3:-OFF} \
-  -DARROW_SIMD_LEVEL=${ARROW_SIMD_LEVEL:-DEFAULT} \
-  -DARROW_SKYHOOK=${ARROW_SKYHOOK:-OFF} \
-  -DARROW_SUBSTRAIT=${ARROW_SUBSTRAIT:-OFF} \
-  -DARROW_TEST_LINKAGE=${ARROW_TEST_LINKAGE:-shared} \
-  -DARROW_TEST_MEMCHECK=${ARROW_TEST_MEMCHECK:-OFF} \
-  -DARROW_USE_ASAN=${ARROW_USE_ASAN:-OFF} \
-  -DARROW_USE_CCACHE=${ARROW_USE_CCACHE:-ON} \
-  -DARROW_USE_GLOG=${ARROW_USE_GLOG:-OFF} \
-  -DARROW_USE_LD_GOLD=${ARROW_USE_LD_GOLD:-OFF} \
-  -DARROW_USE_MOLD=${ARROW_USE_MOLD:-OFF} \
-  -DARROW_USE_PRECOMPILED_HEADERS=${ARROW_USE_PRECOMPILED_HEADERS:-OFF} \
-  -DARROW_USE_STATIC_CRT=${ARROW_USE_STATIC_CRT:-OFF} \
-  -DARROW_USE_TSAN=${ARROW_USE_TSAN:-OFF} \
-  -DARROW_USE_UBSAN=${ARROW_USE_UBSAN:-OFF} \
-  -DARROW_VERBOSE_THIRDPARTY_BUILD=${ARROW_VERBOSE_THIRDPARTY_BUILD:-OFF} \
-  -DARROW_WITH_BROTLI=${ARROW_WITH_BROTLI:-OFF} \
-  -DARROW_WITH_BZ2=${ARROW_WITH_BZ2:-OFF} \
-  -DARROW_WITH_LZ4=${ARROW_WITH_LZ4:-OFF} \
-  -DARROW_WITH_OPENTELEMETRY=${ARROW_WITH_OPENTELEMETRY:-OFF} \
-  -DARROW_WITH_MUSL=${ARROW_WITH_MUSL:-OFF} \
-  -DARROW_WITH_SNAPPY=${ARROW_WITH_SNAPPY:-OFF} \
-  -DARROW_WITH_UCX=${ARROW_WITH_UCX:-OFF} \
-  -DARROW_WITH_UTF8PROC=${ARROW_WITH_UTF8PROC:-ON} \
-  -DARROW_WITH_ZLIB=${ARROW_WITH_ZLIB:-OFF} \
-  -DARROW_WITH_ZSTD=${ARROW_WITH_ZSTD:-OFF} \
-  -DAWSSDK_SOURCE=${AWSSDK_SOURCE:-} \
-  -DAzure_SOURCE=${Azure_SOURCE:-} \
-  -Dbenchmark_SOURCE=${benchmark_SOURCE:-} \
-  -DBOOST_SOURCE=${BOOST_SOURCE:-} \
-  -DBrotli_SOURCE=${Brotli_SOURCE:-} \
-  -DBUILD_WARNING_LEVEL=${BUILD_WARNING_LEVEL:-CHECKIN} \
-  -Dc-ares_SOURCE=${cares_SOURCE:-} \
-  -DCMAKE_BUILD_TYPE=${ARROW_BUILD_TYPE:-debug} \
-  -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE:-OFF} \
-  -DCMAKE_C_FLAGS="${CFLAGS:-}" \
-  -DCMAKE_CXX_FLAGS="${CXXFLAGS:-}" \
-  -DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-17}" \
-  -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR:-lib} \
-  -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX:-${ARROW_HOME}} \
-  -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD:-OFF} \
-  -Dgflags_SOURCE=${gflags_SOURCE:-} \
-  -Dgoogle_cloud_cpp_storage_SOURCE=${google_cloud_cpp_storage_SOURCE:-} \
-  -DgRPC_SOURCE=${gRPC_SOURCE:-} \
-  -DGTest_SOURCE=${GTest_SOURCE:-} \
-  -Dlz4_SOURCE=${lz4_SOURCE:-} \
-  -DORC_SOURCE=${ORC_SOURCE:-} \
-  -DPARQUET_BUILD_EXAMPLES=${PARQUET_BUILD_EXAMPLES:-OFF} \
-  -DPARQUET_BUILD_EXECUTABLES=${PARQUET_BUILD_EXECUTABLES:-OFF} \
-  -DPARQUET_REQUIRE_ENCRYPTION=${PARQUET_REQUIRE_ENCRYPTION:-ON} \
-  -DProtobuf_SOURCE=${Protobuf_SOURCE:-} \
-  -DRapidJSON_SOURCE=${RapidJSON_SOURCE:-} \
-  -Dre2_SOURCE=${re2_SOURCE:-} \
-  -DSnappy_SOURCE=${Snappy_SOURCE:-} \
-  -DThrift_SOURCE=${Thrift_SOURCE:-} \
-  -Dutf8proc_SOURCE=${utf8proc_SOURCE:-} \
-  -Dzstd_SOURCE=${zstd_SOURCE:-} \
-  -Dxsimd_SOURCE=${xsimd_SOURCE:-} \
-  -G "${CMAKE_GENERATOR:-Ninja}" \
-  ${ARROW_CMAKE_ARGS} \
-  ${source_dir}
+if [ "${ARROW_EMSCRIPTEN:-OFF}" = "ON" ]; then
+  if [ "${UBUNTU}" = "20.04" ]; then
+    echo "arrow emscripten build is not supported on Ubuntu 20.04, run with UBUNTU=22.04"
+    exit -1
+  fi
+  n_jobs=2 # Emscripten build fails on docker unless this is set really low
+  source ~/emsdk/emsdk_env.sh
+  emcmake cmake \
+    --preset=ninja-${ARROW_BUILD_TYPE:-debug}-emscripten \
+    -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE:-OFF} \
+    -DCMAKE_C_FLAGS="${CFLAGS:-}" \
+    -DCMAKE_CXX_FLAGS="${CXXFLAGS:-}" \
+    -DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-17}" \
+    -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR:-lib} \
+    -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX:-${ARROW_HOME}} \
+    -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD:-OFF} \
+    ${ARROW_CMAKE_ARGS} \
+    ${source_dir}
+else
+  cmake \
+    -Dabsl_SOURCE=${absl_SOURCE:-} \
+    -DARROW_ACERO=${ARROW_ACERO:-OFF} \
+    -DARROW_AZURE=${ARROW_AZURE:-OFF} \
+    -DARROW_BOOST_USE_SHARED=${ARROW_BOOST_USE_SHARED:-ON} \
+    -DARROW_BUILD_BENCHMARKS_REFERENCE=${ARROW_BUILD_BENCHMARKS:-OFF} \
+    -DARROW_BUILD_BENCHMARKS=${ARROW_BUILD_BENCHMARKS:-OFF} \
+    -DARROW_BUILD_EXAMPLES=${ARROW_BUILD_EXAMPLES:-OFF} \
+    -DARROW_BUILD_INTEGRATION=${ARROW_BUILD_INTEGRATION:-OFF} \
+    -DARROW_BUILD_OPENMP_BENCHMARKS=${ARROW_BUILD_OPENMP_BENCHMARKS:-OFF} \
+    -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED:-ON} \
+    -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC:-ON} \
+    -DARROW_BUILD_TESTS=${ARROW_BUILD_TESTS:-OFF} \
+    -DARROW_BUILD_UTILITIES=${ARROW_BUILD_UTILITIES:-ON} \
+    -DARROW_COMPUTE=${ARROW_COMPUTE:-ON} \
+    -DARROW_CSV=${ARROW_CSV:-ON} \
+    -DARROW_CUDA=${ARROW_CUDA:-OFF} \
+    -DARROW_CXXFLAGS=${ARROW_CXXFLAGS:-} \
+    -DARROW_CXX_FLAGS_DEBUG="${ARROW_CXX_FLAGS_DEBUG:-}" \
+    -DARROW_CXX_FLAGS_RELEASE="${ARROW_CXX_FLAGS_RELEASE:-}" \
+    -DARROW_CXX_FLAGS_RELWITHDEBINFO="${ARROW_CXX_FLAGS_RELWITHDEBINFO:-}" \
+    -DARROW_C_FLAGS_DEBUG="${ARROW_C_FLAGS_DEBUG:-}" \
+    -DARROW_C_FLAGS_RELEASE="${ARROW_C_FLAGS_RELEASE:-}" \
+    -DARROW_C_FLAGS_RELWITHDEBINFO="${ARROW_C_FLAGS_RELWITHDEBINFO:-}" \
+    -DARROW_DATASET=${ARROW_DATASET:-OFF} \
+    -DARROW_DEPENDENCY_SOURCE=${ARROW_DEPENDENCY_SOURCE:-AUTO} \
+    -DARROW_DEPENDENCY_USE_SHARED=${ARROW_DEPENDENCY_USE_SHARED:-ON} \
+    -DARROW_ENABLE_THREADING=${ARROW_ENABLE_THREADING:-ON} \
+    -DARROW_ENABLE_TIMING_TESTS=${ARROW_ENABLE_TIMING_TESTS:-ON} \
+    -DARROW_EXTRA_ERROR_CONTEXT=${ARROW_EXTRA_ERROR_CONTEXT:-OFF} \
+    -DARROW_FILESYSTEM=${ARROW_FILESYSTEM:-ON} \
+    -DARROW_FLIGHT=${ARROW_FLIGHT:-OFF} \
+    -DARROW_FLIGHT_SQL=${ARROW_FLIGHT_SQL:-OFF} \
+    -DARROW_FUZZING=${ARROW_FUZZING:-OFF} \
+    -DARROW_GANDIVA_PC_CXX_FLAGS=${ARROW_GANDIVA_PC_CXX_FLAGS:-} \
+    -DARROW_GANDIVA=${ARROW_GANDIVA:-OFF} \
+    -DARROW_GCS=${ARROW_GCS:-OFF} \
+    -DARROW_HDFS=${ARROW_HDFS:-ON} \
+    -DARROW_INSTALL_NAME_RPATH=${ARROW_INSTALL_NAME_RPATH:-ON} \
+    -DARROW_JEMALLOC=${ARROW_JEMALLOC:-ON} \
+    -DARROW_JSON=${ARROW_JSON:-ON} \
+    -DARROW_LARGE_MEMORY_TESTS=${ARROW_LARGE_MEMORY_TESTS:-OFF} \
+    -DARROW_MIMALLOC=${ARROW_MIMALLOC:-OFF} \
+    -DARROW_ORC=${ARROW_ORC:-OFF} \
+    -DARROW_PARQUET=${ARROW_PARQUET:-OFF} \
+    -DARROW_RUNTIME_SIMD_LEVEL=${ARROW_RUNTIME_SIMD_LEVEL:-MAX} \
+    -DARROW_S3=${ARROW_S3:-OFF} \
+    -DARROW_SIMD_LEVEL=${ARROW_SIMD_LEVEL:-DEFAULT} \
+    -DARROW_SKYHOOK=${ARROW_SKYHOOK:-OFF} \
+    -DARROW_SUBSTRAIT=${ARROW_SUBSTRAIT:-OFF} \
+    -DARROW_TEST_LINKAGE=${ARROW_TEST_LINKAGE:-shared} \
+    -DARROW_TEST_MEMCHECK=${ARROW_TEST_MEMCHECK:-OFF} \
+    -DARROW_USE_ASAN=${ARROW_USE_ASAN:-OFF} \
+    -DARROW_USE_CCACHE=${ARROW_USE_CCACHE:-ON} \
+    -DARROW_USE_GLOG=${ARROW_USE_GLOG:-OFF} \
+    -DARROW_USE_LD_GOLD=${ARROW_USE_LD_GOLD:-OFF} \
+    -DARROW_USE_LLD=${ARROW_USE_LLD:-OFF} \
+    -DARROW_USE_MOLD=${ARROW_USE_MOLD:-OFF} \
+    -DARROW_USE_PRECOMPILED_HEADERS=${ARROW_USE_PRECOMPILED_HEADERS:-OFF} \
+    -DARROW_USE_STATIC_CRT=${ARROW_USE_STATIC_CRT:-OFF} \
+    -DARROW_USE_TSAN=${ARROW_USE_TSAN:-OFF} \
+    -DARROW_USE_UBSAN=${ARROW_USE_UBSAN:-OFF} \
+    -DARROW_VERBOSE_THIRDPARTY_BUILD=${ARROW_VERBOSE_THIRDPARTY_BUILD:-OFF} \
+    -DARROW_WITH_BROTLI=${ARROW_WITH_BROTLI:-OFF} \
+    -DARROW_WITH_BZ2=${ARROW_WITH_BZ2:-OFF} \
+    -DARROW_WITH_LZ4=${ARROW_WITH_LZ4:-OFF} \
+    -DARROW_WITH_OPENTELEMETRY=${ARROW_WITH_OPENTELEMETRY:-OFF} \
+    -DARROW_WITH_MUSL=${ARROW_WITH_MUSL:-OFF} \
+    -DARROW_WITH_SNAPPY=${ARROW_WITH_SNAPPY:-OFF} \
+    -DARROW_WITH_UCX=${ARROW_WITH_UCX:-OFF} \
+    -DARROW_WITH_UTF8PROC=${ARROW_WITH_UTF8PROC:-ON} \
+    -DARROW_WITH_ZLIB=${ARROW_WITH_ZLIB:-OFF} \
+    -DARROW_WITH_ZSTD=${ARROW_WITH_ZSTD:-OFF} \
+    -DAWSSDK_SOURCE=${AWSSDK_SOURCE:-} \
+    -DAzure_SOURCE=${Azure_SOURCE:-} \
+    -Dbenchmark_SOURCE=${benchmark_SOURCE:-} \
+    -DBOOST_SOURCE=${BOOST_SOURCE:-} \
+    -DBrotli_SOURCE=${Brotli_SOURCE:-} \
+    -DBUILD_WARNING_LEVEL=${BUILD_WARNING_LEVEL:-CHECKIN} \
+    -Dc-ares_SOURCE=${cares_SOURCE:-} \
+    -DCMAKE_BUILD_TYPE=${ARROW_BUILD_TYPE:-debug} \
+    -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE:-OFF} \
+    -DCMAKE_C_FLAGS="${CFLAGS:-}" \
+    -DCMAKE_CXX_FLAGS="${CXXFLAGS:-}" \
+    -DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-17}" \
+    -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR:-lib} \
+    -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX:-${ARROW_HOME}} \
+    -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD:-OFF} \
+    -Dgflags_SOURCE=${gflags_SOURCE:-} \
+    -Dgoogle_cloud_cpp_storage_SOURCE=${google_cloud_cpp_storage_SOURCE:-} \
+    -DgRPC_SOURCE=${gRPC_SOURCE:-} \
+    -DGTest_SOURCE=${GTest_SOURCE:-} \
+    -Dlz4_SOURCE=${lz4_SOURCE:-} \
+    -DORC_SOURCE=${ORC_SOURCE:-} \
+    -DPARQUET_BUILD_EXAMPLES=${PARQUET_BUILD_EXAMPLES:-OFF} \
+    -DPARQUET_BUILD_EXECUTABLES=${PARQUET_BUILD_EXECUTABLES:-OFF} \
+    -DPARQUET_REQUIRE_ENCRYPTION=${PARQUET_REQUIRE_ENCRYPTION:-ON} \
+    -DProtobuf_SOURCE=${Protobuf_SOURCE:-} \
+    -DRapidJSON_SOURCE=${RapidJSON_SOURCE:-} \
+    -Dre2_SOURCE=${re2_SOURCE:-} \
+    -DSnappy_SOURCE=${Snappy_SOURCE:-} \
+    -DThrift_SOURCE=${Thrift_SOURCE:-} \
+    -Dutf8proc_SOURCE=${utf8proc_SOURCE:-} \
+    -Dzstd_SOURCE=${zstd_SOURCE:-} \
+    -Dxsimd_SOURCE=${xsimd_SOURCE:-} \
+    -G "${CMAKE_GENERATOR:-Ninja}" \
+    ${ARROW_CMAKE_ARGS} \
+    ${source_dir}
+fi
 
 export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$[${n_jobs} + 1]}
 time cmake --build . --target install
@@ -208,12 +230,17 @@ find . -name "*.o" -delete
 popd
 
 if [ -x "$(command -v ldconfig)" ]; then
-  ldconfig ${ARROW_HOME}/${CMAKE_INSTALL_LIBDIR:-lib}
+  if [ -x "$(command -v sudo)" ]; then
+    SUDO=sudo
+  else
+    SUDO=
+  fi
+  ${SUDO} ldconfig ${ARROW_HOME}/${CMAKE_INSTALL_LIBDIR:-lib}
 fi
 
 if [ "${ARROW_USE_CCACHE}" == "ON" ]; then
-    echo -e "===\n=== ccache statistics after build\n==="
-    ccache -sv 2>/dev/null || ccache -s
+  echo -e "===\n=== ccache statistics after build\n==="
+  ccache -sv 2>/dev/null || ccache -s
 fi
 
 if command -v sccache &> /dev/null; then
@@ -223,6 +250,6 @@ fi
 
 if [ "${BUILD_DOCS_CPP}" == "ON" ]; then
   pushd ${source_dir}/apidoc
-  doxygen
+  OUTPUT_DIRECTORY=${build_dir}/apidoc doxygen
   popd
 fi
diff --git a/ci/scripts/cpp_test.sh b/ci/scripts/cpp_test.sh
index f388825fd0a98..2c640f2c1fb6a 100755
--- a/ci/scripts/cpp_test.sh
+++ b/ci/scripts/cpp_test.sh
@@ -80,6 +80,10 @@ case "$(uname)" in
     ;;
 esac
 
+if [ "${ARROW_EMSCRIPTEN:-OFF}" = "ON" ]; then  
+  n_jobs=1 # avoid spurious fails on emscripten due to loading too many big executables
+fi
+
 pushd ${build_dir}
 
 if [ -z "${PYTHON}" ] && ! which python > /dev/null 2>&1; then
diff --git a/ci/scripts/go_bench.sh b/ci/scripts/go_bench.sh
old mode 100644
new mode 100755
diff --git a/ci/scripts/install_azurite.sh b/ci/scripts/install_azurite.sh
index 2e7008360fdc3..dda5e99405b7f 100755
--- a/ci/scripts/install_azurite.sh
+++ b/ci/scripts/install_azurite.sh
@@ -19,17 +19,18 @@
 
 set -e
 
+# Pin azurite to 3.29.0 due to https://github.com/apache/arrow/issues/41505
 case "$(uname)" in
   Darwin)
-    npm install -g azurite
+    npm install -g azurite@v3.29.0
     which azurite
     ;;
   MINGW*)
     choco install nodejs.install
-    npm install -g azurite
+    npm install -g azurite@v3.29.0
     ;;
   Linux)
-    npm install -g azurite
+    npm install -g azurite@v3.29.0
     which azurite
     ;;
 esac
diff --git a/ci/scripts/install_cmake.sh b/ci/scripts/install_cmake.sh
index 2f5e5d52051ed..7fdb06d90f02c 100755
--- a/ci/scripts/install_cmake.sh
+++ b/ci/scripts/install_cmake.sh
@@ -21,7 +21,10 @@ set -e
 
 declare -A archs
 archs=([amd64]=x86_64
-       [arm64v8]=aarch64)
+       [arch64]=aarch64
+       [arm64]=aarch64
+       [arm64v8]=aarch64
+       [x86_64]=x86_64)
 
 declare -A platforms
 platforms=([linux]=linux
@@ -38,5 +41,25 @@ platform=${platforms[$2]}
 version=$3
 prefix=$4
 
-url="https://github.com/Kitware/CMake/releases/download/v${version}/cmake-${version}-${platform}-${arch}.tar.gz"
-wget -q ${url} -O - | tar -xzf - --directory ${prefix} --strip-components=1
+mkdir -p ${prefix}
+url="https://github.com/Kitware/CMake/releases/download/v${version}/cmake-${version}-${platform}-"
+case ${platform} in
+  macos)
+    url+="universal.tar.gz"
+    curl -L ${url} | tar -xzf - --directory ${prefix} --strip-components=1
+    ln -s CMake.app/Contents/bin ${prefix}/bin
+    ;;
+  windows)
+    url+="${arch}.zip"
+    archive_name=$(basename ${url})
+    curl -L -o ${archive_name} ${url}
+    unzip ${archive_name}
+    base_name=$(basename ${archive_name} .zip)
+    mv ${base_name}/* ${prefix}
+    rm -rf ${base_name} ${archive_name}
+    ;;
+  *)
+    url+="${arch}.tar.gz"
+    curl -L ${url} | tar -xzf - --directory ${prefix} --strip-components=1
+    ;;
+esac
diff --git a/ci/scripts/install_sccache.sh b/ci/scripts/install_sccache.sh
index 0346c0cc9ce7d..136f39b3ae2ab 100755
--- a/ci/scripts/install_sccache.sh
+++ b/ci/scripts/install_sccache.sh
@@ -59,7 +59,7 @@ fi
 # Extract only the sccache binary into $PREFIX and ignore README and LICENSE.
 # --wildcards doesn't work on busybox.
 tar -xzvf $SCCACHE_ARCHIVE --strip-component=1 --directory $PREFIX --exclude="sccache*/*E*E*"
-chmod u+x $PREFIX/sccache
+chmod a+x $PREFIX/sccache
 
 if [ -n "${GITHUB_PATH}" ]; then
     echo "$PREFIX" >> $GITHUB_PATH
diff --git a/ci/scripts/install_vcpkg.sh b/ci/scripts/install_vcpkg.sh
index cc80582326ec5..08989d6444827 100755
--- a/ci/scripts/install_vcpkg.sh
+++ b/ci/scripts/install_vcpkg.sh
@@ -25,13 +25,16 @@ if [ "$#" -lt 1 ]; then
 fi
 
 arrow_dir=$(cd -- "$(dirname -- "$0")/../.." && pwd -P)
-default_vcpkg_version=$(cat "${arrow_dir}/.env" | grep "VCPKG" | cut -d "=" -f2 | tr -d '"')
 default_vcpkg_ports_patch="${arrow_dir}/ci/vcpkg/ports.patch"
 
 vcpkg_destination=$1
-vcpkg_version=${2:-$default_vcpkg_version}
+vcpkg_version=${2:-}
 vcpkg_ports_patch=${3:-$default_vcpkg_ports_patch}
 
+if [ -z "${vcpkg_version}" ]; then
+  vcpkg_version=$(source "${arrow_dir}/.env" && echo "$VCPKG")
+fi
+
 # reduce the fetched data using a shallow clone
 git clone --shallow-since=2021-04-01 https://github.com/microsoft/vcpkg ${vcpkg_destination}
 
diff --git a/ci/scripts/integration_arrow.sh b/ci/scripts/integration_arrow.sh
index a5a012ad2c5c4..2eb58e8dc75ec 100755
--- a/ci/scripts/integration_arrow.sh
+++ b/ci/scripts/integration_arrow.sh
@@ -40,6 +40,8 @@ if [ "${ARROW_INTEGRATION_JAVA}" == "ON" ]; then
     pip install jpype1
 fi
 
+export ARROW_BUILD_ROOT=${build_dir}
+
 # Get more detailed context on crashes
 export PYTHONFAULTHANDLER=1
 
diff --git a/ci/scripts/integration_arrow_build.sh b/ci/scripts/integration_arrow_build.sh
index e5c31527aedff..9b54049a2b803 100755
--- a/ci/scripts/integration_arrow_build.sh
+++ b/ci/scripts/integration_arrow_build.sh
@@ -30,6 +30,8 @@ build_dir=${2}
 
 ${arrow_dir}/ci/scripts/rust_build.sh ${arrow_dir} ${build_dir}
 
+${arrow_dir}/ci/scripts/nanoarrow_build.sh ${arrow_dir} ${build_dir}
+
 if [ "${ARROW_INTEGRATION_CPP}" == "ON" ]; then
     ${arrow_dir}/ci/scripts/cpp_build.sh ${arrow_dir} ${build_dir}
 fi
diff --git a/ci/scripts/java_build.sh b/ci/scripts/java_build.sh
index 2103f0329baec..0fa1edab429c0 100755
--- a/ci/scripts/java_build.sh
+++ b/ci/scripts/java_build.sh
@@ -75,7 +75,16 @@ fi
 # Use `2 * ncores` threads
 mvn="${mvn} -T 2C"
 
-pushd ${source_dir}
+# https://github.com/apache/arrow/issues/41429
+# TODO: We want to out-of-source build. This is a workaround. We copy
+# all needed files to the build directory from the source directory
+# and build in the build directory.
+mkdir -p ${build_dir}
+rm -rf ${build_dir}/format
+cp -aL ${arrow_dir}/format ${build_dir}/
+rm -rf ${build_dir}/java
+cp -aL ${source_dir} ${build_dir}/
+pushd ${build_dir}/java
 
 if [ "${ARROW_JAVA_SHADE_FLATBUFFERS}" == "ON" ]; then
   mvn="${mvn} -Pshade-flatbuffers"
@@ -95,7 +104,7 @@ if [ "${BUILD_DOCS_JAVA}" == "ON" ]; then
   # HTTP pooling is turned of to avoid download issues https://issues.apache.org/jira/browse/ARROW-11633
   mkdir -p ${build_dir}/docs/java/reference
   ${mvn} -Dcheckstyle.skip=true -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false clean install site
-  rsync -a ${arrow_dir}/java/target/site/apidocs/ ${build_dir}/docs/java/reference
+  rsync -a target/site/apidocs/ ${build_dir}/docs/java/reference
 fi
 
 popd
diff --git a/ci/scripts/java_cdata_integration.sh b/ci/scripts/java_cdata_integration.sh
index 86ea7cf155350..0ee5d3026aa09 100755
--- a/ci/scripts/java_cdata_integration.sh
+++ b/ci/scripts/java_cdata_integration.sh
@@ -20,9 +20,9 @@
 set -ex
 
 arrow_dir=${1}
-export ARROW_SOURCE_DIR=${arrow_dir}
+build_dir=${2}
 
-pushd ${arrow_dir}/java/c/src/test/python
+pushd ${build_dir}/java/c/src/test/python
 
 python integration_tests.py
 
diff --git a/ci/scripts/java_full_build.sh b/ci/scripts/java_full_build.sh
index 2734f3e9dbec2..4beade50b4556 100755
--- a/ci/scripts/java_full_build.sh
+++ b/ci/scripts/java_full_build.sh
@@ -49,21 +49,14 @@ fi
 # build the entire project
 mvn clean \
     install \
-    assembly:single \
-    source:jar \
-    javadoc:jar \
     -Papache-release \
     -Parrow-c-data \
     -Parrow-jni \
     -Darrow.cpp.build.dir=$dist_dir \
     -Darrow.c.jni.dist.dir=$dist_dir \
-    -DdescriptorId=source-release
+    --no-transfer-progress
 
 # copy all jar, zip and pom files to the distribution folder
-find . \
-     "(" -name "*-javadoc.jar" -o -name "*-sources.jar" ")" \
-     -exec echo {} ";" \
-     -exec cp {} $dist_dir ";"
 find ~/.m2/repository/org/apache/arrow \
      "(" \
      -name "*.jar" -o \
diff --git a/ci/scripts/java_jni_manylinux_build.sh b/ci/scripts/java_jni_manylinux_build.sh
index da4987d307ce4..6f3769751af42 100755
--- a/ci/scripts/java_jni_manylinux_build.sh
+++ b/ci/scripts/java_jni_manylinux_build.sh
@@ -58,7 +58,7 @@ export ARROW_ORC
 : ${VCPKG_ROOT:=/opt/vcpkg}
 : ${VCPKG_FEATURE_FLAGS:=-manifests}
 : ${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-x64-linux-static-${CMAKE_BUILD_TYPE}}}
-: ${GANDIVA_CXX_FLAGS:=-isystem;${devtoolset_include_cpp};-isystem;${devtoolset_include_cpp}/x86_64-redhat-linux;-isystem;-lpthread}
+: ${GANDIVA_CXX_FLAGS:=-isystem;${devtoolset_include_cpp};-isystem;${devtoolset_include_cpp}/x86_64-redhat-linux;-lpthread}
 
 if [ "${ARROW_USE_CCACHE}" == "ON" ]; then
   echo "=== ccache statistics before build ==="
diff --git a/ci/scripts/js_build.sh b/ci/scripts/js_build.sh
index d61f74f0b7ca1..196539ee0f101 100755
--- a/ci/scripts/js_build.sh
+++ b/ci/scripts/js_build.sh
@@ -25,7 +25,16 @@ build_dir=${2}
 
 : ${BUILD_DOCS_JS:=OFF}
 
-pushd ${source_dir}
+# https://github.com/apache/arrow/issues/41429
+# TODO: We want to out-of-source build. This is a workaround. We copy
+# all needed files to the build directory from the source directory
+# and build in the build directory.
+rm -rf ${build_dir}/js
+mkdir -p ${build_dir}
+cp -aL ${arrow_dir}/LICENSE.txt ${build_dir}/
+cp -aL ${arrow_dir}/NOTICE.txt ${build_dir}/
+cp -aL ${source_dir} ${build_dir}/js
+pushd ${build_dir}/js
 
 yarn --immutable
 yarn lint:ci
@@ -34,18 +43,18 @@ yarn build
 if [ "${BUILD_DOCS_JS}" == "ON" ]; then
   # If apache or upstream are defined use those as remote.
   # Otherwise use origin which could be a fork on PRs.
-  if [ "$(git config --get remote.apache.url)" == "git@github.com:apache/arrow.git" ]; then
+  if [ "$(git -C ${arrow_dir} config --get remote.apache.url)" == "git@github.com:apache/arrow.git" ]; then
     yarn doc --gitRemote apache
-  elif [[ "$(git config --get remote.upstream.url)" =~ "https://github.com/apache/arrow" ]]; then
+  elif [[ "$(git -C ${arrow_dir}config --get remote.upstream.url)" =~ "https://github.com/apache/arrow" ]]; then
     yarn doc --gitRemote upstream
-  elif [[ "$(basename -s .git $(git config --get remote.origin.url))" == "arrow" ]]; then
+  elif [[ "$(basename -s .git $(git -C ${arrow_dir} config --get remote.origin.url))" == "arrow" ]]; then
     yarn doc
   else
     echo "Failed to build docs because the remote is not set correctly. Please set the origin or upstream remote to https://github.com/apache/arrow.git or the apache remote to git@github.com:apache/arrow.git."
     exit 0
   fi
   mkdir -p ${build_dir}/docs/js
-  rsync -a ${arrow_dir}/js/doc/ ${build_dir}/docs/js
+  rsync -a doc/ ${build_dir}/docs/js
 fi
 
 popd
diff --git a/ci/scripts/js_test.sh b/ci/scripts/js_test.sh
index 40de974ede161..863b1c3d34613 100755
--- a/ci/scripts/js_test.sh
+++ b/ci/scripts/js_test.sh
@@ -20,8 +20,9 @@
 set -ex
 
 source_dir=${1}/js
+build_dir=${2}/js
 
-pushd ${source_dir}
+pushd ${build_dir}
 
 yarn lint
 yarn test
diff --git a/ci/scripts/nanoarrow_build.sh b/ci/scripts/nanoarrow_build.sh
new file mode 100755
index 0000000000000..1612b9a2d0102
--- /dev/null
+++ b/ci/scripts/nanoarrow_build.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+#
+# 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.
+
+set -e
+
+arrow_dir=${1}
+source_dir=${1}/nanoarrow
+build_dir=${2}/nanoarrow
+
+# This file is used to build the nanoarrow binaries needed for the archery
+# integration tests. Testing of the nanoarrow implementation in normal CI is handled
+# by github workflows in the arrow-nanoarrow repository.
+
+if [ "${ARCHERY_INTEGRATION_WITH_NANOARROW}" -eq "0" ]; then
+  echo "====================================================================="
+  echo "Not building nanoarrow"
+  echo "====================================================================="
+  exit 0;
+elif [ ! -d "${source_dir}" ]; then
+  echo "====================================================================="
+  echo "The nanoarrow source is missing. Please clone the arrow-nanoarrow repository"
+  echo "to arrow/nanoarrow before running the integration tests:"
+  echo "  git clone https://github.com/apache/arrow-nanoarrow.git path/to/arrow/nanoarrow"
+  echo "====================================================================="
+  exit 1;
+fi
+
+set -x
+
+mkdir -p ${build_dir}
+pushd ${build_dir}
+
+cmake ${source_dir} -DNANOARROW_BUILD_INTEGRATION_TESTS=ON
+cmake --build .
+
+popd
diff --git a/ci/scripts/python_build.sh b/ci/scripts/python_build.sh
index 7a24c1172f7b1..9455baf353633 100755
--- a/ci/scripts/python_build.sh
+++ b/ci/scripts/python_build.sh
@@ -74,19 +74,46 @@ export PYARROW_WITH_SUBSTRAIT=${ARROW_SUBSTRAIT:-OFF}
 
 export PYARROW_PARALLEL=${n_jobs}
 
+: ${CMAKE_PREFIX_PATH:=${ARROW_HOME}}
+export CMAKE_PREFIX_PATH
 export LD_LIBRARY_PATH=${ARROW_HOME}/lib:${LD_LIBRARY_PATH}
 
-pushd ${source_dir}
+# https://github.com/apache/arrow/issues/41429
+# TODO: We want to out-of-source build. This is a workaround. We copy
+# all needed files to the build directory from the source directory
+# and build in the build directory.
+rm -rf ${python_build_dir}
+cp -aL ${source_dir} ${python_build_dir}
+pushd ${python_build_dir}
 # - Cannot call setup.py as it may install in the wrong directory
 #   on Debian/Ubuntu (ARROW-15243).
 # - Cannot use build isolation as we want to use specific dependency versions
 #   (e.g. Numpy, Pandas) on some CI jobs.
 ${PYTHON:-python} -m pip install --no-deps --no-build-isolation -vv .
-# Remove build artifacts from source directory
-find build/ -user root -delete
 popd
 
 if [ "${BUILD_DOCS_PYTHON}" == "ON" ]; then
+  # https://github.com/apache/arrow/issues/41429
+  # TODO: We want to out-of-source build. This is a workaround.
+  #
+  # Copy docs/source because the "autosummary_generate = True"
+  # configuration generates files to docs/source/python/generated/.
+  rm -rf ${python_build_dir}/docs/source
+  mkdir -p ${python_build_dir}/docs
+  cp -a ${arrow_dir}/docs/source ${python_build_dir}/docs/
+  rm -rf ${python_build_dir}/format
+  cp -a ${arrow_dir}/format ${python_build_dir}/
+  rm -rf ${python_build_dir}/cpp/examples
+  mkdir -p ${python_build_dir}/cpp
+  cp -a ${arrow_dir}/cpp/examples ${python_build_dir}/cpp/
+  rm -rf ${python_build_dir}/ci
+  cp -a ${arrow_dir}/ci/ ${python_build_dir}/
   ncpus=$(python -c "import os; print(os.cpu_count())")
-  sphinx-build -b html -j ${ncpus} ${arrow_dir}/docs/source ${build_dir}/docs
+  export ARROW_CPP_DOXYGEN_XML=${build_dir}/cpp/apidoc/xml
+  pushd ${build_dir}
+  sphinx-build \
+    -b html \
+    ${python_build_dir}/docs/source \
+    ${build_dir}/docs
+  popd
 fi
diff --git a/ci/scripts/python_wheel_macos_build.sh b/ci/scripts/python_wheel_macos_build.sh
index a94dac40e931f..3ed9d5d8dd12f 100755
--- a/ci/scripts/python_wheel_macos_build.sh
+++ b/ci/scripts/python_wheel_macos_build.sh
@@ -50,15 +50,12 @@ echo "=== (${PYTHON_VERSION}) Install Python build dependencies ==="
 export PIP_SITE_PACKAGES=$(python -c 'import site; print(site.getsitepackages()[0])')
 export PIP_TARGET_PLATFORM="macosx_${MACOSX_DEPLOYMENT_TARGET//./_}_${arch}"
 
-# TODO(GH-39848) Remove the `--pre --extra-index-url` for numpy nightly again before the 16.0 release 
 pip install \
   --upgrade \
   --only-binary=:all: \
   --target $PIP_SITE_PACKAGES \
   --platform $PIP_TARGET_PLATFORM \
-  -r ${source_dir}/python/requirements-wheel-build.txt \
-  --pre \
-  --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"
+  -r ${source_dir}/python/requirements-wheel-build.txt
 pip install "delocate>=0.10.3"
 
 echo "=== (${PYTHON_VERSION}) Building Arrow C++ libraries ==="
diff --git a/ci/scripts/python_wheel_manylinux_build.sh b/ci/scripts/python_wheel_manylinux_build.sh
index 6e29ef58d2318..aa86494a9d47d 100755
--- a/ci/scripts/python_wheel_manylinux_build.sh
+++ b/ci/scripts/python_wheel_manylinux_build.sh
@@ -160,6 +160,26 @@ export CMAKE_PREFIX_PATH=/tmp/arrow-dist
 pushd /arrow/python
 python setup.py bdist_wheel
 
+echo "=== Strip symbols from wheel ==="
+mkdir -p dist/temp-fix-wheel
+mv dist/pyarrow-*.whl dist/temp-fix-wheel
+
+pushd dist/temp-fix-wheel
+wheel_name=$(ls pyarrow-*.whl)
+# Unzip and remove old wheel
+unzip $wheel_name
+rm $wheel_name
+for filename in $(ls pyarrow/*.so pyarrow/*.so.*); do
+    echo "Stripping debug symbols from: $filename";
+    strip --strip-debug $filename
+done
+# Zip wheel again after stripping symbols
+zip -r $wheel_name .
+mv $wheel_name ..
+popd
+
+rm -rf dist/temp-fix-wheel
+
 echo "=== (${PYTHON_VERSION}) Tag the wheel with manylinux${MANYLINUX_VERSION} ==="
 auditwheel repair -L . dist/pyarrow-*.whl -w repaired_wheels
 popd
diff --git a/ci/scripts/r_build.sh b/ci/scripts/r_build.sh
index 38b54e4434036..f4dc5a5781c6e 100755
--- a/ci/scripts/r_build.sh
+++ b/ci/scripts/r_build.sh
@@ -24,15 +24,29 @@ build_dir=${2}
 
 : ${BUILD_DOCS_R:=OFF}
 
-pushd ${source_dir}
+# https://github.com/apache/arrow/issues/41429
+# TODO: We want to out-of-source build. This is a workaround. We copy
+# all needed files to the build directory from the source directory
+# and build in the build directory.
+rm -rf ${build_dir}/r
+cp -aL ${source_dir} ${build_dir}/r
+pushd ${build_dir}/r
 
 # build first so that any stray compiled files in r/src are ignored
 ${R_BIN} CMD build .
-${R_BIN} CMD INSTALL ${INSTALL_ARGS} arrow*.tar.gz
+if [ -x "$(command -v sudo)" ]; then
+  SUDO=sudo
+else
+  SUDO=
+fi
+${SUDO} \
+  env \
+    PKG_CONFIG_PATH=${ARROW_HOME}/lib/pkgconfig:${PKG_CONFIG_PATH} \
+      ${R_BIN} CMD INSTALL ${INSTALL_ARGS} arrow*.tar.gz
 
 if [ "${BUILD_DOCS_R}" == "ON" ]; then
   ${R_BIN} -e "pkgdown::build_site(install = FALSE)"
-  rsync -a ${source_dir}/docs/ ${build_dir}/docs/r
+  rsync -a docs/ ${build_dir}/docs/r
 fi
 
 popd
diff --git a/ci/scripts/r_docker_configure.sh b/ci/scripts/r_docker_configure.sh
index 52db2e6df6611..8a962fe576cbb 100755
--- a/ci/scripts/r_docker_configure.sh
+++ b/ci/scripts/r_docker_configure.sh
@@ -67,26 +67,6 @@ sloppiness = include_file_ctime
 hash_dir = false" >> ~/.ccache/ccache.conf
 fi
 
-# Special hacking to try to reproduce quirks on centos using non-default build
-# tooling.
-if [[ -n "$DEVTOOLSET_VERSION" ]]; then
-  $PACKAGE_MANAGER install -y centos-release-scl
-  $PACKAGE_MANAGER install -y "devtoolset-$DEVTOOLSET_VERSION"
-
-  # Enable devtoolset here so that `which gcc` finds the right compiler below
-  source /opt/rh/devtoolset-${DEVTOOLSET_VERSION}/enable
-
-  # Build images which require the devtoolset don't have CXX17 variables
-  # set as the system compiler doesn't support C++17
-  if [ ! "`{R_BIN} CMD config CXX17`" ]; then
-    mkdir -p ~/.R
-    echo "CC = $(which gcc) -fPIC" >> ~/.R/Makevars
-    echo "CXX17 = $(which g++) -fPIC" >> ~/.R/Makevars
-    echo "CXX17STD = -std=c++17" >> ~/.R/Makevars
-    echo "CXX17FLAGS = ${CXX11FLAGS}" >> ~/.R/Makevars
-  fi
-fi
-
 if [ -f "${ARROW_SOURCE_HOME}/ci/scripts/r_install_system_dependencies.sh" ]; then
   "${ARROW_SOURCE_HOME}/ci/scripts/r_install_system_dependencies.sh"
 fi
diff --git a/ci/scripts/r_install_system_dependencies.sh b/ci/scripts/r_install_system_dependencies.sh
index be0d75ef235e6..7ddc2604f661a 100755
--- a/ci/scripts/r_install_system_dependencies.sh
+++ b/ci/scripts/r_install_system_dependencies.sh
@@ -21,29 +21,30 @@ set -ex
 
 : ${ARROW_SOURCE_HOME:=/arrow}
 
-if [ "$ARROW_S3" == "ON" ] || [ "$ARROW_GCS" == "ON" ] || [ "$ARROW_R_DEV" == "TRUE" ]; then
-  # Figure out what package manager we have
-  if [ "`which dnf`" ]; then
-    PACKAGE_MANAGER=dnf
-  elif [ "`which yum`" ]; then
-    PACKAGE_MANAGER=yum
-  elif [ "`which zypper`" ]; then
-    PACKAGE_MANAGER=zypper
-  else
-    PACKAGE_MANAGER=apt-get
-    apt-get update
-  fi
+# Figure out what package manager we have
+if [ "`which dnf`" ]; then
+  PACKAGE_MANAGER=dnf
+elif [ "`which yum`" ]; then
+  PACKAGE_MANAGER=yum
+elif [ "`which zypper`" ]; then
+  PACKAGE_MANAGER=zypper
+else
+  PACKAGE_MANAGER=apt-get
+  apt-get update
+fi
 
-  # Install curl and OpenSSL for S3/GCS support
-  case "$PACKAGE_MANAGER" in
-    apt-get)
-      apt-get install -y libcurl4-openssl-dev libssl-dev
-      ;;
-    *)
-      $PACKAGE_MANAGER install -y libcurl-devel openssl-devel
-      ;;
-  esac
+# Install curl and OpenSSL (technically, only needed for S3/GCS support, but
+# installing the R curl package fails without it)
+case "$PACKAGE_MANAGER" in
+  apt-get)
+    apt-get install -y libcurl4-openssl-dev libssl-dev
+    ;;
+  *)
+    $PACKAGE_MANAGER install -y libcurl-devel openssl-devel
+    ;;
+esac
 
+if [ "$ARROW_S3" == "ON" ] || [ "$ARROW_GCS" == "ON" ] || [ "$ARROW_R_DEV" == "TRUE" ]; then
   # The Dockerfile should have put this file here
   if [ "$ARROW_S3" == "ON" ] && [ -f "${ARROW_SOURCE_HOME}/ci/scripts/install_minio.sh" ] && [ "`which wget`" ]; then
     "${ARROW_SOURCE_HOME}/ci/scripts/install_minio.sh" latest /usr/local
diff --git a/ci/scripts/r_sanitize.sh b/ci/scripts/r_sanitize.sh
index 600ee0fa2cbe5..fb3e9a5836387 100755
--- a/ci/scripts/r_sanitize.sh
+++ b/ci/scripts/r_sanitize.sh
@@ -46,10 +46,12 @@ unset ARROW_R_DEV
 export ARROW_R_VERBOSE_TEST=TRUE
 
 export UBSAN_OPTIONS="print_stacktrace=1,suppressions=/arrow/r/tools/ubsan.supp"
+# From the old rhub image https://github.com/r-hub/rhub-linux-builders/blob/master/fedora-clang-devel-san/Dockerfile
+export ASAN_OPTIONS="alloc_dealloc_mismatch=0:detect_leaks=0:detect_odr_violation=0"
 
 # run tests
 pushd tests
-${R_BIN} < testthat.R > testthat.out 2>&1 || { cat testthat.out; exit 1; }
+${R_BIN} --no-save < testthat.R > testthat.out 2>&1 || { cat testthat.out; exit 1; }
 
 cat testthat.out
 if grep -q "runtime error" testthat.out; then
@@ -58,7 +60,7 @@ fi
 
 # run examples
 popd
-${R_BIN} -e 'library(arrow); testthat::test_examples(".")' >> examples.out 2>&1 || { cat examples.out; exit 1; }
+${R_BIN} --no-save -e 'library(arrow); testthat::test_examples(".")' >> examples.out 2>&1 || { cat examples.out; exit 1; }
 
 cat examples.out
 if grep -q "runtime error" examples.out; then
diff --git a/ci/scripts/r_test.sh b/ci/scripts/r_test.sh
index 72078ab3c06c2..fe9d18edb8cbb 100755
--- a/ci/scripts/r_test.sh
+++ b/ci/scripts/r_test.sh
@@ -46,7 +46,9 @@ if [ "$ARROW_USE_PKG_CONFIG" != "false" ]; then
   export LD_LIBRARY_PATH=${ARROW_HOME}/lib:${LD_LIBRARY_PATH}
   export R_LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
 fi
-export _R_CHECK_COMPILATION_FLAGS_KNOWN_=${ARROW_R_CXXFLAGS}
+
+export _R_CHECK_COMPILATION_FLAGS_KNOWN_="${_R_CHECK_COMPILATION_FLAGS_KNOWN_} ${ARROW_R_CXXFLAGS}"
+
 if [ "$ARROW_R_DEV" = "TRUE" ]; then
   # These are sometimes used in the Arrow C++ build and are not a problem
   export _R_CHECK_COMPILATION_FLAGS_KNOWN_="${_R_CHECK_COMPILATION_FLAGS_KNOWN_} -Wno-attributes -msse4.2 -Wno-noexcept-type -Wno-subobject-linkage"
@@ -108,16 +110,15 @@ SCRIPT="as_cran <- !identical(tolower(Sys.getenv('NOT_CRAN')), 'true')
       on.exit(tools::pskill(pid_flight), add = TRUE)
   }
 
-  run_donttest <- identical(tolower(Sys.getenv('_R_CHECK_DONTTEST_EXAMPLES_', 'true')), 'true')
-  if (run_donttest) {
-    args <- c(args, '--run-donttest')
-  }
-
   install_args <- Sys.getenv('INSTALL_ARGS')
   if (nzchar(install_args)) {
     args <- c(args, paste0('--install-args=\"', install_args, '\"'))
   }
 
+  message('Running rcmdcheck with:\n')
+  print(build_args)
+  print(args)
+
   rcmdcheck::rcmdcheck(build_args = build_args, args = args, error_on = 'warning', check_dir = 'check', timeout = 3600)"
 echo "$SCRIPT" | ${R_BIN} --no-save
 
diff --git a/ci/scripts/r_valgrind.sh b/ci/scripts/r_valgrind.sh
index a14cb803ca898..0e40d792111c4 100755
--- a/ci/scripts/r_valgrind.sh
+++ b/ci/scripts/r_valgrind.sh
@@ -33,7 +33,7 @@ ${R_BIN} CMD INSTALL ${INSTALL_ARGS} arrow*.tar.gz
 pushd tests
 
 # to generate suppression files run:
-# ${R_BIN} --vanilla -d "valgrind --tool=memcheck --leak-check=full --track-origins=yes --gen-suppressions=all --log-file=memcheck.log" -f testthat.supp
+# ${R_BIN} --vanilla -d "valgrind --tool=memcheck --leak-check=full --track-origins=yes --gen-suppressions=all --log-file=memcheck.log" -f testthat.R
 ${R_BIN} --vanilla -d "valgrind --tool=memcheck --leak-check=full --track-origins=yes --suppressions=/${1}/ci/etc/valgrind-cran.supp" -f testthat.R |& tee testthat.out
 
 # valgrind --error-exitcode=1 should return an erroring exit code that we can catch,
diff --git a/ci/scripts/ruby_test.sh b/ci/scripts/ruby_test.sh
index 56c33a4d6378a..507fa7858e870 100755
--- a/ci/scripts/ruby_test.sh
+++ b/ci/scripts/ruby_test.sh
@@ -22,6 +22,7 @@ set -ex
 source_dir=${1}/ruby
 build_dir=${2}/ruby
 
+export DYLD_LIBRARY_PATH=${ARROW_HOME}/lib:${DYLD_LIBRARY_PATH}
 export LD_LIBRARY_PATH=${ARROW_HOME}/lib:${LD_LIBRARY_PATH}
 export PKG_CONFIG_PATH=${ARROW_HOME}/lib/pkgconfig
 export GI_TYPELIB_PATH=${ARROW_HOME}/lib/girepository-1.0
diff --git a/ci/scripts/swift_test.sh b/ci/scripts/swift_test.sh
index b523e3891d93c..aba90f31e50d5 100755
--- a/ci/scripts/swift_test.sh
+++ b/ci/scripts/swift_test.sh
@@ -34,10 +34,14 @@ popd
 
 source_dir=${1}/swift/Arrow
 pushd ${source_dir}
+sed 's/\/\/ build://g' Package.swift > Package.swift.build
+mv Package.swift.build Package.swift
 swift test
 popd
 
 source_dir=${1}/swift/ArrowFlight
 pushd ${source_dir}
+sed 's/\/\/ build://g' Package.swift > Package.swift.build
+mv Package.swift.build Package.swift
 swift test
 popd
diff --git a/ci/vcpkg/ports.patch b/ci/vcpkg/ports.patch
index 0d4fb540a2003..136b719ea72dd 100644
--- a/ci/vcpkg/ports.patch
+++ b/ci/vcpkg/ports.patch
@@ -1,11 +1,11 @@
 diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
-index bdc544e9e..53f6bbc3b 100644
+index 7cab6f726..697ab1bb4 100644
 --- a/ports/curl/portfile.cmake
 +++ b/ports/curl/portfile.cmake
-@@ -74,9 +74,12 @@ vcpkg_cmake_configure(
-         -DENABLE_MANUAL=OFF
+@@ -84,9 +84,12 @@ vcpkg_cmake_configure(
+         -DBUILD_TESTING=OFF
+         -DENABLE_CURL_MANUAL=OFF
          -DCURL_CA_FALLBACK=ON
-         -DCURL_USE_LIBPSL=OFF
 +        -DCURL_CA_PATH=none
 +        -DCURL_CA_BUNDLE=none
          -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
@@ -15,6 +15,19 @@ index bdc544e9e..53f6bbc3b 100644
  )
  vcpkg_cmake_install()
  vcpkg_copy_pdbs()
+diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
+index a79c72a59..6b7fa6a66 100644
+--- a/ports/llvm/portfile.cmake
++++ b/ports/llvm/portfile.cmake
+@@ -292,6 +292,8 @@ vcpkg_cmake_configure(
+         ${FEATURE_OPTIONS}
+     MAYBE_UNUSED_VARIABLES 
+         COMPILER_RT_ENABLE_IOS
++        BOLT_TOOLS_INSTALL_DIR
++        LIBOMP_INSTALL_ALIASES
+ )
+ 
+ vcpkg_cmake_install(ADD_BIN_TO_PATH)
 diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake
 index 0c7098082..c603c3653 100644
 --- a/ports/snappy/portfile.cmake
@@ -52,16 +65,3 @@ index 000000000..e839c93a4
 + }
 + 
 + static inline bool LeftShiftOverflows(uint8_t value, uint32_t shift) {
-diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
-index bf9397b66..c3112b673 100644
---- a/ports/llvm/portfile.cmake
-+++ b/ports/llvm/portfile.cmake
-@@ -293,6 +293,8 @@ vcpkg_cmake_configure(
-         ${FEATURE_OPTIONS}
-     MAYBE_UNUSED_VARIABLES 
-         COMPILER_RT_ENABLE_IOS
-+        BOLT_TOOLS_INSTALL_DIR
-+        LIBOMP_INSTALL_ALIASES
- )
- 
- vcpkg_cmake_install(ADD_BIN_TO_PATH)
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 1fbf0bfcfb528..679842c31e0b1 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -71,7 +71,7 @@ if(POLICY CMP0135)
   cmake_policy(SET CMP0135 NEW)
 endif()
 
-set(ARROW_VERSION "16.0.0-SNAPSHOT")
+set(ARROW_VERSION "17.0.0-SNAPSHOT")
 
 string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" ARROW_BASE_VERSION "${ARROW_VERSION}")
 
@@ -256,9 +256,6 @@ if(ARROW_USE_CCACHE
 endif()
 
 if(ARROW_OPTIONAL_INSTALL)
-  # Don't make the "install" target depend on the "all" target
-  set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true)
-
   set(INSTALL_IS_OPTIONAL OPTIONAL)
 endif()
 
@@ -434,10 +431,6 @@ endif()
 # Compiler flags
 #
 
-if(ARROW_NO_DEPRECATED_API)
-  add_definitions(-DARROW_NO_DEPRECATED_API)
-endif()
-
 if(ARROW_EXTRA_ERROR_CONTEXT)
   add_definitions(-DARROW_EXTRA_ERROR_CONTEXT)
 endif()
@@ -711,7 +704,7 @@ list(APPEND ARROW_TEST_LINK_LIBS ${ARROW_GTEST_GMOCK} ${ARROW_GTEST_GTEST_MAIN})
 if(ARROW_BUILD_BENCHMARKS)
   set(ARROW_BENCHMARK_LINK_LIBS benchmark::benchmark_main ${ARROW_TEST_LINK_LIBS})
   if(WIN32)
-    list(APPEND ARROW_BENCHMARK_LINK_LIBS Shlwapi.dll)
+    list(APPEND ARROW_BENCHMARK_LINK_LIBS shlwapi)
   endif()
 endif()
 
diff --git a/cpp/CMakePresets.json b/cpp/CMakePresets.json
index 9d99b3b2a79e0..cb4cdfc03ac82 100644
--- a/cpp/CMakePresets.json
+++ b/cpp/CMakePresets.json
@@ -46,6 +46,32 @@
         "CMAKE_BUILD_TYPE": "RelWithDebInfo"
       }
     },
+    {
+      "name": "features-emscripten",
+      "hidden": true,
+      "cacheVariables": {
+        "ARROW_ACERO": "ON",
+        "ARROW_BUILD_SHARED": "OFF",
+        "ARROW_BUILD_STATIC": "ON",
+        "ARROW_CUDA": "OFF",
+        "ARROW_DEPENDENCY_SOURCE": "BUNDLED",
+        "ARROW_DEPENDENCY_USE_SHARED": "OFF",
+        "ARROW_ENABLE_THREADING": "OFF",
+        "ARROW_FLIGHT": "OFF",
+        "ARROW_IPC": "ON",
+        "ARROW_JEMALLOC": "OFF",
+        "ARROW_MIMALLOC": "OFF",
+        "ARROW_ORC": "ON",
+        "ARROW_RUNTIME_SIMD_LEVEL": "NONE",
+        "ARROW_S3": "OFF",
+        "ARROW_SIMD_LEVEL": "NONE",
+        "ARROW_SUBSTRAIT": "ON",
+        "ARROW_WITH_BROTLI": "ON",
+        "ARROW_WITH_OPENTELEMETRY": "OFF",
+        "ARROW_WITH_SNAPPY": "ON",
+        "CMAKE_C_BYTE_ORDER": "LITTLE_ENDIAN"
+      }
+    },
     {
       "name": "features-minimal",
       "hidden": true,
@@ -194,6 +220,14 @@
         "PARQUET_REQUIRE_ENCRYPTION": "ON"
       }
     },
+    {
+      "name": "features-valgrind",
+      "hidden": true,
+      "cacheVariables": {
+        "ARROW_RUNTIME_SIMD_LEVEL": "AVX2",
+        "ARROW_TEST_MEMCHECK": "ON"
+      }
+    },
     {
       "name": "ninja-debug-minimal",
       "inherits": [
@@ -305,6 +339,46 @@
       "displayName": "Debug build with everything enabled (except benchmarks)",
       "cacheVariables": {}
     },
+    {
+      "name": "ninja-debug-valgrind-basic",
+      "inherits": [
+        "base-debug",
+        "features-basic",
+        "features-valgrind"
+      ],
+      "displayName": "Debug build for Valgrind with reduced dependencies",
+      "cacheVariables": {}
+    },
+    {
+      "name": "ninja-debug-valgrind",
+      "inherits": [
+        "base-debug",
+        "features-main",
+        "features-valgrind"
+      ],
+      "displayName": "Debug build for Valgrind with more optional components",
+      "cacheVariables": {}
+    },
+    {
+      "name": "ninja-debug-valgrind-minimal",
+      "inherits": [
+        "base-debug",
+        "features-minimal",
+        "features-valgrind"
+      ],
+      "displayName": "Debug build for Valgrind without anything enabled",
+      "cacheVariables": {}
+    },
+    {
+      "name": "ninja-debug-valgrind-maximal",
+      "inherits": [
+        "base-debug",
+        "features-maximal",
+        "features-valgrind"
+      ],
+      "displayName": "Debug build for Valgrind with everything enabled",
+      "cacheVariables": {}
+    },
     {
       "name": "ninja-release-minimal",
       "inherits": [
@@ -341,6 +415,24 @@
       "displayName": "Release build with CUDA integration",
       "cacheVariables": {}
     },
+    {
+      "name": "ninja-debug-emscripten",
+      "inherits": [
+        "features-emscripten",
+        "base-debug"
+      ],
+      "displayName": "Debug build which builds an Emscripten library",
+      "cacheVariables": {}
+    },
+    {
+      "name": "ninja-release-emscripten",
+      "inherits": [
+        "features-emscripten",
+        "base-release"
+      ],
+      "displayName": "Release build which builds an Emscripten library",
+      "cacheVariables": {}
+    },
     {
       "name": "ninja-release-flight",
       "inherits": [
diff --git a/cpp/apidoc/Doxyfile b/cpp/apidoc/Doxyfile
index e19c933cd454f..5be93032c00d9 100644
--- a/cpp/apidoc/Doxyfile
+++ b/cpp/apidoc/Doxyfile
@@ -2168,16 +2168,17 @@ INCLUDE_FILE_PATTERNS  =
 
 PREDEFINED             = __attribute__(x)= \
                          __declspec(x)= \
-                         PARQUET_EXPORT= \
-                         GANDIVA_EXPORT= \
-                         ARROW_EXPORT= \
                          ARROW_ACERO_EXPORT= \
+                         ARROW_ARG_UNUSED(x)=x \
+                         ARROW_DEPRECATED(x)= \
                          ARROW_DS_EXPORT= \
                          ARROW_ENGINE_EXPORT= \
+                         ARROW_EXPORT= \
+                         ARROW_EXTERN_TEMPLATE= \
                          ARROW_FLIGHT_EXPORT= \
                          ARROW_FLIGHT_SQL_EXPORT= \
-                         ARROW_EXTERN_TEMPLATE= \
-                         ARROW_DEPRECATED(x)=
+                         GANDIVA_EXPORT= \
+                         PARQUET_EXPORT=
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
diff --git a/cpp/build-support/emscripten-test-init.js b/cpp/build-support/emscripten-test-init.js
new file mode 100644
index 0000000000000..bbb542a29f021
--- /dev/null
+++ b/cpp/build-support/emscripten-test-init.js
@@ -0,0 +1,24 @@
+// 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.
+
+var Module = {
+};
+
+// make sure tests can access the current parquet test data files
+Module.preRun = () => {ENV.PARQUET_TEST_DATA = process.env.PARQUET_TEST_DATA;
+    ENV.ARROW_TEST_DATA = process.env.ARROW_TEST_DATA;
+};
\ No newline at end of file
diff --git a/cpp/build-support/update-thrift.sh b/cpp/build-support/update-thrift.sh
index 9b8f2539cffe3..9e050a5e49d64 100755
--- a/cpp/build-support/update-thrift.sh
+++ b/cpp/build-support/update-thrift.sh
@@ -20,4 +20,4 @@
 
 # Run this from cpp/ directory. thrift is expected to be in your path
 
-thrift --gen cpp:moveable_types -out src/generated src/parquet/parquet.thrift
+thrift --gen cpp:moveable_types,templates -out src/generated src/parquet/parquet.thrift
diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake
index 7a45e9cca59de..e7523add27223 100644
--- a/cpp/cmake_modules/BuildUtils.cmake
+++ b/cpp/cmake_modules/BuildUtils.cmake
@@ -760,8 +760,8 @@ function(ADD_TEST_CASE REL_TEST_NAME)
                valgrind --suppressions=valgrind.supp --tool=memcheck --gen-suppressions=all \
                  --num-callers=500 --leak-check=full --leak-check-heuristics=stdstring \
                  --error-exitcode=1 ${TEST_PATH} ${ARG_TEST_ARGUMENTS}")
-  elseif(WIN32)
-    add_test(${TEST_NAME} ${TEST_PATH} ${ARG_TEST_ARGUMENTS})
+  elseif(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+    add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME} ${ARG_TEST_ARGUMENTS})
   else()
     add_test(${TEST_NAME}
              ${BUILD_SUPPORT_DIR}/run-test.sh
diff --git a/cpp/cmake_modules/DefineOptions.cmake b/cpp/cmake_modules/DefineOptions.cmake
index 5b8bcb3ac6965..41466a1c22404 100644
--- a/cpp/cmake_modules/DefineOptions.cmake
+++ b/cpp/cmake_modules/DefineOptions.cmake
@@ -158,8 +158,6 @@ if(ARROW_DEFINE_OPTIONS)
   define_option_string(ARROW_GIT_DESCRIPTION "The Arrow git commit description (if any)"
                        "")
 
-  define_option(ARROW_NO_DEPRECATED_API "Exclude deprecated APIs from build" OFF)
-
   define_option(ARROW_POSITION_INDEPENDENT_CODE
                 "Whether to create position-independent target" ON)
 
@@ -170,6 +168,8 @@ takes precedence over ccache if a storage backend is configured" ON)
 
   define_option(ARROW_USE_LD_GOLD "Use ld.gold for linking on Linux (if available)" OFF)
 
+  define_option(ARROW_USE_LLD "Use the LLVM lld for linking (if available)" OFF)
+
   define_option(ARROW_USE_MOLD "Use mold for linking on Linux (if available)" OFF)
 
   define_option(ARROW_USE_PRECOMPILED_HEADERS "Use precompiled headers when compiling"
diff --git a/cpp/cmake_modules/FindProtobufAlt.cmake b/cpp/cmake_modules/FindProtobufAlt.cmake
index 15fe1b4f27ef7..703e05c4731b6 100644
--- a/cpp/cmake_modules/FindProtobufAlt.cmake
+++ b/cpp/cmake_modules/FindProtobufAlt.cmake
@@ -28,12 +28,27 @@ endif()
 if(ProtobufAlt_FIND_QUIETLY)
   list(APPEND find_package_args QUIET)
 endif()
-find_package(Protobuf ${find_package_args})
-set(ProtobufAlt_FOUND ${Protobuf_FOUND})
+find_package(protobuf CONFIG ${find_package_args})
+set(ProtobufAlt_FOUND ${protobuf_FOUND})
 if(ProtobufAlt_FOUND)
-  set(ProtobufAlt_VERSION ${Protobuf_VERSION})
-  set(ProtobufAlt_VERSION_MAJOR ${Protobuf_VERSION_MAJOR})
-  set(ProtobufAlt_VERSION_MINOR ${Protobuf_VERSION_MINOR})
-  set(ProtobufAlt_VERSION_PATCH ${Protobuf_VERSION_PATCH})
-  set(ProtobufAlt_VERSION_TWEEK ${Protobuf_VERSION_TWEEK})
+  if(Protobuf_PROTOC_EXECUTABLE)
+    # work around https://github.com/protocolbuffers/protobuf/issues/14576
+    set_target_properties(protobuf::protoc PROPERTIES IMPORTED_LOCATION_RELEASE
+                                                      "${Protobuf_PROTOC_EXECUTABLE}")
+  endif()
+  set(ProtobufAlt_VERSION ${protobuf_VERSION})
+  set(ProtobufAlt_VERSION_MAJOR ${protobuf_VERSION_MAJOR})
+  set(ProtobufAlt_VERSION_MINOR ${protobuf_VERSION_MINOR})
+  set(ProtobufAlt_VERSION_PATCH ${protobuf_VERSION_PATCH})
+  set(ProtobufAlt_VERSION_TWEEK ${protobuf_VERSION_TWEEK})
+else()
+  find_package(Protobuf ${find_package_args})
+  set(ProtobufAlt_FOUND ${Protobuf_FOUND})
+  if(ProtobufAlt_FOUND)
+    set(ProtobufAlt_VERSION ${Protobuf_VERSION})
+    set(ProtobufAlt_VERSION_MAJOR ${Protobuf_VERSION_MAJOR})
+    set(ProtobufAlt_VERSION_MINOR ${Protobuf_VERSION_MINOR})
+    set(ProtobufAlt_VERSION_PATCH ${Protobuf_VERSION_PATCH})
+    set(ProtobufAlt_VERSION_TWEEK ${Protobuf_VERSION_TWEEK})
+  endif()
 endif()
diff --git a/cpp/cmake_modules/FindorcAlt.cmake b/cpp/cmake_modules/FindorcAlt.cmake
index dc3b978cf4037..ce8cd11b4c3f0 100644
--- a/cpp/cmake_modules/FindorcAlt.cmake
+++ b/cpp/cmake_modules/FindorcAlt.cmake
@@ -29,6 +29,7 @@ endif()
 find_package(orc ${find_package_args})
 if(orc_FOUND)
   set(orcAlt_FOUND TRUE)
+  set(orcAlt_VERSION ${orc_VERSION})
   return()
 endif()
 
@@ -51,8 +52,17 @@ else()
             NAMES orc/orc-config.hh
             PATH_SUFFIXES ${ARROW_INCLUDE_PATH_SUFFIXES})
 endif()
+if(ORC_INCLUDE_DIR)
+  file(READ "${ORC_INCLUDE_DIR}/orc/orc-config.hh" ORC_CONFIG_HH_CONTENT)
+  string(REGEX MATCH "#define ORC_VERSION \"[0-9.]+\"" ORC_VERSION_DEFINITION
+               "${ORC_CONFIG_HH_CONTENT}")
+  string(REGEX MATCH "[0-9.]+" ORC_VERSION "${ORC_VERSION_DEFINITION}")
+endif()
 
-find_package_handle_standard_args(orcAlt REQUIRED_VARS ORC_STATIC_LIB ORC_INCLUDE_DIR)
+find_package_handle_standard_args(
+  orcAlt
+  REQUIRED_VARS ORC_STATIC_LIB ORC_INCLUDE_DIR
+  VERSION_VAR ORC_VERSION)
 
 if(orcAlt_FOUND)
   if(NOT TARGET orc::orc)
@@ -61,4 +71,5 @@ if(orcAlt_FOUND)
                           PROPERTIES IMPORTED_LOCATION "${ORC_STATIC_LIB}"
                                      INTERFACE_INCLUDE_DIRECTORIES "${ORC_INCLUDE_DIR}")
   endif()
+  set(orcAlt_VERSION ${ORC_VERSION})
 endif()
diff --git a/cpp/cmake_modules/Findutf8proc.cmake b/cpp/cmake_modules/Findutf8proc.cmake
index e347414090549..9721f76f0631b 100644
--- a/cpp/cmake_modules/Findutf8proc.cmake
+++ b/cpp/cmake_modules/Findutf8proc.cmake
@@ -19,7 +19,7 @@ if(utf8proc_FOUND)
   return()
 endif()
 
-if(ARROW_PACKAGE_KIND STREQUAL "vcpkg")
+if(ARROW_PACKAGE_KIND STREQUAL "vcpkg" OR VCPKG_TOOLCHAIN)
   set(find_package_args "")
   if(utf8proc_FIND_VERSION)
     list(APPEND find_package_args ${utf8proc_FIND_VERSION})
diff --git a/cpp/cmake_modules/SetupCxxFlags.cmake b/cpp/cmake_modules/SetupCxxFlags.cmake
index 90decb4224ec6..e2e1c4412abd0 100644
--- a/cpp/cmake_modules/SetupCxxFlags.cmake
+++ b/cpp/cmake_modules/SetupCxxFlags.cmake
@@ -24,7 +24,9 @@ include(CheckCXXSourceCompiles)
 message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}")
 
 if(NOT DEFINED ARROW_CPU_FLAG)
-  if(CMAKE_SYSTEM_PROCESSOR MATCHES "AMD64|amd64|X86|x86|i[3456]86|x64")
+  if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+    set(ARROW_CPU_FLAG "emscripten")
+  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "AMD64|amd64|X86|x86|i[3456]86|x64")
     set(ARROW_CPU_FLAG "x86")
   elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64|arm64")
     set(ARROW_CPU_FLAG "aarch64")
@@ -312,7 +314,13 @@ if("${BUILD_WARNING_LEVEL}" STREQUAL "CHECKIN")
     set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wall")
     set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wextra")
     set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wdocumentation")
-    set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wshorten-64-to-32")
+    set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -DARROW_WARN_DOCUMENTATION")
+    if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+      # size_t is 32 bit in Emscripten wasm32 - ignore conversion errors
+      set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-shorten-64-to-32")
+    else()
+      set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wshorten-64-to-32")
+    endif()
     set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-missing-braces")
     set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-unused-parameter")
     set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-constant-logical-operand")
@@ -322,8 +330,9 @@ if("${BUILD_WARNING_LEVEL}" STREQUAL "CHECKIN")
     set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wall")
     set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-conversion")
     set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-sign-conversion")
-    set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wunused-result")
     set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wdate-time")
+    string(APPEND CXX_ONLY_FLAGS " -Wredundant-move")
+    set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wunused-result")
   elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Intel" OR CMAKE_CXX_COMPILER_ID STREQUAL
                                                    "IntelLLVM")
     if(WIN32)
@@ -633,19 +642,23 @@ if(NOT WIN32 AND NOT APPLE)
       if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12.1.0")
           set(MOLD_LINKER_FLAGS "-fuse-ld=mold")
-          message(STATUS "Using optional mold linker")
         else()
           message(STATUS "Need GCC 12.1.0 or later to use mold linker: ${CMAKE_CXX_COMPILER_VERSION}"
           )
         endif()
       elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-        set(MOLD_LINKER_FLAGS "--ld-path=${LD_MOLD}")
-        message(STATUS "Using optional mold linker")
+        if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12.0.0")
+          set(MOLD_LINKER_FLAGS "--ld-path=${LD_MOLD}")
+        else()
+          message(STATUS "Need clang 12.0.0 or later to use mold linker: ${CMAKE_CXX_COMPILER_VERSION}"
+          )
+        endif()
       else()
         message(STATUS "Using the default linker because compiler doesn't support mold: ${CMAKE_CXX_COMPILER_ID}"
         )
       endif()
       if(MOLD_LINKER_FLAGS)
+        message(STATUS "Using optional mold linker")
         string(APPEND CMAKE_EXE_LINKER_FLAGS " ${MOLD_LINKER_FLAGS}")
         string(APPEND CMAKE_MODULE_LINKER_FLAGS " ${MOLD_LINKER_FLAGS}")
         string(APPEND CMAKE_SHARED_LINKER_FLAGS " ${MOLD_LINKER_FLAGS}")
@@ -656,6 +669,39 @@ if(NOT WIN32 AND NOT APPLE)
   endif()
 endif()
 
+if(ARROW_USE_LLD)
+  find_program(LD_LLD ld.lld)
+  if(LD_LLD)
+    unset(LLD_LINKER_FLAGS)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+      if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "9.1.0")
+        set(LLD_LINKER_FLAGS "-fuse-ld=lld")
+      else()
+        message(STATUS "Need GCC 9.1.0 or later to use LLD linker: ${CMAKE_CXX_COMPILER_VERSION}"
+        )
+      endif()
+    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+      if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "12.0.0")
+        set(LLD_LINKER_FLAGS "--ld-path=${LD_LLD}")
+      else()
+        message(STATUS "Need clang 12.0.0 or later to use LLD linker: ${CMAKE_CXX_COMPILER_VERSION}"
+        )
+      endif()
+    else()
+      message(STATUS "Using the default linker because compiler doesn't support LLD: ${CMAKE_CXX_COMPILER_ID}"
+      )
+    endif()
+    if(LLD_LINKER_FLAGS)
+      message(STATUS "Using optional LLVM LLD linker")
+      string(APPEND CMAKE_EXE_LINKER_FLAGS " ${LLD_LINKER_FLAGS}")
+      string(APPEND CMAKE_MODULE_LINKER_FLAGS " ${LLD_LINKER_FLAGS}")
+      string(APPEND CMAKE_SHARED_LINKER_FLAGS " ${LLD_LINKER_FLAGS}")
+    else()
+      message(STATUS "Using the default linker because the LLD isn't supported")
+    endif()
+  endif()
+endif()
+
 # compiler flags for different build types (run 'cmake -DCMAKE_BUILD_TYPE=<type> .')
 # For all builds:
 # For CMAKE_BUILD_TYPE=Debug
@@ -692,17 +738,36 @@ if(NOT MSVC)
   set(C_DEBUG_FLAGS "")
   set(CXX_DEBUG_FLAGS "")
   if(NOT MSVC)
-    if(NOT CMAKE_C_FLAGS_DEBUG MATCHES "-O")
-      string(APPEND C_DEBUG_FLAGS " -O0")
-    endif()
-    if(NOT CMAKE_CXX_FLAGS_DEBUG MATCHES "-O")
-      string(APPEND CXX_DEBUG_FLAGS " -O0")
-    endif()
-    if(ARROW_GGDB_DEBUG)
-      string(APPEND C_DEBUG_FLAGS " -ggdb")
-      string(APPEND CXX_DEBUG_FLAGS " -ggdb")
-      string(APPEND C_RELWITHDEBINFO_FLAGS " -ggdb")
-      string(APPEND CXX_RELWITHDEBINFO_FLAGS " -ggdb")
+    if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+      # with -g it uses DWARF debug info, which is really slow to build
+      # on emscripten (and uses tons of memory)
+      string(REPLACE "-g" " " CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
+      string(REPLACE "-g" " " CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
+      string(APPEND C_DEBUG_FLAGS " -g2")
+      string(APPEND CXX_DEBUG_FLAGS " -g2")
+      string(APPEND C_RELWITHDEBINFO_FLAGS " -g2")
+      string(APPEND CXX_RELWITHDEBINFO_FLAGS " -g2")
+      # without -O1, emscripten executables are *MASSIVE*. Don't use -O0
+      if(NOT CMAKE_C_FLAGS_DEBUG MATCHES "-O")
+        string(APPEND C_DEBUG_FLAGS " -O1")
+      endif()
+      if(NOT CMAKE_CXX_FLAGS_DEBUG MATCHES "-O")
+        string(APPEND CXX_DEBUG_FLAGS " -O1")
+      endif()
+    else()
+      if(NOT CMAKE_C_FLAGS_DEBUG MATCHES "-O")
+        string(APPEND C_DEBUG_FLAGS " -O0")
+      endif()
+      if(NOT CMAKE_CXX_FLAGS_DEBUG MATCHES "-O")
+        string(APPEND CXX_DEBUG_FLAGS " -O0")
+      endif()
+
+      if(ARROW_GGDB_DEBUG)
+        string(APPEND C_DEBUG_FLAGS " -ggdb")
+        string(APPEND CXX_DEBUG_FLAGS " -ggdb")
+        string(APPEND C_RELWITHDEBINFO_FLAGS " -ggdb")
+        string(APPEND CXX_RELWITHDEBINFO_FLAGS " -ggdb")
+      endif()
     endif()
   endif()
 
@@ -733,3 +798,40 @@ if(MSVC)
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MSVC_LINKER_FLAGS}")
   endif()
 endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+  # flags are:
+  # 1) We force *everything* to build as position independent
+  # 2) And with support for C++ exceptions
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -fexceptions")
+  # deprecated-literal-operator error is thrown in datetime (vendored lib in arrow)
+  set(CMAKE_CXX_FLAGS
+      "${CMAKE_CXX_FLAGS} -fPIC -fexceptions -Wno-error=deprecated-literal-operator")
+
+  # flags for creating shared libraries (only used in pyarrow, because
+  # Emscripten builds libarrow as static)
+  # flags are:
+  # 1) Tell it to use JavaScript / WebAssembly 64 bit number support.
+  # 2) Tell it to build with support for C++ exceptions
+  # 3) Skip linker flags error which happens with -soname parameter
+  set(ARROW_EMSCRIPTEN_LINKER_FLAGS "-sWASM_BIGINT=1 -fexceptions -Wno-error=linkflags")
+  set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS
+      "-sSIDE_MODULE=1 ${ARROW_EMSCRIPTEN_LINKER_FLAGS}")
+  set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS
+      "-sSIDE_MODULE=1 ${ARROW_EMSCRIPTEN_LINKER_FLAGS}")
+  set(CMAKE_SHARED_LINKER_FLAGS "-sSIDE_MODULE=1 ${ARROW_EMSCRIPTEN_LINKER_FLAGS}")
+  if(ARROW_TESTING)
+    # flags for building test executables for use in node
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "RELEASE")
+      set(CMAKE_EXE_LINKER_FLAGS
+          "${ARROW_EMSCRIPTEN_LINKER_FLAGS} -sALLOW_MEMORY_GROWTH -lnodefs.js -lnoderawfs.js --pre-js ${BUILD_SUPPORT_DIR}/emscripten-test-init.js"
+      )
+    else()
+      set(CMAKE_EXE_LINKER_FLAGS
+          "${ARROW_EMSCRIPTEN_LINKER_FLAGS} -sERROR_ON_WASM_CHANGES_AFTER_LINK=1 -sALLOW_MEMORY_GROWTH -lnodefs.js -lnoderawfs.js --pre-js ${BUILD_SUPPORT_DIR}/emscripten-test-init.js"
+      )
+    endif()
+  else()
+    set(CMAKE_EXE_LINKER_FLAGS "${ARROW_EMSCRIPTEN_LINKER_FLAGS} -sALLOW_MEMORY_GROWTH")
+  endif()
+endif()
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index ad7344b09dd4e..fe859a0121ca6 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -634,8 +634,10 @@ endif()
 if(DEFINED ENV{ARROW_CARES_URL})
   set(CARES_SOURCE_URL "$ENV{ARROW_CARES_URL}")
 else()
+  string(REPLACE "." "_" ARROW_CARES_BUILD_VERSION_UNDERSCORES
+                 ${ARROW_CARES_BUILD_VERSION})
   set_urls(CARES_SOURCE_URL
-           "https://c-ares.haxx.se/download/c-ares-${ARROW_CARES_BUILD_VERSION}.tar.gz"
+           "https://github.com/c-ares/c-ares/releases/download/cares-${ARROW_CARES_BUILD_VERSION_UNDERSCORES}/c-ares-${ARROW_CARES_BUILD_VERSION}.tar.gz"
            "${THIRDPARTY_MIRROR_URL}/cares-${ARROW_CARES_BUILD_VERSION}.tar.gz")
 endif()
 
@@ -976,6 +978,23 @@ set(EP_COMMON_CMAKE_ARGS
     -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
     -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE})
 
+# if building with a toolchain file, pass that through
+if(CMAKE_TOOLCHAIN_FILE)
+  list(APPEND EP_COMMON_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
+endif()
+
+# and crosscompiling emulator (for try_run() )
+if(CMAKE_CROSSCOMPILING_EMULATOR)
+  string(REPLACE ";" ${EP_LIST_SEPARATOR} EP_CMAKE_CROSSCOMPILING_EMULATOR
+                 "${CMAKE_CROSSCOMPILING_EMULATOR}")
+  list(APPEND EP_COMMON_CMAKE_ARGS
+       -DCMAKE_CROSSCOMPILING_EMULATOR=${EP_CMAKE_CROSSCOMPILING_EMULATOR})
+endif()
+
+if(CMAKE_PROJECT_INCLUDE)
+  list(APPEND EP_COMMON_CMAKE_ARGS -DCMAKE_PROJECT_INCLUDE=${CMAKE_PROJECT_INCLUDE})
+endif()
+
 # Enable s/ccache if set by parent.
 if(CMAKE_C_COMPILER_LAUNCHER AND CMAKE_CXX_COMPILER_LAUNCHER)
   list(APPEND EP_COMMON_CMAKE_ARGS
@@ -1173,6 +1192,12 @@ if(MSVC AND ARROW_USE_STATIC_CRT)
   set(Boost_USE_STATIC_RUNTIME ON)
 endif()
 set(Boost_ADDITIONAL_VERSIONS
+    "1.84.0"
+    "1.84"
+    "1.83.0"
+    "1.83"
+    "1.82.0"
+    "1.82"
     "1.81.0"
     "1.81"
     "1.80.0"
@@ -1240,7 +1265,7 @@ endif()
 # - S3FS and Flight benchmarks need Boost at runtime.
 if(ARROW_BUILD_INTEGRATION
    OR ARROW_BUILD_TESTS
-   OR (ARROW_FLIGHT AND ARROW_BUILD_BENCHMARKS)
+   OR (ARROW_FLIGHT AND (ARROW_TESTING OR ARROW_BUILD_BENCHMARKS))
    OR (ARROW_S3 AND ARROW_BUILD_BENCHMARKS))
   set(ARROW_USE_BOOST TRUE)
   set(ARROW_BOOST_REQUIRE_LIBRARY TRUE)
@@ -1349,6 +1374,14 @@ macro(build_snappy)
     set(SNAPPY_PATCH_COMMAND)
   endif()
 
+  if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+    # ignore linker flag errors, as Snappy sets
+    # -Werror -Wall, and Emscripten doesn't support -soname
+    list(APPEND SNAPPY_CMAKE_ARGS
+         "-DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}"
+         "-Wno-error=linkflags")
+  endif()
+
   externalproject_add(snappy_ep
                       ${EP_COMMON_OPTIONS}
                       BUILD_IN_SOURCE 1
@@ -1394,6 +1427,7 @@ macro(build_brotli)
   message(STATUS "Building brotli from source")
   set(BROTLI_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/brotli_ep/src/brotli_ep-install")
   set(BROTLI_INCLUDE_DIR "${BROTLI_PREFIX}/include")
+  set(BROTLI_LIB_DIR "${BROTLI_PREFIX}/lib")
   set(BROTLI_STATIC_LIBRARY_ENC
       "${BROTLI_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc-static${CMAKE_STATIC_LIBRARY_SUFFIX}"
   )
@@ -1405,6 +1439,26 @@ macro(build_brotli)
   )
   set(BROTLI_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS} "-DCMAKE_INSTALL_PREFIX=${BROTLI_PREFIX}")
 
+  set(BROTLI_EP_OPTIONS)
+  if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+    # "cmake install" is disabled for Brotli on Emscripten, so the
+    # default INSTALL_COMMAND fails. We need to disable the default
+    # INSTALL_COMMAND.
+    list(APPEND
+         BROTLI_EP_OPTIONS
+         INSTALL_COMMAND
+         ${CMAKE_COMMAND}
+         -E
+         true)
+
+    set(BROTLI_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/brotli_ep-prefix/src/brotli_ep-build)
+    set(BROTLI_BUILD_LIBS
+        "${BROTLI_BUILD_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}brotlienc-static${CMAKE_STATIC_LIBRARY_SUFFIX}"
+        "${BROTLI_BUILD_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}brotlidec-static${CMAKE_STATIC_LIBRARY_SUFFIX}"
+        "${BROTLI_BUILD_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}brotlicommon-static${CMAKE_STATIC_LIBRARY_SUFFIX}"
+    )
+  endif()
+
   externalproject_add(brotli_ep
                       ${EP_COMMON_OPTIONS}
                       URL ${BROTLI_SOURCE_URL}
@@ -1414,7 +1468,20 @@ macro(build_brotli)
                                        "${BROTLI_STATIC_LIBRARY_COMMON}"
                                        ${BROTLI_BUILD_BYPRODUCTS}
                       CMAKE_ARGS ${BROTLI_CMAKE_ARGS}
-                      STEP_TARGETS headers_copy)
+                      STEP_TARGETS headers_copy ${BROTLI_EP_OPTIONS})
+
+  if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+    # Copy the libraries to our install directory manually.
+    set(BROTLI_BUILD_INCLUDE_DIR
+        ${CMAKE_CURRENT_BINARY_DIR}/brotli_ep-prefix/src/brotli_ep/c/include/brotli)
+    add_custom_command(TARGET brotli_ep
+                       POST_BUILD
+                       COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                               ${BROTLI_BUILD_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}*${CMAKE_STATIC_LIBRARY_SUFFIX}
+                               ${BROTLI_LIB_DIR}
+                       COMMAND ${CMAKE_COMMAND} -E copy_directory
+                               ${BROTLI_BUILD_INCLUDE_DIR} ${BROTLI_INCLUDE_DIR}/brotli)
+  endif()
 
   file(MAKE_DIRECTORY "${BROTLI_INCLUDE_DIR}")
 
@@ -1657,6 +1724,9 @@ macro(build_thrift)
   if(DEFINED BOOST_ROOT)
     list(APPEND THRIFT_CMAKE_ARGS "-DBOOST_ROOT=${BOOST_ROOT}")
   endif()
+  if(DEFINED Boost_INCLUDE_DIR)
+    list(APPEND THRIFT_CMAKE_ARGS "-DBoost_INCLUDE_DIR=${Boost_INCLUDE_DIR}")
+  endif()
   if(DEFINED Boost_NAMESPACE)
     list(APPEND THRIFT_CMAKE_ARGS "-DBoost_NAMESPACE=${Boost_NAMESPACE}")
   endif()
@@ -1798,6 +1868,36 @@ macro(build_protobuf)
   add_dependencies(arrow::protobuf::protoc protobuf_ep)
 
   list(APPEND ARROW_BUNDLED_STATIC_LIBS arrow::protobuf::libprotobuf)
+
+  if(CMAKE_CROSSCOMPILING)
+    # If we are cross compiling, we need to build protoc for the host
+    # system also, as it is used when building Arrow
+    # We do this by calling CMake as a child process
+    # with CXXFLAGS / CFLAGS and CMake flags cleared.
+    set(PROTOBUF_HOST_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/protobuf_ep_host-install")
+    set(PROTOBUF_HOST_COMPILER "${PROTOBUF_HOST_PREFIX}/bin/protoc")
+
+    set(PROTOBUF_HOST_CMAKE_ARGS
+        "-DCMAKE_CXX_FLAGS="
+        "-DCMAKE_C_FLAGS="
+        "-DCMAKE_INSTALL_PREFIX=${PROTOBUF_HOST_PREFIX}"
+        -Dprotobuf_BUILD_TESTS=OFF
+        -Dprotobuf_DEBUG_POSTFIX=)
+
+    externalproject_add(protobuf_ep_host
+                        ${EP_COMMON_OPTIONS}
+                        CMAKE_ARGS ${PROTOBUF_HOST_CMAKE_ARGS}
+                        BUILD_BYPRODUCTS "${PROTOBUF_HOST_COMPILER}"
+                        BUILD_IN_SOURCE 1
+                        URL ${PROTOBUF_SOURCE_URL}
+                        URL_HASH "SHA256=${ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM}")
+
+    add_executable(arrow::protobuf::host_protoc IMPORTED)
+    set_target_properties(arrow::protobuf::host_protoc
+                          PROPERTIES IMPORTED_LOCATION "${PROTOBUF_HOST_COMPILER}")
+
+    add_dependencies(arrow::protobuf::host_protoc protobuf_ep_host)
+  endif()
 endmacro()
 
 if(ARROW_WITH_PROTOBUF)
@@ -1862,7 +1962,11 @@ if(ARROW_WITH_PROTOBUF)
   else()
     set(ARROW_PROTOBUF_LIBPROTOC protobuf::libprotoc)
   endif()
-  if(TARGET arrow::protobuf::protoc)
+  if(TARGET arrow::protobuf::host_protoc)
+    # make sure host protoc is used for compiling protobuf files
+    # during build of e.g. orc
+    set(ARROW_PROTOBUF_PROTOC arrow::protobuf::host_protoc)
+  elseif(TARGET arrow::protobuf::protoc)
     set(ARROW_PROTOBUF_PROTOC arrow::protobuf::protoc)
   else()
     if(NOT TARGET protobuf::protoc)
@@ -2164,8 +2268,15 @@ function(build_gtest)
   if(APPLE)
     string(APPEND CMAKE_CXX_FLAGS " -Wno-unused-value" " -Wno-ignored-attributes")
   endif()
-  set(BUILD_SHARED_LIBS ON)
-  set(BUILD_STATIC_LIBS OFF)
+  # If we're building static libs for Emscripten, we need to build *everything* as
+  # static libs.
+  if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+    set(BUILD_SHARED_LIBS OFF)
+    set(BUILD_STATIC_LIBS ON)
+  else()
+    set(BUILD_SHARED_LIBS ON)
+    set(BUILD_STATIC_LIBS OFF)
+  endif()
   # We need to use "cache" variable to override the default
   # INSTALL_GTEST option by this value. See also:
   # https://cmake.org/cmake/help/latest/policy/CMP0077.html
@@ -2403,37 +2514,58 @@ endif()
 
 macro(build_zlib)
   message(STATUS "Building ZLIB from source")
-  set(ZLIB_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/zlib_ep/src/zlib_ep-install")
-  if(MSVC)
-    if(${UPPERCASE_BUILD_TYPE} STREQUAL "DEBUG")
-      set(ZLIB_STATIC_LIB_NAME zlibstaticd.lib)
-    else()
-      set(ZLIB_STATIC_LIB_NAME zlibstatic.lib)
+
+  # ensure zlib is built with -fpic
+  # and make sure that the build finds the version in Emscripten ports
+  # - n.b. the actual linking happens because -sUSE_ZLIB=1 is
+  # set in the compiler variables, but cmake expects
+  # it to exist at configuration time if we aren't building it as
+  # bundled. We need to do this for all packages
+  # not just zlib as some depend on zlib, but we don't rebuild
+  # if it exists already
+  if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+    # build zlib using Emscripten ports
+    if(NOT EXISTS ${EMSCRIPTEN_SYSROOT}/lib/wasm32-emscripten/pic/libz.a)
+      execute_process(COMMAND embuilder --pic --force build zlib)
     endif()
+    add_library(ZLIB::ZLIB STATIC IMPORTED)
+    set_property(TARGET ZLIB::ZLIB
+                 PROPERTY IMPORTED_LOCATION
+                          "${EMSCRIPTEN_SYSROOT}/lib/wasm32-emscripten/pic/libz.a")
+    list(APPEND ARROW_BUNDLED_STATIC_LIBS ZLIB::ZLIB)
   else()
-    set(ZLIB_STATIC_LIB_NAME libz.a)
-  endif()
-  set(ZLIB_STATIC_LIB "${ZLIB_PREFIX}/lib/${ZLIB_STATIC_LIB_NAME}")
-  set(ZLIB_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS} "-DCMAKE_INSTALL_PREFIX=${ZLIB_PREFIX}")
+    set(ZLIB_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/zlib_ep/src/zlib_ep-install")
+    if(MSVC)
+      if(${UPPERCASE_BUILD_TYPE} STREQUAL "DEBUG")
+        set(ZLIB_STATIC_LIB_NAME zlibstaticd.lib)
+      else()
+        set(ZLIB_STATIC_LIB_NAME zlibstatic.lib)
+      endif()
+    else()
+      set(ZLIB_STATIC_LIB_NAME libz.a)
+    endif()
+    set(ZLIB_STATIC_LIB "${ZLIB_PREFIX}/lib/${ZLIB_STATIC_LIB_NAME}")
+    set(ZLIB_CMAKE_ARGS ${EP_COMMON_CMAKE_ARGS} "-DCMAKE_INSTALL_PREFIX=${ZLIB_PREFIX}")
 
-  externalproject_add(zlib_ep
-                      ${EP_COMMON_OPTIONS}
-                      URL ${ZLIB_SOURCE_URL}
-                      URL_HASH "SHA256=${ARROW_ZLIB_BUILD_SHA256_CHECKSUM}"
-                      BUILD_BYPRODUCTS "${ZLIB_STATIC_LIB}"
-                      CMAKE_ARGS ${ZLIB_CMAKE_ARGS})
+    externalproject_add(zlib_ep
+                        ${EP_COMMON_OPTIONS}
+                        URL ${ZLIB_SOURCE_URL}
+                        URL_HASH "SHA256=${ARROW_ZLIB_BUILD_SHA256_CHECKSUM}"
+                        BUILD_BYPRODUCTS "${ZLIB_STATIC_LIB}"
+                        CMAKE_ARGS ${ZLIB_CMAKE_ARGS})
 
-  file(MAKE_DIRECTORY "${ZLIB_PREFIX}/include")
+    file(MAKE_DIRECTORY "${ZLIB_PREFIX}/include")
 
-  add_library(ZLIB::ZLIB STATIC IMPORTED)
-  set(ZLIB_LIBRARIES ${ZLIB_STATIC_LIB})
-  set(ZLIB_INCLUDE_DIRS "${ZLIB_PREFIX}/include")
-  set_target_properties(ZLIB::ZLIB PROPERTIES IMPORTED_LOCATION ${ZLIB_LIBRARIES})
-  target_include_directories(ZLIB::ZLIB BEFORE INTERFACE "${ZLIB_INCLUDE_DIRS}")
+    add_library(ZLIB::ZLIB STATIC IMPORTED)
+    set(ZLIB_LIBRARIES ${ZLIB_STATIC_LIB})
+    set(ZLIB_INCLUDE_DIRS "${ZLIB_PREFIX}/include")
+    set_target_properties(ZLIB::ZLIB PROPERTIES IMPORTED_LOCATION ${ZLIB_LIBRARIES})
+    target_include_directories(ZLIB::ZLIB BEFORE INTERFACE "${ZLIB_INCLUDE_DIRS}")
 
-  add_dependencies(ZLIB::ZLIB zlib_ep)
+    add_dependencies(ZLIB::ZLIB zlib_ep)
+    list(APPEND ARROW_BUNDLED_STATIC_LIBS ZLIB::ZLIB)
+  endif()
 
-  list(APPEND ARROW_BUNDLED_STATIC_LIBS ZLIB::ZLIB)
   set(ZLIB_VENDORED TRUE)
 endmacro()
 
@@ -2689,11 +2821,13 @@ macro(build_utf8proc)
 endmacro()
 
 if(ARROW_WITH_UTF8PROC)
-  resolve_dependency(utf8proc
-                     PC_PACKAGE_NAMES
-                     libutf8proc
-                     REQUIRED_VERSION
-                     "2.2.0")
+  set(utf8proc_resolve_dependency_args utf8proc PC_PACKAGE_NAMES libutf8proc)
+  if(NOT VCPKG_TOOLCHAIN)
+    # utf8proc in vcpkg doesn't provide version information:
+    # https://github.com/microsoft/vcpkg/issues/39176
+    list(APPEND utf8proc_resolve_dependency_args REQUIRED_VERSION "2.2.0")
+  endif()
+  resolve_dependency(${utf8proc_resolve_dependency_args})
 endif()
 
 macro(build_cares)
@@ -4390,6 +4524,10 @@ macro(build_orc)
       "-DPROTOBUF_LIBRARY=$<TARGET_FILE:${ARROW_PROTOBUF_LIBPROTOBUF}>"
       "-DPROTOC_LIBRARY=$<TARGET_FILE:${ARROW_PROTOBUF_LIBPROTOC}>"
       "-DSNAPPY_HOME=${ORC_SNAPPY_ROOT}"
+      "-DSNAPPY_LIBRARY=$<TARGET_FILE:${Snappy_TARGET}>"
+      "-DLZ4_LIBRARY=$<TARGET_FILE:LZ4::lz4>"
+      "-DLZ4_STATIC_LIB=$<TARGET_FILE:LZ4::lz4>"
+      "-DLZ4_INCLUDE_DIR=${ORC_LZ4_ROOT}/include"
       "-DSNAPPY_INCLUDE_DIR=${ORC_SNAPPY_INCLUDE_DIR}"
       "-DZSTD_HOME=${ORC_ZSTD_ROOT}"
       "-DZSTD_INCLUDE_DIR=$<TARGET_PROPERTY:${ARROW_ZSTD_LIBZSTD},INTERFACE_INCLUDE_DIRECTORIES>"
@@ -4431,6 +4569,15 @@ macro(build_orc)
     endif()
     target_link_libraries(orc::orc INTERFACE ${CMAKE_DL_LIBS})
   endif()
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9")
+      target_link_libraries(orc::orc INTERFACE stdc++fs)
+    endif()
+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "8")
+      target_link_libraries(orc::orc INTERFACE c++fs)
+    endif()
+  endif()
 
   add_dependencies(orc::orc orc_ep)
 
@@ -4440,6 +4587,11 @@ endmacro()
 if(ARROW_ORC)
   resolve_dependency(orc HAVE_ALT TRUE)
   target_link_libraries(orc::orc INTERFACE ${ARROW_PROTOBUF_LIBPROTOBUF})
+  if(ORC_VENDORED)
+    set(ARROW_ORC_VERSION ${ARROW_ORC_BUILD_VERSION})
+  else()
+    set(ARROW_ORC_VERSION ${orcAlt_VERSION})
+  endif()
   message(STATUS "Found ORC static library: ${ORC_STATIC_LIB}")
   message(STATUS "Found ORC headers: ${ORC_INCLUDE_DIR}")
 endif()
@@ -4463,8 +4615,11 @@ macro(build_opentelemetry)
   set(_OPENTELEMETRY_LIBS
       common
       http_client_curl
+      logs
+      ostream_log_record_exporter
       ostream_span_exporter
       otlp_http_client
+      otlp_http_log_record_exporter
       otlp_http_exporter
       otlp_recordable
       proto
@@ -4497,6 +4652,14 @@ macro(build_opentelemetry)
       set(_OPENTELEMETRY_STATIC_LIBRARY
           "${OPENTELEMETRY_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_exporter_otlp_http${CMAKE_STATIC_LIBRARY_SUFFIX}"
       )
+    elseif(_OPENTELEMETRY_LIB STREQUAL "otlp_http_log_record_exporter")
+      set(_OPENTELEMETRY_STATIC_LIBRARY
+          "${OPENTELEMETRY_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_exporter_otlp_http_log${CMAKE_STATIC_LIBRARY_SUFFIX}"
+      )
+    elseif(_OPENTELEMETRY_LIB STREQUAL "ostream_log_record_exporter")
+      set(_OPENTELEMETRY_STATIC_LIBRARY
+          "${OPENTELEMETRY_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_exporter_ostream_logs${CMAKE_STATIC_LIBRARY_SUFFIX}"
+      )
     else()
       set(_OPENTELEMETRY_STATIC_LIBRARY
           "${OPENTELEMETRY_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}opentelemetry_${_OPENTELEMETRY_LIB}${CMAKE_STATIC_LIBRARY_SUFFIX}"
@@ -4531,9 +4694,16 @@ macro(build_opentelemetry)
                       IMPORTED_LOCATION)
   list(APPEND
        OPENTELEMETRY_CMAKE_ARGS
-       -DWITH_OTLP=ON
        -DWITH_OTLP_HTTP=ON
        -DWITH_OTLP_GRPC=OFF
+       # Disabled because it seemed to cause linking errors. May be worth a closer look.
+       -DWITH_FUNC_TESTS=OFF
+       # These options are slated for removal in v1.14 and their features are deemed stable
+       # as of v1.13. However, setting their corresponding ENABLE_* macros in headers seems
+       # finicky - resulting in build failures or ABI-related runtime errors during HTTP
+       # client initialization. There may still be a solution, but we disable them for now.
+       -DWITH_OTLP_HTTP_SSL_PREVIEW=OFF
+       -DWITH_OTLP_HTTP_SSL_TLS_PREVIEW=OFF
        "-DProtobuf_INCLUDE_DIR=${OPENTELEMETRY_PROTOBUF_INCLUDE_DIR}"
        "-DProtobuf_LIBRARY=${OPENTELEMETRY_PROTOBUF_INCLUDE_DIR}"
        "-DProtobuf_PROTOC_EXECUTABLE=${OPENTELEMETRY_PROTOC_EXECUTABLE}")
@@ -4607,19 +4777,25 @@ macro(build_opentelemetry)
   target_link_libraries(opentelemetry-cpp::resources INTERFACE opentelemetry-cpp::common)
   target_link_libraries(opentelemetry-cpp::trace INTERFACE opentelemetry-cpp::common
                                                            opentelemetry-cpp::resources)
+  target_link_libraries(opentelemetry-cpp::logs INTERFACE opentelemetry-cpp::common
+                                                          opentelemetry-cpp::resources)
   target_link_libraries(opentelemetry-cpp::http_client_curl
-                        INTERFACE opentelemetry-cpp::ext CURL::libcurl)
+                        INTERFACE opentelemetry-cpp::common opentelemetry-cpp::ext
+                                  CURL::libcurl)
   target_link_libraries(opentelemetry-cpp::proto INTERFACE ${ARROW_PROTOBUF_LIBPROTOBUF})
   target_link_libraries(opentelemetry-cpp::otlp_recordable
-                        INTERFACE opentelemetry-cpp::trace opentelemetry-cpp::resources
-                                  opentelemetry-cpp::proto)
+                        INTERFACE opentelemetry-cpp::logs opentelemetry-cpp::trace
+                                  opentelemetry-cpp::resources opentelemetry-cpp::proto)
   target_link_libraries(opentelemetry-cpp::otlp_http_client
-                        INTERFACE opentelemetry-cpp::sdk opentelemetry-cpp::proto
+                        INTERFACE opentelemetry-cpp::common opentelemetry-cpp::proto
                                   opentelemetry-cpp::http_client_curl
                                   nlohmann_json::nlohmann_json)
   target_link_libraries(opentelemetry-cpp::otlp_http_exporter
                         INTERFACE opentelemetry-cpp::otlp_recordable
                                   opentelemetry-cpp::otlp_http_client)
+  target_link_libraries(opentelemetry-cpp::otlp_http_log_record_exporter
+                        INTERFACE opentelemetry-cpp::otlp_recordable
+                                  opentelemetry-cpp::otlp_http_client)
 
   foreach(_OPENTELEMETRY_LIB ${_OPENTELEMETRY_LIBS})
     add_dependencies(opentelemetry-cpp::${_OPENTELEMETRY_LIB} opentelemetry_ep)
@@ -4641,7 +4817,11 @@ if(ARROW_WITH_OPENTELEMETRY)
   set(opentelemetry-cpp_SOURCE "AUTO")
   resolve_dependency(opentelemetry-cpp)
   set(ARROW_OPENTELEMETRY_LIBS
-      opentelemetry-cpp::trace opentelemetry-cpp::ostream_span_exporter
+      opentelemetry-cpp::trace
+      opentelemetry-cpp::logs
+      opentelemetry-cpp::otlp_http_log_record_exporter
+      opentelemetry-cpp::ostream_log_record_exporter
+      opentelemetry-cpp::ostream_span_exporter
       opentelemetry-cpp::otlp_http_exporter)
   get_target_property(OPENTELEMETRY_INCLUDE_DIR opentelemetry-cpp::api
                       INTERFACE_INCLUDE_DIRECTORIES)
@@ -5200,9 +5380,3 @@ if(ARROW_WITH_UCX)
 endif()
 
 message(STATUS "All bundled static libraries: ${ARROW_BUNDLED_STATIC_LIBS}")
-
-# Write out the package configurations.
-
-configure_file("src/arrow/util/config.h.cmake" "src/arrow/util/config.h" ESCAPE_QUOTES)
-install(FILES "${ARROW_BINARY_DIR}/src/arrow/util/config.h"
-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/arrow/util")
diff --git a/cpp/examples/arrow/filesystem_definition_example.cc b/cpp/examples/arrow/filesystem_definition_example.cc
index efe1bd10470c0..65301bb843ba1 100644
--- a/cpp/examples/arrow/filesystem_definition_example.cc
+++ b/cpp/examples/arrow/filesystem_definition_example.cc
@@ -138,7 +138,7 @@ class ExampleFileSystem : public fs::FileSystem {
   }
 };
 
-fs::FileSystemRegistrar kExampleFileSystemModule{
+auto kExampleFileSystemModule = ARROW_REGISTER_FILESYSTEM(
     "example",
     [](const arrow::util::Uri& uri, const io::IOContext& io_context,
        std::string* out_path) -> Result<std::shared_ptr<fs::FileSystem>> {
@@ -148,4 +148,4 @@ fs::FileSystemRegistrar kExampleFileSystemModule{
       }
       return fs;
     },
-};
+    {});
diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt
index 4bf1008af4cd0..6dc8358f502f5 100644
--- a/cpp/src/arrow/CMakeLists.txt
+++ b/cpp/src/arrow/CMakeLists.txt
@@ -163,7 +163,7 @@ if(CMAKE_THREAD_LIBS_INIT)
 endif()
 
 if(WIN32)
-  list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32.dll")
+  list(APPEND ARROW_SYSTEM_LINK_LIBS "ws2_32")
 endif()
 
 if(NOT WIN32 AND NOT APPLE)
@@ -200,22 +200,29 @@ function(arrow_add_object_library PREFIX)
   set(SOURCES ${ARGN})
   string(TOLOWER "${PREFIX}" prefix)
   if(WIN32)
-    add_library(${prefix}_shared OBJECT ${SOURCES})
-    add_library(${prefix}_static OBJECT ${SOURCES})
-    set_target_properties(${prefix}_shared PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    set_target_properties(${prefix}_static PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    target_compile_definitions(${prefix}_shared PRIVATE ARROW_EXPORTING)
-    target_compile_definitions(${prefix}_static PRIVATE ARROW_STATIC)
-    target_compile_features(${prefix}_shared PRIVATE cxx_std_17)
-    target_compile_features(${prefix}_static PRIVATE cxx_std_17)
-    set(${PREFIX}_TARGET_SHARED
-        ${prefix}_shared
-        PARENT_SCOPE)
-    set(${PREFIX}_TARGET_STATIC
-        ${prefix}_static
-        PARENT_SCOPE)
+    set(targets)
+    if(ARROW_BUILD_SHARED)
+      add_library(${prefix}_shared OBJECT ${SOURCES})
+      set_target_properties(${prefix}_shared PROPERTIES POSITION_INDEPENDENT_CODE ON)
+      target_compile_definitions(${prefix}_shared PRIVATE ARROW_EXPORTING)
+      target_compile_features(${prefix}_shared PRIVATE cxx_std_17)
+      set(${PREFIX}_TARGET_SHARED
+          ${prefix}_shared
+          PARENT_SCOPE)
+      list(APPEND targets ${prefix}_shared)
+    endif()
+    if(ARROW_BUILD_STATIC)
+      add_library(${prefix}_static OBJECT ${SOURCES})
+      set_target_properties(${prefix}_static PROPERTIES POSITION_INDEPENDENT_CODE ON)
+      target_compile_definitions(${prefix}_static PRIVATE ARROW_STATIC)
+      target_compile_features(${prefix}_static PRIVATE cxx_std_17)
+      set(${PREFIX}_TARGET_STATIC
+          ${prefix}_static
+          PARENT_SCOPE)
+      list(APPEND targets ${prefix}_static)
+    endif()
     set(${PREFIX}_TARGETS
-        ${prefix}_shared ${prefix}_static
+        ${targets}
         PARENT_SCOPE)
   else()
     add_library(${prefix} OBJECT ${SOURCES})
@@ -351,6 +358,12 @@ macro(append_runtime_avx512_src SRCS SRC)
   endif()
 endmacro()
 
+# Write out compile-time configuration constants
+configure_file("util/config.h.cmake" "util/config.h" ESCAPE_QUOTES)
+configure_file("util/config_internal.h.cmake" "util/config_internal.h" ESCAPE_QUOTES)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/util/config.h"
+        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/arrow/util")
+
 set(ARROW_SRCS
     builder.cc
     buffer.cc
@@ -501,6 +514,7 @@ set(ARROW_UTIL_SRCS
     util/decimal.cc
     util/delimiting.cc
     util/dict_util.cc
+    util/fixed_width_internal.cc
     util/float16.cc
     util/formatting.cc
     util/future.cc
@@ -508,6 +522,7 @@ set(ARROW_UTIL_SRCS
     util/int_util.cc
     util/io_util.cc
     util/list_util.cc
+    util/logger.cc
     util/logging.cc
     util/key_value_metadata.cc
     util/memory.cc
@@ -613,6 +628,17 @@ if(ARROW_WITH_ZSTD)
   endforeach()
 endif()
 
+if(ARROW_WITH_OPENTELEMETRY)
+  arrow_add_object_library(ARROW_TELEMETRY telemetry/logging.cc)
+
+  foreach(ARROW_TELEMETRY_TARGET ${ARROW_TELEMETRY_TARGETS})
+    target_link_libraries(${ARROW_TELEMETRY_TARGET} PRIVATE ${ARROW_OPENTELEMETRY_LIBS})
+  endforeach()
+else()
+  set(ARROW_TELEMETRY_TARGET_SHARED)
+  set(ARROW_TELEMETRY_TARGET_STATIC)
+endif()
+
 set(ARROW_TESTING_SHARED_LINK_LIBS arrow_shared ${ARROW_GTEST_GTEST})
 set(ARROW_TESTING_SHARED_PRIVATE_LINK_LIBS arrow::flatbuffers RapidJSON)
 set(ARROW_TESTING_STATIC_LINK_LIBS arrow::flatbuffers RapidJSON arrow_static
@@ -628,14 +654,15 @@ else()
   list(APPEND ARROW_TESTING_STATIC_INSTALL_INTERFACE_LIBS ArrowTesting::gtest)
 endif()
 if(WIN32)
-  list(APPEND ARROW_TESTING_SHARED_LINK_LIBS "ws2_32.dll")
-  list(APPEND ARROW_TESTING_STATIC_LINK_LIBS "ws2_32.dll")
-  list(APPEND ARROW_TESTING_STATIC_INSTALL_INTERFACE_LIBS "ws2_32.dll")
+  list(APPEND ARROW_TESTING_SHARED_LINK_LIBS "ws2_32")
+  list(APPEND ARROW_TESTING_STATIC_LINK_LIBS "ws2_32")
+  list(APPEND ARROW_TESTING_STATIC_INSTALL_INTERFACE_LIBS "ws2_32")
 endif()
 
 set(ARROW_TESTING_SRCS
     io/test_common.cc
     ipc/test_common.cc
+    testing/fixed_width_test_util.cc
     testing/gtest_util.cc
     testing/random.cc
     testing/generator.cc
@@ -689,9 +716,9 @@ set(ARROW_COMPUTE_SRCS
     compute/function.cc
     compute/function_internal.cc
     compute/kernel.cc
-    compute/key_hash.cc
-    compute/key_map.cc
-    compute/light_array.cc
+    compute/key_hash_internal.cc
+    compute/key_map_internal.cc
+    compute/light_array_internal.cc
     compute/ordering.cc
     compute/registry.cc
     compute/kernels/codegen_internal.cc
@@ -715,10 +742,11 @@ set(ARROW_COMPUTE_SRCS
     compute/row/compare_internal.cc
     compute/row/grouper.cc
     compute/row/row_internal.cc
-    compute/util.cc)
+    compute/util.cc
+    compute/util_internal.cc)
 
-append_runtime_avx2_src(ARROW_COMPUTE_SRCS compute/key_hash_avx2.cc)
-append_runtime_avx2_bmi2_src(ARROW_COMPUTE_SRCS compute/key_map_avx2.cc)
+append_runtime_avx2_src(ARROW_COMPUTE_SRCS compute/key_hash_internal_avx2.cc)
+append_runtime_avx2_bmi2_src(ARROW_COMPUTE_SRCS compute/key_map_internal_avx2.cc)
 append_runtime_avx2_src(ARROW_COMPUTE_SRCS compute/row/compare_internal_avx2.cc)
 append_runtime_avx2_src(ARROW_COMPUTE_SRCS compute/row/encode_internal_avx2.cc)
 append_runtime_avx2_bmi2_src(ARROW_COMPUTE_SRCS compute/util_avx2.cc)
@@ -899,6 +927,10 @@ if(ARROW_ORC)
                            adapters/orc/util.cc)
   foreach(ARROW_ORC_TARGET ${ARROW_ORC_TARGETS})
     target_link_libraries(${ARROW_ORC_TARGET} PRIVATE orc::orc)
+    if(ARROW_ORC_VERSION VERSION_LESS "2.0.0")
+      target_compile_definitions(${ARROW_ORC_TARGET}
+                                 PRIVATE ARROW_ORC_NEED_TIME_ZONE_DATABASE_CHECK)
+    endif()
   endforeach()
 else()
   set(ARROW_ORC_TARGET_SHARED)
@@ -996,6 +1028,7 @@ add_arrow_lib(arrow
               ${ARROW_JSON_TARGET_SHARED}
               ${ARROW_MEMORY_POOL_TARGET_SHARED}
               ${ARROW_ORC_TARGET_SHARED}
+              ${ARROW_TELEMETRY_TARGET_SHARED}
               ${ARROW_UTIL_TARGET_SHARED}
               ${ARROW_VENDORED_TARGET_SHARED}
               ${ARROW_SHARED_PRIVATE_LINK_LIBS}
@@ -1011,6 +1044,7 @@ add_arrow_lib(arrow
               ${ARROW_JSON_TARGET_STATIC}
               ${ARROW_MEMORY_POOL_TARGET_STATIC}
               ${ARROW_ORC_TARGET_STATIC}
+              ${ARROW_TELEMETRY_TARGET_STATIC}
               ${ARROW_UTIL_TARGET_STATIC}
               ${ARROW_VENDORED_TARGET_STATIC}
               ${ARROW_SYSTEM_LINK_LIBS}
@@ -1240,6 +1274,10 @@ if(ARROW_SUBSTRAIT)
   add_subdirectory(engine)
 endif()
 
+if(ARROW_WITH_OPENTELEMETRY)
+  add_subdirectory(telemetry)
+endif()
+
 if(ARROW_TENSORFLOW)
   add_subdirectory(adapters/tensorflow)
 endif()
diff --git a/cpp/src/arrow/acero/CMakeLists.txt b/cpp/src/arrow/acero/CMakeLists.txt
index 31ed4a6a69b6a..73079059f1dfd 100644
--- a/cpp/src/arrow/acero/CMakeLists.txt
+++ b/cpp/src/arrow/acero/CMakeLists.txt
@@ -173,13 +173,8 @@ add_arrow_acero_test(hash_join_node_test SOURCES hash_join_node_test.cc
                      bloom_filter_test.cc)
 add_arrow_acero_test(pivot_longer_node_test SOURCES pivot_longer_node_test.cc)
 
-# asof_join_node and sorted_merge_node use std::thread internally
-# and doesn't use ThreadPool so it will
-# be broken if threading is turned off
-if(ARROW_ENABLE_THREADING)
-  add_arrow_acero_test(asof_join_node_test SOURCES asof_join_node_test.cc)
-  add_arrow_acero_test(sorted_merge_node_test SOURCES sorted_merge_node_test.cc)
-endif()
+add_arrow_acero_test(asof_join_node_test SOURCES asof_join_node_test.cc)
+add_arrow_acero_test(sorted_merge_node_test SOURCES sorted_merge_node_test.cc)
 
 add_arrow_acero_test(tpch_node_test SOURCES tpch_node_test.cc)
 add_arrow_acero_test(union_node_test SOURCES union_node_test.cc)
@@ -228,9 +223,7 @@ if(ARROW_BUILD_BENCHMARKS)
   add_arrow_acero_benchmark(project_benchmark SOURCES benchmark_util.cc
                             project_benchmark.cc)
 
-  if(ARROW_ENABLE_THREADING)
-    add_arrow_acero_benchmark(asof_join_benchmark SOURCES asof_join_benchmark.cc)
-  endif()
+  add_arrow_acero_benchmark(asof_join_benchmark SOURCES asof_join_benchmark.cc)
 
   add_arrow_acero_benchmark(tpch_benchmark SOURCES tpch_benchmark.cc)
 
@@ -253,9 +246,7 @@ if(ARROW_BUILD_BENCHMARKS)
     target_link_libraries(arrow-acero-expression-benchmark PUBLIC arrow_acero_static)
     target_link_libraries(arrow-acero-filter-benchmark PUBLIC arrow_acero_static)
     target_link_libraries(arrow-acero-project-benchmark PUBLIC arrow_acero_static)
-    if(ARROW_ENABLE_THREADING)
-      target_link_libraries(arrow-acero-asof-join-benchmark PUBLIC arrow_acero_static)
-    endif()
+    target_link_libraries(arrow-acero-asof-join-benchmark PUBLIC arrow_acero_static)
     target_link_libraries(arrow-acero-tpch-benchmark PUBLIC arrow_acero_static)
     if(ARROW_BUILD_OPENMP_BENCHMARKS)
       target_link_libraries(arrow-acero-hash-join-benchmark PUBLIC arrow_acero_static)
@@ -264,9 +255,7 @@ if(ARROW_BUILD_BENCHMARKS)
     target_link_libraries(arrow-acero-expression-benchmark PUBLIC arrow_acero_shared)
     target_link_libraries(arrow-acero-filter-benchmark PUBLIC arrow_acero_shared)
     target_link_libraries(arrow-acero-project-benchmark PUBLIC arrow_acero_shared)
-    if(ARROW_ENABLE_THREADING)
-      target_link_libraries(arrow-acero-asof-join-benchmark PUBLIC arrow_acero_shared)
-    endif()
+    target_link_libraries(arrow-acero-asof-join-benchmark PUBLIC arrow_acero_shared)
     target_link_libraries(arrow-acero-tpch-benchmark PUBLIC arrow_acero_shared)
     if(ARROW_BUILD_OPENMP_BENCHMARKS)
       target_link_libraries(arrow-acero-hash-join-benchmark PUBLIC arrow_acero_shared)
diff --git a/cpp/src/arrow/acero/aggregate_benchmark.cc b/cpp/src/arrow/acero/aggregate_benchmark.cc
index 4db7e443227d9..854862e3e48ca 100644
--- a/cpp/src/arrow/acero/aggregate_benchmark.cc
+++ b/cpp/src/arrow/acero/aggregate_benchmark.cc
@@ -29,6 +29,7 @@
 #include "arrow/util/benchmark_util.h"
 #include "arrow/util/bit_util.h"
 #include "arrow/util/bitmap_reader.h"
+#include "arrow/util/byte_size.h"
 #include "arrow/util/string.h"
 
 namespace arrow {
@@ -50,6 +51,7 @@ namespace acero {
 #include <random>
 
 using arrow::internal::ToChars;
+using arrow::util::TotalBufferSize;
 
 #ifdef ARROW_WITH_BENCHMARKS_REFERENCE
 
@@ -371,9 +373,11 @@ static void BenchmarkGroupBy(benchmark::State& state, std::vector<Aggregate> agg
   for (std::size_t arg_idx = 0; arg_idx < arguments.size(); arg_idx++) {
     aggregates[arg_idx].target = {FieldRef(static_cast<int>(arg_idx))};
   }
+  int64_t total_bytes = TotalBufferSize(*batch);
   for (auto _ : state) {
     ABORT_NOT_OK(BatchGroupBy(batch, aggregates, key_refs));
   }
+  state.SetBytesProcessed(total_bytes * state.iterations());
 }
 
 #define GROUP_BY_BENCHMARK(Name, Impl)                               \
@@ -578,6 +582,8 @@ static void SumKernel(benchmark::State& state) {
   for (auto _ : state) {
     ABORT_NOT_OK(Sum(array).status());
   }
+
+  state.SetItemsProcessed(state.iterations() * array_size);
 }
 
 static void SumKernelArgs(benchmark::internal::Benchmark* bench) {
@@ -611,6 +617,8 @@ void ModeKernel(benchmark::State& state, int min, int max) {
   for (auto _ : state) {
     ABORT_NOT_OK(Mode(array).status());
   }
+
+  state.SetItemsProcessed(state.iterations() * array_size);
 }
 
 template <typename ArrowType>
@@ -625,13 +633,18 @@ void ModeKernelNarrow<Int8Type>(benchmark::State& state) {
 
 template <>
 void ModeKernelNarrow<BooleanType>(benchmark::State& state) {
+  using CType = typename TypeTraits<BooleanType>::CType;
+
   RegressionArgs args(state);
+  const int64_t array_size = args.size / sizeof(CType);
   auto rand = random::RandomArrayGenerator(1924);
   auto array = rand.Boolean(args.size * 8, 0.5, args.null_proportion);
 
   for (auto _ : state) {
     ABORT_NOT_OK(Mode(array).status());
   }
+
+  state.SetItemsProcessed(state.iterations() * array_size);
 }
 
 template <typename ArrowType>
@@ -668,6 +681,8 @@ static void MinMaxKernelBench(benchmark::State& state) {
   for (auto _ : state) {
     ABORT_NOT_OK(MinMax(array).status());
   }
+
+  state.SetItemsProcessed(state.iterations() * array_size);
 }
 
 static void MinMaxKernelBenchArgs(benchmark::internal::Benchmark* bench) {
@@ -698,6 +713,8 @@ static void CountKernelBenchInt64(benchmark::State& state) {
   for (auto _ : state) {
     ABORT_NOT_OK(Count(array->Slice(1, array_size)).status());
   }
+
+  state.SetItemsProcessed(state.iterations() * array_size);
 }
 BENCHMARK(CountKernelBenchInt64)->Args({1 * 1024 * 1024, 2});  // 1M with 50% null.
 
@@ -718,6 +735,8 @@ void VarianceKernelBench(benchmark::State& state) {
   for (auto _ : state) {
     ABORT_NOT_OK(Variance(array, options).status());
   }
+
+  state.SetItemsProcessed(state.iterations() * array_size);
 }
 
 static void VarianceKernelBenchArgs(benchmark::internal::Benchmark* bench) {
diff --git a/cpp/src/arrow/acero/aggregate_internal.cc b/cpp/src/arrow/acero/aggregate_internal.cc
index 9c4b7fe5ae98c..0c1bc3db365a6 100644
--- a/cpp/src/arrow/acero/aggregate_internal.cc
+++ b/cpp/src/arrow/acero/aggregate_internal.cc
@@ -102,7 +102,7 @@ Result<std::unique_ptr<KernelState>> InitKernel(const HashAggregateKernel* kerne
   ARROW_ASSIGN_OR_RAISE(
       auto state,
       kernel->init(&kernel_ctx, KernelInitArgs{kernel, aggr_in_types, options}));
-  return std::move(state);
+  return state;
 }
 
 Result<std::vector<const HashAggregateKernel*>> GetKernels(
@@ -129,7 +129,7 @@ Result<std::vector<std::unique_ptr<KernelState>>> InitKernels(
     ARROW_ASSIGN_OR_RAISE(states[i],
                           InitKernel(kernels[i], ctx, aggregates[i], in_types[i]));
   }
-  return std::move(states);
+  return states;
 }
 
 Result<FieldVector> ResolveKernels(
@@ -242,7 +242,7 @@ Result<std::vector<Datum>> ExtractValues(const ExecBatch& input_batch,
       DCHECK(false);
     }
   }
-  return std::move(values);
+  return values;
 }
 
 }  // namespace aggregate
diff --git a/cpp/src/arrow/acero/asof_join_benchmark.cc b/cpp/src/arrow/acero/asof_join_benchmark.cc
index 02116b09fc1fd..ed2ac2258eb6c 100644
--- a/cpp/src/arrow/acero/asof_join_benchmark.cc
+++ b/cpp/src/arrow/acero/asof_join_benchmark.cc
@@ -91,7 +91,7 @@ static void TableJoinOverhead(benchmark::State& state,
     ASSERT_OK(DeclarationToStatus(std::move(join_node), /*use_threads=*/false));
   }
 
-  state.counters["input_rows_per_second"] = benchmark::Counter(
+  state.counters["rows_per_second"] = benchmark::Counter(
       static_cast<double>(state.iterations() * (left_table_stats.rows + right_hand_rows)),
       benchmark::Counter::kIsRate);
 
diff --git a/cpp/src/arrow/acero/asof_join_node.cc b/cpp/src/arrow/acero/asof_join_node.cc
index cf0d475c1d770..848cbdf7506ad 100644
--- a/cpp/src/arrow/acero/asof_join_node.cc
+++ b/cpp/src/arrow/acero/asof_join_node.cc
@@ -45,8 +45,8 @@
 #include "arrow/compute/function_internal.h"
 #endif
 #include "arrow/acero/time_series_util.h"
-#include "arrow/compute/key_hash.h"
-#include "arrow/compute/light_array.h"
+#include "arrow/compute/key_hash_internal.h"
+#include "arrow/compute/light_array_internal.h"
 #include "arrow/record_batch.h"
 #include "arrow/result.h"
 #include "arrow/status.h"
@@ -548,8 +548,10 @@ class InputState {
   // true when the queue is empty and, when memo may have future entries (the case of a
   // positive tolerance), when the memo is empty.
   // used when checking whether RHS is up to date with LHS.
-  bool CurrentEmpty() const {
-    return memo_.no_future_ ? Empty() : memo_.times_.empty() && Empty();
+  // NOTE: The emptiness must be decided by a single call to Empty() in caller, due to the
+  // potential race with Push(), see GH-41614.
+  bool CurrentEmpty(bool empty) const {
+    return memo_.no_future_ ? empty : (memo_.times_.empty() && empty);
   }
 
   // in case memo may not have future entries (the case of a non-positive tolerance),
@@ -650,13 +652,15 @@ class InputState {
   // timestamp, update latest_time and latest_ref_row to the value that immediately pass
   // the horizon. Update the memo-store with any entries or future entries so observed.
   // Returns true if updates were made, false if not.
-  Result<bool> AdvanceAndMemoize(OnType ts) {
+  // NOTE: The emptiness must be decided by a single call to Empty() in caller, due to the
+  // potential race with Push(), see GH-41614.
+  Result<bool> AdvanceAndMemoize(OnType ts, bool empty) {
     // Advance the right side row index until we reach the latest right row (for each key)
     // for the given left timestamp.
     DEBUG_SYNC(node_, "Advancing input ", index_, DEBUG_MANIP(std::endl));
 
     // Check if already updated for TS (or if there is no latest)
-    if (Empty()) {  // can't advance if empty and no future entries
+    if (empty) {  // can't advance if empty and no future entries
       return memo_.no_future_ ? false : memo_.RemoveEntriesWithLesserTime(ts);
     }
 
@@ -918,34 +922,46 @@ class CompositeTableBuilder {
 // guaranteeing this probability is below 1 in a billion. The fix is 128-bit hashing.
 // See ARROW-17653
 class AsofJoinNode : public ExecNode {
-  // Advances the RHS as far as possible to be up to date for the current LHS timestamp
-  Result<bool> UpdateRhs() {
+  // A simple wrapper for the result of a single call to UpdateRhs(), identifying:
+  // 1) If any RHS has advanced.
+  // 2) If all RHS are up to date with LHS.
+  struct RhsUpdateState {
+    bool any_advanced;
+    bool all_up_to_date_with_lhs;
+  };
+  // Advances the RHS as far as possible to be up to date for the current LHS timestamp,
+  // and checks if all RHS are up to date with LHS. The reason they have to be performed
+  // together is that they both depend on the emptiness of the RHS, which can be changed
+  // by Push() executing in another thread.
+  Result<RhsUpdateState> UpdateRhs() {
     auto& lhs = *state_.at(0);
     auto lhs_latest_time = lhs.GetLatestTime();
-    bool any_updated = false;
-    for (size_t i = 1; i < state_.size(); ++i) {
-      ARROW_ASSIGN_OR_RAISE(bool advanced, state_[i]->AdvanceAndMemoize(lhs_latest_time));
-      any_updated |= advanced;
-    }
-    return any_updated;
-  }
-
-  // Returns false if RHS not up to date for LHS
-  bool IsUpToDateWithLhsRow() const {
-    auto& lhs = *state_[0];
-    if (lhs.Empty()) return false;  // can't proceed if nothing on the LHS
-    OnType lhs_ts = lhs.GetLatestTime();
+    RhsUpdateState update_state{/*any_advanced=*/false, /*all_up_to_date_with_lhs=*/true};
     for (size_t i = 1; i < state_.size(); ++i) {
       auto& rhs = *state_[i];
-      if (!rhs.Finished()) {
+
+      // Obtain RHS emptiness once for subsequent AdvanceAndMemoize() and CurrentEmpty().
+      bool rhs_empty = rhs.Empty();
+      // Obtain RHS current time here because AdvanceAndMemoize() can change the
+      // emptiness.
+      OnType rhs_current_time = rhs_empty ? OnType{} : rhs.GetLatestTime();
+
+      ARROW_ASSIGN_OR_RAISE(bool advanced,
+                            rhs.AdvanceAndMemoize(lhs_latest_time, rhs_empty));
+      update_state.any_advanced |= advanced;
+
+      if (update_state.all_up_to_date_with_lhs && !rhs.Finished()) {
         // If RHS is finished, then we know it's up to date
-        if (rhs.CurrentEmpty())
-          return false;  // RHS isn't finished, but is empty --> not up to date
-        if (lhs_ts > rhs.GetCurrentTime())
-          return false;  // RHS isn't up to date (and not finished)
+        if (rhs.CurrentEmpty(rhs_empty)) {
+          // RHS isn't finished, but is empty --> not up to date
+          update_state.all_up_to_date_with_lhs = false;
+        } else if (lhs_latest_time > rhs_current_time) {
+          // RHS isn't up to date (and not finished)
+          update_state.all_up_to_date_with_lhs = false;
+        }
       }
     }
-    return true;
+    return update_state;
   }
 
   Result<std::shared_ptr<RecordBatch>> ProcessInner() {
@@ -963,20 +979,19 @@ class AsofJoinNode : public ExecNode {
       // If LHS is finished or empty then there's nothing we can do here
       if (lhs.Finished() || lhs.Empty()) break;
 
-      // Advance each of the RHS as far as possible to be up to date for the LHS timestamp
-      ARROW_ASSIGN_OR_RAISE(bool any_rhs_advanced, UpdateRhs());
+      ARROW_ASSIGN_OR_RAISE(auto rhs_update_state, UpdateRhs());
 
       // If we have received enough inputs to produce the next output batch
       // (decided by IsUpToDateWithLhsRow), we will perform the join and
       // materialize the output batch. The join is done by advancing through
       // the LHS and adding joined row to rows_ (done by Emplace). Finally,
       // input batches that are no longer needed are removed to free up memory.
-      if (IsUpToDateWithLhsRow()) {
+      if (rhs_update_state.all_up_to_date_with_lhs) {
         dst.Emplace(state_, tolerance_);
         ARROW_ASSIGN_OR_RAISE(bool advanced, lhs.Advance());
         if (!advanced) break;  // if we can't advance LHS, we're done for this batch
       } else {
-        if (!any_rhs_advanced) break;  // need to wait for new data
+        if (!rhs_update_state.any_advanced) break;  // need to wait for new data
       }
     }
 
@@ -999,6 +1014,8 @@ class AsofJoinNode : public ExecNode {
     }
   }
 
+#ifdef ARROW_ENABLE_THREADING
+
   template <typename Callable>
   struct Defer {
     Callable callable;
@@ -1085,6 +1102,7 @@ class AsofJoinNode : public ExecNode {
   }
 
   static void ProcessThreadWrapper(AsofJoinNode* node) { node->ProcessThread(); }
+#endif
 
  public:
   AsofJoinNode(ExecPlan* plan, NodeVector inputs, std::vector<std::string> input_labels,
@@ -1116,8 +1134,10 @@ class AsofJoinNode : public ExecNode {
   }
 
   virtual ~AsofJoinNode() {
-    process_.Push(false);  // poison pill
+#ifdef ARROW_ENABLE_THREADING
+    PushProcess(false);
     process_thread_.join();
+#endif
   }
 
   const std::vector<col_index_t>& indices_of_on_key() { return indices_of_on_key_; }
@@ -1395,7 +1415,8 @@ class AsofJoinNode : public ExecNode {
                rb->ToString(), DEBUG_MANIP(std::endl));
 
     ARROW_RETURN_NOT_OK(state_.at(k)->Push(rb));
-    process_.Push(true);
+    PushProcess(true);
+
     return Status::OK();
   }
 
@@ -1410,22 +1431,77 @@ class AsofJoinNode : public ExecNode {
     // The reason for this is that there are cases at the end of a table where we don't
     // know whether the RHS of the join is up-to-date until we know that the table is
     // finished.
-    process_.Push(true);
+    PushProcess(true);
+
     return Status::OK();
   }
+  void PushProcess(bool value) {
+#ifdef ARROW_ENABLE_THREADING
+    process_.Push(value);
+#else
+    if (value) {
+      ProcessNonThreaded();
+    } else if (!process_task_.is_finished()) {
+      EndFromSingleThread();
+    }
+#endif
+  }
 
-  Status StartProducing() override {
 #ifndef ARROW_ENABLE_THREADING
-    return Status::NotImplemented("ASOF join requires threading enabled");
+  bool ProcessNonThreaded() {
+    while (!process_task_.is_finished()) {
+      Result<std::shared_ptr<RecordBatch>> result = ProcessInner();
+
+      if (result.ok()) {
+        auto out_rb = *result;
+        if (!out_rb) break;
+        ExecBatch out_b(*out_rb);
+        out_b.index = batches_produced_++;
+        DEBUG_SYNC(this, "produce batch ", out_b.index, ":", DEBUG_MANIP(std::endl),
+                   out_rb->ToString(), DEBUG_MANIP(std::endl));
+        Status st = output_->InputReceived(this, std::move(out_b));
+        if (!st.ok()) {
+          // this isn't really from a thread,
+          // but we call through to this for consistency
+          EndFromSingleThread(std::move(st));
+          return false;
+        }
+      } else {
+        // this isn't really from a thread,
+        // but we call through to this for consistency
+        EndFromSingleThread(result.status());
+        return false;
+      }
+    }
+    auto& lhs = *state_.at(0);
+    if (lhs.Finished() && !process_task_.is_finished()) {
+      EndFromSingleThread(Status::OK());
+    }
+    return true;
+  }
+
+  void EndFromSingleThread(Status st = Status::OK()) {
+    process_task_.MarkFinished(st);
+    if (st.ok()) {
+      st = output_->InputFinished(this, batches_produced_);
+    }
+    for (const auto& s : state_) {
+      st &= s->ForceShutdown();
+    }
+  }
+
 #endif
 
+  Status StartProducing() override {
     ARROW_ASSIGN_OR_RAISE(process_task_, plan_->query_context()->BeginExternalTask(
                                              "AsofJoinNode::ProcessThread"));
     if (!process_task_.is_valid()) {
       // Plan has already aborted.  Do not start process thread
       return Status::OK();
     }
+#ifdef ARROW_ENABLE_THREADING
     process_thread_ = std::thread(&AsofJoinNode::ProcessThreadWrapper, this);
+#endif
     return Status::OK();
   }
 
@@ -1433,8 +1509,10 @@ class AsofJoinNode : public ExecNode {
   void ResumeProducing(ExecNode* output, int32_t counter) override {}
 
   Status StopProducingImpl() override {
+#ifdef ARROW_ENABLE_THREADING
     process_.Clear();
-    process_.Push(false);
+#endif
+    PushProcess(false);
     return Status::OK();
   }
 
@@ -1464,11 +1542,13 @@ class AsofJoinNode : public ExecNode {
 
   // Backpressure counter common to all inputs
   std::atomic<int32_t> backpressure_counter_;
+#ifdef ARROW_ENABLE_THREADING
   // Queue for triggering processing of a given input
   // (a false value is a poison pill)
   ConcurrentQueue<bool> process_;
   // Worker thread
   std::thread process_thread_;
+#endif
   Future<> process_task_;
 
   // In-progress batches produced
@@ -1496,9 +1576,13 @@ AsofJoinNode::AsofJoinNode(ExecPlan* plan, NodeVector inputs,
       debug_os_(join_options.debug_opts ? join_options.debug_opts->os : nullptr),
       debug_mutex_(join_options.debug_opts ? join_options.debug_opts->mutex : nullptr),
 #endif
-      backpressure_counter_(1),
+      backpressure_counter_(1)
+#ifdef ARROW_ENABLE_THREADING
+      ,
       process_(),
-      process_thread_() {
+      process_thread_()
+#endif
+{
   for (auto& key_hasher : key_hashers_) {
     key_hasher->node_ = this;
   }
diff --git a/cpp/src/arrow/acero/asof_join_node_test.cc b/cpp/src/arrow/acero/asof_join_node_test.cc
index d95d2aaad3643..051e280a4c53c 100644
--- a/cpp/src/arrow/acero/asof_join_node_test.cc
+++ b/cpp/src/arrow/acero/asof_join_node_test.cc
@@ -1678,5 +1678,59 @@ TEST(AsofJoinTest, BackpressureWithBatchesGen) {
                           /*slow_r0=*/false);
 }
 
+// Reproduction of GH-40675: A logical race between Process() and Push() that can be more
+// easily observed with single small batch.
+TEST(AsofJoinTest, RhsEmptinessRace) {
+  auto left_batch = ExecBatchFromJSON(
+      {int64(), utf8()}, R"([[1, "a"], [1, "b"], [5, "a"], [6, "b"], [7, "f"]])");
+  auto right_batch = ExecBatchFromJSON(
+      {int64(), utf8(), float64()}, R"([[2, "a", 1.0], [9, "b", 3.0], [15, "g", 5.0]])");
+
+  Declaration left{
+      "exec_batch_source",
+      ExecBatchSourceNodeOptions(schema({field("colA", int64()), field("col2", utf8())}),
+                                 {std::move(left_batch)})};
+  Declaration right{
+      "exec_batch_source",
+      ExecBatchSourceNodeOptions(schema({field("colB", int64()), field("col3", utf8()),
+                                         field("colC", float64())}),
+                                 {std::move(right_batch)})};
+  AsofJoinNodeOptions asof_join_opts({{{"colA"}, {{"col2"}}}, {{"colB"}, {{"col3"}}}}, 1);
+  Declaration asof_join{
+      "asofjoin", {std::move(left), std::move(right)}, std::move(asof_join_opts)};
+
+  ASSERT_OK_AND_ASSIGN(auto result, DeclarationToExecBatches(std::move(asof_join)));
+
+  auto exp_batch = ExecBatchFromJSON(
+      {int64(), utf8(), float64()},
+      R"([[1, "a", 1.0], [1, "b", null], [5, "a", null], [6, "b", null], [7, "f", null]])");
+  AssertExecBatchesEqualIgnoringOrder(result.schema, {exp_batch}, result.batches);
+}
+
+// Reproduction of GH-41149: Another case of the same root cause as GH-40675, but with
+// empty "by" columns.
+TEST(AsofJoinTest, RhsEmptinessRaceEmptyBy) {
+  auto left_batch = ExecBatchFromJSON({int64()}, R"([[1], [2], [3]])");
+  auto right_batch =
+      ExecBatchFromJSON({utf8(), int64()}, R"([["Z", 2], ["B", 3], ["A", 4]])");
+
+  Declaration left{"exec_batch_source",
+                   ExecBatchSourceNodeOptions(schema({field("on", int64())}),
+                                              {std::move(left_batch)})};
+  Declaration right{
+      "exec_batch_source",
+      ExecBatchSourceNodeOptions(schema({field("colVals", utf8()), field("on", int64())}),
+                                 {std::move(right_batch)})};
+  AsofJoinNodeOptions asof_join_opts({{{"on"}, {}}, {{"on"}, {}}}, 1);
+  Declaration asof_join{
+      "asofjoin", {std::move(left), std::move(right)}, std::move(asof_join_opts)};
+
+  ASSERT_OK_AND_ASSIGN(auto result, DeclarationToExecBatches(std::move(asof_join)));
+
+  auto exp_batch =
+      ExecBatchFromJSON({int64(), utf8()}, R"([[1, "Z"], [2, "Z"], [3, "B"]])");
+  AssertExecBatchesEqualIgnoringOrder(result.schema, {exp_batch}, result.batches);
+}
+
 }  // namespace acero
 }  // namespace arrow
diff --git a/cpp/src/arrow/acero/backpressure_handler.h b/cpp/src/arrow/acero/backpressure_handler.h
index 178272315d7fb..db6c3799354af 100644
--- a/cpp/src/arrow/acero/backpressure_handler.h
+++ b/cpp/src/arrow/acero/backpressure_handler.h
@@ -45,7 +45,7 @@ class BackpressureHandler {
     }
     BackpressureHandler backpressure_handler(input, low_threshold, high_threshold,
                                              std::move(backpressure_control));
-    return std::move(backpressure_handler);
+    return backpressure_handler;
   }
 
   void Handle(size_t start_level, size_t end_level) {
diff --git a/cpp/src/arrow/acero/bloom_filter_test.cc b/cpp/src/arrow/acero/bloom_filter_test.cc
index bad331cfd99d1..a2d6e9575a1aa 100644
--- a/cpp/src/arrow/acero/bloom_filter_test.cc
+++ b/cpp/src/arrow/acero/bloom_filter_test.cc
@@ -27,7 +27,7 @@
 #include "arrow/acero/task_util.h"
 #include "arrow/acero/test_util_internal.h"
 #include "arrow/acero/util.h"
-#include "arrow/compute/key_hash.h"
+#include "arrow/compute/key_hash_internal.h"
 #include "arrow/util/bitmap_ops.h"
 #include "arrow/util/config.h"
 #include "arrow/util/cpu_info.h"
diff --git a/cpp/src/arrow/acero/exec_plan.cc b/cpp/src/arrow/acero/exec_plan.cc
index 97119726d4b17..d9fb1942fccd8 100644
--- a/cpp/src/arrow/acero/exec_plan.cc
+++ b/cpp/src/arrow/acero/exec_plan.cc
@@ -128,7 +128,7 @@ struct ExecPlanImpl : public ExecPlan {
     Future<> scheduler_finished = arrow::util::AsyncTaskScheduler::Make(
         [this](arrow::util::AsyncTaskScheduler* async_scheduler) {
           QueryContext* ctx = query_context();
-          RETURN_NOT_OK(ctx->Init(ctx->max_concurrency(), async_scheduler));
+          RETURN_NOT_OK(ctx->Init(async_scheduler));
 
 #ifdef ARROW_WITH_OPENTELEMETRY
           if (HasMetadata()) {
diff --git a/cpp/src/arrow/acero/hash_aggregate_test.cc b/cpp/src/arrow/acero/hash_aggregate_test.cc
index 2626fd50379dd..743cb20d1960d 100644
--- a/cpp/src/arrow/acero/hash_aggregate_test.cc
+++ b/cpp/src/arrow/acero/hash_aggregate_test.cc
@@ -318,7 +318,7 @@ Result<Datum> RunGroupBy(const BatchesWithSchema& input,
           {
               {"source",
                SourceNodeOptions{input.schema, input.gen(use_threads, /*slow=*/false)}},
-              {"aggregate", AggregateNodeOptions{std::move(aggregates), std::move(keys),
+              {"aggregate", AggregateNodeOptions{aggregates, std::move(keys),
                                                  std::move(segment_keys)}},
               {"sink", SinkNodeOptions{&sink_gen}},
           })
@@ -592,6 +592,12 @@ void TestSegments(std::unique_ptr<RowSegmenter>& segmenter, const ExecSpan& batc
     ASSERT_EQ(expected_segment, segment);
     offset = segment.offset + segment.length;
   }
+  // Assert next is the last (empty) segment.
+  ASSERT_OK_AND_ASSIGN(auto segment, segmenter->GetNextSegment(batch, offset));
+  ASSERT_GE(segment.offset, batch.length);
+  ASSERT_EQ(segment.length, 0);
+  ASSERT_TRUE(segment.is_open);
+  ASSERT_TRUE(segment.extends);
 }
 
 Result<std::unique_ptr<Grouper>> MakeGrouper(const std::vector<TypeHolder>& key_types) {
@@ -682,48 +688,142 @@ TEST(RowSegmenter, Basics) {
 }
 
 TEST(RowSegmenter, NonOrdered) {
-  std::vector<TypeHolder> types = {int32()};
-  auto batch = ExecBatchFromJSON(types, "[[1], [1], [2], [1], [2]]");
-  ASSERT_OK_AND_ASSIGN(auto segmenter, MakeRowSegmenter(types));
-  TestSegments(segmenter, ExecSpan(batch),
-               {{0, 2, false, true},
-                {2, 1, false, false},
-                {3, 1, false, false},
-                {4, 1, true, false},
-                {5, 0, true, true}});
+  {
+    std::vector<TypeHolder> types = {int32()};
+    auto batch = ExecBatchFromJSON(types, "[[1], [1], [2], [1], [2]]");
+    ASSERT_OK_AND_ASSIGN(auto segmenter, MakeRowSegmenter(types));
+    TestSegments(segmenter, ExecSpan(batch),
+                 {{0, 2, false, true},
+                  {2, 1, false, false},
+                  {3, 1, false, false},
+                  {4, 1, true, false},
+                  {5, 0, true, true}});
+  }
+  {
+    std::vector<TypeHolder> types = {int32(), int32()};
+    auto batch = ExecBatchFromJSON(types, "[[1, 1], [1, 1], [2, 2], [1, 2], [2, 2]]");
+    ASSERT_OK_AND_ASSIGN(auto segmenter, MakeRowSegmenter(types));
+    TestSegments(segmenter, ExecSpan(batch),
+                 {{0, 2, false, true},
+                  {2, 1, false, false},
+                  {3, 1, false, false},
+                  {4, 1, true, false},
+                  {5, 0, true, true}});
+  }
 }
 
 TEST(RowSegmenter, EmptyBatches) {
-  std::vector<TypeHolder> types = {int32()};
-  std::vector<ExecBatch> batches = {
-      ExecBatchFromJSON(types, "[]"),         ExecBatchFromJSON(types, "[]"),
-      ExecBatchFromJSON(types, "[[1]]"),      ExecBatchFromJSON(types, "[]"),
-      ExecBatchFromJSON(types, "[[1]]"),      ExecBatchFromJSON(types, "[]"),
-      ExecBatchFromJSON(types, "[[2], [2]]"), ExecBatchFromJSON(types, "[]"),
-  };
-  ASSERT_OK_AND_ASSIGN(auto segmenter, MakeRowSegmenter(types));
-  TestSegments(segmenter, ExecSpan(batches[0]), {});
-  TestSegments(segmenter, ExecSpan(batches[1]), {});
-  TestSegments(segmenter, ExecSpan(batches[2]), {{0, 1, true, true}});
-  TestSegments(segmenter, ExecSpan(batches[3]), {});
-  TestSegments(segmenter, ExecSpan(batches[4]), {{0, 1, true, true}});
-  TestSegments(segmenter, ExecSpan(batches[5]), {});
-  TestSegments(segmenter, ExecSpan(batches[6]), {{0, 2, true, false}});
-  TestSegments(segmenter, ExecSpan(batches[7]), {});
+  {
+    std::vector<TypeHolder> types = {int32()};
+    std::vector<ExecBatch> batches = {
+        ExecBatchFromJSON(types, "[]"),         ExecBatchFromJSON(types, "[]"),
+        ExecBatchFromJSON(types, "[[1]]"),      ExecBatchFromJSON(types, "[]"),
+        ExecBatchFromJSON(types, "[[1]]"),      ExecBatchFromJSON(types, "[]"),
+        ExecBatchFromJSON(types, "[[2], [2]]"), ExecBatchFromJSON(types, "[]"),
+    };
+    ASSERT_OK_AND_ASSIGN(auto segmenter, MakeRowSegmenter(types));
+    TestSegments(segmenter, ExecSpan(batches[0]), {});
+    TestSegments(segmenter, ExecSpan(batches[1]), {});
+    TestSegments(segmenter, ExecSpan(batches[2]), {{0, 1, true, true}});
+    TestSegments(segmenter, ExecSpan(batches[3]), {});
+    TestSegments(segmenter, ExecSpan(batches[4]), {{0, 1, true, true}});
+    TestSegments(segmenter, ExecSpan(batches[5]), {});
+    TestSegments(segmenter, ExecSpan(batches[6]), {{0, 2, true, false}});
+    TestSegments(segmenter, ExecSpan(batches[7]), {});
+  }
+  {
+    std::vector<TypeHolder> types = {int32(), int32()};
+    std::vector<ExecBatch> batches = {
+        ExecBatchFromJSON(types, "[]"),
+        ExecBatchFromJSON(types, "[]"),
+        ExecBatchFromJSON(types, "[[1, 1]]"),
+        ExecBatchFromJSON(types, "[]"),
+        ExecBatchFromJSON(types, "[[1, 1]]"),
+        ExecBatchFromJSON(types, "[]"),
+        ExecBatchFromJSON(types, "[[2, 2], [2, 2]]"),
+        ExecBatchFromJSON(types, "[]"),
+    };
+    ASSERT_OK_AND_ASSIGN(auto segmenter, MakeRowSegmenter(types));
+    TestSegments(segmenter, ExecSpan(batches[0]), {});
+    TestSegments(segmenter, ExecSpan(batches[1]), {});
+    TestSegments(segmenter, ExecSpan(batches[2]), {{0, 1, true, true}});
+    TestSegments(segmenter, ExecSpan(batches[3]), {});
+    TestSegments(segmenter, ExecSpan(batches[4]), {{0, 1, true, true}});
+    TestSegments(segmenter, ExecSpan(batches[5]), {});
+    TestSegments(segmenter, ExecSpan(batches[6]), {{0, 2, true, false}});
+    TestSegments(segmenter, ExecSpan(batches[7]), {});
+  }
 }
 
 TEST(RowSegmenter, MultipleSegments) {
-  std::vector<TypeHolder> types = {int32()};
-  auto batch = ExecBatchFromJSON(types, "[[1], [1], [2], [5], [3], [3], [5], [5], [4]]");
-  ASSERT_OK_AND_ASSIGN(auto segmenter, MakeRowSegmenter(types));
-  TestSegments(segmenter, ExecSpan(batch),
-               {{0, 2, false, true},
-                {2, 1, false, false},
-                {3, 1, false, false},
-                {4, 2, false, false},
-                {6, 2, false, false},
-                {8, 1, true, false},
-                {9, 0, true, true}});
+  {
+    std::vector<TypeHolder> types = {int32()};
+    auto batch =
+        ExecBatchFromJSON(types, "[[1], [1], [2], [5], [3], [3], [5], [5], [4]]");
+    ASSERT_OK_AND_ASSIGN(auto segmenter, MakeRowSegmenter(types));
+    TestSegments(segmenter, ExecSpan(batch),
+                 {{0, 2, false, true},
+                  {2, 1, false, false},
+                  {3, 1, false, false},
+                  {4, 2, false, false},
+                  {6, 2, false, false},
+                  {8, 1, true, false},
+                  {9, 0, true, true}});
+  }
+  {
+    std::vector<TypeHolder> types = {int32(), int32()};
+    auto batch = ExecBatchFromJSON(
+        types,
+        "[[1, 1], [1, 1], [2, 2], [5, 5], [3, 3], [3, 3], [5, 5], [5, 5], [4, 4]]");
+    ASSERT_OK_AND_ASSIGN(auto segmenter, MakeRowSegmenter(types));
+    TestSegments(segmenter, ExecSpan(batch),
+                 {{0, 2, false, true},
+                  {2, 1, false, false},
+                  {3, 1, false, false},
+                  {4, 2, false, false},
+                  {6, 2, false, false},
+                  {8, 1, true, false},
+                  {9, 0, true, true}});
+  }
+}
+
+TEST(RowSegmenter, MultipleSegmentsMultipleBatches) {
+  {
+    std::vector<TypeHolder> types = {int32()};
+    std::vector<ExecBatch> batches = {
+        ExecBatchFromJSON(types, "[[1]]"), ExecBatchFromJSON(types, "[[1], [2]]"),
+        ExecBatchFromJSON(types, "[[5], [3]]"),
+        ExecBatchFromJSON(types, "[[3], [5], [5]]"), ExecBatchFromJSON(types, "[[4]]")};
+
+    ASSERT_OK_AND_ASSIGN(auto segmenter, MakeRowSegmenter(types));
+    TestSegments(segmenter, ExecSpan(batches[0]), {{0, 1, true, true}});
+    TestSegments(segmenter, ExecSpan(batches[1]),
+                 {{0, 1, false, true}, {1, 1, true, false}});
+    TestSegments(segmenter, ExecSpan(batches[2]),
+                 {{0, 1, false, false}, {1, 1, true, false}});
+    TestSegments(segmenter, ExecSpan(batches[3]),
+                 {{0, 1, false, true}, {1, 2, true, false}});
+    TestSegments(segmenter, ExecSpan(batches[4]), {{0, 1, true, false}});
+  }
+  {
+    std::vector<TypeHolder> types = {int32(), int32()};
+    std::vector<ExecBatch> batches = {
+        ExecBatchFromJSON(types, "[[1, 1]]"),
+        ExecBatchFromJSON(types, "[[1, 1], [2, 2]]"),
+        ExecBatchFromJSON(types, "[[5, 5], [3, 3]]"),
+        ExecBatchFromJSON(types, "[[3, 3], [5, 5], [5, 5]]"),
+        ExecBatchFromJSON(types, "[[4, 4]]")};
+
+    ASSERT_OK_AND_ASSIGN(auto segmenter, MakeRowSegmenter(types));
+    TestSegments(segmenter, ExecSpan(batches[0]), {{0, 1, true, true}});
+    TestSegments(segmenter, ExecSpan(batches[1]),
+                 {{0, 1, false, true}, {1, 1, true, false}});
+    TestSegments(segmenter, ExecSpan(batches[2]),
+                 {{0, 1, false, false}, {1, 1, true, false}});
+    TestSegments(segmenter, ExecSpan(batches[3]),
+                 {{0, 1, false, true}, {1, 2, true, false}});
+    TestSegments(segmenter, ExecSpan(batches[4]), {{0, 1, true, false}});
+  }
 }
 
 namespace {
diff --git a/cpp/src/arrow/acero/hash_join.cc b/cpp/src/arrow/acero/hash_join.cc
index 296b2c56e00f4..5aa70a23f7c9e 100644
--- a/cpp/src/arrow/acero/hash_join.cc
+++ b/cpp/src/arrow/acero/hash_join.cc
@@ -791,7 +791,7 @@ class HashJoinBasicImpl : public HashJoinImpl {
 
 Result<std::unique_ptr<HashJoinImpl>> HashJoinImpl::MakeBasic() {
   std::unique_ptr<HashJoinImpl> impl{new HashJoinBasicImpl()};
-  return std::move(impl);
+  return impl;
 }
 
 }  // namespace acero
diff --git a/cpp/src/arrow/acero/hash_join_benchmark.cc b/cpp/src/arrow/acero/hash_join_benchmark.cc
index 993c0b9a705b4..1f8e02e9f0fcf 100644
--- a/cpp/src/arrow/acero/hash_join_benchmark.cc
+++ b/cpp/src/arrow/acero/hash_join_benchmark.cc
@@ -83,8 +83,8 @@ class JoinBenchmark {
       build_metadata["null_probability"] = std::to_string(settings.null_percentage);
       build_metadata["min"] = std::to_string(min_build_value);
       build_metadata["max"] = std::to_string(max_build_value);
-      build_metadata["min_length"] = settings.var_length_min;
-      build_metadata["max_length"] = settings.var_length_max;
+      build_metadata["min_length"] = std::to_string(settings.var_length_min);
+      build_metadata["max_length"] = std::to_string(settings.var_length_max);
 
       std::unordered_map<std::string, std::string> probe_metadata;
       probe_metadata["null_probability"] = std::to_string(settings.null_percentage);
@@ -148,7 +148,7 @@ class JoinBenchmark {
     };
 
     scheduler_ = TaskScheduler::Make();
-    DCHECK_OK(ctx_.Init(settings.num_threads, nullptr));
+    DCHECK_OK(ctx_.Init(nullptr));
 
     auto register_task_group_callback = [&](std::function<Status(size_t, int64_t)> task,
                                             std::function<Status(size_t)> cont) {
diff --git a/cpp/src/arrow/acero/hash_join_node.cc b/cpp/src/arrow/acero/hash_join_node.cc
index c0179fd160e4e..67f902e64be93 100644
--- a/cpp/src/arrow/acero/hash_join_node.cc
+++ b/cpp/src/arrow/acero/hash_join_node.cc
@@ -27,7 +27,7 @@
 #include "arrow/acero/options.h"
 #include "arrow/acero/schema_util.h"
 #include "arrow/acero/util.h"
-#include "arrow/compute/key_hash.h"
+#include "arrow/compute/key_hash_internal.h"
 #include "arrow/util/checked_cast.h"
 #include "arrow/util/future.h"
 #include "arrow/util/thread_pool.h"
@@ -351,7 +351,7 @@ Result<Expression> HashJoinSchema::BindFilter(Expression filter,
                                               const Schema& right_schema,
                                               ExecContext* exec_context) {
   if (filter.IsBound() || filter == literal(true)) {
-    return std::move(filter);
+    return filter;
   }
   // Step 1: Construct filter schema
   FieldVector fields;
@@ -386,7 +386,7 @@ Result<Expression> HashJoinSchema::BindFilter(Expression filter,
                              filter.ToString(), " evaluates to ",
                              filter.type()->ToString());
   }
-  return std::move(filter);
+  return filter;
 }
 
 Expression HashJoinSchema::RewriteFilterToUseFilterSchema(
@@ -497,11 +497,11 @@ struct BloomFilterPushdownContext {
   using BuildFinishedCallback = std::function<Status(size_t, AccumulationQueue)>;
   using FiltersReceivedCallback = std::function<Status(size_t)>;
   using FilterFinishedCallback = std::function<Status(size_t, AccumulationQueue)>;
-  void Init(HashJoinNode* owner, size_t num_threads,
-            RegisterTaskGroupCallback register_task_group_callback,
-            StartTaskGroupCallback start_task_group_callback,
-            FiltersReceivedCallback on_bloom_filters_received, bool disable_bloom_filter,
-            bool use_sync_execution);
+  Status Init(HashJoinNode* owner, size_t num_threads,
+              RegisterTaskGroupCallback register_task_group_callback,
+              StartTaskGroupCallback start_task_group_callback,
+              FiltersReceivedCallback on_bloom_filters_received,
+              bool disable_bloom_filter, bool use_sync_execution);
 
   Status StartProducing(size_t thread_index);
 
@@ -559,8 +559,7 @@ struct BloomFilterPushdownContext {
     std::vector<uint32_t> hashes(batch.length);
     std::vector<uint8_t> bv(bit_vector_bytes);
 
-    ARROW_ASSIGN_OR_RAISE(arrow::util::TempVectorStack * stack,
-                          ctx_->GetTempStack(thread_index));
+    arrow::util::TempVectorStack* stack = &tld_[thread_index].stack;
 
     // Start with full selection for the current batch
     memset(selected.data(), 0xff, bit_vector_bytes);
@@ -654,7 +653,17 @@ struct BloomFilterPushdownContext {
     FiltersReceivedCallback all_received_callback_;
     FilterFinishedCallback on_finished_;
   } eval_;
+
+  static constexpr auto kTempStackUsage =
+      Hashing32::kHashBatchTempStackUsage +
+      (sizeof(uint32_t) + /*extra=*/1) * arrow::util::MiniBatch::kMiniBatchLength;
+
+  struct ThreadLocalData {
+    arrow::util::TempVectorStack stack;
+  };
+  std::vector<ThreadLocalData> tld_;
 };
+
 bool HashJoinSchema::HasDictionaries() const {
   for (int side = 0; side <= 1; ++side) {
     for (int icol = 0; icol < proj_maps[side].num_cols(HashJoinProjection::INPUT);
@@ -930,7 +939,7 @@ class HashJoinNode : public ExecNode, public TracedNode {
     // we will change it back to just the CPU's thread pool capacity.
     size_t num_threads = (GetCpuThreadPoolCapacity() + io::GetIOThreadPoolCapacity() + 1);
 
-    pushdown_context_.Init(
+    RETURN_NOT_OK(pushdown_context_.Init(
         this, num_threads,
         [ctx](std::function<Status(size_t, int64_t)> fn,
               std::function<Status(size_t)> on_finished) {
@@ -940,7 +949,7 @@ class HashJoinNode : public ExecNode, public TracedNode {
           return ctx->StartTaskGroup(task_group_id, num_tasks);
         },
         [this](size_t thread_index) { return OnFiltersReceived(thread_index); },
-        disable_bloom_filter_, use_sync_execution);
+        disable_bloom_filter_, use_sync_execution));
 
     RETURN_NOT_OK(impl_->Init(
         ctx, join_type_, num_threads, &(schema_mgr_->proj_maps[0]),
@@ -1037,7 +1046,7 @@ class HashJoinNode : public ExecNode, public TracedNode {
   BloomFilterPushdownContext pushdown_context_;
 };
 
-void BloomFilterPushdownContext::Init(
+Status BloomFilterPushdownContext::Init(
     HashJoinNode* owner, size_t num_threads,
     RegisterTaskGroupCallback register_task_group_callback,
     StartTaskGroupCallback start_task_group_callback,
@@ -1074,6 +1083,12 @@ void BloomFilterPushdownContext::Init(
         return eval_.on_finished_(thread_index, std::move(eval_.batches_));
       });
   start_task_group_callback_ = std::move(start_task_group_callback);
+  tld_.resize(num_threads);
+  for (auto& local_data : tld_) {
+    RETURN_NOT_OK(local_data.stack.Init(ctx_->memory_pool(), kTempStackUsage));
+  }
+
+  return Status::OK();
 }
 
 Status BloomFilterPushdownContext::StartProducing(size_t thread_index) {
@@ -1124,8 +1139,7 @@ Status BloomFilterPushdownContext::BuildBloomFilter_exec_task(size_t thread_inde
   }
   ARROW_ASSIGN_OR_RAISE(ExecBatch key_batch, ExecBatch::Make(std::move(key_columns)));
 
-  ARROW_ASSIGN_OR_RAISE(arrow::util::TempVectorStack * stack,
-                        ctx_->GetTempStack(thread_index));
+  arrow::util::TempVectorStack* stack = &tld_[thread_index].stack;
   arrow::util::TempVectorHolder<uint32_t> hash_holder(
       stack, arrow::util::MiniBatch::kMiniBatchLength);
   uint32_t* hashes = hash_holder.mutable_data();
diff --git a/cpp/src/arrow/acero/hash_join_node.h b/cpp/src/arrow/acero/hash_join_node.h
index cca64d59830b2..ad60019ceabc4 100644
--- a/cpp/src/arrow/acero/hash_join_node.h
+++ b/cpp/src/arrow/acero/hash_join_node.h
@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include <cassert>
 #include <vector>
 
 #include "arrow/acero/options.h"
@@ -88,7 +89,7 @@ class ARROW_ACERO_EXPORT HashJoinSchema {
                                             const Expression& filter);
 
   bool PayloadIsEmpty(int side) {
-    ARROW_DCHECK(side == 0 || side == 1);
+    assert(side == 0 || side == 1);
     return proj_maps[side].num_cols(HashJoinProjection::PAYLOAD) == 0;
   }
 
diff --git a/cpp/src/arrow/acero/hash_join_node_test.cc b/cpp/src/arrow/acero/hash_join_node_test.cc
index 63969d9a3ed4b..f7b442cc3c624 100644
--- a/cpp/src/arrow/acero/hash_join_node_test.cc
+++ b/cpp/src/arrow/acero/hash_join_node_test.cc
@@ -28,6 +28,7 @@
 #include "arrow/api.h"
 #include "arrow/compute/kernels/row_encoder_internal.h"
 #include "arrow/compute/kernels/test_util.h"
+#include "arrow/compute/light_array_internal.h"
 #include "arrow/testing/extension_type.h"
 #include "arrow/testing/gtest_util.h"
 #include "arrow/testing/matchers.h"
@@ -41,6 +42,7 @@ namespace arrow {
 
 using compute::call;
 using compute::default_exec_context;
+using compute::ExecBatchBuilder;
 using compute::ExecSpan;
 using compute::field_ref;
 using compute::SortIndices;
@@ -2036,6 +2038,29 @@ TEST(HashJoin, ResidualFilter) {
                   [3, 4, "alpha", 4, 16, "alpha"]])")});
 }
 
+TEST(HashJoin, FilterEmptyRows) {
+  // Regression test for GH-41121.
+  BatchesWithSchema input_left;
+  input_left.batches = {
+      ExecBatchFromJSON({int32(), utf8(), int32()}, R"([[2, "Jarry", 28]])")};
+  input_left.schema =
+      schema({field("id", int32()), field("name", utf8()), field("age", int32())});
+
+  BatchesWithSchema input_right;
+  input_right.batches = {ExecBatchFromJSON(
+      {int32(), int32(), utf8()},
+      R"([[2, 10, "Jack"], [3, 12, "Mark"], [4, 15, "Tom"], [1, 10, "Jack"]])")};
+  input_right.schema =
+      schema({field("id", int32()), field("stu_id", int32()), field("subject", utf8())});
+
+  const ResidualFilterCaseRunner runner{std::move(input_left), std::move(input_right)};
+
+  Expression filter = greater(field_ref("age"), literal(25));
+
+  runner.Run(JoinType::LEFT_ANTI, {"id"}, {"stu_id"}, std::move(filter),
+             {ExecBatchFromJSON({int32(), utf8(), int32()}, R"([[2, "Jarry", 28]])")});
+}
+
 TEST(HashJoin, TrivialResidualFilter) {
   Expression always_true =
       equal(call("add", {field_ref("l1"), field_ref("r1")}), literal(2));  // 1 + 1 == 2
@@ -3178,5 +3203,55 @@ TEST(HashJoin, ChainedIntegerHashJoins) {
   }
 }
 
+// Test that a large number of joins don't overflow the temp vector stack, like GH-39582
+// and GH-39951.
+TEST(HashJoin, ManyJoins) {
+  // The idea of this case is to create many nested join nodes that may possibly cause
+  // recursive usage of temp vector stack. To make sure that the recursion happens:
+  // 1. A left-deep join tree is created so that the left-most (the final probe side)
+  // table will go through all the hash tables from the right side.
+  // 2. Left-outer join is used so that every join will increase the cardinality.
+  // 3. The left-most table contains rows of unique integers from 0 to N.
+  // 4. Each right table at level i contains two rows of integer i, so that the probing of
+  // each level will increase the result by one row.
+  // 5. The left-most table is a single batch of enough rows, so that at each level, the
+  // probing will accumulate enough result rows to have to output to the subsequent level
+  // before finishing the current batch (releasing the buffer allocated on the temp vector
+  // stack), which is essentially the recursive usage of the temp vector stack.
+
+  // A fair number of joins to guarantee temp vector stack overflow before GH-41335.
+  const int num_joins = 16;
+
+  // `ExecBatchBuilder::num_rows_max()` is the number of rows for swiss join to accumulate
+  // before outputting.
+  const int num_left_rows = ExecBatchBuilder::num_rows_max();
+  ASSERT_OK_AND_ASSIGN(
+      auto left_batches,
+      MakeIntegerBatches({[](int row_id) -> int64_t { return row_id; }},
+                         schema({field("l_key", int32())}),
+                         /*num_batches=*/1, /*batch_size=*/num_left_rows));
+  Declaration root{"exec_batch_source",
+                   ExecBatchSourceNodeOptions(std::move(left_batches.schema),
+                                              std::move(left_batches.batches))};
+
+  HashJoinNodeOptions join_opts(JoinType::LEFT_OUTER, /*left_keys=*/{"l_key"},
+                                /*right_keys=*/{"r_key"});
+
+  for (int i = 0; i < num_joins; ++i) {
+    ASSERT_OK_AND_ASSIGN(auto right_batches,
+                         MakeIntegerBatches({[i](int) -> int64_t { return i; }},
+                                            schema({field("r_key", int32())}),
+                                            /*num_batches=*/1, /*batch_size=*/2));
+    Declaration table{"exec_batch_source",
+                      ExecBatchSourceNodeOptions(std::move(right_batches.schema),
+                                                 std::move(right_batches.batches))};
+
+    Declaration new_root{"hashjoin", {std::move(root), std::move(table)}, join_opts};
+    root = std::move(new_root);
+  }
+
+  ASSERT_OK_AND_ASSIGN(std::ignore, DeclarationToTable(std::move(root)));
+}
+
 }  // namespace acero
 }  // namespace arrow
diff --git a/cpp/src/arrow/acero/order_by_impl.cc b/cpp/src/arrow/acero/order_by_impl.cc
index 2c624f6ab895f..1165799fc6610 100644
--- a/cpp/src/arrow/acero/order_by_impl.cc
+++ b/cpp/src/arrow/acero/order_by_impl.cc
@@ -93,14 +93,14 @@ Result<std::unique_ptr<OrderByImpl>> OrderByImpl::MakeSort(
     ExecContext* ctx, const std::shared_ptr<Schema>& output_schema,
     const SortOptions& options) {
   std::unique_ptr<OrderByImpl> impl{new SortBasicImpl(ctx, output_schema, options)};
-  return std::move(impl);
+  return impl;
 }
 
 Result<std::unique_ptr<OrderByImpl>> OrderByImpl::MakeSelectK(
     ExecContext* ctx, const std::shared_ptr<Schema>& output_schema,
     const SelectKOptions& options) {
   std::unique_ptr<OrderByImpl> impl{new SelectKBasicImpl(ctx, output_schema, options)};
-  return std::move(impl);
+  return impl;
 }
 
 }  // namespace acero
diff --git a/cpp/src/arrow/acero/query_context.cc b/cpp/src/arrow/acero/query_context.cc
index a27397d12079d..18beb19ab7f8b 100644
--- a/cpp/src/arrow/acero/query_context.cc
+++ b/cpp/src/arrow/acero/query_context.cc
@@ -40,8 +40,7 @@ QueryContext::QueryContext(QueryOptions opts, ExecContext exec_context)
 const CpuInfo* QueryContext::cpu_info() const { return CpuInfo::GetInstance(); }
 int64_t QueryContext::hardware_flags() const { return cpu_info()->hardware_flags(); }
 
-Status QueryContext::Init(size_t max_num_threads, util::AsyncTaskScheduler* scheduler) {
-  tld_.resize(max_num_threads);
+Status QueryContext::Init(util::AsyncTaskScheduler* scheduler) {
   async_scheduler_ = scheduler;
   return Status::OK();
 }
@@ -50,15 +49,6 @@ size_t QueryContext::GetThreadIndex() { return thread_indexer_(); }
 
 size_t QueryContext::max_concurrency() const { return thread_indexer_.Capacity(); }
 
-Result<util::TempVectorStack*> QueryContext::GetTempStack(size_t thread_index) {
-  if (!tld_[thread_index].is_init) {
-    RETURN_NOT_OK(tld_[thread_index].stack.Init(
-        memory_pool(), 32 * util::MiniBatch::kMiniBatchLength * sizeof(uint64_t)));
-    tld_[thread_index].is_init = true;
-  }
-  return &tld_[thread_index].stack;
-}
-
 Result<Future<>> QueryContext::BeginExternalTask(std::string_view name) {
   Future<> completion_future = Future<>::Make();
   if (async_scheduler_->AddSimpleTask([completion_future] { return completion_future; },
diff --git a/cpp/src/arrow/acero/query_context.h b/cpp/src/arrow/acero/query_context.h
index 9ea11679cba05..3eff299439828 100644
--- a/cpp/src/arrow/acero/query_context.h
+++ b/cpp/src/arrow/acero/query_context.h
@@ -38,7 +38,7 @@ class ARROW_ACERO_EXPORT QueryContext {
   QueryContext(QueryOptions opts = {},
                ExecContext exec_context = *default_exec_context());
 
-  Status Init(size_t max_num_threads, arrow::util::AsyncTaskScheduler* scheduler);
+  Status Init(arrow::util::AsyncTaskScheduler* scheduler);
 
   const ::arrow::internal::CpuInfo* cpu_info() const;
   int64_t hardware_flags() const;
@@ -52,7 +52,6 @@ class ARROW_ACERO_EXPORT QueryContext {
 
   size_t GetThreadIndex();
   size_t max_concurrency() const;
-  Result<arrow::util::TempVectorStack*> GetTempStack(size_t thread_index);
 
   /// \brief Start an external task
   ///
@@ -145,11 +144,6 @@ class ARROW_ACERO_EXPORT QueryContext {
   std::unique_ptr<TaskScheduler> task_scheduler_ = TaskScheduler::Make();
 
   ThreadIndexer thread_indexer_;
-  struct ThreadLocalData {
-    bool is_init = false;
-    arrow::util::TempVectorStack stack;
-  };
-  std::vector<ThreadLocalData> tld_;
 
   std::atomic<size_t> in_flight_bytes_to_disk_{0};
 };
diff --git a/cpp/src/arrow/acero/schema_util.h b/cpp/src/arrow/acero/schema_util.h
index 6760022feb4be..db3076a58841a 100644
--- a/cpp/src/arrow/acero/schema_util.h
+++ b/cpp/src/arrow/acero/schema_util.h
@@ -17,13 +17,13 @@
 
 #pragma once
 
+#include <cassert>
 #include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "arrow/compute/light_array.h"  // for KeyColumnMetadata
-#include "arrow/type.h"                 // for DataType, FieldRef, Field and Schema
+#include "arrow/type.h"  // for DataType, FieldRef, Field and Schema
 
 namespace arrow {
 
@@ -47,8 +47,8 @@ struct SchemaProjectionMap {
   const int* source_to_base;
   const int* base_to_target;
   inline int get(int i) const {
-    ARROW_DCHECK(i >= 0 && i < num_cols);
-    ARROW_DCHECK(source_to_base[i] != kMissingField);
+    assert(i >= 0 && i < num_cols);
+    assert(source_to_base[i] != kMissingField);
     return base_to_target[source_to_base[i]];
   }
 };
@@ -66,7 +66,7 @@ class SchemaProjectionMaps {
   Status Init(ProjectionIdEnum full_schema_handle, const Schema& schema,
               const std::vector<ProjectionIdEnum>& projection_handles,
               const std::vector<const std::vector<FieldRef>*>& projections) {
-    ARROW_DCHECK(projection_handles.size() == projections.size());
+    assert(projection_handles.size() == projections.size());
     ARROW_RETURN_NOT_OK(RegisterSchema(full_schema_handle, schema));
     for (size_t i = 0; i < projections.size(); ++i) {
       ARROW_RETURN_NOT_OK(
@@ -174,7 +174,7 @@ class SchemaProjectionMaps {
       }
     }
     // We should never get here
-    ARROW_DCHECK(false);
+    assert(false);
     return -1;
   }
 
@@ -207,7 +207,7 @@ class SchemaProjectionMaps {
             break;
           }
         }
-        ARROW_DCHECK(field_id != SchemaProjectionMap::kMissingField);
+        assert(field_id != SchemaProjectionMap::kMissingField);
         mapping[i] = field_id;
         inverse_mapping[field_id] = i;
       }
diff --git a/cpp/src/arrow/acero/sink_node.cc b/cpp/src/arrow/acero/sink_node.cc
index 4ab6b4537de02..66f447aa87f11 100644
--- a/cpp/src/arrow/acero/sink_node.cc
+++ b/cpp/src/arrow/acero/sink_node.cc
@@ -423,6 +423,7 @@ class ConsumingSinkNode : public ExecNode,
   std::atomic<int32_t> backpressure_counter_ = 0;
   std::unique_ptr<util::SerialSequencingQueue> sequencer_;
 };
+
 static Result<ExecNode*> MakeTableConsumingSinkNode(ExecPlan* plan,
                                                     std::vector<ExecNode*> inputs,
                                                     const ExecNodeOptions& options) {
diff --git a/cpp/src/arrow/acero/sorted_merge_node.cc b/cpp/src/arrow/acero/sorted_merge_node.cc
index 4d4565a6bb5e7..a71ac79efcc46 100644
--- a/cpp/src/arrow/acero/sorted_merge_node.cc
+++ b/cpp/src/arrow/acero/sorted_merge_node.cc
@@ -262,19 +262,22 @@ class SortedMergeNode : public ExecNode {
       : ExecNode(plan, inputs, GetInputLabels(inputs), std::move(output_schema)),
         ordering_(std::move(new_ordering)),
         input_counter(inputs_.size()),
-        output_counter(inputs_.size()),
-        process_thread() {
+        output_counter(inputs_.size())
+#ifdef ARROW_ENABLE_THREADING
+        ,
+        process_thread()
+#endif
+  {
     SetLabel("sorted_merge");
   }
 
   ~SortedMergeNode() override {
-    process_queue.Push(
-        kPoisonPill);  // poison pill
-                       // We might create a temporary (such as to inspect the output
-                       // schema), in which case there isn't anything  to join
+    PushTask(kPoisonPill);
+#ifdef ARROW_ENABLE_THREADING
     if (process_thread.joinable()) {
       process_thread.join();
     }
+#endif
   }
 
   static arrow::Result<arrow::acero::ExecNode*> Make(
@@ -355,10 +358,25 @@ class SortedMergeNode : public ExecNode {
     // InputState's ConcurrentQueue manages locking
     input_counter[index] += rb->num_rows();
     ARROW_RETURN_NOT_OK(state[index]->Push(rb));
-    process_queue.Push(kNewTask);
+    PushTask(kNewTask);
     return Status::OK();
   }
 
+  void PushTask(bool ok) {
+#ifdef ARROW_ENABLE_THREADING
+    process_queue.Push(ok);
+#else
+    if (process_task.is_finished()) {
+      return;
+    }
+    if (ok == kNewTask) {
+      PollOnce();
+    } else {
+      EndFromProcessThread();
+    }
+#endif
+  }
+
   arrow::Status InputFinished(arrow::acero::ExecNode* input, int total_batches) override {
     ARROW_DCHECK(std_has(inputs_, input));
     {
@@ -368,7 +386,8 @@ class SortedMergeNode : public ExecNode {
       state.at(k)->set_total_batches(total_batches);
     }
     // Trigger a final process call for stragglers
-    process_queue.Push(kNewTask);
+    PushTask(kNewTask);
+
     return Status::OK();
   }
 
@@ -379,13 +398,17 @@ class SortedMergeNode : public ExecNode {
       // Plan has already aborted.  Do not start process thread
       return Status::OK();
     }
+#ifdef ARROW_ENABLE_THREADING
     process_thread = std::thread(&SortedMergeNode::StartPoller, this);
+#endif
     return Status::OK();
   }
 
   arrow::Status StopProducingImpl() override {
+#ifdef ARROW_ENABLE_THREADING
     process_queue.Clear();
-    process_queue.Push(kPoisonPill);
+#endif
+    PushTask(kPoisonPill);
     return Status::OK();
   }
 
@@ -408,6 +431,7 @@ class SortedMergeNode : public ExecNode {
           << input_counter[i] << " != " << output_counter[i];
     }
 
+#ifdef ARROW_ENABLE_THREADING
     ARROW_UNUSED(
         plan_->query_context()->executor()->Spawn([this, st = std::move(st)]() mutable {
           Defer cleanup([this, &st]() { process_task.MarkFinished(st); });
@@ -415,6 +439,12 @@ class SortedMergeNode : public ExecNode {
             st = output_->InputFinished(this, batches_produced);
           }
         }));
+#else
+    process_task.MarkFinished(st);
+    if (st.ok()) {
+      st = output_->InputFinished(this, batches_produced);
+    }
+#endif
   }
 
   bool CheckEnded() {
@@ -552,6 +582,7 @@ class SortedMergeNode : public ExecNode {
     return true;
   }
 
+#ifdef ARROW_ENABLE_THREADING
   void EmitBatches() {
     while (true) {
       // Implementation note: If the queue is empty, we will block here
@@ -567,6 +598,7 @@ class SortedMergeNode : public ExecNode {
 
   /// The entry point for processThread
   static void StartPoller(SortedMergeNode* node) { node->EmitBatches(); }
+#endif
 
   arrow::Ordering ordering_;
 
@@ -583,11 +615,13 @@ class SortedMergeNode : public ExecNode {
 
   std::atomic<int32_t> batches_produced{0};
 
+#ifdef ARROW_ENABLE_THREADING
   // Queue to trigger processing of a given input. False acts as a poison pill
   ConcurrentQueue<bool> process_queue;
   // Once StartProducing is called, we initialize this thread to poll the
   // input states and emit batches
   std::thread process_thread;
+#endif
   arrow::Future<> process_task;
 
   // Map arg index --> completion counter
diff --git a/cpp/src/arrow/acero/swiss_join.cc b/cpp/src/arrow/acero/swiss_join.cc
index 68b0e37b01aa9..732deb72861d6 100644
--- a/cpp/src/arrow/acero/swiss_join.cc
+++ b/cpp/src/arrow/acero/swiss_join.cc
@@ -25,7 +25,7 @@
 #include "arrow/acero/util.h"
 #include "arrow/array/util.h"  // MakeArrayFromScalar
 #include "arrow/compute/kernels/row_encoder_internal.h"
-#include "arrow/compute/key_hash.h"
+#include "arrow/compute/key_hash_internal.h"
 #include "arrow/compute/row/compare_internal.h"
 #include "arrow/compute/row/encode_internal.h"
 #include "arrow/util/bit_util.h"
@@ -2167,6 +2167,11 @@ Status JoinResidualFilter::FilterOneBatch(const ExecBatch& keypayload_batch,
   ARROW_DCHECK(!output_payload_ids || payload_ids_maybe_null);
 
   *num_passing_rows = 0;
+
+  if (num_batch_rows == 0) {
+    return Status::OK();
+  }
+
   ARROW_ASSIGN_OR_RAISE(Datum mask,
                         EvalFilter(keypayload_batch, num_batch_rows, batch_row_ids,
                                    key_ids_maybe_null, payload_ids_maybe_null));
@@ -2465,6 +2470,8 @@ Status JoinProbeProcessor::OnFinished() {
 
 class SwissJoin : public HashJoinImpl {
  public:
+  static constexpr auto kTempStackUsage = 64 * arrow::util::MiniBatch::kMiniBatchLength;
+
   Status Init(QueryContext* ctx, JoinType join_type, size_t num_threads,
               const HashJoinProjectionMaps* proj_map_left,
               const HashJoinProjectionMaps* proj_map_right,
@@ -2508,6 +2515,7 @@ class SwissJoin : public HashJoinImpl {
 
     local_states_.resize(num_threads_);
     for (int i = 0; i < num_threads_; ++i) {
+      RETURN_NOT_OK(local_states_[i].stack.Init(pool_, kTempStackUsage));
       local_states_[i].hash_table_ready = false;
       local_states_[i].num_output_batches = 0;
       local_states_[i].materialize.Init(pool_, proj_map_left, proj_map_right);
@@ -2561,8 +2569,7 @@ class SwissJoin : public HashJoinImpl {
 
     ExecBatch keypayload_batch;
     ARROW_ASSIGN_OR_RAISE(keypayload_batch, KeyPayloadFromInput(/*side=*/0, &batch));
-    ARROW_ASSIGN_OR_RAISE(arrow::util::TempVectorStack * temp_stack,
-                          ctx_->GetTempStack(thread_index));
+    arrow::util::TempVectorStack* temp_stack = &local_states_[thread_index].stack;
 
     return CancelIfNotOK(
         probe_processor_.OnNextBatch(thread_index, keypayload_batch, temp_stack,
@@ -2674,8 +2681,7 @@ class SwissJoin : public HashJoinImpl {
             input_batch.values[schema->num_cols(HashJoinProjection::KEY) + icol];
       }
     }
-    ARROW_ASSIGN_OR_RAISE(arrow::util::TempVectorStack * temp_stack,
-                          ctx_->GetTempStack(thread_id));
+    arrow::util::TempVectorStack* temp_stack = &local_states_[thread_id].stack;
     RETURN_NOT_OK(CancelIfNotOK(hash_table_build_.PushNextBatch(
         static_cast<int64_t>(thread_id), key_batch, no_payload ? nullptr : &payload_batch,
         temp_stack)));
@@ -2710,8 +2716,7 @@ class SwissJoin : public HashJoinImpl {
 
   Status MergeFinished(size_t thread_id) {
     RETURN_NOT_OK(status());
-    ARROW_ASSIGN_OR_RAISE(arrow::util::TempVectorStack * temp_stack,
-                          ctx_->GetTempStack(thread_id));
+    arrow::util::TempVectorStack* temp_stack = &local_states_[thread_id].stack;
     hash_table_build_.FinishPrtnMerge(temp_stack);
     return CancelIfNotOK(OnBuildHashTableFinished(static_cast<int64_t>(thread_id)));
   }
@@ -2766,8 +2771,7 @@ class SwissJoin : public HashJoinImpl {
         std::min((task_id + 1) * kNumRowsPerScanTask, hash_table_.num_rows());
     // Get thread index and related temp vector stack
     //
-    ARROW_ASSIGN_OR_RAISE(arrow::util::TempVectorStack * temp_stack,
-                          ctx_->GetTempStack(thread_id));
+    arrow::util::TempVectorStack* temp_stack = &local_states_[thread_id].stack;
 
     // Split into mini-batches
     //
@@ -2944,6 +2948,7 @@ class SwissJoin : public HashJoinImpl {
   FinishedCallback finished_callback_;
 
   struct ThreadLocalState {
+    arrow::util::TempVectorStack stack;
     JoinResultMaterialize materialize;
     std::vector<KeyColumnArray> temp_column_arrays;
     int64_t num_output_batches;
@@ -2980,7 +2985,7 @@ class SwissJoin : public HashJoinImpl {
 
 Result<std::unique_ptr<HashJoinImpl>> HashJoinImpl::MakeSwiss() {
   std::unique_ptr<HashJoinImpl> impl{new SwissJoin()};
-  return std::move(impl);
+  return impl;
 }
 
 }  // namespace acero
diff --git a/cpp/src/arrow/acero/swiss_join_internal.h b/cpp/src/arrow/acero/swiss_join_internal.h
index aa36a61109274..dceb74abe4f1b 100644
--- a/cpp/src/arrow/acero/swiss_join_internal.h
+++ b/cpp/src/arrow/acero/swiss_join_internal.h
@@ -23,8 +23,8 @@
 #include "arrow/acero/schema_util.h"
 #include "arrow/acero/task_util.h"
 #include "arrow/compute/kernels/row_encoder_internal.h"
-#include "arrow/compute/key_map.h"
-#include "arrow/compute/light_array.h"
+#include "arrow/compute/key_map_internal.h"
+#include "arrow/compute/light_array_internal.h"
 #include "arrow/compute/row/encode_internal.h"
 
 namespace arrow {
diff --git a/cpp/src/arrow/acero/task_util.cc b/cpp/src/arrow/acero/task_util.cc
index 4d8e9ecf76597..85378eaeeb27c 100644
--- a/cpp/src/arrow/acero/task_util.cc
+++ b/cpp/src/arrow/acero/task_util.cc
@@ -424,7 +424,7 @@ void TaskSchedulerImpl::Abort(AbortContinuationImpl impl) {
 
 std::unique_ptr<TaskScheduler> TaskScheduler::Make() {
   std::unique_ptr<TaskSchedulerImpl> impl{new TaskSchedulerImpl()};
-  return std::move(impl);
+  return impl;
 }
 
 }  // namespace acero
diff --git a/cpp/src/arrow/acero/tpch_node.cc b/cpp/src/arrow/acero/tpch_node.cc
index 9797a082b49d2..137b62ad38a95 100644
--- a/cpp/src/arrow/acero/tpch_node.cc
+++ b/cpp/src/arrow/acero/tpch_node.cc
@@ -336,7 +336,7 @@ Result<Datum> TpchPseudotext::GenerateComments(size_t num_comments, size_t min_l
   }
   ArrayData ad(utf8(), num_comments,
                {nullptr, std::move(offset_buffer), std::move(comment_buffer)});
-  return std::move(ad);
+  return ad;
 }
 
 bool TpchPseudotext::GenerateWord(int64_t& offset, random::pcg32_fast& rng, char* arr,
@@ -611,7 +611,7 @@ Result<Datum> RandomVString(random::pcg32_fast& rng, int64_t num_rows, int32_t m
   for (int32_t i = 0; i < offsets[num_rows]; i++) str[i] = alpha_numerics[char_dist(rng)];
 
   ArrayData ad(utf8(), num_rows, {nullptr, std::move(offset_buff), std::move(str_buff)});
-  return std::move(ad);
+  return ad;
 }
 
 void GeneratePhoneNumber(char* out, random::pcg32_fast& rng, int32_t country) {
@@ -677,7 +677,7 @@ class PartAndPartSupplierGenerator {
       if (!part_output_queue_.empty()) {
         ExecBatch batch = std::move(part_output_queue_.front());
         part_output_queue_.pop();
-        return std::move(batch);
+        return batch;
       } else if (part_rows_generated_ == part_rows_to_generate_) {
         return std::nullopt;
       } else {
@@ -732,7 +732,7 @@ class PartAndPartSupplierGenerator {
       if (!partsupp_output_queue_.empty()) {
         ExecBatch result = std::move(partsupp_output_queue_.front());
         partsupp_output_queue_.pop();
-        return std::move(result);
+        return result;
       }
     }
     {
@@ -1337,7 +1337,7 @@ class OrdersAndLineItemGenerator {
       if (!orders_output_queue_.empty()) {
         ExecBatch batch = std::move(orders_output_queue_.front());
         orders_output_queue_.pop();
-        return std::move(batch);
+        return batch;
       } else if (orders_rows_generated_ == orders_rows_to_generate_) {
         return std::nullopt;
       } else {
@@ -1401,12 +1401,12 @@ class OrdersAndLineItemGenerator {
     if (from_queue) {
       ARROW_DCHECK(queued.length <= batch_size_);
       tld.first_batch_offset = queued.length;
-      if (queued.length == batch_size_) return std::move(queued);
+      if (queued.length == batch_size_) return queued;
     }
     {
       std::lock_guard<std::mutex> lock(orders_output_queue_mutex_);
       if (orders_rows_generated_ == orders_rows_to_generate_) {
-        if (from_queue) return std::move(queued);
+        if (from_queue) return queued;
         return std::nullopt;
       }
 
diff --git a/cpp/src/arrow/adapters/orc/adapter.cc b/cpp/src/arrow/adapters/orc/adapter.cc
index 127ec49ba990f..25759f8471365 100644
--- a/cpp/src/arrow/adapters/orc/adapter.cc
+++ b/cpp/src/arrow/adapters/orc/adapter.cc
@@ -18,13 +18,16 @@
 #include "arrow/adapters/orc/adapter.h"
 
 #include <algorithm>
-#include <filesystem>
 #include <list>
 #include <memory>
 #include <sstream>
 #include <string>
 #include <vector>
 
+#ifdef ARROW_ORC_NEED_TIME_ZONE_DATABASE_CHECK
+#include <filesystem>
+#endif
+
 #include "arrow/adapters/orc/util.h"
 #include "arrow/builder.h"
 #include "arrow/io/interfaces.h"
@@ -183,11 +186,9 @@ liborc::RowReaderOptions DefaultRowReaderOptions() {
   return options;
 }
 
+#ifdef ARROW_ORC_NEED_TIME_ZONE_DATABASE_CHECK
 // Proactively check timezone database availability for ORC versions older than 2.0.0
 Status CheckTimeZoneDatabaseAvailability() {
-  if (GetOrcMajorVersion() >= 2) {
-    return Status::OK();
-  }
   auto tz_dir = std::getenv("TZDIR");
   bool is_tzdb_avaiable = tz_dir != nullptr
                               ? std::filesystem::exists(tz_dir)
@@ -200,6 +201,7 @@ Status CheckTimeZoneDatabaseAvailability() {
   }
   return Status::OK();
 }
+#endif
 
 }  // namespace
 
@@ -559,10 +561,12 @@ ORCFileReader::~ORCFileReader() {}
 
 Result<std::unique_ptr<ORCFileReader>> ORCFileReader::Open(
     const std::shared_ptr<io::RandomAccessFile>& file, MemoryPool* pool) {
+#ifdef ARROW_ORC_NEED_TIME_ZONE_DATABASE_CHECK
   RETURN_NOT_OK(CheckTimeZoneDatabaseAvailability());
+#endif
   auto result = std::unique_ptr<ORCFileReader>(new ORCFileReader());
   RETURN_NOT_OK(result->impl_->Open(file, pool));
-  return std::move(result);
+  return result;
 }
 
 Result<std::shared_ptr<const KeyValueMetadata>> ORCFileReader::ReadMetadata() {
@@ -826,12 +830,14 @@ ORCFileWriter::ORCFileWriter() { impl_.reset(new ORCFileWriter::Impl()); }
 
 Result<std::unique_ptr<ORCFileWriter>> ORCFileWriter::Open(
     io::OutputStream* output_stream, const WriteOptions& writer_options) {
+#ifdef ARROW_ORC_NEED_TIME_ZONE_DATABASE_CHECK
   RETURN_NOT_OK(CheckTimeZoneDatabaseAvailability());
+#endif
   std::unique_ptr<ORCFileWriter> result =
       std::unique_ptr<ORCFileWriter>(new ORCFileWriter());
   Status status = result->impl_->Open(output_stream, writer_options);
   RETURN_NOT_OK(status);
-  return std::move(result);
+  return result;
 }
 
 Status ORCFileWriter::Write(const Table& table) { return impl_->Write(table); }
diff --git a/cpp/src/arrow/adapters/orc/util.cc b/cpp/src/arrow/adapters/orc/util.cc
index 2a74bec1aa6fd..5bfe257ac7bad 100644
--- a/cpp/src/arrow/adapters/orc/util.cc
+++ b/cpp/src/arrow/adapters/orc/util.cc
@@ -1026,7 +1026,7 @@ Result<std::unique_ptr<liborc::Type>> GetOrcType(const DataType& type) {
         SetAttributes(*it, orc_subtype.get());
         out_type->addStructField(field_name, std::move(orc_subtype));
       }
-      return std::move(out_type);
+      return out_type;
     }
     case Type::type::MAP: {
       const auto& key_field = checked_cast<const MapType&>(type).key_field();
@@ -1048,7 +1048,7 @@ Result<std::unique_ptr<liborc::Type>> GetOrcType(const DataType& type) {
         SetAttributes(arrow_field, orc_subtype.get());
         out_type->addUnionChild(std::move(orc_subtype));
       }
-      return std::move(out_type);
+      return out_type;
     }
     default: {
       return Status::NotImplemented("Unknown or unsupported Arrow type: ",
@@ -1195,7 +1195,7 @@ Result<std::unique_ptr<liborc::Type>> GetOrcType(const Schema& schema) {
     SetAttributes(field, orc_subtype.get());
     out_type->addStructField(field->name(), std::move(orc_subtype));
   }
-  return std::move(out_type);
+  return out_type;
 }
 
 Result<std::shared_ptr<const KeyValueMetadata>> GetFieldMetadata(
diff --git a/cpp/src/arrow/array/array_base.h b/cpp/src/arrow/array/array_base.h
index 6411aebf80442..716ae0722069e 100644
--- a/cpp/src/arrow/array/array_base.h
+++ b/cpp/src/arrow/array/array_base.h
@@ -224,6 +224,14 @@ class ARROW_EXPORT Array {
   /// \return Status
   Status ValidateFull() const;
 
+  /// \brief Return the device_type that this array's data is allocated on
+  ///
+  /// This just delegates to calling device_type on the underlying ArrayData
+  /// object which backs this Array.
+  ///
+  /// \return DeviceAllocationType
+  DeviceAllocationType device_type() const { return data_->device_type(); }
+
  protected:
   Array() = default;
   ARROW_DEFAULT_MOVE_AND_ASSIGN(Array);
diff --git a/cpp/src/arrow/array/array_dict_test.cc b/cpp/src/arrow/array/array_dict_test.cc
index 4ae9e3d6dcbfc..22d6d1fc5ae92 100644
--- a/cpp/src/arrow/array/array_dict_test.cc
+++ b/cpp/src/arrow/array/array_dict_test.cc
@@ -1129,7 +1129,7 @@ TEST(TestDictionary, Validate) {
   arr = std::make_shared<DictionaryArray>(dict_type, indices, MakeArray(invalid_data));
   ASSERT_RAISES(Invalid, arr->ValidateFull());
 
-#if !defined(__APPLE__) && !defined(ARROW_VALGRIND)
+#if !defined(__APPLE__) && !defined(ARROW_VALGRIND) && !defined(__EMSCRIPTEN__)
   // GH-35712: ASSERT_DEATH would make testing slow on macOS.
   ASSERT_DEATH(
       {
diff --git a/cpp/src/arrow/array/array_list_test.cc b/cpp/src/arrow/array/array_list_test.cc
index b08fa99168616..3d18d5f967b72 100644
--- a/cpp/src/arrow/array/array_list_test.cc
+++ b/cpp/src/arrow/array/array_list_test.cc
@@ -735,7 +735,7 @@ class TestListArray : public ::testing::Test {
         ArrayFromJSON(type, "[[1, 2], [3], [4], null, [5], [], [6]]"));
     auto sliced_list_array =
         std::dynamic_pointer_cast<ArrayType>(list_array->Slice(3, 4));
-    ASSERT_OK_AND_ASSIGN(auto flattened, list_array->Flatten());
+    ASSERT_OK_AND_ASSIGN(auto flattened, sliced_list_array->Flatten());
     ASSERT_OK(flattened->ValidateFull());
     // Note the difference between values() and Flatten().
     EXPECT_TRUE(flattened->Equals(ArrayFromJSON(int32(), "[5, 6]")));
@@ -763,6 +763,52 @@ class TestListArray : public ::testing::Test {
         << flattened->ToString();
   }
 
+  void TestFlattenRecursively() {
+    auto inner_type = std::make_shared<T>(int32());
+    auto type = std::make_shared<T>(inner_type);
+
+    // List types with two nested level: list<list<int32>>
+    auto nested_list_array = std::dynamic_pointer_cast<ArrayType>(ArrayFromJSON(type, R"([
+      [[0, 1, 2], null, [3, null]],
+      [null],
+      [[2, 9], [4], [], [6, 5]]
+    ])"));
+    ASSERT_OK_AND_ASSIGN(auto flattened, nested_list_array->FlattenRecursively());
+    ASSERT_OK(flattened->ValidateFull());
+    ASSERT_EQ(10, flattened->length());
+    ASSERT_TRUE(
+        flattened->Equals(ArrayFromJSON(int32(), "[0, 1, 2, 3, null, 2, 9, 4, 6, 5]")));
+
+    // Empty nested list should flatten until non-list type is reached
+    nested_list_array =
+        std::dynamic_pointer_cast<ArrayType>(ArrayFromJSON(type, R"([null])"));
+    ASSERT_OK_AND_ASSIGN(flattened, nested_list_array->FlattenRecursively());
+    ASSERT_TRUE(flattened->type()->Equals(int32()));
+
+    // List types with three nested level: list<list<fixed_size_list<int32, 2>>>
+    type = std::make_shared<T>(std::make_shared<T>(fixed_size_list(int32(), 2)));
+    nested_list_array = std::dynamic_pointer_cast<ArrayType>(ArrayFromJSON(type, R"([
+      [
+        [[null, 0]],
+        [[3, 7], null]
+      ],
+      [
+        [[4, null], [5, 8]],
+        [[8, null]],
+        null
+      ],
+      [
+        null
+      ]
+    ])"));
+    ASSERT_OK_AND_ASSIGN(flattened, nested_list_array->FlattenRecursively());
+    ASSERT_OK(flattened->ValidateFull());
+    ASSERT_EQ(10, flattened->length());
+    ASSERT_EQ(3, flattened->null_count());
+    ASSERT_TRUE(flattened->Equals(
+        ArrayFromJSON(int32(), "[null, 0, 3, 7, 4, null, 5, 8, 8, null]")));
+  }
+
   Status ValidateOffsetsAndSizes(int64_t length, std::vector<offset_type> offsets,
                                  std::vector<offset_type> sizes,
                                  std::shared_ptr<Array> values, int64_t offset = 0) {
@@ -925,10 +971,12 @@ TYPED_TEST(TestListArray, BuilderPreserveFieldName) {
 TYPED_TEST(TestListArray, FlattenSimple) { this->TestFlattenSimple(); }
 TYPED_TEST(TestListArray, FlattenNulls) { this->TestFlattenNulls(); }
 TYPED_TEST(TestListArray, FlattenAllEmpty) { this->TestFlattenAllEmpty(); }
+TYPED_TEST(TestListArray, FlattenSliced) { this->TestFlattenSliced(); }
 TYPED_TEST(TestListArray, FlattenZeroLength) { this->TestFlattenZeroLength(); }
 TYPED_TEST(TestListArray, TestFlattenNonEmptyBackingNulls) {
   this->TestFlattenNonEmptyBackingNulls();
 }
+TYPED_TEST(TestListArray, FlattenRecursively) { this->TestFlattenRecursively(); }
 
 TYPED_TEST(TestListArray, ValidateDimensions) { this->TestValidateDimensions(); }
 
@@ -1239,7 +1287,7 @@ TEST_F(TestMapArray, ValidateErrorNullKey) {
 }
 
 TEST_F(TestMapArray, FromArrays) {
-  std::shared_ptr<Array> offsets1, offsets2, offsets3, offsets4, keys, items;
+  std::shared_ptr<Array> offsets1, offsets2, offsets3, offsets4, offsets5, keys, items;
 
   std::vector<bool> offsets_is_valid3 = {true, false, true, true};
   std::vector<bool> offsets_is_valid4 = {true, true, false, true};
@@ -1294,6 +1342,20 @@ TEST_F(TestMapArray, FromArrays) {
   // Zero-length offsets
   ASSERT_RAISES(Invalid, MapArray::FromArrays(offsets1->Slice(0, 0), keys, items, pool_));
 
+  // Offseted offsets
+  ASSERT_OK_AND_ASSIGN(auto map5,
+                       MapArray::FromArrays(offsets1->Slice(1), keys, items, pool_));
+  ASSERT_OK(map5->Validate());
+
+  AssertArraysEqual(*expected1.Slice(1), *map5);
+
+  std::vector<MapType::offset_type> offset5_values = {2, 2, 6};
+  ArrayFromVector<OffsetType, offset_type>(offset5_values, &offsets5);
+  ASSERT_OK_AND_ASSIGN(auto map6, MapArray::FromArrays(offsets5, keys, items, pool_));
+  ASSERT_OK(map6->Validate());
+
+  AssertArraysEqual(*map5, *map6);
+
   // Offsets not the right type
   ASSERT_RAISES(TypeError, MapArray::FromArrays(keys, offsets1, items, pool_));
 
@@ -1306,6 +1368,35 @@ TEST_F(TestMapArray, FromArrays) {
   ASSERT_EQ(keys_with_null->length(), tmp_items->length());
   ASSERT_RAISES(Invalid,
                 MapArray::FromArrays(offsets1, keys_with_null, tmp_items, pool_));
+
+  // With null_bitmap and null_count=1
+  auto null_bitmap_1 = ArrayFromJSON(boolean(), "[1, 0, 1]")->data()->buffers[1];
+  ASSERT_OK_AND_ASSIGN(auto map7,
+                       MapArray::FromArrays(offsets1, keys, items, pool_, null_bitmap_1));
+  ASSERT_OK(map7->Validate());
+  MapArray expected7(map_type, length, offsets1->data()->buffers[1], keys, items,
+                     null_bitmap_1, 1);
+  ASSERT_EQ(map7->null_count(), 1);
+  AssertArraysEqual(expected7, *map7);
+
+  // With null_bitmap and null_count=2
+  auto null_bitmap_2 = ArrayFromJSON(boolean(), "[0, 1, 0]")->data()->buffers[1];
+  ASSERT_OK_AND_ASSIGN(auto map8,
+                       MapArray::FromArrays(offsets1, keys, items, pool_, null_bitmap_2));
+  ASSERT_OK(map8->Validate());
+  MapArray expected8(map_type, length, offsets1->data()->buffers[1], keys, items,
+                     null_bitmap_2, 2);
+  ASSERT_EQ(map8->null_count(), 2);
+  AssertArraysEqual(expected8, *map8);
+
+  // Null bitmap and offset with null
+  ASSERT_RAISES(Invalid, MapArray::FromArrays(offsets3, keys, items, pool_,
+                                              offsets3->data()->buffers[0]));
+
+  // Null bitmap and offset with offset
+  ASSERT_RAISES(NotImplemented,
+                MapArray::FromArrays(offsets1->Slice(2), keys, items, pool_,
+                                     offsets3->data()->buffers[0]));
 }
 
 TEST_F(TestMapArray, FromArraysEquality) {
@@ -1714,4 +1805,23 @@ TEST_F(TestFixedSizeListArray, Flatten) {
   }
 }
 
+TEST_F(TestFixedSizeListArray, FlattenRecursively) {
+  // Nested fixed-size list-array: fixed_size_list(fixed_size_list(int32, 2), 2)
+  auto inner_type = fixed_size_list(value_type_, 2);
+  type_ = fixed_size_list(inner_type, 2);
+
+  auto values = std::dynamic_pointer_cast<FixedSizeListArray>(ArrayFromJSON(type_, R"([
+    [[0, 1], [null, 3]],
+    [[7, null], [2, 5]],
+    [null, null]
+  ])"));
+  ASSERT_OK(values->ValidateFull());
+  ASSERT_OK_AND_ASSIGN(auto flattened, values->FlattenRecursively());
+  ASSERT_OK(flattened->ValidateFull());
+  ASSERT_EQ(8, flattened->length());
+  ASSERT_EQ(2, flattened->null_count());
+  AssertArraysEqual(*flattened,
+                    *ArrayFromJSON(value_type_, "[0, 1, null, 3, 7, null, 2, 5]"));
+}
+
 }  // namespace arrow
diff --git a/cpp/src/arrow/array/array_nested.cc b/cpp/src/arrow/array/array_nested.cc
index 958c2e25380b0..47c0fd35829a1 100644
--- a/cpp/src/arrow/array/array_nested.cc
+++ b/cpp/src/arrow/array/array_nested.cc
@@ -42,6 +42,7 @@
 #include "arrow/util/checked_cast.h"
 #include "arrow/util/list_util.h"
 #include "arrow/util/logging.h"
+#include "arrow/util/unreachable.h"
 
 namespace arrow {
 
@@ -114,7 +115,7 @@ Result<std::shared_ptr<typename TypeTraits<TYPE>::ArrayType>> ListArrayFromArray
     return Status::TypeError("List offsets must be ", OffsetArrowType::type_name());
   }
 
-  if (null_bitmap != nullptr && offsets.null_count() > 0) {
+  if (null_bitmap != nullptr && offsets.data()->MayHaveNulls()) {
     return Status::Invalid(
         "Ambiguous to specify both validity map and offsets with nulls");
   }
@@ -469,6 +470,49 @@ inline void SetListData(VarLengthListLikeArray<TYPE>* self,
   self->values_ = MakeArray(self->data_->child_data[0]);
 }
 
+Result<std::shared_ptr<Array>> FlattenLogicalListRecursively(const Array& in_array,
+                                                             MemoryPool* memory_pool) {
+  std::shared_ptr<Array> array = in_array.Slice(0, in_array.length());
+  for (auto kind = array->type_id(); is_list(kind) || is_list_view(kind);
+       kind = array->type_id()) {
+    switch (kind) {
+      case Type::LIST: {
+        ARROW_ASSIGN_OR_RAISE(
+            array, (checked_cast<const ListArray*>(array.get())->Flatten(memory_pool)));
+        break;
+      }
+      case Type::LARGE_LIST: {
+        ARROW_ASSIGN_OR_RAISE(
+            array,
+            (checked_cast<const LargeListArray*>(array.get())->Flatten(memory_pool)));
+        break;
+      }
+      case Type::LIST_VIEW: {
+        ARROW_ASSIGN_OR_RAISE(
+            array,
+            (checked_cast<const ListViewArray*>(array.get())->Flatten(memory_pool)));
+        break;
+      }
+      case Type::LARGE_LIST_VIEW: {
+        ARROW_ASSIGN_OR_RAISE(
+            array,
+            (checked_cast<const LargeListViewArray*>(array.get())->Flatten(memory_pool)));
+        break;
+      }
+      case Type::FIXED_SIZE_LIST: {
+        ARROW_ASSIGN_OR_RAISE(
+            array,
+            (checked_cast<const FixedSizeListArray*>(array.get())->Flatten(memory_pool)));
+        break;
+      }
+      default:
+        Unreachable("unexpected non-list type");
+        break;
+    }
+  }
+  return array;
+}
+
 }  // namespace internal
 
 // ----------------------------------------------------------------------
@@ -746,7 +790,7 @@ MapArray::MapArray(const std::shared_ptr<DataType>& type, int64_t length,
                    const std::shared_ptr<Array>& items, int64_t null_count,
                    int64_t offset) {
   auto pair_data = ArrayData::Make(type->fields()[0]->type(), keys->data()->length,
-                                   {nullptr}, {keys->data(), items->data()}, 0, offset);
+                                   {nullptr}, {keys->data(), items->data()}, 0);
   auto map_data =
       ArrayData::Make(type, length, std::move(buffers), {pair_data}, null_count, offset);
   SetData(map_data);
@@ -763,7 +807,7 @@ MapArray::MapArray(const std::shared_ptr<DataType>& type, int64_t length,
 Result<std::shared_ptr<Array>> MapArray::FromArraysInternal(
     std::shared_ptr<DataType> type, const std::shared_ptr<Array>& offsets,
     const std::shared_ptr<Array>& keys, const std::shared_ptr<Array>& items,
-    MemoryPool* pool) {
+    MemoryPool* pool, std::shared_ptr<Buffer> null_bitmap) {
   using offset_type = typename MapType::offset_type;
   using OffsetArrowType = typename CTypeTraits<offset_type>::ArrowType;
 
@@ -783,7 +827,16 @@ Result<std::shared_ptr<Array>> MapArray::FromArraysInternal(
     return Status::Invalid("Map key and item arrays must be equal length");
   }
 
-  if (offsets->null_count() > 0) {
+  if (null_bitmap != nullptr && offsets->data()->MayHaveNulls()) {
+    return Status::Invalid(
+        "Ambiguous to specify both validity map and offsets with nulls");
+  }
+
+  if (null_bitmap != nullptr && offsets->offset() != 0) {
+    return Status::NotImplemented("Null bitmap with offsets slice not supported.");
+  }
+
+  if (offsets->data()->MayHaveNulls()) {
     ARROW_ASSIGN_OR_RAISE(auto buffers,
                           CleanListOffsets<MapType>(NULLPTR, *offsets, pool));
     return std::make_shared<MapArray>(type, offsets->length() - 1, std::move(buffers),
@@ -792,24 +845,34 @@ Result<std::shared_ptr<Array>> MapArray::FromArraysInternal(
 
   using OffsetArrayType = typename TypeTraits<OffsetArrowType>::ArrayType;
   const auto& typed_offsets = checked_cast<const OffsetArrayType&>(*offsets);
-  auto buffers = BufferVector({nullptr, typed_offsets.values()});
+
+  BufferVector buffers;
+  buffers.resize(2);
+  int64_t null_count = 0;
+  if (null_bitmap) {
+    buffers[0] = std::move(null_bitmap);
+    null_count = kUnknownNullCount;
+  }
+  buffers[1] = typed_offsets.values();
   return std::make_shared<MapArray>(type, offsets->length() - 1, std::move(buffers), keys,
-                                    items, /*null_count=*/0, offsets->offset());
+                                    items, /*null_count=*/null_count, offsets->offset());
 }
 
 Result<std::shared_ptr<Array>> MapArray::FromArrays(const std::shared_ptr<Array>& offsets,
                                                     const std::shared_ptr<Array>& keys,
                                                     const std::shared_ptr<Array>& items,
-                                                    MemoryPool* pool) {
+                                                    MemoryPool* pool,
+                                                    std::shared_ptr<Buffer> null_bitmap) {
   return FromArraysInternal(std::make_shared<MapType>(keys->type(), items->type()),
-                            offsets, keys, items, pool);
+                            offsets, keys, items, pool, std::move(null_bitmap));
 }
 
 Result<std::shared_ptr<Array>> MapArray::FromArrays(std::shared_ptr<DataType> type,
                                                     const std::shared_ptr<Array>& offsets,
                                                     const std::shared_ptr<Array>& keys,
                                                     const std::shared_ptr<Array>& items,
-                                                    MemoryPool* pool) {
+                                                    MemoryPool* pool,
+                                                    std::shared_ptr<Buffer> null_bitmap) {
   if (type->id() != Type::MAP) {
     return Status::TypeError("Expected map type, got ", type->ToString());
   }
@@ -820,7 +883,8 @@ Result<std::shared_ptr<Array>> MapArray::FromArrays(std::shared_ptr<DataType> ty
   if (!map_type.item_type()->Equals(items->type())) {
     return Status::TypeError("Mismatching map items type");
   }
-  return FromArraysInternal(std::move(type), offsets, keys, items, pool);
+  return FromArraysInternal(std::move(type), offsets, keys, items, pool,
+                            std::move(null_bitmap));
 }
 
 Status MapArray::ValidateChildData(
@@ -832,13 +896,13 @@ Status MapArray::ValidateChildData(
   if (pair_data->type->id() != Type::STRUCT) {
     return Status::Invalid("Map array child array should have struct type");
   }
-  if (pair_data->null_count != 0) {
+  if (pair_data->MayHaveNulls()) {
     return Status::Invalid("Map array child array should have no nulls");
   }
   if (pair_data->child_data.size() != 2) {
     return Status::Invalid("Map array child array should have two fields");
   }
-  if (pair_data->child_data[0]->null_count != 0) {
+  if (pair_data->child_data[0]->MayHaveNulls()) {
     return Status::Invalid("Map array keys array should have no nulls");
   }
   return Status::OK();
@@ -1133,7 +1197,7 @@ void SparseUnionArray::SetData(std::shared_ptr<ArrayData> data) {
 }
 
 void DenseUnionArray::SetData(const std::shared_ptr<ArrayData>& data) {
-  this->UnionArray::SetData(std::move(data));
+  this->UnionArray::SetData(data);
 
   ARROW_CHECK_EQ(data_->type->id(), Type::DENSE_UNION);
   ARROW_CHECK_EQ(data_->buffers.size(), 3);
diff --git a/cpp/src/arrow/array/array_nested.h b/cpp/src/arrow/array/array_nested.h
index 768a630e0af54..a6d4977839ef1 100644
--- a/cpp/src/arrow/array/array_nested.h
+++ b/cpp/src/arrow/array/array_nested.h
@@ -58,6 +58,20 @@ void SetListData(VarLengthListLikeArray<TYPE>* self,
                  const std::shared_ptr<ArrayData>& data,
                  Type::type expected_type_id = TYPE::type_id);
 
+/// \brief A version of Flatten that keeps recursively flattening until an array of
+/// non-list values is reached.
+///
+/// Array types considered to be lists by this function:
+///  - list
+///  - large_list
+///  - list_view
+///  - large_list_view
+///  - fixed_size_list
+///
+/// \see ListArray::Flatten
+ARROW_EXPORT Result<std::shared_ptr<Array>> FlattenLogicalListRecursively(
+    const Array& in_array, MemoryPool* memory_pool);
+
 }  // namespace internal
 
 /// Base class for variable-sized list and list-view arrays, regardless of offset size.
@@ -103,6 +117,15 @@ class VarLengthListLikeArray : public Array {
     return values_->Slice(value_offset(i), value_length(i));
   }
 
+  /// \brief Flatten all level recursively until reach a non-list type, and return
+  /// a non-list type Array.
+  ///
+  /// \see internal::FlattenLogicalListRecursively
+  Result<std::shared_ptr<Array>> FlattenRecursively(
+      MemoryPool* memory_pool = default_memory_pool()) const {
+    return internal::FlattenLogicalListRecursively(*this, memory_pool);
+  }
+
  protected:
   friend void internal::SetListData<TYPE>(VarLengthListLikeArray<TYPE>* self,
                                           const std::shared_ptr<ArrayData>& data,
@@ -509,15 +532,18 @@ class ARROW_EXPORT MapArray : public ListArray {
   /// \param[in] keys Array containing key values
   /// \param[in] items Array containing item values
   /// \param[in] pool MemoryPool in case new offsets array needs to be
+  /// \param[in] null_bitmap Optional validity bitmap
   /// allocated because of null values
   static Result<std::shared_ptr<Array>> FromArrays(
       const std::shared_ptr<Array>& offsets, const std::shared_ptr<Array>& keys,
-      const std::shared_ptr<Array>& items, MemoryPool* pool = default_memory_pool());
+      const std::shared_ptr<Array>& items, MemoryPool* pool = default_memory_pool(),
+      std::shared_ptr<Buffer> null_bitmap = NULLPTR);
 
   static Result<std::shared_ptr<Array>> FromArrays(
       std::shared_ptr<DataType> type, const std::shared_ptr<Array>& offsets,
       const std::shared_ptr<Array>& keys, const std::shared_ptr<Array>& items,
-      MemoryPool* pool = default_memory_pool());
+      MemoryPool* pool = default_memory_pool(),
+      std::shared_ptr<Buffer> null_bitmap = NULLPTR);
 
   const MapType* map_type() const { return map_type_; }
 
@@ -537,7 +563,7 @@ class ARROW_EXPORT MapArray : public ListArray {
   static Result<std::shared_ptr<Array>> FromArraysInternal(
       std::shared_ptr<DataType> type, const std::shared_ptr<Array>& offsets,
       const std::shared_ptr<Array>& keys, const std::shared_ptr<Array>& items,
-      MemoryPool* pool);
+      MemoryPool* pool, std::shared_ptr<Buffer> null_bitmap = NULLPTR);
 
  private:
   const MapType* map_type_;
@@ -595,6 +621,15 @@ class ARROW_EXPORT FixedSizeListArray : public Array {
   Result<std::shared_ptr<Array>> Flatten(
       MemoryPool* memory_pool = default_memory_pool()) const;
 
+  /// \brief Flatten all level recursively until reach a non-list type, and return
+  /// a non-list type Array.
+  ///
+  /// \see internal::FlattenLogicalListRecursively
+  Result<std::shared_ptr<Array>> FlattenRecursively(
+      MemoryPool* memory_pool = default_memory_pool()) const {
+    return internal::FlattenLogicalListRecursively(*this, memory_pool);
+  }
+
   /// \brief Construct FixedSizeListArray from child value array and value_length
   ///
   /// \param[in] values Array containing list values
diff --git a/cpp/src/arrow/array/array_primitive.cc b/cpp/src/arrow/array/array_primitive.cc
index 7c4a14d93400f..da3810aa392c9 100644
--- a/cpp/src/arrow/array/array_primitive.cc
+++ b/cpp/src/arrow/array/array_primitive.cc
@@ -56,7 +56,7 @@ int64_t BooleanArray::false_count() const {
 }
 
 int64_t BooleanArray::true_count() const {
-  if (data_->null_count.load() != 0) {
+  if (data_->MayHaveNulls()) {
     DCHECK(data_->buffers[0]);
     return internal::CountAndSetBits(data_->buffers[0]->data(), data_->offset,
                                      data_->buffers[1]->data(), data_->offset,
diff --git a/cpp/src/arrow/array/array_test.cc b/cpp/src/arrow/array/array_test.cc
index 21ac1a09f56e7..32806d9d2edb3 100644
--- a/cpp/src/arrow/array/array_test.cc
+++ b/cpp/src/arrow/array/array_test.cc
@@ -22,6 +22,7 @@
 #include <cmath>
 #include <cstdint>
 #include <cstring>
+#include <future>
 #include <limits>
 #include <memory>
 #include <numeric>
@@ -477,6 +478,7 @@ TEST_F(TestArray, TestMakeArrayOfNull) {
       ASSERT_EQ(array->type(), type);
       ASSERT_OK(array->ValidateFull());
       ASSERT_EQ(array->length(), length);
+      ASSERT_EQ(array->device_type(), DeviceAllocationType::kCPU);
       if (is_union(type->id())) {
         ASSERT_EQ(array->null_count(), 0);
         ASSERT_EQ(array->ComputeLogicalNullCount(), length);
@@ -603,11 +605,11 @@ void AssertAppendScalar(MemoryPool* pool, const std::shared_ptr<Scalar>& scalar)
   ASSERT_EQ(out->length(), 9);
 
   auto out_type_id = out->type()->id();
-  const bool has_validity = internal::HasValidityBitmap(out_type_id);
+  const bool can_check_nulls = internal::may_have_validity_bitmap(out_type_id);
   // For a dictionary builder, the output dictionary won't necessarily be the same
   const bool can_check_values = !is_dictionary(out_type_id);
 
-  if (has_validity) {
+  if (can_check_nulls) {
     ASSERT_EQ(out->null_count(), 4);
   } else {
     ASSERT_EQ(out->null_count(), 0);
@@ -718,6 +720,7 @@ TEST_F(TestArray, TestMakeArrayFromScalar) {
       ASSERT_OK(array->ValidateFull());
       ASSERT_EQ(array->length(), length);
       ASSERT_EQ(array->null_count(), 0);
+      ASSERT_EQ(array->device_type(), DeviceAllocationType::kCPU);
 
       // test case for ARROW-13321
       for (int64_t i : {int64_t{0}, length / 2, length - 1}) {
@@ -743,6 +746,7 @@ TEST_F(TestArray, TestMakeArrayFromScalarSliced) {
     auto sliced = array->Slice(1, 4);
     ASSERT_EQ(sliced->length(), 4);
     ASSERT_EQ(sliced->null_count(), 0);
+    ASSERT_EQ(array->device_type(), DeviceAllocationType::kCPU);
     ARROW_EXPECT_OK(sliced->ValidateFull());
   }
 }
@@ -757,6 +761,7 @@ TEST_F(TestArray, TestMakeArrayFromDictionaryScalar) {
   ASSERT_OK(array->ValidateFull());
   ASSERT_EQ(array->length(), 4);
   ASSERT_EQ(array->null_count(), 0);
+  ASSERT_EQ(array->device_type(), DeviceAllocationType::kCPU);
 
   for (int i = 0; i < 4; i++) {
     ASSERT_OK_AND_ASSIGN(auto item, array->GetScalar(i));
@@ -796,6 +801,7 @@ TEST_F(TestArray, TestMakeEmptyArray) {
     ASSERT_OK_AND_ASSIGN(auto array, MakeEmptyArray(type));
     ASSERT_OK(array->ValidateFull());
     ASSERT_EQ(array->length(), 0);
+
     CheckSpanRoundTrip(*array);
   }
 }
@@ -823,6 +829,44 @@ TEST_F(TestArray, TestFillFromScalar) {
   }
 }
 
+// GH-40069: Data-race when concurrent calling ArraySpan::FillFromScalar of the same
+// scalar instance.
+TEST_F(TestArray, TestConcurrentFillFromScalar) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+  for (auto type : TestArrayUtilitiesAgainstTheseTypes()) {
+    ARROW_SCOPED_TRACE("type = ", type->ToString());
+    for (auto seed : {0u, 0xdeadbeef, 42u}) {
+      ARROW_SCOPED_TRACE("seed = ", seed);
+
+      Field field("", type, /*nullable=*/true,
+                  key_value_metadata({{"extension_allow_random_storage", "true"}}));
+      auto array = random::GenerateArray(field, 1, seed);
+
+      ASSERT_OK_AND_ASSIGN(auto scalar, array->GetScalar(0));
+
+      // Lambda to create fill an ArraySpan with the scalar and use the ArraySpan a bit.
+      auto array_span_from_scalar = [&]() {
+        ArraySpan span(*scalar);
+        auto roundtripped_array = span.ToArray();
+        ASSERT_OK(roundtripped_array->ValidateFull());
+
+        AssertArraysEqual(*array, *roundtripped_array);
+        ASSERT_OK_AND_ASSIGN(auto roundtripped_scalar, roundtripped_array->GetScalar(0));
+        AssertScalarsEqual(*scalar, *roundtripped_scalar);
+      };
+
+      // Two concurrent calls to the lambda are just enough for TSAN to detect a race
+      // condition.
+      auto fut1 = std::async(std::launch::async, array_span_from_scalar);
+      auto fut2 = std::async(std::launch::async, array_span_from_scalar);
+      fut1.get();
+      fut2.get();
+    }
+  }
+}
+
 TEST_F(TestArray, ExtensionSpanRoundTrip) {
   // Other types are checked in MakeEmptyArray but MakeEmptyArray doesn't
   // work for extension types so we check that here
@@ -855,7 +899,8 @@ TEST_F(TestArray, TestAppendArraySlice) {
     span.SetMembers(*nulls->data());
     ASSERT_OK(builder->AppendArraySlice(span, 0, 4));
     ASSERT_EQ(12, builder->length());
-    const bool has_validity_bitmap = internal::HasValidityBitmap(scalar->type->id());
+    const bool has_validity_bitmap =
+        internal::may_have_validity_bitmap(scalar->type->id());
     if (has_validity_bitmap) {
       ASSERT_EQ(4, builder->null_count());
     }
@@ -1307,6 +1352,13 @@ TEST(TestBooleanArray, TrueCountFalseCount) {
   CheckArray(checked_cast<const BooleanArray&>(*arr));
   CheckArray(checked_cast<const BooleanArray&>(*arr->Slice(5)));
   CheckArray(checked_cast<const BooleanArray&>(*arr->Slice(0, 0)));
+
+  // GH-41016 true_count() with array without validity buffer with null_count of -1
+  auto arr_unknown_null_count = ArrayFromJSON(boolean(), "[true, false, true]");
+  arr_unknown_null_count->data()->null_count = kUnknownNullCount;
+  ASSERT_EQ(arr_unknown_null_count->data()->null_count.load(), -1);
+  ASSERT_EQ(arr_unknown_null_count->null_bitmap(), nullptr);
+  ASSERT_EQ(checked_pointer_cast<BooleanArray>(arr_unknown_null_count)->true_count(), 2);
 }
 
 TEST(TestPrimitiveAdHoc, TestType) {
diff --git a/cpp/src/arrow/array/builder_base.h b/cpp/src/arrow/array/builder_base.h
index 11036797e014f..ecd2136f5d20b 100644
--- a/cpp/src/arrow/array/builder_base.h
+++ b/cpp/src/arrow/array/builder_base.h
@@ -175,8 +175,9 @@ class ARROW_EXPORT ArrayBuilder {
   /// \brief Append a range of values from an array.
   ///
   /// The given array must be the same type as the builder.
-  virtual Status AppendArraySlice(const ArraySpan& array, int64_t offset,
-                                  int64_t length) {
+  virtual Status AppendArraySlice(const ArraySpan& ARROW_ARG_UNUSED(array),
+                                  int64_t ARROW_ARG_UNUSED(offset),
+                                  int64_t ARROW_ARG_UNUSED(length)) {
     return Status::NotImplemented("AppendArraySlice for builder for ", *type());
   }
 
@@ -331,7 +332,7 @@ inline Result<std::unique_ptr<ArrayBuilder>> MakeBuilder(
     const std::shared_ptr<DataType>& type, MemoryPool* pool = default_memory_pool()) {
   std::unique_ptr<ArrayBuilder> out;
   ARROW_RETURN_NOT_OK(MakeBuilder(pool, type, &out));
-  return std::move(out);
+  return out;
 }
 
 /// \brief Construct an empty ArrayBuilder corresponding to the data
@@ -345,7 +346,7 @@ inline Result<std::unique_ptr<ArrayBuilder>> MakeBuilderExactIndex(
     const std::shared_ptr<DataType>& type, MemoryPool* pool = default_memory_pool()) {
   std::unique_ptr<ArrayBuilder> out;
   ARROW_RETURN_NOT_OK(MakeBuilderExactIndex(pool, type, &out));
-  return std::move(out);
+  return out;
 }
 
 /// \brief Construct an empty DictionaryBuilder initialized optionally
@@ -364,7 +365,7 @@ inline Result<std::unique_ptr<ArrayBuilder>> MakeDictionaryBuilder(
     MemoryPool* pool = default_memory_pool()) {
   std::unique_ptr<ArrayBuilder> out;
   ARROW_RETURN_NOT_OK(MakeDictionaryBuilder(pool, type, dictionary, &out));
-  return std::move(out);
+  return out;
 }
 
 }  // namespace arrow
diff --git a/cpp/src/arrow/array/builder_nested.h b/cpp/src/arrow/array/builder_nested.h
index 429aa5c0488cd..1851ef9122274 100644
--- a/cpp/src/arrow/array/builder_nested.h
+++ b/cpp/src/arrow/array/builder_nested.h
@@ -181,13 +181,11 @@ class ARROW_EXPORT VarLengthListLikeBuilder : public ArrayBuilder {
     if constexpr (is_list_view(TYPE::type_id)) {
       sizes = array.GetValues<offset_type>(2);
     }
-    const bool all_valid = !array.MayHaveLogicalNulls();
-    const uint8_t* validity = array.HasValidityBitmap() ? array.buffers[0].data : NULLPTR;
+    static_assert(internal::may_have_validity_bitmap(TYPE::type_id));
+    const uint8_t* validity = array.MayHaveNulls() ? array.buffers[0].data : NULLPTR;
     ARROW_RETURN_NOT_OK(Reserve(length));
     for (int64_t row = offset; row < offset + length; row++) {
-      const bool is_valid =
-          all_valid || (validity && bit_util::GetBit(validity, array.offset + row)) ||
-          array.IsValid(row);
+      const bool is_valid = !validity || bit_util::GetBit(validity, array.offset + row);
       int64_t size = 0;
       if (is_valid) {
         if constexpr (is_list_view(TYPE::type_id)) {
@@ -250,7 +248,7 @@ class ARROW_EXPORT VarLengthListLikeBuilder : public ArrayBuilder {
   /// \brief Append dimensions for a single list slot.
   ///
   /// ListViewBuilder overrides this to also append the size.
-  virtual void UnsafeAppendDimensions(int64_t offset, int64_t size) {
+  virtual void UnsafeAppendDimensions(int64_t offset, int64_t ARROW_ARG_UNUSED(size)) {
     offsets_builder_.UnsafeAppend(static_cast<offset_type>(offset));
   }
 
@@ -569,13 +567,11 @@ class ARROW_EXPORT MapBuilder : public ArrayBuilder {
 
   Status AppendArraySlice(const ArraySpan& array, int64_t offset,
                           int64_t length) override {
-    const int32_t* offsets = array.GetValues<int32_t>(1);
-    const bool all_valid = !array.MayHaveLogicalNulls();
-    const uint8_t* validity = array.HasValidityBitmap() ? array.buffers[0].data : NULLPTR;
+    const auto* offsets = array.GetValues<int32_t>(1);
+    static_assert(internal::may_have_validity_bitmap(MapType::type_id));
+    const uint8_t* validity = array.MayHaveNulls() ? array.buffers[0].data : NULLPTR;
     for (int64_t row = offset; row < offset + length; row++) {
-      const bool is_valid =
-          all_valid || (validity && bit_util::GetBit(validity, array.offset + row)) ||
-          array.IsValid(row);
+      const bool is_valid = !validity || bit_util::GetBit(validity, array.offset + row);
       if (is_valid) {
         ARROW_RETURN_NOT_OK(Append());
         const int64_t slot_length = offsets[row + 1] - offsets[row];
@@ -646,6 +642,8 @@ class ARROW_EXPORT MapBuilder : public ArrayBuilder {
 /// \brief Builder class for fixed-length list array value types
 class ARROW_EXPORT FixedSizeListBuilder : public ArrayBuilder {
  public:
+  using TypeClass = FixedSizeListType;
+
   /// Use this constructor to define the built array's type explicitly. If value_builder
   /// has indeterminate type, this builder will also.
   FixedSizeListBuilder(MemoryPool* pool,
diff --git a/cpp/src/arrow/array/builder_primitive.h b/cpp/src/arrow/array/builder_primitive.h
index 29e01d55edeb1..de7af1b46bdee 100644
--- a/cpp/src/arrow/array/builder_primitive.h
+++ b/cpp/src/arrow/array/builder_primitive.h
@@ -32,9 +32,10 @@ namespace arrow {
 class ARROW_EXPORT NullBuilder : public ArrayBuilder {
  public:
   explicit NullBuilder(MemoryPool* pool = default_memory_pool(),
-                       int64_t alignment = kDefaultBufferAlignment)
+                       int64_t ARROW_ARG_UNUSED(alignment) = kDefaultBufferAlignment)
       : ArrayBuilder(pool) {}
-  explicit NullBuilder(const std::shared_ptr<DataType>& type,
+
+  explicit NullBuilder(const std::shared_ptr<DataType>& ARROW_ARG_UNUSED(type),
                        MemoryPool* pool = default_memory_pool(),
                        int64_t alignment = kDefaultBufferAlignment)
       : NullBuilder(pool, alignment) {}
diff --git a/cpp/src/arrow/array/builder_run_end.cc b/cpp/src/arrow/array/builder_run_end.cc
index cff8d72952385..ed384123d8b87 100644
--- a/cpp/src/arrow/array/builder_run_end.cc
+++ b/cpp/src/arrow/array/builder_run_end.cc
@@ -162,8 +162,7 @@ Status RunCompressorBuilder::FinishInternal(std::shared_ptr<ArrayData>* out) {
 RunEndEncodedBuilder::ValueRunBuilder::ValueRunBuilder(
     MemoryPool* pool, const std::shared_ptr<ArrayBuilder>& value_builder,
     const std::shared_ptr<DataType>& value_type, RunEndEncodedBuilder& ree_builder)
-    : RunCompressorBuilder(pool, std::move(value_builder), std::move(value_type)),
-      ree_builder_(ree_builder) {}
+    : RunCompressorBuilder(pool, value_builder, value_type), ree_builder_(ree_builder) {}
 
 RunEndEncodedBuilder::RunEndEncodedBuilder(
     MemoryPool* pool, const std::shared_ptr<ArrayBuilder>& run_end_builder,
diff --git a/cpp/src/arrow/array/concatenate.cc b/cpp/src/arrow/array/concatenate.cc
index ff9ed66d1149f..87e55246c78fe 100644
--- a/cpp/src/arrow/array/concatenate.cc
+++ b/cpp/src/arrow/array/concatenate.cc
@@ -317,7 +317,7 @@ class ConcatenateImpl {
   }
 
   Status Concatenate(std::shared_ptr<ArrayData>* out) && {
-    if (out_->null_count != 0 && internal::HasValidityBitmap(out_->type->id())) {
+    if (out_->null_count != 0 && internal::may_have_validity_bitmap(out_->type->id())) {
       RETURN_NOT_OK(ConcatenateBitmaps(Bitmaps(0), pool_, &out_->buffers[0]));
     }
     RETURN_NOT_OK(VisitTypeInline(*out_->type, this));
@@ -522,7 +522,8 @@ class ConcatenateImpl {
       }
       out_data += data->length * index_width;
     }
-    return std::move(out);
+    // R build with openSUSE155 requires an explicit shared_ptr construction
+    return std::shared_ptr<Buffer>(std::move(out));
   }
 
   Status Visit(const DictionaryType& d) {
diff --git a/cpp/src/arrow/array/data.cc b/cpp/src/arrow/array/data.cc
index 80c411dfa6a6d..83eeb56c496cf 100644
--- a/cpp/src/arrow/array/data.cc
+++ b/cpp/src/arrow/array/data.cc
@@ -53,7 +53,7 @@ static inline void AdjustNonNullable(Type::type type_id, int64_t length,
   if (type_id == Type::NA) {
     *null_count = length;
     (*buffers)[0] = nullptr;
-  } else if (internal::HasValidityBitmap(type_id)) {
+  } else if (internal::may_have_validity_bitmap(type_id)) {
     if (*null_count == 0) {
       // In case there are no nulls, don't keep an allocated null bitmap around
       (*buffers)[0] = nullptr;
@@ -224,6 +224,54 @@ int64_t ArrayData::ComputeLogicalNullCount() const {
   return ArraySpan(*this).ComputeLogicalNullCount();
 }
 
+DeviceAllocationType ArrayData::device_type() const {
+  // we're using 0 as a sentinel value for NOT YET ASSIGNED
+  // there is explicitly no constant DeviceAllocationType to represent
+  // the "UNASSIGNED" case as it is invalid for data to not have an
+  // assigned device type. If it's still 0 at the end, then we return
+  // CPU as the allocation device type
+  int type = 0;
+  for (const auto& buf : buffers) {
+    if (!buf) continue;
+#ifdef NDEBUG
+    return buf->device_type();
+#else
+    if (type == 0) {
+      type = static_cast<int>(buf->device_type());
+    } else {
+      DCHECK_EQ(type, static_cast<int>(buf->device_type()));
+    }
+#endif
+  }
+
+  for (const auto& child : child_data) {
+    if (!child) continue;
+#ifdef NDEBUG
+    return child->device_type();
+#else
+    if (type == 0) {
+      type = static_cast<int>(child->device_type());
+    } else {
+      DCHECK_EQ(type, static_cast<int>(child->device_type()));
+    }
+#endif
+  }
+
+  if (dictionary) {
+#ifdef NDEBUG
+    return dictionary->device_type();
+#else
+    if (type == 0) {
+      type = static_cast<int>(dictionary->device_type());
+    } else {
+      DCHECK_EQ(type, static_cast<int>(dictionary->device_type()));
+    }
+#endif
+  }
+
+  return type == 0 ? DeviceAllocationType::kCPU : static_cast<DeviceAllocationType>(type);
+}
+
 // ----------------------------------------------------------------------
 // Methods for ArraySpan
 
@@ -283,25 +331,15 @@ void ArraySpan::SetMembers(const ArrayData& data) {
 
 namespace {
 
-template <typename offset_type>
-BufferSpan OffsetsForScalar(uint8_t* scratch_space, offset_type value_size) {
-  auto* offsets = reinterpret_cast<offset_type*>(scratch_space);
-  offsets[0] = 0;
-  offsets[1] = static_cast<offset_type>(value_size);
-  static_assert(2 * sizeof(offset_type) <= 16);
-  return {scratch_space, sizeof(offset_type) * 2};
+BufferSpan OffsetsForScalar(uint8_t* scratch_space, int64_t offset_width) {
+  return {scratch_space, offset_width * 2};
 }
 
-template <typename offset_type>
 std::pair<BufferSpan, BufferSpan> OffsetsAndSizesForScalar(uint8_t* scratch_space,
-                                                           offset_type value_size) {
+                                                           int64_t offset_width) {
   auto* offsets = scratch_space;
-  auto* sizes = scratch_space + sizeof(offset_type);
-  reinterpret_cast<offset_type*>(offsets)[0] = 0;
-  reinterpret_cast<offset_type*>(sizes)[0] = value_size;
-  static_assert(2 * sizeof(offset_type) <= 16);
-  return {BufferSpan{offsets, sizeof(offset_type)},
-          BufferSpan{sizes, sizeof(offset_type)}};
+  auto* sizes = scratch_space + offset_width;
+  return {BufferSpan{offsets, offset_width}, BufferSpan{sizes, offset_width}};
 }
 
 int GetNumBuffers(const DataType& type) {
@@ -345,7 +383,7 @@ void FillZeroLengthArray(const DataType* type, ArraySpan* span) {
     span->buffers[i].size = 0;
   }
 
-  if (!HasValidityBitmap(type->id())) {
+  if (!may_have_validity_bitmap(type->id())) {
     span->buffers[0] = {};
   }
 
@@ -380,7 +418,7 @@ void ArraySpan::FillFromScalar(const Scalar& value) {
 
   if (type_id == Type::NA) {
     this->null_count = 1;
-  } else if (!internal::HasValidityBitmap(type_id)) {
+  } else if (!internal::may_have_validity_bitmap(type_id)) {
     this->null_count = 0;
   } else {
     // Populate null count and validity bitmap
@@ -415,26 +453,23 @@ void ArraySpan::FillFromScalar(const Scalar& value) {
       data_size = scalar.value->size();
     }
     if (is_binary_like(type_id)) {
-      this->buffers[1] =
-          OffsetsForScalar(scalar.scratch_space_, static_cast<int32_t>(data_size));
+      const auto& binary_scalar = checked_cast<const BinaryScalar&>(value);
+      this->buffers[1] = OffsetsForScalar(binary_scalar.scratch_space_, sizeof(int32_t));
     } else {
       // is_large_binary_like
-      this->buffers[1] = OffsetsForScalar(scalar.scratch_space_, data_size);
+      const auto& large_binary_scalar = checked_cast<const LargeBinaryScalar&>(value);
+      this->buffers[1] =
+          OffsetsForScalar(large_binary_scalar.scratch_space_, sizeof(int64_t));
     }
     this->buffers[2].data = const_cast<uint8_t*>(data_buffer);
     this->buffers[2].size = data_size;
   } else if (type_id == Type::BINARY_VIEW || type_id == Type::STRING_VIEW) {
-    const auto& scalar = checked_cast<const BaseBinaryScalar&>(value);
+    const auto& scalar = checked_cast<const BinaryViewScalar&>(value);
 
     this->buffers[1].size = BinaryViewType::kSize;
     this->buffers[1].data = scalar.scratch_space_;
-    static_assert(sizeof(BinaryViewType::c_type) <= sizeof(scalar.scratch_space_));
-    auto* view = new (&scalar.scratch_space_) BinaryViewType::c_type;
     if (scalar.is_valid) {
-      *view = util::ToBinaryView(std::string_view{*scalar.value}, 0, 0);
       this->buffers[2] = internal::PackVariadicBuffers({&scalar.value, 1});
-    } else {
-      *view = {};
     }
   } else if (type_id == Type::FIXED_SIZE_BINARY) {
     const auto& scalar = checked_cast<const BaseBinaryScalar&>(value);
@@ -443,12 +478,10 @@ void ArraySpan::FillFromScalar(const Scalar& value) {
   } else if (is_var_length_list_like(type_id) || type_id == Type::FIXED_SIZE_LIST) {
     const auto& scalar = checked_cast<const BaseListScalar&>(value);
 
-    int64_t value_length = 0;
     this->child_data.resize(1);
     if (scalar.value != nullptr) {
       // When the scalar is null, scalar.value can also be null
       this->child_data[0].SetMembers(*scalar.value->data());
-      value_length = scalar.value->length();
     } else {
       // Even when the value is null, we still must populate the
       // child_data to yield a valid array. Tedious
@@ -456,17 +489,25 @@ void ArraySpan::FillFromScalar(const Scalar& value) {
                                     &this->child_data[0]);
     }
 
-    if (type_id == Type::LIST || type_id == Type::MAP) {
-      this->buffers[1] =
-          OffsetsForScalar(scalar.scratch_space_, static_cast<int32_t>(value_length));
+    if (type_id == Type::LIST) {
+      const auto& list_scalar = checked_cast<const ListScalar&>(value);
+      this->buffers[1] = OffsetsForScalar(list_scalar.scratch_space_, sizeof(int32_t));
+    } else if (type_id == Type::MAP) {
+      const auto& map_scalar = checked_cast<const MapScalar&>(value);
+      this->buffers[1] = OffsetsForScalar(map_scalar.scratch_space_, sizeof(int32_t));
     } else if (type_id == Type::LARGE_LIST) {
-      this->buffers[1] = OffsetsForScalar(scalar.scratch_space_, value_length);
+      const auto& large_list_scalar = checked_cast<const LargeListScalar&>(value);
+      this->buffers[1] =
+          OffsetsForScalar(large_list_scalar.scratch_space_, sizeof(int64_t));
     } else if (type_id == Type::LIST_VIEW) {
-      std::tie(this->buffers[1], this->buffers[2]) = OffsetsAndSizesForScalar(
-          scalar.scratch_space_, static_cast<int32_t>(value_length));
-    } else if (type_id == Type::LARGE_LIST_VIEW) {
+      const auto& list_view_scalar = checked_cast<const ListViewScalar&>(value);
       std::tie(this->buffers[1], this->buffers[2]) =
-          OffsetsAndSizesForScalar(scalar.scratch_space_, value_length);
+          OffsetsAndSizesForScalar(list_view_scalar.scratch_space_, sizeof(int32_t));
+    } else if (type_id == Type::LARGE_LIST_VIEW) {
+      const auto& large_list_view_scalar =
+          checked_cast<const LargeListViewScalar&>(value);
+      std::tie(this->buffers[1], this->buffers[2]) = OffsetsAndSizesForScalar(
+          large_list_view_scalar.scratch_space_, sizeof(int64_t));
     } else {
       DCHECK_EQ(type_id, Type::FIXED_SIZE_LIST);
       // FIXED_SIZE_LIST: does not have a second buffer
@@ -480,27 +521,19 @@ void ArraySpan::FillFromScalar(const Scalar& value) {
       this->child_data[i].FillFromScalar(*scalar.value[i]);
     }
   } else if (is_union(type_id)) {
-    // Dense union needs scratch space to store both offsets and a type code
-    struct UnionScratchSpace {
-      alignas(int64_t) int8_t type_code;
-      alignas(int64_t) uint8_t offsets[sizeof(int32_t) * 2];
-    };
-    static_assert(sizeof(UnionScratchSpace) <= sizeof(UnionScalar::scratch_space_));
-    auto* union_scratch_space = reinterpret_cast<UnionScratchSpace*>(
-        &checked_cast<const UnionScalar&>(value).scratch_space_);
-
     // First buffer is kept null since unions have no validity vector
     this->buffers[0] = {};
 
-    union_scratch_space->type_code = checked_cast<const UnionScalar&>(value).type_code;
-    this->buffers[1].data = reinterpret_cast<uint8_t*>(&union_scratch_space->type_code);
-    this->buffers[1].size = 1;
-
     this->child_data.resize(this->type->num_fields());
     if (type_id == Type::DENSE_UNION) {
       const auto& scalar = checked_cast<const DenseUnionScalar&>(value);
-      this->buffers[2] =
-          OffsetsForScalar(union_scratch_space->offsets, static_cast<int32_t>(1));
+      auto* union_scratch_space =
+          reinterpret_cast<UnionScalar::UnionScratchSpace*>(&scalar.scratch_space_);
+
+      this->buffers[1].data = reinterpret_cast<uint8_t*>(&union_scratch_space->type_code);
+      this->buffers[1].size = 1;
+
+      this->buffers[2] = OffsetsForScalar(union_scratch_space->offsets, sizeof(int32_t));
       // We can't "see" the other arrays in the union, but we put the "active"
       // union array in the right place and fill zero-length arrays for the
       // others
@@ -517,6 +550,12 @@ void ArraySpan::FillFromScalar(const Scalar& value) {
       }
     } else {
       const auto& scalar = checked_cast<const SparseUnionScalar&>(value);
+      auto* union_scratch_space =
+          reinterpret_cast<UnionScalar::UnionScratchSpace*>(&scalar.scratch_space_);
+
+      this->buffers[1].data = reinterpret_cast<uint8_t*>(&union_scratch_space->type_code);
+      this->buffers[1].size = 1;
+
       // Sparse union scalars have a full complement of child values even
       // though only one of them is relevant, so we just fill them in here
       for (int i = 0; i < static_cast<int>(this->child_data.size()); ++i) {
@@ -541,7 +580,6 @@ void ArraySpan::FillFromScalar(const Scalar& value) {
       e.null_count = 0;
       e.buffers[1].data = scalar.scratch_space_;
       e.buffers[1].size = sizeof(run_end);
-      reinterpret_cast<decltype(run_end)*>(scalar.scratch_space_)[0] = run_end;
     };
 
     switch (scalar.run_end_type()->id()) {
diff --git a/cpp/src/arrow/array/data.h b/cpp/src/arrow/array/data.h
index d8a6663cec580..e0508fe6980a7 100644
--- a/cpp/src/arrow/array/data.h
+++ b/cpp/src/arrow/array/data.h
@@ -46,6 +46,7 @@ ARROW_EXPORT bool IsNullRunEndEncoded(const ArrayData& data, int64_t i);
 ARROW_EXPORT bool UnionMayHaveLogicalNulls(const ArrayData& data);
 ARROW_EXPORT bool RunEndEncodedMayHaveLogicalNulls(const ArrayData& data);
 ARROW_EXPORT bool DictionaryMayHaveLogicalNulls(const ArrayData& data);
+
 }  // namespace internal
 
 // When slicing, we do not know the null count of the sliced range without
@@ -100,6 +101,11 @@ struct ARROW_EXPORT ArrayData {
             int64_t null_count = kUnknownNullCount, int64_t offset = 0)
       : ArrayData(std::move(type), length, null_count, offset) {
     this->buffers = std::move(buffers);
+#ifndef NDEBUG
+    // in debug mode, call the `device_type` function to trigger
+    // the DCHECKs that validate all the buffers are on the same device
+    ARROW_UNUSED(this->device_type());
+#endif
   }
 
   ArrayData(std::shared_ptr<DataType> type, int64_t length,
@@ -109,6 +115,12 @@ struct ARROW_EXPORT ArrayData {
       : ArrayData(std::move(type), length, null_count, offset) {
     this->buffers = std::move(buffers);
     this->child_data = std::move(child_data);
+#ifndef NDEBUG
+    // in debug mode, call the `device_type` function to trigger
+    // the DCHECKs that validate all the buffers (including children)
+    // are on the same device
+    ARROW_UNUSED(this->device_type());
+#endif
   }
 
   static std::shared_ptr<ArrayData> Make(std::shared_ptr<DataType> type, int64_t length,
@@ -357,6 +369,16 @@ struct ARROW_EXPORT ArrayData {
   /// \see GetNullCount
   int64_t ComputeLogicalNullCount() const;
 
+  /// \brief Return the device_type of the underlying buffers and children
+  ///
+  /// If there are no buffers in this ArrayData object, it just returns
+  /// DeviceAllocationType::kCPU as a default. We also assume that all buffers
+  /// should be allocated on the same device type and perform DCHECKs to confirm
+  /// this in debug mode.
+  ///
+  /// \return DeviceAllocationType
+  DeviceAllocationType device_type() const;
+
   std::shared_ptr<DataType> type;
   int64_t length = 0;
   mutable std::atomic<int64_t> null_count{0};
diff --git a/cpp/src/arrow/array/util.cc b/cpp/src/arrow/array/util.cc
index 86e2ffcae4de7..b56ea25f9e421 100644
--- a/cpp/src/arrow/array/util.cc
+++ b/cpp/src/arrow/array/util.cc
@@ -95,7 +95,7 @@ class ArrayDataEndianSwapper {
   Status SwapType(const DataType& type) {
     RETURN_NOT_OK(VisitTypeInline(type, this));
     RETURN_NOT_OK(SwapChildren(type.fields()));
-    if (internal::HasValidityBitmap(type.id())) {
+    if (internal::may_have_validity_bitmap(type.id())) {
       // Copy null bitmap
       out_->buffers[0] = data_->buffers[0];
     }
@@ -125,7 +125,8 @@ class ArrayDataEndianSwapper {
     for (int64_t i = 0; i < length; i++) {
       out_data[i] = bit_util::ByteSwap(in_data[i]);
     }
-    return std::move(out_buffer);
+    // R build with openSUSE155 requires an explicit shared_ptr construction
+    return std::shared_ptr<Buffer>(std::move(out_buffer));
   }
 
   template <typename VALUE_TYPE>
@@ -548,7 +549,7 @@ class NullArrayFactory {
   }
 
   Status Visit(const StructType& type) {
-    for (int i = 0; i < type_->num_fields(); ++i) {
+    for (int i = 0; i < type.num_fields(); ++i) {
       ARROW_ASSIGN_OR_RAISE(out_->child_data[i], CreateChild(type, i, length_));
     }
     return Status::OK();
diff --git a/cpp/src/arrow/array/validate.cc b/cpp/src/arrow/array/validate.cc
index 8dd3eb3f90c15..0d940d3bc869e 100644
--- a/cpp/src/arrow/array/validate.cc
+++ b/cpp/src/arrow/array/validate.cc
@@ -550,7 +550,7 @@ struct ValidateArrayImpl {
     if (full_validation) {
       if (data.null_count != kUnknownNullCount) {
         int64_t actual_null_count;
-        if (HasValidityBitmap(data.type->id()) && data.buffers[0]) {
+        if (may_have_validity_bitmap(data.type->id()) && data.buffers[0]) {
           // Do not call GetNullCount() as it would also set the `null_count` member
           actual_null_count = data.length - CountSetBits(data.buffers[0]->data(),
                                                          data.offset, data.length);
diff --git a/cpp/src/arrow/buffer.cc b/cpp/src/arrow/buffer.cc
index 1bd789b7cafe6..0eb22a9d1553d 100644
--- a/cpp/src/arrow/buffer.cc
+++ b/cpp/src/arrow/buffer.cc
@@ -41,7 +41,8 @@ Result<std::shared_ptr<Buffer>> Buffer::CopySlice(const int64_t start,
 
   ARROW_ASSIGN_OR_RAISE(auto new_buffer, AllocateResizableBuffer(nbytes, pool));
   std::memcpy(new_buffer->mutable_data(), data() + start, static_cast<size_t>(nbytes));
-  return std::move(new_buffer);
+  // R build with openSUSE155 requires an explicit shared_ptr construction
+  return std::shared_ptr<Buffer>(std::move(new_buffer));
 }
 
 Buffer::Buffer() : Buffer(memory_pool::internal::kZeroSizeArea, 0) {}
@@ -185,7 +186,8 @@ Result<std::shared_ptr<Buffer>> AllocateBitmap(int64_t length, MemoryPool* pool)
   if (buf->size() > 0) {
     buf->mutable_data()[buf->size() - 1] = 0;
   }
-  return std::move(buf);
+  // R build with openSUSE155 requires an explicit shared_ptr construction
+  return std::shared_ptr<Buffer>(std::move(buf));
 }
 
 Result<std::shared_ptr<Buffer>> AllocateEmptyBitmap(int64_t length, MemoryPool* pool) {
@@ -197,7 +199,8 @@ Result<std::shared_ptr<Buffer>> AllocateEmptyBitmap(int64_t length, int64_t alig
   ARROW_ASSIGN_OR_RAISE(auto buf,
                         AllocateBuffer(bit_util::BytesForBits(length), alignment, pool));
   memset(buf->mutable_data(), 0, static_cast<size_t>(buf->size()));
-  return std::move(buf);
+  // R build with openSUSE155 requires an explicit shared_ptr construction
+  return std::shared_ptr<Buffer>(std::move(buf));
 }
 
 Status AllocateEmptyBitmap(int64_t length, std::shared_ptr<Buffer>* out) {
@@ -219,7 +222,8 @@ Result<std::shared_ptr<Buffer>> ConcatenateBuffers(
       out_data += buffer->size();
     }
   }
-  return std::move(out);
+  // R build with openSUSE155 requires an explicit shared_ptr construction
+  return std::shared_ptr<Buffer>(std::move(out));
 }
 
 }  // namespace arrow
diff --git a/cpp/src/arrow/c/bridge.cc b/cpp/src/arrow/c/bridge.cc
index d004de7a2ea9f..eba575f4cf39c 100644
--- a/cpp/src/arrow/c/bridge.cc
+++ b/cpp/src/arrow/c/bridge.cc
@@ -528,7 +528,7 @@ namespace {
 struct ExportedArrayPrivateData : PoolAllocationMixin<ExportedArrayPrivateData> {
   // The buffers are owned by the ArrayData member
   SmallVector<const void*, 3> buffers_;
-  struct ArrowArray dictionary_;
+  struct ArrowArray dictionary_ {};
   SmallVector<struct ArrowArray, 1> children_;
   SmallVector<struct ArrowArray*, 4> child_pointers_;
 
@@ -576,7 +576,7 @@ struct ArrayExporter {
     // Store buffer pointers
     size_t n_buffers = data->buffers.size();
     auto buffers_begin = data->buffers.begin();
-    if (n_buffers > 0 && !internal::HasValidityBitmap(data->type->id())) {
+    if (n_buffers > 0 && !internal::may_have_validity_bitmap(data->type->id())) {
       --n_buffers;
       ++buffers_begin;
     }
@@ -1059,8 +1059,14 @@ struct SchemaImporter {
         ARROW_ASSIGN_OR_RAISE(
             type_, registered_ext_type->Deserialize(std::move(type_),
                                                     metadata_.extension_serialized));
-        RETURN_NOT_OK(metadata_.metadata->DeleteMany(
-            {metadata_.extension_name_index, metadata_.extension_serialized_index}));
+        // If metadata is present, delete both metadata keys (otherwise, just remove
+        // the extension name key)
+        if (metadata_.extension_serialized_index >= 0) {
+          RETURN_NOT_OK(metadata_.metadata->DeleteMany(
+              {metadata_.extension_name_index, metadata_.extension_serialized_index}));
+        } else {
+          RETURN_NOT_OK(metadata_.metadata->Delete(metadata_.extension_name_index));
+        }
       }
     }
 
@@ -1448,6 +1454,7 @@ namespace {
 // The ArrowArray is released on destruction.
 struct ImportedArrayData {
   struct ArrowArray array_;
+  DeviceAllocationType device_type_;
   std::shared_ptr<Device::SyncEvent> device_sync_;
 
   ImportedArrayData() {
@@ -1514,6 +1521,7 @@ struct ArrayImporter {
     recursion_level_ = 0;
     import_ = std::make_shared<ImportedArrayData>();
     c_struct_ = &import_->array_;
+    import_->device_type_ = device_type_;
     ArrowArrayMove(src, c_struct_);
     return DoImport();
   }
@@ -1541,7 +1549,8 @@ struct ArrayImporter {
           "cannot be imported as RecordBatch");
     }
     return RecordBatch::Make(std::move(schema), data_->length,
-                             std::move(data_->child_data));
+                             std::move(data_->child_data), import_->device_type_,
+                             import_->device_sync_);
   }
 
   Status ImportChild(const ArrayImporter* parent, struct ArrowArray* src) {
@@ -1868,24 +1877,17 @@ struct ArrayImporter {
   template <typename OffsetType>
   Status ImportStringValuesBuffer(int32_t offsets_buffer_id, int32_t buffer_id,
                                   int64_t byte_width = 1) {
-    if (device_type_ == DeviceAllocationType::kCPU) {
-      auto offsets = data_->GetValues<OffsetType>(offsets_buffer_id);
+    int64_t buffer_size = 0;
+    if (c_struct_->length > 0) {
+      int64_t last_offset_value_offset =
+          (c_struct_->length + c_struct_->offset) * sizeof(OffsetType);
+      OffsetType last_offset_value;
+      RETURN_NOT_OK(MemoryManager::CopyBufferSliceToCPU(
+          data_->buffers[offsets_buffer_id], last_offset_value_offset, sizeof(OffsetType),
+          reinterpret_cast<uint8_t*>(&last_offset_value)));
       // Compute visible size of buffer
-      int64_t buffer_size =
-          (c_struct_->length > 0) ? byte_width * offsets[c_struct_->length] : 0;
-      return ImportBuffer(buffer_id, buffer_size);
-    }
-
-    // we only need the value of the last offset so let's just copy that
-    // one value from device to host.
-    auto single_value_buf =
-        SliceBuffer(data_->buffers[offsets_buffer_id],
-                    c_struct_->length * sizeof(OffsetType), sizeof(OffsetType));
-    ARROW_ASSIGN_OR_RAISE(
-        auto cpubuf, Buffer::ViewOrCopy(single_value_buf, default_cpu_memory_manager()));
-    auto offsets = cpubuf->data_as<OffsetType>();
-    // Compute visible size of buffer
-    int64_t buffer_size = (c_struct_->length > 0) ? byte_width * offsets[0] : 0;
+      buffer_size = byte_width * last_offset_value;
+    }
 
     return ImportBuffer(buffer_id, buffer_size);
   }
@@ -2041,6 +2043,23 @@ Status ExportStreamNext(const std::shared_ptr<RecordBatchReader>& src, int64_t i
   }
 }
 
+// the int64_t i input here is unused, but exists simply to allow utilizing the
+// overload of this with the version for ChunkedArrays. If we removed the int64_t
+// from the signature despite it being unused, we wouldn't be able to leverage the
+// overloading in the templated exporters.
+Status ExportStreamNext(const std::shared_ptr<RecordBatchReader>& src, int64_t i,
+                        struct ArrowDeviceArray* out_array) {
+  std::shared_ptr<RecordBatch> batch;
+  RETURN_NOT_OK(src->ReadNext(&batch));
+  if (batch == nullptr) {
+    // End of stream
+    ArrowArrayMarkReleased(&out_array->array);
+    return Status::OK();
+  } else {
+    return ExportDeviceRecordBatch(*batch, batch->GetSyncEvent(), out_array);
+  }
+}
+
 Status ExportStreamNext(const std::shared_ptr<ChunkedArray>& src, int64_t i,
                         struct ArrowArray* out_array) {
   if (i >= src->num_chunks()) {
@@ -2052,8 +2071,27 @@ Status ExportStreamNext(const std::shared_ptr<ChunkedArray>& src, int64_t i,
   }
 }
 
-template <typename T>
+Status ExportStreamNext(const std::shared_ptr<ChunkedArray>& src, int64_t i,
+                        struct ArrowDeviceArray* out_array) {
+  if (i >= src->num_chunks()) {
+    // End of stream
+    ArrowArrayMarkReleased(&out_array->array);
+    return Status::OK();
+  } else {
+    return ExportDeviceArray(*src->chunk(static_cast<int>(i)), nullptr, out_array);
+  }
+}
+
+template <typename T, bool IsDevice>
 class ExportedArrayStream {
+  using StreamTraits =
+      std::conditional_t<IsDevice, internal::ArrayDeviceStreamExportTraits,
+                         internal::ArrayStreamExportTraits>;
+  using StreamType = typename StreamTraits::CType;
+  using ArrayTraits = std::conditional_t<IsDevice, internal::ArrayDeviceExportTraits,
+                                         internal::ArrayExportTraits>;
+  using ArrayType = typename ArrayTraits::CType;
+
  public:
   struct PrivateData {
     explicit PrivateData(std::shared_ptr<T> reader)
@@ -2067,13 +2105,13 @@ class ExportedArrayStream {
     ARROW_DISALLOW_COPY_AND_ASSIGN(PrivateData);
   };
 
-  explicit ExportedArrayStream(struct ArrowArrayStream* stream) : stream_(stream) {}
+  explicit ExportedArrayStream(StreamType* stream) : stream_(stream) {}
 
   Status GetSchema(struct ArrowSchema* out_schema) {
     return ExportStreamSchema(reader(), out_schema);
   }
 
-  Status GetNext(struct ArrowArray* out_array) {
+  Status GetNext(ArrayType* out_array) {
     return ExportStreamNext(reader(), next_batch_num(), out_array);
   }
 
@@ -2083,38 +2121,35 @@ class ExportedArrayStream {
   }
 
   void Release() {
-    if (ArrowArrayStreamIsReleased(stream_)) {
+    if (StreamTraits::IsReleasedFunc(stream_)) {
       return;
     }
+
     DCHECK_NE(private_data(), nullptr);
     delete private_data();
 
-    ArrowArrayStreamMarkReleased(stream_);
+    StreamTraits::MarkReleased(stream_);
   }
 
   // C-compatible callbacks
 
-  static int StaticGetSchema(struct ArrowArrayStream* stream,
-                             struct ArrowSchema* out_schema) {
+  static int StaticGetSchema(StreamType* stream, struct ArrowSchema* out_schema) {
     ExportedArrayStream self{stream};
     return self.ToCError(self.GetSchema(out_schema));
   }
 
-  static int StaticGetNext(struct ArrowArrayStream* stream,
-                           struct ArrowArray* out_array) {
+  static int StaticGetNext(StreamType* stream, ArrayType* out_array) {
     ExportedArrayStream self{stream};
     return self.ToCError(self.GetNext(out_array));
   }
 
-  static void StaticRelease(struct ArrowArrayStream* stream) {
-    ExportedArrayStream{stream}.Release();
-  }
+  static void StaticRelease(StreamType* stream) { ExportedArrayStream{stream}.Release(); }
 
-  static const char* StaticGetLastError(struct ArrowArrayStream* stream) {
+  static const char* StaticGetLastError(StreamType* stream) {
     return ExportedArrayStream{stream}.GetLastError();
   }
 
-  static Status Make(std::shared_ptr<T> reader, struct ArrowArrayStream* out) {
+  static Status Make(std::shared_ptr<T> reader, StreamType* out) {
     out->get_schema = ExportedArrayStream::StaticGetSchema;
     out->get_next = ExportedArrayStream::StaticGetNext;
     out->get_last_error = ExportedArrayStream::StaticGetLastError;
@@ -2150,19 +2185,36 @@ class ExportedArrayStream {
 
   int64_t next_batch_num() { return private_data()->batch_num_++; }
 
-  struct ArrowArrayStream* stream_;
+  StreamType* stream_;
 };
 
 }  // namespace
 
 Status ExportRecordBatchReader(std::shared_ptr<RecordBatchReader> reader,
                                struct ArrowArrayStream* out) {
-  return ExportedArrayStream<RecordBatchReader>::Make(std::move(reader), out);
+  memset(out, 0, sizeof(struct ArrowArrayStream));
+  return ExportedArrayStream<RecordBatchReader, false>::Make(std::move(reader), out);
 }
 
 Status ExportChunkedArray(std::shared_ptr<ChunkedArray> chunked_array,
                           struct ArrowArrayStream* out) {
-  return ExportedArrayStream<ChunkedArray>::Make(std::move(chunked_array), out);
+  memset(out, 0, sizeof(struct ArrowArrayStream));
+  return ExportedArrayStream<ChunkedArray, false>::Make(std::move(chunked_array), out);
+}
+
+Status ExportDeviceRecordBatchReader(std::shared_ptr<RecordBatchReader> reader,
+                                     struct ArrowDeviceArrayStream* out) {
+  memset(out, 0, sizeof(struct ArrowDeviceArrayStream));
+  out->device_type = static_cast<ArrowDeviceType>(reader->device_type());
+  return ExportedArrayStream<RecordBatchReader, true>::Make(std::move(reader), out);
+}
+
+Status ExportDeviceChunkedArray(std::shared_ptr<ChunkedArray> chunked_array,
+                                DeviceAllocationType device_type,
+                                struct ArrowDeviceArrayStream* out) {
+  memset(out, 0, sizeof(struct ArrowDeviceArrayStream));
+  out->device_type = static_cast<ArrowDeviceType>(device_type);
+  return ExportedArrayStream<ChunkedArray, true>::Make(std::move(chunked_array), out);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -2170,33 +2222,65 @@ Status ExportChunkedArray(std::shared_ptr<ChunkedArray> chunked_array,
 
 namespace {
 
+template <bool IsDevice>
 class ArrayStreamReader {
+ protected:
+  using StreamTraits =
+      std::conditional_t<IsDevice, internal::ArrayDeviceStreamExportTraits,
+                         internal::ArrayStreamExportTraits>;
+  using StreamType = typename StreamTraits::CType;
+  using ArrayTraits = std::conditional_t<IsDevice, internal::ArrayDeviceExportTraits,
+                                         internal::ArrayExportTraits>;
+  using ArrayType = typename ArrayTraits::CType;
+
  public:
-  explicit ArrayStreamReader(struct ArrowArrayStream* stream) {
-    ArrowArrayStreamMove(stream, &stream_);
-    DCHECK(!ArrowArrayStreamIsReleased(&stream_));
+  explicit ArrayStreamReader(StreamType* stream,
+                             const DeviceMemoryMapper mapper = DefaultDeviceMemoryMapper)
+      : mapper_{std::move(mapper)} {
+    StreamTraits::MoveFunc(stream, &stream_);
+    DCHECK(!StreamTraits::IsReleasedFunc(&stream_));
   }
 
   ~ArrayStreamReader() { ReleaseStream(); }
 
   void ReleaseStream() {
-    if (!ArrowArrayStreamIsReleased(&stream_)) {
-      ArrowArrayStreamRelease(&stream_);
-    }
-    DCHECK(ArrowArrayStreamIsReleased(&stream_));
+    // all our trait release funcs check IsReleased so we don't
+    // need to repeat it here
+    StreamTraits::ReleaseFunc(&stream_);
+    DCHECK(StreamTraits::IsReleasedFunc(&stream_));
   }
 
  protected:
-  Status ReadNextArrayInternal(struct ArrowArray* array) {
-    ArrowArrayMarkReleased(array);
+  Status ReadNextArrayInternal(ArrayType* array) {
+    ArrayTraits::MarkReleased(array);
     Status status = StatusFromCError(stream_.get_next(&stream_, array));
-    if (!status.ok() && !ArrowArrayIsReleased(array)) {
-      ArrowArrayRelease(array);
+    if (!status.ok()) {
+      ArrayTraits::ReleaseFunc(array);
     }
 
     return status;
   }
 
+  Result<std::shared_ptr<RecordBatch>> ImportRecordBatchInternal(
+      struct ArrowArray* array, std::shared_ptr<Schema> schema) {
+    return ImportRecordBatch(array, schema);
+  }
+
+  Result<std::shared_ptr<RecordBatch>> ImportRecordBatchInternal(
+      struct ArrowDeviceArray* array, std::shared_ptr<Schema> schema) {
+    return ImportDeviceRecordBatch(array, schema, mapper_);
+  }
+
+  Result<std::shared_ptr<Array>> ImportArrayInternal(
+      struct ArrowArray* array, std::shared_ptr<arrow::DataType> type) {
+    return ImportArray(array, type);
+  }
+
+  Result<std::shared_ptr<Array>> ImportArrayInternal(
+      struct ArrowDeviceArray* array, std::shared_ptr<arrow::DataType> type) {
+    return ImportDeviceArray(array, type, mapper_);
+  }
+
   Result<std::shared_ptr<Schema>> ReadSchema() {
     struct ArrowSchema c_schema = {};
     ARROW_RETURN_NOT_OK(
@@ -2214,19 +2298,19 @@ class ArrayStreamReader {
   }
 
   Status CheckNotReleased() {
-    if (ArrowArrayStreamIsReleased(&stream_)) {
+    if (StreamTraits::IsReleasedFunc(&stream_)) {
       return Status::Invalid(
           "Attempt to read from a stream that has already been closed");
-    } else {
-      return Status::OK();
     }
+
+    return Status::OK();
   }
 
   Status StatusFromCError(int errno_like) const {
     return StatusFromCError(&stream_, errno_like);
   }
 
-  static Status StatusFromCError(struct ArrowArrayStream* stream, int errno_like) {
+  static Status StatusFromCError(StreamType* stream, int errno_like) {
     if (ARROW_PREDICT_TRUE(errno_like == 0)) {
       return Status::OK();
     }
@@ -2250,70 +2334,102 @@ class ArrayStreamReader {
     return {code, last_error ? std::string(last_error) : ""};
   }
 
+  DeviceAllocationType get_device_type() const {
+    if constexpr (IsDevice) {
+      return static_cast<DeviceAllocationType>(stream_.device_type);
+    } else {
+      return DeviceAllocationType::kCPU;
+    }
+  }
+
  private:
-  mutable struct ArrowArrayStream stream_;
+  mutable StreamType stream_;
+  const DeviceMemoryMapper mapper_;
 };
 
-class ArrayStreamBatchReader : public RecordBatchReader, public ArrayStreamReader {
+template <bool IsDevice>
+class ArrayStreamBatchReader : public RecordBatchReader,
+                               public ArrayStreamReader<IsDevice> {
+  using StreamTraits =
+      std::conditional_t<IsDevice, internal::ArrayDeviceStreamExportTraits,
+                         internal::ArrayStreamExportTraits>;
+  using StreamType = typename StreamTraits::CType;
+  using ArrayTraits = std::conditional_t<IsDevice, internal::ArrayDeviceExportTraits,
+                                         internal::ArrayExportTraits>;
+  using ArrayType = typename ArrayTraits::CType;
+
  public:
-  explicit ArrayStreamBatchReader(struct ArrowArrayStream* stream)
-      : ArrayStreamReader(stream) {}
+  explicit ArrayStreamBatchReader(
+      StreamType* stream, const DeviceMemoryMapper& mapper = DefaultDeviceMemoryMapper)
+      : ArrayStreamReader<IsDevice>(stream, mapper) {}
 
   Status Init() {
-    ARROW_ASSIGN_OR_RAISE(schema_, ReadSchema());
+    ARROW_ASSIGN_OR_RAISE(schema_, this->ReadSchema());
     return Status::OK();
   }
 
   std::shared_ptr<Schema> schema() const override { return schema_; }
 
   Status ReadNext(std::shared_ptr<RecordBatch>* batch) override {
-    ARROW_RETURN_NOT_OK(CheckNotReleased());
+    ARROW_RETURN_NOT_OK(this->CheckNotReleased());
 
-    struct ArrowArray c_array;
-    ARROW_RETURN_NOT_OK(ReadNextArrayInternal(&c_array));
+    ArrayType c_array;
+    ARROW_RETURN_NOT_OK(this->ReadNextArrayInternal(&c_array));
 
-    if (ArrowArrayIsReleased(&c_array)) {
+    if (ArrayTraits::IsReleasedFunc(&c_array)) {
       // End of stream
       batch->reset();
       return Status::OK();
     } else {
-      return ImportRecordBatch(&c_array, schema_).Value(batch);
+      return this->ImportRecordBatchInternal(&c_array, schema_).Value(batch);
     }
   }
 
   Status Close() override {
-    ReleaseStream();
+    this->ReleaseStream();
     return Status::OK();
   }
 
+  DeviceAllocationType device_type() const override { return this->get_device_type(); }
+
  private:
   std::shared_ptr<Schema> schema_;
 };
 
-class ArrayStreamArrayReader : public ArrayStreamReader {
+template <bool IsDevice>
+class ArrayStreamArrayReader : public ArrayStreamReader<IsDevice> {
+  using StreamTraits =
+      std::conditional_t<IsDevice, internal::ArrayDeviceStreamExportTraits,
+                         internal::ArrayStreamExportTraits>;
+  using StreamType = typename StreamTraits::CType;
+  using ArrayTraits = std::conditional_t<IsDevice, internal::ArrayDeviceExportTraits,
+                                         internal::ArrayExportTraits>;
+  using ArrayType = typename ArrayTraits::CType;
+
  public:
-  explicit ArrayStreamArrayReader(struct ArrowArrayStream* stream)
-      : ArrayStreamReader(stream) {}
+  explicit ArrayStreamArrayReader(
+      StreamType* stream, const DeviceMemoryMapper& mapper = DefaultDeviceMemoryMapper)
+      : ArrayStreamReader<IsDevice>(stream, mapper) {}
 
   Status Init() {
-    ARROW_ASSIGN_OR_RAISE(field_, ReadField());
+    ARROW_ASSIGN_OR_RAISE(field_, this->ReadField());
     return Status::OK();
   }
 
   std::shared_ptr<DataType> data_type() const { return field_->type(); }
 
   Status ReadNext(std::shared_ptr<Array>* array) {
-    ARROW_RETURN_NOT_OK(CheckNotReleased());
+    ARROW_RETURN_NOT_OK(this->CheckNotReleased());
 
-    struct ArrowArray c_array;
-    ARROW_RETURN_NOT_OK(ReadNextArrayInternal(&c_array));
+    ArrayType c_array;
+    ARROW_RETURN_NOT_OK(this->ReadNextArrayInternal(&c_array));
 
-    if (ArrowArrayIsReleased(&c_array)) {
+    if (ArrayTraits::IsReleasedFunc(&c_array)) {
       // End of stream
       array->reset();
       return Status::OK();
     } else {
-      return ImportArray(&c_array, field_->type()).Value(array);
+      return this->ImportArrayInternal(&c_array, field_->type()).Value(array);
     }
   }
 
@@ -2321,30 +2437,35 @@ class ArrayStreamArrayReader : public ArrayStreamReader {
   std::shared_ptr<Field> field_;
 };
 
-}  // namespace
-
-Result<std::shared_ptr<RecordBatchReader>> ImportRecordBatchReader(
-    struct ArrowArrayStream* stream) {
-  if (ArrowArrayStreamIsReleased(stream)) {
-    return Status::Invalid("Cannot import released ArrowArrayStream");
+template <bool IsDevice, typename StreamTraits = std::conditional_t<
+                             IsDevice, internal::ArrayDeviceStreamExportTraits,
+                             internal::ArrayStreamExportTraits>>
+Result<std::shared_ptr<RecordBatchReader>> ImportReader(
+    typename StreamTraits::CType* stream,
+    const DeviceMemoryMapper& mapper = DefaultDeviceMemoryMapper) {
+  if (StreamTraits::IsReleasedFunc(stream)) {
+    return Status::Invalid("Cannot import released Arrow Stream");
   }
 
-  auto reader = std::make_shared<ArrayStreamBatchReader>(stream);
+  auto reader = std::make_shared<ArrayStreamBatchReader<IsDevice>>(stream, mapper);
   ARROW_RETURN_NOT_OK(reader->Init());
   return reader;
 }
 
-Result<std::shared_ptr<ChunkedArray>> ImportChunkedArray(
-    struct ArrowArrayStream* stream) {
-  if (ArrowArrayStreamIsReleased(stream)) {
-    return Status::Invalid("Cannot import released ArrowArrayStream");
+template <bool IsDevice, typename StreamTraits = std::conditional_t<
+                             IsDevice, internal::ArrayDeviceStreamExportTraits,
+                             internal::ArrayStreamExportTraits>>
+Result<std::shared_ptr<ChunkedArray>> ImportChunked(
+    typename StreamTraits::CType* stream,
+    const DeviceMemoryMapper& mapper = DefaultDeviceMemoryMapper) {
+  if (StreamTraits::IsReleasedFunc(stream)) {
+    return Status::Invalid("Cannot import released Arrow Stream");
   }
 
-  auto reader = std::make_shared<ArrayStreamArrayReader>(stream);
+  auto reader = std::make_shared<ArrayStreamArrayReader<IsDevice>>(stream, mapper);
   ARROW_RETURN_NOT_OK(reader->Init());
 
-  std::shared_ptr<DataType> data_type = reader->data_type();
-
+  auto data_type = reader->data_type();
   ArrayVector chunks;
   std::shared_ptr<Array> chunk;
   while (true) {
@@ -2360,4 +2481,26 @@ Result<std::shared_ptr<ChunkedArray>> ImportChunkedArray(
   return ChunkedArray::Make(std::move(chunks), std::move(data_type));
 }
 
+}  // namespace
+
+Result<std::shared_ptr<RecordBatchReader>> ImportRecordBatchReader(
+    struct ArrowArrayStream* stream) {
+  return ImportReader</*IsDevice=*/false>(stream);
+}
+
+Result<std::shared_ptr<RecordBatchReader>> ImportDeviceRecordBatchReader(
+    struct ArrowDeviceArrayStream* stream, const DeviceMemoryMapper& mapper) {
+  return ImportReader</*IsDevice=*/true>(stream, mapper);
+}
+
+Result<std::shared_ptr<ChunkedArray>> ImportChunkedArray(
+    struct ArrowArrayStream* stream) {
+  return ImportChunked</*IsDevice=*/false>(stream);
+}
+
+Result<std::shared_ptr<ChunkedArray>> ImportDeviceChunkedArray(
+    struct ArrowDeviceArrayStream* stream, const DeviceMemoryMapper& mapper) {
+  return ImportChunked</*IsDevice=*/true>(stream, mapper);
+}
+
 }  // namespace arrow
diff --git a/cpp/src/arrow/c/bridge.h b/cpp/src/arrow/c/bridge.h
index 74a302be4c27d..45367e4f93062 100644
--- a/cpp/src/arrow/c/bridge.h
+++ b/cpp/src/arrow/c/bridge.h
@@ -321,6 +321,31 @@ ARROW_EXPORT
 Status ExportChunkedArray(std::shared_ptr<ChunkedArray> chunked_array,
                           struct ArrowArrayStream* out);
 
+/// \brief Export C++ RecordBatchReader using the C device stream interface
+///
+/// The resulting ArrowDeviceArrayStream struct keeps the record batch reader
+/// alive until its release callback is called by the consumer. The device
+/// type is determined by calling device_type() on the RecordBatchReader.
+///
+/// \param[in] reader RecordBatchReader object to export
+/// \param[out] out C struct to export the stream to
+ARROW_EXPORT
+Status ExportDeviceRecordBatchReader(std::shared_ptr<RecordBatchReader> reader,
+                                     struct ArrowDeviceArrayStream* out);
+
+/// \brief Export C++ ChunkedArray using the C device data interface format.
+///
+/// The resulting ArrowDeviceArrayStream keeps the chunked array data and buffers
+/// alive until its release callback is called by the consumer.
+///
+/// \param[in] chunked_array ChunkedArray object to export
+/// \param[in] device_type the device type the data is located on
+/// \param[out] out C struct to export the stream to
+ARROW_EXPORT
+Status ExportDeviceChunkedArray(std::shared_ptr<ChunkedArray> chunked_array,
+                                DeviceAllocationType device_type,
+                                struct ArrowDeviceArrayStream* out);
+
 /// \brief Import C++ RecordBatchReader from the C stream interface.
 ///
 /// The ArrowArrayStream struct has its contents moved to a private object
@@ -343,6 +368,42 @@ Result<std::shared_ptr<RecordBatchReader>> ImportRecordBatchReader(
 ARROW_EXPORT
 Result<std::shared_ptr<ChunkedArray>> ImportChunkedArray(struct ArrowArrayStream* stream);
 
+/// \brief Import C++ RecordBatchReader from the C device stream interface
+///
+/// The ArrowDeviceArrayStream struct has its contents moved to a private object
+/// held alive by the resulting record batch reader.
+///
+/// \note If there was a required sync event, sync events are accessible by individual
+/// buffers of columns. We are not yet bubbling the sync events from the buffers up to
+/// the `GetSyncEvent` method of an imported RecordBatch. This will be added in a future
+/// update.
+///
+/// \param[in,out] stream C device stream interface struct
+/// \param[in] mapper mapping from device type and ID to memory manager
+/// \return Imported RecordBatchReader object
+ARROW_EXPORT
+Result<std::shared_ptr<RecordBatchReader>> ImportDeviceRecordBatchReader(
+    struct ArrowDeviceArrayStream* stream,
+    const DeviceMemoryMapper& mapper = DefaultDeviceMemoryMapper);
+
+/// \brief Import C++ ChunkedArray from the C device stream interface
+///
+/// The ArrowDeviceArrayStream struct has its contents moved to a private object,
+/// is consumed in its entirety, and released before returning all chunks as a
+/// ChunkedArray.
+///
+/// \note Any chunks that require synchronization for their device memory will have
+/// the SyncEvent objects available by checking the individual buffers of each chunk.
+/// These SyncEvents should be checked before accessing the data in those buffers.
+///
+/// \param[in,out] stream C device stream interface struct
+/// \param[in] mapper mapping from device type and ID to memory manager
+/// \return Imported ChunkedArray object
+ARROW_EXPORT
+Result<std::shared_ptr<ChunkedArray>> ImportDeviceChunkedArray(
+    struct ArrowDeviceArrayStream* stream,
+    const DeviceMemoryMapper& mapper = DefaultDeviceMemoryMapper);
+
 /// @}
 
 }  // namespace arrow
diff --git a/cpp/src/arrow/c/bridge_test.cc b/cpp/src/arrow/c/bridge_test.cc
index dba6e4736b673..09bb524adbdf0 100644
--- a/cpp/src/arrow/c/bridge_test.cc
+++ b/cpp/src/arrow/c/bridge_test.cc
@@ -53,11 +53,15 @@
 
 namespace arrow {
 
+using internal::ArrayDeviceExportTraits;
+using internal::ArrayDeviceStreamExportTraits;
 using internal::ArrayExportGuard;
 using internal::ArrayExportTraits;
 using internal::ArrayStreamExportGuard;
 using internal::ArrayStreamExportTraits;
 using internal::checked_cast;
+using internal::DeviceArrayExportGuard;
+using internal::DeviceArrayStreamExportGuard;
 using internal::SchemaExportGuard;
 using internal::SchemaExportTraits;
 using internal::Zip;
@@ -565,7 +569,7 @@ struct ArrayExportChecker {
 
     auto expected_n_buffers = static_cast<int64_t>(expected_data.buffers.size());
     auto expected_buffers = expected_data.buffers.data();
-    if (!internal::HasValidityBitmap(expected_data.type->id())) {
+    if (!internal::may_have_validity_bitmap(expected_data.type->id())) {
       --expected_n_buffers;
       ++expected_buffers;
     }
@@ -1358,7 +1362,7 @@ class MyMemoryManager : public CPUMemoryManager {
     if (buf.size() > 0) {
       memcpy(dest->mutable_data(), buf.data(), static_cast<size_t>(buf.size()));
     }
-    return std::move(dest);
+    return dest;
   }
 };
 
@@ -4098,6 +4102,23 @@ TEST_F(TestArrayRoundtrip, RegisteredExtension) {
   TestWithArrayFactory(NestedFactory(ExampleDictExtension));
 }
 
+TEST_F(TestArrayRoundtrip, RegisteredExtensionNoMetadata) {
+  auto ext_type = std::make_shared<MetadataOptionalExtensionType>();
+  ExtensionTypeGuard guard(ext_type);
+
+  auto ext_metadata =
+      KeyValueMetadata::Make({"ARROW:extension:name"}, {ext_type->extension_name()});
+  auto ext_field = field("", ext_type->storage_type(), true, std::move(ext_metadata));
+
+  struct ArrowSchema c_schema {};
+  SchemaExportGuard schema_guard(&c_schema);
+  ASSERT_OK(ExportField(*ext_field, &c_schema));
+
+  ASSERT_OK_AND_ASSIGN(auto ext_type_roundtrip, ImportType(&c_schema));
+  ASSERT_EQ(ext_type_roundtrip->id(), Type::EXTENSION);
+  AssertTypeEqual(ext_type_roundtrip, ext_type);
+}
+
 TEST_F(TestArrayRoundtrip, UnregisteredExtension) {
   auto StorageExtractor = [](ArrayFactory factory) {
     return [factory]() -> Result<std::shared_ptr<Array>> {
@@ -4746,4 +4767,516 @@ TEST_F(TestArrayStreamRoundtrip, ChunkedArrayRoundtripEmpty) {
   });
 }
 
+////////////////////////////////////////////////////////////////////////////
+// Array device stream export tests
+
+class TestArrayDeviceStreamExport : public BaseArrayStreamTest {
+ public:
+  void AssertStreamSchema(struct ArrowDeviceArrayStream* c_stream,
+                          const Schema& expected) {
+    struct ArrowSchema c_schema;
+    ASSERT_EQ(0, c_stream->get_schema(c_stream, &c_schema));
+
+    SchemaExportGuard schema_guard(&c_schema);
+    ASSERT_FALSE(ArrowSchemaIsReleased(&c_schema));
+    ASSERT_OK_AND_ASSIGN(auto schema, ImportSchema(&c_schema));
+    AssertSchemaEqual(expected, *schema, /*check_metadata=*/true);
+  }
+
+  void AssertStreamEnd(struct ArrowDeviceArrayStream* c_stream) {
+    struct ArrowDeviceArray c_array;
+    ASSERT_EQ(0, c_stream->get_next(c_stream, &c_array));
+
+    DeviceArrayExportGuard guard(&c_array);
+    ASSERT_TRUE(ArrowDeviceArrayIsReleased(&c_array));
+  }
+
+  void AssertStreamNext(struct ArrowDeviceArrayStream* c_stream,
+                        const RecordBatch& expected) {
+    struct ArrowDeviceArray c_array;
+    ASSERT_EQ(0, c_stream->get_next(c_stream, &c_array));
+
+    DeviceArrayExportGuard guard(&c_array);
+    ASSERT_FALSE(ArrowDeviceArrayIsReleased(&c_array));
+
+    ASSERT_OK_AND_ASSIGN(auto batch,
+                         ImportDeviceRecordBatch(&c_array, expected.schema(),
+                                                 TestDeviceArrayRoundtrip::DeviceMapper));
+    AssertBatchesEqual(expected, *batch);
+  }
+
+  void AssertStreamNext(struct ArrowDeviceArrayStream* c_stream, const Array& expected) {
+    struct ArrowDeviceArray c_array;
+    ASSERT_EQ(0, c_stream->get_next(c_stream, &c_array));
+
+    DeviceArrayExportGuard guard(&c_array);
+    ASSERT_FALSE(ArrowDeviceArrayIsReleased(&c_array));
+
+    ASSERT_OK_AND_ASSIGN(auto array,
+                         ImportDeviceArray(&c_array, expected.type(),
+                                           TestDeviceArrayRoundtrip::DeviceMapper));
+    AssertArraysEqual(expected, *array);
+  }
+
+  static Result<std::shared_ptr<ArrayData>> ToDeviceData(
+      const std::shared_ptr<MemoryManager>& mm, const ArrayData& data) {
+    arrow::BufferVector buffers;
+    for (const auto& buf : data.buffers) {
+      if (buf) {
+        ARROW_ASSIGN_OR_RAISE(auto dest, mm->CopyBuffer(buf, mm));
+        buffers.push_back(dest);
+      } else {
+        buffers.push_back(nullptr);
+      }
+    }
+
+    arrow::ArrayDataVector children;
+    for (const auto& child : data.child_data) {
+      ARROW_ASSIGN_OR_RAISE(auto dest, ToDeviceData(mm, *child));
+      children.push_back(dest);
+    }
+
+    return ArrayData::Make(data.type, data.length, buffers, children, data.null_count,
+                           data.offset);
+  }
+
+  static Result<std::shared_ptr<Array>> ToDevice(const std::shared_ptr<MemoryManager>& mm,
+                                                 const ArrayData& data) {
+    ARROW_ASSIGN_OR_RAISE(auto result, ToDeviceData(mm, data));
+    return MakeArray(result);
+  }
+};
+
+TEST_F(TestArrayDeviceStreamExport, Empty) {
+  auto schema = arrow::schema({field("ints", int32())});
+  auto batches = MakeBatches(schema, {});
+  ASSERT_OK_AND_ASSIGN(
+      auto reader,
+      RecordBatchReader::Make(batches, schema,
+                              static_cast<DeviceAllocationType>(kMyDeviceType)));
+
+  struct ArrowDeviceArrayStream c_stream;
+  ASSERT_OK(ExportDeviceRecordBatchReader(reader, &c_stream));
+  DeviceArrayStreamExportGuard guard(&c_stream);
+
+  ASSERT_FALSE(ArrowDeviceArrayStreamIsReleased(&c_stream));
+  ASSERT_EQ(kMyDeviceType, c_stream.device_type);
+  AssertStreamSchema(&c_stream, *schema);
+  AssertStreamEnd(&c_stream);
+  AssertStreamEnd(&c_stream);
+}
+
+TEST_F(TestArrayDeviceStreamExport, Simple) {
+  std::shared_ptr<Device> device = std::make_shared<MyDevice>(1);
+  auto mm = device->default_memory_manager();
+
+  ASSERT_OK_AND_ASSIGN(auto arr1,
+                       ToDevice(mm, *ArrayFromJSON(int32(), "[1, 2]")->data()));
+  ASSERT_EQ(device->device_type(), arr1->device_type());
+  ASSERT_OK_AND_ASSIGN(auto arr2,
+                       ToDevice(mm, *ArrayFromJSON(int32(), "[4, 5, null]")->data()));
+  ASSERT_EQ(device->device_type(), arr2->device_type());
+  auto schema = arrow::schema({field("ints", int32())});
+  auto batches = MakeBatches(schema, {arr1, arr2});
+  ASSERT_OK_AND_ASSIGN(auto reader,
+                       RecordBatchReader::Make(batches, schema, device->device_type()));
+
+  struct ArrowDeviceArrayStream c_stream;
+
+  ASSERT_OK(ExportDeviceRecordBatchReader(reader, &c_stream));
+  DeviceArrayStreamExportGuard guard(&c_stream);
+
+  ASSERT_FALSE(ArrowDeviceArrayStreamIsReleased(&c_stream));
+  AssertStreamSchema(&c_stream, *schema);
+  ASSERT_EQ(kMyDeviceType, c_stream.device_type);
+  AssertStreamNext(&c_stream, *batches[0]);
+  AssertStreamNext(&c_stream, *batches[1]);
+  AssertStreamEnd(&c_stream);
+  AssertStreamEnd(&c_stream);
+}
+
+TEST_F(TestArrayDeviceStreamExport, ArrayLifetime) {
+  std::shared_ptr<Device> device = std::make_shared<MyDevice>(1);
+  auto mm = device->default_memory_manager();
+
+  ASSERT_OK_AND_ASSIGN(auto arr1,
+                       ToDevice(mm, *ArrayFromJSON(int32(), "[1, 2]")->data()));
+  ASSERT_EQ(device->device_type(), arr1->device_type());
+  ASSERT_OK_AND_ASSIGN(auto arr2,
+                       ToDevice(mm, *ArrayFromJSON(int32(), "[4, 5, null]")->data()));
+  ASSERT_EQ(device->device_type(), arr2->device_type());
+  auto schema = arrow::schema({field("ints", int32())});
+  auto batches = MakeBatches(schema, {arr1, arr2});
+  ASSERT_OK_AND_ASSIGN(auto reader,
+                       RecordBatchReader::Make(batches, schema, device->device_type()));
+
+  struct ArrowDeviceArrayStream c_stream;
+  struct ArrowSchema c_schema;
+  struct ArrowDeviceArray c_array0, c_array1;
+
+  ASSERT_OK(ExportDeviceRecordBatchReader(reader, &c_stream));
+  {
+    DeviceArrayStreamExportGuard guard(&c_stream);
+    ASSERT_FALSE(ArrowDeviceArrayStreamIsReleased(&c_stream));
+    ASSERT_EQ(kMyDeviceType, c_stream.device_type);
+
+    ASSERT_EQ(0, c_stream.get_schema(&c_stream, &c_schema));
+    ASSERT_EQ(0, c_stream.get_next(&c_stream, &c_array0));
+    ASSERT_EQ(0, c_stream.get_next(&c_stream, &c_array1));
+    AssertStreamEnd(&c_stream);
+  }
+
+  DeviceArrayExportGuard guard0(&c_array0), guard1(&c_array1);
+
+  {
+    SchemaExportGuard schema_guard(&c_schema);
+    ASSERT_OK_AND_ASSIGN(auto got_schema, ImportSchema(&c_schema));
+    AssertSchemaEqual(*schema, *got_schema, /*check_metadata=*/true);
+  }
+
+  ASSERT_EQ(kMyDeviceType, c_array0.device_type);
+  ASSERT_EQ(kMyDeviceType, c_array1.device_type);
+
+  ASSERT_GT(pool_->bytes_allocated(), orig_allocated_);
+  ASSERT_OK_AND_ASSIGN(
+      auto batch,
+      ImportDeviceRecordBatch(&c_array1, schema, TestDeviceArrayRoundtrip::DeviceMapper));
+  AssertBatchesEqual(*batches[1], *batch);
+  ASSERT_EQ(device->device_type(), batch->device_type());
+  ASSERT_OK_AND_ASSIGN(
+      batch,
+      ImportDeviceRecordBatch(&c_array0, schema, TestDeviceArrayRoundtrip::DeviceMapper));
+  AssertBatchesEqual(*batches[0], *batch);
+  ASSERT_EQ(device->device_type(), batch->device_type());
+}
+
+TEST_F(TestArrayDeviceStreamExport, Errors) {
+  auto reader =
+      std::make_shared<FailingRecordBatchReader>(Status::Invalid("some example error"));
+
+  struct ArrowDeviceArrayStream c_stream;
+
+  ASSERT_OK(ExportDeviceRecordBatchReader(reader, &c_stream));
+  DeviceArrayStreamExportGuard guard(&c_stream);
+
+  struct ArrowSchema c_schema;
+  ASSERT_EQ(0, c_stream.get_schema(&c_stream, &c_schema));
+  ASSERT_FALSE(ArrowSchemaIsReleased(&c_schema));
+  {
+    SchemaExportGuard schema_guard(&c_schema);
+    ASSERT_OK_AND_ASSIGN(auto schema, ImportSchema(&c_schema));
+    AssertSchemaEqual(schema, arrow::schema({}), /*check_metadata=*/true);
+  }
+
+  struct ArrowDeviceArray c_array;
+  ASSERT_EQ(EINVAL, c_stream.get_next(&c_stream, &c_array));
+}
+
+TEST_F(TestArrayDeviceStreamExport, ChunkedArrayExportEmpty) {
+  ASSERT_OK_AND_ASSIGN(auto chunked_array, ChunkedArray::Make({}, int32()));
+
+  struct ArrowDeviceArrayStream c_stream;
+  struct ArrowSchema c_schema;
+
+  ASSERT_OK(ExportDeviceChunkedArray(
+      chunked_array, static_cast<DeviceAllocationType>(kMyDeviceType), &c_stream));
+  DeviceArrayStreamExportGuard guard(&c_stream);
+
+  {
+    DeviceArrayStreamExportGuard guard(&c_stream);
+    ASSERT_FALSE(ArrowDeviceArrayStreamIsReleased(&c_stream));
+
+    ASSERT_EQ(kMyDeviceType, c_stream.device_type);
+    ASSERT_EQ(0, c_stream.get_schema(&c_stream, &c_schema));
+    AssertStreamEnd(&c_stream);
+  }
+
+  {
+    SchemaExportGuard schema_guard(&c_schema);
+    ASSERT_OK_AND_ASSIGN(auto got_type, ImportType(&c_schema));
+    AssertTypeEqual(*chunked_array->type(), *got_type);
+  }
+}
+
+TEST_F(TestArrayDeviceStreamExport, ChunkedArrayExport) {
+  std::shared_ptr<Device> device = std::make_shared<MyDevice>(1);
+  auto mm = device->default_memory_manager();
+
+  ASSERT_OK_AND_ASSIGN(auto arr1,
+                       ToDevice(mm, *ArrayFromJSON(int32(), "[1, 2]")->data()));
+  ASSERT_EQ(device->device_type(), arr1->device_type());
+  ASSERT_OK_AND_ASSIGN(auto arr2,
+                       ToDevice(mm, *ArrayFromJSON(int32(), "[4, 5, null]")->data()));
+  ASSERT_EQ(device->device_type(), arr2->device_type());
+
+  ASSERT_OK_AND_ASSIGN(auto chunked_array, ChunkedArray::Make({arr1, arr2}));
+
+  struct ArrowDeviceArrayStream c_stream;
+  struct ArrowSchema c_schema;
+  struct ArrowDeviceArray c_array0, c_array1;
+
+  ASSERT_OK(ExportDeviceChunkedArray(chunked_array, device->device_type(), &c_stream));
+  DeviceArrayStreamExportGuard guard(&c_stream);
+
+  {
+    DeviceArrayStreamExportGuard guard(&c_stream);
+    ASSERT_FALSE(ArrowDeviceArrayStreamIsReleased(&c_stream));
+    ASSERT_EQ(kMyDeviceType, c_stream.device_type);
+
+    ASSERT_EQ(0, c_stream.get_schema(&c_stream, &c_schema));
+    ASSERT_EQ(0, c_stream.get_next(&c_stream, &c_array0));
+    ASSERT_EQ(0, c_stream.get_next(&c_stream, &c_array1));
+    AssertStreamEnd(&c_stream);
+  }
+
+  DeviceArrayExportGuard guard0(&c_array0), guard1(&c_array1);
+
+  {
+    SchemaExportGuard schema_guard(&c_schema);
+    ASSERT_OK_AND_ASSIGN(auto got_type, ImportType(&c_schema));
+    AssertTypeEqual(*chunked_array->type(), *got_type);
+  }
+
+  ASSERT_EQ(kMyDeviceType, c_array0.device_type);
+  ASSERT_EQ(kMyDeviceType, c_array1.device_type);
+
+  ASSERT_GT(pool_->bytes_allocated(), orig_allocated_);
+  ASSERT_OK_AND_ASSIGN(auto array,
+                       ImportDeviceArray(&c_array0, chunked_array->type(),
+                                         TestDeviceArrayRoundtrip::DeviceMapper));
+  ASSERT_EQ(device->device_type(), array->device_type());
+  AssertArraysEqual(*chunked_array->chunk(0), *array);
+  ASSERT_OK_AND_ASSIGN(array, ImportDeviceArray(&c_array1, chunked_array->type(),
+                                                TestDeviceArrayRoundtrip::DeviceMapper));
+  ASSERT_EQ(device->device_type(), array->device_type());
+  AssertArraysEqual(*chunked_array->chunk(1), *array);
+}
+
+////////////////////////////////////////////////////////////////////////////
+// Array device stream roundtrip tests
+
+class TestArrayDeviceStreamRoundtrip : public BaseArrayStreamTest {
+ public:
+  static Result<std::shared_ptr<ArrayData>> ToDeviceData(
+      const std::shared_ptr<MemoryManager>& mm, const ArrayData& data) {
+    arrow::BufferVector buffers;
+    for (const auto& buf : data.buffers) {
+      if (buf) {
+        ARROW_ASSIGN_OR_RAISE(auto dest, mm->CopyBuffer(buf, mm));
+        buffers.push_back(dest);
+      } else {
+        buffers.push_back(nullptr);
+      }
+    }
+
+    arrow::ArrayDataVector children;
+    for (const auto& child : data.child_data) {
+      ARROW_ASSIGN_OR_RAISE(auto dest, ToDeviceData(mm, *child));
+      children.push_back(dest);
+    }
+
+    return ArrayData::Make(data.type, data.length, buffers, children, data.null_count,
+                           data.offset);
+  }
+
+  static Result<std::shared_ptr<Array>> ToDevice(const std::shared_ptr<MemoryManager>& mm,
+                                                 const ArrayData& data) {
+    ARROW_ASSIGN_OR_RAISE(auto result, ToDeviceData(mm, data));
+    return MakeArray(result);
+  }
+
+  void Roundtrip(std::shared_ptr<RecordBatchReader>* reader,
+                 struct ArrowDeviceArrayStream* c_stream) {
+    ASSERT_OK(ExportDeviceRecordBatchReader(*reader, c_stream));
+    ASSERT_FALSE(ArrowDeviceArrayStreamIsReleased(c_stream));
+
+    ASSERT_OK_AND_ASSIGN(
+        auto got_reader,
+        ImportDeviceRecordBatchReader(c_stream, TestDeviceArrayRoundtrip::DeviceMapper));
+    *reader = std::move(got_reader);
+  }
+
+  void Roundtrip(
+      std::shared_ptr<RecordBatchReader> reader,
+      std::function<void(const std::shared_ptr<RecordBatchReader>&)> check_func) {
+    ArrowDeviceArrayStream c_stream;
+
+    // NOTE: ReleaseCallback<> is not immediately usable with ArrowDeviceArayStream
+    // because get_next and get_schema need the original private_data.
+    std::weak_ptr<RecordBatchReader> weak_reader(reader);
+    ASSERT_EQ(weak_reader.use_count(), 1);  // Expiration check will fail otherwise
+
+    ASSERT_OK(ExportDeviceRecordBatchReader(std::move(reader), &c_stream));
+    ASSERT_FALSE(ArrowDeviceArrayStreamIsReleased(&c_stream));
+
+    {
+      ASSERT_OK_AND_ASSIGN(auto new_reader,
+                           ImportDeviceRecordBatchReader(
+                               &c_stream, TestDeviceArrayRoundtrip::DeviceMapper));
+      // stream was moved
+      ASSERT_TRUE(ArrowDeviceArrayStreamIsReleased(&c_stream));
+      ASSERT_FALSE(weak_reader.expired());
+
+      check_func(new_reader);
+    }
+    // Stream was released when `new_reader` was destroyed
+    ASSERT_TRUE(weak_reader.expired());
+  }
+
+  void Roundtrip(std::shared_ptr<ChunkedArray> src,
+                 std::function<void(const std::shared_ptr<ChunkedArray>&)> check_func) {
+    ArrowDeviceArrayStream c_stream;
+
+    // One original copy to compare the result, one copy held by the stream
+    std::weak_ptr<ChunkedArray> weak_src(src);
+    int64_t initial_use_count = weak_src.use_count();
+
+    ASSERT_OK(ExportDeviceChunkedArray(
+        std::move(src), static_cast<DeviceAllocationType>(kMyDeviceType), &c_stream));
+    ASSERT_FALSE(ArrowDeviceArrayStreamIsReleased(&c_stream));
+    ASSERT_EQ(kMyDeviceType, c_stream.device_type);
+
+    {
+      ASSERT_OK_AND_ASSIGN(
+          auto dst,
+          ImportDeviceChunkedArray(&c_stream, TestDeviceArrayRoundtrip::DeviceMapper));
+      // Stream was moved, consumed, and released
+      ASSERT_TRUE(ArrowDeviceArrayStreamIsReleased(&c_stream));
+
+      // Stream was released by ImportDeviceChunkedArray but original copy remains
+      ASSERT_EQ(weak_src.use_count(), initial_use_count - 1);
+
+      check_func(dst);
+    }
+  }
+
+  void AssertReaderNext(const std::shared_ptr<RecordBatchReader>& reader,
+                        const RecordBatch& expected) {
+    ASSERT_OK_AND_ASSIGN(auto batch, reader->Next());
+    ASSERT_NE(batch, nullptr);
+    ASSERT_EQ(static_cast<DeviceAllocationType>(kMyDeviceType), batch->device_type());
+    AssertBatchesEqual(expected, *batch);
+  }
+
+  void AssertReaderEnd(const std::shared_ptr<RecordBatchReader>& reader) {
+    ASSERT_OK_AND_ASSIGN(auto batch, reader->Next());
+    ASSERT_EQ(batch, nullptr);
+  }
+
+  void AssertReaderClosed(const std::shared_ptr<RecordBatchReader>& reader) {
+    ASSERT_THAT(reader->Next(),
+                Raises(StatusCode::Invalid, ::testing::HasSubstr("already been closed")));
+  }
+
+  void AssertReaderClose(const std::shared_ptr<RecordBatchReader>& reader) {
+    ASSERT_OK(reader->Close());
+    AssertReaderClosed(reader);
+  }
+};
+
+TEST_F(TestArrayDeviceStreamRoundtrip, Simple) {
+  std::shared_ptr<Device> device = std::make_shared<MyDevice>(1);
+  auto mm = device->default_memory_manager();
+
+  ASSERT_OK_AND_ASSIGN(auto arr1,
+                       ToDevice(mm, *ArrayFromJSON(int32(), "[1, 2]")->data()));
+  ASSERT_EQ(device->device_type(), arr1->device_type());
+  ASSERT_OK_AND_ASSIGN(auto arr2,
+                       ToDevice(mm, *ArrayFromJSON(int32(), "[4, 5, null]")->data()));
+  ASSERT_EQ(device->device_type(), arr2->device_type());
+  auto orig_schema = arrow::schema({field("ints", int32())});
+  auto batches = MakeBatches(orig_schema, {arr1, arr2});
+  ASSERT_OK_AND_ASSIGN(
+      auto reader, RecordBatchReader::Make(batches, orig_schema, device->device_type()));
+
+  Roundtrip(std::move(reader), [&](const std::shared_ptr<RecordBatchReader>& reader) {
+    AssertSchemaEqual(*orig_schema, *reader->schema(), /*check_metadata=*/true);
+    AssertReaderNext(reader, *batches[0]);
+    AssertReaderNext(reader, *batches[1]);
+    AssertReaderEnd(reader);
+    AssertReaderEnd(reader);
+    AssertReaderClose(reader);
+  });
+}
+
+TEST_F(TestArrayDeviceStreamRoundtrip, CloseEarly) {
+  std::shared_ptr<Device> device = std::make_shared<MyDevice>(1);
+  auto mm = device->default_memory_manager();
+
+  ASSERT_OK_AND_ASSIGN(auto arr1,
+                       ToDevice(mm, *ArrayFromJSON(int32(), "[1, 2]")->data()));
+  ASSERT_EQ(device->device_type(), arr1->device_type());
+  ASSERT_OK_AND_ASSIGN(auto arr2,
+                       ToDevice(mm, *ArrayFromJSON(int32(), "[4, 5, null]")->data()));
+  ASSERT_EQ(device->device_type(), arr2->device_type());
+  auto orig_schema = arrow::schema({field("ints", int32())});
+  auto batches = MakeBatches(orig_schema, {arr1, arr2});
+  ASSERT_OK_AND_ASSIGN(
+      auto reader, RecordBatchReader::Make(batches, orig_schema, device->device_type()));
+
+  Roundtrip(std::move(reader), [&](const std::shared_ptr<RecordBatchReader>& reader) {
+    AssertReaderNext(reader, *batches[0]);
+    AssertReaderClose(reader);
+  });
+}
+
+TEST_F(TestArrayDeviceStreamRoundtrip, Errors) {
+  auto reader = std::make_shared<FailingRecordBatchReader>(
+      Status::Invalid("roundtrip error example"));
+
+  Roundtrip(std::move(reader), [&](const std::shared_ptr<RecordBatchReader>& reader) {
+    EXPECT_THAT(reader->Next(), Raises(StatusCode::Invalid,
+                                       ::testing::HasSubstr("roundtrip error example")));
+  });
+}
+
+TEST_F(TestArrayDeviceStreamRoundtrip, SchemaError) {
+  struct ArrowDeviceArrayStream stream = {};
+  stream.get_last_error = [](struct ArrowDeviceArrayStream* stream) {
+    return "Expected error";
+  };
+  stream.get_schema = [](struct ArrowDeviceArrayStream* stream,
+                         struct ArrowSchema* schema) { return EIO; };
+  stream.get_next = [](struct ArrowDeviceArrayStream* stream,
+                       struct ArrowDeviceArray* array) { return EINVAL; };
+  stream.release = [](struct ArrowDeviceArrayStream* stream) {
+    *static_cast<bool*>(stream->private_data) = true;
+    std::memset(stream, 0, sizeof(*stream));
+  };
+  bool released = false;
+  stream.private_data = &released;
+
+  EXPECT_RAISES_WITH_MESSAGE_THAT(IOError, ::testing::HasSubstr("Expected error"),
+                                  ImportDeviceRecordBatchReader(&stream));
+  ASSERT_TRUE(released);
+}
+
+TEST_F(TestArrayDeviceStreamRoundtrip, ChunkedArrayRoundtrip) {
+  std::shared_ptr<Device> device = std::make_shared<MyDevice>(1);
+  auto mm = device->default_memory_manager();
+
+  ASSERT_OK_AND_ASSIGN(auto arr1,
+                       ToDevice(mm, *ArrayFromJSON(int32(), "[1, 2]")->data()));
+  ASSERT_EQ(device->device_type(), arr1->device_type());
+  ASSERT_OK_AND_ASSIGN(auto arr2,
+                       ToDevice(mm, *ArrayFromJSON(int32(), "[4, 5, null]")->data()));
+  ASSERT_EQ(device->device_type(), arr2->device_type());
+
+  ASSERT_OK_AND_ASSIGN(auto src, ChunkedArray::Make({arr1, arr2}));
+
+  Roundtrip(src, [&](const std::shared_ptr<ChunkedArray>& dst) {
+    AssertTypeEqual(*dst->type(), *src->type());
+    AssertChunkedEqual(*dst, *src);
+  });
+}
+
+TEST_F(TestArrayDeviceStreamRoundtrip, ChunkedArrayRoundtripEmpty) {
+  ASSERT_OK_AND_ASSIGN(auto src, ChunkedArray::Make({}, int32()));
+
+  Roundtrip(src, [&](const std::shared_ptr<ChunkedArray>& dst) {
+    AssertTypeEqual(*dst->type(), *src->type());
+    AssertChunkedEqual(*dst, *src);
+  });
+}
+
 }  // namespace arrow
diff --git a/cpp/src/arrow/c/helpers.h b/cpp/src/arrow/c/helpers.h
index a24f272feac81..6e4df17f43ebf 100644
--- a/cpp/src/arrow/c/helpers.h
+++ b/cpp/src/arrow/c/helpers.h
@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -70,9 +71,17 @@ inline int ArrowArrayIsReleased(const struct ArrowArray* array) {
   return array->release == NULL;
 }
 
+inline int ArrowDeviceArrayIsReleased(const struct ArrowDeviceArray* array) {
+  return ArrowArrayIsReleased(&array->array);
+}
+
 /// Mark the C array released (for use in release callbacks)
 inline void ArrowArrayMarkReleased(struct ArrowArray* array) { array->release = NULL; }
 
+inline void ArrowDeviceArrayMarkReleased(struct ArrowDeviceArray* array) {
+  ArrowArrayMarkReleased(&array->array);
+}
+
 /// Move the C array from `src` to `dest`
 ///
 /// Note `dest` must *not* point to a valid array already, otherwise there
@@ -84,6 +93,14 @@ inline void ArrowArrayMove(struct ArrowArray* src, struct ArrowArray* dest) {
   ArrowArrayMarkReleased(src);
 }
 
+inline void ArrowDeviceArrayMove(struct ArrowDeviceArray* src,
+                                 struct ArrowDeviceArray* dest) {
+  assert(dest != src);
+  assert(!ArrowDeviceArrayIsReleased(src));
+  memcpy(dest, src, sizeof(struct ArrowDeviceArray));
+  ArrowDeviceArrayMarkReleased(src);
+}
+
 /// Release the C array, if necessary, by calling its release callback
 inline void ArrowArrayRelease(struct ArrowArray* array) {
   if (!ArrowArrayIsReleased(array)) {
@@ -93,16 +110,32 @@ inline void ArrowArrayRelease(struct ArrowArray* array) {
   }
 }
 
+inline void ArrowDeviceArrayRelease(struct ArrowDeviceArray* array) {
+  if (!ArrowDeviceArrayIsReleased(array)) {
+    array->array.release(&array->array);
+    ARROW_C_ASSERT(ArrowDeviceArrayIsReleased(array),
+                   "ArrowDeviceArrayRelease did not cleanup release callback");
+  }
+}
+
 /// Query whether the C array stream is released
 inline int ArrowArrayStreamIsReleased(const struct ArrowArrayStream* stream) {
   return stream->release == NULL;
 }
 
+inline int ArrowDeviceArrayStreamIsReleased(const struct ArrowDeviceArrayStream* stream) {
+  return stream->release == NULL;
+}
+
 /// Mark the C array stream released (for use in release callbacks)
 inline void ArrowArrayStreamMarkReleased(struct ArrowArrayStream* stream) {
   stream->release = NULL;
 }
 
+inline void ArrowDeviceArrayStreamMarkReleased(struct ArrowDeviceArrayStream* stream) {
+  stream->release = NULL;
+}
+
 /// Move the C array stream from `src` to `dest`
 ///
 /// Note `dest` must *not* point to a valid stream already, otherwise there
@@ -115,6 +148,14 @@ inline void ArrowArrayStreamMove(struct ArrowArrayStream* src,
   ArrowArrayStreamMarkReleased(src);
 }
 
+inline void ArrowDeviceArrayStreamMove(struct ArrowDeviceArrayStream* src,
+                                       struct ArrowDeviceArrayStream* dest) {
+  assert(dest != src);
+  assert(!ArrowDeviceArrayStreamIsReleased(src));
+  memcpy(dest, src, sizeof(struct ArrowDeviceArrayStream));
+  ArrowDeviceArrayStreamMarkReleased(src);
+}
+
 /// Release the C array stream, if necessary, by calling its release callback
 inline void ArrowArrayStreamRelease(struct ArrowArrayStream* stream) {
   if (!ArrowArrayStreamIsReleased(stream)) {
@@ -124,6 +165,14 @@ inline void ArrowArrayStreamRelease(struct ArrowArrayStream* stream) {
   }
 }
 
+inline void ArrowDeviceArrayStreamRelease(struct ArrowDeviceArrayStream* stream) {
+  if (!ArrowDeviceArrayStreamIsReleased(stream)) {
+    stream->release(stream);
+    ARROW_C_ASSERT(ArrowDeviceArrayStreamIsReleased(stream),
+                   "ArrowDeviceArrayStreamRelease did not cleanup release callback");
+  }
+}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/cpp/src/arrow/c/util_internal.h b/cpp/src/arrow/c/util_internal.h
index 6a33be9b0da8e..dc0e25710e987 100644
--- a/cpp/src/arrow/c/util_internal.h
+++ b/cpp/src/arrow/c/util_internal.h
@@ -32,12 +32,32 @@ struct ArrayExportTraits {
   typedef struct ArrowArray CType;
   static constexpr auto IsReleasedFunc = &ArrowArrayIsReleased;
   static constexpr auto ReleaseFunc = &ArrowArrayRelease;
+  static constexpr auto MoveFunc = &ArrowArrayMove;
+  static constexpr auto MarkReleased = &ArrowArrayMarkReleased;
+};
+
+struct ArrayDeviceExportTraits {
+  typedef struct ArrowDeviceArray CType;
+  static constexpr auto IsReleasedFunc = &ArrowDeviceArrayIsReleased;
+  static constexpr auto ReleaseFunc = &ArrowDeviceArrayRelease;
+  static constexpr auto MoveFunc = &ArrowDeviceArrayMove;
+  static constexpr auto MarkReleased = &ArrowDeviceArrayMarkReleased;
 };
 
 struct ArrayStreamExportTraits {
   typedef struct ArrowArrayStream CType;
   static constexpr auto IsReleasedFunc = &ArrowArrayStreamIsReleased;
   static constexpr auto ReleaseFunc = &ArrowArrayStreamRelease;
+  static constexpr auto MoveFunc = &ArrowArrayStreamMove;
+  static constexpr auto MarkReleased = &ArrowArrayStreamMarkReleased;
+};
+
+struct ArrayDeviceStreamExportTraits {
+  typedef struct ArrowDeviceArrayStream CType;
+  static constexpr auto IsReleasedFunc = &ArrowDeviceArrayStreamIsReleased;
+  static constexpr auto ReleaseFunc = &ArrowDeviceArrayStreamRelease;
+  static constexpr auto MoveFunc = &ArrowDeviceArrayStreamMove;
+  static constexpr auto MarkReleased = &ArrowDeviceArrayStreamMarkReleased;
 };
 
 // A RAII-style object to release a C Array / Schema struct at block scope exit.
@@ -79,7 +99,9 @@ class ExportGuard {
 
 using SchemaExportGuard = ExportGuard<SchemaExportTraits>;
 using ArrayExportGuard = ExportGuard<ArrayExportTraits>;
+using DeviceArrayExportGuard = ExportGuard<ArrayDeviceExportTraits>;
 using ArrayStreamExportGuard = ExportGuard<ArrayStreamExportTraits>;
+using DeviceArrayStreamExportGuard = ExportGuard<ArrayDeviceStreamExportTraits>;
 
 }  // namespace internal
 }  // namespace arrow
diff --git a/cpp/src/arrow/chunk_resolver.cc b/cpp/src/arrow/chunk_resolver.cc
index 29bccb52658f8..55eec53ced1c7 100644
--- a/cpp/src/arrow/chunk_resolver.cc
+++ b/cpp/src/arrow/chunk_resolver.cc
@@ -19,14 +19,14 @@
 
 #include <algorithm>
 #include <cstdint>
+#include <limits>
 #include <memory>
 #include <vector>
 
 #include "arrow/array.h"
 #include "arrow/record_batch.h"
 
-namespace arrow {
-namespace internal {
+namespace arrow::internal {
 
 namespace {
 template <typename T>
@@ -54,6 +54,51 @@ inline std::vector<int64_t> MakeChunksOffsets(const std::vector<T>& chunks) {
   offsets[chunks.size()] = offset;
   return offsets;
 }
+
+/// \pre all the pre-conditions of ChunkResolver::ResolveMany()
+/// \pre num_offsets - 1 <= std::numeric_limits<IndexType>::max()
+template <typename IndexType>
+void ResolveManyInline(size_t num_offsets, const int64_t* signed_offsets,
+                       int64_t n_indices, const IndexType* logical_index_vec,
+                       IndexType* out_chunk_index_vec, IndexType chunk_hint,
+                       IndexType* out_index_in_chunk_vec) {
+  auto* offsets = reinterpret_cast<const uint64_t*>(signed_offsets);
+  const auto num_chunks = static_cast<IndexType>(num_offsets - 1);
+  // chunk_hint in [0, num_offsets) per the precondition.
+  for (int64_t i = 0; i < n_indices; i++) {
+    const auto index = static_cast<uint64_t>(logical_index_vec[i]);
+    if (index >= offsets[chunk_hint] &&
+        (chunk_hint == num_chunks || index < offsets[chunk_hint + 1])) {
+      out_chunk_index_vec[i] = chunk_hint;  // hint is correct!
+      continue;
+    }
+    // lo < hi is guaranteed by `num_offsets = chunks.size() + 1`
+    auto chunk_index =
+        ChunkResolver::Bisect(index, offsets, /*lo=*/0, /*hi=*/num_offsets);
+    chunk_hint = static_cast<IndexType>(chunk_index);
+    out_chunk_index_vec[i] = chunk_hint;
+  }
+  if (out_index_in_chunk_vec != NULLPTR) {
+    for (int64_t i = 0; i < n_indices; i++) {
+      auto logical_index = logical_index_vec[i];
+      auto chunk_index = out_chunk_index_vec[i];
+      // chunk_index is in [0, chunks.size()] no matter what the
+      // value of logical_index is, so it's always safe to dereference
+      // offset_ as it contains chunks.size()+1 values.
+      out_index_in_chunk_vec[i] =
+          logical_index - static_cast<IndexType>(offsets[chunk_index]);
+#if defined(ARROW_VALGRIND) || defined(ADDRESS_SANITIZER)
+      // Make it more likely that Valgrind/ASAN can catch an invalid memory
+      // access by poisoning out_index_in_chunk_vec[i] when the logical
+      // index is out-of-bounds.
+      if (chunk_index == num_chunks) {
+        out_index_in_chunk_vec[i] = std::numeric_limits<IndexType>::max();
+      }
+#endif
+    }
+  }
+}
+
 }  // namespace
 
 ChunkResolver::ChunkResolver(const ArrayVector& chunks) noexcept
@@ -84,5 +129,32 @@ ChunkResolver& ChunkResolver::operator=(const ChunkResolver& other) noexcept {
   return *this;
 }
 
-}  // namespace internal
-}  // namespace arrow
+void ChunkResolver::ResolveManyImpl(int64_t n_indices, const uint8_t* logical_index_vec,
+                                    uint8_t* out_chunk_index_vec, uint8_t chunk_hint,
+                                    uint8_t* out_index_in_chunk_vec) const {
+  ResolveManyInline(offsets_.size(), offsets_.data(), n_indices, logical_index_vec,
+                    out_chunk_index_vec, chunk_hint, out_index_in_chunk_vec);
+}
+
+void ChunkResolver::ResolveManyImpl(int64_t n_indices, const uint32_t* logical_index_vec,
+                                    uint32_t* out_chunk_index_vec, uint32_t chunk_hint,
+                                    uint32_t* out_index_in_chunk_vec) const {
+  ResolveManyInline(offsets_.size(), offsets_.data(), n_indices, logical_index_vec,
+                    out_chunk_index_vec, chunk_hint, out_index_in_chunk_vec);
+}
+
+void ChunkResolver::ResolveManyImpl(int64_t n_indices, const uint16_t* logical_index_vec,
+                                    uint16_t* out_chunk_index_vec, uint16_t chunk_hint,
+                                    uint16_t* out_index_in_chunk_vec) const {
+  ResolveManyInline(offsets_.size(), offsets_.data(), n_indices, logical_index_vec,
+                    out_chunk_index_vec, chunk_hint, out_index_in_chunk_vec);
+}
+
+void ChunkResolver::ResolveManyImpl(int64_t n_indices, const uint64_t* logical_index_vec,
+                                    uint64_t* out_chunk_index_vec, uint64_t chunk_hint,
+                                    uint64_t* out_index_in_chunk_vec) const {
+  ResolveManyInline(offsets_.size(), offsets_.data(), n_indices, logical_index_vec,
+                    out_chunk_index_vec, chunk_hint, out_index_in_chunk_vec);
+}
+
+}  // namespace arrow::internal
diff --git a/cpp/src/arrow/chunk_resolver.h b/cpp/src/arrow/chunk_resolver.h
index c5dad1a17b18e..a2a3d5a864243 100644
--- a/cpp/src/arrow/chunk_resolver.h
+++ b/cpp/src/arrow/chunk_resolver.h
@@ -20,6 +20,8 @@
 #include <atomic>
 #include <cassert>
 #include <cstdint>
+#include <limits>
+#include <type_traits>
 #include <vector>
 
 #include "arrow/type_fwd.h"
@@ -27,6 +29,8 @@
 
 namespace arrow::internal {
 
+struct ChunkResolver;
+
 struct ChunkLocation {
   /// \brief Index of the chunk in the array of chunks
   ///
@@ -36,8 +40,17 @@ struct ChunkLocation {
 
   /// \brief Index of the value in the chunk
   ///
-  /// The value is undefined if chunk_index >= chunks.size()
+  /// The value is UNDEFINED if chunk_index >= chunks.size()
   int64_t index_in_chunk = 0;
+
+  ChunkLocation() = default;
+
+  ChunkLocation(int64_t chunk_index, int64_t index_in_chunk)
+      : chunk_index(chunk_index), index_in_chunk(index_in_chunk) {}
+
+  bool operator==(ChunkLocation other) const {
+    return chunk_index == other.chunk_index && index_in_chunk == other.index_in_chunk;
+  }
 };
 
 /// \brief An utility that incrementally resolves logical indices into
@@ -60,12 +73,35 @@ struct ARROW_EXPORT ChunkResolver {
   explicit ChunkResolver(const std::vector<const Array*>& chunks) noexcept;
   explicit ChunkResolver(const RecordBatchVector& batches) noexcept;
 
+  /// \brief Construct a ChunkResolver from a vector of chunks.size() + 1 offsets.
+  ///
+  /// The first offset must be 0 and the last offset must be the logical length of the
+  /// chunked array. Each offset before the last represents the starting logical index of
+  /// the corresponding chunk.
+  explicit ChunkResolver(std::vector<int64_t> offsets) noexcept
+      : offsets_(std::move(offsets)), cached_chunk_(0) {
+#ifndef NDEBUG
+    assert(offsets_.size() >= 1);
+    assert(offsets_[0] == 0);
+    for (size_t i = 1; i < offsets_.size(); i++) {
+      assert(offsets_[i] >= offsets_[i - 1]);
+    }
+#endif
+  }
+
   ChunkResolver(ChunkResolver&& other) noexcept;
   ChunkResolver& operator=(ChunkResolver&& other) noexcept;
 
   ChunkResolver(const ChunkResolver& other) noexcept;
   ChunkResolver& operator=(const ChunkResolver& other) noexcept;
 
+  int64_t logical_array_length() const { return offsets_.back(); }
+  int64_t num_chunks() const { return static_cast<int64_t>(offsets_.size()) - 1; }
+
+  int64_t chunk_length(int64_t chunk_index) const {
+    return offsets_[chunk_index + 1] - offsets_[chunk_index];
+  }
+
   /// \brief Resolve a logical index to a ChunkLocation.
   ///
   /// The returned ChunkLocation contains the chunk index and the within-chunk index
@@ -81,7 +117,7 @@ struct ARROW_EXPORT ChunkResolver {
     const auto cached_chunk = cached_chunk_.load(std::memory_order_relaxed);
     const auto chunk_index =
         ResolveChunkIndex</*StoreCachedChunk=*/true>(index, cached_chunk);
-    return {chunk_index, index - offsets_[chunk_index]};
+    return ChunkLocation{chunk_index, index - offsets_[chunk_index]};
   }
 
   /// \brief Resolve a logical index to a ChunkLocation.
@@ -97,12 +133,70 @@ struct ARROW_EXPORT ChunkResolver {
   /// \return ChunkLocation with a valid chunk_index if index is within
   ///         bounds, or with chunk_index == chunks.size() if logical index is
   ///         `>= chunked_array.length()`.
-  inline ChunkLocation ResolveWithChunkIndexHint(int64_t index,
-                                                 ChunkLocation hint) const {
+  inline ChunkLocation ResolveWithHint(int64_t index, ChunkLocation hint) const {
     assert(hint.chunk_index < static_cast<int64_t>(offsets_.size()));
     const auto chunk_index =
         ResolveChunkIndex</*StoreCachedChunk=*/false>(index, hint.chunk_index);
-    return {chunk_index, index - offsets_[chunk_index]};
+    return ChunkLocation{chunk_index, index - offsets_[chunk_index]};
+  }
+
+  /// \brief Resolve `n_indices` logical indices to chunk indices.
+  ///
+  /// \pre 0 <= logical_index_vec[i] < logical_array_length()
+  ///      (for well-defined and valid chunk index results)
+  /// \pre out_chunk_index_vec has space for `n_indices`
+  /// \pre chunk_hint in [0, chunks.size()]
+  /// \post out_chunk_index_vec[i] in [0, chunks.size()] for i in [0, n)
+  /// \post if logical_index_vec[i] >= chunked_array.length(), then
+  ///       out_chunk_index_vec[i] == chunks.size()
+  ///       and out_index_in_chunk_vec[i] is UNDEFINED (can be out-of-bounds)
+  /// \post if logical_index_vec[i] < 0, then both out_chunk_index_vec[i] and
+  ///       out_index_in_chunk_vec[i] are UNDEFINED
+  ///
+  /// \param n_indices The number of logical indices to resolve
+  /// \param logical_index_vec The logical indices to resolve
+  /// \param out_chunk_index_vec The output array where the chunk indices will be written
+  /// \param chunk_hint 0 or the last chunk_index produced by ResolveMany
+  /// \param out_index_in_chunk_vec If not NULLPTR, the output array where the
+  ///                               within-chunk indices will be written
+  /// \return false iff chunks.size() > std::numeric_limits<IndexType>::max()
+  template <typename IndexType>
+  [[nodiscard]] bool ResolveMany(int64_t n_indices, const IndexType* logical_index_vec,
+                                 IndexType* out_chunk_index_vec, IndexType chunk_hint = 0,
+                                 IndexType* out_index_in_chunk_vec = NULLPTR) const {
+    if constexpr (sizeof(IndexType) < sizeof(uint64_t)) {
+      // The max value returned by Bisect is `offsets.size() - 1` (= chunks.size()).
+      constexpr uint64_t kMaxIndexTypeValue = std::numeric_limits<IndexType>::max();
+      // A ChunkedArray with enough empty chunks can make the index of a chunk
+      // exceed the logical index and thus the maximum value of IndexType.
+      const bool chunk_index_fits_on_type =
+          static_cast<uint64_t>(offsets_.size() - 1) <= kMaxIndexTypeValue;
+      if (ARROW_PREDICT_FALSE(!chunk_index_fits_on_type)) {
+        return false;
+      }
+      // Since an index-in-chunk cannot possibly exceed the logical index being
+      // queried, we don't have to worry about these values not fitting on IndexType.
+    }
+    if constexpr (std::is_signed_v<IndexType>) {
+      // We interpret signed integers as unsigned and avoid having to generate double
+      // the amount of binary code to handle each integer width.
+      //
+      // Negative logical indices can become large values when cast to unsigned, and
+      // they are gracefully handled by ResolveManyImpl, but both the chunk index
+      // and the index in chunk values will be undefined in these cases. This
+      // happend because int8_t(-1) == uint8_t(255) and 255 could be a valid
+      // logical index in the chunked array.
+      using U = std::make_unsigned_t<IndexType>;
+      ResolveManyImpl(n_indices, reinterpret_cast<const U*>(logical_index_vec),
+                      reinterpret_cast<U*>(out_chunk_index_vec),
+                      static_cast<U>(chunk_hint),
+                      reinterpret_cast<U*>(out_index_in_chunk_vec));
+    } else {
+      static_assert(std::is_unsigned_v<IndexType>);
+      ResolveManyImpl(n_indices, logical_index_vec, out_chunk_index_vec, chunk_hint,
+                      out_index_in_chunk_vec);
+    }
+    return true;
   }
 
  private:
@@ -130,17 +224,33 @@ struct ARROW_EXPORT ChunkResolver {
     return chunk_index;
   }
 
+  /// \pre all the pre-conditions of ChunkResolver::ResolveMany()
+  /// \pre num_offsets - 1 <= std::numeric_limits<IndexType>::max()
+  void ResolveManyImpl(int64_t, const uint8_t*, uint8_t*, uint8_t, uint8_t*) const;
+  void ResolveManyImpl(int64_t, const uint16_t*, uint16_t*, uint16_t, uint16_t*) const;
+  void ResolveManyImpl(int64_t, const uint32_t*, uint32_t*, uint32_t, uint32_t*) const;
+  void ResolveManyImpl(int64_t, const uint64_t*, uint64_t*, uint64_t, uint64_t*) const;
+
+ public:
   /// \brief Find the index of the chunk that contains the logical index.
   ///
   /// Any non-negative index is accepted. When `hi=num_offsets`, the largest
   /// possible return value is `num_offsets-1` which is equal to
-  /// `chunks.size()`. The is returned when the logical index is out-of-bounds.
+  /// `chunks.size()`. Which is returned when the logical index is greater or
+  /// equal the logical length of the chunked array.
   ///
-  /// \pre index >= 0
+  /// \pre index >= 0 (otherwise, when index is negative, hi-1 is returned)
   /// \pre lo < hi
   /// \pre lo >= 0 && hi <= offsets_.size()
   static inline int64_t Bisect(int64_t index, const int64_t* offsets, int64_t lo,
                                int64_t hi) {
+    return Bisect(static_cast<uint64_t>(index),
+                  reinterpret_cast<const uint64_t*>(offsets), static_cast<uint64_t>(lo),
+                  static_cast<uint64_t>(hi));
+  }
+
+  static inline int64_t Bisect(uint64_t index, const uint64_t* offsets, uint64_t lo,
+                               uint64_t hi) {
     // Similar to std::upper_bound(), but slightly different as our offsets
     // array always starts with 0.
     auto n = hi - lo;
@@ -148,8 +258,8 @@ struct ARROW_EXPORT ChunkResolver {
     // (lo < hi is guaranteed by the precondition).
     assert(n > 1 && "lo < hi is a precondition of Bisect");
     do {
-      const int64_t m = n >> 1;
-      const int64_t mid = lo + m;
+      const uint64_t m = n >> 1;
+      const uint64_t mid = lo + m;
       if (index >= offsets[mid]) {
         lo = mid;
         n -= m;
diff --git a/cpp/src/arrow/chunked_array_test.cc b/cpp/src/arrow/chunked_array_test.cc
index 6ca52ab46ca68..e9cc283b53cd5 100644
--- a/cpp/src/arrow/chunked_array_test.cc
+++ b/cpp/src/arrow/chunked_array_test.cc
@@ -23,6 +23,7 @@
 #include <memory>
 #include <vector>
 
+#include "arrow/chunk_resolver.h"
 #include "arrow/scalar.h"
 #include "arrow/status.h"
 #include "arrow/testing/builder.h"
@@ -34,6 +35,9 @@
 
 namespace arrow {
 
+using internal::ChunkLocation;
+using internal::ChunkResolver;
+
 class TestChunkedArray : public ::testing::Test {
  protected:
   virtual void Construct() {
@@ -310,4 +314,200 @@ TEST_F(TestChunkedArray, GetScalar) {
   ASSERT_RAISES(IndexError, carr.GetScalar(7));
 }
 
+// ChunkResolver tests
+
+using IndexTypes = ::testing::Types<uint8_t, uint16_t, uint32_t, uint64_t, int8_t,
+                                    int16_t, int32_t, int64_t>;
+
+TEST(TestChunkResolver, Resolve) {
+  ChunkResolver empty(std::vector<int64_t>({0}));  // []
+  // ChunkLocation::index_in_chunk is undefined when chunk_index==chunks.size(),
+  // so only chunk_index is compared in these cases.
+  ASSERT_EQ(empty.Resolve(0).chunk_index, 0);
+  ASSERT_EQ(empty.Resolve(0).chunk_index, 0);
+
+  ChunkResolver one(std::vector<int64_t>({0, 1}));  // [[0]]
+  ASSERT_EQ(one.Resolve(1).chunk_index, 1);
+  ASSERT_EQ(one.Resolve(0), (ChunkLocation(0, 0)));
+  ASSERT_EQ(one.Resolve(1).chunk_index, 1);
+
+  ChunkResolver one_and_empty(std::vector<int64_t>({0, 1, 1, 1}));  // [[0], [], []]
+  ASSERT_EQ(one_and_empty.Resolve(3).chunk_index, 3);
+  ASSERT_EQ(one_and_empty.Resolve(2).chunk_index, 3);
+  ASSERT_EQ(one_and_empty.Resolve(1).chunk_index, 3);
+  ASSERT_EQ(one_and_empty.Resolve(0), (ChunkLocation(0, 0)));
+  ASSERT_EQ(one_and_empty.Resolve(1).chunk_index, 3);
+  ASSERT_EQ(one_and_empty.Resolve(2).chunk_index, 3);
+  ASSERT_EQ(one_and_empty.Resolve(3).chunk_index, 3);
+
+  ChunkResolver one_one_one(std::vector<int64_t>({0, 1, 2, 3}));  // [[0], [1], [2]]
+  ASSERT_EQ(one_one_one.Resolve(3).chunk_index, 3);
+  ASSERT_EQ(one_one_one.Resolve(2), (ChunkLocation(2, 0)));
+  ASSERT_EQ(one_one_one.Resolve(1), (ChunkLocation(1, 0)));
+  ASSERT_EQ(one_one_one.Resolve(0), (ChunkLocation(0, 0)));
+  ASSERT_EQ(one_one_one.Resolve(1), (ChunkLocation(1, 0)));
+  ASSERT_EQ(one_one_one.Resolve(2), (ChunkLocation(2, 0)));
+  ASSERT_EQ(one_one_one.Resolve(3).chunk_index, 3);
+
+  ChunkResolver resolver(std::vector<int64_t>({0, 2, 3, 10}));  // [[0, 1], [2], [3..9]]
+  ASSERT_EQ(resolver.Resolve(10).chunk_index, 3);
+  ASSERT_EQ(resolver.Resolve(9), (ChunkLocation(2, 6)));
+  ASSERT_EQ(resolver.Resolve(8), (ChunkLocation(2, 5)));
+  ASSERT_EQ(resolver.Resolve(4), (ChunkLocation(2, 1)));
+  ASSERT_EQ(resolver.Resolve(3), (ChunkLocation(2, 0)));
+  ASSERT_EQ(resolver.Resolve(2), (ChunkLocation(1, 0)));
+  ASSERT_EQ(resolver.Resolve(1), (ChunkLocation(0, 1)));
+  ASSERT_EQ(resolver.Resolve(0), (ChunkLocation(0, 0)));
+  ASSERT_EQ(resolver.Resolve(1), (ChunkLocation(0, 1)));
+  ASSERT_EQ(resolver.Resolve(2), (ChunkLocation(1, 0)));
+  ASSERT_EQ(resolver.Resolve(3), (ChunkLocation(2, 0)));
+  ASSERT_EQ(resolver.Resolve(4), (ChunkLocation(2, 1)));
+  ASSERT_EQ(resolver.Resolve(8), (ChunkLocation(2, 5)));
+  ASSERT_EQ(resolver.Resolve(9), (ChunkLocation(2, 6)));
+  ASSERT_EQ(resolver.Resolve(10).chunk_index, 3);
+}
+
+template <typename T>
+class TestChunkResolverMany : public ::testing::Test {
+ public:
+  using IndexType = T;
+
+  Result<std::vector<ChunkLocation>> ResolveMany(
+      const ChunkResolver& resolver, const std::vector<IndexType>& logical_index_vec) {
+    const size_t n = logical_index_vec.size();
+    std::vector<IndexType> chunk_index_vec;
+    chunk_index_vec.resize(n);
+    std::vector<IndexType> index_in_chunk_vec;
+    index_in_chunk_vec.resize(n);
+    bool valid = resolver.ResolveMany<IndexType>(
+        static_cast<int64_t>(n), logical_index_vec.data(), chunk_index_vec.data(), 0,
+        index_in_chunk_vec.data());
+    if (ARROW_PREDICT_FALSE(!valid)) {
+      return Status::Invalid("index type doesn't fit possible chunk indexes");
+    }
+    std::vector<ChunkLocation> locations;
+    locations.reserve(n);
+    for (size_t i = 0; i < n; i++) {
+      auto chunk_index = static_cast<int64_t>(chunk_index_vec[i]);
+      auto index_in_chunk = static_cast<int64_t>(index_in_chunk_vec[i]);
+      locations.emplace_back(chunk_index, index_in_chunk);
+    }
+    return locations;
+  }
+
+  void CheckResolveMany(const ChunkResolver& resolver,
+                        const std::vector<IndexType>& logical_index_vec) {
+    ASSERT_OK_AND_ASSIGN(auto locations, ResolveMany(resolver, logical_index_vec));
+    EXPECT_EQ(logical_index_vec.size(), locations.size());
+    for (size_t i = 0; i < logical_index_vec.size(); i++) {
+      IndexType logical_index = logical_index_vec[i];
+      const auto expected = resolver.Resolve(logical_index);
+      ASSERT_LE(expected.chunk_index, resolver.num_chunks());
+      if (expected.chunk_index == resolver.num_chunks()) {
+        // index_in_chunk is undefined in this case
+        ASSERT_EQ(locations[i].chunk_index, expected.chunk_index);
+      } else {
+        ASSERT_EQ(locations[i], expected);
+      }
+    }
+  }
+
+  void TestBasics() {
+    std::vector<IndexType> logical_index_vec;
+
+    ChunkResolver empty(std::vector<int64_t>({0}));  // []
+    logical_index_vec = {0, 0};
+    CheckResolveMany(empty, logical_index_vec);
+
+    ChunkResolver one(std::vector<int64_t>({0, 1}));  // [[0]]
+    logical_index_vec = {1, 0, 1};
+    CheckResolveMany(one, logical_index_vec);
+
+    ChunkResolver one_and_empty(std::vector<int64_t>({0, 1, 1, 1}));  // [[0], [], []]
+    logical_index_vec = {3, 2, 1, 0, 1, 2, 3};
+    CheckResolveMany(one_and_empty, logical_index_vec);
+
+    ChunkResolver one_one_one(std::vector<int64_t>({0, 1, 2, 3}));  // [[0], [1], [2]]
+    logical_index_vec = {3, 2, 1, 0, 1, 2, 3};
+    CheckResolveMany(one_one_one, logical_index_vec);
+
+    ChunkResolver resolver(std::vector<int64_t>({0, 2, 3, 10}));  // [[0, 1], [2], [3..9]]
+    logical_index_vec = {10, 9, 8, 4, 3, 2, 1, 0, 1, 2, 3, 4, 8, 9, 10};
+    CheckResolveMany(resolver, logical_index_vec);
+  }
+
+  void TestOutOfBounds() {
+    ChunkResolver resolver(std::vector<int64_t>({0, 2, 3, 10}));  // [[0, 1], [2], [3..9]]
+
+    std::vector<IndexType> logical_index_vec = {10, 11, 12, 13, 14, 13, 11, 10};
+    ASSERT_OK_AND_ASSIGN(auto locations, ResolveMany(resolver, logical_index_vec));
+    EXPECT_EQ(logical_index_vec.size(), locations.size());
+    for (size_t i = 0; i < logical_index_vec.size(); i++) {
+      ASSERT_EQ(locations[i].chunk_index, resolver.num_chunks());
+    }
+
+    if constexpr (std::is_signed_v<IndexType>) {
+      std::vector<IndexType> logical_index_vec = {-1, -2, -3, -4, INT8_MIN};
+
+      ChunkResolver resolver(std::vector<int64_t>({0, 2, 128}));  // [[0, 1], [2..127]]
+      ASSERT_OK_AND_ASSIGN(auto locations, ResolveMany(resolver, logical_index_vec));
+      EXPECT_EQ(logical_index_vec.size(), locations.size());
+      for (size_t i = 0; i < logical_index_vec.size(); i++) {
+        // All the negative indices are greater than resolver.logical_array_length()-1
+        // when cast to uint8_t.
+        ASSERT_EQ(locations[i].chunk_index, resolver.num_chunks());
+      }
+
+      if constexpr (sizeof(IndexType) == 1) {
+        ChunkResolver resolver(std::vector<int64_t>(
+            {0, 2, 128, 129, 256}));  // [[0, 1], [2..127], [128], [129, 255]]
+        ASSERT_OK_AND_ASSIGN(auto locations, ResolveMany(resolver, logical_index_vec));
+        EXPECT_EQ(logical_index_vec.size(), locations.size());
+        for (size_t i = 0; i < logical_index_vec.size(); i++) {
+          if constexpr (sizeof(IndexType) == 1) {
+            // All the negative 8-bit indices are SMALLER than
+            // resolver.logical_array_length()=256 when cast to 8-bit unsigned integers.
+            // So the resolved locations might look valid, but they should not be trusted.
+            ASSERT_LT(locations[i].chunk_index, resolver.num_chunks());
+          } else {
+            // All the negative indices are greater than resolver.logical_array_length()
+            // when cast to 16/32/64-bit unsigned integers.
+            ASSERT_EQ(locations[i].chunk_index, resolver.num_chunks());
+          }
+        }
+      }
+    }
+  }
+
+  void TestOverflow() {
+    const int64_t kMaxIndex = std::is_signed_v<IndexType> ? 127 : 255;
+    std::vector<IndexType> logical_index_vec = {0, 1, 2,
+                                                static_cast<IndexType>(kMaxIndex)};
+
+    // Overflows are rare because to make them possible, we need more chunks
+    // than logical elements in the ChunkedArray. That requires at least one
+    // empty chunk.
+    std::vector<int64_t> offsets;
+    for (int64_t i = 0; i <= kMaxIndex; i++) {
+      offsets.push_back(i);
+    }
+    ChunkResolver resolver{offsets};
+    ASSERT_OK(ResolveMany(resolver, logical_index_vec));
+
+    offsets.push_back(kMaxIndex);  // adding an empty chunk
+    ChunkResolver resolver_with_empty{offsets};
+    if (sizeof(IndexType) == 1) {
+      ASSERT_NOT_OK(ResolveMany(resolver_with_empty, logical_index_vec));
+    } else {
+      ASSERT_OK(ResolveMany(resolver_with_empty, logical_index_vec));
+    }
+  }
+};
+
+TYPED_TEST_SUITE(TestChunkResolverMany, IndexTypes);
+
+TYPED_TEST(TestChunkResolverMany, Basics) { this->TestBasics(); }
+TYPED_TEST(TestChunkResolverMany, OutOfBounds) { this->TestOutOfBounds(); }
+TYPED_TEST(TestChunkResolverMany, Overflow) { this->TestOverflow(); }
+
 }  // namespace arrow
diff --git a/cpp/src/arrow/compare.cc b/cpp/src/arrow/compare.cc
index bb632e2eb912d..e983b47e39dc4 100644
--- a/cpp/src/arrow/compare.cc
+++ b/cpp/src/arrow/compare.cc
@@ -44,6 +44,7 @@
 #include "arrow/util/bitmap_ops.h"
 #include "arrow/util/bitmap_reader.h"
 #include "arrow/util/checked_cast.h"
+#include "arrow/util/float16.h"
 #include "arrow/util/key_value_metadata.h"
 #include "arrow/util/logging.h"
 #include "arrow/util/macros.h"
@@ -59,6 +60,7 @@ using internal::BitmapReader;
 using internal::BitmapUInt64Reader;
 using internal::checked_cast;
 using internal::OptionalBitmapEquals;
+using util::Float16;
 
 // ----------------------------------------------------------------------
 // Public method implementations
@@ -95,6 +97,30 @@ struct FloatingEquality {
   const T epsilon;
 };
 
+// For half-float equality.
+template <typename Flags>
+struct FloatingEquality<uint16_t, Flags> {
+  explicit FloatingEquality(const EqualOptions& options)
+      : epsilon(static_cast<float>(options.atol())) {}
+
+  bool operator()(uint16_t x, uint16_t y) const {
+    Float16 f_x = Float16::FromBits(x);
+    Float16 f_y = Float16::FromBits(y);
+    if (x == y) {
+      return Flags::signed_zeros_equal || (f_x.signbit() == f_y.signbit());
+    }
+    if (Flags::nans_equal && f_x.is_nan() && f_y.is_nan()) {
+      return true;
+    }
+    if (Flags::approximate && (fabs(f_x.ToFloat() - f_y.ToFloat()) <= epsilon)) {
+      return true;
+    }
+    return false;
+  }
+
+  const float epsilon;
+};
+
 template <typename T, typename Visitor>
 struct FloatingEqualityDispatcher {
   const EqualOptions& options;
@@ -259,6 +285,8 @@ class RangeDataEqualsImpl {
 
   Status Visit(const DoubleType& type) { return CompareFloating(type); }
 
+  Status Visit(const HalfFloatType& type) { return CompareFloating(type); }
+
   // Also matches StringType
   Status Visit(const BinaryType& type) { return CompareBinary(type); }
 
@@ -863,6 +891,8 @@ class ScalarEqualsVisitor {
 
   Status Visit(const DoubleScalar& left) { return CompareFloating(left); }
 
+  Status Visit(const HalfFloatScalar& left) { return CompareFloating(left); }
+
   template <typename T>
   enable_if_t<std::is_base_of<BaseBinaryScalar, T>::value, Status> Visit(const T& left) {
     const auto& right = checked_cast<const BaseBinaryScalar&>(right_);
diff --git a/cpp/src/arrow/compute/CMakeLists.txt b/cpp/src/arrow/compute/CMakeLists.txt
index badcf4f2f26ac..0a8018cd580cf 100644
--- a/cpp/src/arrow/compute/CMakeLists.txt
+++ b/cpp/src/arrow/compute/CMakeLists.txt
@@ -90,7 +90,9 @@ add_arrow_test(internals_test
                light_array_test.cc
                registry_test.cc
                key_hash_test.cc
-               row/compare_test.cc)
+               row/compare_test.cc
+               row/grouper_test.cc
+               util_internal_test.cc)
 
 add_arrow_compute_test(expression_test SOURCES expression_test.cc)
 
diff --git a/cpp/src/arrow/compute/api_scalar.cc b/cpp/src/arrow/compute/api_scalar.cc
index eaec940556361..7c3bc46650e9f 100644
--- a/cpp/src/arrow/compute/api_scalar.cc
+++ b/cpp/src/arrow/compute/api_scalar.cc
@@ -341,7 +341,8 @@ static auto kMatchSubstringOptionsType = GetFunctionOptionsType<MatchSubstringOp
 static auto kNullOptionsType = GetFunctionOptionsType<NullOptions>(
     DataMember("nan_is_null", &NullOptions::nan_is_null));
 static auto kPadOptionsType = GetFunctionOptionsType<PadOptions>(
-    DataMember("width", &PadOptions::width), DataMember("padding", &PadOptions::padding));
+    DataMember("width", &PadOptions::width), DataMember("padding", &PadOptions::padding),
+    DataMember("lean_left_on_odd_padding", &PadOptions::lean_left_on_odd_padding));
 static auto kReplaceSliceOptionsType = GetFunctionOptionsType<ReplaceSliceOptions>(
     DataMember("start", &ReplaceSliceOptions::start),
     DataMember("stop", &ReplaceSliceOptions::stop),
@@ -480,10 +481,11 @@ NullOptions::NullOptions(bool nan_is_null)
     : FunctionOptions(internal::kNullOptionsType), nan_is_null(nan_is_null) {}
 constexpr char NullOptions::kTypeName[];
 
-PadOptions::PadOptions(int64_t width, std::string padding)
+PadOptions::PadOptions(int64_t width, std::string padding, bool lean_left_on_odd_padding)
     : FunctionOptions(internal::kPadOptionsType),
       width(width),
-      padding(std::move(padding)) {}
+      padding(std::move(padding)),
+      lean_left_on_odd_padding(lean_left_on_odd_padding) {}
 PadOptions::PadOptions() : PadOptions(0, " ") {}
 constexpr char PadOptions::kTypeName[];
 
diff --git a/cpp/src/arrow/compute/api_scalar.h b/cpp/src/arrow/compute/api_scalar.h
index bad34f4a37881..947474e5962d0 100644
--- a/cpp/src/arrow/compute/api_scalar.h
+++ b/cpp/src/arrow/compute/api_scalar.h
@@ -358,7 +358,8 @@ class ARROW_EXPORT StrftimeOptions : public FunctionOptions {
 
 class ARROW_EXPORT PadOptions : public FunctionOptions {
  public:
-  explicit PadOptions(int64_t width, std::string padding = " ");
+  explicit PadOptions(int64_t width, std::string padding = " ",
+                      bool lean_left_on_odd_padding = true);
   PadOptions();
   static constexpr char const kTypeName[] = "PadOptions";
 
@@ -366,6 +367,10 @@ class ARROW_EXPORT PadOptions : public FunctionOptions {
   int64_t width;
   /// What to pad the string with. Should be one codepoint (Unicode)/byte (ASCII).
   std::string padding;
+  /// What to do if there is an odd number of padding characters (in case of centered
+  /// padding). Defaults to aligning on the left (i.e. adding the extra padding character
+  /// on the right)
+  bool lean_left_on_odd_padding = true;
 };
 
 class ARROW_EXPORT TrimOptions : public FunctionOptions {
diff --git a/cpp/src/arrow/compute/api_vector.cc b/cpp/src/arrow/compute/api_vector.cc
index d47ee42ebf239..f0d5c0fcc3d72 100644
--- a/cpp/src/arrow/compute/api_vector.cc
+++ b/cpp/src/arrow/compute/api_vector.cc
@@ -153,6 +153,8 @@ static auto kRankOptionsType = GetFunctionOptionsType<RankOptions>(
     DataMember("tiebreaker", &RankOptions::tiebreaker));
 static auto kPairwiseOptionsType = GetFunctionOptionsType<PairwiseOptions>(
     DataMember("periods", &PairwiseOptions::periods));
+static auto kListFlattenOptionsType = GetFunctionOptionsType<ListFlattenOptions>(
+    DataMember("recursive", &ListFlattenOptions::recursive));
 }  // namespace
 }  // namespace internal
 
@@ -224,6 +226,10 @@ PairwiseOptions::PairwiseOptions(int64_t periods)
     : FunctionOptions(internal::kPairwiseOptionsType), periods(periods) {}
 constexpr char PairwiseOptions::kTypeName[];
 
+ListFlattenOptions::ListFlattenOptions(bool recursive)
+    : FunctionOptions(internal::kListFlattenOptionsType), recursive(recursive) {}
+constexpr char ListFlattenOptions::kTypeName[];
+
 namespace internal {
 void RegisterVectorOptions(FunctionRegistry* registry) {
   DCHECK_OK(registry->AddFunctionOptionsType(kFilterOptionsType));
@@ -237,6 +243,7 @@ void RegisterVectorOptions(FunctionRegistry* registry) {
   DCHECK_OK(registry->AddFunctionOptionsType(kCumulativeOptionsType));
   DCHECK_OK(registry->AddFunctionOptionsType(kRankOptionsType));
   DCHECK_OK(registry->AddFunctionOptionsType(kPairwiseOptionsType));
+  DCHECK_OK(registry->AddFunctionOptionsType(kListFlattenOptionsType));
 }
 }  // namespace internal
 
diff --git a/cpp/src/arrow/compute/api_vector.h b/cpp/src/arrow/compute/api_vector.h
index 919572f16ee69..e5bcc37329661 100644
--- a/cpp/src/arrow/compute/api_vector.h
+++ b/cpp/src/arrow/compute/api_vector.h
@@ -245,6 +245,18 @@ class ARROW_EXPORT PairwiseOptions : public FunctionOptions {
   int64_t periods = 1;
 };
 
+/// \brief Options for list_flatten function
+class ARROW_EXPORT ListFlattenOptions : public FunctionOptions {
+ public:
+  explicit ListFlattenOptions(bool recursive = false);
+  static constexpr char const kTypeName[] = "ListFlattenOptions";
+  static ListFlattenOptions Defaults() { return ListFlattenOptions(); }
+
+  /// \brief If true, the list is flattened recursively until a non-list
+  /// array is formed.
+  bool recursive = false;
+};
+
 /// @}
 
 /// \brief Filter with a boolean selection filter
diff --git a/cpp/src/arrow/compute/exec.cc b/cpp/src/arrow/compute/exec.cc
index 28dcf493fa294..05c4936482b0b 100644
--- a/cpp/src/arrow/compute/exec.cc
+++ b/cpp/src/arrow/compute/exec.cc
@@ -480,7 +480,7 @@ struct NullGeneralization {
     if (dtype_id == Type::NA) {
       return ALL_NULL;
     }
-    if (!arrow::internal::HasValidityBitmap(dtype_id)) {
+    if (!arrow::internal::may_have_validity_bitmap(dtype_id)) {
       return ALL_VALID;
     }
     if (value.is_scalar()) {
@@ -923,7 +923,7 @@ class ScalarExecutor : public KernelExecutorImpl<ScalarKernel> {
       DCHECK(output.is_array_data());
 
       // Emit a result for each chunk
-      RETURN_NOT_OK(EmitResult(std::move(output.array_data()), listener));
+      RETURN_NOT_OK(EmitResult(output.array_data(), listener));
     }
     return Status::OK();
   }
@@ -1107,7 +1107,7 @@ class VectorExecutor : public KernelExecutorImpl<VectorKernel> {
       RETURN_NOT_OK(PropagateNulls(kernel_ctx_, span, out.array_data().get()));
     }
     RETURN_NOT_OK(kernel_->exec(kernel_ctx_, span, &out));
-    return EmitResult(std::move(out.array_data()), listener);
+    return EmitResult(out.array_data(), listener);
   }
 
   Status ExecChunked(const ExecBatch& batch, ExecListener* listener) {
@@ -1116,10 +1116,10 @@ class VectorExecutor : public KernelExecutorImpl<VectorKernel> {
     ARROW_ASSIGN_OR_RAISE(out.value, PrepareOutput(batch.length));
     RETURN_NOT_OK(kernel_->exec_chunked(kernel_ctx_, batch, &out));
     if (out.is_array()) {
-      return EmitResult(std::move(out.array()), listener);
+      return EmitResult(out.array(), listener);
     } else {
       DCHECK(out.is_chunked_array());
-      return EmitResult(std::move(out.chunked_array()), listener);
+      return EmitResult(out.chunked_array(), listener);
     }
   }
 
diff --git a/cpp/src/arrow/compute/expression.cc b/cpp/src/arrow/compute/expression.cc
index 532869b3453a7..33e5928c2865d 100644
--- a/cpp/src/arrow/compute/expression.cc
+++ b/cpp/src/arrow/compute/expression.cc
@@ -763,9 +763,7 @@ Result<Datum> ExecuteScalarExpression(const Expression& expr, const ExecBatch& i
   for (size_t i = 0; i < arguments.size(); ++i) {
     ARROW_ASSIGN_OR_RAISE(
         arguments[i], ExecuteScalarExpression(call->arguments[i], input, exec_context));
-    if (arguments[i].is_array()) {
-      all_scalar = false;
-    }
+    all_scalar &= arguments[i].is_scalar();
   }
 
   int64_t input_length;
@@ -1645,7 +1643,7 @@ Expression and_(const std::vector<Expression>& operands) {
 
   Expression folded = operands.front();
   for (auto it = operands.begin() + 1; it != operands.end(); ++it) {
-    folded = and_(std::move(folded), std::move(*it));
+    folded = and_(std::move(folded), *it);
   }
   return folded;
 }
@@ -1659,7 +1657,7 @@ Expression or_(const std::vector<Expression>& operands) {
 
   Expression folded = operands.front();
   for (auto it = operands.begin() + 1; it != operands.end(); ++it) {
-    folded = or_(std::move(folded), std::move(*it));
+    folded = or_(std::move(folded), *it);
   }
   return folded;
 }
diff --git a/cpp/src/arrow/compute/expression_test.cc b/cpp/src/arrow/compute/expression_test.cc
index 30bd882b2c039..d94a17b6ffadf 100644
--- a/cpp/src/arrow/compute/expression_test.cc
+++ b/cpp/src/arrow/compute/expression_test.cc
@@ -909,6 +909,41 @@ TEST(Expression, ExecuteCallWithNoArguments) {
   EXPECT_EQ(actual.length(), kCount);
 }
 
+TEST(Expression, ExecuteChunkedArray) {
+  // GH-41923: compute should generate the right result if input
+  // ExecBatch is `chunked_array`.
+  auto input_schema = struct_({field("a", struct_({
+                                              field("a", float64()),
+                                              field("b", float64()),
+                                          }))});
+
+  auto chunked_array_input = ChunkedArrayFromJSON(input_schema, {R"([
+    {"a": {"a": 6.125, "b": 3.375}},
+    {"a": {"a": 0.0,   "b": 1}}
+  ])",
+                                                                 R"([
+    {"a": {"a": -1,    "b": 4.75}}
+  ])"});
+
+  ASSERT_OK_AND_ASSIGN(auto table_input,
+                       Table::FromChunkedStructArray(chunked_array_input));
+
+  auto expr = add(field_ref(FieldRef("a", "a")), field_ref(FieldRef("a", "b")));
+
+  ASSERT_OK_AND_ASSIGN(expr, expr.Bind(input_schema));
+  std::vector<Datum> inputs{table_input->column(0)};
+  ExecBatch batch{inputs, 3};
+
+  ASSERT_OK_AND_ASSIGN(Datum res, ExecuteScalarExpression(expr, batch));
+
+  AssertDatumsEqual(res, ArrayFromJSON(float64(),
+                                       R"([
+    9.5,
+    1,
+    3.75
+  ])"));
+}
+
 TEST(Expression, ExecuteDictionaryTransparent) {
   ExpectExecute(
       equal(field_ref("a"), field_ref("b")),
diff --git a/cpp/src/arrow/compute/function_internal.h b/cpp/src/arrow/compute/function_internal.h
index 653273ef0fac2..9d8928466baa5 100644
--- a/cpp/src/arrow/compute/function_internal.h
+++ b/cpp/src/arrow/compute/function_internal.h
@@ -684,12 +684,13 @@ const FunctionOptionsType* GetFunctionOptionsType(const Properties&... propertie
       auto options = std::make_unique<Options>();
       RETURN_NOT_OK(
           FromStructScalarImpl<Options>(options.get(), scalar, properties_).status_);
-      return std::move(options);
+      // R build with openSUSE155 requires an explicit unique_ptr construction
+      return std::unique_ptr<FunctionOptions>(std::move(options));
     }
     std::unique_ptr<FunctionOptions> Copy(const FunctionOptions& options) const override {
       auto out = std::make_unique<Options>();
       CopyImpl<Options>(out.get(), checked_cast<const Options&>(options), properties_);
-      return std::move(out);
+      return out;
     }
 
    private:
diff --git a/cpp/src/arrow/compute/function_test.cc b/cpp/src/arrow/compute/function_test.cc
index 66d38ecd64d49..c269de0763217 100644
--- a/cpp/src/arrow/compute/function_test.cc
+++ b/cpp/src/arrow/compute/function_test.cc
@@ -102,6 +102,7 @@ TEST(FunctionOptions, Equality) {
 #endif
   options.emplace_back(new PadOptions(5, " "));
   options.emplace_back(new PadOptions(10, "A"));
+  options.emplace_back(new PadOptions(10, "A", false));
   options.emplace_back(new TrimOptions(" "));
   options.emplace_back(new TrimOptions("abc"));
   options.emplace_back(new SliceOptions(/*start=*/1));
diff --git a/cpp/src/arrow/compute/kernel.cc b/cpp/src/arrow/compute/kernel.cc
index fd554ba3d83c5..5c87ef2cd0561 100644
--- a/cpp/src/arrow/compute/kernel.cc
+++ b/cpp/src/arrow/compute/kernel.cc
@@ -75,7 +75,7 @@ Result<std::unique_ptr<KernelState>> ScalarAggregateKernel::MergeAll(
   for (auto& state : states) {
     RETURN_NOT_OK(kernel->merge(ctx, std::move(*state), out.get()));
   }
-  return std::move(out);
+  return out;
 }
 
 // ----------------------------------------------------------------------
@@ -361,7 +361,8 @@ size_t InputType::Hash() const {
     case InputType::EXACT_TYPE:
       hash_combine(result, type_->Hash());
       break;
-    default:
+    case InputType::ANY_TYPE:
+    case InputType::USE_TYPE_MATCHER:
       break;
   }
   return result;
@@ -378,10 +379,8 @@ std::string InputType::ToString() const {
       break;
     case InputType::USE_TYPE_MATCHER: {
       ss << type_matcher_->ToString();
-    } break;
-    default:
-      DCHECK(false);
       break;
+    }
   }
   return ss.str();
 }
@@ -400,9 +399,8 @@ bool InputType::Equals(const InputType& other) const {
       return type_->Equals(*other.type_);
     case InputType::USE_TYPE_MATCHER:
       return type_matcher_->Equals(*other.type_matcher_);
-    default:
-      return false;
   }
+  return false;
 }
 
 bool InputType::Matches(const DataType& type) const {
@@ -411,21 +409,23 @@ bool InputType::Matches(const DataType& type) const {
       return type_->Equals(type);
     case InputType::USE_TYPE_MATCHER:
       return type_matcher_->Matches(type);
-    default:
-      // ANY_TYPE
+    case InputType::ANY_TYPE:
       return true;
   }
+  return false;
 }
 
 bool InputType::Matches(const Datum& value) const {
   switch (value.kind()) {
+    case Datum::NONE:
+    case Datum::RECORD_BATCH:
+    case Datum::TABLE:
+      DCHECK(false) << "Matches expects ARRAY, CHUNKED_ARRAY or SCALAR";
+      return false;
     case Datum::ARRAY:
     case Datum::CHUNKED_ARRAY:
     case Datum::SCALAR:
       break;
-    default:
-      DCHECK(false);
-      return false;
   }
   return Matches(*value.type());
 }
@@ -445,11 +445,13 @@ const TypeMatcher& InputType::type_matcher() const {
 
 Result<TypeHolder> OutputType::Resolve(KernelContext* ctx,
                                        const std::vector<TypeHolder>& types) const {
-  if (kind_ == OutputType::FIXED) {
-    return type_.get();
-  } else {
-    return resolver_(ctx, types);
+  switch (kind_) {
+    case OutputType::FIXED:
+      return type_;
+    case OutputType::COMPUTED:
+      break;
   }
+  return resolver_(ctx, types);
 }
 
 const std::shared_ptr<DataType>& OutputType::type() const {
@@ -463,11 +465,13 @@ const OutputType::Resolver& OutputType::resolver() const {
 }
 
 std::string OutputType::ToString() const {
-  if (kind_ == OutputType::FIXED) {
-    return type_->ToString();
-  } else {
-    return "computed";
+  switch (kind_) {
+    case OutputType::FIXED:
+      return type_->ToString();
+    case OutputType::COMPUTED:
+      break;
   }
+  return "computed";
 }
 
 // ----------------------------------------------------------------------
diff --git a/cpp/src/arrow/compute/kernels/CMakeLists.txt b/cpp/src/arrow/compute/kernels/CMakeLists.txt
index afb30996eac15..7c7b9c8b68d45 100644
--- a/cpp/src/arrow/compute/kernels/CMakeLists.txt
+++ b/cpp/src/arrow/compute/kernels/CMakeLists.txt
@@ -81,6 +81,7 @@ add_arrow_benchmark(scalar_boolean_benchmark PREFIX "arrow-compute")
 add_arrow_benchmark(scalar_cast_benchmark PREFIX "arrow-compute")
 add_arrow_benchmark(scalar_compare_benchmark PREFIX "arrow-compute")
 add_arrow_benchmark(scalar_if_else_benchmark PREFIX "arrow-compute")
+add_arrow_benchmark(scalar_list_benchmark PREFIX "arrow-compute")
 add_arrow_benchmark(scalar_random_benchmark PREFIX "arrow-compute")
 add_arrow_benchmark(scalar_round_benchmark PREFIX "arrow-compute")
 add_arrow_benchmark(scalar_set_lookup_benchmark PREFIX "arrow-compute")
diff --git a/cpp/src/arrow/compute/kernels/codegen_internal.cc b/cpp/src/arrow/compute/kernels/codegen_internal.cc
index 00a833742f957..0fd9cae7a8d71 100644
--- a/cpp/src/arrow/compute/kernels/codegen_internal.cc
+++ b/cpp/src/arrow/compute/kernels/codegen_internal.cc
@@ -23,6 +23,7 @@
 #include <mutex>
 #include <vector>
 
+#include "arrow/compute/api_vector.h"
 #include "arrow/type_fwd.h"
 
 namespace arrow {
@@ -56,9 +57,23 @@ Result<TypeHolder> LastType(KernelContext*, const std::vector<TypeHolder>& types
   return types.back();
 }
 
-Result<TypeHolder> ListValuesType(KernelContext*, const std::vector<TypeHolder>& args) {
-  const auto& list_type = checked_cast<const BaseListType&>(*args[0].type);
-  return list_type.value_type().get();
+Result<TypeHolder> ListValuesType(KernelContext* ctx,
+                                  const std::vector<TypeHolder>& args) {
+  auto list_type = checked_cast<const BaseListType*>(args[0].type);
+  auto value_type = list_type->value_type().get();
+
+  auto recursive =
+      ctx->state() ? OptionsWrapper<ListFlattenOptions>::Get(ctx).recursive : false;
+  if (!recursive) {
+    return value_type;
+  }
+
+  for (auto value_kind = value_type->id();
+       is_list(value_kind) || is_list_view(value_kind); value_kind = value_type->id()) {
+    list_type = checked_cast<const BaseListType*>(list_type->value_type().get());
+    value_type = list_type->value_type().get();
+  }
+  return value_type;
 }
 
 void EnsureDictionaryDecoded(std::vector<TypeHolder>* types) {
diff --git a/cpp/src/arrow/compute/kernels/codegen_internal.h b/cpp/src/arrow/compute/kernels/codegen_internal.h
index 72b29057b82e0..9e46a21887f8c 100644
--- a/cpp/src/arrow/compute/kernels/codegen_internal.h
+++ b/cpp/src/arrow/compute/kernels/codegen_internal.h
@@ -369,43 +369,6 @@ struct UnboxScalar<Decimal256Type> {
   }
 };
 
-template <typename Type, typename Enable = void>
-struct BoxScalar;
-
-template <typename Type>
-struct BoxScalar<Type, enable_if_has_c_type<Type>> {
-  using T = typename GetOutputType<Type>::T;
-  static void Box(T val, Scalar* out) {
-    // Enables BoxScalar<Int64Type> to work on a (for example) Time64Scalar
-    T* mutable_data = reinterpret_cast<T*>(
-        checked_cast<::arrow::internal::PrimitiveScalarBase*>(out)->mutable_data());
-    *mutable_data = val;
-  }
-};
-
-template <typename Type>
-struct BoxScalar<Type, enable_if_base_binary<Type>> {
-  using T = typename GetOutputType<Type>::T;
-  using ScalarType = typename TypeTraits<Type>::ScalarType;
-  static void Box(T val, Scalar* out) {
-    checked_cast<ScalarType*>(out)->value = std::make_shared<Buffer>(val);
-  }
-};
-
-template <>
-struct BoxScalar<Decimal128Type> {
-  using T = Decimal128;
-  using ScalarType = Decimal128Scalar;
-  static void Box(T val, Scalar* out) { checked_cast<ScalarType*>(out)->value = val; }
-};
-
-template <>
-struct BoxScalar<Decimal256Type> {
-  using T = Decimal256;
-  using ScalarType = Decimal256Scalar;
-  static void Box(T val, Scalar* out) { checked_cast<ScalarType*>(out)->value = val; }
-};
-
 // A VisitArraySpanInline variant that calls its visitor function with logical
 // values, such as Decimal128 rather than std::string_view.
 
@@ -460,7 +423,8 @@ static void VisitTwoArrayValuesInline(const ArraySpan& arr0, const ArraySpan& ar
 
 Result<TypeHolder> FirstType(KernelContext*, const std::vector<TypeHolder>& types);
 Result<TypeHolder> LastType(KernelContext*, const std::vector<TypeHolder>& types);
-Result<TypeHolder> ListValuesType(KernelContext*, const std::vector<TypeHolder>& types);
+Result<TypeHolder> ListValuesType(KernelContext* ctx,
+                                  const std::vector<TypeHolder>& types);
 
 // ----------------------------------------------------------------------
 // Helpers for iterating over common DataType instances for adding kernels to
diff --git a/cpp/src/arrow/compute/kernels/gather_internal.h b/cpp/src/arrow/compute/kernels/gather_internal.h
new file mode 100644
index 0000000000000..4c161533a7277
--- /dev/null
+++ b/cpp/src/arrow/compute/kernels/gather_internal.h
@@ -0,0 +1,306 @@
+// 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.
+
+#pragma once
+
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+
+#include "arrow/array/data.h"
+#include "arrow/util/bit_block_counter.h"
+#include "arrow/util/bit_run_reader.h"
+#include "arrow/util/bit_util.h"
+#include "arrow/util/bitmap_ops.h"
+#include "arrow/util/macros.h"
+
+// Implementation helpers for kernels that need to load/gather fixed-width
+// data from multiple, arbitrary indices.
+//
+// https://en.wikipedia.org/wiki/Gather/scatter_(vector_addressing)
+
+namespace arrow::internal {
+
+// CRTP [1] base class for Gather that provides a gathering loop in terms of
+// Write*() methods that must be implemented by the derived class.
+//
+// [1] https://en.wikipedia.org/wiki/Curiously_recurring_template_pattern
+template <class GatherImpl>
+class GatherBaseCRTP {
+ public:
+  // Output offset is not supported by Gather and idx is supposed to have offset
+  // pre-applied. idx_validity parameters on functions can use the offset they
+  // carry to read the validity bitmap as bitmaps can't have pre-applied offsets
+  // (they might not align to byte boundaries).
+
+  GatherBaseCRTP() = default;
+  ARROW_DISALLOW_COPY_AND_ASSIGN(GatherBaseCRTP);
+  ARROW_DEFAULT_MOVE_AND_ASSIGN(GatherBaseCRTP);
+
+ protected:
+  ARROW_FORCE_INLINE int64_t ExecuteNoNulls(int64_t idx_length) {
+    auto* self = static_cast<GatherImpl*>(this);
+    for (int64_t position = 0; position < idx_length; position++) {
+      self->WriteValue(position);
+    }
+    return idx_length;
+  }
+
+  // See derived Gather classes below for the meaning of the parameters, pre and
+  // post-conditions.
+  //
+  // src_validity is not necessarily the source of the values that are being
+  // gathered (e.g. the source could be a nested fixed-size list array and the
+  // values being gathered are from the innermost buffer), so the ArraySpan is
+  // used solely to check for nulls in the source values and nothing else.
+  //
+  // idx_length is the number of elements in idx and consequently the number of
+  // bits that might be written to out_is_valid. Member `Write*()` functions will be
+  // called with positions from 0 to idx_length - 1.
+  //
+  // If `kOutputIsZeroInitialized` is true, then `WriteZero()` or `WriteZeroSegment()`
+  // doesn't have to be called for resulting null positions. A position is
+  // considered null if either the index or the source value is null at that
+  // position.
+  template <bool kOutputIsZeroInitialized, typename IndexCType>
+  ARROW_FORCE_INLINE int64_t ExecuteWithNulls(const ArraySpan& src_validity,
+                                              int64_t idx_length, const IndexCType* idx,
+                                              const ArraySpan& idx_validity,
+                                              uint8_t* out_is_valid) {
+    auto* self = static_cast<GatherImpl*>(this);
+    OptionalBitBlockCounter indices_bit_counter(idx_validity.buffers[0].data,
+                                                idx_validity.offset, idx_length);
+    int64_t position = 0;
+    int64_t valid_count = 0;
+    while (position < idx_length) {
+      BitBlockCount block = indices_bit_counter.NextBlock();
+      if (!src_validity.MayHaveNulls()) {
+        // Source values are never null, so things are easier
+        valid_count += block.popcount;
+        if (block.popcount == block.length) {
+          // Fastest path: neither source values nor index nulls
+          bit_util::SetBitsTo(out_is_valid, position, block.length, true);
+          for (int64_t i = 0; i < block.length; ++i) {
+            self->WriteValue(position);
+            ++position;
+          }
+        } else if (block.popcount > 0) {
+          // Slow path: some indices but not all are null
+          for (int64_t i = 0; i < block.length; ++i) {
+            ARROW_COMPILER_ASSUME(idx_validity.buffers[0].data != nullptr);
+            if (idx_validity.IsValid(position)) {
+              // index is not null
+              bit_util::SetBit(out_is_valid, position);
+              self->WriteValue(position);
+            } else if constexpr (!kOutputIsZeroInitialized) {
+              self->WriteZero(position);
+            }
+            ++position;
+          }
+        } else {
+          self->WriteZeroSegment(position, block.length);
+          position += block.length;
+        }
+      } else {
+        // Source values may be null, so we must do random access into src_validity
+        if (block.popcount == block.length) {
+          // Faster path: indices are not null but source values may be
+          for (int64_t i = 0; i < block.length; ++i) {
+            ARROW_COMPILER_ASSUME(src_validity.buffers[0].data != nullptr);
+            if (src_validity.IsValid(idx[position])) {
+              // value is not null
+              self->WriteValue(position);
+              bit_util::SetBit(out_is_valid, position);
+              ++valid_count;
+            } else if constexpr (!kOutputIsZeroInitialized) {
+              self->WriteZero(position);
+            }
+            ++position;
+          }
+        } else if (block.popcount > 0) {
+          // Slow path: some but not all indices are null. Since we are doing
+          // random access in general we have to check the value nullness one by
+          // one.
+          for (int64_t i = 0; i < block.length; ++i) {
+            ARROW_COMPILER_ASSUME(src_validity.buffers[0].data != nullptr);
+            ARROW_COMPILER_ASSUME(idx_validity.buffers[0].data != nullptr);
+            if (idx_validity.IsValid(position) && src_validity.IsValid(idx[position])) {
+              // index is not null && value is not null
+              self->WriteValue(position);
+              bit_util::SetBit(out_is_valid, position);
+              ++valid_count;
+            } else if constexpr (!kOutputIsZeroInitialized) {
+              self->WriteZero(position);
+            }
+            ++position;
+          }
+        } else {
+          if constexpr (!kOutputIsZeroInitialized) {
+            self->WriteZeroSegment(position, block.length);
+          }
+          position += block.length;
+        }
+      }
+    }
+    return valid_count;
+  }
+};
+
+// A gather primitive for primitive fixed-width types with a integral byte width. If
+// `kWithFactor` is true, the actual width is a runtime multiple of `kValueWidthInbits`
+// (this can be useful for fixed-size list inputs and other input types with unusual byte
+// widths that don't deserve value specialization).
+template <int kValueWidthInBits, typename IndexCType, bool kWithFactor>
+class Gather : public GatherBaseCRTP<Gather<kValueWidthInBits, IndexCType, kWithFactor>> {
+ public:
+  static_assert(kValueWidthInBits >= 0 && kValueWidthInBits % 8 == 0);
+  static constexpr int kValueWidth = kValueWidthInBits / 8;
+
+ private:
+  const int64_t src_length_;  // number of elements of kValueWidth bytes in src_
+  const uint8_t* src_;
+  const int64_t idx_length_;  // number IndexCType elements in idx_
+  const IndexCType* idx_;
+  uint8_t* out_;
+  int64_t factor_;
+
+ public:
+  void WriteValue(int64_t position) {
+    if constexpr (kWithFactor) {
+      const int64_t scaled_factor = kValueWidth * factor_;
+      memcpy(out_ + position * scaled_factor, src_ + idx_[position] * scaled_factor,
+             scaled_factor);
+    } else {
+      memcpy(out_ + position * kValueWidth, src_ + idx_[position] * kValueWidth,
+             kValueWidth);
+    }
+  }
+
+  void WriteZero(int64_t position) {
+    if constexpr (kWithFactor) {
+      const int64_t scaled_factor = kValueWidth * factor_;
+      memset(out_ + position * scaled_factor, 0, scaled_factor);
+    } else {
+      memset(out_ + position * kValueWidth, 0, kValueWidth);
+    }
+  }
+
+  void WriteZeroSegment(int64_t position, int64_t length) {
+    if constexpr (kWithFactor) {
+      const int64_t scaled_factor = kValueWidth * factor_;
+      memset(out_ + position * scaled_factor, 0, length * scaled_factor);
+    } else {
+      memset(out_ + position * kValueWidth, 0, length * kValueWidth);
+    }
+  }
+
+ public:
+  Gather(int64_t src_length, const uint8_t* src, int64_t zero_src_offset,
+         int64_t idx_length, const IndexCType* idx, uint8_t* out, int64_t factor)
+      : src_length_(src_length),
+        src_(src),
+        idx_length_(idx_length),
+        idx_(idx),
+        out_(out),
+        factor_(factor) {
+    assert(zero_src_offset == 0);
+    assert(src && idx && out);
+    assert((kWithFactor || factor == 1) &&
+           "When kWithFactor is false, the factor is assumed to be 1 at compile time");
+  }
+
+  ARROW_FORCE_INLINE int64_t Execute() { return this->ExecuteNoNulls(idx_length_); }
+
+  /// \pre If kOutputIsZeroInitialized, then this->out_ has to be zero initialized.
+  /// \pre Bits in out_is_valid have to always be zero initialized.
+  /// \post The bits for the valid elements (and only those) are set in out_is_valid.
+  /// \post If !kOutputIsZeroInitialized, then positions in this->_out containing null
+  ///       elements have 0s written to them. This might be less efficient than
+  ///       zero-initializing first and calling this->Execute() afterwards.
+  /// \return The number of valid elements in out.
+  template <bool kOutputIsZeroInitialized = false>
+  ARROW_FORCE_INLINE int64_t Execute(const ArraySpan& src_validity,
+                                     const ArraySpan& idx_validity,
+                                     uint8_t* out_is_valid) {
+    assert(src_length_ == src_validity.length);
+    assert(idx_length_ == idx_validity.length);
+    assert(out_is_valid);
+    return this->template ExecuteWithNulls<kOutputIsZeroInitialized>(
+        src_validity, idx_length_, idx_, idx_validity, out_is_valid);
+  }
+};
+
+// A gather primitive for boolean inputs. Unlike its counterpart above,
+// this does not support passing a non-trivial factor parameter.
+template <typename IndexCType>
+class Gather</*kValueWidthInBits=*/1, IndexCType, /*kWithFactor=*/false>
+    : public GatherBaseCRTP<Gather<1, IndexCType, false>> {
+ private:
+  const int64_t src_length_;  // number of elements of bits bytes in src_ after offset
+  const uint8_t* src_;        // the boolean array data buffer in bits
+  const int64_t src_offset_;  // offset in bits
+  const int64_t idx_length_;  // number IndexCType elements in idx_
+  const IndexCType* idx_;
+  uint8_t* out_;  // output boolean array data buffer in bits
+
+ public:
+  Gather(int64_t src_length, const uint8_t* src, int64_t src_offset, int64_t idx_length,
+         const IndexCType* idx, uint8_t* out, int64_t factor)
+      : src_length_(src_length),
+        src_(src),
+        src_offset_(src_offset),
+        idx_length_(idx_length),
+        idx_(idx),
+        out_(out) {
+    assert(src && idx && out);
+    assert(factor == 1 &&
+           "factor != 1 is not supported when Gather is used to gather bits/booleans");
+  }
+
+  void WriteValue(int64_t position) {
+    bit_util::SetBitTo(out_, position,
+                       bit_util::GetBit(src_, src_offset_ + idx_[position]));
+  }
+
+  void WriteZero(int64_t position) { bit_util::ClearBit(out_, position); }
+
+  void WriteZeroSegment(int64_t position, int64_t block_length) {
+    bit_util::SetBitsTo(out_, position, block_length, false);
+  }
+
+  ARROW_FORCE_INLINE int64_t Execute() { return this->ExecuteNoNulls(idx_length_); }
+
+  /// \pre If kOutputIsZeroInitialized, then this->out_ has to be zero initialized.
+  /// \pre Bits in out_is_valid have to always be zero initialized.
+  /// \post The bits for the valid elements (and only those) are set in out_is_valid.
+  /// \post If !kOutputIsZeroInitialized, then positions in this->_out containing null
+  ///       elements have 0s written to them. This might be less efficient than
+  ///       zero-initializing first and calling this->Execute() afterwards.
+  /// \return The number of valid elements in out.
+  template <bool kOutputIsZeroInitialized = false>
+  ARROW_FORCE_INLINE int64_t Execute(const ArraySpan& src_validity,
+                                     const ArraySpan& idx_validity,
+                                     uint8_t* out_is_valid) {
+    assert(src_length_ == src_validity.length);
+    assert(idx_length_ == idx_validity.length);
+    assert(out_is_valid);
+    return this->template ExecuteWithNulls<kOutputIsZeroInitialized>(
+        src_validity, idx_length_, idx_, idx_validity, out_is_valid);
+  }
+};
+
+}  // namespace arrow::internal
diff --git a/cpp/src/arrow/compute/kernels/hash_aggregate.cc b/cpp/src/arrow/compute/kernels/hash_aggregate.cc
index 5052d8dd66694..54cd695421a93 100644
--- a/cpp/src/arrow/compute/kernels/hash_aggregate.cc
+++ b/cpp/src/arrow/compute/kernels/hash_aggregate.cc
@@ -83,7 +83,8 @@ Result<std::unique_ptr<KernelState>> HashAggregateInit(KernelContext* ctx,
                                                        const KernelInitArgs& args) {
   auto impl = std::make_unique<Impl>();
   RETURN_NOT_OK(impl->Init(ctx->exec_context(), args));
-  return std::move(impl);
+  // R build with openSUSE155 requires an explicit unique_ptr construction
+  return std::unique_ptr<KernelState>(std::move(impl));
 }
 
 Status HashAggregateResize(KernelContext* ctx, int64_t num_groups) {
@@ -813,7 +814,7 @@ struct GroupedMeanImpl
       (*null_count)++;
       bit_util::SetBitTo((*null_bitmap)->mutable_data(), i, false);
     }
-    return std::move(values);
+    return values;
   }
 
   std::shared_ptr<DataType> out_type() const override {
@@ -1114,7 +1115,8 @@ Result<std::unique_ptr<KernelState>> VarStdInit(KernelContext* ctx,
   auto impl = std::make_unique<GroupedVarStdImpl<T>>();
   impl->result_type_ = result_type;
   RETURN_NOT_OK(impl->Init(ctx->exec_context(), args));
-  return std::move(impl);
+  // R build with openSUSE155 requires an explicit unique_ptr construction
+  return std::unique_ptr<KernelState>(std::move(impl));
 }
 
 template <VarOrStd result_type>
@@ -1685,7 +1687,7 @@ Result<std::unique_ptr<KernelState>> MinMaxInit(KernelContext* ctx,
                                                 const KernelInitArgs& args) {
   ARROW_ASSIGN_OR_RAISE(auto impl, HashAggregateInit<GroupedMinMaxImpl<T>>(ctx, args));
   static_cast<GroupedMinMaxImpl<T>*>(impl.get())->type_ = args.inputs[0].GetSharedPtr();
-  return std::move(impl);
+  return impl;
 }
 
 template <MinOrMax min_or_max>
@@ -2188,7 +2190,7 @@ Result<std::unique_ptr<KernelState>> FirstLastInit(KernelContext* ctx,
   ARROW_ASSIGN_OR_RAISE(auto impl, HashAggregateInit<GroupedFirstLastImpl<T>>(ctx, args));
   static_cast<GroupedFirstLastImpl<T>*>(impl.get())->type_ =
       args.inputs[0].GetSharedPtr();
-  return std::move(impl);
+  return impl;
 }
 
 template <FirstOrLast first_or_last>
@@ -2597,7 +2599,7 @@ Result<std::unique_ptr<KernelState>> GroupedDistinctInit(KernelContext* ctx,
   instance->out_type_ = args.inputs[0].GetSharedPtr();
   ARROW_ASSIGN_OR_RAISE(instance->grouper_,
                         Grouper::Make(args.inputs, ctx->exec_context()));
-  return std::move(impl);
+  return impl;
 }
 
 // ----------------------------------------------------------------------
@@ -2839,7 +2841,7 @@ Result<std::unique_ptr<KernelState>> GroupedOneInit(KernelContext* ctx,
   ARROW_ASSIGN_OR_RAISE(auto impl, HashAggregateInit<GroupedOneImpl<T>>(ctx, args));
   auto instance = static_cast<GroupedOneImpl<T>*>(impl.get());
   instance->out_type_ = args.inputs[0].GetSharedPtr();
-  return std::move(impl);
+  return impl;
 }
 
 struct GroupedOneFactory {
@@ -3237,7 +3239,7 @@ Result<std::unique_ptr<KernelState>> GroupedListInit(KernelContext* ctx,
   ARROW_ASSIGN_OR_RAISE(auto impl, HashAggregateInit<GroupedListImpl<T>>(ctx, args));
   auto instance = static_cast<GroupedListImpl<T>*>(impl.get());
   instance->out_type_ = args.inputs[0].GetSharedPtr();
-  return std::move(impl);
+  return impl;
 }
 
 struct GroupedListFactory {
diff --git a/cpp/src/arrow/compute/kernels/scalar_arithmetic.cc b/cpp/src/arrow/compute/kernels/scalar_arithmetic.cc
index efd25a8a20c80..eb243de4a765e 100644
--- a/cpp/src/arrow/compute/kernels/scalar_arithmetic.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_arithmetic.cc
@@ -503,7 +503,7 @@ Result<TypeHolder> ResolveDecimalBinaryOperationOutput(
                         ToResult(getter(left_type.precision(), left_type.scale(),
                                         right_type.precision(), right_type.scale())));
   ARROW_ASSIGN_OR_RAISE(auto type, DecimalType::Make(left_type.id(), precision, scale));
-  return std::move(type);
+  return type;
 }
 
 Result<TypeHolder> ResolveDecimalAdditionOrSubtractionOutput(
@@ -566,7 +566,7 @@ Result<TypeHolder> ResolveTemporalOutput(KernelContext*,
   }
 
   auto type = duration(right_type.unit());
-  return std::move(type);
+  return type;
 }
 
 template <typename Op>
diff --git a/cpp/src/arrow/compute/kernels/scalar_cast_extension.cc b/cpp/src/arrow/compute/kernels/scalar_cast_extension.cc
index c32a6ef6de93e..2a54d28c6fb64 100644
--- a/cpp/src/arrow/compute/kernels/scalar_cast_extension.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_cast_extension.cc
@@ -56,8 +56,9 @@ Status CastToExtension(KernelContext* ctx, const ExecSpan& batch, ExecResult* ou
 std::shared_ptr<CastFunction> GetCastToExtension(std::string name) {
   auto func = std::make_shared<CastFunction>(std::move(name), Type::EXTENSION);
   for (Type::type in_ty : AllTypeIds()) {
-    DCHECK_OK(
-        func->AddKernel(in_ty, {InputType(in_ty)}, kOutputTargetType, CastToExtension));
+    DCHECK_OK(func->AddKernel(in_ty, {InputType(in_ty)}, kOutputTargetType,
+                              CastToExtension, NullHandling::COMPUTED_NO_PREALLOCATE,
+                              MemAllocation::NO_PREALLOCATE));
   }
   return func;
 }
diff --git a/cpp/src/arrow/compute/kernels/scalar_cast_internal.cc b/cpp/src/arrow/compute/kernels/scalar_cast_internal.cc
index 8cf5a04addb00..d8c4088759643 100644
--- a/cpp/src/arrow/compute/kernels/scalar_cast_internal.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_cast_internal.cc
@@ -19,10 +19,13 @@
 #include "arrow/compute/cast_internal.h"
 #include "arrow/compute/kernels/common_internal.h"
 #include "arrow/extension_type.h"
+#include "arrow/type_traits.h"
 #include "arrow/util/checked_cast.h"
+#include "arrow/util/float16.h"
 
 namespace arrow {
 
+using arrow::util::Float16;
 using internal::checked_cast;
 using internal::PrimitiveScalarBase;
 
@@ -47,6 +50,42 @@ struct CastPrimitive {
   }
 };
 
+// Converting floating types to half float.
+template <typename InType>
+struct CastPrimitive<HalfFloatType, InType, enable_if_physical_floating_point<InType>> {
+  static void Exec(const ArraySpan& arr, ArraySpan* out) {
+    using InT = typename InType::c_type;
+    const InT* in_values = arr.GetValues<InT>(1);
+    uint16_t* out_values = out->GetValues<uint16_t>(1);
+    for (int64_t i = 0; i < arr.length; ++i) {
+      *out_values++ = Float16(*in_values++).bits();
+    }
+  }
+};
+
+// Converting from half float to other floating types.
+template <>
+struct CastPrimitive<FloatType, HalfFloatType, enable_if_t<true>> {
+  static void Exec(const ArraySpan& arr, ArraySpan* out) {
+    const uint16_t* in_values = arr.GetValues<uint16_t>(1);
+    float* out_values = out->GetValues<float>(1);
+    for (int64_t i = 0; i < arr.length; ++i) {
+      *out_values++ = Float16::FromBits(*in_values++).ToFloat();
+    }
+  }
+};
+
+template <>
+struct CastPrimitive<DoubleType, HalfFloatType, enable_if_t<true>> {
+  static void Exec(const ArraySpan& arr, ArraySpan* out) {
+    const uint16_t* in_values = arr.GetValues<uint16_t>(1);
+    double* out_values = out->GetValues<double>(1);
+    for (int64_t i = 0; i < arr.length; ++i) {
+      *out_values++ = Float16::FromBits(*in_values++).ToDouble();
+    }
+  }
+};
+
 template <typename OutType, typename InType>
 struct CastPrimitive<OutType, InType, enable_if_t<std::is_same<OutType, InType>::value>> {
   // memcpy output
@@ -56,6 +95,33 @@ struct CastPrimitive<OutType, InType, enable_if_t<std::is_same<OutType, InType>:
   }
 };
 
+// Cast int to half float
+template <typename InType>
+struct CastPrimitive<HalfFloatType, InType, enable_if_integer<InType>> {
+  static void Exec(const ArraySpan& arr, ArraySpan* out) {
+    using InT = typename InType::c_type;
+    const InT* in_values = arr.GetValues<InT>(1);
+    uint16_t* out_values = out->GetValues<uint16_t>(1);
+    for (int64_t i = 0; i < arr.length; ++i) {
+      float temp = static_cast<float>(*in_values++);
+      *out_values++ = Float16(temp).bits();
+    }
+  }
+};
+
+// Cast half float to int
+template <typename OutType>
+struct CastPrimitive<OutType, HalfFloatType, enable_if_integer<OutType>> {
+  static void Exec(const ArraySpan& arr, ArraySpan* out) {
+    using OutT = typename OutType::c_type;
+    const uint16_t* in_values = arr.GetValues<uint16_t>(1);
+    OutT* out_values = out->GetValues<OutT>(1);
+    for (int64_t i = 0; i < arr.length; ++i) {
+      *out_values++ = static_cast<OutT>(Float16::FromBits(*in_values++).ToFloat());
+    }
+  }
+};
+
 template <typename InType>
 void CastNumberImpl(Type::type out_type, const ArraySpan& input, ArraySpan* out) {
   switch (out_type) {
@@ -79,6 +145,8 @@ void CastNumberImpl(Type::type out_type, const ArraySpan& input, ArraySpan* out)
       return CastPrimitive<FloatType, InType>::Exec(input, out);
     case Type::DOUBLE:
       return CastPrimitive<DoubleType, InType>::Exec(input, out);
+    case Type::HALF_FLOAT:
+      return CastPrimitive<HalfFloatType, InType>::Exec(input, out);
     default:
       break;
   }
@@ -109,6 +177,8 @@ void CastNumberToNumberUnsafe(Type::type in_type, Type::type out_type,
       return CastNumberImpl<FloatType>(out_type, input, out);
     case Type::DOUBLE:
       return CastNumberImpl<DoubleType>(out_type, input, out);
+    case Type::HALF_FLOAT:
+      return CastNumberImpl<HalfFloatType>(out_type, input, out);
     default:
       DCHECK(false);
       break;
diff --git a/cpp/src/arrow/compute/kernels/scalar_cast_numeric.cc b/cpp/src/arrow/compute/kernels/scalar_cast_numeric.cc
index b054e57f04d12..3df86e7d6936c 100644
--- a/cpp/src/arrow/compute/kernels/scalar_cast_numeric.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_cast_numeric.cc
@@ -23,6 +23,7 @@
 #include "arrow/compute/kernels/util_internal.h"
 #include "arrow/scalar.h"
 #include "arrow/util/bit_block_counter.h"
+#include "arrow/util/float16.h"
 #include "arrow/util/int_util.h"
 #include "arrow/util/value_parsing.h"
 
@@ -34,6 +35,7 @@ using internal::IntegersCanFit;
 using internal::OptionalBitBlockCounter;
 using internal::ParseValue;
 using internal::PrimitiveScalarBase;
+using util::Float16;
 
 namespace compute {
 namespace internal {
@@ -56,18 +58,37 @@ Status CastFloatingToFloating(KernelContext*, const ExecSpan& batch, ExecResult*
 
 // ----------------------------------------------------------------------
 // Implement fast safe floating point to integer cast
+//
+template <typename InType, typename OutType, typename InT = typename InType::c_type,
+          typename OutT = typename OutType::c_type>
+struct WasTruncated {
+  static bool Check(OutT out_val, InT in_val) {
+    return static_cast<InT>(out_val) != in_val;
+  }
+
+  static bool CheckMaybeNull(OutT out_val, InT in_val, bool is_valid) {
+    return is_valid && static_cast<InT>(out_val) != in_val;
+  }
+};
+
+// Half float to int
+template <typename OutType>
+struct WasTruncated<HalfFloatType, OutType> {
+  using OutT = typename OutType::c_type;
+  static bool Check(OutT out_val, uint16_t in_val) {
+    return static_cast<float>(out_val) != Float16::FromBits(in_val).ToFloat();
+  }
+
+  static bool CheckMaybeNull(OutT out_val, uint16_t in_val, bool is_valid) {
+    return is_valid && static_cast<float>(out_val) != Float16::FromBits(in_val).ToFloat();
+  }
+};
 
 // InType is a floating point type we are planning to cast to integer
 template <typename InType, typename OutType, typename InT = typename InType::c_type,
           typename OutT = typename OutType::c_type>
 ARROW_DISABLE_UBSAN("float-cast-overflow")
 Status CheckFloatTruncation(const ArraySpan& input, const ArraySpan& output) {
-  auto WasTruncated = [&](OutT out_val, InT in_val) -> bool {
-    return static_cast<InT>(out_val) != in_val;
-  };
-  auto WasTruncatedMaybeNull = [&](OutT out_val, InT in_val, bool is_valid) -> bool {
-    return is_valid && static_cast<InT>(out_val) != in_val;
-  };
   auto GetErrorMessage = [&](InT val) {
     return Status::Invalid("Float value ", val, " was truncated converting to ",
                            *output.type);
@@ -86,26 +107,28 @@ Status CheckFloatTruncation(const ArraySpan& input, const ArraySpan& output) {
     if (block.popcount == block.length) {
       // Fast path: branchless
       for (int64_t i = 0; i < block.length; ++i) {
-        block_out_of_bounds |= WasTruncated(out_data[i], in_data[i]);
+        block_out_of_bounds |=
+            WasTruncated<InType, OutType>::Check(out_data[i], in_data[i]);
       }
     } else if (block.popcount > 0) {
       // Indices have nulls, must only boundscheck non-null values
       for (int64_t i = 0; i < block.length; ++i) {
-        block_out_of_bounds |= WasTruncatedMaybeNull(
+        block_out_of_bounds |= WasTruncated<InType, OutType>::CheckMaybeNull(
             out_data[i], in_data[i], bit_util::GetBit(bitmap, offset_position + i));
       }
     }
     if (ARROW_PREDICT_FALSE(block_out_of_bounds)) {
       if (input.GetNullCount() > 0) {
         for (int64_t i = 0; i < block.length; ++i) {
-          if (WasTruncatedMaybeNull(out_data[i], in_data[i],
-                                    bit_util::GetBit(bitmap, offset_position + i))) {
+          if (WasTruncated<InType, OutType>::CheckMaybeNull(
+                  out_data[i], in_data[i],
+                  bit_util::GetBit(bitmap, offset_position + i))) {
             return GetErrorMessage(in_data[i]);
           }
         }
       } else {
         for (int64_t i = 0; i < block.length; ++i) {
-          if (WasTruncated(out_data[i], in_data[i])) {
+          if (WasTruncated<InType, OutType>::Check(out_data[i], in_data[i])) {
             return GetErrorMessage(in_data[i]);
           }
         }
@@ -151,6 +174,9 @@ Status CheckFloatToIntTruncation(const ExecValue& input, const ExecResult& outpu
       return CheckFloatToIntTruncationImpl<FloatType>(input.array, *output.array_span());
     case Type::DOUBLE:
       return CheckFloatToIntTruncationImpl<DoubleType>(input.array, *output.array_span());
+    case Type::HALF_FLOAT:
+      return CheckFloatToIntTruncationImpl<HalfFloatType>(input.array,
+                                                          *output.array_span());
     default:
       break;
   }
@@ -293,6 +319,15 @@ struct CastFunctor<
   }
 };
 
+template <>
+struct CastFunctor<HalfFloatType, StringType, enable_if_t<true>> {
+  static Status Exec(KernelContext* ctx, const ExecSpan& batch, ExecResult* out) {
+    return applicator::ScalarUnaryNotNull<HalfFloatType, StringType,
+                                          ParseString<HalfFloatType>>::Exec(ctx, batch,
+                                                                            out);
+  }
+};
+
 // ----------------------------------------------------------------------
 // Decimal to integer
 
@@ -689,6 +724,10 @@ std::shared_ptr<CastFunction> GetCastToInteger(std::string name) {
     DCHECK_OK(func->AddKernel(in_ty->id(), {in_ty}, out_ty, CastFloatingToInteger));
   }
 
+  // Cast from half-float
+  DCHECK_OK(func->AddKernel(Type::HALF_FLOAT, {InputType(Type::HALF_FLOAT)}, out_ty,
+                            CastFloatingToInteger));
+
   // From other numbers to integer
   AddCommonNumberCasts<OutType>(out_ty, func.get());
 
@@ -715,6 +754,10 @@ std::shared_ptr<CastFunction> GetCastToFloating(std::string name) {
     DCHECK_OK(func->AddKernel(in_ty->id(), {in_ty}, out_ty, CastFloatingToFloating));
   }
 
+  // From half-float to float/double
+  DCHECK_OK(func->AddKernel(Type::HALF_FLOAT, {InputType(Type::HALF_FLOAT)}, out_ty,
+                            CastFloatingToFloating));
+
   // From other numbers to floating point
   AddCommonNumberCasts<OutType>(out_ty, func.get());
 
@@ -723,6 +766,7 @@ std::shared_ptr<CastFunction> GetCastToFloating(std::string name) {
                             CastFunctor<OutType, Decimal128Type>::Exec));
   DCHECK_OK(func->AddKernel(Type::DECIMAL256, {InputType(Type::DECIMAL256)}, out_ty,
                             CastFunctor<OutType, Decimal256Type>::Exec));
+
   return func;
 }
 
@@ -795,6 +839,32 @@ std::shared_ptr<CastFunction> GetCastToDecimal256() {
   return func;
 }
 
+std::shared_ptr<CastFunction> GetCastToHalfFloat() {
+  // HalfFloat is a bit brain-damaged for now
+  auto func = std::make_shared<CastFunction>("func", Type::HALF_FLOAT);
+  AddCommonCasts(Type::HALF_FLOAT, float16(), func.get());
+
+  // Casts from integer to floating point
+  for (const std::shared_ptr<DataType>& in_ty : IntTypes()) {
+    DCHECK_OK(func->AddKernel(in_ty->id(), {in_ty},
+                              TypeTraits<HalfFloatType>::type_singleton(),
+                              CastIntegerToFloating));
+  }
+
+  // Cast from other strings to half float.
+  for (const std::shared_ptr<DataType>& in_ty : BaseBinaryTypes()) {
+    auto exec = GenerateVarBinaryBase<CastFunctor, HalfFloatType>(*in_ty);
+    DCHECK_OK(func->AddKernel(in_ty->id(), {in_ty},
+                              TypeTraits<HalfFloatType>::type_singleton(), exec));
+  }
+
+  DCHECK_OK(func.get()->AddKernel(Type::FLOAT, {InputType(Type::FLOAT)}, float16(),
+                                  CastFloatingToFloating));
+  DCHECK_OK(func.get()->AddKernel(Type::DOUBLE, {InputType(Type::DOUBLE)}, float16(),
+                                  CastFloatingToFloating));
+  return func;
+}
+
 }  // namespace
 
 std::vector<std::shared_ptr<CastFunction>> GetNumericCasts() {
@@ -830,13 +900,14 @@ std::vector<std::shared_ptr<CastFunction>> GetNumericCasts() {
   functions.push_back(GetCastToInteger<UInt64Type>("cast_uint64"));
 
   // HalfFloat is a bit brain-damaged for now
-  auto cast_half_float =
-      std::make_shared<CastFunction>("cast_half_float", Type::HALF_FLOAT);
-  AddCommonCasts(Type::HALF_FLOAT, float16(), cast_half_float.get());
+  auto cast_half_float = GetCastToHalfFloat();
   functions.push_back(cast_half_float);
 
-  functions.push_back(GetCastToFloating<FloatType>("cast_float"));
-  functions.push_back(GetCastToFloating<DoubleType>("cast_double"));
+  auto cast_float = GetCastToFloating<FloatType>("cast_float");
+  functions.push_back(cast_float);
+
+  auto cast_double = GetCastToFloating<DoubleType>("cast_double");
+  functions.push_back(cast_double);
 
   functions.push_back(GetCastToDecimal128());
   functions.push_back(GetCastToDecimal256());
diff --git a/cpp/src/arrow/compute/kernels/scalar_cast_string.cc b/cpp/src/arrow/compute/kernels/scalar_cast_string.cc
index a6576e4e4c26f..dc3fe29a3dfae 100644
--- a/cpp/src/arrow/compute/kernels/scalar_cast_string.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_cast_string.cc
@@ -340,10 +340,15 @@ BinaryToBinaryCastExec(KernelContext* ctx, const ExecSpan& batch, ExecResult* ou
   if (input.offset == output->offset) {
     output->buffers[0] = input.GetBuffer(0);
   } else {
-    ARROW_ASSIGN_OR_RAISE(
-        output->buffers[0],
-        arrow::internal::CopyBitmap(ctx->memory_pool(), input.buffers[0].data,
-                                    input.offset, input.length));
+    // When the offsets are different (e.g., due to slice operation), we need to check if
+    // the null bitmap buffer is not null before copying it. The null bitmap buffer can be
+    // null if the input array value does not contain any null value.
+    if (input.buffers[0].data != NULLPTR) {
+      ARROW_ASSIGN_OR_RAISE(
+          output->buffers[0],
+          arrow::internal::CopyBitmap(ctx->memory_pool(), input.buffers[0].data,
+                                      input.offset, input.length));
+    }
   }
 
   // This buffer is preallocated
@@ -437,6 +442,10 @@ void AddNumberToStringCasts(CastFunction* func) {
                         GenerateNumeric<NumericToStringCastFunctor, OutType>(*in_ty),
                         NullHandling::COMPUTED_NO_PREALLOCATE));
   }
+
+  DCHECK_OK(func->AddKernel(Type::HALF_FLOAT, {float16()}, out_ty,
+                            NumericToStringCastFunctor<OutType, HalfFloatType>::Exec,
+                            NullHandling::COMPUTED_NO_PREALLOCATE));
 }
 
 template <typename OutType>
diff --git a/cpp/src/arrow/compute/kernels/scalar_cast_test.cc b/cpp/src/arrow/compute/kernels/scalar_cast_test.cc
index a8acf68f66c8b..f60d8f2e19e98 100644
--- a/cpp/src/arrow/compute/kernels/scalar_cast_test.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_cast_test.cc
@@ -389,7 +389,7 @@ TEST(Cast, ToIntDowncastUnsafe) {
 }
 
 TEST(Cast, FloatingToInt) {
-  for (auto from : {float32(), float64()}) {
+  for (auto from : {float16(), float32(), float64()}) {
     for (auto to : {int32(), int64()}) {
       // float to int no truncation
       CheckCast(ArrayFromJSON(from, "[1.0, null, 0.0, -1.0, 5.0]"),
@@ -407,6 +407,15 @@ TEST(Cast, FloatingToInt) {
   }
 }
 
+TEST(Cast, FloatingToFloating) {
+  for (auto from : {float16(), float32(), float64()}) {
+    for (auto to : {float16(), float32(), float64()}) {
+      CheckCast(ArrayFromJSON(from, "[1.0, 0.0, -1.0, 5.0]"),
+                ArrayFromJSON(to, "[1.0, 0.0, -1.0, 5.0]"));
+    }
+  }
+}
+
 TEST(Cast, IntToFloating) {
   for (auto from : {uint32(), int32()}) {
     std::string two_24 = "[16777216, 16777217]";
@@ -2187,6 +2196,33 @@ TEST(Cast, BinaryOrStringToFixedSizeBinary) {
   }
 }
 
+TEST(Cast, FixedSizeBinaryToBinaryOrString) {
+  for (auto out_type : {utf8(), large_utf8(), binary(), large_binary()}) {
+    auto valid_input = ArrayFromJSON(fixed_size_binary(3), R"(["foo", null, "bar",
+          "baz", "quu"])");
+
+    CheckCast(valid_input, ArrayFromJSON(out_type, R"(["foo", null, "bar", "baz",
+          "quu"])"));
+
+    auto empty_input = ArrayFromJSON(fixed_size_binary(3), "[]");
+    CheckCast(empty_input, ArrayFromJSON(out_type, "[]"));
+  }
+}
+
+TEST(Cast, FixedSizeBinaryToBinaryOrStringWithSlice) {
+  for (auto out_type : {utf8(), large_utf8(), binary(), large_binary()}) {
+    auto valid_input = ArrayFromJSON(fixed_size_binary(3), R"(["foo", null, "bar",
+                "baz", "quu"])");
+    auto sliced = valid_input->Slice(1, 3);
+    CheckCast(sliced, ArrayFromJSON(out_type, R"([null, "bar", "baz"])"));
+
+    auto valid_input_without_null = ArrayFromJSON(fixed_size_binary(3), R"(["foo", "bar",
+                "baz", "quu"])");
+    auto sliced_without_null = valid_input_without_null->Slice(1, 3);
+    CheckCast(sliced_without_null, ArrayFromJSON(out_type, R"(["bar", "baz", "quu"])"));
+  }
+}
+
 TEST(Cast, IntToString) {
   for (auto string_type : {utf8(), large_utf8()}) {
     CheckCast(ArrayFromJSON(int8(), "[0, 1, 127, -128, null]"),
@@ -2220,14 +2256,12 @@ TEST(Cast, IntToString) {
 }
 
 TEST(Cast, FloatingToString) {
-  for (auto string_type : {utf8(), large_utf8()}) {
-    CheckCast(
-        ArrayFromJSON(float32(), "[0.0, -0.0, 1.5, -Inf, Inf, NaN, null]"),
-        ArrayFromJSON(string_type, R"(["0", "-0", "1.5", "-inf", "inf", "nan", null])"));
-
-    CheckCast(
-        ArrayFromJSON(float64(), "[0.0, -0.0, 1.5, -Inf, Inf, NaN, null]"),
-        ArrayFromJSON(string_type, R"(["0", "-0", "1.5", "-inf", "inf", "nan", null])"));
+  for (auto float_type : {float16(), float32(), float64()}) {
+    for (auto string_type : {utf8(), large_utf8()}) {
+      CheckCast(ArrayFromJSON(float_type, "[0.0, -0.0, 1.5, -Inf, Inf, NaN, null]"),
+                ArrayFromJSON(string_type,
+                              R"(["0", "-0", "1.5", "-inf", "inf", "nan", null])"));
+    }
   }
 }
 
@@ -2247,7 +2281,7 @@ TEST(Cast, ListToPrimitive) {
       Cast(*ArrayFromJSON(list(binary()), R"([["1", "2"], ["3", "4"]])"), utf8()));
 }
 
-using make_list_t = std::shared_ptr<DataType>(const std::shared_ptr<DataType>&);
+using make_list_t = std::shared_ptr<DataType>(std::shared_ptr<DataType>);
 
 static const auto list_factories = std::vector<make_list_t*>{&list, &large_list};
 
diff --git a/cpp/src/arrow/compute/kernels/scalar_compare.cc b/cpp/src/arrow/compute/kernels/scalar_compare.cc
index daf8ed76d628d..9b2fd987d81d8 100644
--- a/cpp/src/arrow/compute/kernels/scalar_compare.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_compare.cc
@@ -491,8 +491,9 @@ template <typename OutType, typename Op>
 struct ScalarMinMax {
   using OutValue = typename GetOutputType<OutType>::T;
 
-  static void ExecScalar(const ExecSpan& batch,
-                         const ElementWiseAggregateOptions& options, Scalar* out) {
+  static Result<std::shared_ptr<Scalar>> ExecScalar(
+      const ExecSpan& batch, const ElementWiseAggregateOptions& options,
+      std::shared_ptr<DataType> type) {
     // All arguments are scalar
     OutValue value{};
     bool valid = false;
@@ -502,8 +503,8 @@ struct ScalarMinMax {
       const Scalar& scalar = *arg.scalar;
       if (!scalar.is_valid) {
         if (options.skip_nulls) continue;
-        out->is_valid = false;
-        return;
+        valid = false;
+        break;
       }
       if (!valid) {
         value = UnboxScalar<OutType>::Unbox(scalar);
@@ -513,9 +514,10 @@ struct ScalarMinMax {
             value, UnboxScalar<OutType>::Unbox(scalar));
       }
     }
-    out->is_valid = valid;
     if (valid) {
-      BoxScalar<OutType>::Box(value, out);
+      return MakeScalar(std::move(type), std::move(value));
+    } else {
+      return MakeNullScalar(std::move(type));
     }
   }
 
@@ -537,8 +539,7 @@ struct ScalarMinMax {
     bool initialize_output = true;
     if (scalar_count > 0) {
       ARROW_ASSIGN_OR_RAISE(std::shared_ptr<Scalar> temp_scalar,
-                            MakeScalar(out->type()->GetSharedPtr(), 0));
-      ExecScalar(batch, options, temp_scalar.get());
+                            ExecScalar(batch, options, out->type()->GetSharedPtr()));
       if (temp_scalar->is_valid) {
         const auto value = UnboxScalar<OutType>::Unbox(*temp_scalar);
         initialize_output = false;
diff --git a/cpp/src/arrow/compute/kernels/scalar_if_else.cc b/cpp/src/arrow/compute/kernels/scalar_if_else.cc
index ee181c053c053..6368ef525ff9c 100644
--- a/cpp/src/arrow/compute/kernels/scalar_if_else.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_if_else.cc
@@ -1309,9 +1309,10 @@ void AddFixedWidthIfElseKernel(const std::shared_ptr<IfElseFunction>& scalar_fun
 }
 
 void AddNestedIfElseKernels(const std::shared_ptr<IfElseFunction>& scalar_function) {
-  for (const auto type_id : {Type::LIST, Type::LARGE_LIST, Type::LIST_VIEW,
-                             Type::LARGE_LIST_VIEW, Type::FIXED_SIZE_LIST, Type::STRUCT,
-                             Type::DENSE_UNION, Type::SPARSE_UNION, Type::DICTIONARY}) {
+  for (const auto type_id :
+       {Type::LIST, Type::LARGE_LIST, Type::LIST_VIEW, Type::LARGE_LIST_VIEW,
+        Type::FIXED_SIZE_LIST, Type::MAP, Type::STRUCT, Type::DENSE_UNION,
+        Type::SPARSE_UNION, Type::DICTIONARY}) {
     ScalarKernel kernel({boolean(), InputType(type_id), InputType(type_id)}, LastType,
                         NestedIfElseExec::Exec);
     kernel.null_handling = NullHandling::COMPUTED_NO_PREALLOCATE;
@@ -1482,39 +1483,27 @@ Status ExecScalarCaseWhen(KernelContext* ctx, const ExecSpan& batch, ExecResult*
     result = temp.get();
   }
 
-  // TODO(wesm): clean this up to have less duplication
-  if (out->is_array_data()) {
-    ArrayData* output = out->array_data().get();
-    if (is_dictionary_type<Type>::value) {
-      const ExecValue& dict_from = has_result ? result : batch[1];
-      if (dict_from.is_scalar()) {
-        output->dictionary = checked_cast<const DictionaryScalar&>(*dict_from.scalar)
-                                 .value.dictionary->data();
-      } else {
-        output->dictionary = dict_from.array.ToArrayData()->dictionary;
-      }
-    }
-    CopyValues<Type>(result, /*in_offset=*/0, batch.length,
-                     output->GetMutableValues<uint8_t>(0, 0),
-                     output->GetMutableValues<uint8_t>(1, 0), output->offset);
-  } else {
-    // ArraySpan
-    ArraySpan* output = out->array_span_mutable();
-    if (is_dictionary_type<Type>::value) {
-      const ExecValue& dict_from = has_result ? result : batch[1];
-      output->child_data.resize(1);
-      if (dict_from.is_scalar()) {
-        output->child_data[0].SetMembers(
-            *checked_cast<const DictionaryScalar&>(*dict_from.scalar)
-                 .value.dictionary->data());
-      } else {
-        output->child_data[0] = dict_from.array;
-      }
+  // Only input types of non-fixed length (which cannot be pre-allocated)
+  // will save the output data in ArrayData. And make sure the FixedLength
+  // types must be output in ArraySpan.
+  static_assert(is_fixed_width(Type::type_id));
+  DCHECK(out->is_array_span());
+
+  ArraySpan* output = out->array_span_mutable();
+  if (is_dictionary_type<Type>::value) {
+    const ExecValue& dict_from = has_result ? result : batch[1];
+    output->child_data.resize(1);
+    if (dict_from.is_scalar()) {
+      output->child_data[0].SetMembers(
+          *checked_cast<const DictionaryScalar&>(*dict_from.scalar)
+               .value.dictionary->data());
+    } else {
+      output->child_data[0] = dict_from.array;
     }
-    CopyValues<Type>(result, /*in_offset=*/0, batch.length,
-                     output->GetValues<uint8_t>(0, 0), output->GetValues<uint8_t>(1, 0),
-                     output->offset);
   }
+  CopyValues<Type>(result, /*in_offset=*/0, batch.length,
+                   output->GetValues<uint8_t>(0, 0), output->GetValues<uint8_t>(1, 0),
+                   output->offset);
   return Status::OK();
 }
 
@@ -1847,6 +1836,48 @@ struct CaseWhenFunctor<Type, enable_if_var_size_list<Type>> {
   }
 };
 
+// TODO(GH-41453): a more efficient implementation for list-views is possible
+template <typename Type>
+struct CaseWhenFunctor<Type, enable_if_list_view<Type>> {
+  using offset_type = typename Type::offset_type;
+  using BuilderType = typename TypeTraits<Type>::BuilderType;
+  static Status Exec(KernelContext* ctx, const ExecSpan& batch, ExecResult* out) {
+    /// TODO(wesm): should this be a DCHECK? Or checked elsewhere
+    if (batch[0].null_count() > 0) {
+      return Status::Invalid("cond struct must not have outer nulls");
+    }
+    if (batch[0].is_scalar()) {
+      return ExecVarWidthScalarCaseWhen(ctx, batch, out);
+    }
+    return ExecArray(ctx, batch, out);
+  }
+
+  static Status ExecArray(KernelContext* ctx, const ExecSpan& batch, ExecResult* out) {
+    return ExecVarWidthArrayCaseWhen(
+        ctx, batch, out,
+        // ReserveData
+        [&](ArrayBuilder* raw_builder) {
+          auto builder = checked_cast<BuilderType*>(raw_builder);
+          auto child_builder = builder->value_builder();
+
+          int64_t reservation = 0;
+          for (int arg = 1; arg < batch.num_values(); arg++) {
+            const ExecValue& source = batch[arg];
+            if (!source.is_array()) {
+              const auto& scalar = checked_cast<const BaseListScalar&>(*source.scalar);
+              if (!scalar.value) continue;
+              reservation =
+                  std::max<int64_t>(reservation, batch.length * scalar.value->length());
+            } else {
+              const ArraySpan& array = source.array;
+              reservation = std::max<int64_t>(reservation, array.child_data[0].length);
+            }
+          }
+          return child_builder->Reserve(reservation);
+        });
+  }
+};
+
 // No-op reserve function, pulled out to avoid apparent miscompilation on MinGW
 Status ReserveNoData(ArrayBuilder*) { return Status::OK(); }
 
@@ -2712,6 +2743,25 @@ void AddBinaryCaseWhenKernels(const std::shared_ptr<CaseWhenFunction>& scalar_fu
   }
 }
 
+template <typename ArrowNestedType>
+void AddNestedCaseWhenKernel(const std::shared_ptr<CaseWhenFunction>& scalar_function) {
+  AddCaseWhenKernel(scalar_function, ArrowNestedType::type_id,
+                    CaseWhenFunctor<ArrowNestedType>::Exec);
+}
+
+void AddNestedCaseWhenKernels(const std::shared_ptr<CaseWhenFunction>& scalar_function) {
+  AddNestedCaseWhenKernel<FixedSizeListType>(scalar_function);
+  AddNestedCaseWhenKernel<ListType>(scalar_function);
+  AddNestedCaseWhenKernel<LargeListType>(scalar_function);
+  AddNestedCaseWhenKernel<ListViewType>(scalar_function);
+  AddNestedCaseWhenKernel<LargeListViewType>(scalar_function);
+  AddNestedCaseWhenKernel<MapType>(scalar_function);
+  AddNestedCaseWhenKernel<StructType>(scalar_function);
+  AddNestedCaseWhenKernel<DenseUnionType>(scalar_function);
+  AddNestedCaseWhenKernel<SparseUnionType>(scalar_function);
+  AddNestedCaseWhenKernel<DictionaryType>(scalar_function);
+}
+
 void AddCoalesceKernel(const std::shared_ptr<ScalarFunction>& scalar_function,
                        detail::GetTypeId get_id, ArrayKernelExec exec) {
   ScalarKernel kernel(KernelSignature::Make({InputType(get_id.id)}, FirstType,
@@ -2731,6 +2781,25 @@ void AddPrimitiveCoalesceKernels(const std::shared_ptr<ScalarFunction>& scalar_f
   }
 }
 
+template <typename ArrowNestedType>
+void AddNestedCoalesceKernel(const std::shared_ptr<ScalarFunction>& scalar_function) {
+  AddCoalesceKernel(scalar_function, ArrowNestedType::type_id,
+                    CoalesceFunctor<ArrowNestedType>::Exec);
+}
+
+void AddNestedCoalesceKernels(const std::shared_ptr<ScalarFunction>& scalar_function) {
+  AddNestedCoalesceKernel<FixedSizeListType>(scalar_function);
+  AddNestedCoalesceKernel<ListType>(scalar_function);
+  AddNestedCoalesceKernel<LargeListType>(scalar_function);
+  AddNestedCoalesceKernel<ListViewType>(scalar_function);
+  AddNestedCoalesceKernel<LargeListViewType>(scalar_function);
+  AddNestedCoalesceKernel<MapType>(scalar_function);
+  AddNestedCoalesceKernel<StructType>(scalar_function);
+  AddNestedCoalesceKernel<DenseUnionType>(scalar_function);
+  AddNestedCoalesceKernel<SparseUnionType>(scalar_function);
+  AddNestedCoalesceKernel<DictionaryType>(scalar_function);
+}
+
 void AddChooseKernel(const std::shared_ptr<ScalarFunction>& scalar_function,
                      detail::GetTypeId get_id, ArrayKernelExec exec) {
   ScalarKernel kernel(KernelSignature::Make({Type::INT64, InputType(get_id.id)}, LastType,
@@ -2822,15 +2891,7 @@ void RegisterScalarIfElse(FunctionRegistry* registry) {
     AddCaseWhenKernel(func, Type::DECIMAL128, CaseWhenFunctor<FixedSizeBinaryType>::Exec);
     AddCaseWhenKernel(func, Type::DECIMAL256, CaseWhenFunctor<FixedSizeBinaryType>::Exec);
     AddBinaryCaseWhenKernels(func, BaseBinaryTypes());
-    AddCaseWhenKernel(func, Type::FIXED_SIZE_LIST,
-                      CaseWhenFunctor<FixedSizeListType>::Exec);
-    AddCaseWhenKernel(func, Type::LIST, CaseWhenFunctor<ListType>::Exec);
-    AddCaseWhenKernel(func, Type::LARGE_LIST, CaseWhenFunctor<LargeListType>::Exec);
-    AddCaseWhenKernel(func, Type::MAP, CaseWhenFunctor<MapType>::Exec);
-    AddCaseWhenKernel(func, Type::STRUCT, CaseWhenFunctor<StructType>::Exec);
-    AddCaseWhenKernel(func, Type::DENSE_UNION, CaseWhenFunctor<DenseUnionType>::Exec);
-    AddCaseWhenKernel(func, Type::SPARSE_UNION, CaseWhenFunctor<SparseUnionType>::Exec);
-    AddCaseWhenKernel(func, Type::DICTIONARY, CaseWhenFunctor<DictionaryType>::Exec);
+    AddNestedCaseWhenKernels(func);
     DCHECK_OK(registry->AddFunction(std::move(func)));
   }
   {
@@ -2848,15 +2909,7 @@ void RegisterScalarIfElse(FunctionRegistry* registry) {
     for (const auto& ty : BaseBinaryTypes()) {
       AddCoalesceKernel(func, ty, GenerateTypeAgnosticVarBinaryBase<CoalesceFunctor>(ty));
     }
-    AddCoalesceKernel(func, Type::FIXED_SIZE_LIST,
-                      CoalesceFunctor<FixedSizeListType>::Exec);
-    AddCoalesceKernel(func, Type::LIST, CoalesceFunctor<ListType>::Exec);
-    AddCoalesceKernel(func, Type::LARGE_LIST, CoalesceFunctor<LargeListType>::Exec);
-    AddCoalesceKernel(func, Type::MAP, CoalesceFunctor<MapType>::Exec);
-    AddCoalesceKernel(func, Type::STRUCT, CoalesceFunctor<StructType>::Exec);
-    AddCoalesceKernel(func, Type::DENSE_UNION, CoalesceFunctor<DenseUnionType>::Exec);
-    AddCoalesceKernel(func, Type::SPARSE_UNION, CoalesceFunctor<SparseUnionType>::Exec);
-    AddCoalesceKernel(func, Type::DICTIONARY, CoalesceFunctor<DictionaryType>::Exec);
+    AddNestedCoalesceKernels(func);
     DCHECK_OK(registry->AddFunction(std::move(func)));
   }
   {
diff --git a/cpp/src/arrow/compute/kernels/scalar_if_else_benchmark.cc b/cpp/src/arrow/compute/kernels/scalar_if_else_benchmark.cc
index 58bc560f52842..5988908853d50 100644
--- a/cpp/src/arrow/compute/kernels/scalar_if_else_benchmark.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_if_else_benchmark.cc
@@ -284,8 +284,11 @@ static void CaseWhenBench(benchmark::State& state) {
   state.SetItemsProcessed(state.iterations() * (len - offset));
 }
 
-static void CaseWhenBenchList(benchmark::State& state) {
-  auto type = list(int64());
+template <typename Type>
+static void CaseWhenBenchList(benchmark::State& state,
+                              const std::shared_ptr<DataType>& type) {
+  using ArrayType = typename TypeTraits<Type>::ArrayType;
+
   auto fld = field("", type);
 
   int64_t len = state.range(0);
@@ -295,17 +298,17 @@ static void CaseWhenBenchList(benchmark::State& state) {
 
   auto cond_field =
       field("cond", boolean(), key_value_metadata({{"null_probability", "0.01"}}));
-  auto cond = rand.ArrayOf(*field("", struct_({cond_field, cond_field, cond_field}),
-                                  key_value_metadata({{"null_probability", "0.0"}})),
-                           len);
-  auto val1 = rand.ArrayOf(*fld, len);
-  auto val2 = rand.ArrayOf(*fld, len);
-  auto val3 = rand.ArrayOf(*fld, len);
-  auto val4 = rand.ArrayOf(*fld, len);
+  auto cond = std::static_pointer_cast<BooleanArray>(
+                  rand.ArrayOf(*field("", struct_({cond_field, cond_field, cond_field}),
+                                      key_value_metadata({{"null_probability", "0.0"}})),
+                               len))
+                  ->Slice(offset);
+  auto val1 = std::static_pointer_cast<ArrayType>(rand.ArrayOf(*fld, len))->Slice(offset);
+  auto val2 = std::static_pointer_cast<ArrayType>(rand.ArrayOf(*fld, len))->Slice(offset);
+  auto val3 = std::static_pointer_cast<ArrayType>(rand.ArrayOf(*fld, len))->Slice(offset);
+  auto val4 = std::static_pointer_cast<ArrayType>(rand.ArrayOf(*fld, len))->Slice(offset);
   for (auto _ : state) {
-    ABORT_NOT_OK(
-        CaseWhen(cond->Slice(offset), {val1->Slice(offset), val2->Slice(offset),
-                                       val3->Slice(offset), val4->Slice(offset)}));
+    ABORT_NOT_OK(CaseWhen(cond, {val1, val2, val3, val4}));
   }
 
   // Set bytes processed to ~length of output
@@ -372,6 +375,21 @@ static void CaseWhenBenchStringContiguous(benchmark::State& state) {
   return CaseWhenBenchContiguous<StringType>(state);
 }
 
+template <typename ListType, typename ValueType>
+static void CaseWhenBenchVarLengthListLike(benchmark::State& state) {
+  auto value_type = TypeTraits<ValueType>::type_singleton();
+  auto list_type = std::make_shared<ListType>(value_type);
+  return CaseWhenBenchList<ListType>(state, list_type);
+}
+
+static void CaseWhenBenchListInt64(benchmark::State& state) {
+  return CaseWhenBenchVarLengthListLike<ListType, Int64Type>(state);
+}
+
+static void CaseWhenBenchListViewInt64(benchmark::State& state) {
+  CaseWhenBenchVarLengthListLike<ListViewType, Int64Type>(state);
+}
+
 struct CoalesceParams {
   int64_t length;
   int64_t num_arguments;
@@ -533,9 +551,11 @@ BENCHMARK(CaseWhenBench64)->Args({kNumItems, 99});
 BENCHMARK(CaseWhenBench64Contiguous)->Args({kNumItems, 0});
 BENCHMARK(CaseWhenBench64Contiguous)->Args({kNumItems, 99});
 
-// CaseWhen: Lists
-BENCHMARK(CaseWhenBenchList)->Args({kFewItems, 0});
-BENCHMARK(CaseWhenBenchList)->Args({kFewItems, 99});
+// CaseWhen: List-like types
+BENCHMARK(CaseWhenBenchListInt64)->Args({kFewItems, 0});
+BENCHMARK(CaseWhenBenchListInt64)->Args({kFewItems, 99});
+BENCHMARK(CaseWhenBenchListViewInt64)->Args({kFewItems, 0});
+BENCHMARK(CaseWhenBenchListViewInt64)->Args({kFewItems, 99});
 
 // CaseWhen: Strings
 BENCHMARK(CaseWhenBenchString)->Args({kFewItems, 0});
diff --git a/cpp/src/arrow/compute/kernels/scalar_if_else_test.cc b/cpp/src/arrow/compute/kernels/scalar_if_else_test.cc
index c4c46b5efe84d..9a0ca325277dc 100644
--- a/cpp/src/arrow/compute/kernels/scalar_if_else_test.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_if_else_test.cc
@@ -896,6 +896,21 @@ TEST_F(TestIfElseKernel, ParameterizedTypes) {
                    {cond, ArrayFromJSON(type0, "[0]"), ArrayFromJSON(type1, "[1]")}));
 }
 
+TEST_F(TestIfElseKernel, MapNested) {
+  auto type = map(int64(), utf8());
+  CheckWithDifferentShapes(
+      ArrayFromJSON(boolean(), "[true, true, false, false]"),
+      ArrayFromJSON(type, R"([null, [[2, "foo"], [4, null]], [[3, "test"]], []])"),
+      ArrayFromJSON(type, R"([[[1, "b"]], [[2, "c"]], [[7, "abc"]], null])"),
+      ArrayFromJSON(type, R"([null, [[2, "foo"], [4, null]], [[7, "abc"]], null])"));
+
+  CheckWithDifferentShapes(
+      ArrayFromJSON(boolean(), "[null, null, null, null]"),
+      ArrayFromJSON(type, R"([null, [[1, "c"]], [[4, null]], [[6, "ok"]]])"),
+      ArrayFromJSON(type, R"([[[-1, null]], [[3, "c"]], null, [[6, "ok"]]])"),
+      ArrayFromJSON(type, R"([null, null, null, null])"));
+}
+
 template <typename Type>
 class TestIfElseUnion : public ::testing::Test {};
 
@@ -1920,7 +1935,7 @@ TYPED_TEST(TestCaseWhenBinary, Random) {
 template <typename Type>
 class TestCaseWhenList : public ::testing::Test {};
 
-TYPED_TEST_SUITE(TestCaseWhenList, ListArrowTypes);
+TYPED_TEST_SUITE(TestCaseWhenList, ListAndListViewArrowTypes);
 
 TYPED_TEST(TestCaseWhenList, ListOfString) {
   auto type = std::make_shared<TypeParam>(utf8());
@@ -2555,7 +2570,7 @@ class TestCoalesceList : public ::testing::Test {};
 
 TYPED_TEST_SUITE(TestCoalesceNumeric, IfElseNumericBasedTypes);
 TYPED_TEST_SUITE(TestCoalesceBinary, BaseBinaryArrowTypes);
-TYPED_TEST_SUITE(TestCoalesceList, ListArrowTypes);
+TYPED_TEST_SUITE(TestCoalesceList, ListAndListViewArrowTypes);
 
 TYPED_TEST(TestCoalesceNumeric, Basics) {
   auto type = default_type_instance<TypeParam>();
diff --git a/cpp/src/arrow/compute/kernels/scalar_list_benchmark.cc b/cpp/src/arrow/compute/kernels/scalar_list_benchmark.cc
new file mode 100644
index 0000000000000..8c5b43d55f756
--- /dev/null
+++ b/cpp/src/arrow/compute/kernels/scalar_list_benchmark.cc
@@ -0,0 +1,153 @@
+// 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.
+
+#include <memory>
+#include <type_traits>
+#include <vector>
+
+#include "arrow/compute/api_scalar.h"
+#include "arrow/compute/exec.h"
+#include "arrow/testing/gtest_util.h"
+#include "arrow/testing/random.h"
+#include "arrow/util/benchmark_util.h"
+#include "benchmark/benchmark.h"
+
+namespace arrow::compute {
+
+constexpr auto kSeed = 0x94378165;
+
+const auto kSliceStart = 2;
+const auto kSliceStop = 10;
+
+static void BenchmarkListSlice(benchmark::State& state, const ListSliceOptions& opts,
+                               std::shared_ptr<DataType> list_ty) {
+  RegressionArgs args(state, /*size_is_bytes=*/false);
+  auto rand = random::RandomArrayGenerator(kSeed);
+  auto array = rand.ArrayOf(std::move(list_ty), args.size, args.null_proportion);
+  auto ctx = default_exec_context();
+  std::vector<Datum> input_args = {std::move(array)};
+  for (auto _ : state) {
+    ABORT_NOT_OK(CallFunction("list_slice", input_args, &opts, ctx).status());
+  }
+}
+
+template <typename InListType = ListType>
+static void ListSliceInt64List(benchmark::State& state) {
+  ListSliceOptions opts;
+  opts.start = kSliceStart;
+  BenchmarkListSlice(state, opts, std::make_shared<InListType>(int64()));
+}
+
+template <typename InListType = ListType>
+static void ListSliceStringList(benchmark::State& state) {
+  ListSliceOptions opts;
+  opts.start = kSliceStart;
+  BenchmarkListSlice(state, opts, std::make_shared<InListType>(utf8()));
+}
+
+template <typename InListType = ListType>
+static void ListSliceInt64ListWithStop(benchmark::State& state) {
+  ListSliceOptions opts;
+  opts.start = kSliceStart;
+  opts.stop = kSliceStop;
+  BenchmarkListSlice(state, opts, std::make_shared<InListType>(int64()));
+}
+
+template <typename InListType = ListType>
+static void ListSliceStringListWithStop(benchmark::State& state) {
+  ListSliceOptions opts;
+  opts.start = kSliceStart;
+  opts.stop = kSliceStop;
+  BenchmarkListSlice(state, opts, std::make_shared<InListType>(utf8()));
+}
+
+template <typename InListType = ListType>
+static void ListSliceInt64ListWithStepAndStop(benchmark::State& state) {
+  ListSliceOptions opts;
+  opts.start = kSliceStart;
+  opts.step = 2;
+  opts.stop = kSliceStop;
+  BenchmarkListSlice(state, opts, std::make_shared<InListType>(int64()));
+}
+
+template <typename InListType = ListType>
+static void ListSliceStringListWithStepAndStop(benchmark::State& state) {
+  ListSliceOptions opts;
+  opts.start = kSliceStart;
+  opts.step = 2;
+  opts.stop = kSliceStop;
+  BenchmarkListSlice(state, opts, std::make_shared<InListType>(utf8()));
+}
+
+static void ListSliceInt64ListView(benchmark::State& state) {
+  ListSliceInt64List<ListViewType>(state);
+}
+
+static void ListSliceStringListView(benchmark::State& state) {
+  ListSliceStringList<ListViewType>(state);
+}
+
+static void ListSliceInt64ListViewWithStop(benchmark::State& state) {
+  ListSliceInt64ListWithStop<ListViewType>(state);
+}
+
+static void ListSliceStringListViewWithStop(benchmark::State& state) {
+  ListSliceStringListWithStop<ListViewType>(state);
+}
+
+static void ListSliceInt64ListViewWithStepAndStop(benchmark::State& state) {
+  ListSliceInt64ListWithStepAndStop<ListViewType>(state);
+}
+
+static void ListSliceStringListViewWithStepAndStop(benchmark::State& state) {
+  ListSliceStringListWithStepAndStop<ListViewType>(state);
+}
+
+static void ListSliceInt64ListToFSL(benchmark::State& state) {
+  ListSliceOptions opts;
+  opts.start = kSliceStart;
+  opts.stop = kSliceStop;
+  opts.return_fixed_size_list = true;
+  BenchmarkListSlice(state, opts, std::make_shared<ListType>(int64()));
+}
+
+static void ListSliceStringListToFSL(benchmark::State& state) {
+  ListSliceOptions opts;
+  opts.start = kSliceStart;
+  opts.stop = kSliceStop;
+  opts.return_fixed_size_list = true;
+  BenchmarkListSlice(state, opts, std::make_shared<ListType>(utf8()));
+}
+
+BENCHMARK(ListSliceInt64List)->Apply(RegressionSetArgs);
+BENCHMARK(ListSliceStringList)->Apply(RegressionSetArgs);
+BENCHMARK(ListSliceInt64ListWithStop)->Apply(RegressionSetArgs);
+BENCHMARK(ListSliceStringListWithStop)->Apply(RegressionSetArgs);
+BENCHMARK(ListSliceInt64ListWithStepAndStop)->Apply(RegressionSetArgs);
+BENCHMARK(ListSliceStringListWithStepAndStop)->Apply(RegressionSetArgs);
+
+BENCHMARK(ListSliceInt64ListView)->Apply(RegressionSetArgs);
+BENCHMARK(ListSliceStringListView)->Apply(RegressionSetArgs);
+BENCHMARK(ListSliceInt64ListViewWithStop)->Apply(RegressionSetArgs);
+BENCHMARK(ListSliceStringListViewWithStop)->Apply(RegressionSetArgs);
+BENCHMARK(ListSliceInt64ListViewWithStepAndStop)->Apply(RegressionSetArgs);
+BENCHMARK(ListSliceStringListViewWithStepAndStop)->Apply(RegressionSetArgs);
+
+BENCHMARK(ListSliceInt64ListToFSL)->Apply(RegressionSetArgs);
+BENCHMARK(ListSliceStringListToFSL)->Apply(RegressionSetArgs);
+
+}  // namespace arrow::compute
diff --git a/cpp/src/arrow/compute/kernels/scalar_nested.cc b/cpp/src/arrow/compute/kernels/scalar_nested.cc
index 733ab9c0dc287..71e367153d9c7 100644
--- a/cpp/src/arrow/compute/kernels/scalar_nested.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_nested.cc
@@ -23,10 +23,12 @@
 #include "arrow/compute/api_scalar.h"
 #include "arrow/compute/kernels/common_internal.h"
 #include "arrow/result.h"
+#include "arrow/type_fwd.h"
 #include "arrow/util/bit_block_counter.h"
 #include "arrow/util/bit_util.h"
 #include "arrow/util/bitmap_generate.h"
 #include "arrow/util/string.h"
+#include "arrow/util/unreachable.h"
 
 namespace arrow {
 
@@ -41,10 +43,17 @@ Status ListValueLength(KernelContext* ctx, const ExecSpan& batch, ExecResult* ou
   const ArraySpan& arr = batch[0].array;
   ArraySpan* out_arr = out->array_span_mutable();
   auto out_values = out_arr->GetValues<offset_type>(1);
-  const offset_type* offsets = arr.GetValues<offset_type>(1);
-  // Offsets are always well-defined and monotonic, even for null values
-  for (int64_t i = 0; i < arr.length; ++i) {
-    *out_values++ = offsets[i + 1] - offsets[i];
+  if (is_list_view(*arr.type)) {
+    const auto* sizes = arr.GetValues<offset_type>(2);
+    if (arr.length > 0) {
+      memcpy(out_values, sizes, arr.length * sizeof(offset_type));
+    }
+  } else {
+    const offset_type* offsets = arr.GetValues<offset_type>(1);
+    // Offsets are always well-defined and monotonic, even for null values
+    for (int64_t i = 0; i < arr.length; ++i) {
+      *out_values++ = offsets[i + 1] - offsets[i];
+    }
   }
   return Status::OK();
 }
@@ -59,6 +68,30 @@ Status FixedSizeListValueLength(KernelContext* ctx, const ExecSpan& batch,
   return Status::OK();
 }
 
+template <typename InListType>
+void AddListValueLengthKernel(ScalarFunction* func,
+                              const std::shared_ptr<DataType>& out_type) {
+  auto in_type = {InputType(InListType::type_id)};
+  ScalarKernel kernel(in_type, out_type, ListValueLength<InListType>);
+  DCHECK_OK(func->AddKernel(std::move(kernel)));
+}
+
+template <>
+void AddListValueLengthKernel<FixedSizeListType>(
+    ScalarFunction* func, const std::shared_ptr<DataType>& out_type) {
+  auto in_type = {InputType(Type::FIXED_SIZE_LIST)};
+  ScalarKernel kernel(in_type, out_type, FixedSizeListValueLength);
+  DCHECK_OK(func->AddKernel(std::move(kernel)));
+}
+
+void AddListValueLengthKernels(ScalarFunction* func) {
+  AddListValueLengthKernel<ListType>(func, int32());
+  AddListValueLengthKernel<LargeListType>(func, int64());
+  AddListValueLengthKernel<ListViewType>(func, int32());
+  AddListValueLengthKernel<LargeListViewType>(func, int64());
+  AddListValueLengthKernel<FixedSizeListType>(func, int32());
+}
+
 const FunctionDoc list_value_length_doc{
     "Compute list lengths",
     ("`lists` must have a list-like type.\n"
@@ -98,14 +131,56 @@ std::string ToString(const std::optional<T>& o) {
   return o.has_value() ? ToChars(*o) : "(nullopt)";
 }
 
-template <typename Type>
+/// \param stop User-provided stop or the length of the input list
+int64_t ListSliceLength(int64_t start, int64_t step, int64_t stop) {
+  DCHECK_GE(step, 1);
+  const auto size = std::max<int64_t>(stop - start, 0);
+  return bit_util::CeilDiv(size, step);
+}
+
+std::optional<int64_t> EffectiveSliceStop(const ListSliceOptions& opts,
+                                          const BaseListType& input_type) {
+  if (!opts.stop.has_value() && input_type.id() == Type::FIXED_SIZE_LIST) {
+    return checked_cast<const FixedSizeListType&>(input_type).list_size();
+  }
+  return opts.stop;
+}
+
+Result<TypeHolder> ListSliceOutputType(const ListSliceOptions& opts,
+                                       const BaseListType& input_list_type) {
+  const auto& value_type = input_list_type.field(0);
+  const bool is_fixed_size_list = input_list_type.id() == Type::FIXED_SIZE_LIST;
+  const auto return_fixed_size_list =
+      opts.return_fixed_size_list.value_or(is_fixed_size_list);
+  if (return_fixed_size_list) {
+    auto stop = EffectiveSliceStop(opts, input_list_type);
+    if (!stop.has_value()) {
+      return Status::Invalid(
+          "Unable to produce FixedSizeListArray from non-FixedSizeListArray without "
+          "`stop` being set.");
+    }
+    if (opts.step < 1) {
+      return Status::Invalid("`step` must be >= 1, got: ", opts.step);
+    }
+    const auto length = ListSliceLength(opts.start, opts.step, *stop);
+    return fixed_size_list(value_type, static_cast<int32_t>(length));
+  }
+  if (is_fixed_size_list) {
+    return list(value_type);
+  }
+  return TypeHolder{&input_list_type};
+}
+
+template <typename InListType>
 struct ListSlice {
-  using offset_type = typename Type::offset_type;
+  using offset_type = typename InListType::offset_type;
 
   static Status Exec(KernelContext* ctx, const ExecSpan& batch, ExecResult* out) {
-    const auto opts = OptionsWrapper<ListSliceOptions>::Get(ctx);
+    const auto& opts = OptionsWrapper<ListSliceOptions>::Get(ctx);
+    const ArraySpan& list_array = batch[0].array;
+    const auto* list_type = checked_cast<const BaseListType*>(list_array.type);
 
-    // Invariants
+    // Pre-conditions
     if (opts.start < 0 || (opts.stop.has_value() && opts.start >= opts.stop.value())) {
       // TODO(ARROW-18281): support start == stop which should give empty lists
       return Status::Invalid("`start`(", opts.start,
@@ -116,128 +191,201 @@ struct ListSlice {
       return Status::Invalid("`step` must be >= 1, got: ", opts.step);
     }
 
-    const ArraySpan& list_array = batch[0].array;
-    const Type* list_type = checked_cast<const Type*>(list_array.type);
-    const auto value_type = list_type->field(0);
-    const auto return_fixed_size_list = opts.return_fixed_size_list.value_or(
-        list_type->id() == arrow::Type::FIXED_SIZE_LIST);
-    std::unique_ptr<ArrayBuilder> builder;
-
-    // should have been checked in resolver
-    // if stop not set, then cannot return fixed size list without input being fixed size
-    // list b/c we cannot determine the max list element in type resolving.
-    DCHECK(opts.stop.has_value() ||
-           (!opts.stop.has_value() && (!return_fixed_size_list ||
-                                       list_type->id() == arrow::Type::FIXED_SIZE_LIST)));
-
-    // construct array values
-    if (return_fixed_size_list) {
-      int32_t stop;
-      if (opts.stop.has_value()) {
-        stop = static_cast<int32_t>(opts.stop.value());
-      } else {
-        DCHECK_EQ(list_type->id(), arrow::Type::FIXED_SIZE_LIST);
-        stop = reinterpret_cast<const FixedSizeListType*>(list_type)->list_size();
-      }
-      const auto size = std::max(stop - static_cast<int32_t>(opts.start), 0);
-      const auto length = bit_util::CeilDiv(size, opts.step);
-      RETURN_NOT_OK(MakeBuilder(ctx->memory_pool(),
-                                fixed_size_list(value_type, static_cast<int32_t>(length)),
-                                &builder));
-      RETURN_NOT_OK(BuildArray<FixedSizeListBuilder>(batch, opts, *builder));
-    } else {
-      if constexpr (std::is_same_v<Type, LargeListType>) {
-        RETURN_NOT_OK(MakeBuilder(ctx->memory_pool(), large_list(value_type), &builder));
-        RETURN_NOT_OK(BuildArray<LargeListBuilder>(batch, opts, *builder));
-      } else {
-        RETURN_NOT_OK(MakeBuilder(ctx->memory_pool(), list(value_type), &builder));
-        RETURN_NOT_OK(BuildArray<ListBuilder>(batch, opts, *builder));
-      }
+    auto* pool = ctx->memory_pool();
+    ARROW_ASSIGN_OR_RAISE(auto output_type_holder, ListSliceOutputType(opts, *list_type));
+    constexpr auto kInputTypeId = InListType::type_id;
+    auto output_type = output_type_holder.GetSharedPtr();
+    switch (output_type->id()) {
+      // The various `if constexpr` guards below avoid generating
+      // ListSlice<InListType>::BuildArray<ListBuilder> specializations
+      // that will never be invoked at runtime.
+      case Type::LIST:
+        DCHECK(kInputTypeId == Type::LIST || kInputTypeId == Type::FIXED_SIZE_LIST);
+        if constexpr (kInputTypeId == Type::LIST ||
+                      kInputTypeId == Type::FIXED_SIZE_LIST) {
+          return BuildArray<ListBuilder>(pool, opts, batch, output_type, out);
+        }
+        break;
+      case Type::LARGE_LIST:
+        DCHECK_EQ(kInputTypeId, Type::LARGE_LIST);
+        if constexpr (kInputTypeId == Type::LARGE_LIST) {
+          return BuildArray<LargeListBuilder>(pool, opts, batch, output_type, out);
+        }
+        break;
+      case Type::FIXED_SIZE_LIST:
+        // A fixed-size list can be produced from any list-like input
+        // if ListSliceOptions::return_fixed_size_list is set to true
+        return BuildArray<FixedSizeListBuilder>(pool, opts, batch, output_type, out);
+      case Type::LIST_VIEW:
+        DCHECK_EQ(kInputTypeId, Type::LIST_VIEW);
+        if constexpr (kInputTypeId == Type::LIST_VIEW) {
+          return BuildArray<ListViewBuilder>(pool, opts, batch, output_type, out);
+        }
+        break;
+      case Type::LARGE_LIST_VIEW:
+        DCHECK_EQ(kInputTypeId, Type::LARGE_LIST_VIEW);
+        if constexpr (kInputTypeId == Type::LARGE_LIST_VIEW) {
+          return BuildArray<LargeListViewBuilder>(pool, opts, batch, output_type, out);
+        }
+        break;
+      default:
+        break;
     }
-
-    // build output arrays and set result
-    ARROW_ASSIGN_OR_RAISE(auto result, builder->Finish());
-    out->value = std::move(result->data());
+    Unreachable();
     return Status::OK();
   }
 
+  /// \brief Builds the array of list slices from the input list array
   template <typename BuilderType>
-  static Status BuildArray(const ExecSpan& batch, const ListSliceOptions& opts,
-                           ArrayBuilder& builder) {
-    if constexpr (std::is_same_v<Type, FixedSizeListType>) {
-      RETURN_NOT_OK(BuildArrayFromFixedSizeListType<BuilderType>(batch, opts, builder));
+  static Status BuildArray(MemoryPool* pool, const ListSliceOptions& opts,
+                           const ExecSpan& batch,
+                           const std::shared_ptr<DataType>& output_type,
+                           ExecResult* out) {
+    std::unique_ptr<ArrayBuilder> builder;
+    RETURN_NOT_OK(MakeBuilder(pool, output_type, &builder));
+    auto* list_builder = checked_cast<BuilderType*>(builder.get());
+    RETURN_NOT_OK(list_builder->Resize(batch[0].array.length));
+    if constexpr (std::is_same_v<InListType, FixedSizeListType>) {
+      RETURN_NOT_OK(BuildArrayFromFixedSizeListType(opts.start, opts.step, opts.stop,
+                                                    batch, list_builder));
     } else {
-      RETURN_NOT_OK(BuildArrayFromListType<BuilderType>(batch, opts, builder));
+      RETURN_NOT_OK(BuildArrayFromVarLenListLikeType(opts.start, opts.step, opts.stop,
+                                                     batch, list_builder));
     }
+    std::shared_ptr<ArrayData> result;
+    RETURN_NOT_OK(list_builder->FinishInternal(&result));
+    out->value = std::move(result);
     return Status::OK();
   }
 
   template <typename BuilderType>
-  static Status BuildArrayFromFixedSizeListType(const ExecSpan& batch,
-                                                const ListSliceOptions& opts,
-                                                ArrayBuilder& builder) {
-    const auto list_size =
-        checked_cast<const FixedSizeListType&>(*batch[0].type()).list_size();
+  static Status BuildArrayFromFixedSizeListType(int64_t start, int64_t step,
+                                                std::optional<int64_t> stop,
+                                                const ExecSpan& batch,
+                                                BuilderType* out_list_builder) {
+    static_assert(std::is_same_v<InListType, FixedSizeListType>);
+    constexpr bool kIsFixedSizeOutput = std::is_same_v<BuilderType, FixedSizeListBuilder>;
+    const auto& fsl_type = checked_cast<const FixedSizeListType&>(*batch[0].type());
     const ArraySpan& list_array = batch[0].array;
-    const ArraySpan& list_values = list_array.child_data[0];
-
-    auto list_builder = checked_cast<BuilderType*>(&builder);
-    for (auto i = 0; i < list_array.length; ++i) {
-      auto offset = (i + list_array.offset) * list_size;
-      auto next_offset = offset + list_size;
-      if (list_array.IsNull(i)) {
-        RETURN_NOT_OK(list_builder->AppendNull());
+    const ArraySpan& values_array = list_array.child_data[0];
+    ArrayBuilder* value_builder = out_list_builder->value_builder();
+
+    auto* is_valid = list_array.GetValues<uint8_t>(0, 0);
+    const auto list_size = static_cast<int64_t>(fsl_type.list_size());
+    const int64_t effective_stop = stop.value_or(list_size);
+    int64_t slice_length, value_count;
+    int64_t null_padding = 0;
+    if constexpr (kIsFixedSizeOutput) {
+      if (list_size < effective_stop) {
+        slice_length = ListSliceLength(start, step, effective_stop);
+        value_count = ListSliceLength(start, step, list_size);
+        DCHECK_LE(value_count, slice_length);
+        null_padding = slice_length - value_count;
+      } else {
+        slice_length = ListSliceLength(start, step, effective_stop);
+        value_count = slice_length;
+      }
+    } else {
+      slice_length = ListSliceLength(start, step, std::min(list_size, effective_stop));
+      value_count = slice_length;
+    }
+    int64_t offset = list_array.offset * list_size;
+    for (int64_t i = 0; i < list_array.length; ++i) {
+      if (is_valid && !bit_util::GetBit(is_valid, list_array.offset + i)) {
+        RETURN_NOT_OK(out_list_builder->AppendNull());
       } else {
-        RETURN_NOT_OK(SetValues<BuilderType>(list_builder, offset, next_offset, &opts,
-                                             &list_values));
+        int64_t start_offset = offset + start;
+        RETURN_NOT_OK(AppendListSliceDimensions<kIsFixedSizeOutput>(slice_length,
+                                                                    out_list_builder));
+        RETURN_NOT_OK(AppendListSliceValues(start_offset, step, value_count, null_padding,
+                                            values_array, value_builder));
       }
+      offset += list_size;
     }
     return Status::OK();
   }
 
   template <typename BuilderType>
-  static Status BuildArrayFromListType(const ExecSpan& batch,
-                                       const ListSliceOptions& opts,
-                                       ArrayBuilder& builder) {
+  static Status BuildArrayFromVarLenListLikeType(int64_t start, int64_t step,
+                                                 std::optional<int64_t> stop,
+                                                 const ExecSpan& batch,
+                                                 BuilderType* out_list_builder) {
+    constexpr bool kIsListViewInput = is_list_view(InListType::type_id);
+    constexpr bool kIsFixedSizeOutput = std::is_same_v<BuilderType, FixedSizeListBuilder>;
     const ArraySpan& list_array = batch[0].array;
-    const offset_type* offsets = list_array.GetValues<offset_type>(1);
-
-    const ArraySpan& list_values = list_array.child_data[0];
-
-    auto list_builder = checked_cast<BuilderType*>(&builder);
-    for (auto i = 0; i < list_array.length; ++i) {
+    const ArraySpan& values_array = list_array.child_data[0];
+    ArrayBuilder* value_builder = out_list_builder->value_builder();
+
+    const auto* is_valid = list_array.GetValues<uint8_t>(0, 0);
+    const auto* offsets = list_array.GetValues<offset_type>(1);
+    const offset_type* sizes = nullptr;
+    if constexpr (kIsListViewInput) {
+      sizes = list_array.GetValues<offset_type>(2);
+    }
+    for (int64_t i = 0; i < list_array.length; ++i) {
       const offset_type offset = offsets[i];
-      const offset_type next_offset = offsets[i + 1];
-      if (list_array.IsNull(i)) {
-        RETURN_NOT_OK(list_builder->AppendNull());
+      const int64_t list_size = kIsListViewInput ? sizes[i] : offsets[i + 1] - offset;
+      if (is_valid && !bit_util::GetBit(is_valid, list_array.offset + i)) {
+        RETURN_NOT_OK(out_list_builder->AppendNull());
       } else {
-        RETURN_NOT_OK(SetValues<BuilderType>(list_builder, offset, next_offset, &opts,
-                                             &list_values));
+        int64_t effective_stop = stop.value_or(list_size);
+        int64_t slice_length, value_count;
+        int64_t null_padding = 0;
+        if constexpr (kIsFixedSizeOutput) {
+          if (list_size < effective_stop) {
+            slice_length = ListSliceLength(start, step, effective_stop);
+            value_count = ListSliceLength(start, step, list_size);
+            DCHECK_LE(value_count, slice_length);
+            null_padding = slice_length - value_count;
+          } else {
+            slice_length = ListSliceLength(start, step, effective_stop);
+            value_count = slice_length;
+          }
+        } else {
+          slice_length =
+              ListSliceLength(start, step, std::min(list_size, effective_stop));
+          value_count = slice_length;
+        }
+        RETURN_NOT_OK(AppendListSliceDimensions<kIsFixedSizeOutput>(slice_length,
+                                                                    out_list_builder));
+        RETURN_NOT_OK(AppendListSliceValues(offset + start, step, value_count,
+                                            null_padding, values_array, value_builder));
       }
     }
     return Status::OK();
   }
-  template <typename BuilderType>
-  static Status SetValues(BuilderType* list_builder, const offset_type offset,
-                          const offset_type next_offset, const ListSliceOptions* opts,
-                          const ArraySpan* list_values) {
-    auto value_builder = list_builder->value_builder();
-    auto cursor = offset;
-
-    RETURN_NOT_OK(list_builder->Append());
-    const auto size = opts->stop.has_value() ? (opts->stop.value() - opts->start)
-                                             : ((next_offset - opts->start) - offset);
-    while (cursor < offset + size) {
-      if (cursor + opts->start >= next_offset) {
-        if constexpr (!std::is_same_v<BuilderType, FixedSizeListBuilder>) {
-          break;  // don't pad nulls for variable sized list output
-        }
-        RETURN_NOT_OK(value_builder->AppendNull());
-      } else {
+
+  template <bool kIsFixedSizeOutput, typename BuilderType>
+  static Status AppendListSliceDimensions(int64_t slice_length,
+                                          BuilderType* out_list_builder) {
+    if constexpr (kIsFixedSizeOutput) {
+      DCHECK_EQ(out_list_builder->type()->id(), Type::FIXED_SIZE_LIST);
+      return out_list_builder->Append();
+    } else {
+      return out_list_builder->Append(/*is_valid=*/true, slice_length);
+    }
+  }
+
+  /// \param value_count The pre-validated number of values to append starting
+  ///                    from `start_offset` with a step of `step`
+  /// \param null_padding The number of nulls to append after the values
+  static Status AppendListSliceValues(int64_t start_offset, int64_t step,
+                                      int64_t value_count, int64_t null_padding,
+                                      const ArraySpan& values_array,
+                                      ArrayBuilder* out_value_builder) {
+    if (step == 1) {
+      RETURN_NOT_OK(
+          out_value_builder->AppendArraySlice(values_array, start_offset, value_count));
+    } else {
+      auto cursor_offset = start_offset;
+      for (int64_t i = 0; i < value_count; i++) {
         RETURN_NOT_OK(
-            value_builder->AppendArraySlice(*list_values, cursor + opts->start, 1));
+            out_value_builder->AppendArraySlice(values_array, cursor_offset, 1));
+        cursor_offset += step;
       }
-      cursor += static_cast<offset_type>(opts->step);
+    }
+    if (null_padding > 0) {
+      RETURN_NOT_OK(out_value_builder->AppendNulls(null_padding));
     }
     return Status::OK();
   }
@@ -246,36 +394,8 @@ struct ListSlice {
 Result<TypeHolder> MakeListSliceResolve(KernelContext* ctx,
                                         const std::vector<TypeHolder>& types) {
   const auto& opts = OptionsWrapper<ListSliceOptions>::Get(ctx);
-  const auto list_type = checked_cast<const BaseListType*>(types[0].type);
-  const auto value_type = list_type->field(0);
-  const auto return_fixed_size_list =
-      opts.return_fixed_size_list.value_or(list_type->id() == Type::FIXED_SIZE_LIST);
-  if (return_fixed_size_list) {
-    int32_t stop;
-    if (!opts.stop.has_value()) {
-      if (list_type->id() == Type::FIXED_SIZE_LIST) {
-        stop = checked_cast<const FixedSizeListType*>(list_type)->list_size();
-      } else {
-        return Status::NotImplemented(
-            "Unable to produce FixedSizeListArray from non-FixedSizeListArray without "
-            "`stop` being set.");
-      }
-    } else {
-      stop = static_cast<int32_t>(opts.stop.value());
-    }
-    const auto size = std::max(static_cast<int32_t>(stop - opts.start), 0);
-    if (opts.step < 1) {
-      return Status::Invalid("`step` must be >= 1, got: ", opts.step);
-    }
-    const auto length = bit_util::CeilDiv(size, opts.step);
-    return fixed_size_list(value_type, static_cast<int32_t>(length));
-  } else {
-    // Returning large list if that's what we got in and didn't ask for fixed size
-    if (list_type->id() == Type::LARGE_LIST) {
-      return large_list(value_type);
-    }
-    return list(value_type);
-  }
+  const auto* list_type = checked_cast<const BaseListType*>(types[0].type);
+  return ListSliceOutputType(opts, *list_type);
 }
 
 template <typename InListType>
@@ -293,6 +413,8 @@ void AddListSliceKernels(ScalarFunction* func) {
   AddListSliceKernels<ListType>(func);
   AddListSliceKernels<LargeListType>(func);
   AddListSliceKernels<FixedSizeListType>(func);
+  AddListSliceKernels<ListViewType>(func);
+  AddListSliceKernels<LargeListViewType>(func);
 }
 
 const FunctionDoc list_slice_doc(
@@ -399,6 +521,8 @@ void AddListElementKernels(ScalarFunction* func) {
 void AddListElementKernels(ScalarFunction* func) {
   AddListElementKernels<ListType, ListElement>(func);
   AddListElementKernels<LargeListType, ListElement>(func);
+  AddListElementKernels<ListViewType, ListElement>(func);
+  AddListElementKernels<LargeListViewType, ListElement>(func);
   AddListElementKernels<FixedSizeListType, FixedSizeListElement>(func);
 }
 
@@ -824,12 +948,7 @@ const FunctionDoc map_lookup_doc{
 void RegisterScalarNested(FunctionRegistry* registry) {
   auto list_value_length = std::make_shared<ScalarFunction>(
       "list_value_length", Arity::Unary(), list_value_length_doc);
-  DCHECK_OK(list_value_length->AddKernel({InputType(Type::LIST)}, int32(),
-                                         ListValueLength<ListType>));
-  DCHECK_OK(list_value_length->AddKernel({InputType(Type::FIXED_SIZE_LIST)}, int32(),
-                                         FixedSizeListValueLength));
-  DCHECK_OK(list_value_length->AddKernel({InputType(Type::LARGE_LIST)}, int64(),
-                                         ListValueLength<LargeListType>));
+  AddListValueLengthKernels(list_value_length.get());
   DCHECK_OK(registry->AddFunction(std::move(list_value_length)));
 
   auto list_element =
diff --git a/cpp/src/arrow/compute/kernels/scalar_nested_test.cc b/cpp/src/arrow/compute/kernels/scalar_nested_test.cc
index a72ec99620b82..b6a6cac1b4382 100644
--- a/cpp/src/arrow/compute/kernels/scalar_nested_test.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_nested_test.cc
@@ -30,11 +30,21 @@ namespace arrow {
 namespace compute {
 
 static std::shared_ptr<DataType> GetOffsetType(const DataType& type) {
-  return type.id() == Type::LIST ? int32() : int64();
+  switch (type.id()) {
+    case Type::LIST:
+    case Type::LIST_VIEW:
+      return int32();
+    case Type::LARGE_LIST:
+    case Type::LARGE_LIST_VIEW:
+      return int64();
+    default:
+      Unreachable("Unexpected type");
+  }
 }
 
 TEST(TestScalarNested, ListValueLength) {
-  for (auto ty : {list(int32()), large_list(int32())}) {
+  for (auto ty : {list(int32()), large_list(int32()), list_view(int32()),
+                  large_list_view(int32())}) {
     CheckScalarUnary("list_value_length", ty, "[[0, null, 1], null, [2, 3], []]",
                      GetOffsetType(*ty), "[3, null, 2, 0]");
   }
@@ -47,7 +57,8 @@ TEST(TestScalarNested, ListValueLength) {
 TEST(TestScalarNested, ListElementNonFixedListWithNulls) {
   auto sample = "[[7, 5, 81], [6, null, 4, 7, 8], [3, 12, 2, 0], [1, 9], null]";
   for (auto ty : NumericTypes()) {
-    for (auto list_type : {list(ty), large_list(ty)}) {
+    for (auto list_type :
+         {list(ty), large_list(ty), list_view(ty), large_list_view(ty)}) {
       auto input = ArrayFromJSON(list_type, sample);
       auto null_input = ArrayFromJSON(list_type, "[null]");
       for (auto index_type : IntTypes()) {
@@ -117,33 +128,45 @@ TEST(TestScalarNested, ListElementInvalid) {
               Raises(StatusCode::Invalid));
 }
 
+using VarLenListLikeTypeFactory =
+    std::shared_ptr<DataType> (*)(std::shared_ptr<DataType>);
+static const VarLenListLikeTypeFactory kVarLenListTypeFactories[] = {
+    list,
+    large_list,
+    list_view,
+    large_list_view,
+};
+
 TEST(TestScalarNested, ListSliceVariableOutput) {
   const auto value_types = {float32(), int32()};
   for (auto value_type : value_types) {
-    auto input = ArrayFromJSON(list(value_type), "[[1, 2, 3], [4, 5], [6], null]");
-    ListSliceOptions args(/*start=*/0, /*stop=*/2, /*step=*/1,
-                          /*return_fixed_size_list=*/false);
-    auto expected = ArrayFromJSON(list(value_type), "[[1, 2], [4, 5], [6], null]");
-    CheckScalarUnary("list_slice", input, expected, &args);
+    for (auto list_type_factory : kVarLenListTypeFactories) {
+      ListSliceOptions args(/*start=*/0, /*stop=*/2, /*step=*/1,
+                            /*return_fixed_size_list=*/false);
+      auto list_ty = list_type_factory(value_type);
+      auto input = ArrayFromJSON(list_ty, "[[1, 2, 3], [4, 5], [6], null]");
+      auto expected = ArrayFromJSON(list_ty, "[[1, 2], [4, 5], [6], null]");
+      CheckScalarUnary("list_slice", input, expected, &args);
 
-    args.start = 1;
-    expected = ArrayFromJSON(list(value_type), "[[2], [5], [], null]");
-    CheckScalarUnary("list_slice", input, expected, &args);
+      args.start = 1;
+      expected = ArrayFromJSON(list_ty, "[[2], [5], [], null]");
+      CheckScalarUnary("list_slice", input, expected, &args);
 
-    args.start = 2;
-    args.stop = 4;
-    expected = ArrayFromJSON(list(value_type), "[[3], [], [], null]");
-    CheckScalarUnary("list_slice", input, expected, &args);
+      args.start = 2;
+      args.stop = 4;
+      expected = ArrayFromJSON(list_ty, "[[3], [], [], null]");
+      CheckScalarUnary("list_slice", input, expected, &args);
 
-    args.start = 1;
-    args.stop = std::nullopt;
-    expected = ArrayFromJSON(list(value_type), "[[2, 3], [5], [], null]");
-    CheckScalarUnary("list_slice", input, expected, &args);
+      args.start = 1;
+      args.stop = std::nullopt;
+      expected = ArrayFromJSON(list_ty, "[[2, 3], [5], [], null]");
+      CheckScalarUnary("list_slice", input, expected, &args);
 
-    args.start = 0;
-    args.stop = 4;
-    args.step = 2;
-    expected = ArrayFromJSON(list(value_type), "[[1, 3], [4], [6], null]");
+      args.start = 0;
+      args.stop = 4;
+      args.step = 2;
+      expected = ArrayFromJSON(list_ty, "[[1, 3], [4], [6], null]");
+    }
   }
 
   // Verify passing `return_fixed_size_list=false` with fixed size input
@@ -158,9 +181,13 @@ TEST(TestScalarNested, ListSliceVariableOutput) {
 TEST(TestScalarNested, ListSliceFixedOutput) {
   const auto value_types = {float32(), int32()};
   for (auto value_type : value_types) {
-    auto inputs = {ArrayFromJSON(list(value_type), "[[1, 2, 3], [4, 5], [6], null]"),
-                   ArrayFromJSON(fixed_size_list(value_type, 3),
-                                 "[[1, 2, 3], [4, 5, null], [6, null, null], null]")};
+    const char* kVarLenListJSON = "[[1, 2, 3], [4, 5], [6], null]";
+    const char* kFixedSizeListJSON = "[[1, 2, 3], [4, 5, null], [6, null, null], null]";
+    std::vector<std::shared_ptr<Array>> inputs;
+    for (auto list_type_factory : kVarLenListTypeFactories) {
+      inputs.push_back(ArrayFromJSON(list_type_factory(value_type), kVarLenListJSON));
+    }
+    inputs.push_back(ArrayFromJSON(fixed_size_list(value_type, 3), kFixedSizeListJSON));
     for (auto input : inputs) {
       ListSliceOptions args(/*start=*/0, /*stop=*/2, /*step=*/1,
                             /*return_fixed_size_list=*/true);
@@ -187,7 +214,7 @@ TEST(TestScalarNested, ListSliceFixedOutput) {
         CheckScalarUnary("list_slice", input, expected, &args);
       } else {
         EXPECT_RAISES_WITH_MESSAGE_THAT(
-            NotImplemented,
+            Invalid,
             ::testing::HasSubstr("Unable to produce FixedSizeListArray from "
                                  "non-FixedSizeListArray without `stop` being set."),
             CallFunction("list_slice", {input}, &args));
@@ -253,22 +280,25 @@ TEST(TestScalarNested, ListSliceChildArrayOffset) {
   ASSERT_EQ(input->offset(), 0);
   ASSERT_EQ(input->values()->offset(), 2);
 
-  ListSliceOptions args(/*start=*/0, /*stop=*/2, /*step=*/1,
+  ListSliceOptions args(/*start=*/0, /*stop=*/3, /*step=*/1,
                         /*return_fixed_size_list=*/false);
   auto expected = ArrayFromJSON(list(int8()), "[[2], [3, 4]]");
   CheckScalarUnary("list_slice", input, expected, &args);
 
   args.return_fixed_size_list = true;
-  expected = ArrayFromJSON(fixed_size_list(int8(), 2), "[[2, null], [3, 4]]");
+  expected = ArrayFromJSON(fixed_size_list(int8(), 3), "[[2, null, null], [3, 4, null]]");
   CheckScalarUnary("list_slice", input, expected, &args);
 }
 
 TEST(TestScalarNested, ListSliceOutputEqualsInputType) {
+  const char* kVarLenListJSON = "[[1, 2, 3], [4, 5], [6, null], null]";
+  const char* kFixedLenListJSON = "[[1, 2], [4, 5], [6, null], null]";
   // Default is to return same type as the one passed in.
-  auto inputs = {
-      ArrayFromJSON(list(int8()), "[[1, 2, 3], [4, 5], [6, null], null]"),
-      ArrayFromJSON(large_list(int8()), "[[1, 2, 3], [4, 5], [6, null], null]"),
-      ArrayFromJSON(fixed_size_list(int8(), 2), "[[1, 2], [4, 5], [6, null], null]")};
+  std::vector<std::shared_ptr<Array>> inputs;
+  for (auto list_type_factory : kVarLenListTypeFactories) {
+    inputs.push_back(ArrayFromJSON(list_type_factory(int8()), kVarLenListJSON));
+  }
+  inputs.push_back(ArrayFromJSON(fixed_size_list(int8(), 2), kFixedLenListJSON));
   for (auto input : inputs) {
     ListSliceOptions args(/*start=*/0, /*stop=*/2, /*step=*/1);
     auto expected = ArrayFromJSON(input->type(), "[[1, 2], [4, 5], [6, null], null]");
@@ -305,10 +335,9 @@ TEST(TestScalarNested, ListSliceBadParameters) {
   // stop not set and FixedSizeList requested with variable sized input
   args.stop = std::nullopt;
   EXPECT_RAISES_WITH_MESSAGE_THAT(
-      NotImplemented,
-      ::testing::HasSubstr("NotImplemented: Unable to produce FixedSizeListArray from "
-                           "non-FixedSizeListArray without "
-                           "`stop` being set."),
+      Invalid,
+      ::testing::HasSubstr("Invalid: Unable to produce FixedSizeListArray from "
+                           "non-FixedSizeListArray without `stop` being set."),
       CallFunction("list_slice", {input}, &args));
   // Catch step must be >= 1
   args.start = 0;
diff --git a/cpp/src/arrow/compute/kernels/scalar_string_ascii.cc b/cpp/src/arrow/compute/kernels/scalar_string_ascii.cc
index 038e623b43c53..fecd57412b436 100644
--- a/cpp/src/arrow/compute/kernels/scalar_string_ascii.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_string_ascii.cc
@@ -1142,9 +1142,13 @@ struct AsciiPadTransform : public StringTransformBase {
     int64_t left = 0;
     int64_t right = 0;
     if (PadLeft && PadRight) {
-      // If odd number of spaces, put the extra space on the right
-      left = spaces / 2;
-      right = spaces - left;
+      if (options_.lean_left_on_odd_padding) {
+        left = spaces / 2;
+        right = spaces - left;
+      } else {
+        right = spaces / 2;
+        left = spaces - right;
+      }
     } else if (PadLeft) {
       left = spaces;
     } else if (PadRight) {
@@ -1315,7 +1319,7 @@ struct RegexSubstringMatcher {
       const MatchSubstringOptions& options, bool is_utf8 = true, bool literal = false) {
     auto matcher = std::make_unique<RegexSubstringMatcher>(options, is_utf8, literal);
     RETURN_NOT_OK(RegexStatus(matcher->regex_match_));
-    return std::move(matcher);
+    return matcher;
   }
 
   explicit RegexSubstringMatcher(const MatchSubstringOptions& options,
@@ -1685,7 +1689,7 @@ struct FindSubstringRegex {
                                          bool is_utf8 = true, bool literal = false) {
     auto matcher = FindSubstringRegex(options, is_utf8, literal);
     RETURN_NOT_OK(RegexStatus(*matcher.regex_match_));
-    return std::move(matcher);
+    return matcher;
   }
 
   explicit FindSubstringRegex(const MatchSubstringOptions& options, bool is_utf8 = true,
@@ -1832,7 +1836,7 @@ struct CountSubstringRegex {
                                           bool is_utf8 = true, bool literal = false) {
     CountSubstringRegex counter(options, is_utf8, literal);
     RETURN_NOT_OK(RegexStatus(*counter.regex_match_));
-    return std::move(counter);
+    return counter;
   }
 
   template <typename OutValue, typename... Ignored>
@@ -2055,7 +2059,7 @@ struct RegexSubstringReplacer {
                              std::move(replacement_error));
     }
 
-    return std::move(replacer);
+    return replacer;
   }
 
   // Using RE2::FindAndConsume we can only find the pattern if it is a group, therefore
@@ -2203,7 +2207,7 @@ struct ExtractRegexData {
       }
       data.group_names.emplace_back(item->second);
     }
-    return std::move(data);
+    return data;
   }
 
   Result<TypeHolder> ResolveOutputType(const std::vector<TypeHolder>& types) const {
diff --git a/cpp/src/arrow/compute/kernels/scalar_string_test.cc b/cpp/src/arrow/compute/kernels/scalar_string_test.cc
index 26289a7f787e1..0a2261290846a 100644
--- a/cpp/src/arrow/compute/kernels/scalar_string_test.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_string_test.cc
@@ -1988,6 +1988,11 @@ TYPED_TEST(TestBaseBinaryKernels, ExtractRegexInvalid) {
 #endif
 
 TYPED_TEST(TestStringKernels, Strptime) {
+#ifdef __EMSCRIPTEN__
+  GTEST_SKIP() << "Skipping some strptime tests due to emscripten bug "
+                  "https://github.com/emscripten-core/emscripten/issues/20466";
+#endif
+
   std::string input1 = R"(["5/1/2020", null, null, "12/13/1900", null])";
   std::string input2 = R"(["5-1-2020", "12/13/1900"])";
   std::string input3 = R"(["5/1/2020", "AA/BB/CCCC"])";
@@ -2008,6 +2013,7 @@ TYPED_TEST(TestStringKernels, Strptime) {
   this->CheckUnary("strptime", input4, unit, output4, &options);
 
   options.format = "%m/%d/%Y %%z";
+  // emscripten bug https://github.com/emscripten-core/emscripten/issues/20466
   this->CheckUnary("strptime", input5, unit, output1, &options);
 
   options.error_is_null = false;
@@ -2019,6 +2025,11 @@ TYPED_TEST(TestStringKernels, Strptime) {
 }
 
 TYPED_TEST(TestStringKernels, StrptimeZoneOffset) {
+#ifdef __EMSCRIPTEN__
+  GTEST_SKIP()
+      << "Emscripten bug https://github.com/emscripten-core/emscripten/issues/20467";
+#endif
+
   if (!arrow::internal::kStrptimeSupportsZone) {
     GTEST_SKIP() << "strptime does not support %z on this platform";
   }
@@ -2106,6 +2117,12 @@ TYPED_TEST(TestStringKernels, PadUTF8) {
       R"([null, "a\u2008\u2008\u2008\u2008", "bb\u2008\u2008\u2008", "b\u00E1r\u2008\u2008", "foobar"])",
       &options);
 
+  PadOptions options2{/*width=*/5, "\xe2\x80\x88", /*lean_left_on_odd_padding=*/false};
+  this->CheckUnary(
+      "utf8_center", R"([null, "a", "bb", "b\u00E1r", "foobar"])", this->type(),
+      R"([null, "\u2008\u2008a\u2008\u2008", "\u2008\u2008bb\u2008", "\u2008b\u00E1r\u2008", "foobar"])",
+      &options2);
+
   PadOptions options_bad{/*width=*/3, /*padding=*/"spam"};
   auto input = ArrayFromJSON(this->type(), R"(["foo"])");
   EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
@@ -2448,6 +2465,10 @@ TYPED_TEST(TestStringKernels, PadAscii) {
   this->CheckUnary("ascii_rpad", R"([null, "a", "bb", "bar", "foobar"])", this->type(),
                    R"([null, "a    ", "bb   ", "bar  ", "foobar"])", &options);
 
+  PadOptions options2{/*width=*/5, " ", /*lean_left_on_odd_padding=*/false};
+  this->CheckUnary("ascii_center", R"([null, "a", "bb", "bar", "foobar"])", this->type(),
+                   R"([null, "  a  ", "  bb ", " bar ", "foobar"])", &options2);
+
   PadOptions options_bad{/*width=*/3, /*padding=*/"spam"};
   auto input = ArrayFromJSON(this->type(), R"(["foo"])");
   EXPECT_RAISES_WITH_MESSAGE_THAT(Invalid,
diff --git a/cpp/src/arrow/compute/kernels/scalar_string_utf8.cc b/cpp/src/arrow/compute/kernels/scalar_string_utf8.cc
index d720d4eee804f..42762ca8b116f 100644
--- a/cpp/src/arrow/compute/kernels/scalar_string_utf8.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_string_utf8.cc
@@ -930,9 +930,13 @@ struct Utf8PadTransform : public StringTransformBase {
     int64_t left = 0;
     int64_t right = 0;
     if (PadLeft && PadRight) {
-      // If odd number of spaces, put the extra space on the right
-      left = spaces / 2;
-      right = spaces - left;
+      if (options_.lean_left_on_odd_padding) {
+        left = spaces / 2;
+        right = spaces - left;
+      } else {
+        right = spaces / 2;
+        left = spaces - right;
+      }
     } else if (PadLeft) {
       left = spaces;
     } else if (PadRight) {
diff --git a/cpp/src/arrow/compute/kernels/scalar_temporal_test.cc b/cpp/src/arrow/compute/kernels/scalar_temporal_test.cc
index 8dac6525fe2e6..8da8c760ea22b 100644
--- a/cpp/src/arrow/compute/kernels/scalar_temporal_test.cc
+++ b/cpp/src/arrow/compute/kernels/scalar_temporal_test.cc
@@ -2143,7 +2143,10 @@ TEST_F(ScalarTemporalTest, StrftimeCLocale) {
 TEST_F(ScalarTemporalTest, StrftimeOtherLocale) {
 #ifdef _WIN32
   GTEST_SKIP() << "There is a known bug in strftime for locales on Windows (ARROW-15922)";
-#else
+#elif defined(__EMSCRIPTEN__)
+  GTEST_SKIP() << "Emscripten doesn't build with multiple locales as default";
+#endif
+
   if (!LocaleExists("fr_FR.UTF-8")) {
     GTEST_SKIP() << "locale 'fr_FR.UTF-8' doesn't exist on this system";
   }
@@ -2155,10 +2158,12 @@ TEST_F(ScalarTemporalTest, StrftimeOtherLocale) {
       ["01 janvier 1970 00:00:59,123", "18 août 2021 15:11:50,456", null])";
   CheckScalarUnary("strftime", timestamp(TimeUnit::MILLI, "UTC"), milliseconds, utf8(),
                    expected, &options);
-#endif
 }
 
 TEST_F(ScalarTemporalTest, StrftimeInvalidLocale) {
+#ifdef __EMSCRIPTEN__
+  GTEST_SKIP() << "Emscripten doesn't build with multiple locales as default";
+#endif
   auto options = StrftimeOptions("%d %B %Y %H:%M:%S", "nonexistent");
   const char* seconds = R"(["1970-01-01T00:00:59", null])";
   auto arr = ArrayFromJSON(timestamp(TimeUnit::SECOND, "UTC"), seconds);
diff --git a/cpp/src/arrow/compute/kernels/test_util.cc b/cpp/src/arrow/compute/kernels/test_util.cc
index 23d0fd18d578a..2217787663a63 100644
--- a/cpp/src/arrow/compute/kernels/test_util.cc
+++ b/cpp/src/arrow/compute/kernels/test_util.cc
@@ -31,6 +31,7 @@
 #include "arrow/datum.h"
 #include "arrow/result.h"
 #include "arrow/table.h"
+#include "arrow/testing/fixed_width_test_util.h"
 #include "arrow/testing/gtest_util.h"
 
 namespace arrow {
diff --git a/cpp/src/arrow/compute/kernels/vector_hash.cc b/cpp/src/arrow/compute/kernels/vector_hash.cc
index 800deba3a5ed2..5067298858132 100644
--- a/cpp/src/arrow/compute/kernels/vector_hash.cc
+++ b/cpp/src/arrow/compute/kernels/vector_hash.cc
@@ -530,7 +530,8 @@ Result<std::unique_ptr<KernelState>> HashInit(KernelContext* ctx,
   auto result = std::make_unique<HashKernel>(args.inputs[0].GetSharedPtr(), args.options,
                                              ctx->memory_pool());
   RETURN_NOT_OK(result->Reset());
-  return std::move(result);
+  // R build with openSUSE155 requires an explicit unique_ptr construction
+  return std::unique_ptr<KernelState>(std::move(result));
 }
 
 template <typename Action>
@@ -697,13 +698,12 @@ void AddHashKernels(VectorFunction* func, VectorKernel base, OutputType out_ty)
     DCHECK_OK(func->AddKernel(base));
   }
 
-  // Example parametric types that we want to match only on Type::type
-  auto parametric_types = {time32(TimeUnit::SECOND), time64(TimeUnit::MICRO),
-                           timestamp(TimeUnit::SECOND), duration(TimeUnit::SECOND),
-                           fixed_size_binary(0)};
-  for (const auto& ty : parametric_types) {
-    base.init = GetHashInit<Action>(ty->id());
-    base.signature = KernelSignature::Make({ty->id()}, out_ty);
+  // Parametric types that we want matching to be dependent only on type id
+  auto parametric_types = {Type::TIME32, Type::TIME64, Type::TIMESTAMP, Type::DURATION,
+                           Type::FIXED_SIZE_BINARY};
+  for (const auto& type_id : parametric_types) {
+    base.init = GetHashInit<Action>(type_id);
+    base.signature = KernelSignature::Make({type_id}, out_ty);
     DCHECK_OK(func->AddKernel(base));
   }
 
diff --git a/cpp/src/arrow/compute/kernels/vector_nested.cc b/cpp/src/arrow/compute/kernels/vector_nested.cc
index 08930e589f7b4..955f9b8cbd14c 100644
--- a/cpp/src/arrow/compute/kernels/vector_nested.cc
+++ b/cpp/src/arrow/compute/kernels/vector_nested.cc
@@ -18,19 +18,32 @@
 // Vector kernels involving nested types
 
 #include "arrow/array/array_base.h"
+#include "arrow/compute/api_vector.h"
 #include "arrow/compute/kernels/common_internal.h"
 #include "arrow/result.h"
+#include "arrow/util/bit_run_reader.h"
+#include "arrow/util/bit_util.h"
+#include "arrow/util/list_util.h"
 #include "arrow/visit_type_inline.h"
 
 namespace arrow {
+
+using internal::CountSetBits;
+using list_util::internal::RangeOfValuesUsed;
+
 namespace compute {
 namespace internal {
 namespace {
 
 template <typename Type>
 Status ListFlatten(KernelContext* ctx, const ExecSpan& batch, ExecResult* out) {
+  auto recursive = OptionsWrapper<ListFlattenOptions>::Get(ctx).recursive;
   typename TypeTraits<Type>::ArrayType list_array(batch[0].array.ToArrayData());
-  ARROW_ASSIGN_OR_RAISE(auto result, list_array.Flatten(ctx->memory_pool()));
+
+  auto pool = ctx->memory_pool();
+  ARROW_ASSIGN_OR_RAISE(auto result, (recursive ? list_array.FlattenRecursively(pool)
+                                                : list_array.Flatten(pool)));
+
   out->value = std::move(result->data());
   return Status::OK();
 }
@@ -70,6 +83,63 @@ struct ListParentIndicesArray {
 
   Status Visit(const LargeListType& type) { return VisitList(type); }
 
+  template <typename Type, typename offset_type = typename Type::offset_type>
+  Status VisitListView(const Type&) {
+    ArraySpan list_view{*input};
+
+    const offset_type* offsets = list_view.GetValues<offset_type>(1);
+    const offset_type* sizes = list_view.GetValues<offset_type>(2);
+    int64_t values_offset;
+    int64_t values_length;
+    ARROW_ASSIGN_OR_RAISE(std::tie(values_offset, values_length),
+                          RangeOfValuesUsed(list_view));
+
+    ARROW_ASSIGN_OR_RAISE(auto indices_validity,
+                          AllocateEmptyBitmap(values_length, ctx->memory_pool()));
+    auto* out_indices_validity = indices_validity->mutable_data();
+    int64_t total_pop_count = 0;
+
+    ARROW_ASSIGN_OR_RAISE(auto indices, ctx->Allocate(values_length * sizeof(int64_t)));
+    auto* out_indices = indices->template mutable_data_as<int64_t>();
+    memset(out_indices, -1, values_length * sizeof(int64_t));
+
+    const auto* validity = list_view.GetValues<uint8_t>(0, 0);
+    RETURN_NOT_OK(arrow::internal::VisitSetBitRuns(
+        validity, list_view.offset, list_view.length,
+        [this, offsets, sizes, out_indices, out_indices_validity, values_offset,
+         &total_pop_count](int64_t run_start, int64_t run_length) {
+          for (int64_t i = run_start; i < run_start + run_length; ++i) {
+            auto validity_offset = offsets[i] - values_offset;
+            const int64_t pop_count =
+                CountSetBits(out_indices_validity, validity_offset, sizes[i]);
+            if (ARROW_PREDICT_FALSE(pop_count > 0)) {
+              return Status::Invalid(
+                  "Function 'list_parent_indices' cannot produce parent indices for "
+                  "values used by more than one list-view array element.");
+            }
+            bit_util::SetBitmap(out_indices_validity, validity_offset, sizes[i]);
+            total_pop_count += sizes[i];
+            for (auto j = static_cast<int64_t>(offsets[i]);
+                 j < static_cast<int64_t>(offsets[i]) + sizes[i]; ++j) {
+              out_indices[j - values_offset] = i + base_output_offset;
+            }
+          }
+          return Status::OK();
+        }));
+
+    DCHECK_LE(total_pop_count, values_length);
+    const int64_t null_count = values_length - total_pop_count;
+    BufferVector buffers{null_count > 0 ? std::move(indices_validity) : nullptr,
+                         std::move(indices)};
+    out = std::make_shared<ArrayData>(int64(), values_length, std::move(buffers),
+                                      null_count);
+    return Status::OK();
+  }
+
+  Status Visit(const ListViewType& type) { return VisitListView(type); }
+
+  Status Visit(const LargeListViewType& type) { return VisitListView(type); }
+
   Status Visit(const FixedSizeListType& type) {
     using offset_type = typename FixedSizeListType::offset_type;
     const offset_type slot_length = type.list_size();
@@ -107,14 +177,19 @@ struct ListParentIndicesArray {
 
 const FunctionDoc list_flatten_doc(
     "Flatten list values",
-    ("`lists` must have a list-like type.\n"
-     "Return an array with the top list level flattened.\n"
-     "Top-level null values in `lists` do not emit anything in the input."),
-    {"lists"});
+    ("`lists` must have a list-like type (lists, list-views, and\n"
+     "fixed-size lists).\n"
+     "Return an array with the top list level flattened unless\n"
+     "`recursive` is set to true in ListFlattenOptions. When that\n"
+     "is that case, flattening happens recursively until a non-list\n"
+     "array is formed.\n"
+     "\n"
+     "Null list values do not emit anything to the output."),
+    {"lists"}, "ListFlattenOptions");
 
 const FunctionDoc list_parent_indices_doc(
     "Compute parent indices of nested list values",
-    ("`lists` must have a list-like type.\n"
+    ("`lists` must have a list-like or list-view type.\n"
      "For each value in each list of `lists`, the top-level list index\n"
      "is emitted."),
     {"lists"});
@@ -136,6 +211,7 @@ class ListParentIndicesFunction : public MetaFunction {
 
         int64_t base_output_offset = 0;
         ArrayVector out_chunks;
+        out_chunks.reserve(input->num_chunks());
         for (const auto& chunk : input->chunks()) {
           ARROW_ASSIGN_OR_RAISE(auto out_chunk,
                                 ListParentIndicesArray::Exec(&kernel_ctx, chunk->data(),
@@ -153,17 +229,34 @@ class ListParentIndicesFunction : public MetaFunction {
   }
 };
 
+const ListFlattenOptions* GetDefaultListFlattenOptions() {
+  static const auto kDefaultListFlattenOptions = ListFlattenOptions::Defaults();
+  return &kDefaultListFlattenOptions;
+}
+
+template <typename InListType>
+void AddBaseListFlattenKernels(VectorFunction* func) {
+  auto in_type = {InputType(InListType::type_id)};
+  auto out_type = OutputType(ListValuesType);
+  VectorKernel kernel(in_type, out_type, ListFlatten<InListType>,
+                      OptionsWrapper<ListFlattenOptions>::Init);
+  DCHECK_OK(func->AddKernel(std::move(kernel)));
+}
+
+void AddBaseListFlattenKernels(VectorFunction* func) {
+  AddBaseListFlattenKernels<ListType>(func);
+  AddBaseListFlattenKernels<LargeListType>(func);
+  AddBaseListFlattenKernels<FixedSizeListType>(func);
+  AddBaseListFlattenKernels<ListViewType>(func);
+  AddBaseListFlattenKernels<LargeListViewType>(func);
+}
+
 }  // namespace
 
 void RegisterVectorNested(FunctionRegistry* registry) {
-  auto flatten =
-      std::make_shared<VectorFunction>("list_flatten", Arity::Unary(), list_flatten_doc);
-  DCHECK_OK(flatten->AddKernel({Type::LIST}, OutputType(ListValuesType),
-                               ListFlatten<ListType>));
-  DCHECK_OK(flatten->AddKernel({Type::FIXED_SIZE_LIST}, OutputType(ListValuesType),
-                               ListFlatten<FixedSizeListType>));
-  DCHECK_OK(flatten->AddKernel({Type::LARGE_LIST}, OutputType(ListValuesType),
-                               ListFlatten<LargeListType>));
+  auto flatten = std::make_shared<VectorFunction>(
+      "list_flatten", Arity::Unary(), list_flatten_doc, GetDefaultListFlattenOptions());
+  AddBaseListFlattenKernels(flatten.get());
   DCHECK_OK(registry->AddFunction(std::move(flatten)));
 
   DCHECK_OK(registry->AddFunction(std::make_shared<ListParentIndicesFunction>()));
diff --git a/cpp/src/arrow/compute/kernels/vector_nested_test.cc b/cpp/src/arrow/compute/kernels/vector_nested_test.cc
index eef1b6835ffb5..da751fa5de403 100644
--- a/cpp/src/arrow/compute/kernels/vector_nested_test.cc
+++ b/cpp/src/arrow/compute/kernels/vector_nested_test.cc
@@ -19,6 +19,7 @@
 
 #include "arrow/chunked_array.h"
 #include "arrow/compute/api.h"
+#include "arrow/compute/api_vector.h"
 #include "arrow/compute/kernels/test_util.h"
 #include "arrow/result.h"
 #include "arrow/testing/gtest_util.h"
@@ -29,38 +30,113 @@ namespace compute {
 
 using arrow::internal::checked_cast;
 
-TEST(TestVectorNested, ListFlatten) {
-  for (auto ty : {list(int16()), large_list(int16())}) {
-    auto input = ArrayFromJSON(ty, "[[0, null, 1], null, [2, 3], []]");
-    auto expected = ArrayFromJSON(int16(), "[0, null, 1, 2, 3]");
+using ListAndListViewTypes =
+    ::testing::Types<ListType, LargeListType, ListViewType, LargeListViewType>;
+
+// ----------------------------------------------------------------------
+// [Large]List and [Large]ListView tests
+template <typename T>
+class TestVectorNestedSpecialized : public ::testing::Test {
+ public:
+  using TypeClass = T;
+
+  void SetUp() override {
+    value_type_ = int16();
+    type_ = std::make_shared<T>(value_type_);
+  }
+
+ public:
+  void TestListFlatten() {
+    auto input = ArrayFromJSON(type_, "[[0, null, 1], null, [2, 3], []]");
+    auto expected = ArrayFromJSON(value_type_, "[0, null, 1, 2, 3]");
     CheckVectorUnary("list_flatten", input, expected);
 
     // Construct a list with a non-empty null slot
     auto tweaked = TweakValidityBit(input, 0, false);
-    expected = ArrayFromJSON(int16(), "[2, 3]");
+    expected = ArrayFromJSON(value_type_, "[2, 3]");
     CheckVectorUnary("list_flatten", tweaked, expected);
   }
-}
 
-TEST(TestVectorNested, ListFlattenNulls) {
-  const auto ty = list(int32());
-  auto input = ArrayFromJSON(ty, "[null, null]");
-  auto expected = ArrayFromJSON(int32(), "[]");
-  CheckVectorUnary("list_flatten", input, expected);
-}
+  void TestListFlattenNulls() {
+    value_type_ = int32();
+    type_ = std::make_shared<T>(value_type_);
+    auto input = ArrayFromJSON(type_, "[null, null]");
+    auto expected = ArrayFromJSON(value_type_, "[]");
+    CheckVectorUnary("list_flatten", input, expected);
+  }
 
-TEST(TestVectorNested, ListFlattenChunkedArray) {
-  for (auto ty : {list(int16()), large_list(int16())}) {
-    ARROW_SCOPED_TRACE(ty->ToString());
-    auto input = ChunkedArrayFromJSON(ty, {"[[0, null, 1], null]", "[[2, 3], []]"});
-    auto expected = ChunkedArrayFromJSON(int16(), {"[0, null, 1]", "[2, 3]"});
+  void TestListFlattenChunkedArray() {
+    ARROW_SCOPED_TRACE(type_->ToString());
+    auto input = ChunkedArrayFromJSON(type_, {"[[0, null, 1], null]", "[[2, 3], []]"});
+    auto expected = ChunkedArrayFromJSON(value_type_, {"[0, null, 1]", "[2, 3]"});
     CheckVectorUnary("list_flatten", input, expected);
 
     ARROW_SCOPED_TRACE("empty");
-    input = ChunkedArrayFromJSON(ty, {});
-    expected = ChunkedArrayFromJSON(int16(), {});
+    input = ChunkedArrayFromJSON(type_, {});
+    expected = ChunkedArrayFromJSON(value_type_, {});
     CheckVectorUnary("list_flatten", input, expected);
   }
+
+  void TestListFlattenRecursively() {
+    auto inner_type = std::make_shared<T>(value_type_);
+    type_ = std::make_shared<T>(inner_type);
+
+    ListFlattenOptions opts;
+    opts.recursive = true;
+
+    // List types with two nesting levels: list<list<int16>>
+    auto input = ArrayFromJSON(type_, R"([
+        [[0, 1, 2], null, [3, null]],
+        [null],
+        [[2, 9], [4], [], [6, 5]]
+      ])");
+    auto expected = ArrayFromJSON(value_type_, "[0, 1, 2, 3, null, 2, 9, 4, 6, 5]");
+    CheckVectorUnary("list_flatten", input, expected, &opts);
+
+    // Empty nested list should flatten until non-list type is reached
+    input = ArrayFromJSON(type_, R"([null])");
+    expected = ArrayFromJSON(value_type_, "[]");
+    CheckVectorUnary("list_flatten", input, expected, &opts);
+
+    // List types with three nesting levels: list<list<fixed_size_list<int32, 2>>>
+    type_ = std::make_shared<T>(std::make_shared<T>(fixed_size_list(value_type_, 2)));
+    input = ArrayFromJSON(type_, R"([
+        [
+          [[null, 0]],
+          [[3, 7], null]
+        ],
+        [
+          [[4, null], [5, 8]],
+          [[8, null]],
+          null
+        ],
+        [
+          null
+        ]
+      ])");
+    expected = ArrayFromJSON(value_type_, "[null, 0, 3, 7, 4, null, 5, 8, 8, null]");
+    CheckVectorUnary("list_flatten", input, expected, &opts);
+  }
+
+ protected:
+  std::shared_ptr<DataType> type_;
+  std::shared_ptr<DataType> value_type_;
+};
+
+TYPED_TEST_SUITE(TestVectorNestedSpecialized, ListAndListViewTypes);
+
+TYPED_TEST(TestVectorNestedSpecialized, ListFlatten) { this->TestListFlatten(); }
+
+TYPED_TEST(TestVectorNestedSpecialized, ListFlattenNulls) {
+  this->TestListFlattenNulls();
+}
+
+TYPED_TEST(TestVectorNestedSpecialized, ListFlattenChunkedArray) {
+  this->TestListFlattenChunkedArray();
+}
+
+TYPED_TEST(TestVectorNestedSpecialized, ListFlattenRecursively) {
+  this->TestListFlattenRecursively();
 }
 
 TEST(TestVectorNested, ListFlattenFixedSizeList) {
@@ -92,8 +168,65 @@ TEST(TestVectorNested, ListFlattenFixedSizeListNulls) {
   CheckVectorUnary("list_flatten", input, expected);
 }
 
+TEST(TestVectorNested, ListFlattenFixedSizeListRecursively) {
+  ListFlattenOptions opts;
+  opts.recursive = true;
+
+  auto inner_type = fixed_size_list(int32(), 2);
+  auto type = fixed_size_list(inner_type, 2);
+  auto input = ArrayFromJSON(type, R"([
+    [[0, 1], [null, 3]],
+    [[7, null], [2, 5]],
+    [null, null]
+  ])");
+  auto expected = ArrayFromJSON(int32(), "[0, 1, null, 3, 7, null, 2, 5]");
+  CheckVectorUnary("list_flatten", input, expected, &opts);
+}
+
+template <typename T = ListViewType, typename offset_type = typename T::offset_type>
+void SwapListView(ArrayData* array, int64_t i, int64_t j) {
+  ASSERT_TRUE(is_list_view(array->type->id()));
+  ASSERT_EQ(array->type->id(), T::type_id);
+  ASSERT_LT(i, array->length);
+  ASSERT_LT(j, array->length);
+  auto* validity = array->GetMutableValues<uint8_t>(0);
+  if (validity) {
+    const bool is_valid_i = bit_util::GetBit(validity, array->offset + i);
+    const bool is_valid_j = bit_util::GetBit(validity, array->offset + j);
+    if (is_valid_i ^ is_valid_j) {
+      bit_util::SetBitTo(validity, array->offset + i, is_valid_j);
+      bit_util::SetBitTo(validity, array->offset + j, is_valid_i);
+    }
+  }
+  auto* offsets = array->GetMutableValues<offset_type>(1);
+  auto* sizes = array->GetMutableValues<offset_type>(2);
+  std::swap(offsets[i], offsets[j]);
+  std::swap(sizes[i], sizes[j]);
+}
+
+template <typename T = ListViewType, typename offset_type = typename T::offset_type>
+void SetListView(ArrayData* array, int64_t i, offset_type offset, offset_type size) {
+  ASSERT_TRUE(is_list_view(array->type->id()));
+  ASSERT_EQ(array->type->id(), T::type_id);
+  ASSERT_LT(i, array->length);
+  auto* validity = array->GetMutableValues<uint8_t>(0);
+  if (validity) {
+    bit_util::SetBit(validity, array->offset + i);
+  }
+  auto* offsets = array->GetMutableValues<offset_type>(1);
+  auto* sizes = array->GetMutableValues<offset_type>(2);
+  offsets[i] = offset;
+  sizes[i] = size;
+}
+
 TEST(TestVectorNested, ListParentIndices) {
-  for (auto ty : {list(int16()), large_list(int16())}) {
+  const auto types = {
+      list(int16()),
+      large_list(int16()),
+      list_view(int16()),
+      large_list_view(int16()),
+  };
+  for (auto ty : types) {
     auto input = ArrayFromJSON(ty, "[[0, null, 1], null, [2, 3], [], [4, 5]]");
 
     auto expected = ArrayFromJSON(int64(), "[0, 0, 0, 2, 2, 4, 4]");
@@ -105,10 +238,47 @@ TEST(TestVectorNested, ListParentIndices) {
   auto tweaked = TweakValidityBit(input, 1, false);
   auto expected = ArrayFromJSON(int64(), "[0, 0, 0, 1, 1, 2, 2, 4, 4]");
   CheckVectorUnary("list_parent_indices", tweaked, expected);
+
+  {
+    // Construct a list-view with a non-empty null slot
+    auto input =
+        ArrayFromJSON(list_view(int16()), "[[0, null, 1], [0, 0], [2, 3], [], [4, 5]]");
+    auto tweaked = TweakValidityBit(input, 1, false);
+    auto expected = ArrayFromJSON(int64(), "[0, 0, 0, null, null, 2, 2, 4, 4]");
+    CheckVectorUnary("list_parent_indices", tweaked, expected);
+
+    // Swap some list-view entries
+    auto swapped = tweaked->data()->Copy();
+    SwapListView(swapped.get(), 0, 2);
+    SwapListView(swapped.get(), 1, 4);
+    AssertDatumsEqual(
+        swapped,
+        ArrayFromJSON(list_view(int16()), "[[2, 3], [4, 5], [0, null, 1], [], null]"),
+        /*verbose=*/true);
+    expected = ArrayFromJSON(int64(), "[2, 2, 2, null, null, 0, 0, 1, 1]");
+    CheckVectorUnary("list_parent_indices", swapped, expected);
+
+    // Make one view use values that are used by other list-views
+    SetListView(swapped.get(), 3, 1, 4);
+    AssertDatumsEqual(
+        swapped,
+        ArrayFromJSON(list_view(int16()),
+                      "[[2, 3], [4, 5], [0, null, 1], [null, 1, 0, 0], null]"),
+        /*verbose=*/true);
+    EXPECT_RAISES_WITH_MESSAGE_THAT(
+        Invalid, ::testing::HasSubstr("values used by more than one list-view"),
+        CallFunction("list_parent_indices", {input}));
+  }
 }
 
 TEST(TestVectorNested, ListParentIndicesChunkedArray) {
-  for (auto ty : {list(int16()), large_list(int16())}) {
+  const auto types = {
+      list(int16()),
+      large_list(int16()),
+      list_view(int16()),
+      large_list_view(int16()),
+  };
+  for (auto ty : types) {
     auto input =
         ChunkedArrayFromJSON(ty, {"[[0, null, 1], null]", "[[2, 3], [], [4, 5]]"});
 
diff --git a/cpp/src/arrow/compute/kernels/vector_selection.cc b/cpp/src/arrow/compute/kernels/vector_selection.cc
index 64c3db204c9ee..b265673e23c86 100644
--- a/cpp/src/arrow/compute/kernels/vector_selection.cc
+++ b/cpp/src/arrow/compute/kernels/vector_selection.cc
@@ -68,12 +68,10 @@ using TakeState = OptionsWrapper<TakeOptions>;
 // ----------------------------------------------------------------------
 // DropNull Implementation
 
-Result<std::shared_ptr<arrow::BooleanArray>> GetDropNullFilter(const Array& values,
-                                                               MemoryPool* memory_pool) {
-  auto bitmap_buffer = values.null_bitmap();
-  std::shared_ptr<arrow::BooleanArray> out_array = std::make_shared<BooleanArray>(
-      values.length(), bitmap_buffer, nullptr, 0, values.offset());
-  return out_array;
+std::shared_ptr<arrow::BooleanArray> MakeDropNullFilter(const Array& values) {
+  auto& bitmap_buffer = values.null_bitmap();
+  return std::make_shared<BooleanArray>(values.length(), bitmap_buffer, nullptr, 0,
+                                        values.offset());
 }
 
 Result<Datum> DropNullArray(const std::shared_ptr<Array>& values, ExecContext* ctx) {
@@ -86,8 +84,7 @@ Result<Datum> DropNullArray(const std::shared_ptr<Array>& values, ExecContext* c
   if (values->type()->id() == Type::type::NA) {
     return std::make_shared<NullArray>(0);
   }
-  ARROW_ASSIGN_OR_RAISE(auto drop_null_filter,
-                        GetDropNullFilter(*values, ctx->memory_pool()));
+  auto drop_null_filter = Datum{MakeDropNullFilter(*values)};
   return Filter(values, drop_null_filter, FilterOptions::Defaults(), ctx);
 }
 
@@ -185,19 +182,16 @@ class DropNullMetaFunction : public MetaFunction {
   Result<Datum> ExecuteImpl(const std::vector<Datum>& args,
                             const FunctionOptions* options,
                             ExecContext* ctx) const override {
-    switch (args[0].kind()) {
-      case Datum::ARRAY: {
-        return DropNullArray(args[0].make_array(), ctx);
-      } break;
-      case Datum::CHUNKED_ARRAY: {
-        return DropNullChunkedArray(args[0].chunked_array(), ctx);
-      } break;
-      case Datum::RECORD_BATCH: {
-        return DropNullRecordBatch(args[0].record_batch(), ctx);
-      } break;
-      case Datum::TABLE: {
-        return DropNullTable(args[0].table(), ctx);
-      } break;
+    auto& values = args[0];
+    switch (values.kind()) {
+      case Datum::ARRAY:
+        return DropNullArray(values.make_array(), ctx);
+      case Datum::CHUNKED_ARRAY:
+        return DropNullChunkedArray(values.chunked_array(), ctx);
+      case Datum::RECORD_BATCH:
+        return DropNullRecordBatch(values.record_batch(), ctx);
+      case Datum::TABLE:
+        return DropNullTable(values.table(), ctx);
       default:
         break;
     }
diff --git a/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.cc b/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.cc
index 8825d697fdf77..bf67a474f31e2 100644
--- a/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.cc
+++ b/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.cc
@@ -22,6 +22,7 @@
 #include <type_traits>
 #include <vector>
 
+#include "arrow/array/concatenate.h"
 #include "arrow/array/data.h"
 #include "arrow/buffer_builder.h"
 #include "arrow/chunked_array.h"
@@ -40,6 +41,7 @@
 #include "arrow/util/bit_run_reader.h"
 #include "arrow/util/bit_util.h"
 #include "arrow/util/bitmap_ops.h"
+#include "arrow/util/fixed_width_internal.h"
 
 namespace arrow {
 
@@ -158,9 +160,11 @@ class PrimitiveFilterImpl {
   PrimitiveFilterImpl(const ArraySpan& values, const ArraySpan& filter,
                       FilterOptions::NullSelectionBehavior null_selection,
                       ArrayData* out_arr)
-      : byte_width_(values.type->byte_width()),
+      : byte_width_(util::FixedWidthInBytes(*values.type)),
         values_is_valid_(values.buffers[0].data),
-        values_data_(values.buffers[1].data),
+        // No offset applied for boolean because it's a bitmap
+        values_data_(kIsBoolean ? values.buffers[1].data
+                                : util::OffsetPointerOfFixedByteWidthValues(values)),
         values_null_count_(values.null_count),
         values_offset_(values.offset),
         values_length_(values.length),
@@ -169,17 +173,13 @@ class PrimitiveFilterImpl {
     if constexpr (kByteWidth >= 0 && !kIsBoolean) {
       DCHECK_EQ(kByteWidth, byte_width_);
     }
-    if constexpr (!kIsBoolean) {
-      // No offset applied for boolean because it's a bitmap
-      values_data_ += values.offset * byte_width();
-    }
 
+    DCHECK_EQ(out_arr->offset, 0);
     if (out_arr->buffers[0] != nullptr) {
       // May be unallocated if neither filter nor values contain nulls
       out_is_valid_ = out_arr->buffers[0]->mutable_data();
     }
-    out_data_ = out_arr->buffers[1]->mutable_data();
-    DCHECK_EQ(out_arr->offset, 0);
+    out_data_ = util::MutableFixedWidthValuesPointer(out_arr);
     out_length_ = out_arr->length;
     out_position_ = 0;
   }
@@ -416,7 +416,7 @@ class PrimitiveFilterImpl {
     out_position_ += length;
   }
 
-  constexpr int32_t byte_width() const {
+  constexpr int64_t byte_width() const {
     if constexpr (kByteWidth >= 0) {
       return kByteWidth;
     } else {
@@ -425,7 +425,7 @@ class PrimitiveFilterImpl {
   }
 
  private:
-  int32_t byte_width_;
+  int64_t byte_width_;
   const uint8_t* values_is_valid_;
   const uint8_t* values_data_;
   int64_t values_null_count_;
@@ -439,6 +439,8 @@ class PrimitiveFilterImpl {
   int64_t out_position_;
 };
 
+}  // namespace
+
 Status PrimitiveFilterExec(KernelContext* ctx, const ExecSpan& batch, ExecResult* out) {
   const ArraySpan& values = batch[0].array;
   const ArraySpan& filter = batch[1].array;
@@ -468,9 +470,10 @@ Status PrimitiveFilterExec(KernelContext* ctx, const ExecSpan& batch, ExecResult
   // validity bitmap.
   const bool allocate_validity = values.null_count != 0 || !filter_null_count_is_zero;
 
-  const int bit_width = values.type->bit_width();
-  RETURN_NOT_OK(PreallocatePrimitiveArrayData(ctx, output_length, bit_width,
-                                              allocate_validity, out_arr));
+  DCHECK(util::IsFixedWidthLike(values));
+  const int64_t bit_width = util::FixedWidthInBits(*values.type);
+  RETURN_NOT_OK(util::internal::PreallocateFixedWidthArrayData(
+      ctx, output_length, /*source=*/values, allocate_validity, out_arr));
 
   switch (bit_width) {
     case 1:
@@ -505,6 +508,8 @@ Status PrimitiveFilterExec(KernelContext* ctx, const ExecSpan& batch, ExecResult
   return Status::OK();
 }
 
+namespace {
+
 // ----------------------------------------------------------------------
 // Optimized filter for base binary types (32-bit and 64-bit)
 
@@ -924,12 +929,26 @@ Result<std::shared_ptr<RecordBatch>> FilterRecordBatch(const RecordBatch& batch,
     return Status::Invalid("Filter inputs must all be the same length");
   }
 
-  // Convert filter to selection vector/indices and use Take
+  // Fetch filter
   const auto& filter_opts = *static_cast<const FilterOptions*>(options);
-  ARROW_ASSIGN_OR_RAISE(
-      std::shared_ptr<ArrayData> indices,
-      GetTakeIndices(*filter.array(), filter_opts.null_selection_behavior,
-                     ctx->memory_pool()));
+  ArrayData filter_array;
+  switch (filter.kind()) {
+    case Datum::ARRAY:
+      filter_array = *filter.array();
+      break;
+    case Datum::CHUNKED_ARRAY: {
+      ARROW_ASSIGN_OR_RAISE(auto combined, Concatenate(filter.chunked_array()->chunks()));
+      filter_array = *combined->data();
+      break;
+    }
+    default:
+      return Status::TypeError("Filter should be array-like");
+  }
+
+  // Convert filter to selection vector/indices and use Take
+  ARROW_ASSIGN_OR_RAISE(std::shared_ptr<ArrayData> indices,
+                        GetTakeIndices(filter_array, filter_opts.null_selection_behavior,
+                                       ctx->memory_pool()));
   std::vector<std::shared_ptr<Array>> columns(batch.num_columns());
   for (int i = 0; i < batch.num_columns(); ++i) {
     ARROW_ASSIGN_OR_RAISE(Datum out, Take(batch.column(i)->data(), Datum(indices),
@@ -1038,7 +1057,6 @@ class FilterMetaFunction : public MetaFunction {
     }
 
     if (args[0].kind() == Datum::RECORD_BATCH) {
-      auto values_batch = args[0].record_batch();
       ARROW_ASSIGN_OR_RAISE(
           std::shared_ptr<RecordBatch> out_batch,
           FilterRecordBatch(*args[0].record_batch(), args[1], options, ctx));
@@ -1083,6 +1101,8 @@ void PopulateFilterKernels(std::vector<SelectionKernelData>* out) {
       {InputType(Type::EXTENSION), plain_filter, ExtensionFilterExec},
       {InputType(Type::LIST), plain_filter, ListFilterExec},
       {InputType(Type::LARGE_LIST), plain_filter, LargeListFilterExec},
+      {InputType(Type::LIST_VIEW), plain_filter, ListViewFilterExec},
+      {InputType(Type::LARGE_LIST_VIEW), plain_filter, LargeListViewFilterExec},
       {InputType(Type::FIXED_SIZE_LIST), plain_filter, FSLFilterExec},
       {InputType(Type::DENSE_UNION), plain_filter, DenseUnionFilterExec},
       {InputType(Type::SPARSE_UNION), plain_filter, SparseUnionFilterExec},
@@ -1101,6 +1121,8 @@ void PopulateFilterKernels(std::vector<SelectionKernelData>* out) {
       {InputType(Type::EXTENSION), ree_filter, ExtensionFilterExec},
       {InputType(Type::LIST), ree_filter, ListFilterExec},
       {InputType(Type::LARGE_LIST), ree_filter, LargeListFilterExec},
+      {InputType(Type::LIST_VIEW), ree_filter, ListViewFilterExec},
+      {InputType(Type::LARGE_LIST_VIEW), ree_filter, LargeListViewFilterExec},
       {InputType(Type::FIXED_SIZE_LIST), ree_filter, FSLFilterExec},
       {InputType(Type::DENSE_UNION), ree_filter, DenseUnionFilterExec},
       {InputType(Type::SPARSE_UNION), ree_filter, SparseUnionFilterExec},
diff --git a/cpp/src/arrow/compute/kernels/vector_selection_internal.cc b/cpp/src/arrow/compute/kernels/vector_selection_internal.cc
index a0fe2808e3e4e..7189d42850e79 100644
--- a/cpp/src/arrow/compute/kernels/vector_selection_internal.cc
+++ b/cpp/src/arrow/compute/kernels/vector_selection_internal.cc
@@ -37,6 +37,7 @@
 #include "arrow/util/bit_block_counter.h"
 #include "arrow/util/bit_run_reader.h"
 #include "arrow/util/bit_util.h"
+#include "arrow/util/fixed_width_internal.h"
 #include "arrow/util/int_util.h"
 #include "arrow/util/logging.h"
 #include "arrow/util/ree_util.h"
@@ -65,24 +66,6 @@ void RegisterSelectionFunction(const std::string& name, FunctionDoc doc,
   DCHECK_OK(registry->AddFunction(std::move(func)));
 }
 
-Status PreallocatePrimitiveArrayData(KernelContext* ctx, int64_t length, int bit_width,
-                                     bool allocate_validity, ArrayData* out) {
-  // Preallocate memory
-  out->length = length;
-  out->buffers.resize(2);
-
-  if (allocate_validity) {
-    ARROW_ASSIGN_OR_RAISE(out->buffers[0], ctx->AllocateBitmap(length));
-  }
-  if (bit_width == 1) {
-    ARROW_ASSIGN_OR_RAISE(out->buffers[1], ctx->AllocateBitmap(length));
-  } else {
-    ARROW_ASSIGN_OR_RAISE(out->buffers[1],
-                          ctx->Allocate(bit_util::BytesForBits(length * bit_width)));
-  }
-  return Status::OK();
-}
-
 namespace {
 
 /// \brief Iterate over a REE filter, emitting ranges of a plain values array that
@@ -564,39 +547,6 @@ struct VarBinarySelectionImpl : public Selection<VarBinarySelectionImpl<Type>, T
   }
 };
 
-struct FSBSelectionImpl : public Selection<FSBSelectionImpl, FixedSizeBinaryType> {
-  using Base = Selection<FSBSelectionImpl, FixedSizeBinaryType>;
-  LIFT_BASE_MEMBERS();
-
-  TypedBufferBuilder<uint8_t> data_builder;
-
-  FSBSelectionImpl(KernelContext* ctx, const ExecSpan& batch, int64_t output_length,
-                   ExecResult* out)
-      : Base(ctx, batch, output_length, out), data_builder(ctx->memory_pool()) {}
-
-  template <typename Adapter>
-  Status GenerateOutput() {
-    FixedSizeBinaryArray typed_values(this->values.ToArrayData());
-    int32_t value_size = typed_values.byte_width();
-
-    RETURN_NOT_OK(data_builder.Reserve(value_size * output_length));
-    Adapter adapter(this);
-    return adapter.Generate(
-        [&](int64_t index) {
-          auto val = typed_values.GetView(index);
-          data_builder.UnsafeAppend(reinterpret_cast<const uint8_t*>(val.data()),
-                                    value_size);
-          return Status::OK();
-        },
-        [&]() {
-          data_builder.UnsafeAppend(value_size, static_cast<uint8_t>(0x00));
-          return Status::OK();
-        });
-  }
-
-  Status Finish() override { return data_builder.Finish(&out->buffers[1]); }
-};
-
 template <typename Type>
 struct ListSelectionImpl : public Selection<ListSelectionImpl<Type>, Type> {
   using offset_type = typename Type::offset_type;
@@ -662,6 +612,63 @@ struct ListSelectionImpl : public Selection<ListSelectionImpl<Type>, Type> {
   }
 };
 
+template <typename Type>
+struct ListViewSelectionImpl : public Selection<ListViewSelectionImpl<Type>, Type> {
+  using offset_type = typename Type::offset_type;
+
+  using Base = Selection<ListViewSelectionImpl<Type>, Type>;
+  LIFT_BASE_MEMBERS();
+
+  TypedBufferBuilder<offset_type> offsets_builder;
+  TypedBufferBuilder<offset_type> sizes_builder;
+
+  ListViewSelectionImpl(KernelContext* ctx, const ExecSpan& batch, int64_t output_length,
+                        ExecResult* out)
+      : Base(ctx, batch, output_length, out),
+        offsets_builder(ctx->memory_pool()),
+        sizes_builder(ctx->memory_pool()) {}
+
+  template <typename Adapter>
+  Status GenerateOutput() {
+    auto* offsets = this->values.template GetValues<offset_type>(1);
+    auto* sizes = this->values.template GetValues<offset_type>(2);
+
+    offset_type null_list_view_offset = 0;
+    Adapter adapter(this);
+    RETURN_NOT_OK(adapter.Generate(
+        [&](int64_t index) {
+          offset_type value_offset = offsets[index];
+          offset_type value_length = sizes[index];
+          offsets_builder.UnsafeAppend(value_offset);
+          sizes_builder.UnsafeAppend(value_length);
+          null_list_view_offset = value_offset + value_length;
+          return Status::OK();
+        },
+        [&]() {
+          // 0 could be appended here, but by adding the last offset, we keep
+          // the buffer compatible with how offsets behave in ListType as well.
+          // The invariant that `offsets[i] + sizes[i] <= values.length` is
+          // trivially maintained by having `sizes[i]` set to 0 here.
+          offsets_builder.UnsafeAppend(null_list_view_offset);
+          sizes_builder.UnsafeAppend(0);
+          return Status::OK();
+        }));
+    return Status::OK();
+  }
+
+  Status Init() override {
+    RETURN_NOT_OK(offsets_builder.Reserve(output_length));
+    return sizes_builder.Reserve(output_length);
+  }
+
+  Status Finish() override {
+    RETURN_NOT_OK(offsets_builder.Finish(&out->buffers[1]));
+    RETURN_NOT_OK(sizes_builder.Finish(&out->buffers[2]));
+    out->child_data = {this->values.child_data[0].ToArrayData()};
+    return Status::OK();
+  }
+};
+
 struct DenseUnionSelectionImpl
     : public Selection<DenseUnionSelectionImpl, DenseUnionType> {
   using Base = Selection<DenseUnionSelectionImpl, DenseUnionType>;
@@ -908,7 +915,30 @@ Status LargeListFilterExec(KernelContext* ctx, const ExecSpan& batch, ExecResult
   return FilterExec<ListSelectionImpl<LargeListType>>(ctx, batch, out);
 }
 
+Status ListViewFilterExec(KernelContext* ctx, const ExecSpan& batch, ExecResult* out) {
+  return FilterExec<ListViewSelectionImpl<ListViewType>>(ctx, batch, out);
+}
+
+Status LargeListViewFilterExec(KernelContext* ctx, const ExecSpan& batch,
+                               ExecResult* out) {
+  return FilterExec<ListViewSelectionImpl<LargeListViewType>>(ctx, batch, out);
+}
+
 Status FSLFilterExec(KernelContext* ctx, const ExecSpan& batch, ExecResult* out) {
+  const ArraySpan& values = batch[0].array;
+
+  // If a FixedSizeList wraps a fixed-width type we can, in some cases, use
+  // PrimitiveFilterExec for a fixed-size list array.
+  if (util::IsFixedWidthLike(values,
+                             /*force_null_count=*/true,
+                             /*exclude_bool_and_dictionary=*/true)) {
+    const auto byte_width = util::FixedWidthInBytes(*values.type);
+    // 0 is a valid byte width for FixedSizeList, but PrimitiveFilterExec
+    // might not handle it correctly.
+    if (byte_width > 0) {
+      return PrimitiveFilterExec(ctx, batch, out);
+    }
+  }
   return FilterExec<FSLSelectionImpl>(ctx, batch, out);
 }
 
@@ -942,23 +972,6 @@ Status LargeVarBinaryTakeExec(KernelContext* ctx, const ExecSpan& batch,
   return TakeExec<VarBinarySelectionImpl<LargeBinaryType>>(ctx, batch, out);
 }
 
-Status FSBTakeExec(KernelContext* ctx, const ExecSpan& batch, ExecResult* out) {
-  const ArraySpan& values = batch[0].array;
-  const auto byte_width = values.type->byte_width();
-  // Use primitive Take implementation (presumably faster) for some byte widths
-  switch (byte_width) {
-    case 1:
-    case 2:
-    case 4:
-    case 8:
-    case 16:
-    case 32:
-      return PrimitiveTakeExec(ctx, batch, out);
-    default:
-      return TakeExec<FSBSelectionImpl>(ctx, batch, out);
-  }
-}
-
 Status ListTakeExec(KernelContext* ctx, const ExecSpan& batch, ExecResult* out) {
   return TakeExec<ListSelectionImpl<ListType>>(ctx, batch, out);
 }
@@ -967,7 +980,24 @@ Status LargeListTakeExec(KernelContext* ctx, const ExecSpan& batch, ExecResult*
   return TakeExec<ListSelectionImpl<LargeListType>>(ctx, batch, out);
 }
 
+Status ListViewTakeExec(KernelContext* ctx, const ExecSpan& batch, ExecResult* out) {
+  return TakeExec<ListViewSelectionImpl<ListViewType>>(ctx, batch, out);
+}
+
+Status LargeListViewTakeExec(KernelContext* ctx, const ExecSpan& batch, ExecResult* out) {
+  return TakeExec<ListViewSelectionImpl<LargeListViewType>>(ctx, batch, out);
+}
+
 Status FSLTakeExec(KernelContext* ctx, const ExecSpan& batch, ExecResult* out) {
+  const ArraySpan& values = batch[0].array;
+
+  // If a FixedSizeList wraps a fixed-width type we can, in some cases, use
+  // FixedWidthTakeExec for a fixed-size list array.
+  if (util::IsFixedWidthLike(values,
+                             /*force_null_count=*/true,
+                             /*exclude_bool_and_dictionary=*/true)) {
+    return FixedWidthTakeExec(ctx, batch, out);
+  }
   return TakeExec<FSLSelectionImpl>(ctx, batch, out);
 }
 
diff --git a/cpp/src/arrow/compute/kernels/vector_selection_internal.h b/cpp/src/arrow/compute/kernels/vector_selection_internal.h
index 95f3e51cd67e3..887bf08354120 100644
--- a/cpp/src/arrow/compute/kernels/vector_selection_internal.h
+++ b/cpp/src/arrow/compute/kernels/vector_selection_internal.h
@@ -45,12 +45,6 @@ void RegisterSelectionFunction(const std::string& name, FunctionDoc doc,
                                const FunctionOptions* default_options,
                                FunctionRegistry* registry);
 
-/// \brief Allocate an ArrayData for a primitive array with a given length and bit width
-///
-/// \param[in] bit_width 1 or a multiple of 8
-Status PreallocatePrimitiveArrayData(KernelContext* ctx, int64_t length, int bit_width,
-                                     bool allocate_validity, ArrayData* out);
-
 /// \brief Callback type for VisitPlainxREEFilterOutputSegments.
 ///
 /// position is the logical position in the values array relative to its offset.
@@ -70,18 +64,22 @@ void VisitPlainxREEFilterOutputSegments(
     FilterOptions::NullSelectionBehavior null_selection,
     const EmitREEFilterSegment& emit_segment);
 
+Status PrimitiveFilterExec(KernelContext*, const ExecSpan&, ExecResult*);
 Status ListFilterExec(KernelContext*, const ExecSpan&, ExecResult*);
 Status LargeListFilterExec(KernelContext*, const ExecSpan&, ExecResult*);
+Status ListViewFilterExec(KernelContext*, const ExecSpan&, ExecResult*);
+Status LargeListViewFilterExec(KernelContext*, const ExecSpan&, ExecResult*);
 Status FSLFilterExec(KernelContext*, const ExecSpan&, ExecResult*);
 Status DenseUnionFilterExec(KernelContext*, const ExecSpan&, ExecResult*);
 Status MapFilterExec(KernelContext*, const ExecSpan&, ExecResult*);
 
 Status VarBinaryTakeExec(KernelContext*, const ExecSpan&, ExecResult*);
 Status LargeVarBinaryTakeExec(KernelContext*, const ExecSpan&, ExecResult*);
-Status PrimitiveTakeExec(KernelContext*, const ExecSpan&, ExecResult*);
-Status FSBTakeExec(KernelContext*, const ExecSpan&, ExecResult*);
+Status FixedWidthTakeExec(KernelContext*, const ExecSpan&, ExecResult*);
 Status ListTakeExec(KernelContext*, const ExecSpan&, ExecResult*);
 Status LargeListTakeExec(KernelContext*, const ExecSpan&, ExecResult*);
+Status ListViewTakeExec(KernelContext*, const ExecSpan&, ExecResult*);
+Status LargeListViewTakeExec(KernelContext*, const ExecSpan&, ExecResult*);
 Status FSLTakeExec(KernelContext*, const ExecSpan&, ExecResult*);
 Status DenseUnionTakeExec(KernelContext*, const ExecSpan&, ExecResult*);
 Status SparseUnionTakeExec(KernelContext*, const ExecSpan&, ExecResult*);
diff --git a/cpp/src/arrow/compute/kernels/vector_selection_take_internal.cc b/cpp/src/arrow/compute/kernels/vector_selection_take_internal.cc
index 5cd3710828485..c45cc552a2cc5 100644
--- a/cpp/src/arrow/compute/kernels/vector_selection_take_internal.cc
+++ b/cpp/src/arrow/compute/kernels/vector_selection_take_internal.cc
@@ -19,6 +19,7 @@
 #include <cstring>
 #include <limits>
 #include <memory>
+#include <utility>
 #include <vector>
 
 #include "arrow/array/builder_primitive.h"
@@ -27,8 +28,10 @@
 #include "arrow/chunked_array.h"
 #include "arrow/compute/api_vector.h"
 #include "arrow/compute/kernels/codegen_internal.h"
+#include "arrow/compute/kernels/gather_internal.h"
 #include "arrow/compute/kernels/vector_selection_internal.h"
 #include "arrow/compute/kernels/vector_selection_take_internal.h"
+#include "arrow/compute/registry.h"
 #include "arrow/memory_pool.h"
 #include "arrow/record_batch.h"
 #include "arrow/table.h"
@@ -37,6 +40,7 @@
 #include "arrow/util/bit_block_counter.h"
 #include "arrow/util/bit_run_reader.h"
 #include "arrow/util/bit_util.h"
+#include "arrow/util/fixed_width_internal.h"
 #include "arrow/util/int_util.h"
 #include "arrow/util/ree_util.h"
 
@@ -323,235 +327,79 @@ namespace {
 using TakeState = OptionsWrapper<TakeOptions>;
 
 // ----------------------------------------------------------------------
-// Implement optimized take for primitive types from boolean to 1/2/4/8-byte
-// C-type based types. Use common implementation for every byte width and only
-// generate code for unsigned integer indices, since after boundschecking to
-// check for negative numbers in the indices we can safely reinterpret_cast
-// signed integers as unsigned.
-
-/// \brief The Take implementation for primitive (fixed-width) types does not
-/// use the logical Arrow type but rather the physical C type. This way we
-/// only generate one take function for each byte width.
-///
-/// This function assumes that the indices have been boundschecked.
-template <typename IndexCType, typename ValueWidthConstant>
-struct PrimitiveTakeImpl {
-  static constexpr int kValueWidth = ValueWidthConstant::value;
-
-  static void Exec(const ArraySpan& values, const ArraySpan& indices,
-                   ArrayData* out_arr) {
-    DCHECK_EQ(values.type->byte_width(), kValueWidth);
-    const auto* values_data =
-        values.GetValues<uint8_t>(1, 0) + kValueWidth * values.offset;
-    const uint8_t* values_is_valid = values.buffers[0].data;
-    auto values_offset = values.offset;
-
-    const auto* indices_data = indices.GetValues<IndexCType>(1);
-    const uint8_t* indices_is_valid = indices.buffers[0].data;
-    auto indices_offset = indices.offset;
-
-    auto out = out_arr->GetMutableValues<uint8_t>(1, 0) + kValueWidth * out_arr->offset;
-    auto out_is_valid = out_arr->buffers[0]->mutable_data();
-    auto out_offset = out_arr->offset;
-    DCHECK_EQ(out_offset, 0);
-
-    // If either the values or indices have nulls, we preemptively zero out the
-    // out validity bitmap so that we don't have to use ClearBit in each
-    // iteration for nulls.
-    if (values.null_count != 0 || indices.null_count != 0) {
-      bit_util::SetBitsTo(out_is_valid, out_offset, indices.length, false);
-    }
-
-    auto WriteValue = [&](int64_t position) {
-      memcpy(out + position * kValueWidth,
-             values_data + indices_data[position] * kValueWidth, kValueWidth);
-    };
-
-    auto WriteZero = [&](int64_t position) {
-      memset(out + position * kValueWidth, 0, kValueWidth);
-    };
-
-    auto WriteZeroSegment = [&](int64_t position, int64_t length) {
-      memset(out + position * kValueWidth, 0, kValueWidth * length);
-    };
-
-    OptionalBitBlockCounter indices_bit_counter(indices_is_valid, indices_offset,
-                                                indices.length);
-    int64_t position = 0;
-    int64_t valid_count = 0;
-    while (position < indices.length) {
-      BitBlockCount block = indices_bit_counter.NextBlock();
-      if (values.null_count == 0) {
-        // Values are never null, so things are easier
-        valid_count += block.popcount;
-        if (block.popcount == block.length) {
-          // Fastest path: neither values nor index nulls
-          bit_util::SetBitsTo(out_is_valid, out_offset + position, block.length, true);
-          for (int64_t i = 0; i < block.length; ++i) {
-            WriteValue(position);
-            ++position;
-          }
-        } else if (block.popcount > 0) {
-          // Slow path: some indices but not all are null
-          for (int64_t i = 0; i < block.length; ++i) {
-            if (bit_util::GetBit(indices_is_valid, indices_offset + position)) {
-              // index is not null
-              bit_util::SetBit(out_is_valid, out_offset + position);
-              WriteValue(position);
-            } else {
-              WriteZero(position);
-            }
-            ++position;
-          }
-        } else {
-          WriteZeroSegment(position, block.length);
-          position += block.length;
-        }
-      } else {
-        // Values have nulls, so we must do random access into the values bitmap
-        if (block.popcount == block.length) {
-          // Faster path: indices are not null but values may be
-          for (int64_t i = 0; i < block.length; ++i) {
-            if (bit_util::GetBit(values_is_valid,
-                                 values_offset + indices_data[position])) {
-              // value is not null
-              WriteValue(position);
-              bit_util::SetBit(out_is_valid, out_offset + position);
-              ++valid_count;
-            } else {
-              WriteZero(position);
-            }
-            ++position;
-          }
-        } else if (block.popcount > 0) {
-          // Slow path: some but not all indices are null. Since we are doing
-          // random access in general we have to check the value nullness one by
-          // one.
-          for (int64_t i = 0; i < block.length; ++i) {
-            if (bit_util::GetBit(indices_is_valid, indices_offset + position) &&
-                bit_util::GetBit(values_is_valid,
-                                 values_offset + indices_data[position])) {
-              // index is not null && value is not null
-              WriteValue(position);
-              bit_util::SetBit(out_is_valid, out_offset + position);
-              ++valid_count;
-            } else {
-              WriteZero(position);
-            }
-            ++position;
-          }
-        } else {
-          WriteZeroSegment(position, block.length);
-          position += block.length;
-        }
-      }
-    }
-    out_arr->null_count = out_arr->length - valid_count;
-  }
-};
-
-template <typename IndexCType>
-struct BooleanTakeImpl {
-  static void Exec(const ArraySpan& values, const ArraySpan& indices,
-                   ArrayData* out_arr) {
-    const uint8_t* values_data = values.buffers[1].data;
-    const uint8_t* values_is_valid = values.buffers[0].data;
-    auto values_offset = values.offset;
-
-    const auto* indices_data = indices.GetValues<IndexCType>(1);
-    const uint8_t* indices_is_valid = indices.buffers[0].data;
-    auto indices_offset = indices.offset;
-
-    auto out = out_arr->buffers[1]->mutable_data();
-    auto out_is_valid = out_arr->buffers[0]->mutable_data();
-    auto out_offset = out_arr->offset;
-
-    // If either the values or indices have nulls, we preemptively zero out the
-    // out validity bitmap so that we don't have to use ClearBit in each
-    // iteration for nulls.
-    if (values.null_count != 0 || indices.null_count != 0) {
-      bit_util::SetBitsTo(out_is_valid, out_offset, indices.length, false);
-    }
-    // Avoid uninitialized data in values array
-    bit_util::SetBitsTo(out, out_offset, indices.length, false);
-
-    auto PlaceDataBit = [&](int64_t loc, IndexCType index) {
-      bit_util::SetBitTo(out, out_offset + loc,
-                         bit_util::GetBit(values_data, values_offset + index));
-    };
+// Implement optimized take for primitive types from boolean to
+// 1/2/4/8/16/32-byte C-type based types and fixed-size binary (0 or more
+// bytes).
+//
+// Use one specialization for each of these primitive byte-widths so the
+// compiler can specialize the memcpy to dedicated CPU instructions and for
+// fixed-width binary use the 1-byte specialization but pass WithFactor=true
+// that makes the kernel consider the factor parameter provided at runtime.
+//
+// Only unsigned index types need to be instantiated since after
+// boundschecking to check for negative numbers in the indices we can safely
+// reinterpret_cast signed integers as unsigned.
 
-    OptionalBitBlockCounter indices_bit_counter(indices_is_valid, indices_offset,
-                                                indices.length);
-    int64_t position = 0;
+/// \brief The Take implementation for primitive types and fixed-width binary.
+///
+/// Also note that this function can also handle fixed-size-list arrays if
+/// they fit the criteria described in fixed_width_internal.h, so use the
+/// function defined in that file to access values and destination pointers
+/// and DO NOT ASSUME `values.type()` is a primitive type.
+///
+/// NOTE: Template parameters are types instead of values to let
+/// `TakeIndexDispatch<>` forward `typename... Args`  after the index type.
+///
+/// \pre the indices have been boundschecked
+template <typename IndexCType, typename ValueBitWidthConstant,
+          typename OutputIsZeroInitialized = std::false_type,
+          typename WithFactor = std::false_type>
+struct FixedWidthTakeImpl {
+  static constexpr int kValueWidthInBits = ValueBitWidthConstant::value;
+
+  static Status Exec(KernelContext* ctx, const ArraySpan& values,
+                     const ArraySpan& indices, ArrayData* out_arr, int64_t factor) {
+#ifndef NDEBUG
+    int64_t bit_width = util::FixedWidthInBits(*values.type);
+    DCHECK(WithFactor::value || (kValueWidthInBits == bit_width && factor == 1));
+    DCHECK(!WithFactor::value ||
+           (factor > 0 && kValueWidthInBits == 8 &&  // factors are used with bytes
+            static_cast<int64_t>(factor * kValueWidthInBits) == bit_width));
+#endif
+    const bool out_has_validity = values.MayHaveNulls() || indices.MayHaveNulls();
+
+    const uint8_t* src;
+    int64_t src_offset;
+    std::tie(src_offset, src) = util::OffsetPointerOfFixedBitWidthValues(values);
+    uint8_t* out = util::MutableFixedWidthValuesPointer(out_arr);
     int64_t valid_count = 0;
-    while (position < indices.length) {
-      BitBlockCount block = indices_bit_counter.NextBlock();
-      if (values.null_count == 0) {
-        // Values are never null, so things are easier
-        valid_count += block.popcount;
-        if (block.popcount == block.length) {
-          // Fastest path: neither values nor index nulls
-          bit_util::SetBitsTo(out_is_valid, out_offset + position, block.length, true);
-          for (int64_t i = 0; i < block.length; ++i) {
-            PlaceDataBit(position, indices_data[position]);
-            ++position;
-          }
-        } else if (block.popcount > 0) {
-          // Slow path: some but not all indices are null
-          for (int64_t i = 0; i < block.length; ++i) {
-            if (bit_util::GetBit(indices_is_valid, indices_offset + position)) {
-              // index is not null
-              bit_util::SetBit(out_is_valid, out_offset + position);
-              PlaceDataBit(position, indices_data[position]);
-            }
-            ++position;
-          }
-        } else {
-          position += block.length;
-        }
-      } else {
-        // Values have nulls, so we must do random access into the values bitmap
-        if (block.popcount == block.length) {
-          // Faster path: indices are not null but values may be
-          for (int64_t i = 0; i < block.length; ++i) {
-            if (bit_util::GetBit(values_is_valid,
-                                 values_offset + indices_data[position])) {
-              // value is not null
-              bit_util::SetBit(out_is_valid, out_offset + position);
-              PlaceDataBit(position, indices_data[position]);
-              ++valid_count;
-            }
-            ++position;
-          }
-        } else if (block.popcount > 0) {
-          // Slow path: some but not all indices are null. Since we are doing
-          // random access in general we have to check the value nullness one by
-          // one.
-          for (int64_t i = 0; i < block.length; ++i) {
-            if (bit_util::GetBit(indices_is_valid, indices_offset + position)) {
-              // index is not null
-              if (bit_util::GetBit(values_is_valid,
-                                   values_offset + indices_data[position])) {
-                // value is not null
-                PlaceDataBit(position, indices_data[position]);
-                bit_util::SetBit(out_is_valid, out_offset + position);
-                ++valid_count;
-              }
-            }
-            ++position;
-          }
-        } else {
-          position += block.length;
-        }
-      }
+    arrow::internal::Gather<kValueWidthInBits, IndexCType, WithFactor::value> gather{
+        /*src_length=*/values.length,
+        src,
+        src_offset,
+        /*idx_length=*/indices.length,
+        /*idx=*/indices.GetValues<IndexCType>(1),
+        out,
+        factor};
+    if (out_has_validity) {
+      DCHECK_EQ(out_arr->offset, 0);
+      // out_is_valid must be zero-initiliazed, because Gather::Execute
+      // saves time by not having to ClearBit on every null element.
+      auto out_is_valid = out_arr->GetMutableValues<uint8_t>(0);
+      memset(out_is_valid, 0, bit_util::BytesForBits(out_arr->length));
+      valid_count = gather.template Execute<OutputIsZeroInitialized::value>(
+          /*src_validity=*/values, /*idx_validity=*/indices, out_is_valid);
+    } else {
+      valid_count = gather.Execute();
     }
     out_arr->null_count = out_arr->length - valid_count;
+    return Status::OK();
   }
 };
 
 template <template <typename...> class TakeImpl, typename... Args>
-void TakeIndexDispatch(const ArraySpan& values, const ArraySpan& indices,
-                       ArrayData* out) {
+Status TakeIndexDispatch(KernelContext* ctx, const ArraySpan& values,
+                         const ArraySpan& indices, ArrayData* out, int64_t factor = 1) {
   // With the simplifying assumption that boundschecking has taken place
   // already at a higher level, we can now assume that the index values are all
   // non-negative. Thus, we can interpret signed integers as unsigned and avoid
@@ -559,22 +407,20 @@ void TakeIndexDispatch(const ArraySpan& values, const ArraySpan& indices,
   // width.
   switch (indices.type->byte_width()) {
     case 1:
-      return TakeImpl<uint8_t, Args...>::Exec(values, indices, out);
+      return TakeImpl<uint8_t, Args...>::Exec(ctx, values, indices, out, factor);
     case 2:
-      return TakeImpl<uint16_t, Args...>::Exec(values, indices, out);
+      return TakeImpl<uint16_t, Args...>::Exec(ctx, values, indices, out, factor);
     case 4:
-      return TakeImpl<uint32_t, Args...>::Exec(values, indices, out);
-    case 8:
-      return TakeImpl<uint64_t, Args...>::Exec(values, indices, out);
+      return TakeImpl<uint32_t, Args...>::Exec(ctx, values, indices, out, factor);
     default:
-      DCHECK(false) << "Invalid indices byte width";
-      break;
+      DCHECK_EQ(indices.type->byte_width(), 8);
+      return TakeImpl<uint64_t, Args...>::Exec(ctx, values, indices, out, factor);
   }
 }
 
 }  // namespace
 
-Status PrimitiveTakeExec(KernelContext* ctx, const ExecSpan& batch, ExecResult* out) {
+Status FixedWidthTakeExec(KernelContext* ctx, const ExecSpan& batch, ExecResult* out) {
   const ArraySpan& values = batch[0].array;
   const ArraySpan& indices = batch[1].array;
 
@@ -583,50 +429,60 @@ Status PrimitiveTakeExec(KernelContext* ctx, const ExecSpan& batch, ExecResult*
   }
 
   ArrayData* out_arr = out->array_data().get();
-
-  const int bit_width = values.type->bit_width();
-
-  // TODO: When neither values nor indices contain nulls, we can skip
-  // allocating the validity bitmap altogether and save time and space. A
-  // streamlined PrimitiveTakeImpl would need to be written that skips all
-  // interactions with the output validity bitmap, though.
-  RETURN_NOT_OK(PreallocatePrimitiveArrayData(ctx, indices.length, bit_width,
-                                              /*allocate_validity=*/true, out_arr));
-  switch (bit_width) {
+  DCHECK(util::IsFixedWidthLike(values));
+  // When we know for sure that values nor indices contain nulls, we can skip
+  // allocating the validity bitmap altogether and save time and space.
+  const bool allocate_validity = values.MayHaveNulls() || indices.MayHaveNulls();
+  RETURN_NOT_OK(util::internal::PreallocateFixedWidthArrayData(
+      ctx, indices.length, /*source=*/values, allocate_validity, out_arr));
+  switch (util::FixedWidthInBits(*values.type)) {
+    case 0:
+      DCHECK(values.type->id() == Type::FIXED_SIZE_BINARY ||
+             values.type->id() == Type::FIXED_SIZE_LIST);
+      return TakeIndexDispatch<FixedWidthTakeImpl, std::integral_constant<int, 0>>(
+          ctx, values, indices, out_arr);
     case 1:
-      TakeIndexDispatch<BooleanTakeImpl>(values, indices, out_arr);
-      break;
+      // Zero-initialize the data buffer for the output array when the bit-width is 1
+      // (e.g. Boolean array) to avoid having to ClearBit on every null element.
+      // This might be profitable for other types as well, but we take the most
+      // conservative approach for now.
+      memset(out_arr->buffers[1]->mutable_data(), 0, out_arr->buffers[1]->size());
+      return TakeIndexDispatch<
+          FixedWidthTakeImpl, std::integral_constant<int, 1>, /*OutputIsZeroInitialized=*/
+          std::true_type>(ctx, values, indices, out_arr);
     case 8:
-      TakeIndexDispatch<PrimitiveTakeImpl, std::integral_constant<int, 1>>(
-          values, indices, out_arr);
-      break;
+      return TakeIndexDispatch<FixedWidthTakeImpl, std::integral_constant<int, 8>>(
+          ctx, values, indices, out_arr);
     case 16:
-      TakeIndexDispatch<PrimitiveTakeImpl, std::integral_constant<int, 2>>(
-          values, indices, out_arr);
-      break;
+      return TakeIndexDispatch<FixedWidthTakeImpl, std::integral_constant<int, 16>>(
+          ctx, values, indices, out_arr);
     case 32:
-      TakeIndexDispatch<PrimitiveTakeImpl, std::integral_constant<int, 4>>(
-          values, indices, out_arr);
-      break;
+      return TakeIndexDispatch<FixedWidthTakeImpl, std::integral_constant<int, 32>>(
+          ctx, values, indices, out_arr);
     case 64:
-      TakeIndexDispatch<PrimitiveTakeImpl, std::integral_constant<int, 8>>(
-          values, indices, out_arr);
-      break;
+      return TakeIndexDispatch<FixedWidthTakeImpl, std::integral_constant<int, 64>>(
+          ctx, values, indices, out_arr);
     case 128:
       // For INTERVAL_MONTH_DAY_NANO, DECIMAL128
-      TakeIndexDispatch<PrimitiveTakeImpl, std::integral_constant<int, 16>>(
-          values, indices, out_arr);
-      break;
+      return TakeIndexDispatch<FixedWidthTakeImpl, std::integral_constant<int, 128>>(
+          ctx, values, indices, out_arr);
     case 256:
       // For DECIMAL256
-      TakeIndexDispatch<PrimitiveTakeImpl, std::integral_constant<int, 32>>(
-          values, indices, out_arr);
-      break;
-    default:
-      return Status::NotImplemented("Unsupported primitive type for take: ",
-                                    *values.type);
+      return TakeIndexDispatch<FixedWidthTakeImpl, std::integral_constant<int, 256>>(
+          ctx, values, indices, out_arr);
   }
-  return Status::OK();
+  if (ARROW_PREDICT_TRUE(values.type->id() == Type::FIXED_SIZE_BINARY ||
+                         values.type->id() == Type::FIXED_SIZE_LIST)) {
+    int64_t byte_width = util::FixedWidthInBytes(*values.type);
+    // 0-length fixed-size binary or lists were handled above on `case 0`
+    DCHECK_GT(byte_width, 0);
+    return TakeIndexDispatch<FixedWidthTakeImpl,
+                             /*ValueBitWidth=*/std::integral_constant<int, 8>,
+                             /*OutputIsZeroInitialized=*/std::false_type,
+                             /*WithFactor=*/std::true_type>(ctx, values, indices, out_arr,
+                                                            /*factor=*/byte_width);
+  }
+  return Status::NotImplemented("Unsupported primitive type for take: ", *values.type);
 }
 
 namespace {
@@ -681,142 +537,144 @@ Status ExtensionTake(KernelContext* ctx, const ExecSpan& batch, ExecResult* out)
 // R -> RecordBatch
 // T -> Table
 
-Result<std::shared_ptr<ArrayData>> TakeAAA(const std::shared_ptr<ArrayData>& values,
-                                           const std::shared_ptr<ArrayData>& indices,
-                                           const TakeOptions& options, ExecContext* ctx) {
-  ARROW_ASSIGN_OR_RAISE(Datum result,
-                        CallFunction("array_take", {values, indices}, &options, ctx));
-  return result.array();
-}
+const FunctionDoc take_doc(
+    "Select values from an input based on indices from another array",
+    ("The output is populated with values from the input at positions\n"
+     "given by `indices`.  Nulls in `indices` emit null in the output."),
+    {"input", "indices"}, "TakeOptions");
 
-Result<std::shared_ptr<ChunkedArray>> TakeCAC(const ChunkedArray& values,
-                                              const Array& indices,
-                                              const TakeOptions& options,
-                                              ExecContext* ctx) {
-  std::shared_ptr<Array> values_array;
-  if (values.num_chunks() == 1) {
-    // Case 1: `values` has a single chunk, so just use it
-    values_array = values.chunk(0);
-  } else {
-    // TODO Case 2: See if all `indices` fall in the same chunk and call Array Take on it
-    // See
-    // https://github.com/apache/arrow/blob/6f2c9041137001f7a9212f244b51bc004efc29af/r/src/compute.cpp#L123-L151
-    // TODO Case 3: If indices are sorted, can slice them and call Array Take
-    // (these are relevant to TakeCCC as well)
-
-    // Case 4: Else, concatenate chunks and call Array Take
-    if (values.chunks().empty()) {
-      ARROW_ASSIGN_OR_RAISE(
-          values_array, MakeArrayOfNull(values.type(), /*length=*/0, ctx->memory_pool()));
-    } else {
-      ARROW_ASSIGN_OR_RAISE(values_array,
-                            Concatenate(values.chunks(), ctx->memory_pool()));
-    }
+// Metafunction for dispatching to different Take implementations other than
+// Array-Array.
+class TakeMetaFunction : public MetaFunction {
+ public:
+  TakeMetaFunction()
+      : MetaFunction("take", Arity::Binary(), take_doc, GetDefaultTakeOptions()) {}
+
+  static Result<Datum> CallArrayTake(const std::vector<Datum>& args,
+                                     const TakeOptions& options, ExecContext* ctx) {
+    ARROW_ASSIGN_OR_RAISE(auto array_take_func,
+                          ctx->func_registry()->GetFunction("array_take"));
+    return array_take_func->Execute(args, &options, ctx);
   }
-  // Call Array Take on our single chunk
-  ARROW_ASSIGN_OR_RAISE(std::shared_ptr<ArrayData> new_chunk,
-                        TakeAAA(values_array->data(), indices.data(), options, ctx));
-  std::vector<std::shared_ptr<Array>> chunks = {MakeArray(new_chunk)};
-  return std::make_shared<ChunkedArray>(std::move(chunks));
-}
 
-Result<std::shared_ptr<ChunkedArray>> TakeCCC(const ChunkedArray& values,
-                                              const ChunkedArray& indices,
-                                              const TakeOptions& options,
-                                              ExecContext* ctx) {
-  // XXX: for every chunk in indices, values are gathered from all chunks in values to
-  // form a new chunk in the result. Performing this concatenation is not ideal, but
-  // greatly simplifies the implementation before something more efficient is
-  // implemented.
-  std::shared_ptr<Array> values_array;
-  if (values.num_chunks() == 1) {
-    values_array = values.chunk(0);
-  } else {
-    if (values.chunks().empty()) {
-      ARROW_ASSIGN_OR_RAISE(
-          values_array, MakeArrayOfNull(values.type(), /*length=*/0, ctx->memory_pool()));
-    } else {
-      ARROW_ASSIGN_OR_RAISE(values_array,
-                            Concatenate(values.chunks(), ctx->memory_pool()));
+  static Result<std::shared_ptr<Array>> ChunkedArrayAsArray(
+      const std::shared_ptr<ChunkedArray>& values, MemoryPool* pool) {
+    switch (values->num_chunks()) {
+      case 0:
+        return MakeArrayOfNull(values->type(), /*length=*/0, pool);
+      case 1:
+        return values->chunk(0);
+      default:
+        return Concatenate(values->chunks(), pool);
     }
   }
-  std::vector<std::shared_ptr<Array>> new_chunks;
-  new_chunks.resize(indices.num_chunks());
-  for (int i = 0; i < indices.num_chunks(); i++) {
-    ARROW_ASSIGN_OR_RAISE(auto chunk, TakeAAA(values_array->data(),
-                                              indices.chunk(i)->data(), options, ctx));
-    new_chunks[i] = MakeArray(chunk);
+
+ private:
+  static Result<std::shared_ptr<ArrayData>> TakeAAA(const std::vector<Datum>& args,
+                                                    const TakeOptions& options,
+                                                    ExecContext* ctx) {
+    DCHECK_EQ(args[0].kind(), Datum::ARRAY);
+    DCHECK_EQ(args[1].kind(), Datum::ARRAY);
+    ARROW_ASSIGN_OR_RAISE(Datum result, CallArrayTake(args, options, ctx));
+    return result.array();
   }
-  return std::make_shared<ChunkedArray>(std::move(new_chunks), values.type());
-}
 
-Result<std::shared_ptr<ChunkedArray>> TakeACC(const Array& values,
-                                              const ChunkedArray& indices,
-                                              const TakeOptions& options,
-                                              ExecContext* ctx) {
-  auto num_chunks = indices.num_chunks();
-  std::vector<std::shared_ptr<Array>> new_chunks(num_chunks);
-  for (int i = 0; i < num_chunks; i++) {
-    // Take with that indices chunk
-    ARROW_ASSIGN_OR_RAISE(std::shared_ptr<ArrayData> chunk,
-                          TakeAAA(values.data(), indices.chunk(i)->data(), options, ctx));
-    new_chunks[i] = MakeArray(chunk);
+  static Result<std::shared_ptr<ArrayData>> TakeCAA(
+      const std::shared_ptr<ChunkedArray>& values, const Array& indices,
+      const TakeOptions& options, ExecContext* ctx) {
+    ARROW_ASSIGN_OR_RAISE(auto values_array,
+                          ChunkedArrayAsArray(values, ctx->memory_pool()));
+    std::vector<Datum> args = {std::move(values_array), indices};
+    return TakeAAA(args, options, ctx);
   }
-  return std::make_shared<ChunkedArray>(std::move(new_chunks), values.type());
-}
 
-Result<std::shared_ptr<RecordBatch>> TakeRAR(const RecordBatch& batch,
-                                             const Array& indices,
-                                             const TakeOptions& options,
-                                             ExecContext* ctx) {
-  auto ncols = batch.num_columns();
-  auto nrows = indices.length();
-  std::vector<std::shared_ptr<Array>> columns(ncols);
-  for (int j = 0; j < ncols; j++) {
-    ARROW_ASSIGN_OR_RAISE(std::shared_ptr<ArrayData> col_data,
-                          TakeAAA(batch.column(j)->data(), indices.data(), options, ctx));
-    columns[j] = MakeArray(col_data);
+  static Result<std::shared_ptr<ChunkedArray>> TakeCAC(
+      const std::shared_ptr<ChunkedArray>& values, const Array& indices,
+      const TakeOptions& options, ExecContext* ctx) {
+    ARROW_ASSIGN_OR_RAISE(auto new_chunk, TakeCAA(values, indices, options, ctx));
+    return std::make_shared<ChunkedArray>(MakeArray(std::move(new_chunk)));
+  }
+
+  static Result<std::shared_ptr<ChunkedArray>> TakeCCC(
+      const std::shared_ptr<ChunkedArray>& values,
+      const std::shared_ptr<ChunkedArray>& indices, const TakeOptions& options,
+      ExecContext* ctx) {
+    // XXX: for every chunk in indices, values are gathered from all chunks in values to
+    // form a new chunk in the result. Performing this concatenation is not ideal, but
+    // greatly simplifies the implementation before something more efficient is
+    // implemented.
+    ARROW_ASSIGN_OR_RAISE(auto values_array,
+                          ChunkedArrayAsArray(values, ctx->memory_pool()));
+    std::vector<Datum> args = {std::move(values_array), {}};
+    std::vector<std::shared_ptr<Array>> new_chunks;
+    new_chunks.resize(indices->num_chunks());
+    for (int i = 0; i < indices->num_chunks(); i++) {
+      args[1] = indices->chunk(i);
+      // XXX: this loop can use TakeCAA once it can handle ChunkedArray
+      // without concatenating first
+      ARROW_ASSIGN_OR_RAISE(auto chunk, TakeAAA(args, options, ctx));
+      new_chunks[i] = MakeArray(chunk);
+    }
+    return std::make_shared<ChunkedArray>(std::move(new_chunks), values->type());
   }
-  return RecordBatch::Make(batch.schema(), nrows, std::move(columns));
-}
 
-Result<std::shared_ptr<Table>> TakeTAT(const Table& table, const Array& indices,
-                                       const TakeOptions& options, ExecContext* ctx) {
-  auto ncols = table.num_columns();
-  std::vector<std::shared_ptr<ChunkedArray>> columns(ncols);
+  static Result<std::shared_ptr<ChunkedArray>> TakeACC(const Array& values,
+                                                       const ChunkedArray& indices,
+                                                       const TakeOptions& options,
+                                                       ExecContext* ctx) {
+    auto num_chunks = indices.num_chunks();
+    std::vector<std::shared_ptr<Array>> new_chunks(num_chunks);
+    std::vector<Datum> args = {values, {}};
+    for (int i = 0; i < num_chunks; i++) {
+      // Take with that indices chunk
+      args[1] = indices.chunk(i);
+      ARROW_ASSIGN_OR_RAISE(auto chunk, TakeAAA(args, options, ctx));
+      new_chunks[i] = MakeArray(chunk);
+    }
+    return std::make_shared<ChunkedArray>(std::move(new_chunks), values.type());
+  }
 
-  for (int j = 0; j < ncols; j++) {
-    ARROW_ASSIGN_OR_RAISE(columns[j], TakeCAC(*table.column(j), indices, options, ctx));
+  static Result<std::shared_ptr<RecordBatch>> TakeRAR(const RecordBatch& batch,
+                                                      const Array& indices,
+                                                      const TakeOptions& options,
+                                                      ExecContext* ctx) {
+    auto ncols = batch.num_columns();
+    auto nrows = indices.length();
+    std::vector<std::shared_ptr<Array>> columns(ncols);
+    std::vector<Datum> args = {{}, indices};
+    for (int j = 0; j < ncols; j++) {
+      args[0] = batch.column(j);
+      ARROW_ASSIGN_OR_RAISE(auto col_data, TakeAAA(args, options, ctx));
+      columns[j] = MakeArray(col_data);
+    }
+    return RecordBatch::Make(batch.schema(), nrows, std::move(columns));
   }
-  return Table::Make(table.schema(), std::move(columns));
-}
 
-Result<std::shared_ptr<Table>> TakeTCT(const Table& table, const ChunkedArray& indices,
-                                       const TakeOptions& options, ExecContext* ctx) {
-  auto ncols = table.num_columns();
-  std::vector<std::shared_ptr<ChunkedArray>> columns(ncols);
-  for (int j = 0; j < ncols; j++) {
-    ARROW_ASSIGN_OR_RAISE(columns[j], TakeCCC(*table.column(j), indices, options, ctx));
+  static Result<std::shared_ptr<Table>> TakeTAT(const std::shared_ptr<Table>& table,
+                                                const Array& indices,
+                                                const TakeOptions& options,
+                                                ExecContext* ctx) {
+    auto ncols = table->num_columns();
+    std::vector<std::shared_ptr<ChunkedArray>> columns(ncols);
+
+    for (int j = 0; j < ncols; j++) {
+      ARROW_ASSIGN_OR_RAISE(columns[j], TakeCAC(table->column(j), indices, options, ctx));
+    }
+    return Table::Make(table->schema(), std::move(columns));
   }
-  return Table::Make(table.schema(), std::move(columns));
-}
 
-const FunctionDoc take_doc(
-    "Select values from an input based on indices from another array",
-    ("The output is populated with values from the input at positions\n"
-     "given by `indices`.  Nulls in `indices` emit null in the output."),
-    {"input", "indices"}, "TakeOptions");
+  static Result<std::shared_ptr<Table>> TakeTCT(
+      const std::shared_ptr<Table>& table, const std::shared_ptr<ChunkedArray>& indices,
+      const TakeOptions& options, ExecContext* ctx) {
+    auto ncols = table->num_columns();
+    std::vector<std::shared_ptr<ChunkedArray>> columns(ncols);
+    for (int j = 0; j < ncols; j++) {
+      ARROW_ASSIGN_OR_RAISE(columns[j], TakeCCC(table->column(j), indices, options, ctx));
+    }
+    return Table::Make(table->schema(), std::move(columns));
+  }
 
-// Metafunction for dispatching to different Take implementations other than
-// Array-Array.
-//
-// TODO: Revamp approach to executing Take operations. In addition to being
-// overly complex dispatching, there is no parallelization.
-class TakeMetaFunction : public MetaFunction {
  public:
-  TakeMetaFunction()
-      : MetaFunction("take", Arity::Binary(), take_doc, GetDefaultTakeOptions()) {}
-
   Result<Datum> ExecuteImpl(const std::vector<Datum>& args,
                             const FunctionOptions* options,
                             ExecContext* ctx) const override {
@@ -825,16 +683,16 @@ class TakeMetaFunction : public MetaFunction {
     switch (args[0].kind()) {
       case Datum::ARRAY:
         if (index_kind == Datum::ARRAY) {
-          return TakeAAA(args[0].array(), args[1].array(), take_opts, ctx);
+          return TakeAAA(args, take_opts, ctx);
         } else if (index_kind == Datum::CHUNKED_ARRAY) {
           return TakeACC(*args[0].make_array(), *args[1].chunked_array(), take_opts, ctx);
         }
         break;
       case Datum::CHUNKED_ARRAY:
         if (index_kind == Datum::ARRAY) {
-          return TakeCAC(*args[0].chunked_array(), *args[1].make_array(), take_opts, ctx);
+          return TakeCAC(args[0].chunked_array(), *args[1].make_array(), take_opts, ctx);
         } else if (index_kind == Datum::CHUNKED_ARRAY) {
-          return TakeCCC(*args[0].chunked_array(), *args[1].chunked_array(), take_opts,
+          return TakeCCC(args[0].chunked_array(), args[1].chunked_array(), take_opts,
                          ctx);
         }
         break;
@@ -845,12 +703,13 @@ class TakeMetaFunction : public MetaFunction {
         break;
       case Datum::TABLE:
         if (index_kind == Datum::ARRAY) {
-          return TakeTAT(*args[0].table(), *args[1].make_array(), take_opts, ctx);
+          return TakeTAT(args[0].table(), *args[1].make_array(), take_opts, ctx);
         } else if (index_kind == Datum::CHUNKED_ARRAY) {
-          return TakeTCT(*args[0].table(), *args[1].chunked_array(), take_opts, ctx);
+          return TakeTCT(args[0].table(), args[1].chunked_array(), take_opts, ctx);
         }
         break;
-      default:
+      case Datum::NONE:
+      case Datum::SCALAR:
         break;
     }
     return Status::NotImplemented(
@@ -877,17 +736,17 @@ void PopulateTakeKernels(std::vector<SelectionKernelData>* out) {
   auto take_indices = match::Integer();
 
   *out = {
-      {InputType(match::Primitive()), take_indices, PrimitiveTakeExec},
+      {InputType(match::Primitive()), take_indices, FixedWidthTakeExec},
       {InputType(match::BinaryLike()), take_indices, VarBinaryTakeExec},
       {InputType(match::LargeBinaryLike()), take_indices, LargeVarBinaryTakeExec},
-      {InputType(Type::FIXED_SIZE_BINARY), take_indices, FSBTakeExec},
+      {InputType(match::FixedSizeBinaryLike()), take_indices, FixedWidthTakeExec},
       {InputType(null()), take_indices, NullTakeExec},
-      {InputType(Type::DECIMAL128), take_indices, PrimitiveTakeExec},
-      {InputType(Type::DECIMAL256), take_indices, PrimitiveTakeExec},
       {InputType(Type::DICTIONARY), take_indices, DictionaryTake},
       {InputType(Type::EXTENSION), take_indices, ExtensionTake},
       {InputType(Type::LIST), take_indices, ListTakeExec},
       {InputType(Type::LARGE_LIST), take_indices, LargeListTakeExec},
+      {InputType(Type::LIST_VIEW), take_indices, ListViewTakeExec},
+      {InputType(Type::LARGE_LIST_VIEW), take_indices, LargeListViewTakeExec},
       {InputType(Type::FIXED_SIZE_LIST), take_indices, FSLTakeExec},
       {InputType(Type::DENSE_UNION), take_indices, DenseUnionTakeExec},
       {InputType(Type::SPARSE_UNION), take_indices, SparseUnionTakeExec},
diff --git a/cpp/src/arrow/compute/kernels/vector_selection_test.cc b/cpp/src/arrow/compute/kernels/vector_selection_test.cc
index ec94b328ea361..aba016d6b7e8d 100644
--- a/cpp/src/arrow/compute/kernels/vector_selection_test.cc
+++ b/cpp/src/arrow/compute/kernels/vector_selection_test.cc
@@ -23,12 +23,14 @@
 #include <utility>
 #include <vector>
 
+#include "arrow/array/builder_nested.h"
 #include "arrow/array/concatenate.h"
 #include "arrow/chunked_array.h"
 #include "arrow/compute/api.h"
 #include "arrow/compute/kernels/test_util.h"
 #include "arrow/table.h"
 #include "arrow/testing/builder.h"
+#include "arrow/testing/fixed_width_test_util.h"
 #include "arrow/testing/gtest_util.h"
 #include "arrow/testing/random.h"
 #include "arrow/testing/util.h"
@@ -677,18 +679,38 @@ TYPED_TEST(TestFilterKernelWithString, FilterDictionary) {
   this->AssertFilterDictionary(dict, "[3, 4, 2]", "[null, 1, 0]", "[null, 4]");
 }
 
+const auto kListAndListViewTypes = std::vector<std::shared_ptr<DataType>>{
+    list(int32()),
+    list_view(int32()),
+};
+
+const auto kNestedListAndListViewTypes = std::vector<std::shared_ptr<DataType>>{
+    list(list(int32())),
+    list_view(list_view(int32())),
+    list(list_view(int32())),
+    list_view(list(int32())),
+};
+
+const auto kLargeListAndListViewTypes = std::vector<std::shared_ptr<DataType>>{
+    large_list(int32()),
+    large_list_view(int32()),
+};
+
 class TestFilterKernelWithList : public TestFilterKernel {
  public:
 };
 
 TEST_F(TestFilterKernelWithList, FilterListInt32) {
   std::string list_json = "[[], [1,2], null, [3]]";
-  this->AssertFilter(list(int32()), list_json, "[0, 0, 0, 0]", "[]");
-  this->AssertFilter(list(int32()), list_json, "[0, 1, 1, null]", "[[1,2], null, null]");
-  this->AssertFilter(list(int32()), list_json, "[0, 0, 1, null]", "[null, null]");
-  this->AssertFilter(list(int32()), list_json, "[1, 0, 0, 1]", "[[], [3]]");
-  this->AssertFilter(list(int32()), list_json, "[1, 1, 1, 1]", list_json);
-  this->AssertFilter(list(int32()), list_json, "[0, 1, 0, 1]", "[[1,2], [3]]");
+  for (auto& type : kListAndListViewTypes) {
+    ARROW_SCOPED_TRACE("type = ", *type);
+    this->AssertFilter(type, list_json, "[0, 0, 0, 0]", "[]");
+    this->AssertFilter(type, list_json, "[0, 1, 1, null]", "[[1,2], null, null]");
+    this->AssertFilter(type, list_json, "[0, 0, 1, null]", "[null, null]");
+    this->AssertFilter(type, list_json, "[1, 0, 0, 1]", "[[], [3]]");
+    this->AssertFilter(type, list_json, "[1, 1, 1, 1]", list_json);
+    this->AssertFilter(type, list_json, "[0, 1, 0, 1]", "[[1,2], [3]]");
+  }
 }
 
 TEST_F(TestFilterKernelWithList, FilterListListInt32) {
@@ -698,35 +720,69 @@ TEST_F(TestFilterKernelWithList, FilterListListInt32) {
     null,
     [[3, null], null]
   ])";
-  auto type = list(list(int32()));
-  this->AssertFilter(type, list_json, "[0, 0, 0, 0]", "[]");
-  this->AssertFilter(type, list_json, "[0, 1, 1, null]", R"([
-    [[1], [2, null, 2], []],
-    null,
-    null
-  ])");
-  this->AssertFilter(type, list_json, "[0, 0, 1, null]", "[null, null]");
-  this->AssertFilter(type, list_json, "[1, 0, 0, 1]", R"([
-    [],
-    [[3, null], null]
-  ])");
-  this->AssertFilter(type, list_json, "[1, 1, 1, 1]", list_json);
-  this->AssertFilter(type, list_json, "[0, 1, 0, 1]", R"([
-    [[1], [2, null, 2], []],
-    [[3, null], null]
-  ])");
+  for (auto& type : kNestedListAndListViewTypes) {
+    ARROW_SCOPED_TRACE("type = ", *type);
+    this->AssertFilter(type, list_json, "[0, 0, 0, 0]", "[]");
+    this->AssertFilter(type, list_json, "[0, 1, 1, null]", R"([
+      [[1], [2, null, 2], []],
+      null,
+      null
+    ])");
+    this->AssertFilter(type, list_json, "[0, 0, 1, null]", "[null, null]");
+    this->AssertFilter(type, list_json, "[1, 0, 0, 1]", R"([
+      [],
+      [[3, null], null]
+    ])");
+    this->AssertFilter(type, list_json, "[1, 1, 1, 1]", list_json);
+    this->AssertFilter(type, list_json, "[0, 1, 0, 1]", R"([
+      [[1], [2, null, 2], []],
+      [[3, null], null]
+    ])");
+  }
 }
 
 class TestFilterKernelWithLargeList : public TestFilterKernel {};
 
 TEST_F(TestFilterKernelWithLargeList, FilterListInt32) {
   std::string list_json = "[[], [1,2], null, [3]]";
-  this->AssertFilter(large_list(int32()), list_json, "[0, 0, 0, 0]", "[]");
-  this->AssertFilter(large_list(int32()), list_json, "[0, 1, 1, null]",
-                     "[[1,2], null, null]");
+  for (auto& type : kLargeListAndListViewTypes) {
+    ARROW_SCOPED_TRACE("type = ", *type);
+    this->AssertFilter(type, list_json, "[0, 0, 0, 0]", "[]");
+    this->AssertFilter(type, list_json, "[0, 1, 1, null]", "[[1,2], null, null]");
+  }
 }
 
-class TestFilterKernelWithFixedSizeList : public TestFilterKernel {};
+class TestFilterKernelWithFixedSizeList : public TestFilterKernel {
+ protected:
+  std::vector<std::shared_ptr<Array>> five_length_filters_ = {
+      ArrayFromJSON(boolean(), "[false, false, false, false, false]"),
+      ArrayFromJSON(boolean(), "[true, true, true, true, true]"),
+      ArrayFromJSON(boolean(), "[false, true, true, false, true]"),
+      ArrayFromJSON(boolean(), "[null, true, null, false, true]"),
+  };
+
+  void AssertFilterOnNestedLists(const std::shared_ptr<DataType>& inner_type,
+                                 const std::vector<int>& list_sizes) {
+    using NLG = ::arrow::util::internal::NestedListGenerator;
+    constexpr int64_t kLength = 5;
+    // Create two equivalent lists: one as a FixedSizeList and another as a List.
+    ASSERT_OK_AND_ASSIGN(auto fsl_list,
+                         NLG::NestedFSLArray(inner_type, list_sizes, kLength));
+    ASSERT_OK_AND_ASSIGN(auto list,
+                         NLG::NestedListArray(inner_type, list_sizes, kLength));
+
+    ARROW_SCOPED_TRACE("CheckTakeOnNestedLists of type `", *fsl_list->type(), "`");
+
+    for (auto& filter : five_length_filters_) {
+      // Use the Filter on ListType as the reference implementation.
+      ASSERT_OK_AND_ASSIGN(auto expected_list,
+                           Filter(*list, *filter, /*options=*/emit_null_));
+      ASSERT_OK_AND_ASSIGN(auto expected_fsl, Cast(expected_list, fsl_list->type()));
+      auto expected_fsl_array = expected_fsl.make_array();
+      this->AssertFilter(fsl_list, filter, expected_fsl_array);
+    }
+  }
+};
 
 TEST_F(TestFilterKernelWithFixedSizeList, FilterFixedSizeListInt32) {
   std::string list_json = "[null, [1, null, 3], [4, 5, 6], [7, 8, null]]";
@@ -740,6 +796,33 @@ TEST_F(TestFilterKernelWithFixedSizeList, FilterFixedSizeListInt32) {
                      "[[1, null, 3], [7, 8, null]]");
 }
 
+TEST_F(TestFilterKernelWithFixedSizeList, FilterFixedSizeListVarWidth) {
+  std::string list_json =
+      R"([["zero", "one", ""], ["two", "", "three"], ["four", "five", "six"], ["seven", "eight", ""]])";
+  this->AssertFilter(fixed_size_list(utf8(), 3), list_json, "[0, 0, 0, 0]", "[]");
+  this->AssertFilter(fixed_size_list(utf8(), 3), list_json, "[0, 1, 1, null]",
+                     R"([["two", "", "three"], ["four", "five", "six"], null])");
+  this->AssertFilter(fixed_size_list(utf8(), 3), list_json, "[0, 0, 1, null]",
+                     R"([["four", "five", "six"], null])");
+  this->AssertFilter(fixed_size_list(utf8(), 3), list_json, "[1, 1, 1, 1]", list_json);
+  this->AssertFilter(fixed_size_list(utf8(), 3), list_json, "[0, 1, 0, 1]",
+                     R"([["two", "", "three"], ["seven", "eight", ""]])");
+}
+
+TEST_F(TestFilterKernelWithFixedSizeList, FilterFixedSizeListModuloNesting) {
+  using NLG = ::arrow::util::internal::NestedListGenerator;
+  const std::vector<std::shared_ptr<DataType>> value_types = {
+      int16(),
+      int32(),
+      int64(),
+  };
+  NLG::VisitAllNestedListConfigurations(
+      value_types, [this](const std::shared_ptr<DataType>& inner_type,
+                          const std::vector<int>& list_sizes) {
+        this->AssertFilterOnNestedLists(inner_type, list_sizes);
+      });
+}
+
 class TestFilterKernelWithMap : public TestFilterKernel {};
 
 TEST_F(TestFilterKernelWithMap, FilterMapStringToInt32) {
@@ -1034,29 +1117,34 @@ Status TakeJSON(const std::shared_ptr<DataType>& type, const std::string& values
       .Value(out);
 }
 
+void DoCheckTake(const std::shared_ptr<Array>& values,
+                 const std::shared_ptr<Array>& indices,
+                 const std::shared_ptr<Array>& expected) {
+  AssertTakeArrays(values, indices, expected);
+
+  // Check sliced values
+  ASSERT_OK_AND_ASSIGN(auto values_filler, MakeArrayOfNull(values->type(), 2));
+  ASSERT_OK_AND_ASSIGN(auto values_sliced,
+                       Concatenate({values_filler, values, values_filler}));
+  values_sliced = values_sliced->Slice(2, values->length());
+  AssertTakeArrays(values_sliced, indices, expected);
+
+  // Check sliced indices
+  ASSERT_OK_AND_ASSIGN(auto zero, MakeScalar(indices->type(), int8_t{0}));
+  ASSERT_OK_AND_ASSIGN(auto indices_filler, MakeArrayFromScalar(*zero, 3));
+  ASSERT_OK_AND_ASSIGN(auto indices_sliced,
+                       Concatenate({indices_filler, indices, indices_filler}));
+  indices_sliced = indices_sliced->Slice(3, indices->length());
+  AssertTakeArrays(values, indices_sliced, expected);
+}
+
 void CheckTake(const std::shared_ptr<DataType>& type, const std::string& values_json,
                const std::string& indices_json, const std::string& expected_json) {
   auto values = ArrayFromJSON(type, values_json);
   auto expected = ArrayFromJSON(type, expected_json);
-
   for (auto index_type : {int8(), uint32()}) {
     auto indices = ArrayFromJSON(index_type, indices_json);
-    AssertTakeArrays(values, indices, expected);
-
-    // Check sliced values
-    ASSERT_OK_AND_ASSIGN(auto values_filler, MakeArrayOfNull(type, 2));
-    ASSERT_OK_AND_ASSIGN(auto values_sliced,
-                         Concatenate({values_filler, values, values_filler}));
-    values_sliced = values_sliced->Slice(2, values->length());
-    AssertTakeArrays(values_sliced, indices, expected);
-
-    // Check sliced indices
-    ASSERT_OK_AND_ASSIGN(auto zero, MakeScalar(index_type, int8_t{0}));
-    ASSERT_OK_AND_ASSIGN(auto indices_filler, MakeArrayFromScalar(*zero, 3));
-    ASSERT_OK_AND_ASSIGN(auto indices_sliced,
-                         Concatenate({indices_filler, indices, indices_filler}));
-    indices_sliced = indices_sliced->Slice(3, indices->length());
-    AssertTakeArrays(values, indices_sliced, expected);
+    DoCheckTake(values, indices, expected);
   }
 }
 
@@ -1082,6 +1170,15 @@ void ValidateTakeImpl(const std::shared_ptr<Array>& values,
   for (int64_t i = 0; i < indices->length(); ++i) {
     if (typed_indices->IsNull(i) || typed_values->IsNull(typed_indices->Value(i))) {
       ASSERT_TRUE(result->IsNull(i)) << i;
+      // The value of a null element is undefined, but right
+      // out of the Take kernel it is expected to be 0.
+      if constexpr (is_primitive(ValuesType::type_id)) {
+        if constexpr (ValuesType::type_id == Type::BOOL) {
+          ASSERT_EQ(typed_result->Value(i), false);
+        } else {
+          ASSERT_EQ(typed_result->Value(i), 0);
+        }
+      }
     } else {
       ASSERT_FALSE(result->IsNull(i)) << i;
       ASSERT_EQ(typed_result->GetView(i), typed_values->GetView(typed_indices->Value(i)))
@@ -1376,17 +1473,18 @@ class TestTakeKernelWithList : public TestTakeKernelTyped<ListType> {};
 
 TEST_F(TestTakeKernelWithList, TakeListInt32) {
   std::string list_json = "[[], [1,2], null, [3]]";
-  CheckTake(list(int32()), list_json, "[]", "[]");
-  CheckTake(list(int32()), list_json, "[3, 2, 1]", "[[3], null, [1,2]]");
-  CheckTake(list(int32()), list_json, "[null, 3, 0]", "[null, [3], []]");
-  CheckTake(list(int32()), list_json, "[null, null]", "[null, null]");
-  CheckTake(list(int32()), list_json, "[3, 0, 0, 3]", "[[3], [], [], [3]]");
-  CheckTake(list(int32()), list_json, "[0, 1, 2, 3]", list_json);
-  CheckTake(list(int32()), list_json, "[0, 0, 0, 0, 0, 0, 1]",
-            "[[], [], [], [], [], [], [1, 2]]");
-
-  this->TestNoValidityBitmapButUnknownNullCount(list(int32()), "[[], [1,2], [3]]",
-                                                "[0, 1, 0]");
+  for (auto& type : kListAndListViewTypes) {
+    CheckTake(type, list_json, "[]", "[]");
+    CheckTake(type, list_json, "[3, 2, 1]", "[[3], null, [1,2]]");
+    CheckTake(type, list_json, "[null, 3, 0]", "[null, [3], []]");
+    CheckTake(type, list_json, "[null, null]", "[null, null]");
+    CheckTake(type, list_json, "[3, 0, 0, 3]", "[[3], [], [], [3]]");
+    CheckTake(type, list_json, "[0, 1, 2, 3]", list_json);
+    CheckTake(type, list_json, "[0, 0, 0, 0, 0, 0, 1]",
+              "[[], [], [], [], [], [], [1, 2]]");
+
+    this->TestNoValidityBitmapButUnknownNullCount(type, "[[], [1,2], [3]]", "[0, 1, 0]");
+  }
 }
 
 TEST_F(TestTakeKernelWithList, TakeListListInt32) {
@@ -1396,38 +1494,61 @@ TEST_F(TestTakeKernelWithList, TakeListListInt32) {
     null,
     [[3, null], null]
   ])";
-  auto type = list(list(int32()));
-  CheckTake(type, list_json, "[]", "[]");
-  CheckTake(type, list_json, "[3, 2, 1]", R"([
-    [[3, null], null],
-    null,
-    [[1], [2, null, 2], []]
-  ])");
-  CheckTake(type, list_json, "[null, 3, 0]", R"([
-    null,
-    [[3, null], null],
-    []
-  ])");
-  CheckTake(type, list_json, "[null, null]", "[null, null]");
-  CheckTake(type, list_json, "[3, 0, 0, 3]",
-            "[[[3, null], null], [], [], [[3, null], null]]");
-  CheckTake(type, list_json, "[0, 1, 2, 3]", list_json);
-  CheckTake(type, list_json, "[0, 0, 0, 0, 0, 0, 1]",
-            "[[], [], [], [], [], [], [[1], [2, null, 2], []]]");
+  for (auto& type : kNestedListAndListViewTypes) {
+    ARROW_SCOPED_TRACE("type = ", *type);
+    CheckTake(type, list_json, "[]", "[]");
+    CheckTake(type, list_json, "[3, 2, 1]", R"([
+      [[3, null], null],
+      null,
+      [[1], [2, null, 2], []]
+    ])");
+    CheckTake(type, list_json, "[null, 3, 0]", R"([
+      null,
+      [[3, null], null],
+      []
+    ])");
+    CheckTake(type, list_json, "[null, null]", "[null, null]");
+    CheckTake(type, list_json, "[3, 0, 0, 3]",
+              "[[[3, null], null], [], [], [[3, null], null]]");
+    CheckTake(type, list_json, "[0, 1, 2, 3]", list_json);
+    CheckTake(type, list_json, "[0, 0, 0, 0, 0, 0, 1]",
+              "[[], [], [], [], [], [], [[1], [2, null, 2], []]]");
 
-  this->TestNoValidityBitmapButUnknownNullCount(
-      type, "[[[1], [2, null, 2], []], [[3, null]]]", "[0, 1, 0]");
+    this->TestNoValidityBitmapButUnknownNullCount(
+        type, "[[[1], [2, null, 2], []], [[3, null]]]", "[0, 1, 0]");
+  }
 }
 
 class TestTakeKernelWithLargeList : public TestTakeKernelTyped<LargeListType> {};
 
 TEST_F(TestTakeKernelWithLargeList, TakeLargeListInt32) {
   std::string list_json = "[[], [1,2], null, [3]]";
-  CheckTake(large_list(int32()), list_json, "[]", "[]");
-  CheckTake(large_list(int32()), list_json, "[null, 1, 2, 0]", "[null, [1,2], null, []]");
+  for (auto& type : kLargeListAndListViewTypes) {
+    ARROW_SCOPED_TRACE("type = ", *type);
+    CheckTake(type, list_json, "[]", "[]");
+    CheckTake(type, list_json, "[null, 1, 2, 0]", "[null, [1,2], null, []]");
+  }
 }
 
-class TestTakeKernelWithFixedSizeList : public TestTakeKernelTyped<FixedSizeListType> {};
+class TestTakeKernelWithFixedSizeList : public TestTakeKernelTyped<FixedSizeListType> {
+ protected:
+  void CheckTakeOnNestedLists(const std::shared_ptr<DataType>& inner_type,
+                              const std::vector<int>& list_sizes, int64_t length) {
+    using NLG = ::arrow::util::internal::NestedListGenerator;
+    // Create two equivalent lists: one as a FixedSizeList and another as a List.
+    ASSERT_OK_AND_ASSIGN(auto fsl_list,
+                         NLG::NestedFSLArray(inner_type, list_sizes, length));
+    ASSERT_OK_AND_ASSIGN(auto list, NLG::NestedListArray(inner_type, list_sizes, length));
+
+    ARROW_SCOPED_TRACE("CheckTakeOnNestedLists of type `", *fsl_list->type(), "`");
+
+    auto indices = ArrayFromJSON(int64(), "[1, 2, 4]");
+    // Use the Take on ListType as the reference implementation.
+    ASSERT_OK_AND_ASSIGN(auto expected_list, Take(*list, *indices));
+    ASSERT_OK_AND_ASSIGN(auto expected_fsl, Cast(*expected_list, fsl_list->type()));
+    DoCheckTake(fsl_list, indices, expected_fsl);
+  }
+};
 
 TEST_F(TestTakeKernelWithFixedSizeList, TakeFixedSizeListInt32) {
   std::string list_json = "[null, [1, null, 3], [4, 5, 6], [7, 8, null]]";
@@ -1440,15 +1561,55 @@ TEST_F(TestTakeKernelWithFixedSizeList, TakeFixedSizeListInt32) {
   CheckTake(fixed_size_list(int32(), 3), list_json, "[3, 0, 0, 3]",
             "[[7, 8, null], null, null, [7, 8, null]]");
   CheckTake(fixed_size_list(int32(), 3), list_json, "[0, 1, 2, 3]", list_json);
+
+  // No nulls in inner list values trigger the use of FixedWidthTakeExec() in
+  // FSLTakeExec()
+  std::string no_nulls_list_json = "[[0, 0, 0], [1, 2, 3], [4, 5, 6], [7, 8, 9]]";
   CheckTake(
-      fixed_size_list(int32(), 3), list_json, "[2, 2, 2, 2, 2, 2, 1]",
-      "[[4, 5, 6], [4, 5, 6], [4, 5, 6], [4, 5, 6], [4, 5, 6], [4, 5, 6], [1, null, 3]]");
+      fixed_size_list(int32(), 3), no_nulls_list_json, "[2, 2, 2, 2, 2, 2, 1]",
+      "[[4, 5, 6], [4, 5, 6], [4, 5, 6], [4, 5, 6], [4, 5, 6], [4, 5, 6], [1, 2, 3]]");
 
   this->TestNoValidityBitmapButUnknownNullCount(fixed_size_list(int32(), 3),
                                                 "[[1, null, 3], [4, 5, 6], [7, 8, null]]",
                                                 "[0, 1, 0]");
 }
 
+TEST_F(TestTakeKernelWithFixedSizeList, TakeFixedSizeListVarWidth) {
+  std::string list_json =
+      R"([["zero", "one", ""], ["two", "", "three"], ["four", "five", "six"], ["seven", "eight", ""]])";
+  CheckTake(fixed_size_list(utf8(), 3), list_json, "[]", "[]");
+  CheckTake(fixed_size_list(utf8(), 3), list_json, "[3, 2, 1]",
+            R"([["seven", "eight", ""], ["four", "five", "six"], ["two", "", "three"]])");
+  CheckTake(fixed_size_list(utf8(), 3), list_json, "[null, 2, 0]",
+            R"([null, ["four", "five", "six"], ["zero", "one", ""]])");
+  CheckTake(fixed_size_list(utf8(), 3), list_json, R"([null, null])", "[null, null]");
+  CheckTake(
+      fixed_size_list(utf8(), 3), list_json, "[3, 0, 0,3]",
+      R"([["seven", "eight", ""], ["zero", "one", ""], ["zero", "one", ""], ["seven", "eight", ""]])");
+  CheckTake(fixed_size_list(utf8(), 3), list_json, "[0, 1, 2, 3]", list_json);
+  CheckTake(fixed_size_list(utf8(), 3), list_json, "[2, 2, 2, 2, 2, 2, 1]",
+            R"([
+                 ["four", "five", "six"], ["four", "five", "six"],
+                 ["four", "five", "six"], ["four", "five", "six"],
+                 ["four", "five", "six"], ["four", "five", "six"],
+                 ["two", "", "three"]
+               ])");
+}
+
+TEST_F(TestTakeKernelWithFixedSizeList, TakeFixedSizeListModuloNesting) {
+  using NLG = ::arrow::util::internal::NestedListGenerator;
+  const std::vector<std::shared_ptr<DataType>> value_types = {
+      int16(),
+      int32(),
+      int64(),
+  };
+  NLG::VisitAllNestedListConfigurations(
+      value_types, [this](const std::shared_ptr<DataType>& inner_type,
+                          const std::vector<int>& list_sizes) {
+        this->CheckTakeOnNestedLists(inner_type, list_sizes, /*length=*/5);
+      });
+}
+
 class TestTakeKernelWithMap : public TestTakeKernelTyped<MapType> {};
 
 TEST_F(TestTakeKernelWithMap, TakeMapStringToInt32) {
@@ -2144,8 +2305,11 @@ class TestDropNullKernelWithList : public TestDropNullKernelTyped<ListType> {};
 
 TEST_F(TestDropNullKernelWithList, DropNullListInt32) {
   std::string list_json = "[[], [1,2], null, [3]]";
-  CheckDropNull(list(int32()), list_json, "[[], [1,2], [3]]");
-  this->TestNoValidityBitmapButUnknownNullCount(list(int32()), "[[], [1,2], [3]]");
+  for (const auto& type : kListAndListViewTypes) {
+    ARROW_SCOPED_TRACE("type = ", *type);
+    CheckDropNull(type, list_json, "[[], [1,2], [3]]");
+    this->TestNoValidityBitmapButUnknownNullCount(type, "[[], [1,2], [3]]");
+  }
 }
 
 TEST_F(TestDropNullKernelWithList, DropNullListListInt32) {
@@ -2155,22 +2319,27 @@ TEST_F(TestDropNullKernelWithList, DropNullListListInt32) {
     null,
     [[3, null], null]
   ])";
-  auto type = list(list(int32()));
-  CheckDropNull(type, list_json, R"([
-    [],
-    [[1], [2, null, 2], []],
-    [[3, null], null]
-  ])");
+  for (auto& type : kNestedListAndListViewTypes) {
+    ARROW_SCOPED_TRACE("type = ", *type);
+    CheckDropNull(type, list_json, R"([
+      [],
+      [[1], [2, null, 2], []],
+      [[3, null], null]
+    ])");
 
-  this->TestNoValidityBitmapButUnknownNullCount(type,
-                                                "[[[1], [2, null, 2], []], [[3, null]]]");
+    this->TestNoValidityBitmapButUnknownNullCount(
+        type, "[[[1], [2, null, 2], []], [[3, null]]]");
+  }
 }
 
 class TestDropNullKernelWithLargeList : public TestDropNullKernelTyped<LargeListType> {};
 
 TEST_F(TestDropNullKernelWithLargeList, DropNullLargeListInt32) {
   std::string list_json = "[[], [1,2], null, [3]]";
-  CheckDropNull(large_list(int32()), list_json, "[[], [1,2],  [3]]");
+  for (auto& type : kLargeListAndListViewTypes) {
+    ARROW_SCOPED_TRACE("type = ", *type);
+    CheckDropNull(type, list_json, "[[], [1,2],  [3]]");
+  }
 
   this->TestNoValidityBitmapButUnknownNullCount(
       fixed_size_list(int32(), 3), "[[1, null, 3], [4, 5, 6], [7, 8, null]]");
diff --git a/cpp/src/arrow/compute/kernels/vector_sort.cc b/cpp/src/arrow/compute/kernels/vector_sort.cc
index db2023ef04cad..ad22fa8d365c4 100644
--- a/cpp/src/arrow/compute/kernels/vector_sort.cc
+++ b/cpp/src/arrow/compute/kernels/vector_sort.cc
@@ -747,15 +747,13 @@ class TableSorter {
     auto& comparator = comparator_;
     const auto& first_sort_key = sort_keys_[0];
 
-    ChunkLocation left_loc{0, 0};
-    ChunkLocation right_loc{0, 0};
+    ChunkLocation left_loc;
+    ChunkLocation right_loc;
     std::merge(nulls_begin, nulls_middle, nulls_middle, nulls_end, temp_indices,
                [&](uint64_t left, uint64_t right) {
                  // First column is either null or nan
-                 left_loc =
-                     left_resolver_.ResolveWithChunkIndexHint(left, /*hint=*/left_loc);
-                 right_loc =
-                     right_resolver_.ResolveWithChunkIndexHint(right, /*hint=*/right_loc);
+                 left_loc = left_resolver_.ResolveWithHint(left, /*hint=*/left_loc);
+                 right_loc = right_resolver_.ResolveWithHint(right, /*hint=*/right_loc);
                  auto chunk_left = first_sort_key.GetChunk(left_loc);
                  auto chunk_right = first_sort_key.GetChunk(right_loc);
                  const auto left_is_null = chunk_left.IsNull();
@@ -786,15 +784,13 @@ class TableSorter {
     // Untyped implementation
     auto& comparator = comparator_;
 
-    ChunkLocation left_loc{0, 0};
-    ChunkLocation right_loc{0, 0};
+    ChunkLocation left_loc;
+    ChunkLocation right_loc;
     std::merge(nulls_begin, nulls_middle, nulls_middle, nulls_end, temp_indices,
                [&](uint64_t left, uint64_t right) {
                  // First column is always null
-                 left_loc =
-                     left_resolver_.ResolveWithChunkIndexHint(left, /*hint=*/left_loc);
-                 right_loc =
-                     right_resolver_.ResolveWithChunkIndexHint(right, /*hint=*/right_loc);
+                 left_loc = left_resolver_.ResolveWithHint(left, /*hint=*/left_loc);
+                 right_loc = right_resolver_.ResolveWithHint(right, /*hint=*/right_loc);
                  return comparator.Compare(left_loc, right_loc, 1);
                });
     // Copy back temp area into main buffer
@@ -812,15 +808,13 @@ class TableSorter {
     auto& comparator = comparator_;
     const auto& first_sort_key = sort_keys_[0];
 
-    ChunkLocation left_loc{0, 0};
-    ChunkLocation right_loc{0, 0};
+    ChunkLocation left_loc;
+    ChunkLocation right_loc;
     std::merge(range_begin, range_middle, range_middle, range_end, temp_indices,
                [&](uint64_t left, uint64_t right) {
                  // Both values are never null nor NaN.
-                 left_loc =
-                     left_resolver_.ResolveWithChunkIndexHint(left, /*hint=*/left_loc);
-                 right_loc =
-                     right_resolver_.ResolveWithChunkIndexHint(right, /*hint=*/right_loc);
+                 left_loc = left_resolver_.ResolveWithHint(left, /*hint=*/left_loc);
+                 right_loc = right_resolver_.ResolveWithHint(right, /*hint=*/right_loc);
                  auto chunk_left = first_sort_key.GetChunk(left_loc);
                  auto chunk_right = first_sort_key.GetChunk(right_loc);
                  DCHECK(!chunk_left.IsNull());
diff --git a/cpp/src/arrow/compute/key_hash.cc b/cpp/src/arrow/compute/key_hash_internal.cc
similarity index 99%
rename from cpp/src/arrow/compute/key_hash.cc
rename to cpp/src/arrow/compute/key_hash_internal.cc
index 1902b9ce9a88e..a0002efb3faf3 100644
--- a/cpp/src/arrow/compute/key_hash.cc
+++ b/cpp/src/arrow/compute/key_hash_internal.cc
@@ -15,14 +15,14 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/compute/key_hash.h"
+#include "arrow/compute/key_hash_internal.h"
 
 #include <memory.h>
 
 #include <algorithm>
 #include <cstdint>
 
-#include "arrow/compute/light_array.h"
+#include "arrow/compute/light_array_internal.h"
 #include "arrow/util/bit_util.h"
 #include "arrow/util/ubsan.h"
 
diff --git a/cpp/src/arrow/compute/key_hash.h b/cpp/src/arrow/compute/key_hash_internal.h
similarity index 90%
rename from cpp/src/arrow/compute/key_hash.h
rename to cpp/src/arrow/compute/key_hash_internal.h
index 1173df5ed103e..1f25beb0e1622 100644
--- a/cpp/src/arrow/compute/key_hash.h
+++ b/cpp/src/arrow/compute/key_hash_internal.h
@@ -23,7 +23,7 @@
 
 #include <cstdint>
 
-#include "arrow/compute/light_array.h"
+#include "arrow/compute/light_array_internal.h"
 #include "arrow/compute/util.h"
 
 namespace arrow {
@@ -48,6 +48,16 @@ class ARROW_EXPORT Hashing32 {
   static void HashMultiColumn(const std::vector<KeyColumnArray>& cols, LightContext* ctx,
                               uint32_t* out_hash);
 
+  // Clarify the max temp stack usage for HashBatch, which might be necessary for the
+  // caller to be aware of at compile time to reserve enough stack size in advance. The
+  // HashBatch implementation uses one uint32 temp vector as a buffer for hash, one uint16
+  // temp vector as a buffer for null indices and one uint32 temp vector as a buffer for
+  // null hash, all are of size kMiniBatchLength. Plus extra kMiniBatchLength to cope with
+  // stack padding and aligning.
+  static constexpr auto kHashBatchTempStackUsage =
+      (sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint32_t) + /*extra=*/1) *
+      util::MiniBatch::kMiniBatchLength;
+
   static Status HashBatch(const ExecBatch& key_batch, uint32_t* hashes,
                           std::vector<KeyColumnArray>& column_arrays,
                           int64_t hardware_flags, util::TempVectorStack* temp_stack,
@@ -161,6 +171,15 @@ class ARROW_EXPORT Hashing64 {
   static void HashMultiColumn(const std::vector<KeyColumnArray>& cols, LightContext* ctx,
                               uint64_t* hashes);
 
+  // Clarify the max temp stack usage for HashBatch, which might be necessary for the
+  // caller to be aware of at compile time to reserve enough stack size in advance. The
+  // HashBatch implementation uses one uint16 temp vector as a buffer for null indices and
+  // one uint64 temp vector as a buffer for null hash, all are of size kMiniBatchLength.
+  // Plus extra kMiniBatchLength to cope with stack padding and aligning.
+  static constexpr auto kHashBatchTempStackUsage =
+      (sizeof(uint16_t) + sizeof(uint64_t) + /*extra=*/1) *
+      util::MiniBatch::kMiniBatchLength;
+
   static Status HashBatch(const ExecBatch& key_batch, uint64_t* hashes,
                           std::vector<KeyColumnArray>& column_arrays,
                           int64_t hardware_flags, util::TempVectorStack* temp_stack,
diff --git a/cpp/src/arrow/compute/key_hash_avx2.cc b/cpp/src/arrow/compute/key_hash_internal_avx2.cc
similarity index 99%
rename from cpp/src/arrow/compute/key_hash_avx2.cc
rename to cpp/src/arrow/compute/key_hash_internal_avx2.cc
index aec2800c647d7..4def87bd7aa20 100644
--- a/cpp/src/arrow/compute/key_hash_avx2.cc
+++ b/cpp/src/arrow/compute/key_hash_internal_avx2.cc
@@ -17,7 +17,7 @@
 
 #include <immintrin.h>
 
-#include "arrow/compute/key_hash.h"
+#include "arrow/compute/key_hash_internal.h"
 #include "arrow/util/bit_util.h"
 
 namespace arrow {
diff --git a/cpp/src/arrow/compute/key_hash_test.cc b/cpp/src/arrow/compute/key_hash_test.cc
index c998df7169c4a..fdf6d2125850a 100644
--- a/cpp/src/arrow/compute/key_hash_test.cc
+++ b/cpp/src/arrow/compute/key_hash_test.cc
@@ -23,14 +23,18 @@
 #include <unordered_set>
 
 #include "arrow/array/builder_binary.h"
-#include "arrow/compute/key_hash.h"
+#include "arrow/compute/key_hash_internal.h"
 #include "arrow/testing/gtest_util.h"
+#include "arrow/testing/random.h"
 #include "arrow/testing/util.h"
 #include "arrow/util/cpu_info.h"
 #include "arrow/util/pcg_random.h"
 
 namespace arrow {
 
+using arrow::random::RandomArrayGenerator;
+using arrow::util::MiniBatch;
+using arrow::util::TempVectorStack;
 using internal::checked_pointer_cast;
 using internal::CpuInfo;
 
@@ -156,7 +160,7 @@ class TestVectorHash {
     std::vector<uint32_t> temp_buffer;
     temp_buffer.resize(mini_batch_size * 4);
 
-    for (int i = 0; i < static_cast<int>(hardware_flags_for_testing.size()); ++i) {
+    for (size_t i = 0; i < hardware_flags_for_testing.size(); ++i) {
       const auto hardware_flags = hardware_flags_for_testing[i];
       if (use_32bit_hash) {
         if (!use_varlen_input) {
@@ -192,7 +196,7 @@ class TestVectorHash {
     // Verify that all implementations (scalar, SIMD) give the same hashes
     //
     const auto& hashes_scalar64 = hashes64[0];
-    for (int i = 0; i < static_cast<int>(hardware_flags_for_testing.size()); ++i) {
+    for (size_t i = 0; i < hardware_flags_for_testing.size(); ++i) {
       for (int j = 0; j < num_rows; ++j) {
         ASSERT_EQ(hashes64[i][j], hashes_scalar64[j])
             << "scalar and simd approaches yielded different hashes";
@@ -280,7 +284,7 @@ void HashFixedLengthFrom(int key_length, int num_rows, int start_row) {
   std::vector<uint32_t> temp_buffer;
   temp_buffer.resize(mini_batch_size * 4);
 
-  for (int i = 0; i < static_cast<int>(hardware_flags_for_testing.size()); ++i) {
+  for (size_t i = 0; i < hardware_flags_for_testing.size(); ++i) {
     const auto hardware_flags = hardware_flags_for_testing[i];
     Hashing32::HashFixed(hardware_flags,
                          /*combine_hashes=*/false, num_rows_to_hash, key_length,
@@ -292,7 +296,7 @@ void HashFixedLengthFrom(int key_length, int num_rows, int start_row) {
   }
 
   // Verify that all implementations (scalar, SIMD) give the same hashes.
-  for (int i = 1; i < static_cast<int>(hardware_flags_for_testing.size()); ++i) {
+  for (size_t i = 1; i < hardware_flags_for_testing.size(); ++i) {
     for (int j = 0; j < num_rows_to_hash; ++j) {
       ASSERT_EQ(hashes32[i][j], hashes32[0][j])
           << "scalar and simd approaches yielded different 32-bit hashes";
@@ -311,5 +315,52 @@ TEST(VectorHash, FixedLengthTailByteSafety) {
   HashFixedLengthFrom(/*key_length=*/19, /*num_rows=*/64, /*start_row=*/63);
 }
 
+// Make sure that Hashing32/64::HashBatch uses no more stack space than declared in
+// Hashing32/64::kHashBatchTempStackUsage.
+TEST(VectorHash, HashBatchTempStackUsage) {
+  for (auto num_rows :
+       {0, 1, MiniBatch::kMiniBatchLength, MiniBatch::kMiniBatchLength * 64}) {
+    SCOPED_TRACE("num_rows = " + std::to_string(num_rows));
+
+    MemoryPool* pool = default_memory_pool();
+    RandomArrayGenerator gen(42);
+
+    auto column = gen.Int8(num_rows, 0, 127);
+    ExecBatch batch({column}, num_rows);
+
+    std::vector<KeyColumnArray> column_arrays;
+    ASSERT_OK(ColumnArraysFromExecBatch(batch, &column_arrays));
+
+    const auto hardware_flags_for_testing = HardwareFlagsForTesting();
+    ASSERT_GT(hardware_flags_for_testing.size(), 0);
+
+    {
+      std::vector<uint32_t> hashes(num_rows);
+      TempVectorStack stack;
+      ASSERT_OK(stack.Init(pool, Hashing32::kHashBatchTempStackUsage));
+      for (size_t i = 0; i < hardware_flags_for_testing.size(); ++i) {
+        SCOPED_TRACE("hashing32 for hardware flags = " +
+                     std::to_string(hardware_flags_for_testing[i]));
+        ASSERT_OK(Hashing32::HashBatch(batch, hashes.data(), column_arrays,
+                                       hardware_flags_for_testing[i], &stack,
+                                       /*start_rows=*/0, num_rows));
+      }
+    }
+
+    {
+      std::vector<uint64_t> hashes(num_rows);
+      TempVectorStack stack;
+      ASSERT_OK(stack.Init(pool, Hashing64::kHashBatchTempStackUsage));
+      for (size_t i = 0; i < hardware_flags_for_testing.size(); ++i) {
+        SCOPED_TRACE("hashing64 for hardware flags = " +
+                     std::to_string(hardware_flags_for_testing[i]));
+        ASSERT_OK(Hashing64::HashBatch(batch, hashes.data(), column_arrays,
+                                       hardware_flags_for_testing[i], &stack,
+                                       /*start_rows=*/0, num_rows));
+      }
+    }
+  }
+}
+
 }  // namespace compute
 }  // namespace arrow
diff --git a/cpp/src/arrow/compute/key_map.cc b/cpp/src/arrow/compute/key_map_internal.cc
similarity index 99%
rename from cpp/src/arrow/compute/key_map.cc
rename to cpp/src/arrow/compute/key_map_internal.cc
index a027ec811cf24..9e6d60ab5032b 100644
--- a/cpp/src/arrow/compute/key_map.cc
+++ b/cpp/src/arrow/compute/key_map_internal.cc
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/compute/key_map.h"
+#include "arrow/compute/key_map_internal.h"
 
 #include <algorithm>
 #include <cstdint>
diff --git a/cpp/src/arrow/compute/key_map.h b/cpp/src/arrow/compute/key_map_internal.h
similarity index 99%
rename from cpp/src/arrow/compute/key_map.h
rename to cpp/src/arrow/compute/key_map_internal.h
index 8e06dc83483aa..a5e784a9e4463 100644
--- a/cpp/src/arrow/compute/key_map.h
+++ b/cpp/src/arrow/compute/key_map_internal.h
@@ -21,6 +21,7 @@
 #include <functional>
 
 #include "arrow/compute/util.h"
+#include "arrow/compute/util_internal.h"
 #include "arrow/result.h"
 #include "arrow/status.h"
 #include "arrow/type_fwd.h"
diff --git a/cpp/src/arrow/compute/key_map_avx2.cc b/cpp/src/arrow/compute/key_map_internal_avx2.cc
similarity index 99%
rename from cpp/src/arrow/compute/key_map_avx2.cc
rename to cpp/src/arrow/compute/key_map_internal_avx2.cc
index 3526a6cb0f344..8c98166f49269 100644
--- a/cpp/src/arrow/compute/key_map_avx2.cc
+++ b/cpp/src/arrow/compute/key_map_internal_avx2.cc
@@ -17,7 +17,7 @@
 
 #include <immintrin.h>
 
-#include "arrow/compute/key_map.h"
+#include "arrow/compute/key_map_internal.h"
 #include "arrow/util/logging.h"
 
 namespace arrow {
diff --git a/cpp/src/arrow/compute/light_array.cc b/cpp/src/arrow/compute/light_array_internal.cc
similarity index 99%
rename from cpp/src/arrow/compute/light_array.cc
rename to cpp/src/arrow/compute/light_array_internal.cc
index b225e04b05cea..4f235925d0fb6 100644
--- a/cpp/src/arrow/compute/light_array.cc
+++ b/cpp/src/arrow/compute/light_array_internal.cc
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/compute/light_array.h"
+#include "arrow/compute/light_array_internal.h"
 
 #include <type_traits>
 
diff --git a/cpp/src/arrow/compute/light_array.h b/cpp/src/arrow/compute/light_array_internal.h
similarity index 99%
rename from cpp/src/arrow/compute/light_array.h
rename to cpp/src/arrow/compute/light_array_internal.h
index 67de71bf56c92..995c4211998e0 100644
--- a/cpp/src/arrow/compute/light_array.h
+++ b/cpp/src/arrow/compute/light_array_internal.h
@@ -22,6 +22,7 @@
 #include "arrow/array.h"
 #include "arrow/compute/exec.h"
 #include "arrow/compute/util.h"
+#include "arrow/compute/util_internal.h"
 #include "arrow/type.h"
 #include "arrow/util/cpu_info.h"
 #include "arrow/util/logging.h"
diff --git a/cpp/src/arrow/compute/light_array_test.cc b/cpp/src/arrow/compute/light_array_test.cc
index ecc5f3ad37931..cc02d489d138f 100644
--- a/cpp/src/arrow/compute/light_array_test.cc
+++ b/cpp/src/arrow/compute/light_array_test.cc
@@ -15,11 +15,12 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "arrow/compute/light_array.h"
+#include "arrow/compute/light_array_internal.h"
 
 #include <gtest/gtest.h>
 #include <numeric>
 
+#include "arrow/memory_pool.h"
 #include "arrow/testing/generator.h"
 #include "arrow/testing/gtest_util.h"
 #include "arrow/type.h"
diff --git a/cpp/src/arrow/compute/row/CMakeLists.txt b/cpp/src/arrow/compute/row/CMakeLists.txt
index 6ae982dbaf3a7..ef03c767f974e 100644
--- a/cpp/src/arrow/compute/row/CMakeLists.txt
+++ b/cpp/src/arrow/compute/row/CMakeLists.txt
@@ -19,3 +19,5 @@
 # in a row-major order.
 
 arrow_install_all_headers("arrow/compute/row")
+
+add_arrow_benchmark(grouper_benchmark PREFIX "arrow-compute")
diff --git a/cpp/src/arrow/compute/row/compare_internal.cc b/cpp/src/arrow/compute/row/compare_internal.cc
index 078a8287c71c0..98aea9011266c 100644
--- a/cpp/src/arrow/compute/row/compare_internal.cc
+++ b/cpp/src/arrow/compute/row/compare_internal.cc
@@ -36,22 +36,22 @@ void KeyCompare::NullUpdateColumnToRow(uint32_t id_col, uint32_t num_rows_to_com
                                        const uint32_t* left_to_right_map,
                                        LightContext* ctx, const KeyColumnArray& col,
                                        const RowTableImpl& rows,
-                                       uint8_t* match_bytevector,
-                                       bool are_cols_in_encoding_order) {
+                                       bool are_cols_in_encoding_order,
+                                       uint8_t* match_bytevector) {
   if (!rows.has_any_nulls(ctx) && !col.data(0)) {
     return;
   }
   uint32_t num_processed = 0;
 #if defined(ARROW_HAVE_RUNTIME_AVX2)
   if (ctx->has_avx2()) {
-    num_processed = NullUpdateColumnToRow_avx2(use_selection, id_col, num_rows_to_compare,
-                                               sel_left_maybe_null, left_to_right_map,
-                                               ctx, col, rows, match_bytevector);
+    num_processed = NullUpdateColumnToRow_avx2(
+        use_selection, id_col, num_rows_to_compare, sel_left_maybe_null,
+        left_to_right_map, ctx, col, rows, are_cols_in_encoding_order, match_bytevector);
   }
 #endif
 
-  uint32_t null_bit_id =
-      are_cols_in_encoding_order ? id_col : rows.metadata().pos_after_encoding(id_col);
+  const uint32_t null_bit_id =
+      ColIdInEncodingOrder(rows, id_col, are_cols_in_encoding_order);
 
   if (!col.data(0)) {
     // Remove rows from the result for which the column value is a null
@@ -363,10 +363,9 @@ void KeyCompare::CompareColumnsToRows(
       continue;
     }
 
-    uint32_t offset_within_row = rows.metadata().encoded_field_offset(
-        are_cols_in_encoding_order
-            ? static_cast<uint32_t>(icol)
-            : rows.metadata().pos_after_encoding(static_cast<uint32_t>(icol)));
+    uint32_t offset_within_row =
+        rows.metadata().encoded_field_offset(ColIdInEncodingOrder(
+            rows, static_cast<uint32_t>(icol), are_cols_in_encoding_order));
     if (col.metadata().is_fixed_length) {
       if (sel_left_maybe_null) {
         CompareBinaryColumnToRow<true>(
@@ -375,9 +374,8 @@ void KeyCompare::CompareColumnsToRows(
             is_first_column ? match_bytevector_A : match_bytevector_B);
         NullUpdateColumnToRow<true>(
             static_cast<uint32_t>(icol), num_rows_to_compare, sel_left_maybe_null,
-            left_to_right_map, ctx, col, rows,
-            is_first_column ? match_bytevector_A : match_bytevector_B,
-            are_cols_in_encoding_order);
+            left_to_right_map, ctx, col, rows, are_cols_in_encoding_order,
+            is_first_column ? match_bytevector_A : match_bytevector_B);
       } else {
         // Version without using selection vector
         CompareBinaryColumnToRow<false>(
@@ -386,9 +384,8 @@ void KeyCompare::CompareColumnsToRows(
             is_first_column ? match_bytevector_A : match_bytevector_B);
         NullUpdateColumnToRow<false>(
             static_cast<uint32_t>(icol), num_rows_to_compare, sel_left_maybe_null,
-            left_to_right_map, ctx, col, rows,
-            is_first_column ? match_bytevector_A : match_bytevector_B,
-            are_cols_in_encoding_order);
+            left_to_right_map, ctx, col, rows, are_cols_in_encoding_order,
+            is_first_column ? match_bytevector_A : match_bytevector_B);
       }
       if (!is_first_column) {
         AndByteVectors(ctx, num_rows_to_compare, match_bytevector_A, match_bytevector_B);
@@ -414,9 +411,8 @@ void KeyCompare::CompareColumnsToRows(
         }
         NullUpdateColumnToRow<true>(
             static_cast<uint32_t>(icol), num_rows_to_compare, sel_left_maybe_null,
-            left_to_right_map, ctx, col, rows,
-            is_first_column ? match_bytevector_A : match_bytevector_B,
-            are_cols_in_encoding_order);
+            left_to_right_map, ctx, col, rows, are_cols_in_encoding_order,
+            is_first_column ? match_bytevector_A : match_bytevector_B);
       } else {
         if (ivarbinary == 0) {
           CompareVarBinaryColumnToRow<false, true>(
@@ -429,9 +425,8 @@ void KeyCompare::CompareColumnsToRows(
         }
         NullUpdateColumnToRow<false>(
             static_cast<uint32_t>(icol), num_rows_to_compare, sel_left_maybe_null,
-            left_to_right_map, ctx, col, rows,
-            is_first_column ? match_bytevector_A : match_bytevector_B,
-            are_cols_in_encoding_order);
+            left_to_right_map, ctx, col, rows, are_cols_in_encoding_order,
+            is_first_column ? match_bytevector_A : match_bytevector_B);
       }
       if (!is_first_column) {
         AndByteVectors(ctx, num_rows_to_compare, match_bytevector_A, match_bytevector_B);
diff --git a/cpp/src/arrow/compute/row/compare_internal.h b/cpp/src/arrow/compute/row/compare_internal.h
index db953fbe11271..a5a109b0b516a 100644
--- a/cpp/src/arrow/compute/row/compare_internal.h
+++ b/cpp/src/arrow/compute/row/compare_internal.h
@@ -19,7 +19,7 @@
 
 #include <cstdint>
 
-#include "arrow/compute/light_array.h"
+#include "arrow/compute/light_array_internal.h"
 #include "arrow/compute/row/encode_internal.h"
 #include "arrow/compute/row/row_internal.h"
 #include "arrow/compute/util.h"
@@ -32,6 +32,16 @@ namespace compute {
 
 class ARROW_EXPORT KeyCompare {
  public:
+  // Clarify the max temp stack usage for CompareColumnsToRows, which might be necessary
+  // for the caller to be aware of (possibly at compile time) to reserve enough stack size
+  // in advance. The CompareColumnsToRows implementation uses three uint8 temp vectors as
+  // buffers for match vectors, all are of size num_rows. Plus extra kMiniBatchLength to
+  // cope with stack padding and aligning.
+  constexpr static int64_t CompareColumnsToRowsTempStackUsage(int64_t num_rows) {
+    return (sizeof(uint8_t) + sizeof(uint8_t) + sizeof(uint8_t)) * num_rows +
+           /*extra=*/util::MiniBatch::kMiniBatchLength;
+  }
+
   // Returns a single 16-bit selection vector of rows that failed comparison.
   // If there is input selection on the left, the resulting selection is a filtered image
   // of input selection.
@@ -43,13 +53,19 @@ class ARROW_EXPORT KeyCompare {
       uint8_t* out_match_bitvector_maybe_null = NULLPTR);
 
  private:
+  static uint32_t ColIdInEncodingOrder(const RowTableImpl& rows, uint32_t id_col,
+                                       bool are_cols_in_encoding_order) {
+    return are_cols_in_encoding_order ? id_col
+                                      : rows.metadata().pos_after_encoding(id_col);
+  }
+
   template <bool use_selection>
   static void NullUpdateColumnToRow(uint32_t id_col, uint32_t num_rows_to_compare,
                                     const uint16_t* sel_left_maybe_null,
                                     const uint32_t* left_to_right_map, LightContext* ctx,
                                     const KeyColumnArray& col, const RowTableImpl& rows,
-                                    uint8_t* match_bytevector,
-                                    bool are_cols_in_encoding_order);
+                                    bool are_cols_in_encoding_order,
+                                    uint8_t* match_bytevector);
 
   template <bool use_selection, class COMPARE_FN>
   static void CompareBinaryColumnToRowHelper(
@@ -92,7 +108,8 @@ class ARROW_EXPORT KeyCompare {
   static uint32_t NullUpdateColumnToRowImp_avx2(
       uint32_t id_col, uint32_t num_rows_to_compare, const uint16_t* sel_left_maybe_null,
       const uint32_t* left_to_right_map, LightContext* ctx, const KeyColumnArray& col,
-      const RowTableImpl& rows, uint8_t* match_bytevector);
+      const RowTableImpl& rows, bool are_cols_in_encoding_order,
+      uint8_t* match_bytevector);
 
   template <bool use_selection, class COMPARE8_FN>
   static uint32_t CompareBinaryColumnToRowHelper_avx2(
@@ -118,13 +135,11 @@ class ARROW_EXPORT KeyCompare {
   static uint32_t AndByteVectors_avx2(uint32_t num_elements, uint8_t* bytevector_A,
                                       const uint8_t* bytevector_B);
 
-  static uint32_t NullUpdateColumnToRow_avx2(bool use_selection, uint32_t id_col,
-                                             uint32_t num_rows_to_compare,
-                                             const uint16_t* sel_left_maybe_null,
-                                             const uint32_t* left_to_right_map,
-                                             LightContext* ctx, const KeyColumnArray& col,
-                                             const RowTableImpl& rows,
-                                             uint8_t* match_bytevector);
+  static uint32_t NullUpdateColumnToRow_avx2(
+      bool use_selection, uint32_t id_col, uint32_t num_rows_to_compare,
+      const uint16_t* sel_left_maybe_null, const uint32_t* left_to_right_map,
+      LightContext* ctx, const KeyColumnArray& col, const RowTableImpl& rows,
+      bool are_cols_in_encoding_order, uint8_t* match_bytevector);
 
   static uint32_t CompareBinaryColumnToRow_avx2(
       bool use_selection, uint32_t offset_within_row, uint32_t num_rows_to_compare,
diff --git a/cpp/src/arrow/compute/row/compare_internal_avx2.cc b/cpp/src/arrow/compute/row/compare_internal_avx2.cc
index ff407c51b83cb..ec511aa03a6d0 100644
--- a/cpp/src/arrow/compute/row/compare_internal_avx2.cc
+++ b/cpp/src/arrow/compute/row/compare_internal_avx2.cc
@@ -39,12 +39,14 @@ template <bool use_selection>
 uint32_t KeyCompare::NullUpdateColumnToRowImp_avx2(
     uint32_t id_col, uint32_t num_rows_to_compare, const uint16_t* sel_left_maybe_null,
     const uint32_t* left_to_right_map, LightContext* ctx, const KeyColumnArray& col,
-    const RowTableImpl& rows, uint8_t* match_bytevector) {
+    const RowTableImpl& rows, bool are_cols_in_encoding_order,
+    uint8_t* match_bytevector) {
   if (!rows.has_any_nulls(ctx) && !col.data(0)) {
     return num_rows_to_compare;
   }
 
-  uint32_t null_bit_id = rows.metadata().pos_after_encoding(id_col);
+  const uint32_t null_bit_id =
+      ColIdInEncodingOrder(rows, id_col, are_cols_in_encoding_order);
 
   if (!col.data(0)) {
     // Remove rows from the result for which the column value is a null
@@ -234,6 +236,8 @@ uint32_t KeyCompare::CompareBinaryColumnToRowHelper_avx2(
         irow_right =
             _mm256_loadu_si256(reinterpret_cast<const __m256i*>(left_to_right_map) + i);
       }
+      // TODO: Need to test if this gather is OK when irow_right is larger than
+      // 0x80000000u.
       __m256i offset_right =
           _mm256_i32gather_epi32((const int*)offsets_right, irow_right, 4);
       offset_right = _mm256_add_epi32(offset_right, _mm256_set1_epi32(offset_within_row));
@@ -249,6 +253,40 @@ uint32_t KeyCompare::CompareBinaryColumnToRowHelper_avx2(
   }
 }
 
+namespace {
+
+// Intrinsics `_mm256_i32gather_epi32/64` treat the `vindex` as signed integer, and we
+// are using `uint32_t` to represent the offset, in range of [0, 4G), within the row
+// table. When the offset is larger than `0x80000000` (2GB), those intrinsics will treat
+// it as negative offset and gather the data from undesired address. To avoid this issue,
+// we normalize the addresses by translating `base` `0x80000000` higher, and `offset`
+// `0x80000000` lower. This way, the offset is always in range of [-2G, 2G) and those
+// intrinsics are safe.
+
+constexpr uint64_t kTwoGB = 0x80000000ull;
+
+template <uint32_t kScale>
+inline __m256i UnsignedOffsetSafeGather32(int const* base, __m256i offset) {
+  int const* normalized_base = base + kTwoGB / sizeof(int);
+  __m256i normalized_offset =
+      _mm256_sub_epi32(offset, _mm256_set1_epi32(static_cast<int>(kTwoGB / kScale)));
+  return _mm256_i32gather_epi32(normalized_base, normalized_offset,
+                                static_cast<int>(kScale));
+}
+
+template <uint32_t kScale>
+inline __m256i UnsignedOffsetSafeGather64(arrow::util::int64_for_gather_t const* base,
+                                          __m128i offset) {
+  arrow::util::int64_for_gather_t const* normalized_base =
+      base + kTwoGB / sizeof(arrow::util::int64_for_gather_t);
+  __m128i normalized_offset =
+      _mm_sub_epi32(offset, _mm_set1_epi32(static_cast<int>(kTwoGB / kScale)));
+  return _mm256_i32gather_epi64(normalized_base, normalized_offset,
+                                static_cast<int>(kScale));
+}
+
+}  // namespace
+
 template <int column_width>
 inline uint64_t CompareSelected8_avx2(const uint8_t* left_base, const uint8_t* right_base,
                                       __m256i irow_left, __m256i offset_right,
@@ -279,7 +317,7 @@ inline uint64_t CompareSelected8_avx2(const uint8_t* left_base, const uint8_t* r
       ARROW_DCHECK(false);
   }
 
-  __m256i right = _mm256_i32gather_epi32((const int*)right_base, offset_right, 1);
+  __m256i right = UnsignedOffsetSafeGather32<1>((int const*)right_base, offset_right);
   if (column_width != sizeof(uint32_t)) {
     constexpr uint32_t mask = column_width == 0 || column_width == 1 ? 0xff : 0xffff;
     right = _mm256_and_si256(right, _mm256_set1_epi32(mask));
@@ -328,7 +366,7 @@ inline uint64_t Compare8_avx2(const uint8_t* left_base, const uint8_t* right_bas
       ARROW_DCHECK(false);
   }
 
-  __m256i right = _mm256_i32gather_epi32((const int*)right_base, offset_right, 1);
+  __m256i right = UnsignedOffsetSafeGather32<1>((int const*)right_base, offset_right);
   if (column_width != sizeof(uint32_t)) {
     constexpr uint32_t mask = column_width == 0 || column_width == 1 ? 0xff : 0xffff;
     right = _mm256_and_si256(right, _mm256_set1_epi32(mask));
@@ -365,9 +403,9 @@ inline uint64_t Compare8_64bit_avx2(const uint8_t* left_base, const uint8_t* rig
   auto right_base_i64 =
       reinterpret_cast<const arrow::util::int64_for_gather_t*>(right_base);
   __m256i right_lo =
-      _mm256_i32gather_epi64(right_base_i64, _mm256_castsi256_si128(offset_right), 1);
-  __m256i right_hi = _mm256_i32gather_epi64(right_base_i64,
-                                            _mm256_extracti128_si256(offset_right, 1), 1);
+      UnsignedOffsetSafeGather64<1>(right_base_i64, _mm256_castsi256_si128(offset_right));
+  __m256i right_hi = UnsignedOffsetSafeGather64<1>(
+      right_base_i64, _mm256_extracti128_si256(offset_right, 1));
   uint32_t result_lo = _mm256_movemask_epi8(_mm256_cmpeq_epi64(left_lo, right_lo));
   uint32_t result_hi = _mm256_movemask_epi8(_mm256_cmpeq_epi64(left_hi, right_hi));
   return result_lo | (static_cast<uint64_t>(result_hi) << 32);
@@ -569,7 +607,7 @@ uint32_t KeyCompare::NullUpdateColumnToRow_avx2(
     bool use_selection, uint32_t id_col, uint32_t num_rows_to_compare,
     const uint16_t* sel_left_maybe_null, const uint32_t* left_to_right_map,
     LightContext* ctx, const KeyColumnArray& col, const RowTableImpl& rows,
-    uint8_t* match_bytevector) {
+    bool are_cols_in_encoding_order, uint8_t* match_bytevector) {
   int64_t num_rows_safe =
       TailSkipForSIMD::FixBitAccess(sizeof(uint32_t), col.length(), col.bit_offset(0));
   if (sel_left_maybe_null) {
@@ -580,13 +618,13 @@ uint32_t KeyCompare::NullUpdateColumnToRow_avx2(
   }
 
   if (use_selection) {
-    return NullUpdateColumnToRowImp_avx2<true>(id_col, num_rows_to_compare,
-                                               sel_left_maybe_null, left_to_right_map,
-                                               ctx, col, rows, match_bytevector);
+    return NullUpdateColumnToRowImp_avx2<true>(
+        id_col, num_rows_to_compare, sel_left_maybe_null, left_to_right_map, ctx, col,
+        rows, are_cols_in_encoding_order, match_bytevector);
   } else {
-    return NullUpdateColumnToRowImp_avx2<false>(id_col, num_rows_to_compare,
-                                                sel_left_maybe_null, left_to_right_map,
-                                                ctx, col, rows, match_bytevector);
+    return NullUpdateColumnToRowImp_avx2<false>(
+        id_col, num_rows_to_compare, sel_left_maybe_null, left_to_right_map, ctx, col,
+        rows, are_cols_in_encoding_order, match_bytevector);
   }
 }
 
diff --git a/cpp/src/arrow/compute/row/compare_test.cc b/cpp/src/arrow/compute/row/compare_test.cc
index 1d8562cd56d3c..662862075c245 100644
--- a/cpp/src/arrow/compute/row/compare_test.cc
+++ b/cpp/src/arrow/compute/row/compare_test.cc
@@ -18,24 +18,29 @@
 #include <numeric>
 
 #include "arrow/compute/row/compare_internal.h"
+#include "arrow/testing/generator.h"
 #include "arrow/testing/gtest_util.h"
+#include "arrow/testing/random.h"
+#include "arrow/util/bitmap_ops.h"
 
 namespace arrow {
 namespace compute {
 
 using arrow::bit_util::BytesForBits;
 using arrow::internal::CpuInfo;
+using arrow::random::RandomArrayGenerator;
 using arrow::util::MiniBatch;
 using arrow::util::TempVectorStack;
 
 // Specialized case for GH-39577.
 TEST(KeyCompare, CompareColumnsToRowsCuriousFSB) {
   int fsb_length = 9;
+  int num_rows = 7;
+
   MemoryPool* pool = default_memory_pool();
   TempVectorStack stack;
-  ASSERT_OK(stack.Init(pool, 8 * MiniBatch::kMiniBatchLength * sizeof(uint64_t)));
+  ASSERT_OK(stack.Init(pool, KeyCompare::CompareColumnsToRowsTempStackUsage(num_rows)));
 
-  int num_rows = 7;
   auto column_right = ArrayFromJSON(fixed_size_binary(fsb_length), R"([
       "000000000",
       "111111111",
@@ -106,5 +111,196 @@ TEST(KeyCompare, CompareColumnsToRowsCuriousFSB) {
   }
 }
 
+// Make sure that KeyCompare::CompareColumnsToRows uses no more stack space than declared
+// in KeyCompare::CompareColumnsToRowsTempStackUsage().
+TEST(KeyCompare, CompareColumnsToRowsTempStackUsage) {
+  for (auto num_rows :
+       {0, 1, MiniBatch::kMiniBatchLength, MiniBatch::kMiniBatchLength * 64}) {
+    SCOPED_TRACE("num_rows = " + std::to_string(num_rows));
+
+    MemoryPool* pool = default_memory_pool();
+    TempVectorStack stack;
+    ASSERT_OK(stack.Init(pool, KeyCompare::CompareColumnsToRowsTempStackUsage(num_rows)));
+
+    RandomArrayGenerator gen(42);
+
+    auto column_right = gen.Int8(num_rows, 0, 127);
+    ExecBatch batch_right({column_right}, num_rows);
+
+    std::vector<KeyColumnMetadata> column_metadatas_right;
+    ASSERT_OK(ColumnMetadatasFromExecBatch(batch_right, &column_metadatas_right));
+
+    RowTableMetadata table_metadata_right;
+    table_metadata_right.FromColumnMetadataVector(column_metadatas_right,
+                                                  sizeof(uint64_t), sizeof(uint64_t));
+
+    std::vector<KeyColumnArray> column_arrays_right;
+    ASSERT_OK(ColumnArraysFromExecBatch(batch_right, &column_arrays_right));
+
+    RowTableImpl row_table;
+    ASSERT_OK(row_table.Init(pool, table_metadata_right));
+
+    RowTableEncoder row_encoder;
+    row_encoder.Init(column_metadatas_right, sizeof(uint64_t), sizeof(uint64_t));
+    row_encoder.PrepareEncodeSelected(0, num_rows, column_arrays_right);
+
+    std::vector<uint16_t> row_ids_right(num_rows);
+    std::iota(row_ids_right.begin(), row_ids_right.end(), 0);
+    ASSERT_OK(row_encoder.EncodeSelected(&row_table, num_rows, row_ids_right.data()));
+
+    auto column_left = gen.Int8(num_rows, 0, 127);
+    ExecBatch batch_left({column_left}, num_rows);
+    std::vector<KeyColumnArray> column_arrays_left;
+    ASSERT_OK(ColumnArraysFromExecBatch(batch_left, &column_arrays_left));
+
+    std::vector<uint32_t> row_ids_left(num_rows);
+    std::iota(row_ids_left.begin(), row_ids_left.end(), 0);
+
+    LightContext ctx{CpuInfo::GetInstance()->hardware_flags(), &stack};
+
+    uint32_t num_rows_no_match;
+    std::vector<uint16_t> row_ids_out(num_rows);
+    KeyCompare::CompareColumnsToRows(num_rows, NULLPTR, row_ids_left.data(), &ctx,
+                                     &num_rows_no_match, row_ids_out.data(),
+                                     column_arrays_left, row_table, true, NULLPTR);
+  }
+}
+
+#ifndef ARROW_VALGRIND
+// Compare columns to rows at offsets over 2GB within a row table.
+// Certain AVX2 instructions may behave unexpectedly causing troubles like GH-41813.
+TEST(KeyCompare, CompareColumnsToRowsLarge) {
+  if constexpr (sizeof(void*) == 4) {
+    GTEST_SKIP() << "Test only works on 64-bit platforms";
+  }
+
+  // The idea of this case is to create a row table using several fixed length columns and
+  // one var length column (so the row is hence var length and has offset buffer), with
+  // the overall data size exceeding 2GB. Then compare each row with itself.
+  constexpr int64_t two_gb = 2ll * 1024ll * 1024ll * 1024ll;
+  // The compare function requires the row id of the left column to be uint16_t, hence the
+  // number of rows.
+  constexpr int64_t num_rows = std::numeric_limits<uint16_t>::max() + 1;
+  const std::vector<std::shared_ptr<DataType>> fixed_length_types{uint64(), uint32()};
+  // The var length column should be a little smaller than 2GB to workaround the capacity
+  // limitation in the var length builder.
+  constexpr int32_t var_length = two_gb / num_rows - 1;
+  auto row_size = std::accumulate(fixed_length_types.begin(), fixed_length_types.end(),
+                                  static_cast<int64_t>(var_length),
+                                  [](int64_t acc, const std::shared_ptr<DataType>& type) {
+                                    return acc + type->byte_width();
+                                  });
+  // The overall size should be larger than 2GB.
+  ASSERT_GT(row_size * num_rows, two_gb);
+
+  MemoryPool* pool = default_memory_pool();
+
+  // The left side columns.
+  std::vector<KeyColumnArray> columns_left;
+  ExecBatch batch_left;
+  {
+    std::vector<Datum> values;
+
+    // Several fixed length arrays containing random content.
+    for (const auto& type : fixed_length_types) {
+      ASSERT_OK_AND_ASSIGN(auto value, ::arrow::gen::Random(type)->Generate(num_rows));
+      values.push_back(std::move(value));
+    }
+    // A var length array containing 'X' repeated var_length times.
+    ASSERT_OK_AND_ASSIGN(auto value_var_length,
+                         ::arrow::gen::Constant(
+                             std::make_shared<BinaryScalar>(std::string(var_length, 'X')))
+                             ->Generate(num_rows));
+    values.push_back(std::move(value_var_length));
+
+    batch_left = ExecBatch(std::move(values), num_rows);
+    ASSERT_OK(ColumnArraysFromExecBatch(batch_left, &columns_left));
+  }
+
+  // The right side row table.
+  RowTableImpl row_table_right;
+  {
+    // Encode the row table with the left columns.
+    std::vector<KeyColumnMetadata> column_metadatas;
+    ASSERT_OK(ColumnMetadatasFromExecBatch(batch_left, &column_metadatas));
+    RowTableMetadata table_metadata;
+    table_metadata.FromColumnMetadataVector(column_metadatas, sizeof(uint64_t),
+                                            sizeof(uint64_t));
+    ASSERT_OK(row_table_right.Init(pool, table_metadata));
+    std::vector<uint16_t> row_ids(num_rows);
+    std::iota(row_ids.begin(), row_ids.end(), 0);
+    RowTableEncoder row_encoder;
+    row_encoder.Init(column_metadatas, sizeof(uint64_t), sizeof(uint64_t));
+    row_encoder.PrepareEncodeSelected(0, num_rows, columns_left);
+    ASSERT_OK(row_encoder.EncodeSelected(
+        &row_table_right, static_cast<uint32_t>(num_rows), row_ids.data()));
+
+    // The row table must contain an offset buffer.
+    ASSERT_NE(row_table_right.offsets(), NULLPTR);
+    // The whole point of this test.
+    ASSERT_GT(row_table_right.offsets()[num_rows - 1], two_gb);
+  }
+
+  // The rows to compare.
+  std::vector<uint32_t> row_ids_to_compare(num_rows);
+  std::iota(row_ids_to_compare.begin(), row_ids_to_compare.end(), 0);
+
+  TempVectorStack stack;
+  ASSERT_OK(stack.Init(pool, KeyCompare::CompareColumnsToRowsTempStackUsage(num_rows)));
+  LightContext ctx{CpuInfo::GetInstance()->hardware_flags(), &stack};
+
+  {
+    // No selection, output no match row ids.
+    uint32_t num_rows_no_match;
+    std::vector<uint16_t> row_ids_out(num_rows);
+    KeyCompare::CompareColumnsToRows(num_rows, /*sel_left_maybe_null=*/NULLPTR,
+                                     row_ids_to_compare.data(), &ctx, &num_rows_no_match,
+                                     row_ids_out.data(), columns_left, row_table_right,
+                                     /*are_cols_in_encoding_order=*/true,
+                                     /*out_match_bitvector_maybe_null=*/NULLPTR);
+    ASSERT_EQ(num_rows_no_match, 0);
+  }
+
+  {
+    // No selection, output match bit vector.
+    std::vector<uint8_t> match_bitvector(BytesForBits(num_rows));
+    KeyCompare::CompareColumnsToRows(
+        num_rows, /*sel_left_maybe_null=*/NULLPTR, row_ids_to_compare.data(), &ctx,
+        /*out_num_rows=*/NULLPTR, /*out_sel_left_maybe_same=*/NULLPTR, columns_left,
+        row_table_right,
+        /*are_cols_in_encoding_order=*/true, match_bitvector.data());
+    ASSERT_EQ(arrow::internal::CountSetBits(match_bitvector.data(), 0, num_rows),
+              num_rows);
+  }
+
+  std::vector<uint16_t> selection_left(num_rows);
+  std::iota(selection_left.begin(), selection_left.end(), 0);
+
+  {
+    // With selection, output no match row ids.
+    uint32_t num_rows_no_match;
+    std::vector<uint16_t> row_ids_out(num_rows);
+    KeyCompare::CompareColumnsToRows(num_rows, selection_left.data(),
+                                     row_ids_to_compare.data(), &ctx, &num_rows_no_match,
+                                     row_ids_out.data(), columns_left, row_table_right,
+                                     /*are_cols_in_encoding_order=*/true,
+                                     /*out_match_bitvector_maybe_null=*/NULLPTR);
+    ASSERT_EQ(num_rows_no_match, 0);
+  }
+
+  {
+    // With selection, output match bit vector.
+    std::vector<uint8_t> match_bitvector(BytesForBits(num_rows));
+    KeyCompare::CompareColumnsToRows(
+        num_rows, selection_left.data(), row_ids_to_compare.data(), &ctx,
+        /*out_num_rows=*/NULLPTR, /*out_sel_left_maybe_same=*/NULLPTR, columns_left,
+        row_table_right,
+        /*are_cols_in_encoding_order=*/true, match_bitvector.data());
+    ASSERT_EQ(arrow::internal::CountSetBits(match_bitvector.data(), 0, num_rows),
+              num_rows);
+  }
+}
+#endif  // ARROW_VALGRIND
+
 }  // namespace compute
 }  // namespace arrow
diff --git a/cpp/src/arrow/compute/row/encode_internal.h b/cpp/src/arrow/compute/row/encode_internal.h
index 6091fb66982af..2afc150530b9e 100644
--- a/cpp/src/arrow/compute/row/encode_internal.h
+++ b/cpp/src/arrow/compute/row/encode_internal.h
@@ -22,8 +22,8 @@
 #include <vector>
 
 #include "arrow/array/data.h"
-#include "arrow/compute/key_map.h"
-#include "arrow/compute/light_array.h"
+#include "arrow/compute/key_map_internal.h"
+#include "arrow/compute/light_array_internal.h"
 #include "arrow/compute/row/row_internal.h"
 #include "arrow/compute/util.h"
 #include "arrow/memory_pool.h"
diff --git a/cpp/src/arrow/compute/row/grouper.cc b/cpp/src/arrow/compute/row/grouper.cc
index 5e23eda16fda2..45b9ad5971e80 100644
--- a/cpp/src/arrow/compute/row/grouper.cc
+++ b/cpp/src/arrow/compute/row/grouper.cc
@@ -26,8 +26,8 @@
 #include "arrow/compute/api_vector.h"
 #include "arrow/compute/function.h"
 #include "arrow/compute/kernels/row_encoder_internal.h"
-#include "arrow/compute/key_hash.h"
-#include "arrow/compute/light_array.h"
+#include "arrow/compute/key_hash_internal.h"
+#include "arrow/compute/light_array_internal.h"
 #include "arrow/compute/registry.h"
 #include "arrow/compute/row/compare_internal.h"
 #include "arrow/compute/row/grouper_internal.h"
@@ -217,18 +217,18 @@ struct SimpleKeySegmenter : public BaseRowSegmenter {
 struct AnyKeysSegmenter : public BaseRowSegmenter {
   static Result<std::unique_ptr<RowSegmenter>> Make(
       const std::vector<TypeHolder>& key_types, ExecContext* ctx) {
-    ARROW_RETURN_NOT_OK(Grouper::Make(key_types, ctx));  // check types
-    return std::make_unique<AnyKeysSegmenter>(key_types, ctx);
+    ARROW_ASSIGN_OR_RAISE(auto grouper, Grouper::Make(key_types, ctx));  // check types
+    return std::make_unique<AnyKeysSegmenter>(key_types, ctx, std::move(grouper));
   }
 
-  AnyKeysSegmenter(const std::vector<TypeHolder>& key_types, ExecContext* ctx)
+  AnyKeysSegmenter(const std::vector<TypeHolder>& key_types, ExecContext* ctx,
+                   std::unique_ptr<Grouper> grouper)
       : BaseRowSegmenter(key_types),
-        ctx_(ctx),
-        grouper_(nullptr),
+        grouper_(std::move(grouper)),
         save_group_id_(kNoGroupId) {}
 
   Status Reset() override {
-    grouper_ = nullptr;
+    ARROW_RETURN_NOT_OK(grouper_->Reset());
     save_group_id_ = kNoGroupId;
     return Status::OK();
   }
@@ -245,7 +245,6 @@ struct AnyKeysSegmenter : public BaseRowSegmenter {
   // first row of a new segment to see if it extends the previous segment.
   template <typename Batch>
   Result<group_id_t> MapGroupIdAt(const Batch& batch, int64_t offset) {
-    if (!grouper_) return kNoGroupId;
     ARROW_ASSIGN_OR_RAISE(auto datum, grouper_->Consume(batch, offset,
                                                         /*length=*/1));
     if (!datum.is_array()) {
@@ -264,9 +263,6 @@ struct AnyKeysSegmenter : public BaseRowSegmenter {
     if (offset == batch.length) {
       return MakeSegment(batch.length, offset, 0, kEmptyExtends);
     }
-    // ARROW-18311: make Grouper support Reset()
-    // so it can be reset instead of recreated below
-    //
     // the group id must be computed prior to resetting the grouper, since it is compared
     // to save_group_id_, and after resetting the grouper produces incomparable group ids
     ARROW_ASSIGN_OR_RAISE(auto group_id, MapGroupIdAt(batch, offset));
@@ -276,7 +272,7 @@ struct AnyKeysSegmenter : public BaseRowSegmenter {
       return extends;
     };
     // resetting drops grouper's group-ids, freeing-up memory for the next segment
-    ARROW_ASSIGN_OR_RAISE(grouper_, Grouper::Make(key_types_, ctx_));  // TODO: reset it
+    ARROW_RETURN_NOT_OK(grouper_->Reset());
     // GH-34475: cache the grouper-consume result across invocations of GetNextSegment
     ARROW_ASSIGN_OR_RAISE(auto datum, grouper_->Consume(batch, offset));
     if (datum.is_array()) {
@@ -299,7 +295,6 @@ struct AnyKeysSegmenter : public BaseRowSegmenter {
   }
 
  private:
-  ExecContext* const ctx_;
   std::unique_ptr<Grouper> grouper_;
   group_id_t save_group_id_;
 };
@@ -352,8 +347,9 @@ struct GrouperNoKeysImpl : Grouper {
     }
     std::shared_ptr<Array> array;
     RETURN_NOT_OK(builder->Finish(&array));
-    return std::move(array);
+    return array;
   }
+  Status Reset() override { return Status::OK(); }
   Result<Datum> Consume(const ExecSpan& batch, int64_t offset, int64_t length) override {
     ARROW_ASSIGN_OR_RAISE(auto array, MakeConstantGroupIdArray(length, 0));
     return Datum(array);
@@ -363,7 +359,7 @@ struct GrouperNoKeysImpl : Grouper {
     auto values = data->GetMutableValues<uint32_t>(0);
     values[0] = 0;
     ExecBatch out({Datum(data)}, 1);
-    return std::move(out);
+    return out;
   }
   uint32_t num_groups() const override { return 1; }
 };
@@ -416,7 +412,15 @@ struct GrouperImpl : public Grouper {
       return Status::NotImplemented("Keys of type ", *key);
     }
 
-    return std::move(impl);
+    return impl;
+  }
+
+  Status Reset() override {
+    map_.clear();
+    offsets_.clear();
+    key_bytes_.clear();
+    num_groups_ = 0;
+    return Status::OK();
   }
 
   Result<Datum> Consume(const ExecSpan& batch, int64_t offset, int64_t length) override {
@@ -592,10 +596,21 @@ struct GrouperFastImpl : public Grouper {
     impl->minibatch_hashes_.resize(impl->minibatch_size_max_ +
                                    kPaddingForSIMD / sizeof(uint32_t));
 
-    return std::move(impl);
+    return impl;
   }
 
-  ~GrouperFastImpl() { map_.cleanup(); }
+  Status Reset() override {
+    ARROW_DCHECK_EQ(temp_stack_.AllocatedSize(), 0);
+    rows_.Clean();
+    rows_minibatch_.Clean();
+    map_.cleanup();
+    RETURN_NOT_OK(map_.init(encode_ctx_.hardware_flags, ctx_->memory_pool()));
+    // TODO: It is now assumed that the dictionaries_ are identical to the first batch
+    // throughout the grouper's lifespan so no resetting is needed. But if we want to
+    // support different dictionaries for different batches, we need to reset the
+    // dictionaries_ here.
+    return Status::OK();
+  }
 
   Result<Datum> Consume(const ExecSpan& batch, int64_t offset, int64_t length) override {
     ARROW_RETURN_NOT_OK(CheckAndCapLengthForConsume(batch.length, offset, &length));
@@ -838,8 +853,7 @@ struct GrouperFastImpl : public Grouper {
     return out;
   }
 
-  static constexpr int log_minibatch_max_ = 10;
-  static constexpr int minibatch_size_max_ = 1 << log_minibatch_max_;
+  static constexpr int minibatch_size_max_ = arrow::util::MiniBatch::kMiniBatchLength;
   static constexpr int minibatch_size_min_ = 128;
   int minibatch_size_;
 
diff --git a/cpp/src/arrow/compute/row/grouper.h b/cpp/src/arrow/compute/row/grouper.h
index 628a9c14f3e44..a883fb938ddaf 100644
--- a/cpp/src/arrow/compute/row/grouper.h
+++ b/cpp/src/arrow/compute/row/grouper.h
@@ -109,6 +109,10 @@ class ARROW_EXPORT Grouper {
   static Result<std::unique_ptr<Grouper>> Make(const std::vector<TypeHolder>& key_types,
                                                ExecContext* ctx = default_exec_context());
 
+  /// Reset all intermediate state, make the grouper logically as just `Make`ed.
+  /// The underlying buffers, if any, may or may not be released though.
+  virtual Status Reset() = 0;
+
   /// Consume a batch of keys, producing the corresponding group ids as an integer array,
   /// over a slice defined by an offset and length, which defaults to the batch length.
   /// Currently only uint32 indices will be produced, eventually the bit width will only
diff --git a/cpp/src/arrow/compute/row/grouper_benchmark.cc b/cpp/src/arrow/compute/row/grouper_benchmark.cc
new file mode 100644
index 0000000000000..1e1a16d579009
--- /dev/null
+++ b/cpp/src/arrow/compute/row/grouper_benchmark.cc
@@ -0,0 +1,156 @@
+// 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.
+
+#include <benchmark/benchmark.h>
+
+#include "arrow/util/key_value_metadata.h"
+#include "arrow/util/string.h"
+
+#include "arrow/compute/row/grouper.h"
+#include "arrow/testing/gtest_util.h"
+#include "arrow/testing/random.h"
+#include "arrow/util/benchmark_util.h"
+
+namespace arrow {
+namespace compute {
+
+constexpr auto kSeed = 0x0ff1ce;
+constexpr int64_t kRound = 16;
+constexpr double true_and_unique_probability = 0.2;
+
+static ExecBatch MakeRandomExecBatch(const DataTypeVector& types, int64_t num_rows,
+                                     double null_probability,
+                                     int64_t alignment = kDefaultBufferAlignment,
+                                     MemoryPool* memory_pool = nullptr) {
+  random::RandomArrayGenerator rng(kSeed);
+  auto num_types = static_cast<int>(types.size());
+
+  // clang-format off
+  // For unique probability:
+  // The proportion of Unique determines the number of groups.
+  // 1. In most scenarios, unique has a small proportion and exists
+  // 2. In GroupBy/HashJoin are sometimes used for deduplication and
+  // in that use case the key is mostly unique
+  auto metadata = key_value_metadata(
+      {
+        "null_probability",
+        "true_probability",  // for boolean type
+        "unique"             // for string type
+      },
+      {
+          internal::ToChars(null_probability),
+          internal::ToChars(true_and_unique_probability),
+          internal::ToChars(static_cast<int32_t>(num_rows *
+                            true_and_unique_probability))
+      });
+  // clang-format on
+
+  std::vector<Datum> values;
+  values.resize(num_types);
+  for (int i = 0; i < num_types; ++i) {
+    auto field = ::arrow::field("", types[i], metadata);
+    values[i] = rng.ArrayOf(*field, num_rows, alignment, memory_pool);
+  }
+
+  return ExecBatch(std::move(values), num_rows);
+}
+
+static void GrouperBenchmark(benchmark::State& state, const ExecSpan& span,
+                             ExecContext* ctx = nullptr) {
+  uint32_t num_groups = 0;
+  for (auto _ : state) {
+    ASSIGN_OR_ABORT(auto grouper, Grouper::Make(span.GetTypes(), ctx));
+    for (int i = 0; i < kRound; ++i) {
+      ASSIGN_OR_ABORT(auto group_ids, grouper->Consume(span));
+    }
+    num_groups = grouper->num_groups();
+  }
+
+  state.SetItemsProcessed(state.iterations() * kRound * span.length);
+  state.counters["num_groups"] = num_groups;
+  state.counters["uniqueness"] = static_cast<double>(num_groups) / (kRound * span.length);
+}
+
+static void GrouperWithMultiTypes(benchmark::State& state, const DataTypeVector& types) {
+  auto ctx = default_exec_context();
+
+  RegressionArgs args(state, false);
+  const int64_t num_rows = args.size;
+  const double null_proportion = args.null_proportion;
+
+  auto exec_batch = MakeRandomExecBatch(types, num_rows, null_proportion,
+                                        kDefaultBufferAlignment, ctx->memory_pool());
+  ExecSpan exec_span(exec_batch);
+  ASSIGN_OR_ABORT(auto grouper, Grouper::Make(exec_span.GetTypes(), ctx));
+  GrouperBenchmark(state, exec_span, ctx);
+}
+
+void SetArgs(benchmark::internal::Benchmark* bench) {
+  BenchmarkSetArgsWithSizes(bench, {1 << 10, 1 << 12});
+}
+
+// This benchmark is mainly to ensure that the construction of our underlying
+// RowTable and the performance of the comparison operations in the lower-level
+// compare_internal can be tracked (we have not systematically tested these
+// underlying operations before).
+//
+// It mainly covers:
+// 1. Basics types, including the impact of null ratio on performance (comparison
+//    operations will compare null values separately.)
+//
+// 2. Combination types which will break the CPU-pipeline in column comparision.
+//    Examples: https://github.com/apache/arrow/pull/41036#issuecomment-2048721547
+//
+// 3. Combination types requiring column resorted. These combinations are
+//    essentially to test the impact of RowTableEncoder's sorting function on
+//    input columns on the performance of CompareColumnsToRows
+//    Examples: https://github.com/apache/arrow/pull/40998#issuecomment-2039204161
+
+// basic types
+BENCHMARK_CAPTURE(GrouperWithMultiTypes, "{boolean}", {boolean()})->Apply(SetArgs);
+BENCHMARK_CAPTURE(GrouperWithMultiTypes, "{int32}", {int32()})->Apply(SetArgs);
+BENCHMARK_CAPTURE(GrouperWithMultiTypes, "{int64}", {int64()})->Apply(SetArgs);
+BENCHMARK_CAPTURE(GrouperWithMultiTypes, "{utf8}", {utf8()})->Apply(SetArgs);
+BENCHMARK_CAPTURE(GrouperWithMultiTypes, "{fixed_size_binary(32)}",
+                  {fixed_size_binary(32)})
+    ->Apply(SetArgs);
+
+// combination types
+BENCHMARK_CAPTURE(GrouperWithMultiTypes, "{boolean, utf8}", {boolean(), utf8()})
+    ->Apply(SetArgs);
+BENCHMARK_CAPTURE(GrouperWithMultiTypes, "{int32, int32}", {int32(), int32()})
+    ->Apply(SetArgs);
+BENCHMARK_CAPTURE(GrouperWithMultiTypes, "{int64, int32}", {int64(), int32()})
+    ->Apply(SetArgs);
+BENCHMARK_CAPTURE(GrouperWithMultiTypes, "{boolean, int64, utf8}",
+                  {boolean(), int64(), utf8()})
+    ->Apply(SetArgs);
+
+// combination types requiring column resorted
+BENCHMARK_CAPTURE(GrouperWithMultiTypes, "{int32, boolean, utf8}",
+                  {int32(), boolean(), utf8()})
+    ->Apply(SetArgs);
+BENCHMARK_CAPTURE(GrouperWithMultiTypes, "{int32, int64, boolean, utf8}",
+                  {int32(), int64(), boolean(), utf8()})
+    ->Apply(SetArgs);
+BENCHMARK_CAPTURE(GrouperWithMultiTypes,
+                  "{utf8, int32, int64, fixed_size_binary(32), boolean}",
+                  {utf8(), int32(), int64(), fixed_size_binary(32), boolean()})
+    ->Apply(SetArgs);
+
+}  // namespace compute
+}  // namespace arrow
diff --git a/cpp/src/arrow/compute/row/grouper_test.cc b/cpp/src/arrow/compute/row/grouper_test.cc
new file mode 100644
index 0000000000000..1e853be5e4af7
--- /dev/null
+++ b/cpp/src/arrow/compute/row/grouper_test.cc
@@ -0,0 +1,68 @@
+// 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.
+
+#include <numeric>
+
+#include "arrow/compute/exec.h"
+#include "arrow/compute/row/grouper.h"
+#include "arrow/testing/gtest_util.h"
+#include "arrow/testing/random.h"
+
+namespace arrow {
+namespace compute {
+
+// Specialized case for GH-40997
+TEST(Grouper, ResortedColumnsWithLargeNullRows) {
+  const uint64_t num_rows = 1024;
+
+  // construct random array with plenty of null values
+  const int32_t kSeed = 42;
+  const int32_t min = 0;
+  const int32_t max = 100;
+  const double null_probability = 0.3;
+  const double true_probability = 0.5;
+  auto rng = random::RandomArrayGenerator(kSeed);
+  auto b_arr = rng.Boolean(num_rows, true_probability, null_probability);
+  auto i32_arr = rng.Int32(num_rows, min, max, null_probability);
+  auto i64_arr = rng.Int64(num_rows, min, max * 10, null_probability);
+
+  // construct batches with columns which will be resorted in the grouper make
+  std::vector<ExecBatch> exec_batches = {ExecBatch({i64_arr, i32_arr, b_arr}, num_rows),
+                                         ExecBatch({i32_arr, i64_arr, b_arr}, num_rows),
+                                         ExecBatch({i64_arr, b_arr, i32_arr}, num_rows),
+                                         ExecBatch({i32_arr, b_arr, i64_arr}, num_rows),
+                                         ExecBatch({b_arr, i32_arr, i64_arr}, num_rows),
+                                         ExecBatch({b_arr, i64_arr, i32_arr}, num_rows)};
+
+  const int num_batches = static_cast<int>(exec_batches.size());
+  std::vector<uint32_t> group_num_vec;
+  group_num_vec.reserve(num_batches);
+
+  for (const auto& exec_batch : exec_batches) {
+    ExecSpan span(exec_batch);
+    ASSERT_OK_AND_ASSIGN(auto grouper, Grouper::Make(span.GetTypes()));
+    ASSERT_OK_AND_ASSIGN(Datum group_ids, grouper->Consume(span));
+    group_num_vec.emplace_back(grouper->num_groups());
+  }
+
+  for (int i = 1; i < num_batches; i++) {
+    ASSERT_EQ(group_num_vec[i - 1], group_num_vec[i]);
+  }
+}
+
+}  // namespace compute
+}  // namespace arrow
diff --git a/cpp/src/arrow/compute/row/row_internal.cc b/cpp/src/arrow/compute/row/row_internal.cc
index f6a62c09fcf24..469205e9b008d 100644
--- a/cpp/src/arrow/compute/row/row_internal.cc
+++ b/cpp/src/arrow/compute/row/row_internal.cc
@@ -66,7 +66,8 @@ void RowTableMetadata::FromColumnMetadataVector(
   //
   // Columns are sorted based on the size in bytes of their fixed-length part.
   // For the varying-length column, the fixed-length part is the 32-bit field storing
-  // cumulative length of varying-length fields.
+  // cumulative length of varying-length fields. This is to make the memory access of
+  // each individual column within the encoded row alignment-friendly.
   //
   // The rules are:
   //
diff --git a/cpp/src/arrow/compute/row/row_internal.h b/cpp/src/arrow/compute/row/row_internal.h
index c9194267aa3fe..3220b7ffe6e40 100644
--- a/cpp/src/arrow/compute/row/row_internal.h
+++ b/cpp/src/arrow/compute/row/row_internal.h
@@ -20,7 +20,7 @@
 #include <vector>
 
 #include "arrow/buffer.h"
-#include "arrow/compute/light_array.h"
+#include "arrow/compute/light_array_internal.h"
 #include "arrow/memory_pool.h"
 #include "arrow/status.h"
 #include "arrow/util/logging.h"
diff --git a/cpp/src/arrow/compute/util.cc b/cpp/src/arrow/compute/util.cc
index 2058ba9f30757..b90b3a64056bd 100644
--- a/cpp/src/arrow/compute/util.cc
+++ b/cpp/src/arrow/compute/util.cc
@@ -17,11 +17,7 @@
 
 #include "arrow/compute/util.h"
 
-#include "arrow/table.h"
-#include "arrow/util/bit_util.h"
-#include "arrow/util/bitmap_ops.h"
 #include "arrow/util/logging.h"
-#include "arrow/util/tracing_internal.h"
 #include "arrow/util/ubsan.h"
 
 namespace arrow {
@@ -31,33 +27,6 @@ using internal::CpuInfo;
 
 namespace util {
 
-void TempVectorStack::alloc(uint32_t num_bytes, uint8_t** data, int* id) {
-  int64_t new_top = top_ + PaddedAllocationSize(num_bytes) + 2 * sizeof(uint64_t);
-  // Stack overflow check (see GH-39582).
-  // XXX cannot return a regular Status because most consumers do not either.
-  ARROW_CHECK_LE(new_top, buffer_size_) << "TempVectorStack::alloc overflow";
-  *data = buffer_->mutable_data() + top_ + sizeof(uint64_t);
-  // We set 8 bytes before the beginning of the allocated range and
-  // 8 bytes after the end to check for stack overflow (which would
-  // result in those known bytes being corrupted).
-  reinterpret_cast<uint64_t*>(buffer_->mutable_data() + top_)[0] = kGuard1;
-  reinterpret_cast<uint64_t*>(buffer_->mutable_data() + new_top)[-1] = kGuard2;
-  *id = num_vectors_++;
-  top_ = new_top;
-}
-
-void TempVectorStack::release(int id, uint32_t num_bytes) {
-  ARROW_DCHECK(num_vectors_ == id + 1);
-  int64_t size = PaddedAllocationSize(num_bytes) + 2 * sizeof(uint64_t);
-  ARROW_DCHECK(reinterpret_cast<const uint64_t*>(buffer_->mutable_data() + top_)[-1] ==
-               kGuard2);
-  ARROW_DCHECK(top_ >= size);
-  top_ -= size;
-  ARROW_DCHECK(reinterpret_cast<const uint64_t*>(buffer_->mutable_data() + top_)[0] ==
-               kGuard1);
-  --num_vectors_;
-}
-
 namespace bit_util {
 
 inline uint64_t SafeLoadUpTo8Bytes(const uint8_t* bytes, int num_bytes) {
diff --git a/cpp/src/arrow/compute/util.h b/cpp/src/arrow/compute/util.h
index e2a2e71b8521d..d56e398667f66 100644
--- a/cpp/src/arrow/compute/util.h
+++ b/cpp/src/arrow/compute/util.h
@@ -24,17 +24,10 @@
 #include <unordered_map>
 #include <vector>
 
-#include "arrow/buffer.h"
 #include "arrow/compute/expression.h"
 #include "arrow/compute/type_fwd.h"
-#include "arrow/memory_pool.h"
 #include "arrow/result.h"
-#include "arrow/status.h"
-#include "arrow/util/bit_util.h"
 #include "arrow/util/cpu_info.h"
-#include "arrow/util/mutex.h"
-#include "arrow/util/thread_pool.h"
-#include "arrow/util/type_fwd.h"
 
 #if defined(__clang__) || defined(__GNUC__)
 #define BYTESWAP(x) __builtin_bswap64(x)
@@ -77,68 +70,6 @@ class MiniBatch {
   static constexpr int kMiniBatchLength = 1 << kLogMiniBatchLength;
 };
 
-/// Storage used to allocate temporary vectors of a batch size.
-/// Temporary vectors should resemble allocating temporary variables on the stack
-/// but in the context of vectorized processing where we need to store a vector of
-/// temporaries instead of a single value.
-class ARROW_EXPORT TempVectorStack {
-  template <typename>
-  friend class TempVectorHolder;
-
- public:
-  Status Init(MemoryPool* pool, int64_t size) {
-    num_vectors_ = 0;
-    top_ = 0;
-    buffer_size_ = PaddedAllocationSize(size) + kPadding + 2 * sizeof(uint64_t);
-    ARROW_ASSIGN_OR_RAISE(auto buffer, AllocateResizableBuffer(size, pool));
-    // Ensure later operations don't accidentally read uninitialized memory.
-    std::memset(buffer->mutable_data(), 0xFF, size);
-    buffer_ = std::move(buffer);
-    return Status::OK();
-  }
-
- private:
-  int64_t PaddedAllocationSize(int64_t num_bytes) {
-    // Round up allocation size to multiple of 8 bytes
-    // to avoid returning temp vectors with unaligned address.
-    //
-    // Also add padding at the end to facilitate loads and stores
-    // using SIMD when number of vector elements is not divisible
-    // by the number of SIMD lanes.
-    //
-    return ::arrow::bit_util::RoundUp(num_bytes, sizeof(int64_t)) + kPadding;
-  }
-  void alloc(uint32_t num_bytes, uint8_t** data, int* id);
-  void release(int id, uint32_t num_bytes);
-  static constexpr uint64_t kGuard1 = 0x3141592653589793ULL;
-  static constexpr uint64_t kGuard2 = 0x0577215664901532ULL;
-  static constexpr int64_t kPadding = 64;
-  int num_vectors_;
-  int64_t top_;
-  std::unique_ptr<Buffer> buffer_;
-  int64_t buffer_size_;
-};
-
-template <typename T>
-class TempVectorHolder {
-  friend class TempVectorStack;
-
- public:
-  ~TempVectorHolder() { stack_->release(id_, num_elements_ * sizeof(T)); }
-  T* mutable_data() { return reinterpret_cast<T*>(data_); }
-  TempVectorHolder(TempVectorStack* stack, uint32_t num_elements) {
-    stack_ = stack;
-    num_elements_ = num_elements;
-    stack_->alloc(num_elements * sizeof(T), &data_, &id_);
-  }
-
- private:
-  TempVectorStack* stack_;
-  uint8_t* data_;
-  int id_;
-  uint32_t num_elements_;
-};
-
 namespace bit_util {
 
 ARROW_EXPORT void bits_to_indexes(int bit_to_search, int64_t hardware_flags,
diff --git a/cpp/src/arrow/compute/util_internal.cc b/cpp/src/arrow/compute/util_internal.cc
new file mode 100644
index 0000000000000..7a7875162c434
--- /dev/null
+++ b/cpp/src/arrow/compute/util_internal.cc
@@ -0,0 +1,100 @@
+// 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.
+
+#include "arrow/compute/util_internal.h"
+
+#include "arrow/compute/util.h"
+#include "arrow/memory_pool.h"
+
+#ifdef ADDRESS_SANITIZER
+#include <sanitizer/asan_interface.h>
+#endif
+
+namespace arrow {
+namespace util {
+
+TempVectorStack::~TempVectorStack() {
+#ifdef ADDRESS_SANITIZER
+  if (buffer_) {
+    ASAN_UNPOISON_MEMORY_REGION(buffer_->mutable_data(), buffer_size_);
+  }
+#endif
+}
+
+Status TempVectorStack::Init(MemoryPool* pool, int64_t size) {
+  num_vectors_ = 0;
+  top_ = 0;
+  buffer_size_ = EstimatedAllocationSize(size);
+  ARROW_ASSIGN_OR_RAISE(auto buffer, AllocateResizableBuffer(buffer_size_, pool));
+#ifdef ADDRESS_SANITIZER
+  ASAN_POISON_MEMORY_REGION(buffer->mutable_data(), buffer_size_);
+#endif
+  buffer_ = std::move(buffer);
+  return Status::OK();
+}
+
+int64_t TempVectorStack::PaddedAllocationSize(int64_t num_bytes) {
+  // Round up allocation size to multiple of 8 bytes
+  // to avoid returning temp vectors with unaligned address.
+  //
+  // Also add padding at the end to facilitate loads and stores
+  // using SIMD when number of vector elements is not divisible
+  // by the number of SIMD lanes.
+  //
+  return ::arrow::bit_util::RoundUp(num_bytes, sizeof(int64_t)) + kPadding;
+}
+
+void TempVectorStack::alloc(uint32_t num_bytes, uint8_t** data, int* id) {
+  int64_t estimated_alloc_size = EstimatedAllocationSize(num_bytes);
+  int64_t new_top = top_ + estimated_alloc_size;
+  // Stack overflow check (see GH-39582).
+  // XXX cannot return a regular Status because most consumers do not either.
+  ARROW_CHECK_LE(new_top, buffer_size_)
+      << "TempVectorStack::alloc overflow: allocating " << estimated_alloc_size
+      << " on top of " << top_ << " in stack of size " << buffer_size_;
+#ifdef ADDRESS_SANITIZER
+  ASAN_UNPOISON_MEMORY_REGION(buffer_->mutable_data() + top_, estimated_alloc_size);
+#endif
+  *data = buffer_->mutable_data() + top_ + /*one guard*/ sizeof(uint64_t);
+#ifndef NDEBUG
+  // We set 8 bytes before the beginning of the allocated range and
+  // 8 bytes after the end to check for stack overflow (which would
+  // result in those known bytes being corrupted).
+  reinterpret_cast<uint64_t*>(buffer_->mutable_data() + top_)[0] = kGuard1;
+  reinterpret_cast<uint64_t*>(buffer_->mutable_data() + new_top)[-1] = kGuard2;
+#endif
+  *id = num_vectors_++;
+  top_ = new_top;
+}
+
+void TempVectorStack::release(int id, uint32_t num_bytes) {
+  ARROW_DCHECK(num_vectors_ == id + 1);
+  int64_t size = EstimatedAllocationSize(num_bytes);
+  ARROW_DCHECK(reinterpret_cast<const uint64_t*>(buffer_->mutable_data() + top_)[-1] ==
+               kGuard2);
+  ARROW_DCHECK(top_ >= size);
+  top_ -= size;
+  ARROW_DCHECK(reinterpret_cast<const uint64_t*>(buffer_->mutable_data() + top_)[0] ==
+               kGuard1);
+#ifdef ADDRESS_SANITIZER
+  ASAN_POISON_MEMORY_REGION(buffer_->mutable_data() + top_, size);
+#endif
+  --num_vectors_;
+}
+
+}  // namespace util
+}  // namespace arrow
diff --git a/cpp/src/arrow/compute/util_internal.h b/cpp/src/arrow/compute/util_internal.h
index 87e89a3350721..5e5b15a5ff600 100644
--- a/cpp/src/arrow/compute/util_internal.h
+++ b/cpp/src/arrow/compute/util_internal.h
@@ -17,7 +17,10 @@
 
 #pragma once
 
+#include "arrow/status.h"
+#include "arrow/type_fwd.h"
 #include "arrow/util/logging.h"
+#include "arrow/util/macros.h"
 
 namespace arrow {
 namespace util {
@@ -27,5 +30,65 @@ void CheckAlignment(const void* ptr) {
   ARROW_DCHECK(reinterpret_cast<uint64_t>(ptr) % sizeof(T) == 0);
 }
 
+/// Storage used to allocate temporary vectors of a batch size.
+/// Temporary vectors should resemble allocating temporary variables on the stack
+/// but in the context of vectorized processing where we need to store a vector of
+/// temporaries instead of a single value.
+class ARROW_EXPORT TempVectorStack {
+  template <typename>
+  friend class TempVectorHolder;
+
+ public:
+  TempVectorStack() = default;
+  ~TempVectorStack();
+
+  ARROW_DISALLOW_COPY_AND_ASSIGN(TempVectorStack);
+
+  ARROW_DEFAULT_MOVE_AND_ASSIGN(TempVectorStack);
+
+  Status Init(MemoryPool* pool, int64_t size);
+
+  int64_t AllocatedSize() const { return top_; }
+
+ private:
+  static int64_t EstimatedAllocationSize(int64_t size) {
+    return PaddedAllocationSize(size) + /*two guards*/ 2 * sizeof(uint64_t);
+  }
+
+  static int64_t PaddedAllocationSize(int64_t num_bytes);
+
+  void alloc(uint32_t num_bytes, uint8_t** data, int* id);
+  void release(int id, uint32_t num_bytes);
+  static constexpr uint64_t kGuard1 = 0x3141592653589793ULL;
+  static constexpr uint64_t kGuard2 = 0x0577215664901532ULL;
+  static constexpr int64_t kPadding = 64;
+  int num_vectors_;
+  int64_t top_;
+  std::unique_ptr<Buffer> buffer_;
+  int64_t buffer_size_;
+
+  friend class TempVectorStackTest;
+};
+
+template <typename T>
+class TempVectorHolder {
+  friend class TempVectorStack;
+
+ public:
+  ~TempVectorHolder() { stack_->release(id_, num_elements_ * sizeof(T)); }
+  T* mutable_data() { return reinterpret_cast<T*>(data_); }
+  TempVectorHolder(TempVectorStack* stack, uint32_t num_elements) {
+    stack_ = stack;
+    num_elements_ = num_elements;
+    stack_->alloc(num_elements * sizeof(T), &data_, &id_);
+  }
+
+ private:
+  TempVectorStack* stack_;
+  uint8_t* data_;
+  int id_;
+  uint32_t num_elements_;
+};
+
 }  // namespace util
 }  // namespace arrow
diff --git a/cpp/src/arrow/compute/util_internal_test.cc b/cpp/src/arrow/compute/util_internal_test.cc
new file mode 100644
index 0000000000000..fbf34f2228488
--- /dev/null
+++ b/cpp/src/arrow/compute/util_internal_test.cc
@@ -0,0 +1,52 @@
+// 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.
+
+#include <gtest/gtest.h>
+
+#include "arrow/buffer.h"
+#include "arrow/compute/util_internal.h"
+#include "arrow/testing/gtest_util.h"
+
+namespace arrow {
+namespace util {
+
+class TempVectorStackTest : public ::testing::Test {
+ protected:
+  static const uint8_t* BufferData(const TempVectorStack& stack) {
+    return stack.buffer_->data();
+  }
+
+  static int64_t BufferCapacity(const TempVectorStack& stack) {
+    return stack.buffer_->capacity();
+  }
+};
+
+// GH-41738: Test the underlying buffer capacity is sufficient to hold the requested
+// vector.
+TEST_F(TempVectorStackTest, BufferCapacitySufficiency) {
+  for (uint32_t stack_size : {1, 7, 8, 63, 64, 65535, 65536}) {
+    ARROW_SCOPED_TRACE("stack_size = ", stack_size);
+    TempVectorStack stack;
+    ASSERT_OK(stack.Init(default_memory_pool(), stack_size));
+
+    TempVectorHolder<uint8_t> v(&stack, stack_size);
+    ASSERT_LE(v.mutable_data() + stack_size, BufferData(stack) + BufferCapacity(stack));
+  }
+}
+
+}  // namespace util
+}  // namespace arrow
diff --git a/cpp/src/arrow/config.cc b/cpp/src/arrow/config.cc
index 1f852e84d3d5c..a0e3a079b3157 100644
--- a/cpp/src/arrow/config.cc
+++ b/cpp/src/arrow/config.cc
@@ -20,6 +20,7 @@
 #include <cstdint>
 
 #include "arrow/util/config.h"
+#include "arrow/util/config_internal.h"
 #include "arrow/util/cpu_info.h"
 #include "arrow/vendored/datetime.h"
 
@@ -58,8 +59,6 @@ std::string MakeSimdLevelString(QueryFlagFunction&& query_flag) {
     return "avx";
   } else if (query_flag(CpuInfo::SSE4_2)) {
     return "sse4_2";
-  } else if (query_flag(CpuInfo::ASIMD)) {
-    return "neon";
   } else {
     return "none";
   }
diff --git a/cpp/src/arrow/csv/reader.cc b/cpp/src/arrow/csv/reader.cc
index e981fafe8e780..e3033a81486e8 100644
--- a/cpp/src/arrow/csv/reader.cc
+++ b/cpp/src/arrow/csv/reader.cc
@@ -1053,8 +1053,8 @@ class AsyncThreadedTableReader
     auto self = shared_from_this();
     return ProcessFirstBuffer().Then([self](const std::shared_ptr<Buffer>& first_buffer) {
       auto block_generator = ThreadedBlockReader::MakeAsyncIterator(
-          self->buffer_generator_, MakeChunker(self->parse_options_),
-          std::move(first_buffer), self->read_options_.skip_rows_after_names);
+          self->buffer_generator_, MakeChunker(self->parse_options_), first_buffer,
+          self->read_options_.skip_rows_after_names);
 
       std::function<Status(CSVBlock)> block_visitor =
           [self](CSVBlock maybe_block) -> Status {
diff --git a/cpp/src/arrow/csv/writer.cc b/cpp/src/arrow/csv/writer.cc
index 0b198759de1e6..5b9c51cda5576 100644
--- a/cpp/src/arrow/csv/writer.cc
+++ b/cpp/src/arrow/csv/writer.cc
@@ -128,10 +128,20 @@ class ColumnPopulator {
     // Populators are intented to be applied to reasonably small data.  In most cases
     // threading overhead would not be justified.
     ctx.set_use_threads(false);
-    ASSIGN_OR_RAISE(
-        std::shared_ptr<Array> casted,
-        compute::Cast(data, /*to_type=*/utf8(), compute::CastOptions(), &ctx));
-    casted_array_ = checked_pointer_cast<StringArray>(casted);
+    if (data.type() && is_large_binary_like(data.type()->id())) {
+      ASSIGN_OR_RAISE(array_, compute::Cast(data, /*to_type=*/large_utf8(),
+                                            compute::CastOptions(), &ctx));
+    } else {
+      auto casted = compute::Cast(data, /*to_type=*/utf8(), compute::CastOptions(), &ctx);
+      if (casted.ok()) {
+        array_ = std::move(casted).ValueOrDie();
+      } else if (casted.status().IsCapacityError()) {
+        ASSIGN_OR_RAISE(array_, compute::Cast(data, /*to_type=*/large_utf8(),
+                                              compute::CastOptions(), &ctx));
+      } else {
+        return casted.status();
+      }
+    }
     return UpdateRowLengths(row_lengths);
   }
 
@@ -146,7 +156,8 @@ class ColumnPopulator {
 
  protected:
   virtual Status UpdateRowLengths(int64_t* row_lengths) = 0;
-  std::shared_ptr<StringArray> casted_array_;
+  // It must be a `StringArray` or `LargeStringArray`.
+  std::shared_ptr<Array> array_;
   const std::string end_chars_;
   std::shared_ptr<Buffer> null_string_;
 
@@ -181,15 +192,28 @@ class UnquotedColumnPopulator : public ColumnPopulator {
         reject_values_with_quotes_(reject_values_with_quotes) {}
 
   Status UpdateRowLengths(int64_t* row_lengths) override {
+    if (ARROW_PREDICT_TRUE(array_->type_id() == Type::STRING)) {
+      return UpdateRowLengths<StringArray>(row_lengths);
+    } else if (ARROW_PREDICT_TRUE(array_->type_id() == Type::LARGE_STRING)) {
+      return UpdateRowLengths<LargeStringArray>(row_lengths);
+    } else {
+      return Status::TypeError("The array must be StringArray or LargeStringArray.");
+    }
+  }
+
+  template <typename StringArrayType>
+  Status UpdateRowLengths(int64_t* row_lengths) {
+    auto casted_array = checked_pointer_cast<StringArrayType>(array_);
     if (reject_values_with_quotes_) {
       // When working on values that, after casting, could produce quotes,
       // we need to return an error in accord with RFC4180.
-      RETURN_NOT_OK(CheckStringArrayHasNoStructuralChars(*casted_array_, delimiter_));
+      RETURN_NOT_OK(CheckStringArrayHasNoStructuralChars<StringArrayType>(*casted_array,
+                                                                          delimiter_));
     }
 
     int64_t row_number = 0;
-    VisitArraySpanInline<StringType>(
-        *casted_array_->data(),
+    VisitArraySpanInline<typename StringArrayType::TypeClass>(
+        *casted_array->data(),
         [&](std::string_view s) {
           row_lengths[row_number] += static_cast<int64_t>(s.length());
           row_number++;
@@ -202,6 +226,17 @@ class UnquotedColumnPopulator : public ColumnPopulator {
   }
 
   Status PopulateRows(char* output, int64_t* offsets) const override {
+    if (ARROW_PREDICT_TRUE(array_->type_id() == Type::STRING)) {
+      return PopulateRows<StringArray>(output, offsets);
+    } else if (ARROW_PREDICT_TRUE(array_->type_id() == Type::LARGE_STRING)) {
+      return PopulateRows<LargeStringArray>(output, offsets);
+    } else {
+      return Status::TypeError("The array must be StringArray or LargeStringArray.");
+    }
+  }
+
+  template <typename StringArrayType>
+  Status PopulateRows(char* output, int64_t* offsets) const {
     // Function applied to valid values cast to string.
     auto valid_function = [&](std::string_view s) {
       memcpy(output + *offsets, s.data(), s.length());
@@ -222,13 +257,14 @@ class UnquotedColumnPopulator : public ColumnPopulator {
       return Status::OK();
     };
 
-    return VisitArraySpanInline<StringType>(*casted_array_->data(), valid_function,
-                                            null_function);
+    return VisitArraySpanInline<typename StringArrayType::TypeClass>(
+        *array_->data(), valid_function, null_function);
   }
 
  private:
   // Returns an error status if string array has any structural characters.
-  static Status CheckStringArrayHasNoStructuralChars(const StringArray& array,
+  template <typename ArrayType>
+  static Status CheckStringArrayHasNoStructuralChars(const ArrayType& array,
                                                      const char delimiter) {
     // scan the underlying string array buffer as a single big string
     const uint8_t* const data = array.raw_data() + array.value_offset(0);
@@ -282,14 +318,26 @@ class QuotedColumnPopulator : public ColumnPopulator {
       : ColumnPopulator(pool, std::move(end_chars), std::move(null_string)) {}
 
   Status UpdateRowLengths(int64_t* row_lengths) override {
-    const StringArray& input = *casted_array_;
+    if (ARROW_PREDICT_TRUE(array_->type_id() == Type::STRING)) {
+      return UpdateRowLengths<StringArray>(row_lengths);
+    } else if (ARROW_PREDICT_TRUE(array_->type_id() == Type::LARGE_STRING)) {
+      return UpdateRowLengths<LargeStringArray>(row_lengths);
+    } else {
+      return Status::TypeError("The array must be StringArray or LargeStringArray.");
+    }
+  }
+
+  template <typename StringArrayType>
+  Status UpdateRowLengths(int64_t* row_lengths) {
+    auto casted_array = checked_pointer_cast<StringArrayType>(array_);
+    const StringArrayType& input = *casted_array;
 
-    row_needs_escaping_.resize(casted_array_->length(), false);
+    row_needs_escaping_.resize(casted_array->length(), false);
 
     if (NoQuoteInArray(input)) {
       // fast path if no quote
       int row_number = 0;
-      VisitArraySpanInline<StringType>(
+      VisitArraySpanInline<typename StringArrayType::TypeClass>(
           *input.data(),
           [&](std::string_view s) {
             row_lengths[row_number] += static_cast<int64_t>(s.length()) + kQuoteCount;
@@ -301,7 +349,7 @@ class QuotedColumnPopulator : public ColumnPopulator {
           });
     } else {
       int row_number = 0;
-      VisitArraySpanInline<StringType>(
+      VisitArraySpanInline<typename StringArrayType::TypeClass>(
           *input.data(),
           [&](std::string_view s) {
             // Each quote in the value string needs to be escaped.
@@ -320,9 +368,20 @@ class QuotedColumnPopulator : public ColumnPopulator {
   }
 
   Status PopulateRows(char* output, int64_t* offsets) const override {
+    if (ARROW_PREDICT_TRUE(array_->type_id() == Type::STRING)) {
+      return PopulateRows<StringArray>(output, offsets);
+    } else if (ARROW_PREDICT_TRUE(array_->type_id() == Type::LARGE_STRING)) {
+      return PopulateRows<LargeStringArray>(output, offsets);
+    } else {
+      return Status::TypeError("The array must be StringArray or LargeStringArray.");
+    }
+  }
+
+  template <typename StringArrayType>
+  Status PopulateRows(char* output, int64_t* offsets) const {
     auto needs_escaping = row_needs_escaping_.begin();
-    VisitArraySpanInline<StringType>(
-        *(casted_array_->data()),
+    VisitArraySpanInline<typename StringArrayType::TypeClass>(
+        *array_->data(),
         [&](std::string_view s) {
           // still needs string content length to be added
           char* row = output + *offsets;
@@ -355,7 +414,8 @@ class QuotedColumnPopulator : public ColumnPopulator {
 
  private:
   // Returns true if there's no quote in the string array
-  static bool NoQuoteInArray(const StringArray& array) {
+  template <typename StringArrayType>
+  static bool NoQuoteInArray(const StringArrayType& array) {
     const uint8_t* data = array.raw_data() + array.value_offset(0);
     const int64_t buffer_size = array.total_values_length();
     return std::memchr(data, '"', buffer_size) == nullptr;
diff --git a/cpp/src/arrow/csv/writer.h b/cpp/src/arrow/csv/writer.h
index 4323337212472..d9d79e1660867 100644
--- a/cpp/src/arrow/csv/writer.h
+++ b/cpp/src/arrow/csv/writer.h
@@ -29,7 +29,8 @@ namespace arrow {
 namespace csv {
 
 // Functionality for converting Arrow data to Comma separated value text.
-// This library supports all primitive types that can be cast to a StringArrays.
+// This library supports all primitive types that can be cast to a StringArray or
+// a LargeStringArray.
 // It applies to following formatting rules:
 //  - For non-binary types no quotes surround values.  Nulls are represented as the empty
 //  string.
diff --git a/cpp/src/arrow/csv/writer_test.cc b/cpp/src/arrow/csv/writer_test.cc
index c1f5622289edb..703179da94093 100644
--- a/cpp/src/arrow/csv/writer_test.cc
+++ b/cpp/src/arrow/csv/writer_test.cc
@@ -73,17 +73,17 @@ WriteOptions DefaultTestOptions(bool include_header = false,
 }
 
 std::string UtilGetExpectedWithEOL(const std::string& eol) {
-  return std::string("1,,-1,,,,") + eol +        // line 1
-         R"(1,"abc""efg",2324,,,,)" + eol +      // line 2
-         R"(,"abcd",5467,,,,)" + eol +           // line 3
-         R"(,,,,,,)" + eol +                     // line 4
-         R"(546,"",517,,,,)" + eol +             // line 5
-         R"(124,"a""""b""",,,,,)" + eol +        // line 6
-         R"(,,,1970-01-01,,,)" + eol +           // line 7
-         R"(,,,,1970-01-02,,)" + eol +           // line 8
-         R"(,,,,,2004-02-29 01:02:03,)" + eol +  // line 9
-         R"(,,,,,,3600)" + eol +                 // line 10
-         R"(,"NA",,,,,)" + eol;                  // line 11
+  return std::string("1,,-1,,,,,") + eol +        // line 1
+         R"(1,"abc""efg",2324,,,,,)" + eol +      // line 2
+         R"(,"abcd",5467,,,,,"efghi")" + eol +    // line 3
+         R"(,,,,,,,)" + eol +                     // line 4
+         R"(546,"",517,,,,,)" + eol +             // line 5
+         R"(124,"a""""b""",,,,,,)" + eol +        // line 6
+         R"(,,,1970-01-01,,,,"jklm")" + eol +     // line 7
+         R"(,,,,1970-01-02,,,)" + eol +           // line 8
+         R"(,,,,,2004-02-29 01:02:03,,)" + eol +  // line 9
+         R"(,,,,,,3600,)" + eol +                 // line 10
+         R"(,"NA",,,,,,)" + eol;                  // line 11
 }
 
 std::vector<WriterTestParams> GenerateTestCases() {
@@ -100,20 +100,22 @@ std::vector<WriterTestParams> GenerateTestCases() {
       field("e", date64()),
       field("f", timestamp(TimeUnit::SECOND)),
       field("g", duration(TimeUnit::SECOND)),
+      field("h", large_utf8()),
   });
   auto populated_batch = R"([{"a": 1, "c ": -1},
                              { "a": 1, "b\"": "abc\"efg", "c ": 2324},
-                             { "b\"": "abcd", "c ": 5467},
+                             { "b\"": "abcd", "c ": 5467, "h": "efghi"},
                              { },
                              { "a": 546, "b\"": "", "c ": 517 },
                              { "a": 124, "b\"": "a\"\"b\"" },
-                             { "d": 0 },
+                             { "d": 0, "h": "jklm" },
                              { "e": 86400000 },
                              { "f": 1078016523 },
                              { "g": 3600 },
                              { "b\"": "NA" }])";
 
-  std::string expected_header = std::string(R"("a","b""","c ","d","e","f","g")") + "\n";
+  std::string expected_header =
+      std::string(R"("a","b""","c ","d","e","f","g","h")") + "\n";
 
   // Expected output without header when using default QuotingStyle::Needed.
   std::string expected_without_header = UtilGetExpectedWithEOL("\n");
@@ -122,42 +124,42 @@ std::vector<WriterTestParams> GenerateTestCases() {
 
   // Expected output without header when using QuotingStyle::AllValid.
   std::string expected_quoting_style_all_valid =
-      std::string(R"("1",,"-1",,,,)") + "\n" +   // line 1
-      R"("1","abc""efg","2324",,,,)" + "\n" +    // line 2
-      R"(,"abcd","5467",,,,)" + "\n" +           // line 3
-      R"(,,,,,,)" + "\n" +                       // line 4
-      R"("546","","517",,,,)" + "\n" +           // line 5
-      R"("124","a""""b""",,,,,)" + "\n" +        // line 6
-      R"(,,,"1970-01-01",,,)" + "\n" +           // line 7
-      R"(,,,,"1970-01-02",,)" + "\n" +           // line 8
-      R"(,,,,,"2004-02-29 01:02:03",)" + "\n" +  // line 9
-      R"(,,,,,,"3600")" + "\n" +                 // line 10
-      R"(,"NA",,,,,)" + "\n";                    // line 11
+      std::string(R"("1",,"-1",,,,,)") + "\n" +   // line 1
+      R"("1","abc""efg","2324",,,,,)" + "\n" +    // line 2
+      R"(,"abcd","5467",,,,,"efghi")" + "\n" +    // line 3
+      R"(,,,,,,,)" + "\n" +                       // line 4
+      R"("546","","517",,,,,)" + "\n" +           // line 5
+      R"("124","a""""b""",,,,,,)" + "\n" +        // line 6
+      R"(,,,"1970-01-01",,,,"jklm")" + "\n" +     // line 7
+      R"(,,,,"1970-01-02",,,)" + "\n" +           // line 8
+      R"(,,,,,"2004-02-29 01:02:03",,)" + "\n" +  // line 9
+      R"(,,,,,,"3600",)" + "\n" +                 // line 10
+      R"(,"NA",,,,,,)" + "\n";                    // line 11
 
   // Batch when testing QuotingStyle::None. The values may not contain any quotes for this
   // style according to RFC4180.
   auto populated_batch_quoting_style_none = R"([{"a": 1, "c ": -1},
                              { "a": 1, "b\"": "abcefg", "c ": 2324},
-                             { "b\"": "abcd", "c ": 5467},
+                             { "b\"": "abcd", "c ": 5467, "h": "efghi"},
                              { },
                              { "a": 546, "b\"": "", "c ": 517 },
                              { "a": 124, "b\"": "ab" },
-                             { "d": 0 },
+                             { "d": 0, "h": "jklm" },
                              { "e": 86400000 },
                              { "f": 1078016523 },
                              { "g": 3600 }])";
   // Expected output for QuotingStyle::None.
-  std::string expected_quoting_style_none = std::string("1,,-1,,,,") + "\n" +  // line 1
-                                            R"(1,abcefg,2324,,,,)" + "\n" +    // line 2
-                                            R"(,abcd,5467,,,,)" + "\n" +       // line 3
-                                            R"(,,,,,,)" + "\n" +               // line 4
-                                            R"(546,,517,,,,)" + "\n" +         // line 5
-                                            R"(124,ab,,,,,)" + "\n" +          // line 6
-                                            R"(,,,1970-01-01,,,)" + "\n" +     // line 7
-                                            R"(,,,,1970-01-02,,)" + "\n" +     // line 8
-                                            R"(,,,,,2004-02-29 01:02:03,)" +
-                                            "\n" +                   // line 9
-                                            R"(,,,,,,3600)" + "\n";  // line 10
+  std::string expected_quoting_style_none = std::string("1,,-1,,,,,") + "\n" +   // line 1
+                                            R"(1,abcefg,2324,,,,,)" + "\n" +     // line 2
+                                            R"(,abcd,5467,,,,,efghi)" + "\n" +   // line 3
+                                            R"(,,,,,,,)" + "\n" +                // line 4
+                                            R"(546,,517,,,,,)" + "\n" +          // line 5
+                                            R"(124,ab,,,,,,)" + "\n" +           // line 6
+                                            R"(,,,1970-01-01,,,,jklm)" + "\n" +  // line 7
+                                            R"(,,,,1970-01-02,,,)" + "\n" +      // line 8
+                                            R"(,,,,,2004-02-29 01:02:03,,)" +
+                                            "\n" +                    // line 9
+                                            R"(,,,,,,3600,)" + "\n";  // line 10
 
   // Schema and data to test custom null value string.
   auto schema_custom_na = schema({field("g", uint64()), field("h", utf8())});
diff --git a/cpp/src/arrow/dataset/dataset.cc b/cpp/src/arrow/dataset/dataset.cc
index 0e7bc3da84235..8a3df182474bf 100644
--- a/cpp/src/arrow/dataset/dataset.cc
+++ b/cpp/src/arrow/dataset/dataset.cc
@@ -402,7 +402,7 @@ class BasicFragmentEvolution : public FragmentEvolutionStrategy {
             }
             return compute::field_ref(FieldRef(std::move(modified_indices)));
           }
-          return std::move(expr);
+          return expr;
         },
         [](compute::Expression expr, compute::Expression* old_expr) { return expr; });
   };
diff --git a/cpp/src/arrow/dataset/dataset_writer.cc b/cpp/src/arrow/dataset/dataset_writer.cc
index 34731d19ab3eb..c60042dd6fef8 100644
--- a/cpp/src/arrow/dataset/dataset_writer.cc
+++ b/cpp/src/arrow/dataset/dataset_writer.cc
@@ -408,8 +408,7 @@ class DatasetWriterDirectoryQueue {
         write_options, writer_state);
     dir_queue->PrepareDirectory();
     ARROW_ASSIGN_OR_RAISE(dir_queue->current_filename_, dir_queue->GetNextFilename());
-    // std::move required to make RTools 3.5 mingw compiler happy
-    return std::move(dir_queue);
+    return dir_queue;
   }
 
   Status Finish() {
@@ -515,7 +514,7 @@ class DatasetWriter::DatasetWriterImpl {
                     std::function<void()> finish_callback, uint64_t max_rows_queued)
       : scheduler_(scheduler),
         write_tasks_(util::MakeThrottledAsyncTaskGroup(
-            scheduler_, 1, /*queue=*/nullptr,
+            scheduler_, /*max_concurrent_cost=*/1, /*queue=*/nullptr,
             [finish_callback = std::move(finish_callback)] {
               finish_callback();
               return Status::OK();
@@ -541,6 +540,23 @@ class DatasetWriter::DatasetWriterImpl {
     }
   }
 
+  void ResumeIfNeeded() {
+    if (!paused_) {
+      return;
+    }
+    bool needs_resume = false;
+    {
+      std::lock_guard lg(mutex_);
+      if (!write_tasks_ || write_tasks_->QueueSize() == 0) {
+        needs_resume = true;
+      }
+    }
+    if (needs_resume) {
+      paused_ = false;
+      resume_callback_();
+    }
+  }
+
   void WriteRecordBatch(std::shared_ptr<RecordBatch> batch, const std::string& directory,
                         const std::string& prefix) {
     write_tasks_->AddSimpleTask(
@@ -549,11 +565,14 @@ class DatasetWriter::DatasetWriterImpl {
               WriteAndCheckBackpressure(std::move(batch), directory, prefix);
           if (!has_room.is_finished()) {
             // We don't have to worry about sequencing backpressure here since
-            // task_group_ serves as our sequencer.  If batches continue to arrive after
-            // we pause they will queue up in task_group_ until we free up and call
-            // Resume
+            // task_group_ serves as our sequencer.  If batches continue to arrive
+            // after we pause they will queue up in task_group_ until we free up and
+            // call Resume
             pause_callback_();
-            return has_room.Then([this] { resume_callback_(); });
+            paused_ = true;
+            return has_room.Then([this] { ResumeIfNeeded(); });
+          } else {
+            ResumeIfNeeded();
           }
           return has_room;
         },
@@ -571,6 +590,9 @@ class DatasetWriter::DatasetWriterImpl {
           return Future<>::MakeFinished();
         },
         "DatasetWriter::FinishAll"sv);
+    // Reset write_tasks_ to signal that we are done adding tasks, this will allow
+    // us to invoke the finish callback once the tasks wrap up.
+    std::lock_guard lg(mutex_);
     write_tasks_.reset();
   }
 
@@ -660,7 +682,7 @@ class DatasetWriter::DatasetWriterImpl {
   }
 
   util::AsyncTaskScheduler* scheduler_ = nullptr;
-  std::unique_ptr<util::AsyncTaskScheduler> write_tasks_;
+  std::unique_ptr<util::ThrottledAsyncTaskScheduler> write_tasks_;
   Future<> finish_fut_ = Future<>::Make();
   FileSystemDatasetWriteOptions write_options_;
   DatasetWriterState writer_state_;
@@ -670,6 +692,7 @@ class DatasetWriter::DatasetWriterImpl {
   std::unordered_map<std::string, std::shared_ptr<DatasetWriterDirectoryQueue>>
       directory_queues_;
   std::mutex mutex_;
+  bool paused_ = false;
   Status err_;
 };
 
diff --git a/cpp/src/arrow/dataset/discovery_test.cc b/cpp/src/arrow/dataset/discovery_test.cc
index 92cec7f324963..981146b7999ef 100644
--- a/cpp/src/arrow/dataset/discovery_test.cc
+++ b/cpp/src/arrow/dataset/discovery_test.cc
@@ -144,7 +144,8 @@ class FileSystemDatasetFactoryTest : public DatasetFactoryTest {
     }
     options_ = std::make_shared<ScanOptions>();
     options_->dataset_schema = schema;
-    ASSERT_OK_AND_ASSIGN(auto projection, ProjectionDescr::Default(*schema));
+    ASSERT_OK_AND_ASSIGN(auto projection, ProjectionDescr::Default(
+                                              *schema, options_->add_augmented_fields));
     SetProjection(options_.get(), std::move(projection));
     ASSERT_OK_AND_ASSIGN(dataset_, factory_->Finish(schema));
     ASSERT_OK_AND_ASSIGN(auto fragment_it, dataset_->GetFragments());
diff --git a/cpp/src/arrow/dataset/file_csv.cc b/cpp/src/arrow/dataset/file_csv.cc
index 09ab775727c98..6258a674deee5 100644
--- a/cpp/src/arrow/dataset/file_csv.cc
+++ b/cpp/src/arrow/dataset/file_csv.cc
@@ -106,7 +106,7 @@ class CsvFileScanner : public FragmentScanner {
     }
     convert_options.include_columns = std::move(columns);
     convert_options.column_types = std::move(column_types);
-    return std::move(convert_options);
+    return convert_options;
   }
 
   static Future<std::shared_ptr<FragmentScanner>> Make(
diff --git a/cpp/src/arrow/dataset/file_parquet.cc b/cpp/src/arrow/dataset/file_parquet.cc
index c17ba89be7907..1f8b6cc4882cf 100644
--- a/cpp/src/arrow/dataset/file_parquet.cc
+++ b/cpp/src/arrow/dataset/file_parquet.cc
@@ -279,7 +279,7 @@ Status ResolveOneFieldRef(
 // names) based on the dataset schema. Returns `false` if no conversion was needed.
 Result<FieldRef> MaybeConvertFieldRef(FieldRef ref, const Schema& dataset_schema) {
   if (ARROW_PREDICT_TRUE(ref.IsNameSequence())) {
-    return std::move(ref);
+    return ref;
   }
 
   ARROW_ASSIGN_OR_RAISE(auto path, ref.FindOne(dataset_schema));
@@ -504,7 +504,8 @@ Result<std::shared_ptr<parquet::arrow::FileReader>> ParquetFileFormat::GetReader
   std::unique_ptr<parquet::arrow::FileReader> arrow_reader;
   RETURN_NOT_OK(parquet::arrow::FileReader::Make(
       options->pool, std::move(reader), std::move(arrow_properties), &arrow_reader));
-  return std::move(arrow_reader);
+  // R build with openSUSE155 requires an explicit shared_ptr construction
+  return std::shared_ptr<parquet::arrow::FileReader>(std::move(arrow_reader));
 }
 
 Future<std::shared_ptr<parquet::arrow::FileReader>> ParquetFileFormat::GetReaderAsync(
@@ -543,7 +544,9 @@ Future<std::shared_ptr<parquet::arrow::FileReader>> ParquetFileFormat::GetReader
                           reader)),
                       std::move(arrow_properties), &arrow_reader));
 
-                  return std::move(arrow_reader);
+                  // R build with openSUSE155 requires an explicit shared_ptr construction
+                  return std::shared_ptr<parquet::arrow::FileReader>(
+                      std::move(arrow_reader));
                 },
                 [path = source.path()](const Status& status)
                     -> Result<std::shared_ptr<parquet::arrow::FileReader>> {
diff --git a/cpp/src/arrow/dataset/file_parquet_encryption_test.cc b/cpp/src/arrow/dataset/file_parquet_encryption_test.cc
index 307017fd67e06..0287d593d12d3 100644
--- a/cpp/src/arrow/dataset/file_parquet_encryption_test.cc
+++ b/cpp/src/arrow/dataset/file_parquet_encryption_test.cc
@@ -148,17 +148,22 @@ class DatasetEncryptionTestBase : public ::testing::Test {
                          FileSystemDatasetFactory::Make(file_system_, selector,
                                                         file_format, factory_options));
 
-    // Read dataset into table
+    // Create the dataset
     ASSERT_OK_AND_ASSIGN(auto dataset, dataset_factory->Finish());
-    ASSERT_OK_AND_ASSIGN(auto scanner_builder, dataset->NewScan());
-    ASSERT_OK_AND_ASSIGN(auto scanner, scanner_builder->Finish());
-    ASSERT_OK_AND_ASSIGN(auto read_table, scanner->ToTable());
-
-    // Verify the data was read correctly
-    ASSERT_OK_AND_ASSIGN(auto combined_table, read_table->CombineChunks());
-    // Validate the table
-    ASSERT_OK(combined_table->ValidateFull());
-    AssertTablesEqual(*combined_table, *table_);
+
+    // Reuse the dataset above to scan it twice to make sure decryption works correctly.
+    for (size_t i = 0; i < 2; ++i) {
+      // Read dataset into table
+      ASSERT_OK_AND_ASSIGN(auto scanner_builder, dataset->NewScan());
+      ASSERT_OK_AND_ASSIGN(auto scanner, scanner_builder->Finish());
+      ASSERT_OK_AND_ASSIGN(auto read_table, scanner->ToTable());
+
+      // Verify the data was read correctly
+      ASSERT_OK_AND_ASSIGN(auto combined_table, read_table->CombineChunks());
+      // Validate the table
+      ASSERT_OK(combined_table->ValidateFull());
+      AssertTablesEqual(*combined_table, *table_);
+    }
   }
 
  protected:
diff --git a/cpp/src/arrow/dataset/file_parquet_test.cc b/cpp/src/arrow/dataset/file_parquet_test.cc
index 76cd0af3b835f..bf626826d4d1b 100644
--- a/cpp/src/arrow/dataset/file_parquet_test.cc
+++ b/cpp/src/arrow/dataset/file_parquet_test.cc
@@ -330,8 +330,9 @@ TEST_F(TestParquetFileFormat, CachedMetadata) {
   // Read the file the first time, will read metadata
   auto options = std::make_shared<ScanOptions>();
   options->filter = literal(true);
-  ASSERT_OK_AND_ASSIGN(auto projection_descr,
-                       ProjectionDescr::FromNames({"x"}, *test_schema));
+  ASSERT_OK_AND_ASSIGN(
+      auto projection_descr,
+      ProjectionDescr::FromNames({"x"}, *test_schema, options->add_augmented_fields));
   options->projected_schema = projection_descr.schema;
   options->projection = projection_descr.expression;
   ASSERT_OK_AND_ASSIGN(auto generator, fragment->ScanBatchesAsync(options));
diff --git a/cpp/src/arrow/dataset/scan_node.cc b/cpp/src/arrow/dataset/scan_node.cc
index c25c5b70ae1ec..4493332111429 100644
--- a/cpp/src/arrow/dataset/scan_node.cc
+++ b/cpp/src/arrow/dataset/scan_node.cc
@@ -166,7 +166,7 @@ class ScanNode : public acero::ExecNode, public acero::TracedNode {
       return Status::Invalid("A scan filter must be a boolean expression");
     }
 
-    return std::move(normalized);
+    return normalized;
   }
 
   static Result<acero::ExecNode*> Make(acero::ExecPlan* plan,
@@ -334,7 +334,7 @@ class ScanNode : public acero::ExecNode, public acero::TracedNode {
           extracted.known_values.push_back({i, *maybe_casted});
         }
       }
-      return std::move(extracted);
+      return extracted;
     }
 
     Future<> BeginScan(const std::shared_ptr<InspectedFragment>& inspected_fragment) {
@@ -427,7 +427,7 @@ class ScanNode : public acero::ExecNode, public acero::TracedNode {
             /*queue=*/nullptr,
             [this]() { return output_->InputFinished(this, num_batches_.load()); });
     fragment_tasks->AddAsyncGenerator<std::shared_ptr<Fragment>>(
-        std::move(frag_gen),
+        frag_gen,
         [this, fragment_tasks =
                    std::move(fragment_tasks)](const std::shared_ptr<Fragment>& fragment) {
           fragment_tasks->AddTask(std::make_unique<ListFragmentTask>(this, fragment));
diff --git a/cpp/src/arrow/dataset/scanner.cc b/cpp/src/arrow/dataset/scanner.cc
index 18981d1451980..a856a792a264f 100644
--- a/cpp/src/arrow/dataset/scanner.cc
+++ b/cpp/src/arrow/dataset/scanner.cc
@@ -211,7 +211,8 @@ Status NormalizeScanOptions(const std::shared_ptr<ScanOptions>& scan_options,
         // create the projected schema only if the provided expressions
         // produces valid set of fields.
         ARROW_ASSIGN_OR_RAISE(auto projection_descr,
-                              ProjectionDescr::Default(*projected_schema));
+                              ProjectionDescr::Default(
+                                  *projected_schema, scan_options->add_augmented_fields));
         scan_options->projected_schema = std::move(projection_descr.schema);
         scan_options->projection = projection_descr.expression;
         ARROW_ASSIGN_OR_RAISE(scan_options->projection,
@@ -220,7 +221,8 @@ Status NormalizeScanOptions(const std::shared_ptr<ScanOptions>& scan_options,
         // if projected_fields are not found, we default to creating the projected_schema
         // and projection from the dataset_schema.
         ARROW_ASSIGN_OR_RAISE(auto projection_descr,
-                              ProjectionDescr::Default(*dataset_schema));
+                              ProjectionDescr::Default(
+                                  *dataset_schema, scan_options->add_augmented_fields));
         scan_options->projected_schema = std::move(projection_descr.schema);
         scan_options->projection = projection_descr.expression;
       }
@@ -231,7 +233,7 @@ Status NormalizeScanOptions(const std::shared_ptr<ScanOptions>& scan_options,
     ARROW_ASSIGN_OR_RAISE(
         auto projection_descr,
         ProjectionDescr::FromNames(scan_options->projected_schema->field_names(),
-                                   *dataset_schema));
+                                   *dataset_schema, scan_options->add_augmented_fields));
     scan_options->projection = projection_descr.expression;
   }
 
@@ -730,7 +732,8 @@ Future<int64_t> AsyncScanner::CountRowsAsync(Executor* executor) {
   const auto options = std::make_shared<ScanOptions>(*scan_options_);
   ARROW_ASSIGN_OR_RAISE(auto empty_projection,
                         ProjectionDescr::FromNames(std::vector<std::string>(),
-                                                   *scan_options_->dataset_schema));
+                                                   *scan_options_->dataset_schema,
+                                                   scan_options_->add_augmented_fields));
   SetProjection(options.get(), empty_projection);
 
   auto total = std::make_shared<std::atomic<int64_t>>(0);
@@ -828,7 +831,8 @@ Result<ProjectionDescr> ProjectionDescr::FromExpressions(
 }
 
 Result<ProjectionDescr> ProjectionDescr::FromNames(std::vector<std::string> names,
-                                                   const Schema& dataset_schema) {
+                                                   const Schema& dataset_schema,
+                                                   bool add_augmented_fields) {
   std::vector<compute::Expression> exprs(names.size());
   for (size_t i = 0; i < exprs.size(); ++i) {
     // If name isn't in schema, try finding it by dotted path.
@@ -846,15 +850,19 @@ Result<ProjectionDescr> ProjectionDescr::FromNames(std::vector<std::string> name
     }
   }
   auto fields = dataset_schema.fields();
-  for (const auto& aug_field : kAugmentedFields) {
-    fields.push_back(aug_field);
+  if (add_augmented_fields) {
+    for (const auto& aug_field : kAugmentedFields) {
+      fields.push_back(aug_field);
+    }
   }
   return ProjectionDescr::FromExpressions(std::move(exprs), std::move(names),
                                           Schema(fields, dataset_schema.metadata()));
 }
 
-Result<ProjectionDescr> ProjectionDescr::Default(const Schema& dataset_schema) {
-  return ProjectionDescr::FromNames(dataset_schema.field_names(), dataset_schema);
+Result<ProjectionDescr> ProjectionDescr::Default(const Schema& dataset_schema,
+                                                 bool add_augmented_fields) {
+  return ProjectionDescr::FromNames(dataset_schema.field_names(), dataset_schema,
+                                    add_augmented_fields);
 }
 
 void SetProjection(ScanOptions* options, ProjectionDescr projection) {
@@ -899,7 +907,8 @@ const std::shared_ptr<Schema>& ScannerBuilder::projected_schema() const {
 Status ScannerBuilder::Project(std::vector<std::string> columns) {
   ARROW_ASSIGN_OR_RAISE(
       auto projection,
-      ProjectionDescr::FromNames(std::move(columns), *scan_options_->dataset_schema));
+      ProjectionDescr::FromNames(std::move(columns), *scan_options_->dataset_schema,
+                                 scan_options_->add_augmented_fields));
   SetProjection(scan_options_.get(), std::move(projection));
   return Status::OK();
 }
@@ -1052,8 +1061,10 @@ Result<acero::ExecNode*> MakeScanNode(acero::ExecPlan* plan,
       });
 
   auto fields = scan_options->dataset_schema->fields();
-  for (const auto& aug_field : kAugmentedFields) {
-    fields.push_back(aug_field);
+  if (scan_options->add_augmented_fields) {
+    for (const auto& aug_field : kAugmentedFields) {
+      fields.push_back(aug_field);
+    }
   }
 
   return acero::MakeExecNode(
diff --git a/cpp/src/arrow/dataset/scanner.h b/cpp/src/arrow/dataset/scanner.h
index 4479158ff20cc..d2de267897180 100644
--- a/cpp/src/arrow/dataset/scanner.h
+++ b/cpp/src/arrow/dataset/scanner.h
@@ -114,6 +114,9 @@ struct ARROW_DS_EXPORT ScanOptions {
   /// Note: This  must be true in order for any readahead to happen
   bool use_threads = false;
 
+  /// If true the scanner will add augmented fields to the output schema.
+  bool add_augmented_fields = true;
+
   /// Fragment-specific scan options.
   std::shared_ptr<FragmentScanOptions> fragment_scan_options;
 
@@ -287,10 +290,12 @@ struct ARROW_DS_EXPORT ProjectionDescr {
 
   /// \brief Create a default projection referencing fields in the dataset schema
   static Result<ProjectionDescr> FromNames(std::vector<std::string> names,
-                                           const Schema& dataset_schema);
+                                           const Schema& dataset_schema,
+                                           bool add_augmented_fields = true);
 
   /// \brief Make a projection that projects every field in the dataset schema
-  static Result<ProjectionDescr> Default(const Schema& dataset_schema);
+  static Result<ProjectionDescr> Default(const Schema& dataset_schema,
+                                         bool add_augmented_fields = true);
 };
 
 /// \brief Utility method to set the projection expression and schema
diff --git a/cpp/src/arrow/dataset/scanner_test.cc b/cpp/src/arrow/dataset/scanner_test.cc
index fccfc80032d31..58bc9c8c0ea6b 100644
--- a/cpp/src/arrow/dataset/scanner_test.cc
+++ b/cpp/src/arrow/dataset/scanner_test.cc
@@ -1103,7 +1103,8 @@ TEST_P(TestScanner, ProjectionDefaults) {
   }
   // If we only specify a projection expression then infer the projected schema
   // from the projection expression
-  auto projection_desc = ProjectionDescr::FromNames({"i32"}, *schema_);
+  auto projection_desc =
+      ProjectionDescr::FromNames({"i32"}, *schema_, /*add_augmented_fields=*/true);
   {
     ARROW_SCOPED_TRACE("User only specifies projection");
     options_->projection = projection_desc->expression;
@@ -1148,7 +1149,8 @@ TEST_P(TestScanner, ProjectedScanNestedFromNames) {
   });
   ASSERT_OK_AND_ASSIGN(auto descr,
                        ProjectionDescr::FromNames({".struct.i32", "nested.right.f64"},
-                                                  *options_->dataset_schema))
+                                                  *options_->dataset_schema,
+                                                  options_->add_augmented_fields))
   SetProjection(options_.get(), std::move(descr));
   auto batch_in = ConstantArrayGenerator::Zeroes(GetParam().items_per_batch, schema_);
   auto batch_out = ConstantArrayGenerator::Zeroes(
@@ -2106,7 +2108,8 @@ TEST(ScanOptions, TestMaterializedFields) {
 
   auto set_projection_from_names = [&opts](std::vector<std::string> names) {
     ASSERT_OK_AND_ASSIGN(auto projection, ProjectionDescr::FromNames(
-                                              std::move(names), *opts->dataset_schema));
+                                              std::move(names), *opts->dataset_schema,
+                                              opts->add_augmented_fields));
     SetProjection(opts.get(), std::move(projection));
   };
 
@@ -2160,7 +2163,8 @@ TEST(ScanOptions, TestMaterializedFields) {
   // project top-level field, filter nothing
   opts->filter = literal(true);
   ASSERT_OK_AND_ASSIGN(projection,
-                       ProjectionDescr::FromNames({"nested"}, *opts->dataset_schema));
+                       ProjectionDescr::FromNames({"nested"}, *opts->dataset_schema,
+                                                  opts->add_augmented_fields));
   SetProjection(opts.get(), std::move(projection));
   EXPECT_THAT(opts->MaterializedFields(), ElementsAre(FieldRef("nested")));
 
diff --git a/cpp/src/arrow/dataset/test_util_internal.h b/cpp/src/arrow/dataset/test_util_internal.h
index de0519afac9e1..8195218b0cfe8 100644
--- a/cpp/src/arrow/dataset/test_util_internal.h
+++ b/cpp/src/arrow/dataset/test_util_internal.h
@@ -386,7 +386,8 @@ class DatasetFixtureMixin : public ::testing::Test {
     options_ = std::make_shared<ScanOptions>();
     options_->dataset_schema = schema_;
     ASSERT_OK_AND_ASSIGN(auto projection,
-                         ProjectionDescr::FromNames(schema_->field_names(), *schema_));
+                         ProjectionDescr::FromNames(schema_->field_names(), *schema_,
+                                                    options_->add_augmented_fields));
     SetProjection(options_.get(), std::move(projection));
     SetFilter(literal(true));
   }
@@ -398,7 +399,8 @@ class DatasetFixtureMixin : public ::testing::Test {
   void SetProjectedColumns(std::vector<std::string> column_names) {
     ASSERT_OK_AND_ASSIGN(
         auto projection,
-        ProjectionDescr::FromNames(std::move(column_names), *options_->dataset_schema));
+        ProjectionDescr::FromNames(std::move(column_names), *options_->dataset_schema,
+                                   /*add_augmented_fields=*/true));
     SetProjection(options_.get(), std::move(projection));
   }
 
@@ -502,7 +504,8 @@ class FileFormatFixtureMixin : public ::testing::Test {
   void SetSchema(std::vector<std::shared_ptr<Field>> fields) {
     opts_->dataset_schema = schema(std::move(fields));
     ASSERT_OK_AND_ASSIGN(auto projection,
-                         ProjectionDescr::Default(*opts_->dataset_schema));
+                         ProjectionDescr::Default(*opts_->dataset_schema,
+                                                  /*add_augmented_fields=*/true));
     SetProjection(opts_.get(), std::move(projection));
   }
 
@@ -512,7 +515,8 @@ class FileFormatFixtureMixin : public ::testing::Test {
 
   void Project(std::vector<std::string> names) {
     ASSERT_OK_AND_ASSIGN(auto projection, ProjectionDescr::FromNames(
-                                              std::move(names), *opts_->dataset_schema));
+                                              std::move(names), *opts_->dataset_schema,
+                                              /*add_augmented_fields=*/true));
     SetProjection(opts_.get(), std::move(projection));
   }
 
@@ -993,7 +997,8 @@ class FileFormatScanMixin : public FileFormatFixtureMixin<FormatHelper>,
     auto i64 = field("i64", int64());
     this->opts_->dataset_schema = schema({i32, i32, i64});
     ASSERT_RAISES(Invalid,
-                  ProjectionDescr::FromNames({"i32"}, *this->opts_->dataset_schema));
+                  ProjectionDescr::FromNames({"i32"}, *this->opts_->dataset_schema,
+                                             /*add_augmented_fields=*/true));
   }
   void TestScanWithPushdownNulls() {
     // Regression test for ARROW-15312
@@ -1933,7 +1938,8 @@ class WriteFileSystemDatasetMixin : public MakeFileSystemDatasetMixin {
     scan_options_->dataset_schema = dataset_->schema();
     ASSERT_OK_AND_ASSIGN(
         auto projection,
-        ProjectionDescr::FromNames(source_schema_->field_names(), *dataset_->schema()));
+        ProjectionDescr::FromNames(source_schema_->field_names(), *dataset_->schema(),
+                                   scan_options_->add_augmented_fields));
     SetProjection(scan_options_.get(), std::move(projection));
   }
 
diff --git a/cpp/src/arrow/device.cc b/cpp/src/arrow/device.cc
index 98b8f7b30397e..c2195e89e75ee 100644
--- a/cpp/src/arrow/device.cc
+++ b/cpp/src/arrow/device.cc
@@ -116,6 +116,32 @@ Result<std::shared_ptr<Buffer>> MemoryManager::ViewBuffer(
                                 " on ", to->device()->ToString(), " not supported");
 }
 
+Status MemoryManager::CopyBufferSliceToCPU(const std::shared_ptr<Buffer>& buf,
+                                           int64_t offset, int64_t length,
+                                           uint8_t* out_data) {
+  if (ARROW_PREDICT_TRUE(buf->is_cpu())) {
+    memcpy(out_data, buf->data() + offset, static_cast<size_t>(length));
+    return Status::OK();
+  }
+
+  auto& from = buf->memory_manager();
+  auto cpu_mm = default_cpu_memory_manager();
+  // Try a view first
+  auto maybe_buffer_result = from->ViewBufferTo(buf, cpu_mm);
+  if (!COPY_BUFFER_SUCCESS(maybe_buffer_result)) {
+    // View failed, try a copy instead
+    maybe_buffer_result = from->CopyBufferTo(buf, cpu_mm);
+  }
+  ARROW_ASSIGN_OR_RAISE(auto maybe_buffer, std::move(maybe_buffer_result));
+  if (maybe_buffer != nullptr) {
+    memcpy(out_data, maybe_buffer->data() + offset, static_cast<size_t>(length));
+    return Status::OK();
+  }
+
+  return Status::NotImplemented("Copying buffer slice from ", from->device()->ToString(),
+                                " to CPU not supported");
+}
+
 #undef COPY_BUFFER_RETURN
 #undef COPY_BUFFER_SUCCESS
 
@@ -189,7 +215,7 @@ Result<std::unique_ptr<Buffer>> CPUMemoryManager::CopyNonOwnedFrom(
   if (buf.size() > 0) {
     memcpy(dest->mutable_data(), buf.data(), static_cast<size_t>(buf.size()));
   }
-  return std::move(dest);
+  return dest;
 }
 
 Result<std::shared_ptr<Buffer>> CPUMemoryManager::ViewBufferFrom(
@@ -221,7 +247,7 @@ Result<std::unique_ptr<Buffer>> CPUMemoryManager::CopyNonOwnedTo(
   if (buf.size() > 0) {
     memcpy(dest->mutable_data(), buf.data(), static_cast<size_t>(buf.size()));
   }
-  return std::move(dest);
+  return dest;
 }
 
 Result<std::shared_ptr<Buffer>> CPUMemoryManager::ViewBufferTo(
diff --git a/cpp/src/arrow/device.h b/cpp/src/arrow/device.h
index 622551c6bd040..f5cca0d27d7b2 100644
--- a/cpp/src/arrow/device.h
+++ b/cpp/src/arrow/device.h
@@ -139,7 +139,8 @@ class ARROW_EXPORT Device : public std::enable_shared_from_this<Device>,
   /// This should create the appropriate stream type for the device,
   /// derived from Device::Stream to allow for stream ordered events
   /// and memory allocations.
-  virtual Result<std::shared_ptr<Stream>> MakeStream(unsigned int flags) {
+  virtual Result<std::shared_ptr<Stream>> MakeStream(
+      unsigned int ARROW_ARG_UNUSED(flags)) {
     return NULLPTR;
   }
 
@@ -149,8 +150,9 @@ class ARROW_EXPORT Device : public std::enable_shared_from_this<Device>,
   /// @param release_fn a function to call during destruction, `nullptr` or
   ///        a no-op function can be passed to indicate ownership is maintained
   ///        externally
-  virtual Result<std::shared_ptr<Stream>> WrapStream(void* device_stream,
-                                                     Stream::release_fn_t release_fn) {
+  virtual Result<std::shared_ptr<Stream>> WrapStream(
+      void* ARROW_ARG_UNUSED(device_stream),
+      Stream::release_fn_t ARROW_ARG_UNUSED(release_fn)) {
     return NULLPTR;
   }
 
@@ -247,6 +249,10 @@ class ARROW_EXPORT MemoryManager : public std::enable_shared_from_this<MemoryMan
   static Result<std::shared_ptr<Buffer>> ViewBuffer(
       const std::shared_ptr<Buffer>& source, const std::shared_ptr<MemoryManager>& to);
 
+  /// \brief Copy a slice of a buffer into a CPU pointer
+  static Status CopyBufferSliceToCPU(const std::shared_ptr<Buffer>& buf, int64_t offset,
+                                     int64_t length, uint8_t* out_data);
+
   /// \brief Create a new SyncEvent.
   ///
   /// This version should construct the appropriate event for the device and
diff --git a/cpp/src/arrow/engine/substrait/expression_internal.cc b/cpp/src/arrow/engine/substrait/expression_internal.cc
index 5d892af9a394e..56d7956076bf8 100644
--- a/cpp/src/arrow/engine/substrait/expression_internal.cc
+++ b/cpp/src/arrow/engine/substrait/expression_internal.cc
@@ -33,6 +33,7 @@
 #include <vector>
 
 #include <google/protobuf/descriptor.h>
+#include <google/protobuf/wrappers.pb.h>
 
 #include "arrow/array/array_base.h"
 #include "arrow/array/array_nested.h"
@@ -58,8 +59,10 @@
 #include "arrow/util/decimal.h"
 #include "arrow/util/endian.h"
 #include "arrow/util/logging.h"
+#include "arrow/util/macros.h"
 #include "arrow/util/small_vector.h"
 #include "arrow/util/string.h"
+#include "arrow/util/unreachable.h"
 #include "arrow/visit_scalar_inline.h"
 
 namespace arrow {
@@ -71,6 +74,9 @@ namespace engine {
 
 namespace {
 
+constexpr int64_t kMicrosPerSecond = 1000000;
+constexpr int64_t kMicrosPerMilli = 1000;
+
 Id NormalizeFunctionName(Id id) {
   // Substrait plans encode the types into the function name so it might look like
   // add:opt_i32_i32.  We don't care about  the :opt_i32_i32 so we just trim it
@@ -127,7 +133,7 @@ Result<SubstraitCall> DecodeScalarFunction(
   for (const auto& opt : scalar_fn.options()) {
     ARROW_RETURN_NOT_OK(DecodeOption(opt, &call));
   }
-  return std::move(call);
+  return call;
 }
 
 std::string EnumToString(int value, const google::protobuf::EnumDescriptor* descriptor) {
@@ -273,7 +279,7 @@ Result<SubstraitCall> FromProto(const substrait::AggregateFunction& func, bool i
   for (int i = 0; i < func.options_size(); i++) {
     ARROW_RETURN_NOT_OK(DecodeOption(func.options(i), &call));
   }
-  return std::move(call);
+  return call;
 }
 
 Result<compute::Expression> FromProto(const substrait::Expression& expr,
@@ -421,6 +427,86 @@ Result<compute::Expression> FromProto(const substrait::Expression& expr,
       expr.DebugString());
 }
 
+namespace {
+struct UserDefinedLiteralToArrow {
+  Status Visit(const DataType& type) {
+    return Status::NotImplemented("User defined literals of type ", type);
+  }
+  Status Visit(const IntegerType& type) {
+    google::protobuf::UInt64Value value;
+    if (!user_defined_->value().UnpackTo(&value)) {
+      return Status::Invalid(
+          "Failed to unpack user defined integer literal to UInt64Value");
+    }
+    ARROW_ASSIGN_OR_RAISE(scalar_, MakeScalar(type.GetSharedPtr(), value.value()));
+    return Status::OK();
+  }
+  Status Visit(const Time32Type& type) {
+    google::protobuf::Int32Value value;
+    if (!user_defined_->value().UnpackTo(&value)) {
+      return Status::Invalid(
+          "Failed to unpack user defined time32 literal to Int32Value");
+    }
+    ARROW_ASSIGN_OR_RAISE(scalar_, MakeScalar(type.GetSharedPtr(), value.value()));
+    return Status::OK();
+  }
+  Status Visit(const Time64Type& type) {
+    google::protobuf::Int64Value value;
+    if (!user_defined_->value().UnpackTo(&value)) {
+      return Status::Invalid(
+          "Failed to unpack user defined time64 literal to Int64Value");
+    }
+    ARROW_ASSIGN_OR_RAISE(scalar_, MakeScalar(type.GetSharedPtr(), value.value()));
+    return Status::OK();
+  }
+  Status Visit(const Date64Type& type) {
+    google::protobuf::Int64Value value;
+    if (!user_defined_->value().UnpackTo(&value)) {
+      return Status::Invalid(
+          "Failed to unpack user defined date64 literal to Int64Value");
+    }
+    ARROW_ASSIGN_OR_RAISE(scalar_, MakeScalar(type.GetSharedPtr(), value.value()));
+    return Status::OK();
+  }
+  Status Visit(const HalfFloatType& type) {
+    google::protobuf::UInt32Value value;
+    if (!user_defined_->value().UnpackTo(&value)) {
+      return Status::Invalid(
+          "Failed to unpack user defined half_float literal to UInt32Value");
+    }
+    uint16_t half_float_value = value.value();
+    ARROW_ASSIGN_OR_RAISE(scalar_, MakeScalar(type.GetSharedPtr(), half_float_value));
+    return Status::OK();
+  }
+  Status Visit(const LargeStringType& type) {
+    google::protobuf::StringValue value;
+    if (!user_defined_->value().UnpackTo(&value)) {
+      return Status::Invalid(
+          "Failed to unpack user defined large_string literal to StringValue");
+    }
+    ARROW_ASSIGN_OR_RAISE(scalar_,
+                          MakeScalar(type.GetSharedPtr(), std::string(value.value())));
+    return Status::OK();
+  }
+  Status Visit(const LargeBinaryType& type) {
+    google::protobuf::BytesValue value;
+    if (!user_defined_->value().UnpackTo(&value)) {
+      return Status::Invalid(
+          "Failed to unpack user defined large_binary literal to BytesValue");
+    }
+    ARROW_ASSIGN_OR_RAISE(scalar_,
+                          MakeScalar(type.GetSharedPtr(), std::string(value.value())));
+    return Status::OK();
+  }
+  Status operator()(const DataType& type) { return VisitTypeInline(type, this); }
+
+  std::shared_ptr<Scalar> scalar_;
+  const substrait::Expression::Literal::UserDefined* user_defined_;
+  const ExtensionSet* ext_set_;
+  const ConversionOptions& conversion_options_;
+};
+}  // namespace
+
 Result<Datum> FromProto(const substrait::Expression::Literal& lit,
                         const ExtensionSet& ext_set,
                         const ConversionOptions& conversion_options) {
@@ -455,6 +541,7 @@ Result<Datum> FromProto(const substrait::Expression::Literal& lit,
     case substrait::Expression::Literal::kBinary:
       return Datum(BinaryScalar(lit.binary()));
 
+      ARROW_SUPPRESS_DEPRECATION_WARNING
     case substrait::Expression::Literal::kTimestamp:
       return Datum(
           TimestampScalar(static_cast<int64_t>(lit.timestamp()), TimeUnit::MICRO));
@@ -462,7 +549,17 @@ Result<Datum> FromProto(const substrait::Expression::Literal& lit,
     case substrait::Expression::Literal::kTimestampTz:
       return Datum(TimestampScalar(static_cast<int64_t>(lit.timestamp_tz()),
                                    TimeUnit::MICRO, TimestampTzTimezoneString()));
-
+      ARROW_UNSUPPRESS_DEPRECATION_WARNING
+    case substrait::Expression::Literal::kPrecisionTimestamp: {
+      // https://github.com/substrait-io/substrait/issues/611
+      // TODO(GH-40741) don't break, return precision timestamp
+      break;
+    }
+    case substrait::Expression::Literal::kPrecisionTimestampTz: {
+      // https://github.com/substrait-io/substrait/issues/611
+      // TODO(GH-40741) don't break, return precision timestamp
+      break;
+    }
     case substrait::Expression::Literal::kDate:
       return Datum(Date32Scalar(lit.date()));
     case substrait::Expression::Literal::kTime:
@@ -674,18 +771,30 @@ Result<Datum> FromProto(const substrait::Expression::Literal& lit,
       return Datum(MakeNullScalar(std::move(type_nullable.first)));
     }
 
+    case substrait::Expression::Literal::kUserDefined: {
+      const auto& user_defined = lit.user_defined();
+      ARROW_ASSIGN_OR_RAISE(auto type_record,
+                            ext_set.DecodeType(user_defined.type_reference()));
+      UserDefinedLiteralToArrow visitor{nullptr, &user_defined, &ext_set,
+                                        conversion_options};
+      ARROW_RETURN_NOT_OK((visitor)(*type_record.type));
+      return Datum(std::move(visitor.scalar_));
+    }
+
+    case substrait::Expression::Literal::LITERAL_TYPE_NOT_SET:
+      return Status::Invalid("substrait literal did not have any literal type set");
+
     default:
       break;
   }
 
-  return Status::NotImplemented("conversion to arrow::Datum from Substrait literal ",
-                                lit.DebugString());
+  return Status::NotImplemented("conversion to arrow::Datum from Substrait literal `",
+                                lit.DebugString(), "`");
 }
 
 namespace {
-struct ScalarToProtoImpl {
-  Status Visit(const NullScalar& s) { return NotImplemented(s); }
 
+struct ScalarToProtoImpl {
   using Lit = substrait::Expression::Literal;
 
   template <typename Arg, typename PrimitiveScalar>
@@ -702,6 +811,25 @@ struct ScalarToProtoImpl {
     return Status::OK();
   }
 
+  Status EncodeUserDefined(const DataType& data_type,
+                           const google::protobuf::Message& value) {
+    ARROW_ASSIGN_OR_RAISE(auto anchor, ext_set_->EncodeType(data_type));
+    auto user_defined = std::make_unique<Lit::UserDefined>();
+    user_defined->set_type_reference(anchor);
+    auto value_any = std::make_unique<google::protobuf::Any>();
+    value_any->PackFrom(value);
+    user_defined->set_allocated_value(value_any.release());
+    lit_->set_allocated_user_defined(user_defined.release());
+    return Status::OK();
+  }
+
+  Status Visit(const NullScalar& s) {
+    ARROW_ASSIGN_OR_RAISE(auto anchor, ext_set_->EncodeType(*s.type));
+    auto user_defined = std::make_unique<Lit::UserDefined>();
+    user_defined->set_type_reference(anchor);
+    lit_->set_allocated_user_defined(user_defined.release());
+    return Status::OK();
+  }
   Status Visit(const BooleanScalar& s) { return Primitive(&Lit::set_boolean, s); }
 
   Status Visit(const Int8Scalar& s) { return Primitive(&Lit::set_i8, s); }
@@ -709,12 +837,31 @@ struct ScalarToProtoImpl {
   Status Visit(const Int32Scalar& s) { return Primitive(&Lit::set_i32, s); }
   Status Visit(const Int64Scalar& s) { return Primitive(&Lit::set_i64, s); }
 
-  Status Visit(const UInt8Scalar& s) { return NotImplemented(s); }
-  Status Visit(const UInt16Scalar& s) { return NotImplemented(s); }
-  Status Visit(const UInt32Scalar& s) { return NotImplemented(s); }
-  Status Visit(const UInt64Scalar& s) { return NotImplemented(s); }
-
-  Status Visit(const HalfFloatScalar& s) { return NotImplemented(s); }
+  Status Visit(const UInt8Scalar& s) {
+    google::protobuf::UInt64Value value;
+    value.set_value(s.value);
+    return EncodeUserDefined(*s.type, value);
+  }
+  Status Visit(const UInt16Scalar& s) {
+    google::protobuf::UInt64Value value;
+    value.set_value(s.value);
+    return EncodeUserDefined(*s.type, value);
+  }
+  Status Visit(const UInt32Scalar& s) {
+    google::protobuf::UInt64Value value;
+    value.set_value(s.value);
+    return EncodeUserDefined(*s.type, value);
+  }
+  Status Visit(const UInt64Scalar& s) {
+    google::protobuf::UInt64Value value;
+    value.set_value(s.value);
+    return EncodeUserDefined(*s.type, value);
+  }
+  Status Visit(const HalfFloatScalar& s) {
+    google::protobuf::UInt32Value value;
+    value.set_value(s.value);
+    return EncodeUserDefined(*s.type, value);
+  }
   Status Visit(const FloatScalar& s) { return Primitive(&Lit::set_fp32, s); }
   Status Visit(const DoubleScalar& s) { return Primitive(&Lit::set_fp64, s); }
 
@@ -722,12 +869,18 @@ struct ScalarToProtoImpl {
     return FromBuffer([](Lit* lit, std::string&& s) { lit->set_string(std::move(s)); },
                       s);
   }
+  Status Visit(const StringViewScalar& s) {
+    return FromBuffer([](Lit* lit, std::string&& s) { lit->set_string(std::move(s)); },
+                      s);
+  }
   Status Visit(const BinaryScalar& s) {
     return FromBuffer([](Lit* lit, std::string&& s) { lit->set_binary(std::move(s)); },
                       s);
   }
-
-  Status Visit(const BinaryViewScalar& s) { return NotImplemented(s); }
+  Status Visit(const BinaryViewScalar& s) {
+    return FromBuffer([](Lit* lit, std::string&& s) { lit->set_binary(std::move(s)); },
+                      s);
+  }
 
   Status Visit(const FixedSizeBinaryScalar& s) {
     return FromBuffer(
@@ -735,28 +888,64 @@ struct ScalarToProtoImpl {
   }
 
   Status Visit(const Date32Scalar& s) { return Primitive(&Lit::set_date, s); }
-  Status Visit(const Date64Scalar& s) { return NotImplemented(s); }
+  Status Visit(const Date64Scalar& s) {
+    google::protobuf::Int64Value value;
+    value.set_value(s.value);
+    return EncodeUserDefined(*s.type, value);
+  }
 
   Status Visit(const TimestampScalar& s) {
     const auto& t = checked_cast<const TimestampType&>(*s.type);
 
-    if (t.unit() != TimeUnit::MICRO) return NotImplemented(s);
+    uint64_t micros;
+    switch (t.unit()) {
+      case TimeUnit::SECOND:
+        micros = s.value * kMicrosPerSecond;
+        break;
+      case TimeUnit::MILLI:
+        micros = s.value * kMicrosPerMilli;
+        break;
+      case TimeUnit::MICRO:
+        micros = s.value;
+        break;
+      case TimeUnit::NANO:
+        // TODO(GH-40741): can support nanos when
+        // https://github.com/substrait-io/substrait/issues/611 is resolved
+        return NotImplemented(s);
+      default:
+        return NotImplemented(s);
+    }
 
-    if (t.timezone() == "") return Primitive(&Lit::set_timestamp, s);
+    // Remove these and use precision timestamp once
+    // https://github.com/substrait-io/substrait/issues/611 is resolved
+    ARROW_SUPPRESS_DEPRECATION_WARNING
 
-    if (t.timezone() == TimestampTzTimezoneString()) {
-      return Primitive(&Lit::set_timestamp_tz, s);
+    if (t.timezone() == "") {
+      lit_->set_timestamp(micros);
+    } else {
+      // Some loss of info here, Substrait doesn't store timezone
+      // in field data
+      lit_->set_timestamp_tz(micros);
     }
+    ARROW_UNSUPPRESS_DEPRECATION_WARNING
 
-    return NotImplemented(s);
+    return Status::OK();
   }
 
-  Status Visit(const Time32Scalar& s) { return NotImplemented(s); }
+  // Need to support parameterized UDTs
+  Status Visit(const Time32Scalar& s) {
+    google::protobuf::Int32Value value;
+    value.set_value(s.value);
+    return EncodeUserDefined(*s.type, value);
+  }
   Status Visit(const Time64Scalar& s) {
-    if (checked_cast<const Time64Type&>(*s.type).unit() != TimeUnit::MICRO) {
-      return NotImplemented(s);
+    if (checked_cast<const Time64Type&>(*s.type).unit() == TimeUnit::MICRO) {
+      return Primitive(&Lit::set_time, s);
+    } else {
+      google::protobuf::Int64Value value;
+      value.set_value(s.value);
+      return EncodeUserDefined(*s.type, value);
     }
-    return Primitive(&Lit::set_time, s);
   }
 
   Status Visit(const MonthIntervalScalar& s) { return NotImplemented(s); }
@@ -778,9 +967,10 @@ struct ScalarToProtoImpl {
     return Status::OK();
   }
 
+  // Need support for parameterized UDTs
   Status Visit(const Decimal256Scalar& s) { return NotImplemented(s); }
 
-  Status Visit(const ListScalar& s) {
+  Status Visit(const BaseListScalar& s) {
     if (s.value->length() == 0) {
       ARROW_ASSIGN_OR_RAISE(auto list_type, ToProto(*s.type, /*nullable=*/true, ext_set_,
                                                     conversion_options_));
@@ -807,10 +997,6 @@ struct ScalarToProtoImpl {
     return Status::OK();
   }
 
-  Status Visit(const ListViewScalar& s) {
-    return Status::NotImplemented("list-view to proto");
-  }
-
   Status Visit(const LargeListViewScalar& s) {
     return Status::NotImplemented("list-view to proto");
   }
@@ -830,7 +1016,10 @@ struct ScalarToProtoImpl {
 
   Status Visit(const SparseUnionScalar& s) { return NotImplemented(s); }
   Status Visit(const DenseUnionScalar& s) { return NotImplemented(s); }
-  Status Visit(const DictionaryScalar& s) { return NotImplemented(s); }
+  Status Visit(const DictionaryScalar& s) {
+    ARROW_ASSIGN_OR_RAISE(auto encoded, s.GetEncodedValue());
+    return (*this)(*encoded);
+  }
 
   Status Visit(const MapScalar& s) {
     if (s.value->length() == 0) {
@@ -914,10 +1103,21 @@ struct ScalarToProtoImpl {
     return NotImplemented(s);
   }
 
+  // Need support for parameterized UDTs
   Status Visit(const FixedSizeListScalar& s) { return NotImplemented(s); }
   Status Visit(const DurationScalar& s) { return NotImplemented(s); }
-  Status Visit(const LargeStringScalar& s) { return NotImplemented(s); }
-  Status Visit(const LargeBinaryScalar& s) { return NotImplemented(s); }
+
+  Status Visit(const LargeStringScalar& s) {
+    google::protobuf::StringValue value;
+    value.set_value(s.view().data(), s.view().size());
+    return EncodeUserDefined(*s.type, value);
+  }
+  Status Visit(const LargeBinaryScalar& s) {
+    google::protobuf::BytesValue value;
+    value.set_value(s.view().data(), s.view().size());
+    return EncodeUserDefined(*s.type, value);
+  }
+  // Need support for parameterized UDTs
   Status Visit(const LargeListScalar& s) { return NotImplemented(s); }
   Status Visit(const MonthDayNanoIntervalScalar& s) { return NotImplemented(s); }
 
@@ -953,7 +1153,7 @@ Result<std::unique_ptr<substrait::Expression::Literal>> ToProto(
     out->set_allocated_null(type.release());
   }
 
-  return std::move(out);
+  return out;
 }
 
 static Status AddChildToReferenceSegment(
@@ -1026,7 +1226,7 @@ static Result<std::unique_ptr<substrait::Expression>> MakeDirectReference(
 
   auto out = std::make_unique<substrait::Expression>();
   out->set_allocated_selection(selection.release());
-  return std::move(out);
+  return out;
 }
 
 // Indexes the given Substrait struct-typed expression or root (if expr is empty) using
@@ -1092,7 +1292,7 @@ Result<std::unique_ptr<substrait::Expression::ScalarFunction>> EncodeSubstraitCa
     }
   }
 
-  return std::move(scalar_fn);
+  return scalar_fn;
 }
 
 Result<std::vector<std::unique_ptr<substrait::Expression>>> DatumToLiterals(
@@ -1156,7 +1356,7 @@ Result<std::unique_ptr<substrait::Expression>> ToProto(
   if (auto datum = expr.literal()) {
     ARROW_ASSIGN_OR_RAISE(auto literal, ToProto(*datum, ext_set, conversion_options));
     out->set_allocated_literal(literal.release());
-    return std::move(out);
+    return out;
   }
 
   if (auto param = expr.parameter()) {
@@ -1167,7 +1367,7 @@ Result<std::unique_ptr<substrait::Expression>> ToProto(
       ARROW_ASSIGN_OR_RAISE(out, MakeStructFieldReference(std::move(out), index));
     }
 
-    return std::move(out);
+    return out;
   }
 
   auto call = CallNotNull(expr);
@@ -1199,7 +1399,7 @@ Result<std::unique_ptr<substrait::Expression>> ToProto(
       if_then_->set_allocated_else_(arguments.back().release());
 
       out->set_allocated_if_then(if_then_.release());
-      return std::move(out);
+      return out;
     }
   }
 
@@ -1223,7 +1423,7 @@ Result<std::unique_ptr<substrait::Expression>> ToProto(
     for (int index : field_path.indices()) {
       ARROW_ASSIGN_OR_RAISE(out, MakeStructFieldReference(std::move(out), index));
     }
-    return std::move(out);
+    return out;
   }
 
   if (call->function_name == "list_element") {
@@ -1249,7 +1449,7 @@ Result<std::unique_ptr<substrait::Expression>> ToProto(
     if_then->set_allocated_else_(arguments[2].release());
 
     out->set_allocated_if_then(if_then.release());
-    return std::move(out);
+    return out;
   } else if (call->function_name == "cast") {
     auto cast = std::make_unique<substrait::Expression::Cast>();
 
@@ -1278,7 +1478,7 @@ Result<std::unique_ptr<substrait::Expression>> ToProto(
     cast->set_allocated_type(to_type.release());
 
     out->set_allocated_cast(cast.release());
-    return std::move(out);
+    return out;
   } else if (call->function_name == "is_in") {
     auto or_list = std::make_unique<substrait::Expression::SingularOrList>();
 
@@ -1299,7 +1499,7 @@ Result<std::unique_ptr<substrait::Expression>> ToProto(
       or_list->mutable_options()->AddAllocated(option.release());
     }
     out->set_allocated_singular_or_list(or_list.release());
-    return std::move(out);
+    return out;
   }
 
   // other expression types dive into extensions immediately
@@ -1334,7 +1534,7 @@ Result<std::unique_ptr<substrait::Expression>> ToProto(
     return maybe_converter.status();
   }
   out->set_allocated_scalar_function(scalar_fn.release());
-  return std::move(out);
+  return out;
 }
 
 }  // namespace engine
diff --git a/cpp/src/arrow/engine/substrait/extended_expression_internal.cc b/cpp/src/arrow/engine/substrait/extended_expression_internal.cc
index 225901c910f25..e2e6d934372dc 100644
--- a/cpp/src/arrow/engine/substrait/extended_expression_internal.cc
+++ b/cpp/src/arrow/engine/substrait/extended_expression_internal.cc
@@ -143,7 +143,7 @@ Result<std::unique_ptr<substrait::ExpressionReference>> CreateExpressionReferenc
   ARROW_ASSIGN_OR_RAISE(std::unique_ptr<substrait::Expression> expression,
                         ToProto(expr, ext_set, conversion_options));
   expr_ref->set_allocated_expression(expression.release());
-  return std::move(expr_ref);
+  return expr_ref;
 }
 
 }  // namespace
@@ -178,7 +178,7 @@ Result<BoundExpressions> FromProto(const substrait::ExtendedExpression& expressi
     *ext_set_out = std::move(ext_set);
   }
 
-  return std::move(bound_expressions);
+  return bound_expressions;
 }
 
 Result<std::unique_ptr<substrait::ExtendedExpression>> ToProto(
@@ -203,7 +203,7 @@ Result<std::unique_ptr<substrait::ExtendedExpression>> ToProto(
     expression->mutable_referred_expr()->AddAllocated(expr_ref.release());
   }
   RETURN_NOT_OK(AddExtensionSetToExtendedExpression(*ext_set, expression.get()));
-  return std::move(expression);
+  return expression;
 }
 
 }  // namespace engine
diff --git a/cpp/src/arrow/engine/substrait/extension_set.cc b/cpp/src/arrow/engine/substrait/extension_set.cc
index b0dd6aeffbcfa..cefe53d2847ca 100644
--- a/cpp/src/arrow/engine/substrait/extension_set.cc
+++ b/cpp/src/arrow/engine/substrait/extension_set.cc
@@ -288,7 +288,7 @@ Result<ExtensionSet> ExtensionSet::Make(
     }
   }
 
-  return std::move(set);
+  return set;
 }
 
 Result<ExtensionSet::TypeRecord> ExtensionSet::DecodeType(uint32_t anchor) const {
@@ -799,7 +799,7 @@ Result<std::vector<compute::Expression>> GetValueArgs(const SubstraitCall& call,
     ARROW_ASSIGN_OR_RAISE(compute::Expression arg, call.GetValueArg(index));
     expressions.push_back(arg);
   }
-  return std::move(expressions);
+  return expressions;
 }
 
 ExtensionIdRegistry::SubstraitCallToArrow DecodeOptionlessOverflowableArithmetic(
@@ -874,7 +874,7 @@ ExtensionIdRegistry::ArrowToSubstraitCall EncodeOptionlessOverflowableArithmetic
         for (std::size_t i = 0; i < call.arguments.size(); i++) {
           substrait_call.SetValueArg(static_cast<int>(i), call.arguments[i]);
         }
-        return std::move(substrait_call);
+        return substrait_call;
       };
 }
 
@@ -887,7 +887,7 @@ ExtensionIdRegistry::ArrowToSubstraitCall EncodeBasic(Id substrait_fn_id) {
         for (std::size_t i = 0; i < call.arguments.size(); i++) {
           substrait_call.SetValueArg(static_cast<int>(i), call.arguments[i]);
         }
-        return std::move(substrait_call);
+        return substrait_call;
       };
 }
 
@@ -907,7 +907,7 @@ ExtensionIdRegistry::ArrowToSubstraitCall EncodeIsNull(Id substrait_fn_id) {
         for (std::size_t i = 0; i < call.arguments.size(); i++) {
           substrait_call.SetValueArg(static_cast<int>(i), call.arguments[i]);
         }
-        return std::move(substrait_call);
+        return substrait_call;
       };
 }
 
@@ -1035,7 +1035,7 @@ struct DefaultExtensionIdRegistry : ExtensionIdRegistryImpl {
     };
 
     // The type (variation) mappings listed below need to be kept in sync
-    // with the YAML at substrait/format/extension_types.yaml manually;
+    // with the YAML at format/substrait/extension_types.yaml manually;
     // see ARROW-15535.
     for (TypeName e : {
              TypeName{uint8(), "u8"},
@@ -1043,6 +1043,12 @@ struct DefaultExtensionIdRegistry : ExtensionIdRegistryImpl {
              TypeName{uint32(), "u32"},
              TypeName{uint64(), "u64"},
              TypeName{float16(), "fp16"},
+             TypeName{large_utf8(), "large_string"},
+             TypeName{large_binary(), "large_binary"},
+             TypeName{time32(TimeUnit::SECOND), "time_seconds"},
+             TypeName{time32(TimeUnit::MILLI), "time_millis"},
+             TypeName{date64(), "date_millis"},
+             TypeName{time64(TimeUnit::NANO), "time_nanos"},
          }) {
       DCHECK_OK(RegisterType({kArrowExtTypesUri, e.name}, std::move(e.type)));
     }
diff --git a/cpp/src/arrow/engine/substrait/extension_set.h b/cpp/src/arrow/engine/substrait/extension_set.h
index 0a502960447e6..c18e0cf77aae5 100644
--- a/cpp/src/arrow/engine/substrait/extension_set.h
+++ b/cpp/src/arrow/engine/substrait/extension_set.h
@@ -295,6 +295,10 @@ class ARROW_ENGINE_EXPORT ExtensionIdRegistry {
 constexpr std::string_view kArrowExtTypesUri =
     "https://github.com/apache/arrow/blob/main/format/substrait/"
     "extension_types.yaml";
+// Extension types that don't match 1:1 with a data type (or the data type is
+// parameterized)
+constexpr std::string_view kTimeNanosTypeName = "time_nanos";
+constexpr Id kTimeNanosId = {kArrowExtTypesUri, kTimeNanosTypeName};
 
 /// A default registry with all supported functions and data types registered
 ///
diff --git a/cpp/src/arrow/engine/substrait/extension_types.cc b/cpp/src/arrow/engine/substrait/extension_types.cc
index fcc722e9d9410..f71b5f7185d00 100644
--- a/cpp/src/arrow/engine/substrait/extension_types.cc
+++ b/cpp/src/arrow/engine/substrait/extension_types.cc
@@ -22,6 +22,7 @@
 #include <string_view>
 
 #include "arrow/engine/simple_extension_type_internal.h"
+#include "arrow/engine/substrait/type_internal.h"
 #include "arrow/result.h"
 #include "arrow/type_fwd.h"
 #include "arrow/util/reflection_internal.h"
@@ -113,6 +114,36 @@ std::shared_ptr<DataType> interval_year() { return IntervalYearType::Make({}); }
 
 std::shared_ptr<DataType> interval_day() { return IntervalDayType::Make({}); }
 
+Result<std::shared_ptr<DataType>> precision_timestamp(int precision) {
+  switch (precision) {
+    case 0:
+      return timestamp(TimeUnit::SECOND);
+    case 3:
+      return timestamp(TimeUnit::MILLI);
+    case 6:
+      return timestamp(TimeUnit::MICRO);
+    case 9:
+      return timestamp(TimeUnit::NANO);
+    default:
+      return Status::NotImplemented("Unrecognized timestamp precision (", precision, ")");
+  }
+}
+
+Result<std::shared_ptr<DataType>> precision_timestamp_tz(int precision) {
+  switch (precision) {
+    case 0:
+      return timestamp(TimeUnit::SECOND, TimestampTzTimezoneString());
+    case 3:
+      return timestamp(TimeUnit::MILLI, TimestampTzTimezoneString());
+    case 6:
+      return timestamp(TimeUnit::MICRO, TimestampTzTimezoneString());
+    case 9:
+      return timestamp(TimeUnit::NANO, TimestampTzTimezoneString());
+    default:
+      return Status::NotImplemented("Unrecognized timestamp precision (", precision, ")");
+  }
+}
+
 bool UnwrapUuid(const DataType& t) {
   if (UuidType::GetIf(t)) {
     return true;
diff --git a/cpp/src/arrow/engine/substrait/extension_types.h b/cpp/src/arrow/engine/substrait/extension_types.h
index 28a4898a878d7..ae71ad83f7e54 100644
--- a/cpp/src/arrow/engine/substrait/extension_types.h
+++ b/cpp/src/arrow/engine/substrait/extension_types.h
@@ -56,6 +56,16 @@ std::shared_ptr<DataType> interval_year();
 ARROW_ENGINE_EXPORT
 std::shared_ptr<DataType> interval_day();
 
+/// constructs the appropriate timestamp type given the precision
+/// no time zone
+ARROW_ENGINE_EXPORT
+Result<std::shared_ptr<DataType>> precision_timestamp(int precision);
+
+/// constructs the appropriate timestamp type given the precision
+/// and the UTC time zone
+ARROW_ENGINE_EXPORT
+Result<std::shared_ptr<DataType>> precision_timestamp_tz(int precision);
+
 /// Return true if t is Uuid, otherwise false
 ARROW_ENGINE_EXPORT
 bool UnwrapUuid(const DataType&);
diff --git a/cpp/src/arrow/engine/substrait/plan_internal.cc b/cpp/src/arrow/engine/substrait/plan_internal.cc
index cc4806878c404..4473b0443eb19 100644
--- a/cpp/src/arrow/engine/substrait/plan_internal.cc
+++ b/cpp/src/arrow/engine/substrait/plan_internal.cc
@@ -65,7 +65,7 @@ Result<std::unique_ptr<substrait::Plan>> PlanToProto(
   plan_rel->set_allocated_root(rel_root.release());
   subs_plan->mutable_relations()->AddAllocated(plan_rel.release());
   RETURN_NOT_OK(AddExtensionSetToPlan(*ext_set, subs_plan.get()));
-  return std::move(subs_plan);
+  return subs_plan;
 }
 
 }  // namespace engine
diff --git a/cpp/src/arrow/engine/substrait/relation_internal.cc b/cpp/src/arrow/engine/substrait/relation_internal.cc
index f15f1a5527b7b..6a25bd89f0128 100644
--- a/cpp/src/arrow/engine/substrait/relation_internal.cc
+++ b/cpp/src/arrow/engine/substrait/relation_internal.cc
@@ -91,7 +91,7 @@ Result<EmitInfo> GetEmitInfo(const RelMessage& rel,
   }
   emit_info.expressions = std::move(proj_field_refs);
   emit_info.schema = schema(std::move(emit_fields));
-  return std::move(emit_info);
+  return emit_info;
 }
 
 Result<DeclarationInfo> ProcessEmitProject(
@@ -393,6 +393,7 @@ Result<DeclarationInfo> FromProto(const substrait::Rel& rel, const ExtensionSet&
 
       auto scan_options = std::make_shared<dataset::ScanOptions>();
       scan_options->use_threads = true;
+      scan_options->add_augmented_fields = false;
 
       if (read.has_filter()) {
         ARROW_ASSIGN_OR_RAISE(scan_options->filter,
@@ -1023,7 +1024,7 @@ Result<std::unique_ptr<substrait::ReadRel>> NamedTableRelationConverter(
   }
   read_rel->set_allocated_named_table(read_rel_tn.release());
 
-  return std::move(read_rel);
+  return read_rel;
 }
 
 Result<std::unique_ptr<substrait::ReadRel>> ScanRelationConverter(
@@ -1067,7 +1068,7 @@ Result<std::unique_ptr<substrait::ReadRel>> ScanRelationConverter(
     read_rel_lfs->mutable_items()->AddAllocated(read_rel_lfs_ffs.release());
   }
   read_rel->set_allocated_local_files(read_rel_lfs.release());
-  return std::move(read_rel);
+  return read_rel;
 }
 
 Result<std::unique_ptr<substrait::FilterRel>> FilterRelationConverter(
@@ -1096,7 +1097,7 @@ Result<std::unique_ptr<substrait::FilterRel>> FilterRelationConverter(
   ARROW_ASSIGN_OR_RAISE(auto subs_expr,
                         ToProto(bound_expression, ext_set, conversion_options));
   filter_rel->set_allocated_condition(subs_expr.release());
-  return std::move(filter_rel);
+  return filter_rel;
 }
 
 }  // namespace
@@ -1145,7 +1146,7 @@ Result<std::unique_ptr<substrait::Rel>> ToProto(
     const ConversionOptions& conversion_options) {
   auto rel = std::make_unique<substrait::Rel>();
   RETURN_NOT_OK(SerializeAndCombineRelations(declr, ext_set, &rel, conversion_options));
-  return std::move(rel);
+  return rel;
 }
 
 }  // namespace engine
diff --git a/cpp/src/arrow/engine/substrait/serde.cc b/cpp/src/arrow/engine/substrait/serde.cc
index 9e670f121778e..16d2ace4ac0d7 100644
--- a/cpp/src/arrow/engine/substrait/serde.cc
+++ b/cpp/src/arrow/engine/substrait/serde.cc
@@ -256,7 +256,7 @@ Result<std::shared_ptr<acero::ExecPlan>> MakeSingleDeclarationPlan(
   } else {
     ARROW_ASSIGN_OR_RAISE(auto plan, acero::ExecPlan::Make());
     ARROW_RETURN_NOT_OK(declarations[0].AddToPlan(plan.get()));
-    return std::move(plan);
+    return plan;
   }
 }
 
diff --git a/cpp/src/arrow/engine/substrait/serde_test.cc b/cpp/src/arrow/engine/substrait/serde_test.cc
index 1e771ccdd25c2..6762d1e045450 100644
--- a/cpp/src/arrow/engine/substrait/serde_test.cc
+++ b/cpp/src/arrow/engine/substrait/serde_test.cc
@@ -54,6 +54,7 @@
 #include "arrow/engine/substrait/options.h"
 #include "arrow/engine/substrait/serde.h"
 #include "arrow/engine/substrait/test_util.h"
+#include "arrow/engine/substrait/type_internal.h"
 #include "arrow/engine/substrait/util.h"
 #include "arrow/filesystem/filesystem.h"
 #include "arrow/filesystem/localfs.h"
@@ -299,6 +300,8 @@ TEST(Substrait, SupportedTypes) {
            map(utf8(), field("", utf8()), false));
 }
 
+// These types don't exist in Substrait.  However, we have user defined types
+// defined for them and they should be able to round-trip
 TEST(Substrait, SupportedExtensionTypes) {
   ExtensionSet ext_set;
 
@@ -308,6 +311,12 @@ TEST(Substrait, SupportedExtensionTypes) {
            uint16(),
            uint32(),
            uint64(),
+           large_utf8(),
+           large_binary(),
+           date64(),
+           time32(TimeUnit::SECOND),
+           time32(TimeUnit::MILLI),
+           time64(TimeUnit::NANO),
        }) {
     auto anchor = ext_set.num_types();
 
@@ -332,6 +341,53 @@ TEST(Substrait, SupportedExtensionTypes) {
   }
 }
 
+// Encodings are not considered distinct types in Substrait.  The encoding information
+// is lost during a round-trip.
+TEST(Substrait, OneWayTypes) {
+  ExtensionSet ext_set;
+
+  for (auto [source_type, return_type] :
+       {std::pair{binary_view(), binary()},
+        {utf8_view(), utf8()},
+        {dictionary(int32(), utf8()), utf8()},
+        {run_end_encoded(int32(), int32()), int32()},
+        {dictionary(int32(), dictionary(int32(), utf8())), utf8()}}) {
+    ASSERT_OK_AND_ASSIGN(auto substrait_type, SerializeType(*source_type, &ext_set, {}));
+
+    ASSERT_OK_AND_ASSIGN(auto actual_return,
+                         DeserializeType(*substrait_type, ext_set, {}));
+
+    EXPECT_EQ(*actual_return, *return_type);
+  }
+}
+
+// Substrait does not store the time zone as part of the type.  That information is stored
+// on the function instead.  As a result, that information is lost on a round-trip.
+TEST(Substrait, TimestampTypes) {
+  ExtensionSet ext_set;
+
+  for (auto time_unit :
+       {TimeUnit::NANO, TimeUnit::MICRO, TimeUnit::MILLI, TimeUnit::SECOND}) {
+    for (auto time_zone : {"UTC", "America/New_York"}) {
+      auto input_type = timestamp(time_unit, time_zone);
+      ASSERT_OK_AND_ASSIGN(auto substrait_type, SerializeType(*input_type, &ext_set, {}));
+
+      auto expected_return = timestamp(time_unit, TimestampTzTimezoneString());
+      ASSERT_OK_AND_ASSIGN(auto actual_return,
+                           DeserializeType(*substrait_type, ext_set, {}));
+
+      EXPECT_EQ(*actual_return, *expected_return);
+    }
+    auto input_type = timestamp(time_unit);
+    ASSERT_OK_AND_ASSIGN(auto substrait_type, SerializeType(*input_type, &ext_set, {}));
+
+    ASSERT_OK_AND_ASSIGN(auto actual_return,
+                         DeserializeType(*substrait_type, ext_set, {}));
+
+    EXPECT_EQ(*actual_return, *input_type);
+  }
+}
+
 TEST(Substrait, NamedStruct) {
   ExtensionSet ext_set;
 
@@ -415,26 +471,11 @@ TEST(Substrait, NoEquivalentArrowType) {
 
 TEST(Substrait, NoEquivalentSubstraitType) {
   for (auto type : {
-           date64(),
-           timestamp(TimeUnit::SECOND),
-           timestamp(TimeUnit::NANO),
-           timestamp(TimeUnit::MICRO, "New York"),
-           time32(TimeUnit::SECOND),
-           time32(TimeUnit::MILLI),
-           time64(TimeUnit::NANO),
-
            decimal256(76, 67),
-
            sparse_union({field("i8", int8()), field("f32", float32())}),
            dense_union({field("i8", int8()), field("f32", float32())}),
-           dictionary(int32(), utf8()),
-
            fixed_size_list(float16(), 3),
-
            duration(TimeUnit::MICRO),
-
-           large_utf8(),
-           large_binary(),
            large_list(utf8()),
        }) {
     ARROW_SCOPED_TRACE(type->ToString());
@@ -563,6 +604,56 @@ TEST(Substrait, SupportedLiterals) {
   }
 }
 
+template <typename ScalarType>
+void CheckArrowSpecificLiteral(ScalarType scalar) {
+  compute::Expression lit = compute::literal(scalar);
+  ExtensionSet ext_set;
+  ASSERT_OK_AND_ASSIGN(auto serialized, SerializeExpression(lit, &ext_set));
+  ASSERT_OK_AND_ASSIGN(auto roundtripped, DeserializeExpression(*serialized, ext_set));
+  ASSERT_EQ(lit, roundtripped);
+}
+
+TEST(Substrait, ArrowSpecificLiterals) {
+  CheckArrowSpecificLiteral(UInt8Scalar(7));
+  CheckArrowSpecificLiteral(UInt16Scalar(7));
+  CheckArrowSpecificLiteral(UInt32Scalar(7));
+  CheckArrowSpecificLiteral(UInt64Scalar(7));
+  CheckArrowSpecificLiteral(Date64Scalar(86400000));
+  CheckArrowSpecificLiteral(Time64Scalar(7, TimeUnit::NANO));
+  CheckArrowSpecificLiteral(Time32Scalar(7, TimeUnit::SECOND));
+  CheckArrowSpecificLiteral(Time32Scalar(7, TimeUnit::MILLI));
+  CheckArrowSpecificLiteral(Time32Scalar(7, TimeUnit::SECOND));
+  // We serialize as a signed integer, which doesn't make sense for Time scalars but
+  // Arrow supports it so we might as well round-trip it.
+  CheckArrowSpecificLiteral(Time32Scalar(-7, TimeUnit::MILLI));
+  CheckArrowSpecificLiteral(Time32Scalar(-7, TimeUnit::SECOND));
+  CheckArrowSpecificLiteral(Time64Scalar(-7, TimeUnit::NANO));
+  // Negative date scalars DO make sense and we should make sure they work
+  CheckArrowSpecificLiteral(Date64Scalar(-86400000));
+  CheckArrowSpecificLiteral(HalfFloatScalar(0));
+  CheckArrowSpecificLiteral(LargeStringScalar("hello"));
+  CheckArrowSpecificLiteral(LargeBinaryScalar("hello"));
+  CheckArrowSpecificLiteral(MakeNullScalar(null()));
+}
+
+template <typename SourceScalarType, typename DestScalarType>
+void CheckOneWayLiteral(SourceScalarType source, DestScalarType expected) {
+  compute::Expression lit = compute::literal(source);
+  ExtensionSet ext_set;
+  ASSERT_OK_AND_ASSIGN(auto serialized, SerializeExpression(lit, &ext_set));
+  ASSERT_OK_AND_ASSIGN(auto roundtripped, DeserializeExpression(*serialized, ext_set));
+  compute::Expression expected_lit = compute::literal(expected);
+  ASSERT_EQ(expected_lit, roundtripped);
+}
+
+TEST(Substrait, OneWayLiterals) {
+  CheckOneWayLiteral(StringViewScalar("test"), StringScalar("test"));
+  CheckOneWayLiteral(BinaryViewScalar("test"), BinaryScalar("test"));
+  CheckOneWayLiteral(RunEndEncodedScalar(std::make_shared<UInt32Scalar>(7),
+                                         run_end_encoded(int16(), uint32())),
+                     UInt32Scalar(7));
+}
+
 TEST(Substrait, CannotDeserializeLiteral) {
   ExtensionSet ext_set;
 
@@ -823,8 +914,8 @@ TEST(Substrait, Cast) {
   std::shared_ptr<compute::CastOptions> cast_opts =
       std::dynamic_pointer_cast<compute::CastOptions>(call_opts);
   ASSERT_TRUE(!!cast_opts);
-  // It is unclear whether a Substrait cast should be safe or not.  In the meantime we are
-  // assuming it is unsafe based on the behavior of many SQL engines.
+  // It is unclear whether a Substrait cast should be safe or not.  In the meantime we
+  // are assuming it is unsafe based on the behavior of many SQL engines.
   ASSERT_TRUE(cast_opts->allow_int_overflow);
   ASSERT_TRUE(cast_opts->allow_float_truncate);
   ASSERT_TRUE(cast_opts->allow_decimal_truncate);
@@ -973,6 +1064,86 @@ NamedTableProvider AlwaysProvideSameTable(std::shared_ptr<Table> table) {
   };
 }
 
+TEST(Substrait, ExecReadRelWithLocalFiles) {
+  ASSERT_OK_AND_ASSIGN(std::string dir_string,
+                       arrow::internal::GetEnvVar("PARQUET_TEST_DATA"));
+
+  std::string substrait_json = R"({
+    "relations": [
+    {
+      "root": {
+        "input": {
+          "read": {
+            "common": {
+              "direct": {}
+            },
+            "baseSchema": {
+              "names": [
+                "f32",
+                "f64"
+              ],
+              "struct": {
+                "types": [
+                  {
+                    "fp32": {
+                      "nullability": "NULLABILITY_REQUIRED"
+                    }
+                  },
+                  {
+                    "fp64": {
+                      "nullability": "NULLABILITY_REQUIRED"
+                    }
+                  }
+                ],
+                "nullability": "NULLABILITY_REQUIRED"
+              }
+            },
+            "localFiles": {
+              "items": [
+                {
+                  "uriFile": "file://[DIRECTORY_PLACEHOLDER]/byte_stream_split.zstd.parquet",
+                  "parquet": {}
+                }
+              ]
+            }
+          }
+        },
+        "names": [
+          "f32",
+          "f64"
+        ]
+      }
+    }
+    ],
+    "version": {
+    "minorNumber": 42,
+    "producer": "my-producer"
+    }
+  })";
+  const char* placeholder = "[DIRECTORY_PLACEHOLDER]";
+  substrait_json.replace(substrait_json.find(placeholder), strlen(placeholder),
+                         dir_string);
+
+  ASSERT_OK_AND_ASSIGN(auto buf,
+                       internal::SubstraitFromJSON("Plan", substrait_json,
+                                                   /*ignore_unknown_fields=*/false));
+
+  ASSERT_OK_AND_ASSIGN(auto declarations,
+                       DeserializePlans(*buf, acero::NullSinkNodeConsumer::Make));
+  ASSERT_EQ(declarations.size(), 1);
+  acero::Declaration* decl = &declarations[0];
+  ASSERT_EQ(decl->factory_name, "consuming_sink");
+  ASSERT_OK_AND_ASSIGN(auto plan, acero::ExecPlan::Make());
+  ASSERT_OK_AND_ASSIGN(auto sink_node, declarations[0].AddToPlan(plan.get()));
+  ASSERT_STREQ(sink_node->kind_name(), "ConsumingSinkNode");
+  ASSERT_EQ(sink_node->num_inputs(), 1);
+  auto& prev_node = sink_node->inputs()[0];
+  ASSERT_STREQ(prev_node->kind_name(), "SourceNode");
+
+  plan->StartProducing();
+  ASSERT_FINISHES_OK(plan->finished());
+}
+
 TEST(Substrait, RelWithHint) {
   ASSERT_OK_AND_ASSIGN(auto buf,
                        internal::SubstraitFromJSON("Rel", R"({
@@ -2352,6 +2523,7 @@ TEST(SubstraitRoundTrip, BasicPlanEndToEnd) {
 
   auto scan_options = std::make_shared<dataset::ScanOptions>();
   scan_options->projection = compute::project({}, {});
+  scan_options->add_augmented_fields = false;
   const std::string filter_col_left = "shared";
   const std::string filter_col_right = "distinct";
   auto comp_left_value = compute::field_ref(filter_col_left);
diff --git a/cpp/src/arrow/engine/substrait/type_internal.cc b/cpp/src/arrow/engine/substrait/type_internal.cc
index f4a2e6800eb49..b469f5fa0baab 100644
--- a/cpp/src/arrow/engine/substrait/type_internal.cc
+++ b/cpp/src/arrow/engine/substrait/type_internal.cc
@@ -34,8 +34,13 @@
 #include "arrow/status.h"
 #include "arrow/type.h"
 #include "arrow/type_fwd.h"
+#include "arrow/type_traits.h"
+#include "arrow/util/checked_cast.h"
+#include "arrow/util/unreachable.h"
 #include "arrow/visit_type_inline.h"
 
+using arrow::internal::checked_cast;
+
 namespace arrow {
 namespace engine {
 
@@ -121,11 +126,24 @@ Result<std::pair<std::shared_ptr<DataType>, bool>> FromProto(
     case substrait::Type::kBinary:
       return FromProtoImpl<BinaryType>(type.binary());
 
+      ARROW_SUPPRESS_DEPRECATION_WARNING
     case substrait::Type::kTimestamp:
       return FromProtoImpl<TimestampType>(type.timestamp(), TimeUnit::MICRO);
     case substrait::Type::kTimestampTz:
       return FromProtoImpl<TimestampType>(type.timestamp_tz(), TimeUnit::MICRO,
                                           TimestampTzTimezoneString());
+      ARROW_UNSUPPRESS_DEPRECATION_WARNING
+    case substrait::Type::kPrecisionTimestamp: {
+      ARROW_ASSIGN_OR_RAISE(std::shared_ptr<DataType> ts_type,
+                            precision_timestamp(type.precision_timestamp().precision()));
+      return std::make_pair(ts_type, IsNullable(type.precision_timestamp()));
+    }
+    case substrait::Type::kPrecisionTimestampTz: {
+      ARROW_ASSIGN_OR_RAISE(
+          std::shared_ptr<DataType> ts_type,
+          precision_timestamp_tz(type.precision_timestamp_tz().precision()));
+      return std::make_pair(ts_type, IsNullable(type.precision_timestamp_tz()));
+    }
     case substrait::Type::kDate:
       return FromProtoImpl<Date32Type>(type.date());
 
@@ -263,7 +281,14 @@ struct DataTypeToProtoImpl {
     return SetWith(&substrait::Type::set_allocated_binary);
   }
 
-  Status Visit(const BinaryViewType& t) { return NotImplemented(t); }
+  // From Substrait's point of view the view types are encodings, and an execution detail,
+  // and not distinct from the non-view type.
+  Status Visit(const BinaryViewType& t) {
+    return SetWith(&substrait::Type::set_allocated_binary);
+  }
+  Status Visit(const StringViewType& t) {
+    return SetWith(&substrait::Type::set_allocated_string);
+  }
 
   Status Visit(const FixedSizeBinaryType& t) {
     SetWithThen(&substrait::Type::set_allocated_fixed_binary)->set_length(t.byte_width());
@@ -273,25 +298,50 @@ struct DataTypeToProtoImpl {
   Status Visit(const Date32Type& t) {
     return SetWith(&substrait::Type::set_allocated_date);
   }
-  Status Visit(const Date64Type& t) { return NotImplemented(t); }
+  Status Visit(const Date64Type& t) { return EncodeUserDefined(t); }
 
-  Status Visit(const TimestampType& t) {
-    if (t.unit() != TimeUnit::MICRO) return NotImplemented(t);
+  template <typename Sub>
+  Status VisitTimestamp(const TimestampType& t,
+                        void (substrait::Type::*set_allocated_sub)(Sub*)) {
+    auto ts = SetWithThen(set_allocated_sub);
+    switch (t.unit()) {
+      case TimeUnit::SECOND:
+        ts->set_precision(0);
+        break;
+      case TimeUnit::MILLI:
+        ts->set_precision(3);
+        break;
+      case TimeUnit::MICRO:
+        ts->set_precision(6);
+        break;
+      case TimeUnit::NANO:
+        ts->set_precision(9);
+        break;
+      default:
+        return NotImplemented(t);
+    }
+    return Status::OK();
+  }
 
+  Status Visit(const TimestampType& t) {
     if (t.timezone() == "") {
-      return SetWith(&substrait::Type::set_allocated_timestamp);
-    }
-    if (t.timezone() == TimestampTzTimezoneString()) {
-      return SetWith(&substrait::Type::set_allocated_timestamp_tz);
+      return VisitTimestamp(t, &substrait::Type::set_allocated_precision_timestamp);
+    } else {
+      // Note: The timezone information is discarded here.  In Substrait the time zone
+      // information is part of the function and not part of the type.  For example, to
+      // convert a timestamp to a string, the time zone is passed as an argument to the
+      // function.
+      return VisitTimestamp(t, &substrait::Type::set_allocated_precision_timestamp_tz);
     }
-
-    return NotImplemented(t);
   }
 
-  Status Visit(const Time32Type& t) { return NotImplemented(t); }
+  Status Visit(const Time32Type& t) { return EncodeUserDefined(t); }
   Status Visit(const Time64Type& t) {
-    if (t.unit() != TimeUnit::MICRO) return NotImplemented(t);
-    return SetWith(&substrait::Type::set_allocated_time);
+    if (t.unit() == TimeUnit::MICRO) {
+      return SetWith(&substrait::Type::set_allocated_time);
+    } else {
+      return EncodeUserDefined(t);
+    }
   }
 
   Status Visit(const MonthIntervalType& t) { return EncodeUserDefined(t); }
@@ -303,6 +353,7 @@ struct DataTypeToProtoImpl {
     dec->set_scale(t.scale());
     return Status::OK();
   }
+  // TODO(GH-40740) support parameterized UDT
   Status Visit(const Decimal256Type& t) { return NotImplemented(t); }
 
   Status Visit(const ListType& t) {
@@ -313,8 +364,16 @@ struct DataTypeToProtoImpl {
     return Status::OK();
   }
 
-  Status Visit(const ListViewType& t) { return NotImplemented(t); }
+  // From Substrait's point of view this is an encoding, and an implementation detail,
+  // and not distinct from the list type.
+  Status Visit(const ListViewType& t) {
+    ARROW_ASSIGN_OR_RAISE(auto type, ToProto(*t.value_type(), t.value_field()->nullable(),
+                                             ext_set_, conversion_options_));
+    SetWithThen(&substrait::Type::set_allocated_list)->set_allocated_type(type.release());
+    return Status::OK();
+  }
 
+  // TODO(GH-40740) support parameterized UDT
   Status Visit(const LargeListViewType& t) { return NotImplemented(t); }
 
   Status Visit(const StructType& t) {
@@ -335,8 +394,9 @@ struct DataTypeToProtoImpl {
 
   Status Visit(const SparseUnionType& t) { return NotImplemented(t); }
   Status Visit(const DenseUnionType& t) { return NotImplemented(t); }
-  Status Visit(const DictionaryType& t) { return NotImplemented(t); }
-  Status Visit(const RunEndEncodedType& t) { return NotImplemented(t); }
+  // The caller should have unwrapped the dictionary / RLE type
+  Status Visit(const DictionaryType& t) { Unreachable(); }
+  Status Visit(const RunEndEncodedType& t) { Unreachable(); }
 
   Status Visit(const MapType& t) {
     // FIXME assert default field names; custom ones won't roundtrip
@@ -379,10 +439,13 @@ struct DataTypeToProtoImpl {
     return NotImplemented(t);
   }
 
+  // TODO(GH-40740) support parameterized UDT
   Status Visit(const FixedSizeListType& t) { return NotImplemented(t); }
+  // TODO(GH-40740) support parameterized UDT
   Status Visit(const DurationType& t) { return NotImplemented(t); }
-  Status Visit(const LargeStringType& t) { return NotImplemented(t); }
-  Status Visit(const LargeBinaryType& t) { return NotImplemented(t); }
+  Status Visit(const LargeStringType& t) { return EncodeUserDefined(t); }
+  Status Visit(const LargeBinaryType& t) { return EncodeUserDefined(t); }
+  // TODO(GH-40740) support parameterized UDT
   Status Visit(const LargeListType& t) { return NotImplemented(t); }
   Status Visit(const MonthDayNanoIntervalType& t) { return EncodeUserDefined(t); }
 
@@ -429,10 +492,21 @@ struct DataTypeToProtoImpl {
 Result<std::unique_ptr<substrait::Type>> ToProto(
     const DataType& type, bool nullable, ExtensionSet* ext_set,
     const ConversionOptions& conversion_options) {
+  // From Substrait's perspective the "dictionary type" is just an encoding.  As a result,
+  // we lose that information on conversion and just convert the value type.
+  if (type.id() == Type::DICTIONARY) {
+    const auto& dict_type = checked_cast<const DictionaryType&>(type);
+    return ToProto(*dict_type.value_type(), nullable, ext_set, conversion_options);
+  }
+  // Ditto for REE
+  if (type.id() == Type::RUN_END_ENCODED) {
+    const auto& ree_type = checked_cast<const RunEndEncodedType&>(type);
+    return ToProto(*ree_type.value_type(), nullable, ext_set, conversion_options);
+  }
   auto out = std::make_unique<substrait::Type>();
   RETURN_NOT_OK(
       (DataTypeToProtoImpl{out.get(), nullable, ext_set, conversion_options})(type));
-  return std::move(out);
+  return out;
 }
 
 Result<std::shared_ptr<Schema>> FromProto(const substrait::NamedStruct& named_struct,
@@ -509,7 +583,7 @@ Result<std::unique_ptr<substrait::NamedStruct>> ToProto(
   }
 
   named_struct->set_allocated_struct_(struct_.release());
-  return std::move(named_struct);
+  return named_struct;
 }
 
 }  // namespace engine
diff --git a/cpp/src/arrow/engine/substrait/util.h b/cpp/src/arrow/engine/substrait/util.h
index 5128ec44bff77..bef2a6c7e1823 100644
--- a/cpp/src/arrow/engine/substrait/util.h
+++ b/cpp/src/arrow/engine/substrait/util.h
@@ -70,7 +70,7 @@ ARROW_ENGINE_EXPORT const std::string& default_extension_types_uri();
 
 // TODO(ARROW-18145) Populate these from cmake files
 constexpr uint32_t kSubstraitMajorVersion = 0;
-constexpr uint32_t kSubstraitMinorVersion = 27;
+constexpr uint32_t kSubstraitMinorVersion = 44;
 constexpr uint32_t kSubstraitPatchVersion = 0;
 
 constexpr uint32_t kSubstraitMinimumMajorVersion = 0;
diff --git a/cpp/src/arrow/extension/fixed_shape_tensor.cc b/cpp/src/arrow/extension/fixed_shape_tensor.cc
index 1101b08307332..944a134a707b1 100644
--- a/cpp/src/arrow/extension/fixed_shape_tensor.cc
+++ b/cpp/src/arrow/extension/fixed_shape_tensor.cc
@@ -207,44 +207,44 @@ std::shared_ptr<Array> FixedShapeTensorType::MakeArray(
 
 Result<std::shared_ptr<Tensor>> FixedShapeTensorType::MakeTensor(
     const std::shared_ptr<ExtensionScalar>& scalar) {
-  const auto ext_scalar = internal::checked_pointer_cast<ExtensionScalar>(scalar);
-  const auto ext_type =
-      internal::checked_pointer_cast<FixedShapeTensorType>(scalar->type);
-  if (!is_fixed_width(*ext_type->value_type())) {
+  const auto& ext_scalar = internal::checked_cast<const ExtensionScalar&>(*scalar);
+  const auto& ext_type =
+      internal::checked_cast<const FixedShapeTensorType&>(*scalar->type);
+  if (!is_fixed_width(*ext_type.value_type())) {
     return Status::TypeError("Cannot convert non-fixed-width values to Tensor.");
   }
-  const auto array =
-      internal::checked_pointer_cast<const FixedSizeListScalar>(ext_scalar->value)->value;
+  const auto& array =
+      internal::checked_cast<const FixedSizeListScalar*>(ext_scalar.value.get())->value;
   if (array->null_count() > 0) {
     return Status::Invalid("Cannot convert data with nulls to Tensor.");
   }
-  const auto value_type =
-      internal::checked_pointer_cast<FixedWidthType>(ext_type->value_type());
-  const auto byte_width = value_type->byte_width();
+  const auto& value_type =
+      internal::checked_cast<const FixedWidthType&>(*ext_type.value_type());
+  const auto byte_width = value_type.byte_width();
 
-  std::vector<int64_t> permutation = ext_type->permutation();
+  std::vector<int64_t> permutation = ext_type.permutation();
   if (permutation.empty()) {
-    permutation.resize(ext_type->ndim());
+    permutation.resize(ext_type.ndim());
     std::iota(permutation.begin(), permutation.end(), 0);
   }
 
-  std::vector<int64_t> shape = ext_type->shape();
+  std::vector<int64_t> shape = ext_type.shape();
   internal::Permute<int64_t>(permutation, &shape);
 
-  std::vector<std::string> dim_names = ext_type->dim_names();
+  std::vector<std::string> dim_names = ext_type.dim_names();
   if (!dim_names.empty()) {
     internal::Permute<std::string>(permutation, &dim_names);
   }
 
   std::vector<int64_t> strides;
-  RETURN_NOT_OK(ComputeStrides(*value_type.get(), shape, permutation, &strides));
+  RETURN_NOT_OK(ComputeStrides(value_type, shape, permutation, &strides));
   const auto start_position = array->offset() * byte_width;
   const auto size = std::accumulate(shape.begin(), shape.end(), static_cast<int64_t>(1),
                                     std::multiplies<>());
   const auto buffer =
       SliceBuffer(array->data()->buffers[1], start_position, size * byte_width);
 
-  return Tensor::Make(ext_type->value_type(), buffer, shape, strides, dim_names);
+  return Tensor::Make(ext_type.value_type(), buffer, shape, strides, dim_names);
 }
 
 Result<std::shared_ptr<FixedShapeTensorArray>> FixedShapeTensorArray::FromTensor(
@@ -257,12 +257,14 @@ Result<std::shared_ptr<FixedShapeTensorArray>> FixedShapeTensorArray::FromTensor
   permutation.erase(permutation.begin());
 
   std::vector<int64_t> cell_shape;
+  cell_shape.reserve(permutation.size());
   for (auto i : permutation) {
     cell_shape.emplace_back(tensor->shape()[i]);
   }
 
   std::vector<std::string> dim_names;
   if (!tensor->dim_names().empty()) {
+    dim_names.reserve(permutation.size());
     for (auto i : permutation) {
       dim_names.emplace_back(tensor->dim_names()[i]);
     }
@@ -337,9 +339,9 @@ const Result<std::shared_ptr<Tensor>> FixedShapeTensorArray::ToTensor() const {
   // To convert an array of n dimensional tensors to a n+1 dimensional tensor we
   // interpret the array's length as the first dimension the new tensor.
 
-  const auto ext_type =
-      internal::checked_pointer_cast<FixedShapeTensorType>(this->type());
-  const auto value_type = ext_type->value_type();
+  const auto& ext_type =
+      internal::checked_cast<const FixedShapeTensorType&>(*this->type());
+  const auto& value_type = ext_type.value_type();
   ARROW_RETURN_IF(
       !is_fixed_width(*value_type),
       Status::TypeError(value_type->ToString(), " is not valid data type for a tensor"));
@@ -350,35 +352,35 @@ const Result<std::shared_ptr<Tensor>> FixedShapeTensorArray::ToTensor() const {
   // will get permutation index 0 and remaining values from ext_type->permutation() need
   // to be shifted to fill the [1, ndim+1) range. Computed permutation will be used to
   // generate the new tensor's shape, strides and dim_names.
-  std::vector<int64_t> permutation = ext_type->permutation();
+  std::vector<int64_t> permutation = ext_type.permutation();
   if (permutation.empty()) {
-    permutation.resize(ext_type->ndim() + 1);
+    permutation.resize(ext_type.ndim() + 1);
     std::iota(permutation.begin(), permutation.end(), 0);
   } else {
-    for (auto i = 0; i < static_cast<int64_t>(ext_type->ndim()); i++) {
+    for (auto i = 0; i < static_cast<int64_t>(ext_type.ndim()); i++) {
       permutation[i] += 1;
     }
     permutation.insert(permutation.begin(), 1, 0);
   }
 
-  std::vector<std::string> dim_names = ext_type->dim_names();
+  std::vector<std::string> dim_names = ext_type.dim_names();
   if (!dim_names.empty()) {
     dim_names.insert(dim_names.begin(), 1, "");
     internal::Permute<std::string>(permutation, &dim_names);
   }
 
-  std::vector<int64_t> shape = ext_type->shape();
+  std::vector<int64_t> shape = ext_type.shape();
   auto cell_size = std::accumulate(shape.begin(), shape.end(), static_cast<int64_t>(1),
                                    std::multiplies<>());
   shape.insert(shape.begin(), 1, this->length());
   internal::Permute<int64_t>(permutation, &shape);
 
   std::vector<int64_t> tensor_strides;
-  const auto fw_value_type = internal::checked_pointer_cast<FixedWidthType>(value_type);
+  const auto* fw_value_type = internal::checked_cast<FixedWidthType*>(value_type.get());
   ARROW_RETURN_NOT_OK(
-      ComputeStrides(*fw_value_type.get(), shape, permutation, &tensor_strides));
+      ComputeStrides(*fw_value_type, shape, permutation, &tensor_strides));
 
-  const auto raw_buffer = this->storage()->data()->child_data[0]->buffers[1];
+  const auto& raw_buffer = this->storage()->data()->child_data[0]->buffers[1];
   ARROW_ASSIGN_OR_RAISE(
       const auto buffer,
       SliceBufferSafe(raw_buffer, this->offset() * cell_size * value_type->byte_width()));
@@ -389,7 +391,7 @@ const Result<std::shared_ptr<Tensor>> FixedShapeTensorArray::ToTensor() const {
 Result<std::shared_ptr<DataType>> FixedShapeTensorType::Make(
     const std::shared_ptr<DataType>& value_type, const std::vector<int64_t>& shape,
     const std::vector<int64_t>& permutation, const std::vector<std::string>& dim_names) {
-  const auto ndim = shape.size();
+  const size_t ndim = shape.size();
   if (!permutation.empty() && ndim != permutation.size()) {
     return Status::Invalid("permutation size must match shape size. Expected: ", ndim,
                            " Got: ", permutation.size());
@@ -402,18 +404,18 @@ Result<std::shared_ptr<DataType>> FixedShapeTensorType::Make(
     RETURN_NOT_OK(internal::IsPermutationValid(permutation));
   }
 
-  const auto size = std::accumulate(shape.begin(), shape.end(), static_cast<int64_t>(1),
-                                    std::multiplies<>());
+  const int64_t size = std::accumulate(shape.begin(), shape.end(),
+                                       static_cast<int64_t>(1), std::multiplies<>());
   return std::make_shared<FixedShapeTensorType>(value_type, static_cast<int32_t>(size),
                                                 shape, permutation, dim_names);
 }
 
 const std::vector<int64_t>& FixedShapeTensorType::strides() {
   if (strides_.empty()) {
-    auto value_type = internal::checked_pointer_cast<FixedWidthType>(this->value_type_);
+    auto value_type = internal::checked_cast<FixedWidthType*>(this->value_type_.get());
     std::vector<int64_t> tensor_strides;
-    ARROW_CHECK_OK(ComputeStrides(*value_type.get(), this->shape(), this->permutation(),
-                                  &tensor_strides));
+    ARROW_CHECK_OK(
+        ComputeStrides(*value_type, this->shape(), this->permutation(), &tensor_strides));
     strides_ = tensor_strides;
   }
   return strides_;
diff --git a/cpp/src/arrow/extension/fixed_shape_tensor.h b/cpp/src/arrow/extension/fixed_shape_tensor.h
index 3fec79b5c2a3c..20ec20a64c2d4 100644
--- a/cpp/src/arrow/extension/fixed_shape_tensor.h
+++ b/cpp/src/arrow/extension/fixed_shape_tensor.h
@@ -67,10 +67,10 @@ class ARROW_EXPORT FixedShapeTensorType : public ExtensionType {
   size_t ndim() const { return shape_.size(); }
 
   /// Shape of tensor elements
-  const std::vector<int64_t> shape() const { return shape_; }
+  const std::vector<int64_t>& shape() const { return shape_; }
 
   /// Value type of tensor elements
-  const std::shared_ptr<DataType> value_type() const { return value_type_; }
+  const std::shared_ptr<DataType>& value_type() const { return value_type_; }
 
   /// Strides of tensor elements. Strides state offset in bytes between adjacent
   /// elements along each dimension. In case permutation is non-empty strides are
diff --git a/cpp/src/arrow/extension_type.h b/cpp/src/arrow/extension_type.h
index 0fd7216f1820b..b3f085198be69 100644
--- a/cpp/src/arrow/extension_type.h
+++ b/cpp/src/arrow/extension_type.h
@@ -54,6 +54,9 @@ class ARROW_EXPORT ExtensionType : public DataType {
 
   std::string name() const override { return "extension"; }
 
+  int32_t byte_width() const override { return storage_type_->byte_width(); }
+  int bit_width() const override { return storage_type_->bit_width(); }
+
   /// \brief Unique name of extension type used to identify type for
   /// serialization
   /// \return the string name of the extension
diff --git a/cpp/src/arrow/extension_type_test.cc b/cpp/src/arrow/extension_type_test.cc
index 31222d74806f4..f104c984a64b4 100644
--- a/cpp/src/arrow/extension_type_test.cc
+++ b/cpp/src/arrow/extension_type_test.cc
@@ -196,6 +196,8 @@ TEST_F(TestExtensionType, ExtensionTypeTest) {
 
   auto type = uuid();
   ASSERT_EQ(type->id(), Type::EXTENSION);
+  ASSERT_EQ(type->bit_width(), 128);
+  ASSERT_EQ(type->byte_width(), 16);
 
   const auto& ext_type = static_cast<const ExtensionType&>(*type);
   std::string serialized = ext_type.Serialize();
@@ -204,6 +206,9 @@ TEST_F(TestExtensionType, ExtensionTypeTest) {
                        ext_type.Deserialize(fixed_size_binary(16), serialized));
   ASSERT_TRUE(deserialized->Equals(*type));
   ASSERT_FALSE(deserialized->Equals(*fixed_size_binary(16)));
+  ASSERT_EQ(deserialized->id(), Type::EXTENSION);
+  ASSERT_EQ(deserialized->bit_width(), 128);
+  ASSERT_EQ(deserialized->byte_width(), 16);
 }
 
 auto RoundtripBatch = [](const std::shared_ptr<RecordBatch>& batch,
diff --git a/cpp/src/arrow/field_ref_test.cc b/cpp/src/arrow/field_ref_test.cc
index 0cb2da4f709a1..25c8aa0b71623 100644
--- a/cpp/src/arrow/field_ref_test.cc
+++ b/cpp/src/arrow/field_ref_test.cc
@@ -199,7 +199,7 @@ struct FieldPathTestCase {
         Table::Make(out.schema, {out.v0.chunked_array, out.v1.chunked_array}, kNumRows);
     ARROW_RETURN_NOT_OK(out.table->ValidateFull());
 
-    return std::move(out);
+    return out;
   }
 
  private:
diff --git a/cpp/src/arrow/filesystem/CMakeLists.txt b/cpp/src/arrow/filesystem/CMakeLists.txt
index deac04af72f5a..0a31a64b7a3a4 100644
--- a/cpp/src/arrow/filesystem/CMakeLists.txt
+++ b/cpp/src/arrow/filesystem/CMakeLists.txt
@@ -28,7 +28,9 @@ add_arrow_test(filesystem-test
                EXTRA_LABELS
                filesystem
                DEFINITIONS
-               ARROW_FILESYSTEM_EXAMPLE_LIBPATH="$<TARGET_FILE:arrow_filesystem_example>")
+               ARROW_FILESYSTEM_EXAMPLE_LIBPATH="$<TARGET_FILE:arrow_filesystem_example>"
+               EXTRA_DEPENDENCIES
+               arrow_filesystem_example)
 
 if(ARROW_BUILD_BENCHMARKS)
   add_arrow_benchmark(localfs_benchmark
diff --git a/cpp/src/arrow/filesystem/azurefs.cc b/cpp/src/arrow/filesystem/azurefs.cc
index 260478b068ed1..a3aa2c8e837d9 100644
--- a/cpp/src/arrow/filesystem/azurefs.cc
+++ b/cpp/src/arrow/filesystem/azurefs.cc
@@ -117,8 +117,12 @@ Status AzureOptions::ExtractFromUriQuery(const Uri& uri) {
         credential_kind = CredentialKind::kDefault;
       } else if (kv.second == "anonymous") {
         credential_kind = CredentialKind::kAnonymous;
+      } else if (kv.second == "cli") {
+        credential_kind = CredentialKind::kCLI;
       } else if (kv.second == "workload_identity") {
         credential_kind = CredentialKind::kWorkloadIdentity;
+      } else if (kv.second == "environment") {
+        credential_kind = CredentialKind::kEnvironment;
       } else {
         // Other credential kinds should be inferred from the given
         // parameters automatically.
@@ -168,9 +172,15 @@ Status AzureOptions::ExtractFromUriQuery(const Uri& uri) {
       case CredentialKind::kAnonymous:
         RETURN_NOT_OK(ConfigureAnonymousCredential());
         break;
+      case CredentialKind::kCLI:
+        RETURN_NOT_OK(ConfigureCLICredential());
+        break;
       case CredentialKind::kWorkloadIdentity:
         RETURN_NOT_OK(ConfigureWorkloadIdentityCredential());
         break;
+      case CredentialKind::kEnvironment:
+        RETURN_NOT_OK(ConfigureEnvironmentCredential());
+        break;
       default:
         // Default credential
         break;
@@ -250,8 +260,10 @@ bool AzureOptions::Equals(const AzureOptions& other) const {
       return storage_shared_key_credential_->AccountName ==
              other.storage_shared_key_credential_->AccountName;
     case CredentialKind::kClientSecret:
+    case CredentialKind::kCLI:
     case CredentialKind::kManagedIdentity:
     case CredentialKind::kWorkloadIdentity:
+    case CredentialKind::kEnvironment:
       return token_credential_->GetCredentialName() ==
              other.token_credential_->GetCredentialName();
   }
@@ -277,6 +289,13 @@ std::string BuildBaseUrl(const std::string& scheme, const std::string& authority
   url += "/";
   return url;
 }
+
+template <typename... PrefixArgs>
+Status ExceptionToStatus(const Storage::StorageException& exception,
+                         PrefixArgs&&... prefix_args) {
+  return Status::IOError(std::forward<PrefixArgs>(prefix_args)..., " Azure Error: [",
+                         exception.ErrorCode, "] ", exception.what());
+}
 }  // namespace
 
 std::string AzureOptions::AccountBlobUrl(const std::string& account_name) const {
@@ -324,17 +343,33 @@ Status AzureOptions::ConfigureManagedIdentityCredential(const std::string& clien
   return Status::OK();
 }
 
+Status AzureOptions::ConfigureCLICredential() {
+  credential_kind_ = CredentialKind::kCLI;
+  token_credential_ = std::make_shared<Azure::Identity::AzureCliCredential>();
+  return Status::OK();
+}
+
 Status AzureOptions::ConfigureWorkloadIdentityCredential() {
   credential_kind_ = CredentialKind::kWorkloadIdentity;
   token_credential_ = std::make_shared<Azure::Identity::WorkloadIdentityCredential>();
   return Status::OK();
 }
 
+Status AzureOptions::ConfigureEnvironmentCredential() {
+  credential_kind_ = CredentialKind::kEnvironment;
+  token_credential_ = std::make_shared<Azure::Identity::EnvironmentCredential>();
+  return Status::OK();
+}
+
 Result<std::unique_ptr<Blobs::BlobServiceClient>> AzureOptions::MakeBlobServiceClient()
     const {
   if (account_name.empty()) {
     return Status::Invalid("AzureOptions doesn't contain a valid account name");
   }
+  if (!(blob_storage_scheme == "http" || blob_storage_scheme == "https")) {
+    return Status::Invalid("AzureOptions::blob_storage_scheme must be http or https: ",
+                           blob_storage_scheme);
+  }
   switch (credential_kind_) {
     case CredentialKind::kAnonymous:
       return std::make_unique<Blobs::BlobServiceClient>(AccountBlobUrl(account_name));
@@ -345,7 +380,9 @@ Result<std::unique_ptr<Blobs::BlobServiceClient>> AzureOptions::MakeBlobServiceC
       [[fallthrough]];
     case CredentialKind::kClientSecret:
     case CredentialKind::kManagedIdentity:
+    case CredentialKind::kCLI:
     case CredentialKind::kWorkloadIdentity:
+    case CredentialKind::kEnvironment:
       return std::make_unique<Blobs::BlobServiceClient>(AccountBlobUrl(account_name),
                                                         token_credential_);
     case CredentialKind::kStorageSharedKey:
@@ -360,6 +397,10 @@ AzureOptions::MakeDataLakeServiceClient() const {
   if (account_name.empty()) {
     return Status::Invalid("AzureOptions doesn't contain a valid account name");
   }
+  if (!(dfs_storage_scheme == "http" || dfs_storage_scheme == "https")) {
+    return Status::Invalid("AzureOptions::dfs_storage_scheme must be http or https: ",
+                           dfs_storage_scheme);
+  }
   switch (credential_kind_) {
     case CredentialKind::kAnonymous:
       return std::make_unique<DataLake::DataLakeServiceClient>(
@@ -371,7 +412,9 @@ AzureOptions::MakeDataLakeServiceClient() const {
       [[fallthrough]];
     case CredentialKind::kClientSecret:
     case CredentialKind::kManagedIdentity:
+    case CredentialKind::kCLI:
     case CredentialKind::kWorkloadIdentity:
+    case CredentialKind::kEnvironment:
       return std::make_unique<DataLake::DataLakeServiceClient>(
           AccountDfsUrl(account_name), token_credential_);
     case CredentialKind::kStorageSharedKey:
@@ -381,6 +424,25 @@ AzureOptions::MakeDataLakeServiceClient() const {
   return Status::Invalid("AzureOptions doesn't contain a valid auth configuration");
 }
 
+Result<std::string> AzureOptions::GenerateSASToken(
+    Storage::Sas::BlobSasBuilder* builder, Blobs::BlobServiceClient* client) const {
+  using SasProtocol = Storage::Sas::SasProtocol;
+  builder->Protocol =
+      blob_storage_scheme == "http" ? SasProtocol::HttpsAndHttp : SasProtocol::HttpsOnly;
+  if (storage_shared_key_credential_) {
+    return builder->GenerateSasToken(*storage_shared_key_credential_);
+  } else {
+    // GH-39344: This part isn't tested. This may not work.
+    try {
+      auto delegation_key_response = client->GetUserDelegationKey(builder->ExpiresOn);
+      return builder->GenerateSasToken(delegation_key_response.Value, account_name);
+    } catch (const Storage::StorageException& exception) {
+      return ExceptionToStatus(exception, "GetUserDelegationKey failed for '",
+                               client->GetUrl(), "'.");
+    }
+  }
+}
+
 namespace {
 
 // An AzureFileSystem represents an Azure storage account. An AzureLocation describes a
@@ -450,13 +512,6 @@ struct AzureLocation {
   }
 };
 
-template <typename... PrefixArgs>
-Status ExceptionToStatus(const Storage::StorageException& exception,
-                         PrefixArgs&&... prefix_args) {
-  return Status::IOError(std::forward<PrefixArgs>(prefix_args)..., " Azure Error: [",
-                         exception.ErrorCode, "] ", exception.what());
-}
-
 Status PathNotFound(const AzureLocation& location) {
   return ::arrow::fs::internal::PathNotFound(location.all);
 }
@@ -829,7 +884,7 @@ class ObjectInputFile final : public io::RandomAccessFile {
       DCHECK_LE(bytes_read, nbytes);
       RETURN_NOT_OK(buffer->Resize(bytes_read));
     }
-    return std::move(buffer);
+    return buffer;
   }
 
   Result<int64_t> Read(int64_t nbytes, void* out) override {
@@ -841,7 +896,7 @@ class ObjectInputFile final : public io::RandomAccessFile {
   Result<std::shared_ptr<Buffer>> Read(int64_t nbytes) override {
     ARROW_ASSIGN_OR_RAISE(auto buffer, ReadAt(pos_, nbytes));
     pos_ += buffer->size();
-    return std::move(buffer);
+    return buffer;
   }
 
  private:
@@ -1179,6 +1234,15 @@ Status CreateContainerIfNotExists(const std::string& container_name,
   }
 }
 
+FileInfo FileInfoFromPath(std::string_view container,
+                          const DataLake::Models::PathItem& path) {
+  FileInfo info{internal::ConcatAbstractPath(container, path.Name),
+                path.IsDirectory ? FileType::Directory : FileType::File};
+  info.set_size(path.FileSize);
+  info.set_mtime(std::chrono::system_clock::time_point{path.LastModified});
+  return info;
+}
+
 FileInfo DirectoryFileInfoFromPath(std::string_view path) {
   return FileInfo{std::string{internal::RemoveTrailingSlash(path)}, FileType::Directory};
 }
@@ -1576,7 +1640,7 @@ class AzureFileSystem::Impl {
   }
 
  private:
-  /// \pref location.container is not empty.
+  /// \pre location.container is not empty.
   template <typename ContainerClient>
   Status CheckDirExists(const ContainerClient& container_client,
                         const AzureLocation& location) {
@@ -1591,7 +1655,9 @@ class AzureFileSystem::Impl {
     if (info.type() == FileType::NotFound) {
       return PathNotFound(location);
     }
-    DCHECK_EQ(info.type(), FileType::Directory);
+    if (info.type() != FileType::Directory) {
+      return NotADir(location);
+    }
     return Status::OK();
   }
 
@@ -1621,6 +1687,50 @@ class AzureFileSystem::Impl {
     return result;
   }
 
+  /// \brief List the paths at the root of a filesystem or some dir in a filesystem.
+  ///
+  /// \pre adlfs_client is the client for the filesystem named like the first
+  /// segment of select.base_dir.
+  Status GetFileInfoWithSelectorFromFileSystem(
+      const DataLake::DataLakeFileSystemClient& adlfs_client,
+      const Core::Context& context, Azure::Nullable<int32_t> page_size_hint,
+      const FileSelector& select, FileInfoVector* acc_results) {
+    ARROW_ASSIGN_OR_RAISE(auto base_location, AzureLocation::FromString(select.base_dir));
+
+    auto directory_client = adlfs_client.GetDirectoryClient(base_location.path);
+    bool found = false;
+    DataLake::ListPathsOptions options;
+    options.PageSizeHint = page_size_hint;
+
+    try {
+      auto list_response = directory_client.ListPaths(select.recursive, options, context);
+      for (; list_response.HasPage(); list_response.MoveToNextPage(context)) {
+        if (list_response.Paths.empty()) {
+          continue;
+        }
+        found = true;
+        for (const auto& path : list_response.Paths) {
+          if (path.Name == base_location.path && !path.IsDirectory) {
+            return NotADir(base_location);
+          }
+          acc_results->push_back(FileInfoFromPath(base_location.container, path));
+        }
+      }
+    } catch (const Storage::StorageException& exception) {
+      if (IsContainerNotFound(exception) || exception.ErrorCode == "PathNotFound") {
+        found = false;
+      } else {
+        return ExceptionToStatus(exception,
+                                 "Failed to list paths in a directory: ", select.base_dir,
+                                 ": ", directory_client.GetUrl());
+      }
+    }
+
+    return found || select.allow_not_found
+               ? Status::OK()
+               : ::arrow::fs::internal::PathNotFound(select.base_dir);
+  }
+
   /// \brief List the blobs at the root of a container or some dir in a container.
   ///
   /// \pre container_client is the client for the container named like the first
@@ -1770,6 +1880,20 @@ class AzureFileSystem::Impl {
       return VisitContainers(context, std::move(on_container));
     }
 
+    auto adlfs_client = GetFileSystemClient(base_location.container);
+    ARROW_ASSIGN_OR_RAISE(auto hns_support, HierarchicalNamespaceSupport(adlfs_client));
+    if (hns_support == HNSSupport::kContainerNotFound) {
+      if (select.allow_not_found) {
+        return Status::OK();
+      } else {
+        return ::arrow::fs::internal::PathNotFound(select.base_dir);
+      }
+    }
+    if (hns_support == HNSSupport::kEnabled) {
+      return GetFileInfoWithSelectorFromFileSystem(adlfs_client, context, page_size_hint,
+                                                   select, acc_results);
+    }
+    DCHECK_EQ(hns_support, HNSSupport::kDisabled);
     auto container_client =
         blob_service_client_->GetBlobContainerClient(base_location.container);
     return GetFileInfoWithSelectorFromContainer(container_client, context, page_size_hint,
@@ -1818,8 +1942,67 @@ class AzureFileSystem::Impl {
                            const AzureLocation& location, bool recursive) {
     DCHECK(!location.container.empty());
     DCHECK(!location.path.empty());
-    // Non-recursive CreateDir calls require the parent directory to exist.
-    if (!recursive) {
+    if (recursive) {
+      // Recursive CreateDir calls require that all path segments be
+      // either a directory or not found.
+
+      // Check each path segment is a directory or not
+      // found. Nonexistent segments are collected to
+      // nonexistent_locations. We'll create directories for
+      // nonexistent segments later.
+      std::vector<AzureLocation> nonexistent_locations;
+      for (auto prefix = location; !prefix.path.empty(); prefix = prefix.parent()) {
+        ARROW_ASSIGN_OR_RAISE(auto info, GetFileInfo(container_client, prefix));
+        if (info.type() == FileType::File) {
+          return NotADir(prefix);
+        }
+        if (info.type() == FileType::NotFound) {
+          nonexistent_locations.push_back(prefix);
+        }
+      }
+      // Ensure container exists
+      ARROW_ASSIGN_OR_RAISE(auto container,
+                            AzureLocation::FromString(location.container));
+      ARROW_ASSIGN_OR_RAISE(auto container_info,
+                            GetContainerPropsAsFileInfo(container, container_client));
+      if (container_info.type() == FileType::NotFound) {
+        try {
+          container_client.CreateIfNotExists();
+        } catch (const Storage::StorageException& exception) {
+          return ExceptionToStatus(exception, "Failed to create directory '",
+                                   location.all, "': ", container_client.GetUrl());
+        }
+      }
+      // Create nonexistent directories from shorter to longer:
+      //
+      // Example:
+      //
+      // * location: /container/a/b/c/d/
+      // * Nonexistent path segments:
+      //   * /container/a/
+      //   * /container/a/c/
+      //   * /container/a/c/d/
+      // * target_locations:
+      //   1. /container/a/c/d/
+      //   2. /container/a/c/
+      //   3. /container/a/
+      //
+      // Create order:
+      //   1. /container/a/
+      //   2. /container/a/c/
+      //   3. /container/a/c/d/
+      for (size_t i = nonexistent_locations.size(); i > 0; --i) {
+        const auto& nonexistent_location = nonexistent_locations[i - 1];
+        try {
+          create_if_not_exists(container_client, nonexistent_location);
+        } catch (const Storage::StorageException& exception) {
+          return ExceptionToStatus(exception, "Failed to create directory '",
+                                   location.all, "': ", container_client.GetUrl());
+        }
+      }
+      return Status::OK();
+    } else {
+      // Non-recursive CreateDir calls require the parent directory to exist.
       auto parent = location.parent();
       if (!parent.path.empty()) {
         RETURN_NOT_OK(CheckDirExists(container_client, parent));
@@ -1827,28 +2010,17 @@ class AzureFileSystem::Impl {
       // If the parent location is just the container, we don't need to check if it
       // exists because the operation we perform below will fail if the container
       // doesn't exist and we can handle that error according to the recursive flag.
-    }
-    try {
-      create_if_not_exists(container_client, location);
-      return Status::OK();
-    } catch (const Storage::StorageException& exception) {
-      if (IsContainerNotFound(exception)) {
-        try {
-          if (recursive) {
-            container_client.CreateIfNotExists();
-            create_if_not_exists(container_client, location);
-            return Status::OK();
-          } else {
-            auto parent = location.parent();
-            return PathNotFound(parent);
-          }
-        } catch (const Storage::StorageException& second_exception) {
-          return ExceptionToStatus(second_exception, "Failed to create directory '",
-                                   location.all, "': ", container_client.GetUrl());
+      try {
+        create_if_not_exists(container_client, location);
+        return Status::OK();
+      } catch (const Storage::StorageException& exception) {
+        if (IsContainerNotFound(exception)) {
+          auto parent = location.parent();
+          return PathNotFound(parent);
         }
+        return ExceptionToStatus(exception, "Failed to create directory '", location.all,
+                                 "': ", container_client.GetUrl());
       }
-      return ExceptionToStatus(exception, "Failed to create directory '", location.all,
-                               "': ", container_client.GetUrl());
     }
   }
 
@@ -2016,8 +2188,15 @@ class AzureFileSystem::Impl {
     bool found_dir_marker_blob = false;
     try {
       auto list_response = container_client.ListBlobs(options);
-      if (require_dir_to_exist && list_response.Blobs.empty()) {
-        return PathNotFound(location);
+      if (list_response.Blobs.empty()) {
+        if (require_dir_to_exist) {
+          return PathNotFound(location);
+        } else {
+          ARROW_ASSIGN_OR_RAISE(auto info, GetFileInfo(container_client, location));
+          if (info.type() == FileType::File) {
+            return NotADir(location);
+          }
+        }
       }
       for (; list_response.HasPage(); list_response.MoveToNextPage()) {
         if (list_response.Blobs.empty()) {
@@ -2100,6 +2279,17 @@ class AzureFileSystem::Impl {
                                Azure::Nullable<std::string> lease_id = {}) {
     DCHECK(!location.container.empty());
     DCHECK(!location.path.empty());
+    ARROW_ASSIGN_OR_RAISE(auto file_info, GetFileInfo(adlfs_client, location, lease_id));
+    if (file_info.type() == FileType::NotFound) {
+      if (require_dir_to_exist) {
+        return PathNotFound(location);
+      } else {
+        return Status::OK();
+      }
+    }
+    if (file_info.type() != FileType::Directory) {
+      return NotADir(location);
+    }
     auto directory_client = adlfs_client.GetDirectoryClient(
         std::string(internal::RemoveTrailingSlash(location.path)));
     DataLake::DeleteDirectoryOptions options;
@@ -2143,6 +2333,9 @@ class AzureFileSystem::Impl {
                   kDelimiter, path.Name, ": ", sub_directory_client.GetUrl());
             }
           } else {
+            if (path.Name == location.path) {
+              return NotADir(location);
+            }
             auto sub_file_client = adlfs_client.GetFileClient(path.Name);
             try {
               sub_file_client.Delete();
@@ -2730,8 +2923,30 @@ class AzureFileSystem::Impl {
     if (src == dest) {
       return Status::OK();
     }
+    std::string sas_token;
+    {
+      Storage::Sas::BlobSasBuilder builder;
+      std::chrono::seconds available_period(60);
+      builder.ExpiresOn = std::chrono::system_clock::now() + available_period;
+      builder.BlobContainerName = src.container;
+      builder.BlobName = src.path;
+      builder.Resource = Storage::Sas::BlobSasResource::Blob;
+      builder.SetPermissions(Storage::Sas::BlobSasPermissions::Read);
+      ARROW_ASSIGN_OR_RAISE(
+          sas_token, options_.GenerateSASToken(&builder, blob_service_client_.get()));
+    }
+    auto src_url = GetBlobClient(src.container, src.path).GetUrl() + sas_token;
     auto dest_blob_client = GetBlobClient(dest.container, dest.path);
-    auto src_url = GetBlobClient(src.container, src.path).GetUrl();
+    if (!dest.path.empty()) {
+      auto dest_parent = dest.parent();
+      if (!dest_parent.path.empty()) {
+        auto dest_container_client = GetBlobContainerClient(dest_parent.container);
+        ARROW_ASSIGN_OR_RAISE(auto info, GetFileInfo(dest_container_client, dest_parent));
+        if (info.type() == FileType::File) {
+          return NotADir(dest_parent);
+        }
+      }
+    }
     try {
       dest_blob_client.CopyFromUri(src_url);
     } catch (const Storage::StorageException& exception) {
diff --git a/cpp/src/arrow/filesystem/azurefs.h b/cpp/src/arrow/filesystem/azurefs.h
index 350014954f056..93d6ec2f945b4 100644
--- a/cpp/src/arrow/filesystem/azurefs.h
+++ b/cpp/src/arrow/filesystem/azurefs.h
@@ -37,6 +37,10 @@ namespace Azure::Storage::Blobs {
 class BlobServiceClient;
 }
 
+namespace Azure::Storage::Sas {
+struct BlobSasBuilder;
+}
+
 namespace Azure::Storage::Files::DataLake {
 class DataLakeFileSystemClient;
 class DataLakeServiceClient;
@@ -115,7 +119,9 @@ struct ARROW_EXPORT AzureOptions {
     kStorageSharedKey,
     kClientSecret,
     kManagedIdentity,
+    kCLI,
     kWorkloadIdentity,
+    kEnvironment,
   } credential_kind_ = CredentialKind::kDefault;
 
   std::shared_ptr<Azure::Storage::StorageSharedKeyCredential>
@@ -137,18 +143,14 @@ struct ARROW_EXPORT AzureOptions {
   ///
   /// 1. abfs[s]://[:\<password\>@]\<account\>.blob.core.windows.net
   ///    [/\<container\>[/\<path\>]]
-  /// 2. abfs[s]://\<container\>[:\<password\>]@\<account\>.dfs.core.windows.net
-  ///     [/path]
+  /// 2. abfs[s]://\<container\>[:\<password\>]\@\<account\>.dfs.core.windows.net[/path]
   /// 3. abfs[s]://[\<account[:\<password\>]@]\<host[.domain]\>[\<:port\>]
   ///    [/\<container\>[/path]]
   /// 4. abfs[s]://[\<account[:\<password\>]@]\<container\>[/path]
   ///
-  /// 1. and 2. are compatible with the Azure Data Lake Storage Gen2 URIs:
-  /// https://learn.microsoft.com/en-us/azure/storage/blobs/data-lake-storage-introduction-abfs-uri
-  ///
-  /// 3. is for Azure Blob Storage compatible service including Azurite.
-  ///
-  /// 4. is a shorter version of 1. and 2.
+  /// (1) and (2) are compatible with the Azure Data Lake Storage Gen2 URIs
+  /// [1], (3) is for Azure Blob Storage compatible service including Azurite,
+  /// and (4) is a shorter version of (1) and (2).
   ///
   /// Note that there is no difference between abfs and abfss. HTTPS is
   /// used with abfs by default. You can force to use HTTP by specifying
@@ -159,12 +161,15 @@ struct ARROW_EXPORT AzureOptions {
   /// * blob_storage_authority: Set AzureOptions::blob_storage_authority
   /// * dfs_storage_authority: Set AzureOptions::dfs_storage_authority
   /// * enable_tls: If it's "false" or "0", HTTP not HTTPS is used.
-  /// * credential_kind: One of "default", "anonymous",
-  ///   "workload_identity". If "default" is specified, it's just
-  ///   ignored.  If "anonymous" is specified,
+  /// * credential_kind: One of "default", "anonymous", "workload_identity",
+  ///   "environment" or "cli". If "default" is specified, it's
+  ///   just ignored.  If "anonymous" is specified,
   ///   AzureOptions::ConfigureAnonymousCredential() is called. If
   ///   "workload_identity" is specified,
-  ///   AzureOptions::ConfigureWorkloadIdentityCredential() is called.
+  ///   AzureOptions::ConfigureWorkloadIdentityCredential() is called. If
+  ///   "environment" is specified,
+  ///   AzureOptions::ConfigureEnvironmentCredential() is called. If "cli" is
+  ///   specified, AzureOptions::ConfigureCLICredential() is called.
   /// * tenant_id: You must specify "client_id" and "client_secret"
   ///   too. AzureOptions::ConfigureClientSecretCredential() is called.
   /// * client_id: If you don't specify "tenant_id" and
@@ -174,6 +179,9 @@ struct ARROW_EXPORT AzureOptions {
   ///   AzureOptions::ConfigureClientSecretCredential() is called.
   /// * client_secret: You must specify "tenant_id" and "client_id"
   ///   too. AzureOptions::ConfigureClientSecretCredential() is called.
+  ///
+  /// [1]:
+  /// https://learn.microsoft.com/en-us/azure/storage/blobs/data-lake-storage-introduction-abfs-uri
   static Result<AzureOptions> FromUri(const Uri& uri, std::string* out_path);
   static Result<AzureOptions> FromUri(const std::string& uri, std::string* out_path);
 
@@ -184,7 +192,9 @@ struct ARROW_EXPORT AzureOptions {
                                          const std::string& client_id,
                                          const std::string& client_secret);
   Status ConfigureManagedIdentityCredential(const std::string& client_id = std::string());
+  Status ConfigureCLICredential();
   Status ConfigureWorkloadIdentityCredential();
+  Status ConfigureEnvironmentCredential();
 
   bool Equals(const AzureOptions& other) const;
 
@@ -196,6 +206,10 @@ struct ARROW_EXPORT AzureOptions {
 
   Result<std::unique_ptr<Azure::Storage::Files::DataLake::DataLakeServiceClient>>
   MakeDataLakeServiceClient() const;
+
+  Result<std::string> GenerateSASToken(
+      Azure::Storage::Sas::BlobSasBuilder* builder,
+      Azure::Storage::Blobs::BlobServiceClient* client) const;
 };
 
 /// \brief FileSystem implementation backed by Azure Blob Storage (ABS) [1] and
@@ -218,7 +232,7 @@ struct ARROW_EXPORT AzureOptions {
 ///   overwriting.
 /// - When you use the ListBlobs operation without specifying a delimiter, the results
 ///   include both directories and blobs. If you choose to use a delimiter, use only a
-///   forward slash (/) -- the only supported delimiter.
+///   forward slash (/) \--- the only supported delimiter.
 /// - If you use the DeleteBlob API to delete a directory, that directory is deleted only
 ///   if it's empty. This means that you can't use the Blob API delete directories
 ///   recursively.
diff --git a/cpp/src/arrow/filesystem/azurefs_test.cc b/cpp/src/arrow/filesystem/azurefs_test.cc
index 7ea5eb446bc12..9a11a6f24995a 100644
--- a/cpp/src/arrow/filesystem/azurefs_test.cc
+++ b/cpp/src/arrow/filesystem/azurefs_test.cc
@@ -98,6 +98,7 @@ class BaseAzureEnv : public ::testing::Environment {
 
   virtual AzureBackend backend() const = 0;
 
+  virtual bool HasSubmitBatchBug() const { return false; }
   virtual bool WithHierarchicalNamespace() const { return false; }
 
   virtual Result<int64_t> GetDebugLogSize() { return 0; }
@@ -207,6 +208,18 @@ class AzuriteEnv : public AzureEnvImpl<AzuriteEnv> {
     return self;
   }
 
+  /// Azurite has a bug that causes BlobContainerClient::SubmitBatch to fail on macOS.
+  /// SubmitBatch is used by:
+  ///  - AzureFileSystem::DeleteDir
+  ///  - AzureFileSystem::DeleteDirContents
+  bool HasSubmitBatchBug() const override {
+#ifdef __APPLE__
+    return true;
+#else
+    return false;
+#endif
+  }
+
   Result<int64_t> GetDebugLogSize() override {
     ARROW_ASSIGN_OR_RAISE(auto exists, arrow::internal::FileExists(debug_log_path_));
     if (!exists) {
@@ -274,6 +287,190 @@ class AzureHierarchicalNSEnv : public AzureEnvImpl<AzureHierarchicalNSEnv> {
   bool WithHierarchicalNamespace() const final { return true; }
 };
 
+namespace {
+Result<AzureOptions> MakeOptions(BaseAzureEnv* env) {
+  AzureOptions options;
+  options.account_name = env->account_name();
+  switch (env->backend()) {
+    case AzureBackend::kAzurite:
+      options.blob_storage_authority = "127.0.0.1:10000";
+      options.dfs_storage_authority = "127.0.0.1:10000";
+      options.blob_storage_scheme = "http";
+      options.dfs_storage_scheme = "http";
+      break;
+    case AzureBackend::kAzure:
+      // Use the default values
+      break;
+  }
+  ARROW_EXPECT_OK(options.ConfigureAccountKeyCredential(env->account_key()));
+  return options;
+}
+}  // namespace
+
+struct PreexistingData {
+ public:
+  using RNG = random::pcg32_fast;
+
+ public:
+  const std::string container_name;
+  static constexpr char const* kObjectName = "test-object-name";
+
+  static constexpr char const* kLoremIpsum = R"""(
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
+incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis
+nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
+fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
+culpa qui officia deserunt mollit anim id est laborum.
+)""";
+
+ public:
+  explicit PreexistingData(RNG& rng) : container_name{RandomContainerName(rng)} {}
+
+  // Creates a path by concatenating the container name and the stem.
+  std::string ContainerPath(std::string_view stem) const { return Path(stem); }
+
+  // Short alias to ContainerPath()
+  std::string Path(std::string_view stem) const {
+    return ConcatAbstractPath(container_name, stem);
+  }
+
+  std::string ObjectPath() const { return ContainerPath(kObjectName); }
+  std::string NotFoundObjectPath() const { return ContainerPath("not-found"); }
+
+  std::string RandomDirectoryPath(RNG& rng) const {
+    return ContainerPath(RandomChars(32, rng));
+  }
+
+  // Utilities
+  static std::string RandomContainerName(RNG& rng) { return RandomChars(32, rng); }
+
+  static std::string RandomChars(int count, RNG& rng) {
+    auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
+    std::uniform_int_distribution<int> d(0, static_cast<int>(fillers.size()) - 1);
+    std::string s;
+    std::generate_n(std::back_inserter(s), count, [&] { return fillers[d(rng)]; });
+    return s;
+  }
+
+  static int RandomIndex(int end, RNG& rng) {
+    return std::uniform_int_distribution<int>(0, end - 1)(rng);
+  }
+
+  static std::string RandomLine(int lineno, int width, RNG& rng) {
+    auto line = std::to_string(lineno) + ":    ";
+    line += RandomChars(width - static_cast<int>(line.size()) - 1, rng);
+    line += '\n';
+    return line;
+  }
+};
+
+class TestGeneric : public ::testing::Test, public GenericFileSystemTest {
+ public:
+  void TearDown() override {
+    if (azure_fs_) {
+      ASSERT_OK(azure_fs_->DeleteDir(container_name_));
+    }
+  }
+
+ protected:
+  void SetUpInternal(BaseAzureEnv* env) {
+    env_ = env;
+    random::pcg32_fast rng((std::random_device()()));
+    container_name_ = PreexistingData::RandomContainerName(rng);
+    ASSERT_OK_AND_ASSIGN(auto options, MakeOptions(env_));
+    ASSERT_OK_AND_ASSIGN(azure_fs_, AzureFileSystem::Make(options));
+    ASSERT_OK(azure_fs_->CreateDir(container_name_, true));
+    fs_ = std::make_shared<SubTreeFileSystem>(container_name_, azure_fs_);
+  }
+
+  std::shared_ptr<FileSystem> GetEmptyFileSystem() override { return fs_; }
+
+  bool have_implicit_directories() const override { return true; }
+  bool allow_write_file_over_dir() const override { return true; }
+  bool allow_read_dir_as_file() const override { return true; }
+  bool allow_move_dir() const override { return false; }
+  bool allow_move_file() const override { return true; }
+  bool allow_append_to_file() const override { return true; }
+  bool have_directory_mtimes() const override { return true; }
+  bool have_flaky_directory_tree_deletion() const override { return false; }
+  bool have_file_metadata() const override { return true; }
+  // calloc() used in libxml2's xmlNewGlobalState() is detected as a
+  // memory leak like the following. But it's a false positive. It's
+  // used in ListBlobsByHierarchy() for GetFileInfo() and it's freed
+  // in the call. This is detected as a memory leak only with
+  // generator API (GetFileInfoGenerator()) and not detected with
+  // non-generator API (GetFileInfo()). So this is a false positive.
+  //
+  // ==2875409==ERROR: LeakSanitizer: detected memory leaks
+  //
+  // Direct leak of 968 byte(s) in 1 object(s) allocated from:
+  //     #0 0x55d02c967bdc in calloc (build/debug/arrow-azurefs-test+0x17bbdc) (BuildId:
+  //     520690d1b20e860cc1feef665dce8196e64f955e) #1 0x7fa914b1cd1e in xmlNewGlobalState
+  //     builddir/main/../../threads.c:580:10 #2 0x7fa914b1cd1e in xmlGetGlobalState
+  //     builddir/main/../../threads.c:666:31
+  bool have_false_positive_memory_leak_with_generator() const override { return true; }
+
+  BaseAzureEnv* env_;
+  std::shared_ptr<AzureFileSystem> azure_fs_;
+  std::shared_ptr<FileSystem> fs_;
+
+ private:
+  std::string container_name_;
+};
+
+class TestAzuriteGeneric : public TestGeneric {
+ public:
+  void SetUp() override {
+    ASSERT_OK_AND_ASSIGN(auto env, AzuriteEnv::GetInstance());
+    SetUpInternal(env);
+  }
+
+ protected:
+  // Azurite doesn't support moving files over containers.
+  bool allow_move_file() const override { return false; }
+  // Azurite doesn't support directory mtime.
+  bool have_directory_mtimes() const override { return false; }
+  // DeleteDir() doesn't work with Azurite on macOS
+  bool have_flaky_directory_tree_deletion() const override {
+    return env_->HasSubmitBatchBug();
+  }
+};
+
+class TestAzureFlatNSGeneric : public TestGeneric {
+ public:
+  void SetUp() override {
+    auto env_result = AzureFlatNSEnv::GetInstance();
+    if (env_result.status().IsCancelled()) {
+      GTEST_SKIP() << env_result.status().message();
+    }
+    ASSERT_OK_AND_ASSIGN(auto env, env_result);
+    SetUpInternal(env);
+  }
+
+ protected:
+  // Flat namespace account doesn't support moving files over containers.
+  bool allow_move_file() const override { return false; }
+  // Flat namespace account doesn't support directory mtime.
+  bool have_directory_mtimes() const override { return false; }
+};
+
+class TestAzureHierarchicalNSGeneric : public TestGeneric {
+ public:
+  void SetUp() override {
+    auto env_result = AzureHierarchicalNSEnv::GetInstance();
+    if (env_result.status().IsCancelled()) {
+      GTEST_SKIP() << env_result.status().message();
+    }
+    ASSERT_OK_AND_ASSIGN(auto env, env_result);
+    SetUpInternal(env);
+  }
+};
+
+GENERIC_FS_TEST_FUNCTIONS(TestAzuriteGeneric);
+GENERIC_FS_TEST_FUNCTIONS(TestAzureFlatNSGeneric);
+GENERIC_FS_TEST_FUNCTIONS(TestAzureHierarchicalNSGeneric);
+
 TEST(AzureFileSystem, InitializingFilesystemWithoutAccountNameFails) {
   AzureOptions options;
   ASSERT_RAISES(Invalid, options.ConfigureAccountKeyCredential("account_key"));
@@ -324,6 +521,13 @@ TEST(AzureFileSystem, InitializeWithManagedIdentityCredential) {
   EXPECT_OK_AND_ASSIGN(fs, AzureFileSystem::Make(options));
 }
 
+TEST(AzureFileSystem, InitializeWithCLICredential) {
+  AzureOptions options;
+  options.account_name = "dummy-account-name";
+  ARROW_EXPECT_OK(options.ConfigureCLICredential());
+  EXPECT_OK_AND_ASSIGN(auto fs, AzureFileSystem::Make(options));
+}
+
 TEST(AzureFileSystem, InitializeWithWorkloadIdentityCredential) {
   AzureOptions options;
   options.account_name = "dummy-account-name";
@@ -331,6 +535,13 @@ TEST(AzureFileSystem, InitializeWithWorkloadIdentityCredential) {
   EXPECT_OK_AND_ASSIGN(auto fs, AzureFileSystem::Make(options));
 }
 
+TEST(AzureFileSystem, InitializeWithEnvironmentCredential) {
+  AzureOptions options;
+  options.account_name = "dummy-account-name";
+  ARROW_EXPECT_OK(options.ConfigureEnvironmentCredential());
+  EXPECT_OK_AND_ASSIGN(auto fs, AzureFileSystem::Make(options));
+}
+
 TEST(AzureFileSystem, OptionsCompare) {
   AzureOptions options;
   EXPECT_TRUE(options.Equals(options));
@@ -463,6 +674,15 @@ class TestAzureOptions : public ::testing::Test {
     ASSERT_EQ(options.credential_kind_, AzureOptions::CredentialKind::kManagedIdentity);
   }
 
+  void TestFromUriCredentialCLI() {
+    ASSERT_OK_AND_ASSIGN(
+        auto options,
+        AzureOptions::FromUri("abfs://account.blob.core.windows.net/container/dir/blob?"
+                              "credential_kind=cli",
+                              nullptr));
+    ASSERT_EQ(options.credential_kind_, AzureOptions::CredentialKind::kCLI);
+  }
+
   void TestFromUriCredentialWorkloadIdentity() {
     ASSERT_OK_AND_ASSIGN(
         auto options,
@@ -472,6 +692,15 @@ class TestAzureOptions : public ::testing::Test {
     ASSERT_EQ(options.credential_kind_, AzureOptions::CredentialKind::kWorkloadIdentity);
   }
 
+  void TestFromUriCredentialEnvironment() {
+    ASSERT_OK_AND_ASSIGN(
+        auto options,
+        AzureOptions::FromUri("abfs://account.blob.core.windows.net/container/dir/blob?"
+                              "credential_kind=environment",
+                              nullptr));
+    ASSERT_EQ(options.credential_kind_, AzureOptions::CredentialKind::kEnvironment);
+  }
+
   void TestFromUriCredentialInvalid() {
     ASSERT_RAISES(Invalid, AzureOptions::FromUri(
                                "abfs://file_system@account.dfs.core.windows.net/dir/file?"
@@ -502,6 +731,38 @@ class TestAzureOptions : public ::testing::Test {
                                "unknown=invalid",
                                nullptr));
   }
+
+  void TestMakeBlobServiceClientInvalidAccountName() {
+    AzureOptions options;
+    ASSERT_RAISES_WITH_MESSAGE(
+        Invalid, "Invalid: AzureOptions doesn't contain a valid account name",
+        options.MakeBlobServiceClient());
+  }
+
+  void TestMakeBlobServiceClientInvalidBlobStorageScheme() {
+    AzureOptions options;
+    options.account_name = "user";
+    options.blob_storage_scheme = "abfs";
+    ASSERT_RAISES_WITH_MESSAGE(
+        Invalid, "Invalid: AzureOptions::blob_storage_scheme must be http or https: abfs",
+        options.MakeBlobServiceClient());
+  }
+
+  void TestMakeDataLakeServiceClientInvalidAccountName() {
+    AzureOptions options;
+    ASSERT_RAISES_WITH_MESSAGE(
+        Invalid, "Invalid: AzureOptions doesn't contain a valid account name",
+        options.MakeDataLakeServiceClient());
+  }
+
+  void TestMakeDataLakeServiceClientInvalidDfsStorageScheme() {
+    AzureOptions options;
+    options.account_name = "user";
+    options.dfs_storage_scheme = "abfs";
+    ASSERT_RAISES_WITH_MESSAGE(
+        Invalid, "Invalid: AzureOptions::dfs_storage_scheme must be http or https: abfs",
+        options.MakeDataLakeServiceClient());
+  }
 };
 
 TEST_F(TestAzureOptions, FromUriBlobStorage) { TestFromUriBlobStorage(); }
@@ -520,9 +781,13 @@ TEST_F(TestAzureOptions, FromUriCredentialClientSecret) {
 TEST_F(TestAzureOptions, FromUriCredentialManagedIdentity) {
   TestFromUriCredentialManagedIdentity();
 }
+TEST_F(TestAzureOptions, FromUriCredentialCLI) { TestFromUriCredentialCLI(); }
 TEST_F(TestAzureOptions, FromUriCredentialWorkloadIdentity) {
   TestFromUriCredentialWorkloadIdentity();
 }
+TEST_F(TestAzureOptions, FromUriCredentialEnvironment) {
+  TestFromUriCredentialEnvironment();
+}
 TEST_F(TestAzureOptions, FromUriCredentialInvalid) { TestFromUriCredentialInvalid(); }
 TEST_F(TestAzureOptions, FromUriBlobStorageAuthority) {
   TestFromUriBlobStorageAuthority();
@@ -531,64 +796,18 @@ TEST_F(TestAzureOptions, FromUriDfsStorageAuthority) { TestFromUriDfsStorageAuth
 TEST_F(TestAzureOptions, FromUriInvalidQueryParameter) {
   TestFromUriInvalidQueryParameter();
 }
-
-struct PreexistingData {
- public:
-  using RNG = random::pcg32_fast;
-
- public:
-  const std::string container_name;
-  static constexpr char const* kObjectName = "test-object-name";
-
-  static constexpr char const* kLoremIpsum = R"""(
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
-incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis
-nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
-Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
-fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
-culpa qui officia deserunt mollit anim id est laborum.
-)""";
-
- public:
-  explicit PreexistingData(RNG& rng) : container_name{RandomContainerName(rng)} {}
-
-  // Creates a path by concatenating the container name and the stem.
-  std::string ContainerPath(std::string_view stem) const { return Path(stem); }
-
-  // Short alias to ContainerPath()
-  std::string Path(std::string_view stem) const {
-    return ConcatAbstractPath(container_name, stem);
-  }
-
-  std::string ObjectPath() const { return ContainerPath(kObjectName); }
-  std::string NotFoundObjectPath() const { return ContainerPath("not-found"); }
-
-  std::string RandomDirectoryPath(RNG& rng) const {
-    return ContainerPath(RandomChars(32, rng));
-  }
-
-  // Utilities
-  static std::string RandomContainerName(RNG& rng) { return RandomChars(32, rng); }
-
-  static std::string RandomChars(int count, RNG& rng) {
-    auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
-    std::uniform_int_distribution<int> d(0, static_cast<int>(fillers.size()) - 1);
-    std::string s;
-    std::generate_n(std::back_inserter(s), count, [&] { return fillers[d(rng)]; });
-    return s;
-  }
-
-  static int RandomIndex(int end, RNG& rng) {
-    return std::uniform_int_distribution<int>(0, end - 1)(rng);
-  }
-
-  static std::string RandomLine(int lineno, int width, RNG& rng) {
-    auto line = std::to_string(lineno) + ":    ";
-    line += RandomChars(width - static_cast<int>(line.size()) - 1, rng);
-    line += '\n';
-    return line;
-  }
-};
+TEST_F(TestAzureOptions, MakeBlobServiceClientInvalidAccountName) {
+  TestMakeBlobServiceClientInvalidAccountName();
+}
+TEST_F(TestAzureOptions, MakeBlobServiceClientInvalidBlobStorageScheme) {
+  TestMakeBlobServiceClientInvalidBlobStorageScheme();
+}
+TEST_F(TestAzureOptions, MakeDataLakeServiceClientInvalidAccountName) {
+  TestMakeDataLakeServiceClientInvalidAccountName();
+}
+TEST_F(TestAzureOptions, MakeDataLakeServiceClientInvalidDfsStorageScheme) {
+  TestMakeDataLakeServiceClientInvalidDfsStorageScheme();
+}
 
 class TestAzureFileSystem : public ::testing::Test {
  protected:
@@ -621,24 +840,6 @@ class TestAzureFileSystem : public ::testing::Test {
     return fs(CachedHNSSupport(*env));
   }
 
-  static Result<AzureOptions> MakeOptions(BaseAzureEnv* env) {
-    AzureOptions options;
-    options.account_name = env->account_name();
-    switch (env->backend()) {
-      case AzureBackend::kAzurite:
-        options.blob_storage_authority = "127.0.0.1:10000";
-        options.dfs_storage_authority = "127.0.0.1:10000";
-        options.blob_storage_scheme = "http";
-        options.dfs_storage_scheme = "http";
-        break;
-      case AzureBackend::kAzure:
-        // Use the default values
-        break;
-    }
-    ARROW_EXPECT_OK(options.ConfigureAccountKeyCredential(env->account_key()));
-    return options;
-  }
-
   void SetUp() override {
     auto make_options = [this]() -> Result<AzureOptions> {
       ARROW_ASSIGN_OR_RAISE(auto env, GetAzureEnv());
@@ -824,19 +1025,6 @@ class TestAzureFileSystem : public ::testing::Test {
       "This test is affected by an Azurite issue: "
       "https://github.com/Azure/Azurite/pull/2302";
 
-  /// Azurite has a bug that causes BlobContainerClient::SubmitBatch to fail on macOS.
-  /// SubmitBatch is used by:
-  ///  - AzureFileSystem::DeleteDir
-  ///  - AzureFileSystem::DeleteDirContents
-  bool HasSubmitBatchBug() const {
-#ifdef __APPLE__
-    EXPECT_OK_AND_ASSIGN(auto env, GetAzureEnv());
-    return env->backend() == AzureBackend::kAzurite;
-#else
-    return false;
-#endif
-  }
-
   static bool WithErrno(const Status& status, int expected_errno) {
     auto* detail = status.detail().get();
     return detail &&
@@ -1059,9 +1247,7 @@ class TestAzureFileSystem : public ::testing::Test {
 
     auto path2 = data.Path("directory2");
     ASSERT_OK(fs()->OpenOutputStream(path2));
-    // CreateDir returns OK even if there is already a file or directory at this
-    // location. Whether or not this is the desired behaviour is debatable.
-    ASSERT_OK(fs()->CreateDir(path2));
+    ASSERT_RAISES(IOError, fs()->CreateDir(path2));
     AssertFileInfo(fs(), path2, FileType::File);
   }
 
@@ -1070,7 +1256,8 @@ class TestAzureFileSystem : public ::testing::Test {
   }
 
   void TestDeleteDirSuccessEmpty() {
-    if (HasSubmitBatchBug()) {
+    ASSERT_OK_AND_ASSIGN(auto env, GetAzureEnv());
+    if (env->HasSubmitBatchBug()) {
       GTEST_SKIP() << kSubmitBatchBugMessage;
     }
     auto data = SetUpPreexistingData();
@@ -1090,7 +1277,8 @@ class TestAzureFileSystem : public ::testing::Test {
   }
 
   void TestDeleteDirSuccessHaveBlob() {
-    if (HasSubmitBatchBug()) {
+    ASSERT_OK_AND_ASSIGN(auto env, GetAzureEnv());
+    if (env->HasSubmitBatchBug()) {
       GTEST_SKIP() << kSubmitBatchBugMessage;
     }
     auto data = SetUpPreexistingData();
@@ -1105,7 +1293,8 @@ class TestAzureFileSystem : public ::testing::Test {
   }
 
   void TestNonEmptyDirWithTrailingSlash() {
-    if (HasSubmitBatchBug()) {
+    ASSERT_OK_AND_ASSIGN(auto env, GetAzureEnv());
+    if (env->HasSubmitBatchBug()) {
       GTEST_SKIP() << kSubmitBatchBugMessage;
     }
     auto data = SetUpPreexistingData();
@@ -1120,7 +1309,8 @@ class TestAzureFileSystem : public ::testing::Test {
   }
 
   void TestDeleteDirSuccessHaveDirectory() {
-    if (HasSubmitBatchBug()) {
+    ASSERT_OK_AND_ASSIGN(auto env, GetAzureEnv());
+    if (env->HasSubmitBatchBug()) {
       GTEST_SKIP() << kSubmitBatchBugMessage;
     }
     auto data = SetUpPreexistingData();
@@ -1135,7 +1325,8 @@ class TestAzureFileSystem : public ::testing::Test {
   }
 
   void TestDeleteDirContentsSuccessExist() {
-    if (HasSubmitBatchBug()) {
+    ASSERT_OK_AND_ASSIGN(auto env, GetAzureEnv());
+    if (env->HasSubmitBatchBug()) {
       GTEST_SKIP() << kSubmitBatchBugMessage;
     }
     auto preexisting_data = SetUpPreexistingData();
@@ -1149,7 +1340,8 @@ class TestAzureFileSystem : public ::testing::Test {
   }
 
   void TestDeleteDirContentsSuccessExistWithTrailingSlash() {
-    if (HasSubmitBatchBug()) {
+    ASSERT_OK_AND_ASSIGN(auto env, GetAzureEnv());
+    if (env->HasSubmitBatchBug()) {
       GTEST_SKIP() << kSubmitBatchBugMessage;
     }
     auto preexisting_data = SetUpPreexistingData();
@@ -1163,7 +1355,8 @@ class TestAzureFileSystem : public ::testing::Test {
   }
 
   void TestDeleteDirContentsSuccessNonexistent() {
-    if (HasSubmitBatchBug()) {
+    ASSERT_OK_AND_ASSIGN(auto env, GetAzureEnv());
+    if (env->HasSubmitBatchBug()) {
       GTEST_SKIP() << kSubmitBatchBugMessage;
     }
     auto data = SetUpPreexistingData();
@@ -2174,7 +2367,8 @@ TEST_F(TestAzuriteFileSystem, DeleteDirSuccessContainer) {
 }
 
 TEST_F(TestAzuriteFileSystem, DeleteDirSuccessNonexistent) {
-  if (HasSubmitBatchBug()) {
+  ASSERT_OK_AND_ASSIGN(auto env, GetAzureEnv());
+  if (env->HasSubmitBatchBug()) {
     GTEST_SKIP() << kSubmitBatchBugMessage;
   }
   auto data = SetUpPreexistingData();
@@ -2185,7 +2379,8 @@ TEST_F(TestAzuriteFileSystem, DeleteDirSuccessNonexistent) {
 }
 
 TEST_F(TestAzuriteFileSystem, DeleteDirSuccessHaveBlobs) {
-  if (HasSubmitBatchBug()) {
+  ASSERT_OK_AND_ASSIGN(auto env, GetAzureEnv());
+  if (env->HasSubmitBatchBug()) {
     GTEST_SKIP() << kSubmitBatchBugMessage;
   }
   auto data = SetUpPreexistingData();
@@ -2213,7 +2408,8 @@ TEST_F(TestAzuriteFileSystem, DeleteDirUri) {
 }
 
 TEST_F(TestAzuriteFileSystem, DeleteDirContentsSuccessContainer) {
-  if (HasSubmitBatchBug()) {
+  ASSERT_OK_AND_ASSIGN(auto env, GetAzureEnv());
+  if (env->HasSubmitBatchBug()) {
     GTEST_SKIP() << kSubmitBatchBugMessage;
   }
   auto data = SetUpPreexistingData();
@@ -2228,7 +2424,8 @@ TEST_F(TestAzuriteFileSystem, DeleteDirContentsSuccessContainer) {
 }
 
 TEST_F(TestAzuriteFileSystem, DeleteDirContentsSuccessDirectory) {
-  if (HasSubmitBatchBug()) {
+  ASSERT_OK_AND_ASSIGN(auto env, GetAzureEnv());
+  if (env->HasSubmitBatchBug()) {
     GTEST_SKIP() << kSubmitBatchBugMessage;
   }
   auto data = SetUpPreexistingData();
diff --git a/cpp/src/arrow/filesystem/filesystem.cc b/cpp/src/arrow/filesystem/filesystem.cc
index c96a5fd2cf280..284be685fa800 100644
--- a/cpp/src/arrow/filesystem/filesystem.cc
+++ b/cpp/src/arrow/filesystem/filesystem.cc
@@ -56,16 +56,13 @@
 #include "arrow/util/visibility.h"
 #include "arrow/util/windows_fixup.h"
 
-namespace arrow {
-
-using internal::checked_pointer_cast;
-using internal::TaskHints;
-using io::internal::SubmitIO;
-using util::Uri;
-
-namespace fs {
+namespace arrow::fs {
 
+using arrow::internal::checked_pointer_cast;
 using arrow::internal::GetEnvVar;
+using arrow::internal::TaskHints;
+using arrow::io::internal::SubmitIO;
+using arrow::util::Uri;
 using internal::ConcatAbstractPath;
 using internal::EnsureTrailingSlash;
 using internal::GetAbstractPathParent;
@@ -273,6 +270,11 @@ Result<std::string> FileSystem::PathFromUri(const std::string& uri_string) const
   return Status::NotImplemented("PathFromUri is not yet supported on this filesystem");
 }
 
+Result<std::string> FileSystem::MakeUri(std::string path) const {
+  return Status::NotImplemented("MakeUri is not yet supported for ", type_name(),
+                                " filesystems");
+}
+
 //////////////////////////////////////////////////////////////////////////
 // SubTreeFileSystem implementation
 
@@ -726,6 +728,10 @@ class FileSystemFactoryRegistry {
           main_registry->scheme_to_factory_.emplace(std::move(scheme), registered);
       if (success) continue;
 
+      if (it->second.ok()) {
+        if (registered->factory == it->second->factory) continue;
+      }
+
       duplicated_schemes.emplace_back(it->first);
     }
     scheme_to_factory_.clear();
@@ -755,8 +761,8 @@ class FileSystemFactoryRegistry {
     RETURN_NOT_OK(CheckValid());
 
     auto [it, success] = scheme_to_factory_.emplace(
-        std::move(scheme), Registered{std::move(factory), std::move(finalizer)});
-    if (success) {
+        std::move(scheme), Registered{factory, std::move(finalizer)});
+    if (success || (it->second.ok() && it->second->factory == factory)) {
       return Status::OK();
     }
 
@@ -852,18 +858,10 @@ Result<std::shared_ptr<FileSystem>> FileSystemFromUriReal(const Uri& uri,
         auto* factory,
         FileSystemFactoryRegistry::GetInstance()->FactoryForScheme(scheme));
     if (factory != nullptr) {
-      return (*factory)(uri, io_context, out_path);
+      return factory->function(uri, io_context, out_path);
     }
   }
 
-  if (scheme == "file") {
-    std::string path;
-    ARROW_ASSIGN_OR_RAISE(auto options, LocalFileSystemOptions::FromUri(uri, &path));
-    if (out_path != nullptr) {
-      *out_path = path;
-    }
-    return std::make_shared<LocalFileSystem>(options, io_context);
-  }
   if (scheme == "abfs" || scheme == "abfss") {
 #ifdef ARROW_AZURE
     ARROW_ASSIGN_OR_RAISE(auto options, AzureOptions::FromUri(uri, out_path));
@@ -969,5 +967,4 @@ Status Initialize(const FileSystemGlobalOptions& options) {
   return Status::OK();
 }
 
-}  // namespace fs
-}  // namespace arrow
+}  // namespace arrow::fs
diff --git a/cpp/src/arrow/filesystem/filesystem.h b/cpp/src/arrow/filesystem/filesystem.h
index 272e42256a388..d4f62f86a7482 100644
--- a/cpp/src/arrow/filesystem/filesystem.h
+++ b/cpp/src/arrow/filesystem/filesystem.h
@@ -197,6 +197,11 @@ class ARROW_EXPORT FileSystem
   /// \return The path inside the filesystem that is indicated by the URI.
   virtual Result<std::string> PathFromUri(const std::string& uri_string) const;
 
+  /// \brief Make a URI from which FileSystemFromUri produces an equivalent filesystem
+  /// \param path The path component to use in the resulting URI
+  /// \return A URI string, or an error if an equivalent URI cannot be produced
+  virtual Result<std::string> MakeUri(std::string path) const;
+
   virtual bool Equals(const FileSystem& other) const = 0;
 
   virtual bool Equals(const std::shared_ptr<FileSystem>& other) const {
@@ -352,8 +357,23 @@ class ARROW_EXPORT FileSystem
   bool default_async_is_sync_ = true;
 };
 
-using FileSystemFactory = std::function<Result<std::shared_ptr<FileSystem>>(
-    const Uri& uri, const io::IOContext& io_context, std::string* out_path)>;
+struct FileSystemFactory {
+  std::function<Result<std::shared_ptr<FileSystem>>(
+      const Uri& uri, const io::IOContext& io_context, std::string* out_path)>
+      function;
+  std::string_view file;
+  int line;
+
+  bool operator==(const FileSystemFactory& other) const {
+    // In the case where libarrow is linked statically both to the executable and to a
+    // dynamically loaded filesystem implementation library, the library contains a
+    // duplicate definition of the registry and duplicate definitions of any
+    // FileSystemRegistrars which are statically linked to libarrow. When retrieving
+    // factories from the filesystem implementation library, we use the file and line
+    // of the registrar's definition to determine equivalence of the duplicate factories.
+    return file == other.file && line == other.line;
+  }
+};
 
 /// \brief A FileSystem implementation that delegates to another
 /// implementation after prepending a fixed base path.
@@ -645,6 +665,12 @@ struct ARROW_EXPORT FileSystemRegistrar {
                       std::function<void()> finalizer = {});
 };
 
+#define ARROW_REGISTER_FILESYSTEM(scheme, factory_function, finalizer)            \
+  ::arrow::fs::FileSystemRegistrar {                                              \
+    scheme, ::arrow::fs::FileSystemFactory{factory_function, __FILE__, __LINE__}, \
+        finalizer                                                                 \
+  }
+
 /// @}
 
 namespace internal {
diff --git a/cpp/src/arrow/filesystem/localfs.cc b/cpp/src/arrow/filesystem/localfs.cc
index fbb33fd00868b..22d802d8f9f7f 100644
--- a/cpp/src/arrow/filesystem/localfs.cc
+++ b/cpp/src/arrow/filesystem/localfs.cc
@@ -39,6 +39,7 @@
 #include "arrow/io/type_fwd.h"
 #include "arrow/util/async_generator.h"
 #include "arrow/util/io_util.h"
+#include "arrow/util/string.h"
 #include "arrow/util/uri.h"
 #include "arrow/util/windows_fixup.h"
 
@@ -246,8 +247,20 @@ Result<LocalFileSystemOptions> LocalFileSystemOptions::FromUri(
         std::string(internal::RemoveTrailingSlash(uri.path(), /*preserve_root=*/true));
   }
 
-  // TODO handle use_mmap option
-  return LocalFileSystemOptions();
+  LocalFileSystemOptions options;
+  ARROW_ASSIGN_OR_RAISE(auto params, uri.query_items());
+  for (const auto& [key, value] : params) {
+    if (key == "use_mmap") {
+      if (value.empty()) {
+        options.use_mmap = true;
+        continue;
+      } else {
+        ARROW_ASSIGN_OR_RAISE(options.use_mmap, ::arrow::internal::ParseBoolean(value));
+      }
+      break;
+    }
+  }
+  return options;
 }
 
 LocalFileSystem::LocalFileSystem(const io::IOContext& io_context)
@@ -273,6 +286,11 @@ Result<std::string> LocalFileSystem::PathFromUri(const std::string& uri_string)
                                      authority_handling);
 }
 
+Result<std::string> LocalFileSystem::MakeUri(std::string path) const {
+  ARROW_ASSIGN_OR_RAISE(path, DoNormalizePath(std::move(path)));
+  return "file://" + path + (options_.use_mmap ? "?use_mmap" : "");
+}
+
 bool LocalFileSystem::Equals(const FileSystem& other) const {
   if (other.type_name() != type_name()) {
     return false;
@@ -506,7 +524,7 @@ class AsyncStatSelector {
     ARROW_ASSIGN_OR_RAISE(
         auto gen,
         MakeBackgroundGenerator(Iterator<FileInfoVector>(DiscoveryImplIterator(
-                                    std::move(dir_fn), nesting_depth, std::move(selector),
+                                    dir_fn, nesting_depth, std::move(selector),
                                     discovery_state, io_context, file_info_batch_size)),
                                 io_context.executor()));
     gen = MakeTransferredGenerator(std::move(gen), io_context.executor());
@@ -686,4 +704,19 @@ Result<std::shared_ptr<io::OutputStream>> LocalFileSystem::OpenAppendStream(
   return OpenOutputStreamGeneric(path, truncate, append);
 }
 
+static Result<std::shared_ptr<fs::FileSystem>> LocalFileSystemFactory(
+    const arrow::util::Uri& uri, const io::IOContext& io_context, std::string* out_path) {
+  std::string path;
+  ARROW_ASSIGN_OR_RAISE(auto options, LocalFileSystemOptions::FromUri(uri, &path));
+  if (out_path != nullptr) {
+    *out_path = std::move(path);
+  }
+  return std::make_shared<LocalFileSystem>(options, io_context);
+}
+
+FileSystemRegistrar kLocalFileSystemModule[]{
+    ARROW_REGISTER_FILESYSTEM("file", LocalFileSystemFactory, {}),
+    ARROW_REGISTER_FILESYSTEM("local", LocalFileSystemFactory, {}),
+};
+
 }  // namespace arrow::fs
diff --git a/cpp/src/arrow/filesystem/localfs.h b/cpp/src/arrow/filesystem/localfs.h
index 45a3da317f663..d72e8f7d74d51 100644
--- a/cpp/src/arrow/filesystem/localfs.h
+++ b/cpp/src/arrow/filesystem/localfs.h
@@ -83,6 +83,7 @@ class ARROW_EXPORT LocalFileSystem : public FileSystem {
 
   Result<std::string> NormalizePath(std::string path) override;
   Result<std::string> PathFromUri(const std::string& uri_string) const override;
+  Result<std::string> MakeUri(std::string path) const override;
 
   bool Equals(const FileSystem& other) const override;
 
diff --git a/cpp/src/arrow/filesystem/localfs_test.cc b/cpp/src/arrow/filesystem/localfs_test.cc
index f90833a88d118..6dd7a8c75586c 100644
--- a/cpp/src/arrow/filesystem/localfs_test.cc
+++ b/cpp/src/arrow/filesystem/localfs_test.cc
@@ -15,8 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <cerrno>
-#include <chrono>
 #include <memory>
 #include <sstream>
 #include <string>
@@ -113,10 +111,8 @@ Result<std::shared_ptr<FileSystem>> SlowFileSystemFactory(const Uri& uri,
   }
   return std::make_shared<SlowFileSystemPublicProps>(base_fs, average_latency, seed);
 }
-FileSystemRegistrar kSlowFileSystemModule{
-    "slowfile",
-    SlowFileSystemFactory,
-};
+auto kSlowFileSystemModule =
+    ARROW_REGISTER_FILESYSTEM("slowfile", SlowFileSystemFactory, {});
 
 TEST(FileSystemFromUri, LinkedRegisteredFactory) {
   // Since the registrar's definition is in this translation unit (which is linked to the
@@ -138,6 +134,9 @@ TEST(FileSystemFromUri, LinkedRegisteredFactory) {
 }
 
 TEST(FileSystemFromUri, LoadedRegisteredFactory) {
+#ifdef __EMSCRIPTEN__
+  GTEST_SKIP() << "Emscripten dynamic library testing disabled";
+#endif
   // Since the registrar's definition is in libarrow_filesystem_example.so,
   // its factory will be registered only after the library is dynamically loaded.
   std::string path;
@@ -155,23 +154,25 @@ TEST(FileSystemFromUri, RuntimeRegisteredFactory) {
   EXPECT_THAT(FileSystemFromUri("slowfile2:///hey/yo", &path),
               Raises(StatusCode::Invalid));
 
-  EXPECT_THAT(RegisterFileSystemFactory("slowfile2", SlowFileSystemFactory), Ok());
+  EXPECT_THAT(
+      RegisterFileSystemFactory("slowfile2", {SlowFileSystemFactory, __FILE__, __LINE__}),
+      Ok());
 
   ASSERT_OK_AND_ASSIGN(auto fs, FileSystemFromUri("slowfile2:///hey/yo", &path));
   EXPECT_EQ(path, "/hey/yo");
   EXPECT_EQ(fs->type_name(), "slow");
 
   EXPECT_THAT(
-      RegisterFileSystemFactory("slowfile2", SlowFileSystemFactory),
+      RegisterFileSystemFactory("slowfile2", {SlowFileSystemFactory, __FILE__, __LINE__}),
       Raises(StatusCode::KeyError,
              testing::HasSubstr("Attempted to register factory for scheme 'slowfile2' "
                                 "but that scheme is already registered")));
 }
 
 FileSystemRegistrar kSegfaultFileSystemModule[]{
-    {"segfault", nullptr},
-    {"segfault", nullptr},
-    {"segfault", nullptr},
+    ARROW_REGISTER_FILESYSTEM("segfault", nullptr, {}),
+    ARROW_REGISTER_FILESYSTEM("segfault", nullptr, {}),
+    ARROW_REGISTER_FILESYSTEM("segfault", nullptr, {}),
 };
 TEST(FileSystemFromUri, LinkedRegisteredFactoryNameCollision) {
   // Since multiple registrars are defined in this translation unit which all
@@ -309,6 +310,7 @@ class TestLocalFS : public LocalFSTestMixin {
     std::string path;
     ASSERT_OK_AND_ASSIGN(fs_, fs_from_uri(uri, &path));
     ASSERT_EQ(fs_->type_name(), "local");
+    local_fs_ = ::arrow::internal::checked_pointer_cast<LocalFileSystem>(fs_);
     ASSERT_EQ(path, expected_path);
     ASSERT_OK_AND_ASSIGN(path, fs_->PathFromUri(uri));
     ASSERT_EQ(path, expected_path);
@@ -420,8 +422,17 @@ TYPED_TEST(TestLocalFS, FileSystemFromUriFile) {
 
   // Variations
   this->TestLocalUri("file:/foo/bar", "/foo/bar");
+  ASSERT_FALSE(this->local_fs_->options().use_mmap);
   this->TestLocalUri("file:///foo/bar", "/foo/bar");
   this->TestLocalUri("file:///some%20path/%25percent", "/some path/%percent");
+
+  this->TestLocalUri("file:///_?use_mmap", "/_");
+  if (this->path_formatter_.supports_uri()) {
+    ASSERT_TRUE(this->local_fs_->options().use_mmap);
+    ASSERT_OK_AND_ASSIGN(auto uri, this->fs_->MakeUri("/_"));
+    EXPECT_EQ(uri, "file:///_?use_mmap");
+  }
+
 #ifdef _WIN32
   this->TestLocalUri("file:/C:/foo/bar", "C:/foo/bar");
   this->TestLocalUri("file:///C:/foo/bar", "C:/foo/bar");
@@ -532,7 +543,7 @@ struct DirTreeCreator {
   Result<FileInfoVector> Create(const std::string& base) {
     FileInfoVector infos;
     RETURN_NOT_OK(Create(base, 0, &infos));
-    return std::move(infos);
+    return infos;
   }
 
   Status Create(const std::string& base, int depth, FileInfoVector* infos) {
diff --git a/cpp/src/arrow/filesystem/s3fs.cc b/cpp/src/arrow/filesystem/s3fs.cc
index 640888e1c4fa5..99cee19ed1e78 100644
--- a/cpp/src/arrow/filesystem/s3fs.cc
+++ b/cpp/src/arrow/filesystem/s3fs.cc
@@ -601,44 +601,81 @@ class S3Client : public Aws::S3::S3Client {
  public:
   using Aws::S3::S3Client::S3Client;
 
+  static inline constexpr auto kBucketRegionHeaderName = "x-amz-bucket-region";
+
+  std::string GetBucketRegionFromHeaders(
+      const Aws::Http::HeaderValueCollection& headers) {
+    const auto it = headers.find(ToAwsString(kBucketRegionHeaderName));
+    if (it != headers.end()) {
+      return std::string(FromAwsString(it->second));
+    }
+    return std::string();
+  }
+
+  template <typename ErrorType>
+  Result<std::string> GetBucketRegionFromError(
+      const std::string& bucket, const Aws::Client::AWSError<ErrorType>& error) {
+    std::string region = GetBucketRegionFromHeaders(error.GetResponseHeaders());
+    if (!region.empty()) {
+      return region;
+    } else if (error.GetResponseCode() == Aws::Http::HttpResponseCode::NOT_FOUND) {
+      return Status::IOError("Bucket '", bucket, "' not found");
+    } else {
+      return ErrorToStatus(
+          std::forward_as_tuple("When resolving region for bucket '", bucket, "': "),
+          "HeadBucket", error);
+    }
+  }
+
+#if ARROW_AWS_SDK_VERSION_CHECK(1, 11, 212)
+  // HeadBucketResult::GetBucketRegion appeared in AWS SDK 1.11.212
+  Result<std::string> GetBucketRegion(const std::string& bucket,
+                                      const S3Model::HeadBucketRequest& request) {
+    auto outcome = this->HeadBucket(request);
+    if (!outcome.IsSuccess()) {
+      return GetBucketRegionFromError(bucket, outcome.GetError());
+    }
+    auto&& region = std::move(outcome).GetResult().GetBucketRegion();
+    if (region.empty()) {
+      return Status::IOError("When resolving region for bucket '", request.GetBucket(),
+                             "': missing 'x-amz-bucket-region' header in response");
+    }
+    return region;
+  }
+#else
   // To get a bucket's region, we must extract the "x-amz-bucket-region" header
   // from the response to a HEAD bucket request.
   // Unfortunately, the S3Client APIs don't let us access the headers of successful
   // responses.  So we have to cook a AWS request and issue it ourselves.
-
-  Result<std::string> GetBucketRegion(const S3Model::HeadBucketRequest& request) {
+  Result<std::string> GetBucketRegion(const std::string& bucket,
+                                      const S3Model::HeadBucketRequest& request) {
     auto uri = GeneratePresignedUrl(request.GetBucket(),
                                     /*key=*/"", Aws::Http::HttpMethod::HTTP_HEAD);
     // NOTE: The signer region argument isn't passed here, as there's no easy
     // way of computing it (the relevant method is private).
     auto outcome = MakeRequest(uri, request, Aws::Http::HttpMethod::HTTP_HEAD,
                                Aws::Auth::SIGV4_SIGNER);
-    const auto code = outcome.IsSuccess() ? outcome.GetResult().GetResponseCode()
-                                          : outcome.GetError().GetResponseCode();
-    const auto& headers = outcome.IsSuccess()
-                              ? outcome.GetResult().GetHeaderValueCollection()
-                              : outcome.GetError().GetResponseHeaders();
-
-    const auto it = headers.find(ToAwsString("x-amz-bucket-region"));
-    if (it == headers.end()) {
-      if (code == Aws::Http::HttpResponseCode::NOT_FOUND) {
-        return Status::IOError("Bucket '", request.GetBucket(), "' not found");
-      } else if (!outcome.IsSuccess()) {
-        return ErrorToStatus(std::forward_as_tuple("When resolving region for bucket '",
-                                                   request.GetBucket(), "': "),
-                             "HeadBucket", outcome.GetError());
-      } else {
-        return Status::IOError("When resolving region for bucket '", request.GetBucket(),
-                               "': missing 'x-amz-bucket-region' header in response");
-      }
+    if (!outcome.IsSuccess()) {
+      return GetBucketRegionFromError(bucket, outcome.GetError());
+    }
+    std::string region =
+        GetBucketRegionFromHeaders(outcome.GetResult().GetHeaderValueCollection());
+    if (!region.empty()) {
+      return region;
+    } else if (outcome.GetResult().GetResponseCode() ==
+               Aws::Http::HttpResponseCode::NOT_FOUND) {
+      return Status::IOError("Bucket '", request.GetBucket(), "' not found");
+    } else {
+      return Status::IOError("When resolving region for bucket '", request.GetBucket(),
+                             "': missing 'x-amz-bucket-region' header in response");
     }
-    return std::string(FromAwsString(it->second));
   }
+#endif
 
   Result<std::string> GetBucketRegion(const std::string& bucket) {
     S3Model::HeadBucketRequest req;
     req.SetBucket(ToAwsString(bucket));
-    return GetBucketRegion(req);
+    return GetBucketRegion(bucket, req);
   }
 
   S3Model::CompleteMultipartUploadOutcome CompleteMultipartUploadWithErrorFixup(
@@ -1510,7 +1547,8 @@ class ObjectInputFile final : public io::RandomAccessFile {
       DCHECK_LE(bytes_read, nbytes);
       RETURN_NOT_OK(buf->Resize(bytes_read));
     }
-    return std::move(buf);
+    // R build with openSUSE155 requires an explicit shared_ptr construction
+    return std::shared_ptr<Buffer>(std::move(buf));
   }
 
   Result<int64_t> Read(int64_t nbytes, void* out) override {
@@ -1522,7 +1560,7 @@ class ObjectInputFile final : public io::RandomAccessFile {
   Result<std::shared_ptr<Buffer>> Read(int64_t nbytes) override {
     ARROW_ASSIGN_OR_RAISE(auto buffer, ReadAt(pos_, nbytes));
     pos_ += buffer->size();
-    return std::move(buffer);
+    return buffer;
   }
 
  protected:
@@ -1568,6 +1606,10 @@ class ObjectOutputStream final : public io::OutputStream {
     io::internal::CloseFromDestructor(this);
   }
 
+  std::shared_ptr<ObjectOutputStream> Self() {
+    return std::dynamic_pointer_cast<ObjectOutputStream>(shared_from_this());
+  }
+
   Status Init() {
     ARROW_ASSIGN_OR_RAISE(auto client_lock, holder_->Lock());
 
@@ -1686,9 +1728,9 @@ class ObjectOutputStream final : public io::OutputStream {
 
     RETURN_NOT_OK(EnsureReadyToFlushFromClose());
 
-    auto self = std::dynamic_pointer_cast<ObjectOutputStream>(shared_from_this());
     // Wait for in-progress uploads to finish (if async writes are enabled)
-    return FlushAsync().Then([self]() { return self->FinishPartUploadAfterFlush(); });
+    return FlushAsync().Then(
+        [self = Self()]() { return self->FinishPartUploadAfterFlush(); });
   }
 
   bool closed() const override { return closed_; }
@@ -1854,7 +1896,15 @@ class ObjectOutputStream final : public io::OutputStream {
     }
     // Notify completion
     if (--state->parts_in_progress == 0) {
-      state->pending_parts_completed.MarkFinished(state->status);
+      // GH-41862: avoid potential deadlock if the Future's callback is called
+      // with the mutex taken.
+      auto fut = state->pending_parts_completed;
+      lock.unlock();
+      // State could be mutated concurrently if another thread writes to the
+      // stream, but in this case the Flush() call is only advisory anyway.
+      // Besides, it's not generally sound to write to an OutputStream from
+      // several threads at once.
+      fut.MarkFinished(state->status);
     }
   }
 
@@ -2859,6 +2909,7 @@ Status S3FileSystem::CreateDir(const std::string& s, bool recursive) {
     return impl_->CreateBucket(path.bucket);
   }
 
+  FileInfo file_info;
   // Create object
   if (recursive) {
     // Ensure bucket exists
@@ -2866,10 +2917,33 @@ Status S3FileSystem::CreateDir(const std::string& s, bool recursive) {
     if (!bucket_exists) {
       RETURN_NOT_OK(impl_->CreateBucket(path.bucket));
     }
+
+    auto key_i = path.key_parts.begin();
+    std::string parent_key{};
+    if (options().check_directory_existence_before_creation) {
+      // Walk up the directory first to find the first existing parent
+      for (const auto& part : path.key_parts) {
+        parent_key += part;
+        parent_key += kSep;
+      }
+      for (key_i = path.key_parts.end(); key_i-- != path.key_parts.begin();) {
+        ARROW_ASSIGN_OR_RAISE(file_info,
+                              this->GetFileInfo(path.bucket + kSep + parent_key));
+        if (file_info.type() != FileType::NotFound) {
+          // Found!
+          break;
+        } else {
+          // remove the kSep and the part
+          parent_key.pop_back();
+          parent_key.erase(parent_key.end() - key_i->size(), parent_key.end());
+        }
+      }
+      key_i++;  // Above for loop moves one extra iterator at the end
+    }
     // Ensure that all parents exist, then the directory itself
-    std::string parent_key;
-    for (const auto& part : path.key_parts) {
-      parent_key += part;
+    // Create all missing directories
+    for (; key_i < path.key_parts.end(); ++key_i) {
+      parent_key += *key_i;
       parent_key += kSep;
       RETURN_NOT_OK(impl_->CreateEmptyDir(path.bucket, parent_key));
     }
@@ -2887,11 +2961,18 @@ Status S3FileSystem::CreateDir(const std::string& s, bool recursive) {
                                "': parent directory does not exist");
       }
     }
+  }
 
-    // XXX Should we check that no non-directory entry exists?
-    // Minio does it for us, not sure about other S3 implementations.
-    return impl_->CreateEmptyDir(path.bucket, path.key);
+  // Check if the directory exists already
+  if (options().check_directory_existence_before_creation) {
+    ARROW_ASSIGN_OR_RAISE(file_info, this->GetFileInfo(path.full_path));
+    if (file_info.type() != FileType::NotFound) {
+      return Status::OK();
+    }
   }
+  // XXX Should we check that no non-directory entry exists?
+  // Minio does it for us, not sure about other S3 implementations.
+  return impl_->CreateEmptyDir(path.bucket, path.key);
 }
 
 Status S3FileSystem::DeleteDir(const std::string& s) {
diff --git a/cpp/src/arrow/filesystem/s3fs.h b/cpp/src/arrow/filesystem/s3fs.h
index 82d08bc5ea89a..fbbe9d0b3f42b 100644
--- a/cpp/src/arrow/filesystem/s3fs.h
+++ b/cpp/src/arrow/filesystem/s3fs.h
@@ -166,6 +166,17 @@ struct ARROW_EXPORT S3Options {
   /// Whether to allow deletion of buckets
   bool allow_bucket_deletion = false;
 
+  /// Whether to allow pessimistic directory creation in CreateDir function
+  ///
+  /// By default, CreateDir function will try to create the directory without checking its
+  /// existence. It's an optimization to try directory creation and catch the error,
+  /// rather than issue two dependent I/O calls.
+  /// Though for key/value storage like Google Cloud Storage, too many creation calls will
+  /// breach the rate limit for object mutation operations and cause serious consequences.
+  /// It's also possible you don't have creation access for the parent directory. Set it
+  /// to be true to address these scenarios.
+  bool check_directory_existence_before_creation = false;
+
   /// \brief Default metadata for OpenOutputStream.
   ///
   /// This will be ignored if non-empty metadata is passed to OpenOutputStream.
diff --git a/cpp/src/arrow/filesystem/s3fs_test.cc b/cpp/src/arrow/filesystem/s3fs_test.cc
index 88cc96956e34c..5a160a78ceea0 100644
--- a/cpp/src/arrow/filesystem/s3fs_test.cc
+++ b/cpp/src/arrow/filesystem/s3fs_test.cc
@@ -614,9 +614,26 @@ class TestS3FS : public S3TestMixin {
     // after CloseAsync or synchronously after stream.reset() since we're just
     // checking that `closeAsyncFut` keeps the stream alive until completion
     // rather than segfaulting on a dangling stream
-    auto closeAsyncFut = stream->CloseAsync();
+    auto close_fut = stream->CloseAsync();
     stream.reset();
-    ASSERT_OK(closeAsyncFut.MoveResult());
+    ASSERT_OK(close_fut.MoveResult());
+    AssertObjectContents(client_.get(), "bucket", "somefile", "new data");
+  }
+
+  void TestOpenOutputStreamCloseAsyncFutureDeadlock() {
+    // This is inspired by GH-41862, though it fails to reproduce the actual
+    // issue reported there (actual preconditions might be required).
+    // Here we lose our reference to an output stream from its CloseAsync callback.
+    // This should not deadlock.
+    std::shared_ptr<io::OutputStream> stream;
+    ASSERT_OK_AND_ASSIGN(stream, fs_->OpenOutputStream("bucket/somefile"));
+    ASSERT_OK(stream->Write("new data"));
+    auto close_fut = stream->CloseAsync();
+    close_fut.AddCallback([stream = std::move(stream)](Status st) mutable {
+      // Trigger stream destruction from callback
+      stream.reset();
+    });
+    ASSERT_OK(close_fut.MoveResult());
     AssertObjectContents(client_.get(), "bucket", "somefile", "new data");
   }
 
@@ -922,9 +939,13 @@ TEST_F(TestS3FS, CreateDir) {
 
   // New "directory"
   AssertFileInfo(fs_.get(), "bucket/newdir", FileType::NotFound);
-  ASSERT_OK(fs_->CreateDir("bucket/newdir"));
+  ASSERT_OK(fs_->CreateDir("bucket/newdir", /*recursive=*/false));
   AssertFileInfo(fs_.get(), "bucket/newdir", FileType::Directory);
 
+  // By default CreateDir uses recursvie mode, make it explictly to be false
+  ASSERT_RAISES(IOError,
+                fs_->CreateDir("bucket/newdir/newsub/newsubsub", /*recursive=*/false));
+
   // New "directory", recursive
   ASSERT_OK(fs_->CreateDir("bucket/newdir/newsub/newsubsub", /*recursive=*/true));
   AssertFileInfo(fs_.get(), "bucket/newdir/newsub", FileType::Directory);
@@ -939,6 +960,31 @@ TEST_F(TestS3FS, CreateDir) {
   // Extraneous slashes
   ASSERT_RAISES(Invalid, fs_->CreateDir("bucket//somedir"));
   ASSERT_RAISES(Invalid, fs_->CreateDir("bucket/somedir//newdir"));
+
+  // check existing before creation
+  options_.check_directory_existence_before_creation = true;
+  MakeFileSystem();
+  // New "directory" again
+  AssertFileInfo(fs_.get(), "bucket/checknewdir", FileType::NotFound);
+  ASSERT_OK(fs_->CreateDir("bucket/checknewdir"));
+  AssertFileInfo(fs_.get(), "bucket/checknewdir", FileType::Directory);
+
+  ASSERT_RAISES(IOError, fs_->CreateDir("bucket/checknewdir/newsub/newsubsub/newsubsub/",
+                                        /*recursive=*/false));
+
+  // New "directory" again, recursive
+  ASSERT_OK(fs_->CreateDir("bucket/checknewdir/newsub/newsubsub", /*recursive=*/true));
+  AssertFileInfo(fs_.get(), "bucket/checknewdir/newsub", FileType::Directory);
+  AssertFileInfo(fs_.get(), "bucket/checknewdir/newsub/newsubsub", FileType::Directory);
+  AssertFileInfo(fs_.get(), "bucket/checknewdir/newsub/newsubsub/newsubsub",
+                 FileType::NotFound);
+  // Try creation with the same name
+  ASSERT_OK(fs_->CreateDir("bucket/checknewdir/newsub/newsubsub/newsubsub/",
+                           /*recursive=*/true));
+  AssertFileInfo(fs_.get(), "bucket/checknewdir/newsub", FileType::Directory);
+  AssertFileInfo(fs_.get(), "bucket/checknewdir/newsub/newsubsub", FileType::Directory);
+  AssertFileInfo(fs_.get(), "bucket/checknewdir/newsub/newsubsub/newsubsub",
+                 FileType::Directory);
 }
 
 TEST_F(TestS3FS, DeleteFile) {
@@ -1225,6 +1271,16 @@ TEST_F(TestS3FS, OpenOutputStreamAsyncDestructorSyncWrite) {
   TestOpenOutputStreamCloseAsyncDestructor();
 }
 
+TEST_F(TestS3FS, OpenOutputStreamCloseAsyncFutureDeadlockBackgroundWrites) {
+  TestOpenOutputStreamCloseAsyncFutureDeadlock();
+}
+
+TEST_F(TestS3FS, OpenOutputStreamCloseAsyncFutureDeadlockSyncWrite) {
+  options_.background_writes = false;
+  MakeFileSystem();
+  TestOpenOutputStreamCloseAsyncFutureDeadlock();
+}
+
 TEST_F(TestS3FS, OpenOutputStreamMetadata) {
   std::shared_ptr<io::OutputStream> stream;
 
diff --git a/cpp/src/arrow/filesystem/test_util.cc b/cpp/src/arrow/filesystem/test_util.cc
index 040917dcd218a..8eb00b8ae44f3 100644
--- a/cpp/src/arrow/filesystem/test_util.cc
+++ b/cpp/src/arrow/filesystem/test_util.cc
@@ -252,8 +252,7 @@ void GenericFileSystemTest::TestCreateDir(FileSystem* fs) {
 }
 
 void GenericFileSystemTest::TestDeleteDir(FileSystem* fs) {
-  if (have_flaky_directory_tree_deletion())
-    GTEST_SKIP() << "Flaky directory deletion on Windows";
+  if (have_flaky_directory_tree_deletion()) GTEST_SKIP() << "Flaky directory deletion";
 
   ASSERT_OK(fs->CreateDir("AB/CD/EF"));
   ASSERT_OK(fs->CreateDir("AB/GH/IJ"));
@@ -281,8 +280,7 @@ void GenericFileSystemTest::TestDeleteDir(FileSystem* fs) {
 }
 
 void GenericFileSystemTest::TestDeleteDirContents(FileSystem* fs) {
-  if (have_flaky_directory_tree_deletion())
-    GTEST_SKIP() << "Flaky directory deletion on Windows";
+  if (have_flaky_directory_tree_deletion()) GTEST_SKIP() << "Flaky directory deletion";
 
   ASSERT_OK(fs->CreateDir("AB/CD/EF"));
   ASSERT_OK(fs->CreateDir("AB/GH/IJ"));
@@ -313,6 +311,8 @@ void GenericFileSystemTest::TestDeleteDirContents(FileSystem* fs) {
 }
 
 void GenericFileSystemTest::TestDeleteRootDirContents(FileSystem* fs) {
+  if (have_flaky_directory_tree_deletion()) GTEST_SKIP() << "Flaky directory deletion";
+
   ASSERT_OK(fs->CreateDir("AB/CD"));
   CreateFile(fs, "AB/abc", "");
 
@@ -323,9 +323,7 @@ void GenericFileSystemTest::TestDeleteRootDirContents(FileSystem* fs) {
     AssertAllDirs(fs, {"AB", "AB/CD"});
     AssertAllFiles(fs, {"AB/abc"});
   } else {
-    if (!have_flaky_directory_tree_deletion()) {
-      AssertAllDirs(fs, {});
-    }
+    AssertAllDirs(fs, {});
     AssertAllFiles(fs, {});
   }
 }
@@ -385,6 +383,10 @@ void GenericFileSystemTest::TestDeleteFiles(FileSystem* fs) {
 }
 
 void GenericFileSystemTest::TestMoveFile(FileSystem* fs) {
+  if (!allow_move_file()) {
+    GTEST_SKIP() << "Filesystem doesn't allow moving files";
+  }
+
   ASSERT_OK(fs->CreateDir("AB/CD"));
   ASSERT_OK(fs->CreateDir("EF"));
   CreateFile(fs, "abc", "data");
@@ -750,6 +752,12 @@ void GenericFileSystemTest::TestGetFileInfoSelector(FileSystem* fs) {
 }
 
 void GenericFileSystemTest::TestGetFileInfoGenerator(FileSystem* fs) {
+#if defined(ADDRESS_SANITIZER) || defined(ARROW_VALGRIND)
+  if (have_false_positive_memory_leak_with_generator()) {
+    GTEST_SKIP() << "Filesystem have false positive memory leak with generator";
+  }
+#endif
+
   ASSERT_OK(fs->CreateDir("AB/CD"));
   CreateFile(fs, "abc", "data");
   CreateFile(fs, "AB/def", "some data");
@@ -1177,8 +1185,12 @@ void GenericFileSystemTest::TestSpecialChars(FileSystem* fs) {
   AssertFileContents(fs, "Special and%different.txt", "data");
 
   ASSERT_OK(fs->DeleteFile("Special and%different.txt"));
-  ASSERT_OK(fs->DeleteDir("Blank Char"));
-  AssertAllDirs(fs, {});
+  if (have_flaky_directory_tree_deletion()) {
+    ASSERT_OK(fs->DeleteFile("Blank Char/Special%Char.txt"));
+  } else {
+    ASSERT_OK(fs->DeleteDir("Blank Char"));
+    AssertAllDirs(fs, {});
+  }
   AssertAllFiles(fs, {});
 }
 
diff --git a/cpp/src/arrow/filesystem/test_util.h b/cpp/src/arrow/filesystem/test_util.h
index 62b488e159a24..e70c787aa85c4 100644
--- a/cpp/src/arrow/filesystem/test_util.h
+++ b/cpp/src/arrow/filesystem/test_util.h
@@ -168,6 +168,8 @@ class ARROW_TESTING_EXPORT GenericFileSystemTest {
   virtual bool allow_write_file_over_dir() const { return false; }
   // - Whether the filesystem allows reading a directory
   virtual bool allow_read_dir_as_file() const { return false; }
+  // - Whether the filesystem allows moving a file
+  virtual bool allow_move_file() const { return true; }
   // - Whether the filesystem allows moving a directory
   virtual bool allow_move_dir() const { return true; }
   // - Whether the filesystem allows moving a directory "over" a non-empty destination
@@ -182,6 +184,8 @@ class ARROW_TESTING_EXPORT GenericFileSystemTest {
   virtual bool have_flaky_directory_tree_deletion() const { return false; }
   // - Whether the filesystem stores some metadata alongside files
   virtual bool have_file_metadata() const { return false; }
+  // - Whether the filesystem has a false positive memory leak with generator
+  virtual bool have_false_positive_memory_leak_with_generator() const { return false; }
 
   void TestEmpty(FileSystem* fs);
   void TestNormalizePath(FileSystem* fs);
diff --git a/cpp/src/arrow/filesystem/util_internal.cc b/cpp/src/arrow/filesystem/util_internal.cc
index d69f6c896d08e..be43e14e84337 100644
--- a/cpp/src/arrow/filesystem/util_internal.cc
+++ b/cpp/src/arrow/filesystem/util_internal.cc
@@ -103,7 +103,7 @@ Result<Uri> ParseFileSystemUri(const std::string& uri_string) {
     return status;
 #endif
   }
-  return std::move(uri);
+  return uri;
 }
 
 #ifdef _WIN32
diff --git a/cpp/src/arrow/flight/CMakeLists.txt b/cpp/src/arrow/flight/CMakeLists.txt
index 8eba89b8e78a6..43ac48b87678e 100644
--- a/cpp/src/arrow/flight/CMakeLists.txt
+++ b/cpp/src/arrow/flight/CMakeLists.txt
@@ -157,6 +157,10 @@ set(ARROW_FLIGHT_SRCS
     transport/grpc/util_internal.cc
     types.cc)
 
+if(ARROW_WITH_OPENTELEMETRY)
+  list(APPEND ARROW_FLIGHT_SRCS otel_logging.cc)
+endif()
+
 if(MSVC)
   # Protobuf generated files trigger spurious warnings on MSVC.
   foreach(GENERATED_SOURCE "${CMAKE_CURRENT_BINARY_DIR}/Flight.pb.cc"
diff --git a/cpp/src/arrow/flight/client.cc b/cpp/src/arrow/flight/client.cc
index 4d4f13a09fb26..58a3ba4ab83e5 100644
--- a/cpp/src/arrow/flight/client.cc
+++ b/cpp/src/arrow/flight/client.cc
@@ -591,7 +591,7 @@ arrow::Result<CancelFlightInfoResult> FlightClient::CancelFlightInfo(
   ARROW_ASSIGN_OR_RAISE(auto cancel_result, CancelFlightInfoResult::Deserialize(
                                                 std::string_view(*result->body)));
   ARROW_RETURN_NOT_OK(stream->Drain());
-  return std::move(cancel_result);
+  return cancel_result;
 }
 
 arrow::Result<FlightEndpoint> FlightClient::RenewFlightEndpoint(
@@ -603,7 +603,7 @@ arrow::Result<FlightEndpoint> FlightClient::RenewFlightEndpoint(
   ARROW_ASSIGN_OR_RAISE(auto renewed_endpoint,
                         FlightEndpoint::Deserialize(std::string_view(*result->body)));
   ARROW_RETURN_NOT_OK(stream->Drain());
-  return std::move(renewed_endpoint);
+  return renewed_endpoint;
 }
 
 arrow::Result<std::vector<ActionType>> FlightClient::ListActions(
diff --git a/cpp/src/arrow/flight/client.h b/cpp/src/arrow/flight/client.h
index 330fa8bad730d..613903108949e 100644
--- a/cpp/src/arrow/flight/client.h
+++ b/cpp/src/arrow/flight/client.h
@@ -15,8 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-/// \brief Implementation of Flight RPC client. API should be
-/// considered experimental for now
+/// \brief Implementation of Flight RPC client.
 
 #pragma once
 
@@ -177,7 +176,6 @@ class ARROW_FLIGHT_EXPORT FlightMetadataReader {
 };
 
 /// \brief Client class for Arrow Flight RPC services.
-/// API experimental for now
 class ARROW_FLIGHT_EXPORT FlightClient {
  public:
   ~FlightClient();
@@ -275,8 +273,6 @@ class ARROW_FLIGHT_EXPORT FlightClient {
   /// \param[in] options Per-RPC options
   /// \param[in] descriptor the dataset request
   /// \param[in] listener Callbacks for response and RPC completion
-  ///
-  /// This API is EXPERIMENTAL.
   void GetFlightInfoAsync(const FlightCallOptions& options,
                           const FlightDescriptor& descriptor,
                           std::shared_ptr<AsyncListener<FlightInfo>> listener);
@@ -288,8 +284,6 @@ class ARROW_FLIGHT_EXPORT FlightClient {
   /// \brief Asynchronous GetFlightInfo returning a Future.
   /// \param[in] options Per-RPC options
   /// \param[in] descriptor the dataset request
-  ///
-  /// This API is EXPERIMENTAL.
   arrow::Future<FlightInfo> GetFlightInfoAsync(const FlightCallOptions& options,
                                                const FlightDescriptor& descriptor);
   arrow::Future<FlightInfo> GetFlightInfoAsync(const FlightDescriptor& descriptor) {
diff --git a/cpp/src/arrow/flight/cookie_internal.cc b/cpp/src/arrow/flight/cookie_internal.cc
index 8f41106ebce5c..75a10d148bf47 100644
--- a/cpp/src/arrow/flight/cookie_internal.cc
+++ b/cpp/src/arrow/flight/cookie_internal.cc
@@ -15,8 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-// Interfaces for defining middleware for Flight clients. Currently
-// experimental.
+// Interfaces for defining middleware for Flight clients.
 
 #include "arrow/flight/cookie_internal.h"
 #include "arrow/flight/client.h"
diff --git a/cpp/src/arrow/flight/flight_benchmark.cc b/cpp/src/arrow/flight/flight_benchmark.cc
index f53b1c6dcea30..057ef15c3c7ae 100644
--- a/cpp/src/arrow/flight/flight_benchmark.cc
+++ b/cpp/src/arrow/flight/flight_benchmark.cc
@@ -131,7 +131,8 @@ struct PerformanceStats {
 Status WaitForReady(FlightClient* client, const FlightCallOptions& call_options) {
   Action action{"ping", nullptr};
   for (int attempt = 0; attempt < 10; attempt++) {
-    if (client->DoAction(call_options, action).ok()) {
+    auto result_stream_result = client->DoAction(call_options, action);
+    if (result_stream_result.ok() && (*result_stream_result)->Drain().ok()) {
       return Status::OK();
     }
     std::this_thread::sleep_for(std::chrono::milliseconds(1000));
diff --git a/cpp/src/arrow/flight/flight_test.cc b/cpp/src/arrow/flight/flight_test.cc
index 55cc938870f85..e179f3406d65e 100644
--- a/cpp/src/arrow/flight/flight_test.cc
+++ b/cpp/src/arrow/flight/flight_test.cc
@@ -71,6 +71,7 @@
 #ifdef ARROW_WITH_OPENTELEMETRY
 #include <opentelemetry/context/propagation/global_propagator.h>
 #include <opentelemetry/context/propagation/text_map_propagator.h>
+#include <opentelemetry/sdk/trace/processor.h>
 #include <opentelemetry/sdk/trace/tracer_provider.h>
 #include <opentelemetry/trace/propagation/http_trace_context.h>
 #endif
diff --git a/cpp/src/arrow/flight/integration_tests/flight_integration_test.cc b/cpp/src/arrow/flight/integration_tests/flight_integration_test.cc
index 92c088b7fae08..15318a8d7a465 100644
--- a/cpp/src/arrow/flight/integration_tests/flight_integration_test.cc
+++ b/cpp/src/arrow/flight/integration_tests/flight_integration_test.cc
@@ -89,6 +89,10 @@ TEST(FlightIntegration, FlightSqlExtension) {
   ASSERT_OK(RunScenario("flight_sql:extension"));
 }
 
+TEST(FlightIntegration, FlightSqlIngestion) {
+  ASSERT_OK(RunScenario("flight_sql:ingestion"));
+}
+
 }  // namespace integration_tests
 }  // namespace flight
 }  // namespace arrow
diff --git a/cpp/src/arrow/flight/integration_tests/test_integration.cc b/cpp/src/arrow/flight/integration_tests/test_integration.cc
index 21f57efd122c3..665c1f1ba036a 100644
--- a/cpp/src/arrow/flight/integration_tests/test_integration.cc
+++ b/cpp/src/arrow/flight/integration_tests/test_integration.cc
@@ -752,7 +752,8 @@ class ExpirationTimeRenewFlightEndpointScenario : public Scenario {
 /// both "lol_invalid", which will result in errors attempting to set either.
 class SessionOptionsServer : public sql::FlightSqlServerBase {
   static inline const std::string invalid_option_name = "lol_invalid";
-  static inline const SessionOptionValue invalid_option_value = "lol_invalid";
+  static inline const SessionOptionValue invalid_option_value =
+      std::string("lol_invalid");
 
   const std::string session_middleware_key;
   // These will never be threaded so using a plain map and no lock
@@ -852,7 +853,7 @@ class SessionOptionsScenario : public Scenario {
         {{"foolong", 123L},
          {"bardouble", 456.0},
          {"lol_invalid", "this won't get set"},
-         {"key_with_invalid_value", "lol_invalid"},
+         {"key_with_invalid_value", std::string("lol_invalid")},
          {"big_ol_string_list", std::vector<std::string>{"a", "b", "sea", "dee", " ",
                                                          "  ", "geee", "(づ｡◕‿‿◕｡)づ"}}}};
     ARROW_ASSIGN_OR_RAISE(auto res1, client.SetSessionOptions({}, req1));
@@ -878,16 +879,16 @@ class SessionOptionsScenario : public Scenario {
     }
     // Update
     ARROW_ASSIGN_OR_RAISE(
-        auto res3,
-        client.SetSessionOptions(
-            {}, SetSessionOptionsRequest{
-                    {{"foolong", std::monostate{}},
-                     {"big_ol_string_list", "a,b,sea,dee, ,  ,geee,(づ｡◕‿‿◕｡)づ"}}}));
+        auto res3, client.SetSessionOptions(
+                       {}, SetSessionOptionsRequest{
+                               {{"foolong", std::monostate{}},
+                                {"big_ol_string_list",
+                                 std::string("a,b,sea,dee, ,  ,geee,(づ｡◕‿‿◕｡)づ")}}}));
     ARROW_ASSIGN_OR_RAISE(auto res4, client.GetSessionOptions({}, {}));
     if (res4.session_options !=
         std::map<std::string, SessionOptionValue>{
             {"bardouble", 456.0},
-            {"big_ol_string_list", "a,b,sea,dee, ,  ,geee,(づ｡◕‿‿◕｡)づ"}}) {
+            {"big_ol_string_list", std::string("a,b,sea,dee, ,  ,geee,(づ｡◕‿‿◕｡)づ")}}) {
       return Status::Invalid("res4 incorrect: " + res4.ToString());
     }
 
@@ -1068,6 +1069,7 @@ constexpr int64_t kUpdateStatementExpectedRows = 10000L;
 constexpr int64_t kUpdateStatementWithTransactionExpectedRows = 15000L;
 constexpr int64_t kUpdatePreparedStatementExpectedRows = 20000L;
 constexpr int64_t kUpdatePreparedStatementWithTransactionExpectedRows = 25000L;
+constexpr int64_t kIngestStatementExpectedRows = 3L;
 constexpr char kSelectStatement[] = "SELECT STATEMENT";
 constexpr char kSavepointId[] = "savepoint_id";
 constexpr char kSavepointName[] = "savepoint_name";
@@ -2123,6 +2125,127 @@ class ReuseConnectionScenario : public Scenario {
     return Status::OK();
   }
 };
+
+std::shared_ptr<Schema> GetIngestSchema() {
+  return arrow::schema({arrow::field("test_field", arrow::int64(), true)});
+}
+
+arrow::Result<std::shared_ptr<RecordBatchReader>> GetIngestRecords() {
+  auto schema = GetIngestSchema();
+  auto array = arrow::ArrayFromJSON(arrow::int64(), "[null,null,null]");
+  auto record_batch = arrow::RecordBatch::Make(schema, 3, {array});
+  return RecordBatchReader::Make({record_batch});
+}
+
+/// \brief The server used for testing bulk ingestion
+class FlightSqlIngestionServer : public sql::FlightSqlServerBase {
+ public:
+  FlightSqlIngestionServer() : sql::FlightSqlServerBase() {
+    RegisterSqlInfo(sql::SqlInfoOptions::SqlInfo::FLIGHT_SQL_SERVER_BULK_INGESTION,
+                    sql::SqlInfoResult(true));
+    RegisterSqlInfo(
+        sql::SqlInfoOptions::SqlInfo::FLIGHT_SQL_SERVER_INGEST_TRANSACTIONS_SUPPORTED,
+        sql::SqlInfoResult(true));
+  }
+
+  arrow::Result<int64_t> DoPutCommandStatementIngest(
+      const ServerCallContext& context, const sql::StatementIngest& command,
+      FlightMessageReader* reader) override {
+    ARROW_RETURN_NOT_OK(AssertEq<bool>(
+        true,
+        sql::TableDefinitionOptionsTableNotExistOption::kCreate ==
+            command.table_definition_options.if_not_exist,
+        "Wrong TableDefinitionOptionsTableNotExistOption for ExecuteIngest"));
+    ARROW_RETURN_NOT_OK(AssertEq<bool>(
+        true,
+        sql::TableDefinitionOptionsTableExistsOption::kReplace ==
+            command.table_definition_options.if_exists,
+        "Wrong TableDefinitionOptionsTableExistsOption for ExecuteIngest"));
+    ARROW_RETURN_NOT_OK(AssertEq<std::string>("test_table", command.table,
+                                              "Wrong table for ExecuteIngest"));
+    ARROW_RETURN_NOT_OK(AssertEq<std::string>("test_schema", command.schema.value(),
+                                              "Wrong schema for ExecuteIngest"));
+    ARROW_RETURN_NOT_OK(AssertEq<std::string>("test_catalog", command.catalog.value(),
+                                              "Wrong catalog for ExecuteIngest"));
+    ARROW_RETURN_NOT_OK(AssertEq<bool>(true, command.temporary,
+                                       "Wrong temporary setting for ExecuteIngest"));
+    ARROW_RETURN_NOT_OK(AssertEq<std::string>("123", command.transaction_id.value(),
+                                              "Wrong transaction_id for ExecuteIngest"));
+
+    std::unordered_map<std::string, std::string> expected_options = {{"key1", "val1"},
+                                                                     {"key2", "val2"}};
+    ARROW_RETURN_NOT_OK(
+        AssertEq<std::size_t>(expected_options.size(), command.options.size(),
+                              "Wrong number of options set for ExecuteIngest"));
+    for (auto it = expected_options.begin(); it != expected_options.end(); ++it) {
+      auto key = it->first;
+      auto expected_val = it->second;
+      ARROW_RETURN_NOT_OK(
+          AssertEq<std::string>(expected_val, command.options.at(key),
+                                "Wrong option value set for ExecuteIngest"));
+    }
+
+    auto expected_schema = GetIngestSchema();
+    int64_t num_records = 0;
+    while (true) {
+      ARROW_ASSIGN_OR_RAISE(FlightStreamChunk chunk, reader->Next());
+      if (chunk.data == nullptr) break;
+
+      ARROW_RETURN_NOT_OK(
+          AssertEq(true, expected_schema->Equals(chunk.data->schema()),
+                   "Chunk schema does not match expected schema for ExecuteIngest"));
+      num_records += chunk.data->num_rows();
+    }
+
+    return num_records;
+  }
+};
+
+/// \brief The FlightSqlIngestion scenario.
+///
+/// This tests that the client can execute bulk ingestion against the server.
+///
+/// The server implements DoPutCommandStatementIngest and validates that the arguments
+/// it receives are the same as those supplied to the client, or have been successfully
+/// mapped to the equivalent server-side representation. The size and schema of the sent
+/// and received streams are also validated against eachother.
+class FlightSqlIngestionScenario : public Scenario {
+  Status MakeServer(std::unique_ptr<FlightServerBase>* server,
+                    FlightServerOptions* options) override {
+    server->reset(new FlightSqlIngestionServer());
+    return Status::OK();
+  }
+
+  Status MakeClient(FlightClientOptions* options) override { return Status::OK(); }
+
+  Status RunClient(std::unique_ptr<FlightClient> client) override {
+    sql::FlightSqlClient sql_client(std::move(client));
+    ARROW_RETURN_NOT_OK(ValidateIngestion(&sql_client));
+    return Status::OK();
+  }
+
+  Status ValidateIngestion(sql::FlightSqlClient* sql_client) {
+    ARROW_ASSIGN_OR_RAISE(auto record_batch_reader, GetIngestRecords());
+
+    sql::TableDefinitionOptions table_definition_options;
+    table_definition_options.if_not_exist =
+        sql::TableDefinitionOptionsTableNotExistOption::kCreate;
+    table_definition_options.if_exists =
+        sql::TableDefinitionOptionsTableExistsOption::kReplace;
+    bool temporary = true;
+    std::unordered_map<std::string, std::string> options = {{"key1", "val1"},
+                                                            {"key2", "val2"}};
+    ARROW_ASSIGN_OR_RAISE(
+        auto updated_rows,
+        sql_client->ExecuteIngest({}, record_batch_reader, table_definition_options,
+                                  "test_table", "test_schema", "test_catalog", temporary,
+                                  sql::Transaction("123"), options));
+    ARROW_RETURN_NOT_OK(AssertEq(kIngestStatementExpectedRows, updated_rows,
+                                 "Wrong number of updated rows for ExecuteIngest"));
+
+    return Status::OK();
+  }
+};
 }  // namespace
 
 Status GetScenario(const std::string& scenario_name, std::shared_ptr<Scenario>* out) {
@@ -2165,6 +2288,9 @@ Status GetScenario(const std::string& scenario_name, std::shared_ptr<Scenario>*
   } else if (scenario_name == "flight_sql:extension") {
     *out = std::make_shared<FlightSqlExtensionScenario>();
     return Status::OK();
+  } else if (scenario_name == "flight_sql:ingestion") {
+    *out = std::make_shared<FlightSqlIngestionScenario>();
+    return Status::OK();
   }
   return Status::KeyError("Scenario not found: ", scenario_name);
 }
diff --git a/cpp/src/arrow/flight/middleware.h b/cpp/src/arrow/flight/middleware.h
index 84448097ff019..d717e396a8b68 100644
--- a/cpp/src/arrow/flight/middleware.h
+++ b/cpp/src/arrow/flight/middleware.h
@@ -16,7 +16,7 @@
 // under the License.
 
 // Interfaces for defining middleware for Flight clients and
-// servers. Currently experimental.
+// servers.
 
 #pragma once
 
diff --git a/cpp/src/arrow/flight/otel_logging.cc b/cpp/src/arrow/flight/otel_logging.cc
new file mode 100644
index 0000000000000..62c18238af430
--- /dev/null
+++ b/cpp/src/arrow/flight/otel_logging.cc
@@ -0,0 +1,62 @@
+// 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.
+
+#include <string_view>
+
+#include "arrow/flight/otel_logging.h"
+#include "arrow/flight/otel_logging_internal.h"
+#include "arrow/result.h"
+#include "arrow/util/logger.h"
+#include "arrow/util/logging.h"
+
+namespace arrow::flight {
+
+namespace {
+constexpr std::string_view kGrpcClientName = "arrow-flight-grpc-client-otel";
+constexpr std::string_view kGrpcServerName = "arrow-flight-grpc-server-otel";
+constexpr std::string_view kSqlClientName = "arrow-flight-sql-client-otel";
+constexpr std::string_view kSqlServerName = "arrow-flight-sql-server-otel";
+}  // namespace
+
+Status RegisterFlightOtelLoggers(const telemetry::OtelLoggingOptions& options) {
+  for (auto name : {kGrpcClientName, kGrpcServerName, kSqlClientName, kSqlServerName}) {
+    ARROW_ASSIGN_OR_RAISE(auto logger,
+                          telemetry::OtelLoggerProvider::MakeLogger(name, options));
+    DCHECK_NE(logger, nullptr);
+    ARROW_RETURN_NOT_OK(util::LoggerRegistry::RegisterLogger(name, std::move(logger)));
+  }
+  return Status::OK();
+}
+
+namespace internal {
+
+std::shared_ptr<util::Logger> GetOtelGrpcClientLogger() {
+  return util::LoggerRegistry::GetLogger(kGrpcClientName);
+}
+std::shared_ptr<util::Logger> GetOtelGrpcServerLogger() {
+  return util::LoggerRegistry::GetLogger(kGrpcServerName);
+}
+std::shared_ptr<util::Logger> GetOtelSqlClientLogger() {
+  return util::LoggerRegistry::GetLogger(kSqlClientName);
+}
+std::shared_ptr<util::Logger> GetOtelSqlServerLogger() {
+  return util::LoggerRegistry::GetLogger(kSqlServerName);
+}
+
+}  // namespace internal
+
+}  // namespace arrow::flight
diff --git a/cpp/src/arrow/flight/otel_logging.h b/cpp/src/arrow/flight/otel_logging.h
new file mode 100644
index 0000000000000..9a91e5d99ce7d
--- /dev/null
+++ b/cpp/src/arrow/flight/otel_logging.h
@@ -0,0 +1,33 @@
+// 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.
+
+#pragma once
+
+#include "arrow/util/config.h"
+
+#ifdef ARROW_WITH_OPENTELEMETRY
+#include "arrow/status.h"
+#include "arrow/telemetry/logging.h"
+#include "arrow/util/macros.h"
+
+namespace arrow::flight {
+
+ARROW_EXPORT Status
+RegisterFlightOtelLoggers(const telemetry::OtelLoggingOptions& options);
+
+}  // namespace arrow::flight
+#endif
diff --git a/cpp/src/arrow/flight/otel_logging_internal.h b/cpp/src/arrow/flight/otel_logging_internal.h
new file mode 100644
index 0000000000000..52602f0fe8aa5
--- /dev/null
+++ b/cpp/src/arrow/flight/otel_logging_internal.h
@@ -0,0 +1,56 @@
+// 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.
+
+#pragma once
+
+#include "arrow/util/config.h"
+
+#include "arrow/util/macros.h"
+#ifdef ARROW_WITH_OPENTELEMETRY
+#include "arrow/flight/otel_logging.h"
+#include "arrow/util/logger.h"
+
+namespace arrow::flight::internal {
+
+ARROW_EXPORT std::shared_ptr<util::Logger> GetOtelGrpcClientLogger();
+ARROW_EXPORT std::shared_ptr<util::Logger> GetOtelGrpcServerLogger();
+ARROW_EXPORT std::shared_ptr<util::Logger> GetOtelSqlClientLogger();
+ARROW_EXPORT std::shared_ptr<util::Logger> GetOtelSqlServerLogger();
+
+}  // namespace arrow::flight::internal
+
+#define ARROW_FLIGHT_OTELLOG_CLIENT(LEVEL, ...)                                  \
+  ARROW_LOGGER_CALL(::arrow::flight::internal::GetOtelGrpcClientLogger(), LEVEL, \
+                    __VA_ARGS__)
+#define ARROW_FLIGHT_OTELLOG_SERVER(LEVEL, ...)                                  \
+  ARROW_LOGGER_CALL(::arrow::flight::internal::GetOtelGrpcServerLogger(), LEVEL, \
+                    __VA_ARGS__)
+#define ARROW_FLIGHT_OTELLOG_SQL_CLIENT(LEVEL, ...)                             \
+  ARROW_LOGGER_CALL(::arrow::flight::internal::GetOtelSqlClientLogger(), LEVEL, \
+                    __VA_ARGS__)
+#define ARROW_FLIGHT_OTELLOG_SQL_SERVER(LEVEL, ...)                             \
+  ARROW_LOGGER_CALL(::arrow::flight::internal::GetOtelSqlServerLogger(), LEVEL, \
+                    __VA_ARGS__)
+
+#else
+
+#define ARROW_FLIGHT_OTELLOG_CLIENT(LEVEL, ...) ARROW_UNUSED(0)
+#define ARROW_FLIGHT_OTELLOG_SERVER(LEVEL, ...) ARROW_UNUSED(0)
+#define ARROW_FLIGHT_OTELLOG_SQL_CLIENT(LEVEL, ...) ARROW_UNUSED(0)
+#define ARROW_FLIGHT_OTELLOG_SQL_SERVER(LEVEL, ...) ARROW_UNUSED(0)
+
+#endif
diff --git a/cpp/src/arrow/flight/server.h b/cpp/src/arrow/flight/server.h
index ffcffe12e3c78..8d73353ab16c1 100644
--- a/cpp/src/arrow/flight/server.h
+++ b/cpp/src/arrow/flight/server.h
@@ -15,8 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-// Interfaces to use for defining Flight RPC servers. API should be considered
-// experimental for now
+// Interfaces to use for defining Flight RPC servers.
 
 #pragma once
 
diff --git a/cpp/src/arrow/flight/server_middleware.h b/cpp/src/arrow/flight/server_middleware.h
index 030f1a17c2100..3a3e6f8616ed6 100644
--- a/cpp/src/arrow/flight/server_middleware.h
+++ b/cpp/src/arrow/flight/server_middleware.h
@@ -15,8 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-// Interfaces for defining middleware for Flight servers. Currently
-// experimental.
+// Interfaces for defining middleware for Flight servers.
 
 #pragma once
 
diff --git a/cpp/src/arrow/flight/server_tracing_middleware.cc b/cpp/src/arrow/flight/server_tracing_middleware.cc
index b5326d88a43eb..02520cb66fd0e 100644
--- a/cpp/src/arrow/flight/server_tracing_middleware.cc
+++ b/cpp/src/arrow/flight/server_tracing_middleware.cc
@@ -137,7 +137,7 @@ class TracingServerMiddlewareFactory : public ServerMiddlewareFactory {
     options.kind = otel::trace::SpanKind::kServer;
     options.parent = otel::trace::GetSpan(new_otel_context)->GetContext();
 
-    auto* tracer = arrow::internal::tracing::GetTracer();
+    auto tracer = otel::trace::Provider::GetTracerProvider()->GetTracer("arrow");
     auto method_name = ToString(info.method);
     auto span = tracer->StartSpan(
         method_name,
diff --git a/cpp/src/arrow/flight/sql/client.cc b/cpp/src/arrow/flight/sql/client.cc
index d0552e33df5c2..86fd4868bad2d 100644
--- a/cpp/src/arrow/flight/sql/client.cc
+++ b/cpp/src/arrow/flight/sql/client.cc
@@ -256,6 +256,114 @@ arrow::Result<int64_t> FlightSqlClient::ExecuteSubstraitUpdate(
   return update_result.record_count();
 }
 
+arrow::Result<int64_t> FlightSqlClient::ExecuteIngest(
+    const FlightCallOptions& options, const std::shared_ptr<RecordBatchReader>& reader,
+    const TableDefinitionOptions& table_definition_options, const std::string& table,
+    const std::optional<std::string>& schema, const std::optional<std::string>& catalog,
+    const bool temporary, const Transaction& transaction,
+    const std::unordered_map<std::string, std::string>& ingest_options) {
+  flight_sql_pb::CommandStatementIngest command;
+
+  flight_sql_pb::CommandStatementIngest_TableDefinitionOptions*
+      pb_table_definition_options =
+          new flight_sql_pb::CommandStatementIngest_TableDefinitionOptions();
+  switch (table_definition_options.if_not_exist) {
+    case TableDefinitionOptionsTableNotExistOption::kUnspecified:
+      pb_table_definition_options->set_if_not_exist(
+          flight_sql_pb::
+              CommandStatementIngest_TableDefinitionOptions_TableNotExistOption_TABLE_NOT_EXIST_OPTION_UNSPECIFIED);  // NOLINT(whitespace/line_length)
+      break;
+    case TableDefinitionOptionsTableNotExistOption::kCreate:
+      pb_table_definition_options->set_if_not_exist(
+          flight_sql_pb::
+              CommandStatementIngest_TableDefinitionOptions_TableNotExistOption_TABLE_NOT_EXIST_OPTION_CREATE);  // NOLINT(whitespace/line_length)
+      break;
+    case TableDefinitionOptionsTableNotExistOption::kFail:
+      pb_table_definition_options->set_if_not_exist(
+          flight_sql_pb::
+              CommandStatementIngest_TableDefinitionOptions_TableNotExistOption_TABLE_NOT_EXIST_OPTION_FAIL);  // NOLINT(whitespace/line_length)
+      break;
+
+    default:
+      break;
+  }
+
+  switch (table_definition_options.if_exists) {
+    case TableDefinitionOptionsTableExistsOption::kUnspecified:
+      pb_table_definition_options->set_if_exists(
+          flight_sql_pb::
+              CommandStatementIngest_TableDefinitionOptions_TableExistsOption_TABLE_EXISTS_OPTION_UNSPECIFIED);  // NOLINT(whitespace/line_length)
+      break;
+    case TableDefinitionOptionsTableExistsOption::kFail:
+      pb_table_definition_options->set_if_exists(
+          flight_sql_pb::
+              CommandStatementIngest_TableDefinitionOptions_TableExistsOption_TABLE_EXISTS_OPTION_FAIL);  // NOLINT(whitespace/line_length)
+      break;
+    case TableDefinitionOptionsTableExistsOption::kAppend:
+      pb_table_definition_options->set_if_exists(
+          flight_sql_pb::
+              CommandStatementIngest_TableDefinitionOptions_TableExistsOption_TABLE_EXISTS_OPTION_APPEND);  // NOLINT(whitespace/line_length)
+      break;
+    case TableDefinitionOptionsTableExistsOption::kReplace:
+      pb_table_definition_options->set_if_exists(
+          flight_sql_pb::
+              CommandStatementIngest_TableDefinitionOptions_TableExistsOption_TABLE_EXISTS_OPTION_REPLACE);  // NOLINT(whitespace/line_length)
+      break;
+
+    default:
+      break;
+  }
+
+  command.set_allocated_table_definition_options(pb_table_definition_options);
+  command.set_table(table);
+
+  if (schema.has_value()) {
+    command.set_schema(schema.value());
+  }
+
+  if (catalog.has_value()) {
+    command.set_catalog(catalog.value());
+  }
+
+  command.set_temporary(temporary);
+
+  if (transaction.is_valid()) {
+    command.set_transaction_id(transaction.transaction_id());
+  }
+
+  auto command_options = command.mutable_options();
+  for (const auto& [key, val] : ingest_options) {
+    (*command_options)[key] = val;
+  }
+
+  ARROW_ASSIGN_OR_RAISE(FlightDescriptor descriptor,
+                        GetFlightDescriptorForCommand(command));
+
+  auto reader_ = reader.get();
+  ARROW_ASSIGN_OR_RAISE(auto stream, DoPut(options, descriptor, reader_->schema()));
+
+  while (true) {
+    ARROW_ASSIGN_OR_RAISE(auto batch, reader_->Next());
+    if (!batch) break;
+    ARROW_RETURN_NOT_OK(stream.writer->WriteRecordBatch(*batch));
+  }
+
+  ARROW_RETURN_NOT_OK(stream.writer->DoneWriting());
+  std::shared_ptr<Buffer> metadata;
+  ARROW_RETURN_NOT_OK(stream.reader->ReadMetadata(&metadata));
+  ARROW_RETURN_NOT_OK(stream.writer->Close());
+
+  if (!metadata) return Status::IOError("Server did not send a response");
+
+  flight_sql_pb::DoPutUpdateResult update_result;
+  if (!update_result.ParseFromArray(metadata->data(),
+                                    static_cast<int>(metadata->size()))) {
+    return Status::Invalid("Unable to parse DoPutUpdateResult");
+  }
+
+  return update_result.record_count();
+}
+
 arrow::Result<std::unique_ptr<FlightInfo>> FlightSqlClient::GetCatalogs(
     const FlightCallOptions& options) {
   flight_sql_pb::CommandGetCatalogs command;
@@ -574,7 +682,7 @@ arrow::Result<std::unique_ptr<FlightInfo>> PreparedStatement::Execute(
                                          parameter_binding_.get()));
   }
   ARROW_ASSIGN_OR_RAISE(auto flight_info, client_->GetFlightInfo(options, descriptor));
-  return std::move(flight_info);
+  return flight_info;
 }
 
 arrow::Result<int64_t> PreparedStatement::ExecuteUpdate(
diff --git a/cpp/src/arrow/flight/sql/client.h b/cpp/src/arrow/flight/sql/client.h
index 9782611dbadcd..c37c640e653a4 100644
--- a/cpp/src/arrow/flight/sql/client.h
+++ b/cpp/src/arrow/flight/sql/client.h
@@ -101,6 +101,24 @@ class ARROW_FLIGHT_SQL_EXPORT FlightSqlClient {
       const FlightCallOptions& options, const SubstraitPlan& plan,
       const Transaction& transaction = no_transaction());
 
+  /// \brief Execute a bulk ingestion to the server.
+  /// \param[in] options                   RPC-layer hints for this call.
+  /// \param[in] reader                    The records to ingest.
+  /// \param[in] table_definition_options  The behavior for handling the table definition.
+  /// \param[in] table                     The destination table to load into.
+  /// \param[in] schema                    The DB schema of the destination table.
+  /// \param[in] catalog                   The catalog of the destination table.
+  /// \param[in] temporary                 Use a temporary table.
+  /// \param[in] transaction               Ingest as part of this transaction.
+  /// \param[in] ingest_options            Additional, backend-specific options.
+  /// \return The number of rows ingested to the server.
+  arrow::Result<int64_t> ExecuteIngest(
+      const FlightCallOptions& options, const std::shared_ptr<RecordBatchReader>& reader,
+      const TableDefinitionOptions& table_definition_options, const std::string& table,
+      const std::optional<std::string>& schema, const std::optional<std::string>& catalog,
+      const bool temporary, const Transaction& transaction = no_transaction(),
+      const std::unordered_map<std::string, std::string>& ingest_options = {});
+
   /// \brief Request a list of catalogs.
   /// \param[in] options      RPC-layer hints for this call.
   /// \return The FlightInfo describing where to access the dataset.
diff --git a/cpp/src/arrow/flight/sql/server.cc b/cpp/src/arrow/flight/sql/server.cc
index a5cb842de8f49..63d1f5c5225fa 100644
--- a/cpp/src/arrow/flight/sql/server.cc
+++ b/cpp/src/arrow/flight/sql/server.cc
@@ -15,8 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-// Interfaces to use for defining Flight RPC servers. API should be considered
-// experimental for now
+// Interfaces to use for defining Flight RPC servers.
 
 // Platform-specific defines
 #include "arrow/flight/platform.h"
@@ -234,6 +233,90 @@ arrow::Result<PreparedStatementUpdate> ParseCommandPreparedStatementUpdate(
   return result;
 }
 
+arrow::Result<StatementIngest> ParseCommandStatementIngest(
+    const google::protobuf::Any& any) {
+  pb::sql::CommandStatementIngest command;
+  if (!any.UnpackTo(&command)) {
+    return Status::Invalid("Unable to unpack CommandStatementIngest.");
+  }
+
+  StatementIngest result;
+  TableDefinitionOptions table_definition_options;
+  switch (command.table_definition_options().if_not_exist()) {
+    case pb::sql::CommandStatementIngest::TableDefinitionOptions::
+        TABLE_NOT_EXIST_OPTION_UNSPECIFIED:
+      table_definition_options.if_not_exist =
+          TableDefinitionOptionsTableNotExistOption::kUnspecified;
+      break;
+    case pb::sql::CommandStatementIngest::TableDefinitionOptions::
+        TABLE_NOT_EXIST_OPTION_CREATE:
+      table_definition_options.if_not_exist =
+          TableDefinitionOptionsTableNotExistOption::kCreate;
+      break;
+    case pb::sql::CommandStatementIngest::TableDefinitionOptions::
+        TABLE_NOT_EXIST_OPTION_FAIL:
+      table_definition_options.if_not_exist =
+          TableDefinitionOptionsTableNotExistOption::kFail;
+      break;
+
+    default:
+      return Status::Invalid(
+          "Unrecognized TableNotExistOption for "
+          "CommandStatementIngest::TableDefinitionOptions.");
+  }
+
+  switch (command.table_definition_options().if_exists()) {
+    case pb::sql::CommandStatementIngest::TableDefinitionOptions::
+        TABLE_EXISTS_OPTION_UNSPECIFIED:
+      table_definition_options.if_exists =
+          TableDefinitionOptionsTableExistsOption::kUnspecified;
+      break;
+    case pb::sql::CommandStatementIngest::TableDefinitionOptions::
+        TABLE_EXISTS_OPTION_FAIL:
+      table_definition_options.if_exists = TableDefinitionOptionsTableExistsOption::kFail;
+      break;
+    case pb::sql::CommandStatementIngest::TableDefinitionOptions::
+        TABLE_EXISTS_OPTION_APPEND:
+      table_definition_options.if_exists =
+          TableDefinitionOptionsTableExistsOption::kAppend;
+      break;
+    case pb::sql::CommandStatementIngest::TableDefinitionOptions::
+        TABLE_EXISTS_OPTION_REPLACE:
+      table_definition_options.if_exists =
+          TableDefinitionOptionsTableExistsOption::kReplace;
+      break;
+
+    default:
+      return Status::Invalid(
+          "Unrecognized TableExistsOption for "
+          "CommandStatementIngest::TableDefinitionOptions.");
+  }
+
+  result.table_definition_options = table_definition_options;
+  result.table = command.table();
+
+  if (command.has_schema()) {
+    result.schema = command.schema();
+  }
+
+  if (command.has_catalog()) {
+    result.catalog = command.catalog();
+  }
+
+  result.temporary = command.temporary();
+
+  if (command.has_transaction_id()) {
+    result.transaction_id = command.transaction_id();
+  }
+
+  std::unordered_map<std::string, std::string> options;
+  for (const auto& [key, val] : command.options()) {
+    options[key] = val;
+  }
+  result.options = options;
+  return result;
+}
+
 arrow::Result<ActionBeginSavepointRequest> ParseActionBeginSavepointRequest(
     const google::protobuf::Any& any) {
   pb::sql::ActionBeginSavepointRequest command;
@@ -764,6 +847,19 @@ Status FlightSqlServerBase::DoPut(const ServerCallContext& context,
     pb::sql::DoPutUpdateResult result;
     result.set_record_count(record_count);
 
+    const auto buffer = Buffer::FromString(result.SerializeAsString());
+    ARROW_RETURN_NOT_OK(writer->WriteMetadata(*buffer));
+    return Status::OK();
+  } else if (any.Is<pb::sql::CommandStatementIngest>()) {
+    ARROW_ASSIGN_OR_RAISE(StatementIngest internal_command,
+                          ParseCommandStatementIngest(any));
+    ARROW_ASSIGN_OR_RAISE(
+        auto record_count,
+        DoPutCommandStatementIngest(context, internal_command, reader.get()));
+
+    pb::sql::DoPutUpdateResult result;
+    result.set_record_count(record_count);
+
     const auto buffer = Buffer::FromString(result.SerializeAsString());
     ARROW_RETURN_NOT_OK(writer->WriteMetadata(*buffer));
     return Status::OK();
@@ -1202,6 +1298,12 @@ arrow::Result<int64_t> FlightSqlServerBase::DoPutCommandSubstraitPlan(
   return Status::NotImplemented("DoPutCommandSubstraitPlan not implemented");
 }
 
+arrow::Result<int64_t> FlightSqlServerBase::DoPutCommandStatementIngest(
+    const ServerCallContext& context, const StatementIngest& command,
+    FlightMessageReader* reader) {
+  return Status::NotImplemented("DoPutCommandStatementIngest not implemented");
+}
+
 const std::shared_ptr<Schema>& SqlSchema::GetCatalogsSchema() {
   static std::shared_ptr<Schema> kSchema =
       arrow::schema({field("catalog_name", utf8(), false)});
diff --git a/cpp/src/arrow/flight/sql/server.h b/cpp/src/arrow/flight/sql/server.h
index df46004474a39..7130e96987b89 100644
--- a/cpp/src/arrow/flight/sql/server.h
+++ b/cpp/src/arrow/flight/sql/server.h
@@ -15,8 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-// Interfaces to use for defining Flight RPC servers. API should be considered
-// experimental for now
+// Interfaces to use for defining Flight RPC servers.
 
 #pragma once
 
@@ -86,6 +85,24 @@ struct ARROW_FLIGHT_SQL_EXPORT PreparedStatementUpdate {
   std::string prepared_statement_handle;
 };
 
+/// \brief A bulk ingestion request
+struct ARROW_FLIGHT_SQL_EXPORT StatementIngest {
+  /// \brief The behavior for handling the table definition.
+  TableDefinitionOptions table_definition_options;
+  /// \brief The destination table to load into.
+  std::string table;
+  /// \brief The DB schema of the destination table.
+  std::optional<std::string> schema;
+  /// :\brief The catalog of the destination table.
+  std::optional<std::string> catalog;
+  /// \brief Use a temporary table.
+  bool temporary;
+  /// \brief Ingest as part of this transaction.
+  std::optional<std::string> transaction_id;
+  /// \brief Additional, backend-specific options.
+  std::unordered_map<std::string, std::string> options;
+};
+
 /// \brief A request to fetch server metadata.
 struct ARROW_FLIGHT_SQL_EXPORT GetSqlInfo {
   /// \brief A list of metadata IDs to fetch.
@@ -569,6 +586,15 @@ class ARROW_FLIGHT_SQL_EXPORT FlightSqlServerBase : public FlightServerBase {
       const ServerCallContext& context, const PreparedStatementUpdate& command,
       FlightMessageReader* reader);
 
+  /// \brief Execute a bulk ingestion.
+  /// \param[in] context  The call context.
+  /// \param[in] command  The StatementIngest object containing the ingestion request.
+  /// \param[in] reader   a sequence of uploaded record batches.
+  /// \return             The changed record count.
+  virtual arrow::Result<int64_t> DoPutCommandStatementIngest(
+      const ServerCallContext& context, const StatementIngest& command,
+      FlightMessageReader* reader);
+
   /// \brief Begin a new transaction.
   /// \param[in] context  The call context.
   /// \param[in] request  Request parameters.
diff --git a/cpp/src/arrow/flight/sql/server_session_middleware.h b/cpp/src/arrow/flight/sql/server_session_middleware.h
index 021793de3de32..6eb11041a08bd 100644
--- a/cpp/src/arrow/flight/sql/server_session_middleware.h
+++ b/cpp/src/arrow/flight/sql/server_session_middleware.h
@@ -16,7 +16,6 @@
 // under the License.
 
 // Middleware for handling Flight SQL Sessions including session cookie handling.
-// Currently experimental.
 
 #pragma once
 
diff --git a/cpp/src/arrow/flight/sql/test_app_cli.cc b/cpp/src/arrow/flight/sql/test_app_cli.cc
index 66a6b6f5aa4e5..194ecf5e57808 100644
--- a/cpp/src/arrow/flight/sql/test_app_cli.cc
+++ b/cpp/src/arrow/flight/sql/test_app_cli.cc
@@ -15,6 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include "arrow/util/config.h"
+
 #include <gflags/gflags.h>
 #define BOOST_NO_CXX98_FUNCTION_BASE  // ARROW-17805
 #include <boost/algorithm/string.hpp>
@@ -25,18 +27,33 @@
 #include "arrow/array/builder_binary.h"
 #include "arrow/array/builder_primitive.h"
 #include "arrow/flight/api.h"
+#include "arrow/flight/client_tracing_middleware.h"
 #include "arrow/flight/sql/api.h"
 #include "arrow/io/memory.h"
 #include "arrow/pretty_print.h"
 #include "arrow/status.h"
 #include "arrow/table.h"
 
+#ifdef ARROW_WITH_OPENTELEMETRY
+#include "arrow/flight/otel_logging.h"
+#include "arrow/util/tracing_internal.h"
+
+#include <opentelemetry/context/propagation/global_propagator.h>
+#include <opentelemetry/context/propagation/text_map_propagator.h>
+#include <opentelemetry/sdk/trace/processor.h>
+#include <opentelemetry/sdk/trace/tracer_provider.h>
+#include <opentelemetry/trace/propagation/http_trace_context.h>
+#include <opentelemetry/trace/provider.h>
+#include <opentelemetry/trace/scope.h>
+#endif
+
 using arrow::Result;
 using arrow::Schema;
 using arrow::Status;
 using arrow::flight::ClientAuthHandler;
 using arrow::flight::FlightCallOptions;
 using arrow::flight::FlightClient;
+using arrow::flight::FlightClientOptions;
 using arrow::flight::FlightDescriptor;
 using arrow::flight::FlightEndpoint;
 using arrow::flight::FlightInfo;
@@ -58,6 +75,41 @@ DEFINE_string(catalog, "", "Catalog");
 DEFINE_string(schema, "", "Schema");
 DEFINE_string(table, "", "Table");
 
+#ifdef ARROW_WITH_OPENTELEMETRY
+class OtelScope {
+ public:
+  explicit OtelScope(opentelemetry::trace::Scope scope) : scope_(std::move(scope)) {}
+
+  static Result<std::unique_ptr<OtelScope>> Make() {
+    // Implicitly sets up TracerProvider
+    auto tracer = arrow::internal::tracing::GetTracer();
+
+    opentelemetry::context::propagation::GlobalTextMapPropagator::SetGlobalPropagator(
+        opentelemetry::nostd::shared_ptr<
+            opentelemetry::context::propagation::TextMapPropagator>(
+            new opentelemetry::trace::propagation::HttpTraceContext()));
+
+    ARROW_RETURN_NOT_OK(arrow::telemetry::internal::InitializeOtelLoggerProvider());
+
+    auto logging_options = arrow::telemetry::OtelLoggingOptions::Defaults();
+    logging_options.severity_threshold = arrow::telemetry::LogLevel::ARROW_TRACE;
+    // Flush after every log message
+    logging_options.flush_severity = arrow::telemetry::LogLevel::ARROW_TRACE;
+    ARROW_RETURN_NOT_OK(arrow::flight::RegisterFlightOtelLoggers(logging_options));
+
+    opentelemetry::trace::StartSpanOptions span_options;
+    span_options.kind = opentelemetry::trace::SpanKind::kClient;
+    auto span = tracer->StartSpan("flight-sql-test-app", span_options);
+    auto scope = tracer->WithActiveSpan(span);
+
+    return std::make_unique<OtelScope>(std::move(scope));
+  }
+
+ private:
+  opentelemetry::trace::Scope scope_;
+};
+#endif
+
 Status PrintResultsForEndpoint(FlightSqlClient& client,
                                const FlightCallOptions& call_options,
                                const FlightEndpoint& endpoint) {
@@ -101,8 +153,15 @@ Status PrintResults(FlightSqlClient& client, const FlightCallOptions& call_optio
 }
 
 Status RunMain() {
+#ifdef ARROW_WITH_OPENTELEMETRY
+  ARROW_ASSIGN_OR_RAISE(auto otel_scope, OtelScope::Make());
+#endif
+
   ARROW_ASSIGN_OR_RAISE(auto location, Location::ForGrpcTcp(FLAGS_host, FLAGS_port));
-  ARROW_ASSIGN_OR_RAISE(auto client, FlightClient::Connect(location));
+  auto client_options = FlightClientOptions::Defaults();
+  client_options.middleware.push_back(
+      arrow::flight::MakeTracingClientMiddlewareFactory());
+  ARROW_ASSIGN_OR_RAISE(auto client, FlightClient::Connect(location, client_options));
 
   FlightCallOptions call_options;
 
diff --git a/cpp/src/arrow/flight/sql/test_server_cli.cc b/cpp/src/arrow/flight/sql/test_server_cli.cc
index 8f5a78ce268f5..a8124140497c6 100644
--- a/cpp/src/arrow/flight/sql/test_server_cli.cc
+++ b/cpp/src/arrow/flight/sql/test_server_cli.cc
@@ -15,6 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include "arrow/util/config.h"
+
 #include <gflags/gflags.h>
 
 #include <csignal>
@@ -23,16 +25,54 @@
 #include <string>
 
 #include "arrow/flight/server.h"
+#include "arrow/flight/server_tracing_middleware.h"
 #include "arrow/flight/sql/example/sqlite_server.h"
 #include "arrow/io/test_common.h"
 #include "arrow/util/logging.h"
 
+#ifdef ARROW_WITH_OPENTELEMETRY
+#include "arrow/flight/otel_logging.h"
+#include "arrow/util/tracing_internal.h"
+
+#include <opentelemetry/context/propagation/global_propagator.h>
+#include <opentelemetry/context/propagation/text_map_propagator.h>
+#include <opentelemetry/trace/propagation/http_trace_context.h>
+#endif
+
 DEFINE_int32(port, 31337, "Server port to listen on");
 
+#ifdef ARROW_WITH_OPENTELEMETRY
+arrow::Status SetupOTel() {
+  auto tracer = arrow::internal::tracing::GetTracer();
+  ARROW_UNUSED(tracer);
+
+  opentelemetry::context::propagation::GlobalTextMapPropagator::SetGlobalPropagator(
+      opentelemetry::nostd::shared_ptr<
+          opentelemetry::context::propagation::TextMapPropagator>(
+          new opentelemetry::trace::propagation::HttpTraceContext()));
+
+  ARROW_RETURN_NOT_OK(arrow::telemetry::internal::InitializeOtelLoggerProvider());
+
+  auto logging_options = arrow::telemetry::OtelLoggingOptions::Defaults();
+  logging_options.severity_threshold = arrow::telemetry::LogLevel::ARROW_TRACE;
+  // Flush after every log message
+  logging_options.flush_severity = arrow::telemetry::LogLevel::ARROW_TRACE;
+  ARROW_RETURN_NOT_OK(arrow::flight::RegisterFlightOtelLoggers(logging_options));
+
+  return arrow::Status::OK();
+}
+#endif
+
 arrow::Status RunMain() {
+#ifdef ARROW_WITH_OPENTELEMETRY
+  ARROW_RETURN_NOT_OK(SetupOTel());
+#endif
+
   ARROW_ASSIGN_OR_RAISE(auto location,
                         arrow::flight::Location::ForGrpcTcp("0.0.0.0", FLAGS_port));
   arrow::flight::FlightServerOptions options(location);
+  options.middleware.emplace_back("tracing",
+                                  arrow::flight::MakeTracingServerMiddlewareFactory());
 
   std::shared_ptr<arrow::flight::sql::example::SQLiteFlightSqlServer> server;
   ARROW_ASSIGN_OR_RAISE(server,
diff --git a/cpp/src/arrow/flight/sql/types.h b/cpp/src/arrow/flight/sql/types.h
index b41488b68f232..fe90c08ed2019 100644
--- a/cpp/src/arrow/flight/sql/types.h
+++ b/cpp/src/arrow/flight/sql/types.h
@@ -107,6 +107,14 @@ struct ARROW_FLIGHT_SQL_EXPORT SqlInfoOptions {
     /// supports explicit query cancellation (the CancelQuery action).
     FLIGHT_SQL_SERVER_CANCEL = 9,
 
+    /// Retrieves a boolean value indicating whether the Flight SQL Server
+    /// supports executing bulk ingestion.
+    FLIGHT_SQL_SERVER_BULK_INGESTION = 10,
+
+    /// Retrieves a boolean value indicating whether the Flight SQL Server
+    /// supports transactions for bulk ingestion.
+    FLIGHT_SQL_SERVER_INGEST_TRANSACTIONS_SUPPORTED = 11,
+
     /// Retrieves an int32 value indicating the timeout (in milliseconds) for
     /// prepared statement handles.
     ///
@@ -920,6 +928,29 @@ enum class CancelResult : int8_t {
   kNotCancellable,
 };
 
+/// \brief The action to take if the target table of an ingestion does not exist.
+enum class TableDefinitionOptionsTableNotExistOption {
+  kUnspecified,
+  kCreate,
+  kFail,
+};
+
+/// \brief The action to take if the target table of an ingestion already exists.
+enum class TableDefinitionOptionsTableExistsOption {
+  kUnspecified,
+  kFail,
+  kAppend,
+  kReplace,
+};
+
+/// \brief Options for table definition behavior of bulk ingestion.
+struct TableDefinitionOptions {
+  /// \brief Behavior when the table does not exist.
+  TableDefinitionOptionsTableNotExistOption if_not_exist;
+  /// \brief Behavior when the table exists.
+  TableDefinitionOptionsTableExistsOption if_exists;
+};
+
 ARROW_FLIGHT_SQL_EXPORT
 std::ostream& operator<<(std::ostream& os, CancelResult result);
 
diff --git a/cpp/src/arrow/flight/transport.h b/cpp/src/arrow/flight/transport.h
index 4029aa5223deb..4ce50534023fc 100644
--- a/cpp/src/arrow/flight/transport.h
+++ b/cpp/src/arrow/flight/transport.h
@@ -19,8 +19,6 @@
 /// Internal (but not private) interface for implementing
 /// alternate network transports in Flight.
 ///
-/// \warning EXPERIMENTAL. Subject to change.
-///
 /// To implement a transport, implement ServerTransport and
 /// ClientTransport, and register the desired URI schemes with
 /// TransportRegistry. Flight takes care of most of the per-RPC
@@ -248,8 +246,6 @@ TransportRegistry* GetDefaultTransportRegistry();
 /// Transport implementations may subclass this to store their own
 /// state, and stash an instance in a user-supplied AsyncListener via
 /// ClientTransport::GetAsyncRpc and ClientTransport::SetAsyncRpc.
-///
-/// This API is EXPERIMENTAL.
 class ARROW_FLIGHT_EXPORT AsyncRpc {
  public:
   virtual ~AsyncRpc() = default;
diff --git a/cpp/src/arrow/flight/types.h b/cpp/src/arrow/flight/types.h
index b3df8377b8ffd..cdf03f21041ee 100644
--- a/cpp/src/arrow/flight/types.h
+++ b/cpp/src/arrow/flight/types.h
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-// Data structure for Flight RPC. API should be considered experimental for now
+// Data structure for Flight RPC.
 
 #pragma once
 
@@ -1115,8 +1115,6 @@ std::string ToString(TransportStatusCode code);
 ///   instead of trying to translate to Arrow Status.
 ///
 /// Currently, only attached to the Status passed to AsyncListener::OnFinish.
-///
-/// This API is EXPERIMENTAL.
 class ARROW_FLIGHT_EXPORT TransportStatusDetail : public StatusDetail {
  public:
   constexpr static const char* kTypeId = "flight::TransportStatusDetail";
diff --git a/cpp/src/arrow/flight/types_async.h b/cpp/src/arrow/flight/types_async.h
index a241e64fb4e49..d5ed48d8a6438 100644
--- a/cpp/src/arrow/flight/types_async.h
+++ b/cpp/src/arrow/flight/types_async.h
@@ -31,8 +31,6 @@ namespace arrow::flight {
 /// @{
 
 /// \brief Non-templated state for an async RPC.
-///
-/// This API is EXPERIMENTAL.
 class ARROW_FLIGHT_EXPORT AsyncListenerBase {
  public:
   AsyncListenerBase();
@@ -57,8 +55,6 @@ class ARROW_FLIGHT_EXPORT AsyncListenerBase {
 /// A single listener may not be used for multiple concurrent RPC
 /// calls.  The application MUST hold the listener alive until
 /// OnFinish() is called and has finished.
-///
-/// This API is EXPERIMENTAL.
 template <typename T>
 class ARROW_FLIGHT_EXPORT AsyncListener : public AsyncListenerBase {
  public:
diff --git a/cpp/src/arrow/gpu/cuda_benchmark.cc b/cpp/src/arrow/gpu/cuda_benchmark.cc
index 2787d103cc7ce..a5415d86123bf 100644
--- a/cpp/src/arrow/gpu/cuda_benchmark.cc
+++ b/cpp/src/arrow/gpu/cuda_benchmark.cc
@@ -36,7 +36,7 @@ constexpr int64_t kGpuNumber = 0;
 static void CudaBufferWriterBenchmark(benchmark::State& state, const int64_t total_bytes,
                                       const int64_t chunksize,
                                       const int64_t buffer_size) {
-  CudaDeviceManager* manager;
+  CudaDeviceManager* manager = nullptr;
   ABORT_NOT_OK(CudaDeviceManager::Instance().Value(&manager));
   std::shared_ptr<CudaContext> context;
   ABORT_NOT_OK(manager->GetContext(kGpuNumber).Value(&context));
diff --git a/cpp/src/arrow/gpu/cuda_memory.cc b/cpp/src/arrow/gpu/cuda_memory.cc
index 6972321006a9a..148de68434272 100644
--- a/cpp/src/arrow/gpu/cuda_memory.cc
+++ b/cpp/src/arrow/gpu/cuda_memory.cc
@@ -89,7 +89,7 @@ Result<std::shared_ptr<Buffer>> CudaIpcMemHandle::Serialize(MemoryPool* pool) co
     memcpy(buffer->mutable_data() + sizeof(impl_->memory_size), &impl_->ipc_handle,
            sizeof(impl_->ipc_handle));
   }
-  return std::move(buffer);
+  return buffer;
 }
 
 const void* CudaIpcMemHandle::handle() const { return &impl_->ipc_handle; }
@@ -494,7 +494,8 @@ Result<std::shared_ptr<MemoryManager>> DefaultMemoryMapper(ArrowDeviceType devic
     case ARROW_DEVICE_CUDA:
     case ARROW_DEVICE_CUDA_HOST:
     case ARROW_DEVICE_CUDA_MANAGED: {
-      ARROW_ASSIGN_OR_RAISE(auto device, arrow::cuda::CudaDevice::Make(device_id));
+      ARROW_ASSIGN_OR_RAISE(auto device,
+                            arrow::cuda::CudaDevice::Make(static_cast<int>(device_id)));
       return device->default_memory_manager();
     }
     default:
@@ -505,7 +506,8 @@ Result<std::shared_ptr<MemoryManager>> DefaultMemoryMapper(ArrowDeviceType devic
 namespace {
 
 Result<std::shared_ptr<MemoryManager>> DefaultCUDADeviceMapper(int64_t device_id) {
-  ARROW_ASSIGN_OR_RAISE(auto device, arrow::cuda::CudaDevice::Make(device_id));
+  ARROW_ASSIGN_OR_RAISE(auto device,
+                        arrow::cuda::CudaDevice::Make(static_cast<int>(device_id)));
   return device->default_memory_manager();
 }
 
diff --git a/cpp/src/arrow/gpu/cuda_test.cc b/cpp/src/arrow/gpu/cuda_test.cc
index 4c450bf389919..4c9b961fa1465 100644
--- a/cpp/src/arrow/gpu/cuda_test.cc
+++ b/cpp/src/arrow/gpu/cuda_test.cc
@@ -679,6 +679,49 @@ TEST_F(TestCudaArrowIpc, BasicWriteRead) {
   CompareBatch(*batch, *cpu_batch);
 }
 
+TEST_F(TestCudaArrowIpc, WriteIpcString) {
+  auto values = ArrayFromJSON(utf8(), R"(["foo", null, "quux"])");
+  ASSERT_OK_AND_ASSIGN(auto values_device, values->CopyTo(mm_));
+  auto batch = RecordBatch::Make(schema({field("vals", utf8())}), 3,
+                                 {values_device->data()}, DeviceAllocationType::kCUDA);
+
+  ipc::IpcPayload payload;
+  ASSERT_OK(
+      ipc::GetRecordBatchPayload(*batch, ipc::IpcWriteOptions::Defaults(), &payload));
+
+  ASSERT_EQ(values_device->data()->buffers[0]->address(),
+            payload.body_buffers[0]->address());
+  ASSERT_EQ(values_device->data()->buffers[1]->address(),
+            payload.body_buffers[1]->address());
+}
+
+TEST_F(TestCudaArrowIpc, WriteIpcList) {
+  auto values =
+      ArrayFromJSON(list(utf8()), R"([["foo", null], null, ["quux", "bar", "baz"]])");
+  ASSERT_OK_AND_ASSIGN(auto values_device, values->CopyTo(mm_));
+  auto batch = RecordBatch::Make(schema({field("vals", list(utf8()))}), 3,
+                                 {values_device->data()}, DeviceAllocationType::kCUDA);
+
+  ipc::IpcPayload payload;
+  ASSERT_OK(
+      ipc::GetRecordBatchPayload(*batch, ipc::IpcWriteOptions::Defaults(), &payload));
+
+  ASSERT_EQ(values_device->data()->buffers[0]->address(),
+            payload.body_buffers[0]->address());
+}
+
+TEST_F(TestCudaArrowIpc, WriteIpcSlicedRecord) {
+  std::shared_ptr<RecordBatch> batch;
+  ASSERT_OK(ipc::test::MakeListRecordBatch(&batch));
+
+  ASSERT_OK_AND_ASSIGN(auto batch_device, batch->CopyTo(mm_));
+  auto sliced_batch_device = batch_device->Slice(10);
+
+  ipc::IpcPayload payload;
+  ASSERT_NOT_OK(ipc::GetRecordBatchPayload(*sliced_batch_device,
+                                           ipc::IpcWriteOptions::Defaults(), &payload));
+}
+
 TEST_F(TestCudaArrowIpc, DictionaryWriteRead) {
   std::shared_ptr<RecordBatch> batch;
   ASSERT_OK(ipc::test::MakeDictionary(&batch));
diff --git a/cpp/src/arrow/integration/json_internal.cc b/cpp/src/arrow/integration/json_internal.cc
index 64eb342d5bd47..89719b4ba4b2e 100644
--- a/cpp/src/arrow/integration/json_internal.cc
+++ b/cpp/src/arrow/integration/json_internal.cc
@@ -1069,9 +1069,9 @@ Result<std::shared_ptr<DataType>> GetUnion(const RjObject& json_type,
   }
 
   if (mode == UnionMode::SPARSE) {
-    return sparse_union(std::move(children), std::move(type_codes));
+    return sparse_union(children, std::move(type_codes));
   } else {
-    return dense_union(std::move(children), std::move(type_codes));
+    return dense_union(children, std::move(type_codes));
   }
 }
 
@@ -1849,7 +1849,7 @@ class ArrayReader {
   Result<std::shared_ptr<ArrayData>> Parse() {
     ARROW_ASSIGN_OR_RAISE(length_, GetMemberInt<int32_t>(obj_, "count"));
 
-    if (::arrow::internal::HasValidityBitmap(type_->id())) {
+    if (::arrow::internal::may_have_validity_bitmap(type_->id())) {
       // Null and union types don't have a validity bitmap
       RETURN_NOT_OK(ParseValidityBitmap());
     }
diff --git a/cpp/src/arrow/io/buffered.cc b/cpp/src/arrow/io/buffered.cc
index 21cce478d3fa5..b41e4257af215 100644
--- a/cpp/src/arrow/io/buffered.cc
+++ b/cpp/src/arrow/io/buffered.cc
@@ -282,6 +282,8 @@ class BufferedInputStream::Impl : public BufferedBase {
     return raw_pos_ - bytes_buffered_;
   }
 
+  // Resize internal read buffer. Note that the internal buffer-size
+  // should be not larger than the raw_read_bound_.
   Status SetBufferSize(int64_t new_buffer_size) {
     if (new_buffer_size <= 0) {
       return Status::Invalid("Buffer size should be positive");
@@ -289,6 +291,11 @@ class BufferedInputStream::Impl : public BufferedBase {
     if ((buffer_pos_ + bytes_buffered_) >= new_buffer_size) {
       return Status::Invalid("Cannot shrink read buffer if buffered data remains");
     }
+    if (raw_read_bound_ >= 0) {
+      // No need to reserve space for more than the total remaining number of bytes.
+      new_buffer_size = std::min(new_buffer_size,
+                                 bytes_buffered_ + (raw_read_bound_ - raw_read_total_));
+    }
     return ResizeBuffer(new_buffer_size);
   }
 
@@ -423,7 +430,8 @@ class BufferedInputStream::Impl : public BufferedBase {
       RETURN_NOT_OK(buffer->Resize(bytes_read, false /* shrink_to_fit */));
       buffer->ZeroPadding();
     }
-    return std::move(buffer);
+    // R build with openSUSE155 requires an explicit shared_ptr construction
+    return std::shared_ptr<Buffer>(std::move(buffer));
   }
 
   // For providing access to the raw file handles
@@ -432,6 +440,8 @@ class BufferedInputStream::Impl : public BufferedBase {
  private:
   std::shared_ptr<InputStream> raw_;
   int64_t raw_read_total_;
+  // a bound on the maximum number of bytes to read from the raw input stream.
+  // The default -1 indicates that it is unbounded
   int64_t raw_read_bound_;
 
   // Number of remaining bytes in the buffer, to be reduced on each read from
diff --git a/cpp/src/arrow/io/buffered_test.cc b/cpp/src/arrow/io/buffered_test.cc
index 82feeea0517fd..cbf2c2cf06938 100644
--- a/cpp/src/arrow/io/buffered_test.cc
+++ b/cpp/src/arrow/io/buffered_test.cc
@@ -329,7 +329,8 @@ class TestBufferedInputStream : public FileTestFixture<BufferedInputStream> {
     local_pool_ = MemoryPool::CreateDefault();
   }
 
-  void MakeExample1(int64_t buffer_size, MemoryPool* pool = default_memory_pool()) {
+  void MakeExample1(int64_t buffer_size, MemoryPool* pool = default_memory_pool(),
+                    int64_t raw_read_bound = -1) {
     test_data_ = kExample1;
 
     ASSERT_OK_AND_ASSIGN(auto file_out, FileOutputStream::Open(path_));
@@ -338,7 +339,8 @@ class TestBufferedInputStream : public FileTestFixture<BufferedInputStream> {
 
     ASSERT_OK_AND_ASSIGN(auto file_in, ReadableFile::Open(path_));
     raw_ = file_in;
-    ASSERT_OK_AND_ASSIGN(buffered_, BufferedInputStream::Create(buffer_size, pool, raw_));
+    ASSERT_OK_AND_ASSIGN(
+        buffered_, BufferedInputStream::Create(buffer_size, pool, raw_, raw_read_bound));
   }
 
  protected:
@@ -472,6 +474,23 @@ TEST_F(TestBufferedInputStream, SetBufferSize) {
   ASSERT_OK(buffered_->SetBufferSize(5));
 }
 
+// GH-43060: Internal buffer should not greater than the
+// bytes could buffer.
+TEST_F(TestBufferedInputStream, BufferSizeLimit) {
+  {
+    // Buffer size should not exceeds raw_read_bound
+    MakeExample1(/*buffer_size=*/100000, default_memory_pool(), /*raw_read_bound=*/15);
+    EXPECT_EQ(15, buffered_->buffer_size());
+  }
+  {
+    // Set a buffer size after read.
+    MakeExample1(/*buffer_size=*/10, default_memory_pool(), /*raw_read_bound=*/15);
+    ASSERT_OK(buffered_->Read(10));
+    ASSERT_OK(buffered_->SetBufferSize(/*new_buffer_size=*/100000));
+    EXPECT_EQ(5, buffered_->buffer_size());
+  }
+}
+
 class TestBufferedInputStreamBound : public ::testing::Test {
  public:
   void SetUp() { CreateExample(/*bounded=*/true); }
diff --git a/cpp/src/arrow/io/compressed.cc b/cpp/src/arrow/io/compressed.cc
index d06101748dc0c..306f7c4bf8519 100644
--- a/cpp/src/arrow/io/compressed.cc
+++ b/cpp/src/arrow/io/compressed.cc
@@ -269,7 +269,7 @@ class CompressedInputStream::Impl {
 
   // Read compressed data if necessary
   Status EnsureCompressedData() {
-    int64_t compressed_avail = compressed_ ? compressed_->size() - compressed_pos_ : 0;
+    int64_t compressed_avail = compressed_buffer_available();
     if (compressed_avail == 0) {
       // Ensure compressed_ buffer is allocated with kChunkSize.
       if (!supports_zero_copy_from_raw_) {
@@ -297,10 +297,14 @@ class CompressedInputStream::Impl {
     return Status::OK();
   }
 
-  // Decompress some data from the compressed_ buffer.
-  // Call this function only if the decompressed_ buffer is empty.
+  // Decompress some data from the compressed_ buffer into decompressor_.
+  // Call this function only if the decompressed_ buffer is fully consumed.
   Status DecompressData() {
+    // compressed_buffer_available() could be 0 here because there might
+    // still be some decompressed data left to emit even though the compressed
+    // data was entirely consumed (especially if the expansion factor is large)
     DCHECK_NE(compressed_->data(), nullptr);
+    DCHECK_EQ(0, decompressed_buffer_available());
 
     int64_t decompress_size = kDecompressSize;
 
@@ -352,8 +356,10 @@ class CompressedInputStream::Impl {
   }
 
   // Try to feed more data into the decompressed_ buffer.
-  Status RefillDecompressed(bool* has_data) {
-    // First try to read data from the decompressor
+  // Returns whether there is more data to read.
+  Result<bool> RefillDecompressed() {
+    // First try to read data from the decompressor, unless we haven't read any
+    // compressed data yet.
     if (compressed_ && compressed_->size() != 0) {
       if (decompressor_->IsFinished()) {
         // We just went over the end of a previous compressed stream.
@@ -362,21 +368,21 @@ class CompressedInputStream::Impl {
       }
       RETURN_NOT_OK(DecompressData());
     }
-    if (!decompressed_ || decompressed_->size() == 0) {
-      // Got nothing, need to read more compressed data
+    int64_t decompress_avail = decompressed_buffer_available();
+    if (decompress_avail == 0) {
+      // Got nothing from existing `compressed_` and `decompressor_`,
+      // need to read more compressed data.
       RETURN_NOT_OK(EnsureCompressedData());
-      if (compressed_pos_ == compressed_->size()) {
+      if (compressed_buffer_available() == 0) {
         // No more data to decompress
         if (!fresh_decompressor_ && !decompressor_->IsFinished()) {
           return Status::IOError("Truncated compressed stream");
         }
-        *has_data = false;
-        return Status::OK();
+        return false;
       }
       RETURN_NOT_OK(DecompressData());
     }
-    *has_data = true;
-    return Status::OK();
+    return true;
   }
 
   Result<int64_t> Read(int64_t nbytes, void* out) {
@@ -394,7 +400,7 @@ class CompressedInputStream::Impl {
 
       // At this point, no more decompressed data remains, so we need to
       // decompress more
-      RETURN_NOT_OK(RefillDecompressed(&decompressor_has_data));
+      ARROW_ASSIGN_OR_RAISE(decompressor_has_data, RefillDecompressed());
     }
 
     total_pos_ += total_read;
@@ -405,11 +411,21 @@ class CompressedInputStream::Impl {
     ARROW_ASSIGN_OR_RAISE(auto buf, AllocateResizableBuffer(nbytes, pool_));
     ARROW_ASSIGN_OR_RAISE(int64_t bytes_read, Read(nbytes, buf->mutable_data()));
     RETURN_NOT_OK(buf->Resize(bytes_read));
-    return buf;
+    // R build with openSUSE155 requires an explicit shared_ptr construction
+    return std::shared_ptr<Buffer>(std::move(buf));
   }
 
   const std::shared_ptr<InputStream>& raw() const { return raw_; }
 
+ private:
+  int64_t compressed_buffer_available() const {
+    return compressed_ ? compressed_->size() - compressed_pos_ : 0;
+  }
+
+  int64_t decompressed_buffer_available() const {
+    return decompressed_ ? decompressed_->size() - decompressed_pos_ : 0;
+  }
+
  private:
   // Read 64 KB compressed data at a time
   static const int64_t kChunkSize = 64 * 1024;
diff --git a/cpp/src/arrow/io/compressed_benchmark.cc b/cpp/src/arrow/io/compressed_benchmark.cc
index 52a30d8cb0887..ae9ecd57143f3 100644
--- a/cpp/src/arrow/io/compressed_benchmark.cc
+++ b/cpp/src/arrow/io/compressed_benchmark.cc
@@ -170,6 +170,7 @@ static void CompressedInputStreamNonZeroCopyBufferReturnedByCallee(
                                  BufferReadMode::ReturnedByCallee>(state, kCompression);
 }
 
+#ifdef ARROW_WITH_LZ4
 static void CompressedInputArguments(::benchmark::internal::Benchmark* b) {
   b->ArgNames({"num_bytes", "batch_size"})
       ->Args({8 * 1024, 8 * 1024})
@@ -180,7 +181,6 @@ static void CompressedInputArguments(::benchmark::internal::Benchmark* b) {
       ->Args({1024 * 1024, 1024 * 1024});
 }
 
-#ifdef ARROW_WITH_LZ4
 // Benchmark LZ4 because it's lightweight, which makes benchmarking focused on the
 // overhead of the compression input stream.
 BENCHMARK_TEMPLATE(CompressedInputStreamZeroCopyBufferProvidedByCaller,
diff --git a/cpp/src/arrow/io/compressed_test.cc b/cpp/src/arrow/io/compressed_test.cc
index bd414149d5345..12d116e3395d4 100644
--- a/cpp/src/arrow/io/compressed_test.cc
+++ b/cpp/src/arrow/io/compressed_test.cc
@@ -77,7 +77,7 @@ std::shared_ptr<Buffer> CompressDataOneShot(Codec* codec,
   compressed_len = *codec->Compress(data.size(), data.data(), max_compressed_len,
                                     compressed->mutable_data());
   ABORT_NOT_OK(compressed->Resize(compressed_len));
-  return std::move(compressed);
+  return compressed;
 }
 
 Status RunCompressedInputStream(Codec* codec, std::shared_ptr<Buffer> compressed,
diff --git a/cpp/src/arrow/io/file.cc b/cpp/src/arrow/io/file.cc
index 00426f9957b1f..a22accf65660a 100644
--- a/cpp/src/arrow/io/file.cc
+++ b/cpp/src/arrow/io/file.cc
@@ -230,7 +230,8 @@ class ReadableFile::ReadableFileImpl : public OSFile {
       RETURN_NOT_OK(buffer->Resize(bytes_read));
       buffer->ZeroPadding();
     }
-    return std::move(buffer);
+    // R build with openSUSE155 requires an explicit shared_ptr construction
+    return std::shared_ptr<Buffer>(std::move(buffer));
   }
 
   Result<std::shared_ptr<Buffer>> ReadBufferAt(int64_t position, int64_t nbytes) {
@@ -242,7 +243,8 @@ class ReadableFile::ReadableFileImpl : public OSFile {
       RETURN_NOT_OK(buffer->Resize(bytes_read));
       buffer->ZeroPadding();
     }
-    return std::move(buffer);
+    // R build with openSUSE155 requires an explicit shared_ptr construction
+    return std::shared_ptr<Buffer>(std::move(buffer));
   }
 
   Status WillNeed(const std::vector<ReadRange>& ranges) {
@@ -398,8 +400,14 @@ class MemoryMappedFile::MemoryMap
 
     ~Region() {
       if (data_ != nullptr) {
+#ifndef __EMSCRIPTEN__
         int result = munmap(data(), static_cast<size_t>(size_));
+        // emscripten erroneously reports failures in munmap
+        // https://github.com/emscripten-core/emscripten/issues/20459
         ARROW_CHECK_EQ(result, 0) << "munmap failed";
+#else
+        munmap(data(), static_cast<size_t>(size_));
+#endif
       }
     }
 
diff --git a/cpp/src/arrow/io/file_test.cc b/cpp/src/arrow/io/file_test.cc
index e7e7ba949c9fd..af414891b950e 100644
--- a/cpp/src/arrow/io/file_test.cc
+++ b/cpp/src/arrow/io/file_test.cc
@@ -42,6 +42,7 @@
 #include "arrow/status.h"
 #include "arrow/testing/gtest_util.h"
 #include "arrow/testing/util.h"
+#include "arrow/util/config.h"
 #include "arrow/util/future.h"
 #include "arrow/util/io_util.h"
 
@@ -486,6 +487,10 @@ TEST_F(TestReadableFile, CustomMemoryPool) {
 }
 
 TEST_F(TestReadableFile, ThreadSafety) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   std::string data = "foobar";
   {
     std::ofstream stream;
@@ -540,6 +545,9 @@ class TestPipeIO : public ::testing::Test {
 };
 
 TEST_F(TestPipeIO, TestWrite) {
+#ifdef __EMSCRIPTEN__
+  GTEST_SKIP() << "Pipes not supported on Emscripten";
+#endif
   std::string data1 = "test", data2 = "data!";
   std::shared_ptr<FileOutputStream> file;
   uint8_t buffer[10];
@@ -570,6 +578,9 @@ TEST_F(TestPipeIO, TestWrite) {
 }
 
 TEST_F(TestPipeIO, ReadableFileFails) {
+#ifdef __EMSCRIPTEN__
+  GTEST_SKIP() << "Pipes not supported on Emscripten";
+#endif
   // ReadableFile fails on non-seekable fd
   ASSERT_RAISES(IOError, ReadableFile::Open(pipe_.rfd.fd()));
 }
@@ -1048,6 +1059,10 @@ TEST_F(TestMemoryMappedFile, CastableToFileInterface) {
 }
 
 TEST_F(TestMemoryMappedFile, ThreadSafety) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   std::string data = "foobar";
   std::string path = TempFile("ipc-multithreading-test");
   CreateFile(path, static_cast<int>(data.size()));
diff --git a/cpp/src/arrow/io/hdfs.cc b/cpp/src/arrow/io/hdfs.cc
index 5d3edcd3ba63a..5fb762d076376 100644
--- a/cpp/src/arrow/io/hdfs.cc
+++ b/cpp/src/arrow/io/hdfs.cc
@@ -172,7 +172,8 @@ class HdfsReadableFile::HdfsReadableFileImpl : public HdfsAnyFileImpl {
       RETURN_NOT_OK(buffer->Resize(bytes_read));
       buffer->ZeroPadding();
     }
-    return std::move(buffer);
+    // R build with openSUSE155 requires an explicit shared_ptr construction
+    return std::shared_ptr<Buffer>(std::move(buffer));
   }
 
   Result<int64_t> Read(int64_t nbytes, void* buffer) {
@@ -200,7 +201,8 @@ class HdfsReadableFile::HdfsReadableFileImpl : public HdfsAnyFileImpl {
     if (bytes_read < nbytes) {
       RETURN_NOT_OK(buffer->Resize(bytes_read));
     }
-    return std::move(buffer);
+    // R build with openSUSE155 requires an explicit shared_ptr construction
+    return std::shared_ptr<Buffer>(std::move(buffer));
   }
 
   Result<int64_t> GetSize() {
diff --git a/cpp/src/arrow/io/stdio.cc b/cpp/src/arrow/io/stdio.cc
index ac6ca3a63a604..ba4a66a2f340e 100644
--- a/cpp/src/arrow/io/stdio.cc
+++ b/cpp/src/arrow/io/stdio.cc
@@ -85,7 +85,8 @@ Result<std::shared_ptr<Buffer>> StdinStream::Read(int64_t nbytes) {
   ARROW_ASSIGN_OR_RAISE(int64_t bytes_read, Read(nbytes, buffer->mutable_data()));
   ARROW_RETURN_NOT_OK(buffer->Resize(bytes_read, false));
   buffer->ZeroPadding();
-  return std::move(buffer);
+  // R build with openSUSE155 requires an explicit shared_ptr construction
+  return std::shared_ptr<Buffer>(std::move(buffer));
 }
 
 }  // namespace io
diff --git a/cpp/src/arrow/ipc/CMakeLists.txt b/cpp/src/arrow/ipc/CMakeLists.txt
index 9fd71361d9b76..2fc9b145ccc98 100644
--- a/cpp/src/arrow/ipc/CMakeLists.txt
+++ b/cpp/src/arrow/ipc/CMakeLists.txt
@@ -39,6 +39,7 @@ endfunction()
 
 add_arrow_test(feather_test)
 add_arrow_ipc_test(json_simple_test)
+add_arrow_ipc_test(message_internal_test)
 add_arrow_ipc_test(read_write_test)
 add_arrow_ipc_test(tensor_test)
 
@@ -56,6 +57,7 @@ if(ARROW_BUILD_UTILITIES OR ARROW_BUILD_INTEGRATION)
   target_link_libraries(arrow-file-to-stream ${ARROW_UTIL_LIB})
   add_executable(arrow-stream-to-file stream_to_file.cc)
   target_link_libraries(arrow-stream-to-file ${ARROW_UTIL_LIB})
+
   if(ARROW_BUILD_UTILITIES)
     install(TARGETS arrow-file-to-stream arrow-stream-to-file ${INSTALL_IS_OPTIONAL}
             DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/cpp/src/arrow/ipc/json_simple.cc b/cpp/src/arrow/ipc/json_simple.cc
index ceeabe01677ed..9fd449831c980 100644
--- a/cpp/src/arrow/ipc/json_simple.cc
+++ b/cpp/src/arrow/ipc/json_simple.cc
@@ -36,6 +36,7 @@
 #include "arrow/type_traits.h"
 #include "arrow/util/checked_cast.h"
 #include "arrow/util/decimal.h"
+#include "arrow/util/float16.h"
 #include "arrow/util/logging.h"
 #include "arrow/util/value_parsing.h"
 
@@ -52,6 +53,7 @@ namespace rj = arrow::rapidjson;
 namespace arrow {
 
 using internal::ParseValue;
+using util::Float16;
 
 namespace ipc {
 namespace internal {
@@ -232,9 +234,9 @@ enable_if_physical_signed_integer<T, Status> ConvertNumber(const rj::Value& json
 
 // Convert single unsigned integer value
 template <typename T>
-enable_if_physical_unsigned_integer<T, Status> ConvertNumber(const rj::Value& json_obj,
-                                                             const DataType& type,
-                                                             typename T::c_type* out) {
+enable_if_unsigned_integer<T, Status> ConvertNumber(const rj::Value& json_obj,
+                                                    const DataType& type,
+                                                    typename T::c_type* out) {
   if (json_obj.IsUint64()) {
     uint64_t v64 = json_obj.GetUint64();
     *out = static_cast<typename T::c_type>(v64);
@@ -249,6 +251,30 @@ enable_if_physical_unsigned_integer<T, Status> ConvertNumber(const rj::Value& js
   }
 }
 
+// Convert float16/HalfFloatType
+template <typename T>
+enable_if_half_float<T, Status> ConvertNumber(const rj::Value& json_obj,
+                                              const DataType& type, uint16_t* out) {
+  if (json_obj.IsDouble()) {
+    double f64 = json_obj.GetDouble();
+    *out = Float16(f64).bits();
+    return Status::OK();
+  } else if (json_obj.IsUint()) {
+    uint32_t u32t = json_obj.GetUint();
+    double f64 = static_cast<double>(u32t);
+    *out = Float16(f64).bits();
+    return Status::OK();
+  } else if (json_obj.IsInt()) {
+    int32_t i32t = json_obj.GetInt();
+    double f64 = static_cast<double>(i32t);
+    *out = Float16(f64).bits();
+    return Status::OK();
+  } else {
+    *out = static_cast<uint16_t>(0);
+    return JSONTypeError("unsigned int", json_obj.GetType());
+  }
+}
+
 // Convert single floating point value
 template <typename T>
 enable_if_physical_floating_point<T, Status> ConvertNumber(const rj::Value& json_obj,
diff --git a/cpp/src/arrow/ipc/json_simple_test.cc b/cpp/src/arrow/ipc/json_simple_test.cc
index ea3a9ae1a14a9..c6f14b1e1d50e 100644
--- a/cpp/src/arrow/ipc/json_simple_test.cc
+++ b/cpp/src/arrow/ipc/json_simple_test.cc
@@ -44,6 +44,7 @@
 #include "arrow/util/bitmap_builders.h"
 #include "arrow/util/checked_cast.h"
 #include "arrow/util/decimal.h"
+#include "arrow/util/float16.h"
 
 #if defined(_MSC_VER)
 // "warning C4307: '+': integral constant overflow"
@@ -51,6 +52,9 @@
 #endif
 
 namespace arrow {
+
+using util::Float16;
+
 namespace ipc {
 namespace internal {
 namespace json {
@@ -269,7 +273,6 @@ INSTANTIATE_TYPED_TEST_SUITE_P(TestUInt8, TestIntegers, UInt8Type);
 INSTANTIATE_TYPED_TEST_SUITE_P(TestUInt16, TestIntegers, UInt16Type);
 INSTANTIATE_TYPED_TEST_SUITE_P(TestUInt32, TestIntegers, UInt32Type);
 INSTANTIATE_TYPED_TEST_SUITE_P(TestUInt64, TestIntegers, UInt64Type);
-INSTANTIATE_TYPED_TEST_SUITE_P(TestHalfFloat, TestIntegers, HalfFloatType);
 
 template <typename T>
 class TestStrings : public ::testing::Test {
diff --git a/cpp/src/arrow/ipc/message.cc b/cpp/src/arrow/ipc/message.cc
index e196dd7bf5389..27ded52861eaf 100644
--- a/cpp/src/arrow/ipc/message.cc
+++ b/cpp/src/arrow/ipc/message.cc
@@ -130,7 +130,7 @@ Result<std::unique_ptr<Message>> Message::Open(std::shared_ptr<Buffer> metadata,
                                                std::shared_ptr<Buffer> body) {
   std::unique_ptr<Message> result(new Message(std::move(metadata), std::move(body)));
   RETURN_NOT_OK(result->impl_->Open());
-  return std::move(result);
+  return result;
 }
 
 Message::~Message() {}
@@ -208,7 +208,7 @@ Result<std::unique_ptr<Message>> Message::ReadFrom(std::shared_ptr<Buffer> metad
                            " bytes for message body, got ", body->size());
   }
   RETURN_NOT_OK(decoder.Consume(body));
-  return std::move(result);
+  return result;
 }
 
 Result<std::unique_ptr<Message>> Message::ReadFrom(const int64_t offset,
@@ -225,7 +225,7 @@ Result<std::unique_ptr<Message>> Message::ReadFrom(const int64_t offset,
                            " bytes for message body, got ", body->size());
   }
   RETURN_NOT_OK(decoder.Consume(body));
-  return std::move(result);
+  return result;
 }
 
 Status WritePadding(io::OutputStream* stream, int64_t nbytes) {
@@ -329,7 +329,7 @@ Result<std::unique_ptr<Message>> ReadMessage(std::shared_ptr<Buffer> metadata,
     case MessageDecoder::State::INITIAL:
       // Metadata did not request a body so we better not have provided one
       DCHECK_EQ(body, nullptr);
-      return std::move(result);
+      return result;
     case MessageDecoder::State::METADATA_LENGTH:
       return Status::Invalid("metadata length is missing from the metadata buffer");
     case MessageDecoder::State::METADATA:
@@ -338,7 +338,7 @@ Result<std::unique_ptr<Message>> ReadMessage(std::shared_ptr<Buffer> metadata,
     case MessageDecoder::State::BODY: {
       if (body == nullptr) {
         // Caller didn't give a body so just give them a message without body
-        return std::move(result);
+        return result;
       }
       if (body->size() != decoder.next_required_size()) {
         return Status::IOError("Expected body buffer to be ",
@@ -346,7 +346,7 @@ Result<std::unique_ptr<Message>> ReadMessage(std::shared_ptr<Buffer> metadata,
                                " bytes for message body, got ", body->size());
       }
       RETURN_NOT_OK(decoder.Consume(body));
-      return std::move(result);
+      return result;
     }
     case MessageDecoder::State::EOS:
       return Status::Invalid("Unexpected empty message in IPC file format");
@@ -376,7 +376,7 @@ Result<std::unique_ptr<Message>> ReadMessage(int64_t offset, int32_t metadata_le
 
   switch (decoder.state()) {
     case MessageDecoder::State::INITIAL:
-      return std::move(result);
+      return result;
     case MessageDecoder::State::METADATA_LENGTH:
       return Status::Invalid("metadata length is missing. File offset: ", offset,
                              ", metadata length: ", metadata_length);
@@ -401,7 +401,7 @@ Result<std::unique_ptr<Message>> ReadMessage(int64_t offset, int32_t metadata_le
                                " bytes for message body, got ", body->size());
       }
       RETURN_NOT_OK(decoder.Consume(body));
-      return std::move(result);
+      return result;
     }
     case MessageDecoder::State::EOS:
       return Status::Invalid("Unexpected empty message in IPC file format");
@@ -551,7 +551,7 @@ Result<std::unique_ptr<Message>> ReadMessage(io::InputStream* file, MemoryPool*
   if (!message) {
     return nullptr;
   } else {
-    return std::move(message);
+    return message;
   }
 }
 
diff --git a/cpp/src/arrow/ipc/message_internal_test.cc b/cpp/src/arrow/ipc/message_internal_test.cc
new file mode 100644
index 0000000000000..112240f08d552
--- /dev/null
+++ b/cpp/src/arrow/ipc/message_internal_test.cc
@@ -0,0 +1,81 @@
+// 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.
+
+#include <flatbuffers/flatbuffers.h>
+#include <gtest/gtest.h>
+#include <memory>
+
+#include "arrow/buffer.h"
+#include "arrow/ipc/dictionary.h"
+#include "arrow/ipc/metadata_internal.h"
+#include "arrow/ipc/options.h"
+#include "arrow/testing/gtest_util.h"
+#include "arrow/util/key_value_metadata.h"
+
+namespace arrow::ipc::internal {
+
+using FBB = flatbuffers::FlatBufferBuilder;
+
+// GH-40361: Test that Flatbuffer serialization matches a known output
+// byte-for-byte.
+//
+// Our Flatbuffers code should not depend on argument evaluation order as it's
+// undefined (https://en.cppreference.com/w/cpp/language/eval_order) and may
+// lead to unnecessary platform- or toolchain-specific differences in
+// serialization.
+TEST(TestMessageInternal, TestByteIdentical) {
+  FBB fbb;
+  flatbuffers::Offset<org::apache::arrow::flatbuf::Schema> fb_schema;
+  DictionaryFieldMapper mapper;
+
+  // Create a simple Schema with just two metadata KVPs
+  auto f0 = field("f0", int64());
+  auto f1 = field("f1", int64());
+  std::vector<std::shared_ptr<Field>> fields = {f0, f1};
+  std::shared_ptr<KeyValueMetadata> metadata =
+      KeyValueMetadata::Make({"key_1", "key_2"}, {"key_1_value", "key_2_value"});
+  auto schema = ::arrow::schema({f0}, metadata);
+
+  // Serialize the Schema to a Buffer
+  std::shared_ptr<Buffer> out_buffer;
+  ASSERT_OK(
+      WriteSchemaMessage(*schema, mapper, IpcWriteOptions::Defaults(), &out_buffer));
+
+  // This is example output from macOS+ARM+LLVM
+  const uint8_t expected[] = {
+      0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x0E, 0x00, 0x06, 0x00, 0x05, 0x00,
+      0x08, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x00, 0x10, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x0A, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x04, 0x00, 0x08, 0x00, 0x0A, 0x00,
+      0x00, 0x00, 0x6C, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
+      0x38, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xD8, 0xFF, 0xFF, 0xFF, 0x18, 0x00,
+      0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0B, 0x00, 0x00, 0x00, 0x6B, 0x65, 0x79, 0x5F,
+      0x32, 0x5F, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x00, 0x05, 0x00, 0x00, 0x00, 0x6B, 0x65,
+      0x79, 0x5F, 0x32, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0C, 0x00, 0x04, 0x00, 0x08, 0x00,
+      0x08, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0B, 0x00,
+      0x00, 0x00, 0x6B, 0x65, 0x79, 0x5F, 0x31, 0x5F, 0x76, 0x61, 0x6C, 0x75, 0x65, 0x00,
+      0x05, 0x00, 0x00, 0x00, 0x6B, 0x65, 0x79, 0x5F, 0x31, 0x00, 0x00, 0x00, 0x01, 0x00,
+      0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x10, 0x00, 0x14, 0x00, 0x08, 0x00, 0x06, 0x00,
+      0x07, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x01, 0x02, 0x10, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
+      0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x66, 0x30, 0x00, 0x00, 0x08, 0x00,
+      0x0C, 0x00, 0x08, 0x00, 0x07, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+      0x40, 0x00, 0x00, 0x00};
+  Buffer expected_buffer(expected, sizeof(expected));
+
+  AssertBufferEqual(expected_buffer, *out_buffer);
+}
+}  // namespace arrow::ipc::internal
diff --git a/cpp/src/arrow/ipc/metadata_internal.cc b/cpp/src/arrow/ipc/metadata_internal.cc
index 4154b594d9507..be8d1ccc35f1a 100644
--- a/cpp/src/arrow/ipc/metadata_internal.cc
+++ b/cpp/src/arrow/ipc/metadata_internal.cc
@@ -109,8 +109,9 @@ flatbuf::MetadataVersion MetadataVersionToFlatbuffer(MetadataVersion version) {
 bool HasValidityBitmap(Type::type type_id, MetadataVersion version) {
   // In V4, null types have no validity bitmap
   // In V5 and later, null and union types have no validity bitmap
-  return (version < MetadataVersion::V5) ? (type_id != Type::NA)
-                                         : ::arrow::internal::HasValidityBitmap(type_id);
+  return (version < MetadataVersion::V5)
+             ? (type_id != Type::NA)
+             : ::arrow::internal::may_have_validity_bitmap(type_id);
 }
 
 namespace {
@@ -190,11 +191,9 @@ Status UnionFromFlatbuffer(const flatbuf::Union* union_data,
   }
 
   if (mode == UnionMode::SPARSE) {
-    ARROW_ASSIGN_OR_RAISE(
-        *out, SparseUnionType::Make(std::move(children), std::move(type_codes)));
+    ARROW_ASSIGN_OR_RAISE(*out, SparseUnionType::Make(children, std::move(type_codes)));
   } else {
-    ARROW_ASSIGN_OR_RAISE(
-        *out, DenseUnionType::Make(std::move(children), std::move(type_codes)));
+    ARROW_ASSIGN_OR_RAISE(*out, DenseUnionType::Make(children, std::move(type_codes)));
   }
   return Status::OK();
 }
@@ -477,7 +476,9 @@ static Status GetDictionaryEncoding(FBB& fbb, const std::shared_ptr<Field>& fiel
 
 static KeyValueOffset AppendKeyValue(FBB& fbb, const std::string& key,
                                      const std::string& value) {
-  return flatbuf::CreateKeyValue(fbb, fbb.CreateString(key), fbb.CreateString(value));
+  auto fbb_key = fbb.CreateString(key);
+  auto fbb_value = fbb.CreateString(value);
+  return flatbuf::CreateKeyValue(fbb, fbb_key, fbb_value);
 }
 
 static void AppendKeyValueMetadata(FBB& fbb, const KeyValueMetadata& metadata,
diff --git a/cpp/src/arrow/ipc/metadata_internal.h b/cpp/src/arrow/ipc/metadata_internal.h
index 631a336f75a9a..c0aca44644a40 100644
--- a/cpp/src/arrow/ipc/metadata_internal.h
+++ b/cpp/src/arrow/ipc/metadata_internal.h
@@ -238,7 +238,8 @@ static inline Result<std::shared_ptr<Buffer>> WriteFlatbufferBuilder(
 
   uint8_t* dst = result->mutable_data();
   memcpy(dst, fbb.GetBufferPointer(), size);
-  return std::move(result);
+  // R build with openSUSE155 requires an explicit shared_ptr construction
+  return std::shared_ptr<Buffer>(std::move(result));
 }
 
 ARROW_EXPORT
diff --git a/cpp/src/arrow/ipc/read_write_test.cc b/cpp/src/arrow/ipc/read_write_test.cc
index c5075299a3e35..ff7838cc39d72 100644
--- a/cpp/src/arrow/ipc/read_write_test.cc
+++ b/cpp/src/arrow/ipc/read_write_test.cc
@@ -1046,6 +1046,9 @@ class RecursionLimits : public ::testing::Test, public io::MemoryMapFixture {
 };
 
 TEST_F(RecursionLimits, WriteLimit) {
+#ifdef __EMSCRIPTEN__
+  GTEST_SKIP() << "This crashes the Emscripten runtime.";
+#endif
   int32_t metadata_length = -1;
   int64_t body_length = -1;
   std::shared_ptr<Schema> schema;
@@ -1078,6 +1081,10 @@ TEST_F(RecursionLimits, ReadLimit) {
 // Test fails with a structured exception on Windows + Debug
 #if !defined(_WIN32) || defined(NDEBUG)
 TEST_F(RecursionLimits, StressLimit) {
+#ifdef __EMSCRIPTEN__
+  GTEST_SKIP() << "This crashes the Emscripten runtime.";
+#endif
+
   auto CheckDepth = [this](int recursion_depth, bool* it_works) {
     int32_t metadata_length = -1;
     int64_t body_length = -1;
diff --git a/cpp/src/arrow/ipc/reader.cc b/cpp/src/arrow/ipc/reader.cc
index d272c78560f82..da84f2f2dc87d 100644
--- a/cpp/src/arrow/ipc/reader.cc
+++ b/cpp/src/arrow/ipc/reader.cc
@@ -540,7 +540,8 @@ Result<std::shared_ptr<Buffer>> DecompressBuffer(const std::shared_ptr<Buffer>&
                            actual_decompressed);
   }
 
-  return std::move(uncompressed);
+  // R build with openSUSE155 requires an explicit shared_ptr construction
+  return std::shared_ptr<Buffer>(std::move(uncompressed));
 }
 
 Status DecompressBuffers(Compression::type compression, const IpcReadOptions& options,
@@ -1174,7 +1175,7 @@ static Result<std::unique_ptr<Message>> ReadMessageFromBlock(
 
   ARROW_ASSIGN_OR_RAISE(auto message, ReadMessage(block.offset, block.metadata_length,
                                                   file, fields_loader));
-  return std::move(message);
+  return message;
 }
 
 static Future<std::shared_ptr<Message>> ReadMessageFromBlockAsync(
@@ -1536,7 +1537,7 @@ class RecordBatchFileReaderImpl : public RecordBatchFileReader {
     ARROW_ASSIGN_OR_RAISE(auto message,
                           arrow::ipc::ReadMessageFromBlock(block, file_, fields_loader));
     stats_.num_messages.fetch_add(1, std::memory_order_relaxed);
-    return std::move(message);
+    return message;
   }
 
   Status ReadDictionaries() {
@@ -1632,7 +1633,7 @@ class RecordBatchFileReaderImpl : public RecordBatchFileReader {
     }
     context.compression = compression;
     context.metadata_version = internal::GetMetadataVersion(message->version());
-    return std::move(context);
+    return context;
   }
 
   Result<const flatbuf::RecordBatch*> GetBatchFromMessage(
@@ -2704,7 +2705,7 @@ Result<std::shared_ptr<Buffer>> IoRecordedRandomAccessFile::Read(int64_t nbytes)
   ARROW_ASSIGN_OR_RAISE(std::shared_ptr<Buffer> buffer, ReadAt(position_, nbytes));
   auto num_bytes_read = std::min(file_size_, position_ + nbytes) - position_;
   position_ += num_bytes_read;
-  return std::move(buffer);
+  return buffer;
 }
 
 const io::IOContext& IoRecordedRandomAccessFile::io_context() const {
diff --git a/cpp/src/arrow/ipc/writer.cc b/cpp/src/arrow/ipc/writer.cc
index 93256440f4a7a..f603e60c66555 100644
--- a/cpp/src/arrow/ipc/writer.cc
+++ b/cpp/src/arrow/ipc/writer.cc
@@ -154,6 +154,11 @@ class RecordBatchSerializer {
       return Status::CapacityError("Cannot write arrays larger than 2^31 - 1 in length");
     }
 
+    if (arr.offset() != 0 && arr.device_type() != DeviceAllocationType::kCPU) {
+      // https://github.com/apache/arrow/issues/43029
+      return Status::NotImplemented("Cannot compute null count for non-cpu sliced array");
+    }
+
     // push back all common elements
     field_nodes_.push_back({arr.length(), arr.null_count(), 0});
 
@@ -164,7 +169,7 @@ class RecordBatchSerializer {
         std::shared_ptr<Buffer> bitmap;
         RETURN_NOT_OK(GetTruncatedBitmap(arr.offset(), arr.length(), arr.null_bitmap(),
                                          options_.memory_pool, &bitmap));
-        out_->body_buffers.emplace_back(bitmap);
+        out_->body_buffers.emplace_back(std::move(bitmap));
       } else {
         // Push a dummy zero-length buffer, not to be copied
         out_->body_buffers.emplace_back(kNullBuffer);
@@ -222,8 +227,9 @@ class RecordBatchSerializer {
       RETURN_NOT_OK(
           result->Resize(actual_length + sizeof(int64_t), /* shrink_to_fit= */ true));
     }
-    *reinterpret_cast<int64_t*>(result->mutable_data()) =
-        bit_util::ToLittleEndian(prefixed_length);
+    int64_t prefixed_length_little_endian = bit_util::ToLittleEndian(prefixed_length);
+    util::SafeStore(result->mutable_data(), prefixed_length_little_endian);
+
     *out = SliceBuffer(std::move(result), /*offset=*/0, actual_length + sizeof(int64_t));
 
     return Status::OK();
@@ -415,7 +421,7 @@ class RecordBatchSerializer {
     std::shared_ptr<Buffer> data;
     RETURN_NOT_OK(GetTruncatedBitmap(array.offset(), array.length(), array.values(),
                                      options_.memory_pool, &data));
-    out_->body_buffers.emplace_back(data);
+    out_->body_buffers.emplace_back(std::move(data));
     return Status::OK();
   }
 
@@ -442,20 +448,28 @@ class RecordBatchSerializer {
                    data->size() - byte_offset);
       data = SliceBuffer(data, byte_offset, buffer_length);
     }
-    out_->body_buffers.emplace_back(data);
+    out_->body_buffers.emplace_back(std::move(data));
     return Status::OK();
   }
 
   template <typename T>
   enable_if_base_binary<typename T::TypeClass, Status> Visit(const T& array) {
+    using offset_type = typename T::offset_type;
+
     std::shared_ptr<Buffer> value_offsets;
     RETURN_NOT_OK(GetZeroBasedValueOffsets<T>(array, &value_offsets));
     auto data = array.value_data();
 
     int64_t total_data_bytes = 0;
-    if (value_offsets) {
-      total_data_bytes = array.value_offset(array.length()) - array.value_offset(0);
+    if (value_offsets && array.length() > 0) {
+      offset_type last_offset_value;
+      RETURN_NOT_OK(MemoryManager::CopyBufferSliceToCPU(
+          value_offsets, array.length() * sizeof(offset_type), sizeof(offset_type),
+          reinterpret_cast<uint8_t*>(&last_offset_value)));
+
+      total_data_bytes = last_offset_value;
     }
+
     if (NeedTruncate(array.offset(), data.get(), total_data_bytes)) {
       // Slice the data buffer to include only the range we need now
       const int64_t start_offset = array.value_offset(0);
@@ -464,8 +478,8 @@ class RecordBatchSerializer {
       data = SliceBuffer(data, start_offset, slice_length);
     }
 
-    out_->body_buffers.emplace_back(value_offsets);
-    out_->body_buffers.emplace_back(data);
+    out_->body_buffers.emplace_back(std::move(value_offsets));
+    out_->body_buffers.emplace_back(std::move(data));
     return Status::OK();
   }
 
@@ -494,8 +508,15 @@ class RecordBatchSerializer {
     offset_type values_offset = 0;
     offset_type values_length = 0;
     if (value_offsets) {
-      values_offset = array.value_offset(0);
-      values_length = array.value_offset(array.length()) - values_offset;
+      RETURN_NOT_OK(MemoryManager::CopyBufferSliceToCPU(
+          array.value_offsets(), array.offset() * sizeof(offset_type),
+          sizeof(offset_type), reinterpret_cast<uint8_t*>(&values_offset)));
+      offset_type last_values_offset = 0;
+      RETURN_NOT_OK(MemoryManager::CopyBufferSliceToCPU(
+          array.value_offsets(), (array.offset() + array.length()) * sizeof(offset_type),
+          sizeof(offset_type), reinterpret_cast<uint8_t*>(&last_values_offset)));
+
+      values_length = last_values_offset - values_offset;
     }
 
     if (array.offset() != 0 || values_length < values->length()) {
@@ -566,7 +587,7 @@ class RecordBatchSerializer {
     RETURN_NOT_OK(GetTruncatedBuffer(
         offset, length, static_cast<int32_t>(sizeof(UnionArray::type_code_t)),
         array.type_codes(), options_.memory_pool, &type_codes));
-    out_->body_buffers.emplace_back(type_codes);
+    out_->body_buffers.emplace_back(std::move(type_codes));
 
     --max_recursion_depth_;
     for (int i = 0; i < array.num_fields(); ++i) {
@@ -585,7 +606,7 @@ class RecordBatchSerializer {
     RETURN_NOT_OK(GetTruncatedBuffer(
         offset, length, static_cast<int32_t>(sizeof(UnionArray::type_code_t)),
         array.type_codes(), options_.memory_pool, &type_codes));
-    out_->body_buffers.emplace_back(type_codes);
+    out_->body_buffers.emplace_back(std::move(type_codes));
 
     --max_recursion_depth_;
     const auto& type = checked_cast<const UnionType&>(*array.type());
@@ -640,7 +661,7 @@ class RecordBatchSerializer {
 
       value_offsets = std::move(shifted_offsets_buffer);
     }
-    out_->body_buffers.emplace_back(value_offsets);
+    out_->body_buffers.emplace_back(std::move(value_offsets));
 
     // Visit children and slice accordingly
     for (int i = 0; i < type.num_fields(); ++i) {
@@ -1561,7 +1582,8 @@ Result<std::unique_ptr<RecordBatchWriter>> OpenRecordBatchWriter(
   auto writer = std::make_unique<internal::IpcFormatWriter>(
       std::move(sink), schema, options, /*is_file_format=*/false);
   RETURN_NOT_OK(writer->Start());
-  return std::move(writer);
+  // R build with openSUSE155 requires an explicit unique_ptr construction
+  return std::unique_ptr<RecordBatchWriter>(std::move(writer));
 }
 
 Result<std::unique_ptr<IpcPayloadWriter>> MakePayloadStreamWriter(
diff --git a/cpp/src/arrow/json/object_writer.h b/cpp/src/arrow/json/object_writer.h
index b15b09dbdacfc..cf1ce62194fb8 100644
--- a/cpp/src/arrow/json/object_writer.h
+++ b/cpp/src/arrow/json/object_writer.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <memory>
+#include <string>
 #include <string_view>
 
 #include "arrow/util/visibility.h"
diff --git a/cpp/src/arrow/pretty_print.cc b/cpp/src/arrow/pretty_print.cc
index e666ec70f9489..53a6953681660 100644
--- a/cpp/src/arrow/pretty_print.cc
+++ b/cpp/src/arrow/pretty_print.cc
@@ -391,7 +391,14 @@ class ArrayPrinter : public PrettyPrinter {
   }
 
   Status Print(const Array& array) {
-    RETURN_NOT_OK(VisitArrayInline(array, this));
+    if (array.device_type() != DeviceAllocationType::kCPU) {
+      // GH-43055: ideally we only copy start/end slices from non-CPU memory
+      // based on the window size that is being printed
+      ARROW_ASSIGN_OR_RAISE(auto array_cpu, array.CopyTo(default_cpu_memory_manager()));
+      RETURN_NOT_OK(VisitArrayInline(*array_cpu, this));
+    } else {
+      RETURN_NOT_OK(VisitArrayInline(array, this));
+    }
     Flush();
     return Status::OK();
   }
diff --git a/cpp/src/arrow/record_batch.cc b/cpp/src/arrow/record_batch.cc
index 6f3b8e75a20d0..e3a8c0d710cb8 100644
--- a/cpp/src/arrow/record_batch.cc
+++ b/cpp/src/arrow/record_batch.cc
@@ -35,7 +35,6 @@
 #include "arrow/type.h"
 #include "arrow/util/iterator.h"
 #include "arrow/util/logging.h"
-#include "arrow/util/unreachable.h"
 #include "arrow/util/vector.h"
 #include "arrow/visit_type_inline.h"
 
@@ -59,17 +58,31 @@ int RecordBatch::num_columns() const { return schema_->num_fields(); }
 class SimpleRecordBatch : public RecordBatch {
  public:
   SimpleRecordBatch(std::shared_ptr<Schema> schema, int64_t num_rows,
-                    std::vector<std::shared_ptr<Array>> columns)
-      : RecordBatch(std::move(schema), num_rows), boxed_columns_(std::move(columns)) {
+                    std::vector<std::shared_ptr<Array>> columns,
+                    std::shared_ptr<Device::SyncEvent> sync_event = nullptr)
+      : RecordBatch(std::move(schema), num_rows),
+        boxed_columns_(std::move(columns)),
+        device_type_(DeviceAllocationType::kCPU),
+        sync_event_(std::move(sync_event)) {
+    if (boxed_columns_.size() > 0) {
+      device_type_ = boxed_columns_[0]->device_type();
+    }
+
     columns_.resize(boxed_columns_.size());
     for (size_t i = 0; i < columns_.size(); ++i) {
       columns_[i] = boxed_columns_[i]->data();
+      DCHECK_EQ(device_type_, columns_[i]->device_type());
     }
   }
 
   SimpleRecordBatch(const std::shared_ptr<Schema>& schema, int64_t num_rows,
-                    std::vector<std::shared_ptr<ArrayData>> columns)
-      : RecordBatch(std::move(schema), num_rows), columns_(std::move(columns)) {
+                    std::vector<std::shared_ptr<ArrayData>> columns,
+                    DeviceAllocationType device_type = DeviceAllocationType::kCPU,
+                    std::shared_ptr<Device::SyncEvent> sync_event = nullptr)
+      : RecordBatch(std::move(schema), num_rows),
+        columns_(std::move(columns)),
+        device_type_(device_type),
+        sync_event_(std::move(sync_event)) {
     boxed_columns_.resize(schema_->num_fields());
   }
 
@@ -99,6 +112,7 @@ class SimpleRecordBatch : public RecordBatch {
       const std::shared_ptr<Array>& column) const override {
     ARROW_CHECK(field != nullptr);
     ARROW_CHECK(column != nullptr);
+    ARROW_CHECK(column->device_type() == device_type_);
 
     if (!field->type()->Equals(column->type())) {
       return Status::TypeError("Column data type ", field->type()->name(),
@@ -113,7 +127,8 @@ class SimpleRecordBatch : public RecordBatch {
 
     ARROW_ASSIGN_OR_RAISE(auto new_schema, schema_->AddField(i, field));
     return RecordBatch::Make(std::move(new_schema), num_rows_,
-                             internal::AddVectorElement(columns_, i, column->data()));
+                             internal::AddVectorElement(columns_, i, column->data()),
+                             device_type_, sync_event_);
   }
 
   Result<std::shared_ptr<RecordBatch>> SetColumn(
@@ -121,6 +136,7 @@ class SimpleRecordBatch : public RecordBatch {
       const std::shared_ptr<Array>& column) const override {
     ARROW_CHECK(field != nullptr);
     ARROW_CHECK(column != nullptr);
+    ARROW_CHECK(column->device_type() == device_type_);
 
     if (!field->type()->Equals(column->type())) {
       return Status::TypeError("Column data type ", field->type()->name(),
@@ -135,19 +151,22 @@ class SimpleRecordBatch : public RecordBatch {
 
     ARROW_ASSIGN_OR_RAISE(auto new_schema, schema_->SetField(i, field));
     return RecordBatch::Make(std::move(new_schema), num_rows_,
-                             internal::ReplaceVectorElement(columns_, i, column->data()));
+                             internal::ReplaceVectorElement(columns_, i, column->data()),
+                             device_type_, sync_event_);
   }
 
   Result<std::shared_ptr<RecordBatch>> RemoveColumn(int i) const override {
     ARROW_ASSIGN_OR_RAISE(auto new_schema, schema_->RemoveField(i));
     return RecordBatch::Make(std::move(new_schema), num_rows_,
-                             internal::DeleteVectorElement(columns_, i));
+                             internal::DeleteVectorElement(columns_, i), device_type_,
+                             sync_event_);
   }
 
   std::shared_ptr<RecordBatch> ReplaceSchemaMetadata(
       const std::shared_ptr<const KeyValueMetadata>& metadata) const override {
     auto new_schema = schema_->WithMetadata(metadata);
-    return RecordBatch::Make(std::move(new_schema), num_rows_, columns_);
+    return RecordBatch::Make(std::move(new_schema), num_rows_, columns_, device_type_,
+                             sync_event_);
   }
 
   std::shared_ptr<RecordBatch> Slice(int64_t offset, int64_t length) const override {
@@ -157,7 +176,8 @@ class SimpleRecordBatch : public RecordBatch {
       arrays.emplace_back(field->Slice(offset, length));
     }
     int64_t num_rows = std::min(num_rows_ - offset, length);
-    return std::make_shared<SimpleRecordBatch>(schema_, num_rows, std::move(arrays));
+    return std::make_shared<SimpleRecordBatch>(schema_, num_rows, std::move(arrays),
+                                               device_type_, sync_event_);
   }
 
   Status Validate() const override {
@@ -167,11 +187,22 @@ class SimpleRecordBatch : public RecordBatch {
     return RecordBatch::Validate();
   }
 
+  const std::shared_ptr<Device::SyncEvent>& GetSyncEvent() const override {
+    return sync_event_;
+  }
+
+  DeviceAllocationType device_type() const override { return device_type_; }
+
  private:
   std::vector<std::shared_ptr<ArrayData>> columns_;
 
   // Caching boxed array data
   mutable std::vector<std::shared_ptr<Array>> boxed_columns_;
+
+  // the type of device that the buffers for columns are allocated on.
+  // all columns should be on the same type of device.
+  DeviceAllocationType device_type_;
+  std::shared_ptr<Device::SyncEvent> sync_event_;
 };
 
 RecordBatch::RecordBatch(const std::shared_ptr<Schema>& schema, int64_t num_rows)
@@ -179,18 +210,21 @@ RecordBatch::RecordBatch(const std::shared_ptr<Schema>& schema, int64_t num_rows
 
 std::shared_ptr<RecordBatch> RecordBatch::Make(
     std::shared_ptr<Schema> schema, int64_t num_rows,
-    std::vector<std::shared_ptr<Array>> columns) {
+    std::vector<std::shared_ptr<Array>> columns,
+    std::shared_ptr<Device::SyncEvent> sync_event) {
   DCHECK_EQ(schema->num_fields(), static_cast<int>(columns.size()));
   return std::make_shared<SimpleRecordBatch>(std::move(schema), num_rows,
-                                             std::move(columns));
+                                             std::move(columns), std::move(sync_event));
 }
 
 std::shared_ptr<RecordBatch> RecordBatch::Make(
     std::shared_ptr<Schema> schema, int64_t num_rows,
-    std::vector<std::shared_ptr<ArrayData>> columns) {
+    std::vector<std::shared_ptr<ArrayData>> columns, DeviceAllocationType device_type,
+    std::shared_ptr<Device::SyncEvent> sync_event) {
   DCHECK_EQ(schema->num_fields(), static_cast<int>(columns.size()));
   return std::make_shared<SimpleRecordBatch>(std::move(schema), num_rows,
-                                             std::move(columns));
+                                             std::move(columns), device_type,
+                                             std::move(sync_event));
 }
 
 Result<std::shared_ptr<RecordBatch>> RecordBatch::MakeEmpty(
@@ -251,161 +285,11 @@ Result<std::shared_ptr<StructArray>> RecordBatch::ToStructArray() const {
                                        /*offset=*/0);
 }
 
-template <typename Out>
-struct ConvertColumnsToTensorVisitor {
-  Out*& out_values;
-  const ArrayData& in_data;
-
-  template <typename T>
-  Status Visit(const T&) {
-    if constexpr (is_numeric(T::type_id)) {
-      using In = typename T::c_type;
-      auto in_values = ArraySpan(in_data).GetSpan<In>(1, in_data.length);
-
-      if (in_data.null_count == 0) {
-        if constexpr (std::is_same_v<In, Out>) {
-          memcpy(out_values, in_values.data(), in_values.size_bytes());
-          out_values += in_values.size();
-        } else {
-          for (In in_value : in_values) {
-            *out_values++ = static_cast<Out>(in_value);
-          }
-        }
-      } else {
-        for (int64_t i = 0; i < in_data.length; ++i) {
-          *out_values++ =
-              in_data.IsNull(i) ? static_cast<Out>(NAN) : static_cast<Out>(in_values[i]);
-        }
-      }
-      return Status::OK();
-    }
-    Unreachable();
-  }
-};
-
-template <typename DataType>
-inline void ConvertColumnsToTensor(const RecordBatch& batch, uint8_t* out) {
-  using CType = typename arrow::TypeTraits<DataType>::CType;
-  auto* out_values = reinterpret_cast<CType*>(out);
-
-  for (const auto& column : batch.columns()) {
-    ConvertColumnsToTensorVisitor<CType> visitor{out_values, *column->data()};
-    DCHECK_OK(VisitTypeInline(*column->type(), &visitor));
-  }
-}
-
-Result<std::shared_ptr<Tensor>> RecordBatch::ToTensor(bool null_to_nan,
+Result<std::shared_ptr<Tensor>> RecordBatch::ToTensor(bool null_to_nan, bool row_major,
                                                       MemoryPool* pool) const {
-  if (num_columns() == 0) {
-    return Status::TypeError(
-        "Conversion to Tensor for RecordBatches without columns/schema is not "
-        "supported.");
-  }
-  // Check for no validity bitmap of each field
-  // if null_to_nan conversion is set to false
-  for (int i = 0; i < num_columns(); ++i) {
-    if (column(i)->null_count() > 0 && !null_to_nan) {
-      return Status::TypeError(
-          "Can only convert a RecordBatch with no nulls. Set null_to_nan to true to "
-          "convert nulls to NaN");
-    }
-  }
-
-  // Check for supported data types and merge fields
-  // to get the resulting uniform data type
-  if (!is_integer(column(0)->type()->id()) && !is_floating(column(0)->type()->id())) {
-    return Status::TypeError("DataType is not supported: ",
-                             column(0)->type()->ToString());
-  }
-  std::shared_ptr<Field> result_field = schema_->field(0);
-  std::shared_ptr<DataType> result_type = result_field->type();
-
-  Field::MergeOptions options;
-  options.promote_integer_to_float = true;
-  options.promote_integer_sign = true;
-  options.promote_numeric_width = true;
-
-  if (num_columns() > 1) {
-    for (int i = 1; i < num_columns(); ++i) {
-      if (!is_numeric(column(i)->type()->id())) {
-        return Status::TypeError("DataType is not supported: ",
-                                 column(i)->type()->ToString());
-      }
-
-      // Casting of float16 is not supported, throw an error in this case
-      if ((column(i)->type()->id() == Type::HALF_FLOAT ||
-           result_field->type()->id() == Type::HALF_FLOAT) &&
-          column(i)->type()->id() != result_field->type()->id()) {
-        return Status::NotImplemented("Casting from or to halffloat is not supported.");
-      }
-
-      ARROW_ASSIGN_OR_RAISE(
-          result_field, result_field->MergeWith(
-                            schema_->field(i)->WithName(result_field->name()), options));
-    }
-    result_type = result_field->type();
-  }
-
-  // Check if result_type is signed or unsigned integer and null_to_nan is set to true
-  // Then all columns should be promoted to float type
-  if (is_integer(result_type->id()) && null_to_nan) {
-    ARROW_ASSIGN_OR_RAISE(
-        result_field,
-        result_field->MergeWith(field(result_field->name(), float32()), options));
-    result_type = result_field->type();
-  }
-
-  // Allocate memory
-  ARROW_ASSIGN_OR_RAISE(
-      std::shared_ptr<Buffer> result,
-      AllocateBuffer(result_type->bit_width() * num_columns() * num_rows(), pool));
-  // Copy data
-  switch (result_type->id()) {
-    case Type::UINT8:
-      ConvertColumnsToTensor<UInt8Type>(*this, result->mutable_data());
-      break;
-    case Type::UINT16:
-    case Type::HALF_FLOAT:
-      ConvertColumnsToTensor<UInt16Type>(*this, result->mutable_data());
-      break;
-    case Type::UINT32:
-      ConvertColumnsToTensor<UInt32Type>(*this, result->mutable_data());
-      break;
-    case Type::UINT64:
-      ConvertColumnsToTensor<UInt64Type>(*this, result->mutable_data());
-      break;
-    case Type::INT8:
-      ConvertColumnsToTensor<Int8Type>(*this, result->mutable_data());
-      break;
-    case Type::INT16:
-      ConvertColumnsToTensor<Int16Type>(*this, result->mutable_data());
-      break;
-    case Type::INT32:
-      ConvertColumnsToTensor<Int32Type>(*this, result->mutable_data());
-      break;
-    case Type::INT64:
-      ConvertColumnsToTensor<Int64Type>(*this, result->mutable_data());
-      break;
-    case Type::FLOAT:
-      ConvertColumnsToTensor<FloatType>(*this, result->mutable_data());
-      break;
-    case Type::DOUBLE:
-      ConvertColumnsToTensor<DoubleType>(*this, result->mutable_data());
-      break;
-    default:
-      return Status::TypeError("DataType is not supported: ", result_type->ToString());
-  }
-
-  // Construct Tensor object
-  const auto& fixed_width_type =
-      internal::checked_cast<const FixedWidthType&>(*result_type);
-  std::vector<int64_t> shape = {num_rows(), num_columns()};
-  std::vector<int64_t> strides;
+  std::shared_ptr<Tensor> tensor;
   ARROW_RETURN_NOT_OK(
-      internal::ComputeColumnMajorStrides(fixed_width_type, shape, &strides));
-  ARROW_ASSIGN_OR_RAISE(auto tensor,
-                        Tensor::Make(result_type, std::move(result), shape, strides));
-
+      internal::RecordBatchToTensor(*this, null_to_nan, row_major, pool, &tensor));
   return tensor;
 }
 
@@ -423,6 +307,10 @@ bool RecordBatch::Equals(const RecordBatch& other, bool check_metadata,
     return false;
   }
 
+  if (device_type() != other.device_type()) {
+    return false;
+  }
+
   for (int i = 0; i < num_columns(); ++i) {
     if (!column(i)->Equals(other.column(i), opts)) {
       return false;
@@ -437,6 +325,10 @@ bool RecordBatch::ApproxEquals(const RecordBatch& other, const EqualOptions& opt
     return false;
   }
 
+  if (device_type() != other.device_type()) {
+    return false;
+  }
+
   for (int i = 0; i < num_columns(); ++i) {
     if (!column(i)->ApproxEquals(other.column(i), opts)) {
       return false;
@@ -462,7 +354,7 @@ Result<std::shared_ptr<RecordBatch>> RecordBatch::ReplaceSchema(
           ", did not match new schema field type: ", replace_type->ToString());
     }
   }
-  return RecordBatch::Make(std::move(schema), num_rows(), columns());
+  return RecordBatch::Make(std::move(schema), num_rows(), columns(), GetSyncEvent());
 }
 
 std::vector<std::string> RecordBatch::ColumnNames() const {
@@ -491,7 +383,7 @@ Result<std::shared_ptr<RecordBatch>> RecordBatch::RenameColumns(
   }
 
   return RecordBatch::Make(::arrow::schema(std::move(fields)), num_rows(),
-                           std::move(columns));
+                           std::move(columns), GetSyncEvent());
 }
 
 Result<std::shared_ptr<RecordBatch>> RecordBatch::SelectColumns(
@@ -512,7 +404,8 @@ Result<std::shared_ptr<RecordBatch>> RecordBatch::SelectColumns(
 
   auto new_schema =
       std::make_shared<arrow::Schema>(std::move(fields), schema()->metadata());
-  return RecordBatch::Make(std::move(new_schema), num_rows(), std::move(columns));
+  return RecordBatch::Make(std::move(new_schema), num_rows(), std::move(columns),
+                           GetSyncEvent());
 }
 
 std::shared_ptr<RecordBatch> RecordBatch::Slice(int64_t offset) const {
@@ -604,12 +497,16 @@ Result<std::shared_ptr<Table>> RecordBatchReader::ToTable() {
 class SimpleRecordBatchReader : public RecordBatchReader {
  public:
   SimpleRecordBatchReader(Iterator<std::shared_ptr<RecordBatch>> it,
-                          std::shared_ptr<Schema> schema)
-      : schema_(std::move(schema)), it_(std::move(it)) {}
+                          std::shared_ptr<Schema> schema,
+                          DeviceAllocationType device_type = DeviceAllocationType::kCPU)
+      : schema_(std::move(schema)), it_(std::move(it)), device_type_(device_type) {}
 
   SimpleRecordBatchReader(std::vector<std::shared_ptr<RecordBatch>> batches,
-                          std::shared_ptr<Schema> schema)
-      : schema_(std::move(schema)), it_(MakeVectorIterator(std::move(batches))) {}
+                          std::shared_ptr<Schema> schema,
+                          DeviceAllocationType device_type = DeviceAllocationType::kCPU)
+      : schema_(std::move(schema)),
+        it_(MakeVectorIterator(std::move(batches))),
+        device_type_(device_type) {}
 
   Status ReadNext(std::shared_ptr<RecordBatch>* batch) override {
     return it_.Next().Value(batch);
@@ -617,13 +514,17 @@ class SimpleRecordBatchReader : public RecordBatchReader {
 
   std::shared_ptr<Schema> schema() const override { return schema_; }
 
+  DeviceAllocationType device_type() const override { return device_type_; }
+
  protected:
   std::shared_ptr<Schema> schema_;
   Iterator<std::shared_ptr<RecordBatch>> it_;
+  DeviceAllocationType device_type_;
 };
 
 Result<std::shared_ptr<RecordBatchReader>> RecordBatchReader::Make(
-    std::vector<std::shared_ptr<RecordBatch>> batches, std::shared_ptr<Schema> schema) {
+    std::vector<std::shared_ptr<RecordBatch>> batches, std::shared_ptr<Schema> schema,
+    DeviceAllocationType device_type) {
   if (schema == nullptr) {
     if (batches.size() == 0 || batches[0] == nullptr) {
       return Status::Invalid("Cannot infer schema from empty vector or nullptr");
@@ -632,16 +533,19 @@ Result<std::shared_ptr<RecordBatchReader>> RecordBatchReader::Make(
     schema = batches[0]->schema();
   }
 
-  return std::make_shared<SimpleRecordBatchReader>(std::move(batches), std::move(schema));
+  return std::make_shared<SimpleRecordBatchReader>(std::move(batches), std::move(schema),
+                                                   device_type);
 }
 
 Result<std::shared_ptr<RecordBatchReader>> RecordBatchReader::MakeFromIterator(
-    Iterator<std::shared_ptr<RecordBatch>> batches, std::shared_ptr<Schema> schema) {
+    Iterator<std::shared_ptr<RecordBatch>> batches, std::shared_ptr<Schema> schema,
+    DeviceAllocationType device_type) {
   if (schema == nullptr) {
     return Status::Invalid("Schema cannot be nullptr");
   }
 
-  return std::make_shared<SimpleRecordBatchReader>(std::move(batches), std::move(schema));
+  return std::make_shared<SimpleRecordBatchReader>(std::move(batches), std::move(schema),
+                                                   device_type);
 }
 
 RecordBatchReader::~RecordBatchReader() {
@@ -658,6 +562,10 @@ Result<std::shared_ptr<RecordBatch>> ConcatenateRecordBatches(
   int cols = batches[0]->num_columns();
   auto schema = batches[0]->schema();
   for (size_t i = 0; i < batches.size(); ++i) {
+    if (auto sync = batches[i]->GetSyncEvent()) {
+      ARROW_RETURN_NOT_OK(sync->Wait());
+    }
+
     length += batches[i]->num_rows();
     if (!schema->Equals(batches[i]->schema())) {
       return Status::Invalid(
diff --git a/cpp/src/arrow/record_batch.h b/cpp/src/arrow/record_batch.h
index 5202ff4abfa0b..95596e9c15594 100644
--- a/cpp/src/arrow/record_batch.h
+++ b/cpp/src/arrow/record_batch.h
@@ -23,6 +23,7 @@
 #include <vector>
 
 #include "arrow/compare.h"
+#include "arrow/device.h"
 #include "arrow/result.h"
 #include "arrow/status.h"
 #include "arrow/type_fwd.h"
@@ -45,9 +46,12 @@ class ARROW_EXPORT RecordBatch {
   /// \param[in] num_rows length of fields in the record batch. Each array
   /// should have the same length as num_rows
   /// \param[in] columns the record batch fields as vector of arrays
-  static std::shared_ptr<RecordBatch> Make(std::shared_ptr<Schema> schema,
-                                           int64_t num_rows,
-                                           std::vector<std::shared_ptr<Array>> columns);
+  /// \param[in] sync_event optional synchronization event for non-CPU device
+  /// memory used by buffers
+  static std::shared_ptr<RecordBatch> Make(
+      std::shared_ptr<Schema> schema, int64_t num_rows,
+      std::vector<std::shared_ptr<Array>> columns,
+      std::shared_ptr<Device::SyncEvent> sync_event = NULLPTR);
 
   /// \brief Construct record batch from vector of internal data structures
   /// \since 0.5.0
@@ -58,9 +62,15 @@ class ARROW_EXPORT RecordBatch {
   /// \param num_rows the number of semantic rows in the record batch. This
   /// should be equal to the length of each field
   /// \param columns the data for the batch's columns
+  /// \param device_type the type of the device that the Arrow columns are
+  /// allocated on
+  /// \param sync_event optional synchronization event for non-CPU device
+  /// memory used by buffers
   static std::shared_ptr<RecordBatch> Make(
       std::shared_ptr<Schema> schema, int64_t num_rows,
-      std::vector<std::shared_ptr<ArrayData>> columns);
+      std::vector<std::shared_ptr<ArrayData>> columns,
+      DeviceAllocationType device_type = DeviceAllocationType::kCPU,
+      std::shared_ptr<Device::SyncEvent> sync_event = NULLPTR);
 
   /// \brief Create an empty RecordBatch of a given schema
   ///
@@ -87,10 +97,12 @@ class ARROW_EXPORT RecordBatch {
   /// Generated Tensor will have column-major layout.
   ///
   /// \param[in] null_to_nan if true, convert nulls to NaN
+  /// \param[in] row_major if true, create row-major Tensor else column-major Tensor
   /// \param[in] pool the memory pool to allocate the tensor buffer
   /// \return the resulting Tensor
   Result<std::shared_ptr<Tensor>> ToTensor(
-      bool null_to_nan = false, MemoryPool* pool = default_memory_pool()) const;
+      bool null_to_nan = false, bool row_major = true,
+      MemoryPool* pool = default_memory_pool()) const;
 
   /// \brief Construct record batch from struct array
   ///
@@ -258,6 +270,18 @@ class ARROW_EXPORT RecordBatch {
   /// \return Status
   virtual Status ValidateFull() const;
 
+  /// \brief EXPERIMENTAL: Return a top-level sync event object for this record batch
+  ///
+  /// If all of the data for this record batch is in CPU memory, then this
+  /// will return null. If the data for this batch is
+  /// on a device, then if synchronization is needed before accessing the
+  /// data the returned sync event will allow for it.
+  ///
+  /// \return null or a Device::SyncEvent
+  virtual const std::shared_ptr<Device::SyncEvent>& GetSyncEvent() const = 0;
+
+  virtual DeviceAllocationType device_type() const = 0;
+
  protected:
   RecordBatch(const std::shared_ptr<Schema>& schema, int64_t num_rows);
 
@@ -286,7 +310,22 @@ class ARROW_EXPORT RecordBatchReader {
   /// \brief Read the next record batch in the stream. Return null for batch
   /// when reaching end of stream
   ///
-  /// \param[out] batch the next loaded batch, null at end of stream
+  /// Example:
+  ///
+  /// ```
+  /// while (true) {
+  ///   std::shared_ptr<RecordBatch> batch;
+  ///   ARROW_RETURN_NOT_OK(reader->ReadNext(&batch));
+  ///   if (!batch) {
+  ///     break;
+  ///   }
+  ///   // handling the `batch`, the `batch->num_rows()`
+  ///   // might be 0.
+  /// }
+  /// ```
+  ///
+  /// \param[out] batch the next loaded batch, null at end of stream. Returning
+  /// an empty batch doesn't mean the end of stream because it is valid data.
   /// \return Status
   virtual Status ReadNext(std::shared_ptr<RecordBatch>* batch) = 0;
 
@@ -304,6 +343,11 @@ class ARROW_EXPORT RecordBatchReader {
   /// \brief finalize reader
   virtual Status Close() { return Status::OK(); }
 
+  /// \brief EXPERIMENTAL: Get the device type for record batches this reader produces
+  ///
+  /// default implementation is to return DeviceAllocationType::kCPU
+  virtual DeviceAllocationType device_type() const { return DeviceAllocationType::kCPU; }
+
   class RecordBatchReaderIterator {
    public:
     using iterator_category = std::input_iterator_tag;
@@ -377,15 +421,19 @@ class ARROW_EXPORT RecordBatchReader {
   /// \param[in] batches the vector of RecordBatch to read from
   /// \param[in] schema schema to conform to. Will be inferred from the first
   ///            element if not provided.
+  /// \param[in] device_type the type of device that the batches are allocated on
   static Result<std::shared_ptr<RecordBatchReader>> Make(
-      RecordBatchVector batches, std::shared_ptr<Schema> schema = NULLPTR);
+      RecordBatchVector batches, std::shared_ptr<Schema> schema = NULLPTR,
+      DeviceAllocationType device_type = DeviceAllocationType::kCPU);
 
   /// \brief Create a RecordBatchReader from an Iterator of RecordBatch.
   ///
   /// \param[in] batches an iterator of RecordBatch to read from.
   /// \param[in] schema schema that each record batch in iterator will conform to.
+  /// \param[in] device_type the type of device that the batches are allocated on
   static Result<std::shared_ptr<RecordBatchReader>> MakeFromIterator(
-      Iterator<std::shared_ptr<RecordBatch>> batches, std::shared_ptr<Schema> schema);
+      Iterator<std::shared_ptr<RecordBatch>> batches, std::shared_ptr<Schema> schema,
+      DeviceAllocationType device_type = DeviceAllocationType::kCPU);
 };
 
 /// \brief Concatenate record batches
diff --git a/cpp/src/arrow/record_batch_test.cc b/cpp/src/arrow/record_batch_test.cc
index 7e0eb1d460555..daf7109075eab 100644
--- a/cpp/src/arrow/record_batch_test.cc
+++ b/cpp/src/arrow/record_batch_test.cc
@@ -36,11 +36,14 @@
 #include "arrow/testing/gtest_util.h"
 #include "arrow/testing/random.h"
 #include "arrow/type.h"
+#include "arrow/util/float16.h"
 #include "arrow/util/iterator.h"
 #include "arrow/util/key_value_metadata.h"
 
 namespace arrow {
 
+using util::Float16;
+
 class TestRecordBatch : public ::testing::Test {};
 
 TEST_F(TestRecordBatch, Equals) {
@@ -682,14 +685,20 @@ TEST_F(TestRecordBatch, ToTensorEmptyBatch) {
   ASSERT_OK_AND_ASSIGN(std::shared_ptr<RecordBatch> empty,
                        RecordBatch::MakeEmpty(schema));
 
-  ASSERT_OK_AND_ASSIGN(auto tensor, empty->ToTensor());
-  ASSERT_OK(tensor->Validate());
+  ASSERT_OK_AND_ASSIGN(auto tensor_column,
+                       empty->ToTensor(/*null_to_nan=*/false, /*row_major=*/false));
+  ASSERT_OK(tensor_column->Validate());
+
+  ASSERT_OK_AND_ASSIGN(auto tensor_row, empty->ToTensor());
+  ASSERT_OK(tensor_row->Validate());
 
   const std::vector<int64_t> strides = {4, 4};
   const std::vector<int64_t> shape = {0, 2};
 
-  EXPECT_EQ(strides, tensor->strides());
-  EXPECT_EQ(shape, tensor->shape());
+  EXPECT_EQ(strides, tensor_column->strides());
+  EXPECT_EQ(shape, tensor_column->shape());
+  EXPECT_EQ(strides, tensor_row->strides());
+  EXPECT_EQ(shape, tensor_row->shape());
 
   auto batch_no_columns =
       RecordBatch::Make(::arrow::schema({}), 10, std::vector<std::shared_ptr<Array>>{});
@@ -712,6 +721,19 @@ void CheckTensor(const std::shared_ptr<Tensor>& tensor, const int size,
   EXPECT_TRUE(tensor->is_contiguous());
 }
 
+template <typename DataType>
+void CheckTensorRowMajor(const std::shared_ptr<Tensor>& tensor, const int size,
+                         const std::vector<int64_t> shape,
+                         const std::vector<int64_t> strides) {
+  EXPECT_EQ(size, tensor->size());
+  EXPECT_EQ(TypeTraits<DataType>::type_singleton(), tensor->type());
+  EXPECT_EQ(shape, tensor->shape());
+  EXPECT_EQ(strides, tensor->strides());
+  EXPECT_TRUE(tensor->is_row_major());
+  EXPECT_FALSE(tensor->is_column_major());
+  EXPECT_TRUE(tensor->is_contiguous());
+}
+
 TEST_F(TestRecordBatch, ToTensorSupportedNaN) {
   const int length = 9;
 
@@ -726,7 +748,8 @@ TEST_F(TestRecordBatch, ToTensorSupportedNaN) {
 
   auto batch = RecordBatch::Make(schema, length, {a0, a1});
 
-  ASSERT_OK_AND_ASSIGN(auto tensor, batch->ToTensor());
+  ASSERT_OK_AND_ASSIGN(auto tensor,
+                       batch->ToTensor(/*null_to_nan=*/false, /*row_major=*/false));
   ASSERT_OK(tensor->Validate());
 
   std::vector<int64_t> shape = {9, 2};
@@ -756,7 +779,8 @@ TEST_F(TestRecordBatch, ToTensorSupportedNullToNan) {
 
   auto batch = RecordBatch::Make(schema, length, {a0, a1});
 
-  ASSERT_OK_AND_ASSIGN(auto tensor, batch->ToTensor(/*null_to_nan=*/true));
+  ASSERT_OK_AND_ASSIGN(auto tensor,
+                       batch->ToTensor(/*null_to_nan=*/true, /*row_major=*/false));
   ASSERT_OK(tensor->Validate());
 
   std::vector<int64_t> shape = {9, 2};
@@ -771,6 +795,19 @@ TEST_F(TestRecordBatch, ToTensorSupportedNullToNan) {
 
   CheckTensor<DoubleType>(tensor, 18, shape, f_strides);
 
+  ASSERT_OK_AND_ASSIGN(auto tensor_row, batch->ToTensor(/*null_to_nan=*/true));
+  ASSERT_OK(tensor_row->Validate());
+
+  std::vector<int64_t> strides = {f64_size * shape[1], f64_size};
+  std::shared_ptr<Tensor> tensor_expected_row = TensorFromJSON(
+      float64(), "[NaN, 10, 2,  20, 3, 30,  4, 40, 5, NaN, 6, 60, 7, 70, 8, 80, 9, 90]",
+      shape, strides);
+
+  EXPECT_FALSE(tensor_expected_row->Equals(*tensor_row));
+  EXPECT_TRUE(tensor_expected_row->Equals(*tensor_row, EqualOptions().nans_equal(true)));
+
+  CheckTensorRowMajor<DoubleType>(tensor_row, 18, shape, strides);
+
   // int32 -> float64
   auto f2 = field("f2", int32());
 
@@ -780,7 +817,8 @@ TEST_F(TestRecordBatch, ToTensorSupportedNullToNan) {
   auto a2 = ArrayFromJSON(int32(), "[10, 20, 30, 40, null, 60, 70, 80, 90]");
   auto batch1 = RecordBatch::Make(schema1, length, {a0, a2});
 
-  ASSERT_OK_AND_ASSIGN(auto tensor1, batch1->ToTensor(/*null_to_nan=*/true));
+  ASSERT_OK_AND_ASSIGN(auto tensor1,
+                       batch1->ToTensor(/*null_to_nan=*/true, /*row_major=*/false));
   ASSERT_OK(tensor1->Validate());
 
   EXPECT_FALSE(tensor_expected->Equals(*tensor1));
@@ -788,6 +826,14 @@ TEST_F(TestRecordBatch, ToTensorSupportedNullToNan) {
 
   CheckTensor<DoubleType>(tensor1, 18, shape, f_strides);
 
+  ASSERT_OK_AND_ASSIGN(auto tensor1_row, batch1->ToTensor(/*null_to_nan=*/true));
+  ASSERT_OK(tensor1_row->Validate());
+
+  EXPECT_FALSE(tensor_expected_row->Equals(*tensor1_row));
+  EXPECT_TRUE(tensor_expected_row->Equals(*tensor1_row, EqualOptions().nans_equal(true)));
+
+  CheckTensorRowMajor<DoubleType>(tensor1_row, 18, shape, strides);
+
   // int8 -> float32
   auto f3 = field("f3", int8());
   auto f4 = field("f4", int8());
@@ -799,7 +845,8 @@ TEST_F(TestRecordBatch, ToTensorSupportedNullToNan) {
   auto a4 = ArrayFromJSON(int8(), "[10, 20, 30, 40, null, 60, 70, 80, 90]");
   auto batch2 = RecordBatch::Make(schema2, length, {a3, a4});
 
-  ASSERT_OK_AND_ASSIGN(auto tensor2, batch2->ToTensor(/*null_to_nan=*/true));
+  ASSERT_OK_AND_ASSIGN(auto tensor2,
+                       batch2->ToTensor(/*null_to_nan=*/true, /*row_major=*/false));
   ASSERT_OK(tensor2->Validate());
 
   const int64_t f32_size = sizeof(float);
@@ -812,6 +859,20 @@ TEST_F(TestRecordBatch, ToTensorSupportedNullToNan) {
   EXPECT_TRUE(tensor_expected_2->Equals(*tensor2, EqualOptions().nans_equal(true)));
 
   CheckTensor<FloatType>(tensor2, 18, shape, f_strides_2);
+
+  ASSERT_OK_AND_ASSIGN(auto tensor2_row, batch2->ToTensor(/*null_to_nan=*/true));
+  ASSERT_OK(tensor2_row->Validate());
+
+  std::vector<int64_t> strides_2 = {f32_size * shape[1], f32_size};
+  std::shared_ptr<Tensor> tensor2_expected_row = TensorFromJSON(
+      float32(), "[NaN, 10, 2,  20, 3, 30,  4, 40, 5, NaN, 6, 60, 7, 70, 8, 80, 9, 90]",
+      shape, strides_2);
+
+  EXPECT_FALSE(tensor2_expected_row->Equals(*tensor2_row));
+  EXPECT_TRUE(
+      tensor2_expected_row->Equals(*tensor2_row, EqualOptions().nans_equal(true)));
+
+  CheckTensorRowMajor<FloatType>(tensor2_row, 18, shape, strides_2);
 }
 
 TEST_F(TestRecordBatch, ToTensorSupportedTypesMixed) {
@@ -830,7 +891,8 @@ TEST_F(TestRecordBatch, ToTensorSupportedTypesMixed) {
   auto schema = ::arrow::schema(fields);
   auto batch = RecordBatch::Make(schema, length, {a0});
 
-  ASSERT_OK_AND_ASSIGN(auto tensor, batch->ToTensor());
+  ASSERT_OK_AND_ASSIGN(auto tensor,
+                       batch->ToTensor(/*null_to_nan=*/false, /*row_major=*/false));
   ASSERT_OK(tensor->Validate());
 
   std::vector<int64_t> shape = {9, 1};
@@ -847,7 +909,8 @@ TEST_F(TestRecordBatch, ToTensorSupportedTypesMixed) {
   auto schema1 = ::arrow::schema(fields1);
   auto batch1 = RecordBatch::Make(schema1, length, {a0, a1});
 
-  ASSERT_OK_AND_ASSIGN(auto tensor1, batch1->ToTensor());
+  ASSERT_OK_AND_ASSIGN(auto tensor1,
+                       batch1->ToTensor(/*null_to_nan=*/false, /*row_major=*/false));
   ASSERT_OK(tensor1->Validate());
 
   std::vector<int64_t> shape1 = {9, 2};
@@ -872,7 +935,8 @@ TEST_F(TestRecordBatch, ToTensorSupportedTypesMixed) {
   auto schema2 = ::arrow::schema(fields2);
   auto batch2 = RecordBatch::Make(schema2, length, {a0, a1, a2});
 
-  ASSERT_OK_AND_ASSIGN(auto tensor2, batch2->ToTensor());
+  ASSERT_OK_AND_ASSIGN(auto tensor2,
+                       batch2->ToTensor(/*null_to_nan=*/false, /*row_major=*/false));
   ASSERT_OK(tensor2->Validate());
 
   std::vector<int64_t> shape2 = {9, 3};
@@ -917,11 +981,11 @@ TEST_F(TestRecordBatch, ToTensorUnsupportedMixedFloat16) {
 }
 
 template <typename DataType>
-class TestBatchToTensor : public ::testing::Test {};
+class TestBatchToTensorColumnMajor : public ::testing::Test {};
 
-TYPED_TEST_SUITE_P(TestBatchToTensor);
+TYPED_TEST_SUITE_P(TestBatchToTensorColumnMajor);
 
-TYPED_TEST_P(TestBatchToTensor, SupportedTypes) {
+TYPED_TEST_P(TestBatchToTensorColumnMajor, SupportedTypes) {
   using DataType = TypeParam;
   using c_data_type = typename DataType::c_type;
   const int unit_size = sizeof(c_data_type);
@@ -944,7 +1008,8 @@ TYPED_TEST_P(TestBatchToTensor, SupportedTypes) {
 
   auto batch = RecordBatch::Make(schema, length, {a0, a1, a2});
 
-  ASSERT_OK_AND_ASSIGN(auto tensor, batch->ToTensor());
+  ASSERT_OK_AND_ASSIGN(auto tensor,
+                       batch->ToTensor(/*null_to_nan=*/false, /*row_major=*/false));
   ASSERT_OK(tensor->Validate());
 
   std::vector<int64_t> shape = {9, 3};
@@ -961,7 +1026,8 @@ TYPED_TEST_P(TestBatchToTensor, SupportedTypes) {
   // Test offsets
   auto batch_slice = batch->Slice(1);
 
-  ASSERT_OK_AND_ASSIGN(auto tensor_sliced, batch_slice->ToTensor());
+  ASSERT_OK_AND_ASSIGN(auto tensor_sliced,
+                       batch_slice->ToTensor(/*null_to_nan=*/false, /*row_major=*/false));
   ASSERT_OK(tensor_sliced->Validate());
 
   std::vector<int64_t> shape_sliced = {8, 3};
@@ -977,7 +1043,9 @@ TYPED_TEST_P(TestBatchToTensor, SupportedTypes) {
 
   auto batch_slice_1 = batch->Slice(1, 5);
 
-  ASSERT_OK_AND_ASSIGN(auto tensor_sliced_1, batch_slice_1->ToTensor());
+  ASSERT_OK_AND_ASSIGN(
+      auto tensor_sliced_1,
+      batch_slice_1->ToTensor(/*null_to_nan=*/false, /*row_major=*/false));
   ASSERT_OK(tensor_sliced_1->Validate());
 
   std::vector<int64_t> shape_sliced_1 = {5, 3};
@@ -991,18 +1059,107 @@ TYPED_TEST_P(TestBatchToTensor, SupportedTypes) {
   CheckTensor<DataType>(tensor_expected_sliced_1, 15, shape_sliced_1, f_strides_sliced_1);
 }
 
-REGISTER_TYPED_TEST_SUITE_P(TestBatchToTensor, SupportedTypes);
+REGISTER_TYPED_TEST_SUITE_P(TestBatchToTensorColumnMajor, SupportedTypes);
+
+INSTANTIATE_TYPED_TEST_SUITE_P(UInt8, TestBatchToTensorColumnMajor, UInt8Type);
+INSTANTIATE_TYPED_TEST_SUITE_P(UInt16, TestBatchToTensorColumnMajor, UInt16Type);
+INSTANTIATE_TYPED_TEST_SUITE_P(UInt32, TestBatchToTensorColumnMajor, UInt32Type);
+INSTANTIATE_TYPED_TEST_SUITE_P(UInt64, TestBatchToTensorColumnMajor, UInt64Type);
+INSTANTIATE_TYPED_TEST_SUITE_P(Int8, TestBatchToTensorColumnMajor, Int8Type);
+INSTANTIATE_TYPED_TEST_SUITE_P(Int16, TestBatchToTensorColumnMajor, Int16Type);
+INSTANTIATE_TYPED_TEST_SUITE_P(Int32, TestBatchToTensorColumnMajor, Int32Type);
+INSTANTIATE_TYPED_TEST_SUITE_P(Int64, TestBatchToTensorColumnMajor, Int64Type);
+INSTANTIATE_TYPED_TEST_SUITE_P(Float16, TestBatchToTensorColumnMajor, HalfFloatType);
+INSTANTIATE_TYPED_TEST_SUITE_P(Float32, TestBatchToTensorColumnMajor, FloatType);
+INSTANTIATE_TYPED_TEST_SUITE_P(Float64, TestBatchToTensorColumnMajor, DoubleType);
+
+template <typename DataType>
+class TestBatchToTensorRowMajor : public ::testing::Test {};
+
+TYPED_TEST_SUITE_P(TestBatchToTensorRowMajor);
+
+TYPED_TEST_P(TestBatchToTensorRowMajor, SupportedTypes) {
+  using DataType = TypeParam;
+  using c_data_type = typename DataType::c_type;
+  const int unit_size = sizeof(c_data_type);
+
+  const int length = 9;
+
+  auto f0 = field("f0", TypeTraits<DataType>::type_singleton());
+  auto f1 = field("f1", TypeTraits<DataType>::type_singleton());
+  auto f2 = field("f2", TypeTraits<DataType>::type_singleton());
+
+  std::vector<std::shared_ptr<Field>> fields = {f0, f1, f2};
+  auto schema = ::arrow::schema(fields);
+
+  auto a0 = ArrayFromJSON(TypeTraits<DataType>::type_singleton(),
+                          "[1, 2, 3, 4, 5, 6, 7, 8, 9]");
+  auto a1 = ArrayFromJSON(TypeTraits<DataType>::type_singleton(),
+                          "[10, 20, 30, 40, 50, 60, 70, 80, 90]");
+  auto a2 = ArrayFromJSON(TypeTraits<DataType>::type_singleton(),
+                          "[100, 100, 100, 100, 100, 100, 100, 100, 100]");
+
+  auto batch = RecordBatch::Make(schema, length, {a0, a1, a2});
+
+  ASSERT_OK_AND_ASSIGN(auto tensor, batch->ToTensor());
+  ASSERT_OK(tensor->Validate());
+
+  std::vector<int64_t> shape = {9, 3};
+  std::vector<int64_t> strides = {unit_size * shape[1], unit_size};
+  std::shared_ptr<Tensor> tensor_expected =
+      TensorFromJSON(TypeTraits<DataType>::type_singleton(),
+                     "[1,   10, 100, 2, 20, 100, 3, 30, 100, 4, 40, 100, 5, 50, 100, 6, "
+                     "60, 100, 7, 70, 100, 8, 80, 100, 9, 90, 100]",
+                     shape, strides);
+
+  EXPECT_TRUE(tensor_expected->Equals(*tensor));
+  CheckTensorRowMajor<DataType>(tensor, 27, shape, strides);
+
+  // Test offsets
+  auto batch_slice = batch->Slice(1);
+
+  ASSERT_OK_AND_ASSIGN(auto tensor_sliced, batch_slice->ToTensor());
+  ASSERT_OK(tensor_sliced->Validate());
+
+  std::vector<int64_t> shape_sliced = {8, 3};
+  std::vector<int64_t> strides_sliced = {unit_size * shape[1], unit_size};
+  std::shared_ptr<Tensor> tensor_expected_sliced =
+      TensorFromJSON(TypeTraits<DataType>::type_singleton(),
+                     "[2, 20, 100, 3, 30, 100, 4, 40, 100, 5, 50, 100, 6, "
+                     "60, 100, 7, 70, 100, 8, 80, 100, 9, 90, 100]",
+                     shape_sliced, strides_sliced);
+
+  EXPECT_TRUE(tensor_expected_sliced->Equals(*tensor_sliced));
+  CheckTensorRowMajor<DataType>(tensor_sliced, 24, shape_sliced, strides_sliced);
+
+  auto batch_slice_1 = batch->Slice(1, 5);
+
+  ASSERT_OK_AND_ASSIGN(auto tensor_sliced_1, batch_slice_1->ToTensor());
+  ASSERT_OK(tensor_sliced_1->Validate());
+
+  std::vector<int64_t> shape_sliced_1 = {5, 3};
+  std::vector<int64_t> strides_sliced_1 = {unit_size * shape_sliced_1[1], unit_size};
+  std::shared_ptr<Tensor> tensor_expected_sliced_1 =
+      TensorFromJSON(TypeTraits<DataType>::type_singleton(),
+                     "[2, 20, 100, 3, 30, 100, 4, 40, 100, 5, 50, 100, 6, 60, 100]",
+                     shape_sliced_1, strides_sliced_1);
+
+  EXPECT_TRUE(tensor_expected_sliced_1->Equals(*tensor_sliced_1));
+  CheckTensorRowMajor<DataType>(tensor_sliced_1, 15, shape_sliced_1, strides_sliced_1);
+}
 
-INSTANTIATE_TYPED_TEST_SUITE_P(UInt8, TestBatchToTensor, UInt8Type);
-INSTANTIATE_TYPED_TEST_SUITE_P(UInt16, TestBatchToTensor, UInt16Type);
-INSTANTIATE_TYPED_TEST_SUITE_P(UInt32, TestBatchToTensor, UInt32Type);
-INSTANTIATE_TYPED_TEST_SUITE_P(UInt64, TestBatchToTensor, UInt64Type);
-INSTANTIATE_TYPED_TEST_SUITE_P(Int8, TestBatchToTensor, Int8Type);
-INSTANTIATE_TYPED_TEST_SUITE_P(Int16, TestBatchToTensor, Int16Type);
-INSTANTIATE_TYPED_TEST_SUITE_P(Int32, TestBatchToTensor, Int32Type);
-INSTANTIATE_TYPED_TEST_SUITE_P(Int64, TestBatchToTensor, Int64Type);
-INSTANTIATE_TYPED_TEST_SUITE_P(Float16, TestBatchToTensor, HalfFloatType);
-INSTANTIATE_TYPED_TEST_SUITE_P(Float32, TestBatchToTensor, FloatType);
-INSTANTIATE_TYPED_TEST_SUITE_P(Float64, TestBatchToTensor, DoubleType);
+REGISTER_TYPED_TEST_SUITE_P(TestBatchToTensorRowMajor, SupportedTypes);
+
+INSTANTIATE_TYPED_TEST_SUITE_P(UInt8, TestBatchToTensorRowMajor, UInt8Type);
+INSTANTIATE_TYPED_TEST_SUITE_P(UInt16, TestBatchToTensorRowMajor, UInt16Type);
+INSTANTIATE_TYPED_TEST_SUITE_P(UInt32, TestBatchToTensorRowMajor, UInt32Type);
+INSTANTIATE_TYPED_TEST_SUITE_P(UInt64, TestBatchToTensorRowMajor, UInt64Type);
+INSTANTIATE_TYPED_TEST_SUITE_P(Int8, TestBatchToTensorRowMajor, Int8Type);
+INSTANTIATE_TYPED_TEST_SUITE_P(Int16, TestBatchToTensorRowMajor, Int16Type);
+INSTANTIATE_TYPED_TEST_SUITE_P(Int32, TestBatchToTensorRowMajor, Int32Type);
+INSTANTIATE_TYPED_TEST_SUITE_P(Int64, TestBatchToTensorRowMajor, Int64Type);
+INSTANTIATE_TYPED_TEST_SUITE_P(Float16, TestBatchToTensorRowMajor, HalfFloatType);
+INSTANTIATE_TYPED_TEST_SUITE_P(Float32, TestBatchToTensorRowMajor, FloatType);
+INSTANTIATE_TYPED_TEST_SUITE_P(Float64, TestBatchToTensorRowMajor, DoubleType);
 
 }  // namespace arrow
diff --git a/cpp/src/arrow/scalar.cc b/cpp/src/arrow/scalar.cc
index 6996b46c8b61a..252706fd0b387 100644
--- a/cpp/src/arrow/scalar.cc
+++ b/cpp/src/arrow/scalar.cc
@@ -542,6 +542,12 @@ struct ScalarValidateImpl {
   }
 };
 
+template <typename T, size_t N>
+void FillScalarScratchSpace(void* scratch_space, T const (&arr)[N]) {
+  static_assert(sizeof(arr) <= internal::kScalarScratchSpaceSize);
+  std::memcpy(scratch_space, arr, sizeof(arr));
+}
+
 }  // namespace
 
 size_t Scalar::hash() const { return ScalarHashImpl(*this).hash_; }
@@ -557,6 +563,31 @@ Status Scalar::ValidateFull() const {
 BaseBinaryScalar::BaseBinaryScalar(std::string s, std::shared_ptr<DataType> type)
     : BaseBinaryScalar(Buffer::FromString(std::move(s)), std::move(type)) {}
 
+void BinaryScalar::FillScratchSpace(uint8_t* scratch_space,
+                                    const std::shared_ptr<Buffer>& value) {
+  FillScalarScratchSpace(
+      scratch_space,
+      {int32_t(0), value ? static_cast<int32_t>(value->size()) : int32_t(0)});
+}
+
+void BinaryViewScalar::FillScratchSpace(uint8_t* scratch_space,
+                                        const std::shared_ptr<Buffer>& value) {
+  static_assert(sizeof(BinaryViewType::c_type) <= internal::kScalarScratchSpaceSize);
+  auto* view = new (scratch_space) BinaryViewType::c_type;
+  if (value) {
+    *view = util::ToBinaryView(std::string_view{*value}, 0, 0);
+  } else {
+    *view = {};
+  }
+}
+
+void LargeBinaryScalar::FillScratchSpace(uint8_t* scratch_space,
+                                         const std::shared_ptr<Buffer>& value) {
+  FillScalarScratchSpace(
+      scratch_space,
+      {int64_t(0), value ? static_cast<int64_t>(value->size()) : int64_t(0)});
+}
+
 FixedSizeBinaryScalar::FixedSizeBinaryScalar(std::shared_ptr<Buffer> value,
                                              std::shared_ptr<DataType> type,
                                              bool is_valid)
@@ -578,20 +609,48 @@ FixedSizeBinaryScalar::FixedSizeBinaryScalar(std::string s, bool is_valid)
 BaseListScalar::BaseListScalar(std::shared_ptr<Array> value,
                                std::shared_ptr<DataType> type, bool is_valid)
     : Scalar{std::move(type), is_valid}, value(std::move(value)) {
-  ARROW_CHECK(this->type->field(0)->type()->Equals(this->value->type()));
+  if (this->value) {
+    ARROW_CHECK(this->type->field(0)->type()->Equals(this->value->type()));
+  }
 }
 
 ListScalar::ListScalar(std::shared_ptr<Array> value, bool is_valid)
-    : BaseListScalar(value, list(value->type()), is_valid) {}
+    : ListScalar(value, list(value->type()), is_valid) {}
+
+void ListScalar::FillScratchSpace(uint8_t* scratch_space,
+                                  const std::shared_ptr<Array>& value) {
+  FillScalarScratchSpace(
+      scratch_space,
+      {int32_t(0), value ? static_cast<int32_t>(value->length()) : int32_t(0)});
+}
 
 LargeListScalar::LargeListScalar(std::shared_ptr<Array> value, bool is_valid)
-    : BaseListScalar(value, large_list(value->type()), is_valid) {}
+    : LargeListScalar(value, large_list(value->type()), is_valid) {}
+
+void LargeListScalar::FillScratchSpace(uint8_t* scratch_space,
+                                       const std::shared_ptr<Array>& value) {
+  FillScalarScratchSpace(scratch_space,
+                         {int64_t(0), value ? value->length() : int64_t(0)});
+}
 
 ListViewScalar::ListViewScalar(std::shared_ptr<Array> value, bool is_valid)
-    : BaseListScalar(value, list_view(value->type()), is_valid) {}
+    : ListViewScalar(value, list_view(value->type()), is_valid) {}
+
+void ListViewScalar::FillScratchSpace(uint8_t* scratch_space,
+                                      const std::shared_ptr<Array>& value) {
+  FillScalarScratchSpace(
+      scratch_space,
+      {int32_t(0), value ? static_cast<int32_t>(value->length()) : int32_t(0)});
+}
 
 LargeListViewScalar::LargeListViewScalar(std::shared_ptr<Array> value, bool is_valid)
-    : BaseListScalar(value, large_list_view(value->type()), is_valid) {}
+    : LargeListViewScalar(value, large_list_view(value->type()), is_valid) {}
+
+void LargeListViewScalar::FillScratchSpace(uint8_t* scratch_space,
+                                           const std::shared_ptr<Array>& value) {
+  FillScalarScratchSpace(scratch_space,
+                         {int64_t(0), value ? value->length() : int64_t(0)});
+}
 
 inline std::shared_ptr<DataType> MakeMapType(const std::shared_ptr<DataType>& pair_type) {
   ARROW_CHECK_EQ(pair_type->id(), Type::STRUCT);
@@ -600,13 +659,22 @@ inline std::shared_ptr<DataType> MakeMapType(const std::shared_ptr<DataType>& pa
 }
 
 MapScalar::MapScalar(std::shared_ptr<Array> value, bool is_valid)
-    : BaseListScalar(value, MakeMapType(value->type()), is_valid) {}
+    : MapScalar(value, MakeMapType(value->type()), is_valid) {}
+
+void MapScalar::FillScratchSpace(uint8_t* scratch_space,
+                                 const std::shared_ptr<Array>& value) {
+  FillScalarScratchSpace(
+      scratch_space,
+      {int32_t(0), value ? static_cast<int32_t>(value->length()) : int32_t(0)});
+}
 
 FixedSizeListScalar::FixedSizeListScalar(std::shared_ptr<Array> value,
                                          std::shared_ptr<DataType> type, bool is_valid)
-    : BaseListScalar(value, std::move(type), is_valid) {
-  ARROW_CHECK_EQ(this->value->length(),
-                 checked_cast<const FixedSizeListType&>(*this->type).list_size());
+    : BaseListScalar(std::move(value), std::move(type), is_valid) {
+  if (this->value) {
+    ARROW_CHECK_EQ(this->value->length(),
+                   checked_cast<const FixedSizeListType&>(*this->type).list_size());
+  }
 }
 
 FixedSizeListScalar::FixedSizeListScalar(std::shared_ptr<Array> value, bool is_valid)
@@ -645,7 +713,9 @@ Result<std::shared_ptr<Scalar>> StructScalar::field(FieldRef ref) const {
 
 RunEndEncodedScalar::RunEndEncodedScalar(std::shared_ptr<Scalar> value,
                                          std::shared_ptr<DataType> type)
-    : Scalar{std::move(type), value->is_valid}, value{std::move(value)} {
+    : Scalar{std::move(type), value->is_valid},
+      ArraySpanFillFromScalarScratchSpace(*this->type),
+      value{std::move(value)} {
   ARROW_CHECK_EQ(this->type->id(), Type::RUN_END_ENCODED);
 }
 
@@ -656,6 +726,21 @@ RunEndEncodedScalar::RunEndEncodedScalar(const std::shared_ptr<DataType>& type)
 
 RunEndEncodedScalar::~RunEndEncodedScalar() = default;
 
+void RunEndEncodedScalar::FillScratchSpace(uint8_t* scratch_space, const DataType& type) {
+  Type::type run_end = checked_cast<const RunEndEncodedType&>(type).run_end_type()->id();
+  switch (run_end) {
+    case Type::INT16:
+      FillScalarScratchSpace(scratch_space, {int16_t(1)});
+      break;
+    case Type::INT32:
+      FillScalarScratchSpace(scratch_space, {int32_t(1)});
+      break;
+    default:
+      DCHECK_EQ(run_end, Type::INT64);
+      FillScalarScratchSpace(scratch_space, {int64_t(1)});
+  }
+}
+
 DictionaryScalar::DictionaryScalar(std::shared_ptr<DataType> type)
     : internal::PrimitiveScalarBase(std::move(type)),
       value{MakeNullScalar(checked_cast<const DictionaryType&>(*this->type).index_type()),
@@ -731,12 +816,16 @@ Result<TimestampScalar> TimestampScalar::FromISO8601(std::string_view iso8601,
 SparseUnionScalar::SparseUnionScalar(ValueType value, int8_t type_code,
                                      std::shared_ptr<DataType> type)
     : UnionScalar(std::move(type), type_code, /*is_valid=*/true),
+      ArraySpanFillFromScalarScratchSpace(type_code),
       value(std::move(value)) {
-  this->child_id =
-      checked_cast<const SparseUnionType&>(*this->type).child_ids()[type_code];
+  const auto child_ids = checked_cast<const SparseUnionType&>(*this->type).child_ids();
+  if (type_code >= 0 && static_cast<size_t>(type_code) < child_ids.size() &&
+      child_ids[type_code] != UnionType::kInvalidChildId) {
+    this->child_id = child_ids[type_code];
 
-  // Fix nullness based on whether the selected child is null
-  this->is_valid = this->value[this->child_id]->is_valid;
+    // Fix nullness based on whether the selected child is null
+    this->is_valid = this->value[this->child_id]->is_valid;
+  }
 }
 
 std::shared_ptr<Scalar> SparseUnionScalar::FromValue(std::shared_ptr<Scalar> value,
@@ -755,6 +844,17 @@ std::shared_ptr<Scalar> SparseUnionScalar::FromValue(std::shared_ptr<Scalar> val
   return std::make_shared<SparseUnionScalar>(field_values, type_code, std::move(type));
 }
 
+void SparseUnionScalar::FillScratchSpace(uint8_t* scratch_space, int8_t type_code) {
+  auto* union_scratch_space = reinterpret_cast<UnionScratchSpace*>(scratch_space);
+  union_scratch_space->type_code = type_code;
+}
+
+void DenseUnionScalar::FillScratchSpace(uint8_t* scratch_space, int8_t type_code) {
+  auto* union_scratch_space = reinterpret_cast<UnionScratchSpace*>(scratch_space);
+  union_scratch_space->type_code = type_code;
+  FillScalarScratchSpace(union_scratch_space->offsets, {int32_t(0), int32_t(1)});
+}
+
 namespace {
 
 template <typename T>
@@ -969,58 +1069,72 @@ std::shared_ptr<Buffer> FormatToBuffer(Formatter&& formatter, const ScalarType&
 }
 
 // error fallback
-Status CastImpl(const Scalar& from, Scalar* to) {
+template <typename To>
+Result<std::shared_ptr<Scalar>> CastImpl(const Scalar& from,
+                                         std::shared_ptr<DataType> to_type) {
   return Status::NotImplemented("casting scalars of type ", *from.type, " to type ",
-                                *to->type);
+                                *to_type);
 }
 
 // numeric to numeric
-template <typename From, typename To>
-Status CastImpl(const NumericScalar<From>& from, NumericScalar<To>* to) {
-  to->value = static_cast<typename To::c_type>(from.value);
-  return Status::OK();
+template <typename To, typename From>
+enable_if_number<To, Result<std::shared_ptr<Scalar>>> CastImpl(
+    const NumericScalar<From>& from, std::shared_ptr<DataType> to_type) {
+  using ToScalar = typename TypeTraits<To>::ScalarType;
+  return std::make_shared<ToScalar>(static_cast<typename To::c_type>(from.value),
+                                    std::move(to_type));
 }
 
 // numeric to boolean
-template <typename T>
-Status CastImpl(const NumericScalar<T>& from, BooleanScalar* to) {
-  constexpr auto zero = static_cast<typename T::c_type>(0);
-  to->value = from.value != zero;
-  return Status::OK();
+template <typename To, typename From>
+enable_if_boolean<To, Result<std::shared_ptr<Scalar>>> CastImpl(
+    const NumericScalar<From>& from, std::shared_ptr<DataType> to_type) {
+  constexpr auto zero = static_cast<typename From::c_type>(0);
+  return std::make_shared<BooleanScalar>(from.value != zero, std::move(to_type));
 }
 
 // boolean to numeric
-template <typename T>
-Status CastImpl(const BooleanScalar& from, NumericScalar<T>* to) {
-  to->value = static_cast<typename T::c_type>(from.value);
-  return Status::OK();
+template <typename To>
+enable_if_number<To, Result<std::shared_ptr<Scalar>>> CastImpl(
+    const BooleanScalar& from, std::shared_ptr<DataType> to_type) {
+  using ToScalar = typename TypeTraits<To>::ScalarType;
+  return std::make_shared<ToScalar>(static_cast<typename To::c_type>(from.value),
+                                    std::move(to_type));
 }
 
 // numeric to temporal
-template <typename From, typename To>
+template <typename To, typename From>
 typename std::enable_if<std::is_base_of<TemporalType, To>::value &&
                             !std::is_same<DayTimeIntervalType, To>::value &&
                             !std::is_same<MonthDayNanoIntervalType, To>::value,
-                        Status>::type
-CastImpl(const NumericScalar<From>& from, TemporalScalar<To>* to) {
-  to->value = static_cast<typename To::c_type>(from.value);
-  return Status::OK();
+                        Result<std::shared_ptr<Scalar>>>::type
+CastImpl(const NumericScalar<From>& from, std::shared_ptr<DataType> to_type) {
+  using ToScalar = typename TypeTraits<To>::ScalarType;
+  return std::make_shared<ToScalar>(static_cast<typename To::c_type>(from.value),
+                                    std::move(to_type));
 }
 
 // temporal to numeric
-template <typename From, typename To>
-typename std::enable_if<std::is_base_of<TemporalType, From>::value &&
+template <typename To, typename From>
+typename std::enable_if<is_number_type<To>::value &&
+                            std::is_base_of<TemporalType, From>::value &&
                             !std::is_same<DayTimeIntervalType, From>::value &&
                             !std::is_same<MonthDayNanoIntervalType, From>::value,
-                        Status>::type
-CastImpl(const TemporalScalar<From>& from, NumericScalar<To>* to) {
-  to->value = static_cast<typename To::c_type>(from.value);
-  return Status::OK();
+                        Result<std::shared_ptr<Scalar>>>::type
+CastImpl(const TemporalScalar<From>& from, std::shared_ptr<DataType> to_type) {
+  using ToScalar = typename TypeTraits<To>::ScalarType;
+  return std::make_shared<ToScalar>(static_cast<typename To::c_type>(from.value),
+                                    std::move(to_type));
 }
 
 // timestamp to timestamp
-Status CastImpl(const TimestampScalar& from, TimestampScalar* to) {
-  return util::ConvertTimestampValue(from.type, to->type, from.value).Value(&to->value);
+template <typename To>
+enable_if_timestamp<To, Result<std::shared_ptr<Scalar>>> CastImpl(
+    const TimestampScalar& from, std::shared_ptr<DataType> to_type) {
+  using ToScalar = typename TypeTraits<To>::ScalarType;
+  ARROW_ASSIGN_OR_RAISE(auto value,
+                        util::ConvertTimestampValue(from.type, to_type, from.value));
+  return std::make_shared<ToScalar>(value, std::move(to_type));
 }
 
 template <typename TypeWithTimeUnit>
@@ -1029,101 +1143,117 @@ std::shared_ptr<DataType> AsTimestampType(const std::shared_ptr<DataType>& type)
 }
 
 // duration to duration
-Status CastImpl(const DurationScalar& from, DurationScalar* to) {
-  return util::ConvertTimestampValue(AsTimestampType<DurationType>(from.type),
-                                     AsTimestampType<DurationType>(to->type), from.value)
-      .Value(&to->value);
+template <typename To>
+enable_if_duration<To, Result<std::shared_ptr<Scalar>>> CastImpl(
+    const DurationScalar& from, std::shared_ptr<DataType> to_type) {
+  using ToScalar = typename TypeTraits<To>::ScalarType;
+  ARROW_ASSIGN_OR_RAISE(
+      auto value,
+      util::ConvertTimestampValue(AsTimestampType<DurationType>(from.type),
+                                  AsTimestampType<DurationType>(to_type), from.value));
+  return std::make_shared<ToScalar>(value, std::move(to_type));
 }
 
 // time to time
-template <typename F, typename ToScalar, typename T = typename ToScalar::TypeClass>
-enable_if_time<T, Status> CastImpl(const TimeScalar<F>& from, ToScalar* to) {
-  return util::ConvertTimestampValue(AsTimestampType<F>(from.type),
-                                     AsTimestampType<T>(to->type), from.value)
-      .Value(&to->value);
+template <typename To, typename From, typename T = typename To::TypeClass>
+enable_if_time<To, Result<std::shared_ptr<Scalar>>> CastImpl(
+    const TimeScalar<From>& from, std::shared_ptr<DataType> to_type) {
+  using ToScalar = typename TypeTraits<To>::ScalarType;
+  ARROW_ASSIGN_OR_RAISE(
+      auto value, util::ConvertTimestampValue(AsTimestampType<From>(from.type),
+                                              AsTimestampType<To>(to_type), from.value));
+  return std::make_shared<ToScalar>(value, std::move(to_type));
 }
 
 constexpr int64_t kMillisecondsInDay = 86400000;
 
 // date to date
-Status CastImpl(const Date32Scalar& from, Date64Scalar* to) {
-  to->value = from.value * kMillisecondsInDay;
-  return Status::OK();
+template <typename To>
+enable_if_t<std::is_same<To, Date64Scalar>::value, Result<std::shared_ptr<Scalar>>>
+CastImpl(const Date32Scalar& from, std::shared_ptr<DataType> to_type) {
+  return std::make_shared<Date64Scalar>(from.value * kMillisecondsInDay,
+                                        std::move(to_type));
 }
-Status CastImpl(const Date64Scalar& from, Date32Scalar* to) {
-  to->value = static_cast<int32_t>(from.value / kMillisecondsInDay);
-  return Status::OK();
+template <typename To>
+enable_if_t<std::is_same<To, Date32Scalar>::value, Result<std::shared_ptr<Scalar>>>
+CastImpl(const Date64Scalar& from, std::shared_ptr<DataType> to_type) {
+  return std::make_shared<Date32Scalar>(
+      static_cast<int32_t>(from.value / kMillisecondsInDay), std::move(to_type));
 }
 
 // timestamp to date
-Status CastImpl(const TimestampScalar& from, Date64Scalar* to) {
+template <typename To>
+enable_if_t<std::is_same<To, Date64Scalar>::value, Result<std::shared_ptr<Scalar>>>
+CastImpl(const TimestampScalar& from, std::shared_ptr<DataType> to_type) {
   ARROW_ASSIGN_OR_RAISE(
       auto millis,
       util::ConvertTimestampValue(from.type, timestamp(TimeUnit::MILLI), from.value));
-  to->value = millis - millis % kMillisecondsInDay;
-  return Status::OK();
+  return std::make_shared<Date64Scalar>(millis - millis % kMillisecondsInDay,
+                                        std::move(to_type));
 }
-Status CastImpl(const TimestampScalar& from, Date32Scalar* to) {
+template <typename To>
+enable_if_t<std::is_same<To, Date32Scalar>::value, Result<std::shared_ptr<Scalar>>>
+CastImpl(const TimestampScalar& from, std::shared_ptr<DataType> to_type) {
   ARROW_ASSIGN_OR_RAISE(
       auto millis,
       util::ConvertTimestampValue(from.type, timestamp(TimeUnit::MILLI), from.value));
-  to->value = static_cast<int32_t>(millis / kMillisecondsInDay);
-  return Status::OK();
+  return std::make_shared<Date32Scalar>(static_cast<int32_t>(millis / kMillisecondsInDay),
+                                        std::move(to_type));
 }
 
 // date to timestamp
-template <typename D>
-Status CastImpl(const DateScalar<D>& from, TimestampScalar* to) {
+template <typename To, typename From>
+enable_if_timestamp<Result<std::shared_ptr<To>>> CastImpl(
+    const DateScalar<From>& from, std::shared_ptr<DataType> to_type) {
+  using ToScalar = typename TypeTraits<To>::ScalarType;
   int64_t millis = from.value;
-  if (std::is_same<D, Date32Type>::value) {
+  if (std::is_same<From, Date32Type>::value) {
     millis *= kMillisecondsInDay;
   }
-  return util::ConvertTimestampValue(timestamp(TimeUnit::MILLI), to->type, millis)
-      .Value(&to->value);
+  ARROW_ASSIGN_OR_RAISE(auto value, util::ConvertTimestampValue(
+                                        timestamp(TimeUnit::MILLI), to_type, millis));
+  return std::make_shared<ToScalar>(value, std::move(to_type));
 }
 
 // string to any
-template <typename ScalarType>
-Status CastImpl(const StringScalar& from, ScalarType* to) {
-  ARROW_ASSIGN_OR_RAISE(auto out, Scalar::Parse(to->type, std::string_view(*from.value)));
-  to->value = std::move(checked_cast<ScalarType&>(*out).value);
-  return Status::OK();
+template <typename To>
+Result<std::shared_ptr<Scalar>> CastImpl(const StringScalar& from,
+                                         std::shared_ptr<DataType> to_type) {
+  using ToScalar = typename TypeTraits<To>::ScalarType;
+  ARROW_ASSIGN_OR_RAISE(auto out,
+                        Scalar::Parse(std::move(to_type), std::string_view(*from.value)));
+  DCHECK(checked_pointer_cast<ToScalar>(out) != nullptr);
+  return out;
 }
 
 // binary/large binary/large string to string
-template <typename ScalarType>
-enable_if_t<std::is_base_of_v<BaseBinaryScalar, ScalarType> &&
-                !std::is_same<ScalarType, StringScalar>::value,
-            Status>
-CastImpl(const ScalarType& from, StringScalar* to) {
-  to->value = from.value;
-  return Status::OK();
+template <typename To, typename From>
+enable_if_t<std::is_same<To, StringType>::value &&
+                std::is_base_of_v<BaseBinaryScalar, From> &&
+                !std::is_same<From, StringScalar>::value,
+            Result<std::shared_ptr<Scalar>>>
+CastImpl(const From& from, std::shared_ptr<DataType> to_type) {
+  return std::make_shared<StringScalar>(from.value, std::move(to_type));
 }
 
 // formattable to string
-template <typename ScalarType, typename T = typename ScalarType::TypeClass,
+template <typename To, typename From, typename T = typename From::TypeClass,
           typename Formatter = internal::StringFormatter<T>,
           // note: Value unused but necessary to trigger SFINAE if Formatter is
           // undefined
           typename Value = typename Formatter::value_type>
-Status CastImpl(const ScalarType& from, StringScalar* to) {
-  to->value = FormatToBuffer(Formatter{from.type.get()}, from);
-  return Status::OK();
-}
-
-Status CastImpl(const Decimal128Scalar& from, StringScalar* to) {
-  auto from_type = checked_cast<const Decimal128Type*>(from.type.get());
-  to->value = Buffer::FromString(from.value.ToString(from_type->scale()));
-  return Status::OK();
+typename std::enable_if_t<std::is_same<To, StringType>::value,
+                          Result<std::shared_ptr<Scalar>>>
+CastImpl(const From& from, std::shared_ptr<DataType> to_type) {
+  return std::make_shared<StringScalar>(FormatToBuffer(Formatter{from.type.get()}, from),
+                                        std::move(to_type));
 }
 
-Status CastImpl(const Decimal256Scalar& from, StringScalar* to) {
-  auto from_type = checked_cast<const Decimal256Type*>(from.type.get());
-  to->value = Buffer::FromString(from.value.ToString(from_type->scale()));
-  return Status::OK();
-}
-
-Status CastImpl(const StructScalar& from, StringScalar* to) {
+// struct to string
+template <typename To>
+typename std::enable_if_t<std::is_same<To, StringType>::value,
+                          Result<std::shared_ptr<Scalar>>>
+CastImpl(const StructScalar& from, std::shared_ptr<DataType> to_type) {
   std::stringstream ss;
   ss << '{';
   for (int i = 0; static_cast<size_t>(i) < from.value.size(); i++) {
@@ -1132,24 +1262,23 @@ Status CastImpl(const StructScalar& from, StringScalar* to) {
        << " = " << from.value[i]->ToString();
   }
   ss << '}';
-  to->value = Buffer::FromString(ss.str());
-  return Status::OK();
+  return std::make_shared<StringScalar>(Buffer::FromString(ss.str()), std::move(to_type));
 }
 
 // casts between variable-length and fixed-length list types
-template <typename ToScalar>
-enable_if_list_type<typename ToScalar::TypeClass, Status> CastImpl(
-    const BaseListScalar& from, ToScalar* to) {
-  if constexpr (sizeof(typename ToScalar::TypeClass::offset_type) < sizeof(int64_t)) {
-    if (from.value->length() >
-        std::numeric_limits<typename ToScalar::TypeClass::offset_type>::max()) {
+template <typename To, typename From>
+std::enable_if_t<is_list_type<To>::value && is_list_type<From>::value,
+                 Result<std::shared_ptr<Scalar>>>
+CastImpl(const From& from, std::shared_ptr<DataType> to_type) {
+  if constexpr (sizeof(typename To::offset_type) < sizeof(int64_t)) {
+    if (from.value->length() > std::numeric_limits<typename To::offset_type>::max()) {
       return Status::Invalid(from.type->ToString(), " too large to cast to ",
-                             to->type->ToString());
+                             to_type->ToString());
     }
   }
 
-  if constexpr (is_fixed_size_list_type<typename ToScalar::TypeClass>::value) {
-    const auto& fixed_size_list_type = checked_cast<const FixedSizeListType&>(*to->type);
+  if constexpr (is_fixed_size_list_type<To>::value) {
+    const auto& fixed_size_list_type = checked_cast<const FixedSizeListType&>(*to_type);
     if (from.value->length() != fixed_size_list_type.list_size()) {
       return Status::Invalid("Cannot cast ", from.type->ToString(), " of length ",
                              from.value->length(), " to fixed size list of length ",
@@ -1157,13 +1286,15 @@ enable_if_list_type<typename ToScalar::TypeClass, Status> CastImpl(
     }
   }
 
-  DCHECK_EQ(from.is_valid, to->is_valid);
-  to->value = from.value;
-  return Status::OK();
+  using ToScalar = typename TypeTraits<To>::ScalarType;
+  return std::make_shared<ToScalar>(from.value, std::move(to_type), from.is_valid);
 }
 
 // list based types (list, large list and map (fixed sized list too)) to string
-Status CastImpl(const BaseListScalar& from, StringScalar* to) {
+template <typename To>
+typename std::enable_if_t<std::is_same<To, StringType>::value,
+                          Result<std::shared_ptr<Scalar>>>
+CastImpl(const BaseListScalar& from, std::shared_ptr<DataType> to_type) {
   std::stringstream ss;
   ss << from.type->ToString() << "[";
   for (int64_t i = 0; i < from.value->length(); i++) {
@@ -1172,11 +1303,14 @@ Status CastImpl(const BaseListScalar& from, StringScalar* to) {
     ss << value->ToString();
   }
   ss << ']';
-  to->value = Buffer::FromString(ss.str());
-  return Status::OK();
+  return std::make_shared<StringScalar>(Buffer::FromString(ss.str()), std::move(to_type));
 }
 
-Status CastImpl(const UnionScalar& from, StringScalar* to) {
+// union types to string
+template <typename To>
+typename std::enable_if_t<std::is_same<To, StringType>::value,
+                          Result<std::shared_ptr<Scalar>>>
+CastImpl(const UnionScalar& from, std::shared_ptr<DataType> to_type) {
   const auto& union_ty = checked_cast<const UnionType&>(*from.type);
   std::stringstream ss;
   const Scalar* selected_value;
@@ -1188,8 +1322,7 @@ Status CastImpl(const UnionScalar& from, StringScalar* to) {
   }
   ss << "union{" << union_ty.field(union_ty.child_ids()[from.type_code])->ToString()
      << " = " << selected_value->ToString() << '}';
-  to->value = Buffer::FromString(ss.str());
-  return Status::OK();
+  return std::make_shared<StringScalar>(Buffer::FromString(ss.str()), std::move(to_type));
 }
 
 struct CastImplVisitor {
@@ -1199,59 +1332,49 @@ struct CastImplVisitor {
 
   const Scalar& from_;
   const std::shared_ptr<DataType>& to_type_;
-  Scalar* out_;
+  std::shared_ptr<Scalar> out_ = nullptr;
 };
 
 template <typename ToType>
 struct FromTypeVisitor : CastImplVisitor {
   using ToScalar = typename TypeTraits<ToType>::ScalarType;
 
-  FromTypeVisitor(const Scalar& from, const std::shared_ptr<DataType>& to_type,
-                  Scalar* out)
-      : CastImplVisitor{from, to_type, out} {}
+  FromTypeVisitor(const Scalar& from, const std::shared_ptr<DataType>& to_type)
+      : CastImplVisitor{from, to_type} {}
 
   template <typename FromType>
   Status Visit(const FromType&) {
-    return CastImpl(checked_cast<const typename TypeTraits<FromType>::ScalarType&>(from_),
-                    checked_cast<ToScalar*>(out_));
+    ARROW_ASSIGN_OR_RAISE(
+        out_, CastImpl<ToType>(
+                  checked_cast<const typename TypeTraits<FromType>::ScalarType&>(from_),
+                  to_type_));
+    return Status::OK();
   }
 
   // identity cast only for parameter free types
   template <typename T1 = ToType>
   typename std::enable_if_t<TypeTraits<T1>::is_parameter_free, Status> Visit(
       const ToType&) {
-    checked_cast<ToScalar*>(out_)->value = checked_cast<const ToScalar&>(from_).value;
+    ARROW_ASSIGN_OR_RAISE(
+        out_, MakeScalar(to_type_, checked_cast<const ToScalar&>(from_).value));
     return Status::OK();
   }
 
-  Status CastFromListLike(const BaseListType& base_list_type) {
-    return CastImpl(checked_cast<const BaseListScalar&>(from_),
-                    checked_cast<ToScalar*>(out_));
-  }
-
-  Status Visit(const ListType& list_type) { return CastFromListLike(list_type); }
-
-  Status Visit(const LargeListType& large_list_type) {
-    return CastFromListLike(large_list_type);
-  }
-
-  Status Visit(const FixedSizeListType& fixed_size_list_type) {
-    return CastFromListLike(fixed_size_list_type);
-  }
-
   Status Visit(const NullType&) { return NotImplemented(); }
   Status Visit(const DictionaryType&) { return NotImplemented(); }
   Status Visit(const ExtensionType&) { return NotImplemented(); }
 };
 
 struct ToTypeVisitor : CastImplVisitor {
-  ToTypeVisitor(const Scalar& from, const std::shared_ptr<DataType>& to_type, Scalar* out)
-      : CastImplVisitor{from, to_type, out} {}
+  ToTypeVisitor(const Scalar& from, const std::shared_ptr<DataType>& to_type)
+      : CastImplVisitor{from, to_type} {}
 
   template <typename ToType>
   Status Visit(const ToType&) {
-    FromTypeVisitor<ToType> unpack_from_type{from_, to_type_, out_};
-    return VisitTypeInline(*from_.type, &unpack_from_type);
+    FromTypeVisitor<ToType> unpack_from_type{from_, to_type_};
+    ARROW_RETURN_NOT_OK(VisitTypeInline(*from_.type, &unpack_from_type));
+    out_ = std::move(unpack_from_type.out_);
+    return Status::OK();
   }
 
   Status Visit(const NullType&) {
@@ -1262,25 +1385,28 @@ struct ToTypeVisitor : CastImplVisitor {
   }
 
   Status Visit(const DictionaryType& dict_type) {
-    auto& out = checked_cast<DictionaryScalar*>(out_)->value;
     ARROW_ASSIGN_OR_RAISE(auto cast_value, from_.CastTo(dict_type.value_type()));
-    ARROW_ASSIGN_OR_RAISE(out.dictionary, MakeArrayFromScalar(*cast_value, 1));
-    return Int32Scalar(0).CastTo(dict_type.index_type()).Value(&out.index);
+    ARROW_ASSIGN_OR_RAISE(auto dictionary, MakeArrayFromScalar(*cast_value, 1));
+    ARROW_ASSIGN_OR_RAISE(auto index, Int32Scalar(0).CastTo(dict_type.index_type()));
+    out_ = DictionaryScalar::Make(std::move(index), std::move(dictionary));
+    return Status::OK();
   }
 
   Status Visit(const ExtensionType&) { return NotImplemented(); }
+
+  Result<std::shared_ptr<Scalar>> Finish() && {
+    ARROW_RETURN_NOT_OK(VisitTypeInline(*to_type_, this));
+    return std::move(out_);
+  }
 };
 
 }  // namespace
 
 Result<std::shared_ptr<Scalar>> Scalar::CastTo(std::shared_ptr<DataType> to) const {
-  std::shared_ptr<Scalar> out = MakeNullScalar(to);
   if (is_valid) {
-    out->is_valid = true;
-    ToTypeVisitor unpack_to_type{*this, to, out.get()};
-    RETURN_NOT_OK(VisitTypeInline(*to, &unpack_to_type));
+    return ToTypeVisitor{*this, std::move(to)}.Finish();
   }
-  return out;
+  return MakeNullScalar(std::move(to));
 }
 
 void PrintTo(const Scalar& scalar, std::ostream* os) { *os << scalar.ToString(); }
diff --git a/cpp/src/arrow/scalar.h b/cpp/src/arrow/scalar.h
index 65c5ee4df0a04..982a4c5113c92 100644
--- a/cpp/src/arrow/scalar.h
+++ b/cpp/src/arrow/scalar.h
@@ -131,11 +131,24 @@ struct ARROW_EXPORT NullScalar : public Scalar {
 
 namespace internal {
 
+constexpr auto kScalarScratchSpaceSize = sizeof(int64_t) * 2;
+
+template <typename Impl>
 struct ARROW_EXPORT ArraySpanFillFromScalarScratchSpace {
   //  16 bytes of scratch space to enable ArraySpan to be a view onto any
   //  Scalar- including binary scalars where we need to create a buffer
   //  that looks like two 32-bit or 64-bit offsets.
-  alignas(int64_t) mutable uint8_t scratch_space_[sizeof(int64_t) * 2];
+  alignas(int64_t) mutable uint8_t scratch_space_[kScalarScratchSpaceSize];
+
+ private:
+  template <typename... Args>
+  explicit ArraySpanFillFromScalarScratchSpace(Args&&... args) {
+    Impl::FillScratchSpace(scratch_space_, std::forward<Args>(args)...);
+  }
+
+  ArraySpanFillFromScalarScratchSpace() = delete;
+
+  friend Impl;
 };
 
 struct ARROW_EXPORT PrimitiveScalarBase : public Scalar {
@@ -145,8 +158,6 @@ struct ARROW_EXPORT PrimitiveScalarBase : public Scalar {
   using Scalar::Scalar;
   /// \brief Get a const pointer to the value of this scalar. May be null.
   virtual const void* data() const = 0;
-  /// \brief Get a mutable pointer to the value of this scalar. May be null.
-  virtual void* mutable_data() = 0;
   /// \brief Get an immutable view of the value of this scalar as bytes.
   virtual std::string_view view() const = 0;
 };
@@ -167,7 +178,6 @@ struct ARROW_EXPORT PrimitiveScalar : public PrimitiveScalarBase {
   ValueType value{};
 
   const void* data() const override { return &value; }
-  void* mutable_data() override { return &value; }
   std::string_view view() const override {
     return std::string_view(reinterpret_cast<const char*>(&value), sizeof(ValueType));
   };
@@ -245,41 +255,63 @@ struct ARROW_EXPORT DoubleScalar : public NumericScalar<DoubleType> {
   using NumericScalar<DoubleType>::NumericScalar;
 };
 
-struct ARROW_EXPORT BaseBinaryScalar
-    : public internal::PrimitiveScalarBase,
-      private internal::ArraySpanFillFromScalarScratchSpace {
-  using internal::PrimitiveScalarBase::PrimitiveScalarBase;
+struct ARROW_EXPORT BaseBinaryScalar : public internal::PrimitiveScalarBase {
   using ValueType = std::shared_ptr<Buffer>;
 
-  std::shared_ptr<Buffer> value;
+  // The value is not supposed to be modified after construction, because subclasses have
+  // a scratch space whose content need to be kept consistent with the value. It is also
+  // the user of this class's responsibility to ensure that the buffer is not written to
+  // accidentally.
+  const std::shared_ptr<Buffer> value = NULLPTR;
 
   const void* data() const override {
     return value ? reinterpret_cast<const void*>(value->data()) : NULLPTR;
   }
-  void* mutable_data() override {
-    return value ? reinterpret_cast<void*>(value->mutable_data()) : NULLPTR;
-  }
   std::string_view view() const override {
     return value ? std::string_view(*value) : std::string_view();
   }
 
+  explicit BaseBinaryScalar(std::shared_ptr<DataType> type)
+      : internal::PrimitiveScalarBase(std::move(type)) {}
+
   BaseBinaryScalar(std::shared_ptr<Buffer> value, std::shared_ptr<DataType> type)
       : internal::PrimitiveScalarBase{std::move(type), true}, value(std::move(value)) {}
 
-  friend ArraySpan;
   BaseBinaryScalar(std::string s, std::shared_ptr<DataType> type);
 };
 
-struct ARROW_EXPORT BinaryScalar : public BaseBinaryScalar {
-  using BaseBinaryScalar::BaseBinaryScalar;
+struct ARROW_EXPORT BinaryScalar
+    : public BaseBinaryScalar,
+      private internal::ArraySpanFillFromScalarScratchSpace<BinaryScalar> {
   using TypeClass = BinaryType;
+  using ArraySpanFillFromScalarScratchSpace =
+      internal::ArraySpanFillFromScalarScratchSpace<BinaryScalar>;
+
+  explicit BinaryScalar(std::shared_ptr<DataType> type)
+      : BaseBinaryScalar(std::move(type)),
+        ArraySpanFillFromScalarScratchSpace(this->value) {}
+
+  BinaryScalar(std::shared_ptr<Buffer> value, std::shared_ptr<DataType> type)
+      : BaseBinaryScalar(std::move(value), std::move(type)),
+        ArraySpanFillFromScalarScratchSpace(this->value) {}
+
+  BinaryScalar(std::string s, std::shared_ptr<DataType> type)
+      : BaseBinaryScalar(std::move(s), std::move(type)),
+        ArraySpanFillFromScalarScratchSpace(this->value) {}
 
   explicit BinaryScalar(std::shared_ptr<Buffer> value)
       : BinaryScalar(std::move(value), binary()) {}
 
-  explicit BinaryScalar(std::string s) : BaseBinaryScalar(std::move(s), binary()) {}
+  explicit BinaryScalar(std::string s) : BinaryScalar(std::move(s), binary()) {}
 
   BinaryScalar() : BinaryScalar(binary()) {}
+
+ private:
+  static void FillScratchSpace(uint8_t* scratch_space,
+                               const std::shared_ptr<Buffer>& value);
+
+  friend ArraySpan;
+  friend ArraySpanFillFromScalarScratchSpace;
 };
 
 struct ARROW_EXPORT StringScalar : public BinaryScalar {
@@ -294,19 +326,41 @@ struct ARROW_EXPORT StringScalar : public BinaryScalar {
   StringScalar() : StringScalar(utf8()) {}
 };
 
-struct ARROW_EXPORT BinaryViewScalar : public BaseBinaryScalar {
-  using BaseBinaryScalar::BaseBinaryScalar;
+struct ARROW_EXPORT BinaryViewScalar
+    : public BaseBinaryScalar,
+      private internal::ArraySpanFillFromScalarScratchSpace<BinaryViewScalar> {
   using TypeClass = BinaryViewType;
+  using ArraySpanFillFromScalarScratchSpace =
+      internal::ArraySpanFillFromScalarScratchSpace<BinaryViewScalar>;
+
+  explicit BinaryViewScalar(std::shared_ptr<DataType> type)
+      : BaseBinaryScalar(std::move(type)),
+        ArraySpanFillFromScalarScratchSpace(this->value) {}
+
+  BinaryViewScalar(std::shared_ptr<Buffer> value, std::shared_ptr<DataType> type)
+      : BaseBinaryScalar(std::move(value), std::move(type)),
+        ArraySpanFillFromScalarScratchSpace(this->value) {}
+
+  BinaryViewScalar(std::string s, std::shared_ptr<DataType> type)
+      : BaseBinaryScalar(std::move(s), std::move(type)),
+        ArraySpanFillFromScalarScratchSpace(this->value) {}
 
   explicit BinaryViewScalar(std::shared_ptr<Buffer> value)
       : BinaryViewScalar(std::move(value), binary_view()) {}
 
   explicit BinaryViewScalar(std::string s)
-      : BaseBinaryScalar(std::move(s), binary_view()) {}
+      : BinaryViewScalar(std::move(s), binary_view()) {}
 
   BinaryViewScalar() : BinaryViewScalar(binary_view()) {}
 
   std::string_view view() const override { return std::string_view(*this->value); }
+
+ private:
+  static void FillScratchSpace(uint8_t* scratch_space,
+                               const std::shared_ptr<Buffer>& value);
+
+  friend ArraySpan;
+  friend ArraySpanFillFromScalarScratchSpace;
 };
 
 struct ARROW_EXPORT StringViewScalar : public BinaryViewScalar {
@@ -322,20 +376,39 @@ struct ARROW_EXPORT StringViewScalar : public BinaryViewScalar {
   StringViewScalar() : StringViewScalar(utf8_view()) {}
 };
 
-struct ARROW_EXPORT LargeBinaryScalar : public BaseBinaryScalar {
-  using BaseBinaryScalar::BaseBinaryScalar;
+struct ARROW_EXPORT LargeBinaryScalar
+    : public BaseBinaryScalar,
+      private internal::ArraySpanFillFromScalarScratchSpace<LargeBinaryScalar> {
   using TypeClass = LargeBinaryType;
+  using ArraySpanFillFromScalarScratchSpace =
+      internal::ArraySpanFillFromScalarScratchSpace<LargeBinaryScalar>;
+
+  explicit LargeBinaryScalar(std::shared_ptr<DataType> type)
+      : BaseBinaryScalar(std::move(type)),
+        ArraySpanFillFromScalarScratchSpace(this->value) {}
 
   LargeBinaryScalar(std::shared_ptr<Buffer> value, std::shared_ptr<DataType> type)
-      : BaseBinaryScalar(std::move(value), std::move(type)) {}
+      : BaseBinaryScalar(std::move(value), std::move(type)),
+        ArraySpanFillFromScalarScratchSpace(this->value) {}
+
+  LargeBinaryScalar(std::string s, std::shared_ptr<DataType> type)
+      : BaseBinaryScalar(std::move(s), std::move(type)),
+        ArraySpanFillFromScalarScratchSpace(this->value) {}
 
   explicit LargeBinaryScalar(std::shared_ptr<Buffer> value)
       : LargeBinaryScalar(std::move(value), large_binary()) {}
 
   explicit LargeBinaryScalar(std::string s)
-      : BaseBinaryScalar(std::move(s), large_binary()) {}
+      : LargeBinaryScalar(std::move(s), large_binary()) {}
 
   LargeBinaryScalar() : LargeBinaryScalar(large_binary()) {}
+
+ private:
+  static void FillScratchSpace(uint8_t* scratch_space,
+                               const std::shared_ptr<Buffer>& value);
+
+  friend ArraySpan;
+  friend ArraySpanFillFromScalarScratchSpace;
 };
 
 struct ARROW_EXPORT LargeStringScalar : public LargeBinaryScalar {
@@ -482,10 +555,6 @@ struct ARROW_EXPORT DecimalScalar : public internal::PrimitiveScalarBase {
     return reinterpret_cast<const void*>(value.native_endian_bytes());
   }
 
-  void* mutable_data() override {
-    return reinterpret_cast<void*>(value.mutable_native_endian_bytes());
-  }
-
   std::string_view view() const override {
     return std::string_view(reinterpret_cast<const char*>(value.native_endian_bytes()),
                             ValueType::kByteWidth);
@@ -502,54 +571,127 @@ struct ARROW_EXPORT Decimal256Scalar : public DecimalScalar<Decimal256Type, Deci
   using DecimalScalar::DecimalScalar;
 };
 
-struct ARROW_EXPORT BaseListScalar
-    : public Scalar,
-      private internal::ArraySpanFillFromScalarScratchSpace {
-  using Scalar::Scalar;
+struct ARROW_EXPORT BaseListScalar : public Scalar {
   using ValueType = std::shared_ptr<Array>;
 
   BaseListScalar(std::shared_ptr<Array> value, std::shared_ptr<DataType> type,
                  bool is_valid = true);
 
-  std::shared_ptr<Array> value;
-
- private:
-  friend struct ArraySpan;
+  // The value is not supposed to be modified after construction, because subclasses have
+  // a scratch space whose content need to be kept consistent with the value. It is also
+  // the user of this class's responsibility to ensure that the array is not modified
+  // accidentally.
+  const std::shared_ptr<Array> value;
 };
 
-struct ARROW_EXPORT ListScalar : public BaseListScalar {
+struct ARROW_EXPORT ListScalar
+    : public BaseListScalar,
+      private internal::ArraySpanFillFromScalarScratchSpace<ListScalar> {
   using TypeClass = ListType;
-  using BaseListScalar::BaseListScalar;
+  using ArraySpanFillFromScalarScratchSpace =
+      internal::ArraySpanFillFromScalarScratchSpace<ListScalar>;
+
+  ListScalar(std::shared_ptr<Array> value, std::shared_ptr<DataType> type,
+             bool is_valid = true)
+      : BaseListScalar(std::move(value), std::move(type), is_valid),
+        ArraySpanFillFromScalarScratchSpace(this->value) {}
 
   explicit ListScalar(std::shared_ptr<Array> value, bool is_valid = true);
+
+ private:
+  static void FillScratchSpace(uint8_t* scratch_space,
+                               const std::shared_ptr<Array>& value);
+
+  friend ArraySpan;
+  friend ArraySpanFillFromScalarScratchSpace;
 };
 
-struct ARROW_EXPORT LargeListScalar : public BaseListScalar {
+struct ARROW_EXPORT LargeListScalar
+    : public BaseListScalar,
+      private internal::ArraySpanFillFromScalarScratchSpace<LargeListScalar> {
   using TypeClass = LargeListType;
-  using BaseListScalar::BaseListScalar;
+  using ArraySpanFillFromScalarScratchSpace =
+      internal::ArraySpanFillFromScalarScratchSpace<LargeListScalar>;
+
+  LargeListScalar(std::shared_ptr<Array> value, std::shared_ptr<DataType> type,
+                  bool is_valid = true)
+      : BaseListScalar(std::move(value), std::move(type), is_valid),
+        ArraySpanFillFromScalarScratchSpace(this->value) {}
 
   explicit LargeListScalar(std::shared_ptr<Array> value, bool is_valid = true);
+
+ private:
+  static void FillScratchSpace(uint8_t* scratch_space,
+                               const std::shared_ptr<Array>& value);
+
+  friend ArraySpan;
+  friend ArraySpanFillFromScalarScratchSpace;
 };
 
-struct ARROW_EXPORT ListViewScalar : public BaseListScalar {
+struct ARROW_EXPORT ListViewScalar
+    : public BaseListScalar,
+      private internal::ArraySpanFillFromScalarScratchSpace<ListViewScalar> {
   using TypeClass = ListViewType;
-  using BaseListScalar::BaseListScalar;
+  using ArraySpanFillFromScalarScratchSpace =
+      internal::ArraySpanFillFromScalarScratchSpace<ListViewScalar>;
+
+  ListViewScalar(std::shared_ptr<Array> value, std::shared_ptr<DataType> type,
+                 bool is_valid = true)
+      : BaseListScalar(std::move(value), std::move(type), is_valid),
+        ArraySpanFillFromScalarScratchSpace(this->value) {}
 
   explicit ListViewScalar(std::shared_ptr<Array> value, bool is_valid = true);
+
+ private:
+  static void FillScratchSpace(uint8_t* scratch_space,
+                               const std::shared_ptr<Array>& value);
+
+  friend ArraySpan;
+  friend ArraySpanFillFromScalarScratchSpace;
 };
 
-struct ARROW_EXPORT LargeListViewScalar : public BaseListScalar {
+struct ARROW_EXPORT LargeListViewScalar
+    : public BaseListScalar,
+      private internal::ArraySpanFillFromScalarScratchSpace<LargeListViewScalar> {
   using TypeClass = LargeListViewType;
-  using BaseListScalar::BaseListScalar;
+  using ArraySpanFillFromScalarScratchSpace =
+      internal::ArraySpanFillFromScalarScratchSpace<LargeListViewScalar>;
+
+  LargeListViewScalar(std::shared_ptr<Array> value, std::shared_ptr<DataType> type,
+                      bool is_valid = true)
+      : BaseListScalar(std::move(value), std::move(type), is_valid),
+        ArraySpanFillFromScalarScratchSpace(this->value) {}
 
   explicit LargeListViewScalar(std::shared_ptr<Array> value, bool is_valid = true);
+
+ private:
+  static void FillScratchSpace(uint8_t* scratch_space,
+                               const std::shared_ptr<Array>& value);
+
+  friend ArraySpan;
+  friend ArraySpanFillFromScalarScratchSpace;
 };
 
-struct ARROW_EXPORT MapScalar : public BaseListScalar {
+struct ARROW_EXPORT MapScalar
+    : public BaseListScalar,
+      private internal::ArraySpanFillFromScalarScratchSpace<MapScalar> {
   using TypeClass = MapType;
-  using BaseListScalar::BaseListScalar;
+  using ArraySpanFillFromScalarScratchSpace =
+      internal::ArraySpanFillFromScalarScratchSpace<MapScalar>;
+
+  MapScalar(std::shared_ptr<Array> value, std::shared_ptr<DataType> type,
+            bool is_valid = true)
+      : BaseListScalar(std::move(value), std::move(type), is_valid),
+        ArraySpanFillFromScalarScratchSpace(this->value) {}
 
   explicit MapScalar(std::shared_ptr<Array> value, bool is_valid = true);
+
+ private:
+  static void FillScratchSpace(uint8_t* scratch_space,
+                               const std::shared_ptr<Array>& value);
+
+  friend ArraySpan;
+  friend ArraySpanFillFromScalarScratchSpace;
 };
 
 struct ARROW_EXPORT FixedSizeListScalar : public BaseListScalar {
@@ -576,9 +718,10 @@ struct ARROW_EXPORT StructScalar : public Scalar {
                                                     std::vector<std::string> field_names);
 };
 
-struct ARROW_EXPORT UnionScalar : public Scalar,
-                                  private internal::ArraySpanFillFromScalarScratchSpace {
-  int8_t type_code;
+struct ARROW_EXPORT UnionScalar : public Scalar {
+  // The type code is not supposed to be modified after construction, because the scratch
+  // space's content need to be kept consistent with it.
+  const int8_t type_code;
 
   virtual const std::shared_ptr<Scalar>& child_value() const = 0;
 
@@ -586,17 +729,31 @@ struct ARROW_EXPORT UnionScalar : public Scalar,
   UnionScalar(std::shared_ptr<DataType> type, int8_t type_code, bool is_valid)
       : Scalar(std::move(type), is_valid), type_code(type_code) {}
 
-  friend struct ArraySpan;
+  struct UnionScratchSpace {
+    alignas(int64_t) int8_t type_code;
+    alignas(int64_t) uint8_t offsets[sizeof(int32_t) * 2];
+  };
+  static_assert(sizeof(UnionScratchSpace) <= internal::kScalarScratchSpaceSize);
+
+  friend ArraySpan;
 };
 
-struct ARROW_EXPORT SparseUnionScalar : public UnionScalar {
+struct ARROW_EXPORT SparseUnionScalar
+    : public UnionScalar,
+      private internal::ArraySpanFillFromScalarScratchSpace<SparseUnionScalar> {
   using TypeClass = SparseUnionType;
+  using ArraySpanFillFromScalarScratchSpace =
+      internal::ArraySpanFillFromScalarScratchSpace<SparseUnionScalar>;
 
   // Even though only one of the union values is relevant for this scalar, we
   // nonetheless construct a vector of scalars, one per union value, to have
   // enough data to reconstruct a valid ArraySpan of length 1 from this scalar
   using ValueType = std::vector<std::shared_ptr<Scalar>>;
-  ValueType value;
+  // The value is not supposed to be modified after construction, because the scratch
+  // space's content need to be kept consistent with the value. It is also the user of
+  // this class's responsibility to ensure that the scalars of the vector is not modified
+  // to accidentally.
+  const ValueType value;
 
   // The value index corresponding to the active type code
   int child_id;
@@ -611,30 +768,57 @@ struct ARROW_EXPORT SparseUnionScalar : public UnionScalar {
   /// to construct a vector of scalars
   static std::shared_ptr<Scalar> FromValue(std::shared_ptr<Scalar> value, int field_index,
                                            std::shared_ptr<DataType> type);
+
+ private:
+  static void FillScratchSpace(uint8_t* scratch_space, int8_t type_code);
+
+  friend ArraySpan;
+  friend ArraySpanFillFromScalarScratchSpace;
 };
 
-struct ARROW_EXPORT DenseUnionScalar : public UnionScalar {
+struct ARROW_EXPORT DenseUnionScalar
+    : public UnionScalar,
+      private internal::ArraySpanFillFromScalarScratchSpace<DenseUnionScalar> {
   using TypeClass = DenseUnionType;
+  using ArraySpanFillFromScalarScratchSpace =
+      internal::ArraySpanFillFromScalarScratchSpace<DenseUnionScalar>;
 
   // For DenseUnionScalar, we can make a valid ArraySpan of length 1 from this
   // scalar
   using ValueType = std::shared_ptr<Scalar>;
-  ValueType value;
+  // The value is not supposed to be modified after construction, because the scratch
+  // space's content need to be kept consistent with the value. It is also the user of
+  // this class's responsibility to ensure that the elements of the vector is not modified
+  // accidentally.
+  const ValueType value;
 
   const std::shared_ptr<Scalar>& child_value() const override { return this->value; }
 
   DenseUnionScalar(ValueType value, int8_t type_code, std::shared_ptr<DataType> type)
       : UnionScalar(std::move(type), type_code, value->is_valid),
+        ArraySpanFillFromScalarScratchSpace(type_code),
         value(std::move(value)) {}
+
+ private:
+  static void FillScratchSpace(uint8_t* scratch_space, int8_t type_code);
+
+  friend ArraySpan;
+  friend ArraySpanFillFromScalarScratchSpace;
 };
 
 struct ARROW_EXPORT RunEndEncodedScalar
     : public Scalar,
-      private internal::ArraySpanFillFromScalarScratchSpace {
+      private internal::ArraySpanFillFromScalarScratchSpace<RunEndEncodedScalar> {
   using TypeClass = RunEndEncodedType;
   using ValueType = std::shared_ptr<Scalar>;
+  using ArraySpanFillFromScalarScratchSpace =
+      internal::ArraySpanFillFromScalarScratchSpace<RunEndEncodedScalar>;
 
-  ValueType value;
+  // The value is not supposed to be modified after construction, because the scratch
+  // space's content need to be kept consistent with the value. It is also the user of
+  // this class's responsibility to ensure that the wrapped scalar is not modified
+  // accidentally.
+  const ValueType value;
 
   RunEndEncodedScalar(std::shared_ptr<Scalar> value, std::shared_ptr<DataType> type);
 
@@ -652,7 +836,10 @@ struct ARROW_EXPORT RunEndEncodedScalar
  private:
   const TypeClass& ree_type() const { return internal::checked_cast<TypeClass&>(*type); }
 
+  static void FillScratchSpace(uint8_t* scratch_space, const DataType& type);
+
   friend ArraySpan;
+  friend ArraySpanFillFromScalarScratchSpace;
 };
 
 /// \brief A Scalar value for DictionaryType
@@ -680,10 +867,6 @@ struct ARROW_EXPORT DictionaryScalar : public internal::PrimitiveScalarBase {
   const void* data() const override {
     return internal::checked_cast<internal::PrimitiveScalarBase&>(*value.index).data();
   }
-  void* mutable_data() override {
-    return internal::checked_cast<internal::PrimitiveScalarBase&>(*value.index)
-        .mutable_data();
-  }
   std::string_view view() const override {
     return internal::checked_cast<const internal::PrimitiveScalarBase&>(*value.index)
         .view();
diff --git a/cpp/src/arrow/scalar_test.cc b/cpp/src/arrow/scalar_test.cc
index 09dfde3227109..104a5697b5727 100644
--- a/cpp/src/arrow/scalar_test.cc
+++ b/cpp/src/arrow/scalar_test.cc
@@ -95,6 +95,68 @@ TEST(TestNullScalar, ValidateErrors) {
   AssertValidationFails(scalar);
 }
 
+TEST(TestNullScalar, Cast) {
+  NullScalar scalar;
+  for (auto to_type : {
+           int8(),
+           float64(),
+           date32(),
+           time32(TimeUnit::SECOND),
+           timestamp(TimeUnit::SECOND),
+           duration(TimeUnit::SECOND),
+           utf8(),
+           large_binary(),
+           list(int32()),
+           struct_({field("f", int32())}),
+           map(utf8(), int32()),
+           decimal(12, 2),
+           list_view(int32()),
+           large_list(int32()),
+           dense_union({field("string", utf8()), field("number", uint64())}),
+           sparse_union({field("string", utf8()), field("number", uint64())}),
+       }) {
+    // Cast() function doesn't support casting null scalar, use Scalar::CastTo() instead.
+    ASSERT_OK_AND_ASSIGN(auto casted, scalar.CastTo(to_type));
+    ASSERT_EQ(casted->type->id(), to_type->id());
+    ASSERT_FALSE(casted->is_valid);
+  }
+}
+
+TEST(TestBooleanScalar, Cast) {
+  for (auto b : {true, false}) {
+    BooleanScalar scalar(b);
+    ARROW_SCOPED_TRACE("boolean value: ", scalar.ToString());
+
+    // Boolean type (identity cast).
+    {
+      ASSERT_OK_AND_ASSIGN(auto casted, Cast(scalar, boolean()));
+      ASSERT_TRUE(casted.scalar()->Equals(scalar)) << casted.scalar()->ToString();
+    }
+
+    // Numeric types.
+    for (auto to_type : {
+             int8(),
+             uint16(),
+             int32(),
+             uint64(),
+             float32(),
+             float64(),
+         }) {
+      ARROW_SCOPED_TRACE("to type: ", to_type->ToString());
+      ASSERT_OK_AND_ASSIGN(auto casted, Cast(scalar, to_type));
+      ASSERT_EQ(casted.scalar()->type->id(), to_type->id());
+      ASSERT_EQ(casted.scalar()->ToString(), std::to_string(b));
+    }
+
+    // String type.
+    {
+      ASSERT_OK_AND_ASSIGN(auto casted, Cast(scalar, utf8()));
+      ASSERT_EQ(casted.scalar()->type->id(), utf8()->id());
+      ASSERT_EQ(casted.scalar()->ToString(), scalar.ToString());
+    }
+  }
+}
+
 template <typename T>
 class TestNumericScalar : public ::testing::Test {
  public:
@@ -464,12 +526,23 @@ class TestDecimalScalar : public ::testing::Test {
                                     ::testing::HasSubstr("does not fit in precision of"),
                                     invalid.ValidateFull());
   }
+
+  void TestCast() {
+    const auto ty = std::make_shared<T>(3, 2);
+    const auto pi = ScalarType(ValueType(314), ty);
+
+    ASSERT_OK_AND_ASSIGN(auto casted, Cast(pi, utf8()));
+    ASSERT_TRUE(casted.scalar()->Equals(StringScalar("3.14")))
+        << casted.scalar()->ToString();
+  }
 };
 
 TYPED_TEST_SUITE(TestDecimalScalar, DecimalArrowTypes);
 
 TYPED_TEST(TestDecimalScalar, Basics) { this->TestBasics(); }
 
+TYPED_TEST(TestDecimalScalar, Cast) { this->TestCast(); }
+
 TEST(TestBinaryScalar, Basics) {
   std::string data = "test data";
   auto buf = std::make_shared<Buffer>(data);
@@ -551,6 +624,14 @@ TEST(TestBinaryScalar, ValidateErrors) {
   AssertValidationFails(*null_scalar);
 }
 
+TEST(TestBinaryScalar, Cast) {
+  BinaryScalar scalar(Buffer::FromString("test data"));
+  ASSERT_OK_AND_ASSIGN(auto casted, Cast(scalar, utf8()));
+  ASSERT_EQ(casted.scalar()->type->id(), utf8()->id());
+  AssertBufferEqual(*checked_cast<const StringScalar&>(*casted.scalar()).value,
+                    *scalar.value);
+}
+
 template <typename T>
 class TestStringScalar : public ::testing::Test {
  public:
@@ -580,19 +661,25 @@ class TestStringScalar : public ::testing::Test {
   }
 
   void TestValidateErrors() {
-    // Inconsistent is_valid / value
-    ScalarType scalar(Buffer::FromString("xxx"));
-    scalar.is_valid = false;
-    AssertValidationFails(scalar);
+    {
+      // Inconsistent is_valid / value
+      ScalarType scalar(Buffer::FromString("xxx"));
+      scalar.is_valid = false;
+      AssertValidationFails(scalar);
+    }
 
-    auto null_scalar = MakeNullScalar(type_);
-    null_scalar->is_valid = true;
-    AssertValidationFails(*null_scalar);
+    {
+      auto null_scalar = MakeNullScalar(type_);
+      null_scalar->is_valid = true;
+      AssertValidationFails(*null_scalar);
+    }
 
-    // Invalid UTF8
-    scalar = ScalarType(Buffer::FromString("\xff"));
-    ASSERT_OK(scalar.Validate());
-    ASSERT_RAISES(Invalid, scalar.ValidateFull());
+    {
+      // Invalid UTF8
+      ScalarType scalar(Buffer::FromString("\xff"));
+      ASSERT_OK(scalar.Validate());
+      ASSERT_RAISES(Invalid, scalar.ValidateFull());
+    }
   }
 
  protected:
@@ -676,8 +763,16 @@ TEST(TestFixedSizeBinaryScalar, ValidateErrors) {
   FixedSizeBinaryScalar scalar(buf, type);
   ASSERT_OK(scalar.ValidateFull());
 
-  scalar.value = SliceBuffer(buf, 1);
-  AssertValidationFails(scalar);
+  ASSERT_RAISES(Invalid, MakeScalar(type, SliceBuffer(buf, 1)));
+}
+
+TEST(TestFixedSizeBinaryScalar, Cast) {
+  std::string data = "test data";
+  FixedSizeBinaryScalar scalar(data);
+  ASSERT_OK_AND_ASSIGN(auto casted, Cast(scalar, utf8()));
+  ASSERT_EQ(casted.scalar()->type->id(), utf8()->id());
+  AssertBufferEqual(*checked_cast<const StringScalar&>(*casted.scalar()).value,
+                    *scalar.value);
 }
 
 TEST(TestDateScalars, Basics) {
@@ -1136,24 +1231,25 @@ class TestListLikeScalar : public ::testing::Test {
   }
 
   void TestValidateErrors() {
-    ScalarType scalar(value_);
-    scalar.is_valid = false;
-    ASSERT_OK(scalar.ValidateFull());
-
-    // Value must be defined
-    scalar = ScalarType(value_);
-    scalar.value = nullptr;
-    AssertValidationFails(scalar);
+    {
+      ScalarType scalar(value_);
+      scalar.is_valid = false;
+      ASSERT_OK(scalar.ValidateFull());
+    }
 
-    // Inconsistent child type
-    scalar = ScalarType(value_);
-    scalar.value = ArrayFromJSON(int32(), "[1, 2, null]");
-    AssertValidationFails(scalar);
+    {
+      // Value must be defined
+      ScalarType scalar(nullptr, type_);
+      scalar.is_valid = true;
+      AssertValidationFails(scalar);
+    }
 
-    // Invalid UTF8 in child data
-    scalar = ScalarType(ArrayFromJSON(utf8(), "[null, null, \"\xff\"]"));
-    ASSERT_OK(scalar.Validate());
-    ASSERT_RAISES(Invalid, scalar.ValidateFull());
+    {
+      // Invalid UTF8 in child data
+      ScalarType scalar(ArrayFromJSON(utf8(), "[null, null, \"\xff\"]"));
+      ASSERT_OK(scalar.Validate());
+      ASSERT_RAISES(Invalid, scalar.ValidateFull());
+    }
   }
 
   void TestHashing() {
@@ -1195,6 +1291,12 @@ class TestListLikeScalar : public ::testing::Test {
 
     auto invalid_cast_type = fixed_size_list(value_->type(), 5);
     CheckListCastError(scalar, invalid_cast_type);
+
+    // Cast() function doesn't support casting list-like to string, use Scalar::CastTo()
+    // instead.
+    ASSERT_OK_AND_ASSIGN(auto casted_str, scalar.CastTo(utf8()));
+    ASSERT_EQ(casted_str->type->id(), utf8()->id());
+    ASSERT_EQ(casted_str->ToString(), scalar.ToString());
   }
 
  protected:
@@ -1224,6 +1326,24 @@ TEST(TestFixedSizeListScalar, ValidateErrors) {
   AssertValidationFails(scalar);
 }
 
+TEST(TestFixedSizeListScalar, Cast) {
+  const auto ty = fixed_size_list(int16(), 3);
+  FixedSizeListScalar scalar(ArrayFromJSON(int16(), "[1, 2, 5]"), ty);
+
+  CheckListCast(scalar, list(int16()));
+  CheckListCast(scalar, large_list(int16()));
+  CheckListCast(scalar, fixed_size_list(int16(), 3));
+
+  auto invalid_cast_type = fixed_size_list(int16(), 4);
+  CheckListCastError(scalar, invalid_cast_type);
+
+  // Cast() function doesn't support casting list-like to string, use Scalar::CastTo()
+  // instead.
+  ASSERT_OK_AND_ASSIGN(auto casted_str, scalar.CastTo(utf8()));
+  ASSERT_EQ(casted_str->type->id(), utf8()->id());
+  ASSERT_EQ(casted_str->ToString(), scalar.ToString());
+}
+
 TEST(TestMapScalar, Basics) {
   auto value =
       ArrayFromJSON(struct_({field("key", utf8(), false), field("value", int8())}),
@@ -1253,6 +1373,12 @@ TEST(TestMapScalar, Cast) {
 
   auto invalid_cast_type = fixed_size_list(key_value_type, 5);
   CheckListCastError(scalar, invalid_cast_type);
+
+  // Cast() function doesn't support casting map to string, use Scalar::CastTo() instead.
+  ASSERT_OK_AND_ASSIGN(auto casted_str, scalar.CastTo(utf8()));
+  ASSERT_TRUE(casted_str->Equals(StringScalar(
+      R"(map<string, int8>[{key:string = a, value:int8 = 1}, {key:string = b, value:int8 = 2}])")))
+      << casted_str->ToString();
 }
 
 TEST(TestStructScalar, FieldAccess) {
@@ -1345,6 +1471,16 @@ TEST(TestStructScalar, ValidateErrors) {
   ASSERT_RAISES(Invalid, scalar.ValidateFull());
 }
 
+TEST(TestStructScalar, Cast) {
+  auto ty = struct_({field("i", int32()), field("s", utf8())});
+  StructScalar scalar({MakeScalar(42), MakeScalar("xxx")}, ty);
+
+  // Cast() function doesn't support casting map to string, use Scalar::CastTo() instead.
+  ASSERT_OK_AND_ASSIGN(auto casted_str, scalar.CastTo(utf8()));
+  ASSERT_TRUE(casted_str->Equals(StringScalar(R"({i:int32 = 42, s:string = xxx})")))
+      << casted_str->ToString();
+}
+
 TEST(TestDictionaryScalar, Basics) {
   for (auto index_ty : all_dictionary_index_types()) {
     auto ty = dictionary(index_ty, utf8());
@@ -1534,17 +1670,41 @@ void CheckGetNullUnionScalar(const Array& arr, int64_t index) {
   ASSERT_FALSE(checked_cast<const UnionScalar&>(*scalar).child_value()->is_valid);
 }
 
+std::shared_ptr<Scalar> MakeUnionScalar(const SparseUnionType& type, int8_t type_code,
+                                        std::shared_ptr<Scalar> field_value,
+                                        int field_index) {
+  ScalarVector field_values;
+  for (int i = 0; i < type.num_fields(); ++i) {
+    if (i == field_index) {
+      field_values.emplace_back(std::move(field_value));
+    } else {
+      field_values.emplace_back(MakeNullScalar(type.field(i)->type()));
+    }
+  }
+  return std::make_shared<SparseUnionScalar>(std::move(field_values), type_code,
+                                             type.GetSharedPtr());
+}
+
 std::shared_ptr<Scalar> MakeUnionScalar(const SparseUnionType& type,
                                         std::shared_ptr<Scalar> field_value,
                                         int field_index) {
-  return SparseUnionScalar::FromValue(field_value, field_index, type.GetSharedPtr());
+  return SparseUnionScalar::FromValue(std::move(field_value), field_index,
+                                      type.GetSharedPtr());
+}
+
+std::shared_ptr<Scalar> MakeUnionScalar(const DenseUnionType& type, int8_t type_code,
+                                        std::shared_ptr<Scalar> field_value,
+                                        int field_index) {
+  return std::make_shared<DenseUnionScalar>(std::move(field_value), type_code,
+                                            type.GetSharedPtr());
 }
 
 std::shared_ptr<Scalar> MakeUnionScalar(const DenseUnionType& type,
                                         std::shared_ptr<Scalar> field_value,
                                         int field_index) {
   int8_t type_code = type.type_codes()[field_index];
-  return std::make_shared<DenseUnionScalar>(field_value, type_code, type.GetSharedPtr());
+  return std::make_shared<DenseUnionScalar>(std::move(field_value), type_code,
+                                            type.GetSharedPtr());
 }
 
 std::shared_ptr<Scalar> MakeSpecificNullScalar(const DenseUnionType& type,
@@ -1592,7 +1752,13 @@ class TestUnionScalar : public ::testing::Test {
 
   std::shared_ptr<Scalar> ScalarFromValue(int field_index,
                                           std::shared_ptr<Scalar> field_value) {
-    return MakeUnionScalar(*union_type_, field_value, field_index);
+    return MakeUnionScalar(*union_type_, std::move(field_value), field_index);
+  }
+
+  std::shared_ptr<Scalar> ScalarFromTypeCodeAndValue(int8_t type_code,
+                                                     std::shared_ptr<Scalar> field_value,
+                                                     int field_index) {
+    return MakeUnionScalar(*union_type_, type_code, std::move(field_value), field_index);
   }
 
   std::shared_ptr<Scalar> SpecificNull(int field_index) {
@@ -1610,40 +1776,48 @@ class TestUnionScalar : public ::testing::Test {
   }
 
   void TestValidateErrors() {
-    // Type code doesn't exist
-    auto scalar = ScalarFromValue(0, alpha_);
-    UnionScalar* union_scalar = static_cast<UnionScalar*>(scalar.get());
-
-    // Invalid type code
-    union_scalar->type_code = 0;
-    AssertValidationFails(*union_scalar);
+    {
+      // Invalid type code
+      auto scalar = ScalarFromTypeCodeAndValue(0, alpha_, 0);
+      AssertValidationFails(*scalar);
+    }
 
-    union_scalar->is_valid = false;
-    AssertValidationFails(*union_scalar);
+    {
+      auto scalar = ScalarFromTypeCodeAndValue(0, alpha_, 0);
+      scalar->is_valid = false;
+      AssertValidationFails(*scalar);
+    }
 
-    union_scalar->type_code = -42;
-    union_scalar->is_valid = true;
-    AssertValidationFails(*union_scalar);
+    {
+      auto scalar = ScalarFromTypeCodeAndValue(-42, alpha_, 0);
+      AssertValidationFails(*scalar);
+    }
 
-    union_scalar->is_valid = false;
-    AssertValidationFails(*union_scalar);
+    {
+      auto scalar = ScalarFromTypeCodeAndValue(-42, alpha_, 0);
+      scalar->is_valid = false;
+      AssertValidationFails(*scalar);
+    }
 
     // Type code doesn't correspond to child type
     if (type_->id() == ::arrow::Type::DENSE_UNION) {
-      union_scalar->type_code = 42;
-      union_scalar->is_valid = true;
-      AssertValidationFails(*union_scalar);
-
-      scalar = ScalarFromValue(2, two_);
-      union_scalar = static_cast<UnionScalar*>(scalar.get());
-      union_scalar->type_code = 3;
-      AssertValidationFails(*union_scalar);
+      {
+        auto scalar = ScalarFromTypeCodeAndValue(42, alpha_, 0);
+        AssertValidationFails(*scalar);
+      }
+
+      {
+        auto scalar = ScalarFromTypeCodeAndValue(3, two_, 2);
+        AssertValidationFails(*scalar);
+      }
     }
 
-    // underlying value has invalid UTF8
-    scalar = ScalarFromValue(0, std::make_shared<StringScalar>("\xff"));
-    ASSERT_OK(scalar->Validate());
-    ASSERT_RAISES(Invalid, scalar->ValidateFull());
+    {
+      // underlying value has invalid UTF8
+      auto scalar = ScalarFromValue(0, std::make_shared<StringScalar>("\xff"));
+      ASSERT_OK(scalar->Validate());
+      ASSERT_RAISES(Invalid, scalar->ValidateFull());
+    }
   }
 
   void TestEquals() {
@@ -1680,6 +1854,14 @@ class TestUnionScalar : public ::testing::Test {
     }
   }
 
+  void TestCast() {
+    // Cast() function doesn't support casting union to string, use Scalar::CastTo()
+    // instead.
+    ASSERT_OK_AND_ASSIGN(auto casted, union_alpha_->CastTo(utf8()));
+    ASSERT_TRUE(casted->Equals(StringScalar(R"(union{string: string = alpha})")))
+        << casted->ToString();
+  }
+
  protected:
   std::shared_ptr<DataType> type_;
   const UnionType* union_type_;
@@ -1698,6 +1880,8 @@ TYPED_TEST(TestUnionScalar, Equals) { this->TestEquals(); }
 
 TYPED_TEST(TestUnionScalar, MakeNullScalar) { this->TestMakeNullScalar(); }
 
+TYPED_TEST(TestUnionScalar, Cast) { this->TestCast(); }
+
 class TestSparseUnionScalar : public TestUnionScalar<SparseUnionType> {};
 
 TEST_F(TestSparseUnionScalar, GetScalar) {
@@ -1974,14 +2158,14 @@ TEST_F(TestExtensionScalar, ValidateErrors) {
   scalar.is_valid = false;
   ASSERT_OK(scalar.ValidateFull());
 
-  // Invalid storage scalar (wrong length)
-  std::shared_ptr<Scalar> invalid_storage = MakeNullScalar(storage_type_);
-  invalid_storage->is_valid = true;
-  static_cast<FixedSizeBinaryScalar*>(invalid_storage.get())->value =
-      std::make_shared<Buffer>("123");
-  AssertValidationFails(*invalid_storage);
+  // Invalid storage scalar (invalid UTF8)
+  ASSERT_OK_AND_ASSIGN(std::shared_ptr<Scalar> invalid_storage,
+                       MakeScalar(utf8(), std::make_shared<Buffer>("\xff")));
+  ASSERT_OK(invalid_storage->Validate());
+  ASSERT_RAISES(Invalid, invalid_storage->ValidateFull());
   scalar = ExtensionScalar(invalid_storage, type_);
-  AssertValidationFails(scalar);
+  ASSERT_OK(scalar.Validate());
+  ASSERT_RAISES(Invalid, scalar.ValidateFull());
 }
 
 }  // namespace arrow
diff --git a/cpp/src/arrow/table.cc b/cpp/src/arrow/table.cc
index 967e78f6b4db1..5dc5e4c1a9a8c 100644
--- a/cpp/src/arrow/table.cc
+++ b/cpp/src/arrow/table.cc
@@ -619,6 +619,7 @@ TableBatchReader::TableBatchReader(const Table& table)
   for (int i = 0; i < table.num_columns(); ++i) {
     column_data_[i] = table.column(i).get();
   }
+  DCHECK(table_.Validate().ok());
 }
 
 TableBatchReader::TableBatchReader(std::shared_ptr<Table> table)
@@ -632,6 +633,7 @@ TableBatchReader::TableBatchReader(std::shared_ptr<Table> table)
   for (int i = 0; i < owned_table_->num_columns(); ++i) {
     column_data_[i] = owned_table_->column(i).get();
   }
+  DCHECK(table_.Validate().ok());
 }
 
 std::shared_ptr<Schema> TableBatchReader::schema() const { return table_.schema(); }
diff --git a/cpp/src/arrow/table.h b/cpp/src/arrow/table.h
index a7508430c132b..79675fa92b1f3 100644
--- a/cpp/src/arrow/table.h
+++ b/cpp/src/arrow/table.h
@@ -241,6 +241,8 @@ class ARROW_EXPORT Table {
 ///
 /// The conversion is zero-copy: each record batch is a view over a slice
 /// of the table's columns.
+///
+/// The table is expected to be valid prior to using it with the batch reader.
 class ARROW_EXPORT TableBatchReader : public RecordBatchReader {
  public:
   /// \brief Construct a TableBatchReader for the given table
diff --git a/cpp/src/arrow/table_builder.cc b/cpp/src/arrow/table_builder.cc
index 19ca151ac200f..8dc2efd19d90d 100644
--- a/cpp/src/arrow/table_builder.cc
+++ b/cpp/src/arrow/table_builder.cc
@@ -47,7 +47,7 @@ Result<std::unique_ptr<RecordBatchBuilder>> RecordBatchBuilder::Make(
       new RecordBatchBuilder(schema, pool, initial_capacity));
   RETURN_NOT_OK(builder->CreateBuilders());
   RETURN_NOT_OK(builder->InitBuilders());
-  return std::move(builder);
+  return builder;
 }
 
 Result<std::shared_ptr<RecordBatch>> RecordBatchBuilder::Flush(bool reset_builders) {
diff --git a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-bullseye/Dockerfile b/cpp/src/arrow/telemetry/CMakeLists.txt
similarity index 61%
rename from dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-bullseye/Dockerfile
rename to cpp/src/arrow/telemetry/CMakeLists.txt
index b0842a0c0d6ff..2b9720d6d899a 100644
--- a/dev/tasks/linux-packages/apache-arrow-apt-source/apt/debian-bullseye/Dockerfile
+++ b/cpp/src/arrow/telemetry/CMakeLists.txt
@@ -15,27 +15,17 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM debian:bullseye
-
-RUN \
-  echo "debconf debconf/frontend select Noninteractive" | \
-    debconf-set-selections
+#
+# arrow_telemetry
+#
 
-RUN \
-  echo 'APT::Install-Recommends "false";' > \
-    /etc/apt/apt.conf.d/disable-install-recommends
+# Headers: top level
+arrow_install_all_headers("arrow/telemetry")
 
-ARG DEBUG
+set(ARROW_TELEMETRY_TEST_LINK_LIBS ${ARROW_OPENTELEMETRY_LIBS})
 
-RUN \
-  quiet=$([ "${DEBUG}" = "yes" ] || echo "-qq") && \
-  apt update ${quiet} && \
-  apt install -y -V ${quiet} \
-    build-essential \
-    debhelper \
-    devscripts \
-    fakeroot \
-    gnupg \
-    lsb-release && \
-  apt clean && \
-  rm -rf /var/lib/apt/lists/*
+add_arrow_test(telemetry_test
+               SOURCES
+               telemetry_test.cc
+               EXTRA_LINK_LIBS
+               ${ARROW_TELEMETRY_TEST_LINK_LIBS})
diff --git a/cpp/src/arrow/telemetry/logging.cc b/cpp/src/arrow/telemetry/logging.cc
new file mode 100644
index 0000000000000..7e9a69afedbb5
--- /dev/null
+++ b/cpp/src/arrow/telemetry/logging.cc
@@ -0,0 +1,293 @@
+// 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.
+
+#include "arrow/telemetry/logging.h"
+#include "arrow/telemetry/util_internal.h"
+#include "arrow/util/io_util.h"
+#include "arrow/util/logging.h"
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4522)
+#endif
+
+#include <google/protobuf/util/json_util.h>
+
+#include <opentelemetry/exporters/ostream/log_record_exporter.h>
+#include <opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h>
+#include <opentelemetry/exporters/otlp/otlp_http_log_record_exporter_options.h>
+#include <opentelemetry/exporters/otlp/otlp_recordable_utils.h>
+#include <opentelemetry/logs/logger.h>
+#include <opentelemetry/logs/noop.h>
+#include <opentelemetry/logs/provider.h>
+#include <opentelemetry/sdk/logs/batch_log_record_processor.h>
+#include <opentelemetry/sdk/logs/batch_log_record_processor_options.h>
+#include <opentelemetry/sdk/logs/exporter.h>
+#include <opentelemetry/sdk/logs/logger_provider.h>
+#include <opentelemetry/trace/tracer.h>
+
+#include <opentelemetry/exporters/otlp/protobuf_include_prefix.h>
+
+#include <opentelemetry/proto/collector/logs/v1/logs_service.pb.h>
+
+#include <opentelemetry/exporters/otlp/protobuf_include_suffix.h>
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+namespace arrow {
+namespace telemetry {
+
+namespace {
+
+using internal::OtelLogExporterOptions;
+
+constexpr const char kLoggingBackendEnvVar[] = "ARROW_LOGGING_BACKEND";
+
+class OtlpOStreamLogRecordExporter final : public otel::sdk::logs::LogRecordExporter {
+ public:
+  explicit OtlpOStreamLogRecordExporter(std::ostream* sink) : sink_(sink) {
+    pb_json_options_.add_whitespace = false;
+  }
+
+  otel::sdk::common::ExportResult Export(
+      const otel_span<std::unique_ptr<otel::sdk::logs::Recordable>>& records) noexcept
+      override {
+    otel::proto::collector::logs::v1::ExportLogsServiceRequest request;
+    otel::exporter::otlp::OtlpRecordableUtils::PopulateRequest(records, &request);
+
+    for (const auto& logs : request.resource_logs()) {
+      std::string out;
+      auto status =
+          google::protobuf::util::MessageToJsonString(logs, &out, pb_json_options_);
+      if (ARROW_PREDICT_FALSE(!status.ok())) {
+        return otel::sdk::common::ExportResult::kFailure;
+      }
+      (*sink_) << out << std::endl;
+    }
+
+    return otel::sdk::common::ExportResult::kSuccess;
+  }
+
+  bool ForceFlush(std::chrono::microseconds timeout) noexcept override {
+    return exporter_.ForceFlush(timeout);
+  }
+
+  bool Shutdown(std::chrono::microseconds timeout) noexcept override {
+    return exporter_.Shutdown(timeout);
+  }
+
+  std::unique_ptr<otel::sdk::logs::Recordable> MakeRecordable() noexcept override {
+    return exporter_.MakeRecordable();
+  }
+
+ private:
+  std::ostream* sink_;
+  otel::exporter::otlp::OtlpHttpLogRecordExporter exporter_;
+  google::protobuf::util::JsonPrintOptions pb_json_options_;
+};
+
+otel::logs::Severity ToOtelSeverity(LogLevel level) {
+  switch (level) {
+    case LogLevel::ARROW_TRACE:
+      return otel::logs::Severity::kTrace;
+    case LogLevel::ARROW_DEBUG:
+      return otel::logs::Severity::kDebug;
+    case LogLevel::ARROW_INFO:
+      return otel::logs::Severity::kInfo;
+    case LogLevel::ARROW_WARNING:
+      return otel::logs::Severity::kWarn;
+    case LogLevel::ARROW_ERROR:
+      return otel::logs::Severity::kError;
+    case LogLevel::ARROW_FATAL:
+      return otel::logs::Severity::kFatal;
+  }
+  return otel::logs::Severity::kInvalid;
+}
+
+enum class ExporterKind {
+  OSTREAM,
+  OTLP_HTTP,
+  OTLP_OSTREAM,
+};
+
+std::unique_ptr<otel::sdk::logs::LogRecordExporter> MakeExporter(
+    ExporterKind exporter_kind, std::ostream* ostream = nullptr) {
+  switch (exporter_kind) {
+    case ExporterKind::OSTREAM: {
+      return std::make_unique<otel::exporter::logs::OStreamLogRecordExporter>(*ostream);
+    } break;
+    case ExporterKind::OTLP_HTTP: {
+      namespace otlp = otel::exporter::otlp;
+      otlp::OtlpHttpLogRecordExporterOptions options{};
+      return std::make_unique<otlp::OtlpHttpLogRecordExporter>(options);
+    } break;
+    case ExporterKind::OTLP_OSTREAM: {
+      return std::make_unique<OtlpOStreamLogRecordExporter>(ostream);
+    } break;
+    default:
+      break;
+  }
+  return nullptr;
+}
+
+std::unique_ptr<otel::sdk::logs::LogRecordExporter> MakeExporterFromEnv(
+    const OtelLogExporterOptions& exporter_options) {
+  auto maybe_env_var = arrow::internal::GetEnvVar(kLoggingBackendEnvVar);
+  if (maybe_env_var.ok()) {
+    auto env_var = maybe_env_var.ValueOrDie();
+    auto* default_ostream =
+        exporter_options.default_stream ? exporter_options.default_stream : &std::cerr;
+    if (env_var == "ostream") {
+      // TODO: Currently disabled as the log records returned by otel's ostream exporter
+      // don't maintain copies of their attributes, leading to lifetime issues. If/when
+      // this is addressed, we can enable it. See:
+      // https://github.com/open-telemetry/opentelemetry-cpp/issues/2402
+#if 0
+      return MakeExporter(ExporterKind::OSTREAM, default_ostream);
+#else
+      ARROW_LOG(WARNING) << "Requested unimplemented backend " << kLoggingBackendEnvVar
+                         << "=" << env_var << ". Falling back to arrow_otlp_ostream";
+      return MakeExporter(ExporterKind::OTLP_OSTREAM, default_ostream);
+#endif
+    } else if (env_var == "otlp_http") {
+      return MakeExporter(ExporterKind::OTLP_HTTP);
+    } else if (env_var == "arrow_otlp_stdout") {
+      return MakeExporter(ExporterKind::OTLP_OSTREAM, &std::cout);
+    } else if (env_var == "arrow_otlp_stderr") {
+      return MakeExporter(ExporterKind::OTLP_OSTREAM, &std::cerr);
+    } else if (env_var == "arrow_otlp_ostream") {
+      return MakeExporter(ExporterKind::OTLP_OSTREAM, default_ostream);
+    } else if (!env_var.empty()) {
+      ARROW_LOG(WARNING) << "Requested unknown backend " << kLoggingBackendEnvVar << "="
+                         << env_var;
+    }
+  }
+  return nullptr;
+}
+
+std::unique_ptr<otel::sdk::logs::LogRecordProcessor> MakeLogRecordProcessor(
+    std::unique_ptr<otel::sdk::logs::LogRecordExporter> exporter) {
+  otel::sdk::logs::BatchLogRecordProcessorOptions options{};
+  return std::make_unique<otel::sdk::logs::BatchLogRecordProcessor>(std::move(exporter),
+                                                                    options);
+}
+
+otel_shared_ptr<otel::logs::LoggerProvider> MakeLoggerProvider(
+    const OtelLogExporterOptions& exporter_options) {
+  auto exporter = MakeExporterFromEnv(exporter_options);
+  if (exporter) {
+    auto processor = MakeLogRecordProcessor(std::move(exporter));
+    return otel_shared_ptr<otel::sdk::logs::LoggerProvider>(
+        new otel::sdk::logs::LoggerProvider(std::move(processor)));
+  }
+  return otel_shared_ptr<otel::logs::LoggerProvider>(
+      new otel::logs::NoopLoggerProvider{});
+}
+
+class OtelLoggerImpl : public OtelLogger {
+ public:
+  OtelLoggerImpl(OtelLoggingOptions options,
+                 otel_shared_ptr<otel::logs::Logger> ot_logger)
+      : logger_(ot_logger), options_(std::move(options)) {}
+
+  void Log(const util::LogDetails& details) override {
+    if (details.severity < options_.severity_threshold) {
+      return;
+    }
+
+    auto log = logger_->CreateLogRecord();
+    if (log == nullptr) {
+      return;
+    }
+
+    // We set the remaining attributes AFTER the custom attributes in AttributeHolder
+    // because, in the event of key collisions, these should take precedence.
+    log->SetTimestamp(otel::common::SystemTimestamp(details.timestamp));
+    log->SetSeverity(ToOtelSeverity(details.severity));
+
+    auto span_ctx = otel::trace::Tracer::GetCurrentSpan()->GetContext();
+    log->SetSpanId(span_ctx.span_id());
+    log->SetTraceId(span_ctx.trace_id());
+    log->SetTraceFlags(span_ctx.trace_flags());
+
+    log->SetBody(ToOtel(details.message));
+
+    logger_->EmitLogRecord(std::move(log));
+
+    if (details.severity >= options_.flush_severity) {
+      util::Logger::Flush();
+    }
+  }
+
+  bool Flush(std::chrono::microseconds timeout) override {
+    return OtelLoggerProvider::Flush(timeout);
+  }
+
+  bool is_enabled() const override { return true; }
+
+  util::ArrowLogLevel severity_threshold() const override {
+    return options_.severity_threshold;
+  }
+
+  std::string_view name() const override {
+    otel_string_view s = logger_->GetName();
+    return std::string_view(s.data(), s.length());
+  }
+
+ private:
+  otel_shared_ptr<otel::logs::Logger> logger_;
+  OtelLoggingOptions options_;
+};
+
+}  // namespace
+
+bool OtelLoggerProvider::Flush(std::chrono::microseconds timeout) {
+  auto provider = otel::logs::Provider::GetLoggerProvider();
+  if (auto sdk_provider =
+          dynamic_cast<otel::sdk::logs::LoggerProvider*>(provider.get())) {
+    return sdk_provider->ForceFlush(timeout);
+  }
+  return false;
+}
+
+Result<std::shared_ptr<OtelLogger>> OtelLoggerProvider::MakeLogger(
+    std::string_view name, const OtelLoggingOptions& options) {
+  auto ot_logger = otel::logs::Provider::GetLoggerProvider()->GetLogger(ToOtel(name));
+  return std::make_shared<OtelLoggerImpl>(options, std::move(ot_logger));
+}
+
+namespace internal {
+
+Status InitializeOtelLoggerProvider(const OtelLogExporterOptions& exporter_options) {
+  otel::logs::Provider::SetLoggerProvider(MakeLoggerProvider(exporter_options));
+  return Status::OK();
+}
+
+bool ShutdownOtelLoggerProvider() {
+  auto provider = otel::logs::Provider::GetLoggerProvider();
+  if (auto sdk_provider =
+          dynamic_cast<otel::sdk::logs::LoggerProvider*>(provider.get())) {
+    return sdk_provider->Shutdown();
+  }
+  return false;
+}
+
+}  // namespace internal
+
+}  // namespace telemetry
+}  // namespace arrow
diff --git a/cpp/src/arrow/telemetry/logging.h b/cpp/src/arrow/telemetry/logging.h
new file mode 100644
index 0000000000000..04b39e6c1985e
--- /dev/null
+++ b/cpp/src/arrow/telemetry/logging.h
@@ -0,0 +1,95 @@
+// 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.
+
+#pragma once
+
+#include <chrono>
+#include <iosfwd>
+#include <memory>
+#include <string>
+#include <string_view>
+
+#include "arrow/result.h"
+#include "arrow/status.h"
+#include "arrow/util/logger.h"
+#include "arrow/util/logging.h"
+#include "arrow/util/macros.h"
+#include "arrow/util/visibility.h"
+
+namespace arrow {
+namespace telemetry {
+
+using LogLevel = util::ArrowLogLevel;
+
+struct OtelLoggingOptions {
+  /// \brief Minimum severity required to emit an OpenTelemetry log record
+  LogLevel severity_threshold = LogLevel::ARROW_INFO;
+
+  /// \brief Minimum severity required to immediately attempt to flush pending log records
+  LogLevel flush_severity = LogLevel::ARROW_ERROR;
+
+  static OtelLoggingOptions Defaults() { return OtelLoggingOptions{}; }
+};
+
+class ARROW_EXPORT OtelLogger : public util::Logger {
+ public:
+  virtual ~OtelLogger() = default;
+
+  virtual std::string_view name() const = 0;
+};
+
+/// \brief A wrapper interface for `opentelemetry::logs::Provider`
+/// \details Application authors will typically want to set the global OpenTelemetry
+/// logger provider themselves after configuring an exporter, processor, resource etc.
+/// This API will then defer to the provider returned by
+/// `opentelemetry::logs::Provider::GetLoggerProvider`
+class ARROW_EXPORT OtelLoggerProvider {
+ public:
+  /// \brief Attempt to flush the log record processor associated with the provider
+  /// \return `true` if the flush occured
+  static bool Flush(std::chrono::microseconds timeout = std::chrono::microseconds::max());
+
+  static Result<std::shared_ptr<OtelLogger>> MakeLogger(
+      std::string_view name,
+      const OtelLoggingOptions& options = OtelLoggingOptions::Defaults());
+};
+
+namespace internal {
+
+// These utilities are primarily intended for Arrow developers
+
+struct OtelLogExporterOptions {
+  /// \brief Default stream to use for the ostream/arrow_otlp_ostream log record exporters
+  /// \details If null, stderr will be used
+  std::ostream* default_stream = NULLPTR;
+
+  static OtelLogExporterOptions Defaults() { return OtelLogExporterOptions{}; }
+};
+
+/// \brief Initialize the global OpenTelemetry logger provider with a default exporter
+/// (based on the ARROW_LOGGING_BACKEND envvar) and batch processor
+ARROW_EXPORT Status InitializeOtelLoggerProvider(
+    const OtelLogExporterOptions& exporter_options = OtelLogExporterOptions::Defaults());
+
+/// \brief Attempt to shut down the global OpenTelemetry logger provider
+/// \return `true` if shutdown was successful
+ARROW_EXPORT bool ShutdownOtelLoggerProvider();
+
+}  // namespace internal
+
+}  // namespace telemetry
+}  // namespace arrow
diff --git a/cpp/src/arrow/telemetry/telemetry_test.cc b/cpp/src/arrow/telemetry/telemetry_test.cc
new file mode 100644
index 0000000000000..d9215053822f2
--- /dev/null
+++ b/cpp/src/arrow/telemetry/telemetry_test.cc
@@ -0,0 +1,109 @@
+// 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.
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include "arrow/telemetry/logging.h"
+#include "arrow/telemetry/util_internal.h"
+#include "arrow/testing/gtest_util.h"
+#include "arrow/testing/util.h"
+#include "arrow/util/io_util.h"
+#include "arrow/util/logging.h"
+#include "arrow/util/tracing_internal.h"
+
+#include <opentelemetry/context/propagation/global_propagator.h>
+#include <opentelemetry/context/propagation/text_map_propagator.h>
+#include <opentelemetry/sdk/trace/processor.h>
+#include <opentelemetry/sdk/trace/tracer_provider.h>
+#include <opentelemetry/trace/propagation/http_trace_context.h>
+#include <opentelemetry/trace/provider.h>
+
+namespace arrow {
+namespace telemetry {
+
+static constexpr char kLoggingEnvVar[] = "ARROW_LOGGING_BACKEND";
+
+class OtelEnvironment : public ::testing::Environment {
+ public:
+  static constexpr std::string_view kLoggerName = "arrow-telemetry-test";
+
+  void SetUp() override {
+    auto maybe_env_var = arrow::internal::GetEnvVar(kLoggingEnvVar);
+    // The env variable is required to be set to obtain a valid logger, so if it hasn't
+    // been set in the environment then we do that here.
+    if (maybe_env_var.status().IsKeyError()) {
+      ASSERT_OK(arrow::internal::SetEnvVar(kLoggingEnvVar, "arrow_otlp_stderr"));
+    }
+
+    // Implicitly sets up span processors + tracer provider
+    auto tracer = arrow::internal::tracing::GetTracer();
+    ARROW_UNUSED(tracer);
+
+    otel::context::propagation::GlobalTextMapPropagator::SetGlobalPropagator(
+        otel::nostd::shared_ptr<otel::context::propagation::TextMapPropagator>(
+            new otel::trace::propagation::HttpTraceContext()));
+
+    ASSERT_OK(internal::InitializeOtelLoggerProvider());
+
+    auto logging_options = OtelLoggingOptions::Defaults();
+    logging_options.severity_threshold = LogLevel::ARROW_TRACE;
+    logging_options.flush_severity = LogLevel::ARROW_TRACE;
+    ASSERT_OK_AND_ASSIGN(auto logger,
+                         OtelLoggerProvider::MakeLogger(kLoggerName, logging_options));
+    ASSERT_NE(logger, nullptr);
+    ASSERT_OK(util::LoggerRegistry::RegisterLogger(logger->name(), logger));
+  }
+
+  void TearDown() override { EXPECT_TRUE(internal::ShutdownOtelLoggerProvider()); }
+};
+
+static ::testing::Environment* kOtelEnvironment =
+    ::testing::AddGlobalTestEnvironment(new OtelEnvironment);
+
+void Log(LogLevel severity, std::string_view message) {
+  auto logger = std::dynamic_pointer_cast<telemetry::OtelLogger>(
+      util::LoggerRegistry::GetLogger(OtelEnvironment::kLoggerName));
+  ASSERT_NE(logger, nullptr);
+  util::LogDetails details;
+  details.severity = severity;
+  details.message = message;
+  logger->Log(details);
+}
+
+class TestLogging : public ::testing::Test {
+ public:
+  void SetUp() override {
+    tracer_ = arrow::internal::tracing::GetTracer();
+    span_ = tracer_->StartSpan("test-logging");
+  }
+
+  otel::trace::Scope MakeScope() { return tracer_->WithActiveSpan(span_); }
+
+ protected:
+  otel::trace::Tracer* tracer_;
+  otel::nostd::shared_ptr<otel::trace::Span> span_;
+};
+
+TEST_F(TestLogging, Basics) {
+  auto scope = MakeScope();
+  Log(LogLevel::ARROW_ERROR, "foo bar");
+  Log(LogLevel::ARROW_WARNING, "baz bal");
+}
+
+}  // namespace telemetry
+}  // namespace arrow
diff --git a/cpp/src/arrow/telemetry/util_internal.h b/cpp/src/arrow/telemetry/util_internal.h
new file mode 100644
index 0000000000000..6dfe4dec62058
--- /dev/null
+++ b/cpp/src/arrow/telemetry/util_internal.h
@@ -0,0 +1,42 @@
+// 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.
+
+#pragma once
+
+#include <opentelemetry/common/attribute_value.h>
+#include <opentelemetry/common/key_value_iterable.h>
+#include <opentelemetry/nostd/shared_ptr.h>
+#include <opentelemetry/nostd/span.h>
+#include <opentelemetry/nostd/string_view.h>
+
+namespace arrow {
+namespace telemetry {
+
+namespace otel = ::opentelemetry;
+
+template <typename T>
+using otel_shared_ptr = otel::nostd::shared_ptr<T>;
+template <typename T>
+using otel_span = otel::nostd::span<T>;
+using otel_string_view = otel::nostd::string_view;
+
+inline otel_string_view ToOtel(std::string_view in) {
+  return otel_string_view(in.data(), in.length());
+}
+
+}  // namespace telemetry
+}  // namespace arrow
diff --git a/cpp/src/arrow/tensor.cc b/cpp/src/arrow/tensor.cc
index 77ccedbde15c6..b47f1a1075b37 100644
--- a/cpp/src/arrow/tensor.cc
+++ b/cpp/src/arrow/tensor.cc
@@ -18,6 +18,7 @@
 #include "arrow/tensor.h"
 
 #include <algorithm>
+#include <cmath>
 #include <cstddef>
 #include <cstdint>
 #include <functional>
@@ -27,12 +28,14 @@
 #include <type_traits>
 #include <vector>
 
+#include "arrow/record_batch.h"
 #include "arrow/status.h"
 #include "arrow/type.h"
 #include "arrow/type_traits.h"
 #include "arrow/util/checked_cast.h"
 #include "arrow/util/int_util_overflow.h"
 #include "arrow/util/logging.h"
+#include "arrow/util/unreachable.h"
 #include "arrow/visit_type_inline.h"
 
 namespace arrow {
@@ -220,6 +223,209 @@ Status ValidateTensorParameters(const std::shared_ptr<DataType>& type,
   return Status::OK();
 }
 
+template <typename Out>
+struct ConvertColumnsToTensorVisitor {
+  Out*& out_values;
+  const ArrayData& in_data;
+
+  template <typename T>
+  Status Visit(const T&) {
+    if constexpr (is_numeric(T::type_id)) {
+      using In = typename T::c_type;
+      auto in_values = ArraySpan(in_data).GetSpan<In>(1, in_data.length);
+
+      if (in_data.null_count == 0) {
+        if constexpr (std::is_same_v<In, Out>) {
+          memcpy(out_values, in_values.data(), in_values.size_bytes());
+          out_values += in_values.size();
+        } else {
+          for (In in_value : in_values) {
+            *out_values++ = static_cast<Out>(in_value);
+          }
+        }
+      } else {
+        for (int64_t i = 0; i < in_data.length; ++i) {
+          *out_values++ =
+              in_data.IsNull(i) ? static_cast<Out>(NAN) : static_cast<Out>(in_values[i]);
+        }
+      }
+      return Status::OK();
+    }
+    Unreachable();
+  }
+};
+
+template <typename Out>
+struct ConvertColumnsToTensorRowMajorVisitor {
+  Out*& out_values;
+  const ArrayData& in_data;
+  int num_cols;
+  int col_idx;
+
+  template <typename T>
+  Status Visit(const T&) {
+    if constexpr (is_numeric(T::type_id)) {
+      using In = typename T::c_type;
+      auto in_values = ArraySpan(in_data).GetSpan<In>(1, in_data.length);
+
+      if (in_data.null_count == 0) {
+        for (int64_t i = 0; i < in_data.length; ++i) {
+          out_values[i * num_cols + col_idx] = static_cast<Out>(in_values[i]);
+        }
+      } else {
+        for (int64_t i = 0; i < in_data.length; ++i) {
+          out_values[i * num_cols + col_idx] =
+              in_data.IsNull(i) ? static_cast<Out>(NAN) : static_cast<Out>(in_values[i]);
+        }
+      }
+      return Status::OK();
+    }
+    Unreachable();
+  }
+};
+
+template <typename DataType>
+inline void ConvertColumnsToTensor(const RecordBatch& batch, uint8_t* out,
+                                   bool row_major) {
+  using CType = typename arrow::TypeTraits<DataType>::CType;
+  auto* out_values = reinterpret_cast<CType*>(out);
+
+  int i = 0;
+  for (const auto& column : batch.columns()) {
+    if (row_major) {
+      ConvertColumnsToTensorRowMajorVisitor<CType> visitor{out_values, *column->data(),
+                                                           batch.num_columns(), i++};
+      DCHECK_OK(VisitTypeInline(*column->type(), &visitor));
+    } else {
+      ConvertColumnsToTensorVisitor<CType> visitor{out_values, *column->data()};
+      DCHECK_OK(VisitTypeInline(*column->type(), &visitor));
+    }
+  }
+}
+
+Status RecordBatchToTensor(const RecordBatch& batch, bool null_to_nan, bool row_major,
+                           MemoryPool* pool, std::shared_ptr<Tensor>* tensor) {
+  if (batch.num_columns() == 0) {
+    return Status::TypeError(
+        "Conversion to Tensor for RecordBatches without columns/schema is not "
+        "supported.");
+  }
+  // Check for no validity bitmap of each field
+  // if null_to_nan conversion is set to false
+  for (int i = 0; i < batch.num_columns(); ++i) {
+    if (batch.column(i)->null_count() > 0 && !null_to_nan) {
+      return Status::TypeError(
+          "Can only convert a RecordBatch with no nulls. Set null_to_nan to true to "
+          "convert nulls to NaN");
+    }
+  }
+
+  // Check for supported data types and merge fields
+  // to get the resulting uniform data type
+  if (!is_integer(batch.column(0)->type()->id()) &&
+      !is_floating(batch.column(0)->type()->id())) {
+    return Status::TypeError("DataType is not supported: ",
+                             batch.column(0)->type()->ToString());
+  }
+  std::shared_ptr<Field> result_field = batch.schema()->field(0);
+  std::shared_ptr<DataType> result_type = result_field->type();
+
+  Field::MergeOptions options;
+  options.promote_integer_to_float = true;
+  options.promote_integer_sign = true;
+  options.promote_numeric_width = true;
+
+  if (batch.num_columns() > 1) {
+    for (int i = 1; i < batch.num_columns(); ++i) {
+      if (!is_numeric(batch.column(i)->type()->id())) {
+        return Status::TypeError("DataType is not supported: ",
+                                 batch.column(i)->type()->ToString());
+      }
+
+      // Casting of float16 is not supported, throw an error in this case
+      if ((batch.column(i)->type()->id() == Type::HALF_FLOAT ||
+           result_field->type()->id() == Type::HALF_FLOAT) &&
+          batch.column(i)->type()->id() != result_field->type()->id()) {
+        return Status::NotImplemented("Casting from or to halffloat is not supported.");
+      }
+
+      ARROW_ASSIGN_OR_RAISE(
+          result_field,
+          result_field->MergeWith(
+              batch.schema()->field(i)->WithName(result_field->name()), options));
+    }
+    result_type = result_field->type();
+  }
+
+  // Check if result_type is signed or unsigned integer and null_to_nan is set to true
+  // Then all columns should be promoted to float type
+  if (is_integer(result_type->id()) && null_to_nan) {
+    ARROW_ASSIGN_OR_RAISE(
+        result_field,
+        result_field->MergeWith(field(result_field->name(), float32()), options));
+    result_type = result_field->type();
+  }
+
+  // Allocate memory
+  ARROW_ASSIGN_OR_RAISE(
+      std::shared_ptr<Buffer> result,
+      AllocateBuffer(result_type->bit_width() * batch.num_columns() * batch.num_rows(),
+                     pool));
+  // Copy data
+  switch (result_type->id()) {
+    case Type::UINT8:
+      ConvertColumnsToTensor<UInt8Type>(batch, result->mutable_data(), row_major);
+      break;
+    case Type::UINT16:
+    case Type::HALF_FLOAT:
+      ConvertColumnsToTensor<UInt16Type>(batch, result->mutable_data(), row_major);
+      break;
+    case Type::UINT32:
+      ConvertColumnsToTensor<UInt32Type>(batch, result->mutable_data(), row_major);
+      break;
+    case Type::UINT64:
+      ConvertColumnsToTensor<UInt64Type>(batch, result->mutable_data(), row_major);
+      break;
+    case Type::INT8:
+      ConvertColumnsToTensor<Int8Type>(batch, result->mutable_data(), row_major);
+      break;
+    case Type::INT16:
+      ConvertColumnsToTensor<Int16Type>(batch, result->mutable_data(), row_major);
+      break;
+    case Type::INT32:
+      ConvertColumnsToTensor<Int32Type>(batch, result->mutable_data(), row_major);
+      break;
+    case Type::INT64:
+      ConvertColumnsToTensor<Int64Type>(batch, result->mutable_data(), row_major);
+      break;
+    case Type::FLOAT:
+      ConvertColumnsToTensor<FloatType>(batch, result->mutable_data(), row_major);
+      break;
+    case Type::DOUBLE:
+      ConvertColumnsToTensor<DoubleType>(batch, result->mutable_data(), row_major);
+      break;
+    default:
+      return Status::TypeError("DataType is not supported: ", result_type->ToString());
+  }
+
+  // Construct Tensor object
+  const auto& fixed_width_type =
+      internal::checked_cast<const FixedWidthType&>(*result_type);
+  std::vector<int64_t> shape = {batch.num_rows(), batch.num_columns()};
+  std::vector<int64_t> strides;
+
+  if (row_major) {
+    ARROW_RETURN_NOT_OK(
+        internal::ComputeRowMajorStrides(fixed_width_type, shape, &strides));
+  } else {
+    ARROW_RETURN_NOT_OK(
+        internal::ComputeColumnMajorStrides(fixed_width_type, shape, &strides));
+  }
+  ARROW_ASSIGN_OR_RAISE(*tensor,
+                        Tensor::Make(result_type, std::move(result), shape, strides));
+  return Status::OK();
+}
+
 }  // namespace internal
 
 /// Constructor with strides and dimension names
diff --git a/cpp/src/arrow/tensor.h b/cpp/src/arrow/tensor.h
index ff6f3735f9193..dd3a21fae495a 100644
--- a/cpp/src/arrow/tensor.h
+++ b/cpp/src/arrow/tensor.h
@@ -77,6 +77,10 @@ Status ValidateTensorParameters(const std::shared_ptr<DataType>& type,
                                 const std::vector<int64_t>& strides,
                                 const std::vector<std::string>& dim_names);
 
+ARROW_EXPORT
+Status RecordBatchToTensor(const RecordBatch& batch, bool null_to_nan, bool row_major,
+                           MemoryPool* pool, std::shared_ptr<Tensor>* tensor);
+
 }  // namespace internal
 
 class ARROW_EXPORT Tensor {
diff --git a/cpp/src/arrow/testing/builder.h b/cpp/src/arrow/testing/builder.h
index 09e8f49dea9eb..6beb7760e3bbf 100644
--- a/cpp/src/arrow/testing/builder.h
+++ b/cpp/src/arrow/testing/builder.h
@@ -195,7 +195,7 @@ Result<std::shared_ptr<Array>> ArrayFromBuilderVisitor(
 
   std::shared_ptr<Array> out;
   RETURN_NOT_OK(builder->Finish(&out));
-  return std::move(out);
+  return out;
 }
 
 template <typename Fn>
diff --git a/cpp/src/arrow/testing/examplefs.cc b/cpp/src/arrow/testing/examplefs.cc
index d3e7e3b03f6d7..5c9d5f9d90712 100644
--- a/cpp/src/arrow/testing/examplefs.cc
+++ b/cpp/src/arrow/testing/examplefs.cc
@@ -24,7 +24,7 @@
 
 namespace arrow::fs {
 
-FileSystemRegistrar kExampleFileSystemModule{
+auto kExampleFileSystemModule = ARROW_REGISTER_FILESYSTEM(
     "example",
     [](const Uri& uri, const io::IOContext& io_context,
        std::string* out_path) -> Result<std::shared_ptr<FileSystem>> {
@@ -33,6 +33,6 @@ FileSystemRegistrar kExampleFileSystemModule{
       auto local_uri = "file" + uri.ToString().substr(kScheme.size());
       return FileSystemFromUri(local_uri, io_context, out_path);
     },
-};
+    {});
 
 }  // namespace arrow::fs
diff --git a/cpp/src/arrow/testing/extension_type.h b/cpp/src/arrow/testing/extension_type.h
index 846e3c7a16578..6515631f202ae 100644
--- a/cpp/src/arrow/testing/extension_type.h
+++ b/cpp/src/arrow/testing/extension_type.h
@@ -132,6 +132,25 @@ class ARROW_TESTING_EXPORT DictExtensionType : public ExtensionType {
   std::string Serialize() const override { return "dict-extension-serialized"; }
 };
 
+// A minimal extension type that does not error when passed blank extension information
+class ARROW_TESTING_EXPORT MetadataOptionalExtensionType : public ExtensionType {
+ public:
+  MetadataOptionalExtensionType() : ExtensionType(null()) {}
+  std::string extension_name() const override { return "metadata.optional"; }
+  std::string Serialize() const override { return ""; }
+  std::shared_ptr<Array> MakeArray(std::shared_ptr<ArrayData> data) const override {
+    return nullptr;
+  }
+  bool ExtensionEquals(const ExtensionType& other) const override {
+    return other.extension_name() == extension_name();
+  }
+  Result<std::shared_ptr<DataType>> Deserialize(
+      std::shared_ptr<DataType> storage_type,
+      const std::string& serialized_data) const override {
+    return std::make_shared<MetadataOptionalExtensionType>();
+  }
+};
+
 class ARROW_TESTING_EXPORT Complex128Array : public ExtensionArray {
  public:
   using ExtensionArray::ExtensionArray;
diff --git a/cpp/src/arrow/testing/fixed_width_test_util.cc b/cpp/src/arrow/testing/fixed_width_test_util.cc
new file mode 100644
index 0000000000000..9c305ed1df97c
--- /dev/null
+++ b/cpp/src/arrow/testing/fixed_width_test_util.cc
@@ -0,0 +1,181 @@
+// 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.
+
+#include <cstdint>
+#include <functional>
+#include <limits>
+#include <vector>
+
+#include "arrow/array/builder_base.h"
+#include "arrow/array/builder_nested.h"
+#include "arrow/array/builder_primitive.h"
+#include "arrow/testing/fixed_width_test_util.h"
+#include "arrow/type.h"
+#include "arrow/util/checked_cast.h"
+
+namespace arrow::util::internal {
+
+namespace {
+template <typename ArrowType>
+inline Status AppendNumeric(ArrayBuilder* builder, int64_t* next_value) {
+  using NumericBuilder = ::arrow::NumericBuilder<ArrowType>;
+  using value_type = typename NumericBuilder::value_type;
+  auto* numeric_builder = ::arrow::internal::checked_cast<NumericBuilder*>(builder);
+  auto cast_next_value =
+      static_cast<value_type>(*next_value % std::numeric_limits<value_type>::max());
+  RETURN_NOT_OK(numeric_builder->Append(cast_next_value));
+  *next_value += 1;
+  return Status::OK();
+}
+}  // namespace
+
+std::shared_ptr<DataType> NestedListGenerator::NestedFSLType(
+    const std::shared_ptr<DataType>& inner_type, const std::vector<int>& sizes) {
+  auto type = inner_type;
+  for (auto it = sizes.rbegin(); it != sizes.rend(); it++) {
+    type = fixed_size_list(type, *it);
+  }
+  return type;
+}
+
+std::shared_ptr<DataType> NestedListGenerator::NestedListType(
+    const std::shared_ptr<DataType>& inner_type, size_t depth) {
+  auto list_type = list(inner_type);
+  for (size_t i = 1; i < depth; i++) {
+    list_type = list(std::move(list_type));
+  }
+  return list_type;
+}
+
+Result<std::shared_ptr<Array>> NestedListGenerator::NestedFSLArray(
+    const std::shared_ptr<DataType>& inner_type, const std::vector<int>& list_sizes,
+    int64_t length) {
+  auto nested_type = NestedFSLType(inner_type, list_sizes);
+  ARROW_ASSIGN_OR_RAISE(auto builder, MakeBuilder(nested_type));
+  return NestedListArray(builder.get(), list_sizes, length);
+}
+
+Result<std::shared_ptr<Array>> NestedListGenerator::NestedListArray(
+    const std::shared_ptr<DataType>& inner_type, const std::vector<int>& list_sizes,
+    int64_t length) {
+  auto nested_type = NestedListType(inner_type, list_sizes.size());
+  ARROW_ASSIGN_OR_RAISE(auto builder, MakeBuilder(nested_type));
+  return NestedListArray(builder.get(), list_sizes, length);
+}
+
+void NestedListGenerator::VisitAllNestedListConfigurations(
+    const std::vector<std::shared_ptr<DataType>>& inner_value_types,
+    const std::function<void(const std::shared_ptr<DataType>&, const std::vector<int>&)>&
+        visit,
+    int max_depth, int max_power_of_2_size) {
+  for (int depth = 1; depth <= max_depth; depth++) {
+    for (auto& type : inner_value_types) {
+      assert(is_fixed_width(*type));
+      int value_width = type->byte_width();
+
+      std::vector<int> list_sizes;  // stack of list sizes
+      auto pop = [&]() {            // pop the list_sizes stack
+        assert(!list_sizes.empty());
+        value_width /= list_sizes.back();
+        list_sizes.pop_back();
+      };
+      auto next = [&]() {  // double the top of the stack
+        assert(!list_sizes.empty());
+        value_width *= 2;
+        list_sizes.back() *= 2;
+        return value_width;
+      };
+      auto push_1s = [&]() {  // fill the stack with 1s
+        while (list_sizes.size() < static_cast<size_t>(depth)) {
+          list_sizes.push_back(1);
+        }
+      };
+
+      // Loop invariants:
+      //   value_width == product(list_sizes) * type->byte_width()
+      //   value_width is a power-of-2 (1, 2, 4, 8, 16, max_power_of_2_size=32)
+      push_1s();
+      do {
+        // for (auto x : list_sizes) printf("%d * ", x);
+        // printf("(%s) %d = %2d\n", type->name().c_str(), type->byte_width(),
+        // value_width);
+        visit(type, list_sizes);
+        while (!list_sizes.empty()) {
+          if (next() <= max_power_of_2_size) {
+            push_1s();
+            break;
+          }
+          pop();
+        }
+      } while (!list_sizes.empty());
+    }
+  }
+}
+
+Status NestedListGenerator::AppendNestedList(ArrayBuilder* nested_builder,
+                                             const int* list_sizes,
+                                             int64_t* next_inner_value) {
+  using ::arrow::internal::checked_cast;
+  ArrayBuilder* builder = nested_builder;
+  auto type = builder->type();
+  if (type->id() == Type::FIXED_SIZE_LIST || type->id() == Type::LIST) {
+    const int list_size = *list_sizes;
+    if (type->id() == Type::FIXED_SIZE_LIST) {
+      auto* fsl_builder = checked_cast<FixedSizeListBuilder*>(builder);
+      assert(list_size == checked_cast<FixedSizeListType&>(*type).list_size());
+      RETURN_NOT_OK(fsl_builder->Append());
+      builder = fsl_builder->value_builder();
+    } else {  // type->id() == Type::LIST)
+      auto* list_builder = checked_cast<ListBuilder*>(builder);
+      RETURN_NOT_OK(list_builder->Append(/*is_valid=*/true, list_size));
+      builder = list_builder->value_builder();
+    }
+    list_sizes++;
+    for (int i = 0; i < list_size; i++) {
+      RETURN_NOT_OK(AppendNestedList(builder, list_sizes, next_inner_value));
+    }
+  } else {
+    switch (type->id()) {
+      case Type::INT8:
+        RETURN_NOT_OK(AppendNumeric<Int8Type>(builder, next_inner_value));
+        break;
+      case Type::INT16:
+        RETURN_NOT_OK(AppendNumeric<Int16Type>(builder, next_inner_value));
+        break;
+      case Type::INT32:
+        RETURN_NOT_OK(AppendNumeric<Int32Type>(builder, next_inner_value));
+        break;
+      case Type::INT64:
+        RETURN_NOT_OK(AppendNumeric<Int64Type>(builder, next_inner_value));
+        break;
+      default:
+        return Status::NotImplemented("Unsupported type: ", *type);
+    }
+  }
+  return Status::OK();
+}
+
+Result<std::shared_ptr<Array>> NestedListGenerator::NestedListArray(
+    ArrayBuilder* nested_builder, const std::vector<int>& list_sizes, int64_t length) {
+  int64_t next_inner_value = 0;
+  for (int64_t i = 0; i < length; i++) {
+    RETURN_NOT_OK(AppendNestedList(nested_builder, list_sizes.data(), &next_inner_value));
+  }
+  return nested_builder->Finish();
+}
+
+}  // namespace arrow::util::internal
diff --git a/cpp/src/arrow/testing/fixed_width_test_util.h b/cpp/src/arrow/testing/fixed_width_test_util.h
new file mode 100644
index 0000000000000..9e5e6fa68509e
--- /dev/null
+++ b/cpp/src/arrow/testing/fixed_width_test_util.h
@@ -0,0 +1,76 @@
+// 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.
+
+#pragma once
+
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <vector>
+
+#include "arrow/testing/visibility.h"
+#include "arrow/type.h"
+#include "arrow/type_fwd.h"
+
+namespace arrow::util::internal {
+
+class ARROW_TESTING_EXPORT NestedListGenerator {
+ public:
+  /// \brief Create a nested FixedSizeListType.
+  ///
+  /// \return `fixed_size_list(fixed_size_list(..., sizes[1]), sizes[0])`
+  static std::shared_ptr<DataType> NestedFSLType(
+      const std::shared_ptr<DataType>& inner_type, const std::vector<int>& sizes);
+
+  /// \brief Create a nested FixedListType.
+  ///
+  /// \return `list(list(...))`
+  static std::shared_ptr<DataType> NestedListType(
+      const std::shared_ptr<DataType>& inner_type, size_t depth);
+
+  static Result<std::shared_ptr<Array>> NestedFSLArray(
+      const std::shared_ptr<DataType>& inner_type, const std::vector<int>& list_sizes,
+      int64_t length);
+
+  static Result<std::shared_ptr<Array>> NestedListArray(
+      const std::shared_ptr<DataType>& inner_type, const std::vector<int>& list_sizes,
+      int64_t length);
+
+  /// \brief Generate all possible nested list configurations of depth 1 to max_depth.
+  ///
+  /// Each configuration consists of a single inner value type and a list of sizes.
+  /// Both can be used with NestedFSLArray and NestedListArray to generate test data.
+  ///
+  /// The product of the list sizes and the size of the inner value type is always a power
+  /// of 2 no greater than max_power_of_2_size. For max_depth=3 and
+  /// max_power_of_2_size=32, this generates 108 configurations.
+  static void VisitAllNestedListConfigurations(
+      const std::vector<std::shared_ptr<DataType>>& inner_value_types,
+      const std::function<void(const std::shared_ptr<DataType>&,
+                               const std::vector<int>&)>& visit,
+      int max_depth = 3, int max_power_of_2_size = 32);
+
+ private:
+  // Append([...[[*next_inner_value++, *next_inner_value++, ...]]...])
+  static Status AppendNestedList(ArrayBuilder* nested_builder, const int* list_sizes,
+                                 int64_t* next_inner_value);
+
+  static Result<std::shared_ptr<Array>> NestedListArray(
+      ArrayBuilder* nested_builder, const std::vector<int>& list_sizes, int64_t length);
+};
+
+}  // namespace arrow::util::internal
diff --git a/cpp/src/arrow/type.cc b/cpp/src/arrow/type.cc
index edf8f0496628c..91a0d87cb8ae7 100644
--- a/cpp/src/arrow/type.cc
+++ b/cpp/src/arrow/type.cc
@@ -57,6 +57,8 @@ using internal::checked_cast;
 constexpr Type::type NullType::type_id;
 constexpr Type::type ListType::type_id;
 constexpr Type::type LargeListType::type_id;
+constexpr Type::type ListViewType::type_id;
+constexpr Type::type LargeListViewType::type_id;
 
 constexpr Type::type MapType::type_id;
 
@@ -729,7 +731,7 @@ Result<std::shared_ptr<DataType>> MaybeMergeListTypes(
         auto item_field,
         left.item_field()->MergeWith(
             *right.item_field()->WithName(left.item_field()->name()), options));
-    return map(std::move(key_field->type()), std::move(item_field),
+    return map(key_field->type(), std::move(item_field),
                /*keys_sorted=*/left.keys_sorted() && right.keys_sorted());
   } else if (promoted_type->id() == Type::STRUCT && other_type->id() == Type::STRUCT) {
     return MergeStructs(promoted_type, other_type, options);
@@ -1696,7 +1698,7 @@ class NestedSelector {
       }
     }
 
-    return std::move(child_data);
+    return child_data;
   }
 
   static Result<std::shared_ptr<Array>> GetChild(const Array& array, int i,
@@ -3149,20 +3151,20 @@ std::shared_ptr<DataType> time64(TimeUnit::type unit) {
   return std::make_shared<Time64Type>(unit);
 }
 
-std::shared_ptr<DataType> list(const std::shared_ptr<DataType>& value_type) {
-  return std::make_shared<ListType>(value_type);
+std::shared_ptr<DataType> list(std::shared_ptr<DataType> value_type) {
+  return std::make_shared<ListType>(std::move(value_type));
 }
 
-std::shared_ptr<DataType> list(const std::shared_ptr<Field>& value_field) {
-  return std::make_shared<ListType>(value_field);
+std::shared_ptr<DataType> list(std::shared_ptr<Field> value_field) {
+  return std::make_shared<ListType>(std::move(value_field));
 }
 
-std::shared_ptr<DataType> large_list(const std::shared_ptr<DataType>& value_type) {
-  return std::make_shared<LargeListType>(value_type);
+std::shared_ptr<DataType> large_list(std::shared_ptr<DataType> value_type) {
+  return std::make_shared<LargeListType>(std::move(value_type));
 }
 
-std::shared_ptr<DataType> large_list(const std::shared_ptr<Field>& value_field) {
-  return std::make_shared<LargeListType>(value_field);
+std::shared_ptr<DataType> large_list(std::shared_ptr<Field> value_field) {
+  return std::make_shared<LargeListType>(std::move(value_field));
 }
 
 std::shared_ptr<DataType> map(std::shared_ptr<DataType> key_type,
@@ -3183,14 +3185,14 @@ std::shared_ptr<DataType> map(std::shared_ptr<Field> key_field,
                                    keys_sorted);
 }
 
-std::shared_ptr<DataType> fixed_size_list(const std::shared_ptr<DataType>& value_type,
+std::shared_ptr<DataType> fixed_size_list(std::shared_ptr<DataType> value_type,
                                           int32_t list_size) {
-  return std::make_shared<FixedSizeListType>(value_type, list_size);
+  return std::make_shared<FixedSizeListType>(std::move(value_type), list_size);
 }
 
-std::shared_ptr<DataType> fixed_size_list(const std::shared_ptr<Field>& value_field,
+std::shared_ptr<DataType> fixed_size_list(std::shared_ptr<Field> value_field,
                                           int32_t list_size) {
-  return std::make_shared<FixedSizeListType>(value_field, list_size);
+  return std::make_shared<FixedSizeListType>(std::move(value_field), list_size);
 }
 
 std::shared_ptr<DataType> list_view(std::shared_ptr<DataType> value_type) {
diff --git a/cpp/src/arrow/type.h b/cpp/src/arrow/type.h
index 3f651741d3e49..e087c8ca1c387 100644
--- a/cpp/src/arrow/type.h
+++ b/cpp/src/arrow/type.h
@@ -1122,11 +1122,11 @@ class ARROW_EXPORT ListType : public BaseListType {
   static constexpr const char* type_name() { return "list"; }
 
   // List can contain any other logical value type
-  explicit ListType(const std::shared_ptr<DataType>& value_type)
-      : ListType(std::make_shared<Field>("item", value_type)) {}
+  explicit ListType(std::shared_ptr<DataType> value_type)
+      : ListType(std::make_shared<Field>("item", std::move(value_type))) {}
 
-  explicit ListType(const std::shared_ptr<Field>& value_field) : BaseListType(type_id) {
-    children_ = {value_field};
+  explicit ListType(std::shared_ptr<Field> value_field) : BaseListType(type_id) {
+    children_ = {std::move(value_field)};
   }
 
   DataTypeLayout layout() const override {
@@ -1153,12 +1153,11 @@ class ARROW_EXPORT LargeListType : public BaseListType {
   static constexpr const char* type_name() { return "large_list"; }
 
   // List can contain any other logical value type
-  explicit LargeListType(const std::shared_ptr<DataType>& value_type)
-      : LargeListType(std::make_shared<Field>("item", value_type)) {}
+  explicit LargeListType(std::shared_ptr<DataType> value_type)
+      : LargeListType(std::make_shared<Field>("item", std::move(value_type))) {}
 
-  explicit LargeListType(const std::shared_ptr<Field>& value_field)
-      : BaseListType(type_id) {
-    children_ = {value_field};
+  explicit LargeListType(std::shared_ptr<Field> value_field) : BaseListType(type_id) {
+    children_ = {std::move(value_field)};
   }
 
   DataTypeLayout layout() const override {
@@ -1296,12 +1295,13 @@ class ARROW_EXPORT FixedSizeListType : public BaseListType {
   static constexpr const char* type_name() { return "fixed_size_list"; }
 
   // List can contain any other logical value type
-  FixedSizeListType(const std::shared_ptr<DataType>& value_type, int32_t list_size)
-      : FixedSizeListType(std::make_shared<Field>("item", value_type), list_size) {}
+  FixedSizeListType(std::shared_ptr<DataType> value_type, int32_t list_size)
+      : FixedSizeListType(std::make_shared<Field>("item", std::move(value_type)),
+                          list_size) {}
 
-  FixedSizeListType(const std::shared_ptr<Field>& value_field, int32_t list_size)
+  FixedSizeListType(std::shared_ptr<Field> value_field, int32_t list_size)
       : BaseListType(type_id), list_size_(list_size) {
-    children_ = {value_field};
+    children_ = {std::move(value_field)};
   }
 
   DataTypeLayout layout() const override {
@@ -1723,7 +1723,9 @@ class ARROW_EXPORT MonthIntervalType : public IntervalType {
 
   MonthIntervalType() : IntervalType(type_id) {}
 
-  std::string ToString(bool show_metadata = false) const override { return name(); }
+  std::string ToString(bool ARROW_ARG_UNUSED(show_metadata) = false) const override {
+    return name();
+  }
   std::string name() const override { return "month_interval"; }
 };
 
@@ -1759,7 +1761,9 @@ class ARROW_EXPORT DayTimeIntervalType : public IntervalType {
 
   int bit_width() const override { return static_cast<int>(sizeof(c_type) * CHAR_BIT); }
 
-  std::string ToString(bool show_metadata = false) const override { return name(); }
+  std::string ToString(bool ARROW_ARG_UNUSED(show_metadata) = false) const override {
+    return name();
+  }
   std::string name() const override { return "day_time_interval"; }
 };
 
@@ -1799,7 +1803,9 @@ class ARROW_EXPORT MonthDayNanoIntervalType : public IntervalType {
 
   int bit_width() const override { return static_cast<int>(sizeof(c_type) * CHAR_BIT); }
 
-  std::string ToString(bool show_metadata = false) const override { return name(); }
+  std::string ToString(bool ARROW_ARG_UNUSED(show_metadata) = false) const override {
+    return name();
+  }
   std::string name() const override { return "month_day_nano_interval"; }
 };
 
@@ -2482,7 +2488,7 @@ Result<std::shared_ptr<Schema>> UnifySchemas(
 
 namespace internal {
 
-constexpr bool HasValidityBitmap(Type::type id) {
+constexpr bool may_have_validity_bitmap(Type::type id) {
   switch (id) {
     case Type::NA:
     case Type::DENSE_UNION:
@@ -2494,6 +2500,9 @@ constexpr bool HasValidityBitmap(Type::type id) {
   }
 }
 
+ARROW_DEPRECATED("Deprecated in 17.0.0. Use may_have_validity_bitmap() instead.")
+constexpr bool HasValidityBitmap(Type::type id) { return may_have_validity_bitmap(id); }
+
 ARROW_EXPORT
 std::string ToString(Type::type id);
 
diff --git a/cpp/src/arrow/type_fwd.h b/cpp/src/arrow/type_fwd.h
index 63eec10bf723b..08777d247edbf 100644
--- a/cpp/src/arrow/type_fwd.h
+++ b/cpp/src/arrow/type_fwd.h
@@ -525,19 +525,19 @@ std::shared_ptr<DataType> decimal256(int32_t precision, int32_t scale);
 
 /// \brief Create a ListType instance from its child Field type
 ARROW_EXPORT
-std::shared_ptr<DataType> list(const std::shared_ptr<Field>& value_type);
+std::shared_ptr<DataType> list(std::shared_ptr<Field> value_type);
 
 /// \brief Create a ListType instance from its child DataType
 ARROW_EXPORT
-std::shared_ptr<DataType> list(const std::shared_ptr<DataType>& value_type);
+std::shared_ptr<DataType> list(std::shared_ptr<DataType> value_type);
 
 /// \brief Create a LargeListType instance from its child Field type
 ARROW_EXPORT
-std::shared_ptr<DataType> large_list(const std::shared_ptr<Field>& value_type);
+std::shared_ptr<DataType> large_list(std::shared_ptr<Field> value_type);
 
 /// \brief Create a LargeListType instance from its child DataType
 ARROW_EXPORT
-std::shared_ptr<DataType> large_list(const std::shared_ptr<DataType>& value_type);
+std::shared_ptr<DataType> large_list(std::shared_ptr<DataType> value_type);
 
 /// \brief Create a ListViewType instance
 ARROW_EXPORT std::shared_ptr<DataType> list_view(std::shared_ptr<DataType> value_type);
@@ -568,12 +568,12 @@ std::shared_ptr<DataType> map(std::shared_ptr<DataType> key_type,
 
 /// \brief Create a FixedSizeListType instance from its child Field type
 ARROW_EXPORT
-std::shared_ptr<DataType> fixed_size_list(const std::shared_ptr<Field>& value_type,
+std::shared_ptr<DataType> fixed_size_list(std::shared_ptr<Field> value_type,
                                           int32_t list_size);
 
 /// \brief Create a FixedSizeListType instance from its child DataType
 ARROW_EXPORT
-std::shared_ptr<DataType> fixed_size_list(const std::shared_ptr<DataType>& value_type,
+std::shared_ptr<DataType> fixed_size_list(std::shared_ptr<DataType> value_type,
                                           int32_t list_size);
 /// \brief Return a Duration instance (naming use _type to avoid namespace conflict with
 /// built in time classes).
diff --git a/cpp/src/arrow/type_traits.h b/cpp/src/arrow/type_traits.h
index ed66c9367dc36..8caf4400fe86d 100644
--- a/cpp/src/arrow/type_traits.h
+++ b/cpp/src/arrow/type_traits.h
@@ -305,6 +305,7 @@ struct TypeTraits<HalfFloatType> {
   using BuilderType = HalfFloatBuilder;
   using ScalarType = HalfFloatScalar;
   using TensorType = HalfFloatTensor;
+  using CType = uint16_t;
 
   static constexpr int64_t bytes_required(int64_t elements) {
     return elements * static_cast<int64_t>(sizeof(uint16_t));
diff --git a/cpp/src/arrow/util/CMakeLists.txt b/cpp/src/arrow/util/CMakeLists.txt
index e26efba28594b..24a1c1177240d 100644
--- a/cpp/src/arrow/util/CMakeLists.txt
+++ b/cpp/src/arrow/util/CMakeLists.txt
@@ -56,6 +56,7 @@ add_arrow_test(utility-test
                compression_test.cc
                decimal_test.cc
                float16_test.cc
+               fixed_width_test.cc
                formatting_util_test.cc
                key_value_metadata_test.cc
                hashing_test.cc
@@ -63,6 +64,7 @@ add_arrow_test(utility-test
                ${IO_UTIL_TEST_SOURCES}
                iterator_test.cc
                list_util_test.cc
+               logger_test.cc
                logging_test.cc
                queue_test.cc
                range_test.cc
diff --git a/cpp/src/arrow/util/align_util.cc b/cpp/src/arrow/util/align_util.cc
index 7bc687b155052..a327afa7a5cc3 100644
--- a/cpp/src/arrow/util/align_util.cc
+++ b/cpp/src/arrow/util/align_util.cc
@@ -159,9 +159,10 @@ Result<std::shared_ptr<Buffer>> EnsureAlignment(std::shared_ptr<Buffer> buffer,
         auto new_buffer,
         AllocateBuffer(buffer->size(), minimum_desired_alignment, memory_pool));
     std::memcpy(new_buffer->mutable_data(), buffer->data(), buffer->size());
-    return std::move(new_buffer);
+    // R build with openSUSE155 requires an explicit shared_ptr construction
+    return std::shared_ptr<Buffer>(std::move(new_buffer));
   } else {
-    return std::move(buffer);
+    return buffer;
   }
 }
 
@@ -197,9 +198,9 @@ Result<std::shared_ptr<ArrayData>> EnsureAlignment(std::shared_ptr<ArrayData> ar
     auto new_array_data = ArrayData::Make(
         array_data->type, array_data->length, std::move(buffers), array_data->child_data,
         array_data->dictionary, array_data->GetNullCount(), array_data->offset);
-    return std::move(new_array_data);
+    return new_array_data;
   } else {
-    return std::move(array_data);
+    return array_data;
   }
 }
 
@@ -210,7 +211,7 @@ Result<std::shared_ptr<Array>> EnsureAlignment(std::shared_ptr<Array> array,
                         EnsureAlignment(array->data(), alignment, memory_pool));
 
   if (new_array_data.get() == array->data().get()) {
-    return std::move(array);
+    return array;
   } else {
     return MakeArray(std::move(new_array_data));
   }
@@ -230,7 +231,7 @@ Result<std::shared_ptr<ChunkedArray>> EnsureAlignment(std::shared_ptr<ChunkedArr
     }
     return ChunkedArray::Make(std::move(chunks_), array->type());
   } else {
-    return std::move(array);
+    return array;
   }
 }
 
@@ -248,7 +249,7 @@ Result<std::shared_ptr<RecordBatch>> EnsureAlignment(std::shared_ptr<RecordBatch
     }
     return RecordBatch::Make(batch->schema(), batch->num_rows(), std::move(columns_));
   } else {
-    return std::move(batch);
+    return batch;
   }
 }
 
@@ -275,7 +276,7 @@ Result<std::shared_ptr<Table>> EnsureAlignment(std::shared_ptr<Table> table,
     }
     return Table::Make(table->schema(), std::move(columns_), table->num_rows());
   } else {
-    return std::move(table);
+    return table;
   }
 }
 
diff --git a/cpp/src/arrow/util/async_generator.h b/cpp/src/arrow/util/async_generator.h
index f9bcd534567c6..fd66298d1a9d6 100644
--- a/cpp/src/arrow/util/async_generator.h
+++ b/cpp/src/arrow/util/async_generator.h
@@ -1962,7 +1962,7 @@ AsyncGenerator<T> MakeFailingGenerator(Status st) {
   return [state]() -> Future<T> {
     auto st = std::move(*state);
     if (!st.ok()) {
-      return std::move(st);
+      return st;
     } else {
       return AsyncGeneratorEnd<T>();
     }
diff --git a/cpp/src/arrow/util/async_generator_test.cc b/cpp/src/arrow/util/async_generator_test.cc
index 2b74313db279b..afb03b67209a6 100644
--- a/cpp/src/arrow/util/async_generator_test.cc
+++ b/cpp/src/arrow/util/async_generator_test.cc
@@ -399,6 +399,10 @@ TEST(TestAsyncUtil, MapParallelStress) {
 }
 
 TEST(TestAsyncUtil, MapQueuingFailStress) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   constexpr int NTASKS = 10;
   constexpr int NITEMS = 10;
   for (bool slow : {true, false}) {
@@ -1872,6 +1876,10 @@ TEST(PushGenerator, DanglingProducer) {
 }
 
 TEST(PushGenerator, Stress) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   const int NTHREADS = 20;
   const int NVALUES = 2000;
   const int NFUTURES = NVALUES + 100;
diff --git a/cpp/src/arrow/util/async_util.cc b/cpp/src/arrow/util/async_util.cc
index 63e27bfbe5773..fbd45eadac2cd 100644
--- a/cpp/src/arrow/util/async_util.cc
+++ b/cpp/src/arrow/util/async_util.cc
@@ -118,6 +118,8 @@ class FifoQueue : public ThrottledAsyncTaskScheduler::Queue {
 
   void Purge() override { tasks_.clear(); }
 
+  std::size_t Size() const override { return tasks_.size(); }
+
  private:
   std::list<std::unique_ptr<Task>> tasks_;
 };
@@ -332,6 +334,10 @@ class ThrottledAsyncTaskSchedulerImpl
 
   void Pause() override { throttle_->Pause(); }
   void Resume() override { throttle_->Resume(); }
+  std::size_t QueueSize() override {
+    std::lock_guard lk(mutex_);
+    return queue_->Size();
+  }
   const util::tracing::Span& span() const override { return target_->span(); }
 
  private:
@@ -499,6 +505,7 @@ class ThrottledAsyncTaskGroup : public ThrottledAsyncTaskScheduler {
       : throttle_(std::move(throttle)), task_group_(std::move(task_group)) {}
   void Pause() override { throttle_->Pause(); }
   void Resume() override { throttle_->Resume(); }
+  std::size_t QueueSize() override { return throttle_->QueueSize(); }
   const util::tracing::Span& span() const override { return task_group_->span(); }
   bool AddTask(std::unique_ptr<Task> task) override {
     return task_group_->AddTask(std::move(task));
diff --git a/cpp/src/arrow/util/async_util.h b/cpp/src/arrow/util/async_util.h
index 7a675da59facd..d9ed63bdbce22 100644
--- a/cpp/src/arrow/util/async_util.h
+++ b/cpp/src/arrow/util/async_util.h
@@ -226,6 +226,7 @@ class ARROW_EXPORT ThrottledAsyncTaskScheduler : public AsyncTaskScheduler {
     virtual bool Empty() = 0;
     /// Purge the queue of all items
     virtual void Purge() = 0;
+    virtual std::size_t Size() const = 0;
   };
 
   class Throttle {
@@ -277,6 +278,8 @@ class ARROW_EXPORT ThrottledAsyncTaskScheduler : public AsyncTaskScheduler {
   /// Allows task to be submitted again.  If there is a max_concurrent_cost limit then
   /// it will still apply.
   virtual void Resume() = 0;
+  /// Return the number of tasks queued but not yet submitted
+  virtual std::size_t QueueSize() = 0;
 
   /// Create a throttled view of a scheduler
   ///
diff --git a/cpp/src/arrow/util/async_util_test.cc b/cpp/src/arrow/util/async_util_test.cc
index 313ca91912335..1f9aad453e9c4 100644
--- a/cpp/src/arrow/util/async_util_test.cc
+++ b/cpp/src/arrow/util/async_util_test.cc
@@ -680,6 +680,7 @@ class PriorityQueue : public ThrottledAsyncTaskScheduler::Queue {
       queue_.pop();
     }
   }
+  std::size_t Size() const { return queue_.size(); }
 
  private:
   std::priority_queue<TaskWithPriority*, std::vector<TaskWithPriority*>,
diff --git a/cpp/src/arrow/util/atfork_test.cc b/cpp/src/arrow/util/atfork_test.cc
index 004e28e19514a..750f4d138793b 100644
--- a/cpp/src/arrow/util/atfork_test.cc
+++ b/cpp/src/arrow/util/atfork_test.cc
@@ -35,6 +35,7 @@
 
 #include "arrow/testing/gtest_util.h"
 #include "arrow/util/atfork_internal.h"
+#include "arrow/util/config.h"
 #include "arrow/util/io_util.h"
 #include "arrow/util/logging.h"
 
@@ -109,6 +110,10 @@ class TestAtFork : public ::testing::Test {
 #ifndef _WIN32
 
 TEST_F(TestAtFork, EmptyHandlers) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   auto handlers = std::make_shared<AtForkHandler>();
 
   RegisterAtFork(handlers);
@@ -130,6 +135,10 @@ TEST_F(TestAtFork, EmptyHandlers) {
 }
 
 TEST_F(TestAtFork, SingleThread) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   auto handlers1 = std::make_shared<AtForkHandler>(PushBefore(1), PushParentAfter(11),
                                                    PushChildAfter(21));
   auto handlers2 = std::make_shared<AtForkHandler>(PushBefore(2), PushParentAfter(12),
@@ -188,6 +197,10 @@ TEST_F(TestAtFork, SingleThread) {
 // https://github.com/google/sanitizers/issues/950.
 
 TEST_F(TestAtFork, MultipleThreads) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   const int kNumThreads = 5;
   const int kNumIterations = 40;
   const int kParentAfterAddend = 10000;
@@ -245,6 +258,9 @@ TEST_F(TestAtFork, NestedChild) {
 #ifdef __APPLE__
   GTEST_SKIP() << "Nested fork is not supported on macOS";
 #endif
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
 
   auto handlers1 = std::make_shared<AtForkHandler>(PushBefore(1), PushParentAfter(11),
                                                    PushChildAfter(21));
@@ -286,6 +302,10 @@ TEST_F(TestAtFork, NestedChild) {
 
 #ifdef _WIN32
 TEST_F(TestAtFork, NoOp) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   auto handlers = std::make_shared<AtForkHandler>(PushBefore(1), PushParentAfter(11),
                                                   PushChildAfter(21));
 
diff --git a/cpp/src/arrow/util/bit_util_benchmark.cc b/cpp/src/arrow/util/bit_util_benchmark.cc
index 0bf2c26f12486..43f3fb33cd7fd 100644
--- a/cpp/src/arrow/util/bit_util_benchmark.cc
+++ b/cpp/src/arrow/util/bit_util_benchmark.cc
@@ -107,7 +107,7 @@ static std::shared_ptr<Buffer> CreateRandomBuffer(int64_t nbytes) {
   auto buffer = *AllocateBuffer(nbytes);
   memset(buffer->mutable_data(), 0, nbytes);
   random_bytes(nbytes, /*seed=*/0, buffer->mutable_data());
-  return std::move(buffer);
+  return buffer;
 }
 
 static std::shared_ptr<Buffer> CreateRandomBitsBuffer(int64_t nbits,
diff --git a/cpp/src/arrow/util/bitmap_builders.cc b/cpp/src/arrow/util/bitmap_builders.cc
index 0348b1303b96b..c5cf3d2bc72b5 100644
--- a/cpp/src/arrow/util/bitmap_builders.cc
+++ b/cpp/src/arrow/util/bitmap_builders.cc
@@ -51,7 +51,8 @@ Result<std::shared_ptr<Buffer>> BytesToBits(const std::vector<uint8_t>& bytes,
   uint8_t* out_buf = buffer->mutable_data();
   memset(out_buf, 0, static_cast<size_t>(buffer->capacity()));
   FillBitsFromBytes(bytes, out_buf);
-  return std::move(buffer);
+  // R build with openSUSE155 requires an explicit shared_ptr construction
+  return std::shared_ptr<Buffer>(std::move(buffer));
 }
 
 Result<std::shared_ptr<Buffer>> BitmapAllButOne(MemoryPool* pool, int64_t length,
@@ -66,7 +67,8 @@ Result<std::shared_ptr<Buffer>> BitmapAllButOne(MemoryPool* pool, int64_t length
   auto bitmap_data = buffer->mutable_data();
   bit_util::SetBitsTo(bitmap_data, 0, length, value);
   bit_util::SetBitTo(bitmap_data, straggler_pos, !value);
-  return std::move(buffer);
+  // R build with openSUSE155 requires an explicit shared_ptr construction
+  return std::shared_ptr<Buffer>(std::move(buffer));
 }
 
 }  // namespace internal
diff --git a/cpp/src/arrow/util/bitmap_reader_benchmark.cc b/cpp/src/arrow/util/bitmap_reader_benchmark.cc
index 1427adb13e131..b3c199ec3bd55 100644
--- a/cpp/src/arrow/util/bitmap_reader_benchmark.cc
+++ b/cpp/src/arrow/util/bitmap_reader_benchmark.cc
@@ -45,7 +45,7 @@ static std::shared_ptr<Buffer> CreateRandomBuffer(int64_t nbytes) {
   auto buffer = *AllocateBuffer(nbytes);
   memset(buffer->mutable_data(), 0, nbytes);
   random_bytes(nbytes, /*seed=*/0, buffer->mutable_data());
-  return std::move(buffer);
+  return buffer;
 }
 
 static void BitBlockCounterBench(benchmark::State& state) {
diff --git a/cpp/src/arrow/util/cache_test.cc b/cpp/src/arrow/util/cache_test.cc
index 6b71baa369b9b..264bfe68ec5d2 100644
--- a/cpp/src/arrow/util/cache_test.cc
+++ b/cpp/src/arrow/util/cache_test.cc
@@ -26,6 +26,7 @@
 
 #include "arrow/testing/gtest_util.h"
 #include "arrow/util/cache_internal.h"
+#include "arrow/util/config.h"
 
 namespace arrow {
 namespace internal {
@@ -255,6 +256,10 @@ TYPED_TEST(TestMemoizeLru, Basics) { this->TestBasics(); }
 class TestMemoizeLruThreadSafe : public TestMemoizeLru<MemoizeLruFactory> {};
 
 TEST_F(TestMemoizeLruThreadSafe, Threads) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   using V = IntValue;
   Callable c;
 
diff --git a/cpp/src/arrow/util/cancel_test.cc b/cpp/src/arrow/util/cancel_test.cc
index 45f6cde4f5579..713418f15a0cc 100644
--- a/cpp/src/arrow/util/cancel_test.cc
+++ b/cpp/src/arrow/util/cancel_test.cc
@@ -232,6 +232,10 @@ class SignalCancelTest : public CancelTest {
 };
 
 TEST_F(SignalCancelTest, Register) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   RegisterHandler();
 
   TriggerSignal();
@@ -239,6 +243,10 @@ TEST_F(SignalCancelTest, Register) {
 }
 
 TEST_F(SignalCancelTest, RegisterUnregister) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   // The signal stop source was set up but no handler was registered,
   // so the token shouldn't be signalled.
   TriggerSignal();
@@ -261,6 +269,10 @@ TEST_F(SignalCancelTest, RegisterUnregister) {
 #if !(defined(_WIN32) || defined(ARROW_VALGRIND) || defined(ADDRESS_SANITIZER) || \
       defined(THREAD_SANITIZER))
 TEST_F(SignalCancelTest, ForkSafetyUnregisteredHandlers) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   RunInChild([&]() {
     // Child
     TriggerSignal();
@@ -284,6 +296,10 @@ TEST_F(SignalCancelTest, ForkSafetyUnregisteredHandlers) {
 }
 
 TEST_F(SignalCancelTest, ForkSafetyRegisteredHandlers) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   RegisterHandler();
 
   RunInChild([&]() {
@@ -307,6 +323,10 @@ TEST_F(SignalCancelTest, ForkSafetyRegisteredHandlers) {
 #endif
 
 TEST_F(CancelTest, ThreadedPollSuccess) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   constexpr int kNumThreads = 10;
 
   std::vector<Status> results(kNumThreads);
@@ -339,6 +359,10 @@ TEST_F(CancelTest, ThreadedPollSuccess) {
 }
 
 TEST_F(CancelTest, ThreadedPollCancel) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   constexpr int kNumThreads = 10;
 
   std::vector<Status> results(kNumThreads);
diff --git a/cpp/src/arrow/util/compression.cc b/cpp/src/arrow/util/compression.cc
index b63aec0aae8f9..7e2a3de30306a 100644
--- a/cpp/src/arrow/util/compression.cc
+++ b/cpp/src/arrow/util/compression.cc
@@ -216,7 +216,7 @@ Result<std::unique_ptr<Codec>> Codec::Create(Compression::type codec_type,
 
   DCHECK_NE(codec, nullptr);
   RETURN_NOT_OK(codec->Init());
-  return std::move(codec);
+  return codec;
 }
 
 // use compression level to create Codec
diff --git a/cpp/src/arrow/util/config.h.cmake b/cpp/src/arrow/util/config.h.cmake
index 9fbd685084fd5..08c2ae173601b 100644
--- a/cpp/src/arrow/util/config.h.cmake
+++ b/cpp/src/arrow/util/config.h.cmake
@@ -31,9 +31,6 @@
 
 #define ARROW_BUILD_TYPE "@UPPERCASE_BUILD_TYPE@"
 
-#define ARROW_GIT_ID "@ARROW_GIT_ID@"
-#define ARROW_GIT_DESCRIPTION "@ARROW_GIT_DESCRIPTION@"
-
 #define ARROW_PACKAGE_KIND "@ARROW_PACKAGE_KIND@"
 
 #cmakedefine ARROW_COMPUTE
diff --git a/cpp/src/arrow/util/config_internal.h.cmake b/cpp/src/arrow/util/config_internal.h.cmake
new file mode 100644
index 0000000000000..e90f7ee12da4d
--- /dev/null
+++ b/cpp/src/arrow/util/config_internal.h.cmake
@@ -0,0 +1,22 @@
+// 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.
+
+// These variables are not exposed as they can make compilation caching
+// and increment builds less efficient.
+
+#define ARROW_GIT_ID "@ARROW_GIT_ID@"
+#define ARROW_GIT_DESCRIPTION "@ARROW_GIT_DESCRIPTION@"
diff --git a/cpp/src/arrow/util/counting_semaphore_test.cc b/cpp/src/arrow/util/counting_semaphore_test.cc
index a5fa9f6bde891..4de11ce852a03 100644
--- a/cpp/src/arrow/util/counting_semaphore_test.cc
+++ b/cpp/src/arrow/util/counting_semaphore_test.cc
@@ -22,12 +22,17 @@
 #include <vector>
 
 #include "arrow/testing/gtest_util.h"
+#include "arrow/util/config.h"
 #include "gtest/gtest.h"
 
 namespace arrow {
 namespace util {
 
 TEST(CountingSemaphore, Basic) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   CountingSemaphore semaphore;
   std::atomic<bool> acquired{false};
   std::atomic<bool> started{false};
@@ -50,6 +55,10 @@ TEST(CountingSemaphore, Basic) {
 }
 
 TEST(CountingSemaphore, CloseAborts) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   CountingSemaphore semaphore;
   std::atomic<bool> cleanup{false};
   std::thread acquirer([&] {
@@ -64,6 +73,10 @@ TEST(CountingSemaphore, CloseAborts) {
 }
 
 TEST(CountingSemaphore, Stress) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   constexpr uint32_t NTHREADS = 10;
   CountingSemaphore semaphore;
   std::vector<uint32_t> max_allowed_cases = {1, 3};
diff --git a/cpp/src/arrow/util/decimal.cc b/cpp/src/arrow/util/decimal.cc
index ce71def497161..c8457eae8ed33 100644
--- a/cpp/src/arrow/util/decimal.cc
+++ b/cpp/src/arrow/util/decimal.cc
@@ -717,7 +717,7 @@ Status Decimal128::FromString(const char* s, Decimal128* out, int32_t* precision
 Result<Decimal128> Decimal128::FromString(std::string_view s) {
   Decimal128 out;
   RETURN_NOT_OK(FromString(s, &out, nullptr, nullptr));
-  return std::move(out);
+  return out;
 }
 
 Result<Decimal128> Decimal128::FromString(const std::string& s) {
@@ -850,7 +850,7 @@ Status Decimal256::FromString(const char* s, Decimal256* out, int32_t* precision
 Result<Decimal256> Decimal256::FromString(std::string_view s) {
   Decimal256 out;
   RETURN_NOT_OK(FromString(s, &out, nullptr, nullptr));
-  return std::move(out);
+  return out;
 }
 
 Result<Decimal256> Decimal256::FromString(const std::string& s) {
diff --git a/cpp/src/arrow/util/decimal.h b/cpp/src/arrow/util/decimal.h
index 345c74d95b101..14c7103d5ac0d 100644
--- a/cpp/src/arrow/util/decimal.h
+++ b/cpp/src/arrow/util/decimal.h
@@ -80,7 +80,7 @@ class ARROW_EXPORT Decimal128 : public BasicDecimal128 {
     std::pair<Decimal128, Decimal128> result;
     auto dstatus = BasicDecimal128::Divide(divisor, &result.first, &result.second);
     ARROW_RETURN_NOT_OK(ToArrowStatus(dstatus));
-    return std::move(result);
+    return result;
   }
 
   /// \brief Convert the Decimal128 value to a base 10 decimal string with the given
@@ -118,7 +118,7 @@ class ARROW_EXPORT Decimal128 : public BasicDecimal128 {
     Decimal128 out;
     auto dstatus = BasicDecimal128::Rescale(original_scale, new_scale, &out);
     ARROW_RETURN_NOT_OK(ToArrowStatus(dstatus));
-    return std::move(out);
+    return out;
   }
 
   /// \brief Convert to a signed integer
@@ -218,7 +218,7 @@ class ARROW_EXPORT Decimal256 : public BasicDecimal256 {
     Decimal256 out;
     auto dstatus = BasicDecimal256::Rescale(original_scale, new_scale, &out);
     ARROW_RETURN_NOT_OK(ToArrowStatus(dstatus));
-    return std::move(out);
+    return out;
   }
 
   /// Divide this number by right and return the result.
@@ -235,7 +235,7 @@ class ARROW_EXPORT Decimal256 : public BasicDecimal256 {
     std::pair<Decimal256, Decimal256> result;
     auto dstatus = BasicDecimal256::Divide(divisor, &result.first, &result.second);
     ARROW_RETURN_NOT_OK(ToArrowStatus(dstatus));
-    return std::move(result);
+    return result;
   }
 
   /// \brief Convert from a big-endian byte representation. The length must be
diff --git a/cpp/src/arrow/util/fixed_width_internal.cc b/cpp/src/arrow/util/fixed_width_internal.cc
new file mode 100644
index 0000000000000..3f12fafb54f0f
--- /dev/null
+++ b/cpp/src/arrow/util/fixed_width_internal.cc
@@ -0,0 +1,232 @@
+// 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.
+
+#include <cstdint>
+#include <optional>
+#include <utility>
+
+#include "arrow/array/data.h"
+#include "arrow/compute/kernel.h"
+#include "arrow/result.h"
+#include "arrow/type.h"
+#include "arrow/util/checked_cast.h"
+#include "arrow/util/fixed_width_internal.h"
+#include "arrow/util/logging.h"
+#include "arrow/util/small_vector.h"
+
+namespace arrow::util {
+
+using ::arrow::internal::checked_cast;
+
+bool IsFixedWidthLike(const ArraySpan& source, bool force_null_count,
+                      bool exclude_bool_and_dictionary) {
+  return IsFixedWidthLike(
+      source, force_null_count, [exclude_bool_and_dictionary](const DataType& type) {
+        return !exclude_bool_and_dictionary ||
+               (type.id() != Type::DICTIONARY && type.id() != Type::BOOL);
+      });
+}
+
+static int64_t FixedWidthInBytesFallback(const FixedSizeListType& fixed_size_list_type) {
+  auto* fsl = &fixed_size_list_type;
+  int64_t list_size = fsl->list_size();
+  for (auto type = fsl->value_type().get();;) {
+    if (type->id() == Type::FIXED_SIZE_LIST) {
+      fsl = checked_cast<const FixedSizeListType*>(type);
+      list_size *= fsl->list_size();
+      type = fsl->value_type().get();
+      continue;
+    }
+    if (type->id() != Type::BOOL && is_fixed_width(type->id())) {
+      const int64_t flat_byte_width = list_size * type->byte_width();
+      DCHECK_GE(flat_byte_width, 0);
+      return flat_byte_width;
+    }
+    break;
+  }
+  return -1;
+}
+
+int64_t FixedWidthInBytes(const DataType& type) {
+  auto type_id = type.id();
+  if (is_fixed_width(type_id)) {
+    const int32_t num_bits = type.bit_width();
+    return (type_id == Type::BOOL) ? -1 : num_bits / 8;
+  }
+  if (type_id == Type::FIXED_SIZE_LIST) {
+    auto& fsl = ::arrow::internal::checked_cast<const FixedSizeListType&>(type);
+    return FixedWidthInBytesFallback(fsl);
+  }
+  return -1;
+}
+
+static int64_t FixedWidthInBitsFallback(const FixedSizeListType& fixed_size_list_type) {
+  auto* fsl = &fixed_size_list_type;
+  int64_t list_size = fsl->list_size();
+  for (auto type = fsl->value_type().get();;) {
+    auto type_id = type->id();
+    if (type_id == Type::FIXED_SIZE_LIST) {
+      fsl = checked_cast<const FixedSizeListType*>(type);
+      list_size *= fsl->list_size();
+      type = fsl->value_type().get();
+      continue;
+    }
+    if (is_fixed_width(type_id)) {
+      const int64_t flat_bit_width = list_size * type->bit_width();
+      DCHECK_GE(flat_bit_width, 0);
+      return flat_bit_width;
+    }
+    break;
+  }
+  return -1;
+}
+
+int64_t FixedWidthInBits(const DataType& type) {
+  auto type_id = type.id();
+  if (is_fixed_width(type_id)) {
+    return type.bit_width();
+  }
+  if (type_id == Type::FIXED_SIZE_LIST) {
+    auto& fsl = ::arrow::internal::checked_cast<const FixedSizeListType&>(type);
+    return FixedWidthInBitsFallback(fsl);
+  }
+  return -1;
+}
+
+namespace internal {
+
+Status PreallocateFixedWidthArrayData(::arrow::compute::KernelContext* ctx,
+                                      int64_t length, const ArraySpan& source,
+                                      bool allocate_validity, ArrayData* out) {
+  DCHECK(!source.MayHaveNulls() || allocate_validity)
+      << "allocate_validity cannot be false if source may have nulls";
+  DCHECK_EQ(source.type->id(), out->type->id());
+  auto* type = source.type;
+  out->length = length;
+  if (type->id() == Type::FIXED_SIZE_LIST) {
+    out->buffers.resize(1);
+    out->child_data = {std::make_shared<ArrayData>()};
+  } else {
+    out->buffers.resize(2);
+  }
+  if (allocate_validity) {
+    ARROW_ASSIGN_OR_RAISE(out->buffers[0], ctx->AllocateBitmap(length));
+  }
+
+  if (type->id() == Type::BOOL) {
+    ARROW_ASSIGN_OR_RAISE(out->buffers[1], ctx->AllocateBitmap(length));
+    return Status::OK();
+  }
+  if (is_fixed_width(type->id())) {
+    if (type->id() == Type::DICTIONARY) {
+      return Status::NotImplemented(
+          "PreallocateFixedWidthArrayData: DICTIONARY type allocation: ", *type);
+    }
+    ARROW_ASSIGN_OR_RAISE(out->buffers[1],
+                          ctx->Allocate(length * source.type->byte_width()));
+    return Status::OK();
+  }
+  if (type->id() == Type::FIXED_SIZE_LIST) {
+    auto& fsl_type = checked_cast<const FixedSizeListType&>(*type);
+    auto& value_type = fsl_type.value_type();
+    if (ARROW_PREDICT_FALSE(value_type->id() == Type::DICTIONARY)) {
+      return Status::NotImplemented(
+          "PreallocateFixedWidthArrayData: DICTIONARY type allocation: ", *type);
+    }
+    if (source.child_data[0].MayHaveNulls()) {
+      return Status::Invalid(
+          "PreallocateFixedWidthArrayData: "
+          "FixedSizeList may have null values in child array: ",
+          fsl_type);
+    }
+    auto* child_values = out->child_data[0].get();
+    child_values->type = value_type;
+    return PreallocateFixedWidthArrayData(ctx, length * fsl_type.list_size(),
+                                          /*source=*/source.child_data[0],
+                                          /*allocate_validity=*/false,
+                                          /*out=*/child_values);
+  }
+  return Status::Invalid("PreallocateFixedWidthArrayData: Invalid type: ", *type);
+}
+
+}  // namespace internal
+
+std::pair<int, const uint8_t*> OffsetPointerOfFixedBitWidthValues(
+    const ArraySpan& source) {
+  using OffsetAndListSize = std::pair<int64_t, int64_t>;
+  auto get_offset = [](auto pair) { return pair.first; };
+  auto get_list_size = [](auto pair) { return pair.second; };
+  ::arrow::internal::SmallVector<OffsetAndListSize, 1> stack;
+
+  int64_t list_size = 1;
+  auto* array = &source;
+  while (array->type->id() == Type::FIXED_SIZE_LIST) {
+    list_size *= checked_cast<const FixedSizeListType*>(array->type)->list_size();
+    stack.emplace_back(array->offset, list_size);
+    array = &array->child_data[0];
+  }
+  // Now that innermost values were reached, pop the stack and calculate the offset
+  // in bytes of the innermost values buffer by considering the offset at each
+  // level of nesting.
+  DCHECK(is_fixed_width(*array->type));
+  DCHECK(array == &source || !array->MayHaveNulls())
+      << "OffsetPointerOfFixedWidthValues: array is expected to be flat or have no "
+         "nulls in the arrays nested by FIXED_SIZE_LIST.";
+  int64_t value_width_in_bits = array->type->bit_width();
+  int64_t offset_in_bits = array->offset * value_width_in_bits;
+  for (auto it = stack.rbegin(); it != stack.rend(); ++it) {
+    value_width_in_bits *= get_list_size(*it);
+    offset_in_bits += get_offset(*it) * value_width_in_bits;
+  }
+  DCHECK_GE(value_width_in_bits, 0);
+  const auto* values_ptr = array->GetValues<uint8_t>(1, 0);
+  return {static_cast<int>(offset_in_bits % 8), values_ptr + (offset_in_bits / 8)};
+}
+
+const uint8_t* OffsetPointerOfFixedByteWidthValues(const ArraySpan& source) {
+  DCHECK(IsFixedWidthLike(source, /*force_null_count=*/false,
+                          [](const DataType& type) { return type.id() != Type::BOOL; }));
+  return OffsetPointerOfFixedBitWidthValues(source).second;
+}
+
+/// \brief Get the mutable pointer to the fixed-width values of an array
+///        allocated by PreallocateFixedWidthArrayData.
+///
+/// \pre mutable_array->offset and the offset of child array (if it's a
+///      FixedSizeList) MUST be 0 (recursively).
+/// \pre IsFixedWidthLike(ArraySpan(mutable_array)) or the more restrictive
+///      is_fixed_width(*mutable_array->type) MUST be true
+/// \return The mutable pointer to the fixed-width byte blocks of the array. If
+///         pre-conditions are not satisfied, the return values is undefined.
+uint8_t* MutableFixedWidthValuesPointer(ArrayData* mutable_array) {
+  auto* array = mutable_array;
+  auto type_id = array->type->id();
+  while (type_id == Type::FIXED_SIZE_LIST) {
+    DCHECK_EQ(array->offset, 0);
+    DCHECK_EQ(array->child_data.size(), 1) << array->type->ToString(true) << " part of "
+                                           << mutable_array->type->ToString(true);
+    array = array->child_data[0].get();
+    type_id = array->type->id();
+  }
+  DCHECK_EQ(mutable_array->offset, 0);
+  // BOOL is allowed here only because the offset is expected to be 0,
+  // so the byte-aligned pointer also points to the first *bit* of the buffer.
+  DCHECK(is_fixed_width(type_id));
+  return array->GetMutableValues<uint8_t>(1, 0);
+}
+
+}  // namespace arrow::util
diff --git a/cpp/src/arrow/util/fixed_width_internal.h b/cpp/src/arrow/util/fixed_width_internal.h
new file mode 100644
index 0000000000000..232411f4c4a56
--- /dev/null
+++ b/cpp/src/arrow/util/fixed_width_internal.h
@@ -0,0 +1,309 @@
+// 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.
+
+#pragma once
+
+#include <cstdint>
+
+#include "arrow/array/data.h"
+#include "arrow/type.h"
+#include "arrow/type_fwd.h"
+#include "arrow/type_traits.h"
+
+namespace arrow::compute {
+// XXX: remove dependency on compute::KernelContext
+class KernelContext;
+}  // namespace arrow::compute
+
+namespace arrow::util {
+
+/// \brief Checks if the given array has a fixed-width type or if it's an array of
+/// fixed-size list that can be flattened to an array of fixed-width values.
+///
+/// Fixed-width types are the ones defined by the is_fixed_width() predicate in
+/// type_traits.h. They are all the types that passes any of the following
+/// predicates:
+///
+///  - is_primitive()
+///  - is_fixed_size_binary()
+///  - is_dictionary()
+///
+/// At least 3 types in this set require special care:
+///  - `Type::BOOL` is fixed-width, but it's a 1-bit type and pointers to first bit
+///    in boolean buffers are not always aligned to byte boundaries.
+///  - `Type::DICTIONARY` is fixed-width because the indices are fixed-width, but the
+///    dictionary values are not necessarily fixed-width and have to be managed
+///    by separate operations.
+///  - Type::FIXED_SIZE_BINARY unlike other fixed-width types, fixed-size binary
+///    values are defined by a size attribute that is not known at compile time.
+///    The other types have power-of-2 byte widths, while fixed-size binary can
+///    have any byte width including 0.
+///
+/// Additionally, we say that a type is "fixed-width like" if it's a fixed-width as
+/// defined above, or if it's a fixed-size list (or nested fixed-size lists) and
+/// the innermost type is fixed-width and the following restrictions also apply:
+///  - Only the top-level array may have nulls, all the inner array have to be completely
+///    free of nulls so we don't need to manage internal validity bitmaps.
+///
+/// \param source The array to check
+/// \param force_null_count If true, GetNullCount() is used instead of null_count
+/// \param exclude_bool_and_dictionary If true, BOOL and DICTIONARY are excluded from
+///                                    the is_fixed_width() types. Default: false.
+ARROW_EXPORT bool IsFixedWidthLike(const ArraySpan& source, bool force_null_count = false,
+                                   bool exclude_bool_and_dictionary = false);
+
+// Take the following `fixed_size_list<fixed_size_list<int32, 2>, 3>` array as an
+// example:
+//
+//     [
+//       [[1, 2], [3,  4], [ 5,  6]],
+//       null,
+//       [[7, 8], [9, 10], [11, 12]]
+//     ]
+//
+// in memory, it would look like:
+//
+//     {
+//        type: fixed_size_list<fixed_size_list<int32, 2>, 3>,
+//        length: 3,
+//        null_count: 1,
+//        offset: 0,
+//        buffers: [
+//          0: [0b00000101]
+//        ],
+//        child_data: [
+//          0: {
+//            type: fixed_size_list<int32, 2>,
+//            length: 9,
+//            null_count: 0,
+//            offset: 0,
+//            buffers: [0: NULL],
+//            child_data: [
+//              0: {
+//                type: int32,
+//                length: 18,
+//                null_count: 0,
+//                offset: 0,
+//                buffers: [
+//                  0: NULL,
+//                  1: [ 1,  2,  3,  4,  5,  6,
+//                       0,  0,  0,  0,  0,  0
+//                       7,  8,  9, 10, 11, 12 ]
+//                ],
+//                child_data: []
+//              }
+//            ]
+//          }
+//        ]
+//     }
+//
+// This layout fits the fixed-width like definition because the innermost type
+// is byte-aligned fixed-width (int32 = 4 bytes) and the internal arrays don't
+// have nulls. The validity bitmap is only needed at the top-level array.
+//
+// Writing to this array can be done in the same way writing to a flat fixed-width
+// array is done, by:
+// 1. Updating the validity bitmap at the top-level array if nulls are present.
+// 2. Updating a continuous fixed-width block of memory through a single pointer.
+//
+// The length of this block of memory is the product of the list sizes in the
+// `FixedSizeList` types and the byte width of the innermost fixed-width type:
+//
+//     3 * 2 * 4 = 24 bytes
+//
+// Writing the `[[1, 2], [3, 4], [5, 6]]` value at a given index can be done by
+// simply setting the validity bit to 1 and writing the 24-byte sequence of
+// integers `[1, 2, 3, 4, 5, 6]` to the memory block at `byte_ptr + index * 24`.
+//
+// The length of the top-level array fully defines the lengths that all the nested
+// arrays must have, which makes defining all the lengths as easy as defining the
+// length of the top-level array.
+//
+//     length = 3
+//     child_data[0].length == 3 * 3 == 9
+//     child_data[0].child_data[0].length == 3 * 3 * 2 == 18
+//
+//     child_data[0].child_data[0].buffers[1].size() >=
+//       (3 * (3 * 2 * sizeof(int32)) == 3 * 24 == 72)
+//
+// Dealing with offsets is a bit involved. Let's say the array described above has
+// the offsets 2, 5, and 7:
+//
+//     {
+//        type: fixed_size_list<fixed_size_list<int32, 2>, 3>,
+//        offset: 2,
+//        ...
+//        child_data: [
+//          0: {
+//            type: fixed_size_list<int32, 2>,
+//            offset: 5,
+//            ...
+//            child_data: [
+//              0: {
+//                type: int32,
+//                offset: 7,
+//                buffers: [
+//                  0: NULL,
+//                  1: [ 1, 1, 1, 1, 1, 1, 1,      // 7 values skipped
+//                       0,1, 0,1, 0,1, 0,1, 0,1,  // 5 [x,x] values skipped
+//
+//                       0,0,0,0,0,1,  //
+//                       0,0,0,0,0,1,  // 2 [[x,x], [x,x], [x,x]] values skipped
+//
+//                       1,  2,  3,  4,  5,  6,  //
+//                       0,  0,  0,  0,  0,  0   // the actual values
+//                       7,  8,  9, 10, 11, 12   //
+//                     ]
+//                ],
+//              }
+//            ]
+//          }
+//        ]
+//     }
+//
+// The offset of the innermost values buffer, in bytes, is calculated as:
+//
+//     ((2 * 3) + (5 * 2) + 7) * sizeof(int32) = 29 * 4 bytes = 116 bytes
+//
+// In general, the formula to calculate the offset of the innermost values buffer is:
+//
+//     ((off_0 * fsl_size_0) + (off_1 * fsl_size_1) + ... + innermost_off)
+//        * sizeof(innermost_type)
+//
+// `OffsetPointerOfFixedByteWidthValues()` can calculate this byte offset and return
+// the pointer to the first relevant byte of the innermost values buffer.
+
+/// \brief Checks if the given array has a fixed-width type or if it's an array of
+/// fixed-size list that can be flattened to an array of fixed-width values.
+///
+/// \param source The array to check
+/// \param force_null_count If true, GetNullCount() is used instead of null_count
+/// \param extra_predicate A DataType predicate that can be used to further
+///                        restrict the types that are considered fixed-width
+template <class ExtraPred>
+inline bool IsFixedWidthLike(const ArraySpan& source, bool force_null_count,
+                             ExtraPred extra_predicate) {
+  const auto* type = source.type;
+  // BOOL is considered fixed-width if not nested under FIXED_SIZE_LIST.
+  if (is_fixed_width(type->id()) && extra_predicate(*type)) {
+    return true;
+  }
+  if (type->id() == Type::FIXED_SIZE_LIST) {
+    // All the inner arrays must not contain any nulls.
+    const auto* values = &source.child_data[0];
+    while ((force_null_count ? values->GetNullCount() : values->null_count) == 0) {
+      type = values->type;
+      if (type->id() == Type::FIXED_SIZE_LIST) {
+        values = &values->child_data[0];
+        continue;
+      }
+      return is_fixed_width(type->id()) && extra_predicate(*type);
+    }
+  }
+  return false;
+}
+
+/// \brief Get the fixed-width in bytes of a type if it is a fixed-width like
+/// type, but not BOOL.
+///
+/// If the array is a FixedSizeList (of any level of nesting), the byte width of
+/// the values is the product of all fixed-list sizes and the byte width of the
+/// innermost fixed-width value type.
+///
+/// IsFixedWidthLike(array) performs more checks than this function and should
+/// be used to guarantee that, if type is not BOOL, this function will not return -1.
+///
+/// NOTE: this function translates `DataType::bit_width()` to bytes differently from
+/// `DataType::byte_width()`. `DataType::byte_width()` will return 0 for
+/// BOOL, while this function will return `-1`. This is done because 0 is
+/// a valid return value for FIXED_SIZE_LIST with size 0 or `FIXED_SIZE_BINARY` with
+/// size 0.
+///
+/// \pre The instance of the array where this type is from must pass
+///      `IsFixedWidthLike(array)` and should not be BOOL.
+/// \return The fixed-byte width of the values or -1 if the type is BOOL or not
+///         fixed-width like. 0 is a valid return value as fixed-size-lists
+///         and fixed-size-binary with size 0 are allowed.
+ARROW_EXPORT int64_t FixedWidthInBytes(const DataType& type);
+
+/// \brief Get the fixed-width in bits of a type if it is a fixed-width like
+/// type.
+///
+/// If the array is a FixedSizeList (of any level of nesting), the bit width of
+/// the values is the product of all fixed-list sizes and the bit width of the
+/// innermost fixed-width value type.
+///
+/// \return The bit-width of the values or -1
+/// \see FixedWidthInBytes
+ARROW_EXPORT int64_t FixedWidthInBits(const DataType& type);
+
+namespace internal {
+
+/// \brief Allocate an ArrayData for a type that is fixed-width like.
+///
+/// This function performs the same checks performed by
+/// `IsFixedWidthLike(source, false, false)`. If `source.type` is not a simple
+/// fixed-width type, caller should make sure it passes the
+/// `IsFixedWidthLike(source)` checks. That guarantees that it's possible to
+/// allocate an array that can serve as a destination for a kernel that writes values
+/// through a single pointer to fixed-width byte blocks.
+///
+/// \param[in] length The length of the array to allocate (unrelated to the length of
+///                   the source array)
+/// \param[in] source The source array that carries the type information and the
+///                   validity bitmaps that are relevant for the type validation
+///                   when the source is a FixedSizeList.
+/// \see IsFixedWidthLike
+ARROW_EXPORT Status PreallocateFixedWidthArrayData(::arrow::compute::KernelContext* ctx,
+                                                   int64_t length,
+                                                   const ArraySpan& source,
+                                                   bool allocate_validity,
+                                                   ArrayData* out);
+
+}  // namespace internal
+
+/// \brief Get the 0-7 residual offset in bits and the pointer to the fixed-width
+/// values of a fixed-width like array.
+///
+/// For byte-aligned types, the offset is always 0.
+///
+/// \pre `IsFixedWidthLike(source)` or the more restrictive
+///      is_fixed_width(*mutable_array->type) SHOULD be true
+/// \return A pair with the residual offset in bits (0-7) and the pointer
+///         to the fixed-width values.
+ARROW_EXPORT std::pair<int, const uint8_t*> OffsetPointerOfFixedBitWidthValues(
+    const ArraySpan& source);
+
+/// \brief Get the pointer to the fixed-width values of a fixed-width like array.
+///
+/// \pre `IsFixedWidthLike(source)` should be true and BOOL should be excluded
+///      as each bool is 1-bit width making it impossible to produce a
+///      byte-aligned pointer to the values in the general case.
+ARROW_EXPORT const uint8_t* OffsetPointerOfFixedByteWidthValues(const ArraySpan& source);
+
+/// \brief Get the mutable pointer to the fixed-width values of an array
+///        allocated by PreallocateFixedWidthArrayData.
+///
+/// \pre mutable_array->offset and the offset of child array (if it's a
+///      FixedSizeList) MUST be 0 (recursively).
+/// \pre IsFixedWidthLike(ArraySpan(mutable_array)) or the more restrictive
+///      is_fixed_width(*mutable_array->type) MUST be true
+/// \return The mutable pointer to the fixed-width byte blocks of the array. If
+///         pre-conditions are not satisfied, the return values is undefined.
+ARROW_EXPORT uint8_t* MutableFixedWidthValuesPointer(ArrayData* mutable_array);
+
+}  // namespace arrow::util
diff --git a/cpp/src/arrow/util/fixed_width_test.cc b/cpp/src/arrow/util/fixed_width_test.cc
new file mode 100644
index 0000000000000..3b35de1b6bbeb
--- /dev/null
+++ b/cpp/src/arrow/util/fixed_width_test.cc
@@ -0,0 +1,214 @@
+// 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.
+
+// #include <cmath>
+// #include <string>
+
+#include <gtest/gtest.h>
+
+#include "arrow/array/array_base.h"
+#include "arrow/array/data.h"
+#include "arrow/testing/gtest_util.h"
+#include "arrow/type.h"
+#include "arrow/util/fixed_width_internal.h"
+
+namespace arrow::util {
+
+namespace {
+bool NotBool(const DataType& type) { return type.id() != Type::BOOL; }
+bool NotInt32(const DataType& type) { return type.id() != Type::INT32; }
+}  // namespace
+
+class TestFixedWidth : public ::testing::Test {
+ protected:
+  std::shared_ptr<Array> bool_array_array_;
+  std::shared_ptr<Array> int_array_array_;
+  std::shared_ptr<Array> fsl_bool_array_;
+  std::shared_ptr<Array> fsl_int_array_;
+  std::shared_ptr<Array> fsl_int_nulls_array_;
+  std::shared_ptr<Array> fsl_int_inner_nulls_array_;
+  std::shared_ptr<Array> dict_string_array_;
+
+  std::shared_ptr<DataType> fsl(int32_t list_size,
+                                const std::shared_ptr<DataType>& value_type) {
+    return fixed_size_list(value_type, list_size);
+  }
+
+ public:
+  void SetUp() override {
+    bool_array_array_ = ArrayFromJSON(boolean(), "[true, false, null]");
+    int_array_array_ = ArrayFromJSON(int32(), "[1, 0, null]");
+    fsl_bool_array_ = ArrayFromJSON(fsl(2, boolean()), "[[true, false]]");
+    fsl_int_array_ = ArrayFromJSON(fsl(2, int32()), "[[1, 0], [2, 3]]");
+    fsl_int_nulls_array_ = ArrayFromJSON(fsl(2, int32()), "[[1, 0], null, [1, 2]]");
+    fsl_int_inner_nulls_array_ =
+        ArrayFromJSON(fsl(2, int32()), "[[1, 0], [2, 3], [null, 2]]");
+    dict_string_array_ =
+        ArrayFromJSON(dictionary(int32(), utf8()), R"(["Alice", "Bob", "Alice"])");
+  }
+};
+
+TEST_F(TestFixedWidth, IsFixedWidth) {
+  auto arr = ArraySpan{*bool_array_array_->data()};
+  // force_null_count doesn't matter because nulls at the top-level
+  // of the array are allowed by IsFixedWidthLike.
+  ASSERT_TRUE(IsFixedWidthLike(arr, /*force_null_count=*/false));
+  ASSERT_TRUE(IsFixedWidthLike(arr, /*force_null_count=*/true));
+
+  ASSERT_TRUE(IsFixedWidthLike(arr, /*force_null_count=*/false, NotInt32));
+  ASSERT_FALSE(IsFixedWidthLike(arr, /*force_null_count=*/false, NotBool));
+
+  arr = ArraySpan{*int_array_array_->data()};
+  ASSERT_TRUE(IsFixedWidthLike(arr, /*force_null_count=*/false));
+  ASSERT_TRUE(IsFixedWidthLike(arr, /*force_null_count=*/true));
+  ASSERT_TRUE(IsFixedWidthLike(arr, /*force_null_count=*/false, NotBool));
+}
+
+TEST_F(TestFixedWidth, IsFixedWidthLike) {
+  auto arr = ArraySpan{*fsl_bool_array_->data()};
+  ASSERT_TRUE(IsFixedWidthLike(arr, /*force_null_count=*/false));
+
+  arr = ArraySpan{*fsl_int_array_->data()};
+  ASSERT_TRUE(IsFixedWidthLike(arr, /*force_null_count=*/false));
+  arr.null_count = kUnknownNullCount;
+  // force_null_count=true isn't necessary because nulls at the top-level
+  // of the array are allowed by IsFixedWidthLike.
+  ASSERT_TRUE(IsFixedWidthLike(arr, /*force_null_count=*/false));
+
+  arr.child_data[0].null_count = kUnknownNullCount;
+  // inner nulls are not allowed by IsFixedWidthLike...
+  ASSERT_FALSE(IsFixedWidthLike(arr, /*force_null_count=*/false));
+  // ...but forcing null counting at on every internal array increases
+  // the chances of IsFixedWidthLike returning true.
+  ASSERT_TRUE(IsFixedWidthLike(arr, /*force_null_count=*/true));
+  // Excluding INT32 from the internal array checks.
+  ASSERT_FALSE(IsFixedWidthLike(arr, /*force_null_count=*/true, NotInt32));
+
+  arr = ArraySpan{*fsl_int_nulls_array_->data()};
+  // Nulls at the top-level of the array are allowed by IsFixedWidthLike.
+  //
+  // TODO(GH-10157): ArrayFromJSON uses FixedSizeListBuilder which currently
+  // produces nulls on the child data if one of the list-typed elements is null.
+  // ASSERT_TRUE(IsFixedWidthLike(arr, /*force_null_count=*/false));
+
+  arr = ArraySpan{*fsl_int_inner_nulls_array_->data()};
+  // Inner nulls are not allowed by IsFixedWidthLike.
+  ASSERT_FALSE(IsFixedWidthLike(arr, /*force_null_count=*/true));
+
+  arr = ArraySpan{*dict_string_array_->data()};
+  // Dictionaries are considered fixed-width by is_fixed_width(), but excluded
+  // by IsFixedWidthLike if exclude_bool_and_dictionary=true.
+  ASSERT_TRUE(IsFixedWidthLike(arr));
+  ASSERT_TRUE(IsFixedWidthLike(arr, /*force_null_count=*/false,
+                               /*exclude_bool_and_dictionary=*/false));
+  ASSERT_FALSE(IsFixedWidthLike(arr, /*force_null_count=*/false,
+                                /*exclude_bool_and_dictionary=*/true));
+}
+
+TEST_F(TestFixedWidth, MeasureWidthInBytes) {
+  auto b = boolean();
+  auto i8 = int8();
+  auto i32 = int32();
+  auto fsb = fixed_size_binary(3);
+  auto dict = dictionary(int32(), utf8());
+  auto varlen = utf8();
+  ASSERT_EQ(FixedWidthInBytes(*b), -1);
+  ASSERT_EQ(FixedWidthInBytes(*i8), 1);
+  ASSERT_EQ(FixedWidthInBytes(*i32), 4);
+  ASSERT_EQ(FixedWidthInBytes(*fsb), 3);
+  ASSERT_EQ(FixedWidthInBytes(*dict), 4);
+
+  ASSERT_EQ(FixedWidthInBytes(*varlen), -1);
+  ASSERT_EQ(FixedWidthInBytes(*varlen), -1);
+
+  ASSERT_EQ(FixedWidthInBytes(*fsl(0, b)), -1);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(3, b)), -1);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(5, b)), -1);
+
+  ASSERT_EQ(FixedWidthInBytes(*fsl(0, i8)), 0);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(3, i8)), 3);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(5, i8)), 5);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(0, i32)), 0);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(3, i32)), 3 * 4);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(5, i32)), 5 * 4);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(5, fsb)), 5 * 3);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(5, dict)), 5 * 4);
+
+  ASSERT_EQ(FixedWidthInBytes(*fsl(2, fsl(0, i8))), 0);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(2, fsl(3, i8))), 2 * 3);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(2, fsl(5, i8))), 2 * 5);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(2, fsl(0, i32))), 0);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(2, fsl(3, i32))), 2 * 3 * 4);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(2, fsl(5, i32))), 2 * 5 * 4);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(2, fsl(0, fsb))), 0);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(2, fsl(3, fsb))), 2 * 3 * 3);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(2, fsl(5, fsb))), 2 * 5 * 3);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(2, fsl(0, dict))), 0);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(2, fsl(3, dict))), 2 * 3 * 4);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(2, fsl(5, dict))), 2 * 5 * 4);
+
+  ASSERT_EQ(FixedWidthInBytes(*fsl(0, varlen)), -1);
+  ASSERT_EQ(FixedWidthInBytes(*fsl(2, varlen)), -1);
+}
+
+TEST_F(TestFixedWidth, MeasureWidthInBits) {
+  auto b = boolean();
+  auto i8 = int8();
+  auto i32 = int32();
+  auto fsb = fixed_size_binary(3);
+  auto dict = dictionary(int32(), utf8());
+  auto varlen = utf8();
+  ASSERT_EQ(FixedWidthInBits(*b), 1);
+  ASSERT_EQ(FixedWidthInBits(*i8), 8);
+  ASSERT_EQ(FixedWidthInBits(*i32), 4 * 8);
+  ASSERT_EQ(FixedWidthInBits(*fsb), 3 * 8);
+  ASSERT_EQ(FixedWidthInBits(*dict), 4 * 8);
+
+  ASSERT_EQ(FixedWidthInBits(*varlen), -1);
+  ASSERT_EQ(FixedWidthInBits(*varlen), -1);
+
+  ASSERT_EQ(FixedWidthInBits(*fsl(0, b)), 0);
+  ASSERT_EQ(FixedWidthInBits(*fsl(3, b)), 3);
+  ASSERT_EQ(FixedWidthInBits(*fsl(5, b)), 5);
+
+  ASSERT_EQ(FixedWidthInBits(*fsl(0, i8)), 0);
+  ASSERT_EQ(FixedWidthInBits(*fsl(3, i8)), 3 * 8);
+  ASSERT_EQ(FixedWidthInBits(*fsl(5, i8)), 5 * 8);
+  ASSERT_EQ(FixedWidthInBits(*fsl(0, i32)), 0);
+  ASSERT_EQ(FixedWidthInBits(*fsl(3, i32)), 4 * 3 * 8);
+  ASSERT_EQ(FixedWidthInBits(*fsl(5, i32)), 4 * 5 * 8);
+  ASSERT_EQ(FixedWidthInBits(*fsl(5, fsb)), 5 * 3 * 8);
+  ASSERT_EQ(FixedWidthInBits(*fsl(5, dict)), 5 * 4 * 8);
+
+  ASSERT_EQ(FixedWidthInBits(*fsl(2, fsl(0, i8))), 0);
+  ASSERT_EQ(FixedWidthInBits(*fsl(2, fsl(3, i8))), 2 * 3 * 8);
+  ASSERT_EQ(FixedWidthInBits(*fsl(2, fsl(5, i8))), 2 * 5 * 8);
+  ASSERT_EQ(FixedWidthInBits(*fsl(2, fsl(0, i32))), 0);
+  ASSERT_EQ(FixedWidthInBits(*fsl(2, fsl(3, i32))), 2 * 3 * 4 * 8);
+  ASSERT_EQ(FixedWidthInBits(*fsl(2, fsl(5, i32))), 2 * 5 * 4 * 8);
+  ASSERT_EQ(FixedWidthInBits(*fsl(2, fsl(0, fsb))), 0);
+  ASSERT_EQ(FixedWidthInBits(*fsl(2, fsl(3, fsb))), 2 * 3 * 3 * 8);
+  ASSERT_EQ(FixedWidthInBits(*fsl(2, fsl(5, fsb))), 2 * 5 * 3 * 8);
+  ASSERT_EQ(FixedWidthInBits(*fsl(2, fsl(0, dict))), 0);
+  ASSERT_EQ(FixedWidthInBits(*fsl(2, fsl(3, dict))), 2 * 3 * 4 * 8);
+  ASSERT_EQ(FixedWidthInBits(*fsl(2, fsl(5, dict))), 2 * 5 * 4 * 8);
+
+  ASSERT_EQ(FixedWidthInBits(*fsl(0, varlen)), -1);
+  ASSERT_EQ(FixedWidthInBits(*fsl(2, varlen)), -1);
+}
+
+}  // namespace arrow::util
diff --git a/cpp/src/arrow/util/formatting.cc b/cpp/src/arrow/util/formatting.cc
index c16d42ce5cfe2..c5a7e03f8573a 100644
--- a/cpp/src/arrow/util/formatting.cc
+++ b/cpp/src/arrow/util/formatting.cc
@@ -18,10 +18,12 @@
 #include "arrow/util/formatting.h"
 #include "arrow/util/config.h"
 #include "arrow/util/double_conversion.h"
+#include "arrow/util/float16.h"
 #include "arrow/util/logging.h"
 
 namespace arrow {
 
+using util::Float16;
 using util::double_conversion::DoubleToStringConverter;
 
 static constexpr int kMinBufferSize = DoubleToStringConverter::kBase10MaximalLength + 1;
@@ -87,5 +89,14 @@ int FloatToStringFormatter::FormatFloat(double v, char* out_buffer, int out_size
   return builder.position();
 }
 
+int FloatToStringFormatter::FormatFloat(uint16_t v, char* out_buffer, int out_size) {
+  DCHECK_GE(out_size, kMinBufferSize);
+  util::double_conversion::StringBuilder builder(out_buffer, out_size);
+  bool result = impl_->converter_.ToShortest(Float16::FromBits(v).ToFloat(), &builder);
+  DCHECK(result);
+  ARROW_UNUSED(result);
+  return builder.position();
+}
+
 }  // namespace internal
 }  // namespace arrow
diff --git a/cpp/src/arrow/util/formatting.h b/cpp/src/arrow/util/formatting.h
index 71bae74629e35..dd9af907ecc37 100644
--- a/cpp/src/arrow/util/formatting.h
+++ b/cpp/src/arrow/util/formatting.h
@@ -126,8 +126,10 @@ namespace detail {
 ARROW_EXPORT extern const char digit_pairs[];
 
 // Based on fmtlib's format_int class:
-// Write digits from right to left into a stack allocated buffer
-inline void FormatOneChar(char c, char** cursor) { *--*cursor = c; }
+// Write digits from right to left into a stack allocated buffer.
+// \pre *cursor points to the byte after the one that will be written.
+// \post *cursor points to the byte that was written.
+inline void FormatOneChar(char c, char** cursor) { *(--(*cursor)) = c; }
 
 template <typename Int>
 void FormatOneDigit(Int value, char** cursor) {
@@ -268,6 +270,7 @@ class ARROW_EXPORT FloatToStringFormatter {
   // Returns the number of characters written
   int FormatFloat(float v, char* out_buffer, int out_size);
   int FormatFloat(double v, char* out_buffer, int out_size);
+  int FormatFloat(uint16_t v, char* out_buffer, int out_size);
 
  protected:
   struct Impl;
@@ -301,6 +304,12 @@ class FloatToStringFormatterMixin : public FloatToStringFormatter {
   }
 };
 
+template <>
+class StringFormatter<HalfFloatType> : public FloatToStringFormatterMixin<HalfFloatType> {
+ public:
+  using FloatToStringFormatterMixin::FloatToStringFormatterMixin;
+};
+
 template <>
 class StringFormatter<FloatType> : public FloatToStringFormatterMixin<FloatType> {
  public:
@@ -319,6 +328,7 @@ class StringFormatter<DoubleType> : public FloatToStringFormatterMixin<DoubleTyp
 namespace detail {
 
 constexpr size_t BufferSizeYYYY_MM_DD() {
+  // "-"? "99999-12-31"
   return 1 + detail::Digits10(99999) + 1 + detail::Digits10(12) + 1 +
          detail::Digits10(31);
 }
@@ -345,6 +355,7 @@ inline void FormatYYYY_MM_DD(arrow_vendored::date::year_month_day ymd, char** cu
 
 template <typename Duration>
 constexpr size_t BufferSizeHH_MM_SS() {
+  // "23:59:59" ("." "9"+)?
   return detail::Digits10(23) + 1 + detail::Digits10(59) + 1 + detail::Digits10(59) + 1 +
          detail::Digits10(Duration::period::den) - 1;
 }
@@ -498,8 +509,9 @@ class StringFormatter<TimestampType> {
       timepoint_days -= days(1);
     }
 
+    // YYYY_MM_DD " " HH_MM_SS "Z"?
     constexpr size_t buffer_size =
-        detail::BufferSizeYYYY_MM_DD() + 1 + detail::BufferSizeHH_MM_SS<Duration>();
+        detail::BufferSizeYYYY_MM_DD() + 1 + detail::BufferSizeHH_MM_SS<Duration>() + 1;
 
     std::array<char, buffer_size> buffer;
     char* cursor = buffer.data() + buffer_size;
diff --git a/cpp/src/arrow/util/formatting_util_test.cc b/cpp/src/arrow/util/formatting_util_test.cc
index 13f57a495d639..f5ae789b23651 100644
--- a/cpp/src/arrow/util/formatting_util_test.cc
+++ b/cpp/src/arrow/util/formatting_util_test.cc
@@ -26,11 +26,13 @@
 #include "arrow/testing/gtest_util.h"
 #include "arrow/type.h"
 #include "arrow/util/decimal.h"
+#include "arrow/util/float16.h"
 #include "arrow/util/formatting.h"
 
 namespace arrow {
 
 using internal::StringFormatter;
+using util::Float16;
 
 class StringAppender {
  public:
@@ -280,6 +282,32 @@ TEST(Formatting, Double) {
   AssertFormatting(formatter, -HUGE_VAL, "-inf");
 }
 
+TEST(Formatting, HalfFloat) {
+  StringFormatter<HalfFloatType> formatter;
+
+  AssertFormatting(formatter, Float16(0.0f).bits(), "0");
+  AssertFormatting(formatter, Float16(-0.0f).bits(), "-0");
+  AssertFormatting(formatter, Float16(1.5f).bits(), "1.5");
+
+  // Slightly adapted from values present here
+  // https://blogs.mathworks.com/cleve/2017/05/08/half-precision-16-bit-floating-point-arithmetic/
+  AssertFormatting(formatter, 0x3c00, "1");
+  AssertFormatting(formatter, 0x3c01, "1.0009765625");
+  AssertFormatting(formatter, 0x0400, "0.00006103515625");
+  AssertFormatting(formatter, 0x0001, "5.960464477539063e-8");
+
+  // Can't avoid loss of precision here.
+  AssertFormatting(formatter, Float16(1234.567f).bits(), "1235");
+  AssertFormatting(formatter, Float16(1e3f).bits(), "1000");
+  AssertFormatting(formatter, Float16(1e4f).bits(), "10000");
+  AssertFormatting(formatter, Float16(1e10f).bits(), "inf");
+  AssertFormatting(formatter, Float16(1e15f).bits(), "inf");
+
+  AssertFormatting(formatter, 0xffff, "nan");
+  AssertFormatting(formatter, 0x7c00, "inf");
+  AssertFormatting(formatter, 0xfc00, "-inf");
+}
+
 template <typename T>
 void TestDecimalFormatter() {
   struct TestParam {
@@ -533,6 +561,14 @@ TEST(Formatting, Timestamp) {
     }
   }
 
+  {
+    constexpr int64_t kMillisInDay = 24 * 60 * 60 * 1000;
+    auto ty = timestamp(TimeUnit::MILLI, "+01:00");
+    StringFormatter<TimestampType> formatter(ty.get());
+    AssertFormatting(formatter, -15000 * 365 * kMillisInDay + 1,
+                     "-13021-12-17 00:00:00.001Z");
+  }
+
   {
     auto ty = timestamp(TimeUnit::MILLI, "Pacific/Maruesas");
     StringFormatter<TimestampType> formatter(ty.get());
diff --git a/cpp/src/arrow/util/future.cc b/cpp/src/arrow/util/future.cc
index a5426f949e721..60687172fe8d7 100644
--- a/cpp/src/arrow/util/future.cc
+++ b/cpp/src/arrow/util/future.cc
@@ -212,7 +212,7 @@ std::unique_ptr<FutureImpl> FutureImpl::Make() {
 std::unique_ptr<FutureImpl> FutureImpl::MakeFinished(FutureState state) {
   std::unique_ptr<ConcreteFutureImpl> ptr(new ConcreteFutureImpl());
   ptr->state_ = state;
-  return std::move(ptr);
+  return ptr;
 }
 
 FutureImpl::FutureImpl() : state_(FutureState::PENDING) {}
diff --git a/cpp/src/arrow/util/future.h b/cpp/src/arrow/util/future.h
index 283b581a5100a..0aa2842703712 100644
--- a/cpp/src/arrow/util/future.h
+++ b/cpp/src/arrow/util/future.h
@@ -871,7 +871,7 @@ Future<T> ToFuture(Result<T> maybe_value) {
 
 template <typename T>
 Future<T> ToFuture(Future<T> fut) {
-  return std::move(fut);
+  return fut;
 }
 
 template <typename T>
diff --git a/cpp/src/arrow/util/future_test.cc b/cpp/src/arrow/util/future_test.cc
index 87891e48efa5e..2ed2b69aed524 100644
--- a/cpp/src/arrow/util/future_test.cc
+++ b/cpp/src/arrow/util/future_test.cc
@@ -415,6 +415,10 @@ TEST(FutureRefTest, HeadRemoved) {
 }
 
 TEST(FutureStressTest, Callback) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
 #ifdef ARROW_VALGRIND
   const int NITERS = 2;
 #else
@@ -471,6 +475,10 @@ TEST(FutureStressTest, Callback) {
 }
 
 TEST(FutureStressTest, TryAddCallback) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   for (unsigned int n = 0; n < 1; n++) {
     auto fut = Future<>::Make();
     std::atomic<unsigned int> callbacks_added(0);
@@ -527,6 +535,10 @@ TEST(FutureStressTest, TryAddCallback) {
 }
 
 TEST(FutureStressTest, DeleteAfterWait) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   constexpr int kNumTasks = 100;
   for (int i = 0; i < kNumTasks; i++) {
     {
@@ -1543,6 +1555,10 @@ TEST(FnOnceTest, MoveOnlyDataType) {
 }
 
 TEST(FutureTest, MatcherExamples) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   EXPECT_THAT(Future<int>::MakeFinished(Status::Invalid("arbitrary error")),
               Finishes(Raises(StatusCode::Invalid)));
 
diff --git a/cpp/src/arrow/util/io_util.cc b/cpp/src/arrow/util/io_util.cc
index 5928ebcb88959..2eefe96f0d5c4 100644
--- a/cpp/src/arrow/util/io_util.cc
+++ b/cpp/src/arrow/util/io_util.cc
@@ -95,6 +95,7 @@
 #include "arrow/result.h"
 #include "arrow/util/atfork_internal.h"
 #include "arrow/util/checked_cast.h"
+#include "arrow/util/config.h"
 #include "arrow/util/io_util.h"
 #include "arrow/util/logging.h"
 #include "arrow/util/mutex.h"
@@ -1083,7 +1084,7 @@ Result<FileDescriptor> FileOpenReadable(const PlatformFilename& file_name) {
   }
 #endif
 
-  return std::move(fd);
+  return fd;
 }
 
 Result<FileDescriptor> FileOpenWritable(const PlatformFilename& file_name,
@@ -1147,7 +1148,7 @@ Result<FileDescriptor> FileOpenWritable(const PlatformFilename& file_name,
     // Seek to end, as O_APPEND does not necessarily do it
     RETURN_NOT_OK(lseek64_compat(fd.fd(), 0, SEEK_END));
   }
-  return std::move(fd);
+  return fd;
 }
 
 Result<int64_t> FileTell(int fd) {
@@ -1485,6 +1486,7 @@ Status MemoryMapRemap(void* addr, size_t old_size, size_t new_size, int fildes,
 }
 
 Status MemoryAdviseWillNeed(const std::vector<MemoryRegion>& regions) {
+#ifndef __EMSCRIPTEN__
   const auto page_size = static_cast<size_t>(GetPageSize());
   DCHECK_GT(page_size, 0);
   const size_t page_mask = ~(page_size - 1);
@@ -1543,6 +1545,9 @@ Status MemoryAdviseWillNeed(const std::vector<MemoryRegion>& regions) {
 #else
   return Status::OK();
 #endif
+#else
+  return Status::OK();
+#endif
 }
 
 //
@@ -1962,7 +1967,7 @@ Result<std::unique_ptr<TemporaryDir>> TemporaryDir::Make(const std::string& pref
   for (const auto& base_dir : base_dirs) {
     ARROW_ASSIGN_OR_RAISE(auto ptr, TryCreatingDirectory(base_dir));
     if (ptr) {
-      return std::move(ptr);
+      return ptr;
     }
     // Cannot create in this directory, try the next one
   }
@@ -2067,7 +2072,9 @@ Status SendSignal(int signum) {
 }
 
 Status SendSignalToThread(int signum, uint64_t thread_id) {
-#ifdef _WIN32
+#ifndef ARROW_ENABLE_THREADING
+  return Status::NotImplemented("Can't send signal with no threads");
+#elif defined(_WIN32)
   return Status::NotImplemented("Cannot send signal to specific thread on Windows");
 #else
   // Have to use a C-style cast because pthread_t can be a pointer *or* integer type
diff --git a/cpp/src/arrow/util/io_util_test.cc b/cpp/src/arrow/util/io_util_test.cc
index d0569c799561f..73213bf9ce48a 100644
--- a/cpp/src/arrow/util/io_util_test.cc
+++ b/cpp/src/arrow/util/io_util_test.cc
@@ -40,6 +40,7 @@
 #include "arrow/buffer.h"
 #include "arrow/testing/gtest_util.h"
 #include "arrow/util/bit_util.h"
+#include "arrow/util/config.h"
 #include "arrow/util/cpu_info.h"
 #include "arrow/util/io_util.h"
 #include "arrow/util/logging.h"
@@ -146,8 +147,8 @@ TEST(MemoryAdviseWillNeed, Basics) {
   ASSERT_OK(MemoryAdviseWillNeed({{addr1, 0}, {addr2 + 1, 0}}));
 
   // Should probably fail
-  // (but on Windows, MemoryAdviseWillNeed can be a no-op)
-#ifndef _WIN32
+  // (but on Windows or Emscripten, MemoryAdviseWillNeed can be a no-op)
+#if !defined(_WIN32) && !defined(__EMSCRIPTEN__)
   ASSERT_RAISES(IOError,
                 MemoryAdviseWillNeed({{nullptr, std::numeric_limits<size_t>::max()}}));
 #endif
@@ -368,6 +369,10 @@ TestSelfPipe* TestSelfPipe::instance_;
 TEST_F(TestSelfPipe, MakeAndShutdown) {}
 
 TEST_F(TestSelfPipe, WaitAndSend) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   StartReading();
   SleepABit();
   AssertPayloadsEventually({});
@@ -380,6 +385,10 @@ TEST_F(TestSelfPipe, WaitAndSend) {
 }
 
 TEST_F(TestSelfPipe, SendAndWait) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   self_pipe_->Send(123456789123456789ULL);
   StartReading();
   SleepABit();
@@ -390,6 +399,10 @@ TEST_F(TestSelfPipe, SendAndWait) {
 }
 
 TEST_F(TestSelfPipe, WaitAndShutdown) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   StartReading();
   SleepABit();
   ASSERT_OK(self_pipe_->Shutdown());
@@ -401,6 +414,9 @@ TEST_F(TestSelfPipe, WaitAndShutdown) {
 }
 
 TEST_F(TestSelfPipe, ShutdownAndWait) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
   self_pipe_->Send(123456789123456789ULL);
   ASSERT_OK(self_pipe_->Shutdown());
   StartReading();
@@ -413,6 +429,10 @@ TEST_F(TestSelfPipe, ShutdownAndWait) {
 }
 
 TEST_F(TestSelfPipe, WaitAndSendFromSignal) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   signal_received_.store(0);
   SignalHandlerGuard guard(SIGINT, &HandleSignal);
 
@@ -431,6 +451,10 @@ TEST_F(TestSelfPipe, WaitAndSendFromSignal) {
 }
 
 TEST_F(TestSelfPipe, SendFromSignalAndWait) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   signal_received_.store(0);
   SignalHandlerGuard guard(SIGINT, &HandleSignal);
 
@@ -450,6 +474,10 @@ TEST_F(TestSelfPipe, SendFromSignalAndWait) {
 #if !(defined(_WIN32) || defined(ARROW_VALGRIND) || defined(ADDRESS_SANITIZER) || \
       defined(THREAD_SANITIZER))
 TEST_F(TestSelfPipe, ForkSafety) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "Test requires threading support";
+#endif
+
   self_pipe_->Send(123456789123456789ULL);
 
   auto child_pid = fork();
@@ -1025,6 +1053,9 @@ TEST_F(TestSendSignal, Generic) {
 }
 
 TEST_F(TestSendSignal, ToThread) {
+#ifndef ARROW_ENABLE_THREADING
+  GTEST_SKIP() << "SendSignalToThread requires threading";
+#endif
 #ifdef _WIN32
   uint64_t dummy_thread_id = 42;
   ASSERT_RAISES(NotImplemented, SendSignalToThread(SIGINT, dummy_thread_id));
diff --git a/cpp/src/arrow/util/iterator.h b/cpp/src/arrow/util/iterator.h
index 5e716d0fd113d..5025799b9a372 100644
--- a/cpp/src/arrow/util/iterator.h
+++ b/cpp/src/arrow/util/iterator.h
@@ -105,9 +105,18 @@ class Iterator : public util::EqualityComparable<Iterator<T>> {
   Iterator() : ptr_(NULLPTR, [](void*) {}) {}
 
   /// \brief Return the next element of the sequence, IterationTraits<T>::End() when the
-  /// iteration is completed. Calling this on a default constructed Iterator
-  /// will result in undefined behavior.
-  Result<T> Next() { return next_(ptr_.get()); }
+  /// iteration is completed.
+  Result<T> Next() {
+    if (ptr_) {
+      auto next_result = next_(ptr_.get());
+      if (next_result.ok() && IsIterationEnd(next_result.ValueUnsafe())) {
+        ptr_.reset(NULLPTR);
+      }
+      return next_result;
+    } else {
+      return IterationTraits<T>::End();
+    }
+  }
 
   /// Pass each element of the sequence to a visitor. Will return any error status
   /// returned by the visitor, terminating iteration.
@@ -180,9 +189,7 @@ class Iterator : public util::EqualityComparable<Iterator<T>> {
       ARROW_ASSIGN_OR_RAISE(auto element, maybe_element);
       out.push_back(std::move(element));
     }
-    // ARROW-8193: On gcc-4.8 without the explicit move it tries to use the
-    // copy constructor, which may be deleted on the elements of type T
-    return std::move(out);
+    return out;
   }
 
  private:
diff --git a/cpp/src/arrow/util/iterator_test.cc b/cpp/src/arrow/util/iterator_test.cc
index ba21ddcced209..a247ba13aef73 100644
--- a/cpp/src/arrow/util/iterator_test.cc
+++ b/cpp/src/arrow/util/iterator_test.cc
@@ -146,6 +146,49 @@ void AssertIteratorNext(T expected, Iterator<T>& it) {
   ASSERT_EQ(expected, actual);
 }
 
+template <typename T>
+class DeleteDetectableIterator {
+ public:
+  explicit DeleteDetectableIterator(std::vector<T> values, bool* deleted)
+      : values_(std::move(values)), i_(0), deleted_(deleted) {}
+
+  DeleteDetectableIterator(DeleteDetectableIterator&& source)
+      : values_(std::move(source.values_)), i_(source.i_), deleted_(source.deleted_) {
+    source.deleted_ = nullptr;
+  }
+
+  ~DeleteDetectableIterator() {
+    if (deleted_) {
+      *deleted_ = true;
+    }
+  }
+
+  Result<T> Next() {
+    if (i_ == values_.size()) {
+      return IterationTraits<T>::End();
+    }
+    return std::move(values_[i_++]);
+  }
+
+ private:
+  std::vector<T> values_;
+  size_t i_;
+  bool* deleted_;
+};
+
+// Generic iterator tests
+
+TEST(TestIterator, DeleteOnEnd) {
+  bool deleted = false;
+  Iterator<TestInt> it(DeleteDetectableIterator<TestInt>({1}, &deleted));
+  ASSERT_FALSE(deleted);
+  AssertIteratorNext({1}, it);
+  ASSERT_FALSE(deleted);
+  ASSERT_OK_AND_ASSIGN(auto value, it.Next());
+  ASSERT_TRUE(IsIterationEnd(value));
+  ASSERT_TRUE(deleted);
+}
+
 // --------------------------------------------------------------------
 // Synchronous iterator tests
 
diff --git a/cpp/src/arrow/util/logger.cc b/cpp/src/arrow/util/logger.cc
new file mode 100644
index 0000000000000..35269710f899b
--- /dev/null
+++ b/cpp/src/arrow/util/logger.cc
@@ -0,0 +1,198 @@
+// 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.
+
+#include <iostream>
+#include <mutex>
+#include <sstream>
+#include <unordered_map>
+
+#include "arrow/util/logger.h"
+
+namespace arrow {
+namespace util {
+
+namespace {
+
+class NoopLogger : public Logger {
+ public:
+  void Log(const LogDetails&) override {}
+  bool is_enabled() const override { return false; }
+};
+
+class SimpleLogger : public Logger {
+ public:
+  SimpleLogger(ArrowLogLevel severity_threshold, std::ostream* sink)
+      : severity_threshold_(severity_threshold), sink_(sink) {}
+
+  void Log(const LogDetails& details) override {
+    *sink_ << details.source_location.file << ":" << details.source_location.line << ": "
+           << std::string(details.message) << std::endl;
+  }
+
+  bool Flush(std::chrono::microseconds) override {
+    sink_->flush();
+    return true;
+  }
+
+  bool is_enabled() const override { return true; }
+
+  ArrowLogLevel severity_threshold() const override { return severity_threshold_; }
+
+ private:
+  ArrowLogLevel severity_threshold_;
+  std::ostream* sink_;
+};
+
+using LoggerMap = std::unordered_map<std::string, std::shared_ptr<Logger>>;
+
+struct RegistryImpl {
+  LoggerMap loggers;
+  std::shared_ptr<Logger> default_logger = MakeOStreamLogger(ArrowLogLevel::ARROW_INFO);
+  std::mutex mtx;
+};
+
+RegistryImpl* GetRegistry() {
+  static auto instance = std::make_unique<RegistryImpl>();
+  return instance.get();
+}
+
+}  // namespace
+
+std::shared_ptr<Logger> MakeOStreamLogger(ArrowLogLevel severity_threshold,
+                                          std::ostream& sink) {
+  return std::make_shared<SimpleLogger>(severity_threshold, &sink);
+}
+std::shared_ptr<Logger> MakeOStreamLogger(ArrowLogLevel severity_threshold) {
+  return MakeOStreamLogger(severity_threshold, std::cerr);
+}
+
+Status LoggerRegistry::RegisterLogger(std::string_view name,
+                                      std::shared_ptr<Logger> logger) {
+  DCHECK_NE(logger, nullptr);
+  auto registry = GetRegistry();
+
+  std::lock_guard<std::mutex> lk(registry->mtx);
+  auto ret = registry->loggers.emplace(name, std::move(logger));
+  ARROW_RETURN_IF(!ret.second, Status::Invalid("Logger with name \"", std::string(name),
+                                               "\" is already registered"));
+  return Status::OK();
+}
+
+void LoggerRegistry::UnregisterLogger(std::string_view name) {
+  auto registry = GetRegistry();
+  std::lock_guard<std::mutex> lk(registry->mtx);
+  registry->loggers.erase(std::string(name));
+}
+
+std::shared_ptr<Logger> LoggerRegistry::GetLogger(std::string_view name) {
+  if (name.empty()) {
+    return GetDefaultLogger();
+  }
+
+  auto registry = GetRegistry();
+  {
+    std::lock_guard<std::mutex> lk(registry->mtx);
+    const auto& loggers = registry->loggers;
+    if (auto it = loggers.find(std::string(name)); it != loggers.end()) {
+      return it->second;
+    }
+  }
+  return std::make_shared<NoopLogger>();
+}
+
+std::shared_ptr<Logger> LoggerRegistry::GetDefaultLogger() {
+  auto registry = GetRegistry();
+  std::lock_guard<std::mutex> lk(registry->mtx);
+  return registry->default_logger;
+}
+
+void LoggerRegistry::SetDefaultLogger(std::shared_ptr<Logger> logger) {
+  DCHECK_NE(logger, nullptr);
+  auto registry = GetRegistry();
+  std::lock_guard<std::mutex> lk(registry->mtx);
+  registry->default_logger = std::move(logger);
+}
+
+class LogMessage::Impl {
+ public:
+  Impl(ArrowLogLevel severity, SourceLocation source_location) {
+    details.severity = severity;
+    details.source_location = source_location;
+  }
+  Impl(ArrowLogLevel severity, std::shared_ptr<Logger> logger,
+       SourceLocation source_location)
+      : Impl(severity, source_location) {
+    logger_ = std::move(logger);
+  }
+  Impl(ArrowLogLevel severity, std::string logger_name, SourceLocation source_location)
+      : Impl(severity, source_location) {
+    this->logger_name = std::move(logger_name);
+  }
+
+  ~Impl() {
+    auto* logger = GetResolvedLogger();
+
+    if (logger && logger->is_enabled() &&
+        details.severity >= logger->severity_threshold()) {
+      auto str = stream.str();
+      details.message = str;
+      logger->Log(details);
+    }
+
+    // It's debatable whether this should be the underlying logger's responsibility
+    if (details.severity == ArrowLogLevel::ARROW_FATAL) {
+      if (logger) {
+        logger->Flush();
+      }
+      std::abort();
+    }
+  }
+
+  Logger* GetResolvedLogger() {
+    if (!logger_) {
+      logger_ = LoggerRegistry::GetLogger(logger_name);
+    }
+    return logger_.get();
+  }
+
+  LogDetails details{};
+  std::string logger_name;
+  std::stringstream stream;
+
+ private:
+  std::shared_ptr<Logger> logger_;
+};
+
+LogMessage::LogMessage(ArrowLogLevel severity, std::shared_ptr<Logger> logger,
+                       SourceLocation source_location)
+    : impl_(std::make_shared<Impl>(severity, std::move(logger), source_location)) {}
+
+LogMessage::LogMessage(ArrowLogLevel severity, std::string_view logger_name,
+                       SourceLocation source_location)
+    : impl_(std::make_shared<Impl>(severity, std::string(logger_name), source_location)) {
+}
+
+std::ostream& LogMessage::Stream() { return impl_->stream; }
+
+bool LogMessage::CheckIsEnabled() {
+  auto* logger = impl_->GetResolvedLogger();
+  return (logger && logger->is_enabled() &&
+          impl_->details.severity >= logger->severity_threshold());
+}
+
+}  // namespace util
+}  // namespace arrow
diff --git a/cpp/src/arrow/util/logger.h b/cpp/src/arrow/util/logger.h
new file mode 100644
index 0000000000000..5200503bb4fdb
--- /dev/null
+++ b/cpp/src/arrow/util/logger.h
@@ -0,0 +1,186 @@
+// 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.
+
+#pragma once
+
+#include <chrono>
+#include <iosfwd>
+#include <memory>
+#include <string_view>
+
+#include "arrow/result.h"
+#include "arrow/status.h"
+#include "arrow/util/logging.h"
+#include "arrow/util/macros.h"
+#include "arrow/util/visibility.h"
+
+namespace arrow {
+namespace util {
+
+struct SourceLocation {
+  const char* file = "";
+  int line = 0;
+};
+
+struct LogDetails {
+  ArrowLogLevel severity = ArrowLogLevel::ARROW_INFO;
+  std::chrono::system_clock::time_point timestamp = std::chrono::system_clock::now();
+  SourceLocation source_location{};
+  std::string_view message = "";
+};
+
+/// \brief A base interface for custom loggers.
+///
+/// Loggers can be added to the LoggerRegistry for global access or directly provided to
+/// certain logging utilities.
+class Logger {
+ public:
+  virtual ~Logger() = default;
+
+  virtual void Log(const LogDetails& details) = 0;
+
+  virtual bool Flush(std::chrono::microseconds timeout) { return true; }
+  bool Flush() { return this->Flush(std::chrono::microseconds::max()); }
+
+  virtual bool is_enabled() const { return true; }
+
+  virtual ArrowLogLevel severity_threshold() const { return ArrowLogLevel::ARROW_TRACE; }
+};
+
+/// \brief Creates a simple logger that redirects output to std::cerr
+ARROW_EXPORT std::shared_ptr<Logger> MakeOStreamLogger(ArrowLogLevel severity_threshold);
+/// \brief Creates a simple logger that redirects output to the provided ostream
+ARROW_EXPORT std::shared_ptr<Logger> MakeOStreamLogger(ArrowLogLevel severity_threshold,
+                                                       std::ostream& sink);
+
+class ARROW_EXPORT LoggerRegistry {
+ public:
+  /// \brief Add a logger to the registry with the associated name
+  ///
+  /// Returns Invalid if a logger with the provided name already exists. Users should call
+  /// `UnregisterLogger` first if they wish to overwrite it.
+  static Status RegisterLogger(std::string_view name, std::shared_ptr<Logger> logger);
+
+  /// \brief Remove a logger from the registry
+  static void UnregisterLogger(std::string_view name);
+
+  /// \brief Return the logger associated with the provided name
+  ///
+  /// If `name` is empty, the default logger is returned. If `name` doesn't match any of
+  /// the registered loggers then a non-null noop logger is returned
+  static std::shared_ptr<Logger> GetLogger(std::string_view name = "");
+
+  /// \brief Return the default logger
+  static std::shared_ptr<Logger> GetDefaultLogger();
+  /// \brief Set the default logger
+  static void SetDefaultLogger(std::shared_ptr<Logger> logger);
+};
+
+/// \brief Represents a single log record to be emitted by an underlying logger
+class ARROW_EXPORT LogMessage {
+ public:
+  /// \brief Construct a LogMessage with the provided underlying logger
+  LogMessage(ArrowLogLevel severity, std::shared_ptr<Logger> logger,
+             SourceLocation source_location = {});
+  /// \brief Construct a LogMessage with the provided logger name, which will be used to
+  /// find an underlying logger in the registry
+  LogMessage(ArrowLogLevel severity, std::string_view logger_name,
+             SourceLocation source_location = {});
+
+  std::ostream& Stream();
+
+  // Convenience method - mainly for use in ARROW_LOG_* macros. This prevents unnecessary
+  // argument evaluation when log statements are stripped in certain builds
+  template <typename... Args>
+  LogMessage& Append(Args&&... args) {
+    if constexpr (sizeof...(Args) > 0) {
+      if (CheckIsEnabled()) {
+        (Stream() << ... << args);
+      }
+    }
+    return *this;
+  }
+
+ private:
+  bool CheckIsEnabled();
+
+  class Impl;
+  std::shared_ptr<Impl> impl_;
+};
+
+}  // namespace util
+}  // namespace arrow
+
+// For the following macros, log statements with a lower severity than
+// `ARROW_MINIMUM_LOG_LEVEL` will be stripped from the build
+#ifndef ARROW_MINIMUM_LOG_LEVEL
+#define ARROW_MINIMUM_LOG_LEVEL -1000
+#endif
+
+#define ARROW_LOGGER_INTERNAL(LOGGER, LEVEL)                                      \
+  (::arrow::util::LogMessage(::arrow::util::ArrowLogLevel::ARROW_##LEVEL, LOGGER, \
+                             ::arrow::util::SourceLocation{__FILE__, __LINE__}))
+
+static_assert(static_cast<int>(::arrow::util::ArrowLogLevel::ARROW_TRACE) == -2);
+#if ARROW_MINIMUM_LOG_LEVEL <= -2
+#define ARROW_LOGGER_TRACE(LOGGER, ...) \
+  (ARROW_LOGGER_INTERNAL(LOGGER, TRACE).Append(__VA_ARGS__))
+#else
+#define ARROW_LOGGER_TRACE(...) ARROW_UNUSED(0)
+#endif
+
+static_assert(static_cast<int>(::arrow::util::ArrowLogLevel::ARROW_DEBUG) == -1);
+#if ARROW_MINIMUM_LOG_LEVEL <= -1
+#define ARROW_LOGGER_DEBUG(LOGGER, ...) \
+  (ARROW_LOGGER_INTERNAL(LOGGER, DEBUG).Append(__VA_ARGS__))
+#else
+#define ARROW_LOGGER_DEBUG(...) ARROW_UNUSED(0)
+#endif
+
+static_assert(static_cast<int>(::arrow::util::ArrowLogLevel::ARROW_INFO) == 0);
+#if ARROW_MINIMUM_LOG_LEVEL <= 0
+#define ARROW_LOGGER_INFO(LOGGER, ...) \
+  (ARROW_LOGGER_INTERNAL(LOGGER, INFO).Append(__VA_ARGS__))
+#else
+#define ARROW_LOGGER_INFO(...) ARROW_UNUSED(0)
+#endif
+
+static_assert(static_cast<int>(::arrow::util::ArrowLogLevel::ARROW_WARNING) == 1);
+#if ARROW_MINIMUM_LOG_LEVEL <= 1
+#define ARROW_LOGGER_WARNING(LOGGER, ...) \
+  (ARROW_LOGGER_INTERNAL(LOGGER, WARNING).Append(__VA_ARGS__))
+#else
+#define ARROW_LOGGER_WARNING(...) ARROW_UNUSED(0)
+#endif
+
+static_assert(static_cast<int>(::arrow::util::ArrowLogLevel::ARROW_ERROR) == 2);
+#if ARROW_MINIMUM_LOG_LEVEL <= 2
+#define ARROW_LOGGER_ERROR(LOGGER, ...) \
+  (ARROW_LOGGER_INTERNAL(LOGGER, ERROR).Append(__VA_ARGS__))
+#else
+#define ARROW_LOGGER_ERROR(...) ARROW_UNUSED(0)
+#endif
+
+static_assert(static_cast<int>(::arrow::util::ArrowLogLevel::ARROW_FATAL) == 3);
+#if ARROW_MINIMUM_LOG_LEVEL <= 3
+#define ARROW_LOGGER_FATAL(LOGGER, ...) \
+  (ARROW_LOGGER_INTERNAL(LOGGER, FATAL).Append(__VA_ARGS__))
+#else
+#define ARROW_LOGGER_FATAL(...) ARROW_UNUSED(0)
+#endif
+
+#define ARROW_LOGGER_CALL(LOGGER, LEVEL, ...) ARROW_LOGGER_##LEVEL(LOGGER, __VA_ARGS__)
diff --git a/cpp/src/arrow/util/logger_test.cc b/cpp/src/arrow/util/logger_test.cc
new file mode 100644
index 0000000000000..0faea81a598fd
--- /dev/null
+++ b/cpp/src/arrow/util/logger_test.cc
@@ -0,0 +1,140 @@
+// 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.
+
+#include <functional>
+#include <vector>
+
+#include <gtest/gtest.h>
+
+#include "arrow/testing/gtest_util.h"
+#include "arrow/util/logger.h"
+
+// Emit log via the default logger
+#define DO_LOG(LEVEL, ...) ARROW_LOGGER_CALL("", LEVEL, __VA_ARGS__)
+
+namespace arrow {
+namespace util {
+
+namespace {
+
+class MockLogger : public Logger {
+ public:
+  explicit MockLogger(ArrowLogLevel threshold = ArrowLogLevel::ARROW_TRACE)
+      : threshold(threshold) {}
+  void Log(const LogDetails& details) override {
+    if (callback) {
+      callback(details);
+    }
+  }
+  ArrowLogLevel severity_threshold() const override { return threshold; }
+  bool is_enabled() const override { return enabled; }
+
+  ArrowLogLevel threshold;
+  bool enabled = true;
+  std::function<void(const LogDetails&)> callback;
+};
+
+struct OstreamableTracer {
+  mutable bool was_evaluated = false;
+  friend std::ostream& operator<<(std::ostream& os, const OstreamableTracer& tracer) {
+    tracer.was_evaluated = true;
+    return os;
+  }
+};
+
+}  // namespace
+
+TEST(LoggerTest, Basics) {
+  // Basic tests using the default logger
+  DO_LOG(ERROR);
+  DO_LOG(ERROR, "foo");
+  auto to_int = [](ArrowLogLevel lvl) { return static_cast<int>(lvl); };
+  DO_LOG(TRACE, "sev: ", to_int(ArrowLogLevel::ARROW_TRACE), ":TRACE");
+  DO_LOG(DEBUG, "sev: ", to_int(ArrowLogLevel::ARROW_DEBUG), ":DEBUG");
+  DO_LOG(INFO, "sev: ", to_int(ArrowLogLevel::ARROW_INFO), ":INFO");
+  DO_LOG(WARNING, "sev: ", to_int(ArrowLogLevel::ARROW_WARNING), ":WARNING");
+  DO_LOG(ERROR, "sev: ", to_int(ArrowLogLevel::ARROW_ERROR), ":ERROR");
+
+  {
+    auto logger = std::make_shared<MockLogger>(ArrowLogLevel::ARROW_WARNING);
+    OstreamableTracer tracers[5]{};
+    ARROW_LOGGER_CALL(logger, TRACE, "foo", tracers[0], "bar");
+    ARROW_LOGGER_CALL(logger, DEBUG, "foo", tracers[1], "bar");
+    ARROW_LOGGER_CALL(logger, INFO, "foo", tracers[2], "bar");
+    ARROW_LOGGER_CALL(logger, WARNING, "foo", tracers[3], "bar");
+    ARROW_LOGGER_CALL(logger, ERROR, "foo", tracers[4], "bar");
+
+    // If the message severity doesn't meet the logger's minimum severity, the LogMessage
+    // stream shouldn't be appended to
+    ASSERT_FALSE(tracers[0].was_evaluated);
+    ASSERT_FALSE(tracers[1].was_evaluated);
+    ASSERT_FALSE(tracers[2].was_evaluated);
+    ASSERT_TRUE(tracers[3].was_evaluated);
+    ASSERT_TRUE(tracers[4].was_evaluated);
+  }
+
+  {
+    auto logger = std::make_shared<MockLogger>(ArrowLogLevel::ARROW_WARNING);
+    logger->enabled = false;
+    OstreamableTracer tracer;
+    // If the underlying logger is disabled, the LogMessage stream shouldn't be appended
+    // to (regardless of severity)
+    ARROW_LOGGER_CALL(logger, WARNING, tracer);
+    ARROW_LOGGER_CALL(logger, ERROR, tracer);
+    ASSERT_FALSE(tracer.was_evaluated);
+  }
+}
+
+TEST(LoggerTest, EmittedMessages) {
+  std::vector<std::string> messages;
+  auto callback = [&messages](const LogDetails& details) {
+    messages.push_back(std::string(details.message));
+  };
+
+  auto logger = std::make_shared<MockLogger>(ArrowLogLevel::ARROW_TRACE);
+  logger->callback = callback;
+  for (int i = 0; i < 3; ++i) {
+    ARROW_LOGGER_CALL(logger, TRACE, "i=", i);
+  }
+
+  ASSERT_EQ(messages.size(), 3);
+  EXPECT_EQ(messages[0], "i=0");
+  EXPECT_EQ(messages[1], "i=1");
+  EXPECT_EQ(messages[2], "i=2");
+}
+
+TEST(LoggerTest, Registry) {
+  std::string name = "test-logger";
+  std::shared_ptr<Logger> logger = std::make_shared<MockLogger>();
+
+  ASSERT_OK(LoggerRegistry::RegisterLogger(name, logger));
+  ASSERT_EQ(logger, LoggerRegistry::GetLogger(name));
+
+  // Error if the logger is already registered
+  ASSERT_RAISES(Invalid, LoggerRegistry::RegisterLogger(name, logger));
+
+  LoggerRegistry::UnregisterLogger(name);
+  ASSERT_OK(LoggerRegistry::RegisterLogger(name, logger));
+  ASSERT_EQ(logger, LoggerRegistry::GetLogger(name));
+
+  LoggerRegistry::UnregisterLogger(name);
+}
+
+#undef DO_LOG
+
+}  // namespace util
+}  // namespace arrow
diff --git a/cpp/src/arrow/util/logging.cc b/cpp/src/arrow/util/logging.cc
index 25c336a6d2111..ca4edcc5a5deb 100644
--- a/cpp/src/arrow/util/logging.cc
+++ b/cpp/src/arrow/util/logging.cc
@@ -118,6 +118,8 @@ static std::unique_ptr<std::string> log_dir_;
 // Glog's severity map.
 static google::LogSeverity GetMappedSeverity(ArrowLogLevel severity) {
   switch (severity) {
+    case ArrowLogLevel::ARROW_TRACE:
+      return google::GLOG_INFO;
     case ArrowLogLevel::ARROW_DEBUG:
       return google::GLOG_INFO;
     case ArrowLogLevel::ARROW_INFO:
diff --git a/cpp/src/arrow/util/logging.h b/cpp/src/arrow/util/logging.h
index 2baa560563bb4..2a2175ec0fc72 100644
--- a/cpp/src/arrow/util/logging.h
+++ b/cpp/src/arrow/util/logging.h
@@ -46,6 +46,7 @@ namespace arrow {
 namespace util {
 
 enum class ArrowLogLevel : int {
+  ARROW_TRACE = -2,
   ARROW_DEBUG = -1,
   ARROW_INFO = 0,
   ARROW_WARNING = 1,
diff --git a/cpp/src/arrow/util/macros.h b/cpp/src/arrow/util/macros.h
index 1d23e829d74a9..484df3400d92d 100644
--- a/cpp/src/arrow/util/macros.h
+++ b/cpp/src/arrow/util/macros.h
@@ -36,28 +36,78 @@
   TypeName& operator=(TypeName&&) = default
 #endif
 
-#define ARROW_UNUSED(x) (void)(x)
-#define ARROW_ARG_UNUSED(x)
+// With ARROW_PREDICT_FALSE, GCC and clang can be told that a certain branch is
+// not likely to be taken (for instance, a CHECK failure), and use that information in
+// static analysis. Giving the compiler this information can affect the generated code
+// layout in the absence of better information (i.e. -fprofile-arcs). [1] explains how
+// this feature can be used to improve code generation. It was written as a positive
+// comment to a negative article about the use of these annotations.
 //
-// GCC can be told that a certain branch is not likely to be taken (for
-// instance, a CHECK failure), and use that information in static analysis.
-// Giving it this information can help it optimize for the common case in
-// the absence of better information (ie. -fprofile-arcs).
+// ARROW_COMPILER_ASSUME allows the compiler to assume that a given expression is
+// true, without evaluating it, and to optimise based on this assumption [2]. If this
+// condition is violated at runtime, the behavior is undefined. This can be useful to
+// generate both faster and smaller code in compute kernels.
 //
-#if defined(__GNUC__)
-#define ARROW_PREDICT_FALSE(x) (__builtin_expect(!!(x), 0))
-#define ARROW_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1))
+// IMPORTANT: Different optimisers are likely to react differently to this annotation!
+// It should be used with care when we can prove by some means that the assumption
+// is (1) guaranteed to always hold and (2) is useful for optimization [3]. If the
+// assumption is pessimistic, it might even block the compiler from decisions that
+// could lead to better code [4]. If you have a good intuition for what the compiler
+// can do with assumptions [5], you can use this macro to guide it and end up with
+// results you would only get with more complex code transformations.
+// `clang -S -emit-llvm` can be used to check how the generated code changes with
+// your specific use of this macro.
+//
+// [1] https://lobste.rs/s/uwgtkt/don_t_use_likely_unlikely_attributes#c_xi3wmc
+// [2] "Portable assumptions"
+//     https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2021/p1774r4.pdf
+// [3] "Assertions Are Pessimistic, Assumptions Are Optimistic"
+//     https://blog.regehr.org/archives/1096
+// [4] https://discourse.llvm.org/t/llvm-assume-blocks-optimization/71609
+// [5] J. Doerfert et al. 2019. "Performance Exploration Through Optimistic Static
+//     Program Annotations". https://github.com/jdoerfert/PETOSPA/blob/master/ISC19.pdf
+#define ARROW_UNUSED(x) (void)(x)
+#ifdef ARROW_WARN_DOCUMENTATION
+#define ARROW_ARG_UNUSED(x) x
+#else
+#define ARROW_ARG_UNUSED(x)
+#endif
+#if defined(__GNUC__)  // GCC and compatible compilers (clang, Intel ICC)
 #define ARROW_NORETURN __attribute__((noreturn))
 #define ARROW_NOINLINE __attribute__((noinline))
 #define ARROW_FORCE_INLINE __attribute__((always_inline))
+#define ARROW_PREDICT_FALSE(x) (__builtin_expect(!!(x), 0))
+#define ARROW_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1))
 #define ARROW_PREFETCH(addr) __builtin_prefetch(addr)
-#elif defined(_MSC_VER)
+#define ARROW_RESTRICT __restrict
+#if defined(__clang__)  // clang-specific
+#define ARROW_COMPILER_ASSUME(expr) __builtin_assume(expr)
+#else  // GCC-specific
+#if __GNUC__ >= 13
+#define ARROW_COMPILER_ASSUME(expr) __attribute__((assume(expr)))
+#else
+// GCC does not have a built-in assume intrinsic before GCC 13, so we use an
+// if statement and __builtin_unreachable() to achieve the same effect [2].
+// Unlike clang's __builtin_assume and C++23's [[assume(expr)]], using this
+// on GCC won't warn about side-effects in the expression, so make sure expr
+// is side-effect free when working with GCC versions before 13 (Jan-2024),
+// otherwise clang/MSVC builds will fail in CI.
+#define ARROW_COMPILER_ASSUME(expr) \
+  if (expr) {                       \
+  } else {                          \
+    __builtin_unreachable();        \
+  }
+#endif  // __GNUC__ >= 13
+#endif
+#elif defined(_MSC_VER)  // MSVC
 #define ARROW_NORETURN __declspec(noreturn)
 #define ARROW_NOINLINE __declspec(noinline)
-#define ARROW_FORCE_INLINE __declspec(forceinline)
+#define ARROW_FORCE_INLINE __forceinline
 #define ARROW_PREDICT_FALSE(x) (x)
 #define ARROW_PREDICT_TRUE(x) (x)
 #define ARROW_PREFETCH(addr)
+#define ARROW_RESTRICT __restrict
+#define ARROW_COMPILER_ASSUME(expr) __assume(expr)
 #else
 #define ARROW_NORETURN
 #define ARROW_NOINLINE
@@ -65,12 +115,8 @@
 #define ARROW_PREDICT_FALSE(x) (x)
 #define ARROW_PREDICT_TRUE(x) (x)
 #define ARROW_PREFETCH(addr)
-#endif
-
-#if defined(__GNUC__) || defined(__clang__) || defined(_MSC_VER)
-#define ARROW_RESTRICT __restrict
-#else
 #define ARROW_RESTRICT
+#define ARROW_COMPILER_ASSUME(expr)
 #endif
 
 // ----------------------------------------------------------------------
diff --git a/cpp/src/arrow/util/mutex.cc b/cpp/src/arrow/util/mutex.cc
index 9f82ad45b0740..bbf2a9a93e692 100644
--- a/cpp/src/arrow/util/mutex.cc
+++ b/cpp/src/arrow/util/mutex.cc
@@ -24,6 +24,7 @@
 #include <atomic>
 #endif
 
+#include "arrow/util/config.h"
 #include "arrow/util/logging.h"
 
 namespace arrow {
@@ -35,9 +36,12 @@ struct Mutex::Impl {
 
 Mutex::Guard::Guard(Mutex* locked)
     : locked_(locked, [](Mutex* locked) {
+#ifdef ARROW_ENABLE_THREADING
         DCHECK(!locked->impl_->mutex_.try_lock());
+#endif
         locked->impl_->mutex_.unlock();
-      }) {}
+      }) {
+}
 
 Mutex::Guard Mutex::TryLock() {
   DCHECK_NE(impl_, nullptr);
diff --git a/cpp/src/arrow/util/rle_encoding_test.cc b/cpp/src/arrow/util/rle_encoding_test.cc
index 01d1ffd767fc9..26984e5f7735d 100644
--- a/cpp/src/arrow/util/rle_encoding_test.cc
+++ b/cpp/src/arrow/util/rle_encoding_test.cc
@@ -214,7 +214,14 @@ TEST(BitUtil, RoundTripIntValues) {
 void ValidateRle(const std::vector<int>& values, int bit_width,
                  uint8_t* expected_encoding, int expected_len) {
   const int len = 64 * 1024;
+#ifdef __EMSCRIPTEN__
+  // don't make this on the stack as it is
+  // too big for emscripten
+  std::vector<uint8_t> buffer_vec(static_cast<size_t>(len));
+  uint8_t* buffer = buffer_vec.data();
+#else
   uint8_t buffer[len];
+#endif
   EXPECT_LE(expected_len, len);
 
   RleEncoder encoder(buffer, len, bit_width);
@@ -227,7 +234,7 @@ void ValidateRle(const std::vector<int>& values, int bit_width,
   if (expected_len != -1) {
     EXPECT_EQ(encoded_len, expected_len);
   }
-  if (expected_encoding != NULL) {
+  if (expected_encoding != NULL && encoded_len == expected_len) {
     EXPECT_EQ(memcmp(buffer, expected_encoding, encoded_len), 0);
   }
 
@@ -256,7 +263,14 @@ void ValidateRle(const std::vector<int>& values, int bit_width,
 // the returned values are not all the same
 bool CheckRoundTrip(const std::vector<int>& values, int bit_width) {
   const int len = 64 * 1024;
+#ifdef __EMSCRIPTEN__
+  // don't make this on the stack as it is
+  // too big for emscripten
+  std::vector<uint8_t> buffer_vec(static_cast<size_t>(len));
+  uint8_t* buffer = buffer_vec.data();
+#else
   uint8_t buffer[len];
+#endif
   RleEncoder encoder(buffer, len, bit_width);
   for (size_t i = 0; i < values.size(); ++i) {
     bool result = encoder.Put(values[i]);
diff --git a/cpp/src/arrow/util/tracing_internal.cc b/cpp/src/arrow/util/tracing_internal.cc
index 58668cab18bc6..f4f65ad1e6132 100644
--- a/cpp/src/arrow/util/tracing_internal.cc
+++ b/cpp/src/arrow/util/tracing_internal.cc
@@ -35,6 +35,7 @@
 #include <opentelemetry/exporters/otlp/otlp_http_exporter.h>
 #include <opentelemetry/exporters/otlp/otlp_recordable_utils.h>
 #include <opentelemetry/sdk/trace/batch_span_processor.h>
+#include <opentelemetry/sdk/trace/batch_span_processor_options.h>
 #include <opentelemetry/sdk/trace/recordable.h>
 #include <opentelemetry/sdk/trace/span_data.h>
 #include <opentelemetry/sdk/trace/tracer_provider.h>
diff --git a/cpp/src/arrow/util/value_parsing.cc b/cpp/src/arrow/util/value_parsing.cc
index f6a24ac1467f8..8cecc6365a3b9 100644
--- a/cpp/src/arrow/util/value_parsing.cc
+++ b/cpp/src/arrow/util/value_parsing.cc
@@ -22,8 +22,11 @@
 #include <string>
 #include <utility>
 
+#include "arrow/util/float16.h"
 #include "arrow/vendored/fast_float/fast_float.h"
 
+using arrow::util::Float16;
+
 namespace arrow {
 namespace internal {
 
@@ -43,6 +46,20 @@ bool StringToFloat(const char* s, size_t length, char decimal_point, double* out
   return res.ec == std::errc() && res.ptr == s + length;
 }
 
+// Half float
+bool StringToFloat(const char* s, size_t length, char decimal_point, uint16_t* out) {
+  ::arrow_vendored::fast_float::parse_options options{
+      ::arrow_vendored::fast_float::chars_format::general, decimal_point};
+  float temp_out;
+  const auto res =
+      ::arrow_vendored::fast_float::from_chars_advanced(s, s + length, temp_out, options);
+  const bool ok = res.ec == std::errc() && res.ptr == s + length;
+  if (ok) {
+    *out = Float16::FromFloat(temp_out).bits();
+  }
+  return ok;
+}
+
 // ----------------------------------------------------------------------
 // strptime-like parsing
 
diff --git a/cpp/src/arrow/util/value_parsing.h b/cpp/src/arrow/util/value_parsing.h
index b3c711840f3e2..609906052cd20 100644
--- a/cpp/src/arrow/util/value_parsing.h
+++ b/cpp/src/arrow/util/value_parsing.h
@@ -135,6 +135,9 @@ bool StringToFloat(const char* s, size_t length, char decimal_point, float* out)
 ARROW_EXPORT
 bool StringToFloat(const char* s, size_t length, char decimal_point, double* out);
 
+ARROW_EXPORT
+bool StringToFloat(const char* s, size_t length, char decimal_point, uint16_t* out);
+
 template <>
 struct StringConverter<FloatType> {
   using value_type = float;
@@ -163,6 +166,20 @@ struct StringConverter<DoubleType> {
   const char decimal_point;
 };
 
+template <>
+struct StringConverter<HalfFloatType> {
+  using value_type = uint16_t;
+
+  explicit StringConverter(char decimal_point = '.') : decimal_point(decimal_point) {}
+
+  bool Convert(const HalfFloatType&, const char* s, size_t length, value_type* out) {
+    return ARROW_PREDICT_TRUE(StringToFloat(s, length, decimal_point, out));
+  }
+
+ private:
+  const char decimal_point;
+};
+
 // NOTE: HalfFloatType would require a half<->float conversion library
 
 inline uint8_t ParseDecimalDigit(char c) { return static_cast<uint8_t>(c - '0'); }
diff --git a/cpp/src/arrow/util/value_parsing_test.cc b/cpp/src/arrow/util/value_parsing_test.cc
index 30c5e6aae74ba..7cd1ab1e25c31 100644
--- a/cpp/src/arrow/util/value_parsing_test.cc
+++ b/cpp/src/arrow/util/value_parsing_test.cc
@@ -24,9 +24,13 @@
 
 #include "arrow/testing/gtest_util.h"
 #include "arrow/type.h"
+#include "arrow/util/float16.h"
 #include "arrow/util/value_parsing.h"
 
 namespace arrow {
+
+using util::Float16;
+
 namespace internal {
 
 template <typename T>
@@ -152,6 +156,25 @@ TEST(StringConversion, ToDouble) {
   AssertConversionFails(&converter, "1.5");
 }
 
+TEST(StringConversion, ToHalfFloat) {
+  AssertConversion<HalfFloatType>("1.5", Float16(1.5f).bits());
+  AssertConversion<HalfFloatType>("0", Float16(0.0f).bits());
+  AssertConversion<HalfFloatType>("-0.0", Float16(-0.0f).bits());
+  AssertConversion<HalfFloatType>("-1e15", Float16(-1e15).bits());
+  AssertConversion<HalfFloatType>("+Infinity", 0x7c00);
+  AssertConversion<HalfFloatType>("-Infinity", 0xfc00);
+  AssertConversion<HalfFloatType>("Infinity", 0x7c00);
+
+  AssertConversionFails<HalfFloatType>("");
+  AssertConversionFails<HalfFloatType>("e");
+  AssertConversionFails<HalfFloatType>("1,5");
+
+  StringConverter<HalfFloatType> converter(/*decimal_point=*/',');
+  AssertConversion(&converter, "1,5", Float16(1.5f).bits());
+  AssertConversion(&converter, "0", Float16(0.0f).bits());
+  AssertConversionFails(&converter, "1.5");
+}
+
 #if !defined(_WIN32) || defined(NDEBUG)
 
 TEST(StringConversion, ToFloatLocale) {
@@ -180,6 +203,19 @@ TEST(StringConversion, ToDoubleLocale) {
   AssertConversionFails(&converter, "1,5");
 }
 
+TEST(StringConversion, ToHalfFloatLocale) {
+  // French locale uses the comma as decimal point
+  LocaleGuard locale_guard("fr_FR.UTF-8");
+
+  AssertConversion<HalfFloatType>("1.5", Float16(1.5).bits());
+  AssertConversionFails<HalfFloatType>("1,5");
+
+  StringConverter<HalfFloatType> converter(/*decimal_point=*/'#');
+  AssertConversion(&converter, "1#5", Float16(1.5).bits());
+  AssertConversionFails(&converter, "1.5");
+  AssertConversionFails(&converter, "1,5");
+}
+
 #endif  // _WIN32
 
 TEST(StringConversion, ToInt8) {
@@ -794,6 +830,11 @@ TEST(TimestampParser, StrptimeZoneOffset) {
   if (!kStrptimeSupportsZone) {
     GTEST_SKIP() << "strptime does not support %z on this platform";
   }
+#ifdef __EMSCRIPTEN__
+  GTEST_SKIP() << "Test temporarily disabled due to emscripten bug "
+                  "https://github.com/emscripten-core/emscripten/issues/20467 ";
+#endif
+
   std::string format = "%Y-%d-%m %H:%M:%S%z";
   auto parser = TimestampParser::MakeStrptime(format);
 
diff --git a/cpp/src/arrow/util/vector.h b/cpp/src/arrow/util/vector.h
index e3c0a67cf46c4..74b6a2403a2bb 100644
--- a/cpp/src/arrow/util/vector.h
+++ b/cpp/src/arrow/util/vector.h
@@ -113,7 +113,7 @@ Result<std::vector<To>> MaybeMapVector(Fn&& map, const std::vector<From>& source
   out.reserve(source.size());
   ARROW_RETURN_NOT_OK(MaybeTransform(source.begin(), source.end(),
                                      std::back_inserter(out), std::forward<Fn>(map)));
-  return std::move(out);
+  return out;
 }
 
 template <typename Fn, typename From = internal::call_traits::argument_type<0, Fn>,
@@ -152,7 +152,7 @@ Result<std::vector<T>> UnwrapOrRaise(std::vector<Result<T>>&& results) {
     }
     out.push_back(it->MoveValueUnsafe());
   }
-  return std::move(out);
+  return out;
 }
 
 template <typename T>
@@ -165,7 +165,7 @@ Result<std::vector<T>> UnwrapOrRaise(const std::vector<Result<T>>& results) {
     }
     out.push_back(result.ValueUnsafe());
   }
-  return std::move(out);
+  return out;
 }
 
 }  // namespace internal
diff --git a/cpp/src/arrow/vendored/datetime/tz.cpp b/cpp/src/arrow/vendored/datetime/tz.cpp
index 6962a8b3c3572..e94c1bc8ae682 100644
--- a/cpp/src/arrow/vendored/datetime/tz.cpp
+++ b/cpp/src/arrow/vendored/datetime/tz.cpp
@@ -118,7 +118,7 @@
 #include <vector>
 #include <sys/stat.h>
 
-// unistd.h is used on some platforms as part of the the means to get
+// unistd.h is used on some platforms as part of the means to get
 // the current time zone. On Win32 windows.h provides a means to do it.
 // gcc/mingw supports unistd.h on Win32 but MSVC does not.
 
diff --git a/cpp/src/arrow/vendored/pcg/pcg_random.hpp b/cpp/src/arrow/vendored/pcg/pcg_random.hpp
index a864ba0a2c59b..e39e61e908a2a 100644
--- a/cpp/src/arrow/vendored/pcg/pcg_random.hpp
+++ b/cpp/src/arrow/vendored/pcg/pcg_random.hpp
@@ -1900,7 +1900,7 @@ typedef pcg_engines::ext_oneseq_xsh_rs_64_32<1,32,true>     pcg32_k2_fast;
 //  - the k variants are k-dimensionally equidistributed
 //  - the c variants offer better crypographic security
 //
-// (just how good the cryptographic security is is an open question)
+// (just how good the cryptographic security is an open question)
 
 typedef pcg_engines::ext_setseq_xsh_rr_64_32<6,16,true>     pcg32_k64;
 typedef pcg_engines::ext_mcg_xsh_rs_64_32<6,32,true>        pcg32_k64_oneseq;
@@ -1923,7 +1923,7 @@ typedef pcg_engines::ext_mcg_xsl_rr_128_64<5,128,false>     pcg64_c32_fast;
 //  - the k variants are k-dimensionally equidistributed
 //  - the c variants offer better crypographic security
 //
-// (just how good the cryptographic security is is an open question)
+// (just how good the cryptographic security is an open question)
 
 typedef pcg_engines::ext_setseq_xsh_rr_64_32<10,16,true>    pcg32_k1024;
 typedef pcg_engines::ext_oneseq_xsh_rs_64_32<10,32,true>    pcg32_k1024_fast;
diff --git a/cpp/src/gandiva/cache.cc b/cpp/src/gandiva/cache.cc
index a1333ccdc5d43..2358b08c82424 100644
--- a/cpp/src/gandiva/cache.cc
+++ b/cpp/src/gandiva/cache.cc
@@ -20,26 +20,41 @@
 #include "arrow/result.h"
 #include "arrow/util/io_util.h"
 #include "arrow/util/logging.h"
+#include "arrow/util/value_parsing.h"
 
 namespace gandiva {
 
-static const size_t DEFAULT_CACHE_SIZE = 5000;
-
-int GetCapacity() {
-  size_t capacity = DEFAULT_CACHE_SIZE;
-  auto maybe_env_cache_size = ::arrow::internal::GetEnvVar("GANDIVA_CACHE_SIZE");
-  if (maybe_env_cache_size.ok()) {
-    const auto env_cache_size = *std::move(maybe_env_cache_size);
-    if (!env_cache_size.empty()) {
-      capacity = std::atol(env_cache_size.c_str());
-      if (capacity <= 0) {
-        ARROW_LOG(WARNING) << "Invalid cache size provided in GANDIVA_CACHE_SIZE. "
-                           << "Using default cache size: " << DEFAULT_CACHE_SIZE;
-        capacity = DEFAULT_CACHE_SIZE;
-      }
-    }
+constexpr auto kCacheCapacityEnvVar = "GANDIVA_CACHE_SIZE";
+constexpr auto kDefaultCacheSize = 5000;
+
+namespace internal {
+int GetCacheCapacityFromEnvVar() {
+  auto maybe_env_value = ::arrow::internal::GetEnvVar(kCacheCapacityEnvVar);
+  if (!maybe_env_value.ok()) {
+    return kDefaultCacheSize;
+  }
+  const auto env_value = *std::move(maybe_env_value);
+  if (env_value.empty()) {
+    return kDefaultCacheSize;
+  }
+  int capacity = 0;
+  bool ok = ::arrow::internal::ParseValue<::arrow::Int32Type>(
+      env_value.c_str(), env_value.size(), &capacity);
+  if (!ok || capacity <= 0) {
+    ARROW_LOG(WARNING) << "Invalid cache size provided in " << kCacheCapacityEnvVar
+                       << ". Using default cache size: " << kDefaultCacheSize;
+    return kDefaultCacheSize;
   }
-  return static_cast<int>(capacity);
+  return capacity;
+}
+}  // namespace internal
+
+// Deprecated in 17.0.0. Use GetCacheCapacity instead.
+int GetCapacity() { return GetCacheCapacity(); }
+
+int GetCacheCapacity() {
+  static const int capacity = internal::GetCacheCapacityFromEnvVar();
+  return capacity;
 }
 
 void LogCacheSize(size_t capacity) {
diff --git a/cpp/src/gandiva/cache.h b/cpp/src/gandiva/cache.h
index 7cff9b02692ae..c19dbb7a0e30e 100644
--- a/cpp/src/gandiva/cache.h
+++ b/cpp/src/gandiva/cache.h
@@ -20,14 +20,27 @@
 #include <cstdlib>
 #include <mutex>
 
+#include "arrow/util/macros.h"
 #include "gandiva/lru_cache.h"
 #include "gandiva/visibility.h"
 
 namespace gandiva {
 
+namespace internal {
+// Only called once by GetCacheCapacity().
+// Do the actual work of getting the cache capacity from env var.
+// Also makes the testing easier.
+GANDIVA_EXPORT
+int GetCacheCapacityFromEnvVar();
+}  // namespace internal
+
+ARROW_DEPRECATED("Deprecated in 17.0.0. Use GetCacheCapacity instead.")
 GANDIVA_EXPORT
 int GetCapacity();
 
+GANDIVA_EXPORT
+int GetCacheCapacity();
+
 GANDIVA_EXPORT
 void LogCacheSize(size_t capacity);
 
@@ -36,7 +49,7 @@ class Cache {
  public:
   explicit Cache(size_t capacity) : cache_(capacity) { LogCacheSize(capacity); }
 
-  Cache() : Cache(GetCapacity()) {}
+  Cache() : Cache(GetCacheCapacity()) {}
 
   ValueType GetObjectCode(const KeyType& cache_key) {
     std::optional<ValueType> result;
diff --git a/cpp/src/gandiva/cache_test.cc b/cpp/src/gandiva/cache_test.cc
index a146707079fa6..96cf4a12e587a 100644
--- a/cpp/src/gandiva/cache_test.cc
+++ b/cpp/src/gandiva/cache_test.cc
@@ -16,10 +16,14 @@
 // under the License.
 
 #include "gandiva/cache.h"
+#include "arrow/testing/gtest_util.h"
+#include "arrow/util/io_util.h"
+#include "arrow/util/logging.h"
 
 #include <gtest/gtest.h>
 
 namespace gandiva {
+
 class TestCacheKey {
  public:
   explicit TestCacheKey(int value) : value_(value) {}
@@ -38,5 +42,67 @@ TEST(TestCache, TestGetPut) {
   ASSERT_EQ(cache.GetObjectCode(TestCacheKey(2)), "world");
 }
 
-TEST(TestCache, TestGetCacheCapacity) { ASSERT_EQ(GetCapacity(), 5000); }
+namespace {
+constexpr auto cache_capacity_env_var = "GANDIVA_CACHE_SIZE";
+constexpr auto default_cache_capacity = 5000;
+}  // namespace
+
+TEST(TestCache, TestGetCacheCapacityDefault) {
+  ASSERT_EQ(GetCacheCapacity(), default_cache_capacity);
+}
+
+TEST(TestCache, TestGetCacheCapacityEnvVar) {
+  using ::arrow::EnvVarGuard;
+
+  // Empty.
+  {
+    EnvVarGuard guard(cache_capacity_env_var, "");
+    ASSERT_EQ(internal::GetCacheCapacityFromEnvVar(), default_cache_capacity);
+  }
+
+  // Non-number.
+  {
+    EnvVarGuard guard(cache_capacity_env_var, "invalid");
+    ASSERT_EQ(internal::GetCacheCapacityFromEnvVar(), default_cache_capacity);
+  }
+
+  // Number with invalid suffix.
+  {
+    EnvVarGuard guard(cache_capacity_env_var, "42MB");
+    ASSERT_EQ(internal::GetCacheCapacityFromEnvVar(), default_cache_capacity);
+  }
+
+  // Valid positive number.
+  {
+    EnvVarGuard guard(cache_capacity_env_var, "42");
+    ASSERT_EQ(internal::GetCacheCapacityFromEnvVar(), 42);
+  }
+
+  // Int max.
+  {
+    auto str = std::to_string(std::numeric_limits<int>::max());
+    EnvVarGuard guard(cache_capacity_env_var, str.c_str());
+    ASSERT_EQ(internal::GetCacheCapacityFromEnvVar(), std::numeric_limits<int>::max());
+  }
+
+  // Zero.
+  {
+    EnvVarGuard guard(cache_capacity_env_var, "0");
+    ASSERT_EQ(internal::GetCacheCapacityFromEnvVar(), default_cache_capacity);
+  }
+
+  // Negative number.
+  {
+    EnvVarGuard guard(cache_capacity_env_var, "-1");
+    ASSERT_EQ(internal::GetCacheCapacityFromEnvVar(), default_cache_capacity);
+  }
+
+  // Over int max.
+  {
+    auto str = std::to_string(static_cast<int64_t>(std::numeric_limits<int>::max()) + 1);
+    EnvVarGuard guard(cache_capacity_env_var, str.c_str());
+    ASSERT_EQ(internal::GetCacheCapacityFromEnvVar(), default_cache_capacity);
+  }
+}
+
 }  // namespace gandiva
diff --git a/cpp/src/gandiva/function_registry.cc b/cpp/src/gandiva/function_registry.cc
index 2e392630ee009..0955a2e47fcaf 100644
--- a/cpp/src/gandiva/function_registry.cc
+++ b/cpp/src/gandiva/function_registry.cc
@@ -147,7 +147,7 @@ arrow::Result<std::shared_ptr<FunctionRegistry>> MakeDefaultFunctionRegistry() {
       ARROW_RETURN_NOT_OK(registry->Add(func_signature));
     }
   }
-  return std::move(registry);
+  return registry;
 }
 
 std::shared_ptr<FunctionRegistry> default_function_registry() {
diff --git a/cpp/src/gandiva/llvm_generator.cc b/cpp/src/gandiva/llvm_generator.cc
index 62ebab08f4d6b..4afa2935ace33 100644
--- a/cpp/src/gandiva/llvm_generator.cc
+++ b/cpp/src/gandiva/llvm_generator.cc
@@ -1251,7 +1251,7 @@ LValuePtr LLVMGenerator::Visitor::BuildFunctionCall(const NativeFunction* func,
     // Make the function call
     auto out = decimalIR.CallDecimalFunction(func->pc_name(), llvm_return_type, *params);
     ret_lvalue->set_data(out);
-    return std::move(ret_lvalue);
+    return ret_lvalue;
   } else {
     bool isDecimalFunction = false;
     for (auto& arg : *params) {
diff --git a/cpp/src/gandiva/precompiled/string_ops.cc b/cpp/src/gandiva/precompiled/string_ops.cc
index 5aa0eb38eafd7..3849cf7bdf9a5 100644
--- a/cpp/src/gandiva/precompiled/string_ops.cc
+++ b/cpp/src/gandiva/precompiled/string_ops.cc
@@ -1377,7 +1377,7 @@ gdv_int32 ascii_utf8(const char* data, gdv_int32 data_len) {
   if (data_len == 0) {
     return 0;
   }
-  return static_cast<gdv_int32>(data[0]);
+  return static_cast<gdv_int32>(static_cast<signed char>(data[0]));
 }
 
 // Returns the ASCII character having the binary equivalent to A.
diff --git a/cpp/src/gandiva/precompiled/string_ops_test.cc b/cpp/src/gandiva/precompiled/string_ops_test.cc
index 89213592e7ea2..aaa25db0a9f8d 100644
--- a/cpp/src/gandiva/precompiled/string_ops_test.cc
+++ b/cpp/src/gandiva/precompiled/string_ops_test.cc
@@ -51,6 +51,8 @@ TEST(TestStringOps, TestAscii) {
   EXPECT_EQ(ascii_utf8("", 0), 0);
   EXPECT_EQ(ascii_utf8("123", 3), 49);
   EXPECT_EQ(ascii_utf8("999", 3), 57);
+  EXPECT_EQ(ascii_utf8("\x80", 1), -128);
+  EXPECT_EQ(ascii_utf8("\xFF", 1), -1);
 }
 
 TEST(TestStringOps, TestChrBigInt) {
diff --git a/cpp/src/gandiva/regex_functions_holder.cc b/cpp/src/gandiva/regex_functions_holder.cc
index 03a4af90d8991..ef07a9ef0bc9b 100644
--- a/cpp/src/gandiva/regex_functions_holder.cc
+++ b/cpp/src/gandiva/regex_functions_holder.cc
@@ -99,13 +99,14 @@ Result<std::shared_ptr<LikeHolder>> LikeHolder::Make(const FunctionNode& node) {
           "'like' function requires a string literal as the second parameter"));
 
   RE2::Options regex_op;
+  regex_op.set_dot_nl(true);  // set dotall mode for the regex.
   if (node.descriptor()->name() == "ilike") {
     regex_op.set_case_sensitive(false);  // set case-insensitive for ilike function.
 
     return Make(std::get<std::string>(literal->holder()), regex_op);
   }
   if (node.children().size() == 2) {
-    return Make(std::get<std::string>(literal->holder()));
+    return Make(std::get<std::string>(literal->holder()), regex_op);
   } else {
     auto escape_char = dynamic_cast<LiteralNode*>(node.children().at(2).get());
     ARROW_RETURN_IF(
@@ -118,7 +119,7 @@ Result<std::shared_ptr<LikeHolder>> LikeHolder::Make(const FunctionNode& node) {
         Status::Invalid(
             "'like' function requires a string literal as the third parameter"));
     return Make(std::get<std::string>(literal->holder()),
-                std::get<std::string>(escape_char->holder()));
+                std::get<std::string>(escape_char->holder()), regex_op);
   }
 }
 
@@ -126,7 +127,9 @@ Result<std::shared_ptr<LikeHolder>> LikeHolder::Make(const std::string& sql_patt
   std::string pcre_pattern;
   ARROW_RETURN_NOT_OK(RegexUtil::SqlLikePatternToPcre(sql_pattern, pcre_pattern));
 
-  auto lholder = std::shared_ptr<LikeHolder>(new LikeHolder(pcre_pattern));
+  RE2::Options regex_op;
+  regex_op.set_dot_nl(true);  // set dotall mode for the regex.
+  auto lholder = std::shared_ptr<LikeHolder>(new LikeHolder(pcre_pattern, regex_op));
   ARROW_RETURN_IF(!lholder->regex_.ok(),
                   Status::Invalid("Building RE2 pattern '", pcre_pattern,
                                   "' failed with: ", lholder->regex_.error()));
@@ -135,7 +138,8 @@ Result<std::shared_ptr<LikeHolder>> LikeHolder::Make(const std::string& sql_patt
 }
 
 Result<std::shared_ptr<LikeHolder>> LikeHolder::Make(const std::string& sql_pattern,
-                                                     const std::string& escape_char) {
+                                                     const std::string& escape_char,
+                                                     RE2::Options regex_op) {
   ARROW_RETURN_IF(escape_char.length() > 1,
                   Status::Invalid("The length of escape char ", escape_char,
                                   " in 'like' function is greater than 1"));
@@ -147,7 +151,7 @@ Result<std::shared_ptr<LikeHolder>> LikeHolder::Make(const std::string& sql_patt
     ARROW_RETURN_NOT_OK(RegexUtil::SqlLikePatternToPcre(sql_pattern, pcre_pattern));
   }
 
-  auto lholder = std::shared_ptr<LikeHolder>(new LikeHolder(pcre_pattern));
+  auto lholder = std::shared_ptr<LikeHolder>(new LikeHolder(pcre_pattern, regex_op));
   ARROW_RETURN_IF(!lholder->regex_.ok(),
                   Status::Invalid("Building RE2 pattern '", pcre_pattern,
                                   "' failed with: ", lholder->regex_.error()));
diff --git a/cpp/src/gandiva/regex_functions_holder.h b/cpp/src/gandiva/regex_functions_holder.h
index 36d942510bb5b..354c2b53d95e1 100644
--- a/cpp/src/gandiva/regex_functions_holder.h
+++ b/cpp/src/gandiva/regex_functions_holder.h
@@ -40,7 +40,8 @@ class GANDIVA_EXPORT LikeHolder : public FunctionHolder {
   static Result<std::shared_ptr<LikeHolder>> Make(const std::string& sql_pattern);
 
   static Result<std::shared_ptr<LikeHolder>> Make(const std::string& sql_pattern,
-                                                  const std::string& escape_char);
+                                                  const std::string& escape_char,
+                                                  RE2::Options regex_op);
 
   static Result<std::shared_ptr<LikeHolder>> Make(const std::string& sql_pattern,
                                                   RE2::Options regex_op);
diff --git a/cpp/src/gandiva/regex_functions_holder_test.cc b/cpp/src/gandiva/regex_functions_holder_test.cc
index 534be5987a233..64657e88c6473 100644
--- a/cpp/src/gandiva/regex_functions_holder_test.cc
+++ b/cpp/src/gandiva/regex_functions_holder_test.cc
@@ -28,6 +28,8 @@ namespace gandiva {
 class TestLikeHolder : public ::testing::Test {
  public:
   RE2::Options regex_op;
+  void SetUp() { regex_op.set_dot_nl(true); }
+
   FunctionNode BuildLike(std::string pattern) {
     auto field = std::make_shared<FieldNode>(arrow::field("in", arrow::utf8()));
     auto pattern_node =
@@ -77,6 +79,14 @@ TEST_F(TestLikeHolder, TestPcreSpecial) {
   EXPECT_FALSE(like("xxabc"));
 }
 
+TEST_F(TestLikeHolder, TestPcreSpecialWithNewLine) {
+  EXPECT_OK_AND_ASSIGN(auto const like_holder, LikeHolder::Make("%Space1.%", regex_op));
+
+  auto& like = *like_holder;
+  EXPECT_TRUE(
+      like("[name: \"Space1.protect\"\nargs: \"count\"\ncolumn_name: \"pass_count\"]"));
+}
+
 TEST_F(TestLikeHolder, TestRegexEscape) {
   std::string res;
   ARROW_EXPECT_OK(RegexUtil::SqlLikePatternToPcre("#%hello#_abc_def##", '#', res));
@@ -91,14 +101,22 @@ TEST_F(TestLikeHolder, TestDot) {
   EXPECT_FALSE(like("abcd"));
 }
 
+TEST_F(TestLikeHolder, TestMatchWithNewLine) {
+  EXPECT_OK_AND_ASSIGN(auto const like_holder, LikeHolder::Make("%abc%", regex_op));
+
+  auto& like = *like_holder;
+  EXPECT_TRUE(like("abc\nd"));
+}
+
 TEST_F(TestLikeHolder, TestMatchSubString) {
-  EXPECT_OK_AND_ASSIGN(auto like_holder, LikeHolder::Make("%abc%", "\\"));
+  EXPECT_OK_AND_ASSIGN(auto like_holder, LikeHolder::Make("%abc%", "\\", regex_op));
 
   auto& like = *like_holder;
   EXPECT_TRUE(like("abc"));
   EXPECT_FALSE(like("xxabdc"));
 
-  EXPECT_OK_AND_ASSIGN(like_holder, LikeHolder::Make("%ab-.^$*+?()[]{}|—/c\\%%", "\\"));
+  EXPECT_OK_AND_ASSIGN(like_holder,
+                       LikeHolder::Make("%ab-.^$*+?()[]{}|—/c\\%%", "\\", regex_op));
 
   auto& like_reserved_char = *like_holder;
   EXPECT_TRUE(like_reserved_char("XXab-.^$*+?()[]{}|—/c%d"));
@@ -173,7 +191,7 @@ TEST_F(TestLikeHolder, TestOptimise) {
 }
 
 TEST_F(TestLikeHolder, TestMatchOneEscape) {
-  EXPECT_OK_AND_ASSIGN(auto const like_holder, LikeHolder::Make("ab\\_", "\\"));
+  EXPECT_OK_AND_ASSIGN(auto const like_holder, LikeHolder::Make("ab\\_", "\\", regex_op));
 
   auto& like = *like_holder;
 
@@ -187,7 +205,7 @@ TEST_F(TestLikeHolder, TestMatchOneEscape) {
 }
 
 TEST_F(TestLikeHolder, TestMatchManyEscape) {
-  EXPECT_OK_AND_ASSIGN(auto const like_holder, LikeHolder::Make("ab\\%", "\\"));
+  EXPECT_OK_AND_ASSIGN(auto const like_holder, LikeHolder::Make("ab\\%", "\\", regex_op));
 
   auto& like = *like_holder;
 
@@ -201,7 +219,8 @@ TEST_F(TestLikeHolder, TestMatchManyEscape) {
 }
 
 TEST_F(TestLikeHolder, TestMatchEscape) {
-  EXPECT_OK_AND_ASSIGN(auto const like_holder, LikeHolder::Make("ab\\\\", "\\"));
+  EXPECT_OK_AND_ASSIGN(auto const like_holder,
+                       LikeHolder::Make("ab\\\\", "\\", regex_op));
 
   auto& like = *like_holder;
 
@@ -211,7 +230,7 @@ TEST_F(TestLikeHolder, TestMatchEscape) {
 }
 
 TEST_F(TestLikeHolder, TestEmptyEscapeChar) {
-  EXPECT_OK_AND_ASSIGN(auto const like_holder, LikeHolder::Make("ab\\_", ""));
+  EXPECT_OK_AND_ASSIGN(auto const like_holder, LikeHolder::Make("ab\\_", "", regex_op));
 
   auto& like = *like_holder;
 
@@ -223,7 +242,7 @@ TEST_F(TestLikeHolder, TestEmptyEscapeChar) {
 }
 
 TEST_F(TestLikeHolder, TestMultipleEscapeChar) {
-  ASSERT_RAISES(Invalid, LikeHolder::Make("ab\\_", "\\\\").status());
+  ASSERT_RAISES(Invalid, LikeHolder::Make("ab\\_", "\\\\", regex_op).status());
 }
 
 class TestILikeHolder : public ::testing::Test {
diff --git a/cpp/src/generated/parquet_types.cpp b/cpp/src/generated/parquet_types.cpp
index 8932c4a4f8d19..1ba0c4626233f 100644
--- a/cpp/src/generated/parquet_types.cpp
+++ b/cpp/src/generated/parquet_types.cpp
@@ -640,128 +640,6 @@ std::ostream& operator<<(std::ostream& out, const SizeStatistics& obj)
 }
 
 
-uint32_t SizeStatistics::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->unencoded_byte_array_data_bytes);
-          this->__isset.unencoded_byte_array_data_bytes = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->repetition_level_histogram.clear();
-            uint32_t _size0;
-            ::apache::thrift::protocol::TType _etype3;
-            xfer += iprot->readListBegin(_etype3, _size0);
-            this->repetition_level_histogram.resize(_size0);
-            uint32_t _i4;
-            for (_i4 = 0; _i4 < _size0; ++_i4)
-            {
-              xfer += iprot->readI64(this->repetition_level_histogram[_i4]);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.repetition_level_histogram = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->definition_level_histogram.clear();
-            uint32_t _size5;
-            ::apache::thrift::protocol::TType _etype8;
-            xfer += iprot->readListBegin(_etype8, _size5);
-            this->definition_level_histogram.resize(_size5);
-            uint32_t _i9;
-            for (_i9 = 0; _i9 < _size5; ++_i9)
-            {
-              xfer += iprot->readI64(this->definition_level_histogram[_i9]);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.definition_level_histogram = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t SizeStatistics::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("SizeStatistics");
-
-  if (this->__isset.unencoded_byte_array_data_bytes) {
-    xfer += oprot->writeFieldBegin("unencoded_byte_array_data_bytes", ::apache::thrift::protocol::T_I64, 1);
-    xfer += oprot->writeI64(this->unencoded_byte_array_data_bytes);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.repetition_level_histogram) {
-    xfer += oprot->writeFieldBegin("repetition_level_histogram", ::apache::thrift::protocol::T_LIST, 2);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->repetition_level_histogram.size()));
-      std::vector<int64_t> ::const_iterator _iter10;
-      for (_iter10 = this->repetition_level_histogram.begin(); _iter10 != this->repetition_level_histogram.end(); ++_iter10)
-      {
-        xfer += oprot->writeI64((*_iter10));
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.definition_level_histogram) {
-    xfer += oprot->writeFieldBegin("definition_level_histogram", ::apache::thrift::protocol::T_LIST, 3);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->definition_level_histogram.size()));
-      std::vector<int64_t> ::const_iterator _iter11;
-      for (_iter11 = this->definition_level_histogram.begin(); _iter11 != this->definition_level_histogram.end(); ++_iter11)
-      {
-        xfer += oprot->writeI64((*_iter11));
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(SizeStatistics &a, SizeStatistics &b) {
   using ::std::swap;
   swap(a.unencoded_byte_array_data_bytes, b.unencoded_byte_array_data_bytes);
@@ -856,153 +734,6 @@ std::ostream& operator<<(std::ostream& out, const Statistics& obj)
 }
 
 
-uint32_t Statistics::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readBinary(this->max);
-          this->__isset.max = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readBinary(this->min);
-          this->__isset.min = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->null_count);
-          this->__isset.null_count = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->distinct_count);
-          this->__isset.distinct_count = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readBinary(this->max_value);
-          this->__isset.max_value = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 6:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readBinary(this->min_value);
-          this->__isset.min_value = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 7:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->is_max_value_exact);
-          this->__isset.is_max_value_exact = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 8:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->is_min_value_exact);
-          this->__isset.is_min_value_exact = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t Statistics::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Statistics");
-
-  if (this->__isset.max) {
-    xfer += oprot->writeFieldBegin("max", ::apache::thrift::protocol::T_STRING, 1);
-    xfer += oprot->writeBinary(this->max);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.min) {
-    xfer += oprot->writeFieldBegin("min", ::apache::thrift::protocol::T_STRING, 2);
-    xfer += oprot->writeBinary(this->min);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.null_count) {
-    xfer += oprot->writeFieldBegin("null_count", ::apache::thrift::protocol::T_I64, 3);
-    xfer += oprot->writeI64(this->null_count);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.distinct_count) {
-    xfer += oprot->writeFieldBegin("distinct_count", ::apache::thrift::protocol::T_I64, 4);
-    xfer += oprot->writeI64(this->distinct_count);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.max_value) {
-    xfer += oprot->writeFieldBegin("max_value", ::apache::thrift::protocol::T_STRING, 5);
-    xfer += oprot->writeBinary(this->max_value);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.min_value) {
-    xfer += oprot->writeFieldBegin("min_value", ::apache::thrift::protocol::T_STRING, 6);
-    xfer += oprot->writeBinary(this->min_value);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.is_max_value_exact) {
-    xfer += oprot->writeFieldBegin("is_max_value_exact", ::apache::thrift::protocol::T_BOOL, 7);
-    xfer += oprot->writeBool(this->is_max_value_exact);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.is_min_value_exact) {
-    xfer += oprot->writeFieldBegin("is_min_value_exact", ::apache::thrift::protocol::T_BOOL, 8);
-    xfer += oprot->writeBool(this->is_min_value_exact);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(Statistics &a, Statistics &b) {
   using ::std::swap;
   swap(a.max, b.max);
@@ -1087,44 +818,6 @@ std::ostream& operator<<(std::ostream& out, const StringType& obj)
 }
 
 
-uint32_t StringType::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t StringType::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("StringType");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(StringType &a, StringType &b) {
   using ::std::swap;
   (void) a;
@@ -1162,44 +855,6 @@ std::ostream& operator<<(std::ostream& out, const UUIDType& obj)
 }
 
 
-uint32_t UUIDType::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t UUIDType::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("UUIDType");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(UUIDType &a, UUIDType &b) {
   using ::std::swap;
   (void) a;
@@ -1237,44 +892,6 @@ std::ostream& operator<<(std::ostream& out, const MapType& obj)
 }
 
 
-uint32_t MapType::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t MapType::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("MapType");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(MapType &a, MapType &b) {
   using ::std::swap;
   (void) a;
@@ -1312,44 +929,6 @@ std::ostream& operator<<(std::ostream& out, const ListType& obj)
 }
 
 
-uint32_t ListType::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t ListType::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("ListType");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(ListType &a, ListType &b) {
   using ::std::swap;
   (void) a;
@@ -1387,44 +966,6 @@ std::ostream& operator<<(std::ostream& out, const EnumType& obj)
 }
 
 
-uint32_t EnumType::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t EnumType::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("EnumType");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(EnumType &a, EnumType &b) {
   using ::std::swap;
   (void) a;
@@ -1462,44 +1003,6 @@ std::ostream& operator<<(std::ostream& out, const DateType& obj)
 }
 
 
-uint32_t DateType::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t DateType::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("DateType");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(DateType &a, DateType &b) {
   using ::std::swap;
   (void) a;
@@ -1537,44 +1040,6 @@ std::ostream& operator<<(std::ostream& out, const Float16Type& obj)
 }
 
 
-uint32_t Float16Type::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t Float16Type::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Float16Type");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(Float16Type &a, Float16Type &b) {
   using ::std::swap;
   (void) a;
@@ -1612,44 +1077,6 @@ std::ostream& operator<<(std::ostream& out, const NullType& obj)
 }
 
 
-uint32_t NullType::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t NullType::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("NullType");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(NullType &a, NullType &b) {
   using ::std::swap;
   (void) a;
@@ -1695,79 +1122,6 @@ std::ostream& operator<<(std::ostream& out, const DecimalType& obj)
 }
 
 
-uint32_t DecimalType::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_scale = false;
-  bool isset_precision = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->scale);
-          isset_scale = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->precision);
-          isset_precision = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_scale)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_precision)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t DecimalType::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("DecimalType");
-
-  xfer += oprot->writeFieldBegin("scale", ::apache::thrift::protocol::T_I32, 1);
-  xfer += oprot->writeI32(this->scale);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("precision", ::apache::thrift::protocol::T_I32, 2);
-  xfer += oprot->writeI32(this->precision);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(DecimalType &a, DecimalType &b) {
   using ::std::swap;
   swap(a.scale, b.scale);
@@ -1811,44 +1165,6 @@ std::ostream& operator<<(std::ostream& out, const MilliSeconds& obj)
 }
 
 
-uint32_t MilliSeconds::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t MilliSeconds::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("MilliSeconds");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(MilliSeconds &a, MilliSeconds &b) {
   using ::std::swap;
   (void) a;
@@ -1886,44 +1202,6 @@ std::ostream& operator<<(std::ostream& out, const MicroSeconds& obj)
 }
 
 
-uint32_t MicroSeconds::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t MicroSeconds::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("MicroSeconds");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(MicroSeconds &a, MicroSeconds &b) {
   using ::std::swap;
   (void) a;
@@ -1961,44 +1239,6 @@ std::ostream& operator<<(std::ostream& out, const NanoSeconds& obj)
 }
 
 
-uint32_t NanoSeconds::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t NanoSeconds::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("NanoSeconds");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(NanoSeconds &a, NanoSeconds &b) {
   using ::std::swap;
   (void) a;
@@ -2051,88 +1291,6 @@ std::ostream& operator<<(std::ostream& out, const TimeUnit& obj)
 }
 
 
-uint32_t TimeUnit::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->MILLIS.read(iprot);
-          this->__isset.MILLIS = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->MICROS.read(iprot);
-          this->__isset.MICROS = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->NANOS.read(iprot);
-          this->__isset.NANOS = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t TimeUnit::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("TimeUnit");
-
-  if (this->__isset.MILLIS) {
-    xfer += oprot->writeFieldBegin("MILLIS", ::apache::thrift::protocol::T_STRUCT, 1);
-    xfer += this->MILLIS.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.MICROS) {
-    xfer += oprot->writeFieldBegin("MICROS", ::apache::thrift::protocol::T_STRUCT, 2);
-    xfer += this->MICROS.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.NANOS) {
-    xfer += oprot->writeFieldBegin("NANOS", ::apache::thrift::protocol::T_STRUCT, 3);
-    xfer += this->NANOS.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(TimeUnit &a, TimeUnit &b) {
   using ::std::swap;
   swap(a.MILLIS, b.MILLIS);
@@ -2195,79 +1353,6 @@ std::ostream& operator<<(std::ostream& out, const TimestampType& obj)
 }
 
 
-uint32_t TimestampType::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_isAdjustedToUTC = false;
-  bool isset_unit = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->isAdjustedToUTC);
-          isset_isAdjustedToUTC = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->unit.read(iprot);
-          isset_unit = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_isAdjustedToUTC)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_unit)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t TimestampType::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("TimestampType");
-
-  xfer += oprot->writeFieldBegin("isAdjustedToUTC", ::apache::thrift::protocol::T_BOOL, 1);
-  xfer += oprot->writeBool(this->isAdjustedToUTC);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("unit", ::apache::thrift::protocol::T_STRUCT, 2);
-  xfer += this->unit.write(oprot);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(TimestampType &a, TimestampType &b) {
   using ::std::swap;
   swap(a.isAdjustedToUTC, b.isAdjustedToUTC);
@@ -2319,79 +1404,6 @@ std::ostream& operator<<(std::ostream& out, const TimeType& obj)
 }
 
 
-uint32_t TimeType::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_isAdjustedToUTC = false;
-  bool isset_unit = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->isAdjustedToUTC);
-          isset_isAdjustedToUTC = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->unit.read(iprot);
-          isset_unit = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_isAdjustedToUTC)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_unit)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t TimeType::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("TimeType");
-
-  xfer += oprot->writeFieldBegin("isAdjustedToUTC", ::apache::thrift::protocol::T_BOOL, 1);
-  xfer += oprot->writeBool(this->isAdjustedToUTC);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("unit", ::apache::thrift::protocol::T_STRUCT, 2);
-  xfer += this->unit.write(oprot);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(TimeType &a, TimeType &b) {
   using ::std::swap;
   swap(a.isAdjustedToUTC, b.isAdjustedToUTC);
@@ -2443,79 +1455,6 @@ std::ostream& operator<<(std::ostream& out, const IntType& obj)
 }
 
 
-uint32_t IntType::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_bitWidth = false;
-  bool isset_isSigned = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_BYTE) {
-          xfer += iprot->readByte(this->bitWidth);
-          isset_bitWidth = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->isSigned);
-          isset_isSigned = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_bitWidth)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_isSigned)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t IntType::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("IntType");
-
-  xfer += oprot->writeFieldBegin("bitWidth", ::apache::thrift::protocol::T_BYTE, 1);
-  xfer += oprot->writeByte(this->bitWidth);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("isSigned", ::apache::thrift::protocol::T_BOOL, 2);
-  xfer += oprot->writeBool(this->isSigned);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(IntType &a, IntType &b) {
   using ::std::swap;
   swap(a.bitWidth, b.bitWidth);
@@ -2559,44 +1498,6 @@ std::ostream& operator<<(std::ostream& out, const JsonType& obj)
 }
 
 
-uint32_t JsonType::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t JsonType::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("JsonType");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(JsonType &a, JsonType &b) {
   using ::std::swap;
   (void) a;
@@ -2634,44 +1535,6 @@ std::ostream& operator<<(std::ostream& out, const BsonType& obj)
 }
 
 
-uint32_t BsonType::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t BsonType::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("BsonType");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(BsonType &a, BsonType &b) {
   using ::std::swap;
   (void) a;
@@ -2779,231 +1642,6 @@ std::ostream& operator<<(std::ostream& out, const LogicalType& obj)
 }
 
 
-uint32_t LogicalType::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->STRING.read(iprot);
-          this->__isset.STRING = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->MAP.read(iprot);
-          this->__isset.MAP = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->LIST.read(iprot);
-          this->__isset.LIST = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->ENUM.read(iprot);
-          this->__isset.ENUM = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->DECIMAL.read(iprot);
-          this->__isset.DECIMAL = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 6:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->DATE.read(iprot);
-          this->__isset.DATE = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 7:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->TIME.read(iprot);
-          this->__isset.TIME = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 8:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->TIMESTAMP.read(iprot);
-          this->__isset.TIMESTAMP = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 10:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->INTEGER.read(iprot);
-          this->__isset.INTEGER = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 11:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->UNKNOWN.read(iprot);
-          this->__isset.UNKNOWN = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 12:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->JSON.read(iprot);
-          this->__isset.JSON = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 13:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->BSON.read(iprot);
-          this->__isset.BSON = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 14:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->UUID.read(iprot);
-          this->__isset.UUID = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 15:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->FLOAT16.read(iprot);
-          this->__isset.FLOAT16 = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t LogicalType::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("LogicalType");
-
-  if (this->__isset.STRING) {
-    xfer += oprot->writeFieldBegin("STRING", ::apache::thrift::protocol::T_STRUCT, 1);
-    xfer += this->STRING.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.MAP) {
-    xfer += oprot->writeFieldBegin("MAP", ::apache::thrift::protocol::T_STRUCT, 2);
-    xfer += this->MAP.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.LIST) {
-    xfer += oprot->writeFieldBegin("LIST", ::apache::thrift::protocol::T_STRUCT, 3);
-    xfer += this->LIST.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.ENUM) {
-    xfer += oprot->writeFieldBegin("ENUM", ::apache::thrift::protocol::T_STRUCT, 4);
-    xfer += this->ENUM.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.DECIMAL) {
-    xfer += oprot->writeFieldBegin("DECIMAL", ::apache::thrift::protocol::T_STRUCT, 5);
-    xfer += this->DECIMAL.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.DATE) {
-    xfer += oprot->writeFieldBegin("DATE", ::apache::thrift::protocol::T_STRUCT, 6);
-    xfer += this->DATE.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.TIME) {
-    xfer += oprot->writeFieldBegin("TIME", ::apache::thrift::protocol::T_STRUCT, 7);
-    xfer += this->TIME.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.TIMESTAMP) {
-    xfer += oprot->writeFieldBegin("TIMESTAMP", ::apache::thrift::protocol::T_STRUCT, 8);
-    xfer += this->TIMESTAMP.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.INTEGER) {
-    xfer += oprot->writeFieldBegin("INTEGER", ::apache::thrift::protocol::T_STRUCT, 10);
-    xfer += this->INTEGER.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.UNKNOWN) {
-    xfer += oprot->writeFieldBegin("UNKNOWN", ::apache::thrift::protocol::T_STRUCT, 11);
-    xfer += this->UNKNOWN.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.JSON) {
-    xfer += oprot->writeFieldBegin("JSON", ::apache::thrift::protocol::T_STRUCT, 12);
-    xfer += this->JSON.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.BSON) {
-    xfer += oprot->writeFieldBegin("BSON", ::apache::thrift::protocol::T_STRUCT, 13);
-    xfer += this->BSON.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.UUID) {
-    xfer += oprot->writeFieldBegin("UUID", ::apache::thrift::protocol::T_STRUCT, 14);
-    xfer += this->UUID.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.FLOAT16) {
-    xfer += oprot->writeFieldBegin("FLOAT16", ::apache::thrift::protocol::T_STRUCT, 15);
-    xfer += this->FLOAT16.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(LogicalType &a, LogicalType &b) {
   using ::std::swap;
   swap(a.STRING, b.STRING);
@@ -3173,187 +1811,6 @@ std::ostream& operator<<(std::ostream& out, const SchemaElement& obj)
 }
 
 
-uint32_t SchemaElement::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_name = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast96;
-          xfer += iprot->readI32(ecast96);
-          this->type = static_cast<Type::type>(ecast96);
-          this->__isset.type = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->type_length);
-          this->__isset.type_length = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast97;
-          xfer += iprot->readI32(ecast97);
-          this->repetition_type = static_cast<FieldRepetitionType::type>(ecast97);
-          this->__isset.repetition_type = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->name);
-          isset_name = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->num_children);
-          this->__isset.num_children = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 6:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast98;
-          xfer += iprot->readI32(ecast98);
-          this->converted_type = static_cast<ConvertedType::type>(ecast98);
-          this->__isset.converted_type = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 7:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->scale);
-          this->__isset.scale = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 8:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->precision);
-          this->__isset.precision = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 9:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->field_id);
-          this->__isset.field_id = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 10:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->logicalType.read(iprot);
-          this->__isset.logicalType = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_name)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t SchemaElement::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("SchemaElement");
-
-  if (this->__isset.type) {
-    xfer += oprot->writeFieldBegin("type", ::apache::thrift::protocol::T_I32, 1);
-    xfer += oprot->writeI32(static_cast<int32_t>(this->type));
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.type_length) {
-    xfer += oprot->writeFieldBegin("type_length", ::apache::thrift::protocol::T_I32, 2);
-    xfer += oprot->writeI32(this->type_length);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.repetition_type) {
-    xfer += oprot->writeFieldBegin("repetition_type", ::apache::thrift::protocol::T_I32, 3);
-    xfer += oprot->writeI32(static_cast<int32_t>(this->repetition_type));
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldBegin("name", ::apache::thrift::protocol::T_STRING, 4);
-  xfer += oprot->writeString(this->name);
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.num_children) {
-    xfer += oprot->writeFieldBegin("num_children", ::apache::thrift::protocol::T_I32, 5);
-    xfer += oprot->writeI32(this->num_children);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.converted_type) {
-    xfer += oprot->writeFieldBegin("converted_type", ::apache::thrift::protocol::T_I32, 6);
-    xfer += oprot->writeI32(static_cast<int32_t>(this->converted_type));
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.scale) {
-    xfer += oprot->writeFieldBegin("scale", ::apache::thrift::protocol::T_I32, 7);
-    xfer += oprot->writeI32(this->scale);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.precision) {
-    xfer += oprot->writeFieldBegin("precision", ::apache::thrift::protocol::T_I32, 8);
-    xfer += oprot->writeI32(this->precision);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.field_id) {
-    xfer += oprot->writeFieldBegin("field_id", ::apache::thrift::protocol::T_I32, 9);
-    xfer += oprot->writeI32(this->field_id);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.logicalType) {
-    xfer += oprot->writeFieldBegin("logicalType", ::apache::thrift::protocol::T_STRUCT, 10);
-    xfer += this->logicalType.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(SchemaElement &a, SchemaElement &b) {
   using ::std::swap;
   swap(a.type, b.type);
@@ -3471,128 +1928,6 @@ std::ostream& operator<<(std::ostream& out, const DataPageHeader& obj)
 }
 
 
-uint32_t DataPageHeader::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_num_values = false;
-  bool isset_encoding = false;
-  bool isset_definition_level_encoding = false;
-  bool isset_repetition_level_encoding = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->num_values);
-          isset_num_values = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast103;
-          xfer += iprot->readI32(ecast103);
-          this->encoding = static_cast<Encoding::type>(ecast103);
-          isset_encoding = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast104;
-          xfer += iprot->readI32(ecast104);
-          this->definition_level_encoding = static_cast<Encoding::type>(ecast104);
-          isset_definition_level_encoding = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast105;
-          xfer += iprot->readI32(ecast105);
-          this->repetition_level_encoding = static_cast<Encoding::type>(ecast105);
-          isset_repetition_level_encoding = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->statistics.read(iprot);
-          this->__isset.statistics = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_num_values)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_encoding)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_definition_level_encoding)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_repetition_level_encoding)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t DataPageHeader::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("DataPageHeader");
-
-  xfer += oprot->writeFieldBegin("num_values", ::apache::thrift::protocol::T_I32, 1);
-  xfer += oprot->writeI32(this->num_values);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("encoding", ::apache::thrift::protocol::T_I32, 2);
-  xfer += oprot->writeI32(static_cast<int32_t>(this->encoding));
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("definition_level_encoding", ::apache::thrift::protocol::T_I32, 3);
-  xfer += oprot->writeI32(static_cast<int32_t>(this->definition_level_encoding));
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("repetition_level_encoding", ::apache::thrift::protocol::T_I32, 4);
-  xfer += oprot->writeI32(static_cast<int32_t>(this->repetition_level_encoding));
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.statistics) {
-    xfer += oprot->writeFieldBegin("statistics", ::apache::thrift::protocol::T_STRUCT, 5);
-    xfer += this->statistics.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(DataPageHeader &a, DataPageHeader &b) {
   using ::std::swap;
   swap(a.num_values, b.num_values);
@@ -3659,44 +1994,6 @@ std::ostream& operator<<(std::ostream& out, const IndexPageHeader& obj)
 }
 
 
-uint32_t IndexPageHeader::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t IndexPageHeader::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("IndexPageHeader");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(IndexPageHeader &a, IndexPageHeader &b) {
   using ::std::swap;
   (void) a;
@@ -3747,94 +2044,6 @@ std::ostream& operator<<(std::ostream& out, const DictionaryPageHeader& obj)
 }
 
 
-uint32_t DictionaryPageHeader::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_num_values = false;
-  bool isset_encoding = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->num_values);
-          isset_num_values = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast114;
-          xfer += iprot->readI32(ecast114);
-          this->encoding = static_cast<Encoding::type>(ecast114);
-          isset_encoding = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->is_sorted);
-          this->__isset.is_sorted = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_num_values)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_encoding)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t DictionaryPageHeader::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("DictionaryPageHeader");
-
-  xfer += oprot->writeFieldBegin("num_values", ::apache::thrift::protocol::T_I32, 1);
-  xfer += oprot->writeI32(this->num_values);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("encoding", ::apache::thrift::protocol::T_I32, 2);
-  xfer += oprot->writeI32(static_cast<int32_t>(this->encoding));
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.is_sorted) {
-    xfer += oprot->writeFieldBegin("is_sorted", ::apache::thrift::protocol::T_BOOL, 3);
-    xfer += oprot->writeBool(this->is_sorted);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(DictionaryPageHeader &a, DictionaryPageHeader &b) {
   using ::std::swap;
   swap(a.num_values, b.num_values);
@@ -3923,167 +2132,6 @@ std::ostream& operator<<(std::ostream& out, const DataPageHeaderV2& obj)
 }
 
 
-uint32_t DataPageHeaderV2::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_num_values = false;
-  bool isset_num_nulls = false;
-  bool isset_num_rows = false;
-  bool isset_encoding = false;
-  bool isset_definition_levels_byte_length = false;
-  bool isset_repetition_levels_byte_length = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->num_values);
-          isset_num_values = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->num_nulls);
-          isset_num_nulls = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->num_rows);
-          isset_num_rows = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast119;
-          xfer += iprot->readI32(ecast119);
-          this->encoding = static_cast<Encoding::type>(ecast119);
-          isset_encoding = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->definition_levels_byte_length);
-          isset_definition_levels_byte_length = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 6:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->repetition_levels_byte_length);
-          isset_repetition_levels_byte_length = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 7:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->is_compressed);
-          this->__isset.is_compressed = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 8:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->statistics.read(iprot);
-          this->__isset.statistics = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_num_values)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_num_nulls)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_num_rows)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_encoding)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_definition_levels_byte_length)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_repetition_levels_byte_length)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t DataPageHeaderV2::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("DataPageHeaderV2");
-
-  xfer += oprot->writeFieldBegin("num_values", ::apache::thrift::protocol::T_I32, 1);
-  xfer += oprot->writeI32(this->num_values);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("num_nulls", ::apache::thrift::protocol::T_I32, 2);
-  xfer += oprot->writeI32(this->num_nulls);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("num_rows", ::apache::thrift::protocol::T_I32, 3);
-  xfer += oprot->writeI32(this->num_rows);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("encoding", ::apache::thrift::protocol::T_I32, 4);
-  xfer += oprot->writeI32(static_cast<int32_t>(this->encoding));
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("definition_levels_byte_length", ::apache::thrift::protocol::T_I32, 5);
-  xfer += oprot->writeI32(this->definition_levels_byte_length);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("repetition_levels_byte_length", ::apache::thrift::protocol::T_I32, 6);
-  xfer += oprot->writeI32(this->repetition_levels_byte_length);
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.is_compressed) {
-    xfer += oprot->writeFieldBegin("is_compressed", ::apache::thrift::protocol::T_BOOL, 7);
-    xfer += oprot->writeBool(this->is_compressed);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.statistics) {
-    xfer += oprot->writeFieldBegin("statistics", ::apache::thrift::protocol::T_STRUCT, 8);
-    xfer += this->statistics.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(DataPageHeaderV2 &a, DataPageHeaderV2 &b) {
   using ::std::swap;
   swap(a.num_values, b.num_values);
@@ -4168,44 +2216,6 @@ std::ostream& operator<<(std::ostream& out, const SplitBlockAlgorithm& obj)
 }
 
 
-uint32_t SplitBlockAlgorithm::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t SplitBlockAlgorithm::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("SplitBlockAlgorithm");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(SplitBlockAlgorithm &a, SplitBlockAlgorithm &b) {
   using ::std::swap;
   (void) a;
@@ -4248,62 +2258,6 @@ std::ostream& operator<<(std::ostream& out, const BloomFilterAlgorithm& obj)
 }
 
 
-uint32_t BloomFilterAlgorithm::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->BLOCK.read(iprot);
-          this->__isset.BLOCK = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t BloomFilterAlgorithm::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("BloomFilterAlgorithm");
-
-  if (this->__isset.BLOCK) {
-    xfer += oprot->writeFieldBegin("BLOCK", ::apache::thrift::protocol::T_STRUCT, 1);
-    xfer += this->BLOCK.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(BloomFilterAlgorithm &a, BloomFilterAlgorithm &b) {
   using ::std::swap;
   swap(a.BLOCK, b.BLOCK);
@@ -4346,44 +2300,6 @@ std::ostream& operator<<(std::ostream& out, const XxHash& obj)
 }
 
 
-uint32_t XxHash::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t XxHash::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("XxHash");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(XxHash &a, XxHash &b) {
   using ::std::swap;
   (void) a;
@@ -4426,62 +2342,6 @@ std::ostream& operator<<(std::ostream& out, const BloomFilterHash& obj)
 }
 
 
-uint32_t BloomFilterHash::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->XXHASH.read(iprot);
-          this->__isset.XXHASH = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t BloomFilterHash::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("BloomFilterHash");
-
-  if (this->__isset.XXHASH) {
-    xfer += oprot->writeFieldBegin("XXHASH", ::apache::thrift::protocol::T_STRUCT, 1);
-    xfer += this->XXHASH.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(BloomFilterHash &a, BloomFilterHash &b) {
   using ::std::swap;
   swap(a.XXHASH, b.XXHASH);
@@ -4511,57 +2371,19 @@ void BloomFilterHash::printTo(std::ostream& out) const {
   out << "BloomFilterHash(";
   out << "XXHASH="; (__isset.XXHASH ? (out << to_string(XXHASH)) : (out << "<null>"));
   out << ")";
-}
-
-
-Uncompressed::~Uncompressed() noexcept {
-}
-
-std::ostream& operator<<(std::ostream& out, const Uncompressed& obj)
-{
-  obj.printTo(out);
-  return out;
-}
-
-
-uint32_t Uncompressed::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
+}
 
-  xfer += iprot->readStructEnd();
 
-  return xfer;
+Uncompressed::~Uncompressed() noexcept {
 }
 
-uint32_t Uncompressed::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("Uncompressed");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
+std::ostream& operator<<(std::ostream& out, const Uncompressed& obj)
+{
+  obj.printTo(out);
+  return out;
 }
 
+
 void swap(Uncompressed &a, Uncompressed &b) {
   using ::std::swap;
   (void) a;
@@ -4604,62 +2426,6 @@ std::ostream& operator<<(std::ostream& out, const BloomFilterCompression& obj)
 }
 
 
-uint32_t BloomFilterCompression::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->UNCOMPRESSED.read(iprot);
-          this->__isset.UNCOMPRESSED = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t BloomFilterCompression::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("BloomFilterCompression");
-
-  if (this->__isset.UNCOMPRESSED) {
-    xfer += oprot->writeFieldBegin("UNCOMPRESSED", ::apache::thrift::protocol::T_STRUCT, 1);
-    xfer += this->UNCOMPRESSED.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(BloomFilterCompression &a, BloomFilterCompression &b) {
   using ::std::swap;
   swap(a.UNCOMPRESSED, b.UNCOMPRESSED);
@@ -4718,109 +2484,6 @@ std::ostream& operator<<(std::ostream& out, const BloomFilterHeader& obj)
 }
 
 
-uint32_t BloomFilterHeader::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_numBytes = false;
-  bool isset_algorithm = false;
-  bool isset_hash = false;
-  bool isset_compression = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->numBytes);
-          isset_numBytes = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->algorithm.read(iprot);
-          isset_algorithm = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->hash.read(iprot);
-          isset_hash = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->compression.read(iprot);
-          isset_compression = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_numBytes)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_algorithm)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_hash)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_compression)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t BloomFilterHeader::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("BloomFilterHeader");
-
-  xfer += oprot->writeFieldBegin("numBytes", ::apache::thrift::protocol::T_I32, 1);
-  xfer += oprot->writeI32(this->numBytes);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("algorithm", ::apache::thrift::protocol::T_STRUCT, 2);
-  xfer += this->algorithm.write(oprot);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("hash", ::apache::thrift::protocol::T_STRUCT, 3);
-  xfer += this->hash.write(oprot);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("compression", ::apache::thrift::protocol::T_STRUCT, 4);
-  xfer += this->compression.write(oprot);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(BloomFilterHeader &a, BloomFilterHeader &b) {
   using ::std::swap;
   swap(a.numBytes, b.numBytes);
@@ -4913,161 +2576,6 @@ std::ostream& operator<<(std::ostream& out, const PageHeader& obj)
 }
 
 
-uint32_t PageHeader::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_type = false;
-  bool isset_uncompressed_page_size = false;
-  bool isset_compressed_page_size = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast152;
-          xfer += iprot->readI32(ecast152);
-          this->type = static_cast<PageType::type>(ecast152);
-          isset_type = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->uncompressed_page_size);
-          isset_uncompressed_page_size = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->compressed_page_size);
-          isset_compressed_page_size = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->crc);
-          this->__isset.crc = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->data_page_header.read(iprot);
-          this->__isset.data_page_header = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 6:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->index_page_header.read(iprot);
-          this->__isset.index_page_header = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 7:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->dictionary_page_header.read(iprot);
-          this->__isset.dictionary_page_header = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 8:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->data_page_header_v2.read(iprot);
-          this->__isset.data_page_header_v2 = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_type)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_uncompressed_page_size)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_compressed_page_size)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t PageHeader::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("PageHeader");
-
-  xfer += oprot->writeFieldBegin("type", ::apache::thrift::protocol::T_I32, 1);
-  xfer += oprot->writeI32(static_cast<int32_t>(this->type));
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("uncompressed_page_size", ::apache::thrift::protocol::T_I32, 2);
-  xfer += oprot->writeI32(this->uncompressed_page_size);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("compressed_page_size", ::apache::thrift::protocol::T_I32, 3);
-  xfer += oprot->writeI32(this->compressed_page_size);
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.crc) {
-    xfer += oprot->writeFieldBegin("crc", ::apache::thrift::protocol::T_I32, 4);
-    xfer += oprot->writeI32(this->crc);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.data_page_header) {
-    xfer += oprot->writeFieldBegin("data_page_header", ::apache::thrift::protocol::T_STRUCT, 5);
-    xfer += this->data_page_header.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.index_page_header) {
-    xfer += oprot->writeFieldBegin("index_page_header", ::apache::thrift::protocol::T_STRUCT, 6);
-    xfer += this->index_page_header.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.dictionary_page_header) {
-    xfer += oprot->writeFieldBegin("dictionary_page_header", ::apache::thrift::protocol::T_STRUCT, 7);
-    xfer += this->dictionary_page_header.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.data_page_header_v2) {
-    xfer += oprot->writeFieldBegin("data_page_header_v2", ::apache::thrift::protocol::T_STRUCT, 8);
-    xfer += this->data_page_header_v2.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(PageHeader &a, PageHeader &b) {
   using ::std::swap;
   swap(a.type, b.type);
@@ -5161,77 +2669,6 @@ std::ostream& operator<<(std::ostream& out, const KeyValue& obj)
 }
 
 
-uint32_t KeyValue::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_key = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->key);
-          isset_key = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->value);
-          this->__isset.value = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_key)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t KeyValue::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("KeyValue");
-
-  xfer += oprot->writeFieldBegin("key", ::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString(this->key);
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.value) {
-    xfer += oprot->writeFieldBegin("value", ::apache::thrift::protocol::T_STRING, 2);
-    xfer += oprot->writeString(this->value);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(KeyValue &a, KeyValue &b) {
   using ::std::swap;
   swap(a.key, b.key);
@@ -5292,94 +2729,6 @@ std::ostream& operator<<(std::ostream& out, const SortingColumn& obj)
 }
 
 
-uint32_t SortingColumn::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_column_idx = false;
-  bool isset_descending = false;
-  bool isset_nulls_first = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->column_idx);
-          isset_column_idx = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->descending);
-          isset_descending = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->nulls_first);
-          isset_nulls_first = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_column_idx)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_descending)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_nulls_first)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t SortingColumn::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("SortingColumn");
-
-  xfer += oprot->writeFieldBegin("column_idx", ::apache::thrift::protocol::T_I32, 1);
-  xfer += oprot->writeI32(this->column_idx);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("descending", ::apache::thrift::protocol::T_BOOL, 2);
-  xfer += oprot->writeBool(this->descending);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("nulls_first", ::apache::thrift::protocol::T_BOOL, 3);
-  xfer += oprot->writeBool(this->nulls_first);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(SortingColumn &a, SortingColumn &b) {
   using ::std::swap;
   swap(a.column_idx, b.column_idx);
@@ -5441,98 +2790,6 @@ std::ostream& operator<<(std::ostream& out, const PageEncodingStats& obj)
 }
 
 
-uint32_t PageEncodingStats::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_page_type = false;
-  bool isset_encoding = false;
-  bool isset_count = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast165;
-          xfer += iprot->readI32(ecast165);
-          this->page_type = static_cast<PageType::type>(ecast165);
-          isset_page_type = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast166;
-          xfer += iprot->readI32(ecast166);
-          this->encoding = static_cast<Encoding::type>(ecast166);
-          isset_encoding = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->count);
-          isset_count = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_page_type)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_encoding)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_count)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t PageEncodingStats::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("PageEncodingStats");
-
-  xfer += oprot->writeFieldBegin("page_type", ::apache::thrift::protocol::T_I32, 1);
-  xfer += oprot->writeI32(static_cast<int32_t>(this->page_type));
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("encoding", ::apache::thrift::protocol::T_I32, 2);
-  xfer += oprot->writeI32(static_cast<int32_t>(this->encoding));
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("count", ::apache::thrift::protocol::T_I32, 3);
-  xfer += oprot->writeI32(this->count);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(PageEncodingStats &a, PageEncodingStats &b) {
   using ::std::swap;
   swap(a.page_type, b.page_type);
@@ -5654,359 +2911,6 @@ std::ostream& operator<<(std::ostream& out, const ColumnMetaData& obj)
 }
 
 
-uint32_t ColumnMetaData::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_type = false;
-  bool isset_encodings = false;
-  bool isset_path_in_schema = false;
-  bool isset_codec = false;
-  bool isset_num_values = false;
-  bool isset_total_uncompressed_size = false;
-  bool isset_total_compressed_size = false;
-  bool isset_data_page_offset = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast171;
-          xfer += iprot->readI32(ecast171);
-          this->type = static_cast<Type::type>(ecast171);
-          isset_type = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->encodings.clear();
-            uint32_t _size172;
-            ::apache::thrift::protocol::TType _etype175;
-            xfer += iprot->readListBegin(_etype175, _size172);
-            this->encodings.resize(_size172);
-            uint32_t _i176;
-            for (_i176 = 0; _i176 < _size172; ++_i176)
-            {
-              int32_t ecast177;
-              xfer += iprot->readI32(ecast177);
-              this->encodings[_i176] = static_cast<Encoding::type>(ecast177);
-            }
-            xfer += iprot->readListEnd();
-          }
-          isset_encodings = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->path_in_schema.clear();
-            uint32_t _size178;
-            ::apache::thrift::protocol::TType _etype181;
-            xfer += iprot->readListBegin(_etype181, _size178);
-            this->path_in_schema.resize(_size178);
-            uint32_t _i182;
-            for (_i182 = 0; _i182 < _size178; ++_i182)
-            {
-              xfer += iprot->readString(this->path_in_schema[_i182]);
-            }
-            xfer += iprot->readListEnd();
-          }
-          isset_path_in_schema = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast183;
-          xfer += iprot->readI32(ecast183);
-          this->codec = static_cast<CompressionCodec::type>(ecast183);
-          isset_codec = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->num_values);
-          isset_num_values = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 6:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->total_uncompressed_size);
-          isset_total_uncompressed_size = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 7:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->total_compressed_size);
-          isset_total_compressed_size = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 8:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->key_value_metadata.clear();
-            uint32_t _size184;
-            ::apache::thrift::protocol::TType _etype187;
-            xfer += iprot->readListBegin(_etype187, _size184);
-            this->key_value_metadata.resize(_size184);
-            uint32_t _i188;
-            for (_i188 = 0; _i188 < _size184; ++_i188)
-            {
-              xfer += this->key_value_metadata[_i188].read(iprot);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.key_value_metadata = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 9:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->data_page_offset);
-          isset_data_page_offset = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 10:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->index_page_offset);
-          this->__isset.index_page_offset = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 11:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->dictionary_page_offset);
-          this->__isset.dictionary_page_offset = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 12:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->statistics.read(iprot);
-          this->__isset.statistics = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 13:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->encoding_stats.clear();
-            uint32_t _size189;
-            ::apache::thrift::protocol::TType _etype192;
-            xfer += iprot->readListBegin(_etype192, _size189);
-            this->encoding_stats.resize(_size189);
-            uint32_t _i193;
-            for (_i193 = 0; _i193 < _size189; ++_i193)
-            {
-              xfer += this->encoding_stats[_i193].read(iprot);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.encoding_stats = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 14:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->bloom_filter_offset);
-          this->__isset.bloom_filter_offset = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 15:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->bloom_filter_length);
-          this->__isset.bloom_filter_length = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 16:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->size_statistics.read(iprot);
-          this->__isset.size_statistics = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_type)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_encodings)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_path_in_schema)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_codec)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_num_values)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_total_uncompressed_size)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_total_compressed_size)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_data_page_offset)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t ColumnMetaData::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("ColumnMetaData");
-
-  xfer += oprot->writeFieldBegin("type", ::apache::thrift::protocol::T_I32, 1);
-  xfer += oprot->writeI32(static_cast<int32_t>(this->type));
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("encodings", ::apache::thrift::protocol::T_LIST, 2);
-  {
-    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->encodings.size()));
-    std::vector<Encoding::type> ::const_iterator _iter194;
-    for (_iter194 = this->encodings.begin(); _iter194 != this->encodings.end(); ++_iter194)
-    {
-      xfer += oprot->writeI32(static_cast<int32_t>((*_iter194)));
-    }
-    xfer += oprot->writeListEnd();
-  }
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("path_in_schema", ::apache::thrift::protocol::T_LIST, 3);
-  {
-    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->path_in_schema.size()));
-    std::vector<std::string> ::const_iterator _iter195;
-    for (_iter195 = this->path_in_schema.begin(); _iter195 != this->path_in_schema.end(); ++_iter195)
-    {
-      xfer += oprot->writeString((*_iter195));
-    }
-    xfer += oprot->writeListEnd();
-  }
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("codec", ::apache::thrift::protocol::T_I32, 4);
-  xfer += oprot->writeI32(static_cast<int32_t>(this->codec));
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("num_values", ::apache::thrift::protocol::T_I64, 5);
-  xfer += oprot->writeI64(this->num_values);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("total_uncompressed_size", ::apache::thrift::protocol::T_I64, 6);
-  xfer += oprot->writeI64(this->total_uncompressed_size);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("total_compressed_size", ::apache::thrift::protocol::T_I64, 7);
-  xfer += oprot->writeI64(this->total_compressed_size);
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.key_value_metadata) {
-    xfer += oprot->writeFieldBegin("key_value_metadata", ::apache::thrift::protocol::T_LIST, 8);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->key_value_metadata.size()));
-      std::vector<KeyValue> ::const_iterator _iter196;
-      for (_iter196 = this->key_value_metadata.begin(); _iter196 != this->key_value_metadata.end(); ++_iter196)
-      {
-        xfer += (*_iter196).write(oprot);
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldBegin("data_page_offset", ::apache::thrift::protocol::T_I64, 9);
-  xfer += oprot->writeI64(this->data_page_offset);
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.index_page_offset) {
-    xfer += oprot->writeFieldBegin("index_page_offset", ::apache::thrift::protocol::T_I64, 10);
-    xfer += oprot->writeI64(this->index_page_offset);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.dictionary_page_offset) {
-    xfer += oprot->writeFieldBegin("dictionary_page_offset", ::apache::thrift::protocol::T_I64, 11);
-    xfer += oprot->writeI64(this->dictionary_page_offset);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.statistics) {
-    xfer += oprot->writeFieldBegin("statistics", ::apache::thrift::protocol::T_STRUCT, 12);
-    xfer += this->statistics.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.encoding_stats) {
-    xfer += oprot->writeFieldBegin("encoding_stats", ::apache::thrift::protocol::T_LIST, 13);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->encoding_stats.size()));
-      std::vector<PageEncodingStats> ::const_iterator _iter197;
-      for (_iter197 = this->encoding_stats.begin(); _iter197 != this->encoding_stats.end(); ++_iter197)
-      {
-        xfer += (*_iter197).write(oprot);
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.bloom_filter_offset) {
-    xfer += oprot->writeFieldBegin("bloom_filter_offset", ::apache::thrift::protocol::T_I64, 14);
-    xfer += oprot->writeI64(this->bloom_filter_offset);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.bloom_filter_length) {
-    xfer += oprot->writeFieldBegin("bloom_filter_length", ::apache::thrift::protocol::T_I32, 15);
-    xfer += oprot->writeI32(this->bloom_filter_length);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.size_statistics) {
-    xfer += oprot->writeFieldBegin("size_statistics", ::apache::thrift::protocol::T_STRUCT, 16);
-    xfer += this->size_statistics.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(ColumnMetaData &a, ColumnMetaData &b) {
   using ::std::swap;
   swap(a.type, b.type);
@@ -6139,44 +3043,6 @@ std::ostream& operator<<(std::ostream& out, const EncryptionWithFooterKey& obj)
 }
 
 
-uint32_t EncryptionWithFooterKey::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t EncryptionWithFooterKey::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("EncryptionWithFooterKey");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(EncryptionWithFooterKey &a, EncryptionWithFooterKey &b) {
   using ::std::swap;
   (void) a;
@@ -6223,97 +3089,6 @@ std::ostream& operator<<(std::ostream& out, const EncryptionWithColumnKey& obj)
 }
 
 
-uint32_t EncryptionWithColumnKey::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_path_in_schema = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->path_in_schema.clear();
-            uint32_t _size206;
-            ::apache::thrift::protocol::TType _etype209;
-            xfer += iprot->readListBegin(_etype209, _size206);
-            this->path_in_schema.resize(_size206);
-            uint32_t _i210;
-            for (_i210 = 0; _i210 < _size206; ++_i210)
-            {
-              xfer += iprot->readString(this->path_in_schema[_i210]);
-            }
-            xfer += iprot->readListEnd();
-          }
-          isset_path_in_schema = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readBinary(this->key_metadata);
-          this->__isset.key_metadata = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_path_in_schema)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t EncryptionWithColumnKey::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("EncryptionWithColumnKey");
-
-  xfer += oprot->writeFieldBegin("path_in_schema", ::apache::thrift::protocol::T_LIST, 1);
-  {
-    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->path_in_schema.size()));
-    std::vector<std::string> ::const_iterator _iter211;
-    for (_iter211 = this->path_in_schema.begin(); _iter211 != this->path_in_schema.end(); ++_iter211)
-    {
-      xfer += oprot->writeString((*_iter211));
-    }
-    xfer += oprot->writeListEnd();
-  }
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.key_metadata) {
-    xfer += oprot->writeFieldBegin("key_metadata", ::apache::thrift::protocol::T_STRING, 2);
-    xfer += oprot->writeBinary(this->key_metadata);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(EncryptionWithColumnKey &a, EncryptionWithColumnKey &b) {
   using ::std::swap;
   swap(a.path_in_schema, b.path_in_schema);
@@ -6372,75 +3147,6 @@ std::ostream& operator<<(std::ostream& out, const ColumnCryptoMetaData& obj)
 }
 
 
-uint32_t ColumnCryptoMetaData::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->ENCRYPTION_WITH_FOOTER_KEY.read(iprot);
-          this->__isset.ENCRYPTION_WITH_FOOTER_KEY = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->ENCRYPTION_WITH_COLUMN_KEY.read(iprot);
-          this->__isset.ENCRYPTION_WITH_COLUMN_KEY = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t ColumnCryptoMetaData::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("ColumnCryptoMetaData");
-
-  if (this->__isset.ENCRYPTION_WITH_FOOTER_KEY) {
-    xfer += oprot->writeFieldBegin("ENCRYPTION_WITH_FOOTER_KEY", ::apache::thrift::protocol::T_STRUCT, 1);
-    xfer += this->ENCRYPTION_WITH_FOOTER_KEY.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.ENCRYPTION_WITH_COLUMN_KEY) {
-    xfer += oprot->writeFieldBegin("ENCRYPTION_WITH_COLUMN_KEY", ::apache::thrift::protocol::T_STRUCT, 2);
-    xfer += this->ENCRYPTION_WITH_COLUMN_KEY.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(ColumnCryptoMetaData &a, ColumnCryptoMetaData &b) {
   using ::std::swap;
   swap(a.ENCRYPTION_WITH_FOOTER_KEY, b.ENCRYPTION_WITH_FOOTER_KEY);
@@ -6533,168 +3239,6 @@ std::ostream& operator<<(std::ostream& out, const ColumnChunk& obj)
 }
 
 
-uint32_t ColumnChunk::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_file_offset = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->file_path);
-          this->__isset.file_path = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->file_offset);
-          isset_file_offset = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->meta_data.read(iprot);
-          this->__isset.meta_data = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->offset_index_offset);
-          this->__isset.offset_index_offset = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->offset_index_length);
-          this->__isset.offset_index_length = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 6:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->column_index_offset);
-          this->__isset.column_index_offset = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 7:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->column_index_length);
-          this->__isset.column_index_length = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 8:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->crypto_metadata.read(iprot);
-          this->__isset.crypto_metadata = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 9:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readBinary(this->encrypted_column_metadata);
-          this->__isset.encrypted_column_metadata = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_file_offset)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t ColumnChunk::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("ColumnChunk");
-
-  if (this->__isset.file_path) {
-    xfer += oprot->writeFieldBegin("file_path", ::apache::thrift::protocol::T_STRING, 1);
-    xfer += oprot->writeString(this->file_path);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldBegin("file_offset", ::apache::thrift::protocol::T_I64, 2);
-  xfer += oprot->writeI64(this->file_offset);
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.meta_data) {
-    xfer += oprot->writeFieldBegin("meta_data", ::apache::thrift::protocol::T_STRUCT, 3);
-    xfer += this->meta_data.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.offset_index_offset) {
-    xfer += oprot->writeFieldBegin("offset_index_offset", ::apache::thrift::protocol::T_I64, 4);
-    xfer += oprot->writeI64(this->offset_index_offset);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.offset_index_length) {
-    xfer += oprot->writeFieldBegin("offset_index_length", ::apache::thrift::protocol::T_I32, 5);
-    xfer += oprot->writeI32(this->offset_index_length);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.column_index_offset) {
-    xfer += oprot->writeFieldBegin("column_index_offset", ::apache::thrift::protocol::T_I64, 6);
-    xfer += oprot->writeI64(this->column_index_offset);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.column_index_length) {
-    xfer += oprot->writeFieldBegin("column_index_length", ::apache::thrift::protocol::T_I32, 7);
-    xfer += oprot->writeI32(this->column_index_length);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.crypto_metadata) {
-    xfer += oprot->writeFieldBegin("crypto_metadata", ::apache::thrift::protocol::T_STRUCT, 8);
-    xfer += this->crypto_metadata.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.encrypted_column_metadata) {
-    xfer += oprot->writeFieldBegin("encrypted_column_metadata", ::apache::thrift::protocol::T_STRING, 9);
-    xfer += oprot->writeBinary(this->encrypted_column_metadata);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(ColumnChunk &a, ColumnChunk &b) {
   using ::std::swap;
   swap(a.file_path, b.file_path);
@@ -6817,186 +3361,6 @@ std::ostream& operator<<(std::ostream& out, const RowGroup& obj)
 }
 
 
-uint32_t RowGroup::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_columns = false;
-  bool isset_total_byte_size = false;
-  bool isset_num_rows = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->columns.clear();
-            uint32_t _size224;
-            ::apache::thrift::protocol::TType _etype227;
-            xfer += iprot->readListBegin(_etype227, _size224);
-            this->columns.resize(_size224);
-            uint32_t _i228;
-            for (_i228 = 0; _i228 < _size224; ++_i228)
-            {
-              xfer += this->columns[_i228].read(iprot);
-            }
-            xfer += iprot->readListEnd();
-          }
-          isset_columns = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->total_byte_size);
-          isset_total_byte_size = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->num_rows);
-          isset_num_rows = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->sorting_columns.clear();
-            uint32_t _size229;
-            ::apache::thrift::protocol::TType _etype232;
-            xfer += iprot->readListBegin(_etype232, _size229);
-            this->sorting_columns.resize(_size229);
-            uint32_t _i233;
-            for (_i233 = 0; _i233 < _size229; ++_i233)
-            {
-              xfer += this->sorting_columns[_i233].read(iprot);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.sorting_columns = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->file_offset);
-          this->__isset.file_offset = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 6:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->total_compressed_size);
-          this->__isset.total_compressed_size = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 7:
-        if (ftype == ::apache::thrift::protocol::T_I16) {
-          xfer += iprot->readI16(this->ordinal);
-          this->__isset.ordinal = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_columns)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_total_byte_size)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_num_rows)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t RowGroup::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("RowGroup");
-
-  xfer += oprot->writeFieldBegin("columns", ::apache::thrift::protocol::T_LIST, 1);
-  {
-    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->columns.size()));
-    std::vector<ColumnChunk> ::const_iterator _iter234;
-    for (_iter234 = this->columns.begin(); _iter234 != this->columns.end(); ++_iter234)
-    {
-      xfer += (*_iter234).write(oprot);
-    }
-    xfer += oprot->writeListEnd();
-  }
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("total_byte_size", ::apache::thrift::protocol::T_I64, 2);
-  xfer += oprot->writeI64(this->total_byte_size);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("num_rows", ::apache::thrift::protocol::T_I64, 3);
-  xfer += oprot->writeI64(this->num_rows);
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.sorting_columns) {
-    xfer += oprot->writeFieldBegin("sorting_columns", ::apache::thrift::protocol::T_LIST, 4);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->sorting_columns.size()));
-      std::vector<SortingColumn> ::const_iterator _iter235;
-      for (_iter235 = this->sorting_columns.begin(); _iter235 != this->sorting_columns.end(); ++_iter235)
-      {
-        xfer += (*_iter235).write(oprot);
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.file_offset) {
-    xfer += oprot->writeFieldBegin("file_offset", ::apache::thrift::protocol::T_I64, 5);
-    xfer += oprot->writeI64(this->file_offset);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.total_compressed_size) {
-    xfer += oprot->writeFieldBegin("total_compressed_size", ::apache::thrift::protocol::T_I64, 6);
-    xfer += oprot->writeI64(this->total_compressed_size);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.ordinal) {
-    xfer += oprot->writeFieldBegin("ordinal", ::apache::thrift::protocol::T_I16, 7);
-    xfer += oprot->writeI16(this->ordinal);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(RowGroup &a, RowGroup &b) {
   using ::std::swap;
   swap(a.columns, b.columns);
@@ -7075,44 +3439,6 @@ std::ostream& operator<<(std::ostream& out, const TypeDefinedOrder& obj)
 }
 
 
-uint32_t TypeDefinedOrder::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    xfer += iprot->skip(ftype);
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t TypeDefinedOrder::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("TypeDefinedOrder");
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(TypeDefinedOrder &a, TypeDefinedOrder &b) {
   using ::std::swap;
   (void) a;
@@ -7155,62 +3481,6 @@ std::ostream& operator<<(std::ostream& out, const ColumnOrder& obj)
 }
 
 
-uint32_t ColumnOrder::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->TYPE_ORDER.read(iprot);
-          this->__isset.TYPE_ORDER = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t ColumnOrder::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("ColumnOrder");
-
-  if (this->__isset.TYPE_ORDER) {
-    xfer += oprot->writeFieldBegin("TYPE_ORDER", ::apache::thrift::protocol::T_STRUCT, 1);
-    xfer += this->TYPE_ORDER.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(ColumnOrder &a, ColumnOrder &b) {
   using ::std::swap;
   swap(a.TYPE_ORDER, b.TYPE_ORDER);
@@ -7265,94 +3535,6 @@ std::ostream& operator<<(std::ostream& out, const PageLocation& obj)
 }
 
 
-uint32_t PageLocation::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_offset = false;
-  bool isset_compressed_page_size = false;
-  bool isset_first_row_index = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->offset);
-          isset_offset = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->compressed_page_size);
-          isset_compressed_page_size = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->first_row_index);
-          isset_first_row_index = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_offset)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_compressed_page_size)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_first_row_index)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t PageLocation::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("PageLocation");
-
-  xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I64, 1);
-  xfer += oprot->writeI64(this->offset);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("compressed_page_size", ::apache::thrift::protocol::T_I32, 2);
-  xfer += oprot->writeI32(this->compressed_page_size);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("first_row_index", ::apache::thrift::protocol::T_I64, 3);
-  xfer += oprot->writeI64(this->first_row_index);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(PageLocation &a, PageLocation &b) {
   using ::std::swap;
   swap(a.offset, b.offset);
@@ -7411,117 +3593,6 @@ std::ostream& operator<<(std::ostream& out, const OffsetIndex& obj)
 }
 
 
-uint32_t OffsetIndex::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_page_locations = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->page_locations.clear();
-            uint32_t _size252;
-            ::apache::thrift::protocol::TType _etype255;
-            xfer += iprot->readListBegin(_etype255, _size252);
-            this->page_locations.resize(_size252);
-            uint32_t _i256;
-            for (_i256 = 0; _i256 < _size252; ++_i256)
-            {
-              xfer += this->page_locations[_i256].read(iprot);
-            }
-            xfer += iprot->readListEnd();
-          }
-          isset_page_locations = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->unencoded_byte_array_data_bytes.clear();
-            uint32_t _size257;
-            ::apache::thrift::protocol::TType _etype260;
-            xfer += iprot->readListBegin(_etype260, _size257);
-            this->unencoded_byte_array_data_bytes.resize(_size257);
-            uint32_t _i261;
-            for (_i261 = 0; _i261 < _size257; ++_i261)
-            {
-              xfer += iprot->readI64(this->unencoded_byte_array_data_bytes[_i261]);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.unencoded_byte_array_data_bytes = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_page_locations)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t OffsetIndex::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("OffsetIndex");
-
-  xfer += oprot->writeFieldBegin("page_locations", ::apache::thrift::protocol::T_LIST, 1);
-  {
-    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->page_locations.size()));
-    std::vector<PageLocation> ::const_iterator _iter262;
-    for (_iter262 = this->page_locations.begin(); _iter262 != this->page_locations.end(); ++_iter262)
-    {
-      xfer += (*_iter262).write(oprot);
-    }
-    xfer += oprot->writeListEnd();
-  }
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.unencoded_byte_array_data_bytes) {
-    xfer += oprot->writeFieldBegin("unencoded_byte_array_data_bytes", ::apache::thrift::protocol::T_LIST, 2);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->unencoded_byte_array_data_bytes.size()));
-      std::vector<int64_t> ::const_iterator _iter263;
-      for (_iter263 = this->unencoded_byte_array_data_bytes.begin(); _iter263 != this->unencoded_byte_array_data_bytes.end(); ++_iter263)
-      {
-        xfer += oprot->writeI64((*_iter263));
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(OffsetIndex &a, OffsetIndex &b) {
   using ::std::swap;
   swap(a.page_locations, b.page_locations);
@@ -7601,270 +3672,6 @@ std::ostream& operator<<(std::ostream& out, const ColumnIndex& obj)
 }
 
 
-uint32_t ColumnIndex::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_null_pages = false;
-  bool isset_min_values = false;
-  bool isset_max_values = false;
-  bool isset_boundary_order = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->null_pages.clear();
-            uint32_t _size268;
-            ::apache::thrift::protocol::TType _etype271;
-            xfer += iprot->readListBegin(_etype271, _size268);
-            this->null_pages.resize(_size268);
-            uint32_t _i272;
-            for (_i272 = 0; _i272 < _size268; ++_i272)
-            {
-              xfer += iprot->readBool(this->null_pages[_i272]);
-            }
-            xfer += iprot->readListEnd();
-          }
-          isset_null_pages = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->min_values.clear();
-            uint32_t _size273;
-            ::apache::thrift::protocol::TType _etype276;
-            xfer += iprot->readListBegin(_etype276, _size273);
-            this->min_values.resize(_size273);
-            uint32_t _i277;
-            for (_i277 = 0; _i277 < _size273; ++_i277)
-            {
-              xfer += iprot->readBinary(this->min_values[_i277]);
-            }
-            xfer += iprot->readListEnd();
-          }
-          isset_min_values = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->max_values.clear();
-            uint32_t _size278;
-            ::apache::thrift::protocol::TType _etype281;
-            xfer += iprot->readListBegin(_etype281, _size278);
-            this->max_values.resize(_size278);
-            uint32_t _i282;
-            for (_i282 = 0; _i282 < _size278; ++_i282)
-            {
-              xfer += iprot->readBinary(this->max_values[_i282]);
-            }
-            xfer += iprot->readListEnd();
-          }
-          isset_max_values = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          int32_t ecast283;
-          xfer += iprot->readI32(ecast283);
-          this->boundary_order = static_cast<BoundaryOrder::type>(ecast283);
-          isset_boundary_order = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->null_counts.clear();
-            uint32_t _size284;
-            ::apache::thrift::protocol::TType _etype287;
-            xfer += iprot->readListBegin(_etype287, _size284);
-            this->null_counts.resize(_size284);
-            uint32_t _i288;
-            for (_i288 = 0; _i288 < _size284; ++_i288)
-            {
-              xfer += iprot->readI64(this->null_counts[_i288]);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.null_counts = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 6:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->repetition_level_histograms.clear();
-            uint32_t _size289;
-            ::apache::thrift::protocol::TType _etype292;
-            xfer += iprot->readListBegin(_etype292, _size289);
-            this->repetition_level_histograms.resize(_size289);
-            uint32_t _i293;
-            for (_i293 = 0; _i293 < _size289; ++_i293)
-            {
-              xfer += iprot->readI64(this->repetition_level_histograms[_i293]);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.repetition_level_histograms = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 7:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->definition_level_histograms.clear();
-            uint32_t _size294;
-            ::apache::thrift::protocol::TType _etype297;
-            xfer += iprot->readListBegin(_etype297, _size294);
-            this->definition_level_histograms.resize(_size294);
-            uint32_t _i298;
-            for (_i298 = 0; _i298 < _size294; ++_i298)
-            {
-              xfer += iprot->readI64(this->definition_level_histograms[_i298]);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.definition_level_histograms = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_null_pages)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_min_values)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_max_values)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_boundary_order)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t ColumnIndex::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("ColumnIndex");
-
-  xfer += oprot->writeFieldBegin("null_pages", ::apache::thrift::protocol::T_LIST, 1);
-  {
-    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_BOOL, static_cast<uint32_t>(this->null_pages.size()));
-    std::vector<bool> ::const_iterator _iter299;
-    for (_iter299 = this->null_pages.begin(); _iter299 != this->null_pages.end(); ++_iter299)
-    {
-      xfer += oprot->writeBool((*_iter299));
-    }
-    xfer += oprot->writeListEnd();
-  }
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("min_values", ::apache::thrift::protocol::T_LIST, 2);
-  {
-    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->min_values.size()));
-    std::vector<std::string> ::const_iterator _iter300;
-    for (_iter300 = this->min_values.begin(); _iter300 != this->min_values.end(); ++_iter300)
-    {
-      xfer += oprot->writeBinary((*_iter300));
-    }
-    xfer += oprot->writeListEnd();
-  }
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("max_values", ::apache::thrift::protocol::T_LIST, 3);
-  {
-    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->max_values.size()));
-    std::vector<std::string> ::const_iterator _iter301;
-    for (_iter301 = this->max_values.begin(); _iter301 != this->max_values.end(); ++_iter301)
-    {
-      xfer += oprot->writeBinary((*_iter301));
-    }
-    xfer += oprot->writeListEnd();
-  }
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("boundary_order", ::apache::thrift::protocol::T_I32, 4);
-  xfer += oprot->writeI32(static_cast<int32_t>(this->boundary_order));
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.null_counts) {
-    xfer += oprot->writeFieldBegin("null_counts", ::apache::thrift::protocol::T_LIST, 5);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->null_counts.size()));
-      std::vector<int64_t> ::const_iterator _iter302;
-      for (_iter302 = this->null_counts.begin(); _iter302 != this->null_counts.end(); ++_iter302)
-      {
-        xfer += oprot->writeI64((*_iter302));
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.repetition_level_histograms) {
-    xfer += oprot->writeFieldBegin("repetition_level_histograms", ::apache::thrift::protocol::T_LIST, 6);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->repetition_level_histograms.size()));
-      std::vector<int64_t> ::const_iterator _iter303;
-      for (_iter303 = this->repetition_level_histograms.begin(); _iter303 != this->repetition_level_histograms.end(); ++_iter303)
-      {
-        xfer += oprot->writeI64((*_iter303));
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.definition_level_histograms) {
-    xfer += oprot->writeFieldBegin("definition_level_histograms", ::apache::thrift::protocol::T_LIST, 7);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->definition_level_histograms.size()));
-      std::vector<int64_t> ::const_iterator _iter304;
-      for (_iter304 = this->definition_level_histograms.begin(); _iter304 != this->definition_level_histograms.end(); ++_iter304)
-      {
-        xfer += oprot->writeI64((*_iter304));
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(ColumnIndex &a, ColumnIndex &b) {
   using ::std::swap;
   swap(a.null_pages, b.null_pages);
@@ -7958,88 +3765,6 @@ std::ostream& operator<<(std::ostream& out, const AesGcmV1& obj)
 }
 
 
-uint32_t AesGcmV1::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readBinary(this->aad_prefix);
-          this->__isset.aad_prefix = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readBinary(this->aad_file_unique);
-          this->__isset.aad_file_unique = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->supply_aad_prefix);
-          this->__isset.supply_aad_prefix = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t AesGcmV1::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("AesGcmV1");
-
-  if (this->__isset.aad_prefix) {
-    xfer += oprot->writeFieldBegin("aad_prefix", ::apache::thrift::protocol::T_STRING, 1);
-    xfer += oprot->writeBinary(this->aad_prefix);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.aad_file_unique) {
-    xfer += oprot->writeFieldBegin("aad_file_unique", ::apache::thrift::protocol::T_STRING, 2);
-    xfer += oprot->writeBinary(this->aad_file_unique);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.supply_aad_prefix) {
-    xfer += oprot->writeFieldBegin("supply_aad_prefix", ::apache::thrift::protocol::T_BOOL, 3);
-    xfer += oprot->writeBool(this->supply_aad_prefix);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(AesGcmV1 &a, AesGcmV1 &b) {
   using ::std::swap;
   swap(a.aad_prefix, b.aad_prefix);
@@ -8109,88 +3834,6 @@ std::ostream& operator<<(std::ostream& out, const AesGcmCtrV1& obj)
 }
 
 
-uint32_t AesGcmCtrV1::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readBinary(this->aad_prefix);
-          this->__isset.aad_prefix = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readBinary(this->aad_file_unique);
-          this->__isset.aad_file_unique = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_BOOL) {
-          xfer += iprot->readBool(this->supply_aad_prefix);
-          this->__isset.supply_aad_prefix = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t AesGcmCtrV1::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("AesGcmCtrV1");
-
-  if (this->__isset.aad_prefix) {
-    xfer += oprot->writeFieldBegin("aad_prefix", ::apache::thrift::protocol::T_STRING, 1);
-    xfer += oprot->writeBinary(this->aad_prefix);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.aad_file_unique) {
-    xfer += oprot->writeFieldBegin("aad_file_unique", ::apache::thrift::protocol::T_STRING, 2);
-    xfer += oprot->writeBinary(this->aad_file_unique);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.supply_aad_prefix) {
-    xfer += oprot->writeFieldBegin("supply_aad_prefix", ::apache::thrift::protocol::T_BOOL, 3);
-    xfer += oprot->writeBool(this->supply_aad_prefix);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(AesGcmCtrV1 &a, AesGcmCtrV1 &b) {
   using ::std::swap;
   swap(a.aad_prefix, b.aad_prefix);
@@ -8255,75 +3898,6 @@ std::ostream& operator<<(std::ostream& out, const EncryptionAlgorithm& obj)
 }
 
 
-uint32_t EncryptionAlgorithm::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->AES_GCM_V1.read(iprot);
-          this->__isset.AES_GCM_V1 = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->AES_GCM_CTR_V1.read(iprot);
-          this->__isset.AES_GCM_CTR_V1 = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t EncryptionAlgorithm::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("EncryptionAlgorithm");
-
-  if (this->__isset.AES_GCM_V1) {
-    xfer += oprot->writeFieldBegin("AES_GCM_V1", ::apache::thrift::protocol::T_STRUCT, 1);
-    xfer += this->AES_GCM_V1.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.AES_GCM_CTR_V1) {
-    xfer += oprot->writeFieldBegin("AES_GCM_CTR_V1", ::apache::thrift::protocol::T_STRUCT, 2);
-    xfer += this->AES_GCM_CTR_V1.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(EncryptionAlgorithm &a, EncryptionAlgorithm &b) {
   using ::std::swap;
   swap(a.AES_GCM_V1, b.AES_GCM_V1);
@@ -8413,254 +3987,6 @@ std::ostream& operator<<(std::ostream& out, const FileMetaData& obj)
 }
 
 
-uint32_t FileMetaData::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_version = false;
-  bool isset_schema = false;
-  bool isset_num_rows = false;
-  bool isset_row_groups = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_I32) {
-          xfer += iprot->readI32(this->version);
-          isset_version = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->schema.clear();
-            uint32_t _size321;
-            ::apache::thrift::protocol::TType _etype324;
-            xfer += iprot->readListBegin(_etype324, _size321);
-            this->schema.resize(_size321);
-            uint32_t _i325;
-            for (_i325 = 0; _i325 < _size321; ++_i325)
-            {
-              xfer += this->schema[_i325].read(iprot);
-            }
-            xfer += iprot->readListEnd();
-          }
-          isset_schema = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 3:
-        if (ftype == ::apache::thrift::protocol::T_I64) {
-          xfer += iprot->readI64(this->num_rows);
-          isset_num_rows = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 4:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->row_groups.clear();
-            uint32_t _size326;
-            ::apache::thrift::protocol::TType _etype329;
-            xfer += iprot->readListBegin(_etype329, _size326);
-            this->row_groups.resize(_size326);
-            uint32_t _i330;
-            for (_i330 = 0; _i330 < _size326; ++_i330)
-            {
-              xfer += this->row_groups[_i330].read(iprot);
-            }
-            xfer += iprot->readListEnd();
-          }
-          isset_row_groups = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 5:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->key_value_metadata.clear();
-            uint32_t _size331;
-            ::apache::thrift::protocol::TType _etype334;
-            xfer += iprot->readListBegin(_etype334, _size331);
-            this->key_value_metadata.resize(_size331);
-            uint32_t _i335;
-            for (_i335 = 0; _i335 < _size331; ++_i335)
-            {
-              xfer += this->key_value_metadata[_i335].read(iprot);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.key_value_metadata = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 6:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->created_by);
-          this->__isset.created_by = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 7:
-        if (ftype == ::apache::thrift::protocol::T_LIST) {
-          {
-            this->column_orders.clear();
-            uint32_t _size336;
-            ::apache::thrift::protocol::TType _etype339;
-            xfer += iprot->readListBegin(_etype339, _size336);
-            this->column_orders.resize(_size336);
-            uint32_t _i340;
-            for (_i340 = 0; _i340 < _size336; ++_i340)
-            {
-              xfer += this->column_orders[_i340].read(iprot);
-            }
-            xfer += iprot->readListEnd();
-          }
-          this->__isset.column_orders = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 8:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->encryption_algorithm.read(iprot);
-          this->__isset.encryption_algorithm = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 9:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readBinary(this->footer_signing_key_metadata);
-          this->__isset.footer_signing_key_metadata = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_version)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_schema)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_num_rows)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  if (!isset_row_groups)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t FileMetaData::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("FileMetaData");
-
-  xfer += oprot->writeFieldBegin("version", ::apache::thrift::protocol::T_I32, 1);
-  xfer += oprot->writeI32(this->version);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("schema", ::apache::thrift::protocol::T_LIST, 2);
-  {
-    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->schema.size()));
-    std::vector<SchemaElement> ::const_iterator _iter341;
-    for (_iter341 = this->schema.begin(); _iter341 != this->schema.end(); ++_iter341)
-    {
-      xfer += (*_iter341).write(oprot);
-    }
-    xfer += oprot->writeListEnd();
-  }
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("num_rows", ::apache::thrift::protocol::T_I64, 3);
-  xfer += oprot->writeI64(this->num_rows);
-  xfer += oprot->writeFieldEnd();
-
-  xfer += oprot->writeFieldBegin("row_groups", ::apache::thrift::protocol::T_LIST, 4);
-  {
-    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->row_groups.size()));
-    std::vector<RowGroup> ::const_iterator _iter342;
-    for (_iter342 = this->row_groups.begin(); _iter342 != this->row_groups.end(); ++_iter342)
-    {
-      xfer += (*_iter342).write(oprot);
-    }
-    xfer += oprot->writeListEnd();
-  }
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.key_value_metadata) {
-    xfer += oprot->writeFieldBegin("key_value_metadata", ::apache::thrift::protocol::T_LIST, 5);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->key_value_metadata.size()));
-      std::vector<KeyValue> ::const_iterator _iter343;
-      for (_iter343 = this->key_value_metadata.begin(); _iter343 != this->key_value_metadata.end(); ++_iter343)
-      {
-        xfer += (*_iter343).write(oprot);
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.created_by) {
-    xfer += oprot->writeFieldBegin("created_by", ::apache::thrift::protocol::T_STRING, 6);
-    xfer += oprot->writeString(this->created_by);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.column_orders) {
-    xfer += oprot->writeFieldBegin("column_orders", ::apache::thrift::protocol::T_LIST, 7);
-    {
-      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->column_orders.size()));
-      std::vector<ColumnOrder> ::const_iterator _iter344;
-      for (_iter344 = this->column_orders.begin(); _iter344 != this->column_orders.end(); ++_iter344)
-      {
-        xfer += (*_iter344).write(oprot);
-      }
-      xfer += oprot->writeListEnd();
-    }
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.encryption_algorithm) {
-    xfer += oprot->writeFieldBegin("encryption_algorithm", ::apache::thrift::protocol::T_STRUCT, 8);
-    xfer += this->encryption_algorithm.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  if (this->__isset.footer_signing_key_metadata) {
-    xfer += oprot->writeFieldBegin("footer_signing_key_metadata", ::apache::thrift::protocol::T_STRING, 9);
-    xfer += oprot->writeBinary(this->footer_signing_key_metadata);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(FileMetaData &a, FileMetaData &b) {
   using ::std::swap;
   swap(a.version, b.version);
@@ -8760,77 +4086,6 @@ std::ostream& operator<<(std::ostream& out, const FileCryptoMetaData& obj)
 }
 
 
-uint32_t FileCryptoMetaData::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-  bool isset_encryption_algorithm = false;
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->encryption_algorithm.read(iprot);
-          isset_encryption_algorithm = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readBinary(this->key_metadata);
-          this->__isset.key_metadata = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  if (!isset_encryption_algorithm)
-    throw TProtocolException(TProtocolException::INVALID_DATA);
-  return xfer;
-}
-
-uint32_t FileCryptoMetaData::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
-  xfer += oprot->writeStructBegin("FileCryptoMetaData");
-
-  xfer += oprot->writeFieldBegin("encryption_algorithm", ::apache::thrift::protocol::T_STRUCT, 1);
-  xfer += this->encryption_algorithm.write(oprot);
-  xfer += oprot->writeFieldEnd();
-
-  if (this->__isset.key_metadata) {
-    xfer += oprot->writeFieldBegin("key_metadata", ::apache::thrift::protocol::T_STRING, 2);
-    xfer += oprot->writeBinary(this->key_metadata);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
 void swap(FileCryptoMetaData &a, FileCryptoMetaData &b) {
   using ::std::swap;
   swap(a.encryption_algorithm, b.encryption_algorithm);
diff --git a/cpp/src/generated/parquet_types.h b/cpp/src/generated/parquet_types.h
index 9dc6794c4030b..6cf85fe5e73cc 100644
--- a/cpp/src/generated/parquet_types.h
+++ b/cpp/src/generated/parquet_types.h
@@ -466,7 +466,7 @@ typedef struct _SizeStatistics__isset {
  * in this structure can help determine the number of nulls at a particular
  * nesting level and maximum length of lists).
  */
-class SizeStatistics : public virtual ::apache::thrift::TBase {
+class SizeStatistics {
  public:
 
   SizeStatistics(const SizeStatistics&);
@@ -546,8 +546,10 @@ class SizeStatistics : public virtual ::apache::thrift::TBase {
 
   bool operator < (const SizeStatistics & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -572,7 +574,7 @@ typedef struct _Statistics__isset {
  * Statistics per row group and per page
  * All fields are optional.
  */
-class Statistics : public virtual ::apache::thrift::TBase {
+class Statistics {
  public:
 
   Statistics(const Statistics&);
@@ -697,8 +699,10 @@ class Statistics : public virtual ::apache::thrift::TBase {
 
   bool operator < (const Statistics & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -711,7 +715,7 @@ std::ostream& operator<<(std::ostream& out, const Statistics& obj);
 /**
  * Empty structs to use as logical type annotations
  */
-class StringType : public virtual ::apache::thrift::TBase {
+class StringType {
  public:
 
   StringType(const StringType&) noexcept;
@@ -733,8 +737,10 @@ class StringType : public virtual ::apache::thrift::TBase {
 
   bool operator < (const StringType & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -744,7 +750,7 @@ void swap(StringType &a, StringType &b);
 std::ostream& operator<<(std::ostream& out, const StringType& obj);
 
 
-class UUIDType : public virtual ::apache::thrift::TBase {
+class UUIDType {
  public:
 
   UUIDType(const UUIDType&) noexcept;
@@ -766,8 +772,10 @@ class UUIDType : public virtual ::apache::thrift::TBase {
 
   bool operator < (const UUIDType & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -777,7 +785,7 @@ void swap(UUIDType &a, UUIDType &b);
 std::ostream& operator<<(std::ostream& out, const UUIDType& obj);
 
 
-class MapType : public virtual ::apache::thrift::TBase {
+class MapType {
  public:
 
   MapType(const MapType&) noexcept;
@@ -799,8 +807,10 @@ class MapType : public virtual ::apache::thrift::TBase {
 
   bool operator < (const MapType & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -810,7 +820,7 @@ void swap(MapType &a, MapType &b);
 std::ostream& operator<<(std::ostream& out, const MapType& obj);
 
 
-class ListType : public virtual ::apache::thrift::TBase {
+class ListType {
  public:
 
   ListType(const ListType&) noexcept;
@@ -832,8 +842,10 @@ class ListType : public virtual ::apache::thrift::TBase {
 
   bool operator < (const ListType & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -843,7 +855,7 @@ void swap(ListType &a, ListType &b);
 std::ostream& operator<<(std::ostream& out, const ListType& obj);
 
 
-class EnumType : public virtual ::apache::thrift::TBase {
+class EnumType {
  public:
 
   EnumType(const EnumType&) noexcept;
@@ -865,8 +877,10 @@ class EnumType : public virtual ::apache::thrift::TBase {
 
   bool operator < (const EnumType & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -876,7 +890,7 @@ void swap(EnumType &a, EnumType &b);
 std::ostream& operator<<(std::ostream& out, const EnumType& obj);
 
 
-class DateType : public virtual ::apache::thrift::TBase {
+class DateType {
  public:
 
   DateType(const DateType&) noexcept;
@@ -898,8 +912,10 @@ class DateType : public virtual ::apache::thrift::TBase {
 
   bool operator < (const DateType & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -909,7 +925,7 @@ void swap(DateType &a, DateType &b);
 std::ostream& operator<<(std::ostream& out, const DateType& obj);
 
 
-class Float16Type : public virtual ::apache::thrift::TBase {
+class Float16Type {
  public:
 
   Float16Type(const Float16Type&) noexcept;
@@ -931,8 +947,10 @@ class Float16Type : public virtual ::apache::thrift::TBase {
 
   bool operator < (const Float16Type & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -949,7 +967,7 @@ std::ostream& operator<<(std::ostream& out, const Float16Type& obj);
  * null and the physical type can't be determined. This annotation signals
  * the case where the physical type was guessed from all null values.
  */
-class NullType : public virtual ::apache::thrift::TBase {
+class NullType {
  public:
 
   NullType(const NullType&) noexcept;
@@ -971,8 +989,10 @@ class NullType : public virtual ::apache::thrift::TBase {
 
   bool operator < (const NullType & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -993,7 +1013,7 @@ std::ostream& operator<<(std::ostream& out, const NullType& obj);
  * 
  * Allowed for physical types: INT32, INT64, FIXED, and BINARY
  */
-class DecimalType : public virtual ::apache::thrift::TBase {
+class DecimalType {
  public:
 
   DecimalType(const DecimalType&) noexcept;
@@ -1027,8 +1047,10 @@ class DecimalType : public virtual ::apache::thrift::TBase {
 
   bool operator < (const DecimalType & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -1041,7 +1063,7 @@ std::ostream& operator<<(std::ostream& out, const DecimalType& obj);
 /**
  * Time units for logical types
  */
-class MilliSeconds : public virtual ::apache::thrift::TBase {
+class MilliSeconds {
  public:
 
   MilliSeconds(const MilliSeconds&) noexcept;
@@ -1063,8 +1085,10 @@ class MilliSeconds : public virtual ::apache::thrift::TBase {
 
   bool operator < (const MilliSeconds & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -1074,7 +1098,7 @@ void swap(MilliSeconds &a, MilliSeconds &b);
 std::ostream& operator<<(std::ostream& out, const MilliSeconds& obj);
 
 
-class MicroSeconds : public virtual ::apache::thrift::TBase {
+class MicroSeconds {
  public:
 
   MicroSeconds(const MicroSeconds&) noexcept;
@@ -1096,8 +1120,10 @@ class MicroSeconds : public virtual ::apache::thrift::TBase {
 
   bool operator < (const MicroSeconds & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -1107,7 +1133,7 @@ void swap(MicroSeconds &a, MicroSeconds &b);
 std::ostream& operator<<(std::ostream& out, const MicroSeconds& obj);
 
 
-class NanoSeconds : public virtual ::apache::thrift::TBase {
+class NanoSeconds {
  public:
 
   NanoSeconds(const NanoSeconds&) noexcept;
@@ -1129,8 +1155,10 @@ class NanoSeconds : public virtual ::apache::thrift::TBase {
 
   bool operator < (const NanoSeconds & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -1146,7 +1174,7 @@ typedef struct _TimeUnit__isset {
   bool NANOS :1;
 } _TimeUnit__isset;
 
-class TimeUnit : public virtual ::apache::thrift::TBase {
+class TimeUnit {
  public:
 
   TimeUnit(const TimeUnit&) noexcept;
@@ -1191,8 +1219,10 @@ class TimeUnit : public virtual ::apache::thrift::TBase {
 
   bool operator < (const TimeUnit & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -1207,7 +1237,7 @@ std::ostream& operator<<(std::ostream& out, const TimeUnit& obj);
  * 
  * Allowed for physical types: INT64
  */
-class TimestampType : public virtual ::apache::thrift::TBase {
+class TimestampType {
  public:
 
   TimestampType(const TimestampType&) noexcept;
@@ -1240,8 +1270,10 @@ class TimestampType : public virtual ::apache::thrift::TBase {
 
   bool operator < (const TimestampType & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -1256,7 +1288,7 @@ std::ostream& operator<<(std::ostream& out, const TimestampType& obj);
  * 
  * Allowed for physical types: INT32 (millis), INT64 (micros, nanos)
  */
-class TimeType : public virtual ::apache::thrift::TBase {
+class TimeType {
  public:
 
   TimeType(const TimeType&) noexcept;
@@ -1289,8 +1321,10 @@ class TimeType : public virtual ::apache::thrift::TBase {
 
   bool operator < (const TimeType & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -1307,7 +1341,7 @@ std::ostream& operator<<(std::ostream& out, const TimeType& obj);
  * 
  * Allowed for physical types: INT32, INT64
  */
-class IntType : public virtual ::apache::thrift::TBase {
+class IntType {
  public:
 
   IntType(const IntType&) noexcept;
@@ -1341,8 +1375,10 @@ class IntType : public virtual ::apache::thrift::TBase {
 
   bool operator < (const IntType & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -1357,7 +1393,7 @@ std::ostream& operator<<(std::ostream& out, const IntType& obj);
  * 
  * Allowed for physical types: BINARY
  */
-class JsonType : public virtual ::apache::thrift::TBase {
+class JsonType {
  public:
 
   JsonType(const JsonType&) noexcept;
@@ -1379,8 +1415,10 @@ class JsonType : public virtual ::apache::thrift::TBase {
 
   bool operator < (const JsonType & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -1395,7 +1433,7 @@ std::ostream& operator<<(std::ostream& out, const JsonType& obj);
  * 
  * Allowed for physical types: BINARY
  */
-class BsonType : public virtual ::apache::thrift::TBase {
+class BsonType {
  public:
 
   BsonType(const BsonType&) noexcept;
@@ -1417,8 +1455,10 @@ class BsonType : public virtual ::apache::thrift::TBase {
 
   bool operator < (const BsonType & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -1452,7 +1492,7 @@ typedef struct _LogicalType__isset {
  * SchemaElement must also set the corresponding ConvertedType (if any)
  * from the following table.
  */
-class LogicalType : public virtual ::apache::thrift::TBase {
+class LogicalType {
  public:
 
   LogicalType(const LogicalType&) noexcept;
@@ -1574,8 +1614,10 @@ class LogicalType : public virtual ::apache::thrift::TBase {
 
   bool operator < (const LogicalType & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -1603,7 +1645,7 @@ typedef struct _SchemaElement__isset {
  *  - if it is a primitive type (leaf) then type is defined and num_children is undefined
  * the nodes are listed in depth first traversal order.
  */
-class SchemaElement : public virtual ::apache::thrift::TBase {
+class SchemaElement {
  public:
 
   SchemaElement(const SchemaElement&);
@@ -1754,8 +1796,10 @@ class SchemaElement : public virtual ::apache::thrift::TBase {
 
   bool operator < (const SchemaElement & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -1772,7 +1816,7 @@ typedef struct _DataPageHeader__isset {
 /**
  * Data page header
  */
-class DataPageHeader : public virtual ::apache::thrift::TBase {
+class DataPageHeader {
  public:
 
   DataPageHeader(const DataPageHeader&);
@@ -1848,8 +1892,10 @@ class DataPageHeader : public virtual ::apache::thrift::TBase {
 
   bool operator < (const DataPageHeader & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -1859,7 +1905,7 @@ void swap(DataPageHeader &a, DataPageHeader &b);
 std::ostream& operator<<(std::ostream& out, const DataPageHeader& obj);
 
 
-class IndexPageHeader : public virtual ::apache::thrift::TBase {
+class IndexPageHeader {
  public:
 
   IndexPageHeader(const IndexPageHeader&) noexcept;
@@ -1881,8 +1927,10 @@ class IndexPageHeader : public virtual ::apache::thrift::TBase {
 
   bool operator < (const IndexPageHeader & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -1902,7 +1950,7 @@ typedef struct _DictionaryPageHeader__isset {
  * can be placed in a column chunk.
  * 
  */
-class DictionaryPageHeader : public virtual ::apache::thrift::TBase {
+class DictionaryPageHeader {
  public:
 
   DictionaryPageHeader(const DictionaryPageHeader&) noexcept;
@@ -1957,8 +2005,10 @@ class DictionaryPageHeader : public virtual ::apache::thrift::TBase {
 
   bool operator < (const DictionaryPageHeader & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -1979,7 +2029,7 @@ typedef struct _DataPageHeaderV2__isset {
  * The remaining section containing the data is compressed if is_compressed is true
  * 
  */
-class DataPageHeaderV2 : public virtual ::apache::thrift::TBase {
+class DataPageHeaderV2 {
  public:
 
   DataPageHeaderV2(const DataPageHeaderV2&);
@@ -2085,8 +2135,10 @@ class DataPageHeaderV2 : public virtual ::apache::thrift::TBase {
 
   bool operator < (const DataPageHeaderV2 & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -2099,7 +2151,7 @@ std::ostream& operator<<(std::ostream& out, const DataPageHeaderV2& obj);
 /**
  * Block-based algorithm type annotation. *
  */
-class SplitBlockAlgorithm : public virtual ::apache::thrift::TBase {
+class SplitBlockAlgorithm {
  public:
 
   SplitBlockAlgorithm(const SplitBlockAlgorithm&) noexcept;
@@ -2121,8 +2173,10 @@ class SplitBlockAlgorithm : public virtual ::apache::thrift::TBase {
 
   bool operator < (const SplitBlockAlgorithm & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -2139,7 +2193,7 @@ typedef struct _BloomFilterAlgorithm__isset {
 /**
  * The algorithm used in Bloom filter. *
  */
-class BloomFilterAlgorithm : public virtual ::apache::thrift::TBase {
+class BloomFilterAlgorithm {
  public:
 
   BloomFilterAlgorithm(const BloomFilterAlgorithm&) noexcept;
@@ -2173,8 +2227,10 @@ class BloomFilterAlgorithm : public virtual ::apache::thrift::TBase {
 
   bool operator < (const BloomFilterAlgorithm & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -2189,7 +2245,7 @@ std::ostream& operator<<(std::ostream& out, const BloomFilterAlgorithm& obj);
  * algorithm. It uses 64 bits version of xxHash.
  * 
  */
-class XxHash : public virtual ::apache::thrift::TBase {
+class XxHash {
  public:
 
   XxHash(const XxHash&) noexcept;
@@ -2211,8 +2267,10 @@ class XxHash : public virtual ::apache::thrift::TBase {
 
   bool operator < (const XxHash & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -2231,7 +2289,7 @@ typedef struct _BloomFilterHash__isset {
  * using plain encoding.
  * 
  */
-class BloomFilterHash : public virtual ::apache::thrift::TBase {
+class BloomFilterHash {
  public:
 
   BloomFilterHash(const BloomFilterHash&) noexcept;
@@ -2265,8 +2323,10 @@ class BloomFilterHash : public virtual ::apache::thrift::TBase {
 
   bool operator < (const BloomFilterHash & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -2280,7 +2340,7 @@ std::ostream& operator<<(std::ostream& out, const BloomFilterHash& obj);
  * The compression used in the Bloom filter.
  * 
  */
-class Uncompressed : public virtual ::apache::thrift::TBase {
+class Uncompressed {
  public:
 
   Uncompressed(const Uncompressed&) noexcept;
@@ -2302,8 +2362,10 @@ class Uncompressed : public virtual ::apache::thrift::TBase {
 
   bool operator < (const Uncompressed & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -2317,7 +2379,7 @@ typedef struct _BloomFilterCompression__isset {
   bool UNCOMPRESSED :1;
 } _BloomFilterCompression__isset;
 
-class BloomFilterCompression : public virtual ::apache::thrift::TBase {
+class BloomFilterCompression {
  public:
 
   BloomFilterCompression(const BloomFilterCompression&) noexcept;
@@ -2348,8 +2410,10 @@ class BloomFilterCompression : public virtual ::apache::thrift::TBase {
 
   bool operator < (const BloomFilterCompression & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -2364,7 +2428,7 @@ std::ostream& operator<<(std::ostream& out, const BloomFilterCompression& obj);
  * and followed by its bitset.
  * 
  */
-class BloomFilterHeader : public virtual ::apache::thrift::TBase {
+class BloomFilterHeader {
  public:
 
   BloomFilterHeader(const BloomFilterHeader&) noexcept;
@@ -2419,8 +2483,10 @@ class BloomFilterHeader : public virtual ::apache::thrift::TBase {
 
   bool operator < (const BloomFilterHeader & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -2438,7 +2504,7 @@ typedef struct _PageHeader__isset {
   bool data_page_header_v2 :1;
 } _PageHeader__isset;
 
-class PageHeader : public virtual ::apache::thrift::TBase {
+class PageHeader {
  public:
 
   PageHeader(const PageHeader&);
@@ -2545,8 +2611,10 @@ class PageHeader : public virtual ::apache::thrift::TBase {
 
   bool operator < (const PageHeader & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -2563,7 +2631,7 @@ typedef struct _KeyValue__isset {
 /**
  * Wrapper struct to store key values
  */
-class KeyValue : public virtual ::apache::thrift::TBase {
+class KeyValue {
  public:
 
   KeyValue(const KeyValue&);
@@ -2601,8 +2669,10 @@ class KeyValue : public virtual ::apache::thrift::TBase {
 
   bool operator < (const KeyValue & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -2615,7 +2685,7 @@ std::ostream& operator<<(std::ostream& out, const KeyValue& obj);
 /**
  * Wrapper struct to specify sort order
  */
-class SortingColumn : public virtual ::apache::thrift::TBase {
+class SortingColumn {
  public:
 
   SortingColumn(const SortingColumn&) noexcept;
@@ -2665,8 +2735,10 @@ class SortingColumn : public virtual ::apache::thrift::TBase {
 
   bool operator < (const SortingColumn & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -2679,7 +2751,7 @@ std::ostream& operator<<(std::ostream& out, const SortingColumn& obj);
 /**
  * statistics of a given page type and encoding
  */
-class PageEncodingStats : public virtual ::apache::thrift::TBase {
+class PageEncodingStats {
  public:
 
   PageEncodingStats(const PageEncodingStats&) noexcept;
@@ -2732,8 +2804,10 @@ class PageEncodingStats : public virtual ::apache::thrift::TBase {
 
   bool operator < (const PageEncodingStats & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -2757,7 +2831,7 @@ typedef struct _ColumnMetaData__isset {
 /**
  * Description for column metadata
  */
-class ColumnMetaData : public virtual ::apache::thrift::TBase {
+class ColumnMetaData {
  public:
 
   ColumnMetaData(const ColumnMetaData&);
@@ -2950,8 +3024,10 @@ class ColumnMetaData : public virtual ::apache::thrift::TBase {
 
   bool operator < (const ColumnMetaData & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -2961,7 +3037,7 @@ void swap(ColumnMetaData &a, ColumnMetaData &b);
 std::ostream& operator<<(std::ostream& out, const ColumnMetaData& obj);
 
 
-class EncryptionWithFooterKey : public virtual ::apache::thrift::TBase {
+class EncryptionWithFooterKey {
  public:
 
   EncryptionWithFooterKey(const EncryptionWithFooterKey&) noexcept;
@@ -2983,8 +3059,10 @@ class EncryptionWithFooterKey : public virtual ::apache::thrift::TBase {
 
   bool operator < (const EncryptionWithFooterKey & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -2998,7 +3076,7 @@ typedef struct _EncryptionWithColumnKey__isset {
   bool key_metadata :1;
 } _EncryptionWithColumnKey__isset;
 
-class EncryptionWithColumnKey : public virtual ::apache::thrift::TBase {
+class EncryptionWithColumnKey {
  public:
 
   EncryptionWithColumnKey(const EncryptionWithColumnKey&);
@@ -3041,8 +3119,10 @@ class EncryptionWithColumnKey : public virtual ::apache::thrift::TBase {
 
   bool operator < (const EncryptionWithColumnKey & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -3057,7 +3137,7 @@ typedef struct _ColumnCryptoMetaData__isset {
   bool ENCRYPTION_WITH_COLUMN_KEY :1;
 } _ColumnCryptoMetaData__isset;
 
-class ColumnCryptoMetaData : public virtual ::apache::thrift::TBase {
+class ColumnCryptoMetaData {
  public:
 
   ColumnCryptoMetaData(const ColumnCryptoMetaData&);
@@ -3095,8 +3175,10 @@ class ColumnCryptoMetaData : public virtual ::apache::thrift::TBase {
 
   bool operator < (const ColumnCryptoMetaData & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -3117,7 +3199,7 @@ typedef struct _ColumnChunk__isset {
   bool encrypted_column_metadata :1;
 } _ColumnChunk__isset;
 
-class ColumnChunk : public virtual ::apache::thrift::TBase {
+class ColumnChunk {
  public:
 
   ColumnChunk(const ColumnChunk&);
@@ -3241,8 +3323,10 @@ class ColumnChunk : public virtual ::apache::thrift::TBase {
 
   bool operator < (const ColumnChunk & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -3259,7 +3343,7 @@ typedef struct _RowGroup__isset {
   bool ordinal :1;
 } _RowGroup__isset;
 
-class RowGroup : public virtual ::apache::thrift::TBase {
+class RowGroup {
  public:
 
   RowGroup(const RowGroup&);
@@ -3357,8 +3441,10 @@ class RowGroup : public virtual ::apache::thrift::TBase {
 
   bool operator < (const RowGroup & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -3371,7 +3457,7 @@ std::ostream& operator<<(std::ostream& out, const RowGroup& obj);
 /**
  * Empty struct to signal the order defined by the physical or logical type
  */
-class TypeDefinedOrder : public virtual ::apache::thrift::TBase {
+class TypeDefinedOrder {
  public:
 
   TypeDefinedOrder(const TypeDefinedOrder&) noexcept;
@@ -3393,8 +3479,10 @@ class TypeDefinedOrder : public virtual ::apache::thrift::TBase {
 
   bool operator < (const TypeDefinedOrder & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -3420,7 +3508,7 @@ typedef struct _ColumnOrder__isset {
  * If the reader does not support the value of this union, min and max stats
  * for this column should be ignored.
  */
-class ColumnOrder : public virtual ::apache::thrift::TBase {
+class ColumnOrder {
  public:
 
   ColumnOrder(const ColumnOrder&) noexcept;
@@ -3501,8 +3589,10 @@ class ColumnOrder : public virtual ::apache::thrift::TBase {
 
   bool operator < (const ColumnOrder & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -3512,7 +3602,7 @@ void swap(ColumnOrder &a, ColumnOrder &b);
 std::ostream& operator<<(std::ostream& out, const ColumnOrder& obj);
 
 
-class PageLocation : public virtual ::apache::thrift::TBase {
+class PageLocation {
  public:
 
   PageLocation(const PageLocation&) noexcept;
@@ -3563,8 +3653,10 @@ class PageLocation : public virtual ::apache::thrift::TBase {
 
   bool operator < (const PageLocation & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -3578,7 +3670,7 @@ typedef struct _OffsetIndex__isset {
   bool unencoded_byte_array_data_bytes :1;
 } _OffsetIndex__isset;
 
-class OffsetIndex : public virtual ::apache::thrift::TBase {
+class OffsetIndex {
  public:
 
   OffsetIndex(const OffsetIndex&);
@@ -3624,8 +3716,10 @@ class OffsetIndex : public virtual ::apache::thrift::TBase {
 
   bool operator < (const OffsetIndex & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -3645,7 +3739,7 @@ typedef struct _ColumnIndex__isset {
  * Description for ColumnIndex.
  * Each <array-field>[i] refers to the page at OffsetIndex.page_locations[i]
  */
-class ColumnIndex : public virtual ::apache::thrift::TBase {
+class ColumnIndex {
  public:
 
   ColumnIndex(const ColumnIndex&);
@@ -3756,8 +3850,10 @@ class ColumnIndex : public virtual ::apache::thrift::TBase {
 
   bool operator < (const ColumnIndex & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -3773,7 +3869,7 @@ typedef struct _AesGcmV1__isset {
   bool supply_aad_prefix :1;
 } _AesGcmV1__isset;
 
-class AesGcmV1 : public virtual ::apache::thrift::TBase {
+class AesGcmV1 {
  public:
 
   AesGcmV1(const AesGcmV1&);
@@ -3831,8 +3927,10 @@ class AesGcmV1 : public virtual ::apache::thrift::TBase {
 
   bool operator < (const AesGcmV1 & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -3848,7 +3946,7 @@ typedef struct _AesGcmCtrV1__isset {
   bool supply_aad_prefix :1;
 } _AesGcmCtrV1__isset;
 
-class AesGcmCtrV1 : public virtual ::apache::thrift::TBase {
+class AesGcmCtrV1 {
  public:
 
   AesGcmCtrV1(const AesGcmCtrV1&);
@@ -3906,8 +4004,10 @@ class AesGcmCtrV1 : public virtual ::apache::thrift::TBase {
 
   bool operator < (const AesGcmCtrV1 & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -3922,7 +4022,7 @@ typedef struct _EncryptionAlgorithm__isset {
   bool AES_GCM_CTR_V1 :1;
 } _EncryptionAlgorithm__isset;
 
-class EncryptionAlgorithm : public virtual ::apache::thrift::TBase {
+class EncryptionAlgorithm {
  public:
 
   EncryptionAlgorithm(const EncryptionAlgorithm&);
@@ -3960,8 +4060,10 @@ class EncryptionAlgorithm : public virtual ::apache::thrift::TBase {
 
   bool operator < (const EncryptionAlgorithm & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -3982,7 +4084,7 @@ typedef struct _FileMetaData__isset {
 /**
  * Description for file metadata
  */
-class FileMetaData : public virtual ::apache::thrift::TBase {
+class FileMetaData {
  public:
 
   FileMetaData(const FileMetaData&);
@@ -4116,8 +4218,10 @@ class FileMetaData : public virtual ::apache::thrift::TBase {
 
   bool operator < (const FileMetaData & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -4134,7 +4238,7 @@ typedef struct _FileCryptoMetaData__isset {
 /**
  * Crypto metadata for files with encrypted footer *
  */
-class FileCryptoMetaData : public virtual ::apache::thrift::TBase {
+class FileCryptoMetaData {
  public:
 
   FileCryptoMetaData(const FileCryptoMetaData&);
@@ -4180,8 +4284,10 @@ class FileCryptoMetaData : public virtual ::apache::thrift::TBase {
 
   bool operator < (const FileCryptoMetaData & ) const;
 
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot) override;
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const override;
+  template <class Protocol_>
+  uint32_t read(Protocol_* iprot);
+  template <class Protocol_>
+  uint32_t write(Protocol_* oprot) const;
 
   virtual void printTo(std::ostream& out) const;
 };
@@ -4192,4 +4298,6 @@ std::ostream& operator<<(std::ostream& out, const FileCryptoMetaData& obj);
 
 }} // namespace
 
+#include "parquet_types.tcc"
+
 #endif
diff --git a/cpp/src/generated/parquet_types.tcc b/cpp/src/generated/parquet_types.tcc
new file mode 100644
index 0000000000000..ee02d7f0139fc
--- /dev/null
+++ b/cpp/src/generated/parquet_types.tcc
@@ -0,0 +1,4867 @@
+/**
+ * Autogenerated by Thrift Compiler (0.19.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+#ifndef parquet_TYPES_TCC
+#define parquet_TYPES_TCC
+
+#include "parquet_types.h"
+
+namespace parquet { namespace format {
+
+template <class Protocol_>
+uint32_t SizeStatistics::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->unencoded_byte_array_data_bytes);
+          this->__isset.unencoded_byte_array_data_bytes = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->repetition_level_histogram.clear();
+            uint32_t _size0;
+            ::apache::thrift::protocol::TType _etype3;
+            xfer += iprot->readListBegin(_etype3, _size0);
+            this->repetition_level_histogram.resize(_size0);
+            uint32_t _i4;
+            for (_i4 = 0; _i4 < _size0; ++_i4)
+            {
+              xfer += iprot->readI64(this->repetition_level_histogram[_i4]);
+            }
+            xfer += iprot->readListEnd();
+          }
+          this->__isset.repetition_level_histogram = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->definition_level_histogram.clear();
+            uint32_t _size5;
+            ::apache::thrift::protocol::TType _etype8;
+            xfer += iprot->readListBegin(_etype8, _size5);
+            this->definition_level_histogram.resize(_size5);
+            uint32_t _i9;
+            for (_i9 = 0; _i9 < _size5; ++_i9)
+            {
+              xfer += iprot->readI64(this->definition_level_histogram[_i9]);
+            }
+            xfer += iprot->readListEnd();
+          }
+          this->__isset.definition_level_histogram = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t SizeStatistics::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("SizeStatistics");
+
+  if (this->__isset.unencoded_byte_array_data_bytes) {
+    xfer += oprot->writeFieldBegin("unencoded_byte_array_data_bytes", ::apache::thrift::protocol::T_I64, 1);
+    xfer += oprot->writeI64(this->unencoded_byte_array_data_bytes);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.repetition_level_histogram) {
+    xfer += oprot->writeFieldBegin("repetition_level_histogram", ::apache::thrift::protocol::T_LIST, 2);
+    {
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->repetition_level_histogram.size()));
+      std::vector<int64_t> ::const_iterator _iter10;
+      for (_iter10 = this->repetition_level_histogram.begin(); _iter10 != this->repetition_level_histogram.end(); ++_iter10)
+      {
+        xfer += oprot->writeI64((*_iter10));
+      }
+      xfer += oprot->writeListEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.definition_level_histogram) {
+    xfer += oprot->writeFieldBegin("definition_level_histogram", ::apache::thrift::protocol::T_LIST, 3);
+    {
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->definition_level_histogram.size()));
+      std::vector<int64_t> ::const_iterator _iter11;
+      for (_iter11 = this->definition_level_histogram.begin(); _iter11 != this->definition_level_histogram.end(); ++_iter11)
+      {
+        xfer += oprot->writeI64((*_iter11));
+      }
+      xfer += oprot->writeListEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t Statistics::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readBinary(this->max);
+          this->__isset.max = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readBinary(this->min);
+          this->__isset.min = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->null_count);
+          this->__isset.null_count = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->distinct_count);
+          this->__isset.distinct_count = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readBinary(this->max_value);
+          this->__isset.max_value = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readBinary(this->min_value);
+          this->__isset.min_value = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 7:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->is_max_value_exact);
+          this->__isset.is_max_value_exact = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 8:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->is_min_value_exact);
+          this->__isset.is_min_value_exact = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t Statistics::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("Statistics");
+
+  if (this->__isset.max) {
+    xfer += oprot->writeFieldBegin("max", ::apache::thrift::protocol::T_STRING, 1);
+    xfer += oprot->writeBinary(this->max);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.min) {
+    xfer += oprot->writeFieldBegin("min", ::apache::thrift::protocol::T_STRING, 2);
+    xfer += oprot->writeBinary(this->min);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.null_count) {
+    xfer += oprot->writeFieldBegin("null_count", ::apache::thrift::protocol::T_I64, 3);
+    xfer += oprot->writeI64(this->null_count);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.distinct_count) {
+    xfer += oprot->writeFieldBegin("distinct_count", ::apache::thrift::protocol::T_I64, 4);
+    xfer += oprot->writeI64(this->distinct_count);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.max_value) {
+    xfer += oprot->writeFieldBegin("max_value", ::apache::thrift::protocol::T_STRING, 5);
+    xfer += oprot->writeBinary(this->max_value);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.min_value) {
+    xfer += oprot->writeFieldBegin("min_value", ::apache::thrift::protocol::T_STRING, 6);
+    xfer += oprot->writeBinary(this->min_value);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.is_max_value_exact) {
+    xfer += oprot->writeFieldBegin("is_max_value_exact", ::apache::thrift::protocol::T_BOOL, 7);
+    xfer += oprot->writeBool(this->is_max_value_exact);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.is_min_value_exact) {
+    xfer += oprot->writeFieldBegin("is_min_value_exact", ::apache::thrift::protocol::T_BOOL, 8);
+    xfer += oprot->writeBool(this->is_min_value_exact);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t StringType::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t StringType::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("StringType");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t UUIDType::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t UUIDType::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("UUIDType");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t MapType::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t MapType::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("MapType");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t ListType::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t ListType::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("ListType");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t EnumType::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t EnumType::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("EnumType");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t DateType::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t DateType::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("DateType");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t Float16Type::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t Float16Type::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("Float16Type");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t NullType::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t NullType::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("NullType");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t DecimalType::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_scale = false;
+  bool isset_precision = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->scale);
+          isset_scale = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->precision);
+          isset_precision = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_scale)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_precision)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t DecimalType::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("DecimalType");
+
+  xfer += oprot->writeFieldBegin("scale", ::apache::thrift::protocol::T_I32, 1);
+  xfer += oprot->writeI32(this->scale);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("precision", ::apache::thrift::protocol::T_I32, 2);
+  xfer += oprot->writeI32(this->precision);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t MilliSeconds::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t MilliSeconds::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("MilliSeconds");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t MicroSeconds::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t MicroSeconds::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("MicroSeconds");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t NanoSeconds::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t NanoSeconds::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("NanoSeconds");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t TimeUnit::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->MILLIS.read(iprot);
+          this->__isset.MILLIS = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->MICROS.read(iprot);
+          this->__isset.MICROS = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->NANOS.read(iprot);
+          this->__isset.NANOS = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t TimeUnit::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("TimeUnit");
+
+  if (this->__isset.MILLIS) {
+    xfer += oprot->writeFieldBegin("MILLIS", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->MILLIS.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.MICROS) {
+    xfer += oprot->writeFieldBegin("MICROS", ::apache::thrift::protocol::T_STRUCT, 2);
+    xfer += this->MICROS.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.NANOS) {
+    xfer += oprot->writeFieldBegin("NANOS", ::apache::thrift::protocol::T_STRUCT, 3);
+    xfer += this->NANOS.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t TimestampType::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_isAdjustedToUTC = false;
+  bool isset_unit = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->isAdjustedToUTC);
+          isset_isAdjustedToUTC = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->unit.read(iprot);
+          isset_unit = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_isAdjustedToUTC)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_unit)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t TimestampType::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("TimestampType");
+
+  xfer += oprot->writeFieldBegin("isAdjustedToUTC", ::apache::thrift::protocol::T_BOOL, 1);
+  xfer += oprot->writeBool(this->isAdjustedToUTC);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("unit", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += this->unit.write(oprot);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t TimeType::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_isAdjustedToUTC = false;
+  bool isset_unit = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->isAdjustedToUTC);
+          isset_isAdjustedToUTC = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->unit.read(iprot);
+          isset_unit = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_isAdjustedToUTC)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_unit)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t TimeType::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("TimeType");
+
+  xfer += oprot->writeFieldBegin("isAdjustedToUTC", ::apache::thrift::protocol::T_BOOL, 1);
+  xfer += oprot->writeBool(this->isAdjustedToUTC);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("unit", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += this->unit.write(oprot);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t IntType::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_bitWidth = false;
+  bool isset_isSigned = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_BYTE) {
+          xfer += iprot->readByte(this->bitWidth);
+          isset_bitWidth = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->isSigned);
+          isset_isSigned = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_bitWidth)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_isSigned)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t IntType::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("IntType");
+
+  xfer += oprot->writeFieldBegin("bitWidth", ::apache::thrift::protocol::T_BYTE, 1);
+  xfer += oprot->writeByte(this->bitWidth);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("isSigned", ::apache::thrift::protocol::T_BOOL, 2);
+  xfer += oprot->writeBool(this->isSigned);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t JsonType::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t JsonType::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("JsonType");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t BsonType::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t BsonType::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("BsonType");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t LogicalType::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->STRING.read(iprot);
+          this->__isset.STRING = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->MAP.read(iprot);
+          this->__isset.MAP = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->LIST.read(iprot);
+          this->__isset.LIST = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ENUM.read(iprot);
+          this->__isset.ENUM = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->DECIMAL.read(iprot);
+          this->__isset.DECIMAL = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->DATE.read(iprot);
+          this->__isset.DATE = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 7:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->TIME.read(iprot);
+          this->__isset.TIME = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 8:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->TIMESTAMP.read(iprot);
+          this->__isset.TIMESTAMP = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 10:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->INTEGER.read(iprot);
+          this->__isset.INTEGER = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 11:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->UNKNOWN.read(iprot);
+          this->__isset.UNKNOWN = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 12:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->JSON.read(iprot);
+          this->__isset.JSON = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 13:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->BSON.read(iprot);
+          this->__isset.BSON = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 14:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->UUID.read(iprot);
+          this->__isset.UUID = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 15:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->FLOAT16.read(iprot);
+          this->__isset.FLOAT16 = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t LogicalType::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("LogicalType");
+
+  if (this->__isset.STRING) {
+    xfer += oprot->writeFieldBegin("STRING", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->STRING.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.MAP) {
+    xfer += oprot->writeFieldBegin("MAP", ::apache::thrift::protocol::T_STRUCT, 2);
+    xfer += this->MAP.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.LIST) {
+    xfer += oprot->writeFieldBegin("LIST", ::apache::thrift::protocol::T_STRUCT, 3);
+    xfer += this->LIST.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.ENUM) {
+    xfer += oprot->writeFieldBegin("ENUM", ::apache::thrift::protocol::T_STRUCT, 4);
+    xfer += this->ENUM.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.DECIMAL) {
+    xfer += oprot->writeFieldBegin("DECIMAL", ::apache::thrift::protocol::T_STRUCT, 5);
+    xfer += this->DECIMAL.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.DATE) {
+    xfer += oprot->writeFieldBegin("DATE", ::apache::thrift::protocol::T_STRUCT, 6);
+    xfer += this->DATE.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.TIME) {
+    xfer += oprot->writeFieldBegin("TIME", ::apache::thrift::protocol::T_STRUCT, 7);
+    xfer += this->TIME.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.TIMESTAMP) {
+    xfer += oprot->writeFieldBegin("TIMESTAMP", ::apache::thrift::protocol::T_STRUCT, 8);
+    xfer += this->TIMESTAMP.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.INTEGER) {
+    xfer += oprot->writeFieldBegin("INTEGER", ::apache::thrift::protocol::T_STRUCT, 10);
+    xfer += this->INTEGER.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.UNKNOWN) {
+    xfer += oprot->writeFieldBegin("UNKNOWN", ::apache::thrift::protocol::T_STRUCT, 11);
+    xfer += this->UNKNOWN.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.JSON) {
+    xfer += oprot->writeFieldBegin("JSON", ::apache::thrift::protocol::T_STRUCT, 12);
+    xfer += this->JSON.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.BSON) {
+    xfer += oprot->writeFieldBegin("BSON", ::apache::thrift::protocol::T_STRUCT, 13);
+    xfer += this->BSON.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.UUID) {
+    xfer += oprot->writeFieldBegin("UUID", ::apache::thrift::protocol::T_STRUCT, 14);
+    xfer += this->UUID.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.FLOAT16) {
+    xfer += oprot->writeFieldBegin("FLOAT16", ::apache::thrift::protocol::T_STRUCT, 15);
+    xfer += this->FLOAT16.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t SchemaElement::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_name = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast96;
+          xfer += iprot->readI32(ecast96);
+          this->type = static_cast<Type::type>(ecast96);
+          this->__isset.type = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->type_length);
+          this->__isset.type_length = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast97;
+          xfer += iprot->readI32(ecast97);
+          this->repetition_type = static_cast<FieldRepetitionType::type>(ecast97);
+          this->__isset.repetition_type = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->name);
+          isset_name = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->num_children);
+          this->__isset.num_children = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast98;
+          xfer += iprot->readI32(ecast98);
+          this->converted_type = static_cast<ConvertedType::type>(ecast98);
+          this->__isset.converted_type = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 7:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->scale);
+          this->__isset.scale = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 8:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->precision);
+          this->__isset.precision = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 9:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->field_id);
+          this->__isset.field_id = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 10:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->logicalType.read(iprot);
+          this->__isset.logicalType = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_name)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t SchemaElement::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("SchemaElement");
+
+  if (this->__isset.type) {
+    xfer += oprot->writeFieldBegin("type", ::apache::thrift::protocol::T_I32, 1);
+    xfer += oprot->writeI32(static_cast<int32_t>(this->type));
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.type_length) {
+    xfer += oprot->writeFieldBegin("type_length", ::apache::thrift::protocol::T_I32, 2);
+    xfer += oprot->writeI32(this->type_length);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.repetition_type) {
+    xfer += oprot->writeFieldBegin("repetition_type", ::apache::thrift::protocol::T_I32, 3);
+    xfer += oprot->writeI32(static_cast<int32_t>(this->repetition_type));
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldBegin("name", ::apache::thrift::protocol::T_STRING, 4);
+  xfer += oprot->writeString(this->name);
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.num_children) {
+    xfer += oprot->writeFieldBegin("num_children", ::apache::thrift::protocol::T_I32, 5);
+    xfer += oprot->writeI32(this->num_children);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.converted_type) {
+    xfer += oprot->writeFieldBegin("converted_type", ::apache::thrift::protocol::T_I32, 6);
+    xfer += oprot->writeI32(static_cast<int32_t>(this->converted_type));
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.scale) {
+    xfer += oprot->writeFieldBegin("scale", ::apache::thrift::protocol::T_I32, 7);
+    xfer += oprot->writeI32(this->scale);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.precision) {
+    xfer += oprot->writeFieldBegin("precision", ::apache::thrift::protocol::T_I32, 8);
+    xfer += oprot->writeI32(this->precision);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.field_id) {
+    xfer += oprot->writeFieldBegin("field_id", ::apache::thrift::protocol::T_I32, 9);
+    xfer += oprot->writeI32(this->field_id);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.logicalType) {
+    xfer += oprot->writeFieldBegin("logicalType", ::apache::thrift::protocol::T_STRUCT, 10);
+    xfer += this->logicalType.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t DataPageHeader::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_num_values = false;
+  bool isset_encoding = false;
+  bool isset_definition_level_encoding = false;
+  bool isset_repetition_level_encoding = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->num_values);
+          isset_num_values = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast103;
+          xfer += iprot->readI32(ecast103);
+          this->encoding = static_cast<Encoding::type>(ecast103);
+          isset_encoding = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast104;
+          xfer += iprot->readI32(ecast104);
+          this->definition_level_encoding = static_cast<Encoding::type>(ecast104);
+          isset_definition_level_encoding = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast105;
+          xfer += iprot->readI32(ecast105);
+          this->repetition_level_encoding = static_cast<Encoding::type>(ecast105);
+          isset_repetition_level_encoding = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->statistics.read(iprot);
+          this->__isset.statistics = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_num_values)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_encoding)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_definition_level_encoding)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_repetition_level_encoding)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t DataPageHeader::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("DataPageHeader");
+
+  xfer += oprot->writeFieldBegin("num_values", ::apache::thrift::protocol::T_I32, 1);
+  xfer += oprot->writeI32(this->num_values);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("encoding", ::apache::thrift::protocol::T_I32, 2);
+  xfer += oprot->writeI32(static_cast<int32_t>(this->encoding));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("definition_level_encoding", ::apache::thrift::protocol::T_I32, 3);
+  xfer += oprot->writeI32(static_cast<int32_t>(this->definition_level_encoding));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("repetition_level_encoding", ::apache::thrift::protocol::T_I32, 4);
+  xfer += oprot->writeI32(static_cast<int32_t>(this->repetition_level_encoding));
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.statistics) {
+    xfer += oprot->writeFieldBegin("statistics", ::apache::thrift::protocol::T_STRUCT, 5);
+    xfer += this->statistics.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t IndexPageHeader::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t IndexPageHeader::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("IndexPageHeader");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t DictionaryPageHeader::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_num_values = false;
+  bool isset_encoding = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->num_values);
+          isset_num_values = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast114;
+          xfer += iprot->readI32(ecast114);
+          this->encoding = static_cast<Encoding::type>(ecast114);
+          isset_encoding = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->is_sorted);
+          this->__isset.is_sorted = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_num_values)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_encoding)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t DictionaryPageHeader::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("DictionaryPageHeader");
+
+  xfer += oprot->writeFieldBegin("num_values", ::apache::thrift::protocol::T_I32, 1);
+  xfer += oprot->writeI32(this->num_values);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("encoding", ::apache::thrift::protocol::T_I32, 2);
+  xfer += oprot->writeI32(static_cast<int32_t>(this->encoding));
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.is_sorted) {
+    xfer += oprot->writeFieldBegin("is_sorted", ::apache::thrift::protocol::T_BOOL, 3);
+    xfer += oprot->writeBool(this->is_sorted);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t DataPageHeaderV2::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_num_values = false;
+  bool isset_num_nulls = false;
+  bool isset_num_rows = false;
+  bool isset_encoding = false;
+  bool isset_definition_levels_byte_length = false;
+  bool isset_repetition_levels_byte_length = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->num_values);
+          isset_num_values = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->num_nulls);
+          isset_num_nulls = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->num_rows);
+          isset_num_rows = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast119;
+          xfer += iprot->readI32(ecast119);
+          this->encoding = static_cast<Encoding::type>(ecast119);
+          isset_encoding = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->definition_levels_byte_length);
+          isset_definition_levels_byte_length = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->repetition_levels_byte_length);
+          isset_repetition_levels_byte_length = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 7:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->is_compressed);
+          this->__isset.is_compressed = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 8:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->statistics.read(iprot);
+          this->__isset.statistics = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_num_values)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_num_nulls)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_num_rows)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_encoding)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_definition_levels_byte_length)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_repetition_levels_byte_length)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t DataPageHeaderV2::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("DataPageHeaderV2");
+
+  xfer += oprot->writeFieldBegin("num_values", ::apache::thrift::protocol::T_I32, 1);
+  xfer += oprot->writeI32(this->num_values);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("num_nulls", ::apache::thrift::protocol::T_I32, 2);
+  xfer += oprot->writeI32(this->num_nulls);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("num_rows", ::apache::thrift::protocol::T_I32, 3);
+  xfer += oprot->writeI32(this->num_rows);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("encoding", ::apache::thrift::protocol::T_I32, 4);
+  xfer += oprot->writeI32(static_cast<int32_t>(this->encoding));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("definition_levels_byte_length", ::apache::thrift::protocol::T_I32, 5);
+  xfer += oprot->writeI32(this->definition_levels_byte_length);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("repetition_levels_byte_length", ::apache::thrift::protocol::T_I32, 6);
+  xfer += oprot->writeI32(this->repetition_levels_byte_length);
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.is_compressed) {
+    xfer += oprot->writeFieldBegin("is_compressed", ::apache::thrift::protocol::T_BOOL, 7);
+    xfer += oprot->writeBool(this->is_compressed);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.statistics) {
+    xfer += oprot->writeFieldBegin("statistics", ::apache::thrift::protocol::T_STRUCT, 8);
+    xfer += this->statistics.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t SplitBlockAlgorithm::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t SplitBlockAlgorithm::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("SplitBlockAlgorithm");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t BloomFilterAlgorithm::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->BLOCK.read(iprot);
+          this->__isset.BLOCK = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t BloomFilterAlgorithm::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("BloomFilterAlgorithm");
+
+  if (this->__isset.BLOCK) {
+    xfer += oprot->writeFieldBegin("BLOCK", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->BLOCK.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t XxHash::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t XxHash::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("XxHash");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t BloomFilterHash::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->XXHASH.read(iprot);
+          this->__isset.XXHASH = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t BloomFilterHash::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("BloomFilterHash");
+
+  if (this->__isset.XXHASH) {
+    xfer += oprot->writeFieldBegin("XXHASH", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->XXHASH.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t Uncompressed::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t Uncompressed::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("Uncompressed");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t BloomFilterCompression::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->UNCOMPRESSED.read(iprot);
+          this->__isset.UNCOMPRESSED = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t BloomFilterCompression::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("BloomFilterCompression");
+
+  if (this->__isset.UNCOMPRESSED) {
+    xfer += oprot->writeFieldBegin("UNCOMPRESSED", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->UNCOMPRESSED.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t BloomFilterHeader::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_numBytes = false;
+  bool isset_algorithm = false;
+  bool isset_hash = false;
+  bool isset_compression = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->numBytes);
+          isset_numBytes = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->algorithm.read(iprot);
+          isset_algorithm = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->hash.read(iprot);
+          isset_hash = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->compression.read(iprot);
+          isset_compression = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_numBytes)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_algorithm)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_hash)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_compression)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t BloomFilterHeader::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("BloomFilterHeader");
+
+  xfer += oprot->writeFieldBegin("numBytes", ::apache::thrift::protocol::T_I32, 1);
+  xfer += oprot->writeI32(this->numBytes);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("algorithm", ::apache::thrift::protocol::T_STRUCT, 2);
+  xfer += this->algorithm.write(oprot);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("hash", ::apache::thrift::protocol::T_STRUCT, 3);
+  xfer += this->hash.write(oprot);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("compression", ::apache::thrift::protocol::T_STRUCT, 4);
+  xfer += this->compression.write(oprot);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t PageHeader::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_type = false;
+  bool isset_uncompressed_page_size = false;
+  bool isset_compressed_page_size = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast152;
+          xfer += iprot->readI32(ecast152);
+          this->type = static_cast<PageType::type>(ecast152);
+          isset_type = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->uncompressed_page_size);
+          isset_uncompressed_page_size = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->compressed_page_size);
+          isset_compressed_page_size = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->crc);
+          this->__isset.crc = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->data_page_header.read(iprot);
+          this->__isset.data_page_header = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->index_page_header.read(iprot);
+          this->__isset.index_page_header = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 7:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->dictionary_page_header.read(iprot);
+          this->__isset.dictionary_page_header = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 8:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->data_page_header_v2.read(iprot);
+          this->__isset.data_page_header_v2 = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_type)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_uncompressed_page_size)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_compressed_page_size)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t PageHeader::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("PageHeader");
+
+  xfer += oprot->writeFieldBegin("type", ::apache::thrift::protocol::T_I32, 1);
+  xfer += oprot->writeI32(static_cast<int32_t>(this->type));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("uncompressed_page_size", ::apache::thrift::protocol::T_I32, 2);
+  xfer += oprot->writeI32(this->uncompressed_page_size);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("compressed_page_size", ::apache::thrift::protocol::T_I32, 3);
+  xfer += oprot->writeI32(this->compressed_page_size);
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.crc) {
+    xfer += oprot->writeFieldBegin("crc", ::apache::thrift::protocol::T_I32, 4);
+    xfer += oprot->writeI32(this->crc);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.data_page_header) {
+    xfer += oprot->writeFieldBegin("data_page_header", ::apache::thrift::protocol::T_STRUCT, 5);
+    xfer += this->data_page_header.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.index_page_header) {
+    xfer += oprot->writeFieldBegin("index_page_header", ::apache::thrift::protocol::T_STRUCT, 6);
+    xfer += this->index_page_header.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.dictionary_page_header) {
+    xfer += oprot->writeFieldBegin("dictionary_page_header", ::apache::thrift::protocol::T_STRUCT, 7);
+    xfer += this->dictionary_page_header.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.data_page_header_v2) {
+    xfer += oprot->writeFieldBegin("data_page_header_v2", ::apache::thrift::protocol::T_STRUCT, 8);
+    xfer += this->data_page_header_v2.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t KeyValue::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_key = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->key);
+          isset_key = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->value);
+          this->__isset.value = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_key)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t KeyValue::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("KeyValue");
+
+  xfer += oprot->writeFieldBegin("key", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->key);
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.value) {
+    xfer += oprot->writeFieldBegin("value", ::apache::thrift::protocol::T_STRING, 2);
+    xfer += oprot->writeString(this->value);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t SortingColumn::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_column_idx = false;
+  bool isset_descending = false;
+  bool isset_nulls_first = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->column_idx);
+          isset_column_idx = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->descending);
+          isset_descending = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->nulls_first);
+          isset_nulls_first = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_column_idx)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_descending)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_nulls_first)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t SortingColumn::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("SortingColumn");
+
+  xfer += oprot->writeFieldBegin("column_idx", ::apache::thrift::protocol::T_I32, 1);
+  xfer += oprot->writeI32(this->column_idx);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("descending", ::apache::thrift::protocol::T_BOOL, 2);
+  xfer += oprot->writeBool(this->descending);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("nulls_first", ::apache::thrift::protocol::T_BOOL, 3);
+  xfer += oprot->writeBool(this->nulls_first);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t PageEncodingStats::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_page_type = false;
+  bool isset_encoding = false;
+  bool isset_count = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast165;
+          xfer += iprot->readI32(ecast165);
+          this->page_type = static_cast<PageType::type>(ecast165);
+          isset_page_type = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast166;
+          xfer += iprot->readI32(ecast166);
+          this->encoding = static_cast<Encoding::type>(ecast166);
+          isset_encoding = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->count);
+          isset_count = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_page_type)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_encoding)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_count)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t PageEncodingStats::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("PageEncodingStats");
+
+  xfer += oprot->writeFieldBegin("page_type", ::apache::thrift::protocol::T_I32, 1);
+  xfer += oprot->writeI32(static_cast<int32_t>(this->page_type));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("encoding", ::apache::thrift::protocol::T_I32, 2);
+  xfer += oprot->writeI32(static_cast<int32_t>(this->encoding));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("count", ::apache::thrift::protocol::T_I32, 3);
+  xfer += oprot->writeI32(this->count);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t ColumnMetaData::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_type = false;
+  bool isset_encodings = false;
+  bool isset_path_in_schema = false;
+  bool isset_codec = false;
+  bool isset_num_values = false;
+  bool isset_total_uncompressed_size = false;
+  bool isset_total_compressed_size = false;
+  bool isset_data_page_offset = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast171;
+          xfer += iprot->readI32(ecast171);
+          this->type = static_cast<Type::type>(ecast171);
+          isset_type = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->encodings.clear();
+            uint32_t _size172;
+            ::apache::thrift::protocol::TType _etype175;
+            xfer += iprot->readListBegin(_etype175, _size172);
+            this->encodings.resize(_size172);
+            uint32_t _i176;
+            for (_i176 = 0; _i176 < _size172; ++_i176)
+            {
+              int32_t ecast177;
+              xfer += iprot->readI32(ecast177);
+              this->encodings[_i176] = static_cast<Encoding::type>(ecast177);
+            }
+            xfer += iprot->readListEnd();
+          }
+          isset_encodings = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->path_in_schema.clear();
+            uint32_t _size178;
+            ::apache::thrift::protocol::TType _etype181;
+            xfer += iprot->readListBegin(_etype181, _size178);
+            this->path_in_schema.resize(_size178);
+            uint32_t _i182;
+            for (_i182 = 0; _i182 < _size178; ++_i182)
+            {
+              xfer += iprot->readString(this->path_in_schema[_i182]);
+            }
+            xfer += iprot->readListEnd();
+          }
+          isset_path_in_schema = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast183;
+          xfer += iprot->readI32(ecast183);
+          this->codec = static_cast<CompressionCodec::type>(ecast183);
+          isset_codec = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->num_values);
+          isset_num_values = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->total_uncompressed_size);
+          isset_total_uncompressed_size = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 7:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->total_compressed_size);
+          isset_total_compressed_size = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 8:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->key_value_metadata.clear();
+            uint32_t _size184;
+            ::apache::thrift::protocol::TType _etype187;
+            xfer += iprot->readListBegin(_etype187, _size184);
+            this->key_value_metadata.resize(_size184);
+            uint32_t _i188;
+            for (_i188 = 0; _i188 < _size184; ++_i188)
+            {
+              xfer += this->key_value_metadata[_i188].read(iprot);
+            }
+            xfer += iprot->readListEnd();
+          }
+          this->__isset.key_value_metadata = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 9:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->data_page_offset);
+          isset_data_page_offset = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 10:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->index_page_offset);
+          this->__isset.index_page_offset = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 11:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->dictionary_page_offset);
+          this->__isset.dictionary_page_offset = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 12:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->statistics.read(iprot);
+          this->__isset.statistics = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 13:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->encoding_stats.clear();
+            uint32_t _size189;
+            ::apache::thrift::protocol::TType _etype192;
+            xfer += iprot->readListBegin(_etype192, _size189);
+            this->encoding_stats.resize(_size189);
+            uint32_t _i193;
+            for (_i193 = 0; _i193 < _size189; ++_i193)
+            {
+              xfer += this->encoding_stats[_i193].read(iprot);
+            }
+            xfer += iprot->readListEnd();
+          }
+          this->__isset.encoding_stats = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 14:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->bloom_filter_offset);
+          this->__isset.bloom_filter_offset = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 15:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->bloom_filter_length);
+          this->__isset.bloom_filter_length = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 16:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->size_statistics.read(iprot);
+          this->__isset.size_statistics = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_type)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_encodings)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_path_in_schema)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_codec)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_num_values)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_total_uncompressed_size)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_total_compressed_size)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_data_page_offset)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t ColumnMetaData::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("ColumnMetaData");
+
+  xfer += oprot->writeFieldBegin("type", ::apache::thrift::protocol::T_I32, 1);
+  xfer += oprot->writeI32(static_cast<int32_t>(this->type));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("encodings", ::apache::thrift::protocol::T_LIST, 2);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I32, static_cast<uint32_t>(this->encodings.size()));
+    std::vector<Encoding::type> ::const_iterator _iter194;
+    for (_iter194 = this->encodings.begin(); _iter194 != this->encodings.end(); ++_iter194)
+    {
+      xfer += oprot->writeI32(static_cast<int32_t>((*_iter194)));
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("path_in_schema", ::apache::thrift::protocol::T_LIST, 3);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->path_in_schema.size()));
+    std::vector<std::string> ::const_iterator _iter195;
+    for (_iter195 = this->path_in_schema.begin(); _iter195 != this->path_in_schema.end(); ++_iter195)
+    {
+      xfer += oprot->writeString((*_iter195));
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("codec", ::apache::thrift::protocol::T_I32, 4);
+  xfer += oprot->writeI32(static_cast<int32_t>(this->codec));
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("num_values", ::apache::thrift::protocol::T_I64, 5);
+  xfer += oprot->writeI64(this->num_values);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("total_uncompressed_size", ::apache::thrift::protocol::T_I64, 6);
+  xfer += oprot->writeI64(this->total_uncompressed_size);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("total_compressed_size", ::apache::thrift::protocol::T_I64, 7);
+  xfer += oprot->writeI64(this->total_compressed_size);
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.key_value_metadata) {
+    xfer += oprot->writeFieldBegin("key_value_metadata", ::apache::thrift::protocol::T_LIST, 8);
+    {
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->key_value_metadata.size()));
+      std::vector<KeyValue> ::const_iterator _iter196;
+      for (_iter196 = this->key_value_metadata.begin(); _iter196 != this->key_value_metadata.end(); ++_iter196)
+      {
+        xfer += (*_iter196).write(oprot);
+      }
+      xfer += oprot->writeListEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldBegin("data_page_offset", ::apache::thrift::protocol::T_I64, 9);
+  xfer += oprot->writeI64(this->data_page_offset);
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.index_page_offset) {
+    xfer += oprot->writeFieldBegin("index_page_offset", ::apache::thrift::protocol::T_I64, 10);
+    xfer += oprot->writeI64(this->index_page_offset);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.dictionary_page_offset) {
+    xfer += oprot->writeFieldBegin("dictionary_page_offset", ::apache::thrift::protocol::T_I64, 11);
+    xfer += oprot->writeI64(this->dictionary_page_offset);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.statistics) {
+    xfer += oprot->writeFieldBegin("statistics", ::apache::thrift::protocol::T_STRUCT, 12);
+    xfer += this->statistics.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.encoding_stats) {
+    xfer += oprot->writeFieldBegin("encoding_stats", ::apache::thrift::protocol::T_LIST, 13);
+    {
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->encoding_stats.size()));
+      std::vector<PageEncodingStats> ::const_iterator _iter197;
+      for (_iter197 = this->encoding_stats.begin(); _iter197 != this->encoding_stats.end(); ++_iter197)
+      {
+        xfer += (*_iter197).write(oprot);
+      }
+      xfer += oprot->writeListEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.bloom_filter_offset) {
+    xfer += oprot->writeFieldBegin("bloom_filter_offset", ::apache::thrift::protocol::T_I64, 14);
+    xfer += oprot->writeI64(this->bloom_filter_offset);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.bloom_filter_length) {
+    xfer += oprot->writeFieldBegin("bloom_filter_length", ::apache::thrift::protocol::T_I32, 15);
+    xfer += oprot->writeI32(this->bloom_filter_length);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.size_statistics) {
+    xfer += oprot->writeFieldBegin("size_statistics", ::apache::thrift::protocol::T_STRUCT, 16);
+    xfer += this->size_statistics.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t EncryptionWithFooterKey::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t EncryptionWithFooterKey::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("EncryptionWithFooterKey");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t EncryptionWithColumnKey::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_path_in_schema = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->path_in_schema.clear();
+            uint32_t _size206;
+            ::apache::thrift::protocol::TType _etype209;
+            xfer += iprot->readListBegin(_etype209, _size206);
+            this->path_in_schema.resize(_size206);
+            uint32_t _i210;
+            for (_i210 = 0; _i210 < _size206; ++_i210)
+            {
+              xfer += iprot->readString(this->path_in_schema[_i210]);
+            }
+            xfer += iprot->readListEnd();
+          }
+          isset_path_in_schema = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readBinary(this->key_metadata);
+          this->__isset.key_metadata = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_path_in_schema)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t EncryptionWithColumnKey::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("EncryptionWithColumnKey");
+
+  xfer += oprot->writeFieldBegin("path_in_schema", ::apache::thrift::protocol::T_LIST, 1);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->path_in_schema.size()));
+    std::vector<std::string> ::const_iterator _iter211;
+    for (_iter211 = this->path_in_schema.begin(); _iter211 != this->path_in_schema.end(); ++_iter211)
+    {
+      xfer += oprot->writeString((*_iter211));
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.key_metadata) {
+    xfer += oprot->writeFieldBegin("key_metadata", ::apache::thrift::protocol::T_STRING, 2);
+    xfer += oprot->writeBinary(this->key_metadata);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t ColumnCryptoMetaData::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ENCRYPTION_WITH_FOOTER_KEY.read(iprot);
+          this->__isset.ENCRYPTION_WITH_FOOTER_KEY = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->ENCRYPTION_WITH_COLUMN_KEY.read(iprot);
+          this->__isset.ENCRYPTION_WITH_COLUMN_KEY = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t ColumnCryptoMetaData::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("ColumnCryptoMetaData");
+
+  if (this->__isset.ENCRYPTION_WITH_FOOTER_KEY) {
+    xfer += oprot->writeFieldBegin("ENCRYPTION_WITH_FOOTER_KEY", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->ENCRYPTION_WITH_FOOTER_KEY.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.ENCRYPTION_WITH_COLUMN_KEY) {
+    xfer += oprot->writeFieldBegin("ENCRYPTION_WITH_COLUMN_KEY", ::apache::thrift::protocol::T_STRUCT, 2);
+    xfer += this->ENCRYPTION_WITH_COLUMN_KEY.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t ColumnChunk::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_file_offset = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->file_path);
+          this->__isset.file_path = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->file_offset);
+          isset_file_offset = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->meta_data.read(iprot);
+          this->__isset.meta_data = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->offset_index_offset);
+          this->__isset.offset_index_offset = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->offset_index_length);
+          this->__isset.offset_index_length = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->column_index_offset);
+          this->__isset.column_index_offset = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 7:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->column_index_length);
+          this->__isset.column_index_length = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 8:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->crypto_metadata.read(iprot);
+          this->__isset.crypto_metadata = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 9:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readBinary(this->encrypted_column_metadata);
+          this->__isset.encrypted_column_metadata = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_file_offset)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t ColumnChunk::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("ColumnChunk");
+
+  if (this->__isset.file_path) {
+    xfer += oprot->writeFieldBegin("file_path", ::apache::thrift::protocol::T_STRING, 1);
+    xfer += oprot->writeString(this->file_path);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldBegin("file_offset", ::apache::thrift::protocol::T_I64, 2);
+  xfer += oprot->writeI64(this->file_offset);
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.meta_data) {
+    xfer += oprot->writeFieldBegin("meta_data", ::apache::thrift::protocol::T_STRUCT, 3);
+    xfer += this->meta_data.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.offset_index_offset) {
+    xfer += oprot->writeFieldBegin("offset_index_offset", ::apache::thrift::protocol::T_I64, 4);
+    xfer += oprot->writeI64(this->offset_index_offset);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.offset_index_length) {
+    xfer += oprot->writeFieldBegin("offset_index_length", ::apache::thrift::protocol::T_I32, 5);
+    xfer += oprot->writeI32(this->offset_index_length);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.column_index_offset) {
+    xfer += oprot->writeFieldBegin("column_index_offset", ::apache::thrift::protocol::T_I64, 6);
+    xfer += oprot->writeI64(this->column_index_offset);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.column_index_length) {
+    xfer += oprot->writeFieldBegin("column_index_length", ::apache::thrift::protocol::T_I32, 7);
+    xfer += oprot->writeI32(this->column_index_length);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.crypto_metadata) {
+    xfer += oprot->writeFieldBegin("crypto_metadata", ::apache::thrift::protocol::T_STRUCT, 8);
+    xfer += this->crypto_metadata.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.encrypted_column_metadata) {
+    xfer += oprot->writeFieldBegin("encrypted_column_metadata", ::apache::thrift::protocol::T_STRING, 9);
+    xfer += oprot->writeBinary(this->encrypted_column_metadata);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t RowGroup::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_columns = false;
+  bool isset_total_byte_size = false;
+  bool isset_num_rows = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->columns.clear();
+            uint32_t _size224;
+            ::apache::thrift::protocol::TType _etype227;
+            xfer += iprot->readListBegin(_etype227, _size224);
+            this->columns.resize(_size224);
+            uint32_t _i228;
+            for (_i228 = 0; _i228 < _size224; ++_i228)
+            {
+              xfer += this->columns[_i228].read(iprot);
+            }
+            xfer += iprot->readListEnd();
+          }
+          isset_columns = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->total_byte_size);
+          isset_total_byte_size = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->num_rows);
+          isset_num_rows = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->sorting_columns.clear();
+            uint32_t _size229;
+            ::apache::thrift::protocol::TType _etype232;
+            xfer += iprot->readListBegin(_etype232, _size229);
+            this->sorting_columns.resize(_size229);
+            uint32_t _i233;
+            for (_i233 = 0; _i233 < _size229; ++_i233)
+            {
+              xfer += this->sorting_columns[_i233].read(iprot);
+            }
+            xfer += iprot->readListEnd();
+          }
+          this->__isset.sorting_columns = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->file_offset);
+          this->__isset.file_offset = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->total_compressed_size);
+          this->__isset.total_compressed_size = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 7:
+        if (ftype == ::apache::thrift::protocol::T_I16) {
+          xfer += iprot->readI16(this->ordinal);
+          this->__isset.ordinal = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_columns)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_total_byte_size)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_num_rows)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t RowGroup::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("RowGroup");
+
+  xfer += oprot->writeFieldBegin("columns", ::apache::thrift::protocol::T_LIST, 1);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->columns.size()));
+    std::vector<ColumnChunk> ::const_iterator _iter234;
+    for (_iter234 = this->columns.begin(); _iter234 != this->columns.end(); ++_iter234)
+    {
+      xfer += (*_iter234).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("total_byte_size", ::apache::thrift::protocol::T_I64, 2);
+  xfer += oprot->writeI64(this->total_byte_size);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("num_rows", ::apache::thrift::protocol::T_I64, 3);
+  xfer += oprot->writeI64(this->num_rows);
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.sorting_columns) {
+    xfer += oprot->writeFieldBegin("sorting_columns", ::apache::thrift::protocol::T_LIST, 4);
+    {
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->sorting_columns.size()));
+      std::vector<SortingColumn> ::const_iterator _iter235;
+      for (_iter235 = this->sorting_columns.begin(); _iter235 != this->sorting_columns.end(); ++_iter235)
+      {
+        xfer += (*_iter235).write(oprot);
+      }
+      xfer += oprot->writeListEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.file_offset) {
+    xfer += oprot->writeFieldBegin("file_offset", ::apache::thrift::protocol::T_I64, 5);
+    xfer += oprot->writeI64(this->file_offset);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.total_compressed_size) {
+    xfer += oprot->writeFieldBegin("total_compressed_size", ::apache::thrift::protocol::T_I64, 6);
+    xfer += oprot->writeI64(this->total_compressed_size);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.ordinal) {
+    xfer += oprot->writeFieldBegin("ordinal", ::apache::thrift::protocol::T_I16, 7);
+    xfer += oprot->writeI16(this->ordinal);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t TypeDefinedOrder::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    xfer += iprot->skip(ftype);
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t TypeDefinedOrder::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("TypeDefinedOrder");
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t ColumnOrder::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->TYPE_ORDER.read(iprot);
+          this->__isset.TYPE_ORDER = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t ColumnOrder::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("ColumnOrder");
+
+  if (this->__isset.TYPE_ORDER) {
+    xfer += oprot->writeFieldBegin("TYPE_ORDER", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->TYPE_ORDER.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t PageLocation::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_offset = false;
+  bool isset_compressed_page_size = false;
+  bool isset_first_row_index = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->offset);
+          isset_offset = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->compressed_page_size);
+          isset_compressed_page_size = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->first_row_index);
+          isset_first_row_index = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_offset)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_compressed_page_size)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_first_row_index)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t PageLocation::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("PageLocation");
+
+  xfer += oprot->writeFieldBegin("offset", ::apache::thrift::protocol::T_I64, 1);
+  xfer += oprot->writeI64(this->offset);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("compressed_page_size", ::apache::thrift::protocol::T_I32, 2);
+  xfer += oprot->writeI32(this->compressed_page_size);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("first_row_index", ::apache::thrift::protocol::T_I64, 3);
+  xfer += oprot->writeI64(this->first_row_index);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t OffsetIndex::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_page_locations = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->page_locations.clear();
+            uint32_t _size252;
+            ::apache::thrift::protocol::TType _etype255;
+            xfer += iprot->readListBegin(_etype255, _size252);
+            this->page_locations.resize(_size252);
+            uint32_t _i256;
+            for (_i256 = 0; _i256 < _size252; ++_i256)
+            {
+              xfer += this->page_locations[_i256].read(iprot);
+            }
+            xfer += iprot->readListEnd();
+          }
+          isset_page_locations = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->unencoded_byte_array_data_bytes.clear();
+            uint32_t _size257;
+            ::apache::thrift::protocol::TType _etype260;
+            xfer += iprot->readListBegin(_etype260, _size257);
+            this->unencoded_byte_array_data_bytes.resize(_size257);
+            uint32_t _i261;
+            for (_i261 = 0; _i261 < _size257; ++_i261)
+            {
+              xfer += iprot->readI64(this->unencoded_byte_array_data_bytes[_i261]);
+            }
+            xfer += iprot->readListEnd();
+          }
+          this->__isset.unencoded_byte_array_data_bytes = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_page_locations)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t OffsetIndex::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("OffsetIndex");
+
+  xfer += oprot->writeFieldBegin("page_locations", ::apache::thrift::protocol::T_LIST, 1);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->page_locations.size()));
+    std::vector<PageLocation> ::const_iterator _iter262;
+    for (_iter262 = this->page_locations.begin(); _iter262 != this->page_locations.end(); ++_iter262)
+    {
+      xfer += (*_iter262).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.unencoded_byte_array_data_bytes) {
+    xfer += oprot->writeFieldBegin("unencoded_byte_array_data_bytes", ::apache::thrift::protocol::T_LIST, 2);
+    {
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->unencoded_byte_array_data_bytes.size()));
+      std::vector<int64_t> ::const_iterator _iter263;
+      for (_iter263 = this->unencoded_byte_array_data_bytes.begin(); _iter263 != this->unencoded_byte_array_data_bytes.end(); ++_iter263)
+      {
+        xfer += oprot->writeI64((*_iter263));
+      }
+      xfer += oprot->writeListEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t ColumnIndex::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_null_pages = false;
+  bool isset_min_values = false;
+  bool isset_max_values = false;
+  bool isset_boundary_order = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->null_pages.clear();
+            uint32_t _size268;
+            ::apache::thrift::protocol::TType _etype271;
+            xfer += iprot->readListBegin(_etype271, _size268);
+            this->null_pages.resize(_size268);
+            uint32_t _i272;
+            for (_i272 = 0; _i272 < _size268; ++_i272)
+            {
+              xfer += iprot->readBool(this->null_pages[_i272]);
+            }
+            xfer += iprot->readListEnd();
+          }
+          isset_null_pages = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->min_values.clear();
+            uint32_t _size273;
+            ::apache::thrift::protocol::TType _etype276;
+            xfer += iprot->readListBegin(_etype276, _size273);
+            this->min_values.resize(_size273);
+            uint32_t _i277;
+            for (_i277 = 0; _i277 < _size273; ++_i277)
+            {
+              xfer += iprot->readBinary(this->min_values[_i277]);
+            }
+            xfer += iprot->readListEnd();
+          }
+          isset_min_values = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->max_values.clear();
+            uint32_t _size278;
+            ::apache::thrift::protocol::TType _etype281;
+            xfer += iprot->readListBegin(_etype281, _size278);
+            this->max_values.resize(_size278);
+            uint32_t _i282;
+            for (_i282 = 0; _i282 < _size278; ++_i282)
+            {
+              xfer += iprot->readBinary(this->max_values[_i282]);
+            }
+            xfer += iprot->readListEnd();
+          }
+          isset_max_values = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          int32_t ecast283;
+          xfer += iprot->readI32(ecast283);
+          this->boundary_order = static_cast<BoundaryOrder::type>(ecast283);
+          isset_boundary_order = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->null_counts.clear();
+            uint32_t _size284;
+            ::apache::thrift::protocol::TType _etype287;
+            xfer += iprot->readListBegin(_etype287, _size284);
+            this->null_counts.resize(_size284);
+            uint32_t _i288;
+            for (_i288 = 0; _i288 < _size284; ++_i288)
+            {
+              xfer += iprot->readI64(this->null_counts[_i288]);
+            }
+            xfer += iprot->readListEnd();
+          }
+          this->__isset.null_counts = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->repetition_level_histograms.clear();
+            uint32_t _size289;
+            ::apache::thrift::protocol::TType _etype292;
+            xfer += iprot->readListBegin(_etype292, _size289);
+            this->repetition_level_histograms.resize(_size289);
+            uint32_t _i293;
+            for (_i293 = 0; _i293 < _size289; ++_i293)
+            {
+              xfer += iprot->readI64(this->repetition_level_histograms[_i293]);
+            }
+            xfer += iprot->readListEnd();
+          }
+          this->__isset.repetition_level_histograms = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 7:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->definition_level_histograms.clear();
+            uint32_t _size294;
+            ::apache::thrift::protocol::TType _etype297;
+            xfer += iprot->readListBegin(_etype297, _size294);
+            this->definition_level_histograms.resize(_size294);
+            uint32_t _i298;
+            for (_i298 = 0; _i298 < _size294; ++_i298)
+            {
+              xfer += iprot->readI64(this->definition_level_histograms[_i298]);
+            }
+            xfer += iprot->readListEnd();
+          }
+          this->__isset.definition_level_histograms = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_null_pages)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_min_values)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_max_values)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_boundary_order)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t ColumnIndex::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("ColumnIndex");
+
+  xfer += oprot->writeFieldBegin("null_pages", ::apache::thrift::protocol::T_LIST, 1);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_BOOL, static_cast<uint32_t>(this->null_pages.size()));
+    std::vector<bool> ::const_iterator _iter299;
+    for (_iter299 = this->null_pages.begin(); _iter299 != this->null_pages.end(); ++_iter299)
+    {
+      xfer += oprot->writeBool((*_iter299));
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("min_values", ::apache::thrift::protocol::T_LIST, 2);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->min_values.size()));
+    std::vector<std::string> ::const_iterator _iter300;
+    for (_iter300 = this->min_values.begin(); _iter300 != this->min_values.end(); ++_iter300)
+    {
+      xfer += oprot->writeBinary((*_iter300));
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("max_values", ::apache::thrift::protocol::T_LIST, 3);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->max_values.size()));
+    std::vector<std::string> ::const_iterator _iter301;
+    for (_iter301 = this->max_values.begin(); _iter301 != this->max_values.end(); ++_iter301)
+    {
+      xfer += oprot->writeBinary((*_iter301));
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("boundary_order", ::apache::thrift::protocol::T_I32, 4);
+  xfer += oprot->writeI32(static_cast<int32_t>(this->boundary_order));
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.null_counts) {
+    xfer += oprot->writeFieldBegin("null_counts", ::apache::thrift::protocol::T_LIST, 5);
+    {
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->null_counts.size()));
+      std::vector<int64_t> ::const_iterator _iter302;
+      for (_iter302 = this->null_counts.begin(); _iter302 != this->null_counts.end(); ++_iter302)
+      {
+        xfer += oprot->writeI64((*_iter302));
+      }
+      xfer += oprot->writeListEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.repetition_level_histograms) {
+    xfer += oprot->writeFieldBegin("repetition_level_histograms", ::apache::thrift::protocol::T_LIST, 6);
+    {
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->repetition_level_histograms.size()));
+      std::vector<int64_t> ::const_iterator _iter303;
+      for (_iter303 = this->repetition_level_histograms.begin(); _iter303 != this->repetition_level_histograms.end(); ++_iter303)
+      {
+        xfer += oprot->writeI64((*_iter303));
+      }
+      xfer += oprot->writeListEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.definition_level_histograms) {
+    xfer += oprot->writeFieldBegin("definition_level_histograms", ::apache::thrift::protocol::T_LIST, 7);
+    {
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->definition_level_histograms.size()));
+      std::vector<int64_t> ::const_iterator _iter304;
+      for (_iter304 = this->definition_level_histograms.begin(); _iter304 != this->definition_level_histograms.end(); ++_iter304)
+      {
+        xfer += oprot->writeI64((*_iter304));
+      }
+      xfer += oprot->writeListEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t AesGcmV1::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readBinary(this->aad_prefix);
+          this->__isset.aad_prefix = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readBinary(this->aad_file_unique);
+          this->__isset.aad_file_unique = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->supply_aad_prefix);
+          this->__isset.supply_aad_prefix = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t AesGcmV1::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("AesGcmV1");
+
+  if (this->__isset.aad_prefix) {
+    xfer += oprot->writeFieldBegin("aad_prefix", ::apache::thrift::protocol::T_STRING, 1);
+    xfer += oprot->writeBinary(this->aad_prefix);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.aad_file_unique) {
+    xfer += oprot->writeFieldBegin("aad_file_unique", ::apache::thrift::protocol::T_STRING, 2);
+    xfer += oprot->writeBinary(this->aad_file_unique);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.supply_aad_prefix) {
+    xfer += oprot->writeFieldBegin("supply_aad_prefix", ::apache::thrift::protocol::T_BOOL, 3);
+    xfer += oprot->writeBool(this->supply_aad_prefix);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t AesGcmCtrV1::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readBinary(this->aad_prefix);
+          this->__isset.aad_prefix = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readBinary(this->aad_file_unique);
+          this->__isset.aad_file_unique = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_BOOL) {
+          xfer += iprot->readBool(this->supply_aad_prefix);
+          this->__isset.supply_aad_prefix = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t AesGcmCtrV1::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("AesGcmCtrV1");
+
+  if (this->__isset.aad_prefix) {
+    xfer += oprot->writeFieldBegin("aad_prefix", ::apache::thrift::protocol::T_STRING, 1);
+    xfer += oprot->writeBinary(this->aad_prefix);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.aad_file_unique) {
+    xfer += oprot->writeFieldBegin("aad_file_unique", ::apache::thrift::protocol::T_STRING, 2);
+    xfer += oprot->writeBinary(this->aad_file_unique);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.supply_aad_prefix) {
+    xfer += oprot->writeFieldBegin("supply_aad_prefix", ::apache::thrift::protocol::T_BOOL, 3);
+    xfer += oprot->writeBool(this->supply_aad_prefix);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t EncryptionAlgorithm::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->AES_GCM_V1.read(iprot);
+          this->__isset.AES_GCM_V1 = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->AES_GCM_CTR_V1.read(iprot);
+          this->__isset.AES_GCM_CTR_V1 = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t EncryptionAlgorithm::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("EncryptionAlgorithm");
+
+  if (this->__isset.AES_GCM_V1) {
+    xfer += oprot->writeFieldBegin("AES_GCM_V1", ::apache::thrift::protocol::T_STRUCT, 1);
+    xfer += this->AES_GCM_V1.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.AES_GCM_CTR_V1) {
+    xfer += oprot->writeFieldBegin("AES_GCM_CTR_V1", ::apache::thrift::protocol::T_STRUCT, 2);
+    xfer += this->AES_GCM_CTR_V1.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t FileMetaData::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_version = false;
+  bool isset_schema = false;
+  bool isset_num_rows = false;
+  bool isset_row_groups = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_I32) {
+          xfer += iprot->readI32(this->version);
+          isset_version = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->schema.clear();
+            uint32_t _size321;
+            ::apache::thrift::protocol::TType _etype324;
+            xfer += iprot->readListBegin(_etype324, _size321);
+            this->schema.resize(_size321);
+            uint32_t _i325;
+            for (_i325 = 0; _i325 < _size321; ++_i325)
+            {
+              xfer += this->schema[_i325].read(iprot);
+            }
+            xfer += iprot->readListEnd();
+          }
+          isset_schema = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 3:
+        if (ftype == ::apache::thrift::protocol::T_I64) {
+          xfer += iprot->readI64(this->num_rows);
+          isset_num_rows = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 4:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->row_groups.clear();
+            uint32_t _size326;
+            ::apache::thrift::protocol::TType _etype329;
+            xfer += iprot->readListBegin(_etype329, _size326);
+            this->row_groups.resize(_size326);
+            uint32_t _i330;
+            for (_i330 = 0; _i330 < _size326; ++_i330)
+            {
+              xfer += this->row_groups[_i330].read(iprot);
+            }
+            xfer += iprot->readListEnd();
+          }
+          isset_row_groups = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 5:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->key_value_metadata.clear();
+            uint32_t _size331;
+            ::apache::thrift::protocol::TType _etype334;
+            xfer += iprot->readListBegin(_etype334, _size331);
+            this->key_value_metadata.resize(_size331);
+            uint32_t _i335;
+            for (_i335 = 0; _i335 < _size331; ++_i335)
+            {
+              xfer += this->key_value_metadata[_i335].read(iprot);
+            }
+            xfer += iprot->readListEnd();
+          }
+          this->__isset.key_value_metadata = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 6:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->created_by);
+          this->__isset.created_by = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 7:
+        if (ftype == ::apache::thrift::protocol::T_LIST) {
+          {
+            this->column_orders.clear();
+            uint32_t _size336;
+            ::apache::thrift::protocol::TType _etype339;
+            xfer += iprot->readListBegin(_etype339, _size336);
+            this->column_orders.resize(_size336);
+            uint32_t _i340;
+            for (_i340 = 0; _i340 < _size336; ++_i340)
+            {
+              xfer += this->column_orders[_i340].read(iprot);
+            }
+            xfer += iprot->readListEnd();
+          }
+          this->__isset.column_orders = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 8:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->encryption_algorithm.read(iprot);
+          this->__isset.encryption_algorithm = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 9:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readBinary(this->footer_signing_key_metadata);
+          this->__isset.footer_signing_key_metadata = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_version)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_schema)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_num_rows)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  if (!isset_row_groups)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t FileMetaData::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FileMetaData");
+
+  xfer += oprot->writeFieldBegin("version", ::apache::thrift::protocol::T_I32, 1);
+  xfer += oprot->writeI32(this->version);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("schema", ::apache::thrift::protocol::T_LIST, 2);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->schema.size()));
+    std::vector<SchemaElement> ::const_iterator _iter341;
+    for (_iter341 = this->schema.begin(); _iter341 != this->schema.end(); ++_iter341)
+    {
+      xfer += (*_iter341).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("num_rows", ::apache::thrift::protocol::T_I64, 3);
+  xfer += oprot->writeI64(this->num_rows);
+  xfer += oprot->writeFieldEnd();
+
+  xfer += oprot->writeFieldBegin("row_groups", ::apache::thrift::protocol::T_LIST, 4);
+  {
+    xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->row_groups.size()));
+    std::vector<RowGroup> ::const_iterator _iter342;
+    for (_iter342 = this->row_groups.begin(); _iter342 != this->row_groups.end(); ++_iter342)
+    {
+      xfer += (*_iter342).write(oprot);
+    }
+    xfer += oprot->writeListEnd();
+  }
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.key_value_metadata) {
+    xfer += oprot->writeFieldBegin("key_value_metadata", ::apache::thrift::protocol::T_LIST, 5);
+    {
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->key_value_metadata.size()));
+      std::vector<KeyValue> ::const_iterator _iter343;
+      for (_iter343 = this->key_value_metadata.begin(); _iter343 != this->key_value_metadata.end(); ++_iter343)
+      {
+        xfer += (*_iter343).write(oprot);
+      }
+      xfer += oprot->writeListEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.created_by) {
+    xfer += oprot->writeFieldBegin("created_by", ::apache::thrift::protocol::T_STRING, 6);
+    xfer += oprot->writeString(this->created_by);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.column_orders) {
+    xfer += oprot->writeFieldBegin("column_orders", ::apache::thrift::protocol::T_LIST, 7);
+    {
+      xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->column_orders.size()));
+      std::vector<ColumnOrder> ::const_iterator _iter344;
+      for (_iter344 = this->column_orders.begin(); _iter344 != this->column_orders.end(); ++_iter344)
+      {
+        xfer += (*_iter344).write(oprot);
+      }
+      xfer += oprot->writeListEnd();
+    }
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.encryption_algorithm) {
+    xfer += oprot->writeFieldBegin("encryption_algorithm", ::apache::thrift::protocol::T_STRUCT, 8);
+    xfer += this->encryption_algorithm.write(oprot);
+    xfer += oprot->writeFieldEnd();
+  }
+  if (this->__isset.footer_signing_key_metadata) {
+    xfer += oprot->writeFieldBegin("footer_signing_key_metadata", ::apache::thrift::protocol::T_STRING, 9);
+    xfer += oprot->writeBinary(this->footer_signing_key_metadata);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t FileCryptoMetaData::read(Protocol_* iprot) {
+
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  uint32_t xfer = 0;
+  std::string fname;
+  ::apache::thrift::protocol::TType ftype;
+  int16_t fid;
+
+  xfer += iprot->readStructBegin(fname);
+
+  using ::apache::thrift::protocol::TProtocolException;
+
+  bool isset_encryption_algorithm = false;
+
+  while (true)
+  {
+    xfer += iprot->readFieldBegin(fname, ftype, fid);
+    if (ftype == ::apache::thrift::protocol::T_STOP) {
+      break;
+    }
+    switch (fid)
+    {
+      case 1:
+        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
+          xfer += this->encryption_algorithm.read(iprot);
+          isset_encryption_algorithm = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readBinary(this->key_metadata);
+          this->__isset.key_metadata = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      default:
+        xfer += iprot->skip(ftype);
+        break;
+    }
+    xfer += iprot->readFieldEnd();
+  }
+
+  xfer += iprot->readStructEnd();
+
+  if (!isset_encryption_algorithm)
+    throw TProtocolException(TProtocolException::INVALID_DATA);
+  return xfer;
+}
+
+template <class Protocol_>
+uint32_t FileCryptoMetaData::write(Protocol_* oprot) const {
+  uint32_t xfer = 0;
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  xfer += oprot->writeStructBegin("FileCryptoMetaData");
+
+  xfer += oprot->writeFieldBegin("encryption_algorithm", ::apache::thrift::protocol::T_STRUCT, 1);
+  xfer += this->encryption_algorithm.write(oprot);
+  xfer += oprot->writeFieldEnd();
+
+  if (this->__isset.key_metadata) {
+    xfer += oprot->writeFieldBegin("key_metadata", ::apache::thrift::protocol::T_STRING, 2);
+    xfer += oprot->writeBinary(this->key_metadata);
+    xfer += oprot->writeFieldEnd();
+  }
+  xfer += oprot->writeFieldStop();
+  xfer += oprot->writeStructEnd();
+  return xfer;
+}
+
+}} // namespace
+
+#endif
diff --git a/cpp/src/parquet/CMakeLists.txt b/cpp/src/parquet/CMakeLists.txt
index 93f2e72d8d661..dc80f08e72cfe 100644
--- a/cpp/src/parquet/CMakeLists.txt
+++ b/cpp/src/parquet/CMakeLists.txt
@@ -397,6 +397,7 @@ add_parquet_test(writer-test
 
 add_parquet_test(arrow-test
                  SOURCES
+                 arrow/arrow_metadata_test.cc
                  arrow/arrow_reader_writer_test.cc
                  arrow/arrow_schema_test.cc
                  arrow/arrow_statistics_test.cc)
@@ -432,6 +433,7 @@ add_parquet_benchmark(column_reader_benchmark)
 add_parquet_benchmark(column_io_benchmark)
 add_parquet_benchmark(encoding_benchmark)
 add_parquet_benchmark(level_conversion_benchmark)
+add_parquet_benchmark(metadata_benchmark)
 add_parquet_benchmark(page_index_benchmark SOURCES page_index_benchmark.cc
                       benchmark_util.cc)
 add_parquet_benchmark(arrow/reader_writer_benchmark PREFIX "parquet-arrow")
diff --git a/cpp/src/parquet/arrow/arrow_metadata_test.cc b/cpp/src/parquet/arrow/arrow_metadata_test.cc
new file mode 100644
index 0000000000000..6f512227708b9
--- /dev/null
+++ b/cpp/src/parquet/arrow/arrow_metadata_test.cc
@@ -0,0 +1,97 @@
+// 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.
+
+#include "gtest/gtest.h"
+
+#include "arrow/table.h"
+#include "arrow/testing/gtest_util.h"
+#include "arrow/util/key_value_metadata.h"
+
+#include "parquet/api/writer.h"
+
+#include "parquet/arrow/reader.h"
+#include "parquet/arrow/schema.h"
+#include "parquet/arrow/writer.h"
+#include "parquet/file_writer.h"
+#include "parquet/test_util.h"
+
+namespace parquet::arrow {
+
+TEST(Metadata, AppendMetadata) {
+  // A sample table, type and structure does not matter in this test case
+  auto schema = ::arrow::schema({::arrow::field("f", ::arrow::utf8())});
+  auto table = ::arrow::Table::Make(
+      schema, {::arrow::ArrayFromJSON(::arrow::utf8(), R"(["a", "b", "c"])")});
+
+  auto sink = CreateOutputStream();
+  ArrowWriterProperties::Builder builder;
+  builder.store_schema();
+  ASSERT_OK_AND_ASSIGN(auto writer,
+                       parquet::arrow::FileWriter::Open(
+                           *schema, ::arrow::default_memory_pool(), sink,
+                           parquet::default_writer_properties(), builder.build()));
+
+  auto kv_meta = std::make_shared<KeyValueMetadata>();
+  kv_meta->Append("test_key_1", "test_value_1");
+  // <test_key_2, test_value_2_temp> would be overwritten later.
+  kv_meta->Append("test_key_2", "test_value_2_temp");
+  ASSERT_OK(writer->AddKeyValueMetadata(kv_meta));
+
+  // Key value metadata that will be added to the file.
+  auto kv_meta_added = std::make_shared<::arrow::KeyValueMetadata>();
+  kv_meta_added->Append("test_key_2", "test_value_2");
+  kv_meta_added->Append("test_key_3", "test_value_3");
+
+  ASSERT_OK(writer->AddKeyValueMetadata(kv_meta_added));
+  ASSERT_OK(writer->Close());
+
+  // return error if the file is closed
+  ASSERT_RAISES(IOError, writer->AddKeyValueMetadata(kv_meta_added));
+
+  auto verify_key_value_metadata =
+      [&](const std::shared_ptr<const KeyValueMetadata>& key_value_metadata) {
+        ASSERT_TRUE(nullptr != key_value_metadata);
+
+        // Verify keys that were added before file writer was closed are present.
+        for (int i = 1; i <= 3; ++i) {
+          auto index = std::to_string(i);
+          PARQUET_ASSIGN_OR_THROW(auto value,
+                                  key_value_metadata->Get("test_key_" + index));
+          EXPECT_EQ("test_value_" + index, value);
+        }
+        EXPECT_TRUE(key_value_metadata->Contains("ARROW:schema"));
+      };
+  // verify the metadata in writer
+  verify_key_value_metadata(writer->metadata()->key_value_metadata());
+
+  ASSERT_OK(writer->Close());
+
+  ASSERT_OK_AND_ASSIGN(auto buffer, sink->Finish());
+  // verify the metadata in reader
+  {
+    std::unique_ptr<FileReader> reader;
+    FileReaderBuilder reader_builder;
+    ASSERT_OK_NO_THROW(
+        reader_builder.Open(std::make_shared<::arrow::io::BufferReader>(buffer)));
+    ASSERT_OK(
+        reader_builder.properties(default_arrow_reader_properties())->Build(&reader));
+
+    verify_key_value_metadata(reader->parquet_reader()->metadata()->key_value_metadata());
+  }
+}
+
+}  // namespace parquet::arrow
diff --git a/cpp/src/parquet/arrow/arrow_reader_writer_test.cc b/cpp/src/parquet/arrow/arrow_reader_writer_test.cc
index dd0b19c2ce048..aad1e933c4f25 100644
--- a/cpp/src/parquet/arrow/arrow_reader_writer_test.cc
+++ b/cpp/src/parquet/arrow/arrow_reader_writer_test.cc
@@ -4469,7 +4469,7 @@ class TestArrowReadDictionary : public ::testing::TestWithParam<double> {
     RETURN_NOT_OK(builder.Open(std::make_shared<BufferReader>(buffer_)));
     RETURN_NOT_OK(builder.properties(properties_)->Build(&reader));
 
-    return std::move(reader);
+    return reader;
   }
 };
 
diff --git a/cpp/src/parquet/arrow/reader.cc b/cpp/src/parquet/arrow/reader.cc
index 54ac18307c537..e3e6dccb81a10 100644
--- a/cpp/src/parquet/arrow/reader.cc
+++ b/cpp/src/parquet/arrow/reader.cc
@@ -1043,6 +1043,16 @@ Status FileReaderImpl::GetRecordBatchReader(const std::vector<int>& row_groups,
           }
         }
 
+        // Check all columns has same row-size
+        if (!columns.empty()) {
+          int64_t row_size = columns[0]->length();
+          for (size_t i = 1; i < columns.size(); ++i) {
+            if (columns[i]->length() != row_size) {
+              return ::arrow::Status::Invalid("columns do not have the same size");
+            }
+          }
+        }
+
         auto table = ::arrow::Table::Make(batch_schema, std::move(columns));
         auto table_reader = std::make_shared<::arrow::TableBatchReader>(*table);
 
diff --git a/cpp/src/parquet/arrow/writer.cc b/cpp/src/parquet/arrow/writer.cc
index 5238986c428d3..4fd7ef1b47b39 100644
--- a/cpp/src/parquet/arrow/writer.cc
+++ b/cpp/src/parquet/arrow/writer.cc
@@ -482,6 +482,14 @@ class FileWriterImpl : public FileWriter {
     return writer_->metadata();
   }
 
+  /// \brief Append the key-value metadata to the file metadata
+  ::arrow::Status AddKeyValueMetadata(
+      const std::shared_ptr<const ::arrow::KeyValueMetadata>& key_value_metadata)
+      override {
+    PARQUET_CATCH_NOT_OK(writer_->AddKeyValueMetadata(key_value_metadata));
+    return Status::OK();
+  }
+
  private:
   friend class FileWriter;
 
@@ -547,8 +555,8 @@ Status GetSchemaMetadata(const ::arrow::Schema& schema, ::arrow::MemoryPool* poo
   // The serialized schema is not UTF-8, which is required for Thrift
   std::string schema_as_string = serialized->ToString();
   std::string schema_base64 = ::arrow::util::base64_encode(schema_as_string);
-  result->Append(kArrowSchemaKey, schema_base64);
-  *out = result;
+  result->Append(kArrowSchemaKey, std::move(schema_base64));
+  *out = std::move(result);
   return Status::OK();
 }
 
diff --git a/cpp/src/parquet/arrow/writer.h b/cpp/src/parquet/arrow/writer.h
index 1decafedc97fd..4a1a033a7b7b8 100644
--- a/cpp/src/parquet/arrow/writer.h
+++ b/cpp/src/parquet/arrow/writer.h
@@ -143,6 +143,16 @@ class PARQUET_EXPORT FileWriter {
   virtual ~FileWriter();
 
   virtual MemoryPool* memory_pool() const = 0;
+  /// \brief Add key-value metadata to the file.
+  /// \param[in] key_value_metadata the metadata to add.
+  /// \note This will overwrite any existing metadata with the same key.
+  /// \return Error if Close() has been called.
+  ///
+  /// WARNING: If `store_schema` is enabled, `ARROW:schema` would be stored
+  /// in the key-value metadata. Overwriting this key would result in
+  /// `store_schema` being unusable during read.
+  virtual ::arrow::Status AddKeyValueMetadata(
+      const std::shared_ptr<const ::arrow::KeyValueMetadata>& key_value_metadata) = 0;
   /// \brief Return the file metadata, only available after calling Close().
   virtual const std::shared_ptr<FileMetaData> metadata() const = 0;
 };
diff --git a/cpp/src/parquet/column_page.h b/cpp/src/parquet/column_page.h
index 905f805b8c9cc..b389ffd98e6c7 100644
--- a/cpp/src/parquet/column_page.h
+++ b/cpp/src/parquet/column_page.h
@@ -75,13 +75,13 @@ class DataPage : public Page {
  protected:
   DataPage(PageType::type type, const std::shared_ptr<Buffer>& buffer, int32_t num_values,
            Encoding::type encoding, int64_t uncompressed_size,
-           const EncodedStatistics& statistics = EncodedStatistics(),
+           EncodedStatistics statistics = EncodedStatistics(),
            std::optional<int64_t> first_row_index = std::nullopt)
       : Page(buffer, type),
         num_values_(num_values),
         encoding_(encoding),
         uncompressed_size_(uncompressed_size),
-        statistics_(statistics),
+        statistics_(std::move(statistics)),
         first_row_index_(std::move(first_row_index)) {}
 
   int32_t num_values_;
@@ -97,10 +97,10 @@ class DataPageV1 : public DataPage {
   DataPageV1(const std::shared_ptr<Buffer>& buffer, int32_t num_values,
              Encoding::type encoding, Encoding::type definition_level_encoding,
              Encoding::type repetition_level_encoding, int64_t uncompressed_size,
-             const EncodedStatistics& statistics = EncodedStatistics(),
+             EncodedStatistics statistics = EncodedStatistics(),
              std::optional<int64_t> first_row_index = std::nullopt)
       : DataPage(PageType::DATA_PAGE, buffer, num_values, encoding, uncompressed_size,
-                 statistics, std::move(first_row_index)),
+                 std::move(statistics), std::move(first_row_index)),
         definition_level_encoding_(definition_level_encoding),
         repetition_level_encoding_(repetition_level_encoding) {}
 
@@ -119,10 +119,10 @@ class DataPageV2 : public DataPage {
              int32_t num_rows, Encoding::type encoding,
              int32_t definition_levels_byte_length, int32_t repetition_levels_byte_length,
              int64_t uncompressed_size, bool is_compressed = false,
-             const EncodedStatistics& statistics = EncodedStatistics(),
+             EncodedStatistics statistics = EncodedStatistics(),
              std::optional<int64_t> first_row_index = std::nullopt)
       : DataPage(PageType::DATA_PAGE_V2, buffer, num_values, encoding, uncompressed_size,
-                 statistics, std::move(first_row_index)),
+                 std::move(statistics), std::move(first_row_index)),
         num_nulls_(num_nulls),
         num_rows_(num_rows),
         definition_levels_byte_length_(definition_levels_byte_length),
diff --git a/cpp/src/parquet/column_reader.cc b/cpp/src/parquet/column_reader.cc
index 3fb224154c4ec..52add8f339fc3 100644
--- a/cpp/src/parquet/column_reader.cc
+++ b/cpp/src/parquet/column_reader.cc
@@ -101,6 +101,10 @@ inline void CheckNumberDecoded(int64_t number_decoded, int64_t expected) {
                                    std::to_string(expected));
   }
 }
+
+constexpr std::string_view kErrorRepDefLevelNotMatchesNumValues =
+    "Number of decoded rep / def levels do not match num_values in page header";
+
 }  // namespace
 
 LevelDecoder::LevelDecoder() : num_values_remaining_(0) {}
@@ -534,11 +538,11 @@ std::shared_ptr<Page> SerializedPageReader::NextPage() {
       page_buffer =
           DecompressIfNeeded(std::move(page_buffer), compressed_len, uncompressed_len);
 
-      return std::make_shared<DataPageV1>(page_buffer, header.num_values,
-                                          LoadEnumSafe(&header.encoding),
-                                          LoadEnumSafe(&header.definition_level_encoding),
-                                          LoadEnumSafe(&header.repetition_level_encoding),
-                                          uncompressed_len, data_page_statistics);
+      return std::make_shared<DataPageV1>(
+          page_buffer, header.num_values, LoadEnumSafe(&header.encoding),
+          LoadEnumSafe(&header.definition_level_encoding),
+          LoadEnumSafe(&header.repetition_level_encoding), uncompressed_len,
+          std::move(data_page_statistics));
     } else if (page_type == PageType::DATA_PAGE_V2) {
       ++page_ordinal_;
       const format::DataPageHeaderV2& header = current_page_header_.data_page_header_v2;
@@ -565,7 +569,7 @@ std::shared_ptr<Page> SerializedPageReader::NextPage() {
           page_buffer, header.num_values, header.num_nulls, header.num_rows,
           LoadEnumSafe(&header.encoding), header.definition_levels_byte_length,
           header.repetition_levels_byte_length, uncompressed_len, is_compressed,
-          data_page_statistics);
+          std::move(data_page_statistics));
     } else {
       throw ParquetException(
           "Internal error, we have already skipped non-data pages in ShouldSkipPage()");
@@ -638,12 +642,6 @@ namespace {
 // ----------------------------------------------------------------------
 // Impl base class for TypedColumnReader and RecordReader
 
-// PLAIN_DICTIONARY is deprecated but used to be used as a dictionary index
-// encoding.
-static bool IsDictionaryIndexEncoding(const Encoding::type& e) {
-  return e == Encoding::RLE_DICTIONARY || e == Encoding::PLAIN_DICTIONARY;
-}
-
 template <typename DType>
 class ColumnReaderImplBase {
  public:
@@ -727,13 +725,13 @@ class ColumnReaderImplBase {
         ConfigureDictionary(static_cast<const DictionaryPage*>(current_page_.get()));
         continue;
       } else if (current_page_->type() == PageType::DATA_PAGE) {
-        const auto page = std::static_pointer_cast<DataPageV1>(current_page_);
+        const auto* page = static_cast<const DataPageV1*>(current_page_.get());
         const int64_t levels_byte_size = InitializeLevelDecoders(
             *page, page->repetition_level_encoding(), page->definition_level_encoding());
         InitializeDataDecoder(*page, levels_byte_size);
         return true;
       } else if (current_page_->type() == PageType::DATA_PAGE_V2) {
-        const auto page = std::static_pointer_cast<DataPageV2>(current_page_);
+        const auto* page = static_cast<const DataPageV2*>(current_page_.get());
         int64_t levels_byte_size = InitializeLevelDecodersV2(*page);
         InitializeDataDecoder(*page, levels_byte_size);
         return true;
@@ -872,8 +870,9 @@ class ColumnReaderImplBase {
     }
 
     Encoding::type encoding = page.encoding();
-
     if (IsDictionaryIndexEncoding(encoding)) {
+      // Normalizing the PLAIN_DICTIONARY to RLE_DICTIONARY encoding
+      // in decoder.
       encoding = Encoding::RLE_DICTIONARY;
     }
 
@@ -907,6 +906,8 @@ class ColumnReaderImplBase {
                               static_cast<int>(data_size));
   }
 
+  // Available values in the current data page, value includes repeated values
+  // and nulls.
   int64_t available_values_current_page() const {
     return num_buffered_values_ - num_decoded_values_;
   }
@@ -933,7 +934,7 @@ class ColumnReaderImplBase {
   int64_t num_buffered_values_;
 
   // The number of values from the current data page that have been decoded
-  // into memory
+  // into memory or skipped over.
   int64_t num_decoded_values_;
 
   ::arrow::MemoryPool* pool_;
@@ -944,7 +945,7 @@ class ColumnReaderImplBase {
 
   /// Flag to signal when a new dictionary has been set, for the benefit of
   /// DictionaryRecordReader
-  bool new_dictionary_;
+  bool new_dictionary_ = false;
 
   // The exposed encoding
   ExposedEncoding exposed_encoding_ = ExposedEncoding::NO_ENCODING;
@@ -1026,28 +1027,36 @@ class TypedColumnReaderImpl : public TypedColumnReader<DType>,
 
   // Read definition and repetition levels. Also return the number of definition levels
   // and number of values to read. This function is called before reading values.
+  //
+  // ReadLevels will throw exception when any num-levels read is not equal to the number
+  // of the levels can be read.
   void ReadLevels(int64_t batch_size, int16_t* def_levels, int16_t* rep_levels,
-                  int64_t* num_def_levels, int64_t* values_to_read) {
-    batch_size =
-        std::min(batch_size, this->num_buffered_values_ - this->num_decoded_values_);
+                  int64_t* num_def_levels, int64_t* non_null_values_to_read) {
+    batch_size = std::min(batch_size, this->available_values_current_page());
 
     // If the field is required and non-repeated, there are no definition levels
     if (this->max_def_level_ > 0 && def_levels != nullptr) {
       *num_def_levels = this->ReadDefinitionLevels(batch_size, def_levels);
+      if (ARROW_PREDICT_FALSE(*num_def_levels != batch_size)) {
+        throw ParquetException(kErrorRepDefLevelNotMatchesNumValues);
+      }
       // TODO(wesm): this tallying of values-to-decode can be performed with better
       // cache-efficiency if fused with the level decoding.
-      *values_to_read +=
+      *non_null_values_to_read +=
           std::count(def_levels, def_levels + *num_def_levels, this->max_def_level_);
     } else {
       // Required field, read all values
-      *values_to_read = batch_size;
+      if (num_def_levels != nullptr) {
+        *num_def_levels = 0;
+      }
+      *non_null_values_to_read = batch_size;
     }
 
     // Not present for non-repeated fields
     if (this->max_rep_level_ > 0 && rep_levels != nullptr) {
       int64_t num_rep_levels = this->ReadRepetitionLevels(batch_size, rep_levels);
-      if (def_levels != nullptr && *num_def_levels != num_rep_levels) {
-        throw ParquetException("Number of decoded rep / def levels did not match");
+      if (batch_size != num_rep_levels) {
+        throw ParquetException(kErrorRepDefLevelNotMatchesNumValues);
       }
     }
   }
@@ -1090,8 +1099,7 @@ int64_t TypedColumnReaderImpl<DType>::ReadBatchWithDictionary(
   *indices_read = ReadDictionaryIndices(indices_to_read, indices);
   int64_t total_indices = std::max<int64_t>(num_def_levels, *indices_read);
   // Some callers use a batch size of 0 just to get the dictionary.
-  int64_t expected_values =
-      std::min(batch_size, this->num_buffered_values_ - this->num_decoded_values_);
+  int64_t expected_values = std::min(batch_size, this->available_values_current_page());
   if (total_indices == 0 && expected_values > 0) {
     std::stringstream ss;
     ss << "Read 0 values, expected " << expected_values;
@@ -1106,7 +1114,8 @@ template <typename DType>
 int64_t TypedColumnReaderImpl<DType>::ReadBatch(int64_t batch_size, int16_t* def_levels,
                                                 int16_t* rep_levels, T* values,
                                                 int64_t* values_read) {
-  // HasNext invokes ReadNewPage
+  // HasNext might invoke ReadNewPage until a data page with
+  // `available_values_current_page() > 0` is found.
   if (!HasNext()) {
     *values_read = 0;
     return 0;
@@ -1115,20 +1124,31 @@ int64_t TypedColumnReaderImpl<DType>::ReadBatch(int64_t batch_size, int16_t* def
   // TODO(wesm): keep reading data pages until batch_size is reached, or the
   // row group is finished
   int64_t num_def_levels = 0;
-  int64_t values_to_read = 0;
-  ReadLevels(batch_size, def_levels, rep_levels, &num_def_levels, &values_to_read);
-
-  *values_read = this->ReadValues(values_to_read, values);
+  // Number of non-null values to read within `num_def_levels`.
+  int64_t non_null_values_to_read = 0;
+  ReadLevels(batch_size, def_levels, rep_levels, &num_def_levels,
+             &non_null_values_to_read);
+  // Should not return more values than available in the current data page,
+  // since currently, ReadLevels would only consume level from current
+  // data page.
+  if (ARROW_PREDICT_FALSE(num_def_levels > this->available_values_current_page())) {
+    throw ParquetException(kErrorRepDefLevelNotMatchesNumValues);
+  }
+  if (non_null_values_to_read != 0) {
+    *values_read = this->ReadValues(non_null_values_to_read, values);
+  } else {
+    *values_read = 0;
+  }
+  // Adjust total_values, since if max_def_level_ == 0, num_def_levels would
+  // be 0 and `values_read` would adjust to `available_values_current_page()`.
   int64_t total_values = std::max<int64_t>(num_def_levels, *values_read);
-  int64_t expected_values =
-      std::min(batch_size, this->num_buffered_values_ - this->num_decoded_values_);
+  int64_t expected_values = std::min(batch_size, this->available_values_current_page());
   if (total_values == 0 && expected_values > 0) {
     std::stringstream ss;
     ss << "Read 0 values, expected " << expected_values;
     ParquetException::EofException(ss.str());
   }
   this->ConsumeBufferedValues(total_values);
-
   return total_values;
 }
 
@@ -1137,7 +1157,8 @@ int64_t TypedColumnReaderImpl<DType>::ReadBatchSpaced(
     int64_t batch_size, int16_t* def_levels, int16_t* rep_levels, T* values,
     uint8_t* valid_bits, int64_t valid_bits_offset, int64_t* levels_read,
     int64_t* values_read, int64_t* null_count_out) {
-  // HasNext invokes ReadNewPage
+  // HasNext might invoke ReadNewPage until a data page with
+  // `available_values_current_page() > 0` is found.
   if (!HasNext()) {
     *levels_read = 0;
     *values_read = 0;
@@ -1145,21 +1166,24 @@ int64_t TypedColumnReaderImpl<DType>::ReadBatchSpaced(
     return 0;
   }
 
+  // Number of non-null values to read
   int64_t total_values;
   // TODO(wesm): keep reading data pages until batch_size is reached, or the
   // row group is finished
-  batch_size =
-      std::min(batch_size, this->num_buffered_values_ - this->num_decoded_values_);
+  batch_size = std::min(batch_size, this->available_values_current_page());
 
   // If the field is required and non-repeated, there are no definition levels
   if (this->max_def_level_ > 0) {
     int64_t num_def_levels = this->ReadDefinitionLevels(batch_size, def_levels);
+    if (ARROW_PREDICT_FALSE(num_def_levels != batch_size)) {
+      throw ParquetException(kErrorRepDefLevelNotMatchesNumValues);
+    }
 
     // Not present for non-repeated fields
     if (this->max_rep_level_ > 0) {
       int64_t num_rep_levels = this->ReadRepetitionLevels(batch_size, rep_levels);
-      if (num_def_levels != num_rep_levels) {
-        throw ParquetException("Number of decoded rep / def levels did not match");
+      if (ARROW_PREDICT_FALSE(num_def_levels != num_rep_levels)) {
+        throw ParquetException(kErrorRepDefLevelNotMatchesNumValues);
       }
     }
 
@@ -1316,7 +1340,8 @@ class TypedRecordReader : public TypedColumnReaderImpl<DType>,
     levels_position_ = 0;
     levels_capacity_ = 0;
     read_dense_for_nullable_ = read_dense_for_nullable;
-    uses_values_ = !(descr->physical_type() == Type::BYTE_ARRAY);
+    // BYTE_ARRAY values are not stored in the `values_` buffer.
+    uses_values_ = descr->physical_type() != Type::BYTE_ARRAY;
 
     if (uses_values_) {
       values_ = AllocateBuffer(pool);
@@ -1339,7 +1364,7 @@ class TypedRecordReader : public TypedColumnReaderImpl<DType>,
 
   const void* ReadDictionary(int32_t* dictionary_length) override {
     if (this->current_decoder_ == nullptr && !this->HasNextInternal()) {
-      dictionary_length = 0;
+      *dictionary_length = 0;
       return nullptr;
     }
     // Verify the current data page is dictionary encoded. The current_encoding_ should
@@ -1400,26 +1425,21 @@ class TypedRecordReader : public TypedColumnReaderImpl<DType>,
         int16_t* def_levels = this->def_levels() + levels_written_;
         int16_t* rep_levels = this->rep_levels() + levels_written_;
 
-        // Not present for non-repeated fields
-        int64_t levels_read = 0;
+        if (ARROW_PREDICT_FALSE(this->ReadDefinitionLevels(batch_size, def_levels) !=
+                                batch_size)) {
+          throw ParquetException(kErrorRepDefLevelNotMatchesNumValues);
+        }
         if (this->max_rep_level_ > 0) {
-          levels_read = this->ReadDefinitionLevels(batch_size, def_levels);
-          if (this->ReadRepetitionLevels(batch_size, rep_levels) != levels_read) {
-            throw ParquetException("Number of decoded rep / def levels did not match");
+          int64_t rep_levels_read = this->ReadRepetitionLevels(batch_size, rep_levels);
+          if (ARROW_PREDICT_FALSE(rep_levels_read != batch_size)) {
+            throw ParquetException(kErrorRepDefLevelNotMatchesNumValues);
           }
-        } else if (this->max_def_level_ > 0) {
-          levels_read = this->ReadDefinitionLevels(batch_size, def_levels);
         }
 
-        // Exhausted column chunk
-        if (levels_read == 0) {
-          break;
-        }
-
-        levels_written_ += levels_read;
+        levels_written_ += batch_size;
         records_read += ReadRecordData(num_records - records_read);
       } else {
-        // No repetition or definition levels
+        // No repetition and definition levels, we can read values directly
         batch_size = std::min(num_records - records_read, batch_size);
         records_read += ReadRecordData(batch_size);
       }
@@ -1573,13 +1593,14 @@ class TypedRecordReader : public TypedColumnReaderImpl<DType>,
       int16_t* def_levels = this->def_levels() + levels_written_;
       int16_t* rep_levels = this->rep_levels() + levels_written_;
 
-      int64_t levels_read = 0;
-      levels_read = this->ReadDefinitionLevels(batch_size, def_levels);
-      if (this->ReadRepetitionLevels(batch_size, rep_levels) != levels_read) {
-        throw ParquetException("Number of decoded rep / def levels did not match");
+      if (this->ReadDefinitionLevels(batch_size, def_levels) != batch_size) {
+        throw ParquetException(kErrorRepDefLevelNotMatchesNumValues);
+      }
+      if (this->ReadRepetitionLevels(batch_size, rep_levels) != batch_size) {
+        throw ParquetException(kErrorRepDefLevelNotMatchesNumValues);
       }
 
-      levels_written_ += levels_read;
+      levels_written_ += batch_size;
       int64_t remaining_records = num_records - skipped_records;
       // This updates at_record_start_.
       skipped_records += DelimitAndSkipRecordsInBuffer(remaining_records);
@@ -1674,44 +1695,55 @@ class TypedRecordReader : public TypedColumnReaderImpl<DType>,
   //
   // \return Number of records delimited
   int64_t DelimitRecords(int64_t num_records, int64_t* values_seen) {
-    int64_t values_to_read = 0;
+    if (ARROW_PREDICT_FALSE(num_records == 0 || levels_position_ == levels_written_)) {
+      *values_seen = 0;
+      return 0;
+    }
     int64_t records_read = 0;
-
-    const int16_t* def_levels = this->def_levels() + levels_position_;
-    const int16_t* rep_levels = this->rep_levels() + levels_position_;
-
+    const int16_t* const rep_levels = this->rep_levels();
+    const int16_t* const def_levels = this->def_levels();
     ARROW_DCHECK_GT(this->max_rep_level_, 0);
-
-    // Count logical records and number of values to read
-    while (levels_position_ < levels_written_) {
-      const int16_t rep_level = *rep_levels++;
-      if (rep_level == 0) {
-        // If at_record_start_ is true, we are seeing the start of a record
-        // for the second time, such as after repeated calls to
-        // DelimitRecords. In this case we must continue until we find
-        // another record start or exhausting the ColumnChunk
-        if (!at_record_start_) {
-          // We've reached the end of a record; increment the record count.
-          ++records_read;
-          if (records_read == num_records) {
-            // We've found the number of records we were looking for. Set
-            // at_record_start_ to true and break
-            at_record_start_ = true;
-            break;
-          }
-        }
-      }
+    // If at_record_start_ is true, we are seeing the start of a record
+    // for the second time, such as after repeated calls to
+    // DelimitRecords. In this case we must continue until we find
+    // another record start or exhausting the ColumnChunk
+    int64_t level = levels_position_;
+    if (at_record_start_) {
+      ARROW_DCHECK_EQ(0, rep_levels[levels_position_]);
+      ++levels_position_;
       // We have decided to consume the level at this position; therefore we
       // must advance until we find another record boundary
       at_record_start_ = false;
+    }
 
-      const int16_t def_level = *def_levels++;
-      if (def_level == this->max_def_level_) {
-        ++values_to_read;
+    // Count logical records and number of non-null values to read
+    ARROW_DCHECK(!at_record_start_);
+    // Scan repetition levels to find record end
+    while (levels_position_ < levels_written_) {
+      // We use an estimated batch size to simplify branching and
+      // improve performance in the common case. This might slow
+      // things down a bit if a single long record remains, though.
+      int64_t stride =
+          std::min(levels_written_ - levels_position_, num_records - records_read);
+      const int64_t position_end = levels_position_ + stride;
+      for (int64_t i = levels_position_; i < position_end; ++i) {
+        records_read += rep_levels[i] == 0;
+      }
+      levels_position_ = position_end;
+      if (records_read == num_records) {
+        // Check last rep_level reaches the boundary and
+        // pop the last level.
+        ARROW_CHECK_EQ(rep_levels[levels_position_ - 1], 0);
+        --levels_position_;
+        // We've found the number of records we were looking for. Set
+        // at_record_start_ to true and break
+        at_record_start_ = true;
+        break;
       }
-      ++levels_position_;
     }
-    *values_seen = values_to_read;
+    // Scan definition levels to find number of physical values
+    *values_seen = std::count(def_levels + level, def_levels + levels_position_,
+                              this->max_def_level_);
     return records_read;
   }
 
diff --git a/cpp/src/parquet/column_reader.h b/cpp/src/parquet/column_reader.h
index 1f16356d2d3c5..80faa65aa9c81 100644
--- a/cpp/src/parquet/column_reader.h
+++ b/cpp/src/parquet/column_reader.h
@@ -197,7 +197,7 @@ class PARQUET_EXPORT ColumnReader {
 template <typename DType>
 class TypedColumnReader : public ColumnReader {
  public:
-  typedef typename DType::c_type T;
+  using T = typename DType::c_type;
 
   // Read a batch of repetition levels, definition levels, and values from the
   // column.
diff --git a/cpp/src/parquet/column_reader_test.cc b/cpp/src/parquet/column_reader_test.cc
index 7829c58c50663..053517095ea05 100644
--- a/cpp/src/parquet/column_reader_test.cc
+++ b/cpp/src/parquet/column_reader_test.cc
@@ -415,7 +415,7 @@ TEST_F(TestPrimitiveReader, TestReadValuesMissing) {
       &descr, values, /*num_values=*/2, Encoding::PLAIN, /*indices=*/{},
       /*indices_size=*/0, /*def_levels=*/input_def_levels, max_def_level_,
       /*rep_levels=*/{},
-      /*max_rep_level=*/0);
+      /*max_rep_level=*/max_rep_level_);
   pages_.push_back(data_page);
   InitReader(&descr);
   auto reader = static_cast<BoolReader*>(reader_.get());
@@ -431,6 +431,80 @@ TEST_F(TestPrimitiveReader, TestReadValuesMissing) {
                ParquetException);
 }
 
+// GH-41321: When max_def_level > 0 or max_rep_level > 0, and
+// Page has more or less levels than the `num_values` in
+// PageHeader. We should detect and throw exception.
+TEST_F(TestPrimitiveReader, DefRepLevelNotExpected) {
+  auto do_check = [&](const NodePtr& type, const std::vector<int16_t>& input_def_levels,
+                      const std::vector<int16_t>& input_rep_levels, int num_values) {
+    std::vector<bool> values(num_values, false);
+    const ColumnDescriptor descr(type, max_def_level_, max_rep_level_);
+
+    // The data page falls back to plain encoding
+    std::shared_ptr<ResizableBuffer> dummy = AllocateBuffer();
+    std::shared_ptr<DataPageV1> data_page = MakeDataPage<BooleanType>(
+        &descr, values, /*num_values=*/num_values, Encoding::PLAIN, /*indices=*/{},
+        /*indices_size=*/0, /*def_levels=*/input_def_levels, max_def_level_,
+        /*rep_levels=*/input_rep_levels,
+        /*max_rep_level=*/max_rep_level_);
+    pages_.push_back(data_page);
+    InitReader(&descr);
+    auto reader = static_cast<BoolReader*>(reader_.get());
+    ASSERT_TRUE(reader->HasNext());
+
+    constexpr int batch_size = 10;
+    std::vector<int16_t> def_levels(batch_size, 0);
+    std::vector<int16_t> rep_levels(batch_size, 0);
+    bool values_out[batch_size];
+    int64_t values_read;
+    EXPECT_THROW_THAT(
+        [&]() {
+          reader->ReadBatch(batch_size, def_levels.data(), rep_levels.data(), values_out,
+                            &values_read);
+        },
+        ParquetException,
+        ::testing::Property(&ParquetException::what,
+                            ::testing::HasSubstr("Number of decoded rep / def levels do "
+                                                 "not match num_values in page header")));
+  };
+  // storing def-levels less than value in page-header
+  {
+    max_def_level_ = 1;
+    max_rep_level_ = 0;
+    NodePtr type = schema::Boolean("a", Repetition::OPTIONAL);
+    std::vector<int16_t> input_def_levels(1, 1);
+    std::vector<int16_t> input_rep_levels{};
+    do_check(type, input_def_levels, input_rep_levels, /*num_values=*/3);
+  }
+  // storing def-levels more than value in page-header
+  {
+    max_def_level_ = 1;
+    max_rep_level_ = 0;
+    NodePtr type = schema::Boolean("a", Repetition::OPTIONAL);
+    std::vector<int16_t> input_def_levels(2, 1);
+    std::vector<int16_t> input_rep_levels{};
+    do_check(type, input_def_levels, input_rep_levels, /*num_values=*/1);
+  }
+  // storing rep-levels less than value in page-header
+  {
+    max_def_level_ = 0;
+    max_rep_level_ = 1;
+    NodePtr type = schema::Boolean("a", Repetition::REPEATED);
+    std::vector<int16_t> input_def_levels{};
+    std::vector<int16_t> input_rep_levels(3, 0);
+    do_check(type, input_def_levels, input_rep_levels, /*num_values=*/4);
+  }
+  // storing rep-levels more than value in page-header
+  {
+    max_def_level_ = 0;
+    max_rep_level_ = 1;
+    NodePtr type = schema::Boolean("a", Repetition::REPEATED);
+    std::vector<int16_t> input_def_levels{};
+    std::vector<int16_t> input_rep_levels(2, 1);
+    do_check(type, input_def_levels, input_rep_levels, /*num_values=*/1);
+  }
+}
+
 // Repetition level byte length reported in Page but Max Repetition level
 // is zero for the column.
 TEST_F(TestPrimitiveReader, TestRepetitionLvlBytesWithMaxRepetitionZero) {
diff --git a/cpp/src/parquet/column_writer.cc b/cpp/src/parquet/column_writer.cc
index eae8fc6125499..ac1c3ea2e3e20 100644
--- a/cpp/src/parquet/column_writer.cc
+++ b/cpp/src/parquet/column_writer.cc
@@ -379,6 +379,11 @@ class SerializedPageWriter : public PageWriter {
 
   int64_t WriteDataPage(const DataPage& page) override {
     const int64_t uncompressed_size = page.uncompressed_size();
+    if (uncompressed_size > std::numeric_limits<int32_t>::max()) {
+      throw ParquetException("Uncompressed data page size overflows INT32_MAX. Size:",
+                             uncompressed_size);
+    }
+
     std::shared_ptr<Buffer> compressed_data = page.buffer();
     const uint8_t* output_data_buffer = compressed_data->data();
     int64_t output_data_len = compressed_data->size();
@@ -399,11 +404,6 @@ class SerializedPageWriter : public PageWriter {
     }
 
     format::PageHeader page_header;
-
-    if (uncompressed_size > std::numeric_limits<int32_t>::max()) {
-      throw ParquetException("Uncompressed data page size overflows INT32_MAX. Size:",
-                             uncompressed_size);
-    }
     page_header.__set_uncompressed_page_size(static_cast<int32_t>(uncompressed_size));
     page_header.__set_compressed_page_size(static_cast<int32_t>(output_data_len));
 
@@ -1018,13 +1018,13 @@ void ColumnWriterImpl::BuildDataPageV1(int64_t definition_levels_rle_size,
         compressed_data->CopySlice(0, compressed_data->size(), allocator_));
     std::unique_ptr<DataPage> page_ptr = std::make_unique<DataPageV1>(
         compressed_data_copy, num_values, encoding_, Encoding::RLE, Encoding::RLE,
-        uncompressed_size, page_stats, first_row_index);
+        uncompressed_size, std::move(page_stats), first_row_index);
     total_compressed_bytes_ += page_ptr->size() + sizeof(format::PageHeader);
 
     data_pages_.push_back(std::move(page_ptr));
   } else {  // Eagerly write pages
     DataPageV1 page(compressed_data, num_values, encoding_, Encoding::RLE, Encoding::RLE,
-                    uncompressed_size, page_stats, first_row_index);
+                    uncompressed_size, std::move(page_stats), first_row_index);
     WriteDataPage(page);
   }
 }
@@ -1205,10 +1205,6 @@ Status ConvertDictionaryToDense(const ::arrow::Array& array, MemoryPool* pool,
   return Status::OK();
 }
 
-static inline bool IsDictionaryEncoding(Encoding::type encoding) {
-  return encoding == Encoding::PLAIN_DICTIONARY;
-}
-
 template <typename DType>
 class TypedColumnWriterImpl : public ColumnWriterImpl, public TypedColumnWriter<DType> {
  public:
@@ -1565,7 +1561,7 @@ class TypedColumnWriterImpl : public ColumnWriterImpl, public TypedColumnWriter<
   }
 
   void FallbackToPlainEncoding() {
-    if (IsDictionaryEncoding(current_encoder_->encoding())) {
+    if (IsDictionaryIndexEncoding(current_encoder_->encoding())) {
       WriteDictionaryPage();
       // Serialize the buffered Dictionary Indices
       FlushBufferedDataPages();
@@ -1661,7 +1657,7 @@ Status TypedColumnWriterImpl<DType>::WriteArrowDictionary(
                            maybe_parent_nulls);
   };
 
-  if (!IsDictionaryEncoding(current_encoder_->encoding()) ||
+  if (!IsDictionaryIndexEncoding(current_encoder_->encoding()) ||
       !DictionaryDirectWriteSupported(array)) {
     // No longer dictionary-encoding for whatever reason, maybe we never were
     // or we decided to stop. Note that WriteArrow can be invoked multiple
diff --git a/cpp/src/parquet/encoding.cc b/cpp/src/parquet/encoding.cc
index 3eed88f08b22a..54e1e000040a1 100644
--- a/cpp/src/parquet/encoding.cc
+++ b/cpp/src/parquet/encoding.cc
@@ -55,6 +55,7 @@ namespace bit_util = arrow::bit_util;
 using arrow::Status;
 using arrow::VisitNullBitmapInline;
 using arrow::internal::AddWithOverflow;
+using arrow::internal::BitBlockCounter;
 using arrow::internal::checked_cast;
 using arrow::internal::MultiplyWithOverflow;
 using arrow::internal::SafeSignedSubtract;
@@ -441,12 +442,12 @@ class DictEncoderImpl : public EncoderImpl, virtual public DictEncoder<DType> {
   constexpr static int32_t kDataPageBitWidthBytes = 1;
 
   explicit DictEncoderImpl(const ColumnDescriptor* desc, MemoryPool* pool)
-      : EncoderImpl(desc, Encoding::PLAIN_DICTIONARY, pool),
+      : EncoderImpl(desc, Encoding::RLE_DICTIONARY, pool),
         buffered_indices_(::arrow::stl::allocator<int32_t>(pool)),
         dict_encoded_size_(0),
         memo_table_(pool, kInitialHashTableSize) {}
 
-  ~DictEncoderImpl() = default;
+  ~DictEncoderImpl() override = default;
 
   int dict_encoded_size() const override { return dict_encoded_size_; }
 
@@ -550,7 +551,7 @@ class DictEncoderImpl : public EncoderImpl, virtual public DictEncoder<DType> {
     int result_size = WriteIndices(buffer->mutable_data(),
                                    static_cast<int>(EstimatedDataEncodedSize()));
     PARQUET_THROW_NOT_OK(buffer->Resize(result_size, false));
-    return std::move(buffer);
+    return buffer;
   }
 
   /// Writes out the encoded dictionary to buffer. buffer must be preallocated to
@@ -1173,13 +1174,15 @@ class PlainBooleanDecoder : public DecoderImpl, virtual public BooleanDecoder {
 
  private:
   std::unique_ptr<::arrow::bit_util::BitReader> bit_reader_;
+  int total_num_values_{0};
 };
 
 PlainBooleanDecoder::PlainBooleanDecoder(const ColumnDescriptor* descr)
     : DecoderImpl(descr, Encoding::PLAIN) {}
 
 void PlainBooleanDecoder::SetData(int num_values, const uint8_t* data, int len) {
-  num_values_ = num_values;
+  DecoderImpl::SetData(num_values, data, len);
+  total_num_values_ = num_values;
   bit_reader_ = std::make_unique<bit_util::BitReader>(data, len);
 }
 
@@ -1188,19 +1191,53 @@ int PlainBooleanDecoder::DecodeArrow(
     typename EncodingTraits<BooleanType>::Accumulator* builder) {
   int values_decoded = num_values - null_count;
   if (ARROW_PREDICT_FALSE(num_values_ < values_decoded)) {
-    ParquetException::EofException();
+    // A too large `num_values` was requested.
+    ParquetException::EofException(
+        "A too large `num_values` was requested in PlainBooleanDecoder: remain " +
+        std::to_string(num_values_) + ", requested: " + std::to_string(values_decoded));
+  }
+  if (ARROW_PREDICT_FALSE(!bit_reader_->Advance(values_decoded))) {
+    ParquetException::EofException("PlainDecoder doesn't have enough values in page");
   }
 
-  PARQUET_THROW_NOT_OK(builder->Reserve(num_values));
-
-  VisitNullBitmapInline(
-      valid_bits, valid_bits_offset, num_values, null_count,
-      [&]() {
-        bool value;
-        ARROW_IGNORE_EXPR(bit_reader_->GetValue(1, &value));
-        builder->UnsafeAppend(value);
-      },
-      [&]() { builder->UnsafeAppendNull(); });
+  if (null_count == 0) {
+    // FastPath: can copy the data directly
+    PARQUET_THROW_NOT_OK(builder->AppendValues(data_, values_decoded, NULLPTR,
+                                               total_num_values_ - num_values_));
+  } else {
+    // Handle nulls by BitBlockCounter
+    PARQUET_THROW_NOT_OK(builder->Reserve(num_values));
+    BitBlockCounter bit_counter(valid_bits, valid_bits_offset, num_values);
+    int64_t value_position = 0;
+    int64_t valid_bits_offset_position = valid_bits_offset;
+    int64_t previous_value_offset = total_num_values_ - num_values_;
+    while (value_position < num_values) {
+      auto block = bit_counter.NextWord();
+      if (block.AllSet()) {
+        // GH-40978: We don't have UnsafeAppendValues for booleans currently,
+        // so using `AppendValues` here.
+        PARQUET_THROW_NOT_OK(
+            builder->AppendValues(data_, block.length, NULLPTR, previous_value_offset));
+        previous_value_offset += block.length;
+      } else if (block.NoneSet()) {
+        // GH-40978: We don't have UnsafeAppendNulls for booleans currently,
+        // so using `AppendNulls` here.
+        PARQUET_THROW_NOT_OK(builder->AppendNulls(block.length));
+      } else {
+        for (int64_t i = 0; i < block.length; ++i) {
+          if (bit_util::GetBit(valid_bits, valid_bits_offset_position + i)) {
+            bool value = bit_util::GetBit(data_, previous_value_offset);
+            builder->UnsafeAppend(value);
+            previous_value_offset += 1;
+          } else {
+            builder->UnsafeAppendNull();
+          }
+        }
+      }
+      value_position += block.length;
+      valid_bits_offset_position += block.length;
+    }
+  }
 
   num_values_ -= values_decoded;
   return values_decoded;
@@ -1214,18 +1251,15 @@ inline int PlainBooleanDecoder::DecodeArrow(
 
 int PlainBooleanDecoder::Decode(uint8_t* buffer, int max_values) {
   max_values = std::min(max_values, num_values_);
-  bool val;
-  ::arrow::internal::BitmapWriter bit_writer(buffer, 0, max_values);
-  for (int i = 0; i < max_values; ++i) {
-    if (!bit_reader_->GetValue(1, &val)) {
-      ParquetException::EofException();
-    }
-    if (val) {
-      bit_writer.Set();
-    }
-    bit_writer.Next();
+  if (ARROW_PREDICT_FALSE(!bit_reader_->Advance(max_values))) {
+    ParquetException::EofException();
   }
-  bit_writer.Finish();
+  // Copy the data directly
+  // Parquet's boolean encoding is bit-packed using LSB. So
+  // we can directly copy the data to the buffer.
+  ::arrow::internal::CopyBitmap(this->data_, /*offset=*/total_num_values_ - num_values_,
+                                /*length=*/max_values, /*dest=*/buffer,
+                                /*dest_offset=*/0);
   num_values_ -= max_values;
   return max_values;
 }
@@ -1692,7 +1726,7 @@ class DictDecoderImpl : public DecoderImpl, virtual public DictDecoder<Type> {
   }
 
  protected:
-  Status IndexInBounds(int32_t index) {
+  Status IndexInBounds(int32_t index) const {
     if (ARROW_PREDICT_TRUE(0 <= index && index < dictionary_length_)) {
       return Status::OK();
     }
@@ -2706,13 +2740,12 @@ class DeltaLengthByteArrayEncoder : public EncoderImpl,
       : EncoderImpl(descr, Encoding::DELTA_LENGTH_BYTE_ARRAY,
                     pool = ::arrow::default_memory_pool()),
         sink_(pool),
-        length_encoder_(nullptr, pool),
-        encoded_size_{0} {}
+        length_encoder_(nullptr, pool) {}
 
   std::shared_ptr<Buffer> FlushValues() override;
 
   int64_t EstimatedDataEncodedSize() override {
-    return encoded_size_ + length_encoder_.EstimatedDataEncodedSize();
+    return sink_.length() + length_encoder_.EstimatedDataEncodedSize();
   }
 
   using TypedEncoder<ByteArrayType>::Put;
@@ -2734,6 +2767,11 @@ class DeltaLengthByteArrayEncoder : public EncoderImpl,
             return Status::Invalid(
                 "Parquet cannot store strings with size 2GB or more, got: ", view.size());
           }
+          if (ARROW_PREDICT_FALSE(
+                  view.size() + sink_.length() >
+                  static_cast<size_t>(std::numeric_limits<int32_t>::max()))) {
+            return Status::Invalid("excess expansion in DELTA_LENGTH_BYTE_ARRAY");
+          }
           length_encoder_.Put({static_cast<int32_t>(view.length())}, 1);
           PARQUET_THROW_NOT_OK(sink_.Append(view.data(), view.length()));
           return Status::OK();
@@ -2743,7 +2781,6 @@ class DeltaLengthByteArrayEncoder : public EncoderImpl,
 
   ::arrow::BufferBuilder sink_;
   DeltaBitPackEncoder<Int32Type> length_encoder_;
-  uint32_t encoded_size_;
 };
 
 template <typename DType>
@@ -2769,15 +2806,15 @@ void DeltaLengthByteArrayEncoder<DType>::Put(const T* src, int num_values) {
     const int batch_size = std::min(kBatchSize, num_values - idx);
     for (int j = 0; j < batch_size; ++j) {
       const int32_t len = src[idx + j].len;
-      if (AddWithOverflow(total_increment_size, len, &total_increment_size)) {
+      if (ARROW_PREDICT_FALSE(
+              AddWithOverflow(total_increment_size, len, &total_increment_size))) {
         throw ParquetException("excess expansion in DELTA_LENGTH_BYTE_ARRAY");
       }
       lengths[j] = len;
     }
     length_encoder_.Put(lengths.data(), batch_size);
   }
-
-  if (AddWithOverflow(encoded_size_, total_increment_size, &encoded_size_)) {
+  if (sink_.length() + total_increment_size > std::numeric_limits<int32_t>::max()) {
     throw ParquetException("excess expansion in DELTA_LENGTH_BYTE_ARRAY");
   }
   PARQUET_THROW_NOT_OK(sink_.Reserve(total_increment_size));
@@ -2816,7 +2853,6 @@ std::shared_ptr<Buffer> DeltaLengthByteArrayEncoder<DType>::FlushValues() {
 
   std::shared_ptr<Buffer> buffer;
   PARQUET_THROW_NOT_OK(sink_.Finish(&buffer, true));
-  encoded_size_ = 0;
   return buffer;
 }
 
@@ -3110,27 +3146,60 @@ class RleBooleanDecoder : public DecoderImpl, virtual public BooleanDecoder {
   int DecodeArrow(int num_values, int null_count, const uint8_t* valid_bits,
                   int64_t valid_bits_offset,
                   typename EncodingTraits<BooleanType>::Accumulator* out) override {
-    if (null_count != 0) {
-      // TODO(ARROW-34660): implement DecodeArrow with null slots.
-      ParquetException::NYI("RleBoolean DecodeArrow with null slots");
+    if (null_count == num_values) {
+      PARQUET_THROW_NOT_OK(out->AppendNulls(null_count));
+      return 0;
     }
     constexpr int kBatchSize = 1024;
     std::array<bool, kBatchSize> values;
-    int sum_decode_count = 0;
-    do {
-      int current_batch = std::min(kBatchSize, num_values);
-      int decoded_count = decoder_->GetBatch(values.data(), current_batch);
-      if (decoded_count == 0) {
-        break;
+    const int num_non_null_values = num_values - null_count;
+    // Remaining non-null boolean values to read from decoder.
+    // We decode from `decoder_` with maximum 1024 size batches.
+    int num_remain_non_null_values = num_non_null_values;
+    int current_index_in_batch = 0;
+    int current_batch_size = 0;
+    auto next_boolean_batch = [&]() {
+      DCHECK_GT(num_remain_non_null_values, 0);
+      DCHECK_EQ(current_index_in_batch, current_batch_size);
+      current_batch_size = std::min(num_remain_non_null_values, kBatchSize);
+      int decoded_count = decoder_->GetBatch(values.data(), current_batch_size);
+      if (ARROW_PREDICT_FALSE(decoded_count != current_batch_size)) {
+        // required values is more than values in decoder.
+        ParquetException::EofException();
       }
-      sum_decode_count += decoded_count;
-      PARQUET_THROW_NOT_OK(out->Reserve(sum_decode_count));
-      for (int i = 0; i < decoded_count; ++i) {
-        PARQUET_THROW_NOT_OK(out->Append(values[i]));
+      num_remain_non_null_values -= current_batch_size;
+      current_index_in_batch = 0;
+    };
+
+    // Reserve all values including nulls first
+    PARQUET_THROW_NOT_OK(out->Reserve(num_values));
+    if (null_count == 0) {
+      // Fast-path for not having nulls.
+      do {
+        next_boolean_batch();
+        PARQUET_THROW_NOT_OK(
+            out->AppendValues(values.begin(), values.begin() + current_batch_size));
+        num_values -= current_batch_size;
+        // set current_index_in_batch to current_batch_size means
+        // the whole batch is totally consumed.
+        current_index_in_batch = current_batch_size;
+      } while (num_values > 0);
+      return num_non_null_values;
+    }
+    auto next_value = [&]() -> bool {
+      if (current_index_in_batch == current_batch_size) {
+        next_boolean_batch();
+        DCHECK_GT(current_batch_size, 0);
       }
-      num_values -= decoded_count;
-    } while (num_values > 0);
-    return sum_decode_count;
+      DCHECK_LT(current_index_in_batch, current_batch_size);
+      bool value = values[current_index_in_batch];
+      ++current_index_in_batch;
+      return value;
+    };
+    VisitNullBitmapInline(
+        valid_bits, valid_bits_offset, num_values, null_count,
+        [&]() { out->UnsafeAppend(next_value()); }, [&]() { out->UnsafeAppendNull(); });
+    return num_non_null_values;
   }
 
   int DecodeArrow(
@@ -3627,12 +3696,24 @@ class ByteStreamSplitDecoderBase : public DecoderImpl,
   ByteStreamSplitDecoderBase(const ColumnDescriptor* descr, int byte_width)
       : DecoderImpl(descr, Encoding::BYTE_STREAM_SPLIT), byte_width_(byte_width) {}
 
-  void SetData(int num_values, const uint8_t* data, int len) override {
-    if (static_cast<int64_t>(num_values) * byte_width_ != len) {
-      throw ParquetException("Data size (" + std::to_string(len) +
-                             ") does not match number of values in BYTE_STREAM_SPLIT (" +
-                             std::to_string(num_values) + ")");
+  void SetData(int num_values, const uint8_t* data, int len) final {
+    // Check that the data size is consistent with the number of values
+    // The spec requires that the data size is a multiple of the number of values,
+    // see: https://github.com/apache/parquet-format/pull/192 .
+    // GH-41562: passed in `num_values` may include nulls, so we need to check and
+    // adjust the number of values.
+    if (static_cast<int64_t>(num_values) * byte_width_ < len) {
+      throw ParquetException(
+          "Data size (" + std::to_string(len) +
+          ") is too small for the number of values in in BYTE_STREAM_SPLIT (" +
+          std::to_string(num_values) + ")");
+    }
+    if (len % byte_width_ != 0) {
+      throw ParquetException("ByteStreamSplit data size " + std::to_string(len) +
+                             " not aligned with type " + TypeToString(DType::type_num) +
+                             " and byte_width: " + std::to_string(byte_width_));
     }
+    num_values = len / byte_width_;
     DecoderImpl::SetData(num_values, data, len);
     stride_ = num_values_;
   }
diff --git a/cpp/src/parquet/encoding.h b/cpp/src/parquet/encoding.h
index de47bb7deb839..493c4044ddc1c 100644
--- a/cpp/src/parquet/encoding.h
+++ b/cpp/src/parquet/encoding.h
@@ -255,6 +255,11 @@ class Decoder {
 
   // Sets the data for a new page. This will be called multiple times on the same
   // decoder and should reset all internal state.
+  //
+  // `num_values` comes from the data page header, and may be greater than the number of
+  // physical values in the data buffer if there are some omitted (null) values.
+  // `len`, on the other hand, is the size in bytes of the data buffer and
+  // directly relates to the number of physical values.
   virtual void SetData(int num_values, const uint8_t* data, int len) = 0;
 
   // Returns the number of values left (for the last call to SetData()). This is
@@ -400,7 +405,9 @@ class BooleanDecoder : virtual public TypedDecoder<BooleanType> {
   /// \brief Decode and bit-pack values into a buffer
   ///
   /// \param[in] buffer destination for decoded values
-  /// This buffer will contain bit-packed values.
+  /// This buffer will contain bit-packed values. If
+  /// max_values is not a multiple of 8, the trailing bits
+  /// of the last byte will be undefined.
   /// \param[in] max_values max values to decode.
   /// \return The number of values decoded. Should be identical to max_values except
   /// at the end of the current data page.
diff --git a/cpp/src/parquet/encoding_benchmark.cc b/cpp/src/parquet/encoding_benchmark.cc
index 61959b659f633..34d12a624f6fc 100644
--- a/cpp/src/parquet/encoding_benchmark.cc
+++ b/cpp/src/parquet/encoding_benchmark.cc
@@ -66,6 +66,7 @@ static void BM_PlainEncodingBoolean(benchmark::State& state) {
     typed_encoder->FlushValues();
   }
   state.SetBytesProcessed(state.iterations() * state.range(0) * sizeof(bool));
+  state.SetItemsProcessed(state.iterations() * state.range(0));
 }
 
 BENCHMARK(BM_PlainEncodingBoolean)->Range(MIN_RANGE, MAX_RANGE);
@@ -86,11 +87,34 @@ static void BM_PlainDecodingBoolean(benchmark::State& state) {
   }
 
   state.SetBytesProcessed(state.iterations() * state.range(0) * sizeof(bool));
+  state.SetItemsProcessed(state.iterations() * state.range(0));
   delete[] output;
 }
 
 BENCHMARK(BM_PlainDecodingBoolean)->Range(MIN_RANGE, MAX_RANGE);
 
+static void BM_PlainDecodingBooleanToBitmap(benchmark::State& state) {
+  std::vector<bool> values(state.range(0), true);
+  int64_t bitmap_bytes = ::arrow::bit_util::BytesForBits(state.range(0));
+  std::vector<uint8_t> output(bitmap_bytes, 0);
+  auto encoder = MakeEncoder(Type::BOOLEAN, Encoding::PLAIN);
+  auto typed_encoder = dynamic_cast<BooleanEncoder*>(encoder.get());
+  typed_encoder->Put(values, static_cast<int>(values.size()));
+  std::shared_ptr<Buffer> buf = encoder->FlushValues();
+
+  for (auto _ : state) {
+    auto decoder = MakeTypedDecoder<BooleanType>(Encoding::PLAIN);
+    decoder->SetData(static_cast<int>(values.size()), buf->data(),
+                     static_cast<int>(buf->size()));
+    decoder->Decode(output.data(), static_cast<int>(values.size()));
+  }
+  // Still set `BytesProcessed` to byte level.
+  state.SetBytesProcessed(state.iterations() * bitmap_bytes);
+  state.SetItemsProcessed(state.iterations() * state.range(0));
+}
+
+BENCHMARK(BM_PlainDecodingBooleanToBitmap)->Range(MIN_RANGE, MAX_RANGE);
+
 static void BM_PlainEncodingInt64(benchmark::State& state) {
   std::vector<int64_t> values(state.range(0), 64);
   auto encoder = MakeTypedEncoder<Int64Type>(Encoding::PLAIN);
@@ -372,7 +396,7 @@ struct ByteStreamSplitDummyValue<std::array<T, N>> {
   using Array = std::array<T, N>;
 
   static constexpr Array value() {
-    Array array;
+    Array array{};
     array.fill(ByteStreamSplitDummyValue<T>::value());
     return array;
   }
@@ -1097,8 +1121,11 @@ BENCHMARK(BM_DictDecodingByteArray)->Apply(ByteArrayCustomArguments);
 using ::arrow::BinaryBuilder;
 using ::arrow::BinaryDictionary32Builder;
 
-class BenchmarkDecodeArrow : public ::benchmark::Fixture {
+template <typename ParquetType>
+class BenchmarkDecodeArrowBase : public ::benchmark::Fixture {
  public:
+  virtual ~BenchmarkDecodeArrowBase() = default;
+
   void SetUp(const ::benchmark::State& state) override {
     num_values_ = static_cast<int>(state.range());
     InitDataInputs();
@@ -1111,37 +1138,18 @@ class BenchmarkDecodeArrow : public ::benchmark::Fixture {
     values_.clear();
   }
 
-  void InitDataInputs() {
-    // Generate a random string dictionary without any nulls so that this dataset can
-    // be used for benchmarking the DecodeArrowNonNull API
-    constexpr int repeat_factor = 8;
-    constexpr int64_t min_length = 2;
-    constexpr int64_t max_length = 10;
-    ::arrow::random::RandomArrayGenerator rag(0);
-    input_array_ = rag.StringWithRepeats(num_values_, num_values_ / repeat_factor,
-                                         min_length, max_length, /*null_probability=*/0);
-    valid_bits_ = input_array_->null_bitmap_data();
-    total_size_ = input_array_->data()->buffers[2]->size();
-
-    values_.reserve(num_values_);
-    const auto& binary_array = static_cast<const ::arrow::BinaryArray&>(*input_array_);
-    for (int64_t i = 0; i < binary_array.length(); i++) {
-      auto view = binary_array.GetView(i);
-      values_.emplace_back(static_cast<uint32_t>(view.length()),
-                           reinterpret_cast<const uint8_t*>(view.data()));
-    }
-  }
-
+  virtual void InitDataInputs() = 0;
   virtual void DoEncodeArrow() = 0;
   virtual void DoEncodeLowLevel() = 0;
-
-  virtual std::unique_ptr<ByteArrayDecoder> InitializeDecoder() = 0;
+  virtual std::unique_ptr<TypedDecoder<ParquetType>> InitializeDecoder() = 0;
+  virtual typename EncodingTraits<ParquetType>::Accumulator CreateAccumulator() = 0;
 
   void EncodeArrowBenchmark(benchmark::State& state) {
     for (auto _ : state) {
       DoEncodeArrow();
     }
     state.SetBytesProcessed(state.iterations() * total_size_);
+    state.SetItemsProcessed(state.iterations() * num_values_);
   }
 
   void EncodeLowLevelBenchmark(benchmark::State& state) {
@@ -1149,26 +1157,27 @@ class BenchmarkDecodeArrow : public ::benchmark::Fixture {
       DoEncodeLowLevel();
     }
     state.SetBytesProcessed(state.iterations() * total_size_);
+    state.SetItemsProcessed(state.iterations() * num_values_);
   }
 
   void DecodeArrowDenseBenchmark(benchmark::State& state) {
     for (auto _ : state) {
       auto decoder = InitializeDecoder();
-      typename EncodingTraits<ByteArrayType>::Accumulator acc;
-      acc.builder.reset(new BinaryBuilder);
+      auto acc = CreateAccumulator();
       decoder->DecodeArrow(num_values_, 0, valid_bits_, 0, &acc);
     }
     state.SetBytesProcessed(state.iterations() * total_size_);
+    state.SetItemsProcessed(state.iterations() * num_values_);
   }
 
   void DecodeArrowNonNullDenseBenchmark(benchmark::State& state) {
     for (auto _ : state) {
       auto decoder = InitializeDecoder();
-      typename EncodingTraits<ByteArrayType>::Accumulator acc;
-      acc.builder.reset(new BinaryBuilder);
+      auto acc = CreateAccumulator();
       decoder->DecodeArrowNonNull(num_values_, &acc);
     }
     state.SetBytesProcessed(state.iterations() * total_size_);
+    state.SetItemsProcessed(state.iterations() * num_values_);
   }
 
   void DecodeArrowDictBenchmark(benchmark::State& state) {
@@ -1179,6 +1188,7 @@ class BenchmarkDecodeArrow : public ::benchmark::Fixture {
     }
 
     state.SetBytesProcessed(state.iterations() * total_size_);
+    state.SetItemsProcessed(state.iterations() * num_values_);
   }
 
   void DecodeArrowNonNullDictBenchmark(benchmark::State& state) {
@@ -1189,20 +1199,54 @@ class BenchmarkDecodeArrow : public ::benchmark::Fixture {
     }
 
     state.SetBytesProcessed(state.iterations() * total_size_);
+    state.SetItemsProcessed(state.iterations() * num_values_);
   }
 
  protected:
-  int num_values_;
+  int num_values_{0};
   std::shared_ptr<::arrow::Array> input_array_;
-  std::vector<ByteArray> values_;
-  uint64_t total_size_;
-  const uint8_t* valid_bits_;
+  uint64_t total_size_{0};
+  const uint8_t* valid_bits_{nullptr};
   std::shared_ptr<Buffer> buffer_;
+  std::vector<typename ParquetType::c_type> values_;
+};
+
+class BenchmarkDecodeArrowByteArray : public BenchmarkDecodeArrowBase<ByteArrayType> {
+ public:
+  using ByteArrayAccumulator = typename EncodingTraits<ByteArrayType>::Accumulator;
+
+  ByteArrayAccumulator CreateAccumulator() final {
+    ByteArrayAccumulator acc;
+    acc.builder = std::make_unique<BinaryBuilder>(default_memory_pool());
+    return acc;
+  }
+
+  void InitDataInputs() final {
+    // Generate a random string dictionary without any nulls so that this dataset can
+    // be used for benchmarking the DecodeArrowNonNull API
+    constexpr int repeat_factor = 8;
+    constexpr int64_t min_length = 2;
+    constexpr int64_t max_length = 10;
+    ::arrow::random::RandomArrayGenerator rag(0);
+    input_array_ = rag.StringWithRepeats(num_values_, num_values_ / repeat_factor,
+                                         min_length, max_length, /*null_probability=*/0);
+    valid_bits_ = input_array_->null_bitmap_data();
+    total_size_ = input_array_->data()->buffers[2]->size();
+
+    values_.resize(num_values_);
+    const auto& binary_array = static_cast<const ::arrow::BinaryArray&>(*input_array_);
+    for (int64_t i = 0; i < binary_array.length(); i++) {
+      values_[i] = binary_array.GetView(i);
+    }
+  }
+
+ protected:
+  std::vector<ByteArray> values_;
 };
 
 // ----------------------------------------------------------------------
 // Benchmark Decoding from Plain Encoding
-class BM_ArrowBinaryPlain : public BenchmarkDecodeArrow {
+class BM_ArrowBinaryPlain : public BenchmarkDecodeArrowByteArray {
  public:
   void DoEncodeArrow() override {
     auto encoder = MakeTypedEncoder<ByteArrayType>(Encoding::PLAIN);
@@ -1251,7 +1295,7 @@ BENCHMARK_REGISTER_F(BM_ArrowBinaryPlain, DecodeArrowNonNull_Dict)
 
 // ----------------------------------------------------------------------
 // Benchmark Decoding from Dictionary Encoding
-class BM_ArrowBinaryDict : public BenchmarkDecodeArrow {
+class BM_ArrowBinaryDict : public BenchmarkDecodeArrowByteArray {
  public:
   template <typename PutValuesFunc>
   void DoEncode(PutValuesFunc&& put_values) {
@@ -1319,7 +1363,7 @@ class BM_ArrowBinaryDict : public BenchmarkDecodeArrow {
   }
 
   void TearDown(const ::benchmark::State& state) override {
-    BenchmarkDecodeArrow::TearDown(state);
+    BenchmarkDecodeArrowByteArray::TearDown(state);
     dict_buffer_.reset();
     descr_.reset();
   }
@@ -1327,7 +1371,7 @@ class BM_ArrowBinaryDict : public BenchmarkDecodeArrow {
  protected:
   std::unique_ptr<ColumnDescriptor> descr_;
   std::shared_ptr<Buffer> dict_buffer_;
-  int num_dict_entries_;
+  int num_dict_entries_{0};
 };
 
 BENCHMARK_DEFINE_F(BM_ArrowBinaryDict, EncodeArrow)
@@ -1373,4 +1417,121 @@ BENCHMARK_DEFINE_F(BM_ArrowBinaryDict, DecodeArrowNonNull_Dict)
 BENCHMARK_REGISTER_F(BM_ArrowBinaryDict, DecodeArrowNonNull_Dict)
     ->Range(MIN_RANGE, MAX_RANGE);
 
+class BenchmarkDecodeArrowBoolean : public BenchmarkDecodeArrowBase<BooleanType> {
+ public:
+  void InitDataInputs() final {
+    // Generate a random boolean array with `null_probability_`.
+    ::arrow::random::RandomArrayGenerator rag(0);
+    input_array_ = rag.Boolean(num_values_, /*true_probability=*/0.5, null_probability_);
+    valid_bits_ = input_array_->null_bitmap_data();
+
+    // Arrow uses a bitmap representation for boolean arrays,
+    // so, we uses this as "total_size" for the benchmark.
+    total_size_ = ::arrow::bit_util::BytesForBits(num_values_);
+
+    values_.resize(num_values_);
+    const auto& boolean_array = static_cast<const ::arrow::BooleanArray&>(*input_array_);
+    for (int64_t i = 0; i < boolean_array.length(); i++) {
+      values_[i] = boolean_array.Value(i);
+    }
+  }
+
+  typename EncodingTraits<BooleanType>::Accumulator CreateAccumulator() final {
+    return typename EncodingTraits<BooleanType>::Accumulator();
+  }
+
+  void DoEncodeLowLevel() final { ParquetException::NYI(); }
+
+  void DecodeArrowWithNullDenseBenchmark(benchmark::State& state);
+
+ protected:
+  void DoEncodeArrowImpl(Encoding::type encoding) {
+    auto encoder = MakeTypedEncoder<BooleanType>(encoding);
+    encoder->Put(*input_array_);
+    buffer_ = encoder->FlushValues();
+  }
+
+  std::unique_ptr<TypedDecoder<BooleanType>> InitializeDecoderImpl(
+      Encoding::type encoding) const {
+    auto decoder = MakeTypedDecoder<BooleanType>(encoding);
+    decoder->SetData(num_values_, buffer_->data(), static_cast<int>(buffer_->size()));
+    return decoder;
+  }
+
+ protected:
+  double null_probability_ = 0.0;
+};
+
+void BenchmarkDecodeArrowBoolean::DecodeArrowWithNullDenseBenchmark(
+    benchmark::State& state) {
+  // Change null_probability
+  null_probability_ = static_cast<double>(state.range(1)) / 10000;
+  InitDataInputs();
+  this->DoEncodeArrow();
+  int num_values_with_nulls = this->num_values_;
+
+  for (auto _ : state) {
+    auto decoder = this->InitializeDecoder();
+    auto acc = this->CreateAccumulator();
+    decoder->DecodeArrow(
+        num_values_with_nulls,
+        /*null_count=*/static_cast<int>(this->input_array_->null_count()),
+        this->valid_bits_, 0, &acc);
+  }
+  state.SetBytesProcessed(state.iterations() * static_cast<int64_t>(total_size_));
+  state.SetItemsProcessed(state.iterations() * state.range(0));
+}
+
+class BM_DecodeArrowBooleanPlain : public BenchmarkDecodeArrowBoolean {
+ public:
+  void DoEncodeArrow() final { DoEncodeArrowImpl(Encoding::PLAIN); }
+
+  std::unique_ptr<TypedDecoder<BooleanType>> InitializeDecoder() override {
+    return InitializeDecoderImpl(Encoding::PLAIN);
+  }
+};
+
+class BM_DecodeArrowBooleanRle : public BenchmarkDecodeArrowBoolean {
+ public:
+  void DoEncodeArrow() final { DoEncodeArrowImpl(Encoding::RLE); }
+
+  std::unique_ptr<TypedDecoder<BooleanType>> InitializeDecoder() override {
+    return InitializeDecoderImpl(Encoding::RLE);
+  }
+};
+
+static void BooleanWithNullCustomArguments(benchmark::internal::Benchmark* b) {
+  b->ArgsProduct({
+                     benchmark::CreateRange(MIN_RANGE, MAX_RANGE, /*multi=*/4),
+                     {1, 100, 1000, 5000, 10000},
+                 })
+      ->ArgNames({"num_values", "null_in_ten_thousand"});
+}
+
+BENCHMARK_DEFINE_F(BM_DecodeArrowBooleanRle, DecodeArrow)(benchmark::State& state) {
+  DecodeArrowDenseBenchmark(state);
+}
+BENCHMARK_REGISTER_F(BM_DecodeArrowBooleanRle, DecodeArrow)->Range(MIN_RANGE, MAX_RANGE);
+BENCHMARK_DEFINE_F(BM_DecodeArrowBooleanRle, DecodeArrowNonNull)
+(benchmark::State& state) { DecodeArrowNonNullDenseBenchmark(state); }
+BENCHMARK_REGISTER_F(BM_DecodeArrowBooleanRle, DecodeArrowNonNull)
+    ->Range(MIN_RANGE, MAX_RANGE);
+BENCHMARK_DEFINE_F(BM_DecodeArrowBooleanRle, DecodeArrowWithNull)
+(benchmark::State& state) { DecodeArrowWithNullDenseBenchmark(state); }
+BENCHMARK_REGISTER_F(BM_DecodeArrowBooleanRle, DecodeArrowWithNull)
+    ->Apply(BooleanWithNullCustomArguments);
+
+BENCHMARK_DEFINE_F(BM_DecodeArrowBooleanPlain, DecodeArrow)
+(benchmark::State& state) { DecodeArrowDenseBenchmark(state); }
+BENCHMARK_REGISTER_F(BM_DecodeArrowBooleanPlain, DecodeArrow)
+    ->Range(MIN_RANGE, MAX_RANGE);
+BENCHMARK_DEFINE_F(BM_DecodeArrowBooleanPlain, DecodeArrowNonNull)
+(benchmark::State& state) { DecodeArrowNonNullDenseBenchmark(state); }
+BENCHMARK_REGISTER_F(BM_DecodeArrowBooleanPlain, DecodeArrowNonNull)
+    ->Range(MIN_RANGE, MAX_RANGE);
+BENCHMARK_DEFINE_F(BM_DecodeArrowBooleanPlain, DecodeArrowWithNull)
+(benchmark::State& state) { DecodeArrowWithNullDenseBenchmark(state); }
+BENCHMARK_REGISTER_F(BM_DecodeArrowBooleanPlain, DecodeArrowWithNull)
+    ->Apply(BooleanWithNullCustomArguments);
+
 }  // namespace parquet
diff --git a/cpp/src/parquet/encoding_test.cc b/cpp/src/parquet/encoding_test.cc
index ea0029f4c7d7f..78bf26587e3fb 100644
--- a/cpp/src/parquet/encoding_test.cc
+++ b/cpp/src/parquet/encoding_test.cc
@@ -577,6 +577,11 @@ TEST(PlainEncodingAdHoc, ArrowBinaryDirectPut) {
     auto decoder = MakeTypedDecoder<ByteArrayType>(Encoding::PLAIN);
 
     ASSERT_NO_THROW(encoder->Put(*values));
+    // For Plain encoding, the estimated size should be at least the total byte size
+    auto& string_array = dynamic_cast<const ::arrow::StringArray&>(*values);
+    EXPECT_GE(encoder->EstimatedDataEncodedSize(), string_array.total_values_length())
+        << "Estimated size should be at least the total byte size";
+
     auto buf = encoder->FlushValues();
 
     int num_values = static_cast<int>(values->length() - values->null_count());
@@ -602,7 +607,7 @@ TEST(PlainEncodingAdHoc, ArrowBinaryDirectPut) {
 
 // Check that one can put several Arrow arrays into a given encoder
 // and decode to the right values (see GH-36939)
-TEST(PlainBooleanArrayEncoding, AdHocRoundTrip) {
+TEST(BooleanArrayEncoding, AdHocRoundTrip) {
   std::vector<std::shared_ptr<::arrow::Array>> arrays{
       ::arrow::ArrayFromJSON(::arrow::boolean(), R"([])"),
       ::arrow::ArrayFromJSON(::arrow::boolean(), R"([false, null, true])"),
@@ -610,27 +615,173 @@ TEST(PlainBooleanArrayEncoding, AdHocRoundTrip) {
       ::arrow::ArrayFromJSON(::arrow::boolean(), R"([true, null, false])"),
   };
 
-  auto encoder = MakeTypedEncoder<BooleanType>(Encoding::PLAIN,
-                                               /*use_dictionary=*/false);
-  for (const auto& array : arrays) {
-    encoder->Put(*array);
+  for (auto encoding : {Encoding::PLAIN, Encoding::RLE}) {
+    auto encoder = MakeTypedEncoder<BooleanType>(encoding,
+                                                 /*use_dictionary=*/false);
+    for (const auto& array : arrays) {
+      encoder->Put(*array);
+    }
+    auto buffer = encoder->FlushValues();
+    auto decoder = MakeTypedDecoder<BooleanType>(encoding);
+    EXPECT_OK_AND_ASSIGN(auto expected, ::arrow::Concatenate(arrays));
+    decoder->SetData(static_cast<int>(expected->length()), buffer->data(),
+                     static_cast<int>(buffer->size()));
+
+    ::arrow::BooleanBuilder builder;
+    ASSERT_EQ(static_cast<int>(expected->length() - expected->null_count()),
+              decoder->DecodeArrow(static_cast<int>(expected->length()),
+                                   static_cast<int>(expected->null_count()),
+                                   expected->null_bitmap_data(), 0, &builder));
+
+    std::shared_ptr<::arrow::Array> result;
+    ASSERT_OK(builder.Finish(&result));
+    ASSERT_EQ(expected->length(), result->length());
+    ::arrow::AssertArraysEqual(*expected, *result, /*verbose=*/true);
+  }
+}
+
+class TestBooleanArrowDecoding : public ::testing::Test {
+ public:
+  // number of values including nulls
+  constexpr static int kNumValues = 10000;
+
+  void SetUp() override {
+    null_probabilities_ = {0.0, 0.001, 0.5, 0.999, 1.0};
+    read_batch_sizes_ = {1024, 4096, 10000};
+    true_probabilities_ = {0.0, 0.001, 0.5, 0.999, 1.0};
   }
-  auto buffer = encoder->FlushValues();
-  auto decoder = MakeTypedDecoder<BooleanType>(Encoding::PLAIN);
-  EXPECT_OK_AND_ASSIGN(auto expected, ::arrow::Concatenate(arrays));
-  decoder->SetData(static_cast<int>(expected->length()), buffer->data(),
-                   static_cast<int>(buffer->size()));
+  void TearDown() override {}
 
-  ::arrow::BooleanBuilder builder;
-  ASSERT_EQ(static_cast<int>(expected->length() - expected->null_count()),
-            decoder->DecodeArrow(static_cast<int>(expected->length()),
-                                 static_cast<int>(expected->null_count()),
-                                 expected->null_bitmap_data(), 0, &builder));
+  void InitTestCase(Encoding::type encoding, double null_probability,
+                    double true_probability) {
+    GenerateInputData(null_probability, true_probability);
+    SetupEncoderDecoder(encoding);
+  }
 
-  std::shared_ptr<::arrow::Array> result;
-  ASSERT_OK(builder.Finish(&result));
-  ASSERT_EQ(expected->length(), result->length());
-  ::arrow::AssertArraysEqual(*expected, *result, /*verbose=*/true);
+  void GenerateInputData(double null_probability, double true_probability) {
+    ::arrow::random::RandomArrayGenerator rag(0);
+    expected_dense_ = rag.Boolean(kNumValues, true_probability, null_probability);
+    null_count_ = static_cast<int>(expected_dense_->null_count());
+    valid_bits_ = expected_dense_->null_bitmap_data();
+
+    // Initialize input_data_ for the encoder from the expected_array_ values
+    const auto& boolean_array =
+        checked_cast<const ::arrow::BooleanArray&>(*expected_dense_);
+    input_data_.resize(boolean_array.length());
+
+    for (int64_t i = 0; i < boolean_array.length(); ++i) {
+      input_data_[i] = boolean_array.Value(i);
+    }
+  }
+
+  // Setup encoder/decoder pair for testing with boolean encoding
+  void SetupEncoderDecoder(Encoding::type encoding) {
+    encoder_ = MakeTypedEncoder<BooleanType>(encoding);
+    decoder_ = MakeTypedDecoder<BooleanType>(encoding);
+    const auto* data_ptr = reinterpret_cast<const bool*>(input_data_.data());
+    if (valid_bits_ != nullptr) {
+      ASSERT_NO_THROW(encoder_->PutSpaced(data_ptr, kNumValues, valid_bits_, 0));
+    } else {
+      ASSERT_NO_THROW(encoder_->Put(data_ptr, kNumValues));
+    }
+    buffer_ = encoder_->FlushValues();
+    ResetTheDecoder();
+  }
+
+  void ResetTheDecoder() {
+    ASSERT_NE(nullptr, buffer_);
+    decoder_->SetData(kNumValues, buffer_->data(), static_cast<int>(buffer_->size()));
+  }
+
+  void CheckDense(int actual_num_values, const ::arrow::Array& chunk) {
+    ASSERT_EQ(actual_num_values, kNumValues - null_count_);
+    ASSERT_ARRAYS_EQUAL(chunk, *expected_dense_);
+  }
+
+  void CheckDecodeArrow(Encoding::type encoding) {
+    for (double np : null_probabilities_) {
+      for (double true_prob : true_probabilities_) {
+        InitTestCase(encoding, np, true_prob);
+        for (int read_batch_size : this->read_batch_sizes_) {
+          ResetTheDecoder();
+
+          int num_values_left = kNumValues;
+          ::arrow::BooleanBuilder acc;
+          int actual_num_not_null_values = 0;
+          while (num_values_left > 0) {
+            int batch_size = std::min(num_values_left, read_batch_size);
+            ASSERT_NE(0, batch_size);
+            // Counting nulls
+            int64_t batch_null_count = 0;
+            if (null_count_ != 0) {
+              batch_null_count =
+                  batch_size - ::arrow::internal::CountSetBits(
+                                   valid_bits_, kNumValues - num_values_left, batch_size);
+            }
+            int batch_num_values =
+                decoder_->DecodeArrow(batch_size, static_cast<int>(batch_null_count),
+                                      valid_bits_, kNumValues - num_values_left, &acc);
+            actual_num_not_null_values += batch_num_values;
+            num_values_left -= batch_size;
+          }
+          std::shared_ptr<::arrow::Array> chunk;
+          ASSERT_OK(acc.Finish(&chunk));
+          CheckDense(actual_num_not_null_values, *chunk);
+        }
+      }
+    }
+  }
+
+  void CheckDecodeArrowNonNull(Encoding::type encoding) {
+    // NonNull skips tests for null_prob != 0.
+    for (auto true_prob : true_probabilities_) {
+      InitTestCase(encoding, /*null_probability=*/0, true_prob);
+      for (int read_batch_size : this->read_batch_sizes_) {
+        // Resume the decoder
+        ResetTheDecoder();
+        ::arrow::BooleanBuilder acc;
+        int actual_num_values = 0;
+        int num_values_left = kNumValues;
+        while (num_values_left > 0) {
+          int batch_size = std::min(num_values_left, read_batch_size);
+          int batch_num_values = decoder_->DecodeArrowNonNull(batch_size, &acc);
+          actual_num_values += batch_num_values;
+          num_values_left -= batch_num_values;
+        }
+        std::shared_ptr<::arrow::Array> chunk;
+        ASSERT_OK(acc.Finish(&chunk));
+        CheckDense(actual_num_values, *chunk);
+      }
+    }
+  }
+
+ protected:
+  std::vector<double> null_probabilities_;
+  std::vector<double> true_probabilities_;
+  std::vector<int> read_batch_sizes_;
+  std::shared_ptr<::arrow::Array> expected_dense_;
+  int null_count_{0};
+  std::vector<uint8_t> input_data_;
+  const uint8_t* valid_bits_ = NULLPTR;
+  std::unique_ptr<BooleanEncoder> encoder_;
+  std::unique_ptr<BooleanDecoder> decoder_;
+  std::shared_ptr<Buffer> buffer_;
+};
+
+TEST_F(TestBooleanArrowDecoding, CheckDecodeArrowUsingPlain) {
+  this->CheckDecodeArrow(Encoding::PLAIN);
+}
+
+TEST_F(TestBooleanArrowDecoding, CheckDecodeArrowNonNullPlain) {
+  this->CheckDecodeArrowNonNull(Encoding::PLAIN);
+}
+
+TEST_F(TestBooleanArrowDecoding, CheckDecodeArrowRle) {
+  this->CheckDecodeArrow(Encoding::RLE);
+}
+
+TEST_F(TestBooleanArrowDecoding, CheckDecodeArrowNonNullRle) {
+  this->CheckDecodeArrowNonNull(Encoding::RLE);
 }
 
 template <typename T>
@@ -963,8 +1114,6 @@ TYPED_TEST(EncodingAdHocTyped, ByteStreamSplitArrowDirectPut) {
 }
 
 TYPED_TEST(EncodingAdHocTyped, RleArrowDirectPut) {
-  // TODO: test with nulls once RleBooleanDecoder::DecodeArrow supports them
-  this->null_probability_ = 0;
   for (auto seed : {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}) {
     this->Rle(seed);
   }
@@ -1239,7 +1388,7 @@ class TestByteStreamSplitEncoding : public TestEncodingBase<Type> {
     encoder->PutSpaced(draws_, num_values_, valid_bits, valid_bits_offset);
     encode_buffer_ = encoder->FlushValues();
     ASSERT_EQ(encode_buffer_->size(), physical_byte_width() * (num_values_ - null_count));
-    decoder->SetData(num_values_ - null_count, encode_buffer_->data(),
+    decoder->SetData(num_values_, encode_buffer_->data(),
                      static_cast<int>(encode_buffer_->size()));
     auto values_decoded = decoder->DecodeSpaced(decode_buf_, num_values_, null_count,
                                                 valid_bits, valid_bits_offset);
@@ -1573,7 +1722,7 @@ class TestDeltaBitPackEncoding : public TestEncodingBase<Type> {
     for (size_t i = 0; i < kNumRoundTrips; ++i) {
       encoder->PutSpaced(draws_, num_values_, valid_bits, valid_bits_offset);
       encode_buffer_ = encoder->FlushValues();
-      decoder->SetData(num_values_ - null_count, encode_buffer_->data(),
+      decoder->SetData(num_values_, encode_buffer_->data(),
                        static_cast<int>(encode_buffer_->size()));
       auto values_decoded = decoder->DecodeSpaced(decode_buf_, num_values_, null_count,
                                                   valid_bits, valid_bits_offset);
@@ -2016,6 +2165,10 @@ TEST(DeltaLengthByteArrayEncodingAdHoc, ArrowBinaryDirectPut) {
 
   auto CheckSeed = [&](std::shared_ptr<::arrow::Array> values) {
     ASSERT_NO_THROW(encoder->Put(*values));
+    auto* binary_array = checked_cast<const ::arrow::BinaryArray*>(values.get());
+    // For DeltaLength encoding, the estimated size should be at least the total byte size
+    EXPECT_GE(encoder->EstimatedDataEncodedSize(), binary_array->total_values_length())
+        << "Estimated size should be at least the total byte size";
     auto buf = encoder->FlushValues();
 
     int num_values = static_cast<int>(values->length() - values->null_count());
diff --git a/cpp/src/parquet/encryption/file_key_unwrapper.cc b/cpp/src/parquet/encryption/file_key_unwrapper.cc
index 02bea127fd1c3..d88aa6c52ac12 100644
--- a/cpp/src/parquet/encryption/file_key_unwrapper.cc
+++ b/cpp/src/parquet/encryption/file_key_unwrapper.cc
@@ -124,7 +124,7 @@ KeyWithMasterId FileKeyUnwrapper::GetDataEncryptionKey(const KeyMaterial& key_ma
     data_key = internal::DecryptKeyLocally(encoded_wrapped_dek, kek_bytes, aad);
   }
 
-  return KeyWithMasterId(std::move(data_key), std::move(master_key_id));
+  return KeyWithMasterId(std::move(data_key), master_key_id);
 }
 
 std::shared_ptr<KmsClient> FileKeyUnwrapper::GetKmsClientFromConfigOrKeyMaterial(
diff --git a/cpp/src/parquet/file_reader.cc b/cpp/src/parquet/file_reader.cc
index 2d842599c3c70..2a3853102ee73 100644
--- a/cpp/src/parquet/file_reader.cc
+++ b/cpp/src/parquet/file_reader.cc
@@ -71,8 +71,7 @@ bool IsColumnChunkFullyDictionaryEncoded(const ColumnChunkMetaData& col) {
   }
   // The following pages should be dictionary encoded data pages.
   for (size_t idx = 1; idx < encoding_stats.size(); ++idx) {
-    if ((encoding_stats[idx].encoding != Encoding::RLE_DICTIONARY &&
-         encoding_stats[idx].encoding != Encoding::PLAIN_DICTIONARY) ||
+    if (!IsDictionaryIndexEncoding(encoding_stats[idx].encoding) ||
         (encoding_stats[idx].page_type != PageType::DATA_PAGE &&
          encoding_stats[idx].page_type != PageType::DATA_PAGE_V2)) {
       // Return false if any following page is not a dictionary encoded data
@@ -214,16 +213,14 @@ class SerializedRowGroup : public RowGroupReader::Contents {
                      std::shared_ptr<::arrow::io::internal::ReadRangeCache> cached_source,
                      int64_t source_size, FileMetaData* file_metadata,
                      int row_group_number, ReaderProperties props,
-                     std::shared_ptr<Buffer> prebuffered_column_chunks_bitmap,
-                     std::shared_ptr<InternalFileDecryptor> file_decryptor = nullptr)
+                     std::shared_ptr<Buffer> prebuffered_column_chunks_bitmap)
       : source_(std::move(source)),
         cached_source_(std::move(cached_source)),
         source_size_(source_size),
         file_metadata_(file_metadata),
         properties_(std::move(props)),
         row_group_ordinal_(row_group_number),
-        prebuffered_column_chunks_bitmap_(std::move(prebuffered_column_chunks_bitmap)),
-        file_decryptor_(std::move(file_decryptor)) {
+        prebuffered_column_chunks_bitmap_(std::move(prebuffered_column_chunks_bitmap)) {
     row_group_metadata_ = file_metadata->RowGroup(row_group_number);
   }
 
@@ -262,10 +259,10 @@ class SerializedRowGroup : public RowGroupReader::Contents {
     }
 
     // The column is encrypted
-    std::shared_ptr<Decryptor> meta_decryptor =
-        GetColumnMetaDecryptor(crypto_metadata.get(), file_decryptor_.get());
-    std::shared_ptr<Decryptor> data_decryptor =
-        GetColumnDataDecryptor(crypto_metadata.get(), file_decryptor_.get());
+    std::shared_ptr<Decryptor> meta_decryptor = GetColumnMetaDecryptor(
+        crypto_metadata.get(), file_metadata_->file_decryptor().get());
+    std::shared_ptr<Decryptor> data_decryptor = GetColumnDataDecryptor(
+        crypto_metadata.get(), file_metadata_->file_decryptor().get());
     ARROW_DCHECK_NE(meta_decryptor, nullptr);
     ARROW_DCHECK_NE(data_decryptor, nullptr);
 
@@ -290,7 +287,6 @@ class SerializedRowGroup : public RowGroupReader::Contents {
   ReaderProperties properties_;
   int row_group_ordinal_;
   const std::shared_ptr<const Buffer> prebuffered_column_chunks_bitmap_;
-  std::shared_ptr<InternalFileDecryptor> file_decryptor_;
 };
 
 // ----------------------------------------------------------------------
@@ -315,7 +311,9 @@ class SerializedFile : public ParquetFileReader::Contents {
   }
 
   void Close() override {
-    if (file_decryptor_) file_decryptor_->WipeOutDecryptionKeys();
+    if (file_metadata_ && file_metadata_->file_decryptor()) {
+      file_metadata_->file_decryptor()->WipeOutDecryptionKeys();
+    }
   }
 
   std::shared_ptr<RowGroupReader> GetRowGroup(int i) override {
@@ -329,7 +327,7 @@ class SerializedFile : public ParquetFileReader::Contents {
 
     std::unique_ptr<SerializedRowGroup> contents = std::make_unique<SerializedRowGroup>(
         source_, cached_source_, source_size_, file_metadata_.get(), i, properties_,
-        std::move(prebuffered_column_chunks_bitmap), file_decryptor_);
+        std::move(prebuffered_column_chunks_bitmap));
     return std::make_shared<RowGroupReader>(std::move(contents));
   }
 
@@ -345,8 +343,9 @@ class SerializedFile : public ParquetFileReader::Contents {
           "forget to call ParquetFileReader::Open() first?");
     }
     if (!page_index_reader_) {
-      page_index_reader_ = PageIndexReader::Make(source_.get(), file_metadata_,
-                                                 properties_, file_decryptor_.get());
+      page_index_reader_ =
+          PageIndexReader::Make(source_.get(), file_metadata_, properties_,
+                                file_metadata_->file_decryptor().get());
     }
     return page_index_reader_;
   }
@@ -361,8 +360,8 @@ class SerializedFile : public ParquetFileReader::Contents {
           "forget to call ParquetFileReader::Open() first?");
     }
     if (!bloom_filter_reader_) {
-      bloom_filter_reader_ =
-          BloomFilterReader::Make(source_, file_metadata_, properties_, file_decryptor_);
+      bloom_filter_reader_ = BloomFilterReader::Make(source_, file_metadata_, properties_,
+                                                     file_metadata_->file_decryptor());
       if (bloom_filter_reader_ == nullptr) {
         throw ParquetException("Cannot create BloomFilterReader");
       }
@@ -440,10 +439,12 @@ class SerializedFile : public ParquetFileReader::Contents {
     // Parse the footer depending on encryption type
     const bool is_encrypted_footer =
         memcmp(footer_buffer->data() + footer_read_size - 4, kParquetEMagic, 4) == 0;
+    std::shared_ptr<InternalFileDecryptor> file_decryptor;
     if (is_encrypted_footer) {
       // Encrypted file with Encrypted footer.
       const std::pair<int64_t, uint32_t> read_size =
-          ParseMetaDataOfEncryptedFileWithEncryptedFooter(metadata_buffer, metadata_len);
+          ParseMetaDataOfEncryptedFileWithEncryptedFooter(metadata_buffer, metadata_len,
+                                                          &file_decryptor);
       // Read the actual footer
       metadata_start = read_size.first;
       metadata_len = read_size.second;
@@ -452,8 +453,8 @@ class SerializedFile : public ParquetFileReader::Contents {
       // Fall through
     }
 
-    const uint32_t read_metadata_len =
-        ParseUnencryptedFileMetadata(metadata_buffer, metadata_len);
+    const uint32_t read_metadata_len = ParseUnencryptedFileMetadata(
+        metadata_buffer, metadata_len, std::move(file_decryptor));
     auto file_decryption_properties = properties_.file_decryption_properties().get();
     if (is_encrypted_footer) {
       // Nothing else to do here.
@@ -549,34 +550,37 @@ class SerializedFile : public ParquetFileReader::Contents {
     // Parse the footer depending on encryption type
     const bool is_encrypted_footer =
         memcmp(footer_buffer->data() + footer_read_size - 4, kParquetEMagic, 4) == 0;
+    std::shared_ptr<InternalFileDecryptor> file_decryptor;
     if (is_encrypted_footer) {
       // Encrypted file with Encrypted footer.
       std::pair<int64_t, uint32_t> read_size;
       BEGIN_PARQUET_CATCH_EXCEPTIONS
-      read_size =
-          ParseMetaDataOfEncryptedFileWithEncryptedFooter(metadata_buffer, metadata_len);
+      read_size = ParseMetaDataOfEncryptedFileWithEncryptedFooter(
+          metadata_buffer, metadata_len, &file_decryptor);
       END_PARQUET_CATCH_EXCEPTIONS
       // Read the actual footer
       int64_t metadata_start = read_size.first;
       metadata_len = read_size.second;
       return source_->ReadAsync(metadata_start, metadata_len)
-          .Then([this, metadata_len, is_encrypted_footer](
+          .Then([this, metadata_len, is_encrypted_footer, file_decryptor](
                     const std::shared_ptr<::arrow::Buffer>& metadata_buffer) {
             // Continue and read the file footer
-            return ParseMetaDataFinal(metadata_buffer, metadata_len, is_encrypted_footer);
+            return ParseMetaDataFinal(metadata_buffer, metadata_len, is_encrypted_footer,
+                                      file_decryptor);
           });
     }
     return ParseMetaDataFinal(std::move(metadata_buffer), metadata_len,
-                              is_encrypted_footer);
+                              is_encrypted_footer, std::move(file_decryptor));
   }
 
   // Continuation
-  ::arrow::Status ParseMetaDataFinal(std::shared_ptr<::arrow::Buffer> metadata_buffer,
-                                     uint32_t metadata_len,
-                                     const bool is_encrypted_footer) {
+  ::arrow::Status ParseMetaDataFinal(
+      std::shared_ptr<::arrow::Buffer> metadata_buffer, uint32_t metadata_len,
+      const bool is_encrypted_footer,
+      std::shared_ptr<InternalFileDecryptor> file_decryptor) {
     BEGIN_PARQUET_CATCH_EXCEPTIONS
-    const uint32_t read_metadata_len =
-        ParseUnencryptedFileMetadata(metadata_buffer, metadata_len);
+    const uint32_t read_metadata_len = ParseUnencryptedFileMetadata(
+        metadata_buffer, metadata_len, std::move(file_decryptor));
     auto file_decryption_properties = properties_.file_decryption_properties().get();
     if (is_encrypted_footer) {
       // Nothing else to do here.
@@ -607,11 +611,11 @@ class SerializedFile : public ParquetFileReader::Contents {
   // Maps row group ordinal and prebuffer status of its column chunks in the form of a
   // bitmap buffer.
   std::unordered_map<int, std::shared_ptr<Buffer>> prebuffered_column_chunks_;
-  std::shared_ptr<InternalFileDecryptor> file_decryptor_;
 
   // \return The true length of the metadata in bytes
-  uint32_t ParseUnencryptedFileMetadata(const std::shared_ptr<Buffer>& footer_buffer,
-                                        const uint32_t metadata_len);
+  uint32_t ParseUnencryptedFileMetadata(
+      const std::shared_ptr<Buffer>& footer_buffer, const uint32_t metadata_len,
+      std::shared_ptr<InternalFileDecryptor> file_decryptor);
 
   std::string HandleAadPrefix(FileDecryptionProperties* file_decryption_properties,
                               EncryptionAlgorithm& algo);
@@ -623,11 +627,13 @@ class SerializedFile : public ParquetFileReader::Contents {
 
   // \return The position and size of the actual footer
   std::pair<int64_t, uint32_t> ParseMetaDataOfEncryptedFileWithEncryptedFooter(
-      const std::shared_ptr<Buffer>& crypto_metadata_buffer, uint32_t footer_len);
+      const std::shared_ptr<Buffer>& crypto_metadata_buffer, uint32_t footer_len,
+      std::shared_ptr<InternalFileDecryptor>* file_decryptor);
 };
 
 uint32_t SerializedFile::ParseUnencryptedFileMetadata(
-    const std::shared_ptr<Buffer>& metadata_buffer, const uint32_t metadata_len) {
+    const std::shared_ptr<Buffer>& metadata_buffer, const uint32_t metadata_len,
+    std::shared_ptr<InternalFileDecryptor> file_decryptor) {
   if (metadata_buffer->size() != metadata_len) {
     throw ParquetException("Failed reading metadata buffer (requested " +
                            std::to_string(metadata_len) + " bytes but got " +
@@ -636,7 +642,7 @@ uint32_t SerializedFile::ParseUnencryptedFileMetadata(
   uint32_t read_metadata_len = metadata_len;
   // The encrypted read path falls through to here, so pass in the decryptor
   file_metadata_ = FileMetaData::Make(metadata_buffer->data(), &read_metadata_len,
-                                      properties_, file_decryptor_);
+                                      properties_, std::move(file_decryptor));
   return read_metadata_len;
 }
 
@@ -644,7 +650,7 @@ std::pair<int64_t, uint32_t>
 SerializedFile::ParseMetaDataOfEncryptedFileWithEncryptedFooter(
     const std::shared_ptr<::arrow::Buffer>& crypto_metadata_buffer,
     // both metadata & crypto metadata length
-    const uint32_t footer_len) {
+    const uint32_t footer_len, std::shared_ptr<InternalFileDecryptor>* file_decryptor) {
   // encryption with encrypted footer
   // Check if the footer_buffer contains the entire metadata
   if (crypto_metadata_buffer->size() != footer_len) {
@@ -663,7 +669,7 @@ SerializedFile::ParseMetaDataOfEncryptedFileWithEncryptedFooter(
   // Handle AAD prefix
   EncryptionAlgorithm algo = file_crypto_metadata->encryption_algorithm();
   std::string file_aad = HandleAadPrefix(file_decryption_properties, algo);
-  file_decryptor_ = std::make_shared<InternalFileDecryptor>(
+  *file_decryptor = std::make_shared<InternalFileDecryptor>(
       file_decryption_properties, file_aad, algo.algorithm,
       file_crypto_metadata->key_metadata(), properties_.memory_pool());
 
@@ -682,12 +688,12 @@ void SerializedFile::ParseMetaDataOfEncryptedFileWithPlaintextFooter(
     EncryptionAlgorithm algo = file_metadata_->encryption_algorithm();
     // Handle AAD prefix
     std::string file_aad = HandleAadPrefix(file_decryption_properties, algo);
-    file_decryptor_ = std::make_shared<InternalFileDecryptor>(
+    auto file_decryptor = std::make_shared<InternalFileDecryptor>(
         file_decryption_properties, file_aad, algo.algorithm,
         file_metadata_->footer_signing_key_metadata(), properties_.memory_pool());
     // set the InternalFileDecryptor in the metadata as well, as it's used
     // for signature verification and for ColumnChunkMetaData creation.
-    file_metadata_->set_file_decryptor(file_decryptor_);
+    file_metadata_->set_file_decryptor(std::move(file_decryptor));
 
     if (file_decryption_properties->check_plaintext_footer_integrity()) {
       if (metadata_len - read_metadata_len !=
diff --git a/cpp/src/parquet/file_writer.h b/cpp/src/parquet/file_writer.h
index 31706af86dbde..d5ea1d7c98a0e 100644
--- a/cpp/src/parquet/file_writer.h
+++ b/cpp/src/parquet/file_writer.h
@@ -202,7 +202,7 @@ class PARQUET_EXPORT ParquetFileWriter {
 
   /// \brief Add key-value metadata to the file.
   /// \param[in] key_value_metadata the metadata to add.
-  /// \note This will overwrite any existing metadata with the same key.
+  /// \note This will overwrite any existing metadata with the same key(s).
   /// \throw ParquetException if Close() has been called.
   void AddKeyValueMetadata(
       const std::shared_ptr<const KeyValueMetadata>& key_value_metadata);
diff --git a/cpp/src/parquet/metadata.cc b/cpp/src/parquet/metadata.cc
index 3f101b5ae3ac6..b24883cdc160b 100644
--- a/cpp/src/parquet/metadata.cc
+++ b/cpp/src/parquet/metadata.cc
@@ -826,6 +826,10 @@ class FileMetaData::FileMetaDataImpl {
     file_decryptor_ = std::move(file_decryptor);
   }
 
+  const std::shared_ptr<InternalFileDecryptor>& file_decryptor() const {
+    return file_decryptor_;
+  }
+
  private:
   friend FileMetaDataBuilder;
   uint32_t metadata_len_ = 0;
@@ -947,6 +951,10 @@ void FileMetaData::set_file_decryptor(
   impl_->set_file_decryptor(std::move(file_decryptor));
 }
 
+const std::shared_ptr<InternalFileDecryptor>& FileMetaData::file_decryptor() const {
+  return impl_->file_decryptor();
+}
+
 ParquetVersion::type FileMetaData::version() const {
   switch (impl_->version()) {
     case 1:
diff --git a/cpp/src/parquet/metadata.h b/cpp/src/parquet/metadata.h
index 640b898024346..9fc30df58e0d3 100644
--- a/cpp/src/parquet/metadata.h
+++ b/cpp/src/parquet/metadata.h
@@ -399,12 +399,14 @@ class PARQUET_EXPORT FileMetaData {
  private:
   friend FileMetaDataBuilder;
   friend class SerializedFile;
+  friend class SerializedRowGroup;
 
   explicit FileMetaData(const void* serialized_metadata, uint32_t* metadata_len,
                         const ReaderProperties& properties,
                         std::shared_ptr<InternalFileDecryptor> file_decryptor = NULLPTR);
 
   void set_file_decryptor(std::shared_ptr<InternalFileDecryptor> file_decryptor);
+  const std::shared_ptr<InternalFileDecryptor>& file_decryptor() const;
 
   // PIMPL Idiom
   FileMetaData();
diff --git a/cpp/src/parquet/metadata_benchmark.cc b/cpp/src/parquet/metadata_benchmark.cc
new file mode 100644
index 0000000000000..97a99be798cbb
--- /dev/null
+++ b/cpp/src/parquet/metadata_benchmark.cc
@@ -0,0 +1,156 @@
+// 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.
+
+#include <memory>
+#include <sstream>
+
+#include <benchmark/benchmark.h>
+
+#include "arrow/buffer.h"
+#include "arrow/io/memory.h"
+#include "arrow/util/logging.h"
+
+#include "parquet/column_writer.h"
+#include "parquet/file_reader.h"
+#include "parquet/file_writer.h"
+#include "parquet/metadata.h"
+#include "parquet/platform.h"
+#include "parquet/schema.h"
+
+namespace parquet {
+
+using ::arrow::Buffer;
+using ::arrow::io::BufferOutputStream;
+using ::arrow::io::BufferReader;
+using schema::GroupNode;
+using schema::NodePtr;
+using schema::NodeVector;
+
+class MetadataBenchmark {
+ public:
+  explicit MetadataBenchmark(benchmark::State* state)
+      : MetadataBenchmark(static_cast<int>(state->range(0)),
+                          static_cast<int>(state->range(1))) {}
+
+  MetadataBenchmark(int num_columns, int num_row_groups)
+      : num_columns_(num_columns), num_row_groups_(num_row_groups) {
+    NodeVector fields;
+    for (int i = 0; i < num_columns_; ++i) {
+      std::stringstream ss;
+      ss << "col" << i;
+      fields.push_back(parquet::schema::Int32(ss.str(), Repetition::REQUIRED));
+    }
+    schema_root_ = std::static_pointer_cast<GroupNode>(
+        GroupNode::Make("schema", Repetition::REQUIRED, fields));
+
+    WriterProperties::Builder prop_builder;
+    writer_properties_ = prop_builder.version(ParquetVersion::PARQUET_2_6)
+                             ->disable_dictionary()
+                             ->data_page_version(ParquetDataPageVersion::V2)
+                             ->build();
+  }
+
+  std::shared_ptr<Buffer> WriteFile(benchmark::State* state) {
+    PARQUET_ASSIGN_OR_THROW(auto sink, BufferOutputStream::Create());
+
+    auto writer = ParquetFileWriter::Open(sink, schema_root_, writer_properties_);
+    std::vector<int32_t> int32_values(1, 42);
+    int64_t data_size = 0;
+    for (int rg = 0; rg < num_row_groups_; ++rg) {
+      auto row_group_writer = writer->AppendRowGroup();
+      for (int col = 0; col < num_columns_; ++col) {
+        auto col_writer = row_group_writer->NextColumn();
+        ARROW_CHECK_EQ(col_writer->type(), Type::INT32);
+        auto typed_col_writer = static_cast<Int32Writer*>(col_writer);
+        typed_col_writer->WriteBatch(
+            /*num_values=*/static_cast<int64_t>(int32_values.size()),
+            /*def_levels=*/nullptr, /*rep_levels=*/nullptr, int32_values.data());
+        typed_col_writer->Close();
+      }
+      row_group_writer->Close();
+      data_size += row_group_writer->total_compressed_bytes_written();
+    }
+    writer->Close();
+    PARQUET_ASSIGN_OR_THROW(auto buf, sink->Finish());
+    state->counters["file_size"] = static_cast<double>(buf->size());
+    // Note that "data_size" includes the Thrift page headers
+    state->counters["data_size"] = static_cast<double>(data_size);
+    return buf;
+  }
+
+  void ReadFile(std::shared_ptr<Buffer> contents) {
+    auto source = std::make_shared<BufferReader>(contents);
+    ReaderProperties props;
+    auto reader = ParquetFileReader::Open(source, props);
+    auto metadata = reader->metadata();
+    ARROW_CHECK_EQ(metadata->num_columns(), num_columns_);
+    ARROW_CHECK_EQ(metadata->num_row_groups(), num_row_groups_);
+    // There should be one row per row group
+    ARROW_CHECK_EQ(metadata->num_rows(), num_row_groups_);
+    reader->Close();
+  }
+
+ private:
+  int num_columns_;
+  int num_row_groups_;
+  std::shared_ptr<GroupNode> schema_root_;
+  std::shared_ptr<WriterProperties> writer_properties_;
+};
+
+void WriteMetadataSetArgs(benchmark::internal::Benchmark* bench) {
+  bench->ArgNames({"num_columns", "num_row_groups"});
+
+  for (int num_columns : {1, 10, 100}) {
+    for (int num_row_groups : {1, 100, 1000}) {
+      bench->Args({num_columns, num_row_groups});
+    }
+  }
+  /* For larger num_columns, restrict num_row_groups to small values
+   * to avoid blowing up benchmark execution time.
+   */
+  for (int num_row_groups : {1, 100}) {
+    bench->Args({/*num_columns=*/1000, num_row_groups});
+  }
+}
+
+void ReadMetadataSetArgs(benchmark::internal::Benchmark* bench) {
+  WriteMetadataSetArgs(bench);
+}
+
+void WriteFileMetadataAndData(benchmark::State& state) {
+  MetadataBenchmark benchmark(&state);
+
+  for (auto _ : state) {
+    auto sink = benchmark.WriteFile(&state);
+  }
+  state.SetItemsProcessed(state.iterations());
+}
+
+void ReadFileMetadata(benchmark::State& state) {
+  MetadataBenchmark benchmark(&state);
+  auto contents = benchmark.WriteFile(&state);
+
+  for (auto _ : state) {
+    benchmark.ReadFile(contents);
+  }
+  state.SetItemsProcessed(state.iterations());
+}
+
+BENCHMARK(WriteFileMetadataAndData)->Apply(WriteMetadataSetArgs);
+BENCHMARK(ReadFileMetadata)->Apply(ReadMetadataSetArgs);
+
+}  // namespace parquet
diff --git a/cpp/src/parquet/platform.cc b/cpp/src/parquet/platform.cc
index 5c355c28be1c3..98946029fb866 100644
--- a/cpp/src/parquet/platform.cc
+++ b/cpp/src/parquet/platform.cc
@@ -35,7 +35,7 @@ std::shared_ptr<::arrow::io::BufferOutputStream> CreateOutputStream(MemoryPool*
 
 std::shared_ptr<ResizableBuffer> AllocateBuffer(MemoryPool* pool, int64_t size) {
   PARQUET_ASSIGN_OR_THROW(auto result, ::arrow::AllocateResizableBuffer(size, pool));
-  return std::move(result);
+  return result;
 }
 
 }  // namespace parquet
diff --git a/cpp/src/parquet/printer.cc b/cpp/src/parquet/printer.cc
index ce194f897e44d..33df5925a1cf1 100644
--- a/cpp/src/parquet/printer.cc
+++ b/cpp/src/parquet/printer.cc
@@ -246,7 +246,8 @@ void ParquetFilePrinter::JSONPrint(std::ostream& stream, std::list<int> selected
     const ColumnDescriptor* descr = file_metadata->schema()->Column(i);
     stream << "     { \"Id\": \"" << i << "\","
            << " \"Name\": \"" << descr->path()->ToDotString() << "\","
-           << " \"PhysicalType\": \"" << TypeToString(descr->physical_type()) << "\","
+           << " \"PhysicalType\": \""
+           << TypeToString(descr->physical_type(), descr->type_length()) << "\","
            << " \"ConvertedType\": \"" << ConvertedTypeToString(descr->converted_type())
            << "\","
            << " \"LogicalType\": " << (descr->logical_type())->ToJSON() << " }";
diff --git a/cpp/src/parquet/properties.cc b/cpp/src/parquet/properties.cc
index 2267efdf8a44a..4e6c558e064d4 100644
--- a/cpp/src/parquet/properties.cc
+++ b/cpp/src/parquet/properties.cc
@@ -38,7 +38,7 @@ std::shared_ptr<ArrowInputStream> ReaderProperties::GetStream(
     PARQUET_ASSIGN_OR_THROW(
         auto stream, ::arrow::io::BufferedInputStream::Create(buffer_size_, pool_,
                                                               safe_stream, num_bytes));
-    return std::move(stream);
+    return stream;
   } else {
     PARQUET_ASSIGN_OR_THROW(auto data, source->ReadAt(start, num_bytes));
 
diff --git a/cpp/src/parquet/reader_test.cc b/cpp/src/parquet/reader_test.cc
index ea5f133d890d3..f947a7df010b0 100644
--- a/cpp/src/parquet/reader_test.cc
+++ b/cpp/src/parquet/reader_test.cc
@@ -1077,7 +1077,24 @@ Column 1
   ASSERT_EQ(header_output + dump_output, ss_dump.str());
 }
 
-TEST(TestJSONWithLocalFile, JSONOutput) {
+class TestJSONWithLocalFile : public ::testing::Test {
+ public:
+  static std::string ReadFromLocalFile(std::string_view local_file_name) {
+    std::stringstream ss;
+    // empty list means print all
+    std::list<int> columns;
+
+    auto reader =
+        ParquetFileReader::OpenFile(data_file(local_file_name.data()),
+                                    /*memory_map=*/false, default_reader_properties());
+    ParquetFilePrinter printer(reader.get());
+    printer.JSONPrint(ss, columns, local_file_name.data());
+
+    return ss.str();
+  }
+};
+
+TEST_F(TestJSONWithLocalFile, JSONOutput) {
   std::string json_output = R"###({
   "FileName": "alltypes_plain.parquet",
   "Version": "1.0",
@@ -1131,16 +1148,28 @@ TEST(TestJSONWithLocalFile, JSONOutput) {
 }
 )###";
 
-  std::stringstream ss;
-  // empty list means print all
-  std::list<int> columns;
+  std::string json_content = ReadFromLocalFile("alltypes_plain.parquet");
+  ASSERT_EQ(json_output, json_content);
+}
 
-  auto reader =
-      ParquetFileReader::OpenFile(alltypes_plain(), false, default_reader_properties());
-  ParquetFilePrinter printer(reader.get());
-  printer.JSONPrint(ss, columns, "alltypes_plain.parquet");
+TEST_F(TestJSONWithLocalFile, JSONOutputFLBA) {
+  // min-max stats for FLBA contains non-utf8 output, so we don't check
+  // the whole json output.
+  std::string json_content = ReadFromLocalFile("fixed_length_byte_array.parquet");
+
+  std::string json_contains = R"###({
+  "FileName": "fixed_length_byte_array.parquet",
+  "Version": "1.0",
+  "CreatedBy": "parquet-mr version 1.13.0-SNAPSHOT (build d057b39d93014fe40f5067ee4a33621e65c91552)",
+  "TotalRows": "1000",
+  "NumberOfRowGroups": "1",
+  "NumberOfRealColumns": "1",
+  "NumberOfColumns": "1",
+  "Columns": [
+     { "Id": "0", "Name": "flba_field", "PhysicalType": "FIXED_LEN_BYTE_ARRAY(4)", "ConvertedType": "NONE", "LogicalType": {"Type": "None"} }
+  ])###";
 
-  ASSERT_EQ(json_output, ss.str());
+  EXPECT_THAT(json_content, testing::HasSubstr(json_contains));
 }
 
 TEST(TestFileReader, BufferedReadsWithDictionary) {
diff --git a/cpp/src/parquet/thrift_internal.h b/cpp/src/parquet/thrift_internal.h
index 7491f118d32a0..9e02331b44ba0 100644
--- a/cpp/src/parquet/thrift_internal.h
+++ b/cpp/src/parquet/thrift_internal.h
@@ -446,13 +446,12 @@ class ThriftDeserializer {
                                      T* deserialized_msg) {
     // Deserialize msg bytes into c++ thrift msg using memory transport.
     auto tmem_transport = CreateReadOnlyMemoryBuffer(const_cast<uint8_t*>(buf), *len);
-    apache::thrift::protocol::TCompactProtocolFactoryT<ThriftBuffer> tproto_factory;
-    // Protect against CPU and memory bombs
-    tproto_factory.setStringSizeLimit(string_size_limit_);
-    tproto_factory.setContainerSizeLimit(container_size_limit_);
-    auto tproto = tproto_factory.getProtocol(tmem_transport);
+    auto tproto = apache::thrift::protocol::TCompactProtocolT<ThriftBuffer>(
+        tmem_transport, string_size_limit_, container_size_limit_);
     try {
-      deserialized_msg->read(tproto.get());
+      deserialized_msg
+          ->template read<apache::thrift::protocol::TCompactProtocolT<ThriftBuffer>>(
+              &tproto);
     } catch (std::exception& e) {
       std::stringstream ss;
       ss << "Couldn't deserialize thrift: " << e.what() << "\n";
diff --git a/cpp/src/parquet/types.h b/cpp/src/parquet/types.h
index 38529bceae85f..70a1c4b73ec45 100644
--- a/cpp/src/parquet/types.h
+++ b/cpp/src/parquet/types.h
@@ -811,4 +811,10 @@ PARQUET_EXPORT SortOrder::type GetSortOrder(ConvertedType::type converted,
 PARQUET_EXPORT SortOrder::type GetSortOrder(
     const std::shared_ptr<const LogicalType>& logical_type, Type::type primitive);
 
+// PLAIN_DICTIONARY is deprecated but used to be used as a dictionary index
+// encoding.
+constexpr bool IsDictionaryIndexEncoding(Encoding::type e) {
+  return e == Encoding::RLE_DICTIONARY || e == Encoding::PLAIN_DICTIONARY;
+}
+
 }  // namespace parquet
diff --git a/cpp/src/skyhook/cls/cls_skyhook.cc b/cpp/src/skyhook/cls/cls_skyhook.cc
index 24f80c79d5730..632b82f1d1a6c 100644
--- a/cpp/src/skyhook/cls/cls_skyhook.cc
+++ b/cpp/src/skyhook/cls/cls_skyhook.cc
@@ -84,7 +84,7 @@ class RandomAccessObject : public arrow::io::RandomAccessFile {
 
     if (nbytes > 0) {
       std::shared_ptr<ceph::bufferlist> bl = std::make_shared<ceph::bufferlist>();
-      cls_cxx_read(hctx_, position, nbytes, bl.get());
+      cls_cxx_read(hctx_, static_cast<int>(position), static_cast<int>(nbytes), bl.get());
       chunks_.push_back(bl);
       return std::make_shared<arrow::Buffer>((uint8_t*)bl->c_str(), bl->length());
     }
@@ -95,7 +95,7 @@ class RandomAccessObject : public arrow::io::RandomAccessFile {
   arrow::Result<std::shared_ptr<arrow::Buffer>> Read(int64_t nbytes) override {
     ARROW_ASSIGN_OR_RAISE(auto buffer, ReadAt(pos_, nbytes));
     pos_ += buffer->size();
-    return std::move(buffer);
+    return buffer;
   }
 
   /// Read a specified number of bytes from the current position into an output stream.
diff --git a/cpp/src/skyhook/protocol/skyhook_protocol.cc b/cpp/src/skyhook/protocol/skyhook_protocol.cc
index 3b1234c6ed913..b91a9bfdd2ecb 100644
--- a/cpp/src/skyhook/protocol/skyhook_protocol.cc
+++ b/cpp/src/skyhook/protocol/skyhook_protocol.cc
@@ -106,7 +106,8 @@ arrow::Status SerializeTable(const std::shared_ptr<arrow::Table>& table,
   ARROW_RETURN_NOT_OK(writer->Close());
 
   ARROW_ASSIGN_OR_RAISE(auto buffer, buffer_output_stream->Finish());
-  bl->append(reinterpret_cast<const char*>(buffer->data()), buffer->size());
+  bl->append(reinterpret_cast<const char*>(buffer->data()),
+             static_cast<unsigned int>(buffer->size()));
   return arrow::Status::OK();
 }
 
diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt
index 4093b0ec43efd..f080cf58bca85 100644
--- a/cpp/thirdparty/versions.txt
+++ b/cpp/thirdparty/versions.txt
@@ -86,8 +86,8 @@ ARROW_MIMALLOC_BUILD_VERSION=v2.0.6
 ARROW_MIMALLOC_BUILD_SHA256_CHECKSUM=9f05c94cc2b017ed13698834ac2a3567b6339a8bde27640df5a1581d49d05ce5
 ARROW_NLOHMANN_JSON_BUILD_VERSION=v3.10.5
 ARROW_NLOHMANN_JSON_BUILD_SHA256_CHECKSUM=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4
-ARROW_OPENTELEMETRY_BUILD_VERSION=v1.8.1
-ARROW_OPENTELEMETRY_BUILD_SHA256_CHECKSUM=3d640201594b07f08dade9cd1017bd0b59674daca26223b560b9bb6bf56264c2
+ARROW_OPENTELEMETRY_BUILD_VERSION=v1.13.0
+ARROW_OPENTELEMETRY_BUILD_SHA256_CHECKSUM=7735cc56507149686e6019e06f588317099d4522480be5f38a2a09ec69af1706
 ARROW_OPENTELEMETRY_PROTO_BUILD_VERSION=v0.17.0
 ARROW_OPENTELEMETRY_PROTO_BUILD_SHA256_CHECKSUM=f269fbcb30e17b03caa1decd231ce826e59d7651c0f71c3b28eb5140b4bb5412
 ARROW_ORC_BUILD_VERSION=2.0.0
@@ -103,8 +103,8 @@ ARROW_RE2_BUILD_VERSION=2022-06-01
 ARROW_RE2_BUILD_SHA256_CHECKSUM=f89c61410a072e5cbcf8c27e3a778da7d6fd2f2b5b1445cd4f4508bee946ab0f
 ARROW_SNAPPY_BUILD_VERSION=1.1.10
 ARROW_SNAPPY_BUILD_SHA256_CHECKSUM=49d831bffcc5f3d01482340fe5af59852ca2fe76c3e05df0e67203ebbe0f1d90
-ARROW_SUBSTRAIT_BUILD_VERSION=v0.27.0
-ARROW_SUBSTRAIT_BUILD_SHA256_CHECKSUM=4ed375f69d972a57fdc5ec406c17003a111831d8640d3f1733eccd4b3ff45628
+ARROW_SUBSTRAIT_BUILD_VERSION=v0.44.0
+ARROW_SUBSTRAIT_BUILD_SHA256_CHECKSUM=f989a862f694e7dbb695925ddb7c4ce06aa6c51aca945105c075139aed7e55a2
 ARROW_S2N_TLS_BUILD_VERSION=v1.3.35
 ARROW_S2N_TLS_BUILD_SHA256_CHECKSUM=9d32b26e6bfcc058d98248bf8fc231537e347395dd89cf62bb432b55c5da990d
 ARROW_THRIFT_BUILD_VERSION=0.16.0
@@ -113,8 +113,8 @@ ARROW_UCX_BUILD_VERSION=1.12.1
 ARROW_UCX_BUILD_SHA256_CHECKSUM=9bef31aed0e28bf1973d28d74d9ac4f8926c43ca3b7010bd22a084e164e31b71
 ARROW_UTF8PROC_BUILD_VERSION=v2.7.0
 ARROW_UTF8PROC_BUILD_SHA256_CHECKSUM=4bb121e297293c0fd55f08f83afab6d35d48f0af4ecc07523ad8ec99aa2b12a1
-ARROW_XSIMD_BUILD_VERSION=9.0.1
-ARROW_XSIMD_BUILD_SHA256_CHECKSUM=b1bb5f92167fd3a4f25749db0be7e61ed37e0a5d943490f3accdcd2cd2918cc0
+ARROW_XSIMD_BUILD_VERSION=13.0.0
+ARROW_XSIMD_BUILD_SHA256_CHECKSUM=8bdbbad0c3e7afa38d88d0d484d70a1671a1d8aefff03f4223ab2eb6a41110a3
 ARROW_ZLIB_BUILD_VERSION=1.3.1
 ARROW_ZLIB_BUILD_SHA256_CHECKSUM=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
 ARROW_ZSTD_BUILD_VERSION=1.5.6
@@ -144,7 +144,7 @@ DEPENDENCIES=(
   "ARROW_BOOST_URL boost-${ARROW_BOOST_BUILD_VERSION}.tar.gz https://apache.jfrog.io/artifactory/arrow/thirdparty/7.0.0/boost_${ARROW_BOOST_BUILD_VERSION//./_}.tar.gz"
   "ARROW_BROTLI_URL brotli-${ARROW_BROTLI_BUILD_VERSION}.tar.gz https://github.com/google/brotli/archive/${ARROW_BROTLI_BUILD_VERSION}.tar.gz"
   "ARROW_BZIP2_URL bzip2-${ARROW_BZIP2_BUILD_VERSION}.tar.gz https://sourceware.org/pub/bzip2/bzip2-${ARROW_BZIP2_BUILD_VERSION}.tar.gz"
-  "ARROW_CARES_URL cares-${ARROW_CARES_BUILD_VERSION}.tar.gz https://c-ares.haxx.se/download/c-ares-${ARROW_CARES_BUILD_VERSION}.tar.gz"
+  "ARROW_CARES_URL cares-${ARROW_CARES_BUILD_VERSION}.tar.gz https://github.com/c-ares/c-ares/releases/download/cares-${ARROW_CARES_BUILD_VERSION//./_}/c-ares-${ARROW_CARES_BUILD_VERSION}.tar.gz"
   "ARROW_CRC32C_URL crc32c-${ARROW_CRC32C_BUILD_VERSION}.tar.gz https://github.com/google/crc32c/archive/refs/tags/${ARROW_CRC32C_BUILD_VERSION}.tar.gz"
   "ARROW_GBENCHMARK_URL gbenchmark-${ARROW_GBENCHMARK_BUILD_VERSION}.tar.gz https://github.com/google/benchmark/archive/${ARROW_GBENCHMARK_BUILD_VERSION}.tar.gz"
   "ARROW_GFLAGS_URL gflags-${ARROW_GFLAGS_BUILD_VERSION}.tar.gz https://github.com/gflags/gflags/archive/${ARROW_GFLAGS_BUILD_VERSION}.tar.gz"
diff --git a/cpp/vcpkg.json b/cpp/vcpkg.json
index a0f0aa1008dcd..f087a6d24c8f9 100644
--- a/cpp/vcpkg.json
+++ b/cpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "arrow",
-  "version-string": "16.0.0-SNAPSHOT",
+  "version-string": "17.0.0-SNAPSHOT",
   "dependencies": [
     "abseil",
     {
diff --git a/csharp/Directory.Build.props b/csharp/Directory.Build.props
index c759c49b395d8..3c06d3cd31d90 100644
--- a/csharp/Directory.Build.props
+++ b/csharp/Directory.Build.props
@@ -29,7 +29,7 @@
     <Product>Apache Arrow library</Product>
     <Copyright>Copyright 2016-2024 The Apache Software Foundation</Copyright>
     <Company>The Apache Software Foundation</Company>
-    <Version>16.0.0-SNAPSHOT</Version>
+    <Version>17.0.0-SNAPSHOT</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -37,12 +37,13 @@
     <LangVersion>latest</LangVersion>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(CSharpDir)ApacheArrow.snk</AssemblyOriginatorKeyFile>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <!-- NuGet properties -->
   <PropertyGroup>
     <Authors>The Apache Software Foundation</Authors>
-    <PackageIconUrl>https://www.apache.org/images/feather.png</PackageIconUrl>
+    <PackageIcon>feather.png</PackageIcon>
     <!-- We can't use PackageLicenseExpression; the license file also contains 3rd-party notices. -->
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageProjectUrl>https://arrow.apache.org/</PackageProjectUrl>
@@ -55,6 +56,7 @@
 
   <ItemGroup Condition="'$(IsPackable)' == 'true'">
     <Content Include="$(RepoRoot)LICENSE.txt" Pack="true" PackagePath="" />
+    <Content Include="$(CSharpDir)/feather.png" Link="feather.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
 </Project>
diff --git a/csharp/examples/FlightAspServerExample/FlightAspServerExample.csproj b/csharp/examples/FlightAspServerExample/FlightAspServerExample.csproj
index 98e8bb324c727..79312520ba8c0 100644
--- a/csharp/examples/FlightAspServerExample/FlightAspServerExample.csproj
+++ b/csharp/examples/FlightAspServerExample/FlightAspServerExample.csproj
@@ -20,7 +20,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>10</LangVersion>
diff --git a/csharp/examples/FlightClientExample/FlightClientExample.csproj b/csharp/examples/FlightClientExample/FlightClientExample.csproj
index 228c5cf4ea44c..ce0ec83359769 100644
--- a/csharp/examples/FlightClientExample/FlightClientExample.csproj
+++ b/csharp/examples/FlightClientExample/FlightClientExample.csproj
@@ -21,7 +21,7 @@
   
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/csharp/examples/FluentBuilderExample/FluentBuilderExample.csproj b/csharp/examples/FluentBuilderExample/FluentBuilderExample.csproj
index a7bd5392f007d..b1d76d4db00e0 100644
--- a/csharp/examples/FluentBuilderExample/FluentBuilderExample.csproj
+++ b/csharp/examples/FluentBuilderExample/FluentBuilderExample.csproj
@@ -2,7 +2,7 @@
   
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/csharp/feather.png b/csharp/feather.png
new file mode 100644
index 0000000000000..7b596e6683ddb
Binary files /dev/null and b/csharp/feather.png differ
diff --git a/csharp/src/Apache.Arrow.Compression/Apache.Arrow.Compression.csproj b/csharp/src/Apache.Arrow.Compression/Apache.Arrow.Compression.csproj
index 6988567193db4..b8f69672cbc7c 100644
--- a/csharp/src/Apache.Arrow.Compression/Apache.Arrow.Compression.csproj
+++ b/csharp/src/Apache.Arrow.Compression/Apache.Arrow.Compression.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.6" />
-    <PackageReference Include="ZstdSharp.Port" Version="0.7.3" />
+    <PackageReference Include="K4os.Compression.LZ4.Streams" Version="1.3.8" />
+    <PackageReference Include="ZstdSharp.Port" Version="0.8.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/csharp/src/Apache.Arrow.Flight.AspNetCore/Apache.Arrow.Flight.AspNetCore.csproj b/csharp/src/Apache.Arrow.Flight.AspNetCore/Apache.Arrow.Flight.AspNetCore.csproj
index 3fbd772db5ec6..2dd1d9d8f98e2 100644
--- a/csharp/src/Apache.Arrow.Flight.AspNetCore/Apache.Arrow.Flight.AspNetCore.csproj
+++ b/csharp/src/Apache.Arrow.Flight.AspNetCore/Apache.Arrow.Flight.AspNetCore.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.60.0" />
+    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.63.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/csharp/src/Apache.Arrow.Flight.Sql/Apache.Arrow.Flight.Sql.csproj b/csharp/src/Apache.Arrow.Flight.Sql/Apache.Arrow.Flight.Sql.csproj
index 9a3cf190cc376..ee6d42c8d17fc 100644
--- a/csharp/src/Apache.Arrow.Flight.Sql/Apache.Arrow.Flight.Sql.csproj
+++ b/csharp/src/Apache.Arrow.Flight.Sql/Apache.Arrow.Flight.Sql.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.Tools" Version="2.62.0" PrivateAssets="All" />
+    <PackageReference Include="Grpc.Tools" Version="2.64.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/csharp/src/Apache.Arrow.Flight/Apache.Arrow.Flight.csproj b/csharp/src/Apache.Arrow.Flight/Apache.Arrow.Flight.csproj
index bd6ae7ad22b42..be85bd3090e92 100644
--- a/csharp/src/Apache.Arrow.Flight/Apache.Arrow.Flight.csproj
+++ b/csharp/src/Apache.Arrow.Flight/Apache.Arrow.Flight.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.26.0" />
-    <PackageReference Include="Grpc.Net.Client" Version="2.59.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.62.0" PrivateAssets="All" />
+    <PackageReference Include="Google.Protobuf" Version="3.27.1" />
+    <PackageReference Include="Grpc.Net.Client" Version="2.63.0" />
+    <PackageReference Include="Grpc.Tools" Version="2.64.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
diff --git a/csharp/src/Apache.Arrow.Flight/Internal/FlightMessageSerializer.cs b/csharp/src/Apache.Arrow.Flight/Internal/FlightMessageSerializer.cs
index 9df28b5033c06..47ffe43d2457a 100644
--- a/csharp/src/Apache.Arrow.Flight/Internal/FlightMessageSerializer.cs
+++ b/csharp/src/Apache.Arrow.Flight/Internal/FlightMessageSerializer.cs
@@ -27,6 +27,7 @@ internal static class FlightMessageSerializer
     {
         public static Schema DecodeSchema(ReadOnlyMemory<byte> buffer)
         {
+            if (buffer.IsEmpty) return null;
             int bufferPosition = 0;
             int schemaMessageLength = BinaryPrimitives.ReadInt32LittleEndian(buffer.Span.Slice(bufferPosition));
             bufferPosition += sizeof(int);
diff --git a/csharp/src/Apache.Arrow/Apache.Arrow.csproj b/csharp/src/Apache.Arrow/Apache.Arrow.csproj
index c4bb64b73a9ed..034876a114b0b 100644
--- a/csharp/src/Apache.Arrow/Apache.Arrow.csproj
+++ b/csharp/src/Apache.Arrow/Apache.Arrow.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsWindows)'=='true'">
-    <TargetFrameworks>netstandard2.0;net6.0;net462</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0;net462</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(IsWindows)'!='true'">
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFramework)' == 'net462'">
diff --git a/csharp/src/Apache.Arrow/Arrays/Array.cs b/csharp/src/Apache.Arrow/Arrays/Array.cs
index 0838134b19c6d..4abe63e05ad83 100644
--- a/csharp/src/Apache.Arrow/Arrays/Array.cs
+++ b/csharp/src/Apache.Arrow/Arrays/Array.cs
@@ -31,7 +31,7 @@ protected Array(ArrayData data)
 
         public int Offset => Data.Offset;
 
-        public int NullCount => Data.NullCount;
+        public int NullCount => Data.GetNullCount();
 
         public ArrowBuffer NullBitmapBuffer => Data.Buffers[0];
 
diff --git a/csharp/src/Apache.Arrow/Arrays/ArrayData.cs b/csharp/src/Apache.Arrow/Arrays/ArrayData.cs
index 55d77f598c4e4..cdb6ed6b39418 100644
--- a/csharp/src/Apache.Arrow/Arrays/ArrayData.cs
+++ b/csharp/src/Apache.Arrow/Arrays/ArrayData.cs
@@ -15,7 +15,6 @@
 
 using Apache.Arrow.Memory;
 using Apache.Arrow.Types;
-using Google.FlatBuffers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -28,12 +27,30 @@ public sealed class ArrayData : IDisposable
 
         public readonly IArrowType DataType;
         public readonly int Length;
-        public readonly int NullCount;
+
+        /// <summary>
+        /// The number of null values in the Array. May be -1 if the null count has not been computed.
+        /// </summary>
+        public int NullCount;
+
         public readonly int Offset;
         public readonly ArrowBuffer[] Buffers;
         public readonly ArrayData[] Children;
         public readonly ArrayData Dictionary; // Only used for dictionary type
 
+        /// <summary>
+        /// Get the number of null values in the Array, computing the count if required.
+        /// </summary>
+        public int GetNullCount()
+        {
+            if (NullCount == RecalculateNullCount)
+            {
+                NullCount = ComputeNullCount();
+            }
+
+            return NullCount;
+        }
+
         // This is left for compatibility with lower version binaries
         // before the dictionary type was supported.
         public ArrayData(
@@ -111,7 +128,25 @@ public ArrayData Slice(int offset, int length)
             length = Math.Min(Length - offset, length);
             offset += Offset;
 
-            return new ArrayData(DataType, length, RecalculateNullCount, offset, Buffers, Children, Dictionary);
+            int nullCount;
+            if (NullCount == 0)
+            {
+                nullCount = 0;
+            }
+            else if (NullCount == Length)
+            {
+                nullCount = length;
+            }
+            else if (offset == Offset && length == Length)
+            {
+                nullCount = NullCount;
+            }
+            else
+            {
+                nullCount = RecalculateNullCount;
+            }
+
+            return new ArrayData(DataType, length, nullCount, offset, Buffers, Children, Dictionary);
         }
 
         public ArrayData Clone(MemoryAllocator allocator = default)
@@ -125,5 +160,24 @@ public ArrayData Clone(MemoryAllocator allocator = default)
                 Children?.Select(b => b.Clone(allocator))?.ToArray(),
                 Dictionary?.Clone(allocator));
         }
+
+        private int ComputeNullCount()
+        {
+            if (DataType.TypeId == ArrowTypeId.Union)
+            {
+                return UnionArray.ComputeNullCount(this);
+            }
+
+            if (Buffers == null || Buffers.Length == 0 || Buffers[0].IsEmpty)
+            {
+                return 0;
+            }
+
+            // Note: Dictionary arrays may be logically null if there is a null in the dictionary values,
+            // but this isn't accounted for by the IArrowArray.IsNull implementation,
+            // so we maintain consistency with that behaviour here.
+
+            return Length - BitUtility.CountBits(Buffers[0].Span, Offset, Length);
+        }
     }
 }
diff --git a/csharp/src/Apache.Arrow/Arrays/ArrayDataConcatenator.cs b/csharp/src/Apache.Arrow/Arrays/ArrayDataConcatenator.cs
index 698d74e4bac84..fe2543b70a108 100644
--- a/csharp/src/Apache.Arrow/Arrays/ArrayDataConcatenator.cs
+++ b/csharp/src/Apache.Arrow/Arrays/ArrayDataConcatenator.cs
@@ -71,7 +71,7 @@ public ArrayDataConcatenationVisitor(IReadOnlyList<ArrayData> arrayDataList, Mem
                 foreach (ArrayData arrayData in _arrayDataList)
                 {
                     _totalLength += arrayData.Length;
-                    _totalNullCount += arrayData.NullCount;
+                    _totalNullCount += arrayData.GetNullCount();
                 }
             }
 
@@ -107,38 +107,76 @@ public void Visit(ListViewType type)
             {
                 CheckData(type, 3);
                 ArrowBuffer validityBuffer = ConcatenateValidityBuffer();
+                ArrowBuffer sizesBuffer = ConcatenateFixedWidthTypeValueBuffer(2, Int32Type.Default);
 
+                var children = new List<ArrayData>(_arrayDataList.Count);
                 var offsetsBuilder = new ArrowBuffer.Builder<int>(_totalLength);
                 int baseOffset = 0;
 
                 foreach (ArrayData arrayData in _arrayDataList)
                 {
-                    if (arrayData.Length > 0)
+                    if (arrayData.Length == 0)
                     {
-                        ReadOnlySpan<int> span = arrayData.Buffers[1].Span.CastTo<int>().Slice(0, arrayData.Length);
-                        foreach (int offset in span)
-                        {
-                            offsetsBuilder.Append(baseOffset + offset);
-                        }
+                        continue;
                     }
 
-                    baseOffset += arrayData.Children[0].Length;
+                    var child = arrayData.Children[0];
+                    ReadOnlySpan<int> offsets = arrayData.Buffers[1].Span.CastTo<int>().Slice(arrayData.Offset, arrayData.Length);
+                    ReadOnlySpan<int> sizes = arrayData.Buffers[2].Span.CastTo<int>().Slice(arrayData.Offset, arrayData.Length);
+                    var minOffset = offsets[0];
+                    var maxEnd = 0;
+
+                    for (int i = 0; i < arrayData.Length; ++i)
+                    {
+                        minOffset = Math.Min(minOffset, offsets[i]);
+                        maxEnd = Math.Max(maxEnd, offsets[i] + sizes[i]);
+                    }
+
+                    foreach (int offset in offsets)
+                    {
+                        offsetsBuilder.Append(baseOffset + offset - minOffset);
+                    }
+
+                    var childLength = maxEnd - minOffset;
+                    if (minOffset != 0 || childLength != child.Length)
+                    {
+                        child = child.Slice(minOffset, childLength);
+                    }
+
+                    baseOffset += childLength;
+                    children.Add(child);
                 }
 
                 ArrowBuffer offsetBuffer = offsetsBuilder.Build(_allocator);
-                ArrowBuffer sizesBuffer = ConcatenateFixedWidthTypeValueBuffer(2, Int32Type.Default);
-                ArrayData child = Concatenate(SelectChildren(0), _allocator);
+                ArrayData combinedChild = Concatenate(children, _allocator);
 
-                Result = new ArrayData(type, _totalLength, _totalNullCount, 0, new ArrowBuffer[] { validityBuffer, offsetBuffer, sizesBuffer }, new[] { child });
+                Result = new ArrayData(type, _totalLength, _totalNullCount, 0, new ArrowBuffer[] { validityBuffer, offsetBuffer, sizesBuffer }, new[] { combinedChild });
             }
 
             public void Visit(FixedSizeListType type)
             {
                 CheckData(type, 1);
+                var listSize = type.ListSize;
                 ArrowBuffer validityBuffer = ConcatenateValidityBuffer();
-                ArrayData child = Concatenate(SelectChildren(0), _allocator);
 
-                Result = new ArrayData(type, _totalLength, _totalNullCount, 0, new ArrowBuffer[] { validityBuffer }, new[] { child });
+                var children = new List<ArrayData>(_arrayDataList.Count);
+
+                foreach (ArrayData arrayData in _arrayDataList)
+                {
+                    var offset = arrayData.Offset;
+                    var length = arrayData.Length;
+                    var child = arrayData.Children[0];
+                    if (offset != 0 || child.Length != length * listSize)
+                    {
+                        child = child.Slice(offset * listSize, length * listSize);
+                    }
+
+                    children.Add(child);
+                }
+
+                ArrayData combinedChild = Concatenate(children, _allocator);
+
+                Result = new ArrayData(type, _totalLength, _totalNullCount, 0, new ArrowBuffer[] { validityBuffer }, new[] { combinedChild });
             }
 
             public void Visit(StructType type)
@@ -149,7 +187,7 @@ public void Visit(StructType type)
 
                 for (int i = 0; i < type.Fields.Count; i++)
                 {
-                    children.Add(Concatenate(SelectChildren(i), _allocator));
+                    children.Add(Concatenate(SelectSlicedChildren(i), _allocator));
                 }
 
                 Result = new ArrayData(type, _totalLength, _totalNullCount, 0, new ArrowBuffer[] { validityBuffer }, children);
@@ -169,7 +207,11 @@ public void Visit(UnionType type)
 
                 for (int i = 0; i < type.Fields.Count; i++)
                 {
-                    children.Add(Concatenate(SelectChildren(i), _allocator));
+                    // For dense mode, the offsets aren't adjusted so are into the non-sliced child arrays
+                    var fieldChildren = type.Mode == UnionMode.Sparse
+                        ? SelectSlicedChildren(i)
+                        : SelectChildren(i);
+                    children.Add(Concatenate(fieldChildren, _allocator));
                 }
 
                 ArrowBuffer[] buffers = new ArrowBuffer[bufferCount];
@@ -242,9 +284,30 @@ private void ConcatenateLists(NestedType type)
                 CheckData(type, 2);
                 ArrowBuffer validityBuffer = ConcatenateValidityBuffer();
                 ArrowBuffer offsetBuffer = ConcatenateOffsetBuffer();
-                ArrayData child = Concatenate(SelectChildren(0), _allocator);
 
-                Result = new ArrayData(type, _totalLength, _totalNullCount, 0, new ArrowBuffer[] { validityBuffer, offsetBuffer }, new[] { child });
+                var children = new List<ArrayData>(_arrayDataList.Count);
+                foreach (ArrayData arrayData in _arrayDataList)
+                {
+                    if (arrayData.Length == 0)
+                    {
+                        continue;
+                    }
+
+                    var child = arrayData.Children[0];
+                    ReadOnlySpan<int> offsets = arrayData.Buffers[1].Span.CastTo<int>().Slice(arrayData.Offset, arrayData.Length + 1);
+                    var firstOffset = offsets[0];
+                    var lastOffset = offsets[arrayData.Length];
+                    if (firstOffset != 0 || lastOffset != child.Length)
+                    {
+                        child = child.Slice(firstOffset, lastOffset - firstOffset);
+                    }
+
+                    children.Add(child);
+                }
+
+                ArrayData combinedChild = Concatenate(children, _allocator);
+
+                Result = new ArrayData(type, _totalLength, _totalNullCount, 0, new ArrowBuffer[] { validityBuffer, offsetBuffer }, new[] { combinedChild });
             }
 
             private ArrowBuffer ConcatenateValidityBuffer()
@@ -254,7 +317,43 @@ private ArrowBuffer ConcatenateValidityBuffer()
                     return ArrowBuffer.Empty;
                 }
 
-                return ConcatenateBitmapBuffer(0);
+                var builder = new ArrowBuffer.BitmapBuilder(_totalLength);
+
+                foreach (ArrayData arrayData in _arrayDataList)
+                {
+                    int length = arrayData.Length;
+                    int offset = arrayData.Offset;
+                    ReadOnlySpan<byte> span = arrayData.Buffers[0].Span;
+
+                    if (length > 0 && span.Length == 0)
+                    {
+                        if (arrayData.NullCount == 0)
+                        {
+                            builder.AppendRange(true , length);
+                        }
+                        else if (arrayData.NullCount == length)
+                        {
+                            builder.AppendRange(false , length);
+                        }
+                        else
+                        {
+                            throw new Exception("Array has no validity buffer and null count != 0 or length");
+                        }
+                    }
+                    else if (offset == 0)
+                    {
+                        builder.Append(span, length);
+                    }
+                    else
+                    {
+                        for (int i = 0; i < length; ++i)
+                        {
+                            builder.Append(BitUtility.GetBit(span, offset + i));
+                        }
+                    }
+                }
+
+                return builder.Build(_allocator);
             }
 
             private ArrowBuffer ConcatenateBitmapBuffer(int bufferIndex)
@@ -264,9 +363,20 @@ private ArrowBuffer ConcatenateBitmapBuffer(int bufferIndex)
                 foreach (ArrayData arrayData in _arrayDataList)
                 {
                     int length = arrayData.Length;
+                    int offset = arrayData.Offset;
                     ReadOnlySpan<byte> span = arrayData.Buffers[bufferIndex].Span;
 
-                    builder.Append(span, length);
+                    if (offset == 0)
+                    {
+                        builder.Append(span, length);
+                    }
+                    else
+                    {
+                        for (int i = 0; i < length; ++i)
+                        {
+                            builder.Append(BitUtility.GetBit(span, offset + i));
+                        }
+                    }
                 }
 
                 return builder.Build(_allocator);
@@ -279,10 +389,10 @@ private ArrowBuffer ConcatenateFixedWidthTypeValueBuffer(int bufferIndex, FixedW
 
                 foreach (ArrayData arrayData in _arrayDataList)
                 {
-                    int length = arrayData.Length;
-                    int byteLength = length * typeByteWidth;
+                    int byteLength = arrayData.Length * typeByteWidth;
+                    int byteOffset = arrayData.Offset * typeByteWidth;
 
-                    builder.Append(arrayData.Buffers[bufferIndex].Span.Slice(0, byteLength));
+                    builder.Append(arrayData.Buffers[bufferIndex].Span.Slice(byteOffset, byteLength));
                 }
 
                 return builder.Build(_allocator);
@@ -294,8 +404,10 @@ private ArrowBuffer ConcatenateVariableBinaryValueBuffer()
 
                 foreach (ArrayData arrayData in _arrayDataList)
                 {
-                    int lastOffset = arrayData.Buffers[1].Span.CastTo<int>()[arrayData.Length];
-                    builder.Append(arrayData.Buffers[2].Span.Slice(0, lastOffset));
+                    var offsets = arrayData.Buffers[1].Span.CastTo<int>().Slice(arrayData.Offset, arrayData.Length + 1);
+                    var firstOffset = offsets[0];
+                    var lastOffset = offsets[arrayData.Length];
+                    builder.Append(arrayData.Buffers[2].Span.Slice(firstOffset, lastOffset - firstOffset));
                 }
 
                 return builder.Build(_allocator);
@@ -306,8 +418,6 @@ private ArrowBuffer ConcatenateOffsetBuffer()
                 var builder = new ArrowBuffer.Builder<int>(_totalLength + 1);
                 int baseOffset = 0;
 
-                builder.Append(0);
-
                 foreach (ArrayData arrayData in _arrayDataList)
                 {
                     if (arrayData.Length == 0)
@@ -315,19 +425,20 @@ private ArrowBuffer ConcatenateOffsetBuffer()
                         continue;
                     }
 
-                    // The first offset is always 0.
-                    // It should be skipped because it duplicate to the last offset of builder.
-                    ReadOnlySpan<int> span = arrayData.Buffers[1].Span.CastTo<int>().Slice(1, arrayData.Length);
+                    ReadOnlySpan<int> span = arrayData.Buffers[1].Span.CastTo<int>().Slice(arrayData.Offset, arrayData.Length + 1);
+                    // First offset may be non-zero for sliced arrays
+                    var firstOffset = span[0];
 
-                    foreach (int offset in span)
+                    foreach (int offset in span.Slice(0, arrayData.Length))
                     {
-                        builder.Append(baseOffset + offset);
+                        builder.Append(baseOffset + offset - firstOffset);
                     }
 
-                    // The next offset must start from the current last offset.
-                    baseOffset += span[arrayData.Length - 1];
+                    baseOffset += span[arrayData.Length] - firstOffset;
                 }
 
+                builder.Append(baseOffset);
+
                 return builder.Build(_allocator);
             }
 
@@ -342,7 +453,7 @@ private ArrowBuffer ConcatenateViewBuffer(out int variadicBufferCount)
                         continue;
                     }
 
-                    ReadOnlySpan<BinaryView> span = arrayData.Buffers[1].Span.CastTo<BinaryView>().Slice(0, arrayData.Length);
+                    ReadOnlySpan<BinaryView> span = arrayData.Buffers[1].Span.CastTo<BinaryView>().Slice(arrayData.Offset, arrayData.Length);
                     foreach (BinaryView view in span)
                     {
                         if (view.Length > BinaryView.MaxInlineLength)
@@ -367,7 +478,7 @@ private ArrowBuffer ConcatenateUnionTypeBuffer()
 
                 foreach (ArrayData arrayData in _arrayDataList)
                 {
-                    builder.Append(arrayData.Buffers[0]);
+                    builder.Append(arrayData.Buffers[0].Span.Slice(arrayData.Offset, arrayData.Length));
                 }
 
                 return builder.Build(_allocator);
@@ -376,18 +487,26 @@ private ArrowBuffer ConcatenateUnionTypeBuffer()
             private ArrowBuffer ConcatenateUnionOffsetBuffer()
             {
                 var builder = new ArrowBuffer.Builder<int>(_totalLength);
-                int baseOffset = 0;
+                var typeCount = _arrayDataList.Count > 0 ? _arrayDataList[0].Children.Length : 0;
+                var baseOffsets = new int[typeCount];
 
                 foreach (ArrayData arrayData in _arrayDataList)
                 {
-                    ReadOnlySpan<int> span = arrayData.Buffers[1].Span.CastTo<int>();
-                    foreach (int offset in span)
+                    ReadOnlySpan<byte> typeSpan = arrayData.Buffers[0].Span.Slice(arrayData.Offset, arrayData.Length);
+                    ReadOnlySpan<int> offsetSpan = arrayData.Buffers[1].Span.CastTo<int>().Slice(arrayData.Offset, arrayData.Length);
+                    for (int i = 0; i < arrayData.Length; ++i)
                     {
-                        builder.Append(baseOffset + offset);
+                        var typeId = typeSpan[i];
+                        builder.Append(checked(baseOffsets[typeId] + offsetSpan[i]));
                     }
 
-                    // The next offset must start from the current last offset.
-                    baseOffset += span[arrayData.Length];
+                    for (int i = 0; i < typeCount; ++i)
+                    {
+                        checked
+                        {
+                            baseOffsets[i] += arrayData.Children[i].Length;
+                        }
+                    }
                 }
 
                 return builder.Build(_allocator);
@@ -404,6 +523,26 @@ private List<ArrayData> SelectChildren(int index)
 
                 return children;
             }
+
+            private List<ArrayData> SelectSlicedChildren(int index)
+            {
+                var children = new List<ArrayData>(_arrayDataList.Count);
+
+                foreach (ArrayData arrayData in _arrayDataList)
+                {
+                    var offset = arrayData.Offset;
+                    var length = arrayData.Length;
+                    var child = arrayData.Children[index];
+                    if (offset != 0 || child.Length != length)
+                    {
+                        child = child.Slice(offset, length);
+                    }
+
+                    children.Add(child);
+                }
+
+                return children;
+            }
         }
     }
 }
diff --git a/csharp/src/Apache.Arrow/Arrays/ArrowArrayBuilderFactory.cs b/csharp/src/Apache.Arrow/Arrays/ArrowArrayBuilderFactory.cs
index f8367102082f5..cb7164aa146c6 100644
--- a/csharp/src/Apache.Arrow/Arrays/ArrowArrayBuilderFactory.cs
+++ b/csharp/src/Apache.Arrow/Arrays/ArrowArrayBuilderFactory.cs
@@ -82,12 +82,21 @@ internal static IArrowArrayBuilder<IArrowArray, IArrowArrayBuilder<IArrowArray>>
                     return new Decimal128Array.Builder(dataType as Decimal128Type);
                 case ArrowTypeId.Decimal256:
                     return new Decimal256Array.Builder(dataType as Decimal256Type);
+                case ArrowTypeId.Interval:
+                    var intervalType = (IntervalType)dataType;
+                    return intervalType.Unit switch
+                    {
+                        IntervalUnit.YearMonth => new YearMonthIntervalArray.Builder(),
+                        IntervalUnit.DayTime => new DayTimeIntervalArray.Builder(),
+                        IntervalUnit.MonthDayNanosecond => new MonthDayNanosecondIntervalArray.Builder(),
+                        _ => throw new ArgumentOutOfRangeException($"unsupported interval unit <{intervalType.Unit}>")
+                    };
+                case ArrowTypeId.Map:
+                    return new MapArray.Builder(dataType as MapType);
                 case ArrowTypeId.Struct:
                 case ArrowTypeId.Union:
                 case ArrowTypeId.Dictionary:
                 case ArrowTypeId.FixedSizedBinary:
-                case ArrowTypeId.Interval:
-                case ArrowTypeId.Map:
                 default:
                     throw new NotSupportedException($"An ArrowArrayBuilder cannot be built for type {dataType.TypeId}.");
             }
diff --git a/csharp/src/Apache.Arrow/Arrays/BinaryArray.cs b/csharp/src/Apache.Arrow/Arrays/BinaryArray.cs
index 1bd4035d5b9da..bd5d9315e9fc4 100644
--- a/csharp/src/Apache.Arrow/Arrays/BinaryArray.cs
+++ b/csharp/src/Apache.Arrow/Arrays/BinaryArray.cs
@@ -22,7 +22,7 @@
 
 namespace Apache.Arrow
 {
-    public class BinaryArray : Array, IReadOnlyList<byte[]>
+    public class BinaryArray : Array, IReadOnlyList<byte[]>, ICollection<byte[]>
     {
         public class Builder : BuilderBase<BinaryArray, Builder>
         {
@@ -380,5 +380,30 @@ IEnumerator<byte[]> IEnumerable<byte[]>.GetEnumerator()
         }
 
         IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable<byte[]>)this).GetEnumerator();
+
+        int ICollection<byte[]>.Count => Length;
+        bool ICollection<byte[]>.IsReadOnly => true;
+        void ICollection<byte[]>.Add(byte[] item) => throw new NotSupportedException("Collection is read-only.");
+        bool ICollection<byte[]>.Remove(byte[] item) => throw new NotSupportedException("Collection is read-only.");
+        void ICollection<byte[]>.Clear() => throw new NotSupportedException("Collection is read-only.");
+
+        bool ICollection<byte[]>.Contains(byte[] item)
+        {
+            for (int index = 0; index < Length; index++)
+            {
+                if (GetBytes(index).SequenceEqual(item))
+                    return true;
+            }
+
+            return false;
+        }
+
+        void ICollection<byte[]>.CopyTo(byte[][] array, int arrayIndex)
+        {
+            for (int srcIndex = 0, destIndex = arrayIndex; srcIndex < Length; srcIndex++, destIndex++)
+            {
+                array[destIndex] = GetBytes(srcIndex).ToArray();
+            }
+        }
     }
 }
diff --git a/csharp/src/Apache.Arrow/Arrays/BinaryViewArray.cs b/csharp/src/Apache.Arrow/Arrays/BinaryViewArray.cs
index 4f62dffd1ddeb..b7c9b07336a5a 100644
--- a/csharp/src/Apache.Arrow/Arrays/BinaryViewArray.cs
+++ b/csharp/src/Apache.Arrow/Arrays/BinaryViewArray.cs
@@ -322,7 +322,7 @@ public ReadOnlySpan<byte> GetBytes(int index, out bool isNull)
             BinaryView binaryView = Views[index];
             if (binaryView.IsInline)
             {
-                return ViewsBuffer.Span.Slice(16 * index + 4, binaryView.Length);
+                return ViewsBuffer.Span.Slice(16 * (Offset + index) + 4, binaryView.Length);
             }
 
             return DataBuffer(binaryView._bufferIndex).Span.Slice(binaryView._bufferOffset, binaryView.Length);
diff --git a/csharp/src/Apache.Arrow/Arrays/BooleanArray.cs b/csharp/src/Apache.Arrow/Arrays/BooleanArray.cs
index e9c5f8979e48f..19d4d0b7ed564 100644
--- a/csharp/src/Apache.Arrow/Arrays/BooleanArray.cs
+++ b/csharp/src/Apache.Arrow/Arrays/BooleanArray.cs
@@ -21,7 +21,7 @@
 
 namespace Apache.Arrow
 {
-    public class BooleanArray: Array, IReadOnlyList<bool?>
+    public class BooleanArray: Array, IReadOnlyList<bool?>, ICollection<bool?>
     {
         public class Builder : IArrowArrayBuilder<bool, BooleanArray, Builder>
         {
@@ -188,7 +188,7 @@ public bool GetBoolean(int index)
         public bool? GetValue(int index)
         {
             return IsNull(index)
-                ? (bool?)null
+                ? null
                 : BitUtility.GetBit(ValueBuffer.Span, index + Offset);
         }
 
@@ -205,5 +205,30 @@ public bool GetBoolean(int index)
         }
 
         IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable<bool?>)this).GetEnumerator();
+
+        int ICollection<bool?>.Count => Length;
+        bool ICollection<bool?>.IsReadOnly => true;
+        void ICollection<bool?>.Add(bool? item) => throw new NotSupportedException("Collection is read-only.");
+        bool ICollection<bool?>.Remove(bool? item) => throw new NotSupportedException("Collection is read-only.");
+        void ICollection<bool?>.Clear() => throw new NotSupportedException("Collection is read-only.");
+
+        bool ICollection<bool?>.Contains(bool? item)
+        {
+            for (int index = 0; index < Length; index++)
+            {
+                if (GetValue(index).Equals(item))
+                    return true;
+            }
+
+            return false;
+        }
+
+        void ICollection<bool?>.CopyTo(bool?[] array, int arrayIndex)
+        {
+            for (int srcIndex = 0, destIndex = arrayIndex; srcIndex < Length; srcIndex++, destIndex++)
+            {
+                array[destIndex] = GetValue(srcIndex);
+            }
+        }
     }
 }
diff --git a/csharp/src/Apache.Arrow/Arrays/Date32Array.cs b/csharp/src/Apache.Arrow/Arrays/Date32Array.cs
index 6ab4986f573e2..55864e89e2eb3 100644
--- a/csharp/src/Apache.Arrow/Arrays/Date32Array.cs
+++ b/csharp/src/Apache.Arrow/Arrays/Date32Array.cs
@@ -23,9 +23,9 @@ namespace Apache.Arrow
     /// The <see cref="Date32Array"/> class holds an array of dates in the <c>Date32</c> format, where each date is
     /// stored as the number of days since the dawn of (UNIX) time.
     /// </summary>
-    public class Date32Array : PrimitiveArray<int>, IReadOnlyList<DateTime?>
+    public class Date32Array : PrimitiveArray<int>, IReadOnlyList<DateTime?>, ICollection<DateTime?>
 #if NET6_0_OR_GREATER
-        , IReadOnlyList<DateOnly?>
+        , IReadOnlyList<DateOnly?>, ICollection<DateOnly?>
 #endif
     {
         private static readonly DateTime _epochDate = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Unspecified);
@@ -40,10 +40,9 @@ public class Builder : DateArrayBuilder<int, Date32Array, Builder>
         {
             private class DateBuilder : PrimitiveArrayBuilder<int, Date32Array, DateBuilder>
             {
-                protected override Date32Array Build(
-                    ArrowBuffer valueBuffer, ArrowBuffer nullBitmapBuffer,
-                    int length, int nullCount, int offset) =>
-                    new Date32Array(valueBuffer, nullBitmapBuffer, length, nullCount, offset);
+                protected override Date32Array Build(ArrowBuffer valueBuffer, ArrowBuffer nullBitmapBuffer, int length,
+                    int nullCount, int offset) =>
+                    new(valueBuffer, nullBitmapBuffer, length, nullCount, offset);
             }
 
             /// <summary>
@@ -149,6 +148,31 @@ public Date32Array(ArrayData data)
                 yield return GetDateOnly(index);
             };
         }
+
+        int ICollection<DateOnly?>.Count => Length;
+        bool ICollection<DateOnly?>.IsReadOnly => true;
+        void ICollection<DateOnly?>.Add(DateOnly? item) => throw new NotSupportedException("Collection is read-only.");
+        bool ICollection<DateOnly?>.Remove(DateOnly? item) => throw new NotSupportedException("Collection is read-only.");
+        void ICollection<DateOnly?>.Clear() => throw new NotSupportedException("Collection is read-only.");
+
+        bool ICollection<DateOnly?>.Contains(DateOnly? item)
+        {
+            for (int index = 0; index < Length; index++)
+            {
+                if (GetDateOnly(index).Equals(item))
+                    return true;
+            }
+
+            return false;
+        }
+
+        void ICollection<DateOnly?>.CopyTo(DateOnly?[] array, int arrayIndex)
+        {
+            for (int srcIndex = 0, destIndex = arrayIndex; srcIndex < Length; srcIndex++, destIndex++)
+            {
+                array[destIndex] = GetDateOnly(srcIndex);
+            }
+        }
 #endif
 
         int IReadOnlyCollection<DateTime?>.Count => Length;
@@ -160,7 +184,32 @@ public Date32Array(ArrayData data)
             for (int index = 0; index < Length; index++)
             {
                 yield return GetDateTime(index);
-            };
+            }
+        }
+
+        int ICollection<DateTime?>.Count => Length;
+        bool ICollection<DateTime?>.IsReadOnly => true;
+        void ICollection<DateTime?>.Add(DateTime? item) => throw new NotSupportedException("Collection is read-only.");
+        bool ICollection<DateTime?>.Remove(DateTime? item) => throw new NotSupportedException("Collection is read-only.");
+        void ICollection<DateTime?>.Clear() => throw new NotSupportedException("Collection is read-only.");
+
+        bool ICollection<DateTime?>.Contains(DateTime? item)
+        {
+            for (int index = 0; index < Length; index++)
+            {
+                if (GetDateTime(index).Equals(item))
+                    return true;
+            }
+
+            return false;
+        }
+
+        void ICollection<DateTime?>.CopyTo(DateTime?[] array, int arrayIndex)
+        {
+            for (int srcIndex = 0, destIndex = arrayIndex; srcIndex < Length; srcIndex++, destIndex++)
+            {
+                array[destIndex] = GetDateTime(srcIndex);
+            }
         }
     }
 }
diff --git a/csharp/src/Apache.Arrow/Arrays/Date64Array.cs b/csharp/src/Apache.Arrow/Arrays/Date64Array.cs
index 43e698e10b25c..77538ce59ffae 100644
--- a/csharp/src/Apache.Arrow/Arrays/Date64Array.cs
+++ b/csharp/src/Apache.Arrow/Arrays/Date64Array.cs
@@ -24,9 +24,9 @@ namespace Apache.Arrow
     /// stored as the number of milliseconds since the dawn of (UNIX) time, excluding leap seconds, in multiples of
     /// 86400000.
     /// </summary>
-    public class Date64Array : PrimitiveArray<long>, IReadOnlyList<DateTime?>
+    public class Date64Array : PrimitiveArray<long>, IReadOnlyList<DateTime?>, ICollection<DateTime?>
 #if NET6_0_OR_GREATER
-        , IReadOnlyList<DateOnly?>
+        , IReadOnlyList<DateOnly?>, ICollection<DateOnly?>
 #endif
     {
         private const long MillisecondsPerDay = 86400000;
@@ -45,10 +45,9 @@ public class Builder : DateArrayBuilder<long, Date64Array, Builder>
         {
             private class DateBuilder : PrimitiveArrayBuilder<long, Date64Array, DateBuilder>
             {
-                protected override Date64Array Build(
-                    ArrowBuffer valueBuffer, ArrowBuffer nullBitmapBuffer,
-                    int length, int nullCount, int offset) =>
-                    new Date64Array(valueBuffer, nullBitmapBuffer, length, nullCount, offset);
+                protected override Date64Array Build(ArrowBuffer valueBuffer, ArrowBuffer nullBitmapBuffer, int length,
+                    int nullCount, int offset) =>
+                    new(valueBuffer, nullBitmapBuffer, length, nullCount, offset);
             }
 
             /// <summary>
@@ -151,6 +150,31 @@ public Date64Array(ArrayData data)
                 yield return GetDateOnly(index);
             };
         }
+
+        int ICollection<DateOnly?>.Count => Length;
+        bool ICollection<DateOnly?>.IsReadOnly => true;
+        void ICollection<DateOnly?>.Add(DateOnly? item) => throw new NotSupportedException("Collection is read-only.");
+        bool ICollection<DateOnly?>.Remove(DateOnly? item) => throw new NotSupportedException("Collection is read-only.");
+        void ICollection<DateOnly?>.Clear() => throw new NotSupportedException("Collection is read-only.");
+
+        bool ICollection<DateOnly?>.Contains(DateOnly? item)
+        {
+            for (int index = 0; index < Length; index++)
+            {
+                if (GetDateOnly(index).Equals(item))
+                    return true;
+            }
+
+            return false;
+        }
+
+        void ICollection<DateOnly?>.CopyTo(DateOnly?[] array, int arrayIndex)
+        {
+            for (int srcIndex = 0, destIndex = arrayIndex; srcIndex < Length; srcIndex++, destIndex++)
+            {
+                array[destIndex] = GetDateOnly(srcIndex);
+            }
+        }
 #endif
 
         int IReadOnlyCollection<DateTime?>.Count => Length;
@@ -162,7 +186,32 @@ public Date64Array(ArrayData data)
             for (int index = 0; index < Length; index++)
             {
                 yield return GetDateTime(index);
-            };
+            }
+        }
+
+        int ICollection<DateTime?>.Count => Length;
+        bool ICollection<DateTime?>.IsReadOnly => true;
+        void ICollection<DateTime?>.Add(DateTime? item) => throw new NotSupportedException("Collection is read-only.");
+        bool ICollection<DateTime?>.Remove(DateTime? item) => throw new NotSupportedException("Collection is read-only.");
+        void ICollection<DateTime?>.Clear() => throw new NotSupportedException("Collection is read-only.");
+
+        bool ICollection<DateTime?>.Contains(DateTime? item)
+        {
+            for (int index = 0; index < Length; index++)
+            {
+                if (GetDateTime(index).Equals(item))
+                    return true;
+            }
+
+            return false;
+        }
+
+        void ICollection<DateTime?>.CopyTo(DateTime?[] array, int arrayIndex)
+        {
+            for (int srcIndex = 0, destIndex = arrayIndex; srcIndex < Length; srcIndex++, destIndex++)
+            {
+                array[destIndex] = GetDateTime(srcIndex);
+            }
         }
     }
 }
diff --git a/csharp/src/Apache.Arrow/Arrays/Decimal128Array.cs b/csharp/src/Apache.Arrow/Arrays/Decimal128Array.cs
index 5a51175b7c4da..2fb6f4c961127 100644
--- a/csharp/src/Apache.Arrow/Arrays/Decimal128Array.cs
+++ b/csharp/src/Apache.Arrow/Arrays/Decimal128Array.cs
@@ -144,7 +144,7 @@ public Decimal128Array(ArrayData data)
             {
                 return null;
             }
-            return DecimalUtility.GetDecimal(ValueBuffer, index, Scale, ByteWidth);
+            return DecimalUtility.GetDecimal(ValueBuffer, Offset + index, Scale, ByteWidth);
         }
 
         public IList<decimal?> ToList(bool includeNulls = false)
@@ -177,7 +177,7 @@ public string GetString(int index)
             {
                 return null;
             }
-            return DecimalUtility.GetString(ValueBuffer, index, Precision, Scale, ByteWidth);
+            return DecimalUtility.GetString(ValueBuffer, Offset + index, Precision, Scale, ByteWidth);
         }
 
         public SqlDecimal? GetSqlDecimal(int index)
@@ -187,7 +187,7 @@ public string GetString(int index)
                 return null;
             }
 
-            return DecimalUtility.GetSqlDecimal128(ValueBuffer, index, Precision, Scale);
+            return DecimalUtility.GetSqlDecimal128(ValueBuffer, Offset + index, Precision, Scale);
         }
 
         int IReadOnlyCollection<SqlDecimal?>.Count => Length;
diff --git a/csharp/src/Apache.Arrow/Arrays/Decimal256Array.cs b/csharp/src/Apache.Arrow/Arrays/Decimal256Array.cs
index eca2611b6f3bb..52bfb9eb20768 100644
--- a/csharp/src/Apache.Arrow/Arrays/Decimal256Array.cs
+++ b/csharp/src/Apache.Arrow/Arrays/Decimal256Array.cs
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#nullable enable
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -23,7 +25,7 @@
 
 namespace Apache.Arrow
 {
-    public class Decimal256Array : FixedSizeBinaryArray, IReadOnlyList<SqlDecimal?>, IReadOnlyList<string>
+    public class Decimal256Array : FixedSizeBinaryArray, IReadOnlyList<SqlDecimal?>, IReadOnlyList<string?>
     {
         public class Builder : BuilderBase<Decimal256Array, Builder>
         {
@@ -151,7 +153,7 @@ public Decimal256Array(ArrayData data)
                 return null;
             }
 
-            return DecimalUtility.GetDecimal(ValueBuffer, index, Scale, ByteWidth);
+            return DecimalUtility.GetDecimal(ValueBuffer, Offset + index, Scale, ByteWidth);
         }
 
         public IList<decimal?> ToList(bool includeNulls = false)
@@ -178,13 +180,13 @@ public Decimal256Array(ArrayData data)
             return list;
         }
 
-        public string GetString(int index)
+        public string? GetString(int index)
         {
             if (IsNull(index))
             {
                 return null;
             }
-            return DecimalUtility.GetString(ValueBuffer, index, Precision, Scale, ByteWidth);
+            return DecimalUtility.GetString(ValueBuffer, Offset + index, Precision, Scale, ByteWidth);
         }
 
         public bool TryGetSqlDecimal(int index, out SqlDecimal? value)
@@ -196,11 +198,11 @@ public bool TryGetSqlDecimal(int index, out SqlDecimal? value)
             }
 
             const int longWidth = 4;
-            var span = ValueBuffer.Span.CastTo<long>().Slice(index * longWidth);
+            var span = ValueBuffer.Span.CastTo<long>().Slice((Offset + index) * longWidth);
             if ((span[2] == 0 && span[3] == 0) ||
                 (span[2] == -1 && span[3] == -1))
             {
-                value = DecimalUtility.GetSqlDecimal128(ValueBuffer, 2 * index, Precision, Scale);
+                value = DecimalUtility.GetSqlDecimal128(ValueBuffer, 2 * (Offset + index), Precision, Scale);
                 return true;
             }
 
@@ -230,10 +232,10 @@ public bool TryGetSqlDecimal(int index, out SqlDecimal? value)
             }
         }
 
-        int IReadOnlyCollection<string>.Count => Length;
-        string? IReadOnlyList<string>.this[int index] => GetString(index);
+        int IReadOnlyCollection<string?>.Count => Length;
+        string? IReadOnlyList<string?>.this[int index] => GetString(index);
 
-        IEnumerator<string> IEnumerable<string>.GetEnumerator()
+        IEnumerator<string?> IEnumerable<string?>.GetEnumerator()
         {
             for (int index = 0; index < Length; index++)
             {
@@ -241,6 +243,6 @@ IEnumerator<string> IEnumerable<string>.GetEnumerator()
             }
         }
 
-        IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable<string>)this).GetEnumerator();
+        IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable<string?>)this).GetEnumerator();
     }
 }
diff --git a/csharp/src/Apache.Arrow/Arrays/DenseUnionArray.cs b/csharp/src/Apache.Arrow/Arrays/DenseUnionArray.cs
index 1aacbe11f08b9..79880c894b13d 100644
--- a/csharp/src/Apache.Arrow/Arrays/DenseUnionArray.cs
+++ b/csharp/src/Apache.Arrow/Arrays/DenseUnionArray.cs
@@ -24,7 +24,7 @@ public class DenseUnionArray : UnionArray
     {
         public ArrowBuffer ValueOffsetBuffer => Data.Buffers[1];
 
-        public ReadOnlySpan<int> ValueOffsets => ValueOffsetBuffer.Span.CastTo<int>();
+        public ReadOnlySpan<int> ValueOffsets => ValueOffsetBuffer.Span.CastTo<int>().Slice(Offset, Length);
 
         public DenseUnionArray(
             IArrowType dataType,
@@ -38,7 +38,6 @@ public DenseUnionArray(
                 dataType, length, nullCount, offset, new[] { typeIds, valuesOffsetBuffer },
                 children.Select(child => child.Data)))
         {
-            _fields = children.ToArray();
             ValidateMode(UnionMode.Dense, Type.Mode);
         }
 
@@ -48,5 +47,33 @@ public DenseUnionArray(ArrayData data)
             ValidateMode(UnionMode.Dense, Type.Mode);
             data.EnsureBufferCount(2);
         }
+
+        protected override bool FieldIsValid(IArrowArray fieldArray, int index)
+        {
+            return fieldArray.IsValid(ValueOffsets[index]);
+        }
+
+        internal new static int ComputeNullCount(ArrayData data)
+        {
+            var offset = data.Offset;
+            var length = data.Length;
+            var typeIds = data.Buffers[0].Span.Slice(offset, length);
+            var valueOffsets = data.Buffers[1].Span.CastTo<int>().Slice(offset, length);
+            var childArrays = new IArrowArray[data.Children.Length];
+            for (var childIdx = 0; childIdx < data.Children.Length; ++childIdx)
+            {
+                childArrays[childIdx] = ArrowArrayFactory.BuildArray(data.Children[childIdx]);
+            }
+
+            var nullCount = 0;
+            for (var i = 0; i < length; ++i)
+            {
+                var typeId = typeIds[i];
+                var valueOffset = valueOffsets[i];
+                nullCount += childArrays[typeId].IsNull(valueOffset) ? 1 : 0;
+            }
+
+            return nullCount;
+        }
     }
 }
diff --git a/csharp/src/Apache.Arrow/Arrays/FixedSizeBinaryArray.cs b/csharp/src/Apache.Arrow/Arrays/FixedSizeBinaryArray.cs
index 0fa7954724f38..9d597ef1624ea 100644
--- a/csharp/src/Apache.Arrow/Arrays/FixedSizeBinaryArray.cs
+++ b/csharp/src/Apache.Arrow/Arrays/FixedSizeBinaryArray.cs
@@ -68,7 +68,7 @@ public ReadOnlySpan<byte> GetBytes(int index)
             }
 
             int size = ((FixedSizeBinaryType)Data.DataType).ByteWidth;
-            return ValueBuffer.Span.Slice(index * size, size);
+            return ValueBuffer.Span.Slice((Offset + index) * size, size);
         }
 
         int IReadOnlyCollection<byte[]>.Count => Length;
diff --git a/csharp/src/Apache.Arrow/Arrays/IntervalArray.cs b/csharp/src/Apache.Arrow/Arrays/IntervalArray.cs
index de4fc42b4cf92..3949af877b0c5 100644
--- a/csharp/src/Apache.Arrow/Arrays/IntervalArray.cs
+++ b/csharp/src/Apache.Arrow/Arrays/IntervalArray.cs
@@ -31,7 +31,7 @@ internal static class IntervalArray
     }
 
     public abstract class IntervalArray<T> : PrimitiveArray<T>
-        where T : struct
+        where T : struct, IEquatable<T>
     {
         protected IntervalArray(ArrayData data)
             : base(data)
diff --git a/csharp/src/Apache.Arrow/Arrays/NullArray.cs b/csharp/src/Apache.Arrow/Arrays/NullArray.cs
index 762540065c929..7f3e183829243 100644
--- a/csharp/src/Apache.Arrow/Arrays/NullArray.cs
+++ b/csharp/src/Apache.Arrow/Arrays/NullArray.cs
@@ -95,7 +95,7 @@ public NullArray(int length)
 
         public int Offset => Data.Offset;
 
-        public int NullCount => Data.NullCount;
+        public int NullCount => Data.GetNullCount();
 
         public void Dispose() { }
         public bool IsNull(int index) => true;
diff --git a/csharp/src/Apache.Arrow/Arrays/PrimitiveArray.cs b/csharp/src/Apache.Arrow/Arrays/PrimitiveArray.cs
index 0456c5cc65ba4..05d659b5270ad 100644
--- a/csharp/src/Apache.Arrow/Arrays/PrimitiveArray.cs
+++ b/csharp/src/Apache.Arrow/Arrays/PrimitiveArray.cs
@@ -20,8 +20,8 @@
 
 namespace Apache.Arrow
 {
-    public abstract class PrimitiveArray<T> : Array, IReadOnlyList<T?>
-        where T : struct
+    public abstract class PrimitiveArray<T> : Array, IReadOnlyList<T?>, ICollection<T?>
+        where T : struct, IEquatable<T>
     {
         protected PrimitiveArray(ArrayData data)
             : base(data)
@@ -40,7 +40,7 @@ protected PrimitiveArray(ArrayData data)
             {
                 throw new ArgumentOutOfRangeException(nameof(index));
             }
-            return IsValid(index) ? Values[index] : (T?)null;
+            return IsValid(index) ? Values[index] : null;
         }
 
         public IList<T?> ToList(bool includeNulls = false)
@@ -86,5 +86,36 @@ IEnumerator IEnumerable.GetEnumerator()
                 yield return IsValid(index) ? Values[index] : null;
             }
         }
+
+        int ICollection<T?>.Count => Length;
+        bool ICollection<T?>.IsReadOnly => true;
+        void ICollection<T?>.Add(T? item) => throw new NotSupportedException("Collection is read-only.");
+        bool ICollection<T?>.Remove(T? item) => throw new NotSupportedException("Collection is read-only.");
+        void ICollection<T?>.Clear() => throw new NotSupportedException("Collection is read-only.");
+
+        bool ICollection<T?>.Contains(T? item)
+        {
+            if (item == null)
+            {
+                return NullCount > 0;
+            }
+
+            ReadOnlySpan<T> values = Values;
+            while (values.Length > 0)
+            {
+                int index = Values.IndexOf(item.Value);
+                if (index < 0 || IsValid(index)) { return index >= 0; }
+                values = values.Slice(index + 1);
+            }
+            return false;
+        }
+
+        void ICollection<T?>.CopyTo(T?[] array, int arrayIndex)
+        {
+            for (int srcIndex = 0, destIndex = arrayIndex; srcIndex < Length; srcIndex++, destIndex++)
+            {
+                array[destIndex] = GetValue(srcIndex);
+            }
+        }
     }
 }
diff --git a/csharp/src/Apache.Arrow/Arrays/PrimitiveArrayBuilder.cs b/csharp/src/Apache.Arrow/Arrays/PrimitiveArrayBuilder.cs
index 67fe46633c18f..ae02173fb0df4 100644
--- a/csharp/src/Apache.Arrow/Arrays/PrimitiveArrayBuilder.cs
+++ b/csharp/src/Apache.Arrow/Arrays/PrimitiveArrayBuilder.cs
@@ -20,7 +20,7 @@
 
 namespace Apache.Arrow
 {
-    public abstract class PrimitiveArrayBuilder<TFrom, TTo, TArray, TBuilder> : IArrowArrayBuilder<TArray, TBuilder>
+    public abstract class PrimitiveArrayBuilder<TFrom, TTo, TArray, TBuilder> : IArrowArrayBuilder<TFrom, TArray, TBuilder>
         where TTo : struct
         where TArray : IArrowArray
         where TBuilder : class, IArrowArrayBuilder<TArray>
diff --git a/csharp/src/Apache.Arrow/Arrays/SparseUnionArray.cs b/csharp/src/Apache.Arrow/Arrays/SparseUnionArray.cs
index b79c44c979e47..5b29489ebb1f0 100644
--- a/csharp/src/Apache.Arrow/Arrays/SparseUnionArray.cs
+++ b/csharp/src/Apache.Arrow/Arrays/SparseUnionArray.cs
@@ -32,7 +32,6 @@ public SparseUnionArray(
                 dataType, length, nullCount, offset, new[] { typeIds },
                 children.Select(child => child.Data)))
         {
-            _fields = children.ToArray();
             ValidateMode(UnionMode.Sparse, Type.Mode);
         }
 
@@ -42,5 +41,31 @@ public SparseUnionArray(ArrayData data)
             ValidateMode(UnionMode.Sparse, Type.Mode);
             data.EnsureBufferCount(1);
         }
+
+        protected override bool FieldIsValid(IArrowArray fieldArray, int index)
+        {
+            return fieldArray.IsValid(index);
+        }
+
+        internal new static int ComputeNullCount(ArrayData data)
+        {
+            var offset = data.Offset;
+            var length = data.Length;
+            var typeIds = data.Buffers[0].Span.Slice(offset, length);
+            var childArrays = new IArrowArray[data.Children.Length];
+            for (var childIdx = 0; childIdx < data.Children.Length; ++childIdx)
+            {
+                childArrays[childIdx] = ArrowArrayFactory.BuildArray(data.Children[childIdx]);
+            }
+
+            var nullCount = 0;
+            for (var i = 0; i < data.Length; ++i)
+            {
+                var typeId = typeIds[i];
+                nullCount += childArrays[typeId].IsNull(offset + i) ? 1 : 0;
+            }
+
+            return nullCount;
+        }
     }
 }
diff --git a/csharp/src/Apache.Arrow/Arrays/StringArray.cs b/csharp/src/Apache.Arrow/Arrays/StringArray.cs
index af77fe1b1a83d..ab44805d8d1e9 100644
--- a/csharp/src/Apache.Arrow/Arrays/StringArray.cs
+++ b/csharp/src/Apache.Arrow/Arrays/StringArray.cs
@@ -13,19 +13,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using Apache.Arrow.Types;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
+using Apache.Arrow.Types;
 
 namespace Apache.Arrow
 {
-    public class StringArray: BinaryArray, IReadOnlyList<string>
+    public class StringArray: BinaryArray, IReadOnlyList<string>, ICollection<string>
     {
         public static readonly Encoding DefaultEncoding = Encoding.UTF8;
 
+        private Dictionary<Encoding, string[]> materializedStringStore;
+
         public new class Builder : BuilderBase<StringArray, Builder>
         {
             public Builder() : base(StringType.Default) { }
@@ -71,16 +73,28 @@ public StringArray(int length,
 
         public override void Accept(IArrowArrayVisitor visitor) => Accept(this, visitor);
 
+        /// <summary>
+        /// Get the string value at the given index
+        /// </summary>
+        /// <param name="index">Input index</param>
+        /// <param name="encoding">Optional: the string encoding, default is UTF8</param>
+        /// <returns>The string object at the given index</returns>
         public string GetString(int index, Encoding encoding = default)
         {
             encoding ??= DefaultEncoding;
 
+            if (materializedStringStore != null && materializedStringStore.TryGetValue(encoding, out string[] materializedStrings))
+            {
+                return materializedStrings[index];
+            }
+
             ReadOnlySpan<byte> bytes = GetBytes(index, out bool isNull);
 
             if (isNull)
             {
                 return null;
             }
+
             if (bytes.Length == 0)
             {
                 return string.Empty;
@@ -93,6 +107,50 @@ public string GetString(int index, Encoding encoding = default)
             }
         }
 
+        /// <summary>
+        /// Materialize the array for the given encoding to accelerate the string access
+        /// </summary>
+        /// <param name="encoding">Optional: the string encoding, default is UTF8</param>
+        /// <remarks>This method is not thread safe when it is called in parallel with <see cref="GetString(int, Encoding)"/> or <see cref="Materialize(Encoding)"/>.</remarks>
+        public void Materialize(Encoding encoding = default)
+        {
+            encoding ??= DefaultEncoding;
+
+            if (IsMaterialized(encoding))
+            {
+                return;
+            }
+
+            if (materializedStringStore == null)
+            {
+                materializedStringStore = new Dictionary<Encoding, string[]>();
+            }
+
+            var stringStore = new string[Length];
+            for (int i = 0; i < Length; i++)
+            {
+                stringStore[i] = GetString(i, encoding);
+            }
+
+            materializedStringStore[encoding] = stringStore;
+        }
+
+        /// <summary>
+        /// Check if the array has been materialized for the given encoding
+        /// </summary>
+        /// <param name="encoding">Optional: the string encoding, default is UTF8</param>
+        /// <returns>True of false whether the array has been materialized</returns>
+        public bool IsMaterialized(Encoding encoding = default)
+        {
+            if (materializedStringStore == null)
+            {
+                return false;
+            }
+
+            encoding ??= DefaultEncoding;
+            return materializedStringStore.ContainsKey(encoding);
+        }
+
         int IReadOnlyCollection<string>.Count => Length;
 
         string IReadOnlyList<string>.this[int index] => GetString(index);
@@ -106,5 +164,30 @@ IEnumerator<string> IEnumerable<string>.GetEnumerator()
         }
 
         IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable<string>)this).GetEnumerator();
+
+        int ICollection<string>.Count => Length;
+        bool ICollection<string>.IsReadOnly => true;
+        void ICollection<string>.Add(string item) => throw new NotSupportedException("Collection is read-only.");
+        bool ICollection<string>.Remove(string item) => throw new NotSupportedException("Collection is read-only.");
+        void ICollection<string>.Clear() => throw new NotSupportedException("Collection is read-only.");
+
+        bool ICollection<string>.Contains(string item)
+        {
+            for (int index = 0; index < Length; index++)
+            {
+                if (GetString(index) == item)
+                    return true;
+            }
+
+            return false;
+        }
+
+        void ICollection<string>.CopyTo(string[] array, int arrayIndex)
+        {
+            for (int srcIndex = 0, destIndex = arrayIndex; srcIndex < Length; srcIndex++, destIndex++)
+            {
+                array[destIndex] = GetString(srcIndex);
+            }
+        }
     }
 }
diff --git a/csharp/src/Apache.Arrow/Arrays/Time32Array.cs b/csharp/src/Apache.Arrow/Arrays/Time32Array.cs
index e9c2d7a4d9b28..63c0898935ba5 100644
--- a/csharp/src/Apache.Arrow/Arrays/Time32Array.cs
+++ b/csharp/src/Apache.Arrow/Arrays/Time32Array.cs
@@ -26,7 +26,7 @@ namespace Apache.Arrow
     /// </summary>
     public class Time32Array : PrimitiveArray<int>
 #if NET6_0_OR_GREATER
-        , IReadOnlyList<TimeOnly?>
+        , IReadOnlyList<TimeOnly?>, ICollection<TimeOnly?>
 #endif
     {
         /// <summary>
@@ -171,6 +171,31 @@ public Time32Array(ArrayData data)
                 yield return GetTime(index);
             };
         }
+
+        int ICollection<TimeOnly?>.Count => Length;
+        bool ICollection<TimeOnly?>.IsReadOnly => true;
+        void ICollection<TimeOnly?>.Add(TimeOnly? item) => throw new NotSupportedException("Collection is read-only.");
+        bool ICollection<TimeOnly?>.Remove(TimeOnly? item) => throw new NotSupportedException("Collection is read-only.");
+        void ICollection<TimeOnly?>.Clear() => throw new NotSupportedException("Collection is read-only.");
+
+        bool ICollection<TimeOnly?>.Contains(TimeOnly? item)
+        {
+            for (int index = 0; index < Length; index++)
+            {
+                if (GetTime(index).Equals(item))
+                    return true;
+            }
+
+            return false;
+        }
+
+        void ICollection<TimeOnly?>.CopyTo(TimeOnly?[] array, int arrayIndex)
+        {
+            for (int srcIndex = 0, destIndex = arrayIndex; srcIndex < Length; srcIndex++, destIndex++)
+            {
+                array[destIndex] = GetTime(srcIndex);
+            }
+        }
 #endif
     }
 }
diff --git a/csharp/src/Apache.Arrow/Arrays/Time64Array.cs b/csharp/src/Apache.Arrow/Arrays/Time64Array.cs
index fc18dfb8bf726..5518462952050 100644
--- a/csharp/src/Apache.Arrow/Arrays/Time64Array.cs
+++ b/csharp/src/Apache.Arrow/Arrays/Time64Array.cs
@@ -26,7 +26,7 @@ namespace Apache.Arrow
     /// </summary>
     public class Time64Array : PrimitiveArray<long>
 #if NET6_0_OR_GREATER
-        , IReadOnlyList<TimeOnly?>
+        , IReadOnlyList<TimeOnly?>, ICollection<TimeOnly?>
 #endif
     {
         /// <summary>
@@ -162,6 +162,31 @@ public Time64Array(ArrayData data)
                 yield return GetTime(index);
             };
         }
+
+        int ICollection<TimeOnly?>.Count => Length;
+        bool ICollection<TimeOnly?>.IsReadOnly => true;
+        void ICollection<TimeOnly?>.Add(TimeOnly? item) => throw new NotSupportedException("Collection is read-only.");
+        bool ICollection<TimeOnly?>.Remove(TimeOnly? item) => throw new NotSupportedException("Collection is read-only.");
+        void ICollection<TimeOnly?>.Clear() => throw new NotSupportedException("Collection is read-only.");
+
+        bool ICollection<TimeOnly?>.Contains(TimeOnly? item)
+        {
+            for (int index = 0; index < Length; index++)
+            {
+                if (GetTime(index).Equals(item))
+                    return true;
+            }
+
+            return false;
+        }
+
+        void ICollection<TimeOnly?>.CopyTo(TimeOnly?[] array, int arrayIndex)
+        {
+            for (int srcIndex = 0, destIndex = arrayIndex; srcIndex < Length; srcIndex++, destIndex++)
+            {
+                array[destIndex] = GetTime(srcIndex);
+            }
+        }
 #endif
     }
 }
diff --git a/csharp/src/Apache.Arrow/Arrays/TimestampArray.cs b/csharp/src/Apache.Arrow/Arrays/TimestampArray.cs
index ccb656854a5df..b83860584707e 100644
--- a/csharp/src/Apache.Arrow/Arrays/TimestampArray.cs
+++ b/csharp/src/Apache.Arrow/Arrays/TimestampArray.cs
@@ -21,7 +21,7 @@
 
 namespace Apache.Arrow
 {
-    public class TimestampArray : PrimitiveArray<long>, IReadOnlyList<DateTimeOffset?>
+    public class TimestampArray : PrimitiveArray<long>, IReadOnlyList<DateTimeOffset?>, ICollection<DateTimeOffset?>
     {
         private static readonly DateTimeOffset s_epoch = new DateTimeOffset(1970, 1, 1, 0, 0, 0, 0, TimeSpan.Zero);
 
@@ -157,5 +157,30 @@ public DateTimeOffset GetTimestampUnchecked(int index)
                 yield return GetTimestamp(index);
             };
         }
+
+        int ICollection<DateTimeOffset?>.Count => Length;
+        bool ICollection<DateTimeOffset?>.IsReadOnly => true;
+        void ICollection<DateTimeOffset?>.Add(DateTimeOffset? item) => throw new NotSupportedException("Collection is read-only.");
+        bool ICollection<DateTimeOffset?>.Remove(DateTimeOffset? item) => throw new NotSupportedException("Collection is read-only.");
+        void ICollection<DateTimeOffset?>.Clear() => throw new NotSupportedException("Collection is read-only.");
+
+        bool ICollection<DateTimeOffset?>.Contains(DateTimeOffset? item)
+        {
+            for (int index = 0; index < Length; index++)
+            {
+                if (GetTimestamp(index).Equals(item))
+                    return true;
+            }
+
+            return false;
+        }
+
+        void ICollection<DateTimeOffset?>.CopyTo(DateTimeOffset?[] array, int arrayIndex)
+        {
+            for (int srcIndex = 0, destIndex = arrayIndex; srcIndex < Length; srcIndex++, destIndex++)
+            {
+                array[destIndex] = GetTimestamp(srcIndex);
+            }
+        }
     }
 }
diff --git a/csharp/src/Apache.Arrow/Arrays/UnionArray.cs b/csharp/src/Apache.Arrow/Arrays/UnionArray.cs
index 0a7ae288fd0c5..c1deb9b651a89 100644
--- a/csharp/src/Apache.Arrow/Arrays/UnionArray.cs
+++ b/csharp/src/Apache.Arrow/Arrays/UnionArray.cs
@@ -25,7 +25,7 @@ public abstract class UnionArray : IArrowArray
         protected IReadOnlyList<IArrowArray> _fields;
 
         public IReadOnlyList<IArrowArray> Fields =>
-            LazyInitializer.EnsureInitialized(ref _fields, () => InitializeFields());
+            LazyInitializer.EnsureInitialized(ref _fields, InitializeFields);
 
         public ArrayData Data { get; }
 
@@ -35,15 +35,15 @@ public abstract class UnionArray : IArrowArray
 
         public ArrowBuffer TypeBuffer => Data.Buffers[0];
 
-        public ReadOnlySpan<byte> TypeIds => TypeBuffer.Span;
+        public ReadOnlySpan<byte> TypeIds => TypeBuffer.Span.Slice(Offset, Length);
 
         public int Length => Data.Length;
 
         public int Offset => Data.Offset;
 
-        public int NullCount => Data.NullCount;
+        public int NullCount => Data.GetNullCount();
 
-        public bool IsValid(int index) => NullCount == 0 || Fields[TypeIds[index]].IsValid(index);
+        public bool IsValid(int index) => NullCount == 0 || FieldIsValid(Fields[TypeIds[index]], index);
 
         public bool IsNull(int index) => !IsValid(index);
 
@@ -65,6 +65,8 @@ public static UnionArray Create(ArrayData data)
 
         public void Accept(IArrowArrayVisitor visitor) => Array.Accept(this, visitor);
 
+        protected abstract bool FieldIsValid(IArrowArray field, int index);
+
         public void Dispose()
         {
             Dispose(true);
@@ -89,12 +91,29 @@ protected static void ValidateMode(UnionMode expected, UnionMode actual)
             }
         }
 
+        internal static int ComputeNullCount(ArrayData data)
+        {
+            return ((UnionType)data.DataType).Mode switch
+            {
+                UnionMode.Sparse => SparseUnionArray.ComputeNullCount(data),
+                UnionMode.Dense => DenseUnionArray.ComputeNullCount(data),
+                _ => throw new InvalidOperationException("unknown union mode in null count computation")
+            };
+        }
+
         private IReadOnlyList<IArrowArray> InitializeFields()
         {
             IArrowArray[] result = new IArrowArray[Data.Children.Length];
             for (int i = 0; i < Data.Children.Length; i++)
             {
-                result[i] = ArrowArrayFactory.BuildArray(Data.Children[i]);
+                var childData = Data.Children[i];
+                if (Mode == UnionMode.Sparse && (Data.Offset != 0 || childData.Length != Data.Length))
+                {
+                    // We only slice the child data for sparse mode,
+                    // so that the sliced value offsets remain valid in dense mode
+                    childData = childData.Slice(Data.Offset, Data.Length);
+                }
+                result[i] = ArrowArrayFactory.BuildArray(childData);
             }
             return result;
         }
diff --git a/csharp/src/Apache.Arrow/C/CArrowArrayExporter.cs b/csharp/src/Apache.Arrow/C/CArrowArrayExporter.cs
index 03059eaf5d4df..b241fdfea3bda 100644
--- a/csharp/src/Apache.Arrow/C/CArrowArrayExporter.cs
+++ b/csharp/src/Apache.Arrow/C/CArrowArrayExporter.cs
@@ -115,7 +115,7 @@ private unsafe static void ConvertArray(ExportedAllocationOwner sharedOwner, Arr
         {
             cArray->length = array.Length;
             cArray->offset = array.Offset;
-            cArray->null_count = array.NullCount;
+            cArray->null_count = array.NullCount; // The C Data interface allows the null count to be -1
             cArray->release = ReleaseArrayPtr;
             cArray->private_data = MakePrivateData(sharedOwner);
 
diff --git a/csharp/src/Apache.Arrow/C/CArrowArrayImporter.cs b/csharp/src/Apache.Arrow/C/CArrowArrayImporter.cs
index fbb2be661fc5d..abe02dcbb591f 100644
--- a/csharp/src/Apache.Arrow/C/CArrowArrayImporter.cs
+++ b/csharp/src/Apache.Arrow/C/CArrowArrayImporter.cs
@@ -17,6 +17,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Runtime.InteropServices;
 using Apache.Arrow.Memory;
 using Apache.Arrow.Types;
@@ -36,7 +37,7 @@ public static class CArrowArrayImporter
         /// Typically, you will allocate an uninitialized CArrowArray pointer,
         /// pass that to external function, and then use this method to import
         /// the result.
-        /// 
+        ///
         /// <code>
         /// CArrowArray* importedPtr = CArrowArray.Create();
         /// foreign_export_function(importedPtr);
@@ -71,7 +72,7 @@ public static unsafe IArrowArray ImportArray(CArrowArray* ptr, IArrowType type)
         /// Typically, you will allocate an uninitialized CArrowArray pointer,
         /// pass that to external function, and then use this method to import
         /// the result.
-        /// 
+        ///
         /// <code>
         /// CArrowArray* importedPtr = CArrowArray.Create();
         /// foreign_export_function(importedPtr);
@@ -256,6 +257,19 @@ private ArrowBuffer ImportValidityBuffer(CArrowArray* cArray)
                 return (cArray->buffers[0] == null) ? ArrowBuffer.Empty : new ArrowBuffer(AddMemory((IntPtr)cArray->buffers[0], 0, validityLength));
             }
 
+            private ArrowBuffer ImportCArrayBuffer(CArrowArray* cArray, int i, int lengthBytes)
+            {
+                if (lengthBytes > 0)
+                {
+                    Debug.Assert(cArray->buffers[i] != null);
+                    return new ArrowBuffer(AddMemory((IntPtr)cArray->buffers[i], 0, lengthBytes));
+                }
+                else
+                {
+                    return ArrowBuffer.Empty;
+                }
+            }
+
             private ArrowBuffer[] ImportByteArrayBuffers(CArrowArray* cArray)
             {
                 if (cArray->n_buffers != 3)
@@ -266,12 +280,13 @@ private ArrowBuffer[] ImportByteArrayBuffers(CArrowArray* cArray)
                 int length = checked((int)cArray->length);
                 int offsetsLength = (length + 1) * 4;
                 int* offsets = (int*)cArray->buffers[1];
+                Debug.Assert(offsets != null);
                 int valuesLength = offsets[length];
 
                 ArrowBuffer[] buffers = new ArrowBuffer[3];
                 buffers[0] = ImportValidityBuffer(cArray);
-                buffers[1] = new ArrowBuffer(AddMemory((IntPtr)cArray->buffers[1], 0, offsetsLength));
-                buffers[2] = new ArrowBuffer(AddMemory((IntPtr)cArray->buffers[2], 0, valuesLength));
+                buffers[1] = ImportCArrayBuffer(cArray, 1, offsetsLength);
+                buffers[2] = ImportCArrayBuffer(cArray, 2, valuesLength);
 
                 return buffers;
             }
@@ -289,10 +304,10 @@ private ArrowBuffer[] ImportByteArrayViewBuffers(CArrowArray* cArray)
                 long* bufferLengths = (long*)cArray->buffers[cArray->n_buffers - 1];
                 ArrowBuffer[] buffers = new ArrowBuffer[cArray->n_buffers - 1];
                 buffers[0] = ImportValidityBuffer(cArray);
-                buffers[1] = new ArrowBuffer(AddMemory((IntPtr)cArray->buffers[1], 0, viewsLength));
+                buffers[1] = ImportCArrayBuffer(cArray, 1, viewsLength);
                 for (int i = 2; i < buffers.Length; i++)
                 {
-                    buffers[i] = new ArrowBuffer(AddMemory((IntPtr)cArray->buffers[i], 0, checked((int)bufferLengths[i - 2])));
+                    buffers[i] = ImportCArrayBuffer(cArray, i, checked((int)bufferLengths[i - 2]));
                 }
 
                 return buffers;
@@ -310,7 +325,7 @@ private ArrowBuffer[] ImportListBuffers(CArrowArray* cArray)
 
                 ArrowBuffer[] buffers = new ArrowBuffer[2];
                 buffers[0] = ImportValidityBuffer(cArray);
-                buffers[1] = new ArrowBuffer(AddMemory((IntPtr)cArray->buffers[1], 0, offsetsLength));
+                buffers[1] = ImportCArrayBuffer(cArray, 1, offsetsLength);
 
                 return buffers;
             }
@@ -327,8 +342,8 @@ private ArrowBuffer[] ImportListViewBuffers(CArrowArray* cArray)
 
                 ArrowBuffer[] buffers = new ArrowBuffer[3];
                 buffers[0] = ImportValidityBuffer(cArray);
-                buffers[1] = new ArrowBuffer(AddMemory((IntPtr)cArray->buffers[1], 0, offsetsLength));
-                buffers[2] = new ArrowBuffer(AddMemory((IntPtr)cArray->buffers[2], 0, offsetsLength));
+                buffers[1] = ImportCArrayBuffer(cArray, 1, offsetsLength);
+                buffers[2] = ImportCArrayBuffer(cArray, 2, offsetsLength);
 
                 return buffers;
             }
@@ -356,8 +371,8 @@ private ArrowBuffer[] ImportDenseUnionBuffers(CArrowArray* cArray)
                 int offsetsLength = length * 4;
 
                 ArrowBuffer[] buffers = new ArrowBuffer[2];
-                buffers[0] = new ArrowBuffer(AddMemory((IntPtr)cArray->buffers[0], 0, length));
-                buffers[1] = new ArrowBuffer(AddMemory((IntPtr)cArray->buffers[1], 0, offsetsLength));
+                buffers[0] = ImportCArrayBuffer(cArray, 0, length);
+                buffers[1] = ImportCArrayBuffer(cArray, 1, offsetsLength);
 
                 return buffers;
             }
@@ -370,7 +385,7 @@ private ArrowBuffer[] ImportSparseUnionBuffers(CArrowArray* cArray)
                 }
 
                 ArrowBuffer[] buffers = new ArrowBuffer[1];
-                buffers[0] = new ArrowBuffer(AddMemory((IntPtr)cArray->buffers[0], 0, checked((int)cArray->length)));
+                buffers[0] = ImportCArrayBuffer(cArray, 0, checked((int)cArray->length));
 
                 return buffers;
             }
@@ -392,7 +407,7 @@ private ArrowBuffer[] ImportFixedWidthBuffers(CArrowArray* cArray, int bitWidth)
 
                 ArrowBuffer[] buffers = new ArrowBuffer[2];
                 buffers[0] = ImportValidityBuffer(cArray);
-                buffers[1] = new ArrowBuffer(AddMemory((IntPtr)cArray->buffers[1], 0, valuesLength));
+                buffers[1] = ImportCArrayBuffer(cArray, 1, valuesLength);
 
                 return buffers;
             }
diff --git a/csharp/src/Apache.Arrow/DecimalUtility.cs b/csharp/src/Apache.Arrow/DecimalUtility.cs
index e2ab18d479edb..1847b45a5c50b 100644
--- a/csharp/src/Apache.Arrow/DecimalUtility.cs
+++ b/csharp/src/Apache.Arrow/DecimalUtility.cs
@@ -431,9 +431,12 @@ internal static void GetBytes(SqlDecimal value, int precision, int scale, Span<b
                 value = SqlDecimal.ConvertToPrecScale(value, precision, scale);
             }
 
-            // TODO: Consider groveling in the internals to avoid the probable allocation
-            Span<int> span = bytes.CastTo<int>();
-            value.Data.AsSpan().CopyTo(span);
+#if NET7_0_OR_GREATER
+            value.WriteTdsValue(bytes.CastTo<uint>());
+#else
+            value.Data.AsSpan().CopyTo(bytes.CastTo<int>());
+#endif
+
             if (!value.IsPositive)
             {
                 Span<long> longSpan = bytes.CastTo<long>();
diff --git a/csharp/src/Apache.Arrow/Ipc/ArrowReaderImplementation.cs b/csharp/src/Apache.Arrow/Ipc/ArrowReaderImplementation.cs
index 4e273dbde5690..a37c501072f4b 100644
--- a/csharp/src/Apache.Arrow/Ipc/ArrowReaderImplementation.cs
+++ b/csharp/src/Apache.Arrow/Ipc/ArrowReaderImplementation.cs
@@ -261,7 +261,7 @@ private ArrayData LoadField(
 
             if (fieldNullCount < 0)
             {
-                throw new InvalidDataException("Null count length must be >= 0"); // TODO:Localize exception message
+                throw new InvalidDataException("Null count must be >= 0"); // TODO:Localize exception message
             }
 
             int buffers;
diff --git a/csharp/src/Apache.Arrow/Ipc/ArrowStreamWriter.cs b/csharp/src/Apache.Arrow/Ipc/ArrowStreamWriter.cs
index b002f8c8b1578..c66569afeba85 100644
--- a/csharp/src/Apache.Arrow/Ipc/ArrowStreamWriter.cs
+++ b/csharp/src/Apache.Arrow/Ipc/ArrowStreamWriter.cs
@@ -19,6 +19,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Apache.Arrow.Arrays;
@@ -69,23 +70,37 @@ private class ArrowRecordBatchFlatBufferBuilder :
             IArrowArrayVisitor<DictionaryArray>,
             IArrowArrayVisitor<NullArray>
         {
+            public readonly struct FieldNode
+            {
+                public readonly int Length;
+                public readonly int NullCount;
+
+                public FieldNode(int length, int nullCount)
+                {
+                    Length = length;
+                    NullCount = nullCount;
+                }
+            }
+
             public readonly struct Buffer
             {
-                public readonly ArrowBuffer DataBuffer;
+                public readonly ReadOnlyMemory<byte> DataBuffer;
                 public readonly int Offset;
 
-                public Buffer(ArrowBuffer buffer, int offset)
+                public Buffer(ReadOnlyMemory<byte> buffer, int offset)
                 {
                     DataBuffer = buffer;
                     Offset = offset;
                 }
             }
 
+            private readonly List<FieldNode> _fieldNodes;
             private readonly List<Buffer> _buffers;
             private readonly ICompressionCodec _compressionCodec;
             private readonly MemoryAllocator _allocator;
             private readonly MemoryStream _compressionStream;
 
+            public IReadOnlyList<FieldNode> FieldNodes => _fieldNodes;
             public IReadOnlyList<Buffer> Buffers => _buffers;
 
             public List<long> VariadicCounts { get; private set; } 
@@ -97,56 +112,102 @@ public ArrowRecordBatchFlatBufferBuilder(
                 _compressionCodec = compressionCodec;
                 _compressionStream = compressionStream;
                 _allocator = allocator;
+                _fieldNodes = new List<FieldNode>();
                 _buffers = new List<Buffer>();
                 TotalLength = 0;
             }
 
-            public void Visit(Int8Array array) => CreateBuffers(array);
-            public void Visit(Int16Array array) => CreateBuffers(array);
-            public void Visit(Int32Array array) => CreateBuffers(array);
-            public void Visit(Int64Array array) => CreateBuffers(array);
-            public void Visit(UInt8Array array) => CreateBuffers(array);
-            public void Visit(UInt16Array array) => CreateBuffers(array);
-            public void Visit(UInt32Array array) => CreateBuffers(array);
-            public void Visit(UInt64Array array) => CreateBuffers(array);
+            public void VisitArray(IArrowArray array)
+            {
+                _fieldNodes.Add(new FieldNode(array.Length, array.NullCount));
+
+                array.Accept(this);
+            }
+
+            public void Visit(Int8Array array) => VisitPrimitiveArray(array);
+            public void Visit(Int16Array array) => VisitPrimitiveArray(array);
+            public void Visit(Int32Array array) => VisitPrimitiveArray(array);
+            public void Visit(Int64Array array) => VisitPrimitiveArray(array);
+            public void Visit(UInt8Array array) => VisitPrimitiveArray(array);
+            public void Visit(UInt16Array array) => VisitPrimitiveArray(array);
+            public void Visit(UInt32Array array) => VisitPrimitiveArray(array);
+            public void Visit(UInt64Array array) => VisitPrimitiveArray(array);
 #if NET5_0_OR_GREATER
-            public void Visit(HalfFloatArray array) => CreateBuffers(array);
+            public void Visit(HalfFloatArray array) => VisitPrimitiveArray(array);
 #endif
-            public void Visit(FloatArray array) => CreateBuffers(array);
-            public void Visit(DoubleArray array) => CreateBuffers(array);
-            public void Visit(TimestampArray array) => CreateBuffers(array);
-            public void Visit(BooleanArray array) => CreateBuffers(array);
-            public void Visit(Date32Array array) => CreateBuffers(array);
-            public void Visit(Date64Array array) => CreateBuffers(array);
-            public void Visit(Time32Array array) => CreateBuffers(array);
-            public void Visit(Time64Array array) => CreateBuffers(array);
-            public void Visit(DurationArray array) => CreateBuffers(array);
-            public void Visit(YearMonthIntervalArray array) => CreateBuffers(array);
-            public void Visit(DayTimeIntervalArray array) => CreateBuffers(array);
-            public void Visit(MonthDayNanosecondIntervalArray array) => CreateBuffers(array);
+            public void Visit(FloatArray array) => VisitPrimitiveArray(array);
+            public void Visit(DoubleArray array) => VisitPrimitiveArray(array);
+            public void Visit(TimestampArray array) => VisitPrimitiveArray(array);
+            public void Visit(Date32Array array) => VisitPrimitiveArray(array);
+            public void Visit(Date64Array array) => VisitPrimitiveArray(array);
+            public void Visit(Time32Array array) => VisitPrimitiveArray(array);
+            public void Visit(Time64Array array) => VisitPrimitiveArray(array);
+            public void Visit(DurationArray array) => VisitPrimitiveArray(array);
+            public void Visit(YearMonthIntervalArray array) => VisitPrimitiveArray(array);
+            public void Visit(DayTimeIntervalArray array) => VisitPrimitiveArray(array);
+            public void Visit(MonthDayNanosecondIntervalArray array) => VisitPrimitiveArray(array);
+
+            private void VisitPrimitiveArray<T>(PrimitiveArray<T> array)
+                where T : struct, IEquatable<T>
+            {
+                _buffers.Add(CreateBitmapBuffer(array.NullBitmapBuffer, array.Offset, array.Length));
+                _buffers.Add(CreateSlicedBuffer<T>(array.ValueBuffer, array.Offset, array.Length));
+            }
+
+            public void Visit(BooleanArray array)
+            {
+                _buffers.Add(CreateBitmapBuffer(array.NullBitmapBuffer, array.Offset, array.Length));
+                _buffers.Add(CreateBitmapBuffer(array.ValueBuffer, array.Offset, array.Length));
+            }
 
             public void Visit(ListArray array)
             {
-                _buffers.Add(CreateBuffer(array.NullBitmapBuffer));
-                _buffers.Add(CreateBuffer(array.ValueOffsetsBuffer));
+                _buffers.Add(CreateBitmapBuffer(array.NullBitmapBuffer, array.Offset, array.Length));
+                _buffers.Add(CreateBuffer(GetZeroBasedValueOffsets(array.ValueOffsetsBuffer, array.Offset, array.Length)));
 
-                array.Values.Accept(this);
+                int valuesOffset = 0;
+                int valuesLength = 0;
+                if (array.Length > 0)
+                {
+                    valuesOffset = array.ValueOffsets[0];
+                    valuesLength = array.ValueOffsets[array.Length] - valuesOffset;
+                }
+
+                var values = array.Values;
+                if (valuesOffset > 0 || valuesLength < values.Length)
+                {
+                    values = ArrowArrayFactory.Slice(values, valuesOffset, valuesLength);
+                }
+
+                VisitArray(values);
             }
 
             public void Visit(ListViewArray array)
             {
-                _buffers.Add(CreateBuffer(array.NullBitmapBuffer));
-                _buffers.Add(CreateBuffer(array.ValueOffsetsBuffer));
-                _buffers.Add(CreateBuffer(array.SizesBuffer));
+                var (valueOffsetsBuffer, minOffset, maxEnd) = GetZeroBasedListViewOffsets(array);
+
+                _buffers.Add(CreateBitmapBuffer(array.NullBitmapBuffer, array.Offset, array.Length));
+                _buffers.Add(CreateBuffer(valueOffsetsBuffer));
+                _buffers.Add(CreateSlicedBuffer<int>(array.SizesBuffer, array.Offset, array.Length));
+
+                IArrowArray values = array.Values;
+                if (minOffset != 0 || values.Length != maxEnd)
+                {
+                    values = ArrowArrayFactory.Slice(values, minOffset, maxEnd - minOffset);
+                }
 
-                array.Values.Accept(this);
+                VisitArray(values);
             }
 
             public void Visit(FixedSizeListArray array)
             {
-                _buffers.Add(CreateBuffer(array.NullBitmapBuffer));
+                _buffers.Add(CreateBitmapBuffer(array.NullBitmapBuffer, array.Offset, array.Length));
 
-                array.Values.Accept(this);
+                var listSize = ((FixedSizeListType)array.Data.DataType).ListSize;
+                var valuesSlice =
+                    ArrowArrayFactory.Slice(array.Values, array.Offset * listSize, array.Length * listSize);
+
+                VisitArray(valuesSlice);
             }
 
             public void Visit(StringArray array) => Visit(array as BinaryArray);
@@ -155,15 +216,24 @@ public void Visit(FixedSizeListArray array)
 
             public void Visit(BinaryArray array)
             {
-                _buffers.Add(CreateBuffer(array.NullBitmapBuffer));
-                _buffers.Add(CreateBuffer(array.ValueOffsetsBuffer));
-                _buffers.Add(CreateBuffer(array.ValueBuffer));
+                _buffers.Add(CreateBitmapBuffer(array.NullBitmapBuffer, array.Offset, array.Length));
+                _buffers.Add(CreateBuffer(GetZeroBasedValueOffsets(array.ValueOffsetsBuffer, array.Offset, array.Length)));
+
+                int valuesOffset = 0;
+                int valuesLength = 0;
+                if (array.Length > 0)
+                {
+                    valuesOffset = array.ValueOffsets[0];
+                    valuesLength = array.ValueOffsets[array.Length] - valuesOffset;
+                }
+
+                _buffers.Add(CreateSlicedBuffer<byte>(array.ValueBuffer, valuesOffset, valuesLength));
             }
 
             public void Visit(BinaryViewArray array)
             {
-                _buffers.Add(CreateBuffer(array.NullBitmapBuffer));
-                _buffers.Add(CreateBuffer(array.ViewsBuffer));
+                _buffers.Add(CreateBitmapBuffer(array.NullBitmapBuffer, array.Offset, array.Length));
+                _buffers.Add(CreateSlicedBuffer<Scalars.BinaryView>(array.ViewsBuffer, array.Offset, array.Length));
                 for (int i = 0; i < array.DataBufferCount; i++)
                 {
                     _buffers.Add(CreateBuffer(array.DataBuffer(i)));
@@ -174,45 +244,40 @@ public void Visit(BinaryViewArray array)
 
             public void Visit(FixedSizeBinaryArray array)
             {
-                _buffers.Add(CreateBuffer(array.NullBitmapBuffer));
-                _buffers.Add(CreateBuffer(array.ValueBuffer));
+                var itemSize = ((FixedSizeBinaryType)array.Data.DataType).ByteWidth;
+                _buffers.Add(CreateBitmapBuffer(array.NullBitmapBuffer, array.Offset, array.Length));
+                _buffers.Add(CreateSlicedBuffer(array.ValueBuffer, itemSize, array.Offset, array.Length));
             }
 
-            public void Visit(Decimal128Array array)
-            {
-                _buffers.Add(CreateBuffer(array.NullBitmapBuffer));
-                _buffers.Add(CreateBuffer(array.ValueBuffer));
-            }
+            public void Visit(Decimal128Array array) => Visit(array as FixedSizeBinaryArray);
 
-            public void Visit(Decimal256Array array)
-            {
-                _buffers.Add(CreateBuffer(array.NullBitmapBuffer));
-                _buffers.Add(CreateBuffer(array.ValueBuffer));
-            }
+            public void Visit(Decimal256Array array) => Visit(array as FixedSizeBinaryArray);
 
             public void Visit(StructArray array)
             {
-                _buffers.Add(CreateBuffer(array.NullBitmapBuffer));
+                _buffers.Add(CreateBitmapBuffer(array.NullBitmapBuffer, array.Offset, array.Length));
 
                 for (int i = 0; i < array.Fields.Count; i++)
                 {
-                    array.Fields[i].Accept(this);
+                    // Fields property accessor handles slicing field arrays if required
+                    VisitArray(array.Fields[i]);
                 }
             }
 
             public void Visit(UnionArray array)
             {
-                _buffers.Add(CreateBuffer(array.TypeBuffer));
+                _buffers.Add(CreateSlicedBuffer<byte>(array.TypeBuffer, array.Offset, array.Length));
 
                 ArrowBuffer? offsets = (array as DenseUnionArray)?.ValueOffsetBuffer;
                 if (offsets != null)
                 {
-                    _buffers.Add(CreateBuffer(offsets.Value));
+                    _buffers.Add(CreateSlicedBuffer<int>(offsets.Value, array.Offset, array.Length));
                 }
 
                 for (int i = 0; i < array.Fields.Count; i++)
                 {
-                    array.Fields[i].Accept(this);
+                    // Fields property accessor handles slicing field arrays for sparse union arrays if required
+                    VisitArray(array.Fields[i]);
                 }
             }
 
@@ -221,8 +286,7 @@ public void Visit(DictionaryArray array)
                 // Dictionary is serialized separately in Dictionary serialization.
                 // We are only interested in indices at this context.
 
-                _buffers.Add(CreateBuffer(array.NullBitmapBuffer));
-                _buffers.Add(CreateBuffer(array.IndicesBuffer));
+                array.Indices.Accept(this);
             }
 
             public void Visit(NullArray array)
@@ -230,25 +294,152 @@ public void Visit(NullArray array)
                 // There are no buffers for a NullArray
             }
 
-            private void CreateBuffers(BooleanArray array)
+            private ArrowBuffer GetZeroBasedValueOffsets(ArrowBuffer valueOffsetsBuffer, int arrayOffset, int arrayLength)
+            {
+                var requiredBytes = CalculatePaddedBufferLength(sizeof(int) * (arrayLength + 1));
+
+                if (arrayOffset != 0)
+                {
+                    // Array has been sliced, so we need to shift and adjust the offsets
+                    var originalOffsets = valueOffsetsBuffer.Span.CastTo<int>().Slice(arrayOffset, arrayLength + 1);
+                    var firstOffset = arrayLength > 0 ? originalOffsets[0] : 0;
+
+                    var newValueOffsetsBuffer = _allocator.Allocate(requiredBytes);
+                    var newValueOffsets = newValueOffsetsBuffer.Memory.Span.CastTo<int>();
+
+                    for (int i = 0; i < arrayLength + 1; ++i)
+                    {
+                        newValueOffsets[i] = originalOffsets[i] - firstOffset;
+                    }
+
+                    return new ArrowBuffer(newValueOffsetsBuffer);
+                }
+                else if (valueOffsetsBuffer.Length > requiredBytes)
+                {
+                    // Array may have been sliced but the offset is zero,
+                    // so we can truncate the existing offsets
+                    return new ArrowBuffer(valueOffsetsBuffer.Memory.Slice(0, requiredBytes));
+                }
+                else
+                {
+                    // Use the full buffer
+                    return valueOffsetsBuffer;
+                }
+            }
+
+            private (ArrowBuffer Buffer, int minOffset, int maxEnd) GetZeroBasedListViewOffsets(ListViewArray array)
             {
-                _buffers.Add(CreateBuffer(array.NullBitmapBuffer));
-                _buffers.Add(CreateBuffer(array.ValueBuffer));
+                if (array.Length == 0)
+                {
+                    return (ArrowBuffer.Empty, 0, 0);
+                }
+
+                var offsets = array.ValueOffsets;
+                var sizes = array.Sizes;
+
+                int minOffset = offsets[0];
+                int maxEnd = offsets[array.Length - 1] + sizes[array.Length - 1];
+
+                // Min possible offset is zero, and max possible end is the values length.
+                // If these match the first offset and last end we don't need to do anything further,
+                // but otherwise we need to iterate over each index in case the offsets aren't ordered.
+                if (minOffset != 0 || maxEnd != array.Values.Length)
+                {
+                    for (int i = 0; i < array.Length; ++i)
+                    {
+                        minOffset = Math.Min(minOffset, offsets[i]);
+                        maxEnd = Math.Max(maxEnd, offsets[i] + sizes[i]);
+                    }
+                }
+
+                var requiredBytes = CalculatePaddedBufferLength(sizeof(int) * array.Length);
+
+                if (minOffset == 0)
+                {
+                    // No need to adjust the offsets, but we may need to slice the offsets buffer.
+                    ArrowBuffer buffer = array.ValueOffsetsBuffer;
+                    if (array.Offset != 0 || buffer.Length > requiredBytes)
+                    {
+                        var byteOffset = sizeof(int) * array.Offset;
+                        var sliceLength = Math.Min(requiredBytes, buffer.Length - byteOffset);
+                        buffer = new ArrowBuffer(buffer.Memory.Slice(byteOffset, sliceLength));
+                    }
+
+                    return (buffer, minOffset, maxEnd);
+                }
+
+                // Compute shifted offsets
+                var newOffsetsBuffer = _allocator.Allocate(requiredBytes);
+                var newOffsets = newOffsetsBuffer.Memory.Span.CastTo<int>();
+                for (int i = 0; i < array.Length; ++i)
+                {
+                    newOffsets[i] = offsets[i] - minOffset;
+                }
+
+                return (new ArrowBuffer(newOffsetsBuffer), minOffset, maxEnd);
             }
 
-            private void CreateBuffers<T>(PrimitiveArray<T> array)
+            private Buffer CreateBitmapBuffer(ArrowBuffer buffer, int offset, int length)
+            {
+                if (buffer.IsEmpty)
+                {
+                    return CreateBuffer(buffer.Memory);
+                }
+
+                var paddedLength = CalculatePaddedBufferLength(BitUtility.ByteCount(length));
+                if (offset % 8 == 0)
+                {
+                    var byteOffset = offset / 8;
+                    var sliceLength = Math.Min(paddedLength, buffer.Length - byteOffset);
+
+                    return CreateBuffer(buffer.Memory.Slice(byteOffset, sliceLength));
+                }
+                else
+                {
+                    // Need to copy bitmap so the first bit is aligned with the first byte
+                    var memoryOwner = _allocator.Allocate(paddedLength);
+                    var outputSpan = memoryOwner.Memory.Span;
+                    var inputSpan = buffer.Span;
+                    for (var i = 0; i < length; ++i)
+                    {
+                        BitUtility.SetBit(outputSpan, i, BitUtility.GetBit(inputSpan, offset + i));
+                    }
+
+                    return CreateBuffer(memoryOwner.Memory);
+                }
+            }
+
+            private Buffer CreateSlicedBuffer<T>(ArrowBuffer buffer, int offset, int length)
                 where T : struct
             {
-                _buffers.Add(CreateBuffer(array.NullBitmapBuffer));
-                _buffers.Add(CreateBuffer(array.ValueBuffer));
+                return CreateSlicedBuffer(buffer, Unsafe.SizeOf<T>(), offset, length);
+            }
+
+            private Buffer CreateSlicedBuffer(ArrowBuffer buffer, int itemSize, int offset, int length)
+            {
+                var byteLength = length * itemSize;
+                var paddedLength = CalculatePaddedBufferLength(byteLength);
+                if (offset != 0 || paddedLength < buffer.Length)
+                {
+                    var byteOffset = offset * itemSize;
+                    var sliceLength = Math.Min(paddedLength, buffer.Length - byteOffset);
+                    return CreateBuffer(buffer.Memory.Slice(byteOffset, sliceLength));
+                }
+
+                return CreateBuffer(buffer.Memory);
             }
 
             private Buffer CreateBuffer(ArrowBuffer buffer)
+            {
+                return CreateBuffer(buffer.Memory);
+            }
+
+            private Buffer CreateBuffer(ReadOnlyMemory<byte> buffer)
             {
                 int offset = TotalLength;
                 const int UncompressedLengthSize = 8;
 
-                ArrowBuffer bufferToWrite;
+                ReadOnlyMemory<byte> bufferToWrite;
                 if (_compressionCodec == null)
                 {
                     bufferToWrite = buffer;
@@ -258,7 +449,7 @@ private Buffer CreateBuffer(ArrowBuffer buffer)
                     // Write zero length and skip compression
                     var uncompressedLengthBytes = _allocator.Allocate(UncompressedLengthSize);
                     BinaryPrimitives.WriteInt64LittleEndian(uncompressedLengthBytes.Memory.Span, 0);
-                    bufferToWrite = new ArrowBuffer(uncompressedLengthBytes);
+                    bufferToWrite = uncompressedLengthBytes.Memory;
                 }
                 else
                 {
@@ -266,14 +457,14 @@ private Buffer CreateBuffer(ArrowBuffer buffer)
                     // compressed buffers are stored.
                     _compressionStream.Seek(0, SeekOrigin.Begin);
                     _compressionStream.SetLength(0);
-                    _compressionCodec.Compress(buffer.Memory, _compressionStream);
+                    _compressionCodec.Compress(buffer, _compressionStream);
                     if (_compressionStream.Length < buffer.Length)
                     {
                         var newBuffer = _allocator.Allocate((int) _compressionStream.Length + UncompressedLengthSize);
                         BinaryPrimitives.WriteInt64LittleEndian(newBuffer.Memory.Span, buffer.Length);
                         _compressionStream.Seek(0, SeekOrigin.Begin);
                         _compressionStream.ReadFullBuffer(newBuffer.Memory.Slice(UncompressedLengthSize));
-                        bufferToWrite = new ArrowBuffer(newBuffer);
+                        bufferToWrite = newBuffer.Memory;
                     }
                     else
                     {
@@ -281,8 +472,8 @@ private Buffer CreateBuffer(ArrowBuffer buffer)
                         // buffer instead, and indicate this by setting the uncompressed length to -1
                         var newBuffer = _allocator.Allocate(buffer.Length + UncompressedLengthSize);
                         BinaryPrimitives.WriteInt64LittleEndian(newBuffer.Memory.Span, -1);
-                        buffer.Memory.CopyTo(newBuffer.Memory.Slice(UncompressedLengthSize));
-                        bufferToWrite = new ArrowBuffer(newBuffer);
+                        buffer.CopyTo(newBuffer.Memory.Slice(UncompressedLengthSize));
+                        bufferToWrite = newBuffer.Memory;
                     }
                 }
 
@@ -366,29 +557,6 @@ public ArrowStreamWriter(Stream baseStream, Schema schema, bool leaveOpen, IpcOp
             }
         }
 
-        private void CreateSelfAndChildrenFieldNodes(ArrayData data)
-        {
-            if (data.DataType is NestedType)
-            {
-                // flatbuffer struct vectors have to be created in reverse order
-                for (int i = data.Children.Length - 1; i >= 0; i--)
-                {
-                    CreateSelfAndChildrenFieldNodes(data.Children[i]);
-                }
-            }
-            Flatbuf.FieldNode.CreateFieldNode(Builder, data.Length, data.NullCount);
-        }
-
-        private static int CountAllNodes(IReadOnlyList<Field> fields)
-        {
-            int count = 0;
-            foreach (Field arrowArray in fields)
-            {
-                CountSelfAndChildrenNodes(arrowArray.DataType, ref count);
-            }
-            return count;
-        }
-
         private Offset<Flatbuf.BodyCompression> GetBodyCompression()
         {
             if (_options.CompressionCodec == null)
@@ -406,18 +574,6 @@ private static int CountAllNodes(IReadOnlyList<Field> fields)
                 Builder, compressionType, Flatbuf.BodyCompressionMethod.BUFFER);
         }
 
-        private static void CountSelfAndChildrenNodes(IArrowType type, ref int count)
-        {
-            if (type is NestedType nestedType)
-            {
-                foreach (Field childField in nestedType.Fields)
-                {
-                    CountSelfAndChildrenNodes(childField.DataType, ref count);
-                }
-            }
-            count++;
-        }
-
         private protected void WriteRecordBatchInternal(RecordBatch recordBatch)
         {
             // TODO: Truncate buffers with extraneous padding / unused capacity
@@ -461,8 +617,6 @@ private protected void WriteRecordBatchInternal(RecordBatch recordBatch)
         private protected async Task WriteRecordBatchInternalAsync(RecordBatch recordBatch,
             CancellationToken cancellationToken = default)
         {
-            // TODO: Truncate buffers with extraneous padding / unused capacity
-
             if (!HasWrittenSchema)
             {
                 await WriteSchemaAsync(Schema, cancellationToken).ConfigureAwait(false);
@@ -506,11 +660,11 @@ private long WriteBufferData(IReadOnlyList<ArrowRecordBatchFlatBufferBuilder.Buf
 
             for (int i = 0; i < buffers.Count; i++)
             {
-                ArrowBuffer buffer = buffers[i].DataBuffer;
+                ReadOnlyMemory<byte> buffer = buffers[i].DataBuffer;
                 if (buffer.IsEmpty)
                     continue;
 
-                WriteBuffer(buffer);
+                BaseStream.Write(buffer);
 
                 int paddedLength = checked((int)BitUtility.RoundUpToMultipleOf8(buffer.Length));
                 int padding = paddedLength - buffer.Length;
@@ -537,11 +691,11 @@ private async ValueTask<long> WriteBufferDataAsync(IReadOnlyList<ArrowRecordBatc
 
             for (int i = 0; i < buffers.Count; i++)
             {
-                ArrowBuffer buffer = buffers[i].DataBuffer;
+                ReadOnlyMemory<byte> buffer = buffers[i].DataBuffer;
                 if (buffer.IsEmpty)
                     continue;
 
-                await WriteBufferAsync(buffer, cancellationToken).ConfigureAwait(false);
+                await BaseStream.WriteAsync(buffer, cancellationToken).ConfigureAwait(false);
 
                 int paddedLength = checked((int)BitUtility.RoundUpToMultipleOf8(buffer.Length));
                 int padding = paddedLength - buffer.Length;
@@ -571,22 +725,6 @@ private Tuple<ArrowRecordBatchFlatBufferBuilder, VectorOffset, VectorOffset> Pre
         {
             Builder.Clear();
 
-            // Serialize field nodes
-
-            int fieldCount = fields.Count;
-
-            Flatbuf.RecordBatch.StartNodesVector(Builder, CountAllNodes(fields));
-
-            // flatbuffer struct vectors have to be created in reverse order
-            for (int i = fieldCount - 1; i >= 0; i--)
-            {
-                CreateSelfAndChildrenFieldNodes(arrays[i].Data);
-            }
-
-            VectorOffset fieldNodesVectorOffset = Builder.EndVector();
-
-            // Serialize buffers
-
             // CompressionCodec can be disposed after all data is visited by the builder,
             // and doesn't need to be alive for the full lifetime of the ArrowRecordBatchFlatBufferBuilder
             using var compressionCodec = _options.CompressionCodec.HasValue
@@ -594,20 +732,34 @@ private Tuple<ArrowRecordBatchFlatBufferBuilder, VectorOffset, VectorOffset> Pre
                 : null;
 
             var recordBatchBuilder = new ArrowRecordBatchFlatBufferBuilder(compressionCodec, _allocator, _compressionStream);
-            for (int i = 0; i < fieldCount; i++)
+
+            // Visit all arrays recursively
+            for (int i = 0; i < fields.Count; i++)
             {
                 IArrowArray fieldArray = arrays[i];
-                fieldArray.Accept(recordBatchBuilder);
+                recordBatchBuilder.VisitArray(fieldArray);
+            }
+
+            // Serialize field nodes
+            IReadOnlyList<ArrowRecordBatchFlatBufferBuilder.FieldNode> fieldNodes = recordBatchBuilder.FieldNodes;
+            Flatbuf.RecordBatch.StartNodesVector(Builder, fieldNodes.Count);
+
+            // flatbuffer struct vectors have to be created in reverse order
+            for (int i = fieldNodes.Count - 1; i >= 0; i--)
+            {
+                Flatbuf.FieldNode.CreateFieldNode(Builder, fieldNodes[i].Length, fieldNodes[i].NullCount);
             }
 
+            VectorOffset fieldNodesVectorOffset = Builder.EndVector();
+
             VectorOffset variadicCountOffset = default;
             if (recordBatchBuilder.VariadicCounts != null)
             {
                 variadicCountOffset = Flatbuf.RecordBatch.CreateVariadicCountsVectorBlock(Builder, recordBatchBuilder.VariadicCounts.ToArray());
             }
 
+            // Serialize buffers
             IReadOnlyList<ArrowRecordBatchFlatBufferBuilder.Buffer> buffers = recordBatchBuilder.Buffers;
-
             Flatbuf.RecordBatch.StartBuffersVector(Builder, buffers.Count);
 
             // flatbuffer struct vectors have to be created in reverse order
@@ -783,16 +935,6 @@ public async Task WriteEndAsync(CancellationToken cancellationToken = default)
             }
         }
 
-        private void WriteBuffer(ArrowBuffer arrowBuffer)
-        {
-            BaseStream.Write(arrowBuffer.Memory);
-        }
-
-        private ValueTask WriteBufferAsync(ArrowBuffer arrowBuffer, CancellationToken cancellationToken = default)
-        {
-            return BaseStream.WriteAsync(arrowBuffer.Memory, cancellationToken);
-        }
-
         private protected Offset<Flatbuf.Schema> SerializeSchema(Schema schema)
         {
             // Build metadata
@@ -1056,6 +1198,15 @@ protected int CalculatePadding(long offset, int alignment = 8)
             }
         }
 
+        private static int CalculatePaddedBufferLength(int length)
+        {
+            long result = BitUtility.RoundUpToMultiplePowerOfTwo(length, MemoryAllocator.DefaultAlignment);
+            checked
+            {
+                return (int)result;
+            }
+        }
+
         private protected void WritePadding(int length)
         {
             if (length > 0)
diff --git a/csharp/src/Apache.Arrow/Memory/NativeMemoryManager.cs b/csharp/src/Apache.Arrow/Memory/NativeMemoryManager.cs
index 8f0210b28240f..d42ee5279e795 100644
--- a/csharp/src/Apache.Arrow/Memory/NativeMemoryManager.cs
+++ b/csharp/src/Apache.Arrow/Memory/NativeMemoryManager.cs
@@ -40,10 +40,12 @@ internal NativeMemoryManager(INativeAllocationOwner owner, IntPtr ptr, int offse
             _owner = owner;
         }
 
+#pragma warning disable CA2015 // TODO: is this correct?
         ~NativeMemoryManager()
         {
             Dispose(false);
         }
+#pragma warning restore CA2015
 
         public override unsafe Span<byte> GetSpan()
         {
diff --git a/csharp/src/Apache.Arrow/Scalars/BinaryView.cs b/csharp/src/Apache.Arrow/Scalars/BinaryView.cs
index eaba89c7a3a8e..143e6875f050f 100644
--- a/csharp/src/Apache.Arrow/Scalars/BinaryView.cs
+++ b/csharp/src/Apache.Arrow/Scalars/BinaryView.cs
@@ -83,7 +83,7 @@ private BinaryView(int length, int prefix, int bufferIndex, int offset)
         public bool IsInline => Length <= MaxInlineLength;
 
 #if NET5_0_OR_GREATER
-        public ReadOnlySpan<byte> Bytes => MemoryMarshal.CreateReadOnlySpan<byte>(ref Unsafe.AsRef(_inline[0]), IsInline ? Length : PrefixLength);
+        public ReadOnlySpan<byte> Bytes => MemoryMarshal.CreateReadOnlySpan<byte>(ref Unsafe.AsRef(in _inline[0]), IsInline ? Length : PrefixLength);
 #else
         public unsafe ReadOnlySpan<byte> Bytes => new ReadOnlySpan<byte>(Unsafe.AsPointer(ref _inline[0]), IsInline ? Length : PrefixLength);
 #endif
diff --git a/csharp/test/Apache.Arrow.Benchmarks/Apache.Arrow.Benchmarks.csproj b/csharp/test/Apache.Arrow.Benchmarks/Apache.Arrow.Benchmarks.csproj
index df76fd4a7b45f..f735f01b022d0 100644
--- a/csharp/test/Apache.Arrow.Benchmarks/Apache.Arrow.Benchmarks.csproj
+++ b/csharp/test/Apache.Arrow.Benchmarks/Apache.Arrow.Benchmarks.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.10" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.12" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/csharp/test/Apache.Arrow.Compression.Tests/Apache.Arrow.Compression.Tests.csproj b/csharp/test/Apache.Arrow.Compression.Tests/Apache.Arrow.Compression.Tests.csproj
index d4d124668e081..bd97372d1021b 100644
--- a/csharp/test/Apache.Arrow.Compression.Tests/Apache.Arrow.Compression.Tests.csproj
+++ b/csharp/test/Apache.Arrow.Compression.Tests/Apache.Arrow.Compression.Tests.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/csharp/test/Apache.Arrow.Flight.Sql.Tests/Apache.Arrow.Flight.Sql.Tests.csproj b/csharp/test/Apache.Arrow.Flight.Sql.Tests/Apache.Arrow.Flight.Sql.Tests.csproj
index ad6efbd7b45e7..5a5a92ccd2c7f 100644
--- a/csharp/test/Apache.Arrow.Flight.Sql.Tests/Apache.Arrow.Flight.Sql.Tests.csproj
+++ b/csharp/test/Apache.Arrow.Flight.Sql.Tests/Apache.Arrow.Flight.Sql.Tests.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <TargetFramework>net7.0</TargetFramework>
+      <TargetFramework>net8.0</TargetFramework>
       <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-      <PackageReference Include="xunit" Version="2.7.0" />
-      <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+      <PackageReference Include="xunit" Version="2.8.1" />
+      <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />
       <PackageReference Include="coverlet.collector" Version="6.0.2" />
     </ItemGroup>
 
diff --git a/csharp/test/Apache.Arrow.Flight.Sql.Tests/FlightSqlServerTests.cs b/csharp/test/Apache.Arrow.Flight.Sql.Tests/FlightSqlServerTests.cs
index 4ad5bde0874a8..e5e64b073f799 100644
--- a/csharp/test/Apache.Arrow.Flight.Sql.Tests/FlightSqlServerTests.cs
+++ b/csharp/test/Apache.Arrow.Flight.Sql.Tests/FlightSqlServerTests.cs
@@ -14,6 +14,7 @@
 // limitations under the License.
 
 #nullable enable
+
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -65,7 +66,7 @@ public async Task EnsureTheCorrectActionsAreGiven()
         var streamWriter = new MockServerStreamWriter<FlightActionType>();
 
         //When
-        await producer.ListActions(streamWriter, new MockServerCallContext()).ConfigureAwait(false);
+        await producer.ListActions(streamWriter, new MockServerCallContext());
         var actions = streamWriter.Messages.ToArray();
 
         Assert.Equal(FlightSqlUtils.FlightSqlActions, actions);
@@ -115,7 +116,7 @@ public void EnsureTableSchemaIsCorrectWithoutTableSchema(bool includeTableSchema
     [InlineData(typeof(CommandGetImportedKeys), "GetImportedKeysFlightInfo")]
     [InlineData(typeof(CommandGetCrossReference), "GetCrossReferenceFlightInfo")]
     [InlineData(typeof(CommandGetXdbcTypeInfo), "GetXdbcTypeFlightInfo")]
-    public async void EnsureGetFlightInfoIsCorrectlyRoutedForCommand(Type commandType, string expectedResult)
+    public async Task EnsureGetFlightInfoIsCorrectlyRoutedForCommand(Type commandType, string expectedResult)
     {
         //Given
         var command = (IMessage) Activator.CreateInstance(commandType)!;
@@ -131,7 +132,7 @@ public async void EnsureGetFlightInfoIsCorrectlyRoutedForCommand(Type commandTyp
 
 
     [Fact]
-    public async void EnsureAnInvalidOperationExceptionIsThrownWhenACommandIsNotSupportedAndHasNoDescriptor()
+    public async Task EnsureAnInvalidOperationExceptionIsThrownWhenACommandIsNotSupportedAndHasNoDescriptor()
     {
         //Given
         var producer = new TestFlightSqlSever();
@@ -145,7 +146,7 @@ public async void EnsureAnInvalidOperationExceptionIsThrownWhenACommandIsNotSupp
     }
 
     [Fact]
-    public async void EnsureAnInvalidOperationExceptionIsThrownWhenACommandIsNotSupported()
+    public async Task EnsureAnInvalidOperationExceptionIsThrownWhenACommandIsNotSupported()
     {
         //Given
         var producer = new TestFlightSqlSever();
@@ -175,7 +176,7 @@ public async void EnsureAnInvalidOperationExceptionIsThrownWhenACommandIsNotSupp
     [InlineData(typeof(CommandGetImportedKeys), "DoGetImportedKeys")]
     [InlineData(typeof(CommandGetCrossReference), "DoGetCrossReference")]
     [InlineData(typeof(CommandGetXdbcTypeInfo), "DoGetXbdcTypeInfo")]
-    public async void EnsureDoGetIsCorrectlyRoutedForADoGetCommand(Type commandType, string expectedResult)
+    public async Task EnsureDoGetIsCorrectlyRoutedForADoGetCommand(Type commandType, string expectedResult)
     {
         //Given
         var producer = new TestFlightSqlSever();
@@ -192,7 +193,7 @@ public async void EnsureDoGetIsCorrectlyRoutedForADoGetCommand(Type commandType,
     }
 
     [Fact]
-    public async void EnsureAnInvalidOperationExceptionIsThrownWhenADoGetCommandIsNotSupported()
+    public async Task EnsureAnInvalidOperationExceptionIsThrownWhenADoGetCommandIsNotSupported()
     {
         //Given
         var producer = new TestFlightSqlSever();
@@ -213,7 +214,7 @@ public async void EnsureAnInvalidOperationExceptionIsThrownWhenADoGetCommandIsNo
     [InlineData(SqlAction.CloseRequest, typeof(ActionClosePreparedStatementRequest), "ClosePreparedStatement")]
     [InlineData(SqlAction.CreateRequest, typeof(ActionCreatePreparedStatementRequest), "CreatePreparedStatement")]
     [InlineData("BadCommand", typeof(ActionCreatePreparedStatementRequest), "Action type BadCommand not supported", true)]
-    public async void EnsureDoActionIsCorrectlyRoutedForAnActionRequest(string actionType, Type actionBodyType, string expectedResponse, bool isException = false)
+    public async Task EnsureDoActionIsCorrectlyRoutedForAnActionRequest(string actionType, Type actionBodyType, string expectedResponse, bool isException = false)
     {
         //Given
         var producer = new TestFlightSqlSever();
@@ -237,19 +238,19 @@ public async void EnsureDoActionIsCorrectlyRoutedForAnActionRequest(string actio
     [InlineData(typeof(CommandPreparedStatementQuery), "PutPreparedStatementQuery")]
     [InlineData(typeof(CommandPreparedStatementUpdate), "PutPreparedStatementUpdate")]
     [InlineData(typeof(CommandGetXdbcTypeInfo), "Command CommandGetXdbcTypeInfo not supported", true)]
-    public async void EnsureDoPutIsCorrectlyRoutedForTheCommand(Type commandType, string expectedResponse, bool isException = false)
+    public async Task EnsureDoPutIsCorrectlyRoutedForTheCommand(Type commandType, string expectedResponse, bool isException = false)
     {
         //Given
         var command = (IMessage) Activator.CreateInstance(commandType)!;
         var producer = new TestFlightSqlSever();
         var descriptor = FlightDescriptor.CreateCommandDescriptor(command.PackAndSerialize().ToArray());
         var recordBatch = new RecordBatch(new Schema(new List<Field>(), null), System.Array.Empty<Int8Array>(), 0);
-        var reader = new MockStreamReader<FlightData>(await recordBatch.ToFlightData(descriptor).ConfigureAwait(false));
+        var reader = new MockStreamReader<FlightData>(await recordBatch.ToFlightData(descriptor));
         var batchReader = new FlightServerRecordBatchStreamReader(reader);
         var mockStreamWriter = new MockServerStreamWriter<FlightPutResult>();
 
         //When
-        async Task Act() => await producer.DoPut(batchReader, mockStreamWriter, new MockServerCallContext()).ConfigureAwait(false);
+        async Task Act() => await producer.DoPut(batchReader, mockStreamWriter, new MockServerCallContext());
         var exception = await Record.ExceptionAsync(Act);
         string? actualMessage = isException ? exception?.Message : mockStreamWriter.Messages[0].ApplicationMetadata.ToStringUtf8();
 
@@ -271,7 +272,7 @@ private class MockServerCallContext : ServerCallContext
         protected override CancellationToken CancellationTokenCore => default;
         protected override Metadata ResponseTrailersCore => new();
         protected override Status StatusCore { get; set; }
-        protected override WriteOptions WriteOptionsCore { get; set; } = WriteOptions.Default;
+        protected override WriteOptions? WriteOptionsCore { get; set; } = WriteOptions.Default;
         protected override AuthContext AuthContextCore => new("", new Dictionary<string, List<AuthProperty>>());
     }
 }
@@ -325,7 +326,7 @@ public static async Task<Schema> GetSchema(this IEnumerable<FlightData> flightDa
     public static async Task<IEnumerable<FlightData>> ToFlightData(this RecordBatch recordBatch, FlightDescriptor? descriptor = null)
     {
         var responseStream = new MockFlightServerRecordBatchStreamWriter();
-        await responseStream.WriteRecordBatchAsync(recordBatch).ConfigureAwait(false);
+        await responseStream.WriteRecordBatchAsync(recordBatch);
         if (descriptor == null)
         {
             return responseStream.FlightData;
diff --git a/csharp/test/Apache.Arrow.Flight.TestWeb/Apache.Arrow.Flight.TestWeb.csproj b/csharp/test/Apache.Arrow.Flight.TestWeb/Apache.Arrow.Flight.TestWeb.csproj
index 3aaebb103f9da..789fb9569edba 100644
--- a/csharp/test/Apache.Arrow.Flight.TestWeb/Apache.Arrow.Flight.TestWeb.csproj
+++ b/csharp/test/Apache.Arrow.Flight.TestWeb/Apache.Arrow.Flight.TestWeb.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.AspNetCore" Version="2.59.0" />
+    <PackageReference Include="Grpc.AspNetCore" Version="2.63.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/csharp/test/Apache.Arrow.Flight.Tests/Apache.Arrow.Flight.Tests.csproj b/csharp/test/Apache.Arrow.Flight.Tests/Apache.Arrow.Flight.Tests.csproj
index 6f1b4e180e4fc..132f17fa212a5 100644
--- a/csharp/test/Apache.Arrow.Flight.Tests/Apache.Arrow.Flight.Tests.csproj
+++ b/csharp/test/Apache.Arrow.Flight.Tests/Apache.Arrow.Flight.Tests.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />
     <PackageReference Include="coverlet.collector" Version="6.0.2" />
   </ItemGroup>
 
diff --git a/csharp/test/Apache.Arrow.Flight.Tests/FlightTests.cs b/csharp/test/Apache.Arrow.Flight.Tests/FlightTests.cs
index ebc38354b5c28..aac4e4209240a 100644
--- a/csharp/test/Apache.Arrow.Flight.Tests/FlightTests.cs
+++ b/csharp/test/Apache.Arrow.Flight.Tests/FlightTests.cs
@@ -288,9 +288,9 @@ public async Task TestHandshake()
         {
             var duplexStreamingCall = _flightClient.Handshake();
 
-            await duplexStreamingCall.RequestStream.WriteAsync(new FlightHandshakeRequest(ByteString.Empty)).ConfigureAwait(false);
-            await duplexStreamingCall.RequestStream.CompleteAsync().ConfigureAwait(false);
-            var results = await duplexStreamingCall.ResponseStream.ToListAsync().ConfigureAwait(false);
+            await duplexStreamingCall.RequestStream.WriteAsync(new FlightHandshakeRequest(ByteString.Empty));
+            await duplexStreamingCall.RequestStream.CompleteAsync();
+            var results = await duplexStreamingCall.ResponseStream.ToListAsync();
 
             Assert.Single(results);
             Assert.Equal("Done", results.First().Payload.ToStringUtf8());
@@ -303,10 +303,10 @@ public async Task TestSingleExchange()
             var duplexStreamingCall = _flightClient.DoExchange(flightDescriptor);
             var expectedBatch = CreateTestBatch(0, 100);
 
-            await duplexStreamingCall.RequestStream.WriteAsync(expectedBatch).ConfigureAwait(false);
-            await duplexStreamingCall.RequestStream.CompleteAsync().ConfigureAwait(false);
+            await duplexStreamingCall.RequestStream.WriteAsync(expectedBatch);
+            await duplexStreamingCall.RequestStream.CompleteAsync();
 
-            var results = await duplexStreamingCall.ResponseStream.ToListAsync().ConfigureAwait(false);
+            var results = await duplexStreamingCall.ResponseStream.ToListAsync();
 
             Assert.Single(results);
             ArrowReaderVerifier.CompareBatches(expectedBatch, results.FirstOrDefault());
@@ -320,11 +320,11 @@ public async Task TestMultipleExchange()
             var expectedBatch1 = CreateTestBatch(0, 100);
             var expectedBatch2 = CreateTestBatch(100, 100);
 
-            await duplexStreamingCall.RequestStream.WriteAsync(expectedBatch1).ConfigureAwait(false);
-            await duplexStreamingCall.RequestStream.WriteAsync(expectedBatch2).ConfigureAwait(false);
-            await duplexStreamingCall.RequestStream.CompleteAsync().ConfigureAwait(false);
+            await duplexStreamingCall.RequestStream.WriteAsync(expectedBatch1);
+            await duplexStreamingCall.RequestStream.WriteAsync(expectedBatch2);
+            await duplexStreamingCall.RequestStream.CompleteAsync();
 
-            var results = await duplexStreamingCall.ResponseStream.ToListAsync().ConfigureAwait(false);
+            var results = await duplexStreamingCall.ResponseStream.ToListAsync();
 
             ArrowReaderVerifier.CompareBatches(expectedBatch1, results[0]);
             ArrowReaderVerifier.CompareBatches(expectedBatch2, results[1]);
@@ -338,8 +338,8 @@ public async Task TestExchangeWithMetadata()
             var expectedBatch = CreateTestBatch(0, 100);
             var expectedMetadata = ByteString.CopyFromUtf8("test metadata");
 
-            await duplexStreamingCall.RequestStream.WriteAsync(expectedBatch, expectedMetadata).ConfigureAwait(false);
-            await duplexStreamingCall.RequestStream.CompleteAsync().ConfigureAwait(false);
+            await duplexStreamingCall.RequestStream.WriteAsync(expectedBatch, expectedMetadata);
+            await duplexStreamingCall.RequestStream.CompleteAsync();
 
             List<ByteString> actualMetadata = new List<ByteString>();
             List<RecordBatch> actualBatch = new List<RecordBatch>();
@@ -358,9 +358,9 @@ public async Task TestHandshakeWithSpecificMessage()
         {
             var duplexStreamingCall = _flightClient.Handshake();
 
-            await duplexStreamingCall.RequestStream.WriteAsync(new FlightHandshakeRequest(ByteString.CopyFromUtf8("Hello"))).ConfigureAwait(false);
-            await duplexStreamingCall.RequestStream.CompleteAsync().ConfigureAwait(false);
-            var results = await duplexStreamingCall.ResponseStream.ToListAsync().ConfigureAwait(false);
+            await duplexStreamingCall.RequestStream.WriteAsync(new FlightHandshakeRequest(ByteString.CopyFromUtf8("Hello")));
+            await duplexStreamingCall.RequestStream.CompleteAsync();
+            var results = await duplexStreamingCall.ResponseStream.ToListAsync();
 
             Assert.Single(results);
             Assert.Equal("Hello handshake", results.First().Payload.ToStringUtf8());
diff --git a/csharp/test/Apache.Arrow.IntegrationTest/Apache.Arrow.IntegrationTest.csproj b/csharp/test/Apache.Arrow.IntegrationTest/Apache.Arrow.IntegrationTest.csproj
index e77f329bf2a15..7f226fd08818f 100644
--- a/csharp/test/Apache.Arrow.IntegrationTest/Apache.Arrow.IntegrationTest.csproj
+++ b/csharp/test/Apache.Arrow.IntegrationTest/Apache.Arrow.IntegrationTest.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/csharp/test/Apache.Arrow.IntegrationTest/JsonFile.cs b/csharp/test/Apache.Arrow.IntegrationTest/JsonFile.cs
index 31a5676f01315..7232f74b8bec6 100644
--- a/csharp/test/Apache.Arrow.IntegrationTest/JsonFile.cs
+++ b/csharp/test/Apache.Arrow.IntegrationTest/JsonFile.cs
@@ -908,8 +908,8 @@ private static byte[] ConvertHexStringToByteArray(string hexString)
             };
 
             private void GenerateArray<T, TArray>(Func<ArrowBuffer, ArrowBuffer, int, int, int, TArray> createArray)
+                where T : struct, IEquatable<T>
                 where TArray : PrimitiveArray<T>
-                where T : struct
             {
                 ArrowBuffer validityBuffer = GetValidityBuffer(out int nullCount);
 
@@ -929,8 +929,8 @@ private void GenerateArray<T, TArray>(Func<ArrowBuffer, ArrowBuffer, int, int, i
             }
 
             private void GenerateLongArray<T, TArray>(Func<ArrowBuffer, ArrowBuffer, int, int, int, TArray> createArray, Func<string, T> parse)
+                where T : struct, IEquatable<T>
                 where TArray : PrimitiveArray<T>
-                where T : struct
             {
                 ArrowBuffer validityBuffer = GetValidityBuffer(out int nullCount);
 
@@ -950,8 +950,8 @@ private void GenerateLongArray<T, TArray>(Func<ArrowBuffer, ArrowBuffer, int, in
             }
 
             private void GenerateArray<T, TArray>(Func<ArrowBuffer, ArrowBuffer, int, int, int, TArray> createArray, Func<JsonElement, T> construct)
+                where T : struct, IEquatable<T>
                 where TArray : PrimitiveArray<T>
-                where T : struct
             {
                 ArrowBuffer validityBuffer = GetValidityBuffer(out int nullCount);
 
diff --git a/csharp/test/Apache.Arrow.Tests/Apache.Arrow.Tests.csproj b/csharp/test/Apache.Arrow.Tests/Apache.Arrow.Tests.csproj
index 3febfc92b97c8..a3290e3be14ee 100644
--- a/csharp/test/Apache.Arrow.Tests/Apache.Arrow.Tests.csproj
+++ b/csharp/test/Apache.Arrow.Tests/Apache.Arrow.Tests.csproj
@@ -4,19 +4,21 @@
   <PropertyGroup>
     <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <!-- Required for PythonNET -->
+    <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsWindows)'=='true'">
-    <TargetFrameworks>net7.0;net472;net462</TargetFrameworks>
+    <TargetFrameworks>net8.0;net472;net462</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(IsWindows)'!='true'">
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/csharp/test/Apache.Arrow.Tests/ArrowArrayBuilderFactoryReflector.cs b/csharp/test/Apache.Arrow.Tests/ArrowArrayBuilderFactoryReflector.cs
deleted file mode 100644
index 69894ab3cd325..0000000000000
--- a/csharp/test/Apache.Arrow.Tests/ArrowArrayBuilderFactoryReflector.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// 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.
-
-using System;
-using System.Reflection;
-using Apache.Arrow.Types;
-
-namespace Apache.Arrow.Tests
-{
-    static class ArrayArrayBuilderFactoryReflector
-    {
-        private static readonly MethodInfo s_buildInfo = typeof(ArrayData).Assembly.GetType("Apache.Arrow.ArrowArrayBuilderFactory")
-            .GetMethod("Build", BindingFlags.Static | BindingFlags.NonPublic);
-
-        internal static IArrowArrayBuilder<IArrowArray, IArrowArrayBuilder<IArrowArray>> InvokeBuild(IArrowType dataType)
-        {
-            return s_buildInfo.Invoke(null, new object[] { dataType }) as IArrowArrayBuilder<IArrowArray, IArrowArrayBuilder<IArrowArray>>;
-        }
-    }
-}
diff --git a/csharp/test/Apache.Arrow.Tests/ArrowArrayConcatenatorTests.cs b/csharp/test/Apache.Arrow.Tests/ArrowArrayConcatenatorTests.cs
index 25ef289f0dc25..2437d3d94c446 100644
--- a/csharp/test/Apache.Arrow.Tests/ArrowArrayConcatenatorTests.cs
+++ b/csharp/test/Apache.Arrow.Tests/ArrowArrayConcatenatorTests.cs
@@ -34,6 +34,16 @@ public void TestStandardCases()
             }
         }
 
+        [Fact]
+        public void TestConcatenateSlices()
+        {
+            foreach ((List<IArrowArray> testTargetArrayList, IArrowArray expectedArray) in GenerateTestData(slicedArrays: true))
+            {
+                IArrowArray actualArray = ArrowArrayConcatenator.Concatenate(testTargetArrayList);
+                ArrowReaderVerifier.CompareArrays(expectedArray, actualArray, strictCompare: false);
+            }
+        }
+
         [Fact]
         public void TestNullOrEmpty()
         {
@@ -49,7 +59,7 @@ public void TestSingleElement()
             ArrowReaderVerifier.CompareArrays(array, actualArray);
         }
 
-        private static IEnumerable<Tuple<List<IArrowArray>, IArrowArray>> GenerateTestData()
+        private static IEnumerable<Tuple<List<IArrowArray>, IArrowArray>> GenerateTestData(bool slicedArrays = false)
         {
             var targetTypes = new List<IArrowType>() {
                     BooleanType.Default,
@@ -78,7 +88,7 @@ private static IEnumerable<Tuple<List<IArrowArray>, IArrowArray>> GenerateTestDa
                         new Field.Builder().Name("Strings").DataType(StringType.Default).Nullable(true).Build(),
                         new Field.Builder().Name("Ints").DataType(Int32Type.Default).Nullable(true).Build()
                     }),
-                    new FixedSizeListType(Int32Type.Default, 1),
+                    new FixedSizeListType(Int32Type.Default, 2),
                     new UnionType(
                         new List<Field>{
                             new Field.Builder().Name("Strings").DataType(StringType.Default).Nullable(true).Build(),
@@ -106,7 +116,7 @@ private static IEnumerable<Tuple<List<IArrowArray>, IArrowArray>> GenerateTestDa
 
             foreach (IArrowType type in targetTypes)
             {
-                var creator = new TestDataGenerator();
+                var creator = new TestDataGenerator(slicedArrays);
                 type.Accept(creator);
                 yield return Tuple.Create(creator.TestTargetArrayList, creator.ExpectedArray);
             }
@@ -142,26 +152,44 @@ private class TestDataGenerator :
             IArrowTypeVisitor<UnionType>,
             IArrowTypeVisitor<MapType>
         {
+            private readonly List<List<int?>> _baseData;
 
-            private List<List<int?>> _baseData;
+            private readonly int _baseDataListCount;
 
-            private int _baseDataListCount;
+            private readonly int _resultTotalElementCount;
 
-            private int _baseDataTotalElementCount;
+            private readonly List<(int Offset, int Length)> _sliceParameters = null;
 
             public List<IArrowArray> TestTargetArrayList { get; }
             public IArrowArray ExpectedArray { get; private set; }
 
-            public TestDataGenerator()
+            public TestDataGenerator(bool slicedArrays)
             {
                 _baseData = new List<List<int?>> {
-                    new List<int?> { 1, 2, 3 },
-                    new List<int?> { 100, 101, null },
-                    new List<int?> { 11, null, 12 },
+                    new List<int?> { 1, 2, 3, 4, 5, 6 },
+                    new List<int?> { 100, 101, null, 102, null, 103 },
+                    new List<int?> { null, null },
+                    new List<int?> { },
+                    new List<int?> { 11, null, 12, 13, 14 },
                 };
 
+                if (slicedArrays)
+                {
+                    _sliceParameters = new List<(int, int)>
+                    {
+                        (2, 3),
+                        (0, 5),
+                        (0, 2),
+                        (0, 0),
+                        (1, 4),
+                    };
+                }
+
                 _baseDataListCount = _baseData.Count;
-                _baseDataTotalElementCount = _baseData.Sum(_ => _.Count);
+                _resultTotalElementCount = slicedArrays
+                    ? _sliceParameters.Sum(p => p.Length)
+                    : _baseData.Sum(baseList => baseList.Count);
+
                 TestTargetArrayList = new List<IArrowArray>(_baseDataListCount);
             }
 
@@ -179,166 +207,35 @@ public TestDataGenerator()
             public void Visit(Date32Type type) => GenerateTestData<DateTime, Date32Array, Date32Array.Builder>(type, x => DateTime.MinValue.AddDays(x));
             public void Visit(Date64Type type) => GenerateTestData<DateTime, Date64Array, Date64Array.Builder>(type, x => DateTime.MinValue.AddDays(x));
 
-            public void Visit(Decimal128Type type)
-            {
-                Decimal128Array.Builder resultBuilder = new Decimal128Array.Builder(type).Reserve(_baseDataTotalElementCount);
+            public void Visit(Decimal128Type type) => GenerateTestData<Decimal128Array, Decimal128Array.Builder>(type, (builder, x) => builder.Append(x));
 
-                for (int i = 0; i < _baseDataListCount; i++)
-                {
-                    List<int?> dataList = _baseData[i];
-                    Decimal128Array.Builder builder = new Decimal128Array.Builder(type).Reserve(dataList.Count);
-                    foreach (decimal? value in dataList)
-                    {
-                        if (value.HasValue)
-                        {
-                            builder.Append(value.Value);
-                            resultBuilder.Append(value.Value);
-                        }
-                        else
-                        {
-                            builder.AppendNull();
-                            resultBuilder.AppendNull();
-                        }
-                    }
-                    TestTargetArrayList.Add(builder.Build());
-                }
-
-                ExpectedArray = resultBuilder.Build();
-            }
-
-            public void Visit(Decimal256Type type)
-            {
-                Decimal256Array.Builder resultBuilder = new Decimal256Array.Builder(type).Reserve(_baseDataTotalElementCount);
-
-                for (int i = 0; i < _baseDataListCount; i++)
-                {
-                    List<int?> dataList = _baseData[i];
-                    Decimal256Array.Builder builder = new Decimal256Array.Builder(type).Reserve(dataList.Count);
-                    foreach (decimal? value in dataList)
-                    {
-                        if (value.HasValue)
-                        {
-                            builder.Append(value.Value);
-                            resultBuilder.Append(value.Value);
-                        }
-                        else
-                        {
-                            builder.AppendNull();
-                            resultBuilder.AppendNull();
-                        }
-                    }
-                    TestTargetArrayList.Add(builder.Build());
-                }
-
-                ExpectedArray = resultBuilder.Build();
-            }
+            public void Visit(Decimal256Type type) => GenerateTestData<Decimal256Array, Decimal256Array.Builder>(type, (builder, x) => builder.Append(x));
 
             public void Visit(TimestampType type)
             {
-                TimestampArray.Builder resultBuilder = new TimestampArray.Builder().Reserve(_baseDataTotalElementCount);
                 DateTimeOffset basis = DateTimeOffset.UtcNow;
-
-                for (int i = 0; i < _baseDataListCount; i++)
-                {
-                    List<int?> dataList = _baseData[i];
-                    TimestampArray.Builder builder = new TimestampArray.Builder().Reserve(dataList.Count);
-                    foreach (int? value in dataList)
-                    {
-                        if (value.HasValue)
-                        {
-                            DateTimeOffset dateValue = basis.AddMilliseconds(value.Value);
-                            builder.Append(dateValue);
-                            resultBuilder.Append(dateValue);
-                        }
-                        else
-                        {
-                            builder.AppendNull();
-                            resultBuilder.AppendNull();
-                        }
-                    }
-                    TestTargetArrayList.Add(builder.Build());
-                }
-
-                ExpectedArray = resultBuilder.Build();
+                GenerateTestData<TimestampArray, TimestampArray.Builder>(type, (builder, x) => builder.Append(basis.AddMilliseconds(x)));
             }
 
-            public void Visit(DurationType type)
-            {
-                DurationArray.Builder resultBuilder = new DurationArray.Builder(type).Reserve(_baseDataTotalElementCount);
-
-                for (int i = 0; i < _baseDataListCount; i++)
-                {
-                    List<int?> dataList = _baseData[i];
-                    DurationArray.Builder builder = new DurationArray.Builder(type).Reserve(dataList.Count);
-                    foreach (int? value in dataList)
-                    {
-                        if (value.HasValue)
-                        {
-                            builder.Append(value.Value);
-                            resultBuilder.Append(value.Value);
-                        }
-                        else
-                        {
-                            builder.AppendNull();
-                            resultBuilder.AppendNull();
-                        }
-                    }
-                    TestTargetArrayList.Add(builder.Build());
-                }
-
-                ExpectedArray = resultBuilder.Build();
-            }
+            public void Visit(DurationType type) => GenerateTestData<long, DurationArray, DurationArray.Builder>(type, x => (long)x);
 
             public void Visit(IntervalType type)
             {
                 switch (type.Unit)
                 {
                     case IntervalUnit.YearMonth:
-                        YearMonthIntervalArray.Builder yearMonthBuilder = new YearMonthIntervalArray.Builder().Reserve(_baseDataTotalElementCount);
-                        foreach (List<int?> dataList in _baseData)
-                        {
-                            YearMonthIntervalArray.Builder yearMonthBuilder1 = new YearMonthIntervalArray.Builder().Reserve(dataList.Count);
-                            foreach (int? value in dataList)
-                            {
-                                YearMonthInterval? ymi = value != null ? new YearMonthInterval(value.Value) : null;
-                                yearMonthBuilder.Append(ymi);
-                                yearMonthBuilder1.Append(ymi);
-                            }
-                            TestTargetArrayList.Add(yearMonthBuilder1.Build());
-                        }
-                        ExpectedArray = yearMonthBuilder.Build();
+                        GenerateTestData<YearMonthInterval, YearMonthIntervalArray, YearMonthIntervalArray.Builder>(
+                            type, x => new YearMonthInterval(x));
                         break;
 
                     case IntervalUnit.DayTime:
-                        DayTimeIntervalArray.Builder dayTimeBuilder = new DayTimeIntervalArray.Builder().Reserve(_baseDataTotalElementCount);
-                        foreach (List<int?> dataList in _baseData)
-                        {
-                            DayTimeIntervalArray.Builder dayTimeBuilder1 = new DayTimeIntervalArray.Builder().Reserve(dataList.Count);
-                            foreach (int? value in dataList)
-                            {
-                                DayTimeInterval? dti = value != null ? new DayTimeInterval(100 - 50 * value.Value, 100 * value.Value) : null;
-                                dayTimeBuilder.Append(dti);
-                                dayTimeBuilder1.Append(dti);
-                            }
-                            TestTargetArrayList.Add(dayTimeBuilder1.Build());
-                        }
-                        ExpectedArray = dayTimeBuilder.Build();
+                        GenerateTestData<DayTimeInterval, DayTimeIntervalArray, DayTimeIntervalArray.Builder>(
+                            type, x => new DayTimeInterval(100 - 50 * x, 100 * x));
                         break;
 
                     case IntervalUnit.MonthDayNanosecond:
-                        MonthDayNanosecondIntervalArray.Builder monthDayNanoBuilder = new MonthDayNanosecondIntervalArray.Builder().Reserve(_baseDataTotalElementCount);
-                        foreach (List<int?> dataList in _baseData)
-                        {
-                            MonthDayNanosecondIntervalArray.Builder monthDayNanoBuilder1 = new MonthDayNanosecondIntervalArray.Builder().Reserve(dataList.Count);
-                            foreach (int? value in dataList)
-                            {
-                                MonthDayNanosecondInterval? mdni = value != null ? new MonthDayNanosecondInterval(value.Value, 5 - value.Value, 100 * value.Value) : null;
-                                monthDayNanoBuilder.Append(mdni);
-                                monthDayNanoBuilder1.Append(mdni);
-                            }
-                            TestTargetArrayList.Add(monthDayNanoBuilder1.Build());
-                        }
-                        ExpectedArray = monthDayNanoBuilder.Build();
+                        GenerateTestData<MonthDayNanosecondInterval, MonthDayNanosecondIntervalArray, MonthDayNanosecondIntervalArray.Builder>(
+                            type, x => new MonthDayNanosecondInterval(x, 5 - x, 100 * x));
                         break;
 
                     default:
@@ -346,245 +243,154 @@ public void Visit(IntervalType type)
                 }
             }
 
-            public void Visit(BinaryType type)
-            {
-                BinaryArray.Builder resultBuilder = new BinaryArray.Builder().Reserve(_baseDataTotalElementCount);
-
-                for (int i = 0; i < _baseDataListCount; i++)
+            public void Visit(BinaryType type) =>
+                GenerateTestData<BinaryArray, BinaryArray.Builder>(type, (builder, x) =>
                 {
-                    List<int?> dataList = _baseData[i];
-                    BinaryArray.Builder builder = new BinaryArray.Builder().Reserve(dataList.Count);
-
-                    foreach (byte? value in dataList)
+                    if (x % 2 == 0)
                     {
-                        if (value.HasValue)
-                        {
-                            builder.Append(value.Value);
-                            resultBuilder.Append(value.Value);
-                        }
-                        else
-                        {
-                            builder.AppendNull();
-                            resultBuilder.AppendNull();
-                        }
+                        builder.Append((byte)x);
                     }
-                    TestTargetArrayList.Add(builder.Build());
-                }
-
-                ExpectedArray = resultBuilder.Build();
-            }
-
-            public void Visit(BinaryViewType type)
-            {
-                BinaryViewArray.Builder resultBuilder = new BinaryViewArray.Builder().Reserve(_baseDataTotalElementCount);
-
-                for (int i = 0; i < _baseDataListCount; i++)
-                {
-                    List<int?> dataList = _baseData[i];
-                    BinaryViewArray.Builder builder = new BinaryViewArray.Builder().Reserve(dataList.Count);
-
-                    foreach (byte? value in dataList)
+                    else
                     {
-                        if (value.HasValue)
-                        {
-                            builder.Append(value.Value);
-                            resultBuilder.Append(value.Value);
-                        }
-                        else
-                        {
-                            builder.AppendNull();
-                            resultBuilder.AppendNull();
-                        }
+                        builder.Append(new byte[] {(byte)x, (byte)(x + 1)}.AsSpan());
                     }
-                    TestTargetArrayList.Add(builder.Build());
-                }
+                });
 
-                ExpectedArray = resultBuilder.Build();
-            }
-
-            public void Visit(StringType type)
-            {
-                StringArray.Builder resultBuilder = new StringArray.Builder().Reserve(_baseDataTotalElementCount);
-
-                for (int i = 0; i < _baseDataListCount; i++)
+            public void Visit(BinaryViewType type) =>
+                GenerateTestData<BinaryViewArray, BinaryViewArray.Builder>(type, (builder, x) =>
                 {
-                    List<int?> dataList = _baseData[i];
-                    StringArray.Builder builder = new StringArray.Builder().Reserve(dataList.Count);
-
-                    foreach (string value in dataList.Select(_ => _.ToString() ?? null))
+                    if (x % 2 == 0)
                     {
-                        builder.Append(value);
-                        resultBuilder.Append(value);
+                        builder.Append((byte)x);
                     }
-                    TestTargetArrayList.Add(builder.Build());
-                }
-
-                ExpectedArray = resultBuilder.Build();
-            }
-
-            public void Visit(StringViewType type)
-            {
-                StringViewArray.Builder resultBuilder = new StringViewArray.Builder().Reserve(_baseDataTotalElementCount);
-
-                for (int i = 0; i < _baseDataListCount; i++)
-                {
-                    List<int?> dataList = _baseData[i];
-                    StringViewArray.Builder builder = new StringViewArray.Builder().Reserve(dataList.Count);
-
-                    foreach (string value in dataList.Select(_ => _.ToString() ?? null))
+                    else
                     {
-                        builder.Append(value);
-                        resultBuilder.Append(value);
+                        builder.Append(new byte[] {(byte)x, (byte)(x + 1)}.AsSpan());
                     }
-                    TestTargetArrayList.Add(builder.Build());
-                }
+                });
 
-                ExpectedArray = resultBuilder.Build();
-            }
+            public void Visit(StringType type) =>
+                GenerateTestData<StringArray, StringArray.Builder>(type, (builder, x) => builder.Append(x.ToString()));
 
-            public void Visit(ListType type)
-            {
-                ListArray.Builder resultBuilder = new ListArray.Builder(type.ValueDataType).Reserve(_baseDataTotalElementCount);
-                Int64Array.Builder resultValueBuilder = (Int64Array.Builder)resultBuilder.ValueBuilder.Reserve(_baseDataTotalElementCount);
+            public void Visit(StringViewType type) =>
+                GenerateTestData<StringViewArray, StringViewArray.Builder>(type, (builder, x) => builder.Append(x.ToString()));
 
-                for (int i = 0; i < _baseDataListCount; i++)
+            public void Visit(ListType type) =>
+                GenerateTestData<ListArray, ListArray.Builder>(type, (builder, x) =>
                 {
-                    List<int?> dataList = _baseData[i];
-
-                    ListArray.Builder builder = new ListArray.Builder(type.ValueField).Reserve(dataList.Count);
-                    Int64Array.Builder valueBuilder = (Int64Array.Builder)builder.ValueBuilder.Reserve(dataList.Count);
-
-                    foreach (long? value in dataList)
-                    {
-                        if (value.HasValue)
-                        {
-                            builder.Append();
-                            resultBuilder.Append();
-
-                            valueBuilder.Append(value.Value);
-                            resultValueBuilder.Append(value.Value);
-                        }
-                        else
-                        {
-                            builder.AppendNull();
-                            resultBuilder.AppendNull();
-                        }
-                    }
-
-                    TestTargetArrayList.Add(builder.Build());
-                }
-
-                ExpectedArray = resultBuilder.Build();
-            }
-
-            public void Visit(ListViewType type)
-            {
-                ListViewArray.Builder resultBuilder = new ListViewArray.Builder(type.ValueDataType).Reserve(_baseDataTotalElementCount);
-                Int64Array.Builder resultValueBuilder = (Int64Array.Builder)resultBuilder.ValueBuilder.Reserve(_baseDataTotalElementCount);
-
-                for (int i = 0; i < _baseDataListCount; i++)
+                    builder.Append();
+                    ((Int64Array.Builder)builder.ValueBuilder).Append(x);
+                }, initAction: (builder, length) =>
                 {
-                    List<int?> dataList = _baseData[i];
+                    builder.Reserve(length);
+                    builder.ValueBuilder.Reserve(length);
+                });
 
-                    ListViewArray.Builder builder = new ListViewArray.Builder(type.ValueField).Reserve(dataList.Count);
-                    Int64Array.Builder valueBuilder = (Int64Array.Builder)builder.ValueBuilder.Reserve(dataList.Count);
+            public void Visit(ListViewType type) =>
+                GenerateTestData<ListViewArray, ListViewArray.Builder>(type, (builder, x) =>
+                {
+                    builder.Append();
+                    ((Int64Array.Builder)builder.ValueBuilder).Append(x);
+                }, initAction: (builder, length) =>
+                {
+                    builder.Reserve(length);
+                    builder.ValueBuilder.Reserve(length);
+                });
 
-                    foreach (long? value in dataList)
+            public void Visit(FixedSizeListType type) =>
+                GenerateTestData<FixedSizeListArray, FixedSizeListArray.Builder>(type, (builder, x) =>
+                {
+                    builder.Append();
+                    var valueBuilder = (Int32Array.Builder)builder.ValueBuilder;
+                    for (int i = 0; i < type.ListSize; ++i)
                     {
-                        if (value.HasValue)
-                        {
-                            builder.Append();
-                            resultBuilder.Append();
-
-                            valueBuilder.Append(value.Value);
-                            resultValueBuilder.Append(value.Value);
-                        }
-                        else
-                        {
-                            builder.AppendNull();
-                            resultBuilder.AppendNull();
-                        }
+                        valueBuilder.Append(x);
                     }
+                }, initAction: (builder, length) =>
+                {
+                    builder.Reserve(length);
+                    builder.ValueBuilder.Reserve(length * type.ListSize);
+                });
 
-                    TestTargetArrayList.Add(builder.Build());
-                }
-
-                ExpectedArray = resultBuilder.Build();
-            }
-
-            public void Visit(FixedSizeListType type)
+            public void Visit(StructType type)
             {
-                FixedSizeListArray.Builder resultBuilder = new FixedSizeListArray.Builder(type.ValueDataType, type.ListSize).Reserve(_baseDataTotalElementCount);
-                Int32Array.Builder resultValueBuilder = (Int32Array.Builder)resultBuilder.ValueBuilder.Reserve(_baseDataTotalElementCount);
+                // TODO: Make data from type fields.
 
-                for (int i = 0; i < _baseDataListCount; i++)
+                // The following can be improved with a Builder class for StructArray.
+                StringArray.Builder resultStringBuilder = new StringArray.Builder().Reserve(_resultTotalElementCount);
+                Int32Array.Builder resultInt32Builder = new Int32Array.Builder().Reserve(_resultTotalElementCount);
+                ArrowBuffer.BitmapBuilder resultNullBitmapBuilder = new ArrowBuffer.BitmapBuilder().Reserve(_resultTotalElementCount);
+                int resultNullCount = 0;
+
+                for (int i = 0; i < _baseData.Count; i++)
                 {
                     List<int?> dataList = _baseData[i];
+                    StringArray.Builder stringBuilder = new StringArray.Builder().Reserve(dataList.Count);
+                    Int32Array.Builder int32Builder = new Int32Array.Builder().Reserve(dataList.Count);
+                    ArrowBuffer.BitmapBuilder nullBitmapBuilder = new ArrowBuffer.BitmapBuilder().Reserve(dataList.Count);
+                    int nullCount = 0;
 
-                    FixedSizeListArray.Builder builder = new FixedSizeListArray.Builder(type.ValueField, type.ListSize).Reserve(dataList.Count);
-                    Int32Array.Builder valueBuilder = (Int32Array.Builder)builder.ValueBuilder.Reserve(dataList.Count);
-
-                    foreach (int? value in dataList)
+                    for (int j = 0; j < dataList.Count; ++j)
                     {
+                        var value = dataList[j];
                         if (value.HasValue)
                         {
-                            builder.Append();
-                            resultBuilder.Append();
+                            nullBitmapBuilder.Append(true);
+                            stringBuilder.Append(value.Value.ToString());
+                            int32Builder.Append(value.Value);
 
-                            valueBuilder.Append(value.Value);
-                            resultValueBuilder.Append(value.Value);
+                            if (IncludeInResult(i, j))
+                            {
+                                resultNullBitmapBuilder.Append(true);
+                                resultStringBuilder.Append(value.Value.ToString());
+                                resultInt32Builder.Append(value.Value);
+                            }
                         }
                         else
                         {
-                            builder.AppendNull();
-                            resultBuilder.AppendNull();
+                            nullCount++;
+                            nullBitmapBuilder.Append(false);
+                            stringBuilder.Append("");
+                            int32Builder.Append(0);
+
+                            if (IncludeInResult(i, j))
+                            {
+                                resultNullCount++;
+                                resultNullBitmapBuilder.Append(false);
+                                resultStringBuilder.Append("");
+                                resultInt32Builder.Append(0);
+                            }
                         }
                     }
 
-                    TestTargetArrayList.Add(builder.Build());
-                }
-
-                ExpectedArray = resultBuilder.Build();
-            }
-
-            public void Visit(StructType type)
-            {
-                // TODO: Make data from type fields.
-
-                // The following can be improved with a Builder class for StructArray.
-                StringArray.Builder resultStringBuilder = new StringArray.Builder();
-                Int32Array.Builder resultInt32Builder = new Int32Array.Builder();
-                ArrowBuffer nullBitmapBuffer = new ArrowBuffer.BitmapBuilder().Append(true).Append(true).Append(false).Build();
-
-                for (int i = 0; i < 3; i++)
-                {
-                    resultStringBuilder.Append("joe").AppendNull().AppendNull().Append("mark");
-                    resultInt32Builder.Append(1).Append(2).AppendNull().Append(4);
-                    StringArray stringArray = new StringArray.Builder().Append("joe").AppendNull().AppendNull().Append("mark").Build();
-                    Int32Array intArray = new Int32Array.Builder().Append(1).Append(2).AppendNull().Append(4).Build();
-                    List<Array> arrays = new List<Array>
+                    var arrays = new List<Array>
                     {
-                        stringArray,
-                        intArray
+                        stringBuilder.Build(),
+                        int32Builder.Build(),
                     };
 
-                    TestTargetArrayList.Add(new StructArray(type, 3, arrays, nullBitmapBuffer, 1));
+                    TestTargetArrayList.Add(SliceTargetArray(
+                        new StructArray(type, dataList.Count, arrays, nullBitmapBuilder.Build(), nullCount), i));
                 }
 
-                StringArray resultStringArray = resultStringBuilder.Build();
-                Int32Array resultInt32Array = resultInt32Builder.Build();
+                var resultArrays = new List<Array>
+                {
+                    resultStringBuilder.Build(),
+                    resultInt32Builder.Build(),
+                };
 
-                ExpectedArray = new StructArray(type, 9, new List<Array> { resultStringArray, resultInt32Array }, nullBitmapBuffer, 3);
+                ExpectedArray = new StructArray(
+                    type, _resultTotalElementCount, resultArrays, resultNullBitmapBuilder.Build(), resultNullCount);
             }
 
             public void Visit(UnionType type)
             {
                 bool isDense = type.Mode == UnionMode.Dense;
 
-                StringArray.Builder stringResultBuilder = new StringArray.Builder().Reserve(_baseDataTotalElementCount);
-                Int32Array.Builder intResultBuilder = new Int32Array.Builder().Reserve(_baseDataTotalElementCount);
-                ArrowBuffer.Builder<byte> typeResultBuilder = new ArrowBuffer.Builder<byte>().Reserve(_baseDataTotalElementCount);
-                ArrowBuffer.Builder<int> offsetResultBuilder = new ArrowBuffer.Builder<int>().Reserve(_baseDataTotalElementCount);
+                StringArray.Builder stringResultBuilder = new StringArray.Builder().Reserve(_resultTotalElementCount);
+                Int32Array.Builder intResultBuilder = new Int32Array.Builder().Reserve(_resultTotalElementCount);
+                ArrowBuffer.Builder<byte> typeResultBuilder = new ArrowBuffer.Builder<byte>().Reserve(_resultTotalElementCount);
+                ArrowBuffer.Builder<int> offsetResultBuilder = new ArrowBuffer.Builder<int>().Reserve(_resultTotalElementCount);
                 int resultNullCount = 0;
 
                 for (int i = 0; i < _baseDataListCount; i++)
@@ -598,40 +404,59 @@ public void Visit(UnionType type)
 
                     for (int j = 0; j < dataList.Count; j++)
                     {
-                        byte index = (byte)Math.Max(j % 3, 1);
+                        bool includeInResult = IncludeInResult(i, j);
+                        byte index = (byte)Math.Min(j % 3, 1);
                         int? intValue = (index == 1) ? dataList[j] : null;
                         string stringValue = (index == 1) ? null : dataList[j]?.ToString();
                         typeBuilder.Append(index);
+                        if (includeInResult)
+                        {
+                            typeResultBuilder.Append(index);
+                        }
 
                         if (isDense)
                         {
                             if (index == 0)
                             {
                                 offsetBuilder.Append(stringBuilder.Length);
-                                offsetResultBuilder.Append(stringResultBuilder.Length);
                                 stringBuilder.Append(stringValue);
+                                if (includeInResult)
+                                {
+                                    offsetResultBuilder.Append(stringResultBuilder.Length);
+                                }
+                                // For dense mode, concatenation doesn't slice the child arrays, so always
+                                // add the value to the result.
                                 stringResultBuilder.Append(stringValue);
                             }
                             else
                             {
                                 offsetBuilder.Append(intBuilder.Length);
-                                offsetResultBuilder.Append(intResultBuilder.Length);
                                 intBuilder.Append(intValue);
+                                if (includeInResult)
+                                {
+                                    offsetResultBuilder.Append(intResultBuilder.Length);
+                                }
                                 intResultBuilder.Append(intValue);
                             }
                         }
                         else
                         {
                             stringBuilder.Append(stringValue);
-                            stringResultBuilder.Append(stringValue);
                             intBuilder.Append(intValue);
-                            intResultBuilder.Append(intValue);
+                            if (includeInResult)
+                            {
+                                stringResultBuilder.Append(stringValue);
+                                intResultBuilder.Append(intValue);
+                            }
                         }
 
                         if (dataList[j] == null)
                         {
                             nullCount++;
-                            resultNullCount++;
+                            if (includeInResult)
+                            {
+                                resultNullCount++;
+                            }
                         }
                     }
 
@@ -644,9 +469,11 @@ public void Visit(UnionType type)
                     {
                         buffers = new[] { typeBuilder.Build() };
                     }
-                    TestTargetArrayList.Add(UnionArray.Create(new ArrayData(
+
+                    var unionArray = UnionArray.Create(new ArrayData(
                         type, dataList.Count, nullCount, 0, buffers,
-                        new[] { stringBuilder.Build().Data, intBuilder.Build().Data })));
+                        new[] { stringBuilder.Build().Data, intBuilder.Build().Data }));
+                    TestTargetArrayList.Add(SliceTargetArray(unionArray, i));
                 }
 
                 ArrowBuffer[] resultBuffers;
@@ -658,50 +485,27 @@ public void Visit(UnionType type)
                 {
                     resultBuffers = new[] { typeResultBuilder.Build() };
                 }
+
                 ExpectedArray = UnionArray.Create(new ArrayData(
-                    type, _baseDataTotalElementCount, resultNullCount, 0, resultBuffers,
+                    type, _resultTotalElementCount, resultNullCount, 0, resultBuffers,
                         new[] { stringResultBuilder.Build().Data, intResultBuilder.Build().Data }));
             }
 
-            public void Visit(MapType type)
-            {
-                MapArray.Builder resultBuilder = new MapArray.Builder(type).Reserve(_baseDataTotalElementCount);
-                StringArray.Builder resultKeyBuilder = (StringArray.Builder)resultBuilder.KeyBuilder.Reserve(_baseDataTotalElementCount);
-                Int32Array.Builder resultValueBuilder = (Int32Array.Builder)resultBuilder.ValueBuilder.Reserve(_baseDataTotalElementCount);
-                ArrowBuffer nullBitmapBuilder = new ArrowBuffer.BitmapBuilder().Append(true).Append(true).Append(false).Build();
-
-                for (int i = 0; i < _baseData.Count; i++)
+            public void Visit(MapType type) =>
+                GenerateTestData<MapArray, MapArray.Builder>(type, (builder, x) =>
                 {
-                    List<int?> dataList = _baseData[i];
-
-                    MapArray.Builder builder = new MapArray.Builder(type).Reserve(dataList.Count);
-                    StringArray.Builder keyBuilder = (StringArray.Builder)builder.KeyBuilder.Reserve(dataList.Count);
-                    Int32Array.Builder valueBuilder = (Int32Array.Builder)builder.ValueBuilder.Reserve(dataList.Count);
-
-                    foreach (int? value in dataList)
-                    {
-                        if (value.HasValue)
-                        {
-                            builder.Append();
-                            resultBuilder.Append();
-
-                            keyBuilder.Append(value.Value.ToString());
-                            valueBuilder.Append(value.Value);
-                            resultKeyBuilder.Append(value.Value.ToString());
-                            resultValueBuilder.Append(value.Value);
-                        }
-                        else
-                        {
-                            builder.AppendNull();
-                            resultBuilder.AppendNull();
-                        }
-                    }
-
-                    TestTargetArrayList.Add(builder.Build());
-                }
+                    var keyBuilder = (StringArray.Builder)builder.KeyBuilder;
+                    var valueBuilder = (Int32Array.Builder)builder.ValueBuilder;
 
-                ExpectedArray = resultBuilder.Build();
-            }
+                    builder.Append();
+                    keyBuilder.Append(x.ToString());
+                    valueBuilder.Append(x);
+                }, initAction: (builder, length) =>
+                {
+                    builder.Reserve(length);
+                    builder.KeyBuilder.Reserve(length);
+                    builder.ValueBuilder.Reserve(length);
+                });
 
             public void Visit(IArrowType type)
             {
@@ -712,33 +516,87 @@ private void GenerateTestData<T, TArray, TArrayBuilder>(IArrowType type, Func<in
                 where TArrayBuilder : IArrowArrayBuilder<T, TArray, TArrayBuilder>
                 where TArray : IArrowArray
             {
-                var resultBuilder = (IArrowArrayBuilder<T, TArray, TArrayBuilder>)ArrayArrayBuilderFactoryReflector.InvokeBuild(type);
-                resultBuilder.Reserve(_baseDataTotalElementCount);
+                GenerateTestData<TArray, TArrayBuilder>(type, (builder, x) => builder.Append(generator(x)));
+            }
+
+            private void GenerateTestData<TArray, TArrayBuilder>(
+                IArrowType type, Action<TArrayBuilder, int> buildAction, Action<TArrayBuilder, int> initAction=null)
+                where TArrayBuilder : IArrowArrayBuilder<TArray, TArrayBuilder>
+                where TArray : IArrowArray
+            {
+                var resultBuilder = (TArrayBuilder)ArrowArrayBuilderFactory.Build(type);
+                if (initAction != null)
+                {
+                    initAction(resultBuilder, _resultTotalElementCount);
+                }
+                else
+                {
+                    resultBuilder.Reserve(_resultTotalElementCount);
+                }
 
                 for (int i = 0; i < _baseDataListCount; i++)
                 {
                     List<int?> dataList = _baseData[i];
-                    var builder = (IArrowArrayBuilder<T, TArray, TArrayBuilder>)ArrayArrayBuilderFactoryReflector.InvokeBuild(type);
-                    builder.Reserve(dataList.Count);
+                    var builder = (TArrayBuilder)ArrowArrayBuilderFactory.Build(type);
+                    if (initAction != null)
+                    {
+                        initAction(builder, dataList.Count);
+                    }
+                    else
+                    {
+                        builder.Reserve(dataList.Count);
+                    }
 
-                    foreach (int? value in dataList)
+                    for (int j = 0; j < dataList.Count; ++j)
                     {
+                        var value = dataList[j];
                         if (value.HasValue)
                         {
-                            builder.Append(generator(value.Value));
-                            resultBuilder.Append(generator(value.Value));
+                            buildAction(builder, value.Value);
+                            if (IncludeInResult(i, j))
+                            {
+                                buildAction(resultBuilder, value.Value);
+                            }
                         }
                         else
                         {
                             builder.AppendNull();
-                            resultBuilder.AppendNull();
+                            if (IncludeInResult(i, j))
+                            {
+                                resultBuilder.AppendNull();
+                            }
                         }
                     }
-                    TestTargetArrayList.Add(builder.Build(default));
+
+                    TestTargetArrayList.Add(SliceTargetArray(builder.Build(default), i));
                 }
 
                 ExpectedArray = resultBuilder.Build(default);
             }
+
+            private bool IncludeInResult(int listIndex, int itemIndex)
+            {
+                if (_sliceParameters == null)
+                {
+                    // Unsliced arrays, all values are expected in the result
+                    return true;
+                }
+
+                var sliceParameters = _sliceParameters[listIndex];
+                return itemIndex >= sliceParameters.Offset &&
+                       itemIndex < (sliceParameters.Offset + sliceParameters.Length);
+            }
+
+            private IArrowArray SliceTargetArray(IArrowArray array, int targetIndex)
+            {
+                if (_sliceParameters == null)
+                {
+                    return array;
+                }
+
+                return ArrowArrayFactory.Slice(
+                    array, _sliceParameters[targetIndex].Offset, _sliceParameters[targetIndex].Length);
+            }
         }
     }
 }
diff --git a/csharp/test/Apache.Arrow.Tests/ArrowArrayTests.cs b/csharp/test/Apache.Arrow.Tests/ArrowArrayTests.cs
index a0e90cbbc7c61..c3c21c412d20d 100644
--- a/csharp/test/Apache.Arrow.Tests/ArrowArrayTests.cs
+++ b/csharp/test/Apache.Arrow.Tests/ArrowArrayTests.cs
@@ -101,9 +101,9 @@ public void EnumerateArray()
         {
             var array = new Int64Array.Builder().Append(1).Append(2).Build();
 
-            foreach(long? foo in (IEnumerable<long?>)array)
+            foreach(long? foo in array)
             {
-                Assert.InRange(foo.Value, 1, 2);
+                Assert.InRange(foo!.Value, 1, 2);
             }
 
             foreach (object foo in (IEnumerable)array)
@@ -115,12 +115,145 @@ public void EnumerateArray()
         [Fact]
         public void ArrayAsReadOnlyList()
         {
-            Int64Array array = new Int64Array.Builder().Append(1).Append(2).Build();
-            var readOnlyList = (IReadOnlyList<long?>)array;
+            TestArrayAsReadOnlyList<long, Int64Array, Int64Array.Builder>([1, 2]);
+            TestArrayAsReadOnlyList<byte, UInt8Array, UInt8Array.Builder>([1, 2]);
+            TestArrayAsReadOnlyList<bool, BooleanArray, BooleanArray.Builder>([true, false]);
+            TestArrayAsReadOnlyList<DateTime, Date32Array, Date32Array.Builder>([DateTime.MinValue.Date, DateTime.MaxValue.Date]);
+            TestArrayAsReadOnlyList<DateTime, Date64Array, Date64Array.Builder>([DateTime.MinValue.Date, DateTime.MaxValue.Date]);
+            TestArrayAsReadOnlyList<DateTimeOffset, TimestampArray, TimestampArray.Builder>([DateTimeOffset.MinValue, DateTimeOffset.MinValue.AddYears(100)]);
+
+#if NET5_0_OR_GREATER
+            TestArrayAsReadOnlyList<DateOnly, Date32Array, Date32Array.Builder>([DateOnly.MinValue, DateOnly.MaxValue]);
+            TestArrayAsReadOnlyList<DateOnly, Date64Array, Date64Array.Builder>([DateOnly.MinValue, DateOnly.MaxValue]);
+            TestArrayAsReadOnlyList<TimeOnly, Time32Array, Time32Array.Builder>([TimeOnly.MinValue, TimeOnly.MinValue.AddHours(23)]);
+            TestArrayAsReadOnlyList<TimeOnly, Time64Array, Time64Array.Builder>([TimeOnly.MinValue, TimeOnly.MaxValue]);
+            TestArrayAsReadOnlyList<Half, HalfFloatArray, HalfFloatArray.Builder>([(Half)1.1, (Half)2.2f]);
+#endif
+        }
+
+        // Parameter 'values' must contain two distinct values
+        private static void TestArrayAsReadOnlyList<T, TArray, TArrayBuilder>(IReadOnlyList<T> values)
+            where T : struct
+            where TArray : IArrowArray
+            where TArrayBuilder : IArrowArrayBuilder<T, TArray, TArrayBuilder>, new()
+        {
+            Assert.Equal(2, values.Count);
+            TArray array = new TArrayBuilder().Append(values[0]).AppendNull().Append(values[1]).Build(default);
+            Assert.NotNull(array);
+            var readOnlyList = (IReadOnlyList<T?>)array;
 
             Assert.Equal(array.Length, readOnlyList.Count);
-            Assert.Equal(readOnlyList[0], 1);
-            Assert.Equal(readOnlyList[1], 2);
+            Assert.Equal(3, readOnlyList.Count);
+            Assert.Equal(values[0], readOnlyList[0]);
+            Assert.Null(readOnlyList[1]);
+            Assert.Equal(values[1], readOnlyList[2]);
+        }
+
+        [Fact]
+        public void ArrayAsCollection()
+        {
+            TestPrimitiveArrayAsCollection<long, Int64Array, Int64Array.Builder>([1, 2, 3, 4]);
+            TestPrimitiveArrayAsCollection<byte, UInt8Array, UInt8Array.Builder>([1, 2, 3, 4]);
+            TestPrimitiveArrayAsCollection<bool, BooleanArray, BooleanArray.Builder>([true, true, true, false]);
+            TestPrimitiveArrayAsCollection<DateTime, Date32Array, Date32Array.Builder>([DateTime.MinValue.Date, DateTime.MaxValue.Date, DateTime.Today, DateTime.Today]);
+            TestPrimitiveArrayAsCollection<DateTime, Date64Array, Date64Array.Builder>([DateTime.MinValue.Date, DateTime.MaxValue.Date, DateTime.Today, DateTime.Today]);
+            TestPrimitiveArrayAsCollection<DateTimeOffset, TimestampArray, TimestampArray.Builder>([DateTimeOffset.MinValue, DateTimeOffset.MinValue.AddYears(100), DateTimeOffset.Now, DateTimeOffset.UtcNow]);
+
+#if NET5_0_OR_GREATER
+            TestPrimitiveArrayAsCollection<DateOnly, Date32Array, Date32Array.Builder>([DateOnly.MinValue, DateOnly.MaxValue, DateOnly.FromDayNumber(1), DateOnly.FromDayNumber(2)]);
+            TestPrimitiveArrayAsCollection<DateOnly, Date64Array, Date64Array.Builder>([DateOnly.MinValue, DateOnly.MaxValue, DateOnly.FromDayNumber(1), DateOnly.FromDayNumber(2)]);
+            TestPrimitiveArrayAsCollection<TimeOnly, Time32Array, Time32Array.Builder>([TimeOnly.MinValue, TimeOnly.MinValue.AddHours(23), TimeOnly.MinValue.AddHours(1), TimeOnly.MinValue.AddHours(2)]);
+            TestPrimitiveArrayAsCollection<TimeOnly, Time64Array, Time64Array.Builder>([TimeOnly.MinValue, TimeOnly.MaxValue, TimeOnly.MinValue.AddHours(1), TimeOnly.MinValue.AddHours(2)]);
+            TestPrimitiveArrayAsCollection<Half, HalfFloatArray, HalfFloatArray.Builder>([(Half)1.1, (Half)2.2f, (Half)3.3f, (Half)4.4f]);
+#endif
+
+            byte[][] byteArrs = [new byte[1], [], [255], new byte[2]];
+            TestObjectArrayAsCollection(new BinaryArray.Builder().Append(byteArrs[0].AsEnumerable()).AppendNull().Append(byteArrs[1].AsEnumerable()).Append(byteArrs[0].AsEnumerable()).Build(), System.Array.Empty<byte>(), byteArrs);
+
+            string[] strings = ["abc", "abd", "acd", "adc"];
+            TestObjectArrayAsCollection(new StringArray.Builder().Append(strings[0]).AppendNull().Append(strings[1]).Append(strings[0]).Build(), null, strings);
+        }
+
+        // Parameter 'values' must contain four values. The last value must be distinct from the rest.
+        private static void TestPrimitiveArrayAsCollection<T, TArray, TArrayBuilder>(IReadOnlyList<T> values)
+            where T : struct
+            where TArray : IArrowArray, ICollection<T?>
+            where TArrayBuilder : IArrowArrayBuilder<T, TArray, TArrayBuilder>, new()
+        {
+            Assert.Equal(4, values.Count);
+            TArray array = new TArrayBuilder().Append(values[0]).AppendNull().Append(values[1]).Append(values[0]).Build(default);
+            Assert.NotNull(array);
+            var collection = (ICollection<T?>)array;
+
+            Assert.Equal(array.Length, collection.Count);
+            Assert.Equal(4, collection.Count);
+            Assert.True(collection.IsReadOnly);
+
+            Assert.Equal("Collection is read-only.", Assert.Throws<NotSupportedException>(() => collection.Add(values[3])).Message);
+            Assert.Equal("Collection is read-only.", Assert.Throws<NotSupportedException>(() => collection.Remove(values[3])).Message);
+            Assert.Equal("Collection is read-only.", Assert.Throws<NotSupportedException>(collection.Clear).Message);
+
+            Assert.True(collection.Contains(values[0]));
+            Assert.True(collection.Contains(values[1]));
+            Assert.True(collection.Contains(default));
+            Assert.False(collection.Contains(values[3]));
+
+            T sentinel = values[2];
+            T?[] destArr = { sentinel, sentinel, sentinel, sentinel, sentinel, sentinel };
+            collection.CopyTo(destArr, 1);
+            Assert.Equal(sentinel, destArr[0]);
+            Assert.Equal(values[0], destArr[1]);
+            Assert.Null(destArr[2]);
+            Assert.Equal(values[1], destArr[3]);
+            Assert.Equal(values[0], destArr[4]);
+            Assert.Equal(sentinel, destArr[0]);
+        }
+
+        // Parameter 'values' must contain four values. The last value must be distinct from the rest.
+        private static void TestObjectArrayAsCollection<T, TArray>(TArray array, T nullValue, IReadOnlyList<T> values)
+            where T : class
+            where TArray : IArrowArray, ICollection<T>
+        {
+            Assert.NotNull(array);
+            Assert.Equal(4, values.Count);
+            var collection = (ICollection<T>)array;
+
+            Assert.Equal(array.Length, collection.Count);
+            Assert.Equal(4, collection.Count);
+            Assert.True(collection.IsReadOnly);
+
+            Assert.Equal("Collection is read-only.", Assert.Throws<NotSupportedException>(() => collection.Add(values[3])).Message);
+            Assert.Equal("Collection is read-only.", Assert.Throws<NotSupportedException>(() => collection.Remove(values[3])).Message);
+            Assert.Equal("Collection is read-only.", Assert.Throws<NotSupportedException>(collection.Clear).Message);
+
+            Assert.True(collection.Contains(values[0]));
+            Assert.True(collection.Contains(values[1]));
+            Assert.True(collection.Contains(default));
+            Assert.False(collection.Contains(values[3]));
+
+            T sentinel = values[2];
+            T[] destArr = { sentinel, sentinel, sentinel, sentinel, sentinel, sentinel };
+            collection.CopyTo(destArr, 1);
+            Assert.Equal(sentinel, destArr[0]);
+            Assert.Equal(values[0], destArr[1]);
+            Assert.Equal(nullValue, destArr[2]);
+            Assert.Equal(values[1], destArr[3]);
+            Assert.Equal(values[0], destArr[4]);
+            Assert.Equal(sentinel, destArr[0]);
+        }
+
+        [Fact]
+        public void ContainsDoesNotMatchDefaultValueInArrayWithNullValue()
+        {
+            Int64Array array = new Int64Array.Builder().Append(1).Append(2).AppendNull().Build();
+            Assert.NotNull(array);
+            var collection = (ICollection<long?>)array;
+
+            Assert.True(collection.Contains(1));
+            Assert.True(collection.Contains(2));
+            Assert.True(collection.Contains(default));
+            // A null value is stored as a null bit in the null bitmap, and a default value in the value buffer. Check that we do not match the default value.
+            Assert.False(collection.Contains(0));
         }
 
         [Fact]
@@ -185,6 +318,7 @@ public void SlicePrimitiveArrayWithNulls()
             TestSlice<Date64Array, Date64Array.Builder>(x => x.Append(new DateTime(2019, 1, 1)).Append(new DateTime(2019, 1, 2)).AppendNull().Append(new DateTime(2019, 1, 3)));
             TestSlice<Time32Array, Time32Array.Builder>(x => x.Append(10).Append(20).AppendNull().Append(30));
             TestSlice<Time64Array, Time64Array.Builder>(x => x.Append(10).Append(20).AppendNull().Append(30));
+            TestSlice<Int32Array, Int32Array.Builder>(x => x.AppendNull().AppendNull().AppendNull());  // All nulls
 
             static void TestNumberSlice<T, TArray, TBuilder>()
                 where T : struct, INumber<T>
@@ -314,6 +448,8 @@ private void ValidateArrays<T>(PrimitiveArray<T> slicedArray)
                         .SequenceEqual(slicedArray.Values));
 
                 Assert.Equal(baseArray.GetValue(slicedArray.Offset), slicedArray.GetValue(0));
+
+                ValidateNullCount(slicedArray);
             }
 
             private void ValidateArrays(BooleanArray slicedArray)
@@ -333,6 +469,8 @@ private void ValidateArrays(BooleanArray slicedArray)
 #pragma warning disable CS0618
                 Assert.Equal(baseArray.GetBoolean(slicedArray.Offset), slicedArray.GetBoolean(0));
 #pragma warning restore CS0618
+
+                ValidateNullCount(slicedArray);
             }
 
             private void ValidateArrays(BinaryArray slicedArray)
@@ -347,6 +485,16 @@ private void ValidateArrays(BinaryArray slicedArray)
                         .SequenceEqual(slicedArray.ValueOffsets));
 
                 Assert.True(baseArray.GetBytes(slicedArray.Offset).SequenceEqual(slicedArray.GetBytes(0)));
+
+                ValidateNullCount(slicedArray);
+            }
+
+            private static void ValidateNullCount(IArrowArray slicedArray)
+            {
+                var expectedNullCount = Enumerable.Range(0, slicedArray.Length)
+                    .Select(i => slicedArray.IsNull(i) ? 1 : 0)
+                    .Sum();
+                Assert.Equal(expectedNullCount, slicedArray.NullCount);
             }
         }
     }
diff --git a/csharp/test/Apache.Arrow.Tests/ArrowFileWriterTests.cs b/csharp/test/Apache.Arrow.Tests/ArrowFileWriterTests.cs
index 69b8410d030f2..7b25910114882 100644
--- a/csharp/test/Apache.Arrow.Tests/ArrowFileWriterTests.cs
+++ b/csharp/test/Apache.Arrow.Tests/ArrowFileWriterTests.cs
@@ -15,8 +15,11 @@
 
 using Apache.Arrow.Ipc;
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
+using Apache.Arrow.Types;
 using Xunit;
 
 namespace Apache.Arrow.Tests
@@ -106,13 +109,104 @@ public async Task WritesFooterAlignedMultipleOf8Async()
             await ValidateRecordBatchFile(stream, originalBatch);
         }
 
-        private async Task ValidateRecordBatchFile(Stream stream, RecordBatch recordBatch)
+        [Theory]
+        [InlineData(0, 45)]
+        [InlineData(3, 45)]
+        [InlineData(16, 45)]
+        [InlineData(10, 0)]
+        public async Task WriteSlicedArrays(int sliceOffset, int sliceLength)
+        {
+            var originalBatch = TestData.CreateSampleRecordBatch(length: 100);
+            var slicedArrays = originalBatch.Arrays
+                .Select(array => ArrowArrayFactory.Slice(array, sliceOffset, sliceLength))
+                .ToList();
+            var slicedBatch = new RecordBatch(originalBatch.Schema, slicedArrays, sliceLength);
+
+            var stream = new MemoryStream();
+            var writer = new ArrowFileWriter(stream, slicedBatch.Schema, leaveOpen: true);
+
+            await writer.WriteRecordBatchAsync(slicedBatch);
+            await writer.WriteEndAsync();
+
+            stream.Position = 0;
+
+            // Disable strict comparison because we don't expect buffers to match exactly
+            // due to writing slices of buffers, and instead need to compare array values
+            await ValidateRecordBatchFile(stream, slicedBatch, strictCompare: false);
+        }
+
+        [Theory]
+        [InlineData(0, 100)]
+        [InlineData(0, 50)]
+        [InlineData(50, 50)]
+        [InlineData(25, 50)]
+        public async Task WriteListViewDataWithUnorderedOffsets(int sliceOffset, int sliceLength)
+        {
+            // A list-view array doesn't require that offsets are ordered,
+            // so verify that we can round trip a list-view array with out-of-order offsets.
+            const int length = 100;
+            var random = new Random();
+
+            var randomizedIndices = Enumerable.Range(0, length).ToArray();
+            Shuffle(randomizedIndices, random);
+
+            var offsetsBuilder = new ArrowBuffer.Builder<int>().Resize(length);
+            var sizesBuilder = new ArrowBuffer.Builder<int>().Resize(length);
+            var validityBuilder = new ArrowBuffer.BitmapBuilder().Reserve(length);
+
+            var valuesLength = 0;
+            for (int i = 0; i < length; ++i)
+            {
+                var index = randomizedIndices[i];
+                var listLength = random.Next(0, 10);
+                offsetsBuilder.Span[index] = valuesLength;
+                sizesBuilder.Span[index] = listLength;
+                valuesLength += listLength;
+
+                validityBuilder.Append(random.NextDouble() < 0.9);
+            }
+
+            var valuesBuilder = new Int64Array.Builder().Reserve(valuesLength);
+            for (int i = 0; i < valuesLength; ++i)
+            {
+                valuesBuilder.Append(random.Next(0, 1_000));
+            }
+
+            var type = new ListViewType(new Int64Type());
+            var offsets = offsetsBuilder.Build();
+            var sizes = sizesBuilder.Build();
+            var values = valuesBuilder.Build();
+            var nullCount = validityBuilder.UnsetBitCount;
+            var validityBuffer = validityBuilder.Build();
+
+            IArrowArray listViewArray = new ListViewArray(
+                type, length, offsets, sizes, values, validityBuffer, nullCount);
+
+            if (sliceOffset != 0 || sliceLength != length)
+            {
+                listViewArray = ArrowArrayFactory.Slice(listViewArray, sliceOffset, sliceLength);
+            }
+
+            var recordBatch = new RecordBatch.Builder().Append("x", true, listViewArray).Build();
+
+            var stream = new MemoryStream();
+            var writer = new ArrowFileWriter(stream, recordBatch.Schema, leaveOpen: true);
+
+            await writer.WriteRecordBatchAsync(recordBatch);
+            await writer.WriteEndAsync();
+
+            stream.Position = 0;
+
+            await ValidateRecordBatchFile(stream, recordBatch, strictCompare: false);
+        }
+
+        private async Task ValidateRecordBatchFile(Stream stream, RecordBatch recordBatch, bool strictCompare = true)
         {
             var reader = new ArrowFileReader(stream);
             int count = await reader.RecordBatchCountAsync();
             Assert.Equal(1, count);
             RecordBatch readBatch = await reader.ReadRecordBatchAsync(0);
-            ArrowReaderVerifier.CompareBatches(recordBatch, readBatch);
+            ArrowReaderVerifier.CompareBatches(recordBatch, readBatch, strictCompare);
         }
 
         /// <summary>
@@ -164,5 +258,69 @@ public async Task WritesEmptyFileAsync()
             Assert.Null(readBatch);
             SchemaComparer.Compare(originalBatch.Schema, reader.Schema);
         }
+
+        [Fact]
+        public async Task WriteBinaryArrayWithEmptyOffsets()
+        {
+            // Empty binary arrays generated by the C# builder have a single offset,
+            // but some implementations may produce an empty offsets buffer.
+
+            var array = new BinaryArray(
+                new BinaryType(),
+                length: 0,
+                valueOffsetsBuffer: ArrowBuffer.Empty,
+                dataBuffer: ArrowBuffer.Empty,
+                nullBitmapBuffer: ArrowBuffer.Empty,
+                nullCount: 0);
+
+            var recordBatch = new RecordBatch.Builder().Append("x", true, array).Build();
+
+            var stream = new MemoryStream();
+            var writer = new ArrowFileWriter(stream, recordBatch.Schema, leaveOpen: true);
+
+            await writer.WriteRecordBatchAsync(recordBatch);
+            await writer.WriteEndAsync();
+
+            stream.Position = 0;
+
+            await ValidateRecordBatchFile(stream, recordBatch, strictCompare: false);
+        }
+
+        [Fact]
+        public async Task WriteListArrayWithEmptyOffsets()
+        {
+            var values = new Int32Array.Builder().Build();
+            var array = new ListArray(
+                new ListType(new Int32Type()),
+                length: 0,
+                valueOffsetsBuffer: ArrowBuffer.Empty,
+                values: values,
+                nullBitmapBuffer: ArrowBuffer.Empty,
+                nullCount: 0);
+
+            var recordBatch = new RecordBatch.Builder().Append("x", true, array).Build();
+
+            var stream = new MemoryStream();
+            var writer = new ArrowFileWriter(stream, recordBatch.Schema, leaveOpen: true);
+
+            await writer.WriteRecordBatchAsync(recordBatch);
+            await writer.WriteEndAsync();
+
+            stream.Position = 0;
+
+            await ValidateRecordBatchFile(stream, recordBatch, strictCompare: false);
+        }
+
+        private static void Shuffle(int[] values, Random random)
+        {
+            var length = values.Length;
+            for (int i = 0; i < length - 1; ++i)
+            {
+                var j = random.Next(i, length);
+                var tmp = values[i];
+                values[i] = values[j];
+                values[j] = tmp;
+            }
+        }
     }
 }
diff --git a/csharp/test/Apache.Arrow.Tests/ArrowReaderVerifier.cs b/csharp/test/Apache.Arrow.Tests/ArrowReaderVerifier.cs
index ceeab92860e6f..5c33d1fd43986 100644
--- a/csharp/test/Apache.Arrow.Tests/ArrowReaderVerifier.cs
+++ b/csharp/test/Apache.Arrow.Tests/ArrowReaderVerifier.cs
@@ -160,10 +160,14 @@ public void Visit(StructArray array)
 
                 Assert.Equal(expectedArray.Length, array.Length);
                 Assert.Equal(expectedArray.NullCount, array.NullCount);
-                Assert.Equal(expectedArray.Offset, array.Offset);
                 Assert.Equal(expectedArray.Data.Children.Length, array.Data.Children.Length);
                 Assert.Equal(expectedArray.Fields.Count, array.Fields.Count);
 
+                if (_strictCompare)
+                {
+                    Assert.Equal(expectedArray.Offset, array.Offset);
+                }
+
                 for (int i = 0; i < array.Fields.Count; i++)
                 {
                     array.Fields[i].Accept(new ArrayComparer(expectedArray.Fields[i], _strictCompare));
@@ -178,10 +182,42 @@ public void Visit(UnionArray array)
                 Assert.Equal(expectedArray.Mode, array.Mode);
                 Assert.Equal(expectedArray.Length, array.Length);
                 Assert.Equal(expectedArray.NullCount, array.NullCount);
-                Assert.Equal(expectedArray.Offset, array.Offset);
                 Assert.Equal(expectedArray.Data.Children.Length, array.Data.Children.Length);
                 Assert.Equal(expectedArray.Fields.Count, array.Fields.Count);
 
+                if (_strictCompare)
+                {
+                    Assert.Equal(expectedArray.Offset, array.Offset);
+                    Assert.True(expectedArray.TypeBuffer.Span.SequenceEqual(array.TypeBuffer.Span));
+                }
+                else
+                {
+                    for (int i = 0; i < expectedArray.Length; i++)
+                    {
+                        Assert.Equal(expectedArray.TypeIds[i], array.TypeIds[i]);
+                    }
+                }
+
+                if (_expectedArray is DenseUnionArray expectedDenseArray)
+                {
+                    Assert.IsAssignableFrom<DenseUnionArray>(array);
+                    var denseArray = array as DenseUnionArray;
+                    Assert.NotNull(denseArray);
+
+                    if (_strictCompare)
+                    {
+                        Assert.True(expectedDenseArray.ValueOffsetBuffer.Span.SequenceEqual(denseArray.ValueOffsetBuffer.Span));
+                    }
+                    else
+                    {
+                        for (int i = 0; i < expectedDenseArray.Length; i++)
+                        {
+                            Assert.Equal(
+                                expectedDenseArray.ValueOffsets[i], denseArray.ValueOffsets[i]);
+                        }
+                    }
+                }
+
                 for (int i = 0; i < array.Fields.Count; i++)
                 {
                     array.Fields[i].Accept(new ArrayComparer(expectedArray.Fields[i], _strictCompare));
@@ -220,12 +256,12 @@ private void CompareBinaryArrays<T>(BinaryArray actualArray)
 
                 Assert.Equal(expectedArray.Length, actualArray.Length);
                 Assert.Equal(expectedArray.NullCount, actualArray.NullCount);
-                Assert.Equal(expectedArray.Offset, actualArray.Offset);
 
-                CompareValidityBuffer(expectedArray.NullCount, _expectedArray.Length, expectedArray.NullBitmapBuffer, actualArray.NullBitmapBuffer);
+                CompareValidityBuffer(expectedArray.NullCount, _expectedArray.Length, expectedArray.NullBitmapBuffer, expectedArray.Offset, actualArray.NullBitmapBuffer, actualArray.Offset);
 
                 if (_strictCompare)
                 {
+                    Assert.Equal(expectedArray.Offset, actualArray.Offset);
                     Assert.True(expectedArray.ValueOffsetsBuffer.Span.SequenceEqual(actualArray.ValueOffsetsBuffer.Span));
                     Assert.True(expectedArray.Values.Slice(0, expectedArray.Length).SequenceEqual(actualArray.Values.Slice(0, actualArray.Length)));
                 }
@@ -252,9 +288,13 @@ private void CompareVariadicArrays<T>(BinaryViewArray actualArray)
 
                 Assert.Equal(expectedArray.Length, actualArray.Length);
                 Assert.Equal(expectedArray.NullCount, actualArray.NullCount);
-                Assert.Equal(expectedArray.Offset, actualArray.Offset);
 
-                CompareValidityBuffer(expectedArray.NullCount, _expectedArray.Length, expectedArray.NullBitmapBuffer, actualArray.NullBitmapBuffer);
+                if (_strictCompare)
+                {
+                    Assert.Equal(expectedArray.Offset, actualArray.Offset);
+                }
+
+                CompareValidityBuffer(expectedArray.NullCount, _expectedArray.Length, expectedArray.NullBitmapBuffer, expectedArray.Offset, actualArray.NullBitmapBuffer, actualArray.Offset);
 
                 Assert.True(expectedArray.Views.SequenceEqual(actualArray.Views));
 
@@ -277,12 +317,12 @@ private void CompareArrays(FixedSizeBinaryArray actualArray)
 
                 Assert.Equal(expectedArray.Length, actualArray.Length);
                 Assert.Equal(expectedArray.NullCount, actualArray.NullCount);
-                Assert.Equal(expectedArray.Offset, actualArray.Offset);
 
-                CompareValidityBuffer(expectedArray.NullCount, _expectedArray.Length, expectedArray.NullBitmapBuffer, actualArray.NullBitmapBuffer);
+                CompareValidityBuffer(expectedArray.NullCount, _expectedArray.Length, expectedArray.NullBitmapBuffer, expectedArray.Offset, actualArray.NullBitmapBuffer, actualArray.Offset);
 
                 if (_strictCompare)
                 {
+                    Assert.Equal(expectedArray.Offset, actualArray.Offset);
                     Assert.True(expectedArray.ValueBuffer.Span.Slice(0, expectedArray.Length).SequenceEqual(actualArray.ValueBuffer.Span.Slice(0, actualArray.Length)));
                 }
                 else
@@ -306,12 +346,12 @@ private void CompareArrays<T>(PrimitiveArray<T> actualArray)
 
                 Assert.Equal(expectedArray.Length, actualArray.Length);
                 Assert.Equal(expectedArray.NullCount, actualArray.NullCount);
-                Assert.Equal(expectedArray.Offset, actualArray.Offset);
 
-                CompareValidityBuffer(expectedArray.NullCount, _expectedArray.Length, expectedArray.NullBitmapBuffer, actualArray.NullBitmapBuffer);
+                CompareValidityBuffer(expectedArray.NullCount, _expectedArray.Length, expectedArray.NullBitmapBuffer, expectedArray.Offset, actualArray.NullBitmapBuffer, actualArray.Offset);
 
                 if (_strictCompare)
                 {
+                    Assert.Equal(expectedArray.Offset, actualArray.Offset);
                     Assert.True(expectedArray.Values.Slice(0, expectedArray.Length).SequenceEqual(actualArray.Values.Slice(0, actualArray.Length)));
                 }
                 else
@@ -338,12 +378,12 @@ private void CompareArrays(BooleanArray actualArray)
 
                 Assert.Equal(expectedArray.Length, actualArray.Length);
                 Assert.Equal(expectedArray.NullCount, actualArray.NullCount);
-                Assert.Equal(expectedArray.Offset, actualArray.Offset);
 
-                CompareValidityBuffer(expectedArray.NullCount, _expectedArray.Length, expectedArray.NullBitmapBuffer, actualArray.NullBitmapBuffer);
+                CompareValidityBuffer(expectedArray.NullCount, _expectedArray.Length, expectedArray.NullBitmapBuffer, expectedArray.Offset, actualArray.NullBitmapBuffer, actualArray.Offset);
 
                 if (_strictCompare)
                 {
+                    Assert.Equal(expectedArray.Offset, actualArray.Offset);
                     int booleanByteCount = BitUtility.ByteCount(expectedArray.Length);
                     Assert.True(expectedArray.Values.Slice(0, booleanByteCount).SequenceEqual(actualArray.Values.Slice(0, booleanByteCount)));
                 }
@@ -365,21 +405,31 @@ private void CompareArrays(ListArray actualArray)
 
                 Assert.Equal(expectedArray.Length, actualArray.Length);
                 Assert.Equal(expectedArray.NullCount, actualArray.NullCount);
-                Assert.Equal(expectedArray.Offset, actualArray.Offset);
 
-                CompareValidityBuffer(expectedArray.NullCount, _expectedArray.Length, expectedArray.NullBitmapBuffer, actualArray.NullBitmapBuffer);
+                CompareValidityBuffer(expectedArray.NullCount, _expectedArray.Length, expectedArray.NullBitmapBuffer, expectedArray.Offset, actualArray.NullBitmapBuffer, actualArray.Offset);
 
                 if (_strictCompare)
                 {
+                    Assert.Equal(expectedArray.Offset, actualArray.Offset);
                     Assert.True(expectedArray.ValueOffsetsBuffer.Span.SequenceEqual(actualArray.ValueOffsetsBuffer.Span));
+                    actualArray.Values.Accept(new ArrayComparer(expectedArray.Values, _strictCompare));
                 }
                 else
                 {
-                    int offsetsLength = (expectedArray.Length + 1) * sizeof(int);
-                    Assert.True(expectedArray.ValueOffsetsBuffer.Span.Slice(0, offsetsLength).SequenceEqual(actualArray.ValueOffsetsBuffer.Span.Slice(0, offsetsLength)));
+                    for (int i = 0; i < actualArray.Length; ++i)
+                    {
+                        if (expectedArray.IsNull(i))
+                        {
+                            Assert.True(actualArray.IsNull(i));
+                        }
+                        else
+                        {
+                            var expectedList = expectedArray.GetSlicedValues(i);
+                            var actualList = actualArray.GetSlicedValues(i);
+                            actualList.Accept(new ArrayComparer(expectedList, _strictCompare));
+                        }
+                    }
                 }
-
-                actualArray.Values.Accept(new ArrayComparer(expectedArray.Values, _strictCompare));
             }
 
             private void CompareArrays(ListViewArray actualArray)
@@ -391,23 +441,32 @@ private void CompareArrays(ListViewArray actualArray)
 
                 Assert.Equal(expectedArray.Length, actualArray.Length);
                 Assert.Equal(expectedArray.NullCount, actualArray.NullCount);
-                Assert.Equal(expectedArray.Offset, actualArray.Offset);
 
-                CompareValidityBuffer(expectedArray.NullCount, _expectedArray.Length, expectedArray.NullBitmapBuffer, actualArray.NullBitmapBuffer);
+                CompareValidityBuffer(expectedArray.NullCount, _expectedArray.Length, expectedArray.NullBitmapBuffer, expectedArray.Offset, actualArray.NullBitmapBuffer, actualArray.Offset);
 
                 if (_strictCompare)
                 {
+                    Assert.Equal(expectedArray.Offset, actualArray.Offset);
                     Assert.True(expectedArray.ValueOffsetsBuffer.Span.SequenceEqual(actualArray.ValueOffsetsBuffer.Span));
                     Assert.True(expectedArray.SizesBuffer.Span.SequenceEqual(actualArray.SizesBuffer.Span));
+                    actualArray.Values.Accept(new ArrayComparer(expectedArray.Values, _strictCompare));
                 }
                 else
                 {
-                    int length = expectedArray.Length * sizeof(int);
-                    Assert.True(expectedArray.ValueOffsetsBuffer.Span.Slice(0, length).SequenceEqual(actualArray.ValueOffsetsBuffer.Span.Slice(0, length)));
-                    Assert.True(expectedArray.SizesBuffer.Span.Slice(0, length).SequenceEqual(actualArray.SizesBuffer.Span.Slice(0, length)));
+                    for (int i = 0; i < actualArray.Length; ++i)
+                    {
+                        if (expectedArray.IsNull(i))
+                        {
+                            Assert.True(actualArray.IsNull(i));
+                        }
+                        else
+                        {
+                            var expectedList = expectedArray.GetSlicedValues(i);
+                            var actualList = actualArray.GetSlicedValues(i);
+                            actualList.Accept(new ArrayComparer(expectedList, _strictCompare));
+                        }
+                    }
                 }
-
-                actualArray.Values.Accept(new ArrayComparer(expectedArray.Values, _strictCompare));
             }
 
             private void CompareArrays(FixedSizeListArray actualArray)
@@ -419,38 +478,38 @@ private void CompareArrays(FixedSizeListArray actualArray)
 
                 Assert.Equal(expectedArray.Length, actualArray.Length);
                 Assert.Equal(expectedArray.NullCount, actualArray.NullCount);
-                Assert.Equal(expectedArray.Offset, actualArray.Offset);
+                if (_strictCompare)
+                {
+                    Assert.Equal(expectedArray.Offset, actualArray.Offset);
+                }
 
-                CompareValidityBuffer(expectedArray.NullCount, _expectedArray.Length, expectedArray.NullBitmapBuffer, actualArray.NullBitmapBuffer);
+                CompareValidityBuffer(expectedArray.NullCount, _expectedArray.Length, expectedArray.NullBitmapBuffer, expectedArray.Offset, actualArray.NullBitmapBuffer, actualArray.Offset);
 
-                actualArray.Values.Accept(new ArrayComparer(expectedArray.Values, _strictCompare));
+                var listSize = ((FixedSizeListType)expectedArray.Data.DataType).ListSize;
+                var expectedValuesSlice = ArrowArrayFactory.Slice(
+                    expectedArray.Values, expectedArray.Offset * listSize, expectedArray.Length * listSize);
+                actualArray.Values.Accept(new ArrayComparer(expectedValuesSlice, _strictCompare));
             }
 
-            private void CompareValidityBuffer(int nullCount, int arrayLength, ArrowBuffer expectedValidityBuffer, ArrowBuffer actualValidityBuffer)
+            private void CompareValidityBuffer(int nullCount, int arrayLength, ArrowBuffer expectedValidityBuffer, int expectedBufferOffset, ArrowBuffer actualValidityBuffer, int actualBufferOffset)
             {
                 if (_strictCompare)
                 {
                     Assert.True(expectedValidityBuffer.Span.SequenceEqual(actualValidityBuffer.Span));
                 }
-                else if (nullCount != 0 && arrayLength > 0)
+                else if (actualValidityBuffer.IsEmpty || expectedValidityBuffer.IsEmpty || arrayLength == 0)
                 {
-                    int validityBitmapByteCount = BitUtility.ByteCount(arrayLength);
-                    ReadOnlySpan<byte> expectedSpanPartial = expectedValidityBuffer.Span.Slice(0, validityBitmapByteCount - 1);
-                    ReadOnlySpan<byte> actualSpanPartial = actualValidityBuffer.Span.Slice(0, validityBitmapByteCount - 1);
-
-                    // Compare the first validityBitmapByteCount - 1 bytes
-                    Assert.True(
-                        expectedSpanPartial.SequenceEqual(actualSpanPartial),
-                        string.Format("First {0} bytes of validity buffer do not match", validityBitmapByteCount - 1));
-
-                    // Compare the last byte bitwise (because there is no guarantee about the value of
-                    // bits outside the range [0, arrayLength])
-                    ReadOnlySpan<byte> expectedSpanFull = expectedValidityBuffer.Span.Slice(0, validityBitmapByteCount);
-                    ReadOnlySpan<byte> actualSpanFull = actualValidityBuffer.Span.Slice(0, validityBitmapByteCount);
-                    for (int i = 8 * (validityBitmapByteCount - 1); i < arrayLength; i++)
+                    Assert.True(nullCount == 0 || arrayLength == 0);
+                }
+                else
+                {
+                    // Compare all values bitwise
+                    var expectedSpan = expectedValidityBuffer.Span;
+                    var actualSpan = actualValidityBuffer.Span;
+                    for (int i = 0; i < arrayLength; i++)
                     {
                         Assert.True(
-                            BitUtility.GetBit(expectedSpanFull, i) == BitUtility.GetBit(actualSpanFull, i),
+                            BitUtility.GetBit(expectedSpan, expectedBufferOffset + i) == BitUtility.GetBit(actualSpan, actualBufferOffset + i),
                             string.Format("Bit at index {0}/{1} is not equal", i, arrayLength));
                     }
                 }
diff --git a/csharp/test/Apache.Arrow.Tests/ArrowStreamWriterTests.cs b/csharp/test/Apache.Arrow.Tests/ArrowStreamWriterTests.cs
index c4c0b6ec9ff21..db8369fa618e9 100644
--- a/csharp/test/Apache.Arrow.Tests/ArrowStreamWriterTests.cs
+++ b/csharp/test/Apache.Arrow.Tests/ArrowStreamWriterTests.cs
@@ -203,7 +203,37 @@ public async Task WriteBatchWithNullsAsync()
             await TestRoundTripRecordBatchAsync(originalBatch);
         }
 
-        private static void TestRoundTripRecordBatches(List<RecordBatch> originalBatches, IpcOptions options = null)
+        [Theory]
+        [InlineData(0, 45)]
+        [InlineData(3, 45)]
+        [InlineData(16, 45)]
+        public void WriteSlicedArrays(int sliceOffset, int sliceLength)
+        {
+            var originalBatch = TestData.CreateSampleRecordBatch(length: 100);
+            var slicedArrays = originalBatch.Arrays
+                .Select(array => ArrowArrayFactory.Slice(array, sliceOffset, sliceLength))
+                .ToList();
+            var slicedBatch = new RecordBatch(originalBatch.Schema, slicedArrays, sliceLength);
+
+            TestRoundTripRecordBatch(slicedBatch, strictCompare: false);
+        }
+
+        [Theory]
+        [InlineData(0, 45)]
+        [InlineData(3, 45)]
+        [InlineData(16, 45)]
+        public async Task WriteSlicedArraysAsync(int sliceOffset, int sliceLength)
+        {
+            var originalBatch = TestData.CreateSampleRecordBatch(length: 100);
+            var slicedArrays = originalBatch.Arrays
+                .Select(array => ArrowArrayFactory.Slice(array, sliceOffset, sliceLength))
+                .ToList();
+            var slicedBatch = new RecordBatch(originalBatch.Schema, slicedArrays, sliceLength);
+
+            await TestRoundTripRecordBatchAsync(slicedBatch, strictCompare: false);
+        }
+
+        private static void TestRoundTripRecordBatches(List<RecordBatch> originalBatches, IpcOptions options = null, bool strictCompare = true)
         {
             using (MemoryStream stream = new MemoryStream())
             {
@@ -223,13 +253,13 @@ private static void TestRoundTripRecordBatches(List<RecordBatch> originalBatches
                     foreach (RecordBatch originalBatch in originalBatches)
                     {
                         RecordBatch newBatch = reader.ReadNextRecordBatch();
-                        ArrowReaderVerifier.CompareBatches(originalBatch, newBatch);
+                        ArrowReaderVerifier.CompareBatches(originalBatch, newBatch, strictCompare: strictCompare);
                     }
                 }
             }
         }
 
-        private static async Task TestRoundTripRecordBatchesAsync(List<RecordBatch> originalBatches, IpcOptions options = null)
+        private static async Task TestRoundTripRecordBatchesAsync(List<RecordBatch> originalBatches, IpcOptions options = null, bool strictCompare = true)
         {
             using (MemoryStream stream = new MemoryStream())
             {
@@ -249,20 +279,20 @@ private static async Task TestRoundTripRecordBatchesAsync(List<RecordBatch> orig
                     foreach (RecordBatch originalBatch in originalBatches)
                     {
                         RecordBatch newBatch = reader.ReadNextRecordBatch();
-                        ArrowReaderVerifier.CompareBatches(originalBatch, newBatch);
+                        ArrowReaderVerifier.CompareBatches(originalBatch, newBatch, strictCompare: strictCompare);
                     }
                 }
             }
         }
 
-        private static void TestRoundTripRecordBatch(RecordBatch originalBatch, IpcOptions options = null)
+        private static void TestRoundTripRecordBatch(RecordBatch originalBatch, IpcOptions options = null, bool strictCompare = true)
         {
-            TestRoundTripRecordBatches(new List<RecordBatch> { originalBatch }, options);
+            TestRoundTripRecordBatches(new List<RecordBatch> { originalBatch }, options, strictCompare: strictCompare);
         }
 
-        private static async Task TestRoundTripRecordBatchAsync(RecordBatch originalBatch, IpcOptions options = null)
+        private static async Task TestRoundTripRecordBatchAsync(RecordBatch originalBatch, IpcOptions options = null, bool strictCompare = true)
         {
-            await TestRoundTripRecordBatchesAsync(new List<RecordBatch> { originalBatch }, options);
+            await TestRoundTripRecordBatchesAsync(new List<RecordBatch> { originalBatch }, options, strictCompare: strictCompare);
         }
 
         [Fact]
diff --git a/csharp/test/Apache.Arrow.Tests/BinaryViewArrayTests.cs b/csharp/test/Apache.Arrow.Tests/BinaryViewArrayTests.cs
new file mode 100644
index 0000000000000..7c18a49e96944
--- /dev/null
+++ b/csharp/test/Apache.Arrow.Tests/BinaryViewArrayTests.cs
@@ -0,0 +1,40 @@
+// 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.
+
+using Xunit;
+
+namespace Apache.Arrow.Tests;
+
+public class BinaryViewArrayTests
+{
+    [Fact]
+    public void SliceBinaryViewArray()
+    {
+        var array = new BinaryViewArray.Builder()
+            .Append(new byte[] { 0, 1, 2 })
+            .Append(new byte[] { 3, 4 })
+            .AppendNull()
+            .Append(new byte[] { 5, 6 })
+            .Append(new byte[] { 7, 8 })
+            .Build();
+
+        var slice = (BinaryViewArray)array.Slice(1, 3);
+
+        Assert.Equal(3, slice.Length);
+        Assert.Equal(new byte[] {3, 4}, slice.GetBytes(0).ToArray());
+        Assert.True(slice.GetBytes(1).IsEmpty);
+        Assert.Equal(new byte[] {5, 6}, slice.GetBytes(2).ToArray());
+    }
+}
diff --git a/csharp/test/Apache.Arrow.Tests/CDataInterfacePythonTests.cs b/csharp/test/Apache.Arrow.Tests/CDataInterfacePythonTests.cs
index 274434e4bab09..fee18d165cdbd 100644
--- a/csharp/test/Apache.Arrow.Tests/CDataInterfacePythonTests.cs
+++ b/csharp/test/Apache.Arrow.Tests/CDataInterfacePythonTests.cs
@@ -31,24 +31,19 @@ namespace Apache.Arrow.Tests
 {
     public class CDataSchemaPythonTest : IClassFixture<CDataSchemaPythonTest.PythonNet>
     {
-        class PythonNet : IDisposable
+        public class PythonNet : IDisposable
         {
+            public bool Initialized { get; }
+
             public PythonNet()
             {
-                bool inCIJob = Environment.GetEnvironmentVariable("GITHUB_ACTIONS") == "true";
-                bool inVerificationJob = Environment.GetEnvironmentVariable("TEST_CSHARP") == "1";
                 bool pythonSet = Environment.GetEnvironmentVariable("PYTHONNET_PYDLL") != null;
-                // We only skip if this is not in CI
-                if (inCIJob && !inVerificationJob && !pythonSet)
-                {
-                    throw new Exception("PYTHONNET_PYDLL not set; skipping C Data Interface tests.");
-                }
-                else
+                if (!pythonSet)
                 {
-                    Skip.If(!pythonSet, "PYTHONNET_PYDLL not set; skipping C Data Interface tests.");
+                    Initialized = false;
+                    return;
                 }
 
-
                 PythonEngine.Initialize();
 
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) &&
@@ -57,6 +52,8 @@ public PythonNet()
                     dynamic sys = Py.Import("sys");
                     sys.path.append(Path.Combine(Path.GetDirectoryName(Environment.GetEnvironmentVariable("PYTHONNET_PYDLL")), "DLLs"));
                 }
+
+                Initialized = true;
             }
 
             public void Dispose()
@@ -65,6 +62,21 @@ public void Dispose()
             }
         }
 
+        public CDataSchemaPythonTest(PythonNet pythonNet)
+        {
+            if (!pythonNet.Initialized)
+            {
+                bool inCIJob = Environment.GetEnvironmentVariable("GITHUB_ACTIONS") == "true";
+                bool inVerificationJob = Environment.GetEnvironmentVariable("TEST_CSHARP") == "1";
+
+                // Skip these tests if this is not in CI or is a verification job and PythonNet couldn't be initialized
+                Skip.If(inVerificationJob || !inCIJob, "PYTHONNET_PYDLL not set; skipping C Data Interface tests.");
+
+                // Otherwise throw
+                throw new Exception("PYTHONNET_PYDLL not set; cannot run C Data Interface tests.");
+            }
+        }
+
         private static Schema GetTestSchema()
         {
             using (Py.GIL())
diff --git a/csharp/test/Apache.Arrow.Tests/Date32ArrayTests.cs b/csharp/test/Apache.Arrow.Tests/Date32ArrayTests.cs
index 2a674b942c17b..6e4742cad06f2 100644
--- a/csharp/test/Apache.Arrow.Tests/Date32ArrayTests.cs
+++ b/csharp/test/Apache.Arrow.Tests/Date32ArrayTests.cs
@@ -131,7 +131,7 @@ public void AppendGivesUtcDate(DateTimeOffset dateTimeOffset)
         public class AppendDateOnly
         {
             [Theory]
-            [MemberData(nameof(GetDateOnlyData), MemberType = typeof(Date64ArrayTests))]
+            [MemberData(nameof(GetDateOnlyData), MemberType = typeof(Date32ArrayTests))]
             public void AppendDateGivesSameDate(DateOnly date)
             {
                 // Arrange
diff --git a/csharp/test/Apache.Arrow.Tests/Decimal128ArrayTests.cs b/csharp/test/Apache.Arrow.Tests/Decimal128ArrayTests.cs
index fdc07effb715f..c5e0647f60a39 100644
--- a/csharp/test/Apache.Arrow.Tests/Decimal128ArrayTests.cs
+++ b/csharp/test/Apache.Arrow.Tests/Decimal128ArrayTests.cs
@@ -458,5 +458,48 @@ public void AppendRangeSqlDecimal()
                 }
             }
         }
+
+        [Fact]
+        public void SliceDecimal128Array()
+        {
+            // Arrange
+            const int originalLength = 50;
+            const int offset = 3;
+            const int sliceLength = 32;
+
+            var builder = new Decimal128Array.Builder(new Decimal128Type(14, 10));
+            var random = new Random();
+
+            for (int i = 0; i < originalLength; i++)
+            {
+                if (random.NextDouble() < 0.2)
+                {
+                    builder.AppendNull();
+                }
+                else
+                {
+                    builder.Append(i * (decimal)Math.Round(random.NextDouble(), 10));
+                }
+            }
+
+            var array = builder.Build();
+
+            // Act
+            var slice = (Decimal128Array)array.Slice(offset, sliceLength);
+
+            // Assert
+            Assert.NotNull(slice);
+            Assert.Equal(sliceLength, slice.Length);
+            for (int i = 0; i < sliceLength; ++i)
+            {
+                Assert.Equal(array.GetValue(offset + i), slice.GetValue(i));
+                Assert.Equal(array.GetSqlDecimal(offset + i), slice.GetSqlDecimal(i));
+                Assert.Equal(array.GetString(offset + i), slice.GetString(i));
+            }
+
+            Assert.Equal(
+                array.ToList(includeNulls: true).Skip(offset).Take(sliceLength).ToList(),
+                slice.ToList(includeNulls: true));
+        }
     }
 }
diff --git a/csharp/test/Apache.Arrow.Tests/Decimal256ArrayTests.cs b/csharp/test/Apache.Arrow.Tests/Decimal256ArrayTests.cs
index baeb7ee5419b9..ba0eb5f017766 100644
--- a/csharp/test/Apache.Arrow.Tests/Decimal256ArrayTests.cs
+++ b/csharp/test/Apache.Arrow.Tests/Decimal256ArrayTests.cs
@@ -476,5 +476,56 @@ public void AppendRangeSqlDecimal()
                 }
             }
         }
+
+        [Fact]
+        public void SliceDecimal256Array()
+        {
+            // Arrange
+            const int originalLength = 50;
+            const int offset = 3;
+            const int sliceLength = 32;
+
+            var builder = new Decimal256Array.Builder(new Decimal256Type(14, 10));
+            var random = new Random();
+
+            for (int i = 0; i < originalLength; i++)
+            {
+                if (random.NextDouble() < 0.2)
+                {
+                    builder.AppendNull();
+                }
+                else
+                {
+                    builder.Append(i * (decimal)Math.Round(random.NextDouble(), 10));
+                }
+            }
+
+            var array = builder.Build();
+
+            // Act
+            var slice = (Decimal256Array)array.Slice(offset, sliceLength);
+
+            // Assert
+            Assert.NotNull(slice);
+            Assert.Equal(sliceLength, slice.Length);
+            for (int i = 0; i < sliceLength; ++i)
+            {
+                Assert.Equal(array.GetValue(offset + i), slice.GetValue(i));
+                if (array.TryGetSqlDecimal(offset + i, out var expectedSqlDecimal))
+                {
+                    Assert.True(slice.TryGetSqlDecimal(i, out var actualSqlDecimal));
+                    Assert.Equal(expectedSqlDecimal, actualSqlDecimal);
+                }
+                else
+                {
+                    Assert.False(slice.TryGetSqlDecimal(i, out _));
+                }
+                Assert.Equal(array.GetString(offset + i), slice.GetString(i));
+            }
+
+            Assert.Equal(
+                array.ToList(includeNulls: true).Skip(offset).Take(sliceLength).ToList(),
+                slice.ToList(includeNulls: true));
+        }
     }
 }
diff --git a/csharp/test/Apache.Arrow.Tests/DurationArrayTests.cs b/csharp/test/Apache.Arrow.Tests/DurationArrayTests.cs
index 59080d739b10b..412f67de5f0fb 100644
--- a/csharp/test/Apache.Arrow.Tests/DurationArrayTests.cs
+++ b/csharp/test/Apache.Arrow.Tests/DurationArrayTests.cs
@@ -115,7 +115,7 @@ public void AppendTimeSpanGivesSameTimeSpan(TimeSpan? timeSpan, DurationType typ
                 Assert.Equal(timeSpan, array.GetTimeSpan(0));
 
                 IReadOnlyList<TimeSpan?> asList = array;
-                Assert.Equal(1, asList.Count);
+                Assert.Single(asList);
                 Assert.Equal(timeSpan, asList[0]);
             }
         }
diff --git a/csharp/test/Apache.Arrow.Tests/Extensions/DateTimeOffsetExtensions.cs b/csharp/test/Apache.Arrow.Tests/Extensions/DateTimeOffsetExtensions.cs
index 4375c39cdfaf6..01809735d14c9 100644
--- a/csharp/test/Apache.Arrow.Tests/Extensions/DateTimeOffsetExtensions.cs
+++ b/csharp/test/Apache.Arrow.Tests/Extensions/DateTimeOffsetExtensions.cs
@@ -14,8 +14,6 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Apache.Arrow.Tests
 {
diff --git a/csharp/test/Apache.Arrow.Tests/FixedSizeBinaryArrayTests.cs b/csharp/test/Apache.Arrow.Tests/FixedSizeBinaryArrayTests.cs
new file mode 100644
index 0000000000000..abc66d6ce9c9d
--- /dev/null
+++ b/csharp/test/Apache.Arrow.Tests/FixedSizeBinaryArrayTests.cs
@@ -0,0 +1,52 @@
+// 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.
+
+using System.Linq;
+using Apache.Arrow.Arrays;
+using Apache.Arrow.Types;
+using Xunit;
+
+namespace Apache.Arrow.Tests;
+
+public class FixedSizeBinaryArrayTests
+{
+    [Fact]
+    public void SliceFixedSizeBinaryArray()
+    {
+        const int byteWidth = 2;
+        const int length = 5;
+        const int nullCount = 1;
+
+        var validityBuffer = new ArrowBuffer.BitmapBuilder()
+            .AppendRange(true, 2)
+            .Append(false)
+            .AppendRange(true, 2)
+            .Build();
+        var dataBuffer = new ArrowBuffer.Builder<byte>()
+            .AppendRange(Enumerable.Range(0, length * byteWidth).Select(i => (byte)i))
+            .Build();
+        var arrayData = new ArrayData(
+            new FixedSizeBinaryType(byteWidth),
+            length, nullCount, 0, new [] {validityBuffer, dataBuffer});
+        var array = new FixedSizeBinaryArray(arrayData);
+
+        var slice = (FixedSizeBinaryArray)array.Slice(1, 3);
+
+        Assert.Equal(3, slice.Length);
+        Assert.Equal(new byte[] {2, 3}, slice.GetBytes(0).ToArray());
+        Assert.True(slice.GetBytes(1).IsEmpty);
+        Assert.Equal(new byte[] {6, 7}, slice.GetBytes(2).ToArray());
+    }
+}
diff --git a/csharp/test/Apache.Arrow.Tests/StringArrayTests.cs b/csharp/test/Apache.Arrow.Tests/StringArrayTests.cs
index 0fd3d3d105a70..b19731535a29d 100644
--- a/csharp/test/Apache.Arrow.Tests/StringArrayTests.cs
+++ b/csharp/test/Apache.Arrow.Tests/StringArrayTests.cs
@@ -49,6 +49,37 @@ public void ReturnsAppendedValue(string firstValue, string secondValue)
                 // Assert
                 Assert.Equal(firstValue, retrievedValue);
             }
+
+            [Theory]
+            [InlineData(null, null)]
+            [InlineData(null, "")]
+            [InlineData(null, "value")]
+            [InlineData("", null)]
+            [InlineData("", "")]
+            [InlineData("", "value")]
+            [InlineData("value", null)]
+            [InlineData("value", "")]
+            [InlineData("value", "value")]
+            public void ReturnsAppendedValueMaterialize(string firstValue, string secondValue)
+            {
+                // Arrange
+                // Create an array with two elements. The second element being null,
+                // empty, or non-empty may influence the underlying BinaryArray
+                // storage such that retrieving an empty first element could result
+                // in an empty span or a 0-length span backed by storage.
+                var array = new StringArray.Builder()
+                    .Append(firstValue)
+                    .Append(secondValue)
+                    .Build();
+
+                // Act
+                array.Materialize();
+                var retrievedValue = array.GetString(0);
+
+                // Assert
+                Assert.True(array.IsMaterialized());
+                Assert.Equal(firstValue, retrievedValue);
+            }
         }
     }
 }
diff --git a/csharp/test/Apache.Arrow.Tests/TestData.cs b/csharp/test/Apache.Arrow.Tests/TestData.cs
index 29ddef2864862..3ea42ee0fbcb7 100644
--- a/csharp/test/Apache.Arrow.Tests/TestData.cs
+++ b/csharp/test/Apache.Arrow.Tests/TestData.cs
@@ -294,7 +294,18 @@ public void Visit(StringType type)
 
                 for (var i = 0; i < Length; i++)
                 {
-                    builder.Append(str);
+                    switch (i % 3)
+                    {
+                        case 0:
+                            builder.AppendNull();
+                            break;
+                        case 1:
+                            builder.Append(str);
+                            break;
+                        case 2:
+                            builder.Append(str + str);
+                            break;
+                    }
                 }
 
                 Array = builder.Build();
@@ -328,15 +339,21 @@ public void Visit(ListType type)
             {
                 var builder = new ListArray.Builder(type.ValueField).Reserve(Length);
 
-                var valueBuilder = (Int64Array.Builder)builder.ValueBuilder.Reserve(Length + 1);
+                var valueBuilder = (Int64Array.Builder)builder.ValueBuilder.Reserve(Length * 3 / 2);
 
                 for (var i = 0; i < Length; i++)
                 {
-                    builder.Append();
-                    valueBuilder.Append(i);
+                    if (i % 10 == 2)
+                    {
+                        builder.AppendNull();
+                    }
+                    else
+                    {
+                        builder.Append();
+                        var listLength = i % 4;
+                        valueBuilder.AppendRange(Enumerable.Range(i, listLength).Select(x => (long)x));
+                    }
                 }
-                //Add a value to check if Values.Length can exceed ListArray.Length
-                valueBuilder.Append(0);
 
                 Array = builder.Build();
             }
@@ -352,8 +369,12 @@ public void Visit(ListViewType type)
                     builder.Append();
                     valueBuilder.Append(i);
                 }
-                //Add a value to check if Values.Length can exceed ListArray.Length
-                valueBuilder.Append(0);
+
+                if (Length > 0)
+                {
+                    // Add a value to check if Values.Length can exceed ListArray.Length
+                    valueBuilder.Append(0);
+                }
 
                 Array = builder.Build();
             }
@@ -562,9 +583,13 @@ public void Visit(MapType type)
                     keyBuilder.Append(i.ToString());
                     valueBuilder.Append(i);
                 }
-                //Add a value to check if Values.Length can exceed MapArray.Length
-                keyBuilder.Append("0");
-                valueBuilder.Append(0);
+
+                if (Length > 0)
+                {
+                    // Add a value to check if Values.Length can exceed MapArray.Length
+                    keyBuilder.Append("0");
+                    valueBuilder.Append(0);
+                }
 
                 Array = builder.Build();
             }
diff --git a/csharp/test/Apache.Arrow.Tests/UnionArrayTests.cs b/csharp/test/Apache.Arrow.Tests/UnionArrayTests.cs
new file mode 100644
index 0000000000000..c603ef63a4d3e
--- /dev/null
+++ b/csharp/test/Apache.Arrow.Tests/UnionArrayTests.cs
@@ -0,0 +1,209 @@
+// 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.
+
+using System;
+using System.Linq;
+using Apache.Arrow.Types;
+using Xunit;
+
+namespace Apache.Arrow.Tests;
+
+public class UnionArrayTests
+{
+    [Theory]
+    [InlineData(UnionMode.Sparse)]
+    [InlineData(UnionMode.Dense)]
+    public void UnionArrayIsNull(UnionMode mode)
+    {
+        var (array, expectedNull) = BuildUnionArray(mode, 100);
+
+        for (var i = 0; i < array.Length; ++i)
+        {
+            Assert.Equal(expectedNull[i], array.IsNull(i));
+            Assert.Equal(!expectedNull[i], array.IsValid(i));
+        }
+    }
+
+    [Theory]
+    [InlineData(UnionMode.Sparse)]
+    [InlineData(UnionMode.Dense)]
+    public void UnionArraySlice(UnionMode mode)
+    {
+        var (array, expectedNull) = BuildUnionArray(mode, 10);
+
+        for (var offset = 0; offset < array.Length; ++offset)
+        {
+            for (var length = 0; length < array.Length - offset; ++length)
+            {
+                var slicedArray = (UnionArray)ArrowArrayFactory.Slice(array, offset, length);
+
+                var nullCount = 0;
+                for (var i = 0; i < slicedArray.Length; ++i)
+                {
+                    Assert.Equal(expectedNull[offset + i], slicedArray.IsNull(i));
+                    Assert.Equal(!expectedNull[offset + i], slicedArray.IsValid(i));
+                    nullCount += expectedNull[offset + i] ? 1 : 0;
+
+                    CompareValue(array, offset + i, slicedArray, i);
+                }
+
+                Assert.Equal(nullCount, slicedArray.NullCount);
+            }
+        }
+    }
+
+    [Theory]
+    [InlineData(UnionMode.Sparse)]
+    [InlineData(UnionMode.Dense)]
+    public void UnionArrayConstructedWithOffset(UnionMode mode)
+    {
+        const int length = 10;
+        var (array, expectedNull) = BuildUnionArray(mode, length);
+
+        for (var offset = 0; offset < array.Length; ++offset)
+        {
+            var (slicedArray, _) = BuildUnionArray(mode, length, offset);
+
+            var nullCount = 0;
+            for (var i = 0; i < slicedArray.Length; ++i)
+            {
+                Assert.Equal(expectedNull[offset + i], slicedArray.IsNull(i));
+                Assert.Equal(!expectedNull[offset + i], slicedArray.IsValid(i));
+                nullCount += expectedNull[offset + i] ? 1 : 0;
+
+                CompareValue(array, offset + i, slicedArray, i);
+            }
+
+            Assert.Equal(nullCount, slicedArray.NullCount);
+        }
+    }
+
+    private static void CompareValue(UnionArray originalArray, int originalIndex, UnionArray slicedArray, int sliceIndex)
+    {
+        var typeId = originalArray.TypeIds[originalIndex];
+        var sliceTypeId = slicedArray.TypeIds[sliceIndex];
+        Assert.Equal(typeId, sliceTypeId);
+
+        switch (typeId)
+        {
+            case 0:
+                CompareFieldValue<int, Int32Array>(typeId, originalArray, originalIndex, slicedArray, sliceIndex);
+                break;
+            case 1:
+                CompareFieldValue<float, FloatArray>(typeId, originalArray, originalIndex, slicedArray, sliceIndex);
+                break;
+            default:
+                throw new Exception($"Unexpected type id {typeId}");
+        }
+    }
+
+    private static void CompareFieldValue<T, TArray>(byte typeId, UnionArray originalArray, int originalIndex, UnionArray slicedArray, int sliceIndex)
+        where T : struct, IEquatable<T>
+        where TArray : PrimitiveArray<T>
+    {
+        if (originalArray is DenseUnionArray denseOriginalArray)
+        {
+            Assert.IsType<DenseUnionArray>(slicedArray);
+
+            originalIndex = denseOriginalArray.ValueOffsets[originalIndex];
+            sliceIndex = ((DenseUnionArray)slicedArray).ValueOffsets[sliceIndex];
+        }
+        var originalValue = ((TArray)originalArray.Fields[typeId]).GetValue(originalIndex);
+        var sliceValue = ((TArray)slicedArray.Fields[typeId]).GetValue(sliceIndex);
+        Assert.Equal(originalValue, sliceValue);
+    }
+
+    private static (UnionArray array, bool[] isNull) BuildUnionArray(UnionMode mode, int length, int offset=0)
+    {
+        var fields = new Field[]
+        {
+            new Field("field0", new Int32Type(), true),
+            new Field("field1", new FloatType(), true),
+        };
+        var typeIds = new[] { 0, 1 };
+        var type = new UnionType(fields, typeIds, mode);
+
+        var nullCount = 0;
+        var field0Builder = new Int32Array.Builder();
+        var field1Builder = new FloatArray.Builder();
+        var typeIdsBuilder = new ArrowBuffer.Builder<byte>();
+        var valuesOffsetBuilder = new ArrowBuffer.Builder<int>();
+        var expectedNull = new bool[length];
+
+        for (var i = 0; i < length; ++i)
+        {
+            var isNull = i % 3 == 0;
+            expectedNull[i] = isNull;
+            nullCount += (isNull && i >= offset) ? 1 : 0;
+
+            if (i % 2 == 0)
+            {
+                typeIdsBuilder.Append(0);
+                if (mode == UnionMode.Sparse)
+                {
+                    field1Builder.Append(0.0f);
+                }
+                else
+                {
+                    valuesOffsetBuilder.Append(field0Builder.Length);
+                }
+
+                if (isNull)
+                {
+                    field0Builder.AppendNull();
+                }
+                else
+                {
+                    field0Builder.Append(i);
+                }
+            }
+            else
+            {
+                typeIdsBuilder.Append(1);
+                if (mode == UnionMode.Sparse)
+                {
+                    field0Builder.Append(0);
+                }
+                else
+                {
+                    valuesOffsetBuilder.Append(field1Builder.Length);
+                }
+
+                if (isNull)
+                {
+                    field1Builder.AppendNull();
+                }
+                else
+                {
+                    field1Builder.Append(i * 0.1f);
+                }
+            }
+        }
+
+        var typeIdsBuffer = typeIdsBuilder.Build();
+        var valuesOffsetBuffer = valuesOffsetBuilder.Build();
+        var children = new IArrowArray[]
+        {
+            field0Builder.Build(),
+            field1Builder.Build()
+        };
+
+        UnionArray array = mode == UnionMode.Dense
+            ? new DenseUnionArray(type, length - offset, children, typeIdsBuffer, valuesOffsetBuffer, nullCount, offset)
+            : new SparseUnionArray(type, length - offset, children, typeIdsBuffer, nullCount, offset);
+
+        return (array, expectedNull);
+    }
+}
diff --git a/dev/README.md b/dev/README.md
index db9a10d527334..b04dd35b1c1ff 100644
--- a/dev/README.md
+++ b/dev/README.md
@@ -48,17 +48,32 @@ After installed, it runs the merge script.
 you'll have to install Python dependencies yourself and then run
 `dev/merge_arrow_pr.py` directly.)
 
+The merge script requires tokens for access control. There are two options
+for configuring your tokens: environment variables or a configuration file.
+
+> Note: Arrow only requires a GitHub token. Parquet can use GitHub or
+JIRA tokens.
+
+#### Pass tokens via Environment Variables
+
 The merge script uses the GitHub REST API. You must set a
-`ARROW_GITHUB_API_TOKEN` environment variable to use a 
-[Personal Access Token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token). 
+`ARROW_GITHUB_API_TOKEN` environment variable to use a
+[Personal Access Token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token).
 You need to add `workflow` scope to the Personal Access Token.
 
-You can specify the 
+You can specify the
 [Personal Access Token](https://confluence.atlassian.com/enterprise/using-personal-access-tokens-1026032365.html)
-of your JIRA account in the 
+of your JIRA account in the
 `APACHE_JIRA_TOKEN` environment variable.
 If the variable is not set, the script will ask you for it.
 
+#### Pass tokens via configuration file
+
+```
+cp ./merge.conf.sample ~/.config/arrow/merge.conf
+```
+Update your new `merge.conf` file with your Personal Access Tokens.
+
 Example output:
 
 ```text
diff --git a/dev/archery/README.md b/dev/archery/README.md
index 9991e7402d832..0b9d5c743d122 100644
--- a/dev/archery/README.md
+++ b/dev/archery/README.md
@@ -23,7 +23,7 @@ Archery is documented on the Arrow website:
 
 * [Daily development using Archery](https://arrow.apache.org/docs/developers/continuous_integration/archery.html)
 * [Using Archery and Crossbow](https://arrow.apache.org/docs/developers/continuous_integration/crossbow.html)
-* [Using Archer and Docker](https://arrow.apache.org/docs/developers/continuous_integration/docker.html)
+* [Using Archery and Docker](https://arrow.apache.org/docs/developers/continuous_integration/docker.html)
 
 # Installing Archery
 
diff --git a/dev/archery/archery/benchmark/google.py b/dev/archery/archery/benchmark/google.py
index 5d07ffab2edd8..b07dc8cb30f84 100644
--- a/dev/archery/archery/benchmark/google.py
+++ b/dev/archery/archery/benchmark/google.py
@@ -57,7 +57,7 @@ def results(self, repetitions=1, repetition_min_time=None):
                     "--benchmark_out_format=json"]
 
             if repetition_min_time is not None:
-                argv.append(f"--benchmark_min_time={repetition_min_time:.6f}")
+                argv.append(f"--benchmark_min_time={repetition_min_time:.6f}s")
 
             if self.benchmark_filter:
                 argv.append(f"--benchmark_filter={self.benchmark_filter}")
diff --git a/dev/archery/archery/cli.py b/dev/archery/archery/cli.py
index 32921afb2e61b..cd746f9c4499a 100644
--- a/dev/archery/archery/cli.py
+++ b/dev/archery/archery/cli.py
@@ -44,6 +44,7 @@
 
 @click.group(context_settings={"help_option_names": ["-h", "--help"]})
 @click.option("--debug", type=BOOL, is_flag=True, default=False,
+              envvar='ARCHERY_DEBUG',
               help="Increase logging with debugging output.")
 @click.option("--pdb", type=BOOL, is_flag=True, default=False,
               help="Invoke pdb on uncaught exception.")
@@ -260,6 +261,7 @@ def build(ctx, src, build_dir, force, targets, **kwargs):
               "Check all sources files for license texts via Apache RAT."),
     LintCheck('r', "Lint R files."),
     LintCheck('docker', "Lint Dockerfiles with hadolint."),
+    LintCheck('docs', "Lint docs with sphinx-lint."),
 ]
 
 
@@ -284,9 +286,10 @@ def decorate_lint_command(cmd):
               help="Run IWYU on all C++ files if enabled")
 @click.option("-a", "--all", is_flag=True, default=False,
               help="Enable all checks.")
+@click.argument("path", required=False)
 @decorate_lint_command
 @click.pass_context
-def lint(ctx, src, fix, iwyu_all, **checks):
+def lint(ctx, src, fix, iwyu_all, path, **checks):
     if checks.pop('all'):
         # "--all" is given => enable all non-selected checks
         for k, v in checks.items():
@@ -296,7 +299,7 @@ def lint(ctx, src, fix, iwyu_all, **checks):
         raise click.UsageError(
             "Need to enable at least one lint check (try --help)")
     try:
-        linter(src, fix, iwyu_all=iwyu_all, **checks)
+        linter(src, fix, iwyu_all=iwyu_all, path=path, **checks)
     except LintValidationException:
         sys.exit(1)
 
@@ -735,6 +738,9 @@ def _set_default(opt, default):
               help='Include JavaScript in integration tests')
 @click.option('--with-go', type=bool, default=False,
               help='Include Go in integration tests')
+@click.option('--with-nanoarrow', type=bool, default=False,
+              help='Include nanoarrow in integration tests',
+              envvar="ARCHERY_INTEGRATION_WITH_NANOARROW")
 @click.option('--with-rust', type=bool, default=False,
               help='Include Rust in integration tests',
               envvar="ARCHERY_INTEGRATION_WITH_RUST")
@@ -773,7 +779,7 @@ def integration(with_all=False, random_seed=12345, **args):
 
     gen_path = args['write_generated_json']
 
-    languages = ['cpp', 'csharp', 'java', 'js', 'go', 'rust']
+    languages = ['cpp', 'csharp', 'java', 'js', 'go', 'nanoarrow', 'rust']
     formats = ['ipc', 'flight', 'c_data']
 
     enabled_languages = 0
diff --git a/dev/archery/archery/crossbow/cli.py b/dev/archery/archery/crossbow/cli.py
index d30d012859815..5e31b37dd441a 100644
--- a/dev/archery/archery/crossbow/cli.py
+++ b/dev/archery/archery/crossbow/cli.py
@@ -505,7 +505,17 @@ def asset_callback(task_name, task, asset):
         if asset is not None:
             path = target_dir / task_name / asset.name
             path.parent.mkdir(exist_ok=True)
-            if not dry_run:
+
+            def need_download():
+                if dry_run:
+                    return False
+                if not path.exists():
+                    return True
+                if path.stat().st_size != asset.size:
+                    return True
+                return False
+
+            if need_download():
                 import github3
                 max_n_retries = 5
                 n_retries = 0
diff --git a/dev/archery/archery/crossbow/core.py b/dev/archery/archery/crossbow/core.py
index c85f1f754b997..0b5d242bbaccf 100644
--- a/dev/archery/archery/crossbow/core.py
+++ b/dev/archery/archery/crossbow/core.py
@@ -427,8 +427,14 @@ def create_branch(self, branch_name, files, parents=None, message='',
         return branch
 
     def create_tag(self, tag_name, commit_id, message=''):
+        git_object_commit = (
+            pygit2.GIT_OBJECT_COMMIT
+            if getattr(pygit2, 'GIT_OBJECT_COMMIT')
+            else pygit2.GIT_OBJ_COMMIT
+        )
         tag_id = self.repo.create_tag(tag_name, commit_id,
-                                      pygit2.GIT_OBJ_COMMIT, self.signature,
+                                      git_object_commit,
+                                      self.signature,
                                       message)
 
         # append to the pushable references
diff --git a/dev/archery/archery/docker/cli.py b/dev/archery/archery/docker/cli.py
index 20d9a16138bac..7053db2afccff 100644
--- a/dev/archery/archery/docker/cli.py
+++ b/dev/archery/archery/docker/cli.py
@@ -46,10 +46,19 @@ def _execute(self, *args, **kwargs):
               callback=validate_arrow_sources,
               help="Specify Arrow source directory.")
 @click.option('--dry-run/--execute', default=False,
-              help="Display the docker-compose commands instead of executing "
-                   "them.")
+              help="Display the docker commands instead of executing them.")
+@click.option('--using-docker-cli', default=False, is_flag=True,
+              envvar='ARCHERY_USE_DOCKER_CLI',
+              help="Use docker CLI directly for building instead of calling "
+                   "docker-compose. This may help to reuse cached layers.")
+@click.option('--using-docker-buildx', default=False, is_flag=True,
+              envvar='ARCHERY_USE_DOCKER_BUILDX',
+              help="Use buildx with docker CLI directly for building instead "
+                   "of calling docker-compose or the plain docker build "
+                   "command. This option makes the build cache reusable "
+                   "across hosts.")
 @click.pass_context
-def docker(ctx, src, dry_run):
+def docker(ctx, src, dry_run, using_docker_cli, using_docker_buildx):
     """
     Interact with docker-compose based builds.
     """
@@ -64,8 +73,13 @@ def docker(ctx, src, dry_run):
 
     # take the docker-compose parameters like PYTHON, PANDAS, UBUNTU from the
     # environment variables to keep the usage similar to docker-compose
+    using_docker_cli |= using_docker_buildx
     compose = DockerCompose(config_path, params=os.environ,
-                            debug=ctx.obj.get('debug', False))
+                            using_docker=using_docker_cli,
+                            using_buildx=using_docker_buildx,
+                            debug=ctx.obj.get('debug', False),
+                            compose_bin=("docker compose" if using_docker_cli
+                                         else "docker-compose"))
     if dry_run:
         _mock_compose_calls(compose)
     ctx.obj['compose'] = compose
@@ -83,24 +97,19 @@ def check_config(obj):
 
 @docker.command('pull')
 @click.argument('image')
-@click.option('--using-docker-cli', default=False, is_flag=True,
-              envvar='ARCHERY_USE_DOCKER_CLI',
-              help="Use docker CLI directly for pulling instead of calling "
-                   "docker-compose. This may help to reuse cached layers.")
 @click.option('--pull-leaf/--no-leaf', default=True,
               help="Whether to pull leaf images too.")
 @click.option('--ignore-pull-failures/--no-ignore-pull-failures', default=True,
               help="Whether to ignore pull failures.")
 @click.pass_obj
-def docker_pull(obj, image, *, using_docker_cli, pull_leaf,
-                ignore_pull_failures):
+def docker_pull(obj, image, *, pull_leaf, ignore_pull_failures):
     """
     Execute docker-compose pull.
     """
     compose = obj['compose']
 
     try:
-        compose.pull(image, pull_leaf=pull_leaf, using_docker=using_docker_cli,
+        compose.pull(image, pull_leaf=pull_leaf,
                      ignore_pull_failures=ignore_pull_failures)
     except UndefinedImage as e:
         raise click.ClickException(
@@ -115,16 +124,6 @@ def docker_pull(obj, image, *, using_docker_cli, pull_leaf,
 @click.argument('image')
 @click.option('--force-pull/--no-pull', default=True,
               help="Whether to force pull the image and its ancestor images")
-@click.option('--using-docker-cli', default=False, is_flag=True,
-              envvar='ARCHERY_USE_DOCKER_CLI',
-              help="Use docker CLI directly for building instead of calling "
-                   "docker-compose. This may help to reuse cached layers.")
-@click.option('--using-docker-buildx', default=False, is_flag=True,
-              envvar='ARCHERY_USE_DOCKER_BUILDX',
-              help="Use buildx with docker CLI directly for building instead "
-                   "of calling docker-compose or the plain docker build "
-                   "command. This option makes the build cache reusable "
-                   "across hosts.")
 @click.option('--use-cache/--no-cache', default=True,
               help="Whether to use cache when building the image and its "
                    "ancestor images")
@@ -133,22 +132,17 @@ def docker_pull(obj, image, *, using_docker_cli, pull_leaf,
                    "passed as the argument. To disable caching for both the "
                    "image and its ancestors use --no-cache option.")
 @click.pass_obj
-def docker_build(obj, image, *, force_pull, using_docker_cli,
-                 using_docker_buildx, use_cache, use_leaf_cache):
+def docker_build(obj, image, *, force_pull, use_cache, use_leaf_cache):
     """
     Execute docker-compose builds.
     """
     compose = obj['compose']
 
-    using_docker_cli |= using_docker_buildx
     try:
         if force_pull:
-            compose.pull(image, pull_leaf=use_leaf_cache,
-                         using_docker=using_docker_cli)
+            compose.pull(image, pull_leaf=use_leaf_cache)
         compose.build(image, use_cache=use_cache,
                       use_leaf_cache=use_leaf_cache,
-                      using_docker=using_docker_cli,
-                      using_buildx=using_docker_buildx,
                       pull_parents=force_pull)
     except UndefinedImage as e:
         raise click.ClickException(
@@ -172,16 +166,6 @@ def docker_build(obj, image, *, force_pull, using_docker_cli,
               help="Whether to force build the image and its ancestor images")
 @click.option('--build-only', default=False, is_flag=True,
               help="Pull and/or build the image, but do not run it")
-@click.option('--using-docker-cli', default=False, is_flag=True,
-              envvar='ARCHERY_USE_DOCKER_CLI',
-              help="Use docker CLI directly for building instead of calling "
-                   "docker-compose. This may help to reuse cached layers.")
-@click.option('--using-docker-buildx', default=False, is_flag=True,
-              envvar='ARCHERY_USE_DOCKER_BUILDX',
-              help="Use buildx with docker CLI directly for building instead "
-                   "of calling docker-compose or the plain docker build "
-                   "command. This option makes the build cache reusable "
-                   "across hosts.")
 @click.option('--use-cache/--no-cache', default=True,
               help="Whether to use cache when building the image and its "
                    "ancestor images")
@@ -191,7 +175,7 @@ def docker_build(obj, image, *, force_pull, using_docker_cli,
                    "image and its ancestors use --no-cache option.")
 @click.option('--resource-limit', default=None,
               help="A CPU/memory limit preset to mimic CI environments like "
-                   "GitHub Actions. Implies --using-docker-cli. Note that "
+                   "GitHub Actions. Mandates --using-docker-cli. Note that "
                    "exporting ARCHERY_DOCKER_BIN=\"sudo docker\" is likely "
                    "required, unless Docker is configured with cgroups v2 "
                    "(else Docker will silently ignore the limits).")
@@ -199,8 +183,8 @@ def docker_build(obj, image, *, force_pull, using_docker_cli,
               help="Set volume within the container")
 @click.pass_obj
 def docker_run(obj, image, command, *, env, user, force_pull, force_build,
-               build_only, using_docker_cli, using_docker_buildx, use_cache,
-               use_leaf_cache, resource_limit, volume):
+               build_only, use_cache, use_leaf_cache, resource_limit,
+               volume):
     """
     Execute docker-compose builds.
 
@@ -234,18 +218,14 @@ def docker_run(obj, image, command, *, env, user, force_pull, force_build,
     archery docker run ubuntu-cpp bash
     """
     compose = obj['compose']
-    using_docker_cli |= using_docker_buildx
 
     env = dict(kv.split('=', 1) for kv in env)
     try:
         if force_pull:
-            compose.pull(image, pull_leaf=use_leaf_cache,
-                         using_docker=using_docker_cli)
+            compose.pull(image, pull_leaf=use_leaf_cache)
         if force_build:
             compose.build(image, use_cache=use_cache,
-                          use_leaf_cache=use_leaf_cache,
-                          using_docker=using_docker_cli,
-                          using_buildx=using_docker_buildx)
+                          use_leaf_cache=use_leaf_cache)
         if build_only:
             return
         compose.run(
@@ -253,7 +233,6 @@ def docker_run(obj, image, command, *, env, user, force_pull, force_build,
             command=command,
             env=env,
             user=user,
-            using_docker=using_docker_cli,
             resource_limit=resource_limit,
             volumes=volume
         )
@@ -273,15 +252,11 @@ def docker_run(obj, image, command, *, env, user, force_pull, force_build,
 @click.option('--password', '-p', required=False,
               envvar='ARCHERY_DOCKER_PASSWORD',
               help='Docker repository password')
-@click.option('--using-docker-cli', default=False, is_flag=True,
-              help="Use docker CLI directly for building instead of calling "
-                   "docker-compose. This may help to reuse cached layers.")
 @click.pass_obj
-def docker_compose_push(obj, image, user, password, using_docker_cli):
+def docker_compose_push(obj, image, user, password):
     """Push the generated docker-compose image."""
     compose = obj['compose']
-    compose.push(image, user=user, password=password,
-                 using_docker=using_docker_cli)
+    compose.push(image, user=user, password=password)
 
 
 @docker.command('images')
diff --git a/dev/archery/archery/docker/core.py b/dev/archery/archery/docker/core.py
index 184d9808759b8..cb831060022a4 100644
--- a/dev/archery/archery/docker/core.py
+++ b/dev/archery/archery/docker/core.py
@@ -58,12 +58,21 @@ class UndefinedImage(Exception):
 
 class ComposeConfig:
 
-    def __init__(self, config_path, dotenv_path, compose_bin, params=None):
+    def __init__(self, config_path, dotenv_path, compose_bin,
+                 using_docker=False, using_buildx=False,
+                 params=None, debug=False):
+        self.using_docker = using_docker
+        self.using_buildx = using_buildx
+        self.debug = debug
         config_path = _ensure_path(config_path)
         if dotenv_path:
             dotenv_path = _ensure_path(dotenv_path)
         else:
             dotenv_path = config_path.parent / '.env'
+        if self.debug:
+            # Log docker version
+            Docker().run('version')
+
         self._read_env(dotenv_path, params)
         self._read_config(config_path, compose_bin)
 
@@ -122,8 +131,13 @@ def _read_config(self, config_path, compose_bin):
             )
 
         # trigger docker-compose's own validation
-        compose = Command('docker-compose')
-        args = ['--file', str(config_path), 'config']
+        if self.using_docker:
+            compose = Docker()
+            args = ['compose']
+        else:
+            compose = Command('docker-compose')
+            args = []
+        args += ['--file', str(config_path), 'config']
         result = compose.run(*args, env=self.env, check=False,
                              stderr=subprocess.PIPE, stdout=subprocess.PIPE)
 
@@ -164,12 +178,13 @@ def __init__(self, docker_bin=None):
 class DockerCompose(Command):
 
     def __init__(self, config_path, dotenv_path=None, compose_bin=None,
-                 params=None, debug=False):
+                 using_docker=False, using_buildx=False, params=None,
+                 debug=False):
         compose_bin = default_bin(compose_bin, 'docker-compose')
         self.config = ComposeConfig(config_path, dotenv_path, compose_bin,
-                                    params)
+                                    params=params, using_docker=using_docker,
+                                    using_buildx=using_buildx, debug=debug)
         self.bin = compose_bin
-        self.debug = debug
         self.pull_memory = set()
 
     def clear_pull_memory(self):
@@ -215,14 +230,13 @@ def _execute_docker(self, *args, **kwargs):
                 )
             )
 
-    def pull(self, service_name, pull_leaf=True, using_docker=False,
-             ignore_pull_failures=True):
+    def pull(self, service_name, pull_leaf=True, ignore_pull_failures=True):
         def _pull(service):
             args = ['pull']
             if service['image'] in self.pull_memory:
                 return
 
-            if using_docker:
+            if self.config.using_docker:
                 try:
                     self._execute_docker(*args, service['image'])
                 except Exception as e:
@@ -245,7 +259,7 @@ def _pull(service):
             _pull(service)
 
     def build(self, service_name, use_cache=True, use_leaf_cache=True,
-              using_docker=False, using_buildx=False, pull_parents=True):
+              pull_parents=True):
         def _build(service, use_cache):
             if 'build' not in service:
                 # nothing to do
@@ -273,7 +287,7 @@ def _build(service, use_cache):
             if self.config.env.get('BUILDKIT_INLINE_CACHE') == '1':
                 args.extend(['--build-arg', 'BUILDKIT_INLINE_CACHE=1'])
 
-            if using_buildx:
+            if self.config.using_buildx:
                 for k, v in service['build'].get('args', {}).items():
                     args.extend(['--build-arg', '{}={}'.format(k, v)])
 
@@ -295,9 +309,9 @@ def _build(service, use_cache):
                     service['build'].get('context', '.')
                 ])
                 self._execute_docker("buildx", "build", *args)
-            elif using_docker:
+            elif self.config.using_docker:
                 # better for caching
-                if self.debug:
+                if self.config.debug and os.name != "nt":
                     args.append("--progress=plain")
                 for k, v in service['build'].get('args', {}).items():
                     args.extend(['--build-arg', '{}={}'.format(k, v)])
@@ -310,7 +324,7 @@ def _build(service, use_cache):
                 ])
                 self._execute_docker("build", *args)
             else:
-                if self.debug:
+                if self.config.debug and os.name != "nt":
                     args.append("--progress=plain")
                 self._execute_compose("build", *args, service['name'])
 
@@ -322,7 +336,7 @@ def _build(service, use_cache):
         _build(service, use_cache=use_cache and use_leaf_cache)
 
     def run(self, service_name, command=None, *, env=None, volumes=None,
-            user=None, using_docker=False, resource_limit=None):
+            user=None, resource_limit=None):
         service = self.config.get(service_name)
 
         args = []
@@ -337,7 +351,7 @@ def run(self, service_name, command=None, *, env=None, volumes=None,
             for volume in volumes:
                 args.extend(['--volume', volume])
 
-        if using_docker or service['need_gpu'] or resource_limit:
+        if self.config.using_docker or service['need_gpu'] or resource_limit:
             # use gpus, requires docker>=19.03
             if service['need_gpu']:
                 args.extend(['--gpus', 'all'])
@@ -357,6 +371,10 @@ def run(self, service_name, command=None, *, env=None, volumes=None,
                     v = "{}:{}".format(v['source'], v['target'])
                 args.extend(['-v', v])
 
+            # append capabilities from the compose conf
+            for c in service.get('cap_add', []):
+                args.extend([f'--cap-add={c}'])
+
             # infer whether an interactive shell is desired or not
             if command in ['cmd.exe', 'bash', 'sh', 'powershell']:
                 args.append('-it')
@@ -388,6 +406,10 @@ def run(self, service_name, command=None, *, env=None, volumes=None,
                     # on the docker-compose yaml file.
                     if isinstance(cmd, list):
                         cmd = shlex.join(cmd)
+                    # Match behaviour from docker compose
+                    # to interpolate environment variables
+                    # https://docs.docker.com/compose/compose-file/12-interpolation/
+                    cmd = cmd.replace("$$", "$")
                     args.extend(shlex.split(cmd))
 
             # execute as a plain docker cli command
@@ -399,9 +421,9 @@ def run(self, service_name, command=None, *, env=None, volumes=None,
                 args.append(command)
             self._execute_compose('run', '--rm', *args)
 
-    def push(self, service_name, user=None, password=None, using_docker=False):
+    def push(self, service_name, user=None, password=None):
         def _push(service):
-            if using_docker:
+            if self.config.using_docker:
                 return self._execute_docker('push', service['image'])
             else:
                 return self._execute_compose('push', service['name'])
diff --git a/dev/archery/archery/docker/tests/test_docker_cli.py b/dev/archery/archery/docker/tests/test_docker_cli.py
index ab39c7b9dbb4a..c117a3edfff65 100644
--- a/dev/archery/archery/docker/tests/test_docker_cli.py
+++ b/dev/archery/archery/docker/tests/test_docker_cli.py
@@ -33,14 +33,12 @@ def test_docker_run_with_custom_command(run, build, pull):
 
     assert result.exit_code == 0
     pull.assert_called_once_with(
-        "ubuntu-cpp", pull_leaf=True, using_docker=False
+        "ubuntu-cpp", pull_leaf=True,
     )
     build.assert_called_once_with(
         "ubuntu-cpp",
         use_cache=True,
         use_leaf_cache=True,
-        using_docker=False,
-        using_buildx=False
     )
     run.assert_called_once_with(
         "ubuntu-cpp",
@@ -48,7 +46,6 @@ def test_docker_run_with_custom_command(run, build, pull):
         env={},
         resource_limit=None,
         user=None,
-        using_docker=False,
         volumes=(),
     )
 
@@ -75,14 +72,12 @@ def test_docker_run_options(run, build, pull):
     result = CliRunner().invoke(docker, args)
     assert result.exit_code == 0
     pull.assert_called_once_with(
-        "ubuntu-cpp", pull_leaf=True, using_docker=False
+        "ubuntu-cpp", pull_leaf=True,
     )
     build.assert_called_once_with(
         "ubuntu-cpp",
         use_cache=True,
         use_leaf_cache=True,
-        using_docker=False,
-        using_buildx=False
     )
     run.assert_called_once_with(
         "ubuntu-cpp",
@@ -90,7 +85,6 @@ def test_docker_run_options(run, build, pull):
         env={"ARROW_GANDIVA": "OFF", "ARROW_FLIGHT": "ON"},
         resource_limit=None,
         user="root",
-        using_docker=False,
         volumes=(
             "./build:/build",
             "./ccache:/ccache:delegated",
@@ -126,7 +120,6 @@ def test_docker_limit_options(run):
         env={"ARROW_GANDIVA": "OFF", "ARROW_FLIGHT": "ON"},
         resource_limit="github",
         user="root",
-        using_docker=False,
         volumes=(
             "./build:/build",
             "./ccache:/ccache:delegated",
@@ -145,7 +138,6 @@ def test_docker_run_without_pulling_or_building(run):
         env={},
         resource_limit=None,
         user=None,
-        using_docker=False,
         volumes=(),
     )
 
@@ -157,14 +149,12 @@ def test_docker_run_only_pulling_and_building(build, pull):
     result = CliRunner().invoke(docker, args)
     assert result.exit_code == 0
     pull.assert_called_once_with(
-        "ubuntu-cpp", pull_leaf=True, using_docker=False
+        "ubuntu-cpp", pull_leaf=True,
     )
     build.assert_called_once_with(
         "ubuntu-cpp",
         use_cache=True,
         use_leaf_cache=True,
-        using_docker=False,
-        using_buildx=False
     )
 
 
@@ -187,8 +177,6 @@ def test_docker_run_without_build_cache(run, build):
         "ubuntu-cpp",
         use_cache=False,
         use_leaf_cache=False,
-        using_docker=False,
-        using_buildx=False
     )
     run.assert_called_once_with(
         "ubuntu-cpp",
@@ -196,6 +184,5 @@ def test_docker_run_without_build_cache(run, build):
         env={},
         resource_limit=None,
         user="me",
-        using_docker=False,
         volumes=(),
     )
diff --git a/dev/archery/archery/integration/datagen.py b/dev/archery/archery/integration/datagen.py
index 5cae907a4aa71..b51f3d876f820 100644
--- a/dev/archery/archery/integration/datagen.py
+++ b/dev/archery/archery/integration/datagen.py
@@ -1928,17 +1928,19 @@ def _temp_path():
         .skip_tester('C#')
         .skip_tester('Java')
         .skip_tester('JS')
+        .skip_tester('nanoarrow')
         .skip_tester('Rust'),
 
         generate_binary_view_case()
-        .skip_tester('Java')
         .skip_tester('JS')
+        .skip_tester('nanoarrow')
         .skip_tester('Rust'),
 
         generate_list_view_case()
         .skip_tester('C#')     # Doesn't support large list views
         .skip_tester('Java')
         .skip_tester('JS')
+        .skip_tester('nanoarrow')
         .skip_tester('Rust'),
 
         generate_extension_case()
diff --git a/dev/archery/archery/integration/runner.py b/dev/archery/archery/integration/runner.py
index b50d5c5c2644e..0ea244720cc1d 100644
--- a/dev/archery/archery/integration/runner.py
+++ b/dev/archery/archery/integration/runner.py
@@ -36,6 +36,7 @@
 from .tester_java import JavaTester
 from .tester_js import JSTester
 from .tester_csharp import CSharpTester
+from .tester_nanoarrow import NanoarrowTester
 from .util import guid, printer
 from .util import SKIP_C_ARRAY, SKIP_C_SCHEMA, SKIP_FLIGHT, SKIP_IPC
 from ..utils.source import ARROW_ROOT_DEFAULT
@@ -541,8 +542,8 @@ def get_static_json_files():
 
 def run_all_tests(with_cpp=True, with_java=True, with_js=True,
                   with_csharp=True, with_go=True, with_rust=False,
-                  run_ipc=False, run_flight=False, run_c_data=False,
-                  tempdir=None, **kwargs):
+                  with_nanoarrow=False, run_ipc=False, run_flight=False,
+                  run_c_data=False, tempdir=None, **kwargs):
     tempdir = tempdir or tempfile.mkdtemp(prefix='arrow-integration-')
 
     testers: List[Tester] = []
@@ -562,6 +563,9 @@ def run_all_tests(with_cpp=True, with_java=True, with_js=True,
     if with_go:
         testers.append(GoTester(**kwargs))
 
+    if with_nanoarrow:
+        testers.append(NanoarrowTester(**kwargs))
+
     if with_rust:
         testers.append(RustTester(**kwargs))
 
@@ -638,6 +642,11 @@ def run_all_tests(with_cpp=True, with_java=True, with_js=True,
             description="Ensure Flight SQL extensions work as expected.",
             skip_testers={"Rust"}
         ),
+        Scenario(
+            "flight_sql:ingestion",
+            description="Ensure Flight SQL ingestion works as expected.",
+            skip_testers={"JS", "C#", "Rust", "Java"}
+        ),
     ]
 
     runner = IntegrationRunner(json_files, flight_scenarios, testers, **kwargs)
diff --git a/dev/archery/archery/integration/tester_csharp.py b/dev/archery/archery/integration/tester_csharp.py
index 9aab5b0b28ef9..02ced0701deaf 100644
--- a/dev/archery/archery/integration/tester_csharp.py
+++ b/dev/archery/archery/integration/tester_csharp.py
@@ -28,7 +28,7 @@
 
 _EXE_PATH = os.path.join(_ARTIFACTS_PATH,
                          "Apache.Arrow.IntegrationTest",
-                         "Debug/net7.0/Apache.Arrow.IntegrationTest",
+                         "Debug/net8.0/Apache.Arrow.IntegrationTest",
                          )
 
 _clr_loaded = False
@@ -44,10 +44,10 @@ def _load_clr():
         import clr
         clr.AddReference(
             f"{_ARTIFACTS_PATH}/Apache.Arrow.IntegrationTest/"
-            f"Debug/net7.0/Apache.Arrow.IntegrationTest.dll")
+            f"Debug/net8.0/Apache.Arrow.IntegrationTest.dll")
         clr.AddReference(
             f"{_ARTIFACTS_PATH}/Apache.Arrow.Tests/"
-            f"Debug/net7.0/Apache.Arrow.Tests.dll")
+            f"Debug/net8.0/Apache.Arrow.Tests.dll")
 
         from Apache.Arrow.IntegrationTest import CDataInterface
         CDataInterface.Initialize()
diff --git a/dev/archery/archery/integration/tester_java.py b/dev/archery/archery/integration/tester_java.py
index 8e7a0bb99f9de..9b14c6939cde8 100644
--- a/dev/archery/archery/integration/tester_java.py
+++ b/dev/archery/archery/integration/tester_java.py
@@ -18,17 +18,23 @@
 import contextlib
 import functools
 import os
+from pathlib import Path
 import subprocess
 
 from . import cdata
 from .tester import Tester, CDataExporter, CDataImporter
 from .util import run_cmd, log
-from ..utils.source import ARROW_ROOT_DEFAULT
+
+
+ARROW_BUILD_ROOT = os.environ.get(
+    'ARROW_BUILD_ROOT',
+    Path(__file__).resolve().parents[4]
+)
 
 
 def load_version_from_pom():
     import xml.etree.ElementTree as ET
-    tree = ET.parse(os.path.join(ARROW_ROOT_DEFAULT, 'java', 'pom.xml'))
+    tree = ET.parse(os.path.join(ARROW_BUILD_ROOT, 'java', 'pom.xml'))
     tag_pattern = '{http://maven.apache.org/POM/4.0.0}version'
     version_tag = list(tree.getroot().findall(tag_pattern))[0]
     return version_tag.text
@@ -48,7 +54,7 @@ def load_version_from_pom():
 _ARROW_TOOLS_JAR = os.environ.get(
     "ARROW_JAVA_INTEGRATION_JAR",
     os.path.join(
-        ARROW_ROOT_DEFAULT,
+        ARROW_BUILD_ROOT,
         "java/tools/target",
         f"arrow-tools-{_arrow_version}-jar-with-dependencies.jar"
     )
@@ -56,7 +62,7 @@ def load_version_from_pom():
 _ARROW_C_DATA_JAR = os.environ.get(
     "ARROW_C_DATA_JAVA_INTEGRATION_JAR",
     os.path.join(
-        ARROW_ROOT_DEFAULT,
+        ARROW_BUILD_ROOT,
         "java/c/target",
         f"arrow-c-data-{_arrow_version}.jar"
     )
@@ -64,7 +70,7 @@ def load_version_from_pom():
 _ARROW_FLIGHT_JAR = os.environ.get(
     "ARROW_FLIGHT_JAVA_INTEGRATION_JAR",
     os.path.join(
-        ARROW_ROOT_DEFAULT,
+        ARROW_BUILD_ROOT,
         "java/flight/flight-integration-tests/target",
         f"flight-integration-tests-{_arrow_version}-jar-with-dependencies.jar"
     )
diff --git a/dev/archery/archery/integration/tester_js.py b/dev/archery/archery/integration/tester_js.py
index c7f363ba54687..dcf56f9a5ab6b 100644
--- a/dev/archery/archery/integration/tester_js.py
+++ b/dev/archery/archery/integration/tester_js.py
@@ -16,13 +16,17 @@
 # under the License.
 
 import os
+from pathlib import Path
 
 from .tester import Tester
 from .util import run_cmd, log
-from ..utils.source import ARROW_ROOT_DEFAULT
 
 
-ARROW_JS_ROOT = os.path.join(ARROW_ROOT_DEFAULT, 'js')
+ARROW_BUILD_ROOT = os.environ.get(
+    'ARROW_BUILD_ROOT',
+    Path(__file__).resolve().parents[4]
+)
+ARROW_JS_ROOT = os.path.join(ARROW_BUILD_ROOT, 'js')
 _EXE_PATH = os.path.join(ARROW_JS_ROOT, 'bin')
 _VALIDATE = os.path.join(_EXE_PATH, 'integration.ts')
 _JSON_TO_ARROW = os.path.join(_EXE_PATH, 'json-to-arrow.ts')
diff --git a/dev/archery/archery/integration/tester_nanoarrow.py b/dev/archery/archery/integration/tester_nanoarrow.py
new file mode 100644
index 0000000000000..30ff1bb6e50a7
--- /dev/null
+++ b/dev/archery/archery/integration/tester_nanoarrow.py
@@ -0,0 +1,148 @@
+# 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.
+
+import functools
+import os
+
+from . import cdata
+from .tester import Tester, CDataExporter, CDataImporter
+from ..utils.source import ARROW_ROOT_DEFAULT
+
+
+_NANOARROW_PATH = os.environ.get(
+    "ARROW_NANOARROW_PATH",
+    os.path.join(ARROW_ROOT_DEFAULT, "nanoarrow/cdata"),
+)
+
+_INTEGRATION_DLL = os.path.join(
+    _NANOARROW_PATH, "libnanoarrow_c_data_integration" + cdata.dll_suffix
+)
+
+
+class NanoarrowTester(Tester):
+    PRODUCER = False
+    CONSUMER = False
+    FLIGHT_SERVER = False
+    FLIGHT_CLIENT = False
+    C_DATA_SCHEMA_EXPORTER = True
+    C_DATA_ARRAY_EXPORTER = True
+    C_DATA_SCHEMA_IMPORTER = True
+    C_DATA_ARRAY_IMPORTER = True
+
+    name = "nanoarrow"
+
+    def validate(self, json_path, arrow_path, quirks=None):
+        raise NotImplementedError()
+
+    def json_to_file(self, json_path, arrow_path):
+        raise NotImplementedError()
+
+    def stream_to_file(self, stream_path, file_path):
+        raise NotImplementedError()
+
+    def file_to_stream(self, file_path, stream_path):
+        raise NotImplementedError()
+
+    def make_c_data_exporter(self):
+        return NanoarrowCDataExporter(self.debug, self.args)
+
+    def make_c_data_importer(self):
+        return NanoarrowCDataImporter(self.debug, self.args)
+
+
+_nanoarrow_c_data_entrypoints = """
+    const char* nanoarrow_CDataIntegration_ExportSchemaFromJson(
+        const char* json_path, struct ArrowSchema* out);
+
+    const char* nanoarrow_CDataIntegration_ImportSchemaAndCompareToJson(
+        const char* json_path, struct ArrowSchema* schema);
+
+    const char* nanoarrow_CDataIntegration_ExportBatchFromJson(
+        const char* json_path, int num_batch, struct ArrowArray* out);
+
+    const char* nanoarrow_CDataIntegration_ImportBatchAndCompareToJson(
+        const char* json_path, int num_batch, struct ArrowArray* batch);
+
+    int64_t nanoarrow_BytesAllocated(void);
+    """
+
+
+@functools.lru_cache
+def _load_ffi(ffi, lib_path=_INTEGRATION_DLL):
+    ffi.cdef(_nanoarrow_c_data_entrypoints)
+    dll = ffi.dlopen(lib_path)
+    return dll
+
+
+class _CDataBase:
+    def __init__(self, debug, args):
+        self.debug = debug
+        self.args = args
+        self.ffi = cdata.ffi()
+        self.dll = _load_ffi(self.ffi)
+
+    def _check_nanoarrow_error(self, na_error):
+        """
+        Check a `const char*` error return from an integration entrypoint.
+
+        A null means success, a non-empty string is an error message.
+        The string is statically allocated on the nanoarrow side and does not
+        need to be released.
+        """
+        assert self.ffi.typeof(na_error) is self.ffi.typeof("const char*")
+        if na_error != self.ffi.NULL:
+            error = self.ffi.string(na_error).decode("utf8", errors="replace")
+            raise RuntimeError(f"nanoarrow C Data Integration call failed: {error}")
+
+
+class NanoarrowCDataExporter(CDataExporter, _CDataBase):
+    def export_schema_from_json(self, json_path, c_schema_ptr):
+        na_error = self.dll.nanoarrow_CDataIntegration_ExportSchemaFromJson(
+            str(json_path).encode(), c_schema_ptr
+        )
+        self._check_nanoarrow_error(na_error)
+
+    def export_batch_from_json(self, json_path, num_batch, c_array_ptr):
+        na_error = self.dll.nanoarrow_CDataIntegration_ExportBatchFromJson(
+            str(json_path).encode(), num_batch, c_array_ptr
+        )
+        self._check_nanoarrow_error(na_error)
+
+    @property
+    def supports_releasing_memory(self):
+        return True
+
+    def record_allocation_state(self):
+        return self.dll.nanoarrow_BytesAllocated()
+
+
+class NanoarrowCDataImporter(CDataImporter, _CDataBase):
+    def import_schema_and_compare_to_json(self, json_path, c_schema_ptr):
+        na_error = self.dll.nanoarrow_CDataIntegration_ImportSchemaAndCompareToJson(
+            str(json_path).encode(), c_schema_ptr
+        )
+        self._check_nanoarrow_error(na_error)
+
+    def import_batch_and_compare_to_json(self, json_path, num_batch, c_array_ptr):
+        na_error = self.dll.nanoarrow_CDataIntegration_ImportBatchAndCompareToJson(
+            str(json_path).encode(), num_batch, c_array_ptr
+        )
+        self._check_nanoarrow_error(na_error)
+
+    @property
+    def supports_releasing_memory(self):
+        return True
diff --git a/dev/archery/archery/utils/lint.py b/dev/archery/archery/utils/lint.py
index 15f22ca2e6e5c..c9d05fffd9168 100644
--- a/dev/archery/archery/utils/lint.py
+++ b/dev/archery/archery/utils/lint.py
@@ -157,13 +157,13 @@ def cmake_linter(src, fix=False):
             'go/**/CMakeLists.txt',
             'java/**/CMakeLists.txt',
             'matlab/**/CMakeLists.txt',
-            'python/CMakeLists.txt',
+            'python/**/CMakeLists.txt',
         ],
         exclude_patterns=[
             'cpp/cmake_modules/FindNumPy.cmake',
             'cpp/cmake_modules/FindPythonLibsNew.cmake',
             'cpp/cmake_modules/UseCython.cmake',
-            'cpp/src/arrow/util/config.h.cmake',
+            'cpp/src/arrow/util/*.h.cmake',
         ]
     )
     method = cmake_format.fix if fix else cmake_format.check
@@ -436,10 +436,55 @@ def docker_linter(src):
                                                    cwd=src.path))
 
 
-def linter(src, fix=False, *, clang_format=False, cpplint=False,
+class SphinxLint(Command):
+    def __init__(self, src, path=None, sphinx_lint_bin=None, disable=None, enable=None):
+        self.src = src
+        self.path = path
+        self.bin = default_bin(sphinx_lint_bin, "sphinx-lint")
+        self.disable = disable or "all"
+        self.enable = enable
+
+    def lint(self, *args, check=False):
+        docs_path = os.path.join(self.src.path, "docs")
+
+        args = []
+
+        if self.disable:
+            args.extend(["--disable", self.disable])
+
+        if self.enable:
+            args.extend(["--enable", self.enable])
+
+        if self.path is not None:
+            args.extend([self.path])
+        else:
+            args.extend([docs_path])
+
+        return self.run(*args, check=check)
+
+
+def docs_linter(src, path=None):
+    """Run sphinx-lint on docs."""
+    logger.info("Running docs linter (sphinx-lint)")
+
+    sphinx_lint = SphinxLint(
+        src,
+        path=path,
+        disable="all",
+        enable="trailing-whitespace,missing-final-newline"
+    )
+
+    if not sphinx_lint.available:
+        logger.error("sphinx-lint linter requested but sphinx-lint binary not found")
+        return
+
+    yield LintResult.from_cmd(sphinx_lint.lint())
+
+
+def linter(src, fix=False, path=None, *, clang_format=False, cpplint=False,
            clang_tidy=False, iwyu=False, iwyu_all=False,
            python=False, numpydoc=False, cmake_format=False, rat=False,
-           r=False, docker=False):
+           r=False, docker=False, docs=False):
     """Run all linters."""
     with tmpdir(prefix="arrow-lint-") as root:
         build_dir = os.path.join(root, "cpp-build")
@@ -481,6 +526,9 @@ def linter(src, fix=False, *, clang_format=False, cpplint=False,
         if docker:
             results.extend(docker_linter(src))
 
+        if docs:
+            results.extend(docs_linter(src, path))
+
         # Raise error if one linter failed, ensuring calling code can exit with
         # non-zero.
         for result in results:
diff --git a/dev/archery/requirements-test.txt b/dev/archery/requirements-test.txt
index 208ec64cdf026..e3e62a993c2a2 100644
--- a/dev/archery/requirements-test.txt
+++ b/dev/archery/requirements-test.txt
@@ -1,2 +1,3 @@
+docker-compose
 pytest
 responses
diff --git a/dev/archery/setup.py b/dev/archery/setup.py
index 23a1600910d04..cd3e2e9ca0834 100755
--- a/dev/archery/setup.py
+++ b/dev/archery/setup.py
@@ -41,7 +41,7 @@
     'integration': ['cffi'],
     'integration-java': ['jpype1'],
     'lint': ['numpydoc==1.1.0', 'autopep8', 'flake8==6.1.0', 'cython-lint',
-             'cmake_format==0.6.13'],
+             'cmake_format==0.6.13', 'sphinx-lint==0.9.1'],
     'numpydoc': ['numpydoc==1.1.0'],
     'release': ['pygithub', jinja_req, 'jira', 'semver', 'gitpython'],
 }
diff --git a/dev/conbench_envs/benchmarks.env b/dev/conbench_envs/benchmarks.env
index 9a4f2da1b544a..3af29491a8345 100644
--- a/dev/conbench_envs/benchmarks.env
+++ b/dev/conbench_envs/benchmarks.env
@@ -16,6 +16,8 @@
 
 CMAKE_BUILD_TYPE=release
 ARROW_BUILD_TESTS=OFF
+ARROW_BUILD_BENCHMARKS=ON
+ARROW_BUILD_BENCHMARKS_REFERENCE=OFF
 ARROW_BUILD_TYPE=release
 ARROW_DEPENDENCY_SOURCE=AUTO
 ARROW_DATASET=ON
@@ -27,8 +29,8 @@ ARROW_GANDIVA=OFF
 ARROW_HDFS=ON
 ARROW_HOME=$CONDA_PREFIX
 ARROW_INSTALL_NAME_RPATH=ON
+ARROW_JEMALLOC=OFF
 ARROW_MIMALLOC=ON
-ARROW_NO_DEPRECATED_API=ON
 ARROW_ORC=ON
 ARROW_PARQUET=ON
 ARROW_PYTHON=ON
diff --git a/dev/conbench_envs/hooks.sh b/dev/conbench_envs/hooks.sh
index 6bcfbe446152e..0745357d2c0d3 100755
--- a/dev/conbench_envs/hooks.sh
+++ b/dev/conbench_envs/hooks.sh
@@ -49,8 +49,9 @@ set_arrow_build_and_run_env_vars() {
 }
 
 build_arrow_cpp() {
+  export ARROW_BUILD_DIR="/tmp/$(uuidgen)"
   # Ignore the error when a cache can't be created
-  if ! ci/scripts/cpp_build.sh $(pwd) $(pwd) 2> error.log; then
+  if ! ci/scripts/cpp_build.sh $(pwd) $ARROW_BUILD_DIR 2> error.log; then
       if ! grep -q -F "Can\'t create temporary cache file" error.log; then
          cat error.log
       fi
@@ -58,7 +59,8 @@ build_arrow_cpp() {
 }
 
 build_arrow_python() {
-  ci/scripts/python_build.sh $(pwd) $(pwd)
+  mkdir -p /tmp/arrow
+  ci/scripts/python_build.sh $(pwd) /tmp/arrow
 }
 
 build_arrow_r() {
@@ -68,7 +70,8 @@ build_arrow_r() {
 }
 
 build_arrow_java() {
-  ci/scripts/java_build.sh $(pwd) $(pwd)
+  mkdir -p /tmp/arrow
+  ci/scripts/java_build.sh $(pwd) /tmp/arrow
 }
 
 install_archery() {
diff --git a/dev/merge_arrow_pr.py b/dev/merge_arrow_pr.py
index 25d3372d8b4d3..6694d2373b8f1 100755
--- a/dev/merge_arrow_pr.py
+++ b/dev/merge_arrow_pr.py
@@ -44,9 +44,6 @@
 import requests
 import getpass
 
-from six.moves import input
-import six
-
 try:
     import jira.client
     import jira.exceptions
@@ -99,7 +96,7 @@ def get_json(url, headers=None):
 
 
 def run_cmd(cmd):
-    if isinstance(cmd, six.string_types):
+    if isinstance(cmd, str):
         cmd = cmd.split(' ')
 
     try:
@@ -113,7 +110,7 @@ def run_cmd(cmd):
         print('--------------')
         raise e
 
-    if isinstance(output, six.binary_type):
+    if isinstance(output, bytes):
         output = output.decode('utf-8')
     return output
 
@@ -306,15 +303,11 @@ def version_tuple(x):
 
     # Only suggest versions starting with a number, like 0.x but not JS-0.x
     mainline_versions = all_versions
-    mainline_non_patch_versions = []
-    for v in mainline_versions:
-        (major, minor, patch) = v.split(".")
-        if patch == "0":
-            mainline_non_patch_versions.append(v)
-
-    if len(mainline_versions) > len(mainline_non_patch_versions):
-        # If there is a non-patch release, suggest that instead
-        mainline_versions = mainline_non_patch_versions
+    major_versions = [v for v in mainline_versions if v.endswith('.0.0')]
+
+    if len(mainline_versions) > len(major_versions):
+        # If there is a future major release, suggest that
+        mainline_versions = major_versions
 
     mainline_versions = [v for v in mainline_versions
                          if f"maint-{v}" not in maintenance_branches]
diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index 8fb23f45f0f3a..fbd0b2996077c 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -51,6 +51,45 @@ def prepare(*targets)
     sh(env, "dev/release/01-prepare.sh", @release_version, @next_version, "0")
   end
 
+  data(:release_type, [nil, :major, :minor, :patch])
+  def test_deb_package_names
+    omit_on_release_branch
+    current_commit = git_current_commit
+    stdout = prepare("DEB_PACKAGE_NAMES")
+    changes = parse_patch(git("log", "-p", "#{current_commit}.."))
+    sampled_changes = changes.collect do |change|
+      first_hunk = change[:hunks][0]
+      first_removed_line = first_hunk.find { |line| line.start_with?("-") }
+      first_added_line = first_hunk.find { |line| line.start_with?("+") }
+      {
+        sampled_diff: [first_removed_line, first_added_line],
+        path: change[:path],
+      }
+    end
+    case release_type
+    when :major, :minor
+      expected_changes = [
+        {
+          sampled_diff: [
+            "-Package: libarrow#{@snapshot_so_version}",
+            "+Package: libarrow#{@so_version}",
+          ],
+          path: "dev/tasks/linux-packages/apache-arrow/debian/control.in",
+        },
+        {
+          sampled_diff: [
+            "-      - libarrow-acero#{@snapshot_so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb",
+            "+      - libarrow-acero#{@so_version}-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb",
+          ],
+          path: "dev/tasks/tasks.yml",
+        },
+      ]
+    else
+      expected_changes = []
+    end
+    assert_equal(expected_changes, sampled_changes, "Output:\n#{stdout}")
+  end
+
   def test_linux_packages
     user = "Arrow Developers"
     email = "dev@arrow.apache.org"
@@ -96,7 +135,7 @@ def test_linux_packages
     assert_equal(expected_changes, sampled_changes, "Output:\n#{stdout}")
   end
 
-  data(:release_type, [:major, :minor, :patch])
+  data(:next_release_type, [:major, :minor, :patch])
   def test_version_pre_tag
     omit_on_release_branch
 
@@ -108,6 +147,13 @@ def test_version_pre_tag
            "+version = '#{@release_version}'"],
         ],
       },
+      {
+        path: "c_glib/vcpkg.json",
+        hunks: [
+          ["-  \"version-string\": \"#{@snapshot_version}\",",
+           "+  \"version-string\": \"#{@release_version}\","],
+        ],
+      },
       {
         path: "ci/scripts/PKGBUILD",
         hunks: [
@@ -151,7 +197,7 @@ def test_version_pre_tag
         ],
       },
     ]
-    unless release_type == :patch
+    unless next_release_type == :patch
       expected_changes += [
         {
           path: "docs/source/_static/versions.json",
@@ -208,10 +254,10 @@ def test_version_pre_tag
         ],
       },
       {
-        path: "python/setup.py",
+        path: "python/pyproject.toml",
         hunks: [
-          ["-default_version = '#{@snapshot_version}'",
-           "+default_version = '#{@release_version}'"],
+          ["-fallback_version = '#{@release_version}a0'",
+           "+fallback_version = '#{@release_version}'"],
         ],
       },
       {
@@ -229,7 +275,7 @@ def test_version_pre_tag
         ],
       },
     ]
-    if release_type == :major
+    if next_release_type == :major
       expected_changes += [
         {
           path: "r/pkgdown/assets/versions.json",
diff --git a/dev/release/01-prepare.sh b/dev/release/01-prepare.sh
index 01fa2f3d80345..779348f036f02 100755
--- a/dev/release/01-prepare.sh
+++ b/dev/release/01-prepare.sh
@@ -33,21 +33,22 @@ next_version=$2
 next_version_snapshot="${next_version}-SNAPSHOT"
 rc_number=$3
 
-release_tag="apache-arrow-${version}"
+release_candidate_tag="apache-arrow-${version}-rc${rc_number}"
 release_branch="release-${version}"
 release_candidate_branch="release-${version}-rc${rc_number}"
 
 : ${PREPARE_DEFAULT:=1}
 : ${PREPARE_CHANGELOG:=${PREPARE_DEFAULT}}
+: ${PREPARE_DEB_PACKAGE_NAMES:=${PREPARE_DEFAULT}}
 : ${PREPARE_LINUX_PACKAGES:=${PREPARE_DEFAULT}}
 : ${PREPARE_VERSION_PRE_TAG:=${PREPARE_DEFAULT}}
 : ${PREPARE_BRANCH:=${PREPARE_DEFAULT}}
 : ${PREPARE_TAG:=${PREPARE_DEFAULT}}
 
 if [ ${PREPARE_TAG} -gt 0 ]; then
-  if [ $(git tag -l "${release_tag}") ]; then
-    echo "Delete existing git tag $release_tag"
-    git tag -d "${release_tag}"
+  if [ $(git tag -l "${release_candidate_tag}") ]; then
+    echo "Delete existing git tag $release_candidate_tag"
+    git tag -d "${release_candidate_tag}"
   fi
 fi
 
@@ -78,20 +79,16 @@ if [ ${PREPARE_CHANGELOG} -gt 0 ]; then
   git commit -m "MINOR: [Release] Update CHANGELOG.md for $version"
 fi
 
+if [ ${PREPARE_DEB_PACKAGE_NAMES} -gt 0 ]; then
+  update_deb_package_names "$(current_version)" "${version}"
+fi
+
 if [ ${PREPARE_LINUX_PACKAGES} -gt 0 ]; then
-  echo "Updating .deb/.rpm changelogs for $version"
-  cd $SOURCE_DIR/../tasks/linux-packages
-  rake \
-    version:update \
-    ARROW_RELEASE_TIME="$(date +%Y-%m-%dT%H:%M:%S%z)" \
-    ARROW_VERSION=${version}
-  git add */debian*/changelog */yum/*.spec.in
-  git commit -m "MINOR: [Release] Update .deb/.rpm changelogs for $version"
-  cd -
+  update_linux_packages "${version}" "$(date +%Y-%m-%dT%H:%M:%S%z)"
 fi
 
 if [ ${PREPARE_VERSION_PRE_TAG} -gt 0 ]; then
-  echo "Prepare release ${version} on tag ${release_tag} then reset to version ${next_version_snapshot}"
+  echo "Prepare release ${version} on tag ${release_candidate_tag} then reset to version ${next_version_snapshot}"
 
   update_versions "${version}" "${next_version}" "release"
   git commit -m "MINOR: [Release] Update versions for ${version}"
@@ -100,5 +97,5 @@ fi
 ############################## Tag the Release ##############################
 
 if [ ${PREPARE_TAG} -gt 0 ]; then
-  git tag -a "${release_tag}" -m "[Release] Apache Arrow Release ${version}"
+  git tag -a "${release_candidate_tag}" -m "[Release] Apache Arrow Release ${version} RC${rc_number}"
 fi
diff --git a/dev/release/02-source-test.rb b/dev/release/02-source-test.rb
index 149a2b27ac94a..eab95c798f284 100644
--- a/dev/release/02-source-test.rb
+++ b/dev/release/02-source-test.rb
@@ -22,8 +22,10 @@ class SourceTest < Test::Unit::TestCase
   def setup
     @current_commit = git_current_commit
     detect_versions
-    @tag_name = "apache-arrow-#{@release_version}"
+    @tag_name = "apache-arrow-#{@release_version}-rc0"
+    @archive_name = "apache-arrow-#{@release_version}.tar.gz"
     @script = File.expand_path("dev/release/02-source.sh")
+    @tarball_script = File.expand_path("dev/release/utils-create-release-tarball.sh")
 
     Dir.mktmpdir do |dir|
       Dir.chdir(dir) do
@@ -40,8 +42,9 @@ def source(*targets)
     targets.each do |target|
       env["SOURCE_#{target}"] = "1"
     end
+    sh(env, @tarball_script, @release_version, "0") 
     output = sh(env, @script, @release_version, "0")
-    sh("tar", "xf", "#{@tag_name}.tar.gz")
+    sh("tar", "xf", @archive_name)
     output
   end
 
diff --git a/dev/release/02-source.sh b/dev/release/02-source.sh
index 1bd3c0e19e04e..b3eae212212ab 100755
--- a/dev/release/02-source.sh
+++ b/dev/release/02-source.sh
@@ -21,6 +21,7 @@
 set -eu
 
 : ${SOURCE_DEFAULT:=1}
+: ${SOURCE_DOWNLOAD:=${SOURCE_DEFAULT}}
 : ${SOURCE_RAT:=${SOURCE_DEFAULT}}
 : ${SOURCE_UPLOAD:=${SOURCE_DEFAULT}}
 : ${SOURCE_PR:=${SOURCE_DEFAULT}}
@@ -37,11 +38,10 @@ fi
 version=$1
 rc=$2
 
-tag=apache-arrow-${version}
+tag=apache-arrow-${version}-rc${rc}
 maint_branch=maint-${version}
 rc_branch="release-${version}-rc${rc}"
-tagrc=${tag}-rc${rc}
-rc_url="https://dist.apache.org/repos/dist/dev/arrow/${tagrc}"
+rc_url="https://dist.apache.org/repos/dist/dev/arrow/${tag}"
 
 echo "Preparing source for tag ${tag}"
 
@@ -56,35 +56,19 @@ fi
 
 echo "Using commit $release_hash"
 
-tarball=${tag}.tar.gz
-
-rm -rf ${tag}
-# be conservative and use the release hash, even though git produces the same
-# archive (identical hashes) using the scm tag
-(cd "${SOURCE_TOP_DIR}" && \
-  git archive ${release_hash} --prefix ${tag}/) | \
-  tar xf -
-
-# Resolve all hard and symbolic links.
-# If we change this, we must change ArrowSources.archive in
-# dev/archery/archery/utils/source.py too.
-rm -rf ${tag}.tmp
-mv ${tag} ${tag}.tmp
-cp -R -L ${tag}.tmp ${tag}
-rm -rf ${tag}.tmp
-
-# Create a dummy .git/ directory to download the source files from GitHub with Source Link in C#.
-dummy_git=${tag}/csharp/dummy.git
-mkdir ${dummy_git}
-pushd ${dummy_git}
-echo ${release_hash} > HEAD
-echo '[remote "origin"] url = https://github.com/apache/arrow.git' >> config
-mkdir objects refs
-popd
-
-# Create new tarball from modified source directory
-tar czf ${tarball} ${tag}
-rm -rf ${tag}
+tarball=apache-arrow-${version}.tar.gz
+
+if [ ${SOURCE_DOWNLOAD} -gt 0 ]; then
+  # Wait for the release candidate workflow to finish before attempting 
+  # to download the tarball from the GitHub Release.
+  . $SOURCE_DIR/utils-watch-gh-workflow.sh ${tag} "release_candidate.yml"
+  rm -f ${tarball}
+  gh release download \
+    ${tag} \
+    --repo apache/arrow \
+    --dir . \
+    --pattern "${tarball}"
+fi
 
 if [ ${SOURCE_RAT} -gt 0 ]; then
   "${SOURCE_DIR}/run-rat.sh" ${tarball}
@@ -105,18 +89,21 @@ if [ ${SOURCE_UPLOAD} -gt 0 ]; then
   ${sha256_generate} $tarball > ${tarball}.sha256
   ${sha512_generate} $tarball > ${tarball}.sha512
 
+  # Upload signed tarballs to GitHub Release
+  gh release upload ${tag} ${tarball}.sha256 ${tarball}.sha512
+
   # check out the arrow RC folder
   svn co --depth=empty https://dist.apache.org/repos/dist/dev/arrow tmp
 
   # add the release candidate for the tag
-  mkdir -p tmp/${tagrc}
+  mkdir -p tmp/${tag}
 
   # copy the rc tarball into the tmp dir
-  cp ${tarball}* tmp/${tagrc}
+  cp ${tarball}* tmp/${tag}
 
   # commit to svn
-  svn add tmp/${tagrc}
-  svn ci -m "Apache Arrow ${version} RC${rc}" tmp/${tagrc}
+  svn add tmp/${tag}
+  svn ci -m "Apache Arrow ${version} RC${rc}" tmp/${tag}
 
   # clean up
   rm -rf tmp
diff --git a/dev/release/03-binary-submit.sh b/dev/release/03-binary-submit.sh
index d65b4e97c5fc2..0dc63aa7089d1 100755
--- a/dev/release/03-binary-submit.sh
+++ b/dev/release/03-binary-submit.sh
@@ -28,7 +28,7 @@ version=$1
 rc=$2
 version_with_rc="${version}-rc${rc}"
 crossbow_job_prefix="release-${version_with_rc}"
-release_tag="apache-arrow-${version}"
+release_tag="apache-arrow-${version}-rc${rc}"
 rc_branch="release-${version_with_rc}"
 
 : ${ARROW_REPOSITORY:="apache/arrow"}
diff --git a/dev/release/05-binary-upload.sh b/dev/release/05-binary-upload.sh
index ae240c02ddf62..3515883bfa861 100755
--- a/dev/release/05-binary-upload.sh
+++ b/dev/release/05-binary-upload.sh
@@ -21,8 +21,8 @@ set -e
 set -u
 set -o pipefail
 
-export LANG=C
-export LC_CTYPE=C
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
 
 SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
diff --git a/dev/release/07-matlab-upload.sh b/dev/release/07-matlab-upload.sh
new file mode 100755
index 0000000000000..803ceadb35eaf
--- /dev/null
+++ b/dev/release/07-matlab-upload.sh
@@ -0,0 +1,89 @@
+# 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.
+
+set -e
+set -u
+set -o pipefail
+
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+if [ $# -ne 2 ]; then
+  echo "Usage: $0 <version> <rc-num>"
+  exit
+fi
+
+version=$1
+rc=$2
+
+: ${UPLOAD_DEFAULT=1}
+: ${UPLOAD_FORCE_SIGN=${UPLOAD_DEFAULT}}
+
+if [ ${UPLOAD_FORCE_SIGN} -gt 0 ]; then
+  pushd "${SOURCE_DIR}"
+  if [ ! -f .env ]; then
+    echo "You must create $(pwd)/.env"
+    echo "You can use $(pwd)/.env.example as template"
+    exit 1
+  fi
+  . .env
+  popd
+fi
+
+version_with_rc="${version}-rc${rc}"
+crossbow_job_prefix="release-${version_with_rc}"
+crossbow_package_dir="${SOURCE_DIR}/../../packages"
+
+: ${CROSSBOW_JOB_NUMBER:="0"}
+: ${CROSSBOW_JOB_ID:="${crossbow_job_prefix}-${CROSSBOW_JOB_NUMBER}"}
+: ${ARROW_ARTIFACTS_DIR:="${crossbow_package_dir}/${CROSSBOW_JOB_ID}/matlab"}
+
+if [ ! -e "${ARROW_ARTIFACTS_DIR}" ]; then
+  echo "${ARROW_ARTIFACTS_DIR} does not exist"
+  exit 1
+fi
+
+if [ ! -d "${ARROW_ARTIFACTS_DIR}" ]; then
+  echo "${ARROW_ARTIFACTS_DIR} is not a directory"
+  exit 1
+fi
+
+pushd "${ARROW_ARTIFACTS_DIR}"
+
+if [ ${UPLOAD_FORCE_SIGN} -gt 0 ]; then
+  # Upload the MATLAB MLTBX Release Candidate to the GitHub Releases
+  # area of the Apache Arrow GitHub project.
+  mltbx_file="matlab-arrow-${version}.mltbx"
+  mltbx_signature_gpg_ascii_armor="${mltbx_file}.asc"
+  mltbx_checksum_sha512="${mltbx_file}.sha512"
+
+  rm -rf ${mltbx_signature_gpg_ascii_armor}
+  rm -rf ${mltbx_checksum_sha512}
+
+  # Sign the MLTBX file and create a detached (--deatch-sign) ASCII armor (--armor) GPG signature file.
+  gpg --detach-sign --local-user "${GPG_KEY_ID}" --armor ${mltbx_file}
+
+  # Compute the SHA512 checksum of the MLTBX file.
+  shasum --algorithm 512 ${mltbx_file} > ${mltbx_checksum_sha512}
+fi
+
+tag="apache-arrow-${version_with_rc}"
+gh release upload ${tag} \
+  --clobber \
+  --repo apache/arrow \
+  *
+
+popd
diff --git a/dev/release/07-binary-verify.sh b/dev/release/08-binary-verify.sh
similarity index 100%
rename from dev/release/07-binary-verify.sh
rename to dev/release/08-binary-verify.sh
diff --git a/dev/release/binary-task.rb b/dev/release/binary-task.rb
index 8fcdcf1f5f442..c2386a1f52f21 100644
--- a/dev/release/binary-task.rb
+++ b/dev/release/binary-task.rb
@@ -1083,7 +1083,6 @@ def apt_release_repositories_dir
 
   def available_apt_targets
     [
-      ["debian", "bullseye", "main"],
       ["debian", "bookworm", "main"],
       ["debian", "trixie", "main"],
       ["ubuntu", "focal", "main"],
@@ -2111,8 +2110,6 @@ def apt_test_targets_default
     # Disable arm64 targets by default for now
     # because they require some setups on host.
     [
-      "debian-bullseye",
-      # "debian-bullseye-arm64",
       "debian-bookworm",
       # "debian-bookworm-arm64",
       "debian-trixie",
diff --git a/dev/release/binary/Dockerfile b/dev/release/binary/Dockerfile
index a21b32dd763cc..bef042fb42ce7 100644
--- a/dev/release/binary/Dockerfile
+++ b/dev/release/binary/Dockerfile
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM debian:bullseye
+FROM debian:bookworm
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/dev/release/binary/runner.sh b/dev/release/binary/runner.sh
index 465d60d629504..d4c0f67dde7ba 100755
--- a/dev/release/binary/runner.sh
+++ b/dev/release/binary/runner.sh
@@ -19,7 +19,8 @@
 
 set -u
 
-export LANG=C
+export LANG=C.UTF-8
+export LC_ALL=C.UTF-8
 
 target_dir=/host/binary/tmp
 original_owner=$(stat --format=%u ${target_dir})
diff --git a/dev/release/post-01-tag.sh b/dev/release/post-01-tag.sh
new file mode 100755
index 0000000000000..df0f6756c0e7c
--- /dev/null
+++ b/dev/release/post-01-tag.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+#
+# 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.
+
+set -e
+set -o pipefail
+
+if [ "$#" -ne 2 ]; then
+  echo "Usage: $0 <version> <rc-num>"
+  exit
+fi
+
+# Create the release tag and trigger the Publish Release workflow.
+release_candidate_tag=apache-arrow-${version}-rc${num}
+release_tag=apache-arrow-${version}
+git tag -a ${release_tag} ${release_candidate_tag}^{} -m "[Release] Apache Arrow Release ${version}"
+git push apache ${release_tag}
diff --git a/dev/release/post-01-upload.sh b/dev/release/post-02-upload.sh
similarity index 100%
rename from dev/release/post-01-upload.sh
rename to dev/release/post-02-upload.sh
diff --git a/dev/release/post-02-binary.sh b/dev/release/post-03-binary.sh
similarity index 100%
rename from dev/release/post-02-binary.sh
rename to dev/release/post-03-binary.sh
diff --git a/dev/release/post-03-website.sh b/dev/release/post-04-website.sh
similarity index 100%
rename from dev/release/post-03-website.sh
rename to dev/release/post-04-website.sh
diff --git a/dev/release/post-05-update-gh-release-notes.sh b/dev/release/post-05-update-gh-release-notes.sh
new file mode 100755
index 0000000000000..e321c98721c17
--- /dev/null
+++ b/dev/release/post-05-update-gh-release-notes.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+#
+# 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.
+
+set -e
+set -o pipefail
+
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 <version>"
+    exit 1
+fi
+
+
+VERSION=$1
+REPOSITORY="apache/arrow"
+TAG="apache-arrow-${VERSION}"
+WORKFLOW="release.yml"
+SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# Wait for the GitHub Workflow that creates the GitHub Release
+# to finish before updating the release notes.
+. $SOURCE_DIR/utils-watch-gh-workflow.sh ${TAG} ${WORKFLOW}
+
+# Update the Release Notes section
+RELEASE_NOTES_URL="https://arrow.apache.org/release/${VERSION}.html"
+RELEASE_NOTES="Release Notes URL: ${RELEASE_NOTES_URL}"
+gh release edit ${TAG} --repo ${REPOSITORY} --notes "${RELEASE_NOTES}" --verify-tag
diff --git a/dev/release/post-04-ruby.sh b/dev/release/post-06-ruby.sh
similarity index 100%
rename from dev/release/post-04-ruby.sh
rename to dev/release/post-06-ruby.sh
diff --git a/dev/release/post-05-js.sh b/dev/release/post-07-js.sh
similarity index 100%
rename from dev/release/post-05-js.sh
rename to dev/release/post-07-js.sh
diff --git a/dev/release/post-06-csharp.sh b/dev/release/post-08-csharp.sh
similarity index 100%
rename from dev/release/post-06-csharp.sh
rename to dev/release/post-08-csharp.sh
diff --git a/dev/release/post-07-remove-old-artifacts.sh b/dev/release/post-09-remove-old-artifacts.sh
similarity index 100%
rename from dev/release/post-07-remove-old-artifacts.sh
rename to dev/release/post-09-remove-old-artifacts.sh
diff --git a/dev/release/post-08-docs.sh b/dev/release/post-10-docs.sh
similarity index 89%
rename from dev/release/post-08-docs.sh
rename to dev/release/post-10-docs.sh
index 1e457c95c033c..58a462551f199 100755
--- a/dev/release/post-08-docs.sh
+++ b/dev/release/post-10-docs.sh
@@ -72,14 +72,28 @@ fi
 # delete current stable docs and restore all previous versioned docs
 rm -rf docs/*
 git checkout "${versioned_paths[@]}"
+# Download and untar released docs in a temp folder
+rm -rf docs_new
+mkdir docs_new
+pushd docs_new
 curl \
   --fail \
   --location \
   --remote-name \
   https://apache.jfrog.io/artifactory/arrow/docs/${version}/docs.tar.gz
 tar xvf docs.tar.gz
-rm -f docs.tar.gz
-git checkout docs/c_glib/index.html
+# Update DOCUMENTATION_OPTIONS.show_version_warning_banner
+find docs \
+  -type f \
+  -exec \
+    sed -i.bak \
+      -e "s/DOCUMENTATION_OPTIONS.show_version_warning_banner = true/DOCUMENTATION_OPTIONS.show_version_warning_banner = false/g" \
+      {} \;
+find ./ -name '*.bak' -delete
+popd
+mv docs_new/docs/* docs/
+rm -rf docs_new
+
 if [ "$is_major_release" = "yes" ] ; then
   previous_series=${previous_version%.*}
   mv docs_temp docs/${previous_series}
diff --git a/dev/release/post-09-python.sh b/dev/release/post-11-python.sh
similarity index 100%
rename from dev/release/post-09-python.sh
rename to dev/release/post-11-python.sh
diff --git a/dev/release/post-11-bump-versions-test.rb b/dev/release/post-12-bump-versions-test.rb
similarity index 94%
rename from dev/release/post-11-bump-versions-test.rb
rename to dev/release/post-12-bump-versions-test.rb
index 78d9320bfb312..2bd14587461cc 100644
--- a/dev/release/post-11-bump-versions-test.rb
+++ b/dev/release/post-12-bump-versions-test.rb
@@ -63,18 +63,18 @@ def bump_versions(*targets)
         previous_version_components[2].succ!
       end
       sh(env,
-         "dev/release/post-11-bump-versions.sh",
+         "dev/release/post-12-bump-versions.sh",
          previous_version_components.join("."),
          @release_version)
     else
       sh(env,
-         "dev/release/post-11-bump-versions.sh",
+         "dev/release/post-12-bump-versions.sh",
          @release_version,
          @next_version)
     end
   end
 
-  data(:release_type, [:major, :minor, :patch])
+  data(:next_release_type, [:major, :minor, :patch])
   def test_version_post_tag
     omit_on_release_branch
 
@@ -86,6 +86,13 @@ def test_version_post_tag
            "+version = '#{@next_snapshot_version}'"],
         ],
       },
+      {
+        path: "c_glib/vcpkg.json",
+        hunks: [
+          ["-  \"version-string\": \"#{@snapshot_version}\",",
+           "+  \"version-string\": \"#{@next_snapshot_version}\","],
+        ],
+      },
       {
         path: "ci/scripts/PKGBUILD",
         hunks: [
@@ -129,7 +136,7 @@ def test_version_post_tag
         ],
       },
     ]
-    unless release_type == :patch
+    unless next_release_type == :patch
       expected_changes += [
         {
           path: "docs/source/_static/versions.json",
@@ -172,10 +179,10 @@ def test_version_post_tag
         ],
       },
       {
-        path: "python/setup.py",
+        path: "python/pyproject.toml",
         hunks: [
-          ["-default_version = '#{@snapshot_version}'",
-           "+default_version = '#{@next_snapshot_version}'"],
+          ["-fallback_version = '#{@release_version}a0'",
+           "+fallback_version = '#{@next_version}a0'"],
         ],
       },
       {
@@ -195,8 +202,14 @@ def test_version_post_tag
         ],
       },
     ]
-    if release_type == :major
+    if next_release_type == :major
       expected_changes += [
+        {
+          path: "c_glib/tool/generate-version-header.py",
+          hunks: [
+            ["+        (#{@next_major_version}, 0),"],
+          ],
+        },
         {
           path: "docs/source/index.rst",
           hunks: [
@@ -263,7 +276,7 @@ def test_version_post_tag
 
       import_path = "github.com/apache/arrow/go/v#{@snapshot_major_version}"
       hunks = []
-      if release_type == :major
+      if next_release_type == :major
         lines = File.readlines(path, chomp: true)
         target_lines = lines.each_with_index.select do |line, i|
           line.include?(import_path)
diff --git a/dev/release/post-11-bump-versions.sh b/dev/release/post-12-bump-versions.sh
similarity index 54%
rename from dev/release/post-11-bump-versions.sh
rename to dev/release/post-12-bump-versions.sh
index 93eb15e0921c8..422821a66bde5 100755
--- a/dev/release/post-11-bump-versions.sh
+++ b/dev/release/post-12-bump-versions.sh
@@ -41,10 +41,6 @@ version=$1
 next_version=$2
 next_version_snapshot="${next_version}-SNAPSHOT"
 
-current_version=$(grep ARROW_VERSION "${SOURCE_DIR}/../../cpp/CMakeLists.txt" | \
-                    head -n1 | \
-                    grep -E -o '([0-9]+\.[0-9]+\.[0-9]+)')
-
 case "${version}" in
   *.0.0)
     is_major_release=1
@@ -68,52 +64,12 @@ if [ ${BUMP_VERSION_POST_TAG} -gt 0 ]; then
 fi
 
 if [ ${BUMP_DEB_PACKAGE_NAMES} -gt 0 ] && \
-     [ "${next_version}" != "${current_version}" ]; then
-  echo "Updating .deb package names for ${next_version}"
-  so_version() {
-    local version=$1
-    local major_version=$(echo $version | sed -E -e 's/^([0-9]+)\.[0-9]+\.[0-9]+$/\1/')
-    local minor_version=$(echo $version | sed -E -e 's/^[0-9]+\.([0-9]+)\.[0-9]+$/\1/')
-    expr ${major_version} \* 100 + ${minor_version}
-  }
-  deb_lib_suffix=$(so_version $version)
-  next_deb_lib_suffix=$(so_version $next_version)
-  if [ "${deb_lib_suffix}" != "${next_deb_lib_suffix}" ]; then
-    cd $SOURCE_DIR/../tasks/linux-packages/apache-arrow
-    for target in debian*/lib*${deb_lib_suffix}.install; do
-      git mv \
-        ${target} \
-        $(echo $target | sed -e "s/${deb_lib_suffix}/${next_deb_lib_suffix}/")
-    done
-    deb_lib_suffix_substitute_pattern="s/(lib(arrow|gandiva|parquet)[-a-z]*)${deb_lib_suffix}/\\1${next_deb_lib_suffix}/g"
-    sed -i.bak -E -e "${deb_lib_suffix_substitute_pattern}" debian*/control*
-    rm -f debian*/control*.bak
-    git add debian*/control*
-    cd -
-    cd $SOURCE_DIR/../tasks/
-    sed -i.bak -E -e "${deb_lib_suffix_substitute_pattern}" tasks.yml
-    rm -f tasks.yml.bak
-    git add tasks.yml
-    cd -
-    cd $SOURCE_DIR
-    sed -i.bak -E -e "${deb_lib_suffix_substitute_pattern}" rat_exclude_files.txt
-    rm -f rat_exclude_files.txt.bak
-    git add rat_exclude_files.txt
-    git commit -m "MINOR: [Release] Update .deb package names for $next_version"
-    cd -
-  fi
+     [ "${next_version}" != "$(current_version)" ]; then
+  update_deb_package_names "${version}" "${next_version}"
 fi
 
 if [ ${BUMP_LINUX_PACKAGES} -gt 0 ]; then
-  echo "Updating .deb/.rpm changelogs for $version"
-  cd $SOURCE_DIR/../tasks/linux-packages
-  rake \
-    version:update \
-    ARROW_RELEASE_TIME="$(git log -n1 --format=%aI apache-arrow-${version})" \
-    ARROW_VERSION=${version}
-  git add */debian*/changelog */yum/*.spec.in
-  git commit -m "MINOR: [Release] Update .deb/.rpm changelogs for $version"
-  cd -
+  update_linux_packages "${version}" "$(git log -n1 --format=%aI apache-arrow-${version})"
 fi
 
 if [ ${BUMP_PUSH} -gt 0 ]; then
diff --git a/dev/release/post-10-go.sh b/dev/release/post-13-go.sh
similarity index 100%
rename from dev/release/post-10-go.sh
rename to dev/release/post-13-go.sh
diff --git a/dev/release/post-12-msys2.sh b/dev/release/post-14-msys2.sh
similarity index 100%
rename from dev/release/post-12-msys2.sh
rename to dev/release/post-14-msys2.sh
diff --git a/dev/release/post-13-homebrew.sh b/dev/release/post-15-homebrew.sh
similarity index 100%
rename from dev/release/post-13-homebrew.sh
rename to dev/release/post-15-homebrew.sh
diff --git a/dev/release/post-14-vcpkg.sh b/dev/release/post-16-vcpkg.sh
similarity index 100%
rename from dev/release/post-14-vcpkg.sh
rename to dev/release/post-16-vcpkg.sh
diff --git a/dev/release/post-15-conan.sh b/dev/release/post-17-conan.sh
similarity index 100%
rename from dev/release/post-15-conan.sh
rename to dev/release/post-17-conan.sh
diff --git a/dev/release/rat_exclude_files.txt b/dev/release/rat_exclude_files.txt
index 4f86a12afe4fb..ef325090f2f4b 100644
--- a/dev/release/rat_exclude_files.txt
+++ b/dev/release/rat_exclude_files.txt
@@ -63,6 +63,7 @@ go.work.sum
 go/go.sum
 go/arrow/Gopkg.lock
 go/arrow/flight/gen/flight/*.pb.go
+go/arrow/util/util_message/*.pb.go
 go/arrow/internal/cpu/*
 go/arrow/type_string.go
 go/arrow/cdata/test/go.sum
@@ -80,6 +81,8 @@ go/parquet/internal/gen-go/parquet/GoUnusedProtection__.go
 go/parquet/internal/gen-go/parquet/parquet-consts.go
 go/parquet/internal/gen-go/parquet/parquet.go
 go/parquet/version_string.go
+java/vector/src/main/java/org/apache/arrow/vector/util/IntObjectMap.java
+java/vector/src/main/java/org/apache/arrow/vector/util/IntObjectHashMap.java
 js/.npmignore
 js/closure-compiler-scripts/*
 js/src/fb/*.ts
@@ -148,3 +151,4 @@ r/tools/nixlibs-allowlist.txt
 ruby/red-arrow/.yardopts
 .github/pull_request_template.md
 swift/data-generator/swift-datagen/go.sum
+swift/CDataWGo/go.sum
diff --git a/dev/release/test-helper.rb b/dev/release/test-helper.rb
index 3b2c3aa6e5874..82400bae2793b 100644
--- a/dev/release/test-helper.rb
+++ b/dev/release/test-helper.rb
@@ -96,7 +96,11 @@ def parse_patch(patch)
 
 module VersionDetectable
   def release_type
-    (data || {})[:release_type] || :major
+    (data || {})[:release_type]
+  end
+
+  def next_release_type
+    (data || {})[:next_release_type] || :major
   end
 
   def detect_versions
@@ -104,19 +108,36 @@ def detect_versions
     cpp_cmake_lists = top_dir + "cpp" + "CMakeLists.txt"
     @snapshot_version = cpp_cmake_lists.read[/ARROW_VERSION "(.+?)"/, 1]
     @snapshot_major_version = @snapshot_version.split(".")[0]
-    @release_version = @snapshot_version.gsub(/-SNAPSHOT\z/, "")
+    @snapshot_so_version = compute_so_version(@snapshot_version.split("-")[0])
+    release_version = @snapshot_version.gsub(/-SNAPSHOT\z/, "")
+    release_version_components = release_version.split(".")
+    case release_type
+    when nil
+    when :major
+      release_version_components[0].succ!
+    when :minor
+      release_version_components[1].succ!
+    when :patch
+      release_version_components[2].succ!
+    else
+      raise "unknown release type: #{release_type.inspect}"
+    end
+    @release_version = release_version_components.join(".")
     @release_compatible_version = @release_version.split(".")[0, 2].join(".")
     @so_version = compute_so_version(@release_version)
     next_version_components = @release_version.split(".")
-    case release_type
+    case next_release_type
     when :major
       next_version_components[0].succ!
+      next_version_components[1] = 0
+      next_version_components[2] = 0
     when :minor
       next_version_components[1].succ!
+      next_version_components[2] = 0
     when :patch
       next_version_components[2].succ!
     else
-      raise "unknown release type: #{release_type.inspect}"
+      raise "unknown next release type: #{next_release_type.inspect}"
     end
     @next_version = next_version_components.join(".")
     @next_major_version = @next_version.split(".")[0]
diff --git a/dev/release/utils-create-release-tarball.sh b/dev/release/utils-create-release-tarball.sh
new file mode 100755
index 0000000000000..1a0ba83639b9a
--- /dev/null
+++ b/dev/release/utils-create-release-tarball.sh
@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+#
+# 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.
+#
+
+SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SOURCE_TOP_DIR="$(cd "${SOURCE_DIR}/../../" && pwd)"
+
+if [ "$#" -ne 2 ]; then
+  echo "Usage: $0 <version> <rc-num>"
+  exit
+fi
+
+version=$1
+rc=$2
+
+tag=apache-arrow-${version}-rc${rc}
+tarball=apache-arrow-${version}.tar.gz
+
+: ${release_hash:=$(git rev-list --max-count=1 ${tag})}
+
+rm -rf ${tag}
+
+# be conservative and use the release hash, even though git produces the same
+# archive (identical hashes) using the scm tag
+(cd "${SOURCE_TOP_DIR}" && \
+  git archive ${release_hash} --prefix ${tag}/) | \
+  tar xf -
+
+# Resolve symbolic and hard links
+rm -rf ${tag}.tmp
+mv ${tag} ${tag}.tmp
+cp -R -L ${tag}.tmp ${tag}
+rm -rf ${tag}.tmp
+
+# Create a dummy .git/ directory to download the source files from GitHub with Source Link in C#.
+dummy_git=${tag}/csharp/dummy.git
+mkdir ${dummy_git}
+pushd ${dummy_git}
+echo ${release_hash} > HEAD
+echo '[remote "origin"] url = https://github.com/apache/arrow.git' >> config
+mkdir objects refs
+popd 
+
+# Create new tarball from modified source directory
+tar czf ${tarball} ${tag}
+rm -rf ${tag}
diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh
index 51367087228a4..c255e728a335b 100644
--- a/dev/release/utils-prepare.sh
+++ b/dev/release/utils-prepare.sh
@@ -26,10 +26,12 @@ update_versions() {
     release)
       local version=${base_version}
       local r_version=${base_version}
+      local python_version=${base_version}
       ;;
     snapshot)
       local version=${next_version}-SNAPSHOT
       local r_version=${base_version}.9000
+      local python_version=${next_version}a0
       ;;
   esac
   local major_version=${version%%.*}
@@ -40,6 +42,22 @@ update_versions() {
     meson.build
   rm -f meson.build.bak
   git add meson.build
+
+  # Add a new version entry only when the next release is a new major release
+  if [ "${type}" = "snapshot" -a \
+       "${next_version}" = "${major_version}.0.0" ]; then
+    sed -i.bak -E -e \
+      "s/^ALL_VERSIONS = \[$/&\\n        (${major_version}, 0),/" \
+      tool/generate-version-header.py
+    rm -f tool/generate-version-header.py.bak
+    git add tool/generate-version-header.py
+  fi
+
+  sed -i.bak -E -e \
+    "s/\"version-string\": \".+\"/\"version-string\": \"${version}\"/" \
+    vcpkg.json
+  rm -f vcpkg.json.bak
+  git add vcpkg.json
   popd
 
   pushd "${ARROW_DIR}/ci/scripts"
@@ -110,10 +128,10 @@ update_versions() {
 
   pushd "${ARROW_DIR}/python"
   sed -i.bak -E -e \
-    "s/^default_version = '.+'/default_version = '${version}'/" \
-    setup.py
-  rm -f setup.py.bak
-  git add setup.py
+    "s/^fallback_version = '.+'/fallback_version = '${python_version}'/" \
+    pyproject.toml
+  rm -f pyproject.toml.bak
+  git add pyproject.toml
   sed -i.bak -E -e \
     "s/^set\(PYARROW_VERSION \".+\"\)/set(PYARROW_VERSION \"${version}\")/" \
     CMakeLists.txt
@@ -127,7 +145,7 @@ update_versions() {
     DESCRIPTION
   rm -f DESCRIPTION.bak
   git add DESCRIPTION
-  
+
   # Replace dev version with release version
   sed -i.bak -E -e \
     "/^<!--/,/^# arrow /s/^# arrow .+/# arrow ${base_version}/" \
@@ -190,3 +208,64 @@ update_versions() {
   git add r/pkgdown/assets/versions.json
   popd
 }
+
+current_version() {
+  grep ARROW_VERSION "${ARROW_DIR}/cpp/CMakeLists.txt" | \
+    head -n1 | \
+    grep -E -o '([0-9]+\.[0-9]+\.[0-9]+)'
+}
+
+so_version() {
+  local version=$1
+  local major_version=$(echo ${version} | cut -d. -f1)
+  local minor_version=$(echo ${version} | cut -d. -f2)
+  expr ${major_version} \* 100 + ${minor_version}
+}
+
+update_deb_package_names() {
+  local version=$1
+  local next_version=$2
+  echo "Updating .deb package names for ${next_version}"
+  deb_lib_suffix=$(so_version ${version})
+  next_deb_lib_suffix=$(so_version ${next_version})
+  if [ "${deb_lib_suffix}" != "${next_deb_lib_suffix}" ]; then
+    pushd ${ARROW_DIR}/dev/tasks/linux-packages/apache-arrow
+    for target in debian*/lib*${deb_lib_suffix}.install; do
+      git mv \
+        ${target} \
+        $(echo ${target} | sed -e "s/${deb_lib_suffix}/${next_deb_lib_suffix}/")
+    done
+    deb_lib_suffix_substitute_pattern="s/(lib(arrow|gandiva|parquet)[-a-z]*)${deb_lib_suffix}/\\1${next_deb_lib_suffix}/g"
+    sed -i.bak -E -e "${deb_lib_suffix_substitute_pattern}" debian*/control*
+    rm -f debian*/control*.bak
+    git add debian*/control*
+    popd
+
+    pushd ${ARROW_DIR}/dev/tasks
+    sed -i.bak -E -e "${deb_lib_suffix_substitute_pattern}" tasks.yml
+    rm -f tasks.yml.bak
+    git add tasks.yml
+    popd
+
+    pushd ${ARROW_DIR}/dev/release
+    sed -i.bak -E -e "${deb_lib_suffix_substitute_pattern}" rat_exclude_files.txt
+    rm -f rat_exclude_files.txt.bak
+    git add rat_exclude_files.txt
+    git commit -m "MINOR: [Release] Update .deb package names for ${next_version}"
+    popd
+  fi
+}
+
+update_linux_packages() {
+  local version=$1
+  local release_time=$2
+  echo "Updating .deb/.rpm changelogs for ${version}"
+  pushd ${ARROW_DIR}/dev/tasks/linux-packages
+  rake \
+    version:update \
+    ARROW_RELEASE_TIME="${release_time}" \
+    ARROW_VERSION=${version}
+  git add */debian*/changelog */yum/*.spec.in
+  git commit -m "MINOR: [Release] Update .deb/.rpm changelogs for ${version}"
+  popd
+}
diff --git a/dev/release/utils-watch-gh-workflow.sh b/dev/release/utils-watch-gh-workflow.sh
new file mode 100755
index 0000000000000..c0bab40df0d76
--- /dev/null
+++ b/dev/release/utils-watch-gh-workflow.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+#
+# 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.
+
+set -e
+set -o pipefail
+
+if [ "$#" -ne 2 ]; then
+    echo "Usage: $0 <tag> <workflow>"
+    exit 1
+fi
+
+TAG=$1
+WORKFLOW=$2
+REPOSITORY="apache/arrow"
+
+echo "Looking for GitHub Actions workflow on ${REPOSITORY}:${TAG}"
+RUN_ID=""
+while [[ -z "${RUN_ID}" ]]
+do
+    echo "Waiting for run to start..."
+    RUN_ID=$(gh run list \
+                --repo "${REPOSITORY}" \
+                --workflow="${WORKFLOW}" \
+                --json 'databaseId,event,headBranch,status' \
+                --jq ".[] | select(.event == \"push\" and .headBranch == \"${TAG}\") | .databaseId")
+      sleep 1
+  done
+
+echo "Found GitHub Actions workflow with ID: ${RUN_ID}"
+gh run watch --repo "${REPOSITORY}" --exit-status ${RUN_ID}
\ No newline at end of file
diff --git a/dev/release/verify-apt.sh b/dev/release/verify-apt.sh
index cbb6d93823b21..8c54fe5c11cf1 100755
--- a/dev/release/verify-apt.sh
+++ b/dev/release/verify-apt.sh
@@ -80,12 +80,6 @@ esac
 
 workaround_missing_packages=()
 case "${distribution}-${code_name}" in
-  debian-bullseye)
-    sed \
-      -i"" \
-      -e "s/ main$/ main contrib non-free/g" \
-      /etc/apt/sources.list
-    ;;
   debian-*)
     sed \
       -i"" \
diff --git a/dev/release/verify-release-candidate.bat b/dev/release/verify-release-candidate.bat
index 8226eb5db360a..06d3016c72af9 100644
--- a/dev/release/verify-release-candidate.bat
+++ b/dev/release/verify-release-candidate.bat
@@ -122,7 +122,10 @@ cmake --build . --target INSTALL --config Release || exit /B 1
 @rem Needed so python-test.exe works
 set PYTHONPATH_ORIGINAL=%PYTHONPATH%
 set PYTHONPATH=%CONDA_PREFIX%\Lib;%CONDA_PREFIX%\Lib\site-packages;%CONDA_PREFIX%\DLLs;%CONDA_PREFIX%;%PYTHONPATH%
-ctest -j%NUMBER_OF_PROCESSORS% --output-on-failure  || exit /B 1
+ctest ^
+  --build-config Release ^
+  --output-on-failure ^
+  --parallel %NUMBER_OF_PROCESSORS% || exit /B 1
 set PYTHONPATH=%PYTHONPATH_ORIGINAL%
 popd
 
diff --git a/dev/release/verify-release-candidate.sh b/dev/release/verify-release-candidate.sh
index f18b18aaa997c..fcaaa423a4c75 100755
--- a/dev/release/verify-release-candidate.sh
+++ b/dev/release/verify-release-candidate.sh
@@ -185,9 +185,7 @@ test_binary() {
 test_apt() {
   show_header "Testing APT packages"
 
-  for target in "debian:bullseye" \
-                "arm64v8/debian:bullseye" \
-                "debian:bookworm" \
+  for target in "debian:bookworm" \
                 "arm64v8/debian:bookworm" \
                 "debian:trixie" \
                 "arm64v8/debian:trixie" \
@@ -347,7 +345,7 @@ install_csharp() {
 
   show_info "Ensuring that C# is installed..."
 
-  if dotnet --version | grep 7\.0 > /dev/null 2>&1; then
+  if dotnet --version | grep 8\.0 > /dev/null 2>&1; then
     local csharp_bin=$(dirname $(which dotnet))
     show_info "Found C# at $(which csharp) (.NET $(dotnet --version))"
   else
@@ -355,7 +353,7 @@ install_csharp() {
       show_info "dotnet found but it is the wrong version and will be ignored."
     fi
     local csharp_bin=${ARROW_TMPDIR}/csharp/bin
-    local dotnet_version=7.0.102
+    local dotnet_version=8.0.204
     local dotnet_platform=
     case "$(uname)" in
       Linux)
@@ -502,7 +500,8 @@ maybe_setup_conda() {
 install_maven() {
   MAVEN_VERSION=3.8.7
   if command -v mvn > /dev/null; then
-    SYSTEM_MAVEN_VERSION=$(mvn -v | head -n 1 | awk '{print $3}')
+    # --batch-mode is for disabling output color.
+    SYSTEM_MAVEN_VERSION=$(mvn --batch-mode -v | head -n 1 | awk '{print $3}')
     show_info "Found Maven version ${SYSTEM_MAVEN_VERSION} at $(command -v mvn)."
   else
     SYSTEM_MAVEN_VERSION=0.0.0
@@ -523,7 +522,8 @@ install_maven() {
         ${APACHE_MIRROR}/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz
       tar xzf apache-maven-${MAVEN_VERSION}-bin.tar.gz
       export PATH=$(pwd)/apache-maven-${MAVEN_VERSION}/bin:$PATH
-      show_info "Installed Maven version $(mvn -v | head -n 1 | awk '{print $3}')"
+      # --batch-mode is for disabling output color.
+      show_info "Installed Maven version $(mvn --batch-mode -v | head -n 1 | awk '{print $3}')"
     else
       show_info "System Maven version ${SYSTEM_MAVEN_VERSION} is newer than minimum version ${MAVEN_VERSION}. Skipping installation."
     fi
@@ -756,7 +756,7 @@ test_python() {
   show_header "Build and test Python libraries"
 
   # Build and test Python
-  maybe_setup_virtualenv "cython>=0.29.31" numpy "setuptools_scm<8.0.0" setuptools
+  maybe_setup_virtualenv
   maybe_setup_conda --file ci/conda_env_python.txt
 
   if [ "${USE_CONDA}" -gt 0 ]; then
@@ -788,7 +788,7 @@ test_python() {
   pushd python
 
   # Build pyarrow
-  python setup.py build_ext --inplace
+  python -m pip install -e .
 
   # Check mandatory and optional imports
   python -c "
diff --git a/dev/release/verify-yum.sh b/dev/release/verify-yum.sh
index a3904169bbf61..aad82af21fc96 100755
--- a/dev/release/verify-yum.sh
+++ b/dev/release/verify-yum.sh
@@ -64,6 +64,16 @@ uninstall_command="dnf remove -y"
 clean_command="dnf clean"
 info_command="dnf info --enablerepo=crb"
 
+# GH-42128
+# Switch all repos to point to to vault.centos.org, use for EOL distros
+fix_eol_repositories() {
+  sed -i \
+    -e 's/^mirrorlist/#mirrorlist/' \
+    -e 's/^#baseurl/baseurl/' \
+    -e 's/mirror\.centos\.org/vault.centos.org/' \
+    /etc/yum.repos.d/*.repo
+}
+
 echo "::group::Prepare repository"
 
 case "${distribution}-${distribution_version}" in
@@ -99,6 +109,7 @@ case "${distribution}-${distribution_version}" in
     uninstall_command="yum remove -y"
     clean_command="yum clean"
     info_command="yum info"
+    fix_eol_repositories
     ;;
   centos-8)
     distribution_prefix="centos"
@@ -106,6 +117,7 @@ case "${distribution}-${distribution_version}" in
     ruby_devel_packages+=(redhat-rpm-config)
     install_command="dnf install -y --enablerepo=powertools"
     info_command="dnf info --enablerepo=powertools"
+    fix_eol_repositories
     ;;
   centos-*)
     distribution_prefix="centos"
diff --git a/dev/requirements_merge_arrow_pr.txt b/dev/requirements_merge_arrow_pr.txt
index 7ac17dc1b1933..99909e434a580 100644
--- a/dev/requirements_merge_arrow_pr.txt
+++ b/dev/requirements_merge_arrow_pr.txt
@@ -1,3 +1,2 @@
 jira
 requests
-six
diff --git a/dev/tasks/conda-recipes/azure.linux.yml b/dev/tasks/conda-recipes/azure.linux.yml
index 279ffb48ccd60..3153d44198e68 100755
--- a/dev/tasks/conda-recipes/azure.linux.yml
+++ b/dev/tasks/conda-recipes/azure.linux.yml
@@ -46,12 +46,6 @@ jobs:
 
   {{ macros.azure_checkout_arrow() }}
 
-  - task: CondaEnvironment@1
-    inputs:
-      packageSpecs: 'anaconda-client shyaml'
-      installOptions: '-c conda-forge'
-      updateConda: false
-
   - script: |
       mkdir build_artifacts
       CI=azure arrow/dev/tasks/conda-recipes/run_docker_build.sh $(pwd)/build_artifacts
diff --git a/dev/tasks/docker-tests/azure.linux.yml b/dev/tasks/docker-tests/azure.linux.yml
deleted file mode 100644
index be03957e925ed..0000000000000
--- a/dev/tasks/docker-tests/azure.linux.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.
-
-{% import 'macros.jinja' as macros with context %}
-
-jobs:
-- job: linux
-  pool:
-    vmImage: ubuntu-latest
-  timeoutInMinutes: 360
-  {% if env is defined %}
-  variables:
-  {% for key, value in env.items() %}
-    {{ key }}: {{ value }}
-  {% endfor %}
-  {% endif %}
-
-  steps:
-  - task: UsePythonVersion@0
-    inputs:
-      versionSpec: '3.8'
-
-  - script: |
-      git clone --no-checkout {{ arrow.remote }} arrow
-      git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }}
-      git -C arrow checkout FETCH_HEAD
-      git -C arrow submodule update --init --recursive
-      git -C arrow remote add upstream https://github.com/apache/arrow.git
-    displayName: Clone arrow
-
-  - script: pip install -e arrow/dev/archery[docker]
-    displayName: Setup Archery
-
-  - script: |
-      archery docker run \
-        -e ARROW_DOCS_VERSION="{{ arrow.no_rc_version }}" \
-        -e SETUPTOOLS_SCM_PRETEND_VERSION="{{ arrow.no_rc_version }}" \
-        {{ flags|default("") }} \
-        {{ image }} \
-        {{ command|default("") }}
-    displayName: Execute Docker Build
-    env:
-    {{ macros.azure_set_sccache_envvars()|indent(4) }}
-
-  {% if post_script is defined %}
-  - script: |
-      {{ post_script|indent(6) }}
-    displayName: Post Script
-  {% endif %}
-
-  {% if artifacts is defined %}
-  {{ macros.azure_upload_releases(artifacts) }}
-  {% endif %}
diff --git a/dev/tasks/docker-tests/circle.linux.yml b/dev/tasks/docker-tests/circle.linux.yml
deleted file mode 100644
index faad449c8ef88..0000000000000
--- a/dev/tasks/docker-tests/circle.linux.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.
-
-version: 2
-jobs:
-  build:
-    machine:
-      image: ubuntu-1604:202004-01
-    {%- if env is defined %}
-    environment:
-    {%- for key, value in env.items() %}
-      {{ key }}: {{ value }}
-    {%- endfor %}
-    {%- endif %}
-    steps:
-      - run: |
-          docker -v
-          docker-compose -v
-      - run: |
-          git clone --no-checkout {{ arrow.remote }} arrow
-          git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }}
-          git -C arrow checkout FETCH_HEAD
-          git -C arrow submodule update --init --recursive
-      - run:
-          name: Execute Docker Build
-          command: |
-            pyenv versions
-            pyenv global 3.8.12
-            pip install -e arrow/dev/archery[docker]
-            archery docker run -e SETUPTOOLS_SCM_PRETEND_VERSION="{{ arrow.no_rc_version }}" {{ run }}
-          no_output_timeout: "1h"
-
-workflows:
-  version: 2
-  build:
-    jobs:
-      - build
diff --git a/dev/tasks/homebrew-formulae/apache-arrow-glib.rb b/dev/tasks/homebrew-formulae/apache-arrow-glib.rb
index f47c4d737f1a0..d8f5ca872dbec 100644
--- a/dev/tasks/homebrew-formulae/apache-arrow-glib.rb
+++ b/dev/tasks/homebrew-formulae/apache-arrow-glib.rb
@@ -29,7 +29,7 @@
 class ApacheArrowGlib < Formula
   desc "GLib bindings for Apache Arrow"
   homepage "https://arrow.apache.org/"
-  url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-16.0.0-SNAPSHOT/apache-arrow-16.0.0-SNAPSHOT.tar.gz"
+  url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-17.0.0-SNAPSHOT/apache-arrow-17.0.0-SNAPSHOT.tar.gz"
   sha256 "9948ddb6d4798b51552d0dca3252dd6e3a7d0f9702714fc6f5a1b59397ce1d28"
   license "Apache-2.0"
   head "https://github.com/apache/arrow.git", branch: "main"
diff --git a/dev/tasks/homebrew-formulae/apache-arrow.rb b/dev/tasks/homebrew-formulae/apache-arrow.rb
index 881ca50fdecf3..e17d524bd9d71 100644
--- a/dev/tasks/homebrew-formulae/apache-arrow.rb
+++ b/dev/tasks/homebrew-formulae/apache-arrow.rb
@@ -29,7 +29,7 @@
 class ApacheArrow < Formula
   desc "Columnar in-memory analytics layer designed to accelerate big data"
   homepage "https://arrow.apache.org/"
-  url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-16.0.0-SNAPSHOT/apache-arrow-16.0.0-SNAPSHOT.tar.gz"
+  url "https://www.apache.org/dyn/closer.lua?path=arrow/arrow-17.0.0-SNAPSHOT/apache-arrow-17.0.0-SNAPSHOT.tar.gz"
   sha256 "9948ddb6d4798b51552d0dca3252dd6e3a7d0f9702714fc6f5a1b59397ce1d28"
   license "Apache-2.0"
   head "https://github.com/apache/arrow.git", branch: "main"
diff --git a/dev/tasks/java-jars/github.yml b/dev/tasks/java-jars/github.yml
index 03cbcc7c98fcc..9493be05be6ee 100644
--- a/dev/tasks/java-jars/github.yml
+++ b/dev/tasks/java-jars/github.yml
@@ -30,6 +30,7 @@ jobs:
       ARCH: {{ '${{ matrix.platform.archery_arch }}' }}
       ARCH_ALIAS: {{ '${{ matrix.platform.archery_arch_alias }}' }}
       ARCH_SHORT: {{ '${{ matrix.platform.archery_arch_short }}' }}
+      ARCHERY_USE_DOCKER_CLI: {{ "${{matrix.platform.archery_use_docker_cli || '1'}}" }}
     strategy:
       fail-fast: false
       matrix:
@@ -44,6 +45,7 @@ jobs:
             archery_arch: "arm64v8"
             archery_arch_alias: "aarch64"
             archery_arch_short: "arm64"
+            archery_use_docker_cli: "0"
     steps:
       {{ macros.github_checkout_arrow()|indent }}
       {{ macros.github_free_space()|indent }}
@@ -78,7 +80,7 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          - { runs_on: ["macos-latest"], arch: "x86_64"}
+          - { runs_on: ["macos-13"], arch: "x86_64"}
           - { runs_on: ["macos-14"], arch: "aarch_64" }
     env:
       MACOSX_DEPLOYMENT_TARGET: "10.15"
@@ -106,6 +108,18 @@ jobs:
           # llvm@14 because llvm is newer than llvm@14.
           brew uninstall llvm || :
 
+          # Ensure updating python@XXX with the "--overwrite" option.
+          # If python@XXX is updated without "--overwrite", it causes
+          # a conflict error. Because Python 3 installed not by
+          # Homebrew exists in /usr/local on GitHub Actions. If
+          # Homebrew's python@XXX is updated without "--overwrite", it
+          # tries to replace /usr/local/bin/2to3 and so on and causes
+          # a conflict error.
+          brew update
+          for python_package in $(brew list | grep python@); do
+            brew install --overwrite ${python_package}
+          done
+
           brew bundle --file=arrow/cpp/Brewfile
           # We want to link aws-sdk-cpp statically but Homebrew's
           # aws-sdk-cpp provides only shared library. If we have
@@ -228,6 +242,9 @@ jobs:
           test -f arrow/java-dist/arrow_dataset_jni/x86_64/arrow_dataset_jni.dll
           test -f arrow/java-dist/arrow_orc_jni/x86_64/arrow_orc_jni.dll
       - name: Build bundled jar
+        env:
+          MAVEN_ARGS: >-
+            --no-transfer-progress
         run: |
           set -e
           pushd arrow/java
diff --git a/dev/tasks/linux-packages/apache-arrow-apt-source/debian/changelog b/dev/tasks/linux-packages/apache-arrow-apt-source/debian/changelog
index ea99882edfb2e..04aa586dc3c96 100644
--- a/dev/tasks/linux-packages/apache-arrow-apt-source/debian/changelog
+++ b/dev/tasks/linux-packages/apache-arrow-apt-source/debian/changelog
@@ -1,3 +1,15 @@
+apache-arrow-apt-source (16.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Raúl Cumplido <raulcumplido@gmail.com>  Thu, 09 May 2024 07:21:29 -0000
+
+apache-arrow-apt-source (16.0.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Raúl Cumplido <raulcumplido@gmail.com>  Tue, 16 Apr 2024 14:48:07 -0000
+
 apache-arrow-apt-source (15.0.2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/dev/tasks/linux-packages/apache-arrow-release/yum/apache-arrow-release.spec.in b/dev/tasks/linux-packages/apache-arrow-release/yum/apache-arrow-release.spec.in
index 0e28c475ffef1..f0eb785dd6bc7 100644
--- a/dev/tasks/linux-packages/apache-arrow-release/yum/apache-arrow-release.spec.in
+++ b/dev/tasks/linux-packages/apache-arrow-release/yum/apache-arrow-release.spec.in
@@ -102,6 +102,12 @@ else
 fi
 
 %changelog
+* Thu May 09 2024 Raúl Cumplido <raulcumplido@gmail.com> - 16.1.0-1
+- New upstream release.
+
+* Tue Apr 16 2024 Raúl Cumplido <raulcumplido@gmail.com> - 16.0.0-1
+- New upstream release.
+
 * Wed Mar 13 2024 Raúl Cumplido <raulcumplido@gmail.com> - 15.0.2-1
 - New upstream release.
 
diff --git a/dev/tasks/linux-packages/apache-arrow-release/yum/centos-7/Dockerfile b/dev/tasks/linux-packages/apache-arrow-release/yum/centos-7/Dockerfile
index 236b0e2972dbf..2634e7a0d3159 100644
--- a/dev/tasks/linux-packages/apache-arrow-release/yum/centos-7/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow-release/yum/centos-7/Dockerfile
@@ -19,6 +19,14 @@ FROM centos:7
 
 ARG DEBUG
 
+# GH-42128
+# Switch repos to point to to vault.centos.org because Centos Stream 8 is EOL
+RUN sed -i \
+  -e 's/^mirrorlist/#mirrorlist/' \
+  -e 's/^#baseurl/baseurl/' \
+  -e 's/mirror\.centos\.org/vault.centos.org/' \
+  /etc/yum.repos.d/*.repo
+
 RUN \
   quiet=$([ "${DEBUG}" = "yes" ] || echo "--quiet") && \
   yum install -y ${quiet} \
diff --git a/dev/tasks/linux-packages/apache-arrow-release/yum/centos-8-stream/Dockerfile b/dev/tasks/linux-packages/apache-arrow-release/yum/centos-8-stream/Dockerfile
index 11d7ad0ee7b3e..65b6cb0ffb142 100644
--- a/dev/tasks/linux-packages/apache-arrow-release/yum/centos-8-stream/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow-release/yum/centos-8-stream/Dockerfile
@@ -19,6 +19,14 @@ FROM quay.io/centos/centos:stream8
 
 ARG DEBUG
 
+# GH-42128
+# Switch repos to point to to vault.centos.org because Centos Stream 8 is EOL
+RUN sed -i \
+  -e 's/^mirrorlist/#mirrorlist/' \
+  -e 's/^#baseurl/baseurl/' \
+  -e 's/mirror\.centos\.org/vault.centos.org/' \
+  /etc/yum.repos.d/*.repo
+
 RUN \
   quiet=$([ "${DEBUG}" = "yes" ] || echo "--quiet") && \
   dnf install --enablerepo=powertools -y ${quiet} \
diff --git a/dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye/Dockerfile b/dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye/Dockerfile
deleted file mode 100644
index 2edcd4d5ed216..0000000000000
--- a/dev/tasks/linux-packages/apache-arrow/apt/debian-bullseye/Dockerfile
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.
-
-ARG FROM=debian:bullseye
-FROM ${FROM}
-
-RUN \
-  echo "debconf debconf/frontend select Noninteractive" | \
-    debconf-set-selections
-
-RUN \
-  echo "deb http://deb.debian.org/debian bullseye-backports main" > \
-    /etc/apt/sources.list.d/backports.list
-
-RUN \
-  echo 'APT::Install-Recommends "false";' > \
-    /etc/apt/apt.conf.d/disable-install-recommends
-
-RUN sed -i'' -e 's/main$/main contrib non-free/g' /etc/apt/sources.list
-
-ARG DEBUG
-RUN \
-  quiet=$([ "${DEBUG}" = "yes" ] || echo "-qq") && \
-  apt update ${quiet} && \
-  apt install -y -V ${quiet} \
-    build-essential \
-    clang \
-    cmake \
-    debhelper \
-    devscripts \
-    git \
-    libboost-filesystem-dev \
-    libboost-system-dev \
-    libbrotli-dev \
-    libbz2-dev \
-    libc-ares-dev \
-    libcurl4-openssl-dev \
-    libgirepository1.0-dev \
-    libglib2.0-doc \
-    libgmock-dev \
-    libgoogle-glog-dev \
-    libgrpc++-dev \
-    libgtest-dev \
-    liblz4-dev \
-    libprotobuf-dev \
-    libprotoc-dev \
-    libre2-dev \
-    libsnappy-dev \
-    libssl-dev \
-    libthrift-dev \
-    libutf8proc-dev \
-    libzstd-dev \
-    llvm-dev \
-    lsb-release \
-    ninja-build \
-    nlohmann-json3-dev \
-    pkg-config \
-    protobuf-compiler-grpc \
-    python3-dev \
-    python3-pip \
-    rapidjson-dev \
-    tzdata \
-    valac \
-    zlib1g-dev && \
-  if apt list | grep '^nvidia-cuda-toolkit/'; then \
-    apt install -y -V ${quiet} nvidia-cuda-toolkit; \
-  fi && \
-  apt install -y -V -t bullseye-backports ${quiet} \
-    meson && \
-  pip3 install gi-docgen && \
-  ln -fs /usr/local/bin/gi-docgen /usr/bin && \
-  apt clean && \
-  rm -rf /var/lib/apt/lists/*
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/changelog b/dev/tasks/linux-packages/apache-arrow/debian/changelog
index 68a8c01e1ec18..35cc598fe6f87 100644
--- a/dev/tasks/linux-packages/apache-arrow/debian/changelog
+++ b/dev/tasks/linux-packages/apache-arrow/debian/changelog
@@ -1,3 +1,15 @@
+apache-arrow (16.1.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Raúl Cumplido <raulcumplido@gmail.com>  Thu, 09 May 2024 07:21:29 -0000
+
+apache-arrow (16.0.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Raúl Cumplido <raulcumplido@gmail.com>  Tue, 16 Apr 2024 14:48:07 -0000
+
 apache-arrow (15.0.2-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/control.in b/dev/tasks/linux-packages/apache-arrow/debian/control.in
index e23e2a7ee44e3..c33e3ac791be1 100644
--- a/dev/tasks/linux-packages/apache-arrow/debian/control.in
+++ b/dev/tasks/linux-packages/apache-arrow/debian/control.in
@@ -42,7 +42,7 @@ Build-Depends-Indep: libglib2.0-doc
 Standards-Version: 3.9.8
 Homepage: https://arrow.apache.org/
 
-Package: libarrow1600
+Package: libarrow1700
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -62,12 +62,12 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libarrow1600 (= ${binary:Version})
+  libarrow1700 (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
  This package provides tools.
 
-Package: libarrow-cuda1600
+Package: libarrow-cuda1700
 Section: libs
 Architecture: @CUDA_ARCHITECTURE@
 Multi-Arch: same
@@ -75,12 +75,12 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libarrow1600 (= ${binary:Version})
+  libarrow1700 (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
  This package provides C++ library files for CUDA support.
 
-Package: libarrow-acero1600
+Package: libarrow-acero1700
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -88,12 +88,12 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libarrow1600 (= ${binary:Version})
+  libarrow1700 (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
  This package provides C++ library files for Acero module.
 
-Package: libarrow-dataset1600
+Package: libarrow-dataset1700
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -101,13 +101,13 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libarrow-acero1600 (= ${binary:Version}),
-  libparquet1600 (= ${binary:Version})
+  libarrow-acero1700 (= ${binary:Version}),
+  libparquet1700 (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
  This package provides C++ library files for Dataset module.
 
-Package: libarrow-flight1600
+Package: libarrow-flight1700
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -115,12 +115,12 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libarrow1600 (= ${binary:Version})
+  libarrow1700 (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
  This package provides C++ library files for Flight RPC system.
 
-Package: libarrow-flight-sql1600
+Package: libarrow-flight-sql1700
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -128,7 +128,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libarrow-flight1600 (= ${binary:Version})
+  libarrow-flight1700 (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
  This package provides C++ library files for Flight SQL system.
@@ -139,7 +139,7 @@ Architecture: any
 Multi-Arch: same
 Depends:
   ${misc:Depends},
-  libarrow1600 (= ${binary:Version}),
+  libarrow1700 (= ${binary:Version}),
   libbrotli-dev,
   libbz2-dev,
   libcurl4-openssl-dev,
@@ -166,7 +166,7 @@ Multi-Arch: same
 Depends:
   ${misc:Depends},
   libarrow-dev (= ${binary:Version}),
-  libarrow-cuda1600 (= ${binary:Version})
+  libarrow-cuda1700 (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
  This package provides C++ header files for CUDA support.
@@ -177,7 +177,7 @@ Architecture: any
 Multi-Arch: same
 Depends:
   ${misc:Depends},
-  libarrow-acero1600 (= ${binary:Version}),
+  libarrow-acero1700 (= ${binary:Version}),
   libparquet-dev (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
@@ -190,7 +190,7 @@ Multi-Arch: same
 Depends:
   ${misc:Depends},
   libarrow-acero-dev (= ${binary:Version}),
-  libarrow-dataset1600 (= ${binary:Version}),
+  libarrow-dataset1700 (= ${binary:Version}),
   libparquet-dev (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
@@ -203,7 +203,7 @@ Multi-Arch: same
 Depends:
   ${misc:Depends},
   libarrow-dev (= ${binary:Version}),
-  libarrow-flight1600 (= ${binary:Version}),
+  libarrow-flight1700 (= ${binary:Version}),
   libc-ares-dev,
 @USE_SYSTEM_GRPC@  libgrpc++-dev
 Description: Apache Arrow is a data processing library for analysis
@@ -217,12 +217,12 @@ Multi-Arch: same
 Depends:
   ${misc:Depends},
   libarrow-flight-dev (= ${binary:Version}),
-  libarrow-flight-sql1600 (= ${binary:Version})
+  libarrow-flight-sql1700 (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
  This package provides C++ header files for Flight SQL system.
 
-Package: libgandiva1600
+Package: libgandiva1700
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -230,7 +230,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libarrow1600 (= ${binary:Version})
+  libarrow1700 (= ${binary:Version})
 Description: Gandiva is a toolset for compiling and evaluating expressions
  on Arrow Data.
  .
@@ -243,13 +243,13 @@ Multi-Arch: same
 Depends:
   ${misc:Depends},
   libarrow-dev (= ${binary:Version}),
-  libgandiva1600 (= ${binary:Version})
+  libgandiva1700 (= ${binary:Version})
 Description: Gandiva is a toolset for compiling and evaluating expressions
  on Arrow Data.
  .
  This package provides C++ header files.
 
-Package: libparquet1600
+Package: libparquet1700
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -269,7 +269,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libparquet1600 (= ${binary:Version})
+  libparquet1700 (= ${binary:Version})
 Description: Apache Parquet is a columnar storage format
  .
  This package provides tools.
@@ -281,13 +281,13 @@ Multi-Arch: same
 Depends:
   ${misc:Depends},
   libarrow-dev (= ${binary:Version}),
-  libparquet1600 (= ${binary:Version}),
+  libparquet1700 (= ${binary:Version}),
   libthrift-dev
 Description: Apache Parquet is a columnar storage format
  .
  This package provides C++ header files.
 
-Package: libarrow-glib1600
+Package: libarrow-glib1700
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -295,7 +295,7 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libarrow1600 (= ${binary:Version})
+  libarrow1700 (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
  This package provides GLib based library files.
@@ -319,7 +319,7 @@ Depends:
   ${misc:Depends},
   libglib2.0-dev,
   libarrow-acero-dev (= ${binary:Version}),
-  libarrow-glib1600 (= ${binary:Version}),
+  libarrow-glib1700 (= ${binary:Version}),
   gir1.2-arrow-1.0 (= ${binary:Version})
 Suggests: libarrow-glib-doc
 Description: Apache Arrow is a data processing library for analysis
@@ -337,7 +337,7 @@ Description: Apache Arrow is a data processing library for analysis
  .
  This package provides documentations.
 
-Package: libarrow-cuda-glib1600
+Package: libarrow-cuda-glib1700
 Section: libs
 Architecture: @CUDA_ARCHITECTURE@
 Multi-Arch: same
@@ -345,8 +345,8 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libarrow-glib1600 (= ${binary:Version}),
-  libarrow-cuda1600 (= ${binary:Version})
+  libarrow-glib1700 (= ${binary:Version}),
+  libarrow-cuda1700 (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
  This package provides GLib based library files for CUDA support.
@@ -371,13 +371,13 @@ Depends:
   ${misc:Depends},
   libarrow-cuda-dev (= ${binary:Version}),
   libarrow-glib-dev (= ${binary:Version}),
-  libarrow-cuda-glib1600 (= ${binary:Version}),
+  libarrow-cuda-glib1700 (= ${binary:Version}),
   gir1.2-arrow-cuda-1.0 (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
  This package provides GLib based header files for CUDA support.
 
-Package: libarrow-dataset-glib1600
+Package: libarrow-dataset-glib1700
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -385,8 +385,8 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libarrow-glib1600 (= ${binary:Version}),
-  libarrow-dataset1600 (= ${binary:Version})
+  libarrow-glib1700 (= ${binary:Version}),
+  libarrow-dataset1700 (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
  This package provides GLib based library files for dataset module.
@@ -411,7 +411,7 @@ Depends:
   ${misc:Depends},
   libarrow-dataset-dev (= ${binary:Version}),
   libarrow-glib-dev (= ${binary:Version}),
-  libarrow-dataset-glib1600 (= ${binary:Version}),
+  libarrow-dataset-glib1700 (= ${binary:Version}),
   gir1.2-arrow-dataset-1.0 (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
@@ -428,7 +428,7 @@ Description: Apache Arrow is a data processing library for analysis
  .
  This package provides documentations for dataset module.
 
-Package: libarrow-flight-glib1600
+Package: libarrow-flight-glib1700
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -436,8 +436,8 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libarrow-glib1600 (= ${binary:Version}),
-  libarrow-flight1600 (= ${binary:Version})
+  libarrow-glib1700 (= ${binary:Version}),
+  libarrow-flight1700 (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
  This package provides GLib based library files for Apache Arrow Flight.
@@ -463,7 +463,7 @@ Depends:
   ${misc:Depends},
   libarrow-flight-dev (= ${binary:Version}),
   libarrow-glib-dev (= ${binary:Version}),
-  libarrow-flight-glib1600 (= ${binary:Version}),
+  libarrow-flight-glib1700 (= ${binary:Version}),
   gir1.2-arrow-flight-1.0 (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
@@ -480,7 +480,7 @@ Description: Apache Arrow is a data processing library for analysis
  .
  This package provides documentations for Apache Arrow Flight.
 
-Package: libarrow-flight-sql-glib1600
+Package: libarrow-flight-sql-glib1700
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -488,8 +488,8 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libarrow-flight-glib1600 (= ${binary:Version}),
-  libarrow-flight-sql1600 (= ${binary:Version})
+  libarrow-flight-glib1700 (= ${binary:Version}),
+  libarrow-flight-sql1700 (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
  This package provides GLib based library files for Apache Arrow Flight SQL.
@@ -515,7 +515,7 @@ Depends:
   ${misc:Depends},
   libarrow-flight-sql-dev (= ${binary:Version}),
   libarrow-flight-glib-dev (= ${binary:Version}),
-  libarrow-flight-sql-glib1600 (= ${binary:Version}),
+  libarrow-flight-sql-glib1700 (= ${binary:Version}),
   gir1.2-arrow-flight-sql-1.0 (= ${binary:Version})
 Description: Apache Arrow is a data processing library for analysis
  .
@@ -532,7 +532,7 @@ Description: Apache Arrow is a data processing library for analysis
  .
  This package provides documentations for Apache Arrow Flight SQL.
 
-Package: libgandiva-glib1600
+Package: libgandiva-glib1700
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -540,8 +540,8 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libarrow-glib1600 (= ${binary:Version}),
-  libgandiva1600 (= ${binary:Version})
+  libarrow-glib1700 (= ${binary:Version}),
+  libgandiva1700 (= ${binary:Version})
 Description: Gandiva is a toolset for compiling and evaluating expressions
  on Arrow Data.
  .
@@ -568,7 +568,7 @@ Depends:
   ${misc:Depends},
   libgandiva-dev (= ${binary:Version}),
   libarrow-glib-dev (= ${binary:Version}),
-  libgandiva-glib1600 (= ${binary:Version}),
+  libgandiva-glib1700 (= ${binary:Version}),
   gir1.2-gandiva-1.0 (= ${binary:Version})
 Description: Gandiva is a toolset for compiling and evaluating expressions
  on Arrow Data.
@@ -587,7 +587,7 @@ Description: Gandiva is a toolset for compiling and evaluating expressions
  .
  This package provides documentations.
 
-Package: libparquet-glib1600
+Package: libparquet-glib1700
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -595,8 +595,8 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends:
   ${misc:Depends},
   ${shlibs:Depends},
-  libarrow-glib1600 (= ${binary:Version}),
-  libparquet1600 (= ${binary:Version})
+  libarrow-glib1700 (= ${binary:Version}),
+  libparquet1700 (= ${binary:Version})
 Description: Apache Parquet is a columnar storage format
  .
  This package provides GLib based library files.
@@ -621,7 +621,7 @@ Depends:
   ${misc:Depends},
   libarrow-glib-dev (= ${binary:Version}),
   libparquet-dev (= ${binary:Version}),
-  libparquet-glib1600 (= ${binary:Version}),
+  libparquet-glib1700 (= ${binary:Version}),
   gir1.2-parquet-1.0 (= ${binary:Version})
 Suggests: libparquet-glib-doc
 Description: Apache Parquet is a columnar storage format
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/libarrow-acero1600.install b/dev/tasks/linux-packages/apache-arrow/debian/libarrow-acero1700.install
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow/debian/libarrow-acero1600.install
rename to dev/tasks/linux-packages/apache-arrow/debian/libarrow-acero1700.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/libarrow-cuda-glib1600.install b/dev/tasks/linux-packages/apache-arrow/debian/libarrow-cuda-glib1700.install
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow/debian/libarrow-cuda-glib1600.install
rename to dev/tasks/linux-packages/apache-arrow/debian/libarrow-cuda-glib1700.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/libarrow-cuda1600.install b/dev/tasks/linux-packages/apache-arrow/debian/libarrow-cuda1700.install
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow/debian/libarrow-cuda1600.install
rename to dev/tasks/linux-packages/apache-arrow/debian/libarrow-cuda1700.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/libarrow-dataset-glib1600.install b/dev/tasks/linux-packages/apache-arrow/debian/libarrow-dataset-glib1700.install
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow/debian/libarrow-dataset-glib1600.install
rename to dev/tasks/linux-packages/apache-arrow/debian/libarrow-dataset-glib1700.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/libarrow-dataset1600.install b/dev/tasks/linux-packages/apache-arrow/debian/libarrow-dataset1700.install
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow/debian/libarrow-dataset1600.install
rename to dev/tasks/linux-packages/apache-arrow/debian/libarrow-dataset1700.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight-glib1600.install b/dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight-glib1700.install
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight-glib1600.install
rename to dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight-glib1700.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight-sql-glib1600.install b/dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight-sql-glib1700.install
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight-sql-glib1600.install
rename to dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight-sql-glib1700.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight-sql1600.install b/dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight-sql1700.install
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight-sql1600.install
rename to dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight-sql1700.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight1600.install b/dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight1700.install
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight1600.install
rename to dev/tasks/linux-packages/apache-arrow/debian/libarrow-flight1700.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/libarrow-glib1600.install b/dev/tasks/linux-packages/apache-arrow/debian/libarrow-glib1700.install
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow/debian/libarrow-glib1600.install
rename to dev/tasks/linux-packages/apache-arrow/debian/libarrow-glib1700.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/libarrow1600.install b/dev/tasks/linux-packages/apache-arrow/debian/libarrow1700.install
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow/debian/libarrow1600.install
rename to dev/tasks/linux-packages/apache-arrow/debian/libarrow1700.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/libgandiva-glib1600.install b/dev/tasks/linux-packages/apache-arrow/debian/libgandiva-glib1700.install
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow/debian/libgandiva-glib1600.install
rename to dev/tasks/linux-packages/apache-arrow/debian/libgandiva-glib1700.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/libgandiva1600.install b/dev/tasks/linux-packages/apache-arrow/debian/libgandiva1700.install
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow/debian/libgandiva1600.install
rename to dev/tasks/linux-packages/apache-arrow/debian/libgandiva1700.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/libparquet-glib1600.install b/dev/tasks/linux-packages/apache-arrow/debian/libparquet-glib1700.install
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow/debian/libparquet-glib1600.install
rename to dev/tasks/linux-packages/apache-arrow/debian/libparquet-glib1700.install
diff --git a/dev/tasks/linux-packages/apache-arrow/debian/libparquet1600.install b/dev/tasks/linux-packages/apache-arrow/debian/libparquet1700.install
similarity index 100%
rename from dev/tasks/linux-packages/apache-arrow/debian/libparquet1600.install
rename to dev/tasks/linux-packages/apache-arrow/debian/libparquet1700.install
diff --git a/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in b/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
index 9465141379564..d5e6c3a332eb3 100644
--- a/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
+++ b/dev/tasks/linux-packages/apache-arrow/yum/arrow.spec.in
@@ -27,7 +27,9 @@
 
 %define is_centos_7 (%{_rhel} == 7 && !%{is_amazon_linux})
 
-%define major_version %(echo @VERSION@ | grep -o '^[0-9]*')
+%define major_version %(echo @VERSION@ | cut -d. -f 1)
+%define minor_version %(echo @VERSION@ | cut -d. -f 2)
+%define so_version %(expr %{major_version} '*' 100 + %{minor_version})
 
 %define boost_version %( \
   if [ %{_rhel} -eq 7 ]; then \
@@ -239,7 +241,7 @@ cd cpp
 rm -rf %{buildroot}%{_docdir}/arrow/
 cd -
 
-%package -n %{name}%{major_version}-libs
+%package -n %{name}%{so_version}-libs
 Summary:	Runtime libraries for Apache Arrow C++
 License:	Apache-2.0
 %if %{have_lz4_libs}
@@ -248,10 +250,10 @@ Requires:	lz4-libs %{lz4_requirement}
 Requires:	lz4 %{lz4_requirement}
 %endif
 
-%description -n %{name}%{major_version}-libs
+%description -n %{name}%{so_version}-libs
 This package contains the libraries for Apache Arrow C++.
 
-%files -n %{name}%{major_version}-libs
+%files -n %{name}%{so_version}-libs
 %defattr(-,root,root,-)
 %doc README.md
 %license LICENSE.txt NOTICE.txt
@@ -260,7 +262,7 @@ This package contains the libraries for Apache Arrow C++.
 %package tools
 Summary:	Tools for Apache Arrow C++
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-libs = %{version}-%{release}
 
 %description tools
 Tools for Apache Arrow C++.
@@ -274,7 +276,7 @@ Tools for Apache Arrow C++.
 %package devel
 Summary:	Libraries and header files for Apache Arrow C++
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-libs = %{version}-%{release}
 Requires:	brotli-devel
 Requires:	bzip2-devel
 Requires:	curl-devel
@@ -322,15 +324,15 @@ Libraries and header files for Apache Arrow C++.
 %{_libdir}/pkgconfig/arrow-orc.pc
 %{_libdir}/pkgconfig/arrow.pc
 
-%package -n %{name}%{major_version}-acero-libs
+%package -n %{name}%{so_version}-acero-libs
 Summary:	C++ library to execute a query in streaming
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-libs = %{version}-%{release}
 
-%description -n %{name}%{major_version}-acero-libs
+%description -n %{name}%{so_version}-acero-libs
 This package contains the libraries for Apache Arrow Acero.
 
-%files -n %{name}%{major_version}-acero-libs
+%files -n %{name}%{so_version}-acero-libs
 %defattr(-,root,root,-)
 %doc README.md
 %license LICENSE.txt NOTICE.txt
@@ -339,7 +341,7 @@ This package contains the libraries for Apache Arrow Acero.
 %package acero-devel
 Summary:	Libraries and header files for Apache Arrow Acero
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-acero-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-acero-libs = %{version}-%{release}
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description acero-devel
@@ -355,16 +357,16 @@ Libraries and header files for Apache Arrow Acero
 %{_libdir}/libarrow_acero.so
 %{_libdir}/pkgconfig/arrow-acero.pc
 
-%package -n %{name}%{major_version}-dataset-libs
+%package -n %{name}%{so_version}-dataset-libs
 Summary:	C++ library to read and write semantic datasets stored in different locations and formats
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-acero-libs = %{version}-%{release}
-Requires:	parquet%{major_version}-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-acero-libs = %{version}-%{release}
+Requires:	parquet%{so_version}-libs = %{version}-%{release}
 
-%description -n %{name}%{major_version}-dataset-libs
+%description -n %{name}%{so_version}-dataset-libs
 This package contains the libraries for Apache Arrow dataset.
 
-%files -n %{name}%{major_version}-dataset-libs
+%files -n %{name}%{so_version}-dataset-libs
 %defattr(-,root,root,-)
 %doc README.md
 %license LICENSE.txt NOTICE.txt
@@ -373,7 +375,7 @@ This package contains the libraries for Apache Arrow dataset.
 %package dataset-devel
 Summary:	Libraries and header files for Apache Arrow dataset.
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-dataset-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-dataset-libs = %{version}-%{release}
 Requires:	%{name}-acero-devel = %{version}-%{release}
 Requires:	parquet-devel = %{version}-%{release}
 
@@ -391,15 +393,15 @@ Libraries and header files for Apache Arrow dataset.
 %{_libdir}/pkgconfig/arrow-dataset.pc
 
 %if %{use_flight}
-%package -n %{name}%{major_version}-flight-libs
+%package -n %{name}%{so_version}-flight-libs
 Summary:	C++ library for fast data transport.
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-libs = %{version}-%{release}
 
-%description -n %{name}%{major_version}-flight-libs
+%description -n %{name}%{so_version}-flight-libs
 This package contains the libraries for Apache Arrow Flight.
 
-%files -n %{name}%{major_version}-flight-libs
+%files -n %{name}%{so_version}-flight-libs
 %defattr(-,root,root,-)
 %doc README.md
 %license LICENSE.txt NOTICE.txt
@@ -408,7 +410,7 @@ This package contains the libraries for Apache Arrow Flight.
 %package flight-devel
 Summary:	Libraries and header files for Apache Arrow Flight.
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-flight-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-flight-libs = %{version}-%{release}
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	c-ares-devel
 %if %{have_grpc}
@@ -430,15 +432,15 @@ Libraries and header files for Apache Arrow Flight.
 %{_libdir}/libarrow_flight.so
 %{_libdir}/pkgconfig/arrow-flight.pc
 
-%package -n %{name}%{major_version}-flight-sql-libs
+%package -n %{name}%{so_version}-flight-sql-libs
 Summary:	C++ library for interacting with SQL databases.
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-flight-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-flight-libs = %{version}-%{release}
 
-%description -n %{name}%{major_version}-flight-sql-libs
+%description -n %{name}%{so_version}-flight-sql-libs
 This package contains the libraries for Apache Arrow Flight SQL.
 
-%files -n %{name}%{major_version}-flight-sql-libs
+%files -n %{name}%{so_version}-flight-sql-libs
 %defattr(-,root,root,-)
 %doc README.md
 %license LICENSE.txt NOTICE.txt
@@ -447,7 +449,7 @@ This package contains the libraries for Apache Arrow Flight SQL.
 %package flight-sql-devel
 Summary:	Libraries and header files for Apache Arrow Flight SQL.
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-flight-sql-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-flight-sql-libs = %{version}-%{release}
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description flight-sql-devel
@@ -465,15 +467,15 @@ Libraries and header files for Apache Arrow Flight SQL.
 %endif
 
 %if %{use_gandiva}
-%package -n gandiva%{major_version}-libs
+%package -n gandiva%{so_version}-libs
 Summary:	C++ library for compiling and evaluating expressions on Apache Arrow data.
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-libs = %{version}-%{release}
 
-%description -n gandiva%{major_version}-libs
+%description -n gandiva%{so_version}-libs
 This package contains the libraries for Gandiva.
 
-%files -n gandiva%{major_version}-libs
+%files -n gandiva%{so_version}-libs
 %defattr(-,root,root,-)
 %doc README.md
 %license LICENSE.txt NOTICE.txt
@@ -483,7 +485,7 @@ This package contains the libraries for Gandiva.
 Summary:	Libraries and header files for Gandiva.
 License:	Apache-2.0
 Requires:	%{name}-devel = %{version}-%{release}
-Requires:	gandiva%{major_version}-libs = %{version}-%{release}
+Requires:	gandiva%{so_version}-libs = %{version}-%{release}
 Requires:	llvm-devel
 
 %description -n gandiva-devel
@@ -500,15 +502,15 @@ Libraries and header files for Gandiva.
 %{_libdir}/pkgconfig/gandiva.pc
 %endif
 
-%package -n parquet%{major_version}-libs
+%package -n parquet%{so_version}-libs
 Summary:	Runtime libraries for Apache Parquet C++
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-libs = %{version}-%{release}
 
-%description -n parquet%{major_version}-libs
+%description -n parquet%{so_version}-libs
 This package contains the libraries for Apache Parquet C++.
 
-%files -n parquet%{major_version}-libs
+%files -n parquet%{so_version}-libs
 %defattr(-,root,root,-)
 %doc README.md
 %license LICENSE.txt NOTICE.txt
@@ -517,7 +519,7 @@ This package contains the libraries for Apache Parquet C++.
 %package -n parquet-tools
 Summary:	Tools for Apache Parquet C++
 License:	Apache-2.0
-Requires:	parquet%{major_version}-libs = %{version}-%{release}
+Requires:	parquet%{so_version}-libs = %{version}-%{release}
 
 %description -n parquet-tools
 Tools for Apache Parquet C++.
@@ -532,7 +534,7 @@ Tools for Apache Parquet C++.
 Summary:	Libraries and header files for Apache Parquet C++
 License:	Apache-2.0
 Requires:	%{name}-devel = %{version}-%{release}
-Requires:	parquet%{major_version}-libs = %{version}-%{release}
+Requires:	parquet%{so_version}-libs = %{version}-%{release}
 Requires:	zlib-devel
 
 %description -n parquet-devel
@@ -548,15 +550,15 @@ Libraries and header files for Apache Parquet C++.
 %{_libdir}/libparquet.so
 %{_libdir}/pkgconfig/parquet*.pc
 
-%package -n %{name}%{major_version}-glib-libs
+%package -n %{name}%{so_version}-glib-libs
 Summary:	Runtime libraries for Apache Arrow GLib
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-libs = %{version}-%{release}
 
-%description -n %{name}%{major_version}-glib-libs
+%description -n %{name}%{so_version}-glib-libs
 This package contains the libraries for Apache Arrow GLib.
 
-%files -n %{name}%{major_version}-glib-libs
+%files -n %{name}%{so_version}-glib-libs
 %defattr(-,root,root,-)
 %doc README.md
 %license LICENSE.txt NOTICE.txt
@@ -567,7 +569,7 @@ This package contains the libraries for Apache Arrow GLib.
 Summary:	Libraries and header files for Apache Arrow GLib
 License:	Apache-2.0
 Requires:	%{name}-acero-devel = %{version}-%{release}
-Requires:	%{name}%{major_version}-glib-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-glib-libs = %{version}-%{release}
 Requires:	glib2-devel
 Requires:	gobject-introspection-devel
 
@@ -606,16 +608,16 @@ Documentation for Apache Arrow GLib.
 %{_docdir}/arrow-glib/
 %endif
 
-%package -n %{name}%{major_version}-dataset-glib-libs
+%package -n %{name}%{so_version}-dataset-glib-libs
 Summary:	Runtime libraries for Apache Arrow Dataset GLib
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-dataset-libs = %{version}-%{release}
-Requires:	%{name}%{major_version}-glib-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-dataset-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-glib-libs = %{version}-%{release}
 
-%description -n %{name}%{major_version}-dataset-glib-libs
+%description -n %{name}%{so_version}-dataset-glib-libs
 This package contains the libraries for Apache Arrow Dataset GLib.
 
-%files -n %{name}%{major_version}-dataset-glib-libs
+%files -n %{name}%{so_version}-dataset-glib-libs
 %defattr(-,root,root,-)
 %doc README.md
 %license LICENSE.txt NOTICE.txt
@@ -625,7 +627,7 @@ This package contains the libraries for Apache Arrow Dataset GLib.
 %package dataset-glib-devel
 Summary:	Libraries and header files for Apache Arrow Dataset GLib
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-dataset-glib-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-dataset-glib-libs = %{version}-%{release}
 Requires:	%{name}-dataset-devel = %{version}-%{release}
 Requires:	%{name}-glib-devel = %{version}-%{release}
 
@@ -661,16 +663,16 @@ Documentation for Apache Arrow dataset GLib.
 %endif
 
 %if %{use_flight}
-%package -n %{name}%{major_version}-flight-glib-libs
+%package -n %{name}%{so_version}-flight-glib-libs
 Summary:	Runtime libraries for Apache Arrow Flight GLib
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-flight-libs = %{version}-%{release}
-Requires:	%{name}%{major_version}-glib-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-flight-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-glib-libs = %{version}-%{release}
 
-%description -n %{name}%{major_version}-flight-glib-libs
+%description -n %{name}%{so_version}-flight-glib-libs
 This package contains the libraries for Apache Arrow Flight GLib.
 
-%files -n %{name}%{major_version}-flight-glib-libs
+%files -n %{name}%{so_version}-flight-glib-libs
 %defattr(-,root,root,-)
 %doc README.md
 %license LICENSE.txt NOTICE.txt
@@ -680,7 +682,7 @@ This package contains the libraries for Apache Arrow Flight GLib.
 %package flight-glib-devel
 Summary:	Libraries and header files for Apache Arrow Flight GLib
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-flight-glib-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-flight-glib-libs = %{version}-%{release}
 Requires:	%{name}-flight-devel = %{version}-%{release}
 Requires:	%{name}-glib-devel = %{version}-%{release}
 
@@ -715,16 +717,16 @@ Documentation for Apache Arrow Flight GLib.
 %{_docdir}/arrow-flight-glib/
 %endif
 
-%package -n %{name}%{major_version}-flight-sql-glib-libs
+%package -n %{name}%{so_version}-flight-sql-glib-libs
 Summary:	Runtime libraries for Apache Arrow Flight SQL GLib
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-flight-sql-libs = %{version}-%{release}
-Requires:	%{name}%{major_version}-flight-glib-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-flight-sql-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-flight-glib-libs = %{version}-%{release}
 
-%description -n %{name}%{major_version}-flight-sql-glib-libs
+%description -n %{name}%{so_version}-flight-sql-glib-libs
 This package contains the libraries for Apache Arrow Flight SQL GLib.
 
-%files -n %{name}%{major_version}-flight-sql-glib-libs
+%files -n %{name}%{so_version}-flight-sql-glib-libs
 %defattr(-,root,root,-)
 %doc README.md
 %license LICENSE.txt NOTICE.txt
@@ -734,7 +736,7 @@ This package contains the libraries for Apache Arrow Flight SQL GLib.
 %package flight-sql-glib-devel
 Summary:	Libraries and header files for Apache Arrow Flight SQL GLib
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-flight-sql-glib-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-flight-sql-glib-libs = %{version}-%{release}
 Requires:	%{name}-flight-sql-devel = %{version}-%{release}
 Requires:	%{name}-flight-glib-devel = %{version}-%{release}
 
@@ -771,16 +773,16 @@ Documentation for Apache Arrow Flight SQL GLib.
 %endif
 
 %if %{use_gandiva}
-%package -n gandiva%{major_version}-glib-libs
+%package -n gandiva%{so_version}-glib-libs
 Summary:	Runtime libraries for Gandiva GLib
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-glib-libs = %{version}-%{release}
-Requires:	gandiva%{major_version}-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-glib-libs = %{version}-%{release}
+Requires:	gandiva%{so_version}-libs = %{version}-%{release}
 
-%description -n gandiva%{major_version}-glib-libs
+%description -n gandiva%{so_version}-glib-libs
 This package contains the libraries for Gandiva GLib.
 
-%files -n gandiva%{major_version}-glib-libs
+%files -n gandiva%{so_version}-glib-libs
 %defattr(-,root,root,-)
 %doc README.md
 %license LICENSE.txt NOTICE.txt
@@ -791,7 +793,7 @@ This package contains the libraries for Gandiva GLib.
 Summary:	Libraries and header files for Gandiva GLib
 License:	Apache-2.0
 Requires:	%{name}-glib-devel = %{version}-%{release}
-Requires:	gandiva%{major_version}-glib-libs = %{version}-%{release}
+Requires:	gandiva%{so_version}-glib-libs = %{version}-%{release}
 Requires:	gandiva-devel = %{version}-%{release}
 
 %description -n gandiva-glib-devel
@@ -826,16 +828,16 @@ Documentation for Gandiva GLib.
   %endif
 %endif
 
-%package -n parquet%{major_version}-glib-libs
+%package -n parquet%{so_version}-glib-libs
 Summary:	Runtime libraries for Apache Parquet GLib
 License:	Apache-2.0
-Requires:	%{name}%{major_version}-glib-libs = %{version}-%{release}
-Requires:	parquet%{major_version}-libs = %{version}-%{release}
+Requires:	%{name}%{so_version}-glib-libs = %{version}-%{release}
+Requires:	parquet%{so_version}-libs = %{version}-%{release}
 
-%description -n parquet%{major_version}-glib-libs
+%description -n parquet%{so_version}-glib-libs
 This package contains the libraries for Apache Parquet GLib.
 
-%files -n parquet%{major_version}-glib-libs
+%files -n parquet%{so_version}-glib-libs
 %defattr(-,root,root,-)
 %doc README.md
 %license LICENSE.txt NOTICE.txt
@@ -846,7 +848,7 @@ This package contains the libraries for Apache Parquet GLib.
 Summary:	Libraries and header files for Apache Parquet GLib
 License:	Apache-2.0
 Requires:	%{name}-glib-devel = %{version}-%{release}
-Requires:	parquet%{major_version}-glib-libs = %{version}-%{release}
+Requires:	parquet%{so_version}-glib-libs = %{version}-%{release}
 Requires:	parquet-devel = %{version}-%{release}
 
 %description -n parquet-glib-devel
@@ -881,6 +883,12 @@ Documentation for Apache Parquet GLib.
 %endif
 
 %changelog
+* Thu May 09 2024 Raúl Cumplido <raulcumplido@gmail.com> - 16.1.0-1
+- New upstream release.
+
+* Tue Apr 16 2024 Raúl Cumplido <raulcumplido@gmail.com> - 16.0.0-1
+- New upstream release.
+
 * Wed Mar 13 2024 Raúl Cumplido <raulcumplido@gmail.com> - 15.0.2-1
 - New upstream release.
 
diff --git a/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile b/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile
index 3c52a5663f773..8c029d87c2493 100644
--- a/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow/yum/centos-7/Dockerfile
@@ -23,6 +23,14 @@ ENV \
 
 ARG DEBUG
 
+# GH-42128
+# Switch repos to point to to vault.centos.org because Centos 7 is EOL
+RUN sed -i \
+  -e 's/^mirrorlist/#mirrorlist/' \
+  -e 's/^#baseurl/baseurl/' \
+  -e 's/mirror\.centos\.org/vault.centos.org/' \
+  /etc/yum.repos.d/*.repo
+
 RUN \
   quiet=$([ "${DEBUG}" = "yes" ] || echo "--quiet") && \
   yum update -y ${quiet} && \
diff --git a/dev/tasks/linux-packages/apache-arrow/yum/centos-8-stream/Dockerfile b/dev/tasks/linux-packages/apache-arrow/yum/centos-8-stream/Dockerfile
index acc29d3e3776c..ce0a26a0e46bb 100644
--- a/dev/tasks/linux-packages/apache-arrow/yum/centos-8-stream/Dockerfile
+++ b/dev/tasks/linux-packages/apache-arrow/yum/centos-8-stream/Dockerfile
@@ -20,6 +20,14 @@ FROM ${FROM}
 
 ARG DEBUG
 
+# GH-42128
+# Switch repos to point to to vault.centos.org because Centos Stream 8 is EOL
+RUN sed -i \
+  -e 's/^mirrorlist/#mirrorlist/' \
+  -e 's/^#baseurl/baseurl/' \
+  -e 's/mirror\.centos\.org/vault.centos.org/' \
+  /etc/yum.repos.d/*.repo
+
 RUN \
   quiet=$([ "${DEBUG}" = "yes" ] || echo "--quiet") && \
   dnf install -y ${quiet} epel-release && \
diff --git a/dev/tasks/linux-packages/github.linux.yml b/dev/tasks/linux-packages/github.linux.yml
index 6de3edfce07e1..9e24835b8b627 100644
--- a/dev/tasks/linux-packages/github.linux.yml
+++ b/dev/tasks/linux-packages/github.linux.yml
@@ -29,6 +29,7 @@ jobs:
     {% endif %}
     env:
       ARCHITECTURE: {{ architecture }}
+      ARCHERY_USE_DOCKER_CLI: {{ '0' if architecture == 'arm64' else '1' }}
     steps:
       {{ macros.github_checkout_arrow()|indent }}
       {{ macros.github_login_dockerhub()|indent }}
diff --git a/dev/tasks/linux-packages/package-task.rb b/dev/tasks/linux-packages/package-task.rb
index 3a9e5e48b4585..6bcc397277e3a 100644
--- a/dev/tasks/linux-packages/package-task.rb
+++ b/dev/tasks/linux-packages/package-task.rb
@@ -267,8 +267,6 @@ def apt_targets_default
     # Disable arm64 targets by default for now
     # because they require some setups on host.
     [
-      "debian-bullseye",
-      # "debian-bullseye-arm64",
       "debian-bookworm",
       # "debian-bookworm-arm64",
       "debian-trixie",
diff --git a/dev/tasks/macros.jinja b/dev/tasks/macros.jinja
index bcafe53066ef8..b225109050aae 100644
--- a/dev/tasks/macros.jinja
+++ b/dev/tasks/macros.jinja
@@ -23,6 +23,10 @@ on:
   push:
     branches:
       - "*-github-*"
+
+env:
+  ARCHERY_DEBUG: 1
+  ARCHERY_USE_DOCKER_CLI: 1
 {% endmacro %}
 
 {%- macro github_checkout_arrow(fetch_depth=1, submodules="recursive", action_v="4") -%}
@@ -55,7 +59,8 @@ on:
 
 {%- macro github_install_archery() -%}
   - name: Set up Python by actions/setup-python
-    if: runner.arch == 'X64'
+    if: |
+      !(runner.os == 'Linux' && runner.arch != 'X64')
     uses: actions/setup-python@v4
     with:
       cache: 'pip'
@@ -82,7 +87,8 @@ on:
 
 {%- macro github_upload_releases(pattern) -%}
   - name: Set up Python by actions/setup-python
-    if: runner.arch == 'X64'
+    if: |
+      !(runner.os == 'Linux' && runner.arch != 'X64')
     uses: actions/setup-python@v4
     with:
       python-version: 3.12
@@ -214,15 +220,12 @@ on:
 
 {%- macro azure_upload_anaconda(pattern) -%}
   {%- if arrow.is_default_branch() -%}
-  - task: CondaEnvironment@1
-    inputs:
-      packageSpecs: 'anaconda-client'
-      installOptions: '-c conda-forge'
-      updateConda: no
-  - script: |
-      conda install -y anaconda-client
+  - bash: |
+      conda create -y -n azure_upload_anaconda -c conda-forge anaconda-client
+      source activate azure_upload_anaconda
       anaconda -t $(CROSSBOW_ANACONDA_TOKEN) upload --force {{ pattern }}
     displayName: Upload packages to Anaconda
+
   {% endif %}
 {% endmacro %}
 
@@ -401,4 +404,3 @@ on:
   {{ key }}: "{{ value }}"
   {% endfor %}
 {% endmacro %}
-
diff --git a/dev/tasks/matlab/github.yml b/dev/tasks/matlab/github.yml
new file mode 100644
index 0000000000000..73dd9b6d1a7a8
--- /dev/null
+++ b/dev/tasks/matlab/github.yml
@@ -0,0 +1,159 @@
+# 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.
+
+{% import 'macros.jinja' as macros with context %}
+
+{{ macros.github_header() }}
+
+jobs:
+
+  ubuntu:
+    name: AMD64 Ubuntu 20.04 MATLAB
+    runs-on: ubuntu-20.04
+    steps:
+      {{ macros.github_checkout_arrow()|indent }}
+      - name: Install ninja-build
+        run: sudo apt-get update && sudo apt-get install ninja-build
+      - name: Install MATLAB
+        uses: matlab-actions/setup-matlab@v2
+        with:
+          release: R2024a
+      - name: Build MATLAB Interface
+        env:
+        {{ macros.github_set_sccache_envvars()|indent(8) }}
+        run: arrow/ci/scripts/matlab_build.sh $(pwd)/arrow
+      - name: Change shared library dependency name
+        # MATLAB's programmatic packaging interface does not properly 
+        # include symbolic link files in the package MLTBX - this is a
+        # bug. As a temporary workaround, change the expected name of the 
+        # Arrow C++ library which libarrowproxy.so depends on. For example,
+        # change libarrow.so.1500 to libarrow.so.1500.0.0.
+        run: |
+          pushd arrow/matlab/install/arrow_matlab/+libmexclass/+proxy/ 
+          SYMLINK_ARROW_LIB="$(find . -name 'libarrow.so.*' -type l | xargs basename)"
+          REGULAR_ARROW_LIB="$(echo libarrow.so.*.*)"
+          echo "SYMLINK_ARROW_LIB = ${SYMLINK_ARROW_LIB}"
+          echo "REGULAR_ARROW_LIB = ${REGULAR_ARROW_LIB}"
+          patchelf --replace-needed $SYMLINK_ARROW_LIB $REGULAR_ARROW_LIB libarrowproxy.so
+          popd
+      - name: Compress into single artifact
+        run: tar -cvzf matlab-arrow-ubuntu.tar.gz arrow/matlab/install/arrow_matlab
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: matlab-arrow-ubuntu.tar.gz
+          path: matlab-arrow-ubuntu.tar.gz
+
+  macos:
+    name:  {{ '${{ matrix.platform.architecture}}' }}  macOS {{ '${{ matrix.platform.macos-version }}' }} MATLAB
+    runs-on: macos-{{ '${{ matrix.platform.macos-version }}' }}
+    strategy:
+      matrix:
+        platform:
+            - { architecture: "AMD64", macos-version: "12", architecture-suffix: "x64"}
+            - { architecture: "ARM64", macos-version: "14", architecture-suffix: "arm64"}
+    steps:
+      {{ macros.github_checkout_arrow()|indent }}
+      - name: Install ninja-build
+        run: brew install ninja
+      - name: Install MATLAB
+        uses: matlab-actions/setup-matlab@v2
+        with:
+          release: R2024a
+      - name: Build MATLAB Interface
+        env:
+        {{ macros.github_set_sccache_envvars()|indent(8) }}
+        run: arrow/ci/scripts/matlab_build.sh $(pwd)/arrow
+      - name: Update dynamic library names
+        run: |
+          arrow/dev/tasks/matlab/rename_macos_dynamic_libraries.sh \
+            arrow/matlab/install/arrow_matlab/+libmexclass/+proxy \
+            {{ '${{ matrix.platform.architecture-suffix }}' }}
+      - name: Compress into single artifact
+        run: tar -cvzf matlab-arrow-macos-{{ '${{ matrix.platform.architecture-suffix }}' }}.tar.gz arrow/matlab/install/arrow_matlab
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: matlab-arrow-macos-{{ '${{ matrix.platform.architecture-suffix }}' }}.tar.gz
+          path: matlab-arrow-macos-{{ '${{ matrix.platform.architecture-suffix }}' }}.tar.gz
+
+  windows:
+    name: AMD64 Windows 2022 MATLAB
+    runs-on: windows-2022
+    steps:
+      {{ macros.github_checkout_arrow()|indent }}
+      - name: Install MATLAB
+        uses: matlab-actions/setup-matlab@v2
+        with:
+          release: R2024a
+      - name: Install sccache
+        shell: bash
+        run: arrow/ci/scripts/install_sccache.sh pc-windows-msvc $(pwd)/sccache
+      - name: Build MATLAB Interface
+        shell: cmd
+        env:
+        {{ macros.github_set_sccache_envvars()|indent(8) }}
+        run: |
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+          bash -c "arrow/ci/scripts/matlab_build.sh $(pwd)/arrow"
+      - name: Compress into single artifact
+        shell: bash
+        run: tar -cvzf matlab-arrow-windows.tar.gz arrow/matlab/install/arrow_matlab
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: matlab-arrow-windows.tar.gz
+          path: matlab-arrow-windows.tar.gz
+
+  package-mltbx:
+    name: Package MATLAB Toolbox (MLTBX) Files
+    runs-on: ubuntu-latest
+    needs:
+      - ubuntu
+      - macos
+      - windows
+    steps:
+      {{ macros.github_checkout_arrow(fetch_depth=0)|indent }}
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts-downloaded
+      - name: Decompress Artifacts
+        run: |
+          mv artifacts-downloaded/*/*.tar.gz .
+          tar -xzvf matlab-arrow-ubuntu.tar.gz
+          tar -xzvf matlab-arrow-macos-x64.tar.gz
+          tar -xzvf matlab-arrow-macos-arm64.tar.gz
+          tar -xzvf matlab-arrow-windows.tar.gz
+      - name: Copy LICENSE.txt and NOTICE.txt for packaging 
+        run: |
+          cp arrow/LICENSE.txt arrow/matlab/install/arrow_matlab/LICENSE.txt
+          cp arrow/NOTICE.txt arrow/matlab/install/arrow_matlab/NOTICE.txt
+      - name: Install MATLAB
+        uses: matlab-actions/setup-matlab@v2
+        with:
+          release: R2024a
+      - name: Run commands
+        env:
+          MATLABPATH: arrow/matlab/tools
+          ARROW_MATLAB_TOOLBOX_FOLDER: arrow/matlab/install/arrow_matlab
+          ARROW_MATLAB_TOOLBOX_OUTPUT_FOLDER: artifacts/matlab-dist
+          ARROW_MATLAB_TOOLBOX_VERSION: {{ arrow.no_rc_version }}
+        uses: matlab-actions/run-command@v2
+        with:
+          command: packageMatlabInterface
+      {{ macros.github_upload_releases(["artifacts/matlab-dist/*.mltbx"])|indent }}
diff --git a/dev/tasks/matlab/rename_macos_dynamic_libraries.sh b/dev/tasks/matlab/rename_macos_dynamic_libraries.sh
new file mode 100755
index 0000000000000..a2a66fee0b55d
--- /dev/null
+++ b/dev/tasks/matlab/rename_macos_dynamic_libraries.sh
@@ -0,0 +1,162 @@
+#!/usr/bin/env bash
+#
+# 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.
+
+set -ex
+
+# Issue Number 1:
+#
+# MATLAB's programmatic packaging interface does not properly package symbolic links. If the
+# toolboxFolder argumented provided to the constructor of matlab.addons.toolbox.ToolboxOptions
+# contains a symbolic link, the ToolboxOptions will resolve the symbolic link and include
+# the symbolic link's target as one of the files to package instead of the link itself.
+#
+# Example:
+#
+# Suppose you had this folder structure
+#
+#        $ tree /tmp/example
+#        /tmp/example
+#        |-- regular_file.txt
+#        |-- symbolic_link -> regular_file.txt
+#
+# Passing "/tmp/example" as the toolboxFolder argument to ToolboxOptions' constructor in MATLAB
+# returns the following object:
+#
+#       >> opts = matlab.addons.toolbox.ToolboxOptions("/tmp/example", "dummy-identifier");
+#       >> opts.ToolboxFiles
+#
+#       ans =
+#
+#            "/private/tmp/example/regular_file.txt"
+#
+# Note that the ToolboxFiles property - the list of files to package - does not include the
+# symbolic link.
+#
+# This is a known limitation with matlab.addons.toolbox.ToolboxOptions.
+#
+# Why is this a problem?
+#
+# On macOS, building the Arrow C++ bindings generates the following files:
+#
+#        $ tree arrow/matlab/install/arrow_matlab/+libmexclass/+proxy/
+#        .
+#        |-- libarrow.1700.0.0.dylib
+#        |-- libarrow.1700.dylib -> libarrow.1700.0.0.dylib
+#        |-- libarrow.dylib -> libarrow.1700.dylib
+#
+# When "arrow/matlab/install/arrow_matlab" is suppplied as the toolboxFolder argument
+# to the constructor of ToolboxOptions, only the libarrow.1700.0.0.dylib is included as a file
+# to package. This is a problem because building the MATLAB interface to Arrow creates a shared
+# library called libarrowproxy.dylib, which is linked against libarrow.1700.dylib - not
+# libarrow.1700.0.0.dyblib.
+#
+# This can be seen by calling otool with the -L flag on libarrowproxy.dylib:
+#
+#        $ otool -L libarrowproxy.dylib | grep -E '@rpath/libarrow\.'
+#	            @rpath/libarrow.1700.dylib
+#
+# To prevent a run-time linker error, we need to update the name of libarrowproxy.dylib's
+# dependent shared library from @rpath/libarrow.1700.dylib to @rpath/libarrow.1700.0.0.dylib
+# because only libarrow.1700.0.0.dylib is packaged.
+#
+# ==============================================================================================
+#
+# Issue Number 2:
+#
+# The platforms that the MATLAB Interface to Arrow supports Windows, Linux,
+# Intel/AMD-based macOS and ARM-based macOS. Currently, we create one "monolithic" MLTBX file
+# to package the interface that includes all shared libraries for all supported platforms.
+# We do this because the File Exchange <-> GitHub Release integration does not support
+# platform-specific MLTBX files.
+#
+# The problem with creating one MLTBX to package the interface for all platforms is that
+# the names of the shared libraries built by the interface for Intel/AMD-based macOS
+# and ARM-based macOS are identical.For example, building the interface generates the shared
+# library libarrow.1700.0.0.dylib on both platforms. To avoid this duplicate name problem,
+# we need to uniquify the names of the shared libraries generated for Intel/AMD-based
+# macOS and ARM-based macOS.
+
+if [ "$#" -ne 2 ]; then
+  echo "Usage: $0 <dylib-dir> <arch>"
+  exit 1
+fi
+
+DYLIB_DIR=${1}
+ARCH=${2}
+
+if [ "$ARCH" == "arm64" ]; then
+  IS_ARM64=1
+elif [ "$ARCH" == "x64" ]; then
+  IS_ARM64=0
+else
+  echo "<arch> must be arm64 or x64"
+  exit 1
+fi
+
+pushd ${DYLIB_DIR}
+
+LIBARROW_DYLIB="$(find . -name 'libarrow.dylib' | xargs basename)"
+LIBARROW_MAJOR_DYLIB="$(find . -name 'libarrow.*.dylib' -type l | xargs basename)"
+LIBARROW_MAJOR_MINOR_PATCH_DYLIB="$(echo libarrow.*.*.dylib)"
+LIBMEXCLASS_DYLIB="$(find . -name 'libmexclass.dylib' | xargs basename)"
+LIBARROWPROXY_DYLIB="$(find . -name 'libarrowproxy.dylib' | xargs basename)"
+if [ $IS_ARM64 -eq 1 ]; then
+  MEX_GATEWAY="$(find . -name 'gateway.mexmaca64' | xargs basename)"
+else
+  MEX_GATEWAY="$(find . -name 'gateway.mexmaci64' | xargs basename)"
+fi
+
+MAJOR_MINOR_PATCH_VERSION=${LIBARROW_MAJOR_MINOR_PATCH_DYLIB#*.}
+MAJOR_MINOR_PATCH_VERSION=${MAJOR_MINOR_PATCH_VERSION%.*}
+
+LIBARROW_ARCH_MAJOR_MINOR_PATCH_DYLIB="libarrow_${ARCH}.${MAJOR_MINOR_PATCH_VERSION}.dylib"
+LIBARROWPROXY_ARCH_DYLIB="libarrowproxy_${ARCH}.dylib"
+LIBMEXCLASS_ARCH_DYLIB="libmexclass_${ARCH}.dylib"
+
+# Delete the symbolic links. These files are not included in the packaged MLTBX file. 
+rm ${LIBARROW_MAJOR_DYLIB}
+rm ${LIBARROW_DYLIB}
+
+# Rename libarrow.*.*.*.dylib to libarrow_(arm64|x64).*.*.*.dylib (e.g. libarrow.1700.0.0.dylib -> libarrow_(arm64|x64).1700.0.0.dylib)
+mv ${LIBARROW_MAJOR_MINOR_PATCH_DYLIB} ${LIBARROW_ARCH_MAJOR_MINOR_PATCH_DYLIB}
+
+# Rename libarrowproxy.dylib to libarrowproxy_(arm64|x64).dylib
+mv ${LIBARROWPROXY_DYLIB} ${LIBARROWPROXY_ARCH_DYLIB}
+
+# Rename libmexclass.dylib to libmexclass_(arm64|x64).dylib
+mv ${LIBMEXCLASS_DYLIB} ${LIBMEXCLASS_ARCH_DYLIB}
+
+# Update the identificaton names of the renamed dynamic libraries
+install_name_tool -id @rpath/${LIBMEXCLASS_ARCH_DYLIB} ${LIBMEXCLASS_ARCH_DYLIB}
+install_name_tool -id @rpath/${LIBARROWPROXY_ARCH_DYLIB} ${LIBARROWPROXY_ARCH_DYLIB}
+install_name_tool -id @rpath/${LIBARROW_ARCH_MAJOR_MINOR_PATCH_DYLIB} ${LIBARROW_ARCH_MAJOR_MINOR_PATCH_DYLIB}
+
+# Change install name of dependent shared library libarrow.*.*.*.dylib to libarrow_arm64.*.*.*.dylib in libarrowproxy_(arm64|x64).dylib
+install_name_tool -change @rpath/${LIBARROW_MAJOR_DYLIB} @rpath/${LIBARROW_ARCH_MAJOR_MINOR_PATCH_DYLIB} ${LIBARROWPROXY_ARCH_DYLIB}
+
+# Change install name of dependent shared library libmexclass.dylib to libmexclass_(arm64|x64).*.*.*.dylib libarrowproxy_(arm64|x64).dylib
+install_name_tool -change @rpath/${LIBMEXCLASS_DYLIB} @rpath/${LIBMEXCLASS_ARCH_DYLIB} ${LIBARROWPROXY_ARCH_DYLIB}
+
+# Change install name of dependent shared library libmexclass.dylib to libmexclass_(arm64|x64).dylib in gateway.(mexmaca64|mexmaci64)
+install_name_tool -change @rpath/${LIBMEXCLASS_DYLIB} @rpath/${LIBMEXCLASS_ARCH_DYLIB} ${MEX_GATEWAY}
+
+# Change install name of dependent shared library libarrowproxy.dylib to libarrowproxy_(arm64|x64).dylib in gateway.(mexmaca64|mexmaci64)
+install_name_tool -change @rpath/${LIBARROWPROXY_DYLIB} @rpath/${LIBARROWPROXY_ARCH_DYLIB} ${MEX_GATEWAY}
+
+popd
\ No newline at end of file
diff --git a/dev/tasks/python-minimal-build/github.linux.yml b/dev/tasks/python-minimal-build/github.linux.yml
index e776312b93f95..d97968b86b362 100644
--- a/dev/tasks/python-minimal-build/github.linux.yml
+++ b/dev/tasks/python-minimal-build/github.linux.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
 {{ macros.github_set_env(env) }}
     steps:
-      {{ macros.github_checkout_arrow(submodules=false)|indent }}
+      {{ macros.github_checkout_arrow(fetch_depth=0, submodules=false)|indent }}
 
       - name: Run minimal build example
         run: |
diff --git a/dev/tasks/python-wheels/github.linux.yml b/dev/tasks/python-wheels/github.linux.yml
index 41b18684cee10..5c82bf74b30b7 100644
--- a/dev/tasks/python-wheels/github.linux.yml
+++ b/dev/tasks/python-wheels/github.linux.yml
@@ -31,8 +31,10 @@ jobs:
       # archery uses these environment variables
       {% if arch == "amd64" %}
       ARCH: amd64
+      ARCHERY_USE_DOCKER_CLI: 1
       {% else %}
       ARCH: arm64v8
+      ARCHERY_USE_DOCKER_CLI: 0
       {% endif %}
       PYTHON: "{{ python_version }}"
 
@@ -65,6 +67,7 @@ jobs:
           ALMALINUX: "8"
         run: |
           archery docker run \
+            -e ARROW_GANDIVA=OFF \
             -e TEST_DEFAULT=0 \
             -e TEST_PYARROW_VERSION={{ arrow.no_rc_version }} \
             -e TEST_PYTHON_VERSIONS={{ python_version }} \
diff --git a/dev/tasks/python-wheels/github.osx.yml b/dev/tasks/python-wheels/github.osx.yml
index e7b6d7898103b..ce9613545eb54 100644
--- a/dev/tasks/python-wheels/github.osx.yml
+++ b/dev/tasks/python-wheels/github.osx.yml
@@ -17,8 +17,7 @@
 {% import 'macros.jinja' as macros with context %}
 
 {{ macros.github_header() }}
-
-env:
+# env: is generated by macros.github_header()
   ARROW_JEMALLOC: "{{ arrow_jemalloc }}"
   CC: "clang"
   CMAKE_BUILD_TYPE: release
@@ -51,6 +50,14 @@ jobs:
         run: |
           brew list
 
+      # CMake 3.29.1 that is pre-installed on the macOS image has a problem.
+      # See also: https://github.com/microsoft/vcpkg/issues/37968
+      - name: Install CMake 3.29.0
+        shell: bash
+        run: |
+          arrow/ci/scripts/install_cmake.sh $(arch) macos 3.29.0 ${PWD}/local
+          echo "${PWD}/local/bin" >> $GITHUB_PATH
+
       - name: Retrieve VCPKG version from arrow/.env
         run: |
           vcpkg_version=$(cat "arrow/.env" | grep "VCPKG" | cut -d "=" -f2 | tr -d '"')
diff --git a/dev/tasks/r/azure.linux.yml b/dev/tasks/r/azure.linux.yml
index e26a59629fa1a..28893a81728c3 100644
--- a/dev/tasks/r/azure.linux.yml
+++ b/dev/tasks/r/azure.linux.yml
@@ -38,7 +38,6 @@ jobs:
       export R_ORG={{ r_org }}
       export R_IMAGE={{ r_image }}
       export R_TAG={{ r_tag }}
-      export DEVTOOLSET_VERSION={{ devtoolset_version|default("") }}
       export R_CUSTOM_CCACHE={{ r_custom_ccache|default("false") }}
       docker-compose pull --ignore-pull-failures r
       docker-compose build r
diff --git a/dev/tasks/r/github.linux.arrow.version.back.compat.yml b/dev/tasks/r/github.linux.arrow.version.back.compat.yml
index 804f0d2127059..086705dbb9cf4 100644
--- a/dev/tasks/r/github.linux.arrow.version.back.compat.yml
+++ b/dev/tasks/r/github.linux.arrow.version.back.compat.yml
@@ -73,6 +73,8 @@ jobs:
         config:
         # We use the R version that was released at the time of the arrow release in order
         # to make sure we can download binaries from RSPM.
+        - { old_arrow_version: '14.0.2.1', r: '4.3' }
+        - { old_arrow_version: '13.0.0.1', r: '4.3' }
         - { old_arrow_version: '12.0.1.1', r: '4.3' }
         - { old_arrow_version: '11.0.0.3', r: '4.2' }
         - { old_arrow_version: '10.0.1', r: '4.2' }
diff --git a/dev/tasks/r/github.linux.cran.yml b/dev/tasks/r/github.linux.cran.yml
index 0aeb7cfa2b434..34cb4b9446a0b 100644
--- a/dev/tasks/r/github.linux.cran.yml
+++ b/dev/tasks/r/github.linux.cran.yml
@@ -28,11 +28,10 @@ jobs:
       matrix:
         # See https://hub.docker.com/r/rhub
         r_image:
-          - debian-gcc-devel
-          - debian-gcc-patched
-          - debian-gcc-release
-          - fedora-gcc-devel
-          - fedora-clang-devel
+          - ubuntu-gcc12    # ~ r-devel-linux-x86_64-debian-gcc
+          - ubuntu-clang    # ~ r-devel-linux-x86_64-debian-clang
+          - ubuntu-next     # ~ r-patched-linux-x86_64
+          - ubuntu-release  # ~ r-release-linux-x86_64
     env:
       R_ORG: "rhub"
       R_IMAGE: {{ MATRIX }}
diff --git a/dev/tasks/r/github.linux.offline.build.yml b/dev/tasks/r/github.linux.offline.build.yml
index 7a747ac480084..9ac0ebc40835e 100644
--- a/dev/tasks/r/github.linux.offline.build.yml
+++ b/dev/tasks/r/github.linux.offline.build.yml
@@ -84,7 +84,7 @@ jobs:
         {{ macros.github_set_sccache_envvars()|indent(8)}}
         run: |
           cd arrow/r
-          R CMD INSTALL --install-tests --no-test-load --no-docs --no-help --no-byte-compile arrow_with_deps.tar.gz
+          R CMD INSTALL --install-tests --no-test-load --no-byte-compile arrow_with_deps.tar.gz
       - name: Run the tests
         run: R -e 'if(tools::testInstalledPackage("arrow") != 0L) stop("There was a test failure.")'
       - name: Dump test logs
diff --git a/dev/tasks/r/github.linux.versions.yml b/dev/tasks/r/github.linux.versions.yml
index 48093e9fd5b32..753efe61d048e 100644
--- a/dev/tasks/r/github.linux.versions.yml
+++ b/dev/tasks/r/github.linux.versions.yml
@@ -30,9 +30,9 @@ jobs:
         r_version:
           # We test devel, release, and oldrel in regular CI.
           # This is for older versions
-          - "3.6"
           - "4.0"
           - "4.1"
+          - "4.2"
     env:
       R_ORG: "rstudio"
       R_IMAGE: "r-base"
diff --git a/dev/tasks/r/github.packages.yml b/dev/tasks/r/github.packages.yml
index 2979f57bb6146..0539eae6cc9d9 100644
--- a/dev/tasks/r/github.packages.yml
+++ b/dev/tasks/r/github.packages.yml
@@ -227,11 +227,20 @@ jobs:
            working-directory: 'arrow'
            extra-packages: cpp11
       - name: Set CRAN like openssl
-        if: contains(matrix.platform.runs_on, 'arm64')
+        if: contains(matrix.platform.name, 'macOS')
+        # The -E forwards the GITHUB_* envvars
+        shell: sudo -E Rscript {0}
         run: |
-          # The arm64 runners contain openssl 1.1.1t in this path that is always included first so we need to override the
-          # default setting of the brew --prefix as root dir to avoid version conflicts.
-          echo "OPENSSL_ROOT_DIR=/opt/R/arm64" >> $GITHUB_ENV
+          # get the mac-recipes version of openssl from CRAN
+          source("https://mac.R-project.org/bin/install.R") 
+          install.libs("openssl")
+
+          # override our cmakes default setting of the brew --prefix as root dir to avoid version conflicts.
+          if (Sys.info()[["machine"]] == "arm64"){
+            cat("OPENSSL_ROOT_DIR=/opt/R/arm64\n", file=Sys.getenv("GITHUB_ENV"), append = TRUE)
+          } else {
+            cat("OPENSSL_ROOT_DIR=/opt/R/x86_64\n", file=Sys.getenv("GITHUB_ENV"), append = TRUE)
+          }
       - name: Build Binary
         id: build
         shell: Rscript {0}
@@ -239,6 +248,7 @@ jobs:
           NOT_CRAN: "false" # actions/setup-r sets this implicitly
           ARROW_R_DEV: "true"
           LIBARROW_BINARY: "true" # has to be set as long as allowlist not updated
+          LIBARROW_BUILD: "false"
           ARROW_R_ENFORCE_CHECKSUM: "true"
           ARROW_R_CHECKSUM_PATH: "{{ '${{ github.workspace }}' }}/repo/libarrow/bin"
         run: |
@@ -299,17 +309,15 @@ jobs:
           # choosing a binary on this OS. If libarrow_binary is TRUE, we're on
           # an OS that is not in the allowlist, so we have to opt-in to use the
           # binary. Other env vars used in r_docker_configure.sh can be added
-          # here (like devtoolset) and wired up in the later steps.
-          - {image: "rhub/debian-clang-devel", libarrow_binary: "TRUE"}
+          # here and wired up in the later steps.
+          - {image: "rhub/ubuntu-clang", libarrow_binary: "TRUE"}
           # fedora-clang-devel cannot use binaries bc of libc++ (uncomment to see the error)
           # - {image: "rhub/fedora-clang-devel", libarrow_binary: "TRUE"}
-          - {image: "rhub/ubuntu-gcc-release"} # currently ubuntu-20.04 (focal)
-          - {image: "rocker/r-ubuntu:22.04"} # openssl3
-          - {image: "rocker/r-ver"} # whatever is latest ubuntu LTS
+          - {image: "rhub/ubuntu-release"} # currently ubuntu-22.04
           - {image: "rocker/r-ver:4.0.0"} # ubuntu-20.04
-          - {image: "rocker/r-ver:3.6.3", libarrow_binary: "TRUE"} # debian:buster (10)
-          - {image: "rstudio/r-base:4.1-focal"} # ubuntu-20.04
-          - {image: "rstudio/r-base:4.2-centos7", devtoolset: "8"}
+          - {image: "rstudio/r-base:4.1-focal"}
+          - {image: "rstudio/r-base:4.2-jammy"}
+          - {image: "rstudio/r-base:4.3-noble"}
     steps:
       # Get the arrow checkout just for the docker config scripts
       # Don't need submodules for this (hence false arg to macro): they fail on
@@ -319,7 +327,6 @@ jobs:
       - name: Install system requirements
         env:
           ARROW_R_DEV: "TRUE" # To install curl/openssl in r_docker_configure.sh
-          DEVTOOLSET_VERSION: {{ '${{ matrix.config.devtoolset }}' }}
         shell: bash
         run: |
           # Make sure R is on the path for the R-hub devel versions (where RPREFIX is set in its dockerfile)
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 2abfbc15174df..61df283960ccf 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -59,12 +59,13 @@ groups:
     - conan-*
     - debian-*
     - java-jars
+    - matlab
     - nuget
     - python-sdist
     - r-binary-packages
     - ubuntu-*
     - wheel-*
-    - test-ubuntu-*-docs
+    - test-debian-*-docs
 
 {############################# Testing tasks #################################}
 
@@ -79,6 +80,7 @@ groups:
 
   java:
     - "*java*"
+    - test-*spark*
 
   python:
     - test-*python*
@@ -407,7 +409,7 @@ tasks:
       arrow_jemalloc: "ON"
       python_version: "{{ python_version }}"
       macos_deployment_target: "{{ macos_version }}"
-      runs_on: "macos-latest"
+      runs_on: "macos-13"
       vcpkg_arch: "amd64"
     artifacts:
       - pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-{{ platform_tag }}.whl
@@ -449,8 +451,7 @@ tasks:
 
 {############################## Linux PKGS ####################################}
 
-{% for target in ["debian-bullseye",
-                  "debian-bookworm",
+{% for target in ["debian-bookworm",
                   "debian-trixie",
                   "ubuntu-focal",
                   "ubuntu-jammy",
@@ -491,59 +492,59 @@ tasks:
       - gir1.2-gandiva-1.0_{no_rc_version}-1_[a-z0-9]+.deb
       - gir1.2-parquet-1.0_{no_rc_version}-1_[a-z0-9]+.deb
       - libarrow-acero-dev_{no_rc_version}-1_[a-z0-9]+.deb
-      - libarrow-acero1600-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
-      - libarrow-acero1600_{no_rc_version}-1_[a-z0-9]+.deb
+      - libarrow-acero1700-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
+      - libarrow-acero1700_{no_rc_version}-1_[a-z0-9]+.deb
       - libarrow-dataset-dev_{no_rc_version}-1_[a-z0-9]+.deb
       - libarrow-dataset-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
       - libarrow-dataset-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
-      - libarrow-dataset-glib1600-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
-      - libarrow-dataset-glib1600_{no_rc_version}-1_[a-z0-9]+.deb
-      - libarrow-dataset1600-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
-      - libarrow-dataset1600_{no_rc_version}-1_[a-z0-9]+.deb
+      - libarrow-dataset-glib1700-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
+      - libarrow-dataset-glib1700_{no_rc_version}-1_[a-z0-9]+.deb
+      - libarrow-dataset1700-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
+      - libarrow-dataset1700_{no_rc_version}-1_[a-z0-9]+.deb
       - libarrow-dev_{no_rc_version}-1_[a-z0-9]+.deb
       - libarrow-flight-dev_{no_rc_version}-1_[a-z0-9]+.deb
       - libarrow-flight-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
       - libarrow-flight-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
-      - libarrow-flight-glib1600-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
-      - libarrow-flight-glib1600_{no_rc_version}-1_[a-z0-9]+.deb
+      - libarrow-flight-glib1700-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
+      - libarrow-flight-glib1700_{no_rc_version}-1_[a-z0-9]+.deb
       - libarrow-flight-sql-dev_{no_rc_version}-1_[a-z0-9]+.deb
       - libarrow-flight-sql-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
       - libarrow-flight-sql-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
-      - libarrow-flight-sql-glib1600-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
-      - libarrow-flight-sql-glib1600_{no_rc_version}-1_[a-z0-9]+.deb
-      - libarrow-flight-sql1600-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
-      - libarrow-flight-sql1600_{no_rc_version}-1_[a-z0-9]+.deb
-      - libarrow-flight1600-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
-      - libarrow-flight1600_{no_rc_version}-1_[a-z0-9]+.deb
+      - libarrow-flight-sql-glib1700-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
+      - libarrow-flight-sql-glib1700_{no_rc_version}-1_[a-z0-9]+.deb
+      - libarrow-flight-sql1700-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
+      - libarrow-flight-sql1700_{no_rc_version}-1_[a-z0-9]+.deb
+      - libarrow-flight1700-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
+      - libarrow-flight1700_{no_rc_version}-1_[a-z0-9]+.deb
       - libarrow-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
       - libarrow-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
-      - libarrow-glib1600-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
-      - libarrow-glib1600_{no_rc_version}-1_[a-z0-9]+.deb
-      - libarrow1600-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
-      - libarrow1600_{no_rc_version}-1_[a-z0-9]+.deb
+      - libarrow-glib1700-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
+      - libarrow-glib1700_{no_rc_version}-1_[a-z0-9]+.deb
+      - libarrow1700-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
+      - libarrow1700_{no_rc_version}-1_[a-z0-9]+.deb
       - libgandiva-dev_{no_rc_version}-1_[a-z0-9]+.deb
       - libgandiva-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
       - libgandiva-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
-      - libgandiva-glib1600-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
-      - libgandiva-glib1600_{no_rc_version}-1_[a-z0-9]+.deb
-      - libgandiva1600-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
-      - libgandiva1600_{no_rc_version}-1_[a-z0-9]+.deb
+      - libgandiva-glib1700-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
+      - libgandiva-glib1700_{no_rc_version}-1_[a-z0-9]+.deb
+      - libgandiva1700-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
+      - libgandiva1700_{no_rc_version}-1_[a-z0-9]+.deb
       - libparquet-dev_{no_rc_version}-1_[a-z0-9]+.deb
       - libparquet-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
       - libparquet-glib-doc_{no_rc_version}-1_[a-z0-9]+.deb
-      - libparquet-glib1600-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
-      - libparquet-glib1600_{no_rc_version}-1_[a-z0-9]+.deb
-      - libparquet1600-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
-      - libparquet1600_{no_rc_version}-1_[a-z0-9]+.deb
+      - libparquet-glib1700-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
+      - libparquet-glib1700_{no_rc_version}-1_[a-z0-9]+.deb
+      - libparquet1700-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
+      - libparquet1700_{no_rc_version}-1_[a-z0-9]+.deb
       - parquet-tools_{no_rc_version}-1_[a-z0-9]+.deb
     {% if architecture == "amd64" %}
       - gir1.2-arrow-cuda-1.0_{no_rc_version}-1_[a-z0-9]+.deb
       - libarrow-cuda-dev_{no_rc_version}-1_[a-z0-9]+.deb
       - libarrow-cuda-glib-dev_{no_rc_version}-1_[a-z0-9]+.deb
-      - libarrow-cuda-glib1600-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
-      - libarrow-cuda-glib1600_{no_rc_version}-1_[a-z0-9]+.deb
-      - libarrow-cuda1600-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
-      - libarrow-cuda1600_{no_rc_version}-1_[a-z0-9]+.deb
+      - libarrow-cuda-glib1700-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
+      - libarrow-cuda-glib1700_{no_rc_version}-1_[a-z0-9]+.deb
+      - libarrow-cuda1700-dbgsym_{no_rc_version}-1_[a-z0-9]+.d?deb
+      - libarrow-cuda1700_{no_rc_version}-1_[a-z0-9]+.deb
     {% endif %}
   {% endfor %}
 {% endfor %}
@@ -665,6 +666,14 @@ tasks:
     params:
       formula: apache-arrow.rb
 
+  ############################## MATLAB Packages ################################
+
+  matlab:
+    ci: github
+    template: matlab/github.yml
+    artifacts:
+      - matlab-arrow-{no_rc_version}.mltbx
+
   ############################## Arrow JAR's ##################################
 
   java-jars:
@@ -738,7 +747,6 @@ tasks:
       - arrow-jdbc-{no_rc_snapshot_version}.pom
       - arrow-maven-plugins-{no_rc_snapshot_version}-cyclonedx.json
       - arrow-maven-plugins-{no_rc_snapshot_version}-cyclonedx.xml
-      - arrow-maven-plugins-{no_rc_snapshot_version}-src.zip
       - arrow-maven-plugins-{no_rc_snapshot_version}.pom
       - arrow-memory-core-{no_rc_snapshot_version}-cyclonedx.json
       - arrow-memory-core-{no_rc_snapshot_version}-cyclonedx.xml
@@ -842,7 +850,6 @@ tasks:
       - module-info-compiler-maven-plugin-{no_rc_snapshot_version}-cyclonedx.xml
       - module-info-compiler-maven-plugin-{no_rc_snapshot_version}-javadoc.jar
       - module-info-compiler-maven-plugin-{no_rc_snapshot_version}-sources.jar
-      - module-info-compiler-maven-plugin-{no_rc_snapshot_version}-src.zip
       - module-info-compiler-maven-plugin-{no_rc_snapshot_version}.jar
       - module-info-compiler-maven-plugin-{no_rc_snapshot_version}.pom
 
@@ -878,12 +885,12 @@ tasks:
       - r-lib__libarrow__bin__darwin-arm64-openssl-3.0__arrow-{no_rc_r_version}\.zip
       - r-lib__libarrow__bin__darwin-x86_64-openssl-1.1__arrow-{no_rc_r_version}\.zip
       - r-lib__libarrow__bin__darwin-x86_64-openssl-3.0__arrow-{no_rc_r_version}\.zip
+      - r-pkg__bin__windows__contrib__4.4__arrow_{no_rc_r_version}\.zip
       - r-pkg__bin__windows__contrib__4.3__arrow_{no_rc_r_version}\.zip
-      - r-pkg__bin__windows__contrib__4.2__arrow_{no_rc_r_version}\.zip
+      - r-pkg__bin__macosx__big-sur-x86_64__contrib__4.4__arrow_{no_rc_r_version}\.tgz
       - r-pkg__bin__macosx__big-sur-x86_64__contrib__4.3__arrow_{no_rc_r_version}\.tgz
-      - r-pkg__bin__macosx__contrib__4.2__arrow_{no_rc_r_version}\.tgz
+      - r-pkg__bin__macosx__big-sur-arm64__contrib__4.4__arrow_{no_rc_r_version}\.tgz
       - r-pkg__bin__macosx__big-sur-arm64__contrib__4.3__arrow_{no_rc_r_version}\.tgz
-      - r-pkg__bin__macosx__big-sur-arm64__contrib__4.2__arrow_{no_rc_r_version}\.tgz
       - r-pkg__src__contrib__arrow_{no_rc_r_version}\.tar\.gz
 
 
@@ -1039,14 +1046,13 @@ tasks:
       image: {{ image }}
 {% endfor %}
 
-  # Use azure to run valgrind tests to prevent OOM
   test-conda-cpp-valgrind:
-    ci: azure
-    template: docker-tests/azure.linux.yml
+    ci: github
+    template: docker-tests/github.linux.yml
     params:
       image: conda-cpp-valgrind
 
-{% for ubuntu_version in ["20.04", "22.04", "24.04"] %}
+{% for ubuntu_version in ["20.04", "22.04"] %}
   test-ubuntu-{{ ubuntu_version }}-cpp:
     ci: github
     template: docker-tests/github.linux.yml
@@ -1064,13 +1070,25 @@ tasks:
         UBUNTU: 20.04
       image: ubuntu-cpp-bundled
 
+  test-ubuntu-24.04-cpp:
+    ci: github
+    template: docker-tests/github.linux.yml
+    params:
+      env:
+        CLANG_TOOLS: 15
+        LLVM: 15
+        UBUNTU: 24.04
+      image: ubuntu-cpp
+
   test-ubuntu-24.04-cpp-gcc-14:
     ci: github
     template: docker-tests/github.linux.yml
     params:
       env:
-        UBUNTU: "24.04"
+        CLANG_TOOLS: 15
         GCC_VERSION: 14
+        LLVM: 15
+        UBUNTU: 24.04
       # rapidjson 1.1.0 has an error caught by gcc 14.
       # https://github.com/Tencent/rapidjson/issues/718
       flags: -e CC=gcc-14 -e CXX=g++-14 -e RapidJSON_SOURCE=BUNDLED
@@ -1081,6 +1099,7 @@ tasks:
     template: docker-tests/github.linux.yml
     params:
       env:
+        ARCHERY_USE_DOCKER_CLI: 0
         UBUNTU: 20.04
       flags: -e ARROW_SKYHOOK=ON
       image: ubuntu-cpp
@@ -1155,6 +1174,14 @@ tasks:
       flags: "-e ARROW_CSV=ON -e ARROW_PARQUET=ON"
       image: ubuntu-cpp-minimal
 
+  test-ubuntu-22.04-cpp-emscripten:
+    ci: github
+    template: docker-tests/github.linux.yml
+    params:
+      env:
+        UBUNTU: 22.04
+      image: ubuntu-cpp-emscripten
+
 {% for python_version in ["3.8", "3.9", "3.10", "3.11", "3.12"] %}
   test-conda-python-{{ python_version }}:
     ci: github
@@ -1196,8 +1223,8 @@ tasks:
       image: conda-python-cython2
 
   test-debian-12-python-3-amd64:
-    ci: azure
-    template: docker-tests/azure.linux.yml
+    ci: github
+    template: docker-tests/github.linux.yml
     params:
       env:
         DEBIAN: 12
@@ -1214,8 +1241,8 @@ tasks:
       image: debian-python
 
   test-ubuntu-20.04-python-3:
-    ci: azure
-    template: docker-tests/azure.linux.yml
+    ci: github
+    template: docker-tests/github.linux.yml
     params:
       env:
         UBUNTU: 20.04
@@ -1230,16 +1257,16 @@ tasks:
       image: ubuntu-python
 
   test-fedora-39-python-3:
-    ci: azure
-    template: docker-tests/azure.linux.yml
+    ci: github
+    template: docker-tests/github.linux.yml
     params:
       env:
         FEDORA: 39
       image: fedora-python
 
   test-r-linux-valgrind:
-    ci: azure
-    template: docker-tests/azure.linux.yml
+    ci: github
+    template: docker-tests/github.linux.yml
     params:
       env:
         ARROW_R_DEV: "TRUE"
@@ -1326,10 +1353,10 @@ tasks:
       r_tag: latest
       r_custom_ccache: true
 
-{% for r_org, r_image, r_tag in [("rhub", "ubuntu-gcc-release", "latest"),
+{% for r_org, r_image, r_tag in [("rhub", "ubuntu-release", "latest"),
                                  ("rocker", "r-ver", "latest"),
                                  ("rstudio", "r-base", "4.2-focal"),
-                                 ("rstudio", "r-base", "4.1-opensuse153")] %}
+                                 ("rstudio", "r-base", "4.1-opensuse155")] %}
   test-r-{{ r_org }}-{{ r_image }}-{{ r_tag }}:
     ci: azure
     template: r/azure.linux.yml
@@ -1347,9 +1374,9 @@ tasks:
     template: r/azure.linux.yml
     params:
       r_org: rhub
-      r_image: debian-gcc-devel-lto
+      r_image: gcc13
       r_tag: latest
-      flags: '-e NOT_CRAN=false -e INSTALL_ARGS=--use-LTO'
+      flags: '-e INSTALL_ARGS=--use-LTO'
 
   # This one has -flto=auto
   test-r-ubuntu-22.04:
@@ -1381,15 +1408,6 @@ tasks:
         GCC_VERSION: 12
       image: ubuntu-r-only-r
 
-  test-r-rstudio-r-base-4.2-centos7-devtoolset-8:
-    ci: azure
-    template: r/azure.linux.yml
-    params:
-      r_org: rstudio
-      r_image: r-base
-      r_tag: 4.2-centos7
-      devtoolset_version: 8
-
   test-r-minimal-build:
     ci: azure
     template: r/azure.linux.yml
@@ -1400,25 +1418,25 @@ tasks:
       flags: "-e LIBARROW_MINIMAL=TRUE"
 
   test-ubuntu-r-sanitizer:
-    ci: azure
-    template: docker-tests/azure.linux.yml
+    ci: github
+    template: docker-tests/github.linux.yml
     params:
       env:
         R_PRUNE_DEPS: TRUE
       image: ubuntu-r-sanitizer
 
-  test-fedora-r-clang-sanitizer:
-    ci: azure
-    template: docker-tests/azure.linux.yml
+  test-r-clang-sanitizer:
+    ci: github
+    template: docker-tests/github.linux.yml
     params:
       env:
         R_PRUNE_DEPS: TRUE
-      image: fedora-r-clang-sanitizer
+      image: r-clang-sanitizer
 
   {% for go_version, staticcheck in [("1.21", "v0.4.7"), ("1.22", "latest")] %}
   test-debian-12-go-{{ go_version }}:
-    ci: azure
-    template: docker-tests/azure.linux.yml
+    ci: github
+    template: docker-tests/github.linux.yml
     params:
       env:
         DEBIAN: 12
@@ -1428,15 +1446,15 @@ tasks:
   {% endfor %}
 
   # be sure to update binary-task.rb when upgrading ubuntu
-  test-ubuntu-22.04-docs:
+  test-debian-12-docs:
     ci: github
     template: docs/github.linux.yml
     params:
       env:
-        UBUNTU: 22.04
+        JDK: 17
       pr_number: Unset
       flags: "-v $PWD/build/:/build/"
-      image: ubuntu-docs
+      image: debian-docs
       publish: false
     artifacts:
       - docs.tar.gz
@@ -1447,12 +1465,16 @@ tasks:
     ci: github
     template: docker-tests/github.cuda.yml
     params:
+      env:
+        ARCHERY_USE_DOCKER_CLI: 0
       image: ubuntu-cuda-cpp
 
   test-cuda-python:
     ci: github
     template: docker-tests/github.cuda.yml
     params:
+      env:
+        ARCHERY_USE_DOCKER_CLI: 0
       image: ubuntu-cuda-python
 
   ############################## Fuzz tests #################################
@@ -1472,10 +1494,11 @@ tasks:
 
 {% for python_version, pandas_version, numpy_version, cache_leaf in [("3.8", "1.0", "1.19", True),
                                                                      ("3.9", "latest", "latest", False),
+                                                                     ("3.10", "latest", "1.26", False),
                                                                      ("3.10", "latest", "latest", False),
                                                                      ("3.10", "nightly", "nightly", False),
                                                                      ("3.11", "upstream_devel", "nightly", False)] %}
-  test-conda-python-{{ python_version }}-pandas-{{ pandas_version }}:
+  test-conda-python-{{ python_version }}-pandas-{{ pandas_version }}-numpy-{{ numpy_version }}:
     ci: github
     template: docker-tests/github.linux.yml
     params:
@@ -1513,8 +1536,9 @@ tasks:
     template: docker-tests/github.linux.yml
     params:
       env:
-        PYTHON: "3.10"
+        ARCHERY_USE_DOCKER_CLI: 0
         HDFS: "{{ hdfs_version }}"
+        PYTHON: "3.10"
       image: conda-python-hdfs
 {% endfor %}
 
@@ -1559,8 +1583,8 @@ tasks:
     template: docs/github.linux.yml
     params:
       env:
-        UBUNTU: 22.04
+        JDK: 17
       pr_number: Unset
       flags: "-v $PWD/build/:/build/"
-      image: ubuntu-docs
+      image: debian-docs
       publish: true
diff --git a/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat b/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat
index 8f160ee7c4fd2..3b337bb175005 100644
--- a/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat
+++ b/dev/tasks/vcpkg-tests/cpp-build-vcpkg.bat
@@ -78,7 +78,8 @@ cmake --build . --target INSTALL --config Release || exit /B 1
 
 @rem Test Arrow C++ library
 
-ctest --output-on-failure ^
+ctest --build-config Release ^
+      --output-on-failure ^
       --parallel %NUMBER_OF_PROCESSORS% ^
       --timeout 300 || exit /B 1
 
diff --git a/dev/tasks/vcpkg-tests/github.windows.yml b/dev/tasks/vcpkg-tests/github.windows.yml
index 618c997c2527b..af12db595286f 100644
--- a/dev/tasks/vcpkg-tests/github.windows.yml
+++ b/dev/tasks/vcpkg-tests/github.windows.yml
@@ -15,14 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# NOTE: must set "Crossbow" as name to have the badge links working in the
-# github comment reports!
-name: Crossbow
+{% import 'macros.jinja' as macros with context %}
 
-on:
-  push:
-    branches:
-      - "*-github-*"
+{{ macros.github_header() }}
 
 jobs:
   test-vcpkg-win:
@@ -31,12 +26,14 @@ jobs:
     env:
       VCPKG_BINARY_SOURCES: 'clear;nuget,GitHub,readwrite'
     steps:
-      - name: Checkout Arrow
+      {{ macros.github_checkout_arrow()|indent }}
+      # CMake 3.29.1 that is pre-installed on the Windows image has a problem.
+      # See also: https://github.com/microsoft/vcpkg/issues/37968
+      - name: Install CMake 3.29.0
+        shell: bash
         run: |
-          git clone --no-checkout {{ arrow.remote }} arrow
-          git -C arrow fetch -t {{ arrow.remote }} {{ arrow.branch }}
-          git -C arrow checkout FETCH_HEAD
-          git -C arrow submodule update --init --recursive
+          arrow/ci/scripts/install_cmake.sh amd64 windows 3.29.0 /c/cmake
+          echo "c:\\cmake\\bin" >> $GITHUB_PATH
       - name: Download Timezone Database
         shell: bash
         run: arrow/ci/scripts/download_tz_database.sh
@@ -59,7 +56,7 @@ jobs:
           CALL setx PATH "%PATH%;C:\vcpkg"
       - name: Setup NuGet Credentials
         shell: bash
-        env: 
+        env:
           GITHUB_TOKEN: {{ '${{ secrets.GITHUB_TOKEN }}' }}
         run: |
           `vcpkg fetch nuget | tail -n 1` \
diff --git a/dev/tasks/verify-rc/github.linux.amd64.docker.yml b/dev/tasks/verify-rc/github.linux.amd64.docker.yml
index 65b30b5c8d4df..f2c0673314826 100644
--- a/dev/tasks/verify-rc/github.linux.amd64.docker.yml
+++ b/dev/tasks/verify-rc/github.linux.amd64.docker.yml
@@ -38,12 +38,15 @@ jobs:
         run: |
           archery docker run \
             -e VERIFY_VERSION="{{ release|default("") }}" \
+            {% if distro == 'almalinux' and target|upper == 'PYTHON' %}
+            -e ARROW_GANDIVA=OFF \
+            {% endif %}
             -e VERIFY_RC="{{ rc|default("") }}" \
             -e TEST_DEFAULT=0 \
             -e TEST_{{ target|upper }}=1 \
             {{ distro }}-verify-rc
 
-    {% if arrow.is_default_branch() %}
+    {% if arrow.is_default_branch() and distro != "conda" %}
       {{ macros.github_login_dockerhub()|indent }}
       - name: Push Docker Image
         shell: bash
diff --git a/dev/tasks/verify-rc/github.macos.yml b/dev/tasks/verify-rc/github.macos.yml
index 642cee2bb9aec..4bc3fff71b64a 100644
--- a/dev/tasks/verify-rc/github.macos.yml
+++ b/dev/tasks/verify-rc/github.macos.yml
@@ -20,8 +20,7 @@
 {{ macros.github_header() }}
 
 {% set use_conda = use_conda|default(False) %}
-
-env:
+# env: is generated by macros.github_header()
   # Current oldest supported version according to https://endoflife.date/macos
   MACOSX_DEPLOYMENT_TARGET: "10.15"
 
@@ -52,9 +51,9 @@ jobs:
           distribution: 'temurin'
           java-version: '11'
 
-      - uses: actions/setup-dotnet@v2
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
 
       - uses: actions/setup-node@v4
         with:
diff --git a/dev/test_merge_arrow_pr.py b/dev/test_merge_arrow_pr.py
index 305b08f2830bb..0067c10414c65 100755
--- a/dev/test_merge_arrow_pr.py
+++ b/dev/test_merge_arrow_pr.py
@@ -26,14 +26,17 @@
 
 FakeIssue = namedtuple('issue', ['fields'])
 FakeFields = namedtuple('fields', ['status', 'summary', 'assignee',
-                                   'components', 'fixVersions'])
+                                   'components', 'fixVersions', 'milestone'])
 FakeAssignee = namedtuple('assignee', ['displayName'])
 FakeStatus = namedtuple('status', ['name'])
 FakeComponent = namedtuple('component', ['name'])
 FakeVersion = namedtuple('version', ['name', 'raw'])
+FakeMilestone = namedtuple('milestone', ['state'])
 
 RAW_VERSION_JSON = [
     {'name': 'JS-0.4.0', 'released': False},
+    {'name': '1.0.0', 'released': False},
+    {'name': '2.0.0', 'released': False},
     {'name': '0.9.0', 'released': False},
     {'name': '0.10.0', 'released': False},
     {'name': '0.8.0', 'released': True},
@@ -50,7 +53,7 @@
 status = FakeStatus('In Progress')
 fields = FakeFields(status, 'issue summary', FakeAssignee('groundhog'),
                     [FakeComponent('C++'), FakeComponent('Format')],
-                    [])
+                    [], FakeMilestone('closed')._asdict())
 FAKE_ISSUE_1 = FakeIssue(fields)
 
 
@@ -92,6 +95,31 @@ def project_versions(self, project):
         return self._project_versions
 
 
+class FakeGitHub:
+
+    def __init__(self, issue=None, project_versions=None):
+        self._issue = issue
+        self._project_versions = project_versions
+
+    @property
+    def issue(self):
+        return self._issue.fields._asdict()
+
+    @property
+    def current_versions(self):
+        all_versions = self._project_versions or SOURCE_VERSIONS
+        return [
+            v for v in all_versions if not v.raw.get("released")
+        ] + ['0.11.0']
+
+    @property
+    def current_fix_versions(self):
+        return 'JS-0.4.0'
+
+    def project_versions(self, project):
+        return self._project_versions
+
+
 class FakeCLI:
 
     def __init__(self, responses=()):
@@ -115,11 +143,11 @@ def test_jira_fix_versions():
     fix_version = merge_arrow_pr.get_candidate_fix_version(
         issue.current_versions
     )
-    assert fix_version == '0.9.0'
+    assert fix_version == '1.0.0'
 
 
 def test_jira_fix_versions_filters_maintenance():
-    maintenance_branches = ["maint-0.9.0"]
+    maintenance_branches = ["maint-1.0.0"]
     jira = FakeJIRA(project_versions=SOURCE_VERSIONS,
                     transitions=TRANSITIONS)
 
@@ -128,13 +156,14 @@ def test_jira_fix_versions_filters_maintenance():
         issue.current_versions,
         maintenance_branches=maintenance_branches
     )
-    assert fix_version == '0.10.0'
+    assert fix_version == '2.0.0'
 
 
-def test_jira_no_suggest_patch_release():
+def test_jira_only_suggest_major_release():
     versions_json = [
         {'name': '0.9.1', 'released': False},
         {'name': '0.10.0', 'released': False},
+        {'name': '1.0.0', 'released': False},
     ]
 
     versions = [FakeVersion(raw['name'], raw) for raw in versions_json]
@@ -144,7 +173,7 @@ def test_jira_no_suggest_patch_release():
     fix_version = merge_arrow_pr.get_candidate_fix_version(
         issue.current_versions
     )
-    assert fix_version == '0.10.0'
+    assert fix_version == '1.0.0'
 
 
 def test_jira_parquet_no_suggest_non_cpp():
@@ -153,8 +182,10 @@ def test_jira_parquet_no_suggest_non_cpp():
         {'name': 'cpp-1.5.0', 'released': True},
         {'name': 'cpp-1.6.0', 'released': False},
         {'name': 'cpp-1.7.0', 'released': False},
+        {'name': 'cpp-2.0.0', 'released': False},
         {'name': '1.11.0', 'released': False},
-        {'name': '1.12.0', 'released': False}
+        {'name': '1.12.0', 'released': False},
+        {'name': '2.0.0', 'released': False}
     ]
 
     versions = [FakeVersion(raw['name'], raw)
@@ -166,7 +197,7 @@ def test_jira_parquet_no_suggest_non_cpp():
     fix_version = merge_arrow_pr.get_candidate_fix_version(
         issue.current_versions
     )
-    assert fix_version == 'cpp-1.6.0'
+    assert fix_version == 'cpp-2.0.0'
 
 
 def test_jira_invalid_issue():
@@ -219,13 +250,12 @@ def test_jira_resolve_non_mainline():
 
 def test_jira_resolve_released_fix_version():
     # ARROW-5083
-    jira = FakeJIRA(issue=FAKE_ISSUE_1,
-                    project_versions=SOURCE_VERSIONS,
-                    transitions=TRANSITIONS)
+    jira = FakeGitHub(issue=FAKE_ISSUE_1,
+                      project_versions=SOURCE_VERSIONS)
 
-    cmd = FakeCLI(responses=['0.7.0'])
+    cmd = FakeCLI(responses=['1.0.0'])
     fix_versions_json = merge_arrow_pr.prompt_for_fix_version(cmd, jira)
-    assert fix_versions_json == "0.7.0"
+    assert fix_versions_json == "1.0.0"
 
 
 def test_multiple_authors_bad_input():
@@ -256,7 +286,7 @@ def test_multiple_authors_bad_input():
 def test_jira_already_resolved():
     status = FakeStatus('Resolved')
     fields = FakeFields(status, 'issue summary', FakeAssignee('groundhog'),
-                        [FakeComponent('Java')], [])
+                        [FakeComponent('Java')], [], None)
     issue = FakeIssue(fields)
 
     jira = FakeJIRA(issue=issue,
@@ -287,7 +317,7 @@ def test_no_unset_point_release_fix_version():
     fields = FakeFields(status, 'summary', FakeAssignee('someone'),
                         [FakeComponent('Java')],
                         [FakeVersion(v, versions_json[v])
-                         for v in ['0.17.0', '0.15.1', '0.14.2']])
+                         for v in ['0.17.0', '0.15.1', '0.14.2']], None)
     issue = FakeIssue(fields)
 
     jira = FakeJIRA(
diff --git a/docker-compose.yml b/docker-compose.yml
index 9b0610fe553b5..a2a2b41c8747f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -99,7 +99,7 @@ x-with-gpus:
 x-hierarchy:
   # This section is used by the archery tool to enable building nested images,
   # so it is enough to call:
-  #   archery run debian-ruby
+  #   archery docker run debian-ruby
   # instead of a sequence of docker-compose commands:
   #   docker-compose build debian-cpp
   #   docker-compose build debian-c-glib
@@ -131,7 +131,8 @@ x-hierarchy:
   - debian-cpp:
     - debian-c-glib:
       - debian-ruby
-    - debian-python
+    - debian-python:
+      - debian-docs
   - debian-go:
     - debian-go-cgo
     - debian-go-cgo-python
@@ -145,8 +146,7 @@ x-hierarchy:
     - ubuntu-c-glib:
       - ubuntu-ruby
     - ubuntu-lint
-    - ubuntu-python:
-      - ubuntu-docs
+    - ubuntu-python
     - ubuntu-python-sdist-test
     - ubuntu-r
     - ubuntu-r-only-r
@@ -157,11 +157,12 @@ x-hierarchy:
   - ubuntu-csharp
   - ubuntu-cpp-sanitizer
   - ubuntu-cpp-thread-sanitizer
+  - ubuntu-cpp-emscripten
   - ubuntu-r-sanitizer
   - ubuntu-r-valgrind
   - ubuntu-swift
   - ubuntu-verify-rc
-  - fedora-r-clang-sanitizer
+  - r-clang-sanitizer
   - r
   - r-revdepcheck
   # helper services
@@ -285,6 +286,7 @@ services:
       <<: [*common, *ccache, *sccache, *cpp]
       ARROW_BUILD_BENCHMARKS: "ON"
       ARROW_BUILD_EXAMPLES: "ON"
+      ARROW_BUILD_OPENMP_BENCHMARKS: "ON"
       ARROW_ENABLE_TIMING_TESTS:  # inherit
       ARROW_EXTRA_ERROR_CONTEXT: "ON"
       ARROW_MIMALLOC: "ON"
@@ -652,6 +654,31 @@ services:
       ARROW_USE_TSAN: "ON"
     command: *cpp-command
 
+  ubuntu-cpp-emscripten:
+    # Usage:
+    #   docker-compose build ubuntu-cpp-emscripten
+    #   docker-compose run --rm ubuntu-cpp-emscripten
+    # Parameters:
+    #   ARCH: amd64, arm64v8, ...
+    #   UBUNTU: 22.04
+    image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cpp
+    build:
+      context: .
+      dockerfile: ci/docker/ubuntu-${UBUNTU}-cpp.dockerfile
+      cache_from:
+        - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-cpp
+      args:
+        arch: ${ARCH}
+        clang_tools: ${CLANG_TOOLS}
+        llvm: ${LLVM}
+    shm_size: *shm-size
+    volumes: *ubuntu-volumes
+    environment:
+      <<: [*common, *ccache, *sccache, *cpp]
+      ARROW_EMSCRIPTEN: "ON"
+      UBUNTU:
+    command: *cpp-command
+
   fedora-cpp:
     # Usage:
     #   docker-compose build fedora-cpp
@@ -685,10 +712,11 @@ services:
     # Usage:
     #   docker-compose run --rm conan
     # Parameters:
-    #   CONAN: gcc11, gcc11-armv7, ...
+    #   CONAN_BASE: gcc11, gcc11-armv7, ...
+    #   CONAN_VERSION: 1.62.0
     #   See https://github.com/conan-io/conan-docker-tools#readme for
     #   available images.
-    image: conanio/${CONAN}
+    image: conanio/${CONAN_BASE}:${CONAN_VERSION}
     user: root:root
     shm_size: *shm-size
     ulimits: *ulimits
@@ -698,7 +726,7 @@ services:
       - .:/arrow:delegated
     command: >-
       /bin/bash -c "
-        /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin &&
+        sudo /arrow/ci/scripts/install_sccache.sh unknown-linux-musl /usr/local/bin &&
         /arrow/ci/scripts/conan_setup.sh &&
         /arrow/ci/scripts/conan_build.sh /arrow /build"
 
@@ -1201,6 +1229,8 @@ services:
     # We should extend the list of enabled rules after adding this build to
     # the CI pipeline.
     image: ${REPO}:${ARCH}-conda-python-${PYTHON}-pandas-${PANDAS}
+    cap_add:
+      - SYS_ADMIN
     environment:
       <<: [*common, *ccache]
       ARROW_SUBSTRAIT: "ON"
@@ -1351,7 +1381,7 @@ services:
           /arrow/ci/scripts/python_build.sh /arrow /build &&
           /arrow/ci/scripts/java_jni_build.sh /arrow $${ARROW_HOME} /build /tmp/dist/java/ &&
           /arrow/ci/scripts/java_build.sh /arrow /build /tmp/dist/java &&
-          /arrow/ci/scripts/java_cdata_integration.sh /arrow /tmp/dist/java" ]
+          /arrow/ci/scripts/java_cdata_integration.sh /arrow /build" ]
 
   conda-python-cython2:
     # Usage:
@@ -1432,8 +1462,8 @@ services:
     # (including building the C++ library) on any Docker image that contains R
     #
     # Usage:
-    #   R_ORG=rhub R_IMAGE=ubuntu-gcc-release R_TAG=latest docker-compose build r
-    #   R_ORG=rhub R_IMAGE=ubuntu-gcc-release R_TAG=latest docker-compose run r
+    #   R_ORG=rhub R_IMAGE=ubuntu-release R_TAG=latest docker-compose build r
+    #   R_ORG=rhub R_IMAGE=ubuntu-release R_TAG=latest docker-compose run r
     image: ${REPO}:r-${R_ORG}-${R_IMAGE}-${R_TAG}
     build:
       context: .
@@ -1443,7 +1473,6 @@ services:
       args:
         base: ${R_ORG}/${R_IMAGE}:${R_TAG}
         r_dev: ${ARROW_R_DEV}
-        devtoolset_version: ${DEVTOOLSET_VERSION}
         tz: ${TZ}
         r_prune_deps: ${R_PRUNE_DEPS}
         r_custom_ccache: ${R_CUSTOM_CCACHE}
@@ -1455,7 +1484,6 @@ services:
       ARROW_R_DEV: ${ARROW_R_DEV}
       # To test for CRAN release, delete ^^ these two env vars so we download the Apache release
       ARROW_USE_PKG_CONFIG: "false"
-      devtoolset_version: ${DEVTOOLSET_VERSION}
     volumes:
       - .:/arrow:delegated
     command: >
@@ -1488,18 +1516,17 @@ services:
       /bin/bash -c "
         /arrow/ci/scripts/r_sanitize.sh /arrow"
 
-  fedora-r-clang-sanitizer:
-    image: ${REPO}:r-rhub-fedora-clang-devel-latest
+  r-clang-sanitizer:
+    image: ${REPO}:r-rhub-clang-devel-latest
     build:
       context: .
       dockerfile: ci/docker/linux-r.dockerfile
       cache_from:
-        - ${REPO}:r-rhub-fedora-clang-devel-latest
+        - ${REPO}:r-rhub-clang-devel-latest
       args:
-        base: rhub/fedora-clang-devel-san
+        base: rhub/clang-asan
         r_dev: ${ARROW_R_DEV}
-        devtoolset_version: ${DEVTOOLSET_VERSION}
-        r_bin: RDsan
+        r_bin: R
         tz: ${TZ}
         r_prune_deps: ${R_PRUNE_DEPS}
     shm_size: *shm-size
@@ -1538,6 +1565,7 @@ services:
       # so some build might pass without this setting, but we want to ensure that we stay to AVX2 regardless of runner.
       EXTRA_CMAKE_FLAGS: "-DARROW_RUNTIME_SIMD_LEVEL=AVX2"
       ARROW_SOURCE_HOME: "/arrow"
+      LIBARROW_DOWNLOAD: "false"
     volumes: *ubuntu-volumes
     command: >
       /bin/bash -c "
@@ -1652,7 +1680,7 @@ services:
     command: &js-command >
       /bin/bash -c "
         /arrow/ci/scripts/js_build.sh /arrow /build &&
-        /arrow/ci/scripts/js_test.sh /arrow"
+        /arrow/ci/scripts/js_test.sh /arrow /build"
 
   #################################### C# #####################################
 
@@ -1721,9 +1749,11 @@ services:
     volumes: *conda-volumes
     environment:
       <<: [*common, *ccache]
+      ARCHERY_INTEGRATION_WITH_NANOARROW: 0
       ARCHERY_INTEGRATION_WITH_RUST: 0
       # Tell Archery where Arrow binaries are located
       ARROW_CPP_EXE_PATH: /build/cpp/debug
+      ARROW_NANOARROW_PATH: /build/nanoarrow
       ARROW_RUST_EXE_PATH: /build/rust/debug
     command:
       ["/arrow/ci/scripts/integration_arrow_build.sh /arrow /build &&
@@ -1731,29 +1761,34 @@ services:
 
   ################################ Docs #######################################
 
-  ubuntu-docs:
+  debian-docs:
     # Usage:
-    #   docker-compose build ubuntu-cpp
-    #   docker-compose build ubuntu-python
-    #   docker-compose build ubuntu-docs
-    #   docker-compose run --rm ubuntu-docs
-    image: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-docs
+    #   docker-compose build debian-cpp
+    #   docker-compose build debian-python
+    #   docker-compose build debian-docs
+    #   docker-compose run --rm debian-docs
+    image: ${REPO}:${ARCH}-debian-${DEBIAN}-docs
     build:
       context: .
       dockerfile: ci/docker/linux-apt-docs.dockerfile
       cache_from:
-        - ${REPO}:${ARCH}-ubuntu-${UBUNTU}-docs
+        - ${REPO}:${ARCH}-debian-${DEBIAN}-docs
       args:
         r: ${R}
         jdk: ${JDK}
         maven: ${MAVEN}
         node: ${NODE}
-        base: ${REPO}:${ARCH}-ubuntu-${UBUNTU}-python-3
+        base: ${REPO}:${ARCH}-debian-${DEBIAN}-python-3
+    # This is for Chromium used by Mermaid. Chromium uses namespace
+    # isolation for security by default.
+    cap_add:
+      - SYS_ADMIN
     environment:
       <<: [*common, *ccache]
       ARROW_CUDA: "ON"
       ARROW_CXX_FLAGS_DEBUG: "-g1"
       ARROW_C_FLAGS_DEBUG: "-g1"
+      ARROW_HOME: "/tmp/local"
       ARROW_JAVA_SKIP_GIT_PLUGIN:
       ARROW_SUBSTRAIT: "ON"
       BUILD_DOCS_C_GLIB: "ON"
@@ -1762,9 +1797,11 @@ services:
       BUILD_DOCS_JS: "ON"
       BUILD_DOCS_PYTHON: "ON"
       BUILD_DOCS_R: "ON"
-    volumes: *ubuntu-volumes
-    command: &docs-command >
+    volumes: *debian-volumes
+    command: >
       /bin/bash -c "
+        sudo mkdir -p /build /ccache &&
+        sudo chown -R `id --user --name`: /build /ccache &&
         /arrow/ci/scripts/cpp_build.sh /arrow /build &&
         /arrow/ci/scripts/python_build.sh /arrow /build &&
         /arrow/ci/scripts/c_glib_build.sh /arrow /build &&
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 252344a74a58f..afb252e17457b 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -8,7 +8,9 @@ myst-parser[linkify]
 numpydoc
 pydata-sphinx-theme~=0.14
 sphinx-autobuild
-sphinx-design
 sphinx-copybutton
+sphinx-design
+sphinx-lint
+sphinxcontrib-mermaid
 sphinx==6.2
 pandas
diff --git a/docs/source/_static/versions.json b/docs/source/_static/versions.json
index d647709cda723..e879fc69138d0 100644
--- a/docs/source/_static/versions.json
+++ b/docs/source/_static/versions.json
@@ -1,15 +1,25 @@
 [
     {
-        "name": "16.0 (dev)",
+        "name": "17.0 (dev)",
         "version": "dev/",
         "url": "https://arrow.apache.org/docs/dev/"
     },
     {
-        "name": "15.0 (stable)",
+        "name": "16.1 (stable)",
         "version": "",
         "url": "https://arrow.apache.org/docs/",
         "preferred": true
     },
+    {
+        "name": "16.0",
+        "version": "16.0/",
+        "url": "https://arrow.apache.org/docs/16.0/"
+    },
+    {
+        "name": "15.0",
+        "version": "15.0/",
+        "url": "https://arrow.apache.org/docs/15.0/"
+    },
     {
         "name": "14.0",
         "version": "14.0/",
diff --git a/docs/source/conf.py b/docs/source/conf.py
index ad8fa798d6aac..1e6c113e33188 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -125,6 +125,7 @@
     'sphinx.ext.intersphinx',
     'sphinx.ext.mathjax',
     'sphinx.ext.viewcode',
+    'sphinxcontrib.mermaid',
 ]
 
 # Show members for classes in .. autosummary
@@ -137,7 +138,9 @@
 }
 
 # Breathe configuration
-breathe_projects = {"arrow_cpp": "../../cpp/apidoc/xml"}
+breathe_projects = {
+    "arrow_cpp": os.environ.get("ARROW_CPP_DOXYGEN_XML", "../../cpp/apidoc/xml"),
+}
 breathe_default_project = "arrow_cpp"
 
 # Overridden conditionally below
@@ -346,9 +349,9 @@
             "icon": "fa-brands fa-square-github",
         },
         {
-            "name": "Twitter",
+            "name": "X",
             "url": "https://twitter.com/ApacheArrow",
-            "icon": "fa-brands fa-square-twitter",
+            "icon": "fa-brands fa-square-x-twitter",
         },
     ],
     "show_version_warning_banner": True,
@@ -532,7 +535,7 @@
 #
 # latex_appendices = []
 
-# It false, will not define \strong, \code, 	itleref, \crossref ... but only
+# It false, will not define \strong, \code, \titleref, \crossref ... but only
 # \sphinxstrong, ..., \sphinxtitleref, ... To help avoid clash with user added
 # packages.
 #
@@ -584,6 +587,9 @@
 #
 # texinfo_no_detailmenu = False
 
+# -- Options for mermaid output -------------------------------------------
+
+mermaid_output_format = 'svg'
 
 def setup(app):
     # Use a config value to indicate whether CUDA API docs can be generated.
diff --git a/docs/source/cpp/acero/developer_guide.rst b/docs/source/cpp/acero/developer_guide.rst
index 331cd833b58af..7dd08fe3ce2ce 100644
--- a/docs/source/cpp/acero/developer_guide.rst
+++ b/docs/source/cpp/acero/developer_guide.rst
@@ -187,7 +187,7 @@ Examples
   task (described below) as completed which allows the plan to finish.
 * The ``fetch`` node, in ``InputReceived``, may decide that it has all the data it needs.  It can then call
   ``StopProducing`` on its input.
-  
+
 Initialization / Construction / Destruction
 -------------------------------------------
 
@@ -271,7 +271,7 @@ distributed systems.  Once that has been done then it should be possible to do a
 meaning exchanging between multiple exec plan instances on a single system) if desired.
 
 .. figure:: dist_plan.svg
-   
+
    A distributed plan can provide parallelism even if the plans themselves run serially
 
 Pipeline Parallelism
@@ -327,8 +327,8 @@ An engine could choose to create a thread task for every execution of a node.  H
 this leads to problems with cache locality.  For example, let's assume we have a basic plan consisting of three
 exec nodes, scan, project, and then filter (this is a very common use case).  Now let's assume there are 100 batches.
 In a task-per-operator model we would have tasks like "Scan Batch 5", "Project Batch 5", and "Filter Batch 5".  Each
-of those tasks is potentially going to access the same data.  For example, maybe the `project` and `filter` nodes need
-to read the same column.  A column which is intially created in a decode phase of the `scan` node.  To maximize cache
+of those tasks is potentially going to access the same data.  For example, maybe the ``project`` and ``filter`` nodes need
+to read the same column.  A column which is intially created in a decode phase of the ``scan`` node.  To maximize cache
 utilization we would need to carefully schedule our tasks to ensure that all three of those tasks are run consecutively
 and assigned to the same CPU core.
 
@@ -412,7 +412,7 @@ Ordered Execution
 =================
 
 Some nodes either establish an ordering to their outgoing batches or they need to be able to process batches in order.
-Acero handles ordering using the `batch_index` property on an ExecBatch.  If a node has a deterministic output order
+Acero handles ordering using the ``batch_index`` property on an ExecBatch.  If a node has a deterministic output order
 then it should apply a batch index on batches that it emits.  For example, the OrderByNode applies a new ordering to
 batches (regardless of the incoming ordering).  The scan node is able to attach an implicit ordering to batches which
 reflects the order of the rows in the files being scanned.
@@ -461,8 +461,8 @@ Acero's tracing is currently half-implemented and there are major gaps in profil
 effort at tracing with open telemetry and most of the necessary pieces are in place.  The main thing currently lacking is
 some kind of effective visualization of the tracing results.
 
-In order to use the tracing that is present today you will need to build with Arrow with `ARROW_WITH_OPENTELEMETRY=ON`.
-Then you will need to set the environment variable `ARROW_TRACING_BACKEND=otlp_http`.  This will configure open telemetry
+In order to use the tracing that is present today you will need to build with Arrow with ``ARROW_WITH_OPENTELEMETRY=ON``.
+Then you will need to set the environment variable ``ARROW_TRACING_BACKEND=otlp_http``.  This will configure open telemetry
 to export trace results (as OTLP) to the HTTP endpoint http://localhost:4318/v1/traces.  You will need to configure an
 open telemetry collector to collect results on that endpoint and you will need to configure a trace viewer of some kind
 such as Jaeger: https://www.jaegertracing.io/docs/1.21/opentelemetry/
@@ -472,7 +472,7 @@ Benchmarking
 
 The most complete macro benchmarking for Acero is provided by https://github.com/voltrondata-labs/arrowbench
 These include a set of TPC-H benchmarks, executed from the R-dplyr integration, which are run on every Arrow commit and
-reported to Conbench at https://conbench.ursa.dev/ 
+reported to Conbench at https://conbench.ursa.dev/
 
 In addition to these TPC-H benchmarks there are a number of micro-benchmarks for various nodes (hash-join, asof-join,
 etc.)  Finally, the compute functions themselves should mostly have micro-benchmarks.  For more on micro benchmarks you
diff --git a/docs/source/cpp/acero/overview.rst b/docs/source/cpp/acero/overview.rst
index c569f82b099b6..34e0b143bc2ce 100644
--- a/docs/source/cpp/acero/overview.rst
+++ b/docs/source/cpp/acero/overview.rst
@@ -206,19 +206,19 @@ is very similar to a RecordBatch.  It can have zero or more columns and all of t
 must have the same length.  There are a few key differences from ExecBatch:
 
 .. figure:: rb_vs_eb.svg
-   
+
    Both the record batch and the exec batch have strong ownership of the arrays & buffers
 
-* An `ExecBatch` does not have a schema.  This is because an `ExecBatch` is assumed to be
+* An ``ExecBatch`` does not have a schema.  This is because an ``ExecBatch`` is assumed to be
   part of a stream of batches and the stream is assumed to have a consistent schema.  So
-  the schema for an `ExecBatch` is typically stored in the ExecNode.
-* Columns in an `ExecBatch` are either an `Array` or a `Scalar`.  When a column is a `Scalar`
-  this means that the column has a single value for every row in the batch.  An `ExecBatch`
+  the schema for an ``ExecBatch`` is typically stored in the ExecNode.
+* Columns in an ``ExecBatch`` are either an ``Array`` or a ``Scalar``.  When a column is a ``Scalar``
+  this means that the column has a single value for every row in the batch.  An ``ExecBatch``
   also has a length property which describes how many rows are in a batch.  So another way to
-  view a `Scalar` is a constant array with `length` elements.
-* An `ExecBatch` contains additional information used by the exec plan.  For example, an
-  `index` can be used to describe a batch's position in an ordered stream.  We expect 
-  that `ExecBatch` will also evolve to contain additional fields such as a selection vector.
+  view a ``Scalar`` is a constant array with ``length`` elements.
+* An ``ExecBatch`` contains additional information used by the exec plan.  For example, an
+  ``index`` can be used to describe a batch's position in an ordered stream.  We expect
+  that ``ExecBatch`` will also evolve to contain additional fields such as a selection vector.
 
 .. figure:: scalar_vs_array.svg
 
@@ -231,8 +231,8 @@ only zero copy if there are no scalars in the exec batch.
 
 .. note::
    Both Acero and the compute module have "lightweight" versions of batches and arrays.
-   In the compute module these are called `BatchSpan`, `ArraySpan`, and `BufferSpan`.  In
-   Acero the concept is called `KeyColumnArray`.  These types were developed concurrently
+   In the compute module these are called ``BatchSpan``, ``ArraySpan``, and ``BufferSpan``.  In
+   Acero the concept is called ``KeyColumnArray``.  These types were developed concurrently
    and serve the same purpose.  They aim to provide an array container that can be completely
    stack allocated (provided the data type is non-nested) in order to avoid heap allocation
    overhead.  Ideally these two concepts will be merged someday.
@@ -247,9 +247,9 @@ execution of the nodes.  Both ExecPlan and ExecNode are tied to the lifecycle of
 They have state and are not expected to be restartable.
 
 .. warning::
-   The structures within Acero, including `ExecBatch`, are still experimental.  The `ExecBatch`
-   class should not be used outside of Acero.  Instead, an `ExecBatch` should be converted to
-   a more standard structure such as a `RecordBatch`.
+   The structures within Acero, including ``ExecBatch``, are still experimental.  The ``ExecBatch``
+   class should not be used outside of Acero.  Instead, an ``ExecBatch`` should be converted to
+   a more standard structure such as a ``RecordBatch``.
 
    Similarly, an ExecPlan is an internal concept.  Users creating plans should be using Declaration
    objects.  APIs for consuming and executing plans should abstract away the details of the underlying
@@ -266,5 +266,5 @@ various query representations (e.g. Substrait).  The Declaration objects are the
 with the DeclarationToXyz methods, are the current public API for Acero.
 
 .. figure:: decl_vs_ep.svg
-   
-   A declaration is a blueprint that is used to instantiate exec plan instances
\ No newline at end of file
+
+   A declaration is a blueprint that is used to instantiate exec plan instances
diff --git a/docs/source/cpp/acero/substrait.rst b/docs/source/cpp/acero/substrait.rst
index 797b2407f93cd..a5532733627c1 100644
--- a/docs/source/cpp/acero/substrait.rst
+++ b/docs/source/cpp/acero/substrait.rst
@@ -111,7 +111,7 @@ Aggregate Relations
 * Each measure's arguments must be direct references.
 * A measure may not have a filter
 * A measure may not have sorts
-* A measure's invocation must be AGGREGATION_INVOCATION_ALL or 
+* A measure's invocation must be AGGREGATION_INVOCATION_ALL or
   AGGREGATION_INVOCATION_UNSPECIFIED
 * A measure's phase must be AGGREGATION_PHASE_INITIAL_TO_RESULT
 
@@ -146,73 +146,73 @@ Types
      - Caveat
    * - boolean
      - boolean
-     - 
+     -
    * - i8
      - int8
-     - 
+     -
    * - i16
      - int16
-     - 
+     -
    * - i32
      - int32
-     - 
+     -
    * - i64
      - int64
-     - 
+     -
    * - fp32
      - float32
-     - 
+     -
    * - fp64
      - float64
-     - 
+     -
    * - string
      - string
-     - 
+     -
    * - binary
      - binary
-     - 
+     -
    * - timestamp
      - timestamp<MICRO,"">
-     - 
+     -
    * - timestamp_tz
      - timestamp<MICRO,"UTC">
-     - 
+     -
    * - date
      - date32<DAY>
-     - 
+     -
    * - time
      - time64<MICRO>
-     - 
+     -
    * - interval_year
-     - 
+     -
      - Not currently supported
    * - interval_day
-     - 
+     -
      - Not currently supported
    * - uuid
-     - 
+     -
      - Not currently supported
    * - FIXEDCHAR<L>
-     - 
+     -
      - Not currently supported
    * - VARCHAR<L>
-     - 
+     -
      - Not currently supported
    * - FIXEDBINARY<L>
      - fixed_size_binary<L>
-     - 
+     -
    * - DECIMAL<P,S>
      - decimal128<P,S>
-     - 
+     -
    * - STRUCT<T1...TN>
      - struct<T1...TN>
      - Arrow struct fields will have no name (empty string)
    * - NSTRUCT<N:T1...N:Tn>
-     - 
+     -
      - Not currently supported
    * - LIST<T>
      - list<T>
-     - 
+     -
    * - MAP<K,V>
      - map<K,V>
      - K must not be nullable
diff --git a/docs/source/cpp/acero/user_guide.rst b/docs/source/cpp/acero/user_guide.rst
index eca1a0104708b..0271be2180e99 100644
--- a/docs/source/cpp/acero/user_guide.rst
+++ b/docs/source/cpp/acero/user_guide.rst
@@ -32,14 +32,14 @@ Using Acero
 The basic workflow for Acero is this:
 
 #. First, create a graph of :class:`Declaration` objects describing the plan
- 
+
 #. Call one of the DeclarationToXyz methods to execute the Declaration.
 
    a. A new ExecPlan is created from the graph of Declarations.  Each Declaration will correspond to one
       ExecNode in the plan.  In addition, a sink node will be added, depending on which DeclarationToXyz method
       was used.
 
-   b. The ExecPlan is executed.  Typically this happens as part of the DeclarationToXyz call but in 
+   b. The ExecPlan is executed.  Typically this happens as part of the DeclarationToXyz call but in
       DeclarationToReader the reader is returned before the plan is finished executing.
 
    c. Once the plan is finished it is destroyed
@@ -315,7 +315,7 @@ of a specific execution node.
 ``source``
 ----------
 
-A ``source`` operation can be considered as an entry point to create a streaming execution plan. 
+A ``source`` operation can be considered as an entry point to create a streaming execution plan.
 :class:`SourceNodeOptions` are used to create the ``source`` operation.  The
 ``source`` operation is the most generic and flexible type of source currently available but it can
 be quite tricky to configure.  First you should review the other source node types to ensure there
@@ -326,7 +326,7 @@ function should take no arguments and should return an
 ``arrow::Future<std::optional<arrow::ExecBatch>>``.
 This function might be reading a file, iterating through an in memory structure, or receiving data
 from a network connection.  The arrow library refers to these functions as ``arrow::AsyncGenerator``
-and there are a number of utilities for working with these functions.  For this example we use 
+and there are a number of utilities for working with these functions.  For this example we use
 a vector of record batches that we've already stored in memory.
 In addition, the schema of the data must be known up front.  Acero must know the schema of the data
 at each stage of the execution graph before any processing has begun.  This means we must supply the
@@ -368,10 +368,10 @@ Example of using ``source`` (usage of sink is explained in detail in :ref:`sink<
 In the previous example, :ref:`source node <stream_execution_source_docs>`, a source node
 was used to input the data.  But when developing an application, if the data is already in memory
 as a table, it is much easier, and more performant to use :class:`TableSourceNodeOptions`.
-Here the input data can be passed as a ``std::shared_ptr<arrow::Table>`` along with a ``max_batch_size``. 
+Here the input data can be passed as a ``std::shared_ptr<arrow::Table>`` along with a ``max_batch_size``.
 The ``max_batch_size`` is to break up large record batches so that they can be processed in parallel.
 It is important to note that the table batches will not get merged to form larger batches when the source
-table has a smaller batch size. 
+table has a smaller batch size.
 
 Example of using ``table_source``
 
@@ -387,7 +387,7 @@ Example of using ``table_source``
 ``filter``
 ----------
 
-``filter`` operation, as the name suggests, provides an option to define data filtering 
+``filter`` operation, as the name suggests, provides an option to define data filtering
 criteria. It selects rows where the given expression evaluates to true. Filters can be written using
 :class:`arrow::compute::Expression`, and the expression should have a return type of boolean.
 For example, if we wish to keep rows where the value
@@ -415,7 +415,7 @@ functions, i.e. elementwise functions that return one value for each input
 row independent of the value of all other rows).
 This is exposed via :class:`ProjectNodeOptions` which requires,
 an :class:`arrow::compute::Expression` and name for each of the output columns (if names are not
-provided, the string representations of exprs will be used).  
+provided, the string representations of exprs will be used).
 
 Project example:
 
@@ -455,8 +455,8 @@ can be selected from :ref:`this list of aggregation functions
           will be added which should alleviate this constraint.
 
 The aggregation can provide results as a group or scalar. For instances,
-an operation like `hash_count` provides the counts per each unique record
-as a grouped result while an operation like `sum` provides a single record. 
+an operation like ``hash_count`` provides the counts per each unique record
+as a grouped result while an operation like ``sum`` provides a single record.
 
 Scalar Aggregation example:
 
@@ -481,16 +481,16 @@ Group Aggregation example:
 ``sink``
 --------
 
-``sink`` operation provides output and is the final node of a streaming 
-execution definition. :class:`SinkNodeOptions` interface is used to pass 
+``sink`` operation provides output and is the final node of a streaming
+execution definition. :class:`SinkNodeOptions` interface is used to pass
 the required options. Similar to the source operator the sink operator exposes the output
 with a function that returns a record batch future each time it is called.  It is expected the
 caller will repeatedly call this function until the generator function is exhausted (returns
 ``std::optional::nullopt``).  If this function is not called often enough then record batches
 will accumulate in memory.  An execution plan should only have one
-"terminal" node (one sink node).  An :class:`ExecPlan` can terminate early due to cancellation or 
+"terminal" node (one sink node).  An :class:`ExecPlan` can terminate early due to cancellation or
 an error, before the output is fully consumed. However, the plan can be safely destroyed independently
-of the sink, which will hold the unconsumed batches by `exec_plan->finished()`.
+of the sink, which will hold the unconsumed batches by ``exec_plan->finished()``.
 
 As a part of the Source Example, the Sink operation is also included;
 
@@ -515,7 +515,7 @@ The consuming function may be called before a previous invocation has completed.
 function does not run quickly enough then many concurrent executions could pile up, blocking the
 CPU thread pool.  The execution plan will not be marked finished until all consuming function callbacks
 have been completed.
-Once all batches have been delivered the execution plan will wait for the `finish` future to complete
+Once all batches have been delivered the execution plan will wait for the ``finish`` future to complete
 before marking the execution plan finished.  This allows for workflows where the consumption function
 converts batches into async tasks (this is currently done internally for the dataset write node).
 
@@ -526,12 +526,12 @@ Example::
   arrow::Future<> finish = arrow::Future<>::Make();
   struct CustomSinkNodeConsumer : public cp::SinkNodeConsumer {
 
-      CustomSinkNodeConsumer(std::atomic<uint32_t> *batches_seen, arrow::Future<>finish): 
+      CustomSinkNodeConsumer(std::atomic<uint32_t> *batches_seen, arrow::Future<>finish):
       batches_seen(batches_seen), finish(std::move(finish)) {}
       // Consumption logic can be written here
       arrow::Status Consume(cp::ExecBatch batch) override {
       // data can be consumed in the expected way
-      // transfer to another system or just do some work 
+      // transfer to another system or just do some work
       // and write to disk
       (*batches_seen)++;
       return arrow::Status::OK();
@@ -541,9 +541,9 @@ Example::
 
       std::atomic<uint32_t> *batches_seen;
       arrow::Future<> finish;
-      
+
   };
-  
+
   std::shared_ptr<CustomSinkNodeConsumer> consumer =
           std::make_shared<CustomSinkNodeConsumer>(&batches_seen, finish);
 
@@ -567,14 +567,14 @@ Consuming-Sink example:
 ``order_by_sink``
 -----------------
 
-``order_by_sink`` operation is an extension to the ``sink`` operation. 
-This operation provides the ability to guarantee the ordering of the 
-stream by providing the :class:`OrderBySinkNodeOptions`. 
-Here the :class:`arrow::compute::SortOptions` are provided to define which columns 
+``order_by_sink`` operation is an extension to the ``sink`` operation.
+This operation provides the ability to guarantee the ordering of the
+stream by providing the :class:`OrderBySinkNodeOptions`.
+Here the :class:`arrow::compute::SortOptions` are provided to define which columns
 are used for sorting and whether to sort by ascending or descending values.
 
 .. note:: This node is a "pipeline breaker" and will fully materialize the dataset in memory.
-          In the future, spillover mechanisms will be added which should alleviate this 
+          In the future, spillover mechanisms will be added which should alleviate this
           constraint.
 
 
@@ -593,14 +593,14 @@ Order-By-Sink example:
 ``select_k_sink``
 -----------------
 
-``select_k_sink`` option enables selecting the top/bottom K elements, 
-similar to a SQL ``ORDER BY ... LIMIT K`` clause.  
-:class:`SelectKOptions` which is a defined by 
-using :struct:`OrderBySinkNode` definition. This option returns a sink node that receives 
+``select_k_sink`` option enables selecting the top/bottom K elements,
+similar to a SQL ``ORDER BY ... LIMIT K`` clause.
+:class:`SelectKOptions` which is a defined by
+using :struct:`OrderBySinkNode` definition. This option returns a sink node that receives
 inputs and then compute top_k/bottom_k.
 
 .. note:: This node is a "pipeline breaker" and will fully materialize the input in memory.
-          In the future, spillover mechanisms will be added which should alleviate this 
+          In the future, spillover mechanisms will be added which should alleviate this
           constraint.
 
 SelectK example:
@@ -617,7 +617,7 @@ SelectK example:
 
 .. _stream_execution_table_sink_docs:
 
-The ``table_sink`` node provides the ability to receive the output as an in-memory table. 
+The ``table_sink`` node provides the ability to receive the output as an in-memory table.
 This is simpler to use than the other sink nodes provided by the streaming execution engine
 but it only makes sense when the output fits comfortably in memory.
 The node is created using :class:`TableSinkNodeOptions`.
@@ -637,7 +637,7 @@ Example of using ``table_sink``
 ---------
 
 ``scan`` is an operation used to load and process datasets.  It should be preferred over the
-more generic ``source`` node when your input is a dataset.  The behavior is defined using 
+more generic ``source`` node when your input is a dataset.  The behavior is defined using
 :class:`arrow::dataset::ScanNodeOptions`.  More information on datasets and the various
 scan options can be found in :doc:`../dataset`.
 
@@ -683,10 +683,10 @@ Write example:
 ``union``
 -------------
 
-``union`` merges multiple data streams with the same schema into one, similar to 
+``union`` merges multiple data streams with the same schema into one, similar to
 a SQL ``UNION ALL`` clause.
 
-The following example demonstrates how this can be achieved using 
+The following example demonstrates how this can be achieved using
 two data sources.
 
 Union example:
@@ -704,15 +704,15 @@ Union example:
 -------------
 
 ``hash_join`` operation provides the relational algebra operation, join using hash-based
-algorithm. :class:`HashJoinNodeOptions` contains the options required in 
-defining a join. The hash_join supports 
+algorithm. :class:`HashJoinNodeOptions` contains the options required in
+defining a join. The hash_join supports
 `left/right/full semi/anti/outerjoins
-<https://en.wikipedia.org/wiki/Join_(SQL)>`_. 
+<https://en.wikipedia.org/wiki/Join_(SQL)>`_.
 Also the join-key (i.e. the column(s) to join on), and suffixes (i.e a suffix term like "_x"
-which can be appended as a suffix for column names duplicated in both left and right 
-relations.) can be set via the join options. 
+which can be appended as a suffix for column names duplicated in both left and right
+relations.) can be set via the join options.
 `Read more on hash-joins
-<https://en.wikipedia.org/wiki/Hash_join>`_. 
+<https://en.wikipedia.org/wiki/Hash_join>`_.
 
 Hash-Join example:
 
@@ -726,7 +726,7 @@ Hash-Join example:
 Summary
 =======
 
-There are examples of these nodes which can be found in 
+There are examples of these nodes which can be found in
 ``cpp/examples/arrow/execution_plan_documentation_examples.cc`` in the Arrow source.
 
 Complete Example:
diff --git a/docs/source/cpp/api/filesystem.rst b/docs/source/cpp/api/filesystem.rst
index 02b12668327f2..599e9fedb60f9 100644
--- a/docs/source/cpp/api/filesystem.rst
+++ b/docs/source/cpp/api/filesystem.rst
@@ -97,3 +97,12 @@ Google Cloud Storage filesystem
 
 .. doxygenclass:: arrow::fs::GcsFileSystem
    :members:
+
+Azure filesystem
+----------------
+
+.. doxygenstruct:: arrow::fs::AzureOptions
+   :members:
+
+.. doxygenclass:: arrow::fs::AzureFileSystem
+   :members:
diff --git a/docs/source/cpp/api/flightsql.rst b/docs/source/cpp/api/flightsql.rst
index 565b605108d9f..0f49a76f20687 100644
--- a/docs/source/cpp/api/flightsql.rst
+++ b/docs/source/cpp/api/flightsql.rst
@@ -22,8 +22,6 @@
 Arrow Flight SQL
 ================
 
-.. note:: Flight SQL is currently experimental and APIs are subject to change.
-
 Common Types
 ============
 
diff --git a/docs/source/cpp/api/scalar.rst b/docs/source/cpp/api/scalar.rst
index 04e78450d7744..be9f9686bf110 100644
--- a/docs/source/cpp/api/scalar.rst
+++ b/docs/source/cpp/api/scalar.rst
@@ -44,4 +44,4 @@ Utilities
 .. doxygenclass:: arrow::ScalarVisitor
    :project: arrow_cpp
    :members:
-   :undoc-members:
\ No newline at end of file
+   :undoc-members:
diff --git a/docs/source/cpp/build_system.rst b/docs/source/cpp/build_system.rst
index 60df117eb510e..e80bca4c949dc 100644
--- a/docs/source/cpp/build_system.rst
+++ b/docs/source/cpp/build_system.rst
@@ -47,7 +47,7 @@ file into an executable linked with the Arrow C++ shared library:
 .. code-block:: cmake
 
    cmake_minimum_required(VERSION 3.16)
-   
+
    project(MyExample)
 
    find_package(Arrow REQUIRED)
@@ -167,7 +167,7 @@ file into an executable linked with the Arrow C++ shared library:
 .. code-block:: makefile
 
    my_example: my_example.cc
-   	$(CXX) -o $@ $(CXXFLAGS) $< $$(pkg-config --cflags --libs arrow)
+       $(CXX) -o $@ $(CXXFLAGS) $< $$(pkg-config --cflags --libs arrow)
 
 Many build systems support pkg-config. For example:
 
diff --git a/docs/source/cpp/compute.rst b/docs/source/cpp/compute.rst
index e7310d2c0c711..4131bbdf6f912 100644
--- a/docs/source/cpp/compute.rst
+++ b/docs/source/cpp/compute.rst
@@ -49,8 +49,8 @@ Computation inputs are represented as a general :class:`Datum` class,
 which is a tagged union of several shapes of data such as :class:`Scalar`,
 :class:`Array` and :class:`ChunkedArray`.  Many compute functions support
 both array (chunked or not) and scalar inputs, however some will mandate
-particular input types. For example, while ``array_sort_indices`` requires its 
-first and only input to be an array, the generalized ``sort_indices`` 
+particular input types. For example, while ``array_sort_indices`` requires its
+first and only input to be an array, the generalized ``sort_indices``
 function accepts an array, chunked array, record batch or table.
 
 .. _invoking-compute-functions:
@@ -181,7 +181,8 @@ of general type categories:
 
 * "String-like": String, LargeString.
 
-* "List-like": List, LargeList, sometimes also FixedSizeList.
+* "List-like": List, LargeList, ListView, LargeListView, and sometimes also
+  FixedSizeList.
 
 * "Nested": List-likes (including FixedSizeList), Struct, Union, and
   related types like Map.
@@ -514,8 +515,8 @@ Mixed time resolution temporal inputs will be cast to finest input resolution.
   +------------+---------------------------------------------+
 
   It's compatible with Redshift's decimal promotion rules. All decimal digits
-  are preserved for `add`, `subtract` and `multiply` operations. The result
-  precision of `divide` is at least the sum of precisions of both operands with
+  are preserved for ``add``, ``subtract`` and ``multiply`` operations. The result
+  precision of ``divide`` is at least the sum of precisions of both operands with
   enough scale kept. Error is returned if the result precision is beyond the
   decimal value range.
 
@@ -572,28 +573,28 @@ representation based on the rounding criterion.
 | trunc             | Unary      | Numeric     | Float32/Float64/Decimal |                                  |        |
 +-------------------+------------+-------------+-------------------------+----------------------------------+--------+
 
-* \(1)  By default rounding functions change a value to the nearest 
-  integer using HALF_TO_EVEN to resolve ties.  Options are available to control 
-  the rounding criterion.  All ``round`` functions have the 
+* \(1)  By default rounding functions change a value to the nearest
+  integer using HALF_TO_EVEN to resolve ties.  Options are available to control
+  the rounding criterion.  All ``round`` functions have the
   ``round_mode`` option to set the rounding mode.
 * \(2) Round to a number of digits where the ``ndigits`` option of
   :struct:`RoundOptions` specifies the rounding precision in terms of number
   of digits.  A negative value corresponds to digits in the non-fractional
   part.  For example, -2 corresponds to rounding to the nearest multiple of
   100 (zeroing the ones and tens digits).  Default value of ``ndigits`` is 0
-  which rounds to the nearest integer. For integer inputs a non-negative 
+  which rounds to the nearest integer. For integer inputs a non-negative
   ``ndigits`` value is ignored and the input is returned unchanged. For integer
-  inputs, if ``-ndigits`` is larger than the maximum number of digits the 
+  inputs, if ``-ndigits`` is larger than the maximum number of digits the
   input type can hold, an error is returned.
 * \(3) Round to a multiple where the ``multiple`` option of
   :struct:`RoundToMultipleOptions` specifies the rounding scale.  The rounding
-  multiple has to be a positive value and can be casted to input type.  
-  For example, 100 corresponds to rounding to the nearest multiple of 100 
-  (zeroing the ones and tens digits). Default value of ``multiple`` is 1 which 
+  multiple has to be a positive value and can be casted to input type.
+  For example, 100 corresponds to rounding to the nearest multiple of 100
+  (zeroing the ones and tens digits). Default value of ``multiple`` is 1 which
   rounds to the nearest integer.
 * \(4) Round the first input to multiple of the second input. The rounding
-  multiple has to be a positive value and can be casted to the first input type.  
-  For example, 100 corresponds to rounding to the nearest multiple of 100 
+  multiple has to be a positive value and can be casted to the first input type.
+  For example, 100 corresponds to rounding to the nearest multiple of 100
   (zeroing the ones and tens digits).
 
 For ``round`` functions, the following rounding modes are available.
@@ -634,8 +635,8 @@ The example values are given for default values of ``ndigits`` and ``multiple``.
 |                       |                                                              | -3.5 -> -3, -4.5 -> -5    |
 +-----------------------+--------------------------------------------------------------+---------------------------+
 
-The following table gives examples of how ``ndigits`` (for the ``round`` 
-and ``round_binary`` functions) and ``multiple`` (for ``round_to_multiple``) 
+The following table gives examples of how ``ndigits`` (for the ``round``
+and ``round_binary`` functions) and ``multiple`` (for ``round_to_multiple``)
 influence the operation performed, respectively.
 
 +--------------------+-------------------+---------------------------+
@@ -1029,7 +1030,7 @@ These functions trim off characters on both sides (trim), or the left (ltrim) or
 +--------------------------+------------+-------------------------+---------------------+----------------------------------------+---------+
 
 * \(1) Only characters specified in :member:`TrimOptions::characters` will be
-  trimmed off. Both the input string and the `characters` argument are
+  trimmed off. Both the input string and the ``characters`` argument are
   interpreted as ASCII characters.
 
 * \(2) Only trim off ASCII whitespace characters (``'\t'``, ``'\n'``, ``'\v'``,
@@ -1298,8 +1299,8 @@ Structural transforms
 +---------------------+------------+-------------+------------------+------------------------------+--------+
 
 * \(1) Each output element is the length of the corresponding input element
-  (null if input is null).  Output type is Int32 for List and FixedSizeList,
-  Int64 for LargeList.
+  (null if input is null).  Output type is Int32 for List, ListView, and
+  FixedSizeList, Int64 for LargeList and LargeListView.
 
 * \(2) The output struct's field types are the types of its arguments. The
   field names are specified using an instance of :struct:`MakeStructOptions`.
@@ -1413,13 +1414,15 @@ null input value is converted into a null output value.
 +-----------------------------+------------------------------------+---------+
 | Struct                      | Struct                             | \(2)    |
 +-----------------------------+------------------------------------+---------+
-| List-like                   | List-like                          | \(3)    |
+| List-like                   | List-like or (Large)ListView       | \(3)    |
 +-----------------------------+------------------------------------+---------+
-| Map                         | Map or List of two-field struct    | \(4)    |
+| (Large)ListView             | List-like or (Large)ListView       | \(4)    |
++-----------------------------+------------------------------------+---------+
+| Map                         | Map or List of two-field struct    | \(5)    |
 +-----------------------------+------------------------------------+---------+
 | Null                        | Any                                |         |
 +-----------------------------+------------------------------------+---------+
-| Any                         | Extension                          | \(5)    |
+| Any                         | Extension                          | \(6)    |
 +-----------------------------+------------------------------------+---------+
 
 * \(1) The dictionary indices are unchanged, the dictionary values are
@@ -1433,14 +1436,21 @@ null input value is converted into a null output value.
 
 * \(3) The list offsets are unchanged, the list values are cast from the
   input value type to the output value type (if a conversion is
-  available).
+  available). If the output type is (Large)ListView, then sizes are
+  derived from the offsets.
+
+* \(4) If output type is list-like, offsets (consequently, the values array)
+  might have to be rebuilt to be sorted and spaced adequately. If output type is
+  a list-view type, the offsets and sizes are unchanged. In any case, the list
+  values are cast from the input value type to the output value type (if a
+  conversion is available).
 
-* \(4) Offsets are unchanged, the keys and values are cast from respective input
+* \(5) Offsets are unchanged, the keys and values are cast from respective input
   to output types (if a conversion is available). If output type is a list of
   struct, the key field is output as the first field and the value field the
   second field, regardless of field names chosen.
 
-* \(5) Any input type that can be cast to the resulting extension's storage type.
+* \(6) Any input type that can be cast to the resulting extension's storage type.
   This excludes extension types, unless being cast to the same extension type.
 
 Temporal component extraction
@@ -1570,7 +1580,7 @@ is the same, even though the UTC years would be different.
 Timezone handling
 ~~~~~~~~~~~~~~~~~
 
-`assume_timezone` function is meant to be used when an external system produces
+``assume_timezone`` function is meant to be used when an external system produces
 "timezone-naive" timestamps which need to be converted to "timezone-aware"
 timestamps (see for example the `definition
 <https://docs.python.org/3/library/datetime.html#aware-and-naive-objects>`__
@@ -1581,11 +1591,11 @@ Input timestamps are assumed to be relative to the timezone given in
 UTC-relative timestamps with the timezone metadata set to the above value.
 An error is returned if the timestamps already have the timezone metadata set.
 
-`local_timestamp` function converts UTC-relative timestamps to local "timezone-naive"
+``local_timestamp`` function converts UTC-relative timestamps to local "timezone-naive"
 timestamps. The timezone is taken from the timezone metadata of the input
-timestamps. This function is the inverse of `assume_timezone`. Please note:
+timestamps. This function is the inverse of ``assume_timezone``. Please note:
 **all temporal functions already operate on timestamps as if they were in local
-time of the metadata provided timezone**. Using `local_timestamp` is only meant to be
+time of the metadata provided timezone**. Using ``local_timestamp`` is only meant to be
 used when an external system expects local timestamps.
 
 +-----------------+-------+-------------+---------------+---------------------------------+-------+
@@ -1621,12 +1631,12 @@ Array-wise ("vector") functions
 Cumulative Functions
 ~~~~~~~~~~~~~~~~~~~~
 
-Cumulative functions are vector functions that perform a running accumulation on 
-their input using a given binary associative operation with an identity element 
-(a monoid) and output an array containing the corresponding intermediate running 
-values. The input is expected to be of numeric type. By default these functions 
-do not detect overflow. They are also available in an overflow-checking variant, 
-suffixed ``_checked``, which returns an ``Invalid`` :class:`Status` when 
+Cumulative functions are vector functions that perform a running accumulation on
+their input using a given binary associative operation with an identity element
+(a monoid) and output an array containing the corresponding intermediate running
+values. The input is expected to be of numeric type. By default these functions
+do not detect overflow. They are also available in an overflow-checking variant,
+suffixed ``_checked``, which returns an ``Invalid`` :class:`Status` when
 overflow is detected.
 
 +-------------------------+-------+-------------+-------------+--------------------------------+-----------+
@@ -1649,8 +1659,8 @@ overflow is detected.
 
 * \(1) CumulativeOptions has two optional parameters. The first parameter
   :member:`CumulativeOptions::start` is a starting value for the running
-  accumulation. It has a default value of 0 for `sum`, 1 for `prod`, min of 
-  input type for `max`, and max of input type for `min`. Specified values of 
+  accumulation. It has a default value of 0 for ``sum``, 1 for ``prod``, min of
+  input type for ``max``, and max of input type for ``min``. Specified values of
   ``start`` must be castable to the input type. The second parameter
   :member:`CumulativeOptions::skip_nulls` is a boolean. When set to
   false (the default), the first encountered null is propagated. When set to
@@ -1804,8 +1814,10 @@ Structural transforms
   list array are discarded.
 
 * \(3) For each value in the list child array, the index at which it is found
-  in the list array is appended to the output.  Nulls in the parent list array
-  are discarded.
+  in the list-like array is appended to the output. Indices of null lists in the
+  parent array might still be present in the output if they are non-empty null
+  lists. If the parent is a list-view, child array values that are not used by
+  any non-null list-view are null in the output.
 
 * \(4) For each list element, compute the slice of that list element, then
   return another list-like array of those slices. Can return either a
@@ -1861,9 +1873,9 @@ replaced, based on the remaining inputs.
 
 Pairwise functions
 ~~~~~~~~~~~~~~~~~~~~
-Pairwise functions are unary vector functions that perform a binary operation on 
+Pairwise functions are unary vector functions that perform a binary operation on
 a pair of elements in the input array, typically on adjacent elements. The n-th
-output is computed by applying the binary operation to the n-th and (n-p)-th inputs, 
+output is computed by applying the binary operation to the n-th and (n-p)-th inputs,
 where p is the period. The default period is 1, in which case the binary
 operation is applied to adjacent pairs of inputs. The period can also be
 negative, in which case the n-th output is computed by applying the binary
@@ -1877,9 +1889,9 @@ operation to the n-th and (n+abs(p))-th inputs.
 | pairwise_diff_checked  | Unary | Numeric/Temporal     | Numeric/Temporal     | :struct:`PairwiseOptions`      | \(1)(3)  |
 +------------------------+-------+----------------------+----------------------+--------------------------------+----------+
 
-* \(1) Computes the first order difference of an array, It internally calls 
-  the scalar function ``Subtract`` (or the checked variant) to compute 
-  differences, so its behavior and supported types are the same as 
-  ``Subtract``. The period can be specified in :struct:`PairwiseOptions`. 
+* \(1) Computes the first order difference of an array, It internally calls
+  the scalar function ``Subtract`` (or the checked variant) to compute
+  differences, so its behavior and supported types are the same as
+  ``Subtract``. The period can be specified in :struct:`PairwiseOptions`.
 * \(2) Wraps around the result when overflow is detected.
 * \(3) Returns an ``Invalid`` :class:`Status` when overflow is detected.
diff --git a/docs/source/cpp/dataset.rst b/docs/source/cpp/dataset.rst
index 1f5d0476c2889..a64b73b61c05d 100644
--- a/docs/source/cpp/dataset.rst
+++ b/docs/source/cpp/dataset.rst
@@ -378,28 +378,28 @@ Partitioning performance considerations
 
 Partitioning datasets has two aspects that affect performance: it increases the number of
 files and it creates a directory structure around the files. Both of these have benefits
-as well as costs. Depending on the configuration and the size of your dataset, the costs 
-can outweigh the benefits. 
+as well as costs. Depending on the configuration and the size of your dataset, the costs
+can outweigh the benefits.
 
-Because partitions split up the dataset into multiple files, partitioned datasets can be 
-read and written with parallelism. However, each additional file adds a little overhead in 
-processing for filesystem interaction. It also increases the overall dataset size since 
+Because partitions split up the dataset into multiple files, partitioned datasets can be
+read and written with parallelism. However, each additional file adds a little overhead in
+processing for filesystem interaction. It also increases the overall dataset size since
 each file has some shared metadata. For example, each parquet file contains the schema and
-group-level statistics. The number of partitions is a floor for the number of files. If 
-you partition a dataset by date with a year of data, you will have at least 365 files. If 
-you further partition by another dimension with 1,000 unique values, you will have up to 
+group-level statistics. The number of partitions is a floor for the number of files. If
+you partition a dataset by date with a year of data, you will have at least 365 files. If
+you further partition by another dimension with 1,000 unique values, you will have up to
 365,000 files. This fine of partitioning often leads to small files that mostly consist of
 metadata.
 
-Partitioned datasets create nested folder structures, and those allow us to prune which 
+Partitioned datasets create nested folder structures, and those allow us to prune which
 files are loaded in a scan. However, this adds overhead to discovering files in the dataset,
 as we'll need to recursively "list directory" to find the data files. Too fine
 partitions can cause problems here: Partitioning a dataset by date for a years worth
-of data will require 365 list calls to find all the files; adding another column with 
+of data will require 365 list calls to find all the files; adding another column with
 cardinality 1,000 will make that 365,365 calls.
 
 The most optimal partitioning layout will depend on your data, access patterns, and which
-systems will be reading the data. Most systems, including Arrow, should work across a 
+systems will be reading the data. Most systems, including Arrow, should work across a
 range of file sizes and partitioning layouts, but there are extremes you should avoid. These
 guidelines can help avoid some known worst cases:
 
diff --git a/docs/source/cpp/datatypes.rst b/docs/source/cpp/datatypes.rst
index 4e1fe76b4d6f2..7eb70936f4e1d 100644
--- a/docs/source/cpp/datatypes.rst
+++ b/docs/source/cpp/datatypes.rst
@@ -72,8 +72,8 @@ To instantiate data types, it is recommended to call the provided
 Type Traits
 -----------
 
-Writing code that can handle concrete :class:`arrow::DataType` subclasses would 
-be verbose, if it weren't for type traits. Arrow's type traits map the Arrow 
+Writing code that can handle concrete :class:`arrow::DataType` subclasses would
+be verbose, if it weren't for type traits. Arrow's type traits map the Arrow
 data types to the specialized array, scalar, builder, and other associated types.
 For example, the Boolean type has traits:
 
@@ -96,7 +96,7 @@ For example, the Boolean type has traits:
 See the :ref:`type-traits` for an explanation of each of these fields.
 
 Using type traits, one can write template functions that can handle a variety
-of Arrow types. For example, to write a function that creates an array of 
+of Arrow types. For example, to write a function that creates an array of
 Fibonacci values for any Arrow numeric type:
 
 .. code-block:: cpp
@@ -128,7 +128,7 @@ For some common cases, there are type associations on the classes themselves. Us
 
 Similar to the type traits provided in
 `std::type_traits <https://en.cppreference.com/w/cpp/header/type_traits>`_,
-Arrow provides type predicates such as ``is_number_type`` as well as 
+Arrow provides type predicates such as ``is_number_type`` as well as
 corresponding templates that wrap ``std::enable_if_t`` such as ``enable_if_number``.
 These can constrain template functions to only compile for relevant types, which
 is useful if other overloads need to be implemented. For example, to write a sum
@@ -176,20 +176,20 @@ here is how one might sum across columns of arbitrary numeric types:
    class TableSummation {
      double partial = 0.0;
     public:
-   
+
      arrow::Result<double> Compute(std::shared_ptr<arrow::RecordBatch> batch) {
        for (std::shared_ptr<arrow::Array> array : batch->columns()) {
          ARROW_RETURN_NOT_OK(arrow::VisitArrayInline(*array, this));
        }
        return partial;
      }
-   
+
      // Default implementation
      arrow::Status Visit(const arrow::Array& array) {
        return arrow::Status::NotImplemented("Cannot compute sum for array of type ",
                                             array.type()->ToString());
      }
-   
+
      template <typename ArrayType, typename T = typename ArrayType::TypeClass>
      arrow::enable_if_number<T, arrow::Status> Visit(const ArrayType& array) {
        for (std::optional<typename T::c_type> value : array) {
diff --git a/docs/source/cpp/env_vars.rst b/docs/source/cpp/env_vars.rst
index 116c151824c75..0a082b0a5d859 100644
--- a/docs/source/cpp/env_vars.rst
+++ b/docs/source/cpp/env_vars.rst
@@ -181,6 +181,10 @@ that changing their value later will have an effect.
    The number of entries to keep in the Gandiva JIT compilation cache.
    The cache is in-memory and does not persist across processes.
 
+   The default cache size is 5000.  The value of this environment variable
+   should be a positive integer and should not exceed the maximum value
+   of int32.  Otherwise the default value is used.
+
 .. envvar:: HADOOP_HOME
 
    The path to the Hadoop installation.
diff --git a/docs/source/cpp/examples/compute_and_write_example.rst b/docs/source/cpp/examples/compute_and_write_example.rst
index e66d3ced55d0c..a4b619f7ffff3 100644
--- a/docs/source/cpp/examples/compute_and_write_example.rst
+++ b/docs/source/cpp/examples/compute_and_write_example.rst
@@ -21,8 +21,8 @@
 Compute and Write CSV Example
 =============================
 
-The file ``cpp/examples/arrow/compute_and_write_csv_example.cc`` located inside 
-the source tree contains an example of creating a table of two numerical columns 
-and then comparing the magnitudes of the entries in the columns and writing out to 
+The file ``cpp/examples/arrow/compute_and_write_csv_example.cc`` located inside
+the source tree contains an example of creating a table of two numerical columns
+and then comparing the magnitudes of the entries in the columns and writing out to
 a CSV file with the column entries and their comparisons.  The code in the example
 is documented.
diff --git a/docs/source/cpp/flight.rst b/docs/source/cpp/flight.rst
index e07a84e91ee4f..a1e9420bfd34e 100644
--- a/docs/source/cpp/flight.rst
+++ b/docs/source/cpp/flight.rst
@@ -350,10 +350,10 @@ Closing unresponsive connections
    calls Cancel() on a timer, with the main thread resetting the timer every time
    an operation completes successfully. For a fully-worked out example, see the
    Cookbook.
-   
+
    .. note:: There is a long standing ticket for a per-write/per-read timeout
              instead of a per call timeout (ARROW-6062_), but this is not (easily)
-             possible to implement with the blocking gRPC API. 
+             possible to implement with the blocking gRPC API.
 
 .. _best gRPC practices: https://grpc.io/docs/guides/performance/#general
 .. _gRPC keys: https://grpc.github.io/grpc/cpp/group__grpc__arg__keys.html
diff --git a/docs/source/cpp/gandiva.rst b/docs/source/cpp/gandiva.rst
index 07b07bee7ac4e..f60d1fc8ac8d9 100644
--- a/docs/source/cpp/gandiva.rst
+++ b/docs/source/cpp/gandiva.rst
@@ -29,8 +29,8 @@ Gandiva only handles projections and filters; for other transformations, see
 :ref:`Compute Functions <compute-cpp>`.
 
 Gandiva was designed to take advantage of the Arrow memory format and modern
-hardware. From the Arrow memory model, since Arrow arrays have separate buffers for values and 
-validity bitmaps, values and their null status can often be processed 
+hardware. From the Arrow memory model, since Arrow arrays have separate buffers for values and
+validity bitmaps, values and their null status can often be processed
 independently, allowing for better instruction pipelining. On modern hardware,
 compiling expressions using LLVM allows the execution to be optimized
 to the local runtime environment and hardware, including available SIMD
@@ -42,25 +42,25 @@ pre-compiled into LLVM IR (intermediate representation).
 
 Expression, Projector and Filter
 ================================
-To effectively utilize Gandiva, you will construct expression trees with ``TreeExprBuilder``, 
-including the creation of function nodes, if-else logic, and boolean expressions. 
+To effectively utilize Gandiva, you will construct expression trees with ``TreeExprBuilder``,
+including the creation of function nodes, if-else logic, and boolean expressions.
 Subsequently, leverage ``Projector`` or ``Filter`` execution kernels to efficiently evaluate these expressions.
-See :doc:`./gandiva/expr_projector_filter` for more details. 
+See :doc:`./gandiva/expr_projector_filter` for more details.
 
 
 External Functions Development
 ==============================
-Gandiva offers the capability of integrating external functions, encompassing 
-both C functions and IR functions. This feature broadens the spectrum of 
-functions that can be applied within Gandiva expressions. For developers 
-looking to customize and enhance their computational solutions, 
-Gandiva provides the opportunity to develop and register their own external 
-functions, thus allowing for a more tailored and flexible use of the Gandiva 
+Gandiva offers the capability of integrating external functions, encompassing
+both C functions and IR functions. This feature broadens the spectrum of
+functions that can be applied within Gandiva expressions. For developers
+looking to customize and enhance their computational solutions,
+Gandiva provides the opportunity to develop and register their own external
+functions, thus allowing for a more tailored and flexible use of the Gandiva
 environment.
-See :doc:`./gandiva/external_func` for more details. 
+See :doc:`./gandiva/external_func` for more details.
 
 .. toctree::
    :maxdepth: 2
 
    gandiva/expr_projector_filter
-   gandiva/external_func
\ No newline at end of file
+   gandiva/external_func
diff --git a/docs/source/cpp/gandiva/expr_projector_filter.rst b/docs/source/cpp/gandiva/expr_projector_filter.rst
index c960d1d869fe5..9d58b185032e3 100644
--- a/docs/source/cpp/gandiva/expr_projector_filter.rst
+++ b/docs/source/cpp/gandiva/expr_projector_filter.rst
@@ -30,7 +30,7 @@ literal values, created by :func:`TreeExprBuilder::MakeLiteral`. Nodes
 can be combined into more complex expression trees using:
 
 * :func:`TreeExprBuilder::MakeFunction` to create a function
-  node. (You can call :func:`GetRegisteredFunctionSignatures` to 
+  node. (You can call :func:`GetRegisteredFunctionSignatures` to
   get a list of valid function signatures.)
 * :func:`TreeExprBuilder::MakeIf` to create if-else logic.
 * :func:`TreeExprBuilder::MakeAnd` and :func:`TreeExprBuilder::MakeOr`
@@ -39,7 +39,7 @@ can be combined into more complex expression trees using:
   functions to create set membership tests.
 
 Each of these functions create new composite nodes, which contain the leaf nodes
-(literals and field references) or other composite nodes as children. By 
+(literals and field references) or other composite nodes as children. By
 composing these, you can create arbitrarily complex expression trees.
 
 Once an expression tree is built, they are wrapped in either :class:`Expression`
@@ -84,7 +84,7 @@ reused to process distinct record batches in parallel.
 Evaluating projections
 ----------------------
 
-Execution is performed with :func:`Projector::Evaluate`. This outputs 
+Execution is performed with :func:`Projector::Evaluate`. This outputs
 a vector of arrays, which can be passed along with the output schema to
 :func:`arrow::RecordBatch::Make()`.
 
@@ -99,14 +99,14 @@ Evaluating filters
 
 :func:`Filter::Evaluate` produces :class:`SelectionVector`,
 a vector of row indices that matched the filter condition. The selection vector
-is a wrapper around an arrow integer array, parameterized by bitwidth. When 
-creating the selection vector (you must initialize it *before* passing to 
-``Evaluate()``), you must choose the bitwidth, which determines the max index 
+is a wrapper around an arrow integer array, parameterized by bitwidth. When
+creating the selection vector (you must initialize it *before* passing to
+``Evaluate()``), you must choose the bitwidth, which determines the max index
 value it can hold, and the max number of slots, which determines how many indices
-it may contain. In general, the max number of slots should be set to your batch 
-size and the bitwidth the smallest integer size that can represent all integers 
-less than the batch size. For example, if your batch size is 100k, set the 
-maximum number of slots to 100k and the bitwidth to 32 (since 2^16 = 64k which 
+it may contain. In general, the max number of slots should be set to your batch
+size and the bitwidth the smallest integer size that can represent all integers
+less than the batch size. For example, if your batch size is 100k, set the
+maximum number of slots to 100k and the bitwidth to 32 (since 2^16 = 64k which
 would be too small).
 
 Once ``Evaluate()`` has been run and the :class:`SelectionVector` is
@@ -123,10 +123,10 @@ output record batch.
 Evaluating projections and filters
 ----------------------------------
 
-Finally, you can also project while apply a selection vector, with 
+Finally, you can also project while apply a selection vector, with
 :func:`Projector::Evaluate()`. To do so, first make sure to initialize the
 :class:`Projector` with :func:`SelectionVector::GetMode()` so that the projector
-compiles with the correct bitwidth. Then you can pass the 
+compiles with the correct bitwidth. Then you can pass the
 :class:`SelectionVector` into the :func:`Projector::Evaluate()` method.
 
 
@@ -134,4 +134,4 @@ compiles with the correct bitwidth. Then you can pass the
    :language: cpp
    :start-after: (Doc section: Evaluate filter and projection)
    :end-before: (Doc section: Evaluate filter and projection)
-   :dedent: 2
\ No newline at end of file
+   :dedent: 2
diff --git a/docs/source/cpp/gandiva/external_func.rst b/docs/source/cpp/gandiva/external_func.rst
index cdd8fc82e59db..f8bdde83d96e6 100644
--- a/docs/source/cpp/gandiva/external_func.rst
+++ b/docs/source/cpp/gandiva/external_func.rst
@@ -79,7 +79,7 @@ The ``NativeFunction`` class is used to define the metadata for an external func
     * ``ResultNullableType::kResultNullIfNull``: result validity is an intersection of the validity of the children.
     * ``ResultNullableType::kResultNullNever``: result is always valid.
     * ``ResultNullableType::kResultNullInternal``: result validity depends on some internal logic.
-* ``pc_name``: The name of the corresponding precompiled function. 
+* ``pc_name``: The name of the corresponding precompiled function.
   * Typically, this name follows the convention ``{base_name}`` + ``_{param1_type}`` + ``{param2_type}`` + ... + ``{paramN_type}``. For example, if the base name is ``add`` and the function takes two ``int32`` parameters and returns an ``int32``, the precompiled function name would be ``add_int32_int32``, but this convention is not mandatory as long as you can guarantee its uniqueness.
 * ``flags``: Optional flags for additional function attributes (default is 0). Please check out ``NativeFunction::kNeedsContext``, ``NativeFunction::kNeedsFunctionHolder``, and ``NativeFunction::kCanReturnErrors`` for more details.
 
@@ -153,10 +153,10 @@ Not all Arrow data types are supported in Gandiva. The following table lists the
 | utf8 (as return type)               | int64_t context,  |
 |                                     | const char*,      |
 |                                     | uint32_t*         |
-|                                     | [see next section]| 
+|                                     | [see next section]|
 +-------------------------------------+-------------------+
 
-Handling arrow::StringType (utf8 type) and arrow::BinaryType 
+Handling arrow::StringType (utf8 type) and arrow::BinaryType
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Both ``arrow::StringType`` and ``arrow::BinaryType`` are variable-length types. And they are handled similarly in external functions. Since ``arrow::StringType`` (utf8 type) is more commonly used, we will use it below as the example to explain how to handle variable-length types in external functions.
 
@@ -179,7 +179,7 @@ When ``arrow::StringType`` (``utf8`` type) is used as the return type in a funct
 2. **Function Parameters:**
     * **Context Parameter**: The C function should begin with an additional parameter, ``int64_t context``. This parameter is crucial for context management within the function.
     * **String Length Output Parameter**: The function should also include a ``uint32_t*`` parameter at the end. This output parameter will store the length of the returned string data.
-3. **Return Value**: The function should return a ``const char*`` pointer, pointing to the string data. 
+3. **Return Value**: The function should return a ``const char*`` pointer, pointing to the string data.
 4. **Function Implementation:**
    * **Memory Allocation and Error Messaging:** Within the function's implementation, use ``gdv_fn_context_arena_malloc`` and ``gdv_fn_context_set_error_msg`` for memory allocation and error messaging, respectively. Both functions take ``int64_t context`` as their first parameter, facilitating efficient context utilization.
 
@@ -200,10 +200,10 @@ You can use ``gandiva::FunctionRegistry``'s APIs to register external C function
         NativeFunction func, void* c_function_ptr,
         std::optional<FunctionHolderMaker> function_holder_maker = std::nullopt);
 
-The above API allows you to register an external C function. 
+The above API allows you to register an external C function.
 
-* The ``NativeFunction`` object describes the metadata of the external C function. 
-* The ``c_function_ptr`` is the function pointer to the external C function's implementation. 
+* The ``NativeFunction`` object describes the metadata of the external C function.
+* The ``c_function_ptr`` is the function pointer to the external C function's implementation.
 * The optional ``function_holder_maker`` is used to create a function holder for the external C function if the external C function requires a function holder. Check out the ``gandiva::FunctionHolder`` class and its several sub-classes for more details.
 
 External IR functions
diff --git a/docs/source/cpp/getting_started.rst b/docs/source/cpp/getting_started.rst
index 89bd4559ef1e6..2cab5d1581c1c 100644
--- a/docs/source/cpp/getting_started.rst
+++ b/docs/source/cpp/getting_started.rst
@@ -24,17 +24,17 @@ Getting Started
 The following articles demonstrate installation, use, and a basic understanding of Arrow.
 These articles will get you setup quickly using Arrow and give you a taste of what the
 library is capable of.
-Specifically, it contains: an installation and linking guide; documentation of conventions used 
-in the codebase and suggested for users; and tutorials, including: 
+Specifically, it contains: an installation and linking guide; documentation of conventions used
+in the codebase and suggested for users; and tutorials, including:
 
-* Building Arrow arrays and tabular structures 
+* Building Arrow arrays and tabular structures
 * Reading and writing Parquet, Arrow, and CSV files
 * Executing compute kernels on arrays
 * Reading and writing multi-file partitioned datasets
 
 Start here to gain a basic understanding of Arrow, and move on to the :doc:`/cpp/user_guide` to
-explore more specific topics and underlying concepts, or the :doc:`/cpp/api` to explore Arrow's 
-API. 
+explore more specific topics and underlying concepts, or the :doc:`/cpp/api` to explore Arrow's
+API.
 
 .. toctree::
 
@@ -44,5 +44,3 @@ API.
    tutorials/io_tutorial.rst
    tutorials/compute_tutorial.rst
    tutorials/datasets_tutorial.rst
-   
-   
diff --git a/docs/source/cpp/io.rst b/docs/source/cpp/io.rst
index 2a05473852c24..2312132b1a354 100644
--- a/docs/source/cpp/io.rst
+++ b/docs/source/cpp/io.rst
@@ -116,15 +116,15 @@ scope, which will register a factory whenever the instance is loaded:
 
 .. code-block:: cpp
 
-    arrow::fs::FileSystemRegistrar kExampleFileSystemModule{
+    auto kExampleFileSystemModule = ARROW_REGISTER_FILESYSTEM(
       "example",
       [](const Uri& uri, const io::IOContext& io_context,
           std::string* out_path) -> Result<std::shared_ptr<arrow::fs::FileSystem>> {
         EnsureExampleFileSystemInitialized();
         return std::make_shared<ExampleFileSystem>();
       },
-      &EnsureExampleFileSystemFinalized,
-    };
+      &EnsureExampleFileSystemFinalized
+    );
 
 If a filesystem implementation requires initialization before any instances
 may be constructed, this should be included in the corresponding factory or
@@ -144,4 +144,3 @@ should have exactly one of its sources
 ``#include "arrow/filesystem/filesystem_library.h"``
 in order to ensure the presence of the symbol on which
 :func:`~arrow::fs::LoadFileSystemFactories` depends.
-
diff --git a/docs/source/cpp/memory.rst b/docs/source/cpp/memory.rst
index ad8276e3728a2..33907b5580f61 100644
--- a/docs/source/cpp/memory.rst
+++ b/docs/source/cpp/memory.rst
@@ -205,7 +205,7 @@ simply do::
 Memory Profiling
 ================
 
-On Linux, detailed profiles of memory allocations can be generated using 
+On Linux, detailed profiles of memory allocations can be generated using
 ``perf record``, without any need to modify the binaries. These profiles can
 show the traceback in addition to allocation size. This does require debug
 symbols, from either a debug build or a release with debug symbols build.
@@ -234,14 +234,14 @@ recorded allocations, so we can correlate them with the call to free/de-allocate
 .. tab-set::
 
    .. tab-item:: jemalloc
-      
+
       .. code-block:: shell
 
-         perf probe -x libarrow.so je_arrow_mallocx '$params' 
-         perf probe -x libarrow.so je_arrow_mallocx%return '$retval' 
-         perf probe -x libarrow.so je_arrow_rallocx '$params' 
-         perf probe -x libarrow.so je_arrow_rallocx%return '$retval' 
-         perf probe -x libarrow.so je_arrow_dallocx '$params' 
+         perf probe -x libarrow.so je_arrow_mallocx '$params'
+         perf probe -x libarrow.so je_arrow_mallocx%return '$retval'
+         perf probe -x libarrow.so je_arrow_rallocx '$params'
+         perf probe -x libarrow.so je_arrow_rallocx%return '$retval'
+         perf probe -x libarrow.so je_arrow_dallocx '$params'
          PROBE_ARGS="-e probe_libarrow:je_arrow_mallocx \
             -e probe_libarrow:je_arrow_mallocx__return \
             -e probe_libarrow:je_arrow_rallocx \
@@ -249,13 +249,13 @@ recorded allocations, so we can correlate them with the call to free/de-allocate
             -e probe_libarrow:je_arrow_dallocx"
 
    .. tab-item:: mimalloc
-      
+
       .. code-block:: shell
 
-         perf probe -x libarrow.so mi_malloc_aligned '$params' 
-         perf probe -x libarrow.so mi_malloc_aligned%return '$retval' 
-         perf probe -x libarrow.so mi_realloc_aligned '$params' 
-         perf probe -x libarrow.so mi_realloc_aligned%return '$retval' 
+         perf probe -x libarrow.so mi_malloc_aligned '$params'
+         perf probe -x libarrow.so mi_malloc_aligned%return '$retval'
+         perf probe -x libarrow.so mi_realloc_aligned '$params'
+         perf probe -x libarrow.so mi_realloc_aligned%return '$retval'
          perf probe -x libarrow.so mi_free '$params'
          PROBE_ARGS="-e probe_libarrow:mi_malloc_aligned \
             -e probe_libarrow:mi_malloc_aligned__return \
@@ -277,9 +277,9 @@ If you want to profile a running process, you can run ``perf record -p <PID>``
 and it will record until you interrupt with CTRL+C. Alternatively, you can do
 ``perf record -P <PID> sleep 10`` to record for 10 seconds.
 
-The resulting data can be processed with standard tools to work with perf or 
+The resulting data can be processed with standard tools to work with perf or
 ``perf script`` can be used to pipe a text format of the data to custom scripts.
-The following script parses ``perf script`` output and prints the output in 
+The following script parses ``perf script`` output and prints the output in
 new lines delimited JSON for easier processing.
 
 .. code-block:: python
@@ -354,7 +354,7 @@ Here's an example invocation of that script, with a preview of output data:
 
 
 From there one can answer a number of questions. For example, the following
-script will find which allocations were never freed, and print the associated 
+script will find which allocations were never freed, and print the associated
 tracebacks along with the count of dangling allocations:
 
 .. code-block:: python
diff --git a/docs/source/cpp/parquet.rst b/docs/source/cpp/parquet.rst
index 3e06352f5dde3..9d2a5d791fed0 100644
--- a/docs/source/cpp/parquet.rst
+++ b/docs/source/cpp/parquet.rst
@@ -51,8 +51,8 @@ FileReader
 ----------
 
 To read Parquet data into Arrow structures, use :class:`arrow::FileReader`.
-To construct, it requires a :class:`::arrow::io::RandomAccessFile` instance 
-representing the input file. To read the whole file at once, 
+To construct, it requires a :class:`::arrow::io::RandomAccessFile` instance
+representing the input file. To read the whole file at once,
 use :func:`arrow::FileReader::ReadTable`:
 
 .. literalinclude:: ../../../cpp/examples/arrow/parquet_read_write.cc
@@ -67,7 +67,7 @@ Finer-grained options are available through the
 and :class:`ArrowReaderProperties` classes.
 
 For reading as a stream of batches, use the :func:`arrow::FileReader::GetRecordBatchReader`
-method to retrieve a :class:`arrow::RecordBatchReader`. It will use the batch 
+method to retrieve a :class:`arrow::RecordBatchReader`. It will use the batch
 size set in :class:`ArrowReaderProperties`.
 
 .. literalinclude:: ../../../cpp/examples/arrow/parquet_read_write.cc
@@ -106,8 +106,8 @@ If memory efficiency is more important than performance, then:
 #. Turn on ``enable_buffered_stream`` in :class:`parquet::ReaderProperties`.
 
 In addition, if you know certain columns contain many repeated values, you can
-read them as :term:`dictionary encoded<dictionary-encoding>` columns. This is 
-enabled with the ``set_read_dictionary`` setting on :class:`ArrowReaderProperties`. 
+read them as :term:`dictionary encoded<dictionary-encoding>` columns. This is
+enabled with the ``set_read_dictionary`` setting on :class:`ArrowReaderProperties`.
 If the files were written with Arrow C++ and the ``store_schema`` was activated,
 then the original Arrow schema will be automatically read and will override this
 setting.
@@ -174,7 +174,7 @@ The :func:`arrow::WriteTable` function writes an entire
 
 .. note::
 
-   Column compression is off by default in C++. See :ref:`below <parquet-writer-properties>` 
+   Column compression is off by default in C++. See :ref:`below <parquet-writer-properties>`
    for how to choose a compression codec in the writer properties.
 
 To write out data batch-by-batch, use :class:`arrow::FileWriter`.
@@ -191,9 +191,9 @@ StreamWriter
 
 The :class:`StreamWriter` allows for Parquet files to be written using
 standard C++ output operators, similar to reading with the :class:`StreamReader`
-class. This type-safe approach also ensures that rows are written without 
-omitting fields and allows for new row groups to be created automatically 
-(after certain volume of data) or explicitly by using the :type:`EndRowGroup` 
+class. This type-safe approach also ensures that rows are written without
+omitting fields and allows for new row groups to be created automatically
+(after certain volume of data) or explicitly by using the :type:`EndRowGroup`
 stream modifier.
 
 Exceptions are used to signal errors.  A :class:`ParquetException` is
@@ -266,20 +266,20 @@ group that takes precedent over the ``chunk_size`` passed in the write methods.
 You can set the version of Parquet to write with ``version``, which determines
 which logical types are available. In addition, you can set the data page version
 with ``data_page_version``. It's V1 by default; setting to V2 will allow more
-optimal compression (skipping compressing pages where there isn't a space 
+optimal compression (skipping compressing pages where there isn't a space
 benefit), but not all readers support this data page version.
 
-Compression is off by default, but to get the most out of Parquet, you should 
-also choose a compression codec. You can choose one for the whole file or 
+Compression is off by default, but to get the most out of Parquet, you should
+also choose a compression codec. You can choose one for the whole file or
 choose one for individual columns. If you choose a mix, the file-level option
-will apply to columns that don't have a specific compression codec. See 
+will apply to columns that don't have a specific compression codec. See
 :class:`::arrow::Compression` for options.
 
-Column data encodings can likewise be applied at the file-level or at the 
-column level. By default, the writer will attempt to dictionary encode all 
+Column data encodings can likewise be applied at the file-level or at the
+column level. By default, the writer will attempt to dictionary encode all
 supported columns, unless the dictionary grows too large. This behavior can
 be changed at file-level or at the column level with ``disable_dictionary()``.
-When not using dictionary encoding, it will fallback to the encoding set for 
+When not using dictionary encoding, it will fallback to the encoding set for
 the column or the overall file; by default ``Encoding::PLAIN``, but this can
 be changed with ``encoding()``.
 
@@ -522,8 +522,8 @@ An Arrow Dictionary type is written out as its value type.  It can still
 be recreated at read time using Parquet metadata (see "Roundtripping Arrow
 types" below).
 
-Roundtripping Arrow types
-~~~~~~~~~~~~~~~~~~~~~~~~~
+Roundtripping Arrow types and schema
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 While there is no bijection between Arrow types and Parquet types, it is
 possible to serialize the Arrow schema as part of the Parquet file metadata.
@@ -531,8 +531,7 @@ This is enabled using :func:`ArrowWriterProperties::store_schema`.
 
 On the read path, the serialized schema will be automatically recognized
 and will recreate the original Arrow data, converting the Parquet data as
-required (for example, a LargeList will be recreated from the Parquet LIST
-type).
+required.
 
 As an example, when serializing an Arrow LargeList to Parquet:
 
@@ -542,6 +541,20 @@ As an example, when serializing an Arrow LargeList to Parquet:
   :func:`ArrowWriterProperties::store_schema` was enabled when writing the file;
   otherwise, it is decoded as an Arrow List.
 
+Parquet field id
+""""""""""""""""
+
+The Parquet format supports an optional integer *field id* which can be assigned
+to a given field. This is used for example in the
+`Apache Iceberg specification <https://github.com/apache/iceberg/blob/main/format/spec.md#column-projection>`__.
+
+On the writer side, if ``PARQUET:field_id`` is present as a metadata key on an
+Arrow field, then its value is parsed as a non-negative integer and is used as
+the field id for the corresponding Parquet field.
+
+On the reader side, Arrow will convert such a field id to a metadata key named
+``PARQUET:field_id`` on the corresponding Arrow field.
+
 Serialization details
 """""""""""""""""""""
 
@@ -549,6 +562,7 @@ The Arrow schema is serialized as a :ref:`Arrow IPC <format-ipc>` schema message
 then base64-encoded and stored under the ``ARROW:schema`` metadata key in
 the Parquet file metadata.
 
+
 Limitations
 ~~~~~~~~~~~
 
@@ -559,7 +573,7 @@ Encryption
 
 Parquet C++ implements all features specified in the
 `encryption specification <https://github.com/apache/parquet-format/blob/master/Encryption.md>`__,
-except for encryption of column index and bloom filter modules. 
+except for encryption of column index and bloom filter modules.
 
 More specifically, Parquet C++ supports:
 
diff --git a/docs/source/cpp/tables.rst b/docs/source/cpp/tables.rst
index b28a9fc1e13a5..d98a2acde6620 100644
--- a/docs/source/cpp/tables.rst
+++ b/docs/source/cpp/tables.rst
@@ -81,13 +81,13 @@ and computation functions, possibly incremental.
    :alt: A graphical representation of an Arrow Table and a Record Batch, with
          structure as described in text above.
 
-Record batches can be sent between implementations, such as via 
+Record batches can be sent between implementations, such as via
 :ref:`IPC <format-ipc>` or
-via the :doc:`C Data Interface <../format/CDataInterface>`. Tables and 
+via the :doc:`C Data Interface <../format/CDataInterface>`. Tables and
 chunked arrays, on the other hand, are concepts in the C++ implementation,
 not in the Arrow format itself, so they aren't directly portable.
 
-However, a table can be converted to and built from a sequence of record 
+However, a table can be converted to and built from a sequence of record
 batches easily without needing to copy the underlying array buffers.
 A table can be streamed as an arbitrary number of record batches using
 a :class:`arrow::TableBatchReader`.  Conversely, a logical sequence of
diff --git a/docs/source/cpp/threading.rst b/docs/source/cpp/threading.rst
index 24ad25b5a028a..4a1a65ffe012d 100644
--- a/docs/source/cpp/threading.rst
+++ b/docs/source/cpp/threading.rst
@@ -99,4 +99,4 @@ Arrow C++ uses :class:`arrow::Future` to communicate results between threads.  T
 an :class:`arrow::Future` will be created when an operation needs to perform some kind
 of long running task that will block for some period of time.  :class:`arrow::Future`
 objects are mainly meant for internal use and any method that returns an
-:class:`arrow::Future` will usually have a synchronous variant as well.
\ No newline at end of file
+:class:`arrow::Future` will usually have a synchronous variant as well.
diff --git a/docs/source/cpp/tutorials/compute_tutorial.rst b/docs/source/cpp/tutorials/compute_tutorial.rst
index bcb87e6a8f992..a650865d75ce4 100644
--- a/docs/source/cpp/tutorials/compute_tutorial.rst
+++ b/docs/source/cpp/tutorials/compute_tutorial.rst
@@ -34,7 +34,7 @@ functionality to:
 
 3. Search for a value in a column
 
-Pre-requisites 
+Pre-requisites
 ---------------
 
 Before continuing, make sure you have:
@@ -49,16 +49,16 @@ Setup
 Before running some computations, we need to fill in a couple gaps:
 
 1. We need to include necessary headers.
-   
+
 2. ``A main()`` is needed to glue things together.
 
 3. We need data to play with.
-   
+
 Includes
 ^^^^^^^^
 
-Before writing C++ code, we need some includes. We'll get ``iostream`` for output, then import Arrow's 
-compute functionality: 
+Before writing C++ code, we need some includes. We'll get ``iostream`` for output, then import Arrow's
+compute functionality:
 
 .. literalinclude:: ../../../../cpp/examples/tutorial_examples/compute_example.cc
   :language: cpp
@@ -340,4 +340,4 @@ Refer to the below for a copy of the complete code:
   :start-after: (Doc section: Compute Example)
   :end-before: (Doc section: Compute Example)
   :linenos:
-  :lineno-match:
\ No newline at end of file
+  :lineno-match:
diff --git a/docs/source/cpp/tutorials/datasets_tutorial.rst b/docs/source/cpp/tutorials/datasets_tutorial.rst
index 285fc24d8d599..f60e1e52170ae 100644
--- a/docs/source/cpp/tutorials/datasets_tutorial.rst
+++ b/docs/source/cpp/tutorials/datasets_tutorial.rst
@@ -33,7 +33,7 @@ file on disk. In this article, you will:
 
 2. write out a partitioned dataset from a Table.
 
-Pre-requisites 
+Pre-requisites
 ---------------
 
 Before continuing, make sure you have:
@@ -50,7 +50,7 @@ Setup
 Before running some computations, we need to fill in a couple gaps:
 
 1. We need to include necessary headers.
-   
+
 2. A ``main()`` is needed to glue things together.
 
 3. We need data on disk to play with.
@@ -58,8 +58,8 @@ Before running some computations, we need to fill in a couple gaps:
 Includes
 ^^^^^^^^
 
-Before writing C++ code, we need some includes. We'll get ``iostream`` for output, then import Arrow's 
-compute functionality for each file type we'll work with in this article: 
+Before writing C++ code, we need some includes. We'll get ``iostream`` for output, then import Arrow's
+compute functionality for each file type we'll work with in this article:
 
 .. literalinclude:: ../../../../cpp/examples/tutorial_examples/dataset_example.cc
   :language: cpp
@@ -206,7 +206,7 @@ Build Dataset using Factory
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 With a :class:`dataset::FileSystemDatasetFactory` set up, we can actually build our
-:class:`dataset::Dataset` with :func:`dataset::FileSystemDatasetFactory::Finish`, just 
+:class:`dataset::Dataset` with :func:`dataset::FileSystemDatasetFactory::Finish`, just
 like with an :class:`ArrayBuilder` back in the basic tutorial:
 
 .. literalinclude:: ../../../../cpp/examples/tutorial_examples/dataset_example.cc
@@ -228,14 +228,14 @@ dataset, and print those out, along with some small info:
 Move Dataset into Table
 ^^^^^^^^^^^^^^^^^^^^^^^
 
-One way we can do something with :class:`Datasets <dataset::Dataset>` is getting 
-them into a :class:`Table`, where we can do anything we’ve learned we can do to 
-:class:`Tables <Table>` to that :class:`Table`. 
+One way we can do something with :class:`Datasets <dataset::Dataset>` is getting
+them into a :class:`Table`, where we can do anything we’ve learned we can do to
+:class:`Tables <Table>` to that :class:`Table`.
 
 .. seealso:: :doc:`/cpp/streaming_execution` for execution that avoids manifesting the entire dataset in memory.
 
-In order to move a :class:`Dataset’s <dataset::Dataset>` contents into a :class:`Table`, 
-we need a :class:`dataset::Scanner`, which scans the data and outputs it to the :class:`Table`. 
+In order to move a :class:`Dataset’s <dataset::Dataset>` contents into a :class:`Table`,
+we need a :class:`dataset::Scanner`, which scans the data and outputs it to the :class:`Table`.
 First, we get a :class:`dataset::ScannerBuilder` from the :class:`dataset::Dataset`:
 
 .. literalinclude:: ../../../../cpp/examples/tutorial_examples/dataset_example.cc
@@ -305,7 +305,7 @@ Create Scanner for Moving Table Data
 The process for writing a :class:`dataset::Dataset`, once a source of data is available,
 is similar to the reverse of reading it. Before, we used a :class:`dataset::Scanner` in
 order to scan into a :class:`Table` – now, we need one to read out of our
-:class:`TableBatchReader`. To get that :class:`dataset::Scanner`, we’ll make a :class:`dataset::ScannerBuilder` 
+:class:`TableBatchReader`. To get that :class:`dataset::Scanner`, we’ll make a :class:`dataset::ScannerBuilder`
 based on our :class:`TableBatchReader`, then use that Builder to build a :class:`dataset::Scanner`:
 
 .. literalinclude:: ../../../../cpp/examples/tutorial_examples/dataset_example.cc
@@ -343,7 +343,7 @@ Arrow, so we’ll write back out to that:
   :start-after: (Doc section: Write Format)
   :end-before: (Doc section: Write Format)
 
-Configure FileSystemDatasetWriteOptions 
+Configure FileSystemDatasetWriteOptions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 In order to write to disk, we need some configuration. We’ll do so via
@@ -435,11 +435,11 @@ tutorials.
 With that, you’ve read and written partitioned datasets! This method,
 with some configuration, will work for any supported dataset format. For
 an example of such a dataset, the NYC Taxi dataset is a well-known
-one, which you can find `here <https://www1.nyc.gov/site/tlc/about/tlc-trip-record-data.page>`_. 
+one, which you can find `here <https://www1.nyc.gov/site/tlc/about/tlc-trip-record-data.page>`_.
 Now you can get larger-than-memory data mapped for use!
 
 Which means that now we have to be able to process this data without
-pulling it all into memory at once. For this, try Acero. 
+pulling it all into memory at once. For this, try Acero.
 
 .. seealso:: :doc:`/cpp/streaming_execution` for more information on Acero.
 
@@ -450,4 +450,4 @@ Refer to the below for a copy of the complete code:
   :start-after: (Doc section: Dataset Example)
   :end-before: (Doc section: Dataset Example)
   :linenos:
-  :lineno-match:
\ No newline at end of file
+  :lineno-match:
diff --git a/docs/source/cpp/tutorials/io_tutorial.rst b/docs/source/cpp/tutorials/io_tutorial.rst
index f981c94b83e32..309f10a350aa3 100644
--- a/docs/source/cpp/tutorials/io_tutorial.rst
+++ b/docs/source/cpp/tutorials/io_tutorial.rst
@@ -33,7 +33,7 @@ the start to end of an application. In this article, you will:
 
 3. Read a Parquet file into a :class:`Table` and write it back out afterwards
 
-Pre-requisites 
+Pre-requisites
 ---------------
 
 Before continuing, make sure you have:
@@ -50,7 +50,7 @@ Setup
 Before writing out some file I/O, we need to fill in a couple gaps:
 
 1. We need to include necessary headers.
-   
+
 2. A ``main()`` is needed to glue things together.
 
 3. We need files to play with.
@@ -58,8 +58,8 @@ Before writing out some file I/O, we need to fill in a couple gaps:
 Includes
 ^^^^^^^^
 
-Before writing C++ code, we need some includes. We'll get ``iostream`` for output, then import Arrow's 
-I/O functionality for each file type we'll work with in this article: 
+Before writing C++ code, we need some includes. We'll get ``iostream`` for output, then import Arrow's
+I/O functionality for each file type we'll work with in this article:
 
 .. literalinclude:: ../../../../cpp/examples/tutorial_examples/file_access_example.cc
   :language: cpp
@@ -156,8 +156,8 @@ Opening an Arrow file Reader
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 An :class:`io::ReadableFile` is too generic to offer all functionality to read an Arrow file.
-We need to use it to get an :class:`ipc::RecordBatchFileReader` object. This object implements 
-all the logic needed to read an Arrow file with correct formatting. We get one through 
+We need to use it to get an :class:`ipc::RecordBatchFileReader` object. This object implements
+all the logic needed to read an Arrow file with correct formatting. We get one through
 :func:`ipc::RecordBatchFileReader::Open`:
 
 .. literalinclude:: ../../../../cpp/examples/tutorial_examples/file_access_example.cc
@@ -294,8 +294,8 @@ Write a CSV File from Table
 
 CSV writing to :class:`Table` looks exactly like IPC writing to :class:`RecordBatch`,
 except with our :class:`Table`, and using :func:`ipc::RecordBatchWriter::WriteTable` instead of
-:func:`ipc::RecordBatchWriter::WriteRecordBatch`. Note that the same writer class is used -- 
-we're writing with :func:`ipc::RecordBatchWriter::WriteTable` because we have a :class:`Table`. We’ll target 
+:func:`ipc::RecordBatchWriter::WriteRecordBatch`. Note that the same writer class is used --
+we're writing with :func:`ipc::RecordBatchWriter::WriteTable` because we have a :class:`Table`. We’ll target
 a file, use our :class:`Table’s <Table>` :class:`Schema`, and then write the :class:`Table`:
 
 .. literalinclude:: ../../../../cpp/examples/tutorial_examples/file_access_example.cc
@@ -358,7 +358,7 @@ even though we used :func:`io::ReadableFile::Open`. Note that we pass our
 Reading a Parquet File to Table
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-With a prepared :class:`parquet::arrow::FileReader` in hand, we can read to a 
+With a prepared :class:`parquet::arrow::FileReader` in hand, we can read to a
 :class:`Table`, except we must pass the :class:`Table` by reference instead of outputting to it:
 
 .. literalinclude:: ../../../../cpp/examples/tutorial_examples/file_access_example.cc
@@ -401,4 +401,4 @@ Refer to the below for a copy of the complete code:
   :start-after: (Doc section: File I/O)
   :end-before: (Doc section: File I/O)
   :linenos:
-  :lineno-match:
\ No newline at end of file
+  :lineno-match:
diff --git a/docs/source/developers/continuous_integration/index.rst b/docs/source/developers/continuous_integration/index.rst
index f988b5ab69d50..cfca14e10e48c 100644
--- a/docs/source/developers/continuous_integration/index.rst
+++ b/docs/source/developers/continuous_integration/index.rst
@@ -27,4 +27,4 @@ Continuous Integration
    overview
    docker
    archery
-   crossbow
\ No newline at end of file
+   crossbow
diff --git a/docs/source/developers/continuous_integration/overview.rst b/docs/source/developers/continuous_integration/overview.rst
index 93e74f269d50a..9d39c90cfd2d3 100644
--- a/docs/source/developers/continuous_integration/overview.rst
+++ b/docs/source/developers/continuous_integration/overview.rst
@@ -30,7 +30,7 @@ Some files central to Arrow CI are:
 
 We use :ref:`Docker<docker-builds>` in order to have portable and reproducible Linux builds, as well as running Windows builds in Windows containers.  We use :ref:`Archery<Archery>` and :ref:`Crossbow<Crossbow>` to help co-ordinate the various CI tasks.
 
-One thing to note is that some of the services defined in ``docker-compose.yml`` are interdependent.  When running services locally, you must either manually build its dependencies first, or build it via the use of ``archery run ...`` which automatically finds and builds dependencies.
+One thing to note is that some of the services defined in ``docker-compose.yml`` are interdependent.  When running services locally, you must either manually build its dependencies first, or build it via the use of ``archery docker run ...`` which automatically finds and builds dependencies.
 
 There are numerous important directories in the Arrow project which relate to CI:
 
diff --git a/docs/source/developers/cpp/building.rst b/docs/source/developers/cpp/building.rst
index 5fab745679e93..b052b856c9bd5 100644
--- a/docs/source/developers/cpp/building.rst
+++ b/docs/source/developers/cpp/building.rst
@@ -67,7 +67,7 @@ On Alpine Linux:
            gcc \
            ninja \
            make
-           
+
 On Fedora Linux:
 
 .. code-block:: shell
@@ -99,7 +99,7 @@ On macOS, you can use `Homebrew <https://brew.sh/>`_:
 With `vcpkg <https://github.com/Microsoft/vcpkg>`_:
 
 .. code-block:: shell
-   
+
    git clone https://github.com/apache/arrow.git
    cd arrow
    vcpkg install \
@@ -312,7 +312,7 @@ depends on ``python`` being available).
 
 On some Linux distributions, running the test suite might require setting an
 explicit locale. If you see any locale-related errors, try setting the
-environment variable (which requires the `locales` package or equivalent):
+environment variable (which requires the ``locales`` package or equivalent):
 
 .. code-block::
 
@@ -362,7 +362,7 @@ boolean flags to ``cmake``.
 * ``-DARROW_GCS=ON``: Build Arrow with GCS support (requires the GCloud SDK for C++)
 * ``-DARROW_HDFS=ON``: Arrow integration with libhdfs for accessing the Hadoop
   Filesystem
-* ``-DARROW_JEMALLOC=ON``: Build the Arrow jemalloc-based allocator, on by default 
+* ``-DARROW_JEMALLOC=ON``: Build the Arrow jemalloc-based allocator, on by default
 * ``-DARROW_JSON=ON``: JSON reader module
 * ``-DARROW_MIMALLOC=ON``: Build the Arrow mimalloc-based allocator
 * ``-DARROW_ORC=ON``: Arrow integration with Apache ORC
@@ -375,7 +375,7 @@ boolean flags to ``cmake``.
   instead.
 * ``-DARROW_S3=ON``: Support for Amazon S3-compatible filesystems
 * ``-DARROW_SUBSTRAIT=ON``: Build with support for Substrait
-* ``-DARROW_WITH_RE2=ON``: Build with support for regular expressions using the re2 
+* ``-DARROW_WITH_RE2=ON``: Build with support for regular expressions using the re2
   library, on by default and used when ``ARROW_COMPUTE`` or ``ARROW_GANDIVA`` is ``ON``
 * ``-DARROW_WITH_UTF8PROC=ON``: Build with support for Unicode properties using
   the utf8proc library, on by default and used when ``ARROW_COMPUTE`` or ``ARROW_GANDIVA``
@@ -472,7 +472,7 @@ The build system supports a number of third-party dependencies
   * ``c-ares``: a dependency of gRPC
   * ``gflags``: for command line utilities (formerly Googleflags)
   * ``GLOG``: for logging
-  * ``google_cloud_cpp_storage``: for Google Cloud Storage support, requires 
+  * ``google_cloud_cpp_storage``: for Google Cloud Storage support, requires
     system cURL and can use the ``BUNDLED`` method described below
   * ``gRPC``: for remote procedure calls
   * ``GTest``: Googletest, for testing
@@ -627,9 +627,10 @@ outputs like:
 Deprecations and API Changes
 ----------------------------
 
-We use the compiler definition ``ARROW_NO_DEPRECATED_API`` to disable APIs that
-have been deprecated. It is a good practice to compile third party applications
-with this flag to proactively catch and account for API changes.
+We use the marco ``ARROW_DEPRECATED`` which wraps C++ deprecated attribute for
+APIs that have been deprecated. It is a good practice to compile third party
+applications with ``-Werror=deprecated-declarations`` (for GCC/Clang or similar
+flags of other compilers) to proactively catch and account for API changes.
 
 Modular Build Targets
 ---------------------
diff --git a/docs/source/developers/cpp/emscripten.rst b/docs/source/developers/cpp/emscripten.rst
new file mode 100644
index 0000000000000..b4c563aae1a3b
--- /dev/null
+++ b/docs/source/developers/cpp/emscripten.rst
@@ -0,0 +1,99 @@
+.. 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.
+
+
+.. highlight:: console
+
+.. _developers-cpp-emscripten:
+===============================================
+Cross compiling for WebAssembly with Emscripten
+===============================================
+
+Prerequisites
+-------------
+You need CMake and compilers etc. installed as per the normal build instructions. Before building with Emscripten, you also need to install Emscripten and
+activate it using the commands below (see https://emscripten.org/docs/getting_started/downloads.html for details).
+
+.. code:: shell
+
+   git clone https://github.com/emscripten-core/emsdk.git
+   cd emsdk
+   # replace <version> with the desired EMSDK version.
+   # e.g. for Pyodide 0.24, you need EMSDK version 3.1.45
+   ./emsdk install <version>
+   ./emsdk activate <version>
+   source ./emsdk_env.sh
+
+If you want to build PyArrow for `Pyodide <https://pyodide.org>`_, you
+need ``pyodide-build`` installed via ``pip``, and to be running with the
+same version of Python that Pyodide is built for, along with the same
+versions of emsdk tools.
+
+.. code:: shell
+
+   # install Pyodide build tools.
+   # e.g. for version 0.24 of Pyodide:
+   pip install pyodide-build==0.24
+
+Then build with the ``ninja-release-emscripten`` CMake preset,
+like below:
+
+.. code:: shell
+
+   emcmake cmake --preset "ninja-release-emscripten"
+   ninja install
+
+This will install a built static library version of ``libarrow`` it into the
+Emscripten sysroot cache, meaning you can build things that depend on it
+and they will find ``libarrow``.
+
+e.g. if you want to build for Pyodide, run the commands above, and then
+go to ``arrow/python`` and run
+
+.. code:: shell
+
+   pyodide build
+
+It should make a wheel targeting the currently enabled version of
+Pyodide (i.e. the version corresponding to the currently installed
+``pyodide-build``) in the ``dist`` subdirectory.
+
+
+Manual Build
+------------
+
+If you want to manually build for Emscripten, take a look at the
+``CMakePresets.json`` file in the ``arrow/cpp`` directory for a list of things
+you will need to override. In particular you will need:
+
+#. Build dependencies set to ``BUNDLED``, so it uses properly cross
+   compiled build dependencies.
+
+#. ``CMAKE_TOOLCHAIN_FILE`` set by using ``emcmake cmake`` instead of just ``cmake``.
+
+#. You will quite likely need to set ``ARROW_ENABLE_THREADING`` to ``OFF``
+   for builds targeting single threaded Emscripten environments such as
+   Pyodide.
+
+#. ``ARROW_FLIGHT`` and anything else that uses network probably won't
+   work.
+
+#. ``ARROW_JEMALLOC`` and ``ARROW_MIMALLOC`` again probably need to be
+   ``OFF``
+
+#. ``ARROW_BUILD_STATIC`` set to ``ON`` and ``ARROW_BUILD_SHARED`` set to
+   ``OFF`` is most likely to work.
diff --git a/docs/source/developers/cpp/index.rst b/docs/source/developers/cpp/index.rst
index 36c9778bea1b0..603e1607dc543 100644
--- a/docs/source/developers/cpp/index.rst
+++ b/docs/source/developers/cpp/index.rst
@@ -27,5 +27,6 @@ C++ Development
    building
    development
    windows
+   emscripten
    conventions
    fuzzing
diff --git a/docs/source/developers/cpp/windows.rst b/docs/source/developers/cpp/windows.rst
index 251a45325fe0b..60ac949e81663 100644
--- a/docs/source/developers/cpp/windows.rst
+++ b/docs/source/developers/cpp/windows.rst
@@ -379,9 +379,9 @@ Downloading the Timezone Database
 =================================
 
 To run some of the compute unit tests on Windows, the IANA timezone database
-and the Windows timezone mapping need to be downloaded first. See 
+and the Windows timezone mapping need to be downloaded first. See
 :ref:`download-timezone-database` for download instructions. To set a non-default
-path for the timezone database while running the unit tests, set the 
+path for the timezone database while running the unit tests, set the
 ``ARROW_TIMEZONE_DATABASE`` environment variable.
 
 Replicating Appveyor Builds
diff --git a/docs/source/developers/documentation.rst b/docs/source/developers/documentation.rst
index 8b1ea28c0f54b..a479065f6297e 100644
--- a/docs/source/developers/documentation.rst
+++ b/docs/source/developers/documentation.rst
@@ -259,7 +259,7 @@ Build the docs in the target directory:
    sphinx-build ./source/developers ./source/developers/_build -c ./source -D master_doc=temp_index
 
 This builds everything in the target directory to a folder inside of it
-called ``_build`` using the config file in the `source` directory.
+called ``_build`` using the config file in the ``source`` directory.
 
 Once you have verified the HTML documents, you can remove temporary index file:
 
diff --git a/docs/source/developers/guide/architectural_overview.rst b/docs/source/developers/guide/architectural_overview.rst
index 58e05c85f457e..085a814453c84 100644
--- a/docs/source/developers/guide/architectural_overview.rst
+++ b/docs/source/developers/guide/architectural_overview.rst
@@ -29,8 +29,8 @@
 Architectural Overview
 **********************
 
-A general overview of Apache Arrow project can be found on the 
-`front page <https://arrow.apache.org/>`_ and in the 
+A general overview of Apache Arrow project can be found on the
+`front page <https://arrow.apache.org/>`_ and in the
 `Apache Arrow Overview <https://arrow.apache.org/overview/>`_.
 You can also have a look at the
 `Frequently Asked Questions <https://arrow.apache.org/faq/>`_.
diff --git a/docs/source/developers/guide/communication.rst b/docs/source/developers/guide/communication.rst
index a8659f83ac04d..749c94f9419b2 100644
--- a/docs/source/developers/guide/communication.rst
+++ b/docs/source/developers/guide/communication.rst
@@ -27,7 +27,7 @@
 .. _communication:
 
 *************
-Communication 
+Communication
 *************
 
 **About the contributors**
@@ -50,7 +50,7 @@ tags ([C++], [R], [Ruby] etc.) so it gets noticed by the right people.
 Where to get help 👋
 ====================
 
-For any question you may have or problems you are facing you can write to 
+For any question you may have or problems you are facing you can write to
 user or development :ref:`mailing_list` or you can create an issue on
 :ref:`github`. Also use GitHub to search through the issues, report bugs
 and create feature requests or proposals.
diff --git a/docs/source/developers/guide/documentation.rst b/docs/source/developers/guide/documentation.rst
index 3bb3bebef5098..8f9d7311e765f 100644
--- a/docs/source/developers/guide/documentation.rst
+++ b/docs/source/developers/guide/documentation.rst
@@ -49,7 +49,7 @@ documentation itself, you can search for an issue in GitHub.
 
 Documentation improvements are also a great way to gain some
 experience with our submission and review process without
-requiring a lot of local development environment setup. 
+requiring a lot of local development environment setup.
 
 .. note::
    Many documentation-only changes can be made directly in the
@@ -114,4 +114,3 @@ library. Source folder includes:
 
 **Cookbooks** have their own repository `<https://github.com/apache/arrow-cookbook>`_
 and can be separately cloned and built.
-
diff --git a/docs/source/developers/guide/index.rst b/docs/source/developers/guide/index.rst
index 353c8332ff0b5..0ed27a0ddc54e 100644
--- a/docs/source/developers/guide/index.rst
+++ b/docs/source/developers/guide/index.rst
@@ -83,17 +83,17 @@ of adding a basic feature.
    the installation of third-party packages, depending on which build
    options and components you enable. The C++ build guide
    has suggestions for commonly encountered issues - you can find it
-   :ref:`here <cpp-development>`. 
+   :ref:`here <cpp-development>`.
    Anytime you are stuck, feel free to reach out via
    appropriate :ref:`communication` channel.
 
-   See a short description about the building process of 
+   See a short description about the building process of
    :ref:`PyArrow or the R package<build-arrow-guide>` or go straight to detailed
    instructions on how to build one of Arrow libraries in the
    `documentation <https://arrow.apache.org/docs/>`_ .
- 
+
 #. **Run the tests**
-   
+
    We should run the tests to check if everything is working correctly. For example,
    you can run the tests from a terminal for Python
 
@@ -155,7 +155,7 @@ There are lots of ways to contribute to the project besides writing code!
 * Improving the **documentation** is a great way to start contributing!
   For more information visit :ref:`documentation` section of the guide.
 
-* **Apache Arrow Cookbooks** are a collection of recipes for solving various problems 
+* **Apache Arrow Cookbooks** are a collection of recipes for solving various problems
   and completing different tasks using Apache Arrow. They are also a great way to start
   contributing. For more information visit
   `How to contribute to Apache Arrow Cookbook <https://github.com/apache/arrow-cookbook/blob/main/CONTRIBUTING.md>`_
diff --git a/docs/source/developers/guide/resources.rst b/docs/source/developers/guide/resources.rst
index f350f469af403..b5905af65499b 100644
--- a/docs/source/developers/guide/resources.rst
+++ b/docs/source/developers/guide/resources.rst
@@ -78,7 +78,7 @@ Reproducible examples:
 - `Tidyverse: Make a reprex <https://www.tidyverse.org/help/#reprex>`_
 - `Craft Minimal Bug Reports by Matthew Rocklin <https://matthewrocklin.com/blog/work/2018/02/28/minimal-bug-reports>`_
 
-Recommended references 
+Recommended references
 ----------------------
 
 - Slatkin, Brett, *Effective Python: 90 Specific Ways to Write Better Python*, Addison-Wesley Professional, 2019
diff --git a/docs/source/developers/guide/step_by_step/arrow_codebase.rst b/docs/source/developers/guide/step_by_step/arrow_codebase.rst
index 0beece991b197..0c194ab3a3f70 100644
--- a/docs/source/developers/guide/step_by_step/arrow_codebase.rst
+++ b/docs/source/developers/guide/step_by_step/arrow_codebase.rst
@@ -99,8 +99,8 @@ can be called from a function in another language.  After a function is defined
 C++ we must create the binding manually to use it in that implementation.
 
 .. note::
-	There is much you can learn by checking **Pull Requests**
-	and **unit tests** for similar issues.
+  There is much you can learn by checking **Pull Requests**
+  and **unit tests** for similar issues.
 
 .. tab-set::
 
diff --git a/docs/source/developers/guide/step_by_step/finding_issues.rst b/docs/source/developers/guide/step_by_step/finding_issues.rst
index 390c56a81c73f..a76b15e917e9a 100644
--- a/docs/source/developers/guide/step_by_step/finding_issues.rst
+++ b/docs/source/developers/guide/step_by_step/finding_issues.rst
@@ -65,7 +65,7 @@ person who triaged the ticket expected it to be. Don't hesitate to write that
 in the comments.
 
 .. note::
-   
+
    When you find a GitHub issue you would like to work on, please mention
    your interest in the comment section of that issue; that way we will know
    you are working on it.
diff --git a/docs/source/developers/guide/step_by_step/set_up.rst b/docs/source/developers/guide/step_by_step/set_up.rst
index 60b472637badb..9c808ceee7be6 100644
--- a/docs/source/developers/guide/step_by_step/set_up.rst
+++ b/docs/source/developers/guide/step_by_step/set_up.rst
@@ -60,7 +60,7 @@ a username and password each time you execute a git command.
    RStudio project and will create a ``.Rproj`` file in the root directory.
    For this reason it is *highly recommended* to clone the repository using
    the command line or a Git client.
-   
+
 Get the source code
 ===================
 
@@ -118,10 +118,10 @@ Should give you a result similar to this:
 
 .. code:: console
 
-   origin	https://github.com/<your username>/arrow.git (fetch)
-   origin	https://github.com/<your username>/arrow.git (push)
-   upstream	https://github.com/apache/arrow (fetch)
-   upstream	https://github.com/apache/arrow (push)
+   origin    https://github.com/<your username>/arrow.git (fetch)
+   origin    https://github.com/<your username>/arrow.git (push)
+   upstream  https://github.com/apache/arrow (fetch)
+   upstream  https://github.com/apache/arrow (push)
 
 If you did everything correctly, you should now have a copy of the code
 in the ``arrow`` directory and two remotes that refer to your own GitHub
diff --git a/docs/source/developers/guide/step_by_step/styling.rst b/docs/source/developers/guide/step_by_step/styling.rst
index bb428b0b6ab40..c155acb389512 100644
--- a/docs/source/developers/guide/step_by_step/styling.rst
+++ b/docs/source/developers/guide/step_by_step/styling.rst
@@ -59,4 +59,4 @@ check your code and will stop the commit process, described in
 the following section, if there are any errors.
 
 - `Pre-commit installation instructions <https://pre-commit.com/#installation>`_
-- `Pre-commit hooks <https://pre-commit.com/hooks.html>`_
\ No newline at end of file
+- `Pre-commit hooks <https://pre-commit.com/hooks.html>`_
diff --git a/docs/source/developers/guide/tutorials/index.rst b/docs/source/developers/guide/tutorials/index.rst
index dcefab23230f9..5f44231afc9c2 100644
--- a/docs/source/developers/guide/tutorials/index.rst
+++ b/docs/source/developers/guide/tutorials/index.rst
@@ -25,4 +25,4 @@ Tutorials
    :maxdepth: 1
 
    python_tutorial
-   r_tutorial
\ No newline at end of file
+   r_tutorial
diff --git a/docs/source/developers/guide/tutorials/python_tutorial.rst b/docs/source/developers/guide/tutorials/python_tutorial.rst
index 7f004160b0e75..c12c4489aee95 100644
--- a/docs/source/developers/guide/tutorials/python_tutorial.rst
+++ b/docs/source/developers/guide/tutorials/python_tutorial.rst
@@ -137,7 +137,7 @@ function is defined in the ``compute.py`` file.
 
 After examining the ``compute.py`` file we can see that together
 with ``_compute.pyx`` the functions from C++ get wrapped into Python.
-We will define the new feature at the end of the ``compute.py`` file. 
+We will define the new feature at the end of the ``compute.py`` file.
 
 Lets run some code in the Python console from ``arrow/python``
 directory in order to learn more about ``pc.min_max``.
@@ -147,10 +147,10 @@ directory in order to learn more about ``pc.min_max``.
    $ cd python
    $ python
 
-   Python 3.9.7 (default, Oct 22 2021, 13:24:00) 
+   Python 3.9.7 (default, Oct 22 2021, 13:24:00)
    [Clang 13.0.0 (clang-1300.0.29.3)] on darwin
    Type "help", "copyright", "credits" or "license" for more information.
-   
+
 We have entered into the Python console from the shell and we can
 do some research:
 
@@ -278,7 +278,7 @@ options for the ``pc.min_max`` function we can finish the work.
       return pa.scalar([('min-', min_t), ('max+', max_t)], type=ty)
 
 .. TODO seealso
-   .. For more information about the Arrow codebase visit 
+   .. For more information about the Arrow codebase visit
    .. :ref:``. (link to working on the Arrow codebase section)
 
 Adding a test
@@ -303,24 +303,24 @@ a specific unit test, pass in the test name to the ``-k`` parameter.
 .. code:: console
 
    $ cd python
-   $ python -m pytest pyarrow/tests/test_compute.py -k test_tutorial_min_max                    
+   $ python -m pytest pyarrow/tests/test_compute.py -k test_tutorial_min_max
    ======================== test session starts ==========================
    platform darwin -- Python 3.9.7, pytest-6.2.5, py-1.10.0, pluggy-1.0.0
    rootdir: /Users/alenkafrim/repos/arrow/python, configfile: setup.cfg
    plugins: hypothesis-6.24.1, lazy-fixture-0.6.3
-   collected 204 items / 203 deselected / 1 selected                                                                                   
+   collected 204 items / 203 deselected / 1 selected
 
    pyarrow/tests/test_compute.py .                                  [100%]
 
    ======================== 1 passed, 203 deselected in 0.16s ============
-   
 
-   $ python -m pytest pyarrow/tests/test_compute.py                       
+
+   $ python -m pytest pyarrow/tests/test_compute.py
    ======================== test session starts ===========================
    platform darwin -- Python 3.9.7, pytest-6.2.5, py-1.10.0, pluggy-1.0.0
    rootdir: /Users/alenkafrim/repos/arrow/python, configfile: setup.cfg
    plugins: hypothesis-6.24.1, lazy-fixture-0.6.3
-   collected 204 items                                                                                                                 
+   collected 204 items
 
    pyarrow/tests/test_compute.py ................................... [ 46%]
    .................................................                 [100%]
@@ -339,7 +339,7 @@ utility called `Archery <https://arrow.apache.org/docs/developers/archery.html>`
 to check if code is in line with PEP 8 style guide.
 
 .. code:: console
-   
+
    $ archery lint --python --fix
    INFO:archery:Running Python formatter (autopep8)
    INFO:archery:Running Python linter (flake8)
@@ -430,7 +430,7 @@ to the branch history):
    $ git commit -am "Adding a new compute feature for tutorial purposes"
    [ARROW-14977 170ef85be] Adding a new compute feature for tutorial purposes
     2 files changed, 51 insertions(+)
-   
+
 
 We can use ``git log`` to check the history of commits:
 
@@ -448,12 +448,12 @@ We can use ``git log`` to check the history of commits:
    Date:   Sun Dec 5 15:19:46 2021 +0900
 
        ARROW-14981: [CI][Docs] Upload built documents
-       
+
        We can use this in release process instead of building on release
        manager's local environment.
-       
+
        Closes #11856 from kou/ci-docs-upload
-       
+
        Authored-by: Sutou Kouhei <kou@clear-code.com>
        Signed-off-by: Sutou Kouhei <kou@clear-code.com>
    ...
@@ -478,10 +478,10 @@ called ``origin``.
    Writing objects: 100% (7/7), 1.19 KiB | 1.19 MiB/s, done.
    Total 7 (delta 6), reused 0 (delta 0), pack-reused 0
    remote: Resolving deltas: 100% (6/6), completed with 6 local objects.
-   remote: 
+   remote:
    remote: Create a pull request for 'ARROW-14977' on GitHub by visiting:
    remote:      https://github.com/AlenkaF/arrow/pull/new/ARROW-14977
-   remote: 
+   remote:
    To https://github.com/AlenkaF/arrow.git
     * [new branch]          ARROW-14977 -> ARROW-14977
 
@@ -490,7 +490,7 @@ to create a Pull Request. On the GitHub Arrow
 page (main or forked) we will see a yellow notice
 bar with a note that we made recent pushes to the branch
 ARROW-14977. That’s great, now we can make the Pull Request
-by clicking on **Compare & pull request**. 
+by clicking on **Compare & pull request**.
 
 .. figure:: ../../images/python_tutorial_github_pr_notice.jpeg
    :scale: 50 %
@@ -527,5 +527,5 @@ the code, comment, resolve conversations and so on. The Pull Request
 we made can be viewed `here <https://github.com/apache/arrow/pull/11900>`_.
 
 .. seealso::
-   
+
    For more information about Pull Request workflow see :ref:`pr_lifecycle`.
diff --git a/docs/source/developers/java/building.rst b/docs/source/developers/java/building.rst
index 27e2de97328c3..82053e901186c 100644
--- a/docs/source/developers/java/building.rst
+++ b/docs/source/developers/java/building.rst
@@ -347,6 +347,11 @@ Arrow repository, and update the following settings:
 * If using IntelliJ's Maven integration to build, you may need to change
   ``<fork>`` to ``false`` in the pom.xml files due to an `IntelliJ bug
   <https://youtrack.jetbrains.com/issue/IDEA-278903>`__.
+* To enable debugging JNI-based modules like ``dataset``,
+  activate specific profiles in the Maven tab under "Profiles".
+  Ensure the profiles ``arrow-c-data``, ``arrow-jni``, ``generate-libs-cdata-all-os``,
+  ``generate-libs-jni-macos-linux``, and ``jdk11+`` are enabled, so that the
+  IDE can build them and enable debugging.
 
 You may not need to update all of these settings if you build/test with the
 IntelliJ Maven integration instead of with IntelliJ directly.
diff --git a/docs/source/developers/java/development.rst b/docs/source/developers/java/development.rst
index 261cd5702ae07..dd1839257a30e 100644
--- a/docs/source/developers/java/development.rst
+++ b/docs/source/developers/java/development.rst
@@ -110,7 +110,46 @@ integration tests, you would do:
 Code Style
 ==========
 
-Code style is enforced with Checkstyle. The configuration is located at `checkstyle`_.
+The current Java code follows the `Google Java Style`_ with Apache license headers.
+
+Java code style is checked by `Spotless`_ during the build, and the continuous integration build will verify
+that changes adhere to the style guide.
+
+Automatically fixing code style issues
+--------------------------------------
+
+- You can check the style without building the project with ``mvn spotless:check``.
+- You can autoformat the source with ``mvn spotless:apply``.
+
+Example:
+
+.. code-block:: bash
+
+    The following files had format violations:
+        src/main/java/org/apache/arrow/algorithm/rank/VectorRank.java
+            @@ -15,7 +15,6 @@
+            ·*·limitations·under·the·License.
+            ·*/
+
+            -
+            package·org.apache.arrow.algorithm.rank;
+
+            import·java.util.stream.IntStream;
+    Run 'mvn spotless:apply' to fix these violations.
+
+Code Formatter for Intellij IDEA and Eclipse
+--------------------------------------------
+
+Follow the instructions to set up google-java-format for:
+
+- `Eclipse`_
+- `IntelliJ`_
+
+
+Checkstyle
+----------
+
+Checkstyle is also used for general linting. The configuration is located at `checkstyle`_.
 You can also just check the style without building the project.
 This checks the code style of all source code under the current directory or from within an individual module.
 
@@ -118,7 +157,41 @@ This checks the code style of all source code under the current directory or fro
 
     $ mvn checkstyle:check
 
+Maven ``pom.xml`` style is enforced with Spotless using `Apache Maven pom.xml guidelines`_
+You can also just check the style without building the project.
+This checks the style of all pom.xml files under the current directory or from within an individual module.
+
+.. code-block::
+
+    $ mvn spotless:check
+
+This applies the style to all pom.xml files under the current directory or from within an individual module.
+
+.. code-block::
+
+    $ mvn spotless:apply
+
 .. _benchmark: https://github.com/ursacomputing/benchmarks
 .. _archery: https://github.com/apache/arrow/blob/main/dev/conbench_envs/README.md#L188
 .. _conbench: https://github.com/conbench/conbench
 .. _checkstyle: https://github.com/apache/arrow/blob/main/java/dev/checkstyle/checkstyle.xml
+.. _Apache Maven pom.xml guidelines: https://maven.apache.org/developers/conventions/code.html#pom-code-convention
+.. _Spotless: https://github.com/diffplug/spotless
+.. _Google Java Style: https://google.github.io/styleguide/javaguide.html
+.. _Eclipse: https://github.com/google/google-java-format?tab=readme-ov-file#eclipse
+.. _IntelliJ: https://github.com/google/google-java-format?tab=readme-ov-file#intellij-android-studio-and-other-jetbrains-ides
+
+Build Caching
+=============
+
+Build caching is done through Develocity (formerly Maven Enterprise).  To force
+a build without the cache, run::
+
+    mvn clean install -Ddevelocity.cache.local.enabled=false -Ddevelocity.cache.remote.enabled=false
+
+This can be useful to make sure you see all warnings from ErrorProne, for example.
+
+ErrorProne
+==========
+
+ErrorProne should be disabled for generated code.
diff --git a/docs/source/developers/overview.rst b/docs/source/developers/overview.rst
index c7bc4273313bc..5a18b1e4eb8db 100644
--- a/docs/source/developers/overview.rst
+++ b/docs/source/developers/overview.rst
@@ -75,7 +75,7 @@ checklist for using ``git``:
     locally, for example if additional commits have been made by a colleague.  By using
     ``--force-with-lease`` instead of ``--force``, you ensure those commits are not overwritten
     and can fetch those changes if desired.
-    
+
   .. dropdown:: Setting rebase to be default
     :animate: fade-in-slide-down
     :class-container: sd-shadow-none
@@ -202,4 +202,3 @@ Implementations that do not intend to implement cross endian support:
 
 For other libraries, a discussion to gather consensus on the mailing-list
 should be had before submitting PRs.
-
diff --git a/docs/source/developers/python.rst b/docs/source/developers/python.rst
index be9fac067cb52..2f3e892ce8ede 100644
--- a/docs/source/developers/python.rst
+++ b/docs/source/developers/python.rst
@@ -302,10 +302,24 @@ created above (stored in ``$ARROW_HOME``):
 
 .. code-block::
 
-   $ mkdir arrow/cpp/build
-   $ pushd arrow/cpp/build
-   $ cmake -DCMAKE_INSTALL_PREFIX=$ARROW_HOME \
-           -DCMAKE_INSTALL_LIBDIR=lib \
+   $ cmake -S arrow/cpp -B arrow/cpp/build \
+           -DCMAKE_INSTALL_PREFIX=$ARROW_HOME \
+           --preset ninja-release-python
+   $ cmake --build arrow/cpp/build --target install
+
+``ninja-release-python`` is not the only preset available - if you would like a
+build with more features like CUDA, Flight and Gandiva support you may opt for
+the ``ninja-release-python-maximal`` preset. If you wanted less features, (i.e.
+removing ORC and dataset support) you could opt for
+``ninja-release-python-minimal``. Changing the word ``release`` to ``debug``
+with any of the aforementioned presets will generate a debug build of Arrow.
+
+The presets are provided as a convenience, but you may instead opt to
+specify the individual components:
+
+.. code-block::
+   $ cmake -S arrow/cpp -B arrow/cpp/build \
+           -DCMAKE_INSTALL_PREFIX=$ARROW_HOME \
            -DCMAKE_BUILD_TYPE=Debug \
            -DARROW_BUILD_TESTS=ON \
            -DARROW_COMPUTE=ON \
@@ -321,11 +335,8 @@ created above (stored in ``$ARROW_HOME``):
            -DARROW_WITH_SNAPPY=ON \
            -DARROW_WITH_ZLIB=ON \
            -DARROW_WITH_ZSTD=ON \
-           -DPARQUET_REQUIRE_ENCRYPTION=ON \
-           ..
-   $ make -j4
-   $ make install
-   $ popd
+           -DPARQUET_REQUIRE_ENCRYPTION=ON
+   $ cmake --build arrow/cpp/build --target install -j4
 
 There are a number of optional components that can be switched ON by
 adding flags with ``ON``:
@@ -386,18 +397,14 @@ Now, build pyarrow:
 .. code-block::
 
    $ pushd arrow/python
-   $ export PYARROW_WITH_PARQUET=1
-   $ export PYARROW_WITH_DATASET=1
    $ export PYARROW_PARALLEL=4
    $ python setup.py build_ext --inplace
    $ popd
 
-If you did build one of the optional components (in C++), you need to set the
-corresponding ``PYARROW_WITH_$COMPONENT`` environment variable to 1.
-
-Similarly, if you built with ``PARQUET_REQUIRE_ENCRYPTION`` (in C++), you
-need to set the corresponding ``PYARROW_WITH_PARQUET_ENCRYPTION`` environment
-variable to 1.
+If you did build one of the optional components in C++, the equivalent components
+will be enabled by default for building pyarrow. This default can be overridden
+by setting the corresponding ``PYARROW_WITH_$COMPONENT`` environment variable
+to 0 or 1, see :ref:`python-dev-env-variables` below.
 
 To set the number of threads used to compile PyArrow's C++/Cython components,
 set the ``PYARROW_PARALLEL`` environment variable.
@@ -540,7 +547,6 @@ Now, we can build pyarrow:
 .. code-block::
 
    $ pushd arrow\python
-   $ set PYARROW_WITH_PARQUET=1
    $ set CONDA_DLL_SEARCH_MODIFICATION_ENABLE=1
    $ python setup.py build_ext --inplace
    $ popd
@@ -590,46 +596,12 @@ Then run the unit tests with:
 Caveats
 -------
 
+.. _python-dev-env-variables:
+
 Relevant components and environment variables
 =============================================
 
-List of relevant Arrow CMake flags and corresponding environment variables
-to be used when building PyArrow are:
-
-.. list-table::
-   :widths: 30 30
-   :header-rows: 1
-
-   * - Arrow flags/options
-     - Corresponding environment variables for PyArrow
-   * - ``CMAKE_BUILD_TYPE``
-     - ``PYARROW_BUILD_TYPE`` (release, debug or relwithdebinfo)
-   * - ``ARROW_GCS``
-     - ``PYARROW_WITH_GCS``
-   * - ``ARROW_S3``
-     - ``PYARROW_WITH_S3``
-   * - ``ARROW_HDFS``
-     - ``PYARROW_WITH_HDFS``
-   * - ``ARROW_CUDA``
-     - ``PYARROW_WITH_CUDA``
-   * - ``ARROW_SUBSTRAIT``
-     - ``PYARROW_WITH_SUBSTRAIT``
-   * - ``ARROW_FLIGHT``
-     - ``PYARROW_WITH_FLIGHT``
-   * - ``ARROW_DATASET``
-     - ``PYARROW_WITH_DATASET``
-   * - ``ARROW_PARQUET``
-     - ``PYARROW_WITH_PARQUET``
-   * - ``PARQUET_REQUIRE_ENCRYPTION``
-     - ``PYARROW_WITH_PARQUET_ENCRYPTION``
-   * - ``ARROW_TENSORFLOW``
-     - ``PYARROW_WITH_TENSORFLOW``
-   * - ``ARROW_ORC``
-     - ``PYARROW_WITH_ORC``
-   * - ``ARROW_GANDIVA``
-     - ``PYARROW_WITH_GANDIVA``
-
-List of relevant environment variables that can also be used to build
+List of relevant environment variables that can be used to build
 PyArrow are:
 
 .. list-table::
@@ -639,6 +611,9 @@ PyArrow are:
    * - PyArrow environment variable
      - Description
      - Default value
+   * - ``PYARROW_BUILD_TYPE``
+     - Build type for PyArrow (release, debug or relwithdebinfo), sets ``CMAKE_BUILD_TYPE``
+     - ``release``
    * - ``PYARROW_CMAKE_GENERATOR``
      - Example: ``'Visual Studio 15 2017 Win64'``
      - ``''``
@@ -667,6 +642,45 @@ PyArrow are:
      - Number of processes used to compile PyArrow’s C++/Cython components
      - ``''``
 
+The components being disabled or enabled when building PyArrrow is by default
+based on how Arrow C++ is build (i.e. it follows the ``ARROW_$COMPONENT`` flags).
+However, the ``PYARROW_WITH_$COMPONENT`` environment variables can still be used
+to override this when building PyArrow (e.g. to disable components, or to enforce
+certain components to be built):
+
+.. list-table::
+   :widths: 30 30
+   :header-rows: 1
+
+   * - Arrow flags/options
+     - Corresponding environment variables for PyArrow
+   * - ``ARROW_GCS``
+     - ``PYARROW_WITH_GCS``
+   * - ``ARROW_S3``
+     - ``PYARROW_WITH_S3``
+   * - ``ARROW_AZURE``
+     - ``PYARROW_WITH_AZURE``
+   * - ``ARROW_HDFS``
+     - ``PYARROW_WITH_HDFS``
+   * - ``ARROW_CUDA``
+     - ``PYARROW_WITH_CUDA``
+   * - ``ARROW_SUBSTRAIT``
+     - ``PYARROW_WITH_SUBSTRAIT``
+   * - ``ARROW_FLIGHT``
+     - ``PYARROW_WITH_FLIGHT``
+   * - ``ARROW_ACERO``
+     - ``PYARROW_WITH_ACERO``
+   * - ``ARROW_DATASET``
+     - ``PYARROW_WITH_DATASET``
+   * - ``ARROW_PARQUET``
+     - ``PYARROW_WITH_PARQUET``
+   * - ``PARQUET_REQUIRE_ENCRYPTION``
+     - ``PYARROW_WITH_PARQUET_ENCRYPTION``
+   * - ``ARROW_ORC``
+     - ``PYARROW_WITH_ORC``
+   * - ``ARROW_GANDIVA``
+     - ``PYARROW_WITH_GANDIVA``
+
 Deleting stale build artifacts
 ==============================
 
diff --git a/docs/source/developers/release.rst b/docs/source/developers/release.rst
index 09608f2834478..fae48e4d8e0f0 100644
--- a/docs/source/developers/release.rst
+++ b/docs/source/developers/release.rst
@@ -80,10 +80,10 @@ Ensure local tags are removed, gpg-agent is set and JIRA tickets are correctly a
 
     # Delete the local tag for RC1 or later
     git tag -d apache-arrow-<version>
-    
+
     # Setup gpg agent for signing artifacts
     source dev/release/setup-gpg-agent.sh
-    
+
     # Curate the release
     # The end of the generated report shows the JIRA tickets with wrong version number assigned.
     archery release curate <version>
@@ -106,7 +106,7 @@ If there is consensus and there is a Release Manager willing to take the effort
 the release a patch release can be created.
 
 Committers can tag issues that should be included on the next patch release using the
-`backport-candidate` label. Is the responsability of the author or the committer to add the
+``backport-candidate`` label. Is the responsability of the author or the committer to add the
 label to the issue to help the Release Manager identify the issues that should be backported.
 
 If a specific issue is identified as the reason to create a patch release the Release Manager
@@ -117,7 +117,7 @@ Be sure to go through on the following checklist:
 #. Create milestone
 #. Create maintenance branch
 #. Include issue that was requested as requiring new patch release
-#. Add new milestone to issues with `backport-candidate` label
+#. Add new milestone to issues with ``backport-candidate`` label
 #. cherry-pick issues into maintenance branch
 
 Creating a Release Candidate
@@ -131,7 +131,7 @@ branch from main.
 Follow up Release Candidates will update the maintenance branch by cherry-picking
 specific commits.
 
-For the the initial Release Candidate for a minor or a patch release we will create
+For the initial Release Candidate for a minor or a patch release we will create
 a maintenance branch from the previous corresponding release. For example,
 for a 15.0.1 patch we will create a maint-15.0.1 branch from maint-15.0.0 and for
 a maint-15.0.2 we will create it from maint-15.0.1. Once the maintenance branch is
@@ -180,7 +180,7 @@ Create the Release Candidate branch from the updated maintenance branch
 
     # Start from the updated maintenance branch.
     git checkout maint-X.Y.Z
-    
+
     # The following script will create a branch for the Release Candidate,
     # place the necessary commits updating the version number and then create a git tag
     # on OSX use gnu-sed with homebrew: brew install gnu-sed (and export to $PATH)
@@ -188,9 +188,9 @@ Create the Release Candidate branch from the updated maintenance branch
     # <rc-number> starts at 0 and increments every time the Release Candidate is burned
     # so for the first RC this would be: dev/release/01-prepare.sh 4.0.0 5.0.0 0
     dev/release/01-prepare.sh <version> <next-version> <rc-number>
-    
-    # Push the release tag (for RC1 or later the --force flag is required)
-    git push -u apache apache-arrow-<version>
+
+    # Push the release candidate tag
+    git push -u apache apache-arrow-<version>rc<rc-number>
     # Push the release candidate branch in order to trigger verification jobs later
     git push -u apache release-<version>-rc<rc-number>
 
@@ -200,24 +200,26 @@ Build source and binaries and submit them
 .. code-block::
 
     # Build the source release tarball and create Pull Request with verification tasks
+    #
+    # NOTE: You need to have GitHub CLI installed to run this script.
     dev/release/02-source.sh <version> <rc-number>
-    
+
     # Submit binary tasks using crossbow, the command will output the crossbow build id
     dev/release/03-binary-submit.sh <version> <rc-number>
-    
+
     # Wait for the crossbow jobs to finish
     archery crossbow status <crossbow-build-id>
-    
+
     # Download the produced binaries
     # This will download packages to a directory called packages/release-<version>-rc<rc-number>
     dev/release/04-binary-download.sh <version> <rc-number>
-    
+
     # Sign and upload the binaries
     #
     # On macOS the only way I could get this to work was running "echo "UPDATESTARTUPTTY" | gpg-connect-agent" before running this comment
     # otherwise I got errors referencing "ioctl" errors.
     dev/release/05-binary-upload.sh <version> <rc-number>
-    
+
     # Sign and upload the Java artifacts
     #
     # Note that you need to press the "Close" button manually by Web interface
@@ -225,8 +227,13 @@ Build source and binaries and submit them
     #   https://repository.apache.org/#stagingRepositories
     dev/release/06-java-upload.sh <version> <rc-number>
 
+    # Sign and upload MATLAB artifacts to the GitHub Releases area.
+    #
+    # Note that you need to have GitHub CLI installed to run this script.
+    dev/release/07-matlab-upload.sh <version> <rc-number>
+
     # Start verifications for binaries and wheels
-    dev/release/07-binary-verify.sh <version> <rc-number>
+    dev/release/08-binary-verify.sh <version> <rc-number>
 
 Verify the Release
 ------------------
@@ -257,9 +264,11 @@ Be sure to go through on the following checklist:
 #. Start the new version on JIRA for the related CPP PARQUET version
 #. Merge changes on release branch to maintenance branch for patch releases
 #. Add the new release to the Apache Reporter System
+#. Push release tag
 #. Upload source
 #. Upload binaries
 #. Update website
+#. Update GitHub Release Notes
 #. Update Homebrew packages
 #. Update MSYS2 package
 #. Upload RubyGems
@@ -325,6 +334,18 @@ Be sure to go through on the following checklist:
 
    Add relevant release data for Arrow to `Apache reporter <https://reporter.apache.org/addrelease.html?arrow>`_.
 
+.. dropdown:: Push release tag and create GitHub Release
+   :animate: fade-in-slide-down
+   :class-title: sd-fs-5
+   :class-container: sd-shadow-md
+
+   A committer must push the release tag to GitHub:
+
+   .. code-block:: Bash
+
+      # dev/release/post-01-tag.sh 0.1.0 0
+      dev/release/post-01-tag.sh <version> <rc>
+
 .. dropdown:: Upload source release artifacts to Subversion
    :animate: fade-in-slide-down
    :class-title: sd-fs-5
@@ -334,20 +355,20 @@ Be sure to go through on the following checklist:
 
    .. code-block:: Bash
 
-      # dev/release/post-01-upload.sh 0.1.0 0
-      dev/release/post-01-upload.sh <version> <rc>
+      # dev/release/post-02-upload.sh 0.1.0 0
+      dev/release/post-02-upload.sh <version> <rc>
 
 .. dropdown:: Upload binary release artifacts to Artifactory
    :animate: fade-in-slide-down
    :class-title: sd-fs-5
    :class-container: sd-shadow-md
 
-   A committer must upload the binary release artifacts to Artifactory:
+   A committer must upload the binary release artifacts to Artifactory and create the GitHub Release:
 
    .. code-block:: Bash
 
-      # dev/release/post-02-binary.sh 0.1.0 0
-      dev/release/post-02-binary.sh <version> <rc number>
+      # dev/release/post-03-binary.sh 0.1.0 0
+      dev/release/post-03-binary.sh <version> <rc number>
 
 .. dropdown:: Update website
    :animate: fade-in-slide-down
@@ -369,11 +390,23 @@ Be sure to go through on the following checklist:
 
       ## Generate a release note for the new version, update the
       ## latest release information automatically.
-      # dev/release/post-03-website.sh 9.0.0 10.0.0
-      dev/release/post-03-website.sh OLD_X.OLD_Y.OLD_Z X.Y.Z
+      # dev/release/post-04-website.sh 9.0.0 10.0.0
+      dev/release/post-04-website.sh OLD_X.OLD_Y.OLD_Z X.Y.Z
 
    This script pushes a ``release-note-X.Y.Z`` branch to your ``apache/arrow-site`` fork. You need to open a pull request from the ``release-note-X.Y.Z`` branch on your Web browser.
 
+.. dropdown:: Update Release Notes in apache/arrow GitHub Release
+   :animate: fade-in-slide-down
+   :class-title: sd-fs-5
+   :class-container: sd-shadow-md
+
+   A committer must run the following script:
+
+   .. code-block:: Bash
+
+      # dev/release/post-05-update-gh-release-notes.sh 17.0.0
+      dev/release/post-05-update-gh-release-notes.sh apache-arrow-X.Y.Z
+
 .. dropdown:: Update Homebrew packages
    :animate: fade-in-slide-down
    :class-title: sd-fs-5
@@ -395,8 +428,8 @@ Be sure to go through on the following checklist:
       git remote add <YOUR_GITHUB_ID> git@github.com:<YOUR_GITHUB_ID>/homebrew-core.git
       cd -
 
-      # dev/release/post-13-homebrew.sh 10.0.0 kou
-      dev/release/post-13-homebrew.sh X.Y.Z <YOUR_GITHUB_ID>
+      # dev/release/post-15-homebrew.sh 10.0.0 kou
+      dev/release/post-15-homebrew.sh X.Y.Z <YOUR_GITHUB_ID>
 
    This script pushes a ``apache-arrow-X.Y.Z`` branch to your ``Homebrew/homebrew-core`` fork. You need to create a pull request from the ``apache-arrow-X.Y.Z`` branch with ``apache-arrow, apache-arrow-glib: X.Y.Z`` title on your Web browser.
 
@@ -421,8 +454,8 @@ Be sure to go through on the following checklist:
       git remote add upstream https://github.com/msys2/MINGW-packages.git
       cd -
 
-      # dev/release/post-12-msys2.sh 10.0.0 ../MINGW-packages
-      dev/release/post-12-msys2.sh X.Y.Z <YOUR_MINGW_PACKAGES_FORK>
+      # dev/release/post-14-msys2.sh 10.0.0 ../MINGW-packages
+      dev/release/post-14-msys2.sh X.Y.Z <YOUR_MINGW_PACKAGES_FORK>
 
    This script pushes a ``arrow-X.Y.Z`` branch to your ``msys2/MINGW-packages`` fork. You need to create a pull request from the ``arrow-X.Y.Z`` branch with ``arrow: Update to X.Y.Z`` title on your Web browser.
 
@@ -446,8 +479,8 @@ Be sure to go through on the following checklist:
 
    .. code-block:: Bash
 
-      # dev/release/post-04-ruby.sh 10.0.0
-      dev/release/post-04-ruby.sh X.Y.Z
+      # dev/release/post-06-ruby.sh 10.0.0
+      dev/release/post-06-ruby.sh X.Y.Z
 
 .. dropdown:: Update JavaScript packages
    :animate: fade-in-slide-down
@@ -465,8 +498,8 @@ Be sure to go through on the following checklist:
       # Login to npmjs.com (You need to do this only for the first time)
       npm login --registry=https://registry.yarnpkg.com/
 
-      # dev/release/post-05-js.sh 10.0.0
-      dev/release/post-05-js.sh X.Y.Z
+      # dev/release/post-07-js.sh 10.0.0
+      dev/release/post-07-js.sh X.Y.Z
 
 .. dropdown:: Update C# packages
    :animate: fade-in-slide-down
@@ -481,8 +514,8 @@ Be sure to go through on the following checklist:
 
    .. code-block:: Bash
 
-      # NUGET_API_KEY=YOUR_NUGET_API_KEY dev/release/post-06-csharp.sh 10.0.0
-      NUGET_API_KEY=<your NuGet API key> dev/release/post-06-csharp.sh X.Y.Z
+      # NUGET_API_KEY=YOUR_NUGET_API_KEY dev/release/post-08-csharp.sh 10.0.0
+      NUGET_API_KEY=<your NuGet API key> dev/release/post-08-csharp.sh X.Y.Z
 
 .. dropdown:: Upload wheels/sdist to PyPI
    :animate: fade-in-slide-down
@@ -495,8 +528,8 @@ Be sure to go through on the following checklist:
 
    .. code-block:: Bash
 
-      # dev/release/post-09-python.sh 10.0.0
-      dev/release/post-09-python.sh <version>
+      # dev/release/post-11-python.sh 10.0.0
+      dev/release/post-11-python.sh <version>
 
 .. dropdown:: Publish Maven packages
    :animate: fade-in-slide-down
@@ -568,8 +601,8 @@ Be sure to go through on the following checklist:
       git remote add upstream https://github.com/microsoft/vcpkg.git
       cd -
 
-      # dev/release/post-14-vcpkg.sh 10.0.0 ../vcpkg
-      dev/release/post-14-vcpkg.sh X.Y.Z <YOUR_VCPKG_FORK>
+      # dev/release/post-16-vcpkg.sh 10.0.0 ../vcpkg
+      dev/release/post-16-vcpkg.sh X.Y.Z <YOUR_VCPKG_FORK>
 
    This script pushes a ``arrow-X.Y.Z`` branch to your ``microsoft/vcpkg`` fork. You need to create a pull request from the ``arrow-X.Y.Z`` branch with ``[arrow] Update to X.Y.Z`` title on your Web browser.
 
@@ -594,8 +627,8 @@ Be sure to go through on the following checklist:
       git remote add upstream https://github.com/conan-io/conan-center-index.git
       cd -
 
-      # dev/release/post-15-conan.sh 10.0.1 ../conan-center-index
-      dev/release/post-15-conan.sh X.Y.Z <YOUR_CONAN_CENTER_INDEX_FORK>
+      # dev/release/post-17-conan.sh 10.0.1 ../conan-center-index
+      dev/release/post-17-conan.sh X.Y.Z <YOUR_CONAN_CENTER_INDEX_FORK>
 
    This script pushes a ``arrow-X.Y.Z`` branch to your ``conan-io/conan-center-index`` fork. You need to create a pull request from the ``arrow-X.Y.Z`` branch on your Web browser.
 
@@ -609,8 +642,8 @@ Be sure to go through on the following checklist:
       # You can run the script with BUMP_TAG=0 and BUMP_PUSH=0
       # this will avoid default pushing to main and pushing the tag
       # but you will require to push manually after reviewing the commits.
-      # dev/release/post-11-bump-versions.sh 10.0.0 11.0.0
-      dev/release/post-11-bump-versions.sh X.Y.Z NEXT_X.NEXT_Y.NEXT_Z
+      # dev/release/post-12-bump-versions.sh 10.0.0 11.0.0
+      dev/release/post-12-bump-versions.sh X.Y.Z NEXT_X.NEXT_Y.NEXT_Z
 
 .. dropdown:: Update tags for Go modules
    :animate: fade-in-slide-down
@@ -619,8 +652,8 @@ Be sure to go through on the following checklist:
 
    .. code-block:: Bash
 
-      # dev/release/post-10-go.sh 10.0.0
-      dev/release/post-10-go.sh X.Y.Z
+      # dev/release/post-13-go.sh 10.0.0
+      dev/release/post-13-go.sh X.Y.Z
 
 .. dropdown:: Update docs
    :animate: fade-in-slide-down
@@ -640,8 +673,8 @@ Be sure to go through on the following checklist:
       git remote add apache git@github.com:apache/arrow-site.git
       cd -
 
-      # dev/release/post-08-docs.sh 10.0.0 9.0.0
-      dev/release/post-08-docs.sh X.Y.Z PREVIOUS_X.PREVIOUS_Y.PREVIOUS_Z
+      # dev/release/post-10-docs.sh 10.0.0 9.0.0
+      dev/release/post-10-docs.sh X.Y.Z PREVIOUS_X.PREVIOUS_Y.PREVIOUS_Z
 
    This script pushes a ``release-docs-X.Y.Z`` branch to your ``arrow-site`` fork. You need to create a Pull Request and use the ``asf-site`` branch as base for it.
 
@@ -686,4 +719,4 @@ Be sure to go through on the following checklist:
 
    .. code-block:: Bash
 
-      dev/release/post-07-remove-old-artifacts.sh
+      dev/release/post-09-remove-old-artifacts.sh
diff --git a/docs/source/developers/release_verification.rst b/docs/source/developers/release_verification.rst
index 53c8f54e5b5bd..afd220db6010d 100644
--- a/docs/source/developers/release_verification.rst
+++ b/docs/source/developers/release_verification.rst
@@ -44,20 +44,36 @@ Linux and macOS
 In order to run the verification script either for the source release or the
 binary artifacts see the following guidelines:
 
+Required source verification
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Individuals are REQUIRED to download all signed source code packages onto their
+own hardware, validate all cryptographic signatures, compile as provided,
+and test the result on their own platform in order to cast a +1 vote.
+
 .. code-block::
 
    # this will create and automatically clean up a temporary directory for the verification environment and will run the source verification
    TEST_DEFAULT=0 TEST_SOURCE=1 verify-release-candidate.sh $VERSION $RC_NUM
-   
-   # this will create and automatically clean up a temporary directory for the verification environment and will run the binary verification
-   TEST_DEFAULT=0 TEST_BINARIES=1 dev/release/verify-release-candidate.sh $VERSION $RC_NUM
-   
+
    # to verify only certain implementations use the TEST_DEFAULT=0 and TEST_* variables
    # here are a couple of examples, but see the source code for the available options
    TEST_DEFAULT=0 TEST_CPP=1 verify-release-candidate.sh $VERSION $RC_NUM  # only C++ tests
    TEST_DEFAULT=0 TEST_CPP=1 TEST_PYTHON=1 verify-release-candidate.sh $VERSION $RC_NUM  # C++ and Python tests
    TEST_DEFAULT=0 TEST_INTEGRATION_CPP=1 TEST_INTEGRATION_JAVA=1 verify-release-candidate.sh $VERSION $RC_NUM  # C++ and Java integration tests
-   
+
+Binary verification
+^^^^^^^^^^^^^^^^^^^
+
+The binaries are generated from the source that has been verified. Those binaries are
+tested on CI but can be tested locally for further validation. It is not necessary to
+test them in order to cast a positive vote.
+
+.. code-block::
+
+   # this will create and automatically clean up a temporary directory for the verification environment and will run the binary verification
+   TEST_DEFAULT=0 TEST_BINARIES=1 dev/release/verify-release-candidate.sh $VERSION $RC_NUM
+
    # to verify certain binaries use the TEST_* variables as:
    TEST_DEFAULT=0 TEST_WHEELS=1 verify-release-candidate.sh $VERSION $RC_NUM  # only Wheels
    TEST_DEFAULT=0 TEST_APT=1 verify-release-candidate.sh $VERSION $RC_NUM  # only APT packages
@@ -130,14 +146,13 @@ As an example:
    I've verified successfully the sources and binaries with:
 
    TEST_DEFAULT=0 TEST_SOURCE=1 dev/release/verify-release-candidate.sh 15.0.0 1
-   TEST_DEFAULT=0 TEST_BINARIES=1 dev/release/verify-release-candidate.sh 15.0.0 1
    with:
    * Python 3.10.12
    * gcc (Ubuntu 11.4.0-1ubuntu1~22.04) 11.4.0
    * NVIDIA CUDA Build cuda_11.5.r11.5/compiler.30672275_0
    * openjdk version "17.0.9" 2023-10-17
    * ruby 3.0.2p107 (2021-07-07 revision 0db68f0233) [x86_64-linux-gnu]
-   * dotnet 7.0.115
+   * dotnet 8.0.204
    * Ubuntu 22.04 LTS
 
 If there were some issues during verification please report them on the
diff --git a/docs/source/developers/reviewing.rst b/docs/source/developers/reviewing.rst
index b6e0c1f4023bd..1550d6aa7ce61 100644
--- a/docs/source/developers/reviewing.rst
+++ b/docs/source/developers/reviewing.rst
@@ -260,14 +260,14 @@ Social aspects
 Labelling
 =========
 
-While reviewing PRs, we should try to identify whether the corresponding issue 
+While reviewing PRs, we should try to identify whether the corresponding issue
 needs to be marked with one or both of the following issue labels:
 
 * **Critical Fix**: The change fixes either: (a) a security vulnerability;
   (b) a bug that causes incorrect or invalid data to be produced;
   or (c) a bug that causes a crash (while the API contract is upheld).
   This is intended to mark fixes to issues that may affect users without their
-  knowledge. For this reason, fixing bugs that cause errors don't count, since 
+  knowledge. For this reason, fixing bugs that cause errors don't count, since
   those bugs are usually obvious. Bugs that cause crashes are considered critical
   because they are a possible vector of Denial-of-Service attacks.
 * **Breaking Change**: The change breaks backwards compatibility in a public API.
@@ -275,7 +275,7 @@ needs to be marked with one or both of the following issue labels:
   compatibility, except for the few places where we do guarantee ABI
   compatibility (such as C Data Interface). Experimental APIs are *not*
   exempt from this; they are just more likely to be associated with this tag.
-  
+
 Breaking changes and critical fixes are separate: breaking changes alter the
 API contract, while critical fixes make the implementation align with the
 existing API contract. For example, fixing a bug that caused a Parquet reader
diff --git a/docs/source/format/ADBC.rst b/docs/source/format/ADBC.rst
index f90ab24d1b9c2..c11bba8f8cc93 100644
--- a/docs/source/format/ADBC.rst
+++ b/docs/source/format/ADBC.rst
@@ -92,7 +92,7 @@ implemented directly by a vendor-specific "driver" or a vendor-neutral
 
 Version 1.0.0 of the standard corresponds to tag adbc-1.0.0 of the
 repository ``apache/arrow-adbc``, which is commit
-f044edf5256abfb4c091b0ad2acc73afea2c93c0_.  Note that is is separate
+f044edf5256abfb4c091b0ad2acc73afea2c93c0_.  Note that is separate
 from releases of the actual implementations.
 
 See the language-specific pages for details:
@@ -188,25 +188,25 @@ bypass this wrapper.
 
 .. figure:: ./ADBCQuadrants.svg
 
-   ADBC, JDBC, and ODBC are database-agnostic.  They define the
-   API that the application uses, but not how that API is implemented,
-   instead deferring to drivers to fulfill requests using the protocol
-   of their choice.  JDBC and (generally) ODBC offer results in a
-   row-oriented format, while ADBC offers columnar Arrow data.
-
-   Protocols/libraries like libpq (Postgres) and TDS (SQL Server) are
-   database-specific and row-oriented.  Multiple databases may
-   implement the same protocol to try to reuse each other's work,
-   e.g. several databases implement the Postgres wire protocol to
-   benefit from its driver implementations.  But the protocol itself
-   was not designed with multiple databases in mind, nor are the
-   protocols generally meant to be used directly by applications.
-
-   Some database-specific protocols are Arrow-native, like those of
-   BigQuery and ClickHouse.  Flight SQL additionally is meant to be
-   database-agnostic, but it defines both the client-facing API and
-   the underlying protocol, so it's hard for applications to use it as
-   the API for databases that don't already implement Flight SQL.
+ADBC, JDBC, and ODBC are database-agnostic.  They define the
+API that the application uses, but not how that API is implemented,
+instead deferring to drivers to fulfill requests using the protocol
+of their choice.  JDBC and (generally) ODBC offer results in a
+row-oriented format, while ADBC offers columnar Arrow data.
+
+Protocols/libraries like libpq (Postgres) and TDS (SQL Server) are
+database-specific and row-oriented.  Multiple databases may
+implement the same protocol to try to reuse each other's work,
+e.g. several databases implement the Postgres wire protocol to
+benefit from its driver implementations.  But the protocol itself
+was not designed with multiple databases in mind, nor are the
+protocols generally meant to be used directly by applications.
+
+Some database-specific protocols are Arrow-native, like those of
+BigQuery and ClickHouse.  Flight SQL additionally is meant to be
+database-agnostic, but it defines both the client-facing API and
+the underlying protocol, so it's hard for applications to use it as
+the API for databases that don't already implement Flight SQL.
 
 Existing database client APIs
 -----------------------------
diff --git a/docs/source/format/CDataInterface/PyCapsuleInterface.rst b/docs/source/format/CDataInterface/PyCapsuleInterface.rst
index 03095aa2e9356..d38ba2822da46 100644
--- a/docs/source/format/CDataInterface/PyCapsuleInterface.rst
+++ b/docs/source/format/CDataInterface/PyCapsuleInterface.rst
@@ -27,8 +27,8 @@ The Arrow PyCapsule Interface
 Rationale
 =========
 
-The :ref:`C data interface <c-data-interface>` and
-:ref:`C stream interface <c-stream-interface>` allow moving Arrow data between
+The :ref:`C data interface <c-data-interface>`, :ref:`C stream interface <c-stream-interface>`
+and :ref:`C device interface <c-device-data-interface>` allow moving Arrow data between
 different implementations of Arrow. However, these interfaces don't specify how
 Python libraries should expose these structs to other libraries. Prior to this,
 many libraries simply provided export to PyArrow data structures, using the
@@ -43,7 +43,7 @@ Goals
 -----
 
 * Standardize the `PyCapsule`_ objects that represent ``ArrowSchema``, ``ArrowArray``,
-  and ``ArrowArrayStream``.
+  ``ArrowArrayStream``, ``ArrowDeviceArray`` and ``ArrowDeviceArrayStream``.
 * Define standard methods that export Arrow data into such capsule objects,
   so that any Python library wanting to accept Arrow data as input can call the
   corresponding method instead of hardcoding support for specific Arrow
@@ -64,7 +64,7 @@ structures should be wrapped in capsules. Capsules avoid invalid access by
 attaching a name to the pointer and avoid memory leaks by attaching a destructor.
 Thus, they are much safer than passing pointers as integers.
 
-`PyCapsule`_ allows for a ``name`` to be associated with the capsule, allowing 
+`PyCapsule`_ allows for a ``name`` to be associated with the capsule, allowing
 consumers to verify that the capsule contains the expected kind of data. To make sure
 Arrow structures are recognized, the following names must be used:
 
@@ -80,7 +80,10 @@ Arrow structures are recognized, the following names must be used:
      - ``arrow_array``
    * - ArrowArrayStream
      - ``arrow_array_stream``
-
+   * - ArrowDeviceArray
+     - ``arrow_device_array``
+   * - ArrowDeviceArrayStream
+     - ``arrow_device_array_stream``
 
 Lifetime Semantics
 ------------------
@@ -95,6 +98,10 @@ the data and marked the release callback as null, so there isn’t a risk of
 releasing data the consumer is using.
 :ref:`Read more in the C Data Interface specification <c-data-interface-released>`.
 
+In case of a device struct, the above mentioned release callback is the
+``release`` member of the embedded ``ArrowArray`` structure.
+:ref:`Read more in the C Device Interface specification <c-device-data-interface-semantics>`.
+
 Just like in the C Data Interface, the PyCapsule objects defined here can only
 be consumed once.
 
@@ -110,12 +117,17 @@ The interface consists of three separate protocols:
 * ``ArrowArrayExportable``, which defines the ``__arrow_c_array__`` method.
 * ``ArrowStreamExportable``, which defines the ``__arrow_c_stream__`` method.
 
+Two additional protocols are defined for the Device interface:
+
+* ``ArrowDeviceArrayExportable``, which defines the ``__arrow_c_device_array__`` method.
+* ``ArrowDeviceStreamExportable``, which defines the ``__arrow_c_device_stream__`` method.
+
 ArrowSchema Export
 ------------------
 
 Schemas, fields, and data types can implement the method ``__arrow_c_schema__``.
 
-.. py:method:: __arrow_c_schema__(self) -> object
+.. py:method:: __arrow_c_schema__(self)
 
     Export the object as an ArrowSchema.
 
@@ -129,12 +141,12 @@ ArrowArray Export
 Arrays and record batches (contiguous tables) can implement the method
 ``__arrow_c_array__``.
 
-.. py:method:: __arrow_c_array__(self, requested_schema: object | None = None) -> Tuple[object, object]
+.. py:method:: __arrow_c_array__(self, requested_schema=None)
 
     Export the object as a pair of ArrowSchema and ArrowArray structures.
 
-    :param requested_schema: A PyCapsule containing a C ArrowSchema representation 
-        of a requested schema. Conversion to this schema is best-effort. See 
+    :param requested_schema: A PyCapsule containing a C ArrowSchema representation
+        of a requested schema. Conversion to this schema is best-effort. See
         `Schema Requests`_.
     :type requested_schema: PyCapsule or None
 
@@ -142,24 +154,63 @@ Arrays and record batches (contiguous tables) can implement the method
         respectively. The schema capsule should have the name ``"arrow_schema"``
         and the array capsule should have the name ``"arrow_array"``.
 
+Libraries supporting the Device interface can implement a ``__arrow_c_device_array__``
+method on those objects, which works the same as ``__arrow_c_array__`` except
+for returning an ArrowDeviceArray structure instead of an ArrowArray structure:
+
+.. py:method:: __arrow_c_device_array__(self, requested_schema=None, **kwargs)
+
+    Export the object as a pair of ArrowSchema and ArrowDeviceArray structures.
+
+    :param requested_schema: A PyCapsule containing a C ArrowSchema representation
+        of a requested schema. Conversion to this schema is best-effort. See
+        `Schema Requests`_.
+    :type requested_schema: PyCapsule or None
+    :param kwargs: Additional keyword arguments should only be accepted if they have
+        a default value of ``None``, to allow for future addition of new keywords.
+        See :ref:`arrow-pycapsule-interface-device-support` for more details.
+
+    :return: A pair of PyCapsules containing a C ArrowSchema and ArrowDeviceArray,
+        respectively. The schema capsule should have the name ``"arrow_schema"``
+        and the array capsule should have the name ``"arrow_device_array"``.
 
 ArrowStream Export
 ------------------
 
 Tables / DataFrames and streams can implement the method ``__arrow_c_stream__``.
 
-.. py:method:: __arrow_c_stream__(self, requested_schema: object | None = None) -> object
+.. py:method:: __arrow_c_stream__(self, requested_schema=None)
 
     Export the object as an ArrowArrayStream.
 
-    :param requested_schema: A PyCapsule containing a C ArrowSchema representation 
-        of a requested schema. Conversion to this schema is best-effort. See 
+    :param requested_schema: A PyCapsule containing a C ArrowSchema representation
+        of a requested schema. Conversion to this schema is best-effort. See
         `Schema Requests`_.
     :type requested_schema: PyCapsule or None
 
     :return: A PyCapsule containing a C ArrowArrayStream representation of the
         object. The capsule must have a name of ``"arrow_array_stream"``.
 
+Libraries supporting the Device interface can implement a ``__arrow_c_device_stream__``
+method on those objects, which works the same as ``__arrow_c_stream__`` except
+for returning an ArrowDeviceArrayStream structure instead of an ArrowArrayStream
+structure:
+
+.. py:method:: __arrow_c_device_stream__(self, requested_schema=None, **kwargs)
+
+    Export the object as an ArrowDeviceArrayStream.
+
+    :param requested_schema: A PyCapsule containing a C ArrowSchema representation
+        of a requested schema. Conversion to this schema is best-effort. See
+        `Schema Requests`_.
+    :type requested_schema: PyCapsule or None
+    :param kwargs: Additional keyword arguments should only be accepted if they have
+        a default value of ``None``, to allow for future addition of new keywords.
+        See :ref:`arrow-pycapsule-interface-device-support` for more details.
+
+    :return: A PyCapsule containing a C ArrowDeviceArrayStream representation of the
+        object. The capsule must have a name of ``"arrow_device_array_stream"``.
+
 Schema Requests
 ---------------
 
@@ -185,14 +236,68 @@ raise an exception. The requested schema mechanism is only meant to negotiate
 between different representations of the same data and not to allow arbitrary
 schema transformations.
 
-
 .. _PyCapsule: https://docs.python.org/3/c-api/capsule.html
 
 
+.. _arrow-pycapsule-interface-device-support:
+
+Device Support
+--------------
+
+The PyCapsule interface has cross hardware support through using the
+:ref:`C device interface <c-device-data-interface>`. This means it is possible
+to exchange data on non-CPU devices (e.g. CUDA GPUs) and to inspect on what
+device the exchanged data lives.
+
+For exchanging the data structures, this interface has two sets of protocol
+methods: the standard CPU-only versions (:meth:`__arrow_c_array__` and
+:meth:`__arrow_c_stream__`) and the equivalent device-aware versions
+(:meth:`__arrow_c_device_array__`, and :meth:`__arrow_c_device_stream__`).
+
+For CPU-only producers, it is allowed to either implement only the standard
+CPU-only protocol methods, or either implement both the CPU-only and device-aware
+methods. The absence of the device version methods implies CPU-only data. For
+CPU-only consumers, it is encouraged to be able to consume both versions of the
+protocol.
+
+For a device-aware producer whose data structures can only reside in
+non-CPU memory, it is recommended to only implement the device version of the
+protocol (e.g. only add ``__arrow_c_device_array__``, and not add ``__arrow_c_array__``).
+Producers that have data structures that can live both on CPU or non-CPU devices
+can implement both versions of the protocol, but the CPU-only versions
+(:meth:`__arrow_c_array__` and :meth:`__arrow_c_stream__`) should be guaranteed
+to contain valid pointers for CPU memory (thus, when trying to export non-CPU data,
+either raise an error or make a copy to CPU memory).
+
+Producing the ``ArrowDeviceArray`` and ``ArrowDeviceArrayStream`` structures
+is expected to not involve any cross-device copying of data.
+
+The device-aware methods (:meth:`__arrow_c_device_array__`, and :meth:`__arrow_c_device_stream__`)
+should accept additional keyword arguments (``**kwargs``), if they have a
+default value of ``None``. This allows for future addition of new optional
+keywords, where the default value for such a new keyword will always be ``None``.
+The implementor is responsible for raising a ``NotImplementedError`` for any
+additional keyword being passed by the user which is not recognised. For
+example:
+
+.. code-block:: python
+
+    def __arrow_c_device_array__(self, requested_schema=None, **kwargs):
+
+        non_default_kwargs = [
+            name for name, value in kwargs.items() if value is not None
+        ]
+        if non_default_kwargs:
+            raise NotImplementedError(
+                f"Received unsupported keyword argument(s): {non_default_kwargs}"
+            )
+
+        ...
+
 Protocol Typehints
 ------------------
 
-The following typehints can be copied into your library to annotate that a 
+The following typehints can be copied into your library to annotate that a
 function accepts an object implementing one of these protocols.
 
 .. code-block:: python
@@ -217,6 +322,22 @@ function accepts an object implementing one of these protocols.
         ) -> object:
             ...
 
+    class ArrowDeviceArrayExportable(Protocol):
+        def __arrow_c_device_array__(
+            self,
+            requested_schema: object | None = None,
+            **kwargs,
+        ) -> Tuple[object, object]:
+            ...
+
+    class ArrowDeviceStreamExportable(Protocol):
+        def __arrow_c_device_stream__(
+            self,
+            requested_schema: object | None = None,
+            **kwargs,
+        ) -> object:
+            ...
+
 Examples
 ========
 
@@ -248,7 +369,7 @@ Below is the code to create a PyCapsule for an ``ArrowSchema``. The code for
              }
              free(schema);
          }
-         
+
          PyObject* ExportArrowSchemaPyCapsule() {
              struct ArrowSchema* schema =
                  (struct ArrowSchema*)malloc(sizeof(struct ArrowSchema));
@@ -270,9 +391,9 @@ Below is the code to create a PyCapsule for an ``ArrowSchema``. The code for
              )
              if schema.release != NULL:
                  schema.release(schema)
-         
+
              free(schema)
-         
+
          cdef object export_arrow_schema_py_capsule():
              cdef ArrowSchema* schema = <ArrowSchema*>malloc(sizeof(ArrowSchema))
              # It's recommended to immediately wrap the struct in a capsule, so
@@ -305,7 +426,7 @@ code for ``ArrowArray`` and ``ArrowArrayStream`` is similar.
       .. code-block:: c
 
          #include <Python.h>
-         
+
          // If the capsule is not an ArrowSchema, will return NULL and set an exception.
          struct ArrowSchema* GetArrowSchemaPyCapsule(PyObject* capsule) {
            return PyCapsule_GetPointer(capsule, "arrow_schema");
@@ -316,7 +437,7 @@ code for ``ArrowArray`` and ``ArrowArrayStream`` is similar.
       .. code-block:: cython
 
          cimport cpython
-        
+
          cdef ArrowSchema* get_arrow_schema_py_capsule(object capsule) except NULL:
              return <ArrowSchema*>cpython.PyCapsule_GetPointer(capsule, 'arrow_schema')
 
@@ -429,7 +550,7 @@ implementing the DataFrame Interchange Protocol.
 Comparison to ``__arrow_array__`` protocol
 ------------------------------------------
 
-The :ref:`arrow_array_protocol` protocol is a dunder method that 
+The :ref:`arrow_array_protocol` protocol is a dunder method that
 defines how PyArrow should import an object as an Arrow array. Unlike this
 protocol, it is specific to PyArrow and isn't used by other libraries. It is
-also limited to arrays and does not support schemas, tabular structures, or streams.
\ No newline at end of file
+also limited to arrays and does not support schemas, tabular structures, or streams.
diff --git a/docs/source/format/CDeviceDataInterface.rst b/docs/source/format/CDeviceDataInterface.rst
index b5b7229a679e1..59433bae47e27 100644
--- a/docs/source/format/CDeviceDataInterface.rst
+++ b/docs/source/format/CDeviceDataInterface.rst
@@ -256,6 +256,10 @@ has the following fields:
     type are on the system. The semantics of the id will be hardware dependent,
     but we use an ``int64_t`` to future-proof the id as devices change over time.
 
+    For device types that do not have an intrinsic notion of a device identifier (e.g.,
+    ``ARROW_DEVICE_CPU``), it is recommended to use a ``device_id`` of -1 as a
+    convention.
+
 .. c:member:: ArrowDeviceType ArrowDeviceArray.device_type
 
     *Mandatory.* The type of the device which can access the buffers in the array.
@@ -344,6 +348,7 @@ Notes:
   synchronization is needed for an extension device, the producer
   should document the type.
 
+.. _c-device-data-interface-semantics:
 
 Semantics
 =========
@@ -689,4 +694,4 @@ Any incompatible changes should be part of a new specification, for example
 .. _Vulkan: https://www.vulkan.org/
 .. _Metal: https://developer.apple.com/metal/
 .. _ROCm: https://www.amd.com/en/graphics/servers-solutions-rocm
-.. _oneAPI: https://www.intel.com/content/www/us/en/developer/tools/oneapi/overview.html
\ No newline at end of file
+.. _oneAPI: https://www.intel.com/content/www/us/en/developer/tools/oneapi/overview.html
diff --git a/docs/source/format/CanonicalExtensions.rst b/docs/source/format/CanonicalExtensions.rst
index 1f055b7f8edb5..c258f889dc6ac 100644
--- a/docs/source/format/CanonicalExtensions.rst
+++ b/docs/source/format/CanonicalExtensions.rst
@@ -51,7 +51,7 @@ types:
 
   3) Its serialization *must* be described in the proposal and should
      not require unduly implementation work or unusual software dependencies
-     (for example, a trivial custom text format or JSON would be acceptable).
+     (for example, a trivial custom text format or a JSON-based format would be acceptable).
 
   4) Its expected semantics *should* be described as well and any
      potential ambiguities or pain points addressed or at least mentioned.
@@ -77,7 +77,7 @@ Official List
 Fixed shape tensor
 ==================
 
-* Extension name: `arrow.fixed_shape_tensor`.
+* Extension name: ``arrow.fixed_shape_tensor``.
 
 * The storage type of the extension: ``FixedSizeList`` where:
 
@@ -153,7 +153,7 @@ Fixed shape tensor
 Variable shape tensor
 =====================
 
-* Extension name: `arrow.variable_shape_tensor`.
+* Extension name: ``arrow.variable_shape_tensor``.
 
 * The storage type of the extension is: ``StructArray`` where struct
   is composed of **data** and **shape** fields describing a single
@@ -251,6 +251,38 @@ Variable shape tensor
    Values inside each **data** tensor element are stored in row-major/C-contiguous
    order according to the corresponding **shape**.
 
+.. _json_extension:
+
+JSON
+====
+
+* Extension name: ``arrow.json``.
+
+* The storage type of this extension is ``String`` or
+  or ``LargeString`` or ``StringView``.
+  Only UTF-8 encoded JSON as specified in `rfc8259`_ is supported.
+
+* Extension type parameters:
+
+  This type does not have any parameters.
+
+* Description of the serialization:
+
+  Metadata is either an empty string or a JSON string with an empty object.
+  In the future, additional fields may be added, but they are not required
+  to interpret the array.
+
+UUID
+====
+
+* Extension name: ``arrow.uuid``.
+
+* The storage type of the extension is ``FixedSizeBinary`` with a length of 16 bytes.
+
+.. note::
+   A specific UUID version is not required or guaranteed. This extension represents
+   UUIDs as FixedSizeBinary(16) with big-endian notation and does not interpret the bytes in any way.
+
 =========================
 Community Extension Types
 =========================
@@ -268,3 +300,5 @@ GeoArrow
 Arrow extension types for representing vector geometries. It is well known
 within the Arrow geospatial subcommunity. The GeoArrow specification is not yet
 finalized.
+
+.. _rfc8259: https://datatracker.ietf.org/doc/html/rfc8259
diff --git a/docs/source/format/Columnar.rst b/docs/source/format/Columnar.rst
index 0cfece2586294..7ae0c2b4bdbd8 100644
--- a/docs/source/format/Columnar.rst
+++ b/docs/source/format/Columnar.rst
@@ -70,21 +70,131 @@ concepts, here is a small glossary to help disambiguate.
   without taking into account any value semantics. For example, a
   32-bit signed integer array and 32-bit floating point array have the
   same layout.
-* **Parent** and **child arrays**: names to express relationships
-  between physical value arrays in a nested type structure. For
-  example, a ``List<T>``-type parent array has a T-type array as its
-  child (see more on lists below).
+* **Data type**: An application-facing semantic value type that is
+  implemented using some physical layout. For example, Decimal128
+  values are stored as 16 bytes in a fixed-size binary
+  layout. A timestamp may be stored as 64-bit fixed-size layout.
 * **Primitive type**: a data type having no child types. This includes
   such types as fixed bit-width, variable-size binary, and null types.
 * **Nested type**: a data type whose full structure depends on one or
   more other child types. Two fully-specified nested types are equal
   if and only if their child types are equal. For example, ``List<U>``
   is distinct from ``List<V>`` iff U and V are different types.
-* **Logical type**: An application-facing semantic value type that is
-  implemented using some physical layout. For example, Decimal
-  values are stored as 16 bytes in a fixed-size binary
-  layout. Similarly, strings can be stored as ``List<1-byte>``. A
-  timestamp may be stored as 64-bit fixed-size layout.
+* **Parent** and **child arrays**: names to express relationships
+  between physical value arrays in a nested type structure. For
+  example, a ``List<T>``-type parent array has a T-type array as its
+  child (see more on lists below).
+* **Parametric type**: a type which requires additional parameters
+  for full determination of its semantics. For example, all nested types
+  are parametric by construction. A timestamp is also parametric as it needs
+  a unit (such as microseconds) and a timezone.
+
+Data Types
+==========
+
+The file `Schema.fbs`_ defines built-in data types supported by the
+Arrow columnar format. Each data type uses a well-defined physical layout.
+
+`Schema.fbs`_ is the authoritative source for the description of the
+standard Arrow data types. However, we also provide the below table for
+convenience:
+
++--------------------+------------------------------+------------------------------------------------------------+
+| Type               | Type Parameters *(1)*        | Physical Memory Layout                                     |
++====================+==============================+============================================================+
+| Null               |                              | Null                                                       |
++--------------------+------------------------------+------------------------------------------------------------+
+| Boolean            |                              | Fixed-size Primitive                                       |
++--------------------+------------------------------+------------------------------------------------------------+
+| Int                | * bit width                  | *" (same as above)*                                        |
+|                    | * signedness                 |                                                            |
++--------------------+------------------------------+------------------------------------------------------------+
+| Floating Point     | * precision                  | *"*                                                        |
++--------------------+------------------------------+------------------------------------------------------------+
+| Decimal            | * bit width                  | *"*                                                        |
+|                    | * scale                      |                                                            |
+|                    | * precision                  |                                                            |
++--------------------+------------------------------+------------------------------------------------------------+
+| Date               | * unit                       | *"*                                                        |
++--------------------+------------------------------+------------------------------------------------------------+
+| Time               | * bit width *(2)*            | *"*                                                        |
+|                    | * unit                       |                                                            |
++--------------------+------------------------------+------------------------------------------------------------+
+| Timestamp          | * unit                       | *"*                                                        |
+|                    | * timezone                   |                                                            |
++--------------------+------------------------------+------------------------------------------------------------+
+| Interval           | * unit                       | *"*                                                        |
++--------------------+------------------------------+------------------------------------------------------------+
+| Duration           | * unit                       | *"*                                                        |
++--------------------+------------------------------+------------------------------------------------------------+
+| Fixed-Size Binary  | * byte width                 | Fixed-size Binary                                          |
++--------------------+------------------------------+------------------------------------------------------------+
+| Binary             |                              | Variable-size Binary with 32-bit offsets                   |
++--------------------+------------------------------+------------------------------------------------------------+
+| Utf8               |                              | *"*                                                        |
++--------------------+------------------------------+------------------------------------------------------------+
+| Large Binary       |                              | Variable-size Binary with 64-bit offsets                   |
++--------------------+------------------------------+------------------------------------------------------------+
+| Large Utf8         |                              | *"*                                                        |
++--------------------+------------------------------+------------------------------------------------------------+
+| Binary View        |                              | Variable-size Binary View                                  |
++--------------------+------------------------------+------------------------------------------------------------+
+| Utf8 View          |                              | *"*                                                        |
++--------------------+------------------------------+------------------------------------------------------------+
+| Fixed-Size List    | * *value type*               | Fixed-size List                                            |
+|                    | * list size                  |                                                            |
++--------------------+------------------------------+------------------------------------------------------------+
+| List               | * *value type*               | Variable-size List with 32-bit offsets                     |
++--------------------+------------------------------+------------------------------------------------------------+
+| Large List         | * *value type*               | Variable-size List with 64-bit offsets                     |
++--------------------+------------------------------+------------------------------------------------------------+
+| List View          | * *value type*               | Variable-size List View with 32-bit offsets and sizes      |
++--------------------+------------------------------+------------------------------------------------------------+
+| Large List View    | * *value type*               | Variable-size List View with 64-bit offsets and sizes      |
++--------------------+------------------------------+------------------------------------------------------------+
+| Struct             | * *children*                 | Struct                                                     |
++--------------------+------------------------------+------------------------------------------------------------+
+| Map                | * *children*                 | Variable-size List of Structs                              |
+|                    | * keys sortedness            |                                                            |
++--------------------+------------------------------+------------------------------------------------------------+
+| Union              | * *children*                 | Dense or Sparse Union *(3)*                                |
+|                    | * mode                       |                                                            |
+|                    | * type ids                   |                                                            |
++--------------------+------------------------------+------------------------------------------------------------+
+| Dictionary         | * *index type* *(4)*         | Dictionary Encoded                                         |
+|                    | * *value type*               |                                                            |
+|                    | * orderedness                |                                                            |
++--------------------+------------------------------+------------------------------------------------------------+
+| Run-End Encoded    | * *run end type* *(5)*       | Run-End Encoded                                            |
+|                    | * *value type*               |                                                            |
++--------------------+------------------------------+------------------------------------------------------------+
+
+* \(1) Type parameters listed in *italics* denote a data type's child types.
+
+* \(2) The *bit width* parameter of a Time type is technically redundant as
+  each *unit* mandates a single bit width.
+
+* \(3) Whether a Union type uses the Sparse or Dense layout is denoted by its
+  *mode* parameter.
+
+* \(4) The *index type* of a Dictionary type can only be an integer type,
+  preferably signed, with width 8 to 64 bits.
+
+* \(5) The *run end type* of a Run-End Encoded type can only be a signed integer type
+  with width 16 to 64 bits.
+
+.. note::
+   Sometimes the term "logical type" is used to denote the Arrow data types
+   and distinguish them from their respective physical layouts. However,
+   unlike other type systems such as `Apache Parquet <https://parquet.apache.org/>`__'s,
+   the Arrow type system doesn't have separate notions of physical types and
+   logical types.
+
+   The Arrow type system separately provides
+   :ref:`extension types <format_metadata_extension_types>`, which allow
+   annotating standard Arrow data types with richer application-facing semantics
+   (for example defining a "JSON" type laid upon the standard String data type).
+
 
 .. _format_layout:
 
@@ -93,7 +203,7 @@ Physical Memory Layout
 
 Arrays are defined by a few pieces of metadata and data:
 
-* A logical data type.
+* A data type.
 * A sequence of buffers.
 * A length as a 64-bit signed integer. Implementations are permitted
   to be limited to 32-bit lengths, see more on this below.
@@ -103,8 +213,8 @@ Arrays are defined by a few pieces of metadata and data:
 Nested arrays additionally have a sequence of one or more sets of
 these items, called the **child arrays**.
 
-Each logical data type has a well-defined physical layout. Here are
-the different physical layouts defined by Arrow:
+Each data type has a well-defined physical layout. Here are the different
+physical layouts defined by Arrow:
 
 * **Primitive (fixed-size)**: a sequence of values each having the
   same byte or bit width
@@ -138,7 +248,7 @@ the different physical layouts defined by Arrow:
 * **Run-End Encoded (REE)**: a nested layout consisting of two child arrays,
   one representing values, and one representing the logical index where
   the run of a corresponding value ends.
-* **Null**: a sequence of all null values, having null logical type
+* **Null**: a sequence of all null values.
 
 The Arrow columnar memory layout only applies to *data* and not
 *metadata*. Implementations are free to represent metadata in-memory
@@ -312,8 +422,8 @@ Each value in this layout consists of 0 or more bytes. While primitive
 arrays have a single values buffer, variable-size binary have an
 **offsets** buffer and **data** buffer.
 
-The offsets buffer contains `length + 1` signed integers (either
-32-bit or 64-bit, depending on the logical type), which encode the
+The offsets buffer contains ``length + 1`` signed integers (either
+32-bit or 64-bit, depending on the data type), which encode the
 start position of each slot in the data buffer. The length of the
 value in each slot is computed using the difference between the offset
 at that slot's index and the subsequent offset. For example, the
@@ -374,7 +484,7 @@ locations are indicated using a **views** buffer, which may point to one
 of potentially several **data** buffers or may contain the characters
 inline.
 
-The views buffer contains `length` view structures with the following layout:
+The views buffer contains ``length`` view structures with the following layout:
 
 ::
 
@@ -394,7 +504,7 @@ should be interpreted.
 
 In the short string case the string's bytes are inlined — stored inside the
 view itself, in the twelve bytes which follow the length. Any remaining bytes
-after the string itself are padded with `0`.
+after the string itself are padded with ``0``.
 
 In the long string case, a buffer index indicates which data buffer
 stores the data bytes and an offset indicates where in that buffer the
@@ -1062,6 +1172,7 @@ of memory buffers for each layout.
    "Variable Binary",validity,offsets,data,
    "Variable Binary View",validity,views,,data
    "List",validity,offsets,,
+   "List View",validity,offsets,sizes,
    "Fixed-size List",validity,,,
    "Struct",validity,,,
    "Sparse Union",type ids,,,
@@ -1070,17 +1181,6 @@ of memory buffers for each layout.
    "Dictionary-encoded",validity,data (indices),,
    "Run-end encoded",,,,
 
-Logical Types
-=============
-
-The `Schema.fbs`_ defines built-in logical types supported by the
-Arrow columnar format. Each logical type uses one of the above
-physical layouts. Nested logical types may have different physical
-layouts depending on the particular realization of the type.
-
-We do not go into detail about the logical types definitions in this
-document as we consider `Schema.fbs`_ to be authoritative.
-
 .. _format-ipc:
 
 Serialization and Interprocess Communication (IPC)
@@ -1108,6 +1208,8 @@ includes a serialized Flatbuffer type along with an optional message
 body. We define this message format before describing how to serialize
 each constituent IPC message type.
 
+.. _ipc-message-format:
+
 Encapsulated message format
 ---------------------------
 
@@ -1158,17 +1260,16 @@ Schema message
 --------------
 
 The Flatbuffers files `Schema.fbs`_ contains the definitions for all
-built-in logical data types and the ``Schema`` metadata type which
-represents the schema of a given record batch. A schema consists of
-an ordered sequence of fields, each having a name and type. A
-serialized ``Schema`` does not contain any data buffers, only type
-metadata.
+built-in data types and the ``Schema`` metadata type which represents
+the schema of a given record batch. A schema consists of an ordered
+sequence of fields, each having a name and type. A serialized ``Schema``
+does not contain any data buffers, only type metadata.
 
 The ``Field`` Flatbuffers type contains the metadata for a single
 array. This includes:
 
 * The field's name
-* The field's logical type
+* The field's data type
 * Whether the field is semantically nullable. While this has no
   bearing on the array's physical layout, many systems distinguish
   nullable and non-nullable fields and we want to allow them to
diff --git a/docs/source/format/DissociatedIPC.rst b/docs/source/format/DissociatedIPC.rst
new file mode 100644
index 0000000000000..0b0861399cb2f
--- /dev/null
+++ b/docs/source/format/DissociatedIPC.rst
@@ -0,0 +1,403 @@
+.. 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.
+
+.. _dissociated-ipc:
+
+========================
+Dissociated IPC Protocol
+========================
+
+.. warning::
+
+    Experimental: The Dissociated IPC Protocol is experimental in its current
+    form. Based on feedback and usage the protocol definition may change until
+    it is fully standardized.
+
+Rationale
+=========
+
+The :ref:`Arrow IPC format <format-ipc>` describes a protocol for transferring
+Arrow data as a stream of record batches. This protocol expects a continuous
+stream of bytes divided into discrete messages (using a length prefix and
+continuation indicator). Each discrete message consists of two portions:
+
+* A `Flatbuffers`_ header message
+* A series of bytes consisting of the flattened and packed body buffers (some
+  message types, like Schema messages, do not have this section)
+  - This is referred to as the *message body* in the IPC format spec.
+
+For most cases, the existing IPC format as it currently exists is sufficiently efficient:
+
+* Receiving data in the IPC format allows zero-copy utilization of the body
+  buffer bytes, no deserialization is required to form Arrow Arrays
+* An IPC file format can be memory-mapped because it is location agnostic
+  and the bytes of the file are exactly what is expected in memory.
+
+However, there are use cases that aren't handled by this:
+
+* Constructing the IPC record batch message requires allocating a contiguous
+  chunk of bytes and copying all of the data buffers into it, packed together
+  back-to-back. This pessimizes the common case of wrapping existing, directly
+  consumable data into an IPC message.
+* Even if Arrow data is located in a memory accessible across process boundaries
+  or transports (such as UCX), there is no standard way to specify that shared
+  location to consumers which could take advantage of it.
+* Arrow data located on a non-CPU device (such as a GPU) cannot be sent using
+  Arrow IPC without having to copy the data back to the host device or copying
+  the Flatbuffers metadata bytes into device memory.
+
+  * By the same token, receiving IPC messages into device memory would require
+    performing a copy of the Flatbuffers metadata back to the host CPU device. This
+    is due to the fact that the IPC stream interleaves data and metadata across a
+    single stream.
+
+This protocol attempts to solve these use cases in an efficient manner.
+
+Goals
+-----
+
+* Define a generic protocol for passing Arrow IPC data, not tied to any particular
+  transport, that also allows for utilizing non-CPU device memory, shared memory, and
+  newer "high performance" transports such as `UCX`_ or `libfabric`_.
+
+  * This allows for the data in the body to be kept on non-CPU devices (like GPUs)
+    without expensive device-to-host copies.
+
+* Allow for using :ref:`Flight RPC <flight-rpc>` purely for control flow by separating
+  the stream of IPC metadata from IPC body bytes
+
+Definitions
+-----------
+
+IPC Metadata
+    The Flatbuffers message bytes that encompass the header of an Arrow IPC message
+
+Tag
+    A little-endian ``uint64`` value used for flow control and used in determining
+    how to interpret the body of a message. Specific bits can be masked to allow
+    identifying messages by only a portion of the tag, leaving the rest of the bits
+    to be used for control flow or other message metadata. Some transports, such as
+    UCX, have built-in support for such tag values and will provide them in CPU
+    memory regardless of whether or not the body of the message may reside on a
+    non-CPU device.
+
+Sequence Number
+    A little-endian, 4-byte unsigned integer starting at 0 for a stream, indicating
+    the sequence order of messages. It is also used to identify specific messages to
+    tie the IPC metadata header to its corresponding body since the metadata and body
+    can be sent across separate pipes/streams/transports.
+
+    If a sequence number reaches ``UINT32_MAX``, it should be allowed to roll over as
+    it is unlikely there would be enough unprocessed messages waiting to be processed
+    that would cause an overlap of sequence numbers.
+
+    The sequence number serves two purposes: To identify corresponding metadata and
+    tagged body data messages and to ensure we do not rely on messages having to arrive
+    in order. A client should use the sequence number to correctly order messages as
+    they arrive for processing.
+
+The Protocol
+============
+
+A reference example implementation utilizing `libcudf`_ and `UCX`_ can be found in the
+`arrow-experiments repo <https://github.com/apache/arrow-experiments/tree/main/dissociated-ipc>`_.
+
+Requirements
+------------
+
+A transport implementing this protocol **MUST** provide two pieces of functionality:
+
+* Message sending
+
+  * Delimited messages (like gRPC) as opposed to non-delimited streams (like plain TCP
+    without further framing).
+
+  * Alternatively, a framing mechanism like the :ref:`encapsulated message format <ipc-message-format>`
+    for the IPC protocol can be used while leaving out the body bytes.
+
+* Tagged message sending
+
+  * Sending a message that has an attached little-endian, unsigned 64-bit integral tag
+    for control flow. A tag like this allows control flow to operate on a message whose body
+    is on a non-CPU device without requiring the message itself to get copied off of the device.
+
+URI Specification
+-----------------
+
+When providing a URI to a consumer to contact for use with this protocol (such as via
+the :ref:`Location URI for Flight <flight-location-uris>`), the URI should specify a scheme
+like *ucx:* or *fabric:*, that is easily identifiable. In addition, the URI should
+encode the following URI query parameters:
+
+.. note::
+    As this protocol matures, this document will get updated with commonly recognized
+    transport schemes that get used with it.
+
+* ``want_data`` - **REQUIRED** - uint64 integer value
+
+  * This value should be used to tag an initial message to the server to initiate a
+    data transfer. The body of the initiating message should be an opaque binary identifier
+    of the data stream being requested (like the ``Ticket`` in the Flight RPC protocol)
+
+* ``free_data`` - **OPTIONAL** - uint64 integer value
+
+  * If the server might send messages using offsets / addresses for remote memory accessing
+    or shared memory locations, the URI should include this parameter. This value is used to
+    tag messages sent from the client to the data server, containing specific offsets / addresses
+    which were provided that are no longer required by the client (i.e. any operations that
+    directly reference those memory locations, such as copying the remote data into local memory,
+    have been completed).
+
+* ``remote_handle`` - **OPTIONAL** - base64-encoded string
+
+  * When working with shared memory or remote memory, this value indicates any required
+    handle or identifier that is necessary for accessing the memory.
+
+    * Using UCX, this would be an *rkey* value
+
+    * With CUDA IPC, this would be the value of the base GPU pointer or memory handle,
+      and subsequent addresses would be offsets from this base pointer.
+
+Handling of Backpressure
+------------------------
+
+*Currently* this proposal does not specify any way to manage the backpressure of
+messages to throttle for memory and bandwidth reasons. For now, this will be
+**transport-defined** rather than lock into something sub-optimal.
+
+As usage among different transports and libraries grows, common patterns will emerge
+that will allow for a generic, but efficient, way to handle backpressure across
+different use cases.
+
+.. note::
+  While the protocol itself is transport agnostic, the current usage and examples
+  only have been tested using UCX and libfabric transports so far, but that's all.
+
+
+Protocol Description
+====================
+
+There are two possibilities that can occur:
+
+1. The streams of metadata and body data are sent across separate connections
+
+.. mermaid:: ./DissociatedIPC/SequenceDiagramSeparate.mmd
+
+
+2. The streams of metadata and body data are sent simultaneously across the
+   same connection
+
+.. mermaid:: ./DissociatedIPC/SequenceDiagramSame.mmd
+
+Server Sequence
+---------------
+
+There can be either a single server handling both the IPC Metadata stream and the
+Body data streams, or separate servers for handling the IPC Metadata and the body
+data. This allows for streaming of data across either a single transport pipe or
+two pipes if desired.
+
+Metadata Stream Sequence
+''''''''''''''''''''''''
+
+The standing state of the server is waiting for a **tagged** message with a specific
+``<want_data>`` tag value to initiate a transfer. This ``<want_data>`` value is defined
+by the server and propagated to any clients via the URI they are provided. This protocol
+does not prescribe any particular value so that it will not interfere with any other
+existing protocols that rely on tag values. The body of that message will contain an
+opaque, binary identifier to indicate a particular dataset / data stream to send.
+
+.. note::
+
+  For instance, the **ticket** that was passed with a *FlightInfo* message would be
+  the body of this message. Because it is opaque, it can be anything the server wants
+  to use. The URI and identifier do not need to be given to the client via Flight RPC,
+  but could come across from any transport or protocol desired.
+
+Upon receiving a ``<want_data>`` request, the server *should* respond by sending a stream
+of messages consisting of the following:
+
+.. mermaid::
+
+  block-beta
+  columns 8
+
+  block:P["\n\n\n\nPrefix"]:5
+    T["Message type\nByte 0"]
+    S["Sequence number\nBytes 1-4"]
+  end
+  H["Flatbuffer bytes\nRest of the message"]:3
+
+* A 5-byte prefix
+
+  - The first byte of the message indicates the type of message, currently there are only
+    two allowed message types (more types may get added in the future):
+
+    0) End of Stream
+    1) Flatbuffers IPC Metadata Message
+
+  - the next 4-bytes are a little-endian, unsigned 32-bit integer indicating the sequence number of
+    the message. The first message in the stream (**MUST** always be a schema message) **MUST**
+    have a sequence number of ``0``. Each subsequent message **MUST** increment the number by
+    ``1``.
+
+* The full Flatbuffers bytes of an Arrow IPC header
+
+As defined in the Arrow IPC format, each metadata message can represent a chunk of data or
+dictionaries for use by the stream of data.
+
+After sending the last metadata message, the server **MUST** indicate the end of the stream
+by sending a message consisting of **exactly** 5 bytes:
+
+* The first byte is ``0``, indicating an **End of Stream** message
+* The last 4 bytes are the sequence number (4-byte, unsigned integer in little-endian byte order)
+
+Data Stream Sequence
+''''''''''''''''''''
+
+If a single server is handling both the data and metadata streams, then the data messages
+**should** begin being sent to the client in parallel with the metadata messages. Otherwise,
+as with the metadata sequence, the standing state of the server is to wait for a **tagged**
+message with the ``<want_data>`` tag value, whose body indicates the dataset / data stream
+to send to the client.
+
+For each IPC message in the stream of data, a **tagged** message **MUST** be sent on the data
+stream if that message has a body (i.e. a Record Batch or Dictionary message). The
+:term:`tag <Tag>` for each message should be structured as follows:
+
+.. mermaid::
+
+  block-beta
+  columns 8
+
+  S["Sequence number\nBytes 0-3"]:4
+  U["Unused (Reserved)\nBytes 4-6"]:3
+  T["Message type\nByte 7"]:1
+
+* The *least significant* 4-bytes (bits 0 - 31) of the tag should be the unsigned 32-bit, little-endian sequence
+  number of the message.
+* The *most significant* byte (bits 56 - 63) of the tag indicates the message body **type** as an 8-bit
+  unsigned integer. Currently only two message types are specified, but more can be added as
+  needed to expand the protocol:
+
+  0) The body contains the raw body buffer bytes as a packed buffer (i.e. the standard IPC
+     format body bytes)
+  1) The body contains a series of unsigned, little-endian 64-bit integer pairs to represent
+     either shared or remote memory, schematically structured as
+
+     * The first two integers (e.g. the first 16 bytes) represent the *total* size (in bytes)
+       of all buffers and the number of buffers in this message (and thus the number of following
+       pairs of ``uint64``)
+
+     * Each subsequent pair of ``uint64`` values are an address / offset followed the length of
+       that particular buffer.
+
+* All unspecified bits (bits 32 - 55) of the tag are *reserved* for future use by potential updates
+  to this protocol. For now they **MUST** be 0.
+
+.. note::
+
+  Any shared/remote memory addresses that are sent across **MUST** be kept alive by the server
+  until a corresponding tagged ``<free_data>`` message is received. If the client disconnects
+  before sending any ``<free_data>`` messages, it can be assumed to be safe to clean up the memory
+  if desired by the server.
+
+After sending the last tagged IPC body message, the server should maintain the connection and wait
+for tagged ``<free_data>`` messages. The structure of these ``<free_data>`` messages is simple:
+one or more unsigned, little-endian 64-bit integers which indicate the addresses/offsets that can
+be freed.
+
+Once there are no more outstanding addresses to be freed, the work for this stream is complete.
+
+Client Sequence
+---------------
+
+A client for this protocol needs to concurrently handle both the data and metadata streams of
+messages which may either both come from the same server or different servers. Below is a flowchart
+showing how a client might handle the metadata and data streams:
+
+.. mermaid:: ./DissociatedIPC/ClientFlowchart.mmd
+
+#. First the client sends a tagged message using the ``<want_data>`` value it was provided in the
+   URI as the tag, and the opaque ID as the body.
+
+   * If the metadata and data servers are separate, then a ``<want_data>`` message needs to be sent
+     separately to each.
+   * In either scenario, the metadata and data streams can be processed concurrently and/or asynchronously
+     depending on the nature of the transports.
+
+#. For each **untagged** message the client receives in the metadata stream:
+
+   * The first byte of the message indicates whether it is an *End of Stream* message (value ``0``)
+     or a metadata message (value ``1``).
+   * The next 4 bytes are the sequence number of the message, an unsigned 32-bit integer in
+     little-endian byte order.
+   * If it is **not** an *End of Stream* message, the remaining bytes are the IPC Flatbuffer bytes which
+     can be interpreted as normal.
+
+     * If the message has a body (i.e. Record Batch or Dictionary message) then the client should retrieve
+       a tagged message from the Data Stream using the same sequence number.
+
+   * If it **is** an *End of Stream* message, then it is safe to close the metadata connection if there are
+     no gaps in the sequence numbers received.
+
+#. When a metadata message that requires a body is received, the tag mask of ``0x00000000FFFFFFFF`` **should**
+   be used alongside the sequence number to match the message regardless of the higher bytes (e.g. we only
+   care about matching the lower 4 bytes to the sequence number)
+
+   * Once recieved, the Most Significant Byte's value determines how the client processes the body data:
+
+     * If the most significant byte is 0: Then the body of the message is the raw IPC packed body buffers
+       allowing it to easily be processed with the corresponding metadata header bytes.
+
+     * If the most significant byte is 1: The body of the message will consist of a series of pairs of
+       unsigned, 64-bit integers in little-endian byte order.
+
+       * The first two integers represent *1)* the total size of all the body buffers together to allow
+         for easy allocation if an intermediate buffer is needed and *2)* the number of buffers being sent (``nbuf``).
+
+       * The rest of the message will be ``nbuf`` pairs of integers, one for each buffer. Each pair is
+         *1)* the address / offset of the buffer and *2)* the length of that buffer. Memory can then be retrieved
+         via shared or remote memory routines based on the underlying transport. These addresses / offsets **MUST**
+         be retained so they can be sent back in ``<free_data>`` messages later, indicating to the server that
+         the client no longer needs the shared memory.
+
+#. Once an *End of Stream* message is received, the client should process any remaining un-processed
+   IPC metadata messages.
+
+#. After individual memory addresses / offsets are able to be freed by the remote server (in the case where
+   it has sent these rather than the full body bytes), the client should send corresponding ``<free_data>`` messages
+   to the server.
+
+   * A single ``<free_data>`` message consists of an arbitrary number of unsigned 64-bit integer values, representing
+     the addresses / offsets which can be freed. The reason for it being an *arbitrary number* is to allow a client
+     to choose whether to send multiple messages to free multiple addresses or to coalesce multiple addresses into
+     fewer messages to be freed (thus making the protocol less "chatty" if desired)
+
+Continuing Development
+======================
+
+If you decide to try this protocol in your own environments and system, we'd love feedback and to learn about
+your use case. As this is an **experimental** protocol currently, we need real-world usage in order to facilitate
+improving it and finding the right generalizations to standardize on across transports.
+
+Please chime in using the Arrow Developers Mailing list: https://arrow.apache.org/community/#mailing-lists
+
+.. _Flatbuffers: http://github.com/google/flatbuffers
+.. _UCX: https://openucx.org/
+.. _libfabric: https://ofiwg.github.io/libfabric/
+.. _libcudf: https://docs.rapids.ai/api
diff --git a/docs/source/format/DissociatedIPC/ClientFlowchart.mmd b/docs/source/format/DissociatedIPC/ClientFlowchart.mmd
new file mode 100644
index 0000000000000..652cabc1c7425
--- /dev/null
+++ b/docs/source/format/DissociatedIPC/ClientFlowchart.mmd
@@ -0,0 +1,37 @@
+%% 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.
+
+graph LR
+client((Client))-->c1{{Send #60;want_data#gt; Msg}}
+subgraph meta [Meta Message]
+  direction LR
+  m1[/Msg Type #40;byte 0#41;<br/>Seq Num #40;bytes 1-5#41;/]-- type 1 -->m2[[Process IPC Header]]
+  m2-- IPC has body -->m3[Get Corresponding<br/>Tagged Msg]
+  m2-- Schema Msg -->m4[/Store Schema/]
+  m1-- type 0 -->e[Indicate End of Stream]
+end
+subgraph data [Data Stream]
+  direction LR
+  d1[Request Msg<br/>for Seq Num]-->d2{Most Significant<br/>Byte}
+  d2-- 0 -->d3[Construct from<br/>Metadata and Body]
+  d2-- 1 -->d4[Get shared/remote<br/>buffers]
+  d4 -->d5[Construct from<br/>Metadata and buffers]
+  d3 & d5 -->e2[Output Batch]
+end
+
+client -- recv untagged msg --> meta
+client -- get tagged msg --> data
diff --git a/docs/source/format/DissociatedIPC/SequenceDiagramSame.mmd b/docs/source/format/DissociatedIPC/SequenceDiagramSame.mmd
new file mode 100644
index 0000000000000..adf26bdc32767
--- /dev/null
+++ b/docs/source/format/DissociatedIPC/SequenceDiagramSame.mmd
@@ -0,0 +1,43 @@
+%% 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.
+
+sequenceDiagram    
+  participant C as Client
+  participant S as Server
+  activate C
+  C-->>+S: TaggedMessage(server.want_data, bytes=ID_of_desired_data)
+  S-->>C: Message(bytes([1]) + le_bytes(sequence_number) + schema_metadata)
+  par
+    loop each chunk
+      S-->>C: Message(bytes([1]) + le_bytes(sequence_number) + batch_metadata)
+    end
+    S-->>C: Message(bytes([0]) + le_bytes(sequence_number))
+  and
+    loop each chunk
+      alt
+        S-->>C: TaggedMessage((bytes[0] << 55) | le_bytes(sequence_number),<br/>bytes=batch_data)
+      else
+        S-->>C: TaggedMessage((bytes[1] << 55) | le_bytes(sequence_number),<br/>bytes=uint64_pairs)
+      end
+    end
+  end
+  
+  loop
+    C-->>S: TaggedMessage(server.free_data, bytes=uint64_list)
+  end
+  deactivate S
+  deactivate C
diff --git a/docs/source/format/DissociatedIPC/SequenceDiagramSeparate.mmd b/docs/source/format/DissociatedIPC/SequenceDiagramSeparate.mmd
new file mode 100644
index 0000000000000..11d2d9d6387eb
--- /dev/null
+++ b/docs/source/format/DissociatedIPC/SequenceDiagramSeparate.mmd
@@ -0,0 +1,44 @@
+%% 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.
+
+sequenceDiagram
+  participant D as Data Stream
+  participant C as Client
+  participant M as Metadata Stream
+
+  activate C
+  C-->>+M: TaggedMessage(server.want_data, bytes=ID_of_desired_data)
+  C-->>+D: TaggedMessage(server.want_data, bytes=ID_of_desired_data)
+  M-->>C: Message(bytes([1]) + le_bytes(sequence_number) + schema_metadata)
+  loop each batch
+    par
+      M-->>C: Message(bytes([1]) + le_bytes(sequence_number) + batch_metadata)
+    and
+      alt
+        D-->>C: TaggedMessage((bytes[0] << 55) | le_bytes(sequence_number),<br/>bytes=batch_data)
+      else
+        D-->>C: TaggedMessage((bytes[1] << 55) | le_bytes(sequence_number),<br/>bytes=uint64_pairs)
+      end
+    end
+  end
+  M-->>C: Message(bytes([0]) + le_bytes(sequence_number))
+  deactivate M
+  loop
+    C-->>D: TaggedMessage(server.free_data, bytes=uint64_list)
+  end
+  deactivate D
+  deactivate C
diff --git a/docs/source/format/Flight.rst b/docs/source/format/Flight.rst
index 7ee84952b4350..2c5487d857ea4 100644
--- a/docs/source/format/Flight.rst
+++ b/docs/source/format/Flight.rst
@@ -68,9 +68,8 @@ Downloading Data
 
 A client that wishes to download the data would:
 
-.. figure:: ./Flight/DoGet.mmd.svg
-
-   Retrieving data via ``DoGet``.
+.. mermaid:: ./Flight/DoGet.mmd
+   :caption: Retrieving data via ``DoGet``.
 
 #. Construct or acquire a ``FlightDescriptor`` for the data set they
    are interested in.
@@ -168,9 +167,8 @@ data. However, ``GetFlightInfo`` doesn't return until the query
 completes, so the client is blocked. In this situation, the client
 can use ``PollFlightInfo`` instead of ``GetFlightInfo``:
 
-.. figure:: ./Flight/PollFlightInfo.mmd.svg
-
-   Polling a long-running query by ``PollFlightInfo``.
+.. mermaid:: ./Flight/PollFlightInfo.mmd
+   :caption: Polling a long-running query by ``PollFlightInfo``.
 
 #. Construct or acquire a ``FlightDescriptor``, as before.
 #. Call ``PollFlightInfo(FlightDescriptor)`` to get a ``PollInfo``
@@ -229,9 +227,8 @@ Uploading Data
 
 To upload data, a client would:
 
-.. figure:: ./Flight/DoPut.mmd.svg
-
-   Uploading data via ``DoPut``.
+.. mermaid:: ./Flight/DoPut.mmd
+   :caption: Uploading data via ``DoPut``.
 
 #. Construct or acquire a ``FlightDescriptor``, as before.
 #. Call ``DoPut(FlightData)`` and upload a stream of Arrow record
@@ -257,9 +254,8 @@ require being stateful if implemented using ``DoGet`` and
 ``DoPut``. Instead, ``DoExchange`` allows this to be implemented as a
 single call. A client would:
 
-.. figure:: ./Flight/DoExchange.mmd.svg
-
-   Complex data flow with ``DoExchange``.
+.. mermaid:: ./Flight/DoExchange.mmd
+   :caption: Complex data flow with ``DoExchange``.
 
 #. Construct or acquire a ``FlightDescriptor``, as before.
 #. Call ``DoExchange(FlightData)``.
@@ -314,6 +310,8 @@ well, in which case any `authentication method supported by gRPC
 
 .. _Mutual TLS (mTLS): https://grpc.io/docs/guides/auth/#supported-auth-mechanisms
 
+.. _flight-location-uris:
+
 Location URIs
 =============
 
diff --git a/docs/source/format/Flight/DoExchange.mmd b/docs/source/format/Flight/DoExchange.mmd
index 14f1789aeaaa7..f7586bf35eb4f 100644
--- a/docs/source/format/Flight/DoExchange.mmd
+++ b/docs/source/format/Flight/DoExchange.mmd
@@ -15,9 +15,6 @@
 %% specific language governing permissions and limitations
 %% under the License.
 
-%% To generate the diagram, use mermaid-cli
-%% Example: docker run --rm -v $(pwd)/FlightSql:/data minlag/mermaid-cli -i /data/CommandGetTables.mmd
-
 sequenceDiagram
 autonumber
 
diff --git a/docs/source/format/Flight/DoExchange.mmd.svg b/docs/source/format/Flight/DoExchange.mmd.svg
deleted file mode 100644
index 204d63d77218d..0000000000000
--- a/docs/source/format/Flight/DoExchange.mmd.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mermaid-1649258037754" width="100%" xmlns="http://www.w3.org/2000/svg" height="449" style="max-width: 607px; background-color: white;" viewBox="-50 -10 607 449"><style>#mermaid-1649258037754 {font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#mermaid-1649258037754 .error-icon{fill:#552222;}#mermaid-1649258037754 .error-text{fill:#552222;stroke:#552222;}#mermaid-1649258037754 .edge-thickness-normal{stroke-width:2px;}#mermaid-1649258037754 .edge-thickness-thick{stroke-width:3.5px;}#mermaid-1649258037754 .edge-pattern-solid{stroke-dasharray:0;}#mermaid-1649258037754 .edge-pattern-dashed{stroke-dasharray:3;}#mermaid-1649258037754 .edge-pattern-dotted{stroke-dasharray:2;}#mermaid-1649258037754 .marker{fill:#333333;stroke:#333333;}#mermaid-1649258037754 .marker.cross{stroke:#333333;}#mermaid-1649258037754 svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#mermaid-1649258037754 .actor{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1649258037754 text.actor&gt;tspan{fill:black;stroke:none;}#mermaid-1649258037754 .actor-line{stroke:grey;}#mermaid-1649258037754 .messageLine0{stroke-width:1.5;stroke-dasharray:none;stroke:#333;}#mermaid-1649258037754 .messageLine1{stroke-width:1.5;stroke-dasharray:2,2;stroke:#333;}#mermaid-1649258037754 #arrowhead path{fill:#333;stroke:#333;}#mermaid-1649258037754 .sequenceNumber{fill:white;}#mermaid-1649258037754 #sequencenumber{fill:#333;}#mermaid-1649258037754 #crosshead path{fill:#333;stroke:#333;}#mermaid-1649258037754 .messageText{fill:#333;stroke:#333;}#mermaid-1649258037754 .labelBox{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1649258037754 .labelText,#mermaid-1649258037754 .labelText&gt;tspan{fill:black;stroke:none;}#mermaid-1649258037754 .loopText,#mermaid-1649258037754 .loopText&gt;tspan{fill:black;stroke:none;}#mermaid-1649258037754 .loopLine{stroke-width:2px;stroke-dasharray:2,2;stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);}#mermaid-1649258037754 .note{stroke:#aaaa33;fill:#fff5ad;}#mermaid-1649258037754 .noteText,#mermaid-1649258037754 .noteText&gt;tspan{fill:black;stroke:none;}#mermaid-1649258037754 .activation0{fill:#f4f4f4;stroke:#666;}#mermaid-1649258037754 .activation1{fill:#f4f4f4;stroke:#666;}#mermaid-1649258037754 .activation2{fill:#f4f4f4;stroke:#666;}#mermaid-1649258037754 .actorPopupMenu{position:absolute;}#mermaid-1649258037754 .actorPopupMenuPanel{position:absolute;fill:#ECECFF;box-shadow:0px 8px 16px 0px rgba(0,0,0,0.2);filter:drop-shadow(3px 5px 2px rgb(0 0 0 / 0.4));}#mermaid-1649258037754 .actor-man line{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1649258037754 .actor-man circle,#mermaid-1649258037754 line{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;stroke-width:2px;}#mermaid-1649258037754 :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g></g><defs><symbol id="computer" width="24" height="24"><path transform="scale(.5)" d="M2 2v13h20v-13h-20zm18 11h-16v-9h16v9zm-10.228 6l.466-1h3.524l.467 1h-4.457zm14.228 3h-24l2-6h2.104l-1.33 4h18.45l-1.297-4h2.073l2 6zm-5-10h-14v-7h14v7z"></path></symbol></defs><defs><symbol id="database" fill-rule="evenodd" clip-rule="evenodd"><path transform="scale(.5)" d="M12.258.001l.256.004.255.005.253.008.251.01.249.012.247.015.246.016.242.019.241.02.239.023.236.024.233.027.231.028.229.031.225.032.223.034.22.036.217.038.214.04.211.041.208.043.205.045.201.046.198.048.194.05.191.051.187.053.183.054.18.056.175.057.172.059.168.06.163.061.16.063.155.064.15.066.074.033.073.033.071.034.07.034.069.035.068.035.067.035.066.035.064.036.064.036.062.036.06.036.06.037.058.037.058.037.055.038.055.038.053.038.052.038.051.039.05.039.048.039.047.039.045.04.044.04.043.04.041.04.04.041.039.041.037.041.036.041.034.041.033.042.032.042.03.042.029.042.027.042.026.043.024.043.023.043.021.043.02.043.018.044.017.043.015.044.013.044.012.044.011.045.009.044.007.045.006.045.004.045.002.045.001.045v17l-.001.045-.002.045-.004.045-.006.045-.007.045-.009.044-.011.045-.012.044-.013.044-.015.044-.017.043-.018.044-.02.043-.021.043-.023.043-.024.043-.026.043-.027.042-.029.042-.03.042-.032.042-.033.042-.034.041-.036.041-.037.041-.039.041-.04.041-.041.04-.043.04-.044.04-.045.04-.047.039-.048.039-.05.039-.051.039-.052.038-.053.038-.055.038-.055.038-.058.037-.058.037-.06.037-.06.036-.062.036-.064.036-.064.036-.066.035-.067.035-.068.035-.069.035-.07.034-.071.034-.073.033-.074.033-.15.066-.155.064-.16.063-.163.061-.168.06-.172.059-.175.057-.18.056-.183.054-.187.053-.191.051-.194.05-.198.048-.201.046-.205.045-.208.043-.211.041-.214.04-.217.038-.22.036-.223.034-.225.032-.229.031-.231.028-.233.027-.236.024-.239.023-.241.02-.242.019-.246.016-.247.015-.249.012-.251.01-.253.008-.255.005-.256.004-.258.001-.258-.001-.256-.004-.255-.005-.253-.008-.251-.01-.249-.012-.247-.015-.245-.016-.243-.019-.241-.02-.238-.023-.236-.024-.234-.027-.231-.028-.228-.031-.226-.032-.223-.034-.22-.036-.217-.038-.214-.04-.211-.041-.208-.043-.204-.045-.201-.046-.198-.048-.195-.05-.19-.051-.187-.053-.184-.054-.179-.056-.176-.057-.172-.059-.167-.06-.164-.061-.159-.063-.155-.064-.151-.066-.074-.033-.072-.033-.072-.034-.07-.034-.069-.035-.068-.035-.067-.035-.066-.035-.064-.036-.063-.036-.062-.036-.061-.036-.06-.037-.058-.037-.057-.037-.056-.038-.055-.038-.053-.038-.052-.038-.051-.039-.049-.039-.049-.039-.046-.039-.046-.04-.044-.04-.043-.04-.041-.04-.04-.041-.039-.041-.037-.041-.036-.041-.034-.041-.033-.042-.032-.042-.03-.042-.029-.042-.027-.042-.026-.043-.024-.043-.023-.043-.021-.043-.02-.043-.018-.044-.017-.043-.015-.044-.013-.044-.012-.044-.011-.045-.009-.044-.007-.045-.006-.045-.004-.045-.002-.045-.001-.045v-17l.001-.045.002-.045.004-.045.006-.045.007-.045.009-.044.011-.045.012-.044.013-.044.015-.044.017-.043.018-.044.02-.043.021-.043.023-.043.024-.043.026-.043.027-.042.029-.042.03-.042.032-.042.033-.042.034-.041.036-.041.037-.041.039-.041.04-.041.041-.04.043-.04.044-.04.046-.04.046-.039.049-.039.049-.039.051-.039.052-.038.053-.038.055-.038.056-.038.057-.037.058-.037.06-.037.061-.036.062-.036.063-.036.064-.036.066-.035.067-.035.068-.035.069-.035.07-.034.072-.034.072-.033.074-.033.151-.066.155-.064.159-.063.164-.061.167-.06.172-.059.176-.057.179-.056.184-.054.187-.053.19-.051.195-.05.198-.048.201-.046.204-.045.208-.043.211-.041.214-.04.217-.038.22-.036.223-.034.226-.032.228-.031.231-.028.234-.027.236-.024.238-.023.241-.02.243-.019.245-.016.247-.015.249-.012.251-.01.253-.008.255-.005.256-.004.258-.001.258.001zm-9.258 20.499v.01l.001.021.003.021.004.022.005.021.006.022.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.023.018.024.019.024.021.024.022.025.023.024.024.025.052.049.056.05.061.051.066.051.07.051.075.051.079.052.084.052.088.052.092.052.097.052.102.051.105.052.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.048.144.049.147.047.152.047.155.047.16.045.163.045.167.043.171.043.176.041.178.041.183.039.187.039.19.037.194.035.197.035.202.033.204.031.209.03.212.029.216.027.219.025.222.024.226.021.23.02.233.018.236.016.24.015.243.012.246.01.249.008.253.005.256.004.259.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.021.224-.024.22-.026.216-.027.212-.028.21-.031.205-.031.202-.034.198-.034.194-.036.191-.037.187-.039.183-.04.179-.04.175-.042.172-.043.168-.044.163-.045.16-.046.155-.046.152-.047.148-.048.143-.049.139-.049.136-.05.131-.05.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.053.083-.051.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.05.023-.024.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.023.01-.022.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.127l-.077.055-.08.053-.083.054-.085.053-.087.052-.09.052-.093.051-.095.05-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.045-.118.044-.12.043-.122.042-.124.042-.126.041-.128.04-.13.04-.132.038-.134.038-.135.037-.138.037-.139.035-.142.035-.143.034-.144.033-.147.032-.148.031-.15.03-.151.03-.153.029-.154.027-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.01-.179.008-.179.008-.181.006-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.006-.179-.008-.179-.008-.178-.01-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.027-.153-.029-.151-.03-.15-.03-.148-.031-.146-.032-.145-.033-.143-.034-.141-.035-.14-.035-.137-.037-.136-.037-.134-.038-.132-.038-.13-.04-.128-.04-.126-.041-.124-.042-.122-.042-.12-.044-.117-.043-.116-.045-.113-.045-.112-.046-.109-.047-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.05-.093-.052-.09-.051-.087-.052-.085-.053-.083-.054-.08-.054-.077-.054v4.127zm0-5.654v.011l.001.021.003.021.004.021.005.022.006.022.007.022.009.022.01.022.011.023.012.023.013.023.015.024.016.023.017.024.018.024.019.024.021.024.022.024.023.025.024.024.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.052.11.051.114.051.119.052.123.05.127.051.131.05.135.049.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.044.171.042.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.022.23.02.233.018.236.016.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.012.241-.015.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.048.139-.05.136-.049.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.051.051-.049.023-.025.023-.024.021-.025.02-.024.019-.024.018-.024.017-.024.015-.023.014-.023.013-.024.012-.022.01-.023.01-.023.008-.022.006-.022.006-.022.004-.021.004-.022.001-.021.001-.021v-4.139l-.077.054-.08.054-.083.054-.085.052-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.044-.118.044-.12.044-.122.042-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.035-.143.033-.144.033-.147.033-.148.031-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.009-.179.009-.179.007-.181.007-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.007-.179-.007-.179-.009-.178-.009-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.031-.146-.033-.145-.033-.143-.033-.141-.035-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.04-.126-.041-.124-.042-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.051-.093-.051-.09-.051-.087-.053-.085-.052-.083-.054-.08-.054-.077-.054v4.139zm0-5.666v.011l.001.02.003.022.004.021.005.022.006.021.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.024.018.023.019.024.021.025.022.024.023.024.024.025.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.051.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.043.171.043.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.021.23.02.233.018.236.017.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.013.241-.014.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.049.139-.049.136-.049.131-.051.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.049.023-.025.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.022.01-.023.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.153l-.077.054-.08.054-.083.053-.085.053-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.048-.105.048-.106.048-.109.046-.111.046-.114.046-.115.044-.118.044-.12.043-.122.043-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.034-.143.034-.144.033-.147.032-.148.032-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.024-.161.024-.162.023-.163.023-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.01-.178.01-.179.009-.179.007-.181.006-.182.006-.182.004-.184.003-.184.001-.185.001-.185-.001-.184-.001-.184-.003-.182-.004-.182-.006-.181-.006-.179-.007-.179-.009-.178-.01-.176-.01-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.023-.162-.023-.161-.024-.159-.024-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.032-.146-.032-.145-.033-.143-.034-.141-.034-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.041-.126-.041-.124-.041-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.048-.105-.048-.102-.048-.1-.05-.097-.049-.095-.051-.093-.051-.09-.052-.087-.052-.085-.053-.083-.053-.08-.054-.077-.054v4.153zm8.74-8.179l-.257.004-.254.005-.25.008-.247.011-.244.012-.241.014-.237.016-.233.018-.231.021-.226.022-.224.023-.22.026-.216.027-.212.028-.21.031-.205.032-.202.033-.198.034-.194.036-.191.038-.187.038-.183.04-.179.041-.175.042-.172.043-.168.043-.163.045-.16.046-.155.046-.152.048-.148.048-.143.048-.139.049-.136.05-.131.05-.126.051-.123.051-.118.051-.114.052-.11.052-.106.052-.101.052-.096.052-.092.052-.088.052-.083.052-.079.052-.074.051-.07.052-.065.051-.06.05-.056.05-.051.05-.023.025-.023.024-.021.024-.02.025-.019.024-.018.024-.017.023-.015.024-.014.023-.013.023-.012.023-.01.023-.01.022-.008.022-.006.023-.006.021-.004.022-.004.021-.001.021-.001.021.001.021.001.021.004.021.004.022.006.021.006.023.008.022.01.022.01.023.012.023.013.023.014.023.015.024.017.023.018.024.019.024.02.025.021.024.023.024.023.025.051.05.056.05.06.05.065.051.07.052.074.051.079.052.083.052.088.052.092.052.096.052.101.052.106.052.11.052.114.052.118.051.123.051.126.051.131.05.136.05.139.049.143.048.148.048.152.048.155.046.16.046.163.045.168.043.172.043.175.042.179.041.183.04.187.038.191.038.194.036.198.034.202.033.205.032.21.031.212.028.216.027.22.026.224.023.226.022.231.021.233.018.237.016.241.014.244.012.247.011.25.008.254.005.257.004.26.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.022.224-.023.22-.026.216-.027.212-.028.21-.031.205-.032.202-.033.198-.034.194-.036.191-.038.187-.038.183-.04.179-.041.175-.042.172-.043.168-.043.163-.045.16-.046.155-.046.152-.048.148-.048.143-.048.139-.049.136-.05.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.05.051-.05.023-.025.023-.024.021-.024.02-.025.019-.024.018-.024.017-.023.015-.024.014-.023.013-.023.012-.023.01-.023.01-.022.008-.022.006-.023.006-.021.004-.022.004-.021.001-.021.001-.021-.001-.021-.001-.021-.004-.021-.004-.022-.006-.021-.006-.023-.008-.022-.01-.022-.01-.023-.012-.023-.013-.023-.014-.023-.015-.024-.017-.023-.018-.024-.019-.024-.02-.025-.021-.024-.023-.024-.023-.025-.051-.05-.056-.05-.06-.05-.065-.051-.07-.052-.074-.051-.079-.052-.083-.052-.088-.052-.092-.052-.096-.052-.101-.052-.106-.052-.11-.052-.114-.052-.118-.051-.123-.051-.126-.051-.131-.05-.136-.05-.139-.049-.143-.048-.148-.048-.152-.048-.155-.046-.16-.046-.163-.045-.168-.043-.172-.043-.175-.042-.179-.041-.183-.04-.187-.038-.191-.038-.194-.036-.198-.034-.202-.033-.205-.032-.21-.031-.212-.028-.216-.027-.22-.026-.224-.023-.226-.022-.231-.021-.233-.018-.237-.016-.241-.014-.244-.012-.247-.011-.25-.008-.254-.005-.257-.004-.26-.001-.26.001z"></path></symbol></defs><defs><symbol id="clock" width="24" height="24"><path transform="scale(.5)" d="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm0-2c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm5.848 12.459c.202.038.202.333.001.372-1.907.361-6.045 1.111-6.547 1.111-.719 0-1.301-.582-1.301-1.301 0-.512.77-5.447 1.125-7.445.034-.192.312-.181.343.014l.985 6.238 5.394 1.011z"></path></symbol></defs><g><line id="actor0" x1="75" y1="5" x2="75" y2="383" class="200" stroke-width="0.5px" stroke="#999"></line><g id="root-0"><rect x="0" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="75" dy="0">Client</tspan></text></g></g><g><line id="actor1" x1="432" y1="5" x2="432" y2="383" class="200" stroke-width="0.5px" stroke="#999"></line><g id="root-1"><rect x="357" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="432" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="432" dy="0">Server</tspan></text></g></g><defs><marker id="arrowhead" refX="9" refY="5" markerUnits="userSpaceOnUse" markerWidth="12" markerHeight="12" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z"></path></marker></defs><defs><marker id="crosshead" markerWidth="15" markerHeight="8" orient="auto" refX="16" refY="4"><path fill="black" stroke="#000000" stroke-width="1px" d="M 9,2 V 6 L16,4 Z" style="stroke-dasharray: 0, 0;"></path><path fill="none" stroke="#000000" stroke-width="1px" d="M 0,1 L 6,7 M 6,1 L 0,7" style="stroke-dasharray: 0, 0;"></path></marker></defs><defs><marker id="filled-head" refX="18" refY="7" markerWidth="20" markerHeight="28" orient="auto"><path d="M 18,7 L9,13 L14,7 L9,1 Z"></path></marker></defs><defs><marker id="sequencenumber" refX="15" refY="15" markerWidth="60" markerHeight="40" orient="auto"><circle cx="15" cy="15" r="6"></circle></marker></defs><g><rect x="100" y="75" fill="#EDF2AE" stroke="#666" width="307" height="36" rx="0" ry="0" class="note"></rect><text x="254" y="80" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="noteText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 14px; font-weight: 400;"><tspan x="254">The first FlightData includes a FlightDescriptor</tspan></text></g><text x="254" y="126" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">DoExchange(FlightData)</text><line x1="75" y1="155" x2="432" y2="155" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="75" y="159" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">1</text><text x="254" y="215" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">stream of FlightData</text><line x1="75" y1="244" x2="432" y2="244" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="75" y="248" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">2</text><text x="254" y="304" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">stream of FlightData</text><line x1="432" y1="333" x2="75" y2="333" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="432" y="337" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">3</text><g><line x1="65" y1="165" x2="442" y2="165" class="loopLine"></line><line x1="442" y1="165" x2="442" y2="343" class="loopLine"></line><line x1="65" y1="343" x2="442" y2="343" class="loopLine"></line><line x1="65" y1="165" x2="65" y2="343" class="loopLine"></line><line x1="65" y1="259" x2="442" y2="259" class="loopLine" style="stroke-dasharray: 3, 3;"></line><polygon points="65,165 115,165 115,178 106.6,185 65,185" class="labelBox"></polygon><text x="90" y="178" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="labelText" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">par</text><text x="278.5" y="183" text-anchor="middle" class="loopText" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;"><tspan x="278.5">[[Client sends data]]</tspan></text><text x="253.5" y="277" text-anchor="middle" class="loopText" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">[[Server sends data]]</text></g><g><rect x="0" y="363" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="395.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="75" dy="0">Client</tspan></text></g><g><rect x="357" y="363" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="432" y="395.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="432" dy="0">Server</tspan></text></g></svg>
\ No newline at end of file
diff --git a/docs/source/format/Flight/DoGet.mmd b/docs/source/format/Flight/DoGet.mmd
index c2e3cd034448c..cac59afb8219f 100644
--- a/docs/source/format/Flight/DoGet.mmd
+++ b/docs/source/format/Flight/DoGet.mmd
@@ -15,9 +15,6 @@
 %% specific language governing permissions and limitations
 %% under the License.
 
-%% To generate the diagram, use mermaid-cli
-%% Example: docker run --rm -v $(pwd)/FlightSql:/data minlag/mermaid-cli -i /data/CommandGetTables.mmd
-
 sequenceDiagram
 autonumber
 
diff --git a/docs/source/format/Flight/DoGet.mmd.svg b/docs/source/format/Flight/DoGet.mmd.svg
deleted file mode 100644
index 48a50d77ed33f..0000000000000
--- a/docs/source/format/Flight/DoGet.mmd.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mermaid-1649258038801" width="100%" xmlns="http://www.w3.org/2000/svg" height="448" style="max-width: 910px; background-color: white;" viewBox="-50 -10 910 448"><style>#mermaid-1649258038801 {font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#mermaid-1649258038801 .error-icon{fill:#552222;}#mermaid-1649258038801 .error-text{fill:#552222;stroke:#552222;}#mermaid-1649258038801 .edge-thickness-normal{stroke-width:2px;}#mermaid-1649258038801 .edge-thickness-thick{stroke-width:3.5px;}#mermaid-1649258038801 .edge-pattern-solid{stroke-dasharray:0;}#mermaid-1649258038801 .edge-pattern-dashed{stroke-dasharray:3;}#mermaid-1649258038801 .edge-pattern-dotted{stroke-dasharray:2;}#mermaid-1649258038801 .marker{fill:#333333;stroke:#333333;}#mermaid-1649258038801 .marker.cross{stroke:#333333;}#mermaid-1649258038801 svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#mermaid-1649258038801 .actor{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1649258038801 text.actor&gt;tspan{fill:black;stroke:none;}#mermaid-1649258038801 .actor-line{stroke:grey;}#mermaid-1649258038801 .messageLine0{stroke-width:1.5;stroke-dasharray:none;stroke:#333;}#mermaid-1649258038801 .messageLine1{stroke-width:1.5;stroke-dasharray:2,2;stroke:#333;}#mermaid-1649258038801 #arrowhead path{fill:#333;stroke:#333;}#mermaid-1649258038801 .sequenceNumber{fill:white;}#mermaid-1649258038801 #sequencenumber{fill:#333;}#mermaid-1649258038801 #crosshead path{fill:#333;stroke:#333;}#mermaid-1649258038801 .messageText{fill:#333;stroke:#333;}#mermaid-1649258038801 .labelBox{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1649258038801 .labelText,#mermaid-1649258038801 .labelText&gt;tspan{fill:black;stroke:none;}#mermaid-1649258038801 .loopText,#mermaid-1649258038801 .loopText&gt;tspan{fill:black;stroke:none;}#mermaid-1649258038801 .loopLine{stroke-width:2px;stroke-dasharray:2,2;stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);}#mermaid-1649258038801 .note{stroke:#aaaa33;fill:#fff5ad;}#mermaid-1649258038801 .noteText,#mermaid-1649258038801 .noteText&gt;tspan{fill:black;stroke:none;}#mermaid-1649258038801 .activation0{fill:#f4f4f4;stroke:#666;}#mermaid-1649258038801 .activation1{fill:#f4f4f4;stroke:#666;}#mermaid-1649258038801 .activation2{fill:#f4f4f4;stroke:#666;}#mermaid-1649258038801 .actorPopupMenu{position:absolute;}#mermaid-1649258038801 .actorPopupMenuPanel{position:absolute;fill:#ECECFF;box-shadow:0px 8px 16px 0px rgba(0,0,0,0.2);filter:drop-shadow(3px 5px 2px rgb(0 0 0 / 0.4));}#mermaid-1649258038801 .actor-man line{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1649258038801 .actor-man circle,#mermaid-1649258038801 line{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;stroke-width:2px;}#mermaid-1649258038801 :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g></g><defs><symbol id="computer" width="24" height="24"><path transform="scale(.5)" d="M2 2v13h20v-13h-20zm18 11h-16v-9h16v9zm-10.228 6l.466-1h3.524l.467 1h-4.457zm14.228 3h-24l2-6h2.104l-1.33 4h18.45l-1.297-4h2.073l2 6zm-5-10h-14v-7h14v7z"></path></symbol></defs><defs><symbol id="database" fill-rule="evenodd" clip-rule="evenodd"><path transform="scale(.5)" d="M12.258.001l.256.004.255.005.253.008.251.01.249.012.247.015.246.016.242.019.241.02.239.023.236.024.233.027.231.028.229.031.225.032.223.034.22.036.217.038.214.04.211.041.208.043.205.045.201.046.198.048.194.05.191.051.187.053.183.054.18.056.175.057.172.059.168.06.163.061.16.063.155.064.15.066.074.033.073.033.071.034.07.034.069.035.068.035.067.035.066.035.064.036.064.036.062.036.06.036.06.037.058.037.058.037.055.038.055.038.053.038.052.038.051.039.05.039.048.039.047.039.045.04.044.04.043.04.041.04.04.041.039.041.037.041.036.041.034.041.033.042.032.042.03.042.029.042.027.042.026.043.024.043.023.043.021.043.02.043.018.044.017.043.015.044.013.044.012.044.011.045.009.044.007.045.006.045.004.045.002.045.001.045v17l-.001.045-.002.045-.004.045-.006.045-.007.045-.009.044-.011.045-.012.044-.013.044-.015.044-.017.043-.018.044-.02.043-.021.043-.023.043-.024.043-.026.043-.027.042-.029.042-.03.042-.032.042-.033.042-.034.041-.036.041-.037.041-.039.041-.04.041-.041.04-.043.04-.044.04-.045.04-.047.039-.048.039-.05.039-.051.039-.052.038-.053.038-.055.038-.055.038-.058.037-.058.037-.06.037-.06.036-.062.036-.064.036-.064.036-.066.035-.067.035-.068.035-.069.035-.07.034-.071.034-.073.033-.074.033-.15.066-.155.064-.16.063-.163.061-.168.06-.172.059-.175.057-.18.056-.183.054-.187.053-.191.051-.194.05-.198.048-.201.046-.205.045-.208.043-.211.041-.214.04-.217.038-.22.036-.223.034-.225.032-.229.031-.231.028-.233.027-.236.024-.239.023-.241.02-.242.019-.246.016-.247.015-.249.012-.251.01-.253.008-.255.005-.256.004-.258.001-.258-.001-.256-.004-.255-.005-.253-.008-.251-.01-.249-.012-.247-.015-.245-.016-.243-.019-.241-.02-.238-.023-.236-.024-.234-.027-.231-.028-.228-.031-.226-.032-.223-.034-.22-.036-.217-.038-.214-.04-.211-.041-.208-.043-.204-.045-.201-.046-.198-.048-.195-.05-.19-.051-.187-.053-.184-.054-.179-.056-.176-.057-.172-.059-.167-.06-.164-.061-.159-.063-.155-.064-.151-.066-.074-.033-.072-.033-.072-.034-.07-.034-.069-.035-.068-.035-.067-.035-.066-.035-.064-.036-.063-.036-.062-.036-.061-.036-.06-.037-.058-.037-.057-.037-.056-.038-.055-.038-.053-.038-.052-.038-.051-.039-.049-.039-.049-.039-.046-.039-.046-.04-.044-.04-.043-.04-.041-.04-.04-.041-.039-.041-.037-.041-.036-.041-.034-.041-.033-.042-.032-.042-.03-.042-.029-.042-.027-.042-.026-.043-.024-.043-.023-.043-.021-.043-.02-.043-.018-.044-.017-.043-.015-.044-.013-.044-.012-.044-.011-.045-.009-.044-.007-.045-.006-.045-.004-.045-.002-.045-.001-.045v-17l.001-.045.002-.045.004-.045.006-.045.007-.045.009-.044.011-.045.012-.044.013-.044.015-.044.017-.043.018-.044.02-.043.021-.043.023-.043.024-.043.026-.043.027-.042.029-.042.03-.042.032-.042.033-.042.034-.041.036-.041.037-.041.039-.041.04-.041.041-.04.043-.04.044-.04.046-.04.046-.039.049-.039.049-.039.051-.039.052-.038.053-.038.055-.038.056-.038.057-.037.058-.037.06-.037.061-.036.062-.036.063-.036.064-.036.066-.035.067-.035.068-.035.069-.035.07-.034.072-.034.072-.033.074-.033.151-.066.155-.064.159-.063.164-.061.167-.06.172-.059.176-.057.179-.056.184-.054.187-.053.19-.051.195-.05.198-.048.201-.046.204-.045.208-.043.211-.041.214-.04.217-.038.22-.036.223-.034.226-.032.228-.031.231-.028.234-.027.236-.024.238-.023.241-.02.243-.019.245-.016.247-.015.249-.012.251-.01.253-.008.255-.005.256-.004.258-.001.258.001zm-9.258 20.499v.01l.001.021.003.021.004.022.005.021.006.022.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.023.018.024.019.024.021.024.022.025.023.024.024.025.052.049.056.05.061.051.066.051.07.051.075.051.079.052.084.052.088.052.092.052.097.052.102.051.105.052.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.048.144.049.147.047.152.047.155.047.16.045.163.045.167.043.171.043.176.041.178.041.183.039.187.039.19.037.194.035.197.035.202.033.204.031.209.03.212.029.216.027.219.025.222.024.226.021.23.02.233.018.236.016.24.015.243.012.246.01.249.008.253.005.256.004.259.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.021.224-.024.22-.026.216-.027.212-.028.21-.031.205-.031.202-.034.198-.034.194-.036.191-.037.187-.039.183-.04.179-.04.175-.042.172-.043.168-.044.163-.045.16-.046.155-.046.152-.047.148-.048.143-.049.139-.049.136-.05.131-.05.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.053.083-.051.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.05.023-.024.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.023.01-.022.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.127l-.077.055-.08.053-.083.054-.085.053-.087.052-.09.052-.093.051-.095.05-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.045-.118.044-.12.043-.122.042-.124.042-.126.041-.128.04-.13.04-.132.038-.134.038-.135.037-.138.037-.139.035-.142.035-.143.034-.144.033-.147.032-.148.031-.15.03-.151.03-.153.029-.154.027-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.01-.179.008-.179.008-.181.006-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.006-.179-.008-.179-.008-.178-.01-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.027-.153-.029-.151-.03-.15-.03-.148-.031-.146-.032-.145-.033-.143-.034-.141-.035-.14-.035-.137-.037-.136-.037-.134-.038-.132-.038-.13-.04-.128-.04-.126-.041-.124-.042-.122-.042-.12-.044-.117-.043-.116-.045-.113-.045-.112-.046-.109-.047-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.05-.093-.052-.09-.051-.087-.052-.085-.053-.083-.054-.08-.054-.077-.054v4.127zm0-5.654v.011l.001.021.003.021.004.021.005.022.006.022.007.022.009.022.01.022.011.023.012.023.013.023.015.024.016.023.017.024.018.024.019.024.021.024.022.024.023.025.024.024.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.052.11.051.114.051.119.052.123.05.127.051.131.05.135.049.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.044.171.042.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.022.23.02.233.018.236.016.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.012.241-.015.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.048.139-.05.136-.049.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.051.051-.049.023-.025.023-.024.021-.025.02-.024.019-.024.018-.024.017-.024.015-.023.014-.023.013-.024.012-.022.01-.023.01-.023.008-.022.006-.022.006-.022.004-.021.004-.022.001-.021.001-.021v-4.139l-.077.054-.08.054-.083.054-.085.052-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.044-.118.044-.12.044-.122.042-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.035-.143.033-.144.033-.147.033-.148.031-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.009-.179.009-.179.007-.181.007-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.007-.179-.007-.179-.009-.178-.009-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.031-.146-.033-.145-.033-.143-.033-.141-.035-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.04-.126-.041-.124-.042-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.051-.093-.051-.09-.051-.087-.053-.085-.052-.083-.054-.08-.054-.077-.054v4.139zm0-5.666v.011l.001.02.003.022.004.021.005.022.006.021.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.024.018.023.019.024.021.025.022.024.023.024.024.025.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.051.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.043.171.043.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.021.23.02.233.018.236.017.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.013.241-.014.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.049.139-.049.136-.049.131-.051.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.049.023-.025.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.022.01-.023.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.153l-.077.054-.08.054-.083.053-.085.053-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.048-.105.048-.106.048-.109.046-.111.046-.114.046-.115.044-.118.044-.12.043-.122.043-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.034-.143.034-.144.033-.147.032-.148.032-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.024-.161.024-.162.023-.163.023-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.01-.178.01-.179.009-.179.007-.181.006-.182.006-.182.004-.184.003-.184.001-.185.001-.185-.001-.184-.001-.184-.003-.182-.004-.182-.006-.181-.006-.179-.007-.179-.009-.178-.01-.176-.01-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.023-.162-.023-.161-.024-.159-.024-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.032-.146-.032-.145-.033-.143-.034-.141-.034-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.041-.126-.041-.124-.041-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.048-.105-.048-.102-.048-.1-.05-.097-.049-.095-.051-.093-.051-.09-.052-.087-.052-.085-.053-.083-.053-.08-.054-.077-.054v4.153zm8.74-8.179l-.257.004-.254.005-.25.008-.247.011-.244.012-.241.014-.237.016-.233.018-.231.021-.226.022-.224.023-.22.026-.216.027-.212.028-.21.031-.205.032-.202.033-.198.034-.194.036-.191.038-.187.038-.183.04-.179.041-.175.042-.172.043-.168.043-.163.045-.16.046-.155.046-.152.048-.148.048-.143.048-.139.049-.136.05-.131.05-.126.051-.123.051-.118.051-.114.052-.11.052-.106.052-.101.052-.096.052-.092.052-.088.052-.083.052-.079.052-.074.051-.07.052-.065.051-.06.05-.056.05-.051.05-.023.025-.023.024-.021.024-.02.025-.019.024-.018.024-.017.023-.015.024-.014.023-.013.023-.012.023-.01.023-.01.022-.008.022-.006.023-.006.021-.004.022-.004.021-.001.021-.001.021.001.021.001.021.004.021.004.022.006.021.006.023.008.022.01.022.01.023.012.023.013.023.014.023.015.024.017.023.018.024.019.024.02.025.021.024.023.024.023.025.051.05.056.05.06.05.065.051.07.052.074.051.079.052.083.052.088.052.092.052.096.052.101.052.106.052.11.052.114.052.118.051.123.051.126.051.131.05.136.05.139.049.143.048.148.048.152.048.155.046.16.046.163.045.168.043.172.043.175.042.179.041.183.04.187.038.191.038.194.036.198.034.202.033.205.032.21.031.212.028.216.027.22.026.224.023.226.022.231.021.233.018.237.016.241.014.244.012.247.011.25.008.254.005.257.004.26.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.022.224-.023.22-.026.216-.027.212-.028.21-.031.205-.032.202-.033.198-.034.194-.036.191-.038.187-.038.183-.04.179-.041.175-.042.172-.043.168-.043.163-.045.16-.046.155-.046.152-.048.148-.048.143-.048.139-.049.136-.05.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.05.051-.05.023-.025.023-.024.021-.024.02-.025.019-.024.018-.024.017-.023.015-.024.014-.023.013-.023.012-.023.01-.023.01-.022.008-.022.006-.023.006-.021.004-.022.004-.021.001-.021.001-.021-.001-.021-.001-.021-.004-.021-.004-.022-.006-.021-.006-.023-.008-.022-.01-.022-.01-.023-.012-.023-.013-.023-.014-.023-.015-.024-.017-.023-.018-.024-.019-.024-.02-.025-.021-.024-.023-.024-.023-.025-.051-.05-.056-.05-.06-.05-.065-.051-.07-.052-.074-.051-.079-.052-.083-.052-.088-.052-.092-.052-.096-.052-.101-.052-.106-.052-.11-.052-.114-.052-.118-.051-.123-.051-.126-.051-.131-.05-.136-.05-.139-.049-.143-.048-.148-.048-.152-.048-.155-.046-.16-.046-.163-.045-.168-.043-.172-.043-.175-.042-.179-.041-.183-.04-.187-.038-.191-.038-.194-.036-.198-.034-.202-.033-.205-.032-.21-.031-.212-.028-.216-.027-.22-.026-.224-.023-.226-.022-.231-.021-.233-.018-.237-.016-.241-.014-.244-.012-.247-.011-.25-.008-.254-.005-.257-.004-.26-.001-.26.001z"></path></symbol></defs><defs><symbol id="clock" width="24" height="24"><path transform="scale(.5)" d="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm0-2c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm5.848 12.459c.202.038.202.333.001.372-1.907.361-6.045 1.111-6.547 1.111-.719 0-1.301-.582-1.301-1.301 0-.512.77-5.447 1.125-7.445.034-.192.312-.181.343.014l.985 6.238 5.394 1.011z"></path></symbol></defs><g><line id="actor0" x1="75" y1="5" x2="75" y2="382" class="200" stroke-width="0.5px" stroke="#999"></line><g id="root-0"><rect x="0" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="75" dy="0">Client</tspan></text></g></g><g><line id="actor1" x1="535" y1="5" x2="535" y2="382" class="200" stroke-width="0.5px" stroke="#999"></line><g id="root-1"><rect x="460" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="535" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="535" dy="0">Metadata Server</tspan></text></g></g><g><line id="actor2" x1="735" y1="5" x2="735" y2="382" class="200" stroke-width="0.5px" stroke="#999"></line><g id="root-2"><rect x="660" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="735" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="735" dy="0">Data Server</tspan></text></g></g><defs><marker id="arrowhead" refX="9" refY="5" markerUnits="userSpaceOnUse" markerWidth="12" markerHeight="12" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z"></path></marker></defs><defs><marker id="crosshead" markerWidth="15" markerHeight="8" orient="auto" refX="16" refY="4"><path fill="black" stroke="#000000" stroke-width="1px" d="M 9,2 V 6 L16,4 Z" style="stroke-dasharray: 0, 0;"></path><path fill="none" stroke="#000000" stroke-width="1px" d="M 0,1 L 6,7 M 6,1 L 0,7" style="stroke-dasharray: 0, 0;"></path></marker></defs><defs><marker id="filled-head" refX="18" refY="7" markerWidth="20" markerHeight="28" orient="auto"><path d="M 18,7 L9,13 L14,7 L9,1 Z"></path></marker></defs><defs><marker id="sequencenumber" refX="15" refY="15" markerWidth="60" markerHeight="40" orient="auto"><circle cx="15" cy="15" r="6"></circle></marker></defs><text x="305" y="80" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">GetFlightInfo(FlightDescriptor)</text><line x1="75" y1="109" x2="535" y2="109" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="75" y="113" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">1</text><text x="305" y="124" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">FlightInfo{endpoints: [FlightEndpoint{ticket: Ticket}, …]}</text><line x1="535" y1="153" x2="75" y2="153" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="535" y="157" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">2</text><g><rect x="50" y="163" fill="#EDF2AE" stroke="#666" width="710" height="36" rx="0" ry="0" class="note"></rect><text x="405" y="168" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="noteText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 14px; font-weight: 400;"><tspan x="405">This may be parallelized</tspan></text></g><text x="405" y="259" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">DoGet(Ticket)</text><line x1="75" y1="288" x2="735" y2="288" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="75" y="292" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">3</text><text x="405" y="303" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">stream of FlightData</text><line x1="735" y1="332" x2="75" y2="332" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="735" y="336" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">4</text><g><line x1="65" y1="209" x2="745" y2="209" class="loopLine"></line><line x1="745" y1="209" x2="745" y2="342" class="loopLine"></line><line x1="65" y1="342" x2="745" y2="342" class="loopLine"></line><line x1="65" y1="209" x2="65" y2="342" class="loopLine"></line><polygon points="65,209 115,209 115,222 106.6,229 65,229" class="labelBox"></polygon><text x="90" y="222" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="labelText" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">loop</text><text x="430" y="227" text-anchor="middle" class="loopText" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;"><tspan x="430">[for each endpoint in FlightInfo.endpoints]</tspan></text></g><g><rect x="0" y="362" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="394.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="75" dy="0">Client</tspan></text></g><g><rect x="460" y="362" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="535" y="394.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="535" dy="0">Metadata Server</tspan></text></g><g><rect x="660" y="362" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="735" y="394.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="735" dy="0">Data Server</tspan></text></g></svg>
\ No newline at end of file
diff --git a/docs/source/format/Flight/DoPut.mmd b/docs/source/format/Flight/DoPut.mmd
index 5845edef1f466..876505da2d300 100644
--- a/docs/source/format/Flight/DoPut.mmd
+++ b/docs/source/format/Flight/DoPut.mmd
@@ -15,9 +15,6 @@
 %% specific language governing permissions and limitations
 %% under the License.
 
-%% To generate the diagram, use mermaid-cli
-%% Example: docker run --rm -v $(pwd)/FlightSql:/data minlag/mermaid-cli -i /data/CommandGetTables.mmd
-
 sequenceDiagram
 autonumber
 
diff --git a/docs/source/format/Flight/DoPut.mmd.svg b/docs/source/format/Flight/DoPut.mmd.svg
deleted file mode 100644
index 9e490e152bdb3..0000000000000
--- a/docs/source/format/Flight/DoPut.mmd.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mermaid-1649258039834" width="100%" xmlns="http://www.w3.org/2000/svg" height="351" style="max-width: 607px; background-color: white;" viewBox="-50 -10 607 351"><style>#mermaid-1649258039834 {font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#mermaid-1649258039834 .error-icon{fill:#552222;}#mermaid-1649258039834 .error-text{fill:#552222;stroke:#552222;}#mermaid-1649258039834 .edge-thickness-normal{stroke-width:2px;}#mermaid-1649258039834 .edge-thickness-thick{stroke-width:3.5px;}#mermaid-1649258039834 .edge-pattern-solid{stroke-dasharray:0;}#mermaid-1649258039834 .edge-pattern-dashed{stroke-dasharray:3;}#mermaid-1649258039834 .edge-pattern-dotted{stroke-dasharray:2;}#mermaid-1649258039834 .marker{fill:#333333;stroke:#333333;}#mermaid-1649258039834 .marker.cross{stroke:#333333;}#mermaid-1649258039834 svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#mermaid-1649258039834 .actor{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1649258039834 text.actor&gt;tspan{fill:black;stroke:none;}#mermaid-1649258039834 .actor-line{stroke:grey;}#mermaid-1649258039834 .messageLine0{stroke-width:1.5;stroke-dasharray:none;stroke:#333;}#mermaid-1649258039834 .messageLine1{stroke-width:1.5;stroke-dasharray:2,2;stroke:#333;}#mermaid-1649258039834 #arrowhead path{fill:#333;stroke:#333;}#mermaid-1649258039834 .sequenceNumber{fill:white;}#mermaid-1649258039834 #sequencenumber{fill:#333;}#mermaid-1649258039834 #crosshead path{fill:#333;stroke:#333;}#mermaid-1649258039834 .messageText{fill:#333;stroke:#333;}#mermaid-1649258039834 .labelBox{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1649258039834 .labelText,#mermaid-1649258039834 .labelText&gt;tspan{fill:black;stroke:none;}#mermaid-1649258039834 .loopText,#mermaid-1649258039834 .loopText&gt;tspan{fill:black;stroke:none;}#mermaid-1649258039834 .loopLine{stroke-width:2px;stroke-dasharray:2,2;stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);}#mermaid-1649258039834 .note{stroke:#aaaa33;fill:#fff5ad;}#mermaid-1649258039834 .noteText,#mermaid-1649258039834 .noteText&gt;tspan{fill:black;stroke:none;}#mermaid-1649258039834 .activation0{fill:#f4f4f4;stroke:#666;}#mermaid-1649258039834 .activation1{fill:#f4f4f4;stroke:#666;}#mermaid-1649258039834 .activation2{fill:#f4f4f4;stroke:#666;}#mermaid-1649258039834 .actorPopupMenu{position:absolute;}#mermaid-1649258039834 .actorPopupMenuPanel{position:absolute;fill:#ECECFF;box-shadow:0px 8px 16px 0px rgba(0,0,0,0.2);filter:drop-shadow(3px 5px 2px rgb(0 0 0 / 0.4));}#mermaid-1649258039834 .actor-man line{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1649258039834 .actor-man circle,#mermaid-1649258039834 line{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;stroke-width:2px;}#mermaid-1649258039834 :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g></g><defs><symbol id="computer" width="24" height="24"><path transform="scale(.5)" d="M2 2v13h20v-13h-20zm18 11h-16v-9h16v9zm-10.228 6l.466-1h3.524l.467 1h-4.457zm14.228 3h-24l2-6h2.104l-1.33 4h18.45l-1.297-4h2.073l2 6zm-5-10h-14v-7h14v7z"></path></symbol></defs><defs><symbol id="database" fill-rule="evenodd" clip-rule="evenodd"><path transform="scale(.5)" d="M12.258.001l.256.004.255.005.253.008.251.01.249.012.247.015.246.016.242.019.241.02.239.023.236.024.233.027.231.028.229.031.225.032.223.034.22.036.217.038.214.04.211.041.208.043.205.045.201.046.198.048.194.05.191.051.187.053.183.054.18.056.175.057.172.059.168.06.163.061.16.063.155.064.15.066.074.033.073.033.071.034.07.034.069.035.068.035.067.035.066.035.064.036.064.036.062.036.06.036.06.037.058.037.058.037.055.038.055.038.053.038.052.038.051.039.05.039.048.039.047.039.045.04.044.04.043.04.041.04.04.041.039.041.037.041.036.041.034.041.033.042.032.042.03.042.029.042.027.042.026.043.024.043.023.043.021.043.02.043.018.044.017.043.015.044.013.044.012.044.011.045.009.044.007.045.006.045.004.045.002.045.001.045v17l-.001.045-.002.045-.004.045-.006.045-.007.045-.009.044-.011.045-.012.044-.013.044-.015.044-.017.043-.018.044-.02.043-.021.043-.023.043-.024.043-.026.043-.027.042-.029.042-.03.042-.032.042-.033.042-.034.041-.036.041-.037.041-.039.041-.04.041-.041.04-.043.04-.044.04-.045.04-.047.039-.048.039-.05.039-.051.039-.052.038-.053.038-.055.038-.055.038-.058.037-.058.037-.06.037-.06.036-.062.036-.064.036-.064.036-.066.035-.067.035-.068.035-.069.035-.07.034-.071.034-.073.033-.074.033-.15.066-.155.064-.16.063-.163.061-.168.06-.172.059-.175.057-.18.056-.183.054-.187.053-.191.051-.194.05-.198.048-.201.046-.205.045-.208.043-.211.041-.214.04-.217.038-.22.036-.223.034-.225.032-.229.031-.231.028-.233.027-.236.024-.239.023-.241.02-.242.019-.246.016-.247.015-.249.012-.251.01-.253.008-.255.005-.256.004-.258.001-.258-.001-.256-.004-.255-.005-.253-.008-.251-.01-.249-.012-.247-.015-.245-.016-.243-.019-.241-.02-.238-.023-.236-.024-.234-.027-.231-.028-.228-.031-.226-.032-.223-.034-.22-.036-.217-.038-.214-.04-.211-.041-.208-.043-.204-.045-.201-.046-.198-.048-.195-.05-.19-.051-.187-.053-.184-.054-.179-.056-.176-.057-.172-.059-.167-.06-.164-.061-.159-.063-.155-.064-.151-.066-.074-.033-.072-.033-.072-.034-.07-.034-.069-.035-.068-.035-.067-.035-.066-.035-.064-.036-.063-.036-.062-.036-.061-.036-.06-.037-.058-.037-.057-.037-.056-.038-.055-.038-.053-.038-.052-.038-.051-.039-.049-.039-.049-.039-.046-.039-.046-.04-.044-.04-.043-.04-.041-.04-.04-.041-.039-.041-.037-.041-.036-.041-.034-.041-.033-.042-.032-.042-.03-.042-.029-.042-.027-.042-.026-.043-.024-.043-.023-.043-.021-.043-.02-.043-.018-.044-.017-.043-.015-.044-.013-.044-.012-.044-.011-.045-.009-.044-.007-.045-.006-.045-.004-.045-.002-.045-.001-.045v-17l.001-.045.002-.045.004-.045.006-.045.007-.045.009-.044.011-.045.012-.044.013-.044.015-.044.017-.043.018-.044.02-.043.021-.043.023-.043.024-.043.026-.043.027-.042.029-.042.03-.042.032-.042.033-.042.034-.041.036-.041.037-.041.039-.041.04-.041.041-.04.043-.04.044-.04.046-.04.046-.039.049-.039.049-.039.051-.039.052-.038.053-.038.055-.038.056-.038.057-.037.058-.037.06-.037.061-.036.062-.036.063-.036.064-.036.066-.035.067-.035.068-.035.069-.035.07-.034.072-.034.072-.033.074-.033.151-.066.155-.064.159-.063.164-.061.167-.06.172-.059.176-.057.179-.056.184-.054.187-.053.19-.051.195-.05.198-.048.201-.046.204-.045.208-.043.211-.041.214-.04.217-.038.22-.036.223-.034.226-.032.228-.031.231-.028.234-.027.236-.024.238-.023.241-.02.243-.019.245-.016.247-.015.249-.012.251-.01.253-.008.255-.005.256-.004.258-.001.258.001zm-9.258 20.499v.01l.001.021.003.021.004.022.005.021.006.022.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.023.018.024.019.024.021.024.022.025.023.024.024.025.052.049.056.05.061.051.066.051.07.051.075.051.079.052.084.052.088.052.092.052.097.052.102.051.105.052.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.048.144.049.147.047.152.047.155.047.16.045.163.045.167.043.171.043.176.041.178.041.183.039.187.039.19.037.194.035.197.035.202.033.204.031.209.03.212.029.216.027.219.025.222.024.226.021.23.02.233.018.236.016.24.015.243.012.246.01.249.008.253.005.256.004.259.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.021.224-.024.22-.026.216-.027.212-.028.21-.031.205-.031.202-.034.198-.034.194-.036.191-.037.187-.039.183-.04.179-.04.175-.042.172-.043.168-.044.163-.045.16-.046.155-.046.152-.047.148-.048.143-.049.139-.049.136-.05.131-.05.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.053.083-.051.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.05.023-.024.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.023.01-.022.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.127l-.077.055-.08.053-.083.054-.085.053-.087.052-.09.052-.093.051-.095.05-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.045-.118.044-.12.043-.122.042-.124.042-.126.041-.128.04-.13.04-.132.038-.134.038-.135.037-.138.037-.139.035-.142.035-.143.034-.144.033-.147.032-.148.031-.15.03-.151.03-.153.029-.154.027-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.01-.179.008-.179.008-.181.006-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.006-.179-.008-.179-.008-.178-.01-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.027-.153-.029-.151-.03-.15-.03-.148-.031-.146-.032-.145-.033-.143-.034-.141-.035-.14-.035-.137-.037-.136-.037-.134-.038-.132-.038-.13-.04-.128-.04-.126-.041-.124-.042-.122-.042-.12-.044-.117-.043-.116-.045-.113-.045-.112-.046-.109-.047-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.05-.093-.052-.09-.051-.087-.052-.085-.053-.083-.054-.08-.054-.077-.054v4.127zm0-5.654v.011l.001.021.003.021.004.021.005.022.006.022.007.022.009.022.01.022.011.023.012.023.013.023.015.024.016.023.017.024.018.024.019.024.021.024.022.024.023.025.024.024.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.052.11.051.114.051.119.052.123.05.127.051.131.05.135.049.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.044.171.042.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.022.23.02.233.018.236.016.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.012.241-.015.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.048.139-.05.136-.049.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.051.051-.049.023-.025.023-.024.021-.025.02-.024.019-.024.018-.024.017-.024.015-.023.014-.023.013-.024.012-.022.01-.023.01-.023.008-.022.006-.022.006-.022.004-.021.004-.022.001-.021.001-.021v-4.139l-.077.054-.08.054-.083.054-.085.052-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.044-.118.044-.12.044-.122.042-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.035-.143.033-.144.033-.147.033-.148.031-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.009-.179.009-.179.007-.181.007-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.007-.179-.007-.179-.009-.178-.009-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.031-.146-.033-.145-.033-.143-.033-.141-.035-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.04-.126-.041-.124-.042-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.051-.093-.051-.09-.051-.087-.053-.085-.052-.083-.054-.08-.054-.077-.054v4.139zm0-5.666v.011l.001.02.003.022.004.021.005.022.006.021.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.024.018.023.019.024.021.025.022.024.023.024.024.025.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.051.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.043.171.043.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.021.23.02.233.018.236.017.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.013.241-.014.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.049.139-.049.136-.049.131-.051.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.049.023-.025.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.022.01-.023.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.153l-.077.054-.08.054-.083.053-.085.053-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.048-.105.048-.106.048-.109.046-.111.046-.114.046-.115.044-.118.044-.12.043-.122.043-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.034-.143.034-.144.033-.147.032-.148.032-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.024-.161.024-.162.023-.163.023-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.01-.178.01-.179.009-.179.007-.181.006-.182.006-.182.004-.184.003-.184.001-.185.001-.185-.001-.184-.001-.184-.003-.182-.004-.182-.006-.181-.006-.179-.007-.179-.009-.178-.01-.176-.01-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.023-.162-.023-.161-.024-.159-.024-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.032-.146-.032-.145-.033-.143-.034-.141-.034-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.041-.126-.041-.124-.041-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.048-.105-.048-.102-.048-.1-.05-.097-.049-.095-.051-.093-.051-.09-.052-.087-.052-.085-.053-.083-.053-.08-.054-.077-.054v4.153zm8.74-8.179l-.257.004-.254.005-.25.008-.247.011-.244.012-.241.014-.237.016-.233.018-.231.021-.226.022-.224.023-.22.026-.216.027-.212.028-.21.031-.205.032-.202.033-.198.034-.194.036-.191.038-.187.038-.183.04-.179.041-.175.042-.172.043-.168.043-.163.045-.16.046-.155.046-.152.048-.148.048-.143.048-.139.049-.136.05-.131.05-.126.051-.123.051-.118.051-.114.052-.11.052-.106.052-.101.052-.096.052-.092.052-.088.052-.083.052-.079.052-.074.051-.07.052-.065.051-.06.05-.056.05-.051.05-.023.025-.023.024-.021.024-.02.025-.019.024-.018.024-.017.023-.015.024-.014.023-.013.023-.012.023-.01.023-.01.022-.008.022-.006.023-.006.021-.004.022-.004.021-.001.021-.001.021.001.021.001.021.004.021.004.022.006.021.006.023.008.022.01.022.01.023.012.023.013.023.014.023.015.024.017.023.018.024.019.024.02.025.021.024.023.024.023.025.051.05.056.05.06.05.065.051.07.052.074.051.079.052.083.052.088.052.092.052.096.052.101.052.106.052.11.052.114.052.118.051.123.051.126.051.131.05.136.05.139.049.143.048.148.048.152.048.155.046.16.046.163.045.168.043.172.043.175.042.179.041.183.04.187.038.191.038.194.036.198.034.202.033.205.032.21.031.212.028.216.027.22.026.224.023.226.022.231.021.233.018.237.016.241.014.244.012.247.011.25.008.254.005.257.004.26.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.022.224-.023.22-.026.216-.027.212-.028.21-.031.205-.032.202-.033.198-.034.194-.036.191-.038.187-.038.183-.04.179-.041.175-.042.172-.043.168-.043.163-.045.16-.046.155-.046.152-.048.148-.048.143-.048.139-.049.136-.05.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.05.051-.05.023-.025.023-.024.021-.024.02-.025.019-.024.018-.024.017-.023.015-.024.014-.023.013-.023.012-.023.01-.023.01-.022.008-.022.006-.023.006-.021.004-.022.004-.021.001-.021.001-.021-.001-.021-.001-.021-.004-.021-.004-.022-.006-.021-.006-.023-.008-.022-.01-.022-.01-.023-.012-.023-.013-.023-.014-.023-.015-.024-.017-.023-.018-.024-.019-.024-.02-.025-.021-.024-.023-.024-.023-.025-.051-.05-.056-.05-.06-.05-.065-.051-.07-.052-.074-.051-.079-.052-.083-.052-.088-.052-.092-.052-.096-.052-.101-.052-.106-.052-.11-.052-.114-.052-.118-.051-.123-.051-.126-.051-.131-.05-.136-.05-.139-.049-.143-.048-.148-.048-.152-.048-.155-.046-.16-.046-.163-.045-.168-.043-.172-.043-.175-.042-.179-.041-.183-.04-.187-.038-.191-.038-.194-.036-.198-.034-.202-.033-.205-.032-.21-.031-.212-.028-.216-.027-.22-.026-.224-.023-.226-.022-.231-.021-.233-.018-.237-.016-.241-.014-.244-.012-.247-.011-.25-.008-.254-.005-.257-.004-.26-.001-.26.001z"></path></symbol></defs><defs><symbol id="clock" width="24" height="24"><path transform="scale(.5)" d="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm0-2c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm5.848 12.459c.202.038.202.333.001.372-1.907.361-6.045 1.111-6.547 1.111-.719 0-1.301-.582-1.301-1.301 0-.512.77-5.447 1.125-7.445.034-.192.312-.181.343.014l.985 6.238 5.394 1.011z"></path></symbol></defs><g><line id="actor0" x1="75" y1="5" x2="75" y2="285" class="200" stroke-width="0.5px" stroke="#999"></line><g id="root-0"><rect x="0" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="75" dy="0">Client</tspan></text></g></g><g><line id="actor1" x1="432" y1="5" x2="432" y2="285" class="200" stroke-width="0.5px" stroke="#999"></line><g id="root-1"><rect x="357" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="432" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="432" dy="0">Server</tspan></text></g></g><defs><marker id="arrowhead" refX="9" refY="5" markerUnits="userSpaceOnUse" markerWidth="12" markerHeight="12" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z"></path></marker></defs><defs><marker id="crosshead" markerWidth="15" markerHeight="8" orient="auto" refX="16" refY="4"><path fill="black" stroke="#000000" stroke-width="1px" d="M 9,2 V 6 L16,4 Z" style="stroke-dasharray: 0, 0;"></path><path fill="none" stroke="#000000" stroke-width="1px" d="M 0,1 L 6,7 M 6,1 L 0,7" style="stroke-dasharray: 0, 0;"></path></marker></defs><defs><marker id="filled-head" refX="18" refY="7" markerWidth="20" markerHeight="28" orient="auto"><path d="M 18,7 L9,13 L14,7 L9,1 Z"></path></marker></defs><defs><marker id="sequencenumber" refX="15" refY="15" markerWidth="60" markerHeight="40" orient="auto"><circle cx="15" cy="15" r="6"></circle></marker></defs><g><rect x="100" y="75" fill="#EDF2AE" stroke="#666" width="307" height="36" rx="0" ry="0" class="note"></rect><text x="254" y="80" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="noteText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 14px; font-weight: 400;"><tspan x="254">The first FlightData includes a FlightDescriptor</tspan></text></g><text x="254" y="126" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">DoPut(FlightData)</text><line x1="75" y1="155" x2="432" y2="155" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="75" y="159" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">1</text><text x="254" y="170" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">stream of FlightData</text><line x1="75" y1="199" x2="432" y2="199" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="75" y="203" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">2</text><text x="254" y="214" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">PutResult{app_metadata}</text><line x1="432" y1="245" x2="75" y2="245" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="432" y="249" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">3</text><g><rect x="0" y="265" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="297.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="75" dy="0">Client</tspan></text></g><g><rect x="357" y="265" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="432" y="297.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="432" dy="0">Server</tspan></text></g></svg>
\ No newline at end of file
diff --git a/docs/source/format/Flight/PollFlightInfo.mmd b/docs/source/format/Flight/PollFlightInfo.mmd
index d062a3a216958..f91c077b655c0 100644
--- a/docs/source/format/Flight/PollFlightInfo.mmd
+++ b/docs/source/format/Flight/PollFlightInfo.mmd
@@ -15,9 +15,6 @@
 %% specific language governing permissions and limitations
 %% under the License.
 
-%% To generate the diagram, use mermaid-cli
-%% Example: docker run --rm -v $(pwd):/data minlag/mermaid-cli -i /data/PollFlightInfo.mmd
-
 sequenceDiagram
 autonumber
 
diff --git a/docs/source/format/Flight/PollFlightInfo.mmd.svg b/docs/source/format/Flight/PollFlightInfo.mmd.svg
deleted file mode 100644
index 1890361f88ce4..0000000000000
--- a/docs/source/format/Flight/PollFlightInfo.mmd.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 1125.5 688" style="max-width: 1125.5px; background-color: white;" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="100%" id="mermaid-1690782830274"><style>#mermaid-1690782830274{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#mermaid-1690782830274 .error-icon{fill:#552222;}#mermaid-1690782830274 .error-text{fill:#552222;stroke:#552222;}#mermaid-1690782830274 .edge-thickness-normal{stroke-width:2px;}#mermaid-1690782830274 .edge-thickness-thick{stroke-width:3.5px;}#mermaid-1690782830274 .edge-pattern-solid{stroke-dasharray:0;}#mermaid-1690782830274 .edge-pattern-dashed{stroke-dasharray:3;}#mermaid-1690782830274 .edge-pattern-dotted{stroke-dasharray:2;}#mermaid-1690782830274 .marker{fill:#333333;stroke:#333333;}#mermaid-1690782830274 .marker.cross{stroke:#333333;}#mermaid-1690782830274 svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#mermaid-1690782830274 .actor{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1690782830274 text.actor&gt;tspan{fill:black;stroke:none;}#mermaid-1690782830274 .actor-line{stroke:grey;}#mermaid-1690782830274 .messageLine0{stroke-width:1.5;stroke-dasharray:none;stroke:#333;}#mermaid-1690782830274 .messageLine1{stroke-width:1.5;stroke-dasharray:2,2;stroke:#333;}#mermaid-1690782830274 #arrowhead path{fill:#333;stroke:#333;}#mermaid-1690782830274 .sequenceNumber{fill:white;}#mermaid-1690782830274 #sequencenumber{fill:#333;}#mermaid-1690782830274 #crosshead path{fill:#333;stroke:#333;}#mermaid-1690782830274 .messageText{fill:#333;stroke:none;}#mermaid-1690782830274 .labelBox{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1690782830274 .labelText,#mermaid-1690782830274 .labelText&gt;tspan{fill:black;stroke:none;}#mermaid-1690782830274 .loopText,#mermaid-1690782830274 .loopText&gt;tspan{fill:black;stroke:none;}#mermaid-1690782830274 .loopLine{stroke-width:2px;stroke-dasharray:2,2;stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);}#mermaid-1690782830274 .note{stroke:#aaaa33;fill:#fff5ad;}#mermaid-1690782830274 .noteText,#mermaid-1690782830274 .noteText&gt;tspan{fill:black;stroke:none;}#mermaid-1690782830274 .activation0{fill:#f4f4f4;stroke:#666;}#mermaid-1690782830274 .activation1{fill:#f4f4f4;stroke:#666;}#mermaid-1690782830274 .activation2{fill:#f4f4f4;stroke:#666;}#mermaid-1690782830274 .actorPopupMenu{position:absolute;}#mermaid-1690782830274 .actorPopupMenuPanel{position:absolute;fill:#ECECFF;box-shadow:0px 8px 16px 0px rgba(0,0,0,0.2);filter:drop-shadow(3px 5px 2px rgb(0 0 0 / 0.4));}#mermaid-1690782830274 .actor-man line{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1690782830274 .actor-man circle,#mermaid-1690782830274 line{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;stroke-width:2px;}#mermaid-1690782830274 :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g/><defs><symbol height="24" width="24" id="computer"><path d="M2 2v13h20v-13h-20zm18 11h-16v-9h16v9zm-10.228 6l.466-1h3.524l.467 1h-4.457zm14.228 3h-24l2-6h2.104l-1.33 4h18.45l-1.297-4h2.073l2 6zm-5-10h-14v-7h14v7z" transform="scale(.5)"/></symbol></defs><defs><symbol clip-rule="evenodd" fill-rule="evenodd" id="database"><path d="M12.258.001l.256.004.255.005.253.008.251.01.249.012.247.015.246.016.242.019.241.02.239.023.236.024.233.027.231.028.229.031.225.032.223.034.22.036.217.038.214.04.211.041.208.043.205.045.201.046.198.048.194.05.191.051.187.053.183.054.18.056.175.057.172.059.168.06.163.061.16.063.155.064.15.066.074.033.073.033.071.034.07.034.069.035.068.035.067.035.066.035.064.036.064.036.062.036.06.036.06.037.058.037.058.037.055.038.055.038.053.038.052.038.051.039.05.039.048.039.047.039.045.04.044.04.043.04.041.04.04.041.039.041.037.041.036.041.034.041.033.042.032.042.03.042.029.042.027.042.026.043.024.043.023.043.021.043.02.043.018.044.017.043.015.044.013.044.012.044.011.045.009.044.007.045.006.045.004.045.002.045.001.045v17l-.001.045-.002.045-.004.045-.006.045-.007.045-.009.044-.011.045-.012.044-.013.044-.015.044-.017.043-.018.044-.02.043-.021.043-.023.043-.024.043-.026.043-.027.042-.029.042-.03.042-.032.042-.033.042-.034.041-.036.041-.037.041-.039.041-.04.041-.041.04-.043.04-.044.04-.045.04-.047.039-.048.039-.05.039-.051.039-.052.038-.053.038-.055.038-.055.038-.058.037-.058.037-.06.037-.06.036-.062.036-.064.036-.064.036-.066.035-.067.035-.068.035-.069.035-.07.034-.071.034-.073.033-.074.033-.15.066-.155.064-.16.063-.163.061-.168.06-.172.059-.175.057-.18.056-.183.054-.187.053-.191.051-.194.05-.198.048-.201.046-.205.045-.208.043-.211.041-.214.04-.217.038-.22.036-.223.034-.225.032-.229.031-.231.028-.233.027-.236.024-.239.023-.241.02-.242.019-.246.016-.247.015-.249.012-.251.01-.253.008-.255.005-.256.004-.258.001-.258-.001-.256-.004-.255-.005-.253-.008-.251-.01-.249-.012-.247-.015-.245-.016-.243-.019-.241-.02-.238-.023-.236-.024-.234-.027-.231-.028-.228-.031-.226-.032-.223-.034-.22-.036-.217-.038-.214-.04-.211-.041-.208-.043-.204-.045-.201-.046-.198-.048-.195-.05-.19-.051-.187-.053-.184-.054-.179-.056-.176-.057-.172-.059-.167-.06-.164-.061-.159-.063-.155-.064-.151-.066-.074-.033-.072-.033-.072-.034-.07-.034-.069-.035-.068-.035-.067-.035-.066-.035-.064-.036-.063-.036-.062-.036-.061-.036-.06-.037-.058-.037-.057-.037-.056-.038-.055-.038-.053-.038-.052-.038-.051-.039-.049-.039-.049-.039-.046-.039-.046-.04-.044-.04-.043-.04-.041-.04-.04-.041-.039-.041-.037-.041-.036-.041-.034-.041-.033-.042-.032-.042-.03-.042-.029-.042-.027-.042-.026-.043-.024-.043-.023-.043-.021-.043-.02-.043-.018-.044-.017-.043-.015-.044-.013-.044-.012-.044-.011-.045-.009-.044-.007-.045-.006-.045-.004-.045-.002-.045-.001-.045v-17l.001-.045.002-.045.004-.045.006-.045.007-.045.009-.044.011-.045.012-.044.013-.044.015-.044.017-.043.018-.044.02-.043.021-.043.023-.043.024-.043.026-.043.027-.042.029-.042.03-.042.032-.042.033-.042.034-.041.036-.041.037-.041.039-.041.04-.041.041-.04.043-.04.044-.04.046-.04.046-.039.049-.039.049-.039.051-.039.052-.038.053-.038.055-.038.056-.038.057-.037.058-.037.06-.037.061-.036.062-.036.063-.036.064-.036.066-.035.067-.035.068-.035.069-.035.07-.034.072-.034.072-.033.074-.033.151-.066.155-.064.159-.063.164-.061.167-.06.172-.059.176-.057.179-.056.184-.054.187-.053.19-.051.195-.05.198-.048.201-.046.204-.045.208-.043.211-.041.214-.04.217-.038.22-.036.223-.034.226-.032.228-.031.231-.028.234-.027.236-.024.238-.023.241-.02.243-.019.245-.016.247-.015.249-.012.251-.01.253-.008.255-.005.256-.004.258-.001.258.001zm-9.258 20.499v.01l.001.021.003.021.004.022.005.021.006.022.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.023.018.024.019.024.021.024.022.025.023.024.024.025.052.049.056.05.061.051.066.051.07.051.075.051.079.052.084.052.088.052.092.052.097.052.102.051.105.052.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.048.144.049.147.047.152.047.155.047.16.045.163.045.167.043.171.043.176.041.178.041.183.039.187.039.19.037.194.035.197.035.202.033.204.031.209.03.212.029.216.027.219.025.222.024.226.021.23.02.233.018.236.016.24.015.243.012.246.01.249.008.253.005.256.004.259.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.021.224-.024.22-.026.216-.027.212-.028.21-.031.205-.031.202-.034.198-.034.194-.036.191-.037.187-.039.183-.04.179-.04.175-.042.172-.043.168-.044.163-.045.16-.046.155-.046.152-.047.148-.048.143-.049.139-.049.136-.05.131-.05.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.053.083-.051.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.05.023-.024.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.023.01-.022.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.127l-.077.055-.08.053-.083.054-.085.053-.087.052-.09.052-.093.051-.095.05-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.045-.118.044-.12.043-.122.042-.124.042-.126.041-.128.04-.13.04-.132.038-.134.038-.135.037-.138.037-.139.035-.142.035-.143.034-.144.033-.147.032-.148.031-.15.03-.151.03-.153.029-.154.027-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.01-.179.008-.179.008-.181.006-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.006-.179-.008-.179-.008-.178-.01-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.027-.153-.029-.151-.03-.15-.03-.148-.031-.146-.032-.145-.033-.143-.034-.141-.035-.14-.035-.137-.037-.136-.037-.134-.038-.132-.038-.13-.04-.128-.04-.126-.041-.124-.042-.122-.042-.12-.044-.117-.043-.116-.045-.113-.045-.112-.046-.109-.047-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.05-.093-.052-.09-.051-.087-.052-.085-.053-.083-.054-.08-.054-.077-.054v4.127zm0-5.654v.011l.001.021.003.021.004.021.005.022.006.022.007.022.009.022.01.022.011.023.012.023.013.023.015.024.016.023.017.024.018.024.019.024.021.024.022.024.023.025.024.024.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.052.11.051.114.051.119.052.123.05.127.051.131.05.135.049.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.044.171.042.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.022.23.02.233.018.236.016.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.012.241-.015.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.048.139-.05.136-.049.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.051.051-.049.023-.025.023-.024.021-.025.02-.024.019-.024.018-.024.017-.024.015-.023.014-.023.013-.024.012-.022.01-.023.01-.023.008-.022.006-.022.006-.022.004-.021.004-.022.001-.021.001-.021v-4.139l-.077.054-.08.054-.083.054-.085.052-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.044-.118.044-.12.044-.122.042-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.035-.143.033-.144.033-.147.033-.148.031-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.009-.179.009-.179.007-.181.007-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.007-.179-.007-.179-.009-.178-.009-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.031-.146-.033-.145-.033-.143-.033-.141-.035-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.04-.126-.041-.124-.042-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.051-.093-.051-.09-.051-.087-.053-.085-.052-.083-.054-.08-.054-.077-.054v4.139zm0-5.666v.011l.001.02.003.022.004.021.005.022.006.021.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.024.018.023.019.024.021.025.022.024.023.024.024.025.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.051.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.043.171.043.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.021.23.02.233.018.236.017.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.013.241-.014.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.049.139-.049.136-.049.131-.051.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.049.023-.025.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.022.01-.023.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.153l-.077.054-.08.054-.083.053-.085.053-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.048-.105.048-.106.048-.109.046-.111.046-.114.046-.115.044-.118.044-.12.043-.122.043-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.034-.143.034-.144.033-.147.032-.148.032-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.024-.161.024-.162.023-.163.023-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.01-.178.01-.179.009-.179.007-.181.006-.182.006-.182.004-.184.003-.184.001-.185.001-.185-.001-.184-.001-.184-.003-.182-.004-.182-.006-.181-.006-.179-.007-.179-.009-.178-.01-.176-.01-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.023-.162-.023-.161-.024-.159-.024-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.032-.146-.032-.145-.033-.143-.034-.141-.034-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.041-.126-.041-.124-.041-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.048-.105-.048-.102-.048-.1-.05-.097-.049-.095-.051-.093-.051-.09-.052-.087-.052-.085-.053-.083-.053-.08-.054-.077-.054v4.153zm8.74-8.179l-.257.004-.254.005-.25.008-.247.011-.244.012-.241.014-.237.016-.233.018-.231.021-.226.022-.224.023-.22.026-.216.027-.212.028-.21.031-.205.032-.202.033-.198.034-.194.036-.191.038-.187.038-.183.04-.179.041-.175.042-.172.043-.168.043-.163.045-.16.046-.155.046-.152.048-.148.048-.143.048-.139.049-.136.05-.131.05-.126.051-.123.051-.118.051-.114.052-.11.052-.106.052-.101.052-.096.052-.092.052-.088.052-.083.052-.079.052-.074.051-.07.052-.065.051-.06.05-.056.05-.051.05-.023.025-.023.024-.021.024-.02.025-.019.024-.018.024-.017.023-.015.024-.014.023-.013.023-.012.023-.01.023-.01.022-.008.022-.006.023-.006.021-.004.022-.004.021-.001.021-.001.021.001.021.001.021.004.021.004.022.006.021.006.023.008.022.01.022.01.023.012.023.013.023.014.023.015.024.017.023.018.024.019.024.02.025.021.024.023.024.023.025.051.05.056.05.06.05.065.051.07.052.074.051.079.052.083.052.088.052.092.052.096.052.101.052.106.052.11.052.114.052.118.051.123.051.126.051.131.05.136.05.139.049.143.048.148.048.152.048.155.046.16.046.163.045.168.043.172.043.175.042.179.041.183.04.187.038.191.038.194.036.198.034.202.033.205.032.21.031.212.028.216.027.22.026.224.023.226.022.231.021.233.018.237.016.241.014.244.012.247.011.25.008.254.005.257.004.26.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.022.224-.023.22-.026.216-.027.212-.028.21-.031.205-.032.202-.033.198-.034.194-.036.191-.038.187-.038.183-.04.179-.041.175-.042.172-.043.168-.043.163-.045.16-.046.155-.046.152-.048.148-.048.143-.048.139-.049.136-.05.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.05.051-.05.023-.025.023-.024.021-.024.02-.025.019-.024.018-.024.017-.023.015-.024.014-.023.013-.023.012-.023.01-.023.01-.022.008-.022.006-.023.006-.021.004-.022.004-.021.001-.021.001-.021-.001-.021-.001-.021-.004-.021-.004-.022-.006-.021-.006-.023-.008-.022-.01-.022-.01-.023-.012-.023-.013-.023-.014-.023-.015-.024-.017-.023-.018-.024-.019-.024-.02-.025-.021-.024-.023-.024-.023-.025-.051-.05-.056-.05-.06-.05-.065-.051-.07-.052-.074-.051-.079-.052-.083-.052-.088-.052-.092-.052-.096-.052-.101-.052-.106-.052-.11-.052-.114-.052-.118-.051-.123-.051-.126-.051-.131-.05-.136-.05-.139-.049-.143-.048-.148-.048-.152-.048-.155-.046-.16-.046-.163-.045-.168-.043-.172-.043-.175-.042-.179-.041-.183-.04-.187-.038-.191-.038-.194-.036-.198-.034-.202-.033-.205-.032-.21-.031-.212-.028-.216-.027-.22-.026-.224-.023-.226-.022-.231-.021-.233-.018-.237-.016-.241-.014-.244-.012-.247-.011-.25-.008-.254-.005-.257-.004-.26-.001-.26.001z" transform="scale(.5)"/></symbol></defs><defs><symbol height="24" width="24" id="clock"><path d="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm0-2c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm5.848 12.459c.202.038.202.333.001.372-1.907.361-6.045 1.111-6.547 1.111-.719 0-1.301-.582-1.301-1.301 0-.512.77-5.447 1.125-7.445.034-.192.312-.181.343.014l.985 6.238 5.394 1.011z" transform="scale(.5)"/></symbol></defs><g><line stroke="#999" stroke-width="0.5px" class="200" y2="622" x2="75" y1="5" x1="75" id="actor0"/><g id="root-0"><rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="0" x="0"/><text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="32.5" x="75"><tspan dy="0" x="75">Client</tspan></text></g></g><g><line stroke="#999" stroke-width="0.5px" class="200" y2="622" x2="736" y1="5" x1="736" id="actor1"/><g id="root-1"><rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="0" x="661"/><text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="32.5" x="736"><tspan dy="0" x="736">Metadata Server</tspan></text></g></g><g><line stroke="#999" stroke-width="0.5px" class="200" y2="622" x2="950.5" y1="5" x1="950.5" id="actor2"/><g id="root-2"><rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="0" x="875.5"/><text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="32.5" x="950.5"><tspan dy="0" x="950.5">Data Server</tspan></text></g></g><defs><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="9" id="arrowhead"><path d="M 0 0 L 10 5 L 0 10 z"/></marker></defs><defs><marker refY="5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead"><path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/></marker></defs><defs><marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="18" id="filled-head"><path d="M 18,7 L9,13 L14,7 L9,1 Z"/></marker></defs><defs><marker orient="auto" markerHeight="40" markerWidth="60" refY="15" refX="15" id="sequencenumber"><circle r="6" cy="15" cx="15"/></marker></defs><g><rect class="note" ry="0" rx="0" height="37" width="925.5" stroke="#666" fill="#EDF2AE" y="351" x="50"/><text style="font-size: 16px; font-weight: 400;" dy="1em" class="noteText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="356" x="513"><tspan x="513">This may be parallelized</tspan></text></g><g><rect class="note" ry="0" rx="0" height="37" width="925.5" stroke="#666" fill="#EDF2AE" y="398" x="50"/><text style="font-size: 16px; font-weight: 400;" dy="1em" class="noteText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="403" x="513"><tspan x="513">Some endpoints may be processed while polling</tspan></text></g><g><line class="loopLine" y2="445" x2="960.5" y1="445" x1="65"/><line class="loopLine" y2="582" x2="960.5" y1="445" x1="960.5"/><line class="loopLine" y2="582" x2="960.5" y1="582" x1="65"/><line class="loopLine" y2="582" x2="65" y1="445" x1="65"/><polygon class="labelBox" points="65,445 115,445 115,458 106.6,465 65,465"/><text style="font-size: 16px; font-weight: 400;" class="labelText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="458" x="90">loop</text><text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="463" x="537.75"><tspan x="537.75">[for each endpoint in FlightInfo.endpoints]</tspan></text></g><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="406">PollFlightInfo(FlightDescriptor)</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="736" y1="111" x1="75"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="115" x="75">1</text><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="406">PollInfo{descriptor: FlightDescriptor', ...}</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="75" y1="157" x1="736"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="161" x="736">2</text><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="172" x="406">PollFlightInfo(FlightDescriptor')</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="203" x2="736" y1="203" x1="75"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="207" x="75">3</text><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="218" x="406">PollInfo{descriptor: FlightDescriptor'', ...}</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="249" x2="75" y1="249" x1="736"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="253" x="736">4</text><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="264" x="406">PollFlightInfo(FlightDescriptor'')</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="295" x2="736" y1="295" x1="75"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="299" x="75">5</text><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="310" x="406">PollInfo{descriptor: null, info: FlightInfo{endpoints: [FlightEndpoint{ticket: Ticket}, …]}</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="341" x2="75" y1="341" x1="736"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="345" x="736">6</text><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="495" x="513">DoGet(Ticket)</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="526" x2="950.5" y1="526" x1="75"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="530" x="75">7</text><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="541" x="513">stream of FlightData</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="572" x2="75" y1="572" x1="950.5"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="576" x="950.5">8</text><g><rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="602" x="0"/><text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="634.5" x="75"><tspan dy="0" x="75">Client</tspan></text></g><g><rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="602" x="661"/><text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="634.5" x="736"><tspan dy="0" x="736">Metadata Server</tspan></text></g><g><rect class="actor" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="602" x="875.5"/><text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="634.5" x="950.5"><tspan dy="0" x="950.5">Data Server</tspan></text></g></svg>
\ No newline at end of file
diff --git a/docs/source/format/FlightSql.rst b/docs/source/format/FlightSql.rst
index 5573c0040761f..b4b85e77a2e5f 100644
--- a/docs/source/format/FlightSql.rst
+++ b/docs/source/format/FlightSql.rst
@@ -32,9 +32,6 @@ with any database that supports the necessary endpoints. Flight SQL
 clients wrap the underlying Flight client to provide methods for the
 new RPC methods described here.
 
-.. warning:: Flight SQL is **experimental** and changes to the
-             protocol may still be made.
-
 RPC Methods
 ===========
 
@@ -114,6 +111,12 @@ google.protobuf.Any message, then serialized and packed into the
 to the command name (i.e. for ``ActionClosePreparedStatementRequest``,
 the ``type`` should be ``ClosePreparedStatement``).
 
+Commands that execute updates such as ``CommandStatementUpdate`` and
+``CommandStatementIngest`` return a Flight SQL ``DoPutUpdateResult``
+after consuming the entire FlightData stream. This message is encoded
+in the ``app_metadata`` field of the Flight RPC ``PutResult`` returned.
+
+
 ``ActionClosePreparedStatementRequest``
     Close a previously created prepared statement.
 
@@ -185,6 +188,13 @@ the ``type`` should be ``ClosePreparedStatement``).
     When used with DoPut: execute the query and return the number of
     affected rows.
 
+``CommandStatementIngest``
+    Execute a bulk ingestion.
+
+    When used with DoPut: load the stream of Arrow record batches into
+    the specified target table and return the number of rows ingested
+    via a ``DoPutUpdateResult`` message.
+
 Flight Server Session Management
 --------------------------------
 
@@ -229,17 +239,17 @@ Close and invalidate the current session context.
 Sequence Diagrams
 =================
 
-.. figure:: ./FlightSql/CommandGetTables.mmd.svg
-
-   Listing available tables.
-
-.. figure:: ./FlightSql/CommandStatementQuery.mmd.svg
+.. mermaid:: ./FlightSql/CommandGetTables.mmd
+  :caption: Listing available tables.
 
-   Executing an ad-hoc query.
+.. mermaid:: ./FlightSql/CommandStatementQuery.mmd
+  :caption: Executing an ad-hoc query.
 
-.. figure:: ./FlightSql/CommandPreparedStatementQuery.mmd.svg
+.. mermaid:: ./FlightSql/CommandPreparedStatementQuery.mmd
+  :caption: Creating a prepared statement, then executing it.
 
-   Creating a prepared statement, then executing it.
+.. mermaid:: ./FlightSql/CommandStatementIngest.mmd
+  :caption: Executing a bulk ingestion.
 
 External Resources
 ==================
diff --git a/docs/source/format/FlightSql/CommandGetTables.mmd b/docs/source/format/FlightSql/CommandGetTables.mmd
index f151411647f23..e6b18ed7dc08b 100644
--- a/docs/source/format/FlightSql/CommandGetTables.mmd
+++ b/docs/source/format/FlightSql/CommandGetTables.mmd
@@ -15,9 +15,6 @@
 %% specific language governing permissions and limitations
 %% under the License.
 
-%% To generate the diagram, use mermaid-cli
-%% Example: docker run --rm -v $(pwd)/FlightSql:/data minlag/mermaid-cli -i /data/CommandGetTables.mmd
-
 sequenceDiagram
 autonumber
 
diff --git a/docs/source/format/FlightSql/CommandGetTables.mmd.svg b/docs/source/format/FlightSql/CommandGetTables.mmd.svg
deleted file mode 100644
index 4e71c01982289..0000000000000
--- a/docs/source/format/FlightSql/CommandGetTables.mmd.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mermaid-1647978321168" width="100%" xmlns="http://www.w3.org/2000/svg" height="347" style="max-width: 568px; background-color: white;" viewBox="-50 -10 568 347"><style>#mermaid-1647978321168 {font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#mermaid-1647978321168 .error-icon{fill:#552222;}#mermaid-1647978321168 .error-text{fill:#552222;stroke:#552222;}#mermaid-1647978321168 .edge-thickness-normal{stroke-width:2px;}#mermaid-1647978321168 .edge-thickness-thick{stroke-width:3.5px;}#mermaid-1647978321168 .edge-pattern-solid{stroke-dasharray:0;}#mermaid-1647978321168 .edge-pattern-dashed{stroke-dasharray:3;}#mermaid-1647978321168 .edge-pattern-dotted{stroke-dasharray:2;}#mermaid-1647978321168 .marker{fill:#333333;stroke:#333333;}#mermaid-1647978321168 .marker.cross{stroke:#333333;}#mermaid-1647978321168 svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#mermaid-1647978321168 .actor{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1647978321168 text.actor&gt;tspan{fill:black;stroke:none;}#mermaid-1647978321168 .actor-line{stroke:grey;}#mermaid-1647978321168 .messageLine0{stroke-width:1.5;stroke-dasharray:none;stroke:#333;}#mermaid-1647978321168 .messageLine1{stroke-width:1.5;stroke-dasharray:2,2;stroke:#333;}#mermaid-1647978321168 #arrowhead path{fill:#333;stroke:#333;}#mermaid-1647978321168 .sequenceNumber{fill:white;}#mermaid-1647978321168 #sequencenumber{fill:#333;}#mermaid-1647978321168 #crosshead path{fill:#333;stroke:#333;}#mermaid-1647978321168 .messageText{fill:#333;stroke:#333;}#mermaid-1647978321168 .labelBox{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1647978321168 .labelText,#mermaid-1647978321168 .labelText&gt;tspan{fill:black;stroke:none;}#mermaid-1647978321168 .loopText,#mermaid-1647978321168 .loopText&gt;tspan{fill:black;stroke:none;}#mermaid-1647978321168 .loopLine{stroke-width:2px;stroke-dasharray:2,2;stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);}#mermaid-1647978321168 .note{stroke:#aaaa33;fill:#fff5ad;}#mermaid-1647978321168 .noteText,#mermaid-1647978321168 .noteText&gt;tspan{fill:black;stroke:none;}#mermaid-1647978321168 .activation0{fill:#f4f4f4;stroke:#666;}#mermaid-1647978321168 .activation1{fill:#f4f4f4;stroke:#666;}#mermaid-1647978321168 .activation2{fill:#f4f4f4;stroke:#666;}#mermaid-1647978321168 .actorPopupMenu{position:absolute;}#mermaid-1647978321168 .actorPopupMenuPanel{position:absolute;fill:#ECECFF;box-shadow:0px 8px 16px 0px rgba(0,0,0,0.2);filter:drop-shadow(3px 5px 2px rgb(0 0 0 / 0.4));}#mermaid-1647978321168 .actor-man line{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1647978321168 .actor-man circle,#mermaid-1647978321168 line{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;stroke-width:2px;}#mermaid-1647978321168 :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g></g><defs><symbol id="computer" width="24" height="24"><path transform="scale(.5)" d="M2 2v13h20v-13h-20zm18 11h-16v-9h16v9zm-10.228 6l.466-1h3.524l.467 1h-4.457zm14.228 3h-24l2-6h2.104l-1.33 4h18.45l-1.297-4h2.073l2 6zm-5-10h-14v-7h14v7z"></path></symbol></defs><defs><symbol id="database" fill-rule="evenodd" clip-rule="evenodd"><path transform="scale(.5)" d="M12.258.001l.256.004.255.005.253.008.251.01.249.012.247.015.246.016.242.019.241.02.239.023.236.024.233.027.231.028.229.031.225.032.223.034.22.036.217.038.214.04.211.041.208.043.205.045.201.046.198.048.194.05.191.051.187.053.183.054.18.056.175.057.172.059.168.06.163.061.16.063.155.064.15.066.074.033.073.033.071.034.07.034.069.035.068.035.067.035.066.035.064.036.064.036.062.036.06.036.06.037.058.037.058.037.055.038.055.038.053.038.052.038.051.039.05.039.048.039.047.039.045.04.044.04.043.04.041.04.04.041.039.041.037.041.036.041.034.041.033.042.032.042.03.042.029.042.027.042.026.043.024.043.023.043.021.043.02.043.018.044.017.043.015.044.013.044.012.044.011.045.009.044.007.045.006.045.004.045.002.045.001.045v17l-.001.045-.002.045-.004.045-.006.045-.007.045-.009.044-.011.045-.012.044-.013.044-.015.044-.017.043-.018.044-.02.043-.021.043-.023.043-.024.043-.026.043-.027.042-.029.042-.03.042-.032.042-.033.042-.034.041-.036.041-.037.041-.039.041-.04.041-.041.04-.043.04-.044.04-.045.04-.047.039-.048.039-.05.039-.051.039-.052.038-.053.038-.055.038-.055.038-.058.037-.058.037-.06.037-.06.036-.062.036-.064.036-.064.036-.066.035-.067.035-.068.035-.069.035-.07.034-.071.034-.073.033-.074.033-.15.066-.155.064-.16.063-.163.061-.168.06-.172.059-.175.057-.18.056-.183.054-.187.053-.191.051-.194.05-.198.048-.201.046-.205.045-.208.043-.211.041-.214.04-.217.038-.22.036-.223.034-.225.032-.229.031-.231.028-.233.027-.236.024-.239.023-.241.02-.242.019-.246.016-.247.015-.249.012-.251.01-.253.008-.255.005-.256.004-.258.001-.258-.001-.256-.004-.255-.005-.253-.008-.251-.01-.249-.012-.247-.015-.245-.016-.243-.019-.241-.02-.238-.023-.236-.024-.234-.027-.231-.028-.228-.031-.226-.032-.223-.034-.22-.036-.217-.038-.214-.04-.211-.041-.208-.043-.204-.045-.201-.046-.198-.048-.195-.05-.19-.051-.187-.053-.184-.054-.179-.056-.176-.057-.172-.059-.167-.06-.164-.061-.159-.063-.155-.064-.151-.066-.074-.033-.072-.033-.072-.034-.07-.034-.069-.035-.068-.035-.067-.035-.066-.035-.064-.036-.063-.036-.062-.036-.061-.036-.06-.037-.058-.037-.057-.037-.056-.038-.055-.038-.053-.038-.052-.038-.051-.039-.049-.039-.049-.039-.046-.039-.046-.04-.044-.04-.043-.04-.041-.04-.04-.041-.039-.041-.037-.041-.036-.041-.034-.041-.033-.042-.032-.042-.03-.042-.029-.042-.027-.042-.026-.043-.024-.043-.023-.043-.021-.043-.02-.043-.018-.044-.017-.043-.015-.044-.013-.044-.012-.044-.011-.045-.009-.044-.007-.045-.006-.045-.004-.045-.002-.045-.001-.045v-17l.001-.045.002-.045.004-.045.006-.045.007-.045.009-.044.011-.045.012-.044.013-.044.015-.044.017-.043.018-.044.02-.043.021-.043.023-.043.024-.043.026-.043.027-.042.029-.042.03-.042.032-.042.033-.042.034-.041.036-.041.037-.041.039-.041.04-.041.041-.04.043-.04.044-.04.046-.04.046-.039.049-.039.049-.039.051-.039.052-.038.053-.038.055-.038.056-.038.057-.037.058-.037.06-.037.061-.036.062-.036.063-.036.064-.036.066-.035.067-.035.068-.035.069-.035.07-.034.072-.034.072-.033.074-.033.151-.066.155-.064.159-.063.164-.061.167-.06.172-.059.176-.057.179-.056.184-.054.187-.053.19-.051.195-.05.198-.048.201-.046.204-.045.208-.043.211-.041.214-.04.217-.038.22-.036.223-.034.226-.032.228-.031.231-.028.234-.027.236-.024.238-.023.241-.02.243-.019.245-.016.247-.015.249-.012.251-.01.253-.008.255-.005.256-.004.258-.001.258.001zm-9.258 20.499v.01l.001.021.003.021.004.022.005.021.006.022.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.023.018.024.019.024.021.024.022.025.023.024.024.025.052.049.056.05.061.051.066.051.07.051.075.051.079.052.084.052.088.052.092.052.097.052.102.051.105.052.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.048.144.049.147.047.152.047.155.047.16.045.163.045.167.043.171.043.176.041.178.041.183.039.187.039.19.037.194.035.197.035.202.033.204.031.209.03.212.029.216.027.219.025.222.024.226.021.23.02.233.018.236.016.24.015.243.012.246.01.249.008.253.005.256.004.259.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.021.224-.024.22-.026.216-.027.212-.028.21-.031.205-.031.202-.034.198-.034.194-.036.191-.037.187-.039.183-.04.179-.04.175-.042.172-.043.168-.044.163-.045.16-.046.155-.046.152-.047.148-.048.143-.049.139-.049.136-.05.131-.05.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.053.083-.051.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.05.023-.024.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.023.01-.022.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.127l-.077.055-.08.053-.083.054-.085.053-.087.052-.09.052-.093.051-.095.05-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.045-.118.044-.12.043-.122.042-.124.042-.126.041-.128.04-.13.04-.132.038-.134.038-.135.037-.138.037-.139.035-.142.035-.143.034-.144.033-.147.032-.148.031-.15.03-.151.03-.153.029-.154.027-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.01-.179.008-.179.008-.181.006-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.006-.179-.008-.179-.008-.178-.01-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.027-.153-.029-.151-.03-.15-.03-.148-.031-.146-.032-.145-.033-.143-.034-.141-.035-.14-.035-.137-.037-.136-.037-.134-.038-.132-.038-.13-.04-.128-.04-.126-.041-.124-.042-.122-.042-.12-.044-.117-.043-.116-.045-.113-.045-.112-.046-.109-.047-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.05-.093-.052-.09-.051-.087-.052-.085-.053-.083-.054-.08-.054-.077-.054v4.127zm0-5.654v.011l.001.021.003.021.004.021.005.022.006.022.007.022.009.022.01.022.011.023.012.023.013.023.015.024.016.023.017.024.018.024.019.024.021.024.022.024.023.025.024.024.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.052.11.051.114.051.119.052.123.05.127.051.131.05.135.049.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.044.171.042.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.022.23.02.233.018.236.016.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.012.241-.015.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.048.139-.05.136-.049.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.051.051-.049.023-.025.023-.024.021-.025.02-.024.019-.024.018-.024.017-.024.015-.023.014-.023.013-.024.012-.022.01-.023.01-.023.008-.022.006-.022.006-.022.004-.021.004-.022.001-.021.001-.021v-4.139l-.077.054-.08.054-.083.054-.085.052-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.044-.118.044-.12.044-.122.042-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.035-.143.033-.144.033-.147.033-.148.031-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.009-.179.009-.179.007-.181.007-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.007-.179-.007-.179-.009-.178-.009-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.031-.146-.033-.145-.033-.143-.033-.141-.035-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.04-.126-.041-.124-.042-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.051-.093-.051-.09-.051-.087-.053-.085-.052-.083-.054-.08-.054-.077-.054v4.139zm0-5.666v.011l.001.02.003.022.004.021.005.022.006.021.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.024.018.023.019.024.021.025.022.024.023.024.024.025.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.051.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.043.171.043.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.021.23.02.233.018.236.017.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.013.241-.014.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.049.139-.049.136-.049.131-.051.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.049.023-.025.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.022.01-.023.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.153l-.077.054-.08.054-.083.053-.085.053-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.048-.105.048-.106.048-.109.046-.111.046-.114.046-.115.044-.118.044-.12.043-.122.043-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.034-.143.034-.144.033-.147.032-.148.032-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.024-.161.024-.162.023-.163.023-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.01-.178.01-.179.009-.179.007-.181.006-.182.006-.182.004-.184.003-.184.001-.185.001-.185-.001-.184-.001-.184-.003-.182-.004-.182-.006-.181-.006-.179-.007-.179-.009-.178-.01-.176-.01-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.023-.162-.023-.161-.024-.159-.024-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.032-.146-.032-.145-.033-.143-.034-.141-.034-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.041-.126-.041-.124-.041-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.048-.105-.048-.102-.048-.1-.05-.097-.049-.095-.051-.093-.051-.09-.052-.087-.052-.085-.053-.083-.053-.08-.054-.077-.054v4.153zm8.74-8.179l-.257.004-.254.005-.25.008-.247.011-.244.012-.241.014-.237.016-.233.018-.231.021-.226.022-.224.023-.22.026-.216.027-.212.028-.21.031-.205.032-.202.033-.198.034-.194.036-.191.038-.187.038-.183.04-.179.041-.175.042-.172.043-.168.043-.163.045-.16.046-.155.046-.152.048-.148.048-.143.048-.139.049-.136.05-.131.05-.126.051-.123.051-.118.051-.114.052-.11.052-.106.052-.101.052-.096.052-.092.052-.088.052-.083.052-.079.052-.074.051-.07.052-.065.051-.06.05-.056.05-.051.05-.023.025-.023.024-.021.024-.02.025-.019.024-.018.024-.017.023-.015.024-.014.023-.013.023-.012.023-.01.023-.01.022-.008.022-.006.023-.006.021-.004.022-.004.021-.001.021-.001.021.001.021.001.021.004.021.004.022.006.021.006.023.008.022.01.022.01.023.012.023.013.023.014.023.015.024.017.023.018.024.019.024.02.025.021.024.023.024.023.025.051.05.056.05.06.05.065.051.07.052.074.051.079.052.083.052.088.052.092.052.096.052.101.052.106.052.11.052.114.052.118.051.123.051.126.051.131.05.136.05.139.049.143.048.148.048.152.048.155.046.16.046.163.045.168.043.172.043.175.042.179.041.183.04.187.038.191.038.194.036.198.034.202.033.205.032.21.031.212.028.216.027.22.026.224.023.226.022.231.021.233.018.237.016.241.014.244.012.247.011.25.008.254.005.257.004.26.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.022.224-.023.22-.026.216-.027.212-.028.21-.031.205-.032.202-.033.198-.034.194-.036.191-.038.187-.038.183-.04.179-.041.175-.042.172-.043.168-.043.163-.045.16-.046.155-.046.152-.048.148-.048.143-.048.139-.049.136-.05.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.05.051-.05.023-.025.023-.024.021-.024.02-.025.019-.024.018-.024.017-.023.015-.024.014-.023.013-.023.012-.023.01-.023.01-.022.008-.022.006-.023.006-.021.004-.022.004-.021.001-.021.001-.021-.001-.021-.001-.021-.004-.021-.004-.022-.006-.021-.006-.023-.008-.022-.01-.022-.01-.023-.012-.023-.013-.023-.014-.023-.015-.024-.017-.023-.018-.024-.019-.024-.02-.025-.021-.024-.023-.024-.023-.025-.051-.05-.056-.05-.06-.05-.065-.051-.07-.052-.074-.051-.079-.052-.083-.052-.088-.052-.092-.052-.096-.052-.101-.052-.106-.052-.11-.052-.114-.052-.118-.051-.123-.051-.126-.051-.131-.05-.136-.05-.139-.049-.143-.048-.148-.048-.152-.048-.155-.046-.16-.046-.163-.045-.168-.043-.172-.043-.175-.042-.179-.041-.183-.04-.187-.038-.191-.038-.194-.036-.198-.034-.202-.033-.205-.032-.21-.031-.212-.028-.216-.027-.22-.026-.224-.023-.226-.022-.231-.021-.233-.018-.237-.016-.241-.014-.244-.012-.247-.011-.25-.008-.254-.005-.257-.004-.26-.001-.26.001z"></path></symbol></defs><defs><symbol id="clock" width="24" height="24"><path transform="scale(.5)" d="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm0-2c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm5.848 12.459c.202.038.202.333.001.372-1.907.361-6.045 1.111-6.547 1.111-.719 0-1.301-.582-1.301-1.301 0-.512.77-5.447 1.125-7.445.034-.192.312-.181.343.014l.985 6.238 5.394 1.011z"></path></symbol></defs><g><line id="actor0" x1="75" y1="5" x2="75" y2="281" class="200" stroke-width="0.5px" stroke="#999"></line><g id="root-0"><rect x="0" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="75" dy="0">Client</tspan></text></g></g><g><line id="actor1" x1="393" y1="5" x2="393" y2="281" class="200" stroke-width="0.5px" stroke="#999"></line><g id="root-1"><rect x="318" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="393" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="393" dy="0">Server</tspan></text></g></g><defs><marker id="arrowhead" refX="9" refY="5" markerUnits="userSpaceOnUse" markerWidth="12" markerHeight="12" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z"></path></marker></defs><defs><marker id="crosshead" markerWidth="15" markerHeight="8" orient="auto" refX="16" refY="4"><path fill="black" stroke="#000000" stroke-width="1px" d="M 9,2 V 6 L16,4 Z" style="stroke-dasharray: 0, 0;"></path><path fill="none" stroke="#000000" stroke-width="1px" d="M 0,1 L 6,7 M 6,1 L 0,7" style="stroke-dasharray: 0, 0;"></path></marker></defs><defs><marker id="filled-head" refX="18" refY="7" markerWidth="20" markerHeight="28" orient="auto"><path d="M 18,7 L9,13 L14,7 L9,1 Z"></path></marker></defs><defs><marker id="sequencenumber" refX="15" refY="15" markerWidth="60" markerHeight="40" orient="auto"><circle cx="15" cy="15" r="6"></circle></marker></defs><text x="234" y="80" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">GetFlightInfo(CommandGetTables)</text><line x1="75" y1="109" x2="393" y2="109" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="75" y="113" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">1</text><text x="234" y="124" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">FlightInfo{…Ticket…}</text><line x1="393" y1="153" x2="75" y2="153" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="393" y="157" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">2</text><text x="234" y="168" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">DoGet(Ticket)</text><line x1="75" y1="197" x2="393" y2="197" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="75" y="201" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">3</text><text x="234" y="212" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">stream of FlightData</text><line x1="393" y1="241" x2="75" y2="241" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="393" y="245" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">4</text><g><rect x="0" y="261" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="293.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="75" dy="0">Client</tspan></text></g><g><rect x="318" y="261" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="393" y="293.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="393" dy="0">Server</tspan></text></g></svg>
\ No newline at end of file
diff --git a/docs/source/format/FlightSql/CommandPreparedStatementQuery.mmd b/docs/source/format/FlightSql/CommandPreparedStatementQuery.mmd
index cbd1eb6014bca..ce18b91eaa33e 100644
--- a/docs/source/format/FlightSql/CommandPreparedStatementQuery.mmd
+++ b/docs/source/format/FlightSql/CommandPreparedStatementQuery.mmd
@@ -15,9 +15,6 @@
 %% specific language governing permissions and limitations
 %% under the License.
 
-%% To generate the diagram, use mermaid-cli
-%% Example: docker run --rm -v $(pwd)/FlightSql:/data minlag/mermaid-cli -i /data/CommandPreparedStatementQuery.mmd
-
 sequenceDiagram
 autonumber
 
diff --git a/docs/source/format/FlightSql/CommandPreparedStatementQuery.mmd.svg b/docs/source/format/FlightSql/CommandPreparedStatementQuery.mmd.svg
deleted file mode 100644
index cbf6a78e9a5ce..0000000000000
--- a/docs/source/format/FlightSql/CommandPreparedStatementQuery.mmd.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg aria-roledescription="sequence" role="graphics-document document" viewBox="-50 -10 651 836" style="max-width: 651px; background-color: white;" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" width="100%" id="my-svg"><g><rect class="actor actor-bottom" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="750" x="401"/><text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="782.5" x="476"><tspan dy="0" x="476">Server</tspan></text></g><g><rect class="actor actor-bottom" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="750" x="0"/><text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="782.5" x="75"><tspan dy="0" x="75">Client</tspan></text></g><g><line stroke="#999" stroke-width="0.5px" class="200" y2="750" x2="476" y1="5" x1="476" id="actor1"/><g id="root-1"><rect class="actor actor-top" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="0" x="401"/><text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="32.5" x="476"><tspan dy="0" x="476">Server</tspan></text></g></g><g><line stroke="#999" stroke-width="0.5px" class="200" y2="750" x2="75" y1="5" x1="75" id="actor0"/><g id="root-0"><rect class="actor actor-top" ry="3" rx="3" height="65" width="150" stroke="#666" fill="#eaeaea" y="0" x="0"/><text style="text-anchor: middle; font-size: 16px; font-weight: 400;" class="actor" alignment-baseline="central" dominant-baseline="central" y="32.5" x="75"><tspan dy="0" x="75">Client</tspan></text></g></g><style>#my-svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#my-svg .error-icon{fill:#552222;}#my-svg .error-text{fill:#552222;stroke:#552222;}#my-svg .edge-thickness-normal{stroke-width:2px;}#my-svg .edge-thickness-thick{stroke-width:3.5px;}#my-svg .edge-pattern-solid{stroke-dasharray:0;}#my-svg .edge-pattern-dashed{stroke-dasharray:3;}#my-svg .edge-pattern-dotted{stroke-dasharray:2;}#my-svg .marker{fill:#333333;stroke:#333333;}#my-svg .marker.cross{stroke:#333333;}#my-svg svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#my-svg .actor{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#my-svg text.actor&gt;tspan{fill:black;stroke:none;}#my-svg .actor-line{stroke:grey;}#my-svg .messageLine0{stroke-width:1.5;stroke-dasharray:none;stroke:#333;}#my-svg .messageLine1{stroke-width:1.5;stroke-dasharray:2,2;stroke:#333;}#my-svg #arrowhead path{fill:#333;stroke:#333;}#my-svg .sequenceNumber{fill:white;}#my-svg #sequencenumber{fill:#333;}#my-svg #crosshead path{fill:#333;stroke:#333;}#my-svg .messageText{fill:#333;stroke:none;}#my-svg .labelBox{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#my-svg .labelText,#my-svg .labelText&gt;tspan{fill:black;stroke:none;}#my-svg .loopText,#my-svg .loopText&gt;tspan{fill:black;stroke:none;}#my-svg .loopLine{stroke-width:2px;stroke-dasharray:2,2;stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);}#my-svg .note{stroke:#aaaa33;fill:#fff5ad;}#my-svg .noteText,#my-svg .noteText&gt;tspan{fill:black;stroke:none;}#my-svg .activation0{fill:#f4f4f4;stroke:#666;}#my-svg .activation1{fill:#f4f4f4;stroke:#666;}#my-svg .activation2{fill:#f4f4f4;stroke:#666;}#my-svg .actorPopupMenu{position:absolute;}#my-svg .actorPopupMenuPanel{position:absolute;fill:#ECECFF;box-shadow:0px 8px 16px 0px rgba(0,0,0,0.2);filter:drop-shadow(3px 5px 2px rgb(0 0 0 / 0.4));}#my-svg .actor-man line{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#my-svg .actor-man circle,#my-svg line{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;stroke-width:2px;}#my-svg :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g/><defs><symbol height="24" width="24" id="computer"><path d="M2 2v13h20v-13h-20zm18 11h-16v-9h16v9zm-10.228 6l.466-1h3.524l.467 1h-4.457zm14.228 3h-24l2-6h2.104l-1.33 4h18.45l-1.297-4h2.073l2 6zm-5-10h-14v-7h14v7z" transform="scale(.5)"/></symbol></defs><defs><symbol clip-rule="evenodd" fill-rule="evenodd" id="database"><path d="M12.258.001l.256.004.255.005.253.008.251.01.249.012.247.015.246.016.242.019.241.02.239.023.236.024.233.027.231.028.229.031.225.032.223.034.22.036.217.038.214.04.211.041.208.043.205.045.201.046.198.048.194.05.191.051.187.053.183.054.18.056.175.057.172.059.168.06.163.061.16.063.155.064.15.066.074.033.073.033.071.034.07.034.069.035.068.035.067.035.066.035.064.036.064.036.062.036.06.036.06.037.058.037.058.037.055.038.055.038.053.038.052.038.051.039.05.039.048.039.047.039.045.04.044.04.043.04.041.04.04.041.039.041.037.041.036.041.034.041.033.042.032.042.03.042.029.042.027.042.026.043.024.043.023.043.021.043.02.043.018.044.017.043.015.044.013.044.012.044.011.045.009.044.007.045.006.045.004.045.002.045.001.045v17l-.001.045-.002.045-.004.045-.006.045-.007.045-.009.044-.011.045-.012.044-.013.044-.015.044-.017.043-.018.044-.02.043-.021.043-.023.043-.024.043-.026.043-.027.042-.029.042-.03.042-.032.042-.033.042-.034.041-.036.041-.037.041-.039.041-.04.041-.041.04-.043.04-.044.04-.045.04-.047.039-.048.039-.05.039-.051.039-.052.038-.053.038-.055.038-.055.038-.058.037-.058.037-.06.037-.06.036-.062.036-.064.036-.064.036-.066.035-.067.035-.068.035-.069.035-.07.034-.071.034-.073.033-.074.033-.15.066-.155.064-.16.063-.163.061-.168.06-.172.059-.175.057-.18.056-.183.054-.187.053-.191.051-.194.05-.198.048-.201.046-.205.045-.208.043-.211.041-.214.04-.217.038-.22.036-.223.034-.225.032-.229.031-.231.028-.233.027-.236.024-.239.023-.241.02-.242.019-.246.016-.247.015-.249.012-.251.01-.253.008-.255.005-.256.004-.258.001-.258-.001-.256-.004-.255-.005-.253-.008-.251-.01-.249-.012-.247-.015-.245-.016-.243-.019-.241-.02-.238-.023-.236-.024-.234-.027-.231-.028-.228-.031-.226-.032-.223-.034-.22-.036-.217-.038-.214-.04-.211-.041-.208-.043-.204-.045-.201-.046-.198-.048-.195-.05-.19-.051-.187-.053-.184-.054-.179-.056-.176-.057-.172-.059-.167-.06-.164-.061-.159-.063-.155-.064-.151-.066-.074-.033-.072-.033-.072-.034-.07-.034-.069-.035-.068-.035-.067-.035-.066-.035-.064-.036-.063-.036-.062-.036-.061-.036-.06-.037-.058-.037-.057-.037-.056-.038-.055-.038-.053-.038-.052-.038-.051-.039-.049-.039-.049-.039-.046-.039-.046-.04-.044-.04-.043-.04-.041-.04-.04-.041-.039-.041-.037-.041-.036-.041-.034-.041-.033-.042-.032-.042-.03-.042-.029-.042-.027-.042-.026-.043-.024-.043-.023-.043-.021-.043-.02-.043-.018-.044-.017-.043-.015-.044-.013-.044-.012-.044-.011-.045-.009-.044-.007-.045-.006-.045-.004-.045-.002-.045-.001-.045v-17l.001-.045.002-.045.004-.045.006-.045.007-.045.009-.044.011-.045.012-.044.013-.044.015-.044.017-.043.018-.044.02-.043.021-.043.023-.043.024-.043.026-.043.027-.042.029-.042.03-.042.032-.042.033-.042.034-.041.036-.041.037-.041.039-.041.04-.041.041-.04.043-.04.044-.04.046-.04.046-.039.049-.039.049-.039.051-.039.052-.038.053-.038.055-.038.056-.038.057-.037.058-.037.06-.037.061-.036.062-.036.063-.036.064-.036.066-.035.067-.035.068-.035.069-.035.07-.034.072-.034.072-.033.074-.033.151-.066.155-.064.159-.063.164-.061.167-.06.172-.059.176-.057.179-.056.184-.054.187-.053.19-.051.195-.05.198-.048.201-.046.204-.045.208-.043.211-.041.214-.04.217-.038.22-.036.223-.034.226-.032.228-.031.231-.028.234-.027.236-.024.238-.023.241-.02.243-.019.245-.016.247-.015.249-.012.251-.01.253-.008.255-.005.256-.004.258-.001.258.001zm-9.258 20.499v.01l.001.021.003.021.004.022.005.021.006.022.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.023.018.024.019.024.021.024.022.025.023.024.024.025.052.049.056.05.061.051.066.051.07.051.075.051.079.052.084.052.088.052.092.052.097.052.102.051.105.052.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.048.144.049.147.047.152.047.155.047.16.045.163.045.167.043.171.043.176.041.178.041.183.039.187.039.19.037.194.035.197.035.202.033.204.031.209.03.212.029.216.027.219.025.222.024.226.021.23.02.233.018.236.016.24.015.243.012.246.01.249.008.253.005.256.004.259.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.021.224-.024.22-.026.216-.027.212-.028.21-.031.205-.031.202-.034.198-.034.194-.036.191-.037.187-.039.183-.04.179-.04.175-.042.172-.043.168-.044.163-.045.16-.046.155-.046.152-.047.148-.048.143-.049.139-.049.136-.05.131-.05.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.053.083-.051.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.05.023-.024.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.023.01-.022.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.127l-.077.055-.08.053-.083.054-.085.053-.087.052-.09.052-.093.051-.095.05-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.045-.118.044-.12.043-.122.042-.124.042-.126.041-.128.04-.13.04-.132.038-.134.038-.135.037-.138.037-.139.035-.142.035-.143.034-.144.033-.147.032-.148.031-.15.03-.151.03-.153.029-.154.027-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.01-.179.008-.179.008-.181.006-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.006-.179-.008-.179-.008-.178-.01-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.027-.153-.029-.151-.03-.15-.03-.148-.031-.146-.032-.145-.033-.143-.034-.141-.035-.14-.035-.137-.037-.136-.037-.134-.038-.132-.038-.13-.04-.128-.04-.126-.041-.124-.042-.122-.042-.12-.044-.117-.043-.116-.045-.113-.045-.112-.046-.109-.047-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.05-.093-.052-.09-.051-.087-.052-.085-.053-.083-.054-.08-.054-.077-.054v4.127zm0-5.654v.011l.001.021.003.021.004.021.005.022.006.022.007.022.009.022.01.022.011.023.012.023.013.023.015.024.016.023.017.024.018.024.019.024.021.024.022.024.023.025.024.024.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.052.11.051.114.051.119.052.123.05.127.051.131.05.135.049.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.044.171.042.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.022.23.02.233.018.236.016.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.012.241-.015.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.048.139-.05.136-.049.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.051.051-.049.023-.025.023-.024.021-.025.02-.024.019-.024.018-.024.017-.024.015-.023.014-.023.013-.024.012-.022.01-.023.01-.023.008-.022.006-.022.006-.022.004-.021.004-.022.001-.021.001-.021v-4.139l-.077.054-.08.054-.083.054-.085.052-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.044-.118.044-.12.044-.122.042-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.035-.143.033-.144.033-.147.033-.148.031-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.009-.179.009-.179.007-.181.007-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.007-.179-.007-.179-.009-.178-.009-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.031-.146-.033-.145-.033-.143-.033-.141-.035-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.04-.126-.041-.124-.042-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.051-.093-.051-.09-.051-.087-.053-.085-.052-.083-.054-.08-.054-.077-.054v4.139zm0-5.666v.011l.001.02.003.022.004.021.005.022.006.021.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.024.018.023.019.024.021.025.022.024.023.024.024.025.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.051.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.043.171.043.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.021.23.02.233.018.236.017.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.013.241-.014.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.049.139-.049.136-.049.131-.051.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.049.023-.025.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.022.01-.023.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.153l-.077.054-.08.054-.083.053-.085.053-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.048-.105.048-.106.048-.109.046-.111.046-.114.046-.115.044-.118.044-.12.043-.122.043-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.034-.143.034-.144.033-.147.032-.148.032-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.024-.161.024-.162.023-.163.023-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.01-.178.01-.179.009-.179.007-.181.006-.182.006-.182.004-.184.003-.184.001-.185.001-.185-.001-.184-.001-.184-.003-.182-.004-.182-.006-.181-.006-.179-.007-.179-.009-.178-.01-.176-.01-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.023-.162-.023-.161-.024-.159-.024-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.032-.146-.032-.145-.033-.143-.034-.141-.034-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.041-.126-.041-.124-.041-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.048-.105-.048-.102-.048-.1-.05-.097-.049-.095-.051-.093-.051-.09-.052-.087-.052-.085-.053-.083-.053-.08-.054-.077-.054v4.153zm8.74-8.179l-.257.004-.254.005-.25.008-.247.011-.244.012-.241.014-.237.016-.233.018-.231.021-.226.022-.224.023-.22.026-.216.027-.212.028-.21.031-.205.032-.202.033-.198.034-.194.036-.191.038-.187.038-.183.04-.179.041-.175.042-.172.043-.168.043-.163.045-.16.046-.155.046-.152.048-.148.048-.143.048-.139.049-.136.05-.131.05-.126.051-.123.051-.118.051-.114.052-.11.052-.106.052-.101.052-.096.052-.092.052-.088.052-.083.052-.079.052-.074.051-.07.052-.065.051-.06.05-.056.05-.051.05-.023.025-.023.024-.021.024-.02.025-.019.024-.018.024-.017.023-.015.024-.014.023-.013.023-.012.023-.01.023-.01.022-.008.022-.006.023-.006.021-.004.022-.004.021-.001.021-.001.021.001.021.001.021.004.021.004.022.006.021.006.023.008.022.01.022.01.023.012.023.013.023.014.023.015.024.017.023.018.024.019.024.02.025.021.024.023.024.023.025.051.05.056.05.06.05.065.051.07.052.074.051.079.052.083.052.088.052.092.052.096.052.101.052.106.052.11.052.114.052.118.051.123.051.126.051.131.05.136.05.139.049.143.048.148.048.152.048.155.046.16.046.163.045.168.043.172.043.175.042.179.041.183.04.187.038.191.038.194.036.198.034.202.033.205.032.21.031.212.028.216.027.22.026.224.023.226.022.231.021.233.018.237.016.241.014.244.012.247.011.25.008.254.005.257.004.26.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.022.224-.023.22-.026.216-.027.212-.028.21-.031.205-.032.202-.033.198-.034.194-.036.191-.038.187-.038.183-.04.179-.041.175-.042.172-.043.168-.043.163-.045.16-.046.155-.046.152-.048.148-.048.143-.048.139-.049.136-.05.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.05.051-.05.023-.025.023-.024.021-.024.02-.025.019-.024.018-.024.017-.023.015-.024.014-.023.013-.023.012-.023.01-.023.01-.022.008-.022.006-.023.006-.021.004-.022.004-.021.001-.021.001-.021-.001-.021-.001-.021-.004-.021-.004-.022-.006-.021-.006-.023-.008-.022-.01-.022-.01-.023-.012-.023-.013-.023-.014-.023-.015-.024-.017-.023-.018-.024-.019-.024-.02-.025-.021-.024-.023-.024-.023-.025-.051-.05-.056-.05-.06-.05-.065-.051-.07-.052-.074-.051-.079-.052-.083-.052-.088-.052-.092-.052-.096-.052-.101-.052-.106-.052-.11-.052-.114-.052-.118-.051-.123-.051-.126-.051-.131-.05-.136-.05-.139-.049-.143-.048-.148-.048-.152-.048-.155-.046-.16-.046-.163-.045-.168-.043-.172-.043-.175-.042-.179-.041-.183-.04-.187-.038-.191-.038-.194-.036-.198-.034-.202-.033-.205-.032-.21-.031-.212-.028-.216-.027-.22-.026-.224-.023-.226-.022-.231-.021-.233-.018-.237-.016-.241-.014-.244-.012-.247-.011-.25-.008-.254-.005-.257-.004-.26-.001-.26.001z" transform="scale(.5)"/></symbol></defs><defs><symbol height="24" width="24" id="clock"><path d="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm0-2c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm5.848 12.459c.202.038.202.333.001.372-1.907.361-6.045 1.111-6.547 1.111-.719 0-1.301-.582-1.301-1.301 0-.512.77-5.447 1.125-7.445.034-.192.312-.181.343.014l.985 6.238 5.394 1.011z" transform="scale(.5)"/></symbol></defs><defs><marker orient="auto" markerHeight="12" markerWidth="12" markerUnits="userSpaceOnUse" refY="5" refX="7.9" id="arrowhead"><path d="M 0 0 L 10 5 L 0 10 z"/></marker></defs><defs><marker refY="4.5" refX="4" orient="auto" markerHeight="8" markerWidth="15" id="crosshead"><path style="stroke-dasharray: 0, 0;" d="M 1,2 L 6,7 M 6,2 L 1,7" stroke-width="1pt" stroke="#000000" fill="none"/></marker></defs><defs><marker orient="auto" markerHeight="28" markerWidth="20" refY="7" refX="15.5" id="filled-head"><path d="M 18,7 L9,13 L14,7 L9,1 Z"/></marker></defs><defs><marker orient="auto" markerHeight="40" markerWidth="60" refY="15" refX="15" id="sequencenumber"><circle r="6" cy="15" cx="15"/></marker></defs><g><rect class="note" ry="0" rx="0" height="39" width="451" stroke="#666" fill="#EDF2AE" y="350" x="50"/><text style="font-size: 16px; font-weight: 400;" dy="1em" class="noteText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="355" x="276"><tspan x="276">optional response with updated handle</tspan></text></g><g><line class="loopLine" y2="491" x2="487" y1="491" x1="64"/><line class="loopLine" y2="628" x2="487" y1="491" x1="487"/><line class="loopLine" y2="628" x2="487" y1="628" x1="64"/><line class="loopLine" y2="628" x2="64" y1="491" x1="64"/><polygon class="labelBox" points="64,491 114,491 114,504 105.6,511 64,511"/><text style="font-size: 16px; font-weight: 400;" class="labelText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="504" x="89">loop</text><text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="509" x="300.5"><tspan x="300.5">[for each endpoint in FlightInfo.endpoints]</tspan></text></g><g><line class="loopLine" y2="167" x2="511" y1="167" x1="40"/><line class="loopLine" y2="638" x2="511" y1="167" x1="511"/><line class="loopLine" y2="638" x2="511" y1="638" x1="40"/><line class="loopLine" y2="638" x2="40" y1="167" x1="40"/><polygon class="labelBox" points="40,167 90,167 90,180 81.6,187 40,187"/><text style="font-size: 16px; font-weight: 400;" class="labelText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="180" x="65">loop</text><text style="font-size: 16px; font-weight: 400;" class="loopText" text-anchor="middle" y="185" x="300.5"><tspan x="300.5">[for each invocation of the prepared statement]</tspan></text></g><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="80" x="274">DoAction(ActionCreatePreparedStatementRequest)</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="111" x2="472" y1="111" x1="76"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="115" x="76">1</text><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="126" x="277">ActionCreatePreparedStatementResult{handle}</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="157" x2="79" y1="157" x1="475"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="161" x="475">2</text><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="217" x="274">DoPut(CommandPreparedStatementQuery)</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="248" x2="472" y1="248" x1="76"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="252" x="76">3</text><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="263" x="274">stream of FlightData</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="294" x2="472" y1="294" x1="76"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="298" x="76">4</text><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="309" x="277">DoPutPreparedStatementResult{handle}</text><line style="stroke-dasharray: 3, 3; fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine1" y2="340" x2="79" y1="340" x1="475"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="344" x="475">5</text><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="404" x="274">GetFlightInfo(CommandPreparedStatementQuery)</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="435" x2="472" y1="435" x1="76"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="439" x="76">6</text><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="450" x="277">FlightInfo{endpoints: [FlightEndpoint{…}, …]}</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="481" x2="79" y1="481" x1="475"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="485" x="475">7</text><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="541" x="274">DoGet(endpoint.ticket)</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="572" x2="472" y1="572" x1="76"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="576" x="76">8</text><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="587" x="277">stream of FlightData</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="618" x2="79" y1="618" x1="475"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="622" x="475">9</text><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="653" x="274">DoAction(ActionClosePreparedStatementRequest)</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="684" x2="472" y1="684" x1="76"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="688" x="76">10</text><text style="font-size: 16px; font-weight: 400;" dy="1em" class="messageText" alignment-baseline="middle" dominant-baseline="middle" text-anchor="middle" y="699" x="277">ActionClosePreparedStatementRequest{}</text><line style="fill: none;" marker-start="url(#sequencenumber)" marker-end="url(#arrowhead)" stroke="none" stroke-width="2" class="messageLine0" y2="730" x2="79" y1="730" x1="475"/><text class="sequenceNumber" text-anchor="middle" font-size="12px" font-family="sans-serif" y="734" x="475">11</text></svg>
\ No newline at end of file
diff --git a/docs/source/format/FlightSql/CommandStatementIngest.mmd b/docs/source/format/FlightSql/CommandStatementIngest.mmd
new file mode 100644
index 0000000000000..0578f465d4dda
--- /dev/null
+++ b/docs/source/format/FlightSql/CommandStatementIngest.mmd
@@ -0,0 +1,25 @@
+%% 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.
+
+sequenceDiagram
+autonumber
+
+participant Client
+participant Server
+Client->>Server: DoPut(CommandStatementIngest)
+Client->>Server: stream of FlightData
+Server->>Client: PutResult{DoPutUpdateResult{RecordCount: int64}}
diff --git a/docs/source/format/FlightSql/CommandStatementQuery.mmd b/docs/source/format/FlightSql/CommandStatementQuery.mmd
index 7b67fecfb75c6..f26aa2f951fcf 100644
--- a/docs/source/format/FlightSql/CommandStatementQuery.mmd
+++ b/docs/source/format/FlightSql/CommandStatementQuery.mmd
@@ -15,9 +15,6 @@
 %% specific language governing permissions and limitations
 %% under the License.
 
-%% To generate the diagram, use mermaid-cli
-%% Example: docker run --rm -v $(pwd)/FlightSql:/data minlag/mermaid-cli -i /data/CommandStatementQuery.mmd
-
 sequenceDiagram
 autonumber
 
diff --git a/docs/source/format/FlightSql/CommandStatementQuery.mmd.svg b/docs/source/format/FlightSql/CommandStatementQuery.mmd.svg
deleted file mode 100644
index f5e8c79f137ff..0000000000000
--- a/docs/source/format/FlightSql/CommandStatementQuery.mmd.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="mermaid-1647978323146" width="100%" xmlns="http://www.w3.org/2000/svg" height="402" style="max-width: 638px; background-color: white;" viewBox="-50 -10 638 402"><style>#mermaid-1647978323146 {font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;fill:#333;}#mermaid-1647978323146 .error-icon{fill:#552222;}#mermaid-1647978323146 .error-text{fill:#552222;stroke:#552222;}#mermaid-1647978323146 .edge-thickness-normal{stroke-width:2px;}#mermaid-1647978323146 .edge-thickness-thick{stroke-width:3.5px;}#mermaid-1647978323146 .edge-pattern-solid{stroke-dasharray:0;}#mermaid-1647978323146 .edge-pattern-dashed{stroke-dasharray:3;}#mermaid-1647978323146 .edge-pattern-dotted{stroke-dasharray:2;}#mermaid-1647978323146 .marker{fill:#333333;stroke:#333333;}#mermaid-1647978323146 .marker.cross{stroke:#333333;}#mermaid-1647978323146 svg{font-family:"trebuchet ms",verdana,arial,sans-serif;font-size:16px;}#mermaid-1647978323146 .actor{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1647978323146 text.actor&gt;tspan{fill:black;stroke:none;}#mermaid-1647978323146 .actor-line{stroke:grey;}#mermaid-1647978323146 .messageLine0{stroke-width:1.5;stroke-dasharray:none;stroke:#333;}#mermaid-1647978323146 .messageLine1{stroke-width:1.5;stroke-dasharray:2,2;stroke:#333;}#mermaid-1647978323146 #arrowhead path{fill:#333;stroke:#333;}#mermaid-1647978323146 .sequenceNumber{fill:white;}#mermaid-1647978323146 #sequencenumber{fill:#333;}#mermaid-1647978323146 #crosshead path{fill:#333;stroke:#333;}#mermaid-1647978323146 .messageText{fill:#333;stroke:#333;}#mermaid-1647978323146 .labelBox{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1647978323146 .labelText,#mermaid-1647978323146 .labelText&gt;tspan{fill:black;stroke:none;}#mermaid-1647978323146 .loopText,#mermaid-1647978323146 .loopText&gt;tspan{fill:black;stroke:none;}#mermaid-1647978323146 .loopLine{stroke-width:2px;stroke-dasharray:2,2;stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);}#mermaid-1647978323146 .note{stroke:#aaaa33;fill:#fff5ad;}#mermaid-1647978323146 .noteText,#mermaid-1647978323146 .noteText&gt;tspan{fill:black;stroke:none;}#mermaid-1647978323146 .activation0{fill:#f4f4f4;stroke:#666;}#mermaid-1647978323146 .activation1{fill:#f4f4f4;stroke:#666;}#mermaid-1647978323146 .activation2{fill:#f4f4f4;stroke:#666;}#mermaid-1647978323146 .actorPopupMenu{position:absolute;}#mermaid-1647978323146 .actorPopupMenuPanel{position:absolute;fill:#ECECFF;box-shadow:0px 8px 16px 0px rgba(0,0,0,0.2);filter:drop-shadow(3px 5px 2px rgb(0 0 0 / 0.4));}#mermaid-1647978323146 .actor-man line{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;}#mermaid-1647978323146 .actor-man circle,#mermaid-1647978323146 line{stroke:hsl(259.6261682243, 59.7765363128%, 87.9019607843%);fill:#ECECFF;stroke-width:2px;}#mermaid-1647978323146 :root{--mermaid-font-family:"trebuchet ms",verdana,arial,sans-serif;}</style><g></g><defs><symbol id="computer" width="24" height="24"><path transform="scale(.5)" d="M2 2v13h20v-13h-20zm18 11h-16v-9h16v9zm-10.228 6l.466-1h3.524l.467 1h-4.457zm14.228 3h-24l2-6h2.104l-1.33 4h18.45l-1.297-4h2.073l2 6zm-5-10h-14v-7h14v7z"></path></symbol></defs><defs><symbol id="database" fill-rule="evenodd" clip-rule="evenodd"><path transform="scale(.5)" d="M12.258.001l.256.004.255.005.253.008.251.01.249.012.247.015.246.016.242.019.241.02.239.023.236.024.233.027.231.028.229.031.225.032.223.034.22.036.217.038.214.04.211.041.208.043.205.045.201.046.198.048.194.05.191.051.187.053.183.054.18.056.175.057.172.059.168.06.163.061.16.063.155.064.15.066.074.033.073.033.071.034.07.034.069.035.068.035.067.035.066.035.064.036.064.036.062.036.06.036.06.037.058.037.058.037.055.038.055.038.053.038.052.038.051.039.05.039.048.039.047.039.045.04.044.04.043.04.041.04.04.041.039.041.037.041.036.041.034.041.033.042.032.042.03.042.029.042.027.042.026.043.024.043.023.043.021.043.02.043.018.044.017.043.015.044.013.044.012.044.011.045.009.044.007.045.006.045.004.045.002.045.001.045v17l-.001.045-.002.045-.004.045-.006.045-.007.045-.009.044-.011.045-.012.044-.013.044-.015.044-.017.043-.018.044-.02.043-.021.043-.023.043-.024.043-.026.043-.027.042-.029.042-.03.042-.032.042-.033.042-.034.041-.036.041-.037.041-.039.041-.04.041-.041.04-.043.04-.044.04-.045.04-.047.039-.048.039-.05.039-.051.039-.052.038-.053.038-.055.038-.055.038-.058.037-.058.037-.06.037-.06.036-.062.036-.064.036-.064.036-.066.035-.067.035-.068.035-.069.035-.07.034-.071.034-.073.033-.074.033-.15.066-.155.064-.16.063-.163.061-.168.06-.172.059-.175.057-.18.056-.183.054-.187.053-.191.051-.194.05-.198.048-.201.046-.205.045-.208.043-.211.041-.214.04-.217.038-.22.036-.223.034-.225.032-.229.031-.231.028-.233.027-.236.024-.239.023-.241.02-.242.019-.246.016-.247.015-.249.012-.251.01-.253.008-.255.005-.256.004-.258.001-.258-.001-.256-.004-.255-.005-.253-.008-.251-.01-.249-.012-.247-.015-.245-.016-.243-.019-.241-.02-.238-.023-.236-.024-.234-.027-.231-.028-.228-.031-.226-.032-.223-.034-.22-.036-.217-.038-.214-.04-.211-.041-.208-.043-.204-.045-.201-.046-.198-.048-.195-.05-.19-.051-.187-.053-.184-.054-.179-.056-.176-.057-.172-.059-.167-.06-.164-.061-.159-.063-.155-.064-.151-.066-.074-.033-.072-.033-.072-.034-.07-.034-.069-.035-.068-.035-.067-.035-.066-.035-.064-.036-.063-.036-.062-.036-.061-.036-.06-.037-.058-.037-.057-.037-.056-.038-.055-.038-.053-.038-.052-.038-.051-.039-.049-.039-.049-.039-.046-.039-.046-.04-.044-.04-.043-.04-.041-.04-.04-.041-.039-.041-.037-.041-.036-.041-.034-.041-.033-.042-.032-.042-.03-.042-.029-.042-.027-.042-.026-.043-.024-.043-.023-.043-.021-.043-.02-.043-.018-.044-.017-.043-.015-.044-.013-.044-.012-.044-.011-.045-.009-.044-.007-.045-.006-.045-.004-.045-.002-.045-.001-.045v-17l.001-.045.002-.045.004-.045.006-.045.007-.045.009-.044.011-.045.012-.044.013-.044.015-.044.017-.043.018-.044.02-.043.021-.043.023-.043.024-.043.026-.043.027-.042.029-.042.03-.042.032-.042.033-.042.034-.041.036-.041.037-.041.039-.041.04-.041.041-.04.043-.04.044-.04.046-.04.046-.039.049-.039.049-.039.051-.039.052-.038.053-.038.055-.038.056-.038.057-.037.058-.037.06-.037.061-.036.062-.036.063-.036.064-.036.066-.035.067-.035.068-.035.069-.035.07-.034.072-.034.072-.033.074-.033.151-.066.155-.064.159-.063.164-.061.167-.06.172-.059.176-.057.179-.056.184-.054.187-.053.19-.051.195-.05.198-.048.201-.046.204-.045.208-.043.211-.041.214-.04.217-.038.22-.036.223-.034.226-.032.228-.031.231-.028.234-.027.236-.024.238-.023.241-.02.243-.019.245-.016.247-.015.249-.012.251-.01.253-.008.255-.005.256-.004.258-.001.258.001zm-9.258 20.499v.01l.001.021.003.021.004.022.005.021.006.022.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.023.018.024.019.024.021.024.022.025.023.024.024.025.052.049.056.05.061.051.066.051.07.051.075.051.079.052.084.052.088.052.092.052.097.052.102.051.105.052.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.048.144.049.147.047.152.047.155.047.16.045.163.045.167.043.171.043.176.041.178.041.183.039.187.039.19.037.194.035.197.035.202.033.204.031.209.03.212.029.216.027.219.025.222.024.226.021.23.02.233.018.236.016.24.015.243.012.246.01.249.008.253.005.256.004.259.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.021.224-.024.22-.026.216-.027.212-.028.21-.031.205-.031.202-.034.198-.034.194-.036.191-.037.187-.039.183-.04.179-.04.175-.042.172-.043.168-.044.163-.045.16-.046.155-.046.152-.047.148-.048.143-.049.139-.049.136-.05.131-.05.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.053.083-.051.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.05.023-.024.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.023.01-.022.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.127l-.077.055-.08.053-.083.054-.085.053-.087.052-.09.052-.093.051-.095.05-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.045-.118.044-.12.043-.122.042-.124.042-.126.041-.128.04-.13.04-.132.038-.134.038-.135.037-.138.037-.139.035-.142.035-.143.034-.144.033-.147.032-.148.031-.15.03-.151.03-.153.029-.154.027-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.01-.179.008-.179.008-.181.006-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.006-.179-.008-.179-.008-.178-.01-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.027-.153-.029-.151-.03-.15-.03-.148-.031-.146-.032-.145-.033-.143-.034-.141-.035-.14-.035-.137-.037-.136-.037-.134-.038-.132-.038-.13-.04-.128-.04-.126-.041-.124-.042-.122-.042-.12-.044-.117-.043-.116-.045-.113-.045-.112-.046-.109-.047-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.05-.093-.052-.09-.051-.087-.052-.085-.053-.083-.054-.08-.054-.077-.054v4.127zm0-5.654v.011l.001.021.003.021.004.021.005.022.006.022.007.022.009.022.01.022.011.023.012.023.013.023.015.024.016.023.017.024.018.024.019.024.021.024.022.024.023.025.024.024.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.052.11.051.114.051.119.052.123.05.127.051.131.05.135.049.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.044.171.042.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.022.23.02.233.018.236.016.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.012.241-.015.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.048.139-.05.136-.049.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.051.051-.049.023-.025.023-.024.021-.025.02-.024.019-.024.018-.024.017-.024.015-.023.014-.023.013-.024.012-.022.01-.023.01-.023.008-.022.006-.022.006-.022.004-.021.004-.022.001-.021.001-.021v-4.139l-.077.054-.08.054-.083.054-.085.052-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.049-.105.048-.106.047-.109.047-.111.046-.114.045-.115.044-.118.044-.12.044-.122.042-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.035-.143.033-.144.033-.147.033-.148.031-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.025-.161.024-.162.023-.163.022-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.011-.178.009-.179.009-.179.007-.181.007-.182.005-.182.004-.184.003-.184.002h-.37l-.184-.002-.184-.003-.182-.004-.182-.005-.181-.007-.179-.007-.179-.009-.178-.009-.176-.011-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.022-.162-.023-.161-.024-.159-.025-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.031-.146-.033-.145-.033-.143-.033-.141-.035-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.04-.126-.041-.124-.042-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.047-.105-.048-.102-.049-.1-.049-.097-.05-.095-.051-.093-.051-.09-.051-.087-.053-.085-.052-.083-.054-.08-.054-.077-.054v4.139zm0-5.666v.011l.001.02.003.022.004.021.005.022.006.021.007.022.009.023.01.022.011.023.012.023.013.023.015.023.016.024.017.024.018.023.019.024.021.025.022.024.023.024.024.025.052.05.056.05.061.05.066.051.07.051.075.052.079.051.084.052.088.052.092.052.097.052.102.052.105.051.11.052.114.051.119.051.123.051.127.05.131.05.135.05.139.049.144.048.147.048.152.047.155.046.16.045.163.045.167.043.171.043.176.042.178.04.183.04.187.038.19.037.194.036.197.034.202.033.204.032.209.03.212.028.216.027.219.025.222.024.226.021.23.02.233.018.236.017.24.014.243.012.246.01.249.008.253.006.256.003.259.001.26-.001.257-.003.254-.006.25-.008.247-.01.244-.013.241-.014.237-.016.233-.018.231-.02.226-.022.224-.024.22-.025.216-.027.212-.029.21-.03.205-.032.202-.033.198-.035.194-.036.191-.037.187-.039.183-.039.179-.041.175-.042.172-.043.168-.044.163-.045.16-.045.155-.047.152-.047.148-.048.143-.049.139-.049.136-.049.131-.051.126-.05.123-.051.118-.052.114-.051.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.052.07-.051.065-.051.06-.051.056-.05.051-.049.023-.025.023-.025.021-.024.02-.024.019-.024.018-.024.017-.024.015-.023.014-.024.013-.023.012-.023.01-.022.01-.023.008-.022.006-.022.006-.022.004-.022.004-.021.001-.021.001-.021v-4.153l-.077.054-.08.054-.083.053-.085.053-.087.053-.09.051-.093.051-.095.051-.097.05-.1.049-.102.048-.105.048-.106.048-.109.046-.111.046-.114.046-.115.044-.118.044-.12.043-.122.043-.124.042-.126.041-.128.04-.13.039-.132.039-.134.038-.135.037-.138.036-.139.036-.142.034-.143.034-.144.033-.147.032-.148.032-.15.03-.151.03-.153.028-.154.028-.156.027-.158.026-.159.024-.161.024-.162.023-.163.023-.165.021-.166.02-.167.019-.169.018-.169.017-.171.016-.173.015-.173.014-.175.013-.175.012-.177.01-.178.01-.179.009-.179.007-.181.006-.182.006-.182.004-.184.003-.184.001-.185.001-.185-.001-.184-.001-.184-.003-.182-.004-.182-.006-.181-.006-.179-.007-.179-.009-.178-.01-.176-.01-.176-.012-.175-.013-.173-.014-.172-.015-.171-.016-.17-.017-.169-.018-.167-.019-.166-.02-.165-.021-.163-.023-.162-.023-.161-.024-.159-.024-.157-.026-.156-.027-.155-.028-.153-.028-.151-.03-.15-.03-.148-.032-.146-.032-.145-.033-.143-.034-.141-.034-.14-.036-.137-.036-.136-.037-.134-.038-.132-.039-.13-.039-.128-.041-.126-.041-.124-.041-.122-.043-.12-.043-.117-.044-.116-.044-.113-.046-.112-.046-.109-.046-.106-.048-.105-.048-.102-.048-.1-.05-.097-.049-.095-.051-.093-.051-.09-.052-.087-.052-.085-.053-.083-.053-.08-.054-.077-.054v4.153zm8.74-8.179l-.257.004-.254.005-.25.008-.247.011-.244.012-.241.014-.237.016-.233.018-.231.021-.226.022-.224.023-.22.026-.216.027-.212.028-.21.031-.205.032-.202.033-.198.034-.194.036-.191.038-.187.038-.183.04-.179.041-.175.042-.172.043-.168.043-.163.045-.16.046-.155.046-.152.048-.148.048-.143.048-.139.049-.136.05-.131.05-.126.051-.123.051-.118.051-.114.052-.11.052-.106.052-.101.052-.096.052-.092.052-.088.052-.083.052-.079.052-.074.051-.07.052-.065.051-.06.05-.056.05-.051.05-.023.025-.023.024-.021.024-.02.025-.019.024-.018.024-.017.023-.015.024-.014.023-.013.023-.012.023-.01.023-.01.022-.008.022-.006.023-.006.021-.004.022-.004.021-.001.021-.001.021.001.021.001.021.004.021.004.022.006.021.006.023.008.022.01.022.01.023.012.023.013.023.014.023.015.024.017.023.018.024.019.024.02.025.021.024.023.024.023.025.051.05.056.05.06.05.065.051.07.052.074.051.079.052.083.052.088.052.092.052.096.052.101.052.106.052.11.052.114.052.118.051.123.051.126.051.131.05.136.05.139.049.143.048.148.048.152.048.155.046.16.046.163.045.168.043.172.043.175.042.179.041.183.04.187.038.191.038.194.036.198.034.202.033.205.032.21.031.212.028.216.027.22.026.224.023.226.022.231.021.233.018.237.016.241.014.244.012.247.011.25.008.254.005.257.004.26.001.26-.001.257-.004.254-.005.25-.008.247-.011.244-.012.241-.014.237-.016.233-.018.231-.021.226-.022.224-.023.22-.026.216-.027.212-.028.21-.031.205-.032.202-.033.198-.034.194-.036.191-.038.187-.038.183-.04.179-.041.175-.042.172-.043.168-.043.163-.045.16-.046.155-.046.152-.048.148-.048.143-.048.139-.049.136-.05.131-.05.126-.051.123-.051.118-.051.114-.052.11-.052.106-.052.101-.052.096-.052.092-.052.088-.052.083-.052.079-.052.074-.051.07-.052.065-.051.06-.05.056-.05.051-.05.023-.025.023-.024.021-.024.02-.025.019-.024.018-.024.017-.023.015-.024.014-.023.013-.023.012-.023.01-.023.01-.022.008-.022.006-.023.006-.021.004-.022.004-.021.001-.021.001-.021-.001-.021-.001-.021-.004-.021-.004-.022-.006-.021-.006-.023-.008-.022-.01-.022-.01-.023-.012-.023-.013-.023-.014-.023-.015-.024-.017-.023-.018-.024-.019-.024-.02-.025-.021-.024-.023-.024-.023-.025-.051-.05-.056-.05-.06-.05-.065-.051-.07-.052-.074-.051-.079-.052-.083-.052-.088-.052-.092-.052-.096-.052-.101-.052-.106-.052-.11-.052-.114-.052-.118-.051-.123-.051-.126-.051-.131-.05-.136-.05-.139-.049-.143-.048-.148-.048-.152-.048-.155-.046-.16-.046-.163-.045-.168-.043-.172-.043-.175-.042-.179-.041-.183-.04-.187-.038-.191-.038-.194-.036-.198-.034-.202-.033-.205-.032-.21-.031-.212-.028-.216-.027-.22-.026-.224-.023-.226-.022-.231-.021-.233-.018-.237-.016-.241-.014-.244-.012-.247-.011-.25-.008-.254-.005-.257-.004-.26-.001-.26.001z"></path></symbol></defs><defs><symbol id="clock" width="24" height="24"><path transform="scale(.5)" d="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm0-2c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm5.848 12.459c.202.038.202.333.001.372-1.907.361-6.045 1.111-6.547 1.111-.719 0-1.301-.582-1.301-1.301 0-.512.77-5.447 1.125-7.445.034-.192.312-.181.343.014l.985 6.238 5.394 1.011z"></path></symbol></defs><g><line id="actor0" x1="75" y1="5" x2="75" y2="336" class="200" stroke-width="0.5px" stroke="#999"></line><g id="root-0"><rect x="0" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="75" dy="0">Client</tspan></text></g></g><g><line id="actor1" x1="463" y1="5" x2="463" y2="336" class="200" stroke-width="0.5px" stroke="#999"></line><g id="root-1"><rect x="388" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="463" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="463" dy="0">Server</tspan></text></g></g><defs><marker id="arrowhead" refX="9" refY="5" markerUnits="userSpaceOnUse" markerWidth="12" markerHeight="12" orient="auto"><path d="M 0 0 L 10 5 L 0 10 z"></path></marker></defs><defs><marker id="crosshead" markerWidth="15" markerHeight="8" orient="auto" refX="16" refY="4"><path fill="black" stroke="#000000" stroke-width="1px" d="M 9,2 V 6 L16,4 Z" style="stroke-dasharray: 0, 0;"></path><path fill="none" stroke="#000000" stroke-width="1px" d="M 0,1 L 6,7 M 6,1 L 0,7" style="stroke-dasharray: 0, 0;"></path></marker></defs><defs><marker id="filled-head" refX="18" refY="7" markerWidth="20" markerHeight="28" orient="auto"><path d="M 18,7 L9,13 L14,7 L9,1 Z"></path></marker></defs><defs><marker id="sequencenumber" refX="15" refY="15" markerWidth="60" markerHeight="40" orient="auto"><circle cx="15" cy="15" r="6"></circle></marker></defs><text x="269" y="80" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">GetFlightInfo(CommandStatementQuery)</text><line x1="75" y1="109" x2="463" y2="109" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="75" y="113" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">1</text><text x="269" y="124" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">FlightInfo{endpoints: [FlightEndpoint{…}, …]}</text><line x1="463" y1="153" x2="75" y2="153" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="463" y="157" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">2</text><text x="269" y="213" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">DoGet(endpoint.ticket)</text><line x1="75" y1="242" x2="463" y2="242" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="75" y="246" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">3</text><text x="269" y="257" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="messageText" dy="1em" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">stream of FlightData</text><line x1="463" y1="286" x2="75" y2="286" class="messageLine0" stroke-width="2" stroke="none" marker-end="url(#arrowhead)" marker-start="url(#sequencenumber)" style="fill: none;"></line><text x="463" y="290" font-family="sans-serif" font-size="12px" text-anchor="middle" textLength="16px" class="sequenceNumber">4</text><g><line x1="65" y1="163" x2="473" y2="163" class="loopLine"></line><line x1="473" y1="163" x2="473" y2="296" class="loopLine"></line><line x1="65" y1="296" x2="473" y2="296" class="loopLine"></line><line x1="65" y1="163" x2="65" y2="296" class="loopLine"></line><polygon points="65,163 115,163 115,176 106.6,183 65,183" class="labelBox"></polygon><text x="90" y="176" text-anchor="middle" dominant-baseline="middle" alignment-baseline="middle" class="labelText" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;">loop</text><text x="294" y="181" text-anchor="middle" class="loopText" style="font-family: &quot;trebuchet ms&quot;, verdana, arial, sans-serif; font-size: 16px; font-weight: 400;"><tspan x="294">[for each endpoint in FlightInfo.endpoints]</tspan></text></g><g><rect x="0" y="316" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="348.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="75" dy="0">Client</tspan></text></g><g><rect x="388" y="316" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="463" y="348.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px; font-weight: 400; font-family: Open-Sans, &quot;sans-serif&quot;;"><tspan x="463" dy="0">Server</tspan></text></g></svg>
\ No newline at end of file
diff --git a/docs/source/format/Glossary.rst b/docs/source/format/Glossary.rst
index 3f2f118a95d6d..11c19c5fa70e9 100644
--- a/docs/source/format/Glossary.rst
+++ b/docs/source/format/Glossary.rst
@@ -211,7 +211,7 @@ Glossary
        its bindings, and Go).
 
        .. image:: ../cpp/tables-versus-record-batches.svg
-          :alt: A graphical representation of an Arrow Table and a 
+          :alt: A graphical representation of an Arrow Table and a
                 Record Batch, with structure as described in text above.
 
        .. seealso:: :term:`chunked array`, :term:`record batch`
diff --git a/docs/source/format/Integration.rst b/docs/source/format/Integration.rst
index 1a9b1b97f07ee..0ab5b832ad012 100644
--- a/docs/source/format/Integration.rst
+++ b/docs/source/format/Integration.rst
@@ -455,6 +455,7 @@ or ``DATA``.
 * ``VARIADIC_DATA_BUFFERS``: a JSON array of data buffers represented as
   hex encoded strings.
 * ``VIEWS``: a JSON array of encoded views, which are JSON objects with:
+
   * ``SIZE``: an integer indicating the size of the view,
   * ``INLINED``: an encoded value (this field will be present if ``SIZE``
     is smaller than 12, otherwise the next three fields will be present),
@@ -501,14 +502,14 @@ integration testing actually tests.
 
 There are two types of integration test cases: the ones populated on the fly
 by the data generator in the Archery utility, and *gold* files that exist
-in the `arrow-testing <https://github.com/apache/arrow-testing/tree/master/data/arrow-ipc-stream/integration>` 
+in the `arrow-testing <https://github.com/apache/arrow-testing/tree/master/data/arrow-ipc-stream/integration>`_
 repository.
 
 Data Generator Tests
 ~~~~~~~~~~~~~~~~~~~~
 
 This is the high-level description of the cases which are generated and
-tested using the ``archery integration`` command (see ``get_generated_json_files`` 
+tested using the ``archery integration`` command (see ``get_generated_json_files``
 in ``datagen.py``):
 
 * Primitive Types
@@ -549,7 +550,7 @@ Gold File Integration Tests
 Pre-generated json and arrow IPC files (both file and stream format) exist
 in the `arrow-testing <https://github.com/apache/arrow-testing>`__ repository
 in the ``data/arrow-ipc-stream/integration`` directory. These serve as
-*gold* files that are assumed to be correct for use in testing. They are 
+*gold* files that are assumed to be correct for use in testing. They are
 referenced by ``runner.py`` in the code for the :ref:`Archery <archery>`
 utility. Below are the test cases which are covered by them:
 
@@ -563,7 +564,7 @@ utility. Below are the test cases which are covered by them:
     + intervals
     + maps
     + nested types (list, struct)
-    + primitives 
+    + primitives
     + primitive with no batches
     + primitive with zero length batches
 
diff --git a/docs/source/format/Versioning.rst b/docs/source/format/Versioning.rst
index 7ba01107074d0..8fcf11b21f0cc 100644
--- a/docs/source/format/Versioning.rst
+++ b/docs/source/format/Versioning.rst
@@ -51,7 +51,7 @@ data.
 An increase in the **minor** version of the format version, such as
 1.0.0 to 1.1.0, indicates that 1.1.0 contains new features not
 available in 1.0.0. So long as these features are not used (such as a
-new logical data type), forward compatibility is preserved.
+new data type), forward compatibility is preserved.
 
 Long-Term Stability
 ===================
diff --git a/docs/source/format/index.rst b/docs/source/format/index.rst
index 856830d863243..44ea3e8e7e608 100644
--- a/docs/source/format/index.rst
+++ b/docs/source/format/index.rst
@@ -30,6 +30,7 @@ Specifications
    CDataInterface
    CStreamInterface
    CDeviceDataInterface
+   DissociatedIPC
    Flight
    FlightSql
    ADBC
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 2ca63c5ebdbc4..0afe52758af25 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -104,11 +104,12 @@ Implementations
    C/GLib <c_glib/index>
    C++ <cpp/index>
    C# <https://github.com/apache/arrow/blob/main/csharp/README.md>
-   Go <https://pkg.go.dev/github.com/apache/arrow/go/v16>
+   Go <https://pkg.go.dev/github.com/apache/arrow/go/v17>
    Java <java/index>
    JavaScript <js/index>
    Julia <https://arrow.apache.org/julia/>
    MATLAB <https://github.com/apache/arrow/blob/main/matlab/README.md>
+   nanoarrow <https://arrow.apache.org/nanoarrow/>
    Python <python/index>
    R <r/index>
    Ruby <https://github.com/apache/arrow/blob/main/ruby/README.md>
diff --git a/docs/source/java/algorithm.rst b/docs/source/java/algorithm.rst
index 316fd38fa0990..d4838967d614f 100644
--- a/docs/source/java/algorithm.rst
+++ b/docs/source/java/algorithm.rst
@@ -20,12 +20,12 @@ Java Algorithms
 
 Arrow's Java library provides algorithms for some commonly-used
 functionalities. The algorithms are provided in the ``org.apache.arrow.algorithm``
-package of the ``algorithm`` module. 
+package of the ``algorithm`` module.
 
 Comparing Vector Elements
 -------------------------
 
-Comparing vector elements is the basic for many algorithms. Vector 
+Comparing vector elements is the basic for many algorithms. Vector
 elements can be compared in one of the two ways:
 
 1. **Equality comparison**: there are two possible results for this type of comparisons: ``equal`` and ``unequal``.
@@ -36,30 +36,30 @@ interface.
 and ``greater than``. This comparison is supported by the abstract class ``org.apache.arrow.algorithm.sort.VectorValueComparator``.
 
 We provide default implementations to compare vector elements. However, users can also define ways
-for customized comparisons. 
+for customized comparisons.
 
 Vector Element Search
 ---------------------
 
-A search algorithm tries to find a particular value in a vector. When successful, a vector index is 
+A search algorithm tries to find a particular value in a vector. When successful, a vector index is
 returned; otherwise, a ``-1`` is returned. The following search algorithms are provided:
 
-1. **Linear search**: this algorithm simply traverses the vector from the beginning, until a match is 
+1. **Linear search**: this algorithm simply traverses the vector from the beginning, until a match is
 found, or the end of the vector is reached. So it takes ``O(n)`` time, where ``n`` is the number of elements
 in the vector.  This algorithm is implemented in ``org.apache.arrow.algorithm.search.VectorSearcher#linearSearch``.
 
-2. **Binary search**: this represents a more efficient search algorithm, as it runs in ``O(log(n))`` time. 
+2. **Binary search**: this represents a more efficient search algorithm, as it runs in ``O(log(n))`` time.
 However, it is only applicable to sorted vectors. To get a sorted vector,
 one can use one of our sorting algorithms, which will be discussed in the next section. This algorithm
 is implemented in ``org.apache.arrow.algorithm.search.VectorSearcher#binarySearch``.
 
 3. **Parallel search**: when the vector is large, it takes a long time to traverse the elements to search
-for a value. To make this process faster, one can split the vector into multiple partitions, and perform the 
+for a value. To make this process faster, one can split the vector into multiple partitions, and perform the
 search for each partition in parallel. This is supported by ``org.apache.arrow.algorithm.search.ParallelSearcher``.
 
-4. **Range search**: for many scenarios, there can be multiple matching values in the vector. 
+4. **Range search**: for many scenarios, there can be multiple matching values in the vector.
 If the vector is sorted, the matching values reside in a contiguous region in the vector. The
-range search algorithm tries to find the upper/lower bound of the region in ``O(log(n))`` time. 
+range search algorithm tries to find the upper/lower bound of the region in ``O(log(n))`` time.
 An implementation is provided in ``org.apache.arrow.algorithm.search.VectorRangeSearcher``.
 
 Vector Sorting
@@ -72,19 +72,19 @@ classified into the following categories:
 1. **In-place sorter**: an in-place sorter performs the sorting by manipulating the original
 vector, without creating any new vector. So it just returns the original vector after the sorting operations.
 Currently, we have ``org.apache.arrow.algorithm.sort.FixedWidthInPlaceVectorSorter`` for in-place
-sorting in ``O(nlog(n))`` time. As the name suggests, it only supports fixed width vectors. 
+sorting in ``O(nlog(n))`` time. As the name suggests, it only supports fixed width vectors.
 
 2. **Out-of-place sorter**: an out-of-place sorter does not mutate the original vector. Instead,
 it copies vector elements to a new vector in sorted order, and returns the new vector.
-We have ``org.apache.arrow.algorithm.sort.FixedWidthInPlaceVectorSorter.FixedWidthOutOfPlaceVectorSorter`` 
+We have ``org.apache.arrow.algorithm.sort.FixedWidthInPlaceVectorSorter.FixedWidthOutOfPlaceVectorSorter``
 and ``org.apache.arrow.algorithm.sort.FixedWidthInPlaceVectorSorter.VariableWidthOutOfPlaceVectorSorter``
-for fixed width and variable width vectors, respectively. Both algorithms run in ``O(nlog(n))`` time. 
+for fixed width and variable width vectors, respectively. Both algorithms run in ``O(nlog(n))`` time.
 
 3. **Index sorter**: this sorter does not actually sort the vector. Instead, it returns an integer
 vector, which correspond to indices of vector elements in sorted order. With the index vector, one can
-easily construct a sorted vector. In addition, some other tasks can be easily achieved, like finding the ``k``th
-smallest value in the vector. Index sorting is supported by ``org.apache.arrow.algorithm.sort.IndexSorter``, 
-which runs in ``O(nlog(n))`` time. It is applicable to vectors of any type. 
+easily construct a sorted vector. In addition, some other tasks can be easily achieved, like finding the ``k`` th
+smallest value in the vector. Index sorting is supported by ``org.apache.arrow.algorithm.sort.IndexSorter``,
+which runs in ``O(nlog(n))`` time. It is applicable to vectors of any type.
 
 Other Algorithms
 ----------------
diff --git a/docs/source/java/flight.rst b/docs/source/java/flight.rst
index e009998be4f4e..6d26583aeefa6 100644
--- a/docs/source/java/flight.rst
+++ b/docs/source/java/flight.rst
@@ -184,7 +184,7 @@ Handshake-based authentication can be enabled by implementing
 ``ServerAuthHandler``. Authentication consists of two parts: on
 initial client connection, the server and client authentication
 implementations can perform any negotiation needed. The client authentication
-handler then provides a token that will be attached to future calls. 
+handler then provides a token that will be attached to future calls.
 
 The client send data to be validated through ``ClientAuthHandler.authenticate``
 The server validate data received through ``ServerAuthHandler.authenticate``.
diff --git a/docs/source/java/flight_sql_jdbc_driver.rst b/docs/source/java/flight_sql_jdbc_driver.rst
index 0ace2185983a9..f95c2ac755d97 100644
--- a/docs/source/java/flight_sql_jdbc_driver.rst
+++ b/docs/source/java/flight_sql_jdbc_driver.rst
@@ -162,15 +162,15 @@ the Flight SQL service as gRPC headers. For example, the following URI ::
 
 This will connect without authentication or encryption, to a Flight
 SQL service running on ``localhost`` on port 12345. Each request will
-also include a `database=mydb` gRPC header.
+also include a ``database=mydb`` gRPC header.
 
 Connection parameters may also be supplied using the Properties object
 when using the JDBC Driver Manager to connect. When supplying using
 the Properties object, values should *not* be URI-encoded.
 
 Parameters specified by the URI supercede parameters supplied by the
-Properties object. When calling the `user/password overload of 
-DriverManager#getConnection() 
+Properties object. When calling the `user/password overload of
+DriverManager#getConnection()
 <https://docs.oracle.com/javase/8/docs/api/java/sql/DriverManager.html#getConnection-java.lang.String-java.lang.String-java.lang.String->`_,
 the username and password supplied on the URI supercede the username and
 password arguments to the function call.
diff --git a/docs/source/java/install.rst b/docs/source/java/install.rst
index 7ac1a4990f37d..dc6a55c87fcd6 100644
--- a/docs/source/java/install.rst
+++ b/docs/source/java/install.rst
@@ -29,8 +29,8 @@ Java modules are regularly built and tested on macOS and Linux distributions.
 Java Compatibility
 ==================
 
-Java modules are compatible with JDK 8 and above.
-Currently, JDK 8, 11, 17, and 21 are tested in CI.
+Java modules are compatible with JDK 8 and above. Currently, JDK versions
+8, 11, 17, and 21 are tested in CI. The latest JDK is also tested in CI.
 
 When using Java 9 or later, some JDK internals must be exposed by
 adding ``--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED`` to the ``java`` command:
@@ -61,9 +61,9 @@ Modifying the command above for Flight:
    $ env _JAVA_OPTIONS="--add-reads=org.apache.arrow.flight.core=ALL-UNNAMED --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED" java -jar ...
 
 Otherwise, you may see errors like ``java.lang.IllegalAccessError: superclass access check failed: class
-org.apache.arrow.flight.ArrowMessage$ArrowBufRetainingCompositeByteBuf (in module org.apache.arrow.flight.core) 
+org.apache.arrow.flight.ArrowMessage$ArrowBufRetainingCompositeByteBuf (in module org.apache.arrow.flight.core)
 cannot access class io.netty.buffer.CompositeByteBuf (in unnamed module ...) because module
-org.apache.arrow.flight.core does not read unnamed module ...
+org.apache.arrow.flight.core does not read unnamed module ...``
 
 Finally, if you are using arrow-dataset, you'll also need to report that JDK internals need to be exposed.
 Modifying the command above for arrow-memory:
@@ -74,8 +74,8 @@ Modifying the command above for arrow-memory:
    # Indirectly via environment variables
    $ env _JAVA_OPTIONS="--add-opens=java.base/java.nio=org.apache.arrow.dataset,org.apache.arrow.memory.core,ALL-UNNAMED" java -jar ...
 
-Otherwise you may see errors such as ``java.lang.RuntimeException: java.lang.reflect.InaccessibleObjectException: 
-Unable to make static void java.nio.Bits.reserveMemory(long,long) accessible: module 
+Otherwise you may see errors such as ``java.lang.RuntimeException: java.lang.reflect.InaccessibleObjectException:
+Unable to make static void java.nio.Bits.reserveMemory(long,long) accessible: module
 java.base does not "opens java.nio" to module org.apache.arrow.dataset``
 
 If using Maven and Surefire for unit testing, :ref:`this argument must
diff --git a/docs/source/java/ipc.rst b/docs/source/java/ipc.rst
index 01341ff2cc391..f5939179177d5 100644
--- a/docs/source/java/ipc.rst
+++ b/docs/source/java/ipc.rst
@@ -81,7 +81,7 @@ Here we used an in-memory stream, but this could have been a socket or some othe
     writer.end();
 
 Note that, since the :class:`VectorSchemaRoot` in the writer is a container that can hold batches, batches flow through
-:class:`VectorSchemaRoot` as part of a pipeline, so we need to populate data before `writeBatch`, so that later batches
+:class:`VectorSchemaRoot` as part of a pipeline, so we need to populate data before ``writeBatch``, so that later batches
 could overwrite previous ones.
 
 Now the :class:`ByteArrayOutputStream` contains the complete stream which contains 5 record batches.
diff --git a/docs/source/java/memory.rst b/docs/source/java/memory.rst
index 036befa148692..8014a27444ac9 100644
--- a/docs/source/java/memory.rst
+++ b/docs/source/java/memory.rst
@@ -20,7 +20,7 @@ Memory Management
 =================
 
 The memory modules contain all the functionality that Arrow uses to allocate and deallocate memory. This document is divided in two parts:
-The first part, *Memory Basics*, provides a high-level introduction. The following section, *Arrow Memory In-Depth*, fills in the details. 
+The first part, *Memory Basics*, provides a high-level introduction. The following section, *Arrow Memory In-Depth*, fills in the details.
 
 .. contents::
 
@@ -39,7 +39,7 @@ Getting Started
 
 Arrow's memory management is built around the needs of the columnar format and using off-heap memory.
 Arrow Java has its own independent implementation. It does not wrap the C++ implementation, although the framework is flexible enough
-to be used with memory allocated in C++ that is used by Java code. 
+to be used with memory allocated in C++ that is used by Java code.
 
 Arrow provides multiple modules: the core interfaces, and implementations of the interfaces.
 Users need the core interfaces, and exactly one of the implementations.
@@ -67,9 +67,9 @@ Why Arrow Uses Direct Memory
 BufferAllocator
 ---------------
 
-The `BufferAllocator`_ is primarily an arena or nursery used for accounting of buffers (ArrowBuf instances). 
-As the name suggests, it can allocate new buffers associated with itself, but it can also 
-handle the accounting for buffers allocated elsewhere. For example, it handles the Java-side accounting for 
+The `BufferAllocator`_ is primarily an arena or nursery used for accounting of buffers (ArrowBuf instances).
+As the name suggests, it can allocate new buffers associated with itself, but it can also
+handle the accounting for buffers allocated elsewhere. For example, it handles the Java-side accounting for
 memory allocated in C++ and shared with Java using the C-Data Interface. In the code below it performs an allocation:
 
 .. code-block:: Java
@@ -100,21 +100,21 @@ memory from a child allocator, those allocations are also reflected in all paren
 effectively sets the program-wide memory limit, and serves as the master bookkeeper for all memory allocations.
 
 Child allocators are not strictly required, but can help better organize code. For instance, a lower memory limit can
-be set for a particular section of code. The child allocator can be closed when that section completes, 
-at which point it checks that that section didn't leak any memory. 
+be set for a particular section of code. The child allocator can be closed when that section completes,
+at which point it checks that that section didn't leak any memory.
 Child allocators can also be named, which makes it easier to tell where an ArrowBuf came from during debugging.
 
 Reference counting
 ------------------
 
-Because direct memory is expensive to allocate and deallocate, allocators may share direct buffers. To managed shared buffers 
-deterministically, we use manual reference counting instead of the garbage collector. 
+Because direct memory is expensive to allocate and deallocate, allocators may share direct buffers. To managed shared buffers
+deterministically, we use manual reference counting instead of the garbage collector.
 This simply means that each buffer has a counter keeping track of the number of references to
 the buffer, and the user is responsible for properly incrementing/decrementing the counter as the buffer is used.
 
 In Arrow, each ArrowBuf has an associated `ReferenceManager`_ that tracks the reference count. You can retrieve
-it with ArrowBuf.getReferenceManager(). The reference count is updated using `ReferenceManager.release`_ to decrement the count, 
-and `ReferenceManager.retain`_ to increment it. 
+it with ArrowBuf.getReferenceManager(). The reference count is updated using `ReferenceManager.release`_ to decrement the count,
+and `ReferenceManager.retain`_ to increment it.
 
 Of course, this is tedious and error-prone, so instead of directly working with buffers, we typically use
 higher-level APIs like ValueVector. Such classes generally implement Closeable/AutoCloseable and will automatically
@@ -289,7 +289,7 @@ Finally, enabling the ``TRACE`` logging level will automatically provide this st
    |        at (#8:1)
 
 Sometimes, explicitly passing allocators around is difficult. For example, it
-can be hard to pass around extra state, like an allocator, through layers of 
+can be hard to pass around extra state, like an allocator, through layers of
 existing application or framework code. A global or singleton allocator instance
 can be useful here, though it should not be your first choice.
 
@@ -370,7 +370,7 @@ Arrow’s memory model is based on the following basic concepts:
    leaks.
 -  The same physical memory can be shared by multiple allocators and the
    allocator must provide an accounting paradigm for this purpose.
-   
+
 Reserving Memory
 ----------------
 
@@ -384,17 +384,17 @@ Arrow provides two different ways to reserve memory:
 -  ``AllocationReservation`` via BufferAllocator.newReservation():
    Allows a short-term preallocation strategy so that a particular
    subsystem can ensure future memory is available to support a
-   particular request.   
-   
+   particular request.
+
 Reference Counting Details
 --------------------------
 
-Typically, the ReferenceManager implementation used is an instance of `BufferLedger`_. 
-A BufferLedger is a ReferenceManager that also maintains the relationship between an ``AllocationManager``, 
+Typically, the ReferenceManager implementation used is an instance of `BufferLedger`_.
+A BufferLedger is a ReferenceManager that also maintains the relationship between an ``AllocationManager``,
 a ``BufferAllocator`` and one or more individual ``ArrowBuf``\ s
 
-All ArrowBufs (direct or sliced) related to a single BufferLedger/BufferAllocator combination 
-share the same reference count and either all will be valid or all will be invalid. 
+All ArrowBufs (direct or sliced) related to a single BufferLedger/BufferAllocator combination
+share the same reference count and either all will be valid or all will be invalid.
 For simplicity of accounting, we treat that memory as being used by one
 of the BufferAllocators associated with the memory. When that allocator
 releases its claim on that memory, the memory ownership is then moved to
@@ -411,7 +411,7 @@ There are several Allocator types in Arrow Java:
 -  ``ChildAllocator`` - A child allocator that derives from the root allocator
 
 Many BufferAllocators can reference the same piece of physical memory at the same
-time. It is the AllocationManager’s responsibility to ensure that in this situation, 
+time. It is the AllocationManager’s responsibility to ensure that in this situation,
 all memory is accurately accounted for from the Root’s perspective
 and also to ensure that the memory is correctly released once all
 BufferAllocators have stopped using that memory.
diff --git a/docs/source/java/overview.rst b/docs/source/java/overview.rst
index 9d9cbad8a26c1..7780ee32ec9bc 100644
--- a/docs/source/java/overview.rst
+++ b/docs/source/java/overview.rst
@@ -54,10 +54,10 @@ but some modules are JNI bindings to the C++ library.
      - (Experimental) A library for converting JDBC data to Arrow data.
      - Native
    * - flight-core
-     - (Experimental) An RPC mechanism for transferring ValueVectors.
+     - An RPC mechanism for transferring ValueVectors.
      - Native
    * - flight-sql
-     - (Experimental) Contains utility classes to expose Flight SQL semantics for clients and servers over Arrow Flight.
+     - Contains utility classes to expose Flight SQL semantics for clients and servers over Arrow Flight.
      - Native
    * - flight-integration-tests
      - Integration tests for Flight RPC.
diff --git a/docs/source/java/quickstartguide.rst b/docs/source/java/quickstartguide.rst
index e358681c57830..1f3ec861d3f46 100644
--- a/docs/source/java/quickstartguide.rst
+++ b/docs/source/java/quickstartguide.rst
@@ -195,10 +195,10 @@ Example: Create a dataset of names (strings) and ages (32-bit signed integers).
 .. code-block:: shell
 
     VectorSchemaRoot created:
-    age	    name
-    10	    Dave
-    20	    Peter
-    30	    Mary
+    age      name
+    10      Dave
+    20      Peter
+    30      Mary
 
 
 Interprocess Communication (IPC)
@@ -306,11 +306,11 @@ Example: Read the dataset from the previous example from an Arrow IPC file (rand
 
     Record batches in file: 1
     VectorSchemaRoot read:
-    age	    name
-    10	    Dave
-    20	    Peter
-    30	    Mary
+    age      name
+    10       Dave
+    20       Peter
+    30       Mary
 
 More examples available at `Arrow Java Cookbook`_.
 
-.. _`Arrow Java Cookbook`: https://arrow.apache.org/cookbook/java
\ No newline at end of file
+.. _`Arrow Java Cookbook`: https://arrow.apache.org/cookbook/java
diff --git a/docs/source/java/substrait.rst b/docs/source/java/substrait.rst
index c5857dcc23f75..fa20dbd61dbfb 100644
--- a/docs/source/java/substrait.rst
+++ b/docs/source/java/substrait.rst
@@ -100,9 +100,9 @@ Here is an example of a Java program that queries a Parquet file using Java Subs
 .. code-block:: text
 
     // Results example:
-    FieldPath(0)	FieldPath(1)	FieldPath(2)	FieldPath(3)
-    0	ALGERIA	0	 haggle. carefully final deposits detect slyly agai
-    1	ARGENTINA	1	al foxes promise slyly according to the regular accounts. bold requests alon
+    FieldPath(0)    FieldPath(1)    FieldPath(2)    FieldPath(3)
+    0               ALGERIA         0               haggle. carefully final deposits detect slyly agai
+    1               ARGENTINA       1               al foxes promise slyly according to the regular accounts. bold requests alon
 
 Executing Projections and Filters Using Extended Expressions
 ============================================================
@@ -189,13 +189,13 @@ This Java program:
 
 .. code-block:: text
 
-    column-1	column-2
-    13	ROMANIA - ular asymptotes are about the furious multipliers. express dependencies nag above the ironically ironic account
-    14	SAUDI ARABIA - ts. silent requests haggle. closely express packages sleep across the blithely
-    12	VIETNAM - hely enticingly express accounts. even, final
-    13	RUSSIA -  requests against the platelets use never according to the quickly regular pint
-    13	UNITED KINGDOM - eans boost carefully special requests. accounts are. carefull
-    11	UNITED STATES - y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be
+    column-1  column-2
+    13        ROMANIA - ular asymptotes are about the furious multipliers. express dependencies nag above the ironically ironic account
+    14        SAUDI ARABIA - ts. silent requests haggle. closely express packages sleep across the blithely
+    12        VIETNAM - hely enticingly express accounts. even, final
+    13        RUSSIA -  requests against the platelets use never according to the quickly regular pint
+    13        UNITED KINGDOM - eans boost carefully special requests. accounts are. carefull
+    11        UNITED STATES - y final packages. slow foxes cajole quickly. quickly silent platelets breach ironic accounts. unusual pinto be
 
 .. _`Substrait`: https://substrait.io/
 .. _`Substrait Java`: https://github.com/substrait-io/substrait-java
diff --git a/docs/source/java/table.rst b/docs/source/java/table.rst
index 603910f51694f..5aa95e153cea0 100644
--- a/docs/source/java/table.rst
+++ b/docs/source/java/table.rst
@@ -75,7 +75,7 @@ Tables are created from a ``VectorSchemaRoot`` as shown below. The memory buffer
 
     Table t = new Table(someVectorSchemaRoot);
 
-If you now update the vectors held by the ``VectorSchemaRoot`` (using some version of  `ValueVector#setSafe()`), it would reflect those changes, but the values in table *t* are unchanged.
+If you now update the vectors held by the ``VectorSchemaRoot`` (using some version of  ``ValueVector#setSafe()``), it would reflect those changes, but the values in table *t* are unchanged.
 
 Creating a Table from FieldVectors
 **********************************
@@ -243,7 +243,7 @@ It is important to recognize that rows are NOT reified as objects, but rather op
 Getting a row
 *************
 
-Calling `immutableRow()` on any table instance returns a new ``Row`` instance.
+Calling ``immutableRow()`` on any table instance returns a new ``Row`` instance.
 
 .. code-block:: Java
 
@@ -262,7 +262,7 @@ Since rows are iterable, you can traverse a table using a standard while loop:
       // do something useful here
     }
 
-``Table`` implements `Iterable<Row>` so you can access rows directly from a table in an enhanced *for* loop:
+``Table`` implements ``Iterable<Row>`` so you can access rows directly from a table in an enhanced *for* loop:
 
 .. code-block:: Java
 
@@ -272,7 +272,7 @@ Since rows are iterable, you can traverse a table using a standard while loop:
       ...
     }
 
-Finally, while rows are usually iterated in the order of the underlying data vectors, but they are also positionable using the `Row#setPosition()` method, so you can skip to a specific row. Row numbers are 0-based.
+Finally, while rows are usually iterated in the order of the underlying data vectors, but they are also positionable using the ``Row#setPosition()`` method, so you can skip to a specific row. Row numbers are 0-based.
 
 .. code-block:: Java
 
@@ -281,7 +281,7 @@ Finally, while rows are usually iterated in the order of the underlying data vec
 
 Any changes to position are applied to all the columns in the table.
 
-Note that you must call `next()`, or `setPosition()` before accessing values via a row. Failure to do so results in a runtime exception.
+Note that you must call ``next()``, or ``setPosition()`` before accessing values via a row. Failure to do so results in a runtime exception.
 
 Read operations using rows
 **************************
@@ -304,7 +304,7 @@ You can also get value using a nullable ``ValueHolder``. For example:
 
 This can be used to retrieve values without creating a new Object for each.
 
-In addition to getting values, you can check if a value is null using `isNull()`. This is important if the vector contains any nulls, as asking for a value from a vector can cause NullPointerExceptions in some cases.
+In addition to getting values, you can check if a value is null using ``isNull()``. This is important if the vector contains any nulls, as asking for a value from a vector can cause NullPointerExceptions in some cases.
 
 .. code-block:: Java
 
@@ -352,13 +352,13 @@ Working with the C-Data interface
 
 The ability to work with native code is required for many Arrow features. This section describes how tables can be be exported for use with native code
 
-Exporting works by converting the data to a ``VectorSchemaRoot`` instance and using the existing facilities to transfer the data. You could do it yourself, but that isn't ideal because conversion to a vector schema root breaks the immutability guarantees. Using the `exportTable()` methods in the `Data`_ class avoids this concern.
+Exporting works by converting the data to a ``VectorSchemaRoot`` instance and using the existing facilities to transfer the data. You could do it yourself, but that isn't ideal because conversion to a vector schema root breaks the immutability guarantees. Using the ``exportTable()`` methods in the `Data`_ class avoids this concern.
 
 .. code-block:: Java
 
     Data.exportTable(bufferAllocator, table, dictionaryProvider, outArrowArray);
 
-If the table contains dictionary-encoded vectors and was constructed with a ``DictionaryProvider``, the provider argument to `exportTable()` can be omitted and the table's provider attribute will be used:
+If the table contains dictionary-encoded vectors and was constructed with a ``DictionaryProvider``, the provider argument to ``exportTable()`` can be omitted and the table's provider attribute will be used:
 
 .. code-block:: Java
 
diff --git a/docs/source/java/vector.rst b/docs/source/java/vector.rst
index 377db71659c13..1c3e123cf50fb 100644
--- a/docs/source/java/vector.rst
+++ b/docs/source/java/vector.rst
@@ -226,7 +226,7 @@ A :class:`ListVector` is a vector that holds a list of values for each index. Wo
 For example, the code below shows how to build a :class:`ListVector` of int's using the writer :class:`UnionListWriter`. We build a vector from 0 to 9 and each index contains a list with values [[0, 0, 0, 0, 0], [0, 1, 2, 3, 4], [0, 2, 4, 6, 8], …, [0, 9, 18, 27, 36]]. List values can be added in any order so writing a list such as [3, 1, 2] would be just as valid.
 
 .. code-block:: Java
-  
+
   try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
     ListVector listVector = ListVector.empty("vector", allocator)) {
     UnionListWriter writer = listVector.getWriter();
@@ -240,7 +240,7 @@ For example, the code below shows how to build a :class:`ListVector` of int's us
        writer.endList();
     }
     listVector.setValueCount(10);
-  }    
+  }
 
 :class:`ListVector` values can be accessed either through the get API or through the reader class :class:`UnionListReader`. To read all the values, first enumerate through the indexes, and then enumerate through the inner list values.
 
@@ -342,7 +342,7 @@ This is where the ``DictionaryEncoding``'s 'id' attribute comes in. This value i
     // now we want to decode our vector, so we retrieve its dictionary from the provider
     Field f = vsr.getField(encoded.getName());
     DictionaryEncoding encoding = f.getDictionary();
-    Dictionary dictionary = provider.get(encoding.getId());
+    Dictionary dictionary = provider.lookup(encoding.getId());
 
 As you can see, a ``DictionaryProvider`` is handy for managing the dictionaries associated with a ``VectorSchemaRoot``. More importantly, it helps package the dictionaries for a ``VectorSchemaRoot`` when it's written. The classes ``ArrowFileWriter`` and ``ArrowStreamWriter`` both accept an optional ``DictionaryProvider`` argument for that purpose. You can find example code for writing dictionaries in the documentation for (:doc:`ipc`). ``ArrowReader`` and its subclasses also implement the ``DictionaryProvider`` interface, so you can retrieve the actual dictionaries when reading a file.
 
diff --git a/docs/source/python/api/arrays.rst b/docs/source/python/api/arrays.rst
index e6f6c3dbbd3d1..aefed00b3d2e0 100644
--- a/docs/source/python/api/arrays.rst
+++ b/docs/source/python/api/arrays.rst
@@ -63,8 +63,8 @@ may expose data type-specific methods or properties.
    FixedSizeBinaryArray
    LargeBinaryArray
    LargeStringArray
-   BinaryViewArray,
-   StringViewArray,
+   BinaryViewArray
+   StringViewArray
    Time32Array
    Time64Array
    Date32Array
diff --git a/docs/source/python/api/compute.rst b/docs/source/python/api/compute.rst
index 928c607d139ce..5423eebfbab40 100644
--- a/docs/source/python/api/compute.rst
+++ b/docs/source/python/api/compute.rst
@@ -52,10 +52,10 @@ Aggregations
 Cumulative Functions
 --------------------
 
-Cumulative functions are vector functions that perform a running accumulation on 
-their input using a given binary associative operation with an identity element 
-(a monoid) and output an array containing the corresponding intermediate running 
-values. The input is expected to be of numeric type. By default these functions 
+Cumulative functions are vector functions that perform a running accumulation on
+their input using a given binary associative operation with an identity element
+(a monoid) and output an array containing the corresponding intermediate running
+values. The input is expected to be of numeric type. By default these functions
 do not detect overflow. They are also
 available in an overflow-checking variant, suffixed ``_checked``, which
 throws an ``ArrowInvalid`` exception when overflow is detected.
@@ -173,7 +173,7 @@ variants which detect domain errors where appropriate.
 Comparisons
 -----------
 
-These functions expect two inputs of the same type. If one of the inputs is `null`
+These functions expect two inputs of the same type. If one of the inputs is ``null``
 they return ``null``.
 
 .. autosummary::
@@ -540,7 +540,6 @@ Compute Options
    AssumeTimezoneOptions
    CastOptions
    CountOptions
-   CountOptions
    CumulativeSumOptions
    DayOfWeekOptions
    DictionaryEncodeOptions
@@ -566,7 +565,6 @@ Compute Options
    RoundToMultipleOptions
    RunEndEncodeOptions
    ScalarAggregateOptions
-   ScalarAggregateOptions
    SelectKOptions
    SetLookupOptions
    SliceOptions
@@ -578,7 +576,6 @@ Compute Options
    StructFieldOptions
    TakeOptions
    TDigestOptions
-   TDigestOptions
    TrimOptions
    VarianceOptions
    WeekOptions
diff --git a/docs/source/python/api/substrait.rst b/docs/source/python/api/substrait.rst
index 66e88fcd279ae..1556be9dbd011 100644
--- a/docs/source/python/api/substrait.rst
+++ b/docs/source/python/api/substrait.rst
@@ -50,4 +50,4 @@ Utility
 .. autosummary::
    :toctree: ../generated/
 
-   get_supported_functions
\ No newline at end of file
+   get_supported_functions
diff --git a/docs/source/python/benchmarks.rst b/docs/source/python/benchmarks.rst
index aee83b7784e39..68fc03c7bcfbc 100644
--- a/docs/source/python/benchmarks.rst
+++ b/docs/source/python/benchmarks.rst
@@ -27,8 +27,7 @@ run with `ASV`_.  You'll need to install the ``asv`` package first
 Running the benchmarks
 ----------------------
 
-To run the benchmarks for a locally-built Arrow, run ``asv dev`` or
-``asv run --python=same``.
+To run the benchmarks for a locally-built Arrow, run ``asv run --python=same``.
 
 We use conda environments as part of running the benchmarks. To use the ``asv``
 setup, you must set the ``$CONDA_HOME`` environment variable to point to the
diff --git a/docs/source/python/compute.rst b/docs/source/python/compute.rst
index c02059a4f8faa..c2b46c8f3f673 100644
--- a/docs/source/python/compute.rst
+++ b/docs/source/python/compute.rst
@@ -23,7 +23,7 @@ Compute Functions
 =================
 
 Arrow supports logical compute operations over inputs of possibly
-varying types.  
+varying types.
 
 The standard compute operations are provided by the :mod:`pyarrow.compute`
 module and can be used directly::
@@ -91,7 +91,7 @@ Grouped Aggregations
 ====================
 
 PyArrow supports grouped aggregations over :class:`pyarrow.Table` through the
-:meth:`pyarrow.Table.group_by` method. 
+:meth:`pyarrow.Table.group_by` method.
 The method will return a grouping declaration
 to which the hash aggregation functions can be applied::
 
@@ -275,7 +275,7 @@ take two datasets and join them:
    ds1 = ds.dataset(table1)
    ds2 = ds.dataset(table2)
 
-   joined_ds = ds1.join(ds2, key="id")
+   joined_ds = ds1.join(ds2, keys="id")
 
 The resulting dataset will be an :class:`.InMemoryDataset` containing the joined data::
 
@@ -300,7 +300,7 @@ Filtering by Expressions
 :class:`.Table` and :class:`.Dataset` can
 both be filtered using a boolean :class:`.Expression`.
 
-The expression can be built starting from a 
+The expression can be built starting from a
 :func:`pyarrow.compute.field`. Comparisons and transformations
 can then be applied to one or more fields to build the filter
 expression you care about.
@@ -325,7 +325,7 @@ in column ``"nums"``
    by the ``bit_wise_and`` operation equals ``0``. Only the numbers where the last bit was ``0`` will
    return a ``0`` as the result of ``num & 1`` and as all numbers where the last bit is ``0`` are
    multiples of ``2`` we will be filtering for the even numbers only.
-   
+
 Once we have our filter, we can provide it to the :meth:`.Table.filter` method
 to filter our table only for the matching rows:
 
@@ -392,7 +392,7 @@ User-Defined Functions
 PyArrow allows defining and registering custom compute functions.
 These functions can then be called from Python as well as C++ (and potentially
 any other implementation wrapping Arrow C++, such as the R ``arrow`` package)
-using their registered function name. 
+using their registered function name.
 
 UDF support is limited to scalar functions. A scalar function is a function which
 executes elementwise operations on arrays or scalars. In general, the output of a
@@ -441,7 +441,7 @@ output type need to be defined. Using :func:`pyarrow.compute.register_scalar_fun
                               function_docs,
                               input_types,
                               output_type)
-   
+
 
 The implementation of a user-defined function always takes a first *context*
 parameter (named ``ctx`` in the example above) which is an instance of
@@ -497,9 +497,9 @@ the GCD of one column with the scalar value 30.  We will be re-using the
    category: [["A","B","C","D"]]
 
 Note that ``ds.field('')._call(...)`` returns a :func:`pyarrow.compute.Expression`.
-The arguments passed to this function call are expressions, not scalar values 
+The arguments passed to this function call are expressions, not scalar values
 (notice the difference between :func:`pyarrow.scalar` and :func:`pyarrow.compute.scalar`,
-the latter produces an expression). 
+the latter produces an expression).
 This expression is evaluated when the projection operator executes it.
 
 Projection Expressions
diff --git a/docs/source/python/data.rst b/docs/source/python/data.rst
index 9156157fcd0c2..4a0f2af6d4868 100644
--- a/docs/source/python/data.rst
+++ b/docs/source/python/data.rst
@@ -26,8 +26,8 @@ with memory buffers, like the ones explained in the documentation on
 :ref:`Memory and IO <io>`. These data structures are exposed in Python through
 a series of interrelated classes:
 
-* **Type Metadata**: Instances of ``pyarrow.DataType``, which describe a logical
-  array type
+* **Type Metadata**: Instances of ``pyarrow.DataType``, which describe the
+  type of an array and govern how its values are interpreted
 * **Schemas**: Instances of ``pyarrow.Schema``, which describe a named
   collection of types. These can be thought of as the column types in a
   table-like object.
@@ -55,8 +55,8 @@ array data. These include:
 * **Nested types**: list, map, struct, and union
 * **Dictionary type**: An encoded categorical type (more on this later)
 
-Each logical data type in Arrow has a corresponding factory function for
-creating an instance of that type object in Python:
+Each data type in Arrow has a corresponding factory function for creating
+an instance of that type object in Python:
 
 .. ipython:: python
 
@@ -72,11 +72,11 @@ creating an instance of that type object in Python:
    print(t4)
    print(t5)
 
-We use the name **logical type** because the **physical** storage may be the
-same for one or more types. For example, ``int64``, ``float64``, and
-``timestamp[ms]`` all occupy 64 bits per value.
+.. note::
+   Different data types might use a given physical storage. For example,
+   ``int64``, ``float64``, and ``timestamp[ms]`` all occupy 64 bits per value.
 
-These objects are `metadata`; they are used for describing the data in arrays,
+These objects are ``metadata``; they are used for describing the data in arrays,
 schemas, and record batches. In Python, they can be used in functions where the
 input data (e.g. Python objects) may be coerced to more than one Arrow type.
 
@@ -99,7 +99,7 @@ types' children. For example, we can define a list of int32 values with:
    t6 = pa.list_(t1)
    t6
 
-A `struct` is a collection of named fields:
+A ``struct`` is a collection of named fields:
 
 .. ipython:: python
 
@@ -561,7 +561,7 @@ schema without having to get any of the batches.::
 
 It can also be sent between languages using the :ref:`C stream interface <c-stream-interface>`.
 
-Conversion of RecordBatch do Tensor
+Conversion of RecordBatch to Tensor
 -----------------------------------
 
 Each array of the ``RecordBatch`` has it's own contiguous memory that is not necessarily
diff --git a/docs/source/python/dataset.rst b/docs/source/python/dataset.rst
index daab36f9a7be9..00469fd57becf 100644
--- a/docs/source/python/dataset.rst
+++ b/docs/source/python/dataset.rst
@@ -575,28 +575,28 @@ Partitioning performance considerations
 
 Partitioning datasets has two aspects that affect performance: it increases the number of
 files and it creates a directory structure around the files. Both of these have benefits
-as well as costs. Depending on the configuration and the size of your dataset, the costs 
-can outweigh the benefits. 
+as well as costs. Depending on the configuration and the size of your dataset, the costs
+can outweigh the benefits.
 
-Because partitions split up the dataset into multiple files, partitioned datasets can be 
-read and written with parallelism. However, each additional file adds a little overhead in 
-processing for filesystem interaction. It also increases the overall dataset size since 
+Because partitions split up the dataset into multiple files, partitioned datasets can be
+read and written with parallelism. However, each additional file adds a little overhead in
+processing for filesystem interaction. It also increases the overall dataset size since
 each file has some shared metadata. For example, each parquet file contains the schema and
-group-level statistics. The number of partitions is a floor for the number of files. If 
-you partition a dataset by date with a year of data, you will have at least 365 files. If 
-you further partition by another dimension with 1,000 unique values, you will have up to 
+group-level statistics. The number of partitions is a floor for the number of files. If
+you partition a dataset by date with a year of data, you will have at least 365 files. If
+you further partition by another dimension with 1,000 unique values, you will have up to
 365,000 files. This fine of partitioning often leads to small files that mostly consist of
 metadata.
 
-Partitioned datasets create nested folder structures, and those allow us to prune which 
+Partitioned datasets create nested folder structures, and those allow us to prune which
 files are loaded in a scan. However, this adds overhead to discovering files in the dataset,
 as we'll need to recursively "list directory" to find the data files. Too fine
 partitions can cause problems here: Partitioning a dataset by date for a years worth
-of data will require 365 list calls to find all the files; adding another column with 
+of data will require 365 list calls to find all the files; adding another column with
 cardinality 1,000 will make that 365,365 calls.
 
 The most optimal partitioning layout will depend on your data, access patterns, and which
-systems will be reading the data. Most systems, including Arrow, should work across a 
+systems will be reading the data. Most systems, including Arrow, should work across a
 range of file sizes and partitioning layouts, but there are extremes you should avoid. These
 guidelines can help avoid some known worst cases:
 
@@ -611,35 +611,35 @@ of file size. Arrow's file writer provides sensible defaults for group sizing in
 Configuring files open during a write
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-When writing data to the disk, there are a few parameters that can be 
+When writing data to the disk, there are a few parameters that can be
 important to optimize the writes, such as the number of rows per file and
 the maximum number of open files allowed during the write.
 
 Set the maximum number of files opened with the ``max_open_files`` parameter of
 :meth:`write_dataset`.
 
-If  ``max_open_files`` is set greater than 0 then this will limit the maximum 
+If  ``max_open_files`` is set greater than 0 then this will limit the maximum
 number of files that can be left open. This only applies to writing partitioned
 datasets, where rows are dispatched to the appropriate file depending on their
 partition values. If an attempt is made to open too many  files then the least
 recently used file will be closed.  If this setting is set too low you may end
 up fragmenting your data into many small files.
 
-If your process is concurrently using other file handlers, either with a 
-dataset scanner or otherwise, you may hit a system file handler limit. For 
+If your process is concurrently using other file handlers, either with a
+dataset scanner or otherwise, you may hit a system file handler limit. For
 example, if you are scanning a dataset with 300 files and writing out to
 900 files, the total of 1200 files may be over a system limit. (On Linux,
 this might be a "Too Many Open Files" error.) You can either reduce this
 ``max_open_files`` setting or increase the file handler limit on your
 system. The default value is 900 which allows some number of files
-to be open by the scanner before hitting the default Linux limit of 1024. 
+to be open by the scanner before hitting the default Linux limit of 1024.
 
-Another important configuration used in :meth:`write_dataset` is ``max_rows_per_file``. 
+Another important configuration used in :meth:`write_dataset` is ``max_rows_per_file``.
 
 Set the maximum number of rows written in each file with the ``max_rows_per_files``
 parameter of :meth:`write_dataset`.
 
-If ``max_rows_per_file`` is set greater than 0 then this will limit how many 
+If ``max_rows_per_file`` is set greater than 0 then this will limit how many
 rows are placed in any single file. Otherwise there will be no limit and one
 file will be created in each output directory unless files need to be closed to respect
 ``max_open_files``. This setting is the primary way to control file size.
@@ -653,22 +653,22 @@ Configuring rows per group during a write
 
 The volume of data written to the disk per each group can be configured.
 This configuration includes a lower and an upper bound.
-The minimum number of rows required to form a row group is 
+The minimum number of rows required to form a row group is
 defined with the ``min_rows_per_group`` parameter of :meth:`write_dataset`.
 
 .. note::
-    If ``min_rows_per_group`` is set greater than 0 then this will cause the 
-    dataset writer to batch incoming data and only write the row groups to the 
-    disk when sufficient rows have accumulated. The final row group size may be 
-    less than this value if other options such as ``max_open_files`` or 
+    If ``min_rows_per_group`` is set greater than 0 then this will cause the
+    dataset writer to batch incoming data and only write the row groups to the
+    disk when sufficient rows have accumulated. The final row group size may be
+    less than this value if other options such as ``max_open_files`` or
     ``max_rows_per_file`` force smaller row group sizes.
 
 The maximum number of rows allowed per group is defined with the
 ``max_rows_per_group`` parameter of :meth:`write_dataset`.
 
-If ``max_rows_per_group`` is set greater than 0 then the dataset writer may split 
-up large incoming batches into multiple row groups.  If this value is set then 
-``min_rows_per_group`` should also be set or else you may end up with very small 
+If ``max_rows_per_group`` is set greater than 0 then the dataset writer may split
+up large incoming batches into multiple row groups.  If this value is set then
+``min_rows_per_group`` should also be set or else you may end up with very small
 row groups (e.g. if the incoming row group size is just barely larger than this value).
 
 Row groups are built into the Parquet and IPC/Feather formats but don't affect JSON or CSV.
@@ -719,7 +719,7 @@ Customizing & inspecting written files
 By default the dataset API will create files named "part-i.format" where "i" is a integer
 generated during the write and "format" is the file format specified in the write_dataset
 call.  For simple datasets it may be possible to know which files will be created but for
-larger or partitioned datasets it is not so easy.  The ``file_visitor`` keyword can be used 
+larger or partitioned datasets it is not so easy.  The ``file_visitor`` keyword can be used
 to supply a visitor that will be called as each file is created:
 
 .. ipython:: python
diff --git a/docs/source/python/dlpack.rst b/docs/source/python/dlpack.rst
index f612ebabde5c9..024c2800e1107 100644
--- a/docs/source/python/dlpack.rst
+++ b/docs/source/python/dlpack.rst
@@ -90,4 +90,4 @@ Convert a PyArrow CPU array to PyTorch tensor:
 
     >>> import torch
     >>> torch.from_dlpack(array)
-    tensor([2, 0, 2, 4])    
+    tensor([2, 0, 2, 4])
diff --git a/docs/source/python/extending_types.rst b/docs/source/python/extending_types.rst
index b7261005e66ee..d746505348157 100644
--- a/docs/source/python/extending_types.rst
+++ b/docs/source/python/extending_types.rst
@@ -37,14 +37,14 @@ under the hood, you can implement the following methods on those objects:
 
 - ``__arrow_c_schema__`` for schema or type-like objects.
 - ``__arrow_c_array__`` for arrays and record batches (contiguous tables).
-- ``__arrow_c_stream__`` for chunked tables or streams of data.
+- ``__arrow_c_stream__`` for chunked arrays, tables and streams of data.
 
 Those methods return `PyCapsule <https://docs.python.org/3/c-api/capsule.html>`__
 objects, and more details on the exact semantics can be found in the
 :ref:`specification <arrow-pycapsule-interface>`.
 
 When your data structures have those methods defined, the PyArrow constructors
-(such as :func:`pyarrow.array` or :func:`pyarrow.table`) will recognize those objects as
+(see below) will recognize those objects as
 supporting this protocol, and convert them to PyArrow data structures zero-copy. And the
 same can be true for any other library supporting this protocol on ingesting data.
 
@@ -53,6 +53,31 @@ support for this protocol by checking for the presence of those methods, and
 therefore accept any Arrow data (instead of harcoding support for a specific
 Arrow producer such as PyArrow).
 
+For consuming data through this protocol with PyArrow, the following constructors
+can be used to create the various PyArrow objects:
+
++----------------------------+-----------------------------------------------+--------------------+
+| Result class               | PyArrow constructor                           | Supported protocol |
++============================+===============================================+====================+
+| :class:`Array`             | :func:`pyarrow.array`                         | array              |
++----------------------------+-----------------------------------------------+--------------------+
+| :class:`ChunkedArray`      | :func:`pyarrow.chunked_array`                 | array, stream      |
++----------------------------+-----------------------------------------------+--------------------+
+| :class:`RecordBatch`       | :func:`pyarrow.record_batch`                  | array              |
++----------------------------+-----------------------------------------------+--------------------+
+| :class:`Table`             | :func:`pyarrow.table`                         | array, stream      |
++----------------------------+-----------------------------------------------+--------------------+
+| :class:`RecordBatchReader` | :meth:`pyarrow.RecordBatchReader.from_stream` | stream             |
++----------------------------+-----------------------------------------------+--------------------+
+| :class:`Field`             | :func:`pyarrow.field`                         | schema             |
++----------------------------+-----------------------------------------------+--------------------+
+| :class:`Schema`            | :func:`pyarrow.schema`                        | schema             |
++----------------------------+-----------------------------------------------+--------------------+
+
+A :class:`DataType` can be created by consuming the schema-compatible object
+using :func:`pyarrow.field` and then accessing the ``.type`` of the resulting
+Field.
+
 .. _arrow_array_protocol:
 
 Controlling conversion to pyarrow.Array with the ``__arrow_array__`` protocol
@@ -76,7 +101,7 @@ define the ``__arrow_array__`` method to return an Arrow array::
             import pyarrow
             return pyarrow.array(..., type=type)
 
-The ``__arrow_array__`` method takes an optional `type` keyword which is passed
+The ``__arrow_array__`` method takes an optional ``type`` keyword which is passed
 through from :func:`pyarrow.array`. The method is allowed to return either
 a :class:`~pyarrow.Array` or a :class:`~pyarrow.ChunkedArray`.
 
@@ -93,7 +118,7 @@ Defining extension types ("user-defined types")
 
 Arrow has the notion of extension types in the metadata specification as a
 possibility to extend the built-in types. This is done by annotating any of the
-built-in Arrow logical types (the "storage type") with a custom type name and
+built-in Arrow data types (the "storage type") with a custom type name and
 optional serialized representation ("ARROW:extension:name" and
 "ARROW:extension:metadata" keys in the Field’s custom_metadata of an IPC
 message).
diff --git a/docs/source/python/filesystems.rst b/docs/source/python/filesystems.rst
index 5309250351d8e..23d10aaaad720 100644
--- a/docs/source/python/filesystems.rst
+++ b/docs/source/python/filesystems.rst
@@ -182,7 +182,7 @@ Example how you can read contents from a S3 bucket::
 
 
 Note that it is important to configure :class:`S3FileSystem` with the correct
-region for the bucket being used. If `region` is not set, the AWS SDK will
+region for the bucket being used. If ``region`` is not set, the AWS SDK will
 choose a value, defaulting to 'us-east-1' if the SDK version is <1.8.
 Otherwise it will try to use a variety of heuristics (environment variables,
 configuration profile, EC2 metadata server) to resolve the region.
@@ -233,7 +233,7 @@ generate a credentials file in the default location::
 
 To connect to a public bucket without using any credentials, you must pass
 ``anonymous=True`` to :class:`GcsFileSystem`. Otherwise, the filesystem
-will report ``Couldn't resolve host name`` since there are different host 
+will report ``Couldn't resolve host name`` since there are different host
 names for authenticated and public access.
 
 Example showing how you can read contents from a GCS bucket::
@@ -277,7 +277,7 @@ load time, since the library may not be in your LD_LIBRARY_PATH), and relies on
 some environment variables.
 
 * ``HADOOP_HOME``: the root of your installed Hadoop distribution. Often has
-  `lib/native/libhdfs.so`.
+  ``lib/native/libhdfs.so``.
 
 * ``JAVA_HOME``: the location of your Java SDK installation.
 
@@ -314,7 +314,7 @@ For example::
    # using this to read a partitioned dataset
    import pyarrow.dataset as ds
    ds.dataset("data/", filesystem=fs)
-   
+
 Similarly for Azure Blob Storage::
 
    import adlfs
diff --git a/docs/source/python/flight.rst b/docs/source/python/flight.rst
index f07b9511ccf68..b63d256547de0 100644
--- a/docs/source/python/flight.rst
+++ b/docs/source/python/flight.rst
@@ -17,6 +17,7 @@
 
 .. currentmodule:: pyarrow.flight
 .. highlight:: python
+.. _flight:
 
 ================
 Arrow Flight RPC
diff --git a/docs/source/python/getstarted.rst b/docs/source/python/getstarted.rst
index d38fcadab288f..42e415c40b835 100644
--- a/docs/source/python/getstarted.rst
+++ b/docs/source/python/getstarted.rst
@@ -37,7 +37,7 @@ in tabular data.
 
 Arrow also provides support for various formats to get those tabular
 data in and out of disk and networks. Most commonly used formats are
-Parquet (:ref:`parquet`) and the IPC format (:ref:`ipc`). 
+Parquet (:ref:`parquet`) and the IPC format (:ref:`ipc`).
 
 Creating Arrays and Tables
 --------------------------
@@ -63,7 +63,7 @@ in tabular data when attached to a column name
 
     birthdays_table = pa.table([days, months, years],
                                names=["days", "months", "years"])
-    
+
     birthdays_table
 
 See :ref:`data` for more details.
@@ -75,7 +75,7 @@ Once you have tabular data, Arrow provides out of the box
 the features to save and restore that data for common formats
 like Parquet:
 
-.. ipython:: python   
+.. ipython:: python
 
     import pyarrow.parquet as pq
 
@@ -92,14 +92,14 @@ data will be as quick as possible
     reloaded_birthdays
 
 Saving and loading back data in arrow is usually done through
-:ref:`Parquet <parquet>`, :ref:`IPC format <ipc>` (:ref:`feather`), 
+:ref:`Parquet <parquet>`, :ref:`IPC format <ipc>` (:ref:`feather`),
 :ref:`CSV <py-csv>` or :ref:`Line-Delimited JSON <json>` formats.
 
 Performing Computations
 -----------------------
 
 Arrow ships with a bunch of compute functions that can be applied
-to its arrays and tables, so through the compute functions 
+to its arrays and tables, so through the compute functions
 it's possible to apply transformations to the data
 
 .. ipython:: python
@@ -122,7 +122,7 @@ smaller chunks
 
     import pyarrow.dataset as ds
 
-    ds.write_dataset(birthdays_table, "savedir", format="parquet", 
+    ds.write_dataset(birthdays_table, "savedir", format="parquet",
                      partitioning=ds.partitioning(
                         pa.schema([birthdays_table.schema.field("years")])
                     ))
@@ -151,8 +151,8 @@ how to project them, etc., refer to :ref:`dataset` documentation.
 Continuing from here
 --------------------
 
-For digging further into Arrow, you might want to read the 
-:doc:`PyArrow Documentation <./index>` itself or the 
+For digging further into Arrow, you might want to read the
+:doc:`PyArrow Documentation <./index>` itself or the
 `Arrow Python Cookbook <https://arrow.apache.org/cookbook/py/>`_
 
 
diff --git a/docs/source/python/getting_involved.rst b/docs/source/python/getting_involved.rst
index 7b3bcf2ac527a..9fda3c7c78488 100644
--- a/docs/source/python/getting_involved.rst
+++ b/docs/source/python/getting_involved.rst
@@ -54,7 +54,7 @@ used as foundations to build easier to use entities.
   exposed to the user are declared. In some cases, those files might directly
   import the entities from inner implementation if they want to expose it
   as is without modification.
-* The ``lib.pyx`` file is where the majority of the core C++ libarrow 
+* The ``lib.pyx`` file is where the majority of the core C++ libarrow
   capabilities are exposed to Python. Most of the implementation of this
   module relies on included ``*.pxi`` files where the specific pieces
   are built. While being exposed to Python as ``pyarrow.lib`` its content
@@ -73,4 +73,4 @@ used as foundations to build easier to use entities.
   PyArrow is also based on PyArrow C++, dedicated pieces of code that live in
   ``python/pyarrow/src/arrow/python`` directory and provide the low level
   code for capabilities like converting to and from numpy or pandas and the classes
-  that allow to use Python objects and callbacks in C++.
\ No newline at end of file
+  that allow to use Python objects and callbacks in C++.
diff --git a/docs/source/python/install.rst b/docs/source/python/install.rst
index 4b966e6d2653d..84d6253691f09 100644
--- a/docs/source/python/install.rst
+++ b/docs/source/python/install.rst
@@ -39,6 +39,13 @@ Install the latest version of PyArrow from
 
     conda install -c conda-forge pyarrow
 
+.. note::
+
+    While the ``pyarrow`` `conda-forge <https://conda-forge.org/>`_ package is
+    the right choice for most users, both a minimal and maximal variant of the
+    package exist, either of which may be better for your use case. See
+    :ref:`python-conda-differences`.
+
 Using Pip
 ---------
 
@@ -83,7 +90,7 @@ While Arrow uses the OS-provided timezone database on Linux and macOS, it requir
 user-provided database on Windows. To download and extract the text version of
 the IANA timezone database follow the instructions in the C++
 :ref:`download-timezone-database` or use pyarrow utility function
-`pyarrow.util.download_tzdata_on_windows()` that does the same.
+``pyarrow.util.download_tzdata_on_windows()`` that does the same.
 
 By default, the timezone database will be detected at ``%USERPROFILE%\Downloads\tzdata``.
 If the database has been downloaded in a different location, you will need to set
@@ -93,3 +100,85 @@ a custom path to the database from Python:
 
    >>> import pyarrow as pa
    >>> pa.set_timezone_db_path("custom_path")
+
+
+.. _python-conda-differences:
+
+Differences between conda-forge packages
+----------------------------------------
+
+On `conda-forge <https://conda-forge.org/>`_, PyArrow is published as three
+separate packages, each providing varying levels of functionality. This is in
+contrast to PyPi, where only a single PyArrow package is provided.
+
+The purpose of this split is to minimize the size of the installed package for
+most users (``pyarrow``), provide a smaller, minimal package for specialized use
+cases (``pyarrow-core``), while still providing a complete package for users who
+require it (``pyarrow-all``). What was historically ``pyarrow`` on
+`conda-forge <https://conda-forge.org/>`_ is now ``pyarrow-all``, though most
+users can continue using ``pyarrow``.
+
+The ``pyarrow-core`` package includes the following functionality:
+
+- :ref:`data`
+- :ref:`compute` (i.e., ``pyarrow.compute``)
+- :ref:`io`
+- :ref:`ipc` (i.e., ``pyarrow.ipc``)
+- :ref:`filesystem` (i.e., ``pyarrow.fs``. Note: It's planned to move cloud fileystems (i.e., :ref:`S3<filesystem-s3>`, :ref:`GCS<filesystem-gcs>`, etc) into ``pyarrow`` in a future release though :ref:`filesystem-localfs` will remain in ``pyarrow-core``.)
+- File formats: :ref:`Arrow/Feather<feather>`, :ref:`JSON<json>`, :ref:`CSV<py-csv>`, :ref:`ORC<orc>` (but not Parquet)
+
+The ``pyarrow`` package adds the following:
+
+- Acero (i.e., ``pyarrow.acero``)
+- :ref:`dataset` (i.e., ``pyarrow.dataset``)
+- :ref:`Parquet<parquet>` (i.e., ``pyarrow.parquet``)
+- Substrait (i.e., ``pyarrow.substrait``)
+
+Finally, ``pyarrow-all`` adds:
+
+- :ref:`flight` and Flight SQL (i.e., ``pyarrow.flight``)
+- Gandiva  (i.e., ``pyarrow.gandiva``)
+
+The following table lists the functionality provided by each package and may be
+useful when deciding to use one package over another or when
+:ref:`python-conda-custom-selection`.
+
++------------+---------------------+--------------+---------+-------------+
+| Component  | Package             | pyarrow-core | pyarrow | pyarrow-all |
++------------+---------------------+--------------+---------+-------------+
+| Core       | pyarrow-core        | ✓            | ✓       | ✓           |
++------------+---------------------+--------------+---------+-------------+
+| Parquet    | libparquet          |              | ✓       | ✓           |
++------------+---------------------+--------------+---------+-------------+
+| Dataset    | libarrow-dataset    |              | ✓       | ✓           |
++------------+---------------------+--------------+---------+-------------+
+| Acero      | libarrow-acero      |              | ✓       | ✓           |
++------------+---------------------+--------------+---------+-------------+
+| Substrait  | libarrow-substrait  |              | ✓       | ✓           |
++------------+---------------------+--------------+---------+-------------+
+| Flight     | libarrow-flight     |              |         | ✓           |
++------------+---------------------+--------------+---------+-------------+
+| Flight SQL | libarrow-flight-sql |              |         | ✓           |
++------------+---------------------+--------------+---------+-------------+
+| Gandiva    | libarrow-gandiva    |              |         | ✓           |
++------------+---------------------+--------------+---------+-------------+
+
+.. _python-conda-custom-selection:
+
+Creating A Custom Selection
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If you know which components you need and want to control what's installed, you
+can create a custom selection of packages to include only the extra features you
+need. For example, to install ``pyarrow-core`` and add support for reading and
+writing Parquet, install ``libparquet`` alongside ``pyarrow-core``:
+
+.. code-block:: shell
+
+    conda install -c conda-forge pyarrow-core libparquet
+
+Or if you wish to use ``pyarrow`` but need support for Flight RPC:
+
+.. code-block:: shell
+
+    conda install -c conda-forge pyarrow libarrow-flight
diff --git a/docs/source/python/integration/extending.rst b/docs/source/python/integration/extending.rst
index b380fea7e902c..d4d099bcf43c8 100644
--- a/docs/source/python/integration/extending.rst
+++ b/docs/source/python/integration/extending.rst
@@ -474,7 +474,7 @@ Toolchain Compatibility (Linux)
 
 The Python wheels for Linux are built using the
 `PyPA manylinux images <https://quay.io/organization/pypa>`_ which use
-the CentOS `devtoolset-9`. In addition to the other notes
+the CentOS ``devtoolset-9``. In addition to the other notes
 above, if you are compiling C++ using these shared libraries, you will need
 to make sure you use a compatible toolchain as well or you might see a
 segfault during runtime.
diff --git a/docs/source/python/integration/python_r.rst b/docs/source/python/integration/python_r.rst
index 20627c3782d3c..ec5dfc366fdf9 100644
--- a/docs/source/python/integration/python_r.rst
+++ b/docs/source/python/integration/python_r.rst
@@ -29,7 +29,7 @@ marshaling and unmarshaling data.
 
     The article takes for granted that you have a ``Python`` environment
     with ``pyarrow`` correctly installed and an ``R`` environment with
-    ``arrow`` library correctly installed. 
+    ``arrow`` library correctly installed.
     See `Python Install Instructions <https://arrow.apache.org/docs/python/install.html>`_
     and `R Install instructions <https://arrow.apache.org/docs/r/#installation>`_
     for further details.
@@ -52,7 +52,7 @@ We could save such a function in a ``addthree.R`` file so that we can
 make it available for reuse.
 
 Once the ``addthree.R`` file is created we can invoke any of its functions
-from Python using the 
+from Python using the
 `rpy2 <https://rpy2.github.io/doc/latest/html/index.html>`_ library which
 enables a R runtime within the Python interpreter.
 
@@ -91,12 +91,12 @@ to access the ``R`` function and print the expected result:
 
 .. code-block:: bash
 
-    $ python addthree.py 
+    $ python addthree.py
     6
 
 If instead of passing around basic data types we want to pass around
 Arrow Arrays, we can do so relying on the
-`rpy2-arrow <https://rpy2.github.io/rpy2-arrow/version/main/html/index.html>`_ 
+`rpy2-arrow <https://rpy2.github.io/rpy2-arrow/version/main/html/index.html>`_
 module which implements ``rpy2`` support for Arrow types.
 
 ``rpy2-arrow`` can be installed through ``pip``:
@@ -189,7 +189,7 @@ Invoking the ``addthree.R`` script will print the outcome of adding
 
 .. code-block:: bash
 
-    $ R --silent -f addthree.R 
+    $ R --silent -f addthree.R
     Array
     <double>
     [
@@ -219,7 +219,7 @@ necessary to import an Arrow Array in R from the C Data interface.
 That work will be done by the ``addthree_cdata`` function which invokes the
 ``addthree`` function once the Array is imported.
 
-Our ``addthree.R`` will thus have both the ``addthree_cdata`` and the 
+Our ``addthree.R`` will thus have both the ``addthree_cdata`` and the
 ``addthree`` functions:
 
 .. code-block:: R
@@ -261,7 +261,7 @@ Our ``addthree.py`` will thus become:
     # Import the pyarrow module that provides access to the C Data interface
     from pyarrow.cffi import ffi as arrow_c
 
-    # Allocate structures where we will export the Array data 
+    # Allocate structures where we will export the Array data
     # and the Array schema. They will be released when we exit the with block.
     with arrow_c.new("struct ArrowArray*") as c_array, \
          arrow_c.new("struct ArrowSchema*") as c_schema:
@@ -274,7 +274,7 @@ Our ``addthree.py`` will thus become:
         array.type._export_to_c(c_schema_ptr)
 
         # Invoke the R addthree_cdata function passing the references
-        # to the array and schema C Data structures. 
+        # to the array and schema C Data structures.
         # Those references are passed as strings as R doesn't have
         # native support for 64bit integers, so the integers are
         # converted to their string representation for R to convert it back.
@@ -289,19 +289,19 @@ Our ``addthree.py`` will thus become:
         # Once the returned array is exported to a C Data infrastructure
         # we can import it back into pyarrow using Array._import_from_c
         py_array = pyarrow.Array._import_from_c(c_array_ptr, c_schema_ptr)
-    
+
     print("RESULT", py_array)
 
 Running the newly changed ``addthree.py`` will now print the Array resulting
-from adding ``3`` to all the elements of the original 
+from adding ``3`` to all the elements of the original
 ``pyarrow.array((1, 2, 3))`` array:
 
 .. code-block:: bash
 
-    $ python addthree.py 
+    $ python addthree.py
     R[write to console]: Attaching package: ‘arrow’
     RESULT [
       4,
       5,
       6
-    ]
\ No newline at end of file
+    ]
diff --git a/docs/source/python/ipc.rst b/docs/source/python/ipc.rst
index 27cd14a68853d..f55e8f8bc5dc3 100644
--- a/docs/source/python/ipc.rst
+++ b/docs/source/python/ipc.rst
@@ -76,12 +76,12 @@ this one can be created with :func:`~pyarrow.ipc.new_stream`:
 .. ipython:: python
 
    sink = pa.BufferOutputStream()
-   
+
    with pa.ipc.new_stream(sink, batch.schema) as writer:
       for i in range(5):
          writer.write_batch(batch)
 
-Here we used an in-memory Arrow buffer stream (``sink``), 
+Here we used an in-memory Arrow buffer stream (``sink``),
 but this could have been a socket or some other IO sink.
 
 When creating the ``StreamWriter``, we pass the schema, since the schema
@@ -102,7 +102,7 @@ convenience function ``pyarrow.ipc.open_stream``:
    with pa.ipc.open_stream(buf) as reader:
          schema = reader.schema
          batches = [b for b in reader]
-   
+
    schema
    len(batches)
 
@@ -126,7 +126,7 @@ The :class:`~pyarrow.RecordBatchFileWriter` has the same API as
 .. ipython:: python
 
    sink = pa.BufferOutputStream()
-   
+
    with pa.ipc.new_file(sink, batch.schema) as writer:
       for i in range(10):
          writer.write_batch(batch)
@@ -164,7 +164,7 @@ DataFrame output:
 
    with pa.ipc.open_file(buf) as reader:
       df = reader.read_pandas()
-   
+
    df[:5]
 
 Efficiently Writing and Reading Arrow Data
diff --git a/docs/source/python/json.rst b/docs/source/python/json.rst
index 99ecbc19a1230..eff6135d895a7 100644
--- a/docs/source/python/json.rst
+++ b/docs/source/python/json.rst
@@ -21,7 +21,7 @@
 Reading JSON files
 ==================
 
-Arrow supports reading columnar data from line-delimited JSON files. 
+Arrow supports reading columnar data from line-delimited JSON files.
 In this context, a JSON file consists of multiple JSON objects, one per line,
 representing individual data rows.  For example, this file represents
 two rows of data with four columns "a", "b", "c", "d":
diff --git a/docs/source/python/memory.rst b/docs/source/python/memory.rst
index 23474b923718d..7b49d48ab20fa 100644
--- a/docs/source/python/memory.rst
+++ b/docs/source/python/memory.rst
@@ -46,7 +46,7 @@ parent-child relationships.
 
 There are many implementations of ``arrow::Buffer``, but they all provide a
 standard interface: a data pointer and length. This is similar to Python's
-built-in `buffer protocol` and ``memoryview`` objects.
+built-in ``buffer protocol`` and ``memoryview`` objects.
 
 A :class:`Buffer` can be created from any Python object implementing
 the buffer protocol by calling the :func:`py_buffer` function. Let's consider
diff --git a/docs/source/python/orc.rst b/docs/source/python/orc.rst
index bfa68fc34d895..76c293d742010 100644
--- a/docs/source/python/orc.rst
+++ b/docs/source/python/orc.rst
@@ -112,7 +112,7 @@ control various settings when writing an ORC file.
 
 * ``file_version``, the ORC format version to use.  ``'0.11'`` ensures
   compatibility with older readers, while ``'0.12'`` is the newer one.
-* ``stripe_size``, to control the approximate size of data within a column 
+* ``stripe_size``, to control the approximate size of data within a column
   stripe. This currently defaults to 64MB.
 
 See the :func:`~pyarrow.orc.write_table()` docstring for more details.
diff --git a/docs/source/python/parquet.rst b/docs/source/python/parquet.rst
index d4717897660b6..029ed4f1a3e15 100644
--- a/docs/source/python/parquet.rst
+++ b/docs/source/python/parquet.rst
@@ -32,7 +32,7 @@ performance data IO.
 
 Apache Arrow is an ideal in-memory transport layer for data that is being read
 or written with Parquet files. We have been concurrently developing the `C++
-implementation of 
+implementation of
 Apache Parquet <https://github.com/apache/arrow/tree/main/cpp/tools/parquet>`_,
 which includes a native, multithreaded C++ adapter to and from in-memory Arrow
 data. PyArrow includes Python bindings to this code, which thus enables reading
diff --git a/docs/source/python/timestamps.rst b/docs/source/python/timestamps.rst
index 64a2a354dddef..80a1b7280cbfa 100644
--- a/docs/source/python/timestamps.rst
+++ b/docs/source/python/timestamps.rst
@@ -24,7 +24,7 @@ Arrow/Pandas Timestamps
 
 Arrow timestamps are stored as a 64-bit integer with column metadata to
 associate a time unit (e.g. milliseconds, microseconds, or nanoseconds), and an
-optional time zone.  Pandas (`Timestamp`) uses a 64-bit integer representing
+optional time zone.  Pandas (``Timestamp``) uses a 64-bit integer representing
 nanoseconds and an optional time zone.
 Python/Pandas timestamp types without a associated time zone are referred to as
 "Time Zone Naive".  Python/Pandas timestamp types with an associated time zone are
@@ -51,8 +51,8 @@ This implies a few things when round-tripping timestamps:
 #.  Timezone information is lost (all timestamps that result from
     converting from spark to arrow/pandas are "time zone naive").
 #.  Timestamps are truncated to microseconds.
-#.  The session time zone might have unintuitive impacts on 
-    translation of timestamp values. 
+#.  The session time zone might have unintuitive impacts on
+    translation of timestamp values.
 
 Spark to Pandas (through Apache Arrow)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -62,8 +62,8 @@ The following cases assume the Spark configuration
 
 ::
 
-    >>> pdf = pd.DataFrame({'naive': [datetime(2019, 1, 1, 0)], 
-    ...                     'aware': [Timestamp(year=2019, month=1, day=1, 
+    >>> pdf = pd.DataFrame({'naive': [datetime(2019, 1, 1, 0)],
+    ...                     'aware': [Timestamp(year=2019, month=1, day=1,
     ...                               nanosecond=500, tz=timezone(timedelta(hours=-8)))]})
     >>> pdf
            naive                               aware
@@ -77,7 +77,7 @@ The following cases assume the Spark configuration
     +-------------------+-------------------+
     |2019-01-01 00:00:00|2019-01-01 08:00:00|
     +-------------------+-------------------+
-                    
+
 Note that conversion of the aware timestamp is shifted to reflect the time
 assuming UTC (it represents the same instant in time).  For naive
 timestamps, Spark treats them as being in the system local
@@ -129,7 +129,7 @@ session time zone is still PST:
    |2019-01-01 00:00:00|2019-01-01 00:00:00|
    +-------------------+-------------------+
 
-   
+
     >>> pst_df.toPandas()
     naive      aware
     0 2019-01-01 2019-01-01
@@ -141,7 +141,7 @@ session time zone is still PST:
     aware    1 non-null datetime64[ns]
     dtypes: datetime64[ns](2)
     memory usage: 96.0 bytes
-    
+
 Notice that, in addition to being a "time zone naive" timestamp, the 'aware'
 value will now differ when converting to an epoch offset.  Spark does the conversion
 by first converting to the session time zone (or system local time zone if
@@ -158,9 +158,9 @@ time:
   >>> (pst_df.toPandas()['aware'][0].timestamp()-pdf['aware'][0].timestamp())/3600
   -8.0
 
-The same type of conversion happens with the data frame converted while 
-the session time zone was UTC.  In this case both naive and aware 
-represent different instants in time (the naive instant is due to 
+The same type of conversion happens with the data frame converted while
+the session time zone was UTC.  In this case both naive and aware
+represent different instants in time (the naive instant is due to
 the change in session time zone between creating data frames):
 
 ::
@@ -179,9 +179,9 @@ the change in session time zone between creating data frames):
 Note that the surprising shift for aware doesn't happen
 when the session time zone is UTC (but the timestamps
 still become "time zone naive"):
-  
+
 ::
-  
+
   >>> spark.conf.set("spark.sql.session.timeZone", "UTC")
   >>> pst_df.show()
   +-------------------+-------------------+
@@ -189,7 +189,7 @@ still become "time zone naive"):
   +-------------------+-------------------+
   |2019-01-01 08:00:00|2019-01-01 08:00:00|
   +-------------------+-------------------+
-  
+
   >>> pst_df.toPandas()['aware'][0]
   Timestamp('2019-01-01 08:00:00')
   >>> pdf['aware'][0]
diff --git a/docs/source/status.rst b/docs/source/status.rst
index 9af2fd1921e22..266381175608a 100644
--- a/docs/source/status.rst
+++ b/docs/source/status.rst
@@ -28,129 +28,138 @@ stated, the Python, R, Ruby and C/GLib libraries follow the C++ Arrow library.
 Data Types
 ==========
 
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Data type         | C++   | Java  | Go    | JavaScript | C#    | Rust  | Julia | Swift |
-| (primitive)       |       |       |       |            |       |       |       |       |
-+===================+=======+=======+=======+============+=======+=======+=======+=======+
-| Null              | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Boolean           | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     | ✓     |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Int8/16/32/64     | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     | ✓     |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| UInt8/16/32/64    | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     | ✓     |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Float16           | ✓ (1) | ✓ (2) | ✓     | ✓          |  ✓ (3)|  ✓    | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Float32/64        | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     | ✓     |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Decimal128        | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Decimal256        | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Date32/64         | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     | ✓     |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Time32/64         | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     | ✓     |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Timestamp         | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Duration          | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Interval          | ✓     | ✓     | ✓     |            |  ✓    |  ✓    | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Fixed Size Binary | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Binary            | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     | ✓     |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Large Binary      | ✓     | ✓     | ✓     | ✓          |       |  ✓    | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Utf8              | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     | ✓     |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Large Utf8        | ✓     | ✓     | ✓     | ✓          |       |  ✓    | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Binary View       | ✓     |       | ✓     |            |   ✓   |       |       |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Large Binary View | ✓     |       | ✓     |            |       |       |       |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Utf8 View         | ✓     |       | ✓     |            |   ✓   |       |       |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Large Utf8 View   | ✓     |       | ✓     |            |       |       |       |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Data type         | C++   | Java  | Go    | JavaScript | C#    | Rust  | Julia | Swift |
-| (nested)          |       |       |       |            |       |       |       |       |
-+===================+=======+=======+=======+============+=======+=======+=======+=======+
-| Fixed Size List   | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| List              | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Large List        | ✓     | ✓     | ✓     |            |       |  ✓    | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| List View         | ✓     |       | ✓     |            |   ✓   |       |       |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Large List View   | ✓     |       | ✓     |            |       |       |       |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Struct            | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Map               | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Dense Union       | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Sparse Union      | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Data type         | C++   | Java  | Go    | JavaScript | C#    | Rust  | Julia | Swift |
-| (special)         |       |       |       |            |       |       |       |       |
-+===================+=======+=======+=======+============+=======+=======+=======+=======+
-| Dictionary        | ✓     | ✓ (4) | ✓     | ✓          | ✓     | ✓ (3) | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Extension         | ✓     | ✓     | ✓     |            |       | ✓     | ✓     |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Run-End Encoded   | ✓     |       | ✓     |            |       |       |       |       |
-+-------------------+-------+-------+-------+------------+-------+-------+-------+-------+
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Data type         | C++   | Java  | Go    | JS | C#    | Rust  | Julia | Swift | nanoarrow |
+| (primitive)       |       |       |       |    |       |       |       |       |           |
++===================+=======+=======+=======+====+=======+=======+=======+=======+===========+
+| Null              | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Boolean           | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     | ✓     | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Int8/16/32/64     | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     | ✓     | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| UInt8/16/32/64    | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     | ✓     | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Float16           | ✓     | ✓ (1) | ✓     | ✓  |  ✓ (2)|  ✓    | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Float32/64        | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     | ✓     | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Decimal128        | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Decimal256        | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Date32/64         | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     | ✓     | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Time32/64         | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     | ✓     | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Timestamp         | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Duration          | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Interval          | ✓     | ✓     | ✓     |    |  ✓    |  ✓    | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Fixed Size Binary | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Binary            | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     | ✓     | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Large Binary      | ✓     | ✓     | ✓     | ✓  |       |  ✓    | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Utf8              | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     | ✓     | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Large Utf8        | ✓     | ✓     | ✓     | ✓  |       |  ✓    | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Binary View       | ✓     |       | ✓     |    |   ✓   |       |       |       |           |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Large Binary View | ✓     |       | ✓     |    |       |       |       |       |           |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Utf8 View         | ✓     |       | ✓     |    |   ✓   |       |       |       |           |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Large Utf8 View   | ✓     |       | ✓     |    |       |       |       |       |           |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Data type         | C++   | Java  | Go    | JS | C#    | Rust  | Julia | Swift | nanoarrow |
+| (nested)          |       |       |       |    |       |       |       |       |           |
++===================+=======+=======+=======+====+=======+=======+=======+=======+===========+
+| Fixed Size List   | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| List              | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Large List        | ✓     | ✓     | ✓     |    |       |  ✓    | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| List View         | ✓     |       | ✓     |    |   ✓   |       |       |       |           |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Large List View   | ✓     |       | ✓     |    |       |       |       |       |           |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Struct            | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Map               | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Dense Union       | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Sparse Union      | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Data type         | C++   | Java  | Go    | JS | C#    | Rust  | Julia | Swift | nanoarrow |
+| (special)         |       |       |       |    |       |       |       |       |           |
++===================+=======+=======+=======+====+=======+=======+=======+=======+===========+
+| Dictionary        | ✓     | ✓ (3) | ✓     | ✓  | ✓     | ✓ (3) | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Extension         | ✓     | ✓     | ✓     |    |       | ✓     | ✓     |       | ✓         |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Run-End Encoded   | ✓     |       | ✓     |    |       |       |       |       |           |
++-------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+
++-----------------------+-------+-------+-------+------------+-------+-------+-------+-------+
+| Canonical             | C++   | Java  | Go    | JavaScript | C#    | Rust  | Julia | Swift |
+| Extension types       |       |       |       |            |       |       |       |       |
++=======================+=======+=======+=======+============+=======+=======+=======+=======+
+| Fixed shape tensor    | ✓     |       |       |            |       |       |       |       |
++-----------------------+-------+-------+-------+------------+-------+-------+-------+-------+
+| Variable shape tensor |       |       |       |            |       |       |       |       |
++-----------------------+-------+-------+-------+------------+-------+-------+-------+-------+
 
 Notes:
 
-* \(1) Casting to/from Float16 in C++ is not supported.
-* \(2) Casting to/from Float16 in Java is not supported.
-* \(3) Float16 support in C# is only available when targeting .NET 6+.
-* \(4) Nested dictionaries not supported
+* \(1) Casting to/from Float16 in Java is not supported.
+* \(2) Float16 support in C# is only available when targeting .NET 6+.
+* \(3) Nested dictionaries not supported
 
 .. seealso::
-   The :ref:`format_columnar` specification.
+   The :ref:`format_columnar` and the
+   :ref:`format_canonical_extensions` specification.
 
 
 IPC Format
 ==========
 
-+-----------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| IPC Feature                 | C++   | Java  | Go    | JavaScript | C#    | Rust  | Julia | Swift |
-|                             |       |       |       |            |       |       |       |       |
-+=============================+=======+=======+=======+============+=======+=======+=======+=======+
-| Arrow stream format         | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     | ✓     |
-+-----------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Arrow file format           | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     | ✓     |
-+-----------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Record batches              | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     | ✓     |
-+-----------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Dictionaries                | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     |       |
-+-----------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Replacement dictionaries    | ✓     | ✓     | ✓     |            |       |       | ✓     |       |
-+-----------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Delta dictionaries          | ✓ (1) |       | ✓ (1) | ✓          |  ✓    |       | ✓     |       |
-+-----------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Tensors                     | ✓     |       |       |            |       |       |       |       |
-+-----------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Sparse tensors              | ✓     |       |       |            |       |       |       |       |
-+-----------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Buffer compression          | ✓     | ✓ (3) | ✓     |            | ✓     |  ✓    | ✓     |       |
-+-----------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Endianness conversion       | ✓ (2) |       | ✓ (2) |            |       |       |       |       |
-+-----------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Custom schema metadata      | ✓     | ✓     | ✓     | ✓          |  ✓    |  ✓    | ✓     |       |
-+-----------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
++-----------------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| IPC Feature                 | C++   | Java  | Go    | JS | C#    | Rust  | Julia | Swift | nanoarrow |
+|                             |       |       |       |    |       |       |       |       |           |
++=============================+=======+=======+=======+====+=======+=======+=======+=======+===========+
+| Arrow stream format         | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     | ✓     | ✓ (4)     |
++-----------------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Arrow file format           | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     | ✓     |           |
++-----------------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Record batches              | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     | ✓     | ✓         |
++-----------------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Dictionaries                | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     |       |           |
++-----------------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Replacement dictionaries    | ✓     | ✓     | ✓     |    |       |       | ✓     |       |           |
++-----------------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Delta dictionaries          | ✓ (1) |       | ✓ (1) | ✓  |  ✓    |       | ✓     |       |           |
++-----------------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Tensors                     | ✓     |       |       |    |       |       |       |       |           |
++-----------------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Sparse tensors              | ✓     |       |       |    |       |       |       |       |           |
++-----------------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Buffer compression          | ✓     | ✓ (3) | ✓     |    | ✓     |  ✓    | ✓     |       |           |
++-----------------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Endianness conversion       | ✓ (2) |       | ✓ (2) |    |       |       |       |       | ✓ (2)     |
++-----------------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
+| Custom schema metadata      | ✓     | ✓     | ✓     | ✓  |  ✓    |  ✓    | ✓     |       | ✓         |
++-----------------------------+-------+-------+-------+----+-------+-------+-------+-------+-----------+
 
 Notes:
 
@@ -160,6 +169,8 @@ Notes:
 
 * \(3) LZ4 Codec currently is quite inefficient. ARROW-11901 tracks improving performance.
 
+* \(4) The nanoarrow IPC implementation is only implemented for reading IPC streams.
+
 .. seealso::
    The :ref:`format-ipc` specification.
 
@@ -168,57 +179,57 @@ Notes:
 Flight RPC
 ==========
 
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Flight RPC Transport                       | C++   | Java  | Go    | JavaScript | C#    | Rust  | Julia | Swift |
-+============================================+=======+=======+=======+============+=======+=======+=======+=======+
-| gRPC_ transport (grpc:, grpc+tcp:)         | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| gRPC domain socket transport (grpc+unix:)  | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| gRPC + TLS transport (grpc+tls:)           | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| UCX_ transport (ucx:)                      | ✓     |       |       |            |       |       |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| Flight RPC Transport                       | C++   | Java  | Go    | JS | C#    | Rust  | Julia | Swift |
++============================================+=======+=======+=======+====+=======+=======+=======+=======+
+| gRPC_ transport (grpc:, grpc+tcp:)         | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| gRPC domain socket transport (grpc+unix:)  | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| gRPC + TLS transport (grpc+tls:)           | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| UCX_ transport (ucx:)                      | ✓     |       |       |    |       |       |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
 
 Supported features in the gRPC transport:
 
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Flight RPC Feature                         | C++   | Java  | Go    | JavaScript | C#    | Rust  | Julia | Swift |
-+============================================+=======+=======+=======+============+=======+=======+=======+=======+
-| All RPC methods                            | ✓     | ✓     | ✓     |            | × (1) | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Authentication handlers                    | ✓     | ✓     | ✓     |            | ✓ (2) | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Call timeouts                              | ✓     | ✓     | ✓     |            |       | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Call cancellation                          | ✓     | ✓     | ✓     |            |       | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Concurrent client calls (3)                | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Custom middleware                          | ✓     | ✓     | ✓     |            |       | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| RPC error codes                            | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| Flight RPC Feature                         | C++   | Java  | Go    | JS | C#    | Rust  | Julia | Swift |
++============================================+=======+=======+=======+====+=======+=======+=======+=======+
+| All RPC methods                            | ✓     | ✓     | ✓     |    | ✓ (1) | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| Authentication handlers                    | ✓     | ✓     | ✓     |    | ✓ (2) | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| Call timeouts                              | ✓     | ✓     | ✓     |    |       | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| Call cancellation                          | ✓     | ✓     | ✓     |    |       | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| Concurrent client calls (3)                | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| Custom middleware                          | ✓     | ✓     | ✓     |    |       | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| RPC error codes                            | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
 
 Supported features in the UCX transport:
 
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Flight RPC Feature                         | C++   | Java  | Go    | JavaScript | C#    | Rust  | Julia | Swift |
-+============================================+=======+=======+=======+============+=======+=======+=======+=======+
-| All RPC methods                            | × (4) |       |       |            |       |       |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Authentication handlers                    |       |       |       |            |       |       |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Call timeouts                              |       |       |       |            |       |       |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Call cancellation                          |       |       |       |            |       |       |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Concurrent client calls                    | ✓ (5) |       |       |            |       |       |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Custom middleware                          |       |       |       |            |       |       |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| RPC error codes                            | ✓     |       |       |            |       |       |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| Flight RPC Feature                         | C++   | Java  | Go    | JS | C#    | Rust  | Julia | Swift |
++============================================+=======+=======+=======+====+=======+=======+=======+=======+
+| All RPC methods                            | ✓ (4) |       |       |    |       |       |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| Authentication handlers                    |       |       |       |    |       |       |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| Call timeouts                              |       |       |       |    |       |       |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| Call cancellation                          |       |       |       |    |       |       |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| Concurrent client calls                    | ✓ (5) |       |       |    |       |       |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| Custom middleware                          |       |       |       |    |       |       |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| RPC error codes                            | ✓     |       |       |    |       |       |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
 
 Notes:
 
@@ -246,55 +257,55 @@ The feature support refers to the client/server libraries only;
 databases which implement the Flight SQL protocol in turn will
 support/not support individual features.
 
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| Feature                                    | C++   | Java  | Go    | JavaScript | C#    | Rust  | Julia | Swift |
-+============================================+=======+=======+=======+============+=======+=======+=======+=======+
-| BeginSavepoint                             | ✓     | ✓     |       |            |       |       |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| BeginTransaction                           | ✓     | ✓     |       |            |       |       |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| CancelQuery                                | ✓     | ✓     |       |            |       |       |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| ClosePreparedStatement                     | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| CreatePreparedStatement                    | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| CreatePreparedSubstraitPlan                | ✓     | ✓     |       |            |       |       |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| EndSavepoint                               | ✓     | ✓     |       |            |       |       |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| EndTransaction                             | ✓     | ✓     |       |            |       |       |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| GetCatalogs                                | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| GetCrossReference                          | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| GetDbSchemas                               | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| GetExportedKeys                            | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| GetImportedKeys                            | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| GetPrimaryKeys                             | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| GetSqlInfo                                 | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| GetTables                                  | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| GetTableTypes                              | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| GetXdbcTypeInfo                            | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| PreparedStatementQuery                     | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| PreparedStatementUpdate                    | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| StatementSubstraitPlan                     | ✓     | ✓     |       |            |       |       |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| StatementQuery                             | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
-| StatementUpdate                            | ✓     | ✓     | ✓     |            | ✓     | ✓     |       |       |
-+--------------------------------------------+-------+-------+-------+------------+-------+-------+-------+-------+
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| Feature                                    | C++   | Java  | Go    | JS | C#    | Rust  | Julia | Swift |
++============================================+=======+=======+=======+====+=======+=======+=======+=======+
+| BeginSavepoint                             | ✓     | ✓     |       |    |       |       |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| BeginTransaction                           | ✓     | ✓     |       |    |       |       |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| CancelQuery                                | ✓     | ✓     |       |    |       |       |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| ClosePreparedStatement                     | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| CreatePreparedStatement                    | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| CreatePreparedSubstraitPlan                | ✓     | ✓     |       |    |       |       |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| EndSavepoint                               | ✓     | ✓     |       |    |       |       |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| EndTransaction                             | ✓     | ✓     |       |    |       |       |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| GetCatalogs                                | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| GetCrossReference                          | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| GetDbSchemas                               | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| GetExportedKeys                            | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| GetImportedKeys                            | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| GetPrimaryKeys                             | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| GetSqlInfo                                 | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| GetTables                                  | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| GetTableTypes                              | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| GetXdbcTypeInfo                            | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| PreparedStatementQuery                     | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| PreparedStatementUpdate                    | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| StatementSubstraitPlan                     | ✓     | ✓     |       |    |       |       |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| StatementQuery                             | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
+| StatementUpdate                            | ✓     | ✓     | ✓     |    | ✓     | ✓     |       |       |
++--------------------------------------------+-------+-------+-------+----+-------+-------+-------+-------+
 
 .. seealso::
    The :doc:`./format/FlightSql` specification.
@@ -302,18 +313,18 @@ support/not support individual features.
 C Data Interface
 ================
 
-+-----------------------------+-----+--------+---+------+----+------+--------+------+-------+-----+-------+
-| Feature                     | C++ | Python | R | Rust | Go | Java | C/GLib | Ruby | Julia | C#  | Swift |
-|                             |     |        |   |      |    |      |        |      |       |     |       |
-+=============================+=====+========+===+======+====+======+========+======+=======+=====+=======+
-| Schema export               | ✓   | ✓      | ✓ | ✓    | ✓  | ✓    | ✓      | ✓    |       | ✓   |       |
-+-----------------------------+-----+--------+---+------+----+------+--------+------+-------+-----+-------+
-| Array export                | ✓   | ✓      | ✓ | ✓    | ✓  | ✓    | ✓      | ✓    |       | ✓   |       |
-+-----------------------------+-----+--------+---+------+----+------+--------+------+-------+-----+-------+
-| Schema import               | ✓   | ✓      | ✓ | ✓    | ✓  | ✓    | ✓      | ✓    |       | ✓   |       |
-+-----------------------------+-----+--------+---+------+----+------+--------+------+-------+-----+-------+
-| Array import                | ✓   | ✓      | ✓ | ✓    | ✓  | ✓    | ✓      | ✓    |       | ✓   |       |
-+-----------------------------+-----+--------+---+------+----+------+--------+------+-------+-----+-------+
++-----------------------------+-----+--------+---+------+----+------+--------+------+-------+-----+-------+-----------+
+| Feature                     | C++ | Python | R | Rust | Go | Java | C/GLib | Ruby | Julia | C#  | Swift | nanoarrow |
+|                             |     |        |   |      |    |      |        |      |       |     |       |           |
++=============================+=====+========+===+======+====+======+========+======+=======+=====+=======+===========+
+| Schema export               | ✓   | ✓      | ✓ | ✓    | ✓  | ✓    | ✓      | ✓    |       | ✓   |       | ✓         |
++-----------------------------+-----+--------+---+------+----+------+--------+------+-------+-----+-------+-----------+
+| Array export                | ✓   | ✓      | ✓ | ✓    | ✓  | ✓    | ✓      | ✓    |       | ✓   |       | ✓         |
++-----------------------------+-----+--------+---+------+----+------+--------+------+-------+-----+-------+-----------+
+| Schema import               | ✓   | ✓      | ✓ | ✓    | ✓  | ✓    | ✓      | ✓    |       | ✓   |       | ✓         |
++-----------------------------+-----+--------+---+------+----+------+--------+------+-------+-----+-------+-----------+
+| Array import                | ✓   | ✓      | ✓ | ✓    | ✓  | ✓    | ✓      | ✓    |       | ✓   |       | ✓         |
++-----------------------------+-----+--------+---+------+----+------+--------+------+-------+-----+-------+-----------+
 
 .. seealso::
    The :ref:`C Data Interface <c-data-interface>` specification.
@@ -322,14 +333,14 @@ C Data Interface
 C Stream Interface
 ==================
 
-+-----------------------------+-----+--------+---+------+----+------+--------+------+-------+-----+-------+
-| Feature                     | C++ | Python | R | Rust | Go | Java | C/GLib | Ruby | Julia | C#  | Swift |
-|                             |     |        |   |      |    |      |        |      |       |     |       |
-+=============================+=====+========+===+======+====+======+========+======+=======+=====+=======+
-| Stream export               | ✓   | ✓      | ✓ | ✓    | ✓  |      | ✓      | ✓    |       | ✓   |       |
-+-----------------------------+-----+--------+---+------+----+------+--------+------+-------+-----+-------+
-| Stream import               | ✓   | ✓      | ✓ | ✓    | ✓  |      | ✓      | ✓    |       | ✓   |       |
-+-----------------------------+-----+--------+---+------+----+------+--------+------+-------+-----+-------+
++-----------------------------+-----+--------+---+------+----+------+--------+------+-------+-----+-------+-----------+
+| Feature                     | C++ | Python | R | Rust | Go | Java | C/GLib | Ruby | Julia | C#  | Swift | nanoarrow |
+|                             |     |        |   |      |    |      |        |      |       |     |       |           |
++=============================+=====+========+===+======+====+======+========+======+=======+=====+=======+===========+
+| Stream export               | ✓   | ✓      | ✓ | ✓    | ✓  |      | ✓      | ✓    |       | ✓   |       | ✓         |
++-----------------------------+-----+--------+---+------+----+------+--------+------+-------+-----+-------+-----------+
+| Stream import               | ✓   | ✓      | ✓ | ✓    | ✓  |      | ✓      | ✓    |       | ✓   |       | ✓         |
++-----------------------------+-----+--------+---+------+----+------+--------+------+-------+-----+-------+-----------+
 
 .. seealso::
    The :ref:`C Stream Interface <c-stream-interface>` specification.
@@ -338,18 +349,18 @@ C Stream Interface
 Third-Party Data Formats
 ========================
 
-+-----------------------------+---------+---------+-------+------------+-------+-------+-------+-------+
-| Format                      | C++     | Java    | Go    | JavaScript | C#    | Rust  | Julia | Swift |
-|                             |         |         |       |            |       |       |       |       |
-+=============================+=========+=========+=======+============+=======+=======+=======+=======+
-| Avro                        |         | R       |       |            |       |       |       |       |
-+-----------------------------+---------+---------+-------+------------+-------+-------+-------+-------+
-| CSV                         | R/W     | R (2)   | R/W   |            |       | R/W   | R/W   |       |
-+-----------------------------+---------+---------+-------+------------+-------+-------+-------+-------+
-| ORC                         | R/W     | R (1)   |       |            |       |       |       |       |
-+-----------------------------+---------+---------+-------+------------+-------+-------+-------+-------+
-| Parquet                     | R/W     | R (2)   | R/W   |            |       | R/W   |       |       |
-+-----------------------------+---------+---------+-------+------------+-------+-------+-------+-------+
++-----------------------------+---------+---------+-------+----+-------+-------+-------+-------+
+| Format                      | C++     | Java    | Go    | JS | C#    | Rust  | Julia | Swift |
+|                             |         |         |       |    |       |       |       |       |
++=============================+=========+=========+=======+====+=======+=======+=======+=======+
+| Avro                        |         | R       | R     |    |       |       |       |       |
++-----------------------------+---------+---------+-------+----+-------+-------+-------+-------+
+| CSV                         | R/W     | R (2)   | R/W   |    |       | R/W   | R/W   |       |
++-----------------------------+---------+---------+-------+----+-------+-------+-------+-------+
+| ORC                         | R/W     | R (1)   |       |    |       |       |       |       |
++-----------------------------+---------+---------+-------+----+-------+-------+-------+-------+
+| Parquet                     | R/W     | R (2)   | R/W   |    |       | R/W   |       |       |
++-----------------------------+---------+---------+-------+----+-------+-------+-------+-------+
 
 Notes:
 
diff --git a/format/FlightSql.proto b/format/FlightSql.proto
index 3282ee4f47304..6fca141d692a7 100644
--- a/format/FlightSql.proto
+++ b/format/FlightSql.proto
@@ -43,7 +43,6 @@ package arrow.flight.protocol.sql;
  * where there is one row per requested piece of metadata information.
  */
 message CommandGetSqlInfo {
-  option (experimental) = true;
 
   /*
    * Values are modelled after ODBC's SQLGetInfo() function. This information is intended to provide
@@ -135,6 +134,23 @@ enum SqlInfo {
    */
   FLIGHT_SQL_SERVER_CANCEL = 9;
 
+  /*
+   * Retrieves a boolean value indicating whether the Flight SQL Server supports executing
+   * bulk ingestion.
+   */
+   FLIGHT_SQL_SERVER_BULK_INGESTION = 10;
+
+  /*
+   * Retrieves a boolean value indicating whether transactions are supported for bulk ingestion. If not, invoking
+   * the method commit in the context of a bulk ingestion is a noop, and the isolation level is
+   * `arrow.flight.protocol.sql.SqlTransactionIsolationLevel.TRANSACTION_NONE`.
+   *
+   * Returns:
+   * - false: if bulk ingestion transactions are unsupported;
+   * - true: if bulk ingestion transactions are supported.
+   */
+   FLIGHT_SQL_SERVER_INGEST_TRANSACTIONS_SUPPORTED = 11;
+
   /*
    * Retrieves an int32 indicating the timeout (in milliseconds) for prepared statement handles.
    *
@@ -1114,7 +1130,6 @@ enum Searchable {
  * The returned data should be ordered by data_type and then by type_name.
  */
 message CommandGetXdbcTypeInfo {
-  option (experimental) = true;
 
   /*
    * Specifies the data type to search for the info.
@@ -1136,7 +1151,6 @@ message CommandGetXdbcTypeInfo {
  * The returned data should be ordered by catalog_name.
  */
 message CommandGetCatalogs {
-  option (experimental) = true;
 }
 
 /*
@@ -1154,7 +1168,6 @@ message CommandGetCatalogs {
  * The returned data should be ordered by catalog_name, then db_schema_name.
  */
 message CommandGetDbSchemas {
-  option (experimental) = true;
 
   /*
    * Specifies the Catalog to search for the tables.
@@ -1202,7 +1215,6 @@ message CommandGetDbSchemas {
  * The returned data should be ordered by catalog_name, db_schema_name, table_name, then table_type, followed by table_schema if requested.
  */
 message CommandGetTables {
-  option (experimental) = true;
 
   /*
    * Specifies the Catalog to search for the tables.
@@ -1255,7 +1267,6 @@ message CommandGetTables {
  * The returned data should be ordered by table_type.
  */
 message CommandGetTableTypes {
-  option (experimental) = true;
 }
 
 /*
@@ -1276,7 +1287,6 @@ message CommandGetTableTypes {
  * The returned data should be ordered by catalog_name, db_schema_name, table_name, key_name, then key_sequence.
  */
 message CommandGetPrimaryKeys {
-  option (experimental) = true;
 
   /*
    * Specifies the catalog to search for the table.
@@ -1331,7 +1341,6 @@ enum UpdateDeleteRules {
  * update_rule and delete_rule returns a byte that is equivalent to actions declared on UpdateDeleteRules enum.
  */
 message CommandGetExportedKeys {
-  option (experimental) = true;
 
   /*
    * Specifies the catalog to search for the foreign key table.
@@ -1382,7 +1391,6 @@ message CommandGetExportedKeys {
  *    - 4 = SET DEFAULT
  */
 message CommandGetImportedKeys {
-  option (experimental) = true;
 
   /*
    * Specifies the catalog to search for the primary key table.
@@ -1435,7 +1443,6 @@ message CommandGetImportedKeys {
  *    - 4 = SET DEFAULT
  */
 message CommandGetCrossReference {
-  option (experimental) = true;
 
   /**
    * The catalog name where the parent table is.
@@ -1482,7 +1489,6 @@ message CommandGetCrossReference {
  * Request message for the "CreatePreparedStatement" action on a Flight SQL enabled backend.
  */
 message ActionCreatePreparedStatementRequest {
-  option (experimental) = true;
 
   // The valid SQL string to create a prepared statement for.
   string query = 1;
@@ -1495,7 +1501,6 @@ message ActionCreatePreparedStatementRequest {
  * An embedded message describing a Substrait plan to execute.
  */
 message SubstraitPlan {
-  option (experimental) = true;
 
   // The serialized substrait.Plan to create a prepared statement for.
   // XXX(ARROW-16902): this is bytes instead of an embedded message
@@ -1512,7 +1517,6 @@ message SubstraitPlan {
  * Request message for the "CreatePreparedSubstraitPlan" action on a Flight SQL enabled backend.
  */
 message ActionCreatePreparedSubstraitPlanRequest {
-  option (experimental) = true;
 
   // The serialized substrait.Plan to create a prepared statement for.
   SubstraitPlan plan = 1;
@@ -1531,7 +1535,6 @@ message ActionCreatePreparedSubstraitPlanRequest {
  * The result should be wrapped in a google.protobuf.Any message.
  */
 message ActionCreatePreparedStatementResult {
-  option (experimental) = true;
 
   // Opaque handle for the prepared statement on the server.
   bytes prepared_statement_handle = 1;
@@ -1553,7 +1556,6 @@ message ActionCreatePreparedStatementResult {
  * Closes server resources associated with the prepared statement handle.
  */
 message ActionClosePreparedStatementRequest {
-  option (experimental) = true;
 
   // Opaque handle for the prepared statement on the server.
   bytes prepared_statement_handle = 1;
@@ -1564,7 +1566,6 @@ message ActionClosePreparedStatementRequest {
  * Begins a transaction.
  */
 message ActionBeginTransactionRequest {
-  option (experimental) = true;
 }
 
 /*
@@ -1575,7 +1576,6 @@ message ActionBeginTransactionRequest {
  * FLIGHT_SQL_TRANSACTION_SUPPORT_SAVEPOINT.
  */
 message ActionBeginSavepointRequest {
-  option (experimental) = true;
 
   // The transaction to which a savepoint belongs.
   bytes transaction_id = 1;
@@ -1593,7 +1593,6 @@ message ActionBeginSavepointRequest {
  * The result should be wrapped in a google.protobuf.Any message.
  */
 message ActionBeginTransactionResult {
-  option (experimental) = true;
 
   // Opaque handle for the transaction on the server.
   bytes transaction_id = 1;
@@ -1609,7 +1608,6 @@ message ActionBeginTransactionResult {
  * The result should be wrapped in a google.protobuf.Any message.
  */
 message ActionBeginSavepointResult {
-  option (experimental) = true;
 
   // Opaque handle for the savepoint on the server.
   bytes savepoint_id = 1;
@@ -1624,7 +1622,6 @@ message ActionBeginSavepointResult {
  * invalidated, as are all associated savepoints.
  */
 message ActionEndTransactionRequest {
-  option (experimental) = true;
 
   enum EndTransaction {
     END_TRANSACTION_UNSPECIFIED = 0;
@@ -1650,7 +1647,6 @@ message ActionEndTransactionRequest {
  * savepoints created after the current savepoint.
  */
 message ActionEndSavepointRequest {
-  option (experimental) = true;
 
   enum EndSavepoint {
     END_SAVEPOINT_UNSPECIFIED = 0;
@@ -1685,7 +1681,6 @@ message ActionEndSavepointRequest {
  *  - GetFlightInfo: execute the query.
  */
 message CommandStatementQuery {
-  option (experimental) = true;
 
   // The SQL syntax.
   string query = 1;
@@ -1712,7 +1707,6 @@ message CommandStatementQuery {
  *  - DoPut: execute the query.
  */
 message CommandStatementSubstraitPlan {
-  option (experimental) = true;
 
   // A serialized substrait.Plan
   SubstraitPlan plan = 1;
@@ -1725,7 +1719,6 @@ message CommandStatementSubstraitPlan {
  * This should be used only once and treated as an opaque value, that is, clients should not attempt to parse this.
  */
 message TicketStatementQuery {
-  option (experimental) = true;
 
   // Unique identifier for the instance of the statement to execute.
   bytes statement_handle = 1;
@@ -1753,7 +1746,6 @@ message TicketStatementQuery {
  *  - GetFlightInfo: execute the prepared statement instance.
  */
 message CommandPreparedStatementQuery {
-  option (experimental) = true;
 
   // Opaque handle for the prepared statement on the server.
   bytes prepared_statement_handle = 1;
@@ -1764,7 +1756,6 @@ message CommandPreparedStatementQuery {
  * for the RPC call DoPut to cause the server to execute the included SQL update.
  */
 message CommandStatementUpdate {
-  option (experimental) = true;
 
   // The SQL syntax.
   string query = 1;
@@ -1778,19 +1769,75 @@ message CommandStatementUpdate {
  * prepared statement handle as an update.
  */
 message CommandPreparedStatementUpdate {
-  option (experimental) = true;
 
   // Opaque handle for the prepared statement on the server.
   bytes prepared_statement_handle = 1;
 }
 
 /*
- * Returned from the RPC call DoPut when a CommandStatementUpdate
- * CommandPreparedStatementUpdate was in the request, containing
- * results from the update.
+ * Represents a bulk ingestion request. Used in the command member of FlightDescriptor
+ * for the the RPC call DoPut to cause the server load the contents of the stream's
+ * FlightData into the target destination.
+ */
+message CommandStatementIngest {
+
+  // Options for table definition behavior
+  message TableDefinitionOptions {
+    // The action to take if the target table does not exist
+    enum TableNotExistOption {
+      // Do not use. Servers should error if this is specified by a client.
+      TABLE_NOT_EXIST_OPTION_UNSPECIFIED = 0;
+      // Create the table if it does not exist
+      TABLE_NOT_EXIST_OPTION_CREATE = 1;
+      // Fail if the table does not exist
+      TABLE_NOT_EXIST_OPTION_FAIL = 2;
+    }
+    // The action to take if the target table already exists
+    enum TableExistsOption {
+      // Do not use. Servers should error if this is specified by a client.
+      TABLE_EXISTS_OPTION_UNSPECIFIED = 0;
+      // Fail if the table already exists
+      TABLE_EXISTS_OPTION_FAIL = 1;
+      // Append to the table if it already exists
+      TABLE_EXISTS_OPTION_APPEND = 2;
+      // Drop and recreate the table if it already exists
+      TABLE_EXISTS_OPTION_REPLACE = 3;
+    }
+
+    TableNotExistOption if_not_exist = 1;
+    TableExistsOption if_exists = 2;
+  }
+
+  // The behavior for handling the table definition.
+  TableDefinitionOptions table_definition_options = 1;
+  // The table to load data into.
+  string table = 2;
+  // The db_schema of the destination table to load data into. If unset, a backend-specific default may be used.
+  optional string schema = 3;
+  // The catalog of the destination table to load data into. If unset, a backend-specific default may be used.
+  optional string catalog = 4;
+  /*
+   * Store ingested data in a temporary table.
+   * The effect of setting temporary is to place the table in a backend-defined namespace, and to drop the table at the end of the session.
+   * The namespacing may make use of a backend-specific schema and/or catalog.
+   * The server should return an error if an explicit choice of schema or catalog is incompatible with the server's namespacing decision.
+  */
+  bool temporary = 5;
+  // Perform the ingestion as part of this transaction. If specified, results should not be committed in the event of an error/cancellation.
+  optional bytes transaction_id = 6;
+
+  // Future extensions to the parameters of CommandStatementIngest should be added here, at a lower index than the generic 'options' parameter.
+
+  // Backend-specific options.
+  map<string, string> options = 1000;
+}
+
+/*
+ * Returned from the RPC call DoPut when a CommandStatementUpdate,
+ * CommandPreparedStatementUpdate, or CommandStatementIngest was
+ * in the request, containing results from the update.
  */
 message DoPutUpdateResult {
-  option (experimental) = true;
 
   // The number of records updated. A return value of -1 represents
   // an unknown updated record count.
@@ -1804,7 +1851,6 @@ message DoPutUpdateResult {
  * can continue as though the fields in this message were not provided or set to sensible default values.
  */
 message DoPutPreparedStatementResult {
-  option (experimental) = true;
 
   // Represents a (potentially updated) opaque handle for the prepared statement on the server.
   // Because the handle could potentially be updated, any previous handles for this prepared
@@ -1836,7 +1882,6 @@ message DoPutPreparedStatementResult {
  */
 message ActionCancelQueryRequest {
   option deprecated = true;
-  option (experimental) = true;
 
   // The result of the GetFlightInfo RPC that initiated the query.
   // XXX(ARROW-16902): this must be a serialized FlightInfo, but is
@@ -1855,7 +1900,6 @@ message ActionCancelQueryRequest {
  */
 message ActionCancelQueryResult {
   option deprecated = true;
-  option (experimental) = true;
 
   enum CancelResult {
     // The cancellation status is unknown. Servers should avoid using
diff --git a/format/substrait/extension_types.yaml b/format/substrait/extension_types.yaml
index 888d6c94c8182..0073da1acc1ed 100644
--- a/format/substrait/extension_types.yaml
+++ b/format/substrait/extension_types.yaml
@@ -35,36 +35,52 @@
 # - interval<months: i32, days: i32, nanos: i64>
 # - arrow::ExtensionTypes
 #
-# Note that not all of these are currently implemented. In particular, these
-# extension types are currently not parameterizable in Substrait, which means
-# among other things that we can't declare dictionary type here at all since
-# we'd have to declare a different dictionary type for all encoded types
-# (but that is an infinite space). Similarly, we would have to declare a
-# timestamp variation for all possible timezone strings.
+# These types fall into several categories of behavior:
 
-type_variations:
-  - parent: i8
-    name: u8
-    description: an unsigned 8 bit integer
-    functions: SEPARATE
-  - parent: i16
-    name: u16
-    description: an unsigned 16 bit integer
-    functions: SEPARATE
-  - parent: i32
-    name: u32
-    description: an unsigned 32 bit integer
-    functions: SEPARATE
-  - parent: i64
-    name: u64
-    description: an unsigned 64 bit integer
-    functions: SEPARATE
+# Certain Arrow data types are, from Substrait's point of view, encodings.
+# These include dictionary, the view types (e.g. binary view, list view),
+# and REE.
+#
+# These types are not logically distinct from the type they are encoding.
+# Specifically, the types meet the following criteria:
+#  *  There is no value in the decoded type that cannot be represented
+#     as a value in the encoded type and vice versa.
+#  *  Functions have the same meaning when applied to the encoded type
+#
+# Note: if two types have a different range (e.g. string and large_string) then
+# they do not satisfy the above criteria and are not encodings. 
+#
+# These types will never have a Substrait equivalent.  In the Substrait point
+# of view these are execution details.
+
+# The following types are encodings:
+
+# binary_view
+# list_view
+# dictionary
+# ree
+
+# Arrow-cpp's Substrait serde does not yet handle parameterized UDTs.  This means
+# the following types are not yet supported but may be supported in the future.
+# We define them below in case other implementations support them in the meantime.
 
-  - parent: i16
-    name: fp16
-    description: a 16 bit floating point number
-    functions: SEPARATE
+# decimal256
+# large_list
+# fixed_size_list
+# duration
 
+# Other types are not encodings, but are not first-class in Substrait.  These
+# types are often similar to existing Substrait types but define a different range
+# of values.  For example, unsigned integer types are very similar to their integer
+# counterparts, but have a different range of values.  These types are defined here
+# as extension types.
+#
+# A full description of the types, along with their specified range, can be found
+# in Schema.fbs
+#
+# Consumers should take care when supporting the below types.  Should Substrait decide
+# later to support these types, the consumer will need to make sure to continue supporting
+# the extension type names as aliases for proper backwards compatibility.
 types:
   - name: "null"
     structure: {}
@@ -80,3 +96,75 @@ types:
       months: i32
       days: i32
       nanos: i64
+  # All unsigned integer literals are encoded as user defined literals with
+  # a google.protobuf.UInt64Value message.
+  - name: u8
+    structure: {}
+  - name: u16
+    structure: {}
+  - name: u32
+    structure: {}
+  - name: u64
+    structure: {}
+  # fp16 literals are encoded as user defined literals with
+  # a google.protobuf.UInt32Value message where the lower 16 bits are
+  # the fp16 value.
+  - name: fp16
+    structure: {}
+  # 64-bit integers are big.  Even though date64 stores ms and not days it
+  # can still represent about 50x more dates than date32.  Since it has a
+  # different range of values, it is an extension type.
+  #
+  # date64 literals are encoded as user defined literals with
+  # a google.protobuf.Int64Value message.
+  - name: date_millis
+    structure: {}
+  # time literals are encoded as user defined literals with
+  # a google.protobuf.Int32Value message (for time_seconds/time_millis)
+  # or a google.protobuf.Int64Value message (for time_nanos).
+  - name: time_seconds
+    structure: {}
+  - name: time_millis
+    structure: {}
+  - name: time_nanos
+    structure: {}
+  # Large string literals are encoded using a
+  # google.protobuf.StringValue message.
+  - name: large_string
+    structure: {}
+  # Large binary literals are encoded using a
+  # google.protobuf.BytesValue message.
+  - name: large_binary
+    structure: {}
+  # We cannot generate these today because they are parameterized UDTs and
+  # substrait-cpp does not yet support parameterized UDTs.
+  - name: decimal256
+    structure: {}
+    parameters:
+     - name: precision
+       type: integer
+       min: 0
+       max: 76
+     - name: scale
+       type: integer
+       min: 0
+       max: 76
+  - name: large_list
+    structure: {}
+    parameters:
+      - name: value_type
+        type: dataType
+  - name: fixed_size_list
+    structure: {}
+    parameters:
+      - name: value_type
+        type: dataType
+      - name: dimension
+        type: integer
+        min: 0
+  - name: duration
+    structure: {}
+    parameters:
+      - name: unit
+        type: string
+
diff --git a/go/README.md b/go/README.md
index 20bd7cd77575e..220b0a230a615 100644
--- a/go/README.md
+++ b/go/README.md
@@ -20,7 +20,7 @@
 Apache Arrow for Go
 ===================
 
-[![Go Reference](https://pkg.go.dev/badge/github.com/apache/arrow/go/v16.svg)](https://pkg.go.dev/github.com/apache/arrow/go/v16)
+[![Go Reference](https://pkg.go.dev/badge/github.com/apache/arrow/go/v17.svg)](https://pkg.go.dev/github.com/apache/arrow/go/v17)
 
 [Apache Arrow][arrow] is a cross-language development platform for in-memory
 data. It specifies a standardized language-independent columnar memory format
@@ -48,7 +48,7 @@ func main() {
 
 DSN option keys are expressed as `k=v`, delimited with `;`. 
 Some options keys are defined in ADBC, others are defined in the FlightSQL ADBC driver.
-- Arrow ADBC [developer doc](https://arrow.apache.org/adbc/main/driver/go/flight_sql.html#client-options)
+- Arrow ADBC [developer doc](https://arrow.apache.org/adbc/main/driver/flight_sql.html#client-options)
 - ADBC [source code](https://github.com/apache/arrow-adbc/blob/3d12fad1bae21029a8ff25604d6e65760c3f65bd/go/adbc/adbc.go#L149-L158)
 - FlightSQL driver option keys [source code](https://github.com/apache/arrow-adbc/blob/3d12fad1bae21029a8ff25604d6e65760c3f65bd/go/adbc/driver/flightsql/flightsql_adbc.go#L70-L81)
 
diff --git a/go/arrow/_examples/helloworld/main.go b/go/arrow/_examples/helloworld/main.go
index 9952cc9497389..f4348d6e66771 100644
--- a/go/arrow/_examples/helloworld/main.go
+++ b/go/arrow/_examples/helloworld/main.go
@@ -19,10 +19,10 @@ package main
 import (
 	"os"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/math"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/math"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func main() {
diff --git a/go/arrow/_tools/tmpl/main.go b/go/arrow/_tools/tmpl/main.go
index 3c60e52d317dd..1f83a1b905ae9 100644
--- a/go/arrow/_tools/tmpl/main.go
+++ b/go/arrow/_tools/tmpl/main.go
@@ -28,7 +28,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 const Ext = ".tmpl"
diff --git a/go/arrow/array.go b/go/arrow/array.go
index ca83989ab9bfc..7f04eab71e5f4 100644
--- a/go/arrow/array.go
+++ b/go/arrow/array.go
@@ -19,8 +19,8 @@ package arrow
 import (
 	"fmt"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 // ArrayData is the underlying memory and metadata of an Arrow array, corresponding
diff --git a/go/arrow/array/array.go b/go/arrow/array/array.go
index c8d82cc79d32d..be6ba864d1aa7 100644
--- a/go/arrow/array/array.go
+++ b/go/arrow/array/array.go
@@ -19,9 +19,9 @@ package array
 import (
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 )
 
 const (
diff --git a/go/arrow/array/array_test.go b/go/arrow/array/array_test.go
index 9e422bb9d545f..9beadc3cdc654 100644
--- a/go/arrow/array/array_test.go
+++ b/go/arrow/array/array_test.go
@@ -19,11 +19,11 @@ package array_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/internal/testing/tools"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/internal/testing/tools"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/types"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/binary.go b/go/arrow/array/binary.go
index f1023d40d6a1f..d36c0aac7d3f2 100644
--- a/go/arrow/array/binary.go
+++ b/go/arrow/array/binary.go
@@ -23,9 +23,9 @@ import (
 	"strings"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 type BinaryLike interface {
diff --git a/go/arrow/array/binary_test.go b/go/arrow/array/binary_test.go
index 5b3d6f0d8ba95..c8d793ef0670e 100644
--- a/go/arrow/array/binary_test.go
+++ b/go/arrow/array/binary_test.go
@@ -20,9 +20,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/binarybuilder.go b/go/arrow/array/binarybuilder.go
index 9de7921e29dfc..e5b4dd63cf9a5 100644
--- a/go/arrow/array/binarybuilder.go
+++ b/go/arrow/array/binarybuilder.go
@@ -25,10 +25,10 @@ import (
 	"sync/atomic"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 // A BinaryBuilder is used to build a Binary array using the Append methods.
diff --git a/go/arrow/array/binarybuilder_test.go b/go/arrow/array/binarybuilder_test.go
index 589396f2c5a04..e37c5f624f9cc 100644
--- a/go/arrow/array/binarybuilder_test.go
+++ b/go/arrow/array/binarybuilder_test.go
@@ -20,9 +20,9 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/boolean.go b/go/arrow/array/boolean.go
index ce9d4136122cd..50a4101db18b3 100644
--- a/go/arrow/array/boolean.go
+++ b/go/arrow/array/boolean.go
@@ -21,10 +21,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 // A type which represents an immutable sequence of boolean values.
diff --git a/go/arrow/array/boolean_test.go b/go/arrow/array/boolean_test.go
index 165fb470d6f89..c3bc235de3f21 100644
--- a/go/arrow/array/boolean_test.go
+++ b/go/arrow/array/boolean_test.go
@@ -22,8 +22,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/booleanbuilder.go b/go/arrow/array/booleanbuilder.go
index b09d5f08f8401..d58ff80151c06 100644
--- a/go/arrow/array/booleanbuilder.go
+++ b/go/arrow/array/booleanbuilder.go
@@ -23,11 +23,11 @@ import (
 	"strconv"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 type BooleanBuilder struct {
diff --git a/go/arrow/array/booleanbuilder_test.go b/go/arrow/array/booleanbuilder_test.go
index 25b6678155fa5..e01f6660c4c10 100644
--- a/go/arrow/array/booleanbuilder_test.go
+++ b/go/arrow/array/booleanbuilder_test.go
@@ -19,9 +19,9 @@ package array_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/internal/testing/tools"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/internal/testing/tools"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/bufferbuilder.go b/go/arrow/array/bufferbuilder.go
index 61d0b2d65ba88..b9638b311584d 100644
--- a/go/arrow/array/bufferbuilder.go
+++ b/go/arrow/array/bufferbuilder.go
@@ -20,10 +20,10 @@ import (
 	"sync/atomic"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 type bufBuilder interface {
diff --git a/go/arrow/array/bufferbuilder_byte.go b/go/arrow/array/bufferbuilder_byte.go
index 82a132c1c3b06..dd39d6b835cc3 100644
--- a/go/arrow/array/bufferbuilder_byte.go
+++ b/go/arrow/array/bufferbuilder_byte.go
@@ -16,7 +16,7 @@
 
 package array
 
-import "github.com/apache/arrow/go/v16/arrow/memory"
+import "github.com/apache/arrow/go/v17/arrow/memory"
 
 type byteBufferBuilder struct {
 	bufferBuilder
diff --git a/go/arrow/array/bufferbuilder_numeric.gen.go b/go/arrow/array/bufferbuilder_numeric.gen.go
index 923168728a03f..19388e27b0ee3 100644
--- a/go/arrow/array/bufferbuilder_numeric.gen.go
+++ b/go/arrow/array/bufferbuilder_numeric.gen.go
@@ -19,9 +19,9 @@
 package array
 
 import (
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 type int64BufferBuilder struct {
diff --git a/go/arrow/array/bufferbuilder_numeric.gen.go.tmpl b/go/arrow/array/bufferbuilder_numeric.gen.go.tmpl
index ae6b2d8e0dea6..40c96b5987cf3 100644
--- a/go/arrow/array/bufferbuilder_numeric.gen.go.tmpl
+++ b/go/arrow/array/bufferbuilder_numeric.gen.go.tmpl
@@ -17,9 +17,9 @@
 package array
 
 import (
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 {{range .In}}
diff --git a/go/arrow/array/bufferbuilder_numeric_test.go b/go/arrow/array/bufferbuilder_numeric_test.go
index 4d218fd103e92..372ba6976269d 100644
--- a/go/arrow/array/bufferbuilder_numeric_test.go
+++ b/go/arrow/array/bufferbuilder_numeric_test.go
@@ -20,8 +20,8 @@ import (
 	"testing"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/builder.go b/go/arrow/array/builder.go
index 4751f57cc5b9c..88c0ac479868b 100644
--- a/go/arrow/array/builder.go
+++ b/go/arrow/array/builder.go
@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 const (
@@ -357,7 +357,7 @@ func NewBuilder(mem memory.Allocator, dtype arrow.DataType) Builder {
 		return bldr
 	case arrow.FIXED_SIZE_LIST:
 		typ := dtype.(*arrow.FixedSizeListType)
-		return NewFixedSizeListBuilder(mem, typ.Len(), typ.Elem())
+		return NewFixedSizeListBuilderWithField(mem, typ.Len(), typ.ElemField())
 	case arrow.DURATION:
 		typ := dtype.(*arrow.DurationType)
 		return NewDurationBuilder(mem, typ)
diff --git a/go/arrow/array/builder_test.go b/go/arrow/array/builder_test.go
index ab3507e225544..d508d4626d4e9 100644
--- a/go/arrow/array/builder_test.go
+++ b/go/arrow/array/builder_test.go
@@ -19,8 +19,8 @@ package array
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/testing/tools"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/internal/testing/tools"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/compare.go b/go/arrow/array/compare.go
index 6c806b06b98cf..7c6f3cab7a7a7 100644
--- a/go/arrow/array/compare.go
+++ b/go/arrow/array/compare.go
@@ -20,9 +20,9 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
 )
 
 // RecordEqual reports whether the two provided records are equal.
diff --git a/go/arrow/array/compare_test.go b/go/arrow/array/compare_test.go
index 995eb35e7d250..223535bf64000 100644
--- a/go/arrow/array/compare_test.go
+++ b/go/arrow/array/compare_test.go
@@ -22,11 +22,11 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/internal/arrdata"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/internal/arrdata"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/concat.go b/go/arrow/array/concat.go
index 9e0cb53abc54b..184f7143ee5df 100644
--- a/go/arrow/array/concat.go
+++ b/go/arrow/array/concat.go
@@ -23,13 +23,13 @@ import (
 	"math/bits"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/encoded"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
-	"github.com/apache/arrow/go/v16/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/encoded"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
+	"github.com/apache/arrow/go/v17/internal/utils"
 )
 
 // Concatenate creates a new arrow.Array which is the concatenation of the
@@ -520,12 +520,7 @@ func concat(data []arrow.ArrayData, mem memory.Allocator) (arr arrow.ArrayData,
 	out := &Data{refCount: 1, dtype: data[0].DataType(), nulls: 0}
 	defer func() {
 		if pErr := recover(); pErr != nil {
-			switch e := pErr.(type) {
-			case error:
-				err = fmt.Errorf("arrow/concat: %w", e)
-			default:
-				err = fmt.Errorf("arrow/concat: %v", pErr)
-			}
+			err = utils.FormatRecoveredError("arrow/concat", pErr)
 		}
 		if err != nil {
 			out.Release()
diff --git a/go/arrow/array/concat_test.go b/go/arrow/array/concat_test.go
index 23d0d4b5ca8e7..bfde89ec6600d 100644
--- a/go/arrow/array/concat_test.go
+++ b/go/arrow/array/concat_test.go
@@ -23,11 +23,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal/testing/gen"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal/testing/gen"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
diff --git a/go/arrow/array/data.go b/go/arrow/array/data.go
index 9ef1da6e14729..40fad0dfd0033 100644
--- a/go/arrow/array/data.go
+++ b/go/arrow/array/data.go
@@ -22,9 +22,9 @@ import (
 	"sync/atomic"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 // Data represents the memory and metadata of an Arrow array.
@@ -201,7 +201,9 @@ func (d *Data) SizeInBytes() uint64 {
 	}
 
 	for _, b := range d.Buffers() {
-		size += uint64(b.Len())
+		if b != nil {
+			size += uint64(b.Len())
+		}
 	}
 	for _, c := range d.Children() {
 		size += c.SizeInBytes()
diff --git a/go/arrow/array/data_test.go b/go/arrow/array/data_test.go
index 63af01ffdad2d..68f2ada97b037 100644
--- a/go/arrow/array/data_test.go
+++ b/go/arrow/array/data_test.go
@@ -17,10 +17,11 @@
 package array
 
 import (
+	"slices"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -60,6 +61,17 @@ func TestSizeInBytes(t *testing.T) {
 	var arrayData arrow.ArrayData = data
 	dataWithChild := NewData(&arrow.StringType{}, 10, buffers1, []arrow.ArrayData{arrayData}, 0, 0)
 
+	buffers2 := slices.Clone(buffers1)
+	buffers2[0] = nil
+	dataWithNilBuffer := NewData(&arrow.StringType{}, 10, buffers2, nil, 0, 0)
+
+	t.Run("nil buffers", func(t *testing.T) {
+		expectedSize := uint64(30)
+		if actualSize := dataWithNilBuffer.SizeInBytes(); actualSize != expectedSize {
+			t.Errorf("expected size %d, got %d", expectedSize, actualSize)
+		}
+	})
+
 	t.Run("buffers only", func(t *testing.T) {
 		expectedSize := uint64(45)
 		if actualSize := data.SizeInBytes(); actualSize != expectedSize {
diff --git a/go/arrow/array/decimal128.go b/go/arrow/array/decimal128.go
index dc5f5d761618e..4578fd4061dc4 100644
--- a/go/arrow/array/decimal128.go
+++ b/go/arrow/array/decimal128.go
@@ -24,12 +24,12 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 // A type which represents an immutable sequence of 128-bit decimal values.
diff --git a/go/arrow/array/decimal128_test.go b/go/arrow/array/decimal128_test.go
index 31c6a6f8cadd6..3e2d021924723 100644
--- a/go/arrow/array/decimal128_test.go
+++ b/go/arrow/array/decimal128_test.go
@@ -19,10 +19,10 @@ package array_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/decimal256.go b/go/arrow/array/decimal256.go
index f9c666300fa61..bc082638b7bc4 100644
--- a/go/arrow/array/decimal256.go
+++ b/go/arrow/array/decimal256.go
@@ -24,12 +24,12 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 // Decimal256 is a type that represents an immutable sequence of 256-bit decimal values.
diff --git a/go/arrow/array/decimal256_test.go b/go/arrow/array/decimal256_test.go
index c78bd5243a66a..dd671b53bf101 100644
--- a/go/arrow/array/decimal256_test.go
+++ b/go/arrow/array/decimal256_test.go
@@ -19,10 +19,10 @@ package array_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/decimal_test.go b/go/arrow/array/decimal_test.go
index d63c807fa9dbf..414bb3426ca34 100644
--- a/go/arrow/array/decimal_test.go
+++ b/go/arrow/array/decimal_test.go
@@ -21,12 +21,12 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/suite"
 )
 
diff --git a/go/arrow/array/dictionary.go b/go/arrow/array/dictionary.go
index 35f0fb20492ba..6e202deeb37cd 100644
--- a/go/arrow/array/dictionary.go
+++ b/go/arrow/array/dictionary.go
@@ -25,16 +25,16 @@ import (
 	"sync/atomic"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/hashing"
-	"github.com/apache/arrow/go/v16/internal/json"
-	"github.com/apache/arrow/go/v16/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/hashing"
+	"github.com/apache/arrow/go/v17/internal/json"
+	"github.com/apache/arrow/go/v17/internal/utils"
 )
 
 // Dictionary represents the type for dictionary-encoded data with a data
diff --git a/go/arrow/array/dictionary_test.go b/go/arrow/array/dictionary_test.go
index 2986b2ae70c04..128182d005eba 100644
--- a/go/arrow/array/dictionary_test.go
+++ b/go/arrow/array/dictionary_test.go
@@ -24,13 +24,13 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
diff --git a/go/arrow/array/diff.go b/go/arrow/array/diff.go
index fa1f404578c39..7110804d1b2cb 100644
--- a/go/arrow/array/diff.go
+++ b/go/arrow/array/diff.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 // Edit represents one entry in the edit script to compare two arrays.
diff --git a/go/arrow/array/diff_test.go b/go/arrow/array/diff_test.go
index 341ee3ea89c61..67fa1d04ab506 100644
--- a/go/arrow/array/diff_test.go
+++ b/go/arrow/array/diff_test.go
@@ -23,11 +23,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
+	"github.com/apache/arrow/go/v17/internal/types"
 )
 
 type diffTestCase struct {
diff --git a/go/arrow/array/encoded.go b/go/arrow/array/encoded.go
index 48ce582274b93..7df66061b5eb7 100644
--- a/go/arrow/array/encoded.go
+++ b/go/arrow/array/encoded.go
@@ -23,12 +23,12 @@ import (
 	"reflect"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/encoded"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
-	"github.com/apache/arrow/go/v16/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/encoded"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
+	"github.com/apache/arrow/go/v17/internal/utils"
 )
 
 // RunEndEncoded represents an array containing two children:
diff --git a/go/arrow/array/encoded_test.go b/go/arrow/array/encoded_test.go
index b19ed9c3cca3d..1c54e56aaea6f 100644
--- a/go/arrow/array/encoded_test.go
+++ b/go/arrow/array/encoded_test.go
@@ -20,10 +20,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/go/arrow/array/extension.go b/go/arrow/array/extension.go
index b1d4178821c81..5df86c8964a7b 100644
--- a/go/arrow/array/extension.go
+++ b/go/arrow/array/extension.go
@@ -20,9 +20,9 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 // ExtensionArray is the interface that needs to be implemented to handle
diff --git a/go/arrow/array/extension_test.go b/go/arrow/array/extension_test.go
index 21dbdf6bd6c6d..4520117f857f8 100644
--- a/go/arrow/array/extension_test.go
+++ b/go/arrow/array/extension_test.go
@@ -19,10 +19,10 @@ package array_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/types"
 	"github.com/stretchr/testify/suite"
 )
 
diff --git a/go/arrow/array/fixed_size_list.go b/go/arrow/array/fixed_size_list.go
index 29ec328401865..830361b518acd 100644
--- a/go/arrow/array/fixed_size_list.go
+++ b/go/arrow/array/fixed_size_list.go
@@ -22,11 +22,11 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 // FixedSizeList represents an immutable sequence of N array values.
@@ -162,25 +162,38 @@ func (a *FixedSizeList) MarshalJSON() ([]byte, error) {
 }
 
 type FixedSizeListBuilder struct {
-	builder
-
-	etype  arrow.DataType // data type of the list's elements.
-	n      int32          // number of elements in the fixed-size list.
-	values Builder        // value builder for the list's elements.
+	baseListBuilder
+	n int32 // number of elements in the fixed-size list.
 }
 
 // NewFixedSizeListBuilder returns a builder, using the provided memory allocator.
 // The created list builder will create a list whose elements will be of type etype.
 func NewFixedSizeListBuilder(mem memory.Allocator, n int32, etype arrow.DataType) *FixedSizeListBuilder {
 	return &FixedSizeListBuilder{
-		builder: builder{refCount: 1, mem: mem},
-		etype:   etype,
-		n:       n,
-		values:  NewBuilder(mem, etype),
+		baseListBuilder{
+			builder: builder{refCount: 1, mem: mem},
+			values:  NewBuilder(mem, etype),
+			dt:      arrow.FixedSizeListOf(n, etype),
+		},
+		n,
+	}
+}
+
+// NewFixedSizeListBuilderWithField returns a builder similarly to
+// NewFixedSizeListBuilder, but it accepts a child rather than just a datatype
+// to ensure nullability context is preserved.
+func NewFixedSizeListBuilderWithField(mem memory.Allocator, n int32, field arrow.Field) *FixedSizeListBuilder {
+	return &FixedSizeListBuilder{
+		baseListBuilder{
+			builder: builder{refCount: 1, mem: mem},
+			values:  NewBuilder(mem, field.Type),
+			dt:      arrow.FixedSizeListOfField(n, field),
+		},
+		n,
 	}
 }
 
-func (b *FixedSizeListBuilder) Type() arrow.DataType { return arrow.FixedSizeListOf(b.n, b.etype) }
+func (b *FixedSizeListBuilder) Type() arrow.DataType { return b.dt }
 
 // Release decreases the reference count by 1.
 // When the reference count goes to zero, the memory is freed.
@@ -296,7 +309,7 @@ func (b *FixedSizeListBuilder) newData() (data *Data) {
 	defer values.Release()
 
 	data = NewData(
-		arrow.FixedSizeListOf(b.n, b.etype), b.length,
+		b.dt, b.length,
 		[]*memory.Buffer{b.nullBitmap},
 		[]arrow.ArrayData{values.Data()},
 		b.nulls,
@@ -336,7 +349,7 @@ func (b *FixedSizeListBuilder) UnmarshalOne(dec *json.Decoder) error {
 	default:
 		return &json.UnmarshalTypeError{
 			Value:  fmt.Sprint(t),
-			Struct: arrow.FixedSizeListOf(b.n, b.etype).String(),
+			Struct: b.dt.String(),
 		}
 	}
 
diff --git a/go/arrow/array/fixed_size_list_test.go b/go/arrow/array/fixed_size_list_test.go
index 64c2c65b9e2b4..ff8c5fe552e4c 100644
--- a/go/arrow/array/fixed_size_list_test.go
+++ b/go/arrow/array/fixed_size_list_test.go
@@ -20,9 +20,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/fixedsize_binary.go b/go/arrow/array/fixedsize_binary.go
index b5c8994373dce..535b2d51003a7 100644
--- a/go/arrow/array/fixedsize_binary.go
+++ b/go/arrow/array/fixedsize_binary.go
@@ -22,8 +22,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 // A type which represents an immutable sequence of fixed-length binary strings.
diff --git a/go/arrow/array/fixedsize_binary_test.go b/go/arrow/array/fixedsize_binary_test.go
index 07a5c36f71a16..927818a640a3a 100644
--- a/go/arrow/array/fixedsize_binary_test.go
+++ b/go/arrow/array/fixedsize_binary_test.go
@@ -21,9 +21,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func TestFixedSizeBinary(t *testing.T) {
diff --git a/go/arrow/array/fixedsize_binarybuilder.go b/go/arrow/array/fixedsize_binarybuilder.go
index 33548dcfa1975..08e8ae841b9e4 100644
--- a/go/arrow/array/fixedsize_binarybuilder.go
+++ b/go/arrow/array/fixedsize_binarybuilder.go
@@ -23,10 +23,10 @@ import (
 	"reflect"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 // A FixedSizeBinaryBuilder is used to build a FixedSizeBinary array using the Append methods.
diff --git a/go/arrow/array/fixedsize_binarybuilder_test.go b/go/arrow/array/fixedsize_binarybuilder_test.go
index 8f82e27b4b876..3bd8611f37230 100644
--- a/go/arrow/array/fixedsize_binarybuilder_test.go
+++ b/go/arrow/array/fixedsize_binarybuilder_test.go
@@ -19,8 +19,8 @@ package array
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/float16.go b/go/arrow/array/float16.go
index 6fe35f2401949..b71f23b22c5e6 100644
--- a/go/arrow/array/float16.go
+++ b/go/arrow/array/float16.go
@@ -20,9 +20,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 // A type which represents an immutable sequence of Float16 values.
@@ -87,10 +87,20 @@ func (a *Float16) GetOneForMarshal(i int) interface{} {
 func (a *Float16) MarshalJSON() ([]byte, error) {
 	vals := make([]interface{}, a.Len())
 	for i, v := range a.values {
-		if a.IsValid(i) {
-			vals[i] = v.Float32()
-		} else {
+		if !a.IsValid(i) {
 			vals[i] = nil
+			continue
+		}
+
+		switch {
+		case v.IsNaN():
+			vals[i] = "NaN"
+		case v.IsInf() && !v.Signbit():
+			vals[i] = "+Inf"
+		case v.IsInf() && v.Signbit():
+			vals[i] = "-Inf"
+		default:
+			vals[i] = v.Float32()
 		}
 	}
 	return json.Marshal(vals)
diff --git a/go/arrow/array/float16_builder.go b/go/arrow/array/float16_builder.go
index dafa8a5602352..9eeb22feca43e 100644
--- a/go/arrow/array/float16_builder.go
+++ b/go/arrow/array/float16_builder.go
@@ -23,12 +23,12 @@ import (
 	"strconv"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 type Float16Builder struct {
diff --git a/go/arrow/array/float16_builder_test.go b/go/arrow/array/float16_builder_test.go
index 3826861bc4a4c..47d84302a9008 100644
--- a/go/arrow/array/float16_builder_test.go
+++ b/go/arrow/array/float16_builder_test.go
@@ -19,9 +19,9 @@ package array_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/interval.go b/go/arrow/array/interval.go
index 7af9806dc15f7..2cabfad18a84a 100644
--- a/go/arrow/array/interval.go
+++ b/go/arrow/array/interval.go
@@ -23,11 +23,11 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 func NewIntervalData(data arrow.ArrayData) arrow.Array {
diff --git a/go/arrow/array/interval_test.go b/go/arrow/array/interval_test.go
index 6b6be3ef7a3e4..c10112caaa5f1 100644
--- a/go/arrow/array/interval_test.go
+++ b/go/arrow/array/interval_test.go
@@ -20,9 +20,9 @@ import (
 	"math"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/json_reader.go b/go/arrow/array/json_reader.go
index c8462798ad554..4f5ebea6b3a25 100644
--- a/go/arrow/array/json_reader.go
+++ b/go/arrow/array/json_reader.go
@@ -22,10 +22,10 @@ import (
 	"io"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 type Option func(config)
diff --git a/go/arrow/array/json_reader_test.go b/go/arrow/array/json_reader_test.go
index f8398e91b562f..30a6d5833ee69 100644
--- a/go/arrow/array/json_reader_test.go
+++ b/go/arrow/array/json_reader_test.go
@@ -20,9 +20,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/list.go b/go/arrow/array/list.go
index d383a73a196a0..16b7cf1bc05a9 100644
--- a/go/arrow/array/list.go
+++ b/go/arrow/array/list.go
@@ -22,11 +22,11 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 type ListLike interface {
diff --git a/go/arrow/array/list_test.go b/go/arrow/array/list_test.go
index 37f1d3f489232..5b624dccfc91a 100644
--- a/go/arrow/array/list_test.go
+++ b/go/arrow/array/list_test.go
@@ -20,9 +20,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/map.go b/go/arrow/array/map.go
index da80ab016e727..eb11f963c5837 100644
--- a/go/arrow/array/map.go
+++ b/go/arrow/array/map.go
@@ -20,9 +20,9 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 // Map represents an immutable sequence of Key/Value structs. It is a
diff --git a/go/arrow/array/map_test.go b/go/arrow/array/map_test.go
index 8cd874f0aadb3..cbea072e09045 100644
--- a/go/arrow/array/map_test.go
+++ b/go/arrow/array/map_test.go
@@ -20,9 +20,9 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/null.go b/go/arrow/array/null.go
index 19b7c15f498f1..365964ebb0a2f 100644
--- a/go/arrow/array/null.go
+++ b/go/arrow/array/null.go
@@ -23,10 +23,10 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 // Null represents an immutable, degenerate array with no physical storage.
diff --git a/go/arrow/array/null_test.go b/go/arrow/array/null_test.go
index d4855e244a083..ae645f9564220 100644
--- a/go/arrow/array/null_test.go
+++ b/go/arrow/array/null_test.go
@@ -19,9 +19,9 @@ package array_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/numeric.gen.go b/go/arrow/array/numeric.gen.go
index 0c7346ddf1964..b962cda40b8b3 100644
--- a/go/arrow/array/numeric.gen.go
+++ b/go/arrow/array/numeric.gen.go
@@ -20,11 +20,12 @@ package array
 
 import (
 	"fmt"
+	"math"
 	"strconv"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 // A type which represents an immutable sequence of int64 values.
@@ -290,11 +291,23 @@ func (a *Float64) GetOneForMarshal(i int) interface{} {
 func (a *Float64) MarshalJSON() ([]byte, error) {
 	vals := make([]interface{}, a.Len())
 	for i := 0; i < a.Len(); i++ {
-		if a.IsValid(i) {
-			vals[i] = a.values[i]
-		} else {
+		if !a.IsValid(i) {
 			vals[i] = nil
+			continue
 		}
+
+		f := a.Value(i)
+		switch {
+		case math.IsNaN(f):
+			vals[i] = "NaN"
+		case math.IsInf(f, 1):
+			vals[i] = "+Inf"
+		case math.IsInf(f, -1):
+			vals[i] = "-Inf"
+		default:
+			vals[i] = f
+		}
+
 	}
 
 	return json.Marshal(vals)
@@ -575,10 +588,19 @@ func (a *Float32) GetOneForMarshal(i int) interface{} {
 func (a *Float32) MarshalJSON() ([]byte, error) {
 	vals := make([]interface{}, a.Len())
 	for i := 0; i < a.Len(); i++ {
-		if a.IsValid(i) {
-			vals[i] = a.values[i]
-		} else {
+		if !a.IsValid(i) {
 			vals[i] = nil
+			continue
+		}
+
+		f := a.Value(i)
+		v := strconv.FormatFloat(float64(f), 'g', -1, 32)
+
+		switch v {
+		case "NaN", "+Inf", "-Inf":
+			vals[i] = v
+		default:
+			vals[i] = f
 		}
 	}
 
diff --git a/go/arrow/array/numeric.gen.go.tmpl b/go/arrow/array/numeric.gen.go.tmpl
index 2ccb8d8b83679..d9daa55849619 100644
--- a/go/arrow/array/numeric.gen.go.tmpl
+++ b/go/arrow/array/numeric.gen.go.tmpl
@@ -21,8 +21,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 {{range .In}}
@@ -133,11 +133,45 @@ func (a *{{.Name}}) MarshalJSON() ([]byte, error) {
 {{else -}}
 	vals := make([]interface{}, a.Len())
 	for i := 0; i < a.Len(); i++ {
+	{{if (eq .Name "Float32") -}}
+		if !a.IsValid(i) {
+			vals[i] = nil
+			continue
+		}
+
+		f := a.Value(i)
+		v := strconv.FormatFloat(float64(f), 'g', -1, 32)
+
+		switch v {
+		case "NaN", "+Inf", "-Inf":
+			vals[i] = v
+		default:
+			vals[i] = f
+		}
+	{{else if (eq .Name "Float64") -}}
+		if !a.IsValid(i) {
+			vals[i] = nil
+			continue
+		}
+
+		f := a.Value(i)
+		switch {
+		case math.IsNaN(f):
+			vals[i] = "NaN"
+		case math.IsInf(f, 1):
+			vals[i] = "+Inf"
+		case math.IsInf(f, -1):
+			vals[i] = "-Inf"
+		default:
+			vals[i] = f
+		}
+	{{else}}
 		if a.IsValid(i) {
 			{{ if (eq .Size "1") }}vals[i] = float64(a.values[i]) // prevent uint8 from being seen as binary data{{ else }}vals[i] = a.values[i]{{ end }}
 		} else {
 			vals[i] = nil
 		}
+	{{end}}
 	}
 {{end}}
 	return json.Marshal(vals)
diff --git a/go/arrow/array/numeric_test.go b/go/arrow/array/numeric_test.go
index 34cab789259fd..3013d45acbb2b 100644
--- a/go/arrow/array/numeric_test.go
+++ b/go/arrow/array/numeric_test.go
@@ -21,10 +21,11 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -137,6 +138,92 @@ func TestFloat64SliceDataWithNull(t *testing.T) {
 	}
 }
 
+func TestFloat16MarshalJSON(t *testing.T) {
+	pool := memory.NewCheckedAllocator(memory.NewGoAllocator())
+	defer pool.AssertSize(t, 0)
+
+	bldr := array.NewFloat16Builder(pool)
+	defer bldr.Release()
+
+	jsonstr := `[0, 1, 2, 3, "NaN", "NaN", 4, 5, "+Inf", "-Inf"]`
+
+	bldr.Append(float16.New(0))
+	bldr.Append(float16.New(1))
+	bldr.Append(float16.New(2))
+	bldr.Append(float16.New(3))
+	bldr.Append(float16.NaN())
+	bldr.Append(float16.NaN())
+	bldr.Append(float16.New(4))
+	bldr.Append(float16.New(5))
+	bldr.Append(float16.Inf())
+	bldr.Append(float16.Inf().Negate())
+
+	expected := bldr.NewFloat16Array()
+	defer expected.Release()
+	expected_json, err := expected.MarshalJSON()
+	assert.NoError(t, err)
+	assert.JSONEq(t, jsonstr, string(expected_json))
+}
+
+func TestFloat32MarshalJSON(t *testing.T) {
+	pool := memory.NewCheckedAllocator(memory.NewGoAllocator())
+	defer pool.AssertSize(t, 0)
+
+	bldr := array.NewFloat32Builder(pool)
+	defer bldr.Release()
+
+	jsonstr := `[0, 1, "+Inf", 2, 3, "NaN", "NaN", 4, 5, "-Inf"]`
+
+	bldr.Append(0)
+	bldr.Append(1)
+	bldr.Append(float32(math.Inf(1)))
+	bldr.Append(2)
+	bldr.Append(3)
+	bldr.Append(float32(math.NaN()))
+	bldr.Append(float32(math.NaN()))
+	bldr.Append(4)
+	bldr.Append(5)
+	bldr.Append(float32(math.Inf(-1)))
+
+	expected := bldr.NewFloat32Array()
+	defer expected.Release()
+
+	expected_json, err := expected.MarshalJSON()
+	assert.NoError(t, err)
+
+	assert.JSONEq(t, jsonstr, string(expected_json))
+}
+
+func TestFloat64MarshalJSON(t *testing.T) {
+	pool := memory.NewCheckedAllocator(memory.NewGoAllocator())
+	defer pool.AssertSize(t, 0)
+
+	bldr := array.NewFloat64Builder(pool)
+	defer bldr.Release()
+
+	jsonstr := `[0, 1, "+Inf", 2, 3, "NaN", "NaN", 4, 5, "-Inf"]`
+
+	bldr.Append(0)
+	bldr.Append(1)
+	bldr.Append(math.Inf(1))
+	bldr.Append(2)
+	bldr.Append(3)
+	bldr.Append(math.NaN())
+	bldr.Append(math.NaN())
+	bldr.Append(4)
+	bldr.Append(5)
+	bldr.Append(math.Inf(-1))
+
+	expected := bldr.NewFloat64Array()
+	defer expected.Release()
+
+	expected_json, err := expected.MarshalJSON()
+	assert.NoError(t, err)
+
+	assert.JSONEq(t, jsonstr, string(expected_json))
+
+}
+
 func TestUnmarshalSpecialFloat(t *testing.T) {
 	pool := memory.NewCheckedAllocator(memory.NewGoAllocator())
 	defer pool.AssertSize(t, 0)
diff --git a/go/arrow/array/numericbuilder.gen.go b/go/arrow/array/numericbuilder.gen.go
index 5f79b87c73788..227fcb2f68e83 100644
--- a/go/arrow/array/numericbuilder.gen.go
+++ b/go/arrow/array/numericbuilder.gen.go
@@ -27,11 +27,11 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 type Int64Builder struct {
diff --git a/go/arrow/array/numericbuilder.gen.go.tmpl b/go/arrow/array/numericbuilder.gen.go.tmpl
index 95bc9accbe8ec..c701c49c4210d 100644
--- a/go/arrow/array/numericbuilder.gen.go.tmpl
+++ b/go/arrow/array/numericbuilder.gen.go.tmpl
@@ -17,11 +17,11 @@
 package array
 
 import (
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 {{range .In}}
diff --git a/go/arrow/array/numericbuilder.gen_test.go b/go/arrow/array/numericbuilder.gen_test.go
index 10751e42de21a..b43aa7f807090 100644
--- a/go/arrow/array/numericbuilder.gen_test.go
+++ b/go/arrow/array/numericbuilder.gen_test.go
@@ -19,11 +19,12 @@
 package array_test
 
 import (
+	"math"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -633,6 +634,28 @@ func TestFloat64Builder_Resize(t *testing.T) {
 	assert.Equal(t, 5, ab.Len())
 }
 
+func TestFloat64BuilderUnmarshalJSON(t *testing.T) {
+	mem := memory.NewCheckedAllocator(memory.NewGoAllocator())
+	defer mem.AssertSize(t, 0)
+
+	bldr := array.NewFloat64Builder(mem)
+	defer bldr.Release()
+
+	jsonstr := `[0, 1, "+Inf", 2, 3, "NaN", "NaN", 4, 5, "-Inf"]`
+
+	err := bldr.UnmarshalJSON([]byte(jsonstr))
+	assert.NoError(t, err)
+
+	arr := bldr.NewFloat64Array()
+	defer arr.Release()
+
+	assert.NotNil(t, arr)
+
+	assert.False(t, math.IsInf(float64(arr.Value(0)), 0), arr.Value(0))
+	assert.True(t, math.IsInf(float64(arr.Value(2)), 1), arr.Value(2))
+	assert.True(t, math.IsNaN(float64(arr.Value(5))), arr.Value(5))
+}
+
 func TestInt32StringRoundTrip(t *testing.T) {
 	// 1. create array
 	mem := memory.NewCheckedAllocator(memory.NewGoAllocator())
@@ -1239,6 +1262,28 @@ func TestFloat32Builder_Resize(t *testing.T) {
 	assert.Equal(t, 5, ab.Len())
 }
 
+func TestFloat32BuilderUnmarshalJSON(t *testing.T) {
+	mem := memory.NewCheckedAllocator(memory.NewGoAllocator())
+	defer mem.AssertSize(t, 0)
+
+	bldr := array.NewFloat32Builder(mem)
+	defer bldr.Release()
+
+	jsonstr := `[0, 1, "+Inf", 2, 3, "NaN", "NaN", 4, 5, "-Inf"]`
+
+	err := bldr.UnmarshalJSON([]byte(jsonstr))
+	assert.NoError(t, err)
+
+	arr := bldr.NewFloat32Array()
+	defer arr.Release()
+
+	assert.NotNil(t, arr)
+
+	assert.False(t, math.IsInf(float64(arr.Value(0)), 0), arr.Value(0))
+	assert.True(t, math.IsInf(float64(arr.Value(2)), 1), arr.Value(2))
+	assert.True(t, math.IsNaN(float64(arr.Value(5))), arr.Value(5))
+}
+
 func TestInt16StringRoundTrip(t *testing.T) {
 	// 1. create array
 	mem := memory.NewCheckedAllocator(memory.NewGoAllocator())
diff --git a/go/arrow/array/numericbuilder.gen_test.go.tmpl b/go/arrow/array/numericbuilder.gen_test.go.tmpl
index 41f68715fddbc..9f381aa055fac 100644
--- a/go/arrow/array/numericbuilder.gen_test.go.tmpl
+++ b/go/arrow/array/numericbuilder.gen_test.go.tmpl
@@ -19,9 +19,9 @@ package array_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -271,6 +271,29 @@ func Test{{.Name}}Builder_Resize(t *testing.T) {
 	ab.Resize(32)
 	assert.Equal(t, 5, ab.Len())
 }
+
+func Test{{.Name}}BuilderUnmarshalJSON(t *testing.T) {
+	mem := memory.NewCheckedAllocator(memory.NewGoAllocator())
+	defer mem.AssertSize(t, 0)
+
+	bldr := array.New{{.Name}}Builder(mem)
+	defer bldr.Release()
+
+	jsonstr := `[0, 1, "+Inf", 2, 3, "NaN", "NaN", 4, 5, "-Inf"]`
+
+	err := bldr.UnmarshalJSON([]byte(jsonstr))
+	assert.NoError(t, err)
+
+	arr := bldr.New{{.Name}}Array()
+	defer arr.Release()
+
+	assert.NotNil(t, arr)
+
+	assert.False(t, math.IsInf(float64(arr.Value(0)), 0), arr.Value(0))
+	assert.True(t, math.IsInf(float64(arr.Value(2)), 1), arr.Value(2))
+	assert.True(t, math.IsNaN(float64(arr.Value(5))), arr.Value(5))
+}
+
 {{end}}
 
 
diff --git a/go/arrow/array/record.go b/go/arrow/array/record.go
index 6a45880181043..93543f929ed7f 100644
--- a/go/arrow/array/record.go
+++ b/go/arrow/array/record.go
@@ -22,10 +22,10 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 // RecordReader reads a stream of records.
diff --git a/go/arrow/array/record_test.go b/go/arrow/array/record_test.go
index c961c04af2c23..6712a1c9085be 100644
--- a/go/arrow/array/record_test.go
+++ b/go/arrow/array/record_test.go
@@ -21,9 +21,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -94,7 +94,7 @@ func TestRecord(t *testing.T) {
 	if _, err := rec.SetColumn(0, col2_1); err == nil {
 		t.Fatalf("expected an error")
 	}
-	newRec, err := rec.SetColumn(1, col2_1);
+	newRec, err := rec.SetColumn(1, col2_1)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -372,6 +372,45 @@ func TestRecordReader(t *testing.T) {
 	}
 }
 
+func TestRecordBuilderRespectsFixedSizeArrayNullability(t *testing.T) {
+	mem := memory.NewCheckedAllocator(memory.NewGoAllocator())
+	defer mem.AssertSize(t, 0)
+
+	cases := []struct {
+		assertion string
+		fields    []arrow.Field
+	}{
+		{
+			"nullable",
+			[]arrow.Field{{Name: "data", Type: arrow.FixedSizeListOf(1, arrow.PrimitiveTypes.Int32)}},
+		},
+		{
+			"not nullable",
+			[]arrow.Field{{Name: "data", Type: arrow.FixedSizeListOfNonNullable(1, arrow.PrimitiveTypes.Int32)}},
+		},
+	}
+	for _, c := range cases {
+		t.Run(c.assertion, func(t *testing.T) {
+			schema := arrow.NewSchema(c.fields, nil)
+			b := array.NewRecordBuilder(mem, schema)
+			defer b.Release()
+
+			lb := b.Field(0).(*array.FixedSizeListBuilder)
+			lb.Append(true)
+
+			vb := lb.ValueBuilder().(*array.Int32Builder)
+			vb.Append(10)
+
+			rec := b.NewRecord()
+			defer rec.Release()
+
+			if got, want := rec.Column(0).String(), "[[10]]"; got != want {
+				t.Fatalf("invalid record: got=%q, want=%q", got, want)
+			}
+		})
+	}
+}
+
 func TestRecordBuilder(t *testing.T) {
 	mem := memory.NewCheckedAllocator(memory.NewGoAllocator())
 	defer mem.AssertSize(t, 0)
diff --git a/go/arrow/array/string.go b/go/arrow/array/string.go
index 6453bcaf7bdc5..f4735f2cb5e0e 100644
--- a/go/arrow/array/string.go
+++ b/go/arrow/array/string.go
@@ -23,9 +23,9 @@ import (
 	"strings"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 type StringLike interface {
diff --git a/go/arrow/array/string_test.go b/go/arrow/array/string_test.go
index 8006bc4740b4d..e9d9e061b4c52 100644
--- a/go/arrow/array/string_test.go
+++ b/go/arrow/array/string_test.go
@@ -21,10 +21,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/struct.go b/go/arrow/array/struct.go
index dc6fab689735b..1921ee86dd894 100644
--- a/go/arrow/array/struct.go
+++ b/go/arrow/array/struct.go
@@ -23,11 +23,11 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 // Struct represents an ordered sequence of relative types.
diff --git a/go/arrow/array/struct_test.go b/go/arrow/array/struct_test.go
index 895d9508dcb8b..03190585fadf0 100644
--- a/go/arrow/array/struct_test.go
+++ b/go/arrow/array/struct_test.go
@@ -20,9 +20,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/table.go b/go/arrow/array/table.go
index 2e7bb72d77855..54299ba6b1922 100644
--- a/go/arrow/array/table.go
+++ b/go/arrow/array/table.go
@@ -23,8 +23,8 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 )
 
 // NewColumnSlice returns a new zero-copy slice of the column with the indicated
diff --git a/go/arrow/array/table_test.go b/go/arrow/array/table_test.go
index 6ce69f66d67ac..2b9aaa7f352bf 100644
--- a/go/arrow/array/table_test.go
+++ b/go/arrow/array/table_test.go
@@ -22,9 +22,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func TestChunked(t *testing.T) {
diff --git a/go/arrow/array/timestamp.go b/go/arrow/array/timestamp.go
index 21a02dd402099..dfd62ad68e568 100644
--- a/go/arrow/array/timestamp.go
+++ b/go/arrow/array/timestamp.go
@@ -24,11 +24,11 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 // Timestamp represents an immutable sequence of arrow.Timestamp values.
diff --git a/go/arrow/array/timestamp_test.go b/go/arrow/array/timestamp_test.go
index 5a6e470c58804..38ab9279f6785 100644
--- a/go/arrow/array/timestamp_test.go
+++ b/go/arrow/array/timestamp_test.go
@@ -20,9 +20,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/array/union.go b/go/arrow/array/union.go
index 2400b9f88e0f6..10dc560348dae 100644
--- a/go/arrow/array/union.go
+++ b/go/arrow/array/union.go
@@ -25,12 +25,12 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 // Union is a convenience interface to encompass both Sparse and Dense
diff --git a/go/arrow/array/union_test.go b/go/arrow/array/union_test.go
index 45373b2e96d6a..d848340a96070 100644
--- a/go/arrow/array/union_test.go
+++ b/go/arrow/array/union_test.go
@@ -21,9 +21,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 )
diff --git a/go/arrow/array/util.go b/go/arrow/array/util.go
index f4781ce4e3cbc..e82eb24679bc4 100644
--- a/go/arrow/array/util.go
+++ b/go/arrow/array/util.go
@@ -22,11 +22,11 @@ import (
 	"io"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/hashing"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/hashing"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 func min(a, b int) int {
diff --git a/go/arrow/array/util_test.go b/go/arrow/array/util_test.go
index 262f45d356933..2f395b03ffbbb 100644
--- a/go/arrow/array/util_test.go
+++ b/go/arrow/array/util_test.go
@@ -25,13 +25,13 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/internal/arrdata"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/internal/arrdata"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/go/arrow/arrio/arrio.go b/go/arrow/arrio/arrio.go
index 6825b14cf403a..74bebd7ebe691 100644
--- a/go/arrow/arrio/arrio.go
+++ b/go/arrow/arrio/arrio.go
@@ -22,7 +22,7 @@ import (
 	"errors"
 	"io"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 // Reader is the interface that wraps the Read method.
diff --git a/go/arrow/arrio/arrio_test.go b/go/arrow/arrio/arrio_test.go
index e05385eed2d17..09d47c50c8e23 100644
--- a/go/arrow/arrio/arrio_test.go
+++ b/go/arrow/arrio/arrio_test.go
@@ -22,11 +22,11 @@ import (
 	"os"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/arrio"
-	"github.com/apache/arrow/go/v16/arrow/internal/arrdata"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/arrio"
+	"github.com/apache/arrow/go/v17/arrow/internal/arrdata"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 type copyKind int
diff --git a/go/arrow/avro/avro2parquet/main.go b/go/arrow/avro/avro2parquet/main.go
index f1c5eb36e9142..6a74940ffe2c1 100644
--- a/go/arrow/avro/avro2parquet/main.go
+++ b/go/arrow/avro/avro2parquet/main.go
@@ -26,10 +26,10 @@ import (
 	"runtime/pprof"
 	"time"
 
-	"github.com/apache/arrow/go/v16/arrow/avro"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/compress"
-	pq "github.com/apache/arrow/go/v16/parquet/pqarrow"
+	"github.com/apache/arrow/go/v17/arrow/avro"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/compress"
+	pq "github.com/apache/arrow/go/v17/parquet/pqarrow"
 )
 
 var (
diff --git a/go/arrow/avro/reader.go b/go/arrow/avro/reader.go
index 19a9023c57a68..e4a3aefd96da1 100644
--- a/go/arrow/avro/reader.go
+++ b/go/arrow/avro/reader.go
@@ -23,10 +23,10 @@ import (
 	"io"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/hamba/avro/v2/ocf"
 	"github.com/tidwall/sjson"
 
diff --git a/go/arrow/avro/reader_test.go b/go/arrow/avro/reader_test.go
index 375c653eee85b..3a02c995970a2 100644
--- a/go/arrow/avro/reader_test.go
+++ b/go/arrow/avro/reader_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 	hamba "github.com/hamba/avro/v2"
 )
 
diff --git a/go/arrow/avro/reader_types.go b/go/arrow/avro/reader_types.go
index 484155a43a794..3c3ebd3147053 100644
--- a/go/arrow/avro/reader_types.go
+++ b/go/arrow/avro/reader_types.go
@@ -23,12 +23,12 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/types"
 )
 
 type dataLoader struct {
diff --git a/go/arrow/avro/schema.go b/go/arrow/avro/schema.go
index c9bb4388b8c15..6e2ac00124df9 100644
--- a/go/arrow/avro/schema.go
+++ b/go/arrow/avro/schema.go
@@ -22,9 +22,10 @@ import (
 	"math"
 	"strconv"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/internal/types"
+	"github.com/apache/arrow/go/v17/internal/utils"
 	avro "github.com/hamba/avro/v2"
 )
 
@@ -76,14 +77,7 @@ func ArrowSchemaFromAvro(schema avro.Schema) (s *arrow.Schema, err error) {
 	defer func() {
 		if r := recover(); r != nil {
 			s = nil
-			switch x := r.(type) {
-			case string:
-				err = fmt.Errorf("invalid avro schema: %s", x)
-			case error:
-				err = fmt.Errorf("invalid avro schema: %w", x)
-			default:
-				err = fmt.Errorf("invalid avro schema: unknown error")
-			}
+			err = utils.FormatRecoveredError("invalid avro schema", r)
 		}
 	}()
 	n := newSchemaNode()
diff --git a/go/arrow/avro/schema_test.go b/go/arrow/avro/schema_test.go
index ca97debfbad4c..ee4525707aadf 100644
--- a/go/arrow/avro/schema_test.go
+++ b/go/arrow/avro/schema_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 	hamba "github.com/hamba/avro/v2"
 )
 
diff --git a/go/arrow/bitutil/bitmaps.go b/go/arrow/bitutil/bitmaps.go
index 3e211c213014b..eb3210043537b 100644
--- a/go/arrow/bitutil/bitmaps.go
+++ b/go/arrow/bitutil/bitmaps.go
@@ -22,9 +22,9 @@ import (
 	"math/bits"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/endian"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 // BitmapReader is a simple bitmap reader for a byte slice.
diff --git a/go/arrow/bitutil/bitmaps_test.go b/go/arrow/bitutil/bitmaps_test.go
index 918db3c7ad437..8d6bfdd1dde28 100644
--- a/go/arrow/bitutil/bitmaps_test.go
+++ b/go/arrow/bitutil/bitmaps_test.go
@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 )
diff --git a/go/arrow/bitutil/bitutil.go b/go/arrow/bitutil/bitutil.go
index 6a8f75410363f..a6497196fe15a 100644
--- a/go/arrow/bitutil/bitutil.go
+++ b/go/arrow/bitutil/bitutil.go
@@ -21,7 +21,7 @@ import (
 	"math/bits"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 var (
diff --git a/go/arrow/bitutil/bitutil_test.go b/go/arrow/bitutil/bitutil_test.go
index 752da59a0c7b6..fc5be55113b99 100644
--- a/go/arrow/bitutil/bitutil_test.go
+++ b/go/arrow/bitutil/bitutil_test.go
@@ -21,8 +21,8 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal/testing/tools"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal/testing/tools"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/cdata/cdata.go b/go/arrow/cdata/cdata.go
index 7e8f678f7e2d9..157df47adedc8 100644
--- a/go/arrow/cdata/cdata.go
+++ b/go/arrow/cdata/cdata.go
@@ -32,7 +32,11 @@ package cdata
 //	memset(out, 0, sizeof(struct ArrowArray));
 //	return out;
 // }
-// struct ArrowArrayStream* get_stream() { return (struct ArrowArrayStream*)malloc(sizeof(struct ArrowArrayStream)); }
+// struct ArrowArrayStream* get_stream() {
+//	struct ArrowArrayStream* out = (struct ArrowArrayStream*)malloc(sizeof(struct ArrowArrayStream));
+//	memset(out, 0, sizeof(struct ArrowArrayStream));
+//	return out;
+// }
 //
 import "C"
 
@@ -46,10 +50,10 @@ import (
 	"syscall"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"golang.org/x/xerrors"
 )
 
@@ -448,6 +452,7 @@ func (imp *cimporter) doImportArr(src *CArrowArray) error {
 	defer func() {
 		if imp.alloc.bufCount == 0 {
 			C.ArrowArrayRelease(imp.arr)
+			C.free(unsafe.Pointer(imp.arr))
 		}
 	}()
 
diff --git a/go/arrow/cdata/cdata_exports.go b/go/arrow/cdata/cdata_exports.go
index fecc8610bf2a0..b971cb21de1b9 100644
--- a/go/arrow/cdata/cdata_exports.go
+++ b/go/arrow/cdata/cdata_exports.go
@@ -44,11 +44,11 @@ import (
 	"strings"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/endian"
-	"github.com/apache/arrow/go/v16/arrow/internal"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/internal"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
 )
 
 func encodeCMetadata(keys, values []string) []byte {
@@ -293,7 +293,7 @@ func (exp *schemaExporter) export(field arrow.Field) {
 func (exp *schemaExporter) finish(out *CArrowSchema) {
 	out.dictionary = nil
 	if exp.dict != nil {
-		out.dictionary = (*CArrowSchema)(C.malloc(C.sizeof_struct_ArrowSchema))
+		out.dictionary = (*CArrowSchema)(C.calloc(C.sizeof_struct_ArrowSchema, C.size_t(1)))
 		exp.dict.finish(out.dictionary)
 	}
 	out.name = C.CString(exp.name)
@@ -413,7 +413,7 @@ func exportArray(arr arrow.Array, out *CArrowArray, outSchema *CArrowSchema) {
 		childPtrs[0], childPtrs[1] = &children[0], &children[1]
 		out.children = (**CArrowArray)(unsafe.Pointer(&childPtrs[0]))
 	case *array.Dictionary:
-		out.dictionary = (*CArrowArray)(C.malloc(C.sizeof_struct_ArrowArray))
+		out.dictionary = (*CArrowArray)(C.calloc(C.sizeof_struct_ArrowArray, C.size_t(1)))
 		exportArray(arr.Dictionary(), out.dictionary, nil)
 	case array.Union:
 		out.n_children = C.int64_t(arr.NumFields())
diff --git a/go/arrow/cdata/cdata_test.go b/go/arrow/cdata/cdata_test.go
index 354e560ea31ed..a200e2db45145 100644
--- a/go/arrow/cdata/cdata_test.go
+++ b/go/arrow/cdata/cdata_test.go
@@ -35,12 +35,12 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/internal/arrdata"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/memory/mallocator"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/internal/arrdata"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/memory/mallocator"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/cdata/cdata_test_framework.go b/go/arrow/cdata/cdata_test_framework.go
index 2a4eec9b0e782..caa1208a20ae5 100644
--- a/go/arrow/cdata/cdata_test_framework.go
+++ b/go/arrow/cdata/cdata_test_framework.go
@@ -69,10 +69,10 @@ import (
 	"runtime/cgo"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/internal"
-	"github.com/apache/arrow/go/v16/arrow/memory/mallocator"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/internal"
+	"github.com/apache/arrow/go/v17/arrow/memory/mallocator"
 )
 
 const (
diff --git a/go/arrow/cdata/exports.go b/go/arrow/cdata/exports.go
index f499908976e59..40f5fb2023558 100644
--- a/go/arrow/cdata/exports.go
+++ b/go/arrow/cdata/exports.go
@@ -20,8 +20,8 @@ import (
 	"runtime/cgo"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 // #include <stdlib.h>
diff --git a/go/arrow/cdata/import_allocator.go b/go/arrow/cdata/import_allocator.go
index 2ba8429cdbc7f..ad107902eb8ba 100644
--- a/go/arrow/cdata/import_allocator.go
+++ b/go/arrow/cdata/import_allocator.go
@@ -20,7 +20,7 @@ import (
 	"sync/atomic"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 )
 
 // #include "arrow/c/helpers.h"
diff --git a/go/arrow/cdata/interface.go b/go/arrow/cdata/interface.go
index 3d9e7cb8ddd22..ba821896168e2 100644
--- a/go/arrow/cdata/interface.go
+++ b/go/arrow/cdata/interface.go
@@ -22,10 +22,10 @@ package cdata
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/arrio"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/arrio"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/arrow/cdata/test/test_cimport.go b/go/arrow/cdata/test/test_cimport.go
index 8fd161c225eef..83ce27ece0d9f 100644
--- a/go/arrow/cdata/test/test_cimport.go
+++ b/go/arrow/cdata/test/test_cimport.go
@@ -23,10 +23,10 @@ import (
 	"fmt"
 	"runtime"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/cdata"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/cdata"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 // #include <stdint.h>
diff --git a/go/arrow/compute/arithmetic.go b/go/arrow/compute/arithmetic.go
index ebc3124e43688..e152413cd3eed 100644
--- a/go/arrow/compute/arithmetic.go
+++ b/go/arrow/compute/arithmetic.go
@@ -22,12 +22,12 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/compute/internal/kernels"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/compute/internal/kernels"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 )
 
 type (
diff --git a/go/arrow/compute/arithmetic_test.go b/go/arrow/compute/arithmetic_test.go
index f39d5a45a4c30..307fa4389544b 100644
--- a/go/arrow/compute/arithmetic_test.go
+++ b/go/arrow/compute/arithmetic_test.go
@@ -26,16 +26,16 @@ import (
 	"testing"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/compute/internal/kernels"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/internal/testing/gen"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/compute/internal/kernels"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/internal/testing/gen"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 	"github.com/klauspost/cpuid/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/go/arrow/compute/cast.go b/go/arrow/compute/cast.go
index f4b4a039ffc3c..dc2a6d022b2a1 100644
--- a/go/arrow/compute/cast.go
+++ b/go/arrow/compute/cast.go
@@ -23,11 +23,11 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/compute/internal/kernels"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/compute/internal/kernels"
 )
 
 var (
diff --git a/go/arrow/compute/cast_test.go b/go/arrow/compute/cast_test.go
index 149ff19ca4ef6..11b9587e9bdca 100644
--- a/go/arrow/compute/cast_test.go
+++ b/go/arrow/compute/cast_test.go
@@ -26,16 +26,16 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/internal/testing/gen"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/internal/testing/gen"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
+	"github.com/apache/arrow/go/v17/internal/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
diff --git a/go/arrow/compute/datum.go b/go/arrow/compute/datum.go
index 43ed13fcfcc69..40d9aa5db8601 100644
--- a/go/arrow/compute/datum.go
+++ b/go/arrow/compute/datum.go
@@ -21,9 +21,9 @@ package compute
 import (
 	"fmt"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 )
 
 //go:generate go run golang.org/x/tools/cmd/stringer -type=DatumKind -linecomment
diff --git a/go/arrow/compute/example_test.go b/go/arrow/compute/example_test.go
index e2cc91c4b1aa9..8d157aa40ac25 100644
--- a/go/arrow/compute/example_test.go
+++ b/go/arrow/compute/example_test.go
@@ -23,11 +23,11 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 // This example demonstrates how to register a custom scalar function.
diff --git a/go/arrow/compute/exec.go b/go/arrow/compute/exec.go
index 31e7657b5a3aa..e3e3fc0e5b887 100644
--- a/go/arrow/compute/exec.go
+++ b/go/arrow/compute/exec.go
@@ -22,9 +22,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 )
 
 func haveChunkedArray(values []Datum) bool {
diff --git a/go/arrow/compute/exec/kernel.go b/go/arrow/compute/exec/kernel.go
index 20cc617a1ae27..657f18cb87373 100644
--- a/go/arrow/compute/exec/kernel.go
+++ b/go/arrow/compute/exec/kernel.go
@@ -24,10 +24,10 @@ import (
 	"hash/maphash"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"golang.org/x/exp/slices"
 )
 
diff --git a/go/arrow/compute/exec/kernel_test.go b/go/arrow/compute/exec/kernel_test.go
index a07b993c6adf1..13beb62d3d704 100644
--- a/go/arrow/compute/exec/kernel_test.go
+++ b/go/arrow/compute/exec/kernel_test.go
@@ -22,12 +22,12 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/compute/exec/span.go b/go/arrow/compute/exec/span.go
index 4425784f25c94..d62306e663882 100644
--- a/go/arrow/compute/exec/span.go
+++ b/go/arrow/compute/exec/span.go
@@ -22,11 +22,11 @@ import (
 	"sync/atomic"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 )
 
 // BufferSpan is a lightweight Buffer holder for ArraySpans that does not
diff --git a/go/arrow/compute/exec/span_test.go b/go/arrow/compute/exec/span_test.go
index a814d150831d6..79452965b8f81 100644
--- a/go/arrow/compute/exec/span_test.go
+++ b/go/arrow/compute/exec/span_test.go
@@ -24,14 +24,14 @@ import (
 	"testing"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/endian"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
+	"github.com/apache/arrow/go/v17/internal/types"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/compute/exec/utils.go b/go/arrow/compute/exec/utils.go
index 868161010bf59..88390eef9cdef 100644
--- a/go/arrow/compute/exec/utils.go
+++ b/go/arrow/compute/exec/utils.go
@@ -24,10 +24,10 @@ import (
 	"sync/atomic"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"golang.org/x/exp/constraints"
 	"golang.org/x/exp/slices"
 )
diff --git a/go/arrow/compute/exec/utils_test.go b/go/arrow/compute/exec/utils_test.go
index 2504286b5e240..82b2545b5ce61 100644
--- a/go/arrow/compute/exec/utils_test.go
+++ b/go/arrow/compute/exec/utils_test.go
@@ -21,10 +21,10 @@ package exec_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/compute/exec_internals_test.go b/go/arrow/compute/exec_internals_test.go
index 0a6be416076fc..34f14e69d06d4 100644
--- a/go/arrow/compute/exec_internals_test.go
+++ b/go/arrow/compute/exec_internals_test.go
@@ -24,13 +24,13 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/internal/testing/gen"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/internal/testing/gen"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 	"github.com/stretchr/testify/suite"
 )
 
diff --git a/go/arrow/compute/exec_test.go b/go/arrow/compute/exec_test.go
index 0fbfa55e548f0..40b5e55ecb8d2 100644
--- a/go/arrow/compute/exec_test.go
+++ b/go/arrow/compute/exec_test.go
@@ -22,12 +22,12 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 	"github.com/stretchr/testify/suite"
 )
 
diff --git a/go/arrow/compute/executor.go b/go/arrow/compute/executor.go
index 53c9ec155528b..3e605db305013 100644
--- a/go/arrow/compute/executor.go
+++ b/go/arrow/compute/executor.go
@@ -25,14 +25,14 @@ import (
 	"runtime"
 	"sync"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/internal"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/internal"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 )
 
 // ExecCtx holds simple contextual information for execution
diff --git a/go/arrow/compute/expression.go b/go/arrow/compute/expression.go
index a81cb24b5a575..8dde6927a7c02 100644
--- a/go/arrow/compute/expression.go
+++ b/go/arrow/compute/expression.go
@@ -28,14 +28,14 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/compute/internal/kernels"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/compute/internal/kernels"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 )
 
 var hashSeed = maphash.MakeSeed()
diff --git a/go/arrow/compute/expression_test.go b/go/arrow/compute/expression_test.go
index 8964cb8af0696..4f3188ea82d9f 100644
--- a/go/arrow/compute/expression_test.go
+++ b/go/arrow/compute/expression_test.go
@@ -22,11 +22,11 @@ package compute_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/compute/exprs/builders.go b/go/arrow/compute/exprs/builders.go
index 8b273a7a6bb1d..525aa2ade3fe5 100644
--- a/go/arrow/compute/exprs/builders.go
+++ b/go/arrow/compute/exprs/builders.go
@@ -25,8 +25,8 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/compute"
 	"github.com/substrait-io/substrait-go/expr"
 	"github.com/substrait-io/substrait-go/extensions"
 	"github.com/substrait-io/substrait-go/types"
diff --git a/go/arrow/compute/exprs/builders_test.go b/go/arrow/compute/exprs/builders_test.go
index d78eb7f1c7cda..167a4378f9dfa 100644
--- a/go/arrow/compute/exprs/builders_test.go
+++ b/go/arrow/compute/exprs/builders_test.go
@@ -21,8 +21,8 @@ package exprs_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/compute/exprs"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/compute/exprs"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/substrait-io/substrait-go/expr"
diff --git a/go/arrow/compute/exprs/exec.go b/go/arrow/compute/exprs/exec.go
index 6a780be32f019..28c360a2e7dec 100644
--- a/go/arrow/compute/exprs/exec.go
+++ b/go/arrow/compute/exprs/exec.go
@@ -23,15 +23,15 @@ import (
 	"fmt"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/endian"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 	"github.com/substrait-io/substrait-go/expr"
 	"github.com/substrait-io/substrait-go/extensions"
 	"github.com/substrait-io/substrait-go/types"
diff --git a/go/arrow/compute/exprs/exec_internal_test.go b/go/arrow/compute/exprs/exec_internal_test.go
index 2525d1c8c7cae..e38ebb9fb8bd7 100644
--- a/go/arrow/compute/exprs/exec_internal_test.go
+++ b/go/arrow/compute/exprs/exec_internal_test.go
@@ -23,10 +23,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/go/arrow/compute/exprs/exec_test.go b/go/arrow/compute/exprs/exec_test.go
index cf7aac9a9b2e8..038a57a8408f8 100644
--- a/go/arrow/compute/exprs/exec_test.go
+++ b/go/arrow/compute/exprs/exec_test.go
@@ -23,12 +23,12 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/compute/exprs"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/compute/exprs"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/substrait-io/substrait-go/expr"
diff --git a/go/arrow/compute/exprs/extension_types.go b/go/arrow/compute/exprs/extension_types.go
index 24031eea66def..5dd5d229b09a7 100644
--- a/go/arrow/compute/exprs/extension_types.go
+++ b/go/arrow/compute/exprs/extension_types.go
@@ -24,8 +24,8 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 type simpleExtensionTypeFactory[P comparable] struct {
diff --git a/go/arrow/compute/exprs/field_refs.go b/go/arrow/compute/exprs/field_refs.go
index 941159bd47443..888b7e605f8b8 100644
--- a/go/arrow/compute/exprs/field_refs.go
+++ b/go/arrow/compute/exprs/field_refs.go
@@ -21,11 +21,11 @@ package exprs
 import (
 	"fmt"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 	"github.com/substrait-io/substrait-go/expr"
 )
 
diff --git a/go/arrow/compute/exprs/types.go b/go/arrow/compute/exprs/types.go
index dee0ad9eb91ab..c231a62c28426 100644
--- a/go/arrow/compute/exprs/types.go
+++ b/go/arrow/compute/exprs/types.go
@@ -24,8 +24,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/compute"
 	"github.com/substrait-io/substrait-go/expr"
 	"github.com/substrait-io/substrait-go/extensions"
 	"github.com/substrait-io/substrait-go/types"
diff --git a/go/arrow/compute/fieldref.go b/go/arrow/compute/fieldref.go
index 0c55c36dab243..ea8579f9b60b0 100644
--- a/go/arrow/compute/fieldref.go
+++ b/go/arrow/compute/fieldref.go
@@ -25,8 +25,8 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 var (
diff --git a/go/arrow/compute/fieldref_hash.go b/go/arrow/compute/fieldref_hash.go
index dace05788bb46..5da85254e314b 100644
--- a/go/arrow/compute/fieldref_hash.go
+++ b/go/arrow/compute/fieldref_hash.go
@@ -23,7 +23,7 @@ import (
 	"math/bits"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 func (f FieldPath) hash(h *maphash.Hash) {
diff --git a/go/arrow/compute/fieldref_test.go b/go/arrow/compute/fieldref_test.go
index 1ddb3267ff1b3..45ca64acbcac2 100644
--- a/go/arrow/compute/fieldref_test.go
+++ b/go/arrow/compute/fieldref_test.go
@@ -19,10 +19,10 @@ package compute_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/compute/functions.go b/go/arrow/compute/functions.go
index e1c7b66d822e7..44f54e09dee94 100644
--- a/go/arrow/compute/functions.go
+++ b/go/arrow/compute/functions.go
@@ -23,8 +23,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
 )
 
 type Function interface {
diff --git a/go/arrow/compute/functions_test.go b/go/arrow/compute/functions_test.go
index f07b5dc1eb589..0e40c0a2f8082 100644
--- a/go/arrow/compute/functions_test.go
+++ b/go/arrow/compute/functions_test.go
@@ -21,8 +21,8 @@ package compute_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/compute"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/go/arrow/compute/internal/kernels/base_arithmetic.go b/go/arrow/compute/internal/kernels/base_arithmetic.go
index 009251da87dc7..38aa073c76745 100644
--- a/go/arrow/compute/internal/kernels/base_arithmetic.go
+++ b/go/arrow/compute/internal/kernels/base_arithmetic.go
@@ -24,11 +24,11 @@ import (
 	"math/bits"
 
 	"github.com/JohnCGriffin/overflow"
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 	"golang.org/x/exp/constraints"
 )
 
diff --git a/go/arrow/compute/internal/kernels/base_arithmetic_amd64.go b/go/arrow/compute/internal/kernels/base_arithmetic_amd64.go
index 7800a3abd7bb3..902c5f341032b 100644
--- a/go/arrow/compute/internal/kernels/base_arithmetic_amd64.go
+++ b/go/arrow/compute/internal/kernels/base_arithmetic_amd64.go
@@ -21,9 +21,9 @@ package kernels
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 	"golang.org/x/exp/constraints"
 	"golang.org/x/sys/cpu"
 )
diff --git a/go/arrow/compute/internal/kernels/base_arithmetic_avx2_amd64.go b/go/arrow/compute/internal/kernels/base_arithmetic_avx2_amd64.go
index b49ebf0060e01..223e6c29b755a 100644
--- a/go/arrow/compute/internal/kernels/base_arithmetic_avx2_amd64.go
+++ b/go/arrow/compute/internal/kernels/base_arithmetic_avx2_amd64.go
@@ -21,7 +21,7 @@ package kernels
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 //go:noescape
diff --git a/go/arrow/compute/internal/kernels/base_arithmetic_sse4_amd64.go b/go/arrow/compute/internal/kernels/base_arithmetic_sse4_amd64.go
index da02db2c90f78..0c81f426c537b 100644
--- a/go/arrow/compute/internal/kernels/base_arithmetic_sse4_amd64.go
+++ b/go/arrow/compute/internal/kernels/base_arithmetic_sse4_amd64.go
@@ -21,7 +21,7 @@ package kernels
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 //go:noescape
diff --git a/go/arrow/compute/internal/kernels/basic_arithmetic_noasm.go b/go/arrow/compute/internal/kernels/basic_arithmetic_noasm.go
index f77408c51d756..0291989d9a45b 100644
--- a/go/arrow/compute/internal/kernels/basic_arithmetic_noasm.go
+++ b/go/arrow/compute/internal/kernels/basic_arithmetic_noasm.go
@@ -19,8 +19,8 @@
 package kernels
 
 import (
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
 	"golang.org/x/exp/constraints"
 )
 
diff --git a/go/arrow/compute/internal/kernels/boolean_cast.go b/go/arrow/compute/internal/kernels/boolean_cast.go
index 30ff952795180..266b569df7b7d 100644
--- a/go/arrow/compute/internal/kernels/boolean_cast.go
+++ b/go/arrow/compute/internal/kernels/boolean_cast.go
@@ -22,9 +22,9 @@ import (
 	"strconv"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
 )
 
 func isNonZero[T arrow.FixedWidthType](ctx *exec.KernelCtx, in []T, out []byte) error {
diff --git a/go/arrow/compute/internal/kernels/cast.go b/go/arrow/compute/internal/kernels/cast.go
index a2676c7f7182a..b7e3b59d7accc 100644
--- a/go/arrow/compute/internal/kernels/cast.go
+++ b/go/arrow/compute/internal/kernels/cast.go
@@ -19,9 +19,9 @@
 package kernels
 
 import (
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
 )
 
 type CastOptions struct {
diff --git a/go/arrow/compute/internal/kernels/cast_numeric.go b/go/arrow/compute/internal/kernels/cast_numeric.go
index b77f2177a04f3..88c295271fe5f 100644
--- a/go/arrow/compute/internal/kernels/cast_numeric.go
+++ b/go/arrow/compute/internal/kernels/cast_numeric.go
@@ -21,7 +21,7 @@ package kernels
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 var castNumericUnsafe func(itype, otype arrow.Type, in, out []byte, len int) = castNumericGo
diff --git a/go/arrow/compute/internal/kernels/cast_numeric_avx2_amd64.go b/go/arrow/compute/internal/kernels/cast_numeric_avx2_amd64.go
index 1609983740d00..186fac16bae82 100644
--- a/go/arrow/compute/internal/kernels/cast_numeric_avx2_amd64.go
+++ b/go/arrow/compute/internal/kernels/cast_numeric_avx2_amd64.go
@@ -21,7 +21,7 @@ package kernels
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 //go:noescape
diff --git a/go/arrow/compute/internal/kernels/cast_numeric_neon_arm64.go b/go/arrow/compute/internal/kernels/cast_numeric_neon_arm64.go
index 7e00d3075cfcb..630bc06199f49 100644
--- a/go/arrow/compute/internal/kernels/cast_numeric_neon_arm64.go
+++ b/go/arrow/compute/internal/kernels/cast_numeric_neon_arm64.go
@@ -21,7 +21,7 @@ package kernels
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 	"golang.org/x/sys/cpu"
 )
 
diff --git a/go/arrow/compute/internal/kernels/cast_numeric_sse4_amd64.go b/go/arrow/compute/internal/kernels/cast_numeric_sse4_amd64.go
index 4f0f6c2bc424e..cea34a62a9489 100644
--- a/go/arrow/compute/internal/kernels/cast_numeric_sse4_amd64.go
+++ b/go/arrow/compute/internal/kernels/cast_numeric_sse4_amd64.go
@@ -21,7 +21,7 @@ package kernels
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 //go:noescape
diff --git a/go/arrow/compute/internal/kernels/cast_temporal.go b/go/arrow/compute/internal/kernels/cast_temporal.go
index 3e6edb6a38918..0ad73737439c7 100644
--- a/go/arrow/compute/internal/kernels/cast_temporal.go
+++ b/go/arrow/compute/internal/kernels/cast_temporal.go
@@ -24,10 +24,10 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 )
 
 const millisecondsInDay = 86400000
diff --git a/go/arrow/compute/internal/kernels/helpers.go b/go/arrow/compute/internal/kernels/helpers.go
index d47885d2f4084..a99670cbbb231 100644
--- a/go/arrow/compute/internal/kernels/helpers.go
+++ b/go/arrow/compute/internal/kernels/helpers.go
@@ -22,13 +22,13 @@ import (
 	"fmt"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
 	"golang.org/x/exp/constraints"
 )
 
diff --git a/go/arrow/compute/internal/kernels/numeric_cast.go b/go/arrow/compute/internal/kernels/numeric_cast.go
index 4667abd4751ae..286c45e41d7b2 100644
--- a/go/arrow/compute/internal/kernels/numeric_cast.go
+++ b/go/arrow/compute/internal/kernels/numeric_cast.go
@@ -23,13 +23,13 @@ import (
 	"strconv"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
 	"golang.org/x/exp/constraints"
 )
 
diff --git a/go/arrow/compute/internal/kernels/rounding.go b/go/arrow/compute/internal/kernels/rounding.go
index e9d547d6f1e9f..ab05082513679 100644
--- a/go/arrow/compute/internal/kernels/rounding.go
+++ b/go/arrow/compute/internal/kernels/rounding.go
@@ -22,11 +22,11 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 	"golang.org/x/exp/constraints"
 )
 
diff --git a/go/arrow/compute/internal/kernels/scalar_arithmetic.go b/go/arrow/compute/internal/kernels/scalar_arithmetic.go
index 14bf36ee7ba07..038cca507b379 100644
--- a/go/arrow/compute/internal/kernels/scalar_arithmetic.go
+++ b/go/arrow/compute/internal/kernels/scalar_arithmetic.go
@@ -22,13 +22,13 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 )
 
 // scalar kernel that ignores (assumed all-null inputs) and returns null
diff --git a/go/arrow/compute/internal/kernels/scalar_boolean.go b/go/arrow/compute/internal/kernels/scalar_boolean.go
index 6005d45c102fb..7dbf76d4e847f 100644
--- a/go/arrow/compute/internal/kernels/scalar_boolean.go
+++ b/go/arrow/compute/internal/kernels/scalar_boolean.go
@@ -19,9 +19,9 @@
 package kernels
 
 import (
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 )
 
 type computeWordFN func(leftTrue, leftFalse, rightTrue, rightFalse uint64) (outValid, outData uint64)
diff --git a/go/arrow/compute/internal/kernels/scalar_comparison_amd64.go b/go/arrow/compute/internal/kernels/scalar_comparison_amd64.go
index 93862ce617eae..76de68a0ae44f 100644
--- a/go/arrow/compute/internal/kernels/scalar_comparison_amd64.go
+++ b/go/arrow/compute/internal/kernels/scalar_comparison_amd64.go
@@ -21,7 +21,7 @@ package kernels
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 	"golang.org/x/sys/cpu"
 )
 
diff --git a/go/arrow/compute/internal/kernels/scalar_comparison_avx2_amd64.go b/go/arrow/compute/internal/kernels/scalar_comparison_avx2_amd64.go
index 3f0066dc59159..b98b538570554 100644
--- a/go/arrow/compute/internal/kernels/scalar_comparison_avx2_amd64.go
+++ b/go/arrow/compute/internal/kernels/scalar_comparison_avx2_amd64.go
@@ -21,7 +21,7 @@ package kernels
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 //go:noescape
diff --git a/go/arrow/compute/internal/kernels/scalar_comparison_noasm.go b/go/arrow/compute/internal/kernels/scalar_comparison_noasm.go
index a4811981953bd..e897f767fd081 100644
--- a/go/arrow/compute/internal/kernels/scalar_comparison_noasm.go
+++ b/go/arrow/compute/internal/kernels/scalar_comparison_noasm.go
@@ -18,7 +18,7 @@
 
 package kernels
 
-import "github.com/apache/arrow/go/v16/arrow"
+import "github.com/apache/arrow/go/v17/arrow"
 
 func genCompareKernel[T arrow.NumericType](op CompareOperator) *CompareData {
 	return genGoCompareKernel(getCmpOp[T](op))
diff --git a/go/arrow/compute/internal/kernels/scalar_comparison_sse4_amd64.go b/go/arrow/compute/internal/kernels/scalar_comparison_sse4_amd64.go
index a47668c3e725c..739ee929136ea 100644
--- a/go/arrow/compute/internal/kernels/scalar_comparison_sse4_amd64.go
+++ b/go/arrow/compute/internal/kernels/scalar_comparison_sse4_amd64.go
@@ -21,7 +21,7 @@ package kernels
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 //go:noescape
diff --git a/go/arrow/compute/internal/kernels/scalar_comparisons.go b/go/arrow/compute/internal/kernels/scalar_comparisons.go
index 1c8418020afa1..f7278d6b16e3a 100644
--- a/go/arrow/compute/internal/kernels/scalar_comparisons.go
+++ b/go/arrow/compute/internal/kernels/scalar_comparisons.go
@@ -23,14 +23,14 @@ import (
 	"fmt"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
 )
 
 type binaryKernel func(left, right, out []byte, offset int)
diff --git a/go/arrow/compute/internal/kernels/string_casts.go b/go/arrow/compute/internal/kernels/string_casts.go
index 21bfe7bd87e00..ec64871d31263 100644
--- a/go/arrow/compute/internal/kernels/string_casts.go
+++ b/go/arrow/compute/internal/kernels/string_casts.go
@@ -23,12 +23,12 @@ import (
 	"strconv"
 	"unicode/utf8"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
 )
 
 func validateUtf8Fsb(input *exec.ArraySpan) error {
diff --git a/go/arrow/compute/internal/kernels/types.go b/go/arrow/compute/internal/kernels/types.go
index 0237e1a9994b6..a3df0b2db18ff 100644
--- a/go/arrow/compute/internal/kernels/types.go
+++ b/go/arrow/compute/internal/kernels/types.go
@@ -21,10 +21,10 @@ package kernels
 import (
 	"fmt"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 )
 
 var (
diff --git a/go/arrow/compute/internal/kernels/vector_hash.go b/go/arrow/compute/internal/kernels/vector_hash.go
index 5c9ed0a8c712e..6da52e075443f 100644
--- a/go/arrow/compute/internal/kernels/vector_hash.go
+++ b/go/arrow/compute/internal/kernels/vector_hash.go
@@ -21,13 +21,13 @@ package kernels
 import (
 	"fmt"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
-	"github.com/apache/arrow/go/v16/internal/hashing"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
+	"github.com/apache/arrow/go/v17/internal/hashing"
 )
 
 type HashState interface {
diff --git a/go/arrow/compute/internal/kernels/vector_run_end_encode.go b/go/arrow/compute/internal/kernels/vector_run_end_encode.go
index 6275a61510993..f9f517585699a 100644
--- a/go/arrow/compute/internal/kernels/vector_run_end_encode.go
+++ b/go/arrow/compute/internal/kernels/vector_run_end_encode.go
@@ -24,14 +24,14 @@ import (
 	"sort"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 type RunEndEncodeState struct {
diff --git a/go/arrow/compute/internal/kernels/vector_selection.go b/go/arrow/compute/internal/kernels/vector_selection.go
index 7734b7b123eaa..b4fd90848a229 100644
--- a/go/arrow/compute/internal/kernels/vector_selection.go
+++ b/go/arrow/compute/internal/kernels/vector_selection.go
@@ -22,13 +22,13 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
 )
 
 type NullSelectionBehavior int8
diff --git a/go/arrow/compute/registry.go b/go/arrow/compute/registry.go
index dc89fe1a621e0..8c42cc9724283 100644
--- a/go/arrow/compute/registry.go
+++ b/go/arrow/compute/registry.go
@@ -21,7 +21,7 @@ package compute
 import (
 	"sync"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 	"golang.org/x/exp/maps"
 	"golang.org/x/exp/slices"
 )
diff --git a/go/arrow/compute/registry_test.go b/go/arrow/compute/registry_test.go
index 16e51514f8b2a..783f75e115333 100644
--- a/go/arrow/compute/registry_test.go
+++ b/go/arrow/compute/registry_test.go
@@ -23,9 +23,9 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/exp/slices"
 )
diff --git a/go/arrow/compute/scalar_bool.go b/go/arrow/compute/scalar_bool.go
index a7e85dfeb479c..ed6007af9234b 100644
--- a/go/arrow/compute/scalar_bool.go
+++ b/go/arrow/compute/scalar_bool.go
@@ -21,9 +21,9 @@ package compute
 import (
 	"fmt"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/compute/internal/kernels"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/compute/internal/kernels"
 )
 
 var (
diff --git a/go/arrow/compute/scalar_bool_test.go b/go/arrow/compute/scalar_bool_test.go
index dd9bfbbd8a689..2ae7f2cba532b 100644
--- a/go/arrow/compute/scalar_bool_test.go
+++ b/go/arrow/compute/scalar_bool_test.go
@@ -23,11 +23,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/go/arrow/compute/scalar_compare.go b/go/arrow/compute/scalar_compare.go
index 6150e610b9a3d..7092431a01549 100644
--- a/go/arrow/compute/scalar_compare.go
+++ b/go/arrow/compute/scalar_compare.go
@@ -21,9 +21,9 @@ package compute
 import (
 	"context"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/compute/internal/kernels"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/compute/internal/kernels"
 )
 
 type compareFunction struct {
diff --git a/go/arrow/compute/scalar_compare_test.go b/go/arrow/compute/scalar_compare_test.go
index 0e08fc11dcbca..9f1115312829f 100644
--- a/go/arrow/compute/scalar_compare_test.go
+++ b/go/arrow/compute/scalar_compare_test.go
@@ -24,15 +24,15 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/compute/internal/kernels"
-	"github.com/apache/arrow/go/v16/arrow/internal/testing/gen"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/compute/internal/kernels"
+	"github.com/apache/arrow/go/v17/arrow/internal/testing/gen"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
diff --git a/go/arrow/compute/selection.go b/go/arrow/compute/selection.go
index 77d76b95863c2..e2966189c9f6a 100644
--- a/go/arrow/compute/selection.go
+++ b/go/arrow/compute/selection.go
@@ -22,10 +22,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/compute/internal/kernels"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/compute/internal/kernels"
 	"golang.org/x/sync/errgroup"
 )
 
diff --git a/go/arrow/compute/utils.go b/go/arrow/compute/utils.go
index 9c9b63955eb02..b20688539f146 100644
--- a/go/arrow/compute/utils.go
+++ b/go/arrow/compute/utils.go
@@ -24,12 +24,12 @@ import (
 	"math"
 	"time"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/compute/internal/kernels"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/compute/internal/kernels"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/arrow/compute/vector_hash.go b/go/arrow/compute/vector_hash.go
index e7d7aaa5a7562..7fcbce19ada4c 100644
--- a/go/arrow/compute/vector_hash.go
+++ b/go/arrow/compute/vector_hash.go
@@ -21,8 +21,8 @@ package compute
 import (
 	"context"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/compute/internal/kernels"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/compute/internal/kernels"
 )
 
 var (
diff --git a/go/arrow/compute/vector_hash_test.go b/go/arrow/compute/vector_hash_test.go
index ba604f31e9fca..87a4eb6806a9b 100644
--- a/go/arrow/compute/vector_hash_test.go
+++ b/go/arrow/compute/vector_hash_test.go
@@ -23,12 +23,12 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
diff --git a/go/arrow/compute/vector_run_end_test.go b/go/arrow/compute/vector_run_end_test.go
index 2c4170e07cd1c..a6cc1306a625b 100644
--- a/go/arrow/compute/vector_run_end_test.go
+++ b/go/arrow/compute/vector_run_end_test.go
@@ -25,13 +25,13 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/internal/testing/gen"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/internal/testing/gen"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/suite"
 )
 
diff --git a/go/arrow/compute/vector_run_ends.go b/go/arrow/compute/vector_run_ends.go
index 8ce369241739f..09b872f486a01 100644
--- a/go/arrow/compute/vector_run_ends.go
+++ b/go/arrow/compute/vector_run_ends.go
@@ -21,8 +21,8 @@ package compute
 import (
 	"context"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/compute/internal/kernels"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/compute/internal/kernels"
 )
 
 var (
diff --git a/go/arrow/compute/vector_selection_test.go b/go/arrow/compute/vector_selection_test.go
index c49f751fd0526..2331a2d0342b5 100644
--- a/go/arrow/compute/vector_selection_test.go
+++ b/go/arrow/compute/vector_selection_test.go
@@ -24,15 +24,15 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/compute/exec"
-	"github.com/apache/arrow/go/v16/arrow/compute/internal/kernels"
-	"github.com/apache/arrow/go/v16/arrow/internal/testing/gen"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/compute/exec"
+	"github.com/apache/arrow/go/v17/arrow/compute/internal/kernels"
+	"github.com/apache/arrow/go/v17/arrow/internal/testing/gen"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
+	"github.com/apache/arrow/go/v17/internal/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
diff --git a/go/arrow/csv/common.go b/go/arrow/csv/common.go
index 173d8559c7e26..06fed69a77fe5 100644
--- a/go/arrow/csv/common.go
+++ b/go/arrow/csv/common.go
@@ -23,8 +23,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 var (
@@ -239,21 +239,31 @@ func WithStringsReplacer(replacer *strings.Replacer) Option {
 
 func validate(schema *arrow.Schema) {
 	for i, f := range schema.Fields() {
-		switch ft := f.Type.(type) {
-		case *arrow.BooleanType:
-		case *arrow.Int8Type, *arrow.Int16Type, *arrow.Int32Type, *arrow.Int64Type:
-		case *arrow.Uint8Type, *arrow.Uint16Type, *arrow.Uint32Type, *arrow.Uint64Type:
-		case *arrow.Float16Type, *arrow.Float32Type, *arrow.Float64Type:
-		case *arrow.StringType, *arrow.LargeStringType:
-		case *arrow.TimestampType:
-		case *arrow.Date32Type, *arrow.Date64Type:
-		case *arrow.Decimal128Type, *arrow.Decimal256Type:
-		case *arrow.ListType, *arrow.LargeListType, *arrow.FixedSizeListType:
-		case *arrow.BinaryType, *arrow.LargeBinaryType, *arrow.FixedSizeBinaryType:
-		case arrow.ExtensionType:
-		case *arrow.NullType:
-		default:
-			panic(fmt.Errorf("arrow/csv: field %d (%s) has invalid data type %T", i, f.Name, ft))
+		if !typeSupported(f.Type) {
+			panic(fmt.Errorf("arrow/csv: field %d (%s) has invalid data type %T", i, f.Name, f.Type))
 		}
 	}
 }
+
+func typeSupported(dt arrow.DataType) bool {
+	switch dt := dt.(type) {
+	case *arrow.BooleanType:
+	case *arrow.Int8Type, *arrow.Int16Type, *arrow.Int32Type, *arrow.Int64Type:
+	case *arrow.Uint8Type, *arrow.Uint16Type, *arrow.Uint32Type, *arrow.Uint64Type:
+	case *arrow.Float16Type, *arrow.Float32Type, *arrow.Float64Type:
+	case *arrow.StringType, *arrow.LargeStringType:
+	case *arrow.TimestampType:
+	case *arrow.Date32Type, *arrow.Date64Type:
+	case *arrow.Decimal128Type, *arrow.Decimal256Type:
+	case *arrow.MapType:
+		return false
+	case arrow.ListLikeType:
+		return typeSupported(dt.Elem())
+	case *arrow.BinaryType, *arrow.LargeBinaryType, *arrow.FixedSizeBinaryType:
+	case arrow.ExtensionType:
+	case *arrow.NullType:
+	default:
+		return false
+	}
+	return true
+}
diff --git a/go/arrow/csv/reader.go b/go/arrow/csv/reader.go
index 05e79e6500fc4..46591a9a5adee 100644
--- a/go/arrow/csv/reader.go
+++ b/go/arrow/csv/reader.go
@@ -29,13 +29,13 @@ import (
 	"time"
 	"unicode/utf8"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 // Reader wraps encoding/csv.Reader and creates array.Records from a schema.
@@ -474,6 +474,10 @@ func (r *Reader) initFieldConverter(bldr array.Builder) func(string) {
 		return func(str string) {
 			r.parseDate32(bldr, str)
 		}
+	case *arrow.Date64Type:
+		return func(str string) {
+			r.parseDate64(bldr, str)
+		}
 	case *arrow.Time32Type:
 		return func(str string) {
 			r.parseTime32(bldr, str, dt.Unit)
@@ -486,17 +490,13 @@ func (r *Reader) initFieldConverter(bldr array.Builder) func(string) {
 		return func(str string) {
 			r.parseDecimal256(bldr, str, dt.Precision, dt.Scale)
 		}
-	case *arrow.ListType:
-		return func(s string) {
-			r.parseList(bldr, s)
-		}
-	case *arrow.LargeListType:
+	case *arrow.FixedSizeListType:
 		return func(s string) {
-			r.parseLargeList(bldr, s)
+			r.parseFixedSizeList(bldr.(*array.FixedSizeListBuilder), s, int(dt.Len()))
 		}
-	case *arrow.FixedSizeListType:
+	case arrow.ListLikeType:
 		return func(s string) {
-			r.parseFixedSizeList(bldr, s, int(dt.Len()))
+			r.parseListLike(bldr.(array.ListLikeBuilder), s)
 		}
 	case *arrow.BinaryType:
 		return func(s string) {
@@ -740,81 +740,67 @@ func (r *Reader) parseDate32(field array.Builder, str string) {
 	field.(*array.Date32Builder).Append(arrow.Date32FromTime(tm))
 }
 
-func (r *Reader) parseTime32(field array.Builder, str string, unit arrow.TimeUnit) {
+func (r *Reader) parseDate64(field array.Builder, str string) {
 	if r.isNull(str) {
 		field.AppendNull()
 		return
 	}
 
-	val, err := arrow.Time32FromString(str, unit)
+	tm, err := time.Parse("2006-01-02", str)
 	if err != nil && r.err == nil {
 		r.err = err
 		field.AppendNull()
 		return
 	}
-	field.(*array.Time32Builder).Append(val)
+	field.(*array.Date64Builder).Append(arrow.Date64FromTime(tm))
 }
 
-func (r *Reader) parseDecimal128(field array.Builder, str string, prec, scale int32) {
+func (r *Reader) parseTime32(field array.Builder, str string, unit arrow.TimeUnit) {
 	if r.isNull(str) {
 		field.AppendNull()
 		return
 	}
 
-	val, err := decimal128.FromString(str, prec, scale)
+	val, err := arrow.Time32FromString(str, unit)
 	if err != nil && r.err == nil {
 		r.err = err
 		field.AppendNull()
 		return
 	}
-	field.(*array.Decimal128Builder).Append(val)
+	field.(*array.Time32Builder).Append(val)
 }
 
-func (r *Reader) parseDecimal256(field array.Builder, str string, prec, scale int32) {
+func (r *Reader) parseDecimal128(field array.Builder, str string, prec, scale int32) {
 	if r.isNull(str) {
 		field.AppendNull()
 		return
 	}
 
-	val, err := decimal256.FromString(str, prec, scale)
+	val, err := decimal128.FromString(str, prec, scale)
 	if err != nil && r.err == nil {
 		r.err = err
 		field.AppendNull()
 		return
 	}
-	field.(*array.Decimal256Builder).Append(val)
+	field.(*array.Decimal128Builder).Append(val)
 }
 
-func (r *Reader) parseList(field array.Builder, str string) {
+func (r *Reader) parseDecimal256(field array.Builder, str string, prec, scale int32) {
 	if r.isNull(str) {
 		field.AppendNull()
 		return
 	}
-	if !(strings.HasPrefix(str, "{") && strings.HasSuffix(str, "}")) {
-		r.err = errors.New("invalid list format. should start with '{' and end with '}'")
-		return
-	}
-	str = strings.Trim(str, "{}")
-	listBldr := field.(*array.ListBuilder)
-	listBldr.Append(true)
-	if len(str) == 0 {
-		// we don't want to create the csv reader if we already know the
-		// string is empty
-		return
-	}
-	valueBldr := listBldr.ValueBuilder()
-	reader := csv.NewReader(strings.NewReader(str))
-	items, err := reader.Read()
-	if err != nil {
+
+	val, err := decimal256.FromString(str, prec, scale)
+	if err != nil && r.err == nil {
 		r.err = err
+		field.AppendNull()
 		return
 	}
-	for _, str := range items {
-		r.initFieldConverter(valueBldr)(str)
-	}
+	field.(*array.Decimal256Builder).Append(val)
 }
 
-func (r *Reader) parseLargeList(field array.Builder, str string) {
+func (r *Reader) parseListLike(field array.ListLikeBuilder, str string) {
 	if r.isNull(str) {
 		field.AppendNull()
 		return
@@ -824,14 +810,13 @@ func (r *Reader) parseLargeList(field array.Builder, str string) {
 		return
 	}
 	str = strings.Trim(str, "{}")
-	largeListBldr := field.(*array.LargeListBuilder)
-	largeListBldr.Append(true)
+	field.Append(true)
 	if len(str) == 0 {
 		// we don't want to create the csv reader if we already know the
 		// string is empty
 		return
 	}
-	valueBldr := largeListBldr.ValueBuilder()
+	valueBldr := field.ValueBuilder()
 	reader := csv.NewReader(strings.NewReader(str))
 	items, err := reader.Read()
 	if err != nil {
@@ -843,7 +828,7 @@ func (r *Reader) parseLargeList(field array.Builder, str string) {
 	}
 }
 
-func (r *Reader) parseFixedSizeList(field array.Builder, str string, n int) {
+func (r *Reader) parseFixedSizeList(field *array.FixedSizeListBuilder, str string, n int) {
 	if r.isNull(str) {
 		field.AppendNull()
 		return
@@ -853,14 +838,13 @@ func (r *Reader) parseFixedSizeList(field array.Builder, str string, n int) {
 		return
 	}
 	str = strings.Trim(str, "{}")
-	fixedSizeListBldr := field.(*array.FixedSizeListBuilder)
-	fixedSizeListBldr.Append(true)
+	field.Append(true)
 	if len(str) == 0 {
 		// we don't want to create the csv reader if we already know the
 		// string is empty
 		return
 	}
-	valueBldr := fixedSizeListBldr.ValueBuilder()
+	valueBldr := field.ValueBuilder()
 	reader := csv.NewReader(strings.NewReader(str))
 	items, err := reader.Read()
 	if err != nil {
diff --git a/go/arrow/csv/reader_test.go b/go/arrow/csv/reader_test.go
index 7e131c6dfe0b7..65453db015a7e 100644
--- a/go/arrow/csv/reader_test.go
+++ b/go/arrow/csv/reader_test.go
@@ -25,13 +25,13 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/csv"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/csv"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -357,6 +357,8 @@ func testCSVReader(t *testing.T, filepath string, withHeader bool, stringsCanBeN
 			{Name: "large_binary", Type: arrow.BinaryTypes.LargeBinary},
 			{Name: "fixed_size_binary", Type: &arrow.FixedSizeBinaryType{ByteWidth: 3}},
 			{Name: "uuid", Type: types.NewUUIDType()},
+			{Name: "date32", Type: arrow.PrimitiveTypes.Date32},
+			{Name: "date64", Type: arrow.PrimitiveTypes.Date64},
 		},
 		nil,
 	)
@@ -420,6 +422,8 @@ rec[0]["binary"]: ["\x00\x01\x02"]
 rec[0]["large_binary"]: ["\x00\x01\x02"]
 rec[0]["fixed_size_binary"]: ["\x00\x01\x02"]
 rec[0]["uuid"]: ["00000000-0000-0000-0000-000000000001"]
+rec[0]["date32"]: [19121]
+rec[0]["date64"]: [1652054400000]
 rec[1]["bool"]: [false]
 rec[1]["i8"]: [-2]
 rec[1]["i16"]: [-2]
@@ -442,6 +446,8 @@ rec[1]["binary"]: [(null)]
 rec[1]["large_binary"]: [(null)]
 rec[1]["fixed_size_binary"]: [(null)]
 rec[1]["uuid"]: ["00000000-0000-0000-0000-000000000002"]
+rec[1]["date32"]: [19121]
+rec[1]["date64"]: [1652054400000]
 rec[2]["bool"]: [(null)]
 rec[2]["i8"]: [(null)]
 rec[2]["i16"]: [(null)]
@@ -464,6 +470,8 @@ rec[2]["binary"]: [(null)]
 rec[2]["large_binary"]: [(null)]
 rec[2]["fixed_size_binary"]: [(null)]
 rec[2]["uuid"]: [(null)]
+rec[2]["date32"]: [(null)]
+rec[2]["date64"]: [(null)]
 `, str1Value, str1Value, str2Value, str2Value)
 	got, want := out.String(), want
 	require.Equal(t, want, got)
diff --git a/go/arrow/csv/testdata/header.csv b/go/arrow/csv/testdata/header.csv
index 50be4f5e4daca..68ae18a499dee 100644
--- a/go/arrow/csv/testdata/header.csv
+++ b/go/arrow/csv/testdata/header.csv
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-bool;i8;i16;i32;i64;u8;u16;u32;u64;f16;f32;f64;str;large_str;ts;list(i64);large_list(i64);fixed_size_list(i64);binary;large_binary;fixed_size_binary;uuid
-true;-1;-1;-1;-1;1;1;1;1;1.1;1.1;1.1;str-1;str-1;2022-05-09T00:01:01;{1,2,3};{1,2,3};{1,2,3};AAEC;AAEC;AAEC;00000000-0000-0000-0000-000000000001
-false;-2;-2;-2;-2;2;2;2;2;2.2;2.2;2.2;;;2022-05-09T23:59:59;{};{};{4,5,6};;;;00000000-0000-0000-0000-000000000002
-null;NULL;null;N/A;;null;null;null;null;null;null;null;null;null;null;null;null;null;null;null;null;null
\ No newline at end of file
+bool;i8;i16;i32;i64;u8;u16;u32;u64;f16;f32;f64;str;large_str;ts;list(i64);large_list(i64);fixed_size_list(i64);binary;large_binary;fixed_size_binary;uuid;date32;date64
+true;-1;-1;-1;-1;1;1;1;1;1.1;1.1;1.1;str-1;str-1;2022-05-09T00:01:01;{1,2,3};{1,2,3};{1,2,3};AAEC;AAEC;AAEC;00000000-0000-0000-0000-000000000001;2022-05-09;2022-05-09
+false;-2;-2;-2;-2;2;2;2;2;2.2;2.2;2.2;;;2022-05-09T23:59:59;{};{};{4,5,6};;;;00000000-0000-0000-0000-000000000002;2022-05-09;2022-05-09
+null;NULL;null;N/A;;null;null;null;null;null;null;null;null;null;null;null;null;null;null;null;null;null;null;null
\ No newline at end of file
diff --git a/go/arrow/csv/testdata/types.csv b/go/arrow/csv/testdata/types.csv
index d32941f4b214d..91c0cf3b252b3 100644
--- a/go/arrow/csv/testdata/types.csv
+++ b/go/arrow/csv/testdata/types.csv
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-## supported types: bool;int8;int16;int32;int64;uint8;uint16;uint32;uint64;float16;float32;float64;string;large_string;timestamp;list(i64);large_list(i64);fixed_size_list(i64);binary;large_binary;fixed_size_binary;uuid
-true;-1;-1;-1;-1;1;1;1;1;1.1;1.1;1.1;str-1;str-1;2022-05-09T00:01:01;{1,2,3};{1,2,3};{1,2,3};AAEC;AAEC;AAEC;00000000-0000-0000-0000-000000000001
-false;-2;-2;-2;-2;2;2;2;2;2.2;2.2;2.2;;;2022-05-09T23:59:59;{};{};{4,5,6};;;;00000000-0000-0000-0000-000000000002
-null;NULL;null;N/A;;null;null;null;null;null;null;null;null;null;null;null;null;null;null;null;null;null
\ No newline at end of file
+## supported types: bool;int8;int16;int32;int64;uint8;uint16;uint32;uint64;float16;float32;float64;string;large_string;timestamp;list(i64);large_list(i64);fixed_size_list(i64);binary;large_binary;fixed_size_binary;uuid;date32;date64
+true;-1;-1;-1;-1;1;1;1;1;1.1;1.1;1.1;str-1;str-1;2022-05-09T00:01:01;{1,2,3};{1,2,3};{1,2,3};AAEC;AAEC;AAEC;00000000-0000-0000-0000-000000000001;2022-05-09;2022-05-09
+false;-2;-2;-2;-2;2;2;2;2;2.2;2.2;2.2;;;2022-05-09T23:59:59;{};{};{4,5,6};;;;00000000-0000-0000-0000-000000000002;2022-05-09;2022-05-09
+null;NULL;null;N/A;;null;null;null;null;null;null;null;null;null;null;null;null;null;null;null;null;null;null;null
\ No newline at end of file
diff --git a/go/arrow/csv/transformer.go b/go/arrow/csv/transformer.go
index 6f66fdb474f63..237437c0441e1 100644
--- a/go/arrow/csv/transformer.go
+++ b/go/arrow/csv/transformer.go
@@ -25,11 +25,11 @@ import (
 	"math/big"
 	"strconv"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
-func (w *Writer) transformColToStringArr(typ arrow.DataType, col arrow.Array, stringsReplacer func(string)string) []string {
+func (w *Writer) transformColToStringArr(typ arrow.DataType, col arrow.Array, stringsReplacer func(string) string) []string {
 	res := make([]string, col.Len())
 	switch typ.(type) {
 	case *arrow.BooleanType:
@@ -215,62 +215,25 @@ func (w *Writer) transformColToStringArr(typ arrow.DataType, col arrow.Array, st
 				res[i] = w.nullValue
 			}
 		}
-	case *arrow.ListType:
-		arr := col.(*array.List)
-		listVals, offsets := arr.ListValues(), arr.Offsets()
-		for i := 0; i < arr.Len(); i++ {
-			if arr.IsValid(i) {
-				list := array.NewSlice(listVals, int64(offsets[i]), int64(offsets[i+1]))
-				var b bytes.Buffer
-				b.Write([]byte{'{'})
-				writer := csv.NewWriter(&b)
-				writer.Write(w.transformColToStringArr(list.DataType(), list, stringsReplacer))
-				writer.Flush()
-				b.Truncate(b.Len() - 1)
-				b.Write([]byte{'}'})
-				res[i] = b.String()
-				list.Release()
-			} else {
-				res[i] = w.nullValue
-			}
-		}
-	case *arrow.LargeListType:
-		arr := col.(*array.LargeList)
-		listVals, offsets := arr.ListValues(), arr.Offsets()
-		for i := 0; i < arr.Len(); i++ {
-			if arr.IsValid(i) {
-				list := array.NewSlice(listVals, int64(offsets[i]), int64(offsets[i+1]))
-				var b bytes.Buffer
-				b.Write([]byte{'{'})
-				writer := csv.NewWriter(&b)
-				writer.Write(w.transformColToStringArr(list.DataType(), list, stringsReplacer))
-				writer.Flush()
-				b.Truncate(b.Len() - 1)
-				b.Write([]byte{'}'})
-				res[i] = b.String()
-				list.Release()
-			} else {
-				res[i] = w.nullValue
-			}
-		}
-	case *arrow.FixedSizeListType:
-		arr := col.(*array.FixedSizeList)
+	case arrow.ListLikeType:
+		arr := col.(array.ListLike)
 		listVals := arr.ListValues()
 		for i := 0; i < arr.Len(); i++ {
-			if arr.IsValid(i) {
-				list := array.NewSlice(listVals, int64((arr.Len()-1)*i), int64((arr.Len()-1)*(i+1)))
-				var b bytes.Buffer
-				b.Write([]byte{'{'})
-				writer := csv.NewWriter(&b)
-				writer.Write(w.transformColToStringArr(list.DataType(), list, stringsReplacer))
-				writer.Flush()
-				b.Truncate(b.Len() - 1)
-				b.Write([]byte{'}'})
-				res[i] = b.String()
-				list.Release()
-			} else {
+			if arr.IsNull(i) {
 				res[i] = w.nullValue
+				continue
 			}
+			start, end := arr.ValueOffsets(i)
+			list := array.NewSlice(listVals, start, end)
+			var b bytes.Buffer
+			b.Write([]byte{'{'})
+			writer := csv.NewWriter(&b)
+			writer.Write(w.transformColToStringArr(list.DataType(), list, stringsReplacer))
+			writer.Flush()
+			b.Truncate(b.Len() - 1)
+			b.Write([]byte{'}'})
+			res[i] = b.String()
+			list.Release()
 		}
 	case *arrow.BinaryType:
 		arr := col.(*array.Binary)
diff --git a/go/arrow/csv/writer.go b/go/arrow/csv/writer.go
index d99f4c86c3785..243d83f7d847f 100644
--- a/go/arrow/csv/writer.go
+++ b/go/arrow/csv/writer.go
@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 // Writer wraps encoding/csv.Writer and writes arrow.Record based on a schema.
diff --git a/go/arrow/csv/writer_test.go b/go/arrow/csv/writer_test.go
index 9ca5e063989a4..ef9769fc32876 100644
--- a/go/arrow/csv/writer_test.go
+++ b/go/arrow/csv/writer_test.go
@@ -26,14 +26,14 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/csv"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/csv"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/types"
 	"github.com/google/uuid"
 )
 
diff --git a/go/arrow/datatype.go b/go/arrow/datatype.go
index f8fffe5d36399..8fff5e652572b 100644
--- a/go/arrow/datatype.go
+++ b/go/arrow/datatype.go
@@ -21,7 +21,7 @@ import (
 	"hash/maphash"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 )
 
 // Type is a logical type. They can be expressed as
diff --git a/go/arrow/datatype_binary_test.go b/go/arrow/datatype_binary_test.go
index 48c4f0c839079..41dee140c5a44 100644
--- a/go/arrow/datatype_binary_test.go
+++ b/go/arrow/datatype_binary_test.go
@@ -19,7 +19,7 @@ package arrow_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 func TestBinaryType(t *testing.T) {
diff --git a/go/arrow/datatype_extension_test.go b/go/arrow/datatype_extension_test.go
index 92d04b5c3db7a..92fcacd620586 100644
--- a/go/arrow/datatype_extension_test.go
+++ b/go/arrow/datatype_extension_test.go
@@ -20,8 +20,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/internal/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 )
diff --git a/go/arrow/datatype_fixedwidth.go b/go/arrow/datatype_fixedwidth.go
index 21edd41d232e4..a1c2834b8d574 100644
--- a/go/arrow/datatype_fixedwidth.go
+++ b/go/arrow/datatype_fixedwidth.go
@@ -22,7 +22,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/internal/json"
 
 	"golang.org/x/xerrors"
 )
diff --git a/go/arrow/datatype_fixedwidth_test.go b/go/arrow/datatype_fixedwidth_test.go
index 2ef05554ad86c..f4f3b071ff5d4 100644
--- a/go/arrow/datatype_fixedwidth_test.go
+++ b/go/arrow/datatype_fixedwidth_test.go
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/datatype_nested.go b/go/arrow/datatype_nested.go
index 1a31eb6312ba9..b38983b7f2e5d 100644
--- a/go/arrow/datatype_nested.go
+++ b/go/arrow/datatype_nested.go
@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 )
 
 type (
@@ -877,7 +877,7 @@ func DenseUnionFromArrays(children []Array, fields []string, codes []UnionTypeCo
 }
 
 // DenseUnionOf is equivalent to UnionOf(arrow.DenseMode, fields, typeCodes),
-// constructing a SparseUnionType from a list of fields and type codes.
+// constructing a DenseUnionType from a list of fields and type codes.
 //
 // If len(fields) != len(typeCodes) this will panic. They are allowed to be
 // of length 0.
diff --git a/go/arrow/datatype_nested_test.go b/go/arrow/datatype_nested_test.go
index a1daa8e58df31..fc4c672c6b768 100644
--- a/go/arrow/datatype_nested_test.go
+++ b/go/arrow/datatype_nested_test.go
@@ -94,14 +94,14 @@ func TestStructOf(t *testing.T) {
 			fields: []Field{{Name: "f1", Type: PrimitiveTypes.Int32}},
 			want: &StructType{
 				fields: []Field{{Name: "f1", Type: PrimitiveTypes.Int32}},
-				index:  map[string][]int{"f1": []int{0}},
+				index:  map[string][]int{"f1": {0}},
 			},
 		},
 		{
 			fields: []Field{{Name: "f1", Type: PrimitiveTypes.Int32, Nullable: true}},
 			want: &StructType{
 				fields: []Field{{Name: "f1", Type: PrimitiveTypes.Int32, Nullable: true}},
-				index:  map[string][]int{"f1": []int{0}},
+				index:  map[string][]int{"f1": {0}},
 			},
 		},
 		{
@@ -114,7 +114,7 @@ func TestStructOf(t *testing.T) {
 					{Name: "f1", Type: PrimitiveTypes.Int32},
 					{Name: "", Type: PrimitiveTypes.Int64},
 				},
-				index: map[string][]int{"f1": []int{0}, "": []int{1}},
+				index: map[string][]int{"f1": {0}, "": {1}},
 			},
 		},
 		{
@@ -127,7 +127,7 @@ func TestStructOf(t *testing.T) {
 					{Name: "f1", Type: PrimitiveTypes.Int32},
 					{Name: "f2", Type: PrimitiveTypes.Int64},
 				},
-				index: map[string][]int{"f1": []int{0}, "f2": []int{1}},
+				index: map[string][]int{"f1": {0}, "f2": {1}},
 			},
 		},
 		{
@@ -142,7 +142,7 @@ func TestStructOf(t *testing.T) {
 					{Name: "f2", Type: PrimitiveTypes.Int64},
 					{Name: "f3", Type: ListOf(PrimitiveTypes.Float64)},
 				},
-				index: map[string][]int{"f1": []int{0}, "f2": []int{1}, "f3": []int{2}},
+				index: map[string][]int{"f1": {0}, "f2": {1}, "f3": {2}},
 			},
 		},
 		{
@@ -157,7 +157,7 @@ func TestStructOf(t *testing.T) {
 					{Name: "f2", Type: PrimitiveTypes.Int64},
 					{Name: "f3", Type: ListOf(ListOf(PrimitiveTypes.Float64))},
 				},
-				index: map[string][]int{"f1": []int{0}, "f2": []int{1}, "f3": []int{2}},
+				index: map[string][]int{"f1": {0}, "f2": {1}, "f3": {2}},
 			},
 		},
 		{
@@ -172,7 +172,7 @@ func TestStructOf(t *testing.T) {
 					{Name: "f2", Type: PrimitiveTypes.Int64},
 					{Name: "f3", Type: ListOf(ListOf(StructOf(Field{Name: "f1", Type: PrimitiveTypes.Float64})))},
 				},
-				index: map[string][]int{"f1": []int{0}, "f2": []int{1}, "f3": []int{2}},
+				index: map[string][]int{"f1": {0}, "f2": {1}, "f3": {2}},
 			},
 		},
 		{
@@ -187,7 +187,7 @@ func TestStructOf(t *testing.T) {
 					{Name: "f2", Type: PrimitiveTypes.Int64},
 					{Name: "f1", Type: PrimitiveTypes.Int64},
 				},
-				index: map[string][]int{"f1": []int{0, 2}, "f2": []int{1}},
+				index: map[string][]int{"f1": {0, 2}, "f2": {1}},
 			},
 		},
 	} {
diff --git a/go/arrow/datatype_null_test.go b/go/arrow/datatype_null_test.go
index b12d1fc60db6a..b72395843ef8b 100644
--- a/go/arrow/datatype_null_test.go
+++ b/go/arrow/datatype_null_test.go
@@ -19,7 +19,7 @@ package arrow_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 func TestNullType(t *testing.T) {
diff --git a/go/arrow/datatype_viewheader.go b/go/arrow/datatype_viewheader.go
index bbd7f977db809..8dd2fa4881e2f 100644
--- a/go/arrow/datatype_viewheader.go
+++ b/go/arrow/datatype_viewheader.go
@@ -20,9 +20,9 @@ import (
 	"bytes"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/endian"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 const (
diff --git a/go/arrow/datatype_viewheader_inline.go b/go/arrow/datatype_viewheader_inline.go
index 9ffc0a1f98339..24f518d0e236a 100644
--- a/go/arrow/datatype_viewheader_inline.go
+++ b/go/arrow/datatype_viewheader_inline.go
@@ -21,7 +21,7 @@ package arrow
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 )
 
 func (sh *ViewHeader) InlineString() (data string) {
diff --git a/go/arrow/datatype_viewheader_inline_go1.19.go b/go/arrow/datatype_viewheader_inline_go1.19.go
index 3933f44df065c..2f7299ec111b4 100644
--- a/go/arrow/datatype_viewheader_inline_go1.19.go
+++ b/go/arrow/datatype_viewheader_inline_go1.19.go
@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 )
 
 func (sh *ViewHeader) InlineString() (data string) {
diff --git a/go/arrow/datatype_viewheader_inline_tinygo.go b/go/arrow/datatype_viewheader_inline_tinygo.go
index 3c0dea4a72587..b309c07710e3e 100644
--- a/go/arrow/datatype_viewheader_inline_tinygo.go
+++ b/go/arrow/datatype_viewheader_inline_tinygo.go
@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 )
 
 func (sh *ViewHeader) InlineString() (data string) {
diff --git a/go/arrow/decimal128/decimal128.go b/go/arrow/decimal128/decimal128.go
index 68b4d66e1bd38..e4b19797d5462 100644
--- a/go/arrow/decimal128/decimal128.go
+++ b/go/arrow/decimal128/decimal128.go
@@ -23,7 +23,7 @@ import (
 	"math/big"
 	"math/bits"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 )
 
 const (
diff --git a/go/arrow/decimal128/decimal128_test.go b/go/arrow/decimal128/decimal128_test.go
index a36ae0622aa98..11e293ee3ebb0 100644
--- a/go/arrow/decimal128/decimal128_test.go
+++ b/go/arrow/decimal128/decimal128_test.go
@@ -22,7 +22,7 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/go/arrow/decimal256/decimal256.go b/go/arrow/decimal256/decimal256.go
index cb1a41c84b5a6..d5abfc2298a40 100644
--- a/go/arrow/decimal256/decimal256.go
+++ b/go/arrow/decimal256/decimal256.go
@@ -23,8 +23,8 @@ import (
 	"math/big"
 	"math/bits"
 
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 )
 
 const (
diff --git a/go/arrow/decimal256/decimal256_test.go b/go/arrow/decimal256/decimal256_test.go
index 3e0a97e430b45..07c147bacf2f1 100644
--- a/go/arrow/decimal256/decimal256_test.go
+++ b/go/arrow/decimal256/decimal256_test.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/doc.go b/go/arrow/doc.go
index 19f24c5d0b8c3..93e838d20e4d0 100644
--- a/go/arrow/doc.go
+++ b/go/arrow/doc.go
@@ -34,7 +34,7 @@ To build with tinygo include the noasm build tag.
 */
 package arrow
 
-const PkgVersion = "16.0.0-SNAPSHOT"
+const PkgVersion = "17.0.0-SNAPSHOT"
 
 //go:generate go run _tools/tmpl/main.go -i -data=numeric.tmpldata type_traits_numeric.gen.go.tmpl type_traits_numeric.gen_test.go.tmpl array/numeric.gen.go.tmpl array/numericbuilder.gen.go.tmpl array/bufferbuilder_numeric.gen.go.tmpl
 //go:generate go run _tools/tmpl/main.go -i -data=datatype_numeric.gen.go.tmpldata datatype_numeric.gen.go.tmpl tensor/numeric.gen.go.tmpl tensor/numeric.gen_test.go.tmpl
diff --git a/go/arrow/encoded/ree_utils.go b/go/arrow/encoded/ree_utils.go
index daa265369ca7b..0493d71f31f5c 100644
--- a/go/arrow/encoded/ree_utils.go
+++ b/go/arrow/encoded/ree_utils.go
@@ -20,7 +20,7 @@ import (
 	"math"
 	"sort"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 // FindPhysicalIndex performs a binary search on the run-ends to return
diff --git a/go/arrow/encoded/ree_utils_test.go b/go/arrow/encoded/ree_utils_test.go
index 454ab2810008c..99b8252d1d7c2 100644
--- a/go/arrow/encoded/ree_utils_test.go
+++ b/go/arrow/encoded/ree_utils_test.go
@@ -21,10 +21,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/encoded"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/encoded"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/endian/endian.go b/go/arrow/endian/endian.go
index 7b7ce57f5d561..234c58cde1d14 100644
--- a/go/arrow/endian/endian.go
+++ b/go/arrow/endian/endian.go
@@ -17,8 +17,8 @@
 package endian
 
 import (
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/internal/flatbuf"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/internal/flatbuf"
 )
 
 type Endianness flatbuf.Endianness
diff --git a/go/arrow/example_test.go b/go/arrow/example_test.go
index 9b7ae11d451ad..fbb092ef5baeb 100644
--- a/go/arrow/example_test.go
+++ b/go/arrow/example_test.go
@@ -20,14 +20,13 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/tensor"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/tensor"
 )
 
 // This example demonstrates how to build an array of int64 values using a builder and Append.
-// Whilst convenient for small arrays,
 func Example_minimal() {
 	// Create an allocator.
 	pool := memory.NewGoAllocator()
diff --git a/go/arrow/flight/basic_auth_flight_test.go b/go/arrow/flight/basic_auth_flight_test.go
index e1cc6c1cd7b3c..c602521714727 100755
--- a/go/arrow/flight/basic_auth_flight_test.go
+++ b/go/arrow/flight/basic_auth_flight_test.go
@@ -22,7 +22,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials/insecure"
diff --git a/go/arrow/flight/client.go b/go/arrow/flight/client.go
index 0063e8dccd9cb..b049072e19199 100644
--- a/go/arrow/flight/client.go
+++ b/go/arrow/flight/client.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow/flight/gen/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight/gen/flight"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
diff --git a/go/arrow/flight/cookie_middleware_test.go b/go/arrow/flight/cookie_middleware_test.go
index 4007d056b2c99..53e60fb70b7ff 100644
--- a/go/arrow/flight/cookie_middleware_test.go
+++ b/go/arrow/flight/cookie_middleware_test.go
@@ -28,7 +28,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/apache/arrow/go/v16/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
diff --git a/go/arrow/flight/example_flight_server_test.go b/go/arrow/flight/example_flight_server_test.go
index af8094a953867..e5e684d951541 100755
--- a/go/arrow/flight/example_flight_server_test.go
+++ b/go/arrow/flight/example_flight_server_test.go
@@ -23,7 +23,7 @@ import (
 	"io"
 	"log"
 
-	"github.com/apache/arrow/go/v16/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials/insecure"
diff --git a/go/arrow/flight/flight_middleware_test.go b/go/arrow/flight/flight_middleware_test.go
index a99436c59d8ed..980987d5d4d0f 100755
--- a/go/arrow/flight/flight_middleware_test.go
+++ b/go/arrow/flight/flight_middleware_test.go
@@ -23,8 +23,8 @@ import (
 	sync "sync"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/flight"
-	"github.com/apache/arrow/go/v16/arrow/internal/arrdata"
+	"github.com/apache/arrow/go/v17/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/internal/arrdata"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
diff --git a/go/arrow/flight/flight_test.go b/go/arrow/flight/flight_test.go
index d023704276eab..47c8183b3883d 100755
--- a/go/arrow/flight/flight_test.go
+++ b/go/arrow/flight/flight_test.go
@@ -23,11 +23,11 @@ import (
 	"io"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/flight"
-	"github.com/apache/arrow/go/v16/arrow/internal/arrdata"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/internal/arrdata"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials/insecure"
diff --git a/go/arrow/flight/flightsql/client.go b/go/arrow/flight/flightsql/client.go
index 09e4974ae9bfc..c6794820dc172 100644
--- a/go/arrow/flight/flightsql/client.go
+++ b/go/arrow/flight/flightsql/client.go
@@ -22,12 +22,12 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/flight"
-	pb "github.com/apache/arrow/go/v16/arrow/flight/gen/flight"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/flight"
+	pb "github.com/apache/arrow/go/v17/arrow/flight/gen/flight"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/anypb"
@@ -243,6 +243,85 @@ func (c *Client) ExecuteSubstraitUpdate(ctx context.Context, plan SubstraitPlan,
 	return updateResult.GetRecordCount(), nil
 }
 
+// ExecuteIngest is for executing a bulk ingestion and only returns the number of affected rows.
+// The provided RecordReader will be retained for the duration of the call, but it is the caller's
+// responsibility to release the original reference.
+func (c *Client) ExecuteIngest(ctx context.Context, rdr array.RecordReader, reqOptions *ExecuteIngestOpts, opts ...grpc.CallOption) (int64, error) {
+	var (
+		err          error
+		desc         *flight.FlightDescriptor
+		stream       pb.FlightService_DoPutClient
+		wr           *flight.Writer
+		res          *pb.PutResult
+		updateResult pb.DoPutUpdateResult
+	)
+
+	cmd := (*pb.CommandStatementIngest)(reqOptions)
+
+	// Servers cannot infer defaults for these parameters, so we validate the request to ensure they are set.
+	if cmd.GetTableDefinitionOptions() == nil {
+		return 0, fmt.Errorf("cannot ExecuteIngest: invalid ExecuteIngestOpts, TableDefinitionOptions is required")
+	}
+	if cmd.GetTable() == "" {
+		return 0, fmt.Errorf("cannot ExecuteIngest: invalid ExecuteIngestOpts, Table is required")
+	}
+
+	if desc, err = descForCommand(cmd); err != nil {
+		return 0, err
+	}
+
+	if stream, err = c.Client.DoPut(ctx, opts...); err != nil {
+		return 0, err
+	}
+
+	wr = flight.NewRecordWriter(stream, ipc.WithAllocator(c.Alloc), ipc.WithSchema(rdr.Schema()))
+	defer wr.Close()
+
+	wr.SetFlightDescriptor(desc)
+
+	for rdr.Next() {
+		rec := rdr.Record()
+		err = wr.Write(rec)
+		if err == io.EOF {
+			// gRPC returns io.EOF if the error was generated by the server.
+			// The specific error will be retrieved in the server response.
+			// ref: https://pkg.go.dev/google.golang.org/grpc#ClientStream
+			break
+		}
+		if err != nil {
+			return 0, err
+		}
+	}
+
+	if err = rdr.Err(); err != nil {
+		return 0, err
+	}
+
+	if err = stream.CloseSend(); err != nil {
+		return 0, err
+	}
+
+	if res, err = stream.Recv(); err != nil {
+		return 0, err
+	}
+
+	if err = proto.Unmarshal(res.GetAppMetadata(), &updateResult); err != nil {
+		return 0, err
+	}
+
+	// Drain the stream. If ingestion was successful, no more messages should arrive.
+	// If there was a failure, the next message contains the error and the DoPutUpdateResult
+	// we recieved indicates a partial ingestion if the RecordCount is non-zero.
+	for {
+		_, err := stream.Recv()
+		if err == io.EOF {
+			return updateResult.GetRecordCount(), nil
+		} else if err != nil {
+			return updateResult.GetRecordCount(), err
+		}
+	}
+}
+
 // GetCatalogs requests the list of catalogs from the server and
 // returns a flightInfo object where the response can be retrieved
 func (c *Client) GetCatalogs(ctx context.Context, opts ...grpc.CallOption) (*flight.FlightInfo, error) {
@@ -1040,27 +1119,10 @@ func (p *PreparedStatement) Execute(ctx context.Context, opts ...grpc.CallOption
 		return nil, err
 	}
 
-	if p.hasBindParameters() {
-		pstream, err := p.client.Client.DoPut(ctx, opts...)
-		if err != nil {
-			return nil, err
-		}
-
-		wr, err := p.writeBindParameters(pstream, desc)
-		if err != nil {
-			return nil, err
-		}
-		if err = wr.Close(); err != nil {
-			return nil, err
-		}
-		pstream.CloseSend()
-
-		// wait for the server to ack the result
-		if _, err = pstream.Recv(); err != nil && err != io.EOF {
-			return nil, err
-		}
+	desc, err = p.bindParameters(ctx, desc, opts...)
+	if err != nil {
+		return nil, err
 	}
-
 	return p.client.getFlightInfo(ctx, desc, opts...)
 }
 
@@ -1080,25 +1142,9 @@ func (p *PreparedStatement) ExecutePut(ctx context.Context, opts ...grpc.CallOpt
 		return err
 	}
 
-	if p.hasBindParameters() {
-		pstream, err := p.client.Client.DoPut(ctx, opts...)
-		if err != nil {
-			return err
-		}
-
-		wr, err := p.writeBindParameters(pstream, desc)
-		if err != nil {
-			return err
-		}
-		if err = wr.Close(); err != nil {
-			return err
-		}
-		pstream.CloseSend()
-
-		// wait for the server to ack the result
-		if _, err = pstream.Recv(); err != nil && err != io.EOF {
-			return err
-		}
+	_, err = p.bindParameters(ctx, desc, opts...)
+	if err != nil {
+		return err
 	}
 
 	return nil
@@ -1126,25 +1172,9 @@ func (p *PreparedStatement) ExecutePoll(ctx context.Context, retryDescriptor *fl
 	}
 
 	if retryDescriptor == nil {
-		if p.hasBindParameters() {
-			pstream, err := p.client.Client.DoPut(ctx, opts...)
-			if err != nil {
-				return nil, err
-			}
-
-			wr, err := p.writeBindParameters(pstream, desc)
-			if err != nil {
-				return nil, err
-			}
-			if err = wr.Close(); err != nil {
-				return nil, err
-			}
-			pstream.CloseSend()
-
-			// wait for the server to ack the result
-			if _, err = pstream.Recv(); err != nil && err != io.EOF {
-				return nil, err
-			}
+		desc, err = p.bindParameters(ctx, desc, opts...)
+		if err != nil {
+			return nil, err
 		}
 	}
 	return p.client.Client.PollFlightInfo(ctx, desc, opts...)
@@ -1176,7 +1206,7 @@ func (p *PreparedStatement) ExecuteUpdate(ctx context.Context, opts ...grpc.Call
 		return
 	}
 	if p.hasBindParameters() {
-		wr, err = p.writeBindParameters(pstream, desc)
+		wr, err = p.writeBindParametersToStream(pstream, desc)
 		if err != nil {
 			return
 		}
@@ -1211,7 +1241,36 @@ func (p *PreparedStatement) hasBindParameters() bool {
 	return (p.paramBinding != nil && p.paramBinding.NumRows() > 0) || (p.streamBinding != nil)
 }
 
-func (p *PreparedStatement) writeBindParameters(pstream pb.FlightService_DoPutClient, desc *pb.FlightDescriptor) (*flight.Writer, error) {
+func (p *PreparedStatement) bindParameters(ctx context.Context, desc *pb.FlightDescriptor, opts ...grpc.CallOption) (*flight.FlightDescriptor, error) {
+	if p.hasBindParameters() {
+		pstream, err := p.client.Client.DoPut(ctx, opts...)
+		if err != nil {
+			return nil, err
+		}
+		wr, err := p.writeBindParametersToStream(pstream, desc)
+		if err != nil {
+			return nil, err
+		}
+		if err = wr.Close(); err != nil {
+			return nil, err
+		}
+		pstream.CloseSend()
+		if err = p.captureDoPutPreparedStatementHandle(pstream); err != nil {
+			return nil, err
+		}
+
+		cmd := pb.CommandPreparedStatementQuery{PreparedStatementHandle: p.handle}
+		desc, err = descForCommand(&cmd)
+		if err != nil {
+			return nil, err
+		}
+		return desc, nil
+	}
+	return desc, nil
+}
+
+// XXX: this does not capture the updated handle. Prefer bindParameters.
+func (p *PreparedStatement) writeBindParametersToStream(pstream pb.FlightService_DoPutClient, desc *pb.FlightDescriptor) (*flight.Writer, error) {
 	if p.paramBinding != nil {
 		wr := flight.NewRecordWriter(pstream, ipc.WithSchema(p.paramBinding.Schema()))
 		wr.SetFlightDescriptor(desc)
@@ -1234,6 +1293,29 @@ func (p *PreparedStatement) writeBindParameters(pstream pb.FlightService_DoPutCl
 	}
 }
 
+func (p *PreparedStatement) captureDoPutPreparedStatementHandle(pstream pb.FlightService_DoPutClient) error {
+	var (
+		result                  *pb.PutResult
+		preparedStatementResult pb.DoPutPreparedStatementResult
+		err                     error
+	)
+	if result, err = pstream.Recv(); err != nil && err != io.EOF {
+		return err
+	}
+	// skip if server does not provide a response (legacy server)
+	if result == nil {
+		return nil
+	}
+	if err = proto.Unmarshal(result.GetAppMetadata(), &preparedStatementResult); err != nil {
+		return err
+	}
+	handle := preparedStatementResult.GetPreparedStatementHandle()
+	if handle != nil {
+		p.handle = handle
+	}
+	return nil
+}
+
 // DatasetSchema may be nil if the server did not return it when creating the
 // Prepared Statement.
 func (p *PreparedStatement) DatasetSchema() *arrow.Schema { return p.datasetSchema }
diff --git a/go/arrow/flight/flightsql/client_test.go b/go/arrow/flight/flightsql/client_test.go
index fe4d308f29fc3..33da79167c4ae 100644
--- a/go/arrow/flight/flightsql/client_test.go
+++ b/go/arrow/flight/flightsql/client_test.go
@@ -22,12 +22,12 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/flight"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql"
-	pb "github.com/apache/arrow/go/v16/arrow/flight/gen/flight"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql"
+	pb "github.com/apache/arrow/go/v17/arrow/flight/gen/flight"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
 	"google.golang.org/grpc"
@@ -408,24 +408,26 @@ func (s *FlightSqlClientSuite) TestPreparedStatementExecute() {
 
 func (s *FlightSqlClientSuite) TestPreparedStatementExecuteParamBinding() {
 	const query = "query"
+	const handle = "handle"
+	const updatedHandle = "updated handle"
 
 	// create and close actions
 	cmd := &pb.ActionCreatePreparedStatementRequest{Query: query}
 	action := getAction(cmd)
 	action.Type = flightsql.CreatePreparedStatementActionType
-	closeAct := getAction(&pb.ActionClosePreparedStatementRequest{PreparedStatementHandle: []byte(query)})
+	closeAct := getAction(&pb.ActionClosePreparedStatementRequest{PreparedStatementHandle: []byte(updatedHandle)})
 	closeAct.Type = flightsql.ClosePreparedStatementActionType
 
 	// results from createprepared statement
-	result := &pb.ActionCreatePreparedStatementResult{
-		PreparedStatementHandle: []byte(query),
+	actionResult := &pb.ActionCreatePreparedStatementResult{
+		PreparedStatementHandle: []byte(handle),
 	}
 	schema := arrow.NewSchema([]arrow.Field{{Name: "id", Type: arrow.PrimitiveTypes.Int64, Nullable: true}}, nil)
-	result.ParameterSchema = flight.SerializeSchema(schema, memory.DefaultAllocator)
+	actionResult.ParameterSchema = flight.SerializeSchema(schema, memory.DefaultAllocator)
 
 	// mocked client stream
 	var out anypb.Any
-	out.MarshalFrom(result)
+	out.MarshalFrom(actionResult)
 	data, _ := proto.Marshal(&out)
 
 	createRsp := &mockDoActionClient{}
@@ -443,7 +445,12 @@ func (s *FlightSqlClientSuite) TestPreparedStatementExecuteParamBinding() {
 	s.mockClient.On("DoAction", flightsql.CreatePreparedStatementActionType, action.Body, s.callOpts).Return(createRsp, nil)
 	s.mockClient.On("DoAction", flightsql.ClosePreparedStatementActionType, closeAct.Body, s.callOpts).Return(closeRsp, nil)
 
-	expectedDesc := getDesc(&pb.CommandPreparedStatementQuery{PreparedStatementHandle: []byte(query)})
+	expectedDesc := getDesc(&pb.CommandPreparedStatementQuery{PreparedStatementHandle: []byte(handle)})
+
+	// mocked DoPut result
+	doPutPreparedStatementResult := &pb.DoPutPreparedStatementResult{PreparedStatementHandle: []byte(updatedHandle)}
+	resdata, _ := proto.Marshal(doPutPreparedStatementResult)
+	putResult := &pb.PutResult{AppMetadata: resdata}
 
 	// mocked client stream for DoPut
 	mockedPut := &mockDoPutClient{}
@@ -452,9 +459,9 @@ func (s *FlightSqlClientSuite) TestPreparedStatementExecuteParamBinding() {
 		return proto.Equal(expectedDesc, fd.FlightDescriptor)
 	})).Return(nil).Twice() // first sends schema message, second sends data
 	mockedPut.On("CloseSend").Return(nil)
-	mockedPut.On("Recv").Return((*pb.PutResult)(nil), nil)
+	mockedPut.On("Recv").Return(putResult, nil)
 
-	infoCmd := &pb.CommandPreparedStatementQuery{PreparedStatementHandle: []byte(query)}
+	infoCmd := &pb.CommandPreparedStatementQuery{PreparedStatementHandle: []byte(updatedHandle)}
 	desc := getDesc(infoCmd)
 	s.mockClient.On("GetFlightInfo", desc.Type, desc.Cmd, s.callOpts).Return(&emptyFlightInfo, nil)
 
@@ -462,19 +469,20 @@ func (s *FlightSqlClientSuite) TestPreparedStatementExecuteParamBinding() {
 	s.NoError(err)
 	defer prepared.Close(context.TODO(), s.callOpts...)
 
-	s.Equal(string(prepared.Handle()), "query")
+	s.Equal(string(prepared.Handle()), handle)
 
 	paramSchema := prepared.ParameterSchema()
 	rec, _, err := array.RecordFromJSON(memory.DefaultAllocator, paramSchema, strings.NewReader(`[{"id": 1}]`))
 	s.NoError(err)
 	defer rec.Release()
 
-	s.Equal(string(prepared.Handle()), "query")
+	s.Equal(string(prepared.Handle()), handle)
 
 	prepared.SetParameters(rec)
 	info, err := prepared.Execute(context.TODO(), s.callOpts...)
 	s.NoError(err)
 	s.Equal(&emptyFlightInfo, info)
+	s.Equal(string(prepared.Handle()), updatedHandle)
 }
 
 func (s *FlightSqlClientSuite) TestPreparedStatementExecuteReaderBinding() {
@@ -516,6 +524,11 @@ func (s *FlightSqlClientSuite) TestPreparedStatementExecuteReaderBinding() {
 
 	expectedDesc := getDesc(&pb.CommandPreparedStatementQuery{PreparedStatementHandle: []byte(query)})
 
+	// mocked DoPut result
+	doPutPreparedStatementResult := &pb.DoPutPreparedStatementResult{PreparedStatementHandle: []byte(query)}
+	resdata, _ := proto.Marshal(doPutPreparedStatementResult)
+	putResult := &pb.PutResult{AppMetadata: resdata}
+
 	// mocked client stream for DoPut
 	mockedPut := &mockDoPutClient{}
 	s.mockClient.On("DoPut", s.callOpts).Return(mockedPut, nil)
@@ -528,7 +541,7 @@ func (s *FlightSqlClientSuite) TestPreparedStatementExecuteReaderBinding() {
 		return fd.FlightDescriptor == nil
 	})).Return(nil).Times(3)
 	mockedPut.On("CloseSend").Return(nil)
-	mockedPut.On("Recv").Return((*pb.PutResult)(nil), nil)
+	mockedPut.On("Recv").Return(putResult, nil)
 
 	infoCmd := &pb.CommandPreparedStatementQuery{PreparedStatementHandle: []byte(query)}
 	desc := getDesc(infoCmd)
diff --git a/go/arrow/flight/flightsql/column_metadata.go b/go/arrow/flight/flightsql/column_metadata.go
index 875acdb1e435d..ca9c633ab1e0f 100644
--- a/go/arrow/flight/flightsql/column_metadata.go
+++ b/go/arrow/flight/flightsql/column_metadata.go
@@ -19,7 +19,7 @@ package flightsql
 import (
 	"strconv"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 const (
diff --git a/go/arrow/flight/flightsql/driver/README.md b/go/arrow/flight/flightsql/driver/README.md
index 7fe24e7bd3f3b..5187c7e4248ec 100644
--- a/go/arrow/flight/flightsql/driver/README.md
+++ b/go/arrow/flight/flightsql/driver/README.md
@@ -36,7 +36,7 @@ connection pooling, transactions combined with ease of use (see (#usage)).
 ## Prerequisites
 
 * Go 1.17+
-* Installation via `go get -u github.com/apache/arrow/go/v16/arrow/flight/flightsql`
+* Installation via `go get -u github.com/apache/arrow/go/v17/arrow/flight/flightsql`
 * Backend speaking FlightSQL
 
 ---------------------------------------
@@ -55,7 +55,7 @@ import (
     "database/sql"
     "time"
 
-    _ "github.com/apache/arrow/go/v16/arrow/flight/flightsql"
+    _ "github.com/apache/arrow/go/v17/arrow/flight/flightsql"
 )
 
 // Open the connection to an SQLite backend
@@ -141,7 +141,7 @@ import (
     "log"
     "time"
 
-    "github.com/apache/arrow/go/v16/arrow/flight/flightsql"
+    "github.com/apache/arrow/go/v17/arrow/flight/flightsql"
 )
 
 func main() {
diff --git a/go/arrow/flight/flightsql/driver/config_test.go b/go/arrow/flight/flightsql/driver/config_test.go
index b3c3433362d05..6984da68494be 100644
--- a/go/arrow/flight/flightsql/driver/config_test.go
+++ b/go/arrow/flight/flightsql/driver/config_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql/driver"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql/driver"
 )
 
 func TestConfigTLSRegistry(t *testing.T) {
diff --git a/go/arrow/flight/flightsql/driver/driver.go b/go/arrow/flight/flightsql/driver/driver.go
index ddd75df381e44..cd0487e7ad275 100644
--- a/go/arrow/flight/flightsql/driver/driver.go
+++ b/go/arrow/flight/flightsql/driver/driver.go
@@ -26,11 +26,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/flight"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
diff --git a/go/arrow/flight/flightsql/driver/driver_test.go b/go/arrow/flight/flightsql/driver/driver_test.go
index 11b9036519d79..d4361eb2dd722 100644
--- a/go/arrow/flight/flightsql/driver/driver_test.go
+++ b/go/arrow/flight/flightsql/driver/driver_test.go
@@ -34,13 +34,13 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/flight"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql/driver"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql/example"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql/driver"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql/example"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 const defaultTableName = "drivertest"
@@ -1768,16 +1768,16 @@ func (s *MockServer) CreatePreparedStatement(ctx context.Context, req flightsql.
 	}, nil
 }
 
-func (s *MockServer) DoPutPreparedStatementQuery(ctx context.Context, qry flightsql.PreparedStatementQuery, r flight.MessageReader, w flight.MetadataWriter) error {
+func (s *MockServer) DoPutPreparedStatementQuery(ctx context.Context, qry flightsql.PreparedStatementQuery, r flight.MessageReader, w flight.MetadataWriter) ([]byte, error) {
 	if s.ExpectedPreparedStatementSchema != nil {
 		if !s.ExpectedPreparedStatementSchema.Equal(r.Schema()) {
-			return errors.New("parameter schema: unexpected")
+			return nil, errors.New("parameter schema: unexpected")
 		}
-		return nil
+		return qry.GetPreparedStatementHandle(), nil
 	}
 
 	if s.PreparedStatementParameterSchema != nil && !s.PreparedStatementParameterSchema.Equal(r.Schema()) {
-		return fmt.Errorf("parameter schema: %w", arrow.ErrInvalid)
+		return nil, fmt.Errorf("parameter schema: %w", arrow.ErrInvalid)
 	}
 
 	// GH-35328: it's rare, but this function can complete execution and return
@@ -1791,7 +1791,7 @@ func (s *MockServer) DoPutPreparedStatementQuery(ctx context.Context, qry flight
 	for r.Next() {
 	}
 
-	return nil
+	return qry.GetPreparedStatementHandle(), nil
 }
 
 func (s *MockServer) DoGetStatement(ctx context.Context, ticket flightsql.StatementQueryTicket) (*arrow.Schema, <-chan flight.StreamChunk, error) {
diff --git a/go/arrow/flight/flightsql/driver/utils.go b/go/arrow/flight/flightsql/driver/utils.go
index a99c045e2ed02..d07ed446b2bcb 100644
--- a/go/arrow/flight/flightsql/driver/utils.go
+++ b/go/arrow/flight/flightsql/driver/utils.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 // *** GRPC helpers ***
@@ -104,6 +104,10 @@ func fromArrowType(arr arrow.Array, idx int) (interface{}, error) {
 		return v.ToTime(ts.TimeUnit()), nil
 	case *array.Date64:
 		return c.Value(idx).ToTime(), nil
+	case *array.Duration:
+		dt := arr.DataType().(*arrow.DurationType)
+		duration := time.Duration(c.Value(idx)) * dt.Unit.Multiplier()
+		return duration, nil
 	case *array.DayTimeInterval:
 		durationDays := time.Duration(c.Value(idx).Days*24) * time.Hour
 		duration := time.Duration(c.Value(idx).Milliseconds) * time.Millisecond
diff --git a/go/arrow/flight/flightsql/driver/utils_test.go b/go/arrow/flight/flightsql/driver/utils_test.go
index 6b1adfed47503..2c87075423e0a 100644
--- a/go/arrow/flight/flightsql/driver/utils_test.go
+++ b/go/arrow/flight/flightsql/driver/utils_test.go
@@ -22,12 +22,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/require"
 )
 
@@ -50,6 +50,10 @@ func Test_fromArrowType(t *testing.T) {
 		{Name: "f15-ts_us", Type: arrow.FixedWidthTypes.Timestamp_ns},
 		{Name: "f16-d64", Type: arrow.FixedWidthTypes.Date64},
 		{Name: "f17-dti", Type: arrow.FixedWidthTypes.DayTimeInterval},
+		{Name: "f18-duration_s", Type: arrow.FixedWidthTypes.Duration_s},
+		{Name: "f19-duration_ms", Type: arrow.FixedWidthTypes.Duration_ms},
+		{Name: "f20-duration_us", Type: arrow.FixedWidthTypes.Duration_us},
+		{Name: "f21-duration_ns", Type: arrow.FixedWidthTypes.Duration_ns},
 	}
 
 	schema := arrow.NewSchema(fields, nil)
@@ -90,6 +94,10 @@ func Test_fromArrowType(t *testing.T) {
 	testTime := time.Now()
 	b.Field(15).(*array.Date64Builder).Append(arrow.Date64FromTime(testTime))
 	b.Field(16).(*array.DayTimeIntervalBuilder).Append(arrow.DayTimeInterval{Days: 1, Milliseconds: 1000})
+	b.Field(17).(*array.DurationBuilder).Append(1)
+	b.Field(18).(*array.DurationBuilder).Append(1)
+	b.Field(19).(*array.DurationBuilder).Append(1)
+	b.Field(20).(*array.DurationBuilder).Append(1)
 
 	rec := b.NewRecord()
 	defer rec.Release()
@@ -123,4 +131,8 @@ func Test_fromArrowType(t *testing.T) {
 	tf(t, 14, time.Date(1970, 1, 1, 12, 0, 0, 0, time.UTC))  // "f15-ts_us"
 	tf(t, 15, testTime.In(time.UTC).Truncate(24*time.Hour))  // "f16-d64"
 	tf(t, 16, time.Duration(24*time.Hour+time.Second))       // "f17-dti"
+	tf(t, 17, time.Duration(1000000000))                     // "f18-duration_s"
+	tf(t, 18, time.Duration(1000000))                        // "f19-duration_ms"
+	tf(t, 19, time.Duration(1000))                           // "f20-duration_us"
+	tf(t, 20, time.Duration(1))                              // "f21-duration_ns"
 }
diff --git a/go/arrow/flight/flightsql/example/cmd/sqlite_flightsql_server/main.go b/go/arrow/flight/flightsql/example/cmd/sqlite_flightsql_server/main.go
index 209e2287890b5..6bce68d7949dc 100644
--- a/go/arrow/flight/flightsql/example/cmd/sqlite_flightsql_server/main.go
+++ b/go/arrow/flight/flightsql/example/cmd/sqlite_flightsql_server/main.go
@@ -27,9 +27,9 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/apache/arrow/go/v16/arrow/flight"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql/example"
+	"github.com/apache/arrow/go/v17/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql/example"
 )
 
 func main() {
diff --git a/go/arrow/flight/flightsql/example/sql_batch_reader.go b/go/arrow/flight/flightsql/example/sql_batch_reader.go
index 27a71153ffca9..cb806ef1b27ab 100644
--- a/go/arrow/flight/flightsql/example/sql_batch_reader.go
+++ b/go/arrow/flight/flightsql/example/sql_batch_reader.go
@@ -26,11 +26,11 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/wrapperspb"
diff --git a/go/arrow/flight/flightsql/example/sqlite_info.go b/go/arrow/flight/flightsql/example/sqlite_info.go
index a097fa1954435..ea9d7b98aade4 100644
--- a/go/arrow/flight/flightsql/example/sqlite_info.go
+++ b/go/arrow/flight/flightsql/example/sqlite_info.go
@@ -20,8 +20,8 @@
 package example
 
 import (
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql"
 )
 
 func SqlInfoResultMap() flightsql.SqlInfoResultMap {
diff --git a/go/arrow/flight/flightsql/example/sqlite_server.go b/go/arrow/flight/flightsql/example/sqlite_server.go
index d87efbc9844b1..b5a64d57dceb6 100644
--- a/go/arrow/flight/flightsql/example/sqlite_server.go
+++ b/go/arrow/flight/flightsql/example/sqlite_server.go
@@ -45,13 +45,13 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/flight"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql/schema_ref"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql/schema_ref"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
@@ -618,21 +618,21 @@ func getParamsForStatement(rdr flight.MessageReader) (params [][]interface{}, er
 	return params, rdr.Err()
 }
 
-func (s *SQLiteFlightSQLServer) DoPutPreparedStatementQuery(_ context.Context, cmd flightsql.PreparedStatementQuery, rdr flight.MessageReader, _ flight.MetadataWriter) error {
+func (s *SQLiteFlightSQLServer) DoPutPreparedStatementQuery(_ context.Context, cmd flightsql.PreparedStatementQuery, rdr flight.MessageReader, _ flight.MetadataWriter) ([]byte, error) {
 	val, ok := s.prepared.Load(string(cmd.GetPreparedStatementHandle()))
 	if !ok {
-		return status.Error(codes.InvalidArgument, "prepared statement not found")
+		return nil, status.Error(codes.InvalidArgument, "prepared statement not found")
 	}
 
 	stmt := val.(Statement)
 	args, err := getParamsForStatement(rdr)
 	if err != nil {
-		return status.Errorf(codes.Internal, "error gathering parameters for prepared statement query: %s", err.Error())
+		return nil, status.Errorf(codes.Internal, "error gathering parameters for prepared statement query: %s", err.Error())
 	}
 
 	stmt.params = args
 	s.prepared.Store(string(cmd.GetPreparedStatementHandle()), stmt)
-	return nil
+	return cmd.GetPreparedStatementHandle(), nil
 }
 
 func (s *SQLiteFlightSQLServer) DoPutPreparedStatementUpdate(ctx context.Context, cmd flightsql.PreparedStatementUpdate, rdr flight.MessageReader) (int64, error) {
diff --git a/go/arrow/flight/flightsql/example/sqlite_tables_schema_batch_reader.go b/go/arrow/flight/flightsql/example/sqlite_tables_schema_batch_reader.go
index 08b217a3eadc1..4786110e232a8 100644
--- a/go/arrow/flight/flightsql/example/sqlite_tables_schema_batch_reader.go
+++ b/go/arrow/flight/flightsql/example/sqlite_tables_schema_batch_reader.go
@@ -25,12 +25,12 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/flight"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	sqlite3 "modernc.org/sqlite/lib"
 )
 
diff --git a/go/arrow/flight/flightsql/example/type_info.go b/go/arrow/flight/flightsql/example/type_info.go
index 03f906a8f9624..cfe47b4090fe7 100644
--- a/go/arrow/flight/flightsql/example/type_info.go
+++ b/go/arrow/flight/flightsql/example/type_info.go
@@ -22,10 +22,10 @@ package example
 import (
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql/schema_ref"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql/schema_ref"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func GetTypeInfoResult(mem memory.Allocator) arrow.Record {
diff --git a/go/arrow/flight/flightsql/schema_ref/reference_schemas.go b/go/arrow/flight/flightsql/schema_ref/reference_schemas.go
index eb756686187d0..5b2684bae1694 100644
--- a/go/arrow/flight/flightsql/schema_ref/reference_schemas.go
+++ b/go/arrow/flight/flightsql/schema_ref/reference_schemas.go
@@ -18,7 +18,7 @@
 // by FlightSQL servers and clients.
 package schema_ref
 
-import "github.com/apache/arrow/go/v16/arrow"
+import "github.com/apache/arrow/go/v17/arrow"
 
 var (
 	Catalogs = arrow.NewSchema(
diff --git a/go/arrow/flight/flightsql/server.go b/go/arrow/flight/flightsql/server.go
index 7bc15ab4295f1..25bdc5f4d5bb3 100644
--- a/go/arrow/flight/flightsql/server.go
+++ b/go/arrow/flight/flightsql/server.go
@@ -20,14 +20,14 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/flight"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql/schema_ref"
-	pb "github.com/apache/arrow/go/v16/arrow/flight/gen/flight"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql/schema_ref"
+	pb "github.com/apache/arrow/go/v17/arrow/flight/gen/flight"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/proto"
@@ -196,6 +196,17 @@ type ActionEndSavepointRequest interface {
 	GetAction() EndSavepointRequestType
 }
 
+// StatementIngest represents a bulk ingestion request
+type StatementIngest interface {
+	GetTableDefinitionOptions() *TableDefinitionOptions
+	GetTable() string
+	GetSchema() string
+	GetCatalog() string
+	GetTemporary() bool
+	GetTransactionId() []byte
+	GetOptions() map[string]string
+}
+
 type getXdbcTypeInfo struct {
 	*pb.CommandGetXdbcTypeInfo
 }
@@ -499,14 +510,18 @@ func (BaseServer) DoPutCommandSubstraitPlan(context.Context, StatementSubstraitP
 	return 0, status.Error(codes.Unimplemented, "DoPutCommandSubstraitPlan not implemented")
 }
 
-func (BaseServer) DoPutPreparedStatementQuery(context.Context, PreparedStatementQuery, flight.MessageReader, flight.MetadataWriter) error {
-	return status.Error(codes.Unimplemented, "DoPutPreparedStatementQuery not implemented")
+func (BaseServer) DoPutPreparedStatementQuery(context.Context, PreparedStatementQuery, flight.MessageReader, flight.MetadataWriter) ([]byte, error) {
+	return nil, status.Error(codes.Unimplemented, "DoPutPreparedStatementQuery not implemented")
 }
 
 func (BaseServer) DoPutPreparedStatementUpdate(context.Context, PreparedStatementUpdate, flight.MessageReader) (int64, error) {
 	return 0, status.Error(codes.Unimplemented, "DoPutPreparedStatementUpdate not implemented")
 }
 
+func (BaseServer) DoPutCommandStatementIngest(context.Context, StatementIngest, flight.MessageReader) (int64, error) {
+	return 0, status.Error(codes.Unimplemented, "DoPutCommandStatementIngest not implemented")
+}
+
 func (BaseServer) BeginTransaction(context.Context, ActionBeginTransactionRequest) ([]byte, error) {
 	return nil, status.Error(codes.Unimplemented, "BeginTransaction not implemented")
 }
@@ -662,7 +677,7 @@ type Server interface {
 	// Currently anything written to the writer will be ignored. It is in the
 	// interface for potential future enhancements to avoid having to change
 	// the interface in the future.
-	DoPutPreparedStatementQuery(context.Context, PreparedStatementQuery, flight.MessageReader, flight.MetadataWriter) error
+	DoPutPreparedStatementQuery(context.Context, PreparedStatementQuery, flight.MessageReader, flight.MetadataWriter) ([]byte, error)
 	// DoPutPreparedStatementUpdate executes an update SQL Prepared statement
 	// for the specified statement handle. The reader allows providing a sequence
 	// of uploaded record batches to bind the parameters to. Returns the number
@@ -694,6 +709,9 @@ type Server interface {
 	GetSessionOptions(context.Context, *flight.GetSessionOptionsRequest) (*flight.GetSessionOptionsResult, error)
 	// CloseSession closes/invalidates the current server session.
 	CloseSession(context.Context, *flight.CloseSessionRequest) (*flight.CloseSessionResult, error)
+	// DoPutCommandStatementIngest executes a bulk ingestion and returns
+	// the number of affected rows
+	DoPutCommandStatementIngest(context.Context, StatementIngest, flight.MessageReader) (int64, error)
 
 	mustEmbedBaseServer()
 }
@@ -972,7 +990,16 @@ func (f *flightSqlServer) DoPut(stream flight.FlightService_DoPutServer) error {
 		}
 		return stream.Send(out)
 	case *pb.CommandPreparedStatementQuery:
-		return f.srv.DoPutPreparedStatementQuery(stream.Context(), cmd, rdr, &putMetadataWriter{stream})
+		handle, err := f.srv.DoPutPreparedStatementQuery(stream.Context(), cmd, rdr, &putMetadataWriter{stream})
+		if err != nil {
+			return err
+		}
+		result := pb.DoPutPreparedStatementResult{PreparedStatementHandle: handle}
+		out := &flight.PutResult{}
+		if out.AppMetadata, err = proto.Marshal(&result); err != nil {
+			return status.Errorf(codes.Internal, "failed to marshal PutResult: %s", err.Error())
+		}
+		return stream.Send(out)
 	case *pb.CommandPreparedStatementUpdate:
 		recordCount, err := f.srv.DoPutPreparedStatementUpdate(stream.Context(), cmd, rdr)
 		if err != nil {
@@ -985,6 +1012,26 @@ func (f *flightSqlServer) DoPut(stream flight.FlightService_DoPutServer) error {
 			return status.Errorf(codes.Internal, "failed to marshal PutResult: %s", err.Error())
 		}
 		return stream.Send(out)
+	case *pb.CommandStatementIngest:
+		// Even if there was an error, the server may have ingested some records.
+		// For this reason we send PutResult{recordCount} no matter what, potentially followed by an error
+		// if there was one.
+		recordCount, rpcErr := f.srv.DoPutCommandStatementIngest(stream.Context(), cmd, rdr)
+
+		result := pb.DoPutUpdateResult{RecordCount: recordCount}
+		out := &flight.PutResult{}
+		if out.AppMetadata, err = proto.Marshal(&result); err != nil {
+			return status.Errorf(codes.Internal, "failed to marshal PutResult: %s", err.Error())
+		}
+
+		// If we fail to send the recordCount, just return an error outright
+		if err := stream.Send(out); err != nil {
+			return err
+		}
+
+		// We successfully sent the recordCount.
+		// Send the error if one occurred in the RPC, otherwise this is nil.
+		return rpcErr
 	default:
 		return status.Error(codes.InvalidArgument, "the defined request is invalid")
 	}
diff --git a/go/arrow/flight/flightsql/server_test.go b/go/arrow/flight/flightsql/server_test.go
index df619e7a24140..e594f8e773fd2 100644
--- a/go/arrow/flight/flightsql/server_test.go
+++ b/go/arrow/flight/flightsql/server_test.go
@@ -22,13 +22,13 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/flight"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql"
-	pb "github.com/apache/arrow/go/v16/arrow/flight/gen/flight"
-	"github.com/apache/arrow/go/v16/arrow/flight/session"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql"
+	pb "github.com/apache/arrow/go/v17/arrow/flight/gen/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight/session"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	"google.golang.org/grpc"
@@ -178,6 +178,19 @@ func (*testServer) CloseSession(ctx context.Context, req *flight.CloseSessionReq
 	return &flight.CloseSessionResult{Status: flight.CloseSessionResultClosed}, nil
 }
 
+func (*testServer) DoPutCommandStatementIngest(ctx context.Context, cmd flightsql.StatementIngest, rdr flight.MessageReader) (int64, error) {
+	var maxRows int64 = 50
+	var nRows int64
+	for rdr.Next() {
+		rec := rdr.Record()
+		if nRows+rec.NumRows() > maxRows {
+			return nRows, fmt.Errorf("ingested rows exceeded maximum of %d", maxRows)
+		}
+		nRows += rec.NumRows()
+	}
+	return nRows, nil
+}
+
 type FlightSqlServerSuite struct {
 	suite.Suite
 
@@ -202,9 +215,16 @@ func (s *FlightSqlServerSuite) SetupTest() {
 	cl, err := flightsql.NewClient(s.s.Addr().String(), nil, nil, dialOpts...)
 	s.Require().NoError(err)
 	s.cl = cl
+
+	checked := memory.NewCheckedAllocator(s.cl.Alloc)
+	s.cl.Alloc = checked
 }
 
 func (s *FlightSqlServerSuite) TearDownTest() {
+	checked, ok := s.cl.Alloc.(*memory.CheckedAllocator)
+	s.Require().True(ok)
+	checked.AssertSize(s.T(), 0)
+
 	s.Require().NoError(s.cl.Close())
 	s.cl = nil
 }
@@ -281,6 +301,111 @@ func (s *FlightSqlServerSuite) TestExecutePoll() {
 	s.Len(poll.GetInfo().Endpoint, 2)
 }
 
+func (s *FlightSqlServerSuite) TestExecuteIngestNil() {
+	// Ingest with nil options errors, but does not panic
+	nRecords, err := s.cl.ExecuteIngest(context.TODO(), nil, nil)
+	s.Error(err)
+	s.Equal(int64(0), nRecords)
+}
+
+func (s *FlightSqlServerSuite) TestExecuteIngestInvalid() {
+	reclist := []arrow.Record{}
+	rdr, err := array.NewRecordReader(arrow.NewSchema([]arrow.Field{}, nil), reclist)
+	s.NoError(err)
+	defer rdr.Release()
+
+	// Cannot execute ingest without specifying required options
+	nRecords, err := s.cl.ExecuteIngest(context.TODO(), rdr, &flightsql.ExecuteIngestOpts{})
+	s.Error(err)
+	s.Equal(int64(0), nRecords)
+}
+
+func (s *FlightSqlServerSuite) TestExecuteIngest() {
+	nRecords := 3
+	nRowsPerRecord := 5
+	reclist := generateRecords(s.cl.Alloc, nRecords, nRowsPerRecord)
+	for _, rec := range reclist {
+		defer rec.Release()
+	}
+
+	rdr, err := array.NewRecordReader(reclist[0].Schema(), reclist)
+	s.NoError(err)
+	defer rdr.Release()
+
+	nRowsIngested, err := s.cl.ExecuteIngest(
+		context.TODO(),
+		rdr,
+		&flightsql.ExecuteIngestOpts{
+			TableDefinitionOptions: &flightsql.TableDefinitionOptions{
+				IfNotExist: flightsql.TableDefinitionOptionsTableNotExistOptionCreate,
+				IfExists:   flightsql.TableDefinitionOptionsTableExistsOptionReplace,
+			},
+			Table: "test_table",
+		},
+	)
+	s.NoError(err)
+
+	nRowsExpected := int64(nRecords * nRowsPerRecord)
+	s.Equal(nRowsExpected, nRowsIngested)
+}
+
+func (s *FlightSqlServerSuite) TestExecuteIngestWithServerError() {
+	nRecords := 11 // intentionally exceed maximum number of rows the server can ingest
+	nRowsPerRecord := 5
+	reclist := generateRecords(s.cl.Alloc, nRecords, nRowsPerRecord)
+	for _, rec := range reclist {
+		defer rec.Release()
+	}
+
+	rdr, err := array.NewRecordReader(reclist[0].Schema(), reclist)
+	s.NoError(err)
+	defer rdr.Release()
+
+	nRowsIngested, err := s.cl.ExecuteIngest(
+		context.TODO(),
+		rdr,
+		&flightsql.ExecuteIngestOpts{
+			TableDefinitionOptions: &flightsql.TableDefinitionOptions{
+				IfNotExist: flightsql.TableDefinitionOptionsTableNotExistOptionCreate,
+				IfExists:   flightsql.TableDefinitionOptionsTableExistsOptionReplace,
+			},
+			Table: "test_table",
+		},
+	)
+	s.Error(err)
+	s.ErrorContains(err, "ingested rows exceeded maximum")
+
+	nRowsExpected := int64(50) // max rows the server can ingest
+	s.Equal(nRowsExpected, nRowsIngested)
+}
+
+func generateRecords(alloc memory.Allocator, nRecords, nRowsPerRecord int) []arrow.Record {
+	schema := arrow.NewSchema(
+		[]arrow.Field{
+			{Name: "one", Type: arrow.FixedWidthTypes.Boolean},
+			{Name: "two", Type: arrow.BinaryTypes.String},
+			{Name: "three", Type: arrow.PrimitiveTypes.Int64},
+		},
+		nil,
+	)
+
+	bldr := array.NewRecordBuilder(alloc, schema)
+	defer bldr.Release()
+
+	var val int
+	reclist := make([]arrow.Record, nRecords)
+	for i := 0; i < nRecords; i++ {
+		for j := 0; j < nRowsPerRecord; j++ {
+			bldr.Field(0).(*array.BooleanBuilder).Append(val%2 == 0)
+			bldr.Field(1).(*array.StringBuilder).Append(fmt.Sprint(val))
+			bldr.Field(2).(*array.Int64Builder).Append(int64(val))
+			val++
+		}
+		reclist[i] = bldr.NewRecord()
+	}
+	return reclist
+}
+
 type UnimplementedFlightSqlServerSuite struct {
 	suite.Suite
 
@@ -459,6 +584,36 @@ func (s *UnimplementedFlightSqlServerSuite) TestDoGet() {
 	}
 }
 
+func (s *UnimplementedFlightSqlServerSuite) TestExecuteIngest() {
+	nRecords := 3
+	nRowsPerRecord := 5
+	reclist := generateRecords(s.cl.Alloc, nRecords, nRowsPerRecord)
+	for _, rec := range reclist {
+		defer rec.Release()
+	}
+
+	rdr, err := array.NewRecordReader(reclist[0].Schema(), reclist)
+	s.NoError(err)
+	defer rdr.Release()
+
+	info, err := s.cl.ExecuteIngest(
+		context.TODO(),
+		rdr,
+		&flightsql.ExecuteIngestOpts{
+			TableDefinitionOptions: &flightsql.TableDefinitionOptions{
+				IfNotExist: flightsql.TableDefinitionOptionsTableNotExistOptionCreate,
+				IfExists:   flightsql.TableDefinitionOptionsTableExistsOptionReplace,
+			},
+			Table: "test_table",
+		},
+	)
+	st, ok := status.FromError(err)
+	s.True(ok)
+	s.Equal(codes.Unimplemented, st.Code())
+	s.Equal("DoPutCommandStatementIngest not implemented", st.Message())
+	s.Zero(info)
+}
+
 func (s *UnimplementedFlightSqlServerSuite) TestDoAction() {
 	prep, err := s.cl.Prepare(context.TODO(), "IRRELEVANT")
 	s.Nil(prep)
diff --git a/go/arrow/flight/flightsql/sql_info.go b/go/arrow/flight/flightsql/sql_info.go
index ed6cf5f2cc2d9..662d809955522 100644
--- a/go/arrow/flight/flightsql/sql_info.go
+++ b/go/arrow/flight/flightsql/sql_info.go
@@ -17,8 +17,8 @@
 package flightsql
 
 import (
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 const (
diff --git a/go/arrow/flight/flightsql/sqlite_server_test.go b/go/arrow/flight/flightsql/sqlite_server_test.go
index da8369e91b458..eb30b0aa50695 100644
--- a/go/arrow/flight/flightsql/sqlite_server_test.go
+++ b/go/arrow/flight/flightsql/sqlite_server_test.go
@@ -26,14 +26,14 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/flight"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql/example"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql/schema_ref"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql/example"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql/schema_ref"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 	"google.golang.org/grpc/codes"
diff --git a/go/arrow/flight/flightsql/types.go b/go/arrow/flight/flightsql/types.go
index c70a8bdc4ec26..c709a865da7bb 100644
--- a/go/arrow/flight/flightsql/types.go
+++ b/go/arrow/flight/flightsql/types.go
@@ -17,7 +17,7 @@
 package flightsql
 
 import (
-	pb "github.com/apache/arrow/go/v16/arrow/flight/gen/flight"
+	pb "github.com/apache/arrow/go/v17/arrow/flight/gen/flight"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/anypb"
 )
@@ -134,6 +134,20 @@ type (
 		// the substrait release, e.g. "0.23.0"
 		Version string
 	}
+
+	// ExecuteIngestOpts contains the options for executing a bulk ingestion:
+	//
+	// Required:
+	// - TableDefinitionOptions: Specifies the behavior for creating or updating table definitions
+	// - Table: The destination table to load into
+	//
+	// Optional:
+	// - Schema: The DB schema containing the destination table
+	// - Catalog: The catalog containing the destination table
+	// - Temporary: Use a temporary table as the destination
+	// - TransactionId: Ingest as part of this transaction
+	// - Options: Additional, backend-specific options
+	ExecuteIngestOpts pb.CommandStatementIngest
 )
 
 // SqlInfo enum values
@@ -198,6 +212,18 @@ const (
 	// If 0, there is no timeout.  Servers should reset the timeout when the handle is used in a command.
 	SqlInfoFlightSqlServerTransactionTimeout = SqlInfo(pb.SqlInfo_FLIGHT_SQL_SERVER_TRANSACTION_TIMEOUT)
 
+	// Retrieves a boolean value indicating whether the Flight SQL Server supports executing
+	// bulk ingestion.
+	SqlInfoFlightSqlServerBulkIngestion = SqlInfo(pb.SqlInfo_FLIGHT_SQL_SERVER_BULK_INGESTION)
+	// Retrieves a boolean value indicating whether transactions are supported for bulk ingestion. If not, invoking
+	// the method commit in the context of a bulk ingestion is a noop, and the isolation level is
+	// `arrow.flight.protocol.sql.SqlTransactionIsolationLevel.TRANSACTION_NONE`.
+	//
+	// Returns:
+	// - false: if bulk ingestion transactions are unsupported;
+	// - true: if bulk ingestion transactions are supported.
+	SqlInfoFlightSqlServerIngestTransactionsSupported = SqlInfo(pb.SqlInfo_FLIGHT_SQL_SERVER_INGEST_TRANSACTIONS_SUPPORTED)
+
 	// SQL Syntax Information
 	// Values [500-1000): provide information about the supported SQL Syntax
 
@@ -854,3 +880,20 @@ const (
 )
 
 type CreatePreparedStatementResult = pb.ActionCreatePreparedStatementResult
+
+type (
+	TableDefinitionOptions                    = pb.CommandStatementIngest_TableDefinitionOptions
+	TableDefinitionOptionsTableNotExistOption = pb.CommandStatementIngest_TableDefinitionOptions_TableNotExistOption
+	TableDefinitionOptionsTableExistsOption   = pb.CommandStatementIngest_TableDefinitionOptions_TableExistsOption
+)
+
+const (
+	TableDefinitionOptionsTableNotExistOptionUnspecified = pb.CommandStatementIngest_TableDefinitionOptions_TABLE_NOT_EXIST_OPTION_UNSPECIFIED
+	TableDefinitionOptionsTableNotExistOptionCreate      = pb.CommandStatementIngest_TableDefinitionOptions_TABLE_NOT_EXIST_OPTION_CREATE
+	TableDefinitionOptionsTableNotExistOptionFail        = pb.CommandStatementIngest_TableDefinitionOptions_TABLE_NOT_EXIST_OPTION_FAIL
+
+	TableDefinitionOptionsTableExistsOptionUnspecified = pb.CommandStatementIngest_TableDefinitionOptions_TABLE_EXISTS_OPTION_UNSPECIFIED
+	TableDefinitionOptionsTableExistsOptionFail        = pb.CommandStatementIngest_TableDefinitionOptions_TABLE_EXISTS_OPTION_FAIL
+	TableDefinitionOptionsTableExistsOptionAppend      = pb.CommandStatementIngest_TableDefinitionOptions_TABLE_EXISTS_OPTION_APPEND
+	TableDefinitionOptionsTableExistsOptionReplace     = pb.CommandStatementIngest_TableDefinitionOptions_TABLE_EXISTS_OPTION_REPLACE
+)
diff --git a/go/arrow/flight/gen/flight/Flight.pb.go b/go/arrow/flight/gen/flight/Flight.pb.go
index 42d4493c8f3e6..ea35f469116ab 100644
--- a/go/arrow/flight/gen/flight/Flight.pb.go
+++ b/go/arrow/flight/gen/flight/Flight.pb.go
@@ -18,17 +18,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.2
+// 	protoc        v4.25.3
 // source: Flight.proto
 
 package flight
 
 import (
+	reflect "reflect"
+	sync "sync"
+
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -1210,11 +1211,15 @@ type FlightEndpoint struct {
 	// be redeemed on the current service where the ticket was
 	// generated.
 	//
-	// If the list is not empty, the expectation is that the ticket can
-	// be redeemed at any of the locations, and that the data returned
-	// will be equivalent. In this case, the ticket may only be redeemed
-	// at one of the given locations, and not (necessarily) on the
-	// current service.
+	// If the list is not empty, the expectation is that the ticket can be
+	// redeemed at any of the locations, and that the data returned will be
+	// equivalent. In this case, the ticket may only be redeemed at one of the
+	// given locations, and not (necessarily) on the current service. If one
+	// of the given locations is "arrow-flight-reuse-connection://?", the
+	// client may redeem the ticket on the service where the ticket was
+	// generated (i.e., the same as above), in addition to the other
+	// locations. (This URI was chosen to maximize compatibility, as 'scheme:'
+	// or 'scheme://' are not accepted by Java's java.net.URI.)
 	//
 	// In other words, an application can use multiple locations to
 	// represent redundant and/or load balanced services.
diff --git a/go/arrow/flight/gen/flight/FlightSql.pb.go b/go/arrow/flight/gen/flight/FlightSql.pb.go
index d886bc6bdb70b..f8f5e17d76bd2 100644
--- a/go/arrow/flight/gen/flight/FlightSql.pb.go
+++ b/go/arrow/flight/gen/flight/FlightSql.pb.go
@@ -18,17 +18,18 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.31.0
-// 	protoc        v4.25.2
+// 	protoc        v4.25.3
 // source: FlightSql.proto
 
 package flight
 
 import (
+	reflect "reflect"
+	sync "sync"
+
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	descriptorpb "google.golang.org/protobuf/types/descriptorpb"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -81,6 +82,17 @@ const (
 	// Retrieves a boolean value indicating whether the Flight SQL Server supports explicit
 	// query cancellation (the CancelQuery action).
 	SqlInfo_FLIGHT_SQL_SERVER_CANCEL SqlInfo = 9
+	// Retrieves a boolean value indicating whether the Flight SQL Server supports executing
+	// bulk ingestion.
+	SqlInfo_FLIGHT_SQL_SERVER_BULK_INGESTION SqlInfo = 10
+	// Retrieves a boolean value indicating whether transactions are supported for bulk ingestion. If not, invoking
+	// the method commit in the context of a bulk ingestion is a noop, and the isolation level is
+	// `arrow.flight.protocol.sql.SqlTransactionIsolationLevel.TRANSACTION_NONE`.
+	//
+	// Returns:
+	// - false: if bulk ingestion transactions are unsupported;
+	// - true: if bulk ingestion transactions are supported.
+	SqlInfo_FLIGHT_SQL_SERVER_INGEST_TRANSACTIONS_SUPPORTED SqlInfo = 11
 	// Retrieves an int32 indicating the timeout (in milliseconds) for prepared statement handles.
 	//
 	// If 0, there is no timeout.  Servers should reset the timeout when the handle is used in a command.
@@ -592,6 +604,8 @@ var (
 		7:   "FLIGHT_SQL_SERVER_SUBSTRAIT_MAX_VERSION",
 		8:   "FLIGHT_SQL_SERVER_TRANSACTION",
 		9:   "FLIGHT_SQL_SERVER_CANCEL",
+		10:  "FLIGHT_SQL_SERVER_BULK_INGESTION",
+		11:  "FLIGHT_SQL_SERVER_INGEST_TRANSACTIONS_SUPPORTED",
 		100: "FLIGHT_SQL_SERVER_STATEMENT_TIMEOUT",
 		101: "FLIGHT_SQL_SERVER_TRANSACTION_TIMEOUT",
 		500: "SQL_DDL_CATALOG",
@@ -683,6 +697,8 @@ var (
 		"FLIGHT_SQL_SERVER_SUBSTRAIT_MAX_VERSION":                       7,
 		"FLIGHT_SQL_SERVER_TRANSACTION":                                 8,
 		"FLIGHT_SQL_SERVER_CANCEL":                                      9,
+		"FLIGHT_SQL_SERVER_BULK_INGESTION":                              10,
+		"FLIGHT_SQL_SERVER_INGEST_TRANSACTIONS_SUPPORTED":               11,
 		"FLIGHT_SQL_SERVER_STATEMENT_TIMEOUT":                           100,
 		"FLIGHT_SQL_SERVER_TRANSACTION_TIMEOUT":                         101,
 		"SQL_DDL_CATALOG":                                               500,
@@ -2172,6 +2188,116 @@ func (ActionEndSavepointRequest_EndSavepoint) EnumDescriptor() ([]byte, []int) {
 	return file_FlightSql_proto_rawDescGZIP(), []int{20, 0}
 }
 
+// The action to take if the target table does not exist
+type CommandStatementIngest_TableDefinitionOptions_TableNotExistOption int32
+
+const (
+	// Do not use. Servers should error if this is specified by a client.
+	CommandStatementIngest_TableDefinitionOptions_TABLE_NOT_EXIST_OPTION_UNSPECIFIED CommandStatementIngest_TableDefinitionOptions_TableNotExistOption = 0
+	// Create the table if it does not exist
+	CommandStatementIngest_TableDefinitionOptions_TABLE_NOT_EXIST_OPTION_CREATE CommandStatementIngest_TableDefinitionOptions_TableNotExistOption = 1
+	// Fail if the table does not exist
+	CommandStatementIngest_TableDefinitionOptions_TABLE_NOT_EXIST_OPTION_FAIL CommandStatementIngest_TableDefinitionOptions_TableNotExistOption = 2
+)
+
+// Enum value maps for CommandStatementIngest_TableDefinitionOptions_TableNotExistOption.
+var (
+	CommandStatementIngest_TableDefinitionOptions_TableNotExistOption_name = map[int32]string{
+		0: "TABLE_NOT_EXIST_OPTION_UNSPECIFIED",
+		1: "TABLE_NOT_EXIST_OPTION_CREATE",
+		2: "TABLE_NOT_EXIST_OPTION_FAIL",
+	}
+	CommandStatementIngest_TableDefinitionOptions_TableNotExistOption_value = map[string]int32{
+		"TABLE_NOT_EXIST_OPTION_UNSPECIFIED": 0,
+		"TABLE_NOT_EXIST_OPTION_CREATE":      1,
+		"TABLE_NOT_EXIST_OPTION_FAIL":        2,
+	}
+)
+
+func (x CommandStatementIngest_TableDefinitionOptions_TableNotExistOption) Enum() *CommandStatementIngest_TableDefinitionOptions_TableNotExistOption {
+	p := new(CommandStatementIngest_TableDefinitionOptions_TableNotExistOption)
+	*p = x
+	return p
+}
+
+func (x CommandStatementIngest_TableDefinitionOptions_TableNotExistOption) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (CommandStatementIngest_TableDefinitionOptions_TableNotExistOption) Descriptor() protoreflect.EnumDescriptor {
+	return file_FlightSql_proto_enumTypes[24].Descriptor()
+}
+
+func (CommandStatementIngest_TableDefinitionOptions_TableNotExistOption) Type() protoreflect.EnumType {
+	return &file_FlightSql_proto_enumTypes[24]
+}
+
+func (x CommandStatementIngest_TableDefinitionOptions_TableNotExistOption) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use CommandStatementIngest_TableDefinitionOptions_TableNotExistOption.Descriptor instead.
+func (CommandStatementIngest_TableDefinitionOptions_TableNotExistOption) EnumDescriptor() ([]byte, []int) {
+	return file_FlightSql_proto_rawDescGZIP(), []int{27, 0, 0}
+}
+
+// The action to take if the target table already exists
+type CommandStatementIngest_TableDefinitionOptions_TableExistsOption int32
+
+const (
+	// Do not use. Servers should error if this is specified by a client.
+	CommandStatementIngest_TableDefinitionOptions_TABLE_EXISTS_OPTION_UNSPECIFIED CommandStatementIngest_TableDefinitionOptions_TableExistsOption = 0
+	// Fail if the table already exists
+	CommandStatementIngest_TableDefinitionOptions_TABLE_EXISTS_OPTION_FAIL CommandStatementIngest_TableDefinitionOptions_TableExistsOption = 1
+	// Append to the table if it already exists
+	CommandStatementIngest_TableDefinitionOptions_TABLE_EXISTS_OPTION_APPEND CommandStatementIngest_TableDefinitionOptions_TableExistsOption = 2
+	// Drop and recreate the table if it already exists
+	CommandStatementIngest_TableDefinitionOptions_TABLE_EXISTS_OPTION_REPLACE CommandStatementIngest_TableDefinitionOptions_TableExistsOption = 3
+)
+
+// Enum value maps for CommandStatementIngest_TableDefinitionOptions_TableExistsOption.
+var (
+	CommandStatementIngest_TableDefinitionOptions_TableExistsOption_name = map[int32]string{
+		0: "TABLE_EXISTS_OPTION_UNSPECIFIED",
+		1: "TABLE_EXISTS_OPTION_FAIL",
+		2: "TABLE_EXISTS_OPTION_APPEND",
+		3: "TABLE_EXISTS_OPTION_REPLACE",
+	}
+	CommandStatementIngest_TableDefinitionOptions_TableExistsOption_value = map[string]int32{
+		"TABLE_EXISTS_OPTION_UNSPECIFIED": 0,
+		"TABLE_EXISTS_OPTION_FAIL":        1,
+		"TABLE_EXISTS_OPTION_APPEND":      2,
+		"TABLE_EXISTS_OPTION_REPLACE":     3,
+	}
+)
+
+func (x CommandStatementIngest_TableDefinitionOptions_TableExistsOption) Enum() *CommandStatementIngest_TableDefinitionOptions_TableExistsOption {
+	p := new(CommandStatementIngest_TableDefinitionOptions_TableExistsOption)
+	*p = x
+	return p
+}
+
+func (x CommandStatementIngest_TableDefinitionOptions_TableExistsOption) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (CommandStatementIngest_TableDefinitionOptions_TableExistsOption) Descriptor() protoreflect.EnumDescriptor {
+	return file_FlightSql_proto_enumTypes[25].Descriptor()
+}
+
+func (CommandStatementIngest_TableDefinitionOptions_TableExistsOption) Type() protoreflect.EnumType {
+	return &file_FlightSql_proto_enumTypes[25]
+}
+
+func (x CommandStatementIngest_TableDefinitionOptions_TableExistsOption) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use CommandStatementIngest_TableDefinitionOptions_TableExistsOption.Descriptor instead.
+func (CommandStatementIngest_TableDefinitionOptions_TableExistsOption) EnumDescriptor() ([]byte, []int) {
+	return file_FlightSql_proto_rawDescGZIP(), []int{27, 0, 1}
+}
+
 type ActionCancelQueryResult_CancelResult int32
 
 const (
@@ -2217,11 +2343,11 @@ func (x ActionCancelQueryResult_CancelResult) String() string {
 }
 
 func (ActionCancelQueryResult_CancelResult) Descriptor() protoreflect.EnumDescriptor {
-	return file_FlightSql_proto_enumTypes[24].Descriptor()
+	return file_FlightSql_proto_enumTypes[26].Descriptor()
 }
 
 func (ActionCancelQueryResult_CancelResult) Type() protoreflect.EnumType {
-	return &file_FlightSql_proto_enumTypes[24]
+	return &file_FlightSql_proto_enumTypes[26]
 }
 
 func (x ActionCancelQueryResult_CancelResult) Number() protoreflect.EnumNumber {
@@ -2230,7 +2356,7 @@ func (x ActionCancelQueryResult_CancelResult) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use ActionCancelQueryResult_CancelResult.Descriptor instead.
 func (ActionCancelQueryResult_CancelResult) EnumDescriptor() ([]byte, []int) {
-	return file_FlightSql_proto_rawDescGZIP(), []int{29, 0}
+	return file_FlightSql_proto_rawDescGZIP(), []int{31, 0}
 }
 
 // Represents a metadata request. Used in the command member of FlightDescriptor
@@ -4184,9 +4310,117 @@ func (x *CommandPreparedStatementUpdate) GetPreparedStatementHandle() []byte {
 	return nil
 }
 
-// Returned from the RPC call DoPut when a CommandStatementUpdate
-// CommandPreparedStatementUpdate was in the request, containing
-// results from the update.
+// Represents a bulk ingestion request. Used in the command member of FlightDescriptor
+// for the the RPC call DoPut to cause the server load the contents of the stream's
+// FlightData into the target destination.
+type CommandStatementIngest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// The behavior for handling the table definition.
+	TableDefinitionOptions *CommandStatementIngest_TableDefinitionOptions `protobuf:"bytes,1,opt,name=table_definition_options,json=tableDefinitionOptions,proto3" json:"table_definition_options,omitempty"`
+	// The table to load data into.
+	Table string `protobuf:"bytes,2,opt,name=table,proto3" json:"table,omitempty"`
+	// The db_schema of the destination table to load data into. If unset, a backend-specific default may be used.
+	Schema *string `protobuf:"bytes,3,opt,name=schema,proto3,oneof" json:"schema,omitempty"`
+	// The catalog of the destination table to load data into. If unset, a backend-specific default may be used.
+	Catalog *string `protobuf:"bytes,4,opt,name=catalog,proto3,oneof" json:"catalog,omitempty"`
+	// Store ingested data in a temporary table.
+	// The effect of setting temporary is to place the table in a backend-defined namespace, and to drop the table at the end of the session.
+	// The namespacing may make use of a backend-specific schema and/or catalog.
+	// The server should return an error if an explicit choice of schema or catalog is incompatible with the server's namespacing decision.
+	Temporary bool `protobuf:"varint,5,opt,name=temporary,proto3" json:"temporary,omitempty"`
+	// Perform the ingestion as part of this transaction. If specified, results should not be committed in the event of an error/cancellation.
+	TransactionId []byte `protobuf:"bytes,6,opt,name=transaction_id,json=transactionId,proto3,oneof" json:"transaction_id,omitempty"`
+	// Backend-specific options.
+	Options map[string]string `protobuf:"bytes,1000,rep,name=options,proto3" json:"options,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+}
+
+func (x *CommandStatementIngest) Reset() {
+	*x = CommandStatementIngest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_FlightSql_proto_msgTypes[27]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CommandStatementIngest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CommandStatementIngest) ProtoMessage() {}
+
+func (x *CommandStatementIngest) ProtoReflect() protoreflect.Message {
+	mi := &file_FlightSql_proto_msgTypes[27]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CommandStatementIngest.ProtoReflect.Descriptor instead.
+func (*CommandStatementIngest) Descriptor() ([]byte, []int) {
+	return file_FlightSql_proto_rawDescGZIP(), []int{27}
+}
+
+func (x *CommandStatementIngest) GetTableDefinitionOptions() *CommandStatementIngest_TableDefinitionOptions {
+	if x != nil {
+		return x.TableDefinitionOptions
+	}
+	return nil
+}
+
+func (x *CommandStatementIngest) GetTable() string {
+	if x != nil {
+		return x.Table
+	}
+	return ""
+}
+
+func (x *CommandStatementIngest) GetSchema() string {
+	if x != nil && x.Schema != nil {
+		return *x.Schema
+	}
+	return ""
+}
+
+func (x *CommandStatementIngest) GetCatalog() string {
+	if x != nil && x.Catalog != nil {
+		return *x.Catalog
+	}
+	return ""
+}
+
+func (x *CommandStatementIngest) GetTemporary() bool {
+	if x != nil {
+		return x.Temporary
+	}
+	return false
+}
+
+func (x *CommandStatementIngest) GetTransactionId() []byte {
+	if x != nil {
+		return x.TransactionId
+	}
+	return nil
+}
+
+func (x *CommandStatementIngest) GetOptions() map[string]string {
+	if x != nil {
+		return x.Options
+	}
+	return nil
+}
+
+// Returned from the RPC call DoPut when a CommandStatementUpdate,
+// CommandPreparedStatementUpdate, or CommandStatementIngest was
+// in the request, containing results from the update.
 type DoPutUpdateResult struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -4200,7 +4434,7 @@ type DoPutUpdateResult struct {
 func (x *DoPutUpdateResult) Reset() {
 	*x = DoPutUpdateResult{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_FlightSql_proto_msgTypes[27]
+		mi := &file_FlightSql_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4213,7 +4447,7 @@ func (x *DoPutUpdateResult) String() string {
 func (*DoPutUpdateResult) ProtoMessage() {}
 
 func (x *DoPutUpdateResult) ProtoReflect() protoreflect.Message {
-	mi := &file_FlightSql_proto_msgTypes[27]
+	mi := &file_FlightSql_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4226,7 +4460,7 @@ func (x *DoPutUpdateResult) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DoPutUpdateResult.ProtoReflect.Descriptor instead.
 func (*DoPutUpdateResult) Descriptor() ([]byte, []int) {
-	return file_FlightSql_proto_rawDescGZIP(), []int{27}
+	return file_FlightSql_proto_rawDescGZIP(), []int{28}
 }
 
 func (x *DoPutUpdateResult) GetRecordCount() int64 {
@@ -4236,6 +4470,66 @@ func (x *DoPutUpdateResult) GetRecordCount() int64 {
 	return 0
 }
 
+// An *optional* response returned when `DoPut` is called with `CommandPreparedStatementQuery`.
+//
+// *Note on legacy behavior*: previous versions of the protocol did not return any result for
+// this command, and that behavior should still be supported by clients. In that case, the client
+// can continue as though the fields in this message were not provided or set to sensible default values.
+type DoPutPreparedStatementResult struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// Represents a (potentially updated) opaque handle for the prepared statement on the server.
+	// Because the handle could potentially be updated, any previous handles for this prepared
+	// statement should be considered invalid, and all subsequent requests for this prepared
+	// statement must use this new handle.
+	// The updated handle allows implementing query parameters with stateless services.
+	//
+	// When an updated handle is not provided by the server, clients should contiue
+	// using the previous handle provided by `ActionCreatePreparedStatementResonse`.
+	PreparedStatementHandle []byte `protobuf:"bytes,1,opt,name=prepared_statement_handle,json=preparedStatementHandle,proto3,oneof" json:"prepared_statement_handle,omitempty"`
+}
+
+func (x *DoPutPreparedStatementResult) Reset() {
+	*x = DoPutPreparedStatementResult{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_FlightSql_proto_msgTypes[29]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *DoPutPreparedStatementResult) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*DoPutPreparedStatementResult) ProtoMessage() {}
+
+func (x *DoPutPreparedStatementResult) ProtoReflect() protoreflect.Message {
+	mi := &file_FlightSql_proto_msgTypes[29]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use DoPutPreparedStatementResult.ProtoReflect.Descriptor instead.
+func (*DoPutPreparedStatementResult) Descriptor() ([]byte, []int) {
+	return file_FlightSql_proto_rawDescGZIP(), []int{29}
+}
+
+func (x *DoPutPreparedStatementResult) GetPreparedStatementHandle() []byte {
+	if x != nil {
+		return x.PreparedStatementHandle
+	}
+	return nil
+}
+
 // Request message for the "CancelQuery" action.
 //
 // Explicitly cancel a running query.
@@ -4268,7 +4562,7 @@ type ActionCancelQueryRequest struct {
 func (x *ActionCancelQueryRequest) Reset() {
 	*x = ActionCancelQueryRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_FlightSql_proto_msgTypes[28]
+		mi := &file_FlightSql_proto_msgTypes[30]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4281,7 +4575,7 @@ func (x *ActionCancelQueryRequest) String() string {
 func (*ActionCancelQueryRequest) ProtoMessage() {}
 
 func (x *ActionCancelQueryRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_FlightSql_proto_msgTypes[28]
+	mi := &file_FlightSql_proto_msgTypes[30]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4294,7 +4588,7 @@ func (x *ActionCancelQueryRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ActionCancelQueryRequest.ProtoReflect.Descriptor instead.
 func (*ActionCancelQueryRequest) Descriptor() ([]byte, []int) {
-	return file_FlightSql_proto_rawDescGZIP(), []int{28}
+	return file_FlightSql_proto_rawDescGZIP(), []int{30}
 }
 
 func (x *ActionCancelQueryRequest) GetInfo() []byte {
@@ -4323,7 +4617,7 @@ type ActionCancelQueryResult struct {
 func (x *ActionCancelQueryResult) Reset() {
 	*x = ActionCancelQueryResult{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_FlightSql_proto_msgTypes[29]
+		mi := &file_FlightSql_proto_msgTypes[31]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4336,7 +4630,7 @@ func (x *ActionCancelQueryResult) String() string {
 func (*ActionCancelQueryResult) ProtoMessage() {}
 
 func (x *ActionCancelQueryResult) ProtoReflect() protoreflect.Message {
-	mi := &file_FlightSql_proto_msgTypes[29]
+	mi := &file_FlightSql_proto_msgTypes[31]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4349,7 +4643,7 @@ func (x *ActionCancelQueryResult) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ActionCancelQueryResult.ProtoReflect.Descriptor instead.
 func (*ActionCancelQueryResult) Descriptor() ([]byte, []int) {
-	return file_FlightSql_proto_rawDescGZIP(), []int{29}
+	return file_FlightSql_proto_rawDescGZIP(), []int{31}
 }
 
 func (x *ActionCancelQueryResult) GetResult() ActionCancelQueryResult_CancelResult {
@@ -4359,6 +4653,62 @@ func (x *ActionCancelQueryResult) GetResult() ActionCancelQueryResult_CancelResu
 	return ActionCancelQueryResult_CANCEL_RESULT_UNSPECIFIED
 }
 
+// Options for table definition behavior
+type CommandStatementIngest_TableDefinitionOptions struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	IfNotExist CommandStatementIngest_TableDefinitionOptions_TableNotExistOption `protobuf:"varint,1,opt,name=if_not_exist,json=ifNotExist,proto3,enum=arrow.flight.protocol.sql.CommandStatementIngest_TableDefinitionOptions_TableNotExistOption" json:"if_not_exist,omitempty"`
+	IfExists   CommandStatementIngest_TableDefinitionOptions_TableExistsOption   `protobuf:"varint,2,opt,name=if_exists,json=ifExists,proto3,enum=arrow.flight.protocol.sql.CommandStatementIngest_TableDefinitionOptions_TableExistsOption" json:"if_exists,omitempty"`
+}
+
+func (x *CommandStatementIngest_TableDefinitionOptions) Reset() {
+	*x = CommandStatementIngest_TableDefinitionOptions{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_FlightSql_proto_msgTypes[32]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CommandStatementIngest_TableDefinitionOptions) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CommandStatementIngest_TableDefinitionOptions) ProtoMessage() {}
+
+func (x *CommandStatementIngest_TableDefinitionOptions) ProtoReflect() protoreflect.Message {
+	mi := &file_FlightSql_proto_msgTypes[32]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CommandStatementIngest_TableDefinitionOptions.ProtoReflect.Descriptor instead.
+func (*CommandStatementIngest_TableDefinitionOptions) Descriptor() ([]byte, []int) {
+	return file_FlightSql_proto_rawDescGZIP(), []int{27, 0}
+}
+
+func (x *CommandStatementIngest_TableDefinitionOptions) GetIfNotExist() CommandStatementIngest_TableDefinitionOptions_TableNotExistOption {
+	if x != nil {
+		return x.IfNotExist
+	}
+	return CommandStatementIngest_TableDefinitionOptions_TABLE_NOT_EXIST_OPTION_UNSPECIFIED
+}
+
+func (x *CommandStatementIngest_TableDefinitionOptions) GetIfExists() CommandStatementIngest_TableDefinitionOptions_TableExistsOption {
+	if x != nil {
+		return x.IfExists
+	}
+	return CommandStatementIngest_TableDefinitionOptions_TABLE_EXISTS_OPTION_UNSPECIFIED
+}
+
 var file_FlightSql_proto_extTypes = []protoimpl.ExtensionInfo{
 	{
 		ExtendedType:  (*descriptorpb.MessageOptions)(nil),
@@ -4606,513 +4956,594 @@ var file_FlightSql_proto_rawDesc = []byte{
 	0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x17, 0x70, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x64, 0x53,
 	0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x3a, 0x03,
-	0xc0, 0x3e, 0x01, 0x22, 0x3b, 0x0a, 0x11, 0x44, 0x6f, 0x50, 0x75, 0x74, 0x55, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x72, 0x65, 0x63, 0x6f,
-	0x72, 0x64, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b,
-	0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x3a, 0x03, 0xc0, 0x3e, 0x01,
-	0x22, 0x35, 0x0a, 0x18, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c,
-	0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04,
-	0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f,
-	0x3a, 0x05, 0xc0, 0x3e, 0x01, 0x18, 0x01, 0x22, 0x87, 0x02, 0x0a, 0x17, 0x41, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73,
-	0x75, 0x6c, 0x74, 0x12, 0x57, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x3f, 0x2e, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x2e, 0x66, 0x6c, 0x69, 0x67,
-	0x68, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2e, 0x73, 0x71, 0x6c, 0x2e,
-	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x51, 0x75, 0x65, 0x72,
-	0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65,
-	0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x8b, 0x01, 0x0a,
-	0x0c, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1d, 0x0a,
-	0x19, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x55,
-	0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17,
-	0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x43, 0x41,
-	0x4e, 0x43, 0x45, 0x4c, 0x4c, 0x45, 0x44, 0x10, 0x01, 0x12, 0x1c, 0x0a, 0x18, 0x43, 0x41, 0x4e,
-	0x43, 0x45, 0x4c, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x43, 0x41, 0x4e, 0x43, 0x45,
-	0x4c, 0x4c, 0x49, 0x4e, 0x47, 0x10, 0x02, 0x12, 0x21, 0x0a, 0x1d, 0x43, 0x41, 0x4e, 0x43, 0x45,
-	0x4c, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, 0x43, 0x41, 0x4e,
-	0x43, 0x45, 0x4c, 0x4c, 0x41, 0x42, 0x4c, 0x45, 0x10, 0x03, 0x3a, 0x05, 0xc0, 0x3e, 0x01, 0x18,
-	0x01, 0x2a, 0xb7, 0x18, 0x0a, 0x07, 0x53, 0x71, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a,
-	0x16, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56,
-	0x45, 0x52, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x10, 0x00, 0x12, 0x1d, 0x0a, 0x19, 0x46, 0x4c, 0x49,
-	0x47, 0x48, 0x54, 0x5f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x56,
-	0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x01, 0x12, 0x23, 0x0a, 0x1f, 0x46, 0x4c, 0x49, 0x47,
-	0x48, 0x54, 0x5f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x41, 0x52,
-	0x52, 0x4f, 0x57, 0x5f, 0x56, 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x02, 0x12, 0x1f, 0x0a,
-	0x1b, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56,
-	0x45, 0x52, 0x5f, 0x52, 0x45, 0x41, 0x44, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x03, 0x12, 0x19,
-	0x0a, 0x15, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52,
-	0x56, 0x45, 0x52, 0x5f, 0x53, 0x51, 0x4c, 0x10, 0x04, 0x12, 0x1f, 0x0a, 0x1b, 0x46, 0x4c, 0x49,
+	0xc0, 0x3e, 0x01, 0x22, 0xb1, 0x08, 0x0a, 0x16, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x12, 0x82,
+	0x01, 0x0a, 0x18, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x48, 0x2e, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x2e, 0x66, 0x6c, 0x69, 0x67, 0x68, 0x74,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2e, 0x73, 0x71, 0x6c, 0x2e, 0x43, 0x6f,
+	0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x6e,
+	0x67, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69,
+	0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x16, 0x74, 0x61, 0x62,
+	0x6c, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x05, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x1b, 0x0a, 0x06, 0x73, 0x63, 0x68,
+	0x65, 0x6d, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x73, 0x63, 0x68,
+	0x65, 0x6d, 0x61, 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x61, 0x74, 0x61, 0x6c, 0x6f,
+	0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x07, 0x63, 0x61, 0x74, 0x61, 0x6c,
+	0x6f, 0x67, 0x88, 0x01, 0x01, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61,
+	0x72, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72,
+	0x61, 0x72, 0x79, 0x12, 0x2a, 0x0a, 0x0e, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x02, 0x52, 0x0d, 0x74,
+	0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12,
+	0x59, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xe8, 0x07, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x3e, 0x2e, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x2e, 0x66, 0x6c, 0x69, 0x67, 0x68, 0x74,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2e, 0x73, 0x71, 0x6c, 0x2e, 0x43, 0x6f,
+	0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x6e,
+	0x67, 0x65, 0x73, 0x74, 0x2e, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0xaf, 0x04, 0x0a, 0x16, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x7e, 0x0a, 0x0c, 0x69, 0x66, 0x5f, 0x6e, 0x6f, 0x74, 0x5f,
+	0x65, 0x78, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x5c, 0x2e, 0x61, 0x72,
+	0x72, 0x6f, 0x77, 0x2e, 0x66, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x63, 0x6f, 0x6c, 0x2e, 0x73, 0x71, 0x6c, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x53,
+	0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x2e, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x6f, 0x74, 0x45, 0x78,
+	0x69, 0x73, 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x69, 0x66, 0x4e, 0x6f, 0x74,
+	0x45, 0x78, 0x69, 0x73, 0x74, 0x12, 0x77, 0x0a, 0x09, 0x69, 0x66, 0x5f, 0x65, 0x78, 0x69, 0x73,
+	0x74, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x5a, 0x2e, 0x61, 0x72, 0x72, 0x6f, 0x77,
+	0x2e, 0x66, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c,
+	0x2e, 0x73, 0x71, 0x6c, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x53, 0x74, 0x61, 0x74,
+	0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x67, 0x65, 0x73, 0x74, 0x2e, 0x54, 0x61, 0x62, 0x6c,
+	0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x69, 0x66, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x22, 0x81,
+	0x01, 0x0a, 0x13, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x6f, 0x74, 0x45, 0x78, 0x69, 0x73, 0x74,
+	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x26, 0x0a, 0x22, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f,
+	0x4e, 0x4f, 0x54, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e,
+	0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x21,
+	0x0a, 0x1d, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, 0x45, 0x58, 0x49, 0x53,
+	0x54, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x43, 0x52, 0x45, 0x41, 0x54, 0x45, 0x10,
+	0x01, 0x12, 0x1f, 0x0a, 0x1b, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, 0x45,
+	0x58, 0x49, 0x53, 0x54, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x46, 0x41, 0x49, 0x4c,
+	0x10, 0x02, 0x22, 0x97, 0x01, 0x0a, 0x11, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x45, 0x78, 0x69, 0x73,
+	0x74, 0x73, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x1f, 0x54, 0x41, 0x42, 0x4c,
+	0x45, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x5f, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x5f,
+	0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1c, 0x0a,
+	0x18, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x5f, 0x4f, 0x50,
+	0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x10, 0x01, 0x12, 0x1e, 0x0a, 0x1a, 0x54,
+	0x41, 0x42, 0x4c, 0x45, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x5f, 0x4f, 0x50, 0x54, 0x49,
+	0x4f, 0x4e, 0x5f, 0x41, 0x50, 0x50, 0x45, 0x4e, 0x44, 0x10, 0x02, 0x12, 0x1f, 0x0a, 0x1b, 0x54,
+	0x41, 0x42, 0x4c, 0x45, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x5f, 0x4f, 0x50, 0x54, 0x49,
+	0x4f, 0x4e, 0x5f, 0x52, 0x45, 0x50, 0x4c, 0x41, 0x43, 0x45, 0x10, 0x03, 0x1a, 0x3a, 0x0a, 0x0c,
+	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
+	0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
+	0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x3a, 0x03, 0xc0, 0x3e, 0x01, 0x42, 0x09, 0x0a,
+	0x07, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x63, 0x61, 0x74,
+	0x61, 0x6c, 0x6f, 0x67, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x22, 0x3b, 0x0a, 0x11, 0x44, 0x6f, 0x50, 0x75, 0x74,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x21, 0x0a, 0x0c,
+	0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x0b, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x3a,
+	0x03, 0xc0, 0x3e, 0x01, 0x22, 0x82, 0x01, 0x0a, 0x1c, 0x44, 0x6f, 0x50, 0x75, 0x74, 0x50, 0x72,
+	0x65, 0x70, 0x61, 0x72, 0x65, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x52,
+	0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x3f, 0x0a, 0x19, 0x70, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65,
+	0x64, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x68, 0x61, 0x6e, 0x64,
+	0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x17, 0x70, 0x72, 0x65, 0x70,
+	0x61, 0x72, 0x65, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x48, 0x61, 0x6e,
+	0x64, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x3a, 0x03, 0xc0, 0x3e, 0x01, 0x42, 0x1c, 0x0a, 0x1a, 0x5f,
+	0x70, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x6d, 0x65,
+	0x6e, 0x74, 0x5f, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0x35, 0x0a, 0x18, 0x41, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0c, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x3a, 0x05, 0xc0, 0x3e, 0x01, 0x18, 0x01,
+	0x22, 0x87, 0x02, 0x0a, 0x17, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x61, 0x6e, 0x63, 0x65,
+	0x6c, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x57, 0x0a, 0x06,
+	0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3f, 0x2e, 0x61,
+	0x72, 0x72, 0x6f, 0x77, 0x2e, 0x66, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x63, 0x6f, 0x6c, 0x2e, 0x73, 0x71, 0x6c, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x43,
+	0x61, 0x6e, 0x63, 0x65, 0x6c, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
+	0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72,
+	0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x8b, 0x01, 0x0a, 0x0c, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c,
+	0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1d, 0x0a, 0x19, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c,
+	0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46,
+	0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x5f,
+	0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x4c, 0x45, 0x44,
+	0x10, 0x01, 0x12, 0x1c, 0x0a, 0x18, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x5f, 0x52, 0x45, 0x53,
+	0x55, 0x4c, 0x54, 0x5f, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x4c, 0x49, 0x4e, 0x47, 0x10, 0x02,
+	0x12, 0x21, 0x0a, 0x1d, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c,
+	0x54, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x4c, 0x41, 0x42, 0x4c,
+	0x45, 0x10, 0x03, 0x3a, 0x05, 0xc0, 0x3e, 0x01, 0x18, 0x01, 0x2a, 0x92, 0x19, 0x0a, 0x07, 0x53,
+	0x71, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x16, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54,
+	0x5f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x4e, 0x41, 0x4d, 0x45,
+	0x10, 0x00, 0x12, 0x1d, 0x0a, 0x19, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x53, 0x51, 0x4c,
+	0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x56, 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x10,
+	0x01, 0x12, 0x23, 0x0a, 0x1f, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x53, 0x51, 0x4c, 0x5f,
+	0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x41, 0x52, 0x52, 0x4f, 0x57, 0x5f, 0x56, 0x45, 0x52,
+	0x53, 0x49, 0x4f, 0x4e, 0x10, 0x02, 0x12, 0x1f, 0x0a, 0x1b, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54,
+	0x5f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x52, 0x45, 0x41, 0x44,
+	0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x03, 0x12, 0x19, 0x0a, 0x15, 0x46, 0x4c, 0x49, 0x47, 0x48,
+	0x54, 0x5f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x53, 0x51, 0x4c,
+	0x10, 0x04, 0x12, 0x1f, 0x0a, 0x1b, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x53, 0x51, 0x4c,
+	0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x53, 0x55, 0x42, 0x53, 0x54, 0x52, 0x41, 0x49,
+	0x54, 0x10, 0x05, 0x12, 0x2b, 0x0a, 0x27, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x53, 0x51,
+	0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x53, 0x55, 0x42, 0x53, 0x54, 0x52, 0x41,
+	0x49, 0x54, 0x5f, 0x4d, 0x49, 0x4e, 0x5f, 0x56, 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x06,
+	0x12, 0x2b, 0x0a, 0x27, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x53, 0x51, 0x4c, 0x5f, 0x53,
+	0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x53, 0x55, 0x42, 0x53, 0x54, 0x52, 0x41, 0x49, 0x54, 0x5f,
+	0x4d, 0x41, 0x58, 0x5f, 0x56, 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x07, 0x12, 0x21, 0x0a,
+	0x1d, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56,
+	0x45, 0x52, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x08,
+	0x12, 0x1c, 0x0a, 0x18, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x53, 0x51, 0x4c, 0x5f, 0x53,
+	0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x10, 0x09, 0x12, 0x24,
+	0x0a, 0x20, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52,
+	0x56, 0x45, 0x52, 0x5f, 0x42, 0x55, 0x4c, 0x4b, 0x5f, 0x49, 0x4e, 0x47, 0x45, 0x53, 0x54, 0x49,
+	0x4f, 0x4e, 0x10, 0x0a, 0x12, 0x33, 0x0a, 0x2f, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x53,
+	0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x49, 0x4e, 0x47, 0x45, 0x53, 0x54,
+	0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x5f, 0x53, 0x55,
+	0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x10, 0x0b, 0x12, 0x27, 0x0a, 0x23, 0x46, 0x4c, 0x49,
 	0x47, 0x48, 0x54, 0x5f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x53,
-	0x55, 0x42, 0x53, 0x54, 0x52, 0x41, 0x49, 0x54, 0x10, 0x05, 0x12, 0x2b, 0x0a, 0x27, 0x46, 0x4c,
-	0x49, 0x47, 0x48, 0x54, 0x5f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f,
-	0x53, 0x55, 0x42, 0x53, 0x54, 0x52, 0x41, 0x49, 0x54, 0x5f, 0x4d, 0x49, 0x4e, 0x5f, 0x56, 0x45,
-	0x52, 0x53, 0x49, 0x4f, 0x4e, 0x10, 0x06, 0x12, 0x2b, 0x0a, 0x27, 0x46, 0x4c, 0x49, 0x47, 0x48,
-	0x54, 0x5f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x53, 0x55, 0x42,
-	0x53, 0x54, 0x52, 0x41, 0x49, 0x54, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x56, 0x45, 0x52, 0x53, 0x49,
-	0x4f, 0x4e, 0x10, 0x07, 0x12, 0x21, 0x0a, 0x1d, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x53,
-	0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41,
-	0x43, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x08, 0x12, 0x1c, 0x0a, 0x18, 0x46, 0x4c, 0x49, 0x47, 0x48,
-	0x54, 0x5f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x43, 0x41, 0x4e,
-	0x43, 0x45, 0x4c, 0x10, 0x09, 0x12, 0x27, 0x0a, 0x23, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f,
-	0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x45,
-	0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x4f, 0x55, 0x54, 0x10, 0x64, 0x12, 0x29,
-	0x0a, 0x25, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x52,
-	0x56, 0x45, 0x52, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f,
-	0x54, 0x49, 0x4d, 0x45, 0x4f, 0x55, 0x54, 0x10, 0x65, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x51, 0x4c,
-	0x5f, 0x44, 0x44, 0x4c, 0x5f, 0x43, 0x41, 0x54, 0x41, 0x4c, 0x4f, 0x47, 0x10, 0xf4, 0x03, 0x12,
-	0x13, 0x0a, 0x0e, 0x53, 0x51, 0x4c, 0x5f, 0x44, 0x44, 0x4c, 0x5f, 0x53, 0x43, 0x48, 0x45, 0x4d,
-	0x41, 0x10, 0xf5, 0x03, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x51, 0x4c, 0x5f, 0x44, 0x44, 0x4c, 0x5f,
-	0x54, 0x41, 0x42, 0x4c, 0x45, 0x10, 0xf6, 0x03, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x51, 0x4c, 0x5f,
-	0x49, 0x44, 0x45, 0x4e, 0x54, 0x49, 0x46, 0x49, 0x45, 0x52, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x10,
-	0xf7, 0x03, 0x12, 0x1e, 0x0a, 0x19, 0x53, 0x51, 0x4c, 0x5f, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x49,
-	0x46, 0x49, 0x45, 0x52, 0x5f, 0x51, 0x55, 0x4f, 0x54, 0x45, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x10,
-	0xf8, 0x03, 0x12, 0x1f, 0x0a, 0x1a, 0x53, 0x51, 0x4c, 0x5f, 0x51, 0x55, 0x4f, 0x54, 0x45, 0x44,
-	0x5f, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x49, 0x46, 0x49, 0x45, 0x52, 0x5f, 0x43, 0x41, 0x53, 0x45,
-	0x10, 0xf9, 0x03, 0x12, 0x22, 0x0a, 0x1d, 0x53, 0x51, 0x4c, 0x5f, 0x41, 0x4c, 0x4c, 0x5f, 0x54,
-	0x41, 0x42, 0x4c, 0x45, 0x53, 0x5f, 0x41, 0x52, 0x45, 0x5f, 0x53, 0x45, 0x4c, 0x45, 0x43, 0x54,
-	0x41, 0x42, 0x4c, 0x45, 0x10, 0xfa, 0x03, 0x12, 0x16, 0x0a, 0x11, 0x53, 0x51, 0x4c, 0x5f, 0x4e,
-	0x55, 0x4c, 0x4c, 0x5f, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x49, 0x4e, 0x47, 0x10, 0xfb, 0x03, 0x12,
-	0x11, 0x0a, 0x0c, 0x53, 0x51, 0x4c, 0x5f, 0x4b, 0x45, 0x59, 0x57, 0x4f, 0x52, 0x44, 0x53, 0x10,
-	0xfc, 0x03, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x51, 0x4c, 0x5f, 0x4e, 0x55, 0x4d, 0x45, 0x52, 0x49,
-	0x43, 0x5f, 0x46, 0x55, 0x4e, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0xfd, 0x03, 0x12, 0x19,
-	0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x46, 0x55, 0x4e,
-	0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0xfe, 0x03, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x51, 0x4c,
-	0x5f, 0x53, 0x59, 0x53, 0x54, 0x45, 0x4d, 0x5f, 0x46, 0x55, 0x4e, 0x43, 0x54, 0x49, 0x4f, 0x4e,
-	0x53, 0x10, 0xff, 0x03, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x51, 0x4c, 0x5f, 0x44, 0x41, 0x54, 0x45,
-	0x54, 0x49, 0x4d, 0x45, 0x5f, 0x46, 0x55, 0x4e, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0x80,
-	0x04, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x41, 0x52, 0x43, 0x48, 0x5f,
-	0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x45, 0x53, 0x43, 0x41, 0x50, 0x45, 0x10, 0x81, 0x04,
-	0x12, 0x1e, 0x0a, 0x19, 0x53, 0x51, 0x4c, 0x5f, 0x45, 0x58, 0x54, 0x52, 0x41, 0x5f, 0x4e, 0x41,
-	0x4d, 0x45, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52, 0x53, 0x10, 0x82, 0x04,
-	0x12, 0x21, 0x0a, 0x1c, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x53,
-	0x5f, 0x43, 0x4f, 0x4c, 0x55, 0x4d, 0x4e, 0x5f, 0x41, 0x4c, 0x49, 0x41, 0x53, 0x49, 0x4e, 0x47,
-	0x10, 0x83, 0x04, 0x12, 0x1f, 0x0a, 0x1a, 0x53, 0x51, 0x4c, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x5f,
-	0x50, 0x4c, 0x55, 0x53, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x5f, 0x49, 0x53, 0x5f, 0x4e, 0x55, 0x4c,
-	0x4c, 0x10, 0x84, 0x04, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50,
-	0x4f, 0x52, 0x54, 0x53, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x10, 0x85, 0x04, 0x12,
-	0x29, 0x0a, 0x24, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x53, 0x5f,
-	0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x43, 0x4f, 0x52, 0x52, 0x45, 0x4c, 0x41, 0x54, 0x49, 0x4f,
-	0x4e, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x53, 0x10, 0x86, 0x04, 0x12, 0x33, 0x0a, 0x2e, 0x53, 0x51,
-	0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x53, 0x5f, 0x44, 0x49, 0x46, 0x46, 0x45,
-	0x52, 0x45, 0x4e, 0x54, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x43, 0x4f, 0x52, 0x52, 0x45,
-	0x4c, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x53, 0x10, 0x87, 0x04, 0x12,
-	0x29, 0x0a, 0x24, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x53, 0x5f,
-	0x45, 0x58, 0x50, 0x52, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x53, 0x5f, 0x49, 0x4e, 0x5f, 0x4f,
-	0x52, 0x44, 0x45, 0x52, 0x5f, 0x42, 0x59, 0x10, 0x88, 0x04, 0x12, 0x24, 0x0a, 0x1f, 0x53, 0x51,
-	0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x53, 0x5f, 0x4f, 0x52, 0x44, 0x45, 0x52,
-	0x5f, 0x42, 0x59, 0x5f, 0x55, 0x4e, 0x52, 0x45, 0x4c, 0x41, 0x54, 0x45, 0x44, 0x10, 0x89, 0x04,
-	0x12, 0x1b, 0x0a, 0x16, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45,
-	0x44, 0x5f, 0x47, 0x52, 0x4f, 0x55, 0x50, 0x5f, 0x42, 0x59, 0x10, 0x8a, 0x04, 0x12, 0x24, 0x0a,
-	0x1f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x53, 0x5f, 0x4c, 0x49,
-	0x4b, 0x45, 0x5f, 0x45, 0x53, 0x43, 0x41, 0x50, 0x45, 0x5f, 0x43, 0x4c, 0x41, 0x55, 0x53, 0x45,
-	0x10, 0x8b, 0x04, 0x12, 0x26, 0x0a, 0x21, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f,
-	0x52, 0x54, 0x53, 0x5f, 0x4e, 0x4f, 0x4e, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x41, 0x42, 0x4c, 0x45,
-	0x5f, 0x43, 0x4f, 0x4c, 0x55, 0x4d, 0x4e, 0x53, 0x10, 0x8c, 0x04, 0x12, 0x1a, 0x0a, 0x15, 0x53,
-	0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x47, 0x52, 0x41,
-	0x4d, 0x4d, 0x41, 0x52, 0x10, 0x8d, 0x04, 0x12, 0x1f, 0x0a, 0x1a, 0x53, 0x51, 0x4c, 0x5f, 0x41,
-	0x4e, 0x53, 0x49, 0x39, 0x32, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f,
-	0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x8e, 0x04, 0x12, 0x30, 0x0a, 0x2b, 0x53, 0x51, 0x4c, 0x5f,
-	0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x53, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x52, 0x49,
-	0x54, 0x59, 0x5f, 0x45, 0x4e, 0x48, 0x41, 0x4e, 0x43, 0x45, 0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x46,
-	0x41, 0x43, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x10, 0x8f, 0x04, 0x12, 0x22, 0x0a, 0x1d, 0x53, 0x51,
-	0x4c, 0x5f, 0x4f, 0x55, 0x54, 0x45, 0x52, 0x5f, 0x4a, 0x4f, 0x49, 0x4e, 0x53, 0x5f, 0x53, 0x55,
-	0x50, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x90, 0x04, 0x12, 0x14,
-	0x0a, 0x0f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x43, 0x48, 0x45, 0x4d, 0x41, 0x5f, 0x54, 0x45, 0x52,
-	0x4d, 0x10, 0x91, 0x04, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x51, 0x4c, 0x5f, 0x50, 0x52, 0x4f, 0x43,
-	0x45, 0x44, 0x55, 0x52, 0x45, 0x5f, 0x54, 0x45, 0x52, 0x4d, 0x10, 0x92, 0x04, 0x12, 0x15, 0x0a,
-	0x10, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x41, 0x54, 0x41, 0x4c, 0x4f, 0x47, 0x5f, 0x54, 0x45, 0x52,
-	0x4d, 0x10, 0x93, 0x04, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x41, 0x54, 0x41,
-	0x4c, 0x4f, 0x47, 0x5f, 0x41, 0x54, 0x5f, 0x53, 0x54, 0x41, 0x52, 0x54, 0x10, 0x94, 0x04, 0x12,
-	0x22, 0x0a, 0x1d, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x43, 0x48, 0x45, 0x4d, 0x41, 0x53, 0x5f, 0x53,
-	0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53,
-	0x10, 0x95, 0x04, 0x12, 0x23, 0x0a, 0x1e, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x41, 0x54, 0x41, 0x4c,
-	0x4f, 0x47, 0x53, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x41, 0x43,
-	0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0x96, 0x04, 0x12, 0x26, 0x0a, 0x21, 0x53, 0x51, 0x4c, 0x5f,
-	0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x50, 0x4f, 0x53, 0x49, 0x54, 0x49,
-	0x4f, 0x4e, 0x45, 0x44, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44, 0x53, 0x10, 0x97, 0x04,
-	0x12, 0x24, 0x0a, 0x1f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x4c, 0x45, 0x43, 0x54, 0x5f, 0x46,
-	0x4f, 0x52, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52,
-	0x54, 0x45, 0x44, 0x10, 0x98, 0x04, 0x12, 0x24, 0x0a, 0x1f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x54,
-	0x4f, 0x52, 0x45, 0x44, 0x5f, 0x50, 0x52, 0x4f, 0x43, 0x45, 0x44, 0x55, 0x52, 0x45, 0x53, 0x5f,
-	0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x10, 0x99, 0x04, 0x12, 0x1d, 0x0a, 0x18,
-	0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x53, 0x55,
-	0x42, 0x51, 0x55, 0x45, 0x52, 0x49, 0x45, 0x53, 0x10, 0x9a, 0x04, 0x12, 0x28, 0x0a, 0x23, 0x53,
-	0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x52, 0x52, 0x45, 0x4c, 0x41, 0x54, 0x45, 0x44, 0x5f, 0x53, 0x55,
-	0x42, 0x51, 0x55, 0x45, 0x52, 0x49, 0x45, 0x53, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54,
-	0x45, 0x44, 0x10, 0x9b, 0x04, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50,
-	0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x55, 0x4e, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0x9c, 0x04,
-	0x12, 0x22, 0x0a, 0x1d, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x42, 0x49, 0x4e, 0x41,
-	0x52, 0x59, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x5f, 0x4c, 0x45, 0x4e, 0x47, 0x54,
-	0x48, 0x10, 0x9d, 0x04, 0x12, 0x20, 0x0a, 0x1b, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f,
-	0x43, 0x48, 0x41, 0x52, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x5f, 0x4c, 0x45, 0x4e,
-	0x47, 0x54, 0x48, 0x10, 0x9e, 0x04, 0x12, 0x1f, 0x0a, 0x1a, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41,
-	0x58, 0x5f, 0x43, 0x4f, 0x4c, 0x55, 0x4d, 0x4e, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x5f, 0x4c, 0x45,
-	0x4e, 0x47, 0x54, 0x48, 0x10, 0x9f, 0x04, 0x12, 0x20, 0x0a, 0x1b, 0x53, 0x51, 0x4c, 0x5f, 0x4d,
-	0x41, 0x58, 0x5f, 0x43, 0x4f, 0x4c, 0x55, 0x4d, 0x4e, 0x53, 0x5f, 0x49, 0x4e, 0x5f, 0x47, 0x52,
-	0x4f, 0x55, 0x50, 0x5f, 0x42, 0x59, 0x10, 0xa0, 0x04, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x51, 0x4c,
-	0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x43, 0x4f, 0x4c, 0x55, 0x4d, 0x4e, 0x53, 0x5f, 0x49, 0x4e, 0x5f,
-	0x49, 0x4e, 0x44, 0x45, 0x58, 0x10, 0xa1, 0x04, 0x12, 0x20, 0x0a, 0x1b, 0x53, 0x51, 0x4c, 0x5f,
-	0x4d, 0x41, 0x58, 0x5f, 0x43, 0x4f, 0x4c, 0x55, 0x4d, 0x4e, 0x53, 0x5f, 0x49, 0x4e, 0x5f, 0x4f,
-	0x52, 0x44, 0x45, 0x52, 0x5f, 0x42, 0x59, 0x10, 0xa2, 0x04, 0x12, 0x1e, 0x0a, 0x19, 0x53, 0x51,
-	0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x43, 0x4f, 0x4c, 0x55, 0x4d, 0x4e, 0x53, 0x5f, 0x49, 0x4e,
-	0x5f, 0x53, 0x45, 0x4c, 0x45, 0x43, 0x54, 0x10, 0xa3, 0x04, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x51,
-	0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x43, 0x4f, 0x4c, 0x55, 0x4d, 0x4e, 0x53, 0x5f, 0x49, 0x4e,
-	0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x10, 0xa4, 0x04, 0x12, 0x18, 0x0a, 0x13, 0x53, 0x51, 0x4c,
-	0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53,
-	0x10, 0xa5, 0x04, 0x12, 0x1f, 0x0a, 0x1a, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x43,
-	0x55, 0x52, 0x53, 0x4f, 0x52, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x5f, 0x4c, 0x45, 0x4e, 0x47, 0x54,
-	0x48, 0x10, 0xa6, 0x04, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f,
-	0x49, 0x4e, 0x44, 0x45, 0x58, 0x5f, 0x4c, 0x45, 0x4e, 0x47, 0x54, 0x48, 0x10, 0xa7, 0x04, 0x12,
-	0x1e, 0x0a, 0x19, 0x53, 0x51, 0x4c, 0x5f, 0x44, 0x42, 0x5f, 0x53, 0x43, 0x48, 0x45, 0x4d, 0x41,
-	0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x5f, 0x4c, 0x45, 0x4e, 0x47, 0x54, 0x48, 0x10, 0xa8, 0x04, 0x12,
-	0x22, 0x0a, 0x1d, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x50, 0x52, 0x4f, 0x43, 0x45,
-	0x44, 0x55, 0x52, 0x45, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x5f, 0x4c, 0x45, 0x4e, 0x47, 0x54, 0x48,
-	0x10, 0xa9, 0x04, 0x12, 0x20, 0x0a, 0x1b, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x43,
-	0x41, 0x54, 0x41, 0x4c, 0x4f, 0x47, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x5f, 0x4c, 0x45, 0x4e, 0x47,
-	0x54, 0x48, 0x10, 0xaa, 0x04, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58,
-	0x5f, 0x52, 0x4f, 0x57, 0x5f, 0x53, 0x49, 0x5a, 0x45, 0x10, 0xab, 0x04, 0x12, 0x24, 0x0a, 0x1f,
-	0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x52, 0x4f, 0x57, 0x5f, 0x53, 0x49, 0x5a, 0x45,
-	0x5f, 0x49, 0x4e, 0x43, 0x4c, 0x55, 0x44, 0x45, 0x53, 0x5f, 0x42, 0x4c, 0x4f, 0x42, 0x53, 0x10,
-	0xac, 0x04, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x53, 0x54,
-	0x41, 0x54, 0x45, 0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x4c, 0x45, 0x4e, 0x47, 0x54, 0x48, 0x10, 0xad,
-	0x04, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x53, 0x54, 0x41,
-	0x54, 0x45, 0x4d, 0x45, 0x4e, 0x54, 0x53, 0x10, 0xae, 0x04, 0x12, 0x1e, 0x0a, 0x19, 0x53, 0x51,
-	0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x4e, 0x41, 0x4d, 0x45,
-	0x5f, 0x4c, 0x45, 0x4e, 0x47, 0x54, 0x48, 0x10, 0xaf, 0x04, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x51,
-	0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x53, 0x5f, 0x49, 0x4e, 0x5f,
-	0x53, 0x45, 0x4c, 0x45, 0x43, 0x54, 0x10, 0xb0, 0x04, 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x51, 0x4c,
-	0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x55, 0x53, 0x45, 0x52, 0x4e, 0x41, 0x4d, 0x45, 0x5f, 0x4c, 0x45,
-	0x4e, 0x47, 0x54, 0x48, 0x10, 0xb1, 0x04, 0x12, 0x26, 0x0a, 0x21, 0x53, 0x51, 0x4c, 0x5f, 0x44,
-	0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49,
-	0x4f, 0x4e, 0x5f, 0x49, 0x53, 0x4f, 0x4c, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0xb2, 0x04, 0x12,
-	0x1f, 0x0a, 0x1a, 0x53, 0x51, 0x4c, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49,
-	0x4f, 0x4e, 0x53, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x10, 0xb3, 0x04,
-	0x12, 0x30, 0x0a, 0x2b, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45,
-	0x44, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x5f, 0x49,
-	0x53, 0x4f, 0x4c, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x53, 0x10,
-	0xb4, 0x04, 0x12, 0x32, 0x0a, 0x2d, 0x53, 0x51, 0x4c, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x44,
-	0x45, 0x46, 0x49, 0x4e, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x43, 0x41, 0x55, 0x53, 0x45, 0x53,
-	0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x43, 0x4f, 0x4d,
-	0x4d, 0x49, 0x54, 0x10, 0xb5, 0x04, 0x12, 0x31, 0x0a, 0x2c, 0x53, 0x51, 0x4c, 0x5f, 0x44, 0x41,
-	0x54, 0x41, 0x5f, 0x44, 0x45, 0x46, 0x49, 0x4e, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x5f, 0x49,
-	0x4e, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x5f, 0x49,
-	0x47, 0x4e, 0x4f, 0x52, 0x45, 0x44, 0x10, 0xb6, 0x04, 0x12, 0x23, 0x0a, 0x1e, 0x53, 0x51, 0x4c,
-	0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c,
-	0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x10, 0xb7, 0x04, 0x12, 0x3b,
-	0x0a, 0x36, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f,
-	0x43, 0x4f, 0x4e, 0x43, 0x55, 0x52, 0x52, 0x45, 0x4e, 0x43, 0x49, 0x45, 0x53, 0x5f, 0x46, 0x4f,
-	0x52, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x55, 0x4e, 0x53,
-	0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0xb8, 0x04, 0x12, 0x3c, 0x0a, 0x37, 0x53,
-	0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x43, 0x4f, 0x4e,
-	0x43, 0x55, 0x52, 0x52, 0x45, 0x4e, 0x43, 0x49, 0x45, 0x53, 0x5f, 0x46, 0x4f, 0x52, 0x5f, 0x52,
-	0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x46, 0x4f, 0x52, 0x57, 0x41, 0x52,
-	0x44, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0xb9, 0x04, 0x12, 0x40, 0x0a, 0x3b, 0x53, 0x51, 0x4c,
-	0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x43, 0x4f, 0x4e, 0x43, 0x55,
-	0x52, 0x52, 0x45, 0x4e, 0x43, 0x49, 0x45, 0x53, 0x5f, 0x46, 0x4f, 0x52, 0x5f, 0x52, 0x45, 0x53,
-	0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x52, 0x4f, 0x4c, 0x4c, 0x5f, 0x53,
-	0x45, 0x4e, 0x53, 0x49, 0x54, 0x49, 0x56, 0x45, 0x10, 0xba, 0x04, 0x12, 0x42, 0x0a, 0x3d, 0x53,
-	0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x43, 0x4f, 0x4e,
-	0x43, 0x55, 0x52, 0x52, 0x45, 0x4e, 0x43, 0x49, 0x45, 0x53, 0x5f, 0x46, 0x4f, 0x52, 0x5f, 0x52,
-	0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x52, 0x4f, 0x4c, 0x4c,
-	0x5f, 0x49, 0x4e, 0x53, 0x45, 0x4e, 0x53, 0x49, 0x54, 0x49, 0x56, 0x45, 0x10, 0xbb, 0x04, 0x12,
-	0x20, 0x0a, 0x1b, 0x53, 0x51, 0x4c, 0x5f, 0x42, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x55, 0x50, 0x44,
-	0x41, 0x54, 0x45, 0x53, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x10, 0xbc,
-	0x04, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x41, 0x56, 0x45, 0x50, 0x4f, 0x49,
-	0x4e, 0x54, 0x53, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x10, 0xbd, 0x04,
-	0x12, 0x23, 0x0a, 0x1e, 0x53, 0x51, 0x4c, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x44, 0x5f, 0x50, 0x41,
-	0x52, 0x41, 0x4d, 0x45, 0x54, 0x45, 0x52, 0x53, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54,
-	0x45, 0x44, 0x10, 0xbe, 0x04, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x51, 0x4c, 0x5f, 0x4c, 0x4f, 0x43,
-	0x41, 0x54, 0x4f, 0x52, 0x53, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x43, 0x4f, 0x50,
-	0x59, 0x10, 0xbf, 0x04, 0x12, 0x35, 0x0a, 0x30, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x54, 0x4f, 0x52,
-	0x45, 0x44, 0x5f, 0x46, 0x55, 0x4e, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x5f, 0x55, 0x53, 0x49,
-	0x4e, 0x47, 0x5f, 0x43, 0x41, 0x4c, 0x4c, 0x5f, 0x53, 0x59, 0x4e, 0x54, 0x41, 0x58, 0x5f, 0x53,
-	0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x10, 0xc0, 0x04, 0x2a, 0x91, 0x01, 0x0a, 0x17,
-	0x53, 0x71, 0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x72, 0x61, 0x6e,
-	0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x1e, 0x53, 0x51, 0x4c, 0x5f, 0x53,
-	0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43,
-	0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x29, 0x0a, 0x25, 0x53,
+	0x54, 0x41, 0x54, 0x45, 0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x4f, 0x55, 0x54,
+	0x10, 0x64, 0x12, 0x29, 0x0a, 0x25, 0x46, 0x4c, 0x49, 0x47, 0x48, 0x54, 0x5f, 0x53, 0x51, 0x4c,
+	0x5f, 0x53, 0x45, 0x52, 0x56, 0x45, 0x52, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54,
+	0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x4f, 0x55, 0x54, 0x10, 0x65, 0x12, 0x14, 0x0a,
+	0x0f, 0x53, 0x51, 0x4c, 0x5f, 0x44, 0x44, 0x4c, 0x5f, 0x43, 0x41, 0x54, 0x41, 0x4c, 0x4f, 0x47,
+	0x10, 0xf4, 0x03, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x51, 0x4c, 0x5f, 0x44, 0x44, 0x4c, 0x5f, 0x53,
+	0x43, 0x48, 0x45, 0x4d, 0x41, 0x10, 0xf5, 0x03, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x51, 0x4c, 0x5f,
+	0x44, 0x44, 0x4c, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x10, 0xf6, 0x03, 0x12, 0x18, 0x0a, 0x13,
+	0x53, 0x51, 0x4c, 0x5f, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x49, 0x46, 0x49, 0x45, 0x52, 0x5f, 0x43,
+	0x41, 0x53, 0x45, 0x10, 0xf7, 0x03, 0x12, 0x1e, 0x0a, 0x19, 0x53, 0x51, 0x4c, 0x5f, 0x49, 0x44,
+	0x45, 0x4e, 0x54, 0x49, 0x46, 0x49, 0x45, 0x52, 0x5f, 0x51, 0x55, 0x4f, 0x54, 0x45, 0x5f, 0x43,
+	0x48, 0x41, 0x52, 0x10, 0xf8, 0x03, 0x12, 0x1f, 0x0a, 0x1a, 0x53, 0x51, 0x4c, 0x5f, 0x51, 0x55,
+	0x4f, 0x54, 0x45, 0x44, 0x5f, 0x49, 0x44, 0x45, 0x4e, 0x54, 0x49, 0x46, 0x49, 0x45, 0x52, 0x5f,
+	0x43, 0x41, 0x53, 0x45, 0x10, 0xf9, 0x03, 0x12, 0x22, 0x0a, 0x1d, 0x53, 0x51, 0x4c, 0x5f, 0x41,
+	0x4c, 0x4c, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x53, 0x5f, 0x41, 0x52, 0x45, 0x5f, 0x53, 0x45,
+	0x4c, 0x45, 0x43, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x10, 0xfa, 0x03, 0x12, 0x16, 0x0a, 0x11, 0x53,
+	0x51, 0x4c, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x5f, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x49, 0x4e, 0x47,
+	0x10, 0xfb, 0x03, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x51, 0x4c, 0x5f, 0x4b, 0x45, 0x59, 0x57, 0x4f,
+	0x52, 0x44, 0x53, 0x10, 0xfc, 0x03, 0x12, 0x1a, 0x0a, 0x15, 0x53, 0x51, 0x4c, 0x5f, 0x4e, 0x55,
+	0x4d, 0x45, 0x52, 0x49, 0x43, 0x5f, 0x46, 0x55, 0x4e, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10,
+	0xfd, 0x03, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47,
+	0x5f, 0x46, 0x55, 0x4e, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0xfe, 0x03, 0x12, 0x19, 0x0a,
+	0x14, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x59, 0x53, 0x54, 0x45, 0x4d, 0x5f, 0x46, 0x55, 0x4e, 0x43,
+	0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0xff, 0x03, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x51, 0x4c, 0x5f,
+	0x44, 0x41, 0x54, 0x45, 0x54, 0x49, 0x4d, 0x45, 0x5f, 0x46, 0x55, 0x4e, 0x43, 0x54, 0x49, 0x4f,
+	0x4e, 0x53, 0x10, 0x80, 0x04, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x41,
+	0x52, 0x43, 0x48, 0x5f, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x5f, 0x45, 0x53, 0x43, 0x41, 0x50,
+	0x45, 0x10, 0x81, 0x04, 0x12, 0x1e, 0x0a, 0x19, 0x53, 0x51, 0x4c, 0x5f, 0x45, 0x58, 0x54, 0x52,
+	0x41, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x41, 0x43, 0x54, 0x45, 0x52,
+	0x53, 0x10, 0x82, 0x04, 0x12, 0x21, 0x0a, 0x1c, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50,
+	0x4f, 0x52, 0x54, 0x53, 0x5f, 0x43, 0x4f, 0x4c, 0x55, 0x4d, 0x4e, 0x5f, 0x41, 0x4c, 0x49, 0x41,
+	0x53, 0x49, 0x4e, 0x47, 0x10, 0x83, 0x04, 0x12, 0x1f, 0x0a, 0x1a, 0x53, 0x51, 0x4c, 0x5f, 0x4e,
+	0x55, 0x4c, 0x4c, 0x5f, 0x50, 0x4c, 0x55, 0x53, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x5f, 0x49, 0x53,
+	0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x10, 0x84, 0x04, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f,
+	0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x53, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54,
+	0x10, 0x85, 0x04, 0x12, 0x29, 0x0a, 0x24, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f,
+	0x52, 0x54, 0x53, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x43, 0x4f, 0x52, 0x52, 0x45, 0x4c,
+	0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x53, 0x10, 0x86, 0x04, 0x12, 0x33,
+	0x0a, 0x2e, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x53, 0x5f, 0x44,
+	0x49, 0x46, 0x46, 0x45, 0x52, 0x45, 0x4e, 0x54, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x43,
+	0x4f, 0x52, 0x52, 0x45, 0x4c, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x53,
+	0x10, 0x87, 0x04, 0x12, 0x29, 0x0a, 0x24, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f,
+	0x52, 0x54, 0x53, 0x5f, 0x45, 0x58, 0x50, 0x52, 0x45, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x53, 0x5f,
+	0x49, 0x4e, 0x5f, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x5f, 0x42, 0x59, 0x10, 0x88, 0x04, 0x12, 0x24,
+	0x0a, 0x1f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x53, 0x5f, 0x4f,
+	0x52, 0x44, 0x45, 0x52, 0x5f, 0x42, 0x59, 0x5f, 0x55, 0x4e, 0x52, 0x45, 0x4c, 0x41, 0x54, 0x45,
+	0x44, 0x10, 0x89, 0x04, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50,
+	0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x47, 0x52, 0x4f, 0x55, 0x50, 0x5f, 0x42, 0x59, 0x10, 0x8a,
+	0x04, 0x12, 0x24, 0x0a, 0x1f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54,
+	0x53, 0x5f, 0x4c, 0x49, 0x4b, 0x45, 0x5f, 0x45, 0x53, 0x43, 0x41, 0x50, 0x45, 0x5f, 0x43, 0x4c,
+	0x41, 0x55, 0x53, 0x45, 0x10, 0x8b, 0x04, 0x12, 0x26, 0x0a, 0x21, 0x53, 0x51, 0x4c, 0x5f, 0x53,
+	0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x53, 0x5f, 0x4e, 0x4f, 0x4e, 0x5f, 0x4e, 0x55, 0x4c, 0x4c,
+	0x41, 0x42, 0x4c, 0x45, 0x5f, 0x43, 0x4f, 0x4c, 0x55, 0x4d, 0x4e, 0x53, 0x10, 0x8c, 0x04, 0x12,
+	0x1a, 0x0a, 0x15, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44,
+	0x5f, 0x47, 0x52, 0x41, 0x4d, 0x4d, 0x41, 0x52, 0x10, 0x8d, 0x04, 0x12, 0x1f, 0x0a, 0x1a, 0x53,
+	0x51, 0x4c, 0x5f, 0x41, 0x4e, 0x53, 0x49, 0x39, 0x32, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52,
+	0x54, 0x45, 0x44, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10, 0x8e, 0x04, 0x12, 0x30, 0x0a, 0x2b,
+	0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x53, 0x5f, 0x49, 0x4e, 0x54,
+	0x45, 0x47, 0x52, 0x49, 0x54, 0x59, 0x5f, 0x45, 0x4e, 0x48, 0x41, 0x4e, 0x43, 0x45, 0x4d, 0x45,
+	0x4e, 0x54, 0x5f, 0x46, 0x41, 0x43, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x10, 0x8f, 0x04, 0x12, 0x22,
+	0x0a, 0x1d, 0x53, 0x51, 0x4c, 0x5f, 0x4f, 0x55, 0x54, 0x45, 0x52, 0x5f, 0x4a, 0x4f, 0x49, 0x4e,
+	0x53, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x5f, 0x4c, 0x45, 0x56, 0x45, 0x4c, 0x10,
+	0x90, 0x04, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x43, 0x48, 0x45, 0x4d, 0x41,
+	0x5f, 0x54, 0x45, 0x52, 0x4d, 0x10, 0x91, 0x04, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x51, 0x4c, 0x5f,
+	0x50, 0x52, 0x4f, 0x43, 0x45, 0x44, 0x55, 0x52, 0x45, 0x5f, 0x54, 0x45, 0x52, 0x4d, 0x10, 0x92,
+	0x04, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x41, 0x54, 0x41, 0x4c, 0x4f, 0x47,
+	0x5f, 0x54, 0x45, 0x52, 0x4d, 0x10, 0x93, 0x04, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f,
+	0x43, 0x41, 0x54, 0x41, 0x4c, 0x4f, 0x47, 0x5f, 0x41, 0x54, 0x5f, 0x53, 0x54, 0x41, 0x52, 0x54,
+	0x10, 0x94, 0x04, 0x12, 0x22, 0x0a, 0x1d, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x43, 0x48, 0x45, 0x4d,
+	0x41, 0x53, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x41, 0x43, 0x54,
+	0x49, 0x4f, 0x4e, 0x53, 0x10, 0x95, 0x04, 0x12, 0x23, 0x0a, 0x1e, 0x53, 0x51, 0x4c, 0x5f, 0x43,
+	0x41, 0x54, 0x41, 0x4c, 0x4f, 0x47, 0x53, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45,
+	0x44, 0x5f, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0x96, 0x04, 0x12, 0x26, 0x0a, 0x21,
+	0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x50, 0x4f,
+	0x53, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x45, 0x44, 0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x41, 0x4e, 0x44,
+	0x53, 0x10, 0x97, 0x04, 0x12, 0x24, 0x0a, 0x1f, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x45, 0x4c, 0x45,
+	0x43, 0x54, 0x5f, 0x46, 0x4f, 0x52, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x5f, 0x53, 0x55,
+	0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x10, 0x98, 0x04, 0x12, 0x24, 0x0a, 0x1f, 0x53, 0x51,
+	0x4c, 0x5f, 0x53, 0x54, 0x4f, 0x52, 0x45, 0x44, 0x5f, 0x50, 0x52, 0x4f, 0x43, 0x45, 0x44, 0x55,
+	0x52, 0x45, 0x53, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x10, 0x99, 0x04,
+	0x12, 0x1d, 0x0a, 0x18, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45,
+	0x44, 0x5f, 0x53, 0x55, 0x42, 0x51, 0x55, 0x45, 0x52, 0x49, 0x45, 0x53, 0x10, 0x9a, 0x04, 0x12,
+	0x28, 0x0a, 0x23, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x52, 0x52, 0x45, 0x4c, 0x41, 0x54, 0x45,
+	0x44, 0x5f, 0x53, 0x55, 0x42, 0x51, 0x55, 0x45, 0x52, 0x49, 0x45, 0x53, 0x5f, 0x53, 0x55, 0x50,
+	0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x10, 0x9b, 0x04, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x51, 0x4c,
+	0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x55, 0x4e, 0x49, 0x4f, 0x4e,
+	0x53, 0x10, 0x9c, 0x04, 0x12, 0x22, 0x0a, 0x1d, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f,
+	0x42, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c, 0x5f, 0x4c,
+	0x45, 0x4e, 0x47, 0x54, 0x48, 0x10, 0x9d, 0x04, 0x12, 0x20, 0x0a, 0x1b, 0x53, 0x51, 0x4c, 0x5f,
+	0x4d, 0x41, 0x58, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x5f, 0x4c, 0x49, 0x54, 0x45, 0x52, 0x41, 0x4c,
+	0x5f, 0x4c, 0x45, 0x4e, 0x47, 0x54, 0x48, 0x10, 0x9e, 0x04, 0x12, 0x1f, 0x0a, 0x1a, 0x53, 0x51,
+	0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x43, 0x4f, 0x4c, 0x55, 0x4d, 0x4e, 0x5f, 0x4e, 0x41, 0x4d,
+	0x45, 0x5f, 0x4c, 0x45, 0x4e, 0x47, 0x54, 0x48, 0x10, 0x9f, 0x04, 0x12, 0x20, 0x0a, 0x1b, 0x53,
+	0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x43, 0x4f, 0x4c, 0x55, 0x4d, 0x4e, 0x53, 0x5f, 0x49,
+	0x4e, 0x5f, 0x47, 0x52, 0x4f, 0x55, 0x50, 0x5f, 0x42, 0x59, 0x10, 0xa0, 0x04, 0x12, 0x1d, 0x0a,
+	0x18, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x43, 0x4f, 0x4c, 0x55, 0x4d, 0x4e, 0x53,
+	0x5f, 0x49, 0x4e, 0x5f, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x10, 0xa1, 0x04, 0x12, 0x20, 0x0a, 0x1b,
+	0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x43, 0x4f, 0x4c, 0x55, 0x4d, 0x4e, 0x53, 0x5f,
+	0x49, 0x4e, 0x5f, 0x4f, 0x52, 0x44, 0x45, 0x52, 0x5f, 0x42, 0x59, 0x10, 0xa2, 0x04, 0x12, 0x1e,
+	0x0a, 0x19, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x43, 0x4f, 0x4c, 0x55, 0x4d, 0x4e,
+	0x53, 0x5f, 0x49, 0x4e, 0x5f, 0x53, 0x45, 0x4c, 0x45, 0x43, 0x54, 0x10, 0xa3, 0x04, 0x12, 0x1d,
+	0x0a, 0x18, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x43, 0x4f, 0x4c, 0x55, 0x4d, 0x4e,
+	0x53, 0x5f, 0x49, 0x4e, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x10, 0xa4, 0x04, 0x12, 0x18, 0x0a,
+	0x13, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x43, 0x4f, 0x4e, 0x4e, 0x45, 0x43, 0x54,
+	0x49, 0x4f, 0x4e, 0x53, 0x10, 0xa5, 0x04, 0x12, 0x1f, 0x0a, 0x1a, 0x53, 0x51, 0x4c, 0x5f, 0x4d,
+	0x41, 0x58, 0x5f, 0x43, 0x55, 0x52, 0x53, 0x4f, 0x52, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x5f, 0x4c,
+	0x45, 0x4e, 0x47, 0x54, 0x48, 0x10, 0xa6, 0x04, 0x12, 0x19, 0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f,
+	0x4d, 0x41, 0x58, 0x5f, 0x49, 0x4e, 0x44, 0x45, 0x58, 0x5f, 0x4c, 0x45, 0x4e, 0x47, 0x54, 0x48,
+	0x10, 0xa7, 0x04, 0x12, 0x1e, 0x0a, 0x19, 0x53, 0x51, 0x4c, 0x5f, 0x44, 0x42, 0x5f, 0x53, 0x43,
+	0x48, 0x45, 0x4d, 0x41, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x5f, 0x4c, 0x45, 0x4e, 0x47, 0x54, 0x48,
+	0x10, 0xa8, 0x04, 0x12, 0x22, 0x0a, 0x1d, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x50,
+	0x52, 0x4f, 0x43, 0x45, 0x44, 0x55, 0x52, 0x45, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x5f, 0x4c, 0x45,
+	0x4e, 0x47, 0x54, 0x48, 0x10, 0xa9, 0x04, 0x12, 0x20, 0x0a, 0x1b, 0x53, 0x51, 0x4c, 0x5f, 0x4d,
+	0x41, 0x58, 0x5f, 0x43, 0x41, 0x54, 0x41, 0x4c, 0x4f, 0x47, 0x5f, 0x4e, 0x41, 0x4d, 0x45, 0x5f,
+	0x4c, 0x45, 0x4e, 0x47, 0x54, 0x48, 0x10, 0xaa, 0x04, 0x12, 0x15, 0x0a, 0x10, 0x53, 0x51, 0x4c,
+	0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x52, 0x4f, 0x57, 0x5f, 0x53, 0x49, 0x5a, 0x45, 0x10, 0xab, 0x04,
+	0x12, 0x24, 0x0a, 0x1f, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x52, 0x4f, 0x57, 0x5f,
+	0x53, 0x49, 0x5a, 0x45, 0x5f, 0x49, 0x4e, 0x43, 0x4c, 0x55, 0x44, 0x45, 0x53, 0x5f, 0x42, 0x4c,
+	0x4f, 0x42, 0x53, 0x10, 0xac, 0x04, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41,
+	0x58, 0x5f, 0x53, 0x54, 0x41, 0x54, 0x45, 0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x4c, 0x45, 0x4e, 0x47,
+	0x54, 0x48, 0x10, 0xad, 0x04, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58,
+	0x5f, 0x53, 0x54, 0x41, 0x54, 0x45, 0x4d, 0x45, 0x4e, 0x54, 0x53, 0x10, 0xae, 0x04, 0x12, 0x1e,
+	0x0a, 0x19, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f,
+	0x4e, 0x41, 0x4d, 0x45, 0x5f, 0x4c, 0x45, 0x4e, 0x47, 0x54, 0x48, 0x10, 0xaf, 0x04, 0x12, 0x1d,
+	0x0a, 0x18, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x53,
+	0x5f, 0x49, 0x4e, 0x5f, 0x53, 0x45, 0x4c, 0x45, 0x43, 0x54, 0x10, 0xb0, 0x04, 0x12, 0x1c, 0x0a,
+	0x17, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x41, 0x58, 0x5f, 0x55, 0x53, 0x45, 0x52, 0x4e, 0x41, 0x4d,
+	0x45, 0x5f, 0x4c, 0x45, 0x4e, 0x47, 0x54, 0x48, 0x10, 0xb1, 0x04, 0x12, 0x26, 0x0a, 0x21, 0x53,
+	0x51, 0x4c, 0x5f, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53,
+	0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x49, 0x53, 0x4f, 0x4c, 0x41, 0x54, 0x49, 0x4f, 0x4e,
+	0x10, 0xb2, 0x04, 0x12, 0x1f, 0x0a, 0x1a, 0x53, 0x51, 0x4c, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53,
+	0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45,
+	0x44, 0x10, 0xb3, 0x04, 0x12, 0x30, 0x0a, 0x2b, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50,
+	0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f,
+	0x4e, 0x53, 0x5f, 0x49, 0x53, 0x4f, 0x4c, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4c, 0x45, 0x56,
+	0x45, 0x4c, 0x53, 0x10, 0xb4, 0x04, 0x12, 0x32, 0x0a, 0x2d, 0x53, 0x51, 0x4c, 0x5f, 0x44, 0x41,
+	0x54, 0x41, 0x5f, 0x44, 0x45, 0x46, 0x49, 0x4e, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x43, 0x41,
+	0x55, 0x53, 0x45, 0x53, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e,
+	0x5f, 0x43, 0x4f, 0x4d, 0x4d, 0x49, 0x54, 0x10, 0xb5, 0x04, 0x12, 0x31, 0x0a, 0x2c, 0x53, 0x51,
+	0x4c, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x44, 0x45, 0x46, 0x49, 0x4e, 0x49, 0x54, 0x49, 0x4f,
+	0x4e, 0x53, 0x5f, 0x49, 0x4e, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f,
+	0x4e, 0x53, 0x5f, 0x49, 0x47, 0x4e, 0x4f, 0x52, 0x45, 0x44, 0x10, 0xb6, 0x04, 0x12, 0x23, 0x0a,
+	0x1e, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x52,
+	0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x53, 0x10,
+	0xb7, 0x04, 0x12, 0x3b, 0x0a, 0x36, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52,
+	0x54, 0x45, 0x44, 0x5f, 0x43, 0x4f, 0x4e, 0x43, 0x55, 0x52, 0x52, 0x45, 0x4e, 0x43, 0x49, 0x45,
+	0x53, 0x5f, 0x46, 0x4f, 0x52, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54,
+	0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0xb8, 0x04, 0x12,
+	0x3c, 0x0a, 0x37, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44,
+	0x5f, 0x43, 0x4f, 0x4e, 0x43, 0x55, 0x52, 0x52, 0x45, 0x4e, 0x43, 0x49, 0x45, 0x53, 0x5f, 0x46,
+	0x4f, 0x52, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x46, 0x4f,
+	0x52, 0x57, 0x41, 0x52, 0x44, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0xb9, 0x04, 0x12, 0x40, 0x0a,
+	0x3b, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x43,
+	0x4f, 0x4e, 0x43, 0x55, 0x52, 0x52, 0x45, 0x4e, 0x43, 0x49, 0x45, 0x53, 0x5f, 0x46, 0x4f, 0x52,
+	0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x52, 0x4f,
+	0x4c, 0x4c, 0x5f, 0x53, 0x45, 0x4e, 0x53, 0x49, 0x54, 0x49, 0x56, 0x45, 0x10, 0xba, 0x04, 0x12,
+	0x42, 0x0a, 0x3d, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44,
+	0x5f, 0x43, 0x4f, 0x4e, 0x43, 0x55, 0x52, 0x52, 0x45, 0x4e, 0x43, 0x49, 0x45, 0x53, 0x5f, 0x46,
+	0x4f, 0x52, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x53, 0x43,
+	0x52, 0x4f, 0x4c, 0x4c, 0x5f, 0x49, 0x4e, 0x53, 0x45, 0x4e, 0x53, 0x49, 0x54, 0x49, 0x56, 0x45,
+	0x10, 0xbb, 0x04, 0x12, 0x20, 0x0a, 0x1b, 0x53, 0x51, 0x4c, 0x5f, 0x42, 0x41, 0x54, 0x43, 0x48,
+	0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x53, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54,
+	0x45, 0x44, 0x10, 0xbc, 0x04, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x41, 0x56,
+	0x45, 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x53, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45,
+	0x44, 0x10, 0xbd, 0x04, 0x12, 0x23, 0x0a, 0x1e, 0x53, 0x51, 0x4c, 0x5f, 0x4e, 0x41, 0x4d, 0x45,
+	0x44, 0x5f, 0x50, 0x41, 0x52, 0x41, 0x4d, 0x45, 0x54, 0x45, 0x52, 0x53, 0x5f, 0x53, 0x55, 0x50,
+	0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x10, 0xbe, 0x04, 0x12, 0x1d, 0x0a, 0x18, 0x53, 0x51, 0x4c,
+	0x5f, 0x4c, 0x4f, 0x43, 0x41, 0x54, 0x4f, 0x52, 0x53, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45,
+	0x5f, 0x43, 0x4f, 0x50, 0x59, 0x10, 0xbf, 0x04, 0x12, 0x35, 0x0a, 0x30, 0x53, 0x51, 0x4c, 0x5f,
+	0x53, 0x54, 0x4f, 0x52, 0x45, 0x44, 0x5f, 0x46, 0x55, 0x4e, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53,
+	0x5f, 0x55, 0x53, 0x49, 0x4e, 0x47, 0x5f, 0x43, 0x41, 0x4c, 0x4c, 0x5f, 0x53, 0x59, 0x4e, 0x54,
+	0x41, 0x58, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x10, 0xc0, 0x04, 0x2a,
+	0x91, 0x01, 0x0a, 0x17, 0x53, 0x71, 0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64,
+	0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x1e, 0x53,
 	0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x54, 0x52, 0x41,
-	0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43,
-	0x54, 0x49, 0x4f, 0x4e, 0x10, 0x01, 0x12, 0x27, 0x0a, 0x23, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55,
-	0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54,
-	0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x41, 0x56, 0x45, 0x50, 0x4f, 0x49, 0x4e, 0x54, 0x10, 0x02, 0x2a,
-	0xb2, 0x01, 0x0a, 0x1b, 0x53, 0x71, 0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64,
-	0x43, 0x61, 0x73, 0x65, 0x53, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12,
-	0x20, 0x0a, 0x1c, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f, 0x53, 0x45, 0x4e, 0x53,
-	0x49, 0x54, 0x49, 0x56, 0x49, 0x54, 0x59, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10,
-	0x00, 0x12, 0x29, 0x0a, 0x25, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f, 0x53, 0x45,
-	0x4e, 0x53, 0x49, 0x54, 0x49, 0x56, 0x49, 0x54, 0x59, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f, 0x49,
-	0x4e, 0x53, 0x45, 0x4e, 0x53, 0x49, 0x54, 0x49, 0x56, 0x45, 0x10, 0x01, 0x12, 0x22, 0x0a, 0x1e,
-	0x53, 0x51, 0x4c, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f, 0x53, 0x45, 0x4e, 0x53, 0x49, 0x54, 0x49,
-	0x56, 0x49, 0x54, 0x59, 0x5f, 0x55, 0x50, 0x50, 0x45, 0x52, 0x43, 0x41, 0x53, 0x45, 0x10, 0x02,
+	0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12,
+	0x29, 0x0a, 0x25, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44,
+	0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x52, 0x41,
+	0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x01, 0x12, 0x27, 0x0a, 0x23, 0x53, 0x51,
+	0x4c, 0x5f, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x54, 0x52, 0x41, 0x4e,
+	0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x41, 0x56, 0x45, 0x50, 0x4f, 0x49, 0x4e,
+	0x54, 0x10, 0x02, 0x2a, 0xb2, 0x01, 0x0a, 0x1b, 0x53, 0x71, 0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f,
+	0x72, 0x74, 0x65, 0x64, 0x43, 0x61, 0x73, 0x65, 0x53, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76,
+	0x69, 0x74, 0x79, 0x12, 0x20, 0x0a, 0x1c, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f,
+	0x53, 0x45, 0x4e, 0x53, 0x49, 0x54, 0x49, 0x56, 0x49, 0x54, 0x59, 0x5f, 0x55, 0x4e, 0x4b, 0x4e,
+	0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x29, 0x0a, 0x25, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x41, 0x53,
+	0x45, 0x5f, 0x53, 0x45, 0x4e, 0x53, 0x49, 0x54, 0x49, 0x56, 0x49, 0x54, 0x59, 0x5f, 0x43, 0x41,
+	0x53, 0x45, 0x5f, 0x49, 0x4e, 0x53, 0x45, 0x4e, 0x53, 0x49, 0x54, 0x49, 0x56, 0x45, 0x10, 0x01,
 	0x12, 0x22, 0x0a, 0x1e, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x41, 0x53, 0x45, 0x5f, 0x53, 0x45, 0x4e,
-	0x53, 0x49, 0x54, 0x49, 0x56, 0x49, 0x54, 0x59, 0x5f, 0x4c, 0x4f, 0x57, 0x45, 0x52, 0x43, 0x41,
-	0x53, 0x45, 0x10, 0x03, 0x2a, 0x82, 0x01, 0x0a, 0x0f, 0x53, 0x71, 0x6c, 0x4e, 0x75, 0x6c, 0x6c,
-	0x4f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x51, 0x4c, 0x5f,
-	0x4e, 0x55, 0x4c, 0x4c, 0x53, 0x5f, 0x53, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x48, 0x49, 0x47,
-	0x48, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x53,
-	0x5f, 0x53, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x4c, 0x4f, 0x57, 0x10, 0x01, 0x12, 0x1d, 0x0a,
-	0x19, 0x53, 0x51, 0x4c, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x53, 0x5f, 0x53, 0x4f, 0x52, 0x54, 0x45,
-	0x44, 0x5f, 0x41, 0x54, 0x5f, 0x53, 0x54, 0x41, 0x52, 0x54, 0x10, 0x02, 0x12, 0x1b, 0x0a, 0x17,
+	0x53, 0x49, 0x54, 0x49, 0x56, 0x49, 0x54, 0x59, 0x5f, 0x55, 0x50, 0x50, 0x45, 0x52, 0x43, 0x41,
+	0x53, 0x45, 0x10, 0x02, 0x12, 0x22, 0x0a, 0x1e, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x41, 0x53, 0x45,
+	0x5f, 0x53, 0x45, 0x4e, 0x53, 0x49, 0x54, 0x49, 0x56, 0x49, 0x54, 0x59, 0x5f, 0x4c, 0x4f, 0x57,
+	0x45, 0x52, 0x43, 0x41, 0x53, 0x45, 0x10, 0x03, 0x2a, 0x82, 0x01, 0x0a, 0x0f, 0x53, 0x71, 0x6c,
+	0x4e, 0x75, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x19, 0x0a, 0x15,
 	0x53, 0x51, 0x4c, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x53, 0x5f, 0x53, 0x4f, 0x52, 0x54, 0x45, 0x44,
-	0x5f, 0x41, 0x54, 0x5f, 0x45, 0x4e, 0x44, 0x10, 0x03, 0x2a, 0x5e, 0x0a, 0x13, 0x53, 0x75, 0x70,
-	0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x71, 0x6c, 0x47, 0x72, 0x61, 0x6d, 0x6d, 0x61, 0x72,
-	0x12, 0x17, 0x0a, 0x13, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x49, 0x4e, 0x49, 0x4d, 0x55, 0x4d, 0x5f,
-	0x47, 0x52, 0x41, 0x4d, 0x4d, 0x41, 0x52, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x53, 0x51, 0x4c,
-	0x5f, 0x43, 0x4f, 0x52, 0x45, 0x5f, 0x47, 0x52, 0x41, 0x4d, 0x4d, 0x41, 0x52, 0x10, 0x01, 0x12,
-	0x18, 0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f, 0x45, 0x58, 0x54, 0x45, 0x4e, 0x44, 0x45, 0x44, 0x5f,
-	0x47, 0x52, 0x41, 0x4d, 0x4d, 0x41, 0x52, 0x10, 0x02, 0x2a, 0x68, 0x0a, 0x1e, 0x53, 0x75, 0x70,
-	0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x41, 0x6e, 0x73, 0x69, 0x39, 0x32, 0x53, 0x71, 0x6c, 0x47,
-	0x72, 0x61, 0x6d, 0x6d, 0x61, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x14, 0x0a, 0x10, 0x41,
-	0x4e, 0x53, 0x49, 0x39, 0x32, 0x5f, 0x45, 0x4e, 0x54, 0x52, 0x59, 0x5f, 0x53, 0x51, 0x4c, 0x10,
-	0x00, 0x12, 0x1b, 0x0a, 0x17, 0x41, 0x4e, 0x53, 0x49, 0x39, 0x32, 0x5f, 0x49, 0x4e, 0x54, 0x45,
-	0x52, 0x4d, 0x45, 0x44, 0x49, 0x41, 0x54, 0x45, 0x5f, 0x53, 0x51, 0x4c, 0x10, 0x01, 0x12, 0x13,
-	0x0a, 0x0f, 0x41, 0x4e, 0x53, 0x49, 0x39, 0x32, 0x5f, 0x46, 0x55, 0x4c, 0x4c, 0x5f, 0x53, 0x51,
-	0x4c, 0x10, 0x02, 0x2a, 0x6d, 0x0a, 0x19, 0x53, 0x71, 0x6c, 0x4f, 0x75, 0x74, 0x65, 0x72, 0x4a,
-	0x6f, 0x69, 0x6e, 0x73, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x65, 0x76, 0x65, 0x6c,
-	0x12, 0x19, 0x0a, 0x15, 0x53, 0x51, 0x4c, 0x5f, 0x4a, 0x4f, 0x49, 0x4e, 0x53, 0x5f, 0x55, 0x4e,
-	0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17, 0x53,
-	0x51, 0x4c, 0x5f, 0x4c, 0x49, 0x4d, 0x49, 0x54, 0x45, 0x44, 0x5f, 0x4f, 0x55, 0x54, 0x45, 0x52,
-	0x5f, 0x4a, 0x4f, 0x49, 0x4e, 0x53, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f,
-	0x46, 0x55, 0x4c, 0x4c, 0x5f, 0x4f, 0x55, 0x54, 0x45, 0x52, 0x5f, 0x4a, 0x4f, 0x49, 0x4e, 0x53,
-	0x10, 0x02, 0x2a, 0x51, 0x0a, 0x13, 0x53, 0x71, 0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74,
-	0x65, 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x12, 0x1a, 0x0a, 0x16, 0x53, 0x51, 0x4c,
-	0x5f, 0x47, 0x52, 0x4f, 0x55, 0x50, 0x5f, 0x42, 0x59, 0x5f, 0x55, 0x4e, 0x52, 0x45, 0x4c, 0x41,
-	0x54, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1e, 0x0a, 0x1a, 0x53, 0x51, 0x4c, 0x5f, 0x47, 0x52, 0x4f,
-	0x55, 0x50, 0x5f, 0x42, 0x59, 0x5f, 0x42, 0x45, 0x59, 0x4f, 0x4e, 0x44, 0x5f, 0x53, 0x45, 0x4c,
-	0x45, 0x43, 0x54, 0x10, 0x01, 0x2a, 0x90, 0x01, 0x0a, 0x1a, 0x53, 0x71, 0x6c, 0x53, 0x75, 0x70,
-	0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x41, 0x63, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x22, 0x0a, 0x1e, 0x53, 0x51, 0x4c, 0x5f, 0x45, 0x4c, 0x45, 0x4d,
-	0x45, 0x4e, 0x54, 0x5f, 0x49, 0x4e, 0x5f, 0x50, 0x52, 0x4f, 0x43, 0x45, 0x44, 0x55, 0x52, 0x45,
-	0x5f, 0x43, 0x41, 0x4c, 0x4c, 0x53, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x20, 0x53, 0x51, 0x4c, 0x5f,
-	0x45, 0x4c, 0x45, 0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x49, 0x4e, 0x5f, 0x49, 0x4e, 0x44, 0x45, 0x58,
-	0x5f, 0x44, 0x45, 0x46, 0x49, 0x4e, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0x01, 0x12, 0x28,
-	0x0a, 0x24, 0x53, 0x51, 0x4c, 0x5f, 0x45, 0x4c, 0x45, 0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x49, 0x4e,
-	0x5f, 0x50, 0x52, 0x49, 0x56, 0x49, 0x4c, 0x45, 0x47, 0x45, 0x5f, 0x44, 0x45, 0x46, 0x49, 0x4e,
-	0x49, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0x02, 0x2a, 0x56, 0x0a, 0x1e, 0x53, 0x71, 0x6c, 0x53,
-	0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-	0x65, 0x64, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x51,
-	0x4c, 0x5f, 0x50, 0x4f, 0x53, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x45, 0x44, 0x5f, 0x44, 0x45, 0x4c,
-	0x45, 0x54, 0x45, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x51, 0x4c, 0x5f, 0x50, 0x4f, 0x53,
-	0x49, 0x54, 0x49, 0x4f, 0x4e, 0x45, 0x44, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x45, 0x10, 0x01,
-	0x2a, 0x97, 0x01, 0x0a, 0x16, 0x53, 0x71, 0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65,
-	0x64, 0x53, 0x75, 0x62, 0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12, 0x21, 0x0a, 0x1d, 0x53,
+	0x5f, 0x48, 0x49, 0x47, 0x48, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f, 0x4e,
+	0x55, 0x4c, 0x4c, 0x53, 0x5f, 0x53, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x4c, 0x4f, 0x57, 0x10,
+	0x01, 0x12, 0x1d, 0x0a, 0x19, 0x53, 0x51, 0x4c, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x53, 0x5f, 0x53,
+	0x4f, 0x52, 0x54, 0x45, 0x44, 0x5f, 0x41, 0x54, 0x5f, 0x53, 0x54, 0x41, 0x52, 0x54, 0x10, 0x02,
+	0x12, 0x1b, 0x0a, 0x17, 0x53, 0x51, 0x4c, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x53, 0x5f, 0x53, 0x4f,
+	0x52, 0x54, 0x45, 0x44, 0x5f, 0x41, 0x54, 0x5f, 0x45, 0x4e, 0x44, 0x10, 0x03, 0x2a, 0x5e, 0x0a,
+	0x13, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x71, 0x6c, 0x47, 0x72, 0x61,
+	0x6d, 0x6d, 0x61, 0x72, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x51, 0x4c, 0x5f, 0x4d, 0x49, 0x4e, 0x49,
+	0x4d, 0x55, 0x4d, 0x5f, 0x47, 0x52, 0x41, 0x4d, 0x4d, 0x41, 0x52, 0x10, 0x00, 0x12, 0x14, 0x0a,
+	0x10, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x52, 0x45, 0x5f, 0x47, 0x52, 0x41, 0x4d, 0x4d, 0x41,
+	0x52, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f, 0x45, 0x58, 0x54, 0x45, 0x4e,
+	0x44, 0x45, 0x44, 0x5f, 0x47, 0x52, 0x41, 0x4d, 0x4d, 0x41, 0x52, 0x10, 0x02, 0x2a, 0x68, 0x0a,
+	0x1e, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x41, 0x6e, 0x73, 0x69, 0x39, 0x32,
+	0x53, 0x71, 0x6c, 0x47, 0x72, 0x61, 0x6d, 0x6d, 0x61, 0x72, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12,
+	0x14, 0x0a, 0x10, 0x41, 0x4e, 0x53, 0x49, 0x39, 0x32, 0x5f, 0x45, 0x4e, 0x54, 0x52, 0x59, 0x5f,
+	0x53, 0x51, 0x4c, 0x10, 0x00, 0x12, 0x1b, 0x0a, 0x17, 0x41, 0x4e, 0x53, 0x49, 0x39, 0x32, 0x5f,
+	0x49, 0x4e, 0x54, 0x45, 0x52, 0x4d, 0x45, 0x44, 0x49, 0x41, 0x54, 0x45, 0x5f, 0x53, 0x51, 0x4c,
+	0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x41, 0x4e, 0x53, 0x49, 0x39, 0x32, 0x5f, 0x46, 0x55, 0x4c,
+	0x4c, 0x5f, 0x53, 0x51, 0x4c, 0x10, 0x02, 0x2a, 0x6d, 0x0a, 0x19, 0x53, 0x71, 0x6c, 0x4f, 0x75,
+	0x74, 0x65, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x73, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x4c,
+	0x65, 0x76, 0x65, 0x6c, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x51, 0x4c, 0x5f, 0x4a, 0x4f, 0x49, 0x4e,
+	0x53, 0x5f, 0x55, 0x4e, 0x53, 0x55, 0x50, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x10, 0x00, 0x12,
+	0x1b, 0x0a, 0x17, 0x53, 0x51, 0x4c, 0x5f, 0x4c, 0x49, 0x4d, 0x49, 0x54, 0x45, 0x44, 0x5f, 0x4f,
+	0x55, 0x54, 0x45, 0x52, 0x5f, 0x4a, 0x4f, 0x49, 0x4e, 0x53, 0x10, 0x01, 0x12, 0x18, 0x0a, 0x14,
+	0x53, 0x51, 0x4c, 0x5f, 0x46, 0x55, 0x4c, 0x4c, 0x5f, 0x4f, 0x55, 0x54, 0x45, 0x52, 0x5f, 0x4a,
+	0x4f, 0x49, 0x4e, 0x53, 0x10, 0x02, 0x2a, 0x51, 0x0a, 0x13, 0x53, 0x71, 0x6c, 0x53, 0x75, 0x70,
+	0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x12, 0x1a, 0x0a,
+	0x16, 0x53, 0x51, 0x4c, 0x5f, 0x47, 0x52, 0x4f, 0x55, 0x50, 0x5f, 0x42, 0x59, 0x5f, 0x55, 0x4e,
+	0x52, 0x45, 0x4c, 0x41, 0x54, 0x45, 0x44, 0x10, 0x00, 0x12, 0x1e, 0x0a, 0x1a, 0x53, 0x51, 0x4c,
+	0x5f, 0x47, 0x52, 0x4f, 0x55, 0x50, 0x5f, 0x42, 0x59, 0x5f, 0x42, 0x45, 0x59, 0x4f, 0x4e, 0x44,
+	0x5f, 0x53, 0x45, 0x4c, 0x45, 0x43, 0x54, 0x10, 0x01, 0x2a, 0x90, 0x01, 0x0a, 0x1a, 0x53, 0x71,
+	0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e,
+	0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x22, 0x0a, 0x1e, 0x53, 0x51, 0x4c, 0x5f,
+	0x45, 0x4c, 0x45, 0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x49, 0x4e, 0x5f, 0x50, 0x52, 0x4f, 0x43, 0x45,
+	0x44, 0x55, 0x52, 0x45, 0x5f, 0x43, 0x41, 0x4c, 0x4c, 0x53, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x20,
+	0x53, 0x51, 0x4c, 0x5f, 0x45, 0x4c, 0x45, 0x4d, 0x45, 0x4e, 0x54, 0x5f, 0x49, 0x4e, 0x5f, 0x49,
+	0x4e, 0x44, 0x45, 0x58, 0x5f, 0x44, 0x45, 0x46, 0x49, 0x4e, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x53,
+	0x10, 0x01, 0x12, 0x28, 0x0a, 0x24, 0x53, 0x51, 0x4c, 0x5f, 0x45, 0x4c, 0x45, 0x4d, 0x45, 0x4e,
+	0x54, 0x5f, 0x49, 0x4e, 0x5f, 0x50, 0x52, 0x49, 0x56, 0x49, 0x4c, 0x45, 0x47, 0x45, 0x5f, 0x44,
+	0x45, 0x46, 0x49, 0x4e, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0x02, 0x2a, 0x56, 0x0a, 0x1e,
+	0x53, 0x71, 0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x50, 0x6f, 0x73, 0x69,
+	0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x73, 0x12, 0x19,
+	0x0a, 0x15, 0x53, 0x51, 0x4c, 0x5f, 0x50, 0x4f, 0x53, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x45, 0x44,
+	0x5f, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x00, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x51, 0x4c,
+	0x5f, 0x50, 0x4f, 0x53, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x45, 0x44, 0x5f, 0x55, 0x50, 0x44, 0x41,
+	0x54, 0x45, 0x10, 0x01, 0x2a, 0x97, 0x01, 0x0a, 0x16, 0x53, 0x71, 0x6c, 0x53, 0x75, 0x70, 0x70,
+	0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x75, 0x62, 0x71, 0x75, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12,
+	0x21, 0x0a, 0x1d, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x42, 0x51, 0x55, 0x45, 0x52, 0x49, 0x45,
+	0x53, 0x5f, 0x49, 0x4e, 0x5f, 0x43, 0x4f, 0x4d, 0x50, 0x41, 0x52, 0x49, 0x53, 0x4f, 0x4e, 0x53,
+	0x10, 0x00, 0x12, 0x1c, 0x0a, 0x18, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x42, 0x51, 0x55, 0x45,
+	0x52, 0x49, 0x45, 0x53, 0x5f, 0x49, 0x4e, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x10, 0x01,
+	0x12, 0x19, 0x0a, 0x15, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x42, 0x51, 0x55, 0x45, 0x52, 0x49,
+	0x45, 0x53, 0x5f, 0x49, 0x4e, 0x5f, 0x49, 0x4e, 0x53, 0x10, 0x02, 0x12, 0x21, 0x0a, 0x1d, 0x53,
 	0x51, 0x4c, 0x5f, 0x53, 0x55, 0x42, 0x51, 0x55, 0x45, 0x52, 0x49, 0x45, 0x53, 0x5f, 0x49, 0x4e,
-	0x5f, 0x43, 0x4f, 0x4d, 0x50, 0x41, 0x52, 0x49, 0x53, 0x4f, 0x4e, 0x53, 0x10, 0x00, 0x12, 0x1c,
-	0x0a, 0x18, 0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x42, 0x51, 0x55, 0x45, 0x52, 0x49, 0x45, 0x53,
-	0x5f, 0x49, 0x4e, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15,
-	0x53, 0x51, 0x4c, 0x5f, 0x53, 0x55, 0x42, 0x51, 0x55, 0x45, 0x52, 0x49, 0x45, 0x53, 0x5f, 0x49,
-	0x4e, 0x5f, 0x49, 0x4e, 0x53, 0x10, 0x02, 0x12, 0x21, 0x0a, 0x1d, 0x53, 0x51, 0x4c, 0x5f, 0x53,
-	0x55, 0x42, 0x51, 0x55, 0x45, 0x52, 0x49, 0x45, 0x53, 0x5f, 0x49, 0x4e, 0x5f, 0x51, 0x55, 0x41,
-	0x4e, 0x54, 0x49, 0x46, 0x49, 0x45, 0x44, 0x53, 0x10, 0x03, 0x2a, 0x36, 0x0a, 0x12, 0x53, 0x71,
-	0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x55, 0x6e, 0x69, 0x6f, 0x6e, 0x73,
-	0x12, 0x0d, 0x0a, 0x09, 0x53, 0x51, 0x4c, 0x5f, 0x55, 0x4e, 0x49, 0x4f, 0x4e, 0x10, 0x00, 0x12,
-	0x11, 0x0a, 0x0d, 0x53, 0x51, 0x4c, 0x5f, 0x55, 0x4e, 0x49, 0x4f, 0x4e, 0x5f, 0x41, 0x4c, 0x4c,
-	0x10, 0x01, 0x2a, 0xc9, 0x01, 0x0a, 0x1c, 0x53, 0x71, 0x6c, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61,
-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x73, 0x6f, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4c, 0x65,
-	0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53,
-	0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x24, 0x0a,
-	0x20, 0x53, 0x51, 0x4c, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e,
-	0x5f, 0x52, 0x45, 0x41, 0x44, 0x5f, 0x55, 0x4e, 0x43, 0x4f, 0x4d, 0x4d, 0x49, 0x54, 0x54, 0x45,
-	0x44, 0x10, 0x01, 0x12, 0x22, 0x0a, 0x1e, 0x53, 0x51, 0x4c, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53,
-	0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52, 0x45, 0x41, 0x44, 0x5f, 0x43, 0x4f, 0x4d, 0x4d,
-	0x49, 0x54, 0x54, 0x45, 0x44, 0x10, 0x02, 0x12, 0x23, 0x0a, 0x1f, 0x53, 0x51, 0x4c, 0x5f, 0x54,
-	0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52, 0x45, 0x50, 0x45, 0x41,
-	0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x52, 0x45, 0x41, 0x44, 0x10, 0x03, 0x12, 0x20, 0x0a, 0x1c,
-	0x53, 0x51, 0x4c, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f,
-	0x53, 0x45, 0x52, 0x49, 0x41, 0x4c, 0x49, 0x5a, 0x41, 0x42, 0x4c, 0x45, 0x10, 0x04, 0x2a, 0x89,
-	0x01, 0x0a, 0x18, 0x53, 0x71, 0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54,
-	0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x1b, 0x53,
-	0x51, 0x4c, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x55,
-	0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x24, 0x0a, 0x20,
-	0x53, 0x51, 0x4c, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x44, 0x45, 0x46, 0x49, 0x4e, 0x49, 0x54,
-	0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53,
-	0x10, 0x01, 0x12, 0x26, 0x0a, 0x22, 0x53, 0x51, 0x4c, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x4d,
-	0x41, 0x4e, 0x49, 0x50, 0x55, 0x4c, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x52, 0x41, 0x4e,
-	0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0x02, 0x2a, 0xbc, 0x01, 0x0a, 0x19, 0x53,
-	0x71, 0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x52, 0x65, 0x73, 0x75, 0x6c,
-	0x74, 0x53, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x1f, 0x53, 0x51, 0x4c, 0x5f,
-	0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f,
-	0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x24, 0x0a,
-	0x20, 0x53, 0x51, 0x4c, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f,
-	0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x4f, 0x52, 0x57, 0x41, 0x52, 0x44, 0x5f, 0x4f, 0x4e, 0x4c,
-	0x59, 0x10, 0x01, 0x12, 0x2a, 0x0a, 0x26, 0x53, 0x51, 0x4c, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c,
+	0x5f, 0x51, 0x55, 0x41, 0x4e, 0x54, 0x49, 0x46, 0x49, 0x45, 0x44, 0x53, 0x10, 0x03, 0x2a, 0x36,
+	0x0a, 0x12, 0x53, 0x71, 0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x55, 0x6e,
+	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x51, 0x4c, 0x5f, 0x55, 0x4e, 0x49, 0x4f,
+	0x4e, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x53, 0x51, 0x4c, 0x5f, 0x55, 0x4e, 0x49, 0x4f, 0x4e,
+	0x5f, 0x41, 0x4c, 0x4c, 0x10, 0x01, 0x2a, 0xc9, 0x01, 0x0a, 0x1c, 0x53, 0x71, 0x6c, 0x54, 0x72,
+	0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x73, 0x6f, 0x6c, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f, 0x54,
+	0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10,
+	0x00, 0x12, 0x24, 0x0a, 0x20, 0x53, 0x51, 0x4c, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43,
+	0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52, 0x45, 0x41, 0x44, 0x5f, 0x55, 0x4e, 0x43, 0x4f, 0x4d, 0x4d,
+	0x49, 0x54, 0x54, 0x45, 0x44, 0x10, 0x01, 0x12, 0x22, 0x0a, 0x1e, 0x53, 0x51, 0x4c, 0x5f, 0x54,
+	0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52, 0x45, 0x41, 0x44, 0x5f,
+	0x43, 0x4f, 0x4d, 0x4d, 0x49, 0x54, 0x54, 0x45, 0x44, 0x10, 0x02, 0x12, 0x23, 0x0a, 0x1f, 0x53,
+	0x51, 0x4c, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x52,
+	0x45, 0x50, 0x45, 0x41, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x52, 0x45, 0x41, 0x44, 0x10, 0x03,
+	0x12, 0x20, 0x0a, 0x1c, 0x53, 0x51, 0x4c, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54,
+	0x49, 0x4f, 0x4e, 0x5f, 0x53, 0x45, 0x52, 0x49, 0x41, 0x4c, 0x49, 0x5a, 0x41, 0x42, 0x4c, 0x45,
+	0x10, 0x04, 0x2a, 0x89, 0x01, 0x0a, 0x18, 0x53, 0x71, 0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72,
+	0x74, 0x65, 0x64, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12,
+	0x1f, 0x0a, 0x1b, 0x53, 0x51, 0x4c, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49,
+	0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
+	0x12, 0x24, 0x0a, 0x20, 0x53, 0x51, 0x4c, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x44, 0x45, 0x46,
+	0x49, 0x4e, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54,
+	0x49, 0x4f, 0x4e, 0x53, 0x10, 0x01, 0x12, 0x26, 0x0a, 0x22, 0x53, 0x51, 0x4c, 0x5f, 0x44, 0x41,
+	0x54, 0x41, 0x5f, 0x4d, 0x41, 0x4e, 0x49, 0x50, 0x55, 0x4c, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f,
+	0x54, 0x52, 0x41, 0x4e, 0x53, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x53, 0x10, 0x02, 0x2a, 0xbc,
+	0x01, 0x0a, 0x19, 0x53, 0x71, 0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x52,
+	0x65, 0x73, 0x75, 0x6c, 0x74, 0x53, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x1f,
+	0x53, 0x51, 0x4c, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x54,
+	0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10,
+	0x00, 0x12, 0x24, 0x0a, 0x20, 0x53, 0x51, 0x4c, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f,
+	0x53, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x46, 0x4f, 0x52, 0x57, 0x41, 0x52, 0x44,
+	0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x01, 0x12, 0x2a, 0x0a, 0x26, 0x53, 0x51, 0x4c, 0x5f, 0x52,
+	0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53,
+	0x43, 0x52, 0x4f, 0x4c, 0x4c, 0x5f, 0x49, 0x4e, 0x53, 0x45, 0x4e, 0x53, 0x49, 0x54, 0x49, 0x56,
+	0x45, 0x10, 0x02, 0x12, 0x28, 0x0a, 0x24, 0x53, 0x51, 0x4c, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c,
 	0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x43, 0x52, 0x4f, 0x4c,
-	0x4c, 0x5f, 0x49, 0x4e, 0x53, 0x45, 0x4e, 0x53, 0x49, 0x54, 0x49, 0x56, 0x45, 0x10, 0x02, 0x12,
-	0x28, 0x0a, 0x24, 0x53, 0x51, 0x4c, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45,
-	0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x53, 0x43, 0x52, 0x4f, 0x4c, 0x4c, 0x5f, 0x53, 0x45,
-	0x4e, 0x53, 0x49, 0x54, 0x49, 0x56, 0x45, 0x10, 0x03, 0x2a, 0xa2, 0x01, 0x0a, 0x20, 0x53, 0x71,
-	0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x53, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x79, 0x12, 0x2a,
-	0x0a, 0x26, 0x53, 0x51, 0x4c, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54,
-	0x5f, 0x43, 0x4f, 0x4e, 0x43, 0x55, 0x52, 0x52, 0x45, 0x4e, 0x43, 0x59, 0x5f, 0x55, 0x4e, 0x53,
-	0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x28, 0x0a, 0x24, 0x53, 0x51,
-	0x4c, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x43, 0x4f, 0x4e,
-	0x43, 0x55, 0x52, 0x52, 0x45, 0x4e, 0x43, 0x59, 0x5f, 0x52, 0x45, 0x41, 0x44, 0x5f, 0x4f, 0x4e,
-	0x4c, 0x59, 0x10, 0x01, 0x12, 0x28, 0x0a, 0x24, 0x53, 0x51, 0x4c, 0x5f, 0x52, 0x45, 0x53, 0x55,
-	0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x43, 0x4f, 0x4e, 0x43, 0x55, 0x52, 0x52, 0x45, 0x4e,
-	0x43, 0x59, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x41, 0x42, 0x4c, 0x45, 0x10, 0x02, 0x2a, 0x99,
-	0x04, 0x0a, 0x12, 0x53, 0x71, 0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x43, 0x6f,
-	0x6e, 0x76, 0x65, 0x72, 0x74, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e,
-	0x56, 0x45, 0x52, 0x54, 0x5f, 0x42, 0x49, 0x47, 0x49, 0x4e, 0x54, 0x10, 0x00, 0x12, 0x16, 0x0a,
-	0x12, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x42, 0x49, 0x4e,
-	0x41, 0x52, 0x59, 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e,
-	0x56, 0x45, 0x52, 0x54, 0x5f, 0x42, 0x49, 0x54, 0x10, 0x02, 0x12, 0x14, 0x0a, 0x10, 0x53, 0x51,
-	0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x10, 0x03,
+	0x4c, 0x5f, 0x53, 0x45, 0x4e, 0x53, 0x49, 0x54, 0x49, 0x56, 0x45, 0x10, 0x03, 0x2a, 0xa2, 0x01,
+	0x0a, 0x20, 0x53, 0x71, 0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x52, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x53, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e,
+	0x63, 0x79, 0x12, 0x2a, 0x0a, 0x26, 0x53, 0x51, 0x4c, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54,
+	0x5f, 0x53, 0x45, 0x54, 0x5f, 0x43, 0x4f, 0x4e, 0x43, 0x55, 0x52, 0x52, 0x45, 0x4e, 0x43, 0x59,
+	0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x28,
+	0x0a, 0x24, 0x53, 0x51, 0x4c, 0x5f, 0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54,
+	0x5f, 0x43, 0x4f, 0x4e, 0x43, 0x55, 0x52, 0x52, 0x45, 0x4e, 0x43, 0x59, 0x5f, 0x52, 0x45, 0x41,
+	0x44, 0x5f, 0x4f, 0x4e, 0x4c, 0x59, 0x10, 0x01, 0x12, 0x28, 0x0a, 0x24, 0x53, 0x51, 0x4c, 0x5f,
+	0x52, 0x45, 0x53, 0x55, 0x4c, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x43, 0x4f, 0x4e, 0x43, 0x55,
+	0x52, 0x52, 0x45, 0x4e, 0x43, 0x59, 0x5f, 0x55, 0x50, 0x44, 0x41, 0x54, 0x41, 0x42, 0x4c, 0x45,
+	0x10, 0x02, 0x2a, 0x99, 0x04, 0x0a, 0x12, 0x53, 0x71, 0x6c, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72,
+	0x74, 0x73, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x51, 0x4c,
+	0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x42, 0x49, 0x47, 0x49, 0x4e, 0x54, 0x10,
+	0x00, 0x12, 0x16, 0x0a, 0x12, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54,
+	0x5f, 0x42, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x51, 0x4c,
+	0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x42, 0x49, 0x54, 0x10, 0x02, 0x12, 0x14,
+	0x0a, 0x10, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x43, 0x48,
+	0x41, 0x52, 0x10, 0x03, 0x12, 0x14, 0x0a, 0x10, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56,
+	0x45, 0x52, 0x54, 0x5f, 0x44, 0x41, 0x54, 0x45, 0x10, 0x04, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x51,
+	0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x44, 0x45, 0x43, 0x49, 0x4d, 0x41,
+	0x4c, 0x10, 0x05, 0x12, 0x15, 0x0a, 0x11, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45,
+	0x52, 0x54, 0x5f, 0x46, 0x4c, 0x4f, 0x41, 0x54, 0x10, 0x06, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x51,
+	0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x45,
+	0x52, 0x10, 0x07, 0x12, 0x21, 0x0a, 0x1d, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45,
+	0x52, 0x54, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x44, 0x41, 0x59, 0x5f,
+	0x54, 0x49, 0x4d, 0x45, 0x10, 0x08, 0x12, 0x23, 0x0a, 0x1f, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f,
+	0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x59,
+	0x45, 0x41, 0x52, 0x5f, 0x4d, 0x4f, 0x4e, 0x54, 0x48, 0x10, 0x09, 0x12, 0x1d, 0x0a, 0x19, 0x53,
+	0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x4c, 0x4f, 0x4e, 0x47, 0x56,
+	0x41, 0x52, 0x42, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x53, 0x51,
+	0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x4c, 0x4f, 0x4e, 0x47, 0x56, 0x41,
+	0x52, 0x43, 0x48, 0x41, 0x52, 0x10, 0x0b, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x51, 0x4c, 0x5f, 0x43,
+	0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x4e, 0x55, 0x4d, 0x45, 0x52, 0x49, 0x43, 0x10, 0x0c,
 	0x12, 0x14, 0x0a, 0x10, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f,
-	0x44, 0x41, 0x54, 0x45, 0x10, 0x04, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f,
-	0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x44, 0x45, 0x43, 0x49, 0x4d, 0x41, 0x4c, 0x10, 0x05, 0x12,
-	0x15, 0x0a, 0x11, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x46,
-	0x4c, 0x4f, 0x41, 0x54, 0x10, 0x06, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f,
-	0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x45, 0x52, 0x10, 0x07, 0x12,
-	0x21, 0x0a, 0x1d, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x49,
-	0x4e, 0x54, 0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x44, 0x41, 0x59, 0x5f, 0x54, 0x49, 0x4d, 0x45,
-	0x10, 0x08, 0x12, 0x23, 0x0a, 0x1f, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52,
-	0x54, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x59, 0x45, 0x41, 0x52, 0x5f,
-	0x4d, 0x4f, 0x4e, 0x54, 0x48, 0x10, 0x09, 0x12, 0x1d, 0x0a, 0x19, 0x53, 0x51, 0x4c, 0x5f, 0x43,
-	0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x4c, 0x4f, 0x4e, 0x47, 0x56, 0x41, 0x52, 0x42, 0x49,
-	0x4e, 0x41, 0x52, 0x59, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f,
-	0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x4c, 0x4f, 0x4e, 0x47, 0x56, 0x41, 0x52, 0x43, 0x48, 0x41,
-	0x52, 0x10, 0x0b, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45,
-	0x52, 0x54, 0x5f, 0x4e, 0x55, 0x4d, 0x45, 0x52, 0x49, 0x43, 0x10, 0x0c, 0x12, 0x14, 0x0a, 0x10,
-	0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x52, 0x45, 0x41, 0x4c,
-	0x10, 0x0d, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52,
-	0x54, 0x5f, 0x53, 0x4d, 0x41, 0x4c, 0x4c, 0x49, 0x4e, 0x54, 0x10, 0x0e, 0x12, 0x14, 0x0a, 0x10,
-	0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x54, 0x49, 0x4d, 0x45,
-	0x10, 0x0f, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52,
-	0x54, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x53, 0x54, 0x41, 0x4d, 0x50, 0x10, 0x10, 0x12, 0x17, 0x0a,
-	0x13, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x54, 0x49, 0x4e,
-	0x59, 0x49, 0x4e, 0x54, 0x10, 0x11, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f,
-	0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x56, 0x41, 0x52, 0x42, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x10,
-	0x12, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54,
-	0x5f, 0x56, 0x41, 0x52, 0x43, 0x48, 0x41, 0x52, 0x10, 0x13, 0x2a, 0x8f, 0x04, 0x0a, 0x0c, 0x58,
-	0x64, 0x62, 0x63, 0x44, 0x61, 0x74, 0x61, 0x54, 0x79, 0x70, 0x65, 0x12, 0x15, 0x0a, 0x11, 0x58,
-	0x44, 0x42, 0x43, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45,
-	0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x43, 0x48, 0x41, 0x52, 0x10,
-	0x01, 0x12, 0x10, 0x0a, 0x0c, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x4e, 0x55, 0x4d, 0x45, 0x52, 0x49,
-	0x43, 0x10, 0x02, 0x12, 0x10, 0x0a, 0x0c, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x44, 0x45, 0x43, 0x49,
-	0x4d, 0x41, 0x4c, 0x10, 0x03, 0x12, 0x10, 0x0a, 0x0c, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x49, 0x4e,
-	0x54, 0x45, 0x47, 0x45, 0x52, 0x10, 0x04, 0x12, 0x11, 0x0a, 0x0d, 0x58, 0x44, 0x42, 0x43, 0x5f,
-	0x53, 0x4d, 0x41, 0x4c, 0x4c, 0x49, 0x4e, 0x54, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x58, 0x44,
-	0x42, 0x43, 0x5f, 0x46, 0x4c, 0x4f, 0x41, 0x54, 0x10, 0x06, 0x12, 0x0d, 0x0a, 0x09, 0x58, 0x44,
-	0x42, 0x43, 0x5f, 0x52, 0x45, 0x41, 0x4c, 0x10, 0x07, 0x12, 0x0f, 0x0a, 0x0b, 0x58, 0x44, 0x42,
-	0x43, 0x5f, 0x44, 0x4f, 0x55, 0x42, 0x4c, 0x45, 0x10, 0x08, 0x12, 0x11, 0x0a, 0x0d, 0x58, 0x44,
-	0x42, 0x43, 0x5f, 0x44, 0x41, 0x54, 0x45, 0x54, 0x49, 0x4d, 0x45, 0x10, 0x09, 0x12, 0x11, 0x0a,
-	0x0d, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56, 0x41, 0x4c, 0x10, 0x0a,
-	0x12, 0x10, 0x0a, 0x0c, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x56, 0x41, 0x52, 0x43, 0x48, 0x41, 0x52,
-	0x10, 0x0c, 0x12, 0x0d, 0x0a, 0x09, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x44, 0x41, 0x54, 0x45, 0x10,
-	0x5b, 0x12, 0x0d, 0x0a, 0x09, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x10, 0x5c,
-	0x12, 0x12, 0x0a, 0x0e, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x53, 0x54, 0x41,
-	0x4d, 0x50, 0x10, 0x5d, 0x12, 0x1d, 0x0a, 0x10, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x4c, 0x4f, 0x4e,
-	0x47, 0x56, 0x41, 0x52, 0x43, 0x48, 0x41, 0x52, 0x10, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0x01, 0x12, 0x18, 0x0a, 0x0b, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x42, 0x49, 0x4e, 0x41,
-	0x52, 0x59, 0x10, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x12, 0x1b, 0x0a,
-	0x0e, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x56, 0x41, 0x52, 0x42, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x10,
-	0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x12, 0x1f, 0x0a, 0x12, 0x58, 0x44,
-	0x42, 0x43, 0x5f, 0x4c, 0x4f, 0x4e, 0x47, 0x56, 0x41, 0x52, 0x42, 0x49, 0x4e, 0x41, 0x52, 0x59,
-	0x10, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x12, 0x18, 0x0a, 0x0b, 0x58,
-	0x44, 0x42, 0x43, 0x5f, 0x42, 0x49, 0x47, 0x49, 0x4e, 0x54, 0x10, 0xfb, 0xff, 0xff, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0x01, 0x12, 0x19, 0x0a, 0x0c, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x54, 0x49,
-	0x4e, 0x59, 0x49, 0x4e, 0x54, 0x10, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01,
-	0x12, 0x15, 0x0a, 0x08, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x42, 0x49, 0x54, 0x10, 0xf9, 0xff, 0xff,
-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x12, 0x17, 0x0a, 0x0a, 0x58, 0x44, 0x42, 0x43, 0x5f,
-	0x57, 0x43, 0x48, 0x41, 0x52, 0x10, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01,
-	0x12, 0x1a, 0x0a, 0x0d, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x57, 0x56, 0x41, 0x52, 0x43, 0x48, 0x41,
-	0x52, 0x10, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x2a, 0xa3, 0x08, 0x0a,
-	0x13, 0x58, 0x64, 0x62, 0x63, 0x44, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x53, 0x75, 0x62,
-	0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x14, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42,
-	0x43, 0x4f, 0x44, 0x45, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x15,
-	0x0a, 0x11, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x59,
-	0x45, 0x41, 0x52, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55,
-	0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x44, 0x41, 0x54, 0x45, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11,
-	0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x54, 0x49, 0x4d,
-	0x45, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43,
-	0x4f, 0x44, 0x45, 0x5f, 0x4d, 0x4f, 0x4e, 0x54, 0x48, 0x10, 0x02, 0x12, 0x1a, 0x0a, 0x16, 0x58,
-	0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x54, 0x49, 0x4d, 0x45,
-	0x53, 0x54, 0x41, 0x4d, 0x50, 0x10, 0x03, 0x12, 0x14, 0x0a, 0x10, 0x58, 0x44, 0x42, 0x43, 0x5f,
-	0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x44, 0x41, 0x59, 0x10, 0x03, 0x12, 0x23, 0x0a,
-	0x1f, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x54, 0x49,
-	0x4d, 0x45, 0x5f, 0x57, 0x49, 0x54, 0x48, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x5a, 0x4f, 0x4e, 0x45,
-	0x10, 0x04, 0x12, 0x15, 0x0a, 0x11, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f,
-	0x44, 0x45, 0x5f, 0x48, 0x4f, 0x55, 0x52, 0x10, 0x04, 0x12, 0x28, 0x0a, 0x24, 0x58, 0x44, 0x42,
-	0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x53, 0x54,
-	0x41, 0x4d, 0x50, 0x5f, 0x57, 0x49, 0x54, 0x48, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x5a, 0x4f, 0x4e,
-	0x45, 0x10, 0x05, 0x12, 0x17, 0x0a, 0x13, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43,
-	0x4f, 0x44, 0x45, 0x5f, 0x4d, 0x49, 0x4e, 0x55, 0x54, 0x45, 0x10, 0x05, 0x12, 0x17, 0x0a, 0x13,
-	0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x53, 0x45, 0x43,
-	0x4f, 0x4e, 0x44, 0x10, 0x06, 0x12, 0x1e, 0x0a, 0x1a, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55,
-	0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x59, 0x45, 0x41, 0x52, 0x5f, 0x54, 0x4f, 0x5f, 0x4d, 0x4f,
-	0x4e, 0x54, 0x48, 0x10, 0x07, 0x12, 0x1c, 0x0a, 0x18, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55,
-	0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x44, 0x41, 0x59, 0x5f, 0x54, 0x4f, 0x5f, 0x48, 0x4f, 0x55,
-	0x52, 0x10, 0x08, 0x12, 0x1e, 0x0a, 0x1a, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43,
-	0x4f, 0x44, 0x45, 0x5f, 0x44, 0x41, 0x59, 0x5f, 0x54, 0x4f, 0x5f, 0x4d, 0x49, 0x4e, 0x55, 0x54,
-	0x45, 0x10, 0x09, 0x12, 0x1e, 0x0a, 0x1a, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43,
-	0x4f, 0x44, 0x45, 0x5f, 0x44, 0x41, 0x59, 0x5f, 0x54, 0x4f, 0x5f, 0x53, 0x45, 0x43, 0x4f, 0x4e,
-	0x44, 0x10, 0x0a, 0x12, 0x1f, 0x0a, 0x1b, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43,
-	0x4f, 0x44, 0x45, 0x5f, 0x48, 0x4f, 0x55, 0x52, 0x5f, 0x54, 0x4f, 0x5f, 0x4d, 0x49, 0x4e, 0x55,
-	0x54, 0x45, 0x10, 0x0b, 0x12, 0x1f, 0x0a, 0x1b, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42,
-	0x43, 0x4f, 0x44, 0x45, 0x5f, 0x48, 0x4f, 0x55, 0x52, 0x5f, 0x54, 0x4f, 0x5f, 0x53, 0x45, 0x43,
-	0x4f, 0x4e, 0x44, 0x10, 0x0c, 0x12, 0x21, 0x0a, 0x1d, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55,
-	0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x4d, 0x49, 0x4e, 0x55, 0x54, 0x45, 0x5f, 0x54, 0x4f, 0x5f,
-	0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44, 0x10, 0x0d, 0x12, 0x1e, 0x0a, 0x1a, 0x58, 0x44, 0x42, 0x43,
-	0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56, 0x41,
-	0x4c, 0x5f, 0x59, 0x45, 0x41, 0x52, 0x10, 0x65, 0x12, 0x1f, 0x0a, 0x1b, 0x58, 0x44, 0x42, 0x43,
-	0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56, 0x41,
-	0x4c, 0x5f, 0x4d, 0x4f, 0x4e, 0x54, 0x48, 0x10, 0x66, 0x12, 0x1d, 0x0a, 0x19, 0x58, 0x44, 0x42,
-	0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56,
-	0x41, 0x4c, 0x5f, 0x44, 0x41, 0x59, 0x10, 0x67, 0x12, 0x1e, 0x0a, 0x1a, 0x58, 0x44, 0x42, 0x43,
-	0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56, 0x41,
-	0x4c, 0x5f, 0x48, 0x4f, 0x55, 0x52, 0x10, 0x68, 0x12, 0x20, 0x0a, 0x1c, 0x58, 0x44, 0x42, 0x43,
-	0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56, 0x41,
-	0x4c, 0x5f, 0x4d, 0x49, 0x4e, 0x55, 0x54, 0x45, 0x10, 0x69, 0x12, 0x20, 0x0a, 0x1c, 0x58, 0x44,
-	0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52,
-	0x56, 0x41, 0x4c, 0x5f, 0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44, 0x10, 0x6a, 0x12, 0x27, 0x0a, 0x23,
+	0x52, 0x45, 0x41, 0x4c, 0x10, 0x0d, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f,
+	0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x53, 0x4d, 0x41, 0x4c, 0x4c, 0x49, 0x4e, 0x54, 0x10, 0x0e,
+	0x12, 0x14, 0x0a, 0x10, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f,
+	0x54, 0x49, 0x4d, 0x45, 0x10, 0x0f, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f,
+	0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x53, 0x54, 0x41, 0x4d, 0x50, 0x10,
+	0x10, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54,
+	0x5f, 0x54, 0x49, 0x4e, 0x59, 0x49, 0x4e, 0x54, 0x10, 0x11, 0x12, 0x19, 0x0a, 0x15, 0x53, 0x51,
+	0x4c, 0x5f, 0x43, 0x4f, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x5f, 0x56, 0x41, 0x52, 0x42, 0x49, 0x4e,
+	0x41, 0x52, 0x59, 0x10, 0x12, 0x12, 0x17, 0x0a, 0x13, 0x53, 0x51, 0x4c, 0x5f, 0x43, 0x4f, 0x4e,
+	0x56, 0x45, 0x52, 0x54, 0x5f, 0x56, 0x41, 0x52, 0x43, 0x48, 0x41, 0x52, 0x10, 0x13, 0x2a, 0x8f,
+	0x04, 0x0a, 0x0c, 0x58, 0x64, 0x62, 0x63, 0x44, 0x61, 0x74, 0x61, 0x54, 0x79, 0x70, 0x65, 0x12,
+	0x15, 0x0a, 0x11, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f,
+	0x54, 0x59, 0x50, 0x45, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x43,
+	0x48, 0x41, 0x52, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x4e, 0x55,
+	0x4d, 0x45, 0x52, 0x49, 0x43, 0x10, 0x02, 0x12, 0x10, 0x0a, 0x0c, 0x58, 0x44, 0x42, 0x43, 0x5f,
+	0x44, 0x45, 0x43, 0x49, 0x4d, 0x41, 0x4c, 0x10, 0x03, 0x12, 0x10, 0x0a, 0x0c, 0x58, 0x44, 0x42,
+	0x43, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x47, 0x45, 0x52, 0x10, 0x04, 0x12, 0x11, 0x0a, 0x0d, 0x58,
+	0x44, 0x42, 0x43, 0x5f, 0x53, 0x4d, 0x41, 0x4c, 0x4c, 0x49, 0x4e, 0x54, 0x10, 0x05, 0x12, 0x0e,
+	0x0a, 0x0a, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x46, 0x4c, 0x4f, 0x41, 0x54, 0x10, 0x06, 0x12, 0x0d,
+	0x0a, 0x09, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x52, 0x45, 0x41, 0x4c, 0x10, 0x07, 0x12, 0x0f, 0x0a,
+	0x0b, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x44, 0x4f, 0x55, 0x42, 0x4c, 0x45, 0x10, 0x08, 0x12, 0x11,
+	0x0a, 0x0d, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x44, 0x41, 0x54, 0x45, 0x54, 0x49, 0x4d, 0x45, 0x10,
+	0x09, 0x12, 0x11, 0x0a, 0x0d, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56,
+	0x41, 0x4c, 0x10, 0x0a, 0x12, 0x10, 0x0a, 0x0c, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x56, 0x41, 0x52,
+	0x43, 0x48, 0x41, 0x52, 0x10, 0x0c, 0x12, 0x0d, 0x0a, 0x09, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x44,
+	0x41, 0x54, 0x45, 0x10, 0x5b, 0x12, 0x0d, 0x0a, 0x09, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x54, 0x49,
+	0x4d, 0x45, 0x10, 0x5c, 0x12, 0x12, 0x0a, 0x0e, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x54, 0x49, 0x4d,
+	0x45, 0x53, 0x54, 0x41, 0x4d, 0x50, 0x10, 0x5d, 0x12, 0x1d, 0x0a, 0x10, 0x58, 0x44, 0x42, 0x43,
+	0x5f, 0x4c, 0x4f, 0x4e, 0x47, 0x56, 0x41, 0x52, 0x43, 0x48, 0x41, 0x52, 0x10, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x12, 0x18, 0x0a, 0x0b, 0x58, 0x44, 0x42, 0x43, 0x5f,
+	0x42, 0x49, 0x4e, 0x41, 0x52, 0x59, 0x10, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x01, 0x12, 0x1b, 0x0a, 0x0e, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x56, 0x41, 0x52, 0x42, 0x49, 0x4e,
+	0x41, 0x52, 0x59, 0x10, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x12, 0x1f,
+	0x0a, 0x12, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x4c, 0x4f, 0x4e, 0x47, 0x56, 0x41, 0x52, 0x42, 0x49,
+	0x4e, 0x41, 0x52, 0x59, 0x10, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x12,
+	0x18, 0x0a, 0x0b, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x42, 0x49, 0x47, 0x49, 0x4e, 0x54, 0x10, 0xfb,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x12, 0x19, 0x0a, 0x0c, 0x58, 0x44, 0x42,
+	0x43, 0x5f, 0x54, 0x49, 0x4e, 0x59, 0x49, 0x4e, 0x54, 0x10, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x01, 0x12, 0x15, 0x0a, 0x08, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x42, 0x49, 0x54,
+	0x10, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x12, 0x17, 0x0a, 0x0a, 0x58,
+	0x44, 0x42, 0x43, 0x5f, 0x57, 0x43, 0x48, 0x41, 0x52, 0x10, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x01, 0x12, 0x1a, 0x0a, 0x0d, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x57, 0x56, 0x41,
+	0x52, 0x43, 0x48, 0x41, 0x52, 0x10, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01,
+	0x2a, 0xa3, 0x08, 0x0a, 0x13, 0x58, 0x64, 0x62, 0x63, 0x44, 0x61, 0x74, 0x65, 0x74, 0x69, 0x6d,
+	0x65, 0x53, 0x75, 0x62, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x14, 0x58, 0x44, 0x42, 0x43,
+	0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e,
+	0x10, 0x00, 0x12, 0x15, 0x0a, 0x11, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f,
+	0x44, 0x45, 0x5f, 0x59, 0x45, 0x41, 0x52, 0x10, 0x01, 0x12, 0x15, 0x0a, 0x11, 0x58, 0x44, 0x42,
+	0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x44, 0x41, 0x54, 0x45, 0x10, 0x01,
+	0x12, 0x15, 0x0a, 0x11, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45,
+	0x5f, 0x54, 0x49, 0x4d, 0x45, 0x10, 0x02, 0x12, 0x16, 0x0a, 0x12, 0x58, 0x44, 0x42, 0x43, 0x5f,
+	0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x4d, 0x4f, 0x4e, 0x54, 0x48, 0x10, 0x02, 0x12,
+	0x1a, 0x0a, 0x16, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f,
+	0x54, 0x49, 0x4d, 0x45, 0x53, 0x54, 0x41, 0x4d, 0x50, 0x10, 0x03, 0x12, 0x14, 0x0a, 0x10, 0x58,
+	0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x44, 0x41, 0x59, 0x10,
+	0x03, 0x12, 0x23, 0x0a, 0x1f, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44,
+	0x45, 0x5f, 0x54, 0x49, 0x4d, 0x45, 0x5f, 0x57, 0x49, 0x54, 0x48, 0x5f, 0x54, 0x49, 0x4d, 0x45,
+	0x5a, 0x4f, 0x4e, 0x45, 0x10, 0x04, 0x12, 0x15, 0x0a, 0x11, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53,
+	0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x48, 0x4f, 0x55, 0x52, 0x10, 0x04, 0x12, 0x28, 0x0a,
+	0x24, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x54, 0x49,
+	0x4d, 0x45, 0x53, 0x54, 0x41, 0x4d, 0x50, 0x5f, 0x57, 0x49, 0x54, 0x48, 0x5f, 0x54, 0x49, 0x4d,
+	0x45, 0x5a, 0x4f, 0x4e, 0x45, 0x10, 0x05, 0x12, 0x17, 0x0a, 0x13, 0x58, 0x44, 0x42, 0x43, 0x5f,
+	0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x4d, 0x49, 0x4e, 0x55, 0x54, 0x45, 0x10, 0x05,
+	0x12, 0x17, 0x0a, 0x13, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45,
+	0x5f, 0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44, 0x10, 0x06, 0x12, 0x1e, 0x0a, 0x1a, 0x58, 0x44, 0x42,
+	0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x59, 0x45, 0x41, 0x52, 0x5f, 0x54,
+	0x4f, 0x5f, 0x4d, 0x4f, 0x4e, 0x54, 0x48, 0x10, 0x07, 0x12, 0x1c, 0x0a, 0x18, 0x58, 0x44, 0x42,
+	0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x44, 0x41, 0x59, 0x5f, 0x54, 0x4f,
+	0x5f, 0x48, 0x4f, 0x55, 0x52, 0x10, 0x08, 0x12, 0x1e, 0x0a, 0x1a, 0x58, 0x44, 0x42, 0x43, 0x5f,
+	0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x44, 0x41, 0x59, 0x5f, 0x54, 0x4f, 0x5f, 0x4d,
+	0x49, 0x4e, 0x55, 0x54, 0x45, 0x10, 0x09, 0x12, 0x1e, 0x0a, 0x1a, 0x58, 0x44, 0x42, 0x43, 0x5f,
+	0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x44, 0x41, 0x59, 0x5f, 0x54, 0x4f, 0x5f, 0x53,
+	0x45, 0x43, 0x4f, 0x4e, 0x44, 0x10, 0x0a, 0x12, 0x1f, 0x0a, 0x1b, 0x58, 0x44, 0x42, 0x43, 0x5f,
+	0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x48, 0x4f, 0x55, 0x52, 0x5f, 0x54, 0x4f, 0x5f,
+	0x4d, 0x49, 0x4e, 0x55, 0x54, 0x45, 0x10, 0x0b, 0x12, 0x1f, 0x0a, 0x1b, 0x58, 0x44, 0x42, 0x43,
+	0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x48, 0x4f, 0x55, 0x52, 0x5f, 0x54, 0x4f,
+	0x5f, 0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44, 0x10, 0x0c, 0x12, 0x21, 0x0a, 0x1d, 0x58, 0x44, 0x42,
+	0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x4d, 0x49, 0x4e, 0x55, 0x54, 0x45,
+	0x5f, 0x54, 0x4f, 0x5f, 0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44, 0x10, 0x0d, 0x12, 0x1e, 0x0a, 0x1a,
+	0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54,
+	0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x59, 0x45, 0x41, 0x52, 0x10, 0x65, 0x12, 0x1f, 0x0a, 0x1b,
+	0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54,
+	0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x4d, 0x4f, 0x4e, 0x54, 0x48, 0x10, 0x66, 0x12, 0x1d, 0x0a,
+	0x19, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e,
+	0x54, 0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x44, 0x41, 0x59, 0x10, 0x67, 0x12, 0x1e, 0x0a, 0x1a,
+	0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54,
+	0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x48, 0x4f, 0x55, 0x52, 0x10, 0x68, 0x12, 0x20, 0x0a, 0x1c,
 	0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54,
-	0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x59, 0x45, 0x41, 0x52, 0x5f, 0x54, 0x4f, 0x5f, 0x4d, 0x4f,
-	0x4e, 0x54, 0x48, 0x10, 0x6b, 0x12, 0x25, 0x0a, 0x21, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55,
-	0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x44,
-	0x41, 0x59, 0x5f, 0x54, 0x4f, 0x5f, 0x48, 0x4f, 0x55, 0x52, 0x10, 0x6c, 0x12, 0x27, 0x0a, 0x23,
+	0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x4d, 0x49, 0x4e, 0x55, 0x54, 0x45, 0x10, 0x69, 0x12, 0x20,
+	0x0a, 0x1c, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49,
+	0x4e, 0x54, 0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44, 0x10, 0x6a,
+	0x12, 0x27, 0x0a, 0x23, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45,
+	0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x59, 0x45, 0x41, 0x52, 0x5f, 0x54,
+	0x4f, 0x5f, 0x4d, 0x4f, 0x4e, 0x54, 0x48, 0x10, 0x6b, 0x12, 0x25, 0x0a, 0x21, 0x58, 0x44, 0x42,
+	0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56,
+	0x41, 0x4c, 0x5f, 0x44, 0x41, 0x59, 0x5f, 0x54, 0x4f, 0x5f, 0x48, 0x4f, 0x55, 0x52, 0x10, 0x6c,
+	0x12, 0x27, 0x0a, 0x23, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45,
+	0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x44, 0x41, 0x59, 0x5f, 0x54, 0x4f,
+	0x5f, 0x4d, 0x49, 0x4e, 0x55, 0x54, 0x45, 0x10, 0x6d, 0x12, 0x27, 0x0a, 0x23, 0x58, 0x44, 0x42,
+	0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56,
+	0x41, 0x4c, 0x5f, 0x44, 0x41, 0x59, 0x5f, 0x54, 0x4f, 0x5f, 0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44,
+	0x10, 0x6e, 0x12, 0x28, 0x0a, 0x24, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f,
+	0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x48, 0x4f, 0x55, 0x52,
+	0x5f, 0x54, 0x4f, 0x5f, 0x4d, 0x49, 0x4e, 0x55, 0x54, 0x45, 0x10, 0x6f, 0x12, 0x28, 0x0a, 0x24,
 	0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54,
-	0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x44, 0x41, 0x59, 0x5f, 0x54, 0x4f, 0x5f, 0x4d, 0x49, 0x4e,
-	0x55, 0x54, 0x45, 0x10, 0x6d, 0x12, 0x27, 0x0a, 0x23, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55,
-	0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x44,
-	0x41, 0x59, 0x5f, 0x54, 0x4f, 0x5f, 0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44, 0x10, 0x6e, 0x12, 0x28,
-	0x0a, 0x24, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49,
-	0x4e, 0x54, 0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x48, 0x4f, 0x55, 0x52, 0x5f, 0x54, 0x4f, 0x5f,
-	0x4d, 0x49, 0x4e, 0x55, 0x54, 0x45, 0x10, 0x6f, 0x12, 0x28, 0x0a, 0x24, 0x58, 0x44, 0x42, 0x43,
-	0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56, 0x41,
-	0x4c, 0x5f, 0x48, 0x4f, 0x55, 0x52, 0x5f, 0x54, 0x4f, 0x5f, 0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44,
-	0x10, 0x70, 0x12, 0x2a, 0x0a, 0x26, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53, 0x55, 0x42, 0x43, 0x4f,
-	0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x4d, 0x49, 0x4e, 0x55,
-	0x54, 0x45, 0x5f, 0x54, 0x4f, 0x5f, 0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44, 0x10, 0x71, 0x1a, 0x02,
-	0x10, 0x01, 0x2a, 0x57, 0x0a, 0x08, 0x4e, 0x75, 0x6c, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x18,
-	0x0a, 0x14, 0x4e, 0x55, 0x4c, 0x4c, 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x4e, 0x4f,
-	0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x53, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14, 0x4e, 0x55, 0x4c, 0x4c,
-	0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x41, 0x42, 0x4c, 0x45,
-	0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x4e, 0x55, 0x4c, 0x4c, 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54,
-	0x59, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x02, 0x2a, 0x61, 0x0a, 0x0a, 0x53,
-	0x65, 0x61, 0x72, 0x63, 0x68, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x45, 0x41,
-	0x52, 0x43, 0x48, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x00, 0x12, 0x13,
-	0x0a, 0x0f, 0x53, 0x45, 0x41, 0x52, 0x43, 0x48, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x43, 0x48, 0x41,
-	0x52, 0x10, 0x01, 0x12, 0x14, 0x0a, 0x10, 0x53, 0x45, 0x41, 0x52, 0x43, 0x48, 0x41, 0x42, 0x4c,
-	0x45, 0x5f, 0x42, 0x41, 0x53, 0x49, 0x43, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x45, 0x41,
-	0x52, 0x43, 0x48, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x46, 0x55, 0x4c, 0x4c, 0x10, 0x03, 0x2a, 0x5c,
-	0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x75,
-	0x6c, 0x65, 0x73, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x41, 0x53, 0x43, 0x41, 0x44, 0x45, 0x10, 0x00,
-	0x12, 0x0c, 0x0a, 0x08, 0x52, 0x45, 0x53, 0x54, 0x52, 0x49, 0x43, 0x54, 0x10, 0x01, 0x12, 0x0c,
-	0x0a, 0x08, 0x53, 0x45, 0x54, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09,
-	0x4e, 0x4f, 0x5f, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x03, 0x12, 0x0f, 0x0a, 0x0b, 0x53,
-	0x45, 0x54, 0x5f, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x10, 0x04, 0x3a, 0x44, 0x0a, 0x0c,
-	0x65, 0x78, 0x70, 0x65, 0x72, 0x69, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x6c, 0x12, 0x1f, 0x2e, 0x67,
-	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0xe8, 0x07,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x65, 0x78, 0x70, 0x65, 0x72, 0x69, 0x6d, 0x65, 0x6e, 0x74,
-	0x61, 0x6c, 0x42, 0x56, 0x0a, 0x20, 0x6f, 0x72, 0x67, 0x2e, 0x61, 0x70, 0x61, 0x63, 0x68, 0x65,
-	0x2e, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x2e, 0x66, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x2e, 0x73, 0x71,
-	0x6c, 0x2e, 0x69, 0x6d, 0x70, 0x6c, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63,
-	0x6f, 0x6d, 0x2f, 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2f, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x2f,
-	0x67, 0x6f, 0x2f, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x2f, 0x66, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x2f,
-	0x67, 0x65, 0x6e, 0x2f, 0x66, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f, 0x48, 0x4f, 0x55, 0x52, 0x5f, 0x54, 0x4f, 0x5f, 0x53, 0x45,
+	0x43, 0x4f, 0x4e, 0x44, 0x10, 0x70, 0x12, 0x2a, 0x0a, 0x26, 0x58, 0x44, 0x42, 0x43, 0x5f, 0x53,
+	0x55, 0x42, 0x43, 0x4f, 0x44, 0x45, 0x5f, 0x49, 0x4e, 0x54, 0x45, 0x52, 0x56, 0x41, 0x4c, 0x5f,
+	0x4d, 0x49, 0x4e, 0x55, 0x54, 0x45, 0x5f, 0x54, 0x4f, 0x5f, 0x53, 0x45, 0x43, 0x4f, 0x4e, 0x44,
+	0x10, 0x71, 0x1a, 0x02, 0x10, 0x01, 0x2a, 0x57, 0x0a, 0x08, 0x4e, 0x75, 0x6c, 0x6c, 0x61, 0x62,
+	0x6c, 0x65, 0x12, 0x18, 0x0a, 0x14, 0x4e, 0x55, 0x4c, 0x4c, 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54,
+	0x59, 0x5f, 0x4e, 0x4f, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x53, 0x10, 0x00, 0x12, 0x18, 0x0a, 0x14,
+	0x4e, 0x55, 0x4c, 0x4c, 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x4e, 0x55, 0x4c, 0x4c,
+	0x41, 0x42, 0x4c, 0x45, 0x10, 0x01, 0x12, 0x17, 0x0a, 0x13, 0x4e, 0x55, 0x4c, 0x4c, 0x41, 0x42,
+	0x49, 0x4c, 0x49, 0x54, 0x59, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x02, 0x2a,
+	0x61, 0x0a, 0x0a, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x13, 0x0a,
+	0x0f, 0x53, 0x45, 0x41, 0x52, 0x43, 0x48, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x4e, 0x4f, 0x4e, 0x45,
+	0x10, 0x00, 0x12, 0x13, 0x0a, 0x0f, 0x53, 0x45, 0x41, 0x52, 0x43, 0x48, 0x41, 0x42, 0x4c, 0x45,
+	0x5f, 0x43, 0x48, 0x41, 0x52, 0x10, 0x01, 0x12, 0x14, 0x0a, 0x10, 0x53, 0x45, 0x41, 0x52, 0x43,
+	0x48, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x42, 0x41, 0x53, 0x49, 0x43, 0x10, 0x02, 0x12, 0x13, 0x0a,
+	0x0f, 0x53, 0x45, 0x41, 0x52, 0x43, 0x48, 0x41, 0x42, 0x4c, 0x45, 0x5f, 0x46, 0x55, 0x4c, 0x4c,
+	0x10, 0x03, 0x2a, 0x5c, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x44, 0x65, 0x6c, 0x65,
+	0x74, 0x65, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x41, 0x53, 0x43, 0x41,
+	0x44, 0x45, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x52, 0x45, 0x53, 0x54, 0x52, 0x49, 0x43, 0x54,
+	0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x45, 0x54, 0x5f, 0x4e, 0x55, 0x4c, 0x4c, 0x10, 0x02,
+	0x12, 0x0d, 0x0a, 0x09, 0x4e, 0x4f, 0x5f, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x03, 0x12,
+	0x0f, 0x0a, 0x0b, 0x53, 0x45, 0x54, 0x5f, 0x44, 0x45, 0x46, 0x41, 0x55, 0x4c, 0x54, 0x10, 0x04,
+	0x3a, 0x44, 0x0a, 0x0c, 0x65, 0x78, 0x70, 0x65, 0x72, 0x69, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x6c,
+	0x12, 0x1f, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x18, 0xe8, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x65, 0x78, 0x70, 0x65, 0x72, 0x69,
+	0x6d, 0x65, 0x6e, 0x74, 0x61, 0x6c, 0x42, 0x56, 0x0a, 0x20, 0x6f, 0x72, 0x67, 0x2e, 0x61, 0x70,
+	0x61, 0x63, 0x68, 0x65, 0x2e, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x2e, 0x66, 0x6c, 0x69, 0x67, 0x68,
+	0x74, 0x2e, 0x73, 0x71, 0x6c, 0x2e, 0x69, 0x6d, 0x70, 0x6c, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2f, 0x61, 0x72,
+	0x72, 0x6f, 0x77, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x2f, 0x66, 0x6c, 0x69,
+	0x67, 0x68, 0x74, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x66, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -5127,78 +5558,88 @@ func file_FlightSql_proto_rawDescGZIP() []byte {
 	return file_FlightSql_proto_rawDescData
 }
 
-var file_FlightSql_proto_enumTypes = make([]protoimpl.EnumInfo, 25)
-var file_FlightSql_proto_msgTypes = make([]protoimpl.MessageInfo, 30)
+var file_FlightSql_proto_enumTypes = make([]protoimpl.EnumInfo, 27)
+var file_FlightSql_proto_msgTypes = make([]protoimpl.MessageInfo, 34)
 var file_FlightSql_proto_goTypes = []interface{}{
-	(SqlInfo)(0),                                     // 0: arrow.flight.protocol.sql.SqlInfo
-	(SqlSupportedTransaction)(0),                     // 1: arrow.flight.protocol.sql.SqlSupportedTransaction
-	(SqlSupportedCaseSensitivity)(0),                 // 2: arrow.flight.protocol.sql.SqlSupportedCaseSensitivity
-	(SqlNullOrdering)(0),                             // 3: arrow.flight.protocol.sql.SqlNullOrdering
-	(SupportedSqlGrammar)(0),                         // 4: arrow.flight.protocol.sql.SupportedSqlGrammar
-	(SupportedAnsi92SqlGrammarLevel)(0),              // 5: arrow.flight.protocol.sql.SupportedAnsi92SqlGrammarLevel
-	(SqlOuterJoinsSupportLevel)(0),                   // 6: arrow.flight.protocol.sql.SqlOuterJoinsSupportLevel
-	(SqlSupportedGroupBy)(0),                         // 7: arrow.flight.protocol.sql.SqlSupportedGroupBy
-	(SqlSupportedElementActions)(0),                  // 8: arrow.flight.protocol.sql.SqlSupportedElementActions
-	(SqlSupportedPositionedCommands)(0),              // 9: arrow.flight.protocol.sql.SqlSupportedPositionedCommands
-	(SqlSupportedSubqueries)(0),                      // 10: arrow.flight.protocol.sql.SqlSupportedSubqueries
-	(SqlSupportedUnions)(0),                          // 11: arrow.flight.protocol.sql.SqlSupportedUnions
-	(SqlTransactionIsolationLevel)(0),                // 12: arrow.flight.protocol.sql.SqlTransactionIsolationLevel
-	(SqlSupportedTransactions)(0),                    // 13: arrow.flight.protocol.sql.SqlSupportedTransactions
-	(SqlSupportedResultSetType)(0),                   // 14: arrow.flight.protocol.sql.SqlSupportedResultSetType
-	(SqlSupportedResultSetConcurrency)(0),            // 15: arrow.flight.protocol.sql.SqlSupportedResultSetConcurrency
-	(SqlSupportsConvert)(0),                          // 16: arrow.flight.protocol.sql.SqlSupportsConvert
-	(XdbcDataType)(0),                                // 17: arrow.flight.protocol.sql.XdbcDataType
-	(XdbcDatetimeSubcode)(0),                         // 18: arrow.flight.protocol.sql.XdbcDatetimeSubcode
-	(Nullable)(0),                                    // 19: arrow.flight.protocol.sql.Nullable
-	(Searchable)(0),                                  // 20: arrow.flight.protocol.sql.Searchable
-	(UpdateDeleteRules)(0),                           // 21: arrow.flight.protocol.sql.UpdateDeleteRules
-	(ActionEndTransactionRequest_EndTransaction)(0),  // 22: arrow.flight.protocol.sql.ActionEndTransactionRequest.EndTransaction
-	(ActionEndSavepointRequest_EndSavepoint)(0),      // 23: arrow.flight.protocol.sql.ActionEndSavepointRequest.EndSavepoint
-	(ActionCancelQueryResult_CancelResult)(0),        // 24: arrow.flight.protocol.sql.ActionCancelQueryResult.CancelResult
-	(*CommandGetSqlInfo)(nil),                        // 25: arrow.flight.protocol.sql.CommandGetSqlInfo
-	(*CommandGetXdbcTypeInfo)(nil),                   // 26: arrow.flight.protocol.sql.CommandGetXdbcTypeInfo
-	(*CommandGetCatalogs)(nil),                       // 27: arrow.flight.protocol.sql.CommandGetCatalogs
-	(*CommandGetDbSchemas)(nil),                      // 28: arrow.flight.protocol.sql.CommandGetDbSchemas
-	(*CommandGetTables)(nil),                         // 29: arrow.flight.protocol.sql.CommandGetTables
-	(*CommandGetTableTypes)(nil),                     // 30: arrow.flight.protocol.sql.CommandGetTableTypes
-	(*CommandGetPrimaryKeys)(nil),                    // 31: arrow.flight.protocol.sql.CommandGetPrimaryKeys
-	(*CommandGetExportedKeys)(nil),                   // 32: arrow.flight.protocol.sql.CommandGetExportedKeys
-	(*CommandGetImportedKeys)(nil),                   // 33: arrow.flight.protocol.sql.CommandGetImportedKeys
-	(*CommandGetCrossReference)(nil),                 // 34: arrow.flight.protocol.sql.CommandGetCrossReference
-	(*ActionCreatePreparedStatementRequest)(nil),     // 35: arrow.flight.protocol.sql.ActionCreatePreparedStatementRequest
-	(*SubstraitPlan)(nil),                            // 36: arrow.flight.protocol.sql.SubstraitPlan
-	(*ActionCreatePreparedSubstraitPlanRequest)(nil), // 37: arrow.flight.protocol.sql.ActionCreatePreparedSubstraitPlanRequest
-	(*ActionCreatePreparedStatementResult)(nil),      // 38: arrow.flight.protocol.sql.ActionCreatePreparedStatementResult
-	(*ActionClosePreparedStatementRequest)(nil),      // 39: arrow.flight.protocol.sql.ActionClosePreparedStatementRequest
-	(*ActionBeginTransactionRequest)(nil),            // 40: arrow.flight.protocol.sql.ActionBeginTransactionRequest
-	(*ActionBeginSavepointRequest)(nil),              // 41: arrow.flight.protocol.sql.ActionBeginSavepointRequest
-	(*ActionBeginTransactionResult)(nil),             // 42: arrow.flight.protocol.sql.ActionBeginTransactionResult
-	(*ActionBeginSavepointResult)(nil),               // 43: arrow.flight.protocol.sql.ActionBeginSavepointResult
-	(*ActionEndTransactionRequest)(nil),              // 44: arrow.flight.protocol.sql.ActionEndTransactionRequest
-	(*ActionEndSavepointRequest)(nil),                // 45: arrow.flight.protocol.sql.ActionEndSavepointRequest
-	(*CommandStatementQuery)(nil),                    // 46: arrow.flight.protocol.sql.CommandStatementQuery
-	(*CommandStatementSubstraitPlan)(nil),            // 47: arrow.flight.protocol.sql.CommandStatementSubstraitPlan
-	(*TicketStatementQuery)(nil),                     // 48: arrow.flight.protocol.sql.TicketStatementQuery
-	(*CommandPreparedStatementQuery)(nil),            // 49: arrow.flight.protocol.sql.CommandPreparedStatementQuery
-	(*CommandStatementUpdate)(nil),                   // 50: arrow.flight.protocol.sql.CommandStatementUpdate
-	(*CommandPreparedStatementUpdate)(nil),           // 51: arrow.flight.protocol.sql.CommandPreparedStatementUpdate
-	(*DoPutUpdateResult)(nil),                        // 52: arrow.flight.protocol.sql.DoPutUpdateResult
-	(*ActionCancelQueryRequest)(nil),                 // 53: arrow.flight.protocol.sql.ActionCancelQueryRequest
-	(*ActionCancelQueryResult)(nil),                  // 54: arrow.flight.protocol.sql.ActionCancelQueryResult
-	(*descriptorpb.MessageOptions)(nil),              // 55: google.protobuf.MessageOptions
+	(SqlInfo)(0),                                    // 0: arrow.flight.protocol.sql.SqlInfo
+	(SqlSupportedTransaction)(0),                    // 1: arrow.flight.protocol.sql.SqlSupportedTransaction
+	(SqlSupportedCaseSensitivity)(0),                // 2: arrow.flight.protocol.sql.SqlSupportedCaseSensitivity
+	(SqlNullOrdering)(0),                            // 3: arrow.flight.protocol.sql.SqlNullOrdering
+	(SupportedSqlGrammar)(0),                        // 4: arrow.flight.protocol.sql.SupportedSqlGrammar
+	(SupportedAnsi92SqlGrammarLevel)(0),             // 5: arrow.flight.protocol.sql.SupportedAnsi92SqlGrammarLevel
+	(SqlOuterJoinsSupportLevel)(0),                  // 6: arrow.flight.protocol.sql.SqlOuterJoinsSupportLevel
+	(SqlSupportedGroupBy)(0),                        // 7: arrow.flight.protocol.sql.SqlSupportedGroupBy
+	(SqlSupportedElementActions)(0),                 // 8: arrow.flight.protocol.sql.SqlSupportedElementActions
+	(SqlSupportedPositionedCommands)(0),             // 9: arrow.flight.protocol.sql.SqlSupportedPositionedCommands
+	(SqlSupportedSubqueries)(0),                     // 10: arrow.flight.protocol.sql.SqlSupportedSubqueries
+	(SqlSupportedUnions)(0),                         // 11: arrow.flight.protocol.sql.SqlSupportedUnions
+	(SqlTransactionIsolationLevel)(0),               // 12: arrow.flight.protocol.sql.SqlTransactionIsolationLevel
+	(SqlSupportedTransactions)(0),                   // 13: arrow.flight.protocol.sql.SqlSupportedTransactions
+	(SqlSupportedResultSetType)(0),                  // 14: arrow.flight.protocol.sql.SqlSupportedResultSetType
+	(SqlSupportedResultSetConcurrency)(0),           // 15: arrow.flight.protocol.sql.SqlSupportedResultSetConcurrency
+	(SqlSupportsConvert)(0),                         // 16: arrow.flight.protocol.sql.SqlSupportsConvert
+	(XdbcDataType)(0),                               // 17: arrow.flight.protocol.sql.XdbcDataType
+	(XdbcDatetimeSubcode)(0),                        // 18: arrow.flight.protocol.sql.XdbcDatetimeSubcode
+	(Nullable)(0),                                   // 19: arrow.flight.protocol.sql.Nullable
+	(Searchable)(0),                                 // 20: arrow.flight.protocol.sql.Searchable
+	(UpdateDeleteRules)(0),                          // 21: arrow.flight.protocol.sql.UpdateDeleteRules
+	(ActionEndTransactionRequest_EndTransaction)(0), // 22: arrow.flight.protocol.sql.ActionEndTransactionRequest.EndTransaction
+	(ActionEndSavepointRequest_EndSavepoint)(0),     // 23: arrow.flight.protocol.sql.ActionEndSavepointRequest.EndSavepoint
+	(CommandStatementIngest_TableDefinitionOptions_TableNotExistOption)(0), // 24: arrow.flight.protocol.sql.CommandStatementIngest.TableDefinitionOptions.TableNotExistOption
+	(CommandStatementIngest_TableDefinitionOptions_TableExistsOption)(0),   // 25: arrow.flight.protocol.sql.CommandStatementIngest.TableDefinitionOptions.TableExistsOption
+	(ActionCancelQueryResult_CancelResult)(0),                              // 26: arrow.flight.protocol.sql.ActionCancelQueryResult.CancelResult
+	(*CommandGetSqlInfo)(nil),                                              // 27: arrow.flight.protocol.sql.CommandGetSqlInfo
+	(*CommandGetXdbcTypeInfo)(nil),                                         // 28: arrow.flight.protocol.sql.CommandGetXdbcTypeInfo
+	(*CommandGetCatalogs)(nil),                                             // 29: arrow.flight.protocol.sql.CommandGetCatalogs
+	(*CommandGetDbSchemas)(nil),                                            // 30: arrow.flight.protocol.sql.CommandGetDbSchemas
+	(*CommandGetTables)(nil),                                               // 31: arrow.flight.protocol.sql.CommandGetTables
+	(*CommandGetTableTypes)(nil),                                           // 32: arrow.flight.protocol.sql.CommandGetTableTypes
+	(*CommandGetPrimaryKeys)(nil),                                          // 33: arrow.flight.protocol.sql.CommandGetPrimaryKeys
+	(*CommandGetExportedKeys)(nil),                                         // 34: arrow.flight.protocol.sql.CommandGetExportedKeys
+	(*CommandGetImportedKeys)(nil),                                         // 35: arrow.flight.protocol.sql.CommandGetImportedKeys
+	(*CommandGetCrossReference)(nil),                                       // 36: arrow.flight.protocol.sql.CommandGetCrossReference
+	(*ActionCreatePreparedStatementRequest)(nil),                           // 37: arrow.flight.protocol.sql.ActionCreatePreparedStatementRequest
+	(*SubstraitPlan)(nil),                                                  // 38: arrow.flight.protocol.sql.SubstraitPlan
+	(*ActionCreatePreparedSubstraitPlanRequest)(nil),                       // 39: arrow.flight.protocol.sql.ActionCreatePreparedSubstraitPlanRequest
+	(*ActionCreatePreparedStatementResult)(nil),                            // 40: arrow.flight.protocol.sql.ActionCreatePreparedStatementResult
+	(*ActionClosePreparedStatementRequest)(nil),                            // 41: arrow.flight.protocol.sql.ActionClosePreparedStatementRequest
+	(*ActionBeginTransactionRequest)(nil),                                  // 42: arrow.flight.protocol.sql.ActionBeginTransactionRequest
+	(*ActionBeginSavepointRequest)(nil),                                    // 43: arrow.flight.protocol.sql.ActionBeginSavepointRequest
+	(*ActionBeginTransactionResult)(nil),                                   // 44: arrow.flight.protocol.sql.ActionBeginTransactionResult
+	(*ActionBeginSavepointResult)(nil),                                     // 45: arrow.flight.protocol.sql.ActionBeginSavepointResult
+	(*ActionEndTransactionRequest)(nil),                                    // 46: arrow.flight.protocol.sql.ActionEndTransactionRequest
+	(*ActionEndSavepointRequest)(nil),                                      // 47: arrow.flight.protocol.sql.ActionEndSavepointRequest
+	(*CommandStatementQuery)(nil),                                          // 48: arrow.flight.protocol.sql.CommandStatementQuery
+	(*CommandStatementSubstraitPlan)(nil),                                  // 49: arrow.flight.protocol.sql.CommandStatementSubstraitPlan
+	(*TicketStatementQuery)(nil),                                           // 50: arrow.flight.protocol.sql.TicketStatementQuery
+	(*CommandPreparedStatementQuery)(nil),                                  // 51: arrow.flight.protocol.sql.CommandPreparedStatementQuery
+	(*CommandStatementUpdate)(nil),                                         // 52: arrow.flight.protocol.sql.CommandStatementUpdate
+	(*CommandPreparedStatementUpdate)(nil),                                 // 53: arrow.flight.protocol.sql.CommandPreparedStatementUpdate
+	(*CommandStatementIngest)(nil),                                         // 54: arrow.flight.protocol.sql.CommandStatementIngest
+	(*DoPutUpdateResult)(nil),                                              // 55: arrow.flight.protocol.sql.DoPutUpdateResult
+	(*DoPutPreparedStatementResult)(nil),                                   // 56: arrow.flight.protocol.sql.DoPutPreparedStatementResult
+	(*ActionCancelQueryRequest)(nil),                                       // 57: arrow.flight.protocol.sql.ActionCancelQueryRequest
+	(*ActionCancelQueryResult)(nil),                                        // 58: arrow.flight.protocol.sql.ActionCancelQueryResult
+	(*CommandStatementIngest_TableDefinitionOptions)(nil),                  // 59: arrow.flight.protocol.sql.CommandStatementIngest.TableDefinitionOptions
+	nil,                                 // 60: arrow.flight.protocol.sql.CommandStatementIngest.OptionsEntry
+	(*descriptorpb.MessageOptions)(nil), // 61: google.protobuf.MessageOptions
 }
 var file_FlightSql_proto_depIdxs = []int32{
-	36, // 0: arrow.flight.protocol.sql.ActionCreatePreparedSubstraitPlanRequest.plan:type_name -> arrow.flight.protocol.sql.SubstraitPlan
+	38, // 0: arrow.flight.protocol.sql.ActionCreatePreparedSubstraitPlanRequest.plan:type_name -> arrow.flight.protocol.sql.SubstraitPlan
 	22, // 1: arrow.flight.protocol.sql.ActionEndTransactionRequest.action:type_name -> arrow.flight.protocol.sql.ActionEndTransactionRequest.EndTransaction
 	23, // 2: arrow.flight.protocol.sql.ActionEndSavepointRequest.action:type_name -> arrow.flight.protocol.sql.ActionEndSavepointRequest.EndSavepoint
-	36, // 3: arrow.flight.protocol.sql.CommandStatementSubstraitPlan.plan:type_name -> arrow.flight.protocol.sql.SubstraitPlan
-	24, // 4: arrow.flight.protocol.sql.ActionCancelQueryResult.result:type_name -> arrow.flight.protocol.sql.ActionCancelQueryResult.CancelResult
-	55, // 5: arrow.flight.protocol.sql.experimental:extendee -> google.protobuf.MessageOptions
-	6,  // [6:6] is the sub-list for method output_type
-	6,  // [6:6] is the sub-list for method input_type
-	6,  // [6:6] is the sub-list for extension type_name
-	5,  // [5:6] is the sub-list for extension extendee
-	0,  // [0:5] is the sub-list for field type_name
+	38, // 3: arrow.flight.protocol.sql.CommandStatementSubstraitPlan.plan:type_name -> arrow.flight.protocol.sql.SubstraitPlan
+	59, // 4: arrow.flight.protocol.sql.CommandStatementIngest.table_definition_options:type_name -> arrow.flight.protocol.sql.CommandStatementIngest.TableDefinitionOptions
+	60, // 5: arrow.flight.protocol.sql.CommandStatementIngest.options:type_name -> arrow.flight.protocol.sql.CommandStatementIngest.OptionsEntry
+	26, // 6: arrow.flight.protocol.sql.ActionCancelQueryResult.result:type_name -> arrow.flight.protocol.sql.ActionCancelQueryResult.CancelResult
+	24, // 7: arrow.flight.protocol.sql.CommandStatementIngest.TableDefinitionOptions.if_not_exist:type_name -> arrow.flight.protocol.sql.CommandStatementIngest.TableDefinitionOptions.TableNotExistOption
+	25, // 8: arrow.flight.protocol.sql.CommandStatementIngest.TableDefinitionOptions.if_exists:type_name -> arrow.flight.protocol.sql.CommandStatementIngest.TableDefinitionOptions.TableExistsOption
+	61, // 9: arrow.flight.protocol.sql.experimental:extendee -> google.protobuf.MessageOptions
+	10, // [10:10] is the sub-list for method output_type
+	10, // [10:10] is the sub-list for method input_type
+	10, // [10:10] is the sub-list for extension type_name
+	9,  // [9:10] is the sub-list for extension extendee
+	0,  // [0:9] is the sub-list for field type_name
 }
 
 func init() { file_FlightSql_proto_init() }
@@ -5532,7 +5973,7 @@ func file_FlightSql_proto_init() {
 			}
 		}
 		file_FlightSql_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DoPutUpdateResult); i {
+			switch v := v.(*CommandStatementIngest); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -5544,7 +5985,7 @@ func file_FlightSql_proto_init() {
 			}
 		}
 		file_FlightSql_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ActionCancelQueryRequest); i {
+			switch v := v.(*DoPutUpdateResult); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -5556,6 +5997,30 @@ func file_FlightSql_proto_init() {
 			}
 		}
 		file_FlightSql_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DoPutPreparedStatementResult); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_FlightSql_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ActionCancelQueryRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_FlightSql_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ActionCancelQueryResult); i {
 			case 0:
 				return &v.state
@@ -5567,6 +6032,18 @@ func file_FlightSql_proto_init() {
 				return nil
 			}
 		}
+		file_FlightSql_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CommandStatementIngest_TableDefinitionOptions); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	file_FlightSql_proto_msgTypes[1].OneofWrappers = []interface{}{}
 	file_FlightSql_proto_msgTypes[3].OneofWrappers = []interface{}{}
@@ -5580,13 +6057,15 @@ func file_FlightSql_proto_init() {
 	file_FlightSql_proto_msgTypes[21].OneofWrappers = []interface{}{}
 	file_FlightSql_proto_msgTypes[22].OneofWrappers = []interface{}{}
 	file_FlightSql_proto_msgTypes[25].OneofWrappers = []interface{}{}
+	file_FlightSql_proto_msgTypes[27].OneofWrappers = []interface{}{}
+	file_FlightSql_proto_msgTypes[29].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_FlightSql_proto_rawDesc,
-			NumEnums:      25,
-			NumMessages:   30,
+			NumEnums:      27,
+			NumMessages:   34,
 			NumExtensions: 1,
 			NumServices:   0,
 		},
diff --git a/go/arrow/flight/gen/flight/Flight_grpc.pb.go b/go/arrow/flight/gen/flight/Flight_grpc.pb.go
index 237cb1fe2dfb5..da5601b46ab95 100644
--- a/go/arrow/flight/gen/flight/Flight_grpc.pb.go
+++ b/go/arrow/flight/gen/flight/Flight_grpc.pb.go
@@ -1,13 +1,14 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0
-// - protoc             v4.25.2
+// - protoc             v4.25.3
 // source: Flight.proto
 
 package flight
 
 import (
 	context "context"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
diff --git a/go/arrow/flight/record_batch_reader.go b/go/arrow/flight/record_batch_reader.go
index f0741139fd510..8332fedd2dc0a 100644
--- a/go/arrow/flight/record_batch_reader.go
+++ b/go/arrow/flight/record_batch_reader.go
@@ -21,12 +21,13 @@ import (
 	"fmt"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/arrio"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/arrio"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
 )
 
 // DataStreamReader is an interface for receiving flight data messages on a stream
@@ -217,7 +218,7 @@ func StreamChunksFromReader(rdr array.RecordReader, ch chan<- StreamChunk) {
 	defer close(ch)
 	defer func() {
 		if err := recover(); err != nil {
-			ch <- StreamChunk{Err: fmt.Errorf("panic while reading: %s", err)}
+			ch <- StreamChunk{Err: utils.FormatRecoveredError("panic while reading", err)}
 		}
 	}()
 
@@ -243,7 +244,7 @@ func ConcatenateReaders(rdrs []array.RecordReader, ch chan<- StreamChunk) {
 		}
 
 		if err := recover(); err != nil {
-			ch <- StreamChunk{Err: fmt.Errorf("panic while reading: %s", err)}
+			ch <- StreamChunk{Err: utils.FormatRecoveredError("panic while reading", err)}
 		}
 	}()
 
diff --git a/go/arrow/flight/record_batch_writer.go b/go/arrow/flight/record_batch_writer.go
index 6fbec8d7bd9ce..ca0354e00bc99 100644
--- a/go/arrow/flight/record_batch_writer.go
+++ b/go/arrow/flight/record_batch_writer.go
@@ -19,9 +19,9 @@ package flight
 import (
 	"bytes"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 // DataStreamWriter is an interface that represents an Arrow Flight stream
diff --git a/go/arrow/flight/server.go b/go/arrow/flight/server.go
index 1ca5ecdd8ca60..fc74ba7aa4d6e 100644
--- a/go/arrow/flight/server.go
+++ b/go/arrow/flight/server.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/apache/arrow/go/v16/arrow/flight/gen/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight/gen/flight"
 	"google.golang.org/grpc"
 )
 
diff --git a/go/arrow/flight/server_example_test.go b/go/arrow/flight/server_example_test.go
index f6cb9ce59b99a..8386147c311aa 100644
--- a/go/arrow/flight/server_example_test.go
+++ b/go/arrow/flight/server_example_test.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/apache/arrow/go/v16/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/health"
diff --git a/go/arrow/flight/session/example_session_test.go b/go/arrow/flight/session/example_session_test.go
index 705a0b792ef97..7d92f27f2c840 100644
--- a/go/arrow/flight/session/example_session_test.go
+++ b/go/arrow/flight/session/example_session_test.go
@@ -19,9 +19,9 @@ package session_test
 import (
 	"log"
 
-	"github.com/apache/arrow/go/v16/arrow/flight"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql"
-	"github.com/apache/arrow/go/v16/arrow/flight/session"
+	"github.com/apache/arrow/go/v17/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql"
+	"github.com/apache/arrow/go/v17/arrow/flight/session"
 	"github.com/google/uuid"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
diff --git a/go/arrow/flight/session/session.go b/go/arrow/flight/session/session.go
index 598c393ecea9d..f09a2ed620d8f 100644
--- a/go/arrow/flight/session/session.go
+++ b/go/arrow/flight/session/session.go
@@ -36,7 +36,7 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/apache/arrow/go/v16/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
diff --git a/go/arrow/flight/session/stateful_session.go b/go/arrow/flight/session/stateful_session.go
index 5e3d9c72f5e5c..1a339c1bc4eb7 100644
--- a/go/arrow/flight/session/stateful_session.go
+++ b/go/arrow/flight/session/stateful_session.go
@@ -22,7 +22,7 @@ import (
 	"net/http"
 	"sync"
 
-	"github.com/apache/arrow/go/v16/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight"
 	"github.com/google/uuid"
 )
 
diff --git a/go/arrow/flight/session/stateless_session.go b/go/arrow/flight/session/stateless_session.go
index b57d78230a8e8..1e248a7a5e92d 100644
--- a/go/arrow/flight/session/stateless_session.go
+++ b/go/arrow/flight/session/stateless_session.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/apache/arrow/go/v16/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight"
 	"google.golang.org/protobuf/proto"
 )
 
diff --git a/go/arrow/float16/float16.go b/go/arrow/float16/float16.go
index e0192495eb971..f61db40ef498c 100644
--- a/go/arrow/float16/float16.go
+++ b/go/arrow/float16/float16.go
@@ -175,6 +175,8 @@ func (n Num) Signbit() bool { return (n.bits & 0x8000) != 0 }
 
 func (n Num) IsNaN() bool { return (n.bits & 0x7fff) > 0x7c00 }
 
+func (n Num) IsInf() bool { return (n.bits & 0x7c00) == 0x7c00 }
+
 func (n Num) IsZero() bool { return (n.bits & 0x7fff) == 0 }
 
 func (f Num) Uint16() uint16 { return f.bits }
diff --git a/go/arrow/gen-flatbuffers.go b/go/arrow/gen-flatbuffers.go
index 5c8eba4a24757..720016e0bf168 100644
--- a/go/arrow/gen-flatbuffers.go
+++ b/go/arrow/gen-flatbuffers.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build ignore
 // +build ignore
 
 package main
diff --git a/go/arrow/internal/arrdata/arrdata.go b/go/arrow/internal/arrdata/arrdata.go
index bb04bcdd373ef..9a049c762a364 100644
--- a/go/arrow/internal/arrdata/arrdata.go
+++ b/go/arrow/internal/arrdata/arrdata.go
@@ -21,14 +21,14 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/types"
 )
 
 var (
diff --git a/go/arrow/internal/arrdata/ioutil.go b/go/arrow/internal/arrdata/ioutil.go
index 5e09fe01c8af5..63fac86fde948 100644
--- a/go/arrow/internal/arrdata/ioutil.go
+++ b/go/arrow/internal/arrdata/ioutil.go
@@ -23,11 +23,11 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/internal/flatbuf"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/internal/flatbuf"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 // CheckArrowFile checks whether a given ARROW file contains the expected list of records.
diff --git a/go/arrow/internal/arrjson/arrjson.go b/go/arrow/internal/arrjson/arrjson.go
index fdc0d4e2f1cab..3f41f1b40a38e 100644
--- a/go/arrow/internal/arrjson/arrjson.go
+++ b/go/arrow/internal/arrjson/arrjson.go
@@ -26,16 +26,16 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/internal/dictutils"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/internal/dictutils"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 type Schema struct {
diff --git a/go/arrow/internal/arrjson/arrjson_test.go b/go/arrow/internal/arrjson/arrjson_test.go
index 6b5b414d49802..08a879e7ea3e3 100644
--- a/go/arrow/internal/arrjson/arrjson_test.go
+++ b/go/arrow/internal/arrjson/arrjson_test.go
@@ -22,9 +22,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/internal/arrdata"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/internal/arrdata"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/internal/arrjson/option.go b/go/arrow/internal/arrjson/option.go
index e310ce727aa80..ec53f1e8f43b9 100644
--- a/go/arrow/internal/arrjson/option.go
+++ b/go/arrow/internal/arrjson/option.go
@@ -17,8 +17,8 @@
 package arrjson
 
 import (
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 type config struct {
diff --git a/go/arrow/internal/arrjson/reader.go b/go/arrow/internal/arrjson/reader.go
index dff9534b782d4..8be44c001e180 100644
--- a/go/arrow/internal/arrjson/reader.go
+++ b/go/arrow/internal/arrjson/reader.go
@@ -20,11 +20,11 @@ import (
 	"io"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/arrio"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/internal/dictutils"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/arrio"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/internal/dictutils"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 type Reader struct {
diff --git a/go/arrow/internal/arrjson/writer.go b/go/arrow/internal/arrjson/writer.go
index 37ddcbec28921..1d1565885ba6b 100644
--- a/go/arrow/internal/arrjson/writer.go
+++ b/go/arrow/internal/arrjson/writer.go
@@ -20,11 +20,11 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/arrio"
-	"github.com/apache/arrow/go/v16/arrow/internal/dictutils"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/arrio"
+	"github.com/apache/arrow/go/v17/arrow/internal/dictutils"
+	"github.com/apache/arrow/go/v17/internal/json"
 )
 
 const (
diff --git a/go/arrow/internal/cdata_integration/entrypoints.go b/go/arrow/internal/cdata_integration/entrypoints.go
index 384bcb886d8c2..59e1db52b50e0 100644
--- a/go/arrow/internal/cdata_integration/entrypoints.go
+++ b/go/arrow/internal/cdata_integration/entrypoints.go
@@ -25,10 +25,11 @@ import (
 	"runtime"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/cdata"
-	"github.com/apache/arrow/go/v16/arrow/internal/arrjson"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/cdata"
+	"github.com/apache/arrow/go/v17/arrow/internal/arrjson"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
 )
 
 // #include <stdint.h>
@@ -59,7 +60,7 @@ func ArrowGo_FreeError(cError *C.char) {
 func handlePanic(err *error) {
 	if e := recover(); e != nil {
 		// Add a prefix while wrapping the panic-error
-		*err = fmt.Errorf("panic: %w", e.(error))
+		*err = utils.FormatRecoveredError("panic", e)
 	}
 }
 
diff --git a/go/arrow/internal/debug/assert_off.go b/go/arrow/internal/debug/assert_off.go
index 52b9a233169d2..1450ecc98a26e 100644
--- a/go/arrow/internal/debug/assert_off.go
+++ b/go/arrow/internal/debug/assert_off.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !assert
 // +build !assert
 
 package debug
diff --git a/go/arrow/internal/debug/assert_on.go b/go/arrow/internal/debug/assert_on.go
index 2aa5d6ace4cf0..4a57169b31358 100644
--- a/go/arrow/internal/debug/assert_on.go
+++ b/go/arrow/internal/debug/assert_on.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build assert
 // +build assert
 
 package debug
diff --git a/go/arrow/internal/debug/doc.go b/go/arrow/internal/debug/doc.go
index 3ee1783ca4bda..094e427a22e09 100644
--- a/go/arrow/internal/debug/doc.go
+++ b/go/arrow/internal/debug/doc.go
@@ -17,14 +17,12 @@
 /*
 Package debug provides APIs for conditional runtime assertions and debug logging.
 
-
-Using Assert
+# Using Assert
 
 To enable runtime assertions, build with the assert tag. When the assert tag is omitted,
 the code for the assertion will be omitted from the binary.
 
-
-Using Log
+# Using Log
 
 To enable runtime debug logs, build with the debug tag. When the debug tag is omitted,
 the code for logging will be omitted from the binary.
diff --git a/go/arrow/internal/debug/log_off.go b/go/arrow/internal/debug/log_off.go
index 48da8e1ee94c7..760a5cdc0dc01 100644
--- a/go/arrow/internal/debug/log_off.go
+++ b/go/arrow/internal/debug/log_off.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !debug
 // +build !debug
 
 package debug
diff --git a/go/arrow/internal/debug/log_on.go b/go/arrow/internal/debug/log_on.go
index 99d0c8ae33fef..2588e7d1069f0 100644
--- a/go/arrow/internal/debug/log_on.go
+++ b/go/arrow/internal/debug/log_on.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build debug
 // +build debug
 
 package debug
diff --git a/go/arrow/internal/debug/util.go b/go/arrow/internal/debug/util.go
index 7bd3d5389e669..ea4eba7fb5cb8 100644
--- a/go/arrow/internal/debug/util.go
+++ b/go/arrow/internal/debug/util.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build debug || assert
 // +build debug assert
 
 package debug
diff --git a/go/arrow/internal/dictutils/dict.go b/go/arrow/internal/dictutils/dict.go
index ae7fe4d5c88c6..76382a3dbcac2 100644
--- a/go/arrow/internal/dictutils/dict.go
+++ b/go/arrow/internal/dictutils/dict.go
@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"hash/maphash"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 type Kind int8
diff --git a/go/arrow/internal/dictutils/dict_test.go b/go/arrow/internal/dictutils/dict_test.go
index 86ce6709798c5..393ad5d9e2de7 100644
--- a/go/arrow/internal/dictutils/dict_test.go
+++ b/go/arrow/internal/dictutils/dict_test.go
@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/internal/dictutils"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/internal/dictutils"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func TestDictMemo(t *testing.T) {
diff --git a/go/arrow/internal/flatbuf/Binary.go b/go/arrow/internal/flatbuf/Binary.go
index e8018e74c4151..95e015595b548 100644
--- a/go/arrow/internal/flatbuf/Binary.go
+++ b/go/arrow/internal/flatbuf/Binary.go
@@ -22,7 +22,7 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Opaque binary data
+// / Opaque binary data
 type Binary struct {
 	_tab flatbuffers.Table
 }
diff --git a/go/arrow/internal/flatbuf/BinaryView.go b/go/arrow/internal/flatbuf/BinaryView.go
index 09ca5e7db9601..f6906674bdbc7 100644
--- a/go/arrow/internal/flatbuf/BinaryView.go
+++ b/go/arrow/internal/flatbuf/BinaryView.go
@@ -22,13 +22,13 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Logically the same as Binary, but the internal representation uses a view
-/// struct that contains the string length and either the string's entire data
-/// inline (for small strings) or an inlined prefix, an index of another buffer,
-/// and an offset pointing to a slice in that buffer (for non-small strings).
-///
-/// Since it uses a variable number of data buffers, each Field with this type
-/// must have a corresponding entry in `variadicBufferCounts`.
+// / Logically the same as Binary, but the internal representation uses a view
+// / struct that contains the string length and either the string's entire data
+// / inline (for small strings) or an inlined prefix, an index of another buffer,
+// / and an offset pointing to a slice in that buffer (for non-small strings).
+// /
+// / Since it uses a variable number of data buffers, each Field with this type
+// / must have a corresponding entry in `variadicBufferCounts`.
 type BinaryView struct {
 	_tab flatbuffers.Table
 }
diff --git a/go/arrow/internal/flatbuf/Block.go b/go/arrow/internal/flatbuf/Block.go
index 57a697b196883..8e33d3e641543 100644
--- a/go/arrow/internal/flatbuf/Block.go
+++ b/go/arrow/internal/flatbuf/Block.go
@@ -35,31 +35,34 @@ func (rcv *Block) Table() flatbuffers.Table {
 	return rcv._tab.Table
 }
 
-/// Index to the start of the RecordBlock (note this is past the Message header)
+// / Index to the start of the RecordBlock (note this is past the Message header)
 func (rcv *Block) Offset() int64 {
 	return rcv._tab.GetInt64(rcv._tab.Pos + flatbuffers.UOffsetT(0))
 }
-/// Index to the start of the RecordBlock (note this is past the Message header)
+
+// / Index to the start of the RecordBlock (note this is past the Message header)
 func (rcv *Block) MutateOffset(n int64) bool {
 	return rcv._tab.MutateInt64(rcv._tab.Pos+flatbuffers.UOffsetT(0), n)
 }
 
-/// Length of the metadata
+// / Length of the metadata
 func (rcv *Block) MetaDataLength() int32 {
 	return rcv._tab.GetInt32(rcv._tab.Pos + flatbuffers.UOffsetT(8))
 }
-/// Length of the metadata
+
+// / Length of the metadata
 func (rcv *Block) MutateMetaDataLength(n int32) bool {
 	return rcv._tab.MutateInt32(rcv._tab.Pos+flatbuffers.UOffsetT(8), n)
 }
 
-/// Length of the data (this is aligned so there can be a gap between this and
-/// the metadata).
+// / Length of the data (this is aligned so there can be a gap between this and
+// / the metadata).
 func (rcv *Block) BodyLength() int64 {
 	return rcv._tab.GetInt64(rcv._tab.Pos + flatbuffers.UOffsetT(16))
 }
-/// Length of the data (this is aligned so there can be a gap between this and
-/// the metadata).
+
+// / Length of the data (this is aligned so there can be a gap between this and
+// / the metadata).
 func (rcv *Block) MutateBodyLength(n int64) bool {
 	return rcv._tab.MutateInt64(rcv._tab.Pos+flatbuffers.UOffsetT(16), n)
 }
diff --git a/go/arrow/internal/flatbuf/BodyCompression.go b/go/arrow/internal/flatbuf/BodyCompression.go
index 6468e23135254..c23c29190216b 100644
--- a/go/arrow/internal/flatbuf/BodyCompression.go
+++ b/go/arrow/internal/flatbuf/BodyCompression.go
@@ -22,9 +22,9 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Optional compression for the memory buffers constituting IPC message
-/// bodies. Intended for use with RecordBatch but could be used for other
-/// message types
+// / Optional compression for the memory buffers constituting IPC message
+// / bodies. Intended for use with RecordBatch but could be used for other
+// / message types
 type BodyCompression struct {
 	_tab flatbuffers.Table
 }
@@ -45,8 +45,8 @@ func (rcv *BodyCompression) Table() flatbuffers.Table {
 	return rcv._tab
 }
 
-/// Compressor library.
-/// For LZ4_FRAME, each compressed buffer must consist of a single frame.
+// / Compressor library.
+// / For LZ4_FRAME, each compressed buffer must consist of a single frame.
 func (rcv *BodyCompression) Codec() CompressionType {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {
@@ -55,13 +55,13 @@ func (rcv *BodyCompression) Codec() CompressionType {
 	return 0
 }
 
-/// Compressor library.
-/// For LZ4_FRAME, each compressed buffer must consist of a single frame.
+// / Compressor library.
+// / For LZ4_FRAME, each compressed buffer must consist of a single frame.
 func (rcv *BodyCompression) MutateCodec(n CompressionType) bool {
 	return rcv._tab.MutateInt8Slot(4, int8(n))
 }
 
-/// Indicates the way the record batch body was compressed
+// / Indicates the way the record batch body was compressed
 func (rcv *BodyCompression) Method() BodyCompressionMethod {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
 	if o != 0 {
@@ -70,7 +70,7 @@ func (rcv *BodyCompression) Method() BodyCompressionMethod {
 	return 0
 }
 
-/// Indicates the way the record batch body was compressed
+// / Indicates the way the record batch body was compressed
 func (rcv *BodyCompression) MutateMethod(n BodyCompressionMethod) bool {
 	return rcv._tab.MutateInt8Slot(6, int8(n))
 }
diff --git a/go/arrow/internal/flatbuf/BodyCompressionMethod.go b/go/arrow/internal/flatbuf/BodyCompressionMethod.go
index 108ab3e07fba6..bb7234b3989b5 100644
--- a/go/arrow/internal/flatbuf/BodyCompressionMethod.go
+++ b/go/arrow/internal/flatbuf/BodyCompressionMethod.go
@@ -20,9 +20,9 @@ package flatbuf
 
 import "strconv"
 
-/// Provided for forward compatibility in case we need to support different
-/// strategies for compressing the IPC message body (like whole-body
-/// compression rather than buffer-level) in the future
+// / Provided for forward compatibility in case we need to support different
+// / strategies for compressing the IPC message body (like whole-body
+// / compression rather than buffer-level) in the future
 type BodyCompressionMethod int8
 
 const (
diff --git a/go/arrow/internal/flatbuf/Buffer.go b/go/arrow/internal/flatbuf/Buffer.go
index eba8d99b28e9b..e650e06a57026 100644
--- a/go/arrow/internal/flatbuf/Buffer.go
+++ b/go/arrow/internal/flatbuf/Buffer.go
@@ -22,8 +22,8 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// ----------------------------------------------------------------------
-/// A Buffer represents a single contiguous memory segment
+// / ----------------------------------------------------------------------
+// / A Buffer represents a single contiguous memory segment
 type Buffer struct {
 	_tab flatbuffers.Struct
 }
@@ -37,30 +37,32 @@ func (rcv *Buffer) Table() flatbuffers.Table {
 	return rcv._tab.Table
 }
 
-/// The relative offset into the shared memory page where the bytes for this
-/// buffer starts
+// / The relative offset into the shared memory page where the bytes for this
+// / buffer starts
 func (rcv *Buffer) Offset() int64 {
 	return rcv._tab.GetInt64(rcv._tab.Pos + flatbuffers.UOffsetT(0))
 }
-/// The relative offset into the shared memory page where the bytes for this
-/// buffer starts
+
+// / The relative offset into the shared memory page where the bytes for this
+// / buffer starts
 func (rcv *Buffer) MutateOffset(n int64) bool {
 	return rcv._tab.MutateInt64(rcv._tab.Pos+flatbuffers.UOffsetT(0), n)
 }
 
-/// The absolute length (in bytes) of the memory buffer. The memory is found
-/// from offset (inclusive) to offset + length (non-inclusive). When building
-/// messages using the encapsulated IPC message, padding bytes may be written
-/// after a buffer, but such padding bytes do not need to be accounted for in
-/// the size here.
+// / The absolute length (in bytes) of the memory buffer. The memory is found
+// / from offset (inclusive) to offset + length (non-inclusive). When building
+// / messages using the encapsulated IPC message, padding bytes may be written
+// / after a buffer, but such padding bytes do not need to be accounted for in
+// / the size here.
 func (rcv *Buffer) Length() int64 {
 	return rcv._tab.GetInt64(rcv._tab.Pos + flatbuffers.UOffsetT(8))
 }
-/// The absolute length (in bytes) of the memory buffer. The memory is found
-/// from offset (inclusive) to offset + length (non-inclusive). When building
-/// messages using the encapsulated IPC message, padding bytes may be written
-/// after a buffer, but such padding bytes do not need to be accounted for in
-/// the size here.
+
+// / The absolute length (in bytes) of the memory buffer. The memory is found
+// / from offset (inclusive) to offset + length (non-inclusive). When building
+// / messages using the encapsulated IPC message, padding bytes may be written
+// / after a buffer, but such padding bytes do not need to be accounted for in
+// / the size here.
 func (rcv *Buffer) MutateLength(n int64) bool {
 	return rcv._tab.MutateInt64(rcv._tab.Pos+flatbuffers.UOffsetT(8), n)
 }
diff --git a/go/arrow/internal/flatbuf/Date.go b/go/arrow/internal/flatbuf/Date.go
index 32983ec54ccc2..985a8f79955a4 100644
--- a/go/arrow/internal/flatbuf/Date.go
+++ b/go/arrow/internal/flatbuf/Date.go
@@ -22,12 +22,12 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Date is either a 32-bit or 64-bit signed integer type representing an
-/// elapsed time since UNIX epoch (1970-01-01), stored in either of two units:
-///
-/// * Milliseconds (64 bits) indicating UNIX time elapsed since the epoch (no
-///   leap seconds), where the values are evenly divisible by 86400000
-/// * Days (32 bits) since the UNIX epoch
+// / Date is either a 32-bit or 64-bit signed integer type representing an
+// / elapsed time since UNIX epoch (1970-01-01), stored in either of two units:
+// /
+// / * Milliseconds (64 bits) indicating UNIX time elapsed since the epoch (no
+// /   leap seconds), where the values are evenly divisible by 86400000
+// / * Days (32 bits) since the UNIX epoch
 type Date struct {
 	_tab flatbuffers.Table
 }
diff --git a/go/arrow/internal/flatbuf/Decimal.go b/go/arrow/internal/flatbuf/Decimal.go
index c9de254d1dcbd..2fc9d5ad6586c 100644
--- a/go/arrow/internal/flatbuf/Decimal.go
+++ b/go/arrow/internal/flatbuf/Decimal.go
@@ -22,10 +22,10 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Exact decimal value represented as an integer value in two's
-/// complement. Currently only 128-bit (16-byte) and 256-bit (32-byte) integers
-/// are used. The representation uses the endianness indicated
-/// in the Schema.
+// / Exact decimal value represented as an integer value in two's
+// / complement. Currently only 128-bit (16-byte) and 256-bit (32-byte) integers
+// / are used. The representation uses the endianness indicated
+// / in the Schema.
 type Decimal struct {
 	_tab flatbuffers.Table
 }
@@ -46,7 +46,7 @@ func (rcv *Decimal) Table() flatbuffers.Table {
 	return rcv._tab
 }
 
-/// Total number of decimal digits
+// / Total number of decimal digits
 func (rcv *Decimal) Precision() int32 {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {
@@ -55,12 +55,12 @@ func (rcv *Decimal) Precision() int32 {
 	return 0
 }
 
-/// Total number of decimal digits
+// / Total number of decimal digits
 func (rcv *Decimal) MutatePrecision(n int32) bool {
 	return rcv._tab.MutateInt32Slot(4, n)
 }
 
-/// Number of digits after the decimal point "."
+// / Number of digits after the decimal point "."
 func (rcv *Decimal) Scale() int32 {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
 	if o != 0 {
@@ -69,13 +69,13 @@ func (rcv *Decimal) Scale() int32 {
 	return 0
 }
 
-/// Number of digits after the decimal point "."
+// / Number of digits after the decimal point "."
 func (rcv *Decimal) MutateScale(n int32) bool {
 	return rcv._tab.MutateInt32Slot(6, n)
 }
 
-/// Number of bits per value. The only accepted widths are 128 and 256.
-/// We use bitWidth for consistency with Int::bitWidth.
+// / Number of bits per value. The only accepted widths are 128 and 256.
+// / We use bitWidth for consistency with Int::bitWidth.
 func (rcv *Decimal) BitWidth() int32 {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(8))
 	if o != 0 {
@@ -84,8 +84,8 @@ func (rcv *Decimal) BitWidth() int32 {
 	return 128
 }
 
-/// Number of bits per value. The only accepted widths are 128 and 256.
-/// We use bitWidth for consistency with Int::bitWidth.
+// / Number of bits per value. The only accepted widths are 128 and 256.
+// / We use bitWidth for consistency with Int::bitWidth.
 func (rcv *Decimal) MutateBitWidth(n int32) bool {
 	return rcv._tab.MutateInt32Slot(8, n)
 }
diff --git a/go/arrow/internal/flatbuf/DictionaryBatch.go b/go/arrow/internal/flatbuf/DictionaryBatch.go
index 25b5384e46a5c..999c5fda46384 100644
--- a/go/arrow/internal/flatbuf/DictionaryBatch.go
+++ b/go/arrow/internal/flatbuf/DictionaryBatch.go
@@ -22,12 +22,12 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// For sending dictionary encoding information. Any Field can be
-/// dictionary-encoded, but in this case none of its children may be
-/// dictionary-encoded.
-/// There is one vector / column per dictionary, but that vector / column
-/// may be spread across multiple dictionary batches by using the isDelta
-/// flag
+// / For sending dictionary encoding information. Any Field can be
+// / dictionary-encoded, but in this case none of its children may be
+// / dictionary-encoded.
+// / There is one vector / column per dictionary, but that vector / column
+// / may be spread across multiple dictionary batches by using the isDelta
+// / flag
 type DictionaryBatch struct {
 	_tab flatbuffers.Table
 }
@@ -73,9 +73,9 @@ func (rcv *DictionaryBatch) Data(obj *RecordBatch) *RecordBatch {
 	return nil
 }
 
-/// If isDelta is true the values in the dictionary are to be appended to a
-/// dictionary with the indicated id. If isDelta is false this dictionary
-/// should replace the existing dictionary.
+// / If isDelta is true the values in the dictionary are to be appended to a
+// / dictionary with the indicated id. If isDelta is false this dictionary
+// / should replace the existing dictionary.
 func (rcv *DictionaryBatch) IsDelta() bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(8))
 	if o != 0 {
@@ -84,9 +84,9 @@ func (rcv *DictionaryBatch) IsDelta() bool {
 	return false
 }
 
-/// If isDelta is true the values in the dictionary are to be appended to a
-/// dictionary with the indicated id. If isDelta is false this dictionary
-/// should replace the existing dictionary.
+// / If isDelta is true the values in the dictionary are to be appended to a
+// / dictionary with the indicated id. If isDelta is false this dictionary
+// / should replace the existing dictionary.
 func (rcv *DictionaryBatch) MutateIsDelta(n bool) bool {
 	return rcv._tab.MutateBoolSlot(8, n)
 }
diff --git a/go/arrow/internal/flatbuf/DictionaryEncoding.go b/go/arrow/internal/flatbuf/DictionaryEncoding.go
index a9b09530b2a52..44c3874219f1c 100644
--- a/go/arrow/internal/flatbuf/DictionaryEncoding.go
+++ b/go/arrow/internal/flatbuf/DictionaryEncoding.go
@@ -42,9 +42,9 @@ func (rcv *DictionaryEncoding) Table() flatbuffers.Table {
 	return rcv._tab
 }
 
-/// The known dictionary id in the application where this data is used. In
-/// the file or streaming formats, the dictionary ids are found in the
-/// DictionaryBatch messages
+// / The known dictionary id in the application where this data is used. In
+// / the file or streaming formats, the dictionary ids are found in the
+// / DictionaryBatch messages
 func (rcv *DictionaryEncoding) Id() int64 {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {
@@ -53,18 +53,18 @@ func (rcv *DictionaryEncoding) Id() int64 {
 	return 0
 }
 
-/// The known dictionary id in the application where this data is used. In
-/// the file or streaming formats, the dictionary ids are found in the
-/// DictionaryBatch messages
+// / The known dictionary id in the application where this data is used. In
+// / the file or streaming formats, the dictionary ids are found in the
+// / DictionaryBatch messages
 func (rcv *DictionaryEncoding) MutateId(n int64) bool {
 	return rcv._tab.MutateInt64Slot(4, n)
 }
 
-/// The dictionary indices are constrained to be non-negative integers. If
-/// this field is null, the indices must be signed int32. To maximize
-/// cross-language compatibility and performance, implementations are
-/// recommended to prefer signed integer types over unsigned integer types
-/// and to avoid uint64 indices unless they are required by an application.
+// / The dictionary indices are constrained to be non-negative integers. If
+// / this field is null, the indices must be signed int32. To maximize
+// / cross-language compatibility and performance, implementations are
+// / recommended to prefer signed integer types over unsigned integer types
+// / and to avoid uint64 indices unless they are required by an application.
 func (rcv *DictionaryEncoding) IndexType(obj *Int) *Int {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
 	if o != 0 {
@@ -78,15 +78,15 @@ func (rcv *DictionaryEncoding) IndexType(obj *Int) *Int {
 	return nil
 }
 
-/// The dictionary indices are constrained to be non-negative integers. If
-/// this field is null, the indices must be signed int32. To maximize
-/// cross-language compatibility and performance, implementations are
-/// recommended to prefer signed integer types over unsigned integer types
-/// and to avoid uint64 indices unless they are required by an application.
-/// By default, dictionaries are not ordered, or the order does not have
-/// semantic meaning. In some statistical, applications, dictionary-encoding
-/// is used to represent ordered categorical data, and we provide a way to
-/// preserve that metadata here
+// / The dictionary indices are constrained to be non-negative integers. If
+// / this field is null, the indices must be signed int32. To maximize
+// / cross-language compatibility and performance, implementations are
+// / recommended to prefer signed integer types over unsigned integer types
+// / and to avoid uint64 indices unless they are required by an application.
+// / By default, dictionaries are not ordered, or the order does not have
+// / semantic meaning. In some statistical, applications, dictionary-encoding
+// / is used to represent ordered categorical data, and we provide a way to
+// / preserve that metadata here
 func (rcv *DictionaryEncoding) IsOrdered() bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(8))
 	if o != 0 {
@@ -95,10 +95,10 @@ func (rcv *DictionaryEncoding) IsOrdered() bool {
 	return false
 }
 
-/// By default, dictionaries are not ordered, or the order does not have
-/// semantic meaning. In some statistical, applications, dictionary-encoding
-/// is used to represent ordered categorical data, and we provide a way to
-/// preserve that metadata here
+// / By default, dictionaries are not ordered, or the order does not have
+// / semantic meaning. In some statistical, applications, dictionary-encoding
+// / is used to represent ordered categorical data, and we provide a way to
+// / preserve that metadata here
 func (rcv *DictionaryEncoding) MutateIsOrdered(n bool) bool {
 	return rcv._tab.MutateBoolSlot(8, n)
 }
diff --git a/go/arrow/internal/flatbuf/DictionaryKind.go b/go/arrow/internal/flatbuf/DictionaryKind.go
index 126ba5f7f6bb0..6825100515612 100644
--- a/go/arrow/internal/flatbuf/DictionaryKind.go
+++ b/go/arrow/internal/flatbuf/DictionaryKind.go
@@ -20,11 +20,11 @@ package flatbuf
 
 import "strconv"
 
-/// ----------------------------------------------------------------------
-/// Dictionary encoding metadata
-/// Maintained for forwards compatibility, in the future
-/// Dictionaries might be explicit maps between integers and values
-/// allowing for non-contiguous index values
+// / ----------------------------------------------------------------------
+// / Dictionary encoding metadata
+// / Maintained for forwards compatibility, in the future
+// / Dictionaries might be explicit maps between integers and values
+// / allowing for non-contiguous index values
 type DictionaryKind int16
 
 const (
diff --git a/go/arrow/internal/flatbuf/Endianness.go b/go/arrow/internal/flatbuf/Endianness.go
index cefa2ff9c06ed..c9619b7b0d978 100644
--- a/go/arrow/internal/flatbuf/Endianness.go
+++ b/go/arrow/internal/flatbuf/Endianness.go
@@ -20,8 +20,8 @@ package flatbuf
 
 import "strconv"
 
-/// ----------------------------------------------------------------------
-/// Endianness of the platform producing the data
+// / ----------------------------------------------------------------------
+// / Endianness of the platform producing the data
 type Endianness int16
 
 const (
diff --git a/go/arrow/internal/flatbuf/Feature.go b/go/arrow/internal/flatbuf/Feature.go
index ae5a0398b607d..2204c440ed4fe 100644
--- a/go/arrow/internal/flatbuf/Feature.go
+++ b/go/arrow/internal/flatbuf/Feature.go
@@ -20,35 +20,35 @@ package flatbuf
 
 import "strconv"
 
-/// Represents Arrow Features that might not have full support
-/// within implementations. This is intended to be used in
-/// two scenarios:
-///  1.  A mechanism for readers of Arrow Streams
-///      and files to understand that the stream or file makes
-///      use of a feature that isn't supported or unknown to
-///      the implementation (and therefore can meet the Arrow
-///      forward compatibility guarantees).
-///  2.  A means of negotiating between a client and server
-///      what features a stream is allowed to use. The enums
-///      values here are intented to represent higher level
-///      features, additional details maybe negotiated
-///      with key-value pairs specific to the protocol.
-///
-/// Enums added to this list should be assigned power-of-two values
-/// to facilitate exchanging and comparing bitmaps for supported
-/// features.
+// / Represents Arrow Features that might not have full support
+// / within implementations. This is intended to be used in
+// / two scenarios:
+// /  1.  A mechanism for readers of Arrow Streams
+// /      and files to understand that the stream or file makes
+// /      use of a feature that isn't supported or unknown to
+// /      the implementation (and therefore can meet the Arrow
+// /      forward compatibility guarantees).
+// /  2.  A means of negotiating between a client and server
+// /      what features a stream is allowed to use. The enums
+// /      values here are intented to represent higher level
+// /      features, additional details maybe negotiated
+// /      with key-value pairs specific to the protocol.
+// /
+// / Enums added to this list should be assigned power-of-two values
+// / to facilitate exchanging and comparing bitmaps for supported
+// / features.
 type Feature int64
 
 const (
 	/// Needed to make flatbuffers happy.
-	FeatureUNUSED                 Feature = 0
+	FeatureUNUSED Feature = 0
 	/// The stream makes use of multiple full dictionaries with the
 	/// same ID and assumes clients implement dictionary replacement
 	/// correctly.
 	FeatureDICTIONARY_REPLACEMENT Feature = 1
 	/// The stream makes use of compressed bodies as described
 	/// in Message.fbs.
-	FeatureCOMPRESSED_BODY        Feature = 2
+	FeatureCOMPRESSED_BODY Feature = 2
 )
 
 var EnumNamesFeature = map[Feature]string{
diff --git a/go/arrow/internal/flatbuf/Field.go b/go/arrow/internal/flatbuf/Field.go
index c03cf2f878b6f..8aed29bc48137 100644
--- a/go/arrow/internal/flatbuf/Field.go
+++ b/go/arrow/internal/flatbuf/Field.go
@@ -22,9 +22,9 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// ----------------------------------------------------------------------
-/// A field represents a named column in a record / row batch or child of a
-/// nested type.
+// / ----------------------------------------------------------------------
+// / A field represents a named column in a record / row batch or child of a
+// / nested type.
 type Field struct {
 	_tab flatbuffers.Table
 }
@@ -45,7 +45,7 @@ func (rcv *Field) Table() flatbuffers.Table {
 	return rcv._tab
 }
 
-/// Name is not required, in i.e. a List
+// / Name is not required, in i.e. a List
 func (rcv *Field) Name() []byte {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {
@@ -54,8 +54,8 @@ func (rcv *Field) Name() []byte {
 	return nil
 }
 
-/// Name is not required, in i.e. a List
-/// Whether or not this field can contain nulls. Should be true in general.
+// / Name is not required, in i.e. a List
+// / Whether or not this field can contain nulls. Should be true in general.
 func (rcv *Field) Nullable() bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
 	if o != 0 {
@@ -64,7 +64,7 @@ func (rcv *Field) Nullable() bool {
 	return false
 }
 
-/// Whether or not this field can contain nulls. Should be true in general.
+// / Whether or not this field can contain nulls. Should be true in general.
 func (rcv *Field) MutateNullable(n bool) bool {
 	return rcv._tab.MutateBoolSlot(6, n)
 }
@@ -81,7 +81,7 @@ func (rcv *Field) MutateTypeType(n Type) bool {
 	return rcv._tab.MutateByteSlot(8, byte(n))
 }
 
-/// This is the type of the decoded value if the field is dictionary encoded.
+// / This is the type of the decoded value if the field is dictionary encoded.
 func (rcv *Field) Type(obj *flatbuffers.Table) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(10))
 	if o != 0 {
@@ -91,8 +91,8 @@ func (rcv *Field) Type(obj *flatbuffers.Table) bool {
 	return false
 }
 
-/// This is the type of the decoded value if the field is dictionary encoded.
-/// Present only if the field is dictionary encoded.
+// / This is the type of the decoded value if the field is dictionary encoded.
+// / Present only if the field is dictionary encoded.
 func (rcv *Field) Dictionary(obj *DictionaryEncoding) *DictionaryEncoding {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(12))
 	if o != 0 {
@@ -106,9 +106,9 @@ func (rcv *Field) Dictionary(obj *DictionaryEncoding) *DictionaryEncoding {
 	return nil
 }
 
-/// Present only if the field is dictionary encoded.
-/// children apply only to nested data types like Struct, List and Union. For
-/// primitive types children will have length 0.
+// / Present only if the field is dictionary encoded.
+// / children apply only to nested data types like Struct, List and Union. For
+// / primitive types children will have length 0.
 func (rcv *Field) Children(obj *Field, j int) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(14))
 	if o != 0 {
@@ -129,9 +129,9 @@ func (rcv *Field) ChildrenLength() int {
 	return 0
 }
 
-/// children apply only to nested data types like Struct, List and Union. For
-/// primitive types children will have length 0.
-/// User-defined metadata
+// / children apply only to nested data types like Struct, List and Union. For
+// / primitive types children will have length 0.
+// / User-defined metadata
 func (rcv *Field) CustomMetadata(obj *KeyValue, j int) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(16))
 	if o != 0 {
@@ -152,7 +152,7 @@ func (rcv *Field) CustomMetadataLength() int {
 	return 0
 }
 
-/// User-defined metadata
+// / User-defined metadata
 func FieldStart(builder *flatbuffers.Builder) {
 	builder.StartObject(7)
 }
diff --git a/go/arrow/internal/flatbuf/FieldNode.go b/go/arrow/internal/flatbuf/FieldNode.go
index 606b30bfebbd2..0e258a3d2cde8 100644
--- a/go/arrow/internal/flatbuf/FieldNode.go
+++ b/go/arrow/internal/flatbuf/FieldNode.go
@@ -22,15 +22,15 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// ----------------------------------------------------------------------
-/// Data structures for describing a table row batch (a collection of
-/// equal-length Arrow arrays)
-/// Metadata about a field at some level of a nested type tree (but not
-/// its children).
-///
-/// For example, a List<Int16> with values `[[1, 2, 3], null, [4], [5, 6], null]`
-/// would have {length: 5, null_count: 2} for its List node, and {length: 6,
-/// null_count: 0} for its Int16 node, as separate FieldNode structs
+// / ----------------------------------------------------------------------
+// / Data structures for describing a table row batch (a collection of
+// / equal-length Arrow arrays)
+// / Metadata about a field at some level of a nested type tree (but not
+// / its children).
+// /
+// / For example, a List<Int16> with values `[[1, 2, 3], null, [4], [5, 6], null]`
+// / would have {length: 5, null_count: 2} for its List node, and {length: 6,
+// / null_count: 0} for its Int16 node, as separate FieldNode structs
 type FieldNode struct {
 	_tab flatbuffers.Struct
 }
@@ -44,26 +44,28 @@ func (rcv *FieldNode) Table() flatbuffers.Table {
 	return rcv._tab.Table
 }
 
-/// The number of value slots in the Arrow array at this level of a nested
-/// tree
+// / The number of value slots in the Arrow array at this level of a nested
+// / tree
 func (rcv *FieldNode) Length() int64 {
 	return rcv._tab.GetInt64(rcv._tab.Pos + flatbuffers.UOffsetT(0))
 }
-/// The number of value slots in the Arrow array at this level of a nested
-/// tree
+
+// / The number of value slots in the Arrow array at this level of a nested
+// / tree
 func (rcv *FieldNode) MutateLength(n int64) bool {
 	return rcv._tab.MutateInt64(rcv._tab.Pos+flatbuffers.UOffsetT(0), n)
 }
 
-/// The number of observed nulls. Fields with null_count == 0 may choose not
-/// to write their physical validity bitmap out as a materialized buffer,
-/// instead setting the length of the bitmap buffer to 0.
+// / The number of observed nulls. Fields with null_count == 0 may choose not
+// / to write their physical validity bitmap out as a materialized buffer,
+// / instead setting the length of the bitmap buffer to 0.
 func (rcv *FieldNode) NullCount() int64 {
 	return rcv._tab.GetInt64(rcv._tab.Pos + flatbuffers.UOffsetT(8))
 }
-/// The number of observed nulls. Fields with null_count == 0 may choose not
-/// to write their physical validity bitmap out as a materialized buffer,
-/// instead setting the length of the bitmap buffer to 0.
+
+// / The number of observed nulls. Fields with null_count == 0 may choose not
+// / to write their physical validity bitmap out as a materialized buffer,
+// / instead setting the length of the bitmap buffer to 0.
 func (rcv *FieldNode) MutateNullCount(n int64) bool {
 	return rcv._tab.MutateInt64(rcv._tab.Pos+flatbuffers.UOffsetT(8), n)
 }
diff --git a/go/arrow/internal/flatbuf/FixedSizeBinary.go b/go/arrow/internal/flatbuf/FixedSizeBinary.go
index 4e660d5077f71..2725dfb90b966 100644
--- a/go/arrow/internal/flatbuf/FixedSizeBinary.go
+++ b/go/arrow/internal/flatbuf/FixedSizeBinary.go
@@ -42,7 +42,7 @@ func (rcv *FixedSizeBinary) Table() flatbuffers.Table {
 	return rcv._tab
 }
 
-/// Number of bytes per value
+// / Number of bytes per value
 func (rcv *FixedSizeBinary) ByteWidth() int32 {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {
@@ -51,7 +51,7 @@ func (rcv *FixedSizeBinary) ByteWidth() int32 {
 	return 0
 }
 
-/// Number of bytes per value
+// / Number of bytes per value
 func (rcv *FixedSizeBinary) MutateByteWidth(n int32) bool {
 	return rcv._tab.MutateInt32Slot(4, n)
 }
diff --git a/go/arrow/internal/flatbuf/FixedSizeList.go b/go/arrow/internal/flatbuf/FixedSizeList.go
index dabf5cc8581da..534ca27f2fe21 100644
--- a/go/arrow/internal/flatbuf/FixedSizeList.go
+++ b/go/arrow/internal/flatbuf/FixedSizeList.go
@@ -42,7 +42,7 @@ func (rcv *FixedSizeList) Table() flatbuffers.Table {
 	return rcv._tab
 }
 
-/// Number of list items per value
+// / Number of list items per value
 func (rcv *FixedSizeList) ListSize() int32 {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {
@@ -51,7 +51,7 @@ func (rcv *FixedSizeList) ListSize() int32 {
 	return 0
 }
 
-/// Number of list items per value
+// / Number of list items per value
 func (rcv *FixedSizeList) MutateListSize(n int32) bool {
 	return rcv._tab.MutateInt32Slot(4, n)
 }
diff --git a/go/arrow/internal/flatbuf/Footer.go b/go/arrow/internal/flatbuf/Footer.go
index 65b0ff0954614..d65af41e7f62e 100644
--- a/go/arrow/internal/flatbuf/Footer.go
+++ b/go/arrow/internal/flatbuf/Footer.go
@@ -22,9 +22,9 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// ----------------------------------------------------------------------
-/// Arrow File metadata
-///
+// / ----------------------------------------------------------------------
+// / Arrow File metadata
+// /
 type Footer struct {
 	_tab flatbuffers.Table
 }
@@ -108,7 +108,7 @@ func (rcv *Footer) RecordBatchesLength() int {
 	return 0
 }
 
-/// User-defined metadata
+// / User-defined metadata
 func (rcv *Footer) CustomMetadata(obj *KeyValue, j int) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(12))
 	if o != 0 {
@@ -129,7 +129,7 @@ func (rcv *Footer) CustomMetadataLength() int {
 	return 0
 }
 
-/// User-defined metadata
+// / User-defined metadata
 func FooterStart(builder *flatbuffers.Builder) {
 	builder.StartObject(5)
 }
diff --git a/go/arrow/internal/flatbuf/KeyValue.go b/go/arrow/internal/flatbuf/KeyValue.go
index c1b85318ecd5f..0cd5dc62923e3 100644
--- a/go/arrow/internal/flatbuf/KeyValue.go
+++ b/go/arrow/internal/flatbuf/KeyValue.go
@@ -22,9 +22,9 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// ----------------------------------------------------------------------
-/// user defined key value pairs to add custom metadata to arrow
-/// key namespacing is the responsibility of the user
+// / ----------------------------------------------------------------------
+// / user defined key value pairs to add custom metadata to arrow
+// / key namespacing is the responsibility of the user
 type KeyValue struct {
 	_tab flatbuffers.Table
 }
diff --git a/go/arrow/internal/flatbuf/LargeBinary.go b/go/arrow/internal/flatbuf/LargeBinary.go
index 2c3befcc16fb9..b25ecc41aff51 100644
--- a/go/arrow/internal/flatbuf/LargeBinary.go
+++ b/go/arrow/internal/flatbuf/LargeBinary.go
@@ -22,8 +22,8 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Same as Binary, but with 64-bit offsets, allowing to represent
-/// extremely large data values.
+// / Same as Binary, but with 64-bit offsets, allowing to represent
+// / extremely large data values.
 type LargeBinary struct {
 	_tab flatbuffers.Table
 }
diff --git a/go/arrow/internal/flatbuf/LargeList.go b/go/arrow/internal/flatbuf/LargeList.go
index 92f2284587445..d8bfb9c07df76 100644
--- a/go/arrow/internal/flatbuf/LargeList.go
+++ b/go/arrow/internal/flatbuf/LargeList.go
@@ -22,8 +22,8 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Same as List, but with 64-bit offsets, allowing to represent
-/// extremely large data values.
+// / Same as List, but with 64-bit offsets, allowing to represent
+// / extremely large data values.
 type LargeList struct {
 	_tab flatbuffers.Table
 }
diff --git a/go/arrow/internal/flatbuf/LargeListView.go b/go/arrow/internal/flatbuf/LargeListView.go
index 5b1df149cd1e2..4608c1dec53d8 100644
--- a/go/arrow/internal/flatbuf/LargeListView.go
+++ b/go/arrow/internal/flatbuf/LargeListView.go
@@ -22,8 +22,8 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Same as ListView, but with 64-bit offsets and sizes, allowing to represent
-/// extremely large data values.
+// / Same as ListView, but with 64-bit offsets and sizes, allowing to represent
+// / extremely large data values.
 type LargeListView struct {
 	_tab flatbuffers.Table
 }
diff --git a/go/arrow/internal/flatbuf/LargeUtf8.go b/go/arrow/internal/flatbuf/LargeUtf8.go
index e78b33e110066..4478fed856e6d 100644
--- a/go/arrow/internal/flatbuf/LargeUtf8.go
+++ b/go/arrow/internal/flatbuf/LargeUtf8.go
@@ -22,8 +22,8 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Same as Utf8, but with 64-bit offsets, allowing to represent
-/// extremely large data values.
+// / Same as Utf8, but with 64-bit offsets, allowing to represent
+// / extremely large data values.
 type LargeUtf8 struct {
 	_tab flatbuffers.Table
 }
diff --git a/go/arrow/internal/flatbuf/ListView.go b/go/arrow/internal/flatbuf/ListView.go
index 46b1e0b3cbf2f..cde43cf5b6893 100644
--- a/go/arrow/internal/flatbuf/ListView.go
+++ b/go/arrow/internal/flatbuf/ListView.go
@@ -22,9 +22,9 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Represents the same logical types that List can, but contains offsets and
-/// sizes allowing for writes in any order and sharing of child values among
-/// list values.
+// / Represents the same logical types that List can, but contains offsets and
+// / sizes allowing for writes in any order and sharing of child values among
+// / list values.
 type ListView struct {
 	_tab flatbuffers.Table
 }
diff --git a/go/arrow/internal/flatbuf/Map.go b/go/arrow/internal/flatbuf/Map.go
index 8802aba1ebd39..d4871e558199f 100644
--- a/go/arrow/internal/flatbuf/Map.go
+++ b/go/arrow/internal/flatbuf/Map.go
@@ -22,31 +22,31 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// A Map is a logical nested type that is represented as
-///
-/// List<entries: Struct<key: K, value: V>>
-///
-/// In this layout, the keys and values are each respectively contiguous. We do
-/// not constrain the key and value types, so the application is responsible
-/// for ensuring that the keys are hashable and unique. Whether the keys are sorted
-/// may be set in the metadata for this field.
-///
-/// In a field with Map type, the field has a child Struct field, which then
-/// has two children: key type and the second the value type. The names of the
-/// child fields may be respectively "entries", "key", and "value", but this is
-/// not enforced.
-///
-/// Map
-/// ```text
-///   - child[0] entries: Struct
-///     - child[0] key: K
-///     - child[1] value: V
-/// ```
-/// Neither the "entries" field nor the "key" field may be nullable.
-///
-/// The metadata is structured so that Arrow systems without special handling
-/// for Map can make Map an alias for List. The "layout" attribute for the Map
-/// field must have the same contents as a List.
+// / A Map is a logical nested type that is represented as
+// /
+// / List<entries: Struct<key: K, value: V>>
+// /
+// / In this layout, the keys and values are each respectively contiguous. We do
+// / not constrain the key and value types, so the application is responsible
+// / for ensuring that the keys are hashable and unique. Whether the keys are sorted
+// / may be set in the metadata for this field.
+// /
+// / In a field with Map type, the field has a child Struct field, which then
+// / has two children: key type and the second the value type. The names of the
+// / child fields may be respectively "entries", "key", and "value", but this is
+// / not enforced.
+// /
+// / Map
+// / ```text
+// /   - child[0] entries: Struct
+// /     - child[0] key: K
+// /     - child[1] value: V
+// / ```
+// / Neither the "entries" field nor the "key" field may be nullable.
+// /
+// / The metadata is structured so that Arrow systems without special handling
+// / for Map can make Map an alias for List. The "layout" attribute for the Map
+// / field must have the same contents as a List.
 type Map struct {
 	_tab flatbuffers.Table
 }
@@ -67,7 +67,7 @@ func (rcv *Map) Table() flatbuffers.Table {
 	return rcv._tab
 }
 
-/// Set to true if the keys within each value are sorted
+// / Set to true if the keys within each value are sorted
 func (rcv *Map) KeysSorted() bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {
@@ -76,7 +76,7 @@ func (rcv *Map) KeysSorted() bool {
 	return false
 }
 
-/// Set to true if the keys within each value are sorted
+// / Set to true if the keys within each value are sorted
 func (rcv *Map) MutateKeysSorted(n bool) bool {
 	return rcv._tab.MutateBoolSlot(4, n)
 }
diff --git a/go/arrow/internal/flatbuf/MessageHeader.go b/go/arrow/internal/flatbuf/MessageHeader.go
index c12fc1058119d..d7f9907c7a7a2 100644
--- a/go/arrow/internal/flatbuf/MessageHeader.go
+++ b/go/arrow/internal/flatbuf/MessageHeader.go
@@ -20,14 +20,14 @@ package flatbuf
 
 import "strconv"
 
-/// ----------------------------------------------------------------------
-/// The root Message type
-/// This union enables us to easily send different message types without
-/// redundant storage, and in the future we can easily add new message types.
-///
-/// Arrow implementations do not need to implement all of the message types,
-/// which may include experimental metadata types. For maximum compatibility,
-/// it is best to send data using RecordBatch
+// / ----------------------------------------------------------------------
+// / The root Message type
+// / This union enables us to easily send different message types without
+// / redundant storage, and in the future we can easily add new message types.
+// /
+// / Arrow implementations do not need to implement all of the message types,
+// / which may include experimental metadata types. For maximum compatibility,
+// / it is best to send data using RecordBatch
 type MessageHeader byte
 
 const (
diff --git a/go/arrow/internal/flatbuf/Null.go b/go/arrow/internal/flatbuf/Null.go
index 3c3eb4bda3619..3b93a1b6ee965 100644
--- a/go/arrow/internal/flatbuf/Null.go
+++ b/go/arrow/internal/flatbuf/Null.go
@@ -22,7 +22,7 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// These are stored in the flatbuffer in the Type union below
+// / These are stored in the flatbuffer in the Type union below
 type Null struct {
 	_tab flatbuffers.Table
 }
diff --git a/go/arrow/internal/flatbuf/RecordBatch.go b/go/arrow/internal/flatbuf/RecordBatch.go
index c50f4a6e868ea..52c72a8a20ae4 100644
--- a/go/arrow/internal/flatbuf/RecordBatch.go
+++ b/go/arrow/internal/flatbuf/RecordBatch.go
@@ -22,9 +22,9 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// A data header describing the shared memory layout of a "record" or "row"
-/// batch. Some systems call this a "row batch" internally and others a "record
-/// batch".
+// / A data header describing the shared memory layout of a "record" or "row"
+// / batch. Some systems call this a "row batch" internally and others a "record
+// / batch".
 type RecordBatch struct {
 	_tab flatbuffers.Table
 }
@@ -45,8 +45,8 @@ func (rcv *RecordBatch) Table() flatbuffers.Table {
 	return rcv._tab
 }
 
-/// number of records / rows. The arrays in the batch should all have this
-/// length
+// / number of records / rows. The arrays in the batch should all have this
+// / length
 func (rcv *RecordBatch) Length() int64 {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {
@@ -55,13 +55,13 @@ func (rcv *RecordBatch) Length() int64 {
 	return 0
 }
 
-/// number of records / rows. The arrays in the batch should all have this
-/// length
+// / number of records / rows. The arrays in the batch should all have this
+// / length
 func (rcv *RecordBatch) MutateLength(n int64) bool {
 	return rcv._tab.MutateInt64Slot(4, n)
 }
 
-/// Nodes correspond to the pre-ordered flattened logical schema
+// / Nodes correspond to the pre-ordered flattened logical schema
 func (rcv *RecordBatch) Nodes(obj *FieldNode, j int) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
 	if o != 0 {
@@ -81,13 +81,13 @@ func (rcv *RecordBatch) NodesLength() int {
 	return 0
 }
 
-/// Nodes correspond to the pre-ordered flattened logical schema
-/// Buffers correspond to the pre-ordered flattened buffer tree
-///
-/// The number of buffers appended to this list depends on the schema. For
-/// example, most primitive arrays will have 2 buffers, 1 for the validity
-/// bitmap and 1 for the values. For struct arrays, there will only be a
-/// single buffer for the validity (nulls) bitmap
+// / Nodes correspond to the pre-ordered flattened logical schema
+// / Buffers correspond to the pre-ordered flattened buffer tree
+// /
+// / The number of buffers appended to this list depends on the schema. For
+// / example, most primitive arrays will have 2 buffers, 1 for the validity
+// / bitmap and 1 for the values. For struct arrays, there will only be a
+// / single buffer for the validity (nulls) bitmap
 func (rcv *RecordBatch) Buffers(obj *Buffer, j int) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(8))
 	if o != 0 {
@@ -107,13 +107,13 @@ func (rcv *RecordBatch) BuffersLength() int {
 	return 0
 }
 
-/// Buffers correspond to the pre-ordered flattened buffer tree
-///
-/// The number of buffers appended to this list depends on the schema. For
-/// example, most primitive arrays will have 2 buffers, 1 for the validity
-/// bitmap and 1 for the values. For struct arrays, there will only be a
-/// single buffer for the validity (nulls) bitmap
-/// Optional compression of the message body
+// / Buffers correspond to the pre-ordered flattened buffer tree
+// /
+// / The number of buffers appended to this list depends on the schema. For
+// / example, most primitive arrays will have 2 buffers, 1 for the validity
+// / bitmap and 1 for the values. For struct arrays, there will only be a
+// / single buffer for the validity (nulls) bitmap
+// / Optional compression of the message body
 func (rcv *RecordBatch) Compression(obj *BodyCompression) *BodyCompression {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(10))
 	if o != 0 {
@@ -127,21 +127,21 @@ func (rcv *RecordBatch) Compression(obj *BodyCompression) *BodyCompression {
 	return nil
 }
 
-/// Optional compression of the message body
-/// Some types such as Utf8View are represented using a variable number of buffers.
-/// For each such Field in the pre-ordered flattened logical schema, there will be
-/// an entry in variadicBufferCounts to indicate the number of number of variadic
-/// buffers which belong to that Field in the current RecordBatch.
-///
-/// For example, the schema
-///     col1: Struct<alpha: Int32, beta: BinaryView, gamma: Float64>
-///     col2: Utf8View
-/// contains two Fields with variadic buffers so variadicBufferCounts will have
-/// two entries, the first counting the variadic buffers of `col1.beta` and the
-/// second counting `col2`'s.
-///
-/// This field may be omitted if and only if the schema contains no Fields with
-/// a variable number of buffers, such as BinaryView and Utf8View.
+// / Optional compression of the message body
+// / Some types such as Utf8View are represented using a variable number of buffers.
+// / For each such Field in the pre-ordered flattened logical schema, there will be
+// / an entry in variadicBufferCounts to indicate the number of number of variadic
+// / buffers which belong to that Field in the current RecordBatch.
+// /
+// / For example, the schema
+// /     col1: Struct<alpha: Int32, beta: BinaryView, gamma: Float64>
+// /     col2: Utf8View
+// / contains two Fields with variadic buffers so variadicBufferCounts will have
+// / two entries, the first counting the variadic buffers of `col1.beta` and the
+// / second counting `col2`'s.
+// /
+// / This field may be omitted if and only if the schema contains no Fields with
+// / a variable number of buffers, such as BinaryView and Utf8View.
 func (rcv *RecordBatch) VariadicBufferCounts(j int) int64 {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(12))
 	if o != 0 {
@@ -159,20 +159,20 @@ func (rcv *RecordBatch) VariadicBufferCountsLength() int {
 	return 0
 }
 
-/// Some types such as Utf8View are represented using a variable number of buffers.
-/// For each such Field in the pre-ordered flattened logical schema, there will be
-/// an entry in variadicBufferCounts to indicate the number of number of variadic
-/// buffers which belong to that Field in the current RecordBatch.
-///
-/// For example, the schema
-///     col1: Struct<alpha: Int32, beta: BinaryView, gamma: Float64>
-///     col2: Utf8View
-/// contains two Fields with variadic buffers so variadicBufferCounts will have
-/// two entries, the first counting the variadic buffers of `col1.beta` and the
-/// second counting `col2`'s.
-///
-/// This field may be omitted if and only if the schema contains no Fields with
-/// a variable number of buffers, such as BinaryView and Utf8View.
+// / Some types such as Utf8View are represented using a variable number of buffers.
+// / For each such Field in the pre-ordered flattened logical schema, there will be
+// / an entry in variadicBufferCounts to indicate the number of number of variadic
+// / buffers which belong to that Field in the current RecordBatch.
+// /
+// / For example, the schema
+// /     col1: Struct<alpha: Int32, beta: BinaryView, gamma: Float64>
+// /     col2: Utf8View
+// / contains two Fields with variadic buffers so variadicBufferCounts will have
+// / two entries, the first counting the variadic buffers of `col1.beta` and the
+// / second counting `col2`'s.
+// /
+// / This field may be omitted if and only if the schema contains no Fields with
+// / a variable number of buffers, such as BinaryView and Utf8View.
 func (rcv *RecordBatch) MutateVariadicBufferCounts(j int, n int64) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(12))
 	if o != 0 {
diff --git a/go/arrow/internal/flatbuf/RunEndEncoded.go b/go/arrow/internal/flatbuf/RunEndEncoded.go
index fa414c1bf0eed..b88460b2e22bc 100644
--- a/go/arrow/internal/flatbuf/RunEndEncoded.go
+++ b/go/arrow/internal/flatbuf/RunEndEncoded.go
@@ -22,11 +22,11 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Contains two child arrays, run_ends and values.
-/// The run_ends child array must be a 16/32/64-bit integer array
-/// which encodes the indices at which the run with the value in 
-/// each corresponding index in the values child array ends.
-/// Like list/struct types, the value array can be of any type.
+// / Contains two child arrays, run_ends and values.
+// / The run_ends child array must be a 16/32/64-bit integer array
+// / which encodes the indices at which the run with the value in
+// / each corresponding index in the values child array ends.
+// / Like list/struct types, the value array can be of any type.
 type RunEndEncoded struct {
 	_tab flatbuffers.Table
 }
diff --git a/go/arrow/internal/flatbuf/Schema.go b/go/arrow/internal/flatbuf/Schema.go
index 4ee5ecc9e5e40..ae5b248a766e3 100644
--- a/go/arrow/internal/flatbuf/Schema.go
+++ b/go/arrow/internal/flatbuf/Schema.go
@@ -22,8 +22,8 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// ----------------------------------------------------------------------
-/// A Schema describes the columns in a row batch
+// / ----------------------------------------------------------------------
+// / A Schema describes the columns in a row batch
 type Schema struct {
 	_tab flatbuffers.Table
 }
@@ -44,9 +44,9 @@ func (rcv *Schema) Table() flatbuffers.Table {
 	return rcv._tab
 }
 
-/// endianness of the buffer
-/// it is Little Endian by default
-/// if endianness doesn't match the underlying system then the vectors need to be converted
+// / endianness of the buffer
+// / it is Little Endian by default
+// / if endianness doesn't match the underlying system then the vectors need to be converted
 func (rcv *Schema) Endianness() Endianness {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {
@@ -55,9 +55,9 @@ func (rcv *Schema) Endianness() Endianness {
 	return 0
 }
 
-/// endianness of the buffer
-/// it is Little Endian by default
-/// if endianness doesn't match the underlying system then the vectors need to be converted
+// / endianness of the buffer
+// / it is Little Endian by default
+// / if endianness doesn't match the underlying system then the vectors need to be converted
 func (rcv *Schema) MutateEndianness(n Endianness) bool {
 	return rcv._tab.MutateInt16Slot(4, int16(n))
 }
@@ -102,7 +102,7 @@ func (rcv *Schema) CustomMetadataLength() int {
 	return 0
 }
 
-/// Features used in the stream/file.
+// / Features used in the stream/file.
 func (rcv *Schema) Features(j int) Feature {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(10))
 	if o != 0 {
@@ -120,7 +120,7 @@ func (rcv *Schema) FeaturesLength() int {
 	return 0
 }
 
-/// Features used in the stream/file.
+// / Features used in the stream/file.
 func (rcv *Schema) MutateFeatures(j int, n Feature) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(10))
 	if o != 0 {
diff --git a/go/arrow/internal/flatbuf/SparseMatrixIndexCSR.go b/go/arrow/internal/flatbuf/SparseMatrixIndexCSR.go
index de8217650b281..2477af100355c 100644
--- a/go/arrow/internal/flatbuf/SparseMatrixIndexCSR.go
+++ b/go/arrow/internal/flatbuf/SparseMatrixIndexCSR.go
@@ -22,7 +22,7 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Compressed Sparse Row format, that is matrix-specific.
+// / Compressed Sparse Row format, that is matrix-specific.
 type SparseMatrixIndexCSR struct {
 	_tab flatbuffers.Table
 }
@@ -43,7 +43,7 @@ func (rcv *SparseMatrixIndexCSR) Table() flatbuffers.Table {
 	return rcv._tab
 }
 
-/// The type of values in indptrBuffer
+// / The type of values in indptrBuffer
 func (rcv *SparseMatrixIndexCSR) IndptrType(obj *Int) *Int {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {
@@ -57,29 +57,29 @@ func (rcv *SparseMatrixIndexCSR) IndptrType(obj *Int) *Int {
 	return nil
 }
 
-/// The type of values in indptrBuffer
-/// indptrBuffer stores the location and size of indptr array that
-/// represents the range of the rows.
-/// The i-th row spans from indptr[i] to indptr[i+1] in the data.
-/// The length of this array is 1 + (the number of rows), and the type
-/// of index value is long.
-///
-/// For example, let X be the following 6x4 matrix:
-///
-///   X := [[0, 1, 2, 0],
-///         [0, 0, 3, 0],
-///         [0, 4, 0, 5],
-///         [0, 0, 0, 0],
-///         [6, 0, 7, 8],
-///         [0, 9, 0, 0]].
-///
-/// The array of non-zero values in X is:
-///
-///   values(X) = [1, 2, 3, 4, 5, 6, 7, 8, 9].
-///
-/// And the indptr of X is:
-///
-///   indptr(X) = [0, 2, 3, 5, 5, 8, 10].
+// / The type of values in indptrBuffer
+// / indptrBuffer stores the location and size of indptr array that
+// / represents the range of the rows.
+// / The i-th row spans from indptr[i] to indptr[i+1] in the data.
+// / The length of this array is 1 + (the number of rows), and the type
+// / of index value is long.
+// /
+// / For example, let X be the following 6x4 matrix:
+// /
+// /   X := [[0, 1, 2, 0],
+// /         [0, 0, 3, 0],
+// /         [0, 4, 0, 5],
+// /         [0, 0, 0, 0],
+// /         [6, 0, 7, 8],
+// /         [0, 9, 0, 0]].
+// /
+// / The array of non-zero values in X is:
+// /
+// /   values(X) = [1, 2, 3, 4, 5, 6, 7, 8, 9].
+// /
+// / And the indptr of X is:
+// /
+// /   indptr(X) = [0, 2, 3, 5, 5, 8, 10].
 func (rcv *SparseMatrixIndexCSR) IndptrBuffer(obj *Buffer) *Buffer {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
 	if o != 0 {
@@ -93,29 +93,29 @@ func (rcv *SparseMatrixIndexCSR) IndptrBuffer(obj *Buffer) *Buffer {
 	return nil
 }
 
-/// indptrBuffer stores the location and size of indptr array that
-/// represents the range of the rows.
-/// The i-th row spans from indptr[i] to indptr[i+1] in the data.
-/// The length of this array is 1 + (the number of rows), and the type
-/// of index value is long.
-///
-/// For example, let X be the following 6x4 matrix:
-///
-///   X := [[0, 1, 2, 0],
-///         [0, 0, 3, 0],
-///         [0, 4, 0, 5],
-///         [0, 0, 0, 0],
-///         [6, 0, 7, 8],
-///         [0, 9, 0, 0]].
-///
-/// The array of non-zero values in X is:
-///
-///   values(X) = [1, 2, 3, 4, 5, 6, 7, 8, 9].
-///
-/// And the indptr of X is:
-///
-///   indptr(X) = [0, 2, 3, 5, 5, 8, 10].
-/// The type of values in indicesBuffer
+// / indptrBuffer stores the location and size of indptr array that
+// / represents the range of the rows.
+// / The i-th row spans from indptr[i] to indptr[i+1] in the data.
+// / The length of this array is 1 + (the number of rows), and the type
+// / of index value is long.
+// /
+// / For example, let X be the following 6x4 matrix:
+// /
+// /   X := [[0, 1, 2, 0],
+// /         [0, 0, 3, 0],
+// /         [0, 4, 0, 5],
+// /         [0, 0, 0, 0],
+// /         [6, 0, 7, 8],
+// /         [0, 9, 0, 0]].
+// /
+// / The array of non-zero values in X is:
+// /
+// /   values(X) = [1, 2, 3, 4, 5, 6, 7, 8, 9].
+// /
+// / And the indptr of X is:
+// /
+// /   indptr(X) = [0, 2, 3, 5, 5, 8, 10].
+// / The type of values in indicesBuffer
 func (rcv *SparseMatrixIndexCSR) IndicesType(obj *Int) *Int {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(8))
 	if o != 0 {
@@ -129,16 +129,16 @@ func (rcv *SparseMatrixIndexCSR) IndicesType(obj *Int) *Int {
 	return nil
 }
 
-/// The type of values in indicesBuffer
-/// indicesBuffer stores the location and size of the array that
-/// contains the column indices of the corresponding non-zero values.
-/// The type of index value is long.
-///
-/// For example, the indices of the above X is:
-///
-///   indices(X) = [1, 2, 2, 1, 3, 0, 2, 3, 1].
-///
-/// Note that the indices are sorted in lexicographical order for each row.
+// / The type of values in indicesBuffer
+// / indicesBuffer stores the location and size of the array that
+// / contains the column indices of the corresponding non-zero values.
+// / The type of index value is long.
+// /
+// / For example, the indices of the above X is:
+// /
+// /   indices(X) = [1, 2, 2, 1, 3, 0, 2, 3, 1].
+// /
+// / Note that the indices are sorted in lexicographical order for each row.
 func (rcv *SparseMatrixIndexCSR) IndicesBuffer(obj *Buffer) *Buffer {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(10))
 	if o != 0 {
@@ -152,15 +152,15 @@ func (rcv *SparseMatrixIndexCSR) IndicesBuffer(obj *Buffer) *Buffer {
 	return nil
 }
 
-/// indicesBuffer stores the location and size of the array that
-/// contains the column indices of the corresponding non-zero values.
-/// The type of index value is long.
-///
-/// For example, the indices of the above X is:
-///
-///   indices(X) = [1, 2, 2, 1, 3, 0, 2, 3, 1].
-///
-/// Note that the indices are sorted in lexicographical order for each row.
+// / indicesBuffer stores the location and size of the array that
+// / contains the column indices of the corresponding non-zero values.
+// / The type of index value is long.
+// /
+// / For example, the indices of the above X is:
+// /
+// /   indices(X) = [1, 2, 2, 1, 3, 0, 2, 3, 1].
+// /
+// / Note that the indices are sorted in lexicographical order for each row.
 func SparseMatrixIndexCSRStart(builder *flatbuffers.Builder) {
 	builder.StartObject(4)
 }
diff --git a/go/arrow/internal/flatbuf/SparseMatrixIndexCSX.go b/go/arrow/internal/flatbuf/SparseMatrixIndexCSX.go
index c28cc5d082fac..7f262deedbfc1 100644
--- a/go/arrow/internal/flatbuf/SparseMatrixIndexCSX.go
+++ b/go/arrow/internal/flatbuf/SparseMatrixIndexCSX.go
@@ -22,7 +22,7 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Compressed Sparse format, that is matrix-specific.
+// / Compressed Sparse format, that is matrix-specific.
 type SparseMatrixIndexCSX struct {
 	_tab flatbuffers.Table
 }
@@ -43,7 +43,7 @@ func (rcv *SparseMatrixIndexCSX) Table() flatbuffers.Table {
 	return rcv._tab
 }
 
-/// Which axis, row or column, is compressed
+// / Which axis, row or column, is compressed
 func (rcv *SparseMatrixIndexCSX) CompressedAxis() SparseMatrixCompressedAxis {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {
@@ -52,12 +52,12 @@ func (rcv *SparseMatrixIndexCSX) CompressedAxis() SparseMatrixCompressedAxis {
 	return 0
 }
 
-/// Which axis, row or column, is compressed
+// / Which axis, row or column, is compressed
 func (rcv *SparseMatrixIndexCSX) MutateCompressedAxis(n SparseMatrixCompressedAxis) bool {
 	return rcv._tab.MutateInt16Slot(4, int16(n))
 }
 
-/// The type of values in indptrBuffer
+// / The type of values in indptrBuffer
 func (rcv *SparseMatrixIndexCSX) IndptrType(obj *Int) *Int {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
 	if o != 0 {
@@ -71,30 +71,30 @@ func (rcv *SparseMatrixIndexCSX) IndptrType(obj *Int) *Int {
 	return nil
 }
 
-/// The type of values in indptrBuffer
-/// indptrBuffer stores the location and size of indptr array that
-/// represents the range of the rows.
-/// The i-th row spans from `indptr[i]` to `indptr[i+1]` in the data.
-/// The length of this array is 1 + (the number of rows), and the type
-/// of index value is long.
-///
-/// For example, let X be the following 6x4 matrix:
-/// ```text
-///   X := [[0, 1, 2, 0],
-///         [0, 0, 3, 0],
-///         [0, 4, 0, 5],
-///         [0, 0, 0, 0],
-///         [6, 0, 7, 8],
-///         [0, 9, 0, 0]].
-/// ```
-/// The array of non-zero values in X is:
-/// ```text
-///   values(X) = [1, 2, 3, 4, 5, 6, 7, 8, 9].
-/// ```
-/// And the indptr of X is:
-/// ```text
-///   indptr(X) = [0, 2, 3, 5, 5, 8, 10].
-/// ```
+// / The type of values in indptrBuffer
+// / indptrBuffer stores the location and size of indptr array that
+// / represents the range of the rows.
+// / The i-th row spans from `indptr[i]` to `indptr[i+1]` in the data.
+// / The length of this array is 1 + (the number of rows), and the type
+// / of index value is long.
+// /
+// / For example, let X be the following 6x4 matrix:
+// / ```text
+// /   X := [[0, 1, 2, 0],
+// /         [0, 0, 3, 0],
+// /         [0, 4, 0, 5],
+// /         [0, 0, 0, 0],
+// /         [6, 0, 7, 8],
+// /         [0, 9, 0, 0]].
+// / ```
+// / The array of non-zero values in X is:
+// / ```text
+// /   values(X) = [1, 2, 3, 4, 5, 6, 7, 8, 9].
+// / ```
+// / And the indptr of X is:
+// / ```text
+// /   indptr(X) = [0, 2, 3, 5, 5, 8, 10].
+// / ```
 func (rcv *SparseMatrixIndexCSX) IndptrBuffer(obj *Buffer) *Buffer {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(8))
 	if o != 0 {
@@ -108,30 +108,30 @@ func (rcv *SparseMatrixIndexCSX) IndptrBuffer(obj *Buffer) *Buffer {
 	return nil
 }
 
-/// indptrBuffer stores the location and size of indptr array that
-/// represents the range of the rows.
-/// The i-th row spans from `indptr[i]` to `indptr[i+1]` in the data.
-/// The length of this array is 1 + (the number of rows), and the type
-/// of index value is long.
-///
-/// For example, let X be the following 6x4 matrix:
-/// ```text
-///   X := [[0, 1, 2, 0],
-///         [0, 0, 3, 0],
-///         [0, 4, 0, 5],
-///         [0, 0, 0, 0],
-///         [6, 0, 7, 8],
-///         [0, 9, 0, 0]].
-/// ```
-/// The array of non-zero values in X is:
-/// ```text
-///   values(X) = [1, 2, 3, 4, 5, 6, 7, 8, 9].
-/// ```
-/// And the indptr of X is:
-/// ```text
-///   indptr(X) = [0, 2, 3, 5, 5, 8, 10].
-/// ```
-/// The type of values in indicesBuffer
+// / indptrBuffer stores the location and size of indptr array that
+// / represents the range of the rows.
+// / The i-th row spans from `indptr[i]` to `indptr[i+1]` in the data.
+// / The length of this array is 1 + (the number of rows), and the type
+// / of index value is long.
+// /
+// / For example, let X be the following 6x4 matrix:
+// / ```text
+// /   X := [[0, 1, 2, 0],
+// /         [0, 0, 3, 0],
+// /         [0, 4, 0, 5],
+// /         [0, 0, 0, 0],
+// /         [6, 0, 7, 8],
+// /         [0, 9, 0, 0]].
+// / ```
+// / The array of non-zero values in X is:
+// / ```text
+// /   values(X) = [1, 2, 3, 4, 5, 6, 7, 8, 9].
+// / ```
+// / And the indptr of X is:
+// / ```text
+// /   indptr(X) = [0, 2, 3, 5, 5, 8, 10].
+// / ```
+// / The type of values in indicesBuffer
 func (rcv *SparseMatrixIndexCSX) IndicesType(obj *Int) *Int {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(10))
 	if o != 0 {
@@ -145,16 +145,16 @@ func (rcv *SparseMatrixIndexCSX) IndicesType(obj *Int) *Int {
 	return nil
 }
 
-/// The type of values in indicesBuffer
-/// indicesBuffer stores the location and size of the array that
-/// contains the column indices of the corresponding non-zero values.
-/// The type of index value is long.
-///
-/// For example, the indices of the above X is:
-/// ```text
-///   indices(X) = [1, 2, 2, 1, 3, 0, 2, 3, 1].
-/// ```
-/// Note that the indices are sorted in lexicographical order for each row.
+// / The type of values in indicesBuffer
+// / indicesBuffer stores the location and size of the array that
+// / contains the column indices of the corresponding non-zero values.
+// / The type of index value is long.
+// /
+// / For example, the indices of the above X is:
+// / ```text
+// /   indices(X) = [1, 2, 2, 1, 3, 0, 2, 3, 1].
+// / ```
+// / Note that the indices are sorted in lexicographical order for each row.
 func (rcv *SparseMatrixIndexCSX) IndicesBuffer(obj *Buffer) *Buffer {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(12))
 	if o != 0 {
@@ -168,15 +168,15 @@ func (rcv *SparseMatrixIndexCSX) IndicesBuffer(obj *Buffer) *Buffer {
 	return nil
 }
 
-/// indicesBuffer stores the location and size of the array that
-/// contains the column indices of the corresponding non-zero values.
-/// The type of index value is long.
-///
-/// For example, the indices of the above X is:
-/// ```text
-///   indices(X) = [1, 2, 2, 1, 3, 0, 2, 3, 1].
-/// ```
-/// Note that the indices are sorted in lexicographical order for each row.
+// / indicesBuffer stores the location and size of the array that
+// / contains the column indices of the corresponding non-zero values.
+// / The type of index value is long.
+// /
+// / For example, the indices of the above X is:
+// / ```text
+// /   indices(X) = [1, 2, 2, 1, 3, 0, 2, 3, 1].
+// / ```
+// / Note that the indices are sorted in lexicographical order for each row.
 func SparseMatrixIndexCSXStart(builder *flatbuffers.Builder) {
 	builder.StartObject(5)
 }
diff --git a/go/arrow/internal/flatbuf/SparseTensor.go b/go/arrow/internal/flatbuf/SparseTensor.go
index 6f3f55797d755..8f67e1fc08b84 100644
--- a/go/arrow/internal/flatbuf/SparseTensor.go
+++ b/go/arrow/internal/flatbuf/SparseTensor.go
@@ -54,9 +54,9 @@ func (rcv *SparseTensor) MutateTypeType(n Type) bool {
 	return rcv._tab.MutateByteSlot(4, byte(n))
 }
 
-/// The type of data contained in a value cell.
-/// Currently only fixed-width value types are supported,
-/// no strings or nested types.
+// / The type of data contained in a value cell.
+// / Currently only fixed-width value types are supported,
+// / no strings or nested types.
 func (rcv *SparseTensor) Type(obj *flatbuffers.Table) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
 	if o != 0 {
@@ -66,10 +66,10 @@ func (rcv *SparseTensor) Type(obj *flatbuffers.Table) bool {
 	return false
 }
 
-/// The type of data contained in a value cell.
-/// Currently only fixed-width value types are supported,
-/// no strings or nested types.
-/// The dimensions of the tensor, optionally named.
+// / The type of data contained in a value cell.
+// / Currently only fixed-width value types are supported,
+// / no strings or nested types.
+// / The dimensions of the tensor, optionally named.
 func (rcv *SparseTensor) Shape(obj *TensorDim, j int) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(8))
 	if o != 0 {
@@ -90,8 +90,8 @@ func (rcv *SparseTensor) ShapeLength() int {
 	return 0
 }
 
-/// The dimensions of the tensor, optionally named.
-/// The number of non-zero values in a sparse tensor.
+// / The dimensions of the tensor, optionally named.
+// / The number of non-zero values in a sparse tensor.
 func (rcv *SparseTensor) NonZeroLength() int64 {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(10))
 	if o != 0 {
@@ -100,7 +100,7 @@ func (rcv *SparseTensor) NonZeroLength() int64 {
 	return 0
 }
 
-/// The number of non-zero values in a sparse tensor.
+// / The number of non-zero values in a sparse tensor.
 func (rcv *SparseTensor) MutateNonZeroLength(n int64) bool {
 	return rcv._tab.MutateInt64Slot(10, n)
 }
@@ -117,7 +117,7 @@ func (rcv *SparseTensor) MutateSparseIndexType(n SparseTensorIndex) bool {
 	return rcv._tab.MutateByteSlot(12, byte(n))
 }
 
-/// Sparse tensor index
+// / Sparse tensor index
 func (rcv *SparseTensor) SparseIndex(obj *flatbuffers.Table) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(14))
 	if o != 0 {
@@ -127,8 +127,8 @@ func (rcv *SparseTensor) SparseIndex(obj *flatbuffers.Table) bool {
 	return false
 }
 
-/// Sparse tensor index
-/// The location and size of the tensor's data
+// / Sparse tensor index
+// / The location and size of the tensor's data
 func (rcv *SparseTensor) Data(obj *Buffer) *Buffer {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(16))
 	if o != 0 {
@@ -142,7 +142,7 @@ func (rcv *SparseTensor) Data(obj *Buffer) *Buffer {
 	return nil
 }
 
-/// The location and size of the tensor's data
+// / The location and size of the tensor's data
 func SparseTensorStart(builder *flatbuffers.Builder) {
 	builder.StartObject(7)
 }
diff --git a/go/arrow/internal/flatbuf/SparseTensorIndexCOO.go b/go/arrow/internal/flatbuf/SparseTensorIndexCOO.go
index f8eee99fa691e..bf1c218e2e415 100644
--- a/go/arrow/internal/flatbuf/SparseTensorIndexCOO.go
+++ b/go/arrow/internal/flatbuf/SparseTensorIndexCOO.go
@@ -22,38 +22,38 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// ----------------------------------------------------------------------
-/// EXPERIMENTAL: Data structures for sparse tensors
-/// Coordinate (COO) format of sparse tensor index.
-///
-/// COO's index list are represented as a NxM matrix,
-/// where N is the number of non-zero values,
-/// and M is the number of dimensions of a sparse tensor.
-///
-/// indicesBuffer stores the location and size of the data of this indices
-/// matrix.  The value type and the stride of the indices matrix is
-/// specified in indicesType and indicesStrides fields.
-///
-/// For example, let X be a 2x3x4x5 tensor, and it has the following
-/// 6 non-zero values:
-/// ```text
-///   X[0, 1, 2, 0] := 1
-///   X[1, 1, 2, 3] := 2
-///   X[0, 2, 1, 0] := 3
-///   X[0, 1, 3, 0] := 4
-///   X[0, 1, 2, 1] := 5
-///   X[1, 2, 0, 4] := 6
-/// ```
-/// In COO format, the index matrix of X is the following 4x6 matrix:
-/// ```text
-///   [[0, 0, 0, 0, 1, 1],
-///    [1, 1, 1, 2, 1, 2],
-///    [2, 2, 3, 1, 2, 0],
-///    [0, 1, 0, 0, 3, 4]]
-/// ```
-/// When isCanonical is true, the indices is sorted in lexicographical order
-/// (row-major order), and it does not have duplicated entries.  Otherwise,
-/// the indices may not be sorted, or may have duplicated entries.
+// / ----------------------------------------------------------------------
+// / EXPERIMENTAL: Data structures for sparse tensors
+// / Coordinate (COO) format of sparse tensor index.
+// /
+// / COO's index list are represented as a NxM matrix,
+// / where N is the number of non-zero values,
+// / and M is the number of dimensions of a sparse tensor.
+// /
+// / indicesBuffer stores the location and size of the data of this indices
+// / matrix.  The value type and the stride of the indices matrix is
+// / specified in indicesType and indicesStrides fields.
+// /
+// / For example, let X be a 2x3x4x5 tensor, and it has the following
+// / 6 non-zero values:
+// / ```text
+// /   X[0, 1, 2, 0] := 1
+// /   X[1, 1, 2, 3] := 2
+// /   X[0, 2, 1, 0] := 3
+// /   X[0, 1, 3, 0] := 4
+// /   X[0, 1, 2, 1] := 5
+// /   X[1, 2, 0, 4] := 6
+// / ```
+// / In COO format, the index matrix of X is the following 4x6 matrix:
+// / ```text
+// /   [[0, 0, 0, 0, 1, 1],
+// /    [1, 1, 1, 2, 1, 2],
+// /    [2, 2, 3, 1, 2, 0],
+// /    [0, 1, 0, 0, 3, 4]]
+// / ```
+// / When isCanonical is true, the indices is sorted in lexicographical order
+// / (row-major order), and it does not have duplicated entries.  Otherwise,
+// / the indices may not be sorted, or may have duplicated entries.
 type SparseTensorIndexCOO struct {
 	_tab flatbuffers.Table
 }
@@ -74,7 +74,7 @@ func (rcv *SparseTensorIndexCOO) Table() flatbuffers.Table {
 	return rcv._tab
 }
 
-/// The type of values in indicesBuffer
+// / The type of values in indicesBuffer
 func (rcv *SparseTensorIndexCOO) IndicesType(obj *Int) *Int {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {
@@ -88,9 +88,9 @@ func (rcv *SparseTensorIndexCOO) IndicesType(obj *Int) *Int {
 	return nil
 }
 
-/// The type of values in indicesBuffer
-/// Non-negative byte offsets to advance one value cell along each dimension
-/// If omitted, default to row-major order (C-like).
+// / The type of values in indicesBuffer
+// / Non-negative byte offsets to advance one value cell along each dimension
+// / If omitted, default to row-major order (C-like).
 func (rcv *SparseTensorIndexCOO) IndicesStrides(j int) int64 {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
 	if o != 0 {
@@ -108,8 +108,8 @@ func (rcv *SparseTensorIndexCOO) IndicesStridesLength() int {
 	return 0
 }
 
-/// Non-negative byte offsets to advance one value cell along each dimension
-/// If omitted, default to row-major order (C-like).
+// / Non-negative byte offsets to advance one value cell along each dimension
+// / If omitted, default to row-major order (C-like).
 func (rcv *SparseTensorIndexCOO) MutateIndicesStrides(j int, n int64) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
 	if o != 0 {
@@ -119,7 +119,7 @@ func (rcv *SparseTensorIndexCOO) MutateIndicesStrides(j int, n int64) bool {
 	return false
 }
 
-/// The location and size of the indices matrix's data
+// / The location and size of the indices matrix's data
 func (rcv *SparseTensorIndexCOO) IndicesBuffer(obj *Buffer) *Buffer {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(8))
 	if o != 0 {
@@ -133,12 +133,12 @@ func (rcv *SparseTensorIndexCOO) IndicesBuffer(obj *Buffer) *Buffer {
 	return nil
 }
 
-/// The location and size of the indices matrix's data
-/// This flag is true if and only if the indices matrix is sorted in
-/// row-major order, and does not have duplicated entries.
-/// This sort order is the same as of Tensorflow's SparseTensor,
-/// but it is inverse order of SciPy's canonical coo_matrix
-/// (SciPy employs column-major order for its coo_matrix).
+// / The location and size of the indices matrix's data
+// / This flag is true if and only if the indices matrix is sorted in
+// / row-major order, and does not have duplicated entries.
+// / This sort order is the same as of Tensorflow's SparseTensor,
+// / but it is inverse order of SciPy's canonical coo_matrix
+// / (SciPy employs column-major order for its coo_matrix).
 func (rcv *SparseTensorIndexCOO) IsCanonical() bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(10))
 	if o != 0 {
@@ -147,11 +147,11 @@ func (rcv *SparseTensorIndexCOO) IsCanonical() bool {
 	return false
 }
 
-/// This flag is true if and only if the indices matrix is sorted in
-/// row-major order, and does not have duplicated entries.
-/// This sort order is the same as of Tensorflow's SparseTensor,
-/// but it is inverse order of SciPy's canonical coo_matrix
-/// (SciPy employs column-major order for its coo_matrix).
+// / This flag is true if and only if the indices matrix is sorted in
+// / row-major order, and does not have duplicated entries.
+// / This sort order is the same as of Tensorflow's SparseTensor,
+// / but it is inverse order of SciPy's canonical coo_matrix
+// / (SciPy employs column-major order for its coo_matrix).
 func (rcv *SparseTensorIndexCOO) MutateIsCanonical(n bool) bool {
 	return rcv._tab.MutateBoolSlot(10, n)
 }
diff --git a/go/arrow/internal/flatbuf/SparseTensorIndexCSF.go b/go/arrow/internal/flatbuf/SparseTensorIndexCSF.go
index a824c84ebfe2e..66226e0412c21 100644
--- a/go/arrow/internal/flatbuf/SparseTensorIndexCSF.go
+++ b/go/arrow/internal/flatbuf/SparseTensorIndexCSF.go
@@ -22,7 +22,7 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Compressed Sparse Fiber (CSF) sparse tensor index.
+// / Compressed Sparse Fiber (CSF) sparse tensor index.
 type SparseTensorIndexCSF struct {
 	_tab flatbuffers.Table
 }
@@ -43,37 +43,37 @@ func (rcv *SparseTensorIndexCSF) Table() flatbuffers.Table {
 	return rcv._tab
 }
 
-/// CSF is a generalization of compressed sparse row (CSR) index.
-/// See [smith2017knl](http://shaden.io/pub-files/smith2017knl.pdf)
-///
-/// CSF index recursively compresses each dimension of a tensor into a set
-/// of prefix trees. Each path from a root to leaf forms one tensor
-/// non-zero index. CSF is implemented with two arrays of buffers and one
-/// arrays of integers.
-///
-/// For example, let X be a 2x3x4x5 tensor and let it have the following
-/// 8 non-zero values:
-/// ```text
-///   X[0, 0, 0, 1] := 1
-///   X[0, 0, 0, 2] := 2
-///   X[0, 1, 0, 0] := 3
-///   X[0, 1, 0, 2] := 4
-///   X[0, 1, 1, 0] := 5
-///   X[1, 1, 1, 0] := 6
-///   X[1, 1, 1, 1] := 7
-///   X[1, 1, 1, 2] := 8
-/// ```
-/// As a prefix tree this would be represented as:
-/// ```text
-///         0          1
-///        / \         |
-///       0   1        1
-///      /   / \       |
-///     0   0   1      1
-///    /|  /|   |    /| |
-///   1 2 0 2   0   0 1 2
-/// ```
-/// The type of values in indptrBuffers
+// / CSF is a generalization of compressed sparse row (CSR) index.
+// / See [smith2017knl](http://shaden.io/pub-files/smith2017knl.pdf)
+// /
+// / CSF index recursively compresses each dimension of a tensor into a set
+// / of prefix trees. Each path from a root to leaf forms one tensor
+// / non-zero index. CSF is implemented with two arrays of buffers and one
+// / arrays of integers.
+// /
+// / For example, let X be a 2x3x4x5 tensor and let it have the following
+// / 8 non-zero values:
+// / ```text
+// /   X[0, 0, 0, 1] := 1
+// /   X[0, 0, 0, 2] := 2
+// /   X[0, 1, 0, 0] := 3
+// /   X[0, 1, 0, 2] := 4
+// /   X[0, 1, 1, 0] := 5
+// /   X[1, 1, 1, 0] := 6
+// /   X[1, 1, 1, 1] := 7
+// /   X[1, 1, 1, 2] := 8
+// / ```
+// / As a prefix tree this would be represented as:
+// / ```text
+// /         0          1
+// /        / \         |
+// /       0   1        1
+// /      /   / \       |
+// /     0   0   1      1
+// /    /|  /|   |    /| |
+// /   1 2 0 2   0   0 1 2
+// / ```
+// / The type of values in indptrBuffers
 func (rcv *SparseTensorIndexCSF) IndptrType(obj *Int) *Int {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {
@@ -87,51 +87,51 @@ func (rcv *SparseTensorIndexCSF) IndptrType(obj *Int) *Int {
 	return nil
 }
 
-/// CSF is a generalization of compressed sparse row (CSR) index.
-/// See [smith2017knl](http://shaden.io/pub-files/smith2017knl.pdf)
-///
-/// CSF index recursively compresses each dimension of a tensor into a set
-/// of prefix trees. Each path from a root to leaf forms one tensor
-/// non-zero index. CSF is implemented with two arrays of buffers and one
-/// arrays of integers.
-///
-/// For example, let X be a 2x3x4x5 tensor and let it have the following
-/// 8 non-zero values:
-/// ```text
-///   X[0, 0, 0, 1] := 1
-///   X[0, 0, 0, 2] := 2
-///   X[0, 1, 0, 0] := 3
-///   X[0, 1, 0, 2] := 4
-///   X[0, 1, 1, 0] := 5
-///   X[1, 1, 1, 0] := 6
-///   X[1, 1, 1, 1] := 7
-///   X[1, 1, 1, 2] := 8
-/// ```
-/// As a prefix tree this would be represented as:
-/// ```text
-///         0          1
-///        / \         |
-///       0   1        1
-///      /   / \       |
-///     0   0   1      1
-///    /|  /|   |    /| |
-///   1 2 0 2   0   0 1 2
-/// ```
-/// The type of values in indptrBuffers
-/// indptrBuffers stores the sparsity structure.
-/// Each two consecutive dimensions in a tensor correspond to a buffer in
-/// indptrBuffers. A pair of consecutive values at `indptrBuffers[dim][i]`
-/// and `indptrBuffers[dim][i + 1]` signify a range of nodes in
-/// `indicesBuffers[dim + 1]` who are children of `indicesBuffers[dim][i]` node.
-///
-/// For example, the indptrBuffers for the above X is:
-/// ```text
-///   indptrBuffer(X) = [
-///                       [0, 2, 3],
-///                       [0, 1, 3, 4],
-///                       [0, 2, 4, 5, 8]
-///                     ].
-/// ```
+// / CSF is a generalization of compressed sparse row (CSR) index.
+// / See [smith2017knl](http://shaden.io/pub-files/smith2017knl.pdf)
+// /
+// / CSF index recursively compresses each dimension of a tensor into a set
+// / of prefix trees. Each path from a root to leaf forms one tensor
+// / non-zero index. CSF is implemented with two arrays of buffers and one
+// / arrays of integers.
+// /
+// / For example, let X be a 2x3x4x5 tensor and let it have the following
+// / 8 non-zero values:
+// / ```text
+// /   X[0, 0, 0, 1] := 1
+// /   X[0, 0, 0, 2] := 2
+// /   X[0, 1, 0, 0] := 3
+// /   X[0, 1, 0, 2] := 4
+// /   X[0, 1, 1, 0] := 5
+// /   X[1, 1, 1, 0] := 6
+// /   X[1, 1, 1, 1] := 7
+// /   X[1, 1, 1, 2] := 8
+// / ```
+// / As a prefix tree this would be represented as:
+// / ```text
+// /         0          1
+// /        / \         |
+// /       0   1        1
+// /      /   / \       |
+// /     0   0   1      1
+// /    /|  /|   |    /| |
+// /   1 2 0 2   0   0 1 2
+// / ```
+// / The type of values in indptrBuffers
+// / indptrBuffers stores the sparsity structure.
+// / Each two consecutive dimensions in a tensor correspond to a buffer in
+// / indptrBuffers. A pair of consecutive values at `indptrBuffers[dim][i]`
+// / and `indptrBuffers[dim][i + 1]` signify a range of nodes in
+// / `indicesBuffers[dim + 1]` who are children of `indicesBuffers[dim][i]` node.
+// /
+// / For example, the indptrBuffers for the above X is:
+// / ```text
+// /   indptrBuffer(X) = [
+// /                       [0, 2, 3],
+// /                       [0, 1, 3, 4],
+// /                       [0, 2, 4, 5, 8]
+// /                     ].
+// / ```
 func (rcv *SparseTensorIndexCSF) IndptrBuffers(obj *Buffer, j int) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
 	if o != 0 {
@@ -151,21 +151,21 @@ func (rcv *SparseTensorIndexCSF) IndptrBuffersLength() int {
 	return 0
 }
 
-/// indptrBuffers stores the sparsity structure.
-/// Each two consecutive dimensions in a tensor correspond to a buffer in
-/// indptrBuffers. A pair of consecutive values at `indptrBuffers[dim][i]`
-/// and `indptrBuffers[dim][i + 1]` signify a range of nodes in
-/// `indicesBuffers[dim + 1]` who are children of `indicesBuffers[dim][i]` node.
-///
-/// For example, the indptrBuffers for the above X is:
-/// ```text
-///   indptrBuffer(X) = [
-///                       [0, 2, 3],
-///                       [0, 1, 3, 4],
-///                       [0, 2, 4, 5, 8]
-///                     ].
-/// ```
-/// The type of values in indicesBuffers
+// / indptrBuffers stores the sparsity structure.
+// / Each two consecutive dimensions in a tensor correspond to a buffer in
+// / indptrBuffers. A pair of consecutive values at `indptrBuffers[dim][i]`
+// / and `indptrBuffers[dim][i + 1]` signify a range of nodes in
+// / `indicesBuffers[dim + 1]` who are children of `indicesBuffers[dim][i]` node.
+// /
+// / For example, the indptrBuffers for the above X is:
+// / ```text
+// /   indptrBuffer(X) = [
+// /                       [0, 2, 3],
+// /                       [0, 1, 3, 4],
+// /                       [0, 2, 4, 5, 8]
+// /                     ].
+// / ```
+// / The type of values in indicesBuffers
 func (rcv *SparseTensorIndexCSF) IndicesType(obj *Int) *Int {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(8))
 	if o != 0 {
@@ -179,18 +179,18 @@ func (rcv *SparseTensorIndexCSF) IndicesType(obj *Int) *Int {
 	return nil
 }
 
-/// The type of values in indicesBuffers
-/// indicesBuffers stores values of nodes.
-/// Each tensor dimension corresponds to a buffer in indicesBuffers.
-/// For example, the indicesBuffers for the above X is:
-/// ```text
-///   indicesBuffer(X) = [
-///                        [0, 1],
-///                        [0, 1, 1],
-///                        [0, 0, 1, 1],
-///                        [1, 2, 0, 2, 0, 0, 1, 2]
-///                      ].
-/// ```
+// / The type of values in indicesBuffers
+// / indicesBuffers stores values of nodes.
+// / Each tensor dimension corresponds to a buffer in indicesBuffers.
+// / For example, the indicesBuffers for the above X is:
+// / ```text
+// /   indicesBuffer(X) = [
+// /                        [0, 1],
+// /                        [0, 1, 1],
+// /                        [0, 0, 1, 1],
+// /                        [1, 2, 0, 2, 0, 0, 1, 2]
+// /                      ].
+// / ```
 func (rcv *SparseTensorIndexCSF) IndicesBuffers(obj *Buffer, j int) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(10))
 	if o != 0 {
@@ -210,23 +210,23 @@ func (rcv *SparseTensorIndexCSF) IndicesBuffersLength() int {
 	return 0
 }
 
-/// indicesBuffers stores values of nodes.
-/// Each tensor dimension corresponds to a buffer in indicesBuffers.
-/// For example, the indicesBuffers for the above X is:
-/// ```text
-///   indicesBuffer(X) = [
-///                        [0, 1],
-///                        [0, 1, 1],
-///                        [0, 0, 1, 1],
-///                        [1, 2, 0, 2, 0, 0, 1, 2]
-///                      ].
-/// ```
-/// axisOrder stores the sequence in which dimensions were traversed to
-/// produce the prefix tree.
-/// For example, the axisOrder for the above X is:
-/// ```text
-///   axisOrder(X) = [0, 1, 2, 3].
-/// ```
+// / indicesBuffers stores values of nodes.
+// / Each tensor dimension corresponds to a buffer in indicesBuffers.
+// / For example, the indicesBuffers for the above X is:
+// / ```text
+// /   indicesBuffer(X) = [
+// /                        [0, 1],
+// /                        [0, 1, 1],
+// /                        [0, 0, 1, 1],
+// /                        [1, 2, 0, 2, 0, 0, 1, 2]
+// /                      ].
+// / ```
+// / axisOrder stores the sequence in which dimensions were traversed to
+// / produce the prefix tree.
+// / For example, the axisOrder for the above X is:
+// / ```text
+// /   axisOrder(X) = [0, 1, 2, 3].
+// / ```
 func (rcv *SparseTensorIndexCSF) AxisOrder(j int) int32 {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(12))
 	if o != 0 {
@@ -244,12 +244,12 @@ func (rcv *SparseTensorIndexCSF) AxisOrderLength() int {
 	return 0
 }
 
-/// axisOrder stores the sequence in which dimensions were traversed to
-/// produce the prefix tree.
-/// For example, the axisOrder for the above X is:
-/// ```text
-///   axisOrder(X) = [0, 1, 2, 3].
-/// ```
+// / axisOrder stores the sequence in which dimensions were traversed to
+// / produce the prefix tree.
+// / For example, the axisOrder for the above X is:
+// / ```text
+// /   axisOrder(X) = [0, 1, 2, 3].
+// / ```
 func (rcv *SparseTensorIndexCSF) MutateAxisOrder(j int, n int32) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(12))
 	if o != 0 {
diff --git a/go/arrow/internal/flatbuf/Struct_.go b/go/arrow/internal/flatbuf/Struct_.go
index 427e7060382af..73752a17e00fa 100644
--- a/go/arrow/internal/flatbuf/Struct_.go
+++ b/go/arrow/internal/flatbuf/Struct_.go
@@ -22,9 +22,9 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// A Struct_ in the flatbuffer metadata is the same as an Arrow Struct
-/// (according to the physical memory layout). We used Struct_ here as
-/// Struct is a reserved word in Flatbuffers
+// / A Struct_ in the flatbuffer metadata is the same as an Arrow Struct
+// / (according to the physical memory layout). We used Struct_ here as
+// / Struct is a reserved word in Flatbuffers
 type Struct_ struct {
 	_tab flatbuffers.Table
 }
diff --git a/go/arrow/internal/flatbuf/Tensor.go b/go/arrow/internal/flatbuf/Tensor.go
index 39d70e351e3d6..47bfe8067b57b 100644
--- a/go/arrow/internal/flatbuf/Tensor.go
+++ b/go/arrow/internal/flatbuf/Tensor.go
@@ -54,8 +54,8 @@ func (rcv *Tensor) MutateTypeType(n Type) bool {
 	return rcv._tab.MutateByteSlot(4, byte(n))
 }
 
-/// The type of data contained in a value cell. Currently only fixed-width
-/// value types are supported, no strings or nested types
+// / The type of data contained in a value cell. Currently only fixed-width
+// / value types are supported, no strings or nested types
 func (rcv *Tensor) Type(obj *flatbuffers.Table) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
 	if o != 0 {
@@ -65,9 +65,9 @@ func (rcv *Tensor) Type(obj *flatbuffers.Table) bool {
 	return false
 }
 
-/// The type of data contained in a value cell. Currently only fixed-width
-/// value types are supported, no strings or nested types
-/// The dimensions of the tensor, optionally named
+// / The type of data contained in a value cell. Currently only fixed-width
+// / value types are supported, no strings or nested types
+// / The dimensions of the tensor, optionally named
 func (rcv *Tensor) Shape(obj *TensorDim, j int) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(8))
 	if o != 0 {
@@ -88,9 +88,9 @@ func (rcv *Tensor) ShapeLength() int {
 	return 0
 }
 
-/// The dimensions of the tensor, optionally named
-/// Non-negative byte offsets to advance one value cell along each dimension
-/// If omitted, default to row-major order (C-like).
+// / The dimensions of the tensor, optionally named
+// / Non-negative byte offsets to advance one value cell along each dimension
+// / If omitted, default to row-major order (C-like).
 func (rcv *Tensor) Strides(j int) int64 {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(10))
 	if o != 0 {
@@ -108,8 +108,8 @@ func (rcv *Tensor) StridesLength() int {
 	return 0
 }
 
-/// Non-negative byte offsets to advance one value cell along each dimension
-/// If omitted, default to row-major order (C-like).
+// / Non-negative byte offsets to advance one value cell along each dimension
+// / If omitted, default to row-major order (C-like).
 func (rcv *Tensor) MutateStrides(j int, n int64) bool {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(10))
 	if o != 0 {
@@ -119,7 +119,7 @@ func (rcv *Tensor) MutateStrides(j int, n int64) bool {
 	return false
 }
 
-/// The location and size of the tensor's data
+// / The location and size of the tensor's data
 func (rcv *Tensor) Data(obj *Buffer) *Buffer {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(12))
 	if o != 0 {
@@ -133,7 +133,7 @@ func (rcv *Tensor) Data(obj *Buffer) *Buffer {
 	return nil
 }
 
-/// The location and size of the tensor's data
+// / The location and size of the tensor's data
 func TensorStart(builder *flatbuffers.Builder) {
 	builder.StartObject(5)
 }
diff --git a/go/arrow/internal/flatbuf/TensorDim.go b/go/arrow/internal/flatbuf/TensorDim.go
index 14b82120887e9..c6413b6a8c0bd 100644
--- a/go/arrow/internal/flatbuf/TensorDim.go
+++ b/go/arrow/internal/flatbuf/TensorDim.go
@@ -22,9 +22,9 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// ----------------------------------------------------------------------
-/// Data structures for dense tensors
-/// Shape data for a single axis in a tensor
+// / ----------------------------------------------------------------------
+// / Data structures for dense tensors
+// / Shape data for a single axis in a tensor
 type TensorDim struct {
 	_tab flatbuffers.Table
 }
@@ -45,7 +45,7 @@ func (rcv *TensorDim) Table() flatbuffers.Table {
 	return rcv._tab
 }
 
-/// Length of dimension
+// / Length of dimension
 func (rcv *TensorDim) Size() int64 {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(4))
 	if o != 0 {
@@ -54,12 +54,12 @@ func (rcv *TensorDim) Size() int64 {
 	return 0
 }
 
-/// Length of dimension
+// / Length of dimension
 func (rcv *TensorDim) MutateSize(n int64) bool {
 	return rcv._tab.MutateInt64Slot(4, n)
 }
 
-/// Name of the dimension, optional
+// / Name of the dimension, optional
 func (rcv *TensorDim) Name() []byte {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
 	if o != 0 {
@@ -68,7 +68,7 @@ func (rcv *TensorDim) Name() []byte {
 	return nil
 }
 
-/// Name of the dimension, optional
+// / Name of the dimension, optional
 func TensorDimStart(builder *flatbuffers.Builder) {
 	builder.StartObject(2)
 }
diff --git a/go/arrow/internal/flatbuf/Time.go b/go/arrow/internal/flatbuf/Time.go
index 2fb6e4c110e0a..13038a6e33280 100644
--- a/go/arrow/internal/flatbuf/Time.go
+++ b/go/arrow/internal/flatbuf/Time.go
@@ -22,20 +22,20 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Time is either a 32-bit or 64-bit signed integer type representing an
-/// elapsed time since midnight, stored in either of four units: seconds,
-/// milliseconds, microseconds or nanoseconds.
-///
-/// The integer `bitWidth` depends on the `unit` and must be one of the following:
-/// * SECOND and MILLISECOND: 32 bits
-/// * MICROSECOND and NANOSECOND: 64 bits
-///
-/// The allowed values are between 0 (inclusive) and 86400 (=24*60*60) seconds
-/// (exclusive), adjusted for the time unit (for example, up to 86400000
-/// exclusive for the MILLISECOND unit).
-/// This definition doesn't allow for leap seconds. Time values from
-/// measurements with leap seconds will need to be corrected when ingesting
-/// into Arrow (for example by replacing the value 86400 with 86399).
+// / Time is either a 32-bit or 64-bit signed integer type representing an
+// / elapsed time since midnight, stored in either of four units: seconds,
+// / milliseconds, microseconds or nanoseconds.
+// /
+// / The integer `bitWidth` depends on the `unit` and must be one of the following:
+// / * SECOND and MILLISECOND: 32 bits
+// / * MICROSECOND and NANOSECOND: 64 bits
+// /
+// / The allowed values are between 0 (inclusive) and 86400 (=24*60*60) seconds
+// / (exclusive), adjusted for the time unit (for example, up to 86400000
+// / exclusive for the MILLISECOND unit).
+// / This definition doesn't allow for leap seconds. Time values from
+// / measurements with leap seconds will need to be corrected when ingesting
+// / into Arrow (for example by replacing the value 86400 with 86399).
 type Time struct {
 	_tab flatbuffers.Table
 }
diff --git a/go/arrow/internal/flatbuf/Timestamp.go b/go/arrow/internal/flatbuf/Timestamp.go
index d0058e13e6545..ce172bacdd3c3 100644
--- a/go/arrow/internal/flatbuf/Timestamp.go
+++ b/go/arrow/internal/flatbuf/Timestamp.go
@@ -22,111 +22,111 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Timestamp is a 64-bit signed integer representing an elapsed time since a
-/// fixed epoch, stored in either of four units: seconds, milliseconds,
-/// microseconds or nanoseconds, and is optionally annotated with a timezone.
-///
-/// Timestamp values do not include any leap seconds (in other words, all
-/// days are considered 86400 seconds long).
-///
-/// Timestamps with a non-empty timezone
-/// ------------------------------------
-///
-/// If a Timestamp column has a non-empty timezone value, its epoch is
-/// 1970-01-01 00:00:00 (January 1st 1970, midnight) in the *UTC* timezone
-/// (the Unix epoch), regardless of the Timestamp's own timezone.
-///
-/// Therefore, timestamp values with a non-empty timezone correspond to
-/// physical points in time together with some additional information about
-/// how the data was obtained and/or how to display it (the timezone).
-///
-///   For example, the timestamp value 0 with the timezone string "Europe/Paris"
-///   corresponds to "January 1st 1970, 00h00" in the UTC timezone, but the
-///   application may prefer to display it as "January 1st 1970, 01h00" in
-///   the Europe/Paris timezone (which is the same physical point in time).
-///
-/// One consequence is that timestamp values with a non-empty timezone
-/// can be compared and ordered directly, since they all share the same
-/// well-known point of reference (the Unix epoch).
-///
-/// Timestamps with an unset / empty timezone
-/// -----------------------------------------
-///
-/// If a Timestamp column has no timezone value, its epoch is
-/// 1970-01-01 00:00:00 (January 1st 1970, midnight) in an *unknown* timezone.
-///
-/// Therefore, timestamp values without a timezone cannot be meaningfully
-/// interpreted as physical points in time, but only as calendar / clock
-/// indications ("wall clock time") in an unspecified timezone.
-///
-///   For example, the timestamp value 0 with an empty timezone string
-///   corresponds to "January 1st 1970, 00h00" in an unknown timezone: there
-///   is not enough information to interpret it as a well-defined physical
-///   point in time.
-///
-/// One consequence is that timestamp values without a timezone cannot
-/// be reliably compared or ordered, since they may have different points of
-/// reference.  In particular, it is *not* possible to interpret an unset
-/// or empty timezone as the same as "UTC".
-///
-/// Conversion between timezones
-/// ----------------------------
-///
-/// If a Timestamp column has a non-empty timezone, changing the timezone
-/// to a different non-empty value is a metadata-only operation:
-/// the timestamp values need not change as their point of reference remains
-/// the same (the Unix epoch).
-///
-/// However, if a Timestamp column has no timezone value, changing it to a
-/// non-empty value requires to think about the desired semantics.
-/// One possibility is to assume that the original timestamp values are
-/// relative to the epoch of the timezone being set; timestamp values should
-/// then adjusted to the Unix epoch (for example, changing the timezone from
-/// empty to "Europe/Paris" would require converting the timestamp values
-/// from "Europe/Paris" to "UTC", which seems counter-intuitive but is
-/// nevertheless correct).
-///
-/// Guidelines for encoding data from external libraries
-/// ----------------------------------------------------
-///
-/// Date & time libraries often have multiple different data types for temporal
-/// data. In order to ease interoperability between different implementations the
-/// Arrow project has some recommendations for encoding these types into a Timestamp
-/// column.
-///
-/// An "instant" represents a physical point in time that has no relevant timezone
-/// (for example, astronomical data). To encode an instant, use a Timestamp with
-/// the timezone string set to "UTC", and make sure the Timestamp values
-/// are relative to the UTC epoch (January 1st 1970, midnight).
-///
-/// A "zoned date-time" represents a physical point in time annotated with an
-/// informative timezone (for example, the timezone in which the data was
-/// recorded).  To encode a zoned date-time, use a Timestamp with the timezone
-/// string set to the name of the timezone, and make sure the Timestamp values
-/// are relative to the UTC epoch (January 1st 1970, midnight).
-///
-///  (There is some ambiguity between an instant and a zoned date-time with the
-///   UTC timezone.  Both of these are stored the same in Arrow.  Typically,
-///   this distinction does not matter.  If it does, then an application should
-///   use custom metadata or an extension type to distinguish between the two cases.)
-///
-/// An "offset date-time" represents a physical point in time combined with an
-/// explicit offset from UTC.  To encode an offset date-time, use a Timestamp
-/// with the timezone string set to the numeric timezone offset string
-/// (e.g. "+03:00"), and make sure the Timestamp values are relative to
-/// the UTC epoch (January 1st 1970, midnight).
-///
-/// A "naive date-time" (also called "local date-time" in some libraries)
-/// represents a wall clock time combined with a calendar date, but with
-/// no indication of how to map this information to a physical point in time.
-/// Naive date-times must be handled with care because of this missing
-/// information, and also because daylight saving time (DST) may make
-/// some values ambiguous or nonexistent. A naive date-time may be
-/// stored as a struct with Date and Time fields. However, it may also be
-/// encoded into a Timestamp column with an empty timezone. The timestamp
-/// values should be computed "as if" the timezone of the date-time values
-/// was UTC; for example, the naive date-time "January 1st 1970, 00h00" would
-/// be encoded as timestamp value 0.
+// / Timestamp is a 64-bit signed integer representing an elapsed time since a
+// / fixed epoch, stored in either of four units: seconds, milliseconds,
+// / microseconds or nanoseconds, and is optionally annotated with a timezone.
+// /
+// / Timestamp values do not include any leap seconds (in other words, all
+// / days are considered 86400 seconds long).
+// /
+// / Timestamps with a non-empty timezone
+// / ------------------------------------
+// /
+// / If a Timestamp column has a non-empty timezone value, its epoch is
+// / 1970-01-01 00:00:00 (January 1st 1970, midnight) in the *UTC* timezone
+// / (the Unix epoch), regardless of the Timestamp's own timezone.
+// /
+// / Therefore, timestamp values with a non-empty timezone correspond to
+// / physical points in time together with some additional information about
+// / how the data was obtained and/or how to display it (the timezone).
+// /
+// /   For example, the timestamp value 0 with the timezone string "Europe/Paris"
+// /   corresponds to "January 1st 1970, 00h00" in the UTC timezone, but the
+// /   application may prefer to display it as "January 1st 1970, 01h00" in
+// /   the Europe/Paris timezone (which is the same physical point in time).
+// /
+// / One consequence is that timestamp values with a non-empty timezone
+// / can be compared and ordered directly, since they all share the same
+// / well-known point of reference (the Unix epoch).
+// /
+// / Timestamps with an unset / empty timezone
+// / -----------------------------------------
+// /
+// / If a Timestamp column has no timezone value, its epoch is
+// / 1970-01-01 00:00:00 (January 1st 1970, midnight) in an *unknown* timezone.
+// /
+// / Therefore, timestamp values without a timezone cannot be meaningfully
+// / interpreted as physical points in time, but only as calendar / clock
+// / indications ("wall clock time") in an unspecified timezone.
+// /
+// /   For example, the timestamp value 0 with an empty timezone string
+// /   corresponds to "January 1st 1970, 00h00" in an unknown timezone: there
+// /   is not enough information to interpret it as a well-defined physical
+// /   point in time.
+// /
+// / One consequence is that timestamp values without a timezone cannot
+// / be reliably compared or ordered, since they may have different points of
+// / reference.  In particular, it is *not* possible to interpret an unset
+// / or empty timezone as the same as "UTC".
+// /
+// / Conversion between timezones
+// / ----------------------------
+// /
+// / If a Timestamp column has a non-empty timezone, changing the timezone
+// / to a different non-empty value is a metadata-only operation:
+// / the timestamp values need not change as their point of reference remains
+// / the same (the Unix epoch).
+// /
+// / However, if a Timestamp column has no timezone value, changing it to a
+// / non-empty value requires to think about the desired semantics.
+// / One possibility is to assume that the original timestamp values are
+// / relative to the epoch of the timezone being set; timestamp values should
+// / then adjusted to the Unix epoch (for example, changing the timezone from
+// / empty to "Europe/Paris" would require converting the timestamp values
+// / from "Europe/Paris" to "UTC", which seems counter-intuitive but is
+// / nevertheless correct).
+// /
+// / Guidelines for encoding data from external libraries
+// / ----------------------------------------------------
+// /
+// / Date & time libraries often have multiple different data types for temporal
+// / data. In order to ease interoperability between different implementations the
+// / Arrow project has some recommendations for encoding these types into a Timestamp
+// / column.
+// /
+// / An "instant" represents a physical point in time that has no relevant timezone
+// / (for example, astronomical data). To encode an instant, use a Timestamp with
+// / the timezone string set to "UTC", and make sure the Timestamp values
+// / are relative to the UTC epoch (January 1st 1970, midnight).
+// /
+// / A "zoned date-time" represents a physical point in time annotated with an
+// / informative timezone (for example, the timezone in which the data was
+// / recorded).  To encode a zoned date-time, use a Timestamp with the timezone
+// / string set to the name of the timezone, and make sure the Timestamp values
+// / are relative to the UTC epoch (January 1st 1970, midnight).
+// /
+// /  (There is some ambiguity between an instant and a zoned date-time with the
+// /   UTC timezone.  Both of these are stored the same in Arrow.  Typically,
+// /   this distinction does not matter.  If it does, then an application should
+// /   use custom metadata or an extension type to distinguish between the two cases.)
+// /
+// / An "offset date-time" represents a physical point in time combined with an
+// / explicit offset from UTC.  To encode an offset date-time, use a Timestamp
+// / with the timezone string set to the numeric timezone offset string
+// / (e.g. "+03:00"), and make sure the Timestamp values are relative to
+// / the UTC epoch (January 1st 1970, midnight).
+// /
+// / A "naive date-time" (also called "local date-time" in some libraries)
+// / represents a wall clock time combined with a calendar date, but with
+// / no indication of how to map this information to a physical point in time.
+// / Naive date-times must be handled with care because of this missing
+// / information, and also because daylight saving time (DST) may make
+// / some values ambiguous or nonexistent. A naive date-time may be
+// / stored as a struct with Date and Time fields. However, it may also be
+// / encoded into a Timestamp column with an empty timezone. The timestamp
+// / values should be computed "as if" the timezone of the date-time values
+// / was UTC; for example, the naive date-time "January 1st 1970, 00h00" would
+// / be encoded as timestamp value 0.
 type Timestamp struct {
 	_tab flatbuffers.Table
 }
@@ -159,16 +159,16 @@ func (rcv *Timestamp) MutateUnit(n TimeUnit) bool {
 	return rcv._tab.MutateInt16Slot(4, int16(n))
 }
 
-/// The timezone is an optional string indicating the name of a timezone,
-/// one of:
-///
-/// * As used in the Olson timezone database (the "tz database" or
-///   "tzdata"), such as "America/New_York".
-/// * An absolute timezone offset of the form "+XX:XX" or "-XX:XX",
-///   such as "+07:30".
-///
-/// Whether a timezone string is present indicates different semantics about
-/// the data (see above).
+// / The timezone is an optional string indicating the name of a timezone,
+// / one of:
+// /
+// / * As used in the Olson timezone database (the "tz database" or
+// /   "tzdata"), such as "America/New_York".
+// / * An absolute timezone offset of the form "+XX:XX" or "-XX:XX",
+// /   such as "+07:30".
+// /
+// / Whether a timezone string is present indicates different semantics about
+// / the data (see above).
 func (rcv *Timestamp) Timezone() []byte {
 	o := flatbuffers.UOffsetT(rcv._tab.Offset(6))
 	if o != 0 {
@@ -177,16 +177,16 @@ func (rcv *Timestamp) Timezone() []byte {
 	return nil
 }
 
-/// The timezone is an optional string indicating the name of a timezone,
-/// one of:
-///
-/// * As used in the Olson timezone database (the "tz database" or
-///   "tzdata"), such as "America/New_York".
-/// * An absolute timezone offset of the form "+XX:XX" or "-XX:XX",
-///   such as "+07:30".
-///
-/// Whether a timezone string is present indicates different semantics about
-/// the data (see above).
+// / The timezone is an optional string indicating the name of a timezone,
+// / one of:
+// /
+// / * As used in the Olson timezone database (the "tz database" or
+// /   "tzdata"), such as "America/New_York".
+// / * An absolute timezone offset of the form "+XX:XX" or "-XX:XX",
+// /   such as "+07:30".
+// /
+// / Whether a timezone string is present indicates different semantics about
+// / the data (see above).
 func TimestampStart(builder *flatbuffers.Builder) {
 	builder.StartObject(2)
 }
diff --git a/go/arrow/internal/flatbuf/Type.go b/go/arrow/internal/flatbuf/Type.go
index ab2bce9c63657..df8ba8650e1cd 100644
--- a/go/arrow/internal/flatbuf/Type.go
+++ b/go/arrow/internal/flatbuf/Type.go
@@ -20,9 +20,9 @@ package flatbuf
 
 import "strconv"
 
-/// ----------------------------------------------------------------------
-/// Top-level Type value, enabling extensible type-specific metadata. We can
-/// add new logical types to Type without breaking backwards compatibility
+// / ----------------------------------------------------------------------
+// / Top-level Type value, enabling extensible type-specific metadata. We can
+// / add new logical types to Type without breaking backwards compatibility
 type Type byte
 
 const (
diff --git a/go/arrow/internal/flatbuf/Union.go b/go/arrow/internal/flatbuf/Union.go
index e34121d4757f2..0367fb3c1fb94 100644
--- a/go/arrow/internal/flatbuf/Union.go
+++ b/go/arrow/internal/flatbuf/Union.go
@@ -22,10 +22,10 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// A union is a complex type with children in Field
-/// By default ids in the type vector refer to the offsets in the children
-/// optionally typeIds provides an indirection between the child offset and the type id
-/// for each child `typeIds[offset]` is the id used in the type vector
+// / A union is a complex type with children in Field
+// / By default ids in the type vector refer to the offsets in the children
+// / optionally typeIds provides an indirection between the child offset and the type id
+// / for each child `typeIds[offset]` is the id used in the type vector
 type Union struct {
 	_tab flatbuffers.Table
 }
diff --git a/go/arrow/internal/flatbuf/Utf8.go b/go/arrow/internal/flatbuf/Utf8.go
index 4ff365a37504a..cab4ce7743ca9 100644
--- a/go/arrow/internal/flatbuf/Utf8.go
+++ b/go/arrow/internal/flatbuf/Utf8.go
@@ -22,7 +22,7 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Unicode with UTF-8 encoding
+// / Unicode with UTF-8 encoding
 type Utf8 struct {
 	_tab flatbuffers.Table
 }
diff --git a/go/arrow/internal/flatbuf/Utf8View.go b/go/arrow/internal/flatbuf/Utf8View.go
index 9cf821490198f..f294126a618b6 100644
--- a/go/arrow/internal/flatbuf/Utf8View.go
+++ b/go/arrow/internal/flatbuf/Utf8View.go
@@ -22,13 +22,13 @@ import (
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
-/// Logically the same as Utf8, but the internal representation uses a view
-/// struct that contains the string length and either the string's entire data
-/// inline (for small strings) or an inlined prefix, an index of another buffer,
-/// and an offset pointing to a slice in that buffer (for non-small strings).
-///
-/// Since it uses a variable number of data buffers, each Field with this type
-/// must have a corresponding entry in `variadicBufferCounts`.
+// / Logically the same as Utf8, but the internal representation uses a view
+// / struct that contains the string length and either the string's entire data
+// / inline (for small strings) or an inlined prefix, an index of another buffer,
+// / and an offset pointing to a slice in that buffer (for non-small strings).
+// /
+// / Since it uses a variable number of data buffers, each Field with this type
+// / must have a corresponding entry in `variadicBufferCounts`.
 type Utf8View struct {
 	_tab flatbuffers.Table
 }
diff --git a/go/arrow/internal/flight_integration/cmd/arrow-flight-integration-client/main.go b/go/arrow/internal/flight_integration/cmd/arrow-flight-integration-client/main.go
index e53e035315b58..8d7a3617f2ada 100755
--- a/go/arrow/internal/flight_integration/cmd/arrow-flight-integration-client/main.go
+++ b/go/arrow/internal/flight_integration/cmd/arrow-flight-integration-client/main.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/flight_integration"
+	"github.com/apache/arrow/go/v17/arrow/internal/flight_integration"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )
diff --git a/go/arrow/internal/flight_integration/cmd/arrow-flight-integration-server/main.go b/go/arrow/internal/flight_integration/cmd/arrow-flight-integration-server/main.go
index 8def9993795d1..2ae02789b79e7 100644
--- a/go/arrow/internal/flight_integration/cmd/arrow-flight-integration-server/main.go
+++ b/go/arrow/internal/flight_integration/cmd/arrow-flight-integration-server/main.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"syscall"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/flight_integration"
+	"github.com/apache/arrow/go/v17/arrow/internal/flight_integration"
 )
 
 var (
diff --git a/go/arrow/internal/flight_integration/scenario.go b/go/arrow/internal/flight_integration/scenario.go
index edddd201ddaea..ccfc7a0ed45a3 100644
--- a/go/arrow/internal/flight_integration/scenario.go
+++ b/go/arrow/internal/flight_integration/scenario.go
@@ -31,16 +31,16 @@ import (
 	"strings"
 	"time"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/flight"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql"
-	"github.com/apache/arrow/go/v16/arrow/flight/flightsql/schema_ref"
-	"github.com/apache/arrow/go/v16/arrow/flight/session"
-	"github.com/apache/arrow/go/v16/arrow/internal/arrjson"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql"
+	"github.com/apache/arrow/go/v17/arrow/flight/flightsql/schema_ref"
+	"github.com/apache/arrow/go/v17/arrow/flight/session"
+	"github.com/apache/arrow/go/v17/arrow/internal/arrjson"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/types"
 	"golang.org/x/xerrors"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
@@ -82,6 +82,8 @@ func GetScenario(name string, args ...string) Scenario {
 		return &flightSqlExtensionScenarioTester{}
 	case "session_options":
 		return &sessionOptionsScenarioTester{}
+	case "flight_sql:ingestion":
+		return &flightSqlIngestionScenarioTester{}
 	case "":
 		if len(args) > 0 {
 			return &defaultIntegrationTester{path: args[0]}
@@ -1358,6 +1360,7 @@ const (
 	updateStatementWithTransactionExpectedRows         int64 = 15000
 	updatePreparedStatementExpectedRows                int64 = 20000
 	updatePreparedStatementWithTransactionExpectedRows int64 = 25000
+	ingestStatementExpectedRows                        int64 = 3
 )
 
 type flightSqlScenarioTester struct {
@@ -2131,16 +2134,16 @@ func (m *flightSqlScenarioTester) ClosePreparedStatement(_ context.Context, requ
 	return nil
 }
 
-func (m *flightSqlScenarioTester) DoPutPreparedStatementQuery(_ context.Context, cmd flightsql.PreparedStatementQuery, rdr flight.MessageReader, _ flight.MetadataWriter) error {
+func (m *flightSqlScenarioTester) DoPutPreparedStatementQuery(_ context.Context, cmd flightsql.PreparedStatementQuery, rdr flight.MessageReader, _ flight.MetadataWriter) ([]byte, error) {
 	switch string(cmd.GetPreparedStatementHandle()) {
 	case "SELECT PREPARED STATEMENT HANDLE",
 		"SELECT PREPARED STATEMENT WITH TXN HANDLE",
 		"PLAN HANDLE", "PLAN WITH TXN HANDLE":
 		actualSchema := rdr.Schema()
-		return assertEq(true, actualSchema.Equal(getQuerySchema()))
+		return cmd.GetPreparedStatementHandle(), assertEq(true, actualSchema.Equal(getQuerySchema()))
 	}
 
-	return fmt.Errorf("%w: handle for DoPutPreparedStatementQuery '%s'",
+	return cmd.GetPreparedStatementHandle(), fmt.Errorf("%w: handle for DoPutPreparedStatementQuery '%s'",
 		arrow.ErrInvalid, string(cmd.GetPreparedStatementHandle()))
 }
 
@@ -2948,3 +2951,136 @@ func (tester *sessionOptionsScenarioTester) ValidateSeventhGetSessionOptions(ctx
 
 	return nil
 }
+
+type flightSqlIngestionScenarioTester struct {
+	flightsql.BaseServer
+}
+
+func (m *flightSqlIngestionScenarioTester) MakeServer(port int) flight.Server {
+	srv := flight.NewServerWithMiddleware(nil)
+	m.RegisterSqlInfo(flightsql.SqlInfoFlightSqlServerBulkIngestion, true)
+	m.RegisterSqlInfo(flightsql.SqlInfoFlightSqlServerIngestTransactionsSupported, true)
+
+	srv.RegisterFlightService(flightsql.NewFlightServer(m))
+	initServer(port, srv)
+	return srv
+}
+
+func (m *flightSqlIngestionScenarioTester) RunClient(addr string, opts ...grpc.DialOption) error {
+	client, err := flightsql.NewClient(addr, nil, nil, opts...)
+	if err != nil {
+		return err
+	}
+	defer client.Close()
+
+	return m.ValidateIngestion(client)
+}
+
+func (m *flightSqlIngestionScenarioTester) ValidateIngestion(client *flightsql.Client) error {
+	ctx := context.Background()
+	opts := getIngestOptions()
+	ingestResult, err := client.ExecuteIngest(ctx, getIngestRecords(), opts)
+	if err != nil {
+		return err
+	}
+	if ingestResult != ingestStatementExpectedRows {
+		return fmt.Errorf("expected ingest return %d got %d", ingestStatementExpectedRows, ingestResult)
+	}
+	return nil
+}
+
+func (m *flightSqlIngestionScenarioTester) DoPutCommandStatementIngest(ctx context.Context, cmd flightsql.StatementIngest, rdr flight.MessageReader) (int64, error) {
+	expectedSchema := getIngestSchema()
+	expectedOpts := getIngestOptions()
+
+	if err := assertEq(expectedOpts.TableDefinitionOptions.IfExists, cmd.GetTableDefinitionOptions().IfExists); err != nil {
+		return 0, err
+	}
+
+	if err := assertEq(expectedOpts.TableDefinitionOptions.IfNotExist, cmd.GetTableDefinitionOptions().IfNotExist); err != nil {
+		return 0, err
+	}
+
+	if err := assertEq(expectedOpts.Table, cmd.GetTable()); err != nil {
+		return 0, err
+	}
+
+	if err := assertEq(*expectedOpts.Schema, cmd.GetSchema()); err != nil {
+		return 0, err
+	}
+
+	if err := assertEq(*expectedOpts.Catalog, cmd.GetCatalog()); err != nil {
+		return 0, err
+	}
+
+	if err := assertEq(expectedOpts.Temporary, cmd.GetTemporary()); err != nil {
+		return 0, err
+	}
+
+	if err := assertEq(expectedOpts.TransactionId, cmd.GetTransactionId()); err != nil {
+		return 0, err
+	}
+
+	if err := assertEq(expectedOpts.Options, cmd.GetOptions()); err != nil {
+		return 0, err
+	}
+
+	var nRecords int64
+	for rdr.Next() {
+		rec := rdr.Record()
+		nRecords += rec.NumRows()
+
+		if err := assertEq(true, expectedSchema.Equal(rec.Schema())); err != nil {
+			return 0, err
+		}
+	}
+
+	return nRecords, nil
+}
+
+// Options to assert before/after mocked ingest call
+func getIngestOptions() *flightsql.ExecuteIngestOpts {
+	tableDefinitionOptions := flightsql.TableDefinitionOptions{
+		IfNotExist: flightsql.TableDefinitionOptionsTableNotExistOptionCreate,
+		IfExists:   flightsql.TableDefinitionOptionsTableExistsOptionReplace,
+	}
+	table := "test_table"
+	schema := "test_schema"
+	catalog := "test_catalog"
+	temporary := true
+	transactionId := []byte("123")
+	options := map[string]string{
+		"key1": "val1",
+		"key2": "val2",
+	}
+
+	return &flightsql.ExecuteIngestOpts{
+		TableDefinitionOptions: &tableDefinitionOptions,
+		Table:                  table,
+		Schema:                 &schema,
+		Catalog:                &catalog,
+		Temporary:              temporary,
+		TransactionId:          transactionId,
+		Options:                options,
+	}
+}
+
+// Schema for ingest records; asserted on records received by handler
+func getIngestSchema() *arrow.Schema {
+	return arrow.NewSchema([]arrow.Field{{Name: "test_field", Type: arrow.PrimitiveTypes.Int64, Nullable: true}}, nil)
+}
+
+// Prepare records for ingestion with known length and schema
+func getIngestRecords() array.RecordReader {
+	schema := getIngestSchema()
+
+	arr := array.MakeArrayOfNull(memory.DefaultAllocator, arrow.PrimitiveTypes.Int64, int(ingestStatementExpectedRows))
+	defer arr.Release()
+
+	rec := array.NewRecord(schema, []arrow.Array{arr}, ingestStatementExpectedRows)
+	defer rec.Release()
+
+	rdr, _ := array.NewRecordReader(schema, []arrow.Record{rec})
+
+	return rdr
+}
diff --git a/go/arrow/internal/testing/gen/random_array_gen.go b/go/arrow/internal/testing/gen/random_array_gen.go
index 16ff7a0b41e94..05a8749d15dce 100644
--- a/go/arrow/internal/testing/gen/random_array_gen.go
+++ b/go/arrow/internal/testing/gen/random_array_gen.go
@@ -19,11 +19,11 @@ package gen
 import (
 	"math"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"golang.org/x/exp/rand"
 	"gonum.org/v1/gonum/stat/distuv"
 )
diff --git a/go/arrow/internal/testing/tools/bits_test.go b/go/arrow/internal/testing/tools/bits_test.go
index b33f1a173a34d..e9a638a6b9b2a 100644
--- a/go/arrow/internal/testing/tools/bits_test.go
+++ b/go/arrow/internal/testing/tools/bits_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/testing/tools"
+	"github.com/apache/arrow/go/v17/arrow/internal/testing/tools"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/internal/testing/tools/data_types.go b/go/arrow/internal/testing/tools/data_types.go
index 490b9474232d7..bbfa1af0f6703 100644
--- a/go/arrow/internal/testing/tools/data_types.go
+++ b/go/arrow/internal/testing/tools/data_types.go
@@ -21,8 +21,8 @@ package tools
 import (
 	"reflect"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/float16"
 	"golang.org/x/exp/constraints"
 )
 
diff --git a/go/arrow/internal/utils.go b/go/arrow/internal/utils.go
index f3831f6961bec..2f1f2346f1d3b 100644
--- a/go/arrow/internal/utils.go
+++ b/go/arrow/internal/utils.go
@@ -17,8 +17,8 @@
 package internal
 
 import (
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/internal/flatbuf"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/internal/flatbuf"
 )
 
 const CurMetadataVersion = flatbuf.MetadataVersionV5
diff --git a/go/arrow/ipc/cmd/arrow-cat/main.go b/go/arrow/ipc/cmd/arrow-cat/main.go
index 8fe55054c44a9..4faaabb05ddc1 100644
--- a/go/arrow/ipc/cmd/arrow-cat/main.go
+++ b/go/arrow/ipc/cmd/arrow-cat/main.go
@@ -18,40 +18,40 @@
 //
 // Examples:
 //
-//  $> arrow-cat ./testdata/primitives.data
-//  version: V4
-//  record 1/3...
-//    col[0] "bools": [true (null) (null) false true]
-//    col[1] "int8s": [-1 (null) (null) -4 -5]
-//    col[2] "int16s": [-1 (null) (null) -4 -5]
-//    col[3] "int32s": [-1 (null) (null) -4 -5]
-//    col[4] "int64s": [-1 (null) (null) -4 -5]
-//    col[5] "uint8s": [1 (null) (null) 4 5]
-//    col[6] "uint16s": [1 (null) (null) 4 5]
-//    col[7] "uint32s": [1 (null) (null) 4 5]
-//    col[8] "uint64s": [1 (null) (null) 4 5]
-//    col[9] "float32s": [1 (null) (null) 4 5]
-//    col[10] "float64s": [1 (null) (null) 4 5]
-//  record 2/3...
-//    col[0] "bools": [true (null) (null) false true]
-//  [...]
+//	$> arrow-cat ./testdata/primitives.data
+//	version: V4
+//	record 1/3...
+//	  col[0] "bools": [true (null) (null) false true]
+//	  col[1] "int8s": [-1 (null) (null) -4 -5]
+//	  col[2] "int16s": [-1 (null) (null) -4 -5]
+//	  col[3] "int32s": [-1 (null) (null) -4 -5]
+//	  col[4] "int64s": [-1 (null) (null) -4 -5]
+//	  col[5] "uint8s": [1 (null) (null) 4 5]
+//	  col[6] "uint16s": [1 (null) (null) 4 5]
+//	  col[7] "uint32s": [1 (null) (null) 4 5]
+//	  col[8] "uint64s": [1 (null) (null) 4 5]
+//	  col[9] "float32s": [1 (null) (null) 4 5]
+//	  col[10] "float64s": [1 (null) (null) 4 5]
+//	record 2/3...
+//	  col[0] "bools": [true (null) (null) false true]
+//	[...]
 //
-//  $> gen-arrow-stream | arrow-cat
-//  record 1...
-//    col[0] "bools": [true (null) (null) false true]
-//    col[1] "int8s": [-1 (null) (null) -4 -5]
-//    col[2] "int16s": [-1 (null) (null) -4 -5]
-//    col[3] "int32s": [-1 (null) (null) -4 -5]
-//    col[4] "int64s": [-1 (null) (null) -4 -5]
-//    col[5] "uint8s": [1 (null) (null) 4 5]
-//    col[6] "uint16s": [1 (null) (null) 4 5]
-//    col[7] "uint32s": [1 (null) (null) 4 5]
-//    col[8] "uint64s": [1 (null) (null) 4 5]
-//    col[9] "float32s": [1 (null) (null) 4 5]
-//    col[10] "float64s": [1 (null) (null) 4 5]
-//  record 2...
-//    col[0] "bools": [true (null) (null) false true]
-//  [...]
+//	$> gen-arrow-stream | arrow-cat
+//	record 1...
+//	  col[0] "bools": [true (null) (null) false true]
+//	  col[1] "int8s": [-1 (null) (null) -4 -5]
+//	  col[2] "int16s": [-1 (null) (null) -4 -5]
+//	  col[3] "int32s": [-1 (null) (null) -4 -5]
+//	  col[4] "int64s": [-1 (null) (null) -4 -5]
+//	  col[5] "uint8s": [1 (null) (null) 4 5]
+//	  col[6] "uint16s": [1 (null) (null) 4 5]
+//	  col[7] "uint32s": [1 (null) (null) 4 5]
+//	  col[8] "uint64s": [1 (null) (null) 4 5]
+//	  col[9] "float32s": [1 (null) (null) 4 5]
+//	  col[10] "float64s": [1 (null) (null) 4 5]
+//	record 2...
+//	  col[0] "bools": [true (null) (null) false true]
+//	[...]
 package main
 
 import (
@@ -63,8 +63,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func main() {
diff --git a/go/arrow/ipc/cmd/arrow-cat/main_test.go b/go/arrow/ipc/cmd/arrow-cat/main_test.go
index d2a28271ce98e..53b89fadaf89f 100644
--- a/go/arrow/ipc/cmd/arrow-cat/main_test.go
+++ b/go/arrow/ipc/cmd/arrow-cat/main_test.go
@@ -23,10 +23,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/internal/arrdata"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/internal/arrdata"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func TestCatStream(t *testing.T) {
diff --git a/go/arrow/ipc/cmd/arrow-file-to-stream/main.go b/go/arrow/ipc/cmd/arrow-file-to-stream/main.go
index d47d4019775f2..514f8d42ce3a4 100644
--- a/go/arrow/ipc/cmd/arrow-file-to-stream/main.go
+++ b/go/arrow/ipc/cmd/arrow-file-to-stream/main.go
@@ -24,9 +24,9 @@ import (
 	"log"
 	"os"
 
-	"github.com/apache/arrow/go/v16/arrow/arrio"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/arrio"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func main() {
diff --git a/go/arrow/ipc/cmd/arrow-file-to-stream/main_test.go b/go/arrow/ipc/cmd/arrow-file-to-stream/main_test.go
index edd49e5acbf98..f671ff1d0987c 100644
--- a/go/arrow/ipc/cmd/arrow-file-to-stream/main_test.go
+++ b/go/arrow/ipc/cmd/arrow-file-to-stream/main_test.go
@@ -21,8 +21,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/arrdata"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/internal/arrdata"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func TestFileToStream(t *testing.T) {
diff --git a/go/arrow/ipc/cmd/arrow-json-integration-test/main.go b/go/arrow/ipc/cmd/arrow-json-integration-test/main.go
index 0c55c38cf991f..31669f6a0f00e 100644
--- a/go/arrow/ipc/cmd/arrow-json-integration-test/main.go
+++ b/go/arrow/ipc/cmd/arrow-json-integration-test/main.go
@@ -22,12 +22,12 @@ import (
 	"log"
 	"os"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/arrio"
-	"github.com/apache/arrow/go/v16/arrow/internal/arrjson"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/arrio"
+	"github.com/apache/arrow/go/v17/arrow/internal/arrjson"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/internal/types"
 )
 
 func main() {
diff --git a/go/arrow/ipc/cmd/arrow-json-integration-test/main_test.go b/go/arrow/ipc/cmd/arrow-json-integration-test/main_test.go
index 1d1fd76d97738..1aaf1430b4ff8 100644
--- a/go/arrow/ipc/cmd/arrow-json-integration-test/main_test.go
+++ b/go/arrow/ipc/cmd/arrow-json-integration-test/main_test.go
@@ -20,8 +20,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/arrdata"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/internal/arrdata"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func TestIntegration(t *testing.T) {
diff --git a/go/arrow/ipc/cmd/arrow-ls/main.go b/go/arrow/ipc/cmd/arrow-ls/main.go
index a4634c65df19f..2f54744c4068d 100644
--- a/go/arrow/ipc/cmd/arrow-ls/main.go
+++ b/go/arrow/ipc/cmd/arrow-ls/main.go
@@ -18,38 +18,38 @@
 //
 // Examples:
 //
-//  $> arrow-ls ./testdata/primitives.data
-//  version: V4
-//  schema:
-//    fields: 11
-//      - bools: type=bool, nullable
-//      - int8s: type=int8, nullable
-//      - int16s: type=int16, nullable
-//      - int32s: type=int32, nullable
-//      - int64s: type=int64, nullable
-//      - uint8s: type=uint8, nullable
-//      - uint16s: type=uint16, nullable
-//      - uint32s: type=uint32, nullable
-//      - uint64s: type=uint64, nullable
-//      - float32s: type=float32, nullable
-//      - float64s: type=float64, nullable
-//  records: 3
+//	$> arrow-ls ./testdata/primitives.data
+//	version: V4
+//	schema:
+//	  fields: 11
+//	    - bools: type=bool, nullable
+//	    - int8s: type=int8, nullable
+//	    - int16s: type=int16, nullable
+//	    - int32s: type=int32, nullable
+//	    - int64s: type=int64, nullable
+//	    - uint8s: type=uint8, nullable
+//	    - uint16s: type=uint16, nullable
+//	    - uint32s: type=uint32, nullable
+//	    - uint64s: type=uint64, nullable
+//	    - float32s: type=float32, nullable
+//	    - float64s: type=float64, nullable
+//	records: 3
 //
-//  $> gen-arrow-stream | arrow-ls
-//  schema:
-//    fields: 11
-//      - bools: type=bool, nullable
-//      - int8s: type=int8, nullable
-//      - int16s: type=int16, nullable
-//      - int32s: type=int32, nullable
-//      - int64s: type=int64, nullable
-//      - uint8s: type=uint8, nullable
-//      - uint16s: type=uint16, nullable
-//      - uint32s: type=uint32, nullable
-//      - uint64s: type=uint64, nullable
-//      - float32s: type=float32, nullable
-//      - float64s: type=float64, nullable
-//  records: 3
+//	$> gen-arrow-stream | arrow-ls
+//	schema:
+//	  fields: 11
+//	    - bools: type=bool, nullable
+//	    - int8s: type=int8, nullable
+//	    - int16s: type=int16, nullable
+//	    - int32s: type=int32, nullable
+//	    - int64s: type=int64, nullable
+//	    - uint8s: type=uint8, nullable
+//	    - uint16s: type=uint16, nullable
+//	    - uint32s: type=uint32, nullable
+//	    - uint64s: type=uint64, nullable
+//	    - float32s: type=float32, nullable
+//	    - float64s: type=float64, nullable
+//	records: 3
 package main
 
 import (
@@ -61,8 +61,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func main() {
diff --git a/go/arrow/ipc/cmd/arrow-ls/main_test.go b/go/arrow/ipc/cmd/arrow-ls/main_test.go
index 36c293ffc0e0a..2c123c064a638 100644
--- a/go/arrow/ipc/cmd/arrow-ls/main_test.go
+++ b/go/arrow/ipc/cmd/arrow-ls/main_test.go
@@ -23,10 +23,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/internal/arrdata"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/internal/arrdata"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func TestLsStream(t *testing.T) {
diff --git a/go/arrow/ipc/cmd/arrow-stream-to-file/main.go b/go/arrow/ipc/cmd/arrow-stream-to-file/main.go
index 3fbb534145c2b..3ea635ec03a2a 100644
--- a/go/arrow/ipc/cmd/arrow-stream-to-file/main.go
+++ b/go/arrow/ipc/cmd/arrow-stream-to-file/main.go
@@ -24,9 +24,9 @@ import (
 	"log"
 	"os"
 
-	"github.com/apache/arrow/go/v16/arrow/arrio"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/arrio"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func main() {
diff --git a/go/arrow/ipc/cmd/arrow-stream-to-file/main_test.go b/go/arrow/ipc/cmd/arrow-stream-to-file/main_test.go
index d5545763f1169..2ae0c7c64624f 100644
--- a/go/arrow/ipc/cmd/arrow-stream-to-file/main_test.go
+++ b/go/arrow/ipc/cmd/arrow-stream-to-file/main_test.go
@@ -21,8 +21,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/arrdata"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/internal/arrdata"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func TestStreamToFile(t *testing.T) {
diff --git a/go/arrow/ipc/compression.go b/go/arrow/ipc/compression.go
index 7d9c19093ad7f..12bb5d402d5e6 100644
--- a/go/arrow/ipc/compression.go
+++ b/go/arrow/ipc/compression.go
@@ -19,9 +19,9 @@ package ipc
 import (
 	"io"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/internal/flatbuf"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/internal/flatbuf"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/klauspost/compress/zstd"
 	"github.com/pierrec/lz4/v4"
 )
diff --git a/go/arrow/ipc/endian_swap.go b/go/arrow/ipc/endian_swap.go
index 244a5718c9da7..af4dead45a6df 100644
--- a/go/arrow/ipc/endian_swap.go
+++ b/go/arrow/ipc/endian_swap.go
@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"math/bits"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 // swap the endianness of the array's buffers as needed in-place to save
diff --git a/go/arrow/ipc/endian_swap_test.go b/go/arrow/ipc/endian_swap_test.go
index 8667e1cf5d28d..102ae4364345f 100644
--- a/go/arrow/ipc/endian_swap_test.go
+++ b/go/arrow/ipc/endian_swap_test.go
@@ -20,11 +20,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/endian"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/go/arrow/ipc/file_reader.go b/go/arrow/ipc/file_reader.go
index d0118279afa4d..031a028a558be 100644
--- a/go/arrow/ipc/file_reader.go
+++ b/go/arrow/ipc/file_reader.go
@@ -23,14 +23,14 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/endian"
-	"github.com/apache/arrow/go/v16/arrow/internal"
-	"github.com/apache/arrow/go/v16/arrow/internal/dictutils"
-	"github.com/apache/arrow/go/v16/arrow/internal/flatbuf"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/internal"
+	"github.com/apache/arrow/go/v17/arrow/internal/dictutils"
+	"github.com/apache/arrow/go/v17/arrow/internal/flatbuf"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 // FileReader is an Arrow file reader.
diff --git a/go/arrow/ipc/file_test.go b/go/arrow/ipc/file_test.go
index 87c3f4ddd4a65..a24f61e8c29c9 100644
--- a/go/arrow/ipc/file_test.go
+++ b/go/arrow/ipc/file_test.go
@@ -21,9 +21,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/arrdata"
-	"github.com/apache/arrow/go/v16/arrow/internal/flatbuf"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/internal/arrdata"
+	"github.com/apache/arrow/go/v17/arrow/internal/flatbuf"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func TestFile(t *testing.T) {
diff --git a/go/arrow/ipc/file_writer.go b/go/arrow/ipc/file_writer.go
index 5812745e7d759..8cea458192b85 100644
--- a/go/arrow/ipc/file_writer.go
+++ b/go/arrow/ipc/file_writer.go
@@ -21,11 +21,11 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal/dictutils"
-	"github.com/apache/arrow/go/v16/arrow/internal/flatbuf"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal/dictutils"
+	"github.com/apache/arrow/go/v17/arrow/internal/flatbuf"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 // PayloadWriter is an interface for injecting a different payloadwriter
@@ -278,6 +278,7 @@ type FileWriter struct {
 	mapper          dictutils.Mapper
 	codec           flatbuf.CompressionType
 	compressNP      int
+	compressors     []compressor
 	minSpaceSavings *float64
 
 	// map of the last written dictionaries by id
@@ -302,6 +303,7 @@ func NewFileWriter(w io.WriteSeeker, opts ...Option) (*FileWriter, error) {
 		codec:           cfg.codec,
 		compressNP:      cfg.compressNP,
 		minSpaceSavings: cfg.minSpaceSavings,
+		compressors:     make([]compressor, cfg.compressNP),
 	}
 
 	pos, err := f.w.Seek(0, io.SeekCurrent)
@@ -345,7 +347,9 @@ func (f *FileWriter) Write(rec arrow.Record) error {
 	const allow64b = true
 	var (
 		data = Payload{msg: MessageRecordBatch}
-		enc  = newRecordEncoder(f.mem, 0, kMaxNestingDepth, allow64b, f.codec, f.compressNP, f.minSpaceSavings)
+		enc  = newRecordEncoder(
+			f.mem, 0, kMaxNestingDepth, allow64b, f.codec, f.compressNP, f.minSpaceSavings, f.compressors,
+		)
 	)
 	defer data.Release()
 
diff --git a/go/arrow/ipc/ipc.go b/go/arrow/ipc/ipc.go
index 16ca907350934..b31a358a8a8e0 100644
--- a/go/arrow/ipc/ipc.go
+++ b/go/arrow/ipc/ipc.go
@@ -19,10 +19,10 @@ package ipc
 import (
 	"io"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/arrio"
-	"github.com/apache/arrow/go/v16/arrow/internal/flatbuf"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/arrio"
+	"github.com/apache/arrow/go/v17/arrow/internal/flatbuf"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 const (
@@ -79,6 +79,7 @@ func newConfig(opts ...Option) *config {
 		alloc:              memory.NewGoAllocator(),
 		codec:              -1, // uncompressed
 		ensureNativeEndian: true,
+		compressNP:         1,
 	}
 
 	for _, opt := range opts {
@@ -132,9 +133,12 @@ func WithZstd() Option {
 // WithCompressConcurrency specifies a number of goroutines to spin up for
 // concurrent compression of the body buffers when writing compress IPC records.
 // If n <= 1 then compression will be done serially without goroutine
-// parallelization. Default is 0.
+// parallelization. Default is 1.
 func WithCompressConcurrency(n int) Option {
 	return func(cfg *config) {
+		if n <= 0 {
+			n = 1
+		}
 		cfg.compressNP = n
 	}
 }
diff --git a/go/arrow/ipc/ipc_test.go b/go/arrow/ipc/ipc_test.go
index 247cad04ee409..6348eff2e8393 100644
--- a/go/arrow/ipc/ipc_test.go
+++ b/go/arrow/ipc/ipc_test.go
@@ -29,10 +29,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func TestArrow12072(t *testing.T) {
diff --git a/go/arrow/ipc/message.go b/go/arrow/ipc/message.go
index b1616c891fd50..23142d04c8229 100644
--- a/go/arrow/ipc/message.go
+++ b/go/arrow/ipc/message.go
@@ -22,9 +22,9 @@ import (
 	"io"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/internal/flatbuf"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/internal/flatbuf"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 // MetadataVersion represents the Arrow metadata version.
diff --git a/go/arrow/ipc/message_test.go b/go/arrow/ipc/message_test.go
index 2ad3334c1e0d6..f81b0cb2845f7 100644
--- a/go/arrow/ipc/message_test.go
+++ b/go/arrow/ipc/message_test.go
@@ -22,9 +22,9 @@ import (
 	"io"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func TestMessageReaderBodyInAllocator(t *testing.T) {
diff --git a/go/arrow/ipc/metadata.go b/go/arrow/ipc/metadata.go
index 62167bcecfb69..604adab322959 100644
--- a/go/arrow/ipc/metadata.go
+++ b/go/arrow/ipc/metadata.go
@@ -23,11 +23,11 @@ import (
 	"io"
 	"sort"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/endian"
-	"github.com/apache/arrow/go/v16/arrow/internal/dictutils"
-	"github.com/apache/arrow/go/v16/arrow/internal/flatbuf"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/internal/dictutils"
+	"github.com/apache/arrow/go/v17/arrow/internal/flatbuf"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	flatbuffers "github.com/google/flatbuffers/go"
 )
 
diff --git a/go/arrow/ipc/metadata_test.go b/go/arrow/ipc/metadata_test.go
index 339059db5efdc..f24ac204129e2 100644
--- a/go/arrow/ipc/metadata_test.go
+++ b/go/arrow/ipc/metadata_test.go
@@ -21,12 +21,12 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/internal/dictutils"
-	"github.com/apache/arrow/go/v16/arrow/internal/flatbuf"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/internal/dictutils"
+	"github.com/apache/arrow/go/v17/arrow/internal/flatbuf"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/types"
 	flatbuffers "github.com/google/flatbuffers/go"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/go/arrow/ipc/reader.go b/go/arrow/ipc/reader.go
index 9b0810c50e67f..aeb47cfbd25c5 100644
--- a/go/arrow/ipc/reader.go
+++ b/go/arrow/ipc/reader.go
@@ -23,13 +23,14 @@ import (
 	"io"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/endian"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/internal/dictutils"
-	"github.com/apache/arrow/go/v16/arrow/internal/flatbuf"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/internal/dictutils"
+	"github.com/apache/arrow/go/v17/arrow/internal/flatbuf"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
 )
 
 // Reader reads records from an io.Reader.
@@ -60,7 +61,7 @@ type Reader struct {
 func NewReaderFromMessageReader(r MessageReader, opts ...Option) (reader *Reader, err error) {
 	defer func() {
 		if pErr := recover(); pErr != nil {
-			err = fmt.Errorf("arrow/ipc: unknown error while reading: %v", pErr)
+			err = utils.FormatRecoveredError("arrow/ipc: unknown error while reading", pErr)
 		}
 	}()
 	cfg := newConfig()
@@ -213,7 +214,7 @@ func (r *Reader) getInitialDicts() bool {
 func (r *Reader) next() bool {
 	defer func() {
 		if pErr := recover(); pErr != nil {
-			r.err = fmt.Errorf("arrow/ipc: unknown error while reading: %v", pErr)
+			r.err = utils.FormatRecoveredError("arrow/ipc: unknown error while reading", pErr)
 		}
 	}()
 	if r.schema == nil {
diff --git a/go/arrow/ipc/reader_test.go b/go/arrow/ipc/reader_test.go
index 35ada57018701..556d372881ec0 100644
--- a/go/arrow/ipc/reader_test.go
+++ b/go/arrow/ipc/reader_test.go
@@ -22,9 +22,9 @@ import (
 	"io"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/go/arrow/ipc/stream_test.go b/go/arrow/ipc/stream_test.go
index fc0cdce62da95..14937a3caca97 100644
--- a/go/arrow/ipc/stream_test.go
+++ b/go/arrow/ipc/stream_test.go
@@ -22,9 +22,9 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/arrdata"
-	"github.com/apache/arrow/go/v16/arrow/internal/flatbuf"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/internal/arrdata"
+	"github.com/apache/arrow/go/v17/arrow/internal/flatbuf"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func TestStream(t *testing.T) {
diff --git a/go/arrow/ipc/writer.go b/go/arrow/ipc/writer.go
index 588273166aa99..f2afd2db4274c 100644
--- a/go/arrow/ipc/writer.go
+++ b/go/arrow/ipc/writer.go
@@ -26,15 +26,15 @@ import (
 	"sync"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/internal/dictutils"
-	"github.com/apache/arrow/go/v16/arrow/internal/flatbuf"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/internal/dictutils"
+	"github.com/apache/arrow/go/v17/arrow/internal/flatbuf"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
 )
 
 type swriter struct {
@@ -86,6 +86,7 @@ type Writer struct {
 	mapper          dictutils.Mapper
 	codec           flatbuf.CompressionType
 	compressNP      int
+	compressors     []compressor
 	minSpaceSavings *float64
 
 	// map of the last written dictionaries by id
@@ -107,6 +108,7 @@ func NewWriterWithPayloadWriter(pw PayloadWriter, opts ...Option) *Writer {
 		compressNP:      cfg.compressNP,
 		minSpaceSavings: cfg.minSpaceSavings,
 		emitDictDeltas:  cfg.emitDictDeltas,
+		compressors:     make([]compressor, cfg.compressNP),
 	}
 }
 
@@ -120,6 +122,8 @@ func NewWriter(w io.Writer, opts ...Option) *Writer {
 		schema:         cfg.schema,
 		codec:          cfg.codec,
 		emitDictDeltas: cfg.emitDictDeltas,
+		compressNP:     cfg.compressNP,
+		compressors:    make([]compressor, cfg.compressNP),
 	}
 }
 
@@ -151,7 +155,7 @@ func (w *Writer) Close() error {
 func (w *Writer) Write(rec arrow.Record) (err error) {
 	defer func() {
 		if pErr := recover(); pErr != nil {
-			err = fmt.Errorf("arrow/ipc: unknown error while writing: %v", pErr)
+			err = utils.FormatRecoveredError("arrow/ipc: unknown error while writing", pErr)
 		}
 	}()
 
@@ -170,7 +174,16 @@ func (w *Writer) Write(rec arrow.Record) (err error) {
 	const allow64b = true
 	var (
 		data = Payload{msg: MessageRecordBatch}
-		enc  = newRecordEncoder(w.mem, 0, kMaxNestingDepth, allow64b, w.codec, w.compressNP, w.minSpaceSavings)
+		enc  = newRecordEncoder(
+			w.mem,
+			0,
+			kMaxNestingDepth,
+			allow64b,
+			w.codec,
+			w.compressNP,
+			w.minSpaceSavings,
+			w.compressors,
+		)
 	)
 	defer data.Release()
 
@@ -310,10 +323,20 @@ type recordEncoder struct {
 	allow64b        bool
 	codec           flatbuf.CompressionType
 	compressNP      int
+	compressors     []compressor
 	minSpaceSavings *float64
 }
 
-func newRecordEncoder(mem memory.Allocator, startOffset, maxDepth int64, allow64b bool, codec flatbuf.CompressionType, compressNP int, minSpaceSavings *float64) *recordEncoder {
+func newRecordEncoder(
+	mem memory.Allocator,
+	startOffset,
+	maxDepth int64,
+	allow64b bool,
+	codec flatbuf.CompressionType,
+	compressNP int,
+	minSpaceSavings *float64,
+	compressors []compressor,
+) *recordEncoder {
 	return &recordEncoder{
 		mem:             mem,
 		start:           startOffset,
@@ -321,6 +344,7 @@ func newRecordEncoder(mem memory.Allocator, startOffset, maxDepth int64, allow64
 		allow64b:        allow64b,
 		codec:           codec,
 		compressNP:      compressNP,
+		compressors:     compressors,
 		minSpaceSavings: minSpaceSavings,
 	}
 }
@@ -340,6 +364,13 @@ func (w *recordEncoder) reset() {
 	w.fields = make([]fieldMetadata, 0)
 }
 
+func (w *recordEncoder) getCompressor(id int) compressor {
+	if w.compressors[id] == nil {
+		w.compressors[id] = getCompressor(w.codec)
+	}
+	return w.compressors[id]
+}
+
 func (w *recordEncoder) compressBodyBuffers(p *Payload) error {
 	compress := func(idx int, codec compressor) error {
 		if p.body[idx] == nil || p.body[idx].Len() == 0 {
@@ -378,7 +409,7 @@ func (w *recordEncoder) compressBodyBuffers(p *Payload) error {
 	}
 
 	if w.compressNP <= 1 {
-		codec := getCompressor(w.codec)
+		codec := w.getCompressor(0)
 		for idx := range p.body {
 			if err := compress(idx, codec); err != nil {
 				return err
@@ -395,11 +426,11 @@ func (w *recordEncoder) compressBodyBuffers(p *Payload) error {
 	)
 	defer cancel()
 
-	for i := 0; i < w.compressNP; i++ {
+	for workerID := 0; workerID < w.compressNP; workerID++ {
 		wg.Add(1)
-		go func() {
+		go func(id int) {
 			defer wg.Done()
-			codec := getCompressor(w.codec)
+			codec := w.getCompressor(id)
 			for {
 				select {
 				case idx, ok := <-ch:
@@ -418,7 +449,7 @@ func (w *recordEncoder) compressBodyBuffers(p *Payload) error {
 					return
 				}
 			}
-		}()
+		}(workerID)
 	}
 
 	for idx := range p.body {
diff --git a/go/arrow/ipc/writer_test.go b/go/arrow/ipc/writer_test.go
index a1bf92efbcc8a..4e519ed293422 100644
--- a/go/arrow/ipc/writer_test.go
+++ b/go/arrow/ipc/writer_test.go
@@ -24,11 +24,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/internal/flatbuf"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/internal/flatbuf"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -193,7 +193,8 @@ func TestWriteWithCompressionAndMinSavings(t *testing.T) {
 	}
 
 	for _, codec := range []flatbuf.CompressionType{flatbuf.CompressionTypeLZ4_FRAME, flatbuf.CompressionTypeZSTD} {
-		enc := newRecordEncoder(mem, 0, 5, true, codec, 1, nil)
+		compressors := []compressor{getCompressor(codec)}
+		enc := newRecordEncoder(mem, 0, 5, true, codec, 1, nil, compressors)
 		var payload Payload
 		require.NoError(t, enc.encode(&payload, batch))
 		assert.Len(t, payload.body, 2)
@@ -205,7 +206,7 @@ func TestWriteWithCompressionAndMinSavings(t *testing.T) {
 		assert.Greater(t, compressedSize, int64(0))
 		expectedSavings := 1.0 - float64(compressedSize)/float64(uncompressedSize)
 
-		compressEncoder := newRecordEncoder(mem, 0, 5, true, codec, 1, &expectedSavings)
+		compressEncoder := newRecordEncoder(mem, 0, 5, true, codec, 1, &expectedSavings, compressors)
 		payload.Release()
 		payload.body = payload.body[:0]
 		require.NoError(t, compressEncoder.encode(&payload, batch))
diff --git a/go/arrow/math/float64.go b/go/arrow/math/float64.go
index f99cba737f8dc..4f8fca9e0e959 100644
--- a/go/arrow/math/float64.go
+++ b/go/arrow/math/float64.go
@@ -19,7 +19,7 @@
 package math
 
 import (
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 type Float64Funcs struct {
diff --git a/go/arrow/math/float64_avx2_amd64.go b/go/arrow/math/float64_avx2_amd64.go
index 0d98573720627..73f0126e30f67 100644
--- a/go/arrow/math/float64_avx2_amd64.go
+++ b/go/arrow/math/float64_avx2_amd64.go
@@ -24,7 +24,7 @@ package math
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 //go:noescape
diff --git a/go/arrow/math/float64_neon_arm64.go b/go/arrow/math/float64_neon_arm64.go
index 91b018ff655ec..77f97f5e68bd8 100755
--- a/go/arrow/math/float64_neon_arm64.go
+++ b/go/arrow/math/float64_neon_arm64.go
@@ -24,7 +24,7 @@ package math
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 //go:noescape
diff --git a/go/arrow/math/float64_sse4_amd64.go b/go/arrow/math/float64_sse4_amd64.go
index 8ec3a46f676b1..ea1a1a009011f 100644
--- a/go/arrow/math/float64_sse4_amd64.go
+++ b/go/arrow/math/float64_sse4_amd64.go
@@ -24,7 +24,7 @@ package math
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 //go:noescape
diff --git a/go/arrow/math/float64_test.go b/go/arrow/math/float64_test.go
index f734f35dcb13c..637db6e42b556 100644
--- a/go/arrow/math/float64_test.go
+++ b/go/arrow/math/float64_test.go
@@ -21,9 +21,9 @@ package math_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/math"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/math"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/math/int64.go b/go/arrow/math/int64.go
index 9abc1f591d68c..457e9d37465d9 100644
--- a/go/arrow/math/int64.go
+++ b/go/arrow/math/int64.go
@@ -19,7 +19,7 @@
 package math
 
 import (
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 type Int64Funcs struct {
diff --git a/go/arrow/math/int64_avx2_amd64.go b/go/arrow/math/int64_avx2_amd64.go
index 84a6d60d5f2c6..791436adb0a15 100644
--- a/go/arrow/math/int64_avx2_amd64.go
+++ b/go/arrow/math/int64_avx2_amd64.go
@@ -24,7 +24,7 @@ package math
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 //go:noescape
diff --git a/go/arrow/math/int64_neon_arm64.go b/go/arrow/math/int64_neon_arm64.go
index 03ad1b43d80a7..6439e00e9f999 100755
--- a/go/arrow/math/int64_neon_arm64.go
+++ b/go/arrow/math/int64_neon_arm64.go
@@ -24,7 +24,7 @@ package math
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 //go:noescape
diff --git a/go/arrow/math/int64_sse4_amd64.go b/go/arrow/math/int64_sse4_amd64.go
index c3d76991b074b..dca70c838baf2 100644
--- a/go/arrow/math/int64_sse4_amd64.go
+++ b/go/arrow/math/int64_sse4_amd64.go
@@ -24,7 +24,7 @@ package math
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 //go:noescape
diff --git a/go/arrow/math/int64_test.go b/go/arrow/math/int64_test.go
index dd5b78d107737..4e6f808db0516 100644
--- a/go/arrow/math/int64_test.go
+++ b/go/arrow/math/int64_test.go
@@ -21,9 +21,9 @@ package math_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/math"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/math"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/math/math_amd64.go b/go/arrow/math/math_amd64.go
index 44301dc2415a5..2397eef718df9 100644
--- a/go/arrow/math/math_amd64.go
+++ b/go/arrow/math/math_amd64.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package math
diff --git a/go/arrow/math/math_arm64.go b/go/arrow/math/math_arm64.go
index 014664b046308..b150eb061f9f5 100644
--- a/go/arrow/math/math_arm64.go
+++ b/go/arrow/math/math_arm64.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package math
@@ -25,8 +26,8 @@ import (
 func init() {
 	if cpu.ARM64.HasASIMD {
 		initNEON()
-    } else {
-	    initGo()
+	} else {
+		initGo()
 	}
 }
 
diff --git a/go/arrow/math/math_noasm.go b/go/arrow/math/math_noasm.go
index 0fa924d90aa88..5527ebf801891 100644
--- a/go/arrow/math/math_noasm.go
+++ b/go/arrow/math/math_noasm.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build noasm
 // +build noasm
 
 package math
diff --git a/go/arrow/math/math_ppc64le.go b/go/arrow/math/math_ppc64le.go
index 3daeac7efaff8..85c8f2fe2e758 100644
--- a/go/arrow/math/math_ppc64le.go
+++ b/go/arrow/math/math_ppc64le.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package math
diff --git a/go/arrow/math/math_s390x.go b/go/arrow/math/math_s390x.go
index 3daeac7efaff8..85c8f2fe2e758 100644
--- a/go/arrow/math/math_s390x.go
+++ b/go/arrow/math/math_s390x.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package math
diff --git a/go/arrow/math/type.go.tmpl b/go/arrow/math/type.go.tmpl
index 7ec4dda4feadf..a4e25ae574548 100644
--- a/go/arrow/math/type.go.tmpl
+++ b/go/arrow/math/type.go.tmpl
@@ -17,7 +17,7 @@
 package math
 
 import (
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 {{$def := .D}}
diff --git a/go/arrow/math/type_simd_amd64.go.tmpl b/go/arrow/math/type_simd_amd64.go.tmpl
index 336496f39d51f..86b31e31152bc 100644
--- a/go/arrow/math/type_simd_amd64.go.tmpl
+++ b/go/arrow/math/type_simd_amd64.go.tmpl
@@ -21,7 +21,7 @@ package math
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 {{$name := printf "%s_%s" .In.Type .D.arch}}
diff --git a/go/arrow/math/type_simd_arm64.go.tmpl b/go/arrow/math/type_simd_arm64.go.tmpl
index 336496f39d51f..86b31e31152bc 100755
--- a/go/arrow/math/type_simd_arm64.go.tmpl
+++ b/go/arrow/math/type_simd_arm64.go.tmpl
@@ -21,7 +21,7 @@ package math
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 {{$name := printf "%s_%s" .In.Type .D.arch}}
diff --git a/go/arrow/math/type_test.go.tmpl b/go/arrow/math/type_test.go.tmpl
index 9c412327b7a85..4b11c043155a6 100644
--- a/go/arrow/math/type_test.go.tmpl
+++ b/go/arrow/math/type_test.go.tmpl
@@ -19,9 +19,9 @@ package math_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/math"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/math"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/math/uint64.go b/go/arrow/math/uint64.go
index 6da7427879d49..3b752caecdaf9 100644
--- a/go/arrow/math/uint64.go
+++ b/go/arrow/math/uint64.go
@@ -19,7 +19,7 @@
 package math
 
 import (
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 type Uint64Funcs struct {
diff --git a/go/arrow/math/uint64_avx2_amd64.go b/go/arrow/math/uint64_avx2_amd64.go
index 01b29f5e9b27b..a4092e2140b1e 100644
--- a/go/arrow/math/uint64_avx2_amd64.go
+++ b/go/arrow/math/uint64_avx2_amd64.go
@@ -24,7 +24,7 @@ package math
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 //go:noescape
diff --git a/go/arrow/math/uint64_neon_arm64.go b/go/arrow/math/uint64_neon_arm64.go
index df7bcc7340361..574bbe4064f2a 100755
--- a/go/arrow/math/uint64_neon_arm64.go
+++ b/go/arrow/math/uint64_neon_arm64.go
@@ -24,7 +24,7 @@ package math
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 //go:noescape
diff --git a/go/arrow/math/uint64_sse4_amd64.go b/go/arrow/math/uint64_sse4_amd64.go
index 031a36635fb46..fff3f3ffeeb31 100644
--- a/go/arrow/math/uint64_sse4_amd64.go
+++ b/go/arrow/math/uint64_sse4_amd64.go
@@ -24,7 +24,7 @@ package math
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 //go:noescape
diff --git a/go/arrow/math/uint64_test.go b/go/arrow/math/uint64_test.go
index d332e8e766c74..3403bf5039159 100644
--- a/go/arrow/math/uint64_test.go
+++ b/go/arrow/math/uint64_test.go
@@ -21,9 +21,9 @@ package math_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/math"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/math"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/memory/buffer.go b/go/arrow/memory/buffer.go
index f45d0d55da602..55a17afcf7401 100644
--- a/go/arrow/memory/buffer.go
+++ b/go/arrow/memory/buffer.go
@@ -19,7 +19,7 @@ package memory
 import (
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 )
 
 // Buffer is a wrapper type for a buffer of bytes.
diff --git a/go/arrow/memory/buffer_test.go b/go/arrow/memory/buffer_test.go
index b97fe4b3ae4ab..d61b4e0a3bb4f 100644
--- a/go/arrow/memory/buffer_test.go
+++ b/go/arrow/memory/buffer_test.go
@@ -19,7 +19,7 @@ package memory_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/memory/cgo_allocator.go b/go/arrow/memory/cgo_allocator.go
index 9b8bb467a2c4f..5eb66ade9d861 100644
--- a/go/arrow/memory/cgo_allocator.go
+++ b/go/arrow/memory/cgo_allocator.go
@@ -14,15 +14,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build cgo
-// +build ccalloc
+//go:build cgo && ccalloc
+// +build cgo,ccalloc
 
 package memory
 
 import (
 	"runtime"
 
-	cga "github.com/apache/arrow/go/v16/arrow/memory/internal/cgoalloc"
+	cga "github.com/apache/arrow/go/v17/arrow/memory/internal/cgoalloc"
 )
 
 // CgoArrowAllocator is an allocator which exposes the C++ memory pool class
diff --git a/go/arrow/memory/cgo_allocator_defaults.go b/go/arrow/memory/cgo_allocator_defaults.go
index 501431a0e1eb2..0a2e9a342d37c 100644
--- a/go/arrow/memory/cgo_allocator_defaults.go
+++ b/go/arrow/memory/cgo_allocator_defaults.go
@@ -14,9 +14,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build cgo
-// +build ccalloc
-// +build !cclog
+//go:build cgo && ccalloc && !cclog
+// +build cgo,ccalloc,!cclog
 
 package memory
 
diff --git a/go/arrow/memory/cgo_allocator_logging.go b/go/arrow/memory/cgo_allocator_logging.go
index 01ad6b394807d..fe2e3a940ce21 100644
--- a/go/arrow/memory/cgo_allocator_logging.go
+++ b/go/arrow/memory/cgo_allocator_logging.go
@@ -14,9 +14,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build cgo
-// +build ccalloc
-// +build cclog
+//go:build cgo && ccalloc && cclog
+// +build cgo,ccalloc,cclog
 
 package memory
 
diff --git a/go/arrow/memory/cgo_allocator_test.go b/go/arrow/memory/cgo_allocator_test.go
index e7a03767fc89a..4c07cc326c87f 100644
--- a/go/arrow/memory/cgo_allocator_test.go
+++ b/go/arrow/memory/cgo_allocator_test.go
@@ -14,8 +14,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build cgo
-// +build ccalloc
+//go:build cgo && ccalloc
+// +build cgo,ccalloc
 
 package memory
 
diff --git a/go/arrow/memory/default_mallocator.go b/go/arrow/memory/default_mallocator.go
index 414f2c2d87e62..b30e7e75d8080 100644
--- a/go/arrow/memory/default_mallocator.go
+++ b/go/arrow/memory/default_mallocator.go
@@ -19,7 +19,7 @@
 package memory
 
 import (
-	"github.com/apache/arrow/go/v16/arrow/memory/mallocator"
+	"github.com/apache/arrow/go/v17/arrow/memory/mallocator"
 )
 
 // DefaultAllocator is a default implementation of Allocator and can be used anywhere
diff --git a/go/arrow/memory/default_mallocator_test.go b/go/arrow/memory/default_mallocator_test.go
index 904230cba503c..8737a5224e0f4 100644
--- a/go/arrow/memory/default_mallocator_test.go
+++ b/go/arrow/memory/default_mallocator_test.go
@@ -21,8 +21,8 @@ package memory_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/memory/mallocator"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/memory/mallocator"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/memory/mallocator/mallocator.go b/go/arrow/memory/mallocator/mallocator.go
index 59d240a1063e8..9483bdfc2a05f 100644
--- a/go/arrow/memory/mallocator/mallocator.go
+++ b/go/arrow/memory/mallocator/mallocator.go
@@ -60,10 +60,19 @@ func (alloc *Mallocator) Allocate(size int) []byte {
 	}
 	ptr, err := C.calloc(C.size_t(size), 1)
 	if err != nil {
-		panic(err)
+		// under some circumstances and allocation patterns, we can end up in a scenario
+		// where for some reason calloc return ENOMEM even though there is definitely memory
+		// available for use. So we attempt to fallback to simply doing malloc + memset in
+		// this case. If malloc returns a nil pointer, then we know we're out of memory
+		// and will surface the error.
+		if ptr = C.malloc(C.size_t(size)); ptr == nil {
+			panic(err)
+		}
+		C.memset(ptr, 0, C.size_t(size))
 	} else if ptr == nil {
 		panic("mallocator: out of memory")
 	}
+
 	atomic.AddUint64(&alloc.allocatedBytes, uint64(size))
 	return unsafe.Slice((*byte)(ptr), size)
 }
diff --git a/go/arrow/memory/mallocator/mallocator_test.go b/go/arrow/memory/mallocator/mallocator_test.go
index fa98208f66ecc..4070cc32b2735 100644
--- a/go/arrow/memory/mallocator/mallocator_test.go
+++ b/go/arrow/memory/mallocator/mallocator_test.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/memory/mallocator"
+	"github.com/apache/arrow/go/v17/arrow/memory/mallocator"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/memory/memory_amd64.go b/go/arrow/memory/memory_amd64.go
index 58356d6482558..895ddc07cf81f 100644
--- a/go/arrow/memory/memory_amd64.go
+++ b/go/arrow/memory/memory_amd64.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package memory
diff --git a/go/arrow/memory/memory_arm64.go b/go/arrow/memory/memory_arm64.go
index 3db5d11013164..5260334958526 100755
--- a/go/arrow/memory/memory_arm64.go
+++ b/go/arrow/memory/memory_arm64.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package memory
diff --git a/go/arrow/memory/memory_avx2_amd64.go b/go/arrow/memory/memory_avx2_amd64.go
index 2bd851ea53275..39fb3a5f7692f 100644
--- a/go/arrow/memory/memory_avx2_amd64.go
+++ b/go/arrow/memory/memory_avx2_amd64.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package memory
diff --git a/go/arrow/memory/memory_js_wasm.go b/go/arrow/memory/memory_js_wasm.go
index 9b94d99ff33ca..5cc0c84d39ee7 100644
--- a/go/arrow/memory/memory_js_wasm.go
+++ b/go/arrow/memory/memory_js_wasm.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build wasm
 // +build wasm
 
 package memory
diff --git a/go/arrow/memory/memory_neon_arm64.go b/go/arrow/memory/memory_neon_arm64.go
index 6cb0400c9c597..806ca575f22dd 100755
--- a/go/arrow/memory/memory_neon_arm64.go
+++ b/go/arrow/memory/memory_neon_arm64.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package memory
diff --git a/go/arrow/memory/memory_noasm.go b/go/arrow/memory/memory_noasm.go
index bf8846fa2e059..44f19c091c7e0 100644
--- a/go/arrow/memory/memory_noasm.go
+++ b/go/arrow/memory/memory_noasm.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build noasm
 // +build noasm
 
 package memory
diff --git a/go/arrow/memory/memory_sse4_amd64.go b/go/arrow/memory/memory_sse4_amd64.go
index 716c0d2704a88..1711a1ee3eaf7 100644
--- a/go/arrow/memory/memory_sse4_amd64.go
+++ b/go/arrow/memory/memory_sse4_amd64.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package memory
diff --git a/go/arrow/memory/memory_test.go b/go/arrow/memory/memory_test.go
index bedabe364f842..35bd28e53c795 100644
--- a/go/arrow/memory/memory_test.go
+++ b/go/arrow/memory/memory_test.go
@@ -19,7 +19,7 @@ package memory_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/record.go b/go/arrow/record.go
index 28974ea1dc0ba..a2234d03a9f5b 100644
--- a/go/arrow/record.go
+++ b/go/arrow/record.go
@@ -16,7 +16,7 @@
 
 package arrow
 
-import "github.com/apache/arrow/go/v16/internal/json"
+import "github.com/apache/arrow/go/v17/internal/json"
 
 // Record is a collection of equal-length arrays matching a particular Schema.
 // Also known as a RecordBatch in the spec and in some implementations.
diff --git a/go/arrow/scalar/append.go b/go/arrow/scalar/append.go
index f87e16dcf4603..9520514743443 100644
--- a/go/arrow/scalar/append.go
+++ b/go/arrow/scalar/append.go
@@ -21,11 +21,11 @@ package scalar
 import (
 	"fmt"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/float16"
 	"golang.org/x/exp/constraints"
 )
 
diff --git a/go/arrow/scalar/append_test.go b/go/arrow/scalar/append_test.go
index 3b24dff579e0d..bbfa5d289cf78 100644
--- a/go/arrow/scalar/append_test.go
+++ b/go/arrow/scalar/append_test.go
@@ -23,11 +23,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/internal/testing/tools"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/internal/testing/tools"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
diff --git a/go/arrow/scalar/binary.go b/go/arrow/scalar/binary.go
index 763583916982e..6e1fadb7a1256 100644
--- a/go/arrow/scalar/binary.go
+++ b/go/arrow/scalar/binary.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"unicode/utf8"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 type BinaryScalar interface {
diff --git a/go/arrow/scalar/compare.go b/go/arrow/scalar/compare.go
index c5ccb73b77c52..f54ff7c82c84a 100644
--- a/go/arrow/scalar/compare.go
+++ b/go/arrow/scalar/compare.go
@@ -16,7 +16,7 @@
 
 package scalar
 
-import "github.com/apache/arrow/go/v16/arrow"
+import "github.com/apache/arrow/go/v17/arrow"
 
 // Equals returns true if two scalars are equal, which means they have the same
 // datatype, validity and value.
diff --git a/go/arrow/scalar/nested.go b/go/arrow/scalar/nested.go
index f22290ecfb373..484dad795e791 100644
--- a/go/arrow/scalar/nested.go
+++ b/go/arrow/scalar/nested.go
@@ -21,10 +21,10 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/arrow/scalar/numeric.gen.go b/go/arrow/scalar/numeric.gen.go
index d5875df1d622a..7287d4ff00932 100644
--- a/go/arrow/scalar/numeric.gen.go
+++ b/go/arrow/scalar/numeric.gen.go
@@ -24,9 +24,9 @@ import (
 	"reflect"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
 )
 
 type Int8 struct {
diff --git a/go/arrow/scalar/numeric.gen_test.go b/go/arrow/scalar/numeric.gen_test.go
index c13f36129e54f..071af7cfc1524 100644
--- a/go/arrow/scalar/numeric.gen_test.go
+++ b/go/arrow/scalar/numeric.gen_test.go
@@ -21,8 +21,8 @@ package scalar_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/scalar/numeric.gen_test.go.tmpl b/go/arrow/scalar/numeric.gen_test.go.tmpl
index 98fc3d11a18a4..e21b4f20eeb7c 100644
--- a/go/arrow/scalar/numeric.gen_test.go.tmpl
+++ b/go/arrow/scalar/numeric.gen_test.go.tmpl
@@ -19,8 +19,8 @@ package scalar_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/scalar/parse.go b/go/arrow/scalar/parse.go
index 50269211bb9df..ba189523fcc01 100644
--- a/go/arrow/scalar/parse.go
+++ b/go/arrow/scalar/parse.go
@@ -25,12 +25,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 type TypeToScalar interface {
diff --git a/go/arrow/scalar/scalar.go b/go/arrow/scalar/scalar.go
index 1f4d9d007c3ed..7f210c0a580cf 100644
--- a/go/arrow/scalar/scalar.go
+++ b/go/arrow/scalar/scalar.go
@@ -26,16 +26,16 @@ import (
 	"strconv"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/encoded"
-	"github.com/apache/arrow/go/v16/arrow/endian"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/encoded"
+	"github.com/apache/arrow/go/v17/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/arrow/scalar/scalar_test.go b/go/arrow/scalar/scalar_test.go
index e20e3089d6efc..fcb88c0fb7e4f 100644
--- a/go/arrow/scalar/scalar_test.go
+++ b/go/arrow/scalar/scalar_test.go
@@ -25,12 +25,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/scalar"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/scalar"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
diff --git a/go/arrow/scalar/temporal.go b/go/arrow/scalar/temporal.go
index ad42188c26997..718a63b6b225b 100644
--- a/go/arrow/scalar/temporal.go
+++ b/go/arrow/scalar/temporal.go
@@ -22,7 +22,7 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 func temporalToString(s TemporalScalar) string {
diff --git a/go/arrow/schema.go b/go/arrow/schema.go
index d4943cc4ae632..bdfee7f4325e9 100644
--- a/go/arrow/schema.go
+++ b/go/arrow/schema.go
@@ -21,7 +21,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/endian"
 )
 
 type Metadata struct {
diff --git a/go/arrow/schema_test.go b/go/arrow/schema_test.go
index a01ba839fa525..3d26a769e98b5 100644
--- a/go/arrow/schema_test.go
+++ b/go/arrow/schema_test.go
@@ -21,7 +21,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/endian"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/table.go b/go/arrow/table.go
index 15fd3e5bcf3f9..ccf28547c2177 100644
--- a/go/arrow/table.go
+++ b/go/arrow/table.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 )
 
 // Table represents a logical sequence of chunked arrays of equal length. It is
diff --git a/go/arrow/tensor/numeric.gen.go b/go/arrow/tensor/numeric.gen.go
index eac0fe5cc7fcb..51995d9ba147f 100644
--- a/go/arrow/tensor/numeric.gen.go
+++ b/go/arrow/tensor/numeric.gen.go
@@ -19,7 +19,7 @@
 package tensor
 
 import (
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 // Int8 is an n-dim array of int8s.
diff --git a/go/arrow/tensor/numeric.gen.go.tmpl b/go/arrow/tensor/numeric.gen.go.tmpl
index 0813035ac06e1..17c348fa2b73d 100644
--- a/go/arrow/tensor/numeric.gen.go.tmpl
+++ b/go/arrow/tensor/numeric.gen.go.tmpl
@@ -17,8 +17,8 @@
 package tensor
 
 import (
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
 )
 
 {{range .In}}
diff --git a/go/arrow/tensor/numeric.gen_test.go b/go/arrow/tensor/numeric.gen_test.go
index 9750d6681ca9a..92f4f7015edd2 100644
--- a/go/arrow/tensor/numeric.gen_test.go
+++ b/go/arrow/tensor/numeric.gen_test.go
@@ -23,10 +23,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/tensor"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/tensor"
 )
 
 func TestTensorInt8(t *testing.T) {
diff --git a/go/arrow/tensor/numeric.gen_test.go.tmpl b/go/arrow/tensor/numeric.gen_test.go.tmpl
index 7110f87e9c454..c080df30e0f36 100644
--- a/go/arrow/tensor/numeric.gen_test.go.tmpl
+++ b/go/arrow/tensor/numeric.gen_test.go.tmpl
@@ -21,10 +21,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/tensor"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/tensor"
 )
 
 {{range .In}}
diff --git a/go/arrow/tensor/tensor.go b/go/arrow/tensor/tensor.go
index f96720f0d0f8f..b19cc2b916743 100644
--- a/go/arrow/tensor/tensor.go
+++ b/go/arrow/tensor/tensor.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 )
 
 // Interface represents an n-dimensional array of numerical data.
diff --git a/go/arrow/tensor/tensor_test.go b/go/arrow/tensor/tensor_test.go
index e6a2547b7beef..5ed420b96bba7 100644
--- a/go/arrow/tensor/tensor_test.go
+++ b/go/arrow/tensor/tensor_test.go
@@ -21,10 +21,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/tensor"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/tensor"
 )
 
 func TestTensor(t *testing.T) {
diff --git a/go/arrow/type_traits.go b/go/arrow/type_traits.go
index 54e1bbdc31162..e8e7cf174ed2d 100644
--- a/go/arrow/type_traits.go
+++ b/go/arrow/type_traits.go
@@ -20,9 +20,9 @@ import (
 	"reflect"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/float16"
 	"golang.org/x/exp/constraints"
 )
 
diff --git a/go/arrow/type_traits_boolean.go b/go/arrow/type_traits_boolean.go
index 6b22c264c6676..9bdc0b824e6f6 100644
--- a/go/arrow/type_traits_boolean.go
+++ b/go/arrow/type_traits_boolean.go
@@ -17,7 +17,7 @@
 package arrow
 
 import (
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
 )
 
 type booleanTraits struct{}
diff --git a/go/arrow/type_traits_decimal128.go b/go/arrow/type_traits_decimal128.go
index 8d9bcc8c3f66e..604c5be3f3670 100644
--- a/go/arrow/type_traits_decimal128.go
+++ b/go/arrow/type_traits_decimal128.go
@@ -19,8 +19,8 @@ package arrow
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/endian"
 )
 
 // Decimal128 traits
diff --git a/go/arrow/type_traits_decimal256.go b/go/arrow/type_traits_decimal256.go
index 73fd9b81ffe69..de4d931fed748 100644
--- a/go/arrow/type_traits_decimal256.go
+++ b/go/arrow/type_traits_decimal256.go
@@ -19,8 +19,8 @@ package arrow
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/endian"
 )
 
 // Decimal256 traits
diff --git a/go/arrow/type_traits_float16.go b/go/arrow/type_traits_float16.go
index 2340ac567b62c..46ab2b8fc9ed8 100644
--- a/go/arrow/type_traits_float16.go
+++ b/go/arrow/type_traits_float16.go
@@ -19,8 +19,8 @@ package arrow
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/endian"
-	"github.com/apache/arrow/go/v16/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/float16"
 )
 
 // Float16 traits
diff --git a/go/arrow/type_traits_interval.go b/go/arrow/type_traits_interval.go
index 79fd029310bc9..48ae7eb376453 100644
--- a/go/arrow/type_traits_interval.go
+++ b/go/arrow/type_traits_interval.go
@@ -19,8 +19,8 @@ package arrow
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/endian"
-	"github.com/apache/arrow/go/v16/arrow/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/internal/debug"
 )
 
 var (
diff --git a/go/arrow/type_traits_numeric.gen.go b/go/arrow/type_traits_numeric.gen.go
index 34d1d7843ce14..bf20dc9995a70 100644
--- a/go/arrow/type_traits_numeric.gen.go
+++ b/go/arrow/type_traits_numeric.gen.go
@@ -22,7 +22,7 @@ import (
 	"math"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/endian"
 )
 
 var (
diff --git a/go/arrow/type_traits_numeric.gen.go.tmpl b/go/arrow/type_traits_numeric.gen.go.tmpl
index af471738b6cb6..9e5c68a2fc8fd 100644
--- a/go/arrow/type_traits_numeric.gen.go.tmpl
+++ b/go/arrow/type_traits_numeric.gen.go.tmpl
@@ -20,7 +20,7 @@ import (
 	"math"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/endian"
 )
 
 var (
diff --git a/go/arrow/type_traits_numeric.gen_test.go b/go/arrow/type_traits_numeric.gen_test.go
index a830a7a0fdb34..90324197a3352 100644
--- a/go/arrow/type_traits_numeric.gen_test.go
+++ b/go/arrow/type_traits_numeric.gen_test.go
@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 func TestInt64Traits(t *testing.T) {
diff --git a/go/arrow/type_traits_numeric.gen_test.go.tmpl b/go/arrow/type_traits_numeric.gen_test.go.tmpl
index b033d57e5d890..440f240ab30d2 100644
--- a/go/arrow/type_traits_numeric.gen_test.go.tmpl
+++ b/go/arrow/type_traits_numeric.gen_test.go.tmpl
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 {{- range .In}}
diff --git a/go/arrow/type_traits_test.go b/go/arrow/type_traits_test.go
index 869da426fad96..ee28b81de09a6 100644
--- a/go/arrow/type_traits_test.go
+++ b/go/arrow/type_traits_test.go
@@ -22,10 +22,10 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/float16"
 )
 
 func TestBooleanTraits(t *testing.T) {
diff --git a/go/arrow/type_traits_timestamp.go b/go/arrow/type_traits_timestamp.go
index 3117f983edd0b..09ef09d8ea188 100644
--- a/go/arrow/type_traits_timestamp.go
+++ b/go/arrow/type_traits_timestamp.go
@@ -19,7 +19,7 @@ package arrow
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/endian"
 )
 
 var TimestampTraits timestampTraits
diff --git a/go/arrow/type_traits_view.go b/go/arrow/type_traits_view.go
index 8a56702900e9f..36c83f011251e 100644
--- a/go/arrow/type_traits_view.go
+++ b/go/arrow/type_traits_view.go
@@ -19,7 +19,7 @@ package arrow
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/endian"
 )
 
 var ViewHeaderTraits viewHeaderTraits
diff --git a/go/arrow/util/byte_size.go b/go/arrow/util/byte_size.go
index 840af58ec0614..37b47886f2652 100644
--- a/go/arrow/util/byte_size.go
+++ b/go/arrow/util/byte_size.go
@@ -17,9 +17,9 @@
 package util
 
 import (
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 )
 
 func isArrayDataNil(arrayData arrow.ArrayData) bool {
diff --git a/go/arrow/util/byte_size_test.go b/go/arrow/util/byte_size_test.go
index a0302e72a8a34..6fbbe9dce094b 100644
--- a/go/arrow/util/byte_size_test.go
+++ b/go/arrow/util/byte_size_test.go
@@ -20,10 +20,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/arrow/util"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/util"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/arrow/util/messages/README.md b/go/arrow/util/messages/README.md
new file mode 100644
index 0000000000000..312484f701a46
--- /dev/null
+++ b/go/arrow/util/messages/README.md
@@ -0,0 +1,25 @@
+<!---
+  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.
+-->
+
+How to generate the .pb.go files
+
+```
+cd go/arrow/util/
+protoc -I ./ --go_out=./messages ./messages/types.proto
+```
diff --git a/go/arrow/util/messages/types.proto b/go/arrow/util/messages/types.proto
new file mode 100644
index 0000000000000..c085273ca35e0
--- /dev/null
+++ b/go/arrow/util/messages/types.proto
@@ -0,0 +1,56 @@
+// 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.
+
+syntax = "proto3";
+import "google/protobuf/any.proto";
+
+option go_package = "../util_message";
+
+message ExampleMessage {
+  string field1 = 1;
+}
+
+message AllTheTypes {
+  string str = 1;
+  int32 int32 = 2;
+  int64 int64 = 3;
+  sint32 sint32 = 4;
+  sint64 sin64 = 5;
+  uint32 uint32 = 6;
+  uint64 uint64 = 7;
+  fixed32 fixed32 = 8;
+  fixed64 fixed64 = 9;
+  sfixed32 sfixed32 = 10;
+  bool bool = 11;
+  bytes bytes = 12;
+  double double = 13;
+  ExampleEnum enum = 14;
+  ExampleMessage message = 15;
+  oneof oneof {
+    string oneofstring = 16;
+    ExampleMessage oneofmessage = 17;
+  }
+  google.protobuf.Any any = 18;
+  map<int32, string> simple_map = 19;
+  map<string, ExampleMessage> complex_map = 20;
+  repeated string simple_list = 21;
+  repeated ExampleMessage complex_list = 22;
+
+  enum ExampleEnum {
+    OPTION_0 = 0;
+    OPTION_1 = 1;
+  }
+}
diff --git a/go/arrow/util/protobuf_reflect.go b/go/arrow/util/protobuf_reflect.go
new file mode 100644
index 0000000000000..b4c8d68db8b0d
--- /dev/null
+++ b/go/arrow/util/protobuf_reflect.go
@@ -0,0 +1,865 @@
+// 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.
+
+package util
+
+import (
+	"fmt"
+	"reflect"
+
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/huandu/xstrings"
+	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/reflect/protoreflect"
+	"google.golang.org/protobuf/types/known/anypb"
+)
+
+// ProtobufTypeHandler provides options on how protobuf fields should be handled in the conversion to arrow
+type ProtobufTypeHandler int
+
+const (
+	// OneOfNull means do not wrap oneOfs in a union, they are treated as separate fields
+	OneOfNull ProtobufTypeHandler = iota
+	// OneOfDenseUnion maps the protobuf OneOf to an arrow.DENSE_UNION
+	OneOfDenseUnion
+	// EnumNumber uses the Enum numeric value
+	EnumNumber
+	// EnumValue uses the Enum string value
+	EnumValue
+	// EnumDictionary uses both the numeric and string value and maps to an arrow.Dictionary
+	EnumDictionary
+)
+
+type schemaOptions struct {
+	exclusionPolicy    func(pfr *ProtobufFieldReflection) bool
+	fieldNameFormatter func(str string) string
+	oneOfHandler       ProtobufTypeHandler
+	enumHandler        ProtobufTypeHandler
+}
+
+// ProtobufFieldReflection represents the metadata and values of a protobuf field
+type ProtobufFieldReflection struct {
+	parent     *ProtobufMessageReflection
+	descriptor protoreflect.FieldDescriptor
+	prValue    protoreflect.Value
+	rValue     reflect.Value
+	schemaOptions
+	arrow.Field
+}
+
+func (pfr *ProtobufFieldReflection) isNull() bool {
+	for pfr.rValue.Kind() == reflect.Ptr {
+		if pfr.rValue.IsNil() {
+			return true
+		}
+		pfr.rValue = pfr.rValue.Elem()
+	}
+
+	if !pfr.rValue.IsValid() || !pfr.prValue.IsValid() {
+		return true
+	}
+	return false
+}
+
+func (pfr *ProtobufFieldReflection) arrowField() arrow.Field {
+	return arrow.Field{
+		Name:     pfr.name(),
+		Type:     pfr.getDataType(),
+		Nullable: true,
+	}
+}
+
+func (pfr *ProtobufFieldReflection) protoreflectValue() protoreflect.Value {
+	return pfr.prValue
+}
+
+func (pfr *ProtobufFieldReflection) reflectValue() reflect.Value {
+	return pfr.rValue
+}
+
+func (pfr *ProtobufFieldReflection) GetDescriptor() protoreflect.FieldDescriptor {
+	return pfr.descriptor
+}
+
+func (pfr *ProtobufFieldReflection) name() string {
+	if pfr.isOneOf() && pfr.schemaOptions.oneOfHandler != OneOfNull {
+		return pfr.fieldNameFormatter(string(pfr.descriptor.ContainingOneof().Name()))
+	}
+	return pfr.fieldNameFormatter(string(pfr.descriptor.Name()))
+}
+
+func (pfr *ProtobufFieldReflection) arrowType() arrow.Type {
+	if pfr.isOneOf() && pfr.schemaOptions.oneOfHandler == OneOfDenseUnion {
+		return arrow.DENSE_UNION
+	}
+	if pfr.isEnum() {
+		switch pfr.enumHandler {
+		case EnumNumber:
+			return arrow.INT32
+		case EnumValue:
+			return arrow.STRING
+		case EnumDictionary:
+			return arrow.DICTIONARY
+		}
+	}
+	if pfr.isStruct() {
+		return arrow.STRUCT
+	}
+	if pfr.isMap() {
+		return arrow.MAP
+	}
+	if pfr.isList() {
+		return arrow.LIST
+	}
+	switch pfr.descriptor.Kind() {
+	case protoreflect.Int32Kind:
+		return arrow.INT32
+	case protoreflect.Int64Kind:
+		return arrow.INT64
+	case protoreflect.Sint32Kind:
+		return arrow.INT32
+	case protoreflect.Sint64Kind:
+		return arrow.INT64
+	case protoreflect.Uint32Kind:
+		return arrow.UINT32
+	case protoreflect.Uint64Kind:
+		return arrow.UINT64
+	case protoreflect.Fixed32Kind:
+		return arrow.UINT32
+	case protoreflect.Fixed64Kind:
+		return arrow.UINT64
+	case protoreflect.Sfixed32Kind:
+		return arrow.INT32
+	case protoreflect.Sfixed64Kind:
+		return arrow.INT64
+	case protoreflect.FloatKind:
+		return arrow.FLOAT32
+	case protoreflect.DoubleKind:
+		return arrow.FLOAT64
+	case protoreflect.StringKind:
+		return arrow.STRING
+	case protoreflect.BytesKind:
+		return arrow.BINARY
+	case protoreflect.BoolKind:
+		return arrow.BOOL
+	}
+	return arrow.NULL
+}
+
+func (pfr *ProtobufFieldReflection) isOneOf() bool {
+	return pfr.descriptor.ContainingOneof() != nil
+}
+
+func (pfr *ProtobufFieldReflection) isEnum() bool {
+	return pfr.descriptor.Kind() == protoreflect.EnumKind
+}
+
+func (pfr *ProtobufFieldReflection) isStruct() bool {
+	return pfr.descriptor.Kind() == protoreflect.MessageKind && !pfr.descriptor.IsMap() && pfr.rValue.Kind() != reflect.Slice
+}
+
+func (pfr *ProtobufFieldReflection) isMap() bool {
+	return pfr.descriptor.Kind() == protoreflect.MessageKind && pfr.descriptor.IsMap()
+}
+
+func (pfr *ProtobufFieldReflection) isList() bool {
+	return pfr.descriptor.IsList() && pfr.rValue.Kind() == reflect.Slice
+}
+
+// ProtobufMessageReflection represents the metadata and values of a protobuf message
+type ProtobufMessageReflection struct {
+	descriptor protoreflect.MessageDescriptor
+	message    protoreflect.Message
+	rValue     reflect.Value
+	schemaOptions
+	fields []ProtobufMessageFieldReflection
+}
+
+func (psr ProtobufMessageReflection) unmarshallAny() ProtobufMessageReflection {
+	if psr.descriptor.FullName() == "google.protobuf.Any" && psr.rValue.IsValid() {
+		for psr.rValue.Type().Kind() == reflect.Ptr {
+			psr.rValue = reflect.Indirect(psr.rValue)
+		}
+		fieldValueAsAny, _ := psr.rValue.Interface().(anypb.Any)
+		msg, _ := fieldValueAsAny.UnmarshalNew()
+
+		v := reflect.ValueOf(msg)
+		for v.Kind() == reflect.Ptr {
+			v = reflect.Indirect(v)
+		}
+
+		return ProtobufMessageReflection{
+			descriptor:    msg.ProtoReflect().Descriptor(),
+			message:       msg.ProtoReflect(),
+			rValue:        v,
+			schemaOptions: psr.schemaOptions,
+		}
+	} else {
+		return psr
+	}
+}
+
+func (psr ProtobufMessageReflection) getArrowFields() []arrow.Field {
+	var fields []arrow.Field
+
+	for pfr := range psr.generateStructFields() {
+		fields = append(fields, arrow.Field{
+			Name:     pfr.name(),
+			Type:     pfr.getDataType(),
+			Nullable: true,
+		})
+	}
+
+	return fields
+}
+
+type protobufListReflection struct {
+	ProtobufFieldReflection
+}
+
+func (pfr *ProtobufFieldReflection) asList() protobufListReflection {
+	return protobufListReflection{*pfr}
+}
+
+func (plr protobufListReflection) getDataType() arrow.DataType {
+	for li := range plr.generateListItems() {
+		return arrow.ListOf(li.getDataType())
+	}
+	pfr := ProtobufFieldReflection{
+		descriptor:    plr.descriptor,
+		schemaOptions: plr.schemaOptions,
+	}
+	return arrow.ListOf(pfr.getDataType())
+}
+
+type protobufUnionReflection struct {
+	ProtobufFieldReflection
+}
+
+func (pfr *ProtobufFieldReflection) asUnion() protobufUnionReflection {
+	return protobufUnionReflection{*pfr}
+}
+
+func (pur protobufUnionReflection) isThisOne() bool {
+	for pur.rValue.Kind() == reflect.Ptr || pur.rValue.Kind() == reflect.Interface {
+		pur.rValue = pur.rValue.Elem()
+	}
+	return pur.rValue.Field(0).String() == pur.prValue.String()
+}
+
+func (pur protobufUnionReflection) whichOne() arrow.UnionTypeCode {
+	fds := pur.descriptor.ContainingOneof().Fields()
+	for i := 0; i < fds.Len(); i++ {
+		pfr := pur.parent.getFieldByName(string(fds.Get(i).Name()))
+		if pfr.asUnion().isThisOne() {
+			return pur.getUnionTypeCode(int32(pfr.descriptor.Number()))
+		}
+	}
+	// i.e. all null
+	return -1
+}
+
+func (pur protobufUnionReflection) getField() *ProtobufFieldReflection {
+	fds := pur.descriptor.ContainingOneof().Fields()
+	for i := 0; i < fds.Len(); i++ {
+		pfr := pur.parent.getFieldByName(string(fds.Get(i).Name()))
+		if pfr.asUnion().isThisOne() {
+			return pfr
+		}
+	}
+	// i.e. all null
+	return nil
+}
+
+func (pur protobufUnionReflection) getUnionTypeCode(n int32) arrow.UnionTypeCode {
+	//We use the index of the field number as there is a limit on the arrow.UnionTypeCode (127)
+	//which a protobuf Number could realistically exceed
+	fds := pur.descriptor.ContainingOneof().Fields()
+	for i := 0; i < fds.Len(); i++ {
+		if n == int32(fds.Get(i).Number()) {
+			return int8(i)
+		}
+	}
+	return -1
+}
+
+func (pur protobufUnionReflection) generateUnionFields() chan *ProtobufFieldReflection {
+	out := make(chan *ProtobufFieldReflection)
+	go func() {
+		defer close(out)
+		fds := pur.descriptor.ContainingOneof().Fields()
+		for i := 0; i < fds.Len(); i++ {
+			pfr := pur.parent.getFieldByName(string(fds.Get(i).Name()))
+			// Do not get stuck in a recursion loop
+			pfr.oneOfHandler = OneOfNull
+			if pfr.exclusionPolicy(pfr) {
+				continue
+			}
+			out <- pfr
+		}
+	}()
+
+	return out
+}
+
+func (pur protobufUnionReflection) getArrowFields() []arrow.Field {
+	var fields []arrow.Field
+
+	for pfr := range pur.generateUnionFields() {
+		fields = append(fields, pfr.arrowField())
+	}
+
+	return fields
+}
+
+func (pur protobufUnionReflection) getDataType() arrow.DataType {
+	fds := pur.getArrowFields()
+	typeCodes := make([]arrow.UnionTypeCode, len(fds))
+	for i := 0; i < len(fds); i++ {
+		typeCodes[i] = arrow.UnionTypeCode(i)
+	}
+	return arrow.DenseUnionOf(fds, typeCodes)
+}
+
+type protobufDictReflection struct {
+	ProtobufFieldReflection
+}
+
+func (pfr *ProtobufFieldReflection) asDictionary() protobufDictReflection {
+	return protobufDictReflection{*pfr}
+}
+
+func (pdr protobufDictReflection) getDataType() arrow.DataType {
+	return &arrow.DictionaryType{
+		IndexType: arrow.PrimitiveTypes.Int32,
+		ValueType: arrow.BinaryTypes.String,
+		Ordered:   false,
+	}
+}
+
+func (pdr protobufDictReflection) getDictValues(mem memory.Allocator) arrow.Array {
+	enumValues := pdr.descriptor.Enum().Values()
+	bldr := array.NewStringBuilder(mem)
+	for i := 0; i < enumValues.Len(); i++ {
+		bldr.Append(string(enumValues.Get(i).Name()))
+	}
+	return bldr.NewArray()
+}
+
+type protobufMapReflection struct {
+	ProtobufFieldReflection
+}
+
+func (pfr *ProtobufFieldReflection) asMap() protobufMapReflection {
+	return protobufMapReflection{*pfr}
+}
+
+func (pmr protobufMapReflection) getDataType() arrow.DataType {
+	for kvp := range pmr.generateKeyValuePairs() {
+		return kvp.getDataType()
+	}
+	return protobufMapKeyValuePairReflection{
+		k: ProtobufFieldReflection{
+			parent:        pmr.parent,
+			descriptor:    pmr.descriptor.MapKey(),
+			schemaOptions: pmr.schemaOptions,
+		},
+		v: ProtobufFieldReflection{
+			parent:        pmr.parent,
+			descriptor:    pmr.descriptor.MapValue(),
+			schemaOptions: pmr.schemaOptions,
+		},
+	}.getDataType()
+}
+
+type protobufMapKeyValuePairReflection struct {
+	k ProtobufFieldReflection
+	v ProtobufFieldReflection
+}
+
+func (pmr protobufMapKeyValuePairReflection) getDataType() arrow.DataType {
+	return arrow.MapOf(pmr.k.getDataType(), pmr.v.getDataType())
+}
+
+func (pmr protobufMapReflection) generateKeyValuePairs() chan protobufMapKeyValuePairReflection {
+	out := make(chan protobufMapKeyValuePairReflection)
+
+	go func() {
+		defer close(out)
+		for _, k := range pmr.rValue.MapKeys() {
+			kvp := protobufMapKeyValuePairReflection{
+				k: ProtobufFieldReflection{
+					parent:        pmr.parent,
+					descriptor:    pmr.descriptor.MapKey(),
+					prValue:       getMapKey(k),
+					rValue:        k,
+					schemaOptions: pmr.schemaOptions,
+				},
+				v: ProtobufFieldReflection{
+					parent:        pmr.parent,
+					descriptor:    pmr.descriptor.MapValue(),
+					prValue:       pmr.prValue.Map().Get(protoreflect.MapKey(getMapKey(k))),
+					rValue:        pmr.rValue.MapIndex(k),
+					schemaOptions: pmr.schemaOptions,
+				},
+			}
+			out <- kvp
+		}
+	}()
+
+	return out
+}
+
+func getMapKey(v reflect.Value) protoreflect.Value {
+	switch v.Kind() {
+	case reflect.String:
+		return protoreflect.ValueOf(v.String())
+	case reflect.Int32, reflect.Int64:
+		return protoreflect.ValueOf(v.Int())
+	case reflect.Bool:
+		return protoreflect.ValueOf(v.Bool())
+	case reflect.Uint32, reflect.Uint64:
+		return protoreflect.ValueOf(v.Uint())
+	default:
+		panic("Unmapped protoreflect map key type")
+	}
+}
+
+func (psr ProtobufMessageReflection) generateStructFields() chan *ProtobufFieldReflection {
+	out := make(chan *ProtobufFieldReflection)
+
+	go func() {
+		defer close(out)
+		fds := psr.descriptor.Fields()
+		for i := 0; i < fds.Len(); i++ {
+			pfr := psr.getFieldByName(string(fds.Get(i).Name()))
+			if psr.exclusionPolicy(pfr) {
+				continue
+			}
+			if pfr.arrowType() == arrow.DENSE_UNION {
+				if pfr.descriptor.Number() != pfr.descriptor.ContainingOneof().Fields().Get(0).Number() {
+					continue
+				}
+			}
+			out <- pfr
+		}
+	}()
+
+	return out
+}
+
+func (psr ProtobufMessageReflection) generateFields() chan *ProtobufFieldReflection {
+	out := make(chan *ProtobufFieldReflection)
+
+	go func() {
+		defer close(out)
+		fds := psr.descriptor.Fields()
+		for i := 0; i < fds.Len(); i++ {
+			pfr := psr.getFieldByName(string(fds.Get(i).Name()))
+			if psr.exclusionPolicy(pfr) {
+				continue
+			}
+			if pfr.arrowType() == arrow.DENSE_UNION {
+				if pfr.descriptor.Number() != pfr.descriptor.ContainingOneof().Fields().Get(0).Number() {
+					continue
+				}
+			}
+			out <- pfr
+		}
+	}()
+
+	return out
+}
+
+func (pfr *ProtobufFieldReflection) asStruct() ProtobufMessageReflection {
+	psr := ProtobufMessageReflection{
+		descriptor:    pfr.descriptor.Message(),
+		rValue:        pfr.rValue,
+		schemaOptions: pfr.schemaOptions,
+	}
+	if pfr.prValue.IsValid() {
+		psr.message = pfr.prValue.Message()
+	}
+	psr = psr.unmarshallAny()
+	return psr
+}
+
+func (psr ProtobufMessageReflection) getDataType() arrow.DataType {
+	return arrow.StructOf(psr.getArrowFields()...)
+}
+
+func (psr ProtobufMessageReflection) getFieldByName(n string) *ProtobufFieldReflection {
+	fd := psr.descriptor.Fields().ByTextName(xstrings.ToSnakeCase(n))
+	fv := psr.rValue
+	if fv.IsValid() {
+		if !fv.IsZero() {
+			for fv.Kind() == reflect.Ptr || fv.Kind() == reflect.Interface {
+				fv = fv.Elem()
+			}
+			if fd.ContainingOneof() != nil {
+				n = string(fd.ContainingOneof().Name())
+			}
+			fv = fv.FieldByName(xstrings.ToCamelCase(n))
+			for fv.Kind() == reflect.Ptr {
+				fv = fv.Elem()
+			}
+		}
+	}
+	pfr := ProtobufFieldReflection{
+		parent:        &psr,
+		descriptor:    fd,
+		rValue:        fv,
+		schemaOptions: psr.schemaOptions,
+	}
+	if psr.message != nil {
+		pfr.prValue = psr.message.Get(fd)
+	}
+	return &pfr
+}
+
+func (plr protobufListReflection) generateListItems() chan ProtobufFieldReflection {
+	out := make(chan ProtobufFieldReflection)
+
+	go func() {
+		defer close(out)
+		for i := 0; i < plr.prValue.List().Len(); i++ {
+			out <- ProtobufFieldReflection{
+				descriptor:    plr.descriptor,
+				prValue:       plr.prValue.List().Get(i),
+				rValue:        plr.rValue.Index(i),
+				schemaOptions: plr.schemaOptions,
+			}
+		}
+	}()
+
+	return out
+}
+
+func (pfr *ProtobufFieldReflection) getDataType() arrow.DataType {
+	switch pfr.arrowType() {
+	case arrow.DENSE_UNION:
+		return pfr.asUnion().getDataType()
+	case arrow.DICTIONARY:
+		return pfr.asDictionary().getDataType()
+	case arrow.LIST:
+		return pfr.asList().getDataType()
+	case arrow.MAP:
+		return pfr.asMap().getDataType()
+	case arrow.STRUCT:
+		return pfr.asStruct().getDataType()
+	case arrow.INT32:
+		return arrow.PrimitiveTypes.Int32
+	case arrow.INT64:
+		return arrow.PrimitiveTypes.Int64
+	case arrow.UINT32:
+		return arrow.PrimitiveTypes.Uint32
+	case arrow.UINT64:
+		return arrow.PrimitiveTypes.Uint64
+	case arrow.FLOAT32:
+		return arrow.PrimitiveTypes.Float32
+	case arrow.FLOAT64:
+		return arrow.PrimitiveTypes.Float64
+	case arrow.STRING:
+		return arrow.BinaryTypes.String
+	case arrow.BINARY:
+		return arrow.BinaryTypes.Binary
+	case arrow.BOOL:
+		return arrow.FixedWidthTypes.Boolean
+	}
+	return nil
+}
+
+type protobufReflection interface {
+	name() string
+	arrowType() arrow.Type
+	protoreflectValue() protoreflect.Value
+	reflectValue() reflect.Value
+	GetDescriptor() protoreflect.FieldDescriptor
+	isNull() bool
+	isEnum() bool
+	asDictionary() protobufDictReflection
+	isList() bool
+	asList() protobufListReflection
+	isMap() bool
+	asMap() protobufMapReflection
+	isStruct() bool
+	asStruct() ProtobufMessageReflection
+	isOneOf() bool
+	asUnion() protobufUnionReflection
+}
+
+// ProtobufMessageFieldReflection links together the message and it's fields
+type ProtobufMessageFieldReflection struct {
+	parent *ProtobufMessageReflection
+	protobufReflection
+	arrow.Field
+}
+
+// Schema returns an arrow.Schema representing a protobuf message
+func (msg ProtobufMessageReflection) Schema() *arrow.Schema {
+	var fields []arrow.Field
+	for _, f := range msg.fields {
+		fields = append(fields, f.Field)
+	}
+	return arrow.NewSchema(fields, nil)
+}
+
+// Record returns an arrow.Record for a protobuf message
+func (msg ProtobufMessageReflection) Record(mem memory.Allocator) arrow.Record {
+	if mem == nil {
+		mem = memory.NewGoAllocator()
+	}
+
+	schema := msg.Schema()
+
+	recordBuilder := array.NewRecordBuilder(mem, schema)
+
+	var fieldNames []string
+	for i, f := range msg.fields {
+		f.AppendValueOrNull(recordBuilder.Field(i), mem)
+		fieldNames = append(fieldNames, f.protobufReflection.name())
+	}
+
+	var arrays []arrow.Array
+	for _, bldr := range recordBuilder.Fields() {
+		a := bldr.NewArray()
+		arrays = append(arrays, a)
+	}
+
+	structArray, _ := array.NewStructArray(arrays, fieldNames)
+
+	return array.RecordFromStructArray(structArray, schema)
+}
+
+// NewProtobufMessageReflection initialises a ProtobufMessageReflection
+// can be used to convert a protobuf message into an arrow Record
+func NewProtobufMessageReflection(msg proto.Message, options ...option) *ProtobufMessageReflection {
+	v := reflect.ValueOf(msg)
+	for v.Kind() == reflect.Ptr {
+		v = v.Elem()
+	}
+	includeAll := func(pfr *ProtobufFieldReflection) bool {
+		return false
+	}
+	noFormatting := func(str string) string {
+		return str
+	}
+	psr := &ProtobufMessageReflection{
+		descriptor: msg.ProtoReflect().Descriptor(),
+		message:    msg.ProtoReflect(),
+		rValue:     v,
+		schemaOptions: schemaOptions{
+			exclusionPolicy:    includeAll,
+			fieldNameFormatter: noFormatting,
+			oneOfHandler:       OneOfNull,
+			enumHandler:        EnumDictionary,
+		},
+	}
+
+	for _, opt := range options {
+		opt(psr)
+	}
+
+	var fields []ProtobufMessageFieldReflection
+
+	for pfr := range psr.generateFields() {
+		fields = append(fields, ProtobufMessageFieldReflection{
+			parent:             psr,
+			protobufReflection: pfr,
+			Field:              pfr.arrowField(),
+		})
+	}
+
+	psr.fields = fields
+
+	return psr
+}
+
+type option func(*ProtobufMessageReflection)
+
+// WithExclusionPolicy is an option for a ProtobufMessageReflection
+// WithExclusionPolicy acts as a deny filter on the fields of a protobuf message
+// i.e. prevents them from being included in the schema.
+// A use case for this is to exclude fields containing PII.
+func WithExclusionPolicy(ex func(pfr *ProtobufFieldReflection) bool) option {
+	return func(psr *ProtobufMessageReflection) {
+		psr.exclusionPolicy = ex
+	}
+}
+
+// WithFieldNameFormatter is an option for a ProtobufMessageReflection
+// WithFieldNameFormatter enables customisation of the field names in the arrow schema
+// By default, the field names are taken from the protobuf message (.proto file)
+func WithFieldNameFormatter(formatter func(str string) string) option {
+	return func(psr *ProtobufMessageReflection) {
+		psr.fieldNameFormatter = formatter
+	}
+}
+
+// WithOneOfHandler is an option for a ProtobufMessageReflection
+// WithOneOfHandler enables customisation of the protobuf oneOf type in the arrow schema
+// By default, the oneOfs are mapped to separate columns
+func WithOneOfHandler(oneOfHandler ProtobufTypeHandler) option {
+	return func(psr *ProtobufMessageReflection) {
+		psr.oneOfHandler = oneOfHandler
+	}
+}
+
+// WithEnumHandler is an option for a ProtobufMessageReflection
+// WithEnumHandler enables customisation of the protobuf Enum type in the arrow schema
+// By default, the Enums are mapped to arrow.Dictionary
+func WithEnumHandler(enumHandler ProtobufTypeHandler) option {
+	return func(psr *ProtobufMessageReflection) {
+		psr.enumHandler = enumHandler
+	}
+}
+
+// AppendValueOrNull add the value of a protobuf field to an arrow array builder
+func (f ProtobufMessageFieldReflection) AppendValueOrNull(b array.Builder, mem memory.Allocator) error {
+	pv := f.protoreflectValue()
+	fd := f.GetDescriptor()
+
+	if f.isNull() {
+		b.AppendNull()
+		return nil
+	}
+
+	switch b.Type().ID() {
+	case arrow.STRING:
+		if f.protobufReflection.isEnum() {
+			b.(*array.StringBuilder).Append(string(fd.Enum().Values().ByNumber(pv.Enum()).Name()))
+		} else {
+			b.(*array.StringBuilder).Append(pv.String())
+		}
+	case arrow.BINARY:
+		b.(*array.BinaryBuilder).Append(pv.Bytes())
+	case arrow.INT32:
+		if f.protobufReflection.isEnum() {
+			b.(*array.Int32Builder).Append(int32(f.reflectValue().Int()))
+		} else {
+			b.(*array.Int32Builder).Append(int32(pv.Int()))
+		}
+	case arrow.INT64:
+		b.(*array.Int64Builder).Append(pv.Int())
+	case arrow.FLOAT64:
+		b.(*array.Float64Builder).Append(pv.Float())
+	case arrow.UINT32:
+		b.(*array.Uint32Builder).Append(uint32(pv.Uint()))
+	case arrow.UINT64:
+		b.(*array.Uint64Builder).Append(pv.Uint())
+	case arrow.BOOL:
+		b.(*array.BooleanBuilder).Append(pv.Bool())
+	case arrow.DENSE_UNION:
+		ub := b.(array.UnionBuilder)
+		pur := f.asUnion()
+		if pur.whichOne() == -1 {
+			ub.AppendNull()
+			break
+		}
+		ub.Append(pur.whichOne())
+		cb := ub.Child(int(pur.whichOne()))
+		err := ProtobufMessageFieldReflection{
+			parent:             f.parent,
+			protobufReflection: pur.getField(),
+			Field:              pur.arrowField(),
+		}.AppendValueOrNull(cb, mem)
+		if err != nil {
+			return err
+		}
+	case arrow.DICTIONARY:
+		pdr := f.asDictionary()
+		db := b.(*array.BinaryDictionaryBuilder)
+		err := db.InsertStringDictValues(pdr.getDictValues(mem).(*array.String))
+		if err != nil {
+			return err
+		}
+		enumNum := int(f.reflectValue().Int())
+		enumVal := fd.Enum().Values().ByNumber(protoreflect.EnumNumber(enumNum)).Name()
+		err = db.AppendValueFromString(string(enumVal))
+		if err != nil {
+			return err
+		}
+	case arrow.STRUCT:
+		sb := b.(*array.StructBuilder)
+		sb.Append(true)
+		child := ProtobufMessageFieldReflection{
+			parent: f.parent,
+		}
+		for i, field := range f.Field.Type.(*arrow.StructType).Fields() {
+			child.protobufReflection = f.asStruct().getFieldByName(field.Name)
+			child.Field = field
+			err := child.AppendValueOrNull(sb.FieldBuilder(i), mem)
+			if err != nil {
+				return err
+			}
+		}
+	case arrow.LIST:
+		lb := b.(*array.ListBuilder)
+		l := pv.List().Len()
+		if l == 0 {
+			lb.AppendEmptyValue()
+			break
+		}
+		lb.ValueBuilder().Reserve(l)
+		lb.Append(true)
+		child := ProtobufMessageFieldReflection{
+			parent: f.parent,
+			Field:  f.Field.Type.(*arrow.ListType).ElemField(),
+		}
+		for li := range f.asList().generateListItems() {
+			child.protobufReflection = &li
+			err := child.AppendValueOrNull(lb.ValueBuilder(), mem)
+			if err != nil {
+				return err
+			}
+		}
+	case arrow.MAP:
+		mb := b.(*array.MapBuilder)
+		l := pv.Map().Len()
+		if l == 0 {
+			mb.AppendEmptyValue()
+			break
+		}
+		mb.KeyBuilder().Reserve(l)
+		mb.ItemBuilder().Reserve(l)
+		mb.Append(true)
+		k := ProtobufMessageFieldReflection{
+			parent: f.parent,
+			Field:  f.Field.Type.(*arrow.MapType).KeyField(),
+		}
+		v := ProtobufMessageFieldReflection{
+			parent: f.parent,
+			Field:  f.Field.Type.(*arrow.MapType).ItemField(),
+		}
+		for kvp := range f.asMap().generateKeyValuePairs() {
+			k.protobufReflection = &kvp.k
+			err := k.AppendValueOrNull(mb.KeyBuilder(), mem)
+			if err != nil {
+				return err
+			}
+			v.protobufReflection = &kvp.v
+			err = v.AppendValueOrNull(mb.ItemBuilder(), mem)
+			if err != nil {
+				return err
+			}
+		}
+	default:
+		return fmt.Errorf("not able to appendValueOrNull for type %s", b.Type().ID())
+	}
+	return nil
+}
diff --git a/go/arrow/util/protobuf_reflect_test.go b/go/arrow/util/protobuf_reflect_test.go
new file mode 100644
index 0000000000000..ab3cbdf9a6b13
--- /dev/null
+++ b/go/arrow/util/protobuf_reflect_test.go
@@ -0,0 +1,311 @@
+// 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.
+
+package util
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow/util/util_message"
+	"github.com/huandu/xstrings"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"google.golang.org/protobuf/types/known/anypb"
+)
+
+func SetupTest() util_message.AllTheTypes {
+	msg := util_message.ExampleMessage{
+		Field1: "Example",
+	}
+
+	anyMsg, _ := anypb.New(&msg)
+
+	return util_message.AllTheTypes{
+		Str:      "Hello",
+		Int32:    10,
+		Int64:    100,
+		Sint32:   -10,
+		Sin64:    -100,
+		Uint32:   10,
+		Uint64:   100,
+		Fixed32:  10,
+		Fixed64:  1000,
+		Sfixed32: 10,
+		Bool:     false,
+		Bytes:    []byte("Hello, world!"),
+		Double:   1.1,
+		Enum:     util_message.AllTheTypes_OPTION_1,
+		Message:  &msg,
+		Oneof:    &util_message.AllTheTypes_Oneofstring{Oneofstring: "World"},
+		Any:      anyMsg,
+		//Breaks the test as the Golang maps have a non-deterministic order
+		//SimpleMap:   map[int32]string{99: "Hello", 100: "World", 98: "How", 101: "Are", 1: "You"},
+		SimpleMap:   map[int32]string{99: "Hello"},
+		ComplexMap:  map[string]*util_message.ExampleMessage{"complex": &msg},
+		SimpleList:  []string{"Hello", "World"},
+		ComplexList: []*util_message.ExampleMessage{&msg},
+	}
+}
+
+func TestGetSchema(t *testing.T) {
+	msg := SetupTest()
+
+	got := NewProtobufMessageReflection(&msg).Schema().String()
+	want := `schema:
+  fields: 22
+    - str: type=utf8, nullable
+    - int32: type=int32, nullable
+    - int64: type=int64, nullable
+    - sint32: type=int32, nullable
+    - sin64: type=int64, nullable
+    - uint32: type=uint32, nullable
+    - uint64: type=uint64, nullable
+    - fixed32: type=uint32, nullable
+    - fixed64: type=uint64, nullable
+    - sfixed32: type=int32, nullable
+    - bool: type=bool, nullable
+    - bytes: type=binary, nullable
+    - double: type=float64, nullable
+    - enum: type=dictionary<values=utf8, indices=int32, ordered=false>, nullable
+    - message: type=struct<field1: utf8>, nullable
+    - oneofstring: type=utf8, nullable
+    - oneofmessage: type=struct<field1: utf8>, nullable
+    - any: type=struct<field1: utf8>, nullable
+    - simple_map: type=map<int32, utf8, items_nullable>, nullable
+    - complex_map: type=map<utf8, struct<field1: utf8>, items_nullable>, nullable
+    - simple_list: type=list<item: utf8, nullable>, nullable
+    - complex_list: type=list<item: struct<field1: utf8>, nullable>, nullable`
+
+	require.Equal(t, want, got, "got: %s\nwant: %s", got, want)
+
+	got = NewProtobufMessageReflection(&msg, WithOneOfHandler(OneOfDenseUnion)).Schema().String()
+	want = `schema:
+  fields: 21
+    - str: type=utf8, nullable
+    - int32: type=int32, nullable
+    - int64: type=int64, nullable
+    - sint32: type=int32, nullable
+    - sin64: type=int64, nullable
+    - uint32: type=uint32, nullable
+    - uint64: type=uint64, nullable
+    - fixed32: type=uint32, nullable
+    - fixed64: type=uint64, nullable
+    - sfixed32: type=int32, nullable
+    - bool: type=bool, nullable
+    - bytes: type=binary, nullable
+    - double: type=float64, nullable
+    - enum: type=dictionary<values=utf8, indices=int32, ordered=false>, nullable
+    - message: type=struct<field1: utf8>, nullable
+    - oneof: type=dense_union<oneofstring: type=utf8, nullable=0, oneofmessage: type=struct<field1: utf8>, nullable=1>, nullable
+    - any: type=struct<field1: utf8>, nullable
+    - simple_map: type=map<int32, utf8, items_nullable>, nullable
+    - complex_map: type=map<utf8, struct<field1: utf8>, items_nullable>, nullable
+    - simple_list: type=list<item: utf8, nullable>, nullable
+    - complex_list: type=list<item: struct<field1: utf8>, nullable>, nullable`
+
+	require.Equal(t, want, got, "got: %s\nwant: %s", got, want)
+
+	excludeComplex := func(pfr *ProtobufFieldReflection) bool {
+		return pfr.isMap() || pfr.isList() || pfr.isStruct()
+	}
+
+	got = NewProtobufMessageReflection(&msg, WithExclusionPolicy(excludeComplex)).Schema().String()
+	want = `schema:
+  fields: 15
+    - str: type=utf8, nullable
+    - int32: type=int32, nullable
+    - int64: type=int64, nullable
+    - sint32: type=int32, nullable
+    - sin64: type=int64, nullable
+    - uint32: type=uint32, nullable
+    - uint64: type=uint64, nullable
+    - fixed32: type=uint32, nullable
+    - fixed64: type=uint64, nullable
+    - sfixed32: type=int32, nullable
+    - bool: type=bool, nullable
+    - bytes: type=binary, nullable
+    - double: type=float64, nullable
+    - enum: type=dictionary<values=utf8, indices=int32, ordered=false>, nullable
+    - oneofstring: type=utf8, nullable`
+
+	require.Equal(t, want, got, "got: %s\nwant: %s", got, want)
+
+	got = NewProtobufMessageReflection(
+		&msg,
+		WithExclusionPolicy(excludeComplex),
+		WithFieldNameFormatter(xstrings.ToCamelCase),
+	).Schema().String()
+	want = `schema:
+  fields: 15
+    - Str: type=utf8, nullable
+    - Int32: type=int32, nullable
+    - Int64: type=int64, nullable
+    - Sint32: type=int32, nullable
+    - Sin64: type=int64, nullable
+    - Uint32: type=uint32, nullable
+    - Uint64: type=uint64, nullable
+    - Fixed32: type=uint32, nullable
+    - Fixed64: type=uint64, nullable
+    - Sfixed32: type=int32, nullable
+    - Bool: type=bool, nullable
+    - Bytes: type=binary, nullable
+    - Double: type=float64, nullable
+    - Enum: type=dictionary<values=utf8, indices=int32, ordered=false>, nullable
+    - Oneofstring: type=utf8, nullable`
+
+	require.Equal(t, want, got, "got: %s\nwant: %s", got, want)
+
+	onlyEnum := func(pfr *ProtobufFieldReflection) bool {
+		return !pfr.isEnum()
+	}
+	got = NewProtobufMessageReflection(
+		&msg,
+		WithExclusionPolicy(onlyEnum),
+		WithEnumHandler(EnumNumber),
+	).Schema().String()
+	want = `schema:
+  fields: 1
+    - enum: type=int32, nullable`
+
+	require.Equal(t, want, got, "got: %s\nwant: %s", got, want)
+
+	got = NewProtobufMessageReflection(
+		&msg,
+		WithExclusionPolicy(onlyEnum),
+		WithEnumHandler(EnumValue),
+	).Schema().String()
+	want = `schema:
+  fields: 1
+    - enum: type=utf8, nullable`
+
+	require.Equal(t, want, got, "got: %s\nwant: %s", got, want)
+}
+
+func TestRecordFromProtobuf(t *testing.T) {
+	msg := SetupTest()
+
+	pmr := NewProtobufMessageReflection(&msg, WithOneOfHandler(OneOfDenseUnion))
+	schema := pmr.Schema()
+	got := pmr.Record(nil)
+	jsonStr := `[
+		{
+			"str":"Hello",
+			"int32":10,
+			"int64":100,
+			"sint32":-10,
+			"sin64":-100,
+			"uint32":10,
+			"uint64":100,
+			"fixed32":10,
+			"fixed64":1000,
+			"sfixed32":10,
+			"bool":false,
+			"bytes":"SGVsbG8sIHdvcmxkIQ==",
+			"double":1.1,
+			"enum":"OPTION_1",
+			"message":{"field1":"Example"},
+			"oneof": [0, "World"],
+			"any":{"field1":"Example"},
+			"simple_map":[{"key":99,"value":"Hello"}],
+			"complex_map":[{"key":"complex","value":{"field1":"Example"}}],
+			"simple_list":["Hello","World"],
+			"complex_list":[{"field1":"Example"}]
+		}
+	]`
+	want, _, err := array.RecordFromJSON(memory.NewGoAllocator(), schema, strings.NewReader(jsonStr))
+
+	require.NoError(t, err)
+	require.EqualExportedValues(t, got, want, "got: %s\nwant: %s", got, want)
+
+	onlyEnum := func(pfr *ProtobufFieldReflection) bool { return !pfr.isEnum() }
+	pmr = NewProtobufMessageReflection(&msg, WithExclusionPolicy(onlyEnum), WithEnumHandler(EnumValue))
+	got = pmr.Record(nil)
+	jsonStr = `[ { "enum":"OPTION_1" } ]`
+	want, _, err = array.RecordFromJSON(memory.NewGoAllocator(), pmr.Schema(), strings.NewReader(jsonStr))
+	require.NoError(t, err)
+	require.True(t, array.RecordEqual(got, want), "got: %s\nwant: %s", got, want)
+
+	pmr = NewProtobufMessageReflection(&msg, WithExclusionPolicy(onlyEnum), WithEnumHandler(EnumNumber))
+	got = pmr.Record(nil)
+	jsonStr = `[ { "enum":"1" } ]`
+	want, _, err = array.RecordFromJSON(memory.NewGoAllocator(), pmr.Schema(), strings.NewReader(jsonStr))
+	require.NoError(t, err)
+	require.True(t, array.RecordEqual(got, want), "got: %s\nwant: %s", got, want)
+}
+
+func TestNullRecordFromProtobuf(t *testing.T) {
+	pmr := NewProtobufMessageReflection(&util_message.AllTheTypes{})
+	schema := pmr.Schema()
+	got := pmr.Record(nil)
+	_, _ = got.MarshalJSON()
+	jsonStr := `[
+		{
+			"str":"",
+			"int32":0,
+			"int64":0,
+			"sint32":0,
+			"sin64":0,
+			"uint32":0,
+			"uint64":0,
+			"fixed32":0,
+			"fixed64":0,
+			"sfixed32":0,
+			"bool":false,
+			"bytes":"",
+			"double":0,
+			"enum":"OPTION_0",
+			"message":null,
+			"oneofmessage":{"field1":""},
+			"oneofstring":"",
+			"any":null,
+			"simple_map":[],
+			"complex_map":[],
+			"simple_list":[],
+			"complex_list":[]
+		}
+	]`
+
+	want, _, err := array.RecordFromJSON(memory.NewGoAllocator(), schema, strings.NewReader(jsonStr))
+
+	require.NoError(t, err)
+	require.EqualExportedValues(t, got, want, "got: %s\nwant: %s", got, want)
+}
+
+type testProtobufReflection struct {
+	ProtobufFieldReflection
+}
+
+func (tpr testProtobufReflection) isNull() bool {
+	return false
+}
+
+func TestAppendValueOrNull(t *testing.T) {
+	unsupportedField := arrow.Field{Name: "Test", Type: arrow.FixedWidthTypes.Time32s}
+	schema := arrow.NewSchema([]arrow.Field{unsupportedField}, nil)
+	mem := memory.NewGoAllocator()
+	recordBuilder := array.NewRecordBuilder(mem, schema)
+	pmfr := ProtobufMessageFieldReflection{
+		protobufReflection: &testProtobufReflection{},
+		Field:              arrow.Field{Name: "Test", Type: arrow.FixedWidthTypes.Time32s},
+	}
+	got := pmfr.AppendValueOrNull(recordBuilder.Field(0), mem)
+	want := "not able to appendValueOrNull for type TIME32"
+	assert.EqualErrorf(t, got, want, "Error is: %v, want: %v", got, want)
+}
diff --git a/go/arrow/util/util_message/types.pb.go b/go/arrow/util/util_message/types.pb.go
new file mode 100644
index 0000000000000..80e18847c1970
--- /dev/null
+++ b/go/arrow/util/util_message/types.pb.go
@@ -0,0 +1,539 @@
+// 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.
+
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.31.0
+// 	protoc        v4.24.4
+// source: messages/types.proto
+
+package util_message
+
+import (
+	reflect "reflect"
+	sync "sync"
+
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	anypb "google.golang.org/protobuf/types/known/anypb"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+type AllTheTypes_ExampleEnum int32
+
+const (
+	AllTheTypes_OPTION_0 AllTheTypes_ExampleEnum = 0
+	AllTheTypes_OPTION_1 AllTheTypes_ExampleEnum = 1
+)
+
+// Enum value maps for AllTheTypes_ExampleEnum.
+var (
+	AllTheTypes_ExampleEnum_name = map[int32]string{
+		0: "OPTION_0",
+		1: "OPTION_1",
+	}
+	AllTheTypes_ExampleEnum_value = map[string]int32{
+		"OPTION_0": 0,
+		"OPTION_1": 1,
+	}
+)
+
+func (x AllTheTypes_ExampleEnum) Enum() *AllTheTypes_ExampleEnum {
+	p := new(AllTheTypes_ExampleEnum)
+	*p = x
+	return p
+}
+
+func (x AllTheTypes_ExampleEnum) String() string {
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (AllTheTypes_ExampleEnum) Descriptor() protoreflect.EnumDescriptor {
+	return file_messages_types_proto_enumTypes[0].Descriptor()
+}
+
+func (AllTheTypes_ExampleEnum) Type() protoreflect.EnumType {
+	return &file_messages_types_proto_enumTypes[0]
+}
+
+func (x AllTheTypes_ExampleEnum) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use AllTheTypes_ExampleEnum.Descriptor instead.
+func (AllTheTypes_ExampleEnum) EnumDescriptor() ([]byte, []int) {
+	return file_messages_types_proto_rawDescGZIP(), []int{1, 0}
+}
+
+type ExampleMessage struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Field1 string `protobuf:"bytes,1,opt,name=field1,proto3" json:"field1,omitempty"`
+}
+
+func (x *ExampleMessage) Reset() {
+	*x = ExampleMessage{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_messages_types_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ExampleMessage) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ExampleMessage) ProtoMessage() {}
+
+func (x *ExampleMessage) ProtoReflect() protoreflect.Message {
+	mi := &file_messages_types_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ExampleMessage.ProtoReflect.Descriptor instead.
+func (*ExampleMessage) Descriptor() ([]byte, []int) {
+	return file_messages_types_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *ExampleMessage) GetField1() string {
+	if x != nil {
+		return x.Field1
+	}
+	return ""
+}
+
+type AllTheTypes struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Str      string                  `protobuf:"bytes,1,opt,name=str,proto3" json:"str,omitempty"`
+	Int32    int32                   `protobuf:"varint,2,opt,name=int32,proto3" json:"int32,omitempty"`
+	Int64    int64                   `protobuf:"varint,3,opt,name=int64,proto3" json:"int64,omitempty"`
+	Sint32   int32                   `protobuf:"zigzag32,4,opt,name=sint32,proto3" json:"sint32,omitempty"`
+	Sin64    int64                   `protobuf:"zigzag64,5,opt,name=sin64,proto3" json:"sin64,omitempty"`
+	Uint32   uint32                  `protobuf:"varint,6,opt,name=uint32,proto3" json:"uint32,omitempty"`
+	Uint64   uint64                  `protobuf:"varint,7,opt,name=uint64,proto3" json:"uint64,omitempty"`
+	Fixed32  uint32                  `protobuf:"fixed32,8,opt,name=fixed32,proto3" json:"fixed32,omitempty"`
+	Fixed64  uint64                  `protobuf:"fixed64,9,opt,name=fixed64,proto3" json:"fixed64,omitempty"`
+	Sfixed32 int32                   `protobuf:"fixed32,10,opt,name=sfixed32,proto3" json:"sfixed32,omitempty"`
+	Bool     bool                    `protobuf:"varint,11,opt,name=bool,proto3" json:"bool,omitempty"`
+	Bytes    []byte                  `protobuf:"bytes,12,opt,name=bytes,proto3" json:"bytes,omitempty"`
+	Double   float64                 `protobuf:"fixed64,13,opt,name=double,proto3" json:"double,omitempty"`
+	Enum     AllTheTypes_ExampleEnum `protobuf:"varint,14,opt,name=enum,proto3,enum=AllTheTypes_ExampleEnum" json:"enum,omitempty"`
+	Message  *ExampleMessage         `protobuf:"bytes,15,opt,name=message,proto3" json:"message,omitempty"`
+	// Types that are assignable to Oneof:
+	//
+	//	*AllTheTypes_Oneofstring
+	//	*AllTheTypes_Oneofmessage
+	Oneof       isAllTheTypes_Oneof        `protobuf_oneof:"oneof"`
+	Any         *anypb.Any                 `protobuf:"bytes,18,opt,name=any,proto3" json:"any,omitempty"`
+	SimpleMap   map[int32]string           `protobuf:"bytes,19,rep,name=simple_map,json=simpleMap,proto3" json:"simple_map,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ComplexMap  map[string]*ExampleMessage `protobuf:"bytes,20,rep,name=complex_map,json=complexMap,proto3" json:"complex_map,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	SimpleList  []string                   `protobuf:"bytes,21,rep,name=simple_list,json=simpleList,proto3" json:"simple_list,omitempty"`
+	ComplexList []*ExampleMessage          `protobuf:"bytes,22,rep,name=complex_list,json=complexList,proto3" json:"complex_list,omitempty"`
+}
+
+func (x *AllTheTypes) Reset() {
+	*x = AllTheTypes{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_messages_types_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AllTheTypes) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AllTheTypes) ProtoMessage() {}
+
+func (x *AllTheTypes) ProtoReflect() protoreflect.Message {
+	mi := &file_messages_types_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use AllTheTypes.ProtoReflect.Descriptor instead.
+func (*AllTheTypes) Descriptor() ([]byte, []int) {
+	return file_messages_types_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *AllTheTypes) GetStr() string {
+	if x != nil {
+		return x.Str
+	}
+	return ""
+}
+
+func (x *AllTheTypes) GetInt32() int32 {
+	if x != nil {
+		return x.Int32
+	}
+	return 0
+}
+
+func (x *AllTheTypes) GetInt64() int64 {
+	if x != nil {
+		return x.Int64
+	}
+	return 0
+}
+
+func (x *AllTheTypes) GetSint32() int32 {
+	if x != nil {
+		return x.Sint32
+	}
+	return 0
+}
+
+func (x *AllTheTypes) GetSin64() int64 {
+	if x != nil {
+		return x.Sin64
+	}
+	return 0
+}
+
+func (x *AllTheTypes) GetUint32() uint32 {
+	if x != nil {
+		return x.Uint32
+	}
+	return 0
+}
+
+func (x *AllTheTypes) GetUint64() uint64 {
+	if x != nil {
+		return x.Uint64
+	}
+	return 0
+}
+
+func (x *AllTheTypes) GetFixed32() uint32 {
+	if x != nil {
+		return x.Fixed32
+	}
+	return 0
+}
+
+func (x *AllTheTypes) GetFixed64() uint64 {
+	if x != nil {
+		return x.Fixed64
+	}
+	return 0
+}
+
+func (x *AllTheTypes) GetSfixed32() int32 {
+	if x != nil {
+		return x.Sfixed32
+	}
+	return 0
+}
+
+func (x *AllTheTypes) GetBool() bool {
+	if x != nil {
+		return x.Bool
+	}
+	return false
+}
+
+func (x *AllTheTypes) GetBytes() []byte {
+	if x != nil {
+		return x.Bytes
+	}
+	return nil
+}
+
+func (x *AllTheTypes) GetDouble() float64 {
+	if x != nil {
+		return x.Double
+	}
+	return 0
+}
+
+func (x *AllTheTypes) GetEnum() AllTheTypes_ExampleEnum {
+	if x != nil {
+		return x.Enum
+	}
+	return AllTheTypes_OPTION_0
+}
+
+func (x *AllTheTypes) GetMessage() *ExampleMessage {
+	if x != nil {
+		return x.Message
+	}
+	return nil
+}
+
+func (m *AllTheTypes) GetOneof() isAllTheTypes_Oneof {
+	if m != nil {
+		return m.Oneof
+	}
+	return nil
+}
+
+func (x *AllTheTypes) GetOneofstring() string {
+	if x, ok := x.GetOneof().(*AllTheTypes_Oneofstring); ok {
+		return x.Oneofstring
+	}
+	return ""
+}
+
+func (x *AllTheTypes) GetOneofmessage() *ExampleMessage {
+	if x, ok := x.GetOneof().(*AllTheTypes_Oneofmessage); ok {
+		return x.Oneofmessage
+	}
+	return nil
+}
+
+func (x *AllTheTypes) GetAny() *anypb.Any {
+	if x != nil {
+		return x.Any
+	}
+	return nil
+}
+
+func (x *AllTheTypes) GetSimpleMap() map[int32]string {
+	if x != nil {
+		return x.SimpleMap
+	}
+	return nil
+}
+
+func (x *AllTheTypes) GetComplexMap() map[string]*ExampleMessage {
+	if x != nil {
+		return x.ComplexMap
+	}
+	return nil
+}
+
+func (x *AllTheTypes) GetSimpleList() []string {
+	if x != nil {
+		return x.SimpleList
+	}
+	return nil
+}
+
+func (x *AllTheTypes) GetComplexList() []*ExampleMessage {
+	if x != nil {
+		return x.ComplexList
+	}
+	return nil
+}
+
+type isAllTheTypes_Oneof interface {
+	isAllTheTypes_Oneof()
+}
+
+type AllTheTypes_Oneofstring struct {
+	Oneofstring string `protobuf:"bytes,16,opt,name=oneofstring,proto3,oneof"`
+}
+
+type AllTheTypes_Oneofmessage struct {
+	Oneofmessage *ExampleMessage `protobuf:"bytes,17,opt,name=oneofmessage,proto3,oneof"`
+}
+
+func (*AllTheTypes_Oneofstring) isAllTheTypes_Oneof() {}
+
+func (*AllTheTypes_Oneofmessage) isAllTheTypes_Oneof() {}
+
+var File_messages_types_proto protoreflect.FileDescriptor
+
+var file_messages_types_proto_rawDesc = []byte{
+	0x0a, 0x14, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x22, 0x28, 0x0a, 0x0e, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x31, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x31, 0x22, 0xa9, 0x07, 0x0a, 0x0b,
+	0x41, 0x6c, 0x6c, 0x54, 0x68, 0x65, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x73,
+	0x74, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x74, 0x72, 0x12, 0x14, 0x0a,
+	0x05, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e,
+	0x74, 0x33, 0x32, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x05, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x69, 0x6e,
+	0x74, 0x33, 0x32, 0x18, 0x04, 0x20, 0x01, 0x28, 0x11, 0x52, 0x06, 0x73, 0x69, 0x6e, 0x74, 0x33,
+	0x32, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x69, 0x6e, 0x36, 0x34, 0x18, 0x05, 0x20, 0x01, 0x28, 0x12,
+	0x52, 0x05, 0x73, 0x69, 0x6e, 0x36, 0x34, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x69, 0x6e, 0x74, 0x33,
+	0x32, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x75, 0x69, 0x6e, 0x74, 0x33, 0x32, 0x12,
+	0x16, 0x0a, 0x06, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x52,
+	0x06, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x69, 0x78, 0x65, 0x64,
+	0x33, 0x32, 0x18, 0x08, 0x20, 0x01, 0x28, 0x07, 0x52, 0x07, 0x66, 0x69, 0x78, 0x65, 0x64, 0x33,
+	0x32, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x18, 0x09, 0x20, 0x01,
+	0x28, 0x06, 0x52, 0x07, 0x66, 0x69, 0x78, 0x65, 0x64, 0x36, 0x34, 0x12, 0x1a, 0x0a, 0x08, 0x73,
+	0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0f, 0x52, 0x08, 0x73,
+	0x66, 0x69, 0x78, 0x65, 0x64, 0x33, 0x32, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6f, 0x6f, 0x6c, 0x18,
+	0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x62, 0x6f, 0x6f, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x62,
+	0x79, 0x74, 0x65, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x62, 0x79, 0x74, 0x65,
+	0x73, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28,
+	0x01, 0x52, 0x06, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x12, 0x2c, 0x0a, 0x04, 0x65, 0x6e, 0x75,
+	0x6d, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x18, 0x2e, 0x41, 0x6c, 0x6c, 0x54, 0x68, 0x65,
+	0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x45, 0x6e, 0x75,
+	0x6d, 0x52, 0x04, 0x65, 0x6e, 0x75, 0x6d, 0x12, 0x29, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x45, 0x78, 0x61, 0x6d, 0x70,
+	0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x12, 0x22, 0x0a, 0x0b, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x73, 0x74, 0x72, 0x69, 0x6e,
+	0x67, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x6f, 0x6e, 0x65, 0x6f, 0x66,
+	0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x35, 0x0a, 0x0c, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x6d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x45,
+	0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x48, 0x00, 0x52,
+	0x0c, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x26, 0x0a,
+	0x03, 0x61, 0x6e, 0x79, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79,
+	0x52, 0x03, 0x61, 0x6e, 0x79, 0x12, 0x3a, 0x0a, 0x0a, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x5f,
+	0x6d, 0x61, 0x70, 0x18, 0x13, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x41, 0x6c, 0x6c, 0x54,
+	0x68, 0x65, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x4d, 0x61,
+	0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x4d, 0x61,
+	0x70, 0x12, 0x3d, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x5f, 0x6d, 0x61, 0x70,
+	0x18, 0x14, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x41, 0x6c, 0x6c, 0x54, 0x68, 0x65, 0x54,
+	0x79, 0x70, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x4d, 0x61, 0x70, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x4d, 0x61, 0x70,
+	0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18,
+	0x15, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x4c, 0x69, 0x73,
+	0x74, 0x12, 0x32, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x5f, 0x6c, 0x69, 0x73,
+	0x74, 0x18, 0x16, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c,
+	0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x0b, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
+	0x78, 0x4c, 0x69, 0x73, 0x74, 0x1a, 0x3c, 0x0a, 0x0e, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x4d,
+	0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+	0x02, 0x38, 0x01, 0x1a, 0x4e, 0x0a, 0x0f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x4d, 0x61,
+	0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x25, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c,
+	0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
+	0x02, 0x38, 0x01, 0x22, 0x29, 0x0a, 0x0b, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x45, 0x6e,
+	0x75, 0x6d, 0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x30, 0x10, 0x00,
+	0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x50, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x31, 0x10, 0x01, 0x42, 0x07,
+	0x0a, 0x05, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x42, 0x11, 0x5a, 0x0f, 0x2e, 0x2e, 0x2f, 0x75, 0x74,
+	0x69, 0x6c, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
+}
+
+var (
+	file_messages_types_proto_rawDescOnce sync.Once
+	file_messages_types_proto_rawDescData = file_messages_types_proto_rawDesc
+)
+
+func file_messages_types_proto_rawDescGZIP() []byte {
+	file_messages_types_proto_rawDescOnce.Do(func() {
+		file_messages_types_proto_rawDescData = protoimpl.X.CompressGZIP(file_messages_types_proto_rawDescData)
+	})
+	return file_messages_types_proto_rawDescData
+}
+
+var file_messages_types_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_messages_types_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_messages_types_proto_goTypes = []interface{}{
+	(AllTheTypes_ExampleEnum)(0), // 0: AllTheTypes.ExampleEnum
+	(*ExampleMessage)(nil),       // 1: ExampleMessage
+	(*AllTheTypes)(nil),          // 2: AllTheTypes
+	nil,                          // 3: AllTheTypes.SimpleMapEntry
+	nil,                          // 4: AllTheTypes.ComplexMapEntry
+	(*anypb.Any)(nil),            // 5: google.protobuf.Any
+}
+var file_messages_types_proto_depIdxs = []int32{
+	0, // 0: AllTheTypes.enum:type_name -> AllTheTypes.ExampleEnum
+	1, // 1: AllTheTypes.message:type_name -> ExampleMessage
+	1, // 2: AllTheTypes.oneofmessage:type_name -> ExampleMessage
+	5, // 3: AllTheTypes.any:type_name -> google.protobuf.Any
+	3, // 4: AllTheTypes.simple_map:type_name -> AllTheTypes.SimpleMapEntry
+	4, // 5: AllTheTypes.complex_map:type_name -> AllTheTypes.ComplexMapEntry
+	1, // 6: AllTheTypes.complex_list:type_name -> ExampleMessage
+	1, // 7: AllTheTypes.ComplexMapEntry.value:type_name -> ExampleMessage
+	8, // [8:8] is the sub-list for method output_type
+	8, // [8:8] is the sub-list for method input_type
+	8, // [8:8] is the sub-list for extension type_name
+	8, // [8:8] is the sub-list for extension extendee
+	0, // [0:8] is the sub-list for field type_name
+}
+
+func init() { file_messages_types_proto_init() }
+func file_messages_types_proto_init() {
+	if File_messages_types_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_messages_types_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExampleMessage); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_messages_types_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AllTheTypes); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	file_messages_types_proto_msgTypes[1].OneofWrappers = []interface{}{
+		(*AllTheTypes_Oneofstring)(nil),
+		(*AllTheTypes_Oneofmessage)(nil),
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_messages_types_proto_rawDesc,
+			NumEnums:      1,
+			NumMessages:   4,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_messages_types_proto_goTypes,
+		DependencyIndexes: file_messages_types_proto_depIdxs,
+		EnumInfos:         file_messages_types_proto_enumTypes,
+		MessageInfos:      file_messages_types_proto_msgTypes,
+	}.Build()
+	File_messages_types_proto = out.File
+	file_messages_types_proto_rawDesc = nil
+	file_messages_types_proto_goTypes = nil
+	file_messages_types_proto_depIdxs = nil
+}
diff --git a/go/go.mod b/go/go.mod
index 2f788c5c26b02..7819ab146d80d 100644
--- a/go/go.mod
+++ b/go/go.mod
@@ -14,40 +14,41 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-module github.com/apache/arrow/go/v16
+module github.com/apache/arrow/go/v17
 
 go 1.21
 
 require (
 	github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c
 	github.com/andybalholm/brotli v1.1.0
-	github.com/apache/thrift v0.19.0
+	github.com/apache/thrift v0.20.0
 	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
-	github.com/goccy/go-json v0.10.2
+	github.com/goccy/go-json v0.10.3
 	github.com/golang/snappy v0.0.4
-	github.com/google/flatbuffers v24.3.7+incompatible
+	github.com/google/flatbuffers v24.3.25+incompatible
 	github.com/klauspost/asmfmt v1.3.2
-	github.com/klauspost/compress v1.17.7
-	github.com/klauspost/cpuid/v2 v2.2.7
+	github.com/klauspost/compress v1.17.9
+	github.com/klauspost/cpuid/v2 v2.2.8
 	github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8
 	github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3
 	github.com/pierrec/lz4/v4 v4.1.21
 	github.com/stretchr/testify v1.9.0
 	github.com/zeebo/xxh3 v1.0.2
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
-	golang.org/x/sync v0.6.0
-	golang.org/x/sys v0.18.0
-	golang.org/x/tools v0.19.0
+	golang.org/x/sync v0.7.0
+	golang.org/x/sys v0.21.0
+	golang.org/x/tools v0.22.0
 	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028
 	gonum.org/v1/gonum v0.15.0
-	google.golang.org/grpc v1.62.1
-	google.golang.org/protobuf v1.33.0
-	modernc.org/sqlite v1.29.5
+	google.golang.org/grpc v1.63.2
+	google.golang.org/protobuf v1.34.2
+	modernc.org/sqlite v1.29.6
 )
 
 require (
 	github.com/google/uuid v1.6.0
-	github.com/hamba/avro/v2 v2.20.1
+	github.com/hamba/avro/v2 v2.22.1
+	github.com/huandu/xstrings v1.4.0
 	github.com/substrait-io/substrait-go v0.4.2
 	github.com/tidwall/sjson v1.2.5
 )
@@ -58,7 +59,6 @@ require (
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/fatih/color v1.15.0 // indirect
 	github.com/goccy/go-yaml v1.11.0 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kr/text v0.2.0 // indirect
@@ -75,10 +75,10 @@ require (
 	github.com/tidwall/gjson v1.14.2 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
-	golang.org/x/mod v0.16.0 // indirect
-	golang.org/x/net v0.22.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
+	golang.org/x/mod v0.18.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
 	modernc.org/libc v1.41.0 // indirect
diff --git a/go/go.sum b/go/go.sum
index 593746bcf9e4e..581930a3909cd 100644
--- a/go/go.sum
+++ b/go/go.sum
@@ -1,13 +1,15 @@
 github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU=
 github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
 github.com/alecthomas/assert/v2 v2.3.0 h1:mAsH2wmvjsuvyBvAmCtm7zFsBlb8mIHx5ySLVdDZXL0=
+github.com/alecthomas/assert/v2 v2.3.0/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
 github.com/alecthomas/participle/v2 v2.1.0 h1:z7dElHRrOEEq45F2TG5cbQihMtNTv8vwldytDj7Wrz4=
 github.com/alecthomas/participle/v2 v2.1.0/go.mod h1:Y1+hAs8DHPmc3YUFzqllV+eSQ9ljPTk0ZkPMtEdAx2c=
 github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
+github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
-github.com/apache/thrift v0.19.0 h1:sOqkWPzMj7w6XaYbJQG7m4sGqVolaW/0D28Ln7yPzMk=
-github.com/apache/thrift v0.19.0/go.mod h1:SUALL216IiaOw2Oy+5Vs9lboJ/t9g40C+G07Dc0QC1I=
+github.com/apache/thrift v0.20.0 h1:631+KvYbsBZxmuJjYwhezVsrfc/TbqtZV4QcxOX1fOI=
+github.com/apache/thrift v0.20.0/go.mod h1:hOk1BQqcp2OLzGsyVXdfMk7YFlMxK3aoEVhjD06QhB8=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -19,48 +21,57 @@ github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+m
 github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
 github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
+github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
+github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
-github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
-github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
+github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
+github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/goccy/go-yaml v1.11.0 h1:n7Z+zx8S9f9KgzG6KtQKf+kwqXZlLNR2F6018Dgau54=
 github.com/goccy/go-yaml v1.11.0/go.mod h1:H+mJrWtjPTJAHvRbV09MCK9xYwODM+wRTVFFTWckfng=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/flatbuffers v24.3.7+incompatible h1:BxGUkIQnOciBu33bd5BdvqY8Qvo0O/GR4SPhh7x9Ed0=
-github.com/google/flatbuffers v24.3.7+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/flatbuffers v24.3.25+incompatible h1:CX395cjN9Kke9mmalRoL3d81AtFUxJM+yDthflgJGkI=
+github.com/google/flatbuffers v24.3.25+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
+github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/hamba/avro/v2 v2.20.1 h1:3WByQiVn7wT7d27WQq6pvBRC00FVOrniP6u67FLA/2E=
-github.com/hamba/avro/v2 v2.20.1/go.mod h1:xHiKXbISpb3Ovc809XdzWow+XGTn+Oyf/F9aZbTLAig=
+github.com/hamba/avro/v2 v2.22.1 h1:q1rAbfJsrbMaZPDLQvwUQMfQzp6H+hGXvckmU/lXemk=
+github.com/hamba/avro/v2 v2.22.1/go.mod h1:HOeTrE3kvWnBAgsufqhAzDDV5gvS0QXs65Z6BHfGgbg=
 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
 github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
+github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
+github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU=
+github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4=
 github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
-github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
-github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
-github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
-github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
+github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
+github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs=
 github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
 github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI=
@@ -99,44 +110,45 @@ github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhso
 github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
 github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
 github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
+github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
 github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
-golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
 golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
 golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
-golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
-golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
-golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
+golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
-golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
+golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
 golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
 golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
 gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ=
 gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s=
-google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
-google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de h1:cZGRis4/ot9uVm639a+rHCUaG0JJHEsdyzSQTMX+suY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY=
+google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
+google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
+modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
 modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 h1:5D53IMaUuA5InSeMu9eJtlQXS2NxAhyWQvkKEgXZhHI=
 modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
 modernc.org/libc v1.41.0 h1:g9YAc6BkKlgORsUWj+JwqoB1wU3o4DE3bM3yvA3k+Gk=
@@ -145,8 +157,8 @@ modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
 modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
 modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
 modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=
-modernc.org/sqlite v1.29.5 h1:8l/SQKAjDtZFo9lkJLdk8g9JEOeYRG4/ghStDCCTiTE=
-modernc.org/sqlite v1.29.5/go.mod h1:S02dvcmm7TnTRvGhv8IGYyLnIt7AS2KPaB1F/71p75U=
+modernc.org/sqlite v1.29.6 h1:0lOXGrycJPptfHDuohfYgNqoe4hu+gYuN/pKgY5XjS4=
+modernc.org/sqlite v1.29.6/go.mod h1:S02dvcmm7TnTRvGhv8IGYyLnIt7AS2KPaB1F/71p75U=
 modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
 modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
diff --git a/go/internal/bitutils/bit_block_counter.go b/go/internal/bitutils/bit_block_counter.go
index a53a1d9c1cb47..677c497c14d23 100644
--- a/go/internal/bitutils/bit_block_counter.go
+++ b/go/internal/bitutils/bit_block_counter.go
@@ -21,8 +21,8 @@ import (
 	"math/bits"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/internal/utils"
 )
 
 func loadWord(byt []byte) uint64 {
diff --git a/go/internal/bitutils/bit_block_counter_test.go b/go/internal/bitutils/bit_block_counter_test.go
index 441bb3c4b6e68..7ddd9ca343624 100644
--- a/go/internal/bitutils/bit_block_counter_test.go
+++ b/go/internal/bitutils/bit_block_counter_test.go
@@ -19,9 +19,9 @@ package bitutils_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/exp/rand"
 )
diff --git a/go/internal/bitutils/bit_run_reader.go b/go/internal/bitutils/bit_run_reader.go
index 5d0e92e76c734..aaba0bed8eb19 100644
--- a/go/internal/bitutils/bit_run_reader.go
+++ b/go/internal/bitutils/bit_run_reader.go
@@ -22,9 +22,9 @@ import (
 	"math/bits"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/internal/utils"
 )
 
 // BitRun represents a run of bits with the same value of length Len
diff --git a/go/internal/bitutils/bit_run_reader_test.go b/go/internal/bitutils/bit_run_reader_test.go
index da90860c56986..528fef09c313b 100644
--- a/go/internal/bitutils/bit_run_reader_test.go
+++ b/go/internal/bitutils/bit_run_reader_test.go
@@ -21,9 +21,9 @@ import (
 	"testing"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/endian"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/endian"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/internal/bitutils/bit_set_run_reader.go b/go/internal/bitutils/bit_set_run_reader.go
index 47d09881d5a13..f84d7d975dba4 100644
--- a/go/internal/bitutils/bit_set_run_reader.go
+++ b/go/internal/bitutils/bit_set_run_reader.go
@@ -20,8 +20,8 @@ import (
 	"encoding/binary"
 	"math/bits"
 
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/internal/utils"
 )
 
 // IsMultipleOf64 returns whether v is a multiple of 64.
diff --git a/go/internal/bitutils/bit_set_run_reader_test.go b/go/internal/bitutils/bit_set_run_reader_test.go
index 136b9fad92c59..322906804cae8 100644
--- a/go/internal/bitutils/bit_set_run_reader_test.go
+++ b/go/internal/bitutils/bit_set_run_reader_test.go
@@ -20,9 +20,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
-	"github.com/apache/arrow/go/v16/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
+	"github.com/apache/arrow/go/v17/internal/utils"
 	"github.com/stretchr/testify/suite"
 )
 
diff --git a/go/internal/bitutils/bitmap_generate.go b/go/internal/bitutils/bitmap_generate.go
index d88aeee901194..1871b9570092e 100644
--- a/go/internal/bitutils/bitmap_generate.go
+++ b/go/internal/bitutils/bitmap_generate.go
@@ -16,7 +16,7 @@
 
 package bitutils
 
-import "github.com/apache/arrow/go/v16/arrow/bitutil"
+import "github.com/apache/arrow/go/v17/arrow/bitutil"
 
 // GenerateBits writes sequential bits to a bitmap. Bits preceding the
 // initial start offset are preserved, bits following the bitmap may
diff --git a/go/internal/bitutils/bitmap_generate_test.go b/go/internal/bitutils/bitmap_generate_test.go
index e5e68f477037a..1367fe773c00d 100644
--- a/go/internal/bitutils/bitmap_generate_test.go
+++ b/go/internal/bitutils/bitmap_generate_test.go
@@ -19,7 +19,7 @@ package bitutils_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/internal/bitutils"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
 	"golang.org/x/exp/rand"
 )
 
diff --git a/go/internal/hashing/xxh3_memo_table.gen.go b/go/internal/hashing/xxh3_memo_table.gen.go
index ca27fdf42ebb4..47626d317f10e 100644
--- a/go/internal/hashing/xxh3_memo_table.gen.go
+++ b/go/internal/hashing/xxh3_memo_table.gen.go
@@ -21,9 +21,9 @@ package hashing
 import (
 	"math"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/internal/utils"
 )
 
 type payloadInt8 struct {
diff --git a/go/internal/hashing/xxh3_memo_table.gen.go.tmpl b/go/internal/hashing/xxh3_memo_table.gen.go.tmpl
index b1b52f3bcfcf9..34fd25246f6a4 100644
--- a/go/internal/hashing/xxh3_memo_table.gen.go.tmpl
+++ b/go/internal/hashing/xxh3_memo_table.gen.go.tmpl
@@ -17,8 +17,8 @@
 package hashing
 
 import (
-  "github.com/apache/arrow/go/v16/arrow/bitutil"  
-  "github.com/apache/arrow/go/v16/internal/utils"  
+  "github.com/apache/arrow/go/v17/arrow/bitutil"  
+  "github.com/apache/arrow/go/v17/internal/utils"  
 )
 
 {{range .In}}
diff --git a/go/internal/types/extension_types.go b/go/internal/types/extension_types.go
index f2b3c4a02ec59..e0c9c4c185c9d 100644
--- a/go/internal/types/extension_types.go
+++ b/go/internal/types/extension_types.go
@@ -24,9 +24,9 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/internal/json"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/internal/json"
 	"github.com/google/uuid"
 	"golang.org/x/xerrors"
 )
diff --git a/go/internal/types/extension_types_test.go b/go/internal/types/extension_types_test.go
index e6132b611d455..632375c2685c0 100644
--- a/go/internal/types/extension_types_test.go
+++ b/go/internal/types/extension_types_test.go
@@ -20,11 +20,11 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/json"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/json"
+	"github.com/apache/arrow/go/v17/internal/types"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/go/internal/utils/min_max_arm64.go b/go/internal/utils/min_max_arm64.go
index 7404e95d963e3..d02849665df56 100644
--- a/go/internal/utils/min_max_arm64.go
+++ b/go/internal/utils/min_max_arm64.go
@@ -21,8 +21,9 @@ package utils
 import (
 	"os"
 	"strings"
+
+	"golang.org/x/sys/cpu"
 )
-import "golang.org/x/sys/cpu"
 
 func init() {
 	// Added ability to enable extension via environment:
diff --git a/go/internal/utils/recovery.go b/go/internal/utils/recovery.go
new file mode 100644
index 0000000000000..58aede47fb98d
--- /dev/null
+++ b/go/internal/utils/recovery.go
@@ -0,0 +1,31 @@
+// 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.
+
+package utils
+
+import "fmt"
+
+// FormatRecoveredError is used in cases where a panic/recover receives an
+// object which is potentially an error that could be wrapped, instead of
+// formatted, so that callers can see it.  This may be useful, for example,
+// with custom Allocators which panic to signal failure; these panics will be
+// recovered as wrapped errors, letting the client distinguish them.
+func FormatRecoveredError(msg string, recovered any) error {
+	if err, ok := recovered.(error); ok {
+		return fmt.Errorf("%s: %w", msg, err)
+	}
+	return fmt.Errorf("%s: %v", msg, recovered)
+}
diff --git a/go/internal/utils/recovery_test.go b/go/internal/utils/recovery_test.go
new file mode 100644
index 0000000000000..6ebab9ba5d3d1
--- /dev/null
+++ b/go/internal/utils/recovery_test.go
@@ -0,0 +1,62 @@
+// 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.
+
+package utils
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+type testError struct{}
+
+var _ error = testError{}
+
+func (testError) Error() string {
+	return "test error"
+}
+
+func TestFormatRecoveredError(t *testing.T) {
+	defer func() {
+		thing := recover()
+		assert.NotNil(t, thing)
+		assert.Error(t, thing.(testError))
+
+		err := FormatRecoveredError("recovered thing", thing)
+
+		assert.Equal(t, "recovered thing: test error", err.Error())
+		assert.True(t, errors.Is(err, testError{}))
+		assert.Equal(t, "test error", errors.Unwrap(err).(testError).Error())
+	}()
+
+	panic(testError{})
+}
+
+func TestFormatRecoveredNonError(t *testing.T) {
+	defer func() {
+		thing := recover()
+		assert.NotNil(t, thing)
+
+		err := FormatRecoveredError("recovered thing", thing)
+
+		assert.Equal(t, "recovered thing: just a message", err.Error())
+		assert.False(t, errors.Is(err, testError{}))
+	}()
+
+	panic("just a message")
+}
diff --git a/go/internal/utils/transpose_ints_def.go b/go/internal/utils/transpose_ints_def.go
index 2680429acf8cf..83f0a256a774f 100644
--- a/go/internal/utils/transpose_ints_def.go
+++ b/go/internal/utils/transpose_ints_def.go
@@ -19,7 +19,7 @@ package utils
 import (
 	"errors"
 
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 //go:generate go run ../../arrow/_tools/tmpl -i -data=transpose_ints.tmpldata -d arch=avx2 transpose_ints_simd.go.tmpl=transpose_ints_avx2_amd64.go
diff --git a/go/internal/utils/transpose_ints_test.go b/go/internal/utils/transpose_ints_test.go
index 16e3832868e50..c26782086802c 100644
--- a/go/internal/utils/transpose_ints_test.go
+++ b/go/internal/utils/transpose_ints_test.go
@@ -22,7 +22,7 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/internal/utils"
+	"github.com/apache/arrow/go/v17/internal/utils"
 )
 
 var (
diff --git a/go/parquet/cmd/parquet_reader/dumper.go b/go/parquet/cmd/parquet_reader/dumper.go
index 11248502119c4..a7504fdd4e849 100644
--- a/go/parquet/cmd/parquet_reader/dumper.go
+++ b/go/parquet/cmd/parquet_reader/dumper.go
@@ -22,9 +22,9 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 )
 
 const defaultBatchSize = 128
diff --git a/go/parquet/cmd/parquet_reader/main.go b/go/parquet/cmd/parquet_reader/main.go
index c315aeeb32e79..d0577868e8670 100644
--- a/go/parquet/cmd/parquet_reader/main.go
+++ b/go/parquet/cmd/parquet_reader/main.go
@@ -25,11 +25,11 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/internal/json"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/metadata"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/internal/json"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/metadata"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 
 	"github.com/docopt/docopt-go"
 )
diff --git a/go/parquet/cmd/parquet_schema/main.go b/go/parquet/cmd/parquet_schema/main.go
index 8c59358248cee..d0ff87feb5a56 100644
--- a/go/parquet/cmd/parquet_schema/main.go
+++ b/go/parquet/cmd/parquet_schema/main.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/docopt/docopt-go"
 )
 
diff --git a/go/parquet/compress/brotli.go b/go/parquet/compress/brotli.go
index 3b1575a70cfc8..e7574d2b1a779 100644
--- a/go/parquet/compress/brotli.go
+++ b/go/parquet/compress/brotli.go
@@ -21,7 +21,7 @@ import (
 	"io"
 
 	"github.com/andybalholm/brotli"
-	"github.com/apache/arrow/go/v16/parquet/internal/debug"
+	"github.com/apache/arrow/go/v17/parquet/internal/debug"
 )
 
 type brotliCodec struct{}
diff --git a/go/parquet/compress/compress.go b/go/parquet/compress/compress.go
index 2798defca9444..83b174e449c9f 100644
--- a/go/parquet/compress/compress.go
+++ b/go/parquet/compress/compress.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
 )
 
 // Compression is an alias to the thrift compression codec enum type for easy use
diff --git a/go/parquet/compress/compress_test.go b/go/parquet/compress/compress_test.go
index e2ff8871c3b59..2aaec95bf2eee 100644
--- a/go/parquet/compress/compress_test.go
+++ b/go/parquet/compress/compress_test.go
@@ -22,7 +22,7 @@ import (
 	"math/rand"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/parquet/compress"
+	"github.com/apache/arrow/go/v17/parquet/compress"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/parquet/compress/zstd.go b/go/parquet/compress/zstd.go
index be3fb507262d4..e81d364fceeb4 100644
--- a/go/parquet/compress/zstd.go
+++ b/go/parquet/compress/zstd.go
@@ -20,7 +20,7 @@ import (
 	"io"
 	"sync"
 
-	"github.com/apache/arrow/go/v16/parquet/internal/debug"
+	"github.com/apache/arrow/go/v17/parquet/internal/debug"
 	"github.com/klauspost/compress/zstd"
 )
 
diff --git a/go/parquet/doc.go b/go/parquet/doc.go
index dfe20b6ffd86a..6ab08f83f063f 100644
--- a/go/parquet/doc.go
+++ b/go/parquet/doc.go
@@ -26,14 +26,15 @@
 // This implementation is a native go implementation for reading and writing the
 // parquet file format.
 //
-// Install
+// # Install
 //
 // You can download the library and cli utilities via:
-//   go get -u github.com/apache/arrow/go/v16/parquet
-//   go install github.com/apache/arrow/go/v16/parquet/cmd/parquet_reader@latest
-//   go install github.com/apache/arrow/go/v16/parquet/cmd/parquet_schema@latest
 //
-// Modules
+//	go get -u github.com/apache/arrow/go/v17/parquet
+//	go install github.com/apache/arrow/go/v17/parquet/cmd/parquet_reader@latest
+//	go install github.com/apache/arrow/go/v17/parquet/cmd/parquet_schema@latest
+//
+// # Modules
 //
 // This top level parquet package contains the basic common types and reader/writer
 // properties along with some utilities that are used throughout the other modules.
@@ -50,13 +51,13 @@
 // The schema module contains the types for manipulating / inspecting / creating
 // parquet file schemas.
 //
-// Primitive Types
+// # Primitive Types
 //
 // The Parquet Primitive Types and their corresponding Go types are Boolean (bool),
 // Int32 (int32), Int64 (int64), Int96 (parquet.Int96), Float (float32), Double (float64),
 // ByteArray (parquet.ByteArray) and FixedLenByteArray (parquet.FixedLenByteArray).
 //
-// Encodings
+// # Encodings
 //
 // The encoding types supported in this package are:
 // Plain, Plain/RLE Dictionary, Delta Binary Packed (only integer types), Delta Byte Array
diff --git a/go/parquet/encryption_properties.go b/go/parquet/encryption_properties.go
index dcb00ab7d09ca..f29bf80da9b75 100644
--- a/go/parquet/encryption_properties.go
+++ b/go/parquet/encryption_properties.go
@@ -20,7 +20,7 @@ import (
 	"crypto/rand"
 	"unicode/utf8"
 
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
 )
 
 // Constants that will be used as the default values with encryption/decryption
diff --git a/go/parquet/encryption_properties_test.go b/go/parquet/encryption_properties_test.go
index e73435897435f..0519b7a9db96b 100644
--- a/go/parquet/encryption_properties_test.go
+++ b/go/parquet/encryption_properties_test.go
@@ -19,8 +19,8 @@ package parquet_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/encryption"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/encryption"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/parquet/encryption_read_config_test.go b/go/parquet/encryption_read_config_test.go
index 8e981fbb12b55..e78dffc641905 100644
--- a/go/parquet/encryption_read_config_test.go
+++ b/go/parquet/encryption_read_config_test.go
@@ -23,10 +23,10 @@ import (
 	"path"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/internal/encryption"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/internal/encryption"
 	"github.com/stretchr/testify/suite"
 )
 
diff --git a/go/parquet/encryption_write_config_test.go b/go/parquet/encryption_write_config_test.go
index 7075fd6366cc7..6b5c171e6ea0d 100644
--- a/go/parquet/encryption_write_config_test.go
+++ b/go/parquet/encryption_write_config_test.go
@@ -23,10 +23,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/compress"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/compress"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/stretchr/testify/suite"
 )
 
diff --git a/go/parquet/file/column_reader.go b/go/parquet/file/column_reader.go
index 40d93a35c3407..e441cd3e9c2d2 100644
--- a/go/parquet/file/column_reader.go
+++ b/go/parquet/file/column_reader.go
@@ -21,13 +21,13 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
-	"github.com/apache/arrow/go/v16/parquet/internal/encryption"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/parquet/internal/encryption"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/file/column_reader_test.go b/go/parquet/file/column_reader_test.go
index f19039797fabe..7d8c600138e06 100755
--- a/go/parquet/file/column_reader_test.go
+++ b/go/parquet/file/column_reader_test.go
@@ -24,12 +24,12 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/internal/testutils"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/internal/testutils"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 )
diff --git a/go/parquet/file/column_reader_types.gen.go b/go/parquet/file/column_reader_types.gen.go
index d8ddef4bd1081..1e7837e5679fb 100644
--- a/go/parquet/file/column_reader_types.gen.go
+++ b/go/parquet/file/column_reader_types.gen.go
@@ -21,9 +21,9 @@ package file
 import (
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
 )
 
 // Int32ColumnChunkReader is the Typed Column chunk reader instance for reading
diff --git a/go/parquet/file/column_reader_types.gen.go.tmpl b/go/parquet/file/column_reader_types.gen.go.tmpl
index 153c4f7527ae9..a1cccbad16e37 100644
--- a/go/parquet/file/column_reader_types.gen.go.tmpl
+++ b/go/parquet/file/column_reader_types.gen.go.tmpl
@@ -17,8 +17,8 @@
 package file
 
 import (
-    "github.com/apache/arrow/go/v16/parquet"
-    "github.com/apache/arrow/go/v16/parquet/internal/encoding"
+    "github.com/apache/arrow/go/v17/parquet"
+    "github.com/apache/arrow/go/v17/parquet/internal/encoding"
 )
 
 {{range .In}}
diff --git a/go/parquet/file/column_writer.go b/go/parquet/file/column_writer.go
index 91f5d18942958..520622f0da6c6 100755
--- a/go/parquet/file/column_writer.go
+++ b/go/parquet/file/column_writer.go
@@ -21,14 +21,14 @@ import (
 	"encoding/binary"
 	"io"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
-	"github.com/apache/arrow/go/v16/parquet/metadata"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/parquet/metadata"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 )
 
 //go:generate go run ../../arrow/_tools/tmpl/main.go -i -data=../internal/encoding/physical_types.tmpldata column_writer_types.gen.go.tmpl
diff --git a/go/parquet/file/column_writer_test.go b/go/parquet/file/column_writer_test.go
index d78e1c6761be0..c8d61952064fe 100755
--- a/go/parquet/file/column_writer_test.go
+++ b/go/parquet/file/column_writer_test.go
@@ -24,22 +24,22 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	arrutils "github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/compress"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
-	"github.com/apache/arrow/go/v16/parquet/internal/encryption"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/testutils"
-	"github.com/apache/arrow/go/v16/parquet/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet/metadata"
-	"github.com/apache/arrow/go/v16/parquet/pqarrow"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	arrutils "github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/compress"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/parquet/internal/encryption"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/testutils"
+	"github.com/apache/arrow/go/v17/parquet/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet/metadata"
+	"github.com/apache/arrow/go/v17/parquet/pqarrow"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/suite"
diff --git a/go/parquet/file/column_writer_types.gen.go b/go/parquet/file/column_writer_types.gen.go
index 2766d3aa4aca2..d6c0e8142ab1b 100644
--- a/go/parquet/file/column_writer_types.gen.go
+++ b/go/parquet/file/column_writer_types.gen.go
@@ -19,17 +19,14 @@
 package file
 
 import (
-	"errors"
-	"fmt"
-
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
-	"github.com/apache/arrow/go/v16/parquet/metadata"
-	"github.com/apache/arrow/go/v16/parquet/schema"
-	"golang.org/x/xerrors"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet/metadata"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 )
 
 // Int32ColumnChunkWriter is the typed interface for writing columns to a parquet
@@ -68,14 +65,7 @@ func NewInt32ColumnChunkWriter(meta *metadata.ColumnChunkMetaDataBuilder, pager
 func (w *Int32ColumnChunkWriter) WriteBatch(values []int32, defLevels, repLevels []int16) (valueOffset int64, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case string:
-				err = xerrors.New(r)
-			case error:
-				err = r
-			default:
-				err = fmt.Errorf("unknown error type: %s", r)
-			}
+			err = utils.FormatRecoveredError("unknown error type", r)
 		}
 	}()
 	// We check for DataPage limits only after we have inserted the values. If a user
@@ -154,14 +144,7 @@ func (w *Int32ColumnChunkWriter) WriteBatchSpaced(values []int32, defLevels, rep
 func (w *Int32ColumnChunkWriter) WriteDictIndices(indices arrow.Array, defLevels, repLevels []int16) (err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case string:
-				err = errors.New(r)
-			case error:
-				err = r
-			default:
-				err = fmt.Errorf("unknown error type: %s", r)
-			}
+			err = utils.FormatRecoveredError("unknown error type", r)
 		}
 	}()
 
@@ -272,14 +255,7 @@ func NewInt64ColumnChunkWriter(meta *metadata.ColumnChunkMetaDataBuilder, pager
 func (w *Int64ColumnChunkWriter) WriteBatch(values []int64, defLevels, repLevels []int16) (valueOffset int64, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case string:
-				err = xerrors.New(r)
-			case error:
-				err = r
-			default:
-				err = fmt.Errorf("unknown error type: %s", r)
-			}
+			err = utils.FormatRecoveredError("unknown error type", r)
 		}
 	}()
 	// We check for DataPage limits only after we have inserted the values. If a user
@@ -358,14 +334,7 @@ func (w *Int64ColumnChunkWriter) WriteBatchSpaced(values []int64, defLevels, rep
 func (w *Int64ColumnChunkWriter) WriteDictIndices(indices arrow.Array, defLevels, repLevels []int16) (err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case string:
-				err = errors.New(r)
-			case error:
-				err = r
-			default:
-				err = fmt.Errorf("unknown error type: %s", r)
-			}
+			err = utils.FormatRecoveredError("unknown error type", r)
 		}
 	}()
 
@@ -476,14 +445,7 @@ func NewInt96ColumnChunkWriter(meta *metadata.ColumnChunkMetaDataBuilder, pager
 func (w *Int96ColumnChunkWriter) WriteBatch(values []parquet.Int96, defLevels, repLevels []int16) (valueOffset int64, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case string:
-				err = xerrors.New(r)
-			case error:
-				err = r
-			default:
-				err = fmt.Errorf("unknown error type: %s", r)
-			}
+			err = utils.FormatRecoveredError("unknown error type", r)
 		}
 	}()
 	// We check for DataPage limits only after we have inserted the values. If a user
@@ -562,14 +524,7 @@ func (w *Int96ColumnChunkWriter) WriteBatchSpaced(values []parquet.Int96, defLev
 func (w *Int96ColumnChunkWriter) WriteDictIndices(indices arrow.Array, defLevels, repLevels []int16) (err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case string:
-				err = errors.New(r)
-			case error:
-				err = r
-			default:
-				err = fmt.Errorf("unknown error type: %s", r)
-			}
+			err = utils.FormatRecoveredError("unknown error type", r)
 		}
 	}()
 
@@ -680,14 +635,7 @@ func NewFloat32ColumnChunkWriter(meta *metadata.ColumnChunkMetaDataBuilder, page
 func (w *Float32ColumnChunkWriter) WriteBatch(values []float32, defLevels, repLevels []int16) (valueOffset int64, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case string:
-				err = xerrors.New(r)
-			case error:
-				err = r
-			default:
-				err = fmt.Errorf("unknown error type: %s", r)
-			}
+			err = utils.FormatRecoveredError("unknown error type", r)
 		}
 	}()
 	// We check for DataPage limits only after we have inserted the values. If a user
@@ -766,14 +714,7 @@ func (w *Float32ColumnChunkWriter) WriteBatchSpaced(values []float32, defLevels,
 func (w *Float32ColumnChunkWriter) WriteDictIndices(indices arrow.Array, defLevels, repLevels []int16) (err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case string:
-				err = errors.New(r)
-			case error:
-				err = r
-			default:
-				err = fmt.Errorf("unknown error type: %s", r)
-			}
+			err = utils.FormatRecoveredError("unknown error type", r)
 		}
 	}()
 
@@ -884,14 +825,7 @@ func NewFloat64ColumnChunkWriter(meta *metadata.ColumnChunkMetaDataBuilder, page
 func (w *Float64ColumnChunkWriter) WriteBatch(values []float64, defLevels, repLevels []int16) (valueOffset int64, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case string:
-				err = xerrors.New(r)
-			case error:
-				err = r
-			default:
-				err = fmt.Errorf("unknown error type: %s", r)
-			}
+			err = utils.FormatRecoveredError("unknown error type", r)
 		}
 	}()
 	// We check for DataPage limits only after we have inserted the values. If a user
@@ -970,14 +904,7 @@ func (w *Float64ColumnChunkWriter) WriteBatchSpaced(values []float64, defLevels,
 func (w *Float64ColumnChunkWriter) WriteDictIndices(indices arrow.Array, defLevels, repLevels []int16) (err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case string:
-				err = errors.New(r)
-			case error:
-				err = r
-			default:
-				err = fmt.Errorf("unknown error type: %s", r)
-			}
+			err = utils.FormatRecoveredError("unknown error type", r)
 		}
 	}()
 
@@ -1091,14 +1018,7 @@ func NewBooleanColumnChunkWriter(meta *metadata.ColumnChunkMetaDataBuilder, page
 func (w *BooleanColumnChunkWriter) WriteBatch(values []bool, defLevels, repLevels []int16) (valueOffset int64, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case string:
-				err = xerrors.New(r)
-			case error:
-				err = r
-			default:
-				err = fmt.Errorf("unknown error type: %s", r)
-			}
+			err = utils.FormatRecoveredError("unknown error type", r)
 		}
 	}()
 	// We check for DataPage limits only after we have inserted the values. If a user
@@ -1177,14 +1097,7 @@ func (w *BooleanColumnChunkWriter) WriteBatchSpaced(values []bool, defLevels, re
 func (w *BooleanColumnChunkWriter) WriteDictIndices(indices arrow.Array, defLevels, repLevels []int16) (err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case string:
-				err = errors.New(r)
-			case error:
-				err = r
-			default:
-				err = fmt.Errorf("unknown error type: %s", r)
-			}
+			err = utils.FormatRecoveredError("unknown error type", r)
 		}
 	}()
 
@@ -1295,14 +1208,7 @@ func NewByteArrayColumnChunkWriter(meta *metadata.ColumnChunkMetaDataBuilder, pa
 func (w *ByteArrayColumnChunkWriter) WriteBatch(values []parquet.ByteArray, defLevels, repLevels []int16) (valueOffset int64, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case string:
-				err = xerrors.New(r)
-			case error:
-				err = r
-			default:
-				err = fmt.Errorf("unknown error type: %s", r)
-			}
+			err = utils.FormatRecoveredError("unknown error type", r)
 		}
 	}()
 	// We check for DataPage limits only after we have inserted the values. If a user
@@ -1381,14 +1287,7 @@ func (w *ByteArrayColumnChunkWriter) WriteBatchSpaced(values []parquet.ByteArray
 func (w *ByteArrayColumnChunkWriter) WriteDictIndices(indices arrow.Array, defLevels, repLevels []int16) (err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case string:
-				err = errors.New(r)
-			case error:
-				err = r
-			default:
-				err = fmt.Errorf("unknown error type: %s", r)
-			}
+			err = utils.FormatRecoveredError("unknown error type", r)
 		}
 	}()
 
@@ -1499,14 +1398,7 @@ func NewFixedLenByteArrayColumnChunkWriter(meta *metadata.ColumnChunkMetaDataBui
 func (w *FixedLenByteArrayColumnChunkWriter) WriteBatch(values []parquet.FixedLenByteArray, defLevels, repLevels []int16) (valueOffset int64, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case string:
-				err = xerrors.New(r)
-			case error:
-				err = r
-			default:
-				err = fmt.Errorf("unknown error type: %s", r)
-			}
+			err = utils.FormatRecoveredError("unknown error type", r)
 		}
 	}()
 	// We check for DataPage limits only after we have inserted the values. If a user
@@ -1585,14 +1477,7 @@ func (w *FixedLenByteArrayColumnChunkWriter) WriteBatchSpaced(values []parquet.F
 func (w *FixedLenByteArrayColumnChunkWriter) WriteDictIndices(indices arrow.Array, defLevels, repLevels []int16) (err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case string:
-				err = errors.New(r)
-			case error:
-				err = r
-			default:
-				err = fmt.Errorf("unknown error type: %s", r)
-			}
+			err = utils.FormatRecoveredError("unknown error type", r)
 		}
 	}()
 
diff --git a/go/parquet/file/column_writer_types.gen.go.tmpl b/go/parquet/file/column_writer_types.gen.go.tmpl
index fcd3750012af5..6fbd3d4ffde15 100644
--- a/go/parquet/file/column_writer_types.gen.go.tmpl
+++ b/go/parquet/file/column_writer_types.gen.go.tmpl
@@ -19,10 +19,11 @@ package file
 import (
     "fmt"
 
-    "github.com/apache/arrow/go/v16/parquet"
-    "github.com/apache/arrow/go/v16/parquet/metadata"
-    "github.com/apache/arrow/go/v16/parquet/internal/encoding"
-    format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
+    "github.com/apache/arrow/go/v17/internal/utils"
+    "github.com/apache/arrow/go/v17/parquet"
+    "github.com/apache/arrow/go/v17/parquet/metadata"
+    "github.com/apache/arrow/go/v17/parquet/internal/encoding"
+    format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
 )
 
 {{range .In}}
@@ -69,14 +70,7 @@ func New{{.Name}}ColumnChunkWriter(meta *metadata.ColumnChunkMetaDataBuilder, pa
 func (w *{{.Name}}ColumnChunkWriter) WriteBatch(values []{{.name}}, defLevels, repLevels []int16) (valueOffset int64, err error) {
   defer func() {
     if r := recover(); r != nil {
-      switch r := r.(type) {
-      case string:
-        err = xerrors.New(r)
-      case error:
-        err = r
-      default:
-        err = fmt.Errorf("unknown error type: %s", r)
-      }
+      err = utils.FormatRecoveredError("unknown error type", r)
     }
   }()
   // We check for DataPage limits only after we have inserted the values. If a user
@@ -155,14 +149,7 @@ func (w *{{.Name}}ColumnChunkWriter) WriteBatchSpaced(values []{{.name}}, defLev
 func (w *{{.Name}}ColumnChunkWriter) WriteDictIndices(indices arrow.Array, defLevels, repLevels []int16) (err error) {
   defer func() {
     if r := recover(); r != nil {
-      switch r := r.(type) {
-      case string:
-        err = errors.New(r)
-      case error:
-        err = r
-      default:
-        err = fmt.Errorf("unknown error type: %s", r)
-      }
+      err = utils.FormatRecoveredError("unknown error type", r)
     }
   }()
 
diff --git a/go/parquet/file/file_reader.go b/go/parquet/file/file_reader.go
index b0c8cbf9c7244..145c09bb5fcd4 100644
--- a/go/parquet/file/file_reader.go
+++ b/go/parquet/file/file_reader.go
@@ -25,10 +25,10 @@ import (
 	"runtime"
 	"sync"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/encryption"
-	"github.com/apache/arrow/go/v16/parquet/metadata"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/encryption"
+	"github.com/apache/arrow/go/v17/parquet/metadata"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/file/file_reader_mmap.go b/go/parquet/file/file_reader_mmap.go
index 43fb22f07bf99..c3e487b536f73 100644
--- a/go/parquet/file/file_reader_mmap.go
+++ b/go/parquet/file/file_reader_mmap.go
@@ -22,7 +22,7 @@ package file
 import (
 	"io"
 
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/parquet"
 	"golang.org/x/exp/mmap"
 	"golang.org/x/xerrors"
 )
diff --git a/go/parquet/file/file_reader_mmap_windows.go b/go/parquet/file/file_reader_mmap_windows.go
index bf6436accee02..776eb98d5d282 100644
--- a/go/parquet/file/file_reader_mmap_windows.go
+++ b/go/parquet/file/file_reader_mmap_windows.go
@@ -22,7 +22,7 @@ package file
 import (
 	"errors"
 
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/parquet"
 )
 
 func mmapOpen(filename string) (parquet.ReaderAtSeeker, error) {
diff --git a/go/parquet/file/file_reader_test.go b/go/parquet/file/file_reader_test.go
index c68f30b7ba7f4..8056a837ea19e 100644
--- a/go/parquet/file/file_reader_test.go
+++ b/go/parquet/file/file_reader_test.go
@@ -25,16 +25,16 @@ import (
 	"path"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/compress"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/thrift"
-	"github.com/apache/arrow/go/v16/parquet/metadata"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/compress"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/thrift"
+	"github.com/apache/arrow/go/v17/parquet/metadata"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	libthrift "github.com/apache/thrift/lib/go/thrift"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/go/parquet/file/file_writer.go b/go/parquet/file/file_writer.go
index 57344b25cf05c..ce5e13c24d05a 100644
--- a/go/parquet/file/file_writer.go
+++ b/go/parquet/file/file_writer.go
@@ -21,11 +21,11 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/encryption"
-	"github.com/apache/arrow/go/v16/parquet/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet/metadata"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/encryption"
+	"github.com/apache/arrow/go/v17/parquet/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet/metadata"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 )
 
 // Writer is the primary interface for writing a parquet file
diff --git a/go/parquet/file/file_writer_test.go b/go/parquet/file/file_writer_test.go
index 3687fc8778202..a183022357d62 100644
--- a/go/parquet/file/file_writer_test.go
+++ b/go/parquet/file/file_writer_test.go
@@ -22,13 +22,13 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/compress"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
-	"github.com/apache/arrow/go/v16/parquet/internal/testutils"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/compress"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/parquet/internal/testutils"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
diff --git a/go/parquet/file/level_conversion.go b/go/parquet/file/level_conversion.go
index 9eb33fae361b3..9ab92bc74167e 100755
--- a/go/parquet/file/level_conversion.go
+++ b/go/parquet/file/level_conversion.go
@@ -22,11 +22,11 @@ import (
 	"math/bits"
 	"unsafe"
 
-	shared_utils "github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/bmi"
-	"github.com/apache/arrow/go/v16/parquet/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	shared_utils "github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/bmi"
+	"github.com/apache/arrow/go/v17/parquet/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/file/level_conversion_test.go b/go/parquet/file/level_conversion_test.go
index 4b72fac859866..34a107163a197 100644
--- a/go/parquet/file/level_conversion_test.go
+++ b/go/parquet/file/level_conversion_test.go
@@ -20,9 +20,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/parquet/internal/bmi"
-	"github.com/apache/arrow/go/v16/parquet/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/parquet/internal/bmi"
+	"github.com/apache/arrow/go/v17/parquet/internal/utils"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/parquet/file/page_reader.go b/go/parquet/file/page_reader.go
index 0acd841762c20..3c166253cdabe 100644
--- a/go/parquet/file/page_reader.go
+++ b/go/parquet/file/page_reader.go
@@ -23,13 +23,13 @@ import (
 	"sync"
 
 	"github.com/JohnCGriffin/overflow"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/compress"
-	"github.com/apache/arrow/go/v16/parquet/internal/encryption"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/thrift"
-	"github.com/apache/arrow/go/v16/parquet/metadata"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/compress"
+	"github.com/apache/arrow/go/v17/parquet/internal/encryption"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/thrift"
+	"github.com/apache/arrow/go/v17/parquet/metadata"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/file/page_writer.go b/go/parquet/file/page_writer.go
index 97e352d77043c..1c23917fe202c 100644
--- a/go/parquet/file/page_writer.go
+++ b/go/parquet/file/page_writer.go
@@ -20,15 +20,15 @@ import (
 	"bytes"
 	"sync"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/compress"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
-	"github.com/apache/arrow/go/v16/parquet/internal/encryption"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/thrift"
-	"github.com/apache/arrow/go/v16/parquet/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet/metadata"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/compress"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/parquet/internal/encryption"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/thrift"
+	"github.com/apache/arrow/go/v17/parquet/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet/metadata"
 	libthrift "github.com/apache/thrift/lib/go/thrift"
 	"golang.org/x/xerrors"
 )
diff --git a/go/parquet/file/record_reader.go b/go/parquet/file/record_reader.go
index cbc66dc7746c9..1a1310195a88a 100755
--- a/go/parquet/file/record_reader.go
+++ b/go/parquet/file/record_reader.go
@@ -23,14 +23,14 @@ import (
 	"unsafe"
 
 	"github.com/JohnCGriffin/overflow"
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/file/row_group_reader.go b/go/parquet/file/row_group_reader.go
index 43f1a69ece553..1e8444e1fc1d0 100644
--- a/go/parquet/file/row_group_reader.go
+++ b/go/parquet/file/row_group_reader.go
@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/encryption"
-	"github.com/apache/arrow/go/v16/parquet/metadata"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/encryption"
+	"github.com/apache/arrow/go/v17/parquet/metadata"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/file/row_group_writer.go b/go/parquet/file/row_group_writer.go
index 7ab23e2291020..dfb10d584cce6 100644
--- a/go/parquet/file/row_group_writer.go
+++ b/go/parquet/file/row_group_writer.go
@@ -17,10 +17,10 @@
 package file
 
 import (
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/encryption"
-	"github.com/apache/arrow/go/v16/parquet/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet/metadata"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/encryption"
+	"github.com/apache/arrow/go/v17/parquet/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet/metadata"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/file/row_group_writer_test.go b/go/parquet/file/row_group_writer_test.go
index d8ebba1b83fc0..2fdba06381f55 100644
--- a/go/parquet/file/row_group_writer_test.go
+++ b/go/parquet/file/row_group_writer_test.go
@@ -20,10 +20,10 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/apache/thrift/lib/go/thrift"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/go/parquet/internal/bmi/bitmap_bmi2_amd64.go b/go/parquet/internal/bmi/bitmap_bmi2_amd64.go
index ab6dcec40b02b..7fe5a1654911e 100644
--- a/go/parquet/internal/bmi/bitmap_bmi2_amd64.go
+++ b/go/parquet/internal/bmi/bitmap_bmi2_amd64.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package bmi
diff --git a/go/parquet/internal/bmi/bitmap_bmi2_noasm.go b/go/parquet/internal/bmi/bitmap_bmi2_noasm.go
index 6dc4a39a60e5a..03be648e011a7 100644
--- a/go/parquet/internal/bmi/bitmap_bmi2_noasm.go
+++ b/go/parquet/internal/bmi/bitmap_bmi2_noasm.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build noasm
 // +build noasm
 
 package bmi
diff --git a/go/parquet/internal/bmi/bitmap_bmi2_ppc64le.go b/go/parquet/internal/bmi/bitmap_bmi2_ppc64le.go
index 498d5452e17ad..60f898f6bd557 100644
--- a/go/parquet/internal/bmi/bitmap_bmi2_ppc64le.go
+++ b/go/parquet/internal/bmi/bitmap_bmi2_ppc64le.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package bmi
diff --git a/go/parquet/internal/bmi/bitmap_bmi2_s390x.go b/go/parquet/internal/bmi/bitmap_bmi2_s390x.go
index 498d5452e17ad..60f898f6bd557 100644
--- a/go/parquet/internal/bmi/bitmap_bmi2_s390x.go
+++ b/go/parquet/internal/bmi/bitmap_bmi2_s390x.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package bmi
diff --git a/go/parquet/internal/bmi/bmi_amd64.go b/go/parquet/internal/bmi/bmi_amd64.go
index 600ef024f69a8..f894b160d4c8b 100644
--- a/go/parquet/internal/bmi/bmi_amd64.go
+++ b/go/parquet/internal/bmi/bmi_amd64.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package bmi
diff --git a/go/parquet/internal/bmi/bmi_test.go b/go/parquet/internal/bmi/bmi_test.go
index e229b40050ca2..2b7cc59000ac1 100644
--- a/go/parquet/internal/bmi/bmi_test.go
+++ b/go/parquet/internal/bmi/bmi_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/parquet/internal/bmi"
+	"github.com/apache/arrow/go/v17/parquet/internal/bmi"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/parquet/internal/debug/assert_off.go b/go/parquet/internal/debug/assert_off.go
index 52b9a233169d2..1450ecc98a26e 100644
--- a/go/parquet/internal/debug/assert_off.go
+++ b/go/parquet/internal/debug/assert_off.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !assert
 // +build !assert
 
 package debug
diff --git a/go/parquet/internal/debug/assert_on.go b/go/parquet/internal/debug/assert_on.go
index 188e683120466..1a47460fd542a 100644
--- a/go/parquet/internal/debug/assert_on.go
+++ b/go/parquet/internal/debug/assert_on.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build assert
 // +build assert
 
 package debug
diff --git a/go/parquet/internal/debug/doc.go b/go/parquet/internal/debug/doc.go
index 61684d625380d..d3965793a0825 100644
--- a/go/parquet/internal/debug/doc.go
+++ b/go/parquet/internal/debug/doc.go
@@ -16,7 +16,7 @@
 
 // Package debug provides APIs for conditional runtime assertions and debug logging.
 //
-// Using Assert
+// # Using Assert
 //
 // To enable runtime assertions, build with the assert tag. When the assert tag is omitted,
 // the code for the assertion will be omitted from the binary.
diff --git a/go/parquet/internal/debug/log_off.go b/go/parquet/internal/debug/log_off.go
index 23dcccd810ce4..09f0e09a5ed1d 100644
--- a/go/parquet/internal/debug/log_off.go
+++ b/go/parquet/internal/debug/log_off.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !debug
 // +build !debug
 
 package debug
diff --git a/go/parquet/internal/debug/log_on.go b/go/parquet/internal/debug/log_on.go
index 8d6106099f6f0..0067e442d3693 100644
--- a/go/parquet/internal/debug/log_on.go
+++ b/go/parquet/internal/debug/log_on.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build debug
 // +build debug
 
 package debug
diff --git a/go/parquet/internal/encoding/boolean_decoder.go b/go/parquet/internal/encoding/boolean_decoder.go
index 8f386ec752beb..d21fb3dd56603 100644
--- a/go/parquet/internal/encoding/boolean_decoder.go
+++ b/go/parquet/internal/encoding/boolean_decoder.go
@@ -23,10 +23,10 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	shared_utils "github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	shared_utils "github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/utils"
 )
 
 // PlainBooleanDecoder is for the Plain Encoding type, there is no
diff --git a/go/parquet/internal/encoding/boolean_encoder.go b/go/parquet/internal/encoding/boolean_encoder.go
index 33a414562ce57..f77ae05fe30ef 100644
--- a/go/parquet/internal/encoding/boolean_encoder.go
+++ b/go/parquet/internal/encoding/boolean_encoder.go
@@ -19,10 +19,10 @@ package encoding
 import (
 	"encoding/binary"
 
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/debug"
-	"github.com/apache/arrow/go/v16/parquet/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/debug"
+	"github.com/apache/arrow/go/v17/parquet/internal/utils"
 )
 
 const (
diff --git a/go/parquet/internal/encoding/byte_array_decoder.go b/go/parquet/internal/encoding/byte_array_decoder.go
index ef58fd83329a4..12aaed110b0bc 100644
--- a/go/parquet/internal/encoding/byte_array_decoder.go
+++ b/go/parquet/internal/encoding/byte_array_decoder.go
@@ -19,12 +19,12 @@ package encoding
 import (
 	"encoding/binary"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	pqutils "github.com/apache/arrow/go/v16/parquet/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	pqutils "github.com/apache/arrow/go/v17/parquet/internal/utils"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/internal/encoding/byte_array_encoder.go b/go/parquet/internal/encoding/byte_array_encoder.go
index 456c6ccb5270a..fe6b9b147b0bd 100644
--- a/go/parquet/internal/encoding/byte_array_encoder.go
+++ b/go/parquet/internal/encoding/byte_array_encoder.go
@@ -21,11 +21,11 @@ import (
 	"fmt"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
 )
 
 // PlainByteArrayEncoder encodes byte arrays according to the spec for Plain encoding
diff --git a/go/parquet/internal/encoding/decoder.go b/go/parquet/internal/encoding/decoder.go
index 2ba5152a99a8f..71bfc872f133c 100644
--- a/go/parquet/internal/encoding/decoder.go
+++ b/go/parquet/internal/encoding/decoder.go
@@ -20,16 +20,16 @@ import (
 	"bytes"
 	"reflect"
 
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
-	shared_utils "github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/debug"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
+	shared_utils "github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/debug"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/internal/encoding/delta_bit_packing.go b/go/parquet/internal/encoding/delta_bit_packing.go
index cd4f6d5f81716..db42998818b39 100644
--- a/go/parquet/internal/encoding/delta_bit_packing.go
+++ b/go/parquet/internal/encoding/delta_bit_packing.go
@@ -23,11 +23,11 @@ import (
 	"math/bits"
 	"reflect"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	shared_utils "github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	shared_utils "github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/utils"
 )
 
 // see the deltaBitPack encoder for a description of the encoding format that is
diff --git a/go/parquet/internal/encoding/delta_byte_array.go b/go/parquet/internal/encoding/delta_byte_array.go
index db31fa7c2bb4d..d8c9fb92c65ef 100644
--- a/go/parquet/internal/encoding/delta_byte_array.go
+++ b/go/parquet/internal/encoding/delta_byte_array.go
@@ -17,9 +17,9 @@
 package encoding
 
 import (
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/internal/encoding/delta_byte_array_test.go b/go/parquet/internal/encoding/delta_byte_array_test.go
index eda7c8c35cdc2..c2e4e6849396e 100644
--- a/go/parquet/internal/encoding/delta_byte_array_test.go
+++ b/go/parquet/internal/encoding/delta_byte_array_test.go
@@ -18,10 +18,11 @@ package encoding
 
 import (
 	"fmt"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestDeltaByteArrayDecoder_SetData(t *testing.T) {
diff --git a/go/parquet/internal/encoding/delta_length_byte_array.go b/go/parquet/internal/encoding/delta_length_byte_array.go
index 1906f4cb217b1..eb7a74ecdf117 100644
--- a/go/parquet/internal/encoding/delta_length_byte_array.go
+++ b/go/parquet/internal/encoding/delta_length_byte_array.go
@@ -17,9 +17,9 @@
 package encoding
 
 import (
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/internal/encoding/encoder.go b/go/parquet/internal/encoding/encoder.go
index 8539b5f84b69c..74a6d8dac6566 100644
--- a/go/parquet/internal/encoding/encoder.go
+++ b/go/parquet/internal/encoding/encoder.go
@@ -21,14 +21,14 @@ import (
 	"math/bits"
 	"reflect"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
-	"github.com/apache/arrow/go/v16/parquet"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
+	"github.com/apache/arrow/go/v17/parquet"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 )
 
 //go:generate go run ../../../arrow/_tools/tmpl/main.go -i -data=physical_types.tmpldata plain_encoder_types.gen.go.tmpl typed_encoder.gen.go.tmpl
diff --git a/go/parquet/internal/encoding/encoding_benchmarks_test.go b/go/parquet/internal/encoding/encoding_benchmarks_test.go
index db95ede315f27..0252aa4801430 100644
--- a/go/parquet/internal/encoding/encoding_benchmarks_test.go
+++ b/go/parquet/internal/encoding/encoding_benchmarks_test.go
@@ -21,14 +21,14 @@ import (
 	"math"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/hashing"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
-	"github.com/apache/arrow/go/v16/parquet/internal/testutils"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/hashing"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/parquet/internal/testutils"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 )
 
 const (
diff --git a/go/parquet/internal/encoding/encoding_test.go b/go/parquet/internal/encoding/encoding_test.go
index d6fb38f7083f6..f2d1e31236adf 100644
--- a/go/parquet/internal/encoding/encoding_test.go
+++ b/go/parquet/internal/encoding/encoding_test.go
@@ -26,13 +26,13 @@ import (
 	"testing"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
-	"github.com/apache/arrow/go/v16/parquet/internal/testutils"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/parquet/internal/testutils"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
diff --git a/go/parquet/internal/encoding/fixed_len_byte_array_decoder.go b/go/parquet/internal/encoding/fixed_len_byte_array_decoder.go
index 63b8b469c4b0b..ceb9f5a2e4a22 100644
--- a/go/parquet/internal/encoding/fixed_len_byte_array_decoder.go
+++ b/go/parquet/internal/encoding/fixed_len_byte_array_decoder.go
@@ -19,8 +19,8 @@ package encoding
 import (
 	"math"
 
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/internal/encoding/fixed_len_byte_array_encoder.go b/go/parquet/internal/encoding/fixed_len_byte_array_encoder.go
index 5e45d3f36b662..1cdb3c84d9212 100644
--- a/go/parquet/internal/encoding/fixed_len_byte_array_encoder.go
+++ b/go/parquet/internal/encoding/fixed_len_byte_array_encoder.go
@@ -19,9 +19,9 @@ package encoding
 import (
 	"fmt"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
+	"github.com/apache/arrow/go/v17/parquet"
 )
 
 // PlainFixedLenByteArrayEncoder writes the raw bytes of the byte array
diff --git a/go/parquet/internal/encoding/levels.go b/go/parquet/internal/encoding/levels.go
index 976df4e810e41..d7ee657b34f6c 100644
--- a/go/parquet/internal/encoding/levels.go
+++ b/go/parquet/internal/encoding/levels.go
@@ -24,11 +24,11 @@ import (
 	"math/bits"
 
 	"github.com/JohnCGriffin/overflow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	shared_utils "github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	shared_utils "github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/utils"
 )
 
 // LevelEncoder is for handling the encoding of Definition and Repetition levels
diff --git a/go/parquet/internal/encoding/levels_test.go b/go/parquet/internal/encoding/levels_test.go
index 6b31f4afe22b8..cce2cbe1ee495 100644
--- a/go/parquet/internal/encoding/levels_test.go
+++ b/go/parquet/internal/encoding/levels_test.go
@@ -21,11 +21,11 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/parquet/internal/encoding/memo_table.go b/go/parquet/internal/encoding/memo_table.go
index df775b4cad709..7cf073cf910f6 100644
--- a/go/parquet/internal/encoding/memo_table.go
+++ b/go/parquet/internal/encoding/memo_table.go
@@ -20,11 +20,11 @@ import (
 	"math"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/hashing"
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/hashing"
+	"github.com/apache/arrow/go/v17/parquet"
 )
 
 //go:generate go run ../../../arrow/_tools/tmpl/main.go -i -data=physical_types.tmpldata memo_table_types.gen.go.tmpl
diff --git a/go/parquet/internal/encoding/memo_table_test.go b/go/parquet/internal/encoding/memo_table_test.go
index 5c0ad40c3920a..9032872502871 100644
--- a/go/parquet/internal/encoding/memo_table_test.go
+++ b/go/parquet/internal/encoding/memo_table_test.go
@@ -20,11 +20,11 @@ import (
 	"math"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/hashing"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/hashing"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
 	"github.com/stretchr/testify/suite"
 )
 
diff --git a/go/parquet/internal/encoding/memo_table_types.gen.go b/go/parquet/internal/encoding/memo_table_types.gen.go
index dd165efaaa157..6d8d86d780fae 100644
--- a/go/parquet/internal/encoding/memo_table_types.gen.go
+++ b/go/parquet/internal/encoding/memo_table_types.gen.go
@@ -19,8 +19,8 @@
 package encoding
 
 import (
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
 )
 
 // standard map based implementation of memo tables which can be more efficient
diff --git a/go/parquet/internal/encoding/memo_table_types.gen.go.tmpl b/go/parquet/internal/encoding/memo_table_types.gen.go.tmpl
index 88f8d40d47ba7..3912c3eeaa87b 100644
--- a/go/parquet/internal/encoding/memo_table_types.gen.go.tmpl
+++ b/go/parquet/internal/encoding/memo_table_types.gen.go.tmpl
@@ -17,7 +17,7 @@
 package encoding
 
 import (
-  "github.com/apache/arrow/go/v16/parquet"
+  "github.com/apache/arrow/go/v17/parquet"
 )
 
 // standard map based implementation of memo tables which can be more efficient
diff --git a/go/parquet/internal/encoding/plain_encoder_types.gen.go b/go/parquet/internal/encoding/plain_encoder_types.gen.go
index e8da35d52719f..34e8bf540ce06 100644
--- a/go/parquet/internal/encoding/plain_encoder_types.gen.go
+++ b/go/parquet/internal/encoding/plain_encoder_types.gen.go
@@ -24,11 +24,11 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/endian"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/endian"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/internal/encoding/plain_encoder_types.gen.go.tmpl b/go/parquet/internal/encoding/plain_encoder_types.gen.go.tmpl
index b60d71b2555fd..bc5cebd698188 100644
--- a/go/parquet/internal/encoding/plain_encoder_types.gen.go.tmpl
+++ b/go/parquet/internal/encoding/plain_encoder_types.gen.go.tmpl
@@ -20,10 +20,10 @@ import (
   "encoding/binary"
   "fmt"
 
-  "github.com/apache/arrow/go/v16/arrow"
-  "github.com/apache/arrow/go/v16/parquet"
-  "github.com/apache/arrow/go/v16/internal/utils"
-  "github.com/apache/arrow/go/v16/internal/bitutils"
+  "github.com/apache/arrow/go/v17/arrow"
+  "github.com/apache/arrow/go/v17/parquet"
+  "github.com/apache/arrow/go/v17/internal/utils"
+  "github.com/apache/arrow/go/v17/internal/bitutils"
 )
 
 var (
diff --git a/go/parquet/internal/encoding/typed_encoder.gen.go b/go/parquet/internal/encoding/typed_encoder.gen.go
index 77452da00b29b..0c473a989ef71 100644
--- a/go/parquet/internal/encoding/typed_encoder.gen.go
+++ b/go/parquet/internal/encoding/typed_encoder.gen.go
@@ -22,15 +22,15 @@ import (
 	"fmt"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
-	shared_utils "github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
+	shared_utils "github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/internal/encoding/typed_encoder.gen.go.tmpl b/go/parquet/internal/encoding/typed_encoder.gen.go.tmpl
index 78ade64e750aa..57d7e641fb5df 100644
--- a/go/parquet/internal/encoding/typed_encoder.gen.go.tmpl
+++ b/go/parquet/internal/encoding/typed_encoder.gen.go.tmpl
@@ -17,13 +17,13 @@
 package encoding
 
 import (
-  "github.com/apache/arrow/go/v16/parquet"
-  "github.com/apache/arrow/go/v16/parquet/schema"
-  format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
-  "github.com/apache/arrow/go/v16/arrow"
-  "github.com/apache/arrow/go/v16/parquet/internal/utils"
-  shared_utils "github.com/apache/arrow/go/v16/internal/utils"
-  "github.com/apache/arrow/go/v16/internal/bitutils"
+  "github.com/apache/arrow/go/v17/parquet"
+  "github.com/apache/arrow/go/v17/parquet/schema"
+  format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
+  "github.com/apache/arrow/go/v17/arrow"
+  "github.com/apache/arrow/go/v17/parquet/internal/utils"
+  shared_utils "github.com/apache/arrow/go/v17/internal/utils"
+  "github.com/apache/arrow/go/v17/internal/bitutils"
 )
 
 // fully typed encoder interfaces to enable writing against encoder/decoders
diff --git a/go/parquet/internal/encoding/types.go b/go/parquet/internal/encoding/types.go
index 18d101a65966f..2d7a5d6b1d166 100644
--- a/go/parquet/internal/encoding/types.go
+++ b/go/parquet/internal/encoding/types.go
@@ -20,11 +20,11 @@ import (
 	"io"
 	"sync"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
 	"golang.org/x/xerrors"
 )
 
@@ -185,7 +185,7 @@ func (b *PooledBufferWriter) Reserve(nbytes int) {
 		b.buf = bufferPool.Get().(*memory.Buffer)
 	}
 
-	newCap := utils.Max(b.buf.Cap()+b.offset, 256)
+	newCap := utils.Max(b.buf.Cap(), 256)
 	for newCap < b.pos+nbytes {
 		newCap = bitutil.NextPowerOf2(newCap)
 	}
@@ -361,11 +361,16 @@ func (b *BufferWriter) Truncate() {
 func (b *BufferWriter) Reset(initial int) {
 	if b.buffer != nil {
 		b.buffer.Release()
+	} else {
+		b.buffer = memory.NewResizableBuffer(b.mem)
 	}
 
 	b.pos = 0
 	b.offset = 0
-	b.Reserve(initial)
+
+	if initial > 0 {
+		b.Reserve(initial)
+	}
 }
 
 // Reserve ensures that there is at least enough capacity to write nbytes
diff --git a/go/parquet/internal/encryption/aes.go b/go/parquet/internal/encryption/aes.go
index 526669e35016d..c613e4a02e3a8 100644
--- a/go/parquet/internal/encryption/aes.go
+++ b/go/parquet/internal/encryption/aes.go
@@ -29,7 +29,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/parquet"
 )
 
 // important constants for handling the aes encryption
diff --git a/go/parquet/internal/encryption/decryptor.go b/go/parquet/internal/encryption/decryptor.go
index 2ea4130beb4e8..6a28f6ed7b234 100644
--- a/go/parquet/internal/encryption/decryptor.go
+++ b/go/parquet/internal/encryption/decryptor.go
@@ -19,8 +19,8 @@ package encryption
 import (
 	"io"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
 )
 
 // FileDecryptor is an interface used by the filereader for decrypting an
diff --git a/go/parquet/internal/encryption/encryptor.go b/go/parquet/internal/encryption/encryptor.go
index d9616c16a9c64..fd2860ef323c4 100644
--- a/go/parquet/internal/encryption/encryptor.go
+++ b/go/parquet/internal/encryption/encryptor.go
@@ -19,8 +19,8 @@ package encryption
 import (
 	"io"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
 )
 
 // FileEncryptor is the interface for constructing encryptors for the different
diff --git a/go/parquet/internal/gen-go/parquet/GoUnusedProtection__.go b/go/parquet/internal/gen-go/parquet/GoUnusedProtection__.go
index 01f1eb5aa99e3..c2a8e5415ed64 100644
--- a/go/parquet/internal/gen-go/parquet/GoUnusedProtection__.go
+++ b/go/parquet/internal/gen-go/parquet/GoUnusedProtection__.go
@@ -2,5 +2,4 @@
 
 package parquet
 
-var GoUnusedProtection__ int;
-
+var GoUnusedProtection__ int
diff --git a/go/parquet/internal/gen-go/parquet/parquet-consts.go b/go/parquet/internal/gen-go/parquet/parquet-consts.go
index ab0a73c596e7d..f83e0be7640ff 100644
--- a/go/parquet/internal/gen-go/parquet/parquet-consts.go
+++ b/go/parquet/internal/gen-go/parquet/parquet-consts.go
@@ -7,10 +7,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"regexp"
+	"strings"
 	"time"
+
 	thrift "github.com/apache/thrift/lib/go/thrift"
-	"strings"
-	"regexp"
 )
 
 // (needed to ensure safety because of naive import list construction.)
@@ -20,11 +21,10 @@ var _ = errors.New
 var _ = context.Background
 var _ = time.Now
 var _ = bytes.Equal
+
 // (needed by validator.)
 var _ = strings.Contains
 var _ = regexp.MatchString
 
-
 func init() {
 }
-
diff --git a/go/parquet/internal/gen-go/parquet/parquet.go b/go/parquet/internal/gen-go/parquet/parquet.go
index 9dcedae8888d3..5b616d1335150 100644
--- a/go/parquet/internal/gen-go/parquet/parquet.go
+++ b/go/parquet/internal/gen-go/parquet/parquet.go
@@ -8,10 +8,11 @@ import (
 	"database/sql/driver"
 	"errors"
 	"fmt"
+	"regexp"
+	"strings"
 	"time"
+
 	thrift "github.com/apache/thrift/lib/go/thrift"
-	"strings"
-	"regexp"
 )
 
 // (needed to ensure safety because of naive import list construction.)
@@ -21,1336 +22,1547 @@ var _ = errors.New
 var _ = context.Background
 var _ = time.Now
 var _ = bytes.Equal
+
 // (needed by validator.)
 var _ = strings.Contains
 var _ = regexp.MatchString
 
-//Types supported by Parquet.  These types are intended to be used in combination
-//with the encodings to control the on disk storage format.
-//For example INT16 is not included as a type since a good encoding of INT32
-//would handle this.
+// Types supported by Parquet.  These types are intended to be used in combination
+// with the encodings to control the on disk storage format.
+// For example INT16 is not included as a type since a good encoding of INT32
+// would handle this.
 type Type int64
+
 const (
-  Type_BOOLEAN Type = 0
-  Type_INT32 Type = 1
-  Type_INT64 Type = 2
-  Type_INT96 Type = 3
-  Type_FLOAT Type = 4
-  Type_DOUBLE Type = 5
-  Type_BYTE_ARRAY Type = 6
-  Type_FIXED_LEN_BYTE_ARRAY Type = 7
+	Type_BOOLEAN              Type = 0
+	Type_INT32                Type = 1
+	Type_INT64                Type = 2
+	Type_INT96                Type = 3
+	Type_FLOAT                Type = 4
+	Type_DOUBLE               Type = 5
+	Type_BYTE_ARRAY           Type = 6
+	Type_FIXED_LEN_BYTE_ARRAY Type = 7
 )
 
 func (p Type) String() string {
-  switch p {
-  case Type_BOOLEAN: return "BOOLEAN"
-  case Type_INT32: return "INT32"
-  case Type_INT64: return "INT64"
-  case Type_INT96: return "INT96"
-  case Type_FLOAT: return "FLOAT"
-  case Type_DOUBLE: return "DOUBLE"
-  case Type_BYTE_ARRAY: return "BYTE_ARRAY"
-  case Type_FIXED_LEN_BYTE_ARRAY: return "FIXED_LEN_BYTE_ARRAY"
-  }
-  return "<UNSET>"
+	switch p {
+	case Type_BOOLEAN:
+		return "BOOLEAN"
+	case Type_INT32:
+		return "INT32"
+	case Type_INT64:
+		return "INT64"
+	case Type_INT96:
+		return "INT96"
+	case Type_FLOAT:
+		return "FLOAT"
+	case Type_DOUBLE:
+		return "DOUBLE"
+	case Type_BYTE_ARRAY:
+		return "BYTE_ARRAY"
+	case Type_FIXED_LEN_BYTE_ARRAY:
+		return "FIXED_LEN_BYTE_ARRAY"
+	}
+	return "<UNSET>"
 }
 
 func TypeFromString(s string) (Type, error) {
-  switch s {
-  case "BOOLEAN": return Type_BOOLEAN, nil 
-  case "INT32": return Type_INT32, nil 
-  case "INT64": return Type_INT64, nil 
-  case "INT96": return Type_INT96, nil 
-  case "FLOAT": return Type_FLOAT, nil 
-  case "DOUBLE": return Type_DOUBLE, nil 
-  case "BYTE_ARRAY": return Type_BYTE_ARRAY, nil 
-  case "FIXED_LEN_BYTE_ARRAY": return Type_FIXED_LEN_BYTE_ARRAY, nil 
-  }
-  return Type(0), fmt.Errorf("not a valid Type string")
+	switch s {
+	case "BOOLEAN":
+		return Type_BOOLEAN, nil
+	case "INT32":
+		return Type_INT32, nil
+	case "INT64":
+		return Type_INT64, nil
+	case "INT96":
+		return Type_INT96, nil
+	case "FLOAT":
+		return Type_FLOAT, nil
+	case "DOUBLE":
+		return Type_DOUBLE, nil
+	case "BYTE_ARRAY":
+		return Type_BYTE_ARRAY, nil
+	case "FIXED_LEN_BYTE_ARRAY":
+		return Type_FIXED_LEN_BYTE_ARRAY, nil
+	}
+	return Type(0), fmt.Errorf("not a valid Type string")
 }
 
-
 func TypePtr(v Type) *Type { return &v }
 
 func (p Type) MarshalText() ([]byte, error) {
-return []byte(p.String()), nil
+	return []byte(p.String()), nil
 }
 
 func (p *Type) UnmarshalText(text []byte) error {
-q, err := TypeFromString(string(text))
-if (err != nil) {
-return err
-}
-*p = q
-return nil
+	q, err := TypeFromString(string(text))
+	if err != nil {
+		return err
+	}
+	*p = q
+	return nil
 }
 
 func (p *Type) Scan(value interface{}) error {
-v, ok := value.(int64)
-if !ok {
-return errors.New("Scan value is not int64")
-}
-*p = Type(v)
-return nil
+	v, ok := value.(int64)
+	if !ok {
+		return errors.New("Scan value is not int64")
+	}
+	*p = Type(v)
+	return nil
 }
 
-func (p * Type) Value() (driver.Value, error) {
-  if p == nil {
-    return nil, nil
-  }
-return int64(*p), nil
+func (p *Type) Value() (driver.Value, error) {
+	if p == nil {
+		return nil, nil
+	}
+	return int64(*p), nil
 }
-//DEPRECATED: Common types used by frameworks(e.g. hive, pig) using parquet.
-//ConvertedType is superseded by LogicalType.  This enum should not be extended.
+
+// DEPRECATED: Common types used by frameworks(e.g. hive, pig) using parquet.
+// ConvertedType is superseded by LogicalType.  This enum should not be extended.
 //
-//See LogicalTypes.md for conversion between ConvertedType and LogicalType.
+// See LogicalTypes.md for conversion between ConvertedType and LogicalType.
 type ConvertedType int64
+
 const (
-  ConvertedType_UTF8 ConvertedType = 0
-  ConvertedType_MAP ConvertedType = 1
-  ConvertedType_MAP_KEY_VALUE ConvertedType = 2
-  ConvertedType_LIST ConvertedType = 3
-  ConvertedType_ENUM ConvertedType = 4
-  ConvertedType_DECIMAL ConvertedType = 5
-  ConvertedType_DATE ConvertedType = 6
-  ConvertedType_TIME_MILLIS ConvertedType = 7
-  ConvertedType_TIME_MICROS ConvertedType = 8
-  ConvertedType_TIMESTAMP_MILLIS ConvertedType = 9
-  ConvertedType_TIMESTAMP_MICROS ConvertedType = 10
-  ConvertedType_UINT_8 ConvertedType = 11
-  ConvertedType_UINT_16 ConvertedType = 12
-  ConvertedType_UINT_32 ConvertedType = 13
-  ConvertedType_UINT_64 ConvertedType = 14
-  ConvertedType_INT_8 ConvertedType = 15
-  ConvertedType_INT_16 ConvertedType = 16
-  ConvertedType_INT_32 ConvertedType = 17
-  ConvertedType_INT_64 ConvertedType = 18
-  ConvertedType_JSON ConvertedType = 19
-  ConvertedType_BSON ConvertedType = 20
-  ConvertedType_INTERVAL ConvertedType = 21
+	ConvertedType_UTF8             ConvertedType = 0
+	ConvertedType_MAP              ConvertedType = 1
+	ConvertedType_MAP_KEY_VALUE    ConvertedType = 2
+	ConvertedType_LIST             ConvertedType = 3
+	ConvertedType_ENUM             ConvertedType = 4
+	ConvertedType_DECIMAL          ConvertedType = 5
+	ConvertedType_DATE             ConvertedType = 6
+	ConvertedType_TIME_MILLIS      ConvertedType = 7
+	ConvertedType_TIME_MICROS      ConvertedType = 8
+	ConvertedType_TIMESTAMP_MILLIS ConvertedType = 9
+	ConvertedType_TIMESTAMP_MICROS ConvertedType = 10
+	ConvertedType_UINT_8           ConvertedType = 11
+	ConvertedType_UINT_16          ConvertedType = 12
+	ConvertedType_UINT_32          ConvertedType = 13
+	ConvertedType_UINT_64          ConvertedType = 14
+	ConvertedType_INT_8            ConvertedType = 15
+	ConvertedType_INT_16           ConvertedType = 16
+	ConvertedType_INT_32           ConvertedType = 17
+	ConvertedType_INT_64           ConvertedType = 18
+	ConvertedType_JSON             ConvertedType = 19
+	ConvertedType_BSON             ConvertedType = 20
+	ConvertedType_INTERVAL         ConvertedType = 21
 )
 
 func (p ConvertedType) String() string {
-  switch p {
-  case ConvertedType_UTF8: return "UTF8"
-  case ConvertedType_MAP: return "MAP"
-  case ConvertedType_MAP_KEY_VALUE: return "MAP_KEY_VALUE"
-  case ConvertedType_LIST: return "LIST"
-  case ConvertedType_ENUM: return "ENUM"
-  case ConvertedType_DECIMAL: return "DECIMAL"
-  case ConvertedType_DATE: return "DATE"
-  case ConvertedType_TIME_MILLIS: return "TIME_MILLIS"
-  case ConvertedType_TIME_MICROS: return "TIME_MICROS"
-  case ConvertedType_TIMESTAMP_MILLIS: return "TIMESTAMP_MILLIS"
-  case ConvertedType_TIMESTAMP_MICROS: return "TIMESTAMP_MICROS"
-  case ConvertedType_UINT_8: return "UINT_8"
-  case ConvertedType_UINT_16: return "UINT_16"
-  case ConvertedType_UINT_32: return "UINT_32"
-  case ConvertedType_UINT_64: return "UINT_64"
-  case ConvertedType_INT_8: return "INT_8"
-  case ConvertedType_INT_16: return "INT_16"
-  case ConvertedType_INT_32: return "INT_32"
-  case ConvertedType_INT_64: return "INT_64"
-  case ConvertedType_JSON: return "JSON"
-  case ConvertedType_BSON: return "BSON"
-  case ConvertedType_INTERVAL: return "INTERVAL"
-  }
-  return "<UNSET>"
+	switch p {
+	case ConvertedType_UTF8:
+		return "UTF8"
+	case ConvertedType_MAP:
+		return "MAP"
+	case ConvertedType_MAP_KEY_VALUE:
+		return "MAP_KEY_VALUE"
+	case ConvertedType_LIST:
+		return "LIST"
+	case ConvertedType_ENUM:
+		return "ENUM"
+	case ConvertedType_DECIMAL:
+		return "DECIMAL"
+	case ConvertedType_DATE:
+		return "DATE"
+	case ConvertedType_TIME_MILLIS:
+		return "TIME_MILLIS"
+	case ConvertedType_TIME_MICROS:
+		return "TIME_MICROS"
+	case ConvertedType_TIMESTAMP_MILLIS:
+		return "TIMESTAMP_MILLIS"
+	case ConvertedType_TIMESTAMP_MICROS:
+		return "TIMESTAMP_MICROS"
+	case ConvertedType_UINT_8:
+		return "UINT_8"
+	case ConvertedType_UINT_16:
+		return "UINT_16"
+	case ConvertedType_UINT_32:
+		return "UINT_32"
+	case ConvertedType_UINT_64:
+		return "UINT_64"
+	case ConvertedType_INT_8:
+		return "INT_8"
+	case ConvertedType_INT_16:
+		return "INT_16"
+	case ConvertedType_INT_32:
+		return "INT_32"
+	case ConvertedType_INT_64:
+		return "INT_64"
+	case ConvertedType_JSON:
+		return "JSON"
+	case ConvertedType_BSON:
+		return "BSON"
+	case ConvertedType_INTERVAL:
+		return "INTERVAL"
+	}
+	return "<UNSET>"
 }
 
 func ConvertedTypeFromString(s string) (ConvertedType, error) {
-  switch s {
-  case "UTF8": return ConvertedType_UTF8, nil 
-  case "MAP": return ConvertedType_MAP, nil 
-  case "MAP_KEY_VALUE": return ConvertedType_MAP_KEY_VALUE, nil 
-  case "LIST": return ConvertedType_LIST, nil 
-  case "ENUM": return ConvertedType_ENUM, nil 
-  case "DECIMAL": return ConvertedType_DECIMAL, nil 
-  case "DATE": return ConvertedType_DATE, nil 
-  case "TIME_MILLIS": return ConvertedType_TIME_MILLIS, nil 
-  case "TIME_MICROS": return ConvertedType_TIME_MICROS, nil 
-  case "TIMESTAMP_MILLIS": return ConvertedType_TIMESTAMP_MILLIS, nil 
-  case "TIMESTAMP_MICROS": return ConvertedType_TIMESTAMP_MICROS, nil 
-  case "UINT_8": return ConvertedType_UINT_8, nil 
-  case "UINT_16": return ConvertedType_UINT_16, nil 
-  case "UINT_32": return ConvertedType_UINT_32, nil 
-  case "UINT_64": return ConvertedType_UINT_64, nil 
-  case "INT_8": return ConvertedType_INT_8, nil 
-  case "INT_16": return ConvertedType_INT_16, nil 
-  case "INT_32": return ConvertedType_INT_32, nil 
-  case "INT_64": return ConvertedType_INT_64, nil 
-  case "JSON": return ConvertedType_JSON, nil 
-  case "BSON": return ConvertedType_BSON, nil 
-  case "INTERVAL": return ConvertedType_INTERVAL, nil 
-  }
-  return ConvertedType(0), fmt.Errorf("not a valid ConvertedType string")
+	switch s {
+	case "UTF8":
+		return ConvertedType_UTF8, nil
+	case "MAP":
+		return ConvertedType_MAP, nil
+	case "MAP_KEY_VALUE":
+		return ConvertedType_MAP_KEY_VALUE, nil
+	case "LIST":
+		return ConvertedType_LIST, nil
+	case "ENUM":
+		return ConvertedType_ENUM, nil
+	case "DECIMAL":
+		return ConvertedType_DECIMAL, nil
+	case "DATE":
+		return ConvertedType_DATE, nil
+	case "TIME_MILLIS":
+		return ConvertedType_TIME_MILLIS, nil
+	case "TIME_MICROS":
+		return ConvertedType_TIME_MICROS, nil
+	case "TIMESTAMP_MILLIS":
+		return ConvertedType_TIMESTAMP_MILLIS, nil
+	case "TIMESTAMP_MICROS":
+		return ConvertedType_TIMESTAMP_MICROS, nil
+	case "UINT_8":
+		return ConvertedType_UINT_8, nil
+	case "UINT_16":
+		return ConvertedType_UINT_16, nil
+	case "UINT_32":
+		return ConvertedType_UINT_32, nil
+	case "UINT_64":
+		return ConvertedType_UINT_64, nil
+	case "INT_8":
+		return ConvertedType_INT_8, nil
+	case "INT_16":
+		return ConvertedType_INT_16, nil
+	case "INT_32":
+		return ConvertedType_INT_32, nil
+	case "INT_64":
+		return ConvertedType_INT_64, nil
+	case "JSON":
+		return ConvertedType_JSON, nil
+	case "BSON":
+		return ConvertedType_BSON, nil
+	case "INTERVAL":
+		return ConvertedType_INTERVAL, nil
+	}
+	return ConvertedType(0), fmt.Errorf("not a valid ConvertedType string")
 }
 
-
 func ConvertedTypePtr(v ConvertedType) *ConvertedType { return &v }
 
 func (p ConvertedType) MarshalText() ([]byte, error) {
-return []byte(p.String()), nil
+	return []byte(p.String()), nil
 }
 
 func (p *ConvertedType) UnmarshalText(text []byte) error {
-q, err := ConvertedTypeFromString(string(text))
-if (err != nil) {
-return err
-}
-*p = q
-return nil
+	q, err := ConvertedTypeFromString(string(text))
+	if err != nil {
+		return err
+	}
+	*p = q
+	return nil
 }
 
 func (p *ConvertedType) Scan(value interface{}) error {
-v, ok := value.(int64)
-if !ok {
-return errors.New("Scan value is not int64")
-}
-*p = ConvertedType(v)
-return nil
+	v, ok := value.(int64)
+	if !ok {
+		return errors.New("Scan value is not int64")
+	}
+	*p = ConvertedType(v)
+	return nil
 }
 
-func (p * ConvertedType) Value() (driver.Value, error) {
-  if p == nil {
-    return nil, nil
-  }
-return int64(*p), nil
+func (p *ConvertedType) Value() (driver.Value, error) {
+	if p == nil {
+		return nil, nil
+	}
+	return int64(*p), nil
 }
-//Representation of Schemas
+
+// Representation of Schemas
 type FieldRepetitionType int64
+
 const (
-  FieldRepetitionType_REQUIRED FieldRepetitionType = 0
-  FieldRepetitionType_OPTIONAL FieldRepetitionType = 1
-  FieldRepetitionType_REPEATED FieldRepetitionType = 2
+	FieldRepetitionType_REQUIRED FieldRepetitionType = 0
+	FieldRepetitionType_OPTIONAL FieldRepetitionType = 1
+	FieldRepetitionType_REPEATED FieldRepetitionType = 2
 )
 
 func (p FieldRepetitionType) String() string {
-  switch p {
-  case FieldRepetitionType_REQUIRED: return "REQUIRED"
-  case FieldRepetitionType_OPTIONAL: return "OPTIONAL"
-  case FieldRepetitionType_REPEATED: return "REPEATED"
-  }
-  return "<UNSET>"
+	switch p {
+	case FieldRepetitionType_REQUIRED:
+		return "REQUIRED"
+	case FieldRepetitionType_OPTIONAL:
+		return "OPTIONAL"
+	case FieldRepetitionType_REPEATED:
+		return "REPEATED"
+	}
+	return "<UNSET>"
 }
 
 func FieldRepetitionTypeFromString(s string) (FieldRepetitionType, error) {
-  switch s {
-  case "REQUIRED": return FieldRepetitionType_REQUIRED, nil 
-  case "OPTIONAL": return FieldRepetitionType_OPTIONAL, nil 
-  case "REPEATED": return FieldRepetitionType_REPEATED, nil 
-  }
-  return FieldRepetitionType(0), fmt.Errorf("not a valid FieldRepetitionType string")
+	switch s {
+	case "REQUIRED":
+		return FieldRepetitionType_REQUIRED, nil
+	case "OPTIONAL":
+		return FieldRepetitionType_OPTIONAL, nil
+	case "REPEATED":
+		return FieldRepetitionType_REPEATED, nil
+	}
+	return FieldRepetitionType(0), fmt.Errorf("not a valid FieldRepetitionType string")
 }
 
-
 func FieldRepetitionTypePtr(v FieldRepetitionType) *FieldRepetitionType { return &v }
 
 func (p FieldRepetitionType) MarshalText() ([]byte, error) {
-return []byte(p.String()), nil
+	return []byte(p.String()), nil
 }
 
 func (p *FieldRepetitionType) UnmarshalText(text []byte) error {
-q, err := FieldRepetitionTypeFromString(string(text))
-if (err != nil) {
-return err
-}
-*p = q
-return nil
+	q, err := FieldRepetitionTypeFromString(string(text))
+	if err != nil {
+		return err
+	}
+	*p = q
+	return nil
 }
 
 func (p *FieldRepetitionType) Scan(value interface{}) error {
-v, ok := value.(int64)
-if !ok {
-return errors.New("Scan value is not int64")
-}
-*p = FieldRepetitionType(v)
-return nil
+	v, ok := value.(int64)
+	if !ok {
+		return errors.New("Scan value is not int64")
+	}
+	*p = FieldRepetitionType(v)
+	return nil
 }
 
-func (p * FieldRepetitionType) Value() (driver.Value, error) {
-  if p == nil {
-    return nil, nil
-  }
-return int64(*p), nil
+func (p *FieldRepetitionType) Value() (driver.Value, error) {
+	if p == nil {
+		return nil, nil
+	}
+	return int64(*p), nil
 }
-//Encodings supported by Parquet.  Not all encodings are valid for all types.  These
-//enums are also used to specify the encoding of definition and repetition levels.
-//See the accompanying doc for the details of the more complicated encodings.
+
+// Encodings supported by Parquet.  Not all encodings are valid for all types.  These
+// enums are also used to specify the encoding of definition and repetition levels.
+// See the accompanying doc for the details of the more complicated encodings.
 type Encoding int64
+
 const (
-  Encoding_PLAIN Encoding = 0
-  Encoding_PLAIN_DICTIONARY Encoding = 2
-  Encoding_RLE Encoding = 3
-  Encoding_BIT_PACKED Encoding = 4
-  Encoding_DELTA_BINARY_PACKED Encoding = 5
-  Encoding_DELTA_LENGTH_BYTE_ARRAY Encoding = 6
-  Encoding_DELTA_BYTE_ARRAY Encoding = 7
-  Encoding_RLE_DICTIONARY Encoding = 8
-  Encoding_BYTE_STREAM_SPLIT Encoding = 9
+	Encoding_PLAIN                   Encoding = 0
+	Encoding_PLAIN_DICTIONARY        Encoding = 2
+	Encoding_RLE                     Encoding = 3
+	Encoding_BIT_PACKED              Encoding = 4
+	Encoding_DELTA_BINARY_PACKED     Encoding = 5
+	Encoding_DELTA_LENGTH_BYTE_ARRAY Encoding = 6
+	Encoding_DELTA_BYTE_ARRAY        Encoding = 7
+	Encoding_RLE_DICTIONARY          Encoding = 8
+	Encoding_BYTE_STREAM_SPLIT       Encoding = 9
 )
 
 func (p Encoding) String() string {
-  switch p {
-  case Encoding_PLAIN: return "PLAIN"
-  case Encoding_PLAIN_DICTIONARY: return "PLAIN_DICTIONARY"
-  case Encoding_RLE: return "RLE"
-  case Encoding_BIT_PACKED: return "BIT_PACKED"
-  case Encoding_DELTA_BINARY_PACKED: return "DELTA_BINARY_PACKED"
-  case Encoding_DELTA_LENGTH_BYTE_ARRAY: return "DELTA_LENGTH_BYTE_ARRAY"
-  case Encoding_DELTA_BYTE_ARRAY: return "DELTA_BYTE_ARRAY"
-  case Encoding_RLE_DICTIONARY: return "RLE_DICTIONARY"
-  case Encoding_BYTE_STREAM_SPLIT: return "BYTE_STREAM_SPLIT"
-  }
-  return "<UNSET>"
+	switch p {
+	case Encoding_PLAIN:
+		return "PLAIN"
+	case Encoding_PLAIN_DICTIONARY:
+		return "PLAIN_DICTIONARY"
+	case Encoding_RLE:
+		return "RLE"
+	case Encoding_BIT_PACKED:
+		return "BIT_PACKED"
+	case Encoding_DELTA_BINARY_PACKED:
+		return "DELTA_BINARY_PACKED"
+	case Encoding_DELTA_LENGTH_BYTE_ARRAY:
+		return "DELTA_LENGTH_BYTE_ARRAY"
+	case Encoding_DELTA_BYTE_ARRAY:
+		return "DELTA_BYTE_ARRAY"
+	case Encoding_RLE_DICTIONARY:
+		return "RLE_DICTIONARY"
+	case Encoding_BYTE_STREAM_SPLIT:
+		return "BYTE_STREAM_SPLIT"
+	}
+	return "<UNSET>"
 }
 
 func EncodingFromString(s string) (Encoding, error) {
-  switch s {
-  case "PLAIN": return Encoding_PLAIN, nil 
-  case "PLAIN_DICTIONARY": return Encoding_PLAIN_DICTIONARY, nil 
-  case "RLE": return Encoding_RLE, nil 
-  case "BIT_PACKED": return Encoding_BIT_PACKED, nil 
-  case "DELTA_BINARY_PACKED": return Encoding_DELTA_BINARY_PACKED, nil 
-  case "DELTA_LENGTH_BYTE_ARRAY": return Encoding_DELTA_LENGTH_BYTE_ARRAY, nil 
-  case "DELTA_BYTE_ARRAY": return Encoding_DELTA_BYTE_ARRAY, nil 
-  case "RLE_DICTIONARY": return Encoding_RLE_DICTIONARY, nil 
-  case "BYTE_STREAM_SPLIT": return Encoding_BYTE_STREAM_SPLIT, nil 
-  }
-  return Encoding(0), fmt.Errorf("not a valid Encoding string")
+	switch s {
+	case "PLAIN":
+		return Encoding_PLAIN, nil
+	case "PLAIN_DICTIONARY":
+		return Encoding_PLAIN_DICTIONARY, nil
+	case "RLE":
+		return Encoding_RLE, nil
+	case "BIT_PACKED":
+		return Encoding_BIT_PACKED, nil
+	case "DELTA_BINARY_PACKED":
+		return Encoding_DELTA_BINARY_PACKED, nil
+	case "DELTA_LENGTH_BYTE_ARRAY":
+		return Encoding_DELTA_LENGTH_BYTE_ARRAY, nil
+	case "DELTA_BYTE_ARRAY":
+		return Encoding_DELTA_BYTE_ARRAY, nil
+	case "RLE_DICTIONARY":
+		return Encoding_RLE_DICTIONARY, nil
+	case "BYTE_STREAM_SPLIT":
+		return Encoding_BYTE_STREAM_SPLIT, nil
+	}
+	return Encoding(0), fmt.Errorf("not a valid Encoding string")
 }
 
-
 func EncodingPtr(v Encoding) *Encoding { return &v }
 
 func (p Encoding) MarshalText() ([]byte, error) {
-return []byte(p.String()), nil
+	return []byte(p.String()), nil
 }
 
 func (p *Encoding) UnmarshalText(text []byte) error {
-q, err := EncodingFromString(string(text))
-if (err != nil) {
-return err
-}
-*p = q
-return nil
+	q, err := EncodingFromString(string(text))
+	if err != nil {
+		return err
+	}
+	*p = q
+	return nil
 }
 
 func (p *Encoding) Scan(value interface{}) error {
-v, ok := value.(int64)
-if !ok {
-return errors.New("Scan value is not int64")
-}
-*p = Encoding(v)
-return nil
+	v, ok := value.(int64)
+	if !ok {
+		return errors.New("Scan value is not int64")
+	}
+	*p = Encoding(v)
+	return nil
 }
 
-func (p * Encoding) Value() (driver.Value, error) {
-  if p == nil {
-    return nil, nil
-  }
-return int64(*p), nil
+func (p *Encoding) Value() (driver.Value, error) {
+	if p == nil {
+		return nil, nil
+	}
+	return int64(*p), nil
 }
-//Supported compression algorithms.
+
+// Supported compression algorithms.
 //
-//Codecs added in format version X.Y can be read by readers based on X.Y and later.
-//Codec support may vary between readers based on the format version and
-//libraries available at runtime.
+// Codecs added in format version X.Y can be read by readers based on X.Y and later.
+// Codec support may vary between readers based on the format version and
+// libraries available at runtime.
 //
-//See Compression.md for a detailed specification of these algorithms.
+// See Compression.md for a detailed specification of these algorithms.
 type CompressionCodec int64
+
 const (
-  CompressionCodec_UNCOMPRESSED CompressionCodec = 0
-  CompressionCodec_SNAPPY CompressionCodec = 1
-  CompressionCodec_GZIP CompressionCodec = 2
-  CompressionCodec_LZO CompressionCodec = 3
-  CompressionCodec_BROTLI CompressionCodec = 4
-  CompressionCodec_LZ4 CompressionCodec = 5
-  CompressionCodec_ZSTD CompressionCodec = 6
-  CompressionCodec_LZ4_RAW CompressionCodec = 7
+	CompressionCodec_UNCOMPRESSED CompressionCodec = 0
+	CompressionCodec_SNAPPY       CompressionCodec = 1
+	CompressionCodec_GZIP         CompressionCodec = 2
+	CompressionCodec_LZO          CompressionCodec = 3
+	CompressionCodec_BROTLI       CompressionCodec = 4
+	CompressionCodec_LZ4          CompressionCodec = 5
+	CompressionCodec_ZSTD         CompressionCodec = 6
+	CompressionCodec_LZ4_RAW      CompressionCodec = 7
 )
 
 func (p CompressionCodec) String() string {
-  switch p {
-  case CompressionCodec_UNCOMPRESSED: return "UNCOMPRESSED"
-  case CompressionCodec_SNAPPY: return "SNAPPY"
-  case CompressionCodec_GZIP: return "GZIP"
-  case CompressionCodec_LZO: return "LZO"
-  case CompressionCodec_BROTLI: return "BROTLI"
-  case CompressionCodec_LZ4: return "LZ4"
-  case CompressionCodec_ZSTD: return "ZSTD"
-  case CompressionCodec_LZ4_RAW: return "LZ4_RAW"
-  }
-  return "<UNSET>"
+	switch p {
+	case CompressionCodec_UNCOMPRESSED:
+		return "UNCOMPRESSED"
+	case CompressionCodec_SNAPPY:
+		return "SNAPPY"
+	case CompressionCodec_GZIP:
+		return "GZIP"
+	case CompressionCodec_LZO:
+		return "LZO"
+	case CompressionCodec_BROTLI:
+		return "BROTLI"
+	case CompressionCodec_LZ4:
+		return "LZ4"
+	case CompressionCodec_ZSTD:
+		return "ZSTD"
+	case CompressionCodec_LZ4_RAW:
+		return "LZ4_RAW"
+	}
+	return "<UNSET>"
 }
 
 func CompressionCodecFromString(s string) (CompressionCodec, error) {
-  switch s {
-  case "UNCOMPRESSED": return CompressionCodec_UNCOMPRESSED, nil 
-  case "SNAPPY": return CompressionCodec_SNAPPY, nil 
-  case "GZIP": return CompressionCodec_GZIP, nil 
-  case "LZO": return CompressionCodec_LZO, nil 
-  case "BROTLI": return CompressionCodec_BROTLI, nil 
-  case "LZ4": return CompressionCodec_LZ4, nil 
-  case "ZSTD": return CompressionCodec_ZSTD, nil 
-  case "LZ4_RAW": return CompressionCodec_LZ4_RAW, nil 
-  }
-  return CompressionCodec(0), fmt.Errorf("not a valid CompressionCodec string")
+	switch s {
+	case "UNCOMPRESSED":
+		return CompressionCodec_UNCOMPRESSED, nil
+	case "SNAPPY":
+		return CompressionCodec_SNAPPY, nil
+	case "GZIP":
+		return CompressionCodec_GZIP, nil
+	case "LZO":
+		return CompressionCodec_LZO, nil
+	case "BROTLI":
+		return CompressionCodec_BROTLI, nil
+	case "LZ4":
+		return CompressionCodec_LZ4, nil
+	case "ZSTD":
+		return CompressionCodec_ZSTD, nil
+	case "LZ4_RAW":
+		return CompressionCodec_LZ4_RAW, nil
+	}
+	return CompressionCodec(0), fmt.Errorf("not a valid CompressionCodec string")
 }
 
-
 func CompressionCodecPtr(v CompressionCodec) *CompressionCodec { return &v }
 
 func (p CompressionCodec) MarshalText() ([]byte, error) {
-return []byte(p.String()), nil
+	return []byte(p.String()), nil
 }
 
 func (p *CompressionCodec) UnmarshalText(text []byte) error {
-q, err := CompressionCodecFromString(string(text))
-if (err != nil) {
-return err
-}
-*p = q
-return nil
+	q, err := CompressionCodecFromString(string(text))
+	if err != nil {
+		return err
+	}
+	*p = q
+	return nil
 }
 
 func (p *CompressionCodec) Scan(value interface{}) error {
-v, ok := value.(int64)
-if !ok {
-return errors.New("Scan value is not int64")
-}
-*p = CompressionCodec(v)
-return nil
+	v, ok := value.(int64)
+	if !ok {
+		return errors.New("Scan value is not int64")
+	}
+	*p = CompressionCodec(v)
+	return nil
 }
 
-func (p * CompressionCodec) Value() (driver.Value, error) {
-  if p == nil {
-    return nil, nil
-  }
-return int64(*p), nil
+func (p *CompressionCodec) Value() (driver.Value, error) {
+	if p == nil {
+		return nil, nil
+	}
+	return int64(*p), nil
 }
+
 type PageType int64
+
 const (
-  PageType_DATA_PAGE PageType = 0
-  PageType_INDEX_PAGE PageType = 1
-  PageType_DICTIONARY_PAGE PageType = 2
-  PageType_DATA_PAGE_V2 PageType = 3
+	PageType_DATA_PAGE       PageType = 0
+	PageType_INDEX_PAGE      PageType = 1
+	PageType_DICTIONARY_PAGE PageType = 2
+	PageType_DATA_PAGE_V2    PageType = 3
 )
 
 func (p PageType) String() string {
-  switch p {
-  case PageType_DATA_PAGE: return "DATA_PAGE"
-  case PageType_INDEX_PAGE: return "INDEX_PAGE"
-  case PageType_DICTIONARY_PAGE: return "DICTIONARY_PAGE"
-  case PageType_DATA_PAGE_V2: return "DATA_PAGE_V2"
-  }
-  return "<UNSET>"
+	switch p {
+	case PageType_DATA_PAGE:
+		return "DATA_PAGE"
+	case PageType_INDEX_PAGE:
+		return "INDEX_PAGE"
+	case PageType_DICTIONARY_PAGE:
+		return "DICTIONARY_PAGE"
+	case PageType_DATA_PAGE_V2:
+		return "DATA_PAGE_V2"
+	}
+	return "<UNSET>"
 }
 
 func PageTypeFromString(s string) (PageType, error) {
-  switch s {
-  case "DATA_PAGE": return PageType_DATA_PAGE, nil 
-  case "INDEX_PAGE": return PageType_INDEX_PAGE, nil 
-  case "DICTIONARY_PAGE": return PageType_DICTIONARY_PAGE, nil 
-  case "DATA_PAGE_V2": return PageType_DATA_PAGE_V2, nil 
-  }
-  return PageType(0), fmt.Errorf("not a valid PageType string")
+	switch s {
+	case "DATA_PAGE":
+		return PageType_DATA_PAGE, nil
+	case "INDEX_PAGE":
+		return PageType_INDEX_PAGE, nil
+	case "DICTIONARY_PAGE":
+		return PageType_DICTIONARY_PAGE, nil
+	case "DATA_PAGE_V2":
+		return PageType_DATA_PAGE_V2, nil
+	}
+	return PageType(0), fmt.Errorf("not a valid PageType string")
 }
 
-
 func PageTypePtr(v PageType) *PageType { return &v }
 
 func (p PageType) MarshalText() ([]byte, error) {
-return []byte(p.String()), nil
+	return []byte(p.String()), nil
 }
 
 func (p *PageType) UnmarshalText(text []byte) error {
-q, err := PageTypeFromString(string(text))
-if (err != nil) {
-return err
-}
-*p = q
-return nil
+	q, err := PageTypeFromString(string(text))
+	if err != nil {
+		return err
+	}
+	*p = q
+	return nil
 }
 
 func (p *PageType) Scan(value interface{}) error {
-v, ok := value.(int64)
-if !ok {
-return errors.New("Scan value is not int64")
-}
-*p = PageType(v)
-return nil
+	v, ok := value.(int64)
+	if !ok {
+		return errors.New("Scan value is not int64")
+	}
+	*p = PageType(v)
+	return nil
 }
 
-func (p * PageType) Value() (driver.Value, error) {
-  if p == nil {
-    return nil, nil
-  }
-return int64(*p), nil
+func (p *PageType) Value() (driver.Value, error) {
+	if p == nil {
+		return nil, nil
+	}
+	return int64(*p), nil
 }
-//Enum to annotate whether lists of min/max elements inside ColumnIndex
-//are ordered and if so, in which direction.
+
+// Enum to annotate whether lists of min/max elements inside ColumnIndex
+// are ordered and if so, in which direction.
 type BoundaryOrder int64
+
 const (
-  BoundaryOrder_UNORDERED BoundaryOrder = 0
-  BoundaryOrder_ASCENDING BoundaryOrder = 1
-  BoundaryOrder_DESCENDING BoundaryOrder = 2
+	BoundaryOrder_UNORDERED  BoundaryOrder = 0
+	BoundaryOrder_ASCENDING  BoundaryOrder = 1
+	BoundaryOrder_DESCENDING BoundaryOrder = 2
 )
 
 func (p BoundaryOrder) String() string {
-  switch p {
-  case BoundaryOrder_UNORDERED: return "UNORDERED"
-  case BoundaryOrder_ASCENDING: return "ASCENDING"
-  case BoundaryOrder_DESCENDING: return "DESCENDING"
-  }
-  return "<UNSET>"
+	switch p {
+	case BoundaryOrder_UNORDERED:
+		return "UNORDERED"
+	case BoundaryOrder_ASCENDING:
+		return "ASCENDING"
+	case BoundaryOrder_DESCENDING:
+		return "DESCENDING"
+	}
+	return "<UNSET>"
 }
 
 func BoundaryOrderFromString(s string) (BoundaryOrder, error) {
-  switch s {
-  case "UNORDERED": return BoundaryOrder_UNORDERED, nil 
-  case "ASCENDING": return BoundaryOrder_ASCENDING, nil 
-  case "DESCENDING": return BoundaryOrder_DESCENDING, nil 
-  }
-  return BoundaryOrder(0), fmt.Errorf("not a valid BoundaryOrder string")
+	switch s {
+	case "UNORDERED":
+		return BoundaryOrder_UNORDERED, nil
+	case "ASCENDING":
+		return BoundaryOrder_ASCENDING, nil
+	case "DESCENDING":
+		return BoundaryOrder_DESCENDING, nil
+	}
+	return BoundaryOrder(0), fmt.Errorf("not a valid BoundaryOrder string")
 }
 
-
 func BoundaryOrderPtr(v BoundaryOrder) *BoundaryOrder { return &v }
 
 func (p BoundaryOrder) MarshalText() ([]byte, error) {
-return []byte(p.String()), nil
+	return []byte(p.String()), nil
 }
 
 func (p *BoundaryOrder) UnmarshalText(text []byte) error {
-q, err := BoundaryOrderFromString(string(text))
-if (err != nil) {
-return err
-}
-*p = q
-return nil
+	q, err := BoundaryOrderFromString(string(text))
+	if err != nil {
+		return err
+	}
+	*p = q
+	return nil
 }
 
 func (p *BoundaryOrder) Scan(value interface{}) error {
-v, ok := value.(int64)
-if !ok {
-return errors.New("Scan value is not int64")
-}
-*p = BoundaryOrder(v)
-return nil
+	v, ok := value.(int64)
+	if !ok {
+		return errors.New("Scan value is not int64")
+	}
+	*p = BoundaryOrder(v)
+	return nil
 }
 
-func (p * BoundaryOrder) Value() (driver.Value, error) {
-  if p == nil {
-    return nil, nil
-  }
-return int64(*p), nil
+func (p *BoundaryOrder) Value() (driver.Value, error) {
+	if p == nil {
+		return nil, nil
+	}
+	return int64(*p), nil
 }
+
 // Statistics per row group and per page
 // All fields are optional.
-// 
+//
 // Attributes:
-//  - Max: DEPRECATED: min and max value of the column. Use min_value and max_value.
-// 
+//   - Max: DEPRECATED: min and max value of the column. Use min_value and max_value.
+//
 // Values are encoded using PLAIN encoding, except that variable-length byte
 // arrays do not include a length prefix.
-// 
+//
 // These fields encode min and max values determined by signed comparison
 // only. New files should use the correct order for a column's logical type
 // and store the values in the min_value and max_value fields.
-// 
+//
 // To support older readers, these may be set when the column order is
 // signed.
-//  - Min
-//  - NullCount: count of null value in the column
-//  - DistinctCount: count of distinct values occurring
-//  - MaxValue: Min and max values for the column, determined by its ColumnOrder.
-// 
+//   - Min
+//   - NullCount: count of null value in the column
+//   - DistinctCount: count of distinct values occurring
+//   - MaxValue: Min and max values for the column, determined by its ColumnOrder.
+//
 // Values are encoded using PLAIN encoding, except that variable-length byte
 // arrays do not include a length prefix.
-//  - MinValue
+//   - MinValue
 type Statistics struct {
-  Max []byte `thrift:"max,1" db:"max" json:"max,omitempty"`
-  Min []byte `thrift:"min,2" db:"min" json:"min,omitempty"`
-  NullCount *int64 `thrift:"null_count,3" db:"null_count" json:"null_count,omitempty"`
-  DistinctCount *int64 `thrift:"distinct_count,4" db:"distinct_count" json:"distinct_count,omitempty"`
-  MaxValue []byte `thrift:"max_value,5" db:"max_value" json:"max_value,omitempty"`
-  MinValue []byte `thrift:"min_value,6" db:"min_value" json:"min_value,omitempty"`
+	Max           []byte `thrift:"max,1" db:"max" json:"max,omitempty"`
+	Min           []byte `thrift:"min,2" db:"min" json:"min,omitempty"`
+	NullCount     *int64 `thrift:"null_count,3" db:"null_count" json:"null_count,omitempty"`
+	DistinctCount *int64 `thrift:"distinct_count,4" db:"distinct_count" json:"distinct_count,omitempty"`
+	MaxValue      []byte `thrift:"max_value,5" db:"max_value" json:"max_value,omitempty"`
+	MinValue      []byte `thrift:"min_value,6" db:"min_value" json:"min_value,omitempty"`
 }
 
 func NewStatistics() *Statistics {
-  return &Statistics{}
+	return &Statistics{}
 }
 
 var Statistics_Max_DEFAULT []byte
 
 func (p *Statistics) GetMax() []byte {
-  return p.Max
+	return p.Max
 }
+
 var Statistics_Min_DEFAULT []byte
 
 func (p *Statistics) GetMin() []byte {
-  return p.Min
+	return p.Min
 }
+
 var Statistics_NullCount_DEFAULT int64
+
 func (p *Statistics) GetNullCount() int64 {
-  if !p.IsSetNullCount() {
-    return Statistics_NullCount_DEFAULT
-  }
-return *p.NullCount
+	if !p.IsSetNullCount() {
+		return Statistics_NullCount_DEFAULT
+	}
+	return *p.NullCount
 }
+
 var Statistics_DistinctCount_DEFAULT int64
+
 func (p *Statistics) GetDistinctCount() int64 {
-  if !p.IsSetDistinctCount() {
-    return Statistics_DistinctCount_DEFAULT
-  }
-return *p.DistinctCount
+	if !p.IsSetDistinctCount() {
+		return Statistics_DistinctCount_DEFAULT
+	}
+	return *p.DistinctCount
 }
+
 var Statistics_MaxValue_DEFAULT []byte
 
 func (p *Statistics) GetMaxValue() []byte {
-  return p.MaxValue
+	return p.MaxValue
 }
+
 var Statistics_MinValue_DEFAULT []byte
 
 func (p *Statistics) GetMinValue() []byte {
-  return p.MinValue
+	return p.MinValue
 }
 func (p *Statistics) IsSetMax() bool {
-  return p.Max != nil
+	return p.Max != nil
 }
 
 func (p *Statistics) IsSetMin() bool {
-  return p.Min != nil
+	return p.Min != nil
 }
 
 func (p *Statistics) IsSetNullCount() bool {
-  return p.NullCount != nil
+	return p.NullCount != nil
 }
 
 func (p *Statistics) IsSetDistinctCount() bool {
-  return p.DistinctCount != nil
+	return p.DistinctCount != nil
 }
 
 func (p *Statistics) IsSetMaxValue() bool {
-  return p.MaxValue != nil
+	return p.MaxValue != nil
 }
 
 func (p *Statistics) IsSetMinValue() bool {
-  return p.MinValue != nil
+	return p.MinValue != nil
 }
 
 func (p *Statistics) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.STRING {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.STRING {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 4:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField4(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 5:
-      if fieldTypeId == thrift.STRING {
-        if err := p.ReadField5(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 6:
-      if fieldTypeId == thrift.STRING {
-        if err := p.ReadField6(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
-}
-
-func (p *Statistics)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBinary(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  p.Max = v
-}
-  return nil
-}
-
-func (p *Statistics)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBinary(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  p.Min = v
-}
-  return nil
-}
-
-func (p *Statistics)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 3: ", err)
-} else {
-  p.NullCount = &v
-}
-  return nil
-}
-
-func (p *Statistics)  ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 4: ", err)
-} else {
-  p.DistinctCount = &v
-}
-  return nil
-}
-
-func (p *Statistics)  ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBinary(ctx); err != nil {
-  return thrift.PrependError("error reading field 5: ", err)
-} else {
-  p.MaxValue = v
-}
-  return nil
-}
-
-func (p *Statistics)  ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBinary(ctx); err != nil {
-  return thrift.PrependError("error reading field 6: ", err)
-} else {
-  p.MinValue = v
-}
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.STRING {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.STRING {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 4:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField4(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 5:
+			if fieldTypeId == thrift.STRING {
+				if err := p.ReadField5(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 6:
+			if fieldTypeId == thrift.STRING {
+				if err := p.ReadField6(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
+}
+
+func (p *Statistics) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBinary(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		p.Max = v
+	}
+	return nil
+}
+
+func (p *Statistics) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBinary(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		p.Min = v
+	}
+	return nil
+}
+
+func (p *Statistics) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 3: ", err)
+	} else {
+		p.NullCount = &v
+	}
+	return nil
+}
+
+func (p *Statistics) ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 4: ", err)
+	} else {
+		p.DistinctCount = &v
+	}
+	return nil
+}
+
+func (p *Statistics) ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBinary(ctx); err != nil {
+		return thrift.PrependError("error reading field 5: ", err)
+	} else {
+		p.MaxValue = v
+	}
+	return nil
+}
+
+func (p *Statistics) ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBinary(ctx); err != nil {
+		return thrift.PrependError("error reading field 6: ", err)
+	} else {
+		p.MinValue = v
+	}
+	return nil
 }
 
 func (p *Statistics) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "Statistics"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-    if err := p.writeField4(ctx, oprot); err != nil { return err }
-    if err := p.writeField5(ctx, oprot); err != nil { return err }
-    if err := p.writeField6(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "Statistics"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField4(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField5(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField6(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *Statistics) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetMax() {
-    if err := oprot.WriteFieldBegin(ctx, "max", thrift.STRING, 1); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:max: ", p), err) }
-    if err := oprot.WriteBinary(ctx, p.Max); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.max (1) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:max: ", p), err) }
-  }
-  return err
+	if p.IsSetMax() {
+		if err := oprot.WriteFieldBegin(ctx, "max", thrift.STRING, 1); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:max: ", p), err)
+		}
+		if err := oprot.WriteBinary(ctx, p.Max); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.max (1) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:max: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *Statistics) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetMin() {
-    if err := oprot.WriteFieldBegin(ctx, "min", thrift.STRING, 2); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:min: ", p), err) }
-    if err := oprot.WriteBinary(ctx, p.Min); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.min (2) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:min: ", p), err) }
-  }
-  return err
+	if p.IsSetMin() {
+		if err := oprot.WriteFieldBegin(ctx, "min", thrift.STRING, 2); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:min: ", p), err)
+		}
+		if err := oprot.WriteBinary(ctx, p.Min); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.min (2) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:min: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *Statistics) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetNullCount() {
-    if err := oprot.WriteFieldBegin(ctx, "null_count", thrift.I64, 3); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:null_count: ", p), err) }
-    if err := oprot.WriteI64(ctx, int64(*p.NullCount)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.null_count (3) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:null_count: ", p), err) }
-  }
-  return err
+	if p.IsSetNullCount() {
+		if err := oprot.WriteFieldBegin(ctx, "null_count", thrift.I64, 3); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:null_count: ", p), err)
+		}
+		if err := oprot.WriteI64(ctx, int64(*p.NullCount)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.null_count (3) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:null_count: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *Statistics) writeField4(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetDistinctCount() {
-    if err := oprot.WriteFieldBegin(ctx, "distinct_count", thrift.I64, 4); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:distinct_count: ", p), err) }
-    if err := oprot.WriteI64(ctx, int64(*p.DistinctCount)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.distinct_count (4) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 4:distinct_count: ", p), err) }
-  }
-  return err
+	if p.IsSetDistinctCount() {
+		if err := oprot.WriteFieldBegin(ctx, "distinct_count", thrift.I64, 4); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:distinct_count: ", p), err)
+		}
+		if err := oprot.WriteI64(ctx, int64(*p.DistinctCount)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.distinct_count (4) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 4:distinct_count: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *Statistics) writeField5(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetMaxValue() {
-    if err := oprot.WriteFieldBegin(ctx, "max_value", thrift.STRING, 5); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:max_value: ", p), err) }
-    if err := oprot.WriteBinary(ctx, p.MaxValue); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.max_value (5) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 5:max_value: ", p), err) }
-  }
-  return err
+	if p.IsSetMaxValue() {
+		if err := oprot.WriteFieldBegin(ctx, "max_value", thrift.STRING, 5); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:max_value: ", p), err)
+		}
+		if err := oprot.WriteBinary(ctx, p.MaxValue); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.max_value (5) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 5:max_value: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *Statistics) writeField6(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetMinValue() {
-    if err := oprot.WriteFieldBegin(ctx, "min_value", thrift.STRING, 6); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:min_value: ", p), err) }
-    if err := oprot.WriteBinary(ctx, p.MinValue); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.min_value (6) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 6:min_value: ", p), err) }
-  }
-  return err
+	if p.IsSetMinValue() {
+		if err := oprot.WriteFieldBegin(ctx, "min_value", thrift.STRING, 6); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:min_value: ", p), err)
+		}
+		if err := oprot.WriteBinary(ctx, p.MinValue); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.min_value (6) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 6:min_value: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *Statistics) Equals(other *Statistics) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if bytes.Compare(p.Max, other.Max) != 0 { return false }
-  if bytes.Compare(p.Min, other.Min) != 0 { return false }
-  if p.NullCount != other.NullCount {
-    if p.NullCount == nil || other.NullCount == nil {
-      return false
-    }
-    if (*p.NullCount) != (*other.NullCount) { return false }
-  }
-  if p.DistinctCount != other.DistinctCount {
-    if p.DistinctCount == nil || other.DistinctCount == nil {
-      return false
-    }
-    if (*p.DistinctCount) != (*other.DistinctCount) { return false }
-  }
-  if bytes.Compare(p.MaxValue, other.MaxValue) != 0 { return false }
-  if bytes.Compare(p.MinValue, other.MinValue) != 0 { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if bytes.Compare(p.Max, other.Max) != 0 {
+		return false
+	}
+	if bytes.Compare(p.Min, other.Min) != 0 {
+		return false
+	}
+	if p.NullCount != other.NullCount {
+		if p.NullCount == nil || other.NullCount == nil {
+			return false
+		}
+		if (*p.NullCount) != (*other.NullCount) {
+			return false
+		}
+	}
+	if p.DistinctCount != other.DistinctCount {
+		if p.DistinctCount == nil || other.DistinctCount == nil {
+			return false
+		}
+		if (*p.DistinctCount) != (*other.DistinctCount) {
+			return false
+		}
+	}
+	if bytes.Compare(p.MaxValue, other.MaxValue) != 0 {
+		return false
+	}
+	if bytes.Compare(p.MinValue, other.MinValue) != 0 {
+		return false
+	}
+	return true
 }
 
 func (p *Statistics) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("Statistics(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("Statistics(%+v)", *p)
 }
 
 func (p *Statistics) Validate() error {
-  return nil
+	return nil
 }
+
 // Empty structs to use as logical type annotations
 type StringType struct {
 }
 
 func NewStringType() *StringType {
-  return &StringType{}
+	return &StringType{}
 }
 
 func (p *StringType) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *StringType) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "StringType"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "StringType"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *StringType) Equals(other *StringType) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *StringType) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("StringType(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("StringType(%+v)", *p)
 }
 
 func (p *StringType) Validate() error {
-  return nil
+	return nil
 }
+
 type UUIDType struct {
 }
 
 func NewUUIDType() *UUIDType {
-  return &UUIDType{}
+	return &UUIDType{}
 }
 
 func (p *UUIDType) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *UUIDType) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "UUIDType"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "UUIDType"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *UUIDType) Equals(other *UUIDType) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *UUIDType) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("UUIDType(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("UUIDType(%+v)", *p)
 }
 
 func (p *UUIDType) Validate() error {
-  return nil
+	return nil
 }
+
 type MapType struct {
 }
 
 func NewMapType() *MapType {
-  return &MapType{}
+	return &MapType{}
 }
 
 func (p *MapType) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *MapType) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "MapType"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "MapType"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *MapType) Equals(other *MapType) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *MapType) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("MapType(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("MapType(%+v)", *p)
 }
 
 func (p *MapType) Validate() error {
-  return nil
+	return nil
 }
+
 type ListType struct {
 }
 
 func NewListType() *ListType {
-  return &ListType{}
+	return &ListType{}
 }
 
 func (p *ListType) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *ListType) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "ListType"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "ListType"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *ListType) Equals(other *ListType) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *ListType) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("ListType(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("ListType(%+v)", *p)
 }
 
 func (p *ListType) Validate() error {
-  return nil
+	return nil
 }
+
 type EnumType struct {
 }
 
 func NewEnumType() *EnumType {
-  return &EnumType{}
+	return &EnumType{}
 }
 
 func (p *EnumType) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *EnumType) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "EnumType"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "EnumType"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *EnumType) Equals(other *EnumType) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *EnumType) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("EnumType(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("EnumType(%+v)", *p)
 }
 
 func (p *EnumType) Validate() error {
-  return nil
+	return nil
 }
+
 type DateType struct {
 }
 
 func NewDateType() *DateType {
-  return &DateType{}
+	return &DateType{}
 }
 
 func (p *DateType) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *DateType) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "DateType"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "DateType"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *DateType) Equals(other *DateType) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *DateType) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("DateType(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("DateType(%+v)", *p)
 }
 
 func (p *DateType) Validate() error {
-  return nil
+	return nil
 }
+
 type Float16Type struct {
 }
 
 func NewFloat16Type() *Float16Type {
-  return &Float16Type{}
+	return &Float16Type{}
 }
 
 func (p *Float16Type) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *Float16Type) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "Float16Type"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "Float16Type"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *Float16Type) Equals(other *Float16Type) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *Float16Type) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("Float16Type(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("Float16Type(%+v)", *p)
 }
 
 func (p *Float16Type) Validate() error {
-  return nil
+	return nil
 }
+
 // Logical type to annotate a column that is always null.
-// 
+//
 // Sometimes when discovering the schema of existing data, values are always
 // null and the physical type can't be determined. This annotation signals
 // the case where the physical type was guessed from all null values.
@@ -1358,8169 +1570,9269 @@ type NullType struct {
 }
 
 func NewNullType() *NullType {
-  return &NullType{}
+	return &NullType{}
 }
 
 func (p *NullType) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *NullType) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "NullType"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "NullType"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *NullType) Equals(other *NullType) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *NullType) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("NullType(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("NullType(%+v)", *p)
 }
 
 func (p *NullType) Validate() error {
-  return nil
+	return nil
 }
+
 // Decimal logical type annotation
-// 
+//
 // To maintain forward-compatibility in v1, implementations using this logical
 // type must also set scale and precision on the annotated SchemaElement.
-// 
+//
 // Allowed for physical types: INT32, INT64, FIXED, and BINARY
-// 
+//
 // Attributes:
-//  - Scale
-//  - Precision
+//   - Scale
+//   - Precision
 type DecimalType struct {
-  Scale int32 `thrift:"scale,1,required" db:"scale" json:"scale"`
-  Precision int32 `thrift:"precision,2,required" db:"precision" json:"precision"`
+	Scale     int32 `thrift:"scale,1,required" db:"scale" json:"scale"`
+	Precision int32 `thrift:"precision,2,required" db:"precision" json:"precision"`
 }
 
 func NewDecimalType() *DecimalType {
-  return &DecimalType{}
+	return &DecimalType{}
 }
 
-
 func (p *DecimalType) GetScale() int32 {
-  return p.Scale
+	return p.Scale
 }
 
 func (p *DecimalType) GetPrecision() int32 {
-  return p.Precision
+	return p.Precision
 }
 func (p *DecimalType) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetScale bool = false;
-  var issetPrecision bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetScale = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-        issetPrecision = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetScale{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Scale is not set"));
-  }
-  if !issetPrecision{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Precision is not set"));
-  }
-  return nil
-}
-
-func (p *DecimalType)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  p.Scale = v
-}
-  return nil
-}
-
-func (p *DecimalType)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  p.Precision = v
-}
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetScale bool = false
+	var issetPrecision bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetScale = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+				issetPrecision = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetScale {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Scale is not set"))
+	}
+	if !issetPrecision {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Precision is not set"))
+	}
+	return nil
+}
+
+func (p *DecimalType) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		p.Scale = v
+	}
+	return nil
+}
+
+func (p *DecimalType) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		p.Precision = v
+	}
+	return nil
 }
 
 func (p *DecimalType) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "DecimalType"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "DecimalType"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *DecimalType) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "scale", thrift.I32, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:scale: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.Scale)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.scale (1) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:scale: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "scale", thrift.I32, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:scale: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.Scale)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.scale (1) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:scale: ", p), err)
+	}
+	return err
 }
 
 func (p *DecimalType) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "precision", thrift.I32, 2); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:precision: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.Precision)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.precision (2) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:precision: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "precision", thrift.I32, 2); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:precision: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.Precision)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.precision (2) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:precision: ", p), err)
+	}
+	return err
 }
 
 func (p *DecimalType) Equals(other *DecimalType) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if p.Scale != other.Scale { return false }
-  if p.Precision != other.Precision { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if p.Scale != other.Scale {
+		return false
+	}
+	if p.Precision != other.Precision {
+		return false
+	}
+	return true
 }
 
 func (p *DecimalType) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("DecimalType(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("DecimalType(%+v)", *p)
 }
 
 func (p *DecimalType) Validate() error {
-  return nil
+	return nil
 }
+
 // Time units for logical types
 type MilliSeconds struct {
 }
 
 func NewMilliSeconds() *MilliSeconds {
-  return &MilliSeconds{}
+	return &MilliSeconds{}
 }
 
 func (p *MilliSeconds) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *MilliSeconds) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "MilliSeconds"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "MilliSeconds"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *MilliSeconds) Equals(other *MilliSeconds) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *MilliSeconds) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("MilliSeconds(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("MilliSeconds(%+v)", *p)
 }
 
 func (p *MilliSeconds) Validate() error {
-  return nil
+	return nil
 }
+
 type MicroSeconds struct {
 }
 
 func NewMicroSeconds() *MicroSeconds {
-  return &MicroSeconds{}
+	return &MicroSeconds{}
 }
 
 func (p *MicroSeconds) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *MicroSeconds) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "MicroSeconds"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "MicroSeconds"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *MicroSeconds) Equals(other *MicroSeconds) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *MicroSeconds) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("MicroSeconds(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("MicroSeconds(%+v)", *p)
 }
 
 func (p *MicroSeconds) Validate() error {
-  return nil
+	return nil
 }
+
 type NanoSeconds struct {
 }
 
 func NewNanoSeconds() *NanoSeconds {
-  return &NanoSeconds{}
+	return &NanoSeconds{}
 }
 
 func (p *NanoSeconds) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *NanoSeconds) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "NanoSeconds"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "NanoSeconds"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *NanoSeconds) Equals(other *NanoSeconds) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *NanoSeconds) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("NanoSeconds(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("NanoSeconds(%+v)", *p)
 }
 
 func (p *NanoSeconds) Validate() error {
-  return nil
+	return nil
 }
+
 // Attributes:
-//  - MILLIS
-//  - MICROS
-//  - NANOS
+//   - MILLIS
+//   - MICROS
+//   - NANOS
 type TimeUnit struct {
-  MILLIS *MilliSeconds `thrift:"MILLIS,1" db:"MILLIS" json:"MILLIS,omitempty"`
-  MICROS *MicroSeconds `thrift:"MICROS,2" db:"MICROS" json:"MICROS,omitempty"`
-  NANOS *NanoSeconds `thrift:"NANOS,3" db:"NANOS" json:"NANOS,omitempty"`
+	MILLIS *MilliSeconds `thrift:"MILLIS,1" db:"MILLIS" json:"MILLIS,omitempty"`
+	MICROS *MicroSeconds `thrift:"MICROS,2" db:"MICROS" json:"MICROS,omitempty"`
+	NANOS  *NanoSeconds  `thrift:"NANOS,3" db:"NANOS" json:"NANOS,omitempty"`
 }
 
 func NewTimeUnit() *TimeUnit {
-  return &TimeUnit{}
+	return &TimeUnit{}
 }
 
 var TimeUnit_MILLIS_DEFAULT *MilliSeconds
+
 func (p *TimeUnit) GetMILLIS() *MilliSeconds {
-  if !p.IsSetMILLIS() {
-    return TimeUnit_MILLIS_DEFAULT
-  }
-return p.MILLIS
+	if !p.IsSetMILLIS() {
+		return TimeUnit_MILLIS_DEFAULT
+	}
+	return p.MILLIS
 }
+
 var TimeUnit_MICROS_DEFAULT *MicroSeconds
+
 func (p *TimeUnit) GetMICROS() *MicroSeconds {
-  if !p.IsSetMICROS() {
-    return TimeUnit_MICROS_DEFAULT
-  }
-return p.MICROS
+	if !p.IsSetMICROS() {
+		return TimeUnit_MICROS_DEFAULT
+	}
+	return p.MICROS
 }
+
 var TimeUnit_NANOS_DEFAULT *NanoSeconds
+
 func (p *TimeUnit) GetNANOS() *NanoSeconds {
-  if !p.IsSetNANOS() {
-    return TimeUnit_NANOS_DEFAULT
-  }
-return p.NANOS
+	if !p.IsSetNANOS() {
+		return TimeUnit_NANOS_DEFAULT
+	}
+	return p.NANOS
 }
 func (p *TimeUnit) CountSetFieldsTimeUnit() int {
-  count := 0
-  if (p.IsSetMILLIS()) {
-    count++
-  }
-  if (p.IsSetMICROS()) {
-    count++
-  }
-  if (p.IsSetNANOS()) {
-    count++
-  }
-  return count
+	count := 0
+	if p.IsSetMILLIS() {
+		count++
+	}
+	if p.IsSetMICROS() {
+		count++
+	}
+	if p.IsSetNANOS() {
+		count++
+	}
+	return count
 
 }
 
 func (p *TimeUnit) IsSetMILLIS() bool {
-  return p.MILLIS != nil
+	return p.MILLIS != nil
 }
 
 func (p *TimeUnit) IsSetMICROS() bool {
-  return p.MICROS != nil
+	return p.MICROS != nil
 }
 
 func (p *TimeUnit) IsSetNANOS() bool {
-  return p.NANOS != nil
+	return p.NANOS != nil
 }
 
 func (p *TimeUnit) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
-}
-
-func (p *TimeUnit)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  p.MILLIS = &MilliSeconds{}
-  if err := p.MILLIS.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.MILLIS), err)
-  }
-  return nil
-}
-
-func (p *TimeUnit)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  p.MICROS = &MicroSeconds{}
-  if err := p.MICROS.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.MICROS), err)
-  }
-  return nil
-}
-
-func (p *TimeUnit)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  p.NANOS = &NanoSeconds{}
-  if err := p.NANOS.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.NANOS), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
+}
+
+func (p *TimeUnit) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	p.MILLIS = &MilliSeconds{}
+	if err := p.MILLIS.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.MILLIS), err)
+	}
+	return nil
+}
+
+func (p *TimeUnit) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	p.MICROS = &MicroSeconds{}
+	if err := p.MICROS.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.MICROS), err)
+	}
+	return nil
+}
+
+func (p *TimeUnit) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	p.NANOS = &NanoSeconds{}
+	if err := p.NANOS.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.NANOS), err)
+	}
+	return nil
 }
 
 func (p *TimeUnit) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if c := p.CountSetFieldsTimeUnit(); c != 1 {
-    return fmt.Errorf("%T write union: exactly one field must be set (%d set)", p, c)
-  }
-  if err := oprot.WriteStructBegin(ctx, "TimeUnit"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if c := p.CountSetFieldsTimeUnit(); c != 1 {
+		return fmt.Errorf("%T write union: exactly one field must be set (%d set)", p, c)
+	}
+	if err := oprot.WriteStructBegin(ctx, "TimeUnit"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *TimeUnit) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetMILLIS() {
-    if err := oprot.WriteFieldBegin(ctx, "MILLIS", thrift.STRUCT, 1); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:MILLIS: ", p), err) }
-    if err := p.MILLIS.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.MILLIS), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:MILLIS: ", p), err) }
-  }
-  return err
+	if p.IsSetMILLIS() {
+		if err := oprot.WriteFieldBegin(ctx, "MILLIS", thrift.STRUCT, 1); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:MILLIS: ", p), err)
+		}
+		if err := p.MILLIS.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.MILLIS), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:MILLIS: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *TimeUnit) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetMICROS() {
-    if err := oprot.WriteFieldBegin(ctx, "MICROS", thrift.STRUCT, 2); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:MICROS: ", p), err) }
-    if err := p.MICROS.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.MICROS), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:MICROS: ", p), err) }
-  }
-  return err
+	if p.IsSetMICROS() {
+		if err := oprot.WriteFieldBegin(ctx, "MICROS", thrift.STRUCT, 2); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:MICROS: ", p), err)
+		}
+		if err := p.MICROS.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.MICROS), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:MICROS: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *TimeUnit) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetNANOS() {
-    if err := oprot.WriteFieldBegin(ctx, "NANOS", thrift.STRUCT, 3); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:NANOS: ", p), err) }
-    if err := p.NANOS.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.NANOS), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:NANOS: ", p), err) }
-  }
-  return err
+	if p.IsSetNANOS() {
+		if err := oprot.WriteFieldBegin(ctx, "NANOS", thrift.STRUCT, 3); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:NANOS: ", p), err)
+		}
+		if err := p.NANOS.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.NANOS), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:NANOS: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *TimeUnit) Equals(other *TimeUnit) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if !p.MILLIS.Equals(other.MILLIS) { return false }
-  if !p.MICROS.Equals(other.MICROS) { return false }
-  if !p.NANOS.Equals(other.NANOS) { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if !p.MILLIS.Equals(other.MILLIS) {
+		return false
+	}
+	if !p.MICROS.Equals(other.MICROS) {
+		return false
+	}
+	if !p.NANOS.Equals(other.NANOS) {
+		return false
+	}
+	return true
 }
 
 func (p *TimeUnit) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("TimeUnit(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("TimeUnit(%+v)", *p)
 }
 
 func (p *TimeUnit) Validate() error {
-  return nil
+	return nil
 }
+
 // Timestamp logical type annotation
-// 
+//
 // Allowed for physical types: INT64
-// 
+//
 // Attributes:
-//  - IsAdjustedToUTC
-//  - Unit
+//   - IsAdjustedToUTC
+//   - Unit
 type TimestampType struct {
-  IsAdjustedToUTC bool `thrift:"isAdjustedToUTC,1,required" db:"isAdjustedToUTC" json:"isAdjustedToUTC"`
-  Unit *TimeUnit `thrift:"unit,2,required" db:"unit" json:"unit"`
+	IsAdjustedToUTC bool      `thrift:"isAdjustedToUTC,1,required" db:"isAdjustedToUTC" json:"isAdjustedToUTC"`
+	Unit            *TimeUnit `thrift:"unit,2,required" db:"unit" json:"unit"`
 }
 
 func NewTimestampType() *TimestampType {
-  return &TimestampType{}
+	return &TimestampType{}
 }
 
-
 func (p *TimestampType) GetIsAdjustedToUTC() bool {
-  return p.IsAdjustedToUTC
+	return p.IsAdjustedToUTC
 }
+
 var TimestampType_Unit_DEFAULT *TimeUnit
+
 func (p *TimestampType) GetUnit() *TimeUnit {
-  if !p.IsSetUnit() {
-    return TimestampType_Unit_DEFAULT
-  }
-return p.Unit
+	if !p.IsSetUnit() {
+		return TimestampType_Unit_DEFAULT
+	}
+	return p.Unit
 }
 func (p *TimestampType) IsSetUnit() bool {
-  return p.Unit != nil
+	return p.Unit != nil
 }
 
 func (p *TimestampType) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetIsAdjustedToUTC bool = false;
-  var issetUnit bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.BOOL {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetIsAdjustedToUTC = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-        issetUnit = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetIsAdjustedToUTC{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field IsAdjustedToUTC is not set"));
-  }
-  if !issetUnit{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Unit is not set"));
-  }
-  return nil
-}
-
-func (p *TimestampType)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBool(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  p.IsAdjustedToUTC = v
-}
-  return nil
-}
-
-func (p *TimestampType)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  p.Unit = &TimeUnit{}
-  if err := p.Unit.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Unit), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetIsAdjustedToUTC bool = false
+	var issetUnit bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.BOOL {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetIsAdjustedToUTC = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+				issetUnit = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetIsAdjustedToUTC {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field IsAdjustedToUTC is not set"))
+	}
+	if !issetUnit {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Unit is not set"))
+	}
+	return nil
+}
+
+func (p *TimestampType) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBool(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		p.IsAdjustedToUTC = v
+	}
+	return nil
+}
+
+func (p *TimestampType) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	p.Unit = &TimeUnit{}
+	if err := p.Unit.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Unit), err)
+	}
+	return nil
 }
 
 func (p *TimestampType) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "TimestampType"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "TimestampType"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *TimestampType) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "isAdjustedToUTC", thrift.BOOL, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:isAdjustedToUTC: ", p), err) }
-  if err := oprot.WriteBool(ctx, bool(p.IsAdjustedToUTC)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.isAdjustedToUTC (1) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:isAdjustedToUTC: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "isAdjustedToUTC", thrift.BOOL, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:isAdjustedToUTC: ", p), err)
+	}
+	if err := oprot.WriteBool(ctx, bool(p.IsAdjustedToUTC)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.isAdjustedToUTC (1) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:isAdjustedToUTC: ", p), err)
+	}
+	return err
 }
 
 func (p *TimestampType) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "unit", thrift.STRUCT, 2); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:unit: ", p), err) }
-  if err := p.Unit.Write(ctx, oprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Unit), err)
-  }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:unit: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "unit", thrift.STRUCT, 2); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:unit: ", p), err)
+	}
+	if err := p.Unit.Write(ctx, oprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Unit), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:unit: ", p), err)
+	}
+	return err
 }
 
 func (p *TimestampType) Equals(other *TimestampType) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if p.IsAdjustedToUTC != other.IsAdjustedToUTC { return false }
-  if !p.Unit.Equals(other.Unit) { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if p.IsAdjustedToUTC != other.IsAdjustedToUTC {
+		return false
+	}
+	if !p.Unit.Equals(other.Unit) {
+		return false
+	}
+	return true
 }
 
 func (p *TimestampType) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("TimestampType(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("TimestampType(%+v)", *p)
 }
 
 func (p *TimestampType) Validate() error {
-  return nil
+	return nil
 }
+
 // Time logical type annotation
-// 
+//
 // Allowed for physical types: INT32 (millis), INT64 (micros, nanos)
-// 
+//
 // Attributes:
-//  - IsAdjustedToUTC
-//  - Unit
+//   - IsAdjustedToUTC
+//   - Unit
 type TimeType struct {
-  IsAdjustedToUTC bool `thrift:"isAdjustedToUTC,1,required" db:"isAdjustedToUTC" json:"isAdjustedToUTC"`
-  Unit *TimeUnit `thrift:"unit,2,required" db:"unit" json:"unit"`
+	IsAdjustedToUTC bool      `thrift:"isAdjustedToUTC,1,required" db:"isAdjustedToUTC" json:"isAdjustedToUTC"`
+	Unit            *TimeUnit `thrift:"unit,2,required" db:"unit" json:"unit"`
 }
 
 func NewTimeType() *TimeType {
-  return &TimeType{}
+	return &TimeType{}
 }
 
-
 func (p *TimeType) GetIsAdjustedToUTC() bool {
-  return p.IsAdjustedToUTC
+	return p.IsAdjustedToUTC
 }
+
 var TimeType_Unit_DEFAULT *TimeUnit
+
 func (p *TimeType) GetUnit() *TimeUnit {
-  if !p.IsSetUnit() {
-    return TimeType_Unit_DEFAULT
-  }
-return p.Unit
+	if !p.IsSetUnit() {
+		return TimeType_Unit_DEFAULT
+	}
+	return p.Unit
 }
 func (p *TimeType) IsSetUnit() bool {
-  return p.Unit != nil
+	return p.Unit != nil
 }
 
 func (p *TimeType) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetIsAdjustedToUTC bool = false;
-  var issetUnit bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.BOOL {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetIsAdjustedToUTC = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-        issetUnit = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetIsAdjustedToUTC{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field IsAdjustedToUTC is not set"));
-  }
-  if !issetUnit{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Unit is not set"));
-  }
-  return nil
-}
-
-func (p *TimeType)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBool(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  p.IsAdjustedToUTC = v
-}
-  return nil
-}
-
-func (p *TimeType)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  p.Unit = &TimeUnit{}
-  if err := p.Unit.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Unit), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetIsAdjustedToUTC bool = false
+	var issetUnit bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.BOOL {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetIsAdjustedToUTC = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+				issetUnit = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetIsAdjustedToUTC {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field IsAdjustedToUTC is not set"))
+	}
+	if !issetUnit {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Unit is not set"))
+	}
+	return nil
+}
+
+func (p *TimeType) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBool(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		p.IsAdjustedToUTC = v
+	}
+	return nil
+}
+
+func (p *TimeType) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	p.Unit = &TimeUnit{}
+	if err := p.Unit.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Unit), err)
+	}
+	return nil
 }
 
 func (p *TimeType) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "TimeType"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "TimeType"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *TimeType) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "isAdjustedToUTC", thrift.BOOL, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:isAdjustedToUTC: ", p), err) }
-  if err := oprot.WriteBool(ctx, bool(p.IsAdjustedToUTC)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.isAdjustedToUTC (1) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:isAdjustedToUTC: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "isAdjustedToUTC", thrift.BOOL, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:isAdjustedToUTC: ", p), err)
+	}
+	if err := oprot.WriteBool(ctx, bool(p.IsAdjustedToUTC)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.isAdjustedToUTC (1) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:isAdjustedToUTC: ", p), err)
+	}
+	return err
 }
 
 func (p *TimeType) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "unit", thrift.STRUCT, 2); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:unit: ", p), err) }
-  if err := p.Unit.Write(ctx, oprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Unit), err)
-  }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:unit: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "unit", thrift.STRUCT, 2); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:unit: ", p), err)
+	}
+	if err := p.Unit.Write(ctx, oprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Unit), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:unit: ", p), err)
+	}
+	return err
 }
 
 func (p *TimeType) Equals(other *TimeType) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if p.IsAdjustedToUTC != other.IsAdjustedToUTC { return false }
-  if !p.Unit.Equals(other.Unit) { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if p.IsAdjustedToUTC != other.IsAdjustedToUTC {
+		return false
+	}
+	if !p.Unit.Equals(other.Unit) {
+		return false
+	}
+	return true
 }
 
 func (p *TimeType) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("TimeType(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("TimeType(%+v)", *p)
 }
 
 func (p *TimeType) Validate() error {
-  return nil
+	return nil
 }
+
 // Integer logical type annotation
-// 
+//
 // bitWidth must be 8, 16, 32, or 64.
-// 
+//
 // Allowed for physical types: INT32, INT64
-// 
+//
 // Attributes:
-//  - BitWidth
-//  - IsSigned
+//   - BitWidth
+//   - IsSigned
 type IntType struct {
-  BitWidth int8 `thrift:"bitWidth,1,required" db:"bitWidth" json:"bitWidth"`
-  IsSigned bool `thrift:"isSigned,2,required" db:"isSigned" json:"isSigned"`
+	BitWidth int8 `thrift:"bitWidth,1,required" db:"bitWidth" json:"bitWidth"`
+	IsSigned bool `thrift:"isSigned,2,required" db:"isSigned" json:"isSigned"`
 }
 
 func NewIntType() *IntType {
-  return &IntType{}
+	return &IntType{}
 }
 
-
 func (p *IntType) GetBitWidth() int8 {
-  return p.BitWidth
+	return p.BitWidth
 }
 
 func (p *IntType) GetIsSigned() bool {
-  return p.IsSigned
+	return p.IsSigned
 }
 func (p *IntType) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetBitWidth bool = false;
-  var issetIsSigned bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.BYTE {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetBitWidth = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.BOOL {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-        issetIsSigned = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetBitWidth{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field BitWidth is not set"));
-  }
-  if !issetIsSigned{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field IsSigned is not set"));
-  }
-  return nil
-}
-
-func (p *IntType)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadByte(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  temp := int8(v)
-  p.BitWidth = temp
-}
-  return nil
-}
-
-func (p *IntType)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBool(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  p.IsSigned = v
-}
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetBitWidth bool = false
+	var issetIsSigned bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.BYTE {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetBitWidth = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.BOOL {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+				issetIsSigned = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetBitWidth {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field BitWidth is not set"))
+	}
+	if !issetIsSigned {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field IsSigned is not set"))
+	}
+	return nil
+}
+
+func (p *IntType) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadByte(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		temp := int8(v)
+		p.BitWidth = temp
+	}
+	return nil
+}
+
+func (p *IntType) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBool(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		p.IsSigned = v
+	}
+	return nil
 }
 
 func (p *IntType) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "IntType"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "IntType"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *IntType) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "bitWidth", thrift.BYTE, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:bitWidth: ", p), err) }
-  if err := oprot.WriteByte(ctx, int8(p.BitWidth)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.bitWidth (1) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:bitWidth: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "bitWidth", thrift.BYTE, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:bitWidth: ", p), err)
+	}
+	if err := oprot.WriteByte(ctx, int8(p.BitWidth)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.bitWidth (1) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:bitWidth: ", p), err)
+	}
+	return err
 }
 
 func (p *IntType) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "isSigned", thrift.BOOL, 2); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:isSigned: ", p), err) }
-  if err := oprot.WriteBool(ctx, bool(p.IsSigned)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.isSigned (2) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:isSigned: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "isSigned", thrift.BOOL, 2); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:isSigned: ", p), err)
+	}
+	if err := oprot.WriteBool(ctx, bool(p.IsSigned)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.isSigned (2) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:isSigned: ", p), err)
+	}
+	return err
 }
 
 func (p *IntType) Equals(other *IntType) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if p.BitWidth != other.BitWidth { return false }
-  if p.IsSigned != other.IsSigned { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if p.BitWidth != other.BitWidth {
+		return false
+	}
+	if p.IsSigned != other.IsSigned {
+		return false
+	}
+	return true
 }
 
 func (p *IntType) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("IntType(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("IntType(%+v)", *p)
 }
 
 func (p *IntType) Validate() error {
-  return nil
+	return nil
 }
+
 // Embedded JSON logical type annotation
-// 
+//
 // Allowed for physical types: BINARY
 type JsonType struct {
 }
 
 func NewJsonType() *JsonType {
-  return &JsonType{}
+	return &JsonType{}
 }
 
 func (p *JsonType) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *JsonType) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "JsonType"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "JsonType"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *JsonType) Equals(other *JsonType) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *JsonType) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("JsonType(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("JsonType(%+v)", *p)
 }
 
 func (p *JsonType) Validate() error {
-  return nil
+	return nil
 }
+
 // Embedded BSON logical type annotation
-// 
+//
 // Allowed for physical types: BINARY
 type BsonType struct {
 }
 
 func NewBsonType() *BsonType {
-  return &BsonType{}
+	return &BsonType{}
 }
 
 func (p *BsonType) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *BsonType) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "BsonType"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "BsonType"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *BsonType) Equals(other *BsonType) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *BsonType) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("BsonType(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("BsonType(%+v)", *p)
 }
 
 func (p *BsonType) Validate() error {
-  return nil
+	return nil
 }
+
 // LogicalType annotations to replace ConvertedType.
-// 
+//
 // To maintain compatibility, implementations using LogicalType for a
 // SchemaElement must also set the corresponding ConvertedType (if any)
 // from the following table.
-// 
+//
 // Attributes:
-//  - STRING
-//  - MAP
-//  - LIST
-//  - ENUM
-//  - DECIMAL
-//  - DATE
-//  - TIME
-//  - TIMESTAMP
-//  - INTEGER
-//  - UNKNOWN
-//  - JSON
-//  - BSON
-//  - UUID
-//  - FLOAT16
+//   - STRING
+//   - MAP
+//   - LIST
+//   - ENUM
+//   - DECIMAL
+//   - DATE
+//   - TIME
+//   - TIMESTAMP
+//   - INTEGER
+//   - UNKNOWN
+//   - JSON
+//   - BSON
+//   - UUID
+//   - FLOAT16
 type LogicalType struct {
-  STRING *StringType `thrift:"STRING,1" db:"STRING" json:"STRING,omitempty"`
-  MAP *MapType `thrift:"MAP,2" db:"MAP" json:"MAP,omitempty"`
-  LIST *ListType `thrift:"LIST,3" db:"LIST" json:"LIST,omitempty"`
-  ENUM *EnumType `thrift:"ENUM,4" db:"ENUM" json:"ENUM,omitempty"`
-  DECIMAL *DecimalType `thrift:"DECIMAL,5" db:"DECIMAL" json:"DECIMAL,omitempty"`
-  DATE *DateType `thrift:"DATE,6" db:"DATE" json:"DATE,omitempty"`
-  TIME *TimeType `thrift:"TIME,7" db:"TIME" json:"TIME,omitempty"`
-  TIMESTAMP *TimestampType `thrift:"TIMESTAMP,8" db:"TIMESTAMP" json:"TIMESTAMP,omitempty"`
-  // unused field # 9
-  INTEGER *IntType `thrift:"INTEGER,10" db:"INTEGER" json:"INTEGER,omitempty"`
-  UNKNOWN *NullType `thrift:"UNKNOWN,11" db:"UNKNOWN" json:"UNKNOWN,omitempty"`
-  JSON *JsonType `thrift:"JSON,12" db:"JSON" json:"JSON,omitempty"`
-  BSON *BsonType `thrift:"BSON,13" db:"BSON" json:"BSON,omitempty"`
-  UUID *UUIDType `thrift:"UUID,14" db:"UUID" json:"UUID,omitempty"`
-  FLOAT16 *Float16Type `thrift:"FLOAT16,15" db:"FLOAT16" json:"FLOAT16,omitempty"`
+	STRING    *StringType    `thrift:"STRING,1" db:"STRING" json:"STRING,omitempty"`
+	MAP       *MapType       `thrift:"MAP,2" db:"MAP" json:"MAP,omitempty"`
+	LIST      *ListType      `thrift:"LIST,3" db:"LIST" json:"LIST,omitempty"`
+	ENUM      *EnumType      `thrift:"ENUM,4" db:"ENUM" json:"ENUM,omitempty"`
+	DECIMAL   *DecimalType   `thrift:"DECIMAL,5" db:"DECIMAL" json:"DECIMAL,omitempty"`
+	DATE      *DateType      `thrift:"DATE,6" db:"DATE" json:"DATE,omitempty"`
+	TIME      *TimeType      `thrift:"TIME,7" db:"TIME" json:"TIME,omitempty"`
+	TIMESTAMP *TimestampType `thrift:"TIMESTAMP,8" db:"TIMESTAMP" json:"TIMESTAMP,omitempty"`
+	// unused field # 9
+	INTEGER *IntType     `thrift:"INTEGER,10" db:"INTEGER" json:"INTEGER,omitempty"`
+	UNKNOWN *NullType    `thrift:"UNKNOWN,11" db:"UNKNOWN" json:"UNKNOWN,omitempty"`
+	JSON    *JsonType    `thrift:"JSON,12" db:"JSON" json:"JSON,omitempty"`
+	BSON    *BsonType    `thrift:"BSON,13" db:"BSON" json:"BSON,omitempty"`
+	UUID    *UUIDType    `thrift:"UUID,14" db:"UUID" json:"UUID,omitempty"`
+	FLOAT16 *Float16Type `thrift:"FLOAT16,15" db:"FLOAT16" json:"FLOAT16,omitempty"`
 }
 
 func NewLogicalType() *LogicalType {
-  return &LogicalType{}
+	return &LogicalType{}
 }
 
 var LogicalType_STRING_DEFAULT *StringType
+
 func (p *LogicalType) GetSTRING() *StringType {
-  if !p.IsSetSTRING() {
-    return LogicalType_STRING_DEFAULT
-  }
-return p.STRING
+	if !p.IsSetSTRING() {
+		return LogicalType_STRING_DEFAULT
+	}
+	return p.STRING
 }
+
 var LogicalType_MAP_DEFAULT *MapType
+
 func (p *LogicalType) GetMAP() *MapType {
-  if !p.IsSetMAP() {
-    return LogicalType_MAP_DEFAULT
-  }
-return p.MAP
+	if !p.IsSetMAP() {
+		return LogicalType_MAP_DEFAULT
+	}
+	return p.MAP
 }
+
 var LogicalType_LIST_DEFAULT *ListType
+
 func (p *LogicalType) GetLIST() *ListType {
-  if !p.IsSetLIST() {
-    return LogicalType_LIST_DEFAULT
-  }
-return p.LIST
+	if !p.IsSetLIST() {
+		return LogicalType_LIST_DEFAULT
+	}
+	return p.LIST
 }
+
 var LogicalType_ENUM_DEFAULT *EnumType
+
 func (p *LogicalType) GetENUM() *EnumType {
-  if !p.IsSetENUM() {
-    return LogicalType_ENUM_DEFAULT
-  }
-return p.ENUM
+	if !p.IsSetENUM() {
+		return LogicalType_ENUM_DEFAULT
+	}
+	return p.ENUM
 }
+
 var LogicalType_DECIMAL_DEFAULT *DecimalType
+
 func (p *LogicalType) GetDECIMAL() *DecimalType {
-  if !p.IsSetDECIMAL() {
-    return LogicalType_DECIMAL_DEFAULT
-  }
-return p.DECIMAL
+	if !p.IsSetDECIMAL() {
+		return LogicalType_DECIMAL_DEFAULT
+	}
+	return p.DECIMAL
 }
+
 var LogicalType_DATE_DEFAULT *DateType
+
 func (p *LogicalType) GetDATE() *DateType {
-  if !p.IsSetDATE() {
-    return LogicalType_DATE_DEFAULT
-  }
-return p.DATE
+	if !p.IsSetDATE() {
+		return LogicalType_DATE_DEFAULT
+	}
+	return p.DATE
 }
+
 var LogicalType_TIME_DEFAULT *TimeType
+
 func (p *LogicalType) GetTIME() *TimeType {
-  if !p.IsSetTIME() {
-    return LogicalType_TIME_DEFAULT
-  }
-return p.TIME
+	if !p.IsSetTIME() {
+		return LogicalType_TIME_DEFAULT
+	}
+	return p.TIME
 }
+
 var LogicalType_TIMESTAMP_DEFAULT *TimestampType
+
 func (p *LogicalType) GetTIMESTAMP() *TimestampType {
-  if !p.IsSetTIMESTAMP() {
-    return LogicalType_TIMESTAMP_DEFAULT
-  }
-return p.TIMESTAMP
+	if !p.IsSetTIMESTAMP() {
+		return LogicalType_TIMESTAMP_DEFAULT
+	}
+	return p.TIMESTAMP
 }
+
 var LogicalType_INTEGER_DEFAULT *IntType
+
 func (p *LogicalType) GetINTEGER() *IntType {
-  if !p.IsSetINTEGER() {
-    return LogicalType_INTEGER_DEFAULT
-  }
-return p.INTEGER
+	if !p.IsSetINTEGER() {
+		return LogicalType_INTEGER_DEFAULT
+	}
+	return p.INTEGER
 }
+
 var LogicalType_UNKNOWN_DEFAULT *NullType
+
 func (p *LogicalType) GetUNKNOWN() *NullType {
-  if !p.IsSetUNKNOWN() {
-    return LogicalType_UNKNOWN_DEFAULT
-  }
-return p.UNKNOWN
+	if !p.IsSetUNKNOWN() {
+		return LogicalType_UNKNOWN_DEFAULT
+	}
+	return p.UNKNOWN
 }
+
 var LogicalType_JSON_DEFAULT *JsonType
+
 func (p *LogicalType) GetJSON() *JsonType {
-  if !p.IsSetJSON() {
-    return LogicalType_JSON_DEFAULT
-  }
-return p.JSON
+	if !p.IsSetJSON() {
+		return LogicalType_JSON_DEFAULT
+	}
+	return p.JSON
 }
+
 var LogicalType_BSON_DEFAULT *BsonType
+
 func (p *LogicalType) GetBSON() *BsonType {
-  if !p.IsSetBSON() {
-    return LogicalType_BSON_DEFAULT
-  }
-return p.BSON
+	if !p.IsSetBSON() {
+		return LogicalType_BSON_DEFAULT
+	}
+	return p.BSON
 }
+
 var LogicalType_UUID_DEFAULT *UUIDType
+
 func (p *LogicalType) GetUUID() *UUIDType {
-  if !p.IsSetUUID() {
-    return LogicalType_UUID_DEFAULT
-  }
-return p.UUID
+	if !p.IsSetUUID() {
+		return LogicalType_UUID_DEFAULT
+	}
+	return p.UUID
 }
+
 var LogicalType_FLOAT16_DEFAULT *Float16Type
+
 func (p *LogicalType) GetFLOAT16() *Float16Type {
-  if !p.IsSetFLOAT16() {
-    return LogicalType_FLOAT16_DEFAULT
-  }
-return p.FLOAT16
+	if !p.IsSetFLOAT16() {
+		return LogicalType_FLOAT16_DEFAULT
+	}
+	return p.FLOAT16
 }
 func (p *LogicalType) CountSetFieldsLogicalType() int {
-  count := 0
-  if (p.IsSetSTRING()) {
-    count++
-  }
-  if (p.IsSetMAP()) {
-    count++
-  }
-  if (p.IsSetLIST()) {
-    count++
-  }
-  if (p.IsSetENUM()) {
-    count++
-  }
-  if (p.IsSetDECIMAL()) {
-    count++
-  }
-  if (p.IsSetDATE()) {
-    count++
-  }
-  if (p.IsSetTIME()) {
-    count++
-  }
-  if (p.IsSetTIMESTAMP()) {
-    count++
-  }
-  if (p.IsSetINTEGER()) {
-    count++
-  }
-  if (p.IsSetUNKNOWN()) {
-    count++
-  }
-  if (p.IsSetJSON()) {
-    count++
-  }
-  if (p.IsSetBSON()) {
-    count++
-  }
-  if (p.IsSetUUID()) {
-    count++
-  }
-  if (p.IsSetFLOAT16()) {
-    count++
-  }
-  return count
+	count := 0
+	if p.IsSetSTRING() {
+		count++
+	}
+	if p.IsSetMAP() {
+		count++
+	}
+	if p.IsSetLIST() {
+		count++
+	}
+	if p.IsSetENUM() {
+		count++
+	}
+	if p.IsSetDECIMAL() {
+		count++
+	}
+	if p.IsSetDATE() {
+		count++
+	}
+	if p.IsSetTIME() {
+		count++
+	}
+	if p.IsSetTIMESTAMP() {
+		count++
+	}
+	if p.IsSetINTEGER() {
+		count++
+	}
+	if p.IsSetUNKNOWN() {
+		count++
+	}
+	if p.IsSetJSON() {
+		count++
+	}
+	if p.IsSetBSON() {
+		count++
+	}
+	if p.IsSetUUID() {
+		count++
+	}
+	if p.IsSetFLOAT16() {
+		count++
+	}
+	return count
 
 }
 
 func (p *LogicalType) IsSetSTRING() bool {
-  return p.STRING != nil
+	return p.STRING != nil
 }
 
 func (p *LogicalType) IsSetMAP() bool {
-  return p.MAP != nil
+	return p.MAP != nil
 }
 
 func (p *LogicalType) IsSetLIST() bool {
-  return p.LIST != nil
+	return p.LIST != nil
 }
 
 func (p *LogicalType) IsSetENUM() bool {
-  return p.ENUM != nil
+	return p.ENUM != nil
 }
 
 func (p *LogicalType) IsSetDECIMAL() bool {
-  return p.DECIMAL != nil
+	return p.DECIMAL != nil
 }
 
 func (p *LogicalType) IsSetDATE() bool {
-  return p.DATE != nil
+	return p.DATE != nil
 }
 
 func (p *LogicalType) IsSetTIME() bool {
-  return p.TIME != nil
+	return p.TIME != nil
 }
 
 func (p *LogicalType) IsSetTIMESTAMP() bool {
-  return p.TIMESTAMP != nil
+	return p.TIMESTAMP != nil
 }
 
 func (p *LogicalType) IsSetINTEGER() bool {
-  return p.INTEGER != nil
+	return p.INTEGER != nil
 }
 
 func (p *LogicalType) IsSetUNKNOWN() bool {
-  return p.UNKNOWN != nil
+	return p.UNKNOWN != nil
 }
 
 func (p *LogicalType) IsSetJSON() bool {
-  return p.JSON != nil
+	return p.JSON != nil
 }
 
 func (p *LogicalType) IsSetBSON() bool {
-  return p.BSON != nil
+	return p.BSON != nil
 }
 
 func (p *LogicalType) IsSetUUID() bool {
-  return p.UUID != nil
+	return p.UUID != nil
 }
 
 func (p *LogicalType) IsSetFLOAT16() bool {
-  return p.FLOAT16 != nil
+	return p.FLOAT16 != nil
 }
 
 func (p *LogicalType) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 4:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField4(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 5:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField5(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 6:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField6(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 7:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField7(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 8:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField8(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 10:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField10(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 11:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField11(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 12:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField12(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 13:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField13(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 14:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField14(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 15:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField15(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
-}
-
-func (p *LogicalType)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  p.STRING = &StringType{}
-  if err := p.STRING.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.STRING), err)
-  }
-  return nil
-}
-
-func (p *LogicalType)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  p.MAP = &MapType{}
-  if err := p.MAP.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.MAP), err)
-  }
-  return nil
-}
-
-func (p *LogicalType)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  p.LIST = &ListType{}
-  if err := p.LIST.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.LIST), err)
-  }
-  return nil
-}
-
-func (p *LogicalType)  ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
-  p.ENUM = &EnumType{}
-  if err := p.ENUM.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ENUM), err)
-  }
-  return nil
-}
-
-func (p *LogicalType)  ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
-  p.DECIMAL = &DecimalType{}
-  if err := p.DECIMAL.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DECIMAL), err)
-  }
-  return nil
-}
-
-func (p *LogicalType)  ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
-  p.DATE = &DateType{}
-  if err := p.DATE.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DATE), err)
-  }
-  return nil
-}
-
-func (p *LogicalType)  ReadField7(ctx context.Context, iprot thrift.TProtocol) error {
-  p.TIME = &TimeType{}
-  if err := p.TIME.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.TIME), err)
-  }
-  return nil
-}
-
-func (p *LogicalType)  ReadField8(ctx context.Context, iprot thrift.TProtocol) error {
-  p.TIMESTAMP = &TimestampType{}
-  if err := p.TIMESTAMP.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.TIMESTAMP), err)
-  }
-  return nil
-}
-
-func (p *LogicalType)  ReadField10(ctx context.Context, iprot thrift.TProtocol) error {
-  p.INTEGER = &IntType{}
-  if err := p.INTEGER.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.INTEGER), err)
-  }
-  return nil
-}
-
-func (p *LogicalType)  ReadField11(ctx context.Context, iprot thrift.TProtocol) error {
-  p.UNKNOWN = &NullType{}
-  if err := p.UNKNOWN.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.UNKNOWN), err)
-  }
-  return nil
-}
-
-func (p *LogicalType)  ReadField12(ctx context.Context, iprot thrift.TProtocol) error {
-  p.JSON = &JsonType{}
-  if err := p.JSON.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.JSON), err)
-  }
-  return nil
-}
-
-func (p *LogicalType)  ReadField13(ctx context.Context, iprot thrift.TProtocol) error {
-  p.BSON = &BsonType{}
-  if err := p.BSON.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.BSON), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 4:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField4(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 5:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField5(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 6:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField6(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 7:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField7(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 8:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField8(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 10:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField10(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 11:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField11(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 12:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField12(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 13:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField13(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 14:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField14(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 15:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField15(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
+}
+
+func (p *LogicalType) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	p.STRING = &StringType{}
+	if err := p.STRING.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.STRING), err)
+	}
+	return nil
+}
+
+func (p *LogicalType) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	p.MAP = &MapType{}
+	if err := p.MAP.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.MAP), err)
+	}
+	return nil
+}
+
+func (p *LogicalType) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	p.LIST = &ListType{}
+	if err := p.LIST.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.LIST), err)
+	}
+	return nil
+}
+
+func (p *LogicalType) ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
+	p.ENUM = &EnumType{}
+	if err := p.ENUM.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ENUM), err)
+	}
+	return nil
+}
+
+func (p *LogicalType) ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
+	p.DECIMAL = &DecimalType{}
+	if err := p.DECIMAL.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DECIMAL), err)
+	}
+	return nil
+}
+
+func (p *LogicalType) ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
+	p.DATE = &DateType{}
+	if err := p.DATE.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DATE), err)
+	}
+	return nil
+}
+
+func (p *LogicalType) ReadField7(ctx context.Context, iprot thrift.TProtocol) error {
+	p.TIME = &TimeType{}
+	if err := p.TIME.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.TIME), err)
+	}
+	return nil
+}
+
+func (p *LogicalType) ReadField8(ctx context.Context, iprot thrift.TProtocol) error {
+	p.TIMESTAMP = &TimestampType{}
+	if err := p.TIMESTAMP.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.TIMESTAMP), err)
+	}
+	return nil
+}
+
+func (p *LogicalType) ReadField10(ctx context.Context, iprot thrift.TProtocol) error {
+	p.INTEGER = &IntType{}
+	if err := p.INTEGER.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.INTEGER), err)
+	}
+	return nil
+}
+
+func (p *LogicalType) ReadField11(ctx context.Context, iprot thrift.TProtocol) error {
+	p.UNKNOWN = &NullType{}
+	if err := p.UNKNOWN.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.UNKNOWN), err)
+	}
+	return nil
+}
+
+func (p *LogicalType) ReadField12(ctx context.Context, iprot thrift.TProtocol) error {
+	p.JSON = &JsonType{}
+	if err := p.JSON.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.JSON), err)
+	}
+	return nil
+}
+
+func (p *LogicalType) ReadField13(ctx context.Context, iprot thrift.TProtocol) error {
+	p.BSON = &BsonType{}
+	if err := p.BSON.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.BSON), err)
+	}
+	return nil
 }
 
-func (p *LogicalType)  ReadField14(ctx context.Context, iprot thrift.TProtocol) error {
-  p.UUID = &UUIDType{}
-  if err := p.UUID.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.UUID), err)
-  }
-  return nil
+func (p *LogicalType) ReadField14(ctx context.Context, iprot thrift.TProtocol) error {
+	p.UUID = &UUIDType{}
+	if err := p.UUID.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.UUID), err)
+	}
+	return nil
 }
 
-func (p *LogicalType)  ReadField15(ctx context.Context, iprot thrift.TProtocol) error {
-  p.FLOAT16 = &Float16Type{}
-  if err := p.FLOAT16.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.FLOAT16), err)
-  }
-  return nil
+func (p *LogicalType) ReadField15(ctx context.Context, iprot thrift.TProtocol) error {
+	p.FLOAT16 = &Float16Type{}
+	if err := p.FLOAT16.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.FLOAT16), err)
+	}
+	return nil
 }
 
 func (p *LogicalType) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if c := p.CountSetFieldsLogicalType(); c != 1 {
-    return fmt.Errorf("%T write union: exactly one field must be set (%d set)", p, c)
-  }
-  if err := oprot.WriteStructBegin(ctx, "LogicalType"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-    if err := p.writeField4(ctx, oprot); err != nil { return err }
-    if err := p.writeField5(ctx, oprot); err != nil { return err }
-    if err := p.writeField6(ctx, oprot); err != nil { return err }
-    if err := p.writeField7(ctx, oprot); err != nil { return err }
-    if err := p.writeField8(ctx, oprot); err != nil { return err }
-    if err := p.writeField10(ctx, oprot); err != nil { return err }
-    if err := p.writeField11(ctx, oprot); err != nil { return err }
-    if err := p.writeField12(ctx, oprot); err != nil { return err }
-    if err := p.writeField13(ctx, oprot); err != nil { return err }
-    if err := p.writeField14(ctx, oprot); err != nil { return err }
-    if err := p.writeField15(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if c := p.CountSetFieldsLogicalType(); c != 1 {
+		return fmt.Errorf("%T write union: exactly one field must be set (%d set)", p, c)
+	}
+	if err := oprot.WriteStructBegin(ctx, "LogicalType"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField4(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField5(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField6(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField7(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField8(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField10(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField11(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField12(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField13(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField14(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField15(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *LogicalType) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetSTRING() {
-    if err := oprot.WriteFieldBegin(ctx, "STRING", thrift.STRUCT, 1); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:STRING: ", p), err) }
-    if err := p.STRING.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.STRING), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:STRING: ", p), err) }
-  }
-  return err
+	if p.IsSetSTRING() {
+		if err := oprot.WriteFieldBegin(ctx, "STRING", thrift.STRUCT, 1); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:STRING: ", p), err)
+		}
+		if err := p.STRING.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.STRING), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:STRING: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *LogicalType) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetMAP() {
-    if err := oprot.WriteFieldBegin(ctx, "MAP", thrift.STRUCT, 2); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:MAP: ", p), err) }
-    if err := p.MAP.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.MAP), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:MAP: ", p), err) }
-  }
-  return err
+	if p.IsSetMAP() {
+		if err := oprot.WriteFieldBegin(ctx, "MAP", thrift.STRUCT, 2); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:MAP: ", p), err)
+		}
+		if err := p.MAP.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.MAP), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:MAP: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *LogicalType) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetLIST() {
-    if err := oprot.WriteFieldBegin(ctx, "LIST", thrift.STRUCT, 3); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:LIST: ", p), err) }
-    if err := p.LIST.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.LIST), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:LIST: ", p), err) }
-  }
-  return err
+	if p.IsSetLIST() {
+		if err := oprot.WriteFieldBegin(ctx, "LIST", thrift.STRUCT, 3); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:LIST: ", p), err)
+		}
+		if err := p.LIST.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.LIST), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:LIST: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *LogicalType) writeField4(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetENUM() {
-    if err := oprot.WriteFieldBegin(ctx, "ENUM", thrift.STRUCT, 4); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:ENUM: ", p), err) }
-    if err := p.ENUM.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ENUM), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 4:ENUM: ", p), err) }
-  }
-  return err
+	if p.IsSetENUM() {
+		if err := oprot.WriteFieldBegin(ctx, "ENUM", thrift.STRUCT, 4); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:ENUM: ", p), err)
+		}
+		if err := p.ENUM.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ENUM), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 4:ENUM: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *LogicalType) writeField5(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetDECIMAL() {
-    if err := oprot.WriteFieldBegin(ctx, "DECIMAL", thrift.STRUCT, 5); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:DECIMAL: ", p), err) }
-    if err := p.DECIMAL.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DECIMAL), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 5:DECIMAL: ", p), err) }
-  }
-  return err
+	if p.IsSetDECIMAL() {
+		if err := oprot.WriteFieldBegin(ctx, "DECIMAL", thrift.STRUCT, 5); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:DECIMAL: ", p), err)
+		}
+		if err := p.DECIMAL.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DECIMAL), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 5:DECIMAL: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *LogicalType) writeField6(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetDATE() {
-    if err := oprot.WriteFieldBegin(ctx, "DATE", thrift.STRUCT, 6); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:DATE: ", p), err) }
-    if err := p.DATE.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DATE), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 6:DATE: ", p), err) }
-  }
-  return err
+	if p.IsSetDATE() {
+		if err := oprot.WriteFieldBegin(ctx, "DATE", thrift.STRUCT, 6); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:DATE: ", p), err)
+		}
+		if err := p.DATE.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DATE), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 6:DATE: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *LogicalType) writeField7(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetTIME() {
-    if err := oprot.WriteFieldBegin(ctx, "TIME", thrift.STRUCT, 7); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:TIME: ", p), err) }
-    if err := p.TIME.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.TIME), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 7:TIME: ", p), err) }
-  }
-  return err
+	if p.IsSetTIME() {
+		if err := oprot.WriteFieldBegin(ctx, "TIME", thrift.STRUCT, 7); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:TIME: ", p), err)
+		}
+		if err := p.TIME.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.TIME), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 7:TIME: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *LogicalType) writeField8(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetTIMESTAMP() {
-    if err := oprot.WriteFieldBegin(ctx, "TIMESTAMP", thrift.STRUCT, 8); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:TIMESTAMP: ", p), err) }
-    if err := p.TIMESTAMP.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.TIMESTAMP), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 8:TIMESTAMP: ", p), err) }
-  }
-  return err
+	if p.IsSetTIMESTAMP() {
+		if err := oprot.WriteFieldBegin(ctx, "TIMESTAMP", thrift.STRUCT, 8); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:TIMESTAMP: ", p), err)
+		}
+		if err := p.TIMESTAMP.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.TIMESTAMP), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 8:TIMESTAMP: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *LogicalType) writeField10(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetINTEGER() {
-    if err := oprot.WriteFieldBegin(ctx, "INTEGER", thrift.STRUCT, 10); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 10:INTEGER: ", p), err) }
-    if err := p.INTEGER.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.INTEGER), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 10:INTEGER: ", p), err) }
-  }
-  return err
+	if p.IsSetINTEGER() {
+		if err := oprot.WriteFieldBegin(ctx, "INTEGER", thrift.STRUCT, 10); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 10:INTEGER: ", p), err)
+		}
+		if err := p.INTEGER.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.INTEGER), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 10:INTEGER: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *LogicalType) writeField11(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetUNKNOWN() {
-    if err := oprot.WriteFieldBegin(ctx, "UNKNOWN", thrift.STRUCT, 11); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 11:UNKNOWN: ", p), err) }
-    if err := p.UNKNOWN.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.UNKNOWN), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 11:UNKNOWN: ", p), err) }
-  }
-  return err
+	if p.IsSetUNKNOWN() {
+		if err := oprot.WriteFieldBegin(ctx, "UNKNOWN", thrift.STRUCT, 11); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 11:UNKNOWN: ", p), err)
+		}
+		if err := p.UNKNOWN.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.UNKNOWN), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 11:UNKNOWN: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *LogicalType) writeField12(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetJSON() {
-    if err := oprot.WriteFieldBegin(ctx, "JSON", thrift.STRUCT, 12); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 12:JSON: ", p), err) }
-    if err := p.JSON.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.JSON), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 12:JSON: ", p), err) }
-  }
-  return err
+	if p.IsSetJSON() {
+		if err := oprot.WriteFieldBegin(ctx, "JSON", thrift.STRUCT, 12); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 12:JSON: ", p), err)
+		}
+		if err := p.JSON.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.JSON), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 12:JSON: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *LogicalType) writeField13(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetBSON() {
-    if err := oprot.WriteFieldBegin(ctx, "BSON", thrift.STRUCT, 13); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 13:BSON: ", p), err) }
-    if err := p.BSON.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.BSON), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 13:BSON: ", p), err) }
-  }
-  return err
+	if p.IsSetBSON() {
+		if err := oprot.WriteFieldBegin(ctx, "BSON", thrift.STRUCT, 13); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 13:BSON: ", p), err)
+		}
+		if err := p.BSON.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.BSON), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 13:BSON: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *LogicalType) writeField14(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetUUID() {
-    if err := oprot.WriteFieldBegin(ctx, "UUID", thrift.STRUCT, 14); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 14:UUID: ", p), err) }
-    if err := p.UUID.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.UUID), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 14:UUID: ", p), err) }
-  }
-  return err
+	if p.IsSetUUID() {
+		if err := oprot.WriteFieldBegin(ctx, "UUID", thrift.STRUCT, 14); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 14:UUID: ", p), err)
+		}
+		if err := p.UUID.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.UUID), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 14:UUID: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *LogicalType) writeField15(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetFLOAT16() {
-    if err := oprot.WriteFieldBegin(ctx, "FLOAT16", thrift.STRUCT, 15); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 15:FLOAT16: ", p), err) }
-    if err := p.FLOAT16.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.FLOAT16), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 15:FLOAT16: ", p), err) }
-  }
-  return err
+	if p.IsSetFLOAT16() {
+		if err := oprot.WriteFieldBegin(ctx, "FLOAT16", thrift.STRUCT, 15); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 15:FLOAT16: ", p), err)
+		}
+		if err := p.FLOAT16.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.FLOAT16), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 15:FLOAT16: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *LogicalType) Equals(other *LogicalType) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if !p.STRING.Equals(other.STRING) { return false }
-  if !p.MAP.Equals(other.MAP) { return false }
-  if !p.LIST.Equals(other.LIST) { return false }
-  if !p.ENUM.Equals(other.ENUM) { return false }
-  if !p.DECIMAL.Equals(other.DECIMAL) { return false }
-  if !p.DATE.Equals(other.DATE) { return false }
-  if !p.TIME.Equals(other.TIME) { return false }
-  if !p.TIMESTAMP.Equals(other.TIMESTAMP) { return false }
-  if !p.INTEGER.Equals(other.INTEGER) { return false }
-  if !p.UNKNOWN.Equals(other.UNKNOWN) { return false }
-  if !p.JSON.Equals(other.JSON) { return false }
-  if !p.BSON.Equals(other.BSON) { return false }
-  if !p.UUID.Equals(other.UUID) { return false }
-  if !p.FLOAT16.Equals(other.FLOAT16) { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if !p.STRING.Equals(other.STRING) {
+		return false
+	}
+	if !p.MAP.Equals(other.MAP) {
+		return false
+	}
+	if !p.LIST.Equals(other.LIST) {
+		return false
+	}
+	if !p.ENUM.Equals(other.ENUM) {
+		return false
+	}
+	if !p.DECIMAL.Equals(other.DECIMAL) {
+		return false
+	}
+	if !p.DATE.Equals(other.DATE) {
+		return false
+	}
+	if !p.TIME.Equals(other.TIME) {
+		return false
+	}
+	if !p.TIMESTAMP.Equals(other.TIMESTAMP) {
+		return false
+	}
+	if !p.INTEGER.Equals(other.INTEGER) {
+		return false
+	}
+	if !p.UNKNOWN.Equals(other.UNKNOWN) {
+		return false
+	}
+	if !p.JSON.Equals(other.JSON) {
+		return false
+	}
+	if !p.BSON.Equals(other.BSON) {
+		return false
+	}
+	if !p.UUID.Equals(other.UUID) {
+		return false
+	}
+	if !p.FLOAT16.Equals(other.FLOAT16) {
+		return false
+	}
+	return true
 }
 
 func (p *LogicalType) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("LogicalType(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("LogicalType(%+v)", *p)
 }
 
 func (p *LogicalType) Validate() error {
-  return nil
+	return nil
 }
+
 // Represents a element inside a schema definition.
-//  - if it is a group (inner node) then type is undefined and num_children is defined
-//  - if it is a primitive type (leaf) then type is defined and num_children is undefined
+//   - if it is a group (inner node) then type is undefined and num_children is defined
+//   - if it is a primitive type (leaf) then type is defined and num_children is undefined
+//
 // the nodes are listed in depth first traversal order.
-// 
+//
 // Attributes:
-//  - Type: Data type for this field. Not set if the current element is a non-leaf node
-//  - TypeLength: If type is FIXED_LEN_BYTE_ARRAY, this is the byte length of the values.
+//   - Type: Data type for this field. Not set if the current element is a non-leaf node
+//   - TypeLength: If type is FIXED_LEN_BYTE_ARRAY, this is the byte length of the values.
+//
 // Otherwise, if specified, this is the maximum bit length to store any of the values.
 // (e.g. a low cardinality INT col could have this set to 3).  Note that this is
 // in the schema, and therefore fixed for the entire file.
-//  - RepetitionType: repetition of the field. The root of the schema does not have a repetition_type.
+//   - RepetitionType: repetition of the field. The root of the schema does not have a repetition_type.
+//
 // All other nodes must have one
-//  - Name: Name of the field in the schema
-//  - NumChildren: Nested fields.  Since thrift does not support nested fields,
+//   - Name: Name of the field in the schema
+//   - NumChildren: Nested fields.  Since thrift does not support nested fields,
+//
 // the nesting is flattened to a single list by a depth-first traversal.
 // The children count is used to construct the nested relationship.
 // This field is not set when the element is a primitive type
-//  - ConvertedType: DEPRECATED: When the schema is the result of a conversion from another model.
+//   - ConvertedType: DEPRECATED: When the schema is the result of a conversion from another model.
+//
 // Used to record the original type to help with cross conversion.
-// 
+//
 // This is superseded by logicalType.
-//  - Scale: DEPRECATED: Used when this column contains decimal data.
+//   - Scale: DEPRECATED: Used when this column contains decimal data.
+//
 // See the DECIMAL converted type for more details.
-// 
+//
 // This is superseded by using the DecimalType annotation in logicalType.
-//  - Precision
-//  - FieldID: When the original schema supports field ids, this will save the
+//   - Precision
+//   - FieldID: When the original schema supports field ids, this will save the
+//
 // original field id in the parquet schema
-//  - LogicalType: The logical type of this SchemaElement
-// 
+//   - LogicalType: The logical type of this SchemaElement
+//
 // LogicalType replaces ConvertedType, but ConvertedType is still required
 // for some logical types to ensure forward-compatibility in format v1.
 type SchemaElement struct {
-  Type *Type `thrift:"type,1" db:"type" json:"type,omitempty"`
-  TypeLength *int32 `thrift:"type_length,2" db:"type_length" json:"type_length,omitempty"`
-  RepetitionType *FieldRepetitionType `thrift:"repetition_type,3" db:"repetition_type" json:"repetition_type,omitempty"`
-  Name string `thrift:"name,4,required" db:"name" json:"name"`
-  NumChildren *int32 `thrift:"num_children,5" db:"num_children" json:"num_children,omitempty"`
-  ConvertedType *ConvertedType `thrift:"converted_type,6" db:"converted_type" json:"converted_type,omitempty"`
-  Scale *int32 `thrift:"scale,7" db:"scale" json:"scale,omitempty"`
-  Precision *int32 `thrift:"precision,8" db:"precision" json:"precision,omitempty"`
-  FieldID *int32 `thrift:"field_id,9" db:"field_id" json:"field_id,omitempty"`
-  LogicalType *LogicalType `thrift:"logicalType,10" db:"logicalType" json:"logicalType,omitempty"`
+	Type           *Type                `thrift:"type,1" db:"type" json:"type,omitempty"`
+	TypeLength     *int32               `thrift:"type_length,2" db:"type_length" json:"type_length,omitempty"`
+	RepetitionType *FieldRepetitionType `thrift:"repetition_type,3" db:"repetition_type" json:"repetition_type,omitempty"`
+	Name           string               `thrift:"name,4,required" db:"name" json:"name"`
+	NumChildren    *int32               `thrift:"num_children,5" db:"num_children" json:"num_children,omitempty"`
+	ConvertedType  *ConvertedType       `thrift:"converted_type,6" db:"converted_type" json:"converted_type,omitempty"`
+	Scale          *int32               `thrift:"scale,7" db:"scale" json:"scale,omitempty"`
+	Precision      *int32               `thrift:"precision,8" db:"precision" json:"precision,omitempty"`
+	FieldID        *int32               `thrift:"field_id,9" db:"field_id" json:"field_id,omitempty"`
+	LogicalType    *LogicalType         `thrift:"logicalType,10" db:"logicalType" json:"logicalType,omitempty"`
 }
 
 func NewSchemaElement() *SchemaElement {
-  return &SchemaElement{}
+	return &SchemaElement{}
 }
 
 var SchemaElement_Type_DEFAULT Type
+
 func (p *SchemaElement) GetType() Type {
-  if !p.IsSetType() {
-    return SchemaElement_Type_DEFAULT
-  }
-return *p.Type
+	if !p.IsSetType() {
+		return SchemaElement_Type_DEFAULT
+	}
+	return *p.Type
 }
+
 var SchemaElement_TypeLength_DEFAULT int32
+
 func (p *SchemaElement) GetTypeLength() int32 {
-  if !p.IsSetTypeLength() {
-    return SchemaElement_TypeLength_DEFAULT
-  }
-return *p.TypeLength
+	if !p.IsSetTypeLength() {
+		return SchemaElement_TypeLength_DEFAULT
+	}
+	return *p.TypeLength
 }
+
 var SchemaElement_RepetitionType_DEFAULT FieldRepetitionType
+
 func (p *SchemaElement) GetRepetitionType() FieldRepetitionType {
-  if !p.IsSetRepetitionType() {
-    return SchemaElement_RepetitionType_DEFAULT
-  }
-return *p.RepetitionType
+	if !p.IsSetRepetitionType() {
+		return SchemaElement_RepetitionType_DEFAULT
+	}
+	return *p.RepetitionType
 }
 
 func (p *SchemaElement) GetName() string {
-  return p.Name
+	return p.Name
 }
+
 var SchemaElement_NumChildren_DEFAULT int32
+
 func (p *SchemaElement) GetNumChildren() int32 {
-  if !p.IsSetNumChildren() {
-    return SchemaElement_NumChildren_DEFAULT
-  }
-return *p.NumChildren
+	if !p.IsSetNumChildren() {
+		return SchemaElement_NumChildren_DEFAULT
+	}
+	return *p.NumChildren
 }
+
 var SchemaElement_ConvertedType_DEFAULT ConvertedType
+
 func (p *SchemaElement) GetConvertedType() ConvertedType {
-  if !p.IsSetConvertedType() {
-    return SchemaElement_ConvertedType_DEFAULT
-  }
-return *p.ConvertedType
+	if !p.IsSetConvertedType() {
+		return SchemaElement_ConvertedType_DEFAULT
+	}
+	return *p.ConvertedType
 }
+
 var SchemaElement_Scale_DEFAULT int32
+
 func (p *SchemaElement) GetScale() int32 {
-  if !p.IsSetScale() {
-    return SchemaElement_Scale_DEFAULT
-  }
-return *p.Scale
+	if !p.IsSetScale() {
+		return SchemaElement_Scale_DEFAULT
+	}
+	return *p.Scale
 }
+
 var SchemaElement_Precision_DEFAULT int32
+
 func (p *SchemaElement) GetPrecision() int32 {
-  if !p.IsSetPrecision() {
-    return SchemaElement_Precision_DEFAULT
-  }
-return *p.Precision
+	if !p.IsSetPrecision() {
+		return SchemaElement_Precision_DEFAULT
+	}
+	return *p.Precision
 }
+
 var SchemaElement_FieldID_DEFAULT int32
+
 func (p *SchemaElement) GetFieldID() int32 {
-  if !p.IsSetFieldID() {
-    return SchemaElement_FieldID_DEFAULT
-  }
-return *p.FieldID
+	if !p.IsSetFieldID() {
+		return SchemaElement_FieldID_DEFAULT
+	}
+	return *p.FieldID
 }
+
 var SchemaElement_LogicalType_DEFAULT *LogicalType
+
 func (p *SchemaElement) GetLogicalType() *LogicalType {
-  if !p.IsSetLogicalType() {
-    return SchemaElement_LogicalType_DEFAULT
-  }
-return p.LogicalType
+	if !p.IsSetLogicalType() {
+		return SchemaElement_LogicalType_DEFAULT
+	}
+	return p.LogicalType
 }
 func (p *SchemaElement) IsSetType() bool {
-  return p.Type != nil
+	return p.Type != nil
 }
 
 func (p *SchemaElement) IsSetTypeLength() bool {
-  return p.TypeLength != nil
+	return p.TypeLength != nil
 }
 
 func (p *SchemaElement) IsSetRepetitionType() bool {
-  return p.RepetitionType != nil
+	return p.RepetitionType != nil
 }
 
 func (p *SchemaElement) IsSetNumChildren() bool {
-  return p.NumChildren != nil
+	return p.NumChildren != nil
 }
 
 func (p *SchemaElement) IsSetConvertedType() bool {
-  return p.ConvertedType != nil
+	return p.ConvertedType != nil
 }
 
 func (p *SchemaElement) IsSetScale() bool {
-  return p.Scale != nil
+	return p.Scale != nil
 }
 
 func (p *SchemaElement) IsSetPrecision() bool {
-  return p.Precision != nil
+	return p.Precision != nil
 }
 
 func (p *SchemaElement) IsSetFieldID() bool {
-  return p.FieldID != nil
+	return p.FieldID != nil
 }
 
 func (p *SchemaElement) IsSetLogicalType() bool {
-  return p.LogicalType != nil
+	return p.LogicalType != nil
 }
 
 func (p *SchemaElement) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetName bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 4:
-      if fieldTypeId == thrift.STRING {
-        if err := p.ReadField4(ctx, iprot); err != nil {
-          return err
-        }
-        issetName = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 5:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField5(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 6:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField6(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 7:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField7(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 8:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField8(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 9:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField9(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 10:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField10(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetName{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Name is not set"));
-  }
-  return nil
-}
-
-func (p *SchemaElement)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  temp := Type(v)
-  p.Type = &temp
-}
-  return nil
-}
-
-func (p *SchemaElement)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  p.TypeLength = &v
-}
-  return nil
-}
-
-func (p *SchemaElement)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 3: ", err)
-} else {
-  temp := FieldRepetitionType(v)
-  p.RepetitionType = &temp
-}
-  return nil
-}
-
-func (p *SchemaElement)  ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadString(ctx); err != nil {
-  return thrift.PrependError("error reading field 4: ", err)
-} else {
-  p.Name = v
-}
-  return nil
-}
-
-func (p *SchemaElement)  ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 5: ", err)
-} else {
-  p.NumChildren = &v
-}
-  return nil
-}
-
-func (p *SchemaElement)  ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 6: ", err)
-} else {
-  temp := ConvertedType(v)
-  p.ConvertedType = &temp
-}
-  return nil
-}
-
-func (p *SchemaElement)  ReadField7(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 7: ", err)
-} else {
-  p.Scale = &v
-}
-  return nil
-}
-
-func (p *SchemaElement)  ReadField8(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 8: ", err)
-} else {
-  p.Precision = &v
-}
-  return nil
-}
-
-func (p *SchemaElement)  ReadField9(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 9: ", err)
-} else {
-  p.FieldID = &v
-}
-  return nil
-}
-
-func (p *SchemaElement)  ReadField10(ctx context.Context, iprot thrift.TProtocol) error {
-  p.LogicalType = &LogicalType{}
-  if err := p.LogicalType.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.LogicalType), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetName bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 4:
+			if fieldTypeId == thrift.STRING {
+				if err := p.ReadField4(ctx, iprot); err != nil {
+					return err
+				}
+				issetName = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 5:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField5(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 6:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField6(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 7:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField7(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 8:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField8(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 9:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField9(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 10:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField10(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetName {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Name is not set"))
+	}
+	return nil
+}
+
+func (p *SchemaElement) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		temp := Type(v)
+		p.Type = &temp
+	}
+	return nil
+}
+
+func (p *SchemaElement) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		p.TypeLength = &v
+	}
+	return nil
+}
+
+func (p *SchemaElement) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 3: ", err)
+	} else {
+		temp := FieldRepetitionType(v)
+		p.RepetitionType = &temp
+	}
+	return nil
+}
+
+func (p *SchemaElement) ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadString(ctx); err != nil {
+		return thrift.PrependError("error reading field 4: ", err)
+	} else {
+		p.Name = v
+	}
+	return nil
+}
+
+func (p *SchemaElement) ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 5: ", err)
+	} else {
+		p.NumChildren = &v
+	}
+	return nil
+}
+
+func (p *SchemaElement) ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 6: ", err)
+	} else {
+		temp := ConvertedType(v)
+		p.ConvertedType = &temp
+	}
+	return nil
+}
+
+func (p *SchemaElement) ReadField7(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 7: ", err)
+	} else {
+		p.Scale = &v
+	}
+	return nil
+}
+
+func (p *SchemaElement) ReadField8(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 8: ", err)
+	} else {
+		p.Precision = &v
+	}
+	return nil
+}
+
+func (p *SchemaElement) ReadField9(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 9: ", err)
+	} else {
+		p.FieldID = &v
+	}
+	return nil
+}
+
+func (p *SchemaElement) ReadField10(ctx context.Context, iprot thrift.TProtocol) error {
+	p.LogicalType = &LogicalType{}
+	if err := p.LogicalType.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.LogicalType), err)
+	}
+	return nil
 }
 
 func (p *SchemaElement) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "SchemaElement"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-    if err := p.writeField4(ctx, oprot); err != nil { return err }
-    if err := p.writeField5(ctx, oprot); err != nil { return err }
-    if err := p.writeField6(ctx, oprot); err != nil { return err }
-    if err := p.writeField7(ctx, oprot); err != nil { return err }
-    if err := p.writeField8(ctx, oprot); err != nil { return err }
-    if err := p.writeField9(ctx, oprot); err != nil { return err }
-    if err := p.writeField10(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "SchemaElement"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField4(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField5(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField6(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField7(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField8(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField9(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField10(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *SchemaElement) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetType() {
-    if err := oprot.WriteFieldBegin(ctx, "type", thrift.I32, 1); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:type: ", p), err) }
-    if err := oprot.WriteI32(ctx, int32(*p.Type)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.type (1) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:type: ", p), err) }
-  }
-  return err
+	if p.IsSetType() {
+		if err := oprot.WriteFieldBegin(ctx, "type", thrift.I32, 1); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:type: ", p), err)
+		}
+		if err := oprot.WriteI32(ctx, int32(*p.Type)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.type (1) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:type: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *SchemaElement) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetTypeLength() {
-    if err := oprot.WriteFieldBegin(ctx, "type_length", thrift.I32, 2); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:type_length: ", p), err) }
-    if err := oprot.WriteI32(ctx, int32(*p.TypeLength)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.type_length (2) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:type_length: ", p), err) }
-  }
-  return err
+	if p.IsSetTypeLength() {
+		if err := oprot.WriteFieldBegin(ctx, "type_length", thrift.I32, 2); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:type_length: ", p), err)
+		}
+		if err := oprot.WriteI32(ctx, int32(*p.TypeLength)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.type_length (2) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:type_length: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *SchemaElement) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetRepetitionType() {
-    if err := oprot.WriteFieldBegin(ctx, "repetition_type", thrift.I32, 3); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:repetition_type: ", p), err) }
-    if err := oprot.WriteI32(ctx, int32(*p.RepetitionType)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.repetition_type (3) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:repetition_type: ", p), err) }
-  }
-  return err
+	if p.IsSetRepetitionType() {
+		if err := oprot.WriteFieldBegin(ctx, "repetition_type", thrift.I32, 3); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:repetition_type: ", p), err)
+		}
+		if err := oprot.WriteI32(ctx, int32(*p.RepetitionType)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.repetition_type (3) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:repetition_type: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *SchemaElement) writeField4(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "name", thrift.STRING, 4); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:name: ", p), err) }
-  if err := oprot.WriteString(ctx, string(p.Name)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.name (4) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:name: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "name", thrift.STRING, 4); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:name: ", p), err)
+	}
+	if err := oprot.WriteString(ctx, string(p.Name)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.name (4) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:name: ", p), err)
+	}
+	return err
 }
 
 func (p *SchemaElement) writeField5(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetNumChildren() {
-    if err := oprot.WriteFieldBegin(ctx, "num_children", thrift.I32, 5); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:num_children: ", p), err) }
-    if err := oprot.WriteI32(ctx, int32(*p.NumChildren)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.num_children (5) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 5:num_children: ", p), err) }
-  }
-  return err
+	if p.IsSetNumChildren() {
+		if err := oprot.WriteFieldBegin(ctx, "num_children", thrift.I32, 5); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:num_children: ", p), err)
+		}
+		if err := oprot.WriteI32(ctx, int32(*p.NumChildren)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.num_children (5) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 5:num_children: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *SchemaElement) writeField6(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetConvertedType() {
-    if err := oprot.WriteFieldBegin(ctx, "converted_type", thrift.I32, 6); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:converted_type: ", p), err) }
-    if err := oprot.WriteI32(ctx, int32(*p.ConvertedType)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.converted_type (6) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 6:converted_type: ", p), err) }
-  }
-  return err
+	if p.IsSetConvertedType() {
+		if err := oprot.WriteFieldBegin(ctx, "converted_type", thrift.I32, 6); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:converted_type: ", p), err)
+		}
+		if err := oprot.WriteI32(ctx, int32(*p.ConvertedType)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.converted_type (6) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 6:converted_type: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *SchemaElement) writeField7(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetScale() {
-    if err := oprot.WriteFieldBegin(ctx, "scale", thrift.I32, 7); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:scale: ", p), err) }
-    if err := oprot.WriteI32(ctx, int32(*p.Scale)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.scale (7) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 7:scale: ", p), err) }
-  }
-  return err
+	if p.IsSetScale() {
+		if err := oprot.WriteFieldBegin(ctx, "scale", thrift.I32, 7); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:scale: ", p), err)
+		}
+		if err := oprot.WriteI32(ctx, int32(*p.Scale)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.scale (7) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 7:scale: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *SchemaElement) writeField8(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetPrecision() {
-    if err := oprot.WriteFieldBegin(ctx, "precision", thrift.I32, 8); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:precision: ", p), err) }
-    if err := oprot.WriteI32(ctx, int32(*p.Precision)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.precision (8) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 8:precision: ", p), err) }
-  }
-  return err
+	if p.IsSetPrecision() {
+		if err := oprot.WriteFieldBegin(ctx, "precision", thrift.I32, 8); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:precision: ", p), err)
+		}
+		if err := oprot.WriteI32(ctx, int32(*p.Precision)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.precision (8) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 8:precision: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *SchemaElement) writeField9(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetFieldID() {
-    if err := oprot.WriteFieldBegin(ctx, "field_id", thrift.I32, 9); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:field_id: ", p), err) }
-    if err := oprot.WriteI32(ctx, int32(*p.FieldID)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.field_id (9) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 9:field_id: ", p), err) }
-  }
-  return err
+	if p.IsSetFieldID() {
+		if err := oprot.WriteFieldBegin(ctx, "field_id", thrift.I32, 9); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:field_id: ", p), err)
+		}
+		if err := oprot.WriteI32(ctx, int32(*p.FieldID)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.field_id (9) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 9:field_id: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *SchemaElement) writeField10(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetLogicalType() {
-    if err := oprot.WriteFieldBegin(ctx, "logicalType", thrift.STRUCT, 10); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 10:logicalType: ", p), err) }
-    if err := p.LogicalType.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.LogicalType), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 10:logicalType: ", p), err) }
-  }
-  return err
+	if p.IsSetLogicalType() {
+		if err := oprot.WriteFieldBegin(ctx, "logicalType", thrift.STRUCT, 10); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 10:logicalType: ", p), err)
+		}
+		if err := p.LogicalType.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.LogicalType), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 10:logicalType: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *SchemaElement) Equals(other *SchemaElement) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if p.Type != other.Type {
-    if p.Type == nil || other.Type == nil {
-      return false
-    }
-    if (*p.Type) != (*other.Type) { return false }
-  }
-  if p.TypeLength != other.TypeLength {
-    if p.TypeLength == nil || other.TypeLength == nil {
-      return false
-    }
-    if (*p.TypeLength) != (*other.TypeLength) { return false }
-  }
-  if p.RepetitionType != other.RepetitionType {
-    if p.RepetitionType == nil || other.RepetitionType == nil {
-      return false
-    }
-    if (*p.RepetitionType) != (*other.RepetitionType) { return false }
-  }
-  if p.Name != other.Name { return false }
-  if p.NumChildren != other.NumChildren {
-    if p.NumChildren == nil || other.NumChildren == nil {
-      return false
-    }
-    if (*p.NumChildren) != (*other.NumChildren) { return false }
-  }
-  if p.ConvertedType != other.ConvertedType {
-    if p.ConvertedType == nil || other.ConvertedType == nil {
-      return false
-    }
-    if (*p.ConvertedType) != (*other.ConvertedType) { return false }
-  }
-  if p.Scale != other.Scale {
-    if p.Scale == nil || other.Scale == nil {
-      return false
-    }
-    if (*p.Scale) != (*other.Scale) { return false }
-  }
-  if p.Precision != other.Precision {
-    if p.Precision == nil || other.Precision == nil {
-      return false
-    }
-    if (*p.Precision) != (*other.Precision) { return false }
-  }
-  if p.FieldID != other.FieldID {
-    if p.FieldID == nil || other.FieldID == nil {
-      return false
-    }
-    if (*p.FieldID) != (*other.FieldID) { return false }
-  }
-  if !p.LogicalType.Equals(other.LogicalType) { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if p.Type != other.Type {
+		if p.Type == nil || other.Type == nil {
+			return false
+		}
+		if (*p.Type) != (*other.Type) {
+			return false
+		}
+	}
+	if p.TypeLength != other.TypeLength {
+		if p.TypeLength == nil || other.TypeLength == nil {
+			return false
+		}
+		if (*p.TypeLength) != (*other.TypeLength) {
+			return false
+		}
+	}
+	if p.RepetitionType != other.RepetitionType {
+		if p.RepetitionType == nil || other.RepetitionType == nil {
+			return false
+		}
+		if (*p.RepetitionType) != (*other.RepetitionType) {
+			return false
+		}
+	}
+	if p.Name != other.Name {
+		return false
+	}
+	if p.NumChildren != other.NumChildren {
+		if p.NumChildren == nil || other.NumChildren == nil {
+			return false
+		}
+		if (*p.NumChildren) != (*other.NumChildren) {
+			return false
+		}
+	}
+	if p.ConvertedType != other.ConvertedType {
+		if p.ConvertedType == nil || other.ConvertedType == nil {
+			return false
+		}
+		if (*p.ConvertedType) != (*other.ConvertedType) {
+			return false
+		}
+	}
+	if p.Scale != other.Scale {
+		if p.Scale == nil || other.Scale == nil {
+			return false
+		}
+		if (*p.Scale) != (*other.Scale) {
+			return false
+		}
+	}
+	if p.Precision != other.Precision {
+		if p.Precision == nil || other.Precision == nil {
+			return false
+		}
+		if (*p.Precision) != (*other.Precision) {
+			return false
+		}
+	}
+	if p.FieldID != other.FieldID {
+		if p.FieldID == nil || other.FieldID == nil {
+			return false
+		}
+		if (*p.FieldID) != (*other.FieldID) {
+			return false
+		}
+	}
+	if !p.LogicalType.Equals(other.LogicalType) {
+		return false
+	}
+	return true
 }
 
 func (p *SchemaElement) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("SchemaElement(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("SchemaElement(%+v)", *p)
 }
 
 func (p *SchemaElement) Validate() error {
-  return nil
+	return nil
 }
+
 // Data page header
-// 
+//
 // Attributes:
-//  - NumValues: Number of values, including NULLs, in this data page. *
-//  - Encoding: Encoding used for this data page *
-//  - DefinitionLevelEncoding: Encoding used for definition levels *
-//  - RepetitionLevelEncoding: Encoding used for repetition levels *
-//  - Statistics: Optional statistics for the data in this page*
+//   - NumValues: Number of values, including NULLs, in this data page. *
+//   - Encoding: Encoding used for this data page *
+//   - DefinitionLevelEncoding: Encoding used for definition levels *
+//   - RepetitionLevelEncoding: Encoding used for repetition levels *
+//   - Statistics: Optional statistics for the data in this page*
 type DataPageHeader struct {
-  NumValues int32 `thrift:"num_values,1,required" db:"num_values" json:"num_values"`
-  Encoding Encoding `thrift:"encoding,2,required" db:"encoding" json:"encoding"`
-  DefinitionLevelEncoding Encoding `thrift:"definition_level_encoding,3,required" db:"definition_level_encoding" json:"definition_level_encoding"`
-  RepetitionLevelEncoding Encoding `thrift:"repetition_level_encoding,4,required" db:"repetition_level_encoding" json:"repetition_level_encoding"`
-  Statistics *Statistics `thrift:"statistics,5" db:"statistics" json:"statistics,omitempty"`
+	NumValues               int32       `thrift:"num_values,1,required" db:"num_values" json:"num_values"`
+	Encoding                Encoding    `thrift:"encoding,2,required" db:"encoding" json:"encoding"`
+	DefinitionLevelEncoding Encoding    `thrift:"definition_level_encoding,3,required" db:"definition_level_encoding" json:"definition_level_encoding"`
+	RepetitionLevelEncoding Encoding    `thrift:"repetition_level_encoding,4,required" db:"repetition_level_encoding" json:"repetition_level_encoding"`
+	Statistics              *Statistics `thrift:"statistics,5" db:"statistics" json:"statistics,omitempty"`
 }
 
 func NewDataPageHeader() *DataPageHeader {
-  return &DataPageHeader{}
+	return &DataPageHeader{}
 }
 
-
 func (p *DataPageHeader) GetNumValues() int32 {
-  return p.NumValues
+	return p.NumValues
 }
 
 func (p *DataPageHeader) GetEncoding() Encoding {
-  return p.Encoding
+	return p.Encoding
 }
 
 func (p *DataPageHeader) GetDefinitionLevelEncoding() Encoding {
-  return p.DefinitionLevelEncoding
+	return p.DefinitionLevelEncoding
 }
 
 func (p *DataPageHeader) GetRepetitionLevelEncoding() Encoding {
-  return p.RepetitionLevelEncoding
+	return p.RepetitionLevelEncoding
 }
+
 var DataPageHeader_Statistics_DEFAULT *Statistics
+
 func (p *DataPageHeader) GetStatistics() *Statistics {
-  if !p.IsSetStatistics() {
-    return DataPageHeader_Statistics_DEFAULT
-  }
-return p.Statistics
+	if !p.IsSetStatistics() {
+		return DataPageHeader_Statistics_DEFAULT
+	}
+	return p.Statistics
 }
 func (p *DataPageHeader) IsSetStatistics() bool {
-  return p.Statistics != nil
+	return p.Statistics != nil
 }
 
 func (p *DataPageHeader) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetNumValues bool = false;
-  var issetEncoding bool = false;
-  var issetDefinitionLevelEncoding bool = false;
-  var issetRepetitionLevelEncoding bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetNumValues = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-        issetEncoding = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-        issetDefinitionLevelEncoding = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 4:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField4(ctx, iprot); err != nil {
-          return err
-        }
-        issetRepetitionLevelEncoding = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 5:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField5(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetNumValues{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumValues is not set"));
-  }
-  if !issetEncoding{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Encoding is not set"));
-  }
-  if !issetDefinitionLevelEncoding{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field DefinitionLevelEncoding is not set"));
-  }
-  if !issetRepetitionLevelEncoding{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field RepetitionLevelEncoding is not set"));
-  }
-  return nil
-}
-
-func (p *DataPageHeader)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  p.NumValues = v
-}
-  return nil
-}
-
-func (p *DataPageHeader)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  temp := Encoding(v)
-  p.Encoding = temp
-}
-  return nil
-}
-
-func (p *DataPageHeader)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 3: ", err)
-} else {
-  temp := Encoding(v)
-  p.DefinitionLevelEncoding = temp
-}
-  return nil
-}
-
-func (p *DataPageHeader)  ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 4: ", err)
-} else {
-  temp := Encoding(v)
-  p.RepetitionLevelEncoding = temp
-}
-  return nil
-}
-
-func (p *DataPageHeader)  ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
-  p.Statistics = &Statistics{}
-  if err := p.Statistics.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Statistics), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetNumValues bool = false
+	var issetEncoding bool = false
+	var issetDefinitionLevelEncoding bool = false
+	var issetRepetitionLevelEncoding bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetNumValues = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+				issetEncoding = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+				issetDefinitionLevelEncoding = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 4:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField4(ctx, iprot); err != nil {
+					return err
+				}
+				issetRepetitionLevelEncoding = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 5:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField5(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetNumValues {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumValues is not set"))
+	}
+	if !issetEncoding {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Encoding is not set"))
+	}
+	if !issetDefinitionLevelEncoding {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field DefinitionLevelEncoding is not set"))
+	}
+	if !issetRepetitionLevelEncoding {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field RepetitionLevelEncoding is not set"))
+	}
+	return nil
+}
+
+func (p *DataPageHeader) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		p.NumValues = v
+	}
+	return nil
+}
+
+func (p *DataPageHeader) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		temp := Encoding(v)
+		p.Encoding = temp
+	}
+	return nil
+}
+
+func (p *DataPageHeader) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 3: ", err)
+	} else {
+		temp := Encoding(v)
+		p.DefinitionLevelEncoding = temp
+	}
+	return nil
+}
+
+func (p *DataPageHeader) ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 4: ", err)
+	} else {
+		temp := Encoding(v)
+		p.RepetitionLevelEncoding = temp
+	}
+	return nil
+}
+
+func (p *DataPageHeader) ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
+	p.Statistics = &Statistics{}
+	if err := p.Statistics.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Statistics), err)
+	}
+	return nil
 }
 
 func (p *DataPageHeader) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "DataPageHeader"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-    if err := p.writeField4(ctx, oprot); err != nil { return err }
-    if err := p.writeField5(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "DataPageHeader"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField4(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField5(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *DataPageHeader) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "num_values", thrift.I32, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:num_values: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.NumValues)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.num_values (1) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:num_values: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "num_values", thrift.I32, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:num_values: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.NumValues)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.num_values (1) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:num_values: ", p), err)
+	}
+	return err
 }
 
 func (p *DataPageHeader) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "encoding", thrift.I32, 2); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:encoding: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.Encoding)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.encoding (2) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:encoding: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "encoding", thrift.I32, 2); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:encoding: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.Encoding)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.encoding (2) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:encoding: ", p), err)
+	}
+	return err
 }
 
 func (p *DataPageHeader) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "definition_level_encoding", thrift.I32, 3); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:definition_level_encoding: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.DefinitionLevelEncoding)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.definition_level_encoding (3) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:definition_level_encoding: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "definition_level_encoding", thrift.I32, 3); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:definition_level_encoding: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.DefinitionLevelEncoding)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.definition_level_encoding (3) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:definition_level_encoding: ", p), err)
+	}
+	return err
 }
 
 func (p *DataPageHeader) writeField4(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "repetition_level_encoding", thrift.I32, 4); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:repetition_level_encoding: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.RepetitionLevelEncoding)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.repetition_level_encoding (4) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:repetition_level_encoding: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "repetition_level_encoding", thrift.I32, 4); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:repetition_level_encoding: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.RepetitionLevelEncoding)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.repetition_level_encoding (4) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:repetition_level_encoding: ", p), err)
+	}
+	return err
 }
 
 func (p *DataPageHeader) writeField5(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetStatistics() {
-    if err := oprot.WriteFieldBegin(ctx, "statistics", thrift.STRUCT, 5); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:statistics: ", p), err) }
-    if err := p.Statistics.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Statistics), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 5:statistics: ", p), err) }
-  }
-  return err
+	if p.IsSetStatistics() {
+		if err := oprot.WriteFieldBegin(ctx, "statistics", thrift.STRUCT, 5); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:statistics: ", p), err)
+		}
+		if err := p.Statistics.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Statistics), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 5:statistics: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *DataPageHeader) Equals(other *DataPageHeader) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if p.NumValues != other.NumValues { return false }
-  if p.Encoding != other.Encoding { return false }
-  if p.DefinitionLevelEncoding != other.DefinitionLevelEncoding { return false }
-  if p.RepetitionLevelEncoding != other.RepetitionLevelEncoding { return false }
-  if !p.Statistics.Equals(other.Statistics) { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if p.NumValues != other.NumValues {
+		return false
+	}
+	if p.Encoding != other.Encoding {
+		return false
+	}
+	if p.DefinitionLevelEncoding != other.DefinitionLevelEncoding {
+		return false
+	}
+	if p.RepetitionLevelEncoding != other.RepetitionLevelEncoding {
+		return false
+	}
+	if !p.Statistics.Equals(other.Statistics) {
+		return false
+	}
+	return true
 }
 
 func (p *DataPageHeader) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("DataPageHeader(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("DataPageHeader(%+v)", *p)
 }
 
 func (p *DataPageHeader) Validate() error {
-  return nil
+	return nil
 }
+
 type IndexPageHeader struct {
 }
 
 func NewIndexPageHeader() *IndexPageHeader {
-  return &IndexPageHeader{}
+	return &IndexPageHeader{}
 }
 
 func (p *IndexPageHeader) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *IndexPageHeader) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "IndexPageHeader"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "IndexPageHeader"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *IndexPageHeader) Equals(other *IndexPageHeader) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *IndexPageHeader) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("IndexPageHeader(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("IndexPageHeader(%+v)", *p)
 }
 
 func (p *IndexPageHeader) Validate() error {
-  return nil
+	return nil
 }
+
 // The dictionary page must be placed at the first position of the column chunk
 // if it is partly or completely dictionary encoded. At most one dictionary page
 // can be placed in a column chunk.
-// 
-// 
+//
 // Attributes:
-//  - NumValues: Number of values in the dictionary *
-//  - Encoding: Encoding using this dictionary page *
-//  - IsSorted: If true, the entries in the dictionary are sorted in ascending order *
+//   - NumValues: Number of values in the dictionary *
+//   - Encoding: Encoding using this dictionary page *
+//   - IsSorted: If true, the entries in the dictionary are sorted in ascending order *
 type DictionaryPageHeader struct {
-  NumValues int32 `thrift:"num_values,1,required" db:"num_values" json:"num_values"`
-  Encoding Encoding `thrift:"encoding,2,required" db:"encoding" json:"encoding"`
-  IsSorted *bool `thrift:"is_sorted,3" db:"is_sorted" json:"is_sorted,omitempty"`
+	NumValues int32    `thrift:"num_values,1,required" db:"num_values" json:"num_values"`
+	Encoding  Encoding `thrift:"encoding,2,required" db:"encoding" json:"encoding"`
+	IsSorted  *bool    `thrift:"is_sorted,3" db:"is_sorted" json:"is_sorted,omitempty"`
 }
 
 func NewDictionaryPageHeader() *DictionaryPageHeader {
-  return &DictionaryPageHeader{}
+	return &DictionaryPageHeader{}
 }
 
-
 func (p *DictionaryPageHeader) GetNumValues() int32 {
-  return p.NumValues
+	return p.NumValues
 }
 
 func (p *DictionaryPageHeader) GetEncoding() Encoding {
-  return p.Encoding
+	return p.Encoding
 }
+
 var DictionaryPageHeader_IsSorted_DEFAULT bool
+
 func (p *DictionaryPageHeader) GetIsSorted() bool {
-  if !p.IsSetIsSorted() {
-    return DictionaryPageHeader_IsSorted_DEFAULT
-  }
-return *p.IsSorted
+	if !p.IsSetIsSorted() {
+		return DictionaryPageHeader_IsSorted_DEFAULT
+	}
+	return *p.IsSorted
 }
 func (p *DictionaryPageHeader) IsSetIsSorted() bool {
-  return p.IsSorted != nil
+	return p.IsSorted != nil
 }
 
 func (p *DictionaryPageHeader) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetNumValues bool = false;
-  var issetEncoding bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetNumValues = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-        issetEncoding = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.BOOL {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetNumValues{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumValues is not set"));
-  }
-  if !issetEncoding{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Encoding is not set"));
-  }
-  return nil
-}
-
-func (p *DictionaryPageHeader)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  p.NumValues = v
-}
-  return nil
-}
-
-func (p *DictionaryPageHeader)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  temp := Encoding(v)
-  p.Encoding = temp
-}
-  return nil
-}
-
-func (p *DictionaryPageHeader)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBool(ctx); err != nil {
-  return thrift.PrependError("error reading field 3: ", err)
-} else {
-  p.IsSorted = &v
-}
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetNumValues bool = false
+	var issetEncoding bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetNumValues = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+				issetEncoding = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.BOOL {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetNumValues {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumValues is not set"))
+	}
+	if !issetEncoding {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Encoding is not set"))
+	}
+	return nil
+}
+
+func (p *DictionaryPageHeader) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		p.NumValues = v
+	}
+	return nil
+}
+
+func (p *DictionaryPageHeader) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		temp := Encoding(v)
+		p.Encoding = temp
+	}
+	return nil
+}
+
+func (p *DictionaryPageHeader) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBool(ctx); err != nil {
+		return thrift.PrependError("error reading field 3: ", err)
+	} else {
+		p.IsSorted = &v
+	}
+	return nil
 }
 
 func (p *DictionaryPageHeader) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "DictionaryPageHeader"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "DictionaryPageHeader"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *DictionaryPageHeader) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "num_values", thrift.I32, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:num_values: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.NumValues)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.num_values (1) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:num_values: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "num_values", thrift.I32, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:num_values: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.NumValues)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.num_values (1) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:num_values: ", p), err)
+	}
+	return err
 }
 
 func (p *DictionaryPageHeader) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "encoding", thrift.I32, 2); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:encoding: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.Encoding)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.encoding (2) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:encoding: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "encoding", thrift.I32, 2); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:encoding: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.Encoding)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.encoding (2) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:encoding: ", p), err)
+	}
+	return err
 }
 
 func (p *DictionaryPageHeader) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetIsSorted() {
-    if err := oprot.WriteFieldBegin(ctx, "is_sorted", thrift.BOOL, 3); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:is_sorted: ", p), err) }
-    if err := oprot.WriteBool(ctx, bool(*p.IsSorted)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.is_sorted (3) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:is_sorted: ", p), err) }
-  }
-  return err
+	if p.IsSetIsSorted() {
+		if err := oprot.WriteFieldBegin(ctx, "is_sorted", thrift.BOOL, 3); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:is_sorted: ", p), err)
+		}
+		if err := oprot.WriteBool(ctx, bool(*p.IsSorted)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.is_sorted (3) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:is_sorted: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *DictionaryPageHeader) Equals(other *DictionaryPageHeader) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if p.NumValues != other.NumValues { return false }
-  if p.Encoding != other.Encoding { return false }
-  if p.IsSorted != other.IsSorted {
-    if p.IsSorted == nil || other.IsSorted == nil {
-      return false
-    }
-    if (*p.IsSorted) != (*other.IsSorted) { return false }
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if p.NumValues != other.NumValues {
+		return false
+	}
+	if p.Encoding != other.Encoding {
+		return false
+	}
+	if p.IsSorted != other.IsSorted {
+		if p.IsSorted == nil || other.IsSorted == nil {
+			return false
+		}
+		if (*p.IsSorted) != (*other.IsSorted) {
+			return false
+		}
+	}
+	return true
 }
 
 func (p *DictionaryPageHeader) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("DictionaryPageHeader(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("DictionaryPageHeader(%+v)", *p)
 }
 
 func (p *DictionaryPageHeader) Validate() error {
-  return nil
+	return nil
 }
+
 // New page format allowing reading levels without decompressing the data
 // Repetition and definition levels are uncompressed
 // The remaining section containing the data is compressed if is_compressed is true
-// 
-// 
+//
 // Attributes:
-//  - NumValues: Number of values, including NULLs, in this data page. *
-//  - NumNulls: Number of NULL values, in this data page.
+//   - NumValues: Number of values, including NULLs, in this data page. *
+//   - NumNulls: Number of NULL values, in this data page.
+//
 // Number of non-null = num_values - num_nulls which is also the number of values in the data section *
-//  - NumRows: Number of rows in this data page. which means pages change on record boundaries (r = 0) *
-//  - Encoding: Encoding used for data in this page *
-//  - DefinitionLevelsByteLength: length of the definition levels
-//  - RepetitionLevelsByteLength: length of the repetition levels
-//  - IsCompressed: whether the values are compressed.
+//   - NumRows: Number of rows in this data page. which means pages change on record boundaries (r = 0) *
+//   - Encoding: Encoding used for data in this page *
+//   - DefinitionLevelsByteLength: length of the definition levels
+//   - RepetitionLevelsByteLength: length of the repetition levels
+//   - IsCompressed: whether the values are compressed.
+//
 // Which means the section of the page between
 // definition_levels_byte_length + repetition_levels_byte_length + 1 and compressed_page_size (included)
 // is compressed with the compression_codec.
 // If missing it is considered compressed
-//  - Statistics: optional statistics for the data in this page *
+//   - Statistics: optional statistics for the data in this page *
 type DataPageHeaderV2 struct {
-  NumValues int32 `thrift:"num_values,1,required" db:"num_values" json:"num_values"`
-  NumNulls int32 `thrift:"num_nulls,2,required" db:"num_nulls" json:"num_nulls"`
-  NumRows int32 `thrift:"num_rows,3,required" db:"num_rows" json:"num_rows"`
-  Encoding Encoding `thrift:"encoding,4,required" db:"encoding" json:"encoding"`
-  DefinitionLevelsByteLength int32 `thrift:"definition_levels_byte_length,5,required" db:"definition_levels_byte_length" json:"definition_levels_byte_length"`
-  RepetitionLevelsByteLength int32 `thrift:"repetition_levels_byte_length,6,required" db:"repetition_levels_byte_length" json:"repetition_levels_byte_length"`
-  IsCompressed bool `thrift:"is_compressed,7" db:"is_compressed" json:"is_compressed"`
-  Statistics *Statistics `thrift:"statistics,8" db:"statistics" json:"statistics,omitempty"`
+	NumValues                  int32       `thrift:"num_values,1,required" db:"num_values" json:"num_values"`
+	NumNulls                   int32       `thrift:"num_nulls,2,required" db:"num_nulls" json:"num_nulls"`
+	NumRows                    int32       `thrift:"num_rows,3,required" db:"num_rows" json:"num_rows"`
+	Encoding                   Encoding    `thrift:"encoding,4,required" db:"encoding" json:"encoding"`
+	DefinitionLevelsByteLength int32       `thrift:"definition_levels_byte_length,5,required" db:"definition_levels_byte_length" json:"definition_levels_byte_length"`
+	RepetitionLevelsByteLength int32       `thrift:"repetition_levels_byte_length,6,required" db:"repetition_levels_byte_length" json:"repetition_levels_byte_length"`
+	IsCompressed               bool        `thrift:"is_compressed,7" db:"is_compressed" json:"is_compressed"`
+	Statistics                 *Statistics `thrift:"statistics,8" db:"statistics" json:"statistics,omitempty"`
 }
 
 func NewDataPageHeaderV2() *DataPageHeaderV2 {
-  return &DataPageHeaderV2{
-IsCompressed: true,
-}
+	return &DataPageHeaderV2{
+		IsCompressed: true,
+	}
 }
 
-
 func (p *DataPageHeaderV2) GetNumValues() int32 {
-  return p.NumValues
+	return p.NumValues
 }
 
 func (p *DataPageHeaderV2) GetNumNulls() int32 {
-  return p.NumNulls
+	return p.NumNulls
 }
 
 func (p *DataPageHeaderV2) GetNumRows() int32 {
-  return p.NumRows
+	return p.NumRows
 }
 
 func (p *DataPageHeaderV2) GetEncoding() Encoding {
-  return p.Encoding
+	return p.Encoding
 }
 
 func (p *DataPageHeaderV2) GetDefinitionLevelsByteLength() int32 {
-  return p.DefinitionLevelsByteLength
+	return p.DefinitionLevelsByteLength
 }
 
 func (p *DataPageHeaderV2) GetRepetitionLevelsByteLength() int32 {
-  return p.RepetitionLevelsByteLength
+	return p.RepetitionLevelsByteLength
 }
+
 var DataPageHeaderV2_IsCompressed_DEFAULT bool = true
 
 func (p *DataPageHeaderV2) GetIsCompressed() bool {
-  return p.IsCompressed
+	return p.IsCompressed
 }
+
 var DataPageHeaderV2_Statistics_DEFAULT *Statistics
+
 func (p *DataPageHeaderV2) GetStatistics() *Statistics {
-  if !p.IsSetStatistics() {
-    return DataPageHeaderV2_Statistics_DEFAULT
-  }
-return p.Statistics
+	if !p.IsSetStatistics() {
+		return DataPageHeaderV2_Statistics_DEFAULT
+	}
+	return p.Statistics
 }
 func (p *DataPageHeaderV2) IsSetIsCompressed() bool {
-  return p.IsCompressed != DataPageHeaderV2_IsCompressed_DEFAULT
+	return p.IsCompressed != DataPageHeaderV2_IsCompressed_DEFAULT
 }
 
 func (p *DataPageHeaderV2) IsSetStatistics() bool {
-  return p.Statistics != nil
+	return p.Statistics != nil
 }
 
 func (p *DataPageHeaderV2) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetNumValues bool = false;
-  var issetNumNulls bool = false;
-  var issetNumRows bool = false;
-  var issetEncoding bool = false;
-  var issetDefinitionLevelsByteLength bool = false;
-  var issetRepetitionLevelsByteLength bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetNumValues = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-        issetNumNulls = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-        issetNumRows = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 4:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField4(ctx, iprot); err != nil {
-          return err
-        }
-        issetEncoding = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 5:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField5(ctx, iprot); err != nil {
-          return err
-        }
-        issetDefinitionLevelsByteLength = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 6:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField6(ctx, iprot); err != nil {
-          return err
-        }
-        issetRepetitionLevelsByteLength = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 7:
-      if fieldTypeId == thrift.BOOL {
-        if err := p.ReadField7(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 8:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField8(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetNumValues{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumValues is not set"));
-  }
-  if !issetNumNulls{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumNulls is not set"));
-  }
-  if !issetNumRows{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumRows is not set"));
-  }
-  if !issetEncoding{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Encoding is not set"));
-  }
-  if !issetDefinitionLevelsByteLength{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field DefinitionLevelsByteLength is not set"));
-  }
-  if !issetRepetitionLevelsByteLength{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field RepetitionLevelsByteLength is not set"));
-  }
-  return nil
-}
-
-func (p *DataPageHeaderV2)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  p.NumValues = v
-}
-  return nil
-}
-
-func (p *DataPageHeaderV2)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  p.NumNulls = v
-}
-  return nil
-}
-
-func (p *DataPageHeaderV2)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 3: ", err)
-} else {
-  p.NumRows = v
-}
-  return nil
-}
-
-func (p *DataPageHeaderV2)  ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 4: ", err)
-} else {
-  temp := Encoding(v)
-  p.Encoding = temp
-}
-  return nil
-}
-
-func (p *DataPageHeaderV2)  ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 5: ", err)
-} else {
-  p.DefinitionLevelsByteLength = v
-}
-  return nil
-}
-
-func (p *DataPageHeaderV2)  ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 6: ", err)
-} else {
-  p.RepetitionLevelsByteLength = v
-}
-  return nil
-}
-
-func (p *DataPageHeaderV2)  ReadField7(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBool(ctx); err != nil {
-  return thrift.PrependError("error reading field 7: ", err)
-} else {
-  p.IsCompressed = v
-}
-  return nil
-}
-
-func (p *DataPageHeaderV2)  ReadField8(ctx context.Context, iprot thrift.TProtocol) error {
-  p.Statistics = &Statistics{}
-  if err := p.Statistics.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Statistics), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetNumValues bool = false
+	var issetNumNulls bool = false
+	var issetNumRows bool = false
+	var issetEncoding bool = false
+	var issetDefinitionLevelsByteLength bool = false
+	var issetRepetitionLevelsByteLength bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetNumValues = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+				issetNumNulls = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+				issetNumRows = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 4:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField4(ctx, iprot); err != nil {
+					return err
+				}
+				issetEncoding = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 5:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField5(ctx, iprot); err != nil {
+					return err
+				}
+				issetDefinitionLevelsByteLength = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 6:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField6(ctx, iprot); err != nil {
+					return err
+				}
+				issetRepetitionLevelsByteLength = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 7:
+			if fieldTypeId == thrift.BOOL {
+				if err := p.ReadField7(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 8:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField8(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetNumValues {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumValues is not set"))
+	}
+	if !issetNumNulls {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumNulls is not set"))
+	}
+	if !issetNumRows {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumRows is not set"))
+	}
+	if !issetEncoding {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Encoding is not set"))
+	}
+	if !issetDefinitionLevelsByteLength {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field DefinitionLevelsByteLength is not set"))
+	}
+	if !issetRepetitionLevelsByteLength {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field RepetitionLevelsByteLength is not set"))
+	}
+	return nil
+}
+
+func (p *DataPageHeaderV2) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		p.NumValues = v
+	}
+	return nil
+}
+
+func (p *DataPageHeaderV2) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		p.NumNulls = v
+	}
+	return nil
+}
+
+func (p *DataPageHeaderV2) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 3: ", err)
+	} else {
+		p.NumRows = v
+	}
+	return nil
+}
+
+func (p *DataPageHeaderV2) ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 4: ", err)
+	} else {
+		temp := Encoding(v)
+		p.Encoding = temp
+	}
+	return nil
+}
+
+func (p *DataPageHeaderV2) ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 5: ", err)
+	} else {
+		p.DefinitionLevelsByteLength = v
+	}
+	return nil
+}
+
+func (p *DataPageHeaderV2) ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 6: ", err)
+	} else {
+		p.RepetitionLevelsByteLength = v
+	}
+	return nil
+}
+
+func (p *DataPageHeaderV2) ReadField7(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBool(ctx); err != nil {
+		return thrift.PrependError("error reading field 7: ", err)
+	} else {
+		p.IsCompressed = v
+	}
+	return nil
+}
+
+func (p *DataPageHeaderV2) ReadField8(ctx context.Context, iprot thrift.TProtocol) error {
+	p.Statistics = &Statistics{}
+	if err := p.Statistics.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Statistics), err)
+	}
+	return nil
 }
 
 func (p *DataPageHeaderV2) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "DataPageHeaderV2"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-    if err := p.writeField4(ctx, oprot); err != nil { return err }
-    if err := p.writeField5(ctx, oprot); err != nil { return err }
-    if err := p.writeField6(ctx, oprot); err != nil { return err }
-    if err := p.writeField7(ctx, oprot); err != nil { return err }
-    if err := p.writeField8(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "DataPageHeaderV2"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField4(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField5(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField6(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField7(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField8(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *DataPageHeaderV2) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "num_values", thrift.I32, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:num_values: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.NumValues)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.num_values (1) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:num_values: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "num_values", thrift.I32, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:num_values: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.NumValues)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.num_values (1) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:num_values: ", p), err)
+	}
+	return err
 }
 
 func (p *DataPageHeaderV2) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "num_nulls", thrift.I32, 2); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:num_nulls: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.NumNulls)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.num_nulls (2) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:num_nulls: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "num_nulls", thrift.I32, 2); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:num_nulls: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.NumNulls)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.num_nulls (2) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:num_nulls: ", p), err)
+	}
+	return err
 }
 
 func (p *DataPageHeaderV2) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "num_rows", thrift.I32, 3); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:num_rows: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.NumRows)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.num_rows (3) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:num_rows: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "num_rows", thrift.I32, 3); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:num_rows: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.NumRows)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.num_rows (3) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:num_rows: ", p), err)
+	}
+	return err
 }
 
 func (p *DataPageHeaderV2) writeField4(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "encoding", thrift.I32, 4); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:encoding: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.Encoding)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.encoding (4) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:encoding: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "encoding", thrift.I32, 4); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:encoding: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.Encoding)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.encoding (4) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:encoding: ", p), err)
+	}
+	return err
 }
 
 func (p *DataPageHeaderV2) writeField5(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "definition_levels_byte_length", thrift.I32, 5); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:definition_levels_byte_length: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.DefinitionLevelsByteLength)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.definition_levels_byte_length (5) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 5:definition_levels_byte_length: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "definition_levels_byte_length", thrift.I32, 5); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:definition_levels_byte_length: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.DefinitionLevelsByteLength)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.definition_levels_byte_length (5) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 5:definition_levels_byte_length: ", p), err)
+	}
+	return err
 }
 
 func (p *DataPageHeaderV2) writeField6(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "repetition_levels_byte_length", thrift.I32, 6); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:repetition_levels_byte_length: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.RepetitionLevelsByteLength)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.repetition_levels_byte_length (6) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 6:repetition_levels_byte_length: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "repetition_levels_byte_length", thrift.I32, 6); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:repetition_levels_byte_length: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.RepetitionLevelsByteLength)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.repetition_levels_byte_length (6) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 6:repetition_levels_byte_length: ", p), err)
+	}
+	return err
 }
 
 func (p *DataPageHeaderV2) writeField7(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetIsCompressed() {
-    if err := oprot.WriteFieldBegin(ctx, "is_compressed", thrift.BOOL, 7); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:is_compressed: ", p), err) }
-    if err := oprot.WriteBool(ctx, bool(p.IsCompressed)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.is_compressed (7) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 7:is_compressed: ", p), err) }
-  }
-  return err
+	if p.IsSetIsCompressed() {
+		if err := oprot.WriteFieldBegin(ctx, "is_compressed", thrift.BOOL, 7); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:is_compressed: ", p), err)
+		}
+		if err := oprot.WriteBool(ctx, bool(p.IsCompressed)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.is_compressed (7) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 7:is_compressed: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *DataPageHeaderV2) writeField8(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetStatistics() {
-    if err := oprot.WriteFieldBegin(ctx, "statistics", thrift.STRUCT, 8); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:statistics: ", p), err) }
-    if err := p.Statistics.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Statistics), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 8:statistics: ", p), err) }
-  }
-  return err
+	if p.IsSetStatistics() {
+		if err := oprot.WriteFieldBegin(ctx, "statistics", thrift.STRUCT, 8); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:statistics: ", p), err)
+		}
+		if err := p.Statistics.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Statistics), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 8:statistics: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *DataPageHeaderV2) Equals(other *DataPageHeaderV2) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if p.NumValues != other.NumValues { return false }
-  if p.NumNulls != other.NumNulls { return false }
-  if p.NumRows != other.NumRows { return false }
-  if p.Encoding != other.Encoding { return false }
-  if p.DefinitionLevelsByteLength != other.DefinitionLevelsByteLength { return false }
-  if p.RepetitionLevelsByteLength != other.RepetitionLevelsByteLength { return false }
-  if p.IsCompressed != other.IsCompressed { return false }
-  if !p.Statistics.Equals(other.Statistics) { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if p.NumValues != other.NumValues {
+		return false
+	}
+	if p.NumNulls != other.NumNulls {
+		return false
+	}
+	if p.NumRows != other.NumRows {
+		return false
+	}
+	if p.Encoding != other.Encoding {
+		return false
+	}
+	if p.DefinitionLevelsByteLength != other.DefinitionLevelsByteLength {
+		return false
+	}
+	if p.RepetitionLevelsByteLength != other.RepetitionLevelsByteLength {
+		return false
+	}
+	if p.IsCompressed != other.IsCompressed {
+		return false
+	}
+	if !p.Statistics.Equals(other.Statistics) {
+		return false
+	}
+	return true
 }
 
 func (p *DataPageHeaderV2) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("DataPageHeaderV2(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("DataPageHeaderV2(%+v)", *p)
 }
 
 func (p *DataPageHeaderV2) Validate() error {
-  return nil
+	return nil
 }
+
 // Block-based algorithm type annotation. *
 type SplitBlockAlgorithm struct {
 }
 
 func NewSplitBlockAlgorithm() *SplitBlockAlgorithm {
-  return &SplitBlockAlgorithm{}
+	return &SplitBlockAlgorithm{}
 }
 
 func (p *SplitBlockAlgorithm) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *SplitBlockAlgorithm) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "SplitBlockAlgorithm"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "SplitBlockAlgorithm"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *SplitBlockAlgorithm) Equals(other *SplitBlockAlgorithm) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *SplitBlockAlgorithm) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("SplitBlockAlgorithm(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("SplitBlockAlgorithm(%+v)", *p)
 }
 
 func (p *SplitBlockAlgorithm) Validate() error {
-  return nil
+	return nil
 }
+
 // The algorithm used in Bloom filter. *
-// 
+//
 // Attributes:
-//  - BLOCK: Block-based Bloom filter. *
+//   - BLOCK: Block-based Bloom filter. *
 type BloomFilterAlgorithm struct {
-  BLOCK *SplitBlockAlgorithm `thrift:"BLOCK,1" db:"BLOCK" json:"BLOCK,omitempty"`
+	BLOCK *SplitBlockAlgorithm `thrift:"BLOCK,1" db:"BLOCK" json:"BLOCK,omitempty"`
 }
 
 func NewBloomFilterAlgorithm() *BloomFilterAlgorithm {
-  return &BloomFilterAlgorithm{}
+	return &BloomFilterAlgorithm{}
 }
 
 var BloomFilterAlgorithm_BLOCK_DEFAULT *SplitBlockAlgorithm
+
 func (p *BloomFilterAlgorithm) GetBLOCK() *SplitBlockAlgorithm {
-  if !p.IsSetBLOCK() {
-    return BloomFilterAlgorithm_BLOCK_DEFAULT
-  }
-return p.BLOCK
+	if !p.IsSetBLOCK() {
+		return BloomFilterAlgorithm_BLOCK_DEFAULT
+	}
+	return p.BLOCK
 }
 func (p *BloomFilterAlgorithm) CountSetFieldsBloomFilterAlgorithm() int {
-  count := 0
-  if (p.IsSetBLOCK()) {
-    count++
-  }
-  return count
+	count := 0
+	if p.IsSetBLOCK() {
+		count++
+	}
+	return count
 
 }
 
 func (p *BloomFilterAlgorithm) IsSetBLOCK() bool {
-  return p.BLOCK != nil
+	return p.BLOCK != nil
 }
 
 func (p *BloomFilterAlgorithm) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
-}
-
-func (p *BloomFilterAlgorithm)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  p.BLOCK = &SplitBlockAlgorithm{}
-  if err := p.BLOCK.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.BLOCK), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
+}
+
+func (p *BloomFilterAlgorithm) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	p.BLOCK = &SplitBlockAlgorithm{}
+	if err := p.BLOCK.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.BLOCK), err)
+	}
+	return nil
 }
 
 func (p *BloomFilterAlgorithm) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if c := p.CountSetFieldsBloomFilterAlgorithm(); c != 1 {
-    return fmt.Errorf("%T write union: exactly one field must be set (%d set)", p, c)
-  }
-  if err := oprot.WriteStructBegin(ctx, "BloomFilterAlgorithm"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if c := p.CountSetFieldsBloomFilterAlgorithm(); c != 1 {
+		return fmt.Errorf("%T write union: exactly one field must be set (%d set)", p, c)
+	}
+	if err := oprot.WriteStructBegin(ctx, "BloomFilterAlgorithm"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *BloomFilterAlgorithm) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetBLOCK() {
-    if err := oprot.WriteFieldBegin(ctx, "BLOCK", thrift.STRUCT, 1); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:BLOCK: ", p), err) }
-    if err := p.BLOCK.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.BLOCK), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:BLOCK: ", p), err) }
-  }
-  return err
+	if p.IsSetBLOCK() {
+		if err := oprot.WriteFieldBegin(ctx, "BLOCK", thrift.STRUCT, 1); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:BLOCK: ", p), err)
+		}
+		if err := p.BLOCK.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.BLOCK), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:BLOCK: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *BloomFilterAlgorithm) Equals(other *BloomFilterAlgorithm) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if !p.BLOCK.Equals(other.BLOCK) { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if !p.BLOCK.Equals(other.BLOCK) {
+		return false
+	}
+	return true
 }
 
 func (p *BloomFilterAlgorithm) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("BloomFilterAlgorithm(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("BloomFilterAlgorithm(%+v)", *p)
 }
 
 func (p *BloomFilterAlgorithm) Validate() error {
-  return nil
+	return nil
 }
+
 // Hash strategy type annotation. xxHash is an extremely fast non-cryptographic hash
 // algorithm. It uses 64 bits version of xxHash.
-// 
 type XxHash struct {
 }
 
 func NewXxHash() *XxHash {
-  return &XxHash{}
+	return &XxHash{}
 }
 
 func (p *XxHash) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *XxHash) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "XxHash"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "XxHash"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *XxHash) Equals(other *XxHash) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *XxHash) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("XxHash(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("XxHash(%+v)", *p)
 }
 
 func (p *XxHash) Validate() error {
-  return nil
+	return nil
 }
+
 // The hash function used in Bloom filter. This function takes the hash of a column value
 // using plain encoding.
-// 
-// 
+//
 // Attributes:
-//  - XXHASH: xxHash Strategy. *
+//   - XXHASH: xxHash Strategy. *
 type BloomFilterHash struct {
-  XXHASH *XxHash `thrift:"XXHASH,1" db:"XXHASH" json:"XXHASH,omitempty"`
+	XXHASH *XxHash `thrift:"XXHASH,1" db:"XXHASH" json:"XXHASH,omitempty"`
 }
 
 func NewBloomFilterHash() *BloomFilterHash {
-  return &BloomFilterHash{}
+	return &BloomFilterHash{}
 }
 
 var BloomFilterHash_XXHASH_DEFAULT *XxHash
+
 func (p *BloomFilterHash) GetXXHASH() *XxHash {
-  if !p.IsSetXXHASH() {
-    return BloomFilterHash_XXHASH_DEFAULT
-  }
-return p.XXHASH
+	if !p.IsSetXXHASH() {
+		return BloomFilterHash_XXHASH_DEFAULT
+	}
+	return p.XXHASH
 }
 func (p *BloomFilterHash) CountSetFieldsBloomFilterHash() int {
-  count := 0
-  if (p.IsSetXXHASH()) {
-    count++
-  }
-  return count
+	count := 0
+	if p.IsSetXXHASH() {
+		count++
+	}
+	return count
 
 }
 
 func (p *BloomFilterHash) IsSetXXHASH() bool {
-  return p.XXHASH != nil
+	return p.XXHASH != nil
 }
 
 func (p *BloomFilterHash) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
-}
-
-func (p *BloomFilterHash)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  p.XXHASH = &XxHash{}
-  if err := p.XXHASH.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.XXHASH), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
+}
+
+func (p *BloomFilterHash) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	p.XXHASH = &XxHash{}
+	if err := p.XXHASH.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.XXHASH), err)
+	}
+	return nil
 }
 
 func (p *BloomFilterHash) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if c := p.CountSetFieldsBloomFilterHash(); c != 1 {
-    return fmt.Errorf("%T write union: exactly one field must be set (%d set)", p, c)
-  }
-  if err := oprot.WriteStructBegin(ctx, "BloomFilterHash"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if c := p.CountSetFieldsBloomFilterHash(); c != 1 {
+		return fmt.Errorf("%T write union: exactly one field must be set (%d set)", p, c)
+	}
+	if err := oprot.WriteStructBegin(ctx, "BloomFilterHash"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *BloomFilterHash) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetXXHASH() {
-    if err := oprot.WriteFieldBegin(ctx, "XXHASH", thrift.STRUCT, 1); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:XXHASH: ", p), err) }
-    if err := p.XXHASH.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.XXHASH), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:XXHASH: ", p), err) }
-  }
-  return err
+	if p.IsSetXXHASH() {
+		if err := oprot.WriteFieldBegin(ctx, "XXHASH", thrift.STRUCT, 1); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:XXHASH: ", p), err)
+		}
+		if err := p.XXHASH.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.XXHASH), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:XXHASH: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *BloomFilterHash) Equals(other *BloomFilterHash) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if !p.XXHASH.Equals(other.XXHASH) { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if !p.XXHASH.Equals(other.XXHASH) {
+		return false
+	}
+	return true
 }
 
 func (p *BloomFilterHash) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("BloomFilterHash(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("BloomFilterHash(%+v)", *p)
 }
 
 func (p *BloomFilterHash) Validate() error {
-  return nil
+	return nil
 }
+
 // The compression used in the Bloom filter.
-// 
 type Uncompressed struct {
 }
 
 func NewUncompressed() *Uncompressed {
-  return &Uncompressed{}
+	return &Uncompressed{}
 }
 
 func (p *Uncompressed) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *Uncompressed) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "Uncompressed"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "Uncompressed"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *Uncompressed) Equals(other *Uncompressed) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *Uncompressed) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("Uncompressed(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("Uncompressed(%+v)", *p)
 }
 
 func (p *Uncompressed) Validate() error {
-  return nil
+	return nil
 }
+
 // Attributes:
-//  - UNCOMPRESSED
+//   - UNCOMPRESSED
 type BloomFilterCompression struct {
-  UNCOMPRESSED *Uncompressed `thrift:"UNCOMPRESSED,1" db:"UNCOMPRESSED" json:"UNCOMPRESSED,omitempty"`
+	UNCOMPRESSED *Uncompressed `thrift:"UNCOMPRESSED,1" db:"UNCOMPRESSED" json:"UNCOMPRESSED,omitempty"`
 }
 
 func NewBloomFilterCompression() *BloomFilterCompression {
-  return &BloomFilterCompression{}
+	return &BloomFilterCompression{}
 }
 
 var BloomFilterCompression_UNCOMPRESSED_DEFAULT *Uncompressed
+
 func (p *BloomFilterCompression) GetUNCOMPRESSED() *Uncompressed {
-  if !p.IsSetUNCOMPRESSED() {
-    return BloomFilterCompression_UNCOMPRESSED_DEFAULT
-  }
-return p.UNCOMPRESSED
+	if !p.IsSetUNCOMPRESSED() {
+		return BloomFilterCompression_UNCOMPRESSED_DEFAULT
+	}
+	return p.UNCOMPRESSED
 }
 func (p *BloomFilterCompression) CountSetFieldsBloomFilterCompression() int {
-  count := 0
-  if (p.IsSetUNCOMPRESSED()) {
-    count++
-  }
-  return count
+	count := 0
+	if p.IsSetUNCOMPRESSED() {
+		count++
+	}
+	return count
 
 }
 
 func (p *BloomFilterCompression) IsSetUNCOMPRESSED() bool {
-  return p.UNCOMPRESSED != nil
+	return p.UNCOMPRESSED != nil
 }
 
 func (p *BloomFilterCompression) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
-}
-
-func (p *BloomFilterCompression)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  p.UNCOMPRESSED = &Uncompressed{}
-  if err := p.UNCOMPRESSED.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.UNCOMPRESSED), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
+}
+
+func (p *BloomFilterCompression) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	p.UNCOMPRESSED = &Uncompressed{}
+	if err := p.UNCOMPRESSED.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.UNCOMPRESSED), err)
+	}
+	return nil
 }
 
 func (p *BloomFilterCompression) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if c := p.CountSetFieldsBloomFilterCompression(); c != 1 {
-    return fmt.Errorf("%T write union: exactly one field must be set (%d set)", p, c)
-  }
-  if err := oprot.WriteStructBegin(ctx, "BloomFilterCompression"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if c := p.CountSetFieldsBloomFilterCompression(); c != 1 {
+		return fmt.Errorf("%T write union: exactly one field must be set (%d set)", p, c)
+	}
+	if err := oprot.WriteStructBegin(ctx, "BloomFilterCompression"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *BloomFilterCompression) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetUNCOMPRESSED() {
-    if err := oprot.WriteFieldBegin(ctx, "UNCOMPRESSED", thrift.STRUCT, 1); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:UNCOMPRESSED: ", p), err) }
-    if err := p.UNCOMPRESSED.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.UNCOMPRESSED), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:UNCOMPRESSED: ", p), err) }
-  }
-  return err
+	if p.IsSetUNCOMPRESSED() {
+		if err := oprot.WriteFieldBegin(ctx, "UNCOMPRESSED", thrift.STRUCT, 1); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:UNCOMPRESSED: ", p), err)
+		}
+		if err := p.UNCOMPRESSED.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.UNCOMPRESSED), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:UNCOMPRESSED: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *BloomFilterCompression) Equals(other *BloomFilterCompression) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if !p.UNCOMPRESSED.Equals(other.UNCOMPRESSED) { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if !p.UNCOMPRESSED.Equals(other.UNCOMPRESSED) {
+		return false
+	}
+	return true
 }
 
 func (p *BloomFilterCompression) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("BloomFilterCompression(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("BloomFilterCompression(%+v)", *p)
 }
 
 func (p *BloomFilterCompression) Validate() error {
-  return nil
+	return nil
 }
+
 // Bloom filter header is stored at beginning of Bloom filter data of each column
 // and followed by its bitset.
-// 
-// 
+//
 // Attributes:
-//  - NumBytes: The size of bitset in bytes *
-//  - Algorithm: The algorithm for setting bits. *
-//  - Hash: The hash function used for Bloom filter. *
-//  - Compression: The compression used in the Bloom filter *
+//   - NumBytes: The size of bitset in bytes *
+//   - Algorithm: The algorithm for setting bits. *
+//   - Hash: The hash function used for Bloom filter. *
+//   - Compression: The compression used in the Bloom filter *
 type BloomFilterHeader struct {
-  NumBytes int32 `thrift:"numBytes,1,required" db:"numBytes" json:"numBytes"`
-  Algorithm *BloomFilterAlgorithm `thrift:"algorithm,2,required" db:"algorithm" json:"algorithm"`
-  Hash *BloomFilterHash `thrift:"hash,3,required" db:"hash" json:"hash"`
-  Compression *BloomFilterCompression `thrift:"compression,4,required" db:"compression" json:"compression"`
+	NumBytes    int32                   `thrift:"numBytes,1,required" db:"numBytes" json:"numBytes"`
+	Algorithm   *BloomFilterAlgorithm   `thrift:"algorithm,2,required" db:"algorithm" json:"algorithm"`
+	Hash        *BloomFilterHash        `thrift:"hash,3,required" db:"hash" json:"hash"`
+	Compression *BloomFilterCompression `thrift:"compression,4,required" db:"compression" json:"compression"`
 }
 
 func NewBloomFilterHeader() *BloomFilterHeader {
-  return &BloomFilterHeader{}
+	return &BloomFilterHeader{}
 }
 
-
 func (p *BloomFilterHeader) GetNumBytes() int32 {
-  return p.NumBytes
+	return p.NumBytes
 }
+
 var BloomFilterHeader_Algorithm_DEFAULT *BloomFilterAlgorithm
+
 func (p *BloomFilterHeader) GetAlgorithm() *BloomFilterAlgorithm {
-  if !p.IsSetAlgorithm() {
-    return BloomFilterHeader_Algorithm_DEFAULT
-  }
-return p.Algorithm
+	if !p.IsSetAlgorithm() {
+		return BloomFilterHeader_Algorithm_DEFAULT
+	}
+	return p.Algorithm
 }
+
 var BloomFilterHeader_Hash_DEFAULT *BloomFilterHash
+
 func (p *BloomFilterHeader) GetHash() *BloomFilterHash {
-  if !p.IsSetHash() {
-    return BloomFilterHeader_Hash_DEFAULT
-  }
-return p.Hash
+	if !p.IsSetHash() {
+		return BloomFilterHeader_Hash_DEFAULT
+	}
+	return p.Hash
 }
+
 var BloomFilterHeader_Compression_DEFAULT *BloomFilterCompression
+
 func (p *BloomFilterHeader) GetCompression() *BloomFilterCompression {
-  if !p.IsSetCompression() {
-    return BloomFilterHeader_Compression_DEFAULT
-  }
-return p.Compression
+	if !p.IsSetCompression() {
+		return BloomFilterHeader_Compression_DEFAULT
+	}
+	return p.Compression
 }
 func (p *BloomFilterHeader) IsSetAlgorithm() bool {
-  return p.Algorithm != nil
+	return p.Algorithm != nil
 }
 
 func (p *BloomFilterHeader) IsSetHash() bool {
-  return p.Hash != nil
+	return p.Hash != nil
 }
 
 func (p *BloomFilterHeader) IsSetCompression() bool {
-  return p.Compression != nil
+	return p.Compression != nil
 }
 
 func (p *BloomFilterHeader) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetNumBytes bool = false;
-  var issetAlgorithm bool = false;
-  var issetHash bool = false;
-  var issetCompression bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetNumBytes = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-        issetAlgorithm = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-        issetHash = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 4:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField4(ctx, iprot); err != nil {
-          return err
-        }
-        issetCompression = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetNumBytes{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumBytes is not set"));
-  }
-  if !issetAlgorithm{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Algorithm is not set"));
-  }
-  if !issetHash{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Hash is not set"));
-  }
-  if !issetCompression{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Compression is not set"));
-  }
-  return nil
-}
-
-func (p *BloomFilterHeader)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  p.NumBytes = v
-}
-  return nil
-}
-
-func (p *BloomFilterHeader)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  p.Algorithm = &BloomFilterAlgorithm{}
-  if err := p.Algorithm.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Algorithm), err)
-  }
-  return nil
-}
-
-func (p *BloomFilterHeader)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  p.Hash = &BloomFilterHash{}
-  if err := p.Hash.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Hash), err)
-  }
-  return nil
-}
-
-func (p *BloomFilterHeader)  ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
-  p.Compression = &BloomFilterCompression{}
-  if err := p.Compression.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Compression), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetNumBytes bool = false
+	var issetAlgorithm bool = false
+	var issetHash bool = false
+	var issetCompression bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetNumBytes = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+				issetAlgorithm = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+				issetHash = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 4:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField4(ctx, iprot); err != nil {
+					return err
+				}
+				issetCompression = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetNumBytes {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumBytes is not set"))
+	}
+	if !issetAlgorithm {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Algorithm is not set"))
+	}
+	if !issetHash {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Hash is not set"))
+	}
+	if !issetCompression {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Compression is not set"))
+	}
+	return nil
+}
+
+func (p *BloomFilterHeader) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		p.NumBytes = v
+	}
+	return nil
+}
+
+func (p *BloomFilterHeader) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	p.Algorithm = &BloomFilterAlgorithm{}
+	if err := p.Algorithm.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Algorithm), err)
+	}
+	return nil
+}
+
+func (p *BloomFilterHeader) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	p.Hash = &BloomFilterHash{}
+	if err := p.Hash.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Hash), err)
+	}
+	return nil
+}
+
+func (p *BloomFilterHeader) ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
+	p.Compression = &BloomFilterCompression{}
+	if err := p.Compression.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Compression), err)
+	}
+	return nil
 }
 
 func (p *BloomFilterHeader) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "BloomFilterHeader"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-    if err := p.writeField4(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "BloomFilterHeader"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField4(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *BloomFilterHeader) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "numBytes", thrift.I32, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:numBytes: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.NumBytes)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.numBytes (1) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:numBytes: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "numBytes", thrift.I32, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:numBytes: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.NumBytes)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.numBytes (1) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:numBytes: ", p), err)
+	}
+	return err
 }
 
 func (p *BloomFilterHeader) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "algorithm", thrift.STRUCT, 2); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:algorithm: ", p), err) }
-  if err := p.Algorithm.Write(ctx, oprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Algorithm), err)
-  }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:algorithm: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "algorithm", thrift.STRUCT, 2); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:algorithm: ", p), err)
+	}
+	if err := p.Algorithm.Write(ctx, oprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Algorithm), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:algorithm: ", p), err)
+	}
+	return err
 }
 
 func (p *BloomFilterHeader) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "hash", thrift.STRUCT, 3); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:hash: ", p), err) }
-  if err := p.Hash.Write(ctx, oprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Hash), err)
-  }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:hash: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "hash", thrift.STRUCT, 3); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:hash: ", p), err)
+	}
+	if err := p.Hash.Write(ctx, oprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Hash), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:hash: ", p), err)
+	}
+	return err
 }
 
 func (p *BloomFilterHeader) writeField4(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "compression", thrift.STRUCT, 4); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:compression: ", p), err) }
-  if err := p.Compression.Write(ctx, oprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Compression), err)
-  }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:compression: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "compression", thrift.STRUCT, 4); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:compression: ", p), err)
+	}
+	if err := p.Compression.Write(ctx, oprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Compression), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:compression: ", p), err)
+	}
+	return err
 }
 
 func (p *BloomFilterHeader) Equals(other *BloomFilterHeader) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if p.NumBytes != other.NumBytes { return false }
-  if !p.Algorithm.Equals(other.Algorithm) { return false }
-  if !p.Hash.Equals(other.Hash) { return false }
-  if !p.Compression.Equals(other.Compression) { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if p.NumBytes != other.NumBytes {
+		return false
+	}
+	if !p.Algorithm.Equals(other.Algorithm) {
+		return false
+	}
+	if !p.Hash.Equals(other.Hash) {
+		return false
+	}
+	if !p.Compression.Equals(other.Compression) {
+		return false
+	}
+	return true
 }
 
 func (p *BloomFilterHeader) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("BloomFilterHeader(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("BloomFilterHeader(%+v)", *p)
 }
 
 func (p *BloomFilterHeader) Validate() error {
-  return nil
+	return nil
 }
+
 // Attributes:
-//  - Type: the type of the page: indicates which of the *_header fields is set *
-//  - UncompressedPageSize: Uncompressed page size in bytes (not including this header) *
-//  - CompressedPageSize: Compressed (and potentially encrypted) page size in bytes, not including this header *
-//  - Crc: The 32-bit CRC checksum for the page, to be be calculated as follows:
-// 
-// - The standard CRC32 algorithm is used (with polynomial 0x04C11DB7,
-//   the same as in e.g. GZip).
-// - All page types can have a CRC (v1 and v2 data pages, dictionary pages,
-//   etc.).
-// - The CRC is computed on the serialization binary representation of the page
-//   (as written to disk), excluding the page header. For example, for v1
-//   data pages, the CRC is computed on the concatenation of repetition levels,
-//   definition levels and column values (optionally compressed, optionally
-//   encrypted).
-// - The CRC computation therefore takes place after any compression
-//   and encryption steps, if any.
-// 
+//
+//   - Type: the type of the page: indicates which of the *_header fields is set *
+//
+//   - UncompressedPageSize: Uncompressed page size in bytes (not including this header) *
+//
+//   - CompressedPageSize: Compressed (and potentially encrypted) page size in bytes, not including this header *
+//
+//   - Crc: The 32-bit CRC checksum for the page, to be be calculated as follows:
+//
+//   - The standard CRC32 algorithm is used (with polynomial 0x04C11DB7,
+//     the same as in e.g. GZip).
+//
+//   - All page types can have a CRC (v1 and v2 data pages, dictionary pages,
+//     etc.).
+//
+//   - The CRC is computed on the serialization binary representation of the page
+//     (as written to disk), excluding the page header. For example, for v1
+//     data pages, the CRC is computed on the concatenation of repetition levels,
+//     definition levels and column values (optionally compressed, optionally
+//     encrypted).
+//
+//   - The CRC computation therefore takes place after any compression
+//     and encryption steps, if any.
+//
 // If enabled, this allows for disabling checksumming in HDFS if only a few
 // pages need to be read.
-//  - DataPageHeader
-//  - IndexPageHeader
-//  - DictionaryPageHeader
-//  - DataPageHeaderV2
+//   - DataPageHeader
+//   - IndexPageHeader
+//   - DictionaryPageHeader
+//   - DataPageHeaderV2
 type PageHeader struct {
-  Type PageType `thrift:"type,1,required" db:"type" json:"type"`
-  UncompressedPageSize int32 `thrift:"uncompressed_page_size,2,required" db:"uncompressed_page_size" json:"uncompressed_page_size"`
-  CompressedPageSize int32 `thrift:"compressed_page_size,3,required" db:"compressed_page_size" json:"compressed_page_size"`
-  Crc *int32 `thrift:"crc,4" db:"crc" json:"crc,omitempty"`
-  DataPageHeader *DataPageHeader `thrift:"data_page_header,5" db:"data_page_header" json:"data_page_header,omitempty"`
-  IndexPageHeader *IndexPageHeader `thrift:"index_page_header,6" db:"index_page_header" json:"index_page_header,omitempty"`
-  DictionaryPageHeader *DictionaryPageHeader `thrift:"dictionary_page_header,7" db:"dictionary_page_header" json:"dictionary_page_header,omitempty"`
-  DataPageHeaderV2 *DataPageHeaderV2 `thrift:"data_page_header_v2,8" db:"data_page_header_v2" json:"data_page_header_v2,omitempty"`
+	Type                 PageType              `thrift:"type,1,required" db:"type" json:"type"`
+	UncompressedPageSize int32                 `thrift:"uncompressed_page_size,2,required" db:"uncompressed_page_size" json:"uncompressed_page_size"`
+	CompressedPageSize   int32                 `thrift:"compressed_page_size,3,required" db:"compressed_page_size" json:"compressed_page_size"`
+	Crc                  *int32                `thrift:"crc,4" db:"crc" json:"crc,omitempty"`
+	DataPageHeader       *DataPageHeader       `thrift:"data_page_header,5" db:"data_page_header" json:"data_page_header,omitempty"`
+	IndexPageHeader      *IndexPageHeader      `thrift:"index_page_header,6" db:"index_page_header" json:"index_page_header,omitempty"`
+	DictionaryPageHeader *DictionaryPageHeader `thrift:"dictionary_page_header,7" db:"dictionary_page_header" json:"dictionary_page_header,omitempty"`
+	DataPageHeaderV2     *DataPageHeaderV2     `thrift:"data_page_header_v2,8" db:"data_page_header_v2" json:"data_page_header_v2,omitempty"`
 }
 
 func NewPageHeader() *PageHeader {
-  return &PageHeader{}
+	return &PageHeader{}
 }
 
-
 func (p *PageHeader) GetType() PageType {
-  return p.Type
+	return p.Type
 }
 
 func (p *PageHeader) GetUncompressedPageSize() int32 {
-  return p.UncompressedPageSize
+	return p.UncompressedPageSize
 }
 
 func (p *PageHeader) GetCompressedPageSize() int32 {
-  return p.CompressedPageSize
+	return p.CompressedPageSize
 }
+
 var PageHeader_Crc_DEFAULT int32
+
 func (p *PageHeader) GetCrc() int32 {
-  if !p.IsSetCrc() {
-    return PageHeader_Crc_DEFAULT
-  }
-return *p.Crc
+	if !p.IsSetCrc() {
+		return PageHeader_Crc_DEFAULT
+	}
+	return *p.Crc
 }
+
 var PageHeader_DataPageHeader_DEFAULT *DataPageHeader
+
 func (p *PageHeader) GetDataPageHeader() *DataPageHeader {
-  if !p.IsSetDataPageHeader() {
-    return PageHeader_DataPageHeader_DEFAULT
-  }
-return p.DataPageHeader
+	if !p.IsSetDataPageHeader() {
+		return PageHeader_DataPageHeader_DEFAULT
+	}
+	return p.DataPageHeader
 }
+
 var PageHeader_IndexPageHeader_DEFAULT *IndexPageHeader
+
 func (p *PageHeader) GetIndexPageHeader() *IndexPageHeader {
-  if !p.IsSetIndexPageHeader() {
-    return PageHeader_IndexPageHeader_DEFAULT
-  }
-return p.IndexPageHeader
+	if !p.IsSetIndexPageHeader() {
+		return PageHeader_IndexPageHeader_DEFAULT
+	}
+	return p.IndexPageHeader
 }
+
 var PageHeader_DictionaryPageHeader_DEFAULT *DictionaryPageHeader
+
 func (p *PageHeader) GetDictionaryPageHeader() *DictionaryPageHeader {
-  if !p.IsSetDictionaryPageHeader() {
-    return PageHeader_DictionaryPageHeader_DEFAULT
-  }
-return p.DictionaryPageHeader
+	if !p.IsSetDictionaryPageHeader() {
+		return PageHeader_DictionaryPageHeader_DEFAULT
+	}
+	return p.DictionaryPageHeader
 }
+
 var PageHeader_DataPageHeaderV2_DEFAULT *DataPageHeaderV2
+
 func (p *PageHeader) GetDataPageHeaderV2() *DataPageHeaderV2 {
-  if !p.IsSetDataPageHeaderV2() {
-    return PageHeader_DataPageHeaderV2_DEFAULT
-  }
-return p.DataPageHeaderV2
+	if !p.IsSetDataPageHeaderV2() {
+		return PageHeader_DataPageHeaderV2_DEFAULT
+	}
+	return p.DataPageHeaderV2
 }
 func (p *PageHeader) IsSetCrc() bool {
-  return p.Crc != nil
+	return p.Crc != nil
 }
 
 func (p *PageHeader) IsSetDataPageHeader() bool {
-  return p.DataPageHeader != nil
+	return p.DataPageHeader != nil
 }
 
 func (p *PageHeader) IsSetIndexPageHeader() bool {
-  return p.IndexPageHeader != nil
+	return p.IndexPageHeader != nil
 }
 
 func (p *PageHeader) IsSetDictionaryPageHeader() bool {
-  return p.DictionaryPageHeader != nil
+	return p.DictionaryPageHeader != nil
 }
 
 func (p *PageHeader) IsSetDataPageHeaderV2() bool {
-  return p.DataPageHeaderV2 != nil
+	return p.DataPageHeaderV2 != nil
 }
 
 func (p *PageHeader) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetType bool = false;
-  var issetUncompressedPageSize bool = false;
-  var issetCompressedPageSize bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetType = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-        issetUncompressedPageSize = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-        issetCompressedPageSize = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 4:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField4(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 5:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField5(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 6:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField6(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 7:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField7(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 8:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField8(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetType{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Type is not set"));
-  }
-  if !issetUncompressedPageSize{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field UncompressedPageSize is not set"));
-  }
-  if !issetCompressedPageSize{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field CompressedPageSize is not set"));
-  }
-  return nil
-}
-
-func (p *PageHeader)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  temp := PageType(v)
-  p.Type = temp
-}
-  return nil
-}
-
-func (p *PageHeader)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  p.UncompressedPageSize = v
-}
-  return nil
-}
-
-func (p *PageHeader)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 3: ", err)
-} else {
-  p.CompressedPageSize = v
-}
-  return nil
-}
-
-func (p *PageHeader)  ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 4: ", err)
-} else {
-  p.Crc = &v
-}
-  return nil
-}
-
-func (p *PageHeader)  ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
-  p.DataPageHeader = &DataPageHeader{}
-  if err := p.DataPageHeader.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DataPageHeader), err)
-  }
-  return nil
-}
-
-func (p *PageHeader)  ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
-  p.IndexPageHeader = &IndexPageHeader{}
-  if err := p.IndexPageHeader.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.IndexPageHeader), err)
-  }
-  return nil
-}
-
-func (p *PageHeader)  ReadField7(ctx context.Context, iprot thrift.TProtocol) error {
-  p.DictionaryPageHeader = &DictionaryPageHeader{}
-  if err := p.DictionaryPageHeader.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DictionaryPageHeader), err)
-  }
-  return nil
-}
-
-func (p *PageHeader)  ReadField8(ctx context.Context, iprot thrift.TProtocol) error {
-  p.DataPageHeaderV2 = &DataPageHeaderV2{
-  IsCompressed: true,
-}
-  if err := p.DataPageHeaderV2.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DataPageHeaderV2), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetType bool = false
+	var issetUncompressedPageSize bool = false
+	var issetCompressedPageSize bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetType = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+				issetUncompressedPageSize = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+				issetCompressedPageSize = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 4:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField4(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 5:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField5(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 6:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField6(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 7:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField7(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 8:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField8(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetType {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Type is not set"))
+	}
+	if !issetUncompressedPageSize {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field UncompressedPageSize is not set"))
+	}
+	if !issetCompressedPageSize {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field CompressedPageSize is not set"))
+	}
+	return nil
+}
+
+func (p *PageHeader) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		temp := PageType(v)
+		p.Type = temp
+	}
+	return nil
+}
+
+func (p *PageHeader) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		p.UncompressedPageSize = v
+	}
+	return nil
+}
+
+func (p *PageHeader) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 3: ", err)
+	} else {
+		p.CompressedPageSize = v
+	}
+	return nil
+}
+
+func (p *PageHeader) ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 4: ", err)
+	} else {
+		p.Crc = &v
+	}
+	return nil
+}
+
+func (p *PageHeader) ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
+	p.DataPageHeader = &DataPageHeader{}
+	if err := p.DataPageHeader.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DataPageHeader), err)
+	}
+	return nil
+}
+
+func (p *PageHeader) ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
+	p.IndexPageHeader = &IndexPageHeader{}
+	if err := p.IndexPageHeader.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.IndexPageHeader), err)
+	}
+	return nil
+}
+
+func (p *PageHeader) ReadField7(ctx context.Context, iprot thrift.TProtocol) error {
+	p.DictionaryPageHeader = &DictionaryPageHeader{}
+	if err := p.DictionaryPageHeader.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DictionaryPageHeader), err)
+	}
+	return nil
+}
+
+func (p *PageHeader) ReadField8(ctx context.Context, iprot thrift.TProtocol) error {
+	p.DataPageHeaderV2 = &DataPageHeaderV2{
+		IsCompressed: true,
+	}
+	if err := p.DataPageHeaderV2.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.DataPageHeaderV2), err)
+	}
+	return nil
 }
 
 func (p *PageHeader) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "PageHeader"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-    if err := p.writeField4(ctx, oprot); err != nil { return err }
-    if err := p.writeField5(ctx, oprot); err != nil { return err }
-    if err := p.writeField6(ctx, oprot); err != nil { return err }
-    if err := p.writeField7(ctx, oprot); err != nil { return err }
-    if err := p.writeField8(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "PageHeader"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField4(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField5(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField6(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField7(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField8(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *PageHeader) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "type", thrift.I32, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:type: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.Type)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.type (1) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:type: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "type", thrift.I32, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:type: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.Type)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.type (1) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:type: ", p), err)
+	}
+	return err
 }
 
 func (p *PageHeader) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "uncompressed_page_size", thrift.I32, 2); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:uncompressed_page_size: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.UncompressedPageSize)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.uncompressed_page_size (2) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:uncompressed_page_size: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "uncompressed_page_size", thrift.I32, 2); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:uncompressed_page_size: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.UncompressedPageSize)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.uncompressed_page_size (2) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:uncompressed_page_size: ", p), err)
+	}
+	return err
 }
 
 func (p *PageHeader) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "compressed_page_size", thrift.I32, 3); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:compressed_page_size: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.CompressedPageSize)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.compressed_page_size (3) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:compressed_page_size: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "compressed_page_size", thrift.I32, 3); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:compressed_page_size: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.CompressedPageSize)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.compressed_page_size (3) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:compressed_page_size: ", p), err)
+	}
+	return err
 }
 
 func (p *PageHeader) writeField4(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetCrc() {
-    if err := oprot.WriteFieldBegin(ctx, "crc", thrift.I32, 4); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:crc: ", p), err) }
-    if err := oprot.WriteI32(ctx, int32(*p.Crc)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.crc (4) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 4:crc: ", p), err) }
-  }
-  return err
+	if p.IsSetCrc() {
+		if err := oprot.WriteFieldBegin(ctx, "crc", thrift.I32, 4); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:crc: ", p), err)
+		}
+		if err := oprot.WriteI32(ctx, int32(*p.Crc)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.crc (4) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 4:crc: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *PageHeader) writeField5(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetDataPageHeader() {
-    if err := oprot.WriteFieldBegin(ctx, "data_page_header", thrift.STRUCT, 5); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:data_page_header: ", p), err) }
-    if err := p.DataPageHeader.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DataPageHeader), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 5:data_page_header: ", p), err) }
-  }
-  return err
+	if p.IsSetDataPageHeader() {
+		if err := oprot.WriteFieldBegin(ctx, "data_page_header", thrift.STRUCT, 5); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:data_page_header: ", p), err)
+		}
+		if err := p.DataPageHeader.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DataPageHeader), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 5:data_page_header: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *PageHeader) writeField6(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetIndexPageHeader() {
-    if err := oprot.WriteFieldBegin(ctx, "index_page_header", thrift.STRUCT, 6); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:index_page_header: ", p), err) }
-    if err := p.IndexPageHeader.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.IndexPageHeader), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 6:index_page_header: ", p), err) }
-  }
-  return err
+	if p.IsSetIndexPageHeader() {
+		if err := oprot.WriteFieldBegin(ctx, "index_page_header", thrift.STRUCT, 6); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:index_page_header: ", p), err)
+		}
+		if err := p.IndexPageHeader.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.IndexPageHeader), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 6:index_page_header: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *PageHeader) writeField7(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetDictionaryPageHeader() {
-    if err := oprot.WriteFieldBegin(ctx, "dictionary_page_header", thrift.STRUCT, 7); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:dictionary_page_header: ", p), err) }
-    if err := p.DictionaryPageHeader.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DictionaryPageHeader), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 7:dictionary_page_header: ", p), err) }
-  }
-  return err
+	if p.IsSetDictionaryPageHeader() {
+		if err := oprot.WriteFieldBegin(ctx, "dictionary_page_header", thrift.STRUCT, 7); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:dictionary_page_header: ", p), err)
+		}
+		if err := p.DictionaryPageHeader.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DictionaryPageHeader), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 7:dictionary_page_header: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *PageHeader) writeField8(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetDataPageHeaderV2() {
-    if err := oprot.WriteFieldBegin(ctx, "data_page_header_v2", thrift.STRUCT, 8); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:data_page_header_v2: ", p), err) }
-    if err := p.DataPageHeaderV2.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DataPageHeaderV2), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 8:data_page_header_v2: ", p), err) }
-  }
-  return err
+	if p.IsSetDataPageHeaderV2() {
+		if err := oprot.WriteFieldBegin(ctx, "data_page_header_v2", thrift.STRUCT, 8); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:data_page_header_v2: ", p), err)
+		}
+		if err := p.DataPageHeaderV2.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.DataPageHeaderV2), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 8:data_page_header_v2: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *PageHeader) Equals(other *PageHeader) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if p.Type != other.Type { return false }
-  if p.UncompressedPageSize != other.UncompressedPageSize { return false }
-  if p.CompressedPageSize != other.CompressedPageSize { return false }
-  if p.Crc != other.Crc {
-    if p.Crc == nil || other.Crc == nil {
-      return false
-    }
-    if (*p.Crc) != (*other.Crc) { return false }
-  }
-  if !p.DataPageHeader.Equals(other.DataPageHeader) { return false }
-  if !p.IndexPageHeader.Equals(other.IndexPageHeader) { return false }
-  if !p.DictionaryPageHeader.Equals(other.DictionaryPageHeader) { return false }
-  if !p.DataPageHeaderV2.Equals(other.DataPageHeaderV2) { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if p.Type != other.Type {
+		return false
+	}
+	if p.UncompressedPageSize != other.UncompressedPageSize {
+		return false
+	}
+	if p.CompressedPageSize != other.CompressedPageSize {
+		return false
+	}
+	if p.Crc != other.Crc {
+		if p.Crc == nil || other.Crc == nil {
+			return false
+		}
+		if (*p.Crc) != (*other.Crc) {
+			return false
+		}
+	}
+	if !p.DataPageHeader.Equals(other.DataPageHeader) {
+		return false
+	}
+	if !p.IndexPageHeader.Equals(other.IndexPageHeader) {
+		return false
+	}
+	if !p.DictionaryPageHeader.Equals(other.DictionaryPageHeader) {
+		return false
+	}
+	if !p.DataPageHeaderV2.Equals(other.DataPageHeaderV2) {
+		return false
+	}
+	return true
 }
 
 func (p *PageHeader) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("PageHeader(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("PageHeader(%+v)", *p)
 }
 
 func (p *PageHeader) Validate() error {
-  return nil
+	return nil
 }
+
 // Wrapper struct to store key values
-// 
+//
 // Attributes:
-//  - Key
-//  - Value
+//   - Key
+//   - Value
 type KeyValue struct {
-  Key string `thrift:"key,1,required" db:"key" json:"key"`
-  Value *string `thrift:"value,2" db:"value" json:"value,omitempty"`
+	Key   string  `thrift:"key,1,required" db:"key" json:"key"`
+	Value *string `thrift:"value,2" db:"value" json:"value,omitempty"`
 }
 
 func NewKeyValue() *KeyValue {
-  return &KeyValue{}
+	return &KeyValue{}
 }
 
-
 func (p *KeyValue) GetKey() string {
-  return p.Key
+	return p.Key
 }
+
 var KeyValue_Value_DEFAULT string
+
 func (p *KeyValue) GetValue() string {
-  if !p.IsSetValue() {
-    return KeyValue_Value_DEFAULT
-  }
-return *p.Value
+	if !p.IsSetValue() {
+		return KeyValue_Value_DEFAULT
+	}
+	return *p.Value
 }
 func (p *KeyValue) IsSetValue() bool {
-  return p.Value != nil
+	return p.Value != nil
 }
 
 func (p *KeyValue) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetKey bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.STRING {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetKey = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.STRING {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetKey{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Key is not set"));
-  }
-  return nil
-}
-
-func (p *KeyValue)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadString(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  p.Key = v
-}
-  return nil
-}
-
-func (p *KeyValue)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadString(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  p.Value = &v
-}
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetKey bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.STRING {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetKey = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.STRING {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetKey {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Key is not set"))
+	}
+	return nil
+}
+
+func (p *KeyValue) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadString(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		p.Key = v
+	}
+	return nil
+}
+
+func (p *KeyValue) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadString(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		p.Value = &v
+	}
+	return nil
 }
 
 func (p *KeyValue) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "KeyValue"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "KeyValue"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *KeyValue) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "key", thrift.STRING, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err) }
-  if err := oprot.WriteString(ctx, string(p.Key)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.key (1) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "key", thrift.STRING, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:key: ", p), err)
+	}
+	if err := oprot.WriteString(ctx, string(p.Key)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.key (1) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:key: ", p), err)
+	}
+	return err
 }
 
 func (p *KeyValue) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetValue() {
-    if err := oprot.WriteFieldBegin(ctx, "value", thrift.STRING, 2); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:value: ", p), err) }
-    if err := oprot.WriteString(ctx, string(*p.Value)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.value (2) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:value: ", p), err) }
-  }
-  return err
+	if p.IsSetValue() {
+		if err := oprot.WriteFieldBegin(ctx, "value", thrift.STRING, 2); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:value: ", p), err)
+		}
+		if err := oprot.WriteString(ctx, string(*p.Value)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.value (2) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:value: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *KeyValue) Equals(other *KeyValue) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if p.Key != other.Key { return false }
-  if p.Value != other.Value {
-    if p.Value == nil || other.Value == nil {
-      return false
-    }
-    if (*p.Value) != (*other.Value) { return false }
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if p.Key != other.Key {
+		return false
+	}
+	if p.Value != other.Value {
+		if p.Value == nil || other.Value == nil {
+			return false
+		}
+		if (*p.Value) != (*other.Value) {
+			return false
+		}
+	}
+	return true
 }
 
 func (p *KeyValue) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("KeyValue(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("KeyValue(%+v)", *p)
 }
 
 func (p *KeyValue) Validate() error {
-  return nil
+	return nil
 }
+
 // Wrapper struct to specify sort order
-// 
+//
 // Attributes:
-//  - ColumnIdx: The column index (in this row group) *
-//  - Descending: If true, indicates this column is sorted in descending order. *
-//  - NullsFirst: If true, nulls will come before non-null values, otherwise,
+//   - ColumnIdx: The column index (in this row group) *
+//   - Descending: If true, indicates this column is sorted in descending order. *
+//   - NullsFirst: If true, nulls will come before non-null values, otherwise,
+//
 // nulls go at the end.
 type SortingColumn struct {
-  ColumnIdx int32 `thrift:"column_idx,1,required" db:"column_idx" json:"column_idx"`
-  Descending bool `thrift:"descending,2,required" db:"descending" json:"descending"`
-  NullsFirst bool `thrift:"nulls_first,3,required" db:"nulls_first" json:"nulls_first"`
+	ColumnIdx  int32 `thrift:"column_idx,1,required" db:"column_idx" json:"column_idx"`
+	Descending bool  `thrift:"descending,2,required" db:"descending" json:"descending"`
+	NullsFirst bool  `thrift:"nulls_first,3,required" db:"nulls_first" json:"nulls_first"`
 }
 
 func NewSortingColumn() *SortingColumn {
-  return &SortingColumn{}
+	return &SortingColumn{}
 }
 
-
 func (p *SortingColumn) GetColumnIdx() int32 {
-  return p.ColumnIdx
+	return p.ColumnIdx
 }
 
 func (p *SortingColumn) GetDescending() bool {
-  return p.Descending
+	return p.Descending
 }
 
 func (p *SortingColumn) GetNullsFirst() bool {
-  return p.NullsFirst
+	return p.NullsFirst
 }
 func (p *SortingColumn) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetColumnIdx bool = false;
-  var issetDescending bool = false;
-  var issetNullsFirst bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetColumnIdx = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.BOOL {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-        issetDescending = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.BOOL {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-        issetNullsFirst = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetColumnIdx{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field ColumnIdx is not set"));
-  }
-  if !issetDescending{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Descending is not set"));
-  }
-  if !issetNullsFirst{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NullsFirst is not set"));
-  }
-  return nil
-}
-
-func (p *SortingColumn)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  p.ColumnIdx = v
-}
-  return nil
-}
-
-func (p *SortingColumn)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBool(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  p.Descending = v
-}
-  return nil
-}
-
-func (p *SortingColumn)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBool(ctx); err != nil {
-  return thrift.PrependError("error reading field 3: ", err)
-} else {
-  p.NullsFirst = v
-}
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetColumnIdx bool = false
+	var issetDescending bool = false
+	var issetNullsFirst bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetColumnIdx = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.BOOL {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+				issetDescending = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.BOOL {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+				issetNullsFirst = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetColumnIdx {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field ColumnIdx is not set"))
+	}
+	if !issetDescending {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Descending is not set"))
+	}
+	if !issetNullsFirst {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NullsFirst is not set"))
+	}
+	return nil
+}
+
+func (p *SortingColumn) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		p.ColumnIdx = v
+	}
+	return nil
+}
+
+func (p *SortingColumn) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBool(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		p.Descending = v
+	}
+	return nil
+}
+
+func (p *SortingColumn) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBool(ctx); err != nil {
+		return thrift.PrependError("error reading field 3: ", err)
+	} else {
+		p.NullsFirst = v
+	}
+	return nil
 }
 
 func (p *SortingColumn) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "SortingColumn"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "SortingColumn"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *SortingColumn) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "column_idx", thrift.I32, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:column_idx: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.ColumnIdx)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.column_idx (1) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:column_idx: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "column_idx", thrift.I32, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:column_idx: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.ColumnIdx)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.column_idx (1) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:column_idx: ", p), err)
+	}
+	return err
 }
 
 func (p *SortingColumn) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "descending", thrift.BOOL, 2); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:descending: ", p), err) }
-  if err := oprot.WriteBool(ctx, bool(p.Descending)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.descending (2) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:descending: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "descending", thrift.BOOL, 2); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:descending: ", p), err)
+	}
+	if err := oprot.WriteBool(ctx, bool(p.Descending)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.descending (2) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:descending: ", p), err)
+	}
+	return err
 }
 
 func (p *SortingColumn) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "nulls_first", thrift.BOOL, 3); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:nulls_first: ", p), err) }
-  if err := oprot.WriteBool(ctx, bool(p.NullsFirst)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.nulls_first (3) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:nulls_first: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "nulls_first", thrift.BOOL, 3); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:nulls_first: ", p), err)
+	}
+	if err := oprot.WriteBool(ctx, bool(p.NullsFirst)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.nulls_first (3) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:nulls_first: ", p), err)
+	}
+	return err
 }
 
 func (p *SortingColumn) Equals(other *SortingColumn) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if p.ColumnIdx != other.ColumnIdx { return false }
-  if p.Descending != other.Descending { return false }
-  if p.NullsFirst != other.NullsFirst { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if p.ColumnIdx != other.ColumnIdx {
+		return false
+	}
+	if p.Descending != other.Descending {
+		return false
+	}
+	if p.NullsFirst != other.NullsFirst {
+		return false
+	}
+	return true
 }
 
 func (p *SortingColumn) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("SortingColumn(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("SortingColumn(%+v)", *p)
 }
 
 func (p *SortingColumn) Validate() error {
-  return nil
+	return nil
 }
+
 // statistics of a given page type and encoding
-// 
+//
 // Attributes:
-//  - PageType: the page type (data/dic/...) *
-//  - Encoding: encoding of the page *
-//  - Count: number of pages of this type with this encoding *
+//   - PageType: the page type (data/dic/...) *
+//   - Encoding: encoding of the page *
+//   - Count: number of pages of this type with this encoding *
 type PageEncodingStats struct {
-  PageType PageType `thrift:"page_type,1,required" db:"page_type" json:"page_type"`
-  Encoding Encoding `thrift:"encoding,2,required" db:"encoding" json:"encoding"`
-  Count int32 `thrift:"count,3,required" db:"count" json:"count"`
+	PageType PageType `thrift:"page_type,1,required" db:"page_type" json:"page_type"`
+	Encoding Encoding `thrift:"encoding,2,required" db:"encoding" json:"encoding"`
+	Count    int32    `thrift:"count,3,required" db:"count" json:"count"`
 }
 
 func NewPageEncodingStats() *PageEncodingStats {
-  return &PageEncodingStats{}
+	return &PageEncodingStats{}
 }
 
-
 func (p *PageEncodingStats) GetPageType() PageType {
-  return p.PageType
+	return p.PageType
 }
 
 func (p *PageEncodingStats) GetEncoding() Encoding {
-  return p.Encoding
+	return p.Encoding
 }
 
 func (p *PageEncodingStats) GetCount() int32 {
-  return p.Count
+	return p.Count
 }
 func (p *PageEncodingStats) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetPageType bool = false;
-  var issetEncoding bool = false;
-  var issetCount bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetPageType = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-        issetEncoding = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-        issetCount = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetPageType{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field PageType is not set"));
-  }
-  if !issetEncoding{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Encoding is not set"));
-  }
-  if !issetCount{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Count is not set"));
-  }
-  return nil
-}
-
-func (p *PageEncodingStats)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  temp := PageType(v)
-  p.PageType = temp
-}
-  return nil
-}
-
-func (p *PageEncodingStats)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  temp := Encoding(v)
-  p.Encoding = temp
-}
-  return nil
-}
-
-func (p *PageEncodingStats)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 3: ", err)
-} else {
-  p.Count = v
-}
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetPageType bool = false
+	var issetEncoding bool = false
+	var issetCount bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetPageType = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+				issetEncoding = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+				issetCount = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetPageType {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field PageType is not set"))
+	}
+	if !issetEncoding {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Encoding is not set"))
+	}
+	if !issetCount {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Count is not set"))
+	}
+	return nil
+}
+
+func (p *PageEncodingStats) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		temp := PageType(v)
+		p.PageType = temp
+	}
+	return nil
+}
+
+func (p *PageEncodingStats) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		temp := Encoding(v)
+		p.Encoding = temp
+	}
+	return nil
+}
+
+func (p *PageEncodingStats) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 3: ", err)
+	} else {
+		p.Count = v
+	}
+	return nil
 }
 
 func (p *PageEncodingStats) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "PageEncodingStats"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "PageEncodingStats"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *PageEncodingStats) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "page_type", thrift.I32, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:page_type: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.PageType)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.page_type (1) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:page_type: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "page_type", thrift.I32, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:page_type: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.PageType)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.page_type (1) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:page_type: ", p), err)
+	}
+	return err
 }
 
 func (p *PageEncodingStats) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "encoding", thrift.I32, 2); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:encoding: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.Encoding)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.encoding (2) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:encoding: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "encoding", thrift.I32, 2); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:encoding: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.Encoding)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.encoding (2) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:encoding: ", p), err)
+	}
+	return err
 }
 
 func (p *PageEncodingStats) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "count", thrift.I32, 3); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:count: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.Count)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.count (3) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:count: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "count", thrift.I32, 3); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:count: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.Count)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.count (3) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:count: ", p), err)
+	}
+	return err
 }
 
 func (p *PageEncodingStats) Equals(other *PageEncodingStats) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if p.PageType != other.PageType { return false }
-  if p.Encoding != other.Encoding { return false }
-  if p.Count != other.Count { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if p.PageType != other.PageType {
+		return false
+	}
+	if p.Encoding != other.Encoding {
+		return false
+	}
+	if p.Count != other.Count {
+		return false
+	}
+	return true
 }
 
 func (p *PageEncodingStats) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("PageEncodingStats(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("PageEncodingStats(%+v)", *p)
 }
 
 func (p *PageEncodingStats) Validate() error {
-  return nil
+	return nil
 }
+
 // Description for column metadata
-// 
+//
 // Attributes:
-//  - Type: Type of this column *
-//  - Encodings: Set of all encodings used for this column. The purpose is to validate
+//   - Type: Type of this column *
+//   - Encodings: Set of all encodings used for this column. The purpose is to validate
+//
 // whether we can decode those pages. *
-//  - PathInSchema: Path in schema *
-//  - Codec: Compression codec *
-//  - NumValues: Number of values in this column *
-//  - TotalUncompressedSize: total byte size of all uncompressed pages in this column chunk (including the headers) *
-//  - TotalCompressedSize: total byte size of all compressed, and potentially encrypted, pages
+//   - PathInSchema: Path in schema *
+//   - Codec: Compression codec *
+//   - NumValues: Number of values in this column *
+//   - TotalUncompressedSize: total byte size of all uncompressed pages in this column chunk (including the headers) *
+//   - TotalCompressedSize: total byte size of all compressed, and potentially encrypted, pages
+//
 // in this column chunk (including the headers) *
-//  - KeyValueMetadata: Optional key/value metadata *
-//  - DataPageOffset: Byte offset from beginning of file to first data page *
-//  - IndexPageOffset: Byte offset from beginning of file to root index page *
-//  - DictionaryPageOffset: Byte offset from the beginning of file to first (only) dictionary page *
-//  - Statistics: optional statistics for this column chunk
-//  - EncodingStats: Set of all encodings used for pages in this column chunk.
+//   - KeyValueMetadata: Optional key/value metadata *
+//   - DataPageOffset: Byte offset from beginning of file to first data page *
+//   - IndexPageOffset: Byte offset from beginning of file to root index page *
+//   - DictionaryPageOffset: Byte offset from the beginning of file to first (only) dictionary page *
+//   - Statistics: optional statistics for this column chunk
+//   - EncodingStats: Set of all encodings used for pages in this column chunk.
+//
 // This information can be used to determine if all data pages are
 // dictionary encoded for example *
-//  - BloomFilterOffset: Byte offset from beginning of file to Bloom filter data. *
+//   - BloomFilterOffset: Byte offset from beginning of file to Bloom filter data. *
 type ColumnMetaData struct {
-  Type Type `thrift:"type,1,required" db:"type" json:"type"`
-  Encodings []Encoding `thrift:"encodings,2,required" db:"encodings" json:"encodings"`
-  PathInSchema []string `thrift:"path_in_schema,3,required" db:"path_in_schema" json:"path_in_schema"`
-  Codec CompressionCodec `thrift:"codec,4,required" db:"codec" json:"codec"`
-  NumValues int64 `thrift:"num_values,5,required" db:"num_values" json:"num_values"`
-  TotalUncompressedSize int64 `thrift:"total_uncompressed_size,6,required" db:"total_uncompressed_size" json:"total_uncompressed_size"`
-  TotalCompressedSize int64 `thrift:"total_compressed_size,7,required" db:"total_compressed_size" json:"total_compressed_size"`
-  KeyValueMetadata []*KeyValue `thrift:"key_value_metadata,8" db:"key_value_metadata" json:"key_value_metadata,omitempty"`
-  DataPageOffset int64 `thrift:"data_page_offset,9,required" db:"data_page_offset" json:"data_page_offset"`
-  IndexPageOffset *int64 `thrift:"index_page_offset,10" db:"index_page_offset" json:"index_page_offset,omitempty"`
-  DictionaryPageOffset *int64 `thrift:"dictionary_page_offset,11" db:"dictionary_page_offset" json:"dictionary_page_offset,omitempty"`
-  Statistics *Statistics `thrift:"statistics,12" db:"statistics" json:"statistics,omitempty"`
-  EncodingStats []*PageEncodingStats `thrift:"encoding_stats,13" db:"encoding_stats" json:"encoding_stats,omitempty"`
-  BloomFilterOffset *int64 `thrift:"bloom_filter_offset,14" db:"bloom_filter_offset" json:"bloom_filter_offset,omitempty"`
+	Type                  Type                 `thrift:"type,1,required" db:"type" json:"type"`
+	Encodings             []Encoding           `thrift:"encodings,2,required" db:"encodings" json:"encodings"`
+	PathInSchema          []string             `thrift:"path_in_schema,3,required" db:"path_in_schema" json:"path_in_schema"`
+	Codec                 CompressionCodec     `thrift:"codec,4,required" db:"codec" json:"codec"`
+	NumValues             int64                `thrift:"num_values,5,required" db:"num_values" json:"num_values"`
+	TotalUncompressedSize int64                `thrift:"total_uncompressed_size,6,required" db:"total_uncompressed_size" json:"total_uncompressed_size"`
+	TotalCompressedSize   int64                `thrift:"total_compressed_size,7,required" db:"total_compressed_size" json:"total_compressed_size"`
+	KeyValueMetadata      []*KeyValue          `thrift:"key_value_metadata,8" db:"key_value_metadata" json:"key_value_metadata,omitempty"`
+	DataPageOffset        int64                `thrift:"data_page_offset,9,required" db:"data_page_offset" json:"data_page_offset"`
+	IndexPageOffset       *int64               `thrift:"index_page_offset,10" db:"index_page_offset" json:"index_page_offset,omitempty"`
+	DictionaryPageOffset  *int64               `thrift:"dictionary_page_offset,11" db:"dictionary_page_offset" json:"dictionary_page_offset,omitempty"`
+	Statistics            *Statistics          `thrift:"statistics,12" db:"statistics" json:"statistics,omitempty"`
+	EncodingStats         []*PageEncodingStats `thrift:"encoding_stats,13" db:"encoding_stats" json:"encoding_stats,omitempty"`
+	BloomFilterOffset     *int64               `thrift:"bloom_filter_offset,14" db:"bloom_filter_offset" json:"bloom_filter_offset,omitempty"`
 }
 
 func NewColumnMetaData() *ColumnMetaData {
-  return &ColumnMetaData{}
+	return &ColumnMetaData{}
 }
 
-
 func (p *ColumnMetaData) GetType() Type {
-  return p.Type
+	return p.Type
 }
 
 func (p *ColumnMetaData) GetEncodings() []Encoding {
-  return p.Encodings
+	return p.Encodings
 }
 
 func (p *ColumnMetaData) GetPathInSchema() []string {
-  return p.PathInSchema
+	return p.PathInSchema
 }
 
 func (p *ColumnMetaData) GetCodec() CompressionCodec {
-  return p.Codec
+	return p.Codec
 }
 
 func (p *ColumnMetaData) GetNumValues() int64 {
-  return p.NumValues
+	return p.NumValues
 }
 
 func (p *ColumnMetaData) GetTotalUncompressedSize() int64 {
-  return p.TotalUncompressedSize
+	return p.TotalUncompressedSize
 }
 
 func (p *ColumnMetaData) GetTotalCompressedSize() int64 {
-  return p.TotalCompressedSize
+	return p.TotalCompressedSize
 }
+
 var ColumnMetaData_KeyValueMetadata_DEFAULT []*KeyValue
 
 func (p *ColumnMetaData) GetKeyValueMetadata() []*KeyValue {
-  return p.KeyValueMetadata
+	return p.KeyValueMetadata
 }
 
 func (p *ColumnMetaData) GetDataPageOffset() int64 {
-  return p.DataPageOffset
+	return p.DataPageOffset
 }
+
 var ColumnMetaData_IndexPageOffset_DEFAULT int64
+
 func (p *ColumnMetaData) GetIndexPageOffset() int64 {
-  if !p.IsSetIndexPageOffset() {
-    return ColumnMetaData_IndexPageOffset_DEFAULT
-  }
-return *p.IndexPageOffset
+	if !p.IsSetIndexPageOffset() {
+		return ColumnMetaData_IndexPageOffset_DEFAULT
+	}
+	return *p.IndexPageOffset
 }
+
 var ColumnMetaData_DictionaryPageOffset_DEFAULT int64
+
 func (p *ColumnMetaData) GetDictionaryPageOffset() int64 {
-  if !p.IsSetDictionaryPageOffset() {
-    return ColumnMetaData_DictionaryPageOffset_DEFAULT
-  }
-return *p.DictionaryPageOffset
+	if !p.IsSetDictionaryPageOffset() {
+		return ColumnMetaData_DictionaryPageOffset_DEFAULT
+	}
+	return *p.DictionaryPageOffset
 }
+
 var ColumnMetaData_Statistics_DEFAULT *Statistics
+
 func (p *ColumnMetaData) GetStatistics() *Statistics {
-  if !p.IsSetStatistics() {
-    return ColumnMetaData_Statistics_DEFAULT
-  }
-return p.Statistics
+	if !p.IsSetStatistics() {
+		return ColumnMetaData_Statistics_DEFAULT
+	}
+	return p.Statistics
 }
+
 var ColumnMetaData_EncodingStats_DEFAULT []*PageEncodingStats
 
 func (p *ColumnMetaData) GetEncodingStats() []*PageEncodingStats {
-  return p.EncodingStats
+	return p.EncodingStats
 }
+
 var ColumnMetaData_BloomFilterOffset_DEFAULT int64
+
 func (p *ColumnMetaData) GetBloomFilterOffset() int64 {
-  if !p.IsSetBloomFilterOffset() {
-    return ColumnMetaData_BloomFilterOffset_DEFAULT
-  }
-return *p.BloomFilterOffset
+	if !p.IsSetBloomFilterOffset() {
+		return ColumnMetaData_BloomFilterOffset_DEFAULT
+	}
+	return *p.BloomFilterOffset
 }
 func (p *ColumnMetaData) IsSetKeyValueMetadata() bool {
-  return p.KeyValueMetadata != nil
+	return p.KeyValueMetadata != nil
 }
 
 func (p *ColumnMetaData) IsSetIndexPageOffset() bool {
-  return p.IndexPageOffset != nil
+	return p.IndexPageOffset != nil
 }
 
 func (p *ColumnMetaData) IsSetDictionaryPageOffset() bool {
-  return p.DictionaryPageOffset != nil
+	return p.DictionaryPageOffset != nil
 }
 
 func (p *ColumnMetaData) IsSetStatistics() bool {
-  return p.Statistics != nil
+	return p.Statistics != nil
 }
 
 func (p *ColumnMetaData) IsSetEncodingStats() bool {
-  return p.EncodingStats != nil
+	return p.EncodingStats != nil
 }
 
 func (p *ColumnMetaData) IsSetBloomFilterOffset() bool {
-  return p.BloomFilterOffset != nil
+	return p.BloomFilterOffset != nil
 }
 
 func (p *ColumnMetaData) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetType bool = false;
-  var issetEncodings bool = false;
-  var issetPathInSchema bool = false;
-  var issetCodec bool = false;
-  var issetNumValues bool = false;
-  var issetTotalUncompressedSize bool = false;
-  var issetTotalCompressedSize bool = false;
-  var issetDataPageOffset bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetType = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.LIST {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-        issetEncodings = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.LIST {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-        issetPathInSchema = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 4:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField4(ctx, iprot); err != nil {
-          return err
-        }
-        issetCodec = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 5:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField5(ctx, iprot); err != nil {
-          return err
-        }
-        issetNumValues = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 6:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField6(ctx, iprot); err != nil {
-          return err
-        }
-        issetTotalUncompressedSize = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 7:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField7(ctx, iprot); err != nil {
-          return err
-        }
-        issetTotalCompressedSize = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 8:
-      if fieldTypeId == thrift.LIST {
-        if err := p.ReadField8(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 9:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField9(ctx, iprot); err != nil {
-          return err
-        }
-        issetDataPageOffset = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 10:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField10(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 11:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField11(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 12:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField12(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 13:
-      if fieldTypeId == thrift.LIST {
-        if err := p.ReadField13(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 14:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField14(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetType{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Type is not set"));
-  }
-  if !issetEncodings{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Encodings is not set"));
-  }
-  if !issetPathInSchema{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field PathInSchema is not set"));
-  }
-  if !issetCodec{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Codec is not set"));
-  }
-  if !issetNumValues{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumValues is not set"));
-  }
-  if !issetTotalUncompressedSize{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field TotalUncompressedSize is not set"));
-  }
-  if !issetTotalCompressedSize{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field TotalCompressedSize is not set"));
-  }
-  if !issetDataPageOffset{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field DataPageOffset is not set"));
-  }
-  return nil
-}
-
-func (p *ColumnMetaData)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  temp := Type(v)
-  p.Type = temp
-}
-  return nil
-}
-
-func (p *ColumnMetaData)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  _, size, err := iprot.ReadListBegin(ctx)
-  if err != nil {
-    return thrift.PrependError("error reading list begin: ", err)
-  }
-  tSlice := make([]Encoding, 0, size)
-  p.Encodings =  tSlice
-  for i := 0; i < size; i ++ {
-var _elem0 Encoding
-    if v, err := iprot.ReadI32(ctx); err != nil {
-    return thrift.PrependError("error reading field 0: ", err)
-} else {
-    temp := Encoding(v)
-    _elem0 = temp
-}
-    p.Encodings = append(p.Encodings, _elem0)
-  }
-  if err := iprot.ReadListEnd(ctx); err != nil {
-    return thrift.PrependError("error reading list end: ", err)
-  }
-  return nil
-}
-
-func (p *ColumnMetaData)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  _, size, err := iprot.ReadListBegin(ctx)
-  if err != nil {
-    return thrift.PrependError("error reading list begin: ", err)
-  }
-  tSlice := make([]string, 0, size)
-  p.PathInSchema =  tSlice
-  for i := 0; i < size; i ++ {
-var _elem1 string
-    if v, err := iprot.ReadString(ctx); err != nil {
-    return thrift.PrependError("error reading field 0: ", err)
-} else {
-    _elem1 = v
-}
-    p.PathInSchema = append(p.PathInSchema, _elem1)
-  }
-  if err := iprot.ReadListEnd(ctx); err != nil {
-    return thrift.PrependError("error reading list end: ", err)
-  }
-  return nil
-}
-
-func (p *ColumnMetaData)  ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 4: ", err)
-} else {
-  temp := CompressionCodec(v)
-  p.Codec = temp
-}
-  return nil
-}
-
-func (p *ColumnMetaData)  ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 5: ", err)
-} else {
-  p.NumValues = v
-}
-  return nil
-}
-
-func (p *ColumnMetaData)  ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 6: ", err)
-} else {
-  p.TotalUncompressedSize = v
-}
-  return nil
-}
-
-func (p *ColumnMetaData)  ReadField7(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 7: ", err)
-} else {
-  p.TotalCompressedSize = v
-}
-  return nil
-}
-
-func (p *ColumnMetaData)  ReadField8(ctx context.Context, iprot thrift.TProtocol) error {
-  _, size, err := iprot.ReadListBegin(ctx)
-  if err != nil {
-    return thrift.PrependError("error reading list begin: ", err)
-  }
-  tSlice := make([]*KeyValue, 0, size)
-  p.KeyValueMetadata =  tSlice
-  for i := 0; i < size; i ++ {
-    _elem2 := &KeyValue{}
-    if err := _elem2.Read(ctx, iprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem2), err)
-    }
-    p.KeyValueMetadata = append(p.KeyValueMetadata, _elem2)
-  }
-  if err := iprot.ReadListEnd(ctx); err != nil {
-    return thrift.PrependError("error reading list end: ", err)
-  }
-  return nil
-}
-
-func (p *ColumnMetaData)  ReadField9(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 9: ", err)
-} else {
-  p.DataPageOffset = v
-}
-  return nil
-}
-
-func (p *ColumnMetaData)  ReadField10(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 10: ", err)
-} else {
-  p.IndexPageOffset = &v
-}
-  return nil
-}
-
-func (p *ColumnMetaData)  ReadField11(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 11: ", err)
-} else {
-  p.DictionaryPageOffset = &v
-}
-  return nil
-}
-
-func (p *ColumnMetaData)  ReadField12(ctx context.Context, iprot thrift.TProtocol) error {
-  p.Statistics = &Statistics{}
-  if err := p.Statistics.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Statistics), err)
-  }
-  return nil
-}
-
-func (p *ColumnMetaData)  ReadField13(ctx context.Context, iprot thrift.TProtocol) error {
-  _, size, err := iprot.ReadListBegin(ctx)
-  if err != nil {
-    return thrift.PrependError("error reading list begin: ", err)
-  }
-  tSlice := make([]*PageEncodingStats, 0, size)
-  p.EncodingStats =  tSlice
-  for i := 0; i < size; i ++ {
-    _elem3 := &PageEncodingStats{}
-    if err := _elem3.Read(ctx, iprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem3), err)
-    }
-    p.EncodingStats = append(p.EncodingStats, _elem3)
-  }
-  if err := iprot.ReadListEnd(ctx); err != nil {
-    return thrift.PrependError("error reading list end: ", err)
-  }
-  return nil
-}
-
-func (p *ColumnMetaData)  ReadField14(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 14: ", err)
-} else {
-  p.BloomFilterOffset = &v
-}
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetType bool = false
+	var issetEncodings bool = false
+	var issetPathInSchema bool = false
+	var issetCodec bool = false
+	var issetNumValues bool = false
+	var issetTotalUncompressedSize bool = false
+	var issetTotalCompressedSize bool = false
+	var issetDataPageOffset bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetType = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.LIST {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+				issetEncodings = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.LIST {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+				issetPathInSchema = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 4:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField4(ctx, iprot); err != nil {
+					return err
+				}
+				issetCodec = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 5:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField5(ctx, iprot); err != nil {
+					return err
+				}
+				issetNumValues = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 6:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField6(ctx, iprot); err != nil {
+					return err
+				}
+				issetTotalUncompressedSize = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 7:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField7(ctx, iprot); err != nil {
+					return err
+				}
+				issetTotalCompressedSize = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 8:
+			if fieldTypeId == thrift.LIST {
+				if err := p.ReadField8(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 9:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField9(ctx, iprot); err != nil {
+					return err
+				}
+				issetDataPageOffset = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 10:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField10(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 11:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField11(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 12:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField12(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 13:
+			if fieldTypeId == thrift.LIST {
+				if err := p.ReadField13(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 14:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField14(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetType {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Type is not set"))
+	}
+	if !issetEncodings {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Encodings is not set"))
+	}
+	if !issetPathInSchema {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field PathInSchema is not set"))
+	}
+	if !issetCodec {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Codec is not set"))
+	}
+	if !issetNumValues {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumValues is not set"))
+	}
+	if !issetTotalUncompressedSize {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field TotalUncompressedSize is not set"))
+	}
+	if !issetTotalCompressedSize {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field TotalCompressedSize is not set"))
+	}
+	if !issetDataPageOffset {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field DataPageOffset is not set"))
+	}
+	return nil
+}
+
+func (p *ColumnMetaData) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		temp := Type(v)
+		p.Type = temp
+	}
+	return nil
+}
+
+func (p *ColumnMetaData) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	_, size, err := iprot.ReadListBegin(ctx)
+	if err != nil {
+		return thrift.PrependError("error reading list begin: ", err)
+	}
+	tSlice := make([]Encoding, 0, size)
+	p.Encodings = tSlice
+	for i := 0; i < size; i++ {
+		var _elem0 Encoding
+		if v, err := iprot.ReadI32(ctx); err != nil {
+			return thrift.PrependError("error reading field 0: ", err)
+		} else {
+			temp := Encoding(v)
+			_elem0 = temp
+		}
+		p.Encodings = append(p.Encodings, _elem0)
+	}
+	if err := iprot.ReadListEnd(ctx); err != nil {
+		return thrift.PrependError("error reading list end: ", err)
+	}
+	return nil
+}
+
+func (p *ColumnMetaData) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	_, size, err := iprot.ReadListBegin(ctx)
+	if err != nil {
+		return thrift.PrependError("error reading list begin: ", err)
+	}
+	tSlice := make([]string, 0, size)
+	p.PathInSchema = tSlice
+	for i := 0; i < size; i++ {
+		var _elem1 string
+		if v, err := iprot.ReadString(ctx); err != nil {
+			return thrift.PrependError("error reading field 0: ", err)
+		} else {
+			_elem1 = v
+		}
+		p.PathInSchema = append(p.PathInSchema, _elem1)
+	}
+	if err := iprot.ReadListEnd(ctx); err != nil {
+		return thrift.PrependError("error reading list end: ", err)
+	}
+	return nil
+}
+
+func (p *ColumnMetaData) ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 4: ", err)
+	} else {
+		temp := CompressionCodec(v)
+		p.Codec = temp
+	}
+	return nil
+}
+
+func (p *ColumnMetaData) ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 5: ", err)
+	} else {
+		p.NumValues = v
+	}
+	return nil
+}
+
+func (p *ColumnMetaData) ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 6: ", err)
+	} else {
+		p.TotalUncompressedSize = v
+	}
+	return nil
+}
+
+func (p *ColumnMetaData) ReadField7(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 7: ", err)
+	} else {
+		p.TotalCompressedSize = v
+	}
+	return nil
+}
+
+func (p *ColumnMetaData) ReadField8(ctx context.Context, iprot thrift.TProtocol) error {
+	_, size, err := iprot.ReadListBegin(ctx)
+	if err != nil {
+		return thrift.PrependError("error reading list begin: ", err)
+	}
+	tSlice := make([]*KeyValue, 0, size)
+	p.KeyValueMetadata = tSlice
+	for i := 0; i < size; i++ {
+		_elem2 := &KeyValue{}
+		if err := _elem2.Read(ctx, iprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem2), err)
+		}
+		p.KeyValueMetadata = append(p.KeyValueMetadata, _elem2)
+	}
+	if err := iprot.ReadListEnd(ctx); err != nil {
+		return thrift.PrependError("error reading list end: ", err)
+	}
+	return nil
+}
+
+func (p *ColumnMetaData) ReadField9(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 9: ", err)
+	} else {
+		p.DataPageOffset = v
+	}
+	return nil
+}
+
+func (p *ColumnMetaData) ReadField10(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 10: ", err)
+	} else {
+		p.IndexPageOffset = &v
+	}
+	return nil
+}
+
+func (p *ColumnMetaData) ReadField11(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 11: ", err)
+	} else {
+		p.DictionaryPageOffset = &v
+	}
+	return nil
+}
+
+func (p *ColumnMetaData) ReadField12(ctx context.Context, iprot thrift.TProtocol) error {
+	p.Statistics = &Statistics{}
+	if err := p.Statistics.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Statistics), err)
+	}
+	return nil
+}
+
+func (p *ColumnMetaData) ReadField13(ctx context.Context, iprot thrift.TProtocol) error {
+	_, size, err := iprot.ReadListBegin(ctx)
+	if err != nil {
+		return thrift.PrependError("error reading list begin: ", err)
+	}
+	tSlice := make([]*PageEncodingStats, 0, size)
+	p.EncodingStats = tSlice
+	for i := 0; i < size; i++ {
+		_elem3 := &PageEncodingStats{}
+		if err := _elem3.Read(ctx, iprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem3), err)
+		}
+		p.EncodingStats = append(p.EncodingStats, _elem3)
+	}
+	if err := iprot.ReadListEnd(ctx); err != nil {
+		return thrift.PrependError("error reading list end: ", err)
+	}
+	return nil
+}
+
+func (p *ColumnMetaData) ReadField14(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 14: ", err)
+	} else {
+		p.BloomFilterOffset = &v
+	}
+	return nil
 }
 
 func (p *ColumnMetaData) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "ColumnMetaData"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-    if err := p.writeField4(ctx, oprot); err != nil { return err }
-    if err := p.writeField5(ctx, oprot); err != nil { return err }
-    if err := p.writeField6(ctx, oprot); err != nil { return err }
-    if err := p.writeField7(ctx, oprot); err != nil { return err }
-    if err := p.writeField8(ctx, oprot); err != nil { return err }
-    if err := p.writeField9(ctx, oprot); err != nil { return err }
-    if err := p.writeField10(ctx, oprot); err != nil { return err }
-    if err := p.writeField11(ctx, oprot); err != nil { return err }
-    if err := p.writeField12(ctx, oprot); err != nil { return err }
-    if err := p.writeField13(ctx, oprot); err != nil { return err }
-    if err := p.writeField14(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "ColumnMetaData"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField4(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField5(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField6(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField7(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField8(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField9(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField10(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField11(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField12(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField13(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField14(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *ColumnMetaData) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "type", thrift.I32, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:type: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.Type)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.type (1) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:type: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "type", thrift.I32, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:type: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.Type)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.type (1) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:type: ", p), err)
+	}
+	return err
 }
 
 func (p *ColumnMetaData) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "encodings", thrift.LIST, 2); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:encodings: ", p), err) }
-  if err := oprot.WriteListBegin(ctx, thrift.I32, len(p.Encodings)); err != nil {
-    return thrift.PrependError("error writing list begin: ", err)
-  }
-  for _, v := range p.Encodings {
-    if err := oprot.WriteI32(ctx, int32(v)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
-  }
-  if err := oprot.WriteListEnd(ctx); err != nil {
-    return thrift.PrependError("error writing list end: ", err)
-  }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:encodings: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "encodings", thrift.LIST, 2); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:encodings: ", p), err)
+	}
+	if err := oprot.WriteListBegin(ctx, thrift.I32, len(p.Encodings)); err != nil {
+		return thrift.PrependError("error writing list begin: ", err)
+	}
+	for _, v := range p.Encodings {
+		if err := oprot.WriteI32(ctx, int32(v)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
+		}
+	}
+	if err := oprot.WriteListEnd(ctx); err != nil {
+		return thrift.PrependError("error writing list end: ", err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:encodings: ", p), err)
+	}
+	return err
 }
 
 func (p *ColumnMetaData) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "path_in_schema", thrift.LIST, 3); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:path_in_schema: ", p), err) }
-  if err := oprot.WriteListBegin(ctx, thrift.STRING, len(p.PathInSchema)); err != nil {
-    return thrift.PrependError("error writing list begin: ", err)
-  }
-  for _, v := range p.PathInSchema {
-    if err := oprot.WriteString(ctx, string(v)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
-  }
-  if err := oprot.WriteListEnd(ctx); err != nil {
-    return thrift.PrependError("error writing list end: ", err)
-  }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:path_in_schema: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "path_in_schema", thrift.LIST, 3); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:path_in_schema: ", p), err)
+	}
+	if err := oprot.WriteListBegin(ctx, thrift.STRING, len(p.PathInSchema)); err != nil {
+		return thrift.PrependError("error writing list begin: ", err)
+	}
+	for _, v := range p.PathInSchema {
+		if err := oprot.WriteString(ctx, string(v)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
+		}
+	}
+	if err := oprot.WriteListEnd(ctx); err != nil {
+		return thrift.PrependError("error writing list end: ", err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:path_in_schema: ", p), err)
+	}
+	return err
 }
 
 func (p *ColumnMetaData) writeField4(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "codec", thrift.I32, 4); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:codec: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.Codec)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.codec (4) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:codec: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "codec", thrift.I32, 4); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:codec: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.Codec)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.codec (4) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:codec: ", p), err)
+	}
+	return err
 }
 
 func (p *ColumnMetaData) writeField5(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "num_values", thrift.I64, 5); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:num_values: ", p), err) }
-  if err := oprot.WriteI64(ctx, int64(p.NumValues)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.num_values (5) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 5:num_values: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "num_values", thrift.I64, 5); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:num_values: ", p), err)
+	}
+	if err := oprot.WriteI64(ctx, int64(p.NumValues)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.num_values (5) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 5:num_values: ", p), err)
+	}
+	return err
 }
 
 func (p *ColumnMetaData) writeField6(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "total_uncompressed_size", thrift.I64, 6); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:total_uncompressed_size: ", p), err) }
-  if err := oprot.WriteI64(ctx, int64(p.TotalUncompressedSize)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.total_uncompressed_size (6) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 6:total_uncompressed_size: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "total_uncompressed_size", thrift.I64, 6); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:total_uncompressed_size: ", p), err)
+	}
+	if err := oprot.WriteI64(ctx, int64(p.TotalUncompressedSize)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.total_uncompressed_size (6) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 6:total_uncompressed_size: ", p), err)
+	}
+	return err
 }
 
 func (p *ColumnMetaData) writeField7(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "total_compressed_size", thrift.I64, 7); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:total_compressed_size: ", p), err) }
-  if err := oprot.WriteI64(ctx, int64(p.TotalCompressedSize)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.total_compressed_size (7) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 7:total_compressed_size: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "total_compressed_size", thrift.I64, 7); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:total_compressed_size: ", p), err)
+	}
+	if err := oprot.WriteI64(ctx, int64(p.TotalCompressedSize)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.total_compressed_size (7) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 7:total_compressed_size: ", p), err)
+	}
+	return err
 }
 
 func (p *ColumnMetaData) writeField8(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetKeyValueMetadata() {
-    if err := oprot.WriteFieldBegin(ctx, "key_value_metadata", thrift.LIST, 8); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:key_value_metadata: ", p), err) }
-    if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.KeyValueMetadata)); err != nil {
-      return thrift.PrependError("error writing list begin: ", err)
-    }
-    for _, v := range p.KeyValueMetadata {
-      if err := v.Write(ctx, oprot); err != nil {
-        return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-      }
-    }
-    if err := oprot.WriteListEnd(ctx); err != nil {
-      return thrift.PrependError("error writing list end: ", err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 8:key_value_metadata: ", p), err) }
-  }
-  return err
+	if p.IsSetKeyValueMetadata() {
+		if err := oprot.WriteFieldBegin(ctx, "key_value_metadata", thrift.LIST, 8); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:key_value_metadata: ", p), err)
+		}
+		if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.KeyValueMetadata)); err != nil {
+			return thrift.PrependError("error writing list begin: ", err)
+		}
+		for _, v := range p.KeyValueMetadata {
+			if err := v.Write(ctx, oprot); err != nil {
+				return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+			}
+		}
+		if err := oprot.WriteListEnd(ctx); err != nil {
+			return thrift.PrependError("error writing list end: ", err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 8:key_value_metadata: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnMetaData) writeField9(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "data_page_offset", thrift.I64, 9); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:data_page_offset: ", p), err) }
-  if err := oprot.WriteI64(ctx, int64(p.DataPageOffset)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.data_page_offset (9) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 9:data_page_offset: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "data_page_offset", thrift.I64, 9); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:data_page_offset: ", p), err)
+	}
+	if err := oprot.WriteI64(ctx, int64(p.DataPageOffset)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.data_page_offset (9) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 9:data_page_offset: ", p), err)
+	}
+	return err
 }
 
 func (p *ColumnMetaData) writeField10(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetIndexPageOffset() {
-    if err := oprot.WriteFieldBegin(ctx, "index_page_offset", thrift.I64, 10); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 10:index_page_offset: ", p), err) }
-    if err := oprot.WriteI64(ctx, int64(*p.IndexPageOffset)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.index_page_offset (10) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 10:index_page_offset: ", p), err) }
-  }
-  return err
+	if p.IsSetIndexPageOffset() {
+		if err := oprot.WriteFieldBegin(ctx, "index_page_offset", thrift.I64, 10); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 10:index_page_offset: ", p), err)
+		}
+		if err := oprot.WriteI64(ctx, int64(*p.IndexPageOffset)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.index_page_offset (10) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 10:index_page_offset: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnMetaData) writeField11(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetDictionaryPageOffset() {
-    if err := oprot.WriteFieldBegin(ctx, "dictionary_page_offset", thrift.I64, 11); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 11:dictionary_page_offset: ", p), err) }
-    if err := oprot.WriteI64(ctx, int64(*p.DictionaryPageOffset)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.dictionary_page_offset (11) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 11:dictionary_page_offset: ", p), err) }
-  }
-  return err
+	if p.IsSetDictionaryPageOffset() {
+		if err := oprot.WriteFieldBegin(ctx, "dictionary_page_offset", thrift.I64, 11); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 11:dictionary_page_offset: ", p), err)
+		}
+		if err := oprot.WriteI64(ctx, int64(*p.DictionaryPageOffset)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.dictionary_page_offset (11) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 11:dictionary_page_offset: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnMetaData) writeField12(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetStatistics() {
-    if err := oprot.WriteFieldBegin(ctx, "statistics", thrift.STRUCT, 12); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 12:statistics: ", p), err) }
-    if err := p.Statistics.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Statistics), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 12:statistics: ", p), err) }
-  }
-  return err
+	if p.IsSetStatistics() {
+		if err := oprot.WriteFieldBegin(ctx, "statistics", thrift.STRUCT, 12); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 12:statistics: ", p), err)
+		}
+		if err := p.Statistics.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Statistics), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 12:statistics: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnMetaData) writeField13(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetEncodingStats() {
-    if err := oprot.WriteFieldBegin(ctx, "encoding_stats", thrift.LIST, 13); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 13:encoding_stats: ", p), err) }
-    if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.EncodingStats)); err != nil {
-      return thrift.PrependError("error writing list begin: ", err)
-    }
-    for _, v := range p.EncodingStats {
-      if err := v.Write(ctx, oprot); err != nil {
-        return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-      }
-    }
-    if err := oprot.WriteListEnd(ctx); err != nil {
-      return thrift.PrependError("error writing list end: ", err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 13:encoding_stats: ", p), err) }
-  }
-  return err
+	if p.IsSetEncodingStats() {
+		if err := oprot.WriteFieldBegin(ctx, "encoding_stats", thrift.LIST, 13); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 13:encoding_stats: ", p), err)
+		}
+		if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.EncodingStats)); err != nil {
+			return thrift.PrependError("error writing list begin: ", err)
+		}
+		for _, v := range p.EncodingStats {
+			if err := v.Write(ctx, oprot); err != nil {
+				return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+			}
+		}
+		if err := oprot.WriteListEnd(ctx); err != nil {
+			return thrift.PrependError("error writing list end: ", err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 13:encoding_stats: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnMetaData) writeField14(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetBloomFilterOffset() {
-    if err := oprot.WriteFieldBegin(ctx, "bloom_filter_offset", thrift.I64, 14); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 14:bloom_filter_offset: ", p), err) }
-    if err := oprot.WriteI64(ctx, int64(*p.BloomFilterOffset)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.bloom_filter_offset (14) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 14:bloom_filter_offset: ", p), err) }
-  }
-  return err
+	if p.IsSetBloomFilterOffset() {
+		if err := oprot.WriteFieldBegin(ctx, "bloom_filter_offset", thrift.I64, 14); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 14:bloom_filter_offset: ", p), err)
+		}
+		if err := oprot.WriteI64(ctx, int64(*p.BloomFilterOffset)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.bloom_filter_offset (14) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 14:bloom_filter_offset: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnMetaData) Equals(other *ColumnMetaData) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if p.Type != other.Type { return false }
-  if len(p.Encodings) != len(other.Encodings) { return false }
-  for i, _tgt := range p.Encodings {
-    _src4 := other.Encodings[i]
-    if _tgt != _src4 { return false }
-  }
-  if len(p.PathInSchema) != len(other.PathInSchema) { return false }
-  for i, _tgt := range p.PathInSchema {
-    _src5 := other.PathInSchema[i]
-    if _tgt != _src5 { return false }
-  }
-  if p.Codec != other.Codec { return false }
-  if p.NumValues != other.NumValues { return false }
-  if p.TotalUncompressedSize != other.TotalUncompressedSize { return false }
-  if p.TotalCompressedSize != other.TotalCompressedSize { return false }
-  if len(p.KeyValueMetadata) != len(other.KeyValueMetadata) { return false }
-  for i, _tgt := range p.KeyValueMetadata {
-    _src6 := other.KeyValueMetadata[i]
-    if !_tgt.Equals(_src6) { return false }
-  }
-  if p.DataPageOffset != other.DataPageOffset { return false }
-  if p.IndexPageOffset != other.IndexPageOffset {
-    if p.IndexPageOffset == nil || other.IndexPageOffset == nil {
-      return false
-    }
-    if (*p.IndexPageOffset) != (*other.IndexPageOffset) { return false }
-  }
-  if p.DictionaryPageOffset != other.DictionaryPageOffset {
-    if p.DictionaryPageOffset == nil || other.DictionaryPageOffset == nil {
-      return false
-    }
-    if (*p.DictionaryPageOffset) != (*other.DictionaryPageOffset) { return false }
-  }
-  if !p.Statistics.Equals(other.Statistics) { return false }
-  if len(p.EncodingStats) != len(other.EncodingStats) { return false }
-  for i, _tgt := range p.EncodingStats {
-    _src7 := other.EncodingStats[i]
-    if !_tgt.Equals(_src7) { return false }
-  }
-  if p.BloomFilterOffset != other.BloomFilterOffset {
-    if p.BloomFilterOffset == nil || other.BloomFilterOffset == nil {
-      return false
-    }
-    if (*p.BloomFilterOffset) != (*other.BloomFilterOffset) { return false }
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if p.Type != other.Type {
+		return false
+	}
+	if len(p.Encodings) != len(other.Encodings) {
+		return false
+	}
+	for i, _tgt := range p.Encodings {
+		_src4 := other.Encodings[i]
+		if _tgt != _src4 {
+			return false
+		}
+	}
+	if len(p.PathInSchema) != len(other.PathInSchema) {
+		return false
+	}
+	for i, _tgt := range p.PathInSchema {
+		_src5 := other.PathInSchema[i]
+		if _tgt != _src5 {
+			return false
+		}
+	}
+	if p.Codec != other.Codec {
+		return false
+	}
+	if p.NumValues != other.NumValues {
+		return false
+	}
+	if p.TotalUncompressedSize != other.TotalUncompressedSize {
+		return false
+	}
+	if p.TotalCompressedSize != other.TotalCompressedSize {
+		return false
+	}
+	if len(p.KeyValueMetadata) != len(other.KeyValueMetadata) {
+		return false
+	}
+	for i, _tgt := range p.KeyValueMetadata {
+		_src6 := other.KeyValueMetadata[i]
+		if !_tgt.Equals(_src6) {
+			return false
+		}
+	}
+	if p.DataPageOffset != other.DataPageOffset {
+		return false
+	}
+	if p.IndexPageOffset != other.IndexPageOffset {
+		if p.IndexPageOffset == nil || other.IndexPageOffset == nil {
+			return false
+		}
+		if (*p.IndexPageOffset) != (*other.IndexPageOffset) {
+			return false
+		}
+	}
+	if p.DictionaryPageOffset != other.DictionaryPageOffset {
+		if p.DictionaryPageOffset == nil || other.DictionaryPageOffset == nil {
+			return false
+		}
+		if (*p.DictionaryPageOffset) != (*other.DictionaryPageOffset) {
+			return false
+		}
+	}
+	if !p.Statistics.Equals(other.Statistics) {
+		return false
+	}
+	if len(p.EncodingStats) != len(other.EncodingStats) {
+		return false
+	}
+	for i, _tgt := range p.EncodingStats {
+		_src7 := other.EncodingStats[i]
+		if !_tgt.Equals(_src7) {
+			return false
+		}
+	}
+	if p.BloomFilterOffset != other.BloomFilterOffset {
+		if p.BloomFilterOffset == nil || other.BloomFilterOffset == nil {
+			return false
+		}
+		if (*p.BloomFilterOffset) != (*other.BloomFilterOffset) {
+			return false
+		}
+	}
+	return true
 }
 
 func (p *ColumnMetaData) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("ColumnMetaData(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("ColumnMetaData(%+v)", *p)
 }
 
 func (p *ColumnMetaData) Validate() error {
-  return nil
+	return nil
 }
+
 type EncryptionWithFooterKey struct {
 }
 
 func NewEncryptionWithFooterKey() *EncryptionWithFooterKey {
-  return &EncryptionWithFooterKey{}
+	return &EncryptionWithFooterKey{}
 }
 
 func (p *EncryptionWithFooterKey) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *EncryptionWithFooterKey) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "EncryptionWithFooterKey"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "EncryptionWithFooterKey"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *EncryptionWithFooterKey) Equals(other *EncryptionWithFooterKey) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *EncryptionWithFooterKey) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("EncryptionWithFooterKey(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("EncryptionWithFooterKey(%+v)", *p)
 }
 
 func (p *EncryptionWithFooterKey) Validate() error {
-  return nil
+	return nil
 }
+
 // Attributes:
-//  - PathInSchema: Column path in schema *
-//  - KeyMetadata: Retrieval metadata of column encryption key *
+//   - PathInSchema: Column path in schema *
+//   - KeyMetadata: Retrieval metadata of column encryption key *
 type EncryptionWithColumnKey struct {
-  PathInSchema []string `thrift:"path_in_schema,1,required" db:"path_in_schema" json:"path_in_schema"`
-  KeyMetadata []byte `thrift:"key_metadata,2" db:"key_metadata" json:"key_metadata,omitempty"`
+	PathInSchema []string `thrift:"path_in_schema,1,required" db:"path_in_schema" json:"path_in_schema"`
+	KeyMetadata  []byte   `thrift:"key_metadata,2" db:"key_metadata" json:"key_metadata,omitempty"`
 }
 
 func NewEncryptionWithColumnKey() *EncryptionWithColumnKey {
-  return &EncryptionWithColumnKey{}
+	return &EncryptionWithColumnKey{}
 }
 
-
 func (p *EncryptionWithColumnKey) GetPathInSchema() []string {
-  return p.PathInSchema
+	return p.PathInSchema
 }
+
 var EncryptionWithColumnKey_KeyMetadata_DEFAULT []byte
 
 func (p *EncryptionWithColumnKey) GetKeyMetadata() []byte {
-  return p.KeyMetadata
+	return p.KeyMetadata
 }
 func (p *EncryptionWithColumnKey) IsSetKeyMetadata() bool {
-  return p.KeyMetadata != nil
+	return p.KeyMetadata != nil
 }
 
 func (p *EncryptionWithColumnKey) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetPathInSchema bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.LIST {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetPathInSchema = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.STRING {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetPathInSchema{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field PathInSchema is not set"));
-  }
-  return nil
-}
-
-func (p *EncryptionWithColumnKey)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  _, size, err := iprot.ReadListBegin(ctx)
-  if err != nil {
-    return thrift.PrependError("error reading list begin: ", err)
-  }
-  tSlice := make([]string, 0, size)
-  p.PathInSchema =  tSlice
-  for i := 0; i < size; i ++ {
-var _elem8 string
-    if v, err := iprot.ReadString(ctx); err != nil {
-    return thrift.PrependError("error reading field 0: ", err)
-} else {
-    _elem8 = v
-}
-    p.PathInSchema = append(p.PathInSchema, _elem8)
-  }
-  if err := iprot.ReadListEnd(ctx); err != nil {
-    return thrift.PrependError("error reading list end: ", err)
-  }
-  return nil
-}
-
-func (p *EncryptionWithColumnKey)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBinary(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  p.KeyMetadata = v
-}
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetPathInSchema bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.LIST {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetPathInSchema = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.STRING {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetPathInSchema {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field PathInSchema is not set"))
+	}
+	return nil
+}
+
+func (p *EncryptionWithColumnKey) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	_, size, err := iprot.ReadListBegin(ctx)
+	if err != nil {
+		return thrift.PrependError("error reading list begin: ", err)
+	}
+	tSlice := make([]string, 0, size)
+	p.PathInSchema = tSlice
+	for i := 0; i < size; i++ {
+		var _elem8 string
+		if v, err := iprot.ReadString(ctx); err != nil {
+			return thrift.PrependError("error reading field 0: ", err)
+		} else {
+			_elem8 = v
+		}
+		p.PathInSchema = append(p.PathInSchema, _elem8)
+	}
+	if err := iprot.ReadListEnd(ctx); err != nil {
+		return thrift.PrependError("error reading list end: ", err)
+	}
+	return nil
+}
+
+func (p *EncryptionWithColumnKey) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBinary(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		p.KeyMetadata = v
+	}
+	return nil
 }
 
 func (p *EncryptionWithColumnKey) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "EncryptionWithColumnKey"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "EncryptionWithColumnKey"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *EncryptionWithColumnKey) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "path_in_schema", thrift.LIST, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:path_in_schema: ", p), err) }
-  if err := oprot.WriteListBegin(ctx, thrift.STRING, len(p.PathInSchema)); err != nil {
-    return thrift.PrependError("error writing list begin: ", err)
-  }
-  for _, v := range p.PathInSchema {
-    if err := oprot.WriteString(ctx, string(v)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
-  }
-  if err := oprot.WriteListEnd(ctx); err != nil {
-    return thrift.PrependError("error writing list end: ", err)
-  }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:path_in_schema: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "path_in_schema", thrift.LIST, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:path_in_schema: ", p), err)
+	}
+	if err := oprot.WriteListBegin(ctx, thrift.STRING, len(p.PathInSchema)); err != nil {
+		return thrift.PrependError("error writing list begin: ", err)
+	}
+	for _, v := range p.PathInSchema {
+		if err := oprot.WriteString(ctx, string(v)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
+		}
+	}
+	if err := oprot.WriteListEnd(ctx); err != nil {
+		return thrift.PrependError("error writing list end: ", err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:path_in_schema: ", p), err)
+	}
+	return err
 }
 
 func (p *EncryptionWithColumnKey) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetKeyMetadata() {
-    if err := oprot.WriteFieldBegin(ctx, "key_metadata", thrift.STRING, 2); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:key_metadata: ", p), err) }
-    if err := oprot.WriteBinary(ctx, p.KeyMetadata); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.key_metadata (2) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:key_metadata: ", p), err) }
-  }
-  return err
+	if p.IsSetKeyMetadata() {
+		if err := oprot.WriteFieldBegin(ctx, "key_metadata", thrift.STRING, 2); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:key_metadata: ", p), err)
+		}
+		if err := oprot.WriteBinary(ctx, p.KeyMetadata); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.key_metadata (2) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:key_metadata: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *EncryptionWithColumnKey) Equals(other *EncryptionWithColumnKey) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if len(p.PathInSchema) != len(other.PathInSchema) { return false }
-  for i, _tgt := range p.PathInSchema {
-    _src9 := other.PathInSchema[i]
-    if _tgt != _src9 { return false }
-  }
-  if bytes.Compare(p.KeyMetadata, other.KeyMetadata) != 0 { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if len(p.PathInSchema) != len(other.PathInSchema) {
+		return false
+	}
+	for i, _tgt := range p.PathInSchema {
+		_src9 := other.PathInSchema[i]
+		if _tgt != _src9 {
+			return false
+		}
+	}
+	if bytes.Compare(p.KeyMetadata, other.KeyMetadata) != 0 {
+		return false
+	}
+	return true
 }
 
 func (p *EncryptionWithColumnKey) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("EncryptionWithColumnKey(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("EncryptionWithColumnKey(%+v)", *p)
 }
 
 func (p *EncryptionWithColumnKey) Validate() error {
-  return nil
+	return nil
 }
+
 // Attributes:
-//  - ENCRYPTION_WITH_FOOTER_KEY
-//  - ENCRYPTION_WITH_COLUMN_KEY
+//   - ENCRYPTION_WITH_FOOTER_KEY
+//   - ENCRYPTION_WITH_COLUMN_KEY
 type ColumnCryptoMetaData struct {
-  ENCRYPTION_WITH_FOOTER_KEY *EncryptionWithFooterKey `thrift:"ENCRYPTION_WITH_FOOTER_KEY,1" db:"ENCRYPTION_WITH_FOOTER_KEY" json:"ENCRYPTION_WITH_FOOTER_KEY,omitempty"`
-  ENCRYPTION_WITH_COLUMN_KEY *EncryptionWithColumnKey `thrift:"ENCRYPTION_WITH_COLUMN_KEY,2" db:"ENCRYPTION_WITH_COLUMN_KEY" json:"ENCRYPTION_WITH_COLUMN_KEY,omitempty"`
+	ENCRYPTION_WITH_FOOTER_KEY *EncryptionWithFooterKey `thrift:"ENCRYPTION_WITH_FOOTER_KEY,1" db:"ENCRYPTION_WITH_FOOTER_KEY" json:"ENCRYPTION_WITH_FOOTER_KEY,omitempty"`
+	ENCRYPTION_WITH_COLUMN_KEY *EncryptionWithColumnKey `thrift:"ENCRYPTION_WITH_COLUMN_KEY,2" db:"ENCRYPTION_WITH_COLUMN_KEY" json:"ENCRYPTION_WITH_COLUMN_KEY,omitempty"`
 }
 
 func NewColumnCryptoMetaData() *ColumnCryptoMetaData {
-  return &ColumnCryptoMetaData{}
+	return &ColumnCryptoMetaData{}
 }
 
 var ColumnCryptoMetaData_ENCRYPTION_WITH_FOOTER_KEY_DEFAULT *EncryptionWithFooterKey
+
 func (p *ColumnCryptoMetaData) GetENCRYPTION_WITH_FOOTER_KEY() *EncryptionWithFooterKey {
-  if !p.IsSetENCRYPTION_WITH_FOOTER_KEY() {
-    return ColumnCryptoMetaData_ENCRYPTION_WITH_FOOTER_KEY_DEFAULT
-  }
-return p.ENCRYPTION_WITH_FOOTER_KEY
+	if !p.IsSetENCRYPTION_WITH_FOOTER_KEY() {
+		return ColumnCryptoMetaData_ENCRYPTION_WITH_FOOTER_KEY_DEFAULT
+	}
+	return p.ENCRYPTION_WITH_FOOTER_KEY
 }
+
 var ColumnCryptoMetaData_ENCRYPTION_WITH_COLUMN_KEY_DEFAULT *EncryptionWithColumnKey
+
 func (p *ColumnCryptoMetaData) GetENCRYPTION_WITH_COLUMN_KEY() *EncryptionWithColumnKey {
-  if !p.IsSetENCRYPTION_WITH_COLUMN_KEY() {
-    return ColumnCryptoMetaData_ENCRYPTION_WITH_COLUMN_KEY_DEFAULT
-  }
-return p.ENCRYPTION_WITH_COLUMN_KEY
+	if !p.IsSetENCRYPTION_WITH_COLUMN_KEY() {
+		return ColumnCryptoMetaData_ENCRYPTION_WITH_COLUMN_KEY_DEFAULT
+	}
+	return p.ENCRYPTION_WITH_COLUMN_KEY
 }
 func (p *ColumnCryptoMetaData) CountSetFieldsColumnCryptoMetaData() int {
-  count := 0
-  if (p.IsSetENCRYPTION_WITH_FOOTER_KEY()) {
-    count++
-  }
-  if (p.IsSetENCRYPTION_WITH_COLUMN_KEY()) {
-    count++
-  }
-  return count
+	count := 0
+	if p.IsSetENCRYPTION_WITH_FOOTER_KEY() {
+		count++
+	}
+	if p.IsSetENCRYPTION_WITH_COLUMN_KEY() {
+		count++
+	}
+	return count
 
 }
 
 func (p *ColumnCryptoMetaData) IsSetENCRYPTION_WITH_FOOTER_KEY() bool {
-  return p.ENCRYPTION_WITH_FOOTER_KEY != nil
+	return p.ENCRYPTION_WITH_FOOTER_KEY != nil
 }
 
 func (p *ColumnCryptoMetaData) IsSetENCRYPTION_WITH_COLUMN_KEY() bool {
-  return p.ENCRYPTION_WITH_COLUMN_KEY != nil
+	return p.ENCRYPTION_WITH_COLUMN_KEY != nil
 }
 
 func (p *ColumnCryptoMetaData) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
-}
-
-func (p *ColumnCryptoMetaData)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  p.ENCRYPTION_WITH_FOOTER_KEY = &EncryptionWithFooterKey{}
-  if err := p.ENCRYPTION_WITH_FOOTER_KEY.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ENCRYPTION_WITH_FOOTER_KEY), err)
-  }
-  return nil
-}
-
-func (p *ColumnCryptoMetaData)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  p.ENCRYPTION_WITH_COLUMN_KEY = &EncryptionWithColumnKey{}
-  if err := p.ENCRYPTION_WITH_COLUMN_KEY.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ENCRYPTION_WITH_COLUMN_KEY), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
+}
+
+func (p *ColumnCryptoMetaData) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	p.ENCRYPTION_WITH_FOOTER_KEY = &EncryptionWithFooterKey{}
+	if err := p.ENCRYPTION_WITH_FOOTER_KEY.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ENCRYPTION_WITH_FOOTER_KEY), err)
+	}
+	return nil
+}
+
+func (p *ColumnCryptoMetaData) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	p.ENCRYPTION_WITH_COLUMN_KEY = &EncryptionWithColumnKey{}
+	if err := p.ENCRYPTION_WITH_COLUMN_KEY.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.ENCRYPTION_WITH_COLUMN_KEY), err)
+	}
+	return nil
 }
 
 func (p *ColumnCryptoMetaData) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if c := p.CountSetFieldsColumnCryptoMetaData(); c != 1 {
-    return fmt.Errorf("%T write union: exactly one field must be set (%d set)", p, c)
-  }
-  if err := oprot.WriteStructBegin(ctx, "ColumnCryptoMetaData"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if c := p.CountSetFieldsColumnCryptoMetaData(); c != 1 {
+		return fmt.Errorf("%T write union: exactly one field must be set (%d set)", p, c)
+	}
+	if err := oprot.WriteStructBegin(ctx, "ColumnCryptoMetaData"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *ColumnCryptoMetaData) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetENCRYPTION_WITH_FOOTER_KEY() {
-    if err := oprot.WriteFieldBegin(ctx, "ENCRYPTION_WITH_FOOTER_KEY", thrift.STRUCT, 1); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:ENCRYPTION_WITH_FOOTER_KEY: ", p), err) }
-    if err := p.ENCRYPTION_WITH_FOOTER_KEY.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ENCRYPTION_WITH_FOOTER_KEY), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:ENCRYPTION_WITH_FOOTER_KEY: ", p), err) }
-  }
-  return err
+	if p.IsSetENCRYPTION_WITH_FOOTER_KEY() {
+		if err := oprot.WriteFieldBegin(ctx, "ENCRYPTION_WITH_FOOTER_KEY", thrift.STRUCT, 1); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:ENCRYPTION_WITH_FOOTER_KEY: ", p), err)
+		}
+		if err := p.ENCRYPTION_WITH_FOOTER_KEY.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ENCRYPTION_WITH_FOOTER_KEY), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:ENCRYPTION_WITH_FOOTER_KEY: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnCryptoMetaData) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetENCRYPTION_WITH_COLUMN_KEY() {
-    if err := oprot.WriteFieldBegin(ctx, "ENCRYPTION_WITH_COLUMN_KEY", thrift.STRUCT, 2); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:ENCRYPTION_WITH_COLUMN_KEY: ", p), err) }
-    if err := p.ENCRYPTION_WITH_COLUMN_KEY.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ENCRYPTION_WITH_COLUMN_KEY), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:ENCRYPTION_WITH_COLUMN_KEY: ", p), err) }
-  }
-  return err
+	if p.IsSetENCRYPTION_WITH_COLUMN_KEY() {
+		if err := oprot.WriteFieldBegin(ctx, "ENCRYPTION_WITH_COLUMN_KEY", thrift.STRUCT, 2); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:ENCRYPTION_WITH_COLUMN_KEY: ", p), err)
+		}
+		if err := p.ENCRYPTION_WITH_COLUMN_KEY.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.ENCRYPTION_WITH_COLUMN_KEY), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:ENCRYPTION_WITH_COLUMN_KEY: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnCryptoMetaData) Equals(other *ColumnCryptoMetaData) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if !p.ENCRYPTION_WITH_FOOTER_KEY.Equals(other.ENCRYPTION_WITH_FOOTER_KEY) { return false }
-  if !p.ENCRYPTION_WITH_COLUMN_KEY.Equals(other.ENCRYPTION_WITH_COLUMN_KEY) { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if !p.ENCRYPTION_WITH_FOOTER_KEY.Equals(other.ENCRYPTION_WITH_FOOTER_KEY) {
+		return false
+	}
+	if !p.ENCRYPTION_WITH_COLUMN_KEY.Equals(other.ENCRYPTION_WITH_COLUMN_KEY) {
+		return false
+	}
+	return true
 }
 
 func (p *ColumnCryptoMetaData) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("ColumnCryptoMetaData(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("ColumnCryptoMetaData(%+v)", *p)
 }
 
 func (p *ColumnCryptoMetaData) Validate() error {
-  return nil
+	return nil
 }
+
 // Attributes:
-//  - FilePath: File where column data is stored.  If not set, assumed to be same file as
+//   - FilePath: File where column data is stored.  If not set, assumed to be same file as
+//
 // metadata.  This path is relative to the current file.
-// 
-//  - FileOffset: Byte offset in file_path to the ColumnMetaData *
-//  - MetaData: Column metadata for this chunk. This is the same content as what is at
+//
+//   - FileOffset: Byte offset in file_path to the ColumnMetaData *
+//   - MetaData: Column metadata for this chunk. This is the same content as what is at
+//
 // file_path/file_offset.  Having it here has it replicated in the file
 // metadata.
-// 
-//  - OffsetIndexOffset: File offset of ColumnChunk's OffsetIndex *
-//  - OffsetIndexLength: Size of ColumnChunk's OffsetIndex, in bytes *
-//  - ColumnIndexOffset: File offset of ColumnChunk's ColumnIndex *
-//  - ColumnIndexLength: Size of ColumnChunk's ColumnIndex, in bytes *
-//  - CryptoMetadata: Crypto metadata of encrypted columns *
-//  - EncryptedColumnMetadata: Encrypted column metadata for this chunk *
+//
+//   - OffsetIndexOffset: File offset of ColumnChunk's OffsetIndex *
+//   - OffsetIndexLength: Size of ColumnChunk's OffsetIndex, in bytes *
+//   - ColumnIndexOffset: File offset of ColumnChunk's ColumnIndex *
+//   - ColumnIndexLength: Size of ColumnChunk's ColumnIndex, in bytes *
+//   - CryptoMetadata: Crypto metadata of encrypted columns *
+//   - EncryptedColumnMetadata: Encrypted column metadata for this chunk *
 type ColumnChunk struct {
-  FilePath *string `thrift:"file_path,1" db:"file_path" json:"file_path,omitempty"`
-  FileOffset int64 `thrift:"file_offset,2,required" db:"file_offset" json:"file_offset"`
-  MetaData *ColumnMetaData `thrift:"meta_data,3" db:"meta_data" json:"meta_data,omitempty"`
-  OffsetIndexOffset *int64 `thrift:"offset_index_offset,4" db:"offset_index_offset" json:"offset_index_offset,omitempty"`
-  OffsetIndexLength *int32 `thrift:"offset_index_length,5" db:"offset_index_length" json:"offset_index_length,omitempty"`
-  ColumnIndexOffset *int64 `thrift:"column_index_offset,6" db:"column_index_offset" json:"column_index_offset,omitempty"`
-  ColumnIndexLength *int32 `thrift:"column_index_length,7" db:"column_index_length" json:"column_index_length,omitempty"`
-  CryptoMetadata *ColumnCryptoMetaData `thrift:"crypto_metadata,8" db:"crypto_metadata" json:"crypto_metadata,omitempty"`
-  EncryptedColumnMetadata []byte `thrift:"encrypted_column_metadata,9" db:"encrypted_column_metadata" json:"encrypted_column_metadata,omitempty"`
+	FilePath                *string               `thrift:"file_path,1" db:"file_path" json:"file_path,omitempty"`
+	FileOffset              int64                 `thrift:"file_offset,2,required" db:"file_offset" json:"file_offset"`
+	MetaData                *ColumnMetaData       `thrift:"meta_data,3" db:"meta_data" json:"meta_data,omitempty"`
+	OffsetIndexOffset       *int64                `thrift:"offset_index_offset,4" db:"offset_index_offset" json:"offset_index_offset,omitempty"`
+	OffsetIndexLength       *int32                `thrift:"offset_index_length,5" db:"offset_index_length" json:"offset_index_length,omitempty"`
+	ColumnIndexOffset       *int64                `thrift:"column_index_offset,6" db:"column_index_offset" json:"column_index_offset,omitempty"`
+	ColumnIndexLength       *int32                `thrift:"column_index_length,7" db:"column_index_length" json:"column_index_length,omitempty"`
+	CryptoMetadata          *ColumnCryptoMetaData `thrift:"crypto_metadata,8" db:"crypto_metadata" json:"crypto_metadata,omitempty"`
+	EncryptedColumnMetadata []byte                `thrift:"encrypted_column_metadata,9" db:"encrypted_column_metadata" json:"encrypted_column_metadata,omitempty"`
 }
 
 func NewColumnChunk() *ColumnChunk {
-  return &ColumnChunk{}
+	return &ColumnChunk{}
 }
 
 var ColumnChunk_FilePath_DEFAULT string
+
 func (p *ColumnChunk) GetFilePath() string {
-  if !p.IsSetFilePath() {
-    return ColumnChunk_FilePath_DEFAULT
-  }
-return *p.FilePath
+	if !p.IsSetFilePath() {
+		return ColumnChunk_FilePath_DEFAULT
+	}
+	return *p.FilePath
 }
 
 func (p *ColumnChunk) GetFileOffset() int64 {
-  return p.FileOffset
+	return p.FileOffset
 }
+
 var ColumnChunk_MetaData_DEFAULT *ColumnMetaData
+
 func (p *ColumnChunk) GetMetaData() *ColumnMetaData {
-  if !p.IsSetMetaData() {
-    return ColumnChunk_MetaData_DEFAULT
-  }
-return p.MetaData
+	if !p.IsSetMetaData() {
+		return ColumnChunk_MetaData_DEFAULT
+	}
+	return p.MetaData
 }
+
 var ColumnChunk_OffsetIndexOffset_DEFAULT int64
+
 func (p *ColumnChunk) GetOffsetIndexOffset() int64 {
-  if !p.IsSetOffsetIndexOffset() {
-    return ColumnChunk_OffsetIndexOffset_DEFAULT
-  }
-return *p.OffsetIndexOffset
+	if !p.IsSetOffsetIndexOffset() {
+		return ColumnChunk_OffsetIndexOffset_DEFAULT
+	}
+	return *p.OffsetIndexOffset
 }
+
 var ColumnChunk_OffsetIndexLength_DEFAULT int32
+
 func (p *ColumnChunk) GetOffsetIndexLength() int32 {
-  if !p.IsSetOffsetIndexLength() {
-    return ColumnChunk_OffsetIndexLength_DEFAULT
-  }
-return *p.OffsetIndexLength
+	if !p.IsSetOffsetIndexLength() {
+		return ColumnChunk_OffsetIndexLength_DEFAULT
+	}
+	return *p.OffsetIndexLength
 }
+
 var ColumnChunk_ColumnIndexOffset_DEFAULT int64
+
 func (p *ColumnChunk) GetColumnIndexOffset() int64 {
-  if !p.IsSetColumnIndexOffset() {
-    return ColumnChunk_ColumnIndexOffset_DEFAULT
-  }
-return *p.ColumnIndexOffset
+	if !p.IsSetColumnIndexOffset() {
+		return ColumnChunk_ColumnIndexOffset_DEFAULT
+	}
+	return *p.ColumnIndexOffset
 }
+
 var ColumnChunk_ColumnIndexLength_DEFAULT int32
+
 func (p *ColumnChunk) GetColumnIndexLength() int32 {
-  if !p.IsSetColumnIndexLength() {
-    return ColumnChunk_ColumnIndexLength_DEFAULT
-  }
-return *p.ColumnIndexLength
+	if !p.IsSetColumnIndexLength() {
+		return ColumnChunk_ColumnIndexLength_DEFAULT
+	}
+	return *p.ColumnIndexLength
 }
+
 var ColumnChunk_CryptoMetadata_DEFAULT *ColumnCryptoMetaData
+
 func (p *ColumnChunk) GetCryptoMetadata() *ColumnCryptoMetaData {
-  if !p.IsSetCryptoMetadata() {
-    return ColumnChunk_CryptoMetadata_DEFAULT
-  }
-return p.CryptoMetadata
+	if !p.IsSetCryptoMetadata() {
+		return ColumnChunk_CryptoMetadata_DEFAULT
+	}
+	return p.CryptoMetadata
 }
+
 var ColumnChunk_EncryptedColumnMetadata_DEFAULT []byte
 
 func (p *ColumnChunk) GetEncryptedColumnMetadata() []byte {
-  return p.EncryptedColumnMetadata
+	return p.EncryptedColumnMetadata
 }
 func (p *ColumnChunk) IsSetFilePath() bool {
-  return p.FilePath != nil
+	return p.FilePath != nil
 }
 
 func (p *ColumnChunk) IsSetMetaData() bool {
-  return p.MetaData != nil
+	return p.MetaData != nil
 }
 
 func (p *ColumnChunk) IsSetOffsetIndexOffset() bool {
-  return p.OffsetIndexOffset != nil
+	return p.OffsetIndexOffset != nil
 }
 
 func (p *ColumnChunk) IsSetOffsetIndexLength() bool {
-  return p.OffsetIndexLength != nil
+	return p.OffsetIndexLength != nil
 }
 
 func (p *ColumnChunk) IsSetColumnIndexOffset() bool {
-  return p.ColumnIndexOffset != nil
+	return p.ColumnIndexOffset != nil
 }
 
 func (p *ColumnChunk) IsSetColumnIndexLength() bool {
-  return p.ColumnIndexLength != nil
+	return p.ColumnIndexLength != nil
 }
 
 func (p *ColumnChunk) IsSetCryptoMetadata() bool {
-  return p.CryptoMetadata != nil
+	return p.CryptoMetadata != nil
 }
 
 func (p *ColumnChunk) IsSetEncryptedColumnMetadata() bool {
-  return p.EncryptedColumnMetadata != nil
+	return p.EncryptedColumnMetadata != nil
 }
 
 func (p *ColumnChunk) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetFileOffset bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.STRING {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-        issetFileOffset = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 4:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField4(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 5:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField5(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 6:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField6(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 7:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField7(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 8:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField8(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 9:
-      if fieldTypeId == thrift.STRING {
-        if err := p.ReadField9(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetFileOffset{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field FileOffset is not set"));
-  }
-  return nil
-}
-
-func (p *ColumnChunk)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadString(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  p.FilePath = &v
-}
-  return nil
-}
-
-func (p *ColumnChunk)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  p.FileOffset = v
-}
-  return nil
-}
-
-func (p *ColumnChunk)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  p.MetaData = &ColumnMetaData{}
-  if err := p.MetaData.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.MetaData), err)
-  }
-  return nil
-}
-
-func (p *ColumnChunk)  ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 4: ", err)
-} else {
-  p.OffsetIndexOffset = &v
-}
-  return nil
-}
-
-func (p *ColumnChunk)  ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 5: ", err)
-} else {
-  p.OffsetIndexLength = &v
-}
-  return nil
-}
-
-func (p *ColumnChunk)  ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 6: ", err)
-} else {
-  p.ColumnIndexOffset = &v
-}
-  return nil
-}
-
-func (p *ColumnChunk)  ReadField7(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 7: ", err)
-} else {
-  p.ColumnIndexLength = &v
-}
-  return nil
-}
-
-func (p *ColumnChunk)  ReadField8(ctx context.Context, iprot thrift.TProtocol) error {
-  p.CryptoMetadata = &ColumnCryptoMetaData{}
-  if err := p.CryptoMetadata.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.CryptoMetadata), err)
-  }
-  return nil
-}
-
-func (p *ColumnChunk)  ReadField9(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBinary(ctx); err != nil {
-  return thrift.PrependError("error reading field 9: ", err)
-} else {
-  p.EncryptedColumnMetadata = v
-}
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetFileOffset bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.STRING {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+				issetFileOffset = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 4:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField4(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 5:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField5(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 6:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField6(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 7:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField7(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 8:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField8(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 9:
+			if fieldTypeId == thrift.STRING {
+				if err := p.ReadField9(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetFileOffset {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field FileOffset is not set"))
+	}
+	return nil
+}
+
+func (p *ColumnChunk) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadString(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		p.FilePath = &v
+	}
+	return nil
+}
+
+func (p *ColumnChunk) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		p.FileOffset = v
+	}
+	return nil
+}
+
+func (p *ColumnChunk) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	p.MetaData = &ColumnMetaData{}
+	if err := p.MetaData.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.MetaData), err)
+	}
+	return nil
+}
+
+func (p *ColumnChunk) ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 4: ", err)
+	} else {
+		p.OffsetIndexOffset = &v
+	}
+	return nil
+}
+
+func (p *ColumnChunk) ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 5: ", err)
+	} else {
+		p.OffsetIndexLength = &v
+	}
+	return nil
+}
+
+func (p *ColumnChunk) ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 6: ", err)
+	} else {
+		p.ColumnIndexOffset = &v
+	}
+	return nil
+}
+
+func (p *ColumnChunk) ReadField7(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 7: ", err)
+	} else {
+		p.ColumnIndexLength = &v
+	}
+	return nil
+}
+
+func (p *ColumnChunk) ReadField8(ctx context.Context, iprot thrift.TProtocol) error {
+	p.CryptoMetadata = &ColumnCryptoMetaData{}
+	if err := p.CryptoMetadata.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.CryptoMetadata), err)
+	}
+	return nil
+}
+
+func (p *ColumnChunk) ReadField9(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBinary(ctx); err != nil {
+		return thrift.PrependError("error reading field 9: ", err)
+	} else {
+		p.EncryptedColumnMetadata = v
+	}
+	return nil
 }
 
 func (p *ColumnChunk) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "ColumnChunk"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-    if err := p.writeField4(ctx, oprot); err != nil { return err }
-    if err := p.writeField5(ctx, oprot); err != nil { return err }
-    if err := p.writeField6(ctx, oprot); err != nil { return err }
-    if err := p.writeField7(ctx, oprot); err != nil { return err }
-    if err := p.writeField8(ctx, oprot); err != nil { return err }
-    if err := p.writeField9(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "ColumnChunk"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField4(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField5(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField6(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField7(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField8(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField9(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *ColumnChunk) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetFilePath() {
-    if err := oprot.WriteFieldBegin(ctx, "file_path", thrift.STRING, 1); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:file_path: ", p), err) }
-    if err := oprot.WriteString(ctx, string(*p.FilePath)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.file_path (1) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:file_path: ", p), err) }
-  }
-  return err
+	if p.IsSetFilePath() {
+		if err := oprot.WriteFieldBegin(ctx, "file_path", thrift.STRING, 1); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:file_path: ", p), err)
+		}
+		if err := oprot.WriteString(ctx, string(*p.FilePath)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.file_path (1) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:file_path: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnChunk) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "file_offset", thrift.I64, 2); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:file_offset: ", p), err) }
-  if err := oprot.WriteI64(ctx, int64(p.FileOffset)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.file_offset (2) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:file_offset: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "file_offset", thrift.I64, 2); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:file_offset: ", p), err)
+	}
+	if err := oprot.WriteI64(ctx, int64(p.FileOffset)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.file_offset (2) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:file_offset: ", p), err)
+	}
+	return err
 }
 
 func (p *ColumnChunk) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetMetaData() {
-    if err := oprot.WriteFieldBegin(ctx, "meta_data", thrift.STRUCT, 3); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:meta_data: ", p), err) }
-    if err := p.MetaData.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.MetaData), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:meta_data: ", p), err) }
-  }
-  return err
+	if p.IsSetMetaData() {
+		if err := oprot.WriteFieldBegin(ctx, "meta_data", thrift.STRUCT, 3); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:meta_data: ", p), err)
+		}
+		if err := p.MetaData.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.MetaData), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:meta_data: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnChunk) writeField4(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetOffsetIndexOffset() {
-    if err := oprot.WriteFieldBegin(ctx, "offset_index_offset", thrift.I64, 4); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:offset_index_offset: ", p), err) }
-    if err := oprot.WriteI64(ctx, int64(*p.OffsetIndexOffset)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.offset_index_offset (4) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 4:offset_index_offset: ", p), err) }
-  }
-  return err
+	if p.IsSetOffsetIndexOffset() {
+		if err := oprot.WriteFieldBegin(ctx, "offset_index_offset", thrift.I64, 4); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:offset_index_offset: ", p), err)
+		}
+		if err := oprot.WriteI64(ctx, int64(*p.OffsetIndexOffset)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.offset_index_offset (4) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 4:offset_index_offset: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnChunk) writeField5(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetOffsetIndexLength() {
-    if err := oprot.WriteFieldBegin(ctx, "offset_index_length", thrift.I32, 5); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:offset_index_length: ", p), err) }
-    if err := oprot.WriteI32(ctx, int32(*p.OffsetIndexLength)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.offset_index_length (5) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 5:offset_index_length: ", p), err) }
-  }
-  return err
+	if p.IsSetOffsetIndexLength() {
+		if err := oprot.WriteFieldBegin(ctx, "offset_index_length", thrift.I32, 5); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:offset_index_length: ", p), err)
+		}
+		if err := oprot.WriteI32(ctx, int32(*p.OffsetIndexLength)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.offset_index_length (5) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 5:offset_index_length: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnChunk) writeField6(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetColumnIndexOffset() {
-    if err := oprot.WriteFieldBegin(ctx, "column_index_offset", thrift.I64, 6); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:column_index_offset: ", p), err) }
-    if err := oprot.WriteI64(ctx, int64(*p.ColumnIndexOffset)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.column_index_offset (6) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 6:column_index_offset: ", p), err) }
-  }
-  return err
+	if p.IsSetColumnIndexOffset() {
+		if err := oprot.WriteFieldBegin(ctx, "column_index_offset", thrift.I64, 6); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:column_index_offset: ", p), err)
+		}
+		if err := oprot.WriteI64(ctx, int64(*p.ColumnIndexOffset)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.column_index_offset (6) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 6:column_index_offset: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnChunk) writeField7(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetColumnIndexLength() {
-    if err := oprot.WriteFieldBegin(ctx, "column_index_length", thrift.I32, 7); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:column_index_length: ", p), err) }
-    if err := oprot.WriteI32(ctx, int32(*p.ColumnIndexLength)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.column_index_length (7) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 7:column_index_length: ", p), err) }
-  }
-  return err
+	if p.IsSetColumnIndexLength() {
+		if err := oprot.WriteFieldBegin(ctx, "column_index_length", thrift.I32, 7); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:column_index_length: ", p), err)
+		}
+		if err := oprot.WriteI32(ctx, int32(*p.ColumnIndexLength)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.column_index_length (7) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 7:column_index_length: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnChunk) writeField8(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetCryptoMetadata() {
-    if err := oprot.WriteFieldBegin(ctx, "crypto_metadata", thrift.STRUCT, 8); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:crypto_metadata: ", p), err) }
-    if err := p.CryptoMetadata.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.CryptoMetadata), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 8:crypto_metadata: ", p), err) }
-  }
-  return err
+	if p.IsSetCryptoMetadata() {
+		if err := oprot.WriteFieldBegin(ctx, "crypto_metadata", thrift.STRUCT, 8); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:crypto_metadata: ", p), err)
+		}
+		if err := p.CryptoMetadata.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.CryptoMetadata), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 8:crypto_metadata: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnChunk) writeField9(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetEncryptedColumnMetadata() {
-    if err := oprot.WriteFieldBegin(ctx, "encrypted_column_metadata", thrift.STRING, 9); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:encrypted_column_metadata: ", p), err) }
-    if err := oprot.WriteBinary(ctx, p.EncryptedColumnMetadata); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.encrypted_column_metadata (9) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 9:encrypted_column_metadata: ", p), err) }
-  }
-  return err
+	if p.IsSetEncryptedColumnMetadata() {
+		if err := oprot.WriteFieldBegin(ctx, "encrypted_column_metadata", thrift.STRING, 9); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:encrypted_column_metadata: ", p), err)
+		}
+		if err := oprot.WriteBinary(ctx, p.EncryptedColumnMetadata); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.encrypted_column_metadata (9) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 9:encrypted_column_metadata: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnChunk) Equals(other *ColumnChunk) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if p.FilePath != other.FilePath {
-    if p.FilePath == nil || other.FilePath == nil {
-      return false
-    }
-    if (*p.FilePath) != (*other.FilePath) { return false }
-  }
-  if p.FileOffset != other.FileOffset { return false }
-  if !p.MetaData.Equals(other.MetaData) { return false }
-  if p.OffsetIndexOffset != other.OffsetIndexOffset {
-    if p.OffsetIndexOffset == nil || other.OffsetIndexOffset == nil {
-      return false
-    }
-    if (*p.OffsetIndexOffset) != (*other.OffsetIndexOffset) { return false }
-  }
-  if p.OffsetIndexLength != other.OffsetIndexLength {
-    if p.OffsetIndexLength == nil || other.OffsetIndexLength == nil {
-      return false
-    }
-    if (*p.OffsetIndexLength) != (*other.OffsetIndexLength) { return false }
-  }
-  if p.ColumnIndexOffset != other.ColumnIndexOffset {
-    if p.ColumnIndexOffset == nil || other.ColumnIndexOffset == nil {
-      return false
-    }
-    if (*p.ColumnIndexOffset) != (*other.ColumnIndexOffset) { return false }
-  }
-  if p.ColumnIndexLength != other.ColumnIndexLength {
-    if p.ColumnIndexLength == nil || other.ColumnIndexLength == nil {
-      return false
-    }
-    if (*p.ColumnIndexLength) != (*other.ColumnIndexLength) { return false }
-  }
-  if !p.CryptoMetadata.Equals(other.CryptoMetadata) { return false }
-  if bytes.Compare(p.EncryptedColumnMetadata, other.EncryptedColumnMetadata) != 0 { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if p.FilePath != other.FilePath {
+		if p.FilePath == nil || other.FilePath == nil {
+			return false
+		}
+		if (*p.FilePath) != (*other.FilePath) {
+			return false
+		}
+	}
+	if p.FileOffset != other.FileOffset {
+		return false
+	}
+	if !p.MetaData.Equals(other.MetaData) {
+		return false
+	}
+	if p.OffsetIndexOffset != other.OffsetIndexOffset {
+		if p.OffsetIndexOffset == nil || other.OffsetIndexOffset == nil {
+			return false
+		}
+		if (*p.OffsetIndexOffset) != (*other.OffsetIndexOffset) {
+			return false
+		}
+	}
+	if p.OffsetIndexLength != other.OffsetIndexLength {
+		if p.OffsetIndexLength == nil || other.OffsetIndexLength == nil {
+			return false
+		}
+		if (*p.OffsetIndexLength) != (*other.OffsetIndexLength) {
+			return false
+		}
+	}
+	if p.ColumnIndexOffset != other.ColumnIndexOffset {
+		if p.ColumnIndexOffset == nil || other.ColumnIndexOffset == nil {
+			return false
+		}
+		if (*p.ColumnIndexOffset) != (*other.ColumnIndexOffset) {
+			return false
+		}
+	}
+	if p.ColumnIndexLength != other.ColumnIndexLength {
+		if p.ColumnIndexLength == nil || other.ColumnIndexLength == nil {
+			return false
+		}
+		if (*p.ColumnIndexLength) != (*other.ColumnIndexLength) {
+			return false
+		}
+	}
+	if !p.CryptoMetadata.Equals(other.CryptoMetadata) {
+		return false
+	}
+	if bytes.Compare(p.EncryptedColumnMetadata, other.EncryptedColumnMetadata) != 0 {
+		return false
+	}
+	return true
 }
 
 func (p *ColumnChunk) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("ColumnChunk(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("ColumnChunk(%+v)", *p)
 }
 
 func (p *ColumnChunk) Validate() error {
-  return nil
+	return nil
 }
+
 // Attributes:
-//  - Columns: Metadata for each column chunk in this row group.
+//   - Columns: Metadata for each column chunk in this row group.
+//
 // This list must have the same order as the SchemaElement list in FileMetaData.
-// 
-//  - TotalByteSize: Total byte size of all the uncompressed column data in this row group *
-//  - NumRows: Number of rows in this row group *
-//  - SortingColumns: If set, specifies a sort ordering of the rows in this RowGroup.
+//
+//   - TotalByteSize: Total byte size of all the uncompressed column data in this row group *
+//   - NumRows: Number of rows in this row group *
+//   - SortingColumns: If set, specifies a sort ordering of the rows in this RowGroup.
+//
 // The sorting columns can be a subset of all the columns.
-//  - FileOffset: Byte offset from beginning of file to first page (data or dictionary)
+//   - FileOffset: Byte offset from beginning of file to first page (data or dictionary)
+//
 // in this row group *
-//  - TotalCompressedSize: Total byte size of all compressed (and potentially encrypted) column data
+//   - TotalCompressedSize: Total byte size of all compressed (and potentially encrypted) column data
+//
 // in this row group *
-//  - Ordinal: Row group ordinal in the file *
+//   - Ordinal: Row group ordinal in the file *
 type RowGroup struct {
-  Columns []*ColumnChunk `thrift:"columns,1,required" db:"columns" json:"columns"`
-  TotalByteSize int64 `thrift:"total_byte_size,2,required" db:"total_byte_size" json:"total_byte_size"`
-  NumRows int64 `thrift:"num_rows,3,required" db:"num_rows" json:"num_rows"`
-  SortingColumns []*SortingColumn `thrift:"sorting_columns,4" db:"sorting_columns" json:"sorting_columns,omitempty"`
-  FileOffset *int64 `thrift:"file_offset,5" db:"file_offset" json:"file_offset,omitempty"`
-  TotalCompressedSize *int64 `thrift:"total_compressed_size,6" db:"total_compressed_size" json:"total_compressed_size,omitempty"`
-  Ordinal *int16 `thrift:"ordinal,7" db:"ordinal" json:"ordinal,omitempty"`
+	Columns             []*ColumnChunk   `thrift:"columns,1,required" db:"columns" json:"columns"`
+	TotalByteSize       int64            `thrift:"total_byte_size,2,required" db:"total_byte_size" json:"total_byte_size"`
+	NumRows             int64            `thrift:"num_rows,3,required" db:"num_rows" json:"num_rows"`
+	SortingColumns      []*SortingColumn `thrift:"sorting_columns,4" db:"sorting_columns" json:"sorting_columns,omitempty"`
+	FileOffset          *int64           `thrift:"file_offset,5" db:"file_offset" json:"file_offset,omitempty"`
+	TotalCompressedSize *int64           `thrift:"total_compressed_size,6" db:"total_compressed_size" json:"total_compressed_size,omitempty"`
+	Ordinal             *int16           `thrift:"ordinal,7" db:"ordinal" json:"ordinal,omitempty"`
 }
 
 func NewRowGroup() *RowGroup {
-  return &RowGroup{}
+	return &RowGroup{}
 }
 
-
 func (p *RowGroup) GetColumns() []*ColumnChunk {
-  return p.Columns
+	return p.Columns
 }
 
 func (p *RowGroup) GetTotalByteSize() int64 {
-  return p.TotalByteSize
+	return p.TotalByteSize
 }
 
 func (p *RowGroup) GetNumRows() int64 {
-  return p.NumRows
+	return p.NumRows
 }
+
 var RowGroup_SortingColumns_DEFAULT []*SortingColumn
 
 func (p *RowGroup) GetSortingColumns() []*SortingColumn {
-  return p.SortingColumns
+	return p.SortingColumns
 }
+
 var RowGroup_FileOffset_DEFAULT int64
+
 func (p *RowGroup) GetFileOffset() int64 {
-  if !p.IsSetFileOffset() {
-    return RowGroup_FileOffset_DEFAULT
-  }
-return *p.FileOffset
+	if !p.IsSetFileOffset() {
+		return RowGroup_FileOffset_DEFAULT
+	}
+	return *p.FileOffset
 }
+
 var RowGroup_TotalCompressedSize_DEFAULT int64
+
 func (p *RowGroup) GetTotalCompressedSize() int64 {
-  if !p.IsSetTotalCompressedSize() {
-    return RowGroup_TotalCompressedSize_DEFAULT
-  }
-return *p.TotalCompressedSize
+	if !p.IsSetTotalCompressedSize() {
+		return RowGroup_TotalCompressedSize_DEFAULT
+	}
+	return *p.TotalCompressedSize
 }
+
 var RowGroup_Ordinal_DEFAULT int16
+
 func (p *RowGroup) GetOrdinal() int16 {
-  if !p.IsSetOrdinal() {
-    return RowGroup_Ordinal_DEFAULT
-  }
-return *p.Ordinal
+	if !p.IsSetOrdinal() {
+		return RowGroup_Ordinal_DEFAULT
+	}
+	return *p.Ordinal
 }
 func (p *RowGroup) IsSetSortingColumns() bool {
-  return p.SortingColumns != nil
+	return p.SortingColumns != nil
 }
 
 func (p *RowGroup) IsSetFileOffset() bool {
-  return p.FileOffset != nil
+	return p.FileOffset != nil
 }
 
 func (p *RowGroup) IsSetTotalCompressedSize() bool {
-  return p.TotalCompressedSize != nil
+	return p.TotalCompressedSize != nil
 }
 
 func (p *RowGroup) IsSetOrdinal() bool {
-  return p.Ordinal != nil
+	return p.Ordinal != nil
 }
 
 func (p *RowGroup) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetColumns bool = false;
-  var issetTotalByteSize bool = false;
-  var issetNumRows bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.LIST {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetColumns = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-        issetTotalByteSize = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-        issetNumRows = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 4:
-      if fieldTypeId == thrift.LIST {
-        if err := p.ReadField4(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 5:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField5(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 6:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField6(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 7:
-      if fieldTypeId == thrift.I16 {
-        if err := p.ReadField7(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetColumns{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Columns is not set"));
-  }
-  if !issetTotalByteSize{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field TotalByteSize is not set"));
-  }
-  if !issetNumRows{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumRows is not set"));
-  }
-  return nil
-}
-
-func (p *RowGroup)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  _, size, err := iprot.ReadListBegin(ctx)
-  if err != nil {
-    return thrift.PrependError("error reading list begin: ", err)
-  }
-  tSlice := make([]*ColumnChunk, 0, size)
-  p.Columns =  tSlice
-  for i := 0; i < size; i ++ {
-    _elem10 := &ColumnChunk{}
-    if err := _elem10.Read(ctx, iprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem10), err)
-    }
-    p.Columns = append(p.Columns, _elem10)
-  }
-  if err := iprot.ReadListEnd(ctx); err != nil {
-    return thrift.PrependError("error reading list end: ", err)
-  }
-  return nil
-}
-
-func (p *RowGroup)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  p.TotalByteSize = v
-}
-  return nil
-}
-
-func (p *RowGroup)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 3: ", err)
-} else {
-  p.NumRows = v
-}
-  return nil
-}
-
-func (p *RowGroup)  ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
-  _, size, err := iprot.ReadListBegin(ctx)
-  if err != nil {
-    return thrift.PrependError("error reading list begin: ", err)
-  }
-  tSlice := make([]*SortingColumn, 0, size)
-  p.SortingColumns =  tSlice
-  for i := 0; i < size; i ++ {
-    _elem11 := &SortingColumn{}
-    if err := _elem11.Read(ctx, iprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem11), err)
-    }
-    p.SortingColumns = append(p.SortingColumns, _elem11)
-  }
-  if err := iprot.ReadListEnd(ctx); err != nil {
-    return thrift.PrependError("error reading list end: ", err)
-  }
-  return nil
-}
-
-func (p *RowGroup)  ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 5: ", err)
-} else {
-  p.FileOffset = &v
-}
-  return nil
-}
-
-func (p *RowGroup)  ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 6: ", err)
-} else {
-  p.TotalCompressedSize = &v
-}
-  return nil
-}
-
-func (p *RowGroup)  ReadField7(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI16(ctx); err != nil {
-  return thrift.PrependError("error reading field 7: ", err)
-} else {
-  p.Ordinal = &v
-}
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetColumns bool = false
+	var issetTotalByteSize bool = false
+	var issetNumRows bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.LIST {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetColumns = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+				issetTotalByteSize = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+				issetNumRows = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 4:
+			if fieldTypeId == thrift.LIST {
+				if err := p.ReadField4(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 5:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField5(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 6:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField6(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 7:
+			if fieldTypeId == thrift.I16 {
+				if err := p.ReadField7(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetColumns {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Columns is not set"))
+	}
+	if !issetTotalByteSize {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field TotalByteSize is not set"))
+	}
+	if !issetNumRows {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumRows is not set"))
+	}
+	return nil
+}
+
+func (p *RowGroup) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	_, size, err := iprot.ReadListBegin(ctx)
+	if err != nil {
+		return thrift.PrependError("error reading list begin: ", err)
+	}
+	tSlice := make([]*ColumnChunk, 0, size)
+	p.Columns = tSlice
+	for i := 0; i < size; i++ {
+		_elem10 := &ColumnChunk{}
+		if err := _elem10.Read(ctx, iprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem10), err)
+		}
+		p.Columns = append(p.Columns, _elem10)
+	}
+	if err := iprot.ReadListEnd(ctx); err != nil {
+		return thrift.PrependError("error reading list end: ", err)
+	}
+	return nil
+}
+
+func (p *RowGroup) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		p.TotalByteSize = v
+	}
+	return nil
+}
+
+func (p *RowGroup) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 3: ", err)
+	} else {
+		p.NumRows = v
+	}
+	return nil
+}
+
+func (p *RowGroup) ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
+	_, size, err := iprot.ReadListBegin(ctx)
+	if err != nil {
+		return thrift.PrependError("error reading list begin: ", err)
+	}
+	tSlice := make([]*SortingColumn, 0, size)
+	p.SortingColumns = tSlice
+	for i := 0; i < size; i++ {
+		_elem11 := &SortingColumn{}
+		if err := _elem11.Read(ctx, iprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem11), err)
+		}
+		p.SortingColumns = append(p.SortingColumns, _elem11)
+	}
+	if err := iprot.ReadListEnd(ctx); err != nil {
+		return thrift.PrependError("error reading list end: ", err)
+	}
+	return nil
+}
+
+func (p *RowGroup) ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 5: ", err)
+	} else {
+		p.FileOffset = &v
+	}
+	return nil
+}
+
+func (p *RowGroup) ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 6: ", err)
+	} else {
+		p.TotalCompressedSize = &v
+	}
+	return nil
+}
+
+func (p *RowGroup) ReadField7(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI16(ctx); err != nil {
+		return thrift.PrependError("error reading field 7: ", err)
+	} else {
+		p.Ordinal = &v
+	}
+	return nil
 }
 
 func (p *RowGroup) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "RowGroup"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-    if err := p.writeField4(ctx, oprot); err != nil { return err }
-    if err := p.writeField5(ctx, oprot); err != nil { return err }
-    if err := p.writeField6(ctx, oprot); err != nil { return err }
-    if err := p.writeField7(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "RowGroup"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField4(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField5(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField6(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField7(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *RowGroup) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "columns", thrift.LIST, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:columns: ", p), err) }
-  if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.Columns)); err != nil {
-    return thrift.PrependError("error writing list begin: ", err)
-  }
-  for _, v := range p.Columns {
-    if err := v.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-    }
-  }
-  if err := oprot.WriteListEnd(ctx); err != nil {
-    return thrift.PrependError("error writing list end: ", err)
-  }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:columns: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "columns", thrift.LIST, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:columns: ", p), err)
+	}
+	if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.Columns)); err != nil {
+		return thrift.PrependError("error writing list begin: ", err)
+	}
+	for _, v := range p.Columns {
+		if err := v.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+		}
+	}
+	if err := oprot.WriteListEnd(ctx); err != nil {
+		return thrift.PrependError("error writing list end: ", err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:columns: ", p), err)
+	}
+	return err
 }
 
 func (p *RowGroup) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "total_byte_size", thrift.I64, 2); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:total_byte_size: ", p), err) }
-  if err := oprot.WriteI64(ctx, int64(p.TotalByteSize)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.total_byte_size (2) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:total_byte_size: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "total_byte_size", thrift.I64, 2); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:total_byte_size: ", p), err)
+	}
+	if err := oprot.WriteI64(ctx, int64(p.TotalByteSize)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.total_byte_size (2) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:total_byte_size: ", p), err)
+	}
+	return err
 }
 
 func (p *RowGroup) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "num_rows", thrift.I64, 3); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:num_rows: ", p), err) }
-  if err := oprot.WriteI64(ctx, int64(p.NumRows)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.num_rows (3) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:num_rows: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "num_rows", thrift.I64, 3); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:num_rows: ", p), err)
+	}
+	if err := oprot.WriteI64(ctx, int64(p.NumRows)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.num_rows (3) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:num_rows: ", p), err)
+	}
+	return err
 }
 
 func (p *RowGroup) writeField4(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetSortingColumns() {
-    if err := oprot.WriteFieldBegin(ctx, "sorting_columns", thrift.LIST, 4); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:sorting_columns: ", p), err) }
-    if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.SortingColumns)); err != nil {
-      return thrift.PrependError("error writing list begin: ", err)
-    }
-    for _, v := range p.SortingColumns {
-      if err := v.Write(ctx, oprot); err != nil {
-        return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-      }
-    }
-    if err := oprot.WriteListEnd(ctx); err != nil {
-      return thrift.PrependError("error writing list end: ", err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 4:sorting_columns: ", p), err) }
-  }
-  return err
+	if p.IsSetSortingColumns() {
+		if err := oprot.WriteFieldBegin(ctx, "sorting_columns", thrift.LIST, 4); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:sorting_columns: ", p), err)
+		}
+		if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.SortingColumns)); err != nil {
+			return thrift.PrependError("error writing list begin: ", err)
+		}
+		for _, v := range p.SortingColumns {
+			if err := v.Write(ctx, oprot); err != nil {
+				return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+			}
+		}
+		if err := oprot.WriteListEnd(ctx); err != nil {
+			return thrift.PrependError("error writing list end: ", err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 4:sorting_columns: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *RowGroup) writeField5(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetFileOffset() {
-    if err := oprot.WriteFieldBegin(ctx, "file_offset", thrift.I64, 5); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:file_offset: ", p), err) }
-    if err := oprot.WriteI64(ctx, int64(*p.FileOffset)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.file_offset (5) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 5:file_offset: ", p), err) }
-  }
-  return err
+	if p.IsSetFileOffset() {
+		if err := oprot.WriteFieldBegin(ctx, "file_offset", thrift.I64, 5); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:file_offset: ", p), err)
+		}
+		if err := oprot.WriteI64(ctx, int64(*p.FileOffset)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.file_offset (5) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 5:file_offset: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *RowGroup) writeField6(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetTotalCompressedSize() {
-    if err := oprot.WriteFieldBegin(ctx, "total_compressed_size", thrift.I64, 6); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:total_compressed_size: ", p), err) }
-    if err := oprot.WriteI64(ctx, int64(*p.TotalCompressedSize)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.total_compressed_size (6) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 6:total_compressed_size: ", p), err) }
-  }
-  return err
+	if p.IsSetTotalCompressedSize() {
+		if err := oprot.WriteFieldBegin(ctx, "total_compressed_size", thrift.I64, 6); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:total_compressed_size: ", p), err)
+		}
+		if err := oprot.WriteI64(ctx, int64(*p.TotalCompressedSize)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.total_compressed_size (6) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 6:total_compressed_size: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *RowGroup) writeField7(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetOrdinal() {
-    if err := oprot.WriteFieldBegin(ctx, "ordinal", thrift.I16, 7); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:ordinal: ", p), err) }
-    if err := oprot.WriteI16(ctx, int16(*p.Ordinal)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.ordinal (7) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 7:ordinal: ", p), err) }
-  }
-  return err
+	if p.IsSetOrdinal() {
+		if err := oprot.WriteFieldBegin(ctx, "ordinal", thrift.I16, 7); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:ordinal: ", p), err)
+		}
+		if err := oprot.WriteI16(ctx, int16(*p.Ordinal)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.ordinal (7) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 7:ordinal: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *RowGroup) Equals(other *RowGroup) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if len(p.Columns) != len(other.Columns) { return false }
-  for i, _tgt := range p.Columns {
-    _src12 := other.Columns[i]
-    if !_tgt.Equals(_src12) { return false }
-  }
-  if p.TotalByteSize != other.TotalByteSize { return false }
-  if p.NumRows != other.NumRows { return false }
-  if len(p.SortingColumns) != len(other.SortingColumns) { return false }
-  for i, _tgt := range p.SortingColumns {
-    _src13 := other.SortingColumns[i]
-    if !_tgt.Equals(_src13) { return false }
-  }
-  if p.FileOffset != other.FileOffset {
-    if p.FileOffset == nil || other.FileOffset == nil {
-      return false
-    }
-    if (*p.FileOffset) != (*other.FileOffset) { return false }
-  }
-  if p.TotalCompressedSize != other.TotalCompressedSize {
-    if p.TotalCompressedSize == nil || other.TotalCompressedSize == nil {
-      return false
-    }
-    if (*p.TotalCompressedSize) != (*other.TotalCompressedSize) { return false }
-  }
-  if p.Ordinal != other.Ordinal {
-    if p.Ordinal == nil || other.Ordinal == nil {
-      return false
-    }
-    if (*p.Ordinal) != (*other.Ordinal) { return false }
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if len(p.Columns) != len(other.Columns) {
+		return false
+	}
+	for i, _tgt := range p.Columns {
+		_src12 := other.Columns[i]
+		if !_tgt.Equals(_src12) {
+			return false
+		}
+	}
+	if p.TotalByteSize != other.TotalByteSize {
+		return false
+	}
+	if p.NumRows != other.NumRows {
+		return false
+	}
+	if len(p.SortingColumns) != len(other.SortingColumns) {
+		return false
+	}
+	for i, _tgt := range p.SortingColumns {
+		_src13 := other.SortingColumns[i]
+		if !_tgt.Equals(_src13) {
+			return false
+		}
+	}
+	if p.FileOffset != other.FileOffset {
+		if p.FileOffset == nil || other.FileOffset == nil {
+			return false
+		}
+		if (*p.FileOffset) != (*other.FileOffset) {
+			return false
+		}
+	}
+	if p.TotalCompressedSize != other.TotalCompressedSize {
+		if p.TotalCompressedSize == nil || other.TotalCompressedSize == nil {
+			return false
+		}
+		if (*p.TotalCompressedSize) != (*other.TotalCompressedSize) {
+			return false
+		}
+	}
+	if p.Ordinal != other.Ordinal {
+		if p.Ordinal == nil || other.Ordinal == nil {
+			return false
+		}
+		if (*p.Ordinal) != (*other.Ordinal) {
+			return false
+		}
+	}
+	return true
 }
 
 func (p *RowGroup) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("RowGroup(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("RowGroup(%+v)", *p)
 }
 
 func (p *RowGroup) Validate() error {
-  return nil
+	return nil
 }
+
 // Empty struct to signal the order defined by the physical or logical type
 type TypeDefinedOrder struct {
 }
 
 func NewTypeDefinedOrder() *TypeDefinedOrder {
-  return &TypeDefinedOrder{}
+	return &TypeDefinedOrder{}
 }
 
 func (p *TypeDefinedOrder) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-      return err
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+			return err
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
 }
 
 func (p *TypeDefinedOrder) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "TypeDefinedOrder"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "TypeDefinedOrder"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *TypeDefinedOrder) Equals(other *TypeDefinedOrder) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	return true
 }
 
 func (p *TypeDefinedOrder) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("TypeDefinedOrder(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("TypeDefinedOrder(%+v)", *p)
 }
 
 func (p *TypeDefinedOrder) Validate() error {
-  return nil
+	return nil
 }
+
 // Union to specify the order used for the min_value and max_value fields for a
 // column. This union takes the role of an enhanced enum that allows rich
 // elements (which will be needed for a collation-based ordering in the future).
-// 
+//
 // Possible values are:
-// * TypeDefinedOrder - the column uses the order defined by its logical or
-//                      physical type (if there is no logical type).
-// 
+//   - TypeDefinedOrder - the column uses the order defined by its logical or
+//     physical type (if there is no logical type).
+//
 // If the reader does not support the value of this union, min and max stats
 // for this column should be ignored.
-// 
+//
 // Attributes:
-//  - TYPE_ORDER: The sort orders for logical types are:
-//   UTF8 - unsigned byte-wise comparison
-//   INT8 - signed comparison
-//   INT16 - signed comparison
-//   INT32 - signed comparison
-//   INT64 - signed comparison
-//   UINT8 - unsigned comparison
-//   UINT16 - unsigned comparison
-//   UINT32 - unsigned comparison
-//   UINT64 - unsigned comparison
-//   DECIMAL - signed comparison of the represented value
-//   DATE - signed comparison
-//   TIME_MILLIS - signed comparison
-//   TIME_MICROS - signed comparison
-//   TIMESTAMP_MILLIS - signed comparison
-//   TIMESTAMP_MICROS - signed comparison
-//   INTERVAL - unsigned comparison
-//   JSON - unsigned byte-wise comparison
-//   BSON - unsigned byte-wise comparison
-//   ENUM - unsigned byte-wise comparison
-//   LIST - undefined
-//   MAP - undefined
-// 
+//   - TYPE_ORDER: The sort orders for logical types are:
+//     UTF8 - unsigned byte-wise comparison
+//     INT8 - signed comparison
+//     INT16 - signed comparison
+//     INT32 - signed comparison
+//     INT64 - signed comparison
+//     UINT8 - unsigned comparison
+//     UINT16 - unsigned comparison
+//     UINT32 - unsigned comparison
+//     UINT64 - unsigned comparison
+//     DECIMAL - signed comparison of the represented value
+//     DATE - signed comparison
+//     TIME_MILLIS - signed comparison
+//     TIME_MICROS - signed comparison
+//     TIMESTAMP_MILLIS - signed comparison
+//     TIMESTAMP_MICROS - signed comparison
+//     INTERVAL - unsigned comparison
+//     JSON - unsigned byte-wise comparison
+//     BSON - unsigned byte-wise comparison
+//     ENUM - unsigned byte-wise comparison
+//     LIST - undefined
+//     MAP - undefined
+//
 // In the absence of logical types, the sort order is determined by the physical type:
-//   BOOLEAN - false, true
-//   INT32 - signed comparison
-//   INT64 - signed comparison
-//   INT96 (only used for legacy timestamps) - undefined
-//   FLOAT - signed comparison of the represented value (*)
-//   DOUBLE - signed comparison of the represented value (*)
-//   BYTE_ARRAY - unsigned byte-wise comparison
-//   FIXED_LEN_BYTE_ARRAY - unsigned byte-wise comparison
-// 
+//
+//	BOOLEAN - false, true
+//	INT32 - signed comparison
+//	INT64 - signed comparison
+//	INT96 (only used for legacy timestamps) - undefined
+//	FLOAT - signed comparison of the represented value (*)
+//	DOUBLE - signed comparison of the represented value (*)
+//	BYTE_ARRAY - unsigned byte-wise comparison
+//	FIXED_LEN_BYTE_ARRAY - unsigned byte-wise comparison
+//
 // (*) Because the sorting order is not specified properly for floating
-//     point values (relations vs. total ordering) the following
-//     compatibility rules should be applied when reading statistics:
-//     - If the min is a NaN, it should be ignored.
-//     - If the max is a NaN, it should be ignored.
-//     - If the min is +0, the row group may contain -0 values as well.
-//     - If the max is -0, the row group may contain +0 values as well.
-//     - When looking for NaN values, min and max should be ignored.
-// 
-//     When writing statistics the following rules should be followed:
-//     - NaNs should not be written to min or max statistics fields.
-//     - If the computed max value is zero (whether negative or positive),
-//       `+0.0` should be written into the max statistics field.
-//     - If the computed min value is zero (whether negative or positive),
-//       `-0.0` should be written into the min statistics field.
+//
+//	point values (relations vs. total ordering) the following
+//	compatibility rules should be applied when reading statistics:
+//	- If the min is a NaN, it should be ignored.
+//	- If the max is a NaN, it should be ignored.
+//	- If the min is +0, the row group may contain -0 values as well.
+//	- If the max is -0, the row group may contain +0 values as well.
+//	- When looking for NaN values, min and max should be ignored.
+//
+//	When writing statistics the following rules should be followed:
+//	- NaNs should not be written to min or max statistics fields.
+//	- If the computed max value is zero (whether negative or positive),
+//	  `+0.0` should be written into the max statistics field.
+//	- If the computed min value is zero (whether negative or positive),
+//	  `-0.0` should be written into the min statistics field.
 type ColumnOrder struct {
-  TYPE_ORDER *TypeDefinedOrder `thrift:"TYPE_ORDER,1" db:"TYPE_ORDER" json:"TYPE_ORDER,omitempty"`
+	TYPE_ORDER *TypeDefinedOrder `thrift:"TYPE_ORDER,1" db:"TYPE_ORDER" json:"TYPE_ORDER,omitempty"`
 }
 
 func NewColumnOrder() *ColumnOrder {
-  return &ColumnOrder{}
+	return &ColumnOrder{}
 }
 
 var ColumnOrder_TYPE_ORDER_DEFAULT *TypeDefinedOrder
+
 func (p *ColumnOrder) GetTYPE_ORDER() *TypeDefinedOrder {
-  if !p.IsSetTYPE_ORDER() {
-    return ColumnOrder_TYPE_ORDER_DEFAULT
-  }
-return p.TYPE_ORDER
+	if !p.IsSetTYPE_ORDER() {
+		return ColumnOrder_TYPE_ORDER_DEFAULT
+	}
+	return p.TYPE_ORDER
 }
 func (p *ColumnOrder) CountSetFieldsColumnOrder() int {
-  count := 0
-  if (p.IsSetTYPE_ORDER()) {
-    count++
-  }
-  return count
+	count := 0
+	if p.IsSetTYPE_ORDER() {
+		count++
+	}
+	return count
 
 }
 
 func (p *ColumnOrder) IsSetTYPE_ORDER() bool {
-  return p.TYPE_ORDER != nil
+	return p.TYPE_ORDER != nil
 }
 
 func (p *ColumnOrder) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
-}
-
-func (p *ColumnOrder)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  p.TYPE_ORDER = &TypeDefinedOrder{}
-  if err := p.TYPE_ORDER.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.TYPE_ORDER), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
+}
+
+func (p *ColumnOrder) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	p.TYPE_ORDER = &TypeDefinedOrder{}
+	if err := p.TYPE_ORDER.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.TYPE_ORDER), err)
+	}
+	return nil
 }
 
 func (p *ColumnOrder) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if c := p.CountSetFieldsColumnOrder(); c != 1 {
-    return fmt.Errorf("%T write union: exactly one field must be set (%d set)", p, c)
-  }
-  if err := oprot.WriteStructBegin(ctx, "ColumnOrder"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if c := p.CountSetFieldsColumnOrder(); c != 1 {
+		return fmt.Errorf("%T write union: exactly one field must be set (%d set)", p, c)
+	}
+	if err := oprot.WriteStructBegin(ctx, "ColumnOrder"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *ColumnOrder) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetTYPE_ORDER() {
-    if err := oprot.WriteFieldBegin(ctx, "TYPE_ORDER", thrift.STRUCT, 1); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:TYPE_ORDER: ", p), err) }
-    if err := p.TYPE_ORDER.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.TYPE_ORDER), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:TYPE_ORDER: ", p), err) }
-  }
-  return err
+	if p.IsSetTYPE_ORDER() {
+		if err := oprot.WriteFieldBegin(ctx, "TYPE_ORDER", thrift.STRUCT, 1); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:TYPE_ORDER: ", p), err)
+		}
+		if err := p.TYPE_ORDER.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.TYPE_ORDER), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:TYPE_ORDER: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnOrder) Equals(other *ColumnOrder) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if !p.TYPE_ORDER.Equals(other.TYPE_ORDER) { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if !p.TYPE_ORDER.Equals(other.TYPE_ORDER) {
+		return false
+	}
+	return true
 }
 
 func (p *ColumnOrder) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("ColumnOrder(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("ColumnOrder(%+v)", *p)
 }
 
 func (p *ColumnOrder) Validate() error {
-  return nil
+	return nil
 }
+
 // Attributes:
-//  - Offset: Offset of the page in the file *
-//  - CompressedPageSize: Size of the page, including header. Sum of compressed_page_size and header
+//   - Offset: Offset of the page in the file *
+//   - CompressedPageSize: Size of the page, including header. Sum of compressed_page_size and header
+//
 // length
-//  - FirstRowIndex: Index within the RowGroup of the first row of the page; this means pages
+//   - FirstRowIndex: Index within the RowGroup of the first row of the page; this means pages
+//
 // change on record boundaries (r = 0).
 type PageLocation struct {
-  Offset int64 `thrift:"offset,1,required" db:"offset" json:"offset"`
-  CompressedPageSize int32 `thrift:"compressed_page_size,2,required" db:"compressed_page_size" json:"compressed_page_size"`
-  FirstRowIndex int64 `thrift:"first_row_index,3,required" db:"first_row_index" json:"first_row_index"`
+	Offset             int64 `thrift:"offset,1,required" db:"offset" json:"offset"`
+	CompressedPageSize int32 `thrift:"compressed_page_size,2,required" db:"compressed_page_size" json:"compressed_page_size"`
+	FirstRowIndex      int64 `thrift:"first_row_index,3,required" db:"first_row_index" json:"first_row_index"`
 }
 
 func NewPageLocation() *PageLocation {
-  return &PageLocation{}
+	return &PageLocation{}
 }
 
-
 func (p *PageLocation) GetOffset() int64 {
-  return p.Offset
+	return p.Offset
 }
 
 func (p *PageLocation) GetCompressedPageSize() int32 {
-  return p.CompressedPageSize
+	return p.CompressedPageSize
 }
 
 func (p *PageLocation) GetFirstRowIndex() int64 {
-  return p.FirstRowIndex
+	return p.FirstRowIndex
 }
 func (p *PageLocation) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetOffset bool = false;
-  var issetCompressedPageSize bool = false;
-  var issetFirstRowIndex bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetOffset = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-        issetCompressedPageSize = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-        issetFirstRowIndex = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetOffset{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Offset is not set"));
-  }
-  if !issetCompressedPageSize{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field CompressedPageSize is not set"));
-  }
-  if !issetFirstRowIndex{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field FirstRowIndex is not set"));
-  }
-  return nil
-}
-
-func (p *PageLocation)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  p.Offset = v
-}
-  return nil
-}
-
-func (p *PageLocation)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  p.CompressedPageSize = v
-}
-  return nil
-}
-
-func (p *PageLocation)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 3: ", err)
-} else {
-  p.FirstRowIndex = v
-}
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetOffset bool = false
+	var issetCompressedPageSize bool = false
+	var issetFirstRowIndex bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetOffset = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+				issetCompressedPageSize = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+				issetFirstRowIndex = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetOffset {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Offset is not set"))
+	}
+	if !issetCompressedPageSize {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field CompressedPageSize is not set"))
+	}
+	if !issetFirstRowIndex {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field FirstRowIndex is not set"))
+	}
+	return nil
+}
+
+func (p *PageLocation) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		p.Offset = v
+	}
+	return nil
+}
+
+func (p *PageLocation) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		p.CompressedPageSize = v
+	}
+	return nil
+}
+
+func (p *PageLocation) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 3: ", err)
+	} else {
+		p.FirstRowIndex = v
+	}
+	return nil
 }
 
 func (p *PageLocation) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "PageLocation"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "PageLocation"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *PageLocation) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "offset", thrift.I64, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:offset: ", p), err) }
-  if err := oprot.WriteI64(ctx, int64(p.Offset)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.offset (1) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:offset: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "offset", thrift.I64, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:offset: ", p), err)
+	}
+	if err := oprot.WriteI64(ctx, int64(p.Offset)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.offset (1) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:offset: ", p), err)
+	}
+	return err
 }
 
 func (p *PageLocation) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "compressed_page_size", thrift.I32, 2); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:compressed_page_size: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.CompressedPageSize)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.compressed_page_size (2) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:compressed_page_size: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "compressed_page_size", thrift.I32, 2); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:compressed_page_size: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.CompressedPageSize)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.compressed_page_size (2) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:compressed_page_size: ", p), err)
+	}
+	return err
 }
 
 func (p *PageLocation) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "first_row_index", thrift.I64, 3); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:first_row_index: ", p), err) }
-  if err := oprot.WriteI64(ctx, int64(p.FirstRowIndex)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.first_row_index (3) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:first_row_index: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "first_row_index", thrift.I64, 3); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:first_row_index: ", p), err)
+	}
+	if err := oprot.WriteI64(ctx, int64(p.FirstRowIndex)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.first_row_index (3) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:first_row_index: ", p), err)
+	}
+	return err
 }
 
 func (p *PageLocation) Equals(other *PageLocation) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if p.Offset != other.Offset { return false }
-  if p.CompressedPageSize != other.CompressedPageSize { return false }
-  if p.FirstRowIndex != other.FirstRowIndex { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if p.Offset != other.Offset {
+		return false
+	}
+	if p.CompressedPageSize != other.CompressedPageSize {
+		return false
+	}
+	if p.FirstRowIndex != other.FirstRowIndex {
+		return false
+	}
+	return true
 }
 
 func (p *PageLocation) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("PageLocation(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("PageLocation(%+v)", *p)
 }
 
 func (p *PageLocation) Validate() error {
-  return nil
+	return nil
 }
+
 // Attributes:
-//  - PageLocations: PageLocations, ordered by increasing PageLocation.offset. It is required
+//   - PageLocations: PageLocations, ordered by increasing PageLocation.offset. It is required
+//
 // that page_locations[i].first_row_index < page_locations[i+1].first_row_index.
 type OffsetIndex struct {
-  PageLocations []*PageLocation `thrift:"page_locations,1,required" db:"page_locations" json:"page_locations"`
+	PageLocations []*PageLocation `thrift:"page_locations,1,required" db:"page_locations" json:"page_locations"`
 }
 
 func NewOffsetIndex() *OffsetIndex {
-  return &OffsetIndex{}
+	return &OffsetIndex{}
 }
 
-
 func (p *OffsetIndex) GetPageLocations() []*PageLocation {
-  return p.PageLocations
+	return p.PageLocations
 }
 func (p *OffsetIndex) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetPageLocations bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.LIST {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetPageLocations = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetPageLocations{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field PageLocations is not set"));
-  }
-  return nil
-}
-
-func (p *OffsetIndex)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  _, size, err := iprot.ReadListBegin(ctx)
-  if err != nil {
-    return thrift.PrependError("error reading list begin: ", err)
-  }
-  tSlice := make([]*PageLocation, 0, size)
-  p.PageLocations =  tSlice
-  for i := 0; i < size; i ++ {
-    _elem14 := &PageLocation{}
-    if err := _elem14.Read(ctx, iprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem14), err)
-    }
-    p.PageLocations = append(p.PageLocations, _elem14)
-  }
-  if err := iprot.ReadListEnd(ctx); err != nil {
-    return thrift.PrependError("error reading list end: ", err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetPageLocations bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.LIST {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetPageLocations = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetPageLocations {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field PageLocations is not set"))
+	}
+	return nil
+}
+
+func (p *OffsetIndex) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	_, size, err := iprot.ReadListBegin(ctx)
+	if err != nil {
+		return thrift.PrependError("error reading list begin: ", err)
+	}
+	tSlice := make([]*PageLocation, 0, size)
+	p.PageLocations = tSlice
+	for i := 0; i < size; i++ {
+		_elem14 := &PageLocation{}
+		if err := _elem14.Read(ctx, iprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem14), err)
+		}
+		p.PageLocations = append(p.PageLocations, _elem14)
+	}
+	if err := iprot.ReadListEnd(ctx); err != nil {
+		return thrift.PrependError("error reading list end: ", err)
+	}
+	return nil
 }
 
 func (p *OffsetIndex) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "OffsetIndex"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "OffsetIndex"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *OffsetIndex) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "page_locations", thrift.LIST, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:page_locations: ", p), err) }
-  if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.PageLocations)); err != nil {
-    return thrift.PrependError("error writing list begin: ", err)
-  }
-  for _, v := range p.PageLocations {
-    if err := v.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-    }
-  }
-  if err := oprot.WriteListEnd(ctx); err != nil {
-    return thrift.PrependError("error writing list end: ", err)
-  }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:page_locations: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "page_locations", thrift.LIST, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:page_locations: ", p), err)
+	}
+	if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.PageLocations)); err != nil {
+		return thrift.PrependError("error writing list begin: ", err)
+	}
+	for _, v := range p.PageLocations {
+		if err := v.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+		}
+	}
+	if err := oprot.WriteListEnd(ctx); err != nil {
+		return thrift.PrependError("error writing list end: ", err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:page_locations: ", p), err)
+	}
+	return err
 }
 
 func (p *OffsetIndex) Equals(other *OffsetIndex) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if len(p.PageLocations) != len(other.PageLocations) { return false }
-  for i, _tgt := range p.PageLocations {
-    _src15 := other.PageLocations[i]
-    if !_tgt.Equals(_src15) { return false }
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if len(p.PageLocations) != len(other.PageLocations) {
+		return false
+	}
+	for i, _tgt := range p.PageLocations {
+		_src15 := other.PageLocations[i]
+		if !_tgt.Equals(_src15) {
+			return false
+		}
+	}
+	return true
 }
 
 func (p *OffsetIndex) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("OffsetIndex(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("OffsetIndex(%+v)", *p)
 }
 
 func (p *OffsetIndex) Validate() error {
-  return nil
+	return nil
 }
+
 // Description for ColumnIndex.
 // Each <array-field>[i] refers to the page at OffsetIndex.page_locations[i]
-// 
+//
 // Attributes:
-//  - NullPages: A list of Boolean values to determine the validity of the corresponding
+//   - NullPages: A list of Boolean values to determine the validity of the corresponding
+//
 // min and max values. If true, a page contains only null values, and writers
 // have to set the corresponding entries in min_values and max_values to
 // byte[0], so that all lists have the same length. If false, the
 // corresponding entries in min_values and max_values must be valid.
-//  - MinValues: Two lists containing lower and upper bounds for the values of each page
+//   - MinValues: Two lists containing lower and upper bounds for the values of each page
+//
 // determined by the ColumnOrder of the column. These may be the actual
 // minimum and maximum values found on a page, but can also be (more compact)
 // values that do not exist on a page. For example, instead of storing ""Blart
@@ -9528,1722 +10840,1957 @@ func (p *OffsetIndex) Validate() error {
 // Such more compact values must still be valid values within the column's
 // logical type. Readers must make sure that list entries are populated before
 // using them by inspecting null_pages.
-//  - MaxValues
-//  - BoundaryOrder: Stores whether both min_values and max_values are ordered and if so, in
+//   - MaxValues
+//   - BoundaryOrder: Stores whether both min_values and max_values are ordered and if so, in
+//
 // which direction. This allows readers to perform binary searches in both
 // lists. Readers cannot assume that max_values[i] <= min_values[i+1], even
 // if the lists are ordered.
-//  - NullCounts: A list containing the number of null values for each page *
+//   - NullCounts: A list containing the number of null values for each page *
 type ColumnIndex struct {
-  NullPages []bool `thrift:"null_pages,1,required" db:"null_pages" json:"null_pages"`
-  MinValues [][]byte `thrift:"min_values,2,required" db:"min_values" json:"min_values"`
-  MaxValues [][]byte `thrift:"max_values,3,required" db:"max_values" json:"max_values"`
-  BoundaryOrder BoundaryOrder `thrift:"boundary_order,4,required" db:"boundary_order" json:"boundary_order"`
-  NullCounts []int64 `thrift:"null_counts,5" db:"null_counts" json:"null_counts,omitempty"`
+	NullPages     []bool        `thrift:"null_pages,1,required" db:"null_pages" json:"null_pages"`
+	MinValues     [][]byte      `thrift:"min_values,2,required" db:"min_values" json:"min_values"`
+	MaxValues     [][]byte      `thrift:"max_values,3,required" db:"max_values" json:"max_values"`
+	BoundaryOrder BoundaryOrder `thrift:"boundary_order,4,required" db:"boundary_order" json:"boundary_order"`
+	NullCounts    []int64       `thrift:"null_counts,5" db:"null_counts" json:"null_counts,omitempty"`
 }
 
 func NewColumnIndex() *ColumnIndex {
-  return &ColumnIndex{}
+	return &ColumnIndex{}
 }
 
-
 func (p *ColumnIndex) GetNullPages() []bool {
-  return p.NullPages
+	return p.NullPages
 }
 
 func (p *ColumnIndex) GetMinValues() [][]byte {
-  return p.MinValues
+	return p.MinValues
 }
 
 func (p *ColumnIndex) GetMaxValues() [][]byte {
-  return p.MaxValues
+	return p.MaxValues
 }
 
 func (p *ColumnIndex) GetBoundaryOrder() BoundaryOrder {
-  return p.BoundaryOrder
+	return p.BoundaryOrder
 }
+
 var ColumnIndex_NullCounts_DEFAULT []int64
 
 func (p *ColumnIndex) GetNullCounts() []int64 {
-  return p.NullCounts
+	return p.NullCounts
 }
 func (p *ColumnIndex) IsSetNullCounts() bool {
-  return p.NullCounts != nil
+	return p.NullCounts != nil
 }
 
 func (p *ColumnIndex) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetNullPages bool = false;
-  var issetMinValues bool = false;
-  var issetMaxValues bool = false;
-  var issetBoundaryOrder bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.LIST {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetNullPages = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.LIST {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-        issetMinValues = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.LIST {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-        issetMaxValues = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 4:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField4(ctx, iprot); err != nil {
-          return err
-        }
-        issetBoundaryOrder = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 5:
-      if fieldTypeId == thrift.LIST {
-        if err := p.ReadField5(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetNullPages{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NullPages is not set"));
-  }
-  if !issetMinValues{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field MinValues is not set"));
-  }
-  if !issetMaxValues{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field MaxValues is not set"));
-  }
-  if !issetBoundaryOrder{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field BoundaryOrder is not set"));
-  }
-  return nil
-}
-
-func (p *ColumnIndex)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  _, size, err := iprot.ReadListBegin(ctx)
-  if err != nil {
-    return thrift.PrependError("error reading list begin: ", err)
-  }
-  tSlice := make([]bool, 0, size)
-  p.NullPages =  tSlice
-  for i := 0; i < size; i ++ {
-var _elem16 bool
-    if v, err := iprot.ReadBool(ctx); err != nil {
-    return thrift.PrependError("error reading field 0: ", err)
-} else {
-    _elem16 = v
-}
-    p.NullPages = append(p.NullPages, _elem16)
-  }
-  if err := iprot.ReadListEnd(ctx); err != nil {
-    return thrift.PrependError("error reading list end: ", err)
-  }
-  return nil
-}
-
-func (p *ColumnIndex)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  _, size, err := iprot.ReadListBegin(ctx)
-  if err != nil {
-    return thrift.PrependError("error reading list begin: ", err)
-  }
-  tSlice := make([][]byte, 0, size)
-  p.MinValues =  tSlice
-  for i := 0; i < size; i ++ {
-var _elem17 []byte
-    if v, err := iprot.ReadBinary(ctx); err != nil {
-    return thrift.PrependError("error reading field 0: ", err)
-} else {
-    _elem17 = v
-}
-    p.MinValues = append(p.MinValues, _elem17)
-  }
-  if err := iprot.ReadListEnd(ctx); err != nil {
-    return thrift.PrependError("error reading list end: ", err)
-  }
-  return nil
-}
-
-func (p *ColumnIndex)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  _, size, err := iprot.ReadListBegin(ctx)
-  if err != nil {
-    return thrift.PrependError("error reading list begin: ", err)
-  }
-  tSlice := make([][]byte, 0, size)
-  p.MaxValues =  tSlice
-  for i := 0; i < size; i ++ {
-var _elem18 []byte
-    if v, err := iprot.ReadBinary(ctx); err != nil {
-    return thrift.PrependError("error reading field 0: ", err)
-} else {
-    _elem18 = v
-}
-    p.MaxValues = append(p.MaxValues, _elem18)
-  }
-  if err := iprot.ReadListEnd(ctx); err != nil {
-    return thrift.PrependError("error reading list end: ", err)
-  }
-  return nil
-}
-
-func (p *ColumnIndex)  ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 4: ", err)
-} else {
-  temp := BoundaryOrder(v)
-  p.BoundaryOrder = temp
-}
-  return nil
-}
-
-func (p *ColumnIndex)  ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
-  _, size, err := iprot.ReadListBegin(ctx)
-  if err != nil {
-    return thrift.PrependError("error reading list begin: ", err)
-  }
-  tSlice := make([]int64, 0, size)
-  p.NullCounts =  tSlice
-  for i := 0; i < size; i ++ {
-var _elem19 int64
-    if v, err := iprot.ReadI64(ctx); err != nil {
-    return thrift.PrependError("error reading field 0: ", err)
-} else {
-    _elem19 = v
-}
-    p.NullCounts = append(p.NullCounts, _elem19)
-  }
-  if err := iprot.ReadListEnd(ctx); err != nil {
-    return thrift.PrependError("error reading list end: ", err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetNullPages bool = false
+	var issetMinValues bool = false
+	var issetMaxValues bool = false
+	var issetBoundaryOrder bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.LIST {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetNullPages = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.LIST {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+				issetMinValues = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.LIST {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+				issetMaxValues = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 4:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField4(ctx, iprot); err != nil {
+					return err
+				}
+				issetBoundaryOrder = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 5:
+			if fieldTypeId == thrift.LIST {
+				if err := p.ReadField5(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetNullPages {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NullPages is not set"))
+	}
+	if !issetMinValues {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field MinValues is not set"))
+	}
+	if !issetMaxValues {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field MaxValues is not set"))
+	}
+	if !issetBoundaryOrder {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field BoundaryOrder is not set"))
+	}
+	return nil
+}
+
+func (p *ColumnIndex) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	_, size, err := iprot.ReadListBegin(ctx)
+	if err != nil {
+		return thrift.PrependError("error reading list begin: ", err)
+	}
+	tSlice := make([]bool, 0, size)
+	p.NullPages = tSlice
+	for i := 0; i < size; i++ {
+		var _elem16 bool
+		if v, err := iprot.ReadBool(ctx); err != nil {
+			return thrift.PrependError("error reading field 0: ", err)
+		} else {
+			_elem16 = v
+		}
+		p.NullPages = append(p.NullPages, _elem16)
+	}
+	if err := iprot.ReadListEnd(ctx); err != nil {
+		return thrift.PrependError("error reading list end: ", err)
+	}
+	return nil
+}
+
+func (p *ColumnIndex) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	_, size, err := iprot.ReadListBegin(ctx)
+	if err != nil {
+		return thrift.PrependError("error reading list begin: ", err)
+	}
+	tSlice := make([][]byte, 0, size)
+	p.MinValues = tSlice
+	for i := 0; i < size; i++ {
+		var _elem17 []byte
+		if v, err := iprot.ReadBinary(ctx); err != nil {
+			return thrift.PrependError("error reading field 0: ", err)
+		} else {
+			_elem17 = v
+		}
+		p.MinValues = append(p.MinValues, _elem17)
+	}
+	if err := iprot.ReadListEnd(ctx); err != nil {
+		return thrift.PrependError("error reading list end: ", err)
+	}
+	return nil
+}
+
+func (p *ColumnIndex) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	_, size, err := iprot.ReadListBegin(ctx)
+	if err != nil {
+		return thrift.PrependError("error reading list begin: ", err)
+	}
+	tSlice := make([][]byte, 0, size)
+	p.MaxValues = tSlice
+	for i := 0; i < size; i++ {
+		var _elem18 []byte
+		if v, err := iprot.ReadBinary(ctx); err != nil {
+			return thrift.PrependError("error reading field 0: ", err)
+		} else {
+			_elem18 = v
+		}
+		p.MaxValues = append(p.MaxValues, _elem18)
+	}
+	if err := iprot.ReadListEnd(ctx); err != nil {
+		return thrift.PrependError("error reading list end: ", err)
+	}
+	return nil
+}
+
+func (p *ColumnIndex) ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 4: ", err)
+	} else {
+		temp := BoundaryOrder(v)
+		p.BoundaryOrder = temp
+	}
+	return nil
+}
+
+func (p *ColumnIndex) ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
+	_, size, err := iprot.ReadListBegin(ctx)
+	if err != nil {
+		return thrift.PrependError("error reading list begin: ", err)
+	}
+	tSlice := make([]int64, 0, size)
+	p.NullCounts = tSlice
+	for i := 0; i < size; i++ {
+		var _elem19 int64
+		if v, err := iprot.ReadI64(ctx); err != nil {
+			return thrift.PrependError("error reading field 0: ", err)
+		} else {
+			_elem19 = v
+		}
+		p.NullCounts = append(p.NullCounts, _elem19)
+	}
+	if err := iprot.ReadListEnd(ctx); err != nil {
+		return thrift.PrependError("error reading list end: ", err)
+	}
+	return nil
 }
 
 func (p *ColumnIndex) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "ColumnIndex"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-    if err := p.writeField4(ctx, oprot); err != nil { return err }
-    if err := p.writeField5(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "ColumnIndex"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField4(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField5(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *ColumnIndex) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "null_pages", thrift.LIST, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:null_pages: ", p), err) }
-  if err := oprot.WriteListBegin(ctx, thrift.BOOL, len(p.NullPages)); err != nil {
-    return thrift.PrependError("error writing list begin: ", err)
-  }
-  for _, v := range p.NullPages {
-    if err := oprot.WriteBool(ctx, bool(v)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
-  }
-  if err := oprot.WriteListEnd(ctx); err != nil {
-    return thrift.PrependError("error writing list end: ", err)
-  }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:null_pages: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "null_pages", thrift.LIST, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:null_pages: ", p), err)
+	}
+	if err := oprot.WriteListBegin(ctx, thrift.BOOL, len(p.NullPages)); err != nil {
+		return thrift.PrependError("error writing list begin: ", err)
+	}
+	for _, v := range p.NullPages {
+		if err := oprot.WriteBool(ctx, bool(v)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
+		}
+	}
+	if err := oprot.WriteListEnd(ctx); err != nil {
+		return thrift.PrependError("error writing list end: ", err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:null_pages: ", p), err)
+	}
+	return err
 }
 
 func (p *ColumnIndex) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "min_values", thrift.LIST, 2); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:min_values: ", p), err) }
-  if err := oprot.WriteListBegin(ctx, thrift.STRING, len(p.MinValues)); err != nil {
-    return thrift.PrependError("error writing list begin: ", err)
-  }
-  for _, v := range p.MinValues {
-    if err := oprot.WriteBinary(ctx, v); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
-  }
-  if err := oprot.WriteListEnd(ctx); err != nil {
-    return thrift.PrependError("error writing list end: ", err)
-  }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:min_values: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "min_values", thrift.LIST, 2); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:min_values: ", p), err)
+	}
+	if err := oprot.WriteListBegin(ctx, thrift.STRING, len(p.MinValues)); err != nil {
+		return thrift.PrependError("error writing list begin: ", err)
+	}
+	for _, v := range p.MinValues {
+		if err := oprot.WriteBinary(ctx, v); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
+		}
+	}
+	if err := oprot.WriteListEnd(ctx); err != nil {
+		return thrift.PrependError("error writing list end: ", err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:min_values: ", p), err)
+	}
+	return err
 }
 
 func (p *ColumnIndex) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "max_values", thrift.LIST, 3); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:max_values: ", p), err) }
-  if err := oprot.WriteListBegin(ctx, thrift.STRING, len(p.MaxValues)); err != nil {
-    return thrift.PrependError("error writing list begin: ", err)
-  }
-  for _, v := range p.MaxValues {
-    if err := oprot.WriteBinary(ctx, v); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
-  }
-  if err := oprot.WriteListEnd(ctx); err != nil {
-    return thrift.PrependError("error writing list end: ", err)
-  }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:max_values: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "max_values", thrift.LIST, 3); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:max_values: ", p), err)
+	}
+	if err := oprot.WriteListBegin(ctx, thrift.STRING, len(p.MaxValues)); err != nil {
+		return thrift.PrependError("error writing list begin: ", err)
+	}
+	for _, v := range p.MaxValues {
+		if err := oprot.WriteBinary(ctx, v); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
+		}
+	}
+	if err := oprot.WriteListEnd(ctx); err != nil {
+		return thrift.PrependError("error writing list end: ", err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:max_values: ", p), err)
+	}
+	return err
 }
 
 func (p *ColumnIndex) writeField4(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "boundary_order", thrift.I32, 4); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:boundary_order: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.BoundaryOrder)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.boundary_order (4) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:boundary_order: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "boundary_order", thrift.I32, 4); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:boundary_order: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.BoundaryOrder)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.boundary_order (4) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:boundary_order: ", p), err)
+	}
+	return err
 }
 
 func (p *ColumnIndex) writeField5(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetNullCounts() {
-    if err := oprot.WriteFieldBegin(ctx, "null_counts", thrift.LIST, 5); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:null_counts: ", p), err) }
-    if err := oprot.WriteListBegin(ctx, thrift.I64, len(p.NullCounts)); err != nil {
-      return thrift.PrependError("error writing list begin: ", err)
-    }
-    for _, v := range p.NullCounts {
-      if err := oprot.WriteI64(ctx, int64(v)); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err) }
-    }
-    if err := oprot.WriteListEnd(ctx); err != nil {
-      return thrift.PrependError("error writing list end: ", err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 5:null_counts: ", p), err) }
-  }
-  return err
+	if p.IsSetNullCounts() {
+		if err := oprot.WriteFieldBegin(ctx, "null_counts", thrift.LIST, 5); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:null_counts: ", p), err)
+		}
+		if err := oprot.WriteListBegin(ctx, thrift.I64, len(p.NullCounts)); err != nil {
+			return thrift.PrependError("error writing list begin: ", err)
+		}
+		for _, v := range p.NullCounts {
+			if err := oprot.WriteI64(ctx, int64(v)); err != nil {
+				return thrift.PrependError(fmt.Sprintf("%T. (0) field write error: ", p), err)
+			}
+		}
+		if err := oprot.WriteListEnd(ctx); err != nil {
+			return thrift.PrependError("error writing list end: ", err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 5:null_counts: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *ColumnIndex) Equals(other *ColumnIndex) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if len(p.NullPages) != len(other.NullPages) { return false }
-  for i, _tgt := range p.NullPages {
-    _src20 := other.NullPages[i]
-    if _tgt != _src20 { return false }
-  }
-  if len(p.MinValues) != len(other.MinValues) { return false }
-  for i, _tgt := range p.MinValues {
-    _src21 := other.MinValues[i]
-    if bytes.Compare(_tgt, _src21) != 0 { return false }
-  }
-  if len(p.MaxValues) != len(other.MaxValues) { return false }
-  for i, _tgt := range p.MaxValues {
-    _src22 := other.MaxValues[i]
-    if bytes.Compare(_tgt, _src22) != 0 { return false }
-  }
-  if p.BoundaryOrder != other.BoundaryOrder { return false }
-  if len(p.NullCounts) != len(other.NullCounts) { return false }
-  for i, _tgt := range p.NullCounts {
-    _src23 := other.NullCounts[i]
-    if _tgt != _src23 { return false }
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if len(p.NullPages) != len(other.NullPages) {
+		return false
+	}
+	for i, _tgt := range p.NullPages {
+		_src20 := other.NullPages[i]
+		if _tgt != _src20 {
+			return false
+		}
+	}
+	if len(p.MinValues) != len(other.MinValues) {
+		return false
+	}
+	for i, _tgt := range p.MinValues {
+		_src21 := other.MinValues[i]
+		if bytes.Compare(_tgt, _src21) != 0 {
+			return false
+		}
+	}
+	if len(p.MaxValues) != len(other.MaxValues) {
+		return false
+	}
+	for i, _tgt := range p.MaxValues {
+		_src22 := other.MaxValues[i]
+		if bytes.Compare(_tgt, _src22) != 0 {
+			return false
+		}
+	}
+	if p.BoundaryOrder != other.BoundaryOrder {
+		return false
+	}
+	if len(p.NullCounts) != len(other.NullCounts) {
+		return false
+	}
+	for i, _tgt := range p.NullCounts {
+		_src23 := other.NullCounts[i]
+		if _tgt != _src23 {
+			return false
+		}
+	}
+	return true
 }
 
 func (p *ColumnIndex) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("ColumnIndex(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("ColumnIndex(%+v)", *p)
 }
 
 func (p *ColumnIndex) Validate() error {
-  return nil
+	return nil
 }
+
 // Attributes:
-//  - AadPrefix: AAD prefix *
-//  - AadFileUnique: Unique file identifier part of AAD suffix *
-//  - SupplyAadPrefix: In files encrypted with AAD prefix without storing it,
+//   - AadPrefix: AAD prefix *
+//   - AadFileUnique: Unique file identifier part of AAD suffix *
+//   - SupplyAadPrefix: In files encrypted with AAD prefix without storing it,
+//
 // readers must supply the prefix *
 type AesGcmV1 struct {
-  AadPrefix []byte `thrift:"aad_prefix,1" db:"aad_prefix" json:"aad_prefix,omitempty"`
-  AadFileUnique []byte `thrift:"aad_file_unique,2" db:"aad_file_unique" json:"aad_file_unique,omitempty"`
-  SupplyAadPrefix *bool `thrift:"supply_aad_prefix,3" db:"supply_aad_prefix" json:"supply_aad_prefix,omitempty"`
+	AadPrefix       []byte `thrift:"aad_prefix,1" db:"aad_prefix" json:"aad_prefix,omitempty"`
+	AadFileUnique   []byte `thrift:"aad_file_unique,2" db:"aad_file_unique" json:"aad_file_unique,omitempty"`
+	SupplyAadPrefix *bool  `thrift:"supply_aad_prefix,3" db:"supply_aad_prefix" json:"supply_aad_prefix,omitempty"`
 }
 
 func NewAesGcmV1() *AesGcmV1 {
-  return &AesGcmV1{}
+	return &AesGcmV1{}
 }
 
 var AesGcmV1_AadPrefix_DEFAULT []byte
 
 func (p *AesGcmV1) GetAadPrefix() []byte {
-  return p.AadPrefix
+	return p.AadPrefix
 }
+
 var AesGcmV1_AadFileUnique_DEFAULT []byte
 
 func (p *AesGcmV1) GetAadFileUnique() []byte {
-  return p.AadFileUnique
+	return p.AadFileUnique
 }
+
 var AesGcmV1_SupplyAadPrefix_DEFAULT bool
+
 func (p *AesGcmV1) GetSupplyAadPrefix() bool {
-  if !p.IsSetSupplyAadPrefix() {
-    return AesGcmV1_SupplyAadPrefix_DEFAULT
-  }
-return *p.SupplyAadPrefix
+	if !p.IsSetSupplyAadPrefix() {
+		return AesGcmV1_SupplyAadPrefix_DEFAULT
+	}
+	return *p.SupplyAadPrefix
 }
 func (p *AesGcmV1) IsSetAadPrefix() bool {
-  return p.AadPrefix != nil
+	return p.AadPrefix != nil
 }
 
 func (p *AesGcmV1) IsSetAadFileUnique() bool {
-  return p.AadFileUnique != nil
+	return p.AadFileUnique != nil
 }
 
 func (p *AesGcmV1) IsSetSupplyAadPrefix() bool {
-  return p.SupplyAadPrefix != nil
+	return p.SupplyAadPrefix != nil
 }
 
 func (p *AesGcmV1) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.STRING {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.STRING {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.BOOL {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
-}
-
-func (p *AesGcmV1)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBinary(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  p.AadPrefix = v
-}
-  return nil
-}
-
-func (p *AesGcmV1)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBinary(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  p.AadFileUnique = v
-}
-  return nil
-}
-
-func (p *AesGcmV1)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBool(ctx); err != nil {
-  return thrift.PrependError("error reading field 3: ", err)
-} else {
-  p.SupplyAadPrefix = &v
-}
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.STRING {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.STRING {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.BOOL {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
+}
+
+func (p *AesGcmV1) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBinary(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		p.AadPrefix = v
+	}
+	return nil
+}
+
+func (p *AesGcmV1) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBinary(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		p.AadFileUnique = v
+	}
+	return nil
+}
+
+func (p *AesGcmV1) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBool(ctx); err != nil {
+		return thrift.PrependError("error reading field 3: ", err)
+	} else {
+		p.SupplyAadPrefix = &v
+	}
+	return nil
 }
 
 func (p *AesGcmV1) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "AesGcmV1"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "AesGcmV1"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *AesGcmV1) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetAadPrefix() {
-    if err := oprot.WriteFieldBegin(ctx, "aad_prefix", thrift.STRING, 1); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:aad_prefix: ", p), err) }
-    if err := oprot.WriteBinary(ctx, p.AadPrefix); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.aad_prefix (1) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:aad_prefix: ", p), err) }
-  }
-  return err
+	if p.IsSetAadPrefix() {
+		if err := oprot.WriteFieldBegin(ctx, "aad_prefix", thrift.STRING, 1); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:aad_prefix: ", p), err)
+		}
+		if err := oprot.WriteBinary(ctx, p.AadPrefix); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.aad_prefix (1) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:aad_prefix: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *AesGcmV1) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetAadFileUnique() {
-    if err := oprot.WriteFieldBegin(ctx, "aad_file_unique", thrift.STRING, 2); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:aad_file_unique: ", p), err) }
-    if err := oprot.WriteBinary(ctx, p.AadFileUnique); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.aad_file_unique (2) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:aad_file_unique: ", p), err) }
-  }
-  return err
+	if p.IsSetAadFileUnique() {
+		if err := oprot.WriteFieldBegin(ctx, "aad_file_unique", thrift.STRING, 2); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:aad_file_unique: ", p), err)
+		}
+		if err := oprot.WriteBinary(ctx, p.AadFileUnique); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.aad_file_unique (2) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:aad_file_unique: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *AesGcmV1) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetSupplyAadPrefix() {
-    if err := oprot.WriteFieldBegin(ctx, "supply_aad_prefix", thrift.BOOL, 3); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:supply_aad_prefix: ", p), err) }
-    if err := oprot.WriteBool(ctx, bool(*p.SupplyAadPrefix)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.supply_aad_prefix (3) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:supply_aad_prefix: ", p), err) }
-  }
-  return err
+	if p.IsSetSupplyAadPrefix() {
+		if err := oprot.WriteFieldBegin(ctx, "supply_aad_prefix", thrift.BOOL, 3); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:supply_aad_prefix: ", p), err)
+		}
+		if err := oprot.WriteBool(ctx, bool(*p.SupplyAadPrefix)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.supply_aad_prefix (3) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:supply_aad_prefix: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *AesGcmV1) Equals(other *AesGcmV1) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if bytes.Compare(p.AadPrefix, other.AadPrefix) != 0 { return false }
-  if bytes.Compare(p.AadFileUnique, other.AadFileUnique) != 0 { return false }
-  if p.SupplyAadPrefix != other.SupplyAadPrefix {
-    if p.SupplyAadPrefix == nil || other.SupplyAadPrefix == nil {
-      return false
-    }
-    if (*p.SupplyAadPrefix) != (*other.SupplyAadPrefix) { return false }
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if bytes.Compare(p.AadPrefix, other.AadPrefix) != 0 {
+		return false
+	}
+	if bytes.Compare(p.AadFileUnique, other.AadFileUnique) != 0 {
+		return false
+	}
+	if p.SupplyAadPrefix != other.SupplyAadPrefix {
+		if p.SupplyAadPrefix == nil || other.SupplyAadPrefix == nil {
+			return false
+		}
+		if (*p.SupplyAadPrefix) != (*other.SupplyAadPrefix) {
+			return false
+		}
+	}
+	return true
 }
 
 func (p *AesGcmV1) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("AesGcmV1(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("AesGcmV1(%+v)", *p)
 }
 
 func (p *AesGcmV1) Validate() error {
-  return nil
+	return nil
 }
+
 // Attributes:
-//  - AadPrefix: AAD prefix *
-//  - AadFileUnique: Unique file identifier part of AAD suffix *
-//  - SupplyAadPrefix: In files encrypted with AAD prefix without storing it,
+//   - AadPrefix: AAD prefix *
+//   - AadFileUnique: Unique file identifier part of AAD suffix *
+//   - SupplyAadPrefix: In files encrypted with AAD prefix without storing it,
+//
 // readers must supply the prefix *
 type AesGcmCtrV1 struct {
-  AadPrefix []byte `thrift:"aad_prefix,1" db:"aad_prefix" json:"aad_prefix,omitempty"`
-  AadFileUnique []byte `thrift:"aad_file_unique,2" db:"aad_file_unique" json:"aad_file_unique,omitempty"`
-  SupplyAadPrefix *bool `thrift:"supply_aad_prefix,3" db:"supply_aad_prefix" json:"supply_aad_prefix,omitempty"`
+	AadPrefix       []byte `thrift:"aad_prefix,1" db:"aad_prefix" json:"aad_prefix,omitempty"`
+	AadFileUnique   []byte `thrift:"aad_file_unique,2" db:"aad_file_unique" json:"aad_file_unique,omitempty"`
+	SupplyAadPrefix *bool  `thrift:"supply_aad_prefix,3" db:"supply_aad_prefix" json:"supply_aad_prefix,omitempty"`
 }
 
 func NewAesGcmCtrV1() *AesGcmCtrV1 {
-  return &AesGcmCtrV1{}
+	return &AesGcmCtrV1{}
 }
 
 var AesGcmCtrV1_AadPrefix_DEFAULT []byte
 
 func (p *AesGcmCtrV1) GetAadPrefix() []byte {
-  return p.AadPrefix
+	return p.AadPrefix
 }
+
 var AesGcmCtrV1_AadFileUnique_DEFAULT []byte
 
 func (p *AesGcmCtrV1) GetAadFileUnique() []byte {
-  return p.AadFileUnique
+	return p.AadFileUnique
 }
+
 var AesGcmCtrV1_SupplyAadPrefix_DEFAULT bool
+
 func (p *AesGcmCtrV1) GetSupplyAadPrefix() bool {
-  if !p.IsSetSupplyAadPrefix() {
-    return AesGcmCtrV1_SupplyAadPrefix_DEFAULT
-  }
-return *p.SupplyAadPrefix
+	if !p.IsSetSupplyAadPrefix() {
+		return AesGcmCtrV1_SupplyAadPrefix_DEFAULT
+	}
+	return *p.SupplyAadPrefix
 }
 func (p *AesGcmCtrV1) IsSetAadPrefix() bool {
-  return p.AadPrefix != nil
+	return p.AadPrefix != nil
 }
 
 func (p *AesGcmCtrV1) IsSetAadFileUnique() bool {
-  return p.AadFileUnique != nil
+	return p.AadFileUnique != nil
 }
 
 func (p *AesGcmCtrV1) IsSetSupplyAadPrefix() bool {
-  return p.SupplyAadPrefix != nil
+	return p.SupplyAadPrefix != nil
 }
 
 func (p *AesGcmCtrV1) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.STRING {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.STRING {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.BOOL {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
-}
-
-func (p *AesGcmCtrV1)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBinary(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  p.AadPrefix = v
-}
-  return nil
-}
-
-func (p *AesGcmCtrV1)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBinary(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  p.AadFileUnique = v
-}
-  return nil
-}
-
-func (p *AesGcmCtrV1)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBool(ctx); err != nil {
-  return thrift.PrependError("error reading field 3: ", err)
-} else {
-  p.SupplyAadPrefix = &v
-}
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.STRING {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.STRING {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.BOOL {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
+}
+
+func (p *AesGcmCtrV1) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBinary(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		p.AadPrefix = v
+	}
+	return nil
+}
+
+func (p *AesGcmCtrV1) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBinary(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		p.AadFileUnique = v
+	}
+	return nil
+}
+
+func (p *AesGcmCtrV1) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBool(ctx); err != nil {
+		return thrift.PrependError("error reading field 3: ", err)
+	} else {
+		p.SupplyAadPrefix = &v
+	}
+	return nil
 }
 
 func (p *AesGcmCtrV1) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "AesGcmCtrV1"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "AesGcmCtrV1"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *AesGcmCtrV1) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetAadPrefix() {
-    if err := oprot.WriteFieldBegin(ctx, "aad_prefix", thrift.STRING, 1); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:aad_prefix: ", p), err) }
-    if err := oprot.WriteBinary(ctx, p.AadPrefix); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.aad_prefix (1) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:aad_prefix: ", p), err) }
-  }
-  return err
+	if p.IsSetAadPrefix() {
+		if err := oprot.WriteFieldBegin(ctx, "aad_prefix", thrift.STRING, 1); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:aad_prefix: ", p), err)
+		}
+		if err := oprot.WriteBinary(ctx, p.AadPrefix); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.aad_prefix (1) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:aad_prefix: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *AesGcmCtrV1) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetAadFileUnique() {
-    if err := oprot.WriteFieldBegin(ctx, "aad_file_unique", thrift.STRING, 2); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:aad_file_unique: ", p), err) }
-    if err := oprot.WriteBinary(ctx, p.AadFileUnique); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.aad_file_unique (2) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:aad_file_unique: ", p), err) }
-  }
-  return err
+	if p.IsSetAadFileUnique() {
+		if err := oprot.WriteFieldBegin(ctx, "aad_file_unique", thrift.STRING, 2); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:aad_file_unique: ", p), err)
+		}
+		if err := oprot.WriteBinary(ctx, p.AadFileUnique); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.aad_file_unique (2) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:aad_file_unique: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *AesGcmCtrV1) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetSupplyAadPrefix() {
-    if err := oprot.WriteFieldBegin(ctx, "supply_aad_prefix", thrift.BOOL, 3); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:supply_aad_prefix: ", p), err) }
-    if err := oprot.WriteBool(ctx, bool(*p.SupplyAadPrefix)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.supply_aad_prefix (3) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 3:supply_aad_prefix: ", p), err) }
-  }
-  return err
+	if p.IsSetSupplyAadPrefix() {
+		if err := oprot.WriteFieldBegin(ctx, "supply_aad_prefix", thrift.BOOL, 3); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:supply_aad_prefix: ", p), err)
+		}
+		if err := oprot.WriteBool(ctx, bool(*p.SupplyAadPrefix)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.supply_aad_prefix (3) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 3:supply_aad_prefix: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *AesGcmCtrV1) Equals(other *AesGcmCtrV1) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if bytes.Compare(p.AadPrefix, other.AadPrefix) != 0 { return false }
-  if bytes.Compare(p.AadFileUnique, other.AadFileUnique) != 0 { return false }
-  if p.SupplyAadPrefix != other.SupplyAadPrefix {
-    if p.SupplyAadPrefix == nil || other.SupplyAadPrefix == nil {
-      return false
-    }
-    if (*p.SupplyAadPrefix) != (*other.SupplyAadPrefix) { return false }
-  }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if bytes.Compare(p.AadPrefix, other.AadPrefix) != 0 {
+		return false
+	}
+	if bytes.Compare(p.AadFileUnique, other.AadFileUnique) != 0 {
+		return false
+	}
+	if p.SupplyAadPrefix != other.SupplyAadPrefix {
+		if p.SupplyAadPrefix == nil || other.SupplyAadPrefix == nil {
+			return false
+		}
+		if (*p.SupplyAadPrefix) != (*other.SupplyAadPrefix) {
+			return false
+		}
+	}
+	return true
 }
 
 func (p *AesGcmCtrV1) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("AesGcmCtrV1(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("AesGcmCtrV1(%+v)", *p)
 }
 
 func (p *AesGcmCtrV1) Validate() error {
-  return nil
+	return nil
 }
+
 // Attributes:
-//  - AES_GCM_V1
-//  - AES_GCM_CTR_V1
+//   - AES_GCM_V1
+//   - AES_GCM_CTR_V1
 type EncryptionAlgorithm struct {
-  AES_GCM_V1 *AesGcmV1 `thrift:"AES_GCM_V1,1" db:"AES_GCM_V1" json:"AES_GCM_V1,omitempty"`
-  AES_GCM_CTR_V1 *AesGcmCtrV1 `thrift:"AES_GCM_CTR_V1,2" db:"AES_GCM_CTR_V1" json:"AES_GCM_CTR_V1,omitempty"`
+	AES_GCM_V1     *AesGcmV1    `thrift:"AES_GCM_V1,1" db:"AES_GCM_V1" json:"AES_GCM_V1,omitempty"`
+	AES_GCM_CTR_V1 *AesGcmCtrV1 `thrift:"AES_GCM_CTR_V1,2" db:"AES_GCM_CTR_V1" json:"AES_GCM_CTR_V1,omitempty"`
 }
 
 func NewEncryptionAlgorithm() *EncryptionAlgorithm {
-  return &EncryptionAlgorithm{}
+	return &EncryptionAlgorithm{}
 }
 
 var EncryptionAlgorithm_AES_GCM_V1_DEFAULT *AesGcmV1
+
 func (p *EncryptionAlgorithm) GetAES_GCM_V1() *AesGcmV1 {
-  if !p.IsSetAES_GCM_V1() {
-    return EncryptionAlgorithm_AES_GCM_V1_DEFAULT
-  }
-return p.AES_GCM_V1
+	if !p.IsSetAES_GCM_V1() {
+		return EncryptionAlgorithm_AES_GCM_V1_DEFAULT
+	}
+	return p.AES_GCM_V1
 }
+
 var EncryptionAlgorithm_AES_GCM_CTR_V1_DEFAULT *AesGcmCtrV1
+
 func (p *EncryptionAlgorithm) GetAES_GCM_CTR_V1() *AesGcmCtrV1 {
-  if !p.IsSetAES_GCM_CTR_V1() {
-    return EncryptionAlgorithm_AES_GCM_CTR_V1_DEFAULT
-  }
-return p.AES_GCM_CTR_V1
+	if !p.IsSetAES_GCM_CTR_V1() {
+		return EncryptionAlgorithm_AES_GCM_CTR_V1_DEFAULT
+	}
+	return p.AES_GCM_CTR_V1
 }
 func (p *EncryptionAlgorithm) CountSetFieldsEncryptionAlgorithm() int {
-  count := 0
-  if (p.IsSetAES_GCM_V1()) {
-    count++
-  }
-  if (p.IsSetAES_GCM_CTR_V1()) {
-    count++
-  }
-  return count
+	count := 0
+	if p.IsSetAES_GCM_V1() {
+		count++
+	}
+	if p.IsSetAES_GCM_CTR_V1() {
+		count++
+	}
+	return count
 
 }
 
 func (p *EncryptionAlgorithm) IsSetAES_GCM_V1() bool {
-  return p.AES_GCM_V1 != nil
+	return p.AES_GCM_V1 != nil
 }
 
 func (p *EncryptionAlgorithm) IsSetAES_GCM_CTR_V1() bool {
-  return p.AES_GCM_CTR_V1 != nil
+	return p.AES_GCM_CTR_V1 != nil
 }
 
 func (p *EncryptionAlgorithm) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  return nil
-}
-
-func (p *EncryptionAlgorithm)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  p.AES_GCM_V1 = &AesGcmV1{}
-  if err := p.AES_GCM_V1.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.AES_GCM_V1), err)
-  }
-  return nil
-}
-
-func (p *EncryptionAlgorithm)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  p.AES_GCM_CTR_V1 = &AesGcmCtrV1{}
-  if err := p.AES_GCM_CTR_V1.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.AES_GCM_CTR_V1), err)
-  }
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	return nil
+}
+
+func (p *EncryptionAlgorithm) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	p.AES_GCM_V1 = &AesGcmV1{}
+	if err := p.AES_GCM_V1.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.AES_GCM_V1), err)
+	}
+	return nil
+}
+
+func (p *EncryptionAlgorithm) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	p.AES_GCM_CTR_V1 = &AesGcmCtrV1{}
+	if err := p.AES_GCM_CTR_V1.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.AES_GCM_CTR_V1), err)
+	}
+	return nil
 }
 
 func (p *EncryptionAlgorithm) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if c := p.CountSetFieldsEncryptionAlgorithm(); c != 1 {
-    return fmt.Errorf("%T write union: exactly one field must be set (%d set)", p, c)
-  }
-  if err := oprot.WriteStructBegin(ctx, "EncryptionAlgorithm"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if c := p.CountSetFieldsEncryptionAlgorithm(); c != 1 {
+		return fmt.Errorf("%T write union: exactly one field must be set (%d set)", p, c)
+	}
+	if err := oprot.WriteStructBegin(ctx, "EncryptionAlgorithm"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *EncryptionAlgorithm) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetAES_GCM_V1() {
-    if err := oprot.WriteFieldBegin(ctx, "AES_GCM_V1", thrift.STRUCT, 1); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:AES_GCM_V1: ", p), err) }
-    if err := p.AES_GCM_V1.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.AES_GCM_V1), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 1:AES_GCM_V1: ", p), err) }
-  }
-  return err
+	if p.IsSetAES_GCM_V1() {
+		if err := oprot.WriteFieldBegin(ctx, "AES_GCM_V1", thrift.STRUCT, 1); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:AES_GCM_V1: ", p), err)
+		}
+		if err := p.AES_GCM_V1.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.AES_GCM_V1), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 1:AES_GCM_V1: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *EncryptionAlgorithm) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetAES_GCM_CTR_V1() {
-    if err := oprot.WriteFieldBegin(ctx, "AES_GCM_CTR_V1", thrift.STRUCT, 2); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:AES_GCM_CTR_V1: ", p), err) }
-    if err := p.AES_GCM_CTR_V1.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.AES_GCM_CTR_V1), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:AES_GCM_CTR_V1: ", p), err) }
-  }
-  return err
+	if p.IsSetAES_GCM_CTR_V1() {
+		if err := oprot.WriteFieldBegin(ctx, "AES_GCM_CTR_V1", thrift.STRUCT, 2); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:AES_GCM_CTR_V1: ", p), err)
+		}
+		if err := p.AES_GCM_CTR_V1.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.AES_GCM_CTR_V1), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:AES_GCM_CTR_V1: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *EncryptionAlgorithm) Equals(other *EncryptionAlgorithm) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if !p.AES_GCM_V1.Equals(other.AES_GCM_V1) { return false }
-  if !p.AES_GCM_CTR_V1.Equals(other.AES_GCM_CTR_V1) { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if !p.AES_GCM_V1.Equals(other.AES_GCM_V1) {
+		return false
+	}
+	if !p.AES_GCM_CTR_V1.Equals(other.AES_GCM_CTR_V1) {
+		return false
+	}
+	return true
 }
 
 func (p *EncryptionAlgorithm) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("EncryptionAlgorithm(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("EncryptionAlgorithm(%+v)", *p)
 }
 
 func (p *EncryptionAlgorithm) Validate() error {
-  return nil
+	return nil
 }
+
 // Description for file metadata
-// 
+//
 // Attributes:
-//  - Version: Version of this file *
-//  - Schema: Parquet schema for this file.  This schema contains metadata for all the columns.
+//   - Version: Version of this file *
+//   - Schema: Parquet schema for this file.  This schema contains metadata for all the columns.
+//
 // The schema is represented as a tree with a single root.  The nodes of the tree
 // are flattened to a list by doing a depth-first traversal.
 // The column metadata contains the path in the schema for that column which can be
 // used to map columns to nodes in the schema.
 // The first element is the root *
-//  - NumRows: Number of rows in this file *
-//  - RowGroups: Row groups in this file *
-//  - KeyValueMetadata: Optional key/value metadata *
-//  - CreatedBy: String for application that wrote this file.  This should be in the format
+//   - NumRows: Number of rows in this file *
+//   - RowGroups: Row groups in this file *
+//   - KeyValueMetadata: Optional key/value metadata *
+//   - CreatedBy: String for application that wrote this file.  This should be in the format
+//
 // <Application> version <App Version> (build <App Build Hash>).
 // e.g. impala version 1.0 (build 6cf94d29b2b7115df4de2c06e2ab4326d721eb55)
-// 
-//  - ColumnOrders: Sort order used for the min_value and max_value fields in the Statistics
+//
+//   - ColumnOrders: Sort order used for the min_value and max_value fields in the Statistics
+//
 // objects and the min_values and max_values fields in the ColumnIndex
 // objects of each column in this file. Sort orders are listed in the order
 // matching the columns in the schema. The indexes are not necessary the same
 // though, because only leaf nodes of the schema are represented in the list
 // of sort orders.
-// 
+//
 // Without column_orders, the meaning of the min_value and max_value fields
 // in the Statistics object and the ColumnIndex object is undefined. To ensure
 // well-defined behaviour, if these fields are written to a Parquet file,
 // column_orders must be written as well.
-// 
+//
 // The obsolete min and max fields in the Statistics object are always sorted
 // by signed comparison regardless of column_orders.
-//  - EncryptionAlgorithm: Encryption algorithm. This field is set only in encrypted files
+//   - EncryptionAlgorithm: Encryption algorithm. This field is set only in encrypted files
+//
 // with plaintext footer. Files with encrypted footer store algorithm id
 // in FileCryptoMetaData structure.
-//  - FooterSigningKeyMetadata: Retrieval metadata of key used for signing the footer.
+//   - FooterSigningKeyMetadata: Retrieval metadata of key used for signing the footer.
+//
 // Used only in encrypted files with plaintext footer.
 type FileMetaData struct {
-  Version int32 `thrift:"version,1,required" db:"version" json:"version"`
-  Schema []*SchemaElement `thrift:"schema,2,required" db:"schema" json:"schema"`
-  NumRows int64 `thrift:"num_rows,3,required" db:"num_rows" json:"num_rows"`
-  RowGroups []*RowGroup `thrift:"row_groups,4,required" db:"row_groups" json:"row_groups"`
-  KeyValueMetadata []*KeyValue `thrift:"key_value_metadata,5" db:"key_value_metadata" json:"key_value_metadata,omitempty"`
-  CreatedBy *string `thrift:"created_by,6" db:"created_by" json:"created_by,omitempty"`
-  ColumnOrders []*ColumnOrder `thrift:"column_orders,7" db:"column_orders" json:"column_orders,omitempty"`
-  EncryptionAlgorithm *EncryptionAlgorithm `thrift:"encryption_algorithm,8" db:"encryption_algorithm" json:"encryption_algorithm,omitempty"`
-  FooterSigningKeyMetadata []byte `thrift:"footer_signing_key_metadata,9" db:"footer_signing_key_metadata" json:"footer_signing_key_metadata,omitempty"`
+	Version                  int32                `thrift:"version,1,required" db:"version" json:"version"`
+	Schema                   []*SchemaElement     `thrift:"schema,2,required" db:"schema" json:"schema"`
+	NumRows                  int64                `thrift:"num_rows,3,required" db:"num_rows" json:"num_rows"`
+	RowGroups                []*RowGroup          `thrift:"row_groups,4,required" db:"row_groups" json:"row_groups"`
+	KeyValueMetadata         []*KeyValue          `thrift:"key_value_metadata,5" db:"key_value_metadata" json:"key_value_metadata,omitempty"`
+	CreatedBy                *string              `thrift:"created_by,6" db:"created_by" json:"created_by,omitempty"`
+	ColumnOrders             []*ColumnOrder       `thrift:"column_orders,7" db:"column_orders" json:"column_orders,omitempty"`
+	EncryptionAlgorithm      *EncryptionAlgorithm `thrift:"encryption_algorithm,8" db:"encryption_algorithm" json:"encryption_algorithm,omitempty"`
+	FooterSigningKeyMetadata []byte               `thrift:"footer_signing_key_metadata,9" db:"footer_signing_key_metadata" json:"footer_signing_key_metadata,omitempty"`
 }
 
 func NewFileMetaData() *FileMetaData {
-  return &FileMetaData{}
+	return &FileMetaData{}
 }
 
-
 func (p *FileMetaData) GetVersion() int32 {
-  return p.Version
+	return p.Version
 }
 
 func (p *FileMetaData) GetSchema() []*SchemaElement {
-  return p.Schema
+	return p.Schema
 }
 
 func (p *FileMetaData) GetNumRows() int64 {
-  return p.NumRows
+	return p.NumRows
 }
 
 func (p *FileMetaData) GetRowGroups() []*RowGroup {
-  return p.RowGroups
+	return p.RowGroups
 }
+
 var FileMetaData_KeyValueMetadata_DEFAULT []*KeyValue
 
 func (p *FileMetaData) GetKeyValueMetadata() []*KeyValue {
-  return p.KeyValueMetadata
+	return p.KeyValueMetadata
 }
+
 var FileMetaData_CreatedBy_DEFAULT string
+
 func (p *FileMetaData) GetCreatedBy() string {
-  if !p.IsSetCreatedBy() {
-    return FileMetaData_CreatedBy_DEFAULT
-  }
-return *p.CreatedBy
+	if !p.IsSetCreatedBy() {
+		return FileMetaData_CreatedBy_DEFAULT
+	}
+	return *p.CreatedBy
 }
+
 var FileMetaData_ColumnOrders_DEFAULT []*ColumnOrder
 
 func (p *FileMetaData) GetColumnOrders() []*ColumnOrder {
-  return p.ColumnOrders
+	return p.ColumnOrders
 }
+
 var FileMetaData_EncryptionAlgorithm_DEFAULT *EncryptionAlgorithm
+
 func (p *FileMetaData) GetEncryptionAlgorithm() *EncryptionAlgorithm {
-  if !p.IsSetEncryptionAlgorithm() {
-    return FileMetaData_EncryptionAlgorithm_DEFAULT
-  }
-return p.EncryptionAlgorithm
+	if !p.IsSetEncryptionAlgorithm() {
+		return FileMetaData_EncryptionAlgorithm_DEFAULT
+	}
+	return p.EncryptionAlgorithm
 }
+
 var FileMetaData_FooterSigningKeyMetadata_DEFAULT []byte
 
 func (p *FileMetaData) GetFooterSigningKeyMetadata() []byte {
-  return p.FooterSigningKeyMetadata
+	return p.FooterSigningKeyMetadata
 }
 func (p *FileMetaData) IsSetKeyValueMetadata() bool {
-  return p.KeyValueMetadata != nil
+	return p.KeyValueMetadata != nil
 }
 
 func (p *FileMetaData) IsSetCreatedBy() bool {
-  return p.CreatedBy != nil
+	return p.CreatedBy != nil
 }
 
 func (p *FileMetaData) IsSetColumnOrders() bool {
-  return p.ColumnOrders != nil
+	return p.ColumnOrders != nil
 }
 
 func (p *FileMetaData) IsSetEncryptionAlgorithm() bool {
-  return p.EncryptionAlgorithm != nil
+	return p.EncryptionAlgorithm != nil
 }
 
 func (p *FileMetaData) IsSetFooterSigningKeyMetadata() bool {
-  return p.FooterSigningKeyMetadata != nil
+	return p.FooterSigningKeyMetadata != nil
 }
 
 func (p *FileMetaData) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetVersion bool = false;
-  var issetSchema bool = false;
-  var issetNumRows bool = false;
-  var issetRowGroups bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.I32 {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetVersion = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.LIST {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-        issetSchema = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 3:
-      if fieldTypeId == thrift.I64 {
-        if err := p.ReadField3(ctx, iprot); err != nil {
-          return err
-        }
-        issetNumRows = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 4:
-      if fieldTypeId == thrift.LIST {
-        if err := p.ReadField4(ctx, iprot); err != nil {
-          return err
-        }
-        issetRowGroups = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 5:
-      if fieldTypeId == thrift.LIST {
-        if err := p.ReadField5(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 6:
-      if fieldTypeId == thrift.STRING {
-        if err := p.ReadField6(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 7:
-      if fieldTypeId == thrift.LIST {
-        if err := p.ReadField7(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 8:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField8(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 9:
-      if fieldTypeId == thrift.STRING {
-        if err := p.ReadField9(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetVersion{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Version is not set"));
-  }
-  if !issetSchema{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Schema is not set"));
-  }
-  if !issetNumRows{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumRows is not set"));
-  }
-  if !issetRowGroups{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field RowGroups is not set"));
-  }
-  return nil
-}
-
-func (p *FileMetaData)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI32(ctx); err != nil {
-  return thrift.PrependError("error reading field 1: ", err)
-} else {
-  p.Version = v
-}
-  return nil
-}
-
-func (p *FileMetaData)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  _, size, err := iprot.ReadListBegin(ctx)
-  if err != nil {
-    return thrift.PrependError("error reading list begin: ", err)
-  }
-  tSlice := make([]*SchemaElement, 0, size)
-  p.Schema =  tSlice
-  for i := 0; i < size; i ++ {
-    _elem24 := &SchemaElement{}
-    if err := _elem24.Read(ctx, iprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem24), err)
-    }
-    p.Schema = append(p.Schema, _elem24)
-  }
-  if err := iprot.ReadListEnd(ctx); err != nil {
-    return thrift.PrependError("error reading list end: ", err)
-  }
-  return nil
-}
-
-func (p *FileMetaData)  ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadI64(ctx); err != nil {
-  return thrift.PrependError("error reading field 3: ", err)
-} else {
-  p.NumRows = v
-}
-  return nil
-}
-
-func (p *FileMetaData)  ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
-  _, size, err := iprot.ReadListBegin(ctx)
-  if err != nil {
-    return thrift.PrependError("error reading list begin: ", err)
-  }
-  tSlice := make([]*RowGroup, 0, size)
-  p.RowGroups =  tSlice
-  for i := 0; i < size; i ++ {
-    _elem25 := &RowGroup{}
-    if err := _elem25.Read(ctx, iprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem25), err)
-    }
-    p.RowGroups = append(p.RowGroups, _elem25)
-  }
-  if err := iprot.ReadListEnd(ctx); err != nil {
-    return thrift.PrependError("error reading list end: ", err)
-  }
-  return nil
-}
-
-func (p *FileMetaData)  ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
-  _, size, err := iprot.ReadListBegin(ctx)
-  if err != nil {
-    return thrift.PrependError("error reading list begin: ", err)
-  }
-  tSlice := make([]*KeyValue, 0, size)
-  p.KeyValueMetadata =  tSlice
-  for i := 0; i < size; i ++ {
-    _elem26 := &KeyValue{}
-    if err := _elem26.Read(ctx, iprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem26), err)
-    }
-    p.KeyValueMetadata = append(p.KeyValueMetadata, _elem26)
-  }
-  if err := iprot.ReadListEnd(ctx); err != nil {
-    return thrift.PrependError("error reading list end: ", err)
-  }
-  return nil
-}
-
-func (p *FileMetaData)  ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadString(ctx); err != nil {
-  return thrift.PrependError("error reading field 6: ", err)
-} else {
-  p.CreatedBy = &v
-}
-  return nil
-}
-
-func (p *FileMetaData)  ReadField7(ctx context.Context, iprot thrift.TProtocol) error {
-  _, size, err := iprot.ReadListBegin(ctx)
-  if err != nil {
-    return thrift.PrependError("error reading list begin: ", err)
-  }
-  tSlice := make([]*ColumnOrder, 0, size)
-  p.ColumnOrders =  tSlice
-  for i := 0; i < size; i ++ {
-    _elem27 := &ColumnOrder{}
-    if err := _elem27.Read(ctx, iprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem27), err)
-    }
-    p.ColumnOrders = append(p.ColumnOrders, _elem27)
-  }
-  if err := iprot.ReadListEnd(ctx); err != nil {
-    return thrift.PrependError("error reading list end: ", err)
-  }
-  return nil
-}
-
-func (p *FileMetaData)  ReadField8(ctx context.Context, iprot thrift.TProtocol) error {
-  p.EncryptionAlgorithm = &EncryptionAlgorithm{}
-  if err := p.EncryptionAlgorithm.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.EncryptionAlgorithm), err)
-  }
-  return nil
-}
-
-func (p *FileMetaData)  ReadField9(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBinary(ctx); err != nil {
-  return thrift.PrependError("error reading field 9: ", err)
-} else {
-  p.FooterSigningKeyMetadata = v
-}
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetVersion bool = false
+	var issetSchema bool = false
+	var issetNumRows bool = false
+	var issetRowGroups bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.I32 {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetVersion = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.LIST {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+				issetSchema = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 3:
+			if fieldTypeId == thrift.I64 {
+				if err := p.ReadField3(ctx, iprot); err != nil {
+					return err
+				}
+				issetNumRows = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 4:
+			if fieldTypeId == thrift.LIST {
+				if err := p.ReadField4(ctx, iprot); err != nil {
+					return err
+				}
+				issetRowGroups = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 5:
+			if fieldTypeId == thrift.LIST {
+				if err := p.ReadField5(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 6:
+			if fieldTypeId == thrift.STRING {
+				if err := p.ReadField6(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 7:
+			if fieldTypeId == thrift.LIST {
+				if err := p.ReadField7(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 8:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField8(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 9:
+			if fieldTypeId == thrift.STRING {
+				if err := p.ReadField9(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetVersion {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Version is not set"))
+	}
+	if !issetSchema {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field Schema is not set"))
+	}
+	if !issetNumRows {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field NumRows is not set"))
+	}
+	if !issetRowGroups {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field RowGroups is not set"))
+	}
+	return nil
+}
+
+func (p *FileMetaData) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI32(ctx); err != nil {
+		return thrift.PrependError("error reading field 1: ", err)
+	} else {
+		p.Version = v
+	}
+	return nil
+}
+
+func (p *FileMetaData) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	_, size, err := iprot.ReadListBegin(ctx)
+	if err != nil {
+		return thrift.PrependError("error reading list begin: ", err)
+	}
+	tSlice := make([]*SchemaElement, 0, size)
+	p.Schema = tSlice
+	for i := 0; i < size; i++ {
+		_elem24 := &SchemaElement{}
+		if err := _elem24.Read(ctx, iprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem24), err)
+		}
+		p.Schema = append(p.Schema, _elem24)
+	}
+	if err := iprot.ReadListEnd(ctx); err != nil {
+		return thrift.PrependError("error reading list end: ", err)
+	}
+	return nil
+}
+
+func (p *FileMetaData) ReadField3(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadI64(ctx); err != nil {
+		return thrift.PrependError("error reading field 3: ", err)
+	} else {
+		p.NumRows = v
+	}
+	return nil
+}
+
+func (p *FileMetaData) ReadField4(ctx context.Context, iprot thrift.TProtocol) error {
+	_, size, err := iprot.ReadListBegin(ctx)
+	if err != nil {
+		return thrift.PrependError("error reading list begin: ", err)
+	}
+	tSlice := make([]*RowGroup, 0, size)
+	p.RowGroups = tSlice
+	for i := 0; i < size; i++ {
+		_elem25 := &RowGroup{}
+		if err := _elem25.Read(ctx, iprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem25), err)
+		}
+		p.RowGroups = append(p.RowGroups, _elem25)
+	}
+	if err := iprot.ReadListEnd(ctx); err != nil {
+		return thrift.PrependError("error reading list end: ", err)
+	}
+	return nil
+}
+
+func (p *FileMetaData) ReadField5(ctx context.Context, iprot thrift.TProtocol) error {
+	_, size, err := iprot.ReadListBegin(ctx)
+	if err != nil {
+		return thrift.PrependError("error reading list begin: ", err)
+	}
+	tSlice := make([]*KeyValue, 0, size)
+	p.KeyValueMetadata = tSlice
+	for i := 0; i < size; i++ {
+		_elem26 := &KeyValue{}
+		if err := _elem26.Read(ctx, iprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem26), err)
+		}
+		p.KeyValueMetadata = append(p.KeyValueMetadata, _elem26)
+	}
+	if err := iprot.ReadListEnd(ctx); err != nil {
+		return thrift.PrependError("error reading list end: ", err)
+	}
+	return nil
+}
+
+func (p *FileMetaData) ReadField6(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadString(ctx); err != nil {
+		return thrift.PrependError("error reading field 6: ", err)
+	} else {
+		p.CreatedBy = &v
+	}
+	return nil
+}
+
+func (p *FileMetaData) ReadField7(ctx context.Context, iprot thrift.TProtocol) error {
+	_, size, err := iprot.ReadListBegin(ctx)
+	if err != nil {
+		return thrift.PrependError("error reading list begin: ", err)
+	}
+	tSlice := make([]*ColumnOrder, 0, size)
+	p.ColumnOrders = tSlice
+	for i := 0; i < size; i++ {
+		_elem27 := &ColumnOrder{}
+		if err := _elem27.Read(ctx, iprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem27), err)
+		}
+		p.ColumnOrders = append(p.ColumnOrders, _elem27)
+	}
+	if err := iprot.ReadListEnd(ctx); err != nil {
+		return thrift.PrependError("error reading list end: ", err)
+	}
+	return nil
+}
+
+func (p *FileMetaData) ReadField8(ctx context.Context, iprot thrift.TProtocol) error {
+	p.EncryptionAlgorithm = &EncryptionAlgorithm{}
+	if err := p.EncryptionAlgorithm.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.EncryptionAlgorithm), err)
+	}
+	return nil
+}
+
+func (p *FileMetaData) ReadField9(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBinary(ctx); err != nil {
+		return thrift.PrependError("error reading field 9: ", err)
+	} else {
+		p.FooterSigningKeyMetadata = v
+	}
+	return nil
 }
 
 func (p *FileMetaData) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "FileMetaData"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-    if err := p.writeField3(ctx, oprot); err != nil { return err }
-    if err := p.writeField4(ctx, oprot); err != nil { return err }
-    if err := p.writeField5(ctx, oprot); err != nil { return err }
-    if err := p.writeField6(ctx, oprot); err != nil { return err }
-    if err := p.writeField7(ctx, oprot); err != nil { return err }
-    if err := p.writeField8(ctx, oprot); err != nil { return err }
-    if err := p.writeField9(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "FileMetaData"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField3(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField4(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField5(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField6(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField7(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField8(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField9(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *FileMetaData) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "version", thrift.I32, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:version: ", p), err) }
-  if err := oprot.WriteI32(ctx, int32(p.Version)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.version (1) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:version: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "version", thrift.I32, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:version: ", p), err)
+	}
+	if err := oprot.WriteI32(ctx, int32(p.Version)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.version (1) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:version: ", p), err)
+	}
+	return err
 }
 
 func (p *FileMetaData) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "schema", thrift.LIST, 2); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:schema: ", p), err) }
-  if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.Schema)); err != nil {
-    return thrift.PrependError("error writing list begin: ", err)
-  }
-  for _, v := range p.Schema {
-    if err := v.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-    }
-  }
-  if err := oprot.WriteListEnd(ctx); err != nil {
-    return thrift.PrependError("error writing list end: ", err)
-  }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 2:schema: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "schema", thrift.LIST, 2); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:schema: ", p), err)
+	}
+	if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.Schema)); err != nil {
+		return thrift.PrependError("error writing list begin: ", err)
+	}
+	for _, v := range p.Schema {
+		if err := v.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+		}
+	}
+	if err := oprot.WriteListEnd(ctx); err != nil {
+		return thrift.PrependError("error writing list end: ", err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 2:schema: ", p), err)
+	}
+	return err
 }
 
 func (p *FileMetaData) writeField3(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "num_rows", thrift.I64, 3); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:num_rows: ", p), err) }
-  if err := oprot.WriteI64(ctx, int64(p.NumRows)); err != nil {
-  return thrift.PrependError(fmt.Sprintf("%T.num_rows (3) field write error: ", p), err) }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 3:num_rows: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "num_rows", thrift.I64, 3); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:num_rows: ", p), err)
+	}
+	if err := oprot.WriteI64(ctx, int64(p.NumRows)); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T.num_rows (3) field write error: ", p), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 3:num_rows: ", p), err)
+	}
+	return err
 }
 
 func (p *FileMetaData) writeField4(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "row_groups", thrift.LIST, 4); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:row_groups: ", p), err) }
-  if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.RowGroups)); err != nil {
-    return thrift.PrependError("error writing list begin: ", err)
-  }
-  for _, v := range p.RowGroups {
-    if err := v.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-    }
-  }
-  if err := oprot.WriteListEnd(ctx); err != nil {
-    return thrift.PrependError("error writing list end: ", err)
-  }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 4:row_groups: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "row_groups", thrift.LIST, 4); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 4:row_groups: ", p), err)
+	}
+	if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.RowGroups)); err != nil {
+		return thrift.PrependError("error writing list begin: ", err)
+	}
+	for _, v := range p.RowGroups {
+		if err := v.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+		}
+	}
+	if err := oprot.WriteListEnd(ctx); err != nil {
+		return thrift.PrependError("error writing list end: ", err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 4:row_groups: ", p), err)
+	}
+	return err
 }
 
 func (p *FileMetaData) writeField5(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetKeyValueMetadata() {
-    if err := oprot.WriteFieldBegin(ctx, "key_value_metadata", thrift.LIST, 5); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:key_value_metadata: ", p), err) }
-    if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.KeyValueMetadata)); err != nil {
-      return thrift.PrependError("error writing list begin: ", err)
-    }
-    for _, v := range p.KeyValueMetadata {
-      if err := v.Write(ctx, oprot); err != nil {
-        return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-      }
-    }
-    if err := oprot.WriteListEnd(ctx); err != nil {
-      return thrift.PrependError("error writing list end: ", err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 5:key_value_metadata: ", p), err) }
-  }
-  return err
+	if p.IsSetKeyValueMetadata() {
+		if err := oprot.WriteFieldBegin(ctx, "key_value_metadata", thrift.LIST, 5); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 5:key_value_metadata: ", p), err)
+		}
+		if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.KeyValueMetadata)); err != nil {
+			return thrift.PrependError("error writing list begin: ", err)
+		}
+		for _, v := range p.KeyValueMetadata {
+			if err := v.Write(ctx, oprot); err != nil {
+				return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+			}
+		}
+		if err := oprot.WriteListEnd(ctx); err != nil {
+			return thrift.PrependError("error writing list end: ", err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 5:key_value_metadata: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *FileMetaData) writeField6(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetCreatedBy() {
-    if err := oprot.WriteFieldBegin(ctx, "created_by", thrift.STRING, 6); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:created_by: ", p), err) }
-    if err := oprot.WriteString(ctx, string(*p.CreatedBy)); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.created_by (6) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 6:created_by: ", p), err) }
-  }
-  return err
+	if p.IsSetCreatedBy() {
+		if err := oprot.WriteFieldBegin(ctx, "created_by", thrift.STRING, 6); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:created_by: ", p), err)
+		}
+		if err := oprot.WriteString(ctx, string(*p.CreatedBy)); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.created_by (6) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 6:created_by: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *FileMetaData) writeField7(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetColumnOrders() {
-    if err := oprot.WriteFieldBegin(ctx, "column_orders", thrift.LIST, 7); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:column_orders: ", p), err) }
-    if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.ColumnOrders)); err != nil {
-      return thrift.PrependError("error writing list begin: ", err)
-    }
-    for _, v := range p.ColumnOrders {
-      if err := v.Write(ctx, oprot); err != nil {
-        return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
-      }
-    }
-    if err := oprot.WriteListEnd(ctx); err != nil {
-      return thrift.PrependError("error writing list end: ", err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 7:column_orders: ", p), err) }
-  }
-  return err
+	if p.IsSetColumnOrders() {
+		if err := oprot.WriteFieldBegin(ctx, "column_orders", thrift.LIST, 7); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 7:column_orders: ", p), err)
+		}
+		if err := oprot.WriteListBegin(ctx, thrift.STRUCT, len(p.ColumnOrders)); err != nil {
+			return thrift.PrependError("error writing list begin: ", err)
+		}
+		for _, v := range p.ColumnOrders {
+			if err := v.Write(ctx, oprot); err != nil {
+				return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err)
+			}
+		}
+		if err := oprot.WriteListEnd(ctx); err != nil {
+			return thrift.PrependError("error writing list end: ", err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 7:column_orders: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *FileMetaData) writeField8(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetEncryptionAlgorithm() {
-    if err := oprot.WriteFieldBegin(ctx, "encryption_algorithm", thrift.STRUCT, 8); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:encryption_algorithm: ", p), err) }
-    if err := p.EncryptionAlgorithm.Write(ctx, oprot); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.EncryptionAlgorithm), err)
-    }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 8:encryption_algorithm: ", p), err) }
-  }
-  return err
+	if p.IsSetEncryptionAlgorithm() {
+		if err := oprot.WriteFieldBegin(ctx, "encryption_algorithm", thrift.STRUCT, 8); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 8:encryption_algorithm: ", p), err)
+		}
+		if err := p.EncryptionAlgorithm.Write(ctx, oprot); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.EncryptionAlgorithm), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 8:encryption_algorithm: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *FileMetaData) writeField9(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetFooterSigningKeyMetadata() {
-    if err := oprot.WriteFieldBegin(ctx, "footer_signing_key_metadata", thrift.STRING, 9); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:footer_signing_key_metadata: ", p), err) }
-    if err := oprot.WriteBinary(ctx, p.FooterSigningKeyMetadata); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.footer_signing_key_metadata (9) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 9:footer_signing_key_metadata: ", p), err) }
-  }
-  return err
+	if p.IsSetFooterSigningKeyMetadata() {
+		if err := oprot.WriteFieldBegin(ctx, "footer_signing_key_metadata", thrift.STRING, 9); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 9:footer_signing_key_metadata: ", p), err)
+		}
+		if err := oprot.WriteBinary(ctx, p.FooterSigningKeyMetadata); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.footer_signing_key_metadata (9) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 9:footer_signing_key_metadata: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *FileMetaData) Equals(other *FileMetaData) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if p.Version != other.Version { return false }
-  if len(p.Schema) != len(other.Schema) { return false }
-  for i, _tgt := range p.Schema {
-    _src28 := other.Schema[i]
-    if !_tgt.Equals(_src28) { return false }
-  }
-  if p.NumRows != other.NumRows { return false }
-  if len(p.RowGroups) != len(other.RowGroups) { return false }
-  for i, _tgt := range p.RowGroups {
-    _src29 := other.RowGroups[i]
-    if !_tgt.Equals(_src29) { return false }
-  }
-  if len(p.KeyValueMetadata) != len(other.KeyValueMetadata) { return false }
-  for i, _tgt := range p.KeyValueMetadata {
-    _src30 := other.KeyValueMetadata[i]
-    if !_tgt.Equals(_src30) { return false }
-  }
-  if p.CreatedBy != other.CreatedBy {
-    if p.CreatedBy == nil || other.CreatedBy == nil {
-      return false
-    }
-    if (*p.CreatedBy) != (*other.CreatedBy) { return false }
-  }
-  if len(p.ColumnOrders) != len(other.ColumnOrders) { return false }
-  for i, _tgt := range p.ColumnOrders {
-    _src31 := other.ColumnOrders[i]
-    if !_tgt.Equals(_src31) { return false }
-  }
-  if !p.EncryptionAlgorithm.Equals(other.EncryptionAlgorithm) { return false }
-  if bytes.Compare(p.FooterSigningKeyMetadata, other.FooterSigningKeyMetadata) != 0 { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if p.Version != other.Version {
+		return false
+	}
+	if len(p.Schema) != len(other.Schema) {
+		return false
+	}
+	for i, _tgt := range p.Schema {
+		_src28 := other.Schema[i]
+		if !_tgt.Equals(_src28) {
+			return false
+		}
+	}
+	if p.NumRows != other.NumRows {
+		return false
+	}
+	if len(p.RowGroups) != len(other.RowGroups) {
+		return false
+	}
+	for i, _tgt := range p.RowGroups {
+		_src29 := other.RowGroups[i]
+		if !_tgt.Equals(_src29) {
+			return false
+		}
+	}
+	if len(p.KeyValueMetadata) != len(other.KeyValueMetadata) {
+		return false
+	}
+	for i, _tgt := range p.KeyValueMetadata {
+		_src30 := other.KeyValueMetadata[i]
+		if !_tgt.Equals(_src30) {
+			return false
+		}
+	}
+	if p.CreatedBy != other.CreatedBy {
+		if p.CreatedBy == nil || other.CreatedBy == nil {
+			return false
+		}
+		if (*p.CreatedBy) != (*other.CreatedBy) {
+			return false
+		}
+	}
+	if len(p.ColumnOrders) != len(other.ColumnOrders) {
+		return false
+	}
+	for i, _tgt := range p.ColumnOrders {
+		_src31 := other.ColumnOrders[i]
+		if !_tgt.Equals(_src31) {
+			return false
+		}
+	}
+	if !p.EncryptionAlgorithm.Equals(other.EncryptionAlgorithm) {
+		return false
+	}
+	if bytes.Compare(p.FooterSigningKeyMetadata, other.FooterSigningKeyMetadata) != 0 {
+		return false
+	}
+	return true
 }
 
 func (p *FileMetaData) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("FileMetaData(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("FileMetaData(%+v)", *p)
 }
 
 func (p *FileMetaData) Validate() error {
-  return nil
+	return nil
 }
+
 // Crypto metadata for files with encrypted footer *
-// 
+//
 // Attributes:
-//  - EncryptionAlgorithm: Encryption algorithm. This field is only used for files
+//   - EncryptionAlgorithm: Encryption algorithm. This field is only used for files
+//
 // with encrypted footer. Files with plaintext footer store algorithm id
 // inside footer (FileMetaData structure).
-//  - KeyMetadata: Retrieval metadata of key used for encryption of footer,
+//   - KeyMetadata: Retrieval metadata of key used for encryption of footer,
+//
 // and (possibly) columns *
 type FileCryptoMetaData struct {
-  EncryptionAlgorithm *EncryptionAlgorithm `thrift:"encryption_algorithm,1,required" db:"encryption_algorithm" json:"encryption_algorithm"`
-  KeyMetadata []byte `thrift:"key_metadata,2" db:"key_metadata" json:"key_metadata,omitempty"`
+	EncryptionAlgorithm *EncryptionAlgorithm `thrift:"encryption_algorithm,1,required" db:"encryption_algorithm" json:"encryption_algorithm"`
+	KeyMetadata         []byte               `thrift:"key_metadata,2" db:"key_metadata" json:"key_metadata,omitempty"`
 }
 
 func NewFileCryptoMetaData() *FileCryptoMetaData {
-  return &FileCryptoMetaData{}
+	return &FileCryptoMetaData{}
 }
 
 var FileCryptoMetaData_EncryptionAlgorithm_DEFAULT *EncryptionAlgorithm
+
 func (p *FileCryptoMetaData) GetEncryptionAlgorithm() *EncryptionAlgorithm {
-  if !p.IsSetEncryptionAlgorithm() {
-    return FileCryptoMetaData_EncryptionAlgorithm_DEFAULT
-  }
-return p.EncryptionAlgorithm
+	if !p.IsSetEncryptionAlgorithm() {
+		return FileCryptoMetaData_EncryptionAlgorithm_DEFAULT
+	}
+	return p.EncryptionAlgorithm
 }
+
 var FileCryptoMetaData_KeyMetadata_DEFAULT []byte
 
 func (p *FileCryptoMetaData) GetKeyMetadata() []byte {
-  return p.KeyMetadata
+	return p.KeyMetadata
 }
 func (p *FileCryptoMetaData) IsSetEncryptionAlgorithm() bool {
-  return p.EncryptionAlgorithm != nil
+	return p.EncryptionAlgorithm != nil
 }
 
 func (p *FileCryptoMetaData) IsSetKeyMetadata() bool {
-  return p.KeyMetadata != nil
+	return p.KeyMetadata != nil
 }
 
 func (p *FileCryptoMetaData) Read(ctx context.Context, iprot thrift.TProtocol) error {
-  if _, err := iprot.ReadStructBegin(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
-  }
-
-  var issetEncryptionAlgorithm bool = false;
-
-  for {
-    _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
-    if err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
-    }
-    if fieldTypeId == thrift.STOP { break; }
-    switch fieldId {
-    case 1:
-      if fieldTypeId == thrift.STRUCT {
-        if err := p.ReadField1(ctx, iprot); err != nil {
-          return err
-        }
-        issetEncryptionAlgorithm = true
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    case 2:
-      if fieldTypeId == thrift.STRING {
-        if err := p.ReadField2(ctx, iprot); err != nil {
-          return err
-        }
-      } else {
-        if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-          return err
-        }
-      }
-    default:
-      if err := iprot.Skip(ctx, fieldTypeId); err != nil {
-        return err
-      }
-    }
-    if err := iprot.ReadFieldEnd(ctx); err != nil {
-      return err
-    }
-  }
-  if err := iprot.ReadStructEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
-  }
-  if !issetEncryptionAlgorithm{
-    return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field EncryptionAlgorithm is not set"));
-  }
-  return nil
-}
-
-func (p *FileCryptoMetaData)  ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
-  p.EncryptionAlgorithm = &EncryptionAlgorithm{}
-  if err := p.EncryptionAlgorithm.Read(ctx, iprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.EncryptionAlgorithm), err)
-  }
-  return nil
-}
-
-func (p *FileCryptoMetaData)  ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
-  if v, err := iprot.ReadBinary(ctx); err != nil {
-  return thrift.PrependError("error reading field 2: ", err)
-} else {
-  p.KeyMetadata = v
-}
-  return nil
+	if _, err := iprot.ReadStructBegin(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err)
+	}
+
+	var issetEncryptionAlgorithm bool = false
+
+	for {
+		_, fieldTypeId, fieldId, err := iprot.ReadFieldBegin(ctx)
+		if err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err)
+		}
+		if fieldTypeId == thrift.STOP {
+			break
+		}
+		switch fieldId {
+		case 1:
+			if fieldTypeId == thrift.STRUCT {
+				if err := p.ReadField1(ctx, iprot); err != nil {
+					return err
+				}
+				issetEncryptionAlgorithm = true
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		case 2:
+			if fieldTypeId == thrift.STRING {
+				if err := p.ReadField2(ctx, iprot); err != nil {
+					return err
+				}
+			} else {
+				if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+					return err
+				}
+			}
+		default:
+			if err := iprot.Skip(ctx, fieldTypeId); err != nil {
+				return err
+			}
+		}
+		if err := iprot.ReadFieldEnd(ctx); err != nil {
+			return err
+		}
+	}
+	if err := iprot.ReadStructEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err)
+	}
+	if !issetEncryptionAlgorithm {
+		return thrift.NewTProtocolExceptionWithType(thrift.INVALID_DATA, fmt.Errorf("Required field EncryptionAlgorithm is not set"))
+	}
+	return nil
+}
+
+func (p *FileCryptoMetaData) ReadField1(ctx context.Context, iprot thrift.TProtocol) error {
+	p.EncryptionAlgorithm = &EncryptionAlgorithm{}
+	if err := p.EncryptionAlgorithm.Read(ctx, iprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.EncryptionAlgorithm), err)
+	}
+	return nil
+}
+
+func (p *FileCryptoMetaData) ReadField2(ctx context.Context, iprot thrift.TProtocol) error {
+	if v, err := iprot.ReadBinary(ctx); err != nil {
+		return thrift.PrependError("error reading field 2: ", err)
+	} else {
+		p.KeyMetadata = v
+	}
+	return nil
 }
 
 func (p *FileCryptoMetaData) Write(ctx context.Context, oprot thrift.TProtocol) error {
-  if err := oprot.WriteStructBegin(ctx, "FileCryptoMetaData"); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) }
-  if p != nil {
-    if err := p.writeField1(ctx, oprot); err != nil { return err }
-    if err := p.writeField2(ctx, oprot); err != nil { return err }
-  }
-  if err := oprot.WriteFieldStop(ctx); err != nil {
-    return thrift.PrependError("write field stop error: ", err) }
-  if err := oprot.WriteStructEnd(ctx); err != nil {
-    return thrift.PrependError("write struct stop error: ", err) }
-  return nil
+	if err := oprot.WriteStructBegin(ctx, "FileCryptoMetaData"); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err)
+	}
+	if p != nil {
+		if err := p.writeField1(ctx, oprot); err != nil {
+			return err
+		}
+		if err := p.writeField2(ctx, oprot); err != nil {
+			return err
+		}
+	}
+	if err := oprot.WriteFieldStop(ctx); err != nil {
+		return thrift.PrependError("write field stop error: ", err)
+	}
+	if err := oprot.WriteStructEnd(ctx); err != nil {
+		return thrift.PrependError("write struct stop error: ", err)
+	}
+	return nil
 }
 
 func (p *FileCryptoMetaData) writeField1(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if err := oprot.WriteFieldBegin(ctx, "encryption_algorithm", thrift.STRUCT, 1); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:encryption_algorithm: ", p), err) }
-  if err := p.EncryptionAlgorithm.Write(ctx, oprot); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.EncryptionAlgorithm), err)
-  }
-  if err := oprot.WriteFieldEnd(ctx); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T write field end error 1:encryption_algorithm: ", p), err) }
-  return err
+	if err := oprot.WriteFieldBegin(ctx, "encryption_algorithm", thrift.STRUCT, 1); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:encryption_algorithm: ", p), err)
+	}
+	if err := p.EncryptionAlgorithm.Write(ctx, oprot); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.EncryptionAlgorithm), err)
+	}
+	if err := oprot.WriteFieldEnd(ctx); err != nil {
+		return thrift.PrependError(fmt.Sprintf("%T write field end error 1:encryption_algorithm: ", p), err)
+	}
+	return err
 }
 
 func (p *FileCryptoMetaData) writeField2(ctx context.Context, oprot thrift.TProtocol) (err error) {
-  if p.IsSetKeyMetadata() {
-    if err := oprot.WriteFieldBegin(ctx, "key_metadata", thrift.STRING, 2); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:key_metadata: ", p), err) }
-    if err := oprot.WriteBinary(ctx, p.KeyMetadata); err != nil {
-    return thrift.PrependError(fmt.Sprintf("%T.key_metadata (2) field write error: ", p), err) }
-    if err := oprot.WriteFieldEnd(ctx); err != nil {
-      return thrift.PrependError(fmt.Sprintf("%T write field end error 2:key_metadata: ", p), err) }
-  }
-  return err
+	if p.IsSetKeyMetadata() {
+		if err := oprot.WriteFieldBegin(ctx, "key_metadata", thrift.STRING, 2); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:key_metadata: ", p), err)
+		}
+		if err := oprot.WriteBinary(ctx, p.KeyMetadata); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T.key_metadata (2) field write error: ", p), err)
+		}
+		if err := oprot.WriteFieldEnd(ctx); err != nil {
+			return thrift.PrependError(fmt.Sprintf("%T write field end error 2:key_metadata: ", p), err)
+		}
+	}
+	return err
 }
 
 func (p *FileCryptoMetaData) Equals(other *FileCryptoMetaData) bool {
-  if p == other {
-    return true
-  } else if p == nil || other == nil {
-    return false
-  }
-  if !p.EncryptionAlgorithm.Equals(other.EncryptionAlgorithm) { return false }
-  if bytes.Compare(p.KeyMetadata, other.KeyMetadata) != 0 { return false }
-  return true
+	if p == other {
+		return true
+	} else if p == nil || other == nil {
+		return false
+	}
+	if !p.EncryptionAlgorithm.Equals(other.EncryptionAlgorithm) {
+		return false
+	}
+	if bytes.Compare(p.KeyMetadata, other.KeyMetadata) != 0 {
+		return false
+	}
+	return true
 }
 
 func (p *FileCryptoMetaData) String() string {
-  if p == nil {
-    return "<nil>"
-  }
-  return fmt.Sprintf("FileCryptoMetaData(%+v)", *p)
+	if p == nil {
+		return "<nil>"
+	}
+	return fmt.Sprintf("FileCryptoMetaData(%+v)", *p)
 }
 
 func (p *FileCryptoMetaData) Validate() error {
-  return nil
+	return nil
 }
diff --git a/go/parquet/internal/testutils/pagebuilder.go b/go/parquet/internal/testutils/pagebuilder.go
index 0b1fea64ad828..cd1437638c485 100644
--- a/go/parquet/internal/testutils/pagebuilder.go
+++ b/go/parquet/internal/testutils/pagebuilder.go
@@ -22,13 +22,13 @@ import (
 	"io"
 	"reflect"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/compress"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/compress"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/stretchr/testify/mock"
 )
 
diff --git a/go/parquet/internal/testutils/primitive_typed.go b/go/parquet/internal/testutils/primitive_typed.go
index ef50ace7fdf79..55366dc861352 100644
--- a/go/parquet/internal/testutils/primitive_typed.go
+++ b/go/parquet/internal/testutils/primitive_typed.go
@@ -20,11 +20,11 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/metadata"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/metadata"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 )
 
 type PrimitiveTypedTest struct {
diff --git a/go/parquet/internal/testutils/random.go b/go/parquet/internal/testutils/random.go
index 3139e7f7c94f0..568d1a6b5f1df 100644
--- a/go/parquet/internal/testutils/random.go
+++ b/go/parquet/internal/testutils/random.go
@@ -24,14 +24,14 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/endian"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/pqarrow"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/endian"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/pqarrow"
 
 	"golang.org/x/exp/rand"
 	"gonum.org/v1/gonum/stat/distuv"
diff --git a/go/parquet/internal/testutils/random_arrow.go b/go/parquet/internal/testutils/random_arrow.go
index 91fa473adcb03..fe52932e51576 100644
--- a/go/parquet/internal/testutils/random_arrow.go
+++ b/go/parquet/internal/testutils/random_arrow.go
@@ -17,10 +17,10 @@
 package testutils
 
 import (
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/memory"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/memory"
 	"golang.org/x/exp/rand"
 )
 
diff --git a/go/parquet/internal/testutils/utils.go b/go/parquet/internal/testutils/utils.go
index 5a8f6cb3eeb0c..057a055884561 100644
--- a/go/parquet/internal/testutils/utils.go
+++ b/go/parquet/internal/testutils/utils.go
@@ -19,7 +19,7 @@ package testutils
 import (
 	"reflect"
 
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/parquet"
 )
 
 var typeToParquetTypeMap = map[reflect.Type]parquet.Type{
diff --git a/go/parquet/internal/thrift/helpers.go b/go/parquet/internal/thrift/helpers.go
index 81c7e38fe7df7..e2600763dbf3c 100644
--- a/go/parquet/internal/thrift/helpers.go
+++ b/go/parquet/internal/thrift/helpers.go
@@ -23,7 +23,7 @@ import (
 	"context"
 	"io"
 
-	"github.com/apache/arrow/go/v16/parquet/internal/encryption"
+	"github.com/apache/arrow/go/v17/parquet/internal/encryption"
 	"github.com/apache/thrift/lib/go/thrift"
 )
 
diff --git a/go/parquet/internal/utils/bit_benchmark_test.go b/go/parquet/internal/utils/bit_benchmark_test.go
index 3ef548ed2d631..2227c22d3b4e5 100644
--- a/go/parquet/internal/utils/bit_benchmark_test.go
+++ b/go/parquet/internal/utils/bit_benchmark_test.go
@@ -20,9 +20,9 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
-	"github.com/apache/arrow/go/v16/parquet/internal/testutils"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
+	"github.com/apache/arrow/go/v17/parquet/internal/testutils"
 )
 
 type linearBitRunReader struct {
diff --git a/go/parquet/internal/utils/bit_packing_arm64.go b/go/parquet/internal/utils/bit_packing_arm64.go
index 0025db75c8755..a8d3a996d8c46 100644
--- a/go/parquet/internal/utils/bit_packing_arm64.go
+++ b/go/parquet/internal/utils/bit_packing_arm64.go
@@ -23,7 +23,7 @@ import (
 	"github.com/klauspost/cpuid/v2"
 	// import for side effect of initializing feature flags
 	// based on ARM_ENABLE_EXT env var
-	_ "github.com/apache/arrow/go/v16/parquet/internal/bmi"
+	_ "github.com/apache/arrow/go/v17/parquet/internal/bmi"
 )
 
 func init() {
diff --git a/go/parquet/internal/utils/bit_packing_avx2_amd64.go b/go/parquet/internal/utils/bit_packing_avx2_amd64.go
index ee01f002b5ece..0455ccc505bfe 100644
--- a/go/parquet/internal/utils/bit_packing_avx2_amd64.go
+++ b/go/parquet/internal/utils/bit_packing_avx2_amd64.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package utils
diff --git a/go/parquet/internal/utils/bit_packing_neon_arm64.go b/go/parquet/internal/utils/bit_packing_neon_arm64.go
index 8d09c891155ef..09154e3e4b7dd 100755
--- a/go/parquet/internal/utils/bit_packing_neon_arm64.go
+++ b/go/parquet/internal/utils/bit_packing_neon_arm64.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package utils
diff --git a/go/parquet/internal/utils/bit_reader.go b/go/parquet/internal/utils/bit_reader.go
index 5ddbe3bea1ca6..d66968047adc8 100644
--- a/go/parquet/internal/utils/bit_reader.go
+++ b/go/parquet/internal/utils/bit_reader.go
@@ -24,10 +24,10 @@ import (
 	"reflect"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
 )
 
 // masks for grabbing the trailing bits based on the number of trailing bits desired
diff --git a/go/parquet/internal/utils/bit_reader_test.go b/go/parquet/internal/utils/bit_reader_test.go
index 3e5d4ed724bc5..24e4927ff8eca 100644
--- a/go/parquet/internal/utils/bit_reader_test.go
+++ b/go/parquet/internal/utils/bit_reader_test.go
@@ -25,11 +25,11 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet/internal/utils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 	"golang.org/x/exp/rand"
@@ -59,6 +59,23 @@ func TestBitWriter(t *testing.T) {
 
 	assert.Equal(t, byte(0xAA), buf[0])
 	assert.Equal(t, byte(0xCC), buf[1])
+
+	for i := 0; i < 3; i++ {
+		assert.True(t, bw.WriteVlqInt(uint64(i)))
+	}
+	assert.Equal(t, byte(0xAA), buf[0])
+	assert.Equal(t, byte(0xCC), buf[1])
+	assert.Equal(t, byte(0), buf[2])
+	assert.Equal(t, byte(1), buf[3])
+	assert.Equal(t, byte(2), buf[4])
+}
+
+func BenchmarkBitWriter(b *testing.B) {
+	buf := make([]byte, b.N)
+	bw := utils.NewBitWriter(utils.NewWriterAtBuffer(buf))
+	for i := 0; i < b.N; i++ {
+		assert.True(b, bw.WriteVlqInt(uint64(1)))
+	}
 }
 
 func TestBitReader(t *testing.T) {
diff --git a/go/parquet/internal/utils/bit_writer.go b/go/parquet/internal/utils/bit_writer.go
index 106461d33e048..bb7d7a5e0c4fa 100644
--- a/go/parquet/internal/utils/bit_writer.go
+++ b/go/parquet/internal/utils/bit_writer.go
@@ -21,7 +21,7 @@ import (
 	"io"
 	"log"
 
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
 )
 
 // WriterAtBuffer is a convenience struct for providing a WriteAt function
@@ -75,6 +75,7 @@ type BitWriter struct {
 	byteoffset int
 	bitoffset  uint
 	raw        [8]byte
+	buf        [binary.MaxVarintLen64]byte
 }
 
 // NewBitWriter initializes a new bit writer to write to the passed in interface
@@ -163,9 +164,8 @@ func (b *BitWriter) WriteAligned(val uint64, nbytes int) bool {
 // without buffering.
 func (b *BitWriter) WriteVlqInt(v uint64) bool {
 	b.Flush(true)
-	var buf [binary.MaxVarintLen64]byte
-	nbytes := binary.PutUvarint(buf[:], v)
-	if _, err := b.wr.WriteAt(buf[:nbytes], int64(b.byteoffset)); err != nil {
+	nbytes := binary.PutUvarint(b.buf[:], v)
+	if _, err := b.wr.WriteAt(b.buf[:nbytes], int64(b.byteoffset)); err != nil {
 		log.Println(err)
 		return false
 	}
diff --git a/go/parquet/internal/utils/bitmap_writer.go b/go/parquet/internal/utils/bitmap_writer.go
index 514275f8728b1..011330bde550f 100644
--- a/go/parquet/internal/utils/bitmap_writer.go
+++ b/go/parquet/internal/utils/bitmap_writer.go
@@ -20,7 +20,7 @@ import (
 	"encoding/binary"
 	"math/bits"
 
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
 )
 
 // BitmapWriter is an interface for bitmap writers so that we can use multiple
diff --git a/go/parquet/internal/utils/bitmap_writer_test.go b/go/parquet/internal/utils/bitmap_writer_test.go
index 812402ec8d0d0..893b003a8957c 100644
--- a/go/parquet/internal/utils/bitmap_writer_test.go
+++ b/go/parquet/internal/utils/bitmap_writer_test.go
@@ -22,8 +22,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/parquet/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/parquet/internal/utils"
 	"github.com/stretchr/testify/suite"
 )
 
diff --git a/go/parquet/internal/utils/rle.go b/go/parquet/internal/utils/rle.go
index 5c668567b23f4..affda41ec0ecb 100644
--- a/go/parquet/internal/utils/rle.go
+++ b/go/parquet/internal/utils/rle.go
@@ -24,10 +24,10 @@ import (
 	"encoding/binary"
 	"math"
 
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/internal/utils/typed_rle_dict.gen.go b/go/parquet/internal/utils/typed_rle_dict.gen.go
index ef67ee1fe2f36..be986b60786ba 100644
--- a/go/parquet/internal/utils/typed_rle_dict.gen.go
+++ b/go/parquet/internal/utils/typed_rle_dict.gen.go
@@ -19,9 +19,9 @@
 package utils
 
 import (
-	"github.com/apache/arrow/go/v16/internal/bitutils"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/internal/utils/typed_rle_dict.gen.go.tmpl b/go/parquet/internal/utils/typed_rle_dict.gen.go.tmpl
index f4fa5dedc0636..11b393e4a7ab8 100644
--- a/go/parquet/internal/utils/typed_rle_dict.gen.go.tmpl
+++ b/go/parquet/internal/utils/typed_rle_dict.gen.go.tmpl
@@ -17,9 +17,9 @@
 package utils
 
 import (
-  "github.com/apache/arrow/go/v16/parquet"
-  "github.com/apache/arrow/go/v16/internal/bitutils"
-  "github.com/apache/arrow/go/v16/internal/utils"
+  "github.com/apache/arrow/go/v17/parquet"
+  "github.com/apache/arrow/go/v17/internal/bitutils"
+  "github.com/apache/arrow/go/v17/internal/utils"
 )
 
 {{range .In}}
diff --git a/go/parquet/internal/utils/unpack_bool_amd64.go b/go/parquet/internal/utils/unpack_bool_amd64.go
index 1e9680db4b21a..2b2054f3b00b8 100644
--- a/go/parquet/internal/utils/unpack_bool_amd64.go
+++ b/go/parquet/internal/utils/unpack_bool_amd64.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package utils
diff --git a/go/parquet/internal/utils/unpack_bool_arm64.go b/go/parquet/internal/utils/unpack_bool_arm64.go
index 2c3b19eca458b..879ffd3c9540d 100644
--- a/go/parquet/internal/utils/unpack_bool_arm64.go
+++ b/go/parquet/internal/utils/unpack_bool_arm64.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package utils
@@ -21,13 +22,14 @@ package utils
 import (
 	"os"
 	"strings"
+
+	"golang.org/x/sys/cpu"
 )
-import "golang.org/x/sys/cpu"
 
 var byteToBoolFunc func([]byte, []bool)
 
 func init() {
-    // Added ability to enable extension via environment:
+	// Added ability to enable extension via environment:
 	// ARM_ENABLE_EXT=NEON go test
 	if ext, ok := os.LookupEnv("ARM_ENABLE_EXT"); ok {
 		exts := strings.Split(ext, ",")
diff --git a/go/parquet/internal/utils/unpack_bool_avx2_amd64.go b/go/parquet/internal/utils/unpack_bool_avx2_amd64.go
index e0065e5aad16d..cec772a2ccf97 100644
--- a/go/parquet/internal/utils/unpack_bool_avx2_amd64.go
+++ b/go/parquet/internal/utils/unpack_bool_avx2_amd64.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package utils
diff --git a/go/parquet/internal/utils/unpack_bool_neon_arm64.go b/go/parquet/internal/utils/unpack_bool_neon_arm64.go
index 2e9808abbf157..ed46ce29e0309 100755
--- a/go/parquet/internal/utils/unpack_bool_neon_arm64.go
+++ b/go/parquet/internal/utils/unpack_bool_neon_arm64.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package utils
diff --git a/go/parquet/internal/utils/unpack_bool_noasm.go b/go/parquet/internal/utils/unpack_bool_noasm.go
index a715366c6418d..eba20fa9c0f56 100644
--- a/go/parquet/internal/utils/unpack_bool_noasm.go
+++ b/go/parquet/internal/utils/unpack_bool_noasm.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build noasm
 // +build noasm
 
 package utils
diff --git a/go/parquet/internal/utils/unpack_bool_sse4_amd64.go b/go/parquet/internal/utils/unpack_bool_sse4_amd64.go
index 85e4aa77df73b..d00c37474e61c 100644
--- a/go/parquet/internal/utils/unpack_bool_sse4_amd64.go
+++ b/go/parquet/internal/utils/unpack_bool_sse4_amd64.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build !noasm
 // +build !noasm
 
 package utils
diff --git a/go/parquet/metadata/app_version.go b/go/parquet/metadata/app_version.go
index 6c4f06a6c0e6d..fa54aec347575 100644
--- a/go/parquet/metadata/app_version.go
+++ b/go/parquet/metadata/app_version.go
@@ -21,8 +21,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 )
 
 var (
@@ -74,7 +74,8 @@ func NewAppVersionExplicit(app string, major, minor, patch int) *AppVersion {
 // NewAppVersion parses a "created by" string such as "parquet-go 1.0.0".
 //
 // It also supports handling pre-releases and build info such as
-// 	parquet-cpp version 1.5.0ab-xyz5.5.0+cd (build abcd)
+//
+//	parquet-cpp version 1.5.0ab-xyz5.5.0+cd (build abcd)
 func NewAppVersion(createdby string) *AppVersion {
 	v := &AppVersion{}
 
diff --git a/go/parquet/metadata/column_chunk.go b/go/parquet/metadata/column_chunk.go
index 8cda380d39e3d..5bc5c049cd592 100644
--- a/go/parquet/metadata/column_chunk.go
+++ b/go/parquet/metadata/column_chunk.go
@@ -22,13 +22,13 @@ import (
 	"io"
 	"reflect"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/compress"
-	"github.com/apache/arrow/go/v16/parquet/internal/encryption"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/thrift"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/compress"
+	"github.com/apache/arrow/go/v17/parquet/internal/encryption"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/thrift"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/metadata/file.go b/go/parquet/metadata/file.go
index fc376383165b1..fde319d0b32e5 100644
--- a/go/parquet/metadata/file.go
+++ b/go/parquet/metadata/file.go
@@ -24,12 +24,12 @@ import (
 	"reflect"
 	"unicode/utf8"
 
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/compress"
-	"github.com/apache/arrow/go/v16/parquet/internal/encryption"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/thrift"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/compress"
+	"github.com/apache/arrow/go/v17/parquet/internal/encryption"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/thrift"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/metadata/metadata_test.go b/go/parquet/metadata/metadata_test.go
index 872d92325f655..a631d8b925bd2 100644
--- a/go/parquet/metadata/metadata_test.go
+++ b/go/parquet/metadata/metadata_test.go
@@ -21,9 +21,9 @@ import (
 	"testing"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/metadata"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/metadata"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/go/parquet/metadata/row_group.go b/go/parquet/metadata/row_group.go
index fec5d95540acc..c9a55ffdb5b16 100644
--- a/go/parquet/metadata/row_group.go
+++ b/go/parquet/metadata/row_group.go
@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/encryption"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/encryption"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 )
 
 // RowGroupMetaData is a proxy around the thrift RowGroup meta data object
diff --git a/go/parquet/metadata/stat_compare_test.go b/go/parquet/metadata/stat_compare_test.go
index ad403d15f0082..f759ee9fe1734 100644
--- a/go/parquet/metadata/stat_compare_test.go
+++ b/go/parquet/metadata/stat_compare_test.go
@@ -20,8 +20,8 @@ import (
 	"encoding/binary"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/go/parquet/metadata/statistics.go b/go/parquet/metadata/statistics.go
index ba52e247d458b..604fa50ee3b07 100644
--- a/go/parquet/metadata/statistics.go
+++ b/go/parquet/metadata/statistics.go
@@ -22,15 +22,15 @@ import (
 	"math"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/debug"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/debug"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 )
 
 //go:generate go run ../../arrow/_tools/tmpl/main.go -i -data=statistics_types.tmpldata statistics_types.gen.go.tmpl
diff --git a/go/parquet/metadata/statistics_test.go b/go/parquet/metadata/statistics_test.go
index 02c19c1039968..9760c0ee7d2fb 100644
--- a/go/parquet/metadata/statistics_test.go
+++ b/go/parquet/metadata/statistics_test.go
@@ -21,12 +21,12 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/metadata"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/metadata"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/parquet/metadata/statistics_types.gen.go b/go/parquet/metadata/statistics_types.gen.go
index 3854898354c85..a8670e221b706 100644
--- a/go/parquet/metadata/statistics_types.gen.go
+++ b/go/parquet/metadata/statistics_types.gen.go
@@ -22,16 +22,15 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
-	shared_utils "github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
-	"github.com/apache/arrow/go/v16/parquet/schema"
-	"golang.org/x/xerrors"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
+	shared_utils "github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 )
 
 type minmaxPairInt32 [2]int32
@@ -311,14 +310,7 @@ func (s *Int32Statistics) EncodeMax() []byte {
 func (s *Int32Statistics) Encode() (enc EncodedStatistics, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case error:
-				err = r
-			case string:
-				err = xerrors.New(r)
-			default:
-				err = fmt.Errorf("unknown error type thrown from panic: %v", r)
-			}
+			err = shared_utils.FormatRecoveredError("unknown error type thrown from panic", r)
 		}
 	}()
 	if s.HasMinMax() {
@@ -611,14 +603,7 @@ func (s *Int64Statistics) EncodeMax() []byte {
 func (s *Int64Statistics) Encode() (enc EncodedStatistics, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case error:
-				err = r
-			case string:
-				err = xerrors.New(r)
-			default:
-				err = fmt.Errorf("unknown error type thrown from panic: %v", r)
-			}
+			err = shared_utils.FormatRecoveredError("unknown error type thrown from panic", r)
 		}
 	}()
 	if s.HasMinMax() {
@@ -896,14 +881,7 @@ func (s *Int96Statistics) EncodeMax() []byte {
 func (s *Int96Statistics) Encode() (enc EncodedStatistics, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case error:
-				err = r
-			case string:
-				err = xerrors.New(r)
-			default:
-				err = fmt.Errorf("unknown error type thrown from panic: %v", r)
-			}
+			err = shared_utils.FormatRecoveredError("unknown error type thrown from panic", r)
 		}
 	}()
 	if s.HasMinMax() {
@@ -1195,14 +1173,7 @@ func (s *Float32Statistics) EncodeMax() []byte {
 func (s *Float32Statistics) Encode() (enc EncodedStatistics, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case error:
-				err = r
-			case string:
-				err = xerrors.New(r)
-			default:
-				err = fmt.Errorf("unknown error type thrown from panic: %v", r)
-			}
+			err = shared_utils.FormatRecoveredError("unknown error type thrown from panic", r)
 		}
 	}()
 	if s.HasMinMax() {
@@ -1494,14 +1465,7 @@ func (s *Float64Statistics) EncodeMax() []byte {
 func (s *Float64Statistics) Encode() (enc EncodedStatistics, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case error:
-				err = r
-			case string:
-				err = xerrors.New(r)
-			default:
-				err = fmt.Errorf("unknown error type thrown from panic: %v", r)
-			}
+			err = shared_utils.FormatRecoveredError("unknown error type thrown from panic", r)
 		}
 	}()
 	if s.HasMinMax() {
@@ -1779,14 +1743,7 @@ func (s *BooleanStatistics) EncodeMax() []byte {
 func (s *BooleanStatistics) Encode() (enc EncodedStatistics, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case error:
-				err = r
-			case string:
-				err = xerrors.New(r)
-			default:
-				err = fmt.Errorf("unknown error type thrown from panic: %v", r)
-			}
+			err = shared_utils.FormatRecoveredError("unknown error type thrown from panic", r)
 		}
 	}()
 	if s.HasMinMax() {
@@ -2093,14 +2050,7 @@ func (s *ByteArrayStatistics) EncodeMax() []byte {
 func (s *ByteArrayStatistics) Encode() (enc EncodedStatistics, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case error:
-				err = r
-			case string:
-				err = xerrors.New(r)
-			default:
-				err = fmt.Errorf("unknown error type thrown from panic: %v", r)
-			}
+			err = shared_utils.FormatRecoveredError("unknown error type thrown from panic", r)
 		}
 	}()
 	if s.HasMinMax() {
@@ -2410,14 +2360,7 @@ func (s *FixedLenByteArrayStatistics) EncodeMax() []byte {
 func (s *FixedLenByteArrayStatistics) Encode() (enc EncodedStatistics, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case error:
-				err = r
-			case string:
-				err = xerrors.New(r)
-			default:
-				err = fmt.Errorf("unknown error type thrown from panic: %v", r)
-			}
+			err = shared_utils.FormatRecoveredError("unknown error type thrown from panic", r)
 		}
 	}()
 	if s.HasMinMax() {
@@ -2718,14 +2661,7 @@ func (s *Float16Statistics) EncodeMax() []byte {
 func (s *Float16Statistics) Encode() (enc EncodedStatistics, err error) {
 	defer func() {
 		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case error:
-				err = r
-			case string:
-				err = xerrors.New(r)
-			default:
-				err = fmt.Errorf("unknown error type thrown from panic: %v", r)
-			}
+			err = shared_utils.FormatRecoveredError("unknown error type thrown from panic", r)
 		}
 	}()
 	if s.HasMinMax() {
diff --git a/go/parquet/metadata/statistics_types.gen.go.tmpl b/go/parquet/metadata/statistics_types.gen.go.tmpl
index 7dbb9b2d8c4c0..4cf47d1915f83 100644
--- a/go/parquet/metadata/statistics_types.gen.go.tmpl
+++ b/go/parquet/metadata/statistics_types.gen.go.tmpl
@@ -19,13 +19,13 @@ package metadata
 import (
   "fmt"
 
-  "github.com/apache/arrow/go/v16/arrow"
-  "github.com/apache/arrow/go/v16/parquet"
-  "github.com/apache/arrow/go/v16/parquet/schema"
-  "github.com/apache/arrow/go/v16/parquet/internal/utils"
-  shared_utils "github.com/apache/arrow/go/v16/internal/utils"
-  "github.com/apache/arrow/go/v16/parquet/internal/encoding"
-  "github.com/apache/arrow/go/v16/internal/bitutils"
+  "github.com/apache/arrow/go/v17/arrow"
+  "github.com/apache/arrow/go/v17/parquet"
+  "github.com/apache/arrow/go/v17/parquet/schema"
+  "github.com/apache/arrow/go/v17/parquet/internal/utils"
+  shared_utils "github.com/apache/arrow/go/v17/internal/utils"
+  "github.com/apache/arrow/go/v17/parquet/internal/encoding"
+  "github.com/apache/arrow/go/v17/internal/bitutils"
 )
 
 {{range .In}}
@@ -464,14 +464,7 @@ func (s *{{.Name}}Statistics) EncodeMax() []byte{
 func (s *{{.Name}}Statistics) Encode() (enc EncodedStatistics, err error) {
   defer func() {
     if r := recover(); r != nil {
-      switch r := r.(type) {
-			case error:
-				err = r
-			case string:
-				err = xerrors.New(r)
-			default:
-				err = fmt.Errorf("unknown error type thrown from panic: %v", r)
-			}
+      err = shared_utils.FormatRecoveredError("unknown error type thrown from panic", r)
     }
   }()
   if s.HasMinMax() {
diff --git a/go/parquet/pqarrow/column_readers.go b/go/parquet/pqarrow/column_readers.go
index 440753de24f65..661d163213394 100644
--- a/go/parquet/pqarrow/column_readers.go
+++ b/go/parquet/pqarrow/column_readers.go
@@ -26,16 +26,16 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"golang.org/x/sync/errgroup"
 )
 
diff --git a/go/parquet/pqarrow/encode_arrow.go b/go/parquet/pqarrow/encode_arrow.go
index cad9d14e5b319..9f5c870fa7875 100644
--- a/go/parquet/pqarrow/encode_arrow.go
+++ b/go/parquet/pqarrow/encode_arrow.go
@@ -25,16 +25,16 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/internal/debug"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/internal/debug"
 )
 
 // get the count of the number of leaf arrays for the type
diff --git a/go/parquet/pqarrow/encode_arrow_test.go b/go/parquet/pqarrow/encode_arrow_test.go
index fe82a89e88fba..4f955eae4e133 100644
--- a/go/parquet/pqarrow/encode_arrow_test.go
+++ b/go/parquet/pqarrow/encode_arrow_test.go
@@ -25,22 +25,22 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/bitutil"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/decimal256"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/types"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/compress"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
-	"github.com/apache/arrow/go/v16/parquet/internal/testutils"
-	"github.com/apache/arrow/go/v16/parquet/pqarrow"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/bitutil"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/decimal256"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/types"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/compress"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/parquet/internal/testutils"
+	"github.com/apache/arrow/go/v17/parquet/pqarrow"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/go/parquet/pqarrow/encode_dict_compute.go b/go/parquet/pqarrow/encode_dict_compute.go
index f2e257024cfcc..c698cdaf91fb1 100644
--- a/go/parquet/pqarrow/encode_dict_compute.go
+++ b/go/parquet/pqarrow/encode_dict_compute.go
@@ -21,14 +21,14 @@ package pqarrow
 import (
 	"context"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/internal/debug"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/internal/debug"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
 )
 
 func isDictEncoding(enc parquet.Encoding) bool {
diff --git a/go/parquet/pqarrow/encode_dict_nocompute.go b/go/parquet/pqarrow/encode_dict_nocompute.go
index db3d248aa80cf..26efa87538b66 100644
--- a/go/parquet/pqarrow/encode_dict_nocompute.go
+++ b/go/parquet/pqarrow/encode_dict_nocompute.go
@@ -21,8 +21,8 @@ package pqarrow
 import (
 	"errors"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/parquet/file"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/parquet/file"
 )
 
 func writeDictionaryArrow(*arrowWriteContext, file.ColumnChunkWriter, arrow.Array, []int16, []int16, bool) (err error) {
diff --git a/go/parquet/pqarrow/encode_dictionary_test.go b/go/parquet/pqarrow/encode_dictionary_test.go
index 2f16fc99b5367..200b81b3fec86 100644
--- a/go/parquet/pqarrow/encode_dictionary_test.go
+++ b/go/parquet/pqarrow/encode_dictionary_test.go
@@ -26,14 +26,14 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/compute"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/internal/testutils"
-	"github.com/apache/arrow/go/v16/parquet/pqarrow"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/compute"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/internal/testutils"
+	"github.com/apache/arrow/go/v17/parquet/pqarrow"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
diff --git a/go/parquet/pqarrow/file_reader.go b/go/parquet/pqarrow/file_reader.go
index 7cd922dcee87c..3f958dab6f1ba 100755
--- a/go/parquet/pqarrow/file_reader.go
+++ b/go/parquet/pqarrow/file_reader.go
@@ -23,13 +23,13 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/arrio"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/arrio"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/xerrors"
 )
diff --git a/go/parquet/pqarrow/file_reader_test.go b/go/parquet/pqarrow/file_reader_test.go
index 1547004ebf076..d7f03ac0531b7 100644
--- a/go/parquet/pqarrow/file_reader_test.go
+++ b/go/parquet/pqarrow/file_reader_test.go
@@ -26,14 +26,14 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/pqarrow"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/pqarrow"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/go/parquet/pqarrow/file_writer.go b/go/parquet/pqarrow/file_writer.go
index b989add03409a..b1d266ff29080 100644
--- a/go/parquet/pqarrow/file_writer.go
+++ b/go/parquet/pqarrow/file_writer.go
@@ -22,12 +22,12 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/flight"
-	"github.com/apache/arrow/go/v16/internal/utils"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/metadata"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/flight"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/metadata"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/pqarrow/file_writer_test.go b/go/parquet/pqarrow/file_writer_test.go
index 8e80df5179d01..fc965279a928d 100644
--- a/go/parquet/pqarrow/file_writer_test.go
+++ b/go/parquet/pqarrow/file_writer_test.go
@@ -18,14 +18,15 @@ package pqarrow_test
 
 import (
 	"bytes"
+	"math"
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/pqarrow"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/pqarrow"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -87,3 +88,44 @@ func TestFileWriterNumRows(t *testing.T) {
 	require.NoError(t, writer.Close())
 	assert.Equal(t, 4, writer.NumRows())
 }
+
+func TestFileWriterBuffered(t *testing.T) {
+	schema := arrow.NewSchema([]arrow.Field{
+		{Name: "one", Nullable: true, Type: arrow.PrimitiveTypes.Float64},
+		{Name: "two", Nullable: true, Type: arrow.PrimitiveTypes.Float64},
+	}, nil)
+
+	data := `[
+		{"one": 1, "two": 2},
+		{"one": 1, "two": null},
+		{"one": null, "two": 2},
+		{"one": null, "two": null}
+	]`
+
+	alloc := memory.NewCheckedAllocator(memory.DefaultAllocator)
+	defer alloc.AssertSize(t, 0)
+
+	record, _, err := array.RecordFromJSON(alloc, schema, strings.NewReader(data))
+	require.NoError(t, err)
+	defer record.Release()
+
+	output := &bytes.Buffer{}
+	writer, err := pqarrow.NewFileWriter(
+		schema,
+		output,
+		parquet.NewWriterProperties(
+			parquet.WithAllocator(alloc),
+			// Ensure enough space so we can close the writer with rows still buffered
+			parquet.WithMaxRowGroupLength(math.MaxInt64),
+		),
+		pqarrow.NewArrowWriterProperties(
+			pqarrow.WithAllocator(alloc),
+		),
+	)
+	require.NoError(t, err)
+
+	require.NoError(t, writer.WriteBuffered(record))
+
+	require.NoError(t, writer.Close())
+	assert.Equal(t, 4, writer.NumRows())
+}
diff --git a/go/parquet/pqarrow/helpers.go b/go/parquet/pqarrow/helpers.go
index db141c377fb33..a9a4242fdb44c 100644
--- a/go/parquet/pqarrow/helpers.go
+++ b/go/parquet/pqarrow/helpers.go
@@ -17,7 +17,7 @@
 package pqarrow
 
 import (
-	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v17/arrow"
 )
 
 func releaseArrays(arrays []arrow.Array) {
diff --git a/go/parquet/pqarrow/path_builder.go b/go/parquet/pqarrow/path_builder.go
index 42352de69eed0..13f2beca024f1 100644
--- a/go/parquet/pqarrow/path_builder.go
+++ b/go/parquet/pqarrow/path_builder.go
@@ -21,11 +21,11 @@ import (
 	"sync/atomic"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/bitutils"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/bitutils"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/pqarrow/path_builder_test.go b/go/parquet/pqarrow/path_builder_test.go
index 54fccf6cd22d7..4b7a8f9094b76 100644
--- a/go/parquet/pqarrow/path_builder_test.go
+++ b/go/parquet/pqarrow/path_builder_test.go
@@ -20,10 +20,10 @@ import (
 	"context"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/types"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/types"
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/go/parquet/pqarrow/properties.go b/go/parquet/pqarrow/properties.go
index d301e5bff9885..d3cf4de6ac74f 100755
--- a/go/parquet/pqarrow/properties.go
+++ b/go/parquet/pqarrow/properties.go
@@ -19,9 +19,9 @@ package pqarrow
 import (
 	"context"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet/internal/encoding"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet/internal/encoding"
 )
 
 // ArrowWriterProperties are used to determine how to manipulate the arrow data
diff --git a/go/parquet/pqarrow/reader_writer_test.go b/go/parquet/pqarrow/reader_writer_test.go
index b3bf8ab8b29fe..c573dbe43a562 100644
--- a/go/parquet/pqarrow/reader_writer_test.go
+++ b/go/parquet/pqarrow/reader_writer_test.go
@@ -22,12 +22,12 @@ import (
 	"testing"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/array"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/pqarrow"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/array"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/pqarrow"
 	"golang.org/x/exp/rand"
 	"gonum.org/v1/gonum/stat/distuv"
 )
diff --git a/go/parquet/pqarrow/schema.go b/go/parquet/pqarrow/schema.go
index c3694482f425e..8b3ea854b7a8f 100644
--- a/go/parquet/pqarrow/schema.go
+++ b/go/parquet/pqarrow/schema.go
@@ -22,15 +22,15 @@ import (
 	"math"
 	"strconv"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/decimal128"
-	"github.com/apache/arrow/go/v16/arrow/flight"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/file"
-	"github.com/apache/arrow/go/v16/parquet/metadata"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/decimal128"
+	"github.com/apache/arrow/go/v17/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/file"
+	"github.com/apache/arrow/go/v17/parquet/metadata"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/pqarrow/schema_test.go b/go/parquet/pqarrow/schema_test.go
index 5edebb369ff1d..3cbcb803fa68f 100644
--- a/go/parquet/pqarrow/schema_test.go
+++ b/go/parquet/pqarrow/schema_test.go
@@ -20,15 +20,15 @@ import (
 	"encoding/base64"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	"github.com/apache/arrow/go/v16/arrow/flight"
-	"github.com/apache/arrow/go/v16/arrow/ipc"
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/types"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/metadata"
-	"github.com/apache/arrow/go/v16/parquet/pqarrow"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow"
+	"github.com/apache/arrow/go/v17/arrow/flight"
+	"github.com/apache/arrow/go/v17/arrow/ipc"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/types"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/metadata"
+	"github.com/apache/arrow/go/v17/parquet/pqarrow"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/go/parquet/reader_properties.go b/go/parquet/reader_properties.go
index d7d75d3a23c16..1b7a9ef5dcc17 100644
--- a/go/parquet/reader_properties.go
+++ b/go/parquet/reader_properties.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/internal/utils"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/internal/utils"
 )
 
 // ReaderProperties are used to define how the file reader will handle buffering and allocating buffers
diff --git a/go/parquet/reader_writer_properties_test.go b/go/parquet/reader_writer_properties_test.go
index 538896c86bc59..784c644c13590 100644
--- a/go/parquet/reader_writer_properties_test.go
+++ b/go/parquet/reader_writer_properties_test.go
@@ -20,9 +20,9 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/compress"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/compress"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/parquet/schema/column.go b/go/parquet/schema/column.go
index d6747795d1c76..b4c169eff06a4 100644
--- a/go/parquet/schema/column.go
+++ b/go/parquet/schema/column.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/parquet"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
 )
 
 // Column encapsulates the information necessary to interpret primitive
diff --git a/go/parquet/schema/converted_types.go b/go/parquet/schema/converted_types.go
index 9417881a59f14..681f96dfe6c88 100644
--- a/go/parquet/schema/converted_types.go
+++ b/go/parquet/schema/converted_types.go
@@ -17,7 +17,7 @@
 package schema
 
 import (
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
 )
 
 // ConvertedType corresponds to the ConvertedType in the parquet.Thrift,
diff --git a/go/parquet/schema/converted_types_test.go b/go/parquet/schema/converted_types_test.go
index 3148a6e4b1f78..bd15d24c5695c 100644
--- a/go/parquet/schema/converted_types_test.go
+++ b/go/parquet/schema/converted_types_test.go
@@ -19,7 +19,7 @@ package schema_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/parquet/schema/helpers.go b/go/parquet/schema/helpers.go
index a4ce5e4ea8bad..ae0bdd6307560 100644
--- a/go/parquet/schema/helpers.go
+++ b/go/parquet/schema/helpers.go
@@ -17,7 +17,7 @@
 package schema
 
 import (
-	"github.com/apache/arrow/go/v16/parquet"
+	"github.com/apache/arrow/go/v17/parquet"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/schema/helpers_test.go b/go/parquet/schema/helpers_test.go
index 5f7c0f7c0e5d0..8c19070df2789 100644
--- a/go/parquet/schema/helpers_test.go
+++ b/go/parquet/schema/helpers_test.go
@@ -21,8 +21,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/parquet/schema/logical_types.go b/go/parquet/schema/logical_types.go
index 90d0bdfcd1e6a..94a7eaaf07b5b 100644
--- a/go/parquet/schema/logical_types.go
+++ b/go/parquet/schema/logical_types.go
@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/apache/arrow/go/v16/internal/json"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/internal/debug"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/internal/json"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/internal/debug"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
 )
 
 // DecimalMetadata is a struct for managing scale and precision information between
diff --git a/go/parquet/schema/logical_types_test.go b/go/parquet/schema/logical_types_test.go
index 18247118b752e..da70b5a36139e 100644
--- a/go/parquet/schema/logical_types_test.go
+++ b/go/parquet/schema/logical_types_test.go
@@ -19,9 +19,9 @@ package schema_test
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/internal/json"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/internal/json"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/parquet/schema/node.go b/go/parquet/schema/node.go
index 611f52c9e1215..08eec33019278 100644
--- a/go/parquet/schema/node.go
+++ b/go/parquet/schema/node.go
@@ -19,8 +19,8 @@ package schema
 import (
 	"fmt"
 
-	"github.com/apache/arrow/go/v16/parquet"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
 	"github.com/apache/thrift/lib/go/thrift"
 	"golang.org/x/xerrors"
 )
diff --git a/go/parquet/schema/reflection.go b/go/parquet/schema/reflection.go
index 4eee3c86c35f0..5b4f6b5e1cb98 100644
--- a/go/parquet/schema/reflection.go
+++ b/go/parquet/schema/reflection.go
@@ -22,10 +22,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/parquet"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
-	"golang.org/x/xerrors"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/internal/utils"
+	"github.com/apache/arrow/go/v17/parquet"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
 )
 
 type taggedInfo struct {
@@ -551,7 +551,7 @@ func typeToNode(name string, typ reflect.Type, repType parquet.Repetition, info
 // NewSchemaFromStruct generates a schema from an object type via reflection of
 // the type and reading struct tags for "parquet".
 //
-// Rules
+// # Rules
 //
 // Everything defaults to Required repetition, unless otherwise specified.
 // Pointer types become Optional repetition.
@@ -571,7 +571,7 @@ func typeToNode(name string, typ reflect.Type, repType parquet.Repetition, info
 //
 // maps will become appropriate Map structures in the schema of the defined key and values.
 //
-// Available Tags
+// # Available Tags
 //
 // name: by default the node will have the same name as the field, this tag let's you specify a name
 //
@@ -609,14 +609,7 @@ func NewSchemaFromStruct(obj interface{}) (sc *Schema, err error) {
 	defer func() {
 		if r := recover(); r != nil {
 			sc = nil
-			switch x := r.(type) {
-			case string:
-				err = xerrors.New(x)
-			case error:
-				err = x
-			default:
-				err = xerrors.New("unknown panic")
-			}
+			err = utils.FormatRecoveredError("unknown panic", r)
 		}
 	}()
 
@@ -824,14 +817,7 @@ func NewStructFromSchema(sc *Schema) (t reflect.Type, err error) {
 	defer func() {
 		if r := recover(); r != nil {
 			t = nil
-			switch x := r.(type) {
-			case string:
-				err = xerrors.New(x)
-			case error:
-				err = x
-			default:
-				err = xerrors.New("unknown panic")
-			}
+			err = utils.FormatRecoveredError("unknown panic", r)
 		}
 	}()
 
diff --git a/go/parquet/schema/reflection_test.go b/go/parquet/schema/reflection_test.go
index 9fa289388ec65..ca47459611611 100644
--- a/go/parquet/schema/reflection_test.go
+++ b/go/parquet/schema/reflection_test.go
@@ -22,9 +22,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/arrow/float16"
-	"github.com/apache/arrow/go/v16/parquet"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/arrow/float16"
+	"github.com/apache/arrow/go/v17/parquet"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/go/parquet/schema/schema.go b/go/parquet/schema/schema.go
index e4864e9330622..81dca82ecad00 100644
--- a/go/parquet/schema/schema.go
+++ b/go/parquet/schema/schema.go
@@ -35,8 +35,8 @@ import (
 	"io"
 	"strings"
 
-	"github.com/apache/arrow/go/v16/parquet"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
 	"golang.org/x/xerrors"
 )
 
diff --git a/go/parquet/schema/schema_element_test.go b/go/parquet/schema/schema_element_test.go
index af281146980af..4f57652be6c9e 100644
--- a/go/parquet/schema/schema_element_test.go
+++ b/go/parquet/schema/schema_element_test.go
@@ -19,8 +19,8 @@ package schema
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/parquet"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 )
diff --git a/go/parquet/schema/schema_flatten_test.go b/go/parquet/schema/schema_flatten_test.go
index 6b7de6b9b718c..a128232d46309 100644
--- a/go/parquet/schema/schema_flatten_test.go
+++ b/go/parquet/schema/schema_flatten_test.go
@@ -19,8 +19,8 @@ package schema
 import (
 	"testing"
 
-	"github.com/apache/arrow/go/v16/parquet"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 )
diff --git a/go/parquet/schema/schema_test.go b/go/parquet/schema/schema_test.go
index 3f0bdab79aa9e..f0bd941bcb429 100644
--- a/go/parquet/schema/schema_test.go
+++ b/go/parquet/schema/schema_test.go
@@ -20,9 +20,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/apache/arrow/go/v16/parquet"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
-	"github.com/apache/arrow/go/v16/parquet/schema"
+	"github.com/apache/arrow/go/v17/parquet"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/parquet/schema"
 	"github.com/apache/thrift/lib/go/thrift"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
diff --git a/go/parquet/tools.go b/go/parquet/tools.go
index b9ce84def5ae0..64e9419e4f711 100644
--- a/go/parquet/tools.go
+++ b/go/parquet/tools.go
@@ -14,6 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build tools
 // +build tools
 
 package tools
diff --git a/go/parquet/types.go b/go/parquet/types.go
index 5447e793b4ea6..c1ab3788ca577 100644
--- a/go/parquet/types.go
+++ b/go/parquet/types.go
@@ -24,8 +24,8 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/apache/arrow/go/v16/arrow"
-	format "github.com/apache/arrow/go/v16/parquet/internal/gen-go/parquet"
+	"github.com/apache/arrow/go/v17/arrow"
+	format "github.com/apache/arrow/go/v17/parquet/internal/gen-go/parquet"
 )
 
 const (
diff --git a/go/parquet/writer_properties.go b/go/parquet/writer_properties.go
index 7fd3ed9f4be8d..9ff7e5a582215 100644
--- a/go/parquet/writer_properties.go
+++ b/go/parquet/writer_properties.go
@@ -17,8 +17,8 @@
 package parquet
 
 import (
-	"github.com/apache/arrow/go/v16/arrow/memory"
-	"github.com/apache/arrow/go/v16/parquet/compress"
+	"github.com/apache/arrow/go/v17/arrow/memory"
+	"github.com/apache/arrow/go/v17/parquet/compress"
 )
 
 // Constants for default property values used for the default reader, writer and column props.
@@ -46,7 +46,7 @@ const (
 	DefaultStatsEnabled = true
 	// If the stats are larger than 4K the writer will skip writing them out anyways.
 	DefaultMaxStatsSize int64 = 4096
-	DefaultCreatedBy          = "parquet-go version 16.0.0-SNAPSHOT"
+	DefaultCreatedBy          = "parquet-go version 17.0.0-SNAPSHOT"
 	DefaultRootName           = "schema"
 )
 
diff --git a/java/.gitignore b/java/.gitignore
index cef5a6e73f7aa..63c90af7b7d4c 100644
--- a/java/.gitignore
+++ b/java/.gitignore
@@ -21,6 +21,3 @@ arrow-git.properties
 cmake_install.cmake
 install_manifest.txt
 target/
-
-# Generated properties file
-flight/flight-sql-jdbc-core/src/main/resources/properties/flight.properties
diff --git a/.mvn/gradle-enterprise.xml b/java/.mvn/develocity.xml
similarity index 78%
rename from .mvn/gradle-enterprise.xml
rename to java/.mvn/develocity.xml
index bae5a3f147e68..df3cbccd2b6cb 100644
--- a/.mvn/gradle-enterprise.xml
+++ b/java/.mvn/develocity.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
 
     Licensed to the Apache Software Foundation (ASF) under one
@@ -19,19 +19,19 @@
     under the License.
 
 -->
-<gradleEnterprise xmlns="https://www.gradle.com/gradle-enterprise-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://www.gradle.com/gradle-enterprise-maven https://www.gradle.com/schema/gradle-enterprise-maven.xsd">
+<develocity xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd">
     <server>
         <url>https://ge.apache.org</url>
         <allowUntrusted>false</allowUntrusted>
     </server>
     <buildScan>
         <capture>
-            <goalInputFiles>true</goalInputFiles>
+            <fileFingerprints>true</fileFingerprints>
             <buildLogging>true</buildLogging>
             <testLogging>true</testLogging>
         </capture>
         <backgroundBuildScanUpload>#{isFalse(env['CI'])}</backgroundBuildScanUpload>
-        <publish>ALWAYS</publish>
+        <publishing><onlyIf>true</onlyIf></publishing>
         <publishIfAuthenticated>true</publishIfAuthenticated>
         <obfuscation>
             <ipAddresses>#{{'0.0.0.0'}}</ipAddresses>
@@ -42,4 +42,4 @@
             <enabled>false</enabled>
         </remote>
     </buildCache>
-</gradleEnterprise>
+</develocity>
diff --git a/.mvn/extensions.xml b/java/.mvn/extensions.xml
similarity index 90%
rename from .mvn/extensions.xml
rename to java/.mvn/extensions.xml
index b446c647e47e6..d6e80695e22d0 100644
--- a/.mvn/extensions.xml
+++ b/java/.mvn/extensions.xml
@@ -22,12 +22,12 @@
 <extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
     <extension>
         <groupId>com.gradle</groupId>
-        <artifactId>gradle-enterprise-maven-extension</artifactId>
-        <version>1.20</version>
+        <artifactId>develocity-maven-extension</artifactId>
+        <version>1.21.5</version>
     </extension>
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>common-custom-user-data-maven-extension</artifactId>
-        <version>1.12.5</version>
+        <version>2.0</version>
     </extension>
 </extensions>
diff --git a/java/README.md b/java/README.md
index 69d1255a861e6..25e35c10973e9 100644
--- a/java/README.md
+++ b/java/README.md
@@ -48,10 +48,10 @@ a version of your choosing.
 
 ```bash
 $ flatc --version
-flatc version 23.5.26
+flatc version 24.3.25
 
 $ grep "dep.fbs.version" java/pom.xml
-    <dep.fbs.version>23.5.26</dep.fbs.version>
+    <dep.fbs.version>24.3.25</dep.fbs.version>
 ```
 
 2. Generate the flatbuffer java files by performing the following:
@@ -66,10 +66,7 @@ rm -rf java/format/src
 flatc --java -o java/format/src/main/java format/*.fbs
 
 # prepend license header
-find java/format/src -type f | while read file; do
-  (cat header | while read line; do echo "// $line"; done; cat $file) > $file.tmp
-  mv $file.tmp $file
-done
+mvn spotless:apply -pl :arrow-format
 ```
 
 ## Performance Tuning
diff --git a/java/adapter/avro/pom.xml b/java/adapter/avro/pom.xml
index 6644748b5e597..4dac64de1e7ab 100644
--- a/java/adapter/avro/pom.xml
+++ b/java/adapter/avro/pom.xml
@@ -1,22 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.arrow</groupId>
     <artifactId>arrow-java-root</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>17.0.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -26,36 +33,27 @@
   <url>http://maven.apache.org</url>
 
   <dependencies>
-
-    <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-core -->
     <dependency>
       <groupId>org.apache.arrow</groupId>
       <artifactId>arrow-memory-core</artifactId>
     </dependency>
-
-    <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-netty -->
     <dependency>
       <groupId>org.apache.arrow</groupId>
       <artifactId>arrow-memory-netty</artifactId>
       <scope>runtime</scope>
     </dependency>
-
-    <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-vector -->
     <dependency>
       <groupId>org.apache.arrow</groupId>
       <artifactId>arrow-vector</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.immutables</groupId>
-      <artifactId>value</artifactId>
+      <artifactId>value-annotations</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
       <version>${dep.avro.version}</version>
     </dependency>
   </dependencies>
-
 </project>
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrow.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrow.java
index 8baa60a72ddc3..2392c36f94cee 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrow.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrow.java
@@ -14,24 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro;
 
 import java.io.IOException;
-
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.avro.Schema;
 import org.apache.avro.io.Decoder;
 
-/**
- * Utility class to convert Avro objects to columnar Arrow format objects.
- */
+/** Utility class to convert Avro objects to columnar Arrow format objects. */
 public class AvroToArrow {
 
   /**
-   * Fetch the data from {@link Decoder} and convert it to Arrow objects.
-   * Only for testing purpose.
+   * Fetch the data from {@link Decoder} and convert it to Arrow objects. Only for testing purpose.
+   *
    * @param schema avro schema.
    * @param decoder avro decoder
    * @param config configuration of the conversion.
@@ -48,15 +44,14 @@ static VectorSchemaRoot avroToArrow(Schema schema, Decoder decoder, AvroToArrowC
 
   /**
    * Fetch the data from {@link Decoder} and iteratively convert it to Arrow objects.
+   *
    * @param schema avro schema
    * @param decoder avro decoder
    * @param config configuration of the conversion.
    * @throws IOException on error
    */
   public static AvroToArrowVectorIterator avroToArrowIterator(
-      Schema schema,
-      Decoder decoder,
-      AvroToArrowConfig config) throws IOException {
+      Schema schema, Decoder decoder, AvroToArrowConfig config) throws IOException {
 
     Preconditions.checkNotNull(schema, "Avro schema object cannot be null");
     Preconditions.checkNotNull(decoder, "Avro decoder object cannot be null");
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowConfig.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowConfig.java
index f9210fb012523..290d1a77d956c 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowConfig.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowConfig.java
@@ -14,40 +14,35 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro;
 
 import java.util.Set;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.dictionary.DictionaryProvider;
 
-/**
- * This class configures the Avro-to-Arrow conversion process.
- */
+/** This class configures the Avro-to-Arrow conversion process. */
 public class AvroToArrowConfig {
 
   private final BufferAllocator allocator;
   /**
-   * The maximum rowCount to read each time when partially convert data.
-   * Default value is 1024 and -1 means read all data into one vector.
+   * The maximum rowCount to read each time when partially convert data. Default value is 1024 and
+   * -1 means read all data into one vector.
    */
   private final int targetBatchSize;
 
   /**
-   * The dictionary provider used for enum type.
-   * If avro schema has enum type, will create dictionary and update this provider.
+   * The dictionary provider used for enum type. If avro schema has enum type, will create
+   * dictionary and update this provider.
    */
   private final DictionaryProvider.MapDictionaryProvider provider;
 
-  /**
-   * The field names which to skip when reading decoder values.
-   */
+  /** The field names which to skip when reading decoder values. */
   private final Set<String> skipFieldNames;
 
   /**
    * Instantiate an instance.
+   *
    * @param allocator The memory allocator to construct the Arrow vectors with.
    * @param targetBatchSize The maximum rowCount to read each time when partially convert data.
    * @param provider The dictionary provider used for enum type, adapter will update this provider.
@@ -59,8 +54,10 @@ public class AvroToArrowConfig {
       DictionaryProvider.MapDictionaryProvider provider,
       Set<String> skipFieldNames) {
 
-    Preconditions.checkArgument(targetBatchSize == AvroToArrowVectorIterator.NO_LIMIT_BATCH_SIZE ||
-        targetBatchSize > 0, "invalid targetBatchSize: %s", targetBatchSize);
+    Preconditions.checkArgument(
+        targetBatchSize == AvroToArrowVectorIterator.NO_LIMIT_BATCH_SIZE || targetBatchSize > 0,
+        "invalid targetBatchSize: %s",
+        targetBatchSize);
 
     this.allocator = allocator;
     this.targetBatchSize = targetBatchSize;
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowConfigBuilder.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowConfigBuilder.java
index 41e486d0a1ce0..1fa176a7fea38 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowConfigBuilder.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowConfigBuilder.java
@@ -14,18 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro;
 
 import java.util.HashSet;
 import java.util.Set;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.dictionary.DictionaryProvider;
 
-/**
- * This class builds {@link AvroToArrowConfig}s.
- */
+/** This class builds {@link AvroToArrowConfig}s. */
 public class AvroToArrowConfigBuilder {
 
   private BufferAllocator allocator;
@@ -36,9 +32,7 @@ public class AvroToArrowConfigBuilder {
 
   private Set<String> skipFieldNames;
 
-  /**
-   * Default constructor for the {@link AvroToArrowConfigBuilder}.
-   */
+  /** Default constructor for the {@link AvroToArrowConfigBuilder}. */
   public AvroToArrowConfigBuilder(BufferAllocator allocator) {
     this.allocator = allocator;
     this.targetBatchSize = AvroToArrowVectorIterator.DEFAULT_BATCH_SIZE;
@@ -61,14 +55,8 @@ public AvroToArrowConfigBuilder setSkipFieldNames(Set<String> skipFieldNames) {
     return this;
   }
 
-  /**
-   * This builds the {@link AvroToArrowConfig} from the provided params.
-   */
+  /** This builds the {@link AvroToArrowConfig} from the provided params. */
   public AvroToArrowConfig build() {
-    return new AvroToArrowConfig(
-        allocator,
-        targetBatchSize,
-        provider,
-        skipFieldNames);
+    return new AvroToArrowConfig(allocator, targetBatchSize, provider, skipFieldNames);
   }
 }
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowUtils.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowUtils.java
index 1f5ad9e768950..b39121cfd1ae7 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowUtils.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowUtils.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro;
 
 import static org.apache.arrow.vector.types.FloatingPointPrecision.DOUBLE;
@@ -27,10 +26,10 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.adapter.avro.consumers.AvroArraysConsumer;
 import org.apache.arrow.adapter.avro.consumers.AvroBooleanConsumer;
 import org.apache.arrow.adapter.avro.consumers.AvroBytesConsumer;
@@ -95,7 +94,6 @@
 import org.apache.avro.LogicalType;
 import org.apache.avro.LogicalTypes;
 import org.apache.avro.Schema;
-import org.apache.avro.Schema.Type;
 import org.apache.avro.io.Decoder;
 
 /**
@@ -106,36 +104,37 @@ public class AvroToArrowUtils {
   /**
    * Creates a {@link Consumer} from the {@link Schema}
    *
-   <p>This method currently performs following type mapping for Avro data types to corresponding Arrow data types.
+   * <p>This method currently performs following type mapping for Avro data types to corresponding
+   * Arrow data types.
    *
    * <ul>
-   *   <li>STRING --> ArrowType.Utf8</li>
-   *   <li>INT --> ArrowType.Int(32, signed)</li>
-   *   <li>LONG --> ArrowType.Int(64, signed)</li>
-   *   <li>FLOAT --> ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)</li>
-   *   <li>DOUBLE --> ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)</li>
-   *   <li>BOOLEAN --> ArrowType.Bool</li>
-   *   <li>BYTES --> ArrowType.Binary</li>
-   *   <li>ARRAY --> ArrowType.List</li>
-   *   <li>MAP --> ArrowType.Map</li>
-   *   <li>FIXED --> ArrowType.FixedSizeBinary</li>
-   *   <li>RECORD --> ArrowType.Struct</li>
-   *   <li>UNION --> ArrowType.Union</li>
-   *   <li>ENUM--> ArrowType.Int</li>
-   *   <li>DECIMAL --> ArrowType.Decimal</li>
-   *   <li>Date --> ArrowType.Date(DateUnit.DAY)</li>
-   *   <li>TimeMillis --> ArrowType.Time(TimeUnit.MILLISECOND, 32)</li>
-   *   <li>TimeMicros --> ArrowType.Time(TimeUnit.MICROSECOND, 64)</li>
-   *   <li>TimestampMillis --> ArrowType.Timestamp(TimeUnit.MILLISECOND, null)</li>
-   *   <li>TimestampMicros --> ArrowType.Timestamp(TimeUnit.MICROSECOND, null)</li>
+   *   <li>STRING --> ArrowType.Utf8
+   *   <li>INT --> ArrowType.Int(32, signed)
+   *   <li>LONG --> ArrowType.Int(64, signed)
+   *   <li>FLOAT --> ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)
+   *   <li>DOUBLE --> ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)
+   *   <li>BOOLEAN --> ArrowType.Bool
+   *   <li>BYTES --> ArrowType.Binary
+   *   <li>ARRAY --> ArrowType.List
+   *   <li>MAP --> ArrowType.Map
+   *   <li>FIXED --> ArrowType.FixedSizeBinary
+   *   <li>RECORD --> ArrowType.Struct
+   *   <li>UNION --> ArrowType.Union
+   *   <li>ENUM--> ArrowType.Int
+   *   <li>DECIMAL --> ArrowType.Decimal
+   *   <li>Date --> ArrowType.Date(DateUnit.DAY)
+   *   <li>TimeMillis --> ArrowType.Time(TimeUnit.MILLISECOND, 32)
+   *   <li>TimeMicros --> ArrowType.Time(TimeUnit.MICROSECOND, 64)
+   *   <li>TimestampMillis --> ArrowType.Timestamp(TimeUnit.MILLISECOND, null)
+   *   <li>TimestampMicros --> ArrowType.Timestamp(TimeUnit.MICROSECOND, null)
    * </ul>
    */
-
   private static Consumer createConsumer(Schema schema, String name, AvroToArrowConfig config) {
     return createConsumer(schema, name, false, config, null);
   }
 
-  private static Consumer createConsumer(Schema schema, String name, AvroToArrowConfig config, FieldVector vector) {
+  private static Consumer createConsumer(
+      Schema schema, String name, AvroToArrowConfig config, FieldVector vector) {
     return createConsumer(schema, name, false, config, vector);
   }
 
@@ -144,7 +143,8 @@ private static Consumer createConsumer(Schema schema, String name, AvroToArrowCo
    *
    * @param schema avro schema
    * @param name arrow field name
-   * @param consumerVector vector to keep in consumer, if v == null, will create a new vector via field.
+   * @param consumerVector vector to keep in consumer, if v == null, will create a new vector via
+   *     field.
    * @return consumer
    */
   private static Consumer createConsumer(
@@ -159,7 +159,7 @@ private static Consumer createConsumer(
 
     final BufferAllocator allocator = config.getAllocator();
 
-    final Type type = schema.getType();
+    final Schema.Type type = schema.getType();
     final LogicalType logicalType = schema.getLogicalType();
 
     final ArrowType arrowType;
@@ -185,7 +185,7 @@ private static Consumer createConsumer(
         break;
       case STRING:
         arrowType = new ArrowType.Utf8();
-        fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema));
+        fieldType = new FieldType(nullable, arrowType, /*dictionary=*/ null, getMetaData(schema));
         vector = createVector(consumerVector, fieldType, name, allocator);
         consumer = new AvroStringConsumer((VarCharVector) vector);
         break;
@@ -193,12 +193,18 @@ private static Consumer createConsumer(
         Map<String, String> extProps = createExternalProps(schema);
         if (logicalType instanceof LogicalTypes.Decimal) {
           arrowType = createDecimalArrowType((LogicalTypes.Decimal) logicalType);
-          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema, extProps));
+          fieldType =
+              new FieldType(
+                  nullable, arrowType, /*dictionary=*/ null, getMetaData(schema, extProps));
           vector = createVector(consumerVector, fieldType, name, allocator);
-          consumer = new AvroDecimalConsumer.FixedDecimalConsumer((DecimalVector) vector, schema.getFixedSize());
+          consumer =
+              new AvroDecimalConsumer.FixedDecimalConsumer(
+                  (DecimalVector) vector, schema.getFixedSize());
         } else {
           arrowType = new ArrowType.FixedSizeBinary(schema.getFixedSize());
-          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema, extProps));
+          fieldType =
+              new FieldType(
+                  nullable, arrowType, /*dictionary=*/ null, getMetaData(schema, extProps));
           vector = createVector(consumerVector, fieldType, name, allocator);
           consumer = new AvroFixedConsumer((FixedSizeBinaryVector) vector, schema.getFixedSize());
         }
@@ -206,84 +212,85 @@ private static Consumer createConsumer(
       case INT:
         if (logicalType instanceof LogicalTypes.Date) {
           arrowType = new ArrowType.Date(DateUnit.DAY);
-          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema));
+          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/ null, getMetaData(schema));
           vector = createVector(consumerVector, fieldType, name, allocator);
           consumer = new AvroDateConsumer((DateDayVector) vector);
         } else if (logicalType instanceof LogicalTypes.TimeMillis) {
           arrowType = new ArrowType.Time(TimeUnit.MILLISECOND, 32);
-          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema));
+          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/ null, getMetaData(schema));
           vector = createVector(consumerVector, fieldType, name, allocator);
           consumer = new AvroTimeMillisConsumer((TimeMilliVector) vector);
         } else {
-          arrowType = new ArrowType.Int(32, /*signed=*/true);
-          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema));
+          arrowType = new ArrowType.Int(32, /*isSigned=*/ true);
+          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/ null, getMetaData(schema));
           vector = createVector(consumerVector, fieldType, name, allocator);
           consumer = new AvroIntConsumer((IntVector) vector);
         }
         break;
       case BOOLEAN:
         arrowType = new ArrowType.Bool();
-        fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema));
+        fieldType = new FieldType(nullable, arrowType, /*dictionary=*/ null, getMetaData(schema));
         vector = createVector(consumerVector, fieldType, name, allocator);
         consumer = new AvroBooleanConsumer((BitVector) vector);
         break;
       case LONG:
         if (logicalType instanceof LogicalTypes.TimeMicros) {
           arrowType = new ArrowType.Time(TimeUnit.MICROSECOND, 64);
-          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema));
+          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/ null, getMetaData(schema));
           vector = createVector(consumerVector, fieldType, name, allocator);
           consumer = new AvroTimeMicroConsumer((TimeMicroVector) vector);
         } else if (logicalType instanceof LogicalTypes.TimestampMillis) {
           arrowType = new ArrowType.Timestamp(TimeUnit.MILLISECOND, null);
-          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema));
+          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/ null, getMetaData(schema));
           vector = createVector(consumerVector, fieldType, name, allocator);
           consumer = new AvroTimestampMillisConsumer((TimeStampMilliVector) vector);
         } else if (logicalType instanceof LogicalTypes.TimestampMicros) {
           arrowType = new ArrowType.Timestamp(TimeUnit.MICROSECOND, null);
-          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema));
+          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/ null, getMetaData(schema));
           vector = createVector(consumerVector, fieldType, name, allocator);
           consumer = new AvroTimestampMicrosConsumer((TimeStampMicroVector) vector);
         } else {
-          arrowType = new ArrowType.Int(64, /*signed=*/true);
-          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema));
+          arrowType = new ArrowType.Int(64, /*isSigned=*/ true);
+          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/ null, getMetaData(schema));
           vector = createVector(consumerVector, fieldType, name, allocator);
           consumer = new AvroLongConsumer((BigIntVector) vector);
         }
         break;
       case FLOAT:
         arrowType = new ArrowType.FloatingPoint(SINGLE);
-        fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema));
+        fieldType = new FieldType(nullable, arrowType, /*dictionary=*/ null, getMetaData(schema));
         vector = createVector(consumerVector, fieldType, name, allocator);
         consumer = new AvroFloatConsumer((Float4Vector) vector);
         break;
       case DOUBLE:
         arrowType = new ArrowType.FloatingPoint(DOUBLE);
-        fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema));
+        fieldType = new FieldType(nullable, arrowType, /*dictionary=*/ null, getMetaData(schema));
         vector = createVector(consumerVector, fieldType, name, allocator);
         consumer = new AvroDoubleConsumer((Float8Vector) vector);
         break;
       case BYTES:
         if (logicalType instanceof LogicalTypes.Decimal) {
           arrowType = createDecimalArrowType((LogicalTypes.Decimal) logicalType);
-          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema));
+          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/ null, getMetaData(schema));
           vector = createVector(consumerVector, fieldType, name, allocator);
           consumer = new AvroDecimalConsumer.BytesDecimalConsumer((DecimalVector) vector);
         } else {
           arrowType = new ArrowType.Binary();
-          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema));
+          fieldType = new FieldType(nullable, arrowType, /*dictionary=*/ null, getMetaData(schema));
           vector = createVector(consumerVector, fieldType, name, allocator);
           consumer = new AvroBytesConsumer((VarBinaryVector) vector);
         }
         break;
       case NULL:
         arrowType = new ArrowType.Null();
-        fieldType = new FieldType(nullable, arrowType, /*dictionary=*/null, getMetaData(schema));
-        vector = fieldType.createNewSingleVector(name, allocator, /*schemaCallback=*/null);
+        fieldType = new FieldType(nullable, arrowType, /*dictionary=*/ null, getMetaData(schema));
+        vector = fieldType.createNewSingleVector(name, allocator, /*schemaCallBack=*/ null);
         consumer = new AvroNullConsumer((NullVector) vector);
         break;
       default:
         // no-op, shouldn't get here
-        throw new UnsupportedOperationException("Can't convert avro type %s to arrow type." + type.getName());
+        throw new UnsupportedOperationException(
+            "Can't convert avro type %s to arrow type." + type.getName());
     }
     return consumer;
   }
@@ -291,59 +298,65 @@ private static Consumer createConsumer(
   private static ArrowType createDecimalArrowType(LogicalTypes.Decimal logicalType) {
     final int scale = logicalType.getScale();
     final int precision = logicalType.getPrecision();
-    Preconditions.checkArgument(precision > 0 && precision <= 38,
-        "Precision must be in range of 1 to 38");
-    Preconditions.checkArgument(scale >= 0 && scale <= 38,
-        "Scale must be in range of 0 to 38.");
-    Preconditions.checkArgument(scale <= precision,
-        "Invalid decimal scale: %s (greater than precision: %s)", scale, precision);
+    Preconditions.checkArgument(
+        precision > 0 && precision <= 38, "Precision must be in range of 1 to 38");
+    Preconditions.checkArgument(scale >= 0 && scale <= 38, "Scale must be in range of 0 to 38.");
+    Preconditions.checkArgument(
+        scale <= precision,
+        "Invalid decimal scale: %s (greater than precision: %s)",
+        scale,
+        precision);
 
     return new ArrowType.Decimal(precision, scale, 128);
-
   }
 
   private static Consumer createSkipConsumer(Schema schema) {
 
     SkipFunction skipFunction;
-    Type type = schema.getType();
+    Schema.Type type = schema.getType();
 
     switch (type) {
       case UNION:
-        List<Consumer> unionDelegates = schema.getTypes().stream().map(s ->
-            createSkipConsumer(s)).collect(Collectors.toList());
+        List<Consumer> unionDelegates =
+            schema.getTypes().stream().map(s -> createSkipConsumer(s)).collect(Collectors.toList());
         skipFunction = decoder -> unionDelegates.get(decoder.readInt()).consume(decoder);
 
         break;
       case ARRAY:
         Consumer elementDelegate = createSkipConsumer(schema.getElementType());
-        skipFunction = decoder -> {
-          for (long i = decoder.skipArray(); i != 0; i = decoder.skipArray()) {
-            for (long j = 0; j < i; j++) {
-              elementDelegate.consume(decoder);
-            }
-          }
-        };
+        skipFunction =
+            decoder -> {
+              for (long i = decoder.skipArray(); i != 0; i = decoder.skipArray()) {
+                for (long j = 0; j < i; j++) {
+                  elementDelegate.consume(decoder);
+                }
+              }
+            };
         break;
       case MAP:
         Consumer valueDelegate = createSkipConsumer(schema.getValueType());
-        skipFunction = decoder -> {
-          for (long i = decoder.skipMap(); i != 0; i = decoder.skipMap()) {
-            for (long j = 0; j < i; j++) {
-              decoder.skipString(); // Discard key
-              valueDelegate.consume(decoder);
-            }
-          }
-        };
+        skipFunction =
+            decoder -> {
+              for (long i = decoder.skipMap(); i != 0; i = decoder.skipMap()) {
+                for (long j = 0; j < i; j++) {
+                  decoder.skipString(); // Discard key
+                  valueDelegate.consume(decoder);
+                }
+              }
+            };
         break;
       case RECORD:
-        List<Consumer> delegates = schema.getFields().stream().map(field ->
-            createSkipConsumer(field.schema())).collect(Collectors.toList());
+        List<Consumer> delegates =
+            schema.getFields().stream()
+                .map(field -> createSkipConsumer(field.schema()))
+                .collect(Collectors.toList());
 
-        skipFunction = decoder -> {
-          for (Consumer consumer : delegates) {
-            consumer.consume(decoder);
-          }
-        };
+        skipFunction =
+            decoder -> {
+              for (Consumer consumer : delegates) {
+                consumer.consume(decoder);
+              }
+            };
 
         break;
       case ENUM:
@@ -374,7 +387,7 @@ private static Consumer createSkipConsumer(Schema schema) {
         skipFunction = decoder -> decoder.skipBytes();
         break;
       case NULL:
-        skipFunction = decoder -> { };
+        skipFunction = decoder -> {};
         break;
       default:
         // no-op, shouldn't get here
@@ -384,14 +397,13 @@ private static Consumer createSkipConsumer(Schema schema) {
     return new SkipConsumer(skipFunction);
   }
 
-  static CompositeAvroConsumer createCompositeConsumer(
-      Schema schema, AvroToArrowConfig config) {
+  static CompositeAvroConsumer createCompositeConsumer(Schema schema, AvroToArrowConfig config) {
 
     List<Consumer> consumers = new ArrayList<>();
     final Set<String> skipFieldNames = config.getSkipFieldNames();
 
     Schema.Type type = schema.getType();
-    if (type == Type.RECORD) {
+    if (type == Schema.Type.RECORD) {
       for (Schema.Field field : schema.getFields()) {
         if (skipFieldNames.contains(field.name())) {
           consumers.add(createSkipConsumer(field.schema()));
@@ -399,7 +411,6 @@ static CompositeAvroConsumer createCompositeConsumer(
           Consumer consumer = createConsumer(field.schema(), field.name(), config);
           consumers.add(consumer);
         }
-
       }
     } else {
       Consumer consumer = createConsumer(schema, "", config);
@@ -409,14 +420,16 @@ static CompositeAvroConsumer createCompositeConsumer(
     return new CompositeAvroConsumer(consumers);
   }
 
-  private static FieldVector createVector(FieldVector consumerVector, FieldType fieldType,
-      String name, BufferAllocator allocator) {
-    return consumerVector != null ? consumerVector : fieldType.createNewSingleVector(name, allocator, null);
+  private static FieldVector createVector(
+      FieldVector consumerVector, FieldType fieldType, String name, BufferAllocator allocator) {
+    return consumerVector != null
+        ? consumerVector
+        : fieldType.createNewSingleVector(name, allocator, null);
   }
 
   private static String getDefaultFieldName(ArrowType type) {
     Types.MinorType minorType = Types.getMinorTypeForArrowType(type);
-    return minorType.name().toLowerCase();
+    return minorType.name().toLowerCase(Locale.ROOT);
   }
 
   private static Field avroSchemaToField(Schema schema, String name, AvroToArrowConfig config) {
@@ -424,12 +437,9 @@ private static Field avroSchemaToField(Schema schema, String name, AvroToArrowCo
   }
 
   private static Field avroSchemaToField(
-      Schema schema,
-      String name,
-      AvroToArrowConfig config,
-      Map<String, String> externalProps) {
+      Schema schema, String name, AvroToArrowConfig config, Map<String, String> externalProps) {
 
-    final Type type = schema.getType();
+    final Schema.Type type = schema.getType();
     final LogicalType logicalType = schema.getLogicalType();
     final List<Field> children = new ArrayList<>();
     final FieldType fieldType;
@@ -441,7 +451,8 @@ private static Field avroSchemaToField(
           // Union child vector should use default name
           children.add(avroSchemaToField(childSchema, null, config));
         }
-        fieldType = createFieldType(new ArrowType.Union(UnionMode.Sparse, null), schema, externalProps);
+        fieldType =
+            createFieldType(new ArrowType.Union(UnionMode.Sparse, null), schema, externalProps);
         break;
       case ARRAY:
         Schema elementSchema = schema.getElementType();
@@ -450,14 +461,18 @@ private static Field avroSchemaToField(
         break;
       case MAP:
         // MapVector internal struct field and key field should be non-nullable
-        FieldType keyFieldType = new FieldType(/*nullable=*/false, new ArrowType.Utf8(), /*dictionary=*/null);
-        Field keyField = new Field("key", keyFieldType, /*children=*/null);
+        FieldType keyFieldType =
+            new FieldType(/*nullable=*/ false, new ArrowType.Utf8(), /*dictionary=*/ null);
+        Field keyField = new Field("key", keyFieldType, /*children=*/ null);
         Field valueField = avroSchemaToField(schema.getValueType(), "value", config);
 
-        FieldType structFieldType = new FieldType(false, new ArrowType.Struct(), /*dictionary=*/null);
-        Field structField = new Field("internal", structFieldType, Arrays.asList(keyField, valueField));
+        FieldType structFieldType =
+            new FieldType(false, new ArrowType.Struct(), /*dictionary=*/ null);
+        Field structField =
+            new Field("internal", structFieldType, Arrays.asList(keyField, valueField));
         children.add(structField);
-        fieldType = createFieldType(new ArrowType.Map(/*keySorted=*/false), schema, externalProps);
+        fieldType =
+            createFieldType(new ArrowType.Map(/*keysSorted=*/ false), schema, externalProps);
         break;
       case RECORD:
         final Set<String> skipFieldNames = config.getSkipFieldNames();
@@ -486,8 +501,12 @@ private static Field avroSchemaToField(
         int enumCount = schema.getEnumSymbols().size();
         ArrowType.Int indexType = DictionaryEncoder.getIndexType(enumCount);
 
-        fieldType = createFieldType(indexType, schema, externalProps,
-            new DictionaryEncoding(current, /*ordered=*/false, /*indexType=*/indexType));
+        fieldType =
+            createFieldType(
+                indexType,
+                schema,
+                externalProps,
+                new DictionaryEncoding(current, /*ordered=*/ false, /*indexType=*/ indexType));
         break;
 
       case STRING:
@@ -509,7 +528,7 @@ private static Field avroSchemaToField(
         } else if (logicalType instanceof LogicalTypes.TimeMillis) {
           intArrowType = new ArrowType.Time(TimeUnit.MILLISECOND, 32);
         } else {
-          intArrowType = new ArrowType.Int(32, /*signed=*/true);
+          intArrowType = new ArrowType.Int(32, /*isSigned=*/ true);
         }
         fieldType = createFieldType(intArrowType, schema, externalProps);
         break;
@@ -525,7 +544,7 @@ private static Field avroSchemaToField(
         } else if (logicalType instanceof LogicalTypes.TimestampMicros) {
           longArrowType = new ArrowType.Timestamp(TimeUnit.MICROSECOND, null);
         } else {
-          longArrowType = new ArrowType.Int(64, /*signed=*/true);
+          longArrowType = new ArrowType.Int(64, /*isSigned=*/ true);
         }
         fieldType = createFieldType(longArrowType, schema, externalProps);
         break;
@@ -558,8 +577,8 @@ private static Field avroSchemaToField(
     return new Field(name, fieldType, children.size() == 0 ? null : children);
   }
 
-  private static Consumer createArrayConsumer(Schema schema, String name, AvroToArrowConfig config,
-      FieldVector consumerVector) {
+  private static Consumer createArrayConsumer(
+      Schema schema, String name, AvroToArrowConfig config, FieldVector consumerVector) {
 
     ListVector listVector;
     if (consumerVector == null) {
@@ -578,8 +597,8 @@ private static Consumer createArrayConsumer(Schema schema, String name, AvroToAr
     return new AvroArraysConsumer(listVector, delegate);
   }
 
-  private static Consumer createStructConsumer(Schema schema, String name, AvroToArrowConfig config,
-      FieldVector consumerVector) {
+  private static Consumer createStructConsumer(
+      Schema schema, String name, AvroToArrowConfig config, FieldVector consumerVector) {
 
     final Set<String> skipFieldNames = config.getSkipFieldNames();
 
@@ -601,19 +620,22 @@ private static Consumer createStructConsumer(Schema schema, String name, AvroToA
       if (skipFieldNames.contains(fullChildName)) {
         delegate = createSkipConsumer(childField.schema());
       } else {
-        delegate = createConsumer(childField.schema(), fullChildName, config,
-            structVector.getChildrenFromFields().get(vectorIndex++));
+        delegate =
+            createConsumer(
+                childField.schema(),
+                fullChildName,
+                config,
+                structVector.getChildrenFromFields().get(vectorIndex++));
       }
 
       delegates[i] = delegate;
     }
 
     return new AvroStructConsumer(structVector, delegates);
-
   }
 
-  private static Consumer createEnumConsumer(Schema schema, String name, AvroToArrowConfig config,
-      FieldVector consumerVector) {
+  private static Consumer createEnumConsumer(
+      Schema schema, String name, AvroToArrowConfig config, FieldVector consumerVector) {
 
     BaseIntVector indexVector;
     if (consumerVector == null) {
@@ -630,16 +652,14 @@ private static Consumer createEnumConsumer(Schema schema, String name, AvroToArr
     for (int i = 0; i < valueCount; i++) {
       dictVector.set(i, schema.getEnumSymbols().get(i).getBytes(StandardCharsets.UTF_8));
     }
-    Dictionary dictionary =
-        new Dictionary(dictVector, indexVector.getField().getDictionary());
+    Dictionary dictionary = new Dictionary(dictVector, indexVector.getField().getDictionary());
     config.getProvider().put(dictionary);
 
     return new AvroEnumConsumer(indexVector);
-
   }
 
-  private static Consumer createMapConsumer(Schema schema, String name, AvroToArrowConfig config,
-      FieldVector consumerVector) {
+  private static Consumer createMapConsumer(
+      Schema schema, String name, AvroToArrowConfig config, FieldVector consumerVector) {
 
     MapVector mapVector;
     if (consumerVector == null) {
@@ -653,10 +673,14 @@ private static Consumer createMapConsumer(Schema schema, String name, AvroToArro
     StructVector structVector = (StructVector) mapVector.getDataVector();
 
     // keys in avro map are always assumed to be strings.
-    Consumer keyConsumer = new AvroStringConsumer(
-        (VarCharVector) structVector.getChildrenFromFields().get(0));
-    Consumer valueConsumer = createConsumer(schema.getValueType(), schema.getValueType().getName(),
-        config, structVector.getChildrenFromFields().get(1));
+    Consumer keyConsumer =
+        new AvroStringConsumer((VarCharVector) structVector.getChildrenFromFields().get(0));
+    Consumer valueConsumer =
+        createConsumer(
+            schema.getValueType(),
+            schema.getValueType().getName(),
+            config,
+            structVector.getChildrenFromFields().get(1));
 
     AvroStructConsumer internalConsumer =
         new AvroStructConsumer(structVector, new Consumer[] {keyConsumer, valueConsumer});
@@ -664,11 +688,12 @@ private static Consumer createMapConsumer(Schema schema, String name, AvroToArro
     return new AvroMapConsumer(mapVector, internalConsumer);
   }
 
-  private static Consumer createUnionConsumer(Schema schema, String name, AvroToArrowConfig config,
-      FieldVector consumerVector) {
+  private static Consumer createUnionConsumer(
+      Schema schema, String name, AvroToArrowConfig config, FieldVector consumerVector) {
     final int size = schema.getTypes().size();
 
-    final boolean nullable = schema.getTypes().stream().anyMatch(t -> t.getType() == Type.NULL);
+    final boolean nullable =
+        schema.getTypes().stream().anyMatch(t -> t.getType() == Schema.Type.NULL);
 
     UnionVector unionVector;
     if (consumerVector == null) {
@@ -695,21 +720,19 @@ private static Consumer createUnionConsumer(Schema schema, String name, AvroToAr
 
   /**
    * Read data from {@link Decoder} and generate a {@link VectorSchemaRoot}.
+   *
    * @param schema avro schema
    * @param decoder avro decoder to read data from
    */
   static VectorSchemaRoot avroToArrowVectors(
-      Schema schema,
-      Decoder decoder,
-      AvroToArrowConfig config)
-      throws IOException {
+      Schema schema, Decoder decoder, AvroToArrowConfig config) throws IOException {
 
     List<FieldVector> vectors = new ArrayList<>();
     List<Consumer> consumers = new ArrayList<>();
     final Set<String> skipFieldNames = config.getSkipFieldNames();
 
     Schema.Type type = schema.getType();
-    if (type == Type.RECORD) {
+    if (type == Schema.Type.RECORD) {
       for (Schema.Field field : schema.getFields()) {
         if (skipFieldNames.contains(field.name())) {
           consumers.add(createSkipConsumer(field.schema()));
@@ -726,8 +749,8 @@ static VectorSchemaRoot avroToArrowVectors(
     }
 
     long validConsumerCount = consumers.stream().filter(c -> !c.skippable()).count();
-    Preconditions.checkArgument(vectors.size() == validConsumerCount,
-        "vectors size not equals consumers size.");
+    Preconditions.checkArgument(
+        vectors.size() == validConsumerCount, "vectors size not equals consumers size.");
 
     List<Field> fields = vectors.stream().map(t -> t.getField()).collect(Collectors.toList());
 
@@ -767,9 +790,7 @@ private static Map<String, String> getMetaData(Schema schema, Map<String, String
     return metadata;
   }
 
-  /**
-   * Parse avro attributes and convert them to metadata.
-   */
+  /** Parse avro attributes and convert them to metadata. */
   private static Map<String, String> createExternalProps(Schema schema) {
     final Map<String, String> extProps = new HashMap<>();
     String doc = schema.getDoc();
@@ -783,8 +804,9 @@ private static Map<String, String> createExternalProps(Schema schema) {
     return extProps;
   }
 
-  private static FieldType createFieldType(ArrowType arrowType, Schema schema, Map<String, String> externalProps) {
-    return createFieldType(arrowType, schema, externalProps, /*dictionary=*/null);
+  private static FieldType createFieldType(
+      ArrowType arrowType, Schema schema, Map<String, String> externalProps) {
+    return createFieldType(arrowType, schema, externalProps, /*dictionary=*/ null);
   }
 
   private static FieldType createFieldType(
@@ -793,8 +815,8 @@ private static FieldType createFieldType(
       Map<String, String> externalProps,
       DictionaryEncoding dictionary) {
 
-    return new FieldType(/*nullable=*/false, arrowType, dictionary,
-        getMetaData(schema, externalProps));
+    return new FieldType(
+        /*nullable=*/ false, arrowType, dictionary, getMetaData(schema, externalProps));
   }
 
   private static String convertAliases(Set<String> aliases) {
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowVectorIterator.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowVectorIterator.java
index 4a439ade81181..4123370061794 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowVectorIterator.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/AvroToArrowVectorIterator.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro;
 
 import java.io.EOFException;
@@ -22,7 +21,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.adapter.avro.consumers.CompositeAvroConsumer;
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.FieldVector;
@@ -32,9 +30,7 @@
 import org.apache.avro.Schema;
 import org.apache.avro.io.Decoder;
 
-/**
- * VectorSchemaRoot iterator for partially converting avro data.
- */
+/** VectorSchemaRoot iterator for partially converting avro data. */
 public class AvroToArrowVectorIterator implements Iterator<VectorSchemaRoot>, AutoCloseable {
 
   public static final int NO_LIMIT_BATCH_SIZE = -1;
@@ -53,28 +49,18 @@ public class AvroToArrowVectorIterator implements Iterator<VectorSchemaRoot>, Au
 
   private final int targetBatchSize;
 
-  /**
-   * Construct an instance.
-   */
-  private AvroToArrowVectorIterator(
-      Decoder decoder,
-      Schema schema,
-      AvroToArrowConfig config) {
+  /** Construct an instance. */
+  private AvroToArrowVectorIterator(Decoder decoder, Schema schema, AvroToArrowConfig config) {
 
     this.decoder = decoder;
     this.schema = schema;
     this.config = config;
     this.targetBatchSize = config.getTargetBatchSize();
-
   }
 
-  /**
-   * Create a ArrowVectorIterator to partially convert data.
-   */
+  /** Create a ArrowVectorIterator to partially convert data. */
   public static AvroToArrowVectorIterator create(
-      Decoder decoder,
-      Schema schema,
-      AvroToArrowConfig config) {
+      Decoder decoder, Schema schema, AvroToArrowConfig config) {
 
     AvroToArrowVectorIterator iterator = new AvroToArrowVectorIterator(decoder, schema, config);
     try {
@@ -136,9 +122,10 @@ private void load(VectorSchemaRoot root) {
       ValueVectorUtility.preAllocate(root, targetBatchSize);
     }
 
-    long validConsumerCount = compositeConsumer.getConsumers().stream().filter(c ->
-        !c.skippable()).count();
-    Preconditions.checkArgument(root.getFieldVectors().size() == validConsumerCount,
+    long validConsumerCount =
+        compositeConsumer.getConsumers().stream().filter(c -> !c.skippable()).count();
+    Preconditions.checkArgument(
+        root.getFieldVectors().size() == validConsumerCount,
         "Schema root vectors size not equals to consumers size.");
 
     compositeConsumer.resetConsumerVectors(root);
@@ -159,9 +146,8 @@ public boolean hasNext() {
     return nextBatch != null;
   }
 
-  /**
-   * Gets the next vector. The user is responsible for freeing its resources.
-   */
+  /** Gets the next vector. The user is responsible for freeing its resources. */
+  @Override
   public VectorSchemaRoot next() {
     Preconditions.checkArgument(hasNext());
     VectorSchemaRoot returned = nextBatch;
@@ -174,9 +160,8 @@ public VectorSchemaRoot next() {
     return returned;
   }
 
-  /**
-   * Clean up resources.
-   */
+  /** Clean up resources. */
+  @Override
   public void close() {
     if (nextBatch != null) {
       nextBatch.close();
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroArraysConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroArraysConsumer.java
index fd25986c32b95..4555ce7a295f7 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroArraysConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroArraysConsumer.java
@@ -14,25 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
-
 import org.apache.arrow.vector.complex.ListVector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume array type values from avro decoder.
- * Write the data to {@link ListVector}.
+ * Consumer which consume array type values from avro decoder. Write the data to {@link ListVector}.
  */
 public class AvroArraysConsumer extends BaseAvroConsumer<ListVector> {
 
   private final Consumer delegate;
 
-  /**
-   * Instantiate a ArrayConsumer.
-   */
+  /** Instantiate a ArrayConsumer. */
   public AvroArraysConsumer(ListVector vector, Consumer delegate) {
     super(vector);
     this.delegate = delegate;
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroBooleanConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroBooleanConsumer.java
index bf41828d19f7a..09eb5f3b255d5 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroBooleanConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroBooleanConsumer.java
@@ -14,23 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
-
 import org.apache.arrow.vector.BitVector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume boolean type values from avro decoder.
- * Write the data to {@link BitVector}.
+ * Consumer which consume boolean type values from avro decoder. Write the data to {@link
+ * BitVector}.
  */
 public class AvroBooleanConsumer extends BaseAvroConsumer<BitVector> {
 
-  /**
-   * Instantiate a AvroBooleanConsumer.
-   */
+  /** Instantiate a AvroBooleanConsumer. */
   public AvroBooleanConsumer(BitVector vector) {
     super(vector);
   }
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroBytesConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroBytesConsumer.java
index c8370e480608d..86b6cbb13d881 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroBytesConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroBytesConsumer.java
@@ -14,26 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
-
 import org.apache.arrow.vector.VarBinaryVector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume bytes type values from avro decoder.
- * Write the data to {@link VarBinaryVector}.
+ * Consumer which consume bytes type values from avro decoder. Write the data to {@link
+ * VarBinaryVector}.
  */
 public class AvroBytesConsumer extends BaseAvroConsumer<VarBinaryVector> {
 
   private ByteBuffer cacheBuffer;
 
-  /**
-   * Instantiate a AvroBytesConsumer.
-   */
+  /** Instantiate a AvroBytesConsumer. */
   public AvroBytesConsumer(VarBinaryVector vector) {
     super(vector);
   }
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroDoubleConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroDoubleConsumer.java
index 7cc7dd33b15a9..011cbccc09c5b 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroDoubleConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroDoubleConsumer.java
@@ -14,23 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
-
 import org.apache.arrow.vector.Float8Vector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume double type values from avro decoder.
- * Write the data to {@link Float8Vector}.
+ * Consumer which consume double type values from avro decoder. Write the data to {@link
+ * Float8Vector}.
  */
 public class AvroDoubleConsumer extends BaseAvroConsumer<Float8Vector> {
 
-  /**
-   * Instantiate a AvroDoubleConsumer.
-   */
+  /** Instantiate a AvroDoubleConsumer. */
   public AvroDoubleConsumer(Float8Vector vector) {
     super(vector);
   }
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroEnumConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroEnumConsumer.java
index 32a2c85f6fc50..f47988fb962a1 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroEnumConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroEnumConsumer.java
@@ -14,24 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
-
 import org.apache.arrow.vector.BaseIntVector;
 import org.apache.arrow.vector.IntVector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume enum type values from avro decoder.
- * Write the data to {@link IntVector}.
+ * Consumer which consume enum type values from avro decoder. Write the data to {@link IntVector}.
  */
 public class AvroEnumConsumer extends BaseAvroConsumer<BaseIntVector> {
 
-  /**
-   * Instantiate a AvroEnumConsumer.
-   */
+  /** Instantiate a AvroEnumConsumer. */
   public AvroEnumConsumer(BaseIntVector vector) {
     super(vector);
   }
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroFixedConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroFixedConsumer.java
index 16b70898fd36a..6b78afd3c95d4 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroFixedConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroFixedConsumer.java
@@ -14,25 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
-
 import org.apache.arrow.vector.FixedSizeBinaryVector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume fixed type values from avro decoder.
- * Write the data to {@link org.apache.arrow.vector.FixedSizeBinaryVector}.
+ * Consumer which consume fixed type values from avro decoder. Write the data to {@link
+ * org.apache.arrow.vector.FixedSizeBinaryVector}.
  */
 public class AvroFixedConsumer extends BaseAvroConsumer<FixedSizeBinaryVector> {
 
   private final byte[] reuseBytes;
 
-  /**
-   * Instantiate a AvroFixedConsumer.
-   */
+  /** Instantiate a AvroFixedConsumer. */
   public AvroFixedConsumer(FixedSizeBinaryVector vector, int size) {
     super(vector);
     reuseBytes = new byte[size];
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroFloatConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroFloatConsumer.java
index b09d2881875b6..2c6d4aa5a05f6 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroFloatConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroFloatConsumer.java
@@ -14,23 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
-
 import org.apache.arrow.vector.Float4Vector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume float type values from avro decoder.
- * Write the data to {@link Float4Vector}.
+ * Consumer which consume float type values from avro decoder. Write the data to {@link
+ * Float4Vector}.
  */
 public class AvroFloatConsumer extends BaseAvroConsumer<Float4Vector> {
 
-  /**
-   * Instantiate a AvroFloatConsumer.
-   */
+  /** Instantiate a AvroFloatConsumer. */
   public AvroFloatConsumer(Float4Vector vector) {
     super(vector);
   }
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroIntConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroIntConsumer.java
index ae5a2719c5642..22c7b10aa65f7 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroIntConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroIntConsumer.java
@@ -14,23 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
-
 import org.apache.arrow.vector.IntVector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume int type values from avro decoder.
- * Write the data to {@link IntVector}.
+ * Consumer which consume int type values from avro decoder. Write the data to {@link IntVector}.
  */
 public class AvroIntConsumer extends BaseAvroConsumer<IntVector> {
 
-  /**
-   * Instantiate a AvroIntConsumer.
-   */
+  /** Instantiate a AvroIntConsumer. */
   public AvroIntConsumer(IntVector vector) {
     super(vector);
   }
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroLongConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroLongConsumer.java
index 4db836acc4586..90c5313417d7c 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroLongConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroLongConsumer.java
@@ -14,23 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
-
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume long type values from avro decoder.
- * Write the data to {@link BigIntVector}.
+ * Consumer which consume long type values from avro decoder. Write the data to {@link
+ * BigIntVector}.
  */
 public class AvroLongConsumer extends BaseAvroConsumer<BigIntVector> {
 
-  /**
-   * Instantiate a AvroLongConsumer.
-   */
+  /** Instantiate a AvroLongConsumer. */
   public AvroLongConsumer(BigIntVector vector) {
     super(vector);
   }
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroMapConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroMapConsumer.java
index 1ea97e63b61e5..543471533ec01 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroMapConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroMapConsumer.java
@@ -14,27 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
-
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.complex.MapVector;
 import org.apache.arrow.vector.complex.StructVector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume map type values from avro decoder.
- * Write the data to {@link MapVector}.
+ * Consumer which consume map type values from avro decoder. Write the data to {@link MapVector}.
  */
 public class AvroMapConsumer extends BaseAvroConsumer<MapVector> {
 
   private final Consumer delegate;
 
-  /**
-   * Instantiate a AvroMapConsumer.
-   */
+  /** Instantiate a AvroMapConsumer. */
   public AvroMapConsumer(MapVector vector, Consumer delegate) {
     super(vector);
     this.delegate = delegate;
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroNullConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroNullConsumer.java
index 4c7bb8c03bad3..0f80c2b7b2db3 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroNullConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroNullConsumer.java
@@ -14,17 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
-
 import org.apache.arrow.vector.NullVector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume null type values from avro decoder.
- * Corresponding to {@link org.apache.arrow.vector.NullVector}.
+ * Consumer which consume null type values from avro decoder. Corresponding to {@link
+ * org.apache.arrow.vector.NullVector}.
  */
 public class AvroNullConsumer extends BaseAvroConsumer<NullVector> {
 
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroStringConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroStringConsumer.java
index 072270aa6c081..164d595e9c6ac 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroStringConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroStringConsumer.java
@@ -14,26 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
-
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume string type values from avro decoder.
- * Write the data to {@link VarCharVector}.
+ * Consumer which consume string type values from avro decoder. Write the data to {@link
+ * VarCharVector}.
  */
 public class AvroStringConsumer extends BaseAvroConsumer<VarCharVector> {
 
   private ByteBuffer cacheBuffer;
 
-  /**
-   * Instantiate a AvroStringConsumer.
-   */
+  /** Instantiate a AvroStringConsumer. */
   public AvroStringConsumer(VarCharVector vector) {
     super(vector);
   }
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroStructConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroStructConsumer.java
index a02b1577f9fa8..94c2f611e84b7 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroStructConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroStructConsumer.java
@@ -14,27 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
-
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.complex.StructVector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume nested record type values from avro decoder.
- * Write the data to {@link org.apache.arrow.vector.complex.StructVector}.
+ * Consumer which consume nested record type values from avro decoder. Write the data to {@link
+ * org.apache.arrow.vector.complex.StructVector}.
  */
 public class AvroStructConsumer extends BaseAvroConsumer<StructVector> {
 
   private final Consumer[] delegates;
 
-  /**
-   * Instantiate a AvroStructConsumer.
-   */
+  /** Instantiate a AvroStructConsumer. */
   public AvroStructConsumer(StructVector vector, Consumer[] delegates) {
     super(vector);
     this.delegates = delegates;
@@ -49,7 +45,6 @@ public void consume(Decoder decoder) throws IOException {
     }
     vector.setIndexDefined(currentIndex);
     currentIndex++;
-
   }
 
   @Override
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroUnionsConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroUnionsConsumer.java
index 76287543b0646..5a8e23e62892c 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroUnionsConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/AvroUnionsConsumer.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
-
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.complex.UnionVector;
@@ -26,17 +24,15 @@
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume unions type values from avro decoder.
- * Write the data to {@link org.apache.arrow.vector.complex.UnionVector}.
+ * Consumer which consume unions type values from avro decoder. Write the data to {@link
+ * org.apache.arrow.vector.complex.UnionVector}.
  */
 public class AvroUnionsConsumer extends BaseAvroConsumer<UnionVector> {
 
   private Consumer[] delegates;
   private Types.MinorType[] types;
 
-  /**
-   * Instantiate an AvroUnionConsumer.
-   */
+  /** Instantiate an AvroUnionConsumer. */
   public AvroUnionsConsumer(UnionVector vector, Consumer[] delegates, Types.MinorType[] types) {
 
     super(vector);
@@ -53,7 +49,8 @@ public void consume(Decoder decoder) throws IOException {
 
     vector.setType(currentIndex, types[fieldIndex]);
     // In UnionVector we need to set sub vector writer position before consume a value
-    // because in the previous iterations we might not have written to the specific union sub vector.
+    // because in the previous iterations we might not have written to the specific union sub
+    // vector.
     delegate.setPosition(currentIndex);
     delegate.consume(decoder);
 
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/BaseAvroConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/BaseAvroConsumer.java
index 66a6cda68401e..9430d83cb4372 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/BaseAvroConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/BaseAvroConsumer.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import org.apache.arrow.vector.FieldVector;
 
 /**
  * Base class for non-skippable avro consumers.
+ *
  * @param <T> vector type.
  */
 public abstract class BaseAvroConsumer<T extends FieldVector> implements Consumer<T> {
@@ -30,6 +30,7 @@ public abstract class BaseAvroConsumer<T extends FieldVector> implements Consume
 
   /**
    * Constructs a base avro consumer.
+   *
    * @param vector the vector to consume.
    */
   public BaseAvroConsumer(T vector) {
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/CompositeAvroConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/CompositeAvroConsumer.java
index 97812226180ac..11c1f7712ef19 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/CompositeAvroConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/CompositeAvroConsumer.java
@@ -14,20 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
 import java.util.List;
-
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.avro.io.Decoder;
 
-/**
- * Composite consumer which hold all consumers.
- * It manages the consume and cleanup process.
- */
+/** Composite consumer which hold all consumers. It manages the consume and cleanup process. */
 public class CompositeAvroConsumer implements AutoCloseable {
 
   private final List<Consumer> consumers;
@@ -40,18 +35,14 @@ public CompositeAvroConsumer(List<Consumer> consumers) {
     this.consumers = consumers;
   }
 
-  /**
-   * Consume decoder data.
-   */
+  /** Consume decoder data. */
   public void consume(Decoder decoder) throws IOException {
     for (Consumer consumer : consumers) {
       consumer.consume(decoder);
     }
   }
 
-  /**
-   * Reset vector of consumers with the given {@link VectorSchemaRoot}.
-   */
+  /** Reset vector of consumers with the given {@link VectorSchemaRoot}. */
   public void resetConsumerVectors(VectorSchemaRoot root) {
     int index = 0;
     for (Consumer consumer : consumers) {
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/Consumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/Consumer.java
index c2ae1ce77b282..0c07f90bf5f39 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/Consumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/Consumer.java
@@ -14,58 +14,49 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
-
 import org.apache.arrow.vector.FieldVector;
 import org.apache.avro.io.Decoder;
 
 /**
  * Interface that is used to consume values from avro decoder.
+ *
  * @param <T> The vector within consumer or its delegate, used for partially consume purpose.
  */
 public interface Consumer<T extends FieldVector> extends AutoCloseable {
 
   /**
    * Consume a specific type value from avro decoder and write it to vector.
+   *
    * @param decoder avro decoder to read data
    * @throws IOException on error
    */
   void consume(Decoder decoder) throws IOException;
 
-  /**
-   * Add null value to vector by making writer position + 1.
-   */
+  /** Add null value to vector by making writer position + 1. */
   void addNull();
 
-  /**
-   * Set the position to write value into vector.
-   */
+  /** Set the position to write value into vector. */
   void setPosition(int index);
 
-  /**
-   * Get the vector within the consumer.
-   */
+  /** Get the vector within the consumer. */
   FieldVector getVector();
 
-  /**
-   * Close this consumer when occurs exception to avoid potential leak.
-   */
+  /** Close this consumer when occurs exception to avoid potential leak. */
+  @Override
   void close() throws Exception;
 
   /**
    * Reset the vector within consumer for partial read purpose.
+   *
    * @return true if reset is successful, false if reset is not needed.
    */
   boolean resetValueVector(T vector);
 
-  /**
-   * Indicates whether the consumer is type of {@link SkipConsumer}.
-   */
+  /** Indicates whether the consumer is type of {@link SkipConsumer}. */
   default boolean skippable() {
     return false;
   }
-
 }
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/SkipConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/SkipConsumer.java
index 1ac0a6d71557b..2c104728ce620 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/SkipConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/SkipConsumer.java
@@ -14,17 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
-
 import org.apache.arrow.vector.FieldVector;
 import org.apache.avro.io.Decoder;
 
-/**
- * Consumer which skip (throw away) data from the decoder.
- */
+/** Consumer which skip (throw away) data from the decoder. */
 public class SkipConsumer implements Consumer {
 
   private final SkipFunction skipFunction;
@@ -39,12 +35,10 @@ public void consume(Decoder decoder) throws IOException {
   }
 
   @Override
-  public void addNull() {
-  }
+  public void addNull() {}
 
   @Override
-  public void setPosition(int index) {
-  }
+  public void setPosition(int index) {}
 
   @Override
   public FieldVector getVector() {
@@ -52,8 +46,7 @@ public FieldVector getVector() {
   }
 
   @Override
-  public void close() throws Exception {
-  }
+  public void close() throws Exception {}
 
   @Override
   public boolean resetValueVector(FieldVector vector) {
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/SkipFunction.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/SkipFunction.java
index 93fc4a7fede3f..3d72d03104f3c 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/SkipFunction.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/SkipFunction.java
@@ -14,16 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers;
 
 import java.io.IOException;
-
 import org.apache.avro.io.Decoder;
 
-/**
- * Adapter function to skip (throw away) data from the decoder.
- */
+/** Adapter function to skip (throw away) data from the decoder. */
 @FunctionalInterface
 public interface SkipFunction {
   void apply(Decoder decoder) throws IOException;
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroDateConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroDateConsumer.java
index a5c36d88fb76a..0f557297a3cb7 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroDateConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroDateConsumer.java
@@ -14,24 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers.logical;
 
 import java.io.IOException;
-
 import org.apache.arrow.adapter.avro.consumers.BaseAvroConsumer;
 import org.apache.arrow.vector.DateDayVector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume date type values from avro decoder.
- * Write the data to {@link DateDayVector}.
+ * Consumer which consume date type values from avro decoder. Write the data to {@link
+ * DateDayVector}.
  */
 public class AvroDateConsumer extends BaseAvroConsumer<DateDayVector> {
 
-  /**
-   * Instantiate a AvroDateConsumer.
-   */
+  /** Instantiate a AvroDateConsumer. */
   public AvroDateConsumer(DateDayVector vector) {
     super(vector);
   }
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroDecimalConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroDecimalConsumer.java
index ebe5ca3884e5e..fa1a12ac8a6ed 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroDecimalConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroDecimalConsumer.java
@@ -14,40 +14,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers.logical;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
-
 import org.apache.arrow.adapter.avro.consumers.BaseAvroConsumer;
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.DecimalVector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume decimal type values from avro decoder.
- * Write the data to {@link DecimalVector}.
+ * Consumer which consume decimal type values from avro decoder. Write the data to {@link
+ * DecimalVector}.
  */
 public abstract class AvroDecimalConsumer extends BaseAvroConsumer<DecimalVector> {
 
-  /**
-   * Instantiate a AvroDecimalConsumer.
-   */
+  /** Instantiate a AvroDecimalConsumer. */
   public AvroDecimalConsumer(DecimalVector vector) {
     super(vector);
   }
 
-  /**
-   * Consumer for decimal logical type with original bytes type.
-   */
+  /** Consumer for decimal logical type with original bytes type. */
   public static class BytesDecimalConsumer extends AvroDecimalConsumer {
 
     private ByteBuffer cacheBuffer;
 
-    /**
-     * Instantiate a BytesDecimalConsumer.
-     */
+    /** Instantiate a BytesDecimalConsumer. */
     public BytesDecimalConsumer(DecimalVector vector) {
       super(vector);
     }
@@ -60,19 +52,14 @@ public void consume(Decoder decoder) throws IOException {
       cacheBuffer.get(bytes);
       vector.setBigEndian(currentIndex++, bytes);
     }
-
   }
 
-  /**
-   * Consumer for decimal logical type with original fixed type.
-   */
+  /** Consumer for decimal logical type with original fixed type. */
   public static class FixedDecimalConsumer extends AvroDecimalConsumer {
 
     private byte[] reuseBytes;
 
-    /**
-     * Instantiate a FixedDecimalConsumer.
-     */
+    /** Instantiate a FixedDecimalConsumer. */
     public FixedDecimalConsumer(DecimalVector vector, int size) {
       super(vector);
       Preconditions.checkArgument(size <= 16, "Decimal bytes length should <= 16.");
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroTimeMicroConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroTimeMicroConsumer.java
index 89216d4ad1436..60e7d15bf16d6 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroTimeMicroConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroTimeMicroConsumer.java
@@ -14,24 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers.logical;
 
 import java.io.IOException;
-
 import org.apache.arrow.adapter.avro.consumers.BaseAvroConsumer;
 import org.apache.arrow.vector.TimeMicroVector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume date time-micro values from avro decoder.
- * Write the data to {@link TimeMicroVector}.
+ * Consumer which consume date time-micro values from avro decoder. Write the data to {@link
+ * TimeMicroVector}.
  */
 public class AvroTimeMicroConsumer extends BaseAvroConsumer<TimeMicroVector> {
 
-  /**
-   * Instantiate a AvroTimeMicroConsumer.
-   */
+  /** Instantiate a AvroTimeMicroConsumer. */
   public AvroTimeMicroConsumer(TimeMicroVector vector) {
     super(vector);
   }
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroTimeMillisConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroTimeMillisConsumer.java
index ab5df8d4bc8ac..e0b232e9abd5e 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroTimeMillisConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroTimeMillisConsumer.java
@@ -14,24 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers.logical;
 
 import java.io.IOException;
-
 import org.apache.arrow.adapter.avro.consumers.BaseAvroConsumer;
 import org.apache.arrow.vector.TimeMilliVector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume date time-millis values from avro decoder.
- * Write the data to {@link TimeMilliVector}.
+ * Consumer which consume date time-millis values from avro decoder. Write the data to {@link
+ * TimeMilliVector}.
  */
 public class AvroTimeMillisConsumer extends BaseAvroConsumer<TimeMilliVector> {
 
-  /**
-   * Instantiate a AvroTimeMilliConsumer.
-   */
+  /** Instantiate a AvroTimeMilliConsumer. */
   public AvroTimeMillisConsumer(TimeMilliVector vector) {
     super(vector);
   }
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroTimestampMicrosConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroTimestampMicrosConsumer.java
index 93b39d479ff0e..88acf7b329569 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroTimestampMicrosConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroTimestampMicrosConsumer.java
@@ -14,24 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers.logical;
 
 import java.io.IOException;
-
 import org.apache.arrow.adapter.avro.consumers.BaseAvroConsumer;
 import org.apache.arrow.vector.TimeStampMicroVector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume date timestamp-micro values from avro decoder.
- * Write the data to {@link TimeStampMicroVector}.
+ * Consumer which consume date timestamp-micro values from avro decoder. Write the data to {@link
+ * TimeStampMicroVector}.
  */
 public class AvroTimestampMicrosConsumer extends BaseAvroConsumer<TimeStampMicroVector> {
 
-  /**
-   * Instantiate a AvroTimestampMicroConsumer.
-   */
+  /** Instantiate a AvroTimestampMicroConsumer. */
   public AvroTimestampMicrosConsumer(TimeStampMicroVector vector) {
     super(vector);
   }
diff --git a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroTimestampMillisConsumer.java b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroTimestampMillisConsumer.java
index 9e651c3959f81..ec50d7902319c 100644
--- a/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroTimestampMillisConsumer.java
+++ b/java/adapter/avro/src/main/java/org/apache/arrow/adapter/avro/consumers/logical/AvroTimestampMillisConsumer.java
@@ -14,24 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro.consumers.logical;
 
 import java.io.IOException;
-
 import org.apache.arrow.adapter.avro.consumers.BaseAvroConsumer;
 import org.apache.arrow.vector.TimeStampMilliVector;
 import org.apache.avro.io.Decoder;
 
 /**
- * Consumer which consume date timestamp-millis values from avro decoder.
- * Write the data to {@link TimeStampMilliVector}.
+ * Consumer which consume date timestamp-millis values from avro decoder. Write the data to {@link
+ * TimeStampMilliVector}.
  */
 public class AvroTimestampMillisConsumer extends BaseAvroConsumer<TimeStampMilliVector> {
 
-  /**
-   * Instantiate a AvroTimestampMillisConsumer.
-   */
+  /** Instantiate a AvroTimestampMillisConsumer. */
   public AvroTimestampMillisConsumer(TimeStampMilliVector vector) {
     super(vector);
   }
diff --git a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroLogicalTypesTest.java b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroLogicalTypesTest.java
index 6ee04e33a5ce1..173cc855b1eb1 100644
--- a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroLogicalTypesTest.java
+++ b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroLogicalTypesTest.java
@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro;
 
-import static junit.framework.TestCase.assertNull;
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
@@ -27,14 +26,13 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.util.DateUtility;
 import org.apache.avro.Conversions;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericFixed;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AvroLogicalTypesTest extends AvroTestBase {
 
@@ -43,13 +41,13 @@ public void testTimestampMicros() throws Exception {
     Schema schema = getSchema("logical/test_timestamp_micros.avsc");
 
     List<Long> data = Arrays.asList(10000L, 20000L, 30000L, 40000L, 50000L);
-    List<LocalDateTime> expected = Arrays.asList(
-        DateUtility.getLocalDateTimeFromEpochMicro(10000),
-        DateUtility.getLocalDateTimeFromEpochMicro(20000),
-        DateUtility.getLocalDateTimeFromEpochMicro(30000),
-        DateUtility.getLocalDateTimeFromEpochMicro(40000),
-        DateUtility.getLocalDateTimeFromEpochMicro(50000)
-    );
+    List<LocalDateTime> expected =
+        Arrays.asList(
+            DateUtility.getLocalDateTimeFromEpochMicro(10000),
+            DateUtility.getLocalDateTimeFromEpochMicro(20000),
+            DateUtility.getLocalDateTimeFromEpochMicro(30000),
+            DateUtility.getLocalDateTimeFromEpochMicro(40000),
+            DateUtility.getLocalDateTimeFromEpochMicro(50000));
 
     VectorSchemaRoot root = writeAndRead(schema, data);
     FieldVector vector = root.getFieldVectors().get(0);
@@ -62,13 +60,13 @@ public void testTimestampMillis() throws Exception {
     Schema schema = getSchema("logical/test_timestamp_millis.avsc");
 
     List<Long> data = Arrays.asList(10000L, 20000L, 30000L, 40000L, 50000L);
-    List<LocalDateTime> expected = Arrays.asList(
-        DateUtility.getLocalDateTimeFromEpochMilli(10000),
-        DateUtility.getLocalDateTimeFromEpochMilli(20000),
-        DateUtility.getLocalDateTimeFromEpochMilli(30000),
-        DateUtility.getLocalDateTimeFromEpochMilli(40000),
-        DateUtility.getLocalDateTimeFromEpochMilli(50000)
-    );
+    List<LocalDateTime> expected =
+        Arrays.asList(
+            DateUtility.getLocalDateTimeFromEpochMilli(10000),
+            DateUtility.getLocalDateTimeFromEpochMilli(20000),
+            DateUtility.getLocalDateTimeFromEpochMilli(30000),
+            DateUtility.getLocalDateTimeFromEpochMilli(40000),
+            DateUtility.getLocalDateTimeFromEpochMilli(50000));
 
     VectorSchemaRoot root = writeAndRead(schema, data);
     FieldVector vector = root.getFieldVectors().get(0);
@@ -93,13 +91,13 @@ public void testTimeMillis() throws Exception {
     Schema schema = getSchema("logical/test_time_millis.avsc");
 
     List<Integer> data = Arrays.asList(100, 200, 300, 400, 500);
-    List<LocalDateTime> expected = Arrays.asList(
-        DateUtility.getLocalDateTimeFromEpochMilli(100),
-        DateUtility.getLocalDateTimeFromEpochMilli(200),
-        DateUtility.getLocalDateTimeFromEpochMilli(300),
-        DateUtility.getLocalDateTimeFromEpochMilli(400),
-        DateUtility.getLocalDateTimeFromEpochMilli(500)
-    );
+    List<LocalDateTime> expected =
+        Arrays.asList(
+            DateUtility.getLocalDateTimeFromEpochMilli(100),
+            DateUtility.getLocalDateTimeFromEpochMilli(200),
+            DateUtility.getLocalDateTimeFromEpochMilli(300),
+            DateUtility.getLocalDateTimeFromEpochMilli(400),
+            DateUtility.getLocalDateTimeFromEpochMilli(500));
 
     VectorSchemaRoot root = writeAndRead(schema, data);
     FieldVector vector = root.getFieldVectors().get(0);
@@ -137,7 +135,6 @@ public void testDecimalWithOriginalBytes() throws Exception {
     VectorSchemaRoot root = writeAndRead(schema, data);
     FieldVector vector = root.getFieldVectors().get(0);
     checkPrimitiveResult(expected, vector);
-
   }
 
   @Test
@@ -174,10 +171,9 @@ public void testInvalidDecimalPrecision() throws Exception {
       data.add(buffer);
     }
 
-    IllegalArgumentException e = assertThrows(IllegalArgumentException.class,
-        () -> writeAndRead(schema, data));
+    IllegalArgumentException e =
+        assertThrows(IllegalArgumentException.class, () -> writeAndRead(schema, data));
     assertTrue(e.getMessage().contains("Precision must be in range of 1 to 38"));
-
   }
 
   @Test
@@ -197,5 +193,4 @@ public void testFailedToCreateDecimalLogicalType() throws Exception {
     Schema schema3 = getSchema("logical/test_decimal_invalid4.avsc");
     assertNull(schema3.getLogicalType());
   }
-
 }
diff --git a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroSkipFieldTest.java b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroSkipFieldTest.java
index a37eca6514e04..3120c26638c6d 100644
--- a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroSkipFieldTest.java
+++ b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroSkipFieldTest.java
@@ -14,25 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
-
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.complex.StructVector;
 import org.apache.arrow.vector.types.Types;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericRecord;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AvroSkipFieldTest extends AvroTestBase {
 
@@ -40,7 +39,10 @@ public class AvroSkipFieldTest extends AvroTestBase {
   public void testSkipUnionWithOneField() throws Exception {
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f0");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     Schema schema = getSchema("skip/test_skip_union_before.avsc");
     Schema expectedSchema = getSchema("skip/test_skip_union_one_field_expected.avsc");
 
@@ -69,7 +71,10 @@ public void testSkipUnionWithOneField() throws Exception {
   public void testSkipUnionWithNullableOneField() throws Exception {
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f1");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     Schema schema = getSchema("skip/test_skip_union_before.avsc");
     Schema expectedSchema = getSchema("skip/test_skip_union_nullable_field_expected.avsc");
 
@@ -98,7 +103,10 @@ public void testSkipUnionWithNullableOneField() throws Exception {
   public void testSkipUnionWithMultiFields() throws Exception {
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f2");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     Schema schema = getSchema("skip/test_skip_union_before.avsc");
     Schema expectedSchema = getSchema("skip/test_skip_union_multi_fields_expected.avsc");
 
@@ -127,7 +135,10 @@ public void testSkipUnionWithMultiFields() throws Exception {
   public void testSkipMapField() throws Exception {
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f1");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     Schema schema = getSchema("skip/test_skip_map_before.avsc");
     Schema expectedSchema = getSchema("skip/test_skip_map_expected.avsc");
 
@@ -159,7 +170,10 @@ public void testSkipMapField() throws Exception {
   public void testSkipArrayField() throws Exception {
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f1");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     Schema schema = getSchema("skip/test_skip_array_before.avsc");
     Schema expectedSchema = getSchema("skip/test_skip_array_expected.avsc");
 
@@ -188,7 +202,10 @@ public void testSkipMultiFields() throws Exception {
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f1");
     skipFieldNames.add("f2");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     Schema schema = getSchema("test_record.avsc");
     Schema expectedSchema = getSchema("skip/test_skip_multi_fields_expected.avsc");
 
@@ -215,7 +232,10 @@ public void testSkipMultiFields() throws Exception {
   public void testSkipStringField() throws Exception {
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f2");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     Schema schema = getSchema("skip/test_skip_base1.avsc");
     Schema expectedSchema = getSchema("skip/test_skip_string_expected.avsc");
 
@@ -223,12 +243,13 @@ public void testSkipStringField() throws Exception {
     ArrayList<GenericRecord> expectedData = new ArrayList<>();
 
     for (int i = 0; i < 5; i++) {
-      final byte[] testBytes = ("test" + i).getBytes();
+      final byte[] testBytes = ("test" + i).getBytes(StandardCharsets.UTF_8);
       GenericRecord record = new GenericData.Record(schema);
       GenericData.Fixed fixed = new GenericData.Fixed(schema.getField("f0").schema());
       fixed.bytes(testBytes);
       record.put(0, fixed);
-      GenericData.EnumSymbol symbol = new GenericData.EnumSymbol(schema.getField("f1").schema(), "TEST" + i % 2);
+      GenericData.EnumSymbol symbol =
+          new GenericData.EnumSymbol(schema.getField("f1").schema(), "TEST" + i % 2);
       record.put(1, symbol);
       record.put(2, "testtest" + i);
       record.put(3, ByteBuffer.wrap(testBytes));
@@ -249,7 +270,10 @@ public void testSkipStringField() throws Exception {
   public void testSkipBytesField() throws Exception {
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f3");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     Schema schema = getSchema("skip/test_skip_base1.avsc");
     Schema expectedSchema = getSchema("skip/test_skip_bytes_expected.avsc");
 
@@ -257,12 +281,13 @@ public void testSkipBytesField() throws Exception {
     ArrayList<GenericRecord> expectedData = new ArrayList<>();
 
     for (int i = 0; i < 5; i++) {
-      final byte[] testBytes = ("test" + i).getBytes();
+      final byte[] testBytes = ("test" + i).getBytes(StandardCharsets.UTF_8);
       GenericRecord record = new GenericData.Record(schema);
       GenericData.Fixed fixed = new GenericData.Fixed(schema.getField("f0").schema());
       fixed.bytes(testBytes);
       record.put(0, fixed);
-      GenericData.EnumSymbol symbol = new GenericData.EnumSymbol(schema.getField("f1").schema(), "TEST" + i % 2);
+      GenericData.EnumSymbol symbol =
+          new GenericData.EnumSymbol(schema.getField("f1").schema(), "TEST" + i % 2);
       record.put(1, symbol);
       record.put(2, "testtest" + i);
       record.put(3, ByteBuffer.wrap(testBytes));
@@ -283,7 +308,10 @@ public void testSkipBytesField() throws Exception {
   public void testSkipFixedField() throws Exception {
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f0");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     Schema schema = getSchema("skip/test_skip_base1.avsc");
     Schema expectedSchema = getSchema("skip/test_skip_fixed_expected.avsc");
 
@@ -291,12 +319,13 @@ public void testSkipFixedField() throws Exception {
     ArrayList<GenericRecord> expectedData = new ArrayList<>();
 
     for (int i = 0; i < 5; i++) {
-      final byte[] testBytes = ("test" + i).getBytes();
+      final byte[] testBytes = ("test" + i).getBytes(StandardCharsets.UTF_8);
       GenericRecord record = new GenericData.Record(schema);
       GenericData.Fixed fixed = new GenericData.Fixed(schema.getField("f0").schema());
       fixed.bytes(testBytes);
       record.put(0, fixed);
-      GenericData.EnumSymbol symbol = new GenericData.EnumSymbol(schema.getField("f1").schema(), "TEST" + i % 2);
+      GenericData.EnumSymbol symbol =
+          new GenericData.EnumSymbol(schema.getField("f1").schema(), "TEST" + i % 2);
       record.put(1, symbol);
       record.put(2, "testtest" + i);
       record.put(3, ByteBuffer.wrap(testBytes));
@@ -317,7 +346,10 @@ public void testSkipFixedField() throws Exception {
   public void testSkipEnumField() throws Exception {
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f1");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     Schema schema = getSchema("skip/test_skip_base1.avsc");
     Schema expectedSchema = getSchema("skip/test_skip_fixed_expected.avsc");
 
@@ -325,12 +357,13 @@ public void testSkipEnumField() throws Exception {
     ArrayList<GenericRecord> expectedData = new ArrayList<>();
 
     for (int i = 0; i < 5; i++) {
-      final byte[] testBytes = ("test" + i).getBytes();
+      final byte[] testBytes = ("test" + i).getBytes(StandardCharsets.UTF_8);
       GenericRecord record = new GenericData.Record(schema);
       GenericData.Fixed fixed = new GenericData.Fixed(schema.getField("f0").schema());
       fixed.bytes(testBytes);
       record.put(0, fixed);
-      GenericData.EnumSymbol symbol = new GenericData.EnumSymbol(schema.getField("f1").schema(), "TEST" + i % 2);
+      GenericData.EnumSymbol symbol =
+          new GenericData.EnumSymbol(schema.getField("f1").schema(), "TEST" + i % 2);
       record.put(1, symbol);
       record.put(2, "testtest" + i);
       record.put(3, ByteBuffer.wrap(testBytes));
@@ -351,7 +384,10 @@ public void testSkipEnumField() throws Exception {
   public void testSkipBooleanField() throws Exception {
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f0");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     Schema schema = getSchema("skip/test_skip_base2.avsc");
     Schema expectedSchema = getSchema("skip/test_skip_boolean_expected.avsc");
 
@@ -384,7 +420,10 @@ public void testSkipBooleanField() throws Exception {
   public void testSkipIntField() throws Exception {
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f1");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     Schema schema = getSchema("skip/test_skip_base2.avsc");
     Schema expectedSchema = getSchema("skip/test_skip_int_expected.avsc");
 
@@ -417,7 +456,10 @@ public void testSkipIntField() throws Exception {
   public void testSkipLongField() throws Exception {
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f2");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     Schema schema = getSchema("skip/test_skip_base2.avsc");
     Schema expectedSchema = getSchema("skip/test_skip_long_expected.avsc");
 
@@ -450,7 +492,10 @@ public void testSkipLongField() throws Exception {
   public void testSkipFloatField() throws Exception {
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f3");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     Schema schema = getSchema("skip/test_skip_base2.avsc");
     Schema expectedSchema = getSchema("skip/test_skip_float_expected.avsc");
 
@@ -483,7 +528,10 @@ public void testSkipFloatField() throws Exception {
   public void testSkipDoubleField() throws Exception {
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f4");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     Schema schema = getSchema("skip/test_skip_base2.avsc");
     Schema expectedSchema = getSchema("skip/test_skip_double_expected.avsc");
 
@@ -516,7 +564,10 @@ public void testSkipDoubleField() throws Exception {
   public void testSkipRecordField() throws Exception {
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f0");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     Schema schema = getSchema("skip/test_skip_record_before.avsc");
     Schema nestedSchema = schema.getFields().get(0).schema();
     ArrayList<GenericRecord> data = new ArrayList<>();
@@ -546,7 +597,10 @@ public void testSkipRecordField() throws Exception {
   public void testSkipNestedFields() throws Exception {
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f0.f0");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     Schema schema = getSchema("test_nested_record.avsc");
     Schema nestedSchema = schema.getFields().get(0).schema();
     ArrayList<GenericRecord> data = new ArrayList<>();
@@ -602,21 +656,26 @@ public void testSkipThirdLevelField() throws Exception {
     assertEquals(Types.MinorType.STRUCT, root1.getFieldVectors().get(0).getMinorType());
     StructVector secondLevelVector = (StructVector) root1.getFieldVectors().get(0);
     assertEquals(1, secondLevelVector.getChildrenFromFields().size());
-    assertEquals(Types.MinorType.STRUCT, secondLevelVector.getChildrenFromFields().get(0).getMinorType());
+    assertEquals(
+        Types.MinorType.STRUCT, secondLevelVector.getChildrenFromFields().get(0).getMinorType());
     StructVector thirdLevelVector = (StructVector) secondLevelVector.getChildrenFromFields().get(0);
     assertEquals(3, thirdLevelVector.getChildrenFromFields().size());
 
     // skip third level field and validate
     Set<String> skipFieldNames = new HashSet<>();
     skipFieldNames.add("f0.f0.f0");
-    config = new AvroToArrowConfigBuilder(config.getAllocator()).setSkipFieldNames(skipFieldNames).build();
+    config =
+        new AvroToArrowConfigBuilder(config.getAllocator())
+            .setSkipFieldNames(skipFieldNames)
+            .build();
     VectorSchemaRoot root2 = writeAndRead(firstLevelSchema, data);
 
     assertEquals(1, root2.getFieldVectors().size());
     assertEquals(Types.MinorType.STRUCT, root2.getFieldVectors().get(0).getMinorType());
     StructVector secondStruct = (StructVector) root2.getFieldVectors().get(0);
     assertEquals(1, secondStruct.getChildrenFromFields().size());
-    assertEquals(Types.MinorType.STRUCT, secondStruct.getChildrenFromFields().get(0).getMinorType());
+    assertEquals(
+        Types.MinorType.STRUCT, secondStruct.getChildrenFromFields().get(0).getMinorType());
     StructVector thirdStruct = (StructVector) secondStruct.getChildrenFromFields().get(0);
     assertEquals(2, thirdStruct.getChildrenFromFields().size());
 
diff --git a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroTestBase.java b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroTestBase.java
index 60a3a285db3aa..44c4186c52d9e 100644
--- a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroTestBase.java
+++ b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroTestBase.java
@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -29,7 +28,6 @@
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.FieldVector;
@@ -45,18 +43,16 @@
 import org.apache.avro.io.DatumWriter;
 import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.io.EncoderFactory;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.io.TempDir;
 
 public class AvroTestBase {
 
-  @ClassRule
-  public static final TemporaryFolder TMP = new TemporaryFolder();
+  @TempDir public File TMP;
 
   protected AvroToArrowConfig config;
 
-  @Before
+  @BeforeEach
   public void init() {
     BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
     config = new AvroToArrowConfigBuilder(allocator).build();
@@ -64,37 +60,42 @@ public void init() {
 
   public static Schema getSchema(String schemaName) throws Exception {
     try {
-      // Attempt to use JDK 9 behavior of getting the module then the resource stream from the module.
+      // Attempt to use JDK 9 behavior of getting the module then the resource stream from the
+      // module.
       // Note that this code is caller-sensitive.
       Method getModuleMethod = Class.class.getMethod("getModule");
       Object module = getModuleMethod.invoke(TestWriteReadAvroRecord.class);
-      Method getResourceAsStreamFromModule = module.getClass().getMethod("getResourceAsStream", String.class);
-      try (InputStream is = (InputStream) getResourceAsStreamFromModule.invoke(module, "/schema/" + schemaName)) {
-        return new Schema.Parser()
-            .parse(is);
+      Method getResourceAsStreamFromModule =
+          module.getClass().getMethod("getResourceAsStream", String.class);
+      try (InputStream is =
+          (InputStream) getResourceAsStreamFromModule.invoke(module, "/schema/" + schemaName)) {
+        return new Schema.Parser().parse(is);
       }
     } catch (NoSuchMethodException ex) {
       // Use JDK8 behavior.
-      try (InputStream is = TestWriteReadAvroRecord.class.getResourceAsStream("/schema/" + schemaName)) {
+      try (InputStream is =
+          TestWriteReadAvroRecord.class.getResourceAsStream("/schema/" + schemaName)) {
         return new Schema.Parser().parse(is);
       }
     }
   }
 
   protected VectorSchemaRoot writeAndRead(Schema schema, List data) throws Exception {
-    File dataFile = TMP.newFile();
+    File dataFile = new File(TMP, "test.avro");
 
-    BinaryEncoder
-        encoder = new EncoderFactory().directBinaryEncoder(new FileOutputStream(dataFile), null);
-    DatumWriter writer = new GenericDatumWriter(schema);
-    BinaryDecoder
-        decoder = new DecoderFactory().directBinaryDecoder(new FileInputStream(dataFile), null);
+    try (FileOutputStream fos = new FileOutputStream(dataFile);
+        FileInputStream fis = new FileInputStream(dataFile)) {
 
-    for (Object value : data) {
-      writer.write(value, encoder);
-    }
+      BinaryEncoder encoder = new EncoderFactory().directBinaryEncoder(fos, null);
+      DatumWriter<Object> writer = new GenericDatumWriter<>(schema);
+      BinaryDecoder decoder = new DecoderFactory().directBinaryDecoder(fis, null);
+
+      for (Object value : data) {
+        writer.write(value, encoder);
+      }
 
-    return AvroToArrow.avroToArrow(schema, decoder, config);
+      return AvroToArrow.avroToArrow(schema, decoder, config);
+    }
   }
 
   protected void checkArrayResult(List<List<?>> expected, ListVector vector) {
@@ -145,7 +146,7 @@ protected void checkPrimitiveResult(List data, FieldVector vector) {
     }
   }
 
-  protected void checkRecordResult(Schema schema, ArrayList<GenericRecord> data, VectorSchemaRoot root) {
+  protected void checkRecordResult(Schema schema, List<GenericRecord> data, VectorSchemaRoot root) {
     assertEquals(data.size(), root.getRowCount());
     assertEquals(schema.getFields().size(), root.getFieldVectors().size());
 
@@ -157,10 +158,10 @@ protected void checkRecordResult(Schema schema, ArrayList<GenericRecord> data, V
 
       checkPrimitiveResult(fieldData, root.getFieldVectors().get(i));
     }
-
   }
 
-  protected void checkNestedRecordResult(Schema schema, List<GenericRecord> data, VectorSchemaRoot root) {
+  protected void checkNestedRecordResult(
+      Schema schema, List<GenericRecord> data, VectorSchemaRoot root) {
     assertEquals(data.size(), root.getRowCount());
     assertTrue(schema.getFields().size() == 1);
 
@@ -176,10 +177,8 @@ protected void checkNestedRecordResult(Schema schema, List<GenericRecord> data,
 
       checkPrimitiveResult(fieldData, structVector.getChildrenFromFields().get(i));
     }
-
   }
 
-
   // belows are for iterator api
 
   protected void checkArrayResult(List<List<?>> expected, List<ListVector> vectors) {
@@ -194,10 +193,12 @@ protected void checkArrayResult(List<List<?>> expected, List<ListVector> vectors
     }
   }
 
-  protected void checkRecordResult(Schema schema, ArrayList<GenericRecord> data, List<VectorSchemaRoot> roots) {
-    roots.forEach(root -> {
-      assertEquals(schema.getFields().size(), root.getFieldVectors().size());
-    });
+  protected void checkRecordResult(
+      Schema schema, List<GenericRecord> data, List<VectorSchemaRoot> roots) {
+    roots.forEach(
+        root -> {
+          assertEquals(schema.getFields().size(), root.getFieldVectors().size());
+        });
 
     for (int i = 0; i < schema.getFields().size(); i++) {
       List fieldData = new ArrayList();
@@ -210,7 +211,6 @@ protected void checkRecordResult(Schema schema, ArrayList<GenericRecord> data, L
 
       checkPrimitiveResult(fieldData, vectors);
     }
-
   }
 
   protected void checkPrimitiveResult(List data, List<FieldVector> vectors) {
diff --git a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroToArrowIteratorTest.java b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroToArrowIteratorTest.java
index 02f7a3733734c..f8022a9385134 100644
--- a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroToArrowIteratorTest.java
+++ b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroToArrowIteratorTest.java
@@ -14,10 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.EOFException;
 import java.io.File;
@@ -28,7 +27,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.util.AutoCloseables;
@@ -46,29 +44,31 @@
 import org.apache.avro.io.DecoderFactory;
 import org.apache.avro.io.EncoderFactory;
 import org.apache.avro.util.Utf8;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class AvroToArrowIteratorTest extends AvroTestBase {
 
-  @Override
+  @BeforeEach
   public void init() {
     final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
     this.config = new AvroToArrowConfigBuilder(allocator).setTargetBatchSize(3).build();
   }
 
-  private AvroToArrowVectorIterator convert(Schema schema, List data) throws Exception {
-    File dataFile = TMP.newFile();
-
-    BinaryEncoder
-        encoder = new EncoderFactory().directBinaryEncoder(new FileOutputStream(dataFile), null);
-    DatumWriter writer = new GenericDatumWriter(schema);
-    BinaryDecoder
-        decoder = new DecoderFactory().directBinaryDecoder(new FileInputStream(dataFile), null);
+  private void writeDataToFile(Schema schema, List<?> data, File dataFile) throws Exception {
+    try (FileOutputStream fos = new FileOutputStream(dataFile)) {
+      BinaryEncoder encoder = EncoderFactory.get().directBinaryEncoder(fos, null);
+      DatumWriter<Object> writer = new GenericDatumWriter<>(schema);
 
-    for (Object value : data) {
-      writer.write(value, encoder);
+      for (Object value : data) {
+        writer.write(value, encoder);
+      }
+      encoder.flush();
     }
+  }
 
+  private AvroToArrowVectorIterator convert(Schema schema, FileInputStream fis) throws Exception {
+    BinaryDecoder decoder = DecoderFactory.get().directBinaryDecoder(fis, null);
     return AvroToArrow.avroToArrowIterator(schema, decoder, config);
   }
 
@@ -77,9 +77,13 @@ public void testStringType() throws Exception {
     Schema schema = getSchema("test_primitive_string.avsc");
     List<String> data = Arrays.asList("v1", "v2", "v3", "v4", "v5");
 
+    File dataFile = new File(TMP, "test.avro");
+    writeDataToFile(schema, data, dataFile);
+
     List<VectorSchemaRoot> roots = new ArrayList<>();
     List<FieldVector> vectors = new ArrayList<>();
-    try (AvroToArrowVectorIterator iterator = convert(schema, data)) {
+    try (FileInputStream fis = new FileInputStream(dataFile);
+        AvroToArrowVectorIterator iterator = convert(schema, fis)) {
       while (iterator.hasNext()) {
         VectorSchemaRoot root = iterator.next();
         FieldVector vector = root.getFieldVectors().get(0);
@@ -105,9 +109,13 @@ public void testNullableStringType() throws Exception {
       data.add(record);
     }
 
+    File dataFile = new File(TMP, "test.avro");
+    writeDataToFile(schema, data, dataFile);
+
     List<VectorSchemaRoot> roots = new ArrayList<>();
     List<FieldVector> vectors = new ArrayList<>();
-    try (AvroToArrowVectorIterator iterator = convert(schema, data);) {
+    try (FileInputStream fis = new FileInputStream(dataFile);
+        AvroToArrowVectorIterator iterator = convert(schema, fis)) {
       while (iterator.hasNext()) {
         VectorSchemaRoot root = iterator.next();
         FieldVector vector = root.getFieldVectors().get(0);
@@ -117,7 +125,6 @@ public void testNullableStringType() throws Exception {
     }
     checkPrimitiveResult(expected, vectors);
     AutoCloseables.close(roots);
-
   }
 
   @Test
@@ -132,30 +139,38 @@ public void testRecordType() throws Exception {
       data.add(record);
     }
 
+    File dataFile = new File(TMP, "test.avro");
+    writeDataToFile(schema, data, dataFile);
+
     List<VectorSchemaRoot> roots = new ArrayList<>();
-    try (AvroToArrowVectorIterator iterator = convert(schema, data)) {
+    try (FileInputStream fis = new FileInputStream(dataFile);
+        AvroToArrowVectorIterator iterator = convert(schema, fis)) {
       while (iterator.hasNext()) {
         roots.add(iterator.next());
       }
     }
     checkRecordResult(schema, data, roots);
     AutoCloseables.close(roots);
-
   }
 
   @Test
   public void testArrayType() throws Exception {
     Schema schema = getSchema("test_array.avsc");
-    List<List<?>> data = Arrays.asList(
-        Arrays.asList("11", "222", "999"),
-        Arrays.asList("12222", "2333", "1000"),
-        Arrays.asList("1rrr", "2ggg"),
-        Arrays.asList("1vvv", "2bbb"),
-        Arrays.asList("1fff", "2"));
+    List<List<?>> data =
+        Arrays.asList(
+            Arrays.asList("11", "222", "999"),
+            Arrays.asList("12222", "2333", "1000"),
+            Arrays.asList("1rrr", "2ggg"),
+            Arrays.asList("1vvv", "2bbb"),
+            Arrays.asList("1fff", "2"));
+
+    File dataFile = new File(TMP, "test.avro");
+    writeDataToFile(schema, data, dataFile);
 
     List<VectorSchemaRoot> roots = new ArrayList<>();
     List<ListVector> vectors = new ArrayList<>();
-    try (AvroToArrowVectorIterator iterator = convert(schema, data)) {
+    try (FileInputStream fis = new FileInputStream(dataFile);
+        AvroToArrowVectorIterator iterator = convert(schema, fis)) {
       while (iterator.hasNext()) {
         VectorSchemaRoot root = iterator.next();
         roots.add(root);
@@ -172,8 +187,9 @@ public void runLargeNumberOfRows() throws Exception {
     int x = 0;
     final int targetRows = 600000;
     Decoder fakeDecoder = new FakeDecoder(targetRows);
-    try (AvroToArrowVectorIterator iter = AvroToArrow.avroToArrowIterator(schema, fakeDecoder,
-            new AvroToArrowConfigBuilder(config.getAllocator()).build())) {
+    try (AvroToArrowVectorIterator iter =
+        AvroToArrow.avroToArrowIterator(
+            schema, fakeDecoder, new AvroToArrowConfigBuilder(config.getAllocator()).build())) {
       while (iter.hasNext()) {
         VectorSchemaRoot root = iter.next();
         x += root.getRowCount();
@@ -181,13 +197,11 @@ public void runLargeNumberOfRows() throws Exception {
       }
     }
 
-    assertEquals(x, targetRows);
+    assertEquals(targetRows, x);
   }
 
-  /**
-   * Fake avro decoder to test large data.
-   */
-  private class FakeDecoder extends Decoder {
+  /** Fake avro decoder to test large data. */
+  private static class FakeDecoder extends Decoder {
 
     private int numRows;
 
@@ -204,8 +218,7 @@ private void validate() throws EOFException {
     }
 
     @Override
-    public void readNull() throws IOException {
-    }
+    public void readNull() throws IOException {}
 
     @Override
     public boolean readBoolean() throws IOException {
@@ -243,9 +256,7 @@ public String readString() throws IOException {
     }
 
     @Override
-    public void skipString() throws IOException {
-
-    }
+    public void skipString() throws IOException {}
 
     @Override
     public ByteBuffer readBytes(ByteBuffer old) throws IOException {
@@ -253,9 +264,7 @@ public ByteBuffer readBytes(ByteBuffer old) throws IOException {
     }
 
     @Override
-    public void skipBytes() throws IOException {
-
-    }
+    public void skipBytes() throws IOException {}
 
     @Override
     public void readFixed(byte[] bytes, int start, int length) throws IOException {
@@ -264,9 +273,7 @@ public void readFixed(byte[] bytes, int start, int length) throws IOException {
     }
 
     @Override
-    public void skipFixed(int length) throws IOException {
-
-    }
+    public void skipFixed(int length) throws IOException {}
 
     @Override
     public int readEnum() throws IOException {
diff --git a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroToArrowTest.java b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroToArrowTest.java
index 1c64204191762..899ea40301322 100644
--- a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroToArrowTest.java
+++ b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/AvroToArrowTest.java
@@ -14,10 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -26,7 +25,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
@@ -36,7 +34,7 @@
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericRecord;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class AvroToArrowTest extends AvroTestBase {
 
@@ -87,10 +85,8 @@ public void testFixedAttributes() throws Exception {
     Schema schema = getSchema("attrs/test_fixed_attr.avsc");
 
     List<GenericData.Fixed> data = new ArrayList<>();
-    List<byte[]> expected = new ArrayList<>();
     for (int i = 0; i < 5; i++) {
       byte[] value = ("value" + i).getBytes(StandardCharsets.UTF_8);
-      expected.add(value);
       GenericData.Fixed fixed = new GenericData.Fixed(schema);
       fixed.bytes(value);
       data.add(fixed);
@@ -107,12 +103,13 @@ public void testFixedAttributes() throws Exception {
   @Test
   public void testEnumAttributes() throws Exception {
     Schema schema = getSchema("attrs/test_enum_attrs.avsc");
-    List<GenericData.EnumSymbol> data = Arrays.asList(
-        new GenericData.EnumSymbol(schema, "SPADES"),
-        new GenericData.EnumSymbol(schema, "HEARTS"),
-        new GenericData.EnumSymbol(schema, "DIAMONDS"),
-        new GenericData.EnumSymbol(schema, "CLUBS"),
-        new GenericData.EnumSymbol(schema, "SPADES"));
+    List<GenericData.EnumSymbol> data =
+        Arrays.asList(
+            new GenericData.EnumSymbol(schema, "SPADES"),
+            new GenericData.EnumSymbol(schema, "HEARTS"),
+            new GenericData.EnumSymbol(schema, "DIAMONDS"),
+            new GenericData.EnumSymbol(schema, "CLUBS"),
+            new GenericData.EnumSymbol(schema, "SPADES"));
 
     VectorSchemaRoot root = writeAndRead(schema, data);
     FieldVector vector = root.getFieldVectors().get(0);
@@ -174,12 +171,13 @@ public void testNestedRecordType() throws Exception {
   @Test
   public void testEnumType() throws Exception {
     Schema schema = getSchema("test_primitive_enum.avsc");
-    List<GenericData.EnumSymbol> data = Arrays.asList(
-        new GenericData.EnumSymbol(schema, "SPADES"),
-        new GenericData.EnumSymbol(schema, "HEARTS"),
-        new GenericData.EnumSymbol(schema, "DIAMONDS"),
-        new GenericData.EnumSymbol(schema, "CLUBS"),
-        new GenericData.EnumSymbol(schema, "SPADES"));
+    List<GenericData.EnumSymbol> data =
+        Arrays.asList(
+            new GenericData.EnumSymbol(schema, "SPADES"),
+            new GenericData.EnumSymbol(schema, "HEARTS"),
+            new GenericData.EnumSymbol(schema, "DIAMONDS"),
+            new GenericData.EnumSymbol(schema, "CLUBS"),
+            new GenericData.EnumSymbol(schema, "SPADES"));
 
     List<Integer> expectedIndices = Arrays.asList(0, 1, 2, 3, 0);
 
@@ -304,12 +302,13 @@ public void testNullableDoubleType() throws Exception {
   @Test
   public void testBytesType() throws Exception {
     Schema schema = getSchema("test_primitive_bytes.avsc");
-    List<ByteBuffer> data = Arrays.asList(
-        ByteBuffer.wrap("value1".getBytes(StandardCharsets.UTF_8)),
-        ByteBuffer.wrap("value2".getBytes(StandardCharsets.UTF_8)),
-        ByteBuffer.wrap("value3".getBytes(StandardCharsets.UTF_8)),
-        ByteBuffer.wrap("value4".getBytes(StandardCharsets.UTF_8)),
-        ByteBuffer.wrap("value5".getBytes(StandardCharsets.UTF_8)));
+    List<ByteBuffer> data =
+        Arrays.asList(
+            ByteBuffer.wrap("value1".getBytes(StandardCharsets.UTF_8)),
+            ByteBuffer.wrap("value2".getBytes(StandardCharsets.UTF_8)),
+            ByteBuffer.wrap("value3".getBytes(StandardCharsets.UTF_8)),
+            ByteBuffer.wrap("value4".getBytes(StandardCharsets.UTF_8)),
+            ByteBuffer.wrap("value5".getBytes(StandardCharsets.UTF_8)));
 
     VectorSchemaRoot root = writeAndRead(schema, data);
     FieldVector vector = root.getFieldVectors().get(0);
@@ -324,7 +323,8 @@ public void testNullableBytesType() throws Exception {
     ArrayList<GenericRecord> data = new ArrayList<>();
     for (int i = 0; i < 5; i++) {
       GenericRecord record = new GenericData.Record(schema);
-      record.put(0, i % 2 == 0 ? ByteBuffer.wrap(("test" + i).getBytes(StandardCharsets.UTF_8)) : null);
+      record.put(
+          0, i % 2 == 0 ? ByteBuffer.wrap(("test" + i).getBytes(StandardCharsets.UTF_8)) : null);
       data.add(record);
     }
 
@@ -361,12 +361,13 @@ public void testNullableBooleanType() throws Exception {
   @Test
   public void testArrayType() throws Exception {
     Schema schema = getSchema("test_array.avsc");
-    List<List<?>> data = Arrays.asList(
-        Arrays.asList("11", "222", "999"),
-        Arrays.asList("12222", "2333", "1000"),
-        Arrays.asList("1rrr", "2ggg"),
-        Arrays.asList("1vvv", "2bbb"),
-        Arrays.asList("1fff", "2"));
+    List<List<?>> data =
+        Arrays.asList(
+            Arrays.asList("11", "222", "999"),
+            Arrays.asList("12222", "2333", "1000"),
+            Arrays.asList("1rrr", "2ggg"),
+            Arrays.asList("1vvv", "2bbb"),
+            Arrays.asList("1fff", "2"));
 
     VectorSchemaRoot root = writeAndRead(schema, data);
     FieldVector vector = root.getFieldVectors().get(0);
@@ -473,5 +474,4 @@ public void testNullableUnionType() throws Exception {
 
     checkPrimitiveResult(expected, vector);
   }
-
 }
diff --git a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/TestWriteReadAvroRecord.java b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/TestWriteReadAvroRecord.java
index afbddaa6ed87a..c318214f5c0a7 100644
--- a/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/TestWriteReadAvroRecord.java
+++ b/java/adapter/avro/src/test/java/org/apache/arrow/adapter/avro/TestWriteReadAvroRecord.java
@@ -14,15 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.avro;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.avro.Schema;
 import org.apache.avro.file.DataFileReader;
 import org.apache.avro.file.DataFileWriter;
@@ -32,23 +30,19 @@
 import org.apache.avro.generic.GenericRecord;
 import org.apache.avro.io.DatumReader;
 import org.apache.avro.io.DatumWriter;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class TestWriteReadAvroRecord {
 
-  @ClassRule
-  public static final TemporaryFolder TMP = new TemporaryFolder();
+  @TempDir public static File TMP;
 
   @Test
   public void testWriteAndRead() throws Exception {
-
-    File dataFile = TMP.newFile();
+    File dataFile = new File(TMP, "test.avro");
     Schema schema = AvroTestBase.getSchema("test.avsc");
 
-    //write data to disk
+    // write data to disk
     GenericRecord user1 = new GenericData.Record(schema);
     user1.put("name", "Alyssa");
     user1.put("favorite_number", 256);
@@ -59,20 +53,22 @@ public void testWriteAndRead() throws Exception {
     user2.put("favorite_color", "red");
 
     DatumWriter<GenericRecord> datumWriter = new GenericDatumWriter<GenericRecord>(schema);
-    DataFileWriter<GenericRecord> dataFileWriter = new DataFileWriter<GenericRecord>(datumWriter);
-    dataFileWriter.create(schema, dataFile);
-    dataFileWriter.append(user1);
-    dataFileWriter.append(user2);
-    dataFileWriter.close();
+    try (DataFileWriter<GenericRecord> dataFileWriter =
+        new DataFileWriter<GenericRecord>(datumWriter)) {
+      dataFileWriter.create(schema, dataFile);
+      dataFileWriter.append(user1);
+      dataFileWriter.append(user2);
+    }
 
-    //read data from disk
+    // read data from disk
     DatumReader<GenericRecord> datumReader = new GenericDatumReader<GenericRecord>(schema);
-    DataFileReader<GenericRecord>
-        dataFileReader = new DataFileReader<GenericRecord>(dataFile, datumReader);
     List<GenericRecord> result = new ArrayList<>();
-    while (dataFileReader.hasNext()) {
-      GenericRecord user = dataFileReader.next();
-      result.add(user);
+    try (DataFileReader<GenericRecord> dataFileReader =
+        new DataFileReader<GenericRecord>(dataFile, datumReader)) {
+      while (dataFileReader.hasNext()) {
+        GenericRecord user = dataFileReader.next();
+        result.add(user);
+      }
     }
 
     assertEquals(2, result.size());
@@ -86,5 +82,4 @@ public void testWriteAndRead() throws Exception {
     assertEquals(7, deUser2.get("favorite_number"));
     assertEquals("red", deUser2.get("favorite_color").toString());
   }
-
 }
diff --git a/java/adapter/jdbc/pom.xml b/java/adapter/jdbc/pom.xml
index b6c450ecd32b2..742dc9a82dc47 100644
--- a/java/adapter/jdbc/pom.xml
+++ b/java/adapter/jdbc/pom.xml
@@ -1,116 +1,116 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.arrow</groupId>
-        <artifactId>arrow-java-root</artifactId>
-        <version>16.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>arrow-jdbc</artifactId>
-    <name>Arrow JDBC Adapter</name>
-    <description>(Contrib/Experimental)A library for converting JDBC data to Arrow data.</description>
-    <url>http://maven.apache.org</url>
-
-    <dependencies>
-
-        <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-core -->
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-memory-core</artifactId>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-netty -->
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-memory-netty</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-vector -->
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-vector</artifactId>
-            <classifier>${arrow.vector.classifier}</classifier>
-        </dependency>
-
-        <dependency>
-            <groupId>org.immutables</groupId>
-            <artifactId>value</artifactId>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/com.h2database/h2 -->
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>2.2.224</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>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.adapter.jdbc=com.fasterxml.jackson.dataformat.yaml --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED -Duser.timezone=UTC</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.arrow</groupId>
+    <artifactId>arrow-java-root</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>arrow-jdbc</artifactId>
+  <name>Arrow JDBC Adapter</name>
+  <description>(Contrib/Experimental)A library for converting JDBC data to Arrow data.</description>
+  <url>http://maven.apache.org</url>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-memory-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-memory-netty</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-vector</artifactId>
+      <classifier>${arrow.vector.classifier}</classifier>
+    </dependency>
+
+    <dependency>
+      <groupId>org.immutables</groupId>
+      <artifactId>value-annotations</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>2.2.224</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-yaml</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <id>jdk11+</id>
+      <activation>
+        <jdk>[11,]</jdk>
+      </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.adapter.jdbc=com.fasterxml.jackson.dataformat.yaml --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED -Duser.timezone=UTC</argLine>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
 </project>
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/ArrowVectorIterator.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/ArrowVectorIterator.java
index 427c766982f30..d30cf32a04996 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/ArrowVectorIterator.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/ArrowVectorIterator.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
 import static org.apache.arrow.adapter.jdbc.JdbcToArrowUtils.isColumnNullable;
@@ -23,7 +22,6 @@
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.util.Iterator;
-
 import org.apache.arrow.adapter.jdbc.consumer.CompositeJdbcConsumer;
 import org.apache.arrow.adapter.jdbc.consumer.JdbcConsumer;
 import org.apache.arrow.adapter.jdbc.consumer.exceptions.JdbcConsumerException;
@@ -35,9 +33,7 @@
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.arrow.vector.util.ValueVectorUtility;
 
-/**
- * VectorSchemaRoot iterator for partially converting JDBC data.
- */
+/** VectorSchemaRoot iterator for partially converting JDBC data. */
 public class ArrowVectorIterator implements Iterator<VectorSchemaRoot>, AutoCloseable {
 
   private final ResultSet resultSet;
@@ -54,13 +50,12 @@ public class ArrowVectorIterator implements Iterator<VectorSchemaRoot>, AutoClos
 
   private final int targetBatchSize;
 
-  // This is used to track whether the ResultSet has been fully read, and is needed specifically for cases where there
+  // This is used to track whether the ResultSet has been fully read, and is needed specifically for
+  // cases where there
   // is a ResultSet having zero rows (empty):
   private boolean readComplete = false;
 
-  /**
-   * Construct an instance.
-   */
+  /** Construct an instance. */
   private ArrowVectorIterator(ResultSet resultSet, JdbcToArrowConfig config) throws SQLException {
     this.resultSet = resultSet;
     this.config = config;
@@ -73,12 +68,8 @@ private ArrowVectorIterator(ResultSet resultSet, JdbcToArrowConfig config) throw
     this.nextBatch = config.isReuseVectorSchemaRoot() ? createVectorSchemaRoot() : null;
   }
 
-  /**
-   * Create a ArrowVectorIterator to partially convert data.
-   */
-  public static ArrowVectorIterator create(
-      ResultSet resultSet,
-      JdbcToArrowConfig config)
+  /** Create a ArrowVectorIterator to partially convert data. */
+  public static ArrowVectorIterator create(ResultSet resultSet, JdbcToArrowConfig config)
       throws SQLException {
     ArrowVectorIterator iterator = null;
     try {
@@ -142,10 +133,18 @@ private VectorSchemaRoot createVectorSchemaRoot() throws SQLException {
 
   private void initialize(VectorSchemaRoot root) throws SQLException {
     for (int i = 1; i <= consumers.length; i++) {
-      final JdbcFieldInfo columnFieldInfo = JdbcToArrowUtils.getJdbcFieldInfoForColumn(rsmd, i, config);
+      final JdbcFieldInfo columnFieldInfo =
+          JdbcToArrowUtils.getJdbcFieldInfoForColumn(rsmd, i, config);
       ArrowType arrowType = config.getJdbcToArrowTypeConverter().apply(columnFieldInfo);
-      consumers[i - 1] = config.getJdbcConsumerGetter().apply(
-          arrowType, i, isColumnNullable(resultSet.getMetaData(), i, columnFieldInfo), root.getVector(i - 1), config);
+      consumers[i - 1] =
+          config
+              .getJdbcConsumerGetter()
+              .apply(
+                  arrowType,
+                  i,
+                  isColumnNullable(resultSet.getMetaData(), i, columnFieldInfo),
+                  root.getVector(i - 1),
+                  config);
     }
   }
 
@@ -170,16 +169,17 @@ public boolean hasNext() {
   }
 
   /**
-   * Gets the next vector.
-   * If {@link JdbcToArrowConfig#isReuseVectorSchemaRoot()} is false,
-   * the client is responsible for freeing its resources.
+   * Gets the next vector. If {@link JdbcToArrowConfig#isReuseVectorSchemaRoot()} is false, the
+   * client is responsible for freeing its resources.
+   *
    * @throws JdbcConsumerException on error from VectorConsumer
    */
   @Override
   public VectorSchemaRoot next() {
     Preconditions.checkArgument(hasNext());
     try {
-      VectorSchemaRoot ret = config.isReuseVectorSchemaRoot() ? nextBatch : createVectorSchemaRoot();
+      VectorSchemaRoot ret =
+          config.isReuseVectorSchemaRoot() ? nextBatch : createVectorSchemaRoot();
       load(ret);
       return ret;
     } catch (Exception e) {
@@ -193,8 +193,9 @@ public VectorSchemaRoot next() {
   }
 
   /**
-   * Clean up resources ONLY WHEN THE {@link VectorSchemaRoot} HOLDING EACH BATCH IS REUSED. If a new VectorSchemaRoot
-   * is created for each batch, each root must be closed manually by the client code.
+   * Clean up resources ONLY WHEN THE {@link VectorSchemaRoot} HOLDING EACH BATCH IS REUSED. If a
+   * new VectorSchemaRoot is created for each batch, each root must be closed manually by the client
+   * code.
    */
   @Override
   public void close() {
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/Constants.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/Constants.java
index f95133fc7e44c..30e734a68d511 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/Constants.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/Constants.java
@@ -14,20 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
-/**
- * String constants used for metadata returned on Vectors.
- */
+/** String constants used for metadata returned on Vectors. */
 public class Constants {
-  private Constants() {
-  }
+  private Constants() {}
 
   public static final String SQL_CATALOG_NAME_KEY = "SQL_CATALOG_NAME";
   public static final String SQL_SCHEMA_NAME_KEY = "SQL_SCHEMA_NAME";
   public static final String SQL_TABLE_NAME_KEY = "SQL_TABLE_NAME";
   public static final String SQL_COLUMN_NAME_KEY = "SQL_COLUMN_NAME";
   public static final String SQL_TYPE_KEY = "SQL_TYPE";
-
 }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcFieldInfo.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcFieldInfo.java
index d16964ea14417..6becac0bbc10c 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcFieldInfo.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcFieldInfo.java
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Types;
-
 import org.apache.arrow.util.Preconditions;
 
 /**
- * This class represents the information about a JDBC ResultSet Field that is
- * needed to construct an {@link org.apache.arrow.vector.types.pojo.ArrowType}.
- * Currently, this is:
+ * This class represents the information about a JDBC ResultSet Field that is needed to construct an
+ * {@link org.apache.arrow.vector.types.pojo.ArrowType}. Currently, this is:
+ *
  * <ul>
- *   <li>The JDBC {@link java.sql.Types} type.</li>
- *   <li>The nullability.</li>
- *   <li>The field's precision (used for {@link java.sql.Types#DECIMAL} and {@link java.sql.Types#NUMERIC} types).</li>
- *   <li>The field's scale (used for {@link java.sql.Types#DECIMAL} and {@link java.sql.Types#NUMERIC} types).</li>
+ *   <li>The JDBC {@link java.sql.Types} type.
+ *   <li>The nullability.
+ *   <li>The field's precision (used for {@link java.sql.Types#DECIMAL} and {@link
+ *       java.sql.Types#NUMERIC} types).
+ *   <li>The field's scale (used for {@link java.sql.Types#DECIMAL} and {@link
+ *       java.sql.Types#NUMERIC} types).
  * </ul>
  */
 public class JdbcFieldInfo {
@@ -45,12 +45,13 @@ public class JdbcFieldInfo {
   private final int displaySize;
 
   /**
-   * Builds a <code>JdbcFieldInfo</code> using only the {@link java.sql.Types} type.  Do not use this constructor
-   * if the field type is {@link java.sql.Types#DECIMAL} or {@link java.sql.Types#NUMERIC}; the precision and
-   * scale will be set to <code>0</code>.
+   * Builds a <code>JdbcFieldInfo</code> using only the {@link java.sql.Types} type. Do not use this
+   * constructor if the field type is {@link java.sql.Types#DECIMAL} or {@link
+   * java.sql.Types#NUMERIC}; the precision and scale will be set to <code>0</code>.
    *
    * @param jdbcType The {@link java.sql.Types} type.
-   * @throws IllegalArgumentException if jdbcType is {@link java.sql.Types#DECIMAL} or {@link java.sql.Types#NUMERIC}.
+   * @throws IllegalArgumentException if jdbcType is {@link java.sql.Types#DECIMAL} or {@link
+   *     java.sql.Types#NUMERIC}.
    */
   public JdbcFieldInfo(int jdbcType) {
     Preconditions.checkArgument(
@@ -67,7 +68,8 @@ public JdbcFieldInfo(int jdbcType) {
 
   /**
    * Builds a <code>JdbcFieldInfo</code> from the {@link java.sql.Types} type, precision, and scale.
-   * Use this constructor for {@link java.sql.Types#DECIMAL} and {@link java.sql.Types#NUMERIC} types.
+   * Use this constructor for {@link java.sql.Types#DECIMAL} and {@link java.sql.Types#NUMERIC}
+   * types.
    *
    * @param jdbcType The {@link java.sql.Types} type.
    * @param precision The field's numeric precision.
@@ -84,11 +86,13 @@ public JdbcFieldInfo(int jdbcType, int precision, int scale) {
   }
 
   /**
-   * Builds a <code>JdbcFieldInfo</code> from the {@link java.sql.Types} type, nullability, precision, and scale.
+   * Builds a <code>JdbcFieldInfo</code> from the {@link java.sql.Types} type, nullability,
+   * precision, and scale.
    *
    * @param jdbcType The {@link java.sql.Types} type.
    * @param nullability The nullability. Must be one of {@link ResultSetMetaData#columnNoNulls},
-   *     {@link ResultSetMetaData#columnNullable}, or {@link ResultSetMetaData#columnNullableUnknown}.
+   *     {@link ResultSetMetaData#columnNullable}, or {@link
+   *     ResultSetMetaData#columnNullableUnknown}.
    * @param precision The field's numeric precision.
    * @param scale The field's numeric scale.
    */
@@ -103,7 +107,8 @@ public JdbcFieldInfo(int jdbcType, int nullability, int precision, int scale) {
   }
 
   /**
-   * Builds a <code>JdbcFieldInfo</code> from the corresponding {@link java.sql.ResultSetMetaData} column.
+   * Builds a <code>JdbcFieldInfo</code> from the corresponding {@link java.sql.ResultSetMetaData}
+   * column.
    *
    * @param rsmd The {@link java.sql.ResultSetMetaData} to get the field information from.
    * @param column The column to get the field information for (on a 1-based index).
@@ -113,10 +118,12 @@ public JdbcFieldInfo(int jdbcType, int nullability, int precision, int scale) {
    */
   public JdbcFieldInfo(ResultSetMetaData rsmd, int column) throws SQLException {
     Preconditions.checkNotNull(rsmd, "ResultSetMetaData cannot be null.");
-    Preconditions.checkArgument(column > 0, "ResultSetMetaData columns have indices starting at 1.");
+    Preconditions.checkArgument(
+        column > 0, "ResultSetMetaData columns have indices starting at 1.");
     Preconditions.checkArgument(
         column <= rsmd.getColumnCount(),
-        "The index must be within the number of columns (1 to %s, inclusive)", rsmd.getColumnCount());
+        "The index must be within the number of columns (1 to %s, inclusive)",
+        rsmd.getColumnCount());
 
     this.column = column;
     this.jdbcType = rsmd.getColumnType(column);
@@ -128,8 +135,8 @@ public JdbcFieldInfo(ResultSetMetaData rsmd, int column) throws SQLException {
   }
 
   /**
-   * Builds a <code>JdbcFieldInfo</code> from the corresponding row from a {@link java.sql.DatabaseMetaData#getColumns}
-   * ResultSet.
+   * Builds a <code>JdbcFieldInfo</code> from the corresponding row from a {@link
+   * java.sql.DatabaseMetaData#getColumns} ResultSet.
    *
    * @param rs The {@link java.sql.ResultSet} to get the field information from.
    * @throws SQLException If the column information cannot be retrieved.
@@ -144,51 +151,42 @@ public JdbcFieldInfo(ResultSet rs) throws SQLException {
     this.displaySize = rs.getInt("CHAR_OCTET_LENGTH");
   }
 
-  /**
-   * The {@link java.sql.Types} type.
-   */
+  /** The {@link java.sql.Types} type. */
   public int getJdbcType() {
     return jdbcType;
   }
 
-  /**
-   * The nullability.
-   */
+  /** The nullability. */
   public int isNullable() {
     return nullability;
   }
 
   /**
-   * The numeric precision, for {@link java.sql.Types#NUMERIC}  and {@link java.sql.Types#DECIMAL} types.
+   * The numeric precision, for {@link java.sql.Types#NUMERIC} and {@link java.sql.Types#DECIMAL}
+   * types.
    */
   public int getPrecision() {
     return precision;
   }
 
   /**
-   * The numeric scale, for {@link java.sql.Types#NUMERIC}  and {@link java.sql.Types#DECIMAL} types.
+   * The numeric scale, for {@link java.sql.Types#NUMERIC} and {@link java.sql.Types#DECIMAL} types.
    */
   public int getScale() {
     return scale;
   }
 
-  /**
-   * The column index for query column.
-   */
+  /** The column index for query column. */
   public int getColumn() {
     return column;
   }
 
-  /**
-   * The type name as reported by the database.
-   */
+  /** The type name as reported by the database. */
   public String getTypeName() {
     return typeName;
   }
 
-  /**
-   * The max number of characters for the column.
-   */
+  /** The max number of characters for the column. */
   public int getDisplaySize() {
     return displaySize;
   }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcParameterBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcParameterBinder.java
index 2dfc0658cb8d1..fd4721bcd9c4e 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcParameterBinder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcParameterBinder.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.arrow.adapter.jdbc.binder.ColumnBinder;
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.VectorSchemaRoot;
@@ -29,8 +27,8 @@
 /**
  * A binder binds JDBC prepared statement parameters to rows of Arrow data from a VectorSchemaRoot.
  *
- * Each row of the VectorSchemaRoot will be bound to the configured parameters of the PreparedStatement.
- * One row of data is bound at a time.
+ * <p>Each row of the VectorSchemaRoot will be bound to the configured parameters of the
+ * PreparedStatement. One row of data is bound at a time.
  */
 public class JdbcParameterBinder {
   private final PreparedStatement statement;
@@ -44,8 +42,10 @@ public class JdbcParameterBinder {
    *
    * @param statement The statement to bind parameters to.
    * @param root The VectorSchemaRoot to pull data from.
-   * @param binders Column binders to translate from Arrow data to JDBC parameters, one per parameter.
-   * @param parameterIndices For each binder in <tt>binders</tt>, the index of the parameter to bind to.
+   * @param binders Column binders to translate from Arrow data to JDBC parameters, one per
+   *     parameter.
+   * @param parameterIndices For each binder in <tt>binders</tt>, the index of the parameter to bind
+   *     to.
    */
   private JdbcParameterBinder(
       final PreparedStatement statement,
@@ -55,7 +55,8 @@ private JdbcParameterBinder(
     Preconditions.checkArgument(
         binders.length == parameterIndices.length,
         "Number of column binders (%s) must equal number of parameter indices (%s)",
-        binders.length, parameterIndices.length);
+        binders.length,
+        parameterIndices.length);
     this.statement = statement;
     this.root = root;
     this.binders = binders;
@@ -66,9 +67,10 @@ private JdbcParameterBinder(
   /**
    * Initialize a binder with a builder.
    *
-   * @param statement The statement to bind to. The binder does not maintain ownership of the statement.
-   * @param root The {@link VectorSchemaRoot} to pull data from. The binder does not maintain ownership
-   *             of the vector schema root.
+   * @param statement The statement to bind to. The binder does not maintain ownership of the
+   *     statement.
+   * @param root The {@link VectorSchemaRoot} to pull data from. The binder does not maintain
+   *     ownership of the vector schema root.
    */
   public static Builder builder(final PreparedStatement statement, final VectorSchemaRoot root) {
     return new Builder(statement, root);
@@ -82,8 +84,8 @@ public void reset() {
   /**
    * Bind the next row of data to the parameters of the statement.
    *
-   * After this, the application should call the desired method on the prepared statement,
-   * such as {@link PreparedStatement#executeUpdate()}, or {@link PreparedStatement#addBatch()}.
+   * <p>After this, the application should call the desired method on the prepared statement, such
+   * as {@link PreparedStatement#executeUpdate()}, or {@link PreparedStatement#addBatch()}.
    *
    * @return true if a row was bound, false if rows were exhausted
    */
@@ -99,9 +101,7 @@ public boolean next() throws SQLException {
     return true;
   }
 
-  /**
-   * A builder for a {@link JdbcParameterBinder}.
-   */
+  /** A builder for a {@link JdbcParameterBinder}. */
   public static class Builder {
     private final PreparedStatement statement;
     private final VectorSchemaRoot root;
@@ -123,9 +123,7 @@ public Builder bindAll() {
 
     /** Bind the given parameter to the given column using the default binder. */
     public Builder bind(int parameterIndex, int columnIndex) {
-      return bind(
-          parameterIndex,
-          ColumnBinder.forVector(root.getVector(columnIndex)));
+      return bind(parameterIndex, ColumnBinder.forVector(root.getVector(columnIndex)));
     }
 
     /** Bind the given parameter using the given binder. */
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrow.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrow.java
index 246451b5b22f9..493e53056f945 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrow.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrow.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
 import java.io.IOException;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.Preconditions;
 
@@ -29,44 +27,32 @@
  *
  * <p>This utility uses following data mapping to map JDBC/SQL datatype to Arrow data types.
  *
- * <p>CHAR --> ArrowType.Utf8
- * NCHAR --> ArrowType.Utf8
- * VARCHAR --> ArrowType.Utf8
- * NVARCHAR --> ArrowType.Utf8
- * LONGVARCHAR --> ArrowType.Utf8
- * LONGNVARCHAR --> ArrowType.Utf8
- * NUMERIC --> ArrowType.Decimal(precision, scale)
- * DECIMAL --> ArrowType.Decimal(precision, scale)
- * BIT --> ArrowType.Bool
- * TINYINT --> ArrowType.Int(8, signed)
- * SMALLINT --> ArrowType.Int(16, signed)
- * INTEGER --> ArrowType.Int(32, signed)
- * BIGINT --> ArrowType.Int(64, signed)
- * REAL --> ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)
- * FLOAT --> ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)
- * DOUBLE --> ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)
- * BINARY --> ArrowType.Binary
- * VARBINARY --> ArrowType.Binary
- * LONGVARBINARY --> ArrowType.Binary
- * DATE --> ArrowType.Date(DateUnit.MILLISECOND)
- * TIME --> ArrowType.Time(TimeUnit.MILLISECOND, 32)
- * TIMESTAMP --> ArrowType.Timestamp(TimeUnit.MILLISECOND, timezone=null)
- * CLOB --> ArrowType.Utf8
- * BLOB --> ArrowType.Binary
+ * <p>CHAR --> ArrowType.Utf8 NCHAR --> ArrowType.Utf8 VARCHAR --> ArrowType.Utf8 NVARCHAR -->
+ * ArrowType.Utf8 LONGVARCHAR --> ArrowType.Utf8 LONGNVARCHAR --> ArrowType.Utf8 NUMERIC -->
+ * ArrowType.Decimal(precision, scale) DECIMAL --> ArrowType.Decimal(precision, scale) BIT -->
+ * ArrowType.Bool TINYINT --> ArrowType.Int(8, signed) SMALLINT --> ArrowType.Int(16, signed)
+ * INTEGER --> ArrowType.Int(32, signed) BIGINT --> ArrowType.Int(64, signed) REAL -->
+ * ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE) FLOAT -->
+ * ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE) DOUBLE -->
+ * ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE) BINARY --> ArrowType.Binary VARBINARY -->
+ * ArrowType.Binary LONGVARBINARY --> ArrowType.Binary DATE --> ArrowType.Date(DateUnit.MILLISECOND)
+ * TIME --> ArrowType.Time(TimeUnit.MILLISECOND, 32) TIMESTAMP -->
+ * ArrowType.Timestamp(TimeUnit.MILLISECOND, timezone=null) CLOB --> ArrowType.Utf8 BLOB -->
+ * ArrowType.Binary
  *
  * @since 0.10.0
  */
 public class JdbcToArrow {
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          Partial Convert API                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          Partial Convert API                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow objects.
-   * Note here uses the default targetBatchSize = 1024.
+   * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow
+   * objects. Note here uses the default targetBatchSize = 1024.
    *
    * @param resultSet ResultSet to use to fetch the data from underlying database
    * @param allocator Memory allocator
@@ -74,28 +60,25 @@ public class JdbcToArrow {
    * @throws SQLException on error
    */
   public static ArrowVectorIterator sqlToArrowVectorIterator(
-      ResultSet resultSet,
-      BufferAllocator allocator)
-      throws SQLException, IOException {
+      ResultSet resultSet, BufferAllocator allocator) throws SQLException, IOException {
     Preconditions.checkNotNull(allocator, "Memory Allocator object cannot be null");
 
-    JdbcToArrowConfig config =
-        new JdbcToArrowConfig(allocator, JdbcToArrowUtils.getUtcCalendar());
+    JdbcToArrowConfig config = new JdbcToArrowConfig(allocator, JdbcToArrowUtils.getUtcCalendar());
     return sqlToArrowVectorIterator(resultSet, config);
   }
 
   /**
-   * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow objects.
-   * Note if not specify {@link JdbcToArrowConfig#targetBatchSize}, will use default value 1024.
+   * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow
+   * objects. Note if not specify {@link JdbcToArrowConfig#targetBatchSize}, will use default value
+   * 1024.
+   *
    * @param resultSet ResultSet to use to fetch the data from underlying database
-   * @param config    Configuration of the conversion from JDBC to Arrow.
+   * @param config Configuration of the conversion from JDBC to Arrow.
    * @return Arrow Data Objects {@link ArrowVectorIterator}
    * @throws SQLException on error
    */
   public static ArrowVectorIterator sqlToArrowVectorIterator(
-      ResultSet resultSet,
-      JdbcToArrowConfig config)
-      throws SQLException, IOException {
+      ResultSet resultSet, JdbcToArrowConfig config) throws SQLException, IOException {
     Preconditions.checkNotNull(resultSet, "JDBC ResultSet object cannot be null");
     Preconditions.checkNotNull(config, "The configuration cannot be null");
     return ArrowVectorIterator.create(resultSet, config);
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfig.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfig.java
index 68851f4a98bc9..1bfcfc8fe00aa 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfig.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfig.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
 import java.math.RoundingMode;
 import java.util.Calendar;
 import java.util.Map;
 import java.util.function.Function;
-
 import org.apache.arrow.adapter.jdbc.consumer.JdbcConsumer;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.Preconditions;
@@ -30,25 +28,23 @@
 
 /**
  * This class configures the JDBC-to-Arrow conversion process.
- * <p>
- * The allocator is used to construct the {@link org.apache.arrow.vector.VectorSchemaRoot},
- * and the calendar is used to define the time zone of any
- * {@link org.apache.arrow.vector.types.pojo.ArrowType.Timestamp}
- * fields that are created during the conversion.  Neither field may be <code>null</code>.
- * </p>
- * <p>
- * If the <code>includeMetadata</code> flag is set, the Arrow field metadata will contain information
- * from the corresponding {@link java.sql.ResultSetMetaData} that was used to create the
- * {@link org.apache.arrow.vector.types.pojo.FieldType} of the corresponding
- * {@link org.apache.arrow.vector.FieldVector}.
- * </p>
- * <p>
- * If there are any {@link java.sql.Types#ARRAY} fields in the {@link java.sql.ResultSet}, the corresponding
- * {@link JdbcFieldInfo} for the array's contents must be defined here.  Unfortunately, the sub-type
- * information cannot be retrieved from all JDBC implementations (H2 for example, returns
- * {@link java.sql.Types#NULL} for the array sub-type), so it must be configured here.  The column index
- * or name can be used to map to a {@link JdbcFieldInfo}, and that will be used for the conversion.
- * </p>
+ *
+ * <p>The allocator is used to construct the {@link org.apache.arrow.vector.VectorSchemaRoot}, and
+ * the calendar is used to define the time zone of any {@link
+ * org.apache.arrow.vector.types.pojo.ArrowType.Timestamp} fields that are created during the
+ * conversion. Neither field may be <code>null</code>.
+ *
+ * <p>If the <code>includeMetadata</code> flag is set, the Arrow field metadata will contain
+ * information from the corresponding {@link java.sql.ResultSetMetaData} that was used to create the
+ * {@link org.apache.arrow.vector.types.pojo.FieldType} of the corresponding {@link
+ * org.apache.arrow.vector.FieldVector}.
+ *
+ * <p>If there are any {@link java.sql.Types#ARRAY} fields in the {@link java.sql.ResultSet}, the
+ * corresponding {@link JdbcFieldInfo} for the array's contents must be defined here. Unfortunately,
+ * the sub-type information cannot be retrieved from all JDBC implementations (H2 for example,
+ * returns {@link java.sql.Types#NULL} for the array sub-type), so it must be configured here. The
+ * column index or name can be used to map to a {@link JdbcFieldInfo}, and that will be used for the
+ * conversion.
  */
 public final class JdbcToArrowConfig {
 
@@ -66,14 +62,12 @@ public final class JdbcToArrowConfig {
   private final Map<Integer, Map<String, String>> columnMetadataByColumnIndex;
   private final RoundingMode bigDecimalRoundingMode;
   /**
-   * The maximum rowCount to read each time when partially convert data.
-   * Default value is 1024 and -1 means disable partial read.
-   * default is -1 which means disable partial read.
-   * Note that this flag only useful for {@link JdbcToArrow#sqlToArrowVectorIterator}
-   * 1) if targetBatchSize != -1, it will convert full data into multiple vectors
-   * with valueCount no more than targetBatchSize.
-   * 2) if targetBatchSize == -1, it will convert full data into a single vector in {@link ArrowVectorIterator}
-   * </p>
+   * The maximum rowCount to read each time when partially convert data. Default value is 1024 and
+   * -1 means disable partial read. default is -1 which means disable partial read. Note that this
+   * flag only useful for {@link JdbcToArrow#sqlToArrowVectorIterator} 1) if targetBatchSize != -1,
+   * it will convert full data into multiple vectors with valueCount no more than targetBatchSize.
+   * 2) if targetBatchSize == -1, it will convert full data into a single vector in {@link
+   * ArrowVectorIterator}
    */
   private final int targetBatchSize;
 
@@ -81,81 +75,100 @@ public final class JdbcToArrowConfig {
   private final JdbcConsumerFactory jdbcConsumerGetter;
 
   /**
-   * Constructs a new configuration from the provided allocator and calendar.  The <code>allocator</code>
-   * is used when constructing the Arrow vectors from the ResultSet, and the calendar is used to define
-   * Arrow Timestamp fields, and to read time-based fields from the JDBC <code>ResultSet</code>.
+   * Constructs a new configuration from the provided allocator and calendar. The <code>allocator
+   * </code> is used when constructing the Arrow vectors from the ResultSet, and the calendar is
+   * used to define Arrow Timestamp fields, and to read time-based fields from the JDBC <code>
+   * ResultSet</code>.
    *
-   * @param allocator       The memory allocator to construct the Arrow vectors with.
-   * @param calendar        The calendar to use when constructing Timestamp fields and reading time-based results.
+   * @param allocator The memory allocator to construct the Arrow vectors with.
+   * @param calendar The calendar to use when constructing Timestamp fields and reading time-based
+   *     results.
    */
   JdbcToArrowConfig(BufferAllocator allocator, Calendar calendar) {
-    this(allocator, calendar,
+    this(
+        allocator,
+        calendar,
         /* include metadata */ false,
         /* reuse vector schema root */ false,
         /* array sub-types by column index */ null,
         /* array sub-types by column name */ null,
-        DEFAULT_TARGET_BATCH_SIZE, null, null);
+        DEFAULT_TARGET_BATCH_SIZE,
+        null,
+        null);
   }
 
   JdbcToArrowConfig(
-          BufferAllocator allocator,
-          Calendar calendar,
-          boolean includeMetadata,
-          boolean reuseVectorSchemaRoot,
-          Map<Integer, JdbcFieldInfo> arraySubTypesByColumnIndex,
-          Map<String, JdbcFieldInfo> arraySubTypesByColumnName,
-          int targetBatchSize,
-          Function<JdbcFieldInfo, ArrowType> jdbcToArrowTypeConverter) {
-    this(allocator, calendar, includeMetadata, reuseVectorSchemaRoot, arraySubTypesByColumnIndex,
-        arraySubTypesByColumnName, targetBatchSize, jdbcToArrowTypeConverter, null);
+      BufferAllocator allocator,
+      Calendar calendar,
+      boolean includeMetadata,
+      boolean reuseVectorSchemaRoot,
+      Map<Integer, JdbcFieldInfo> arraySubTypesByColumnIndex,
+      Map<String, JdbcFieldInfo> arraySubTypesByColumnName,
+      int targetBatchSize,
+      Function<JdbcFieldInfo, ArrowType> jdbcToArrowTypeConverter) {
+    this(
+        allocator,
+        calendar,
+        includeMetadata,
+        reuseVectorSchemaRoot,
+        arraySubTypesByColumnIndex,
+        arraySubTypesByColumnName,
+        targetBatchSize,
+        jdbcToArrowTypeConverter,
+        null);
   }
 
   /**
-   * Constructs a new configuration from the provided allocator and calendar.  The <code>allocator</code>
-   * is used when constructing the Arrow vectors from the ResultSet, and the calendar is used to define
-   * Arrow Timestamp fields, and to read time-based fields from the JDBC <code>ResultSet</code>.
+   * Constructs a new configuration from the provided allocator and calendar. The <code>allocator
+   * </code> is used when constructing the Arrow vectors from the ResultSet, and the calendar is
+   * used to define Arrow Timestamp fields, and to read time-based fields from the JDBC <code>
+   * ResultSet</code>.
    *
-   * @param allocator       The memory allocator to construct the Arrow vectors with.
-   * @param calendar        The calendar to use when constructing Timestamp fields and reading time-based results.
-   * @param includeMetadata Whether to include JDBC field metadata in the Arrow Schema Field metadata.
+   * @param allocator The memory allocator to construct the Arrow vectors with.
+   * @param calendar The calendar to use when constructing Timestamp fields and reading time-based
+   *     results.
+   * @param includeMetadata Whether to include JDBC field metadata in the Arrow Schema Field
+   *     metadata.
    * @param reuseVectorSchemaRoot Whether to reuse the vector schema root for each data load.
    * @param arraySubTypesByColumnIndex The type of the JDBC array at the column index (1-based).
-   * @param arraySubTypesByColumnName  The type of the JDBC array at the column name.
-   * @param targetBatchSize The target batch size to be used in preallocation of the resulting vectors.
-   * @param jdbcToArrowTypeConverter The function that maps JDBC field type information to arrow type. If set to null,
-   *                                 the default mapping will be used, which is defined as:
-   *  <ul>
-   *    <li>CHAR --> ArrowType.Utf8</li>
-   *    <li>NCHAR --> ArrowType.Utf8</li>
-   *    <li>VARCHAR --> ArrowType.Utf8</li>
-   *    <li>NVARCHAR --> ArrowType.Utf8</li>
-   *    <li>LONGVARCHAR --> ArrowType.Utf8</li>
-   *    <li>LONGNVARCHAR --> ArrowType.Utf8</li>
-   *    <li>NUMERIC --> ArrowType.Decimal(precision, scale)</li>
-   *    <li>DECIMAL --> ArrowType.Decimal(precision, scale)</li>
-   *    <li>BIT --> ArrowType.Bool</li>
-   *    <li>TINYINT --> ArrowType.Int(8, signed)</li>
-   *    <li>SMALLINT --> ArrowType.Int(16, signed)</li>
-   *    <li>INTEGER --> ArrowType.Int(32, signed)</li>
-   *    <li>BIGINT --> ArrowType.Int(64, signed)</li>
-   *    <li>REAL --> ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)</li>
-   *    <li>FLOAT --> ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)</li>
-   *    <li>DOUBLE --> ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)</li>
-   *    <li>BINARY --> ArrowType.Binary</li>
-   *    <li>VARBINARY --> ArrowType.Binary</li>
-   *    <li>LONGVARBINARY --> ArrowType.Binary</li>
-   *    <li>DATE --> ArrowType.Date(DateUnit.DAY)</li>
-   *    <li>TIME --> ArrowType.Time(TimeUnit.MILLISECOND, 32)</li>
-   *    <li>TIMESTAMP --> ArrowType.Timestamp(TimeUnit.MILLISECOND, calendar timezone)</li>
-   *    <li>CLOB --> ArrowType.Utf8</li>
-   *    <li>BLOB --> ArrowType.Binary</li>
-   *    <li>ARRAY --> ArrowType.List</li>
-   *    <li>STRUCT --> ArrowType.Struct</li>
-   *    <li>NULL --> ArrowType.Null</li>
-   *  </ul>
-   * @param bigDecimalRoundingMode The java.math.RoundingMode to be used in coercion of a BigDecimal from a
-   *                               ResultSet having a scale which does not match that of the target vector. Use null
-   *                               (default value) to require strict scale matching.
+   * @param arraySubTypesByColumnName The type of the JDBC array at the column name.
+   * @param targetBatchSize The target batch size to be used in preallocation of the resulting
+   *     vectors.
+   * @param jdbcToArrowTypeConverter The function that maps JDBC field type information to arrow
+   *     type. If set to null, the default mapping will be used, which is defined as:
+   *     <ul>
+   *       <li>CHAR --> ArrowType.Utf8
+   *       <li>NCHAR --> ArrowType.Utf8
+   *       <li>VARCHAR --> ArrowType.Utf8
+   *       <li>NVARCHAR --> ArrowType.Utf8
+   *       <li>LONGVARCHAR --> ArrowType.Utf8
+   *       <li>LONGNVARCHAR --> ArrowType.Utf8
+   *       <li>NUMERIC --> ArrowType.Decimal(precision, scale)
+   *       <li>DECIMAL --> ArrowType.Decimal(precision, scale)
+   *       <li>BIT --> ArrowType.Bool
+   *       <li>TINYINT --> ArrowType.Int(8, signed)
+   *       <li>SMALLINT --> ArrowType.Int(16, signed)
+   *       <li>INTEGER --> ArrowType.Int(32, signed)
+   *       <li>BIGINT --> ArrowType.Int(64, signed)
+   *       <li>REAL --> ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)
+   *       <li>FLOAT --> ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)
+   *       <li>DOUBLE --> ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)
+   *       <li>BINARY --> ArrowType.Binary
+   *       <li>VARBINARY --> ArrowType.Binary
+   *       <li>LONGVARBINARY --> ArrowType.Binary
+   *       <li>DATE --> ArrowType.Date(DateUnit.DAY)
+   *       <li>TIME --> ArrowType.Time(TimeUnit.MILLISECOND, 32)
+   *       <li>TIMESTAMP --> ArrowType.Timestamp(TimeUnit.MILLISECOND, calendar timezone)
+   *       <li>CLOB --> ArrowType.Utf8
+   *       <li>BLOB --> ArrowType.Binary
+   *       <li>ARRAY --> ArrowType.List
+   *       <li>STRUCT --> ArrowType.Struct
+   *       <li>NULL --> ArrowType.Null
+   *     </ul>
+   *
+   * @param bigDecimalRoundingMode The java.math.RoundingMode to be used in coercion of a BigDecimal
+   *     from a ResultSet having a scale which does not match that of the target vector. Use null
+   *     (default value) to require strict scale matching.
    */
   JdbcToArrowConfig(
       BufferAllocator allocator,
@@ -245,16 +258,19 @@ public final class JdbcToArrowConfig {
     this.bigDecimalRoundingMode = bigDecimalRoundingMode;
 
     // set up type converter
-    this.jdbcToArrowTypeConverter = jdbcToArrowTypeConverter != null ? jdbcToArrowTypeConverter :
-        (jdbcFieldInfo) -> JdbcToArrowUtils.getArrowTypeFromJdbcType(jdbcFieldInfo, calendar);
+    this.jdbcToArrowTypeConverter =
+        jdbcToArrowTypeConverter != null
+            ? jdbcToArrowTypeConverter
+            : (jdbcFieldInfo) -> JdbcToArrowUtils.getArrowTypeFromJdbcType(jdbcFieldInfo, calendar);
 
-    this.jdbcConsumerGetter = jdbcConsumerGetter != null ? jdbcConsumerGetter : JdbcToArrowUtils::getConsumer;
+    this.jdbcConsumerGetter =
+        jdbcConsumerGetter != null ? jdbcConsumerGetter : JdbcToArrowUtils::getConsumer;
   }
 
   /**
-   * The calendar to use when defining Arrow Timestamp fields
-   * and retrieving {@link java.sql.Date}, {@link java.sql.Time}, or {@link java.sql.Timestamp}
-   * data types from the {@link java.sql.ResultSet}, or <code>null</code> if not converting.
+   * The calendar to use when defining Arrow Timestamp fields and retrieving {@link java.sql.Date},
+   * {@link java.sql.Time}, or {@link java.sql.Timestamp} data types from the {@link
+   * java.sql.ResultSet}, or <code>null</code> if not converting.
    *
    * @return the calendar.
    */
@@ -280,30 +296,22 @@ public boolean shouldIncludeMetadata() {
     return includeMetadata;
   }
 
-  /**
-   * Get the target batch size for partial read.
-   */
+  /** Get the target batch size for partial read. */
   public int getTargetBatchSize() {
     return targetBatchSize;
   }
 
-  /**
-   * Get whether it is allowed to reuse the vector schema root.
-   */
+  /** Get whether it is allowed to reuse the vector schema root. */
   public boolean isReuseVectorSchemaRoot() {
     return reuseVectorSchemaRoot;
   }
 
-  /**
-   * Gets the mapping between JDBC type information to Arrow type.
-   */
+  /** Gets the mapping between JDBC type information to Arrow type. */
   public Function<JdbcFieldInfo, ArrowType> getJdbcToArrowTypeConverter() {
     return jdbcToArrowTypeConverter;
   }
 
-  /**
-   * Gets the JDBC consumer getter.
-   */
+  /** Gets the JDBC consumer getter. */
   public JdbcConsumerFactory getJdbcConsumerGetter() {
     return jdbcConsumerGetter;
   }
@@ -311,8 +319,10 @@ public JdbcConsumerFactory getJdbcConsumerGetter() {
   /**
    * Returns the array sub-type {@link JdbcFieldInfo} defined for the provided column index.
    *
-   * @param index The {@link java.sql.ResultSetMetaData} column index of an {@link java.sql.Types#ARRAY} type.
-   * @return The {@link JdbcFieldInfo} for that array's sub-type, or <code>null</code> if not defined.
+   * @param index The {@link java.sql.ResultSetMetaData} column index of an {@link
+   *     java.sql.Types#ARRAY} type.
+   * @return The {@link JdbcFieldInfo} for that array's sub-type, or <code>null</code> if not
+   *     defined.
    */
   public JdbcFieldInfo getArraySubTypeByColumnIndex(int index) {
     if (arraySubTypesByColumnIndex == null) {
@@ -325,8 +335,10 @@ public JdbcFieldInfo getArraySubTypeByColumnIndex(int index) {
   /**
    * Returns the array sub-type {@link JdbcFieldInfo} defined for the provided column name.
    *
-   * @param name The {@link java.sql.ResultSetMetaData} column name of an {@link java.sql.Types#ARRAY} type.
-   * @return The {@link JdbcFieldInfo} for that array's sub-type, or <code>null</code> if not defined.
+   * @param name The {@link java.sql.ResultSetMetaData} column name of an {@link
+   *     java.sql.Types#ARRAY} type.
+   * @return The {@link JdbcFieldInfo} for that array's sub-type, or <code>null</code> if not
+   *     defined.
    */
   public JdbcFieldInfo getArraySubTypeByColumnName(String name) {
     if (arraySubTypesByColumnName == null) {
@@ -339,7 +351,8 @@ public JdbcFieldInfo getArraySubTypeByColumnName(String name) {
   /**
    * Returns the type {@link JdbcFieldInfo} explicitly defined for the provided column index.
    *
-   * @param index The {@link java.sql.ResultSetMetaData} column index to evaluate for explicit type mapping.
+   * @param index The {@link java.sql.ResultSetMetaData} column index to evaluate for explicit type
+   *     mapping.
    * @return The {@link JdbcFieldInfo} defined for the column, or <code>null</code> if not defined.
    */
   public JdbcFieldInfo getExplicitTypeByColumnIndex(int index) {
@@ -353,7 +366,8 @@ public JdbcFieldInfo getExplicitTypeByColumnIndex(int index) {
   /**
    * Returns the type {@link JdbcFieldInfo} explicitly defined for the provided column name.
    *
-   * @param name The {@link java.sql.ResultSetMetaData} column name to evaluate for explicit type mapping.
+   * @param name The {@link java.sql.ResultSetMetaData} column name to evaluate for explicit type
+   *     mapping.
    * @return The {@link JdbcFieldInfo} defined for the column, or <code>null</code> if not defined.
    */
   public JdbcFieldInfo getExplicitTypeByColumnName(String name) {
@@ -364,17 +378,12 @@ public JdbcFieldInfo getExplicitTypeByColumnName(String name) {
     }
   }
 
-  /**
-   * Return schema level metadata or null if not provided.
-   */
+  /** Return schema level metadata or null if not provided. */
   public Map<String, String> getSchemaMetadata() {
     return schemaMetadata;
   }
 
-  /**
-   * Return metadata from columnIndex->meta map on per field basis
-   * or null if not provided.
-   */
+  /** Return metadata from columnIndex->meta map on per field basis or null if not provided. */
   public Map<Integer, Map<String, String>> getColumnMetadataByColumnIndex() {
     return columnMetadataByColumnIndex;
   }
@@ -383,12 +392,14 @@ public RoundingMode getBigDecimalRoundingMode() {
     return bigDecimalRoundingMode;
   }
 
-  /**
-   * Interface for a function that gets a JDBC consumer for the given values.
-   */
+  /** Interface for a function that gets a JDBC consumer for the given values. */
   @FunctionalInterface
   public interface JdbcConsumerFactory {
-    JdbcConsumer apply(ArrowType arrowType, int columnIndex, boolean nullable, FieldVector vector,
-                       JdbcToArrowConfig config);
+    JdbcConsumer apply(
+        ArrowType arrowType,
+        int columnIndex,
+        boolean nullable,
+        FieldVector vector,
+        JdbcToArrowConfig config);
   }
 }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigBuilder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigBuilder.java
index 7d88c23832067..783a373c6d0a7 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigBuilder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigBuilder.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
 import static org.apache.arrow.adapter.jdbc.JdbcToArrowConfig.DEFAULT_TARGET_BATCH_SIZE;
@@ -23,15 +22,12 @@
 import java.util.Calendar;
 import java.util.Map;
 import java.util.function.Function;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 
-/**
- * This class builds {@link JdbcToArrowConfig}s.
- */
+/** This class builds {@link JdbcToArrowConfig}s. */
 public class JdbcToArrowConfigBuilder {
   private Calendar calendar;
   private BufferAllocator allocator;
@@ -49,9 +45,9 @@ public class JdbcToArrowConfigBuilder {
   private RoundingMode bigDecimalRoundingMode;
 
   /**
-   * Default constructor for the <code>JdbcToArrowConfigBuilder}</code>.
-   * Use the setter methods for the allocator and calendar; the allocator must be
-   * set.  Otherwise, {@link #build()} will throw a {@link NullPointerException}.
+   * Default constructor for the <code>JdbcToArrowConfigBuilder}</code>. Use the setter methods for
+   * the allocator and calendar; the allocator must be set. Otherwise, {@link #build()} will throw a
+   * {@link NullPointerException}.
    */
   public JdbcToArrowConfigBuilder() {
     this.allocator = null;
@@ -68,16 +64,13 @@ public JdbcToArrowConfigBuilder() {
   }
 
   /**
-   * Constructor for the <code>JdbcToArrowConfigBuilder</code>.  The
-   * allocator is required, and a {@link NullPointerException}
-   * will be thrown if it is <code>null</code>.
-   * <p>
-   * The allocator is used to construct Arrow vectors from the JDBC ResultSet.
-   * The calendar is used to determine the time zone of {@link java.sql.Timestamp}
-   * fields and convert {@link java.sql.Date}, {@link java.sql.Time}, and
-   * {@link java.sql.Timestamp} fields to a single, common time zone when reading
-   * from the result set.
-   * </p>
+   * Constructor for the <code>JdbcToArrowConfigBuilder</code>. The allocator is required, and a
+   * {@link NullPointerException} will be thrown if it is <code>null</code>.
+   *
+   * <p>The allocator is used to construct Arrow vectors from the JDBC ResultSet. The calendar is
+   * used to determine the time zone of {@link java.sql.Timestamp} fields and convert {@link
+   * java.sql.Date}, {@link java.sql.Time}, and {@link java.sql.Timestamp} fields to a single,
+   * common time zone when reading from the result set.
    *
    * @param allocator The Arrow Vector memory allocator.
    * @param calendar The calendar to use when constructing timestamp fields.
@@ -95,26 +88,23 @@ public JdbcToArrowConfigBuilder(BufferAllocator allocator, Calendar calendar) {
   }
 
   /**
-   * Constructor for the <code>JdbcToArrowConfigBuilder</code>.  Both the
-   * allocator and calendar are required.  A {@link NullPointerException}
-   * will be thrown if either of those arguments is <code>null</code>.
-   * <p>
-   * The allocator is used to construct Arrow vectors from the JDBC ResultSet.
-   * The calendar is used to determine the time zone of {@link java.sql.Timestamp}
-   * fields and convert {@link java.sql.Date}, {@link java.sql.Time}, and
-   * {@link java.sql.Timestamp} fields to a single, common time zone when reading
-   * from the result set.
-   * </p>
-   * <p>
-   * The <code>includeMetadata</code> argument, if <code>true</code> will cause
-   * various information about each database field to be added to the Vector
-   * Schema's field metadata.
-   * </p>
+   * Constructor for the <code>JdbcToArrowConfigBuilder</code>. Both the allocator and calendar are
+   * required. A {@link NullPointerException} will be thrown if either of those arguments is <code>
+   * null</code>.
+   *
+   * <p>The allocator is used to construct Arrow vectors from the JDBC ResultSet. The calendar is
+   * used to determine the time zone of {@link java.sql.Timestamp} fields and convert {@link
+   * java.sql.Date}, {@link java.sql.Time}, and {@link java.sql.Timestamp} fields to a single,
+   * common time zone when reading from the result set.
+   *
+   * <p>The <code>includeMetadata</code> argument, if <code>true</code> will cause various
+   * information about each database field to be added to the Vector Schema's field metadata.
    *
    * @param allocator The Arrow Vector memory allocator.
    * @param calendar The calendar to use when constructing timestamp fields.
    */
-  public JdbcToArrowConfigBuilder(BufferAllocator allocator, Calendar calendar, boolean includeMetadata) {
+  public JdbcToArrowConfigBuilder(
+      BufferAllocator allocator, Calendar calendar, boolean includeMetadata) {
     this(allocator, calendar);
     this.includeMetadata = includeMetadata;
   }
@@ -132,8 +122,8 @@ public JdbcToArrowConfigBuilder setAllocator(BufferAllocator allocator) {
   }
 
   /**
-   * Sets the {@link Calendar} to use when constructing timestamp fields in the
-   * Arrow schema, and reading time-based fields from the JDBC <code>ResultSet</code>.
+   * Sets the {@link Calendar} to use when constructing timestamp fields in the Arrow schema, and
+   * reading time-based fields from the JDBC <code>ResultSet</code>.
    *
    * @param calendar the calendar to set.
    */
@@ -145,7 +135,8 @@ public JdbcToArrowConfigBuilder setCalendar(Calendar calendar) {
   /**
    * Sets whether to include JDBC ResultSet field metadata in the Arrow Schema field metadata.
    *
-   * @param includeMetadata Whether to include or exclude JDBC metadata in the Arrow Schema field metadata.
+   * @param includeMetadata Whether to include or exclude JDBC metadata in the Arrow Schema field
+   *     metadata.
    * @return This instance of the <code>JdbcToArrowConfig</code>, for chaining.
    */
   public JdbcToArrowConfigBuilder setIncludeMetadata(boolean includeMetadata) {
@@ -154,8 +145,8 @@ public JdbcToArrowConfigBuilder setIncludeMetadata(boolean includeMetadata) {
   }
 
   /**
-   * Sets the mapping of column-index-to-{@link JdbcFieldInfo} used for columns of type {@link java.sql.Types#ARRAY}.
-   * The column index is 1-based, to match the JDBC column index.
+   * Sets the mapping of column-index-to-{@link JdbcFieldInfo} used for columns of type {@link
+   * java.sql.Types#ARRAY}. The column index is 1-based, to match the JDBC column index.
    *
    * @param map The mapping.
    * @return This instance of the <code>JdbcToArrowConfig</code>, for chaining.
@@ -166,7 +157,8 @@ public JdbcToArrowConfigBuilder setArraySubTypeByColumnIndexMap(Map<Integer, Jdb
   }
 
   /**
-   * Sets the mapping of column-name-to-{@link JdbcFieldInfo} used for columns of type {@link java.sql.Types#ARRAY}.
+   * Sets the mapping of column-name-to-{@link JdbcFieldInfo} used for columns of type {@link
+   * java.sql.Types#ARRAY}.
    *
    * @param map The mapping.
    * @return This instance of the <code>JdbcToArrowConfig</code>, for chaining.
@@ -178,11 +170,12 @@ public JdbcToArrowConfigBuilder setArraySubTypeByColumnNameMap(Map<String, JdbcF
 
   /**
    * Sets the mapping of column-index-to-{@link JdbcFieldInfo} used for column types.
-   * <p>
-   * This can be useful to override type information from JDBC drivers that provide incomplete type info,
-   * e.g. DECIMAL with precision = scale = 0.
-   * <p>
-   * The column index is 1-based, to match the JDBC column index.
+   *
+   * <p>This can be useful to override type information from JDBC drivers that provide incomplete
+   * type info, e.g. DECIMAL with precision = scale = 0.
+   *
+   * <p>The column index is 1-based, to match the JDBC column index.
+   *
    * @param map The mapping.
    */
   public JdbcToArrowConfigBuilder setExplicitTypesByColumnIndex(Map<Integer, JdbcFieldInfo> map) {
@@ -192,9 +185,10 @@ public JdbcToArrowConfigBuilder setExplicitTypesByColumnIndex(Map<Integer, JdbcF
 
   /**
    * Sets the mapping of column-name-to-{@link JdbcFieldInfo} used for column types.
-   * <p>
-   * This can be useful to override type information from JDBC drivers that provide incomplete type info,
-   * e.g. DECIMAL with precision = scale = 0.
+   *
+   * <p>This can be useful to override type information from JDBC drivers that provide incomplete
+   * type info, e.g. DECIMAL with precision = scale = 0.
+   *
    * @param map The mapping.
    */
   public JdbcToArrowConfigBuilder setExplicitTypesByColumnName(Map<String, JdbcFieldInfo> map) {
@@ -204,8 +198,8 @@ public JdbcToArrowConfigBuilder setExplicitTypesByColumnName(Map<String, JdbcFie
 
   /**
    * Set the target number of rows to convert at once.
-   * <p>
-   * Use {@link JdbcToArrowConfig#NO_LIMIT_BATCH_SIZE} to read all rows at once.
+   *
+   * <p>Use {@link JdbcToArrowConfig#NO_LIMIT_BATCH_SIZE} to read all rows at once.
    */
   public JdbcToArrowConfigBuilder setTargetBatchSize(int targetBatchSize) {
     this.targetBatchSize = targetBatchSize;
@@ -214,8 +208,9 @@ public JdbcToArrowConfigBuilder setTargetBatchSize(int targetBatchSize) {
 
   /**
    * Set the function used to convert JDBC types to Arrow types.
-   * <p>
-   * Defaults to wrapping {@link JdbcToArrowUtils#getArrowTypeFromJdbcType(JdbcFieldInfo, Calendar)}.
+   *
+   * <p>Defaults to wrapping {@link JdbcToArrowUtils#getArrowTypeFromJdbcType(JdbcFieldInfo,
+   * Calendar)}.
    */
   public JdbcToArrowConfigBuilder setJdbcToArrowTypeConverter(
       Function<JdbcFieldInfo, ArrowType> jdbcToArrowTypeConverter) {
@@ -225,9 +220,9 @@ public JdbcToArrowConfigBuilder setJdbcToArrowTypeConverter(
 
   /**
    * Set the function used to get a JDBC consumer for a given type.
-   * <p>
-   * Defaults to wrapping {@link
-   * JdbcToArrowUtils#getConsumer(ArrowType, Integer, Boolean, FieldVector, JdbcToArrowConfig)}.
+   *
+   * <p>Defaults to wrapping {@link JdbcToArrowUtils#getConsumer(ArrowType, Integer, Boolean,
+   * FieldVector, JdbcToArrowConfig)}.
    */
   public JdbcToArrowConfigBuilder setJdbcConsumerGetter(
       JdbcToArrowConfig.JdbcConsumerFactory jdbcConsumerGetter) {
@@ -236,35 +231,32 @@ public JdbcToArrowConfigBuilder setJdbcConsumerGetter(
   }
 
   /**
-   * Set whether to use the same {@link org.apache.arrow.vector.VectorSchemaRoot} instance on each iteration,
-   * or to allocate a new one.
+   * Set whether to use the same {@link org.apache.arrow.vector.VectorSchemaRoot} instance on each
+   * iteration, or to allocate a new one.
    */
   public JdbcToArrowConfigBuilder setReuseVectorSchemaRoot(boolean reuseVectorSchemaRoot) {
     this.reuseVectorSchemaRoot = reuseVectorSchemaRoot;
     return this;
   }
 
-  /**
-   * Set metadata for schema.
-   */
+  /** Set metadata for schema. */
   public JdbcToArrowConfigBuilder setSchemaMetadata(Map<String, String> schemaMetadata) {
     this.schemaMetadata = schemaMetadata;
     return this;
   }
 
-  /**
-   * Set metadata from columnIndex->meta map on per field basis.
-   */
+  /** Set metadata from columnIndex->meta map on per field basis. */
   public JdbcToArrowConfigBuilder setColumnMetadataByColumnIndex(
-          Map<Integer, Map<String, String>> columnMetadataByColumnIndex) {
+      Map<Integer, Map<String, String>> columnMetadataByColumnIndex) {
     this.columnMetadataByColumnIndex = columnMetadataByColumnIndex;
     return this;
   }
 
   /**
-   * Set the rounding mode used when the scale of the actual value does not match the declared scale.
-   * <p>
-   * By default, an error is raised in such cases.
+   * Set the rounding mode used when the scale of the actual value does not match the declared
+   * scale.
+   *
+   * <p>By default, an error is raised in such cases.
    */
   public JdbcToArrowConfigBuilder setBigDecimalRoundingMode(RoundingMode bigDecimalRoundingMode) {
     this.bigDecimalRoundingMode = bigDecimalRoundingMode;
@@ -272,8 +264,8 @@ public JdbcToArrowConfigBuilder setBigDecimalRoundingMode(RoundingMode bigDecima
   }
 
   /**
-   * This builds the {@link JdbcToArrowConfig} from the provided
-   * {@link BufferAllocator} and {@link Calendar}.
+   * This builds the {@link JdbcToArrowConfig} from the provided {@link BufferAllocator} and {@link
+   * Calendar}.
    *
    * @return The built {@link JdbcToArrowConfig}
    * @throws NullPointerException if either the allocator or calendar was not set.
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowUtils.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowUtils.java
index eaee49936079f..8397d4c9e0dc4 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowUtils.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowUtils.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
 import static org.apache.arrow.vector.types.FloatingPointPrecision.DOUBLE;
@@ -38,7 +37,6 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
-
 import org.apache.arrow.adapter.jdbc.consumer.ArrayConsumer;
 import org.apache.arrow.adapter.jdbc.consumer.BigIntConsumer;
 import org.apache.arrow.adapter.jdbc.consumer.BinaryConsumer;
@@ -91,7 +89,8 @@
 import org.apache.arrow.vector.util.ValueVectorUtility;
 
 /**
- * Class that does most of the work to convert JDBC ResultSet data into Arrow columnar format Vector objects.
+ * Class that does most of the work to convert JDBC ResultSet data into Arrow columnar format Vector
+ * objects.
  *
  * @since 0.10.0
  */
@@ -99,9 +98,7 @@ public class JdbcToArrowUtils {
 
   private static final int JDBC_ARRAY_VALUE_COLUMN = 2;
 
-  /**
-   * Returns the instance of a {java.util.Calendar} with the UTC time zone and root locale.
-   */
+  /** Returns the instance of a {java.util.Calendar} with the UTC time zone and root locale. */
   public static Calendar getUtcCalendar() {
     return Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.ROOT);
   }
@@ -114,7 +111,8 @@ public static Calendar getUtcCalendar() {
    * @return {@link Schema}
    * @throws SQLException on error
    */
-  public static Schema jdbcToArrowSchema(ResultSetMetaData rsmd, Calendar calendar) throws SQLException {
+  public static Schema jdbcToArrowSchema(ResultSetMetaData rsmd, Calendar calendar)
+      throws SQLException {
     Preconditions.checkNotNull(calendar, "Calendar object can't be null");
 
     return jdbcToArrowSchema(rsmd, new JdbcToArrowConfig(new RootAllocator(0), calendar));
@@ -123,25 +121,28 @@ public static Schema jdbcToArrowSchema(ResultSetMetaData rsmd, Calendar calendar
   /**
    * Create Arrow {@link Schema} object for the given JDBC {@link ResultSetMetaData}.
    *
-   * @param parameterMetaData The ResultSetMetaData containing the results, to read the JDBC metadata from.
-   * @param calendar          The calendar to use the time zone field of, to construct Timestamp fields from.
+   * @param parameterMetaData The ResultSetMetaData containing the results, to read the JDBC
+   *     metadata from.
+   * @param calendar The calendar to use the time zone field of, to construct Timestamp fields from.
    * @return {@link Schema}
    * @throws SQLException on error
    */
-  public static Schema jdbcToArrowSchema(final ParameterMetaData parameterMetaData, final Calendar calendar)
-      throws SQLException {
+  public static Schema jdbcToArrowSchema(
+      final ParameterMetaData parameterMetaData, final Calendar calendar) throws SQLException {
     Preconditions.checkNotNull(calendar, "Calendar object can't be null");
     Preconditions.checkNotNull(parameterMetaData);
     final List<Field> parameterFields = new ArrayList<>(parameterMetaData.getParameterCount());
-    for (int parameterCounter = 1; parameterCounter <= parameterMetaData.getParameterCount();
-         parameterCounter++) {
+    for (int parameterCounter = 1;
+        parameterCounter <= parameterMetaData.getParameterCount();
+        parameterCounter++) {
       final int jdbcDataType = parameterMetaData.getParameterType(parameterCounter);
       final int jdbcIsNullable = parameterMetaData.isNullable(parameterCounter);
       final boolean arrowIsNullable = jdbcIsNullable != ParameterMetaData.parameterNoNulls;
       final int precision = parameterMetaData.getPrecision(parameterCounter);
       final int scale = parameterMetaData.getScale(parameterCounter);
-      final ArrowType arrowType = getArrowTypeFromJdbcType(new JdbcFieldInfo(jdbcDataType, precision, scale), calendar);
-      final FieldType fieldType = new FieldType(arrowIsNullable, arrowType, /*dictionary=*/null);
+      final ArrowType arrowType =
+          getArrowTypeFromJdbcType(new JdbcFieldInfo(jdbcDataType, precision, scale), calendar);
+      final FieldType fieldType = new FieldType(arrowIsNullable, arrowType, /*dictionary=*/ null);
       parameterFields.add(new Field(null, fieldType, null));
     }
 
@@ -152,10 +153,11 @@ public static Schema jdbcToArrowSchema(final ParameterMetaData parameterMetaData
    * Converts the provided JDBC type to its respective {@link ArrowType} counterpart.
    *
    * @param fieldInfo the {@link JdbcFieldInfo} with information about the original JDBC type.
-   * @param calendar  the {@link Calendar} to use for datetime data types.
+   * @param calendar the {@link Calendar} to use for datetime data types.
    * @return a new {@link ArrowType}.
    */
-  public static ArrowType getArrowTypeFromJdbcType(final JdbcFieldInfo fieldInfo, final Calendar calendar) {
+  public static ArrowType getArrowTypeFromJdbcType(
+      final JdbcFieldInfo fieldInfo, final Calendar calendar) {
     switch (fieldInfo.getJdbcType()) {
       case Types.BOOLEAN:
       case Types.BIT:
@@ -222,30 +224,34 @@ public static ArrowType getArrowTypeFromJdbcType(final JdbcFieldInfo fieldInfo,
   /**
    * Create Arrow {@link Schema} object for the given JDBC {@link java.sql.ResultSetMetaData}.
    *
-   * <p>
-   * If {@link JdbcToArrowConfig#shouldIncludeMetadata()} returns <code>true</code>, the following fields
-   * will be added to the {@link FieldType#getMetadata()}:
+   * <p>If {@link JdbcToArrowConfig#shouldIncludeMetadata()} returns <code>true</code>, the
+   * following fields will be added to the {@link FieldType#getMetadata()}:
+   *
    * <ul>
-   *  <li>{@link Constants#SQL_CATALOG_NAME_KEY} representing {@link ResultSetMetaData#getCatalogName(int)}</li>
-   *  <li>{@link Constants#SQL_TABLE_NAME_KEY} representing {@link ResultSetMetaData#getTableName(int)}</li>
-   *  <li>{@link Constants#SQL_COLUMN_NAME_KEY} representing {@link ResultSetMetaData#getColumnLabel(int)}</li>
-   *  <li>{@link Constants#SQL_TYPE_KEY} representing {@link ResultSetMetaData#getColumnTypeName(int)}</li>
+   *   <li>{@link Constants#SQL_CATALOG_NAME_KEY} representing {@link
+   *       ResultSetMetaData#getCatalogName(int)}
+   *   <li>{@link Constants#SQL_TABLE_NAME_KEY} representing {@link
+   *       ResultSetMetaData#getTableName(int)}
+   *   <li>{@link Constants#SQL_COLUMN_NAME_KEY} representing {@link
+   *       ResultSetMetaData#getColumnLabel(int)}
+   *   <li>{@link Constants#SQL_TYPE_KEY} representing {@link
+   *       ResultSetMetaData#getColumnTypeName(int)}
    * </ul>
-   * </p>
-   * <p>
-   * If any columns are of type {@link java.sql.Types#ARRAY}, the configuration object will be used to look up
-   * the array sub-type field.  The {@link JdbcToArrowConfig#getArraySubTypeByColumnIndex(int)} method will be
-   * checked first, followed by the {@link JdbcToArrowConfig#getArraySubTypeByColumnName(String)} method.
-   * </p>
+   *
+   * <p>If any columns are of type {@link java.sql.Types#ARRAY}, the configuration object will be
+   * used to look up the array sub-type field. The {@link
+   * JdbcToArrowConfig#getArraySubTypeByColumnIndex(int)} method will be checked first, followed by
+   * the {@link JdbcToArrowConfig#getArraySubTypeByColumnName(String)} method.
    *
    * @param rsmd The ResultSetMetaData containing the results, to read the JDBC metadata from.
    * @param config The configuration to use when constructing the schema.
    * @return {@link Schema}
    * @throws SQLException on error
-   * @throws IllegalArgumentException if <code>rsmd</code> contains an {@link java.sql.Types#ARRAY} but the
-   *                                  <code>config</code> does not have a sub-type definition for it.
+   * @throws IllegalArgumentException if <code>rsmd</code> contains an {@link java.sql.Types#ARRAY}
+   *     but the <code>config</code> does not have a sub-type definition for it.
    */
-  public static Schema jdbcToArrowSchema(ResultSetMetaData rsmd, JdbcToArrowConfig config) throws SQLException {
+  public static Schema jdbcToArrowSchema(ResultSetMetaData rsmd, JdbcToArrowConfig config)
+      throws SQLException {
     Preconditions.checkNotNull(rsmd, "JDBC ResultSetMetaData object can't be null");
     Preconditions.checkNotNull(config, "The configuration object must not be null");
 
@@ -254,8 +260,10 @@ public static Schema jdbcToArrowSchema(ResultSetMetaData rsmd, JdbcToArrowConfig
     for (int i = 1; i <= columnCount; i++) {
       final String columnName = rsmd.getColumnLabel(i);
 
-      final Map<String, String> columnMetadata = config.getColumnMetadataByColumnIndex() != null ?
-              config.getColumnMetadataByColumnIndex().get(i) : null;
+      final Map<String, String> columnMetadata =
+          config.getColumnMetadataByColumnIndex() != null
+              ? config.getColumnMetadataByColumnIndex().get(i)
+              : null;
       final Map<String, String> metadata;
       if (config.shouldIncludeMetadata()) {
         metadata = new HashMap<>();
@@ -278,14 +286,19 @@ public static Schema jdbcToArrowSchema(ResultSetMetaData rsmd, JdbcToArrowConfig
       final JdbcFieldInfo columnFieldInfo = getJdbcFieldInfoForColumn(rsmd, i, config);
       final ArrowType arrowType = config.getJdbcToArrowTypeConverter().apply(columnFieldInfo);
       if (arrowType != null) {
-        final FieldType fieldType = new FieldType(
-                isColumnNullable(rsmd, i, columnFieldInfo), arrowType, /* dictionary encoding */ null, metadata);
+        final FieldType fieldType =
+            new FieldType(
+                isColumnNullable(rsmd, i, columnFieldInfo),
+                arrowType, /* dictionary encoding */
+                null,
+                metadata);
 
         List<Field> children = null;
         if (arrowType.getTypeID() == ArrowType.List.TYPE_TYPE) {
           final JdbcFieldInfo arrayFieldInfo = getJdbcFieldInfoForArraySubType(rsmd, i, config);
           if (arrayFieldInfo == null) {
-            throw new IllegalArgumentException("Configuration does not provide a mapping for array column " + i);
+            throw new IllegalArgumentException(
+                "Configuration does not provide a mapping for array column " + i);
           }
           children = new ArrayList<Field>();
           final ArrowType childType = config.getJdbcToArrowTypeConverter().apply(arrayFieldInfo);
@@ -295,9 +308,13 @@ public static Schema jdbcToArrowSchema(ResultSetMetaData rsmd, JdbcToArrowConfig
           FieldType keyType = new FieldType(false, new ArrowType.Utf8(), null, null);
           FieldType valueType = new FieldType(false, new ArrowType.Utf8(), null, null);
           children = new ArrayList<>();
-          children.add(new Field("child", mapType,
-                  Arrays.asList(new Field(MapVector.KEY_NAME, keyType, null),
-                          new Field(MapVector.VALUE_NAME, valueType, null))));
+          children.add(
+              new Field(
+                  "child",
+                  mapType,
+                  Arrays.asList(
+                      new Field(MapVector.KEY_NAME, keyType, null),
+                      new Field(MapVector.VALUE_NAME, valueType, null))));
         }
 
         fields.add(new Field(columnName, fieldType, children));
@@ -307,18 +324,14 @@ public static Schema jdbcToArrowSchema(ResultSetMetaData rsmd, JdbcToArrowConfig
   }
 
   static JdbcFieldInfo getJdbcFieldInfoForColumn(
-      ResultSetMetaData rsmd,
-      int arrayColumn,
-      JdbcToArrowConfig config)
-          throws SQLException {
+      ResultSetMetaData rsmd, int arrayColumn, JdbcToArrowConfig config) throws SQLException {
     Preconditions.checkNotNull(rsmd, "ResultSet MetaData object cannot be null");
     Preconditions.checkNotNull(config, "Configuration must not be null");
     Preconditions.checkArgument(
-            arrayColumn > 0,
-            "ResultSetMetaData columns start with 1; column cannot be less than 1");
+        arrayColumn > 0, "ResultSetMetaData columns start with 1; column cannot be less than 1");
     Preconditions.checkArgument(
-            arrayColumn <= rsmd.getColumnCount(),
-            "Column number cannot be more than the number of columns");
+        arrayColumn <= rsmd.getColumnCount(),
+        "Column number cannot be more than the number of columns");
 
     JdbcFieldInfo fieldInfo = config.getExplicitTypeByColumnIndex(arrayColumn);
     if (fieldInfo == null) {
@@ -334,16 +347,12 @@ static JdbcFieldInfo getJdbcFieldInfoForColumn(
    * If no sub-type can be found, returns null.
    */
   private static JdbcFieldInfo getJdbcFieldInfoForArraySubType(
-      ResultSetMetaData rsmd,
-      int arrayColumn,
-      JdbcToArrowConfig config)
-          throws SQLException {
+      ResultSetMetaData rsmd, int arrayColumn, JdbcToArrowConfig config) throws SQLException {
 
     Preconditions.checkNotNull(rsmd, "ResultSet MetaData object cannot be null");
     Preconditions.checkNotNull(config, "Configuration must not be null");
     Preconditions.checkArgument(
-        arrayColumn > 0,
-        "ResultSetMetaData columns start with 1; column cannot be less than 1");
+        arrayColumn > 0, "ResultSetMetaData columns start with 1; column cannot be less than 1");
     Preconditions.checkArgument(
         arrayColumn <= rsmd.getColumnCount(),
         "Column number cannot be more than the number of columns");
@@ -359,10 +368,10 @@ private static JdbcFieldInfo getJdbcFieldInfoForArraySubType(
    * Iterate the given JDBC {@link ResultSet} object to fetch the data and transpose it to populate
    * the given Arrow Vector objects.
    *
-   * @param rs       ResultSet to use to fetch the data from underlying database
-   * @param root     Arrow {@link VectorSchemaRoot} object to populate
-   * @param calendar The calendar to use when reading {@link Date}, {@link Time}, or {@link Timestamp}
-   *                 data types from the {@link ResultSet}, or <code>null</code> if not converting.
+   * @param rs ResultSet to use to fetch the data from underlying database
+   * @param root Arrow {@link VectorSchemaRoot} object to populate
+   * @param calendar The calendar to use when reading {@link Date}, {@link Time}, or {@link
+   *     Timestamp} data types from the {@link ResultSet}, or <code>null</code> if not converting.
    * @throws SQLException on error
    */
   public static void jdbcToArrowVectors(ResultSet rs, VectorSchemaRoot root, Calendar calendar)
@@ -373,29 +382,30 @@ public static void jdbcToArrowVectors(ResultSet rs, VectorSchemaRoot root, Calen
     jdbcToArrowVectors(rs, root, new JdbcToArrowConfig(new RootAllocator(0), calendar));
   }
 
-  static boolean isColumnNullable(ResultSetMetaData resultSetMetadata, int index, JdbcFieldInfo info)
-      throws SQLException {
+  static boolean isColumnNullable(
+      ResultSetMetaData resultSetMetadata, int index, JdbcFieldInfo info) throws SQLException {
     int nullableValue;
     if (info != null && info.isNullable() != ResultSetMetaData.columnNullableUnknown) {
       nullableValue = info.isNullable();
     } else {
       nullableValue = resultSetMetadata.isNullable(index);
     }
-    return nullableValue == ResultSetMetaData.columnNullable ||
-        nullableValue == ResultSetMetaData.columnNullableUnknown;
+    return nullableValue == ResultSetMetaData.columnNullable
+        || nullableValue == ResultSetMetaData.columnNullableUnknown;
   }
 
   /**
    * Iterate the given JDBC {@link ResultSet} object to fetch the data and transpose it to populate
    * the given Arrow Vector objects.
    *
-   * @param rs     ResultSet to use to fetch the data from underlying database
-   * @param root   Arrow {@link VectorSchemaRoot} object to populate
+   * @param rs ResultSet to use to fetch the data from underlying database
+   * @param root Arrow {@link VectorSchemaRoot} object to populate
    * @param config The configuration to use when reading the data.
    * @throws SQLException on error
    * @throws JdbcConsumerException on error from VectorConsumer
    */
-  public static void jdbcToArrowVectors(ResultSet rs, VectorSchemaRoot root, JdbcToArrowConfig config)
+  public static void jdbcToArrowVectors(
+      ResultSet rs, VectorSchemaRoot root, JdbcToArrowConfig config)
       throws SQLException, IOException {
 
     ResultSetMetaData rsmd = rs.getMetaData();
@@ -405,8 +415,13 @@ public static void jdbcToArrowVectors(ResultSet rs, VectorSchemaRoot root, JdbcT
     for (int i = 1; i <= columnCount; i++) {
       FieldVector vector = root.getVector(rsmd.getColumnLabel(i));
       final JdbcFieldInfo columnFieldInfo = getJdbcFieldInfoForColumn(rsmd, i, config);
-      consumers[i - 1] = getConsumer(
-          vector.getField().getType(), i, isColumnNullable(rsmd, i, columnFieldInfo), vector, config);
+      consumers[i - 1] =
+          getConsumer(
+              vector.getField().getType(),
+              i,
+              isColumnNullable(rsmd, i, columnFieldInfo),
+              vector,
+              config);
     }
 
     CompositeJdbcConsumer compositeConsumer = null;
@@ -439,18 +454,22 @@ public static void jdbcToArrowVectors(ResultSet rs, VectorSchemaRoot root, JdbcT
   }
 
   /**
-   * Default function used for JdbcConsumerFactory. This function gets a JdbcConsumer for the
-   * given column based on the Arrow type and provided vector.
+   * Default function used for JdbcConsumerFactory. This function gets a JdbcConsumer for the given
+   * column based on the Arrow type and provided vector.
    *
-   * @param arrowType   Arrow type for the column.
+   * @param arrowType Arrow type for the column.
    * @param columnIndex Column index to fetch from the ResultSet
-   * @param nullable    Whether the value is nullable or not
-   * @param vector      Vector to store the consumed value
-   * @param config      Associated JdbcToArrowConfig, used mainly for the Calendar.
+   * @param nullable Whether the value is nullable or not
+   * @param vector Vector to store the consumed value
+   * @param config Associated JdbcToArrowConfig, used mainly for the Calendar.
    * @return {@link JdbcConsumer}
    */
-  public static JdbcConsumer getConsumer(ArrowType arrowType, int columnIndex, boolean nullable,
-      FieldVector vector, JdbcToArrowConfig config) {
+  public static JdbcConsumer getConsumer(
+      ArrowType arrowType,
+      int columnIndex,
+      boolean nullable,
+      FieldVector vector,
+      JdbcToArrowConfig config) {
     final Calendar calendar = config.getCalendar();
 
     switch (arrowType.getTypeID()) {
@@ -472,10 +491,11 @@ public static JdbcConsumer getConsumer(ArrowType arrowType, int columnIndex, boo
       case Decimal:
         final RoundingMode bigDecimalRoundingMode = config.getBigDecimalRoundingMode();
         if (((ArrowType.Decimal) arrowType).getBitWidth() == 256) {
-          return Decimal256Consumer.createConsumer((Decimal256Vector) vector, columnIndex, nullable,
-                  bigDecimalRoundingMode);
+          return Decimal256Consumer.createConsumer(
+              (Decimal256Vector) vector, columnIndex, nullable, bigDecimalRoundingMode);
         } else {
-          return DecimalConsumer.createConsumer((DecimalVector) vector, columnIndex, nullable, bigDecimalRoundingMode);
+          return DecimalConsumer.createConsumer(
+              (DecimalVector) vector, columnIndex, nullable, bigDecimalRoundingMode);
         }
       case FloatingPoint:
         switch (((ArrowType.FloatingPoint) arrowType).getPrecision()) {
@@ -495,17 +515,25 @@ public static JdbcConsumer getConsumer(ArrowType arrowType, int columnIndex, boo
       case Date:
         return DateConsumer.createConsumer((DateDayVector) vector, columnIndex, nullable, calendar);
       case Time:
-        return TimeConsumer.createConsumer((TimeMilliVector) vector, columnIndex, nullable, calendar);
+        return TimeConsumer.createConsumer(
+            (TimeMilliVector) vector, columnIndex, nullable, calendar);
       case Timestamp:
         if (config.getCalendar() == null) {
-          return TimestampConsumer.createConsumer((TimeStampMilliVector) vector, columnIndex, nullable);
+          return TimestampConsumer.createConsumer(
+              (TimeStampMilliVector) vector, columnIndex, nullable);
         } else {
-          return TimestampTZConsumer.createConsumer((TimeStampMilliTZVector) vector, columnIndex, nullable, calendar);
+          return TimestampTZConsumer.createConsumer(
+              (TimeStampMilliTZVector) vector, columnIndex, nullable, calendar);
         }
       case List:
         FieldVector childVector = ((ListVector) vector).getDataVector();
-        JdbcConsumer delegate = getConsumer(childVector.getField().getType(), JDBC_ARRAY_VALUE_COLUMN,
-            childVector.getField().isNullable(), childVector, config);
+        JdbcConsumer delegate =
+            getConsumer(
+                childVector.getField().getType(),
+                JDBC_ARRAY_VALUE_COLUMN,
+                childVector.getField().isNullable(),
+                childVector,
+                config);
         return ArrayConsumer.createConsumer((ListVector) vector, delegate, columnIndex, nullable);
       case Map:
         return MapConsumer.createConsumer((MapVector) vector, columnIndex, nullable);
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/BaseColumnBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/BaseColumnBinder.java
index f24f409072c0d..d7b62c43acf6f 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/BaseColumnBinder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/BaseColumnBinder.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import org.apache.arrow.vector.FieldVector;
 
 /**
  * Base class for ColumnBinder implementations.
+ *
  * @param <V> The concrete FieldVector subtype.
  */
 public abstract class BaseColumnBinder<V extends FieldVector> implements ColumnBinder {
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/BigIntBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/BigIntBinder.java
index fde4642ef90a5..b9dfcb0d6c956 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/BigIntBinder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/BigIntBinder.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Types;
-
 import org.apache.arrow.vector.BigIntVector;
 
 /** A column binder for 8-bit integers. */
@@ -34,7 +32,8 @@ public BigIntBinder(BigIntVector vector, int jdbcType) {
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
     final long value = vector.getDataBuffer().getLong((long) rowIndex * BigIntVector.TYPE_WIDTH);
     statement.setLong(parameterIndex, value);
   }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/BitBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/BitBinder.java
index adae513e99e7c..c9db194f652ff 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/BitBinder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/BitBinder.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Types;
-
 import org.apache.arrow.vector.BitVector;
 
 /** A column binder for booleans. */
@@ -34,7 +32,8 @@ public BitBinder(BitVector vector, int jdbcType) {
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
     // See BitVector#getBit
     final int byteIndex = rowIndex >> 3;
     final byte b = vector.getDataBuffer().getByte(byteIndex);
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/ColumnBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/ColumnBinder.java
index c2b1259e1424b..c38db68234ecf 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/ColumnBinder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/ColumnBinder.java
@@ -14,17 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-
 import org.apache.arrow.vector.FieldVector;
 
-/**
- * A helper to bind values from a wrapped Arrow vector to a JDBC PreparedStatement.
- */
+/** A helper to bind values from a wrapped Arrow vector to a JDBC PreparedStatement. */
 public interface ColumnBinder {
   /**
    * Bind the given row to the given parameter.
@@ -43,14 +39,10 @@ public interface ColumnBinder {
    */
   int getJdbcType();
 
-  /**
-   * Get the vector used by this binder.
-   */
+  /** Get the vector used by this binder. */
   FieldVector getVector();
 
-  /**
-   * Create a column binder for a vector, using the default JDBC type code for null values.
-   */
+  /** Create a column binder for a vector, using the default JDBC type code for null values. */
   static ColumnBinder forVector(FieldVector vector) {
     return forVector(vector, /*jdbcType*/ null);
   }
@@ -62,7 +54,8 @@ static ColumnBinder forVector(FieldVector vector) {
    * @param jdbcType The JDBC type code to use (or null to use the default).
    */
   static ColumnBinder forVector(FieldVector vector, Integer jdbcType) {
-    final ColumnBinder binder = vector.getField().getType().accept(new ColumnBinderArrowTypeVisitor(vector, jdbcType));
+    final ColumnBinder binder =
+        vector.getField().getType().accept(new ColumnBinderArrowTypeVisitor(vector, jdbcType));
     if (vector.getField().isNullable()) {
       return new NullableColumnBinder(binder);
     }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/ColumnBinderArrowTypeVisitor.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/ColumnBinderArrowTypeVisitor.java
index dc708724043d0..30b2305f3f916 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/ColumnBinderArrowTypeVisitor.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/ColumnBinderArrowTypeVisitor.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.Types;
 import java.time.ZoneId;
 import java.util.Calendar;
 import java.util.TimeZone;
-
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.BitVector;
 import org.apache.arrow.vector.DateDayVector;
@@ -50,8 +48,8 @@
 
 /**
  * Visitor to create the base ColumnBinder for a vector.
- * <p>
- * To handle null values, wrap the returned binder in a {@link NullableColumnBinder}.
+ *
+ * <p>To handle null values, wrap the returned binder in a {@link NullableColumnBinder}.
  */
 public class ColumnBinderArrowTypeVisitor implements ArrowType.ArrowTypeVisitor<ColumnBinder> {
   private final FieldVector vector;
@@ -111,17 +109,21 @@ public ColumnBinder visit(ArrowType.Int type) {
     }
     switch (type.getBitWidth()) {
       case 8:
-        return jdbcType == null ? new TinyIntBinder((TinyIntVector) vector) :
-            new TinyIntBinder((TinyIntVector) vector, jdbcType);
+        return jdbcType == null
+            ? new TinyIntBinder((TinyIntVector) vector)
+            : new TinyIntBinder((TinyIntVector) vector, jdbcType);
       case 16:
-        return jdbcType == null ? new SmallIntBinder((SmallIntVector) vector) :
-            new SmallIntBinder((SmallIntVector) vector, jdbcType);
+        return jdbcType == null
+            ? new SmallIntBinder((SmallIntVector) vector)
+            : new SmallIntBinder((SmallIntVector) vector, jdbcType);
       case 32:
-        return jdbcType == null ? new IntBinder((IntVector) vector) :
-            new IntBinder((IntVector) vector, jdbcType);
+        return jdbcType == null
+            ? new IntBinder((IntVector) vector)
+            : new IntBinder((IntVector) vector, jdbcType);
       case 64:
-        return jdbcType == null ? new BigIntBinder((BigIntVector) vector) :
-            new BigIntBinder((BigIntVector) vector, jdbcType);
+        return jdbcType == null
+            ? new BigIntBinder((BigIntVector) vector)
+            : new BigIntBinder((BigIntVector) vector, jdbcType);
       default:
         throw new UnsupportedOperationException("No column binder implemented for type " + type);
     }
@@ -131,11 +133,13 @@ public ColumnBinder visit(ArrowType.Int type) {
   public ColumnBinder visit(ArrowType.FloatingPoint type) {
     switch (type.getPrecision()) {
       case SINGLE:
-        return jdbcType == null ? new Float4Binder((Float4Vector) vector) :
-            new Float4Binder((Float4Vector) vector, jdbcType);
+        return jdbcType == null
+            ? new Float4Binder((Float4Vector) vector)
+            : new Float4Binder((Float4Vector) vector, jdbcType);
       case DOUBLE:
-        return jdbcType == null ? new Float8Binder((Float8Vector) vector) :
-            new Float8Binder((Float8Vector) vector, jdbcType);
+        return jdbcType == null
+            ? new Float8Binder((Float8Vector) vector)
+            : new Float8Binder((Float8Vector) vector, jdbcType);
       default:
         throw new UnsupportedOperationException("No column binder implemented for type " + type);
     }
@@ -144,51 +148,74 @@ public ColumnBinder visit(ArrowType.FloatingPoint type) {
   @Override
   public ColumnBinder visit(ArrowType.Utf8 type) {
     VarCharVector varChar = (VarCharVector) vector;
-    return jdbcType == null ? new VarCharBinder<>(varChar, Types.VARCHAR) :
-        new VarCharBinder<>(varChar, jdbcType);
+    return jdbcType == null
+        ? new VarCharBinder<>(varChar, Types.VARCHAR)
+        : new VarCharBinder<>(varChar, jdbcType);
+  }
+
+  @Override
+  public ColumnBinder visit(ArrowType.Utf8View type) {
+    throw new UnsupportedOperationException(
+        "Column binder implemented for type " + type + " is not supported");
   }
 
   @Override
   public ColumnBinder visit(ArrowType.LargeUtf8 type) {
     LargeVarCharVector varChar = (LargeVarCharVector) vector;
-    return jdbcType == null ? new VarCharBinder<>(varChar, Types.LONGVARCHAR) :
-        new VarCharBinder<>(varChar, jdbcType);
+    return jdbcType == null
+        ? new VarCharBinder<>(varChar, Types.LONGVARCHAR)
+        : new VarCharBinder<>(varChar, jdbcType);
   }
 
   @Override
   public ColumnBinder visit(ArrowType.Binary type) {
     VarBinaryVector varBinary = (VarBinaryVector) vector;
-    return jdbcType == null ? new VarBinaryBinder<>(varBinary, Types.VARBINARY) :
-        new VarBinaryBinder<>(varBinary, jdbcType);
+    return jdbcType == null
+        ? new VarBinaryBinder<>(varBinary, Types.VARBINARY)
+        : new VarBinaryBinder<>(varBinary, jdbcType);
+  }
+
+  @Override
+  public ColumnBinder visit(ArrowType.BinaryView type) {
+    throw new UnsupportedOperationException(
+        "Column binder implemented for type " + type + " is not supported");
   }
 
   @Override
   public ColumnBinder visit(ArrowType.LargeBinary type) {
     LargeVarBinaryVector varBinary = (LargeVarBinaryVector) vector;
-    return jdbcType == null ? new VarBinaryBinder<>(varBinary, Types.LONGVARBINARY) :
-        new VarBinaryBinder<>(varBinary, jdbcType);
+    return jdbcType == null
+        ? new VarBinaryBinder<>(varBinary, Types.LONGVARBINARY)
+        : new VarBinaryBinder<>(varBinary, jdbcType);
   }
 
   @Override
   public ColumnBinder visit(ArrowType.FixedSizeBinary type) {
     FixedSizeBinaryVector binary = (FixedSizeBinaryVector) vector;
-    return jdbcType == null ? new FixedSizeBinaryBinder(binary, Types.BINARY) :
-        new FixedSizeBinaryBinder(binary, jdbcType);
+    return jdbcType == null
+        ? new FixedSizeBinaryBinder(binary, Types.BINARY)
+        : new FixedSizeBinaryBinder(binary, jdbcType);
   }
 
   @Override
   public ColumnBinder visit(ArrowType.Bool type) {
-    return jdbcType == null ? new BitBinder((BitVector) vector) : new BitBinder((BitVector) vector, jdbcType);
+    return jdbcType == null
+        ? new BitBinder((BitVector) vector)
+        : new BitBinder((BitVector) vector, jdbcType);
   }
 
   @Override
   public ColumnBinder visit(ArrowType.Decimal type) {
     if (type.getBitWidth() == 128) {
       DecimalVector decimalVector = (DecimalVector) vector;
-      return jdbcType == null ? new Decimal128Binder(decimalVector) : new Decimal128Binder(decimalVector, jdbcType);
+      return jdbcType == null
+          ? new Decimal128Binder(decimalVector)
+          : new Decimal128Binder(decimalVector, jdbcType);
     } else if (type.getBitWidth() == 256) {
       Decimal256Vector decimalVector = (Decimal256Vector) vector;
-      return jdbcType == null ? new Decimal256Binder(decimalVector) : new Decimal256Binder(decimalVector, jdbcType);
+      return jdbcType == null
+          ? new Decimal256Binder(decimalVector)
+          : new Decimal256Binder(decimalVector, jdbcType);
     }
     throw new UnsupportedOperationException("No column binder implemented for type " + type);
   }
@@ -197,11 +224,13 @@ public ColumnBinder visit(ArrowType.Decimal type) {
   public ColumnBinder visit(ArrowType.Date type) {
     switch (type.getUnit()) {
       case DAY:
-        return jdbcType == null ? new DateDayBinder((DateDayVector) vector) :
-            new DateDayBinder((DateDayVector) vector, /*calendar*/null, jdbcType);
+        return jdbcType == null
+            ? new DateDayBinder((DateDayVector) vector)
+            : new DateDayBinder((DateDayVector) vector, /*calendar*/ null, jdbcType);
       case MILLISECOND:
-        return jdbcType == null ? new DateMilliBinder((DateMilliVector) vector) :
-            new DateMilliBinder((DateMilliVector) vector, /*calendar*/null, jdbcType);
+        return jdbcType == null
+            ? new DateMilliBinder((DateMilliVector) vector)
+            : new DateMilliBinder((DateMilliVector) vector, /*calendar*/ null, jdbcType);
       default:
         throw new UnsupportedOperationException("No column binder implemented for type " + type);
     }
@@ -211,17 +240,21 @@ public ColumnBinder visit(ArrowType.Date type) {
   public ColumnBinder visit(ArrowType.Time type) {
     switch (type.getUnit()) {
       case SECOND:
-        return jdbcType == null ? new Time32Binder((TimeSecVector) vector) :
-            new Time32Binder((TimeSecVector) vector, jdbcType);
+        return jdbcType == null
+            ? new Time32Binder((TimeSecVector) vector)
+            : new Time32Binder((TimeSecVector) vector, jdbcType);
       case MILLISECOND:
-        return jdbcType == null ? new Time32Binder((TimeMilliVector) vector) :
-            new Time32Binder((TimeMilliVector) vector, jdbcType);
+        return jdbcType == null
+            ? new Time32Binder((TimeMilliVector) vector)
+            : new Time32Binder((TimeMilliVector) vector, jdbcType);
       case MICROSECOND:
-        return jdbcType == null ? new Time64Binder((TimeMicroVector) vector) :
-            new Time64Binder((TimeMicroVector) vector, jdbcType);
+        return jdbcType == null
+            ? new Time64Binder((TimeMicroVector) vector)
+            : new Time64Binder((TimeMicroVector) vector, jdbcType);
       case NANOSECOND:
-        return jdbcType == null ? new Time64Binder((TimeNanoVector) vector) :
-            new Time64Binder((TimeNanoVector) vector, jdbcType);
+        return jdbcType == null
+            ? new Time64Binder((TimeNanoVector) vector)
+            : new Time64Binder((TimeNanoVector) vector, jdbcType);
       default:
         throw new UnsupportedOperationException("No column binder implemented for type " + type);
     }
@@ -246,4 +279,9 @@ public ColumnBinder visit(ArrowType.Interval type) {
   public ColumnBinder visit(ArrowType.Duration type) {
     throw new UnsupportedOperationException("No column binder implemented for type " + type);
   }
+
+  @Override
+  public ColumnBinder visit(ArrowType.ListView type) {
+    throw new UnsupportedOperationException("No column binder implemented for type " + type);
+  }
 }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/DateDayBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/DateDayBinder.java
index bc16790c8f391..b9eae464c8aa2 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/DateDayBinder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/DateDayBinder.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.Date;
@@ -22,12 +21,9 @@
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Calendar;
-
 import org.apache.arrow.vector.DateDayVector;
 
-/**
- * A column binder for 32-bit dates.
- */
+/** A column binder for 32-bit dates. */
 public class DateDayBinder extends BaseColumnBinder<DateDayVector> {
   private static final long MILLIS_PER_DAY = 86_400_000;
   private final Calendar calendar;
@@ -46,7 +42,8 @@ public DateDayBinder(DateDayVector vector, Calendar calendar, int jdbcType) {
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
     // TODO: multiply with overflow
     final long index = (long) rowIndex * DateDayVector.TYPE_WIDTH;
     final Date value = new Date(vector.getDataBuffer().getInt(index) * MILLIS_PER_DAY);
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/DateMilliBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/DateMilliBinder.java
index 5cb91b46ac179..f320391fbed5b 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/DateMilliBinder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/DateMilliBinder.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.Date;
@@ -22,12 +21,9 @@
 import java.sql.SQLException;
 import java.sql.Types;
 import java.util.Calendar;
-
 import org.apache.arrow.vector.DateMilliVector;
 
-/**
- * A column binder for 64-bit dates.
- */
+/** A column binder for 64-bit dates. */
 public class DateMilliBinder extends BaseColumnBinder<DateMilliVector> {
   private final Calendar calendar;
 
@@ -39,14 +35,14 @@ public DateMilliBinder(DateMilliVector vector, Calendar calendar) {
     this(vector, calendar, Types.DATE);
   }
 
-
   public DateMilliBinder(DateMilliVector vector, Calendar calendar, int jdbcType) {
     super(vector, jdbcType);
     this.calendar = calendar;
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
     final long index = (long) rowIndex * DateMilliVector.TYPE_WIDTH;
     final Date value = new Date(vector.getDataBuffer().getLong(index));
     if (calendar == null) {
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Decimal128Binder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Decimal128Binder.java
index 9e9d0e4fdb25b..07ef52f2e594c 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Decimal128Binder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Decimal128Binder.java
@@ -14,20 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.math.BigDecimal;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Types;
-
 import org.apache.arrow.vector.DecimalVector;
 import org.apache.arrow.vector.util.DecimalUtility;
 
-/**
- * A binder for 128-bit decimals.
- */
+/** A binder for 128-bit decimals. */
 public class Decimal128Binder extends BaseColumnBinder<DecimalVector> {
   public Decimal128Binder(DecimalVector vector) {
     this(vector, Types.DECIMAL);
@@ -38,9 +34,11 @@ public Decimal128Binder(DecimalVector vector, int jdbcType) {
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
-    final BigDecimal value = DecimalUtility.getBigDecimalFromArrowBuf(
-        vector.getDataBuffer(), rowIndex, vector.getScale(), DecimalVector.TYPE_WIDTH);
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
+    final BigDecimal value =
+        DecimalUtility.getBigDecimalFromArrowBuf(
+            vector.getDataBuffer(), rowIndex, vector.getScale(), DecimalVector.TYPE_WIDTH);
     statement.setBigDecimal(parameterIndex, value);
   }
 }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Decimal256Binder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Decimal256Binder.java
index bd29e083b4513..5a4222f6b84db 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Decimal256Binder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Decimal256Binder.java
@@ -14,20 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.math.BigDecimal;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Types;
-
 import org.apache.arrow.vector.Decimal256Vector;
 import org.apache.arrow.vector.util.DecimalUtility;
 
-/**
- * A binder for 256-bit decimals.
- */
+/** A binder for 256-bit decimals. */
 public class Decimal256Binder extends BaseColumnBinder<Decimal256Vector> {
   public Decimal256Binder(Decimal256Vector vector) {
     this(vector, Types.DECIMAL);
@@ -38,9 +34,11 @@ public Decimal256Binder(Decimal256Vector vector, int jdbcType) {
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
-    final BigDecimal value = DecimalUtility.getBigDecimalFromArrowBuf(
-        vector.getDataBuffer(), rowIndex, vector.getScale(), Decimal256Vector.TYPE_WIDTH);
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
+    final BigDecimal value =
+        DecimalUtility.getBigDecimalFromArrowBuf(
+            vector.getDataBuffer(), rowIndex, vector.getScale(), Decimal256Vector.TYPE_WIDTH);
     statement.setBigDecimal(parameterIndex, value);
   }
 }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/FixedSizeBinaryBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/FixedSizeBinaryBinder.java
index 7edc5e4532985..4f74b1fa8cfd4 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/FixedSizeBinaryBinder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/FixedSizeBinaryBinder.java
@@ -14,22 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-
 import org.apache.arrow.vector.FixedSizeBinaryVector;
 
-/**
- * A binder for fixed-width binary types.
- */
+/** A binder for fixed-width binary types. */
 public class FixedSizeBinaryBinder extends BaseColumnBinder<FixedSizeBinaryVector> {
   /**
    * Create a binder for the given vector using the given JDBC type for null values.
    *
-   * @param vector   The vector to draw values from.
+   * @param vector The vector to draw values from.
    * @param jdbcType The JDBC type code.
    */
   public FixedSizeBinaryBinder(FixedSizeBinaryVector vector, int jdbcType) {
@@ -37,9 +33,12 @@ public FixedSizeBinaryBinder(FixedSizeBinaryVector vector, int jdbcType) {
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
     byte[] binaryData = new byte[vector.getByteWidth()];
-    vector.getDataBuffer().getBytes((long) rowIndex * binaryData.length, binaryData, 0, binaryData.length);
+    vector
+        .getDataBuffer()
+        .getBytes((long) rowIndex * binaryData.length, binaryData, 0, binaryData.length);
     statement.setBytes(parameterIndex, binaryData);
   }
 }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Float4Binder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Float4Binder.java
index a471c1ebadd66..466a67a2dbc89 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Float4Binder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Float4Binder.java
@@ -14,18 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Types;
-
 import org.apache.arrow.vector.Float4Vector;
 
-/**
- * A binder for 32-bit floats.
- */
+/** A binder for 32-bit floats. */
 public class Float4Binder extends BaseColumnBinder<Float4Vector> {
   public Float4Binder(Float4Vector vector) {
     this(vector, Types.REAL);
@@ -36,7 +32,8 @@ public Float4Binder(Float4Vector vector, int jdbcType) {
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
     final float value = vector.getDataBuffer().getFloat((long) rowIndex * Float4Vector.TYPE_WIDTH);
     statement.setFloat(parameterIndex, value);
   }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Float8Binder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Float8Binder.java
index 4710c3b59860d..222bebf115372 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Float8Binder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Float8Binder.java
@@ -14,18 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Types;
-
 import org.apache.arrow.vector.Float8Vector;
 
-/**
- * A binder for 64-bit floats.
- */
+/** A binder for 64-bit floats. */
 public class Float8Binder extends BaseColumnBinder<Float8Vector> {
   public Float8Binder(Float8Vector vector) {
     this(vector, Types.DOUBLE);
@@ -36,8 +32,10 @@ public Float8Binder(Float8Vector vector, int jdbcType) {
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
-    final double value = vector.getDataBuffer().getDouble((long) rowIndex * Float8Vector.TYPE_WIDTH);
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
+    final double value =
+        vector.getDataBuffer().getDouble((long) rowIndex * Float8Vector.TYPE_WIDTH);
     statement.setDouble(parameterIndex, value);
   }
 }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/IntBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/IntBinder.java
index 7d47f585a39d9..6b49eeb5352b1 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/IntBinder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/IntBinder.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Types;
-
 import org.apache.arrow.vector.IntVector;
 
 /** A column binder for 32-bit integers. */
@@ -34,7 +32,8 @@ public IntBinder(IntVector vector, int jdbcType) {
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
     final int value = vector.getDataBuffer().getInt((long) rowIndex * IntVector.TYPE_WIDTH);
     statement.setInt(parameterIndex, value);
   }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/ListBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/ListBinder.java
index b8aa61234f4e9..25172c0c1f0aa 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/ListBinder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/ListBinder.java
@@ -14,21 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Arrays;
-
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.complex.ListVector;
 import org.apache.arrow.vector.complex.impl.UnionListReader;
 import org.apache.arrow.vector.util.Text;
 
-/**
- * A column binder for list of primitive values.
- */
+/** A column binder for list of primitive values. */
 public class ListBinder extends BaseColumnBinder<ListVector> {
 
   private final UnionListReader listReader;
@@ -52,7 +48,9 @@ public ListBinder(ListVector vector, int jdbcType) {
     try {
       arrayElementClass = dataVectorClass.getMethod("getObject", Integer.TYPE).getReturnType();
     } catch (NoSuchMethodException e) {
-      final String message = String.format("Issue to determine type for getObject method of data vector class %s ",
+      final String message =
+          String.format(
+              "Issue to determine type for getObject method of data vector class %s ",
               dataVectorClass.getName());
       throw new RuntimeException(message);
     }
@@ -60,7 +58,8 @@ public ListBinder(ListVector vector, int jdbcType) {
   }
 
   @Override
-  public void bind(java.sql.PreparedStatement statement, int parameterIndex, int rowIndex)throws java.sql.SQLException {
+  public void bind(java.sql.PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws java.sql.SQLException {
     listReader.setPosition(rowIndex);
     ArrayList<?> sourceArray = (ArrayList<?>) listReader.readObject();
     Object array;
@@ -69,7 +68,9 @@ public void bind(java.sql.PreparedStatement statement, int parameterIndex, int r
       Arrays.setAll((Object[]) array, sourceArray::get);
     } else {
       array = new String[sourceArray.size()];
-      Arrays.setAll((Object[]) array, idx -> sourceArray.get(idx) != null ? sourceArray.get(idx).toString() : null);
+      Arrays.setAll(
+          (Object[]) array,
+          idx -> sourceArray.get(idx) != null ? sourceArray.get(idx).toString() : null);
     }
     statement.setObject(parameterIndex, array);
   }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/MapBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/MapBinder.java
index 07391eb7cbfb4..e94f186453581 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/MapBinder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/MapBinder.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.PreparedStatement;
@@ -23,16 +22,13 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Objects;
-
 import org.apache.arrow.vector.complex.MapVector;
 import org.apache.arrow.vector.complex.impl.UnionMapReader;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.util.JsonStringHashMap;
 
-/**
- * A column binder for map of primitive values.
- */
+/** A column binder for map of primitive values. */
 public class MapBinder extends BaseColumnBinder<MapVector> {
 
   private UnionMapReader reader;
@@ -58,8 +54,8 @@ public MapBinder(MapVector vector, int jdbcType) {
     }
     List<Field> keyValueFields = Objects.requireNonNull(structField.get(0)).getChildren();
     if (keyValueFields.size() != 2) {
-      throw new IllegalArgumentException("Expected two children fields " +
-                                         "inside nested Struct field in Map");
+      throw new IllegalArgumentException(
+          "Expected two children fields " + "inside nested Struct field in Map");
     }
     ArrowType keyType = Objects.requireNonNull(keyValueFields.get(0)).getType();
     ArrowType valueType = Objects.requireNonNull(keyValueFields.get(1)).getType();
@@ -68,15 +64,16 @@ public MapBinder(MapVector vector, int jdbcType) {
   }
 
   @Override
-  public void bind(PreparedStatement statement,
-                   int parameterIndex, int rowIndex) throws SQLException {
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
     reader.setPosition(rowIndex);
     LinkedHashMap<Object, Object> tags = new JsonStringHashMap<>();
     while (reader.next()) {
       Object key = reader.key().readObject();
       Object value = reader.value().readObject();
-      tags.put(isTextKey && key != null ? key.toString() : key,
-               isTextValue && value != null ? value.toString() : value);
+      tags.put(
+          isTextKey && key != null ? key.toString() : key,
+          isTextValue && value != null ? value.toString() : value);
     }
     switch (jdbcType) {
       case Types.VARCHAR:
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/NullableColumnBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/NullableColumnBinder.java
index 123b587ca50d4..bf5288b173341 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/NullableColumnBinder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/NullableColumnBinder.java
@@ -14,17 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-
 import org.apache.arrow.vector.FieldVector;
 
-/**
- * A ColumnBinder that checks for nullability before deferring to a type-specific binder.
- */
+/** A ColumnBinder that checks for nullability before deferring to a type-specific binder. */
 public class NullableColumnBinder implements ColumnBinder {
   private final ColumnBinder wrapped;
 
@@ -33,7 +29,8 @@ public NullableColumnBinder(ColumnBinder wrapped) {
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
     if (wrapped.getVector().isNull(rowIndex)) {
       statement.setNull(parameterIndex, wrapped.getJdbcType());
     } else {
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/SmallIntBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/SmallIntBinder.java
index f9d744b9f5497..aa636c9336f55 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/SmallIntBinder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/SmallIntBinder.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Types;
-
 import org.apache.arrow.vector.SmallIntVector;
 
 /** A column binder for 8-bit integers. */
@@ -34,8 +32,10 @@ public SmallIntBinder(SmallIntVector vector, int jdbcType) {
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
-    final short value = vector.getDataBuffer().getShort((short) rowIndex * SmallIntVector.TYPE_WIDTH);
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
+    final short value =
+        vector.getDataBuffer().getShort((short) rowIndex * SmallIntVector.TYPE_WIDTH);
     statement.setShort(parameterIndex, value);
   }
 }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Time32Binder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Time32Binder.java
index 5dc7e3f513f97..4e09c3be23264 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Time32Binder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Time32Binder.java
@@ -14,21 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Time;
 import java.sql.Types;
-
 import org.apache.arrow.vector.BaseFixedWidthVector;
 import org.apache.arrow.vector.TimeMilliVector;
 import org.apache.arrow.vector.TimeSecVector;
 
-/**
- * A binder for 32-bit time types.
- */
+/** A binder for 32-bit time types. */
 public class Time32Binder extends BaseColumnBinder<BaseFixedWidthVector> {
   private static final long TYPE_WIDTH = 4;
 
@@ -43,11 +39,11 @@ public Time32Binder(TimeMilliVector vector) {
   }
 
   public Time32Binder(TimeSecVector vector, int jdbcType) {
-    this(vector, /*factor*/1_000, jdbcType);
+    this(vector, /*factor*/ 1_000, jdbcType);
   }
 
   public Time32Binder(TimeMilliVector vector, int jdbcType) {
-    this(vector, /*factor*/1, jdbcType);
+    this(vector, /*factor*/ 1, jdbcType);
   }
 
   Time32Binder(BaseFixedWidthVector vector, long factor, int jdbcType) {
@@ -56,7 +52,8 @@ public Time32Binder(TimeMilliVector vector, int jdbcType) {
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
     // TODO: multiply with overflow
     // TODO: take in a Calendar as well?
     final Time value = new Time(vector.getDataBuffer().getInt(rowIndex * TYPE_WIDTH) * factor);
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Time64Binder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Time64Binder.java
index 8d62ae0eb36df..01c85fb32f1b5 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Time64Binder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/Time64Binder.java
@@ -14,21 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Time;
 import java.sql.Types;
-
 import org.apache.arrow.vector.BaseFixedWidthVector;
 import org.apache.arrow.vector.TimeMicroVector;
 import org.apache.arrow.vector.TimeNanoVector;
 
-/**
- * A binder for 64-bit time types.
- */
+/** A binder for 64-bit time types. */
 public class Time64Binder extends BaseColumnBinder<BaseFixedWidthVector> {
   private static final long TYPE_WIDTH = 8;
 
@@ -43,11 +39,11 @@ public Time64Binder(TimeNanoVector vector) {
   }
 
   public Time64Binder(TimeMicroVector vector, int jdbcType) {
-    this(vector, /*factor*/1_000, jdbcType);
+    this(vector, /*factor*/ 1_000, jdbcType);
   }
 
   public Time64Binder(TimeNanoVector vector, int jdbcType) {
-    this(vector, /*factor*/1_000_000, jdbcType);
+    this(vector, /*factor*/ 1_000_000, jdbcType);
   }
 
   Time64Binder(BaseFixedWidthVector vector, long factor, int jdbcType) {
@@ -56,7 +52,8 @@ public Time64Binder(TimeNanoVector vector, int jdbcType) {
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
     // TODO: option to throw on truncation (vendor Guava IntMath#multiply)
     final Time value = new Time(vector.getDataBuffer().getLong(rowIndex * TYPE_WIDTH) / factor);
     statement.setTime(parameterIndex, value);
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/TimeStampBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/TimeStampBinder.java
index 6677e5909901a..942d7ae58dcd5 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/TimeStampBinder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/TimeStampBinder.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.PreparedStatement;
@@ -22,7 +21,6 @@
 import java.sql.Timestamp;
 import java.sql.Types;
 import java.util.Calendar;
-
 import org.apache.arrow.vector.TimeStampVector;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 
@@ -32,15 +30,17 @@ public class TimeStampBinder extends BaseColumnBinder<TimeStampVector> {
   private final long unitsPerSecond;
   private final long nanosPerUnit;
 
-  /**
-   * Create a binder for a timestamp vector using the default JDBC type code.
-   */
+  /** Create a binder for a timestamp vector using the default JDBC type code. */
   public TimeStampBinder(TimeStampVector vector, Calendar calendar) {
-    this(vector, calendar, isZoned(vector.getField().getType()) ? Types.TIMESTAMP_WITH_TIMEZONE : Types.TIMESTAMP);
+    this(
+        vector,
+        calendar,
+        isZoned(vector.getField().getType()) ? Types.TIMESTAMP_WITH_TIMEZONE : Types.TIMESTAMP);
   }
 
   /**
    * Create a binder for a timestamp vector.
+   *
    * @param vector The vector to pull values from.
    * @param calendar Optionally, the calendar to pass to JDBC.
    * @param jdbcType The JDBC type code to use for null values.
@@ -73,19 +73,23 @@ public TimeStampBinder(TimeStampVector vector, Calendar calendar, int jdbcType)
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
     // TODO: option to throw on truncation (vendor Guava IntMath#multiply) or overflow
-    final long rawValue = vector.getDataBuffer().getLong((long) rowIndex * TimeStampVector.TYPE_WIDTH);
+    final long rawValue =
+        vector.getDataBuffer().getLong((long) rowIndex * TimeStampVector.TYPE_WIDTH);
     final long seconds = rawValue / unitsPerSecond;
     final int nanos = (int) ((rawValue - (seconds * unitsPerSecond)) * nanosPerUnit);
     final Timestamp value = new Timestamp(seconds * 1_000);
     value.setNanos(nanos);
     if (calendar != null) {
-      // Timestamp == Date == UTC timestamp (confusingly). Arrow's timestamp with timezone is a UTC value with a
+      // Timestamp == Date == UTC timestamp (confusingly). Arrow's timestamp with timezone is a UTC
+      // value with a
       // zone offset, so we don't need to do any conversion.
       statement.setTimestamp(parameterIndex, value, calendar);
     } else {
-      // Arrow timestamp without timezone isn't strictly convertible to any timezone. So this is technically wrong,
+      // Arrow timestamp without timezone isn't strictly convertible to any timezone. So this is
+      // technically wrong,
       // but there is no 'correct' interpretation here. The application should provide a calendar.
       statement.setTimestamp(parameterIndex, value);
     }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/TinyIntBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/TinyIntBinder.java
index f51d139be863a..0580456d37983 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/TinyIntBinder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/TinyIntBinder.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Types;
-
 import org.apache.arrow.vector.TinyIntVector;
 
 /** A column binder for 8-bit integers. */
@@ -34,7 +32,8 @@ public TinyIntBinder(TinyIntVector vector, int jdbcType) {
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
     final byte value = vector.getDataBuffer().getByte((long) rowIndex * TinyIntVector.TYPE_WIDTH);
     statement.setByte(parameterIndex, value);
   }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/VarBinaryBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/VarBinaryBinder.java
index a94cff6a00496..41807efc611b1 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/VarBinaryBinder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/VarBinaryBinder.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-
 import org.apache.arrow.memory.util.ArrowBufPointer;
 import org.apache.arrow.vector.ElementAddressableVector;
 import org.apache.arrow.vector.FieldVector;
@@ -29,13 +27,14 @@
  *
  * @param <T> The binary vector.
  */
-public class VarBinaryBinder<T extends FieldVector & ElementAddressableVector> extends BaseColumnBinder<T> {
+public class VarBinaryBinder<T extends FieldVector & ElementAddressableVector>
+    extends BaseColumnBinder<T> {
   private final ArrowBufPointer element;
 
   /**
    * Create a binder for the given vector using the given JDBC type for null values.
    *
-   * @param vector   The vector to draw values from.
+   * @param vector The vector to draw values from.
    * @param jdbcType The JDBC type code.
    */
   public VarBinaryBinder(T vector, int jdbcType) {
@@ -44,15 +43,18 @@ public VarBinaryBinder(T vector, int jdbcType) {
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
     vector.getDataPointer(rowIndex, element);
     if (element.getBuf() == null) {
       statement.setNull(parameterIndex, jdbcType);
       return;
     }
     if (element.getLength() > (long) Integer.MAX_VALUE) {
-      final String message = String.format("Length of value at index %d (%d) exceeds Integer.MAX_VALUE",
-          rowIndex, element.getLength());
+      final String message =
+          String.format(
+              "Length of value at index %d (%d) exceeds Integer.MAX_VALUE",
+              rowIndex, element.getLength());
       throw new RuntimeException(message);
     }
     byte[] binaryData = new byte[(int) element.getLength()];
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/VarCharBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/VarCharBinder.java
index 73bd55981490b..926e1da28c9a0 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/VarCharBinder.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/VarCharBinder.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.binder;
 
 import java.nio.charset.StandardCharsets;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-
 import org.apache.arrow.memory.util.ArrowBufPointer;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.VariableWidthVector;
@@ -30,13 +28,14 @@
  *
  * @param <T> The text vector.
  */
-public class VarCharBinder<T extends FieldVector & VariableWidthVector> extends BaseColumnBinder<T> {
+public class VarCharBinder<T extends FieldVector & VariableWidthVector>
+    extends BaseColumnBinder<T> {
   private final ArrowBufPointer element;
 
   /**
    * Create a binder for the given vector using the given JDBC type for null values.
    *
-   * @param vector   The vector to draw values from.
+   * @param vector The vector to draw values from.
    * @param jdbcType The JDBC type code.
    */
   public VarCharBinder(T vector, int jdbcType) {
@@ -45,15 +44,18 @@ public VarCharBinder(T vector, int jdbcType) {
   }
 
   @Override
-  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex) throws SQLException {
+  public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
+      throws SQLException {
     vector.getDataPointer(rowIndex, element);
     if (element.getBuf() == null) {
       statement.setNull(parameterIndex, jdbcType);
       return;
     }
     if (element.getLength() > (long) Integer.MAX_VALUE) {
-      final String message = String.format("Length of value at index %d (%d) exceeds Integer.MAX_VALUE",
-          rowIndex, element.getLength());
+      final String message =
+          String.format(
+              "Length of value at index %d (%d) exceeds Integer.MAX_VALUE",
+              rowIndex, element.getLength());
       throw new RuntimeException(message);
     }
     byte[] utf8Bytes = new byte[(int) element.getLength()];
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/package-info.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/package-info.java
index 4f8936e0c27bf..945c3c9f84fa8 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/package-info.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/package-info.java
@@ -15,8 +15,5 @@
  * limitations under the License.
  */
 
-/**
- * Utilities to bind Arrow data as JDBC prepared statement parameters.
- */
-
+/** Utilities to bind Arrow data as JDBC prepared statement parameters. */
 package org.apache.arrow.adapter.jdbc.binder;
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ArrayConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ArrayConsumer.java
index 2f18b8a416d34..4676e8204eed4 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ArrayConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ArrayConsumer.java
@@ -14,29 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.io.IOException;
 import java.sql.Array;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.complex.ListVector;
 
 /**
- * Consumer which consume array type values from {@link ResultSet}.
- * Write the data to {@link org.apache.arrow.vector.complex.ListVector}.
+ * Consumer which consume array type values from {@link ResultSet}. Write the data to {@link
+ * org.apache.arrow.vector.complex.ListVector}.
  */
 public abstract class ArrayConsumer extends BaseConsumer<ListVector> {
 
-  /**
-   * Creates a consumer for {@link ListVector}.
-   */
+  /** Creates a consumer for {@link ListVector}. */
   public static ArrayConsumer createConsumer(
-        ListVector vector, JdbcConsumer delegate, int index, boolean nullable) {
+      ListVector vector, JdbcConsumer delegate, int index, boolean nullable) {
     if (nullable) {
       return new ArrayConsumer.NullableArrayConsumer(vector, delegate, index);
     } else {
@@ -50,9 +46,7 @@ public static ArrayConsumer createConsumer(
 
   protected int innerVectorIndex = 0;
 
-  /**
-   * Instantiate a ArrayConsumer.
-   */
+  /** Instantiate a ArrayConsumer. */
   public ArrayConsumer(ListVector vector, JdbcConsumer delegate, int index) {
     super(vector, index);
     this.delegate = delegate;
@@ -81,14 +75,10 @@ void ensureInnerVectorCapacity(int targetCapacity) {
     }
   }
 
-  /**
-   * Nullable consumer for {@link ListVector}.
-   */
+  /** Nullable consumer for {@link ListVector}. */
   static class NullableArrayConsumer extends ArrayConsumer {
 
-    /**
-     * Instantiate a nullable array consumer.
-     */
+    /** Instantiate a nullable array consumer. */
     public NullableArrayConsumer(ListVector vector, JdbcConsumer delegate, int index) {
       super(vector, delegate, index);
     }
@@ -113,14 +103,10 @@ public void consume(ResultSet resultSet) throws SQLException, IOException {
     }
   }
 
-  /**
-   * Non-nullable consumer for {@link ListVector}.
-   */
+  /** Non-nullable consumer for {@link ListVector}. */
   static class NonNullableArrayConsumer extends ArrayConsumer {
 
-    /**
-     * Instantiate a nullable array consumer.
-     */
+    /** Instantiate a nullable array consumer. */
     public NonNullableArrayConsumer(ListVector vector, JdbcConsumer delegate, int index) {
       super(vector, delegate, index);
     }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BaseConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BaseConsumer.java
index 2db128d3e2b2d..9ca3c98a7eb98 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BaseConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BaseConsumer.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import org.apache.arrow.vector.ValueVector;
 
 /**
  * Base class for all consumers.
+ *
  * @param <V> vector type.
  */
 public abstract class BaseConsumer<V extends ValueVector> implements JdbcConsumer<V> {
@@ -33,6 +33,7 @@ public abstract class BaseConsumer<V extends ValueVector> implements JdbcConsume
 
   /**
    * Constructs a new consumer.
+   *
    * @param vector the underlying vector for the consumer.
    * @param index the column id for the consumer.
    */
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BigIntConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BigIntConsumer.java
index 19c8efa91719f..b7c547a9391b6 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BigIntConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BigIntConsumer.java
@@ -14,24 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.vector.BigIntVector;
 
 /**
- * Consumer which consume bigint type values from {@link ResultSet}.
- * Write the data to {@link org.apache.arrow.vector.BigIntVector}.
+ * Consumer which consume bigint type values from {@link ResultSet}. Write the data to {@link
+ * org.apache.arrow.vector.BigIntVector}.
  */
 public class BigIntConsumer {
 
-  /**
-   * Creates a consumer for {@link BigIntVector}.
-   */
-  public static JdbcConsumer<BigIntVector> createConsumer(BigIntVector vector, int index, boolean nullable) {
+  /** Creates a consumer for {@link BigIntVector}. */
+  public static JdbcConsumer<BigIntVector> createConsumer(
+      BigIntVector vector, int index, boolean nullable) {
     if (nullable) {
       return new NullableBigIntConsumer(vector, index);
     } else {
@@ -39,14 +36,10 @@ public static JdbcConsumer<BigIntVector> createConsumer(BigIntVector vector, int
     }
   }
 
-  /**
-   * Nullable consumer for big int.
-   */
+  /** Nullable consumer for big int. */
   static class NullableBigIntConsumer extends BaseConsumer<BigIntVector> {
 
-    /**
-     * Instantiate a BigIntConsumer.
-     */
+    /** Instantiate a BigIntConsumer. */
     public NullableBigIntConsumer(BigIntVector vector, int index) {
       super(vector, index);
     }
@@ -63,14 +56,10 @@ public void consume(ResultSet resultSet) throws SQLException {
     }
   }
 
-  /**
-   * Non-nullable consumer for big int.
-   */
+  /** Non-nullable consumer for big int. */
   static class NonNullableBigIntConsumer extends BaseConsumer<BigIntVector> {
 
-    /**
-     * Instantiate a BigIntConsumer.
-     */
+    /** Instantiate a BigIntConsumer. */
     public NonNullableBigIntConsumer(BigIntVector vector, int index) {
       super(vector, index);
     }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumer.java
index 8c5f61169d405..edbc6360df6bf 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumer.java
@@ -14,27 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.vector.BitVectorHelper;
 import org.apache.arrow.vector.VarBinaryVector;
 
 /**
- * Consumer which consume binary type values from {@link ResultSet}.
- * Write the data to {@link org.apache.arrow.vector.VarBinaryVector}.
+ * Consumer which consume binary type values from {@link ResultSet}. Write the data to {@link
+ * org.apache.arrow.vector.VarBinaryVector}.
  */
 public abstract class BinaryConsumer extends BaseConsumer<VarBinaryVector> {
 
-  /**
-   * Creates a consumer for {@link VarBinaryVector}.
-   */
+  /** Creates a consumer for {@link VarBinaryVector}. */
   public static BinaryConsumer createConsumer(VarBinaryVector vector, int index, boolean nullable) {
     if (nullable) {
       return new NullableBinaryConsumer(vector, index);
@@ -45,9 +41,7 @@ public static BinaryConsumer createConsumer(VarBinaryVector vector, int index, b
 
   private final byte[] reuseBytes = new byte[1024];
 
-  /**
-   * Instantiate a BinaryConsumer.
-   */
+  /** Instantiate a BinaryConsumer. */
   public BinaryConsumer(VarBinaryVector vector, int index) {
     super(vector, index);
     if (vector != null) {
@@ -55,9 +49,7 @@ public BinaryConsumer(VarBinaryVector vector, int index) {
     }
   }
 
-  /**
-   * consume a InputStream.
-   */
+  /** consume a InputStream. */
   public void consume(InputStream is) throws IOException {
     if (is != null) {
       while (currentIndex >= vector.getValueCapacity()) {
@@ -74,7 +66,8 @@ public void consume(InputStream is) throws IOException {
         vector.getDataBuffer().setBytes(startOffset + dataLength, reuseBytes, 0, read);
         dataLength += read;
       }
-      offsetBuffer.setInt((currentIndex + 1) * VarBinaryVector.OFFSET_WIDTH, startOffset + dataLength);
+      offsetBuffer.setInt(
+          (currentIndex + 1) * ((long) VarBinaryVector.OFFSET_WIDTH), startOffset + dataLength);
       BitVectorHelper.setBit(vector.getValidityBuffer(), currentIndex);
       vector.setLastSet(currentIndex);
     }
@@ -91,14 +84,10 @@ public void resetValueVector(VarBinaryVector vector) {
     this.currentIndex = 0;
   }
 
-  /**
-   * Consumer for nullable binary data.
-   */
+  /** Consumer for nullable binary data. */
   static class NullableBinaryConsumer extends BinaryConsumer {
-    
-    /**
-     * Instantiate a BinaryConsumer.
-     */
+
+    /** Instantiate a BinaryConsumer. */
     public NullableBinaryConsumer(VarBinaryVector vector, int index) {
       super(vector, index);
     }
@@ -113,14 +102,10 @@ public void consume(ResultSet resultSet) throws SQLException, IOException {
     }
   }
 
-  /**
-   * Consumer for non-nullable binary data.
-   */
+  /** Consumer for non-nullable binary data. */
   static class NonNullableBinaryConsumer extends BinaryConsumer {
 
-    /**
-     * Instantiate a BinaryConsumer.
-     */
+    /** Instantiate a BinaryConsumer. */
     public NonNullableBinaryConsumer(VarBinaryVector vector, int index) {
       super(vector, index);
     }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BitConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BitConsumer.java
index d2d94d0a40e2f..287b9509b5054 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BitConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BitConsumer.java
@@ -14,24 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.vector.BitVector;
 
 /**
- * Consumer which consume bit type values from {@link ResultSet}.
- * Write the data to {@link BitVector}.
+ * Consumer which consume bit type values from {@link ResultSet}. Write the data to {@link
+ * BitVector}.
  */
 public class BitConsumer {
 
-  /**
-   * Creates a consumer for {@link BitVector}.
-   */
-  public static JdbcConsumer<BitVector> createConsumer(BitVector vector, int index, boolean nullable) {
+  /** Creates a consumer for {@link BitVector}. */
+  public static JdbcConsumer<BitVector> createConsumer(
+      BitVector vector, int index, boolean nullable) {
     if (nullable) {
       return new NullableBitConsumer(vector, index);
     } else {
@@ -39,14 +36,10 @@ public static JdbcConsumer<BitVector> createConsumer(BitVector vector, int index
     }
   }
 
-  /**
-   * Nullable consumer for {@link BitVector}.
-   */
+  /** Nullable consumer for {@link BitVector}. */
   static class NullableBitConsumer extends BaseConsumer<BitVector> {
 
-    /**
-     * Instantiate a BitConsumer.
-     */
+    /** Instantiate a BitConsumer. */
     public NullableBitConsumer(BitVector vector, int index) {
       super(vector, index);
     }
@@ -63,14 +56,10 @@ public void consume(ResultSet resultSet) throws SQLException {
     }
   }
 
-  /**
-   * Non-nullable consumer for {@link BitVector}.
-   */
+  /** Non-nullable consumer for {@link BitVector}. */
   static class NonNullableBitConsumer extends BaseConsumer<BitVector> {
 
-    /**
-     * Instantiate a BitConsumer.
-     */
+    /** Instantiate a BitConsumer. */
     public NonNullableBitConsumer(BitVector vector, int index) {
       super(vector, index);
     }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BlobConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BlobConsumer.java
index e57ecdf91707a..a4fc789494e0f 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BlobConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BlobConsumer.java
@@ -14,19 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.io.IOException;
 import java.sql.Blob;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.vector.VarBinaryVector;
 
 /**
- * Consumer which consume blob type values from {@link ResultSet}.
- * Write the data to {@link VarBinaryVector}.
+ * Consumer which consume blob type values from {@link ResultSet}. Write the data to {@link
+ * VarBinaryVector}.
  */
 public class BlobConsumer extends BaseConsumer<VarBinaryVector> {
 
@@ -34,17 +32,12 @@ public class BlobConsumer extends BaseConsumer<VarBinaryVector> {
 
   private final boolean nullable;
 
-  /**
-   * Creates a consumer for {@link VarBinaryVector}.
-   */
-  public static BlobConsumer createConsumer(
-          BinaryConsumer delegate, int index, boolean nullable) {
+  /** Creates a consumer for {@link VarBinaryVector}. */
+  public static BlobConsumer createConsumer(BinaryConsumer delegate, int index, boolean nullable) {
     return new BlobConsumer(delegate, index, nullable);
   }
 
-  /**
-   * Instantiate a BlobConsumer.
-   */
+  /** Instantiate a BlobConsumer. */
   public BlobConsumer(BinaryConsumer delegate, int index, boolean nullable) {
     super(null, index);
     this.delegate = delegate;
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ClobConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ClobConsumer.java
index a52d9b73b4db0..7deba1cbffebd 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ClobConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ClobConsumer.java
@@ -14,28 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.nio.charset.StandardCharsets;
 import java.sql.Clob;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.util.MemoryUtil;
 import org.apache.arrow.vector.BitVectorHelper;
 import org.apache.arrow.vector.VarCharVector;
 
 /**
- * Consumer which consume clob type values from {@link ResultSet}.
- * Write the data to {@link org.apache.arrow.vector.VarCharVector}.
+ * Consumer which consume clob type values from {@link ResultSet}. Write the data to {@link
+ * org.apache.arrow.vector.VarCharVector}.
  */
 public abstract class ClobConsumer extends BaseConsumer<VarCharVector> {
 
-  /**
-   * Creates a consumer for {@link VarCharVector}.
-   */
+  /** Creates a consumer for {@link VarCharVector}. */
   public static ClobConsumer createConsumer(VarCharVector vector, int index, boolean nullable) {
     if (nullable) {
       return new NullableClobConsumer(vector, index);
@@ -46,9 +42,7 @@ public static ClobConsumer createConsumer(VarCharVector vector, int index, boole
 
   private static final int BUFFER_SIZE = 256;
 
-  /**
-   * Instantiate a ClobConsumer.
-   */
+  /** Instantiate a ClobConsumer. */
   public ClobConsumer(VarCharVector vector, int index) {
     super(vector, index);
     if (vector != null) {
@@ -63,14 +57,10 @@ public void resetValueVector(VarCharVector vector) {
     this.currentIndex = 0;
   }
 
-  /**
-   * Nullable consumer for clob data.
-   */
+  /** Nullable consumer for clob data. */
   static class NullableClobConsumer extends ClobConsumer {
-    
-    /**
-     * Instantiate a ClobConsumer.
-     */
+
+    /** Instantiate a ClobConsumer. */
     public NullableClobConsumer(VarCharVector vector, int index) {
       super(vector, index);
     }
@@ -88,7 +78,7 @@ public void consume(ResultSet resultSet) throws SQLException {
 
           ArrowBuf dataBuffer = vector.getDataBuffer();
           ArrowBuf offsetBuffer = vector.getOffsetBuffer();
-          int startIndex = offsetBuffer.getInt(currentIndex * 4);
+          int startIndex = offsetBuffer.getInt(currentIndex * 4L);
           while (read <= length) {
             String str = clob.getSubString(read, readSize);
             byte[] bytes = str.getBytes(StandardCharsets.UTF_8);
@@ -97,16 +87,16 @@ public void consume(ResultSet resultSet) throws SQLException {
               vector.reallocDataBuffer();
             }
             MemoryUtil.UNSAFE.copyMemory(
-                    bytes,
-                    MemoryUtil.BYTE_ARRAY_BASE_OFFSET,
-                    null,
-                    dataBuffer.memoryAddress() + startIndex + totalBytes,
-                    bytes.length);
+                bytes,
+                MemoryUtil.BYTE_ARRAY_BASE_OFFSET,
+                null,
+                dataBuffer.memoryAddress() + startIndex + totalBytes,
+                bytes.length);
 
             totalBytes += bytes.length;
             read += readSize;
           }
-          offsetBuffer.setInt((currentIndex + 1) * 4, startIndex + totalBytes);
+          offsetBuffer.setInt((currentIndex + 1) * 4L, startIndex + totalBytes);
           BitVectorHelper.setBit(vector.getValidityBuffer(), currentIndex);
           vector.setLastSet(currentIndex);
         }
@@ -115,14 +105,10 @@ public void consume(ResultSet resultSet) throws SQLException {
     }
   }
 
-  /**
-   * Non-nullable consumer for clob data.
-   */
+  /** Non-nullable consumer for clob data. */
   static class NonNullableClobConsumer extends ClobConsumer {
 
-    /**
-     * Instantiate a ClobConsumer.
-     */
+    /** Instantiate a ClobConsumer. */
     public NonNullableClobConsumer(VarCharVector vector, int index) {
       super(vector, index);
     }
@@ -139,7 +125,7 @@ public void consume(ResultSet resultSet) throws SQLException {
 
         ArrowBuf dataBuffer = vector.getDataBuffer();
         ArrowBuf offsetBuffer = vector.getOffsetBuffer();
-        int startIndex = offsetBuffer.getInt(currentIndex * 4);
+        int startIndex = offsetBuffer.getInt(currentIndex * 4L);
         while (read <= length) {
           String str = clob.getSubString(read, readSize);
           byte[] bytes = str.getBytes(StandardCharsets.UTF_8);
@@ -148,20 +134,20 @@ public void consume(ResultSet resultSet) throws SQLException {
             vector.reallocDataBuffer();
           }
           MemoryUtil.UNSAFE.copyMemory(
-                  bytes,
-                  MemoryUtil.BYTE_ARRAY_BASE_OFFSET,
-                  null,
-                  dataBuffer.memoryAddress() + startIndex + totalBytes,
-                  bytes.length);
+              bytes,
+              MemoryUtil.BYTE_ARRAY_BASE_OFFSET,
+              null,
+              dataBuffer.memoryAddress() + startIndex + totalBytes,
+              bytes.length);
 
           totalBytes += bytes.length;
           read += readSize;
         }
-        offsetBuffer.setInt((currentIndex + 1) * 4, startIndex + totalBytes);
+        offsetBuffer.setInt((currentIndex + 1) * 4L, startIndex + totalBytes);
         BitVectorHelper.setBit(vector.getValidityBuffer(), currentIndex);
         vector.setLastSet(currentIndex);
       }
-    
+
       currentIndex++;
     }
   }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/CompositeJdbcConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/CompositeJdbcConsumer.java
index e6d780956d538..2366116fd0d18 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/CompositeJdbcConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/CompositeJdbcConsumer.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.io.IOException;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.adapter.jdbc.JdbcFieldInfo;
 import org.apache.arrow.adapter.jdbc.consumer.exceptions.JdbcConsumerException;
 import org.apache.arrow.util.AutoCloseables;
@@ -28,17 +26,12 @@
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 
-/**
- * Composite consumer which hold all consumers.
- * It manages the consume and cleanup process.
- */
+/** Composite consumer which hold all consumers. It manages the consume and cleanup process. */
 public class CompositeJdbcConsumer implements JdbcConsumer {
 
   private final JdbcConsumer[] consumers;
 
-  /**
-   * Construct an instance.
-   */
+  /** Construct an instance. */
   public CompositeJdbcConsumer(JdbcConsumer[] consumers) {
     this.consumers = consumers;
   }
@@ -51,9 +44,11 @@ public void consume(ResultSet rs) throws SQLException, IOException {
       } catch (Exception e) {
         if (consumers[i] instanceof BaseConsumer) {
           BaseConsumer consumer = (BaseConsumer) consumers[i];
-          JdbcFieldInfo fieldInfo = new JdbcFieldInfo(rs.getMetaData(), consumer.columnIndexInResultSet);
+          JdbcFieldInfo fieldInfo =
+              new JdbcFieldInfo(rs.getMetaData(), consumer.columnIndexInResultSet);
           ArrowType arrowType = consumer.vector.getMinorType().getType();
-          throw new JdbcConsumerException("Exception while consuming JDBC value", e, fieldInfo, arrowType);
+          throw new JdbcConsumerException(
+              "Exception while consuming JDBC value", e, fieldInfo, arrowType);
         } else {
           throw e;
         }
@@ -70,17 +65,12 @@ public void close() {
     } catch (Exception e) {
       throw new RuntimeException("Error occurred while releasing resources.", e);
     }
-
   }
 
   @Override
-  public void resetValueVector(ValueVector vector) {
+  public void resetValueVector(ValueVector vector) {}
 
-  }
-
-  /**
-   * Reset inner consumers through vectors in the vector schema root.
-   */
+  /** Reset inner consumers through vectors in the vector schema root. */
   public void resetVectorSchemaRoot(VectorSchemaRoot root) {
     assert root.getFieldVectors().size() == consumers.length;
     for (int i = 0; i < consumers.length; i++) {
@@ -88,4 +78,3 @@ public void resetVectorSchemaRoot(VectorSchemaRoot root) {
     }
   }
 }
-
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DateConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DateConsumer.java
index b9b83daccc25a..c271b900682a1 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DateConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DateConsumer.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.sql.Date;
@@ -22,19 +21,16 @@
 import java.sql.SQLException;
 import java.util.Calendar;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.vector.DateDayVector;
 import org.apache.arrow.vector.DateMilliVector;
 
 /**
- * Consumer which consume date type values from {@link ResultSet}.
- * Write the data to {@link org.apache.arrow.vector.DateDayVector}.
+ * Consumer which consume date type values from {@link ResultSet}. Write the data to {@link
+ * org.apache.arrow.vector.DateDayVector}.
  */
 public class DateConsumer {
 
-  /**
-   * Creates a consumer for {@link DateMilliVector}.
-   */
+  /** Creates a consumer for {@link DateMilliVector}. */
   public static JdbcConsumer<DateDayVector> createConsumer(
       DateDayVector vector, int index, boolean nullable, Calendar calendar) {
     if (nullable) {
@@ -44,23 +40,17 @@ public static JdbcConsumer<DateDayVector> createConsumer(
     }
   }
 
-  /**
-   * Nullable consumer for date.
-   */
+  /** Nullable consumer for date. */
   static class NullableDateConsumer extends BaseConsumer<DateDayVector> {
 
     protected final Calendar calendar;
 
-    /**
-     * Instantiate a DateConsumer.
-     */
+    /** Instantiate a DateConsumer. */
     public NullableDateConsumer(DateDayVector vector, int index) {
-      this(vector, index, /* calendar */null);
+      this(vector, index, /* calendar */ null);
     }
 
-    /**
-     * Instantiate a DateConsumer.
-     */
+    /** Instantiate a DateConsumer. */
     public NullableDateConsumer(DateDayVector vector, int index, Calendar calendar) {
       super(vector, index);
       this.calendar = calendar;
@@ -68,8 +58,10 @@ public NullableDateConsumer(DateDayVector vector, int index, Calendar calendar)
 
     @Override
     public void consume(ResultSet resultSet) throws SQLException {
-      Date date = calendar == null ? resultSet.getDate(columnIndexInResultSet) :
-          resultSet.getDate(columnIndexInResultSet, calendar);
+      Date date =
+          calendar == null
+              ? resultSet.getDate(columnIndexInResultSet)
+              : resultSet.getDate(columnIndexInResultSet, calendar);
       if (!resultSet.wasNull()) {
         // for fixed width vectors, we have allocated enough memory proactively,
         // so there is no need to call the setSafe method here.
@@ -79,23 +71,17 @@ public void consume(ResultSet resultSet) throws SQLException {
     }
   }
 
-  /**
-   * Non-nullable consumer for date.
-   */
+  /** Non-nullable consumer for date. */
   static class NonNullableDateConsumer extends BaseConsumer<DateDayVector> {
 
     protected final Calendar calendar;
 
-    /**
-     * Instantiate a DateConsumer.
-     */
+    /** Instantiate a DateConsumer. */
     public NonNullableDateConsumer(DateDayVector vector, int index) {
-      this(vector, index, /* calendar */null);
+      this(vector, index, /* calendar */ null);
     }
 
-    /**
-     * Instantiate a DateConsumer.
-     */
+    /** Instantiate a DateConsumer. */
     public NonNullableDateConsumer(DateDayVector vector, int index, Calendar calendar) {
       super(vector, index);
       this.calendar = calendar;
@@ -103,8 +89,10 @@ public NonNullableDateConsumer(DateDayVector vector, int index, Calendar calenda
 
     @Override
     public void consume(ResultSet resultSet) throws SQLException {
-      Date date = calendar == null ? resultSet.getDate(columnIndexInResultSet) :
-          resultSet.getDate(columnIndexInResultSet, calendar);
+      Date date =
+          calendar == null
+              ? resultSet.getDate(columnIndexInResultSet)
+              : resultSet.getDate(columnIndexInResultSet, calendar);
       // for fixed width vectors, we have allocated enough memory proactively,
       // so there is no need to call the setSafe method here.
       vector.set(currentIndex, Math.toIntExact(TimeUnit.MILLISECONDS.toDays(date.getTime())));
@@ -112,5 +100,3 @@ public void consume(ResultSet resultSet) throws SQLException {
     }
   }
 }
-
-
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/Decimal256Consumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/Decimal256Consumer.java
index ad00d9b5a2492..eb33ea5038b98 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/Decimal256Consumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/Decimal256Consumer.java
@@ -14,19 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.vector.Decimal256Vector;
 
 /**
- * Consumer which consume decimal type values from {@link ResultSet}.
- * Write the data to {@link org.apache.arrow.vector.Decimal256Vector}.
+ * Consumer which consume decimal type values from {@link ResultSet}. Write the data to {@link
+ * org.apache.arrow.vector.Decimal256Vector}.
  */
 public abstract class Decimal256Consumer extends BaseConsumer<Decimal256Vector> {
   private final RoundingMode bigDecimalRoundingMode;
@@ -36,7 +34,7 @@ public abstract class Decimal256Consumer extends BaseConsumer<Decimal256Vector>
    * Constructs a new consumer.
    *
    * @param vector the underlying vector for the consumer.
-   * @param index  the column id for the consumer.
+   * @param index the column id for the consumer.
    */
   public Decimal256Consumer(Decimal256Vector vector, int index) {
     this(vector, index, null);
@@ -44,27 +42,23 @@ public Decimal256Consumer(Decimal256Vector vector, int index) {
 
   /**
    * Constructs a new consumer, with optional coercibility.
+   *
    * @param vector the underlying vector for the consumer.
    * @param index the column index for the consumer.
-   * @param bigDecimalRoundingMode java.math.RoundingMode to be applied if the BigDecimal scale does not match that
-   *                               of the target vector.  Set to null to retain strict matching behavior (scale of
-   *                               source and target vector must match exactly).
+   * @param bigDecimalRoundingMode java.math.RoundingMode to be applied if the BigDecimal scale does
+   *     not match that of the target vector. Set to null to retain strict matching behavior (scale
+   *     of source and target vector must match exactly).
    */
-  public Decimal256Consumer(Decimal256Vector vector, int index, RoundingMode bigDecimalRoundingMode) {
+  public Decimal256Consumer(
+      Decimal256Vector vector, int index, RoundingMode bigDecimalRoundingMode) {
     super(vector, index);
     this.bigDecimalRoundingMode = bigDecimalRoundingMode;
     this.scale = vector.getScale();
   }
 
-  /**
-   * Creates a consumer for {@link Decimal256Vector}.
-   */
+  /** Creates a consumer for {@link Decimal256Vector}. */
   public static JdbcConsumer<Decimal256Vector> createConsumer(
-          Decimal256Vector vector,
-          int index,
-          boolean nullable,
-          RoundingMode bigDecimalRoundingMode
-  ) {
+      Decimal256Vector vector, int index, boolean nullable, RoundingMode bigDecimalRoundingMode) {
     if (nullable) {
       return new NullableDecimal256Consumer(vector, index, bigDecimalRoundingMode);
     } else {
@@ -79,16 +73,12 @@ protected void set(BigDecimal value) {
     vector.set(currentIndex, value);
   }
 
-
-  /**
-   * Consumer for nullable decimal.
-   */
+  /** Consumer for nullable decimal. */
   static class NullableDecimal256Consumer extends Decimal256Consumer {
 
-    /**
-     * Instantiate a Decimal256Consumer.
-     */
-    public NullableDecimal256Consumer(Decimal256Vector vector, int index, RoundingMode bigDecimalRoundingMode) {
+    /** Instantiate a Decimal256Consumer. */
+    public NullableDecimal256Consumer(
+        Decimal256Vector vector, int index, RoundingMode bigDecimalRoundingMode) {
       super(vector, index, bigDecimalRoundingMode);
     }
 
@@ -104,15 +94,12 @@ public void consume(ResultSet resultSet) throws SQLException {
     }
   }
 
-  /**
-   * Consumer for non-nullable decimal.
-   */
+  /** Consumer for non-nullable decimal. */
   static class NonNullableDecimal256Consumer extends Decimal256Consumer {
 
-    /**
-     * Instantiate a Decimal256Consumer.
-     */
-    public NonNullableDecimal256Consumer(Decimal256Vector vector, int index, RoundingMode bigDecimalRoundingMode) {
+    /** Instantiate a Decimal256Consumer. */
+    public NonNullableDecimal256Consumer(
+        Decimal256Vector vector, int index, RoundingMode bigDecimalRoundingMode) {
       super(vector, index, bigDecimalRoundingMode);
     }
 
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DecimalConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DecimalConsumer.java
index bed96dda8b65d..05b4d27de1022 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DecimalConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DecimalConsumer.java
@@ -14,19 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.vector.DecimalVector;
 
 /**
- * Consumer which consume decimal type values from {@link ResultSet}.
- * Write the data to {@link org.apache.arrow.vector.DecimalVector}.
+ * Consumer which consume decimal type values from {@link ResultSet}. Write the data to {@link
+ * org.apache.arrow.vector.DecimalVector}.
  */
 public abstract class DecimalConsumer extends BaseConsumer<DecimalVector> {
   private final RoundingMode bigDecimalRoundingMode;
@@ -36,7 +34,7 @@ public abstract class DecimalConsumer extends BaseConsumer<DecimalVector> {
    * Constructs a new consumer.
    *
    * @param vector the underlying vector for the consumer.
-   * @param index  the column id for the consumer.
+   * @param index the column id for the consumer.
    */
   public DecimalConsumer(DecimalVector vector, int index) {
     this(vector, index, null);
@@ -44,11 +42,12 @@ public DecimalConsumer(DecimalVector vector, int index) {
 
   /**
    * Constructs a new consumer, with optional coercibility.
+   *
    * @param vector the underlying vector for the consumer.
    * @param index the column index for the consumer.
-   * @param bigDecimalRoundingMode java.math.RoundingMode to be applied if the BigDecimal scale does not match that
-   *                               of the target vector.  Set to null to retain strict matching behavior (scale of
-   *                               source and target vector must match exactly).
+   * @param bigDecimalRoundingMode java.math.RoundingMode to be applied if the BigDecimal scale does
+   *     not match that of the target vector. Set to null to retain strict matching behavior (scale
+   *     of source and target vector must match exactly).
    */
   public DecimalConsumer(DecimalVector vector, int index, RoundingMode bigDecimalRoundingMode) {
     super(vector, index);
@@ -56,15 +55,9 @@ public DecimalConsumer(DecimalVector vector, int index, RoundingMode bigDecimalR
     this.scale = vector.getScale();
   }
 
-  /**
-   * Creates a consumer for {@link DecimalVector}.
-   */
+  /** Creates a consumer for {@link DecimalVector}. */
   public static JdbcConsumer<DecimalVector> createConsumer(
-          DecimalVector vector,
-          int index,
-          boolean nullable,
-          RoundingMode bigDecimalRoundingMode
-  ) {
+      DecimalVector vector, int index, boolean nullable, RoundingMode bigDecimalRoundingMode) {
     if (nullable) {
       return new NullableDecimalConsumer(vector, index, bigDecimalRoundingMode);
     } else {
@@ -79,16 +72,12 @@ protected void set(BigDecimal value) {
     vector.set(currentIndex, value);
   }
 
-
-  /**
-   * Consumer for nullable decimal.
-   */
+  /** Consumer for nullable decimal. */
   static class NullableDecimalConsumer extends DecimalConsumer {
 
-    /**
-     * Instantiate a DecimalConsumer.
-     */
-    public NullableDecimalConsumer(DecimalVector vector, int index, RoundingMode bigDecimalRoundingMode) {
+    /** Instantiate a DecimalConsumer. */
+    public NullableDecimalConsumer(
+        DecimalVector vector, int index, RoundingMode bigDecimalRoundingMode) {
       super(vector, index, bigDecimalRoundingMode);
     }
 
@@ -104,15 +93,12 @@ public void consume(ResultSet resultSet) throws SQLException {
     }
   }
 
-  /**
-   * Consumer for non-nullable decimal.
-   */
+  /** Consumer for non-nullable decimal. */
   static class NonNullableDecimalConsumer extends DecimalConsumer {
 
-    /**
-     * Instantiate a DecimalConsumer.
-     */
-    public NonNullableDecimalConsumer(DecimalVector vector, int index, RoundingMode bigDecimalRoundingMode) {
+    /** Instantiate a DecimalConsumer. */
+    public NonNullableDecimalConsumer(
+        DecimalVector vector, int index, RoundingMode bigDecimalRoundingMode) {
       super(vector, index, bigDecimalRoundingMode);
     }
 
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DoubleConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DoubleConsumer.java
index e3db95d1535af..9cd31e9245472 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DoubleConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DoubleConsumer.java
@@ -14,24 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.vector.Float8Vector;
 
 /**
- * Consumer which consume double type values from {@link ResultSet}.
- * Write the data to {@link org.apache.arrow.vector.Float8Vector}.
+ * Consumer which consume double type values from {@link ResultSet}. Write the data to {@link
+ * org.apache.arrow.vector.Float8Vector}.
  */
 public class DoubleConsumer {
 
-  /**
-   * Creates a consumer for {@link Float8Vector}.
-   */
-  public static JdbcConsumer<Float8Vector> createConsumer(Float8Vector vector, int index, boolean nullable) {
+  /** Creates a consumer for {@link Float8Vector}. */
+  public static JdbcConsumer<Float8Vector> createConsumer(
+      Float8Vector vector, int index, boolean nullable) {
     if (nullable) {
       return new NullableDoubleConsumer(vector, index);
     } else {
@@ -39,14 +36,10 @@ public static JdbcConsumer<Float8Vector> createConsumer(Float8Vector vector, int
     }
   }
 
-  /**
-   * Nullable double consumer.
-   */
+  /** Nullable double consumer. */
   static class NullableDoubleConsumer extends BaseConsumer<Float8Vector> {
 
-    /**
-     * Instantiate a DoubleConsumer.
-     */
+    /** Instantiate a DoubleConsumer. */
     public NullableDoubleConsumer(Float8Vector vector, int index) {
       super(vector, index);
     }
@@ -63,14 +56,10 @@ public void consume(ResultSet resultSet) throws SQLException {
     }
   }
 
-  /**
-   * Non-nullable double consumer.
-   */
+  /** Non-nullable double consumer. */
   static class NonNullableDoubleConsumer extends BaseConsumer<Float8Vector> {
 
-    /**
-     * Instantiate a DoubleConsumer.
-     */
+    /** Instantiate a DoubleConsumer. */
     public NonNullableDoubleConsumer(Float8Vector vector, int index) {
       super(vector, index);
     }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/FloatConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/FloatConsumer.java
index 830348fe94c6b..0f16a68da883e 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/FloatConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/FloatConsumer.java
@@ -14,24 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.vector.Float4Vector;
 
 /**
- * Consumer which consume float type values from {@link ResultSet}.
- * Write the data to {@link org.apache.arrow.vector.Float4Vector}.
+ * Consumer which consume float type values from {@link ResultSet}. Write the data to {@link
+ * org.apache.arrow.vector.Float4Vector}.
  */
 public class FloatConsumer {
 
-  /**
-   * Creates a consumer for {@link Float4Vector}.
-   */
-  public static JdbcConsumer<Float4Vector> createConsumer(Float4Vector vector, int index, boolean nullable) {
+  /** Creates a consumer for {@link Float4Vector}. */
+  public static JdbcConsumer<Float4Vector> createConsumer(
+      Float4Vector vector, int index, boolean nullable) {
     if (nullable) {
       return new NullableFloatConsumer(vector, index);
     } else {
@@ -39,14 +36,10 @@ public static JdbcConsumer<Float4Vector> createConsumer(Float4Vector vector, int
     }
   }
 
-  /**
-   * Nullable float consumer.
-   */
+  /** Nullable float consumer. */
   static class NullableFloatConsumer extends BaseConsumer<Float4Vector> {
 
-    /**
-     * Instantiate a FloatConsumer.
-     */
+    /** Instantiate a FloatConsumer. */
     public NullableFloatConsumer(Float4Vector vector, int index) {
       super(vector, index);
     }
@@ -63,14 +56,10 @@ public void consume(ResultSet resultSet) throws SQLException {
     }
   }
 
-  /**
-   * Non-nullable float consumer.
-   */
+  /** Non-nullable float consumer. */
   static class NonNullableFloatConsumer extends BaseConsumer<Float4Vector> {
 
-    /**
-     * Instantiate a FloatConsumer.
-     */
+    /** Instantiate a FloatConsumer. */
     public NonNullableFloatConsumer(Float4Vector vector, int index) {
       super(vector, index);
     }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/IntConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/IntConsumer.java
index 4e537d682ff7c..302be697fbf07 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/IntConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/IntConsumer.java
@@ -14,24 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.vector.IntVector;
 
 /**
- * Consumer which consume int type values from {@link ResultSet}.
- * Write the data to {@link org.apache.arrow.vector.IntVector}.
+ * Consumer which consume int type values from {@link ResultSet}. Write the data to {@link
+ * org.apache.arrow.vector.IntVector}.
  */
 public class IntConsumer {
 
-  /**
-   * Creates a consumer for {@link IntVector}.
-   */
-  public static JdbcConsumer<IntVector> createConsumer(IntVector vector, int index, boolean nullable) {
+  /** Creates a consumer for {@link IntVector}. */
+  public static JdbcConsumer<IntVector> createConsumer(
+      IntVector vector, int index, boolean nullable) {
     if (nullable) {
       return new NullableIntConsumer(vector, index);
     } else {
@@ -39,14 +36,10 @@ public static JdbcConsumer<IntVector> createConsumer(IntVector vector, int index
     }
   }
 
-  /**
-   * Nullable consumer for int.
-   */
+  /** Nullable consumer for int. */
   static class NullableIntConsumer extends BaseConsumer<IntVector> {
 
-    /**
-     * Instantiate a IntConsumer.
-     */
+    /** Instantiate a IntConsumer. */
     public NullableIntConsumer(IntVector vector, int index) {
       super(vector, index);
     }
@@ -63,14 +56,10 @@ public void consume(ResultSet resultSet) throws SQLException {
     }
   }
 
-  /**
-   * Non-nullable consumer for int.
-   */
+  /** Non-nullable consumer for int. */
   static class NonNullableIntConsumer extends BaseConsumer<IntVector> {
 
-    /**
-     * Instantiate a IntConsumer.
-     */
+    /** Instantiate a IntConsumer. */
     public NonNullableIntConsumer(IntVector vector, int index) {
       super(vector, index);
     }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/JdbcConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/JdbcConsumer.java
index 480dfe3a1c57f..1ec6ad7eb9266 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/JdbcConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/JdbcConsumer.java
@@ -14,33 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.io.IOException;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.vector.ValueVector;
 
 /**
  * An abstraction that is used to consume values from {@link ResultSet}.
+ *
  * @param <T> The vector within consumer or its delegate, used for partially consume purpose.
  */
 public interface JdbcConsumer<T extends ValueVector> extends AutoCloseable {
 
-  /**
-   * Consume a specific type value from {@link ResultSet} and write it to vector.
-   */
+  /** Consume a specific type value from {@link ResultSet} and write it to vector. */
   void consume(ResultSet resultSet) throws SQLException, IOException;
 
-  /**
-   * Close this consumer, do some clean work such as clear reuse ArrowBuf.
-   */
+  /** Close this consumer, do some clean work such as clear reuse ArrowBuf. */
+  @Override
   void close() throws Exception;
 
-  /**
-   * Reset the vector within consumer for partial read purpose.
-   */
+  /** Reset the vector within consumer for partial read purpose. */
   void resetValueVector(T vector);
 }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/MapConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/MapConsumer.java
index 07a071bfc096e..6223650ff2c04 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/MapConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/MapConsumer.java
@@ -14,46 +14,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Map;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.MapVector;
 import org.apache.arrow.vector.complex.impl.UnionMapWriter;
 import org.apache.arrow.vector.util.ObjectMapperFactory;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
- * Consumer which consume map type values from {@link ResultSet}.
- * Write the data into {@link org.apache.arrow.vector.complex.MapVector}.
+ * Consumer which consume map type values from {@link ResultSet}. Write the data into {@link
+ * org.apache.arrow.vector.complex.MapVector}.
  */
 public class MapConsumer extends BaseConsumer<MapVector> {
 
-
   private final UnionMapWriter writer;
   private final ObjectMapper objectMapper = ObjectMapperFactory.newObjectMapper();
-  private final TypeReference<Map<String, String>> typeReference = new TypeReference<Map<String, String>>() {};
+  private final TypeReference<Map<String, String>> typeReference =
+      new TypeReference<Map<String, String>>() {};
   private int currentRow;
 
-  /**
-   * Creates a consumer for {@link MapVector}.
-   */
+  /** Creates a consumer for {@link MapVector}. */
   public static MapConsumer createConsumer(MapVector mapVector, int index, boolean nullable) {
     return new MapConsumer(mapVector, index);
   }
 
-  /**
-   * Instantiate a MapConsumer.
-   */
+  /** Instantiate a MapConsumer. */
   public MapConsumer(MapVector vector, int index) {
     super(vector, index);
     writer = vector.getWriter();
@@ -69,7 +62,8 @@ public void consume(ResultSet resultSet) throws SQLException, IOException {
       } else if (map instanceof Map) {
         writeJavaMapIntoVector((Map<String, String>) map);
       } else {
-        throw new IllegalArgumentException("Unknown type of map type column from JDBC " + map.getClass().getName());
+        throw new IllegalArgumentException(
+            "Unknown type of map type column from JDBC " + map.getClass().getName());
       }
     } else {
       writer.writeNull();
@@ -79,26 +73,25 @@ public void consume(ResultSet resultSet) throws SQLException, IOException {
   private void writeJavaMapIntoVector(Map<String, String> map) {
     BufferAllocator allocator = vector.getAllocator();
     writer.startMap();
-    map.forEach((key, value) -> {
-      byte[] keyBytes = key.getBytes(StandardCharsets.UTF_8);
-      byte[] valueBytes = value != null ? value.getBytes(StandardCharsets.UTF_8) : null;
-      try (
-              ArrowBuf keyBuf = allocator.buffer(keyBytes.length);
-              ArrowBuf valueBuf = valueBytes != null ? allocator.buffer(valueBytes.length) : null;
-      ) {
-        writer.startEntry();
-        keyBuf.writeBytes(keyBytes);
-        writer.key().varChar().writeVarChar(0, keyBytes.length, keyBuf);
-        if (valueBytes != null) {
-          valueBuf.writeBytes(valueBytes);
-          writer.value().varChar().writeVarChar(0, valueBytes.length, valueBuf);
-        } else {
-          writer.value().varChar().writeNull();
-        }
-        writer.endEntry();
-      }
-    });
+    map.forEach(
+        (key, value) -> {
+          byte[] keyBytes = key.getBytes(StandardCharsets.UTF_8);
+          byte[] valueBytes = value != null ? value.getBytes(StandardCharsets.UTF_8) : null;
+          try (ArrowBuf keyBuf = allocator.buffer(keyBytes.length);
+              ArrowBuf valueBuf =
+                  valueBytes != null ? allocator.buffer(valueBytes.length) : null; ) {
+            writer.startEntry();
+            keyBuf.writeBytes(keyBytes);
+            writer.key().varChar().writeVarChar(0, keyBytes.length, keyBuf);
+            if (valueBytes != null) {
+              valueBuf.writeBytes(valueBytes);
+              writer.value().varChar().writeVarChar(0, valueBytes.length, valueBuf);
+            } else {
+              writer.value().varChar().writeNull();
+            }
+            writer.endEntry();
+          }
+        });
     writer.endMap();
   }
 }
-
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/NullConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/NullConsumer.java
index a79a029f45d06..9d7a760f697a7 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/NullConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/NullConsumer.java
@@ -14,17 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.vector.NullVector;
 
 /**
- * Consumer which consume null type values from ResultSet.
- * Corresponding to {@link org.apache.arrow.vector.NullVector}.
+ * Consumer which consume null type values from ResultSet. Corresponding to {@link
+ * org.apache.arrow.vector.NullVector}.
  */
 public class NullConsumer extends BaseConsumer<NullVector> {
 
@@ -33,6 +31,5 @@ public NullConsumer(NullVector vector) {
   }
 
   @Override
-  public void consume(ResultSet resultSet) throws SQLException {
-  }
+  public void consume(ResultSet resultSet) throws SQLException {}
 }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/SmallIntConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/SmallIntConsumer.java
index 2edb3605b177a..9f45c077ed0a8 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/SmallIntConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/SmallIntConsumer.java
@@ -14,24 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.vector.SmallIntVector;
 
 /**
- * Consumer which consume smallInt type values from {@link ResultSet}.
- * Write the data to {@link org.apache.arrow.vector.SmallIntVector}.
+ * Consumer which consume smallInt type values from {@link ResultSet}. Write the data to {@link
+ * org.apache.arrow.vector.SmallIntVector}.
  */
 public class SmallIntConsumer {
 
-  /**
-   * Creates a consumer for {@link SmallIntVector}.
-   */
-  public static BaseConsumer<SmallIntVector> createConsumer(SmallIntVector vector, int index, boolean nullable) {
+  /** Creates a consumer for {@link SmallIntVector}. */
+  public static BaseConsumer<SmallIntVector> createConsumer(
+      SmallIntVector vector, int index, boolean nullable) {
     if (nullable) {
       return new NullableSmallIntConsumer(vector, index);
     } else {
@@ -39,14 +36,10 @@ public static BaseConsumer<SmallIntVector> createConsumer(SmallIntVector vector,
     }
   }
 
-  /**
-   * Nullable consumer for small int.
-   */
+  /** Nullable consumer for small int. */
   static class NullableSmallIntConsumer extends BaseConsumer<SmallIntVector> {
 
-    /**
-     * Instantiate a SmallIntConsumer.
-     */
+    /** Instantiate a SmallIntConsumer. */
     public NullableSmallIntConsumer(SmallIntVector vector, int index) {
       super(vector, index);
     }
@@ -63,14 +56,10 @@ public void consume(ResultSet resultSet) throws SQLException {
     }
   }
 
-  /**
-   * Non-nullable consumer for small int.
-   */
+  /** Non-nullable consumer for small int. */
   static class NonNullableSmallIntConsumer extends BaseConsumer<SmallIntVector> {
 
-    /**
-     * Instantiate a SmallIntConsumer.
-     */
+    /** Instantiate a SmallIntConsumer. */
     public NonNullableSmallIntConsumer(SmallIntVector vector, int index) {
       super(vector, index);
     }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimeConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimeConsumer.java
index 4fa15ad79039e..bee19d0e4deab 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimeConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimeConsumer.java
@@ -14,27 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Time;
 import java.util.Calendar;
-
 import org.apache.arrow.vector.TimeMilliVector;
 
 /**
- * Consumer which consume time type values from {@link ResultSet}.
- * Write the data to {@link org.apache.arrow.vector.TimeMilliVector}.
+ * Consumer which consume time type values from {@link ResultSet}. Write the data to {@link
+ * org.apache.arrow.vector.TimeMilliVector}.
  */
 public abstract class TimeConsumer {
 
-  /**
-   * Creates a consumer for {@link TimeMilliVector}.
-   */
+  /** Creates a consumer for {@link TimeMilliVector}. */
   public static JdbcConsumer<TimeMilliVector> createConsumer(
-          TimeMilliVector vector, int index, boolean nullable, Calendar calendar) {
+      TimeMilliVector vector, int index, boolean nullable, Calendar calendar) {
     if (nullable) {
       return new NullableTimeConsumer(vector, index, calendar);
     } else {
@@ -42,23 +38,17 @@ public static JdbcConsumer<TimeMilliVector> createConsumer(
     }
   }
 
-  /**
-   * Nullable consumer for {@link TimeMilliVector}.
-   */
+  /** Nullable consumer for {@link TimeMilliVector}. */
   static class NullableTimeConsumer extends BaseConsumer<TimeMilliVector> {
 
     protected final Calendar calendar;
 
-    /**
-     * Instantiate a TimeConsumer.
-     */
+    /** Instantiate a TimeConsumer. */
     public NullableTimeConsumer(TimeMilliVector vector, int index) {
-      this(vector, index, /* calendar */null);
+      this(vector, index, /* calendar */ null);
     }
 
-    /**
-     * Instantiate a TimeConsumer.
-     */
+    /** Instantiate a TimeConsumer. */
     public NullableTimeConsumer(TimeMilliVector vector, int index, Calendar calendar) {
       super(vector, index);
       this.calendar = calendar;
@@ -66,8 +56,10 @@ public NullableTimeConsumer(TimeMilliVector vector, int index, Calendar calendar
 
     @Override
     public void consume(ResultSet resultSet) throws SQLException {
-      Time time = calendar == null ? resultSet.getTime(columnIndexInResultSet) :
-          resultSet.getTime(columnIndexInResultSet, calendar);
+      Time time =
+          calendar == null
+              ? resultSet.getTime(columnIndexInResultSet)
+              : resultSet.getTime(columnIndexInResultSet, calendar);
       if (!resultSet.wasNull()) {
         // for fixed width vectors, we have allocated enough memory proactively,
         // so there is no need to call the setSafe method here.
@@ -77,23 +69,17 @@ public void consume(ResultSet resultSet) throws SQLException {
     }
   }
 
-  /**
-   * Non-nullable consumer for {@link TimeMilliVector}.
-   */
+  /** Non-nullable consumer for {@link TimeMilliVector}. */
   static class NonNullableTimeConsumer extends BaseConsumer<TimeMilliVector> {
 
     protected final Calendar calendar;
 
-    /**
-     * Instantiate a TimeConsumer.
-     */
+    /** Instantiate a TimeConsumer. */
     public NonNullableTimeConsumer(TimeMilliVector vector, int index) {
-      this(vector, index, /* calendar */null);
+      this(vector, index, /* calendar */ null);
     }
 
-    /**
-     * Instantiate a TimeConsumer.
-     */
+    /** Instantiate a TimeConsumer. */
     public NonNullableTimeConsumer(TimeMilliVector vector, int index, Calendar calendar) {
       super(vector, index);
       this.calendar = calendar;
@@ -101,8 +87,10 @@ public NonNullableTimeConsumer(TimeMilliVector vector, int index, Calendar calen
 
     @Override
     public void consume(ResultSet resultSet) throws SQLException {
-      Time time = calendar == null ? resultSet.getTime(columnIndexInResultSet) :
-          resultSet.getTime(columnIndexInResultSet, calendar);
+      Time time =
+          calendar == null
+              ? resultSet.getTime(columnIndexInResultSet)
+              : resultSet.getTime(columnIndexInResultSet, calendar);
       // for fixed width vectors, we have allocated enough memory proactively,
       // so there is no need to call the setSafe method here.
       vector.set(currentIndex, (int) time.getTime());
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimestampConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimestampConsumer.java
index 3351e7e78a7e4..cc6269c21f04a 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimestampConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimestampConsumer.java
@@ -14,26 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
-
 import org.apache.arrow.vector.TimeStampMilliVector;
 
 /**
- * Consumer which consume timestamp type values from {@link ResultSet}.
- * Write the data to {@link TimeStampMilliVector}.
+ * Consumer which consume timestamp type values from {@link ResultSet}. Write the data to {@link
+ * TimeStampMilliVector}.
  */
 public abstract class TimestampConsumer {
 
-  /**
-   * Creates a consumer for {@link TimeStampMilliVector}.
-   */
+  /** Creates a consumer for {@link TimeStampMilliVector}. */
   public static JdbcConsumer<TimeStampMilliVector> createConsumer(
-          TimeStampMilliVector vector, int index, boolean nullable) {
+      TimeStampMilliVector vector, int index, boolean nullable) {
     if (nullable) {
       return new NullableTimestampConsumer(vector, index);
     } else {
@@ -41,14 +37,10 @@ public static JdbcConsumer<TimeStampMilliVector> createConsumer(
     }
   }
 
-  /**
-   * Nullable consumer for timestamp.
-   */
+  /** Nullable consumer for timestamp. */
   static class NullableTimestampConsumer extends BaseConsumer<TimeStampMilliVector> {
 
-    /**
-     * Instantiate a TimestampConsumer.
-     */
+    /** Instantiate a TimestampConsumer. */
     public NullableTimestampConsumer(TimeStampMilliVector vector, int index) {
       super(vector, index);
     }
@@ -65,14 +57,10 @@ public void consume(ResultSet resultSet) throws SQLException {
     }
   }
 
-  /**
-   * Non-nullable consumer for timestamp.
-   */
+  /** Non-nullable consumer for timestamp. */
   static class NonNullableTimestampConsumer extends BaseConsumer<TimeStampMilliVector> {
 
-    /**
-     * Instantiate a TimestampConsumer.
-     */
+    /** Instantiate a TimestampConsumer. */
     public NonNullableTimestampConsumer(TimeStampMilliVector vector, int index) {
       super(vector, index);
     }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimestampTZConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimestampTZConsumer.java
index f08671f0be61a..3e4911ac1a161 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimestampTZConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimestampTZConsumer.java
@@ -14,25 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.util.Calendar;
-
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.TimeStampMilliTZVector;
 
 /**
- * Consumer which consume timestamp (with time zone) type values from {@link ResultSet}.
- * Write the data to {@link TimeStampMilliTZVector}.
+ * Consumer which consume timestamp (with time zone) type values from {@link ResultSet}. Write the
+ * data to {@link TimeStampMilliTZVector}.
  */
 public class TimestampTZConsumer {
-  /**
-   * Creates a consumer for {@link TimeStampMilliTZVector}.
-   */
+  /** Creates a consumer for {@link TimeStampMilliTZVector}. */
   public static JdbcConsumer<TimeStampMilliTZVector> createConsumer(
       TimeStampMilliTZVector vector, int index, boolean nullable, Calendar calendar) {
     Preconditions.checkArgument(calendar != null, "Calendar cannot be null");
@@ -43,17 +39,14 @@ public static JdbcConsumer<TimeStampMilliTZVector> createConsumer(
     }
   }
 
-  /**
-   * Nullable consumer for timestamp (with time zone).
-   */
+  /** Nullable consumer for timestamp (with time zone). */
   static class NullableTimestampTZConsumer extends BaseConsumer<TimeStampMilliTZVector> {
 
     protected final Calendar calendar;
 
-    /**
-     * Instantiate a TimestampConsumer.
-     */
-    public NullableTimestampTZConsumer(TimeStampMilliTZVector vector, int index, Calendar calendar) {
+    /** Instantiate a TimestampConsumer. */
+    public NullableTimestampTZConsumer(
+        TimeStampMilliTZVector vector, int index, Calendar calendar) {
       super(vector, index);
       this.calendar = calendar;
     }
@@ -70,17 +63,14 @@ public void consume(ResultSet resultSet) throws SQLException {
     }
   }
 
-  /**
-   * Non-nullable consumer for timestamp (with time zone).
-   */
+  /** Non-nullable consumer for timestamp (with time zone). */
   static class NonNullableTimestampConsumer extends BaseConsumer<TimeStampMilliTZVector> {
 
     protected final Calendar calendar;
 
-    /**
-     * Instantiate a TimestampConsumer.
-     */
-    public NonNullableTimestampConsumer(TimeStampMilliTZVector vector, int index, Calendar calendar) {
+    /** Instantiate a TimestampConsumer. */
+    public NonNullableTimestampConsumer(
+        TimeStampMilliTZVector vector, int index, Calendar calendar) {
       super(vector, index);
       this.calendar = calendar;
     }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TinyIntConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TinyIntConsumer.java
index 40cf087a5ec66..b75b87dd81cc4 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TinyIntConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TinyIntConsumer.java
@@ -14,24 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.vector.TinyIntVector;
 
 /**
- * Consumer which consume tinyInt type values from {@link ResultSet}.
- * Write the data to {@link org.apache.arrow.vector.TinyIntVector}.
+ * Consumer which consume tinyInt type values from {@link ResultSet}. Write the data to {@link
+ * org.apache.arrow.vector.TinyIntVector}.
  */
 public abstract class TinyIntConsumer {
 
-  /**
-   * Creates a consumer for {@link TinyIntVector}.
-   */
-  public static JdbcConsumer<TinyIntVector> createConsumer(TinyIntVector vector, int index, boolean nullable) {
+  /** Creates a consumer for {@link TinyIntVector}. */
+  public static JdbcConsumer<TinyIntVector> createConsumer(
+      TinyIntVector vector, int index, boolean nullable) {
     if (nullable) {
       return new NullableTinyIntConsumer(vector, index);
     } else {
@@ -39,14 +36,10 @@ public static JdbcConsumer<TinyIntVector> createConsumer(TinyIntVector vector, i
     }
   }
 
-  /**
-   * Nullable consumer for tiny int.
-   */
+  /** Nullable consumer for tiny int. */
   static class NullableTinyIntConsumer extends BaseConsumer<TinyIntVector> {
 
-    /**
-     * Instantiate a TinyIntConsumer.
-     */
+    /** Instantiate a TinyIntConsumer. */
     public NullableTinyIntConsumer(TinyIntVector vector, int index) {
       super(vector, index);
     }
@@ -63,14 +56,10 @@ public void consume(ResultSet resultSet) throws SQLException {
     }
   }
 
-  /**
-   * Non-nullable consumer for tiny int.
-   */
+  /** Non-nullable consumer for tiny int. */
   static class NonNullableTinyIntConsumer extends BaseConsumer<TinyIntVector> {
 
-    /**
-     * Instantiate a TinyIntConsumer.
-     */
+    /** Instantiate a TinyIntConsumer. */
     public NonNullableTinyIntConsumer(TinyIntVector vector, int index) {
       super(vector, index);
     }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/VarCharConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/VarCharConsumer.java
index 05333715b8c2f..c81c4f0db124b 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/VarCharConsumer.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/VarCharConsumer.java
@@ -14,25 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import java.nio.charset.StandardCharsets;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-
 import org.apache.arrow.vector.VarCharVector;
 
 /**
- * Consumer which consume varchar type values from {@link ResultSet}.
- * Write the data to {@link org.apache.arrow.vector.VarCharVector}.
+ * Consumer which consume varchar type values from {@link ResultSet}. Write the data to {@link
+ * org.apache.arrow.vector.VarCharVector}.
  */
 public abstract class VarCharConsumer {
 
-  /**
-   * Creates a consumer for {@link VarCharVector}.
-   */
-  public static JdbcConsumer<VarCharVector> createConsumer(VarCharVector vector, int index, boolean nullable) {
+  /** Creates a consumer for {@link VarCharVector}. */
+  public static JdbcConsumer<VarCharVector> createConsumer(
+      VarCharVector vector, int index, boolean nullable) {
     if (nullable) {
       return new NullableVarCharConsumer(vector, index);
     } else {
@@ -40,14 +37,10 @@ public static JdbcConsumer<VarCharVector> createConsumer(VarCharVector vector, i
     }
   }
 
-  /**
-   * Nullable consumer for var char.
-   */
+  /** Nullable consumer for var char. */
   static class NullableVarCharConsumer extends BaseConsumer<VarCharVector> {
 
-    /**
-     * Instantiate a VarCharConsumer.
-     */
+    /** Instantiate a VarCharConsumer. */
     public NullableVarCharConsumer(VarCharVector vector, int index) {
       super(vector, index);
     }
@@ -63,14 +56,10 @@ public void consume(ResultSet resultSet) throws SQLException {
     }
   }
 
-  /**
-   * Non-nullable consumer for var char.
-   */
+  /** Non-nullable consumer for var char. */
   static class NonNullableVarCharConsumer extends BaseConsumer<VarCharVector> {
 
-    /**
-     * Instantiate a VarCharConsumer.
-     */
+    /** Instantiate a VarCharConsumer. */
     public NonNullableVarCharConsumer(VarCharVector vector, int index) {
       super(vector, index);
     }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/exceptions/JdbcConsumerException.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/exceptions/JdbcConsumerException.java
index b235be173cf10..04e26d640c04d 100644
--- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/exceptions/JdbcConsumerException.java
+++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/exceptions/JdbcConsumerException.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer.exceptions;
 
 import org.apache.arrow.adapter.jdbc.JdbcFieldInfo;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 
 /**
- * Exception while consuming JDBC data. This exception stores the JdbcFieldInfo for the column and the
- * ArrowType for the corresponding vector for easier debugging.
+ * Exception while consuming JDBC data. This exception stores the JdbcFieldInfo for the column and
+ * the ArrowType for the corresponding vector for easier debugging.
  */
 public class JdbcConsumerException extends RuntimeException {
   final JdbcFieldInfo fieldInfo;
@@ -31,12 +30,13 @@ public class JdbcConsumerException extends RuntimeException {
   /**
    * Construct JdbcConsumerException with all fields.
    *
-   * @param message   error message
-   * @param cause     original exception
+   * @param message error message
+   * @param cause original exception
    * @param fieldInfo JdbcFieldInfo for the column
    * @param arrowType ArrowType for the corresponding vector
    */
-  public JdbcConsumerException(String message, Throwable cause, JdbcFieldInfo fieldInfo, ArrowType arrowType) {
+  public JdbcConsumerException(
+      String message, Throwable cause, JdbcFieldInfo fieldInfo, ArrowType arrowType) {
     super(message, cause);
     this.fieldInfo = fieldInfo;
     this.arrowType = arrowType;
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/AbstractJdbcToArrowTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/AbstractJdbcToArrowTest.java
index 88a66a31aa2c9..a37a8ca2f5990 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/AbstractJdbcToArrowTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/AbstractJdbcToArrowTest.java
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -30,23 +31,15 @@
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.function.Function;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.util.ValueVectorUtility;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
-
-/**
- * Class to abstract out some common test functionality for testing JDBC to Arrow.
- */
+/** Class to abstract out some common test functionality for testing JDBC to Arrow. */
 public abstract class AbstractJdbcToArrowTest {
 
   protected static final String BIGINT = "BIGINT_FIELD5";
@@ -69,7 +62,8 @@ public abstract class AbstractJdbcToArrowTest {
   protected static final String TINYINT = "TINYINT_FIELD3";
   protected static final String VARCHAR = "VARCHAR_FIELD13";
   protected static final String NULL = "NULL_FIELD18";
-  protected static final Map<String, JdbcFieldInfo> ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP = new HashMap<>();
+  protected static final Map<String, JdbcFieldInfo> ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP =
+      new HashMap<>();
 
   static {
     ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP.put(LIST, new JdbcFieldInfo(Types.INTEGER));
@@ -86,26 +80,27 @@ public abstract class AbstractJdbcToArrowTest {
    * @return Table object
    * @throws IOException on error
    */
-  protected static Table getTable(String ymlFilePath, @SuppressWarnings("rawtypes") Class clss) throws IOException {
-    return new ObjectMapper(new YAMLFactory()).readValue(
-            clss.getClassLoader().getResourceAsStream(ymlFilePath), Table.class);
+  protected static Table getTable(String ymlFilePath, @SuppressWarnings("rawtypes") Class clss)
+      throws IOException {
+    return new ObjectMapper(new YAMLFactory())
+        .readValue(clss.getClassLoader().getResourceAsStream(ymlFilePath), Table.class);
   }
 
-
   /**
    * This method creates Connection object and DB table and also populate data into table for test.
    *
    * @throws SQLException on error
    * @throws ClassNotFoundException on error
    */
-  @Before
-  public void setUp() throws SQLException, ClassNotFoundException {
+  protected void initializeDatabase(Table table) throws SQLException, ClassNotFoundException {
+    this.table = table;
+
     TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
     String url = "jdbc:h2:mem:JdbcToArrowTest";
     String driver = "org.h2.Driver";
     Class.forName(driver);
     conn = DriverManager.getConnection(url);
-    try (Statement stmt = conn.createStatement();) {
+    try (Statement stmt = conn.createStatement(); ) {
       stmt.executeUpdate(table.getCreate());
       for (String insert : table.getData()) {
         stmt.executeUpdate(insert);
@@ -118,7 +113,7 @@ public void setUp() throws SQLException, ClassNotFoundException {
    *
    * @throws SQLException on error
    */
-  @After
+  @AfterEach
   public void destroy() throws SQLException {
     if (conn != null) {
       conn.close();
@@ -136,12 +131,13 @@ public void destroy() throws SQLException {
    * @throws ClassNotFoundException on error
    * @throws IOException on error
    */
-  public static Object[][] prepareTestData(String[] testFiles, @SuppressWarnings("rawtypes") Class clss)
+  public static Object[][] prepareTestData(
+      String[] testFiles, @SuppressWarnings("rawtypes") Class clss)
       throws SQLException, ClassNotFoundException, IOException {
     Object[][] tableArr = new Object[testFiles.length][];
     int i = 0;
     for (String testFile : testFiles) {
-      tableArr[i++] = new Object[]{getTable(testFile, clss)};
+      tableArr[i++] = new Object[] {getTable(testFile, clss)};
     }
     return tableArr;
   }
@@ -149,96 +145,101 @@ public static Object[][] prepareTestData(String[] testFiles, @SuppressWarnings("
   /**
    * Abstract method to implement test Functionality to test JdbcToArrow methods.
    *
+   * @param table Table object
    * @throws SQLException on error
    * @throws IOException on error
    */
-  @Test
-  public abstract void testJdbcToArrowValues() throws SQLException, IOException;
+  public abstract void testJdbcToArrowValues(Table table)
+      throws SQLException, IOException, ClassNotFoundException;
 
   /**
    * Abstract method to implement logic to assert test various datatype values.
    *
    * @param root VectorSchemaRoot for test
-   * @param isIncludeMapVector is this dataset checks includes map column.
-   *          Jdbc type to 'map' mapping declared in configuration only manually
+   * @param isIncludeMapVector is this dataset checks includes map column. Jdbc type to 'map'
+   *     mapping declared in configuration only manually
    */
   public abstract void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector);
 
   /**
-   * For the given SQL query, execute and fetch the data from Relational DB and convert it to Arrow objects.
-   * This method uses the default Calendar instance with default TimeZone and Locale as returned by the JVM.
-   * If you wish to use specific TimeZone or Locale for any Date, Time and Timestamp datasets, you may want use
-   * overloaded API that taken Calendar object instance.
+   * For the given SQL query, execute and fetch the data from Relational DB and convert it to Arrow
+   * objects. This method uses the default Calendar instance with default TimeZone and Locale as
+   * returned by the JVM. If you wish to use specific TimeZone or Locale for any Date, Time and
+   * Timestamp datasets, you may want use overloaded API that taken Calendar object instance.
    *
-   * This method is for test only.
+   * <p>This method is for test only.
    *
-   * @param connection Database connection to be used. This method will not close the passed connection object. Since
-   *                   the caller has passed the connection object it's the responsibility of the caller to close or
-   *                   return the connection to the pool.
-   * @param query      The DB Query to fetch the data.
-   * @param allocator  Memory allocator
+   * @param connection Database connection to be used. This method will not close the passed
+   *     connection object. Since the caller has passed the connection object it's the
+   *     responsibility of the caller to close or return the connection to the pool.
+   * @param query The DB Query to fetch the data.
+   * @param allocator Memory allocator
    * @return Arrow Data Objects {@link VectorSchemaRoot}
-   * @throws SQLException Propagate any SQL Exceptions to the caller after closing any resources opened such as
-   *                      ResultSet and Statement objects.
+   * @throws SQLException Propagate any SQL Exceptions to the caller after closing any resources
+   *     opened such as ResultSet and Statement objects.
    */
   public VectorSchemaRoot sqlToArrow(Connection connection, String query, BufferAllocator allocator)
       throws SQLException, IOException {
     Preconditions.checkNotNull(allocator, "Memory allocator object cannot be null");
 
-    JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(allocator, JdbcToArrowUtils.getUtcCalendar())
-        .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-        .build();
+    JdbcToArrowConfig config =
+        new JdbcToArrowConfigBuilder(allocator, JdbcToArrowUtils.getUtcCalendar())
+            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+            .build();
     return sqlToArrow(connection, query, config);
   }
 
   /**
-   * For the given SQL query, execute and fetch the data from Relational DB and convert it to Arrow objects.
+   * For the given SQL query, execute and fetch the data from Relational DB and convert it to Arrow
+   * objects.
    *
-   * This method is for test only.
+   * <p>This method is for test only.
    *
-   * @param connection Database connection to be used. This method will not close the passed connection object. Since
-   *                   the caller has passed the connection object it's the responsibility of the caller to close or
-   *                   return the connection to the pool.
-   * @param query      The DB Query to fetch the data.
-   * @param allocator  Memory allocator
-   * @param calendar   Calendar object to use to handle Date, Time and Timestamp datasets.
+   * @param connection Database connection to be used. This method will not close the passed
+   *     connection object. Since the caller has passed the connection object it's the
+   *     responsibility of the caller to close or return the connection to the pool.
+   * @param query The DB Query to fetch the data.
+   * @param allocator Memory allocator
+   * @param calendar Calendar object to use to handle Date, Time and Timestamp datasets.
    * @return Arrow Data Objects {@link VectorSchemaRoot}
-   * @throws SQLException Propagate any SQL Exceptions to the caller after closing any resources opened such as
-   *                      ResultSet and Statement objects.
+   * @throws SQLException Propagate any SQL Exceptions to the caller after closing any resources
+   *     opened such as ResultSet and Statement objects.
    */
   public VectorSchemaRoot sqlToArrow(
-      Connection connection,
-      String query,
-      BufferAllocator allocator,
-      Calendar calendar) throws SQLException, IOException {
+      Connection connection, String query, BufferAllocator allocator, Calendar calendar)
+      throws SQLException, IOException {
 
     Preconditions.checkNotNull(allocator, "Memory allocator object cannot be null");
     Preconditions.checkNotNull(calendar, "Calendar object cannot be null");
 
-    JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(allocator, calendar)
-        .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-        .build();
+    JdbcToArrowConfig config =
+        new JdbcToArrowConfigBuilder(allocator, calendar)
+            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+            .build();
     return sqlToArrow(connection, query, config);
   }
 
   /**
-   * For the given SQL query, execute and fetch the data from Relational DB and convert it to Arrow objects.
+   * For the given SQL query, execute and fetch the data from Relational DB and convert it to Arrow
+   * objects.
    *
-   * This method is for test only.
+   * <p>This method is for test only.
    *
-   * @param connection Database connection to be used. This method will not close the passed connection object.
-   *                   Since the caller has passed the connection object it's the responsibility of the caller
-   *                   to close or return the connection to the pool.
-   * @param query      The DB Query to fetch the data.
-   * @param config     Configuration
+   * @param connection Database connection to be used. This method will not close the passed
+   *     connection object. Since the caller has passed the connection object it's the
+   *     responsibility of the caller to close or return the connection to the pool.
+   * @param query The DB Query to fetch the data.
+   * @param config Configuration
    * @return Arrow Data Objects {@link VectorSchemaRoot}
-   * @throws SQLException Propagate any SQL Exceptions to the caller after closing any resources opened such as
-   *                      ResultSet and Statement objects.
+   * @throws SQLException Propagate any SQL Exceptions to the caller after closing any resources
+   *     opened such as ResultSet and Statement objects.
    */
-  public static VectorSchemaRoot sqlToArrow(Connection connection, String query, JdbcToArrowConfig config)
+  public static VectorSchemaRoot sqlToArrow(
+      Connection connection, String query, JdbcToArrowConfig config)
       throws SQLException, IOException {
     Preconditions.checkNotNull(connection, "JDBC connection object cannot be null");
-    Preconditions.checkArgument(query != null && query.length() > 0, "SQL query cannot be null or empty");
+    Preconditions.checkArgument(
+        query != null && query.length() > 0, "SQL query cannot be null or empty");
 
     try (Statement stmt = connection.createStatement()) {
       return sqlToArrow(stmt.executeQuery(query), config);
@@ -246,10 +247,10 @@ public static VectorSchemaRoot sqlToArrow(Connection connection, String query, J
   }
 
   /**
-   * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow objects. This
-   * method uses the default RootAllocator and Calendar object.
+   * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow
+   * objects. This method uses the default RootAllocator and Calendar object.
    *
-   * This method is for test only.
+   * <p>This method is for test only.
    *
    * @param resultSet ResultSet to use to fetch the data from underlying database
    * @return Arrow Data Objects {@link VectorSchemaRoot}
@@ -262,9 +263,10 @@ public static VectorSchemaRoot sqlToArrow(ResultSet resultSet) throws SQLExcepti
   }
 
   /**
-   * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow objects.
+   * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow
+   * objects.
    *
-   * This method is for test only.
+   * <p>This method is for test only.
    *
    * @param resultSet ResultSet to use to fetch the data from underlying database
    * @param allocator Memory allocator
@@ -275,62 +277,69 @@ public static VectorSchemaRoot sqlToArrow(ResultSet resultSet, BufferAllocator a
       throws SQLException, IOException {
     Preconditions.checkNotNull(allocator, "Memory Allocator object cannot be null");
 
-    JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(allocator, JdbcToArrowUtils.getUtcCalendar())
-        .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-        .build();
+    JdbcToArrowConfig config =
+        new JdbcToArrowConfigBuilder(allocator, JdbcToArrowUtils.getUtcCalendar())
+            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+            .build();
     return sqlToArrow(resultSet, config);
   }
 
   /**
-   * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow objects.
+   * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow
+   * objects.
    *
-   * This method is for test only.
+   * <p>This method is for test only.
    *
    * @param resultSet ResultSet to use to fetch the data from underlying database
-   * @param calendar  Calendar instance to use for Date, Time and Timestamp datasets, or <code>null</code> if none.
+   * @param calendar Calendar instance to use for Date, Time and Timestamp datasets, or <code>null
+   *     </code> if none.
    * @return Arrow Data Objects {@link VectorSchemaRoot}
    * @throws SQLException on error
    */
-  public static VectorSchemaRoot sqlToArrow(ResultSet resultSet, Calendar calendar) throws SQLException, IOException {
+  public static VectorSchemaRoot sqlToArrow(ResultSet resultSet, Calendar calendar)
+      throws SQLException, IOException {
     Preconditions.checkNotNull(resultSet, "JDBC ResultSet object cannot be null");
 
-    JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), calendar)
-        .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-        .build();
+    JdbcToArrowConfig config =
+        new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), calendar)
+            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+            .build();
     return sqlToArrow(resultSet, config);
   }
 
   /**
-   * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow objects.
+   * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow
+   * objects.
    *
-   * This method is for test only.
+   * <p>This method is for test only.
    *
    * @param resultSet ResultSet to use to fetch the data from underlying database
    * @param allocator Memory allocator to use.
-   * @param calendar  Calendar instance to use for Date, Time and Timestamp datasets, or <code>null</code> if none.
+   * @param calendar Calendar instance to use for Date, Time and Timestamp datasets, or <code>null
+   *     </code> if none.
    * @return Arrow Data Objects {@link VectorSchemaRoot}
    * @throws SQLException on error
    */
   public static VectorSchemaRoot sqlToArrow(
-      ResultSet resultSet,
-      BufferAllocator allocator,
-      Calendar calendar)
+      ResultSet resultSet, BufferAllocator allocator, Calendar calendar)
       throws SQLException, IOException {
     Preconditions.checkNotNull(allocator, "Memory Allocator object cannot be null");
 
-    JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(allocator, calendar)
-        .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-        .build();
+    JdbcToArrowConfig config =
+        new JdbcToArrowConfigBuilder(allocator, calendar)
+            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+            .build();
     return sqlToArrow(resultSet, config);
   }
 
   /**
-   * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow objects.
+   * For the given JDBC {@link ResultSet}, fetch the data from Relational DB and convert it to Arrow
+   * objects.
    *
-   * This method is for test only.
+   * <p>This method is for test only.
    *
    * @param resultSet ResultSet to use to fetch the data from underlying database
-   * @param config    Configuration of the conversion from JDBC to Arrow.
+   * @param config Configuration of the conversion from JDBC to Arrow.
    * @return Arrow Data Objects {@link VectorSchemaRoot}
    * @throws SQLException on error
    */
@@ -339,8 +348,10 @@ public static VectorSchemaRoot sqlToArrow(ResultSet resultSet, JdbcToArrowConfig
     Preconditions.checkNotNull(resultSet, "JDBC ResultSet object cannot be null");
     Preconditions.checkNotNull(config, "The configuration cannot be null");
 
-    VectorSchemaRoot root = VectorSchemaRoot.create(
-        JdbcToArrowUtils.jdbcToArrowSchema(resultSet.getMetaData(), config), config.getAllocator());
+    VectorSchemaRoot root =
+        VectorSchemaRoot.create(
+            JdbcToArrowUtils.jdbcToArrowSchema(resultSet.getMetaData(), config),
+            config.getAllocator());
     if (config.getTargetBatchSize() != JdbcToArrowConfig.NO_LIMIT_BATCH_SIZE) {
       ValueVectorUtility.preAllocate(root, config.getTargetBatchSize());
     }
@@ -350,12 +361,14 @@ public static VectorSchemaRoot sqlToArrow(ResultSet resultSet, JdbcToArrowConfig
 
   /**
    * Register MAP_FIELD20 as ArrowType.Map
-   * @param calendar  Calendar instance to use for Date, Time and Timestamp datasets, or <code>null</code> if none.
+   *
+   * @param calendar Calendar instance to use for Date, Time and Timestamp datasets, or <code>null
+   *     </code> if none.
    * @param rsmd ResultSetMetaData to lookup column name from result set metadata
    * @return typeConverter instance with mapping column to Map type
    */
   protected Function<JdbcFieldInfo, ArrowType> jdbcToArrowTypeConverter(
-          Calendar calendar, ResultSetMetaData rsmd) {
+      Calendar calendar, ResultSetMetaData rsmd) {
     return (jdbcFieldInfo) -> {
       String columnLabel = null;
       try {
@@ -377,5 +390,4 @@ protected Function<JdbcFieldInfo, ArrowType> jdbcToArrowTypeConverter(
   protected ResultSetMetaData getQueryMetaData(String query) throws SQLException {
     return conn.createStatement().executeQuery(query).getMetaData();
   }
-
 }
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcFieldInfoTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcFieldInfoTest.java
index b1a8b8f226753..152b88c45a865 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcFieldInfoTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcFieldInfoTest.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.sql.Types;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class JdbcFieldInfoTest {
 
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcParameterBinderTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcParameterBinderTest.java
index 15b9ab0386159..a05130f18e4ac 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcParameterBinderTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcParameterBinderTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -32,7 +31,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiConsumer;
-
 import org.apache.arrow.adapter.jdbc.binder.ColumnBinder;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
@@ -106,11 +104,11 @@ void bindOrder() throws SQLException {
                 Field.nullable("ints1", new ArrowType.Int(32, true)),
                 Field.nullable("ints2", new ArrowType.Int(32, true))));
     try (final MockPreparedStatement statement = new MockPreparedStatement();
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       final JdbcParameterBinder binder =
           JdbcParameterBinder.builder(statement, root)
-              .bind(/*paramIndex=*/ 1, /*colIndex=*/ 2)
-              .bind(/*paramIndex=*/ 2, /*colIndex=*/ 0)
+              .bind(/*parameterIndex=*/ 1, /*columnIndex=*/ 2)
+              .bind(/*parameterIndex=*/ 2, /*columnIndex=*/ 0)
               .build();
       assertThat(binder.next()).isFalse();
 
@@ -161,17 +159,17 @@ void bindOrder() throws SQLException {
   @Test
   void customBinder() throws SQLException {
     final Schema schema =
-        new Schema(Collections.singletonList(
-            Field.nullable("ints0", new ArrowType.Int(32, true))));
+        new Schema(Collections.singletonList(Field.nullable("ints0", new ArrowType.Int(32, true))));
 
     try (final MockPreparedStatement statement = new MockPreparedStatement();
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       final JdbcParameterBinder binder =
           JdbcParameterBinder.builder(statement, root)
               .bind(
-                  /*paramIndex=*/ 1,
+                  /*parameterIndex=*/ 1,
                   new ColumnBinder() {
                     private final IntVector vector = (IntVector) root.getVector(0);
+
                     @Override
                     public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
                         throws SQLException {
@@ -212,7 +210,9 @@ public FieldVector getVector() {
 
   @Test
   void bool() throws SQLException {
-    testSimpleType(ArrowType.Bool.INSTANCE, Types.BOOLEAN,
+    testSimpleType(
+        ArrowType.Bool.INSTANCE,
+        Types.BOOLEAN,
         (BitVector vector, Integer index, Boolean value) -> vector.setSafe(index, value ? 1 : 0),
         BitVector::setNull,
         Arrays.asList(true, false, true));
@@ -220,53 +220,76 @@ void bool() throws SQLException {
 
   @Test
   void int8() throws SQLException {
-    testSimpleType(new ArrowType.Int(8, true), Types.TINYINT,
-        TinyIntVector::setSafe, TinyIntVector::setNull,
+    testSimpleType(
+        new ArrowType.Int(8, true),
+        Types.TINYINT,
+        TinyIntVector::setSafe,
+        TinyIntVector::setNull,
         Arrays.asList(Byte.MAX_VALUE, Byte.MIN_VALUE, (byte) 42));
   }
 
   @Test
   void int16() throws SQLException {
-    testSimpleType(new ArrowType.Int(16, true), Types.SMALLINT,
-        SmallIntVector::setSafe, SmallIntVector::setNull,
+    testSimpleType(
+        new ArrowType.Int(16, true),
+        Types.SMALLINT,
+        SmallIntVector::setSafe,
+        SmallIntVector::setNull,
         Arrays.asList(Short.MAX_VALUE, Short.MIN_VALUE, (short) 42));
   }
 
   @Test
   void int32() throws SQLException {
-    testSimpleType(new ArrowType.Int(32, true), Types.INTEGER,
-        IntVector::setSafe, IntVector::setNull,
+    testSimpleType(
+        new ArrowType.Int(32, true),
+        Types.INTEGER,
+        IntVector::setSafe,
+        IntVector::setNull,
         Arrays.asList(Integer.MAX_VALUE, Integer.MIN_VALUE, 42));
   }
 
   @Test
   void int64() throws SQLException {
-    testSimpleType(new ArrowType.Int(64, true), Types.BIGINT,
-        BigIntVector::setSafe, BigIntVector::setNull,
+    testSimpleType(
+        new ArrowType.Int(64, true),
+        Types.BIGINT,
+        BigIntVector::setSafe,
+        BigIntVector::setNull,
         Arrays.asList(Long.MAX_VALUE, Long.MIN_VALUE, 42L));
   }
 
   @Test
   void float32() throws SQLException {
-    testSimpleType(new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE), Types.REAL,
-        Float4Vector::setSafe, Float4Vector::setNull,
+    testSimpleType(
+        new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE),
+        Types.REAL,
+        Float4Vector::setSafe,
+        Float4Vector::setNull,
         Arrays.asList(Float.MIN_VALUE, Float.MAX_VALUE, Float.POSITIVE_INFINITY));
   }
 
   @Test
   void float64() throws SQLException {
-    testSimpleType(new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE), Types.DOUBLE,
-        Float8Vector::setSafe, Float8Vector::setNull,
+    testSimpleType(
+        new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE),
+        Types.DOUBLE,
+        Float8Vector::setSafe,
+        Float8Vector::setNull,
         Arrays.asList(Double.MIN_VALUE, Double.MAX_VALUE, Double.POSITIVE_INFINITY));
   }
 
   @Test
   void time32() throws SQLException {
-    testSimpleType(new ArrowType.Time(TimeUnit.SECOND, 32), Types.TIME,
-        (valueVectors, index, value) -> valueVectors.setSafe(index, (int) (value.getTime() / 1_000)),
+    testSimpleType(
+        new ArrowType.Time(TimeUnit.SECOND, 32),
+        Types.TIME,
+        (valueVectors, index, value) ->
+            valueVectors.setSafe(index, (int) (value.getTime() / 1_000)),
         TimeSecVector::setNull,
         Arrays.asList(new Time(-128_000), new Time(104_000), new Time(-42_000)));
-    testSimpleType(new ArrowType.Time(TimeUnit.MILLISECOND, 32), Types.TIME,
+    testSimpleType(
+        new ArrowType.Time(TimeUnit.MILLISECOND, 32),
+        Types.TIME,
         (valueVectors, index, value) -> valueVectors.setSafe(index, (int) value.getTime()),
         TimeMilliVector::setNull,
         Arrays.asList(new Time(-128_000), new Time(104_000), new Time(-42_000)));
@@ -274,69 +297,108 @@ void time32() throws SQLException {
 
   @Test
   void time64() throws SQLException {
-    testSimpleType(new ArrowType.Time(TimeUnit.MICROSECOND, 64), Types.TIME,
-        (valueVectors, index, value) -> valueVectors.setSafe(index, (int) (value.getTime() * 1_000)),
+    testSimpleType(
+        new ArrowType.Time(TimeUnit.MICROSECOND, 64),
+        Types.TIME,
+        (valueVectors, index, value) -> valueVectors.setSafe(index, (value.getTime() * 1_000)),
         TimeMicroVector::setNull,
         Arrays.asList(new Time(-128_000), new Time(104_000), new Time(-42_000)));
-    testSimpleType(new ArrowType.Time(TimeUnit.NANOSECOND, 64), Types.TIME,
-        (valueVectors, index, value) -> valueVectors.setSafe(index, (int) (value.getTime() * 1_000_000)),
+    testSimpleType(
+        new ArrowType.Time(TimeUnit.NANOSECOND, 64),
+        Types.TIME,
+        (valueVectors, index, value) -> valueVectors.setSafe(index, (value.getTime() * 1_000_000)),
         TimeNanoVector::setNull,
         Arrays.asList(new Time(-128), new Time(104), new Time(-42)));
   }
 
   @Test
   void date32() throws SQLException {
-    testSimpleType(new ArrowType.Date(DateUnit.DAY), Types.DATE,
-        (valueVectors, index, value) -> valueVectors.setSafe(index, (int) (value.getTime() / MILLIS_PER_DAY)),
+    testSimpleType(
+        new ArrowType.Date(DateUnit.DAY),
+        Types.DATE,
+        (valueVectors, index, value) ->
+            valueVectors.setSafe(index, (int) (value.getTime() / MILLIS_PER_DAY)),
         DateDayVector::setNull,
-        Arrays.asList(new Date(-5 * MILLIS_PER_DAY), new Date(2 * MILLIS_PER_DAY), new Date(MILLIS_PER_DAY)));
+        Arrays.asList(
+            new Date(-5 * MILLIS_PER_DAY), new Date(2 * MILLIS_PER_DAY), new Date(MILLIS_PER_DAY)));
   }
 
   @Test
   void date64() throws SQLException {
-    testSimpleType(new ArrowType.Date(DateUnit.MILLISECOND), Types.DATE,
+    testSimpleType(
+        new ArrowType.Date(DateUnit.MILLISECOND),
+        Types.DATE,
         (valueVectors, index, value) -> valueVectors.setSafe(index, value.getTime()),
         DateMilliVector::setNull,
-        Arrays.asList(new Date(-5 * MILLIS_PER_DAY), new Date(2 * MILLIS_PER_DAY), new Date(MILLIS_PER_DAY)));
+        Arrays.asList(
+            new Date(-5 * MILLIS_PER_DAY), new Date(2 * MILLIS_PER_DAY), new Date(MILLIS_PER_DAY)));
   }
 
   @Test
   void timestamp() throws SQLException {
-    List<Timestamp> values = Arrays.asList(new Timestamp(-128_000), new Timestamp(104_000), new Timestamp(-42_000));
-    testSimpleType(new ArrowType.Timestamp(TimeUnit.SECOND, null), Types.TIMESTAMP,
+    List<Timestamp> values =
+        Arrays.asList(new Timestamp(-128_000), new Timestamp(104_000), new Timestamp(-42_000));
+    testSimpleType(
+        new ArrowType.Timestamp(TimeUnit.SECOND, null),
+        Types.TIMESTAMP,
         (valueVectors, index, value) -> valueVectors.setSafe(index, value.getTime() / 1_000),
-        TimeStampSecVector::setNull, values);
-    testSimpleType(new ArrowType.Timestamp(TimeUnit.MILLISECOND, null), Types.TIMESTAMP,
+        TimeStampSecVector::setNull,
+        values);
+    testSimpleType(
+        new ArrowType.Timestamp(TimeUnit.MILLISECOND, null),
+        Types.TIMESTAMP,
         (valueVectors, index, value) -> valueVectors.setSafe(index, value.getTime()),
-        TimeStampMilliVector::setNull, values);
-    testSimpleType(new ArrowType.Timestamp(TimeUnit.MICROSECOND, null), Types.TIMESTAMP,
+        TimeStampMilliVector::setNull,
+        values);
+    testSimpleType(
+        new ArrowType.Timestamp(TimeUnit.MICROSECOND, null),
+        Types.TIMESTAMP,
         (valueVectors, index, value) -> valueVectors.setSafe(index, value.getTime() * 1_000),
-        TimeStampMicroVector::setNull, values);
-    testSimpleType(new ArrowType.Timestamp(TimeUnit.NANOSECOND, null), Types.TIMESTAMP,
+        TimeStampMicroVector::setNull,
+        values);
+    testSimpleType(
+        new ArrowType.Timestamp(TimeUnit.NANOSECOND, null),
+        Types.TIMESTAMP,
         (valueVectors, index, value) -> valueVectors.setSafe(index, value.getTime() * 1_000_000),
-        TimeStampNanoVector::setNull, values);
+        TimeStampNanoVector::setNull,
+        values);
   }
 
   @Test
   void timestampTz() throws SQLException {
-    List<Timestamp> values = Arrays.asList(new Timestamp(-128_000), new Timestamp(104_000), new Timestamp(-42_000));
-    testSimpleType(new ArrowType.Timestamp(TimeUnit.SECOND, "UTC"), Types.TIMESTAMP_WITH_TIMEZONE,
+    List<Timestamp> values =
+        Arrays.asList(new Timestamp(-128_000), new Timestamp(104_000), new Timestamp(-42_000));
+    testSimpleType(
+        new ArrowType.Timestamp(TimeUnit.SECOND, "UTC"),
+        Types.TIMESTAMP_WITH_TIMEZONE,
         (valueVectors, index, value) -> valueVectors.setSafe(index, value.getTime() / 1_000),
-        TimeStampSecTZVector::setNull, values);
-    testSimpleType(new ArrowType.Timestamp(TimeUnit.MILLISECOND, "UTC"), Types.TIMESTAMP_WITH_TIMEZONE,
+        TimeStampSecTZVector::setNull,
+        values);
+    testSimpleType(
+        new ArrowType.Timestamp(TimeUnit.MILLISECOND, "UTC"),
+        Types.TIMESTAMP_WITH_TIMEZONE,
         (valueVectors, index, value) -> valueVectors.setSafe(index, value.getTime()),
-        TimeStampMilliTZVector::setNull, values);
-    testSimpleType(new ArrowType.Timestamp(TimeUnit.MICROSECOND, "UTC"), Types.TIMESTAMP_WITH_TIMEZONE,
+        TimeStampMilliTZVector::setNull,
+        values);
+    testSimpleType(
+        new ArrowType.Timestamp(TimeUnit.MICROSECOND, "UTC"),
+        Types.TIMESTAMP_WITH_TIMEZONE,
         (valueVectors, index, value) -> valueVectors.setSafe(index, value.getTime() * 1_000),
-        TimeStampMicroTZVector::setNull, values);
-    testSimpleType(new ArrowType.Timestamp(TimeUnit.NANOSECOND, "UTC"), Types.TIMESTAMP_WITH_TIMEZONE,
+        TimeStampMicroTZVector::setNull,
+        values);
+    testSimpleType(
+        new ArrowType.Timestamp(TimeUnit.NANOSECOND, "UTC"),
+        Types.TIMESTAMP_WITH_TIMEZONE,
         (valueVectors, index, value) -> valueVectors.setSafe(index, value.getTime() * 1_000_000),
-        TimeStampNanoTZVector::setNull, values);
+        TimeStampNanoTZVector::setNull,
+        values);
   }
 
   @Test
   void utf8() throws SQLException {
-    testSimpleType(ArrowType.Utf8.INSTANCE, Types.VARCHAR,
+    testSimpleType(
+        ArrowType.Utf8.INSTANCE,
+        Types.VARCHAR,
         (VarCharVector vector, Integer index, String value) ->
             vector.setSafe(index, value.getBytes(StandardCharsets.UTF_8)),
         BaseVariableWidthVector::setNull,
@@ -345,7 +407,9 @@ void utf8() throws SQLException {
 
   @Test
   void largeUtf8() throws SQLException {
-    testSimpleType(ArrowType.LargeUtf8.INSTANCE, Types.LONGVARCHAR,
+    testSimpleType(
+        ArrowType.LargeUtf8.INSTANCE,
+        Types.LONGVARCHAR,
         (LargeVarCharVector vector, Integer index, String value) ->
             vector.setSafe(index, value.getBytes(StandardCharsets.UTF_8)),
         BaseLargeVariableWidthVector::setNull,
@@ -354,155 +418,200 @@ void largeUtf8() throws SQLException {
 
   @Test
   void binary() throws SQLException {
-    testSimpleType(ArrowType.Binary.INSTANCE, Types.VARBINARY,
-        (VarBinaryVector vector, Integer index, byte[] value) ->
-            vector.setSafe(index, value),
+    testSimpleType(
+        ArrowType.Binary.INSTANCE,
+        Types.VARBINARY,
+        (VarBinaryVector vector, Integer index, byte[] value) -> vector.setSafe(index, value),
         BaseVariableWidthVector::setNull,
         Arrays.asList(new byte[0], new byte[] {2, -4}, new byte[] {0, -1, 127, -128}));
   }
 
   @Test
   void largeBinary() throws SQLException {
-    testSimpleType(ArrowType.LargeBinary.INSTANCE, Types.LONGVARBINARY,
-        (LargeVarBinaryVector vector, Integer index, byte[] value) ->
-            vector.setSafe(index, value),
+    testSimpleType(
+        ArrowType.LargeBinary.INSTANCE,
+        Types.LONGVARBINARY,
+        (LargeVarBinaryVector vector, Integer index, byte[] value) -> vector.setSafe(index, value),
         BaseLargeVariableWidthVector::setNull,
         Arrays.asList(new byte[0], new byte[] {2, -4}, new byte[] {0, -1, 127, -128}));
   }
 
   @Test
   void fixedSizeBinary() throws SQLException {
-    testSimpleType(new ArrowType.FixedSizeBinary(3), Types.BINARY,
-        FixedSizeBinaryVector::setSafe, FixedSizeBinaryVector::setNull,
+    testSimpleType(
+        new ArrowType.FixedSizeBinary(3),
+        Types.BINARY,
+        FixedSizeBinaryVector::setSafe,
+        FixedSizeBinaryVector::setNull,
         Arrays.asList(new byte[3], new byte[] {1, 2, -4}, new byte[] {-1, 127, -128}));
   }
 
   @Test
   void decimal128() throws SQLException {
-    testSimpleType(new ArrowType.Decimal(/*precision*/ 12, /*scale*/3, 128), Types.DECIMAL,
-        DecimalVector::setSafe, DecimalVector::setNull,
-        Arrays.asList(new BigDecimal("120.429"), new BigDecimal("-10590.123"), new BigDecimal("0.000")));
+    testSimpleType(
+        new ArrowType.Decimal(/*precision*/ 12, /*scale*/ 3, 128),
+        Types.DECIMAL,
+        DecimalVector::setSafe,
+        DecimalVector::setNull,
+        Arrays.asList(
+            new BigDecimal("120.429"), new BigDecimal("-10590.123"), new BigDecimal("0.000")));
   }
 
   @Test
   void decimal256() throws SQLException {
-    testSimpleType(new ArrowType.Decimal(/*precision*/ 12, /*scale*/3, 256), Types.DECIMAL,
-        Decimal256Vector::setSafe, Decimal256Vector::setNull,
-        Arrays.asList(new BigDecimal("120.429"), new BigDecimal("-10590.123"), new BigDecimal("0.000")));
+    testSimpleType(
+        new ArrowType.Decimal(/*precision*/ 12, /*scale*/ 3, 256),
+        Types.DECIMAL,
+        Decimal256Vector::setSafe,
+        Decimal256Vector::setNull,
+        Arrays.asList(
+            new BigDecimal("120.429"), new BigDecimal("-10590.123"), new BigDecimal("0.000")));
   }
 
   @Test
   void listOfDouble() throws SQLException {
-    TriConsumer<ListVector, Integer, Double[]> setValue = (listVector, index, values) -> {
-      org.apache.arrow.vector.complex.impl.UnionListWriter writer = listVector.getWriter();
-      writer.setPosition(index);
-      writer.startList();
-      Arrays.stream(values).forEach(doubleValue -> writer.float8().writeFloat8(doubleValue));
-      writer.endList();
-      listVector.setLastSet(index);
-    };
-    List<Double[]> values = Arrays.asList(new Double[]{0.0, Math.PI}, new Double[]{1.1, -352346.2, 2355.6},
-                                          new Double[]{-1024.3}, new Double[]{});
-    testListType(new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE), setValue, ListVector::setNull, values);
+    TriConsumer<ListVector, Integer, Double[]> setValue =
+        (listVector, index, values) -> {
+          org.apache.arrow.vector.complex.impl.UnionListWriter writer = listVector.getWriter();
+          writer.setPosition(index);
+          writer.startList();
+          Arrays.stream(values).forEach(doubleValue -> writer.float8().writeFloat8(doubleValue));
+          writer.endList();
+          listVector.setLastSet(index);
+        };
+    List<Double[]> values =
+        Arrays.asList(
+            new Double[] {0.0, Math.PI}, new Double[] {1.1, -352346.2, 2355.6},
+            new Double[] {-1024.3}, new Double[] {});
+    testListType(
+        new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE),
+        setValue,
+        ListVector::setNull,
+        values);
   }
 
   @Test
   void listOfInt64() throws SQLException {
-    TriConsumer<ListVector, Integer, Long[]> setValue = (listVector, index, values) -> {
-      org.apache.arrow.vector.complex.impl.UnionListWriter writer = listVector.getWriter();
-      writer.setPosition(index);
-      writer.startList();
-      Arrays.stream(values).forEach(longValue -> writer.bigInt().writeBigInt(longValue));
-      writer.endList();
-      listVector.setLastSet(index);
-    };
-    List<Long[]> values = Arrays.asList(new Long[]{1L, 2L, 3L}, new Long[]{4L, 5L},
-            new Long[]{512L, 1024L, 2048L, 4096L}, new Long[]{});
+    TriConsumer<ListVector, Integer, Long[]> setValue =
+        (listVector, index, values) -> {
+          org.apache.arrow.vector.complex.impl.UnionListWriter writer = listVector.getWriter();
+          writer.setPosition(index);
+          writer.startList();
+          Arrays.stream(values).forEach(longValue -> writer.bigInt().writeBigInt(longValue));
+          writer.endList();
+          listVector.setLastSet(index);
+        };
+    List<Long[]> values =
+        Arrays.asList(
+            new Long[] {1L, 2L, 3L},
+            new Long[] {4L, 5L},
+            new Long[] {512L, 1024L, 2048L, 4096L},
+            new Long[] {});
     testListType((ArrowType) new ArrowType.Int(64, true), setValue, ListVector::setNull, values);
   }
 
   @Test
   void listOfInt32() throws SQLException {
-    TriConsumer<ListVector, Integer, Integer[]> setValue = (listVector, index, values) -> {
-      org.apache.arrow.vector.complex.impl.UnionListWriter writer = listVector.getWriter();
-      writer.setPosition(index);
-      writer.startList();
-      Arrays.stream(values).forEach(integerValue -> writer.integer().writeInt(integerValue));
-      writer.endList();
-      listVector.setLastSet(index);
-    };
-    List<Integer[]> values = Arrays.asList(new Integer[]{1, 2, 3}, new Integer[]{4, 5},
-            new Integer[]{512, 1024, 2048, 4096}, new Integer[]{});
+    TriConsumer<ListVector, Integer, Integer[]> setValue =
+        (listVector, index, values) -> {
+          org.apache.arrow.vector.complex.impl.UnionListWriter writer = listVector.getWriter();
+          writer.setPosition(index);
+          writer.startList();
+          Arrays.stream(values).forEach(integerValue -> writer.integer().writeInt(integerValue));
+          writer.endList();
+          listVector.setLastSet(index);
+        };
+    List<Integer[]> values =
+        Arrays.asList(
+            new Integer[] {1, 2, 3},
+            new Integer[] {4, 5},
+            new Integer[] {512, 1024, 2048, 4096},
+            new Integer[] {});
     testListType((ArrowType) new ArrowType.Int(32, true), setValue, ListVector::setNull, values);
   }
 
   @Test
   void listOfBoolean() throws SQLException {
-    TriConsumer<ListVector, Integer, Boolean[]> setValue = (listVector, index, values) -> {
-      org.apache.arrow.vector.complex.impl.UnionListWriter writer = listVector.getWriter();
-      writer.setPosition(index);
-      writer.startList();
-      Arrays.stream(values).forEach(booleanValue -> writer.bit().writeBit(booleanValue ? 1 : 0));
-      writer.endList();
-      listVector.setLastSet(index);
-    };
-    List<Boolean[]> values = Arrays.asList(new Boolean[]{true, false},
-            new Boolean[]{false, false}, new Boolean[]{true, true, false, true}, new Boolean[]{});
+    TriConsumer<ListVector, Integer, Boolean[]> setValue =
+        (listVector, index, values) -> {
+          org.apache.arrow.vector.complex.impl.UnionListWriter writer = listVector.getWriter();
+          writer.setPosition(index);
+          writer.startList();
+          Arrays.stream(values)
+              .forEach(booleanValue -> writer.bit().writeBit(booleanValue ? 1 : 0));
+          writer.endList();
+          listVector.setLastSet(index);
+        };
+    List<Boolean[]> values =
+        Arrays.asList(
+            new Boolean[] {true, false},
+            new Boolean[] {false, false},
+            new Boolean[] {true, true, false, true},
+            new Boolean[] {});
     testListType((ArrowType) new ArrowType.Bool(), setValue, ListVector::setNull, values);
   }
 
   @Test
   void listOfString() throws SQLException {
-    TriConsumer<ListVector, Integer, String[]> setValue = (listVector, index, values) -> {
-      org.apache.arrow.vector.complex.impl.UnionListWriter writer = listVector.getWriter();
-      writer.setPosition(index);
-      writer.startList();
-      Arrays.stream(values).forEach(stringValue -> {
-        if (stringValue != null) {
-          byte[] stringValueBytes = stringValue.getBytes(StandardCharsets.UTF_8);
-          try (ArrowBuf stringBuffer = allocator.buffer(stringValueBytes.length)) {
-            stringBuffer.writeBytes(stringValueBytes);
-            writer.varChar().writeVarChar(0, stringValueBytes.length, stringBuffer);
-          }
-        } else {
-          writer.varChar().writeNull();
-        }
-      });
-      writer.endList();
-      listVector.setLastSet(index);
-    };
-    List<String[]> values = Arrays.asList(new String[]{"aaaa", "b1"},
-            new String[]{"c", null, "d"}, new String[]{"e", "f", "g", "h"}, new String[]{});
+    TriConsumer<ListVector, Integer, String[]> setValue =
+        (listVector, index, values) -> {
+          org.apache.arrow.vector.complex.impl.UnionListWriter writer = listVector.getWriter();
+          writer.setPosition(index);
+          writer.startList();
+          Arrays.stream(values)
+              .forEach(
+                  stringValue -> {
+                    if (stringValue != null) {
+                      byte[] stringValueBytes = stringValue.getBytes(StandardCharsets.UTF_8);
+                      try (ArrowBuf stringBuffer = allocator.buffer(stringValueBytes.length)) {
+                        stringBuffer.writeBytes(stringValueBytes);
+                        writer.varChar().writeVarChar(0, stringValueBytes.length, stringBuffer);
+                      }
+                    } else {
+                      writer.varChar().writeNull();
+                    }
+                  });
+          writer.endList();
+          listVector.setLastSet(index);
+        };
+    List<String[]> values =
+        Arrays.asList(
+            new String[] {"aaaa", "b1"},
+            new String[] {"c", null, "d"},
+            new String[] {"e", "f", "g", "h"},
+            new String[] {});
     testListType((ArrowType) new ArrowType.Utf8(), setValue, ListVector::setNull, values);
   }
 
   @Test
   void mapOfString() throws SQLException {
-    TriConsumer<MapVector, Integer, Map<String, String>> setValue = (mapVector, index, values) -> {
-      org.apache.arrow.vector.complex.impl.UnionMapWriter mapWriter = mapVector.getWriter();
-      mapWriter.setPosition(index);
-      mapWriter.startMap();
-      values.entrySet().forEach(mapValue -> {
-        if (mapValue != null) {
-          byte[] keyBytes = mapValue.getKey().getBytes(StandardCharsets.UTF_8);
-          byte[] valueBytes = mapValue.getValue().getBytes(StandardCharsets.UTF_8);
-          try (
-              ArrowBuf keyBuf = allocator.buffer(keyBytes.length);
-              ArrowBuf valueBuf = allocator.buffer(valueBytes.length);
-          ) {
-            mapWriter.startEntry();
-            keyBuf.writeBytes(keyBytes);
-            valueBuf.writeBytes(valueBytes);
-            mapWriter.key().varChar().writeVarChar(0, keyBytes.length, keyBuf);
-            mapWriter.value().varChar().writeVarChar(0, valueBytes.length, valueBuf);
-            mapWriter.endEntry();
-          }
-        } else {
-          mapWriter.writeNull();
-        }
-      });
-      mapWriter.endMap();
-    };
+    TriConsumer<MapVector, Integer, Map<String, String>> setValue =
+        (mapVector, index, values) -> {
+          org.apache.arrow.vector.complex.impl.UnionMapWriter mapWriter = mapVector.getWriter();
+          mapWriter.setPosition(index);
+          mapWriter.startMap();
+          values
+              .entrySet()
+              .forEach(
+                  mapValue -> {
+                    if (mapValue != null) {
+                      byte[] keyBytes = mapValue.getKey().getBytes(StandardCharsets.UTF_8);
+                      byte[] valueBytes = mapValue.getValue().getBytes(StandardCharsets.UTF_8);
+                      try (ArrowBuf keyBuf = allocator.buffer(keyBytes.length);
+                          ArrowBuf valueBuf = allocator.buffer(valueBytes.length); ) {
+                        mapWriter.startEntry();
+                        keyBuf.writeBytes(keyBytes);
+                        valueBuf.writeBytes(valueBytes);
+                        mapWriter.key().varChar().writeVarChar(0, keyBytes.length, keyBuf);
+                        mapWriter.value().varChar().writeVarChar(0, valueBytes.length, valueBuf);
+                        mapWriter.endEntry();
+                      }
+                    } else {
+                      mapWriter.writeNull();
+                    }
+                  });
+          mapWriter.endMap();
+        };
 
     JsonStringHashMap<String, String> value1 = new JsonStringHashMap<String, String>();
     value1.put("a", "b");
@@ -514,28 +623,34 @@ void mapOfString() throws SQLException {
     JsonStringHashMap<String, String> value3 = new JsonStringHashMap<String, String>();
     value3.put("y", "z");
     value3.put("arrow", "cool");
-    List<Map<String, String>> values = Arrays.asList(value1, value2, value3, Collections.emptyMap());
-    testMapType(new ArrowType.Map(true), setValue, MapVector::setNull, values, new ArrowType.Utf8());
+    List<Map<String, String>> values =
+        Arrays.asList(value1, value2, value3, Collections.emptyMap());
+    testMapType(
+        new ArrowType.Map(true), setValue, MapVector::setNull, values, new ArrowType.Utf8());
   }
 
   @Test
   void mapOfInteger() throws SQLException {
-    TriConsumer<MapVector, Integer, Map<Integer, Integer>> setValue = (mapVector, index, values) -> {
-      org.apache.arrow.vector.complex.impl.UnionMapWriter mapWriter = mapVector.getWriter();
-      mapWriter.setPosition(index);
-      mapWriter.startMap();
-      values.entrySet().forEach(mapValue -> {
-        if (mapValue != null) {
-          mapWriter.startEntry();
-          mapWriter.key().integer().writeInt(mapValue.getKey());
-          mapWriter.value().integer().writeInt(mapValue.getValue());
-          mapWriter.endEntry();
-        } else {
-          mapWriter.writeNull();
-        }
-      });
-      mapWriter.endMap();
-    };
+    TriConsumer<MapVector, Integer, Map<Integer, Integer>> setValue =
+        (mapVector, index, values) -> {
+          org.apache.arrow.vector.complex.impl.UnionMapWriter mapWriter = mapVector.getWriter();
+          mapWriter.setPosition(index);
+          mapWriter.startMap();
+          values
+              .entrySet()
+              .forEach(
+                  mapValue -> {
+                    if (mapValue != null) {
+                      mapWriter.startEntry();
+                      mapWriter.key().integer().writeInt(mapValue.getKey());
+                      mapWriter.value().integer().writeInt(mapValue.getValue());
+                      mapWriter.endEntry();
+                    } else {
+                      mapWriter.writeNull();
+                    }
+                  });
+          mapWriter.endMap();
+        };
 
     JsonStringHashMap<Integer, Integer> value1 = new JsonStringHashMap<Integer, Integer>();
     value1.put(1, 2);
@@ -547,8 +662,10 @@ void mapOfInteger() throws SQLException {
     JsonStringHashMap<Integer, Integer> value3 = new JsonStringHashMap<Integer, Integer>();
     value3.put(Integer.MIN_VALUE, Integer.MAX_VALUE);
     value3.put(0, 4096);
-    List<Map<Integer, Integer>> values = Arrays.asList(value1, value2, value3, Collections.emptyMap());
-    testMapType(new ArrowType.Map(true), setValue, MapVector::setNull, values, new ArrowType.Int(32, true));
+    List<Map<Integer, Integer>> values =
+        Arrays.asList(value1, value2, value3, Collections.emptyMap());
+    testMapType(
+        new ArrowType.Map(true), setValue, MapVector::setNull, values, new ArrowType.Int(32, true));
   }
 
   @FunctionalInterface
@@ -556,11 +673,16 @@ interface TriConsumer<T, U, V> {
     void accept(T value1, U value2, V value3);
   }
 
-  <T, V extends FieldVector> void testSimpleType(ArrowType arrowType, int jdbcType, TriConsumer<V, Integer, T> setValue,
-                          BiConsumer<V, Integer> setNull, List<T> values) throws SQLException {
+  <T, V extends FieldVector> void testSimpleType(
+      ArrowType arrowType,
+      int jdbcType,
+      TriConsumer<V, Integer, T> setValue,
+      BiConsumer<V, Integer> setNull,
+      List<T> values)
+      throws SQLException {
     Schema schema = new Schema(Collections.singletonList(Field.nullable("field", arrowType)));
     try (final MockPreparedStatement statement = new MockPreparedStatement();
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       final JdbcParameterBinder binder =
           JdbcParameterBinder.builder(statement, root).bindAll().build();
       assertThat(binder.next()).isFalse();
@@ -610,7 +732,7 @@ <T, V extends FieldVector> void testSimpleType(ArrowType arrowType, int jdbcType
     // Non-nullable (since some types have a specialized binder)
     schema = new Schema(Collections.singletonList(Field.notNullable("field", arrowType)));
     try (final MockPreparedStatement statement = new MockPreparedStatement();
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       final JdbcParameterBinder binder =
           JdbcParameterBinder.builder(statement, root).bindAll().build();
       assertThat(binder.next()).isFalse();
@@ -650,15 +772,23 @@ <T, V extends FieldVector> void testSimpleType(ArrowType arrowType, int jdbcType
     }
   }
 
-  <T, V extends FieldVector> void testListType(ArrowType arrowType, TriConsumer<V, Integer, T> setValue,
-                          BiConsumer<V, Integer> setNull, List<T> values) throws SQLException {
+  <T, V extends FieldVector> void testListType(
+      ArrowType arrowType,
+      TriConsumer<V, Integer, T> setValue,
+      BiConsumer<V, Integer> setNull,
+      List<T> values)
+      throws SQLException {
     int jdbcType = Types.ARRAY;
-    Schema schema = new Schema(Collections.singletonList(new Field("field", FieldType.nullable(
-            new ArrowType.List()), Collections.singletonList(
-            new Field("element", FieldType.notNullable(arrowType), null)
-    ))));
+    Schema schema =
+        new Schema(
+            Collections.singletonList(
+                new Field(
+                    "field",
+                    FieldType.nullable(new ArrowType.List()),
+                    Collections.singletonList(
+                        new Field("element", FieldType.notNullable(arrowType), null)))));
     try (final MockPreparedStatement statement = new MockPreparedStatement();
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       final JdbcParameterBinder binder =
           JdbcParameterBinder.builder(statement, root).bindAll().build();
       assertThat(binder.next()).isFalse();
@@ -706,12 +836,16 @@ <T, V extends FieldVector> void testListType(ArrowType arrowType, TriConsumer<V,
     }
 
     // Non-nullable (since some types have a specialized binder)
-    schema = new Schema(Collections.singletonList(new Field("field", FieldType.notNullable(
-            new ArrowType.List()), Collections.singletonList(
-            new Field("element", FieldType.notNullable(arrowType), null)
-    ))));
+    schema =
+        new Schema(
+            Collections.singletonList(
+                new Field(
+                    "field",
+                    FieldType.notNullable(new ArrowType.List()),
+                    Collections.singletonList(
+                        new Field("element", FieldType.notNullable(arrowType), null)))));
     try (final MockPreparedStatement statement = new MockPreparedStatement();
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       final JdbcParameterBinder binder =
           JdbcParameterBinder.builder(statement, root).bindAll().build();
       assertThat(binder.next()).isFalse();
@@ -751,18 +885,31 @@ <T, V extends FieldVector> void testListType(ArrowType arrowType, TriConsumer<V,
     }
   }
 
-  <T, V extends FieldVector> void testMapType(ArrowType arrowType, TriConsumer<V, Integer, T> setValue,
-                                              BiConsumer<V, Integer> setNull, List<T> values,
-                                              ArrowType elementType) throws SQLException {
+  <T, V extends FieldVector> void testMapType(
+      ArrowType arrowType,
+      TriConsumer<V, Integer, T> setValue,
+      BiConsumer<V, Integer> setNull,
+      List<T> values,
+      ArrowType elementType)
+      throws SQLException {
     int jdbcType = Types.VARCHAR;
     FieldType keyType = new FieldType(false, elementType, null, null);
     FieldType mapType = new FieldType(false, ArrowType.Struct.INSTANCE, null, null);
-    Schema schema = new Schema(Collections.singletonList(new Field("field", FieldType.nullable(arrowType),
-            Collections.singletonList(new Field(MapVector.KEY_NAME, mapType,
-                    Arrays.asList(new Field(MapVector.KEY_NAME, keyType, null),
-                            new Field(MapVector.VALUE_NAME, keyType, null)))))));
+    Schema schema =
+        new Schema(
+            Collections.singletonList(
+                new Field(
+                    "field",
+                    FieldType.nullable(arrowType),
+                    Collections.singletonList(
+                        new Field(
+                            MapVector.KEY_NAME,
+                            mapType,
+                            Arrays.asList(
+                                new Field(MapVector.KEY_NAME, keyType, null),
+                                new Field(MapVector.VALUE_NAME, keyType, null)))))));
     try (final MockPreparedStatement statement = new MockPreparedStatement();
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       final JdbcParameterBinder binder =
           JdbcParameterBinder.builder(statement, root).bindAll().build();
       assertThat(binder.next()).isFalse();
@@ -810,18 +957,31 @@ <T, V extends FieldVector> void testMapType(ArrowType arrowType, TriConsumer<V,
     }
 
     // Non-nullable (since some types have a specialized binder)
-    schema = new Schema(Collections.singletonList(new Field("field", FieldType.notNullable(arrowType),
-            Collections.singletonList(new Field(MapVector.KEY_NAME, mapType,
-                    Arrays.asList(new Field(MapVector.KEY_NAME, keyType, null),
-                            new Field(MapVector.VALUE_NAME, keyType, null)))))));
+    schema =
+        new Schema(
+            Collections.singletonList(
+                new Field(
+                    "field",
+                    FieldType.notNullable(arrowType),
+                    Collections.singletonList(
+                        new Field(
+                            MapVector.KEY_NAME,
+                            mapType,
+                            Arrays.asList(
+                                new Field(MapVector.KEY_NAME, keyType, null),
+                                new Field(MapVector.VALUE_NAME, keyType, null)))))));
     try (final MockPreparedStatement statement = new MockPreparedStatement();
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       @SuppressWarnings("unchecked")
       final V vector = (V) root.getVector(0);
 
       final JdbcParameterBinder binder =
-          JdbcParameterBinder.builder(statement, root).bind(1,
-                  new org.apache.arrow.adapter.jdbc.binder.MapBinder((MapVector) vector, Types.OTHER)).build();
+          JdbcParameterBinder.builder(statement, root)
+              .bind(
+                  1,
+                  new org.apache.arrow.adapter.jdbc.binder.MapBinder(
+                      (MapVector) vector, Types.OTHER))
+              .build();
       assertThat(binder.next()).isFalse();
 
       setValue.accept(vector, 0, values.get(0));
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowCommentMetadataTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowCommentMetadataTest.java
index 07cab0d829fed..e7e324c7847f4 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowCommentMetadataTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowCommentMetadataTest.java
@@ -14,14 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.DriverManager;
@@ -34,22 +30,21 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
-
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.types.Types;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class JdbcToArrowCommentMetadataTest {
 
-  private static final String COMMENT = "comment"; //use this metadata key for interoperability with Spark StructType
+  private static final String COMMENT =
+      "comment"; // use this metadata key for interoperability with Spark StructType
   private Connection conn = null;
 
   /**
@@ -58,15 +53,16 @@ public class JdbcToArrowCommentMetadataTest {
    * @throws SQLException on error
    * @throws ClassNotFoundException on error
    */
-  @Before
+  @BeforeEach
   public void setUp() throws SQLException, ClassNotFoundException {
-    String url = "jdbc:h2:mem:JdbcToArrowTest?characterEncoding=UTF-8;INIT=runscript from 'classpath:/h2/comment.sql'";
+    String url =
+        "jdbc:h2:mem:JdbcToArrowTest?characterEncoding=UTF-8;INIT=runscript from 'classpath:/h2/comment.sql'";
     String driver = "org.h2.Driver";
     Class.forName(driver);
     conn = DriverManager.getConnection(url);
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws SQLException {
     if (conn != null) {
       conn.close();
@@ -74,7 +70,8 @@ public void tearDown() throws SQLException {
     }
   }
 
-  private static Field field(String name, boolean nullable, ArrowType type, Map<String, String> metadata) {
+  private static Field field(
+      String name, boolean nullable, ArrowType type, Map<String, String> metadata) {
     return new Field(name, new FieldType(nullable, type, null, metadata), Collections.emptyList());
   }
 
@@ -94,16 +91,26 @@ private static Map<String, String> metadata(String... entries) {
   public void schemaComment() throws Exception {
     boolean includeMetadata = false;
     Schema schema = getSchemaWithCommentFromQuery(includeMetadata);
-    Schema expectedSchema = new Schema(Arrays.asList(
-        field("ID", false, Types.MinorType.BIGINT.getType(),
-            metadata("comment", "Record identifier")),
-        field("NAME", true, Types.MinorType.VARCHAR.getType(),
-            metadata("comment", "Name of record")),
-        field("COLUMN1", true, Types.MinorType.BIT.getType(),
-            metadata()),
-        field("COLUMNN", true, Types.MinorType.INT.getType(),
-            metadata("comment", "Informative description of columnN"))
-        ), metadata("comment", "This is super special table with valuable data"));
+    Schema expectedSchema =
+        new Schema(
+            Arrays.asList(
+                field(
+                    "ID",
+                    false,
+                    Types.MinorType.BIGINT.getType(),
+                    metadata("comment", "Record identifier")),
+                field(
+                    "NAME",
+                    true,
+                    Types.MinorType.VARCHAR.getType(),
+                    metadata("comment", "Name of record")),
+                field("COLUMN1", true, Types.MinorType.BIT.getType(), metadata()),
+                field(
+                    "COLUMNN",
+                    true,
+                    Types.MinorType.INT.getType(),
+                    metadata("comment", "Informative description of columnN"))),
+            metadata("comment", "This is super special table with valuable data"));
     assertThat(schema).isEqualTo(expectedSchema);
   }
 
@@ -111,47 +118,60 @@ public void schemaComment() throws Exception {
   public void schemaCommentWithDatabaseMetadata() throws Exception {
     boolean includeMetadata = true;
     Schema schema = getSchemaWithCommentFromQuery(includeMetadata);
-    Schema expectedSchema = new Schema(Arrays.asList(
-        field("ID", false, Types.MinorType.BIGINT.getType(),
-            metadata(
-                "SQL_CATALOG_NAME", "JDBCTOARROWTEST?CHARACTERENCODING=UTF-8",
-                "SQL_SCHEMA_NAME", "PUBLIC",
-                "SQL_TABLE_NAME", "TABLE1",
-                "SQL_COLUMN_NAME", "ID",
-                "SQL_TYPE", "BIGINT",
-                "comment", "Record identifier"
-            )),
-        field("NAME", true, Types.MinorType.VARCHAR.getType(),
-            metadata(
-                "SQL_CATALOG_NAME", "JDBCTOARROWTEST?CHARACTERENCODING=UTF-8",
-                "SQL_SCHEMA_NAME", "PUBLIC",
-                "SQL_TABLE_NAME", "TABLE1",
-                "SQL_COLUMN_NAME", "NAME",
-                "SQL_TYPE", "CHARACTER VARYING",
-                "comment", "Name of record")),
-        field("COLUMN1", true, Types.MinorType.BIT.getType(),
-            metadata(
-                "SQL_CATALOG_NAME", "JDBCTOARROWTEST?CHARACTERENCODING=UTF-8",
-                "SQL_SCHEMA_NAME", "PUBLIC",
-                "SQL_TABLE_NAME", "TABLE1",
-                "SQL_COLUMN_NAME", "COLUMN1",
-                "SQL_TYPE", "BOOLEAN")),
-        field("COLUMNN", true, Types.MinorType.INT.getType(),
-            metadata(
-                "SQL_CATALOG_NAME", "JDBCTOARROWTEST?CHARACTERENCODING=UTF-8",
-                "SQL_SCHEMA_NAME", "PUBLIC",
-                "SQL_TABLE_NAME", "TABLE1",
-                "SQL_COLUMN_NAME", "COLUMNN",
-                "SQL_TYPE", "INTEGER",
-                "comment", "Informative description of columnN"))
-    ), metadata("comment", "This is super special table with valuable data"));
+    Schema expectedSchema =
+        new Schema(
+            Arrays.asList(
+                field(
+                    "ID",
+                    false,
+                    Types.MinorType.BIGINT.getType(),
+                    metadata(
+                        "SQL_CATALOG_NAME", "JDBCTOARROWTEST?CHARACTERENCODING=UTF-8",
+                        "SQL_SCHEMA_NAME", "PUBLIC",
+                        "SQL_TABLE_NAME", "TABLE1",
+                        "SQL_COLUMN_NAME", "ID",
+                        "SQL_TYPE", "BIGINT",
+                        "comment", "Record identifier")),
+                field(
+                    "NAME",
+                    true,
+                    Types.MinorType.VARCHAR.getType(),
+                    metadata(
+                        "SQL_CATALOG_NAME", "JDBCTOARROWTEST?CHARACTERENCODING=UTF-8",
+                        "SQL_SCHEMA_NAME", "PUBLIC",
+                        "SQL_TABLE_NAME", "TABLE1",
+                        "SQL_COLUMN_NAME", "NAME",
+                        "SQL_TYPE", "CHARACTER VARYING",
+                        "comment", "Name of record")),
+                field(
+                    "COLUMN1",
+                    true,
+                    Types.MinorType.BIT.getType(),
+                    metadata(
+                        "SQL_CATALOG_NAME", "JDBCTOARROWTEST?CHARACTERENCODING=UTF-8",
+                        "SQL_SCHEMA_NAME", "PUBLIC",
+                        "SQL_TABLE_NAME", "TABLE1",
+                        "SQL_COLUMN_NAME", "COLUMN1",
+                        "SQL_TYPE", "BOOLEAN")),
+                field(
+                    "COLUMNN",
+                    true,
+                    Types.MinorType.INT.getType(),
+                    metadata(
+                        "SQL_CATALOG_NAME", "JDBCTOARROWTEST?CHARACTERENCODING=UTF-8",
+                        "SQL_SCHEMA_NAME", "PUBLIC",
+                        "SQL_TABLE_NAME", "TABLE1",
+                        "SQL_COLUMN_NAME", "COLUMNN",
+                        "SQL_TYPE", "INTEGER",
+                        "comment", "Informative description of columnN"))),
+            metadata("comment", "This is super special table with valuable data"));
     assertThat(schema).isEqualTo(expectedSchema);
     /* corresponding Apache Spark DDL after conversion:
-        ID BIGINT NOT NULL COMMENT 'Record identifier',
-        NAME STRING COMMENT 'Name of record',
-        COLUMN1 BOOLEAN,
-        COLUMNN INT COMMENT 'Informative description of columnN'
-     */
+       ID BIGINT NOT NULL COMMENT 'Record identifier',
+       NAME STRING COMMENT 'Name of record',
+       COLUMN1 BOOLEAN,
+       COLUMNN INT COMMENT 'Informative description of columnN'
+    */
     assertThat(schema).isEqualTo(expectedSchema);
   }
 
@@ -160,19 +180,25 @@ private Schema getSchemaWithCommentFromQuery(boolean includeMetadata) throws SQL
     try (Statement statement = conn.createStatement()) {
       try (ResultSet resultSet = statement.executeQuery("select * from table1")) {
         ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
-        Map<Integer, Map<String, String>> columnCommentByColumnIndex = getColumnComments(metaData, resultSetMetaData);
+        Map<Integer, Map<String, String>> columnCommentByColumnIndex =
+            getColumnComments(metaData, resultSetMetaData);
 
         String tableName = getTableNameFromResultSetMetaData(resultSetMetaData);
         String tableComment = getTableComment(metaData, tableName);
-        JdbcToArrowConfig config = new JdbcToArrowConfigBuilder()
-                .setAllocator(new RootAllocator()).setSchemaMetadata(Collections.singletonMap(COMMENT, tableComment))
-                .setColumnMetadataByColumnIndex(columnCommentByColumnIndex).setIncludeMetadata(includeMetadata).build();
+        JdbcToArrowConfig config =
+            new JdbcToArrowConfigBuilder()
+                .setAllocator(new RootAllocator())
+                .setSchemaMetadata(Collections.singletonMap(COMMENT, tableComment))
+                .setColumnMetadataByColumnIndex(columnCommentByColumnIndex)
+                .setIncludeMetadata(includeMetadata)
+                .build();
         return JdbcToArrowUtils.jdbcToArrowSchema(resultSetMetaData, config);
       }
     }
   }
 
-  private String getTableNameFromResultSetMetaData(ResultSetMetaData resultSetMetaData) throws SQLException {
+  private String getTableNameFromResultSetMetaData(ResultSetMetaData resultSetMetaData)
+      throws SQLException {
     Set<String> tablesFromQuery = new HashSet<>();
     for (int idx = 1, columnCount = resultSetMetaData.getColumnCount(); idx <= columnCount; idx++) {
       String tableName = resultSetMetaData.getTableName(idx);
@@ -186,11 +212,16 @@ private String getTableNameFromResultSetMetaData(ResultSetMetaData resultSetMeta
     throw new RuntimeException("Table metadata is absent or ambiguous");
   }
 
-  private Map<Integer, Map<String, String>> getColumnComments(DatabaseMetaData metaData,
-                                                 ResultSetMetaData resultSetMetaData) throws SQLException {
+  private Map<Integer, Map<String, String>> getColumnComments(
+      DatabaseMetaData metaData, ResultSetMetaData resultSetMetaData) throws SQLException {
     Map<Integer, Map<String, String>> columnCommentByColumnIndex = new HashMap<>();
-    for (int columnIdx = 1, columnCount = resultSetMetaData.getColumnCount(); columnIdx <= columnCount; columnIdx++) {
-      String columnComment = getColumnComment(metaData, resultSetMetaData.getTableName(columnIdx),
+    for (int columnIdx = 1, columnCount = resultSetMetaData.getColumnCount();
+        columnIdx <= columnCount;
+        columnIdx++) {
+      String columnComment =
+          getColumnComment(
+              metaData,
+              resultSetMetaData.getTableName(columnIdx),
               resultSetMetaData.getColumnName(columnIdx));
       if (columnComment != null && !columnComment.isEmpty()) {
         columnCommentByColumnIndex.put(columnIdx, Collections.singletonMap(COMMENT, columnComment));
@@ -220,7 +251,8 @@ private String getTableComment(DatabaseMetaData metaData, String tableName) thro
     throw new RuntimeException("Table comment not found");
   }
 
-  private String getColumnComment(DatabaseMetaData metaData, String tableName, String columnName) throws SQLException {
+  private String getColumnComment(DatabaseMetaData metaData, String tableName, String columnName)
+      throws SQLException {
     try (ResultSet tableMetadata = metaData.getColumns(null, null, tableName, columnName)) {
       if (tableMetadata.next()) {
         return tableMetadata.getString("REMARKS");
@@ -228,9 +260,4 @@ private String getColumnComment(DatabaseMetaData metaData, String tableName, Str
     }
     return null;
   }
-
-  private String getExpectedSchema(String expectedResource) throws java.io.IOException, java.net.URISyntaxException {
-    return new String(Files.readAllBytes(Paths.get(Objects.requireNonNull(
-            JdbcToArrowCommentMetadataTest.class.getResource(expectedResource)).toURI())), StandardCharsets.UTF_8);
-  }
 }
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java
index 68a681b052cd3..70c753cf2f8ba 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java
@@ -14,38 +14,46 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.sql.Types;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.TimeZone;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class JdbcToArrowConfigTest {
 
   private static final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-  private static final Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.ROOT);
+  private static final Calendar calendar =
+      Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.ROOT);
 
-  @Test(expected = NullPointerException.class)
+  @Test
   public void testConfigNullArguments() {
-    new JdbcToArrowConfig(null, null);
+    assertThrows(
+        NullPointerException.class,
+        () -> {
+          new JdbcToArrowConfig(null, null);
+        });
   }
 
-  @Test(expected = NullPointerException.class)
+  @Test
   public void testBuilderNullArguments() {
-    new JdbcToArrowConfigBuilder(null, null);
+    assertThrows(
+        NullPointerException.class,
+        () -> {
+          new JdbcToArrowConfigBuilder(null, null);
+        });
   }
 
   @Test
@@ -61,20 +69,32 @@ public void testBuilderNullCalendar() {
     assertNull(config.getCalendar());
   }
 
-  @Test(expected = NullPointerException.class)
+  @Test
   public void testConfigNullAllocator() {
-    new JdbcToArrowConfig(null, calendar);
+    assertThrows(
+        NullPointerException.class,
+        () -> {
+          new JdbcToArrowConfig(null, calendar);
+        });
   }
 
-  @Test(expected = NullPointerException.class)
+  @Test
   public void testBuilderNullAllocator() {
-    new JdbcToArrowConfigBuilder(null, calendar);
+    assertThrows(
+        NullPointerException.class,
+        () -> {
+          new JdbcToArrowConfigBuilder(null, calendar);
+        });
   }
 
-  @Test(expected = NullPointerException.class)
+  @Test
   public void testSetNullAllocator() {
-    JdbcToArrowConfigBuilder builder = new JdbcToArrowConfigBuilder(allocator, calendar);
-    builder.setAllocator(null);
+    assertThrows(
+        NullPointerException.class,
+        () -> {
+          JdbcToArrowConfigBuilder builder = new JdbcToArrowConfigBuilder(allocator, calendar);
+          builder.setAllocator(null);
+        });
   }
 
   @Test
@@ -89,8 +109,8 @@ public void testConfig() {
     JdbcToArrowConfigBuilder builder = new JdbcToArrowConfigBuilder(allocator, calendar);
     JdbcToArrowConfig config = builder.build();
 
-    assertTrue(allocator == config.getAllocator());
-    assertTrue(calendar == config.getCalendar());
+    assertEquals(allocator, config.getAllocator());
+    assertEquals(calendar, config.getCalendar());
 
     Calendar newCalendar = Calendar.getInstance();
     BufferAllocator newAllocator = new RootAllocator(Integer.SIZE);
@@ -98,8 +118,8 @@ public void testConfig() {
     builder.setAllocator(newAllocator).setCalendar(newCalendar);
     config = builder.build();
 
-    assertTrue(newAllocator == config.getAllocator());
-    assertTrue(newCalendar == config.getCalendar());
+    assertEquals(newAllocator, config.getAllocator());
+    assertEquals(newCalendar, config.getCalendar());
   }
 
   @Test
@@ -116,13 +136,29 @@ public void testIncludeMetadata() {
     config = new JdbcToArrowConfigBuilder(allocator, calendar, true).build();
     assertTrue(config.shouldIncludeMetadata());
 
-    config = new JdbcToArrowConfig(allocator, calendar, /* include metadata */ true,
-        /* reuse vector schema root */ true, null, null, JdbcToArrowConfig.NO_LIMIT_BATCH_SIZE, null);
+    config =
+        new JdbcToArrowConfig(
+            allocator,
+            calendar, /* include metadata */
+            true,
+            /* reuse vector schema root */ true,
+            null,
+            null,
+            JdbcToArrowConfig.NO_LIMIT_BATCH_SIZE,
+            null);
     assertTrue(config.shouldIncludeMetadata());
     assertTrue(config.isReuseVectorSchemaRoot());
 
-    config = new JdbcToArrowConfig(allocator, calendar, /* include metadata */ false,
-        /* reuse vector schema root */ false, null, null, JdbcToArrowConfig.NO_LIMIT_BATCH_SIZE, null);
+    config =
+        new JdbcToArrowConfig(
+            allocator,
+            calendar, /* include metadata */
+            false,
+            /* reuse vector schema root */ false,
+            null,
+            null,
+            JdbcToArrowConfig.NO_LIMIT_BATCH_SIZE,
+            null);
     assertFalse(config.shouldIncludeMetadata());
     assertFalse(config.isReuseVectorSchemaRoot());
   }
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowTestHelper.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowTestHelper.java
index 91f2f465dd989..74b1ca34d73c6 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowTestHelper.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowTestHelper.java
@@ -14,16 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.math.BigDecimal;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.util.AbstractMap;
@@ -31,7 +34,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.arrow.vector.BaseValueVector;
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.BitVector;
@@ -57,12 +59,9 @@
 import org.apache.arrow.vector.util.ObjectMapperFactory;
 import org.apache.arrow.vector.util.Text;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
- * This is a Helper class which has functionalities to read and assert the values from the given FieldVector object.
+ * This is a Helper class which has functionalities to read and assert the values from the given
+ * FieldVector object.
  */
 public class JdbcToArrowTestHelper {
 
@@ -78,7 +77,8 @@ public static void assertIntVectorValues(IntVector intVector, int rowCount, Inte
     }
   }
 
-  public static void assertBooleanVectorValues(BitVector bitVector, int rowCount, Boolean[] values) {
+  public static void assertBooleanVectorValues(
+      BitVector bitVector, int rowCount, Boolean[] values) {
     assertEquals(rowCount, bitVector.getValueCount());
 
     for (int j = 0; j < bitVector.getValueCount(); j++) {
@@ -102,7 +102,8 @@ public static void assertBitVectorValues(BitVector bitVector, int rowCount, Inte
     }
   }
 
-  public static void assertTinyIntVectorValues(TinyIntVector tinyIntVector, int rowCount, Integer[] values) {
+  public static void assertTinyIntVectorValues(
+      TinyIntVector tinyIntVector, int rowCount, Integer[] values) {
     assertEquals(rowCount, tinyIntVector.getValueCount());
 
     for (int j = 0; j < tinyIntVector.getValueCount(); j++) {
@@ -114,7 +115,8 @@ public static void assertTinyIntVectorValues(TinyIntVector tinyIntVector, int ro
     }
   }
 
-  public static void assertSmallIntVectorValues(SmallIntVector smallIntVector, int rowCount, Integer[] values) {
+  public static void assertSmallIntVectorValues(
+      SmallIntVector smallIntVector, int rowCount, Integer[] values) {
     assertEquals(rowCount, smallIntVector.getValueCount());
 
     for (int j = 0; j < smallIntVector.getValueCount(); j++) {
@@ -126,7 +128,8 @@ public static void assertSmallIntVectorValues(SmallIntVector smallIntVector, int
     }
   }
 
-  public static void assertBigIntVectorValues(BigIntVector bigIntVector, int rowCount, Long[] values) {
+  public static void assertBigIntVectorValues(
+      BigIntVector bigIntVector, int rowCount, Long[] values) {
     assertEquals(rowCount, bigIntVector.getValueCount());
 
     for (int j = 0; j < bigIntVector.getValueCount(); j++) {
@@ -138,7 +141,8 @@ public static void assertBigIntVectorValues(BigIntVector bigIntVector, int rowCo
     }
   }
 
-  public static void assertDecimalVectorValues(DecimalVector decimalVector, int rowCount, BigDecimal[] values) {
+  public static void assertDecimalVectorValues(
+      DecimalVector decimalVector, int rowCount, BigDecimal[] values) {
     assertEquals(rowCount, decimalVector.getValueCount());
 
     for (int j = 0; j < decimalVector.getValueCount(); j++) {
@@ -150,7 +154,8 @@ public static void assertDecimalVectorValues(DecimalVector decimalVector, int ro
     }
   }
 
-  public static void assertFloat8VectorValues(Float8Vector float8Vector, int rowCount, Double[] values) {
+  public static void assertFloat8VectorValues(
+      Float8Vector float8Vector, int rowCount, Double[] values) {
     assertEquals(rowCount, float8Vector.getValueCount());
 
     for (int j = 0; j < float8Vector.getValueCount(); j++) {
@@ -162,7 +167,8 @@ public static void assertFloat8VectorValues(Float8Vector float8Vector, int rowCo
     }
   }
 
-  public static void assertFloat4VectorValues(Float4Vector float4Vector, int rowCount, Float[] values) {
+  public static void assertFloat4VectorValues(
+      Float4Vector float4Vector, int rowCount, Float[] values) {
     assertEquals(rowCount, float4Vector.getValueCount());
 
     for (int j = 0; j < float4Vector.getValueCount(); j++) {
@@ -174,7 +180,8 @@ public static void assertFloat4VectorValues(Float4Vector float4Vector, int rowCo
     }
   }
 
-  public static void assertTimeVectorValues(TimeMilliVector timeMilliVector, int rowCount, Long[] values) {
+  public static void assertTimeVectorValues(
+      TimeMilliVector timeMilliVector, int rowCount, Long[] values) {
     assertEquals(rowCount, timeMilliVector.getValueCount());
 
     for (int j = 0; j < timeMilliVector.getValueCount(); j++) {
@@ -186,7 +193,8 @@ public static void assertTimeVectorValues(TimeMilliVector timeMilliVector, int r
     }
   }
 
-  public static void assertDateVectorValues(DateDayVector dateDayVector, int rowCount, Integer[] values) {
+  public static void assertDateVectorValues(
+      DateDayVector dateDayVector, int rowCount, Integer[] values) {
     assertEquals(rowCount, dateDayVector.getValueCount());
 
     for (int j = 0; j < dateDayVector.getValueCount(); j++) {
@@ -198,7 +206,8 @@ public static void assertDateVectorValues(DateDayVector dateDayVector, int rowCo
     }
   }
 
-  public static void assertTimeStampVectorValues(TimeStampVector timeStampVector, int rowCount, Long[] values) {
+  public static void assertTimeStampVectorValues(
+      TimeStampVector timeStampVector, int rowCount, Long[] values) {
     assertEquals(rowCount, timeStampVector.getValueCount());
 
     for (int j = 0; j < timeStampVector.getValueCount(); j++) {
@@ -210,7 +219,8 @@ public static void assertTimeStampVectorValues(TimeStampVector timeStampVector,
     }
   }
 
-  public static void assertVarBinaryVectorValues(VarBinaryVector varBinaryVector, int rowCount, byte[][] values) {
+  public static void assertVarBinaryVectorValues(
+      VarBinaryVector varBinaryVector, int rowCount, byte[][] values) {
     assertEquals(rowCount, varBinaryVector.getValueCount());
 
     for (int j = 0; j < varBinaryVector.getValueCount(); j++) {
@@ -222,7 +232,8 @@ public static void assertVarBinaryVectorValues(VarBinaryVector varBinaryVector,
     }
   }
 
-  public static void assertVarcharVectorValues(VarCharVector varCharVector, int rowCount, byte[][] values) {
+  public static void assertVarcharVectorValues(
+      VarCharVector varCharVector, int rowCount, byte[][] values) {
     assertEquals(rowCount, varCharVector.getValueCount());
 
     for (int j = 0; j < varCharVector.getValueCount(); j++) {
@@ -238,7 +249,8 @@ public static void assertNullVectorValues(NullVector vector, int rowCount) {
     assertEquals(rowCount, vector.getValueCount());
   }
 
-  public static void assertListVectorValues(ListVector listVector, int rowCount, Integer[][] values) {
+  public static void assertListVectorValues(
+      ListVector listVector, int rowCount, Integer[][] values) {
     assertEquals(rowCount, listVector.getValueCount());
 
     for (int j = 0; j < listVector.getValueCount(); j++) {
@@ -251,7 +263,8 @@ public static void assertListVectorValues(ListVector listVector, int rowCount, I
     }
   }
 
-  public static void assertMapVectorValues(MapVector mapVector, int rowCount, Map<String, String>[] values) {
+  public static void assertMapVectorValues(
+      MapVector mapVector, int rowCount, Map<String, String>[] values) {
     assertEquals(rowCount, mapVector.getValueCount());
 
     for (int j = 0; j < mapVector.getValueCount(); j++) {
@@ -262,10 +275,17 @@ public static void assertMapVectorValues(MapVector mapVector, int rowCount, Map<
             (JsonStringArrayList<JsonStringHashMap<String, Text>>) mapVector.getObject(j);
         Map<String, String> actualMap = null;
         if (actualSource != null && !actualSource.isEmpty()) {
-          actualMap = actualSource.stream().map(entry ->
-            new AbstractMap.SimpleEntry<>(entry.get("key").toString(),
-                    entry.get("value") != null ? entry.get("value").toString() : null))
-          .collect(HashMap::new, (collector, val) -> collector.put(val.getKey(), val.getValue()), HashMap::putAll);
+          actualMap =
+              actualSource.stream()
+                  .map(
+                      entry ->
+                          new AbstractMap.SimpleEntry<>(
+                              entry.get("key").toString(),
+                              entry.get("value") != null ? entry.get("value").toString() : null))
+                  .collect(
+                      HashMap::new,
+                      (collector, val) -> collector.put(val.getKey(), val.getValue()),
+                      HashMap::putAll);
         }
         assertEquals(values[j], actualMap);
       }
@@ -309,8 +329,8 @@ public static void assertFieldMetadataIsEmpty(VectorSchemaRoot schema) {
     }
   }
 
-  public static void assertFieldMetadataMatchesResultSetMetadata(ResultSetMetaData rsmd, Schema schema)
-      throws SQLException {
+  public static void assertFieldMetadataMatchesResultSetMetadata(
+      ResultSetMetaData rsmd, Schema schema) throws SQLException {
     assertNotNull(schema);
     assertNotNull(schema.getFields());
     assertNotNull(rsmd);
@@ -399,12 +419,14 @@ public static byte[][] getCharArray(String[] values, String dataType) {
     byte[][] valueArr = new byte[dataArr.length][];
     int i = 0;
     for (String data : dataArr) {
-      valueArr[i++] = "null".equals(data.trim()) ? null : data.trim().getBytes();
+      valueArr[i++] =
+          "null".equals(data.trim()) ? null : data.trim().getBytes(StandardCharsets.UTF_8);
     }
     return valueArr;
   }
 
-  public static byte[][] getCharArrayWithCharSet(String[] values, String dataType, Charset charSet) {
+  public static byte[][] getCharArrayWithCharSet(
+      String[] values, String dataType, Charset charSet) {
     String[] dataArr = getValues(values, dataType);
     byte[][] valueArr = new byte[dataArr.length][];
     int i = 0;
@@ -419,11 +441,13 @@ public static byte[][] getBinaryValues(String[] values, String dataType) {
     byte[][] valueArr = new byte[dataArr.length][];
     int i = 0;
     for (String data : dataArr) {
-      valueArr[i++] = "null".equals(data.trim()) ? null : data.trim().getBytes();
+      valueArr[i++] =
+          "null".equals(data.trim()) ? null : data.trim().getBytes(StandardCharsets.UTF_8);
     }
     return valueArr;
   }
 
+  @SuppressWarnings("StringSplitter")
   public static String[] getValues(String[] values, String dataType) {
     String value = "";
     for (String val : values) {
@@ -440,6 +464,7 @@ public static Integer[][] getListValues(String[] values, String dataType) {
     return getListValues(dataArr);
   }
 
+  @SuppressWarnings("StringSplitter")
   public static Integer[][] getListValues(String[] dataArr) {
     Integer[][] valueArr = new Integer[dataArr.length][];
     int i = 0;
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/MockPreparedStatement.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/MockPreparedStatement.java
index 4478cdfbee6f7..8dfc684e22f24 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/MockPreparedStatement.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/MockPreparedStatement.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
 import java.io.InputStream;
@@ -231,8 +230,7 @@ public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLExceptio
   }
 
   @Override
-  public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException {
-  }
+  public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException {}
 
   @Override
   public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws SQLException {
@@ -242,8 +240,7 @@ public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws S
   }
 
   @Override
-  public void setNull(int parameterIndex, int sqlType, String typeName) throws SQLException {
-  }
+  public void setNull(int parameterIndex, int sqlType, String typeName) throws SQLException {}
 
   @Override
   public void setURL(int parameterIndex, URL x) throws SQLException {
@@ -261,80 +258,62 @@ public void setRowId(int parameterIndex, RowId x) throws SQLException {
   }
 
   @Override
-  public void setNString(int parameterIndex, String value) throws SQLException {
-  }
+  public void setNString(int parameterIndex, String value) throws SQLException {}
 
   @Override
   public void setNCharacterStream(int parameterIndex, Reader value, long length)
-      throws SQLException {
-  }
+      throws SQLException {}
 
   @Override
-  public void setNClob(int parameterIndex, NClob value) throws SQLException {
-  }
+  public void setNClob(int parameterIndex, NClob value) throws SQLException {}
 
   @Override
-  public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
-  }
+  public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {}
 
   @Override
   public void setBlob(int parameterIndex, InputStream inputStream, long length)
-      throws SQLException {
-  }
+      throws SQLException {}
 
   @Override
-  public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
-  }
+  public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {}
 
   @Override
-  public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {
-  }
+  public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException {}
 
   @Override
   public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength)
-      throws SQLException {
-  }
+      throws SQLException {}
 
   @Override
-  public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {
-  }
+  public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException {}
 
   @Override
-  public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {
-  }
+  public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException {}
 
   @Override
   public void setCharacterStream(int parameterIndex, Reader reader, long length)
-      throws SQLException {
-  }
+      throws SQLException {}
 
   @Override
-  public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {
-  }
+  public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException {}
 
   @Override
-  public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {
-  }
+  public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException {}
 
   @Override
-  public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
-  }
+  public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {}
 
   @Override
-  public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {
-  }
+  public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException {}
 
   @Override
-  public void setClob(int parameterIndex, Reader reader) throws SQLException {
-  }
+  public void setClob(int parameterIndex, Reader reader) throws SQLException {}
 
   @Override
-  public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
-  }
+  public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {}
 
   @Override
-  public void setNClob(int parameterIndex, Reader reader) throws SQLException {
-  }
+  public void setNClob(int parameterIndex, Reader reader) throws SQLException {}
 
   @Override
   public ResultSet executeQuery(String sql) throws SQLException {
@@ -347,8 +326,7 @@ public int executeUpdate(String sql) throws SQLException {
   }
 
   @Override
-  public void close() throws SQLException {
-  }
+  public void close() throws SQLException {}
 
   @Override
   public int getMaxFieldSize() throws SQLException {
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/ResultSetUtility.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/ResultSetUtility.java
index ccc7681c5bc8b..5f5f6dcb98d43 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/ResultSetUtility.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/ResultSetUtility.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
 import java.io.InputStream;
@@ -48,13 +47,11 @@ public class ResultSetUtility {
   public static ResultSet generateEmptyResultSet() throws SQLException {
     MockDataElement element = new MockDataElement("string_example");
     MockResultSetMetaData.MockColumnMetaData columnMetaData =
-            MockResultSetMetaData.MockColumnMetaData.fromDataElement(element, 1);
+        MockResultSetMetaData.MockColumnMetaData.fromDataElement(element, 1);
     ArrayList<MockResultSetMetaData.MockColumnMetaData> cols = new ArrayList<>();
     cols.add(columnMetaData);
     ResultSetMetaData metadata = new MockResultSetMetaData(cols);
-    return MockResultSet.builder()
-            .setMetaData(metadata)
-            .build();
+    return MockResultSet.builder().setMetaData(metadata).build();
   }
 
   public static MockResultSet generateBasicResultSet(int rows) throws SQLException {
@@ -66,17 +63,17 @@ public static MockResultSet generateBasicResultSet(int rows) throws SQLException
   }
 
   public static class MockResultSet extends ThrowingResultSet {
-    private final ArrayList<MockRow> rows;
+    private final List<MockRow> rows;
     private int index = 0;
     private boolean isClosed = false;
     private ResultSetMetaData metadata;
     private boolean wasNull;
 
-    public MockResultSet(ArrayList<MockRow> rows) throws SQLException {
+    public MockResultSet(List<MockRow> rows) throws SQLException {
       this(rows, MockResultSetMetaData.fromRows(rows));
     }
 
-    public MockResultSet(ArrayList<MockRow> rows, ResultSetMetaData metadata) {
+    public MockResultSet(List<MockRow> rows, ResultSetMetaData metadata) {
       this.rows = rows;
       this.metadata = metadata;
       this.wasNull = false;
@@ -252,8 +249,8 @@ public Builder addDataElement(Object val, int sqlType) {
         return this.addDataElement(new MockDataElement(val, sqlType));
       }
 
-      public Builder setMetaData(ResultSetMetaData metaData) {
-        this.metadata = metaData;
+      public Builder setMetaData(ResultSetMetaData metadata) {
+        this.metadata = metadata;
         return this;
       }
 
@@ -318,16 +315,20 @@ public String getColumnTypeName(int column) throws SQLException {
       return columns.get(column - 1).getTypeName();
     }
 
-    public static MockResultSetMetaData fromRows(ArrayList<MockRow> rows) throws SQLException {
-      // Note: This attempts to dynamically construct ResultSetMetaData from the first row in a given result set.
-      // If there are now rows, or the result set contains no columns, this cannot be dynamically generated and
+    public static MockResultSetMetaData fromRows(List<MockRow> rows) throws SQLException {
+      // Note: This attempts to dynamically construct ResultSetMetaData from the first row in a
+      // given result set.
+      // If there are now rows, or the result set contains no columns, this cannot be dynamically
+      // generated and
       // an exception will be thrown.
       if (rows.size() == 0) {
-        throw new SQLException("Unable to dynamically generate ResultSetMetaData because row count is zero!");
+        throw new SQLException(
+            "Unable to dynamically generate ResultSetMetaData because row count is zero!");
       }
       MockRow firstRow = rows.get(0);
       if (firstRow.dataElements.size() == 0) {
-        throw new SQLException("Unable to dynamically generate ResultSetMetaData because column count is zero!");
+        throw new SQLException(
+            "Unable to dynamically generate ResultSetMetaData because column count is zero!");
       }
       ArrayList<MockColumnMetaData> columns = new ArrayList<>();
       for (int i = 0; i < firstRow.dataElements.size(); i++) {
@@ -338,7 +339,6 @@ public static MockResultSetMetaData fromRows(ArrayList<MockRow> rows) throws SQL
     }
 
     public static class MockColumnMetaData {
-      private int index;
       private int sqlType;
       private int precision;
       private int scale;
@@ -347,9 +347,7 @@ public static class MockColumnMetaData {
       private String typeName;
       private int displaySize;
 
-
-      private MockColumnMetaData() {
-      }
+      private MockColumnMetaData() {}
 
       private String getLabel() {
         return label;
@@ -383,17 +381,17 @@ private int getDisplaySize() {
         return displaySize;
       }
 
-      public static MockColumnMetaData fromDataElement(MockDataElement element, int i) throws SQLException {
+      public static MockColumnMetaData fromDataElement(MockDataElement element, int i)
+          throws SQLException {
         return MockColumnMetaData.builder()
-                .index(i)
-                .sqlType(element.getSqlType())
-                .precision(element.getPrecision())
-                .scale(element.getScale())
-                .nullable(element.isNullable())
-                .setTypeName("TYPE")
-                .setDisplaySize(420)
-                .label("col_" + i)
-                .build();
+            .sqlType(element.getSqlType())
+            .precision(element.getPrecision())
+            .scale(element.getScale())
+            .nullable(element.isNullable())
+            .setTypeName("TYPE")
+            .setDisplaySize(420)
+            .label("col_" + i)
+            .build();
       }
 
       public static Builder builder() {
@@ -403,11 +401,6 @@ public static Builder builder() {
       public static class Builder {
         private MockColumnMetaData columnMetaData = new MockColumnMetaData();
 
-        public Builder index(int index) {
-          this.columnMetaData.index = index;
-          return this;
-        }
-
         public Builder label(String label) {
           this.columnMetaData.label = label;
           return this;
@@ -447,15 +440,13 @@ public MockColumnMetaData build() {
           return this.columnMetaData;
         }
       }
-
     }
-
   }
 
   public static class MockRow {
-    private final ArrayList<MockDataElement> dataElements;
+    private final List<MockDataElement> dataElements;
 
-    public MockRow(ArrayList<MockDataElement> elements) {
+    public MockRow(List<MockDataElement> elements) {
       this.dataElements = elements;
     }
 
@@ -642,7 +633,6 @@ public short getShort() throws SQLException {
     }
   }
 
-
   public static class ThrowingResultSet implements ResultSet {
 
     @Override
@@ -1146,17 +1136,20 @@ public void updateTimestamp(String columnLabel, Timestamp x) throws SQLException
     }
 
     @Override
-    public void updateAsciiStream(String columnLabel, InputStream x, int length) throws SQLException {
+    public void updateAsciiStream(String columnLabel, InputStream x, int length)
+        throws SQLException {
       throw getExceptionToThrow();
     }
 
     @Override
-    public void updateBinaryStream(String columnLabel, InputStream x, int length) throws SQLException {
+    public void updateBinaryStream(String columnLabel, InputStream x, int length)
+        throws SQLException {
       throw getExceptionToThrow();
     }
 
     @Override
-    public void updateCharacterStream(String columnLabel, Reader reader, int length) throws SQLException {
+    public void updateCharacterStream(String columnLabel, Reader reader, int length)
+        throws SQLException {
       throw getExceptionToThrow();
     }
 
@@ -1446,7 +1439,8 @@ public void updateNCharacterStream(int columnIndex, Reader x, long length) throw
     }
 
     @Override
-    public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
+    public void updateNCharacterStream(String columnLabel, Reader reader, long length)
+        throws SQLException {
       throw getExceptionToThrow();
     }
 
@@ -1456,7 +1450,8 @@ public void updateAsciiStream(int columnIndex, InputStream x, long length) throw
     }
 
     @Override
-    public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
+    public void updateBinaryStream(int columnIndex, InputStream x, long length)
+        throws SQLException {
       throw getExceptionToThrow();
     }
 
@@ -1466,27 +1461,32 @@ public void updateCharacterStream(int columnIndex, Reader x, long length) throws
     }
 
     @Override
-    public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException {
+    public void updateAsciiStream(String columnLabel, InputStream x, long length)
+        throws SQLException {
       throw getExceptionToThrow();
     }
 
     @Override
-    public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException {
+    public void updateBinaryStream(String columnLabel, InputStream x, long length)
+        throws SQLException {
       throw getExceptionToThrow();
     }
 
     @Override
-    public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
+    public void updateCharacterStream(String columnLabel, Reader reader, long length)
+        throws SQLException {
       throw getExceptionToThrow();
     }
 
     @Override
-    public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
+    public void updateBlob(int columnIndex, InputStream inputStream, long length)
+        throws SQLException {
       throw getExceptionToThrow();
     }
 
     @Override
-    public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
+    public void updateBlob(String columnLabel, InputStream inputStream, long length)
+        throws SQLException {
       throw getExceptionToThrow();
     }
 
@@ -1591,13 +1591,14 @@ public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
     }
 
     @Override
-    public void updateObject(int columnIndex, Object x, SQLType targetSqlType, int scaleOrLength) throws SQLException {
+    public void updateObject(int columnIndex, Object x, SQLType targetSqlType, int scaleOrLength)
+        throws SQLException {
       throw getExceptionToThrow();
     }
 
     @Override
     public void updateObject(String columnLabel, Object x, SQLType targetSqlType, int scaleOrLength)
-            throws SQLException {
+        throws SQLException {
       throw getExceptionToThrow();
     }
 
@@ -1607,7 +1608,8 @@ public void updateObject(int columnIndex, Object x, SQLType targetSqlType) throw
     }
 
     @Override
-    public void updateObject(String columnLabel, Object x, SQLType targetSqlType) throws SQLException {
+    public void updateObject(String columnLabel, Object x, SQLType targetSqlType)
+        throws SQLException {
       throw getExceptionToThrow();
     }
 
@@ -1630,7 +1632,6 @@ private static SQLException getExceptionToThrow(String message) {
     return new SQLException(message);
   }
 
-
   public static class ThrowingResultSetMetaData implements ResultSetMetaData {
     @Override
     public int getColumnCount() throws SQLException {
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/ResultSetUtilityTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/ResultSetUtilityTest.java
index 2424ed625248d..c7dc9b2791ce0 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/ResultSetUtilityTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/ResultSetUtilityTest.java
@@ -14,42 +14,44 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.VectorSchemaRoot;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Tests of the ResultSetUtility. */
 public class ResultSetUtilityTest {
   @Test
   public void testZeroRowResultSet() throws Exception {
-    for (boolean reuseVectorSchemaRoot : new boolean[]{false, true}) {
+    for (boolean reuseVectorSchemaRoot : new boolean[] {false, true}) {
       try (BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE)) {
         ResultSet rs = ResultSetUtility.generateEmptyResultSet();
-        JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(
-            allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
-            .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
-            .build();
+        JdbcToArrowConfig config =
+            new JdbcToArrowConfigBuilder(
+                    allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
+                .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
+                .build();
 
         ArrowVectorIterator iter = JdbcToArrow.sqlToArrowVectorIterator(rs, config);
-        assertTrue("Iterator on zero row ResultSet should haveNext() before use", iter.hasNext());
+        assertTrue(iter.hasNext(), "Iterator on zero row ResultSet should haveNext() before use");
         VectorSchemaRoot root = iter.next();
-        assertNotNull("VectorSchemaRoot from first next() result should never be null", root);
-        assertEquals("VectorSchemaRoot from empty ResultSet should have zero rows", 0, root.getRowCount());
-        assertFalse("hasNext() should return false on empty ResultSets after initial next() call", iter.hasNext());
+        assertNotNull(root, "VectorSchemaRoot from first next() result should never be null");
+        assertEquals(
+            0, root.getRowCount(), "VectorSchemaRoot from empty ResultSet should have zero rows");
+        assertFalse(
+            iter.hasNext(),
+            "hasNext() should return false on empty ResultSets after initial next() call");
       }
     }
   }
@@ -99,7 +101,8 @@ public void testBasicResultSet() throws Exception {
 
   @Test
   public void testMockDataTypes() throws SQLException {
-    ResultSetUtility.MockDataElement element = new ResultSetUtility.MockDataElement(1L, Types.NUMERIC);
+    ResultSetUtility.MockDataElement element =
+        new ResultSetUtility.MockDataElement(1L, Types.NUMERIC);
     assertEquals(1L, element.getLong());
     assertEquals(1, element.getInt());
     assertEquals("1", element.getString());
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/Table.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/Table.java
index 50c4fe6db2a14..7fa8188a99158 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/Table.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/Table.java
@@ -14,17 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-/**
- * POJO to handle the YAML data from the test YAML file.
- */
+/** POJO to handle the YAML data from the test YAML file. */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Table {
   private String name;
@@ -39,8 +35,7 @@ public class Table {
   private String[] vectors;
   private int rowCount;
 
-  public Table() {
-  }
+  public Table() {}
 
   public String getName() {
     return name;
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/UnreliableMetaDataTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/UnreliableMetaDataTest.java
index 3eb886faabc10..4993a8b1aeec5 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/UnreliableMetaDataTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/UnreliableMetaDataTest.java
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -30,11 +29,10 @@
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-
+import java.util.stream.Stream;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
@@ -42,62 +40,57 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-/**
- * Test options for dealing with unreliable ResultSetMetaData from JDBC drivers.
- */
-@RunWith(Parameterized.class)
+/** Test options for dealing with unreliable ResultSetMetaData from JDBC drivers. */
 public class UnreliableMetaDataTest {
-  private final boolean reuseVectorSchemaRoot;
   private BufferAllocator allocator;
 
-  public UnreliableMetaDataTest(boolean reuseVectorSchemaRoot) {
-    this.reuseVectorSchemaRoot = reuseVectorSchemaRoot;
-  }
-
-  @Before
+  @BeforeEach
   public void beforeEach() {
     allocator = new RootAllocator();
   }
 
-  @After
+  @AfterEach
   public void afterEach() {
     allocator.close();
   }
 
-  @Parameterized.Parameters(name = "reuseVectorSchemaRoot = {0}")
-  public static Collection<Object[]> getTestData() {
-    return Arrays.asList(new Object[][] { {false}, {true} });
+  public static Stream<Arguments> getTestData() {
+    return Arrays.stream(new Object[][] {{false}, {true}}).map(Arguments::of);
   }
 
-  @Test
-  public void testUnreliableMetaDataPrecisionAndScale() throws Exception {
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testUnreliableMetaDataPrecisionAndScale(boolean reuseVectorSchemaRoot)
+      throws Exception {
     ResultSet rs = buildIncorrectPrecisionAndScaleMetaDataResultSet();
     ResultSetMetaData rsmd = rs.getMetaData();
-    assertEquals("Column type should be Types.DECIMAL", Types.DECIMAL, rsmd.getColumnType(1));
-    assertEquals("Column scale should be zero", 0, rsmd.getScale(1));
-    assertEquals("Column precision should be zero", 0, rsmd.getPrecision(1));
+    assertEquals(Types.DECIMAL, rsmd.getColumnType(1), "Column type should be Types.DECIMAL");
+    assertEquals(0, rsmd.getScale(1), "Column scale should be zero");
+    assertEquals(0, rsmd.getPrecision(1), "Column precision should be zero");
     rs.next();
     BigDecimal bd1 = rs.getBigDecimal(1);
-    assertEquals("Value should be 1000000000000000.01", new BigDecimal("1000000000000000.01"), bd1);
-    assertEquals("Value scale should be 2", 2, bd1.scale());
-    assertEquals("Value precision should be 18", 18, bd1.precision());
-    assertFalse("No more rows!", rs.next());
+    assertEquals(new BigDecimal("1000000000000000.01"), bd1, "Value should be 1000000000000000.01");
+    assertEquals(2, bd1.scale(), "Value scale should be 2");
+    assertEquals(18, bd1.precision(), "Value precision should be 18");
+    assertFalse(rs.next(), "No more rows!");
 
     // reset the ResultSet:
     rs.beforeFirst();
-    JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(
-        allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
-        .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
-        .build();
+    JdbcToArrowConfig config =
+        new JdbcToArrowConfigBuilder(
+                allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
+            .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
+            .build();
     try (ArrowVectorIterator iter = JdbcToArrow.sqlToArrowVectorIterator(rs, config)) {
       assertTrue(iter.hasNext());
-      assertThrows(RuntimeException.class, iter::next, "Expected to fail due to mismatched metadata!");
+      assertThrows(
+          RuntimeException.class, iter::next, "Expected to fail due to mismatched metadata!");
     }
 
     // reset the ResultSet:
@@ -105,11 +98,12 @@ public void testUnreliableMetaDataPrecisionAndScale() throws Exception {
     JdbcFieldInfo explicitMappingField = new JdbcFieldInfo(Types.DECIMAL, 18, 2);
     Map<Integer, JdbcFieldInfo> explicitMapping = new HashMap<>();
     explicitMapping.put(1, explicitMappingField);
-    config = new JdbcToArrowConfigBuilder(
-        allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
-        .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
-        .setExplicitTypesByColumnIndex(explicitMapping)
-        .build();
+    config =
+        new JdbcToArrowConfigBuilder(
+                allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
+            .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
+            .setExplicitTypesByColumnIndex(explicitMapping)
+            .build();
 
     try (ArrowVectorIterator iter = JdbcToArrow.sqlToArrowVectorIterator(rs, config)) {
       while (iter.hasNext()) {
@@ -119,45 +113,51 @@ public void testUnreliableMetaDataPrecisionAndScale() throws Exception {
     }
   }
 
-  @Test
-  public void testInconsistentPrecisionAndScale() throws Exception {
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testInconsistentPrecisionAndScale(boolean reuseVectorSchemaRoot) throws Exception {
     ResultSet rs = buildVaryingPrecisionAndScaleResultSet();
     ResultSetMetaData rsmd = rs.getMetaData();
-    assertEquals("Column type should be Types.DECIMAL", Types.DECIMAL, rsmd.getColumnType(1));
-    assertEquals("Column scale should be zero", 0, rsmd.getScale(1));
-    assertEquals("Column precision should be zero", 0, rsmd.getPrecision(1));
+    assertEquals(Types.DECIMAL, rsmd.getColumnType(1), "Column type should be Types.DECIMAL");
+    assertEquals(0, rsmd.getScale(1), "Column scale should be zero");
+    assertEquals(0, rsmd.getPrecision(1), "Column precision should be zero");
     rs.next();
     BigDecimal bd1 = rs.getBigDecimal(1);
-    assertEquals("Value should be 1000000000000000.01", new BigDecimal("1000000000000000.01"), bd1);
-    assertEquals("Value scale should be 2", 2, bd1.scale());
-    assertEquals("Value precision should be 18", 18, bd1.precision());
+    assertEquals(new BigDecimal("1000000000000000.01"), bd1, "Value should be 1000000000000000.01");
+    assertEquals(2, bd1.scale(), "Value scale should be 2");
+    assertEquals(18, bd1.precision(), "Value precision should be 18");
     rs.next();
     BigDecimal bd2 = rs.getBigDecimal(1);
-    assertEquals("Value should be 1000000000300.0000001", new BigDecimal("1000000000300.0000001"), bd2);
-    assertEquals("Value scale should be 7", 7, bd2.scale());
-    assertEquals("Value precision should be 20", 20, bd2.precision());
+    assertEquals(
+        new BigDecimal("1000000000300.0000001"), bd2, "Value should be 1000000000300.0000001");
+    assertEquals(7, bd2.scale(), "Value scale should be 7");
+    assertEquals(20, bd2.precision(), "Value precision should be 20");
     rs.beforeFirst();
     JdbcFieldInfo explicitMappingField = new JdbcFieldInfo(Types.DECIMAL, 20, 7);
     Map<Integer, JdbcFieldInfo> explicitMapping = new HashMap<>();
     explicitMapping.put(1, explicitMappingField);
 
-    JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(
-        allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
-        .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
-        .setExplicitTypesByColumnIndex(explicitMapping)
-        .build();
+    JdbcToArrowConfig config =
+        new JdbcToArrowConfigBuilder(
+                allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
+            .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
+            .setExplicitTypesByColumnIndex(explicitMapping)
+            .build();
     try (ArrowVectorIterator iter = JdbcToArrow.sqlToArrowVectorIterator(rs, config)) {
       assertTrue(iter.hasNext());
-      assertThrows(RuntimeException.class, iter::next,
+      assertThrows(
+          RuntimeException.class,
+          iter::next,
           "This is expected to fail due to inconsistent BigDecimal scales, while strict matching is enabled.");
     }
     // Reuse same ResultSet, with RoundingMode.UNNECESSARY set to coerce BigDecimal scale as needed:
-    config = new JdbcToArrowConfigBuilder(
-        allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
-        .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
-        .setExplicitTypesByColumnIndex(explicitMapping)
-        .setBigDecimalRoundingMode(RoundingMode.UNNECESSARY)
-        .build();
+    config =
+        new JdbcToArrowConfigBuilder(
+                allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
+            .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
+            .setExplicitTypesByColumnIndex(explicitMapping)
+            .setBigDecimalRoundingMode(RoundingMode.UNNECESSARY)
+            .build();
     try (ArrowVectorIterator iter = JdbcToArrow.sqlToArrowVectorIterator(rs, config)) {
       while (iter.hasNext()) {
         VectorSchemaRoot root = iter.next();
@@ -166,32 +166,38 @@ public void testInconsistentPrecisionAndScale() throws Exception {
     }
   }
 
-  @Test
-  public void testIncorrectNullability() throws Exception {
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testIncorrectNullability(boolean reuseVectorSchemaRoot) throws Exception {
     // ARROW-17005: ResultSetMetaData may indicate a field is non-nullable even when there are nulls
     ResultSetUtility.MockResultSetMetaData.MockColumnMetaData columnMetaData =
         ResultSetUtility.MockResultSetMetaData.MockColumnMetaData.builder()
-            .index(1)
             .sqlType(Types.INTEGER)
             .nullable(ResultSetMetaData.columnNoNulls)
             .build();
-    ResultSetMetaData metadata = new ResultSetUtility.MockResultSetMetaData(Collections.singletonList(columnMetaData));
-    final ResultSetUtility.MockResultSet.Builder resultSetBuilder = ResultSetUtility.MockResultSet.builder()
-        .setMetaData(metadata)
-        .addDataElement(new ResultSetUtility.MockDataElement(1024, Types.INTEGER))
-        .finishRow()
-        .addDataElement(new ResultSetUtility.MockDataElement(null, Types.INTEGER))
-        .finishRow();
-    final Schema notNullSchema = new Schema(
-        Collections.singletonList(Field.notNullable(/*name=*/null, new ArrowType.Int(32, true))));
-    final Schema nullSchema = new Schema(
-        Collections.singletonList(Field.nullable(/*name=*/null, new ArrowType.Int(32, true))));
+    ResultSetMetaData metadata =
+        new ResultSetUtility.MockResultSetMetaData(Collections.singletonList(columnMetaData));
+    final ResultSetUtility.MockResultSet.Builder resultSetBuilder =
+        ResultSetUtility.MockResultSet.builder()
+            .setMetaData(metadata)
+            .addDataElement(new ResultSetUtility.MockDataElement(1024, Types.INTEGER))
+            .finishRow()
+            .addDataElement(new ResultSetUtility.MockDataElement(null, Types.INTEGER))
+            .finishRow();
+    final Schema notNullSchema =
+        new Schema(
+            Collections.singletonList(
+                Field.notNullable(/*name=*/ null, new ArrowType.Int(32, true))));
+    final Schema nullSchema =
+        new Schema(
+            Collections.singletonList(Field.nullable(/*name=*/ null, new ArrowType.Int(32, true))));
 
     try (final ResultSet rs = resultSetBuilder.build()) {
-      JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(
-          allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
-          .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
-          .build();
+      JdbcToArrowConfig config =
+          new JdbcToArrowConfigBuilder(
+                  allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
+              .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
+              .build();
       try (ArrowVectorIterator iter = JdbcToArrow.sqlToArrowVectorIterator(rs, config)) {
         assertTrue(iter.hasNext());
         final VectorSchemaRoot root = iter.next();
@@ -209,14 +215,16 @@ public void testIncorrectNullability() throws Exception {
 
       // Override the nullability to get the correct result
       final Map<Integer, JdbcFieldInfo> typeMapping = new HashMap<>();
-      JdbcFieldInfo realFieldInfo = new JdbcFieldInfo(
-          Types.INTEGER, ResultSetMetaData.columnNullable, /*precision*/0, /*scale*/0);
+      JdbcFieldInfo realFieldInfo =
+          new JdbcFieldInfo(
+              Types.INTEGER, ResultSetMetaData.columnNullable, /*precision*/ 0, /*scale*/ 0);
       typeMapping.put(1, realFieldInfo);
-      config = new JdbcToArrowConfigBuilder(
-          allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
-          .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
-          .setExplicitTypesByColumnIndex(typeMapping)
-          .build();
+      config =
+          new JdbcToArrowConfigBuilder(
+                  allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
+              .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
+              .setExplicitTypesByColumnIndex(typeMapping)
+              .build();
       try (ArrowVectorIterator iter = JdbcToArrow.sqlToArrowVectorIterator(rs, config)) {
         assertTrue(iter.hasNext());
         final VectorSchemaRoot root = iter.next();
@@ -232,14 +240,16 @@ public void testIncorrectNullability() throws Exception {
       rs.beforeFirst();
 
       // columnNullableUnknown won't override the metadata
-      realFieldInfo = new JdbcFieldInfo(
-          Types.INTEGER, ResultSetMetaData.columnNullableUnknown, /*precision*/0, /*scale*/0);
+      realFieldInfo =
+          new JdbcFieldInfo(
+              Types.INTEGER, ResultSetMetaData.columnNullableUnknown, /*precision*/ 0, /*scale*/ 0);
       typeMapping.put(1, realFieldInfo);
-      config = new JdbcToArrowConfigBuilder(
-          allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
-          .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
-          .setExplicitTypesByColumnIndex(typeMapping)
-          .build();
+      config =
+          new JdbcToArrowConfigBuilder(
+                  allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
+              .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
+              .setExplicitTypesByColumnIndex(typeMapping)
+              .build();
       try (ArrowVectorIterator iter = JdbcToArrow.sqlToArrowVectorIterator(rs, config)) {
         assertTrue(iter.hasNext());
         final VectorSchemaRoot root = iter.next();
@@ -257,7 +267,6 @@ public void testIncorrectNullability() throws Exception {
   private ResultSet buildIncorrectPrecisionAndScaleMetaDataResultSet() throws SQLException {
     ResultSetUtility.MockResultSetMetaData.MockColumnMetaData columnMetaData =
         ResultSetUtility.MockResultSetMetaData.MockColumnMetaData.builder()
-            .index(1)
             .sqlType(Types.DECIMAL)
             .precision(0)
             .scale(0)
@@ -268,8 +277,8 @@ private ResultSet buildIncorrectPrecisionAndScaleMetaDataResultSet() throws SQLE
     return ResultSetUtility.MockResultSet.builder()
         .setMetaData(metadata)
         .addDataElement(
-            new ResultSetUtility.MockDataElement(new BigDecimal("1000000000000000.01"), Types.DECIMAL)
-        )
+            new ResultSetUtility.MockDataElement(
+                new BigDecimal("1000000000000000.01"), Types.DECIMAL))
         .finishRow()
         .build();
   }
@@ -277,7 +286,6 @@ private ResultSet buildIncorrectPrecisionAndScaleMetaDataResultSet() throws SQLE
   private ResultSet buildVaryingPrecisionAndScaleResultSet() throws SQLException {
     ResultSetUtility.MockResultSetMetaData.MockColumnMetaData columnMetaData =
         ResultSetUtility.MockResultSetMetaData.MockColumnMetaData.builder()
-            .index(1)
             .sqlType(Types.DECIMAL)
             .precision(0)
             .scale(0)
@@ -288,12 +296,12 @@ private ResultSet buildVaryingPrecisionAndScaleResultSet() throws SQLException {
     return ResultSetUtility.MockResultSet.builder()
         .setMetaData(metadata)
         .addDataElement(
-            new ResultSetUtility.MockDataElement(new BigDecimal("1000000000000000.01"), Types.DECIMAL)
-        )
+            new ResultSetUtility.MockDataElement(
+                new BigDecimal("1000000000000000.01"), Types.DECIMAL))
         .finishRow()
         .addDataElement(
-            new ResultSetUtility.MockDataElement(new BigDecimal("1000000000300.0000001"), Types.DECIMAL)
-        )
+            new ResultSetUtility.MockDataElement(
+                new BigDecimal("1000000000300.0000001"), Types.DECIMAL))
         .finishRow()
         .build();
   }
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/consumer/AbstractConsumerTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/consumer/AbstractConsumerTest.java
index 96bac42214cef..157bf5bdec24b 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/consumer/AbstractConsumerTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/consumer/AbstractConsumerTest.java
@@ -14,26 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 public abstract class AbstractConsumerTest {
 
   protected BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     allocator.close();
   }
-
 }
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumerTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumerTest.java
index a368023d49005..b1e253794d0d4 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumerTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumerTest.java
@@ -14,19 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.consumer;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-
 import org.apache.arrow.vector.BaseValueVector;
 import org.apache.arrow.vector.VarBinaryVector;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BinaryConsumerTest extends AbstractConsumerTest {
 
@@ -37,7 +35,8 @@ interface InputStreamConsumer {
     void consume(BinaryConsumer consumer) throws IOException;
   }
 
-  protected void assertConsume(boolean nullable, InputStreamConsumer dataConsumer, byte[][] expect) throws IOException {
+  protected void assertConsume(boolean nullable, InputStreamConsumer dataConsumer, byte[][] expect)
+      throws IOException {
     try (final VarBinaryVector vector = new VarBinaryVector("binary", allocator)) {
       BinaryConsumer consumer = BinaryConsumer.createConsumer(vector, 0, nullable);
       dataConsumer.consume(consumer);
@@ -61,51 +60,59 @@ private byte[] createBytes(int length) {
     return bytes;
   }
 
-
   public void testConsumeInputStream(byte[][] values, boolean nullable) throws IOException {
-    assertConsume(nullable, binaryConsumer -> {
-      for (byte[] value : values) {
-        binaryConsumer.consume(new ByteArrayInputStream(value));
-        binaryConsumer.moveWriterPosition();
-      }
-    }, values);
+    assertConsume(
+        nullable,
+        binaryConsumer -> {
+          for (byte[] value : values) {
+            binaryConsumer.consume(new ByteArrayInputStream(value));
+            binaryConsumer.moveWriterPosition();
+          }
+        },
+        values);
   }
 
   @Test
   public void testConsumeInputStream() throws IOException {
-    testConsumeInputStream(new byte[][]{
-        createBytes(DEFAULT_RECORD_BYTE_COUNT)
-    }, false);
-
-    testConsumeInputStream(new byte[][]{
-        createBytes(DEFAULT_RECORD_BYTE_COUNT),
-        createBytes(DEFAULT_RECORD_BYTE_COUNT)
-    }, false);
-
-    testConsumeInputStream(new byte[][]{
-        createBytes(DEFAULT_RECORD_BYTE_COUNT * 2),
-        createBytes(DEFAULT_RECORD_BYTE_COUNT),
-        createBytes(DEFAULT_RECORD_BYTE_COUNT)
-    }, false);
-
-    testConsumeInputStream(new byte[][]{
-        createBytes(INITIAL_VALUE_ALLOCATION * DEFAULT_RECORD_BYTE_COUNT)
-    }, false);
-
-    testConsumeInputStream(new byte[][]{
-        createBytes(INITIAL_VALUE_ALLOCATION * DEFAULT_RECORD_BYTE_COUNT * 10),
-    }, false);
-
-    testConsumeInputStream(new byte[][]{
-        createBytes(INITIAL_VALUE_ALLOCATION * DEFAULT_RECORD_BYTE_COUNT),
-        createBytes(INITIAL_VALUE_ALLOCATION * DEFAULT_RECORD_BYTE_COUNT)
-    }, false);
-
-    testConsumeInputStream(new byte[][]{
-        createBytes(INITIAL_VALUE_ALLOCATION * DEFAULT_RECORD_BYTE_COUNT),
-        createBytes(DEFAULT_RECORD_BYTE_COUNT),
-        createBytes(INITIAL_VALUE_ALLOCATION * DEFAULT_RECORD_BYTE_COUNT)
-    }, false);
+    testConsumeInputStream(new byte[][] {createBytes(DEFAULT_RECORD_BYTE_COUNT)}, false);
+
+    testConsumeInputStream(
+        new byte[][] {
+          createBytes(DEFAULT_RECORD_BYTE_COUNT), createBytes(DEFAULT_RECORD_BYTE_COUNT)
+        },
+        false);
+
+    testConsumeInputStream(
+        new byte[][] {
+          createBytes(DEFAULT_RECORD_BYTE_COUNT * 2),
+          createBytes(DEFAULT_RECORD_BYTE_COUNT),
+          createBytes(DEFAULT_RECORD_BYTE_COUNT)
+        },
+        false);
+
+    testConsumeInputStream(
+        new byte[][] {createBytes(INITIAL_VALUE_ALLOCATION * DEFAULT_RECORD_BYTE_COUNT)}, false);
+
+    testConsumeInputStream(
+        new byte[][] {
+          createBytes(INITIAL_VALUE_ALLOCATION * DEFAULT_RECORD_BYTE_COUNT * 10),
+        },
+        false);
+
+    testConsumeInputStream(
+        new byte[][] {
+          createBytes(INITIAL_VALUE_ALLOCATION * DEFAULT_RECORD_BYTE_COUNT),
+          createBytes(INITIAL_VALUE_ALLOCATION * DEFAULT_RECORD_BYTE_COUNT)
+        },
+        false);
+
+    testConsumeInputStream(
+        new byte[][] {
+          createBytes(INITIAL_VALUE_ALLOCATION * DEFAULT_RECORD_BYTE_COUNT),
+          createBytes(DEFAULT_RECORD_BYTE_COUNT),
+          createBytes(INITIAL_VALUE_ALLOCATION * DEFAULT_RECORD_BYTE_COUNT)
+        },
+        false);
 
     byte[][] testRecords = new byte[INITIAL_VALUE_ALLOCATION * 2][];
     for (int i = 0; i < testRecords.length; i++) {
@@ -113,5 +120,4 @@ public void testConsumeInputStream() throws IOException {
     }
     testConsumeInputStream(testRecords, false);
   }
-
 }
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcAliasToArrowTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcAliasToArrowTest.java
index d9acfe88f4f8b..e6ca3ad34c7d9 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcAliasToArrowTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcAliasToArrowTest.java
@@ -14,11 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.h2;
 
 import static org.apache.arrow.adapter.jdbc.AbstractJdbcToArrowTest.sqlToArrow;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -28,29 +27,26 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.List;
-
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class JdbcAliasToArrowTest {
   private Connection conn = null;
 
-  private static final String CREATE_STATEMENT =
-      "CREATE TABLE example_table (id INTEGER);";
-  private static final String INSERT_STATEMENT =
-      "INSERT INTO example_table (id) VALUES (?);";
+  private static final String CREATE_STATEMENT = "CREATE TABLE example_table (id INTEGER);";
+  private static final String INSERT_STATEMENT = "INSERT INTO example_table (id) VALUES (?);";
   private static final String QUERY = "SELECT id as a, id as b FROM example_table;";
   private static final String DROP_STATEMENT = "DROP TABLE example_table;";
   private static final String ORIGINAL_COLUMN_NAME = "ID";
   private static final String COLUMN_A = "A";
   private static final String COLUMN_B = "B";
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     String url = "jdbc:h2:mem:JdbcAliasToArrowTest";
     String driver = "org.h2.Driver";
@@ -62,10 +58,9 @@ public void setUp() throws Exception {
   }
 
   /**
-   * Test h2 database query with alias for column name and column label.
-   * To verify reading field alias from an H2 database works as expected.
-   * If this test fails, something is either wrong with the setup,
-   * or the H2 SQL behavior changed.
+   * Test h2 database query with alias for column name and column label. To verify reading field
+   * alias from an H2 database works as expected. If this test fails, something is either wrong with
+   * the setup, or the H2 SQL behavior changed.
    */
   @Test
   public void testReadH2Alias() throws Exception {
@@ -96,8 +91,8 @@ public void testReadH2Alias() throws Exception {
   }
 
   /**
-   * Test jdbc query results with alias to arrow works expected.
-   * Arrow result schema name should be field alias name.
+   * Test jdbc query results with alias to arrow works expected. Arrow result schema name should be
+   * field alias name.
    */
   @Test
   public void testJdbcAliasToArrow() throws Exception {
@@ -105,18 +100,17 @@ public void testJdbcAliasToArrow() throws Exception {
     insertRows(rowCount);
 
     try (ResultSet resultSet = conn.createStatement().executeQuery(QUERY)) {
-      final VectorSchemaRoot vector =
-          sqlToArrow(resultSet, new RootAllocator(Integer.MAX_VALUE));
+      final VectorSchemaRoot vector = sqlToArrow(resultSet, new RootAllocator(Integer.MAX_VALUE));
 
       assertEquals(rowCount, vector.getRowCount());
       Schema vectorSchema = vector.getSchema();
       List<Field> vectorFields = vectorSchema.getFields();
-      assertEquals(vectorFields.get(0).getName(), COLUMN_A);
-      assertEquals(vectorFields.get(1).getName(), COLUMN_B);
+      assertEquals(COLUMN_A, vectorFields.get(0).getName());
+      assertEquals(COLUMN_B, vectorFields.get(1).getName());
     }
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws SQLException {
     try (Statement stmt = conn.createStatement()) {
       stmt.executeUpdate(DROP_STATEMENT);
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java
index 377e332b43a13..23a91fe0e567a 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.h2;
 
 import static org.apache.arrow.adapter.jdbc.AbstractJdbcToArrowTest.sqlToArrow;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
+import java.nio.charset.StandardCharsets;
 import java.sql.Array;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -33,7 +33,6 @@
 import java.sql.Types;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.arrow.adapter.jdbc.JdbcFieldInfo;
 import org.apache.arrow.adapter.jdbc.JdbcToArrowConfig;
 import org.apache.arrow.adapter.jdbc.JdbcToArrowConfigBuilder;
@@ -45,19 +44,20 @@
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.complex.ListVector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class JdbcToArrowArrayTest {
   private Connection conn = null;
 
   private static final String CREATE_STATEMENT =
-      "CREATE TABLE array_table (id INTEGER, int_array INTEGER ARRAY, float_array REAL ARRAY, " +
-          "string_array VARCHAR ARRAY);";
+      "CREATE TABLE array_table (id INTEGER, int_array INTEGER ARRAY, float_array REAL ARRAY, "
+          + "string_array VARCHAR ARRAY);";
   private static final String INSERT_STATEMENT =
       "INSERT INTO array_table (id, int_array, float_array, string_array) VALUES (?, ?, ?, ?);";
-  private static final String QUERY = "SELECT int_array, float_array, string_array FROM array_table ORDER BY id;";
+  private static final String QUERY =
+      "SELECT int_array, float_array, string_array FROM array_table ORDER BY id;";
   private static final String DROP_STATEMENT = "DROP TABLE array_table;";
 
   private static Map<String, JdbcFieldInfo> arrayFieldMapping;
@@ -66,7 +66,7 @@ public class JdbcToArrowArrayTest {
   private static final String FLOAT_ARRAY_FIELD_NAME = "FLOAT_ARRAY";
   private static final String STRING_ARRAY_FIELD_NAME = "STRING_ARRAY";
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     String url = "jdbc:h2:mem:JdbcToArrowTest";
     String driver = "org.h2.Driver";
@@ -157,7 +157,8 @@ public void testJdbcToArrow() throws Exception {
     insertRows(rowCount, intArrays, floatArrays, strArrays);
 
     final JdbcToArrowConfigBuilder builder =
-        new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), JdbcToArrowUtils.getUtcCalendar(), false);
+        new JdbcToArrowConfigBuilder(
+            new RootAllocator(Integer.MAX_VALUE), JdbcToArrowUtils.getUtcCalendar(), false);
     builder.setArraySubTypeByColumnNameMap(arrayFieldMapping);
 
     final JdbcToArrowConfig config = builder.build();
@@ -167,9 +168,12 @@ public void testJdbcToArrow() throws Exception {
 
       assertEquals(rowCount, vector.getRowCount());
 
-      assertIntegerVectorEquals((ListVector) vector.getVector(INT_ARRAY_FIELD_NAME), rowCount, intArrays);
-      assertFloatVectorEquals((ListVector) vector.getVector(FLOAT_ARRAY_FIELD_NAME), rowCount, floatArrays);
-      assertStringVectorEquals((ListVector) vector.getVector(STRING_ARRAY_FIELD_NAME), rowCount, strArrays);
+      assertIntegerVectorEquals(
+          (ListVector) vector.getVector(INT_ARRAY_FIELD_NAME), rowCount, intArrays);
+      assertFloatVectorEquals(
+          (ListVector) vector.getVector(FLOAT_ARRAY_FIELD_NAME), rowCount, floatArrays);
+      assertStringVectorEquals(
+          (ListVector) vector.getVector(STRING_ARRAY_FIELD_NAME), rowCount, strArrays);
     }
   }
 
@@ -178,30 +182,22 @@ public void testJdbcToArrowWithNulls() throws Exception {
     int rowCount = 4;
 
     Integer[][] intArrays = {
-        null,
-        {0},
-        {1},
-        {},
+      null, {0}, {1}, {},
     };
 
     Float[][] floatArrays = {
-        { 2.0f },
-        null,
-        { 3.0f },
-        {},
+      {2.0f}, null, {3.0f}, {},
     };
 
     String[][] stringArrays = {
-        {"4"},
-        null,
-        {"5"},
-        {},
+      {"4"}, null, {"5"}, {},
     };
 
     insertRows(rowCount, intArrays, floatArrays, stringArrays);
 
     final JdbcToArrowConfigBuilder builder =
-        new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), JdbcToArrowUtils.getUtcCalendar(), false);
+        new JdbcToArrowConfigBuilder(
+            new RootAllocator(Integer.MAX_VALUE), JdbcToArrowUtils.getUtcCalendar(), false);
     builder.setArraySubTypeByColumnNameMap(arrayFieldMapping);
 
     final JdbcToArrowConfig config = builder.build();
@@ -211,13 +207,17 @@ public void testJdbcToArrowWithNulls() throws Exception {
 
       assertEquals(rowCount, vector.getRowCount());
 
-      assertIntegerVectorEquals((ListVector) vector.getVector(INT_ARRAY_FIELD_NAME), rowCount, intArrays);
-      assertFloatVectorEquals((ListVector) vector.getVector(FLOAT_ARRAY_FIELD_NAME), rowCount, floatArrays);
-      assertStringVectorEquals((ListVector) vector.getVector(STRING_ARRAY_FIELD_NAME), rowCount, stringArrays);
+      assertIntegerVectorEquals(
+          (ListVector) vector.getVector(INT_ARRAY_FIELD_NAME), rowCount, intArrays);
+      assertFloatVectorEquals(
+          (ListVector) vector.getVector(FLOAT_ARRAY_FIELD_NAME), rowCount, floatArrays);
+      assertStringVectorEquals(
+          (ListVector) vector.getVector(STRING_ARRAY_FIELD_NAME), rowCount, stringArrays);
     }
   }
 
-  private void assertIntegerVectorEquals(ListVector listVector, int rowCount, Integer[][] expectedValues) {
+  private void assertIntegerVectorEquals(
+      ListVector listVector, int rowCount, Integer[][] expectedValues) {
     IntVector vector = (IntVector) listVector.getDataVector();
     ArrowBuf offsetBuffer = listVector.getOffsetBuffer();
 
@@ -242,7 +242,8 @@ private void assertIntegerVectorEquals(ListVector listVector, int rowCount, Inte
     }
   }
 
-  private void assertFloatVectorEquals(ListVector listVector, int rowCount, Float[][] expectedValues) {
+  private void assertFloatVectorEquals(
+      ListVector listVector, int rowCount, Float[][] expectedValues) {
     Float4Vector vector = (Float4Vector) listVector.getDataVector();
     ArrowBuf offsetBuffer = listVector.getOffsetBuffer();
 
@@ -267,7 +268,8 @@ private void assertFloatVectorEquals(ListVector listVector, int rowCount, Float[
     }
   }
 
-  private void assertStringVectorEquals(ListVector listVector, int rowCount, String[][] expectedValues) {
+  private void assertStringVectorEquals(
+      ListVector listVector, int rowCount, String[][] expectedValues) {
     VarCharVector vector = (VarCharVector) listVector.getDataVector();
     ArrowBuf offsetBuffer = listVector.getOffsetBuffer();
 
@@ -284,14 +286,15 @@ private void assertStringVectorEquals(ListVector listVector, int rowCount, Strin
       assertEquals(1, listVector.isSet(row));
       assertEquals(expectedValues[row].length, offset - prevOffset);
       for (int i = prevOffset; i < offset; ++i) {
-        assertArrayEquals(expectedValues[row][i - prevOffset].getBytes(), vector.get(i));
+        assertArrayEquals(
+            expectedValues[row][i - prevOffset].getBytes(StandardCharsets.UTF_8), vector.get(i));
       }
 
       prevOffset = offset;
     }
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws SQLException {
     try (Statement stmt = conn.createStatement()) {
       stmt.executeUpdate(DROP_STATEMENT);
@@ -308,7 +311,7 @@ private Integer[][] generateIntegerArrayField(int numRows) {
 
     for (int i = 0; i < numRows; ++i) {
       int val = i * 4;
-      result[i] = new Integer[]{val, val + 1, val + 2, val + 3};
+      result[i] = new Integer[] {val, val + 1, val + 2, val + 3};
     }
 
     return result;
@@ -316,10 +319,10 @@ private Integer[][] generateIntegerArrayField(int numRows) {
 
   private Float[][] generateFloatArrayField(int numRows) {
     Float[][] result = new Float[numRows][];
-  
+
     for (int i = 0; i < numRows; ++i) {
       int val = i * 4;
-      result[i] = new Float[]{(float) val, (float) val + 1, (float) val + 2, (float) val + 3};
+      result[i] = new Float[] {(float) val, (float) val + 1, (float) val + 2, (float) val + 3};
     }
 
     return result;
@@ -330,22 +333,21 @@ private String[][] generateStringArrayField(int numRows) {
 
     for (int i = 0; i < numRows; ++i) {
       int val = i * 4;
-      result[i] = new String[]{
-          String.valueOf(val),
-          String.valueOf(val + 1),
-          String.valueOf(val + 2),
-          String.valueOf(val + 3) };
+      result[i] =
+          new String[] {
+            String.valueOf(val),
+            String.valueOf(val + 1),
+            String.valueOf(val + 2),
+            String.valueOf(val + 3)
+          };
     }
 
     return result;
   }
 
   private void insertRows(
-      int numRows,
-      Integer[][] integerArrays,
-      Float[][] floatArrays,
-      String[][] strArrays)
-          throws SQLException {
+      int numRows, Integer[][] integerArrays, Float[][] floatArrays, String[][] strArrays)
+      throws SQLException {
 
     // Insert 4 Rows
     try (PreparedStatement stmt = conn.prepareStatement(INSERT_STATEMENT)) {
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowCharSetTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowCharSetTest.java
index 422b55070aaf9..726e1905c4242 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowCharSetTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowCharSetTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.h2;
 
 import static org.apache.arrow.adapter.jdbc.JdbcToArrowTestHelper.assertVarcharVectorValues;
@@ -28,8 +27,7 @@
 import java.sql.Statement;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Collection;
-
+import java.util.stream.Stream;
 import org.apache.arrow.adapter.jdbc.AbstractJdbcToArrowTest;
 import org.apache.arrow.adapter.jdbc.JdbcToArrowConfig;
 import org.apache.arrow.adapter.jdbc.JdbcToArrowConfigBuilder;
@@ -40,17 +38,14 @@
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
- * JUnit Test Class which contains methods to test JDBC to Arrow data conversion functionality with UTF-8 Charset,
- * including the multi-byte CJK characters for H2 database.
+ * JUnit Test Class which contains methods to test JDBC to Arrow data conversion functionality with
+ * UTF-8 Charset, including the multi-byte CJK characters for H2 database.
  */
-@RunWith(Parameterized.class)
 public class JdbcToArrowCharSetTest extends AbstractJdbcToArrowTest {
 
   private static final String[] testFiles = {
@@ -60,28 +55,15 @@ public class JdbcToArrowCharSetTest extends AbstractJdbcToArrowTest {
     "h2/test1_charset_kr_h2.yml"
   };
 
-  /**
-   * Constructor which populates the table object for each test iteration.
-   *
-   * @param table Table oject
-   */
-  public JdbcToArrowCharSetTest(Table table) {
+  @Override
+  public void initializeDatabase(Table table) throws SQLException, ClassNotFoundException {
     this.table = table;
-  }
 
-  /**
-   * This method creates Connection object and DB table and also populate data into table for test.
-   *
-   * @throws SQLException on error
-   * @throws ClassNotFoundException on error
-   */
-  @Before
-  public void setUp() throws SQLException, ClassNotFoundException {
     String url = "jdbc:h2:mem:JdbcToArrowTest?characterEncoding=UTF-8";
     String driver = "org.h2.Driver";
     Class.forName(driver);
     conn = DriverManager.getConnection(url);
-    try (Statement stmt = conn.createStatement();) {
+    try (Statement stmt = conn.createStatement(); ) {
       stmt.executeUpdate(table.getCreate());
       for (String insert : table.getData()) {
         stmt.executeUpdate(insert);
@@ -97,39 +79,66 @@ public void setUp() throws SQLException, ClassNotFoundException {
    * @throws ClassNotFoundException on error
    * @throws IOException on error
    */
-  @Parameters
-  public static Collection<Object[]> getTestData() throws SQLException, ClassNotFoundException, IOException {
-    return Arrays.asList(prepareTestData(testFiles, JdbcToArrowCharSetTest.class));
+  public static Stream<Arguments> getTestData()
+      throws SQLException, ClassNotFoundException, IOException {
+    return Arrays.stream(prepareTestData(testFiles, JdbcToArrowCharSetTest.class))
+        .map(Arguments::of);
   }
 
   /**
-   * Test Method to test JdbcToArrow Functionality for various H2 DB based datatypes with UTF-8 Charset, including
-   * the multi-byte CJK characters.
+   * Test Method to test JdbcToArrow Functionality for various H2 DB based datatypes with UTF-8
+   * Charset, including the multi-byte CJK characters.
    */
-  @Test
-  public void testJdbcToArrowValues() throws SQLException, IOException {
-    testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE),
-        Calendar.getInstance()), false);
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testJdbcToArrowValues(Table table)
+      throws SQLException, IOException, ClassNotFoundException {
+    this.initializeDatabase(table);
+
+    testDataSets(
+        sqlToArrow(
+            conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()),
+        false);
     testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE)), false);
-    testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()),
-        new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()), false);
+    testDataSets(
+        sqlToArrow(
+            conn.createStatement().executeQuery(table.getQuery()),
+            new RootAllocator(Integer.MAX_VALUE),
+            Calendar.getInstance()),
+        false);
     testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery())), false);
-    testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()),
-        new RootAllocator(Integer.MAX_VALUE)), false);
-    testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()),
-        Calendar.getInstance()), false);
-    testDataSets(sqlToArrow(
-        conn.createStatement().executeQuery(table.getQuery()),
-        new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()).build()), false);
-    testDataSets(sqlToArrow(
-        conn,
-        table.getQuery(),
-        new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()).build()), false);
+    testDataSets(
+        sqlToArrow(
+            conn.createStatement().executeQuery(table.getQuery()),
+            new RootAllocator(Integer.MAX_VALUE)),
+        false);
+    testDataSets(
+        sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), Calendar.getInstance()),
+        false);
+    testDataSets(
+        sqlToArrow(
+            conn.createStatement().executeQuery(table.getQuery()),
+            new JdbcToArrowConfigBuilder(
+                    new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
+                .build()),
+        false);
+    testDataSets(
+        sqlToArrow(
+            conn,
+            table.getQuery(),
+            new JdbcToArrowConfigBuilder(
+                    new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
+                .build()),
+        false);
   }
 
-  @Test
-  public void testJdbcSchemaMetadata() throws SQLException {
-    JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(new RootAllocator(0), Calendar.getInstance(), true).build();
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testJdbcSchemaMetadata(Table table) throws SQLException, ClassNotFoundException {
+    this.initializeDatabase(table);
+
+    JdbcToArrowConfig config =
+        new JdbcToArrowConfigBuilder(new RootAllocator(0), Calendar.getInstance(), true).build();
     ResultSetMetaData rsmd = conn.createStatement().executeQuery(table.getQuery()).getMetaData();
     Schema schema = JdbcToArrowUtils.jdbcToArrowSchema(rsmd, config);
     JdbcToArrowTestHelper.assertFieldMetadataMatchesResultSetMetadata(rsmd, schema);
@@ -139,19 +148,26 @@ public void testJdbcSchemaMetadata() throws SQLException {
    * This method calls the assert methods for various DataSets.
    *
    * @param root VectorSchemaRoot for test
-   * @param isIncludeMapVector is this dataset checks includes map column.
-   *          Jdbc type to 'map' mapping declared in configuration only manually
+   * @param isIncludeMapVector is this dataset checks includes map column. Jdbc type to 'map'
+   *     mapping declared in configuration only manually
    */
+  @Override
   public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) {
     JdbcToArrowTestHelper.assertFieldMetadataIsEmpty(root);
 
-    assertVarcharVectorValues((VarCharVector) root.getVector(CLOB), table.getRowCount(),
+    assertVarcharVectorValues(
+        (VarCharVector) root.getVector(CLOB),
+        table.getRowCount(),
         getCharArrayWithCharSet(table.getValues(), CLOB, StandardCharsets.UTF_8));
 
-    assertVarcharVectorValues((VarCharVector) root.getVector(VARCHAR), table.getRowCount(),
+    assertVarcharVectorValues(
+        (VarCharVector) root.getVector(VARCHAR),
+        table.getRowCount(),
         getCharArrayWithCharSet(table.getValues(), VARCHAR, StandardCharsets.UTF_8));
 
-    assertVarcharVectorValues((VarCharVector) root.getVector(CHAR), table.getRowCount(),
+    assertVarcharVectorValues(
+        (VarCharVector) root.getVector(CHAR),
+        table.getRowCount(),
         getCharArrayWithCharSet(table.getValues(), CHAR, StandardCharsets.UTF_8));
   }
 }
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowDataTypesTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowDataTypesTest.java
index ae4fffd0f94f0..5537e1acba2bc 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowDataTypesTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowDataTypesTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.h2;
 
 import static org.apache.arrow.adapter.jdbc.JdbcToArrowTestHelper.assertBigIntVectorValues;
@@ -39,8 +38,7 @@
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Collection;
-
+import java.util.stream.Stream;
 import org.apache.arrow.adapter.jdbc.AbstractJdbcToArrowTest;
 import org.apache.arrow.adapter.jdbc.JdbcToArrowConfig;
 import org.apache.arrow.adapter.jdbc.JdbcToArrowConfigBuilder;
@@ -65,16 +63,14 @@
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.complex.ListVector;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
- * JUnit Test Class which contains methods to test JDBC to Arrow data conversion functionality with various data types
- * for H2 database using multiple test data files.
+ * JUnit Test Class which contains methods to test JDBC to Arrow data conversion functionality with
+ * various data types for H2 database using multiple test data files.
  */
-@RunWith(Parameterized.class)
 public class JdbcToArrowDataTypesTest extends AbstractJdbcToArrowTest {
 
   private static final String BIGINT = "big_int";
@@ -119,15 +115,6 @@ public class JdbcToArrowDataTypesTest extends AbstractJdbcToArrowTest {
     "h2/test1_null_h2.yml"
   };
 
-  /**
-   * Constructor which populates the table object for each test iteration.
-   *
-   * @param table Table object
-   */
-  public JdbcToArrowDataTypesTest(Table table) {
-    this.table = table;
-  }
-
   /**
    * Get the test data as a collection of Table objects for each test iteration.
    *
@@ -136,43 +123,67 @@ public JdbcToArrowDataTypesTest(Table table) {
    * @throws ClassNotFoundException on error
    * @throws IOException on error
    */
-  @Parameters
-  public static Collection<Object[]> getTestData() throws SQLException, ClassNotFoundException, IOException {
-    return Arrays.asList(prepareTestData(testFiles, JdbcToArrowDataTypesTest.class));
+  public static Stream<Arguments> getTestData()
+      throws SQLException, ClassNotFoundException, IOException {
+    return Arrays.stream(prepareTestData(testFiles, JdbcToArrowMapDataTypeTest.class))
+        .map(Arguments::of);
   }
 
-  /**
-   * Test Method to test JdbcToArrow Functionality for various H2 DB based datatypes.
-   */
-  @Test
-  public void testJdbcToArrowValues() throws SQLException, IOException {
-    testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE),
-        Calendar.getInstance()), false);
+  /** Test Method to test JdbcToArrow Functionality for various H2 DB based datatypes. */
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testJdbcToArrowValues(Table table)
+      throws SQLException, IOException, ClassNotFoundException {
+    this.initializeDatabase(table);
+
+    testDataSets(
+        sqlToArrow(
+            conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()),
+        false);
     testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE)), false);
-    testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()),
-        new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()), false);
+    testDataSets(
+        sqlToArrow(
+            conn.createStatement().executeQuery(table.getQuery()),
+            new RootAllocator(Integer.MAX_VALUE),
+            Calendar.getInstance()),
+        false);
     testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery())), false);
-    testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()),
-        new RootAllocator(Integer.MAX_VALUE)), false);
-    testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), Calendar.getInstance()), false);
-    testDataSets(sqlToArrow(
-        conn.createStatement().executeQuery(table.getQuery()),
-        new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
-            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-            .build()), false);
-    testDataSets(sqlToArrow(
-        conn,
-        table.getQuery(),
-        new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
-            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-            .build()), false);
+    testDataSets(
+        sqlToArrow(
+            conn.createStatement().executeQuery(table.getQuery()),
+            new RootAllocator(Integer.MAX_VALUE)),
+        false);
+    testDataSets(
+        sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), Calendar.getInstance()),
+        false);
+    testDataSets(
+        sqlToArrow(
+            conn.createStatement().executeQuery(table.getQuery()),
+            new JdbcToArrowConfigBuilder(
+                    new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
+                .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+                .build()),
+        false);
+    testDataSets(
+        sqlToArrow(
+            conn,
+            table.getQuery(),
+            new JdbcToArrowConfigBuilder(
+                    new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
+                .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+                .build()),
+        false);
   }
 
-  @Test
-  public void testJdbcSchemaMetadata() throws SQLException {
-    JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(new RootAllocator(0), Calendar.getInstance(), true)
-        .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-        .build();
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testJdbcSchemaMetadata(Table table) throws SQLException, ClassNotFoundException {
+    this.initializeDatabase(table);
+
+    JdbcToArrowConfig config =
+        new JdbcToArrowConfigBuilder(new RootAllocator(0), Calendar.getInstance(), true)
+            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+            .build();
     ResultSetMetaData rsmd = conn.createStatement().executeQuery(table.getQuery()).getMetaData();
     Schema schema = JdbcToArrowUtils.jdbcToArrowSchema(rsmd, config);
     JdbcToArrowTestHelper.assertFieldMetadataMatchesResultSetMetadata(rsmd, schema);
@@ -182,77 +193,108 @@ public void testJdbcSchemaMetadata() throws SQLException {
    * This method calls the assert methods for various DataSets.
    *
    * @param root VectorSchemaRoot for test
-   * @param isIncludeMapVector is this dataset checks includes map column.
-   *          Jdbc type to 'map' mapping declared in configuration only manually
+   * @param isIncludeMapVector is this dataset checks includes map column. Jdbc type to 'map'
+   *     mapping declared in configuration only manually
    */
+  @Override
   public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) {
     JdbcToArrowTestHelper.assertFieldMetadataIsEmpty(root);
 
     switch (table.getType()) {
       case BIGINT:
-        assertBigIntVectorValues((BigIntVector) root.getVector(table.getVector()), table.getValues().length,
+        assertBigIntVectorValues(
+            (BigIntVector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getLongValues());
         break;
       case BINARY:
       case BLOB:
-        assertVarBinaryVectorValues((VarBinaryVector) root.getVector(table.getVector()), table.getValues().length,
+        assertVarBinaryVectorValues(
+            (VarBinaryVector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getBinaryValues());
         break;
       case BIT:
-        assertBitVectorValues((BitVector) root.getVector(table.getVector()), table.getValues().length,
+        assertBitVectorValues(
+            (BitVector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getIntValues());
         break;
       case BOOL:
-        assertBooleanVectorValues((BitVector) root.getVector(table.getVector()), table.getValues().length,
+        assertBooleanVectorValues(
+            (BitVector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getBoolValues());
         break;
       case CHAR:
       case VARCHAR:
       case CLOB:
-        assertVarcharVectorValues((VarCharVector) root.getVector(table.getVector()), table.getValues().length,
+        assertVarcharVectorValues(
+            (VarCharVector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getCharValues());
         break;
       case DATE:
-        assertDateVectorValues((DateDayVector) root.getVector(table.getVector()), table.getValues().length,
+        assertDateVectorValues(
+            (DateDayVector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getIntValues());
         break;
       case TIME:
-        assertTimeVectorValues((TimeMilliVector) root.getVector(table.getVector()), table.getValues().length,
+        assertTimeVectorValues(
+            (TimeMilliVector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getLongValues());
         break;
       case TIMESTAMP:
-        assertTimeStampVectorValues((TimeStampVector) root.getVector(table.getVector()), table.getValues().length,
+        assertTimeStampVectorValues(
+            (TimeStampVector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getLongValues());
         break;
       case DECIMAL:
-        assertDecimalVectorValues((DecimalVector) root.getVector(table.getVector()), table.getValues().length,
+        assertDecimalVectorValues(
+            (DecimalVector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getBigDecimalValues());
         break;
       case DOUBLE:
-        assertFloat8VectorValues((Float8Vector) root.getVector(table.getVector()), table.getValues().length,
+        assertFloat8VectorValues(
+            (Float8Vector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getDoubleValues());
         break;
       case INT:
-        assertIntVectorValues((IntVector) root.getVector(table.getVector()), table.getValues().length,
+        assertIntVectorValues(
+            (IntVector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getIntValues());
         break;
       case SMALLINT:
-        assertSmallIntVectorValues((SmallIntVector) root.getVector(table.getVector()), table.getValues().length,
+        assertSmallIntVectorValues(
+            (SmallIntVector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getIntValues());
         break;
       case TINYINT:
-        assertTinyIntVectorValues((TinyIntVector) root.getVector(table.getVector()), table.getValues().length,
+        assertTinyIntVectorValues(
+            (TinyIntVector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getIntValues());
         break;
       case REAL:
-        assertFloat4VectorValues((Float4Vector) root.getVector(table.getVector()), table.getValues().length,
+        assertFloat4VectorValues(
+            (Float4Vector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getFloatValues());
         break;
       case NULL:
         assertNullVectorValues((NullVector) root.getVector(table.getVector()), table.getRowCount());
         break;
       case LIST:
-        assertListVectorValues((ListVector) root.getVector(table.getVector()), table.getValues().length,
+        assertListVectorValues(
+            (ListVector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getListValues());
         break;
       default:
@@ -261,4 +303,3 @@ public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) {
     }
   }
 }
-
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowMapDataTypeTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowMapDataTypeTest.java
index 43862a93c39c9..337220a42fbce 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowMapDataTypeTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowMapDataTypeTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.h2;
 
 import static org.apache.arrow.adapter.jdbc.JdbcToArrowTestHelper.assertMapVectorValues;
@@ -24,52 +23,63 @@
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.util.Calendar;
-
+import java.util.stream.Stream;
 import org.apache.arrow.adapter.jdbc.AbstractJdbcToArrowTest;
 import org.apache.arrow.adapter.jdbc.JdbcToArrowConfigBuilder;
+import org.apache.arrow.adapter.jdbc.Table;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.complex.MapVector;
-import org.junit.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-/**
- * Test MapConsumer with OTHER jdbc type.
- */
+/** Test MapConsumer with OTHER jdbc type. */
 public class JdbcToArrowMapDataTypeTest extends AbstractJdbcToArrowTest {
 
-  public JdbcToArrowMapDataTypeTest() throws IOException {
-    this.table = getTable("h2/test1_map_h2.yml", JdbcToArrowMapDataTypeTest.class);
+  public static Stream<Arguments> getTestData() throws IOException {
+    return Stream.of(
+        Arguments.of(getTable("h2/test1_map_h2.yml", JdbcToArrowMapDataTypeTest.class)));
   }
 
-  /**
-   * Test Method to test JdbcToArrow Functionality for Map form Types.OTHER column
-   */
-  @Test
-  public void testJdbcToArrowValues() throws SQLException, IOException {
+  /** Test Method to test JdbcToArrow Functionality for Map form Types.OTHER column */
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testJdbcToArrowValues(Table table)
+      throws SQLException, IOException, ClassNotFoundException {
+    this.initializeDatabase(table);
+
     Calendar calendar = Calendar.getInstance();
     ResultSetMetaData rsmd = getQueryMetaData(table.getQuery());
-    testDataSets(sqlToArrow(
+    testDataSets(
+        sqlToArrow(
             conn.createStatement().executeQuery(table.getQuery()),
-            new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
-                    .setJdbcToArrowTypeConverter(jdbcToArrowTypeConverter(calendar, rsmd))
-                    .build()), true);
-    testDataSets(sqlToArrow(
+            new JdbcToArrowConfigBuilder(
+                    new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
+                .setJdbcToArrowTypeConverter(jdbcToArrowTypeConverter(calendar, rsmd))
+                .build()),
+        true);
+    testDataSets(
+        sqlToArrow(
             conn,
             table.getQuery(),
-            new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
-                    .setJdbcToArrowTypeConverter(jdbcToArrowTypeConverter(calendar, rsmd))
-                    .build()), true);
+            new JdbcToArrowConfigBuilder(
+                    new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
+                .setJdbcToArrowTypeConverter(jdbcToArrowTypeConverter(calendar, rsmd))
+                .build()),
+        true);
   }
 
   /**
    * This method calls the assert methods for various DataSets.
    *
    * @param root VectorSchemaRoot for test
-   * @param isIncludeMapVector is this dataset checks includes map column.
-   *          Jdbc type to 'map' mapping declared in configuration only manually
+   * @param isIncludeMapVector is this dataset checks includes map column. Jdbc type to 'map'
+   *     mapping declared in configuration only manually
    */
+  @Override
   public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) {
-    assertMapVectorValues((MapVector) root.getVector(MAP), table.getRowCount(),
-            getMapValues(table.getValues(), MAP));
+    assertMapVectorValues(
+        (MapVector) root.getVector(MAP), table.getRowCount(), getMapValues(table.getValues(), MAP));
   }
 }
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowNullTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowNullTest.java
index 5731f27c5b345..205b7e16f2f09 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowNullTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowNullTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.h2;
 
 import static org.apache.arrow.adapter.jdbc.JdbcToArrowTestHelper.assertBigIntVectorValues;
@@ -50,8 +49,7 @@
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Collection;
-
+import java.util.stream.Stream;
 import org.apache.arrow.adapter.jdbc.AbstractJdbcToArrowTest;
 import org.apache.arrow.adapter.jdbc.JdbcToArrowConfig;
 import org.apache.arrow.adapter.jdbc.JdbcToArrowConfigBuilder;
@@ -76,16 +74,14 @@
 import org.apache.arrow.vector.complex.ListVector;
 import org.apache.arrow.vector.complex.MapVector;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
- * JUnit Test Class which contains methods to test JDBC to Arrow data conversion functionality with null values for
- * H2 database.
+ * JUnit Test Class which contains methods to test JDBC to Arrow data conversion functionality with
+ * null values for H2 database.
  */
-@RunWith(Parameterized.class)
 public class JdbcToArrowNullTest extends AbstractJdbcToArrowTest {
 
   private static final String NULL = "null";
@@ -98,15 +94,6 @@ public class JdbcToArrowNullTest extends AbstractJdbcToArrowTest {
     "h2/test1_all_datatypes_selected_null_rows_h2.yml"
   };
 
-  /**
-   * Constructor which populates the table object for each test iteration.
-   *
-   * @param table Table object
-   */
-  public JdbcToArrowNullTest(Table table) {
-    this.table = table;
-  }
-
   /**
    * Get the test data as a collection of Table objects for each test iteration.
    *
@@ -115,47 +102,73 @@ public JdbcToArrowNullTest(Table table) {
    * @throws ClassNotFoundException on error
    * @throws IOException on error
    */
-  @Parameters
-  public static Collection<Object[]> getTestData() throws SQLException, ClassNotFoundException, IOException {
-    return Arrays.asList(prepareTestData(testFiles, JdbcToArrowNullTest.class));
+  public static Stream<Arguments> getTestData()
+      throws SQLException, ClassNotFoundException, IOException {
+    return Arrays.stream(prepareTestData(testFiles, JdbcToArrowNullTest.class)).map(Arguments::of);
   }
 
   /**
-   * Test Method to test JdbcToArrow Functionality for various H2 DB based datatypes with null values.
+   * Test Method to test JdbcToArrow Functionality for various H2 DB based datatypes with null
+   * values.
    */
-  @Test
-  public void testJdbcToArrowValues() throws SQLException, IOException {
-    testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE),
-        Calendar.getInstance()), false);
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testJdbcToArrowValues(Table table)
+      throws SQLException, IOException, ClassNotFoundException {
+    this.initializeDatabase(table);
+
+    testDataSets(
+        sqlToArrow(
+            conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()),
+        false);
     testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE)), false);
-    testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()),
-        new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()), false);
+    testDataSets(
+        sqlToArrow(
+            conn.createStatement().executeQuery(table.getQuery()),
+            new RootAllocator(Integer.MAX_VALUE),
+            Calendar.getInstance()),
+        false);
     testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery())), false);
-    testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()),
-        new RootAllocator(Integer.MAX_VALUE)), false);
-    testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), Calendar.getInstance()), false);
+    testDataSets(
+        sqlToArrow(
+            conn.createStatement().executeQuery(table.getQuery()),
+            new RootAllocator(Integer.MAX_VALUE)),
+        false);
+    testDataSets(
+        sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), Calendar.getInstance()),
+        false);
     Calendar calendar = Calendar.getInstance();
     ResultSetMetaData rsmd = getQueryMetaData(table.getQuery());
-    testDataSets(sqlToArrow(
-        conn.createStatement().executeQuery(table.getQuery()),
-        new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
-            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-            .setJdbcToArrowTypeConverter(jdbcToArrowTypeConverter(calendar, rsmd))
-            .build()), true);
-    testDataSets(sqlToArrow(
-        conn,
-        table.getQuery(),
-        new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
-            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-            .setJdbcToArrowTypeConverter(jdbcToArrowTypeConverter(calendar, rsmd))
-            .build()), true);
+    testDataSets(
+        sqlToArrow(
+            conn.createStatement().executeQuery(table.getQuery()),
+            new JdbcToArrowConfigBuilder(
+                    new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
+                .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+                .setJdbcToArrowTypeConverter(jdbcToArrowTypeConverter(calendar, rsmd))
+                .build()),
+        true);
+    testDataSets(
+        sqlToArrow(
+            conn,
+            table.getQuery(),
+            new JdbcToArrowConfigBuilder(
+                    new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
+                .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+                .setJdbcToArrowTypeConverter(jdbcToArrowTypeConverter(calendar, rsmd))
+                .build()),
+        true);
   }
 
-  @Test
-  public void testJdbcSchemaMetadata() throws SQLException {
-    JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(new RootAllocator(0), Calendar.getInstance(), true)
-        .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-        .build();
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testJdbcSchemaMetadata(Table table) throws SQLException, ClassNotFoundException {
+    this.initializeDatabase(table);
+
+    JdbcToArrowConfig config =
+        new JdbcToArrowConfigBuilder(new RootAllocator(0), Calendar.getInstance(), true)
+            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+            .build();
     ResultSetMetaData rsmd = conn.createStatement().executeQuery(table.getQuery()).getMetaData();
     Schema schema = JdbcToArrowUtils.jdbcToArrowSchema(rsmd, config);
     JdbcToArrowTestHelper.assertFieldMetadataMatchesResultSetMetadata(rsmd, schema);
@@ -165,9 +178,10 @@ public void testJdbcSchemaMetadata() throws SQLException {
    * This method calls the assert methods for various DataSets.
    *
    * @param root VectorSchemaRoot for test
-   * @param isIncludeMapVector is this dataset checks includes map column.
-   *          Jdbc type to 'map' mapping declared in configuration only manually
+   * @param isIncludeMapVector is this dataset checks includes map column. Jdbc type to 'map'
+   *     mapping declared in configuration only manually
    */
+  @Override
   public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) {
     JdbcToArrowTestHelper.assertFieldMetadataIsEmpty(root);
 
@@ -176,7 +190,8 @@ public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) {
         sqlToArrowTestNullValues(table.getVectors(), root, table.getRowCount());
         break;
       case SELECTED_NULL_COLUMN:
-        sqlToArrowTestSelectedNullColumnsValues(table.getVectors(), root, table.getRowCount(), isIncludeMapVector);
+        sqlToArrowTestSelectedNullColumnsValues(
+            table.getVectors(), root, table.getRowCount(), isIncludeMapVector);
         break;
       case SELECTED_NULL_ROW:
         testAllVectorValues(root, isIncludeMapVector);
@@ -190,62 +205,96 @@ public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) {
   private void testAllVectorValues(VectorSchemaRoot root, boolean isIncludeMapVector) {
     JdbcToArrowTestHelper.assertFieldMetadataIsEmpty(root);
 
-    assertBigIntVectorValues((BigIntVector) root.getVector(BIGINT), table.getRowCount(),
+    assertBigIntVectorValues(
+        (BigIntVector) root.getVector(BIGINT),
+        table.getRowCount(),
         getLongValues(table.getValues(), BIGINT));
 
-    assertTinyIntVectorValues((TinyIntVector) root.getVector(TINYINT), table.getRowCount(),
+    assertTinyIntVectorValues(
+        (TinyIntVector) root.getVector(TINYINT),
+        table.getRowCount(),
         getIntValues(table.getValues(), TINYINT));
 
-    assertSmallIntVectorValues((SmallIntVector) root.getVector(SMALLINT), table.getRowCount(),
+    assertSmallIntVectorValues(
+        (SmallIntVector) root.getVector(SMALLINT),
+        table.getRowCount(),
         getIntValues(table.getValues(), SMALLINT));
 
-    assertVarBinaryVectorValues((VarBinaryVector) root.getVector(BINARY), table.getRowCount(),
+    assertVarBinaryVectorValues(
+        (VarBinaryVector) root.getVector(BINARY),
+        table.getRowCount(),
         getBinaryValues(table.getValues(), BINARY));
 
-    assertVarBinaryVectorValues((VarBinaryVector) root.getVector(BLOB), table.getRowCount(),
+    assertVarBinaryVectorValues(
+        (VarBinaryVector) root.getVector(BLOB),
+        table.getRowCount(),
         getBinaryValues(table.getValues(), BLOB));
 
-    assertVarcharVectorValues((VarCharVector) root.getVector(CLOB), table.getRowCount(),
+    assertVarcharVectorValues(
+        (VarCharVector) root.getVector(CLOB),
+        table.getRowCount(),
         getCharArray(table.getValues(), CLOB));
 
-    assertVarcharVectorValues((VarCharVector) root.getVector(VARCHAR), table.getRowCount(),
+    assertVarcharVectorValues(
+        (VarCharVector) root.getVector(VARCHAR),
+        table.getRowCount(),
         getCharArray(table.getValues(), VARCHAR));
 
-    assertVarcharVectorValues((VarCharVector) root.getVector(CHAR), table.getRowCount(),
+    assertVarcharVectorValues(
+        (VarCharVector) root.getVector(CHAR),
+        table.getRowCount(),
         getCharArray(table.getValues(), CHAR));
 
-    assertIntVectorValues((IntVector) root.getVector(INT), table.getRowCount(),
-        getIntValues(table.getValues(), INT));
+    assertIntVectorValues(
+        (IntVector) root.getVector(INT), table.getRowCount(), getIntValues(table.getValues(), INT));
 
-    assertBitVectorValues((BitVector) root.getVector(BIT), table.getRowCount(),
-        getIntValues(table.getValues(), BIT));
+    assertBitVectorValues(
+        (BitVector) root.getVector(BIT), table.getRowCount(), getIntValues(table.getValues(), BIT));
 
-    assertBooleanVectorValues((BitVector) root.getVector(BOOL), table.getRowCount(),
+    assertBooleanVectorValues(
+        (BitVector) root.getVector(BOOL),
+        table.getRowCount(),
         getBooleanValues(table.getValues(), BOOL));
 
-    assertDateVectorValues((DateDayVector) root.getVector(DATE), table.getRowCount(),
+    assertDateVectorValues(
+        (DateDayVector) root.getVector(DATE),
+        table.getRowCount(),
         getIntValues(table.getValues(), DATE));
 
-    assertTimeVectorValues((TimeMilliVector) root.getVector(TIME), table.getRowCount(),
+    assertTimeVectorValues(
+        (TimeMilliVector) root.getVector(TIME),
+        table.getRowCount(),
         getLongValues(table.getValues(), TIME));
 
-    assertTimeStampVectorValues((TimeStampVector) root.getVector(TIMESTAMP), table.getRowCount(),
+    assertTimeStampVectorValues(
+        (TimeStampVector) root.getVector(TIMESTAMP),
+        table.getRowCount(),
         getLongValues(table.getValues(), TIMESTAMP));
 
-    assertDecimalVectorValues((DecimalVector) root.getVector(DECIMAL), table.getRowCount(),
+    assertDecimalVectorValues(
+        (DecimalVector) root.getVector(DECIMAL),
+        table.getRowCount(),
         getDecimalValues(table.getValues(), DECIMAL));
 
-    assertFloat8VectorValues((Float8Vector) root.getVector(DOUBLE), table.getRowCount(),
+    assertFloat8VectorValues(
+        (Float8Vector) root.getVector(DOUBLE),
+        table.getRowCount(),
         getDoubleValues(table.getValues(), DOUBLE));
 
-    assertFloat4VectorValues((Float4Vector) root.getVector(REAL), table.getRowCount(),
+    assertFloat4VectorValues(
+        (Float4Vector) root.getVector(REAL),
+        table.getRowCount(),
         getFloatValues(table.getValues(), REAL));
 
-    assertListVectorValues((ListVector) root.getVector(LIST), table.getRowCount(),
+    assertListVectorValues(
+        (ListVector) root.getVector(LIST),
+        table.getRowCount(),
         getListValues(table.getValues(), LIST));
     if (isIncludeMapVector) {
-      assertMapVectorValues((MapVector) root.getVector(MAP), table.getRowCount(),
-              getMapValues(table.getValues(), MAP));
+      assertMapVectorValues(
+          (MapVector) root.getVector(MAP),
+          table.getRowCount(),
+          getMapValues(table.getValues(), MAP));
     }
   }
 
@@ -283,11 +332,11 @@ public void sqlToArrowTestNullValues(String[] vectors, VectorSchemaRoot root, in
    * @param vectors Vectors to test
    * @param root VectorSchemaRoot for test
    * @param rowCount number of rows
-   * @param isIncludeMapVector is this dataset checks includes map column.
-   *          Jdbc type to 'map' mapping declared in configuration only manually
+   * @param isIncludeMapVector is this dataset checks includes map column. Jdbc type to 'map'
+   *     mapping declared in configuration only manually
    */
-  public void sqlToArrowTestSelectedNullColumnsValues(String[] vectors, VectorSchemaRoot root, int rowCount,
-                                                      boolean isIncludeMapVector) {
+  public void sqlToArrowTestSelectedNullColumnsValues(
+      String[] vectors, VectorSchemaRoot root, int rowCount, boolean isIncludeMapVector) {
     assertNullValues((BigIntVector) root.getVector(vectors[0]), rowCount);
     assertNullValues((DecimalVector) root.getVector(vectors[1]), rowCount);
     assertNullValues((Float8Vector) root.getVector(vectors[2]), rowCount);
@@ -306,5 +355,4 @@ public void sqlToArrowTestSelectedNullColumnsValues(String[] vectors, VectorSche
       assertNullValues((MapVector) root.getVector(vectors[14]), rowCount);
     }
   }
-
 }
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowOptionalColumnsTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowOptionalColumnsTest.java
index eebcbe64c0e0c..382d20f45d4b1 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowOptionalColumnsTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowOptionalColumnsTest.java
@@ -14,79 +14,72 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.h2;
 
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.Arrays;
-import java.util.Collection;
-
+import java.util.stream.Stream;
 import org.apache.arrow.adapter.jdbc.AbstractJdbcToArrowTest;
 import org.apache.arrow.adapter.jdbc.JdbcToArrowTestHelper;
 import org.apache.arrow.adapter.jdbc.Table;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.VectorSchemaRoot;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * JUnit Test Class which contains methods to test JDBC to Arrow data conversion functionality for
  * (non-)optional columns, in particular with regard to the ensuing VectorSchemaRoot's schema.
  */
-@RunWith(Parameterized.class)
 public class JdbcToArrowOptionalColumnsTest extends AbstractJdbcToArrowTest {
-  private static final String[] testFiles = {
-    "h2/test1_null_and_notnull.yml"
-  };
-
-  /**
-   * Constructor which populates the table object for each test iteration.
-   *
-   * @param table Table object
-   */
-  public JdbcToArrowOptionalColumnsTest(Table table) {
-    this.table = table;
-  }
+  private static final String[] testFiles = {"h2/test1_null_and_notnull.yml"};
 
   /**
    * Get the test data as a collection of Table objects for each test iteration.
    *
    * @return Collection of Table objects
-   * @throws SQLException           on error
+   * @throws SQLException on error
    * @throws ClassNotFoundException on error
-   * @throws IOException            on error
+   * @throws IOException on error
    */
-  @Parameterized.Parameters
-  public static Collection<Object[]> getTestData() throws SQLException, ClassNotFoundException, IOException {
-    return Arrays.asList(prepareTestData(testFiles, JdbcToArrowOptionalColumnsTest.class));
+  public static Stream<Arguments> getTestData()
+      throws SQLException, ClassNotFoundException, IOException {
+    return Arrays.stream(prepareTestData(testFiles, JdbcToArrowOptionalColumnsTest.class))
+        .map(Arguments::of);
   }
 
   /**
-   * Test Method to test JdbcToArrow Functionality for dealing with nullable and non-nullable columns.
+   * Test Method to test JdbcToArrow Functionality for dealing with nullable and non-nullable
+   * columns.
    */
-  @Test
-  public void testJdbcToArrowValues() throws SQLException, IOException {
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testJdbcToArrowValues(Table table)
+      throws SQLException, IOException, ClassNotFoundException {
+    this.initializeDatabase(table);
+
     testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE)), false);
   }
 
   /**
-   * This method calls the assert methods for various DataSets. We verify that a SQL `NULL` column becomes
-   * nullable in the VectorSchemaRoot, and that a SQL `NOT NULL` column becomes non-nullable.
+   * This method calls the assert methods for various DataSets. We verify that a SQL `NULL` column
+   * becomes nullable in the VectorSchemaRoot, and that a SQL `NOT NULL` column becomes
+   * non-nullable.
    *
    * @param root VectorSchemaRoot for test
-   * @param isIncludeMapVector is this dataset checks includes map column.
-   *          Jdbc type to 'map' mapping declared in configuration only manually
+   * @param isIncludeMapVector is this dataset checks includes map column. Jdbc type to 'map'
+   *     mapping declared in configuration only manually
    */
+  @Override
   public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) {
     JdbcToArrowTestHelper.assertFieldMetadataIsEmpty(root);
 
     assertTrue(root.getSchema().getFields().get(0).isNullable());
     assertFalse(root.getSchema().getFields().get(1).isNullable());
   }
-
 }
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTest.java
index 7641fa7f1659c..7966f62e175e3 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTest.java
@@ -14,11 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.h2;
 
 import static org.apache.arrow.adapter.jdbc.JdbcToArrowTestHelper.*;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
 import java.sql.ResultSet;
@@ -26,10 +25,7 @@
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Collection;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.apache.arrow.adapter.jdbc.AbstractJdbcToArrowTest;
 import org.apache.arrow.adapter.jdbc.ArrowVectorIterator;
 import org.apache.arrow.adapter.jdbc.JdbcToArrow;
@@ -59,30 +55,18 @@
 import org.apache.arrow.vector.complex.ListVector;
 import org.apache.arrow.vector.complex.MapVector;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
- * JUnit Test Class which contains methods to test JDBC to Arrow data conversion functionality with various data types
- * for H2 database using single test data file.
+ * JUnit Test Class which contains methods to test JDBC to Arrow data conversion functionality with
+ * various data types for H2 database using single test data file.
  */
-@RunWith(Parameterized.class)
 public class JdbcToArrowTest extends AbstractJdbcToArrowTest {
 
   private static final String[] testFiles = {"h2/test1_all_datatypes_h2.yml"};
 
-  /**
-   * Constructor which populates the table object for each test iteration.
-   *
-   * @param table Table object
-   * @param reuseVectorSchemaRoot A flag indicating if we should reuse vector schema roots.
-   */
-  public JdbcToArrowTest(Table table, boolean reuseVectorSchemaRoot) {
-    this.table = table;
-    this.reuseVectorSchemaRoot = reuseVectorSchemaRoot;
-  }
-
   /**
    * Get the test data as a collection of Table objects for each test iteration.
    *
@@ -91,53 +75,78 @@ public JdbcToArrowTest(Table table, boolean reuseVectorSchemaRoot) {
    * @throws ClassNotFoundException on error
    * @throws IOException on error
    */
-  @Parameterized.Parameters(name = "table = {0}, reuse batch = {1}")
-  public static Collection<Object[]> getTestData() throws SQLException, ClassNotFoundException, IOException {
-    return Arrays.stream(prepareTestData(testFiles, JdbcToArrowTest.class)).flatMap(row ->
-      Stream.of(new Object[] {row[0], true}, new Object[] {row[0], false})).collect(Collectors.toList());
+  public static Stream<Arguments> getTestData()
+      throws SQLException, ClassNotFoundException, IOException {
+    return Arrays.stream(prepareTestData(testFiles, JdbcToArrowTest.class))
+        .flatMap(row -> Stream.of(Arguments.of(row[0], true), Arguments.of(row[0], false)));
   }
 
   /**
-   * Test Method to test JdbcToArrow Functionality for various H2 DB based datatypes with only one test data file.
+   * Test Method to test JdbcToArrow Functionality for various H2 DB based datatypes with only one
+   * test data file.
    */
-  @Test
-  public void testJdbcToArrowValues() throws SQLException, IOException {
-    testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE),
-        Calendar.getInstance()), false);
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testJdbcToArrowValues(Table table)
+      throws SQLException, IOException, ClassNotFoundException {
+    this.initializeDatabase(table);
+
+    testDataSets(
+        sqlToArrow(
+            conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()),
+        false);
     testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE)), false);
-    testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()),
-        new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance()), false);
+    testDataSets(
+        sqlToArrow(
+            conn.createStatement().executeQuery(table.getQuery()),
+            new RootAllocator(Integer.MAX_VALUE),
+            Calendar.getInstance()),
+        false);
     testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery())), false);
-    testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()),
-        new RootAllocator(Integer.MAX_VALUE)), false);
-    testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()),
-        Calendar.getInstance()), false);
+    testDataSets(
+        sqlToArrow(
+            conn.createStatement().executeQuery(table.getQuery()),
+            new RootAllocator(Integer.MAX_VALUE)),
+        false);
+    testDataSets(
+        sqlToArrow(conn.createStatement().executeQuery(table.getQuery()), Calendar.getInstance()),
+        false);
     Calendar calendar = Calendar.getInstance();
     ResultSetMetaData rsmd = getQueryMetaData(table.getQuery());
-    testDataSets(sqlToArrow(
-        conn.createStatement().executeQuery(table.getQuery()),
-        new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
-            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-            .setJdbcToArrowTypeConverter(jdbcToArrowTypeConverter(calendar, rsmd))
-            .build()), true);
-    testDataSets(sqlToArrow(
-        conn,
-        table.getQuery(),
-        new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), calendar)
-            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-            .setJdbcToArrowTypeConverter(jdbcToArrowTypeConverter(calendar, rsmd))
-            .build()), true);
+    testDataSets(
+        sqlToArrow(
+            conn.createStatement().executeQuery(table.getQuery()),
+            new JdbcToArrowConfigBuilder(
+                    new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
+                .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+                .setJdbcToArrowTypeConverter(jdbcToArrowTypeConverter(calendar, rsmd))
+                .build()),
+        true);
+    testDataSets(
+        sqlToArrow(
+            conn,
+            table.getQuery(),
+            new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), calendar)
+                .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+                .setJdbcToArrowTypeConverter(jdbcToArrowTypeConverter(calendar, rsmd))
+                .build()),
+        true);
   }
 
-  @Test
-  public void testJdbcSchemaMetadata() throws SQLException {
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testJdbcSchemaMetadata(Table table, boolean reuseVectorSchemaRoot)
+      throws SQLException, ClassNotFoundException {
+    this.initializeDatabase(table);
+
     Calendar calendar = Calendar.getInstance();
     ResultSetMetaData rsmd = getQueryMetaData(table.getQuery());
-    JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(new RootAllocator(0), calendar, true)
-        .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
-        .setJdbcToArrowTypeConverter(jdbcToArrowTypeConverter(calendar, rsmd))
-        .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-        .build();
+    JdbcToArrowConfig config =
+        new JdbcToArrowConfigBuilder(new RootAllocator(0), calendar, true)
+            .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
+            .setJdbcToArrowTypeConverter(jdbcToArrowTypeConverter(calendar, rsmd))
+            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+            .build();
     Schema schema = JdbcToArrowUtils.jdbcToArrowSchema(rsmd, config);
     JdbcToArrowTestHelper.assertFieldMetadataMatchesResultSetMetadata(rsmd, schema);
   }
@@ -146,84 +155,124 @@ public void testJdbcSchemaMetadata() throws SQLException {
    * This method calls the assert methods for various DataSets.
    *
    * @param root VectorSchemaRoot for test
-   * @param isIncludeMapVector is this dataset checks includes map column.
-   *          Jdbc type to 'map' mapping declared in configuration only manually
+   * @param isIncludeMapVector is this dataset checks includes map column. Jdbc type to 'map'
+   *     mapping declared in configuration only manually
    */
+  @Override
   public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) {
     JdbcToArrowTestHelper.assertFieldMetadataIsEmpty(root);
-    assertBigIntVectorValues((BigIntVector) root.getVector(BIGINT), table.getRowCount(),
+    assertBigIntVectorValues(
+        (BigIntVector) root.getVector(BIGINT),
+        table.getRowCount(),
         getLongValues(table.getValues(), BIGINT));
 
-    assertTinyIntVectorValues((TinyIntVector) root.getVector(TINYINT), table.getRowCount(),
+    assertTinyIntVectorValues(
+        (TinyIntVector) root.getVector(TINYINT),
+        table.getRowCount(),
         getIntValues(table.getValues(), TINYINT));
 
-    assertSmallIntVectorValues((SmallIntVector) root.getVector(SMALLINT), table.getRowCount(),
+    assertSmallIntVectorValues(
+        (SmallIntVector) root.getVector(SMALLINT),
+        table.getRowCount(),
         getIntValues(table.getValues(), SMALLINT));
 
-    assertVarBinaryVectorValues((VarBinaryVector) root.getVector(BINARY), table.getRowCount(),
+    assertVarBinaryVectorValues(
+        (VarBinaryVector) root.getVector(BINARY),
+        table.getRowCount(),
         getBinaryValues(table.getValues(), BINARY));
 
-    assertVarBinaryVectorValues((VarBinaryVector) root.getVector(BLOB), table.getRowCount(),
+    assertVarBinaryVectorValues(
+        (VarBinaryVector) root.getVector(BLOB),
+        table.getRowCount(),
         getBinaryValues(table.getValues(), BLOB));
 
-    assertVarcharVectorValues((VarCharVector) root.getVector(CLOB), table.getRowCount(),
+    assertVarcharVectorValues(
+        (VarCharVector) root.getVector(CLOB),
+        table.getRowCount(),
         getCharArray(table.getValues(), CLOB));
 
-    assertVarcharVectorValues((VarCharVector) root.getVector(VARCHAR), table.getRowCount(),
+    assertVarcharVectorValues(
+        (VarCharVector) root.getVector(VARCHAR),
+        table.getRowCount(),
         getCharArray(table.getValues(), VARCHAR));
 
-    assertVarcharVectorValues((VarCharVector) root.getVector(CHAR), table.getRowCount(),
+    assertVarcharVectorValues(
+        (VarCharVector) root.getVector(CHAR),
+        table.getRowCount(),
         getCharArray(table.getValues(), CHAR));
 
-    assertIntVectorValues((IntVector) root.getVector(INT), table.getRowCount(),
-        getIntValues(table.getValues(), INT));
+    assertIntVectorValues(
+        (IntVector) root.getVector(INT), table.getRowCount(), getIntValues(table.getValues(), INT));
 
-    assertBitVectorValues((BitVector) root.getVector(BIT), table.getRowCount(),
-        getIntValues(table.getValues(), BIT));
+    assertBitVectorValues(
+        (BitVector) root.getVector(BIT), table.getRowCount(), getIntValues(table.getValues(), BIT));
 
-    assertBooleanVectorValues((BitVector) root.getVector(BOOL), table.getRowCount(),
+    assertBooleanVectorValues(
+        (BitVector) root.getVector(BOOL),
+        table.getRowCount(),
         getBooleanValues(table.getValues(), BOOL));
 
-    assertDateVectorValues((DateDayVector) root.getVector(DATE), table.getRowCount(),
+    assertDateVectorValues(
+        (DateDayVector) root.getVector(DATE),
+        table.getRowCount(),
         getIntValues(table.getValues(), DATE));
 
-    assertTimeVectorValues((TimeMilliVector) root.getVector(TIME), table.getRowCount(),
+    assertTimeVectorValues(
+        (TimeMilliVector) root.getVector(TIME),
+        table.getRowCount(),
         getLongValues(table.getValues(), TIME));
 
-    assertTimeStampVectorValues((TimeStampVector) root.getVector(TIMESTAMP), table.getRowCount(),
+    assertTimeStampVectorValues(
+        (TimeStampVector) root.getVector(TIMESTAMP),
+        table.getRowCount(),
         getLongValues(table.getValues(), TIMESTAMP));
 
-    assertDecimalVectorValues((DecimalVector) root.getVector(DECIMAL), table.getRowCount(),
+    assertDecimalVectorValues(
+        (DecimalVector) root.getVector(DECIMAL),
+        table.getRowCount(),
         getDecimalValues(table.getValues(), DECIMAL));
 
-    assertFloat8VectorValues((Float8Vector) root.getVector(DOUBLE), table.getRowCount(),
+    assertFloat8VectorValues(
+        (Float8Vector) root.getVector(DOUBLE),
+        table.getRowCount(),
         getDoubleValues(table.getValues(), DOUBLE));
 
-    assertFloat4VectorValues((Float4Vector) root.getVector(REAL), table.getRowCount(),
+    assertFloat4VectorValues(
+        (Float4Vector) root.getVector(REAL),
+        table.getRowCount(),
         getFloatValues(table.getValues(), REAL));
 
     assertNullVectorValues((NullVector) root.getVector(NULL), table.getRowCount());
 
-    assertListVectorValues((ListVector) root.getVector(LIST), table.getRowCount(),
+    assertListVectorValues(
+        (ListVector) root.getVector(LIST),
+        table.getRowCount(),
         getListValues(table.getValues(), LIST));
 
     if (isIncludeMapVector) {
-      assertMapVectorValues((MapVector) root.getVector(MAP), table.getRowCount(),
-              getMapValues(table.getValues(), MAP));
+      assertMapVectorValues(
+          (MapVector) root.getVector(MAP),
+          table.getRowCount(),
+          getMapValues(table.getValues(), MAP));
     }
   }
 
-  @Test
-  public void runLargeNumberOfRows() throws IOException, SQLException {
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void runLargeNumberOfRows(Table table, boolean reuseVectorSchemaRoot)
+      throws IOException, SQLException, ClassNotFoundException {
+    this.initializeDatabase(table);
+
     BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
     int x = 0;
     final int targetRows = 600000;
     ResultSet rs = ResultSetUtility.generateBasicResultSet(targetRows);
-    JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(
-        allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
-        .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
-        .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-        .build();
+    JdbcToArrowConfig config =
+        new JdbcToArrowConfigBuilder(
+                allocator, JdbcToArrowUtils.getUtcCalendar(), /* include metadata */ false)
+            .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
+            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+            .build();
 
     try (ArrowVectorIterator iter = JdbcToArrow.sqlToArrowVectorIterator(rs, config)) {
       while (iter.hasNext()) {
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTimeZoneTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTimeZoneTest.java
index 462a75da5143a..0f60c89d1c03c 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTimeZoneTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowTimeZoneTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.h2;
 
 import static org.apache.arrow.adapter.jdbc.JdbcToArrowTestHelper.assertDateVectorValues;
@@ -26,9 +25,8 @@
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Collection;
 import java.util.TimeZone;
-
+import java.util.stream.Stream;
 import org.apache.arrow.adapter.jdbc.AbstractJdbcToArrowTest;
 import org.apache.arrow.adapter.jdbc.JdbcToArrowConfig;
 import org.apache.arrow.adapter.jdbc.JdbcToArrowConfigBuilder;
@@ -41,17 +39,14 @@
 import org.apache.arrow.vector.TimeStampVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
- * JUnit Test Class which contains methods to test JDBC to Arrow data conversion functionality with TimeZone based Date,
- * Time and Timestamp datatypes for H2 database.
+ * JUnit Test Class which contains methods to test JDBC to Arrow data conversion functionality with
+ * TimeZone based Date, Time and Timestamp datatypes for H2 database.
  */
-
-@RunWith(Parameterized.class)
 public class JdbcToArrowTimeZoneTest extends AbstractJdbcToArrowTest {
 
   private static final String EST_DATE = "est_date";
@@ -76,15 +71,6 @@ public class JdbcToArrowTimeZoneTest extends AbstractJdbcToArrowTest {
     "h2/test1_pst_timestamp_h2.yml"
   };
 
-  /**
-   * Constructor which populates the table object for each test iteration.
-   *
-   * @param table Table object
-   */
-  public JdbcToArrowTimeZoneTest(Table table) {
-    this.table = table;
-  }
-
   /**
    * Get the test data as a collection of Table objects for each test iteration.
    *
@@ -93,40 +79,67 @@ public JdbcToArrowTimeZoneTest(Table table) {
    * @throws ClassNotFoundException on error
    * @throws IOException on error
    */
-  @Parameters
-  public static Collection<Object[]> getTestData() throws SQLException, ClassNotFoundException, IOException {
-    return Arrays.asList(prepareTestData(testFiles, JdbcToArrowTimeZoneTest.class));
+  public static Stream<Arguments> getTestData()
+      throws SQLException, ClassNotFoundException, IOException {
+    return Arrays.stream(prepareTestData(testFiles, JdbcToArrowTimeZoneTest.class))
+        .map(Arguments::of);
   }
 
   /**
-   * Test Method to test JdbcToArrow Functionality for various H2 DB based datatypes with TimeZone based Date,
-   * Time and Timestamp datatype.
+   * Test Method to test JdbcToArrow Functionality for various H2 DB based datatypes with TimeZone
+   * based Date, Time and Timestamp datatype.
    */
-  @Test
-  public void testJdbcToArrowValues() throws SQLException, IOException {
-    testDataSets(sqlToArrow(conn, table.getQuery(), new RootAllocator(Integer.MAX_VALUE),
-        Calendar.getInstance(TimeZone.getTimeZone(table.getTimezone()))), false);
-    testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()),
-        new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance(TimeZone.getTimeZone(table.getTimezone()))), false);
-    testDataSets(sqlToArrow(conn.createStatement().executeQuery(table.getQuery()),
-        Calendar.getInstance(TimeZone.getTimeZone(table.getTimezone()))), false);
-    testDataSets(sqlToArrow(
-        conn.createStatement().executeQuery(table.getQuery()),
-        new JdbcToArrowConfigBuilder(
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testJdbcToArrowValues(Table table)
+      throws SQLException, IOException, ClassNotFoundException {
+    this.initializeDatabase(table);
+
+    testDataSets(
+        sqlToArrow(
+            conn,
+            table.getQuery(),
             new RootAllocator(Integer.MAX_VALUE),
-            Calendar.getInstance(TimeZone.getTimeZone(table.getTimezone()))).build()), false);
-    testDataSets(sqlToArrow(
-        conn,
-        table.getQuery(),
-        new JdbcToArrowConfigBuilder(
+            Calendar.getInstance(TimeZone.getTimeZone(table.getTimezone()))),
+        false);
+    testDataSets(
+        sqlToArrow(
+            conn.createStatement().executeQuery(table.getQuery()),
             new RootAllocator(Integer.MAX_VALUE),
-            Calendar.getInstance(TimeZone.getTimeZone(table.getTimezone()))).build()), false);
+            Calendar.getInstance(TimeZone.getTimeZone(table.getTimezone()))),
+        false);
+    testDataSets(
+        sqlToArrow(
+            conn.createStatement().executeQuery(table.getQuery()),
+            Calendar.getInstance(TimeZone.getTimeZone(table.getTimezone()))),
+        false);
+    testDataSets(
+        sqlToArrow(
+            conn.createStatement().executeQuery(table.getQuery()),
+            new JdbcToArrowConfigBuilder(
+                    new RootAllocator(Integer.MAX_VALUE),
+                    Calendar.getInstance(TimeZone.getTimeZone(table.getTimezone())))
+                .build()),
+        false);
+    testDataSets(
+        sqlToArrow(
+            conn,
+            table.getQuery(),
+            new JdbcToArrowConfigBuilder(
+                    new RootAllocator(Integer.MAX_VALUE),
+                    Calendar.getInstance(TimeZone.getTimeZone(table.getTimezone())))
+                .build()),
+        false);
   }
 
-  @Test
-  public void testJdbcSchemaMetadata() throws SQLException {
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testJdbcSchemaMetadata(Table table) throws SQLException, ClassNotFoundException {
+    this.initializeDatabase(table);
+
     Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone(table.getTimezone()));
-    JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(new RootAllocator(0), calendar, true).build();
+    JdbcToArrowConfig config =
+        new JdbcToArrowConfigBuilder(new RootAllocator(0), calendar, true).build();
     ResultSetMetaData rsmd = conn.createStatement().executeQuery(table.getQuery()).getMetaData();
     Schema schema = JdbcToArrowUtils.jdbcToArrowSchema(rsmd, config);
     JdbcToArrowTestHelper.assertFieldMetadataMatchesResultSetMetadata(rsmd, schema);
@@ -136,9 +149,10 @@ public void testJdbcSchemaMetadata() throws SQLException {
    * This method calls the assert methods for various DataSets.
    *
    * @param root VectorSchemaRoot for test
-   * @param isIncludeMapVector is this dataset checks includes map column.
-   *          Jdbc type to 'map' mapping declared in configuration only manually
+   * @param isIncludeMapVector is this dataset checks includes map column. Jdbc type to 'map'
+   *     mapping declared in configuration only manually
    */
+  @Override
   public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) {
     JdbcToArrowTestHelper.assertFieldMetadataIsEmpty(root);
 
@@ -146,19 +160,25 @@ public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) {
       case EST_DATE:
       case GMT_DATE:
       case PST_DATE:
-        assertDateVectorValues((DateDayVector) root.getVector(table.getVector()), table.getValues().length,
+        assertDateVectorValues(
+            (DateDayVector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getIntValues());
         break;
       case EST_TIME:
       case GMT_TIME:
       case PST_TIME:
-        assertTimeVectorValues((TimeMilliVector) root.getVector(table.getVector()), table.getValues().length,
+        assertTimeVectorValues(
+            (TimeMilliVector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getLongValues());
         break;
       case EST_TIMESTAMP:
       case GMT_TIMESTAMP:
       case PST_TIMESTAMP:
-        assertTimeStampVectorValues((TimeStampVector) root.getVector(table.getVector()), table.getValues().length,
+        assertTimeStampVectorValues(
+            (TimeStampVector) root.getVector(table.getVector()),
+            table.getValues().length,
             table.getLongValues());
         break;
       default:
@@ -166,5 +186,4 @@ public void testDataSets(VectorSchemaRoot root, boolean isIncludeMapVector) {
         break;
     }
   }
-
 }
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowVectorIteratorTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowVectorIteratorTest.java
index 1d7e2760f843e..40fd39ac0c555 100644
--- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowVectorIteratorTest.java
+++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowVectorIteratorTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc.h2;
 
 import static org.apache.arrow.adapter.jdbc.JdbcToArrowTestHelper.getBinaryValues;
@@ -26,11 +25,11 @@
 import static org.apache.arrow.adapter.jdbc.JdbcToArrowTestHelper.getIntValues;
 import static org.apache.arrow.adapter.jdbc.JdbcToArrowTestHelper.getListValues;
 import static org.apache.arrow.adapter.jdbc.JdbcToArrowTestHelper.getLongValues;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -42,7 +41,6 @@
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
-
 import org.apache.arrow.adapter.jdbc.ArrowVectorIterator;
 import org.apache.arrow.adapter.jdbc.JdbcToArrow;
 import org.apache.arrow.adapter.jdbc.JdbcToArrowConfig;
@@ -71,62 +69,59 @@
 import org.apache.arrow.vector.complex.ListVector;
 import org.apache.arrow.vector.types.FloatingPointPrecision;
 import org.apache.arrow.vector.types.pojo.ArrowType;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@RunWith(Parameterized.class)
 public class JdbcToArrowVectorIteratorTest extends JdbcToArrowTest {
 
-  /**
-   * Constructor which populates the table object for each test iteration.
-   *
-   * @param table Table object
-   * @param reuseVectorSchemaRoot A flag indicating if we should reuse vector schema roots.
-   */
-  public JdbcToArrowVectorIteratorTest(Table table, boolean reuseVectorSchemaRoot) {
-    super(table, reuseVectorSchemaRoot);
-  }
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testJdbcToArrowValues(Table table)
+      throws SQLException, IOException, ClassNotFoundException {
+    this.initializeDatabase(table);
 
-  @Test
-  @Override
-  public void testJdbcToArrowValues() throws SQLException, IOException {
-    JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE),
-        Calendar.getInstance())
-        .setTargetBatchSize(3)
-        .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-        .build();
+    JdbcToArrowConfig config =
+        new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
+            .setTargetBatchSize(3)
+            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+            .build();
 
     ArrowVectorIterator iterator =
-        JdbcToArrow.sqlToArrowVectorIterator(conn.createStatement().executeQuery(table.getQuery()), config);
+        JdbcToArrow.sqlToArrowVectorIterator(
+            conn.createStatement().executeQuery(table.getQuery()), config);
 
     validate(iterator);
   }
 
-  @Test
-  public void testVectorSchemaRootReuse() throws SQLException, IOException {
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testVectorSchemaRootReuse(Table table, boolean reuseVectorSchemaRoot)
+      throws SQLException, IOException, ClassNotFoundException {
+    this.initializeDatabase(table);
+
     Integer[][] intValues = {
-            {101, 102, 103},
-            {104, null, null},
-            {107, 108, 109},
-            {110}
+      {101, 102, 103},
+      {104, null, null},
+      {107, 108, 109},
+      {110}
     };
     Integer[][][] listValues = {
-            {{1, 2, 3}, {1, 2}, {1}},
-            {{2, 3, 4}, {2, 3}, {2}},
-            {{3, 4, 5}, {3, 4}, {3}},
-            {{}}
+      {{1, 2, 3}, {1, 2}, {1}},
+      {{2, 3, 4}, {2, 3}, {2}},
+      {{3, 4, 5}, {3, 4}, {3}},
+      {{}}
     };
 
-    JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE),
-        Calendar.getInstance())
-        .setTargetBatchSize(3)
-        .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
-        .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-        .build();
+    JdbcToArrowConfig config =
+        new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
+            .setTargetBatchSize(3)
+            .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
+            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+            .build();
 
     ArrowVectorIterator iterator =
-        JdbcToArrow.sqlToArrowVectorIterator(conn.createStatement().executeQuery(table.getQuery()), config);
+        JdbcToArrow.sqlToArrowVectorIterator(
+            conn.createStatement().executeQuery(table.getQuery()), config);
 
     int batchCount = 0;
     VectorSchemaRoot prev = null;
@@ -175,32 +170,40 @@ public void testVectorSchemaRootReuse() throws SQLException, IOException {
     assertTrue(batchCount > 1);
   }
 
-  @Test
-  public void testJdbcToArrowValuesNoLimit() throws SQLException, IOException {
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testJdbcToArrowValuesNoLimit(Table table)
+      throws SQLException, IOException, ClassNotFoundException {
+    this.initializeDatabase(table);
 
-    JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE),
-        Calendar.getInstance())
-        .setTargetBatchSize(JdbcToArrowConfig.NO_LIMIT_BATCH_SIZE)
-        .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-        .build();
+    JdbcToArrowConfig config =
+        new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
+            .setTargetBatchSize(JdbcToArrowConfig.NO_LIMIT_BATCH_SIZE)
+            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+            .build();
 
     ArrowVectorIterator iterator =
-        JdbcToArrow.sqlToArrowVectorIterator(conn.createStatement().executeQuery(table.getQuery()), config);
+        JdbcToArrow.sqlToArrowVectorIterator(
+            conn.createStatement().executeQuery(table.getQuery()), config);
 
     validate(iterator);
   }
 
-  @Test
-  public void testTimeStampConsumer() throws SQLException, IOException {
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testTimeStampConsumer(Table table, boolean reuseVectorSchemaRoot)
+      throws SQLException, IOException, ClassNotFoundException {
+    this.initializeDatabase(table);
+
     final String sql = "select timestamp_field11 from table1";
 
     // first experiment, with calendar and time zone.
-    JdbcToArrowConfig config = new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE),
-        Calendar.getInstance())
-        .setTargetBatchSize(3)
-        .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
-        .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-        .build();
+    JdbcToArrowConfig config =
+        new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
+            .setTargetBatchSize(3)
+            .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
+            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+            .build();
     assertNotNull(config.getCalendar());
 
     try (ArrowVectorIterator iterator =
@@ -213,16 +216,16 @@ public void testTimeStampConsumer() throws SQLException, IOException {
     }
 
     // second experiment, without calendar and time zone.
-    config = new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE),
-        null)
-        .setTargetBatchSize(3)
-        .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
-        .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
-        .build();
+    config =
+        new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), null)
+            .setTargetBatchSize(3)
+            .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
+            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP)
+            .build();
     assertNull(config.getCalendar());
 
     try (ArrowVectorIterator iterator =
-             JdbcToArrow.sqlToArrowVectorIterator(conn.createStatement().executeQuery(sql), config)) {
+        JdbcToArrow.sqlToArrowVectorIterator(conn.createStatement().executeQuery(sql), config)) {
       VectorSchemaRoot root = iterator.next();
       assertEquals(1, root.getFieldVectors().size());
 
@@ -278,24 +281,40 @@ private void validate(ArrowVectorIterator iterator) throws SQLException, IOExcep
       float8Vectors.add((Float8Vector) root.getVector(DOUBLE));
       listVectors.add((ListVector) root.getVector(LIST));
     }
-    assertBigIntVectorValues(bigIntVectors, table.getRowCount(), getLongValues(table.getValues(), BIGINT));
-    assertTinyIntVectorValues(tinyIntVectors, table.getRowCount(), getIntValues(table.getValues(), TINYINT));
+    assertBigIntVectorValues(
+        bigIntVectors, table.getRowCount(), getLongValues(table.getValues(), BIGINT));
+    assertTinyIntVectorValues(
+        tinyIntVectors, table.getRowCount(), getIntValues(table.getValues(), TINYINT));
     assertIntVectorValues(intVectors, table.getRowCount(), getIntValues(table.getValues(), INT));
-    assertSmallIntVectorValues(smallIntVectors, table.getRowCount(), getIntValues(table.getValues(), SMALLINT));
-    assertBinaryVectorValues(vectorsForBinary, table.getRowCount(), getBinaryValues(table.getValues(), BINARY));
-    assertBinaryVectorValues(vectorsForBlob, table.getRowCount(), getBinaryValues(table.getValues(), BLOB));
-    assertVarCharVectorValues(vectorsForClob, table.getRowCount(), getCharArray(table.getValues(), CLOB));
-    assertVarCharVectorValues(vectorsForVarChar, table.getRowCount(), getCharArray(table.getValues(), VARCHAR));
-    assertVarCharVectorValues(vectorsForChar, table.getRowCount(), getCharArray(table.getValues(), CHAR));
+    assertSmallIntVectorValues(
+        smallIntVectors, table.getRowCount(), getIntValues(table.getValues(), SMALLINT));
+    assertBinaryVectorValues(
+        vectorsForBinary, table.getRowCount(), getBinaryValues(table.getValues(), BINARY));
+    assertBinaryVectorValues(
+        vectorsForBlob, table.getRowCount(), getBinaryValues(table.getValues(), BLOB));
+    assertVarCharVectorValues(
+        vectorsForClob, table.getRowCount(), getCharArray(table.getValues(), CLOB));
+    assertVarCharVectorValues(
+        vectorsForVarChar, table.getRowCount(), getCharArray(table.getValues(), VARCHAR));
+    assertVarCharVectorValues(
+        vectorsForChar, table.getRowCount(), getCharArray(table.getValues(), CHAR));
     assertBitVectorValues(vectorsForBit, table.getRowCount(), getIntValues(table.getValues(), BIT));
-    assertBooleanVectorValues(vectorsForBool, table.getRowCount(), getBooleanValues(table.getValues(), BOOL));
-    assertDateDayVectorValues(dateDayVectors, table.getRowCount(), getLongValues(table.getValues(), DATE));
-    assertTimeMilliVectorValues(timeMilliVectors, table.getRowCount(), getLongValues(table.getValues(), TIME));
-    assertTimeStampVectorValues(timeStampVectors, table.getRowCount(), getLongValues(table.getValues(), TIMESTAMP));
-    assertDecimalVectorValues(decimalVectors, table.getRowCount(), getDecimalValues(table.getValues(), DECIMAL));
-    assertFloat4VectorValues(float4Vectors, table.getRowCount(), getFloatValues(table.getValues(), REAL));
-    assertFloat8VectorValues(float8Vectors, table.getRowCount(), getDoubleValues(table.getValues(), DOUBLE));
-    assertListVectorValues(listVectors, table.getRowCount(), getListValues(table.getValues(), LIST));
+    assertBooleanVectorValues(
+        vectorsForBool, table.getRowCount(), getBooleanValues(table.getValues(), BOOL));
+    assertDateDayVectorValues(
+        dateDayVectors, table.getRowCount(), getLongValues(table.getValues(), DATE));
+    assertTimeMilliVectorValues(
+        timeMilliVectors, table.getRowCount(), getLongValues(table.getValues(), TIME));
+    assertTimeStampVectorValues(
+        timeStampVectors, table.getRowCount(), getLongValues(table.getValues(), TIMESTAMP));
+    assertDecimalVectorValues(
+        decimalVectors, table.getRowCount(), getDecimalValues(table.getValues(), DECIMAL));
+    assertFloat4VectorValues(
+        float4Vectors, table.getRowCount(), getFloatValues(table.getValues(), REAL));
+    assertFloat8VectorValues(
+        float8Vectors, table.getRowCount(), getDoubleValues(table.getValues(), DOUBLE));
+    assertListVectorValues(
+        listVectors, table.getRowCount(), getListValues(table.getValues(), LIST));
 
     roots.forEach(root -> root.close());
   }
@@ -324,7 +343,8 @@ private void assertFloat4VectorValues(List<Float4Vector> vectors, int rowCount,
     }
   }
 
-  private void assertDecimalVectorValues(List<DecimalVector> vectors, int rowCount, BigDecimal[] values) {
+  private void assertDecimalVectorValues(
+      List<DecimalVector> vectors, int rowCount, BigDecimal[] values) {
     int valueCount = vectors.stream().mapToInt(ValueVector::getValueCount).sum();
     assertEquals(rowCount, valueCount);
 
@@ -337,7 +357,8 @@ private void assertDecimalVectorValues(List<DecimalVector> vectors, int rowCount
     }
   }
 
-  private void assertTimeStampVectorValues(List<TimeStampVector> vectors, int rowCount, Long[] values) {
+  private void assertTimeStampVectorValues(
+      List<TimeStampVector> vectors, int rowCount, Long[] values) {
     int valueCount = vectors.stream().mapToInt(ValueVector::getValueCount).sum();
     assertEquals(rowCount, valueCount);
 
@@ -349,7 +370,8 @@ private void assertTimeStampVectorValues(List<TimeStampVector> vectors, int rowC
     }
   }
 
-  private void assertTimeMilliVectorValues(List<TimeMilliVector> vectors, int rowCount, Long[] values) {
+  private void assertTimeMilliVectorValues(
+      List<TimeMilliVector> vectors, int rowCount, Long[] values) {
     int valueCount = vectors.stream().mapToInt(ValueVector::getValueCount).sum();
     assertEquals(rowCount, valueCount);
 
@@ -397,7 +419,8 @@ private void assertBooleanVectorValues(List<BitVector> vectors, int rowCount, Bo
     }
   }
 
-  private void assertVarCharVectorValues(List<VarCharVector> vectors, int rowCount, byte[][] values) {
+  private void assertVarCharVectorValues(
+      List<VarCharVector> vectors, int rowCount, byte[][] values) {
     int valueCount = vectors.stream().mapToInt(ValueVector::getValueCount).sum();
     assertEquals(rowCount, valueCount);
 
@@ -409,7 +432,8 @@ private void assertVarCharVectorValues(List<VarCharVector> vectors, int rowCount
     }
   }
 
-  private void assertBinaryVectorValues(List<VarBinaryVector> vectors, int rowCount, byte[][] values) {
+  private void assertBinaryVectorValues(
+      List<VarBinaryVector> vectors, int rowCount, byte[][] values) {
     int valueCount = vectors.stream().mapToInt(ValueVector::getValueCount).sum();
     assertEquals(rowCount, valueCount);
 
@@ -421,7 +445,8 @@ private void assertBinaryVectorValues(List<VarBinaryVector> vectors, int rowCoun
     }
   }
 
-  private void assertSmallIntVectorValues(List<SmallIntVector> vectors, int rowCount, Integer[] values) {
+  private void assertSmallIntVectorValues(
+      List<SmallIntVector> vectors, int rowCount, Integer[] values) {
     int valueCount = vectors.stream().mapToInt(ValueVector::getValueCount).sum();
     assertEquals(rowCount, valueCount);
 
@@ -433,7 +458,8 @@ private void assertSmallIntVectorValues(List<SmallIntVector> vectors, int rowCou
     }
   }
 
-  private void assertTinyIntVectorValues(List<TinyIntVector> vectors, int rowCount, Integer[] values) {
+  private void assertTinyIntVectorValues(
+      List<TinyIntVector> vectors, int rowCount, Integer[] values) {
     int valueCount = vectors.stream().mapToInt(ValueVector::getValueCount).sum();
     assertEquals(rowCount, valueCount);
 
@@ -474,7 +500,8 @@ private void assertIntVectorValues(List<IntVector> vectors, int rowCount, Intege
     }
   }
 
-  public static void assertListVectorValues(List<ListVector> vectors, int rowCount, Integer[][] values) {
+  public static void assertListVectorValues(
+      List<ListVector> vectors, int rowCount, Integer[][] values) {
     int valueCount = vectors.stream().mapToInt(ValueVector::getValueCount).sum();
     assertEquals(rowCount, valueCount);
 
@@ -492,12 +519,11 @@ public static void assertListVectorValues(List<ListVector> vectors, int rowCount
     }
   }
 
-  /**
-   * Runs a simple query, and encapsulates the result into a field vector.
-   */
+  /** Runs a simple query, and encapsulates the result into a field vector. */
   private FieldVector getQueryResult(JdbcToArrowConfig config) throws SQLException, IOException {
-    ArrowVectorIterator iterator = JdbcToArrow.sqlToArrowVectorIterator(
-        conn.createStatement().executeQuery("select real_field8 from table1"), config);
+    ArrowVectorIterator iterator =
+        JdbcToArrow.sqlToArrowVectorIterator(
+            conn.createStatement().executeQuery("select real_field8 from table1"), config);
 
     VectorSchemaRoot root = iterator.next();
 
@@ -511,12 +537,17 @@ private FieldVector getQueryResult(JdbcToArrowConfig config) throws SQLException
     return result;
   }
 
-  @Test
-  public void testJdbcToArrowCustomTypeConversion() throws SQLException, IOException {
-    JdbcToArrowConfigBuilder builder = new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE),
-        Calendar.getInstance()).setTargetBatchSize(JdbcToArrowConfig.NO_LIMIT_BATCH_SIZE)
-        .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
-        .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP);
+  @ParameterizedTest
+  @MethodSource("getTestData")
+  public void testJdbcToArrowCustomTypeConversion(Table table, boolean reuseVectorSchemaRoot)
+      throws SQLException, IOException, ClassNotFoundException {
+    this.initializeDatabase(table);
+
+    JdbcToArrowConfigBuilder builder =
+        new JdbcToArrowConfigBuilder(new RootAllocator(Integer.MAX_VALUE), Calendar.getInstance())
+            .setTargetBatchSize(JdbcToArrowConfig.NO_LIMIT_BATCH_SIZE)
+            .setReuseVectorSchemaRoot(reuseVectorSchemaRoot)
+            .setArraySubTypeByColumnNameMap(ARRAY_SUB_TYPE_BY_COLUMN_NAME_MAP);
 
     // first experiment, using default type converter
     JdbcToArrowConfig config = builder.build();
@@ -527,15 +558,16 @@ public void testJdbcToArrowCustomTypeConversion() throws SQLException, IOExcepti
     }
 
     // second experiment, using customized type converter
-    builder.setJdbcToArrowTypeConverter((fieldInfo) -> {
-      switch (fieldInfo.getJdbcType()) {
-        case Types.REAL:
-          // this is different from the default type converter
-          return new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE);
-        default:
-          return null;
-      }
-    });
+    builder.setJdbcToArrowTypeConverter(
+        (fieldInfo) -> {
+          switch (fieldInfo.getJdbcType()) {
+            case Types.REAL:
+              // this is different from the default type converter
+              return new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE);
+            default:
+              return null;
+          }
+        });
     config = builder.build();
 
     try (FieldVector vector = getQueryResult(config)) {
diff --git a/java/adapter/orc/pom.xml b/java/adapter/orc/pom.xml
index e7a2bfe872eb3..b216ad5abeb14 100644
--- a/java/adapter/orc/pom.xml
+++ b/java/adapter/orc/pom.xml
@@ -1,141 +1,165 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
+<!--
+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
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-memory-core</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-memory-netty</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-vector</artifactId>
-            <scope>compile</scope>
-            <classifier>${arrow.vector.classifier}</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.immutables</groupId>
-            <artifactId>value</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.orc</groupId>
-            <artifactId>orc-core</artifactId>
-            <version>1.9.2</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-client-runtime</artifactId>
-            <version>3.3.6</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-client-api</artifactId>
-            <version>3.3.6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-common</artifactId>
-            <version>3.3.6</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-reload4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>ch.qos.reload4j</groupId>
-                    <artifactId>reload4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hive</groupId>
-            <artifactId>hive-storage-api</artifactId>
-            <version>2.8.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    http://www.apache.org/licenses/LICENSE-2.0
 
-    <parent>
-        <groupId>org.apache.arrow</groupId>
-        <artifactId>arrow-java-root</artifactId>
-        <version>16.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
+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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.apache.arrow.orc</groupId>
-    <artifactId>arrow-orc</artifactId>
-    <name>Arrow Orc Adapter</name>
-    <description>(Experimental/Contrib)A JNI wrapper for the C++ ORC reader implementation.</description>
-    <packaging>jar</packaging>
-    <properties>
-        <arrow.cpp.build.dir>../../../cpp/release-build/</arrow.cpp.build.dir>
-    </properties>
+  <parent>
+    <groupId>org.apache.arrow</groupId>
+    <artifactId>arrow-java-root</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>${arrow.cpp.build.dir}</directory>
-                <includes>
-                    <include>**/*arrow_orc_jni.*</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
+  <groupId>org.apache.arrow.orc</groupId>
+  <artifactId>arrow-orc</artifactId>
+  <packaging>jar</packaging>
+  <name>Arrow Orc Adapter</name>
+  <description>(Experimental/Contrib)A JNI wrapper for the C++ ORC reader implementation.</description>
+
+  <properties>
+    <arrow.cpp.build.dir>../../../cpp/release-build/</arrow.cpp.build.dir>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-memory-core</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-memory-netty</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-vector</artifactId>
+      <classifier>${arrow.vector.classifier}</classifier>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.immutables</groupId>
+      <artifactId>value-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.orc</groupId>
+      <artifactId>orc-core</artifactId>
+      <version>1.9.2</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-client-runtime</artifactId>
+      <version>${dep.hadoop.version}</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-client-api</artifactId>
+      <version>${dep.hadoop.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+      <version>${dep.hadoop.version}</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-reload4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>ch.qos.reload4j</groupId>
+          <artifactId>reload4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-storage-api</artifactId>
+      <version>4.0.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>${arrow.cpp.build.dir}</directory>
+        <includes>
+          <include>**/*arrow_orc_jni.*</include>
+        </includes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>analyze</id>
+            <configuration>
+              <ignoredDependencies combine.children="append">
+                <!-- indirect use of org.apache.arrow.flatbuf.Message in OrcStripeReader -->
+                <ignoredDependency>org.apache.arrow:arrow-format</ignoredDependency>
+              </ignoredDependencies>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcFieldNode.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcFieldNode.java
index 716a13876608c..faf48e19445ae 100644
--- a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcFieldNode.java
+++ b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcFieldNode.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.orc;
 
-/**
- * Metadata about Vectors/Arrays that is passed via JNI interface.
- */
+/** Metadata about Vectors/Arrays that is passed via JNI interface. */
 class OrcFieldNode {
 
   private final int length;
@@ -27,6 +24,7 @@ class OrcFieldNode {
 
   /**
    * Construct a new instance.
+   *
    * @param length the number of values written.
    * @param nullCount the number of null values.
    */
diff --git a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcJniUtils.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcJniUtils.java
index d61799e990f77..692b0c061839c 100644
--- a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcJniUtils.java
+++ b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcJniUtils.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.orc;
 
 import java.io.File;
@@ -25,24 +24,21 @@
 import java.nio.file.StandardCopyOption;
 import java.util.Locale;
 
-/**
- * Helper class for JNI related operations.
- */
+/** Helper class for JNI related operations. */
 class OrcJniUtils {
   private static final String LIBRARY_NAME = "arrow_orc_jni";
   private static boolean isLoaded = false;
 
-  private OrcJniUtils() {
-  }
+  private OrcJniUtils() {}
 
-  static void loadOrcAdapterLibraryFromJar()
-          throws IOException, IllegalAccessException {
+  static void loadOrcAdapterLibraryFromJar() throws IOException, IllegalAccessException {
     synchronized (OrcJniUtils.class) {
       if (!isLoaded) {
         final String libraryToLoad =
             LIBRARY_NAME + "/" + getNormalizedArch() + "/" + System.mapLibraryName(LIBRARY_NAME);
         final File libraryFile =
-            moveFileFromJarToTemp(System.getProperty("java.io.tmpdir"), libraryToLoad, LIBRARY_NAME);
+            moveFileFromJarToTemp(
+                System.getProperty("java.io.tmpdir"), libraryToLoad, LIBRARY_NAME);
         System.load(libraryFile.getAbsolutePath());
         isLoaded = true;
       }
@@ -64,11 +60,11 @@ private static String getNormalizedArch() {
     return arch;
   }
 
-  private static File moveFileFromJarToTemp(final String tmpDir, String libraryToLoad, String libraryName)
-          throws IOException {
+  private static File moveFileFromJarToTemp(
+      final String tmpDir, String libraryToLoad, String libraryName) throws IOException {
     final File temp = File.createTempFile(tmpDir, libraryName);
-    try (final InputStream is = OrcReaderJniWrapper.class.getClassLoader()
-            .getResourceAsStream(libraryToLoad)) {
+    try (final InputStream is =
+        OrcReaderJniWrapper.class.getClassLoader().getResourceAsStream(libraryToLoad)) {
       if (is == null) {
         throw new FileNotFoundException(libraryToLoad);
       } else {
diff --git a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcMemoryJniWrapper.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcMemoryJniWrapper.java
index 473e8314243b1..70f2a655654c6 100644
--- a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcMemoryJniWrapper.java
+++ b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcMemoryJniWrapper.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.orc;
 
-/**
- * Wrapper for orc memory allocated by native code.
- */
+/** Wrapper for orc memory allocated by native code. */
 class OrcMemoryJniWrapper implements AutoCloseable {
 
   private final long nativeInstanceId;
@@ -32,6 +29,7 @@ class OrcMemoryJniWrapper implements AutoCloseable {
 
   /**
    * Construct a new instance.
+   *
    * @param nativeInstanceId unique id of the underlying memory.
    * @param memoryAddress starting memory address of the underlying memory.
    * @param size size of the valid data.
@@ -46,6 +44,7 @@ class OrcMemoryJniWrapper implements AutoCloseable {
 
   /**
    * Return the size of underlying chunk of memory that has valid data.
+   *
    * @return valid data size
    */
   long getSize() {
@@ -54,6 +53,7 @@ long getSize() {
 
   /**
    * Return the size of underlying chunk of memory managed by this OrcMemoryJniWrapper.
+   *
    * @return underlying memory size
    */
   long getCapacity() {
@@ -62,6 +62,7 @@ long getCapacity() {
 
   /**
    * Return the memory address of underlying chunk of memory.
+   *
    * @return memory address
    */
   long getMemoryAddress() {
diff --git a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReader.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReader.java
index 648e17e9c374c..ca9b44e7e8123 100644
--- a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReader.java
+++ b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReader.java
@@ -14,44 +14,42 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.orc;
 
 import java.io.IOException;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.ipc.ArrowReader;
 
 /**
- *  Orc Reader that allow accessing orc stripes in Orc file.
- *  This orc reader basically acts like an ArrowReader iterator that
- *  iterate over orc stripes. Each stripe will be accessed via an
- *  ArrowReader.
+ * Orc Reader that allow accessing orc stripes in Orc file. This orc reader basically acts like an
+ * ArrowReader iterator that iterate over orc stripes. Each stripe will be accessed via an
+ * ArrowReader.
  */
 public class OrcReader implements AutoCloseable {
   private final OrcReaderJniWrapper jniWrapper;
   private BufferAllocator allocator;
 
-  /**
-   * reference to native reader instance.
-   */
+  /** reference to native reader instance. */
   private final long nativeInstanceId;
 
   /**
    * Create an OrcReader that iterate over orc stripes.
+   *
    * @param filePath file path to target file, currently only support local file.
    * @param allocator allocator provided to ArrowReader.
    * @throws IOException throws exception in case of file not found
    */
-  public OrcReader(String filePath, BufferAllocator allocator) throws IOException, IllegalAccessException {
+  public OrcReader(String filePath, BufferAllocator allocator)
+      throws IOException, IllegalAccessException {
     this.allocator = allocator;
     this.jniWrapper = OrcReaderJniWrapper.getInstance();
     this.nativeInstanceId = jniWrapper.open(filePath);
   }
 
   /**
-   * Seek to designated row. Invoke NextStripeReader() after seek
-   * will return stripe reader starting from designated row.
+   * Seek to designated row. Invoke NextStripeReader() after seek will return stripe reader starting
+   * from designated row.
+   *
    * @param rowNumber the rows number to seek
    * @return true if seek operation is succeeded
    */
diff --git a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReaderJniWrapper.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReaderJniWrapper.java
index ff449c343c4e7..be57485005fbf 100644
--- a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReaderJniWrapper.java
+++ b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReaderJniWrapper.java
@@ -14,14 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.orc;
 
 import java.io.IOException;
 
-/**
- * JNI wrapper for Orc reader.
- */
+/** JNI wrapper for Orc reader. */
 class OrcReaderJniWrapper {
 
   private static volatile OrcReaderJniWrapper INSTANCE;
@@ -41,21 +38,24 @@ static OrcReaderJniWrapper getInstance() throws IOException, IllegalAccessExcept
 
   /**
    * Construct a orc file reader over the target file.
+   *
    * @param fileName absolute file path of target file
-   * @return id of the orc reader instance if file opened successfully,
-   *     otherwise return error code * -1.
+   * @return id of the orc reader instance if file opened successfully, otherwise return error code
+   *     * -1.
    */
   native long open(String fileName);
 
   /**
    * Release resources associated with designated reader instance.
+   *
    * @param readerId id of the reader instance.
    */
   native void close(long readerId);
 
   /**
-   *  Seek to designated row. Invoke nextStripeReader() after seek
-   *  will return id of stripe reader starting from designated row.
+   * Seek to designated row. Invoke nextStripeReader() after seek will return id of stripe reader
+   * starting from designated row.
+   *
    * @param readerId id of the reader instance
    * @param rowNumber the rows number to seek
    * @return true if seek operation is succeeded
@@ -64,6 +64,7 @@ static OrcReaderJniWrapper getInstance() throws IOException, IllegalAccessExcept
 
   /**
    * The number of stripes in the file.
+   *
    * @param readerId id of the reader instance
    * @return number of stripes
    */
@@ -71,6 +72,7 @@ static OrcReaderJniWrapper getInstance() throws IOException, IllegalAccessExcept
 
   /**
    * Get a stripe level ArrowReader with specified batchSize in each record batch.
+   *
    * @param readerId id of the reader instance
    * @param batchSize the number of rows loaded on each iteration
    * @return id of the stripe reader instance.
diff --git a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcRecordBatch.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcRecordBatch.java
index a006cacab98f2..f78898df2205d 100644
--- a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcRecordBatch.java
+++ b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcRecordBatch.java
@@ -14,27 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.orc;
 
 import java.util.Arrays;
 import java.util.List;
 
-/**
- * Wrapper for record batch meta and native memory.
- */
+/** Wrapper for record batch meta and native memory. */
 class OrcRecordBatch {
   final int length;
 
-  /**
-   * Nodes correspond to the pre-ordered flattened logical schema.
-   */
+  /** Nodes correspond to the pre-ordered flattened logical schema. */
   final List<OrcFieldNode> nodes;
 
   final List<OrcMemoryJniWrapper> buffers;
 
   /**
    * Construct a new instance.
+   *
    * @param length number of records included in current batch
    * @param nodes meta data for each fields
    * @param buffers buffers for underlying data
diff --git a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReferenceManager.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReferenceManager.java
index fdec337e85d39..38233a0493bef 100644
--- a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReferenceManager.java
+++ b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReferenceManager.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.orc;
 
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.OwnershipTransferResult;
@@ -26,8 +24,8 @@
 import org.apache.arrow.util.Preconditions;
 
 /**
- * A simple reference manager implementation for memory allocated by native code.
- * The underlying memory will be released when reference count reach zero.
+ * A simple reference manager implementation for memory allocated by native code. The underlying
+ * memory will be released when reference count reach zero.
  */
 public class OrcReferenceManager implements ReferenceManager {
   private final AtomicInteger bufRefCnt = new AtomicInteger(0);
@@ -50,8 +48,8 @@ public boolean release() {
 
   @Override
   public boolean release(int decrement) {
-    Preconditions.checkState(decrement >= 1,
-            "ref count decrement should be greater than or equal to 1");
+    Preconditions.checkState(
+        decrement >= 1, "ref count decrement should be greater than or equal to 1");
     // decrement the ref count
     final int refCnt;
     synchronized (this) {
@@ -89,18 +87,21 @@ public ArrowBuf deriveBuffer(ArrowBuf sourceBuffer, long index, long length) {
     final long derivedBufferAddress = sourceBuffer.memoryAddress() + index;
 
     // create new ArrowBuf
-    final ArrowBuf derivedBuf = new ArrowBuf(
+    final ArrowBuf derivedBuf =
+        new ArrowBuf(
             this,
             null,
             length, // length (in bytes) in the underlying memory chunk for this new ArrowBuf
-            derivedBufferAddress // starting byte address in the underlying memory for this new ArrowBuf,
+            derivedBufferAddress // starting byte address in the underlying memory for this new
+            // ArrowBuf,
             );
 
     return derivedBuf;
   }
 
   @Override
-  public OwnershipTransferResult transferOwnership(ArrowBuf sourceBuffer, BufferAllocator targetAllocator) {
+  public OwnershipTransferResult transferOwnership(
+      ArrowBuf sourceBuffer, BufferAllocator targetAllocator) {
     throw new UnsupportedOperationException();
   }
 
diff --git a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReader.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReader.java
index 484296d92e039..52f5cf429a48d 100644
--- a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReader.java
+++ b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReader.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.orc;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.ipc.ArrowReader;
@@ -33,19 +31,16 @@
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.arrow.vector.util.ByteArrayReadableSeekableByteChannel;
 
-/**
- * Orc stripe that load data into ArrowRecordBatch.
- */
+/** Orc stripe that load data into ArrowRecordBatch. */
 public class OrcStripeReader extends ArrowReader {
-  /**
-   * reference to native stripe reader instance.
-   */
+  /** reference to native stripe reader instance. */
   private final long nativeInstanceId;
 
   /**
    * Construct a new instance.
-   * @param nativeInstanceId nativeInstanceId of the stripe reader instance, obtained by
-   *           calling nextStripeReader from OrcReaderJniWrapper
+   *
+   * @param nativeInstanceId nativeInstanceId of the stripe reader instance, obtained by calling
+   *     nextStripeReader from OrcReaderJniWrapper
    * @param allocator memory allocator for accounting.
    */
   OrcStripeReader(long nativeInstanceId, BufferAllocator allocator) {
@@ -62,18 +57,20 @@ public boolean loadNextBatch() throws IOException {
 
     ArrayList<ArrowBuf> buffers = new ArrayList<>();
     for (OrcMemoryJniWrapper buffer : recordBatch.buffers) {
-      buffers.add(new ArrowBuf(
+      buffers.add(
+          new ArrowBuf(
               new OrcReferenceManager(buffer),
               null,
               (int) buffer.getSize(),
               buffer.getMemoryAddress()));
     }
 
-    loadRecordBatch(new ArrowRecordBatch(
+    loadRecordBatch(
+        new ArrowRecordBatch(
             recordBatch.length,
             recordBatch.nodes.stream()
-              .map(buf -> new ArrowFieldNode(buf.getLength(), buf.getNullCount()))
-              .collect(Collectors.toList()),
+                .map(buf -> new ArrowFieldNode(buf.getLength(), buf.getNullCount()))
+                .collect(Collectors.toList()),
             buffers));
     return true;
   }
@@ -83,7 +80,6 @@ public long bytesRead() {
     return 0;
   }
 
-
   @Override
   protected void closeReadSource() throws IOException {
     OrcStripeReaderJniWrapper.close(nativeInstanceId);
@@ -94,9 +90,8 @@ protected Schema readSchema() throws IOException {
     byte[] schemaBytes = OrcStripeReaderJniWrapper.getSchema(nativeInstanceId);
 
     try (MessageChannelReader schemaReader =
-           new MessageChannelReader(
-                new ReadChannel(
-                new ByteArrayReadableSeekableByteChannel(schemaBytes)), allocator)) {
+        new MessageChannelReader(
+            new ReadChannel(new ByteArrayReadableSeekableByteChannel(schemaBytes)), allocator)) {
 
       MessageResult result = schemaReader.readNext();
       if (result == null) {
diff --git a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReaderJniWrapper.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReaderJniWrapper.java
index 1dd96986108b4..e7b691087fb96 100644
--- a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReaderJniWrapper.java
+++ b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReaderJniWrapper.java
@@ -14,16 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.orc;
 
-/**
- * JNI wrapper for orc stripe reader.
- */
+/** JNI wrapper for orc stripe reader. */
 class OrcStripeReaderJniWrapper {
 
   /**
    * Get the schema of current stripe.
+   *
    * @param readerId id of the stripe reader instance.
    * @return serialized schema.
    */
@@ -31,14 +29,15 @@ class OrcStripeReaderJniWrapper {
 
   /**
    * Load next record batch.
+   *
    * @param readerId id of the stripe reader instance.
-   * @return loaded record batch, return null when reached
-   *     the end of current stripe.
+   * @return loaded record batch, return null when reached the end of current stripe.
    */
   static native OrcRecordBatch next(long readerId);
 
   /**
    * Release resources of underlying reader.
+   *
    * @param readerId id of the stripe reader instance.
    */
   static native void close(long readerId);
diff --git a/java/adapter/orc/src/test/java/org/apache/arrow/adapter/orc/OrcReaderTest.java b/java/adapter/orc/src/test/java/org/apache/arrow/adapter/orc/OrcReaderTest.java
index 4153a35a61c67..f8eb91a1cc758 100644
--- a/java/adapter/orc/src/test/java/org/apache/arrow/adapter/orc/OrcReaderTest.java
+++ b/java/adapter/orc/src/test/java/org/apache/arrow/adapter/orc/OrcReaderTest.java
@@ -14,18 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.orc;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-
-
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.IntVector;
@@ -40,21 +37,18 @@
 import org.apache.orc.OrcFile;
 import org.apache.orc.TypeDescription;
 import org.apache.orc.Writer;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class OrcReaderTest {
 
-  @Rule
-  public TemporaryFolder testFolder = new TemporaryFolder();
+  @TempDir public File testFolder;
 
   private static final int MAX_ALLOCATION = 8 * 1024;
   private static RootAllocator allocator;
 
-  @BeforeClass
+  @BeforeAll
   public static void beforeClass() {
     allocator = new RootAllocator(MAX_ALLOCATION);
   }
@@ -62,10 +56,12 @@ public static void beforeClass() {
   @Test
   public void testOrcJniReader() throws Exception {
     TypeDescription schema = TypeDescription.fromString("struct<x:int,y:string>");
-    File testFile = new File(testFolder.getRoot(), "test-orc");
+    File testFile = new File(testFolder, "test-orc");
 
-    Writer writer = OrcFile.createWriter(new Path(testFile.getAbsolutePath()),
-                                    OrcFile.writerOptions(new Configuration()).setSchema(schema));
+    Writer writer =
+        OrcFile.createWriter(
+            new Path(testFile.getAbsolutePath()),
+            OrcFile.writerOptions(new Configuration()).setSchema(schema));
     VectorizedRowBatch batch = schema.createRowBatch();
     LongColumnVector longColumnVector = (LongColumnVector) batch.cols[0];
     BytesColumnVector bytesColumnVector = (BytesColumnVector) batch.cols[1];
diff --git a/java/algorithm/pom.xml b/java/algorithm/pom.xml
index 25669010d2d42..36e96a8d6ce5d 100644
--- a/java/algorithm/pom.xml
+++ b/java/algorithm/pom.xml
@@ -1,20 +1,28 @@
-<?xml version="1.0"?>
-<!-- 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. -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.arrow</groupId>
     <artifactId>arrow-java-root</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>17.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>arrow-algorithm</artifactId>
   <name>Arrow Algorithms</name>
@@ -44,10 +52,7 @@
     </dependency>
     <dependency>
       <groupId>org.immutables</groupId>
-      <artifactId>value</artifactId>
+      <artifactId>value-annotations</artifactId>
     </dependency>
   </dependencies>
-
-  <build>
-  </build>
 </project>
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/DeduplicationUtils.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/DeduplicationUtils.java
index 8811e43d3d08d..e9364b2a85b7b 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/DeduplicationUtils.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/DeduplicationUtils.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.deduplicate;
 
 import org.apache.arrow.memory.ArrowBuf;
@@ -26,18 +25,18 @@
 import org.apache.arrow.vector.compare.RangeEqualsVisitor;
 import org.apache.arrow.vector.util.DataSizeRoundingUtil;
 
-/**
- * Utilities for vector deduplication.
- */
+/** Utilities for vector deduplication. */
 class DeduplicationUtils {
 
   /**
    * Gets the start positions of the first distinct values in a vector.
+   *
    * @param vector the target vector.
    * @param runStarts the bit set to hold the start positions.
    * @param <V> vector type.
    */
-  public static <V extends ValueVector> void populateRunStartIndicators(V vector, ArrowBuf runStarts) {
+  public static <V extends ValueVector> void populateRunStartIndicators(
+      V vector, ArrowBuf runStarts) {
     int bufSize = DataSizeRoundingUtil.divideBy8Ceil(vector.getValueCount());
     Preconditions.checkArgument(runStarts.capacity() >= bufSize);
     runStarts.setZero(0, bufSize);
@@ -55,6 +54,7 @@ public static <V extends ValueVector> void populateRunStartIndicators(V vector,
 
   /**
    * Gets the run lengths, given the start positions.
+   *
    * @param runStarts the bit set for start positions.
    * @param runLengths the run length vector to populate.
    * @param valueCount the number of values in the bit set.
@@ -76,15 +76,15 @@ public static void populateRunLengths(ArrowBuf runStarts, IntVector runLengths,
   }
 
   /**
-   * Gets distinct values from the input vector by removing adjacent
-   * duplicated values.
+   * Gets distinct values from the input vector by removing adjacent duplicated values.
+   *
    * @param indicators the bit set containing the start positions of distinct values.
    * @param inputVector the input vector.
    * @param outputVector the output vector.
    * @param <V> vector type.
    */
   public static <V extends ValueVector> void populateDeduplicatedValues(
-          ArrowBuf indicators, V inputVector, V outputVector) {
+      ArrowBuf indicators, V inputVector, V outputVector) {
     int dstIdx = 0;
     for (int srcIdx = 0; srcIdx < inputVector.getValueCount(); srcIdx++) {
       if (BitVectorHelper.get(indicators, srcIdx) != 0) {
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/VectorRunDeduplicator.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/VectorRunDeduplicator.java
index 5ef03cbe4a734..4e49de14f5956 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/VectorRunDeduplicator.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/VectorRunDeduplicator.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.deduplicate;
 
 import org.apache.arrow.memory.ArrowBuf;
@@ -26,29 +25,28 @@
 import org.apache.arrow.vector.util.DataSizeRoundingUtil;
 
 /**
- * Remove adjacent equal elements from a vector.
- * If the vector is sorted, it removes all duplicated values in the vector.
+ * Remove adjacent equal elements from a vector. If the vector is sorted, it removes all duplicated
+ * values in the vector.
+ *
  * @param <V> vector type.
  */
 public class VectorRunDeduplicator<V extends ValueVector> implements AutoCloseable {
 
   /**
-   * Bit set for distinct values.
-   * If the value at some index is not equal to the previous value,
-   * its bit is set to 1, otherwise its bit is set to 0.
+   * Bit set for distinct values. If the value at some index is not equal to the previous value, its
+   * bit is set to 1, otherwise its bit is set to 0.
    */
   private ArrowBuf distinctValueBuffer;
 
-  /**
-   * The vector to deduplicate.
-   */
+  /** The vector to deduplicate. */
   private final V vector;
 
   private final BufferAllocator allocator;
 
   /**
    * Constructs a vector run deduplicator for a given vector.
-   * @param vector the vector to deduplicate.  Ownership is NOT taken.
+   *
+   * @param vector the vector to deduplicate. Ownership is NOT taken.
    * @param allocator the allocator used for allocating buffers for start indices.
    */
   public VectorRunDeduplicator(V vector, BufferAllocator allocator) {
@@ -65,17 +63,20 @@ private void createDistinctValueBuffer() {
 
   /**
    * Gets the number of values which are different from their predecessor.
+   *
    * @return the run count.
    */
   public int getRunCount() {
     if (distinctValueBuffer == null) {
       createDistinctValueBuffer();
     }
-    return vector.getValueCount() - BitVectorHelper.getNullCount(distinctValueBuffer, vector.getValueCount());
+    return vector.getValueCount()
+        - BitVectorHelper.getNullCount(distinctValueBuffer, vector.getValueCount());
   }
 
   /**
    * Gets the vector with deduplicated adjacent values removed.
+   *
    * @param outVector the output vector.
    */
   public void populateDeduplicatedValues(V outVector) {
@@ -88,6 +89,7 @@ public void populateDeduplicatedValues(V outVector) {
 
   /**
    * Gets the length of each distinct value.
+   *
    * @param lengthVector the vector for holding length values.
    */
   public void populateRunLengths(IntVector lengthVector) {
@@ -95,7 +97,8 @@ public void populateRunLengths(IntVector lengthVector) {
       createDistinctValueBuffer();
     }
 
-    DeduplicationUtils.populateRunLengths(distinctValueBuffer, lengthVector, vector.getValueCount());
+    DeduplicationUtils.populateRunLengths(
+        distinctValueBuffer, lengthVector, vector.getValueCount());
   }
 
   @Override
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/DictionaryBuilder.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/DictionaryBuilder.java
index 398368d1fc612..88c4e4dc65450 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/DictionaryBuilder.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/DictionaryBuilder.java
@@ -14,33 +14,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.dictionary;
 
 import org.apache.arrow.vector.ValueVector;
 
 /**
- * A dictionary builder is intended for the scenario frequently encountered in practice:
- * the dictionary is not known a priori, so it is generated dynamically.
- * In particular, when a new value arrives, it is tested to check if it is already
- * in the dictionary. If so, it is simply neglected, otherwise, it is added to the dictionary.
- * <p>
- *   The dictionary builder is intended to build a single dictionary.
- *   So it cannot be used for different dictionaries.
- * </p>
+ * A dictionary builder is intended for the scenario frequently encountered in practice: the
+ * dictionary is not known a priori, so it is generated dynamically. In particular, when a new value
+ * arrives, it is tested to check if it is already in the dictionary. If so, it is simply neglected,
+ * otherwise, it is added to the dictionary.
+ *
+ * <p>The dictionary builder is intended to build a single dictionary. So it cannot be used for
+ * different dictionaries.
+ *
  * <p>Below gives the sample code for using the dictionary builder
+ *
  * <pre>{@code
  * DictionaryBuilder dictionaryBuilder = ...
  * ...
  * dictionaryBuild.addValue(newValue);
  * ...
  * }</pre>
- * </p>
- * <p>
- *   With the above code, the dictionary vector will be populated,
- *   and it can be retrieved by the {@link DictionaryBuilder#getDictionary()} method.
- *   After that, dictionary encoding can proceed with the populated dictionary..
- * </p>
+ *
+ * <p>With the above code, the dictionary vector will be populated, and it can be retrieved by the
+ * {@link DictionaryBuilder#getDictionary()} method. After that, dictionary encoding can proceed
+ * with the populated dictionary..
  *
  * @param <V> the dictionary vector type.
  */
@@ -58,7 +56,7 @@ public interface DictionaryBuilder<V extends ValueVector> {
    * Try to add an element from the target vector to the dictionary.
    *
    * @param targetVector the target vector containing new element.
-   * @param targetIndex  the index of the new element in the target vector.
+   * @param targetIndex the index of the new element in the target vector.
    * @return the index of the new element in the dictionary.
    */
   int addValue(V targetVector, int targetIndex);
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/DictionaryEncoder.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/DictionaryEncoder.java
index cda7b3bf9540e..16e27c3a23e72 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/DictionaryEncoder.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/DictionaryEncoder.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.dictionary;
 
 import org.apache.arrow.vector.BaseIntVector;
@@ -22,8 +21,9 @@
 
 /**
  * A dictionary encoder translates one vector into another one based on a dictionary vector.
- * According to Arrow specification, the encoded vector must be an integer based vector, which
- * is the index of the original vector element in the dictionary.
+ * According to Arrow specification, the encoded vector must be an integer based vector, which is
+ * the index of the original vector element in the dictionary.
+ *
  * @param <E> type of the encoded vector.
  * @param <D> type of the vector to encode. It is also the type of the dictionary vector.
  */
@@ -31,9 +31,10 @@ public interface DictionaryEncoder<E extends BaseIntVector, D extends ValueVecto
 
   /**
    * Translates an input vector into an output vector.
+   *
    * @param input the input vector.
-   * @param output the output vector. Note that it must be in a fresh state. At least,
-   *     all its validity bits should be clear.
+   * @param output the output vector. Note that it must be in a fresh state. At least, all its
+   *     validity bits should be clear.
    */
   void encode(D input, E output);
 }
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/HashTableBasedDictionaryBuilder.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/HashTableBasedDictionaryBuilder.java
index dd2b73498f15d..e090682dbe0e8 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/HashTableBasedDictionaryBuilder.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/HashTableBasedDictionaryBuilder.java
@@ -14,49 +14,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.dictionary;
 
 import java.util.HashMap;
-
 import org.apache.arrow.memory.util.ArrowBufPointer;
 import org.apache.arrow.memory.util.hash.ArrowBufHasher;
 import org.apache.arrow.memory.util.hash.SimpleHasher;
 import org.apache.arrow.vector.ElementAddressableVector;
 
 /**
- * This class builds the dictionary based on a hash table.
- * Each add operation can be finished in O(1) time,
- * where n is the current dictionary size.
+ * This class builds the dictionary based on a hash table. Each add operation can be finished in
+ * O(1) time, where n is the current dictionary size.
  *
  * @param <V> the dictionary vector type.
  */
-public class HashTableBasedDictionaryBuilder<V extends ElementAddressableVector> implements DictionaryBuilder<V> {
+public class HashTableBasedDictionaryBuilder<V extends ElementAddressableVector>
+    implements DictionaryBuilder<V> {
 
-  /**
-   * The dictionary to be built.
-   */
+  /** The dictionary to be built. */
   private final V dictionary;
 
-  /**
-   * If null should be encoded.
-   */
+  /** If null should be encoded. */
   private final boolean encodeNull;
 
   /**
-   * The hash map for distinct dictionary entries.
-   * The key is the pointer to the dictionary element, whereas the value is the index in the dictionary.
+   * The hash map for distinct dictionary entries. The key is the pointer to the dictionary element,
+   * whereas the value is the index in the dictionary.
    */
   private HashMap<ArrowBufPointer, Integer> hashMap = new HashMap<>();
 
-  /**
-   * The hasher used for calculating the hash code.
-   */
+  /** The hasher used for calculating the hash code. */
   private final ArrowBufHasher hasher;
 
-  /**
-   * Next pointer to try to add to the hash table.
-   */
+  /** Next pointer to try to add to the hash table. */
   private ArrowBufPointer nextPointer;
 
   /**
@@ -83,7 +73,7 @@ public HashTableBasedDictionaryBuilder(V dictionary, boolean encodeNull) {
    *
    * @param dictionary the dictionary to populate.
    * @param encodeNull if null values should be added to the dictionary.
-   * @param hasher     the hasher used to compute the hash code.
+   * @param hasher the hasher used to compute the hash code.
    */
   public HashTableBasedDictionaryBuilder(V dictionary, boolean encodeNull, ArrowBufHasher hasher) {
     this.dictionary = dictionary;
@@ -125,7 +115,7 @@ public int addValues(V targetVector) {
    * Try to add an element from the target vector to the dictionary.
    *
    * @param targetVector the target vector containing new element.
-   * @param targetIndex  the index of the new element in the target vector.
+   * @param targetIndex the index of the new element in the target vector.
    * @return the index of the new element in the dictionary.
    */
   @Override
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/HashTableDictionaryEncoder.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/HashTableDictionaryEncoder.java
index bea1a784c3d6a..ac7a7d32bf597 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/HashTableDictionaryEncoder.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/HashTableDictionaryEncoder.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.dictionary;
 
 import java.util.HashMap;
-
 import org.apache.arrow.memory.util.ArrowBufPointer;
 import org.apache.arrow.memory.util.hash.ArrowBufHasher;
 import org.apache.arrow.memory.util.hash.SimpleHasher;
@@ -27,43 +25,35 @@
 
 /**
  * Dictionary encoder based on hash table.
+ *
  * @param <E> encoded vector type.
  * @param <D> decoded vector type, which is also the dictionary type.
  */
 public class HashTableDictionaryEncoder<E extends BaseIntVector, D extends ElementAddressableVector>
     implements DictionaryEncoder<E, D> {
 
-  /**
-   * The dictionary for encoding/decoding.
-   * It must be sorted.
-   */
+  /** The dictionary for encoding/decoding. It must be sorted. */
   private final D dictionary;
 
-  /**
-   * The hasher used to compute the hash code.
-   */
+  /** The hasher used to compute the hash code. */
   private final ArrowBufHasher hasher;
 
-  /**
-   * A flag indicating if null should be encoded.
-   */
+  /** A flag indicating if null should be encoded. */
   private final boolean encodeNull;
 
   /**
-   * The hash map for distinct dictionary entries.
-   * The key is the pointer to the dictionary element, whereas the value is the index in the dictionary.
+   * The hash map for distinct dictionary entries. The key is the pointer to the dictionary element,
+   * whereas the value is the index in the dictionary.
    */
   private HashMap<ArrowBufPointer, Integer> hashMap = new HashMap<>();
 
-  /**
-   * The pointer used to probe each element to encode.
-   */
+  /** The pointer used to probe each element to encode. */
   private ArrowBufPointer reusablePointer;
 
   /**
    * Constructs a dictionary encoder.
-   * @param dictionary the dictionary.
    *
+   * @param dictionary the dictionary.
    */
   public HashTableDictionaryEncoder(D dictionary) {
     this(dictionary, false);
@@ -71,20 +61,17 @@ public HashTableDictionaryEncoder(D dictionary) {
 
   /**
    * Constructs a dictionary encoder.
+   *
    * @param dictionary the dictionary.
-   * @param encodeNull a flag indicating if null should be encoded.
-   *     It determines the behaviors for processing null values in the input during encoding/decoding.
-   *    <li>
-   *       For encoding, when a null is encountered in the input,
-   *       1) If the flag is set to true, the encoder searches for the value in the dictionary,
-   *       and outputs the index in the dictionary.
-   *       2) If the flag is set to false, the encoder simply produces a null in the output.
-   *    </li>
-   *    <li>
-   *       For decoding, when a null is encountered in the input,
-   *       1) If the flag is set to true, the decoder should never expect a null in the input.
-   *       2) If set to false, the decoder simply produces a null in the output.
-   *    </li>
+   * @param encodeNull a flag indicating if null should be encoded. It determines the behaviors for
+   *     processing null values in the input during encoding/decoding.
+   *     <li>For encoding, when a null is encountered in the input, 1) If the flag is set to true,
+   *         the encoder searches for the value in the dictionary, and outputs the index in the
+   *         dictionary. 2) If the flag is set to false, the encoder simply produces a null in the
+   *         output.
+   *     <li>For decoding, when a null is encountered in the input, 1) If the flag is set to true,
+   *         the decoder should never expect a null in the input. 2) If set to false, the decoder
+   *         simply produces a null in the output.
    */
   public HashTableDictionaryEncoder(D dictionary, boolean encodeNull) {
     this(dictionary, encodeNull, SimpleHasher.INSTANCE);
@@ -92,13 +79,13 @@ public HashTableDictionaryEncoder(D dictionary, boolean encodeNull) {
 
   /**
    * Constructs a dictionary encoder.
+   *
    * @param dictionary the dictionary.
-   * @param encodeNull a flag indicating if null should be encoded.
-    *     It determines the behaviors for processing null values in the input during encoding.
-    *     When a null is encountered in the input,
-    *     1) If the flag is set to true, the encoder searches for the value in the dictionary,
-    *     and outputs the index in the dictionary.
-    *     2) If the flag is set to false, the encoder simply produces a null in the output.
+   * @param encodeNull a flag indicating if null should be encoded. It determines the behaviors for
+   *     processing null values in the input during encoding. When a null is encountered in the
+   *     input, 1) If the flag is set to true, the encoder searches for the value in the dictionary,
+   *     and outputs the index in the dictionary. 2) If the flag is set to false, the encoder simply
+   *     produces a null in the output.
    * @param hasher the hasher used to calculate the hash code.
    */
   public HashTableDictionaryEncoder(D dictionary, boolean encodeNull, ArrowBufHasher hasher) {
@@ -120,12 +107,12 @@ private void buildHashMap() {
   }
 
   /**
-   * Encodes an input vector by a hash table.
-   * So the algorithm takes O(n) time, where n is the length of the input vector.
+   * Encodes an input vector by a hash table. So the algorithm takes O(n) time, where n is the
+   * length of the input vector.
    *
-   * @param input  the input vector.
+   * @param input the input vector.
    * @param output the output vector.
-   **/
+   */
   @Override
   public void encode(D input, E output) {
     for (int i = 0; i < input.getValueCount(); i++) {
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/LinearDictionaryEncoder.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/LinearDictionaryEncoder.java
index 84a3a96af8ef1..9aeff22005751 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/LinearDictionaryEncoder.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/LinearDictionaryEncoder.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.dictionary;
 
 import org.apache.arrow.vector.BaseIntVector;
@@ -24,20 +23,17 @@
 
 /**
  * Dictionary encoder based on linear search.
+ *
  * @param <E> encoded vector type.
  * @param <D> decoded vector type, which is also the dictionary type.
  */
 public class LinearDictionaryEncoder<E extends BaseIntVector, D extends ValueVector>
     implements DictionaryEncoder<E, D> {
 
-  /**
-   * The dictionary for encoding.
-   */
+  /** The dictionary for encoding. */
   private final D dictionary;
 
-  /**
-   * A flag indicating if null should be encoded.
-   */
+  /** A flag indicating if null should be encoded. */
   private final boolean encodeNull;
 
   private RangeEqualsVisitor equalizer;
@@ -46,8 +42,10 @@ public class LinearDictionaryEncoder<E extends BaseIntVector, D extends ValueVec
 
   /**
    * Constructs a dictionary encoder, with the encode null flag set to false.
-   * @param dictionary the dictionary. Its entries should be sorted in the non-increasing order of their frequency.
-   *     Otherwise, the encoder still produces correct results, but at the expense of performance overhead.
+   *
+   * @param dictionary the dictionary. Its entries should be sorted in the non-increasing order of
+   *     their frequency. Otherwise, the encoder still produces correct results, but at the expense
+   *     of performance overhead.
    */
   public LinearDictionaryEncoder(D dictionary) {
     this(dictionary, false);
@@ -55,14 +53,15 @@ public LinearDictionaryEncoder(D dictionary) {
 
   /**
    * Constructs a dictionary encoder.
-   * @param dictionary the dictionary. Its entries should be sorted in the non-increasing order of their frequency.
-   *     Otherwise, the encoder still produces correct results, but at the expense of performance overhead.
-   * @param encodeNull a flag indicating if null should be encoded.
-   *     It determines the behaviors for processing null values in the input during encoding.
-   *     When a null is encountered in the input,
-   *     1) If the flag is set to true, the encoder searches for the value in the dictionary,
-   *     and outputs the index in the dictionary.
-   *     2) If the flag is set to false, the encoder simply produces a null in the output.
+   *
+   * @param dictionary the dictionary. Its entries should be sorted in the non-increasing order of
+   *     their frequency. Otherwise, the encoder still produces correct results, but at the expense
+   *     of performance overhead.
+   * @param encodeNull a flag indicating if null should be encoded. It determines the behaviors for
+   *     processing null values in the input during encoding. When a null is encountered in the
+   *     input, 1) If the flag is set to true, the encoder searches for the value in the dictionary,
+   *     and outputs the index in the dictionary. 2) If the flag is set to false, the encoder simply
+   *     produces a null in the output.
    */
   public LinearDictionaryEncoder(D dictionary, boolean encodeNull) {
     this.dictionary = dictionary;
@@ -74,12 +73,13 @@ public LinearDictionaryEncoder(D dictionary, boolean encodeNull) {
   }
 
   /**
-   * Encodes an input vector by linear search.
-   * When the dictionary is sorted in the non-increasing order of the entry frequency,
-   * it will have constant time complexity, with no extra memory requirement.
+   * Encodes an input vector by linear search. When the dictionary is sorted in the non-increasing
+   * order of the entry frequency, it will have constant time complexity, with no extra memory
+   * requirement.
+   *
    * @param input the input vector.
-   * @param output the output vector. Note that it must be in a fresh state. At least,
-   *     all its validity bits should be clear.
+   * @param output the output vector. Note that it must be in a fresh state. At least, all its
+   *     validity bits should be clear.
    */
   @Override
   public void encode(D input, E output) {
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/SearchDictionaryEncoder.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/SearchDictionaryEncoder.java
index 1dbf65819005f..edfe3564f28ff 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/SearchDictionaryEncoder.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/SearchDictionaryEncoder.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.dictionary;
 
 import org.apache.arrow.algorithm.search.VectorSearcher;
@@ -24,30 +23,25 @@
 
 /**
  * Dictionary encoder based on searching.
+ *
  * @param <E> encoded vector type.
  * @param <D> decoded vector type, which is also the dictionary type.
  */
 public class SearchDictionaryEncoder<E extends BaseIntVector, D extends ValueVector>
     implements DictionaryEncoder<E, D> {
 
-  /**
-   * The dictionary for encoding/decoding.
-   * It must be sorted.
-   */
+  /** The dictionary for encoding/decoding. It must be sorted. */
   private final D dictionary;
 
-  /**
-   * The criteria by which the dictionary is sorted.
-   */
+  /** The criteria by which the dictionary is sorted. */
   private final VectorValueComparator<D> comparator;
 
-  /**
-   * A flag indicating if null should be encoded.
-   */
+  /** A flag indicating if null should be encoded. */
   private final boolean encodeNull;
 
   /**
    * Constructs a dictionary encoder.
+   *
    * @param dictionary the dictionary. It must be in sorted order.
    * @param comparator the criteria for sorting.
    */
@@ -57,28 +51,29 @@ public SearchDictionaryEncoder(D dictionary, VectorValueComparator<D> comparator
 
   /**
    * Constructs a dictionary encoder.
+   *
    * @param dictionary the dictionary. It must be in sorted order.
    * @param comparator the criteria for sorting.
-   * @param encodeNull a flag indicating if null should be encoded.
-   *     It determines the behaviors for processing null values in the input during encoding.
-   *     When a null is encountered in the input,
-   *     1) If the flag is set to true, the encoder searches for the value in the dictionary,
-   *     and outputs the index in the dictionary.
-   *     2) If the flag is set to false, the encoder simply produces a null in the output.
+   * @param encodeNull a flag indicating if null should be encoded. It determines the behaviors for
+   *     processing null values in the input during encoding. When a null is encountered in the
+   *     input, 1) If the flag is set to true, the encoder searches for the value in the dictionary,
+   *     and outputs the index in the dictionary. 2) If the flag is set to false, the encoder simply
+   *     produces a null in the output.
    */
-  public SearchDictionaryEncoder(D dictionary, VectorValueComparator<D> comparator, boolean encodeNull) {
+  public SearchDictionaryEncoder(
+      D dictionary, VectorValueComparator<D> comparator, boolean encodeNull) {
     this.dictionary = dictionary;
     this.comparator = comparator;
     this.encodeNull = encodeNull;
   }
 
   /**
-   * Encodes an input vector by binary search.
-   * So the algorithm takes O(n * log(m)) time, where n is the length of the input vector,
-   * and m is the length of the dictionary.
+   * Encodes an input vector by binary search. So the algorithm takes O(n * log(m)) time, where n is
+   * the length of the input vector, and m is the length of the dictionary.
+   *
    * @param input the input vector.
-   * @param output the output vector. Note that it must be in a fresh state. At least,
-   *     all its validity bits should be clear.
+   * @param output the output vector. Note that it must be in a fresh state. At least, all its
+   *     validity bits should be clear.
    */
   @Override
   public void encode(D input, E output) {
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/SearchTreeBasedDictionaryBuilder.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/SearchTreeBasedDictionaryBuilder.java
index f9cd77daa2e76..fca7df067dcff 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/SearchTreeBasedDictionaryBuilder.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/dictionary/SearchTreeBasedDictionaryBuilder.java
@@ -14,45 +14,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.dictionary;
 
 import java.util.TreeSet;
-
 import org.apache.arrow.algorithm.sort.VectorValueComparator;
 import org.apache.arrow.vector.ValueVector;
 
 /**
- * This class builds the dictionary based on a binary search tree.
- * Each add operation can be finished in O(log(n)) time,
- * where n is the current dictionary size.
+ * This class builds the dictionary based on a binary search tree. Each add operation can be
+ * finished in O(log(n)) time, where n is the current dictionary size.
  *
  * @param <V> the dictionary vector type.
  */
-public class SearchTreeBasedDictionaryBuilder<V extends ValueVector> implements DictionaryBuilder<V> {
+public class SearchTreeBasedDictionaryBuilder<V extends ValueVector>
+    implements DictionaryBuilder<V> {
 
-  /**
-   * The dictionary to be built.
-   */
+  /** The dictionary to be built. */
   private final V dictionary;
 
-  /**
-   * The criteria for sorting in the search tree.
-   */
+  /** The criteria for sorting in the search tree. */
   protected final VectorValueComparator<V> comparator;
 
-  /**
-   * If null should be encoded.
-   */
+  /** If null should be encoded. */
   private final boolean encodeNull;
 
-  /**
-   * The search tree for storing the value index.
-   */
+  /** The search tree for storing the value index. */
   private TreeSet<Integer> searchTree;
 
   /**
    * Construct a search tree-based dictionary builder.
+   *
    * @param dictionary the dictionary vector.
    * @param comparator the criteria for value equality.
    */
@@ -62,11 +53,13 @@ public SearchTreeBasedDictionaryBuilder(V dictionary, VectorValueComparator<V> c
 
   /**
    * Construct a search tree-based dictionary builder.
+   *
    * @param dictionary the dictionary vector.
    * @param comparator the criteria for value equality.
    * @param encodeNull if null values should be added to the dictionary.
    */
-  public SearchTreeBasedDictionaryBuilder(V dictionary, VectorValueComparator<V> comparator, boolean encodeNull) {
+  public SearchTreeBasedDictionaryBuilder(
+      V dictionary, VectorValueComparator<V> comparator, boolean encodeNull) {
     this.dictionary = dictionary;
     this.comparator = comparator;
     this.encodeNull = encodeNull;
@@ -76,11 +69,10 @@ public SearchTreeBasedDictionaryBuilder(V dictionary, VectorValueComparator<V> c
   }
 
   /**
-   * Gets the dictionary built.
-   * Please note that the dictionary is not in sorted order.
-   * Instead, its order is determined by the order of element insertion.
-   * To get the dictionary in sorted order, please use
-   * {@link SearchTreeBasedDictionaryBuilder#populateSortedDictionary(ValueVector)}.
+   * Gets the dictionary built. Please note that the dictionary is not in sorted order. Instead, its
+   * order is determined by the order of element insertion. To get the dictionary in sorted order,
+   * please use {@link SearchTreeBasedDictionaryBuilder#populateSortedDictionary(ValueVector)}.
+   *
    * @return the dictionary.
    */
   @Override
@@ -90,6 +82,7 @@ public V getDictionary() {
 
   /**
    * Try to add all values from the target vector to the dictionary.
+   *
    * @param targetVector the target vector containing values to probe.
    * @return the number of values actually added to the dictionary.
    */
@@ -107,6 +100,7 @@ public int addValues(V targetVector) {
 
   /**
    * Try to add an element from the target vector to the dictionary.
+   *
    * @param targetVector the target vector containing new element.
    * @param targetIndex the index of the new element in the target vector.
    * @return the index of the new element in the dictionary.
@@ -132,8 +126,8 @@ public int addValue(V targetVector, int targetIndex) {
   }
 
   /**
-   * Gets the sorted dictionary.
-   * Note that given the binary search tree, the sort can finish in O(n).
+   * Gets the sorted dictionary. Note that given the binary search tree, the sort can finish in
+   * O(n).
    */
   public void populateSortedDictionary(V sortedDictionary) {
     int idx = 0;
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/misc/PartialSumUtils.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/misc/PartialSumUtils.java
index f5e95cf1033f5..5492676af1a2e 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/misc/PartialSumUtils.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/misc/PartialSumUtils.java
@@ -14,26 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.misc;
 
 import org.apache.arrow.vector.BaseIntVector;
 
-/**
- * Partial sum related utilities.
- */
+/** Partial sum related utilities. */
 public class PartialSumUtils {
 
   /**
-   * Converts an input vector to a partial sum vector.
-   * This is an inverse operation of {@link PartialSumUtils#toDeltaVector(BaseIntVector, BaseIntVector)}.
-   * Suppose we have input vector a and output vector b.
-   * Then we have b(0) = sumBase; b(i + 1) = b(i) + a(i) (i = 0, 1, 2, ...).
+   * Converts an input vector to a partial sum vector. This is an inverse operation of {@link
+   * PartialSumUtils#toDeltaVector(BaseIntVector, BaseIntVector)}. Suppose we have input vector a
+   * and output vector b. Then we have b(0) = sumBase; b(i + 1) = b(i) + a(i) (i = 0, 1, 2, ...).
+   *
    * @param deltaVector the input vector.
    * @param partialSumVector the output vector.
    * @param sumBase the base of the partial sums.
    */
-  public static void toPartialSumVector(BaseIntVector deltaVector, BaseIntVector partialSumVector, long sumBase) {
+  public static void toPartialSumVector(
+      BaseIntVector deltaVector, BaseIntVector partialSumVector, long sumBase) {
     long sum = sumBase;
     partialSumVector.setWithPossibleTruncate(0, sumBase);
 
@@ -45,10 +43,10 @@ public static void toPartialSumVector(BaseIntVector deltaVector, BaseIntVector p
   }
 
   /**
-   * Converts an input vector to the delta vector.
-   * This is an inverse operation of {@link PartialSumUtils#toPartialSumVector(BaseIntVector, BaseIntVector, long)}.
-   * Suppose we have input vector a and output vector b.
-   * Then we have b(i) = a(i + 1) - a(i)  (i = 0, 1, 2, ...).
+   * Converts an input vector to the delta vector. This is an inverse operation of {@link
+   * PartialSumUtils#toPartialSumVector(BaseIntVector, BaseIntVector, long)}. Suppose we have input
+   * vector a and output vector b. Then we have b(i) = a(i + 1) - a(i) (i = 0, 1, 2, ...).
+   *
    * @param partialSumVector the input vector.
    * @param deltaVector the output vector.
    */
@@ -61,18 +59,18 @@ public static void toDeltaVector(BaseIntVector partialSumVector, BaseIntVector d
   }
 
   /**
-   * Given a value and a partial sum vector, finds its position in the partial sum vector.
-   * In particular, given an integer value a and partial sum vector v, we try to find a
-   * position i, so that v(i) <= a < v(i + 1).
-   * The algorithm is based on binary search, so it takes O(log(n)) time, where n is
-   * the length of the partial sum vector.
+   * Given a value and a partial sum vector, finds its position in the partial sum vector. In
+   * particular, given an integer value a and partial sum vector v, we try to find a position i, so
+   * that v(i) <= a < v(i + 1). The algorithm is based on binary search, so it takes O(log(n)) time,
+   * where n is the length of the partial sum vector.
+   *
    * @param partialSumVector the input partial sum vector.
    * @param value the value to search.
    * @return the position in the partial sum vector, if any, or -1, if none is found.
    */
   public static int findPositionInPartialSumVector(BaseIntVector partialSumVector, long value) {
-    if (value < partialSumVector.getValueAsLong(0) ||
-            value >= partialSumVector.getValueAsLong(partialSumVector.getValueCount() - 1)) {
+    if (value < partialSumVector.getValueAsLong(0)
+        || value >= partialSumVector.getValueAsLong(partialSumVector.getValueCount() - 1)) {
       return -1;
     }
 
@@ -114,6 +112,5 @@ public static int findPositionInPartialSumVector(BaseIntVector partialSumVector,
     throw new IllegalStateException("Should never get here");
   }
 
-  private PartialSumUtils() {
-  }
+  private PartialSumUtils() {}
 }
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/rank/VectorRank.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/rank/VectorRank.java
index 43c9a5b010e8c..baa2058ffc51f 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/rank/VectorRank.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/rank/VectorRank.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.rank;
 
 import java.util.stream.IntStream;
-
 import org.apache.arrow.algorithm.sort.IndexSorter;
 import org.apache.arrow.algorithm.sort.VectorValueComparator;
 import org.apache.arrow.memory.BufferAllocator;
@@ -28,21 +26,21 @@
 
 /**
  * Utility for calculating ranks of vector elements.
+ *
  * @param <V> the vector type
  */
 public class VectorRank<V extends ValueVector> {
 
   private VectorValueComparator<V> comparator;
 
-  /**
-   * Vector indices.
-   */
+  /** Vector indices. */
   private IntVector indices;
 
   private final BufferAllocator allocator;
 
   /**
    * Constructs a vector rank utility.
+   *
    * @param allocator the allocator to use.
    */
   public VectorRank(BufferAllocator allocator) {
@@ -50,9 +48,10 @@ public VectorRank(BufferAllocator allocator) {
   }
 
   /**
-   * Given a rank r, gets the index of the element that is the rth smallest in the vector.
-   * The operation is performed without changing the vector, and takes O(n) time,
-   * where n is the length of the vector.
+   * Given a rank r, gets the index of the element that is the rth smallest in the vector. The
+   * operation is performed without changing the vector, and takes O(n) time, where n is the length
+   * of the vector.
+   *
    * @param vector the vector from which to get the element index.
    * @param comparator the criteria for vector element comparison.
    * @param rank the rank to determine.
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/search/ParallelSearcher.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/search/ParallelSearcher.java
index 6226921b22ed6..6a48019edc3eb 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/search/ParallelSearcher.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/search/ParallelSearcher.java
@@ -14,49 +14,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.search;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
-
 import org.apache.arrow.algorithm.sort.VectorValueComparator;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.compare.Range;
 import org.apache.arrow.vector.compare.RangeEqualsVisitor;
 
 /**
- * Search for a value in the vector by multiple threads.
- * This is often used in scenarios where the vector is large or
- * low response time is required.
+ * Search for a value in the vector by multiple threads. This is often used in scenarios where the
+ * vector is large or low response time is required.
+ *
  * @param <V> the vector type.
  */
 public class ParallelSearcher<V extends ValueVector> {
 
-  /**
-   * The target vector to search.
-   */
+  /** The target vector to search. */
   private final V vector;
 
-  /**
-   * The thread pool.
-   */
+  /** The thread pool. */
   private final ExecutorService threadPool;
 
-  /**
-   * The number of threads to use.
-   */
+  /** The number of threads to use. */
   private final int numThreads;
 
-  /**
-   * The position of the key in the target vector, if any.
-   */
+  /** The position of the key in the target vector, if any. */
   private volatile int keyPosition = -1;
 
   /**
    * Constructs a parallel searcher.
+   *
    * @param vector the vector to search.
    * @param threadPool the thread pool to use.
    * @param numThreads the number of threads to use.
@@ -77,17 +68,17 @@ private CompletableFuture<Boolean>[] initSearch() {
   }
 
   /**
-   * Search for the key in the target vector. The element-wise comparison is based on
-   * {@link RangeEqualsVisitor}, so there are two possible results for each element-wise
-   * comparison: equal and un-equal.
+   * Search for the key in the target vector. The element-wise comparison is based on {@link
+   * RangeEqualsVisitor}, so there are two possible results for each element-wise comparison: equal
+   * and un-equal.
+   *
    * @param keyVector the vector containing the search key.
    * @param keyIndex the index of the search key in the key vector.
-   * @return the position of a matched value in the target vector,
-   *     or -1 if none is found. Please note that if there are multiple
-   *     matches of the key in the target vector, this method makes no
-   *     guarantees about which instance is returned.
-   *     For an alternative search implementation that always finds the first match of the key,
-   *     see {@link VectorSearcher#linearSearch(ValueVector, VectorValueComparator, ValueVector, int)}.
+   * @return the position of a matched value in the target vector, or -1 if none is found. Please
+   *     note that if there are multiple matches of the key in the target vector, this method makes
+   *     no guarantees about which instance is returned. For an alternative search implementation
+   *     that always finds the first match of the key, see {@link
+   *     VectorSearcher#linearSearch(ValueVector, VectorValueComparator, ValueVector, int)}.
    * @throws ExecutionException if an exception occurs in a thread.
    * @throws InterruptedException if a thread is interrupted.
    */
@@ -96,36 +87,38 @@ public int search(V keyVector, int keyIndex) throws ExecutionException, Interrup
     final int valueCount = vector.getValueCount();
     for (int i = 0; i < numThreads; i++) {
       final int tid = i;
-      Future<?> unused = threadPool.submit(() -> {
-        // convert to long to avoid overflow
-        int start = (int) (((long) valueCount) * tid / numThreads);
-        int end = (int) ((long) valueCount) * (tid + 1) / numThreads;
-
-        if (start >= end) {
-          // no data assigned to this task.
-          futures[tid].complete(false);
-          return;
-        }
-
-        RangeEqualsVisitor visitor = new RangeEqualsVisitor(vector, keyVector, null);
-        Range range = new Range(0, 0, 1);
-        for (int pos = start; pos < end; pos++) {
-          if (keyPosition != -1) {
-            // the key has been found by another task
-            futures[tid].complete(false);
-            return;
-          }
-          range.setLeftStart(pos).setRightStart(keyIndex);
-          if (visitor.rangeEquals(range)) {
-            keyPosition = pos;
-            futures[tid].complete(true);
-            return;
-          }
-        }
-
-        // no match value is found.
-        futures[tid].complete(false);
-      });
+      Future<?> unused =
+          threadPool.submit(
+              () -> {
+                // convert to long to avoid overflow
+                int start = (int) (((long) valueCount) * tid / numThreads);
+                int end = (int) ((long) valueCount) * (tid + 1) / numThreads;
+
+                if (start >= end) {
+                  // no data assigned to this task.
+                  futures[tid].complete(false);
+                  return;
+                }
+
+                RangeEqualsVisitor visitor = new RangeEqualsVisitor(vector, keyVector, null);
+                Range range = new Range(0, 0, 1);
+                for (int pos = start; pos < end; pos++) {
+                  if (keyPosition != -1) {
+                    // the key has been found by another task
+                    futures[tid].complete(false);
+                    return;
+                  }
+                  range.setLeftStart(pos).setRightStart(keyIndex);
+                  if (visitor.rangeEquals(range)) {
+                    keyPosition = pos;
+                    futures[tid].complete(true);
+                    return;
+                  }
+                }
+
+                // no match value is found.
+                futures[tid].complete(false);
+              });
     }
 
     CompletableFuture.allOf(futures).get();
@@ -133,56 +126,58 @@ public int search(V keyVector, int keyIndex) throws ExecutionException, Interrup
   }
 
   /**
-   * Search for the key in the target vector. The element-wise comparison is based on
-   * {@link VectorValueComparator}, so there are three possible results for each element-wise
-   * comparison: less than, equal to and greater than.
+   * Search for the key in the target vector. The element-wise comparison is based on {@link
+   * VectorValueComparator}, so there are three possible results for each element-wise comparison:
+   * less than, equal to and greater than.
+   *
    * @param keyVector the vector containing the search key.
    * @param keyIndex the index of the search key in the key vector.
    * @param comparator the comparator for comparing the key against vector elements.
-   * @return the position of a matched value in the target vector,
-   *     or -1 if none is found. Please note that if there are multiple
-   *     matches of the key in the target vector, this method makes no
-   *     guarantees about which instance is returned.
-   *     For an alternative search implementation that always finds the first match of the key,
-   *     see {@link VectorSearcher#linearSearch(ValueVector, VectorValueComparator, ValueVector, int)}.
+   * @return the position of a matched value in the target vector, or -1 if none is found. Please
+   *     note that if there are multiple matches of the key in the target vector, this method makes
+   *     no guarantees about which instance is returned. For an alternative search implementation
+   *     that always finds the first match of the key, see {@link
+   *     VectorSearcher#linearSearch(ValueVector, VectorValueComparator, ValueVector, int)}.
    * @throws ExecutionException if an exception occurs in a thread.
    * @throws InterruptedException if a thread is interrupted.
    */
-  public int search(
-      V keyVector, int keyIndex, VectorValueComparator<V> comparator) throws ExecutionException, InterruptedException {
+  public int search(V keyVector, int keyIndex, VectorValueComparator<V> comparator)
+      throws ExecutionException, InterruptedException {
     final CompletableFuture<Boolean>[] futures = initSearch();
     final int valueCount = vector.getValueCount();
     for (int i = 0; i < numThreads; i++) {
       final int tid = i;
-      Future<?> unused = threadPool.submit(() -> {
-        // convert to long to avoid overflow
-        int start = (int) (((long) valueCount) * tid / numThreads);
-        int end = (int) ((long) valueCount) * (tid + 1) / numThreads;
-
-        if (start >= end) {
-          // no data assigned to this task.
-          futures[tid].complete(false);
-          return;
-        }
-
-        VectorValueComparator<V> localComparator = comparator.createNew();
-        localComparator.attachVectors(vector, keyVector);
-        for (int pos = start; pos < end; pos++) {
-          if (keyPosition != -1) {
-            // the key has been found by another task
-            futures[tid].complete(false);
-            return;
-          }
-          if (localComparator.compare(pos, keyIndex) == 0) {
-            keyPosition = pos;
-            futures[tid].complete(true);
-            return;
-          }
-        }
-
-        // no match value is found.
-        futures[tid].complete(false);
-      });
+      Future<?> unused =
+          threadPool.submit(
+              () -> {
+                // convert to long to avoid overflow
+                int start = (int) (((long) valueCount) * tid / numThreads);
+                int end = (int) ((long) valueCount) * (tid + 1) / numThreads;
+
+                if (start >= end) {
+                  // no data assigned to this task.
+                  futures[tid].complete(false);
+                  return;
+                }
+
+                VectorValueComparator<V> localComparator = comparator.createNew();
+                localComparator.attachVectors(vector, keyVector);
+                for (int pos = start; pos < end; pos++) {
+                  if (keyPosition != -1) {
+                    // the key has been found by another task
+                    futures[tid].complete(false);
+                    return;
+                  }
+                  if (localComparator.compare(pos, keyIndex) == 0) {
+                    keyPosition = pos;
+                    futures[tid].complete(true);
+                    return;
+                  }
+                }
+
+                // no match value is found.
+                futures[tid].complete(false);
+              });
     }
 
     CompletableFuture.allOf(futures).get();
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/search/VectorRangeSearcher.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/search/VectorRangeSearcher.java
index 249194843f101..c7905dd8956c8 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/search/VectorRangeSearcher.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/search/VectorRangeSearcher.java
@@ -1,108 +1,105 @@
-/*
- * 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.
- */
-
-package org.apache.arrow.algorithm.search;
-
-import org.apache.arrow.algorithm.sort.VectorValueComparator;
-import org.apache.arrow.vector.ValueVector;
-
-/**
- * Search for the range of a particular element in the target vector.
- */
-public class VectorRangeSearcher {
-
-  /**
-   * Result returned when a search fails.
-   */
-  public static final int SEARCH_FAIL_RESULT = -1;
-
-  /**
-   * Search for the first occurrence of an element.
-   * The search is based on the binary search algorithm. So the target vector must be sorted.
-   * @param targetVector the vector from which to perform the search.
-   * @param comparator the criterion for the comparison.
-   * @param keyVector the vector containing the element to search.
-   * @param keyIndex the index of the search key in the key vector.
-   * @param <V> the vector type.
-   * @return the index of the first matched element if any, and -1 otherwise.
-   */
-  public static <V extends ValueVector> int getFirstMatch(
-          V targetVector, VectorValueComparator<V> comparator, V keyVector, int keyIndex) {
-    comparator.attachVectors(keyVector, targetVector);
-
-    int ret = SEARCH_FAIL_RESULT;
-
-    int low = 0;
-    int high = targetVector.getValueCount() - 1;
-
-    while (low <= high) {
-      int mid = low + (high - low) / 2;
-      int result = comparator.compare(keyIndex, mid);
-      if (result < 0) {
-        // the key is smaller
-        high = mid - 1;
-      } else if (result > 0) {
-        // the key is larger
-        low = mid + 1;
-      } else {
-        // an equal element is found
-        // continue to go left-ward
-        ret = mid;
-        high = mid - 1;
-      }
-    }
-    return ret;
-  }
-
-  /**
-   * Search for the last occurrence of an element.
-   * The search is based on the binary search algorithm. So the target vector must be sorted.
-   * @param targetVector the vector from which to perform the search.
-   * @param comparator the criterion for the comparison.
-   * @param keyVector the vector containing the element to search.
-   * @param keyIndex the index of the search key in the key vector.
-   * @param <V> the vector type.
-   * @return the index of the last matched element if any, and -1 otherwise.
-   */
-  public static <V extends ValueVector> int getLastMatch(
-          V targetVector, VectorValueComparator<V> comparator, V keyVector, int keyIndex) {
-    comparator.attachVectors(keyVector, targetVector);
-
-    int ret = SEARCH_FAIL_RESULT;
-
-    int low = 0;
-    int high = targetVector.getValueCount() - 1;
-
-    while (low <= high) {
-      int mid = low + (high - low) / 2;
-      int result = comparator.compare(keyIndex, mid);
-      if (result < 0) {
-        // the key is smaller
-        high = mid - 1;
-      } else if (result > 0) {
-        // the key is larger
-        low = mid + 1;
-      } else {
-        // an equal element is found,
-        // continue to go right-ward
-        ret = mid;
-        low = mid + 1;
-      }
-    }
-    return ret;
-  }
-}
+/*
+ * 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.
+ */
+package org.apache.arrow.algorithm.search;
+
+import org.apache.arrow.algorithm.sort.VectorValueComparator;
+import org.apache.arrow.vector.ValueVector;
+
+/** Search for the range of a particular element in the target vector. */
+public class VectorRangeSearcher {
+
+  /** Result returned when a search fails. */
+  public static final int SEARCH_FAIL_RESULT = -1;
+
+  /**
+   * Search for the first occurrence of an element. The search is based on the binary search
+   * algorithm. So the target vector must be sorted.
+   *
+   * @param targetVector the vector from which to perform the search.
+   * @param comparator the criterion for the comparison.
+   * @param keyVector the vector containing the element to search.
+   * @param keyIndex the index of the search key in the key vector.
+   * @param <V> the vector type.
+   * @return the index of the first matched element if any, and -1 otherwise.
+   */
+  public static <V extends ValueVector> int getFirstMatch(
+      V targetVector, VectorValueComparator<V> comparator, V keyVector, int keyIndex) {
+    comparator.attachVectors(keyVector, targetVector);
+
+    int ret = SEARCH_FAIL_RESULT;
+
+    int low = 0;
+    int high = targetVector.getValueCount() - 1;
+
+    while (low <= high) {
+      int mid = low + (high - low) / 2;
+      int result = comparator.compare(keyIndex, mid);
+      if (result < 0) {
+        // the key is smaller
+        high = mid - 1;
+      } else if (result > 0) {
+        // the key is larger
+        low = mid + 1;
+      } else {
+        // an equal element is found
+        // continue to go left-ward
+        ret = mid;
+        high = mid - 1;
+      }
+    }
+    return ret;
+  }
+
+  /**
+   * Search for the last occurrence of an element. The search is based on the binary search
+   * algorithm. So the target vector must be sorted.
+   *
+   * @param targetVector the vector from which to perform the search.
+   * @param comparator the criterion for the comparison.
+   * @param keyVector the vector containing the element to search.
+   * @param keyIndex the index of the search key in the key vector.
+   * @param <V> the vector type.
+   * @return the index of the last matched element if any, and -1 otherwise.
+   */
+  public static <V extends ValueVector> int getLastMatch(
+      V targetVector, VectorValueComparator<V> comparator, V keyVector, int keyIndex) {
+    comparator.attachVectors(keyVector, targetVector);
+
+    int ret = SEARCH_FAIL_RESULT;
+
+    int low = 0;
+    int high = targetVector.getValueCount() - 1;
+
+    while (low <= high) {
+      int mid = low + (high - low) / 2;
+      int result = comparator.compare(keyIndex, mid);
+      if (result < 0) {
+        // the key is smaller
+        high = mid - 1;
+      } else if (result > 0) {
+        // the key is larger
+        low = mid + 1;
+      } else {
+        // an equal element is found,
+        // continue to go right-ward
+        ret = mid;
+        low = mid + 1;
+      }
+    }
+    return ret;
+  }
+}
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/search/VectorSearcher.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/search/VectorSearcher.java
index 646bca01bb81d..dd0b4de5d8677 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/search/VectorSearcher.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/search/VectorSearcher.java
@@ -14,25 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.search;
 
 import org.apache.arrow.algorithm.sort.VectorValueComparator;
 import org.apache.arrow.vector.ValueVector;
 
-/**
- * Search for a particular element in the vector.
- */
+/** Search for a particular element in the vector. */
 public final class VectorSearcher {
 
-  /**
-   * Result returned when a search fails.
-   */
+  /** Result returned when a search fails. */
   public static final int SEARCH_FAIL_RESULT = -1;
 
   /**
-   * Search for a particular element from the key vector in the target vector by binary search.
-   * The target vector must be sorted.
+   * Search for a particular element from the key vector in the target vector by binary search. The
+   * target vector must be sorted.
+   *
    * @param targetVector the vector from which to perform the sort.
    * @param comparator the criterion for the sort.
    * @param keyVector the vector containing the element to search.
@@ -41,7 +37,7 @@ public final class VectorSearcher {
    * @return the index of a matched element if any, and -1 otherwise.
    */
   public static <V extends ValueVector> int binarySearch(
-          V targetVector, VectorValueComparator<V> comparator, V keyVector, int keyIndex) {
+      V targetVector, VectorValueComparator<V> comparator, V keyVector, int keyIndex) {
     comparator.attachVectors(keyVector, targetVector);
 
     // perform binary search
@@ -63,7 +59,9 @@ public static <V extends ValueVector> int binarySearch(
   }
 
   /**
-   * Search for a particular element from the key vector in the target vector by traversing the vector in sequence.
+   * Search for a particular element from the key vector in the target vector by traversing the
+   * vector in sequence.
+   *
    * @param targetVector the vector from which to perform the search.
    * @param comparator the criterion for element equality.
    * @param keyVector the vector containing the element to search.
@@ -72,7 +70,7 @@ public static <V extends ValueVector> int binarySearch(
    * @return the index of a matched element if any, and -1 otherwise.
    */
   public static <V extends ValueVector> int linearSearch(
-          V targetVector, VectorValueComparator<V> comparator, V keyVector, int keyIndex) {
+      V targetVector, VectorValueComparator<V> comparator, V keyVector, int keyIndex) {
     comparator.attachVectors(keyVector, targetVector);
     for (int i = 0; i < targetVector.getValueCount(); i++) {
       if (comparator.compare(keyIndex, i) == 0) {
@@ -82,7 +80,5 @@ public static <V extends ValueVector> int linearSearch(
     return SEARCH_FAIL_RESULT;
   }
 
-  private VectorSearcher() {
-
-  }
+  private VectorSearcher() {}
 }
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/CompositeVectorComparator.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/CompositeVectorComparator.java
index ec74598e0eebf..77093d87bc489 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/CompositeVectorComparator.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/CompositeVectorComparator.java
@@ -14,20 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import org.apache.arrow.vector.ValueVector;
 
 /**
- * A composite vector comparator compares a number of vectors
- * by a number of inner comparators.
- * <p>
- *   It works by first using the first comparator, if a non-zero value
- *   is returned, it simply returns it. Otherwise, it uses the second comparator,
- *   and so on, until a non-zero value is produced, or all inner comparators have
- *   been used.
- * </p>
+ * A composite vector comparator compares a number of vectors by a number of inner comparators.
+ *
+ * <p>It works by first using the first comparator, if a non-zero value is returned, it simply
+ * returns it. Otherwise, it uses the second comparator, and so on, until a non-zero value is
+ * produced, or all inner comparators have been used.
  */
 public class CompositeVectorComparator extends VectorValueComparator<ValueVector> {
 
@@ -62,7 +58,8 @@ public int compare(int index1, int index2) {
 
   @Override
   public VectorValueComparator<ValueVector> createNew() {
-    VectorValueComparator[] newInnerComparators = new VectorValueComparator[innerComparators.length];
+    VectorValueComparator[] newInnerComparators =
+        new VectorValueComparator[innerComparators.length];
     for (int i = 0; i < innerComparators.length; i++) {
       newInnerComparators[i] = innerComparators[i].createNew();
     }
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/DefaultVectorComparators.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/DefaultVectorComparators.java
index 588876aa99059..ec650cd9dc88b 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/DefaultVectorComparators.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/DefaultVectorComparators.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import static org.apache.arrow.vector.complex.BaseRepeatedValueVector.OFFSET_WIDTH;
 
 import java.math.BigDecimal;
 import java.time.Duration;
-
 import org.apache.arrow.memory.util.ArrowBufPointer;
 import org.apache.arrow.memory.util.ByteFunctionHelpers;
 import org.apache.arrow.vector.BaseFixedWidthVector;
@@ -56,13 +54,12 @@
 import org.apache.arrow.vector.complex.RepeatedValueVector;
 import org.apache.arrow.vector.holders.NullableFixedSizeBinaryHolder;
 
-/**
- * Default comparator implementations for different types of vectors.
- */
+/** Default comparator implementations for different types of vectors. */
 public class DefaultVectorComparators {
 
   /**
    * Create the default comparator for the vector.
+   *
    * @param vector the vector.
    * @param <T> the vector type.
    * @return the default comparator.
@@ -104,7 +101,8 @@ public static <T extends ValueVector> VectorValueComparator<T> createDefaultComp
       } else if (vector instanceof IntervalDayVector) {
         return (VectorValueComparator<T>) new IntervalDayComparator();
       } else if (vector instanceof IntervalMonthDayNanoVector) {
-        throw new IllegalArgumentException("No default comparator for " + vector.getClass().getCanonicalName());
+        throw new IllegalArgumentException(
+            "No default comparator for " + vector.getClass().getCanonicalName());
       } else if (vector instanceof TimeMicroVector) {
         return (VectorValueComparator<T>) new TimeMicroComparator();
       } else if (vector instanceof TimeMilliVector) {
@@ -122,7 +120,7 @@ public static <T extends ValueVector> VectorValueComparator<T> createDefaultComp
       return (VectorValueComparator<T>) new VariableWidthComparator();
     } else if (vector instanceof RepeatedValueVector) {
       VectorValueComparator<?> innerComparator =
-              createDefaultComparator(((RepeatedValueVector) vector).getDataVector());
+          createDefaultComparator(((RepeatedValueVector) vector).getDataVector());
       return new RepeatedValueComparator(innerComparator);
     } else if (vector instanceof FixedSizeListVector) {
       VectorValueComparator<?> innerComparator =
@@ -132,13 +130,11 @@ public static <T extends ValueVector> VectorValueComparator<T> createDefaultComp
       return (VectorValueComparator<T>) new NullComparator();
     }
 
-    throw new IllegalArgumentException("No default comparator for " + vector.getClass().getCanonicalName());
+    throw new IllegalArgumentException(
+        "No default comparator for " + vector.getClass().getCanonicalName());
   }
 
-  /**
-   * Default comparator for bytes.
-   * The comparison is based on values, with null comes first.
-   */
+  /** Default comparator for bytes. The comparison is based on values, with null comes first. */
   public static class ByteComparator extends VectorValueComparator<TinyIntVector> {
 
     public ByteComparator() {
@@ -159,8 +155,8 @@ public VectorValueComparator<TinyIntVector> createNew() {
   }
 
   /**
-   * Default comparator for short integers.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for short integers. The comparison is based on values, with null comes
+   * first.
    */
   public static class ShortComparator extends VectorValueComparator<SmallIntVector> {
 
@@ -182,8 +178,8 @@ public VectorValueComparator<SmallIntVector> createNew() {
   }
 
   /**
-   * Default comparator for 32-bit integers.
-   * The comparison is based on int values, with null comes first.
+   * Default comparator for 32-bit integers. The comparison is based on int values, with null comes
+   * first.
    */
   public static class IntComparator extends VectorValueComparator<IntVector> {
 
@@ -205,8 +201,7 @@ public VectorValueComparator<IntVector> createNew() {
   }
 
   /**
-   * Default comparator for long integers.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for long integers. The comparison is based on values, with null comes first.
    */
   public static class LongComparator extends VectorValueComparator<BigIntVector> {
 
@@ -229,8 +224,8 @@ public VectorValueComparator<BigIntVector> createNew() {
   }
 
   /**
-   * Default comparator for unsigned bytes.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for unsigned bytes. The comparison is based on values, with null comes
+   * first.
    */
   public static class UInt1Comparator extends VectorValueComparator<UInt1Vector> {
 
@@ -253,8 +248,8 @@ public VectorValueComparator<UInt1Vector> createNew() {
   }
 
   /**
-   * Default comparator for unsigned short integer.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for unsigned short integer. The comparison is based on values, with null
+   * comes first.
    */
   public static class UInt2Comparator extends VectorValueComparator<UInt2Vector> {
 
@@ -280,8 +275,8 @@ public VectorValueComparator<UInt2Vector> createNew() {
   }
 
   /**
-   * Default comparator for unsigned integer.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for unsigned integer. The comparison is based on values, with null comes
+   * first.
    */
   public static class UInt4Comparator extends VectorValueComparator<UInt4Vector> {
 
@@ -303,8 +298,8 @@ public VectorValueComparator<UInt4Vector> createNew() {
   }
 
   /**
-   * Default comparator for unsigned long integer.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for unsigned long integer. The comparison is based on values, with null
+   * comes first.
    */
   public static class UInt8Comparator extends VectorValueComparator<UInt8Vector> {
 
@@ -326,8 +321,7 @@ public VectorValueComparator<UInt8Vector> createNew() {
   }
 
   /**
-   * Default comparator for float type.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for float type. The comparison is based on values, with null comes first.
    */
   public static class Float4Comparator extends VectorValueComparator<Float4Vector> {
 
@@ -363,8 +357,7 @@ public VectorValueComparator<Float4Vector> createNew() {
   }
 
   /**
-   * Default comparator for double type.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for double type. The comparison is based on values, with null comes first.
    */
   public static class Float8Comparator extends VectorValueComparator<Float8Vector> {
 
@@ -399,10 +392,7 @@ public VectorValueComparator<Float8Vector> createNew() {
     }
   }
 
-  /**
-   * Default comparator for bit type.
-   * The comparison is based on values, with null comes first.
-   */
+  /** Default comparator for bit type. The comparison is based on values, with null comes first. */
   public static class BitComparator extends VectorValueComparator<BitVector> {
 
     public BitComparator() {
@@ -424,8 +414,7 @@ public VectorValueComparator<BitVector> createNew() {
   }
 
   /**
-   * Default comparator for DateDay type.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for DateDay type. The comparison is based on values, with null comes first.
    */
   public static class DateDayComparator extends VectorValueComparator<DateDayVector> {
 
@@ -447,8 +436,8 @@ public VectorValueComparator<DateDayVector> createNew() {
   }
 
   /**
-   * Default comparator for DateMilli type.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for DateMilli type. The comparison is based on values, with null comes
+   * first.
    */
   public static class DateMilliComparator extends VectorValueComparator<DateMilliVector> {
 
@@ -471,8 +460,8 @@ public VectorValueComparator<DateMilliVector> createNew() {
   }
 
   /**
-   * Default comparator for Decimal256 type.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for Decimal256 type. The comparison is based on values, with null comes
+   * first.
    */
   public static class Decimal256Comparator extends VectorValueComparator<Decimal256Vector> {
 
@@ -495,8 +484,7 @@ public VectorValueComparator<Decimal256Vector> createNew() {
   }
 
   /**
-   * Default comparator for Decimal type.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for Decimal type. The comparison is based on values, with null comes first.
    */
   public static class DecimalComparator extends VectorValueComparator<DecimalVector> {
 
@@ -519,8 +507,7 @@ public VectorValueComparator<DecimalVector> createNew() {
   }
 
   /**
-   * Default comparator for Duration type.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for Duration type. The comparison is based on values, with null comes first.
    */
   public static class DurationComparator extends VectorValueComparator<DurationVector> {
 
@@ -543,8 +530,8 @@ public VectorValueComparator<DurationVector> createNew() {
   }
 
   /**
-   * Default comparator for IntervalDay type.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for IntervalDay type. The comparison is based on values, with null comes
+   * first.
    */
   public static class IntervalDayComparator extends VectorValueComparator<IntervalDayVector> {
 
@@ -567,8 +554,8 @@ public VectorValueComparator<IntervalDayVector> createNew() {
   }
 
   /**
-   * Default comparator for TimeMicro type.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for TimeMicro type. The comparison is based on values, with null comes
+   * first.
    */
   public static class TimeMicroComparator extends VectorValueComparator<TimeMicroVector> {
 
@@ -591,8 +578,8 @@ public VectorValueComparator<TimeMicroVector> createNew() {
   }
 
   /**
-   * Default comparator for TimeMilli type.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for TimeMilli type. The comparison is based on values, with null comes
+   * first.
    */
   public static class TimeMilliComparator extends VectorValueComparator<TimeMilliVector> {
 
@@ -615,8 +602,7 @@ public VectorValueComparator<TimeMilliVector> createNew() {
   }
 
   /**
-   * Default comparator for TimeNano type.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for TimeNano type. The comparison is based on values, with null comes first.
    */
   public static class TimeNanoComparator extends VectorValueComparator<TimeNanoVector> {
 
@@ -639,8 +625,7 @@ public VectorValueComparator<TimeNanoVector> createNew() {
   }
 
   /**
-   * Default comparator for TimeSec type.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for TimeSec type. The comparison is based on values, with null comes first.
    */
   public static class TimeSecComparator extends VectorValueComparator<TimeSecVector> {
 
@@ -663,8 +648,7 @@ public VectorValueComparator<TimeSecVector> createNew() {
   }
 
   /**
-   * Default comparator for TimeSec type.
-   * The comparison is based on values, with null comes first.
+   * Default comparator for TimeSec type. The comparison is based on values, with null comes first.
    */
   public static class TimeStampComparator extends VectorValueComparator<TimeStampVector> {
 
@@ -687,10 +671,11 @@ public VectorValueComparator<TimeStampVector> createNew() {
   }
 
   /**
-   * Default comparator for {@link org.apache.arrow.vector.FixedSizeBinaryVector}.
-   * The comparison is in lexicographic order, with null comes first.
+   * Default comparator for {@link org.apache.arrow.vector.FixedSizeBinaryVector}. The comparison is
+   * in lexicographic order, with null comes first.
    */
-  public static class FixedSizeBinaryComparator extends VectorValueComparator<FixedSizeBinaryVector> {
+  public static class FixedSizeBinaryComparator
+      extends VectorValueComparator<FixedSizeBinaryVector> {
 
     @Override
     public int compare(int index1, int index2) {
@@ -720,9 +705,7 @@ public VectorValueComparator<FixedSizeBinaryVector> createNew() {
     }
   }
 
-  /**
-   * Default comparator for {@link org.apache.arrow.vector.NullVector}.
-   */
+  /** Default comparator for {@link org.apache.arrow.vector.NullVector}. */
   public static class NullComparator extends VectorValueComparator<NullVector> {
     @Override
     public int compare(int index1, int index2) {
@@ -742,8 +725,8 @@ public VectorValueComparator<NullVector> createNew() {
   }
 
   /**
-   * Default comparator for {@link org.apache.arrow.vector.VariableWidthVector}.
-   * The comparison is in lexicographic order, with null comes first.
+   * Default comparator for {@link org.apache.arrow.vector.VariableWidthVector}. The comparison is
+   * in lexicographic order, with null comes first.
    */
   public static class VariableWidthComparator extends VectorValueComparator<VariableWidthVector> {
 
@@ -772,12 +755,13 @@ public VectorValueComparator<VariableWidthVector> createNew() {
   }
 
   /**
-   * Default comparator for {@link RepeatedValueVector}.
-   * It works by comparing the underlying vector in a lexicographic order.
+   * Default comparator for {@link RepeatedValueVector}. It works by comparing the underlying vector
+   * in a lexicographic order.
+   *
    * @param <T> inner vector type.
    */
   public static class RepeatedValueComparator<T extends ValueVector>
-          extends VectorValueComparator<RepeatedValueVector> {
+      extends VectorValueComparator<RepeatedValueVector> {
 
     private final VectorValueComparator<T> innerComparator;
 
@@ -823,8 +807,9 @@ public void attachVectors(RepeatedValueVector vector1, RepeatedValueVector vecto
   }
 
   /**
-   * Default comparator for {@link RepeatedValueVector}.
-   * It works by comparing the underlying vector in a lexicographic order.
+   * Default comparator for {@link RepeatedValueVector}. It works by comparing the underlying vector
+   * in a lexicographic order.
+   *
    * @param <T> inner vector type.
    */
   public static class FixedSizeListComparator<T extends ValueVector>
@@ -869,6 +854,5 @@ public void attachVectors(FixedSizeListVector vector1, FixedSizeListVector vecto
     }
   }
 
-  private DefaultVectorComparators() {
-  }
+  private DefaultVectorComparators() {}
 }
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthInPlaceVectorSorter.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthInPlaceVectorSorter.java
index aaa7ba117c3ba..ea2b344a1eabb 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthInPlaceVectorSorter.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthInPlaceVectorSorter.java
@@ -14,20 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import org.apache.arrow.vector.BaseFixedWidthVector;
 
 /**
- * Default in-place sorter for fixed-width vectors.
- * It is based on quick-sort, with average time complexity O(n*log(n)).
+ * Default in-place sorter for fixed-width vectors. It is based on quick-sort, with average time
+ * complexity O(n*log(n)).
+ *
  * @param <V> vector type.
  */
-public class FixedWidthInPlaceVectorSorter<V extends BaseFixedWidthVector> implements InPlaceVectorSorter<V> {
+public class FixedWidthInPlaceVectorSorter<V extends BaseFixedWidthVector>
+    implements InPlaceVectorSorter<V> {
 
   /**
-   * If the number of items is smaller than this threshold, we will use another algorithm to sort the data.
+   * If the number of items is smaller than this threshold, we will use another algorithm to sort
+   * the data.
    */
   public static final int CHANGE_ALGORITHM_THRESHOLD = 15;
 
@@ -35,15 +37,10 @@ public class FixedWidthInPlaceVectorSorter<V extends BaseFixedWidthVector> imple
 
   VectorValueComparator<V> comparator;
 
-  /**
-   * The vector to sort.
-   */
+  /** The vector to sort. */
   V vec;
 
-  /**
-   * The buffer to hold the pivot.
-   * It always has length 1.
-   */
+  /** The buffer to hold the pivot. It always has length 1. */
   V pivotBuffer;
 
   @Override
@@ -99,9 +96,7 @@ private void quickSort() {
     }
   }
 
-  /**
-   *  Select the pivot as the median of 3 samples.
-   */
+  /** Select the pivot as the median of 3 samples. */
   void choosePivot(int low, int high) {
     // we need at least 3 items
     if (high - low + 1 < STOP_CHOOSING_PIVOT_THRESHOLD) {
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthOutOfPlaceVectorSorter.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthOutOfPlaceVectorSorter.java
index 05a4585792dc2..817e890a5abe1 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthOutOfPlaceVectorSorter.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthOutOfPlaceVectorSorter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import org.apache.arrow.memory.ArrowBuf;
@@ -26,18 +25,21 @@
 import org.apache.arrow.vector.IntVector;
 
 /**
- * Default out-of-place sorter for fixed-width vectors.
- * It is an out-of-place sort, with time complexity O(n*log(n)).
+ * Default out-of-place sorter for fixed-width vectors. It is an out-of-place sort, with time
+ * complexity O(n*log(n)).
+ *
  * @param <V> vector type.
  */
-public class FixedWidthOutOfPlaceVectorSorter<V extends BaseFixedWidthVector> implements OutOfPlaceVectorSorter<V> {
+public class FixedWidthOutOfPlaceVectorSorter<V extends BaseFixedWidthVector>
+    implements OutOfPlaceVectorSorter<V> {
 
   protected IndexSorter<V> indexSorter = new IndexSorter<>();
 
   @Override
   public void sortOutOfPlace(V srcVector, V dstVector, VectorValueComparator<V> comparator) {
     if (srcVector instanceof BitVector) {
-      throw new IllegalArgumentException("BitVector is not supported with FixedWidthOutOfPlaceVectorSorter.");
+      throw new IllegalArgumentException(
+          "BitVector is not supported with FixedWidthOutOfPlaceVectorSorter.");
     }
     comparator.attachVector(srcVector);
 
@@ -49,15 +51,18 @@ public void sortOutOfPlace(V srcVector, V dstVector, VectorValueComparator<V> co
     ArrowBuf dstValueBuffer = dstVector.getDataBuffer();
 
     // check buffer size
-    Preconditions.checkArgument(dstValidityBuffer.capacity() * 8 >= srcVector.getValueCount(),
-        "Not enough capacity for the validity buffer of the dst vector. " +
-            "Expected capacity %s, actual capacity %s",
-        (srcVector.getValueCount() + 7) / 8, dstValidityBuffer.capacity());
+    Preconditions.checkArgument(
+        dstValidityBuffer.capacity() * 8 >= srcVector.getValueCount(),
+        "Not enough capacity for the validity buffer of the dst vector. "
+            + "Expected capacity %s, actual capacity %s",
+        (srcVector.getValueCount() + 7) / 8,
+        dstValidityBuffer.capacity());
     Preconditions.checkArgument(
         dstValueBuffer.capacity() >= srcVector.getValueCount() * ((long) srcVector.getTypeWidth()),
-        "Not enough capacity for the data buffer of the dst vector. " +
-            "Expected capacity %s, actual capacity %s",
-        srcVector.getValueCount() * srcVector.getTypeWidth(), dstValueBuffer.capacity());
+        "Not enough capacity for the data buffer of the dst vector. "
+            + "Expected capacity %s, actual capacity %s",
+        srcVector.getValueCount() * srcVector.getTypeWidth(),
+        dstValueBuffer.capacity());
 
     // sort value indices
     try (IntVector sortedIndices = new IntVector("", srcVector.getAllocator())) {
@@ -73,9 +78,9 @@ public void sortOutOfPlace(V srcVector, V dstVector, VectorValueComparator<V> co
         } else {
           BitVectorHelper.setBit(dstValidityBuffer, dstIndex);
           MemoryUtil.UNSAFE.copyMemory(
-                  srcValueBuffer.memoryAddress() + srcIndex * ((long) valueWidth),
-                  dstValueBuffer.memoryAddress() + dstIndex * ((long) valueWidth),
-                  valueWidth);
+              srcValueBuffer.memoryAddress() + srcIndex * ((long) valueWidth),
+              dstValueBuffer.memoryAddress() + dstIndex * ((long) valueWidth),
+              valueWidth);
         }
       }
     }
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/GeneralOutOfPlaceVectorSorter.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/GeneralOutOfPlaceVectorSorter.java
index 9ea39f638aebe..18f5e94314f83 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/GeneralOutOfPlaceVectorSorter.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/GeneralOutOfPlaceVectorSorter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import org.apache.arrow.util.Preconditions;
@@ -22,23 +21,26 @@
 import org.apache.arrow.vector.ValueVector;
 
 /**
- * An out-of-place sorter for vectors of arbitrary type, with time complexity O(n*log(n)).
- * Since it does not make any assumptions about the memory layout of the vector, its performance
- * can be sub-optimal. So if another sorter is applicable ({@link FixedWidthInPlaceVectorSorter}),
- * it should be used in preference.
+ * An out-of-place sorter for vectors of arbitrary type, with time complexity O(n*log(n)). Since it
+ * does not make any assumptions about the memory layout of the vector, its performance can be
+ * sub-optimal. So if another sorter is applicable ({@link FixedWidthInPlaceVectorSorter}), it
+ * should be used in preference.
  *
  * @param <V> vector type.
  */
-public class GeneralOutOfPlaceVectorSorter<V extends ValueVector> implements OutOfPlaceVectorSorter<V> {
+public class GeneralOutOfPlaceVectorSorter<V extends ValueVector>
+    implements OutOfPlaceVectorSorter<V> {
 
   @Override
   public void sortOutOfPlace(V srcVector, V dstVector, VectorValueComparator<V> comparator) {
     comparator.attachVector(srcVector);
 
     // check vector capacity
-    Preconditions.checkArgument(dstVector.getValueCapacity() >= srcVector.getValueCount(),
-        "Not enough capacity for the target vector. " +
-            "Expected capacity %s, actual capacity %s", srcVector.getValueCount(), dstVector.getValueCapacity());
+    Preconditions.checkArgument(
+        dstVector.getValueCapacity() >= srcVector.getValueCount(),
+        "Not enough capacity for the target vector. " + "Expected capacity %s, actual capacity %s",
+        srcVector.getValueCount(),
+        dstVector.getValueCapacity());
 
     // sort value indices
     try (IntVector sortedIndices = new IntVector("", srcVector.getAllocator())) {
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/InPlaceVectorSorter.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/InPlaceVectorSorter.java
index 19817fe76b8ec..ba41bb9e4eac7 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/InPlaceVectorSorter.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/InPlaceVectorSorter.java
@@ -14,15 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import org.apache.arrow.vector.ValueVector;
 
 /**
- * Basic interface for sorting a vector in-place.
- * That is, the sorting is performed by modifying the input vector,
- * without creating a new sorted vector.
+ * Basic interface for sorting a vector in-place. That is, the sorting is performed by modifying the
+ * input vector, without creating a new sorted vector.
  *
  * @param <V> the vector type.
  */
@@ -30,6 +28,7 @@ public interface InPlaceVectorSorter<V extends ValueVector> {
 
   /**
    * Sort a vector in-place.
+   *
    * @param vec the vector to sort.
    * @param comparator the criteria for sort.
    */
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/IndexSorter.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/IndexSorter.java
index 3072717f43123..b8ce3289d2889 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/IndexSorter.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/IndexSorter.java
@@ -14,39 +14,35 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import java.util.stream.IntStream;
-
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.ValueVector;
 
 /**
  * Sorter for the indices of a vector.
+ *
  * @param <V> vector type.
  */
 public class IndexSorter<V extends ValueVector> {
 
   /**
-   * If the number of items is smaller than this threshold, we will use another algorithm to sort the data.
+   * If the number of items is smaller than this threshold, we will use another algorithm to sort
+   * the data.
    */
   public static final int CHANGE_ALGORITHM_THRESHOLD = 15;
 
-  /**
-   * Comparator for vector indices.
-   */
+  /** Comparator for vector indices. */
   private VectorValueComparator<V> comparator;
 
-  /**
-   * Vector indices to sort.
-   */
+  /** Vector indices to sort. */
   private IntVector indices;
 
   /**
-   * Sorts indices, by quick-sort. Suppose the vector is denoted by v.
-   * After calling this method, the following relations hold:
-   * v(indices[0]) <= v(indices[1]) <= ...
+   * Sorts indices, by quick-sort. Suppose the vector is denoted by v. After calling this method,
+   * the following relations hold: v(indices[0]) <= v(indices[1]) <= ...
+   *
    * @param vector the vector whose indices need to be sorted.
    * @param indices the vector for storing the sorted indices.
    * @param comparator the comparator to sort indices.
@@ -100,11 +96,9 @@ private void quickSort() {
     }
   }
 
-  /**
-   *  Select the pivot as the median of 3 samples.
-   */
+  /** Select the pivot as the median of 3 samples. */
   static <T extends ValueVector> int choosePivot(
-          int low, int high, IntVector indices, VectorValueComparator<T> comparator) {
+      int low, int high, IntVector indices, VectorValueComparator<T> comparator) {
     // we need at least 3 items
     if (high - low + 1 < FixedWidthInPlaceVectorSorter.STOP_CHOOSING_PIVOT_THRESHOLD) {
       return indices.get(low);
@@ -149,8 +143,9 @@ static <T extends ValueVector> int choosePivot(
 
   /**
    * Partition a range of values in a vector into two parts, with elements in one part smaller than
-   * elements from the other part. The partition is based on the element indices, so it does
-   * not modify the underlying vector.
+   * elements from the other part. The partition is based on the element indices, so it does not
+   * modify the underlying vector.
+   *
    * @param low the lower bound of the range.
    * @param high the upper bound of the range.
    * @param indices vector element indices.
@@ -159,7 +154,7 @@ static <T extends ValueVector> int choosePivot(
    * @return the index of the split point.
    */
   public static <T extends ValueVector> int partition(
-          int low, int high, IntVector indices, VectorValueComparator<T> comparator) {
+      int low, int high, IntVector indices, VectorValueComparator<T> comparator) {
     int pivotIndex = choosePivot(low, high, indices, comparator);
 
     while (low < high) {
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/InsertionSorter.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/InsertionSorter.java
index dc12a5fefdb65..c058636d66d1e 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/InsertionSorter.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/InsertionSorter.java
@@ -14,27 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import org.apache.arrow.vector.BaseFixedWidthVector;
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.ValueVector;
 
-/**
- * Insertion sorter.
- */
+/** Insertion sorter. */
 class InsertionSorter {
 
   /**
    * Sorts the range of a vector by insertion sort.
    *
-   * @param vector     the vector to be sorted.
-   * @param startIdx   the start index of the range (inclusive).
-   * @param endIdx     the end index of the range (inclusive).
-   * @param buffer     an extra buffer with capacity 1 to hold the current key.
+   * @param vector the vector to be sorted.
+   * @param startIdx the start index of the range (inclusive).
+   * @param endIdx the end index of the range (inclusive).
+   * @param buffer an extra buffer with capacity 1 to hold the current key.
    * @param comparator the criteria for vector element comparison.
-   * @param <V>        the vector type.
+   * @param <V> the vector type.
    */
   static <V extends BaseFixedWidthVector> void insertionSort(
       V vector, int startIdx, int endIdx, VectorValueComparator<V> comparator, V buffer) {
@@ -53,11 +50,11 @@ static <V extends BaseFixedWidthVector> void insertionSort(
   /**
    * Sorts the range of vector indices by insertion sort.
    *
-   * @param indices    the vector  indices.
-   * @param startIdx   the start index of the range (inclusive).
-   * @param endIdx     the end index of the range (inclusive).
+   * @param indices the vector indices.
+   * @param startIdx the start index of the range (inclusive).
+   * @param endIdx the end index of the range (inclusive).
    * @param comparator the criteria for vector element comparison.
-   * @param <V>        the vector type.
+   * @param <V> the vector type.
    */
   static <V extends ValueVector> void insertionSort(
       IntVector indices, int startIdx, int endIdx, VectorValueComparator<V> comparator) {
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/OffHeapIntStack.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/OffHeapIntStack.java
index df96121f1f8f7..ccb7bea4e2bd3 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/OffHeapIntStack.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/OffHeapIntStack.java
@@ -14,15 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.IntVector;
 
-/**
- * An off heap implementation of stack with int elements.
- */
+/** An off heap implementation of stack with int elements. */
 class OffHeapIntStack implements AutoCloseable {
 
   private static final int INIT_SIZE = 128;
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/OutOfPlaceVectorSorter.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/OutOfPlaceVectorSorter.java
index 41d6dadc49147..b18e9b35d0895 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/OutOfPlaceVectorSorter.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/OutOfPlaceVectorSorter.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import org.apache.arrow.vector.ValueVector;
 
 /**
- * Basic interface for sorting a vector out-of-place.
- * That is, the sorting is performed on a newly-created vector,
- * and the original vector is not modified.
+ * Basic interface for sorting a vector out-of-place. That is, the sorting is performed on a
+ * newly-created vector, and the original vector is not modified.
+ *
  * @param <V> the vector type.
  */
 public interface OutOfPlaceVectorSorter<V extends ValueVector> {
 
   /**
    * Sort a vector out-of-place.
+   *
    * @param inVec the input vector.
    * @param outVec the output vector, which has the same size as the input vector.
    * @param comparator the criteria for sort.
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/StableVectorComparator.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/StableVectorComparator.java
index 0b0c3bd55b271..3fcfa5f8f215c 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/StableVectorComparator.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/StableVectorComparator.java
@@ -14,17 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.ValueVector;
 
 /**
- * Stable sorter. It compares values like ordinary comparators.
- * However, when values are equal, it breaks ties by the value indices.
- * Therefore, sort algorithms using this comparator always produce
+ * Stable sorter. It compares values like ordinary comparators. However, when values are equal, it
+ * breaks ties by the value indices. Therefore, sort algorithms using this comparator always produce
  * stable sort results.
+ *
  * @param <V> type of the vector.
  */
 public class StableVectorComparator<V extends ValueVector> extends VectorValueComparator<V> {
@@ -33,6 +32,7 @@ public class StableVectorComparator<V extends ValueVector> extends VectorValueCo
 
   /**
    * Constructs a stable comparator from a given comparator.
+   *
    * @param innerComparator the comparator to convert to stable comparator..
    */
   public StableVectorComparator(VectorValueComparator<V> innerComparator) {
@@ -47,8 +47,9 @@ public void attachVector(V vector) {
 
   @Override
   public void attachVectors(V vector1, V vector2) {
-    Preconditions.checkArgument(vector1 == vector2,
-            "Stable comparator only supports comparing values from the same vector");
+    Preconditions.checkArgument(
+        vector1 == vector2,
+        "Stable comparator only supports comparing values from the same vector");
     super.attachVectors(vector1, vector2);
     innerComparator.attachVectors(vector1, vector2);
   }
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VariableWidthOutOfPlaceVectorSorter.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VariableWidthOutOfPlaceVectorSorter.java
index 863b07c348ef2..8f58dc0dcee0f 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VariableWidthOutOfPlaceVectorSorter.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VariableWidthOutOfPlaceVectorSorter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import org.apache.arrow.memory.ArrowBuf;
@@ -25,12 +24,13 @@
 import org.apache.arrow.vector.IntVector;
 
 /**
- * Default sorter for variable-width vectors.
- * It is an out-of-place sort, with time complexity O(n*log(n)).
+ * Default sorter for variable-width vectors. It is an out-of-place sort, with time complexity
+ * O(n*log(n)).
+ *
  * @param <V> vector type.
  */
 public class VariableWidthOutOfPlaceVectorSorter<V extends BaseVariableWidthVector>
-        implements OutOfPlaceVectorSorter<V> {
+    implements OutOfPlaceVectorSorter<V> {
 
   protected IndexSorter<V> indexSorter = new IndexSorter<>();
 
@@ -46,20 +46,29 @@ public void sortOutOfPlace(V srcVector, V dstVector, VectorValueComparator<V> co
     ArrowBuf dstOffsetBuffer = dstVector.getOffsetBuffer();
 
     // check buffer size
-    Preconditions.checkArgument(dstValidityBuffer.capacity() * 8 >= srcVector.getValueCount(),
-        "Not enough capacity for the validity buffer of the dst vector. " +
-            "Expected capacity %s, actual capacity %s",
-        (srcVector.getValueCount() + 7) / 8, dstValidityBuffer.capacity());
     Preconditions.checkArgument(
-        dstOffsetBuffer.capacity() >= (srcVector.getValueCount() + 1) * ((long) BaseVariableWidthVector.OFFSET_WIDTH),
-        "Not enough capacity for the offset buffer of the dst vector. " +
-            "Expected capacity %s, actual capacity %s",
-        (srcVector.getValueCount() + 1) * BaseVariableWidthVector.OFFSET_WIDTH, dstOffsetBuffer.capacity());
-    long dataSize = srcVector.getOffsetBuffer().getInt(
-        srcVector.getValueCount() * ((long) BaseVariableWidthVector.OFFSET_WIDTH));
+        dstValidityBuffer.capacity() * 8 >= srcVector.getValueCount(),
+        "Not enough capacity for the validity buffer of the dst vector. "
+            + "Expected capacity %s, actual capacity %s",
+        (srcVector.getValueCount() + 7) / 8,
+        dstValidityBuffer.capacity());
+    Preconditions.checkArgument(
+        dstOffsetBuffer.capacity()
+            >= (srcVector.getValueCount() + 1) * ((long) BaseVariableWidthVector.OFFSET_WIDTH),
+        "Not enough capacity for the offset buffer of the dst vector. "
+            + "Expected capacity %s, actual capacity %s",
+        (srcVector.getValueCount() + 1) * BaseVariableWidthVector.OFFSET_WIDTH,
+        dstOffsetBuffer.capacity());
+    long dataSize =
+        srcVector
+            .getOffsetBuffer()
+            .getInt(srcVector.getValueCount() * ((long) BaseVariableWidthVector.OFFSET_WIDTH));
     Preconditions.checkArgument(
-        dstValueBuffer.capacity() >= dataSize, "No enough capacity for the data buffer of the dst vector. " +
-            "Expected capacity %s, actual capacity %s", dataSize, dstValueBuffer.capacity());
+        dstValueBuffer.capacity() >= dataSize,
+        "No enough capacity for the data buffer of the dst vector. "
+            + "Expected capacity %s, actual capacity %s",
+        dataSize,
+        dstValueBuffer.capacity());
 
     // sort value indices
     try (IntVector sortedIndices = new IntVector("", srcVector.getAllocator())) {
@@ -77,16 +86,19 @@ public void sortOutOfPlace(V srcVector, V dstVector, VectorValueComparator<V> co
           BitVectorHelper.unsetBit(dstValidityBuffer, dstIndex);
         } else {
           BitVectorHelper.setBit(dstValidityBuffer, dstIndex);
-          int srcOffset = srcOffsetBuffer.getInt(srcIndex * ((long) BaseVariableWidthVector.OFFSET_WIDTH));
+          int srcOffset =
+              srcOffsetBuffer.getInt(srcIndex * ((long) BaseVariableWidthVector.OFFSET_WIDTH));
           int valueLength =
-              srcOffsetBuffer.getInt((srcIndex + 1) * ((long) BaseVariableWidthVector.OFFSET_WIDTH)) - srcOffset;
+              srcOffsetBuffer.getInt((srcIndex + 1) * ((long) BaseVariableWidthVector.OFFSET_WIDTH))
+                  - srcOffset;
           MemoryUtil.UNSAFE.copyMemory(
-                  srcValueBuffer.memoryAddress() + srcOffset,
-                  dstValueBuffer.memoryAddress() + dstOffset,
-                  valueLength);
+              srcValueBuffer.memoryAddress() + srcOffset,
+              dstValueBuffer.memoryAddress() + dstOffset,
+              valueLength);
           dstOffset += valueLength;
         }
-        dstOffsetBuffer.setInt((dstIndex + 1) * ((long) BaseVariableWidthVector.OFFSET_WIDTH), dstOffset);
+        dstOffsetBuffer.setInt(
+            (dstIndex + 1) * ((long) BaseVariableWidthVector.OFFSET_WIDTH), dstOffset);
       }
     }
   }
diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VectorValueComparator.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VectorValueComparator.java
index d2c772ca8a819..0472f04109b1c 100644
--- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VectorValueComparator.java
+++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VectorValueComparator.java
@@ -14,54 +14,44 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import org.apache.arrow.vector.ValueVector;
 
 /**
- * Compare two values at the given indices in the vectors.
- * This is used for vector sorting.
+ * Compare two values at the given indices in the vectors. This is used for vector sorting.
+ *
  * @param <V> type of the vector.
  */
 public abstract class VectorValueComparator<V extends ValueVector> {
 
-  /**
-   * The first vector to compare.
-   */
+  /** The first vector to compare. */
   protected V vector1;
 
-  /**
-   * The second vector to compare.
-   */
+  /** The second vector to compare. */
   protected V vector2;
 
-  /**
-   * Width of the vector value. For variable-length vectors, this value makes no sense.
-   */
+  /** Width of the vector value. For variable-length vectors, this value makes no sense. */
   protected int valueWidth;
 
-
   private boolean checkNullsOnCompare = true;
 
   /**
-   * This value is true by default and re-computed when vectors are attached to the comparator. If both vectors cannot
-   * contain nulls then this value is {@code false} and calls to {@code compare(i1, i2)} are short-circuited
-   * to {@code compareNotNull(i1, i2)} thereby speeding up comparisons resulting in faster sorts etc.
+   * This value is true by default and re-computed when vectors are attached to the comparator. If
+   * both vectors cannot contain nulls then this value is {@code false} and calls to {@code
+   * compare(i1, i2)} are short-circuited to {@code compareNotNull(i1, i2)} thereby speeding up
+   * comparisons resulting in faster sorts etc.
    */
   public boolean checkNullsOnCompare() {
     return this.checkNullsOnCompare;
   }
 
-  /**
-   * Constructor for variable-width vectors.
-   */
-  protected VectorValueComparator() {
-
-  }
+  /** Constructor for variable-width vectors. */
+  protected VectorValueComparator() {}
 
   /**
    * Constructor for fixed-width vectors.
+   *
    * @param valueWidth the record width (in bytes).
    */
   protected VectorValueComparator(int valueWidth) {
@@ -74,6 +64,7 @@ public int getValueWidth() {
 
   /**
    * Attach both vectors to compare to the same input vector.
+   *
    * @param vector the vector to attach.
    */
   public void attachVector(V vector) {
@@ -82,6 +73,7 @@ public void attachVector(V vector) {
 
   /**
    * Attach vectors to compare.
+   *
    * @param vector1 the first vector to compare.
    * @param vector2 the second vector to compare.
    */
@@ -99,7 +91,7 @@ private boolean mayHaveNulls(V v) {
     if (v.getValueCount() == 0) {
       return true;
     }
-    if (! v.getField().isNullable()) {
+    if (!v.getField().isNullable()) {
       return false;
     }
     return v.getNullCount() > 0;
@@ -107,11 +99,11 @@ private boolean mayHaveNulls(V v) {
 
   /**
    * Compare two values, given their indices.
+   *
    * @param index1 index of the first value to compare.
    * @param index2 index of the second value to compare.
-   * @return an integer greater than 0, if the first value is greater;
-   *     an integer smaller than 0, if the first value is smaller; or 0, if both
-   *     values are equal.
+   * @return an integer greater than 0, if the first value is greater; an integer smaller than 0, if
+   *     the first value is smaller; or 0, if both values are equal.
    */
   public int compare(int index1, int index2) {
     if (checkNullsOnCompare) {
@@ -133,19 +125,19 @@ public int compare(int index1, int index2) {
   }
 
   /**
-   * Compare two values, given their indices.
-   * This is a fast path for comparing non-null values, so the caller
-   * must make sure that values at both indices are not null.
+   * Compare two values, given their indices. This is a fast path for comparing non-null values, so
+   * the caller must make sure that values at both indices are not null.
+   *
    * @param index1 index of the first value to compare.
    * @param index2 index of the second value to compare.
-   * @return an integer greater than 0, if the first value is greater;
-   *     an integer smaller than 0, if the first value is smaller; or 0, if both
-   *     values are equal.
+   * @return an integer greater than 0, if the first value is greater; an integer smaller than 0, if
+   *     the first value is smaller; or 0, if both values are equal.
    */
   public abstract int compareNotNull(int index1, int index2);
 
   /**
    * Creates a comparator of the same type.
+   *
    * @return the newly created comparator.
    */
   public abstract VectorValueComparator<V> createNew();
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestDeduplicationUtils.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestDeduplicationUtils.java
index ac083b84f1611..49a719bafa237 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestDeduplicationUtils.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestDeduplicationUtils.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.deduplicate;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.nio.charset.StandardCharsets;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -29,13 +27,11 @@
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.arrow.vector.util.DataSizeRoundingUtil;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link DeduplicationUtils}.
- */
+/** Test cases for {@link DeduplicationUtils}. */
 public class TestDeduplicationUtils {
 
   private static final int VECTOR_LENGTH = 100;
@@ -44,12 +40,12 @@ public class TestDeduplicationUtils {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -57,10 +53,11 @@ public void shutdown() {
   @Test
   public void testDeduplicateFixedWidth() {
     try (IntVector origVec = new IntVector("original vec", allocator);
-         IntVector dedupVec = new IntVector("deduplicated vec", allocator);
-         IntVector lengthVec = new IntVector("length vec", allocator);
-         ArrowBuf distinctBuf = allocator.buffer(
-                 DataSizeRoundingUtil.divideBy8Ceil(VECTOR_LENGTH * REPETITION_COUNT))) {
+        IntVector dedupVec = new IntVector("deduplicated vec", allocator);
+        IntVector lengthVec = new IntVector("length vec", allocator);
+        ArrowBuf distinctBuf =
+            allocator.buffer(
+                DataSizeRoundingUtil.divideBy8Ceil(VECTOR_LENGTH * REPETITION_COUNT))) {
       origVec.allocateNew(VECTOR_LENGTH * REPETITION_COUNT);
       origVec.setValueCount(VECTOR_LENGTH * REPETITION_COUNT);
       lengthVec.allocateNew();
@@ -73,9 +70,10 @@ public void testDeduplicateFixedWidth() {
       }
 
       DeduplicationUtils.populateRunStartIndicators(origVec, distinctBuf);
-      assertEquals( VECTOR_LENGTH,
-              VECTOR_LENGTH * REPETITION_COUNT -
-                      BitVectorHelper.getNullCount(distinctBuf, VECTOR_LENGTH * REPETITION_COUNT));
+      assertEquals(
+          VECTOR_LENGTH,
+          VECTOR_LENGTH * REPETITION_COUNT
+              - BitVectorHelper.getNullCount(distinctBuf, VECTOR_LENGTH * REPETITION_COUNT));
 
       DeduplicationUtils.populateDeduplicatedValues(distinctBuf, origVec, dedupVec);
       assertEquals(VECTOR_LENGTH, dedupVec.getValueCount());
@@ -84,7 +82,8 @@ public void testDeduplicateFixedWidth() {
         assertEquals(i, dedupVec.get(i));
       }
 
-      DeduplicationUtils.populateRunLengths(distinctBuf, lengthVec, VECTOR_LENGTH * REPETITION_COUNT);
+      DeduplicationUtils.populateRunLengths(
+          distinctBuf, lengthVec, VECTOR_LENGTH * REPETITION_COUNT);
       assertEquals(VECTOR_LENGTH, lengthVec.getValueCount());
 
       for (int i = 0; i < VECTOR_LENGTH; i++) {
@@ -96,12 +95,12 @@ public void testDeduplicateFixedWidth() {
   @Test
   public void testDeduplicateVariableWidth() {
     try (VarCharVector origVec = new VarCharVector("original vec", allocator);
-         VarCharVector dedupVec = new VarCharVector("deduplicated vec", allocator);
-         IntVector lengthVec = new IntVector("length vec", allocator);
-         ArrowBuf distinctBuf = allocator.buffer(
-                 DataSizeRoundingUtil.divideBy8Ceil(VECTOR_LENGTH * REPETITION_COUNT))) {
-      origVec.allocateNew(
-              VECTOR_LENGTH * REPETITION_COUNT * 10, VECTOR_LENGTH * REPETITION_COUNT);
+        VarCharVector dedupVec = new VarCharVector("deduplicated vec", allocator);
+        IntVector lengthVec = new IntVector("length vec", allocator);
+        ArrowBuf distinctBuf =
+            allocator.buffer(
+                DataSizeRoundingUtil.divideBy8Ceil(VECTOR_LENGTH * REPETITION_COUNT))) {
+      origVec.allocateNew(VECTOR_LENGTH * REPETITION_COUNT * 10, VECTOR_LENGTH * REPETITION_COUNT);
       origVec.setValueCount(VECTOR_LENGTH * REPETITION_COUNT);
       lengthVec.allocateNew();
 
@@ -114,9 +113,10 @@ public void testDeduplicateVariableWidth() {
       }
 
       DeduplicationUtils.populateRunStartIndicators(origVec, distinctBuf);
-      assertEquals(VECTOR_LENGTH,
-              VECTOR_LENGTH * REPETITION_COUNT -
-                      BitVectorHelper.getNullCount(distinctBuf, VECTOR_LENGTH * REPETITION_COUNT));
+      assertEquals(
+          VECTOR_LENGTH,
+          VECTOR_LENGTH * REPETITION_COUNT
+              - BitVectorHelper.getNullCount(distinctBuf, VECTOR_LENGTH * REPETITION_COUNT));
 
       DeduplicationUtils.populateDeduplicatedValues(distinctBuf, origVec, dedupVec);
       assertEquals(VECTOR_LENGTH, dedupVec.getValueCount());
@@ -126,7 +126,7 @@ public void testDeduplicateVariableWidth() {
       }
 
       DeduplicationUtils.populateRunLengths(
-              distinctBuf, lengthVec, VECTOR_LENGTH * REPETITION_COUNT);
+          distinctBuf, lengthVec, VECTOR_LENGTH * REPETITION_COUNT);
       assertEquals(VECTOR_LENGTH, lengthVec.getValueCount());
 
       for (int i = 0; i < VECTOR_LENGTH; i++) {
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestVectorRunDeduplicator.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestVectorRunDeduplicator.java
index 788213b162870..7fd816ee9f9ed 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestVectorRunDeduplicator.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestVectorRunDeduplicator.java
@@ -14,25 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.deduplicate;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.nio.charset.StandardCharsets;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.VarCharVector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link VectorRunDeduplicator}.
- */
+/** Test cases for {@link VectorRunDeduplicator}. */
 public class TestVectorRunDeduplicator {
 
   private static final int VECTOR_LENGTH = 100;
@@ -41,12 +37,12 @@ public class TestVectorRunDeduplicator {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -57,7 +53,7 @@ public void testDeduplicateFixedWidth() {
         IntVector dedupVec = new IntVector("deduplicated vec", allocator);
         IntVector lengthVec = new IntVector("length vec", allocator);
         VectorRunDeduplicator<IntVector> deduplicator =
-                 new VectorRunDeduplicator<>(origVec, allocator)) {
+            new VectorRunDeduplicator<>(origVec, allocator)) {
       origVec.allocateNew(VECTOR_LENGTH * REPETITION_COUNT);
       origVec.setValueCount(VECTOR_LENGTH * REPETITION_COUNT);
       lengthVec.allocateNew();
@@ -93,12 +89,11 @@ public void testDeduplicateFixedWidth() {
   @Test
   public void testDeduplicateVariableWidth() {
     try (VarCharVector origVec = new VarCharVector("original vec", allocator);
-         VarCharVector dedupVec = new VarCharVector("deduplicated vec", allocator);
-         IntVector lengthVec = new IntVector("length vec", allocator);
-         VectorRunDeduplicator<VarCharVector> deduplicator =
-                 new VectorRunDeduplicator<>(origVec, allocator)) {
-      origVec.allocateNew(
-              VECTOR_LENGTH * REPETITION_COUNT * 10, VECTOR_LENGTH * REPETITION_COUNT);
+        VarCharVector dedupVec = new VarCharVector("deduplicated vec", allocator);
+        IntVector lengthVec = new IntVector("length vec", allocator);
+        VectorRunDeduplicator<VarCharVector> deduplicator =
+            new VectorRunDeduplicator<>(origVec, allocator)) {
+      origVec.allocateNew(VECTOR_LENGTH * REPETITION_COUNT * 10, VECTOR_LENGTH * REPETITION_COUNT);
       origVec.setValueCount(VECTOR_LENGTH * REPETITION_COUNT);
       lengthVec.allocateNew();
 
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestHashTableBasedDictionaryBuilder.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestHashTableBasedDictionaryBuilder.java
index 45c47626b720e..6e438c7ee2179 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestHashTableBasedDictionaryBuilder.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestHashTableBasedDictionaryBuilder.java
@@ -14,37 +14,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.dictionary;
 
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertNull;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.VarCharVector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link HashTableBasedDictionaryBuilder}.
- */
+/** Test cases for {@link HashTableBasedDictionaryBuilder}. */
 public class TestHashTableBasedDictionaryBuilder {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -52,7 +48,7 @@ public void shutdown() {
   @Test
   public void testBuildVariableWidthDictionaryWithNull() {
     try (VarCharVector vec = new VarCharVector("", allocator);
-         VarCharVector dictionary = new VarCharVector("", allocator)) {
+        VarCharVector dictionary = new VarCharVector("", allocator)) {
 
       vec.allocateNew(100, 10);
       vec.setValueCount(10);
@@ -72,27 +68,34 @@ public void testBuildVariableWidthDictionaryWithNull() {
       vec.set(9, "abc".getBytes(StandardCharsets.UTF_8));
 
       HashTableBasedDictionaryBuilder<VarCharVector> dictionaryBuilder =
-              new HashTableBasedDictionaryBuilder<>(dictionary, true);
+          new HashTableBasedDictionaryBuilder<>(dictionary, true);
 
       int result = dictionaryBuilder.addValues(vec);
 
       assertEquals(7, result);
       assertEquals(7, dictionary.getValueCount());
 
-      assertEquals("hello", new String(Objects.requireNonNull(dictionary.get(0)), StandardCharsets.UTF_8));
-      assertEquals("abc", new String(Objects.requireNonNull(dictionary.get(1)), StandardCharsets.UTF_8));
+      assertEquals(
+          "hello", new String(Objects.requireNonNull(dictionary.get(0)), StandardCharsets.UTF_8));
+      assertEquals(
+          "abc", new String(Objects.requireNonNull(dictionary.get(1)), StandardCharsets.UTF_8));
       assertNull(dictionary.get(2));
-      assertEquals("world", new String(Objects.requireNonNull(dictionary.get(3)), StandardCharsets.UTF_8));
-      assertEquals("12", new String(Objects.requireNonNull(dictionary.get(4)), StandardCharsets.UTF_8));
-      assertEquals("dictionary", new String(Objects.requireNonNull(dictionary.get(5)), StandardCharsets.UTF_8));
-      assertEquals("good", new String(Objects.requireNonNull(dictionary.get(6)), StandardCharsets.UTF_8));
+      assertEquals(
+          "world", new String(Objects.requireNonNull(dictionary.get(3)), StandardCharsets.UTF_8));
+      assertEquals(
+          "12", new String(Objects.requireNonNull(dictionary.get(4)), StandardCharsets.UTF_8));
+      assertEquals(
+          "dictionary",
+          new String(Objects.requireNonNull(dictionary.get(5)), StandardCharsets.UTF_8));
+      assertEquals(
+          "good", new String(Objects.requireNonNull(dictionary.get(6)), StandardCharsets.UTF_8));
     }
   }
 
   @Test
   public void testBuildVariableWidthDictionaryWithoutNull() {
     try (VarCharVector vec = new VarCharVector("", allocator);
-         VarCharVector dictionary = new VarCharVector("", allocator)) {
+        VarCharVector dictionary = new VarCharVector("", allocator)) {
 
       vec.allocateNew(100, 10);
       vec.setValueCount(10);
@@ -112,27 +115,33 @@ public void testBuildVariableWidthDictionaryWithoutNull() {
       vec.set(9, "abc".getBytes(StandardCharsets.UTF_8));
 
       HashTableBasedDictionaryBuilder<VarCharVector> dictionaryBuilder =
-              new HashTableBasedDictionaryBuilder<>(dictionary, false);
+          new HashTableBasedDictionaryBuilder<>(dictionary, false);
 
       int result = dictionaryBuilder.addValues(vec);
 
       assertEquals(6, result);
       assertEquals(6, dictionary.getValueCount());
 
-      assertEquals("hello", new String(Objects.requireNonNull(dictionary.get(0)), StandardCharsets.UTF_8));
-      assertEquals("abc", new String(Objects.requireNonNull(dictionary.get(1)), StandardCharsets.UTF_8));
-      assertEquals("world", new String(Objects.requireNonNull(dictionary.get(2)), StandardCharsets.UTF_8));
-      assertEquals("12", new String(Objects.requireNonNull(dictionary.get(3)), StandardCharsets.UTF_8));
-      assertEquals("dictionary", new String(Objects.requireNonNull(dictionary.get(4)), StandardCharsets.UTF_8));
-      assertEquals("good", new String(Objects.requireNonNull(dictionary.get(5)), StandardCharsets.UTF_8));
-
+      assertEquals(
+          "hello", new String(Objects.requireNonNull(dictionary.get(0)), StandardCharsets.UTF_8));
+      assertEquals(
+          "abc", new String(Objects.requireNonNull(dictionary.get(1)), StandardCharsets.UTF_8));
+      assertEquals(
+          "world", new String(Objects.requireNonNull(dictionary.get(2)), StandardCharsets.UTF_8));
+      assertEquals(
+          "12", new String(Objects.requireNonNull(dictionary.get(3)), StandardCharsets.UTF_8));
+      assertEquals(
+          "dictionary",
+          new String(Objects.requireNonNull(dictionary.get(4)), StandardCharsets.UTF_8));
+      assertEquals(
+          "good", new String(Objects.requireNonNull(dictionary.get(5)), StandardCharsets.UTF_8));
     }
   }
 
   @Test
   public void testBuildFixedWidthDictionaryWithNull() {
     try (IntVector vec = new IntVector("", allocator);
-         IntVector dictionary = new IntVector("", allocator)) {
+        IntVector dictionary = new IntVector("", allocator)) {
       vec.allocateNew(10);
       vec.setValueCount(10);
 
@@ -151,7 +160,7 @@ public void testBuildFixedWidthDictionaryWithNull() {
       vec.setNull(9);
 
       HashTableBasedDictionaryBuilder<IntVector> dictionaryBuilder =
-              new HashTableBasedDictionaryBuilder<>(dictionary, true);
+          new HashTableBasedDictionaryBuilder<>(dictionary, true);
 
       int result = dictionaryBuilder.addValues(vec);
 
@@ -169,7 +178,7 @@ public void testBuildFixedWidthDictionaryWithNull() {
   @Test
   public void testBuildFixedWidthDictionaryWithoutNull() {
     try (IntVector vec = new IntVector("", allocator);
-         IntVector dictionary = new IntVector("", allocator)) {
+        IntVector dictionary = new IntVector("", allocator)) {
       vec.allocateNew(10);
       vec.setValueCount(10);
 
@@ -188,7 +197,7 @@ public void testBuildFixedWidthDictionaryWithoutNull() {
       vec.setNull(9);
 
       HashTableBasedDictionaryBuilder<IntVector> dictionaryBuilder =
-              new HashTableBasedDictionaryBuilder<>(dictionary, false);
+          new HashTableBasedDictionaryBuilder<>(dictionary, false);
 
       int result = dictionaryBuilder.addValues(vec);
 
@@ -199,7 +208,6 @@ public void testBuildFixedWidthDictionaryWithoutNull() {
       assertEquals(8, dictionary.get(1));
       assertEquals(32, dictionary.get(2));
       assertEquals(16, dictionary.get(3));
-
     }
   }
 }
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestHashTableDictionaryEncoder.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestHashTableDictionaryEncoder.java
index 60efbf58bebda..0f5ea463bd178 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestHashTableDictionaryEncoder.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestHashTableDictionaryEncoder.java
@@ -14,18 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.dictionary;
 
-import static junit.framework.TestCase.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Random;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
@@ -34,13 +32,11 @@
 import org.apache.arrow.vector.dictionary.Dictionary;
 import org.apache.arrow.vector.dictionary.DictionaryEncoder;
 import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link HashTableDictionaryEncoder}.
- */
+/** Test cases for {@link HashTableDictionaryEncoder}. */
 public class TestHashTableDictionaryEncoder {
 
   private final int VECTOR_LENGTH = 50;
@@ -53,14 +49,14 @@ public class TestHashTableDictionaryEncoder {
   byte[] one = "111".getBytes(StandardCharsets.UTF_8);
   byte[] two = "222".getBytes(StandardCharsets.UTF_8);
 
-  byte[][] data = new byte[][]{zero, one, two};
+  byte[][] data = new byte[][] {zero, one, two};
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -69,8 +65,8 @@ public void shutdown() {
   public void testEncodeAndDecode() {
     Random random = new Random();
     try (VarCharVector rawVector = new VarCharVector("original vector", allocator);
-         IntVector encodedVector = new IntVector("encoded vector", allocator);
-         VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
+        IntVector encodedVector = new IntVector("encoded vector", allocator);
+        VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
 
       // set up dictionary
       dictionary.allocateNew();
@@ -89,7 +85,7 @@ public void testEncodeAndDecode() {
       rawVector.setValueCount(VECTOR_LENGTH);
 
       HashTableDictionaryEncoder<IntVector, VarCharVector> encoder =
-              new HashTableDictionaryEncoder<>(dictionary, false);
+          new HashTableDictionaryEncoder<>(dictionary, false);
 
       // perform encoding
       encodedVector.allocateNew();
@@ -98,17 +94,21 @@ public void testEncodeAndDecode() {
       // verify encoding results
       assertEquals(rawVector.getValueCount(), encodedVector.getValueCount());
       for (int i = 0; i < VECTOR_LENGTH; i++) {
-        assertArrayEquals(rawVector.get(i), String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8));
+        assertArrayEquals(
+            rawVector.get(i),
+            String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8));
       }
 
       // perform decoding
       Dictionary dict = new Dictionary(dictionary, new DictionaryEncoding(1L, false, null));
-      try (VarCharVector decodedVector = (VarCharVector) DictionaryEncoder.decode(encodedVector, dict)) {
+      try (VarCharVector decodedVector =
+          (VarCharVector) DictionaryEncoder.decode(encodedVector, dict)) {
 
         // verify decoding results
         assertEquals(encodedVector.getValueCount(), decodedVector.getValueCount());
         for (int i = 0; i < VECTOR_LENGTH; i++) {
-          assertArrayEquals(String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8),
+          assertArrayEquals(
+              String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8),
               decodedVector.get(i));
         }
       }
@@ -119,8 +119,8 @@ public void testEncodeAndDecode() {
   public void testEncodeAndDecodeWithNull() {
     Random random = new Random();
     try (VarCharVector rawVector = new VarCharVector("original vector", allocator);
-         IntVector encodedVector = new IntVector("encoded vector", allocator);
-         VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
+        IntVector encodedVector = new IntVector("encoded vector", allocator);
+        VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
 
       // set up dictionary
       dictionary.allocateNew();
@@ -144,7 +144,7 @@ public void testEncodeAndDecodeWithNull() {
       rawVector.setValueCount(VECTOR_LENGTH);
 
       HashTableDictionaryEncoder<IntVector, VarCharVector> encoder =
-              new HashTableDictionaryEncoder<>(dictionary, true);
+          new HashTableDictionaryEncoder<>(dictionary, true);
 
       // perform encoding
       encodedVector.allocateNew();
@@ -156,20 +156,24 @@ public void testEncodeAndDecodeWithNull() {
         if (i % 10 == 0) {
           assertEquals(0, encodedVector.get(i));
         } else {
-          assertArrayEquals(rawVector.get(i), String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8));
+          assertArrayEquals(
+              rawVector.get(i),
+              String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8));
         }
       }
 
       // perform decoding
       Dictionary dict = new Dictionary(dictionary, new DictionaryEncoding(1L, false, null));
-      try (VarCharVector decodedVector = (VarCharVector) DictionaryEncoder.decode(encodedVector, dict)) {
+      try (VarCharVector decodedVector =
+          (VarCharVector) DictionaryEncoder.decode(encodedVector, dict)) {
         // verify decoding results
         assertEquals(encodedVector.getValueCount(), decodedVector.getValueCount());
         for (int i = 0; i < VECTOR_LENGTH; i++) {
           if (i % 10 == 0) {
             assertTrue(decodedVector.isNull(i));
           } else {
-            assertArrayEquals(String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8),
+            assertArrayEquals(
+                String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8),
                 decodedVector.get(i));
           }
         }
@@ -180,8 +184,8 @@ public void testEncodeAndDecodeWithNull() {
   @Test
   public void testEncodeNullWithoutNullInDictionary() {
     try (VarCharVector rawVector = new VarCharVector("original vector", allocator);
-         IntVector encodedVector = new IntVector("encoded vector", allocator);
-         VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
+        IntVector encodedVector = new IntVector("encoded vector", allocator);
+        VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
 
       // set up dictionary, with no null in it.
       dictionary.allocateNew();
@@ -199,13 +203,15 @@ public void testEncodeNullWithoutNullInDictionary() {
       encodedVector.allocateNew();
 
       HashTableDictionaryEncoder<IntVector, VarCharVector> encoder =
-              new HashTableDictionaryEncoder<>(dictionary, true);
+          new HashTableDictionaryEncoder<>(dictionary, true);
 
       // the encoder should encode null, but no null in the dictionary,
       // so an exception should be thrown.
-      assertThrows(IllegalArgumentException.class, () -> {
-        encoder.encode(rawVector, encodedVector);
-      });
+      assertThrows(
+          IllegalArgumentException.class,
+          () -> {
+            encoder.encode(rawVector, encodedVector);
+          });
     }
   }
 
@@ -213,8 +219,8 @@ public void testEncodeNullWithoutNullInDictionary() {
   public void testEncodeStrings() {
     // Create a new value vector
     try (final VarCharVector vector = new VarCharVector("foo", allocator);
-         final IntVector encoded = new IntVector("encoded", allocator);
-         final VarCharVector dictionaryVector = new VarCharVector("dict", allocator)) {
+        final IntVector encoded = new IntVector("encoded", allocator);
+        final VarCharVector dictionaryVector = new VarCharVector("dict", allocator)) {
 
       vector.allocateNew(512, 5);
       encoded.allocateNew();
@@ -235,7 +241,7 @@ public void testEncodeStrings() {
       dictionaryVector.setValueCount(3);
 
       HashTableDictionaryEncoder<IntVector, VarCharVector> encoder =
-              new HashTableDictionaryEncoder<>(dictionaryVector);
+          new HashTableDictionaryEncoder<>(dictionaryVector);
       encoder.encode(vector, encoded);
 
       // verify indices
@@ -262,8 +268,8 @@ public void testEncodeStrings() {
   public void testEncodeLargeVector() {
     // Create a new value vector
     try (final VarCharVector vector = new VarCharVector("foo", allocator);
-         final IntVector encoded = new IntVector("encoded", allocator);
-         final VarCharVector dictionaryVector = new VarCharVector("dict", allocator)) {
+        final IntVector encoded = new IntVector("encoded", allocator);
+        final VarCharVector dictionaryVector = new VarCharVector("dict", allocator)) {
       vector.allocateNew();
       encoded.allocateNew();
 
@@ -281,7 +287,7 @@ public void testEncodeLargeVector() {
       dictionaryVector.setValueCount(3);
 
       HashTableDictionaryEncoder<IntVector, VarCharVector> encoder =
-              new HashTableDictionaryEncoder<>(dictionaryVector);
+          new HashTableDictionaryEncoder<>(dictionaryVector);
       encoder.encode(vector, encoded);
 
       assertEquals(count, encoded.getValueCount());
@@ -305,8 +311,8 @@ public void testEncodeLargeVector() {
   public void testEncodeBinaryVector() {
     // Create a new value vector
     try (final VarBinaryVector vector = new VarBinaryVector("foo", allocator);
-         final VarBinaryVector dictionaryVector = new VarBinaryVector("dict", allocator);
-         final IntVector encoded = new IntVector("encoded", allocator)) {
+        final VarBinaryVector dictionaryVector = new VarBinaryVector("dict", allocator);
+        final IntVector encoded = new IntVector("encoded", allocator)) {
       vector.allocateNew(512, 5);
       vector.allocateNew();
       encoded.allocateNew();
@@ -327,7 +333,7 @@ public void testEncodeBinaryVector() {
       dictionaryVector.setValueCount(3);
 
       HashTableDictionaryEncoder<IntVector, VarBinaryVector> encoder =
-              new HashTableDictionaryEncoder<>(dictionaryVector);
+          new HashTableDictionaryEncoder<>(dictionaryVector);
       encoder.encode(vector, encoded);
 
       assertEquals(5, encoded.getValueCount());
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestLinearDictionaryEncoder.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestLinearDictionaryEncoder.java
index a76aedffa308d..9a8957ddbd089 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestLinearDictionaryEncoder.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestLinearDictionaryEncoder.java
@@ -14,18 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.dictionary;
 
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Random;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
@@ -34,14 +32,11 @@
 import org.apache.arrow.vector.dictionary.Dictionary;
 import org.apache.arrow.vector.dictionary.DictionaryEncoder;
 import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link LinearDictionaryEncoder}.
- */
+/** Test cases for {@link LinearDictionaryEncoder}. */
 public class TestLinearDictionaryEncoder {
 
   private final int VECTOR_LENGTH = 50;
@@ -54,14 +49,14 @@ public class TestLinearDictionaryEncoder {
   byte[] one = "111".getBytes(StandardCharsets.UTF_8);
   byte[] two = "222".getBytes(StandardCharsets.UTF_8);
 
-  byte[][] data = new byte[][]{zero, one, two};
+  byte[][] data = new byte[][] {zero, one, two};
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -70,8 +65,8 @@ public void shutdown() {
   public void testEncodeAndDecode() {
     Random random = new Random();
     try (VarCharVector rawVector = new VarCharVector("original vector", allocator);
-         IntVector encodedVector = new IntVector("encoded vector", allocator);
-         VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
+        IntVector encodedVector = new IntVector("encoded vector", allocator);
+        VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
 
       // set up dictionary
       dictionary.allocateNew();
@@ -90,7 +85,7 @@ public void testEncodeAndDecode() {
       rawVector.setValueCount(VECTOR_LENGTH);
 
       LinearDictionaryEncoder<IntVector, VarCharVector> encoder =
-              new LinearDictionaryEncoder<>(dictionary, false);
+          new LinearDictionaryEncoder<>(dictionary, false);
 
       // perform encoding
       encodedVector.allocateNew();
@@ -99,17 +94,21 @@ public void testEncodeAndDecode() {
       // verify encoding results
       assertEquals(rawVector.getValueCount(), encodedVector.getValueCount());
       for (int i = 0; i < VECTOR_LENGTH; i++) {
-        assertArrayEquals(rawVector.get(i), String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8));
+        assertArrayEquals(
+            rawVector.get(i),
+            String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8));
       }
 
       // perform decoding
       Dictionary dict = new Dictionary(dictionary, new DictionaryEncoding(1L, false, null));
-      try (VarCharVector decodedVector = (VarCharVector) DictionaryEncoder.decode(encodedVector, dict)) {
+      try (VarCharVector decodedVector =
+          (VarCharVector) DictionaryEncoder.decode(encodedVector, dict)) {
 
         // verify decoding results
         assertEquals(encodedVector.getValueCount(), decodedVector.getValueCount());
         for (int i = 0; i < VECTOR_LENGTH; i++) {
-          assertArrayEquals(String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8),
+          assertArrayEquals(
+              String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8),
               decodedVector.get(i));
         }
       }
@@ -120,8 +119,8 @@ public void testEncodeAndDecode() {
   public void testEncodeAndDecodeWithNull() {
     Random random = new Random();
     try (VarCharVector rawVector = new VarCharVector("original vector", allocator);
-         IntVector encodedVector = new IntVector("encoded vector", allocator);
-         VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
+        IntVector encodedVector = new IntVector("encoded vector", allocator);
+        VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
 
       // set up dictionary
       dictionary.allocateNew();
@@ -145,7 +144,7 @@ public void testEncodeAndDecodeWithNull() {
       rawVector.setValueCount(VECTOR_LENGTH);
 
       LinearDictionaryEncoder<IntVector, VarCharVector> encoder =
-              new LinearDictionaryEncoder<>(dictionary, true);
+          new LinearDictionaryEncoder<>(dictionary, true);
 
       // perform encoding
       encodedVector.allocateNew();
@@ -157,13 +156,16 @@ public void testEncodeAndDecodeWithNull() {
         if (i % 10 == 0) {
           assertEquals(0, encodedVector.get(i));
         } else {
-          assertArrayEquals(rawVector.get(i), String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8));
+          assertArrayEquals(
+              rawVector.get(i),
+              String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8));
         }
       }
 
       // perform decoding
       Dictionary dict = new Dictionary(dictionary, new DictionaryEncoding(1L, false, null));
-      try (VarCharVector decodedVector = (VarCharVector) DictionaryEncoder.decode(encodedVector, dict)) {
+      try (VarCharVector decodedVector =
+          (VarCharVector) DictionaryEncoder.decode(encodedVector, dict)) {
 
         // verify decoding results
         assertEquals(encodedVector.getValueCount(), decodedVector.getValueCount());
@@ -171,7 +173,8 @@ public void testEncodeAndDecodeWithNull() {
           if (i % 10 == 0) {
             assertTrue(decodedVector.isNull(i));
           } else {
-            assertArrayEquals(String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8),
+            assertArrayEquals(
+                String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8),
                 decodedVector.get(i));
           }
         }
@@ -182,8 +185,8 @@ public void testEncodeAndDecodeWithNull() {
   @Test
   public void testEncodeNullWithoutNullInDictionary() {
     try (VarCharVector rawVector = new VarCharVector("original vector", allocator);
-         IntVector encodedVector = new IntVector("encoded vector", allocator);
-         VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
+        IntVector encodedVector = new IntVector("encoded vector", allocator);
+        VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
 
       // set up dictionary, with no null in it.
       dictionary.allocateNew();
@@ -201,13 +204,15 @@ public void testEncodeNullWithoutNullInDictionary() {
       encodedVector.allocateNew();
 
       LinearDictionaryEncoder<IntVector, VarCharVector> encoder =
-              new LinearDictionaryEncoder<>(dictionary, true);
+          new LinearDictionaryEncoder<>(dictionary, true);
 
       // the encoder should encode null, but no null in the dictionary,
       // so an exception should be thrown.
-      assertThrows(IllegalArgumentException.class, () -> {
-        encoder.encode(rawVector, encodedVector);
-      });
+      assertThrows(
+          IllegalArgumentException.class,
+          () -> {
+            encoder.encode(rawVector, encodedVector);
+          });
     }
   }
 
@@ -215,8 +220,8 @@ public void testEncodeNullWithoutNullInDictionary() {
   public void testEncodeStrings() {
     // Create a new value vector
     try (final VarCharVector vector = new VarCharVector("foo", allocator);
-         final IntVector encoded = new IntVector("encoded", allocator);
-         final VarCharVector dictionaryVector = new VarCharVector("dict", allocator)) {
+        final IntVector encoded = new IntVector("encoded", allocator);
+        final VarCharVector dictionaryVector = new VarCharVector("dict", allocator)) {
 
       vector.allocateNew(512, 5);
       encoded.allocateNew();
@@ -237,7 +242,7 @@ public void testEncodeStrings() {
       dictionaryVector.setValueCount(3);
 
       LinearDictionaryEncoder<IntVector, VarCharVector> encoder =
-              new LinearDictionaryEncoder<>(dictionaryVector);
+          new LinearDictionaryEncoder<>(dictionaryVector);
       encoder.encode(vector, encoded);
 
       // verify indices
@@ -263,8 +268,8 @@ public void testEncodeStrings() {
   public void testEncodeLargeVector() {
     // Create a new value vector
     try (final VarCharVector vector = new VarCharVector("foo", allocator);
-         final IntVector encoded = new IntVector("encoded", allocator);
-         final VarCharVector dictionaryVector = new VarCharVector("dict", allocator)) {
+        final IntVector encoded = new IntVector("encoded", allocator);
+        final VarCharVector dictionaryVector = new VarCharVector("dict", allocator)) {
       vector.allocateNew();
       encoded.allocateNew();
 
@@ -282,7 +287,7 @@ public void testEncodeLargeVector() {
       dictionaryVector.setValueCount(3);
 
       LinearDictionaryEncoder<IntVector, VarCharVector> encoder =
-              new LinearDictionaryEncoder<>(dictionaryVector);
+          new LinearDictionaryEncoder<>(dictionaryVector);
       encoder.encode(vector, encoded);
 
       assertEquals(count, encoded.getValueCount());
@@ -306,8 +311,8 @@ public void testEncodeLargeVector() {
   public void testEncodeBinaryVector() {
     // Create a new value vector
     try (final VarBinaryVector vector = new VarBinaryVector("foo", allocator);
-         final VarBinaryVector dictionaryVector = new VarBinaryVector("dict", allocator);
-         final IntVector encoded = new IntVector("encoded", allocator)) {
+        final VarBinaryVector dictionaryVector = new VarBinaryVector("dict", allocator);
+        final IntVector encoded = new IntVector("encoded", allocator)) {
       vector.allocateNew(512, 5);
       vector.allocateNew();
       encoded.allocateNew();
@@ -328,7 +333,7 @@ public void testEncodeBinaryVector() {
       dictionaryVector.setValueCount(3);
 
       LinearDictionaryEncoder<IntVector, VarBinaryVector> encoder =
-              new LinearDictionaryEncoder<>(dictionaryVector);
+          new LinearDictionaryEncoder<>(dictionaryVector);
       encoder.encode(vector, encoded);
 
       assertEquals(5, encoded.getValueCount());
@@ -344,7 +349,7 @@ public void testEncodeBinaryVector() {
         assertEquals(vector.getClass(), decoded.getClass());
         assertEquals(vector.getValueCount(), decoded.getValueCount());
         for (int i = 0; i < 5; i++) {
-          Assert.assertTrue(Arrays.equals(vector.getObject(i), decoded.getObject(i)));
+          assertTrue(Arrays.equals(vector.getObject(i), decoded.getObject(i)));
         }
       }
     }
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestSearchDictionaryEncoder.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestSearchDictionaryEncoder.java
index e01c2e7905b46..063c740a12a87 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestSearchDictionaryEncoder.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestSearchDictionaryEncoder.java
@@ -14,18 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.dictionary;
 
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Random;
-
 import org.apache.arrow.algorithm.sort.DefaultVectorComparators;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -35,14 +33,11 @@
 import org.apache.arrow.vector.dictionary.Dictionary;
 import org.apache.arrow.vector.dictionary.DictionaryEncoder;
 import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link SearchDictionaryEncoder}.
- */
+/** Test cases for {@link SearchDictionaryEncoder}. */
 public class TestSearchDictionaryEncoder {
 
   private final int VECTOR_LENGTH = 50;
@@ -55,14 +50,14 @@ public class TestSearchDictionaryEncoder {
   byte[] one = "111".getBytes(StandardCharsets.UTF_8);
   byte[] two = "222".getBytes(StandardCharsets.UTF_8);
 
-  byte[][] data = new byte[][]{zero, one, two};
+  byte[][] data = new byte[][] {zero, one, two};
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -71,8 +66,8 @@ public void shutdown() {
   public void testEncodeAndDecode() {
     Random random = new Random();
     try (VarCharVector rawVector = new VarCharVector("original vector", allocator);
-         IntVector encodedVector = new IntVector("encoded vector", allocator);
-         VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
+        IntVector encodedVector = new IntVector("encoded vector", allocator);
+        VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
 
       // set up dictionary
       dictionary.allocateNew();
@@ -91,8 +86,8 @@ public void testEncodeAndDecode() {
       rawVector.setValueCount(VECTOR_LENGTH);
 
       SearchDictionaryEncoder<IntVector, VarCharVector> encoder =
-              new SearchDictionaryEncoder<>(
-                dictionary, DefaultVectorComparators.createDefaultComparator(rawVector), false);
+          new SearchDictionaryEncoder<>(
+              dictionary, DefaultVectorComparators.createDefaultComparator(rawVector), false);
 
       // perform encoding
       encodedVector.allocateNew();
@@ -101,17 +96,21 @@ public void testEncodeAndDecode() {
       // verify encoding results
       assertEquals(rawVector.getValueCount(), encodedVector.getValueCount());
       for (int i = 0; i < VECTOR_LENGTH; i++) {
-        assertArrayEquals(rawVector.get(i), String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8));
+        assertArrayEquals(
+            rawVector.get(i),
+            String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8));
       }
 
       // perform decoding
       Dictionary dict = new Dictionary(dictionary, new DictionaryEncoding(1L, false, null));
-      try (VarCharVector decodedVector = (VarCharVector) DictionaryEncoder.decode(encodedVector, dict)) {
+      try (VarCharVector decodedVector =
+          (VarCharVector) DictionaryEncoder.decode(encodedVector, dict)) {
 
         // verify decoding results
         assertEquals(encodedVector.getValueCount(), decodedVector.getValueCount());
         for (int i = 0; i < VECTOR_LENGTH; i++) {
-          assertArrayEquals(String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8),
+          assertArrayEquals(
+              String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8),
               decodedVector.get(i));
         }
       }
@@ -122,8 +121,8 @@ public void testEncodeAndDecode() {
   public void testEncodeAndDecodeWithNull() {
     Random random = new Random();
     try (VarCharVector rawVector = new VarCharVector("original vector", allocator);
-         IntVector encodedVector = new IntVector("encoded vector", allocator);
-         VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
+        IntVector encodedVector = new IntVector("encoded vector", allocator);
+        VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
 
       // set up dictionary
       dictionary.allocateNew();
@@ -147,8 +146,8 @@ public void testEncodeAndDecodeWithNull() {
       rawVector.setValueCount(VECTOR_LENGTH);
 
       SearchDictionaryEncoder<IntVector, VarCharVector> encoder =
-              new SearchDictionaryEncoder<>(
-                dictionary, DefaultVectorComparators.createDefaultComparator(rawVector), true);
+          new SearchDictionaryEncoder<>(
+              dictionary, DefaultVectorComparators.createDefaultComparator(rawVector), true);
 
       // perform encoding
       encodedVector.allocateNew();
@@ -160,13 +159,16 @@ public void testEncodeAndDecodeWithNull() {
         if (i % 10 == 0) {
           assertEquals(0, encodedVector.get(i));
         } else {
-          assertArrayEquals(rawVector.get(i), String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8));
+          assertArrayEquals(
+              rawVector.get(i),
+              String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8));
         }
       }
 
       // perform decoding
       Dictionary dict = new Dictionary(dictionary, new DictionaryEncoding(1L, false, null));
-      try (VarCharVector decodedVector = (VarCharVector) DictionaryEncoder.decode(encodedVector, dict)) {
+      try (VarCharVector decodedVector =
+          (VarCharVector) DictionaryEncoder.decode(encodedVector, dict)) {
 
         // verify decoding results
         assertEquals(encodedVector.getValueCount(), decodedVector.getValueCount());
@@ -174,7 +176,8 @@ public void testEncodeAndDecodeWithNull() {
           if (i % 10 == 0) {
             assertTrue(decodedVector.isNull(i));
           } else {
-            assertArrayEquals(String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8),
+            assertArrayEquals(
+                String.valueOf(encodedVector.get(i)).getBytes(StandardCharsets.UTF_8),
                 decodedVector.get(i));
           }
         }
@@ -185,8 +188,8 @@ public void testEncodeAndDecodeWithNull() {
   @Test
   public void testEncodeNullWithoutNullInDictionary() {
     try (VarCharVector rawVector = new VarCharVector("original vector", allocator);
-         IntVector encodedVector = new IntVector("encoded vector", allocator);
-         VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
+        IntVector encodedVector = new IntVector("encoded vector", allocator);
+        VarCharVector dictionary = new VarCharVector("dictionary", allocator)) {
 
       // set up dictionary, with no null in it.
       dictionary.allocateNew();
@@ -204,14 +207,16 @@ public void testEncodeNullWithoutNullInDictionary() {
       encodedVector.allocateNew();
 
       SearchDictionaryEncoder<IntVector, VarCharVector> encoder =
-              new SearchDictionaryEncoder<>(
-                dictionary, DefaultVectorComparators.createDefaultComparator(rawVector), true);
+          new SearchDictionaryEncoder<>(
+              dictionary, DefaultVectorComparators.createDefaultComparator(rawVector), true);
 
       // the encoder should encode null, but no null in the dictionary,
       // so an exception should be thrown.
-      assertThrows(IllegalArgumentException.class, () -> {
-        encoder.encode(rawVector, encodedVector);
-      });
+      assertThrows(
+          IllegalArgumentException.class,
+          () -> {
+            encoder.encode(rawVector, encodedVector);
+          });
     }
   }
 
@@ -219,8 +224,8 @@ public void testEncodeNullWithoutNullInDictionary() {
   public void testEncodeStrings() {
     // Create a new value vector
     try (final VarCharVector vector = new VarCharVector("foo", allocator);
-         final IntVector encoded = new IntVector("encoded", allocator);
-         final VarCharVector dictionaryVector = new VarCharVector("dict", allocator)) {
+        final IntVector encoded = new IntVector("encoded", allocator);
+        final VarCharVector dictionaryVector = new VarCharVector("dict", allocator)) {
 
       vector.allocateNew(512, 5);
       encoded.allocateNew();
@@ -241,8 +246,8 @@ public void testEncodeStrings() {
       dictionaryVector.setValueCount(3);
 
       SearchDictionaryEncoder<IntVector, VarCharVector> encoder =
-              new SearchDictionaryEncoder<>(
-                      dictionaryVector, DefaultVectorComparators.createDefaultComparator(vector));
+          new SearchDictionaryEncoder<>(
+              dictionaryVector, DefaultVectorComparators.createDefaultComparator(vector));
       encoder.encode(vector, encoded);
 
       // verify indices
@@ -268,8 +273,8 @@ public void testEncodeStrings() {
   public void testEncodeLargeVector() {
     // Create a new value vector
     try (final VarCharVector vector = new VarCharVector("foo", allocator);
-         final IntVector encoded = new IntVector("encoded", allocator);
-         final VarCharVector dictionaryVector = new VarCharVector("dict", allocator)) {
+        final IntVector encoded = new IntVector("encoded", allocator);
+        final VarCharVector dictionaryVector = new VarCharVector("dict", allocator)) {
       vector.allocateNew();
       encoded.allocateNew();
 
@@ -287,8 +292,8 @@ public void testEncodeLargeVector() {
       dictionaryVector.setValueCount(3);
 
       SearchDictionaryEncoder<IntVector, VarCharVector> encoder =
-              new SearchDictionaryEncoder<>(
-                      dictionaryVector, DefaultVectorComparators.createDefaultComparator(vector));
+          new SearchDictionaryEncoder<>(
+              dictionaryVector, DefaultVectorComparators.createDefaultComparator(vector));
       encoder.encode(vector, encoded);
 
       assertEquals(count, encoded.getValueCount());
@@ -312,8 +317,8 @@ public void testEncodeLargeVector() {
   public void testEncodeBinaryVector() {
     // Create a new value vector
     try (final VarBinaryVector vector = new VarBinaryVector("foo", allocator);
-         final VarBinaryVector dictionaryVector = new VarBinaryVector("dict", allocator);
-         final IntVector encoded = new IntVector("encoded", allocator)) {
+        final VarBinaryVector dictionaryVector = new VarBinaryVector("dict", allocator);
+        final IntVector encoded = new IntVector("encoded", allocator)) {
       vector.allocateNew(512, 5);
       vector.allocateNew();
       encoded.allocateNew();
@@ -334,8 +339,8 @@ public void testEncodeBinaryVector() {
       dictionaryVector.setValueCount(3);
 
       SearchDictionaryEncoder<IntVector, VarBinaryVector> encoder =
-              new SearchDictionaryEncoder<>(
-                      dictionaryVector, DefaultVectorComparators.createDefaultComparator(vector));
+          new SearchDictionaryEncoder<>(
+              dictionaryVector, DefaultVectorComparators.createDefaultComparator(vector));
       encoder.encode(vector, encoded);
 
       assertEquals(5, encoded.getValueCount());
@@ -351,7 +356,7 @@ public void testEncodeBinaryVector() {
         assertEquals(vector.getClass(), decoded.getClass());
         assertEquals(vector.getValueCount(), decoded.getValueCount());
         for (int i = 0; i < 5; i++) {
-          Assert.assertTrue(Arrays.equals(vector.getObject(i), decoded.getObject(i)));
+          assertTrue(Arrays.equals(vector.getObject(i), decoded.getObject(i)));
         }
       }
     }
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestSearchTreeBasedDictionaryBuilder.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestSearchTreeBasedDictionaryBuilder.java
index 340b7e67e861f..57e1de9497eac 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestSearchTreeBasedDictionaryBuilder.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/dictionary/TestSearchTreeBasedDictionaryBuilder.java
@@ -14,38 +14,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.dictionary;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
-
 import org.apache.arrow.algorithm.sort.DefaultVectorComparators;
 import org.apache.arrow.algorithm.sort.VectorValueComparator;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.VarCharVector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link SearchTreeBasedDictionaryBuilder}.
- */
+/** Test cases for {@link SearchTreeBasedDictionaryBuilder}. */
 public class TestSearchTreeBasedDictionaryBuilder {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -53,8 +49,8 @@ public void shutdown() {
   @Test
   public void testBuildVariableWidthDictionaryWithNull() {
     try (VarCharVector vec = new VarCharVector("", allocator);
-         VarCharVector dictionary = new VarCharVector("", allocator);
-         VarCharVector sortedDictionary = new VarCharVector("", allocator)) {
+        VarCharVector dictionary = new VarCharVector("", allocator);
+        VarCharVector sortedDictionary = new VarCharVector("", allocator)) {
 
       vec.allocateNew(100, 10);
       vec.setValueCount(10);
@@ -74,9 +70,10 @@ public void testBuildVariableWidthDictionaryWithNull() {
       vec.set(8, "good".getBytes(StandardCharsets.UTF_8));
       vec.set(9, "abc".getBytes(StandardCharsets.UTF_8));
 
-      VectorValueComparator<VarCharVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      VectorValueComparator<VarCharVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
       SearchTreeBasedDictionaryBuilder<VarCharVector> dictionaryBuilder =
-              new SearchTreeBasedDictionaryBuilder<>(dictionary, comparator, true);
+          new SearchTreeBasedDictionaryBuilder<>(dictionary, comparator, true);
 
       int result = dictionaryBuilder.addValues(vec);
 
@@ -86,20 +83,32 @@ public void testBuildVariableWidthDictionaryWithNull() {
       dictionaryBuilder.populateSortedDictionary(sortedDictionary);
 
       assertTrue(sortedDictionary.isNull(0));
-      assertEquals("12", new String(Objects.requireNonNull(sortedDictionary.get(1)), StandardCharsets.UTF_8));
-      assertEquals("abc", new String(Objects.requireNonNull(sortedDictionary.get(2)), StandardCharsets.UTF_8));
-      assertEquals("dictionary", new String(Objects.requireNonNull(sortedDictionary.get(3)), StandardCharsets.UTF_8));
-      assertEquals("good", new String(Objects.requireNonNull(sortedDictionary.get(4)), StandardCharsets.UTF_8));
-      assertEquals("hello", new String(Objects.requireNonNull(sortedDictionary.get(5)), StandardCharsets.UTF_8));
-      assertEquals("world", new String(Objects.requireNonNull(sortedDictionary.get(6)), StandardCharsets.UTF_8));
+      assertEquals(
+          "12",
+          new String(Objects.requireNonNull(sortedDictionary.get(1)), StandardCharsets.UTF_8));
+      assertEquals(
+          "abc",
+          new String(Objects.requireNonNull(sortedDictionary.get(2)), StandardCharsets.UTF_8));
+      assertEquals(
+          "dictionary",
+          new String(Objects.requireNonNull(sortedDictionary.get(3)), StandardCharsets.UTF_8));
+      assertEquals(
+          "good",
+          new String(Objects.requireNonNull(sortedDictionary.get(4)), StandardCharsets.UTF_8));
+      assertEquals(
+          "hello",
+          new String(Objects.requireNonNull(sortedDictionary.get(5)), StandardCharsets.UTF_8));
+      assertEquals(
+          "world",
+          new String(Objects.requireNonNull(sortedDictionary.get(6)), StandardCharsets.UTF_8));
     }
   }
 
   @Test
   public void testBuildVariableWidthDictionaryWithoutNull() {
     try (VarCharVector vec = new VarCharVector("", allocator);
-         VarCharVector dictionary = new VarCharVector("", allocator);
-         VarCharVector sortedDictionary = new VarCharVector("", allocator)) {
+        VarCharVector dictionary = new VarCharVector("", allocator);
+        VarCharVector sortedDictionary = new VarCharVector("", allocator)) {
 
       vec.allocateNew(100, 10);
       vec.setValueCount(10);
@@ -119,9 +128,10 @@ public void testBuildVariableWidthDictionaryWithoutNull() {
       vec.set(8, "good".getBytes(StandardCharsets.UTF_8));
       vec.set(9, "abc".getBytes(StandardCharsets.UTF_8));
 
-      VectorValueComparator<VarCharVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      VectorValueComparator<VarCharVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
       SearchTreeBasedDictionaryBuilder<VarCharVector> dictionaryBuilder =
-              new SearchTreeBasedDictionaryBuilder<>(dictionary, comparator, false);
+          new SearchTreeBasedDictionaryBuilder<>(dictionary, comparator, false);
 
       int result = dictionaryBuilder.addValues(vec);
 
@@ -130,20 +140,32 @@ public void testBuildVariableWidthDictionaryWithoutNull() {
 
       dictionaryBuilder.populateSortedDictionary(sortedDictionary);
 
-      assertEquals("12", new String(Objects.requireNonNull(sortedDictionary.get(0)), StandardCharsets.UTF_8));
-      assertEquals("abc", new String(Objects.requireNonNull(sortedDictionary.get(1)), StandardCharsets.UTF_8));
-      assertEquals("dictionary", new String(Objects.requireNonNull(sortedDictionary.get(2)), StandardCharsets.UTF_8));
-      assertEquals("good", new String(Objects.requireNonNull(sortedDictionary.get(3)), StandardCharsets.UTF_8));
-      assertEquals("hello", new String(Objects.requireNonNull(sortedDictionary.get(4)), StandardCharsets.UTF_8));
-      assertEquals("world", new String(Objects.requireNonNull(sortedDictionary.get(5)), StandardCharsets.UTF_8));
+      assertEquals(
+          "12",
+          new String(Objects.requireNonNull(sortedDictionary.get(0)), StandardCharsets.UTF_8));
+      assertEquals(
+          "abc",
+          new String(Objects.requireNonNull(sortedDictionary.get(1)), StandardCharsets.UTF_8));
+      assertEquals(
+          "dictionary",
+          new String(Objects.requireNonNull(sortedDictionary.get(2)), StandardCharsets.UTF_8));
+      assertEquals(
+          "good",
+          new String(Objects.requireNonNull(sortedDictionary.get(3)), StandardCharsets.UTF_8));
+      assertEquals(
+          "hello",
+          new String(Objects.requireNonNull(sortedDictionary.get(4)), StandardCharsets.UTF_8));
+      assertEquals(
+          "world",
+          new String(Objects.requireNonNull(sortedDictionary.get(5)), StandardCharsets.UTF_8));
     }
   }
 
   @Test
   public void testBuildFixedWidthDictionaryWithNull() {
     try (IntVector vec = new IntVector("", allocator);
-         IntVector dictionary = new IntVector("", allocator);
-         IntVector sortedDictionary = new IntVector("", allocator)) {
+        IntVector dictionary = new IntVector("", allocator);
+        IntVector sortedDictionary = new IntVector("", allocator)) {
       vec.allocateNew(10);
       vec.setValueCount(10);
 
@@ -162,9 +184,10 @@ public void testBuildFixedWidthDictionaryWithNull() {
       vec.set(8, 4);
       vec.setNull(9);
 
-      VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
       SearchTreeBasedDictionaryBuilder<IntVector> dictionaryBuilder =
-              new SearchTreeBasedDictionaryBuilder<>(dictionary, comparator, true);
+          new SearchTreeBasedDictionaryBuilder<>(dictionary, comparator, true);
 
       int result = dictionaryBuilder.addValues(vec);
 
@@ -184,8 +207,8 @@ public void testBuildFixedWidthDictionaryWithNull() {
   @Test
   public void testBuildFixedWidthDictionaryWithoutNull() {
     try (IntVector vec = new IntVector("", allocator);
-         IntVector dictionary = new IntVector("", allocator);
-         IntVector sortedDictionary = new IntVector("", allocator)) {
+        IntVector dictionary = new IntVector("", allocator);
+        IntVector sortedDictionary = new IntVector("", allocator)) {
       vec.allocateNew(10);
       vec.setValueCount(10);
 
@@ -204,9 +227,10 @@ public void testBuildFixedWidthDictionaryWithoutNull() {
       vec.set(8, 4);
       vec.setNull(9);
 
-      VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
       SearchTreeBasedDictionaryBuilder<IntVector> dictionaryBuilder =
-              new SearchTreeBasedDictionaryBuilder<>(dictionary, comparator, false);
+          new SearchTreeBasedDictionaryBuilder<>(dictionary, comparator, false);
 
       int result = dictionaryBuilder.addValues(vec);
 
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/misc/TestPartialSumUtils.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/misc/TestPartialSumUtils.java
index 630dd80b44084..e1b255f4f4d81 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/misc/TestPartialSumUtils.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/misc/TestPartialSumUtils.java
@@ -14,21 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.misc;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link PartialSumUtils}.
- */
+/** Test cases for {@link PartialSumUtils}. */
 public class TestPartialSumUtils {
 
   private static final int PARTIAL_SUM_VECTOR_LENGTH = 101;
@@ -37,12 +34,12 @@ public class TestPartialSumUtils {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -50,7 +47,7 @@ public void shutdown() {
   @Test
   public void testToPartialSumVector() {
     try (IntVector delta = new IntVector("delta", allocator);
-         IntVector partialSum = new IntVector("partial sum", allocator)) {
+        IntVector partialSum = new IntVector("partial sum", allocator)) {
       delta.allocateNew(DELTA_VECTOR_LENGTH);
       delta.setValueCount(DELTA_VECTOR_LENGTH);
 
@@ -75,7 +72,7 @@ public void testToPartialSumVector() {
   @Test
   public void testToDeltaVector() {
     try (IntVector partialSum = new IntVector("partial sum", allocator);
-         IntVector delta = new IntVector("delta", allocator)) {
+        IntVector delta = new IntVector("delta", allocator)) {
       partialSum.allocateNew(PARTIAL_SUM_VECTOR_LENGTH);
       partialSum.setValueCount(PARTIAL_SUM_VECTOR_LENGTH);
 
@@ -111,7 +108,8 @@ public void testFindPositionInPartialSumVector() {
 
       // search and verify results
       for (int i = 0; i < PARTIAL_SUM_VECTOR_LENGTH - 1; i++) {
-        assertEquals(i, PartialSumUtils.findPositionInPartialSumVector(partialSum, sumBase + 3 * i + 1));
+        assertEquals(
+            i, PartialSumUtils.findPositionInPartialSumVector(partialSum, sumBase + 3 * i + 1));
       }
     }
   }
@@ -131,8 +129,10 @@ public void testFindPositionInPartialSumVectorNegative() {
       // search and verify results
       assertEquals(0, PartialSumUtils.findPositionInPartialSumVector(partialSum, sumBase));
       assertEquals(-1, PartialSumUtils.findPositionInPartialSumVector(partialSum, sumBase - 1));
-      assertEquals(-1, PartialSumUtils.findPositionInPartialSumVector(partialSum,
-              sumBase + 3 * (PARTIAL_SUM_VECTOR_LENGTH - 1)));
+      assertEquals(
+          -1,
+          PartialSumUtils.findPositionInPartialSumVector(
+              partialSum, sumBase + 3 * (PARTIAL_SUM_VECTOR_LENGTH - 1)));
     }
   }
 }
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/rank/TestVectorRank.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/rank/TestVectorRank.java
index 0e6627eb4822a..0b70cfd297e03 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/rank/TestVectorRank.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/rank/TestVectorRank.java
@@ -14,39 +14,35 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.rank;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.nio.charset.StandardCharsets;
-
 import org.apache.arrow.algorithm.sort.DefaultVectorComparators;
 import org.apache.arrow.algorithm.sort.VectorValueComparator;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.VarCharVector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link org.apache.arrow.algorithm.rank.VectorRank}.
- */
+/** Test cases for {@link org.apache.arrow.algorithm.rank.VectorRank}. */
 public class TestVectorRank {
 
   private BufferAllocator allocator;
 
   private static final int VECTOR_LENGTH = 10;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -70,7 +66,7 @@ public void testFixedWidthRank() {
       vector.set(9, 6);
 
       VectorValueComparator<IntVector> comparator =
-              DefaultVectorComparators.createDefaultComparator(vector);
+          DefaultVectorComparators.createDefaultComparator(vector);
       assertEquals(7, rank.indexAtRank(vector, comparator, 0));
       assertEquals(0, rank.indexAtRank(vector, comparator, 1));
       assertEquals(6, rank.indexAtRank(vector, comparator, 2));
@@ -103,7 +99,7 @@ public void testVariableWidthRank() {
       vector.set(9, String.valueOf(6).getBytes(StandardCharsets.UTF_8));
 
       VectorValueComparator<VarCharVector> comparator =
-              DefaultVectorComparators.createDefaultComparator(vector);
+          DefaultVectorComparators.createDefaultComparator(vector);
 
       assertEquals(7, rank.indexAtRank(vector, comparator, 0));
       assertEquals(0, rank.indexAtRank(vector, comparator, 1));
@@ -137,11 +133,13 @@ public void testRankNegative() {
       vector.set(9, 6);
 
       VectorValueComparator<IntVector> comparator =
-              DefaultVectorComparators.createDefaultComparator(vector);
+          DefaultVectorComparators.createDefaultComparator(vector);
 
-      assertThrows(IllegalArgumentException.class, () -> {
-        rank.indexAtRank(vector, comparator, VECTOR_LENGTH + 1);
-      });
+      assertThrows(
+          IllegalArgumentException.class,
+          () -> {
+            rank.indexAtRank(vector, comparator, VECTOR_LENGTH + 1);
+          });
     }
   }
 }
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestParallelSearcher.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestParallelSearcher.java
index 9ccecfa84a73a..24a9a6ed694c7 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestParallelSearcher.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestParallelSearcher.java
@@ -14,35 +14,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.search;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-
+import java.util.stream.Stream;
 import org.apache.arrow.algorithm.sort.DefaultVectorComparators;
 import org.apache.arrow.algorithm.sort.VectorValueComparator;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.VarCharVector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-/**
- * Test cases for {@link ParallelSearcher}.
- */
-@RunWith(Parameterized.class)
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/** Test cases for {@link ParallelSearcher}. */
 public class TestParallelSearcher {
 
   private enum ComparatorType {
@@ -52,53 +47,49 @@ private enum ComparatorType {
 
   private static final int VECTOR_LENGTH = 10000;
 
-  private final int threadCount;
-
   private BufferAllocator allocator;
 
   private ExecutorService threadPool;
 
-  private final ComparatorType comparatorType;
-
-  public TestParallelSearcher(ComparatorType comparatorType, int threadCount) {
-    this.comparatorType = comparatorType;
-    this.threadCount = threadCount;
-  }
-
-  @Parameterized.Parameters(name = "comparator type = {0}, thread count = {1}")
-  public static Collection<Object[]> getComparatorName() {
-    List<Object[]> params = new ArrayList<>();
+  public static Stream<Arguments> getComparatorName() {
+    List<Arguments> params = new ArrayList<>();
     int[] threadCounts = {1, 2, 5, 10, 20, 50};
     for (ComparatorType type : ComparatorType.values()) {
       for (int count : threadCounts) {
-        params.add(new Object[] {type, count});
+        params.add(Arguments.of(type, count));
       }
     }
-    return params;
+    return params.stream();
   }
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
-    threadPool = Executors.newFixedThreadPool(threadCount);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
-    threadPool.shutdown();
+    if (threadPool != null) {
+      threadPool.shutdown();
+    }
   }
 
-  @Test
-  public void testParallelIntSearch() throws ExecutionException, InterruptedException {
+  @ParameterizedTest
+  @MethodSource("getComparatorName")
+  public void testParallelIntSearch(ComparatorType comparatorType, int threadCount)
+      throws ExecutionException, InterruptedException {
+    threadPool = Executors.newFixedThreadPool(threadCount);
     try (IntVector targetVector = new IntVector("targetVector", allocator);
         IntVector keyVector = new IntVector("keyVector", allocator)) {
       targetVector.allocateNew(VECTOR_LENGTH);
       keyVector.allocateNew(VECTOR_LENGTH);
 
       // if we are comparing elements using equality semantics, we do not need a comparator here.
-      VectorValueComparator<IntVector> comparator = comparatorType == ComparatorType.EqualityComparator ? null
-          : DefaultVectorComparators.createDefaultComparator(targetVector);
+      VectorValueComparator<IntVector> comparator =
+          comparatorType == ComparatorType.EqualityComparator
+              ? null
+              : DefaultVectorComparators.createDefaultComparator(targetVector);
 
       for (int i = 0; i < VECTOR_LENGTH; i++) {
         targetVector.set(i, i);
@@ -107,9 +98,13 @@ public void testParallelIntSearch() throws ExecutionException, InterruptedExcept
       targetVector.setValueCount(VECTOR_LENGTH);
       keyVector.setValueCount(VECTOR_LENGTH);
 
-      ParallelSearcher<IntVector> searcher = new ParallelSearcher<>(targetVector, threadPool, threadCount);
+      ParallelSearcher<IntVector> searcher =
+          new ParallelSearcher<>(targetVector, threadPool, threadCount);
       for (int i = 0; i < VECTOR_LENGTH; i++) {
-        int pos = comparator == null ? searcher.search(keyVector, i) : searcher.search(keyVector, i, comparator);
+        int pos =
+            comparator == null
+                ? searcher.search(keyVector, i)
+                : searcher.search(keyVector, i, comparator);
         if (i * 2 < VECTOR_LENGTH) {
           assertEquals(i * 2, pos);
         } else {
@@ -119,16 +114,21 @@ public void testParallelIntSearch() throws ExecutionException, InterruptedExcept
     }
   }
 
-  @Test
-  public void testParallelStringSearch() throws ExecutionException, InterruptedException {
+  @ParameterizedTest
+  @MethodSource("getComparatorName")
+  public void testParallelStringSearch(ComparatorType comparatorType, int threadCount)
+      throws ExecutionException, InterruptedException {
+    threadPool = Executors.newFixedThreadPool(threadCount);
     try (VarCharVector targetVector = new VarCharVector("targetVector", allocator);
-         VarCharVector keyVector = new VarCharVector("keyVector", allocator)) {
+        VarCharVector keyVector = new VarCharVector("keyVector", allocator)) {
       targetVector.allocateNew(VECTOR_LENGTH);
       keyVector.allocateNew(VECTOR_LENGTH);
 
       // if we are comparing elements using equality semantics, we do not need a comparator here.
-      VectorValueComparator<VarCharVector> comparator = comparatorType == ComparatorType.EqualityComparator ? null
-          : DefaultVectorComparators.createDefaultComparator(targetVector);
+      VectorValueComparator<VarCharVector> comparator =
+          comparatorType == ComparatorType.EqualityComparator
+              ? null
+              : DefaultVectorComparators.createDefaultComparator(targetVector);
 
       for (int i = 0; i < VECTOR_LENGTH; i++) {
         targetVector.setSafe(i, String.valueOf(i).getBytes(StandardCharsets.UTF_8));
@@ -137,9 +137,13 @@ public void testParallelStringSearch() throws ExecutionException, InterruptedExc
       targetVector.setValueCount(VECTOR_LENGTH);
       keyVector.setValueCount(VECTOR_LENGTH);
 
-      ParallelSearcher<VarCharVector> searcher = new ParallelSearcher<>(targetVector, threadPool, threadCount);
+      ParallelSearcher<VarCharVector> searcher =
+          new ParallelSearcher<>(targetVector, threadPool, threadCount);
       for (int i = 0; i < VECTOR_LENGTH; i++) {
-        int pos = comparator == null ? searcher.search(keyVector, i) : searcher.search(keyVector, i, comparator);
+        int pos =
+            comparator == null
+                ? searcher.search(keyVector, i)
+                : searcher.search(keyVector, i, comparator);
         if (i * 2 < VECTOR_LENGTH) {
           assertEquals(i * 2, pos);
         } else {
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorRangeSearcher.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorRangeSearcher.java
index 18f4fa0355f4f..922ec6cbeeb82 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorRangeSearcher.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorRangeSearcher.java
@@ -14,51 +14,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.search;
 
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.Collection;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 import org.apache.arrow.algorithm.sort.DefaultVectorComparators;
 import org.apache.arrow.algorithm.sort.VectorValueComparator;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-/**
- * Test cases for {@link VectorRangeSearcher}.
- */
-@RunWith(Parameterized.class)
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/** Test cases for {@link VectorRangeSearcher}. */
 public class TestVectorRangeSearcher {
 
   private BufferAllocator allocator;
 
-  private int repeat;
-
-  public TestVectorRangeSearcher(int repeat) {
-    this.repeat = repeat;
-  }
-
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
 
-  @Test
-  public void testGetLowerBounds() {
+  @ParameterizedTest
+  @MethodSource("getRepeat")
+  public void testGetLowerBounds(int repeat) {
     final int maxValue = 100;
     try (IntVector intVector = new IntVector("int vec", allocator)) {
       // allocate vector
@@ -78,16 +67,19 @@ public void testGetLowerBounds() {
       }
 
       // do search
-      VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(intVector);
+      VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(intVector);
       for (int i = 0; i < maxValue; i++) {
-        int result = VectorRangeSearcher.getFirstMatch(intVector, comparator, intVector, i * repeat);
+        int result =
+            VectorRangeSearcher.getFirstMatch(intVector, comparator, intVector, i * repeat);
         assertEquals(i * ((long) repeat), result);
       }
     }
   }
 
-  @Test
-  public void testGetLowerBoundsNegative() {
+  @ParameterizedTest
+  @MethodSource("getRepeat")
+  public void testGetLowerBoundsNegative(int repeat) {
     final int maxValue = 100;
     try (IntVector intVector = new IntVector("int vec", allocator);
         IntVector negVector = new IntVector("neg vec", allocator)) {
@@ -112,7 +104,8 @@ public void testGetLowerBoundsNegative() {
       }
 
       // do search
-      VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(intVector);
+      VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(intVector);
       for (int i = 0; i < maxValue; i++) {
         int result = VectorRangeSearcher.getFirstMatch(intVector, comparator, negVector, i);
         assertEquals(-1, result);
@@ -120,8 +113,9 @@ public void testGetLowerBoundsNegative() {
     }
   }
 
-  @Test
-  public void testGetUpperBounds() {
+  @ParameterizedTest
+  @MethodSource("getRepeat")
+  public void testGetUpperBounds(int repeat) {
     final int maxValue = 100;
     try (IntVector intVector = new IntVector("int vec", allocator)) {
       // allocate vector
@@ -141,7 +135,8 @@ public void testGetUpperBounds() {
       }
 
       // do search
-      VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(intVector);
+      VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(intVector);
       for (int i = 0; i < maxValue; i++) {
         int result = VectorRangeSearcher.getLastMatch(intVector, comparator, intVector, i * repeat);
         assertEquals((i + 1) * repeat - 1, result);
@@ -149,11 +144,12 @@ public void testGetUpperBounds() {
     }
   }
 
-  @Test
-  public void testGetUpperBoundsNegative() {
+  @ParameterizedTest
+  @MethodSource("getRepeat")
+  public void testGetUpperBoundsNegative(int repeat) {
     final int maxValue = 100;
     try (IntVector intVector = new IntVector("int vec", allocator);
-         IntVector negVector = new IntVector("neg vec", allocator)) {
+        IntVector negVector = new IntVector("neg vec", allocator)) {
       // allocate vector
       intVector.allocateNew(maxValue * repeat);
       intVector.setValueCount(maxValue * repeat);
@@ -175,7 +171,8 @@ public void testGetUpperBoundsNegative() {
       }
 
       // do search
-      VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(intVector);
+      VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(intVector);
       for (int i = 0; i < maxValue; i++) {
         int result = VectorRangeSearcher.getLastMatch(intVector, comparator, negVector, i);
         assertEquals(-1, result);
@@ -183,13 +180,7 @@ public void testGetUpperBoundsNegative() {
     }
   }
 
-  @Parameterized.Parameters(name = "repeat = {0}")
-  public static Collection<Object[]> getRepeat() {
-    return Arrays.asList(
-      new Object[]{1},
-      new Object[]{2},
-      new Object[]{5},
-      new Object[]{10}
-    );
+  public static Stream<Arguments> getRepeat() {
+    return Stream.of(Arguments.of(1), Arguments.of(2), Arguments.of(5), Arguments.of(10));
   }
 }
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorSearcher.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorSearcher.java
index 32fa10bbd98d0..f08749a8d1ef4 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorSearcher.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/search/TestVectorSearcher.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.search;
 
 import static org.apache.arrow.vector.complex.BaseRepeatedValueVector.OFFSET_WIDTH;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.nio.charset.StandardCharsets;
-
 import org.apache.arrow.algorithm.sort.DefaultVectorComparators;
 import org.apache.arrow.algorithm.sort.VectorValueComparator;
 import org.apache.arrow.memory.BufferAllocator;
@@ -33,25 +31,23 @@
 import org.apache.arrow.vector.complex.ListVector;
 import org.apache.arrow.vector.types.Types;
 import org.apache.arrow.vector.types.pojo.FieldType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link org.apache.arrow.algorithm.search.VectorSearcher}.
- */
+/** Test cases for {@link org.apache.arrow.algorithm.search.VectorSearcher}. */
 public class TestVectorSearcher {
 
   private final int VECTOR_LENGTH = 100;
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -59,7 +55,7 @@ public void shutdown() {
   @Test
   public void testBinarySearchInt() {
     try (IntVector rawVector = new IntVector("", allocator);
-         IntVector negVector = new IntVector("", allocator)) {
+        IntVector negVector = new IntVector("", allocator)) {
       rawVector.allocateNew(VECTOR_LENGTH);
       rawVector.setValueCount(VECTOR_LENGTH);
       negVector.allocateNew(1);
@@ -77,7 +73,7 @@ public void testBinarySearchInt() {
 
       // do search
       VectorValueComparator<IntVector> comparator =
-              DefaultVectorComparators.createDefaultComparator(rawVector);
+          DefaultVectorComparators.createDefaultComparator(rawVector);
       for (int i = 0; i < VECTOR_LENGTH; i++) {
         int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
         assertEquals(i, result);
@@ -91,7 +87,7 @@ public void testBinarySearchInt() {
   @Test
   public void testLinearSearchInt() {
     try (IntVector rawVector = new IntVector("", allocator);
-         IntVector negVector = new IntVector("", allocator)) {
+        IntVector negVector = new IntVector("", allocator)) {
       rawVector.allocateNew(VECTOR_LENGTH);
       rawVector.setValueCount(VECTOR_LENGTH);
       negVector.allocateNew(1);
@@ -109,7 +105,7 @@ public void testLinearSearchInt() {
 
       // do search
       VectorValueComparator<IntVector> comparator =
-              DefaultVectorComparators.createDefaultComparator(rawVector);
+          DefaultVectorComparators.createDefaultComparator(rawVector);
       for (int i = 0; i < VECTOR_LENGTH; i++) {
         int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
         assertEquals(i, result);
@@ -123,7 +119,7 @@ public void testLinearSearchInt() {
   @Test
   public void testBinarySearchVarChar() {
     try (VarCharVector rawVector = new VarCharVector("", allocator);
-         VarCharVector negVector = new VarCharVector("", allocator)) {
+        VarCharVector negVector = new VarCharVector("", allocator)) {
       rawVector.allocateNew(VECTOR_LENGTH * 16, VECTOR_LENGTH);
       rawVector.setValueCount(VECTOR_LENGTH);
       negVector.allocateNew(VECTOR_LENGTH, 1);
@@ -148,7 +144,7 @@ public void testBinarySearchVarChar() {
 
       // do search
       VectorValueComparator<BaseVariableWidthVector> comparator =
-              DefaultVectorComparators.createDefaultComparator(rawVector);
+          DefaultVectorComparators.createDefaultComparator(rawVector);
       for (int i = 0; i < VECTOR_LENGTH; i++) {
         int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
         assertEquals(i, result);
@@ -162,7 +158,7 @@ public void testBinarySearchVarChar() {
   @Test
   public void testLinearSearchVarChar() {
     try (VarCharVector rawVector = new VarCharVector("", allocator);
-         VarCharVector negVector = new VarCharVector("", allocator)) {
+        VarCharVector negVector = new VarCharVector("", allocator)) {
       rawVector.allocateNew(VECTOR_LENGTH * 16, VECTOR_LENGTH);
       rawVector.setValueCount(VECTOR_LENGTH);
       negVector.allocateNew(VECTOR_LENGTH, 1);
@@ -187,7 +183,7 @@ public void testLinearSearchVarChar() {
 
       // do search
       VectorValueComparator<BaseVariableWidthVector> comparator =
-              DefaultVectorComparators.createDefaultComparator(rawVector);
+          DefaultVectorComparators.createDefaultComparator(rawVector);
       for (int i = 0; i < VECTOR_LENGTH; i++) {
         int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
         assertEquals(i, result);
@@ -260,11 +256,11 @@ private ListVector createNegativeListVector() {
   @Test
   public void testBinarySearchList() {
     try (ListVector rawVector = createListVector();
-         ListVector negVector = createNegativeListVector()) {
+        ListVector negVector = createNegativeListVector()) {
 
       // do search
       VectorValueComparator<ListVector> comparator =
-              DefaultVectorComparators.createDefaultComparator(rawVector);
+          DefaultVectorComparators.createDefaultComparator(rawVector);
       for (int i = 0; i < rawVector.getValueCount(); i++) {
         int result = VectorSearcher.binarySearch(rawVector, comparator, rawVector, i);
         assertEquals(i, result);
@@ -281,11 +277,11 @@ public void testBinarySearchList() {
   @Test
   public void testLinearSearchList() {
     try (ListVector rawVector = createListVector();
-         ListVector negVector = createNegativeListVector()) {
+        ListVector negVector = createNegativeListVector()) {
 
       // do search
       VectorValueComparator<ListVector> comparator =
-              DefaultVectorComparators.createDefaultComparator(rawVector);
+          DefaultVectorComparators.createDefaultComparator(rawVector);
       for (int i = 0; i < rawVector.getValueCount(); i++) {
         int result = VectorSearcher.linearSearch(rawVector, comparator, rawVector, i);
         assertEquals(i, result);
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestCompositeVectorComparator.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestCompositeVectorComparator.java
index 9624432924b5a..35f55f338992e 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestCompositeVectorComparator.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestCompositeVectorComparator.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -22,30 +21,27 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link CompositeVectorComparator}.
- */
+/** Test cases for {@link CompositeVectorComparator}. */
 public class TestCompositeVectorComparator {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -60,7 +56,7 @@ public void testCompareVectorSchemaRoot() {
     VarCharVector strVec2 = new VarCharVector("str2", allocator);
 
     try (VectorSchemaRoot batch1 = new VectorSchemaRoot(Arrays.asList(intVec1, strVec1));
-         VectorSchemaRoot batch2 = new VectorSchemaRoot(Arrays.asList(intVec2, strVec2))) {
+        VectorSchemaRoot batch2 = new VectorSchemaRoot(Arrays.asList(intVec2, strVec2))) {
 
       intVec1.allocateNew(vectorLength);
       strVec1.allocateNew(vectorLength * 10, vectorLength);
@@ -75,15 +71,15 @@ public void testCompareVectorSchemaRoot() {
       }
 
       VectorValueComparator<IntVector> innerComparator1 =
-              DefaultVectorComparators.createDefaultComparator(intVec1);
+          DefaultVectorComparators.createDefaultComparator(intVec1);
       innerComparator1.attachVectors(intVec1, intVec2);
       VectorValueComparator<VarCharVector> innerComparator2 =
-              DefaultVectorComparators.createDefaultComparator(strVec1);
+          DefaultVectorComparators.createDefaultComparator(strVec1);
       innerComparator2.attachVectors(strVec1, strVec2);
 
-      VectorValueComparator<ValueVector> comparator = new CompositeVectorComparator(
-          new VectorValueComparator[]{innerComparator1, innerComparator2}
-      );
+      VectorValueComparator<ValueVector> comparator =
+          new CompositeVectorComparator(
+              new VectorValueComparator[] {innerComparator1, innerComparator2});
 
       // verify results
 
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestDefaultVectorComparator.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestDefaultVectorComparator.java
index c40854fb17410..2a046533e89a2 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestDefaultVectorComparator.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestDefaultVectorComparator.java
@@ -14,11 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import static org.apache.arrow.vector.complex.BaseRepeatedValueVector.OFFSET_WIDTH;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -62,24 +61,21 @@
 import org.apache.arrow.vector.types.Types;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.FieldType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link DefaultVectorComparators}.
- */
+/** Test cases for {@link DefaultVectorComparators}. */
 public class TestDefaultVectorComparator {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -111,9 +107,9 @@ private ListVector createListVector(int count) {
   @Test
   public void testCompareLists() {
     try (ListVector listVector1 = createListVector(10);
-         ListVector listVector2 = createListVector(11)) {
+        ListVector listVector2 = createListVector(11)) {
       VectorValueComparator<ListVector> comparator =
-              DefaultVectorComparators.createDefaultComparator(listVector1);
+          DefaultVectorComparators.createDefaultComparator(listVector1);
       comparator.attachVectors(listVector1, listVector2);
 
       // prefix is smaller
@@ -121,11 +117,11 @@ public void testCompareLists() {
     }
 
     try (ListVector listVector1 = createListVector(11);
-         ListVector listVector2 = createListVector(11)) {
+        ListVector listVector2 = createListVector(11)) {
       ((IntVector) listVector2.getDataVector()).set(10, 110);
 
       VectorValueComparator<ListVector> comparator =
-              DefaultVectorComparators.createDefaultComparator(listVector1);
+          DefaultVectorComparators.createDefaultComparator(listVector1);
       comparator.attachVectors(listVector1, listVector2);
 
       // breaking tie by the last element
@@ -133,10 +129,10 @@ public void testCompareLists() {
     }
 
     try (ListVector listVector1 = createListVector(10);
-         ListVector listVector2 = createListVector(10)) {
+        ListVector listVector2 = createListVector(10)) {
 
       VectorValueComparator<ListVector> comparator =
-              DefaultVectorComparators.createDefaultComparator(listVector1);
+          DefaultVectorComparators.createDefaultComparator(listVector1);
       comparator.attachVectors(listVector1, listVector2);
 
       // list vector elements equal
@@ -149,9 +145,9 @@ public void testCopiedComparatorForLists() {
     for (int i = 1; i < 10; i++) {
       for (int j = 1; j < 10; j++) {
         try (ListVector listVector1 = createListVector(10);
-             ListVector listVector2 = createListVector(11)) {
+            ListVector listVector2 = createListVector(11)) {
           VectorValueComparator<ListVector> comparator =
-                  DefaultVectorComparators.createDefaultComparator(listVector1);
+              DefaultVectorComparators.createDefaultComparator(listVector1);
           comparator.attachVectors(listVector1, listVector2);
 
           VectorValueComparator<ListVector> copyComparator = comparator.createNew();
@@ -185,7 +181,7 @@ private FixedSizeListVector createFixedSizeListVector(int count) {
   @Test
   public void testCompareFixedSizeLists() {
     try (FixedSizeListVector listVector1 = createFixedSizeListVector(10);
-         FixedSizeListVector listVector2 = createFixedSizeListVector(11)) {
+        FixedSizeListVector listVector2 = createFixedSizeListVector(11)) {
       VectorValueComparator<FixedSizeListVector> comparator =
           DefaultVectorComparators.createDefaultComparator(listVector1);
       comparator.attachVectors(listVector1, listVector2);
@@ -195,7 +191,7 @@ public void testCompareFixedSizeLists() {
     }
 
     try (FixedSizeListVector listVector1 = createFixedSizeListVector(11);
-         FixedSizeListVector listVector2 = createFixedSizeListVector(11)) {
+        FixedSizeListVector listVector2 = createFixedSizeListVector(11)) {
       ((IntVector) listVector2.getDataVector()).set(10, 110);
 
       VectorValueComparator<FixedSizeListVector> comparator =
@@ -207,7 +203,7 @@ public void testCompareFixedSizeLists() {
     }
 
     try (FixedSizeListVector listVector1 = createFixedSizeListVector(10);
-         FixedSizeListVector listVector2 = createFixedSizeListVector(10)) {
+        FixedSizeListVector listVector2 = createFixedSizeListVector(10)) {
 
       VectorValueComparator<FixedSizeListVector> comparator =
           DefaultVectorComparators.createDefaultComparator(listVector1);
@@ -236,7 +232,7 @@ public void testCompareUInt1() {
       vec.set(9, Byte.MIN_VALUE);
 
       VectorValueComparator<UInt1Vector> comparator =
-              DefaultVectorComparators.createDefaultComparator(vec);
+          DefaultVectorComparators.createDefaultComparator(vec);
       comparator.attachVector(vec);
 
       assertTrue(comparator.compare(0, 1) < 0);
@@ -259,14 +255,21 @@ public void testCompareUInt2() {
       vec.allocateNew(10);
 
       ValueVectorDataPopulator.setVector(
-          vec, null, (char) (Character.MAX_VALUE - 1), Character.MAX_VALUE, (char) 0, (char) 1,
-          (char) 2, (char) (Character.MAX_VALUE - 1), null,
+          vec,
+          null,
+          (char) (Character.MAX_VALUE - 1),
+          Character.MAX_VALUE,
+          (char) 0,
+          (char) 1,
+          (char) 2,
+          (char) (Character.MAX_VALUE - 1),
+          null,
           '\u7FFF', // value for the max 16-byte signed integer
           '\u8000' // value for the min 16-byte signed integer
-      );
+          );
 
       VectorValueComparator<UInt2Vector> comparator =
-              DefaultVectorComparators.createDefaultComparator(vec);
+          DefaultVectorComparators.createDefaultComparator(vec);
       comparator.attachVector(vec);
 
       assertTrue(comparator.compare(0, 1) < 0);
@@ -274,8 +277,8 @@ public void testCompareUInt2() {
       assertTrue(comparator.compare(1, 3) > 0);
       assertTrue(comparator.compare(2, 5) > 0);
       assertTrue(comparator.compare(4, 5) < 0);
-      Assertions.assertEquals(0, comparator.compare(1, 6));
-      Assertions.assertEquals(0, comparator.compare(0, 7));
+      assertEquals(0, comparator.compare(1, 6));
+      assertEquals(0, comparator.compare(0, 7));
       assertTrue(comparator.compare(8, 9) < 0);
       assertTrue(comparator.compare(4, 8) < 0);
       assertTrue(comparator.compare(5, 9) < 0);
@@ -301,7 +304,7 @@ public void testCompareUInt4() {
       vec.set(9, Integer.MIN_VALUE);
 
       VectorValueComparator<UInt4Vector> comparator =
-              DefaultVectorComparators.createDefaultComparator(vec);
+          DefaultVectorComparators.createDefaultComparator(vec);
       comparator.attachVector(vec);
 
       assertTrue(comparator.compare(0, 1) < 0);
@@ -336,7 +339,7 @@ public void testCompareUInt8() {
       vec.set(9, Long.MIN_VALUE);
 
       VectorValueComparator<UInt8Vector> comparator =
-              DefaultVectorComparators.createDefaultComparator(vec);
+          DefaultVectorComparators.createDefaultComparator(vec);
       comparator.attachVector(vec);
 
       assertTrue(comparator.compare(0, 1) < 0);
@@ -358,7 +361,16 @@ public void testCompareFloat4() {
     try (Float4Vector vec = new Float4Vector("", allocator)) {
       vec.allocateNew(9);
       ValueVectorDataPopulator.setVector(
-          vec, -1.1f, 0.0f, 1.0f, null, 1.0f, 2.0f, Float.NaN, Float.NaN, Float.POSITIVE_INFINITY,
+          vec,
+          -1.1f,
+          0.0f,
+          1.0f,
+          null,
+          1.0f,
+          2.0f,
+          Float.NaN,
+          Float.NaN,
+          Float.POSITIVE_INFINITY,
           Float.NEGATIVE_INFINITY);
 
       VectorValueComparator<Float4Vector> comparator =
@@ -393,7 +405,16 @@ public void testCompareFloat8() {
     try (Float8Vector vec = new Float8Vector("", allocator)) {
       vec.allocateNew(9);
       ValueVectorDataPopulator.setVector(
-          vec, -1.1, 0.0, 1.0, null, 1.0, 2.0, Double.NaN, Double.NaN, Double.POSITIVE_INFINITY,
+          vec,
+          -1.1,
+          0.0,
+          1.0,
+          null,
+          1.0,
+          2.0,
+          Double.NaN,
+          Double.NaN,
+          Double.POSITIVE_INFINITY,
           Double.NEGATIVE_INFINITY);
 
       VectorValueComparator<Float8Vector> comparator =
@@ -488,8 +509,15 @@ public void testCompareShort() {
     try (SmallIntVector vec = new SmallIntVector("", allocator)) {
       vec.allocateNew(8);
       ValueVectorDataPopulator.setVector(
-          vec, (short) -1, (short) 0, (short) 1, null, (short) 1, (short) 5,
-          (short) (Short.MIN_VALUE + 1), Short.MAX_VALUE);
+          vec,
+          (short) -1,
+          (short) 0,
+          (short) 1,
+          null,
+          (short) 1,
+          (short) 5,
+          (short) (Short.MIN_VALUE + 1),
+          Short.MAX_VALUE);
 
       VectorValueComparator<SmallIntVector> comparator =
           DefaultVectorComparators.createDefaultComparator(vec);
@@ -519,8 +547,15 @@ public void testCompareByte() {
     try (TinyIntVector vec = new TinyIntVector("", allocator)) {
       vec.allocateNew(8);
       ValueVectorDataPopulator.setVector(
-          vec, (byte) -1, (byte) 0, (byte) 1, null, (byte) 1, (byte) 5,
-          (byte) (Byte.MIN_VALUE + 1), Byte.MAX_VALUE);
+          vec,
+          (byte) -1,
+          (byte) 0,
+          (byte) 1,
+          null,
+          (byte) 1,
+          (byte) 5,
+          (byte) (Byte.MIN_VALUE + 1),
+          Byte.MAX_VALUE);
 
       VectorValueComparator<TinyIntVector> comparator =
           DefaultVectorComparators.createDefaultComparator(vec);
@@ -549,8 +584,7 @@ public void testCompareByte() {
   public void testCompareBit() {
     try (BitVector vec = new BitVector("", allocator)) {
       vec.allocateNew(6);
-      ValueVectorDataPopulator.setVector(
-          vec, 1, 2, 0, 0, -1, null);
+      ValueVectorDataPopulator.setVector(vec, 1, 2, 0, 0, -1, null);
 
       VectorValueComparator<BitVector> comparator =
           DefaultVectorComparators.createDefaultComparator(vec);
@@ -691,7 +725,8 @@ public void testCompareDecimal256() {
   @Test
   public void testCompareDuration() {
     try (DurationVector vec =
-             new DurationVector("", FieldType.nullable(new ArrowType.Duration(TimeUnit.MILLISECOND)), allocator)) {
+        new DurationVector(
+            "", FieldType.nullable(new ArrowType.Duration(TimeUnit.MILLISECOND)), allocator)) {
       vec.allocateNew(8);
       ValueVectorDataPopulator.setVector(
           vec, -1L, 0L, 1L, null, 1L, 5L, Long.MIN_VALUE + 1L, Long.MAX_VALUE);
@@ -722,7 +757,8 @@ public void testCompareDuration() {
   @Test
   public void testCompareIntervalDay() {
     try (IntervalDayVector vec =
-             new IntervalDayVector("", FieldType.nullable(new ArrowType.Duration(TimeUnit.MILLISECOND)), allocator)) {
+        new IntervalDayVector(
+            "", FieldType.nullable(new ArrowType.Duration(TimeUnit.MILLISECOND)), allocator)) {
       vec.allocateNew(8);
       vec.set(0, -1, 0);
       vec.set(1, 0, 0);
@@ -755,8 +791,7 @@ public void testCompareIntervalDay() {
 
   @Test
   public void testCompareTimeMicro() {
-    try (TimeMicroVector vec =
-             new TimeMicroVector("", allocator)) {
+    try (TimeMicroVector vec = new TimeMicroVector("", allocator)) {
       vec.allocateNew(8);
       ValueVectorDataPopulator.setVector(
           vec, -1L, 0L, 1L, null, 1L, 5L, Long.MIN_VALUE + 1L, Long.MAX_VALUE);
@@ -816,8 +851,7 @@ public void testCompareTimeMilli() {
 
   @Test
   public void testCompareTimeNano() {
-    try (TimeNanoVector vec =
-             new TimeNanoVector("", allocator)) {
+    try (TimeNanoVector vec = new TimeNanoVector("", allocator)) {
       vec.allocateNew(8);
       ValueVectorDataPopulator.setVector(
           vec, -1L, 0L, 1L, null, 1L, 5L, Long.MIN_VALUE + 1L, Long.MAX_VALUE);
@@ -877,8 +911,7 @@ public void testCompareTimeSec() {
 
   @Test
   public void testCompareTimeStamp() {
-    try (TimeStampMilliVector vec =
-             new TimeStampMilliVector("", allocator)) {
+    try (TimeStampMilliVector vec = new TimeStampMilliVector("", allocator)) {
       vec.allocateNew(8);
       ValueVectorDataPopulator.setVector(
           vec, -1L, 0L, 1L, null, 1L, 5L, Long.MIN_VALUE + 1L, Long.MAX_VALUE);
@@ -909,7 +942,7 @@ public void testCompareTimeStamp() {
   @Test
   public void testCompareFixedSizeBinary() {
     try (FixedSizeBinaryVector vector1 = new FixedSizeBinaryVector("test1", allocator, 2);
-         FixedSizeBinaryVector vector2 = new FixedSizeBinaryVector("test1", allocator, 3)) {
+        FixedSizeBinaryVector vector2 = new FixedSizeBinaryVector("test1", allocator, 3)) {
       vector1.allocateNew();
       vector2.allocateNew();
       vector1.set(0, new byte[] {1, 1});
@@ -923,7 +956,7 @@ public void testCompareFixedSizeBinary() {
     }
 
     try (FixedSizeBinaryVector vector1 = new FixedSizeBinaryVector("test1", allocator, 3);
-         FixedSizeBinaryVector vector2 = new FixedSizeBinaryVector("test1", allocator, 3)) {
+        FixedSizeBinaryVector vector2 = new FixedSizeBinaryVector("test1", allocator, 3)) {
       vector1.allocateNew();
       vector2.allocateNew();
       vector1.set(0, new byte[] {1, 1, 0});
@@ -937,7 +970,7 @@ public void testCompareFixedSizeBinary() {
     }
 
     try (FixedSizeBinaryVector vector1 = new FixedSizeBinaryVector("test1", allocator, 3);
-         FixedSizeBinaryVector vector2 = new FixedSizeBinaryVector("test1", allocator, 3)) {
+        FixedSizeBinaryVector vector2 = new FixedSizeBinaryVector("test1", allocator, 3)) {
       vector1.allocateNew();
       vector2.allocateNew();
       vector1.set(0, new byte[] {1, 1, 1});
@@ -953,8 +986,8 @@ public void testCompareFixedSizeBinary() {
 
   @Test
   public void testCompareNull() {
-    try (NullVector vec = new NullVector("test",
-        FieldType.notNullable(new ArrowType.Int(32, false)))) {
+    try (NullVector vec =
+        new NullVector("test", FieldType.notNullable(new ArrowType.Int(32, false)))) {
       vec.setValueCount(2);
 
       VectorValueComparator<NullVector> comparator =
@@ -967,12 +1000,14 @@ public void testCompareNull() {
 
   @Test
   public void testCheckNullsOnCompareIsFalseForNonNullableVector() {
-    try (IntVector vec = new IntVector("not nullable",
-            FieldType.notNullable(new ArrowType.Int(32, false)), allocator)) {
+    try (IntVector vec =
+        new IntVector(
+            "not nullable", FieldType.notNullable(new ArrowType.Int(32, false)), allocator)) {
 
       ValueVectorDataPopulator.setVector(vec, 1, 2, 3, 4);
 
-      final VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      final VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
       comparator.attachVector(vec);
 
       assertFalse(comparator.checkNullsOnCompare());
@@ -981,16 +1016,17 @@ public void testCheckNullsOnCompareIsFalseForNonNullableVector() {
 
   @Test
   public void testCheckNullsOnCompareIsTrueForNullableVector() {
-    try (IntVector vec = new IntVector("nullable", FieldType.nullable(
-            new ArrowType.Int(32, false)), allocator);
-         IntVector vec2 = new IntVector("not-nullable", FieldType.notNullable(
-                 new ArrowType.Int(32, false)), allocator)
-    ) {
+    try (IntVector vec =
+            new IntVector("nullable", FieldType.nullable(new ArrowType.Int(32, false)), allocator);
+        IntVector vec2 =
+            new IntVector(
+                "not-nullable", FieldType.notNullable(new ArrowType.Int(32, false)), allocator)) {
 
       ValueVectorDataPopulator.setVector(vec, 1, null, 3, 4);
       ValueVectorDataPopulator.setVector(vec2, 1, 2, 3, 4);
 
-      final VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      final VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
       comparator.attachVector(vec);
       assertTrue(comparator.checkNullsOnCompare());
 
@@ -1001,17 +1037,18 @@ public void testCheckNullsOnCompareIsTrueForNullableVector() {
 
   @Test
   public void testCheckNullsOnCompareIsFalseWithNoNulls() {
-    try (IntVector vec = new IntVector("nullable", FieldType.nullable(
-            new ArrowType.Int(32, false)), allocator);
-         IntVector vec2 = new IntVector("also-nullable", FieldType.nullable(
-                 new ArrowType.Int(32, false)), allocator)
-    ) {
+    try (IntVector vec =
+            new IntVector("nullable", FieldType.nullable(new ArrowType.Int(32, false)), allocator);
+        IntVector vec2 =
+            new IntVector(
+                "also-nullable", FieldType.nullable(new ArrowType.Int(32, false)), allocator)) {
 
       // no null values
       ValueVectorDataPopulator.setVector(vec, 1, 2, 3, 4);
       ValueVectorDataPopulator.setVector(vec2, 1, 2, 3, 4);
 
-      final VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      final VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
       comparator.attachVector(vec);
       assertFalse(comparator.checkNullsOnCompare());
 
@@ -1022,13 +1059,14 @@ public void testCheckNullsOnCompareIsFalseWithNoNulls() {
 
   @Test
   public void testCheckNullsOnCompareIsTrueWithEmptyVectors() {
-    try (IntVector vec = new IntVector("nullable", FieldType.nullable(
-            new ArrowType.Int(32, false)), allocator);
-         IntVector vec2 = new IntVector("also-nullable", FieldType.nullable(
-                 new ArrowType.Int(32, false)), allocator)
-    ) {
+    try (IntVector vec =
+            new IntVector("nullable", FieldType.nullable(new ArrowType.Int(32, false)), allocator);
+        IntVector vec2 =
+            new IntVector(
+                "also-nullable", FieldType.nullable(new ArrowType.Int(32, false)), allocator)) {
 
-      final VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      final VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
       comparator.attachVector(vec2);
       assertTrue(comparator.checkNullsOnCompare());
 
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthInPlaceVectorSorter.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthInPlaceVectorSorter.java
index 91ef52017df4d..d0f59219a8cfc 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthInPlaceVectorSorter.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthInPlaceVectorSorter.java
@@ -14,37 +14,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.stream.IntStream;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.testing.ValueVectorDataPopulator;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link FixedWidthInPlaceVectorSorter}.
- */
+/** Test cases for {@link FixedWidthInPlaceVectorSorter}. */
 public class TestFixedWidthInPlaceVectorSorter {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -69,29 +64,30 @@ public void testSortInt() {
 
       // sort the vector
       FixedWidthInPlaceVectorSorter sorter = new FixedWidthInPlaceVectorSorter();
-      VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
 
       sorter.sortInPlace(vec, comparator);
 
       // verify results
-      Assert.assertEquals(10, vec.getValueCount());
+      assertEquals(10, vec.getValueCount());
 
       assertTrue(vec.isNull(0));
       assertTrue(vec.isNull(1));
-      Assert.assertEquals(2, vec.get(2));
-      Assert.assertEquals(8, vec.get(3));
-      Assert.assertEquals(10, vec.get(4));
-      Assert.assertEquals(10, vec.get(5));
-      Assert.assertEquals(12, vec.get(6));
-      Assert.assertEquals(17, vec.get(7));
-      Assert.assertEquals(23, vec.get(8));
-      Assert.assertEquals(35, vec.get(9));
+      assertEquals(2, vec.get(2));
+      assertEquals(8, vec.get(3));
+      assertEquals(10, vec.get(4));
+      assertEquals(10, vec.get(5));
+      assertEquals(12, vec.get(6));
+      assertEquals(17, vec.get(7));
+      assertEquals(23, vec.get(8));
+      assertEquals(35, vec.get(9));
     }
   }
 
   /**
-   * Tests the worst case for quick sort.
-   * It may cause stack overflow if the algorithm is implemented as a recursive algorithm.
+   * Tests the worst case for quick sort. It may cause stack overflow if the algorithm is
+   * implemented as a recursive algorithm.
    */
   @Test
   public void testSortLargeIncreasingInt() {
@@ -107,15 +103,16 @@ public void testSortLargeIncreasingInt() {
 
       // sort the vector
       FixedWidthInPlaceVectorSorter sorter = new FixedWidthInPlaceVectorSorter();
-      VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
 
       sorter.sortInPlace(vec, comparator);
 
       // verify results
-      Assert.assertEquals(vectorLength, vec.getValueCount());
+      assertEquals(vectorLength, vec.getValueCount());
 
       for (int i = 0; i < vectorLength; i++) {
-        Assert.assertEquals(i, vec.get(i));
+        assertEquals(i, vec.get(i));
       }
     }
   }
@@ -133,7 +130,8 @@ public void testChoosePivot() {
       vec.setValueCount(vectorLength);
 
       FixedWidthInPlaceVectorSorter sorter = new FixedWidthInPlaceVectorSorter();
-      VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
 
       try (IntVector pivotBuffer = (IntVector) vec.getField().createVector(allocator)) {
         // setup internal data structures
@@ -164,16 +162,15 @@ public void testChoosePivot() {
     }
   }
 
-  /**
-   * Evaluates choosing pivot for all possible permutations of 3 numbers.
-   */
+  /** Evaluates choosing pivot for all possible permutations of 3 numbers. */
   @Test
   public void testChoosePivotAllPermutes() {
     try (IntVector vec = new IntVector("", allocator)) {
       vec.allocateNew(3);
 
       FixedWidthInPlaceVectorSorter sorter = new FixedWidthInPlaceVectorSorter();
-      VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
 
       try (IntVector pivotBuffer = (IntVector) vec.getField().createVector(allocator)) {
         // setup internal data structures
@@ -216,25 +213,25 @@ public void testChoosePivotAllPermutes() {
   @Test
   public void testSortInt2() {
     try (IntVector vector = new IntVector("vector", allocator)) {
-      ValueVectorDataPopulator.setVector(vector,
-          0, 1, 2, 3, 4, 5, 30, 31, 32, 33,
-          34, 35, 60, 61, 62, 63, 64, 65, 6, 7,
-          8, 9, 10, 11, 36, 37, 38, 39, 40, 41,
-          66, 67, 68, 69, 70, 71);
+      ValueVectorDataPopulator.setVector(
+          vector, 0, 1, 2, 3, 4, 5, 30, 31, 32, 33, 34, 35, 60, 61, 62, 63, 64, 65, 6, 7, 8, 9, 10,
+          11, 36, 37, 38, 39, 40, 41, 66, 67, 68, 69, 70, 71);
 
       FixedWidthInPlaceVectorSorter sorter = new FixedWidthInPlaceVectorSorter();
-      VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vector);
+      VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vector);
 
       sorter.sortInPlace(vector, comparator);
 
       int[] actual = new int[vector.getValueCount()];
-      IntStream.range(0, vector.getValueCount()).forEach(
-          i -> actual[i] = vector.get(i));
+      IntStream.range(0, vector.getValueCount()).forEach(i -> actual[i] = vector.get(i));
 
       assertArrayEquals(
-          new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
-              11, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
-              40, 41, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71}, actual);
+          new int[] {
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+            60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71
+          },
+          actual);
     }
   }
 }
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthOutOfPlaceVectorSorter.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthOutOfPlaceVectorSorter.java
index cc13e7f8ceaee..e1e5167831235 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthOutOfPlaceVectorSorter.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthOutOfPlaceVectorSorter.java
@@ -14,14 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
-import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.stream.IntStream;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.BaseFixedWidthVector;
@@ -32,38 +31,35 @@
 import org.apache.arrow.vector.SmallIntVector;
 import org.apache.arrow.vector.TinyIntVector;
 import org.apache.arrow.vector.testing.ValueVectorDataPopulator;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-/**
- * Test cases for {@link FixedWidthOutOfPlaceVectorSorter}.
- */
+/** Test cases for {@link FixedWidthOutOfPlaceVectorSorter}. */
 public class TestFixedWidthOutOfPlaceVectorSorter extends TestOutOfPlaceVectorSorter {
 
   private BufferAllocator allocator;
 
-  public TestFixedWidthOutOfPlaceVectorSorter(boolean generalSorter) {
-    super(generalSorter);
-  }
-
-  <V extends BaseFixedWidthVector> OutOfPlaceVectorSorter<V> getSorter() {
-    return generalSorter ? new GeneralOutOfPlaceVectorSorter<>() : new FixedWidthOutOfPlaceVectorSorter<>();
+  <V extends BaseFixedWidthVector> OutOfPlaceVectorSorter<V> getSorter(boolean generalSorter) {
+    return generalSorter
+        ? new GeneralOutOfPlaceVectorSorter<>()
+        : new FixedWidthOutOfPlaceVectorSorter<>();
   }
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
 
-  @Test
-  public void testSortByte() {
+  @ParameterizedTest
+  @MethodSource("getParameter")
+  public void testSortByte(boolean generalSorter) {
     try (TinyIntVector vec = new TinyIntVector("", allocator)) {
       vec.allocateNew(10);
       vec.setValueCount(10);
@@ -81,36 +77,38 @@ public void testSortByte() {
       vec.set(9, 2);
 
       // sort the vector
-      OutOfPlaceVectorSorter<TinyIntVector> sorter = getSorter();
-      VectorValueComparator<TinyIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      OutOfPlaceVectorSorter<TinyIntVector> sorter = getSorter(generalSorter);
+      VectorValueComparator<TinyIntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
 
       TinyIntVector sortedVec =
-              (TinyIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
+          (TinyIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
       sortedVec.allocateNew(vec.getValueCount());
       sortedVec.setValueCount(vec.getValueCount());
 
       sorter.sortOutOfPlace(vec, sortedVec, comparator);
 
       // verify results
-      Assert.assertEquals(vec.getValueCount(), sortedVec.getValueCount());
+      assertEquals(vec.getValueCount(), sortedVec.getValueCount());
 
       assertTrue(sortedVec.isNull(0));
       assertTrue(sortedVec.isNull(1));
-      Assert.assertEquals((byte) 2, sortedVec.get(2));
-      Assert.assertEquals((byte) 8, sortedVec.get(3));
-      Assert.assertEquals((byte) 10, sortedVec.get(4));
-      Assert.assertEquals((byte) 10, sortedVec.get(5));
-      Assert.assertEquals((byte) 12, sortedVec.get(6));
-      Assert.assertEquals((byte) 17, sortedVec.get(7));
-      Assert.assertEquals((byte) 23, sortedVec.get(8));
-      Assert.assertEquals((byte) 35, sortedVec.get(9));
+      assertEquals((byte) 2, sortedVec.get(2));
+      assertEquals((byte) 8, sortedVec.get(3));
+      assertEquals((byte) 10, sortedVec.get(4));
+      assertEquals((byte) 10, sortedVec.get(5));
+      assertEquals((byte) 12, sortedVec.get(6));
+      assertEquals((byte) 17, sortedVec.get(7));
+      assertEquals((byte) 23, sortedVec.get(8));
+      assertEquals((byte) 35, sortedVec.get(9));
 
       sortedVec.close();
     }
   }
 
-  @Test
-  public void testSortShort() {
+  @ParameterizedTest
+  @MethodSource("getParameter")
+  public void testSortShort(boolean generalSorter) {
     try (SmallIntVector vec = new SmallIntVector("", allocator)) {
       vec.allocateNew(10);
       vec.setValueCount(10);
@@ -128,36 +126,38 @@ public void testSortShort() {
       vec.set(9, 2);
 
       // sort the vector
-      OutOfPlaceVectorSorter<SmallIntVector> sorter = getSorter();
-      VectorValueComparator<SmallIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      OutOfPlaceVectorSorter<SmallIntVector> sorter = getSorter(generalSorter);
+      VectorValueComparator<SmallIntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
 
       SmallIntVector sortedVec =
-              (SmallIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
+          (SmallIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
       sortedVec.allocateNew(vec.getValueCount());
       sortedVec.setValueCount(vec.getValueCount());
 
       sorter.sortOutOfPlace(vec, sortedVec, comparator);
 
       // verify results
-      Assert.assertEquals(vec.getValueCount(), sortedVec.getValueCount());
+      assertEquals(vec.getValueCount(), sortedVec.getValueCount());
 
       assertTrue(sortedVec.isNull(0));
       assertTrue(sortedVec.isNull(1));
-      Assert.assertEquals((short) 2, sortedVec.get(2));
-      Assert.assertEquals((short) 8, sortedVec.get(3));
-      Assert.assertEquals((short) 10, sortedVec.get(4));
-      Assert.assertEquals((short) 10, sortedVec.get(5));
-      Assert.assertEquals((short) 12, sortedVec.get(6));
-      Assert.assertEquals((short) 17, sortedVec.get(7));
-      Assert.assertEquals((short) 23, sortedVec.get(8));
-      Assert.assertEquals((short) 35, sortedVec.get(9));
+      assertEquals((short) 2, sortedVec.get(2));
+      assertEquals((short) 8, sortedVec.get(3));
+      assertEquals((short) 10, sortedVec.get(4));
+      assertEquals((short) 10, sortedVec.get(5));
+      assertEquals((short) 12, sortedVec.get(6));
+      assertEquals((short) 17, sortedVec.get(7));
+      assertEquals((short) 23, sortedVec.get(8));
+      assertEquals((short) 35, sortedVec.get(9));
 
       sortedVec.close();
     }
   }
 
-  @Test
-  public void testSortInt() {
+  @ParameterizedTest
+  @MethodSource("getParameter")
+  public void testSortInt(boolean generalSorter) {
     try (IntVector vec = new IntVector("", allocator)) {
       vec.allocateNew(10);
       vec.setValueCount(10);
@@ -175,35 +175,38 @@ public void testSortInt() {
       vec.set(9, 2);
 
       // sort the vector
-      OutOfPlaceVectorSorter<IntVector> sorter = getSorter();
-      VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      OutOfPlaceVectorSorter<IntVector> sorter = getSorter(generalSorter);
+      VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
 
-      IntVector sortedVec = (IntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
+      IntVector sortedVec =
+          (IntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
       sortedVec.allocateNew(vec.getValueCount());
       sortedVec.setValueCount(vec.getValueCount());
 
       sorter.sortOutOfPlace(vec, sortedVec, comparator);
 
       // verify results
-      Assert.assertEquals(vec.getValueCount(), sortedVec.getValueCount());
+      assertEquals(vec.getValueCount(), sortedVec.getValueCount());
 
       assertTrue(sortedVec.isNull(0));
       assertTrue(sortedVec.isNull(1));
-      Assert.assertEquals(2, sortedVec.get(2));
-      Assert.assertEquals(8, sortedVec.get(3));
-      Assert.assertEquals(10, sortedVec.get(4));
-      Assert.assertEquals(10, sortedVec.get(5));
-      Assert.assertEquals(12, sortedVec.get(6));
-      Assert.assertEquals(17, sortedVec.get(7));
-      Assert.assertEquals(23, sortedVec.get(8));
-      Assert.assertEquals(35, sortedVec.get(9));
+      assertEquals(2, sortedVec.get(2));
+      assertEquals(8, sortedVec.get(3));
+      assertEquals(10, sortedVec.get(4));
+      assertEquals(10, sortedVec.get(5));
+      assertEquals(12, sortedVec.get(6));
+      assertEquals(17, sortedVec.get(7));
+      assertEquals(23, sortedVec.get(8));
+      assertEquals(35, sortedVec.get(9));
 
       sortedVec.close();
     }
   }
 
-  @Test
-  public void testSortLong() {
+  @ParameterizedTest
+  @MethodSource("getParameter")
+  public void testSortLong(boolean generalSorter) {
     try (BigIntVector vec = new BigIntVector("", allocator)) {
       vec.allocateNew(10);
       vec.setValueCount(10);
@@ -221,35 +224,38 @@ public void testSortLong() {
       vec.set(9, 2L);
 
       // sort the vector
-      OutOfPlaceVectorSorter<BigIntVector> sorter = getSorter();
-      VectorValueComparator<BigIntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      OutOfPlaceVectorSorter<BigIntVector> sorter = getSorter(generalSorter);
+      VectorValueComparator<BigIntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
 
-      BigIntVector sortedVec = (BigIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
+      BigIntVector sortedVec =
+          (BigIntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
       sortedVec.allocateNew(vec.getValueCount());
       sortedVec.setValueCount(vec.getValueCount());
 
       sorter.sortOutOfPlace(vec, sortedVec, comparator);
 
       // verify results
-      Assert.assertEquals(vec.getValueCount(), sortedVec.getValueCount());
+      assertEquals(vec.getValueCount(), sortedVec.getValueCount());
 
       assertTrue(sortedVec.isNull(0));
       assertTrue(sortedVec.isNull(1));
-      Assert.assertEquals(2L, sortedVec.get(2));
-      Assert.assertEquals(8L, sortedVec.get(3));
-      Assert.assertEquals(10L, sortedVec.get(4));
-      Assert.assertEquals(10L, sortedVec.get(5));
-      Assert.assertEquals(12L, sortedVec.get(6));
-      Assert.assertEquals(17L, sortedVec.get(7));
-      Assert.assertEquals(23L, sortedVec.get(8));
-      Assert.assertEquals(1L << 35L, sortedVec.get(9));
+      assertEquals(2L, sortedVec.get(2));
+      assertEquals(8L, sortedVec.get(3));
+      assertEquals(10L, sortedVec.get(4));
+      assertEquals(10L, sortedVec.get(5));
+      assertEquals(12L, sortedVec.get(6));
+      assertEquals(17L, sortedVec.get(7));
+      assertEquals(23L, sortedVec.get(8));
+      assertEquals(1L << 35L, sortedVec.get(9));
 
       sortedVec.close();
     }
   }
 
-  @Test
-  public void testSortFloat() {
+  @ParameterizedTest
+  @MethodSource("getParameter")
+  public void testSortFloat(boolean generalSorter) {
     try (Float4Vector vec = new Float4Vector("", allocator)) {
       vec.allocateNew(10);
       vec.setValueCount(10);
@@ -267,35 +273,38 @@ public void testSortFloat() {
       vec.set(9, 2f);
 
       // sort the vector
-      OutOfPlaceVectorSorter<Float4Vector> sorter = getSorter();
-      VectorValueComparator<Float4Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      OutOfPlaceVectorSorter<Float4Vector> sorter = getSorter(generalSorter);
+      VectorValueComparator<Float4Vector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
 
-      Float4Vector sortedVec = (Float4Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
+      Float4Vector sortedVec =
+          (Float4Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
       sortedVec.allocateNew(vec.getValueCount());
       sortedVec.setValueCount(vec.getValueCount());
 
       sorter.sortOutOfPlace(vec, sortedVec, comparator);
 
       // verify results
-      Assert.assertEquals(vec.getValueCount(), sortedVec.getValueCount());
+      assertEquals(vec.getValueCount(), sortedVec.getValueCount());
 
       assertTrue(sortedVec.isNull(0));
       assertTrue(sortedVec.isNull(1));
-      Assert.assertEquals(2f, sortedVec.get(2), 0f);
-      Assert.assertEquals(8f, sortedVec.get(3), 0f);
-      Assert.assertEquals(10f, sortedVec.get(4), 0f);
-      Assert.assertEquals(10f, sortedVec.get(5), 0f);
-      Assert.assertEquals(12f, sortedVec.get(6), 0f);
-      Assert.assertEquals(17f, sortedVec.get(7), 0f);
-      Assert.assertEquals(23f, sortedVec.get(8), 0f);
-      Assert.assertEquals(Float.NaN, sortedVec.get(9), 0f);
+      assertEquals(2f, sortedVec.get(2), 0f);
+      assertEquals(8f, sortedVec.get(3), 0f);
+      assertEquals(10f, sortedVec.get(4), 0f);
+      assertEquals(10f, sortedVec.get(5), 0f);
+      assertEquals(12f, sortedVec.get(6), 0f);
+      assertEquals(17f, sortedVec.get(7), 0f);
+      assertEquals(23f, sortedVec.get(8), 0f);
+      assertEquals(Float.NaN, sortedVec.get(9), 0f);
 
       sortedVec.close();
     }
   }
 
-  @Test
-  public void testSortDouble() {
+  @ParameterizedTest
+  @MethodSource("getParameter")
+  public void testSortDouble(boolean generalSorter) {
     try (Float8Vector vec = new Float8Vector("", allocator)) {
       vec.allocateNew(10);
       vec.setValueCount(10);
@@ -313,47 +322,50 @@ public void testSortDouble() {
       vec.set(9, 2);
 
       // sort the vector
-      OutOfPlaceVectorSorter<Float8Vector> sorter = getSorter();
-      VectorValueComparator<Float8Vector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      OutOfPlaceVectorSorter<Float8Vector> sorter = getSorter(generalSorter);
+      VectorValueComparator<Float8Vector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
 
-      Float8Vector sortedVec = (Float8Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
+      Float8Vector sortedVec =
+          (Float8Vector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
       sortedVec.allocateNew(vec.getValueCount());
       sortedVec.setValueCount(vec.getValueCount());
 
       sorter.sortOutOfPlace(vec, sortedVec, comparator);
 
       // verify results
-      Assert.assertEquals(vec.getValueCount(), sortedVec.getValueCount());
+      assertEquals(vec.getValueCount(), sortedVec.getValueCount());
 
       assertTrue(sortedVec.isNull(0));
       assertTrue(sortedVec.isNull(1));
-      Assert.assertEquals(2, sortedVec.get(2), 0);
-      Assert.assertEquals(8, sortedVec.get(3), 0);
-      Assert.assertEquals(10, sortedVec.get(4), 0);
-      Assert.assertEquals(10, sortedVec.get(5), 0);
-      Assert.assertEquals(12, sortedVec.get(6), 0);
-      Assert.assertEquals(17, sortedVec.get(7), 0);
-      Assert.assertEquals(35, sortedVec.get(8), 0);
-      Assert.assertEquals(Double.NaN, sortedVec.get(9), 0);
+      assertEquals(2, sortedVec.get(2), 0);
+      assertEquals(8, sortedVec.get(3), 0);
+      assertEquals(10, sortedVec.get(4), 0);
+      assertEquals(10, sortedVec.get(5), 0);
+      assertEquals(12, sortedVec.get(6), 0);
+      assertEquals(17, sortedVec.get(7), 0);
+      assertEquals(35, sortedVec.get(8), 0);
+      assertEquals(Double.NaN, sortedVec.get(9), 0);
 
       sortedVec.close();
     }
   }
 
-  @Test
-  public void testSortInt2() {
+  @ParameterizedTest
+  @MethodSource("getParameter")
+  public void testSortInt2(boolean generalSorter) {
     try (IntVector vec = new IntVector("", allocator)) {
-      ValueVectorDataPopulator.setVector(vec,
-          0, 1, 2, 3, 4, 5, 30, 31, 32, 33,
-          34, 35, 60, 61, 62, 63, 64, 65, 6, 7,
-          8, 9, 10, 11, 36, 37, 38, 39, 40, 41,
-          66, 67, 68, 69, 70, 71);
+      ValueVectorDataPopulator.setVector(
+          vec, 0, 1, 2, 3, 4, 5, 30, 31, 32, 33, 34, 35, 60, 61, 62, 63, 64, 65, 6, 7, 8, 9, 10, 11,
+          36, 37, 38, 39, 40, 41, 66, 67, 68, 69, 70, 71);
 
       // sort the vector
-      OutOfPlaceVectorSorter<IntVector> sorter = getSorter();
-      VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      OutOfPlaceVectorSorter<IntVector> sorter = getSorter(generalSorter);
+      VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
 
-      try (IntVector sortedVec = (IntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null)) {
+      try (IntVector sortedVec =
+          (IntVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null)) {
         sortedVec.allocateNew(vec.getValueCount());
         sortedVec.setValueCount(vec.getValueCount());
 
@@ -361,13 +373,14 @@ public void testSortInt2() {
 
         // verify results
         int[] actual = new int[sortedVec.getValueCount()];
-        IntStream.range(0, sortedVec.getValueCount()).forEach(
-            i -> actual[i] = sortedVec.get(i));
+        IntStream.range(0, sortedVec.getValueCount()).forEach(i -> actual[i] = sortedVec.get(i));
 
         assertArrayEquals(
-            new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
-                11, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
-                40, 41, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71}, actual);
+            new int[] {
+              0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41,
+              60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71
+            },
+            actual);
       }
     }
   }
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthSorting.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthSorting.java
index 80c72b4e21a27..d9056d08f4988 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthSorting.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestFixedWidthSorting.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.function.Function;
-
+import java.util.stream.Stream;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.BaseFixedWidthVector;
@@ -31,70 +29,59 @@
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.SmallIntVector;
 import org.apache.arrow.vector.TinyIntVector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-/**
- * Test sorting fixed width vectors with random data.
- */
-@RunWith(Parameterized.class)
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/** Test sorting fixed width vectors with random data. */
 public class TestFixedWidthSorting<V extends BaseFixedWidthVector, U extends Comparable<U>> {
 
   static final int[] VECTOR_LENGTHS = new int[] {2, 5, 10, 50, 100, 1000, 3000};
 
   static final double[] NULL_FRACTIONS = {0, 0.1, 0.3, 0.5, 0.7, 0.9, 1};
 
-  private final int length;
-
-  private final double nullFraction;
-
-  private final boolean inPlace;
-
-  private final Function<BufferAllocator, V> vectorGenerator;
-
-  private final TestSortingUtil.DataGenerator<V, U> dataGenerator;
-
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(Integer.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
 
-  public TestFixedWidthSorting(
-      int length, double nullFraction, boolean inPlace, String desc,
-      Function<BufferAllocator, V> vectorGenerator, TestSortingUtil.DataGenerator<V, U> dataGenerator) {
-    this.length = length;
-    this.nullFraction = nullFraction;
-    this.inPlace = inPlace;
-    this.vectorGenerator = vectorGenerator;
-    this.dataGenerator = dataGenerator;
-  }
-
-  @Test
-  public void testSort() {
+  @ParameterizedTest
+  @MethodSource("getParameters")
+  public void testSort(
+      boolean inPlace,
+      int length,
+      double nullFraction,
+      String desc,
+      Function<BufferAllocator, V> vectorGenerator,
+      TestSortingUtil.DataGenerator<V, U> dataGenerator) {
     if (inPlace) {
-      sortInPlace();
+      sortInPlace(length, nullFraction, vectorGenerator, dataGenerator);
     } else {
-      sortOutOfPlace();
+      sortOutOfPlace(length, nullFraction, vectorGenerator, dataGenerator);
     }
   }
 
-  void sortInPlace() {
+  void sortInPlace(
+      int length,
+      double nullFraction,
+      Function<BufferAllocator, V> vectorGenerator,
+      TestSortingUtil.DataGenerator<V, U> dataGenerator) {
     try (V vector = vectorGenerator.apply(allocator)) {
       U[] array = dataGenerator.populate(vector, length, nullFraction);
       TestSortingUtil.sortArray(array);
 
       FixedWidthInPlaceVectorSorter sorter = new FixedWidthInPlaceVectorSorter();
-      VectorValueComparator<V> comparator = DefaultVectorComparators.createDefaultComparator(vector);
+      VectorValueComparator<V> comparator =
+          DefaultVectorComparators.createDefaultComparator(vector);
 
       sorter.sortInPlace(vector, comparator);
 
@@ -102,16 +89,22 @@ void sortInPlace() {
     }
   }
 
-  void sortOutOfPlace() {
+  void sortOutOfPlace(
+      int length,
+      double nullFraction,
+      Function<BufferAllocator, V> vectorGenerator,
+      TestSortingUtil.DataGenerator<V, U> dataGenerator) {
     try (V vector = vectorGenerator.apply(allocator)) {
       U[] array = dataGenerator.populate(vector, length, nullFraction);
       TestSortingUtil.sortArray(array);
 
       // sort the vector
       FixedWidthOutOfPlaceVectorSorter sorter = new FixedWidthOutOfPlaceVectorSorter();
-      VectorValueComparator<V> comparator = DefaultVectorComparators.createDefaultComparator(vector);
+      VectorValueComparator<V> comparator =
+          DefaultVectorComparators.createDefaultComparator(vector);
 
-      try (V sortedVec = (V) vector.getField().getFieldType().createNewSingleVector("", allocator, null)) {
+      try (V sortedVec =
+          (V) vector.getField().getFieldType().createNewSingleVector("", allocator, null)) {
         sortedVec.allocateNew(vector.getValueCount());
         sortedVec.setValueCount(vector.getValueCount());
 
@@ -123,50 +116,73 @@ void sortOutOfPlace() {
     }
   }
 
-  @Parameterized.Parameters(name = "length = {0}, null fraction = {1}, in place = {2}, vector = {3}")
-  public static Collection<Object[]> getParameters() {
-    List<Object[]> params = new ArrayList<>();
+  public static Stream<Arguments> getParameters() {
+    List<Arguments> params = new ArrayList<>();
     for (int length : VECTOR_LENGTHS) {
       for (double nullFrac : NULL_FRACTIONS) {
         for (boolean inPlace : new boolean[] {true, false}) {
-          params.add(new Object[] {
-              length, nullFrac, inPlace, "TinyIntVector",
-              (Function<BufferAllocator, TinyIntVector>) allocator -> new TinyIntVector("vector", allocator),
-              TestSortingUtil.TINY_INT_GENERATOR
-          });
-
-          params.add(new Object[] {
-              length, nullFrac, inPlace, "SmallIntVector",
-              (Function<BufferAllocator, SmallIntVector>) allocator -> new SmallIntVector("vector", allocator),
-              TestSortingUtil.SMALL_INT_GENERATOR
-          });
-
-          params.add(new Object[] {
-              length, nullFrac, inPlace, "IntVector",
-              (Function<BufferAllocator, IntVector>) allocator -> new IntVector("vector", allocator),
-              TestSortingUtil.INT_GENERATOR
-          });
-
-          params.add(new Object[] {
-              length, nullFrac, inPlace, "BigIntVector",
-              (Function<BufferAllocator, BigIntVector>) allocator -> new BigIntVector("vector", allocator),
-              TestSortingUtil.LONG_GENERATOR
-          });
-
-          params.add(new Object[] {
-              length, nullFrac, inPlace, "Float4Vector",
-              (Function<BufferAllocator, Float4Vector>) allocator -> new Float4Vector("vector", allocator),
-              TestSortingUtil.FLOAT_GENERATOR
-          });
-
-          params.add(new Object[] {
-              length, nullFrac, inPlace, "Float8Vector",
-              (Function<BufferAllocator, Float8Vector>) allocator -> new Float8Vector("vector", allocator),
-              TestSortingUtil.DOUBLE_GENERATOR
-          });
+          params.add(
+              Arguments.of(
+                  inPlace,
+                  length,
+                  nullFrac,
+                  "TinyIntVector",
+                  (Function<BufferAllocator, TinyIntVector>)
+                      allocator -> new TinyIntVector("vector", allocator),
+                  TestSortingUtil.TINY_INT_GENERATOR));
+
+          params.add(
+              Arguments.of(
+                  inPlace,
+                  length,
+                  nullFrac,
+                  "SmallIntVector",
+                  (Function<BufferAllocator, SmallIntVector>)
+                      allocator -> new SmallIntVector("vector", allocator),
+                  TestSortingUtil.SMALL_INT_GENERATOR));
+
+          params.add(
+              Arguments.of(
+                  inPlace,
+                  length,
+                  nullFrac,
+                  "IntVector",
+                  (Function<BufferAllocator, IntVector>)
+                      allocator -> new IntVector("vector", allocator),
+                  TestSortingUtil.INT_GENERATOR));
+
+          params.add(
+              Arguments.of(
+                  inPlace,
+                  length,
+                  nullFrac,
+                  "BigIntVector",
+                  (Function<BufferAllocator, BigIntVector>)
+                      allocator -> new BigIntVector("vector", allocator),
+                  TestSortingUtil.LONG_GENERATOR));
+
+          params.add(
+              Arguments.of(
+                  inPlace,
+                  length,
+                  nullFrac,
+                  "Float4Vector",
+                  (Function<BufferAllocator, Float4Vector>)
+                      allocator -> new Float4Vector("vector", allocator),
+                  TestSortingUtil.FLOAT_GENERATOR));
+
+          params.add(
+              Arguments.of(
+                  inPlace,
+                  length,
+                  nullFrac,
+                  "Float8Vector",
+                  (Function<BufferAllocator, Float8Vector>)
+                      allocator -> new Float8Vector("vector", allocator),
+                  TestSortingUtil.DOUBLE_GENERATOR));
         }
       }
     }
-    return params;
+    return params.stream();
   }
 }
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestGeneralOutOfPlaceVectorSorter.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestGeneralOutOfPlaceVectorSorter.java
index 07a6b545ddaa2..29f3331ff0c79 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestGeneralOutOfPlaceVectorSorter.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestGeneralOutOfPlaceVectorSorter.java
@@ -14,10 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -26,53 +25,54 @@
 import org.apache.arrow.vector.testing.ValueVectorDataPopulator;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.FieldType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link GeneralOutOfPlaceVectorSorter}.
- */
+/** Test cases for {@link GeneralOutOfPlaceVectorSorter}. */
 public class TestGeneralOutOfPlaceVectorSorter {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
 
   VectorValueComparator<StructVector> getComparator(StructVector structVector) {
     IntVector child0 = structVector.getChild("column0", IntVector.class);
-    VectorValueComparator<IntVector> childComp0 = DefaultVectorComparators.createDefaultComparator(child0);
+    VectorValueComparator<IntVector> childComp0 =
+        DefaultVectorComparators.createDefaultComparator(child0);
     childComp0.attachVector(child0);
 
     IntVector child1 = structVector.getChild("column1", IntVector.class);
-    VectorValueComparator<IntVector> childComp1 = DefaultVectorComparators.createDefaultComparator(child1);
+    VectorValueComparator<IntVector> childComp1 =
+        DefaultVectorComparators.createDefaultComparator(child1);
     childComp1.attachVector(child1);
 
-    VectorValueComparator<StructVector> comp = new VectorValueComparator<StructVector>() {
-
-      @Override
-      public int compareNotNull(int index1, int index2) {
-        // compare values by lexicographic order
-        int result0 = childComp0.compare(index1, index2);
-        if (result0 != 0) {
-          return result0;
-        }
-        return childComp1.compare(index1, index2);
-      }
-
-      @Override
-      public VectorValueComparator createNew() {
-        return this;
-      }
-    };
+    VectorValueComparator<StructVector> comp =
+        new VectorValueComparator<StructVector>() {
+
+          @Override
+          public int compareNotNull(int index1, int index2) {
+            // compare values by lexicographic order
+            int result0 = childComp0.compare(index1, index2);
+            if (result0 != 0) {
+              return result0;
+            }
+            return childComp1.compare(index1, index2);
+          }
+
+          @Override
+          public VectorValueComparator createNew() {
+            return this;
+          }
+        };
 
     return comp;
   }
@@ -81,17 +81,21 @@ public VectorValueComparator createNew() {
   public void testSortStructVector() {
     final int vectorLength = 7;
     try (StructVector srcVector = StructVector.empty("src struct", allocator);
-         StructVector dstVector = StructVector.empty("dst struct", allocator)) {
+        StructVector dstVector = StructVector.empty("dst struct", allocator)) {
 
       IntVector srcChild0 =
-          srcVector.addOrGet("column0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
+          srcVector.addOrGet(
+              "column0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
       IntVector srcChild1 =
-          srcVector.addOrGet("column1", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
+          srcVector.addOrGet(
+              "column1", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
 
       IntVector dstChild0 =
-          dstVector.addOrGet("column0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
+          dstVector.addOrGet(
+              "column0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
       IntVector dstChild1 =
-          dstVector.addOrGet("column1", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
+          dstVector.addOrGet(
+              "column1", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
 
       // src struct vector values:
       // [
@@ -128,15 +132,16 @@ public void testSortStructVector() {
       // validate results
       assertEquals(vectorLength, dstVector.getValueCount());
       assertEquals(
-          "[" +
-                    "null, " +
-                    "{\"column1\":3}, " +
-                    "{\"column0\":2,\"column1\":1}, " +
-                    "{\"column0\":3,\"column1\":4}, " +
-                    "{\"column0\":5,\"column1\":4}, " +
-                    "{\"column0\":6,\"column1\":6}, " +
-                    "{\"column0\":7}" +
-              "]", dstVector.toString());
+          "["
+              + "null, "
+              + "{\"column1\":3}, "
+              + "{\"column0\":2,\"column1\":1}, "
+              + "{\"column0\":3,\"column1\":4}, "
+              + "{\"column0\":5,\"column1\":4}, "
+              + "{\"column0\":6,\"column1\":6}, "
+              + "{\"column0\":7}"
+              + "]",
+          dstVector.toString());
     }
   }
 }
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestIndexSorter.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestIndexSorter.java
index 99e22f8bdcd5c..ec6d2b71a3718 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestIndexSorter.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestIndexSorter.java
@@ -14,33 +14,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.testing.ValueVectorDataPopulator;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link IndexSorter}.
- */
+/** Test cases for {@link IndexSorter}. */
 public class TestIndexSorter {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -56,14 +53,15 @@ public void testIndexSort() {
 
       // sort the index
       IndexSorter<IntVector> indexSorter = new IndexSorter<>();
-      DefaultVectorComparators.IntComparator intComparator = new DefaultVectorComparators.IntComparator();
+      DefaultVectorComparators.IntComparator intComparator =
+          new DefaultVectorComparators.IntComparator();
       intComparator.attachVector(vec);
 
       IntVector indices = new IntVector("", allocator);
       indices.setValueCount(10);
       indexSorter.sort(vec, indices, intComparator);
 
-      int[] expected = new int[]{6, 9, 1, 3, 0, 4, 5, 7, 2, 8};
+      int[] expected = new int[] {6, 9, 1, 3, 0, 4, 5, 7, 2, 8};
 
       for (int i = 0; i < expected.length; i++) {
         assertTrue(!indices.isNull(i));
@@ -74,8 +72,8 @@ public void testIndexSort() {
   }
 
   /**
-   * Tests the worst case for quick sort.
-   * It may cause stack overflow if the algorithm is implemented as a recursive algorithm.
+   * Tests the worst case for quick sort. It may cause stack overflow if the algorithm is
+   * implemented as a recursive algorithm.
    */
   @Test
   public void testSortLargeIncreasingInt() {
@@ -91,7 +89,8 @@ public void testSortLargeIncreasingInt() {
 
       // sort the vector
       IndexSorter<IntVector> indexSorter = new IndexSorter<>();
-      DefaultVectorComparators.IntComparator intComparator = new DefaultVectorComparators.IntComparator();
+      DefaultVectorComparators.IntComparator intComparator =
+          new DefaultVectorComparators.IntComparator();
       intComparator.attachVector(vec);
 
       try (IntVector indices = new IntVector("", allocator)) {
@@ -110,7 +109,7 @@ public void testSortLargeIncreasingInt() {
   public void testChoosePivot() {
     final int vectorLength = 100;
     try (IntVector vec = new IntVector("vector", allocator);
-         IntVector indices = new IntVector("indices", allocator)) {
+        IntVector indices = new IntVector("indices", allocator)) {
       vec.allocateNew(vectorLength);
       indices.allocateNew(vectorLength);
 
@@ -122,7 +121,8 @@ public void testChoosePivot() {
       vec.setValueCount(vectorLength);
       indices.setValueCount(vectorLength);
 
-      VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
 
       // setup internal data structures
       comparator.attachVector(vec);
@@ -147,17 +147,16 @@ public void testChoosePivot() {
     }
   }
 
-  /**
-   * Evaluates choosing pivot for all possible permutations of 3 numbers.
-   */
+  /** Evaluates choosing pivot for all possible permutations of 3 numbers. */
   @Test
   public void testChoosePivotAllPermutes() {
     try (IntVector vec = new IntVector("vector", allocator);
-         IntVector indices = new IntVector("indices", allocator)) {
+        IntVector indices = new IntVector("indices", allocator)) {
       vec.allocateNew();
       indices.allocateNew();
 
-      VectorValueComparator<IntVector> comparator = DefaultVectorComparators.createDefaultComparator(vec);
+      VectorValueComparator<IntVector> comparator =
+          DefaultVectorComparators.createDefaultComparator(vec);
 
       // setup internal data structures
       comparator.attachVector(vec);
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestInsertionSorter.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestInsertionSorter.java
index ba9c42913c0d9..d0c1f6d6e5c62 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestInsertionSorter.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestInsertionSorter.java
@@ -14,33 +14,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
-import static org.junit.Assert.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.testing.ValueVectorDataPopulator;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link InsertionSorter}.
- */
+/** Test cases for {@link InsertionSorter}. */
 public class TestInsertionSorter {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -49,7 +46,7 @@ public void shutdown() {
 
   private void testSortIntVectorRange(int start, int end, int[] expected) {
     try (IntVector vector = new IntVector("vector", allocator);
-         IntVector buffer = new IntVector("buffer", allocator)) {
+        IntVector buffer = new IntVector("buffer", allocator)) {
 
       buffer.allocateNew(1);
 
@@ -81,7 +78,7 @@ public void testSortIntVector() {
 
   private void testSortIndicesRange(int start, int end, int[] expectedIndices) {
     try (IntVector vector = new IntVector("vector", allocator);
-         IntVector indices = new IntVector("indices", allocator)) {
+        IntVector indices = new IntVector("indices", allocator)) {
 
       ValueVectorDataPopulator.setVector(vector, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0);
       ValueVectorDataPopulator.setVector(indices, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestOffHeapIntStack.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestOffHeapIntStack.java
index 321ca226d7e1d..f0c4bc86f7cf5 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestOffHeapIntStack.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestOffHeapIntStack.java
@@ -14,31 +14,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link OffHeapIntStack}.
- */
+/** Test cases for {@link OffHeapIntStack}. */
 public class TestOffHeapIntStack {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestOutOfPlaceVectorSorter.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestOutOfPlaceVectorSorter.java
index 66b75cbccac3e..9358ef93b086e 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestOutOfPlaceVectorSorter.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestOutOfPlaceVectorSorter.java
@@ -14,33 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
+import java.util.stream.Stream;
+import org.junit.jupiter.params.provider.Arguments;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-/**
- * Test cases for out-of-place sorters.
- */
-@RunWith(Parameterized.class)
+/** Test cases for out-of-place sorters. */
 public abstract class TestOutOfPlaceVectorSorter {
 
-  protected final boolean generalSorter;
-
-  public TestOutOfPlaceVectorSorter(boolean generalSorter) {
-    this.generalSorter = generalSorter;
-  }
-
-  @Parameterized.Parameters(name = "general sorter = {0}")
-  public static Collection<Object[]> getParameter() {
-    List<Object[]> params = new ArrayList<>();
-    params.add(new Object[] {true});
-    params.add(new Object[] {false});
-    return params;
+  public static Stream<Arguments> getParameter() {
+    List<Arguments> args = new ArrayList<>();
+    for (boolean generalSorter : new boolean[] {false, true}) {
+      args.add(Arguments.of(generalSorter));
+    }
+    return args.stream();
   }
 }
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestSortingUtil.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestSortingUtil.java
index e22b22d4e6757..24b2c752d0863 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestSortingUtil.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestSortingUtil.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -25,7 +24,6 @@
 import java.util.Random;
 import java.util.function.BiConsumer;
 import java.util.function.Supplier;
-
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.Float4Vector;
 import org.apache.arrow.vector.Float8Vector;
@@ -37,50 +35,59 @@
 import org.apache.arrow.vector.testing.RandomDataGenerator;
 import org.apache.arrow.vector.testing.ValueVectorDataPopulator;
 
-/**
- * Utilities for sorting related utilities.
- */
+/** Utilities for sorting related utilities. */
 public class TestSortingUtil {
 
   static final Random random = new Random(0);
 
-  static final DataGenerator<TinyIntVector, Byte> TINY_INT_GENERATOR = new DataGenerator<>(
-      RandomDataGenerator.TINY_INT_GENERATOR,
-      (vector, array) -> ValueVectorDataPopulator.setVector(vector, array), Byte.class);
-
-  static final DataGenerator<SmallIntVector, Short> SMALL_INT_GENERATOR = new DataGenerator<>(
-      RandomDataGenerator.SMALL_INT_GENERATOR,
-      (vector, array) -> ValueVectorDataPopulator.setVector(vector, array), Short.class);
-
-  static final DataGenerator<IntVector, Integer> INT_GENERATOR = new DataGenerator<>(
-      RandomDataGenerator.INT_GENERATOR,
-      (vector, array) -> ValueVectorDataPopulator.setVector(vector, array), Integer.class);
-
-  static final DataGenerator<BigIntVector, Long> LONG_GENERATOR = new DataGenerator<>(
-      RandomDataGenerator.LONG_GENERATOR,
-      (vector, array) -> ValueVectorDataPopulator.setVector(vector, array), Long.class);
-
-  static final DataGenerator<Float4Vector, Float> FLOAT_GENERATOR = new DataGenerator<>(
-      RandomDataGenerator.FLOAT_GENERATOR,
-      (vector, array) -> ValueVectorDataPopulator.setVector(vector, array), Float.class);
-
-  static final DataGenerator<Float8Vector, Double> DOUBLE_GENERATOR = new DataGenerator<>(
-      RandomDataGenerator.DOUBLE_GENERATOR,
-      (vector, array) -> ValueVectorDataPopulator.setVector(vector, array), Double.class);
-
-  static final DataGenerator<VarCharVector, String> STRING_GENERATOR = new DataGenerator<>(
-      () -> {
-        int strLength = random.nextInt(20) + 1;
-        return generateRandomString(strLength);
-      },
-      (vector, array) -> ValueVectorDataPopulator.setVector(vector, array), String.class);
-
-  private TestSortingUtil() {
-  }
-
-  /**
-   * Verify that a vector is equal to an array.
-   */
+  static final DataGenerator<TinyIntVector, Byte> TINY_INT_GENERATOR =
+      new DataGenerator<>(
+          RandomDataGenerator.TINY_INT_GENERATOR,
+          (vector, array) -> ValueVectorDataPopulator.setVector(vector, array),
+          Byte.class);
+
+  static final DataGenerator<SmallIntVector, Short> SMALL_INT_GENERATOR =
+      new DataGenerator<>(
+          RandomDataGenerator.SMALL_INT_GENERATOR,
+          (vector, array) -> ValueVectorDataPopulator.setVector(vector, array),
+          Short.class);
+
+  static final DataGenerator<IntVector, Integer> INT_GENERATOR =
+      new DataGenerator<>(
+          RandomDataGenerator.INT_GENERATOR,
+          (vector, array) -> ValueVectorDataPopulator.setVector(vector, array),
+          Integer.class);
+
+  static final DataGenerator<BigIntVector, Long> LONG_GENERATOR =
+      new DataGenerator<>(
+          RandomDataGenerator.LONG_GENERATOR,
+          (vector, array) -> ValueVectorDataPopulator.setVector(vector, array),
+          Long.class);
+
+  static final DataGenerator<Float4Vector, Float> FLOAT_GENERATOR =
+      new DataGenerator<>(
+          RandomDataGenerator.FLOAT_GENERATOR,
+          (vector, array) -> ValueVectorDataPopulator.setVector(vector, array),
+          Float.class);
+
+  static final DataGenerator<Float8Vector, Double> DOUBLE_GENERATOR =
+      new DataGenerator<>(
+          RandomDataGenerator.DOUBLE_GENERATOR,
+          (vector, array) -> ValueVectorDataPopulator.setVector(vector, array),
+          Double.class);
+
+  static final DataGenerator<VarCharVector, String> STRING_GENERATOR =
+      new DataGenerator<>(
+          () -> {
+            int strLength = random.nextInt(20) + 1;
+            return generateRandomString(strLength);
+          },
+          (vector, array) -> ValueVectorDataPopulator.setVector(vector, array),
+          String.class);
+
+  private TestSortingUtil() {}
+
+  /** Verify that a vector is equal to an array. */
   public static <V extends ValueVector, U> void verifyResults(V vector, U[] expected) {
     assertEquals(vector.getValueCount(), expected.length);
     for (int i = 0; i < expected.length; i++) {
@@ -88,30 +95,28 @@ public static <V extends ValueVector, U> void verifyResults(V vector, U[] expect
     }
   }
 
-  /**
-   * Sort an array with null values come first.
-   */
+  /** Sort an array with null values come first. */
   public static <U extends Comparable<U>> void sortArray(U[] array) {
-    Arrays.sort(array, (a, b) -> {
-      if (a == null || b == null) {
-        if (a == null && b == null) {
-          return 0;
-        }
-
-        // exactly one is null
-        if (a == null) {
-          return -1;
-        } else {
-          return 1;
-        }
-      }
-      return a.compareTo(b);
-    });
+    Arrays.sort(
+        array,
+        (a, b) -> {
+          if (a == null || b == null) {
+            if (a == null && b == null) {
+              return 0;
+            }
+
+            // exactly one is null
+            if (a == null) {
+              return -1;
+            } else {
+              return 1;
+            }
+          }
+          return a.compareTo(b);
+        });
   }
 
-  /**
-   * Generate a string with alphabetic characters only.
-   */
+  /** Generate a string with alphabetic characters only. */
   static String generateRandomString(int length) {
     byte[] str = new byte[length];
     final int lower = 'a';
@@ -128,6 +133,7 @@ static String generateRandomString(int length) {
 
   /**
    * Utility to generate data for testing.
+   *
    * @param <V> vector type.
    * @param <U> data element type.
    */
@@ -139,8 +145,7 @@ static class DataGenerator<V extends ValueVector, U extends Comparable<U>> {
 
     final Class<U> clazz;
 
-    DataGenerator(
-        Supplier<U> dataGenerator, BiConsumer<V, U[]> vectorPopulator, Class<U> clazz) {
+    DataGenerator(Supplier<U> dataGenerator, BiConsumer<V, U[]> vectorPopulator, Class<U> clazz) {
       this.dataGenerator = dataGenerator;
       this.vectorPopulator = vectorPopulator;
       this.clazz = clazz;
@@ -148,6 +153,7 @@ static class DataGenerator<V extends ValueVector, U extends Comparable<U>> {
 
     /**
      * Populate the vector according to the specified parameters.
+     *
      * @param vector the vector to populate.
      * @param length vector length.
      * @param nullFraction the fraction of null values.
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestStableVectorComparator.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestStableVectorComparator.java
index f2de5d23fce89..09ac963332e31 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestStableVectorComparator.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestStableVectorComparator.java
@@ -14,36 +14,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.VarCharVector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link StableVectorComparator}.
- */
+/** Test cases for {@link StableVectorComparator}. */
 public class TestStableVectorComparator {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -62,7 +57,8 @@ public void testCompare() {
       vec.set(4, "a".getBytes(StandardCharsets.UTF_8));
 
       VectorValueComparator<VarCharVector> comparator = new TestVarCharSorter();
-      VectorValueComparator<VarCharVector> stableComparator = new StableVectorComparator<>(comparator);
+      VectorValueComparator<VarCharVector> stableComparator =
+          new StableVectorComparator<>(comparator);
       stableComparator.attachVector(vec);
 
       assertTrue(stableComparator.compare(0, 1) > 0);
@@ -70,7 +66,7 @@ public void testCompare() {
       assertTrue(stableComparator.compare(2, 3) < 0);
       assertTrue(stableComparator.compare(1, 3) < 0);
       assertTrue(stableComparator.compare(3, 1) > 0);
-      Assertions.assertEquals(0, stableComparator.compare(3, 3));
+      assertEquals(0, stableComparator.compare(3, 3));
     }
   }
 
@@ -95,10 +91,12 @@ public void testStableSortString() {
       // sort the vector
       VariableWidthOutOfPlaceVectorSorter sorter = new VariableWidthOutOfPlaceVectorSorter();
       VectorValueComparator<VarCharVector> comparator = new TestVarCharSorter();
-      VectorValueComparator<VarCharVector> stableComparator = new StableVectorComparator<>(comparator);
+      VectorValueComparator<VarCharVector> stableComparator =
+          new StableVectorComparator<>(comparator);
 
       try (VarCharVector sortedVec =
-              (VarCharVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null)) {
+          (VarCharVector)
+              vec.getField().getFieldType().createNewSingleVector("", allocator, null)) {
         sortedVec.allocateNew(vec.getByteCapacity(), vec.getValueCount());
         sortedVec.setLastSet(vec.getValueCount() - 1);
         sortedVec.setValueCount(vec.getValueCount());
@@ -107,23 +105,32 @@ public void testStableSortString() {
 
         // verify results
         // the results are stable
-        assertEquals("0", new String(Objects.requireNonNull(sortedVec.get(0)), StandardCharsets.UTF_8));
-        assertEquals("01", new String(Objects.requireNonNull(sortedVec.get(1)), StandardCharsets.UTF_8));
-        assertEquals("0c", new String(Objects.requireNonNull(sortedVec.get(2)), StandardCharsets.UTF_8));
-        assertEquals("a", new String(Objects.requireNonNull(sortedVec.get(3)), StandardCharsets.UTF_8));
-        assertEquals("abc", new String(Objects.requireNonNull(sortedVec.get(4)), StandardCharsets.UTF_8));
-        assertEquals("aa", new String(Objects.requireNonNull(sortedVec.get(5)), StandardCharsets.UTF_8));
-        assertEquals("a1", new String(Objects.requireNonNull(sortedVec.get(6)), StandardCharsets.UTF_8));
-        assertEquals("abcdefg", new String(Objects.requireNonNull(sortedVec.get(7)), StandardCharsets.UTF_8));
-        assertEquals("accc", new String(Objects.requireNonNull(sortedVec.get(8)), StandardCharsets.UTF_8));
-        assertEquals("afds", new String(Objects.requireNonNull(sortedVec.get(9)), StandardCharsets.UTF_8));
+        assertEquals(
+            "0", new String(Objects.requireNonNull(sortedVec.get(0)), StandardCharsets.UTF_8));
+        assertEquals(
+            "01", new String(Objects.requireNonNull(sortedVec.get(1)), StandardCharsets.UTF_8));
+        assertEquals(
+            "0c", new String(Objects.requireNonNull(sortedVec.get(2)), StandardCharsets.UTF_8));
+        assertEquals(
+            "a", new String(Objects.requireNonNull(sortedVec.get(3)), StandardCharsets.UTF_8));
+        assertEquals(
+            "abc", new String(Objects.requireNonNull(sortedVec.get(4)), StandardCharsets.UTF_8));
+        assertEquals(
+            "aa", new String(Objects.requireNonNull(sortedVec.get(5)), StandardCharsets.UTF_8));
+        assertEquals(
+            "a1", new String(Objects.requireNonNull(sortedVec.get(6)), StandardCharsets.UTF_8));
+        assertEquals(
+            "abcdefg",
+            new String(Objects.requireNonNull(sortedVec.get(7)), StandardCharsets.UTF_8));
+        assertEquals(
+            "accc", new String(Objects.requireNonNull(sortedVec.get(8)), StandardCharsets.UTF_8));
+        assertEquals(
+            "afds", new String(Objects.requireNonNull(sortedVec.get(9)), StandardCharsets.UTF_8));
       }
     }
   }
 
-  /**
-   * Utility comparator that compares varchars by the first character.
-   */
+  /** Utility comparator that compares varchars by the first character. */
   private static class TestVarCharSorter extends VectorValueComparator<VarCharVector> {
 
     @Override
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthOutOfPlaceVectorSorter.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthOutOfPlaceVectorSorter.java
index 2486034f1fa32..6addec9e266c3 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthOutOfPlaceVectorSorter.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthOutOfPlaceVectorSorter.java
@@ -14,52 +14,46 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.BaseVariableWidthVector;
 import org.apache.arrow.vector.VarCharVector;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
-/**
- * Test cases for {@link VariableWidthOutOfPlaceVectorSorter}.
- */
+/** Test cases for {@link VariableWidthOutOfPlaceVectorSorter}. */
 public class TestVariableWidthOutOfPlaceVectorSorter extends TestOutOfPlaceVectorSorter {
 
   private BufferAllocator allocator;
 
-  public TestVariableWidthOutOfPlaceVectorSorter(boolean generalSorter) {
-    super(generalSorter);
+  <V extends BaseVariableWidthVector> OutOfPlaceVectorSorter<V> getSorter(boolean generalSorter) {
+    return generalSorter
+        ? new GeneralOutOfPlaceVectorSorter<>()
+        : new VariableWidthOutOfPlaceVectorSorter<V>();
   }
 
-  <V extends BaseVariableWidthVector> OutOfPlaceVectorSorter<V> getSorter() {
-    return generalSorter ? new GeneralOutOfPlaceVectorSorter<>() : new VariableWidthOutOfPlaceVectorSorter<V>();
-  }
-
-
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
 
-  @Test
-  public void testSortString() {
+  @ParameterizedTest
+  @MethodSource("getParameter")
+  public void testSortString(boolean generalSorter) {
     try (VarCharVector vec = new VarCharVector("", allocator)) {
       vec.allocateNew(100, 10);
       vec.setValueCount(10);
@@ -77,12 +71,12 @@ public void testSortString() {
       vec.set(9, "yes".getBytes(StandardCharsets.UTF_8));
 
       // sort the vector
-      OutOfPlaceVectorSorter<BaseVariableWidthVector> sorter = getSorter();
+      OutOfPlaceVectorSorter<BaseVariableWidthVector> sorter = getSorter(generalSorter);
       VectorValueComparator<BaseVariableWidthVector> comparator =
-              DefaultVectorComparators.createDefaultComparator(vec);
+          DefaultVectorComparators.createDefaultComparator(vec);
 
       VarCharVector sortedVec =
-              (VarCharVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
+          (VarCharVector) vec.getField().getFieldType().createNewSingleVector("", allocator, null);
       sortedVec.allocateNew(vec.getByteCapacity(), vec.getValueCount());
       sortedVec.setLastSet(vec.getValueCount() - 1);
       sortedVec.setValueCount(vec.getValueCount());
@@ -90,20 +84,29 @@ public void testSortString() {
       sorter.sortOutOfPlace(vec, sortedVec, comparator);
 
       // verify results
-      Assert.assertEquals(vec.getValueCount(), sortedVec.getValueCount());
-      Assert.assertEquals(vec.getByteCapacity(), sortedVec.getByteCapacity());
-      Assert.assertEquals(vec.getLastSet(), sortedVec.getLastSet());
+      assertEquals(vec.getValueCount(), sortedVec.getValueCount());
+      assertEquals(vec.getByteCapacity(), sortedVec.getByteCapacity());
+      assertEquals(vec.getLastSet(), sortedVec.getLastSet());
 
       assertTrue(sortedVec.isNull(0));
       assertTrue(sortedVec.isNull(1));
-      assertEquals("12", new String(Objects.requireNonNull(sortedVec.get(2)), StandardCharsets.UTF_8));
-      assertEquals("abc", new String(Objects.requireNonNull(sortedVec.get(3)), StandardCharsets.UTF_8));
-      assertEquals("dictionary", new String(Objects.requireNonNull(sortedVec.get(4)), StandardCharsets.UTF_8));
-      assertEquals("good", new String(Objects.requireNonNull(sortedVec.get(5)), StandardCharsets.UTF_8));
-      assertEquals("hello", new String(Objects.requireNonNull(sortedVec.get(6)), StandardCharsets.UTF_8));
-      assertEquals("hello", new String(Objects.requireNonNull(sortedVec.get(7)), StandardCharsets.UTF_8));
-      assertEquals("world", new String(Objects.requireNonNull(sortedVec.get(8)), StandardCharsets.UTF_8));
-      assertEquals("yes", new String(Objects.requireNonNull(sortedVec.get(9)), StandardCharsets.UTF_8));
+      assertEquals(
+          "12", new String(Objects.requireNonNull(sortedVec.get(2)), StandardCharsets.UTF_8));
+      assertEquals(
+          "abc", new String(Objects.requireNonNull(sortedVec.get(3)), StandardCharsets.UTF_8));
+      assertEquals(
+          "dictionary",
+          new String(Objects.requireNonNull(sortedVec.get(4)), StandardCharsets.UTF_8));
+      assertEquals(
+          "good", new String(Objects.requireNonNull(sortedVec.get(5)), StandardCharsets.UTF_8));
+      assertEquals(
+          "hello", new String(Objects.requireNonNull(sortedVec.get(6)), StandardCharsets.UTF_8));
+      assertEquals(
+          "hello", new String(Objects.requireNonNull(sortedVec.get(7)), StandardCharsets.UTF_8));
+      assertEquals(
+          "world", new String(Objects.requireNonNull(sortedVec.get(8)), StandardCharsets.UTF_8));
+      assertEquals(
+          "yes", new String(Objects.requireNonNull(sortedVec.get(9)), StandardCharsets.UTF_8));
 
       sortedVec.close();
     }
diff --git a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthSorting.java b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthSorting.java
index 7951c39d550d2..60a5600764a36 100644
--- a/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthSorting.java
+++ b/java/algorithm/src/test/java/org/apache/arrow/algorithm/sort/TestVariableWidthSorting.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.sort;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
@@ -24,77 +23,67 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 import java.util.function.Function;
-
+import java.util.stream.Stream;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.BaseVariableWidthVector;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.arrow.vector.util.Text;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-/**
- * Test sorting variable width vectors with random data.
- */
-@RunWith(Parameterized.class)
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/** Test sorting variable width vectors with random data. */
 public class TestVariableWidthSorting<V extends BaseVariableWidthVector, U extends Comparable<U>> {
 
   static final int[] VECTOR_LENGTHS = new int[] {2, 5, 10, 50, 100, 1000, 3000};
 
   static final double[] NULL_FRACTIONS = {0, 0.1, 0.3, 0.5, 0.7, 0.9, 1};
 
-  private final int length;
-
-  private final double nullFraction;
-
-  private final Function<BufferAllocator, V> vectorGenerator;
-
-  private final TestSortingUtil.DataGenerator<V, U> dataGenerator;
-
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(Integer.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
 
-  public TestVariableWidthSorting(
-      int length, double nullFraction, String desc,
-      Function<BufferAllocator, V> vectorGenerator, TestSortingUtil.DataGenerator<V, U> dataGenerator) {
-    this.length = length;
-    this.nullFraction = nullFraction;
-    this.vectorGenerator = vectorGenerator;
-    this.dataGenerator = dataGenerator;
-  }
-
-  @Test
-  public void testSort() {
-    sortOutOfPlace();
+  @ParameterizedTest
+  @MethodSource("getParameters")
+  public void testSort(
+      int length,
+      double nullFraction,
+      Function<BufferAllocator, V> vectorGenerator,
+      TestSortingUtil.DataGenerator<V, U> dataGenerator) {
+    sortOutOfPlace(length, nullFraction, vectorGenerator, dataGenerator);
   }
 
-  void sortOutOfPlace() {
+  void sortOutOfPlace(
+      int length,
+      double nullFraction,
+      Function<BufferAllocator, V> vectorGenerator,
+      TestSortingUtil.DataGenerator<V, U> dataGenerator) {
     try (V vector = vectorGenerator.apply(allocator)) {
       U[] array = dataGenerator.populate(vector, length, nullFraction);
       Arrays.sort(array, (Comparator<? super U>) new StringComparator());
 
       // sort the vector
       VariableWidthOutOfPlaceVectorSorter sorter = new VariableWidthOutOfPlaceVectorSorter();
-      VectorValueComparator<V> comparator = DefaultVectorComparators.createDefaultComparator(vector);
+      VectorValueComparator<V> comparator =
+          DefaultVectorComparators.createDefaultComparator(vector);
 
-      try (V sortedVec = (V) vector.getField().getFieldType().createNewSingleVector("", allocator, null)) {
+      try (V sortedVec =
+          (V) vector.getField().getFieldType().createNewSingleVector("", allocator, null)) {
         int dataSize = vector.getOffsetBuffer().getInt(vector.getValueCount() * 4L);
         sortedVec.allocateNew(dataSize, vector.getValueCount());
         sortedVec.setValueCount(vector.getValueCount());
@@ -107,38 +96,38 @@ void sortOutOfPlace() {
     }
   }
 
-  @Parameterized.Parameters(name = "length = {0}, null fraction = {1}, vector = {2}")
-  public static Collection<Object[]> getParameters() {
-    List<Object[]> params = new ArrayList<>();
+  public static Stream<Arguments> getParameters() {
+    List<Arguments> params = new ArrayList<>();
     for (int length : VECTOR_LENGTHS) {
       for (double nullFrac : NULL_FRACTIONS) {
-        params.add(new Object[]{
-            length, nullFrac, "VarCharVector",
-            (Function<BufferAllocator, VarCharVector>) allocator -> new VarCharVector("vector", allocator),
-            TestSortingUtil.STRING_GENERATOR
-        });
+        params.add(
+            Arguments.of(
+                length,
+                nullFrac,
+                (Function<BufferAllocator, VarCharVector>)
+                    allocator -> new VarCharVector("vector", allocator),
+                TestSortingUtil.STRING_GENERATOR));
       }
     }
-    return params;
+    return params.stream();
   }
 
-  /**
-   * Verify results as byte arrays.
-   */
+  /** Verify results as byte arrays. */
   public static <V extends ValueVector> void verifyResults(V vector, String[] expected) {
     assertEquals(vector.getValueCount(), expected.length);
     for (int i = 0; i < expected.length; i++) {
       if (expected[i] == null) {
         assertTrue(vector.isNull(i));
       } else {
-        assertArrayEquals(((Text) vector.getObject(i)).getBytes(), expected[i].getBytes(StandardCharsets.UTF_8));
+        assertArrayEquals(
+            ((Text) vector.getObject(i)).getBytes(), expected[i].getBytes(StandardCharsets.UTF_8));
       }
     }
   }
 
   /**
-   * String comparator with the same behavior as that of
-   * {@link DefaultVectorComparators.VariableWidthComparator}.
+   * String comparator with the same behavior as that of {@link
+   * DefaultVectorComparators.VariableWidthComparator}.
    */
   static class StringComparator implements Comparator<String> {
 
diff --git a/java/bom/pom.xml b/java/bom/pom.xml
index 2406886222dcb..5fafbf38c7cdf 100644
--- a/java/bom/pom.xml
+++ b/java/bom/pom.xml
@@ -1,32 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>18</version>
+    <version>31</version>
   </parent>
 
   <groupId>org.apache.arrow</groupId>
   <artifactId>arrow-bom</artifactId>
-  <version>16.0.0-SNAPSHOT</version>
+  <version>17.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Arrow Bill of Materials</name>
   <description>Arrow Bill of Materials</description>
 
   <properties>
-    <arrow.vector.classifier/>
+    <arrow.vector.classifier></arrow.vector.classifier>
+    <!-- org.apache:apache overrides -->
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.plugin.tools.version>3.12.0</maven.plugin.tools.version>
+    <surefire.version>3.2.5</surefire.version>
+    <version.apache-rat-plugin>0.16.1</version.apache-rat-plugin>
+    <version.maven-assembly-plugin>3.7.1</version.maven-assembly-plugin>
+    <version.maven-compiler-plugin>3.12.1</version.maven-compiler-plugin>
+    <version.maven-dependency-plugin>3.6.1</version.maven-dependency-plugin>
+    <version.maven-gpg-plugin>3.2.4</version.maven-gpg-plugin>
+    <version.maven-jar-plugin>3.2.2</version.maven-jar-plugin>
+    <version.maven-javadoc-plugin>3.6.3</version.maven-javadoc-plugin>
+    <version.maven-project-info-reports-plugin>3.5.0</version.maven-project-info-reports-plugin>
   </properties>
 
   <dependencyManagement>
@@ -138,20 +159,47 @@
         <version>${project.version}</version>
       </dependency>
     </dependencies>
-
   </dependencyManagement>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>com.diffplug.spotless</groupId>
+          <artifactId>spotless-maven-plugin</artifactId>
+          <version>2.30.0</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>3.5.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.12.1</version>
+      </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <configuration>
+          <pom>
+            <licenseHeader>
+              <file>${maven.multiModuleProjectDirectory}/dev/license/asf-xml.license</file>
+              <delimiter>(&lt;configuration|&lt;project)</delimiter>
+            </licenseHeader>
+            <sortPom></sortPom>
+          </pom>
+        </configuration>
+        <executions>
+          <execution>
+            <id>spotless-check</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
@@ -161,13 +209,34 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>3.5.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.12.1</version>
       </plugin>
     </plugins>
   </reporting>
+
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>source-release-assembly</id>
+                <configuration>
+                  <!-- source release assembly is managed at the root of the project. -->
+                  <skipAssembly>true</skipAssembly>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/java/c/pom.xml b/java/c/pom.xml
index ffd41b62dd674..b5a995de1ba2f 100644
--- a/java/c/pom.xml
+++ b/java/c/pom.xml
@@ -1,87 +1,95 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>arrow-java-root</artifactId>
-        <groupId>org.apache.arrow</groupId>
-        <version>16.0.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.arrow</groupId>
+    <artifactId>arrow-java-root</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
+  </parent>
 
-    <artifactId>arrow-c-data</artifactId>
-    <name>Arrow Java C Data Interface</name>
-    <description>Java implementation of C Data Interface</description>
-    <packaging>jar</packaging>
-    <properties>
-        <arrow.c.jni.dist.dir>./build</arrow.c.jni.dist.dir>
-    </properties>
+  <artifactId>arrow-c-data</artifactId>
+  <packaging>jar</packaging>
+  <name>Arrow Java C Data Interface</name>
+  <description>Java implementation of C Data Interface</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-vector</artifactId>
-            <scope>compile</scope>
-            <classifier>${arrow.vector.classifier}</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-vector</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-memory-core</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.immutables</groupId>
-            <artifactId>value</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-memory-unsafe</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-format</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>${arrow.c.jni.dist.dir}</directory>
-                <includes>
-                    <include>**/*arrow_cdata_jni.*</include>
-                </includes>
-            </resource>
-        </resources>
-    </build>
+  <properties>
+    <arrow.c.jni.dist.dir>./build</arrow.c.jni.dist.dir>
+  </properties>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-vector</artifactId>
+      <classifier>${arrow.vector.classifier}</classifier>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-vector</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-memory-core</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.immutables</groupId>
+      <artifactId>value-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-memory-unsafe</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-format</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <directory>${arrow.c.jni.dist.dir}</directory>
+        <includes>
+          <include>**/*arrow_cdata_jni.*</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
 </project>
diff --git a/java/c/src/main/java/module-info.java b/java/c/src/main/java/module-info.java
index 0a62c9b9875b4..48af1bc6b7215 100644
--- a/java/c/src/main/java/module-info.java
+++ b/java/c/src/main/java/module-info.java
@@ -1,19 +1,19 @@
 /*
  * 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.
-  */
+ * 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.
+ */
 
 open module org.apache.arrow.c {
   exports org.apache.arrow.c;
diff --git a/java/c/src/main/java/org/apache/arrow/c/ArrayExporter.java b/java/c/src/main/java/org/apache/arrow/c/ArrayExporter.java
index d6479a3ba4ca8..820a1522749c6 100644
--- a/java/c/src/main/java/org/apache/arrow/c/ArrayExporter.java
+++ b/java/c/src/main/java/org/apache/arrow/c/ArrayExporter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.apache.arrow.c.NativeUtil.NULL;
@@ -23,7 +22,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.arrow.c.jni.JniWrapper;
 import org.apache.arrow.c.jni.PrivateData;
 import org.apache.arrow.memory.ArrowBuf;
@@ -33,9 +31,7 @@
 import org.apache.arrow.vector.dictionary.DictionaryProvider;
 import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
 
-/**
- * Exporter for {@link ArrowArray}.
- */
+/** Exporter for {@link ArrowArray}. */
 final class ArrayExporter {
   private final BufferAllocator allocator;
 
@@ -43,9 +39,7 @@ public ArrayExporter(BufferAllocator allocator) {
     this.allocator = allocator;
   }
 
-  /**
-   * Private data structure for exported arrays.
-   */
+  /** Private data structure for exported arrays. */
   static class ExportedArrayPrivateData implements PrivateData {
     ArrowBuf buffers_ptrs;
     List<ArrowBuf> buffers;
@@ -78,7 +72,6 @@ public void close() {
 
   void export(ArrowArray array, FieldVector vector, DictionaryProvider dictionaryProvider) {
     List<FieldVector> children = vector.getChildrenFromFields();
-    List<ArrowBuf> buffers = vector.getFieldBuffers();
     int valueCount = vector.getValueCount();
     int nullCount = vector.getNullCount();
     DictionaryEncoding dictionaryEncoding = vector.getField().getDictionary();
@@ -95,19 +88,10 @@ void export(ArrowArray array, FieldVector vector, DictionaryProvider dictionaryP
         }
       }
 
-      if (buffers != null) {
-        data.buffers = new ArrayList<>(buffers.size());
-        data.buffers_ptrs = allocator.buffer((long) buffers.size() * Long.BYTES);
-        for (ArrowBuf arrowBuf : buffers) {
-          if (arrowBuf != null) {
-            arrowBuf.getReferenceManager().retain();
-            data.buffers_ptrs.writeLong(arrowBuf.memoryAddress());
-          } else {
-            data.buffers_ptrs.writeLong(NULL);
-          }
-          data.buffers.add(arrowBuf);
-        }
-      }
+      data.buffers = new ArrayList<>(vector.getExportedCDataBufferCount());
+      data.buffers_ptrs =
+          allocator.buffer((long) (vector.getExportedCDataBufferCount()) * Long.BYTES);
+      vector.exportCDataBuffers(data.buffers, data.buffers_ptrs, NULL);
 
       if (dictionaryEncoding != null) {
         Dictionary dictionary = dictionaryProvider.lookup(dictionaryEncoding.getId());
diff --git a/java/c/src/main/java/org/apache/arrow/c/ArrayImporter.java b/java/c/src/main/java/org/apache/arrow/c/ArrayImporter.java
index 7132887ddeed5..b74fb1b47345d 100644
--- a/java/c/src/main/java/org/apache/arrow/c/ArrayImporter.java
+++ b/java/c/src/main/java/org/apache/arrow/c/ArrayImporter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.apache.arrow.c.NativeUtil.NULL;
@@ -24,7 +23,6 @@
 
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.Preconditions;
@@ -34,9 +32,7 @@
 import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
 import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
 
-/**
- * Importer for {@link ArrowArray}.
- */
+/** Importer for {@link ArrowArray}. */
 final class ArrayImporter {
   private static final int MAX_IMPORT_RECURSION_LEVEL = 64;
 
@@ -47,7 +43,8 @@ final class ArrayImporter {
   private ReferenceCountedArrowArray underlyingAllocation;
   private int recursionLevel;
 
-  ArrayImporter(BufferAllocator allocator, FieldVector vector, DictionaryProvider dictionaryProvider) {
+  ArrayImporter(
+      BufferAllocator allocator, FieldVector vector, DictionaryProvider dictionaryProvider) {
     this.allocator = Preconditions.checkNotNull(allocator);
     this.vector = Preconditions.checkNotNull(vector);
     this.dictionaryProvider = dictionaryProvider;
@@ -78,7 +75,9 @@ private void importChild(ArrayImporter parent, ArrowArray src) {
     ArrowArray.Snapshot snapshot = src.snapshot();
     checkState(snapshot.release != NULL, "Cannot import released ArrowArray");
     recursionLevel = parent.recursionLevel + 1;
-    checkState(recursionLevel <= MAX_IMPORT_RECURSION_LEVEL, "Recursion level in ArrowArray struct exceeded");
+    checkState(
+        recursionLevel <= MAX_IMPORT_RECURSION_LEVEL,
+        "Recursion level in ArrowArray struct exceeded");
     // Child buffers will keep the entire parent import alive.
     underlyingAllocation = parent.underlyingAllocation;
     doImport(snapshot);
@@ -86,14 +85,19 @@ private void importChild(ArrayImporter parent, ArrowArray src) {
 
   private void doImport(ArrowArray.Snapshot snapshot) {
     // First import children (required for reconstituting parent array data)
-    long[] children = NativeUtil.toJavaArray(snapshot.children, checkedCastToInt(snapshot.n_children));
+    long[] children =
+        NativeUtil.toJavaArray(snapshot.children, checkedCastToInt(snapshot.n_children));
     if (children != null && children.length > 0) {
       List<FieldVector> childVectors = vector.getChildrenFromFields();
-      checkState(children.length == childVectors.size(), "ArrowArray struct has %s children (expected %s)",
-          children.length, childVectors.size());
+      checkState(
+          children.length == childVectors.size(),
+          "ArrowArray struct has %s children (expected %s)",
+          children.length,
+          childVectors.size());
       for (int i = 0; i < children.length; i++) {
         checkState(children[i] != NULL, "ArrowArray struct has NULL child at position %s", i);
-        ArrayImporter childImporter = new ArrayImporter(allocator, childVectors.get(i), dictionaryProvider);
+        ArrayImporter childImporter =
+            new ArrayImporter(allocator, childVectors.get(i), dictionaryProvider);
         childImporter.importChild(this, ArrowArray.wrap(children[i]));
       }
     }
@@ -109,16 +113,18 @@ private void doImport(ArrowArray.Snapshot snapshot) {
       // reset the dictionary vector to the initial state
       dictionary.getVector().clear();
 
-      ArrayImporter dictionaryImporter = new ArrayImporter(allocator, dictionary.getVector(), dictionaryProvider);
+      ArrayImporter dictionaryImporter =
+          new ArrayImporter(allocator, dictionary.getVector(), dictionaryProvider);
       dictionaryImporter.importChild(this, ArrowArray.wrap(snapshot.dictionary));
     }
 
     // Import main data
     ArrowFieldNode fieldNode = new ArrowFieldNode(snapshot.length, snapshot.null_count);
-    long[] bufferPointers = NativeUtil.toJavaArray(snapshot.buffers, checkedCastToInt(snapshot.n_buffers));
+    long[] bufferPointers =
+        NativeUtil.toJavaArray(snapshot.buffers, checkedCastToInt(snapshot.n_buffers));
 
-    try (final BufferImportTypeVisitor visitor = new BufferImportTypeVisitor(
-        allocator, underlyingAllocation, fieldNode, bufferPointers)) {
+    try (final BufferImportTypeVisitor visitor =
+        new BufferImportTypeVisitor(allocator, underlyingAllocation, fieldNode, bufferPointers)) {
       final List<ArrowBuf> buffers;
       if (bufferPointers == null || bufferPointers.length == 0) {
         buffers = Collections.emptyList();
@@ -128,7 +134,11 @@ private void doImport(ArrowArray.Snapshot snapshot) {
       vector.loadFieldBuffers(fieldNode, buffers);
     } catch (Exception e) {
       throw new IllegalArgumentException(
-          "Could not load buffers for field " + vector.getField() + ". error message: " + e.getMessage(), e);
+          "Could not load buffers for field "
+              + vector.getField()
+              + ". error message: "
+              + e.getMessage(),
+          e);
     }
   }
 }
diff --git a/java/c/src/main/java/org/apache/arrow/c/ArrayStreamExporter.java b/java/c/src/main/java/org/apache/arrow/c/ArrayStreamExporter.java
index 2c5ca08e717fd..cb2508c83d220 100644
--- a/java/c/src/main/java/org/apache/arrow/c/ArrayStreamExporter.java
+++ b/java/c/src/main/java/org/apache/arrow/c/ArrayStreamExporter.java
@@ -14,23 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
-
 import org.apache.arrow.c.jni.JniWrapper;
 import org.apache.arrow.c.jni.PrivateData;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.ipc.ArrowReader;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-/**
- * Utility to export an {@link ArrowReader} as an ArrowArrayStream.
- */
+/** Utility to export an {@link ArrowReader} as an ArrowArrayStream. */
 final class ArrayStreamExporter {
   private final BufferAllocator allocator;
 
@@ -38,9 +34,7 @@ final class ArrayStreamExporter {
     this.allocator = allocator;
   }
 
-  /**
-   * Java-side state for the exported stream.
-   */
+  /** Java-side state for the exported stream. */
   static class ExportedArrayStreamPrivateData implements PrivateData {
     final BufferAllocator allocator;
     final ArrowReader reader;
diff --git a/java/c/src/main/java/org/apache/arrow/c/ArrowArray.java b/java/c/src/main/java/org/apache/arrow/c/ArrowArray.java
index a538852f47c88..3667d13856d04 100644
--- a/java/c/src/main/java/org/apache/arrow/c/ArrowArray.java
+++ b/java/c/src/main/java/org/apache/arrow/c/ArrowArray.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.apache.arrow.c.NativeUtil.NULL;
@@ -22,7 +21,6 @@
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-
 import org.apache.arrow.c.jni.JniWrapper;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
@@ -32,9 +30,9 @@
 
 /**
  * C Data Interface ArrowArray.
- * <p>
- * Represents a wrapper for the following C structure:
- * 
+ *
+ * <p>Represents a wrapper for the following C structure:
+ *
  * <pre>
  * struct ArrowArray {
  *     // Array data description
@@ -46,7 +44,7 @@
  *     const void** buffers;
  *     struct ArrowArray** children;
  *     struct ArrowArray* dictionary;
- * 
+ *
  *     // Release callback
  *     void (*release)(struct ArrowArray*);
  *     // Opaque producer-specific data
@@ -60,9 +58,7 @@ public class ArrowArray implements BaseStruct {
 
   private ArrowBuf data;
 
-  /**
-   * Snapshot of the ArrowArray raw data.
-   */
+  /** Snapshot of the ArrowArray raw data. */
   public static class Snapshot {
     public long length;
     public long null_count;
@@ -75,9 +71,7 @@ public static class Snapshot {
     public long release;
     public long private_data;
 
-    /**
-     * Initialize empty ArrowArray snapshot.
-     */
+    /** Initialize empty ArrowArray snapshot. */
     public Snapshot() {
       length = NULL;
       null_count = NULL;
@@ -94,21 +88,22 @@ public Snapshot() {
 
   /**
    * Create ArrowArray from an existing memory address.
-   * <p>
-   * The resulting ArrowArray does not own the memory.
-   * 
+   *
+   * <p>The resulting ArrowArray does not own the memory.
+   *
    * @param memoryAddress Memory address to wrap
    * @return A new ArrowArray instance
    */
   public static ArrowArray wrap(long memoryAddress) {
-    return new ArrowArray(new ArrowBuf(ReferenceManager.NO_OP, null, ArrowArray.SIZE_OF, memoryAddress));
+    return new ArrowArray(
+        new ArrowBuf(ReferenceManager.NO_OP, null, ArrowArray.SIZE_OF, memoryAddress));
   }
 
   /**
    * Create ArrowArray by allocating memory.
-   * <p>
-   * The resulting ArrowArray owns the memory.
-   * 
+   *
+   * <p>The resulting ArrowArray owns the memory.
+   *
    * @param allocator Allocator for memory allocations
    * @return A new ArrowArray instance
    */
@@ -123,9 +118,7 @@ public static ArrowArray allocateNew(BufferAllocator allocator) {
     this.data = data;
   }
 
-  /**
-   * Mark the array as released.
-   */
+  /** Mark the array as released. */
   public void markReleased() {
     directBuffer().putLong(INDEX_RELEASE_CALLBACK, NULL);
   }
@@ -156,12 +149,13 @@ boolean isClosed() {
   }
 
   private ByteBuffer directBuffer() {
-    return MemoryUtil.directBuffer(memoryAddress(), ArrowArray.SIZE_OF).order(ByteOrder.nativeOrder());
+    return MemoryUtil.directBuffer(memoryAddress(), ArrowArray.SIZE_OF)
+        .order(ByteOrder.nativeOrder());
   }
 
   /**
    * Take a snapshot of the ArrowArray raw values.
-   * 
+   *
    * @return snapshot
    */
   public Snapshot snapshot() {
@@ -180,12 +174,18 @@ public Snapshot snapshot() {
     return snapshot;
   }
 
-  /**
-   * Write values from Snapshot to the underlying ArrowArray memory buffer.
-   */
+  /** Write values from Snapshot to the underlying ArrowArray memory buffer. */
   public void save(Snapshot snapshot) {
-    directBuffer().putLong(snapshot.length).putLong(snapshot.null_count).putLong(snapshot.offset)
-        .putLong(snapshot.n_buffers).putLong(snapshot.n_children).putLong(snapshot.buffers).putLong(snapshot.children)
-        .putLong(snapshot.dictionary).putLong(snapshot.release).putLong(snapshot.private_data);
+    directBuffer()
+        .putLong(snapshot.length)
+        .putLong(snapshot.null_count)
+        .putLong(snapshot.offset)
+        .putLong(snapshot.n_buffers)
+        .putLong(snapshot.n_children)
+        .putLong(snapshot.buffers)
+        .putLong(snapshot.children)
+        .putLong(snapshot.dictionary)
+        .putLong(snapshot.release)
+        .putLong(snapshot.private_data);
   }
 }
diff --git a/java/c/src/main/java/org/apache/arrow/c/ArrowArrayStream.java b/java/c/src/main/java/org/apache/arrow/c/ArrowArrayStream.java
index caf1f2fe965d1..45dc70084b21b 100644
--- a/java/c/src/main/java/org/apache/arrow/c/ArrowArrayStream.java
+++ b/java/c/src/main/java/org/apache/arrow/c/ArrowArrayStream.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.apache.arrow.c.NativeUtil.NULL;
@@ -23,7 +22,6 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-
 import org.apache.arrow.c.jni.CDataJniException;
 import org.apache.arrow.c.jni.JniWrapper;
 import org.apache.arrow.memory.ArrowBuf;
@@ -33,8 +31,8 @@
 
 /**
  * C Stream Interface ArrowArrayStream.
- * <p>
- * Represents a wrapper for the following C structure:
+ *
+ * <p>Represents a wrapper for the following C structure:
  *
  * <pre>
  * struct ArrowArrayStream {
@@ -52,9 +50,7 @@ public class ArrowArrayStream implements BaseStruct {
 
   private ArrowBuf data;
 
-  /**
-   * Snapshot of the ArrowArrayStream raw data.
-   */
+  /** Snapshot of the ArrowArrayStream raw data. */
   public static class Snapshot {
     public long get_schema;
     public long get_next;
@@ -62,9 +58,7 @@ public static class Snapshot {
     public long release;
     public long private_data;
 
-    /**
-     * Initialize empty ArrowArray snapshot.
-     */
+    /** Initialize empty ArrowArray snapshot. */
     public Snapshot() {
       get_schema = NULL;
       get_next = NULL;
@@ -76,20 +70,21 @@ public Snapshot() {
 
   /**
    * Create ArrowArrayStream from an existing memory address.
-   * <p>
-   * The resulting ArrowArrayStream does not own the memory.
+   *
+   * <p>The resulting ArrowArrayStream does not own the memory.
    *
    * @param memoryAddress Memory address to wrap
    * @return A new ArrowArrayStream instance
    */
   public static ArrowArrayStream wrap(long memoryAddress) {
-    return new ArrowArrayStream(new ArrowBuf(ReferenceManager.NO_OP, null, ArrowArrayStream.SIZE_OF, memoryAddress));
+    return new ArrowArrayStream(
+        new ArrowBuf(ReferenceManager.NO_OP, null, ArrowArrayStream.SIZE_OF, memoryAddress));
   }
 
   /**
    * Create ArrowArrayStream by allocating memory.
-   * <p>
-   * The resulting ArrowArrayStream owns the memory.
+   *
+   * <p>The resulting ArrowArrayStream owns the memory.
    *
    * @param allocator Allocator for memory allocations
    * @return A new ArrowArrayStream instance
@@ -105,9 +100,7 @@ public static ArrowArrayStream allocateNew(BufferAllocator allocator) {
     this.data = data;
   }
 
-  /**
-   * Mark the array as released.
-   */
+  /** Mark the array as released. */
   public void markReleased() {
     directBuffer().putLong(INDEX_RELEASE_CALLBACK, NULL);
   }
@@ -126,6 +119,7 @@ public void release() {
 
   /**
    * Get the schema of the stream.
+   *
    * @param schema The ArrowSchema struct to output to
    * @throws IOException if the stream returns an error
    */
@@ -140,6 +134,7 @@ public void getSchema(ArrowSchema schema) throws IOException {
 
   /**
    * Get the next batch in the stream.
+   *
    * @param array The ArrowArray struct to output to
    * @throws IOException if the stream returns an error
    */
@@ -161,7 +156,8 @@ public void close() {
   }
 
   private ByteBuffer directBuffer() {
-    return MemoryUtil.directBuffer(memoryAddress(), ArrowArrayStream.SIZE_OF).order(ByteOrder.nativeOrder());
+    return MemoryUtil.directBuffer(memoryAddress(), ArrowArrayStream.SIZE_OF)
+        .order(ByteOrder.nativeOrder());
   }
 
   /**
@@ -180,9 +176,7 @@ public ArrowArrayStream.Snapshot snapshot() {
     return snapshot;
   }
 
-  /**
-   * Write values from Snapshot to the underlying ArrowArrayStream memory buffer.
-   */
+  /** Write values from Snapshot to the underlying ArrowArrayStream memory buffer. */
   public void save(ArrowArrayStream.Snapshot snapshot) {
     directBuffer()
         .putLong(snapshot.get_schema)
diff --git a/java/c/src/main/java/org/apache/arrow/c/ArrowArrayStreamReader.java b/java/c/src/main/java/org/apache/arrow/c/ArrowArrayStreamReader.java
index b39a3be9b842f..07a88cd8d7dab 100644
--- a/java/c/src/main/java/org/apache/arrow/c/ArrowArrayStreamReader.java
+++ b/java/c/src/main/java/org/apache/arrow/c/ArrowArrayStreamReader.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.apache.arrow.c.NativeUtil.NULL;
@@ -24,15 +23,12 @@
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.dictionary.Dictionary;
 import org.apache.arrow.vector.ipc.ArrowReader;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-/**
- * An implementation of an {@link ArrowReader} backed by an ArrowArrayStream.
- */
+/** An implementation of an {@link ArrowReader} backed by an ArrowArrayStream. */
 final class ArrowArrayStreamReader extends ArrowReader {
   private final ArrowArrayStream ownedStream;
   private final CDataDictionaryProvider provider;
@@ -53,7 +49,8 @@ final class ArrowArrayStreamReader extends ArrowReader {
 
   @Override
   public Map<Long, Dictionary> getDictionaryVectors() {
-    return provider.getDictionaryIds().stream().collect(Collectors.toMap(Function.identity(), provider::lookup));
+    return provider.getDictionaryIds().stream()
+        .collect(Collectors.toMap(Function.identity(), provider::lookup));
   }
 
   @Override
diff --git a/java/c/src/main/java/org/apache/arrow/c/ArrowSchema.java b/java/c/src/main/java/org/apache/arrow/c/ArrowSchema.java
index b34ce7d5a52bc..06e401627ef01 100644
--- a/java/c/src/main/java/org/apache/arrow/c/ArrowSchema.java
+++ b/java/c/src/main/java/org/apache/arrow/c/ArrowSchema.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.apache.arrow.c.NativeUtil.NULL;
@@ -22,7 +21,6 @@
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-
 import org.apache.arrow.c.jni.JniWrapper;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
@@ -31,9 +29,9 @@
 
 /**
  * C Data Interface ArrowSchema.
- * <p>
- * Represents a wrapper for the following C structure:
- * 
+ *
+ * <p>Represents a wrapper for the following C structure:
+ *
  * <pre>
  * struct ArrowSchema {
  *     // Array type description
@@ -44,11 +42,11 @@
  *     int64_t n_children;
  *     struct ArrowSchema** children;
  *     struct ArrowSchema* dictionary;
- *      
+ *
  *     // Release callback
  *     void (*release)(struct ArrowSchema*);
  *     // Opaque producer-specific data
- *     void* private_data; 
+ *     void* private_data;
  * };
  * </pre>
  */
@@ -57,9 +55,7 @@ public class ArrowSchema implements BaseStruct {
 
   private ArrowBuf data;
 
-  /**
-   * Snapshot of the ArrowSchema raw data.
-   */
+  /** Snapshot of the ArrowSchema raw data. */
   public static class Snapshot {
     public long format;
     public long name;
@@ -71,9 +67,7 @@ public static class Snapshot {
     public long release;
     public long private_data;
 
-    /**
-     * Initialize empty ArrowSchema snapshot.
-     */
+    /** Initialize empty ArrowSchema snapshot. */
     public Snapshot() {
       format = NULL;
       name = NULL;
@@ -89,21 +83,22 @@ public Snapshot() {
 
   /**
    * Create ArrowSchema from an existing memory address.
-   * <p>
-   * The resulting ArrowSchema does not own the memory.
-   * 
+   *
+   * <p>The resulting ArrowSchema does not own the memory.
+   *
    * @param memoryAddress Memory address to wrap
    * @return A new ArrowSchema instance
    */
   public static ArrowSchema wrap(long memoryAddress) {
-    return new ArrowSchema(new ArrowBuf(ReferenceManager.NO_OP, null, ArrowSchema.SIZE_OF, memoryAddress));
+    return new ArrowSchema(
+        new ArrowBuf(ReferenceManager.NO_OP, null, ArrowSchema.SIZE_OF, memoryAddress));
   }
 
   /**
    * Create ArrowSchema by allocating memory.
-   * <p>
-   * The resulting ArrowSchema owns the memory.
-   * 
+   *
+   * <p>The resulting ArrowSchema owns the memory.
+   *
    * @param allocator Allocator for memory allocations
    * @return A new ArrowSchema instance
    */
@@ -137,12 +132,13 @@ public void close() {
   }
 
   private ByteBuffer directBuffer() {
-    return MemoryUtil.directBuffer(memoryAddress(), ArrowSchema.SIZE_OF).order(ByteOrder.nativeOrder());
+    return MemoryUtil.directBuffer(memoryAddress(), ArrowSchema.SIZE_OF)
+        .order(ByteOrder.nativeOrder());
   }
 
   /**
    * Take a snapshot of the ArrowSchema raw values.
-   * 
+   *
    * @return snapshot
    */
   public Snapshot snapshot() {
@@ -160,12 +156,17 @@ public Snapshot snapshot() {
     return snapshot;
   }
 
-  /**
-   * Write values from Snapshot to the underlying ArrowSchema memory buffer.
-   */
+  /** Write values from Snapshot to the underlying ArrowSchema memory buffer. */
   public void save(Snapshot snapshot) {
-    directBuffer().putLong(snapshot.format).putLong(snapshot.name).putLong(snapshot.metadata).putLong(snapshot.flags)
-        .putLong(snapshot.n_children).putLong(snapshot.children).putLong(snapshot.dictionary).putLong(snapshot.release)
+    directBuffer()
+        .putLong(snapshot.format)
+        .putLong(snapshot.name)
+        .putLong(snapshot.metadata)
+        .putLong(snapshot.flags)
+        .putLong(snapshot.n_children)
+        .putLong(snapshot.children)
+        .putLong(snapshot.dictionary)
+        .putLong(snapshot.release)
         .putLong(snapshot.private_data);
   }
 }
diff --git a/java/c/src/main/java/org/apache/arrow/c/BaseStruct.java b/java/c/src/main/java/org/apache/arrow/c/BaseStruct.java
index d90fe81758923..d64d2a8506911 100644
--- a/java/c/src/main/java/org/apache/arrow/c/BaseStruct.java
+++ b/java/c/src/main/java/org/apache/arrow/c/BaseStruct.java
@@ -14,30 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
-/**
- * Base interface for C Data Interface structures.
- */
+/** Base interface for C Data Interface structures. */
 public interface BaseStruct extends AutoCloseable {
   /**
    * Get memory address.
-   * 
+   *
    * @return Memory address
    */
   long memoryAddress();
 
   /**
    * Call the release callback of an ArrowArray.
-   * <p>
-   * This function must not be called for child arrays.
+   *
+   * <p>This function must not be called for child arrays.
    */
   void release();
 
-  /**
-   * Close to release the main buffer.
-   */
+  /** Close to release the main buffer. */
   @Override
   void close();
 }
diff --git a/java/c/src/main/java/org/apache/arrow/c/BufferImportTypeVisitor.java b/java/c/src/main/java/org/apache/arrow/c/BufferImportTypeVisitor.java
index cd2a464f4fa17..5f262d3dc3315 100644
--- a/java/c/src/main/java/org/apache/arrow/c/BufferImportTypeVisitor.java
+++ b/java/c/src/main/java/org/apache/arrow/c/BufferImportTypeVisitor.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.apache.arrow.c.NativeUtil.NULL;
@@ -24,11 +23,11 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.util.VisibleForTesting;
+import org.apache.arrow.vector.BaseVariableWidthViewVector;
 import org.apache.arrow.vector.DateDayVector;
 import org.apache.arrow.vector.DateMilliVector;
 import org.apache.arrow.vector.DurationVector;
@@ -55,9 +54,7 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.util.DataSizeRoundingUtil;
 
-/**
- * Import buffers from a C Data Interface struct.
- */
+/** Import buffers from a C Data Interface struct. */
 class BufferImportTypeVisitor implements ArrowType.ArrowTypeVisitor<List<ArrowBuf>>, AutoCloseable {
   private final BufferAllocator allocator;
   private final ReferenceCountedArrowArray underlyingAllocation;
@@ -65,8 +62,11 @@ class BufferImportTypeVisitor implements ArrowType.ArrowTypeVisitor<List<ArrowBu
   private final long[] buffers;
   private final List<ArrowBuf> imported;
 
-  BufferImportTypeVisitor(BufferAllocator allocator, ReferenceCountedArrowArray underlyingAllocation,
-                          ArrowFieldNode fieldNode, long[] buffers) {
+  BufferImportTypeVisitor(
+      BufferAllocator allocator,
+      ReferenceCountedArrowArray underlyingAllocation,
+      ArrowFieldNode fieldNode,
+      long[] buffers) {
     this.allocator = allocator;
     this.underlyingAllocation = underlyingAllocation;
     this.fieldNode = fieldNode;
@@ -82,14 +82,18 @@ public void close() throws Exception {
   @VisibleForTesting
   ArrowBuf importBuffer(ArrowType type, int index, long capacity) {
     checkState(
-            buffers.length > index,
-            "Expected at least %s buffers for type %s, but found %s", index + 1, type, buffers.length);
+        buffers.length > index,
+        "Expected at least %s buffers for type %s, but found %s",
+        index + 1,
+        type,
+        buffers.length);
     long bufferPtr = buffers[index];
 
     if (bufferPtr == NULL) {
       // C array may be NULL but only accept that if expected capacity is zero too
       if (capacity != 0) {
-        throw new IllegalStateException(String.format("Buffer %s for type %s cannot be null", index, type));
+        throw new IllegalStateException(
+            String.format("Buffer %s for type %s cannot be null", index, type));
       } else {
         // no data in the C array, return an empty buffer
         return allocator.getEmpty();
@@ -123,18 +127,24 @@ private ArrowBuf importData(ArrowType type, long capacity) {
   private ArrowBuf maybeImportBitmap(ArrowType type) {
     checkState(
         buffers.length > 0,
-        "Expected at least %s buffers for type %s, but found %s", 1, type, buffers.length);
+        "Expected at least %s buffers for type %s, but found %s",
+        1,
+        type,
+        buffers.length);
     if (buffers[0] == NULL) {
       return null;
     }
-    return importFixedBits(type, 0, /*bitsPerSlot=*/1);
+    return importFixedBits(type, 0, /*bitsPerSlot=*/ 1);
   }
 
   @Override
   public List<ArrowBuf> visit(ArrowType.Null type) {
     checkState(
         buffers.length == 0,
-        "Expected %s buffers for type %s, but found %s", 0, type, buffers.length);
+        "Expected %s buffers for type %s, but found %s",
+        0,
+        type,
+        buffers.length);
     return Collections.emptyList();
   }
 
@@ -150,7 +160,8 @@ public List<ArrowBuf> visit(ArrowType.List type) {
 
   @Override
   public List<ArrowBuf> visit(ArrowType.LargeList type) {
-    return Arrays.asList(maybeImportBitmap(type), importOffsets(type, LargeListVector.OFFSET_WIDTH));
+    return Arrays.asList(
+        maybeImportBitmap(type), importOffsets(type, LargeListVector.OFFSET_WIDTH));
   }
 
   @Override
@@ -164,7 +175,8 @@ public List<ArrowBuf> visit(ArrowType.Union type) {
       case Sparse:
         return Collections.singletonList(importFixedBytes(type, 0, UnionVector.TYPE_WIDTH));
       case Dense:
-        return Arrays.asList(importFixedBytes(type, 0, DenseUnionVector.TYPE_WIDTH),
+        return Arrays.asList(
+            importFixedBytes(type, 0, DenseUnionVector.TYPE_WIDTH),
             importFixedBytes(type, 1, DenseUnionVector.OFFSET_WIDTH));
       default:
         throw new UnsupportedOperationException("Importing buffers for union type: " + type);
@@ -185,11 +197,14 @@ public List<ArrowBuf> visit(ArrowType.Int type) {
   public List<ArrowBuf> visit(ArrowType.FloatingPoint type) {
     switch (type.getPrecision()) {
       case HALF:
-        return Arrays.asList(maybeImportBitmap(type), importFixedBytes(type, 1, /*bytesPerSlot=*/2));
+        return Arrays.asList(
+            maybeImportBitmap(type), importFixedBytes(type, 1, /*bytesPerSlot=*/ 2));
       case SINGLE:
-        return Arrays.asList(maybeImportBitmap(type), importFixedBytes(type, 1, Float4Vector.TYPE_WIDTH));
+        return Arrays.asList(
+            maybeImportBitmap(type), importFixedBytes(type, 1, Float4Vector.TYPE_WIDTH));
       case DOUBLE:
-        return Arrays.asList(maybeImportBitmap(type), importFixedBytes(type, 1, Float8Vector.TYPE_WIDTH));
+        return Arrays.asList(
+            maybeImportBitmap(type), importFixedBytes(type, 1, Float8Vector.TYPE_WIDTH));
       default:
         throw new UnsupportedOperationException("Importing buffers for type: " + type);
     }
@@ -202,21 +217,61 @@ public List<ArrowBuf> visit(ArrowType.Utf8 type) {
       final int end = offsets.getInt(fieldNode.getLength() * (long) VarCharVector.OFFSET_WIDTH);
       checkState(
           end >= start,
-          "Offset buffer for type %s is malformed: start: %s, end: %s", type, start, end);
+          "Offset buffer for type %s is malformed: start: %s, end: %s",
+          type,
+          start,
+          end);
       final int len = end - start;
       offsets.getReferenceManager().retain();
       return Arrays.asList(maybeImportBitmap(type), offsets, importData(type, len));
     }
   }
 
+  private List<ArrowBuf> visitVariableWidthView(ArrowType type) {
+    final int viewBufferIndex = 1;
+    final int variadicSizeBufferIndex = this.buffers.length - 1;
+    final long numOfVariadicBuffers = this.buffers.length - 3;
+    final long variadicSizeBufferCapacity = numOfVariadicBuffers * Long.BYTES;
+    List<ArrowBuf> buffers = new ArrayList<>();
+
+    ArrowBuf variadicSizeBuffer =
+        importBuffer(type, variadicSizeBufferIndex, variadicSizeBufferCapacity);
+
+    ArrowBuf view =
+        importFixedBytes(type, viewBufferIndex, BaseVariableWidthViewVector.ELEMENT_SIZE);
+    buffers.add(maybeImportBitmap(type));
+    buffers.add(view);
+
+    // 0th buffer is validity buffer
+    // 1st buffer is view buffer
+    // 2nd buffer onwards are variadic buffer
+    // N-1 (this.buffers.length - 1) buffer is variadic size buffer
+    final int variadicBufferReadOffset = 2;
+    for (int i = 0; i < numOfVariadicBuffers; i++) {
+      long size = variadicSizeBuffer.getLong((long) i * Long.BYTES);
+      buffers.add(importBuffer(type, i + variadicBufferReadOffset, size));
+    }
+
+    return buffers;
+  }
+
+  @Override
+  public List<ArrowBuf> visit(ArrowType.Utf8View type) {
+    return visitVariableWidthView(type);
+  }
+
   @Override
   public List<ArrowBuf> visit(ArrowType.LargeUtf8 type) {
     try (ArrowBuf offsets = importOffsets(type, LargeVarCharVector.OFFSET_WIDTH)) {
       final long start = offsets.getLong(0);
-      final long end = offsets.getLong(fieldNode.getLength() * (long) LargeVarCharVector.OFFSET_WIDTH);
+      final long end =
+          offsets.getLong(fieldNode.getLength() * (long) LargeVarCharVector.OFFSET_WIDTH);
       checkState(
           end >= start,
-          "Offset buffer for type %s is malformed: start: %s, end: %s", type, start, end);
+          "Offset buffer for type %s is malformed: start: %s, end: %s",
+          type,
+          start,
+          end);
       final long len = end - start;
       offsets.getReferenceManager().retain();
       return Arrays.asList(maybeImportBitmap(type), offsets, importData(type, len));
@@ -230,22 +285,34 @@ public List<ArrowBuf> visit(ArrowType.Binary type) {
       final int end = offsets.getInt(fieldNode.getLength() * (long) VarBinaryVector.OFFSET_WIDTH);
       checkState(
           end >= start,
-          "Offset buffer for type %s is malformed: start: %s, end: %s", type, start, end);
+          "Offset buffer for type %s is malformed: start: %s, end: %s",
+          type,
+          start,
+          end);
       final int len = end - start;
       offsets.getReferenceManager().retain();
       return Arrays.asList(maybeImportBitmap(type), offsets, importData(type, len));
     }
   }
 
+  @Override
+  public List<ArrowBuf> visit(ArrowType.BinaryView type) {
+    return visitVariableWidthView(type);
+  }
+
   @Override
   public List<ArrowBuf> visit(ArrowType.LargeBinary type) {
     try (ArrowBuf offsets = importOffsets(type, LargeVarBinaryVector.OFFSET_WIDTH)) {
       final long start = offsets.getLong(0);
       // TODO: need better tests to cover the failure when I forget to multiply by offset width
-      final long end = offsets.getLong(fieldNode.getLength() * (long) LargeVarBinaryVector.OFFSET_WIDTH);
+      final long end =
+          offsets.getLong(fieldNode.getLength() * (long) LargeVarBinaryVector.OFFSET_WIDTH);
       checkState(
           end >= start,
-          "Offset buffer for type %s is malformed: start: %s, end: %s", type, start, end);
+          "Offset buffer for type %s is malformed: start: %s, end: %s",
+          type,
+          start,
+          end);
       final long len = end - start;
       offsets.getReferenceManager().retain();
       return Arrays.asList(maybeImportBitmap(type), offsets, importData(type, len));
@@ -259,7 +326,7 @@ public List<ArrowBuf> visit(ArrowType.FixedSizeBinary type) {
 
   @Override
   public List<ArrowBuf> visit(ArrowType.Bool type) {
-    return Arrays.asList(maybeImportBitmap(type), importFixedBits(type, 1, /*bitsPerSlot=*/1));
+    return Arrays.asList(maybeImportBitmap(type), importFixedBits(type, 1, /*bitsPerSlot=*/ 1));
   }
 
   @Override
@@ -271,9 +338,11 @@ public List<ArrowBuf> visit(ArrowType.Decimal type) {
   public List<ArrowBuf> visit(ArrowType.Date type) {
     switch (type.getUnit()) {
       case DAY:
-        return Arrays.asList(maybeImportBitmap(type), importFixedBytes(type, 1, DateDayVector.TYPE_WIDTH));
+        return Arrays.asList(
+            maybeImportBitmap(type), importFixedBytes(type, 1, DateDayVector.TYPE_WIDTH));
       case MILLISECOND:
-        return Arrays.asList(maybeImportBitmap(type), importFixedBytes(type, 1, DateMilliVector.TYPE_WIDTH));
+        return Arrays.asList(
+            maybeImportBitmap(type), importFixedBytes(type, 1, DateMilliVector.TYPE_WIDTH));
       default:
         throw new UnsupportedOperationException("Importing buffers for type: " + type);
     }
@@ -283,13 +352,17 @@ public List<ArrowBuf> visit(ArrowType.Date type) {
   public List<ArrowBuf> visit(ArrowType.Time type) {
     switch (type.getUnit()) {
       case SECOND:
-        return Arrays.asList(maybeImportBitmap(type), importFixedBytes(type, 1, TimeSecVector.TYPE_WIDTH));
+        return Arrays.asList(
+            maybeImportBitmap(type), importFixedBytes(type, 1, TimeSecVector.TYPE_WIDTH));
       case MILLISECOND:
-        return Arrays.asList(maybeImportBitmap(type), importFixedBytes(type, 1, TimeMilliVector.TYPE_WIDTH));
+        return Arrays.asList(
+            maybeImportBitmap(type), importFixedBytes(type, 1, TimeMilliVector.TYPE_WIDTH));
       case MICROSECOND:
-        return Arrays.asList(maybeImportBitmap(type), importFixedBytes(type, 1, TimeMicroVector.TYPE_WIDTH));
+        return Arrays.asList(
+            maybeImportBitmap(type), importFixedBytes(type, 1, TimeMicroVector.TYPE_WIDTH));
       case NANOSECOND:
-        return Arrays.asList(maybeImportBitmap(type), importFixedBytes(type, 1, TimeNanoVector.TYPE_WIDTH));
+        return Arrays.asList(
+            maybeImportBitmap(type), importFixedBytes(type, 1, TimeNanoVector.TYPE_WIDTH));
       default:
         throw new UnsupportedOperationException("Importing buffers for type: " + type);
     }
@@ -297,18 +370,23 @@ public List<ArrowBuf> visit(ArrowType.Time type) {
 
   @Override
   public List<ArrowBuf> visit(ArrowType.Timestamp type) {
-    return Arrays.asList(maybeImportBitmap(type), importFixedBytes(type, 1, TimeStampVector.TYPE_WIDTH));
+    return Arrays.asList(
+        maybeImportBitmap(type), importFixedBytes(type, 1, TimeStampVector.TYPE_WIDTH));
   }
 
   @Override
   public List<ArrowBuf> visit(ArrowType.Interval type) {
     switch (type.getUnit()) {
       case YEAR_MONTH:
-        return Arrays.asList(maybeImportBitmap(type), importFixedBytes(type, 1, IntervalYearVector.TYPE_WIDTH));
+        return Arrays.asList(
+            maybeImportBitmap(type), importFixedBytes(type, 1, IntervalYearVector.TYPE_WIDTH));
       case DAY_TIME:
-        return Arrays.asList(maybeImportBitmap(type), importFixedBytes(type, 1, IntervalDayVector.TYPE_WIDTH));
+        return Arrays.asList(
+            maybeImportBitmap(type), importFixedBytes(type, 1, IntervalDayVector.TYPE_WIDTH));
       case MONTH_DAY_NANO:
-        return Arrays.asList(maybeImportBitmap(type), importFixedBytes(type, 1, IntervalMonthDayNanoVector.TYPE_WIDTH));
+        return Arrays.asList(
+            maybeImportBitmap(type),
+            importFixedBytes(type, 1, IntervalMonthDayNanoVector.TYPE_WIDTH));
       default:
         throw new UnsupportedOperationException("Importing buffers for type: " + type);
     }
@@ -316,6 +394,13 @@ public List<ArrowBuf> visit(ArrowType.Interval type) {
 
   @Override
   public List<ArrowBuf> visit(ArrowType.Duration type) {
-    return Arrays.asList(maybeImportBitmap(type), importFixedBytes(type, 1, DurationVector.TYPE_WIDTH));
+    return Arrays.asList(
+        maybeImportBitmap(type), importFixedBytes(type, 1, DurationVector.TYPE_WIDTH));
+  }
+
+  @Override
+  public List<ArrowBuf> visit(ArrowType.ListView type) {
+    throw new UnsupportedOperationException(
+        "Importing buffers for view type: " + type + " not supported");
   }
 }
diff --git a/java/c/src/main/java/org/apache/arrow/c/CDataDictionaryProvider.java b/java/c/src/main/java/org/apache/arrow/c/CDataDictionaryProvider.java
index 4a84f11704c9a..2b49e6e4b5bc1 100644
--- a/java/c/src/main/java/org/apache/arrow/c/CDataDictionaryProvider.java
+++ b/java/c/src/main/java/org/apache/arrow/c/CDataDictionaryProvider.java
@@ -14,28 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.arrow.vector.dictionary.Dictionary;
 import org.apache.arrow.vector.dictionary.DictionaryProvider;
 
 /**
  * A DictionaryProvider that is used in C Data Interface for imports.
- * <p>
- * CDataDictionaryProvider is similar to
- * {@link DictionaryProvider.MapDictionaryProvider} with a key difference that
- * the dictionaries are owned by the provider so it must eventually be closed.
- * <p>
- * The typical usage is to create the CDataDictionaryProvider and pass it to
- * {@link Data#importField} or {@link Data#importSchema} to allocate empty
- * dictionaries based on the information in {@link ArrowSchema}. Then you can
- * re-use the same dictionary provider in any function that imports an
- * {@link ArrowArray} that has the same schema.
+ *
+ * <p>CDataDictionaryProvider is similar to {@link DictionaryProvider.MapDictionaryProvider} with a
+ * key difference that the dictionaries are owned by the provider so it must eventually be closed.
+ *
+ * <p>The typical usage is to create the CDataDictionaryProvider and pass it to {@link
+ * Data#importField} or {@link Data#importSchema} to allocate empty dictionaries based on the
+ * information in {@link ArrowSchema}. Then you can re-use the same dictionary provider in any
+ * function that imports an {@link ArrowArray} that has the same schema.
  */
 public class CDataDictionaryProvider implements DictionaryProvider, AutoCloseable {
 
@@ -69,5 +65,4 @@ public void close() {
     }
     map.clear();
   }
-
 }
diff --git a/java/c/src/main/java/org/apache/arrow/c/Data.java b/java/c/src/main/java/org/apache/arrow/c/Data.java
index c90ce7604d6e7..0b4da33b4eedc 100644
--- a/java/c/src/main/java/org/apache/arrow/c/Data.java
+++ b/java/c/src/main/java/org/apache/arrow/c/Data.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import org.apache.arrow.memory.BufferAllocator;
@@ -35,76 +34,78 @@
 
 /**
  * Functions for working with the C data interface.
- * <p>
- * This API is EXPERIMENTAL. Note that currently only 64bit systems are
- * supported.
+ *
+ * <p>This API is EXPERIMENTAL. Note that currently only 64bit systems are supported.
  */
 public final class Data {
 
-  private Data() {
-  }
+  private Data() {}
 
   /**
    * Export Java Field using the C data interface format.
-   * 
+   *
    * @param allocator Buffer allocator for allocating C data interface fields
-   * @param field     Field object to export
-   * @param provider  Dictionary provider for dictionary encoded fields (optional)
-   * @param out       C struct where to export the field
+   * @param field Field object to export
+   * @param provider Dictionary provider for dictionary encoded fields (optional)
+   * @param out C struct where to export the field
    */
-  public static void exportField(BufferAllocator allocator, Field field, DictionaryProvider provider, ArrowSchema out) {
+  public static void exportField(
+      BufferAllocator allocator, Field field, DictionaryProvider provider, ArrowSchema out) {
     SchemaExporter exporter = new SchemaExporter(allocator);
     exporter.export(out, field, provider);
   }
 
   /**
    * Export Java Schema using the C data interface format.
-   * 
+   *
    * @param allocator Buffer allocator for allocating C data interface fields
-   * @param schema    Schema object to export
-   * @param provider  Dictionary provider for dictionary encoded fields (optional)
-   * @param out       C struct where to export the field
+   * @param schema Schema object to export
+   * @param provider Dictionary provider for dictionary encoded fields (optional)
+   * @param out C struct where to export the field
    */
-  public static void exportSchema(BufferAllocator allocator, Schema schema, DictionaryProvider provider,
-      ArrowSchema out) {
+  public static void exportSchema(
+      BufferAllocator allocator, Schema schema, DictionaryProvider provider, ArrowSchema out) {
     // Convert to a struct field equivalent to the input schema
-    FieldType fieldType = new FieldType(false, new ArrowType.Struct(), null, schema.getCustomMetadata());
+    FieldType fieldType =
+        new FieldType(false, new ArrowType.Struct(), null, schema.getCustomMetadata());
     Field field = new Field("", fieldType, schema.getFields());
     exportField(allocator, field, provider, out);
   }
 
   /**
    * Export Java FieldVector using the C data interface format.
-   * <p>
-   * The resulting ArrowArray struct keeps the array data and buffers alive until
-   * its release callback is called by the consumer.
-   * 
+   *
+   * <p>The resulting ArrowArray struct keeps the array data and buffers alive until its release
+   * callback is called by the consumer.
+   *
    * @param allocator Buffer allocator for allocating C data interface fields
-   * @param vector    Vector object to export
-   * @param provider  Dictionary provider for dictionary encoded vectors
-   *                  (optional)
-   * @param out       C struct where to export the array
+   * @param vector Vector object to export
+   * @param provider Dictionary provider for dictionary encoded vectors (optional)
+   * @param out C struct where to export the array
    */
-  public static void exportVector(BufferAllocator allocator, FieldVector vector, DictionaryProvider provider,
-      ArrowArray out) {
+  public static void exportVector(
+      BufferAllocator allocator, FieldVector vector, DictionaryProvider provider, ArrowArray out) {
     exportVector(allocator, vector, provider, out, null);
   }
 
   /**
    * Export Java FieldVector using the C data interface format.
-   * <p>
-   * The resulting ArrowArray struct keeps the array data and buffers alive until
-   * its release callback is called by the consumer.
-   * 
+   *
+   * <p>The resulting ArrowArray struct keeps the array data and buffers alive until its release
+   * callback is called by the consumer.
+   *
    * @param allocator Buffer allocator for allocating C data interface fields
-   * @param vector    Vector object to export
-   * @param provider  Dictionary provider for dictionary encoded vectors
-   *                  (optional)
-   * @param out       C struct where to export the array
+   * @param vector Vector object to export
+   * @param provider Dictionary provider for dictionary encoded vectors (optional)
+   * @param out C struct where to export the array
    * @param outSchema C struct where to export the array type (optional)
    */
-  public static void exportVector(BufferAllocator allocator, FieldVector vector, DictionaryProvider provider,
-      ArrowArray out, ArrowSchema outSchema) {
+  public static void exportVector(
+      BufferAllocator allocator,
+      FieldVector vector,
+      DictionaryProvider provider,
+      ArrowArray out,
+      ArrowSchema outSchema) {
     if (outSchema != null) {
       exportField(allocator, vector.getField(), provider, outSchema);
     }
@@ -114,97 +115,97 @@ public static void exportVector(BufferAllocator allocator, FieldVector vector, D
   }
 
   /**
-   * Export the current contents of a Java Table using the C data
-   * interface format.
-   * <p>
-   * The table is exported as if it were a struct array. The
-   * resulting ArrowArray struct keeps the record batch data and buffers alive
-   * until its release callback is called by the consumer.
+   * Export the current contents of a Java Table using the C data interface format.
+   *
+   * <p>The table is exported as if it were a struct array. The resulting ArrowArray struct keeps
+   * the record batch data and buffers alive until its release callback is called by the consumer.
    *
    * @param allocator Buffer allocator for allocating C data interface fields
-   * @param table     Table to export
-   * @param out       C struct where to export the record batch
+   * @param table Table to export
+   * @param out C struct where to export the record batch
    */
   public static void exportTable(BufferAllocator allocator, Table table, ArrowArray out) {
     exportTable(allocator, table, table.getDictionaryProvider(), out, null);
   }
 
   /**
-   * Export the current contents of a Java Table using the C data
-   * interface format.
-   * <p>
-   * The table is exported as if it were a struct array. The
-   * resulting ArrowArray struct keeps the record batch data and buffers alive
-   * until its release callback is called by the consumer.
+   * Export the current contents of a Java Table using the C data interface format.
+   *
+   * <p>The table is exported as if it were a struct array. The resulting ArrowArray struct keeps
+   * the record batch data and buffers alive until its release callback is called by the consumer.
    *
    * @param allocator Buffer allocator for allocating C data interface fields
-   * @param table     Table to export
-   * @param provider  Dictionary provider for dictionary encoded vectors
-   *                  (optional)
-   * @param out       C struct where to export the record batch
+   * @param table Table to export
+   * @param provider Dictionary provider for dictionary encoded vectors (optional)
+   * @param out C struct where to export the record batch
    */
-  public static void exportTable(BufferAllocator allocator, Table table,
-      DictionaryProvider provider, ArrowArray out) {
+  public static void exportTable(
+      BufferAllocator allocator, Table table, DictionaryProvider provider, ArrowArray out) {
     exportTable(allocator, table, provider, out, null);
   }
 
   /**
    * Export the current contents of a Java Table using the C data interface format.
-   * <p>
-   * The table is exported as if it were a struct array. The
-   * resulting ArrowArray struct keeps the record batch data and buffers alive
-   * until its release callback is called by the consumer.
+   *
+   * <p>The table is exported as if it were a struct array. The resulting ArrowArray struct keeps
+   * the record batch data and buffers alive until its release callback is called by the consumer.
    *
    * @param allocator Buffer allocator for allocating C data interface fields
-   * @param table     Table to export
-   * @param provider  Dictionary provider for dictionary encoded vectors
-   *                  (optional)
-   * @param out       C struct where to export the record batch
+   * @param table Table to export
+   * @param provider Dictionary provider for dictionary encoded vectors (optional)
+   * @param out C struct where to export the record batch
    * @param outSchema C struct where to export the record batch schema (optional)
    */
-  public static void exportTable(BufferAllocator allocator, Table table,
-                                 DictionaryProvider provider, ArrowArray out, ArrowSchema outSchema) {
+  public static void exportTable(
+      BufferAllocator allocator,
+      Table table,
+      DictionaryProvider provider,
+      ArrowArray out,
+      ArrowSchema outSchema) {
     try (VectorSchemaRoot root = table.toVectorSchemaRoot()) {
       exportVectorSchemaRoot(allocator, root, provider, out, outSchema);
     }
   }
 
   /**
-   * Export the current contents of a Java VectorSchemaRoot using the C data
-   * interface format.
-   * <p>
-   * The vector schema root is exported as if it were a struct array. The
-   * resulting ArrowArray struct keeps the record batch data and buffers alive
-   * until its release callback is called by the consumer.
+   * Export the current contents of a Java VectorSchemaRoot using the C data interface format.
+   *
+   * <p>The vector schema root is exported as if it were a struct array. The resulting ArrowArray
+   * struct keeps the record batch data and buffers alive until its release callback is called by
+   * the consumer.
    *
    * @param allocator Buffer allocator for allocating C data interface fields
-   * @param vsr       Vector schema root to export
-   * @param provider  Dictionary provider for dictionary encoded vectors
-   *                  (optional)
-   * @param out       C struct where to export the record batch
+   * @param vsr Vector schema root to export
+   * @param provider Dictionary provider for dictionary encoded vectors (optional)
+   * @param out C struct where to export the record batch
    */
-  public static void exportVectorSchemaRoot(BufferAllocator allocator, VectorSchemaRoot vsr,
-                                            DictionaryProvider provider, ArrowArray out) {
+  public static void exportVectorSchemaRoot(
+      BufferAllocator allocator,
+      VectorSchemaRoot vsr,
+      DictionaryProvider provider,
+      ArrowArray out) {
     exportVectorSchemaRoot(allocator, vsr, provider, out, null);
   }
 
   /**
-   * Export the current contents of a Java VectorSchemaRoot using the C data
-   * interface format.
-   * <p>
-   * The vector schema root is exported as if it were a struct array. The
-   * resulting ArrowArray struct keeps the record batch data and buffers alive
-   * until its release callback is called by the consumer.
-   * 
+   * Export the current contents of a Java VectorSchemaRoot using the C data interface format.
+   *
+   * <p>The vector schema root is exported as if it were a struct array. The resulting ArrowArray
+   * struct keeps the record batch data and buffers alive until its release callback is called by
+   * the consumer.
+   *
    * @param allocator Buffer allocator for allocating C data interface fields
-   * @param vsr       Vector schema root to export
-   * @param provider  Dictionary provider for dictionary encoded vectors
-   *                  (optional)
-   * @param out       C struct where to export the record batch
+   * @param vsr Vector schema root to export
+   * @param provider Dictionary provider for dictionary encoded vectors (optional)
+   * @param out C struct where to export the record batch
    * @param outSchema C struct where to export the record batch schema (optional)
    */
-  public static void exportVectorSchemaRoot(BufferAllocator allocator, VectorSchemaRoot vsr,
-      DictionaryProvider provider, ArrowArray out, ArrowSchema outSchema) {
+  public static void exportVectorSchemaRoot(
+      BufferAllocator allocator,
+      VectorSchemaRoot vsr,
+      DictionaryProvider provider,
+      ArrowArray out,
+      ArrowSchema outSchema) {
     if (outSchema != null) {
       exportSchema(allocator, vsr.getSchema(), provider, outSchema);
     }
@@ -220,27 +221,30 @@ public static void exportVectorSchemaRoot(BufferAllocator allocator, VectorSchem
 
   /**
    * Export a reader as an ArrowArrayStream using the C Stream Interface.
+   *
    * @param allocator Buffer allocator for allocating C data interface fields
    * @param reader Reader to export
    * @param out C struct to export the stream
    */
-  public static void exportArrayStream(BufferAllocator allocator, ArrowReader reader, ArrowArrayStream out) {
+  public static void exportArrayStream(
+      BufferAllocator allocator, ArrowReader reader, ArrowArrayStream out) {
     new ArrayStreamExporter(allocator).export(out, reader);
   }
 
   /**
    * Import Java Field from the C data interface.
-   * <p>
-   * The given ArrowSchema struct is released (as per the C data interface
-   * specification), even if this function fails.
-   * 
+   *
+   * <p>The given ArrowSchema struct is released (as per the C data interface specification), even
+   * if this function fails.
+   *
    * @param allocator Buffer allocator for allocating dictionary vectors
-   * @param schema    C data interface struct representing the field [inout]
-   * @param provider  A dictionary provider will be initialized with empty
-   *                  dictionary vectors (optional)
+   * @param schema C data interface struct representing the field [inout]
+   * @param provider A dictionary provider will be initialized with empty dictionary vectors
+   *     (optional)
    * @return Imported field object
    */
-  public static Field importField(BufferAllocator allocator, ArrowSchema schema, CDataDictionaryProvider provider) {
+  public static Field importField(
+      BufferAllocator allocator, ArrowSchema schema, CDataDictionaryProvider provider) {
     try {
       SchemaImporter importer = new SchemaImporter(allocator);
       return importer.importField(schema, provider);
@@ -252,36 +256,41 @@ public static Field importField(BufferAllocator allocator, ArrowSchema schema, C
 
   /**
    * Import Java Schema from the C data interface.
-   * <p>
-   * The given ArrowSchema struct is released (as per the C data interface
-   * specification), even if this function fails.
-   * 
+   *
+   * <p>The given ArrowSchema struct is released (as per the C data interface specification), even
+   * if this function fails.
+   *
    * @param allocator Buffer allocator for allocating dictionary vectors
-   * @param schema    C data interface struct representing the field
-   * @param provider  A dictionary provider will be initialized with empty
-   *                  dictionary vectors (optional)
+   * @param schema C data interface struct representing the field
+   * @param provider A dictionary provider will be initialized with empty dictionary vectors
+   *     (optional)
    * @return Imported schema object
    */
-  public static Schema importSchema(BufferAllocator allocator, ArrowSchema schema, CDataDictionaryProvider provider) {
+  public static Schema importSchema(
+      BufferAllocator allocator, ArrowSchema schema, CDataDictionaryProvider provider) {
     Field structField = importField(allocator, schema, provider);
     if (structField.getType().getTypeID() != ArrowTypeID.Struct) {
-      throw new IllegalArgumentException("Cannot import schema: ArrowSchema describes non-struct type");
+      throw new IllegalArgumentException(
+          "Cannot import schema: ArrowSchema describes non-struct type");
     }
     return new Schema(structField.getChildren(), structField.getMetadata());
   }
 
   /**
    * Import Java vector from the C data interface.
-   * <p>
-   * The ArrowArray struct has its contents moved (as per the C data interface
-   * specification) to a private object held alive by the resulting array.
-   * 
+   *
+   * <p>The ArrowArray struct has its contents moved (as per the C data interface specification) to
+   * a private object held alive by the resulting array.
+   *
    * @param allocator Buffer allocator
-   * @param array     C data interface struct holding the array data
-   * @param vector    Imported vector object [out]
-   * @param provider  Dictionary provider to load dictionary vectors to (optional)
+   * @param array C data interface struct holding the array data
+   * @param vector Imported vector object [out]
+   * @param provider Dictionary provider to load dictionary vectors to (optional)
    */
-  public static void importIntoVector(BufferAllocator allocator, ArrowArray array, FieldVector vector,
+  public static void importIntoVector(
+      BufferAllocator allocator,
+      ArrowArray array,
+      FieldVector vector,
       DictionaryProvider provider) {
     ArrayImporter importer = new ArrayImporter(allocator, vector, provider);
     importer.importArray(array);
@@ -289,18 +298,21 @@ public static void importIntoVector(BufferAllocator allocator, ArrowArray array,
 
   /**
    * Import Java vector and its type from the C data interface.
-   * <p>
-   * The ArrowArray struct has its contents moved (as per the C data interface
-   * specification) to a private object held alive by the resulting vector. The
-   * ArrowSchema struct is released, even if this function fails.
-   * 
+   *
+   * <p>The ArrowArray struct has its contents moved (as per the C data interface specification) to
+   * a private object held alive by the resulting vector. The ArrowSchema struct is released, even
+   * if this function fails.
+   *
    * @param allocator Buffer allocator for allocating the output FieldVector
-   * @param array     C data interface struct holding the array data
-   * @param schema    C data interface struct holding the array type
-   * @param provider  Dictionary provider to load dictionary vectors to (optional)
+   * @param array C data interface struct holding the array data
+   * @param schema C data interface struct holding the array type
+   * @param provider Dictionary provider to load dictionary vectors to (optional)
    * @return Imported vector object
    */
-  public static FieldVector importVector(BufferAllocator allocator, ArrowArray array, ArrowSchema schema,
+  public static FieldVector importVector(
+      BufferAllocator allocator,
+      ArrowArray array,
+      ArrowSchema schema,
       CDataDictionaryProvider provider) {
     Field field = importField(allocator, schema, provider);
     FieldVector vector = field.createVector(allocator);
@@ -310,20 +322,22 @@ public static FieldVector importVector(BufferAllocator allocator, ArrowArray arr
 
   /**
    * Import record batch from the C data interface into vector schema root.
-   * 
-   * The ArrowArray struct has its contents moved (as per the C data interface
-   * specification) to a private object held alive by the resulting vector schema
-   * root.
-   * 
-   * The schema of the vector schema root must match the input array (undefined
-   * behavior otherwise).
-   * 
+   *
+   * <p>The ArrowArray struct has its contents moved (as per the C data interface specification) to
+   * a private object held alive by the resulting vector schema root.
+   *
+   * <p>The schema of the vector schema root must match the input array (undefined behavior
+   * otherwise).
+   *
    * @param allocator Buffer allocator
-   * @param array     C data interface struct holding the record batch data
-   * @param root      vector schema root to load into
-   * @param provider  Dictionary provider to load dictionary vectors to (optional)
+   * @param array C data interface struct holding the record batch data
+   * @param root vector schema root to load into
+   * @param provider Dictionary provider to load dictionary vectors to (optional)
    */
-  public static void importIntoVectorSchemaRoot(BufferAllocator allocator, ArrowArray array, VectorSchemaRoot root,
+  public static void importIntoVectorSchemaRoot(
+      BufferAllocator allocator,
+      ArrowArray array,
+      VectorSchemaRoot root,
       DictionaryProvider provider) {
     try (StructVector structVector = StructVector.emptyWithDuplicates("", allocator)) {
       structVector.initializeChildrenFromFields(root.getSchema().getFields());
@@ -338,43 +352,46 @@ public static void importIntoVectorSchemaRoot(BufferAllocator allocator, ArrowAr
 
   /**
    * Import Java vector schema root from a C data interface Schema.
-   * 
-   * The type represented by the ArrowSchema struct must be a struct type array.
-   * 
-   * The ArrowSchema struct is released, even if this function fails.
-   * 
+   *
+   * <p>The type represented by the ArrowSchema struct must be a struct type array.
+   *
+   * <p>The ArrowSchema struct is released, even if this function fails.
+   *
    * @param allocator Buffer allocator for allocating the output VectorSchemaRoot
-   * @param schema    C data interface struct holding the record batch schema
-   * @param provider  Dictionary provider to load dictionary vectors to (optional)
+   * @param schema C data interface struct holding the record batch schema
+   * @param provider Dictionary provider to load dictionary vectors to (optional)
    * @return Imported vector schema root
    */
-  public static VectorSchemaRoot importVectorSchemaRoot(BufferAllocator allocator, ArrowSchema schema,
-      CDataDictionaryProvider provider) {
+  public static VectorSchemaRoot importVectorSchemaRoot(
+      BufferAllocator allocator, ArrowSchema schema, CDataDictionaryProvider provider) {
     return importVectorSchemaRoot(allocator, null, schema, provider);
   }
 
   /**
    * Import Java vector schema root from the C data interface.
-   * 
-   * The type represented by the ArrowSchema struct must be a struct type array.
-   * 
-   * The ArrowArray struct has its contents moved (as per the C data interface
-   * specification) to a private object held alive by the resulting record batch.
-   * The ArrowSchema struct is released, even if this function fails.
-   * 
-   * Prefer {@link #importIntoVectorSchemaRoot} for loading array data while
-   * reusing the same vector schema root.
-   * 
+   *
+   * <p>The type represented by the ArrowSchema struct must be a struct type array.
+   *
+   * <p>The ArrowArray struct has its contents moved (as per the C data interface specification) to
+   * a private object held alive by the resulting record batch. The ArrowSchema struct is released,
+   * even if this function fails.
+   *
+   * <p>Prefer {@link #importIntoVectorSchemaRoot} for loading array data while reusing the same
+   * vector schema root.
+   *
    * @param allocator Buffer allocator for allocating the output VectorSchemaRoot
-   * @param array     C data interface struct holding the record batch data
-   *                  (optional)
-   * @param schema    C data interface struct holding the record batch schema
-   * @param provider  Dictionary provider to load dictionary vectors to (optional)
+   * @param array C data interface struct holding the record batch data (optional)
+   * @param schema C data interface struct holding the record batch schema
+   * @param provider Dictionary provider to load dictionary vectors to (optional)
    * @return Imported vector schema root
    */
-  public static VectorSchemaRoot importVectorSchemaRoot(BufferAllocator allocator, ArrowArray array, ArrowSchema schema,
+  public static VectorSchemaRoot importVectorSchemaRoot(
+      BufferAllocator allocator,
+      ArrowArray array,
+      ArrowSchema schema,
       CDataDictionaryProvider provider) {
-    VectorSchemaRoot vsr = VectorSchemaRoot.create(importSchema(allocator, schema, provider), allocator);
+    VectorSchemaRoot vsr =
+        VectorSchemaRoot.create(importSchema(allocator, schema, provider), allocator);
     if (array != null) {
       importIntoVectorSchemaRoot(allocator, array, vsr, provider);
     }
@@ -383,6 +400,7 @@ public static VectorSchemaRoot importVectorSchemaRoot(BufferAllocator allocator,
 
   /**
    * Import an ArrowArrayStream as an {@link ArrowReader}.
+   *
    * @param allocator Buffer allocator for allocating the output data.
    * @param stream C stream interface struct to import.
    * @return Imported reader
diff --git a/java/c/src/main/java/org/apache/arrow/c/Flags.java b/java/c/src/main/java/org/apache/arrow/c/Flags.java
index 744b4695ac320..dd38afb261a78 100644
--- a/java/c/src/main/java/org/apache/arrow/c/Flags.java
+++ b/java/c/src/main/java/org/apache/arrow/c/Flags.java
@@ -14,23 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.ArrowType.ArrowTypeID;
 import org.apache.arrow.vector.types.pojo.Field;
 
-/**
- * Flags as defined in the C data interface specification.
- */
+/** Flags as defined in the C data interface specification. */
 final class Flags {
   static final int ARROW_FLAG_DICTIONARY_ORDERED = 1;
   static final int ARROW_FLAG_NULLABLE = 2;
   static final int ARROW_FLAG_MAP_KEYS_SORTED = 4;
 
-  private Flags() {
-  }
+  private Flags() {}
 
   static long forField(Field field) {
     long flags = 0L;
diff --git a/java/c/src/main/java/org/apache/arrow/c/Format.java b/java/c/src/main/java/org/apache/arrow/c/Format.java
index 2875e46f749c4..aff51e7b734ab 100644
--- a/java/c/src/main/java/org/apache/arrow/c/Format.java
+++ b/java/c/src/main/java/org/apache/arrow/c/Format.java
@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import java.util.Arrays;
+import java.util.Locale;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.types.DateUnit;
 import org.apache.arrow.vector.types.FloatingPointPrecision;
@@ -30,13 +29,11 @@
 import org.apache.arrow.vector.types.pojo.ArrowType.ExtensionType;
 
 /**
- * Conversion between {@link ArrowType} and string formats, as per C data
- * interface specification.
+ * Conversion between {@link ArrowType} and string formats, as per C data interface specification.
  */
 final class Format {
 
-  private Format() {
-  }
+  private Format() {}
 
   static String asString(ArrowType arrowType) {
     if (arrowType instanceof ExtensionType) {
@@ -49,102 +46,112 @@ static String asString(ArrowType arrowType) {
         return "z";
       case Bool:
         return "b";
-      case Date: {
-        ArrowType.Date type = (ArrowType.Date) arrowType;
-        switch (type.getUnit()) {
-          case DAY:
-            return "tdD";
-          case MILLISECOND:
-            return "tdm";
-          default:
-            throw new UnsupportedOperationException(
-                String.format("Date type with unit %s is unsupported", type.getUnit()));
+      case Date:
+        {
+          ArrowType.Date type = (ArrowType.Date) arrowType;
+          switch (type.getUnit()) {
+            case DAY:
+              return "tdD";
+            case MILLISECOND:
+              return "tdm";
+            default:
+              throw new UnsupportedOperationException(
+                  String.format("Date type with unit %s is unsupported", type.getUnit()));
+          }
         }
-      }
-      case Decimal: {
-        ArrowType.Decimal type = (ArrowType.Decimal) arrowType;
-        if (type.getBitWidth() == 128) {
-          return String.format("d:%d,%d", type.getPrecision(), type.getScale());
+      case Decimal:
+        {
+          ArrowType.Decimal type = (ArrowType.Decimal) arrowType;
+          if (type.getBitWidth() == 128) {
+            return String.format("d:%d,%d", type.getPrecision(), type.getScale());
+          }
+          return String.format(
+              "d:%d,%d,%d", type.getPrecision(), type.getScale(), type.getBitWidth());
         }
-        return String.format("d:%d,%d,%d", type.getPrecision(), type.getScale(), type.getBitWidth());
-      }
-      case Duration: {
-        ArrowType.Duration type = (ArrowType.Duration) arrowType;
-        switch (type.getUnit()) {
-          case SECOND:
-            return "tDs";
-          case MILLISECOND:
-            return "tDm";
-          case MICROSECOND:
-            return "tDu";
-          case NANOSECOND:
-            return "tDn";
-          default:
-            throw new UnsupportedOperationException(
-                String.format("Duration type with unit %s is unsupported", type.getUnit()));
+      case Duration:
+        {
+          ArrowType.Duration type = (ArrowType.Duration) arrowType;
+          switch (type.getUnit()) {
+            case SECOND:
+              return "tDs";
+            case MILLISECOND:
+              return "tDm";
+            case MICROSECOND:
+              return "tDu";
+            case NANOSECOND:
+              return "tDn";
+            default:
+              throw new UnsupportedOperationException(
+                  String.format("Duration type with unit %s is unsupported", type.getUnit()));
+          }
         }
-      }
-      case FixedSizeBinary: {
-        ArrowType.FixedSizeBinary type = (ArrowType.FixedSizeBinary) arrowType;
-        return String.format("w:%d", type.getByteWidth());
-      }
-      case FixedSizeList: {
-        ArrowType.FixedSizeList type = (ArrowType.FixedSizeList) arrowType;
-        return String.format("+w:%d", type.getListSize());
-      }
-      case FloatingPoint: {
-        ArrowType.FloatingPoint type = (ArrowType.FloatingPoint) arrowType;
-        switch (type.getPrecision()) {
-          case HALF:
-            return "e";
-          case SINGLE:
-            return "f";
-          case DOUBLE:
-            return "g";
-          default:
-            throw new UnsupportedOperationException(
-                String.format("FloatingPoint type with precision %s is unsupported", type.getPrecision()));
+      case FixedSizeBinary:
+        {
+          ArrowType.FixedSizeBinary type = (ArrowType.FixedSizeBinary) arrowType;
+          return String.format("w:%d", type.getByteWidth());
         }
-      }
-      case Int: {
-        String format;
-        ArrowType.Int type = (ArrowType.Int) arrowType;
-        switch (type.getBitWidth()) {
-          case Byte.SIZE:
-            format = "C";
-            break;
-          case Short.SIZE:
-            format = "S";
-            break;
-          case Integer.SIZE:
-            format = "I";
-            break;
-          case Long.SIZE:
-            format = "L";
-            break;
-          default:
-            throw new UnsupportedOperationException(
-                String.format("Int type with bitwidth %d is unsupported", type.getBitWidth()));
+      case FixedSizeList:
+        {
+          ArrowType.FixedSizeList type = (ArrowType.FixedSizeList) arrowType;
+          return String.format("+w:%d", type.getListSize());
         }
-        if (type.getIsSigned()) {
-          format = format.toLowerCase();
+      case FloatingPoint:
+        {
+          ArrowType.FloatingPoint type = (ArrowType.FloatingPoint) arrowType;
+          switch (type.getPrecision()) {
+            case HALF:
+              return "e";
+            case SINGLE:
+              return "f";
+            case DOUBLE:
+              return "g";
+            default:
+              throw new UnsupportedOperationException(
+                  String.format(
+                      "FloatingPoint type with precision %s is unsupported", type.getPrecision()));
+          }
         }
-        return format;
-      }
-      case Interval: {
-        ArrowType.Interval type = (ArrowType.Interval) arrowType;
-        switch (type.getUnit()) {
-          case DAY_TIME:
-            return "tiD";
-          case YEAR_MONTH:
-            return "tiM";
-          case MONTH_DAY_NANO:
-            return "tin";
-          default:
-            throw new UnsupportedOperationException(
-                String.format("Interval type with unit %s is unsupported", type.getUnit()));
+      case Int:
+        {
+          String format;
+          ArrowType.Int type = (ArrowType.Int) arrowType;
+          switch (type.getBitWidth()) {
+            case Byte.SIZE:
+              format = "C";
+              break;
+            case Short.SIZE:
+              format = "S";
+              break;
+            case Integer.SIZE:
+              format = "I";
+              break;
+            case Long.SIZE:
+              format = "L";
+              break;
+            default:
+              throw new UnsupportedOperationException(
+                  String.format("Int type with bitwidth %d is unsupported", type.getBitWidth()));
+          }
+          if (type.getIsSigned()) {
+            format = format.toLowerCase(Locale.ROOT);
+          }
+          return format;
+        }
+      case Interval:
+        {
+          ArrowType.Interval type = (ArrowType.Interval) arrowType;
+          switch (type.getUnit()) {
+            case DAY_TIME:
+              return "tiD";
+            case YEAR_MONTH:
+              return "tiM";
+            case MONTH_DAY_NANO:
+              return "tin";
+            default:
+              throw new UnsupportedOperationException(
+                  String.format("Interval type with unit %s is unsupported", type.getUnit()));
+          }
         }
-      }
       case LargeBinary:
         return "Z";
       case LargeList:
@@ -159,47 +166,54 @@ static String asString(ArrowType arrowType) {
         return "n";
       case Struct:
         return "+s";
-      case Time: {
-        ArrowType.Time type = (ArrowType.Time) arrowType;
-        if (type.getUnit() == TimeUnit.SECOND && type.getBitWidth() == 32) {
-          return "tts";
-        } else if (type.getUnit() == TimeUnit.MILLISECOND && type.getBitWidth() == 32) {
-          return "ttm";
-        } else if (type.getUnit() == TimeUnit.MICROSECOND && type.getBitWidth() == 64) {
-          return "ttu";
-        } else if (type.getUnit() == TimeUnit.NANOSECOND && type.getBitWidth() == 64) {
-          return "ttn";
-        } else {
-          throw new UnsupportedOperationException(String.format("Time type with unit %s and bitwidth %d is unsupported",
-              type.getUnit(), type.getBitWidth()));
-        }
-      }
-      case Timestamp: {
-        String format;
-        ArrowType.Timestamp type = (ArrowType.Timestamp) arrowType;
-        switch (type.getUnit()) {
-          case SECOND:
-            format = "tss";
-            break;
-          case MILLISECOND:
-            format = "tsm";
-            break;
-          case MICROSECOND:
-            format = "tsu";
-            break;
-          case NANOSECOND:
-            format = "tsn";
-            break;
-          default:
+      case Time:
+        {
+          ArrowType.Time type = (ArrowType.Time) arrowType;
+          if (type.getUnit() == TimeUnit.SECOND && type.getBitWidth() == 32) {
+            return "tts";
+          } else if (type.getUnit() == TimeUnit.MILLISECOND && type.getBitWidth() == 32) {
+            return "ttm";
+          } else if (type.getUnit() == TimeUnit.MICROSECOND && type.getBitWidth() == 64) {
+            return "ttu";
+          } else if (type.getUnit() == TimeUnit.NANOSECOND && type.getBitWidth() == 64) {
+            return "ttn";
+          } else {
             throw new UnsupportedOperationException(
-                String.format("Timestamp type with unit %s is unsupported", type.getUnit()));
+                String.format(
+                    "Time type with unit %s and bitwidth %d is unsupported",
+                    type.getUnit(), type.getBitWidth()));
+          }
+        }
+      case Timestamp:
+        {
+          String format;
+          ArrowType.Timestamp type = (ArrowType.Timestamp) arrowType;
+          switch (type.getUnit()) {
+            case SECOND:
+              format = "tss";
+              break;
+            case MILLISECOND:
+              format = "tsm";
+              break;
+            case MICROSECOND:
+              format = "tsu";
+              break;
+            case NANOSECOND:
+              format = "tsn";
+              break;
+            default:
+              throw new UnsupportedOperationException(
+                  String.format("Timestamp type with unit %s is unsupported", type.getUnit()));
+          }
+          String timezone = type.getTimezone();
+          return String.format("%s:%s", format, timezone == null ? "" : timezone);
         }
-        String timezone = type.getTimezone();
-        return String.format("%s:%s", format, timezone == null ? "" : timezone);
-      }
       case Union:
         ArrowType.Union type = (ArrowType.Union) arrowType;
-        String typeIDs = Arrays.stream(type.getTypeIds()).mapToObj(String::valueOf).collect(Collectors.joining(","));
+        String typeIDs =
+            Arrays.stream(type.getTypeIds())
+                .mapToObj(String::valueOf)
+                .collect(Collectors.joining(","));
         switch (type.getMode()) {
           case Dense:
             return String.format("+ud:%s", typeIDs);
@@ -211,10 +225,15 @@ static String asString(ArrowType arrowType) {
         }
       case Utf8:
         return "u";
+      case Utf8View:
+        return "vu";
+      case BinaryView:
+        return "vz";
       case NONE:
         throw new IllegalArgumentException("Arrow type ID is NONE");
       default:
-        throw new UnsupportedOperationException(String.format("Unknown type id %s", arrowType.getTypeID()));
+        throw new UnsupportedOperationException(
+            String.format("Unknown type id %s", arrowType.getTypeID()));
     }
   }
 
@@ -290,26 +309,33 @@ static ArrowType asType(String format, long flags)
       case "+m":
         boolean keysSorted = (flags & Flags.ARROW_FLAG_MAP_KEYS_SORTED) != 0;
         return new ArrowType.Map(keysSorted);
+      case "vu":
+        return new ArrowType.Utf8View();
+      case "vz":
+        return new ArrowType.BinaryView();
       default:
         String[] parts = format.split(":", 2);
         if (parts.length == 2) {
           return parseComplexFormat(parts[0], parts[1]);
         }
-        throw new UnsupportedOperationException(String.format("Format %s is not supported", format));
+        throw new UnsupportedOperationException(
+            String.format("Format %s is not supported", format));
     }
   }
 
   private static ArrowType parseComplexFormat(String format, String payload)
       throws NumberFormatException, UnsupportedOperationException, IllegalStateException {
     switch (format) {
-      case "d": {
-        int[] parts = payloadToIntArray(payload);
-        Preconditions.checkState(parts.length == 2 || parts.length == 3, "Format %s:%s is illegal", format, payload);
-        int precision = parts[0];
-        int scale = parts[1];
-        Integer bitWidth = (parts.length == 3) ? parts[2] : null;
-        return ArrowType.Decimal.createDecimal(precision, scale, bitWidth);
-      }
+      case "d":
+        {
+          int[] parts = payloadToIntArray(payload);
+          Preconditions.checkState(
+              parts.length == 2 || parts.length == 3, "Format %s:%s is illegal", format, payload);
+          int precision = parts[0];
+          int scale = parts[1];
+          Integer bitWidth = (parts.length == 3) ? parts[2] : null;
+          return ArrowType.Decimal.createDecimal(precision, scale, bitWidth);
+        }
       case "w":
         return new ArrowType.FixedSizeBinary(Integer.parseInt(payload));
       case "+w":
@@ -327,7 +353,8 @@ private static ArrowType parseComplexFormat(String format, String payload)
       case "tsn":
         return new ArrowType.Timestamp(TimeUnit.NANOSECOND, payloadToTimezone(payload));
       default:
-        throw new UnsupportedOperationException(String.format("Format %s:%s is not supported", format, payload));
+        throw new UnsupportedOperationException(
+            String.format("Format %s:%s is not supported", format, payload));
     }
   }
 
diff --git a/java/c/src/main/java/org/apache/arrow/c/Metadata.java b/java/c/src/main/java/org/apache/arrow/c/Metadata.java
index b81b24fe4ced4..43567b7619388 100644
--- a/java/c/src/main/java/org/apache/arrow/c/Metadata.java
+++ b/java/c/src/main/java/org/apache/arrow/c/Metadata.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.apache.arrow.c.NativeUtil.NULL;
@@ -27,18 +26,14 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.util.MemoryUtil;
 
-/**
- * Encode and decode metadata.
- */
+/** Encode and decode metadata. */
 final class Metadata {
 
-  private Metadata() {
-  }
+  private Metadata() {}
 
   static ArrowBuf encode(BufferAllocator allocator, Map<String, String> metadata) {
     if (metadata == null || metadata.size() == 0) {
@@ -57,7 +52,8 @@ static ArrowBuf encode(BufferAllocator allocator, Map<String, String> metadata)
     }
 
     ArrowBuf result = allocator.buffer(totalSize);
-    ByteBuffer writer = MemoryUtil.directBuffer(result.memoryAddress(), totalSize).order(ByteOrder.nativeOrder());
+    ByteBuffer writer =
+        MemoryUtil.directBuffer(result.memoryAddress(), totalSize).order(ByteOrder.nativeOrder());
     writer.putInt(metadata.size());
     for (byte[] buffer : buffers) {
       writer.putInt(buffer.length);
@@ -71,7 +67,8 @@ static Map<String, String> decode(long bufferAddress) {
       return null;
     }
 
-    ByteBuffer reader = MemoryUtil.directBuffer(bufferAddress, Integer.MAX_VALUE).order(ByteOrder.nativeOrder());
+    ByteBuffer reader =
+        MemoryUtil.directBuffer(bufferAddress, Integer.MAX_VALUE).order(ByteOrder.nativeOrder());
 
     int size = reader.getInt();
     checkState(size >= 0, "Metadata size must not be negative");
diff --git a/java/c/src/main/java/org/apache/arrow/c/NativeUtil.java b/java/c/src/main/java/org/apache/arrow/c/NativeUtil.java
index ba65fd80c4141..1b4c66dea55fe 100644
--- a/java/c/src/main/java/org/apache/arrow/c/NativeUtil.java
+++ b/java/c/src/main/java/org/apache/arrow/c/NativeUtil.java
@@ -14,31 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.util.MemoryUtil;
 
-/**
- * Utility functions for working with native memory.
- */
+/** Utility functions for working with native memory. */
 public final class NativeUtil {
   public static final byte NULL = 0;
   static final int MAX_STRING_LENGTH = Short.MAX_VALUE;
 
-  private NativeUtil() {
-  }
+  private NativeUtil() {}
 
   /**
    * Convert a pointer to a null terminated string into a Java String.
-   * 
+   *
    * @param cstringPtr pointer to C string
    * @return Converted string
    */
@@ -46,7 +41,8 @@ public static String toJavaString(long cstringPtr) {
     if (cstringPtr == NULL) {
       return null;
     }
-    ByteBuffer reader = MemoryUtil.directBuffer(cstringPtr, MAX_STRING_LENGTH).order(ByteOrder.nativeOrder());
+    ByteBuffer reader =
+        MemoryUtil.directBuffer(cstringPtr, MAX_STRING_LENGTH).order(ByteOrder.nativeOrder());
 
     int length = 0;
     while (reader.get() != NULL) {
@@ -60,9 +56,9 @@ public static String toJavaString(long cstringPtr) {
 
   /**
    * Convert a native array pointer (void**) to Java array of pointers.
-   * 
+   *
    * @param arrayPtr Array pointer
-   * @param size     Array size
+   * @param size Array size
    * @return Array of pointer values as longs
    */
   public static long[] toJavaArray(long arrayPtr, int size) {
@@ -74,7 +70,8 @@ public static long[] toJavaArray(long arrayPtr, int size) {
     }
 
     long[] result = new long[size];
-    ByteBuffer reader = MemoryUtil.directBuffer(arrayPtr, Long.BYTES * size).order(ByteOrder.nativeOrder());
+    ByteBuffer reader =
+        MemoryUtil.directBuffer(arrayPtr, Long.BYTES * size).order(ByteOrder.nativeOrder());
     for (int i = 0; i < size; i++) {
       result[i] = reader.getLong();
     }
@@ -83,9 +80,9 @@ public static long[] toJavaArray(long arrayPtr, int size) {
 
   /**
    * Convert Java string to a null terminated string.
-   * 
+   *
    * @param allocator Buffer allocator for allocating the native string
-   * @param string    Input String to convert
+   * @param string Input String to convert
    * @return Buffer with a null terminated string or null if the input is null
    */
   public static ArrowBuf toNativeString(BufferAllocator allocator, String string) {
@@ -102,7 +99,7 @@ public static ArrowBuf toNativeString(BufferAllocator allocator, String string)
 
   /**
    * Close a buffer if it's not null.
-   * 
+   *
    * @param buf Buffer to close
    */
   public static void closeBuffer(ArrowBuf buf) {
@@ -113,7 +110,7 @@ public static void closeBuffer(ArrowBuf buf) {
 
   /**
    * Get the address of a buffer or {@value #NULL} if the input buffer is null.
-   * 
+   *
    * @param buf Buffer to get the address of
    * @return Memory address or {@value #NULL}
    */
@@ -125,9 +122,8 @@ public static long addressOrNull(ArrowBuf buf) {
   }
 
   /**
-   * Get the address of a C Data Interface struct or {@value #NULL} if the input
-   * struct is null.
-   * 
+   * Get the address of a C Data Interface struct or {@value #NULL} if the input struct is null.
+   *
    * @param struct C Data Interface struct to get the address of
    * @return Memory address or {@value #NULL}
    */
@@ -137,5 +133,4 @@ public static long addressOrNull(BaseStruct struct) {
     }
     return struct.memoryAddress();
   }
-
 }
diff --git a/java/c/src/main/java/org/apache/arrow/c/ReferenceCountedArrowArray.java b/java/c/src/main/java/org/apache/arrow/c/ReferenceCountedArrowArray.java
index f09f14817b655..cf50f9417b602 100644
--- a/java/c/src/main/java/org/apache/arrow/c/ReferenceCountedArrowArray.java
+++ b/java/c/src/main/java/org/apache/arrow/c/ReferenceCountedArrowArray.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.ForeignAllocation;
@@ -26,10 +24,11 @@
 /**
  * The owner of an imported C Data Interface array.
  *
- * <p>There is a fundamental mismatch here between memory allocation schemes: AllocationManager represents a single
- * allocation (= a single address and length). But an ArrowArray combines multiple allocations behind a single
- * deallocation callback. This class bridges the two by tracking a reference count, so that the single callback
- * can be managed by multiple {@link ForeignAllocation} instances.
+ * <p>There is a fundamental mismatch here between memory allocation schemes: AllocationManager
+ * represents a single allocation (= a single address and length). But an ArrowArray combines
+ * multiple allocations behind a single deallocation callback. This class bridges the two by
+ * tracking a reference count, so that the single callback can be managed by multiple {@link
+ * ForeignAllocation} instances.
  */
 final class ReferenceCountedArrowArray {
   private final ArrowArray array;
@@ -57,18 +56,21 @@ void release() {
   }
 
   /**
-   * Create an ArrowBuf wrapping a buffer from this ArrowArray associated with the given BufferAllocator.
+   * Create an ArrowBuf wrapping a buffer from this ArrowArray associated with the given
+   * BufferAllocator.
    *
-   * <p>This method is "unsafe" because there is no validation of the given capacity or address. If the returned
-   * buffer is not freed, a memory leak will occur.
+   * <p>This method is "unsafe" because there is no validation of the given capacity or address. If
+   * the returned buffer is not freed, a memory leak will occur.
    */
-  ArrowBuf unsafeAssociateAllocation(BufferAllocator trackingAllocator, long capacity, long memoryAddress) {
+  ArrowBuf unsafeAssociateAllocation(
+      BufferAllocator trackingAllocator, long capacity, long memoryAddress) {
     retain();
-    return trackingAllocator.wrapForeignAllocation(new ForeignAllocation(capacity, memoryAddress) {
-      @Override
-      protected void release0() {
-        ReferenceCountedArrowArray.this.release();
-      }
-    });
+    return trackingAllocator.wrapForeignAllocation(
+        new ForeignAllocation(capacity, memoryAddress) {
+          @Override
+          protected void release0() {
+            ReferenceCountedArrowArray.this.release();
+          }
+        });
   }
 }
diff --git a/java/c/src/main/java/org/apache/arrow/c/SchemaExporter.java b/java/c/src/main/java/org/apache/arrow/c/SchemaExporter.java
index 04d41a4e4f9b0..41a73c410f5bf 100644
--- a/java/c/src/main/java/org/apache/arrow/c/SchemaExporter.java
+++ b/java/c/src/main/java/org/apache/arrow/c/SchemaExporter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.apache.arrow.c.NativeUtil.NULL;
@@ -23,7 +22,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.arrow.c.jni.JniWrapper;
 import org.apache.arrow.c.jni.PrivateData;
 import org.apache.arrow.memory.ArrowBuf;
@@ -33,9 +31,7 @@
 import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
 import org.apache.arrow.vector.types.pojo.Field;
 
-/**
- * Exporter for {@link ArrowSchema}.
- */
+/** Exporter for {@link ArrowSchema}. */
 final class SchemaExporter {
   private final BufferAllocator allocator;
 
@@ -43,9 +39,7 @@ public SchemaExporter(BufferAllocator allocator) {
     this.allocator = allocator;
   }
 
-  /**
-   * Private data structure for exported schemas.
-   */
+  /** Private data structure for exported schemas. */
   static class ExportedSchemaPrivateData implements PrivateData {
     ArrowBuf format;
     ArrowBuf name;
diff --git a/java/c/src/main/java/org/apache/arrow/c/SchemaImporter.java b/java/c/src/main/java/org/apache/arrow/c/SchemaImporter.java
index 09a6afafa0a46..c94a2b3b8d9fc 100644
--- a/java/c/src/main/java/org/apache/arrow/c/SchemaImporter.java
+++ b/java/c/src/main/java/org/apache/arrow/c/SchemaImporter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.apache.arrow.c.NativeUtil.NULL;
@@ -25,7 +24,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.dictionary.Dictionary;
 import org.apache.arrow.vector.types.pojo.ArrowType;
@@ -37,9 +35,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * Importer for {@link ArrowSchema}.
- */
+/** Importer for {@link ArrowSchema}. */
 final class SchemaImporter {
   private static final Logger logger = LoggerFactory.getLogger(SchemaImporter.class);
 
@@ -56,8 +52,11 @@ Field importField(ArrowSchema schema, CDataDictionaryProvider provider) {
     return importField(schema, provider, 0);
   }
 
-  private Field importField(ArrowSchema schema, CDataDictionaryProvider provider, int recursionLevel) {
-    checkState(recursionLevel <= MAX_IMPORT_RECURSION_LEVEL, "Recursion level in ArrowSchema struct exceeded");
+  private Field importField(
+      ArrowSchema schema, CDataDictionaryProvider provider, int recursionLevel) {
+    checkState(
+        recursionLevel <= MAX_IMPORT_RECURSION_LEVEL,
+        "Recursion level in ArrowSchema struct exceeded");
 
     ArrowSchema.Snapshot snapshot = schema.snapshot();
     checkState(snapshot.release != NULL, "Cannot import released ArrowSchema");
@@ -71,7 +70,8 @@ private Field importField(ArrowSchema schema, CDataDictionaryProvider provider,
 
     if (metadata != null && metadata.containsKey(ExtensionType.EXTENSION_METADATA_KEY_NAME)) {
       final String extensionName = metadata.get(ExtensionType.EXTENSION_METADATA_KEY_NAME);
-      final String extensionMetadata = metadata.getOrDefault(ExtensionType.EXTENSION_METADATA_KEY_METADATA, "");
+      final String extensionMetadata =
+          metadata.getOrDefault(ExtensionType.EXTENSION_METADATA_KEY_METADATA, "");
       ExtensionType extensionType = ExtensionTypeRegistry.lookup(extensionName);
       if (extensionType != null) {
         arrowType = extensionType.deserialize(arrowType, extensionMetadata);
@@ -96,7 +96,8 @@ private Field importField(ArrowSchema schema, CDataDictionaryProvider provider,
     FieldType fieldType = new FieldType(nullable, arrowType, dictionaryEncoding, metadata);
 
     List<Field> children = null;
-    long[] childrenIds = NativeUtil.toJavaArray(snapshot.children, checkedCastToInt(snapshot.n_children));
+    long[] childrenIds =
+        NativeUtil.toJavaArray(snapshot.children, checkedCastToInt(snapshot.n_children));
     if (childrenIds != null && childrenIds.length > 0) {
       children = new ArrayList<>(childrenIds.length);
       for (long childAddress : childrenIds) {
diff --git a/java/c/src/main/java/org/apache/arrow/c/StructVectorLoader.java b/java/c/src/main/java/org/apache/arrow/c/StructVectorLoader.java
index d9afd0189d807..6a962cc342114 100644
--- a/java/c/src/main/java/org/apache/arrow/c/StructVectorLoader.java
+++ b/java/c/src/main/java/org/apache/arrow/c/StructVectorLoader.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.apache.arrow.util.Preconditions.checkArgument;
@@ -23,10 +22,10 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.Collections2;
+import org.apache.arrow.vector.BaseVariableWidthViewVector;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.TypeLayout;
 import org.apache.arrow.vector.complex.StructVector;
@@ -38,23 +37,27 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-/**
- * Loads buffers into {@link StructVector}.
- */
+/** Loads buffers into {@link StructVector}. */
 public class StructVectorLoader {
 
   private final Schema schema;
   private final CompressionCodec.Factory factory;
 
   /**
-   * A flag indicating if decompression is needed. This will affect the behavior
-   * of releasing buffers.
+   * A flag indicating if decompression is needed. This will affect the behavior of releasing
+   * buffers.
    */
   private boolean decompressionNeeded;
 
   /**
    * Construct with a schema.
    *
+   * <p>The schema referred to here can be obtained from the struct vector. The schema here should
+   * be the children of a struct vector, not a schema containing the struct field itself. For
+   * example: <code>
+   * Schema schema = new Schema(structVector.getField().getChildren());
+   * </code>
+   *
    * @param schema buffers are added based on schema.
    */
   public StructVectorLoader(Schema schema) {
@@ -64,7 +67,7 @@ public StructVectorLoader(Schema schema) {
   /**
    * Construct with a schema and a compression codec factory.
    *
-   * @param schema  buffers are added based on schema.
+   * @param schema buffers are added based on schema.
    * @param factory the factory to create codec.
    */
   public StructVectorLoader(Schema schema, CompressionCodec.Factory factory) {
@@ -74,9 +77,8 @@ public StructVectorLoader(Schema schema, CompressionCodec.Factory factory) {
 
   /**
    * Loads the record batch into the struct vector.
-   * 
-   * <p>
-   * This will not close the record batch.
+   *
+   * <p>This will not close the record batch.
    *
    * @param recordBatch the batch to load
    */
@@ -86,32 +88,61 @@ public StructVector load(BufferAllocator allocator, ArrowRecordBatch recordBatch
 
     Iterator<ArrowBuf> buffers = recordBatch.getBuffers().iterator();
     Iterator<ArrowFieldNode> nodes = recordBatch.getNodes().iterator();
-    CompressionUtil.CodecType codecType = CompressionUtil.CodecType
-        .fromCompressionType(recordBatch.getBodyCompression().getCodec());
+    CompressionUtil.CodecType codecType =
+        CompressionUtil.CodecType.fromCompressionType(recordBatch.getBodyCompression().getCodec());
     decompressionNeeded = codecType != CompressionUtil.CodecType.NO_COMPRESSION;
-    CompressionCodec codec = decompressionNeeded ? factory.createCodec(codecType) : NoCompressionCodec.INSTANCE;
+    CompressionCodec codec =
+        decompressionNeeded ? factory.createCodec(codecType) : NoCompressionCodec.INSTANCE;
+    Iterator<Long> variadicBufferCounts = Collections.emptyIterator();
+    if (recordBatch.getVariadicBufferCounts() != null
+        && !recordBatch.getVariadicBufferCounts().isEmpty()) {
+      variadicBufferCounts = recordBatch.getVariadicBufferCounts().iterator();
+    }
     for (FieldVector fieldVector : result.getChildrenFromFields()) {
-      loadBuffers(fieldVector, fieldVector.getField(), buffers, nodes, codec);
+      loadBuffers(fieldVector, fieldVector.getField(), buffers, nodes, codec, variadicBufferCounts);
     }
-    result.loadFieldBuffers(new ArrowFieldNode(recordBatch.getLength(), 0), Collections.singletonList(null));
-    if (nodes.hasNext() || buffers.hasNext()) {
-      throw new IllegalArgumentException("not all nodes and buffers were consumed. nodes: " + 
-        Collections2.toList(nodes).toString() + " buffers: " + Collections2.toList(buffers).toString());
+    result.loadFieldBuffers(
+        new ArrowFieldNode(recordBatch.getLength(), 0), Collections.singletonList(null));
+    if (nodes.hasNext() || buffers.hasNext() || variadicBufferCounts.hasNext()) {
+      throw new IllegalArgumentException(
+          "not all nodes, buffers and variadicBufferCounts were consumed. nodes: "
+              + Collections2.toString(nodes)
+              + " buffers: "
+              + Collections2.toString(buffers)
+              + " variadicBufferCounts: "
+              + Collections2.toString(variadicBufferCounts));
     }
     return result;
   }
 
-  private void loadBuffers(FieldVector vector, Field field, Iterator<ArrowBuf> buffers, Iterator<ArrowFieldNode> nodes,
-      CompressionCodec codec) {
+  private void loadBuffers(
+      FieldVector vector,
+      Field field,
+      Iterator<ArrowBuf> buffers,
+      Iterator<ArrowFieldNode> nodes,
+      CompressionCodec codec,
+      Iterator<Long> variadicBufferCounts) {
     checkArgument(nodes.hasNext(), "no more field nodes for field %s and vector %s", field, vector);
     ArrowFieldNode fieldNode = nodes.next();
-    int bufferLayoutCount = TypeLayout.getTypeBufferCount(field.getType());
+    // variadicBufferLayoutCount will be 0 for vectors of a type except BaseVariableWidthViewVector
+    long variadicBufferLayoutCount = 0;
+    if (vector instanceof BaseVariableWidthViewVector) {
+      if (variadicBufferCounts.hasNext()) {
+        variadicBufferLayoutCount = variadicBufferCounts.next();
+      } else {
+        throw new IllegalStateException(
+            "No variadicBufferCounts available for BaseVariableWidthViewVector");
+      }
+    }
+    int bufferLayoutCount =
+        (int) (variadicBufferLayoutCount + TypeLayout.getTypeBufferCount(field.getType()));
     List<ArrowBuf> ownBuffers = new ArrayList<>(bufferLayoutCount);
     for (int j = 0; j < bufferLayoutCount; j++) {
       ArrowBuf nextBuf = buffers.next();
       // for vectors without nulls, the buffer is empty, so there is no need to
       // decompress it.
-      ArrowBuf bufferToAdd = nextBuf.writerIndex() > 0 ? codec.decompress(vector.getAllocator(), nextBuf) : nextBuf;
+      ArrowBuf bufferToAdd =
+          nextBuf.writerIndex() > 0 ? codec.decompress(vector.getAllocator(), nextBuf) : nextBuf;
       ownBuffers.add(bufferToAdd);
       if (decompressionNeeded) {
         // decompression performed
@@ -132,13 +163,15 @@ private void loadBuffers(FieldVector vector, Field field, Iterator<ArrowBuf> buf
     List<Field> children = field.getChildren();
     if (children.size() > 0) {
       List<FieldVector> childrenFromFields = vector.getChildrenFromFields();
-      checkArgument(children.size() == childrenFromFields.size(),
-          "should have as many children as in the schema: found %s expected %s", childrenFromFields.size(),
+      checkArgument(
+          children.size() == childrenFromFields.size(),
+          "should have as many children as in the schema: found %s expected %s",
+          childrenFromFields.size(),
           children.size());
       for (int i = 0; i < childrenFromFields.size(); i++) {
         Field child = children.get(i);
         FieldVector fieldVector = childrenFromFields.get(i);
-        loadBuffers(fieldVector, child, buffers, nodes, codec);
+        loadBuffers(fieldVector, child, buffers, nodes, codec, variadicBufferCounts);
       }
     }
   }
diff --git a/java/c/src/main/java/org/apache/arrow/c/StructVectorUnloader.java b/java/c/src/main/java/org/apache/arrow/c/StructVectorUnloader.java
index aa6d9b4d0f6a7..6f094b92c7991 100644
--- a/java/c/src/main/java/org/apache/arrow/c/StructVectorUnloader.java
+++ b/java/c/src/main/java/org/apache/arrow/c/StructVectorUnloader.java
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
+import org.apache.arrow.vector.BaseVariableWidthViewVector;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.TypeLayout;
 import org.apache.arrow.vector.complex.StructVector;
@@ -30,10 +29,7 @@
 import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
 import org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
 
-/**
- * Helper class that handles converting a {@link StructVector} to a
- * {@link ArrowRecordBatch}.
- */
+/** Helper class that handles converting a {@link StructVector} to a {@link ArrowRecordBatch}. */
 public class StructVectorUnloader {
 
   private final StructVector root;
@@ -41,9 +37,7 @@ public class StructVectorUnloader {
   private final CompressionCodec codec;
   private final boolean alignBuffers;
 
-  /**
-   * Constructs a new instance of the given struct vector.
-   */
+  /** Constructs a new instance of the given struct vector. */
   public StructVectorUnloader(StructVector root) {
     this(root, true, NoCompressionCodec.INSTANCE, true);
   }
@@ -51,11 +45,9 @@ public StructVectorUnloader(StructVector root) {
   /**
    * Constructs a new instance.
    *
-   * @param root             The struct vector to serialize to an
-   *                         {@link ArrowRecordBatch}.
-   * @param includeNullCount Controls whether null count is copied to the
-   *                         {@link ArrowRecordBatch}
-   * @param alignBuffers     Controls if buffers get aligned to 8-byte boundaries.
+   * @param root The struct vector to serialize to an {@link ArrowRecordBatch}.
+   * @param includeNullCount Controls whether null count is copied to the {@link ArrowRecordBatch}
+   * @param alignBuffers Controls if buffers get aligned to 8-byte boundaries.
    */
   public StructVectorUnloader(StructVector root, boolean includeNullCount, boolean alignBuffers) {
     this(root, includeNullCount, NoCompressionCodec.INSTANCE, alignBuffers);
@@ -64,16 +56,13 @@ public StructVectorUnloader(StructVector root, boolean includeNullCount, boolean
   /**
    * Constructs a new instance.
    *
-   * @param root             The struct vector to serialize to an
-   *                         {@link ArrowRecordBatch}.
-   * @param includeNullCount Controls whether null count is copied to the
-   *                         {@link ArrowRecordBatch}
-   * @param codec            the codec for compressing data. If it is null, then
-   *                         no compression is needed.
-   * @param alignBuffers     Controls if buffers get aligned to 8-byte boundaries.
+   * @param root The struct vector to serialize to an {@link ArrowRecordBatch}.
+   * @param includeNullCount Controls whether null count is copied to the {@link ArrowRecordBatch}
+   * @param codec the codec for compressing data. If it is null, then no compression is needed.
+   * @param alignBuffers Controls if buffers get aligned to 8-byte boundaries.
    */
-  public StructVectorUnloader(StructVector root, boolean includeNullCount, CompressionCodec codec,
-      boolean alignBuffers) {
+  public StructVectorUnloader(
+      StructVector root, boolean includeNullCount, CompressionCodec codec, boolean alignBuffers) {
     this.root = root;
     this.includeNullCount = includeNullCount;
     this.codec = codec;
@@ -81,32 +70,58 @@ public StructVectorUnloader(StructVector root, boolean includeNullCount, Compres
   }
 
   /**
-   * Performs the depth first traversal of the Vectors to create an
-   * {@link ArrowRecordBatch} suitable for serialization.
+   * Performs the depth first traversal of the Vectors to create an {@link ArrowRecordBatch}
+   * suitable for serialization.
    */
   public ArrowRecordBatch getRecordBatch() {
     List<ArrowFieldNode> nodes = new ArrayList<>();
     List<ArrowBuf> buffers = new ArrayList<>();
+    List<Long> variadicBufferCounts = new ArrayList<>();
     for (FieldVector vector : root.getChildrenFromFields()) {
-      appendNodes(vector, nodes, buffers);
+      appendNodes(vector, nodes, buffers, variadicBufferCounts);
     }
-    return new ArrowRecordBatch(root.getValueCount(), nodes, buffers, CompressionUtil.createBodyCompression(codec),
+    return new ArrowRecordBatch(
+        root.getValueCount(),
+        nodes,
+        buffers,
+        CompressionUtil.createBodyCompression(codec),
+        variadicBufferCounts,
         alignBuffers);
   }
 
-  private void appendNodes(FieldVector vector, List<ArrowFieldNode> nodes, List<ArrowBuf> buffers) {
-    nodes.add(new ArrowFieldNode(vector.getValueCount(), includeNullCount ? vector.getNullCount() : -1));
+  private long getVariadicBufferCount(FieldVector vector) {
+    if (vector instanceof BaseVariableWidthViewVector) {
+      return ((BaseVariableWidthViewVector) vector).getDataBuffers().size();
+    }
+    return 0L;
+  }
+
+  private void appendNodes(
+      FieldVector vector,
+      List<ArrowFieldNode> nodes,
+      List<ArrowBuf> buffers,
+      List<Long> variadicBufferCounts) {
+    nodes.add(
+        new ArrowFieldNode(vector.getValueCount(), includeNullCount ? vector.getNullCount() : -1));
     List<ArrowBuf> fieldBuffers = vector.getFieldBuffers();
-    int expectedBufferCount = TypeLayout.getTypeBufferCount(vector.getField().getType());
+    long variadicBufferCount = getVariadicBufferCount(vector);
+    int expectedBufferCount =
+        (int) (TypeLayout.getTypeBufferCount(vector.getField().getType()) + variadicBufferCount);
+    // only update variadicBufferCounts for vectors that have variadic buffers
+    if (vector instanceof BaseVariableWidthViewVector) {
+      variadicBufferCounts.add(variadicBufferCount);
+    }
     if (fieldBuffers.size() != expectedBufferCount) {
-      throw new IllegalArgumentException(String.format("wrong number of buffers for field %s in vector %s. found: %s",
-          vector.getField(), vector.getClass().getSimpleName(), fieldBuffers));
+      throw new IllegalArgumentException(
+          String.format(
+              "wrong number of buffers for field %s in vector %s. found: %s",
+              vector.getField(), vector.getClass().getSimpleName(), fieldBuffers));
     }
     for (ArrowBuf buf : fieldBuffers) {
       buffers.add(codec.compress(vector.getAllocator(), buf));
     }
     for (FieldVector child : vector.getChildrenFromFields()) {
-      appendNodes(child, nodes, buffers);
+      appendNodes(child, nodes, buffers, variadicBufferCounts);
     }
   }
 }
diff --git a/java/c/src/main/java/org/apache/arrow/c/jni/CDataJniException.java b/java/c/src/main/java/org/apache/arrow/c/jni/CDataJniException.java
index bebd434f3db3e..ec02f13d58df9 100644
--- a/java/c/src/main/java/org/apache/arrow/c/jni/CDataJniException.java
+++ b/java/c/src/main/java/org/apache/arrow/c/jni/CDataJniException.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c.jni;
 
-/**
- * An exception raised by the JNI side of the C Data bridge.
- */
+/** An exception raised by the JNI side of the C Data bridge. */
 public final class CDataJniException extends Exception {
   private final int errno;
 
@@ -28,18 +25,13 @@ public CDataJniException(int errno, String message) {
     this.errno = errno;
   }
 
-  /**
-   * The original error code returned from C.
-   */
+  /** The original error code returned from C. */
   public int getErrno() {
     return errno;
   }
 
   @Override
-  public String toString() {
-    return "CDataJniException{" +
-        "errno=" + errno +
-        ", message=" + getMessage() +
-        '}';
+  public String getMessage() {
+    return "CDataJniException{" + "errno=" + errno + ", message=" + super.getMessage() + '}';
   }
 }
diff --git a/java/c/src/main/java/org/apache/arrow/c/jni/JniLoader.java b/java/c/src/main/java/org/apache/arrow/c/jni/JniLoader.java
index ef9f432cf0036..f712b400bfd4e 100644
--- a/java/c/src/main/java/org/apache/arrow/c/jni/JniLoader.java
+++ b/java/c/src/main/java/org/apache/arrow/c/jni/JniLoader.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c.jni;
 
 import java.io.File;
@@ -30,11 +29,10 @@
 import java.util.Locale;
 import java.util.Set;
 
-/**
- * The JniLoader for C Data Interface API's native implementation.
- */
+/** The JniLoader for C Data Interface API's native implementation. */
 public class JniLoader {
-  private static final JniLoader INSTANCE = new JniLoader(Collections.singletonList("arrow_cdata_jni"));
+  private static final JniLoader INSTANCE =
+      new JniLoader(Collections.singletonList("arrow_cdata_jni"));
 
   public static JniLoader get() {
     return INSTANCE;
@@ -50,9 +48,7 @@ private boolean finished() {
     return librariesToLoad.isEmpty();
   }
 
-  /**
-   * If required JNI libraries are not loaded, then load them.
-   */
+  /** If required JNI libraries are not loaded, then load them. */
   public void ensureLoaded() {
     if (finished()) {
       return;
@@ -82,9 +78,11 @@ private void load(String name) {
     final String libraryToLoad =
         name + "/" + getNormalizedArch() + "/" + System.mapLibraryName(name);
     try {
-      File temp = File.createTempFile("jnilib-", ".tmp", new File(System.getProperty("java.io.tmpdir")));
+      File temp =
+          File.createTempFile("jnilib-", ".tmp", new File(System.getProperty("java.io.tmpdir")));
       temp.deleteOnExit();
-      try (final InputStream is = JniWrapper.class.getClassLoader().getResourceAsStream(libraryToLoad)) {
+      try (final InputStream is =
+          JniWrapper.class.getClassLoader().getResourceAsStream(libraryToLoad)) {
         if (is == null) {
           throw new FileNotFoundException(libraryToLoad);
         }
diff --git a/java/c/src/main/java/org/apache/arrow/c/jni/JniWrapper.java b/java/c/src/main/java/org/apache/arrow/c/jni/JniWrapper.java
index eb299b65f003b..12b0d0fa21ef5 100644
--- a/java/c/src/main/java/org/apache/arrow/c/jni/JniWrapper.java
+++ b/java/c/src/main/java/org/apache/arrow/c/jni/JniWrapper.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c.jni;
 
-/**
- * JniWrapper for C Data Interface API implementation.
- */
+/** JniWrapper for C Data Interface API implementation. */
 public class JniWrapper {
   private static final JniWrapper INSTANCE = new JniWrapper();
 
@@ -41,9 +38,11 @@ private JniWrapper() {
 
   public native void releaseArray(long memoryAddress);
 
-  public native void getNextArrayStream(long streamAddress, long arrayAddress) throws CDataJniException;
+  public native void getNextArrayStream(long streamAddress, long arrayAddress)
+      throws CDataJniException;
 
-  public native void getSchemaArrayStream(long streamAddress, long arrayAddress) throws CDataJniException;
+  public native void getSchemaArrayStream(long streamAddress, long arrayAddress)
+      throws CDataJniException;
 
   public native void releaseArrayStream(long memoryAddress);
 
diff --git a/java/c/src/main/java/org/apache/arrow/c/jni/PrivateData.java b/java/c/src/main/java/org/apache/arrow/c/jni/PrivateData.java
index e6336cc647766..60db6831f9ca6 100644
--- a/java/c/src/main/java/org/apache/arrow/c/jni/PrivateData.java
+++ b/java/c/src/main/java/org/apache/arrow/c/jni/PrivateData.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c.jni;
 
 import java.io.Closeable;
 
 /**
  * Interface for Java objects stored in C data interface private data.
- * <p>
- * This interface is used for exported structures.
+ *
+ * <p>This interface is used for exported structures.
  */
 public interface PrivateData extends Closeable {
 
diff --git a/java/c/src/test/java/org/apache/arrow/c/ArrowArrayUtilityTest.java b/java/c/src/test/java/org/apache/arrow/c/ArrowArrayUtilityTest.java
index 4a0a966ba1f1f..46f09ae5f0e8f 100644
--- a/java/c/src/test/java/org/apache/arrow/c/ArrowArrayUtilityTest.java
+++ b/java/c/src/test/java/org/apache/arrow/c/ArrowArrayUtilityTest.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.ReferenceManager;
@@ -59,42 +57,56 @@ void afterEach() {
   void importBuffer() throws Exception {
     // Note values are all dummy values here
     try (BufferImportTypeVisitor notEmptyDataVisitor =
-        new BufferImportTypeVisitor(allocator, dummyHandle, new ArrowFieldNode(/* length= */ 1, 0), new long[]{0})) {
+        new BufferImportTypeVisitor(
+            allocator, dummyHandle, new ArrowFieldNode(/* length= */ 1, 0), new long[] {0})) {
 
       // Too few buffers
-      assertThrows(IllegalStateException.class, () -> notEmptyDataVisitor.importBuffer(new ArrowType.Bool(), 1, 1));
+      assertThrows(
+          IllegalStateException.class,
+          () -> notEmptyDataVisitor.importBuffer(new ArrowType.Bool(), 1, 1));
 
       // Null where one isn't expected
-      assertThrows(IllegalStateException.class, () -> notEmptyDataVisitor.importBuffer(new ArrowType.Bool(), 0, 1));
+      assertThrows(
+          IllegalStateException.class,
+          () -> notEmptyDataVisitor.importBuffer(new ArrowType.Bool(), 0, 1));
 
       // Expected capacity not zero but c array ptr is NULL (zero)
-      assertThrows(IllegalStateException.class, () -> notEmptyDataVisitor.importBuffer(new ArrowType.Bool(), 0, 1));
+      assertThrows(
+          IllegalStateException.class,
+          () -> notEmptyDataVisitor.importBuffer(new ArrowType.Bool(), 0, 1));
 
       // Expected capacity is zero and c array ptr is NULL (zero)
-      assertThat(notEmptyDataVisitor.importBuffer(new ArrowType.Bool(), 0, 0)).isEqualTo(allocator.getEmpty());
+      assertThat(notEmptyDataVisitor.importBuffer(new ArrowType.Bool(), 0, 0))
+          .isEqualTo(allocator.getEmpty());
     }
 
     try (BufferImportTypeVisitor emptyDataVisitor =
-        new BufferImportTypeVisitor(allocator, dummyHandle, new ArrowFieldNode(/* length= */ 0, 0), new long[]{0})) {
+        new BufferImportTypeVisitor(
+            allocator, dummyHandle, new ArrowFieldNode(/* length= */ 0, 0), new long[] {0})) {
 
       // Too few buffers
-      assertThrows(IllegalStateException.class, () -> emptyDataVisitor.importBuffer(new ArrowType.Bool(), 1, 1));
+      assertThrows(
+          IllegalStateException.class,
+          () -> emptyDataVisitor.importBuffer(new ArrowType.Bool(), 1, 1));
 
       // Expected capacity not zero but c array ptr is NULL (zero)
-      assertThrows(IllegalStateException.class, () -> emptyDataVisitor.importBuffer(new ArrowType.Bool(), 0, 1));
+      assertThrows(
+          IllegalStateException.class,
+          () -> emptyDataVisitor.importBuffer(new ArrowType.Bool(), 0, 1));
 
       // Expected capacity is zero and c array ptr is NULL (zero)
-      assertThat(emptyDataVisitor.importBuffer(new ArrowType.Bool(), 0, 0)).isEqualTo(allocator.getEmpty());
+      assertThat(emptyDataVisitor.importBuffer(new ArrowType.Bool(), 0, 0))
+          .isEqualTo(allocator.getEmpty());
     }
   }
 
-
   @Test
   void cleanupAfterFailure() throws Exception {
     // Note values are all dummy values here
     long address = MemoryUtil.UNSAFE.allocateMemory(16);
     try (BufferImportTypeVisitor visitor =
-             new BufferImportTypeVisitor(allocator, dummyHandle, new ArrowFieldNode(0, 0), new long[] {address})) {
+        new BufferImportTypeVisitor(
+            allocator, dummyHandle, new ArrowFieldNode(0, 0), new long[] {address})) {
       // This fails, but only after we've already imported a buffer.
       assertThrows(IllegalStateException.class, () -> visitor.visit(new ArrowType.Int(32, true)));
     } finally {
@@ -111,7 +123,7 @@ void bufferAssociatedWithAllocator() throws Exception {
     long baseline = allocator.getAllocatedMemory();
     ArrowFieldNode fieldNode = new ArrowFieldNode(fieldLength, 0);
     try (BufferImportTypeVisitor visitor =
-             new BufferImportTypeVisitor(allocator, dummyHandle, fieldNode, new long[] {0, address})) {
+        new BufferImportTypeVisitor(allocator, dummyHandle, fieldNode, new long[] {0, address})) {
       List<ArrowBuf> buffers = visitor.visit(new ArrowType.Int(32, true));
       assertThat(buffers).hasSize(2);
       assertThat(buffers.get(0)).isNull();
diff --git a/java/c/src/test/java/org/apache/arrow/c/DictionaryTest.java b/java/c/src/test/java/org/apache/arrow/c/DictionaryTest.java
index d892781756ede..ce0e82586b766 100644
--- a/java/c/src/test/java/org/apache/arrow/c/DictionaryTest.java
+++ b/java/c/src/test/java/org/apache/arrow/c/DictionaryTest.java
@@ -14,21 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.channels.Channels;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
-
-import org.apache.arrow.c.ArrowArray;
-import org.apache.arrow.c.ArrowSchema;
-import org.apache.arrow.c.CDataDictionaryProvider;
-import org.apache.arrow.c.Data;
+import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.vector.FieldVector;
@@ -36,13 +34,19 @@
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
+import org.apache.arrow.vector.ViewVarCharVector;
 import org.apache.arrow.vector.compare.VectorEqualsVisitor;
+import org.apache.arrow.vector.complex.StructVector;
 import org.apache.arrow.vector.dictionary.Dictionary;
 import org.apache.arrow.vector.dictionary.DictionaryEncoder;
 import org.apache.arrow.vector.dictionary.DictionaryProvider;
 import org.apache.arrow.vector.ipc.ArrowStreamReader;
 import org.apache.arrow.vector.ipc.ArrowStreamWriter;
+import org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
+import org.apache.arrow.vector.types.Types.MinorType;
 import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
+import org.apache.arrow.vector.types.pojo.Field;
+import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -75,14 +79,19 @@ void roundtrip(FieldVector vector, DictionaryProvider provider, Class<?> clazz)
 
       // Consumer imports vector
       try (CDataDictionaryProvider cDictionaryProvider = new CDataDictionaryProvider();
-          FieldVector imported = Data.importVector(allocator, consumerArrowArray, consumerArrowSchema,
-              cDictionaryProvider);) {
-        assertTrue(clazz.isInstance(imported), String.format("expected %s but was %s", clazz, imported.getClass()));
-        assertTrue(VectorEqualsVisitor.vectorEquals(vector, imported), "vectors are not equivalent");
+          FieldVector imported =
+              Data.importVector(
+                  allocator, consumerArrowArray, consumerArrowSchema, cDictionaryProvider); ) {
+        assertTrue(
+            clazz.isInstance(imported),
+            String.format("expected %s but was %s", clazz, imported.getClass()));
+        assertTrue(
+            VectorEqualsVisitor.vectorEquals(vector, imported), "vectors are not equivalent");
         for (long id : cDictionaryProvider.getDictionaryIds()) {
           ValueVector exportedDictionaryVector = provider.lookup(id).getVector();
           ValueVector importedDictionaryVector = cDictionaryProvider.lookup(id).getVector();
-          assertTrue(VectorEqualsVisitor.vectorEquals(exportedDictionaryVector, importedDictionaryVector),
+          assertTrue(
+              VectorEqualsVisitor.vectorEquals(exportedDictionaryVector, importedDictionaryVector),
               String.format("Dictionary vectors for ID %d are not equivalent", id));
         }
       }
@@ -91,25 +100,27 @@ void roundtrip(FieldVector vector, DictionaryProvider provider, Class<?> clazz)
 
   @Test
   public void testWithDictionary() throws Exception {
-    DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();
+    DictionaryProvider.MapDictionaryProvider provider =
+        new DictionaryProvider.MapDictionaryProvider();
     // create dictionary and provider
     final VarCharVector dictVector = new VarCharVector("dict", allocator);
     dictVector.allocateNewSafe();
-    dictVector.setSafe(0, "aa".getBytes());
-    dictVector.setSafe(1, "bb".getBytes());
-    dictVector.setSafe(2, "cc".getBytes());
+    dictVector.setSafe(0, "aa".getBytes(StandardCharsets.UTF_8));
+    dictVector.setSafe(1, "bb".getBytes(StandardCharsets.UTF_8));
+    dictVector.setSafe(2, "cc".getBytes(StandardCharsets.UTF_8));
     dictVector.setValueCount(3);
 
-    Dictionary dictionary = new Dictionary(dictVector, new DictionaryEncoding(0L, false, /* indexType= */null));
+    Dictionary dictionary =
+        new Dictionary(dictVector, new DictionaryEncoding(0L, false, /* indexType= */ null));
     provider.put(dictionary);
 
     // create vector and encode it
     final VarCharVector vector = new VarCharVector("vector", allocator);
     vector.allocateNewSafe();
-    vector.setSafe(0, "bb".getBytes());
-    vector.setSafe(1, "bb".getBytes());
-    vector.setSafe(2, "cc".getBytes());
-    vector.setSafe(3, "aa".getBytes());
+    vector.setSafe(0, "bb".getBytes(StandardCharsets.UTF_8));
+    vector.setSafe(1, "bb".getBytes(StandardCharsets.UTF_8));
+    vector.setSafe(2, "cc".getBytes(StandardCharsets.UTF_8));
+    vector.setSafe(3, "aa".getBytes(StandardCharsets.UTF_8));
     vector.setValueCount(4);
 
     // get the encoded vector
@@ -129,29 +140,37 @@ public void testRoundtripMultipleBatches() throws IOException {
       // Load first batch
       reader.loadNextBatch();
       // Producer fills consumer schema structure
-      Data.exportSchema(allocator, reader.getVectorSchemaRoot().getSchema(), reader, consumerArrowSchema);
+      Data.exportSchema(
+          allocator, reader.getVectorSchemaRoot().getSchema(), reader, consumerArrowSchema);
       // Consumer loads it as an empty vector schema root
       try (CDataDictionaryProvider consumerDictionaryProvider = new CDataDictionaryProvider();
-          VectorSchemaRoot consumerRoot = Data.importVectorSchemaRoot(allocator, consumerArrowSchema,
-              consumerDictionaryProvider)) {
+          VectorSchemaRoot consumerRoot =
+              Data.importVectorSchemaRoot(
+                  allocator, consumerArrowSchema, consumerDictionaryProvider)) {
         do {
           try (ArrowArray consumerArray = ArrowArray.allocateNew(allocator)) {
             // Producer exports next data
-            Data.exportVectorSchemaRoot(allocator, reader.getVectorSchemaRoot(), reader, consumerArray);
+            Data.exportVectorSchemaRoot(
+                allocator, reader.getVectorSchemaRoot(), reader, consumerArray);
             // Consumer loads next data
-            Data.importIntoVectorSchemaRoot(allocator, consumerArray, consumerRoot, consumerDictionaryProvider);
+            Data.importIntoVectorSchemaRoot(
+                allocator, consumerArray, consumerRoot, consumerDictionaryProvider);
 
             // Roundtrip validation
-            assertTrue(consumerRoot.equals(reader.getVectorSchemaRoot()), "vector schema roots are not equivalent");
+            assertTrue(
+                consumerRoot.equals(reader.getVectorSchemaRoot()),
+                "vector schema roots are not equivalent");
             for (long id : consumerDictionaryProvider.getDictionaryIds()) {
               ValueVector exportedDictionaryVector = reader.lookup(id).getVector();
-              ValueVector importedDictionaryVector = consumerDictionaryProvider.lookup(id).getVector();
-              assertTrue(VectorEqualsVisitor.vectorEquals(exportedDictionaryVector, importedDictionaryVector),
+              ValueVector importedDictionaryVector =
+                  consumerDictionaryProvider.lookup(id).getVector();
+              assertTrue(
+                  VectorEqualsVisitor.vectorEquals(
+                      exportedDictionaryVector, importedDictionaryVector),
                   String.format("Dictionary vectors for ID %d are not equivalent", id));
             }
           }
-        }
-        while (reader.loadNextBatch());
+        } while (reader.loadNextBatch());
       }
     }
   }
@@ -161,22 +180,25 @@ private ArrowStreamReader createMultiBatchReader() throws IOException {
     try (final VarCharVector dictVector = new VarCharVector("dict", allocator);
         IntVector vector = new IntVector("foo", allocator)) {
       // create dictionary and provider
-      DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();
+      DictionaryProvider.MapDictionaryProvider provider =
+          new DictionaryProvider.MapDictionaryProvider();
       dictVector.allocateNewSafe();
-      dictVector.setSafe(0, "aa".getBytes());
-      dictVector.setSafe(1, "bb".getBytes());
-      dictVector.setSafe(2, "cc".getBytes());
-      dictVector.setSafe(3, "dd".getBytes());
-      dictVector.setSafe(4, "ee".getBytes());
+      dictVector.setSafe(0, "aa".getBytes(StandardCharsets.UTF_8));
+      dictVector.setSafe(1, "bb".getBytes(StandardCharsets.UTF_8));
+      dictVector.setSafe(2, "cc".getBytes(StandardCharsets.UTF_8));
+      dictVector.setSafe(3, "dd".getBytes(StandardCharsets.UTF_8));
+      dictVector.setSafe(4, "ee".getBytes(StandardCharsets.UTF_8));
       dictVector.setValueCount(5);
-      Dictionary dictionary = new Dictionary(dictVector, new DictionaryEncoding(0L, false, /* indexType= */null));
+      Dictionary dictionary =
+          new Dictionary(dictVector, new DictionaryEncoding(0L, false, /* indexType= */ null));
       provider.put(dictionary);
 
       Schema schema = new Schema(Collections.singletonList(vector.getField()));
-      try (
-          VectorSchemaRoot root = new VectorSchemaRoot(schema, Collections.singletonList(vector),
-              vector.getValueCount());
-          ArrowStreamWriter writer = new ArrowStreamWriter(root, provider, Channels.newChannel(os));) {
+      try (VectorSchemaRoot root =
+              new VectorSchemaRoot(
+                  schema, Collections.singletonList(vector), vector.getValueCount());
+          ArrowStreamWriter writer =
+              new ArrowStreamWriter(root, provider, Channels.newChannel(os)); ) {
 
         writer.start();
 
@@ -216,4 +238,115 @@ private ArrowStreamReader createMultiBatchReader() throws IOException {
     return new ArrowStreamReader(in, allocator);
   }
 
+  private void createStructVector(StructVector vector) {
+    final ViewVarCharVector child1 =
+        vector.addOrGet(
+            "f0", FieldType.nullable(MinorType.VIEWVARCHAR.getType()), ViewVarCharVector.class);
+    final IntVector child2 =
+        vector.addOrGet("f1", FieldType.nullable(MinorType.INT.getType()), IntVector.class);
+
+    // Write the values to child 1
+    child1.allocateNew();
+    child1.set(0, "01234567890".getBytes());
+    child1.set(1, "012345678901234567".getBytes());
+    vector.setIndexDefined(0);
+
+    // Write the values to child 2
+    child2.allocateNew();
+    child2.set(0, 10);
+    child2.set(1, 11);
+    vector.setIndexDefined(1);
+
+    vector.setValueCount(2);
+  }
+
+  private void createStructVectorInline(StructVector vector) {
+    final ViewVarCharVector child1 =
+        vector.addOrGet(
+            "f0", FieldType.nullable(MinorType.VIEWVARCHAR.getType()), ViewVarCharVector.class);
+    final IntVector child2 =
+        vector.addOrGet("f1", FieldType.nullable(MinorType.INT.getType()), IntVector.class);
+
+    // Write the values to child 1
+    child1.allocateNew();
+    child1.set(0, "012345678".getBytes());
+    child1.set(1, "01234".getBytes());
+    vector.setIndexDefined(0);
+
+    // Write the values to child 2
+    child2.allocateNew();
+    child2.set(0, 10);
+    child2.set(1, 11);
+    vector.setIndexDefined(1);
+
+    vector.setValueCount(2);
+  }
+
+  @Test
+  public void testVectorLoadUnloadOnStructVector() {
+    try (final StructVector structVector1 = StructVector.empty("struct", allocator)) {
+      createStructVector(structVector1);
+      Field field1 = structVector1.getField();
+      Schema schema = new Schema(field1.getChildren());
+      StructVectorUnloader vectorUnloader = new StructVectorUnloader(structVector1);
+
+      try (ArrowRecordBatch recordBatch = vectorUnloader.getRecordBatch();
+          BufferAllocator finalVectorsAllocator =
+              allocator.newChildAllocator("struct", 0, Long.MAX_VALUE); ) {
+        // validating recordBatch contains an output for variadicBufferCounts
+        assertFalse(recordBatch.getVariadicBufferCounts().isEmpty());
+        assertEquals(1, recordBatch.getVariadicBufferCounts().size());
+        assertEquals(1, recordBatch.getVariadicBufferCounts().get(0));
+
+        StructVectorLoader vectorLoader = new StructVectorLoader(schema);
+        try (StructVector structVector2 = vectorLoader.load(finalVectorsAllocator, recordBatch)) {
+          // Improve this after fixing https://github.com/apache/arrow/issues/41933
+          // assertTrue(VectorEqualsVisitor.vectorEquals(structVector1, structVector2), "vectors are
+          // not equivalent");
+          assertTrue(
+              VectorEqualsVisitor.vectorEquals(
+                  structVector1.getChild("f0"), structVector2.getChild("f0")),
+              "vectors are not equivalent");
+          assertTrue(
+              VectorEqualsVisitor.vectorEquals(
+                  structVector1.getChild("f1"), structVector2.getChild("f1")),
+              "vectors are not equivalent");
+        }
+      }
+    }
+  }
+
+  @Test
+  public void testVectorLoadUnloadOnStructVectorWithInline() {
+    try (final StructVector structVector1 = StructVector.empty("struct", allocator)) {
+      createStructVectorInline(structVector1);
+      Field field1 = structVector1.getField();
+      Schema schema = new Schema(field1.getChildren());
+      StructVectorUnloader vectorUnloader = new StructVectorUnloader(structVector1);
+
+      try (ArrowRecordBatch recordBatch = vectorUnloader.getRecordBatch();
+          BufferAllocator finalVectorsAllocator =
+              allocator.newChildAllocator("struct", 0, Long.MAX_VALUE); ) {
+        // validating recordBatch contains an output for variadicBufferCounts
+        assertFalse(recordBatch.getVariadicBufferCounts().isEmpty());
+        assertEquals(1, recordBatch.getVariadicBufferCounts().size());
+        assertEquals(0, recordBatch.getVariadicBufferCounts().get(0));
+
+        StructVectorLoader vectorLoader = new StructVectorLoader(schema);
+        try (StructVector structVector2 = vectorLoader.load(finalVectorsAllocator, recordBatch)) {
+          // Improve this after fixing https://github.com/apache/arrow/issues/41933
+          // assertTrue(VectorEqualsVisitor.vectorEquals(structVector1, structVector2), "vectors are
+          // not equivalent");
+          assertTrue(
+              VectorEqualsVisitor.vectorEquals(
+                  structVector1.getChild("f0"), structVector2.getChild("f0")),
+              "vectors are not equivalent");
+          assertTrue(
+              VectorEqualsVisitor.vectorEquals(
+                  structVector1.getChild("f1"), structVector2.getChild("f1")),
+              "vectors are not equivalent");
+        }
+      }
+    }
+  }
 }
diff --git a/java/c/src/test/java/org/apache/arrow/c/FlagsTest.java b/java/c/src/test/java/org/apache/arrow/c/FlagsTest.java
index 35f836f71f576..1e8843ce82363 100644
--- a/java/c/src/test/java/org/apache/arrow/c/FlagsTest.java
+++ b/java/c/src/test/java/org/apache/arrow/c/FlagsTest.java
@@ -14,14 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;
-
-import org.apache.arrow.c.Flags;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
 import org.apache.arrow.vector.types.pojo.Field;
@@ -31,46 +28,66 @@
 public class FlagsTest {
   @Test
   public void testForFieldNullableOrderedDict() {
-    FieldType fieldType = new FieldType(true, ArrowType.Binary.INSTANCE,
-        new DictionaryEncoding(123L, true, new ArrowType.Int(8, true)));
+    FieldType fieldType =
+        new FieldType(
+            true,
+            ArrowType.Binary.INSTANCE,
+            new DictionaryEncoding(123L, true, new ArrowType.Int(8, true)));
 
-    assertEquals(Flags.ARROW_FLAG_DICTIONARY_ORDERED | Flags.ARROW_FLAG_NULLABLE,
+    assertEquals(
+        Flags.ARROW_FLAG_DICTIONARY_ORDERED | Flags.ARROW_FLAG_NULLABLE,
         Flags.forField(new Field("Name", fieldType, new ArrayList<>())));
   }
 
   @Test
   public void testForFieldOrderedDict() {
-    FieldType fieldType = new FieldType(false, ArrowType.Binary.INSTANCE,
-        new DictionaryEncoding(123L, true, new ArrowType.Int(8, true)));
-    assertEquals(Flags.ARROW_FLAG_DICTIONARY_ORDERED, Flags.forField(new Field("Name", fieldType, new ArrayList<>())));
+    FieldType fieldType =
+        new FieldType(
+            false,
+            ArrowType.Binary.INSTANCE,
+            new DictionaryEncoding(123L, true, new ArrowType.Int(8, true)));
+    assertEquals(
+        Flags.ARROW_FLAG_DICTIONARY_ORDERED,
+        Flags.forField(new Field("Name", fieldType, new ArrayList<>())));
   }
 
   @Test
   public void testForFieldNullableDict() {
-    FieldType fieldType = new FieldType(true, ArrowType.Binary.INSTANCE,
-        new DictionaryEncoding(123L, false, new ArrowType.Int(8, true)));
-    assertEquals(Flags.ARROW_FLAG_NULLABLE, Flags.forField(new Field("Name", fieldType, new ArrayList<>())));
+    FieldType fieldType =
+        new FieldType(
+            true,
+            ArrowType.Binary.INSTANCE,
+            new DictionaryEncoding(123L, false, new ArrowType.Int(8, true)));
+    assertEquals(
+        Flags.ARROW_FLAG_NULLABLE, Flags.forField(new Field("Name", fieldType, new ArrayList<>())));
   }
 
   @Test
   public void testForFieldNullable() {
     FieldType fieldType = new FieldType(true, ArrowType.Binary.INSTANCE, null);
-    assertEquals(Flags.ARROW_FLAG_NULLABLE, Flags.forField(new Field("Name", fieldType, new ArrayList<>())));
+    assertEquals(
+        Flags.ARROW_FLAG_NULLABLE, Flags.forField(new Field("Name", fieldType, new ArrayList<>())));
   }
 
   @Test
   public void testForFieldNullableOrderedSortedMap() {
     ArrowType.Map type = new ArrowType.Map(true);
-    FieldType fieldType = new FieldType(true, type, new DictionaryEncoding(123L, true, new ArrowType.Int(8, true)));
-    assertEquals(Flags.ARROW_FLAG_DICTIONARY_ORDERED | Flags.ARROW_FLAG_NULLABLE | Flags.ARROW_FLAG_MAP_KEYS_SORTED,
+    FieldType fieldType =
+        new FieldType(true, type, new DictionaryEncoding(123L, true, new ArrowType.Int(8, true)));
+    assertEquals(
+        Flags.ARROW_FLAG_DICTIONARY_ORDERED
+            | Flags.ARROW_FLAG_NULLABLE
+            | Flags.ARROW_FLAG_MAP_KEYS_SORTED,
         Flags.forField(new Field("Name", fieldType, new ArrayList<>())));
   }
 
   @Test
   public void testForFieldNullableOrderedMap() {
     ArrowType.Map type = new ArrowType.Map(false);
-    FieldType fieldType = new FieldType(true, type, new DictionaryEncoding(123L, true, new ArrowType.Int(8, true)));
-    assertEquals(Flags.ARROW_FLAG_DICTIONARY_ORDERED | Flags.ARROW_FLAG_NULLABLE,
+    FieldType fieldType =
+        new FieldType(true, type, new DictionaryEncoding(123L, true, new ArrowType.Int(8, true)));
+    assertEquals(
+        Flags.ARROW_FLAG_DICTIONARY_ORDERED | Flags.ARROW_FLAG_NULLABLE,
         Flags.forField(new Field("Name", fieldType, new ArrayList<>())));
   }
 }
diff --git a/java/c/src/test/java/org/apache/arrow/c/FormatTest.java b/java/c/src/test/java/org/apache/arrow/c/FormatTest.java
index 1f7f86b36f64e..c77332433097d 100644
--- a/java/c/src/test/java/org/apache/arrow/c/FormatTest.java
+++ b/java/c/src/test/java/org/apache/arrow/c/FormatTest.java
@@ -14,15 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.apache.arrow.c.Flags;
-import org.apache.arrow.c.Format;
 import org.apache.arrow.vector.types.DateUnit;
 import org.apache.arrow.vector.types.FloatingPointPrecision;
 import org.apache.arrow.vector.types.IntervalUnit;
@@ -71,22 +68,33 @@ public void testAsString() {
     assertEquals("ttm", Format.asString(new ArrowType.Time(TimeUnit.MILLISECOND, 32)));
     assertEquals("ttu", Format.asString(new ArrowType.Time(TimeUnit.MICROSECOND, 64)));
     assertEquals("ttn", Format.asString(new ArrowType.Time(TimeUnit.NANOSECOND, 64)));
-    assertEquals("tss:Timezone", Format.asString(new ArrowType.Timestamp(TimeUnit.SECOND, "Timezone")));
-    assertEquals("tsm:Timezone", Format.asString(new ArrowType.Timestamp(TimeUnit.MILLISECOND, "Timezone")));
-    assertEquals("tsu:Timezone", Format.asString(new ArrowType.Timestamp(TimeUnit.MICROSECOND, "Timezone")));
-    assertEquals("tsn:Timezone", Format.asString(new ArrowType.Timestamp(TimeUnit.NANOSECOND, "Timezone")));
-    assertEquals("+us:1,1,1", Format.asString(new ArrowType.Union(UnionMode.Sparse, new int[] { 1, 1, 1 })));
-    assertEquals("+ud:1,1,1", Format.asString(new ArrowType.Union(UnionMode.Dense, new int[] { 1, 1, 1 })));
+    assertEquals(
+        "tss:Timezone", Format.asString(new ArrowType.Timestamp(TimeUnit.SECOND, "Timezone")));
+    assertEquals(
+        "tsm:Timezone", Format.asString(new ArrowType.Timestamp(TimeUnit.MILLISECOND, "Timezone")));
+    assertEquals(
+        "tsu:Timezone", Format.asString(new ArrowType.Timestamp(TimeUnit.MICROSECOND, "Timezone")));
+    assertEquals(
+        "tsn:Timezone", Format.asString(new ArrowType.Timestamp(TimeUnit.NANOSECOND, "Timezone")));
+    assertEquals(
+        "+us:1,1,1", Format.asString(new ArrowType.Union(UnionMode.Sparse, new int[] {1, 1, 1})));
+    assertEquals(
+        "+ud:1,1,1", Format.asString(new ArrowType.Union(UnionMode.Dense, new int[] {1, 1, 1})));
     assertEquals("u", Format.asString(new ArrowType.Utf8()));
 
-    assertThrows(UnsupportedOperationException.class, () -> Format.asString(new ArrowType.Int(1, true)));
-    assertThrows(UnsupportedOperationException.class, () -> Format.asString(new ArrowType.Time(TimeUnit.SECOND, 1)));
-    assertThrows(UnsupportedOperationException.class,
+    assertThrows(
+        UnsupportedOperationException.class, () -> Format.asString(new ArrowType.Int(1, true)));
+    assertThrows(
+        UnsupportedOperationException.class,
+        () -> Format.asString(new ArrowType.Time(TimeUnit.SECOND, 1)));
+    assertThrows(
+        UnsupportedOperationException.class,
         () -> Format.asString(new ArrowType.Time(TimeUnit.MILLISECOND, 64)));
   }
 
   @Test
-  public void testAsType() throws IllegalStateException, NumberFormatException, UnsupportedOperationException {
+  public void testAsType()
+      throws IllegalStateException, NumberFormatException, UnsupportedOperationException {
     assertTrue(Format.asType("n", 0L) instanceof ArrowType.Null);
     assertTrue(Format.asType("b", 0L) instanceof ArrowType.Bool);
     assertEquals(new ArrowType.Int(Byte.SIZE, true), Format.asType("c", 0L));
@@ -98,8 +106,10 @@ public void testAsType() throws IllegalStateException, NumberFormatException, Un
     assertEquals(new ArrowType.Int(Long.SIZE, true), Format.asType("l", 0L));
     assertEquals(new ArrowType.Int(Long.SIZE, false), Format.asType("L", 0L));
     assertEquals(new ArrowType.FloatingPoint(FloatingPointPrecision.HALF), Format.asType("e", 0L));
-    assertEquals(new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE), Format.asType("f", 0L));
-    assertEquals(new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE), Format.asType("g", 0L));
+    assertEquals(
+        new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE), Format.asType("f", 0L));
+    assertEquals(
+        new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE), Format.asType("g", 0L));
     assertTrue(Format.asType("z", 0L) instanceof ArrowType.Binary);
     assertTrue(Format.asType("Z", 0L) instanceof ArrowType.LargeBinary);
     assertTrue(Format.asType("u", 0L) instanceof ArrowType.Utf8);
@@ -126,12 +136,21 @@ public void testAsType() throws IllegalStateException, NumberFormatException, Un
     assertEquals(new ArrowType.Decimal(9, 1, 1), Format.asType("d:9,1,1", 0L));
     assertEquals(new ArrowType.FixedSizeBinary(1), Format.asType("w:1", 0L));
     assertEquals(new ArrowType.FixedSizeList(3), Format.asType("+w:3", 0L));
-    assertEquals(new ArrowType.Union(UnionMode.Dense, new int[] { 1, 1, 1 }), Format.asType("+ud:1,1,1", 0L));
-    assertEquals(new ArrowType.Union(UnionMode.Sparse, new int[] { 1, 1, 1 }), Format.asType("+us:1,1,1", 0L));
-    assertEquals(new ArrowType.Timestamp(TimeUnit.SECOND, "Timezone"), Format.asType("tss:Timezone", 0L));
-    assertEquals(new ArrowType.Timestamp(TimeUnit.MILLISECOND, "Timezone"), Format.asType("tsm:Timezone", 0L));
-    assertEquals(new ArrowType.Timestamp(TimeUnit.MICROSECOND, "Timezone"), Format.asType("tsu:Timezone", 0L));
-    assertEquals(new ArrowType.Timestamp(TimeUnit.NANOSECOND, "Timezone"), Format.asType("tsn:Timezone", 0L));
+    assertEquals(
+        new ArrowType.Union(UnionMode.Dense, new int[] {1, 1, 1}), Format.asType("+ud:1,1,1", 0L));
+    assertEquals(
+        new ArrowType.Union(UnionMode.Sparse, new int[] {1, 1, 1}), Format.asType("+us:1,1,1", 0L));
+    assertEquals(
+        new ArrowType.Timestamp(TimeUnit.SECOND, "Timezone"), Format.asType("tss:Timezone", 0L));
+    assertEquals(
+        new ArrowType.Timestamp(TimeUnit.MILLISECOND, "Timezone"),
+        Format.asType("tsm:Timezone", 0L));
+    assertEquals(
+        new ArrowType.Timestamp(TimeUnit.MICROSECOND, "Timezone"),
+        Format.asType("tsu:Timezone", 0L));
+    assertEquals(
+        new ArrowType.Timestamp(TimeUnit.NANOSECOND, "Timezone"),
+        Format.asType("tsn:Timezone", 0L));
 
     assertThrows(UnsupportedOperationException.class, () -> Format.asType("Format", 0L));
     assertThrows(UnsupportedOperationException.class, () -> Format.asType(":", 0L));
diff --git a/java/c/src/test/java/org/apache/arrow/c/MetadataTest.java b/java/c/src/test/java/org/apache/arrow/c/MetadataTest.java
index 1d9703b1a8741..18ca18c8d295e 100644
--- a/java/c/src/test/java/org/apache/arrow/c/MetadataTest.java
+++ b/java/c/src/test/java/org/apache/arrow/c/MetadataTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -23,9 +22,6 @@
 import java.nio.ByteOrder;
 import java.util.HashMap;
 import java.util.Map;
-
-import org.apache.arrow.c.Metadata;
-import org.apache.arrow.c.NativeUtil;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.memory.util.LargeMemoryUtil;
@@ -48,11 +44,17 @@ static void beforeAll() {
     metadata.put("key2", "bar");
 
     if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) {
-      encoded = new byte[] { 2, 0, 0, 0, 4, 0, 0, 0, 'k', 'e', 'y', '1', 0, 0, 0, 0, 4, 0, 0, 0, 'k', 'e', 'y', '2', 3,
-          0, 0, 0, 'b', 'a', 'r' };
+      encoded =
+          new byte[] {
+            2, 0, 0, 0, 4, 0, 0, 0, 'k', 'e', 'y', '1', 0, 0, 0, 0, 4, 0, 0, 0, 'k', 'e', 'y', '2',
+            3, 0, 0, 0, 'b', 'a', 'r'
+          };
     } else {
-      encoded = new byte[] { 0, 0, 0, 2, 0, 0, 0, 4, 'k', 'e', 'y', '1', 0, 0, 0, 0, 0, 0, 0, 4, 'k', 'e', 'y', '2', 0,
-          0, 0, 3, 'b', 'a', 'r' };
+      encoded =
+          new byte[] {
+            0, 0, 0, 2, 0, 0, 0, 4, 'k', 'e', 'y', '1', 0, 0, 0, 0, 0, 0, 0, 4, 'k', 'e', 'y', '2',
+            0, 0, 0, 3, 'b', 'a', 'r'
+          };
     }
   }
 
@@ -70,7 +72,8 @@ public void tearDown() {
   public void testEncode() {
     try (ArrowBuf buffer = Metadata.encode(allocator, metadata)) {
       int totalSize = LargeMemoryUtil.checkedCastToInt(buffer.readableBytes());
-      ByteBuffer reader = MemoryUtil.directBuffer(buffer.memoryAddress(), totalSize).order(ByteOrder.nativeOrder());
+      ByteBuffer reader =
+          MemoryUtil.directBuffer(buffer.memoryAddress(), totalSize).order(ByteOrder.nativeOrder());
       byte[] result = new byte[totalSize];
       reader.get(result);
       assertArrayEquals(encoded, result);
@@ -100,5 +103,4 @@ public void testDecodeEmpty() {
     Map<String, String> decoded = Metadata.decode(NativeUtil.NULL);
     assertNull(decoded);
   }
-
 }
diff --git a/java/c/src/test/java/org/apache/arrow/c/NativeUtilTest.java b/java/c/src/test/java/org/apache/arrow/c/NativeUtilTest.java
index f46a0128c8644..10c25ec0d3aba 100644
--- a/java/c/src/test/java/org/apache/arrow/c/NativeUtilTest.java
+++ b/java/c/src/test/java/org/apache/arrow/c/NativeUtilTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
@@ -22,8 +21,6 @@
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-
-import org.apache.arrow.c.NativeUtil;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.memory.util.LargeMemoryUtil;
@@ -49,10 +46,11 @@ public void tearDown() {
   @Test
   public void testString() {
     String javaString = "abc";
-    byte[] nativeString = new byte[] { 97, 98, 99, 0 };
+    byte[] nativeString = new byte[] {97, 98, 99, 0};
     try (ArrowBuf buffer = NativeUtil.toNativeString(allocator, javaString)) {
       int totalSize = LargeMemoryUtil.checkedCastToInt(buffer.readableBytes());
-      ByteBuffer reader = MemoryUtil.directBuffer(buffer.memoryAddress(), totalSize).order(ByteOrder.nativeOrder());
+      ByteBuffer reader =
+          MemoryUtil.directBuffer(buffer.memoryAddress(), totalSize).order(ByteOrder.nativeOrder());
       byte[] result = new byte[totalSize];
       reader.get(result);
       assertArrayEquals(nativeString, result);
@@ -63,8 +61,8 @@ public void testString() {
 
   @Test
   public void testToJavaArray() {
-    long[] nativeArray = new long[] { 1, 2, 3 };
-    try (ArrowBuf buffer = allocator.buffer(Long.BYTES * nativeArray.length, null)) {
+    long[] nativeArray = new long[] {1, 2, 3};
+    try (ArrowBuf buffer = allocator.buffer(Long.BYTES * ((long) nativeArray.length), null)) {
       for (long value : nativeArray) {
         buffer.writeLong(value);
       }
@@ -78,5 +76,4 @@ public void testToZeroJavaArray() {
     long[] actual = NativeUtil.toJavaArray(0xDEADBEEF, 0);
     assertEquals(0, actual.length);
   }
-
 }
diff --git a/java/c/src/test/java/org/apache/arrow/c/RoundtripTest.java b/java/c/src/test/java/org/apache/arrow/c/RoundtripTest.java
index a7e3cde2e7b4b..6591d1f730990 100644
--- a/java/c/src/test/java/org/apache/arrow/c/RoundtripTest.java
+++ b/java/c/src/test/java/org/apache/arrow/c/RoundtripTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.apache.arrow.vector.testing.ValueVectorDataPopulator.setVector;
@@ -33,8 +32,8 @@
 import java.util.Map;
 import java.util.UUID;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -79,6 +78,8 @@
 import org.apache.arrow.vector.VarBinaryVector;
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
+import org.apache.arrow.vector.ViewVarBinaryVector;
+import org.apache.arrow.vector.ViewVarCharVector;
 import org.apache.arrow.vector.ZeroVector;
 import org.apache.arrow.vector.compare.VectorEqualsVisitor;
 import org.apache.arrow.vector.complex.FixedSizeListVector;
@@ -135,7 +136,8 @@ FieldVector vectorRoundtrip(FieldVector vector) {
       }
 
       // Consumer imports vector
-      FieldVector imported = Data.importVector(childAllocator, consumerArrowArray, consumerArrowSchema, null);
+      FieldVector imported =
+          Data.importVector(childAllocator, consumerArrowArray, consumerArrowSchema, null);
       if (!(imported instanceof NullVector)) {
         assertEquals(childAllocator, imported.getAllocator());
       }
@@ -165,10 +167,30 @@ VectorSchemaRoot vectorSchemaRootRoundtrip(VectorSchemaRoot root) {
   }
 
   boolean roundtrip(FieldVector vector, Class<?> clazz) {
+    List<ArrowBuf> fieldBuffers = vector.getFieldBuffers();
+    List<Integer> orgRefCnts =
+        fieldBuffers.stream().map(buf -> buf.refCnt()).collect(Collectors.toList());
+    long orgMemorySize = allocator.getAllocatedMemory();
+
+    boolean result = false;
     try (ValueVector imported = vectorRoundtrip(vector)) {
-      assertTrue(clazz.isInstance(imported), String.format("expected %s but was %s", clazz, imported.getClass()));
-      return VectorEqualsVisitor.vectorEquals(vector, imported);
+      assertTrue(
+          clazz.isInstance(imported),
+          String.format("expected %s but was %s", clazz, imported.getClass()));
+      result = VectorEqualsVisitor.vectorEquals(vector, imported);
     }
+
+    // Check that the ref counts of the buffers are the same after the roundtrip
+    IntStream.range(0, orgRefCnts.size())
+        .forEach(
+            i -> {
+              ArrowBuf buf = fieldBuffers.get(i);
+              assertEquals(buf.refCnt(), orgRefCnts.get(i));
+            });
+
+    assertEquals(orgMemorySize, allocator.getAllocatedMemory());
+
+    return result;
   }
 
   @Test
@@ -293,7 +315,7 @@ public void testZeroVectorEquals() {
   @Test
   public void testFixedSizeBinaryVector() {
     try (final FixedSizeBinaryVector vector = new FixedSizeBinaryVector("v", allocator, 2)) {
-      setVector(vector, new byte[] { 0b0000, 0b0001 }, new byte[] { 0b0010, 0b0011 });
+      setVector(vector, new byte[] {0b0000, 0b0001}, new byte[] {0b0010, 0b0011});
       assertTrue(roundtrip(vector, FixedSizeBinaryVector.class));
     }
   }
@@ -495,11 +517,88 @@ public void testNullVector() {
   @Test
   public void testVarBinaryVector() {
     try (final VarBinaryVector vector = new VarBinaryVector("v", allocator)) {
-      setVector(vector, "abc".getBytes(), "def".getBytes(), null);
+      setVector(
+          vector,
+          "abc".getBytes(StandardCharsets.UTF_8),
+          "def".getBytes(StandardCharsets.UTF_8),
+          null);
       assertTrue(roundtrip(vector, VarBinaryVector.class));
     }
   }
 
+  private String generateString(String str, int repetition) {
+    StringBuilder aRepeated = new StringBuilder();
+    for (int i = 0; i < repetition; i++) {
+      aRepeated.append(str);
+    }
+    return aRepeated.toString();
+  }
+
+  @Test
+  public void testViewVector() {
+    // ViewVarCharVector with short strings
+    try (final ViewVarCharVector vector = new ViewVarCharVector("v1", allocator)) {
+      setVector(
+          vector,
+          "abc".getBytes(StandardCharsets.UTF_8),
+          "def".getBytes(StandardCharsets.UTF_8),
+          null);
+      assertTrue(roundtrip(vector, ViewVarCharVector.class));
+    }
+
+    // ViewVarCharVector with long strings
+    try (final ViewVarCharVector vector = new ViewVarCharVector("v2", allocator)) {
+      setVector(
+          vector,
+          "01234567890123".getBytes(StandardCharsets.UTF_8),
+          "01234567890123567".getBytes(StandardCharsets.UTF_8),
+          null);
+      assertTrue(roundtrip(vector, ViewVarCharVector.class));
+    }
+
+    // ViewVarBinaryVector with short values
+    try (final ViewVarBinaryVector vector = new ViewVarBinaryVector("v3", allocator)) {
+      setVector(
+          vector,
+          "abc".getBytes(StandardCharsets.UTF_8),
+          "def".getBytes(StandardCharsets.UTF_8),
+          null);
+      assertTrue(roundtrip(vector, ViewVarBinaryVector.class));
+    }
+
+    // ViewVarBinaryVector with long values
+    try (final ViewVarBinaryVector vector = new ViewVarBinaryVector("v4", allocator)) {
+      setVector(
+          vector,
+          "01234567890123".getBytes(StandardCharsets.UTF_8),
+          "01234567890123567".getBytes(StandardCharsets.UTF_8),
+          null);
+      assertTrue(roundtrip(vector, ViewVarBinaryVector.class));
+    }
+
+    List<byte[]> byteArrayList = new ArrayList<>();
+    for (int i = 1; i <= 500; i++) {
+      StringBuilder sb = new StringBuilder(i);
+      for (int j = 0; j < i; j++) {
+        sb.append(j); // or any other character
+      }
+      byte[] bytes = sb.toString().getBytes(StandardCharsets.UTF_8);
+      byteArrayList.add(bytes);
+    }
+
+    // ViewVarCharVector with short long strings with multiple data buffers
+    try (final ViewVarCharVector vector = new ViewVarCharVector("v5", allocator)) {
+      setVector(vector, byteArrayList.toArray(new byte[0][]));
+      assertTrue(roundtrip(vector, ViewVarCharVector.class));
+    }
+
+    // ViewVarBinaryVector with short long strings with multiple data buffers
+    try (final ViewVarBinaryVector vector = new ViewVarBinaryVector("v6", allocator)) {
+      setVector(vector, byteArrayList.toArray(new byte[0][]));
+      assertTrue(roundtrip(vector, ViewVarBinaryVector.class));
+    }
+  }
+
   @Test
   public void testVarCharVector() {
     try (final VarCharVector vector = new VarCharVector("v", allocator)) {
@@ -521,7 +620,7 @@ public void testLargeVarBinaryVector() {
 
       String str = "hello world";
       try (ArrowBuf buf = allocator.buffer(16)) {
-        buf.setBytes(0, str.getBytes());
+        buf.setBytes(0, str.getBytes(StandardCharsets.UTF_8));
         binHolder.start = 0;
         binHolder.end = str.length();
         binHolder.buffer = buf;
@@ -544,8 +643,11 @@ public void testLargeVarCharVector() {
   @Test
   public void testListVector() {
     try (final ListVector vector = ListVector.empty("v", allocator)) {
-      setVector(vector, Arrays.stream(new int[] { 1, 2 }).boxed().collect(Collectors.toList()),
-          Arrays.stream(new int[] { 3, 4 }).boxed().collect(Collectors.toList()), new ArrayList<Integer>());
+      setVector(
+          vector,
+          Arrays.stream(new int[] {1, 2}).boxed().collect(Collectors.toList()),
+          Arrays.stream(new int[] {3, 4}).boxed().collect(Collectors.toList()),
+          new ArrayList<Integer>());
       assertTrue(roundtrip(vector, ListVector.class));
     }
   }
@@ -561,8 +663,11 @@ public void testEmptyListVector() {
   @Test
   public void testLargeListVector() {
     try (final LargeListVector vector = LargeListVector.empty("v", allocator)) {
-      setVector(vector, Arrays.stream(new int[] { 1, 2 }).boxed().collect(Collectors.toList()),
-          Arrays.stream(new int[] { 3, 4 }).boxed().collect(Collectors.toList()), new ArrayList<Integer>());
+      setVector(
+          vector,
+          Arrays.stream(new int[] {1, 2}).boxed().collect(Collectors.toList()),
+          Arrays.stream(new int[] {3, 4}).boxed().collect(Collectors.toList()),
+          new ArrayList<Integer>());
       assertTrue(roundtrip(vector, LargeListVector.class));
     }
   }
@@ -570,8 +675,10 @@ public void testLargeListVector() {
   @Test
   public void testFixedSizeListVector() {
     try (final FixedSizeListVector vector = FixedSizeListVector.empty("v", 2, allocator)) {
-      setVector(vector, Arrays.stream(new int[] { 1, 2 }).boxed().collect(Collectors.toList()),
-          Arrays.stream(new int[] { 3, 4 }).boxed().collect(Collectors.toList()));
+      setVector(
+          vector,
+          Arrays.stream(new int[] {1, 2}).boxed().collect(Collectors.toList()),
+          Arrays.stream(new int[] {3, 4}).boxed().collect(Collectors.toList()));
       assertTrue(roundtrip(vector, FixedSizeListVector.class));
     }
   }
@@ -622,8 +729,8 @@ public void testUnionVector() {
   public void testStructVector() {
     try (final StructVector vector = StructVector.empty("v", allocator)) {
       Map<String, List<Integer>> data = new HashMap<>();
-      data.put("col_1", Arrays.stream(new int[] { 1, 2 }).boxed().collect(Collectors.toList()));
-      data.put("col_2", Arrays.stream(new int[] { 3, 4 }).boxed().collect(Collectors.toList()));
+      data.put("col_1", Arrays.stream(new int[] {1, 2}).boxed().collect(Collectors.toList()));
+      data.put("col_2", Arrays.stream(new int[] {3, 4}).boxed().collect(Collectors.toList()));
       setVector(vector, data);
       assertTrue(roundtrip(vector, StructVector.class));
     }
@@ -632,7 +739,8 @@ public void testStructVector() {
   @Test
   public void testExtensionTypeVector() {
     ExtensionTypeRegistry.register(new UuidType());
-    final Schema schema = new Schema(Collections.singletonList(Field.nullable("a", new UuidType())));
+    final Schema schema =
+        new Schema(Collections.singletonList(Field.nullable("a", new UuidType())));
     try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       // Fill with data
       UUID u1 = UUID.randomUUID();
@@ -651,8 +759,12 @@ public void testExtensionTypeVector() {
 
       final Field field = importedRoot.getSchema().getFields().get(0);
       final UuidType expectedType = new UuidType();
-      assertEquals(field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_NAME), expectedType.extensionName());
-      assertEquals(field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_METADATA), expectedType.serialize());
+      assertEquals(
+          field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_NAME),
+          expectedType.extensionName());
+      assertEquals(
+          field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_METADATA),
+          expectedType.serialize());
 
       final UuidVector deserialized = (UuidVector) importedRoot.getFieldVectors().get(0);
       assertEquals(vector.getValueCount(), deserialized.getValueCount());
@@ -683,7 +795,8 @@ public void testVectorSchemaRoot() {
         }
       }
       // Consumer imports vector
-      imported = Data.importVectorSchemaRoot(allocator, consumerArrowArray, consumerArrowSchema, null);
+      imported =
+          Data.importVectorSchemaRoot(allocator, consumerArrowArray, consumerArrowSchema, null);
     }
 
     // Ensure that imported VectorSchemaRoot is valid even after C Data Interface
@@ -695,7 +808,8 @@ public void testVectorSchemaRoot() {
   }
 
   /**
-   * Tests exporting Table and importing back to VSR. Importing back to Table is not supported at present.
+   * Tests exporting Table and importing back to VSR. Importing back to Table is not supported at
+   * present.
    */
   @Test
   public void testTable() {
@@ -704,8 +818,7 @@ public void testTable() {
     // Consumer allocates empty structures
     try (ArrowSchema consumerArrowSchema = ArrowSchema.allocateNew(allocator);
         ArrowArray consumerArrowArray = ArrowArray.allocateNew(allocator)) {
-      try (
-          VectorSchemaRoot vsr = createTestVSR();
+      try (VectorSchemaRoot vsr = createTestVSR();
           Table table = new Table(vsr)) {
         // Producer creates structures from existing memory pointers
         try (ArrowSchema arrowSchema = ArrowSchema.wrap(consumerArrowSchema.memoryAddress());
@@ -715,7 +828,8 @@ public void testTable() {
         }
       }
       // Consumer imports vector
-      imported = Data.importVectorSchemaRoot(allocator, consumerArrowArray, consumerArrowSchema, null);
+      imported =
+          Data.importVectorSchemaRoot(allocator, consumerArrowArray, consumerArrowSchema, null);
     }
 
     // Ensure that imported VectorSchemaRoot is valid even after C Data Interface
@@ -737,10 +851,11 @@ public void testVectorSchemaRootWithDuplicatedFieldNames() {
       try (VectorSchemaRoot testVSR1 = createTestVSR();
           VectorSchemaRoot testVSR2 = createTestVSR()) {
         // Merge two VSRs to produce duplicated field names
-        final VectorSchemaRoot vsr = new VectorSchemaRoot(
-            Stream.concat(
-                testVSR1.getFieldVectors().stream(),
-                testVSR2.getFieldVectors().stream()).collect(Collectors.toList()));
+        final VectorSchemaRoot vsr =
+            new VectorSchemaRoot(
+                Stream.concat(
+                        testVSR1.getFieldVectors().stream(), testVSR2.getFieldVectors().stream())
+                    .collect(Collectors.toList()));
         // Producer creates structures from existing memory pointers
         try (ArrowSchema arrowSchema = ArrowSchema.wrap(consumerArrowSchema.memoryAddress());
             ArrowArray arrowArray = ArrowArray.wrap(consumerArrowArray.memoryAddress())) {
@@ -749,17 +864,19 @@ public void testVectorSchemaRootWithDuplicatedFieldNames() {
         }
       }
       // Consumer imports vector
-      imported = Data.importVectorSchemaRoot(allocator, consumerArrowArray, consumerArrowSchema, null);
+      imported =
+          Data.importVectorSchemaRoot(allocator, consumerArrowArray, consumerArrowSchema, null);
     }
 
     // Ensure that imported VectorSchemaRoot is valid even after C Data Interface
     // structures are closed
     try (VectorSchemaRoot testVSR1 = createTestVSR();
         VectorSchemaRoot testVSR2 = createTestVSR()) {
-      final VectorSchemaRoot original = new VectorSchemaRoot(
-          Stream.concat(
-              testVSR1.getFieldVectors().stream(),
-              testVSR2.getFieldVectors().stream()).collect(Collectors.toList()));
+      final VectorSchemaRoot original =
+          new VectorSchemaRoot(
+              Stream.concat(
+                      testVSR1.getFieldVectors().stream(), testVSR2.getFieldVectors().stream())
+                  .collect(Collectors.toList()));
       assertTrue(imported.equals(original));
     }
     imported.close();
@@ -767,10 +884,14 @@ public void testVectorSchemaRootWithDuplicatedFieldNames() {
 
   @Test
   public void testSchema() {
-    Field decimalField = new Field("inner1", FieldType.nullable(new ArrowType.Decimal(19, 4, 128)), null);
+    Field decimalField =
+        new Field("inner1", FieldType.nullable(new ArrowType.Decimal(19, 4, 128)), null);
     Field strField = new Field("inner2", FieldType.nullable(new ArrowType.Utf8()), null);
-    Field itemField = new Field("col1", FieldType.nullable(new ArrowType.Struct()),
-        Arrays.asList(decimalField, strField));
+    Field itemField =
+        new Field(
+            "col1",
+            FieldType.nullable(new ArrowType.Struct()),
+            Arrays.asList(decimalField, strField));
     Field intField = new Field("col2", FieldType.nullable(new ArrowType.Int(32, true)), null);
     Schema schema = new Schema(Arrays.asList(itemField, intField));
     // Consumer allocates empty ArrowSchema
@@ -819,9 +940,12 @@ public void testImportReleasedArray() {
       consumerArrowArray.markReleased();
 
       // Consumer tried to imports vector but fails
-      Exception e = assertThrows(IllegalStateException.class, () -> {
-        Data.importVector(allocator, consumerArrowArray, consumerArrowSchema, null);
-      });
+      Exception e =
+          assertThrows(
+              IllegalStateException.class,
+              () -> {
+                Data.importVector(allocator, consumerArrowArray, consumerArrowSchema, null);
+              });
 
       assertEquals("Cannot import released ArrowArray", e.getMessage());
     }
@@ -870,7 +994,8 @@ public boolean extensionEquals(ExtensionType other) {
     @Override
     public ArrowType deserialize(ArrowType storageType, String serializedData) {
       if (!storageType.equals(storageType())) {
-        throw new UnsupportedOperationException("Cannot construct UuidType from underlying type " + storageType);
+        throw new UnsupportedOperationException(
+            "Cannot construct UuidType from underlying type " + storageType);
       }
       return new UuidType();
     }
@@ -888,7 +1013,8 @@ public FieldVector getNewVector(String name, FieldType fieldType, BufferAllocato
 
   static class UuidVector extends ExtensionTypeVector<FixedSizeBinaryVector> {
 
-    public UuidVector(String name, BufferAllocator allocator, FixedSizeBinaryVector underlyingVector) {
+    public UuidVector(
+        String name, BufferAllocator allocator, FixedSizeBinaryVector underlyingVector) {
       super(name, allocator, underlyingVector);
     }
 
diff --git a/java/c/src/test/java/org/apache/arrow/c/StreamTest.java b/java/c/src/test/java/org/apache/arrow/c/StreamTest.java
index 68d4fc2a81e68..95363fcc3287f 100644
--- a/java/c/src/test/java/org/apache/arrow/c/StreamTest.java
+++ b/java/c/src/test/java/org/apache/arrow/c/StreamTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.c;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -30,7 +29,6 @@
 import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.util.AutoCloseables;
@@ -40,6 +38,8 @@
 import org.apache.arrow.vector.VectorLoader;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.VectorUnloader;
+import org.apache.arrow.vector.ViewVarBinaryVector;
+import org.apache.arrow.vector.ViewVarCharVector;
 import org.apache.arrow.vector.compare.Range;
 import org.apache.arrow.vector.compare.RangeEqualsVisitor;
 import org.apache.arrow.vector.dictionary.Dictionary;
@@ -70,7 +70,8 @@ public void tearDown() {
 
   @Test
   public void testRoundtripInts() throws Exception {
-    final Schema schema = new Schema(Collections.singletonList(Field.nullable("ints", new ArrowType.Int(32, true))));
+    final Schema schema =
+        new Schema(Collections.singletonList(Field.nullable("ints", new ArrowType.Int(32, true))));
     final List<ArrowRecordBatch> batches = new ArrayList<>();
     try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       final IntVector ints = (IntVector) root.getVector(0);
@@ -97,8 +98,11 @@ public void testRoundtripInts() throws Exception {
 
   @Test
   public void roundtripStrings() throws Exception {
-    final Schema schema = new Schema(Arrays.asList(Field.nullable("ints", new ArrowType.Int(32, true)),
-        Field.nullable("strs", new ArrowType.Utf8())));
+    final Schema schema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("ints", new ArrowType.Int(32, true)),
+                Field.nullable("strs", new ArrowType.Utf8())));
     final List<ArrowRecordBatch> batches = new ArrayList<>();
     try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       final IntVector ints = (IntVector) root.getVector(0);
@@ -132,15 +136,104 @@ public void roundtripStrings() throws Exception {
     }
   }
 
+  @Test
+  public void roundtripStringViews() throws Exception {
+    final Schema schema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("ints", new ArrowType.Int(32, true)),
+                Field.nullable("string_views", new ArrowType.Utf8View())));
+    final List<ArrowRecordBatch> batches = new ArrayList<>();
+    try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+      final IntVector ints = (IntVector) root.getVector(0);
+      final ViewVarCharVector strs = (ViewVarCharVector) root.getVector(1);
+      VectorUnloader unloader = new VectorUnloader(root);
+
+      root.allocateNew();
+      ints.setSafe(0, 1);
+      ints.setSafe(1, 2);
+      ints.setSafe(2, 4);
+      ints.setSafe(3, 8);
+      strs.setSafe(0, "".getBytes(StandardCharsets.UTF_8));
+      strs.setSafe(1, "a".getBytes(StandardCharsets.UTF_8));
+      strs.setSafe(2, "bc1234567890bc".getBytes(StandardCharsets.UTF_8));
+      strs.setSafe(3, "defg1234567890defg".getBytes(StandardCharsets.UTF_8));
+      root.setRowCount(4);
+      batches.add(unloader.getRecordBatch());
+
+      root.allocateNew();
+      ints.setSafe(0, 1);
+      ints.setNull(1);
+      ints.setSafe(2, 4);
+      ints.setNull(3);
+      strs.setSafe(0, "".getBytes(StandardCharsets.UTF_8));
+      strs.setNull(1);
+      strs.setSafe(2, "bc1234567890bc".getBytes(StandardCharsets.UTF_8));
+      strs.setNull(3);
+      root.setRowCount(4);
+      batches.add(unloader.getRecordBatch());
+      roundtrip(schema, batches);
+    }
+  }
+
+  @Test
+  public void roundtripBinaryViews() throws Exception {
+    final Schema schema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("ints", new ArrowType.Int(32, true)),
+                Field.nullable("binary_views", new ArrowType.BinaryView())));
+    final List<ArrowRecordBatch> batches = new ArrayList<>();
+    try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+      final IntVector ints = (IntVector) root.getVector(0);
+      final ViewVarBinaryVector strs = (ViewVarBinaryVector) root.getVector(1);
+      VectorUnloader unloader = new VectorUnloader(root);
+
+      root.allocateNew();
+      ints.setSafe(0, 1);
+      ints.setSafe(1, 2);
+      ints.setSafe(2, 4);
+      ints.setSafe(3, 8);
+      strs.setSafe(0, new byte[0]);
+      strs.setSafe(1, new byte[] {97});
+      strs.setSafe(2, new byte[] {98, 99, 49, 50, 51, 52, 53, 54, 55, 56, 57, 48, 98, 99});
+      strs.setSafe(
+          3,
+          new byte[] {
+            100, 101, 102, 103, 49, 50, 51, 52, 53, 54, 55, 56, 57, 48, 100, 101, 102, 103
+          });
+      root.setRowCount(4);
+      batches.add(unloader.getRecordBatch());
+
+      root.allocateNew();
+      ints.setSafe(0, 1);
+      ints.setNull(1);
+      ints.setSafe(2, 4);
+      ints.setNull(3);
+      strs.setSafe(0, new byte[0]);
+      strs.setNull(1);
+      strs.setSafe(2, new byte[] {98, 99, 49, 50, 51, 52, 53, 54, 55, 56, 57, 48, 98, 99});
+      strs.setNull(3);
+      root.setRowCount(4);
+      batches.add(unloader.getRecordBatch());
+      roundtrip(schema, batches);
+    }
+  }
+
   @Test
   public void roundtripDictionary() throws Exception {
     final ArrowType.Int indexType = new ArrowType.Int(32, true);
     final DictionaryEncoding encoding = new DictionaryEncoding(0L, false, indexType);
-    final Schema schema = new Schema(Collections.singletonList(
-        new Field("dict", new FieldType(/*nullable=*/true, indexType, encoding), Collections.emptyList())));
+    final Schema schema =
+        new Schema(
+            Collections.singletonList(
+                new Field(
+                    "dict",
+                    new FieldType(/*nullable=*/ true, indexType, encoding),
+                    Collections.emptyList())));
     final List<ArrowRecordBatch> batches = new ArrayList<>();
     try (final CDataDictionaryProvider provider = new CDataDictionaryProvider();
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       final VarCharVector dictionary = new VarCharVector("values", allocator);
       dictionary.allocateNew();
       dictionary.setSafe(0, "foo".getBytes(StandardCharsets.UTF_8));
@@ -173,22 +266,27 @@ public void roundtripDictionary() throws Exception {
   @Test
   public void importReleasedStream() {
     try (final ArrowArrayStream stream = ArrowArrayStream.allocateNew(allocator)) {
-      Exception e = assertThrows(IllegalStateException.class, () -> Data.importArrayStream(allocator, stream));
+      Exception e =
+          assertThrows(
+              IllegalStateException.class, () -> Data.importArrayStream(allocator, stream));
       assertThat(e).hasMessageContaining("Cannot import released ArrowArrayStream");
     }
   }
 
   @Test
   public void getNextError() throws Exception {
-    final Schema schema = new Schema(Collections.singletonList(Field.nullable("ints", new ArrowType.Int(32, true))));
+    final Schema schema =
+        new Schema(Collections.singletonList(Field.nullable("ints", new ArrowType.Int(32, true))));
     final List<ArrowRecordBatch> batches = new ArrayList<>();
-    try (final ArrowReader source = new InMemoryArrowReader(allocator, schema, batches,
-        new DictionaryProvider.MapDictionaryProvider()) {
-      @Override
-      public boolean loadNextBatch() throws IOException {
-        throw new IOException("Failed to load batch!");
-      }
-    }; final ArrowArrayStream stream = ArrowArrayStream.allocateNew(allocator)) {
+    try (final ArrowReader source =
+            new InMemoryArrowReader(
+                allocator, schema, batches, new DictionaryProvider.MapDictionaryProvider()) {
+              @Override
+              public boolean loadNextBatch() throws IOException {
+                throw new IOException("Failed to load batch!");
+              }
+            };
+        final ArrowArrayStream stream = ArrowArrayStream.allocateNew(allocator)) {
       Data.exportArrayStream(allocator, source, stream);
       try (final ArrowReader reader = Data.importArrayStream(allocator, stream)) {
         assertThat(reader.getVectorSchemaRoot().getSchema()).isEqualTo(schema);
@@ -201,15 +299,18 @@ public boolean loadNextBatch() throws IOException {
 
   @Test
   public void getSchemaError() throws Exception {
-    final Schema schema = new Schema(Collections.singletonList(Field.nullable("ints", new ArrowType.Int(32, true))));
+    final Schema schema =
+        new Schema(Collections.singletonList(Field.nullable("ints", new ArrowType.Int(32, true))));
     final List<ArrowRecordBatch> batches = new ArrayList<>();
-    try (final ArrowReader source = new InMemoryArrowReader(allocator, schema, batches,
-        new DictionaryProvider.MapDictionaryProvider()) {
-      @Override
-      protected Schema readSchema() {
-        throw new IllegalArgumentException("Failed to read schema!");
-      }
-    }; final ArrowArrayStream stream = ArrowArrayStream.allocateNew(allocator)) {
+    try (final ArrowReader source =
+            new InMemoryArrowReader(
+                allocator, schema, batches, new DictionaryProvider.MapDictionaryProvider()) {
+              @Override
+              protected Schema readSchema() {
+                throw new IllegalArgumentException("Failed to read schema!");
+              }
+            };
+        final ArrowArrayStream stream = ArrowArrayStream.allocateNew(allocator)) {
       Data.exportArrayStream(allocator, source, stream);
       try (final ArrowReader reader = Data.importArrayStream(allocator, stream)) {
         final IOException e = assertThrows(IOException.class, reader::getVectorSchemaRoot);
@@ -219,11 +320,12 @@ protected Schema readSchema() {
     }
   }
 
-  void roundtrip(Schema schema, List<ArrowRecordBatch> batches, DictionaryProvider provider) throws Exception {
+  void roundtrip(Schema schema, List<ArrowRecordBatch> batches, DictionaryProvider provider)
+      throws Exception {
     ArrowReader source = new InMemoryArrowReader(allocator, schema, batches, provider);
 
     try (final ArrowArrayStream stream = ArrowArrayStream.allocateNew(allocator);
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       final VectorLoader loader = new VectorLoader(root);
       Data.exportArrayStream(allocator, source, stream);
 
@@ -260,24 +362,24 @@ void roundtrip(Schema schema, List<ArrowRecordBatch> batches) throws Exception {
   private static void assertVectorsEqual(FieldVector expected, FieldVector actual) {
     assertThat(actual.getField().getType()).isEqualTo(expected.getField().getType());
     assertThat(actual.getValueCount()).isEqualTo(expected.getValueCount());
-    final Range range = new Range(/*leftStart=*/0, /*rightStart=*/0, expected.getValueCount());
-    assertThat(new RangeEqualsVisitor(expected, actual)
-        .rangeEquals(range))
+    final Range range = new Range(/*leftStart=*/ 0, /*rightStart=*/ 0, expected.getValueCount());
+    assertThat(new RangeEqualsVisitor(expected, actual).rangeEquals(range))
         .as("Vectors were not equal.\nExpected: %s\nGot: %s", expected, actual)
         .isTrue();
   }
 
-  /**
-   * An ArrowReader backed by a fixed list of batches.
-   */
+  /** An ArrowReader backed by a fixed list of batches. */
   static class InMemoryArrowReader extends ArrowReader {
     private final Schema schema;
     private final List<ArrowRecordBatch> batches;
     private final DictionaryProvider provider;
     private int nextBatch;
 
-    InMemoryArrowReader(BufferAllocator allocator, Schema schema, List<ArrowRecordBatch> batches,
-                        DictionaryProvider provider) {
+    InMemoryArrowReader(
+        BufferAllocator allocator,
+        Schema schema,
+        List<ArrowRecordBatch> batches,
+        DictionaryProvider provider) {
       super(allocator);
       this.schema = schema;
       this.batches = batches;
@@ -297,7 +399,8 @@ public Set<Long> getDictionaryIds() {
 
     @Override
     public Map<Long, Dictionary> getDictionaryVectors() {
-      return getDictionaryIds().stream().collect(Collectors.toMap(Function.identity(), this::lookup));
+      return getDictionaryIds().stream()
+          .collect(Collectors.toMap(Function.identity(), this::lookup));
     }
 
     @Override
diff --git a/java/c/src/test/python/integration_tests.py b/java/c/src/test/python/integration_tests.py
index eb8bb8c4b22df..ab2ee1742f366 100644
--- a/java/c/src/test/python/integration_tests.py
+++ b/java/c/src/test/python/integration_tests.py
@@ -51,6 +51,13 @@ def setup_jvm():
     kwargs = {}
     # This will be the default behaviour in jpype 0.8+
     kwargs['convertStrings'] = False
+
+    # For debugging purpose please uncomment the following, and include *jvm_args, before **kwargs
+    # in startJVM function call
+    # jvm_args = [
+    #     "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005"
+    # ]
+
     jpype.startJVM(jpype.getDefaultJVMPath(), "-Djava.class.path=" + jar_path, **kwargs)
 
 
@@ -183,6 +190,55 @@ def round_trip_reader(self, schema, batches):
     def test_string_array(self):
         self.round_trip_array(lambda: pa.array([None, "a", "bb", "ccc"]))
 
+    def test_stringview_array(self):
+        # with nulls short strings
+        self.round_trip_array(lambda: pa.array([None, "a", "bb", "c"], type=pa.string_view()))
+        # with nulls long and strings
+        self.round_trip_array(lambda: pa.array([None, "a", "bb"*10, "c"*13], type=pa.string_view()))
+        # without nulls short strings
+        self.round_trip_array(lambda: pa.array(["a", "bb", "c"], type=pa.string_view()))
+        # without nulls long and strings
+        self.round_trip_array(lambda: pa.array(["a", "bb"*10, "c"*13], type=pa.string_view()))
+        # with multiple data buffers
+        arr1 = pa.array(["a", "bb", "c"], type=pa.string_view())
+        arr2 = pa.array(["b", "ee" * 10, "f" * 20], type=pa.string_view())
+        arr3 = pa.array(["c", "abc" * 20, "efg" * 30], type=pa.string_view())
+        arr4 = pa.array(["d", "abcd" * 100, "efgh" * 200], type=pa.string_view())
+        self.round_trip_array(lambda: pa.concat_arrays([arr1, arr2, arr3, arr4]))
+        # empty strings
+        self.round_trip_array(lambda: pa.array(["", "bb" * 10, "c", "", "d", ""], type=pa.string_view()))
+        # null value variations
+        self.round_trip_array(lambda: pa.array(["bb" * 10, None, "", "d", None], type=pa.string_view()))
+        # empty array
+        self.round_trip_array(lambda: pa.array([], type=pa.string_view()))
+        # all null array
+        self.round_trip_array(lambda: pa.array([None, None, None], type=pa.string_view()))
+
+    def test_binaryview_array(self):
+        # with nulls short binary values
+        self.round_trip_array(lambda: pa.array([None, bytes([97]), bytes([98, 98]), bytes([99])], type=pa.binary_view()))
+        # with nulls long binary values
+        self.round_trip_array(lambda: pa.array([None, bytes([97]), bytes([98, 98] * 10), bytes([99] * 13)], type=pa.binary_view()))
+        # without nulls short binary values
+        self.round_trip_array(lambda: pa.array([bytes([97]), bytes([98, 98]), bytes([99])], type=pa.binary_view()))
+        # without nulls long binary values
+        self.round_trip_array(lambda: pa.array([bytes([97]), bytes([98, 98] * 10), bytes([99] * 13)], type=pa.binary_view()))
+        # with multiple data buffers
+        arr1 = pa.array([bytes([97]), bytes([98, 98]), bytes([99])], type=pa.binary_view())
+        arr2 = pa.array([bytes([98]), bytes([98, 98] * 10), bytes([99] * 13)], type=pa.binary_view())
+        arr3 = pa.array([bytes([99]), bytes([98, 100] * 100), bytes([99, 100]) * 30], type=pa.binary_view())
+        arr4 = pa.array([bytes([100]), bytes([98, 100, 101] * 200), bytes([98, 99]) * 300], type=pa.binary_view())
+        self.round_trip_array(lambda: pa.concat_arrays([arr1, arr2, arr3, arr4]))
+        # empty binary values
+        self.round_trip_array(lambda: pa.array([bytes([]), bytes([97, 97]) * 10, bytes([98]), bytes([]), bytes([97]), bytes([])],
+                                               type=pa.binary_view()))
+        # null value variations
+        self.round_trip_array(lambda: pa.array([bytes([97, 97]) * 10, None, bytes([]), bytes([99]), None], type=pa.binary_view()))
+        # empty array
+        self.round_trip_array(lambda: pa.array([], type=pa.binary_view()))
+        # all null array
+        self.round_trip_array(lambda: pa.array([None, None, None], type=pa.binary_view()))
+
     def test_decimal_array(self):
         data = [
             round(decimal.Decimal(722.82), 2),
diff --git a/java/compression/pom.xml b/java/compression/pom.xml
index 0db3fae4653a6..561877bd5cd36 100644
--- a/java/compression/pom.xml
+++ b/java/compression/pom.xml
@@ -1,20 +1,28 @@
-<?xml version="1.0"?>
-<!-- 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. -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.arrow</groupId>
     <artifactId>arrow-java-root</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>17.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>arrow-compression</artifactId>
   <name>Arrow Compression</name>
@@ -37,17 +45,17 @@
     </dependency>
     <dependency>
       <groupId>org.immutables</groupId>
-      <artifactId>value</artifactId>
+      <artifactId>value-annotations</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
-      <version>1.26.0</version>
+      <version>1.26.2</version>
     </dependency>
     <dependency>
       <groupId>com.github.luben</groupId>
       <artifactId>zstd-jni</artifactId>
-      <version>1.5.5-11</version>
+      <version>1.5.6-3</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/java/compression/src/main/java/org/apache/arrow/compression/CommonsCompressionFactory.java b/java/compression/src/main/java/org/apache/arrow/compression/CommonsCompressionFactory.java
index 45d8c7d443252..f15c139df1d0c 100644
--- a/java/compression/src/main/java/org/apache/arrow/compression/CommonsCompressionFactory.java
+++ b/java/compression/src/main/java/org/apache/arrow/compression/CommonsCompressionFactory.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.compression;
 
 import org.apache.arrow.vector.compression.CompressionCodec;
@@ -23,7 +22,7 @@
 /**
  * Default implementation of factory supported LZ4 and ZSTD compression.
  *
- * // TODO(ARROW-12115): Rename this class.
+ * <p>// TODO(ARROW-12115): Rename this class.
  */
 public class CommonsCompressionFactory implements CompressionCodec.Factory {
 
diff --git a/java/compression/src/main/java/org/apache/arrow/compression/Lz4CompressionCodec.java b/java/compression/src/main/java/org/apache/arrow/compression/Lz4CompressionCodec.java
index e8b780638e2c1..edd52604bc757 100644
--- a/java/compression/src/main/java/org/apache/arrow/compression/Lz4CompressionCodec.java
+++ b/java/compression/src/main/java/org/apache/arrow/compression/Lz4CompressionCodec.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.compression;
 
 import java.io.ByteArrayInputStream;
@@ -22,7 +21,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.Preconditions;
@@ -32,21 +30,21 @@
 import org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorOutputStream;
 import org.apache.commons.compress.utils.IOUtils;
 
-/**
- * Compression codec for the LZ4 algorithm.
- */
+/** Compression codec for the LZ4 algorithm. */
 public class Lz4CompressionCodec extends AbstractCompressionCodec {
 
   @Override
   protected ArrowBuf doCompress(BufferAllocator allocator, ArrowBuf uncompressedBuffer) {
-    Preconditions.checkArgument(uncompressedBuffer.writerIndex() <= Integer.MAX_VALUE,
-        "The uncompressed buffer size exceeds the integer limit %s.", Integer.MAX_VALUE);
+    Preconditions.checkArgument(
+        uncompressedBuffer.writerIndex() <= Integer.MAX_VALUE,
+        "The uncompressed buffer size exceeds the integer limit %s.",
+        Integer.MAX_VALUE);
 
     byte[] inBytes = new byte[(int) uncompressedBuffer.writerIndex()];
-    uncompressedBuffer.getBytes(/*index=*/0, inBytes);
+    uncompressedBuffer.getBytes(/*index=*/ 0, inBytes);
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     try (InputStream in = new ByteArrayInputStream(inBytes);
-         OutputStream out = new FramedLZ4CompressorOutputStream(baos)) {
+        OutputStream out = new FramedLZ4CompressorOutputStream(baos)) {
       IOUtils.copy(in, out);
     } catch (IOException e) {
       throw new RuntimeException(e);
@@ -54,7 +52,8 @@ protected ArrowBuf doCompress(BufferAllocator allocator, ArrowBuf uncompressedBu
 
     byte[] outBytes = baos.toByteArray();
 
-    ArrowBuf compressedBuffer = allocator.buffer(CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH + outBytes.length);
+    ArrowBuf compressedBuffer =
+        allocator.buffer(CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH + outBytes.length);
     compressedBuffer.setBytes(CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH, outBytes);
     compressedBuffer.writerIndex(CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH + outBytes.length);
     return compressedBuffer;
@@ -62,12 +61,16 @@ protected ArrowBuf doCompress(BufferAllocator allocator, ArrowBuf uncompressedBu
 
   @Override
   protected ArrowBuf doDecompress(BufferAllocator allocator, ArrowBuf compressedBuffer) {
-    Preconditions.checkArgument(compressedBuffer.writerIndex() <= Integer.MAX_VALUE,
-        "The compressed buffer size exceeds the integer limit %s", Integer.MAX_VALUE);
+    Preconditions.checkArgument(
+        compressedBuffer.writerIndex() <= Integer.MAX_VALUE,
+        "The compressed buffer size exceeds the integer limit %s",
+        Integer.MAX_VALUE);
 
     long decompressedLength = readUncompressedLength(compressedBuffer);
 
-    byte[] inBytes = new byte[(int) (compressedBuffer.writerIndex() - CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH)];
+    byte[] inBytes =
+        new byte
+            [(int) (compressedBuffer.writerIndex() - CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH)];
     compressedBuffer.getBytes(CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH, inBytes);
     ByteArrayOutputStream out = new ByteArrayOutputStream((int) decompressedLength);
     try (InputStream in = new FramedLZ4CompressorInputStream(new ByteArrayInputStream(inBytes))) {
@@ -78,7 +81,7 @@ protected ArrowBuf doDecompress(BufferAllocator allocator, ArrowBuf compressedBu
 
     byte[] outBytes = out.toByteArray();
     ArrowBuf decompressedBuffer = allocator.buffer(outBytes.length);
-    decompressedBuffer.setBytes(/*index=*/0, outBytes);
+    decompressedBuffer.setBytes(/*index=*/ 0, outBytes);
     decompressedBuffer.writerIndex(decompressedLength);
     return decompressedBuffer;
   }
diff --git a/java/compression/src/main/java/org/apache/arrow/compression/ZstdCompressionCodec.java b/java/compression/src/main/java/org/apache/arrow/compression/ZstdCompressionCodec.java
index c26519055b1fe..6e48aae71fcfe 100644
--- a/java/compression/src/main/java/org/apache/arrow/compression/ZstdCompressionCodec.java
+++ b/java/compression/src/main/java/org/apache/arrow/compression/ZstdCompressionCodec.java
@@ -14,20 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.compression;
 
-
+import com.github.luben.zstd.Zstd;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.compression.AbstractCompressionCodec;
 import org.apache.arrow.vector.compression.CompressionUtil;
 
-import com.github.luben.zstd.Zstd;
-
-/**
- * Compression codec for the ZSTD algorithm.
- */
+/** Compression codec for the ZSTD algorithm. */
 public class ZstdCompressionCodec extends AbstractCompressionCodec {
 
   private int compressionLevel;
@@ -46,10 +41,13 @@ protected ArrowBuf doCompress(BufferAllocator allocator, ArrowBuf uncompressedBu
     long maxSize = Zstd.compressBound(uncompressedBuffer.writerIndex());
     long dstSize = CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH + maxSize;
     ArrowBuf compressedBuffer = allocator.buffer(dstSize);
-    long bytesWritten = Zstd.compressUnsafe(
-                          compressedBuffer.memoryAddress() + CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH, dstSize,
-                          /*src*/uncompressedBuffer.memoryAddress(), /*srcSize=*/uncompressedBuffer.writerIndex(),
-                          /*level=*/this.compressionLevel);
+    long bytesWritten =
+        Zstd.compressUnsafe(
+            compressedBuffer.memoryAddress() + CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH,
+            dstSize,
+            /*src*/ uncompressedBuffer.memoryAddress(),
+            /*srcSize=*/ uncompressedBuffer.writerIndex(),
+            /*level=*/ this.compressionLevel);
     if (Zstd.isError(bytesWritten)) {
       compressedBuffer.close();
       throw new RuntimeException("Error compressing: " + Zstd.getErrorName(bytesWritten));
@@ -62,17 +60,23 @@ protected ArrowBuf doCompress(BufferAllocator allocator, ArrowBuf uncompressedBu
   protected ArrowBuf doDecompress(BufferAllocator allocator, ArrowBuf compressedBuffer) {
     long decompressedLength = readUncompressedLength(compressedBuffer);
     ArrowBuf uncompressedBuffer = allocator.buffer(decompressedLength);
-    long decompressedSize = Zstd.decompressUnsafe(uncompressedBuffer.memoryAddress(), decompressedLength,
-          /*src=*/compressedBuffer.memoryAddress() + CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH,
-          compressedBuffer.writerIndex() - CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH);
+    long decompressedSize =
+        Zstd.decompressUnsafe(
+            uncompressedBuffer.memoryAddress(),
+            decompressedLength,
+            /*src=*/ compressedBuffer.memoryAddress() + CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH,
+            compressedBuffer.writerIndex() - CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH);
     if (Zstd.isError(decompressedSize)) {
       uncompressedBuffer.close();
       throw new RuntimeException("Error decompressing: " + Zstd.getErrorName(decompressedLength));
     }
     if (decompressedLength != decompressedSize) {
       uncompressedBuffer.close();
-      throw new RuntimeException("Expected != actual decompressed length: " + 
-                                 decompressedLength + " != " + decompressedSize);
+      throw new RuntimeException(
+          "Expected != actual decompressed length: "
+              + decompressedLength
+              + " != "
+              + decompressedSize);
     }
     uncompressedBuffer.writerIndex(decompressedLength);
     return uncompressedBuffer;
diff --git a/java/compression/src/test/java/org/apache/arrow/compression/TestArrowReaderWriterWithCompression.java b/java/compression/src/test/java/org/apache/arrow/compression/TestArrowReaderWriterWithCompression.java
index af28333746290..d7318e306c37d 100644
--- a/java/compression/src/test/java/org/apache/arrow/compression/TestArrowReaderWriterWithCompression.java
+++ b/java/compression/src/test/java/org/apache/arrow/compression/TestArrowReaderWriterWithCompression.java
@@ -14,9 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.compression;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.channels.Channels;
@@ -25,7 +29,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.GenerateSampleData;
@@ -46,9 +49,7 @@
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.arrow.vector.util.ByteArrayReadableSeekableByteChannel;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -67,7 +68,7 @@ public void setup() {
     root = null;
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     if (root != null) {
       root.close();
@@ -78,11 +79,10 @@ public void tearDown() {
     if (out != null) {
       out.reset();
     }
-
   }
 
-  private void createAndWriteArrowFile(DictionaryProvider provider,
-      CompressionUtil.CodecType codecType) throws IOException {
+  private void createAndWriteArrowFile(
+      DictionaryProvider provider, CompressionUtil.CodecType codecType) throws IOException {
     List<Field> fields = new ArrayList<>();
     fields.add(new Field("col", FieldType.notNullable(new ArrowType.Utf8()), new ArrayList<>()));
     root = VectorSchemaRoot.create(new Schema(fields), allocator);
@@ -91,16 +91,24 @@ private void createAndWriteArrowFile(DictionaryProvider provider,
     GenerateSampleData.generateTestData(root.getVector(0), rowCount);
     root.setRowCount(rowCount);
 
-    try (final ArrowFileWriter writer = new ArrowFileWriter(root, provider, Channels.newChannel(out),
-        new HashMap<>(), IpcOption.DEFAULT, CommonsCompressionFactory.INSTANCE, codecType, Optional.of(7))) {
+    try (final ArrowFileWriter writer =
+        new ArrowFileWriter(
+            root,
+            provider,
+            Channels.newChannel(out),
+            new HashMap<>(),
+            IpcOption.DEFAULT,
+            CommonsCompressionFactory.INSTANCE,
+            codecType,
+            Optional.of(7))) {
       writer.start();
       writer.writeBatch();
       writer.end();
     }
   }
 
-  private void createAndWriteArrowStream(DictionaryProvider provider,
-                                       CompressionUtil.CodecType codecType) throws IOException {
+  private void createAndWriteArrowStream(
+      DictionaryProvider provider, CompressionUtil.CodecType codecType) throws IOException {
     List<Field> fields = new ArrayList<>();
     fields.add(new Field("col", FieldType.notNullable(new ArrowType.Utf8()), new ArrayList<>()));
     root = VectorSchemaRoot.create(new Schema(fields), allocator);
@@ -109,8 +117,15 @@ private void createAndWriteArrowStream(DictionaryProvider provider,
     GenerateSampleData.generateTestData(root.getVector(0), rowCount);
     root.setRowCount(rowCount);
 
-    try (final ArrowStreamWriter writer = new ArrowStreamWriter(root, provider, Channels.newChannel(out),
-            IpcOption.DEFAULT, CommonsCompressionFactory.INSTANCE, codecType, Optional.of(7))) {
+    try (final ArrowStreamWriter writer =
+        new ArrowStreamWriter(
+            root,
+            provider,
+            Channels.newChannel(out),
+            IpcOption.DEFAULT,
+            CommonsCompressionFactory.INSTANCE,
+            codecType,
+            Optional.of(7))) {
       writer.start();
       writer.writeBatch();
       writer.end();
@@ -118,13 +133,15 @@ private void createAndWriteArrowStream(DictionaryProvider provider,
   }
 
   private Dictionary createDictionary(VarCharVector dictionaryVector) {
-    setVector(dictionaryVector,
+    setVector(
+        dictionaryVector,
         "foo".getBytes(StandardCharsets.UTF_8),
         "bar".getBytes(StandardCharsets.UTF_8),
         "baz".getBytes(StandardCharsets.UTF_8));
 
-    return new Dictionary(dictionaryVector,
-        new DictionaryEncoding(/*id=*/1L, /*ordered=*/false, /*indexType=*/null));
+    return new Dictionary(
+        dictionaryVector,
+        new DictionaryEncoding(/*id=*/ 1L, /*ordered=*/ false, /*indexType=*/ null));
   }
 
   @Test
@@ -132,22 +149,26 @@ public void testArrowFileZstdRoundTrip() throws Exception {
     createAndWriteArrowFile(null, CompressionUtil.CodecType.ZSTD);
     // with compression
     try (ArrowFileReader reader =
-        new ArrowFileReader(new ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator,
+        new ArrowFileReader(
+            new ByteArrayReadableSeekableByteChannel(out.toByteArray()),
+            allocator,
             CommonsCompressionFactory.INSTANCE)) {
-      Assertions.assertEquals(1, reader.getRecordBlocks().size());
-      Assertions.assertTrue(reader.loadNextBatch());
-      Assertions.assertTrue(root.equals(reader.getVectorSchemaRoot()));
-      Assertions.assertFalse(reader.loadNextBatch());
+      assertEquals(1, reader.getRecordBlocks().size());
+      assertTrue(reader.loadNextBatch());
+      assertTrue(root.equals(reader.getVectorSchemaRoot()));
+      assertFalse(reader.loadNextBatch());
     }
     // without compression
     try (ArrowFileReader reader =
-        new ArrowFileReader(new ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator,
+        new ArrowFileReader(
+            new ByteArrayReadableSeekableByteChannel(out.toByteArray()),
+            allocator,
             NoCompressionCodec.Factory.INSTANCE)) {
-      Assertions.assertEquals(1, reader.getRecordBlocks().size());
-      Exception exception = Assert.assertThrows(IllegalArgumentException.class,
-          reader::loadNextBatch);
-      Assertions.assertEquals("Please add arrow-compression module to use CommonsCompressionFactory for ZSTD",
-              exception.getMessage());
+      assertEquals(1, reader.getRecordBlocks().size());
+      Exception exception = assertThrows(IllegalArgumentException.class, reader::loadNextBatch);
+      assertEquals(
+          "Please add arrow-compression module to use CommonsCompressionFactory for ZSTD",
+          exception.getMessage());
     }
   }
 
@@ -156,83 +177,99 @@ public void testArrowStreamZstdRoundTrip() throws Exception {
     createAndWriteArrowStream(null, CompressionUtil.CodecType.ZSTD);
     // with compression
     try (ArrowStreamReader reader =
-                 new ArrowStreamReader(new ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator,
-                         CommonsCompressionFactory.INSTANCE)) {
-      Assert.assertTrue(reader.loadNextBatch());
-      Assert.assertTrue(root.equals(reader.getVectorSchemaRoot()));
-      Assert.assertFalse(reader.loadNextBatch());
+        new ArrowStreamReader(
+            new ByteArrayReadableSeekableByteChannel(out.toByteArray()),
+            allocator,
+            CommonsCompressionFactory.INSTANCE)) {
+      assertTrue(reader.loadNextBatch());
+      assertTrue(root.equals(reader.getVectorSchemaRoot()));
+      assertFalse(reader.loadNextBatch());
     }
     // without compression
     try (ArrowStreamReader reader =
-                 new ArrowStreamReader(new ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator,
-                         NoCompressionCodec.Factory.INSTANCE)) {
-      Exception exception = Assert.assertThrows(IllegalArgumentException.class,
-              reader::loadNextBatch);
-      Assert.assertEquals(
-              "Please add arrow-compression module to use CommonsCompressionFactory for ZSTD",
-              exception.getMessage()
-      );
+        new ArrowStreamReader(
+            new ByteArrayReadableSeekableByteChannel(out.toByteArray()),
+            allocator,
+            NoCompressionCodec.Factory.INSTANCE)) {
+      Exception exception = assertThrows(IllegalArgumentException.class, reader::loadNextBatch);
+      assertEquals(
+          "Please add arrow-compression module to use CommonsCompressionFactory for ZSTD",
+          exception.getMessage());
     }
   }
 
   @Test
   public void testArrowFileZstdRoundTripWithDictionary() throws Exception {
-    VarCharVector dictionaryVector = (VarCharVector)
-        FieldType.nullable(new ArrowType.Utf8()).createNewSingleVector("f1_file", allocator, null);
+    VarCharVector dictionaryVector =
+        (VarCharVector)
+            FieldType.nullable(new ArrowType.Utf8())
+                .createNewSingleVector("f1_file", allocator, null);
     Dictionary dictionary = createDictionary(dictionaryVector);
-    DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();
+    DictionaryProvider.MapDictionaryProvider provider =
+        new DictionaryProvider.MapDictionaryProvider();
     provider.put(dictionary);
 
     createAndWriteArrowFile(provider, CompressionUtil.CodecType.ZSTD);
 
     // with compression
     try (ArrowFileReader reader =
-        new ArrowFileReader(new ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator,
+        new ArrowFileReader(
+            new ByteArrayReadableSeekableByteChannel(out.toByteArray()),
+            allocator,
             CommonsCompressionFactory.INSTANCE)) {
-      Assertions.assertEquals(1, reader.getRecordBlocks().size());
-      Assertions.assertTrue(reader.loadNextBatch());
-      Assertions.assertTrue(root.equals(reader.getVectorSchemaRoot()));
-      Assertions.assertFalse(reader.loadNextBatch());
+      assertEquals(1, reader.getRecordBlocks().size());
+      assertTrue(reader.loadNextBatch());
+      assertTrue(root.equals(reader.getVectorSchemaRoot()));
+      assertFalse(reader.loadNextBatch());
     }
     // without compression
     try (ArrowFileReader reader =
-        new ArrowFileReader(new ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator,
+        new ArrowFileReader(
+            new ByteArrayReadableSeekableByteChannel(out.toByteArray()),
+            allocator,
             NoCompressionCodec.Factory.INSTANCE)) {
-      Assertions.assertEquals(1, reader.getRecordBlocks().size());
-      Exception exception = Assert.assertThrows(IllegalArgumentException.class,
-          reader::loadNextBatch);
-      Assertions.assertEquals("Please add arrow-compression module to use CommonsCompressionFactory for ZSTD",
-              exception.getMessage());
+      assertEquals(1, reader.getRecordBlocks().size());
+      Exception exception = assertThrows(IllegalArgumentException.class, reader::loadNextBatch);
+      assertEquals(
+          "Please add arrow-compression module to use CommonsCompressionFactory for ZSTD",
+          exception.getMessage());
     }
     dictionaryVector.close();
   }
 
   @Test
   public void testArrowStreamZstdRoundTripWithDictionary() throws Exception {
-    VarCharVector dictionaryVector = (VarCharVector)
-            FieldType.nullable(new ArrowType.Utf8()).createNewSingleVector("f1_stream", allocator, null);
+    VarCharVector dictionaryVector =
+        (VarCharVector)
+            FieldType.nullable(new ArrowType.Utf8())
+                .createNewSingleVector("f1_stream", allocator, null);
     Dictionary dictionary = createDictionary(dictionaryVector);
-    DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();
+    DictionaryProvider.MapDictionaryProvider provider =
+        new DictionaryProvider.MapDictionaryProvider();
     provider.put(dictionary);
 
     createAndWriteArrowStream(provider, CompressionUtil.CodecType.ZSTD);
 
     // with compression
     try (ArrowStreamReader reader =
-                 new ArrowStreamReader(new ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator,
-                         CommonsCompressionFactory.INSTANCE)) {
-      Assertions.assertTrue(reader.loadNextBatch());
-      Assertions.assertTrue(root.equals(reader.getVectorSchemaRoot()));
-      Assertions.assertFalse(reader.loadNextBatch());
+        new ArrowStreamReader(
+            new ByteArrayReadableSeekableByteChannel(out.toByteArray()),
+            allocator,
+            CommonsCompressionFactory.INSTANCE)) {
+      assertTrue(reader.loadNextBatch());
+      assertTrue(root.equals(reader.getVectorSchemaRoot()));
+      assertFalse(reader.loadNextBatch());
     }
     // without compression
     try (ArrowStreamReader reader =
-                 new ArrowStreamReader(new ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator,
-                         NoCompressionCodec.Factory.INSTANCE)) {
-      Exception exception = Assert.assertThrows(IllegalArgumentException.class,
-              reader::loadNextBatch);
-      Assertions.assertEquals("Please add arrow-compression module to use CommonsCompressionFactory for ZSTD",
-              exception.getMessage());
+        new ArrowStreamReader(
+            new ByteArrayReadableSeekableByteChannel(out.toByteArray()),
+            allocator,
+            NoCompressionCodec.Factory.INSTANCE)) {
+      Exception exception = assertThrows(IllegalArgumentException.class, reader::loadNextBatch);
+      assertEquals(
+          "Please add arrow-compression module to use CommonsCompressionFactory for ZSTD",
+          exception.getMessage());
     }
     dictionaryVector.close();
   }
@@ -247,5 +284,4 @@ public static void setVector(VarCharVector vector, byte[]... values) {
     }
     vector.setValueCount(length);
   }
-
 }
diff --git a/java/compression/src/test/java/org/apache/arrow/compression/TestCompressionCodec.java b/java/compression/src/test/java/org/apache/arrow/compression/TestCompressionCodec.java
index 5fff4fafd677e..b8fb4e28b9059 100644
--- a/java/compression/src/test/java/org/apache/arrow/compression/TestCompressionCodec.java
+++ b/java/compression/src/test/java/org/apache/arrow/compression/TestCompressionCodec.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.compression;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
@@ -35,7 +34,6 @@
 import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.stream.Stream;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -65,9 +63,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-/**
- * Test cases for {@link CompressionCodec}s.
- */
+/** Test cases for {@link CompressionCodec}s. */
 class TestCompressionCodec {
   private BufferAllocator allocator;
 
@@ -242,86 +238,127 @@ private static Stream<CompressionUtil.CodecType> codecTypes() {
   @ParameterizedTest
   @MethodSource("codecTypes")
   void testReadWriteStream(CompressionUtil.CodecType codec) throws Exception {
-    withRoot(codec, (factory, root) -> {
-      ByteArrayOutputStream compressedStream = new ByteArrayOutputStream();
-      try (final ArrowStreamWriter writer = new ArrowStreamWriter(
-          root, new DictionaryProvider.MapDictionaryProvider(),
-          Channels.newChannel(compressedStream),
-          IpcOption.DEFAULT, factory, codec, Optional.of(7))) {
-        writer.start();
-        writer.writeBatch();
-        writer.end();
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-
-      try (ArrowStreamReader reader = new ArrowStreamReader(
-          new ByteArrayReadableSeekableByteChannel(compressedStream.toByteArray()), allocator, factory)) {
-        assertTrue(reader.loadNextBatch());
-        assertTrue(root.equals(reader.getVectorSchemaRoot()));
-        assertFalse(reader.loadNextBatch());
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-    });
+    withRoot(
+        codec,
+        (factory, root) -> {
+          ByteArrayOutputStream compressedStream = new ByteArrayOutputStream();
+          try (final ArrowStreamWriter writer =
+              new ArrowStreamWriter(
+                  root,
+                  new DictionaryProvider.MapDictionaryProvider(),
+                  Channels.newChannel(compressedStream),
+                  IpcOption.DEFAULT,
+                  factory,
+                  codec,
+                  Optional.of(7))) {
+            writer.start();
+            writer.writeBatch();
+            writer.end();
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+
+          try (ArrowStreamReader reader =
+              new ArrowStreamReader(
+                  new ByteArrayReadableSeekableByteChannel(compressedStream.toByteArray()),
+                  allocator,
+                  factory)) {
+            assertTrue(reader.loadNextBatch());
+            assertTrue(root.equals(reader.getVectorSchemaRoot()));
+            assertFalse(reader.loadNextBatch());
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+        });
   }
 
   @ParameterizedTest
   @MethodSource("codecTypes")
   void testReadWriteFile(CompressionUtil.CodecType codec) throws Exception {
-    withRoot(codec, (factory, root) -> {
-      ByteArrayOutputStream compressedStream = new ByteArrayOutputStream();
-      try (final ArrowFileWriter writer = new ArrowFileWriter(
-          root, new DictionaryProvider.MapDictionaryProvider(),
-          Channels.newChannel(compressedStream),
-          new HashMap<>(), IpcOption.DEFAULT, factory, codec, Optional.of(7))) {
-        writer.start();
-        writer.writeBatch();
-        writer.end();
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-
-      try (ArrowFileReader reader = new ArrowFileReader(
-          new ByteArrayReadableSeekableByteChannel(compressedStream.toByteArray()), allocator, factory)) {
-        assertTrue(reader.loadNextBatch());
-        assertTrue(root.equals(reader.getVectorSchemaRoot()));
-        assertFalse(reader.loadNextBatch());
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-    });
+    withRoot(
+        codec,
+        (factory, root) -> {
+          ByteArrayOutputStream compressedStream = new ByteArrayOutputStream();
+          try (final ArrowFileWriter writer =
+              new ArrowFileWriter(
+                  root,
+                  new DictionaryProvider.MapDictionaryProvider(),
+                  Channels.newChannel(compressedStream),
+                  new HashMap<>(),
+                  IpcOption.DEFAULT,
+                  factory,
+                  codec,
+                  Optional.of(7))) {
+            writer.start();
+            writer.writeBatch();
+            writer.end();
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+
+          try (ArrowFileReader reader =
+              new ArrowFileReader(
+                  new ByteArrayReadableSeekableByteChannel(compressedStream.toByteArray()),
+                  allocator,
+                  factory)) {
+            assertTrue(reader.loadNextBatch());
+            assertTrue(root.equals(reader.getVectorSchemaRoot()));
+            assertFalse(reader.loadNextBatch());
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+        });
   }
 
   /** Unloading a vector should not free source buffers. */
   @ParameterizedTest
   @MethodSource("codecTypes")
   void testUnloadCompressed(CompressionUtil.CodecType codec) {
-    withRoot(codec, (factory, root) -> {
-      root.getFieldVectors().forEach((vector) -> {
-        Arrays.stream(vector.getBuffers(/*clear*/ false)).forEach((buf) -> {
-          assertNotEquals(0, buf.getReferenceManager().getRefCount());
-        });
-      });
-
-      final VectorUnloader unloader = new VectorUnloader(
-          root, /*includeNullCount*/ true, factory.createCodec(codec), /*alignBuffers*/ true);
-      unloader.getRecordBatch().close();
-
-      root.getFieldVectors().forEach((vector) -> {
-        Arrays.stream(vector.getBuffers(/*clear*/ false)).forEach((buf) -> {
-          assertNotEquals(0, buf.getReferenceManager().getRefCount());
+    withRoot(
+        codec,
+        (factory, root) -> {
+          root.getFieldVectors()
+              .forEach(
+                  (vector) -> {
+                    Arrays.stream(vector.getBuffers(/*clear*/ false))
+                        .forEach(
+                            (buf) -> {
+                              assertNotEquals(0, buf.getReferenceManager().getRefCount());
+                            });
+                  });
+
+          final VectorUnloader unloader =
+              new VectorUnloader(
+                  root, /*includeNullCount*/
+                  true,
+                  factory.createCodec(codec), /*alignBuffers*/
+                  true);
+          unloader.getRecordBatch().close();
+
+          root.getFieldVectors()
+              .forEach(
+                  (vector) -> {
+                    Arrays.stream(vector.getBuffers(/*clear*/ false))
+                        .forEach(
+                            (buf) -> {
+                              assertNotEquals(0, buf.getReferenceManager().getRefCount());
+                            });
+                  });
         });
-      });
-    });
   }
 
-  void withRoot(CompressionUtil.CodecType codec, BiConsumer<CompressionCodec.Factory, VectorSchemaRoot> testBody) {
-    final Schema schema = new Schema(Arrays.asList(
-        Field.nullable("ints", new ArrowType.Int(32, true)),
-        Field.nullable("strings", ArrowType.Utf8.INSTANCE)));
-    CompressionCodec.Factory factory = codec == CompressionUtil.CodecType.NO_COMPRESSION ?
-        NoCompressionCodec.Factory.INSTANCE : CommonsCompressionFactory.INSTANCE;
+  void withRoot(
+      CompressionUtil.CodecType codec,
+      BiConsumer<CompressionCodec.Factory, VectorSchemaRoot> testBody) {
+    final Schema schema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("ints", new ArrowType.Int(32, true)),
+                Field.nullable("strings", ArrowType.Utf8.INSTANCE)));
+    CompressionCodec.Factory factory =
+        codec == CompressionUtil.CodecType.NO_COMPRESSION
+            ? NoCompressionCodec.Factory.INSTANCE
+            : CommonsCompressionFactory.INSTANCE;
     try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       final IntVector ints = (IntVector) root.getVector(0);
       final VarCharVector strings = (VarCharVector) root.getVector(1);
diff --git a/java/dataset/pom.xml b/java/dataset/pom.xml
index 43b913167390f..00e812a4c6ae6 100644
--- a/java/dataset/pom.xml
+++ b/java/dataset/pom.xml
@@ -1,221 +1,225 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>arrow-java-root</artifactId>
-        <groupId>org.apache.arrow</groupId>
-        <version>16.0.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+<!--
+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
 
-    <artifactId>arrow-dataset</artifactId>
-    <name>Arrow Java Dataset</name>
-    <description>Java implementation of Arrow Dataset API/Framework</description>
-    <packaging>jar</packaging>
-    <properties>
-        <arrow.cpp.build.dir>../../../cpp/release-build/</arrow.cpp.build.dir>
-        <protobuf.version>2.5.0</protobuf.version>
-        <parquet.version>1.13.1</parquet.version>
-        <avro.version>1.11.3</avro.version>
-    </properties>
+    http://www.apache.org/licenses/LICENSE-2.0
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-vector</artifactId>
-            <scope>compile</scope>
-            <classifier>${arrow.vector.classifier}</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-memory-core</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-c-data</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.immutables</groupId>
-            <artifactId>value</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-memory-netty</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.parquet</groupId>
-            <artifactId>parquet-avro</artifactId>
-            <version>${parquet.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.avro</groupId>
-            <artifactId>avro</artifactId>
-            <version>${avro.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.parquet</groupId>
-            <artifactId>parquet-hadoop</artifactId>
-            <version>${parquet.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-vector</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-            <classifier>tests</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-common</artifactId>
-            <version>${dep.hadoop.version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow.orc</groupId>
-            <artifactId>arrow-orc</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.orc</groupId>
-            <artifactId>orc-core</artifactId>
-            <version>1.9.2</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.hive</groupId>
-            <artifactId>hive-storage-api</artifactId>
-            <version>2.8.1</version>
-            <scope>test</scope>
-        </dependency>
-	<dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-	    <version>2.15.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>${arrow.cpp.build.dir}</directory>
-                <includes>
-                    <include>**/*arrow_dataset_jni.*</include>
-                </includes>
-            </resource>
-        </resources>
+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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.arrow</groupId>
+    <artifactId>arrow-java-root</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
+  </parent>
 
+  <artifactId>arrow-dataset</artifactId>
+  <packaging>jar</packaging>
+  <name>Arrow Java Dataset</name>
+  <description>Java implementation of Arrow Dataset API/Framework</description>
+
+  <properties>
+    <arrow.cpp.build.dir>../../../cpp/release-build/</arrow.cpp.build.dir>
+    <parquet.version>1.14.1</parquet.version>
+    <avro.version>1.11.3</avro.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-vector</artifactId>
+      <classifier>${arrow.vector.classifier}</classifier>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-memory-core</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-c-data</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.immutables</groupId>
+      <artifactId>value-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-memory-netty</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.parquet</groupId>
+      <artifactId>parquet-avro</artifactId>
+      <version>${parquet.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avro</groupId>
+      <artifactId>avro</artifactId>
+      <version>${avro.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.parquet</groupId>
+      <artifactId>parquet-hadoop</artifactId>
+      <version>${parquet.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-vector</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-common</artifactId>
+      <version>${dep.hadoop.version}</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow.orc</groupId>
+      <artifactId>arrow-orc</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.orc</groupId>
+      <artifactId>orc-core</artifactId>
+      <version>1.9.2</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hive</groupId>
+      <artifactId>hive-storage-api</artifactId>
+      <version>4.0.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.16.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <directory>${arrow.cpp.build.dir}</directory>
+        <includes>
+          <include>**/*arrow_dataset_jni.*</include>
+        </includes>
+      </resource>
+    </resources>
+
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <enableAssertions>false</enableAssertions>
+          <systemPropertyVariables>
+            <arrow.test.dataRoot>${project.basedir}/../../testing/data</arrow.test.dataRoot>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.xolstice.maven.plugins</groupId>
+        <artifactId>protobuf-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>src</id>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <protoSourceRoot>../../cpp/src/jni/dataset/proto</protoSourceRoot>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>jdk11+</id>
+      <activation>
+        <jdk>[11,]</jdk>
+      </activation>
+      <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <enableAssertions>false</enableAssertions>
-                    <systemPropertyVariables>
-                        <arrow.test.dataRoot>${project.basedir}/../../testing/data</arrow.test.dataRoot>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.xolstice.maven.plugins</groupId>
-                <artifactId>protobuf-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>src</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <protoSourceRoot>../../cpp/src/jni/dataset/proto</protoSourceRoot>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <argLine combine.self="override">--add-reads=org.apache.arrow.dataset=com.fasterxml.jackson.databind --add-opens=java.base/java.nio=org.apache.arrow.dataset,org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
+            </configuration>
+          </plugin>
         </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>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">
-                            <enableAssertions>false</enableAssertions>
-                            <systemPropertyVariables>
-                                <arrow.test.dataRoot>${project.basedir}/../../testing/data</arrow.test.dataRoot>
-                            </systemPropertyVariables>
-                            <argLine>--add-reads=org.apache.arrow.dataset=com.fasterxml.jackson.databind --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/java/dataset/src/main/cpp/jni_wrapper.cc b/java/dataset/src/main/cpp/jni_wrapper.cc
index 19a43c8d2fa41..79efbeb74fc54 100644
--- a/java/dataset/src/main/cpp/jni_wrapper.cc
+++ b/java/dataset/src/main/cpp/jni_wrapper.cc
@@ -25,9 +25,8 @@
 #include "arrow/c/helpers.h"
 #include "arrow/dataset/api.h"
 #include "arrow/dataset/file_base.h"
-#include "arrow/filesystem/localfs.h"
+#include "arrow/filesystem/api.h"
 #include "arrow/filesystem/path_util.h"
-#include "arrow/filesystem/s3fs.h"
 #include "arrow/engine/substrait/util.h"
 #include "arrow/engine/substrait/serde.h"
 #include "arrow/engine/substrait/relation.h"
@@ -660,7 +659,9 @@ JNIEXPORT void JNICALL Java_org_apache_arrow_dataset_jni_JniWrapper_releaseBuffe
 JNIEXPORT void JNICALL Java_org_apache_arrow_dataset_jni_JniWrapper_ensureS3Finalized(
     JNIEnv* env, jobject) {
   JNI_METHOD_START
+#ifdef ARROW_S3
   JniAssertOkOrThrow(arrow::fs::EnsureS3Finalized());
+#endif
   JNI_METHOD_END()
 }
 
diff --git a/java/dataset/src/main/java/module-info.java b/java/dataset/src/main/java/module-info.java
index 1672d12ffec69..3092281a97eae 100644
--- a/java/dataset/src/main/java/module-info.java
+++ b/java/dataset/src/main/java/module-info.java
@@ -1,20 +1,20 @@
 /*
 
- * 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.
- */
+* 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.
+*/
 
 open module org.apache.arrow.dataset {
   exports org.apache.arrow.dataset.file;
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/file/DatasetFileWriter.java b/java/dataset/src/main/java/org/apache/arrow/dataset/file/DatasetFileWriter.java
index b2369b853ad84..2d3b43180bd00 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/file/DatasetFileWriter.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/file/DatasetFileWriter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.file;
 
 import org.apache.arrow.c.ArrowArrayStream;
@@ -36,15 +35,27 @@ public class DatasetFileWriter {
    * @param uri target file uri
    * @param maxPartitions maximum partitions to be included in written files
    * @param partitionColumns columns used to partition output files. Empty to disable partitioning
-   * @param baseNameTemplate file name template used to make partitions. E.g. "dat_{i}", i is current partition
-   *                         ID around all written files.
+   * @param baseNameTemplate file name template used to make partitions. E.g. "dat_{i}", i is
+   *     current partition ID around all written files.
    */
-  public static void write(BufferAllocator allocator, ArrowReader reader, FileFormat format, String uri,
-                           String[] partitionColumns, int maxPartitions, String baseNameTemplate) {
+  public static void write(
+      BufferAllocator allocator,
+      ArrowReader reader,
+      FileFormat format,
+      String uri,
+      String[] partitionColumns,
+      int maxPartitions,
+      String baseNameTemplate) {
     try (final ArrowArrayStream stream = ArrowArrayStream.allocateNew(allocator)) {
       Data.exportArrayStream(allocator, reader, stream);
-      JniWrapper.get().writeFromScannerToFile(stream.memoryAddress(),
-          format.id(), uri, partitionColumns, maxPartitions, baseNameTemplate);
+      JniWrapper.get()
+          .writeFromScannerToFile(
+              stream.memoryAddress(),
+              format.id(),
+              uri,
+              partitionColumns,
+              maxPartitions,
+              baseNameTemplate);
     }
   }
 
@@ -55,7 +66,8 @@ public static void write(BufferAllocator allocator, ArrowReader reader, FileForm
    * @param format target file format
    * @param uri target file uri
    */
-  public static void write(BufferAllocator allocator, ArrowReader reader, FileFormat format, String uri) {
+  public static void write(
+      BufferAllocator allocator, ArrowReader reader, FileFormat format, String uri) {
     write(allocator, reader, format, uri, new String[0], 1024, "data_{i}");
   }
 }
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/file/FileFormat.java b/java/dataset/src/main/java/org/apache/arrow/dataset/file/FileFormat.java
index 70a1faab79ec6..843a72d5aa2a3 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/file/FileFormat.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/file/FileFormat.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.file;
 
-/**
- * File format definitions.
- */
+/** File format definitions. */
 public enum FileFormat {
   PARQUET(0),
   ARROW_IPC(1),
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/file/FileSystemDatasetFactory.java b/java/dataset/src/main/java/org/apache/arrow/dataset/file/FileSystemDatasetFactory.java
index aa315690592ee..36ac6288af6d0 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/file/FileSystemDatasetFactory.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/file/FileSystemDatasetFactory.java
@@ -14,25 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.file;
 
 import org.apache.arrow.dataset.jni.NativeDatasetFactory;
 import org.apache.arrow.dataset.jni.NativeMemoryPool;
 import org.apache.arrow.memory.BufferAllocator;
 
-/**
- * Java binding of the C++ FileSystemDatasetFactory.
- */
+/** Java binding of the C++ FileSystemDatasetFactory. */
 public class FileSystemDatasetFactory extends NativeDatasetFactory {
 
-  public FileSystemDatasetFactory(BufferAllocator allocator, NativeMemoryPool memoryPool, FileFormat format,
-      String uri) {
+  public FileSystemDatasetFactory(
+      BufferAllocator allocator, NativeMemoryPool memoryPool, FileFormat format, String uri) {
     super(allocator, memoryPool, createNative(format, uri));
   }
 
-  public FileSystemDatasetFactory(BufferAllocator allocator, NativeMemoryPool memoryPool, FileFormat format,
-                                  String[] uris) {
+  public FileSystemDatasetFactory(
+      BufferAllocator allocator, NativeMemoryPool memoryPool, FileFormat format, String[] uris) {
     super(allocator, memoryPool, createNative(format, uris));
   }
 
@@ -43,5 +40,4 @@ private static long createNative(FileFormat format, String uri) {
   private static long createNative(FileFormat format, String[] uris) {
     return JniWrapper.get().makeFileSystemDatasetFactory(uris, format.id());
   }
-
 }
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/file/JniWrapper.java b/java/dataset/src/main/java/org/apache/arrow/dataset/file/JniWrapper.java
index c3a1a4e58a140..dfac293ccb588 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/file/JniWrapper.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/file/JniWrapper.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.file;
 
 import org.apache.arrow.dataset.jni.JniLoader;
@@ -31,8 +30,7 @@ public static JniWrapper get() {
     return INSTANCE;
   }
 
-  private JniWrapper() {
-  }
+  private JniWrapper() {}
 
   /**
    * Create FileSystemDatasetFactory and return its native pointer. The pointer is pointing to a
@@ -65,14 +63,14 @@ private JniWrapper() {
    * @param uri target file uri
    * @param partitionColumns columns used to partition output files
    * @param maxPartitions maximum partitions to be included in written files
-   * @param baseNameTemplate file name template used to make partitions. E.g. "dat_{i}", i is current partition
-   *                         ID around all written files.
+   * @param baseNameTemplate file name template used to make partitions. E.g. "dat_{i}", i is
+   *     current partition ID around all written files.
    */
-  public native void writeFromScannerToFile(long streamAddress,
-                                            long fileFormat,
-                                            String uri,
-                                            String[] partitionColumns,
-                                            int maxPartitions,
-                                            String baseNameTemplate);
-
+  public native void writeFromScannerToFile(
+      long streamAddress,
+      long fileFormat,
+      String uri,
+      String[] partitionColumns,
+      int maxPartitions,
+      String baseNameTemplate);
 }
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/DirectReservationListener.java b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/DirectReservationListener.java
index 3922e90335da4..078affa750297 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/DirectReservationListener.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/DirectReservationListener.java
@@ -14,18 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.jni;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.apache.arrow.util.VisibleForTesting;
 
 /**
- * Reserving Java direct memory bytes from java.nio.Bits. Used by Java Dataset API's C++ memory
- * pool implementation. This makes memory allocated by the pool to be controlled by JVM option
+ * Reserving Java direct memory bytes from java.nio.Bits. Used by Java Dataset API's C++ memory pool
+ * implementation. This makes memory allocated by the pool to be controlled by JVM option
  * "-XX:MaxDirectMemorySize".
  */
 public class DirectReservationListener implements ReservationListener {
@@ -40,10 +38,12 @@ private DirectReservationListener() {
       methodUnreserve = this.getDeclaredMethodBaseOnJDKVersion(classBits, "unreserveMemory");
       methodUnreserve.setAccessible(true);
     } catch (Exception e) {
-      final RuntimeException failure = new RuntimeException(
-          "Failed to initialize DirectReservationListener. When starting Java you must include " +
-              "`--add-opens=java.base/java.nio=org.apache.arrow.dataset,org.apache.arrow.memory.core,ALL-UNNAMED` " +
-              "(See https://arrow.apache.org/docs/java/install.html)", e);
+      final RuntimeException failure =
+          new RuntimeException(
+              "Failed to initialize DirectReservationListener. When starting Java you must include "
+                  + "`--add-opens=java.base/java.nio=org.apache.arrow.dataset,org.apache.arrow.memory.core,ALL-UNNAMED` "
+                  + "(See https://arrow.apache.org/docs/java/install.html)",
+              e);
       failure.printStackTrace();
       throw failure;
     }
@@ -55,14 +55,13 @@ public static DirectReservationListener instance() {
     return INSTANCE;
   }
 
-  /**
-   * Reserve bytes by invoking java.nio.java.Bitjava.nio.Bitss#reserveMemory.
-   */
+  /** Reserve bytes by invoking java.nio.java.Bitjava.nio.Bitss#reserveMemory. */
   @Override
   public void reserve(long size) {
     try {
       if (size > Integer.MAX_VALUE) {
-        throw new IllegalArgumentException("reserve size should not be larger than Integer.MAX_VALUE (0x7fffffff)");
+        throw new IllegalArgumentException(
+            "reserve size should not be larger than Integer.MAX_VALUE (0x7fffffff)");
       }
       methodReserve.invoke(null, (int) size, (int) size);
     } catch (Exception e) {
@@ -70,14 +69,13 @@ public void reserve(long size) {
     }
   }
 
-  /**
-   * Unreserve bytes by invoking java.nio.java.Bitjava.nio.Bitss#unreserveMemory.
-   */
+  /** Unreserve bytes by invoking java.nio.java.Bitjava.nio.Bitss#unreserveMemory. */
   @Override
   public void unreserve(long size) {
     try {
       if (size > Integer.MAX_VALUE) {
-        throw new IllegalArgumentException("unreserve size should not be larger than Integer.MAX_VALUE (0x7fffffff)");
+        throw new IllegalArgumentException(
+            "unreserve size should not be larger than Integer.MAX_VALUE (0x7fffffff)");
       }
       methodUnreserve.invoke(null, (int) size, (int) size);
     } catch (Exception e) {
@@ -85,9 +83,7 @@ public void unreserve(long size) {
     }
   }
 
-  /**
-   * Get current reservation of jVM direct memory. Visible for testing.
-   */
+  /** Get current reservation of jVM direct memory. Visible for testing. */
   @VisibleForTesting
   public long getCurrentDirectMemReservation() {
     try {
@@ -110,7 +106,9 @@ public long getCurrentDirectMemReservation() {
   }
 
   /**
-   * Get the given method via reflection, searching for different signatures based on the Java version.
+   * Get the given method via reflection, searching for different signatures based on the Java
+   * version.
+   *
    * @param classBits The java.nio.Bits class.
    * @param name The method being requested.
    * @return The method object.
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/JniExceptionDescriber.java b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/JniExceptionDescriber.java
index a14e35b7a8371..902d21befc993 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/JniExceptionDescriber.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/JniExceptionDescriber.java
@@ -14,22 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.jni;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-/**
- * For native code to invoke to convert a java/lang/Throwable to jstring.
- */
+/** For native code to invoke to convert a java/lang/Throwable to jstring. */
 class JniExceptionDescriber {
-  private JniExceptionDescriber() {
-  }
+  private JniExceptionDescriber() {}
 
   /**
-   * Convert a java/lang/Throwable to jstring. See codes in arrow::dataset::jni::CheckException
-   * for more details.
+   * Convert a java/lang/Throwable to jstring. See codes in arrow::dataset::jni::CheckException for
+   * more details.
    *
    * @param throwable the exception instance.
    * @return a String including error message and stack trace of the exception.
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/JniLoader.java b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/JniLoader.java
index cf2f8fe29e8ba..631b8b1bbed66 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/JniLoader.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/JniLoader.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.jni;
 
 import java.io.File;
@@ -30,12 +29,11 @@
 import java.util.Locale;
 import java.util.Set;
 
-/**
- * The JniLoader for Dataset API's native implementation.
- */
+/** The JniLoader for Dataset API's native implementation. */
 public final class JniLoader {
 
-  private static final JniLoader INSTANCE = new JniLoader(Collections.singletonList("arrow_dataset_jni"));
+  private static final JniLoader INSTANCE =
+      new JniLoader(Collections.singletonList("arrow_dataset_jni"));
 
   public static JniLoader get() {
     return INSTANCE;
@@ -51,9 +49,7 @@ private boolean finished() {
     return librariesToLoad.isEmpty();
   }
 
-  /**
-   * If required JNI libraries are not loaded, then load them.
-   */
+  /** If required JNI libraries are not loaded, then load them. */
   public void ensureLoaded() {
     if (finished()) {
       return;
@@ -65,7 +61,8 @@ public void ensureLoaded() {
   private synchronized void loadRemaining() {
     // The method is protected by a mutex via synchronized, if more than one thread race to call
     // loadRemaining, at same time only one will do the actual loading and the others will wait for
-    // the mutex to be acquired then check on the remaining list: if there are libraries that were not
+    // the mutex to be acquired then check on the remaining list: if there are libraries that were
+    // not
     // successfully loaded then the mutex owner will try to load them again.
     if (finished()) {
       return;
@@ -81,10 +78,11 @@ private void load(String name) {
     final String libraryToLoad =
         name + "/" + getNormalizedArch() + "/" + System.mapLibraryName(name);
     try {
-      File temp = File.createTempFile("jnilib-", ".tmp", new File(System.getProperty("java.io.tmpdir")));
+      File temp =
+          File.createTempFile("jnilib-", ".tmp", new File(System.getProperty("java.io.tmpdir")));
       temp.deleteOnExit();
-      try (final InputStream is
-               = JniWrapper.class.getClassLoader().getResourceAsStream(libraryToLoad)) {
+      try (final InputStream is =
+          JniWrapper.class.getClassLoader().getResourceAsStream(libraryToLoad)) {
         if (is == null) {
           throw new FileNotFoundException(libraryToLoad);
         }
@@ -112,6 +110,11 @@ private String getNormalizedArch() {
   }
 
   private void ensureS3FinalizedOnShutdown() {
-    Runtime.getRuntime().addShutdownHook(new Thread(() -> { JniWrapper.get().ensureS3Finalized(); }));
+    Runtime.getRuntime()
+        .addShutdownHook(
+            new Thread(
+                () -> {
+                  JniWrapper.get().ensureS3Finalized();
+                }));
   }
 }
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/JniWrapper.java b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/JniWrapper.java
index 637a3e8f22a9a..b5aa3d918acd9 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/JniWrapper.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/JniWrapper.java
@@ -14,14 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.jni;
 
 import java.nio.ByteBuffer;
 
-/**
- * JNI wrapper for Dataset API's native implementation.
- */
+/** JNI wrapper for Dataset API's native implementation. */
 public class JniWrapper {
 
   private static final JniWrapper INSTANCE = new JniWrapper();
@@ -31,8 +28,7 @@ public static JniWrapper get() {
     return INSTANCE;
   }
 
-  private JniWrapper() {
-  }
+  private JniWrapper() {}
 
   /**
    * Release the DatasetFactory by destroying its reference held by JNI wrapper.
@@ -70,17 +66,21 @@ private JniWrapper() {
    * Create Scanner from a Dataset and get the native pointer of the Dataset.
    *
    * @param datasetId the native pointer of the arrow::dataset::Dataset instance.
-   * @param columns desired column names.
-   *                Columns not in this list will not be emitted when performing scan operation. Null equals
-   *                to "all columns".
+   * @param columns desired column names. Columns not in this list will not be emitted when
+   *     performing scan operation. Null equals to "all columns".
    * @param substraitProjection substrait extended expression to evaluate for project new columns
    * @param substraitFilter substrait extended expression to evaluate for apply filter
    * @param batchSize batch size of scanned record batches.
    * @param memoryPool identifier of memory pool used in the native scanner.
    * @return the native pointer of the arrow::dataset::Scanner instance.
    */
-  public native long createScanner(long datasetId, String[] columns, ByteBuffer substraitProjection,
-                                   ByteBuffer substraitFilter, long batchSize, long memoryPool);
+  public native long createScanner(
+      long datasetId,
+      String[] columns,
+      ByteBuffer substraitProjection,
+      ByteBuffer substraitFilter,
+      long batchSize,
+      long memoryPool);
 
   /**
    * Get a serialized schema from native instance of a Scanner.
@@ -102,8 +102,8 @@ public native long createScanner(long datasetId, String[] columns, ByteBuffer su
    * Read next record batch from the specified scanner.
    *
    * @param scannerId the native pointer of the arrow::dataset::Scanner instance.
-   * @param arrowArray pointer to an empty {@link org.apache.arrow.c.ArrowArray} struct to
-   *                    store C++ side record batch that conforms to C data interface.
+   * @param arrowArray pointer to an empty {@link org.apache.arrow.c.ArrowArray} struct to store C++
+   *     side record batch that conforms to C data interface.
    * @return true if valid record batch is returned; false if stream ended.
    */
   public native boolean nextRecordBatch(long scannerId, long arrowArray);
@@ -116,8 +116,8 @@ public native long createScanner(long datasetId, String[] columns, ByteBuffer su
   public native void releaseBuffer(long bufferId);
 
   /**
-   * Ensure the S3 APIs are shutdown, but only if not already done. If the S3 APIs are uninitialized,
-   * then this is a noop.
+   * Ensure the S3 APIs are shutdown, but only if not already done. If the S3 APIs are
+   * uninitialized, then this is a noop.
    */
   public native void ensureS3Finalized();
 }
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeContext.java b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeContext.java
index 7f6dfbc028f4f..175cd5af9fee5 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeContext.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeContext.java
@@ -14,14 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.jni;
 
 import org.apache.arrow.memory.BufferAllocator;
 
-/**
- * Context for relevant classes of NativeDataset.
- */
+/** Context for relevant classes of NativeDataset. */
 public class NativeContext {
   private final BufferAllocator allocator;
   private final NativeMemoryPool memoryPool;
@@ -37,16 +34,12 @@ public NativeContext(BufferAllocator allocator, NativeMemoryPool memoryPool) {
     this.memoryPool = memoryPool;
   }
 
-  /**
-   * Returns the allocator which is in use.
-   */
+  /** Returns the allocator which is in use. */
   public BufferAllocator getAllocator() {
     return allocator;
   }
 
-  /**
-   * Returns the native memory pool.
-   */
+  /** Returns the native memory pool. */
   public NativeMemoryPool getMemoryPool() {
     return memoryPool;
   }
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeDataset.java b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeDataset.java
index d9abad9971c4e..83a9ff1f32243 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeDataset.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeDataset.java
@@ -14,15 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.jni;
 
 import org.apache.arrow.dataset.scanner.ScanOptions;
 import org.apache.arrow.dataset.source.Dataset;
 
-/**
- * Native implementation of {@link Dataset}.
- */
+/** Native implementation of {@link Dataset}. */
 public class NativeDataset implements Dataset {
 
   private final NativeContext context;
@@ -41,10 +38,15 @@ public synchronized NativeScanner newScan(ScanOptions options) {
       throw new NativeInstanceReleasedException();
     }
 
-    long scannerId = JniWrapper.get().createScanner(datasetId, options.getColumns().orElse(null),
-        options.getSubstraitProjection().orElse(null),
-        options.getSubstraitFilter().orElse(null),
-        options.getBatchSize(), context.getMemoryPool().getNativeInstanceId());
+    long scannerId =
+        JniWrapper.get()
+            .createScanner(
+                datasetId,
+                options.getColumns().orElse(null),
+                options.getSubstraitProjection().orElse(null),
+                options.getSubstraitFilter().orElse(null),
+                options.getBatchSize(),
+                context.getMemoryPool().getNativeInstanceId());
 
     return new NativeScanner(context, scannerId);
   }
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeDatasetFactory.java b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeDatasetFactory.java
index 993d44fa26fde..d96d9b69fa81c 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeDatasetFactory.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeDatasetFactory.java
@@ -14,19 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.jni;
 
 import java.io.IOException;
-
 import org.apache.arrow.dataset.source.DatasetFactory;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.arrow.vector.util.SchemaUtility;
 
-/**
- * Native implementation of {@link DatasetFactory}.
- */
+/** Native implementation of {@link DatasetFactory}. */
 public class NativeDatasetFactory implements DatasetFactory {
   private final long datasetFactoryId;
   private final NativeMemoryPool memoryPool;
@@ -37,17 +33,19 @@ public class NativeDatasetFactory implements DatasetFactory {
   /**
    * Constructor.
    *
-   * @param allocator a context allocator associated with this factory. Any buffer that will be created natively will
-   *                  be then bound to this allocator.
-   * @param memoryPool the native memory pool associated with this factory. Any buffer created natively should request
-   *                   for memory spaces from this memory pool. This is a mapped instance of c++ arrow::MemoryPool.
-   * @param datasetFactoryId an ID, at the same time the native pointer of the underlying native instance of this
-   *                         factory. Make sure in c++ side  the pointer is pointing to the shared pointer wrapping
-   *                         the actual instance so we could successfully decrease the reference count once
-   *                         {@link #close} is called.
+   * @param allocator a context allocator associated with this factory. Any buffer that will be
+   *     created natively will be then bound to this allocator.
+   * @param memoryPool the native memory pool associated with this factory. Any buffer created
+   *     natively should request for memory spaces from this memory pool. This is a mapped instance
+   *     of c++ arrow::MemoryPool.
+   * @param datasetFactoryId an ID, at the same time the native pointer of the underlying native
+   *     instance of this factory. Make sure in c++ side the pointer is pointing to the shared
+   *     pointer wrapping the actual instance so we could successfully decrease the reference count
+   *     once {@link #close} is called.
    * @see #close()
    */
-  public NativeDatasetFactory(BufferAllocator allocator, NativeMemoryPool memoryPool, long datasetFactoryId) {
+  public NativeDatasetFactory(
+      BufferAllocator allocator, NativeMemoryPool memoryPool, long datasetFactoryId) {
     this.allocator = allocator;
     this.memoryPool = memoryPool;
     this.datasetFactoryId = datasetFactoryId;
@@ -82,7 +80,8 @@ public NativeDataset finish(Schema schema) {
         if (closed) {
           throw new NativeInstanceReleasedException();
         }
-        return new NativeDataset(new NativeContext(allocator, memoryPool),
+        return new NativeDataset(
+            new NativeContext(allocator, memoryPool),
             JniWrapper.get().createDataset(datasetFactoryId, serialized));
       }
     } catch (IOException e) {
@@ -90,9 +89,7 @@ public NativeDataset finish(Schema schema) {
     }
   }
 
-  /**
-   * Close this factory by release the pointer of the native instance.
-   */
+  /** Close this factory by release the pointer of the native instance. */
   @Override
   public synchronized void close() {
     if (closed) {
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeInstanceReleasedException.java b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeInstanceReleasedException.java
index 3231ca23abece..168086bbb410f 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeInstanceReleasedException.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeInstanceReleasedException.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.jni;
 
-/**
- * Thrown if trying to operate on a native instance that is already released.
- */
+/** Thrown if trying to operate on a native instance that is already released. */
 public class NativeInstanceReleasedException extends RuntimeException {
   public NativeInstanceReleasedException() {
     super("Native instance has been released");
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeMemoryPool.java b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeMemoryPool.java
index e20e1e351c542..7ea3b576e6f45 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeMemoryPool.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeMemoryPool.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.jni;
 
-/**
- * C++ memory pool(arrow::MemoryPool)'s Java mapped instance.
- */
+/** C++ memory pool(arrow::MemoryPool)'s Java mapped instance. */
 public class NativeMemoryPool implements AutoCloseable {
   private final long nativeInstanceId;
 
@@ -27,34 +24,28 @@ private NativeMemoryPool(long nativeInstanceId) {
     this.nativeInstanceId = nativeInstanceId;
   }
 
-  /**
-   * Get the default memory pool. This will return arrow::default_memory_pool() directly.
-   */
+  /** Get the default memory pool. This will return arrow::default_memory_pool() directly. */
   public static NativeMemoryPool getDefault() {
     JniLoader.get().ensureLoaded();
     return new NativeMemoryPool(getDefaultMemoryPool());
   }
 
   /**
-   * Create a listenable memory pool (see also: arrow::ReservationListenableMemoryPool) with
-   * a specific listener. All buffers created from the memory pool should take enough reservation
-   * from the listener in advance.
+   * Create a listenable memory pool (see also: arrow::ReservationListenableMemoryPool) with a
+   * specific listener. All buffers created from the memory pool should take enough reservation from
+   * the listener in advance.
    */
   public static NativeMemoryPool createListenable(ReservationListener listener) {
     JniLoader.get().ensureLoaded();
     return new NativeMemoryPool(createListenableMemoryPool(listener));
   }
 
-  /**
-   * Return native instance ID of this memory pool.
-   */
+  /** Return native instance ID of this memory pool. */
   public long getNativeInstanceId() {
     return nativeInstanceId;
   }
 
-  /**
-   * Get current allocated bytes.
-   */
+  /** Get current allocated bytes. */
   public long getBytesAllocated() {
     return bytesAllocated(nativeInstanceId);
   }
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeScanTask.java b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeScanTask.java
index 7747dd6034016..bc7bd4b62c774 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeScanTask.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeScanTask.java
@@ -14,24 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.jni;
 
 import org.apache.arrow.dataset.scanner.ScanTask;
 import org.apache.arrow.vector.ipc.ArrowReader;
 
 /**
- * Native implementation of {@link ScanTask}. Currently RecordBatches are iterated directly by the scanner
- * id via {@link JniWrapper}, thus we allow only one-time execution of method {@link #execute()}. If a re-scan
- * operation is expected, call {@link NativeDataset#newScan} to create a new scanner instance.
+ * Native implementation of {@link ScanTask}. Currently RecordBatches are iterated directly by the
+ * scanner id via {@link JniWrapper}, thus we allow only one-time execution of method {@link
+ * #execute()}. If a re-scan operation is expected, call {@link NativeDataset#newScan} to create a
+ * new scanner instance.
  */
 @Deprecated
 public class NativeScanTask implements ScanTask {
   private final NativeScanner scanner;
 
-  /**
-   * Constructor.
-   */
+  /** Constructor. */
   public NativeScanTask(NativeScanner scanner) {
     this.scanner = scanner;
   }
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeScanner.java b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeScanner.java
index 8ca8e5cf50eac..3367bdd9818fc 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeScanner.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/NativeScanner.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.jni;
 
 import java.io.IOException;
@@ -23,7 +22,6 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
-
 import org.apache.arrow.c.ArrowArray;
 import org.apache.arrow.c.Data;
 import org.apache.arrow.dataset.scanner.Scanner;
@@ -36,9 +34,9 @@
 import org.apache.arrow.vector.util.SchemaUtility;
 
 /**
- * Native implementation of {@link Scanner}. Note that it currently emits only a single scan task of type
- * {@link NativeScanTask}, which is internally a combination of all scan task instances returned by the
- * native scanner.
+ * Native implementation of {@link Scanner}. Note that it currently emits only a single scan task of
+ * type {@link NativeScanTask}, which is internally a combination of all scan task instances
+ * returned by the native scanner.
  */
 public class NativeScanner implements Scanner {
 
@@ -61,8 +59,9 @@ ArrowReader execute() {
       throw new NativeInstanceReleasedException();
     }
     if (!executed.compareAndSet(false, true)) {
-      throw new UnsupportedOperationException("NativeScanner cannot be executed more than once. Consider creating " +
-          "new scanner instead");
+      throw new UnsupportedOperationException(
+          "NativeScanner cannot be executed more than once. Consider creating "
+              + "new scanner instead");
     }
     return new NativeReader(context.getAllocator());
   }
@@ -73,8 +72,8 @@ public ArrowReader scanBatches() {
       throw new NativeInstanceReleasedException();
     }
     if (!executed.compareAndSet(false, true)) {
-      throw new UnsupportedOperationException("NativeScanner can only be executed once. Create a " +
-              "new scanner instead");
+      throw new UnsupportedOperationException(
+          "NativeScanner can only be executed once. Create a " + "new scanner instead");
     }
     return new NativeReader(context.getAllocator());
   }
@@ -95,7 +94,8 @@ public Schema schema() {
       if (closed) {
         throw new NativeInstanceReleasedException();
       }
-      return SchemaUtility.deserialize(JniWrapper.get().getSchemaFromScanner(scannerId), context.getAllocator());
+      return SchemaUtility.deserialize(
+          JniWrapper.get().getSchemaFromScanner(scannerId), context.getAllocator());
     } catch (IOException e) {
       throw new RuntimeException(e);
     } finally {
@@ -117,9 +117,7 @@ public void close() {
     }
   }
 
-  /**
-   * {@link ArrowReader} implementation for NativeDataset.
-   */
+  /** {@link ArrowReader} implementation for NativeDataset. */
   public class NativeReader extends ArrowReader {
 
     private NativeReader(BufferAllocator allocator) {
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/ReservationListener.java b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/ReservationListener.java
index f1ffdd2acbd96..900d5fd895ec4 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/jni/ReservationListener.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/jni/ReservationListener.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.jni;
 
-/**
- * Listener of buffer memory reservation. Used by native datasets.
- */
+/** Listener of buffer memory reservation. Used by native datasets. */
 public interface ReservationListener {
 
   /**
@@ -29,8 +26,6 @@ public interface ReservationListener {
    */
   void reserve(long size);
 
-  /**
-   * Unreserve bytes.
-   */
+  /** Unreserve bytes. */
   void unreserve(long size);
 }
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/scanner/ArrowScannerReader.java b/java/dataset/src/main/java/org/apache/arrow/dataset/scanner/ArrowScannerReader.java
index 417ba837a3b97..acbbe889e5f85 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/scanner/ArrowScannerReader.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/scanner/ArrowScannerReader.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.scanner;
 
 import java.io.IOException;
 import java.util.Iterator;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.VectorLoader;
 import org.apache.arrow.vector.VectorUnloader;
@@ -28,10 +26,7 @@
 import org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-/**
- * An implementation of {@link ArrowReader} that reads
- * the dataset from {@link Scanner}.
- */
+/** An implementation of {@link ArrowReader} that reads the dataset from {@link Scanner}. */
 public class ArrowScannerReader extends ArrowReader {
   private final Scanner scanner;
 
@@ -93,8 +88,7 @@ public boolean loadNextBatch() throws IOException {
     }
 
     VectorLoader loader = new VectorLoader(this.getVectorSchemaRoot());
-    VectorUnloader unloader =
-        new VectorUnloader(currentReader.getVectorSchemaRoot());
+    VectorUnloader unloader = new VectorUnloader(currentReader.getVectorSchemaRoot());
     try (ArrowRecordBatch recordBatch = unloader.getRecordBatch()) {
       loader.load(recordBatch);
     }
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/scanner/ScanOptions.java b/java/dataset/src/main/java/org/apache/arrow/dataset/scanner/ScanOptions.java
index 995d05ac3b314..837016ad1e9d1 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/scanner/ScanOptions.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/scanner/ScanOptions.java
@@ -14,17 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.scanner;
 
 import java.nio.ByteBuffer;
 import java.util.Optional;
-
 import org.apache.arrow.util.Preconditions;
 
-/**
- * Options used during scanning.
- */
+/** Options used during scanning. */
 public class ScanOptions {
   private final long batchSize;
   private final Optional<String[]> columns;
@@ -33,27 +29,35 @@ public class ScanOptions {
 
   /**
    * Constructor.
-   * @param columns Projected columns. Empty for scanning all columns.
-   * @param batchSize Maximum row number of each returned {@link org.apache.arrow.vector.ipc.message.ArrowRecordBatch}
    *
+   * @param columns Projected columns. Empty for scanning all columns.
+   * @param batchSize Maximum row number of each returned {@link
+   *     org.apache.arrow.vector.ipc.message.ArrowRecordBatch}
    * @deprecated Deprecated. Use {@link #ScanOptions(long, Optional)} instead.
    */
   @Deprecated
   public ScanOptions(String[] columns, long batchSize) {
-    this(batchSize, Optional.of(columns).map(present -> {
-      if (present.length == 0) {
-        // Backwards compatibility: See ARROW-13257, in the new constructor, we now use null to scan for all columns.
-        return null;
-      }
-      return present;
-    }));
+    this(
+        batchSize,
+        Optional.of(columns)
+            .map(
+                present -> {
+                  if (present.length == 0) {
+                    // Backwards compatibility: See ARROW-13257, in the new constructor, we now use
+                    // null to scan for all columns.
+                    return null;
+                  }
+                  return present;
+                }));
   }
 
   /**
    * Constructor.
-   * @param batchSize Maximum row number of each returned {@link org.apache.arrow.vector.ipc.message.ArrowRecordBatch}
-   * @param columns (Optional) Projected columns. {@link Optional#empty()} for scanning all columns. Otherwise,
-   *                Only columns present in the Array will be scanned.
+   *
+   * @param batchSize Maximum row number of each returned {@link
+   *     org.apache.arrow.vector.ipc.message.ArrowRecordBatch}
+   * @param columns (Optional) Projected columns. {@link Optional#empty()} for scanning all columns.
+   *     Otherwise, Only columns present in the Array will be scanned.
    */
   public ScanOptions(long batchSize, Optional<String[]> columns) {
     Preconditions.checkNotNull(columns);
@@ -83,9 +87,7 @@ public Optional<ByteBuffer> getSubstraitFilter() {
     return substraitFilter;
   }
 
-  /**
-   * Builder for Options used during scanning.
-   */
+  /** Builder for Options used during scanning. */
   public static class Builder {
     private final long batchSize;
     private Optional<String[]> columns;
@@ -94,7 +96,9 @@ public static class Builder {
 
     /**
      * Constructor.
-     * @param batchSize Maximum row number of each returned {@link org.apache.arrow.vector.ipc.message.ArrowRecordBatch}
+     *
+     * @param batchSize Maximum row number of each returned {@link
+     *     org.apache.arrow.vector.ipc.message.ArrowRecordBatch}
      */
     public Builder(long batchSize) {
       this.batchSize = batchSize;
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/scanner/ScanTask.java b/java/dataset/src/main/java/org/apache/arrow/dataset/scanner/ScanTask.java
index 16b8aeefb61f9..ad19b451a067f 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/scanner/ScanTask.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/scanner/ScanTask.java
@@ -14,23 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.scanner;
 
 import java.io.Reader;
-
 import org.apache.arrow.vector.ipc.ArrowReader;
 
 /**
- * Read record batches from a range of a single data fragment. A
- * ScanTask is meant to be a unit of work to be dispatched. The implementation
- * must be thread and concurrent safe.
+ * Read record batches from a range of a single data fragment. A ScanTask is meant to be a unit of
+ * work to be dispatched. The implementation must be thread and concurrent safe.
  */
 @Deprecated
 public interface ScanTask extends AutoCloseable {
 
-  /**
-   * Execute this ScanTask and return a {@link Reader} instance.
-   */
+  /** Execute this ScanTask and return a {@link Reader} instance. */
   ArrowReader execute();
 }
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/scanner/Scanner.java b/java/dataset/src/main/java/org/apache/arrow/dataset/scanner/Scanner.java
index 43749b7db8ec2..0131db51a7451 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/scanner/Scanner.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/scanner/Scanner.java
@@ -14,15 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.scanner;
 
 import org.apache.arrow.vector.ipc.ArrowReader;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-/**
- * A high level interface for scanning data over dataset.
- */
+/** A high level interface for scanning data over dataset. */
 public interface Scanner extends AutoCloseable {
 
   /**
@@ -35,8 +32,8 @@ public interface Scanner extends AutoCloseable {
   /**
    * Perform the scan operation.
    *
-   * @return a iterable set of {@link ScanTask}s. Each task is considered independent and it is allowed
-   *     to execute the tasks concurrently to gain better performance.
+   * @return a iterable set of {@link ScanTask}s. Each task is considered independent and it is
+   *     allowed to execute the tasks concurrently to gain better performance.
    * @deprecated use {@link #scanBatches()} instead.
    */
   @Deprecated
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/source/Dataset.java b/java/dataset/src/main/java/org/apache/arrow/dataset/source/Dataset.java
index ce193581f40fc..44b575f7c23c8 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/source/Dataset.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/source/Dataset.java
@@ -14,15 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.source;
 
 import org.apache.arrow.dataset.scanner.ScanOptions;
 import org.apache.arrow.dataset.scanner.Scanner;
 
-/**
- * A container of Fragments which are the internal iterable unit of read data.
- */
+/** A container of Fragments which are the internal iterable unit of read data. */
 public interface Dataset extends AutoCloseable {
 
   /**
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/source/DatasetFactory.java b/java/dataset/src/main/java/org/apache/arrow/dataset/source/DatasetFactory.java
index 46b8545d66211..9f2fd8c4e7126 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/source/DatasetFactory.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/source/DatasetFactory.java
@@ -14,15 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.source;
 
 import org.apache.arrow.vector.types.pojo.Schema;
 
 /**
- * DatasetFactory provides a way to inspect a Dataset potential
- * schema before materializing it. Thus, the user can peek the schema for
- * data sources and decide on a unified schema.
+ * DatasetFactory provides a way to inspect a Dataset potential schema before materializing it.
+ * Thus, the user can peek the schema for data sources and decide on a unified schema.
  */
 public interface DatasetFactory extends AutoCloseable {
 
@@ -34,8 +32,8 @@ public interface DatasetFactory extends AutoCloseable {
   Schema inspect();
 
   /**
-   * Create a Dataset with auto-inferred schema. Which means, the schema of the resulting Dataset will be
-   * the same with calling {@link #inspect()} manually.
+   * Create a Dataset with auto-inferred schema. Which means, the schema of the resulting Dataset
+   * will be the same with calling {@link #inspect()} manually.
    *
    * @return the Dataset instance
    */
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/substrait/AceroSubstraitConsumer.java b/java/dataset/src/main/java/org/apache/arrow/dataset/substrait/AceroSubstraitConsumer.java
index d5a29ad4e93f3..a866d6958b1b7 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/substrait/AceroSubstraitConsumer.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/substrait/AceroSubstraitConsumer.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.substrait;
 
 import java.nio.ByteBuffer;
@@ -22,7 +21,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.arrow.c.ArrowArrayStream;
 import org.apache.arrow.c.Data;
 import org.apache.arrow.memory.BufferAllocator;
@@ -30,8 +28,8 @@
 import org.apache.arrow.vector.ipc.ArrowReader;
 
 /**
- * Class to expose Java Substrait API for end users, currently operations supported are only to Consume Substrait Plan
- * in Plan format (JSON) or Binary format (ByteBuffer).
+ * Class to expose Java Substrait API for end users, currently operations supported are only to
+ * Consume Substrait Plan in Plan format (JSON) or Binary format (ByteBuffer).
  */
 public final class AceroSubstraitConsumer {
   private final BufferAllocator allocator;
@@ -54,11 +52,13 @@ public ArrowReader runQuery(String plan) throws Exception {
    * Run Substrait plan.
    *
    * @param plan The JSON Substrait plan.
-   * @param namedTables A mapping of named tables referenced by the plan to an ArrowReader providing the data
-   *                    for the table. Contains the Table Name to Query as a Key and ArrowReader as a Value.
-   * <pre>{@code ArrowReader nationReader = scanner.scanBatches();
+   * @param namedTables A mapping of named tables referenced by the plan to an ArrowReader providing
+   *     the data for the table. Contains the Table Name to Query as a Key and ArrowReader as a
+   *     Value.
+   *     <pre>{@code ArrowReader nationReader = scanner.scanBatches();
    * Map<String, ArrowReader> namedTables = new HashMap<>();
    * namedTables.put("NATION", nationReader);}</pre>
+   *
    * @return the ArrowReader to iterate for record batches.
    */
   public ArrowReader runQuery(String plan, Map<String, ArrowReader> namedTables) throws Exception {
@@ -68,7 +68,7 @@ public ArrowReader runQuery(String plan, Map<String, ArrowReader> namedTables) t
   /**
    * Run Substrait plan.
    *
-   * @param plan                  the binary Substrait plan.
+   * @param plan the binary Substrait plan.
    * @return the ArrowReader to iterate for record batches.
    */
   public ArrowReader runQuery(ByteBuffer plan) throws Exception {
@@ -76,56 +76,51 @@ public ArrowReader runQuery(ByteBuffer plan) throws Exception {
   }
 
   /**
-   * Read binary Substrait plan, execute and return an ArrowReader to read Schema and ArrowRecordBatches.
+   * Read binary Substrait plan, execute and return an ArrowReader to read Schema and
+   * ArrowRecordBatches.
    *
-   * @param plan                  the binary Substrait plan.
-   * @param namedTables A mapping of named tables referenced by the plan to an ArrowReader providing the data
-   *                              for the table. Contains the Table Name to Query as a Key and ArrowReader as a Value.
-   * <pre>{@code ArrowReader nationReader = scanner.scanBatches();
+   * @param plan the binary Substrait plan.
+   * @param namedTables A mapping of named tables referenced by the plan to an ArrowReader providing
+   *     the data for the table. Contains the Table Name to Query as a Key and ArrowReader as a
+   *     Value.
+   *     <pre>{@code ArrowReader nationReader = scanner.scanBatches();
    * Map<String, ArrowReader> namedTables = new HashMap<>();
    * namedTables.put("NATION", nationReader);}</pre>
+   *
    * @return the ArrowReader to iterate for record batches.
    */
-  public ArrowReader runQuery(ByteBuffer plan, Map<String, ArrowReader> namedTables) throws Exception {
+  public ArrowReader runQuery(ByteBuffer plan, Map<String, ArrowReader> namedTables)
+      throws Exception {
     return execute(plan, namedTables);
   }
 
   private ArrowReader execute(String plan, Map<String, ArrowReader> namedTables) throws Exception {
     List<ArrowArrayStream> arrowArrayStream = new ArrayList<>();
-    try (
-        ArrowArrayStream streamOutput = ArrowArrayStream.allocateNew(this.allocator)
-    ) {
+    try (ArrowArrayStream streamOutput = ArrowArrayStream.allocateNew(this.allocator)) {
       String[] mapTableToMemoryAddress = getMapTableToMemoryAddress(namedTables, arrowArrayStream);
-      JniWrapper.get().executeSerializedPlan(
-          plan,
-          mapTableToMemoryAddress,
-          streamOutput.memoryAddress()
-      );
+      JniWrapper.get()
+          .executeSerializedPlan(plan, mapTableToMemoryAddress, streamOutput.memoryAddress());
       return Data.importArrayStream(this.allocator, streamOutput);
     } finally {
       AutoCloseables.close(arrowArrayStream);
     }
   }
 
-  private ArrowReader execute(ByteBuffer plan, Map<String, ArrowReader> namedTables) throws Exception {
+  private ArrowReader execute(ByteBuffer plan, Map<String, ArrowReader> namedTables)
+      throws Exception {
     List<ArrowArrayStream> arrowArrayStream = new ArrayList<>();
-    try (
-        ArrowArrayStream streamOutput = ArrowArrayStream.allocateNew(this.allocator)
-    ) {
+    try (ArrowArrayStream streamOutput = ArrowArrayStream.allocateNew(this.allocator)) {
       String[] mapTableToMemoryAddress = getMapTableToMemoryAddress(namedTables, arrowArrayStream);
-      JniWrapper.get().executeSerializedPlan(
-          plan,
-          mapTableToMemoryAddress,
-          streamOutput.memoryAddress()
-      );
+      JniWrapper.get()
+          .executeSerializedPlan(plan, mapTableToMemoryAddress, streamOutput.memoryAddress());
       return Data.importArrayStream(this.allocator, streamOutput);
     } finally {
       AutoCloseables.close(arrowArrayStream);
     }
   }
 
-  private String[] getMapTableToMemoryAddress(Map<String, ArrowReader> mapTableToArrowReader,
-                                              List<ArrowArrayStream> listStreamInput) {
+  private String[] getMapTableToMemoryAddress(
+      Map<String, ArrowReader> mapTableToArrowReader, List<ArrowArrayStream> listStreamInput) {
     String[] mapTableToMemoryAddress = new String[mapTableToArrowReader.size() * 2];
     ArrowArrayStream streamInput;
     int pos = 0;
diff --git a/java/dataset/src/main/java/org/apache/arrow/dataset/substrait/JniWrapper.java b/java/dataset/src/main/java/org/apache/arrow/dataset/substrait/JniWrapper.java
index 5cb68f8514678..ff50ecfb994cb 100644
--- a/java/dataset/src/main/java/org/apache/arrow/dataset/substrait/JniWrapper.java
+++ b/java/dataset/src/main/java/org/apache/arrow/dataset/substrait/JniWrapper.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.substrait;
 
 import java.nio.ByteBuffer;
-
 import org.apache.arrow.dataset.jni.JniLoader;
 
 /**
- * Class that contains Native methods to call Acero C++ Substrait API. It internally depends on C++ function
- * arrow::engine::ExecuteSerializedPlan. Currently supported input parameters supported are:
+ * Class that contains Native methods to call Acero C++ Substrait API. It internally depends on C++
+ * function arrow::engine::ExecuteSerializedPlan. Currently supported input parameters supported
+ * are:
+ *
  * <pre>
  * - arrow::Buffer: Substrait Plan (JSON or Binary format).
  * - arrow::engine::ConversionOptions: Mapping for arrow::engine::NamedTableProvider.
@@ -32,8 +32,7 @@
 final class JniWrapper {
   private static final JniWrapper INSTANCE = new JniWrapper();
 
-  private JniWrapper() {
-  }
+  private JniWrapper() {}
 
   public static JniWrapper get() {
     JniLoader.get().ensureLoaded();
@@ -41,33 +40,34 @@ public static JniWrapper get() {
   }
 
   /**
-   * Consume the JSON Substrait Plan that contains Named Tables and export the RecordBatchReader into
-   * C-Data Interface ArrowArrayStream.
+   * Consume the JSON Substrait Plan that contains Named Tables and export the RecordBatchReader
+   * into C-Data Interface ArrowArrayStream.
    *
    * @param planInput the JSON Substrait plan.
-   * @param mapTableToMemoryAddressInput the mapping name of Tables Name on position `i` and theirs Memory Address
-   *                                     representation on `i+1` position linearly.
-   * <pre>{@code String[] mapTableToMemoryAddress = new String[2];
+   * @param mapTableToMemoryAddressInput the mapping name of Tables Name on position `i` and theirs
+   *     Memory Address representation on `i+1` position linearly.
+   *     <pre>{@code String[] mapTableToMemoryAddress = new String[2];
    * mapTableToMemoryAddress[0]="NATION";
    * mapTableToMemoryAddress[1]="140650250895360";}</pre>
-   * @param memoryAddressOutput the memory address where RecordBatchReader is exported.
    *
+   * @param memoryAddressOutput the memory address where RecordBatchReader is exported.
    */
-  public native void executeSerializedPlan(String planInput, String[] mapTableToMemoryAddressInput,
-                                                      long memoryAddressOutput);
+  public native void executeSerializedPlan(
+      String planInput, String[] mapTableToMemoryAddressInput, long memoryAddressOutput);
 
   /**
-   * Consume the binary Substrait Plan that contains Named Tables and export the RecordBatchReader into
-   * C-Data Interface ArrowArrayStream.
+   * Consume the binary Substrait Plan that contains Named Tables and export the RecordBatchReader
+   * into C-Data Interface ArrowArrayStream.
    *
    * @param planInput the binary Substrait plan.
-   * @param mapTableToMemoryAddressInput the mapping name of Tables Name on position `i` and theirs Memory Address
-   *                                     representation on `i+1` position linearly.
-   * <pre>{@code String[] mapTableToMemoryAddress = new String[2];
+   * @param mapTableToMemoryAddressInput the mapping name of Tables Name on position `i` and theirs
+   *     Memory Address representation on `i+1` position linearly.
+   *     <pre>{@code String[] mapTableToMemoryAddress = new String[2];
    * mapTableToMemoryAddress[0]="NATION";
    * mapTableToMemoryAddress[1]="140650250895360";}</pre>
+   *
    * @param memoryAddressOutput the memory address where RecordBatchReader is exported.
    */
-  public native void executeSerializedPlan(ByteBuffer planInput, String[] mapTableToMemoryAddressInput,
-                                                      long memoryAddressOutput);
+  public native void executeSerializedPlan(
+      ByteBuffer planInput, String[] mapTableToMemoryAddressInput, long memoryAddressOutput);
 }
diff --git a/java/dataset/src/test/java/org/apache/arrow/dataset/OrcWriteSupport.java b/java/dataset/src/test/java/org/apache/arrow/dataset/OrcWriteSupport.java
index c49612995ee1e..e4daa001c6ee8 100644
--- a/java/dataset/src/test/java/org/apache/arrow/dataset/OrcWriteSupport.java
+++ b/java/dataset/src/test/java/org/apache/arrow/dataset/OrcWriteSupport.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset;
 
 import java.io.IOException;
-
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
@@ -28,8 +26,10 @@
 import org.apache.orc.Writer;
 
 public class OrcWriteSupport {
-  public static void writeTempFile(TypeDescription orcSchema, Path path, Integer[] values) throws IOException {
-    Writer writer = OrcFile.createWriter(path, OrcFile.writerOptions(new Configuration()).setSchema(orcSchema));
+  public static void writeTempFile(TypeDescription orcSchema, Path path, Integer[] values)
+      throws IOException {
+    Writer writer =
+        OrcFile.createWriter(path, OrcFile.writerOptions(new Configuration()).setSchema(orcSchema));
     VectorizedRowBatch batch = orcSchema.createRowBatch();
     LongColumnVector longColumnVector = (LongColumnVector) batch.cols[0];
     for (int idx = 0; idx < values.length; idx++) {
diff --git a/java/dataset/src/test/java/org/apache/arrow/dataset/ParquetWriteSupport.java b/java/dataset/src/test/java/org/apache/arrow/dataset/ParquetWriteSupport.java
index 2352a65e8fb62..ae121424b6a64 100644
--- a/java/dataset/src/test/java/org/apache/arrow/dataset/ParquetWriteSupport.java
+++ b/java/dataset/src/test/java/org/apache/arrow/dataset/ParquetWriteSupport.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset;
 
 import java.io.File;
@@ -24,7 +23,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Random;
-
 import org.apache.arrow.util.Preconditions;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericData;
@@ -32,9 +30,7 @@
 import org.apache.parquet.avro.AvroParquetWriter;
 import org.apache.parquet.hadoop.ParquetWriter;
 
-/**
- * Utility class for writing Parquet files using Avro based tools.
- */
+/** Utility class for writing Parquet files using Avro based tools. */
 public class ParquetWriteSupport implements AutoCloseable {
 
   private final String path;
@@ -45,39 +41,42 @@ public class ParquetWriteSupport implements AutoCloseable {
   private final GenericRecordListBuilder recordListBuilder = new GenericRecordListBuilder();
   private final Random random = new Random();
 
-
   public ParquetWriteSupport(String schemaName, File outputFolder) throws Exception {
     avroSchema = getSchema(schemaName);
     path = outputFolder.getPath() + "/" + "generated-" + random.nextLong() + ".parquet";
     uri = "file://" + path;
-    writer = AvroParquetWriter
-        .<GenericRecord>builder(new org.apache.hadoop.fs.Path(path))
-        .withSchema(avroSchema)
-        .build();
+    writer =
+        AvroParquetWriter.<GenericRecord>builder(new org.apache.hadoop.fs.Path(path))
+            .withSchema(avroSchema)
+            .build();
   }
 
   public static Schema getSchema(String schemaName) throws Exception {
     try {
-      // Attempt to use JDK 9 behavior of getting the module then the resource stream from the module.
+      // Attempt to use JDK 9 behavior of getting the module then the resource stream from the
+      // module.
       // Note that this code is caller-sensitive.
       Method getModuleMethod = Class.class.getMethod("getModule");
       Object module = getModuleMethod.invoke(ParquetWriteSupport.class);
-      Method getResourceAsStreamFromModule = module.getClass().getMethod("getResourceAsStream", String.class);
-      try (InputStream is = (InputStream) getResourceAsStreamFromModule.invoke(module, "/avroschema/" + schemaName)) {
-        return new Schema.Parser()
-            .parse(is);
+      Method getResourceAsStreamFromModule =
+          module.getClass().getMethod("getResourceAsStream", String.class);
+      try (InputStream is =
+          (InputStream) getResourceAsStreamFromModule.invoke(module, "/avroschema/" + schemaName)) {
+        return new Schema.Parser().parse(is);
       }
     } catch (NoSuchMethodException ex) {
       // Use JDK8 behavior.
-      try (InputStream is = ParquetWriteSupport.class.getResourceAsStream("/avroschema/" + schemaName)) {
+      try (InputStream is =
+          ParquetWriteSupport.class.getResourceAsStream("/avroschema/" + schemaName)) {
         return new Schema.Parser().parse(is);
       }
     }
   }
 
-  public static ParquetWriteSupport writeTempFile(String schemaName, File outputFolder,
-      Object... values) throws Exception {
-    try (final ParquetWriteSupport writeSupport = new ParquetWriteSupport(schemaName, outputFolder)) {
+  public static ParquetWriteSupport writeTempFile(
+      String schemaName, File outputFolder, Object... values) throws Exception {
+    try (final ParquetWriteSupport writeSupport =
+        new ParquetWriteSupport(schemaName, outputFolder)) {
       writeSupport.writeRecords(values);
       return writeSupport;
     }
@@ -123,8 +122,8 @@ public void close() throws Exception {
   public class GenericRecordListBuilder {
     public final List<GenericRecord> createRecordList(Object... values) {
       final int fieldCount = avroSchema.getFields().size();
-      Preconditions.checkArgument(values.length % fieldCount == 0,
-          "arg count of values should be divide by field number");
+      Preconditions.checkArgument(
+          values.length % fieldCount == 0, "arg count of values should be divide by field number");
       final List<GenericRecord> recordList = new ArrayList<>();
       for (int i = 0; i < values.length / fieldCount; i++) {
         final GenericRecord record = new GenericData.Record(avroSchema);
diff --git a/java/dataset/src/test/java/org/apache/arrow/dataset/TestAllTypes.java b/java/dataset/src/test/java/org/apache/arrow/dataset/TestAllTypes.java
index 6d33cf057ed3a..eb73663191414 100644
--- a/java/dataset/src/test/java/org/apache/arrow/dataset/TestAllTypes.java
+++ b/java/dataset/src/test/java/org/apache/arrow/dataset/TestAllTypes.java
@@ -14,21 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset;
 
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.IOException;
 import java.nio.channels.Channels;
 import java.nio.channels.SeekableByteChannel;
 import java.nio.channels.WritableByteChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-
 import org.apache.arrow.dataset.file.DatasetFileWriter;
 import org.apache.arrow.dataset.file.FileFormat;
 import org.apache.arrow.memory.BufferAllocator;
@@ -80,62 +79,78 @@
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.arrow.vector.util.ByteArrayReadableSeekableByteChannel;
 import org.apache.arrow.vector.util.Text;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class TestAllTypes extends TestDataset {
 
-  @ClassRule
-  public static final TemporaryFolder TMP = new TemporaryFolder();
+  @TempDir public Path TMP;
 
   private VectorSchemaRoot generateAllTypesVector(BufferAllocator allocator) {
     // Notes:
     // - IntervalMonthDayNano is not supported by Parquet.
-    // - Map (GH-38250) and SparseUnion are resulting in serialization errors when writing with the Dataset API.
-    // "Unhandled type for Arrow to Parquet schema conversion" errors: IntervalDay, IntervalYear, DenseUnion
+    // - Map (GH-38250) and SparseUnion are resulting in serialization errors when writing with the
+    // Dataset API.
+    // "Unhandled type for Arrow to Parquet schema conversion" errors: IntervalDay, IntervalYear,
+    // DenseUnion
     List<Field> childFields = new ArrayList<>();
-    childFields.add(new Field("int-child",
-        new FieldType(false, new ArrowType.Int(32, true), null, null), null));
-    Field structField = new Field("struct",
-        new FieldType(true, ArrowType.Struct.INSTANCE, null, null), childFields);
-    Field[] fields = new Field[] {
-        Field.nullablePrimitive("null", ArrowType.Null.INSTANCE),
-        Field.nullablePrimitive("bool", ArrowType.Bool.INSTANCE),
-        Field.nullablePrimitive("int8", new ArrowType.Int(8, true)),
-        Field.nullablePrimitive("int16", new ArrowType.Int(16, true)),
-        Field.nullablePrimitive("int32", new ArrowType.Int(32, true)),
-        Field.nullablePrimitive("int64", new ArrowType.Int(64, true)),
-        Field.nullablePrimitive("uint8", new ArrowType.Int(8, false)),
-        Field.nullablePrimitive("uint16", new ArrowType.Int(16, false)),
-        Field.nullablePrimitive("uint32", new ArrowType.Int(32, false)),
-        Field.nullablePrimitive("uint64", new ArrowType.Int(64, false)),
-        Field.nullablePrimitive("float16", new ArrowType.FloatingPoint(FloatingPointPrecision.HALF)),
-        Field.nullablePrimitive("float32", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
-        Field.nullablePrimitive("float64", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
-        Field.nullablePrimitive("utf8", ArrowType.Utf8.INSTANCE),
-        Field.nullablePrimitive("binary", ArrowType.Binary.INSTANCE),
-        Field.nullablePrimitive("largeutf8", ArrowType.LargeUtf8.INSTANCE),
-        Field.nullablePrimitive("largebinary", ArrowType.LargeBinary.INSTANCE),
-        Field.nullablePrimitive("fixed_size_binary", new ArrowType.FixedSizeBinary(1)),
-        Field.nullablePrimitive("date_ms", new ArrowType.Date(DateUnit.MILLISECOND)),
-        Field.nullablePrimitive("time_ms", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
-        Field.nullablePrimitive("timestamp_ms", new ArrowType.Timestamp(TimeUnit.MILLISECOND, null)),
-        Field.nullablePrimitive("timestamptz_ms", new ArrowType.Timestamp(TimeUnit.MILLISECOND, "UTC")),
-        Field.nullablePrimitive("time_ns", new ArrowType.Time(TimeUnit.NANOSECOND, 64)),
-        Field.nullablePrimitive("timestamp_ns", new ArrowType.Timestamp(TimeUnit.NANOSECOND, null)),
-        Field.nullablePrimitive("timestamptz_ns", new ArrowType.Timestamp(TimeUnit.NANOSECOND, "UTC")),
-        Field.nullablePrimitive("duration", new ArrowType.Duration(TimeUnit.MILLISECOND)),
-        Field.nullablePrimitive("decimal128", new ArrowType.Decimal(10, 2, 128)),
-        Field.nullablePrimitive("decimal256", new ArrowType.Decimal(10, 2, 256)),
-        new Field("list", FieldType.nullable(ArrowType.List.INSTANCE),
-            Collections.singletonList(Field.nullable("items", new ArrowType.Int(32, true)))),
-        new Field("largelist", FieldType.nullable(ArrowType.LargeList.INSTANCE),
-            Collections.singletonList(Field.nullable("items", new ArrowType.Int(32, true)))),
-        new Field("fixedsizelist", FieldType.nullable(new ArrowType.FixedSizeList(2)),
-            Collections.singletonList(Field.nullable("items", new ArrowType.Int(32, true)))),
-        structField
-    };
+    childFields.add(
+        new Field(
+            "int-child", new FieldType(false, new ArrowType.Int(32, true), null, null), null));
+    Field structField =
+        new Field(
+            "struct", new FieldType(true, ArrowType.Struct.INSTANCE, null, null), childFields);
+    Field[] fields =
+        new Field[] {
+          Field.nullablePrimitive("null", ArrowType.Null.INSTANCE),
+          Field.nullablePrimitive("bool", ArrowType.Bool.INSTANCE),
+          Field.nullablePrimitive("int8", new ArrowType.Int(8, true)),
+          Field.nullablePrimitive("int16", new ArrowType.Int(16, true)),
+          Field.nullablePrimitive("int32", new ArrowType.Int(32, true)),
+          Field.nullablePrimitive("int64", new ArrowType.Int(64, true)),
+          Field.nullablePrimitive("uint8", new ArrowType.Int(8, false)),
+          Field.nullablePrimitive("uint16", new ArrowType.Int(16, false)),
+          Field.nullablePrimitive("uint32", new ArrowType.Int(32, false)),
+          Field.nullablePrimitive("uint64", new ArrowType.Int(64, false)),
+          Field.nullablePrimitive(
+              "float16", new ArrowType.FloatingPoint(FloatingPointPrecision.HALF)),
+          Field.nullablePrimitive(
+              "float32", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
+          Field.nullablePrimitive(
+              "float64", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
+          Field.nullablePrimitive("utf8", ArrowType.Utf8.INSTANCE),
+          Field.nullablePrimitive("binary", ArrowType.Binary.INSTANCE),
+          Field.nullablePrimitive("largeutf8", ArrowType.LargeUtf8.INSTANCE),
+          Field.nullablePrimitive("largebinary", ArrowType.LargeBinary.INSTANCE),
+          Field.nullablePrimitive("fixed_size_binary", new ArrowType.FixedSizeBinary(1)),
+          Field.nullablePrimitive("date_ms", new ArrowType.Date(DateUnit.MILLISECOND)),
+          Field.nullablePrimitive("time_ms", new ArrowType.Time(TimeUnit.MILLISECOND, 32)),
+          Field.nullablePrimitive(
+              "timestamp_ms", new ArrowType.Timestamp(TimeUnit.MILLISECOND, null)),
+          Field.nullablePrimitive(
+              "timestamptz_ms", new ArrowType.Timestamp(TimeUnit.MILLISECOND, "UTC")),
+          Field.nullablePrimitive("time_ns", new ArrowType.Time(TimeUnit.NANOSECOND, 64)),
+          Field.nullablePrimitive(
+              "timestamp_ns", new ArrowType.Timestamp(TimeUnit.NANOSECOND, null)),
+          Field.nullablePrimitive(
+              "timestamptz_ns", new ArrowType.Timestamp(TimeUnit.NANOSECOND, "UTC")),
+          Field.nullablePrimitive("duration", new ArrowType.Duration(TimeUnit.MILLISECOND)),
+          Field.nullablePrimitive("decimal128", new ArrowType.Decimal(10, 2, 128)),
+          Field.nullablePrimitive("decimal256", new ArrowType.Decimal(10, 2, 256)),
+          new Field(
+              "list",
+              FieldType.nullable(ArrowType.List.INSTANCE),
+              Collections.singletonList(Field.nullable("items", new ArrowType.Int(32, true)))),
+          new Field(
+              "largelist",
+              FieldType.nullable(ArrowType.LargeList.INSTANCE),
+              Collections.singletonList(Field.nullable("items", new ArrowType.Int(32, true)))),
+          new Field(
+              "fixedsizelist",
+              FieldType.nullable(new ArrowType.FixedSizeList(2)),
+              Collections.singletonList(Field.nullable("items", new ArrowType.Int(32, true)))),
+          structField
+        };
     VectorSchemaRoot root = VectorSchemaRoot.create(new Schema(Arrays.asList(fields)), allocator);
     root.allocateNew();
     root.setRowCount(2);
@@ -201,7 +216,8 @@ private VectorSchemaRoot generateAllTypesVector(BufferAllocator allocator) {
     ((DurationVector) root.getVector("duration")).set(1, 0);
     ((DecimalVector) root.getVector("decimal128")).set(1, 0);
     ((Decimal256Vector) root.getVector("decimal256")).set(1, 0);
-    UnionFixedSizeListWriter fixedListWriter = ((FixedSizeListVector) root.getVector("fixedsizelist")).getWriter();
+    UnionFixedSizeListWriter fixedListWriter =
+        ((FixedSizeListVector) root.getVector("fixedsizelist")).getWriter();
     fixedListWriter.allocate();
     fixedListWriter.setPosition(1);
     fixedListWriter.startList();
@@ -215,7 +231,8 @@ private VectorSchemaRoot generateAllTypesVector(BufferAllocator allocator) {
     listWriter.integer().writeInt(1);
     listWriter.endList();
 
-    UnionLargeListWriter largeListWriter = ((LargeListVector) root.getVector("largelist")).getWriter();
+    UnionLargeListWriter largeListWriter =
+        ((LargeListVector) root.getVector("largelist")).getWriter();
     largeListWriter.allocate();
     largeListWriter.setPosition(1);
     largeListWriter.startList();
@@ -227,11 +244,9 @@ private VectorSchemaRoot generateAllTypesVector(BufferAllocator allocator) {
   }
 
   private byte[] serializeFile(VectorSchemaRoot root) {
-    try (
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
+    try (ByteArrayOutputStream out = new ByteArrayOutputStream();
         WritableByteChannel channel = Channels.newChannel(out);
-        ArrowStreamWriter writer = new ArrowStreamWriter(root, null, channel)
-    ) {
+        ArrowStreamWriter writer = new ArrowStreamWriter(root, null, channel)) {
       writer.start();
       writer.writeBatch();
       writer.end();
@@ -247,19 +262,21 @@ public void testAllTypesParquet() throws Exception {
       byte[] featherData = serializeFile(root);
       try (SeekableByteChannel channel = new ByteArrayReadableSeekableByteChannel(featherData)) {
         try (ArrowStreamReader reader = new ArrowStreamReader(channel, rootAllocator())) {
-          TMP.create();
-          final File writtenFolder = TMP.newFolder();
-          final String writtenParquet = writtenFolder.toURI().toString();
-          DatasetFileWriter.write(rootAllocator(), reader, FileFormat.PARQUET,
-              writtenParquet);
+          final Path writtenFolder = Files.createTempDirectory(TMP, "writtenFolder");
+          final String writtenParquet = writtenFolder.toUri().toString();
+          DatasetFileWriter.write(rootAllocator(), reader, FileFormat.PARQUET, writtenParquet);
 
-          // Load the reference file from the test resources and write to a temporary file on the OS.
-          String referenceFile = ArrowTestDataUtil.getTestDataRoot()
-              .resolve("parquet")
-              .resolve("alltypes-java.parquet")
-              .toUri().toString();
-          assertParquetFileEquals(referenceFile,
-              Objects.requireNonNull(writtenFolder.listFiles())[0].toURI().toString());
+          // Load the reference file from the test resources and write to a temporary file on the
+          // OS.
+          String referenceFile =
+              ArrowTestDataUtil.getTestDataRoot()
+                  .resolve("parquet")
+                  .resolve("alltypes-java.parquet")
+                  .toUri()
+                  .toString();
+          assertParquetFileEquals(
+              referenceFile,
+              Objects.requireNonNull(writtenFolder.toFile().listFiles())[0].toURI().toString());
         }
       }
     }
diff --git a/java/dataset/src/test/java/org/apache/arrow/dataset/TestDataset.java b/java/dataset/src/test/java/org/apache/arrow/dataset/TestDataset.java
index cafa63b7880ce..f3ca04d77b39b 100644
--- a/java/dataset/src/test/java/org/apache/arrow/dataset/TestDataset.java
+++ b/java/dataset/src/test/java/org/apache/arrow/dataset/TestDataset.java
@@ -14,9 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -26,7 +28,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
-
 import org.apache.arrow.dataset.file.FileFormat;
 import org.apache.arrow.dataset.file.FileSystemDatasetFactory;
 import org.apache.arrow.dataset.jni.NativeMemoryPool;
@@ -45,20 +46,18 @@
 import org.apache.arrow.vector.ipc.ArrowReader;
 import org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 public abstract class TestDataset {
   private BufferAllocator allocator = null;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     allocator.close();
   }
@@ -67,7 +66,8 @@ protected BufferAllocator rootAllocator() {
     return allocator;
   }
 
-  protected List<ArrowRecordBatch> collectResultFromFactory(DatasetFactory factory, ScanOptions options) {
+  protected List<ArrowRecordBatch> collectResultFromFactory(
+      DatasetFactory factory, ScanOptions options) {
     final Dataset dataset = factory.finish();
     final Scanner scanner = dataset.newScan(options);
     try {
@@ -108,22 +108,25 @@ protected Schema inferResultSchemaFromFactory(DatasetFactory factory, ScanOption
   }
 
   protected void assertParquetFileEquals(String expectedURI, String actualURI) throws Exception {
-    final FileSystemDatasetFactory expectedFactory = new FileSystemDatasetFactory(
-        rootAllocator(), NativeMemoryPool.getDefault(), FileFormat.PARQUET, expectedURI);
-    final FileSystemDatasetFactory actualFactory = new FileSystemDatasetFactory(
-        rootAllocator(), NativeMemoryPool.getDefault(), FileFormat.PARQUET, actualURI);
-    List<ArrowRecordBatch> expectedBatches = collectResultFromFactory(expectedFactory,
-        new ScanOptions(new String[0], 100));
-    List<ArrowRecordBatch> actualBatches = collectResultFromFactory(actualFactory,
-        new ScanOptions(new String[0], 100));
-    try (
-        VectorSchemaRoot expectVsr = VectorSchemaRoot.create(expectedFactory.inspect(), rootAllocator());
-        VectorSchemaRoot actualVsr = VectorSchemaRoot.create(actualFactory.inspect(), rootAllocator())) {
+    final FileSystemDatasetFactory expectedFactory =
+        new FileSystemDatasetFactory(
+            rootAllocator(), NativeMemoryPool.getDefault(), FileFormat.PARQUET, expectedURI);
+    final FileSystemDatasetFactory actualFactory =
+        new FileSystemDatasetFactory(
+            rootAllocator(), NativeMemoryPool.getDefault(), FileFormat.PARQUET, actualURI);
+    List<ArrowRecordBatch> expectedBatches =
+        collectResultFromFactory(expectedFactory, new ScanOptions(new String[0], 100));
+    List<ArrowRecordBatch> actualBatches =
+        collectResultFromFactory(actualFactory, new ScanOptions(new String[0], 100));
+    try (VectorSchemaRoot expectVsr =
+            VectorSchemaRoot.create(expectedFactory.inspect(), rootAllocator());
+        VectorSchemaRoot actualVsr =
+            VectorSchemaRoot.create(actualFactory.inspect(), rootAllocator())) {
 
       // fast-fail by comparing metadata
-      Assert.assertEquals(expectedBatches.toString(), actualBatches.toString());
+      assertEquals(expectedBatches.toString(), actualBatches.toString());
       // compare ArrowRecordBatches
-      Assert.assertEquals(expectedBatches.size(), actualBatches.size());
+      assertEquals(expectedBatches.size(), actualBatches.size());
       VectorLoader expectLoader = new VectorLoader(expectVsr);
       VectorLoader actualLoader = new VectorLoader(actualVsr);
       for (int i = 0; i < expectedBatches.size(); i++) {
@@ -133,7 +136,7 @@ protected void assertParquetFileEquals(String expectedURI, String actualURI) thr
           FieldVector vector = expectVsr.getFieldVectors().get(i);
           FieldVector otherVector = actualVsr.getFieldVectors().get(i);
           // TODO: ARROW-18140 Use VectorSchemaRoot#equals() method to compare
-          Assert.assertTrue(VectorEqualsVisitor.vectorEquals(vector, otherVector));
+          assertTrue(VectorEqualsVisitor.vectorEquals(vector, otherVector));
         }
       }
     } finally {
@@ -150,7 +153,8 @@ protected <T> List<T> collect(Iterable<T> iterable) {
   }
 
   protected <T> Stream<T> stream(Iterator<T> iterator) {
-    return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, Spliterator.ORDERED), false);
+    return StreamSupport.stream(
+        Spliterators.spliteratorUnknownSize(iterator, Spliterator.ORDERED), false);
   }
 
   protected <T> List<T> collect(Iterator<T> iterator) {
diff --git a/java/dataset/src/test/java/org/apache/arrow/dataset/TextBasedWriteSupport.java b/java/dataset/src/test/java/org/apache/arrow/dataset/TextBasedWriteSupport.java
index 43f96f6d4d6da..9e6559824ce7f 100644
--- a/java/dataset/src/test/java/org/apache/arrow/dataset/TextBasedWriteSupport.java
+++ b/java/dataset/src/test/java/org/apache/arrow/dataset/TextBasedWriteSupport.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset;
 
 import java.io.File;
@@ -29,11 +28,19 @@ public class TextBasedWriteSupport {
   private final Random random = new Random();
 
   public TextBasedWriteSupport(File outputFolder, String fileExtension) throws URISyntaxException {
-    uri = new URI("file", outputFolder.getPath() + File.separator +
-        "generated-" + random.nextLong() + fileExtension, null);
+    uri =
+        new URI(
+            "file",
+            outputFolder.getPath()
+                + File.separator
+                + "generated-"
+                + random.nextLong()
+                + fileExtension,
+            null);
   }
 
-  public static TextBasedWriteSupport writeTempFile(File outputFolder, String fileExtension, String... values)
+  public static TextBasedWriteSupport writeTempFile(
+      File outputFolder, String fileExtension, String... values)
       throws URISyntaxException, IOException {
     TextBasedWriteSupport writer = new TextBasedWriteSupport(outputFolder, fileExtension);
     try (FileWriter addValues = new FileWriter(new File(writer.uri), true)) {
diff --git a/java/dataset/src/test/java/org/apache/arrow/dataset/file/TestDatasetFileWriter.java b/java/dataset/src/test/java/org/apache/arrow/dataset/file/TestDatasetFileWriter.java
index 86797c165b2b1..ba99392a6c4b7 100644
--- a/java/dataset/src/test/java/org/apache/arrow/dataset/file/TestDatasetFileWriter.java
+++ b/java/dataset/src/test/java/org/apache/arrow/dataset/file/TestDatasetFileWriter.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.file;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.File;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.dataset.ParquetWriteSupport;
 import org.apache.arrow.dataset.TestDataset;
 import org.apache.arrow.dataset.jni.NativeMemoryPool;
@@ -32,65 +32,75 @@
 import org.apache.arrow.dataset.scanner.Scanner;
 import org.apache.arrow.dataset.source.Dataset;
 import org.apache.commons.io.FileUtils;
-import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class TestDatasetFileWriter extends TestDataset {
 
-  @ClassRule
-  public static final TemporaryFolder TMP = new TemporaryFolder();
+  @TempDir public File TMP;
 
   public static final String AVRO_SCHEMA_USER = "user.avsc";
 
   @Test
   public void testParquetWriteSimple() throws Exception {
-    ParquetWriteSupport writeSupport = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(),
-        1, "a", 2, "b", 3, "c", 2, "d");
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a", 2, "b", 3, "c", 2, "d");
     String sampleParquet = writeSupport.getOutputURI();
     ScanOptions options = new ScanOptions(new String[0], 100);
-    final File writtenFolder = TMP.newFolder();
+    final File writtenFolder = new File(TMP, "writtenFolder");
+    writtenFolder.mkdirs();
     final String writtenParquet = writtenFolder.toURI().toString();
-    try (FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-        FileFormat.PARQUET, sampleParquet);
-         final Dataset dataset = factory.finish();
-         final Scanner scanner = dataset.newScan(options);
-         final ArrowScannerReader reader = new ArrowScannerReader(scanner, rootAllocator());
-    ) {
+    try (FileSystemDatasetFactory factory =
+            new FileSystemDatasetFactory(
+                rootAllocator(), NativeMemoryPool.getDefault(), FileFormat.PARQUET, sampleParquet);
+        final Dataset dataset = factory.finish();
+        final Scanner scanner = dataset.newScan(options);
+        final ArrowScannerReader reader = new ArrowScannerReader(scanner, rootAllocator()); ) {
       DatasetFileWriter.write(rootAllocator(), reader, FileFormat.PARQUET, writtenParquet);
-      assertParquetFileEquals(sampleParquet, Objects.requireNonNull(writtenFolder.listFiles())[0].toURI().toString());
+      assertParquetFileEquals(
+          sampleParquet, Objects.requireNonNull(writtenFolder.listFiles())[0].toURI().toString());
     }
   }
 
   @Test
   public void testParquetWriteWithPartitions() throws Exception {
-    ParquetWriteSupport writeSupport = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(),
-        1, "a", 2, "b", 3, "c", 2, "d");
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a", 2, "b", 3, "c", 2, "d");
     String sampleParquet = writeSupport.getOutputURI();
     ScanOptions options = new ScanOptions(new String[0], 100);
-    final File writtenFolder = TMP.newFolder();
+    final File writtenFolder = new File(TMP, "writtenFolder");
+    writtenFolder.mkdirs();
     final String writtenParquet = writtenFolder.toURI().toString();
 
-    try (FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-        FileFormat.PARQUET, sampleParquet);
-         final Dataset dataset = factory.finish();
-         final Scanner scanner = dataset.newScan(options);
-         final ArrowScannerReader reader = new ArrowScannerReader(scanner, rootAllocator());
-    ) {
-      DatasetFileWriter.write(rootAllocator(), reader,
-          FileFormat.PARQUET, writtenParquet, new String[]{"id", "name"},
-          100, "data_{i}");
-      final Set<String> expectedOutputFiles = new HashSet<>(
-          Arrays.asList("id=1/name=a/data_0", "id=2/name=b/data_0", "id=3/name=c/data_0", "id=2/name=d/data_0"));
-      final Set<String> outputFiles = FileUtils.listFiles(writtenFolder, null, true)
-          .stream()
-          .map(file -> {
-            return writtenFolder.toURI().relativize(file.toURI()).toString();
-          })
-          .collect(Collectors.toSet());
-      Assert.assertEquals(expectedOutputFiles, outputFiles);
+    try (FileSystemDatasetFactory factory =
+            new FileSystemDatasetFactory(
+                rootAllocator(), NativeMemoryPool.getDefault(), FileFormat.PARQUET, sampleParquet);
+        final Dataset dataset = factory.finish();
+        final Scanner scanner = dataset.newScan(options);
+        final ArrowScannerReader reader = new ArrowScannerReader(scanner, rootAllocator()); ) {
+      DatasetFileWriter.write(
+          rootAllocator(),
+          reader,
+          FileFormat.PARQUET,
+          writtenParquet,
+          new String[] {"id", "name"},
+          100,
+          "data_{i}");
+      final Set<String> expectedOutputFiles =
+          new HashSet<>(
+              Arrays.asList(
+                  "id=1/name=a/data_0",
+                  "id=2/name=b/data_0",
+                  "id=3/name=c/data_0",
+                  "id=2/name=d/data_0"));
+      final Set<String> outputFiles =
+          FileUtils.listFiles(writtenFolder, null, true).stream()
+              .map(
+                  file -> {
+                    return writtenFolder.toURI().relativize(file.toURI()).toString();
+                  })
+              .collect(Collectors.toSet());
+      assertEquals(expectedOutputFiles, outputFiles);
     }
   }
 }
-
diff --git a/java/dataset/src/test/java/org/apache/arrow/dataset/file/TestFileSystemDataset.java b/java/dataset/src/test/java/org/apache/arrow/dataset/file/TestFileSystemDataset.java
index 6ca559ee2d72e..0b085d25b32eb 100644
--- a/java/dataset/src/test/java/org/apache/arrow/dataset/file/TestFileSystemDataset.java
+++ b/java/dataset/src/test/java/org/apache/arrow/dataset/file/TestFileSystemDataset.java
@@ -14,14 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.file;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.primitives.Primitives;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -36,7 +37,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.dataset.OrcWriteSupport;
 import org.apache.arrow.dataset.ParquetWriteSupport;
 import org.apache.arrow.dataset.TextBasedWriteSupport;
@@ -62,28 +62,26 @@
 import org.apache.avro.generic.GenericRecordBuilder;
 import org.apache.hadoop.fs.Path;
 import org.apache.orc.TypeDescription;
-import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
-import org.junit.rules.TemporaryFolder;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.primitives.Primitives;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class TestFileSystemDataset extends TestNativeDataset {
 
-  @ClassRule
-  public static final TemporaryFolder TMP = new TemporaryFolder();
+  @TempDir public File TMP;
 
   public static final String AVRO_SCHEMA_USER = "user.avsc";
 
   @Test
   public void testBaseParquetRead() throws Exception {
-    ParquetWriteSupport writeSupport = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 1, "a");
-
-    FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-        FileFormat.PARQUET, writeSupport.getOutputURI());
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a");
+
+    FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(),
+            NativeMemoryPool.getDefault(),
+            FileFormat.PARQUET,
+            writeSupport.getOutputURI());
     ScanOptions options = new ScanOptions(100);
     Schema schema = inferResultSchemaFromFactory(factory, options);
     List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);
@@ -103,15 +101,19 @@ public void testBaseParquetRead() throws Exception {
 
   @Test
   public void testMultipleParquetReadFromUris() throws Exception {
-    ParquetWriteSupport writeSupport1 = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(),
-            1, "a");
-    ParquetWriteSupport writeSupport2 = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(),
-            2, "b");
+    ParquetWriteSupport writeSupport1 =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a");
+    ParquetWriteSupport writeSupport2 =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 2, "b");
     String expectedJsonUnordered = "[[1,\"a\"],[2,\"b\"]]";
 
     ScanOptions options = new ScanOptions(1);
-    FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-            FileFormat.PARQUET, new String[]{writeSupport1.getOutputURI(), writeSupport2.getOutputURI()});
+    FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(),
+            NativeMemoryPool.getDefault(),
+            FileFormat.PARQUET,
+            new String[] {writeSupport1.getOutputURI(), writeSupport2.getOutputURI()});
     Schema schema = inferResultSchemaFromFactory(factory, options);
     List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);
 
@@ -124,33 +126,49 @@ public void testMultipleParquetReadFromUris() throws Exception {
     AutoCloseables.close(factory);
   }
 
-
   @Test
   public void testMultipleParquetInvalidUri() throws Exception {
-    RuntimeException exc = assertThrows(RuntimeException.class,
-        () -> new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-            FileFormat.PARQUET, new String[]{"https://example.com", "file:///test/location"}));
-    Assertions.assertEquals("Unrecognized filesystem type in URI: https://example.com", exc.getMessage());
+    RuntimeException exc =
+        assertThrows(
+            RuntimeException.class,
+            () ->
+                new FileSystemDatasetFactory(
+                    rootAllocator(),
+                    NativeMemoryPool.getDefault(),
+                    FileFormat.PARQUET,
+                    new String[] {"https://example.com", "file:///test/location"}));
+    assertEquals("Unrecognized filesystem type in URI: https://example.com", exc.getMessage());
   }
 
   @Test
   public void testMultipleParquetMultipleFilesystemTypes() throws Exception {
-    RuntimeException exc = assertThrows(RuntimeException.class,
-        () -> new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-            FileFormat.PARQUET, new String[]{"file:///test/location", "s3:///test/bucket/file" }));
-    Assertions.assertTrue(
-            exc.getMessage().startsWith("The filesystem expected a URI with one of the schemes (file) but received s3"
-            )
-    );
+    RuntimeException exc =
+        assertThrows(
+            RuntimeException.class,
+            () ->
+                new FileSystemDatasetFactory(
+                    rootAllocator(),
+                    NativeMemoryPool.getDefault(),
+                    FileFormat.PARQUET,
+                    new String[] {"file:///test/location", "s3:///test/bucket/file"}));
+    assertTrue(
+        exc.getMessage()
+            .startsWith(
+                "The filesystem expected a URI with one of the schemes (file) but received s3"));
   }
 
   @Test
   public void testParquetProjectSingleColumn() throws Exception {
-    ParquetWriteSupport writeSupport = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 1, "a");
-
-    FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-        FileFormat.PARQUET, writeSupport.getOutputURI());
-    ScanOptions options = new ScanOptions(100, Optional.of(new String[]{"id"}));
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a");
+
+    FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(),
+            NativeMemoryPool.getDefault(),
+            FileFormat.PARQUET,
+            writeSupport.getOutputURI());
+    ScanOptions options = new ScanOptions(100, Optional.of(new String[] {"id"}));
     Schema schema = inferResultSchemaFromFactory(factory, options);
     List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);
     org.apache.avro.Schema expectedSchema = truncateAvroSchema(writeSupport.getAvroSchema(), 0, 1);
@@ -160,12 +178,10 @@ public void testParquetProjectSingleColumn() throws Exception {
     assertEquals("id", schema.getFields().get(0).getName());
     assertEquals(Types.MinorType.INT.getType(), schema.getFields().get(0).getType());
     assertEquals(1, datum.size());
-    checkParquetReadResult(schema,
-        Collections.singletonList(
-            new GenericRecordBuilder(
-                expectedSchema)
-                .set("id", 1)
-                .build()), datum);
+    checkParquetReadResult(
+        schema,
+        Collections.singletonList(new GenericRecordBuilder(expectedSchema).set("id", 1).build()),
+        datum);
 
     AutoCloseables.close(datum);
     AutoCloseables.close(factory);
@@ -173,12 +189,16 @@ public void testParquetProjectSingleColumn() throws Exception {
 
   @Test
   public void testParquetBatchSize() throws Exception {
-    ParquetWriteSupport writeSupport = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(),
-        1, "a", 2, "b", 3, "c");
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a", 2, "b", 3, "c");
 
     ScanOptions options = new ScanOptions(1);
-    FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-        FileFormat.PARQUET, writeSupport.getOutputURI());
+    FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(),
+            NativeMemoryPool.getDefault(),
+            FileFormat.PARQUET,
+            writeSupport.getOutputURI());
     Schema schema = inferResultSchemaFromFactory(factory, options);
     List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);
 
@@ -193,16 +213,20 @@ public void testParquetBatchSize() throws Exception {
 
   @Test
   public void testParquetDirectoryRead() throws Exception {
-    final File outputFolder = TMP.newFolder();
-    ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, outputFolder,
-        1, "a", 2, "b", 3, "c");
-    ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, outputFolder,
-        4, "e", 5, "f", 6, "g", 7, "h");
-    String expectedJsonUnordered = "[[1,\"a\"],[2,\"b\"],[3,\"c\"],[4,\"e\"],[5,\"f\"],[6,\"g\"],[7,\"h\"]]";
+    final File outputFolder = TMP;
+    ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, outputFolder, 1, "a", 2, "b", 3, "c");
+    ParquetWriteSupport.writeTempFile(
+        AVRO_SCHEMA_USER, outputFolder, 4, "e", 5, "f", 6, "g", 7, "h");
+    String expectedJsonUnordered =
+        "[[1,\"a\"],[2,\"b\"],[3,\"c\"],[4,\"e\"],[5,\"f\"],[6,\"g\"],[7,\"h\"]]";
 
     ScanOptions options = new ScanOptions(new String[0], 1);
-    FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-        FileFormat.PARQUET, outputFolder.toURI().toString());
+    FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(),
+            NativeMemoryPool.getDefault(),
+            FileFormat.PARQUET,
+            outputFolder.toURI().toString());
     Schema schema = inferResultSchemaFromFactory(factory, options);
     List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);
 
@@ -216,33 +240,41 @@ public void testParquetDirectoryRead() throws Exception {
 
   @Test
   public void testEmptyProjectSelectsZeroColumns() throws Exception {
-    ParquetWriteSupport writeSupport = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 1, "a");
-
-    FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-        FileFormat.PARQUET, writeSupport.getOutputURI());
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a");
+
+    FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(),
+            NativeMemoryPool.getDefault(),
+            FileFormat.PARQUET,
+            writeSupport.getOutputURI());
     ScanOptions options = new ScanOptions(100, Optional.of(new String[0]));
     Schema schema = inferResultSchemaFromFactory(factory, options);
     List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);
-    org.apache.avro.Schema expectedSchema = org.apache.avro.Schema.createRecord(Collections.emptyList());
+    org.apache.avro.Schema expectedSchema =
+        org.apache.avro.Schema.createRecord(Collections.emptyList());
 
     assertScanBatchesProduced(factory, options);
     assertEquals(0, schema.getFields().size());
     assertEquals(1, datum.size());
-    checkParquetReadResult(schema,
-        Collections.singletonList(
-            new GenericRecordBuilder(
-                expectedSchema)
-                .build()), datum);
+    checkParquetReadResult(
+        schema, Collections.singletonList(new GenericRecordBuilder(expectedSchema).build()), datum);
 
     AutoCloseables.close(datum);
   }
 
   @Test
   public void testNullProjectSelectsAllColumns() throws Exception {
-    ParquetWriteSupport writeSupport = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 1, "a");
-
-    FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-        FileFormat.PARQUET, writeSupport.getOutputURI());
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a");
+
+    FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(),
+            NativeMemoryPool.getDefault(),
+            FileFormat.PARQUET,
+            writeSupport.getOutputURI());
     ScanOptions options = new ScanOptions(100, Optional.empty());
     Schema schema = inferResultSchemaFromFactory(factory, options);
     List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);
@@ -261,35 +293,46 @@ public void testNullProjectSelectsAllColumns() throws Exception {
 
   @Test
   public void testNoErrorWhenCloseAgain() throws Exception {
-    ParquetWriteSupport writeSupport = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 1, "a");
-
-    FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-        FileFormat.PARQUET, writeSupport.getOutputURI());
-
-    assertDoesNotThrow(() -> {
-      NativeDataset dataset = factory.finish();
-      dataset.close();
-      dataset.close();
-    });
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a");
+
+    FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(),
+            NativeMemoryPool.getDefault(),
+            FileFormat.PARQUET,
+            writeSupport.getOutputURI());
+
+    assertDoesNotThrow(
+        () -> {
+          NativeDataset dataset = factory.finish();
+          dataset.close();
+          dataset.close();
+        });
 
     AutoCloseables.close(factory);
   }
 
   @Test
   public void testErrorThrownWhenScanBatchesAgain() throws Exception {
-    ParquetWriteSupport writeSupport = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 1, "a");
-
-    FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-        FileFormat.PARQUET, writeSupport.getOutputURI());
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a");
+
+    FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(),
+            NativeMemoryPool.getDefault(),
+            FileFormat.PARQUET,
+            writeSupport.getOutputURI());
     NativeDataset dataset = factory.finish();
     ScanOptions options = new ScanOptions(100);
     NativeScanner scanner = dataset.newScan(options);
     List<ArrowRecordBatch> datum = collectTaskData(scanner);
     AutoCloseables.close(datum);
-    UnsupportedOperationException uoe = assertThrows(UnsupportedOperationException.class,
-            scanner::scanBatches);
-    Assertions.assertEquals("NativeScanner can only be executed once. Create a new scanner instead",
-        uoe.getMessage());
+    UnsupportedOperationException uoe =
+        assertThrows(UnsupportedOperationException.class, scanner::scanBatches);
+    assertEquals(
+        "NativeScanner can only be executed once. Create a new scanner instead", uoe.getMessage());
 
     AutoCloseables.close(scanner, dataset, factory);
   }
@@ -297,10 +340,15 @@ public void testErrorThrownWhenScanBatchesAgain() throws Exception {
   @Test
   public void testScanBatchesInOtherThread() throws Exception {
     ExecutorService executor = Executors.newSingleThreadExecutor();
-    ParquetWriteSupport writeSupport = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 1, "a");
-
-    FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-        FileFormat.PARQUET, writeSupport.getOutputURI());
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a");
+
+    FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(),
+            NativeMemoryPool.getDefault(),
+            FileFormat.PARQUET,
+            writeSupport.getOutputURI());
     NativeDataset dataset = factory.finish();
     ScanOptions options = new ScanOptions(100);
     NativeScanner scanner = dataset.newScan(options);
@@ -312,10 +360,15 @@ public void testScanBatchesInOtherThread() throws Exception {
 
   @Test
   public void testErrorThrownWhenScanBatchesAfterScannerClose() throws Exception {
-    ParquetWriteSupport writeSupport = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 1, "a");
-
-    FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-        FileFormat.PARQUET, writeSupport.getOutputURI());
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a");
+
+    FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(),
+            NativeMemoryPool.getDefault(),
+            FileFormat.PARQUET,
+            writeSupport.getOutputURI());
     NativeDataset dataset = factory.finish();
     ScanOptions options = new ScanOptions(100);
     NativeScanner scanner = dataset.newScan(options);
@@ -327,10 +380,15 @@ public void testErrorThrownWhenScanBatchesAfterScannerClose() throws Exception {
 
   @Test
   public void testErrorThrownWhenReadAfterNativeReaderClose() throws Exception {
-    ParquetWriteSupport writeSupport = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 1, "a");
-
-    FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-        FileFormat.PARQUET, writeSupport.getOutputURI());
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a");
+
+    FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(),
+            NativeMemoryPool.getDefault(),
+            FileFormat.PARQUET,
+            writeSupport.getOutputURI());
     NativeDataset dataset = factory.finish();
     ScanOptions options = new ScanOptions(100);
     NativeScanner scanner = dataset.newScan(options);
@@ -343,11 +401,13 @@ public void testErrorThrownWhenReadAfterNativeReaderClose() throws Exception {
 
   @Test
   public void testBaseArrowIpcRead() throws Exception {
-    File dataFile = TMP.newFile();
-    Schema sourceSchema = new Schema(Collections.singletonList(Field.nullable("ints", new ArrowType.Int(32, true))));
+    File dataFile = new File(TMP, "datafile");
+    Schema sourceSchema =
+        new Schema(Collections.singletonList(Field.nullable("ints", new ArrowType.Int(32, true))));
     try (VectorSchemaRoot root = VectorSchemaRoot.create(sourceSchema, rootAllocator());
-         FileOutputStream sink = new FileOutputStream(dataFile);
-         ArrowFileWriter writer = new ArrowFileWriter(root, /*dictionaryProvider=*/null, sink.getChannel())) {
+        FileOutputStream sink = new FileOutputStream(dataFile);
+        ArrowFileWriter writer =
+            new ArrowFileWriter(root, /*dictionaryProvider=*/ null, sink.getChannel())) {
       IntVector ints = (IntVector) root.getVector(0);
       ints.setSafe(0, 0);
       ints.setSafe(1, 1024);
@@ -359,8 +419,9 @@ public void testBaseArrowIpcRead() throws Exception {
     }
 
     String arrowDataURI = dataFile.toURI().toString();
-    FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-            FileFormat.ARROW_IPC, arrowDataURI);
+    FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(), NativeMemoryPool.getDefault(), FileFormat.ARROW_IPC, arrowDataURI);
     ScanOptions options = new ScanOptions(100);
     Schema schema = inferResultSchemaFromFactory(factory, options);
     List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);
@@ -380,15 +441,17 @@ public void testBaseArrowIpcRead() throws Exception {
   @Test
   public void testBaseOrcRead() throws Exception {
     String dataName = "test-orc";
-    String basePath = TMP.getRoot().getAbsolutePath();
+    String basePath = TMP.getAbsolutePath();
 
     TypeDescription orcSchema = TypeDescription.fromString("struct<ints:int>");
     Path path = new Path(basePath, dataName);
-    OrcWriteSupport.writeTempFile(orcSchema, path, new Integer[]{Integer.MIN_VALUE, Integer.MAX_VALUE});
+    OrcWriteSupport.writeTempFile(
+        orcSchema, path, new Integer[] {Integer.MIN_VALUE, Integer.MAX_VALUE});
 
     String orcDatasetUri = new File(basePath, dataName).toURI().toString();
-    FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-            FileFormat.ORC, orcDatasetUri);
+    FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(), NativeMemoryPool.getDefault(), FileFormat.ORC, orcDatasetUri);
     ScanOptions options = new ScanOptions(100);
     Schema schema = inferResultSchemaFromFactory(factory, options);
     List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);
@@ -407,14 +470,18 @@ public void testBaseOrcRead() throws Exception {
 
   @Test
   public void testBaseCsvRead() throws Exception {
-    TextBasedWriteSupport writeSupport = TextBasedWriteSupport.writeTempFile(
-            TMP.newFolder(), ".csv", "Name,Language", "Juno,Java", "Peter,Python", "Celin,C++");
-    String expectedJsonUnordered = "[[\"Juno\", \"Java\"], [\"Peter\", \"Python\"], [\"Celin\", \"C++\"]]";
+    TextBasedWriteSupport writeSupport =
+        TextBasedWriteSupport.writeTempFile(
+            TMP, ".csv", "Name,Language", "Juno,Java", "Peter,Python", "Celin,C++");
+    String expectedJsonUnordered =
+        "[[\"Juno\", \"Java\"], [\"Peter\", \"Python\"], [\"Celin\", \"C++\"]]";
     ScanOptions options = new ScanOptions(100);
-    try (
-        FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-            FileFormat.CSV, writeSupport.getOutputURI())
-    ) {
+    try (FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(),
+            NativeMemoryPool.getDefault(),
+            FileFormat.CSV,
+            writeSupport.getOutputURI())) {
       List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);
       Schema schema = inferResultSchemaFromFactory(factory, options);
 
@@ -431,17 +498,20 @@ public void testBaseCsvRead() throws Exception {
 
   @Test
   public void testBaseJsonRead() throws Exception {
-    TextBasedWriteSupport writeSupport = TextBasedWriteSupport.writeTempFile(
-        TMP.newFolder(), ".json",
-        "{\"Type\": \"Compiled\", \"Language\": \"Java\"}",
-                "{\"Type\": \"Interpreted\", \"Language\": \"Python\"}");
-    String expectedJsonUnordered = "[[\"Compiled\", \"Java\"], " +
-                                   "[\"Interpreted\", \"Python\"]]";
+    TextBasedWriteSupport writeSupport =
+        TextBasedWriteSupport.writeTempFile(
+            TMP,
+            ".json",
+            "{\"Type\": \"Compiled\", \"Language\": \"Java\"}",
+            "{\"Type\": \"Interpreted\", \"Language\": \"Python\"}");
+    String expectedJsonUnordered = "[[\"Compiled\", \"Java\"], " + "[\"Interpreted\", \"Python\"]]";
     ScanOptions options = new ScanOptions(100);
-    try (
-        FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-            FileFormat.JSON, writeSupport.getOutputURI())
-    ) {
+    try (FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(),
+            NativeMemoryPool.getDefault(),
+            FileFormat.JSON,
+            writeSupport.getOutputURI())) {
       List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);
       Schema schema = inferResultSchemaFromFactory(factory, options);
 
@@ -457,8 +527,8 @@ public void testBaseJsonRead() throws Exception {
     }
   }
 
-  private void checkParquetReadResult(Schema schema, String expectedJson, List<ArrowRecordBatch> actual)
-      throws IOException {
+  private void checkParquetReadResult(
+      Schema schema, String expectedJson, List<ArrowRecordBatch> actual) throws IOException {
     final ObjectMapper json = new ObjectMapper();
     final Set<?> expectedSet = json.readValue(expectedJson, Set.class);
     final Set<List<Object>> actualSet = new HashSet<>();
@@ -482,14 +552,15 @@ private void checkParquetReadResult(Schema schema, String expectedJson, List<Arr
         }
       }
     }
-    Assert.assertEquals("Mismatched data read from Parquet, actual: " + json.writeValueAsString(actualSet) + ";",
-        expectedSet, actualSet);
+    assertEquals(
+        expectedSet,
+        actualSet,
+        "Mismatched data read from Parquet, actual: " + json.writeValueAsString(actualSet) + ";");
   }
 
-  private void checkParquetReadResult(Schema schema, List<GenericRecord> expected, List<ArrowRecordBatch> actual) {
-    assertEquals(expected.size(), actual.stream()
-        .mapToInt(ArrowRecordBatch::getLength)
-        .sum());
+  private void checkParquetReadResult(
+      Schema schema, List<GenericRecord> expected, List<ArrowRecordBatch> actual) {
+    assertEquals(expected.size(), actual.stream().mapToInt(ArrowRecordBatch::getLength).sum());
     final int fieldCount = schema.getFields().size();
     LinkedList<GenericRecord> expectedRemovable = new LinkedList<>(expected);
     try (VectorSchemaRoot vsr = VectorSchemaRoot.create(schema, rootAllocator())) {
@@ -503,8 +574,7 @@ private void checkParquetReadResult(Schema schema, List<GenericRecord> expected,
           for (int j = 0; j < batchRowCount; j++) {
             Object object = vector.getObject(j);
             Object expectedObject = expectedRemovable.get(j).get(i);
-            assertEquals(Objects.toString(expectedObject),
-                Objects.toString(object));
+            assertEquals(Objects.toString(expectedObject), Objects.toString(object));
           }
         }
         for (int i = 0; i < batchRowCount; i++) {
@@ -515,11 +585,15 @@ private void checkParquetReadResult(Schema schema, List<GenericRecord> expected,
     }
   }
 
-  private org.apache.avro.Schema truncateAvroSchema(org.apache.avro.Schema schema, int from, int to) {
+  private org.apache.avro.Schema truncateAvroSchema(
+      org.apache.avro.Schema schema, int from, int to) {
     List<org.apache.avro.Schema.Field> fields = schema.getFields().subList(from, to);
     return org.apache.avro.Schema.createRecord(
         fields.stream()
-            .map(f -> new org.apache.avro.Schema.Field(f.name(), f.schema(), f.doc(), f.defaultVal(), f.order()))
+            .map(
+                f ->
+                    new org.apache.avro.Schema.Field(
+                        f.name(), f.schema(), f.doc(), f.defaultVal(), f.order()))
             .collect(Collectors.toList()));
   }
 }
diff --git a/java/dataset/src/test/java/org/apache/arrow/dataset/file/TestFileSystemDatasetFactory.java b/java/dataset/src/test/java/org/apache/arrow/dataset/file/TestFileSystemDatasetFactory.java
index bddf96b5ec9e7..69d80c334169e 100644
--- a/java/dataset/src/test/java/org/apache/arrow/dataset/file/TestFileSystemDatasetFactory.java
+++ b/java/dataset/src/test/java/org/apache/arrow/dataset/file/TestFileSystemDatasetFactory.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.file;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -23,26 +22,37 @@
 
 import org.apache.arrow.dataset.jni.NativeMemoryPool;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestFileSystemDatasetFactory {
 
   @Test
   public void testErrorHandling() {
-    RuntimeException e = assertThrows(RuntimeException.class, () -> {
-      new FileSystemDatasetFactory(new RootAllocator(Long.MAX_VALUE), NativeMemoryPool.getDefault(),
-          FileFormat.NONE, "file:///NON_EXIST_FILE");
-    });
+    RuntimeException e =
+        assertThrows(
+            RuntimeException.class,
+            () -> {
+              new FileSystemDatasetFactory(
+                  new RootAllocator(Long.MAX_VALUE),
+                  NativeMemoryPool.getDefault(),
+                  FileFormat.NONE,
+                  "file:///NON_EXIST_FILE");
+            });
     assertEquals("illegal file format id: -1", e.getMessage());
   }
 
   @Test
   public void testCloseAgain() {
-    assertDoesNotThrow(() -> {
-      FileSystemDatasetFactory factory = new FileSystemDatasetFactory(new RootAllocator(Long.MAX_VALUE),
-          NativeMemoryPool.getDefault(), FileFormat.PARQUET, "file:///NON_EXIST_FILE");
-      factory.close();
-      factory.close();
-    });
+    assertDoesNotThrow(
+        () -> {
+          FileSystemDatasetFactory factory =
+              new FileSystemDatasetFactory(
+                  new RootAllocator(Long.MAX_VALUE),
+                  NativeMemoryPool.getDefault(),
+                  FileFormat.PARQUET,
+                  "file:///NON_EXIST_FILE");
+          factory.close();
+          factory.close();
+        });
   }
 }
diff --git a/java/dataset/src/test/java/org/apache/arrow/dataset/jni/TestNativeDataset.java b/java/dataset/src/test/java/org/apache/arrow/dataset/jni/TestNativeDataset.java
index d0f91769096d8..3a262c5b8580b 100644
--- a/java/dataset/src/test/java/org/apache/arrow/dataset/jni/TestNativeDataset.java
+++ b/java/dataset/src/test/java/org/apache/arrow/dataset/jni/TestNativeDataset.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.jni;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import org.apache.arrow.dataset.TestDataset;
 import org.apache.arrow.dataset.scanner.ScanOptions;
 import org.apache.arrow.dataset.scanner.Scanner;
 import org.apache.arrow.dataset.source.Dataset;
 import org.apache.arrow.dataset.source.DatasetFactory;
-import org.junit.Assert;
 
 public abstract class TestNativeDataset extends TestDataset {
   protected void assertScanBatchesProduced(DatasetFactory factory, ScanOptions options) {
     final Dataset dataset = factory.finish();
     final Scanner scanner = dataset.newScan(options);
-    Assert.assertNotNull(scanner.scanBatches());
+    assertNotNull(scanner.scanBatches());
   }
 }
diff --git a/java/dataset/src/test/java/org/apache/arrow/dataset/jni/TestReservationListener.java b/java/dataset/src/test/java/org/apache/arrow/dataset/jni/TestReservationListener.java
index fa42f7ee7cdc1..f366c824d2ded 100644
--- a/java/dataset/src/test/java/org/apache/arrow/dataset/jni/TestReservationListener.java
+++ b/java/dataset/src/test/java/org/apache/arrow/dataset/jni/TestReservationListener.java
@@ -14,12 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.jni;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.File;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.apache.arrow.dataset.ParquetWriteSupport;
 import org.apache.arrow.dataset.TestDataset;
 import org.apache.arrow.dataset.file.FileFormat;
@@ -27,26 +30,23 @@
 import org.apache.arrow.dataset.scanner.ScanOptions;
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
-import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
-import org.junit.rules.TemporaryFolder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class TestReservationListener extends TestDataset {
 
-  @ClassRule
-  public static final TemporaryFolder TMP = new TemporaryFolder();
+  @TempDir public File TMP;
 
   public static final String AVRO_SCHEMA_USER = "user.avsc";
 
   @Test
   public void testDirectReservationListener() throws Exception {
-    ParquetWriteSupport writeSupport = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 1, "a");
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a");
     NativeMemoryPool pool = NativeMemoryPool.createListenable(DirectReservationListener.instance());
-    FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(),
-        pool, FileFormat.PARQUET,
-        writeSupport.getOutputURI());
+    FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(), pool, FileFormat.PARQUET, writeSupport.getOutputURI());
     ScanOptions options = new ScanOptions(100);
     long initReservation = DirectReservationListener.instance().getCurrentDirectMemReservation();
     List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);
@@ -54,28 +54,31 @@ public void testDirectReservationListener() throws Exception {
     AutoCloseables.close(datum);
     AutoCloseables.close(pool);
     long finalReservation = DirectReservationListener.instance().getCurrentDirectMemReservation();
-    Assert.assertTrue(reservation >= initReservation);
-    Assert.assertEquals(initReservation, finalReservation);
+    assertTrue(reservation >= initReservation);
+    assertEquals(initReservation, finalReservation);
   }
 
   @Test
   public void testCustomReservationListener() throws Exception {
-    ParquetWriteSupport writeSupport = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 1, "a");
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a");
     final AtomicLong reserved = new AtomicLong(0L);
-    ReservationListener listener = new ReservationListener() {
-      @Override
-      public void reserve(long size) {
-        reserved.getAndAdd(size);
-      }
+    ReservationListener listener =
+        new ReservationListener() {
+          @Override
+          public void reserve(long size) {
+            reserved.getAndAdd(size);
+          }
 
-      @Override
-      public void unreserve(long size) {
-        reserved.getAndAdd(-size);
-      }
-    };
+          @Override
+          public void unreserve(long size) {
+            reserved.getAndAdd(-size);
+          }
+        };
     NativeMemoryPool pool = NativeMemoryPool.createListenable(listener);
-    FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(),
-        pool, FileFormat.PARQUET, writeSupport.getOutputURI());
+    FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(), pool, FileFormat.PARQUET, writeSupport.getOutputURI());
     ScanOptions options = new ScanOptions(100);
     long initReservation = reserved.get();
     List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options);
@@ -83,38 +86,44 @@ public void unreserve(long size) {
     AutoCloseables.close(datum);
     AutoCloseables.close(pool);
     long finalReservation = reserved.get();
-    Assert.assertTrue(reservation >= initReservation);
-    Assert.assertEquals(initReservation, finalReservation);
+    assertTrue(reservation >= initReservation);
+    assertEquals(initReservation, finalReservation);
   }
 
   @Test
   public void testErrorThrownFromReservationListener() throws Exception {
     final String errorMessage = "ERROR_MESSAGE";
-    ParquetWriteSupport writeSupport = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 1, "a");
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a");
     final AtomicLong reserved = new AtomicLong(0L);
-    ReservationListener listener = new ReservationListener() {
-      @Override
-      public void reserve(long size) {
-        throw new IllegalArgumentException(errorMessage);
-      }
+    ReservationListener listener =
+        new ReservationListener() {
+          @Override
+          public void reserve(long size) {
+            throw new IllegalArgumentException(errorMessage);
+          }
 
-      @Override
-      public void unreserve(long size) {
-        // no-op
-      }
-    };
+          @Override
+          public void unreserve(long size) {
+            // no-op
+          }
+        };
     NativeMemoryPool pool = NativeMemoryPool.createListenable(listener);
-    FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(),
-        pool, FileFormat.PARQUET, writeSupport.getOutputURI());
+    FileSystemDatasetFactory factory =
+        new FileSystemDatasetFactory(
+            rootAllocator(), pool, FileFormat.PARQUET, writeSupport.getOutputURI());
     ScanOptions options = new ScanOptions(100);
     long initReservation = reserved.get();
-    Assertions.assertThrows(IllegalArgumentException.class, () -> {
-      collectResultFromFactory(factory, options);
-    }, errorMessage);
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          collectResultFromFactory(factory, options);
+        },
+        errorMessage);
     long reservation = reserved.get();
     AutoCloseables.close(pool);
     long finalReservation = reserved.get();
-    Assert.assertEquals(initReservation, reservation);
-    Assert.assertEquals(initReservation, finalReservation);
+    assertEquals(initReservation, reservation);
+    assertEquals(initReservation, finalReservation);
   }
 }
diff --git a/java/dataset/src/test/java/org/apache/arrow/dataset/substrait/TestAceroSubstraitConsumer.java b/java/dataset/src/test/java/org/apache/arrow/dataset/substrait/TestAceroSubstraitConsumer.java
index 0fba72892cdc6..97c185d7053d5 100644
--- a/java/dataset/src/test/java/org/apache/arrow/dataset/substrait/TestAceroSubstraitConsumer.java
+++ b/java/dataset/src/test/java/org/apache/arrow/dataset/substrait/TestAceroSubstraitConsumer.java
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.dataset.substrait;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.io.File;
 import java.nio.ByteBuffer;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -30,7 +31,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-
 import org.apache.arrow.dataset.ParquetWriteSupport;
 import org.apache.arrow.dataset.TestDataset;
 import org.apache.arrow.dataset.file.FileFormat;
@@ -40,44 +40,55 @@
 import org.apache.arrow.dataset.scanner.Scanner;
 import org.apache.arrow.dataset.source.Dataset;
 import org.apache.arrow.dataset.source.DatasetFactory;
+import org.apache.arrow.vector.ValueIterableVector;
 import org.apache.arrow.vector.ipc.ArrowReader;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.apache.arrow.vector.util.Text;
+import org.hamcrest.collection.IsIterableContainingInOrder;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class TestAceroSubstraitConsumer extends TestDataset {
 
-  @ClassRule
-  public static final TemporaryFolder TMP = new TemporaryFolder();
+  @TempDir public File TMP;
+
   public static final String AVRO_SCHEMA_USER = "user.avsc";
 
   @Test
   public void testRunQueryLocalFiles() throws Exception {
-    //Query:
-    //SELECT id, name FROM Users
-    //Isthmus:
-    //./isthmus-macOS-0.7.0  -c "CREATE TABLE USERS ( id INT NOT NULL, name VARCHAR(150));" "SELECT id, name FROM Users"
-    //VARCHAR(150) -> is mapping to -> {ARROW:extension:name=varchar, ARROW:extension:metadata=varchar{length:150}}
+    // Query:
+    // SELECT id, name FROM Users
+    // Isthmus:
+    // ./isthmus-macOS-0.7.0  -c "CREATE TABLE USERS ( id INT NOT NULL, name VARCHAR(150));" "SELECT
+    // id, name FROM Users"
+    // VARCHAR(150) -> is mapping to -> {ARROW:extension:name=varchar,
+    // ARROW:extension:metadata=varchar{length:150}}
     Map<String, String> metadataName = new HashMap<>();
     metadataName.put("ARROW:extension:name", "varchar");
     metadataName.put("ARROW:extension:metadata", "varchar{length:150}");
-    final Schema schema = new Schema(Arrays.asList(
-        Field.nullable("ID", new ArrowType.Int(32, true)),
-        new Field("NAME", new FieldType(true, new ArrowType.Utf8(), null, metadataName), null)
-    ), Collections.emptyMap());
-    ParquetWriteSupport writeSupport = ParquetWriteSupport
-        .writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 1, "a", 11, "b", 21, "c");
-    try (ArrowReader arrowReader = new AceroSubstraitConsumer(rootAllocator())
-        .runQuery(
-            new String(Files.readAllBytes(Paths.get(TestAceroSubstraitConsumer.class.getClassLoader()
-                .getResource("substrait/local_files_users.json").toURI()))).replace("FILENAME_PLACEHOLDER",
-                writeSupport.getOutputURI())
-        )
-    ) {
+    final Schema schema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("ID", new ArrowType.Int(32, true)),
+                new Field(
+                    "NAME", new FieldType(true, new ArrowType.Utf8(), null, metadataName), null)),
+            Collections.emptyMap());
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a", 11, "b", 21, "c");
+    try (ArrowReader arrowReader =
+        new AceroSubstraitConsumer(rootAllocator())
+            .runQuery(
+                new String(
+                        Files.readAllBytes(
+                            Paths.get(
+                                TestAceroSubstraitConsumer.class
+                                    .getClassLoader()
+                                    .getResource("substrait/local_files_users.json")
+                                    .toURI())))
+                    .replace("FILENAME_PLACEHOLDER", writeSupport.getOutputURI()))) {
       assertEquals(schema, arrowReader.getVectorSchemaRoot().getSchema());
       int rowcount = 0;
       while (arrowReader.loadNextBatch()) {
@@ -89,31 +100,42 @@ public void testRunQueryLocalFiles() throws Exception {
 
   @Test
   public void testRunQueryNamedTable() throws Exception {
-    //Query:
-    //SELECT id, name FROM Users
-    //Isthmus:
-    //./isthmus-macOS-0.7.0  -c "CREATE TABLE USERS ( id INT NOT NULL, name VARCHAR(150));" "SELECT id, name FROM Users"
-    final Schema schema = new Schema(Arrays.asList(
-        Field.nullable("ID", new ArrowType.Int(32, true)),
-        Field.nullable("NAME", new ArrowType.Utf8())
-    ), Collections.emptyMap());
-    ParquetWriteSupport writeSupport = ParquetWriteSupport
-        .writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 1, "a", 11, "b", 21, "c");
+    // Query:
+    // SELECT id, name FROM Users
+    // Isthmus:
+    // ./isthmus-macOS-0.7.0  -c "CREATE TABLE USERS ( id INT NOT NULL, name VARCHAR(150));" "SELECT
+    // id, name FROM Users"
+    final Schema schema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("ID", new ArrowType.Int(32, true)),
+                Field.nullable("NAME", new ArrowType.Utf8())),
+            Collections.emptyMap());
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a", 11, "b", 21, "c");
     ScanOptions options = new ScanOptions(/*batchSize*/ 32768);
-    try (
-        DatasetFactory datasetFactory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-            FileFormat.PARQUET, writeSupport.getOutputURI());
+    try (DatasetFactory datasetFactory =
+            new FileSystemDatasetFactory(
+                rootAllocator(),
+                NativeMemoryPool.getDefault(),
+                FileFormat.PARQUET,
+                writeSupport.getOutputURI());
         Dataset dataset = datasetFactory.finish();
         Scanner scanner = dataset.newScan(options);
-        ArrowReader reader = scanner.scanBatches()
-    ) {
+        ArrowReader reader = scanner.scanBatches()) {
       Map<String, ArrowReader> mapTableToArrowReader = new HashMap<>();
       mapTableToArrowReader.put("USERS", reader);
-      try (ArrowReader arrowReader = new AceroSubstraitConsumer(rootAllocator()).runQuery(
-          new String(Files.readAllBytes(Paths.get(TestAceroSubstraitConsumer.class.getClassLoader()
-              .getResource("substrait/named_table_users.json").toURI()))),
-          mapTableToArrowReader
-      )) {
+      try (ArrowReader arrowReader =
+          new AceroSubstraitConsumer(rootAllocator())
+              .runQuery(
+                  new String(
+                      Files.readAllBytes(
+                          Paths.get(
+                              TestAceroSubstraitConsumer.class
+                                  .getClassLoader()
+                                  .getResource("substrait/named_table_users.json")
+                                  .toURI()))),
+                  mapTableToArrowReader)) {
         assertEquals(schema, arrowReader.getVectorSchemaRoot().getSchema());
         assertEquals(arrowReader.getVectorSchemaRoot().getSchema(), schema);
         int rowcount = 0;
@@ -125,77 +147,96 @@ public void testRunQueryNamedTable() throws Exception {
     }
   }
 
-  @Test(expected = RuntimeException.class)
+  @Test
   public void testRunQueryNamedTableWithException() throws Exception {
-    //Query:
-    //SELECT id, name FROM Users
-    //Isthmus:
-    //./isthmus-macOS-0.7.0  -c "CREATE TABLE USERS ( id INT NOT NULL, name VARCHAR(150));" "SELECT id, name FROM Users"
-    final Schema schema = new Schema(Arrays.asList(
-        Field.nullable("ID", new ArrowType.Int(32, true)),
-        Field.nullable("NAME", new ArrowType.Utf8())
-    ), Collections.emptyMap());
-    ParquetWriteSupport writeSupport = ParquetWriteSupport
-        .writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 1, "a", 11, "b", 21, "c");
+    // Query:
+    // SELECT id, name FROM Users
+    // Isthmus:
+    // ./isthmus-macOS-0.7.0  -c "CREATE TABLE USERS ( id INT NOT NULL, name VARCHAR(150));" "SELECT
+    // id, name FROM Users"
+    final Schema schema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("ID", new ArrowType.Int(32, true)),
+                Field.nullable("NAME", new ArrowType.Utf8())),
+            Collections.emptyMap());
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a", 11, "b", 21, "c");
     ScanOptions options = new ScanOptions(/*batchSize*/ 32768);
-    try (
-        DatasetFactory datasetFactory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-            FileFormat.PARQUET, writeSupport.getOutputURI());
+    try (DatasetFactory datasetFactory =
+            new FileSystemDatasetFactory(
+                rootAllocator(),
+                NativeMemoryPool.getDefault(),
+                FileFormat.PARQUET,
+                writeSupport.getOutputURI());
         Dataset dataset = datasetFactory.finish();
         Scanner scanner = dataset.newScan(options);
-        ArrowReader reader = scanner.scanBatches()
-    ) {
+        ArrowReader reader = scanner.scanBatches()) {
       Map<String, ArrowReader> mapTableToArrowReader = new HashMap<>();
       mapTableToArrowReader.put("USERS_INVALID_MAP", reader);
-      try (ArrowReader arrowReader = new AceroSubstraitConsumer(rootAllocator()).runQuery(
-          new String(Files.readAllBytes(Paths.get(TestAceroSubstraitConsumer.class.getClassLoader()
-              .getResource("substrait/named_table_users.json").toURI()))),
-          mapTableToArrowReader
-      )) {
-        assertEquals(schema, arrowReader.getVectorSchemaRoot().getSchema());
-        int rowcount = 0;
-        while (arrowReader.loadNextBatch()) {
-          rowcount += arrowReader.getVectorSchemaRoot().getRowCount();
-        }
-        assertEquals(3, rowcount);
-      }
+      assertThrows(
+          RuntimeException.class,
+          () -> {
+            try (ArrowReader arrowReader =
+                new AceroSubstraitConsumer(rootAllocator())
+                    .runQuery(
+                        new String(
+                            Files.readAllBytes(
+                                Paths.get(
+                                    TestAceroSubstraitConsumer.class
+                                        .getClassLoader()
+                                        .getResource("substrait/named_table_users.json")
+                                        .toURI()))),
+                        mapTableToArrowReader)) {
+              assertEquals(schema, arrowReader.getVectorSchemaRoot().getSchema());
+              int rowcount = 0;
+              while (arrowReader.loadNextBatch()) {
+                rowcount += arrowReader.getVectorSchemaRoot().getRowCount();
+              }
+              assertEquals(3, rowcount);
+            }
+          });
     }
   }
 
   @Test
   public void testRunBinaryQueryNamedTable() throws Exception {
-    //Query:
-    //SELECT id, name FROM Users
-    //Isthmus:
-    //./isthmus-macOS-0.7.0  -c "CREATE TABLE USERS ( id INT NOT NULL, name VARCHAR(150));" "SELECT id, name FROM Users"
-    final Schema schema = new Schema(Arrays.asList(
-        Field.nullable("ID", new ArrowType.Int(32, true)),
-        Field.nullable("NAME", new ArrowType.Utf8())
-    ), Collections.emptyMap());
+    // Query:
+    // SELECT id, name FROM Users
+    // Isthmus:
+    // ./isthmus-macOS-0.7.0  -c "CREATE TABLE USERS ( id INT NOT NULL, name VARCHAR(150));" "SELECT
+    // id, name FROM Users"
+    final Schema schema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("ID", new ArrowType.Int(32, true)),
+                Field.nullable("NAME", new ArrowType.Utf8())),
+            Collections.emptyMap());
     // Base64.getEncoder().encodeToString(plan.toByteArray());
     String binaryPlan =
-        "Gl8SXQpROk8KBhIECgICAxIvCi0KAgoAEh4KAklECgROQU1FEhIKBCoCEAEKC" +
-            "LIBBQiWARgBGAI6BwoFVVNFUlMaCBIGCgISACIAGgoSCAoEEgIIASIAEgJJRBIETkFNRQ==";
-    ParquetWriteSupport writeSupport = ParquetWriteSupport
-        .writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 1, "a", 11, "b", 21, "c");
+        "Gl8SXQpROk8KBhIECgICAxIvCi0KAgoAEh4KAklECgROQU1FEhIKBCoCEAEKC"
+            + "LIBBQiWARgBGAI6BwoFVVNFUlMaCBIGCgISACIAGgoSCAoEEgIIASIAEgJJRBIETkFNRQ==";
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP, 1, "a", 11, "b", 21, "c");
     ScanOptions options = new ScanOptions(/*batchSize*/ 32768);
-    try (
-        DatasetFactory datasetFactory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-            FileFormat.PARQUET, writeSupport.getOutputURI());
+    try (DatasetFactory datasetFactory =
+            new FileSystemDatasetFactory(
+                rootAllocator(),
+                NativeMemoryPool.getDefault(),
+                FileFormat.PARQUET,
+                writeSupport.getOutputURI());
         Dataset dataset = datasetFactory.finish();
         Scanner scanner = dataset.newScan(options);
-        ArrowReader reader = scanner.scanBatches()
-    ) {
+        ArrowReader reader = scanner.scanBatches()) {
       // map table to reader
       Map<String, ArrowReader> mapTableToArrowReader = new HashMap<>();
       mapTableToArrowReader.put("USERS", reader);
       // get binary plan
       ByteBuffer substraitPlan = getByteBuffer(binaryPlan);
       // run query
-      try (ArrowReader arrowReader = new AceroSubstraitConsumer(rootAllocator()).runQuery(
-          substraitPlan,
-          mapTableToArrowReader
-      )) {
+      try (ArrowReader arrowReader =
+          new AceroSubstraitConsumer(rootAllocator())
+              .runQuery(substraitPlan, mapTableToArrowReader)) {
         assertEquals(schema, arrowReader.getVectorSchemaRoot().getSchema());
         int rowcount = 0;
         while (arrowReader.loadNextBatch()) {
@@ -208,134 +249,222 @@ public void testRunBinaryQueryNamedTable() throws Exception {
 
   @Test
   public void testRunExtendedExpressionsFilter() throws Exception {
-    final Schema schema = new Schema(Arrays.asList(
-        Field.nullable("id", new ArrowType.Int(32, true)),
-        Field.nullable("name", new ArrowType.Utf8())
-    ), null);
+    final Schema schema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("id", new ArrowType.Int(32, true)),
+                Field.nullable("name", new ArrowType.Utf8())),
+            null);
     // Substrait Extended Expression: Filter:
     // Expression 01: WHERE ID < 20
-    String base64EncodedSubstraitFilter = "Ch4IARIaL2Z1bmN0aW9uc19jb21wYXJpc29uLnlhbWwSEhoQCAIQAhoKbHQ6YW55X2F" +
-        "ueRo3ChwaGggCGgQKAhABIggaBhIECgISACIGGgQKAigUGhdmaWx0ZXJfaWRfbG93ZXJfdGhhbl8yMCIaCgJJRAoETkFNRRIOCgQqAhA" +
-        "BCgRiAhABGAI=";
+    String base64EncodedSubstraitFilter =
+        "Ch4IARIaL2Z1bmN0aW9uc19jb21wYXJpc29uLnlhbWwSEhoQCAIQAhoKbHQ6YW55X2F"
+            + "ueRo3ChwaGggCGgQKAhABIggaBhIECgISACIGGgQKAigUGhdmaWx0ZXJfaWRfbG93ZXJfdGhhbl8yMCIaCgJJRAoETkFNRRIOCgQqAhA"
+            + "BCgRiAhABGAI=";
     ByteBuffer substraitExpressionFilter = getByteBuffer(base64EncodedSubstraitFilter);
-    ParquetWriteSupport writeSupport = ParquetWriteSupport
-        .writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 19, "value_19", 1, "value_1",
-            11, "value_11", 21, "value_21", 45, "value_45");
-    ScanOptions options = new ScanOptions.Builder(/*batchSize*/ 32768)
-        .columns(Optional.empty())
-        .substraitFilter(substraitExpressionFilter)
-        .build();
-    try (
-        DatasetFactory datasetFactory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-            FileFormat.PARQUET, writeSupport.getOutputURI());
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(
+            AVRO_SCHEMA_USER,
+            TMP,
+            19,
+            "value_19",
+            1,
+            "value_1",
+            11,
+            "value_11",
+            21,
+            "value_21",
+            45,
+            "value_45");
+    ScanOptions options =
+        new ScanOptions.Builder(/*batchSize*/ 32768)
+            .columns(Optional.empty())
+            .substraitFilter(substraitExpressionFilter)
+            .build();
+    try (DatasetFactory datasetFactory =
+            new FileSystemDatasetFactory(
+                rootAllocator(),
+                NativeMemoryPool.getDefault(),
+                FileFormat.PARQUET,
+                writeSupport.getOutputURI());
         Dataset dataset = datasetFactory.finish();
         Scanner scanner = dataset.newScan(options);
-        ArrowReader reader = scanner.scanBatches()
-    ) {
+        ArrowReader reader = scanner.scanBatches()) {
       assertEquals(schema.getFields(), reader.getVectorSchemaRoot().getSchema().getFields());
       int rowcount = 0;
       while (reader.loadNextBatch()) {
         rowcount += reader.getVectorSchemaRoot().getRowCount();
-        assertTrue(reader.getVectorSchemaRoot().getVector("id").toString().equals("[19, 1, 11]"));
-        assertTrue(reader.getVectorSchemaRoot().getVector("name").toString()
-            .equals("[value_19, value_1, value_11]"));
+        final ValueIterableVector<Integer> idVector =
+            (ValueIterableVector<Integer>) reader.getVectorSchemaRoot().getVector("id");
+        assertThat(idVector.getValueIterable(), IsIterableContainingInOrder.contains(19, 1, 11));
+        final ValueIterableVector<Text> nameVector =
+            (ValueIterableVector<Text>) reader.getVectorSchemaRoot().getVector("name");
+        assertThat(
+            nameVector.getValueIterable(),
+            IsIterableContainingInOrder.contains(
+                new Text("value_19"), new Text("value_1"), new Text("value_11")));
       }
       assertEquals(3, rowcount);
     }
   }
 
   @Test
-  public void testRunExtendedExpressionsFilterWithProjectionsInsteadOfFilterException() throws Exception {
-    final Schema schema = new Schema(Arrays.asList(
-        Field.nullable("id", new ArrowType.Int(32, true)),
-        Field.nullable("name", new ArrowType.Utf8())
-    ), null);
+  public void testRunExtendedExpressionsFilterWithProjectionsInsteadOfFilterException()
+      throws Exception {
+    final Schema schema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("id", new ArrowType.Int(32, true)),
+                Field.nullable("name", new ArrowType.Utf8())),
+            null);
     // Substrait Extended Expression: Project New Column:
     // Expression ADD: id + 2
     // Expression CONCAT: name + '-' + name
-    String base64EncodedSubstraitFilter = "Ch4IARIaL2Z1bmN0aW9uc19hcml0aG1ldGljLnlhbWwSERoPCAEaC2FkZDppM" +
-        "zJfaTMyEhQaEggCEAEaDGNvbmNhdDp2Y2hhchoxChoaGBoEKgIQASIIGgYSBAoCEgAiBhoECgIoAhoTYWRkX3R3b190b19jb2x1" +
-        "bW5fYRpGCi0aKwgBGgRiAhABIgoaCBIGCgQSAggBIgkaBwoFYgMgLSAiChoIEgYKBBICCAEaFWNvbmNhdF9jb2x1bW5fYV9hbmR" +
-        "fYiIaCgJJRAoETkFNRRIOCgQqAhABCgRiAhABGAI=";
+    String base64EncodedSubstraitFilter =
+        "Ch4IARIaL2Z1bmN0aW9uc19hcml0aG1ldGljLnlhbWwSERoPCAEaC2FkZDppM"
+            + "zJfaTMyEhQaEggCEAEaDGNvbmNhdDp2Y2hhchoxChoaGBoEKgIQASIIGgYSBAoCEgAiBhoECgIoAhoTYWRkX3R3b190b19jb2x1"
+            + "bW5fYRpGCi0aKwgBGgRiAhABIgoaCBIGCgQSAggBIgkaBwoFYgMgLSAiChoIEgYKBBICCAEaFWNvbmNhdF9jb2x1bW5fYV9hbmR"
+            + "fYiIaCgJJRAoETkFNRRIOCgQqAhABCgRiAhABGAI=";
     ByteBuffer substraitExpressionFilter = getByteBuffer(base64EncodedSubstraitFilter);
-    ParquetWriteSupport writeSupport = ParquetWriteSupport
-        .writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 19, "value_19", 1, "value_1",
-            11, "value_11", 21, "value_21", 45, "value_45");
-    ScanOptions options = new ScanOptions.Builder(/*batchSize*/ 32768)
-        .columns(Optional.empty())
-        .substraitFilter(substraitExpressionFilter)
-        .build();
-    try (
-        DatasetFactory datasetFactory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-            FileFormat.PARQUET, writeSupport.getOutputURI());
-        Dataset dataset = datasetFactory.finish()
-    ) {
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(
+            AVRO_SCHEMA_USER,
+            TMP,
+            19,
+            "value_19",
+            1,
+            "value_1",
+            11,
+            "value_11",
+            21,
+            "value_21",
+            45,
+            "value_45");
+    ScanOptions options =
+        new ScanOptions.Builder(/*batchSize*/ 32768)
+            .columns(Optional.empty())
+            .substraitFilter(substraitExpressionFilter)
+            .build();
+    try (DatasetFactory datasetFactory =
+            new FileSystemDatasetFactory(
+                rootAllocator(),
+                NativeMemoryPool.getDefault(),
+                FileFormat.PARQUET,
+                writeSupport.getOutputURI());
+        Dataset dataset = datasetFactory.finish()) {
       Exception e = assertThrows(RuntimeException.class, () -> dataset.newScan(options));
-      assertTrue(e.getMessage().startsWith("There is no filter expression in the expression provided"));
+      assertTrue(
+          e.getMessage().startsWith("There is no filter expression in the expression provided"));
     }
   }
 
   @Test
   public void testRunExtendedExpressionsFilterWithEmptyFilterException() throws Exception {
-    final Schema schema = new Schema(Arrays.asList(
-        Field.nullable("id", new ArrowType.Int(32, true)),
-        Field.nullable("name", new ArrowType.Utf8())
-    ), null);
+    final Schema schema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("id", new ArrowType.Int(32, true)),
+                Field.nullable("name", new ArrowType.Utf8())),
+            null);
     String base64EncodedSubstraitFilter = "";
     ByteBuffer substraitExpressionFilter = getByteBuffer(base64EncodedSubstraitFilter);
-    ParquetWriteSupport writeSupport = ParquetWriteSupport
-        .writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 19, "value_19", 1, "value_1",
-            11, "value_11", 21, "value_21", 45, "value_45");
-    ScanOptions options = new ScanOptions.Builder(/*batchSize*/ 32768)
-        .columns(Optional.empty())
-        .substraitFilter(substraitExpressionFilter)
-        .build();
-    try (
-        DatasetFactory datasetFactory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-            FileFormat.PARQUET, writeSupport.getOutputURI());
-        Dataset dataset = datasetFactory.finish()
-    ) {
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(
+            AVRO_SCHEMA_USER,
+            TMP,
+            19,
+            "value_19",
+            1,
+            "value_1",
+            11,
+            "value_11",
+            21,
+            "value_21",
+            45,
+            "value_45");
+    ScanOptions options =
+        new ScanOptions.Builder(/*batchSize*/ 32768)
+            .columns(Optional.empty())
+            .substraitFilter(substraitExpressionFilter)
+            .build();
+    try (DatasetFactory datasetFactory =
+            new FileSystemDatasetFactory(
+                rootAllocator(),
+                NativeMemoryPool.getDefault(),
+                FileFormat.PARQUET,
+                writeSupport.getOutputURI());
+        Dataset dataset = datasetFactory.finish()) {
       Exception e = assertThrows(RuntimeException.class, () -> dataset.newScan(options));
-      assertTrue(e.getMessage().contains("no anonymous struct type was provided to which names could be attached."));
+      assertTrue(
+          e.getMessage()
+              .contains("no anonymous struct type was provided to which names could be attached."));
     }
   }
 
   @Test
   public void testRunExtendedExpressionsProjection() throws Exception {
-    final Schema schema = new Schema(Arrays.asList(
-        Field.nullable("add_two_to_column_a", new ArrowType.Int(32, true)),
-        Field.nullable("concat_column_a_and_b", new ArrowType.Utf8())
-    ), null);
+    final Schema schema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("add_two_to_column_a", new ArrowType.Int(32, true)),
+                Field.nullable("concat_column_a_and_b", new ArrowType.Utf8())),
+            null);
     // Substrait Extended Expression: Project New Column:
     // Expression ADD: id + 2
     // Expression CONCAT: name + '-' + name
-    String binarySubstraitExpressionProject = "Ch4IARIaL2Z1bmN0aW9uc19hcml0aG1ldGljLnlhbWwSERoPCAEaC2FkZDppM" +
-        "zJfaTMyEhQaEggCEAEaDGNvbmNhdDp2Y2hhchoxChoaGBoEKgIQASIIGgYSBAoCEgAiBhoECgIoAhoTYWRkX3R3b190b19jb2x1" +
-        "bW5fYRpGCi0aKwgBGgRiAhABIgoaCBIGCgQSAggBIgkaBwoFYgMgLSAiChoIEgYKBBICCAEaFWNvbmNhdF9jb2x1bW5fYV9hbmR" +
-        "fYiIaCgJJRAoETkFNRRIOCgQqAhABCgRiAhABGAI=";
+    String binarySubstraitExpressionProject =
+        "Ch4IARIaL2Z1bmN0aW9uc19hcml0aG1ldGljLnlhbWwSERoPCAEaC2FkZDppM"
+            + "zJfaTMyEhQaEggCEAEaDGNvbmNhdDp2Y2hhchoxChoaGBoEKgIQASIIGgYSBAoCEgAiBhoECgIoAhoTYWRkX3R3b190b19jb2x1"
+            + "bW5fYRpGCi0aKwgBGgRiAhABIgoaCBIGCgQSAggBIgkaBwoFYgMgLSAiChoIEgYKBBICCAEaFWNvbmNhdF9jb2x1bW5fYV9hbmR"
+            + "fYiIaCgJJRAoETkFNRRIOCgQqAhABCgRiAhABGAI=";
     ByteBuffer substraitExpressionProject = getByteBuffer(binarySubstraitExpressionProject);
-    ParquetWriteSupport writeSupport = ParquetWriteSupport
-        .writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 19, "value_19", 1, "value_1",
-            11, "value_11", 21, "value_21", 45, "value_45");
-    ScanOptions options = new ScanOptions.Builder(/*batchSize*/ 32768)
-        .columns(Optional.empty())
-         .substraitProjection(substraitExpressionProject)
-        .build();
-    try (
-        DatasetFactory datasetFactory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-            FileFormat.PARQUET, writeSupport.getOutputURI());
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(
+            AVRO_SCHEMA_USER,
+            TMP,
+            19,
+            "value_19",
+            1,
+            "value_1",
+            11,
+            "value_11",
+            21,
+            "value_21",
+            45,
+            "value_45");
+    ScanOptions options =
+        new ScanOptions.Builder(/*batchSize*/ 32768)
+            .columns(Optional.empty())
+            .substraitProjection(substraitExpressionProject)
+            .build();
+    try (DatasetFactory datasetFactory =
+            new FileSystemDatasetFactory(
+                rootAllocator(),
+                NativeMemoryPool.getDefault(),
+                FileFormat.PARQUET,
+                writeSupport.getOutputURI());
         Dataset dataset = datasetFactory.finish();
         Scanner scanner = dataset.newScan(options);
-        ArrowReader reader = scanner.scanBatches()
-    ) {
+        ArrowReader reader = scanner.scanBatches()) {
       assertEquals(schema.getFields(), reader.getVectorSchemaRoot().getSchema().getFields());
       int rowcount = 0;
       while (reader.loadNextBatch()) {
-        assertTrue(reader.getVectorSchemaRoot().getVector("add_two_to_column_a").toString()
-            .equals("[21, 3, 13, 23, 47]"));
-        assertTrue(reader.getVectorSchemaRoot().getVector("concat_column_a_and_b").toString()
-            .equals("[value_19 - value_19, value_1 - value_1, value_11 - value_11, " +
-                "value_21 - value_21, value_45 - value_45]"));
+        final ValueIterableVector<Integer> sumVector =
+            (ValueIterableVector<Integer>)
+                reader.getVectorSchemaRoot().getVector("add_two_to_column_a");
+        assertThat(
+            sumVector.getValueIterable(), IsIterableContainingInOrder.contains(21, 3, 13, 23, 47));
+        final ValueIterableVector<Text> nameVector =
+            (ValueIterableVector<Text>)
+                reader.getVectorSchemaRoot().getVector("concat_column_a_and_b");
+        assertThat(
+            nameVector.getValueIterable(),
+            IsIterableContainingInOrder.contains(
+                new Text("value_19 - value_19"),
+                new Text("value_1 - value_1"),
+                new Text("value_11 - value_11"),
+                new Text("value_21 - value_21"),
+                new Text("value_45 - value_45")));
         rowcount += reader.getVectorSchemaRoot().getRowCount();
       }
       assertEquals(5, rowcount);
@@ -343,35 +472,55 @@ public void testRunExtendedExpressionsProjection() throws Exception {
   }
 
   @Test
-  public void testRunExtendedExpressionsProjectionWithFilterInsteadOfProjectionException() throws Exception {
-    final Schema schema = new Schema(Arrays.asList(
-        Field.nullable("filter_id_lower_than_20", new ArrowType.Bool())
-    ), null);
+  public void testRunExtendedExpressionsProjectionWithFilterInsteadOfProjectionException()
+      throws Exception {
+    final Schema schema =
+        new Schema(
+            Arrays.asList(Field.nullable("filter_id_lower_than_20", new ArrowType.Bool())), null);
     // Substrait Extended Expression: Filter:
     // Expression 01: WHERE ID < 20
-    String binarySubstraitExpressionFilter = "Ch4IARIaL2Z1bmN0aW9uc19jb21wYXJpc29uLnlhbWwSEhoQCAIQAhoKbHQ6YW55X2F" +
-        "ueRo3ChwaGggCGgQKAhABIggaBhIECgISACIGGgQKAigUGhdmaWx0ZXJfaWRfbG93ZXJfdGhhbl8yMCIaCgJJRAoETkFNRRIOCgQqAhA" +
-        "BCgRiAhABGAI=";
+    String binarySubstraitExpressionFilter =
+        "Ch4IARIaL2Z1bmN0aW9uc19jb21wYXJpc29uLnlhbWwSEhoQCAIQAhoKbHQ6YW55X2F"
+            + "ueRo3ChwaGggCGgQKAhABIggaBhIECgISACIGGgQKAigUGhdmaWx0ZXJfaWRfbG93ZXJfdGhhbl8yMCIaCgJJRAoETkFNRRIOCgQqAhA"
+            + "BCgRiAhABGAI=";
     ByteBuffer substraitExpressionFilter = getByteBuffer(binarySubstraitExpressionFilter);
-    ParquetWriteSupport writeSupport = ParquetWriteSupport
-        .writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 19, "value_19", 1, "value_1",
-            11, "value_11", 21, "value_21", 45, "value_45");
-    ScanOptions options = new ScanOptions.Builder(/*batchSize*/ 32768)
-        .columns(Optional.empty())
-        .substraitProjection(substraitExpressionFilter)
-        .build();
-    try (
-        DatasetFactory datasetFactory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-            FileFormat.PARQUET, writeSupport.getOutputURI());
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(
+            AVRO_SCHEMA_USER,
+            TMP,
+            19,
+            "value_19",
+            1,
+            "value_1",
+            11,
+            "value_11",
+            21,
+            "value_21",
+            45,
+            "value_45");
+    ScanOptions options =
+        new ScanOptions.Builder(/*batchSize*/ 32768)
+            .columns(Optional.empty())
+            .substraitProjection(substraitExpressionFilter)
+            .build();
+    try (DatasetFactory datasetFactory =
+            new FileSystemDatasetFactory(
+                rootAllocator(),
+                NativeMemoryPool.getDefault(),
+                FileFormat.PARQUET,
+                writeSupport.getOutputURI());
         Dataset dataset = datasetFactory.finish();
         Scanner scanner = dataset.newScan(options);
-        ArrowReader reader = scanner.scanBatches()
-    ) {
+        ArrowReader reader = scanner.scanBatches()) {
       assertEquals(schema.getFields(), reader.getVectorSchemaRoot().getSchema().getFields());
       int rowcount = 0;
       while (reader.loadNextBatch()) {
-        assertTrue(reader.getVectorSchemaRoot().getVector("filter_id_lower_than_20").toString()
-            .equals("[true, true, true, false, false]"));
+        final ValueIterableVector<Boolean> booleanVector =
+            (ValueIterableVector<Boolean>)
+                reader.getVectorSchemaRoot().getVector("filter_id_lower_than_20");
+        assertThat(
+            booleanVector.getValueIterable(),
+            IsIterableContainingInOrder.contains(true, true, true, false, false));
         rowcount += reader.getVectorSchemaRoot().getRowCount();
       }
       assertEquals(5, rowcount);
@@ -380,71 +529,116 @@ public void testRunExtendedExpressionsProjectionWithFilterInsteadOfProjectionExc
 
   @Test
   public void testRunExtendedExpressionsProjectionWithEmptyProjectionException() throws Exception {
-    final Schema schema = new Schema(Arrays.asList(
-        Field.nullable("id", new ArrowType.Int(32, true)),
-        Field.nullable("name", new ArrowType.Utf8())
-    ), null);
+    final Schema schema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("id", new ArrowType.Int(32, true)),
+                Field.nullable("name", new ArrowType.Utf8())),
+            null);
     String base64EncodedSubstraitFilter = "";
     ByteBuffer substraitExpressionProjection = getByteBuffer(base64EncodedSubstraitFilter);
-    ParquetWriteSupport writeSupport = ParquetWriteSupport
-        .writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 19, "value_19", 1, "value_1",
-            11, "value_11", 21, "value_21", 45, "value_45");
-    ScanOptions options = new ScanOptions.Builder(/*batchSize*/ 32768)
-        .columns(Optional.empty())
-        .substraitProjection(substraitExpressionProjection)
-        .build();
-    try (
-        DatasetFactory datasetFactory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-            FileFormat.PARQUET, writeSupport.getOutputURI());
-        Dataset dataset = datasetFactory.finish()
-    ) {
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(
+            AVRO_SCHEMA_USER,
+            TMP,
+            19,
+            "value_19",
+            1,
+            "value_1",
+            11,
+            "value_11",
+            21,
+            "value_21",
+            45,
+            "value_45");
+    ScanOptions options =
+        new ScanOptions.Builder(/*batchSize*/ 32768)
+            .columns(Optional.empty())
+            .substraitProjection(substraitExpressionProjection)
+            .build();
+    try (DatasetFactory datasetFactory =
+            new FileSystemDatasetFactory(
+                rootAllocator(),
+                NativeMemoryPool.getDefault(),
+                FileFormat.PARQUET,
+                writeSupport.getOutputURI());
+        Dataset dataset = datasetFactory.finish()) {
       Exception e = assertThrows(RuntimeException.class, () -> dataset.newScan(options));
-      assertTrue(e.getMessage().contains("no anonymous struct type was provided to which names could be attached."));
+      assertTrue(
+          e.getMessage()
+              .contains("no anonymous struct type was provided to which names could be attached."));
     }
   }
 
   @Test
   public void testRunExtendedExpressionsProjectAndFilter() throws Exception {
-    final Schema schema = new Schema(Arrays.asList(
-        Field.nullable("add_two_to_column_a", new ArrowType.Int(32, true)),
-        Field.nullable("concat_column_a_and_b", new ArrowType.Utf8())
-    ), null);
+    final Schema schema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("add_two_to_column_a", new ArrowType.Int(32, true)),
+                Field.nullable("concat_column_a_and_b", new ArrowType.Utf8())),
+            null);
     // Substrait Extended Expression: Project New Column:
     // Expression ADD: id + 2
     // Expression CONCAT: name + '-' + name
-    String binarySubstraitExpressionProject = "Ch4IARIaL2Z1bmN0aW9uc19hcml0aG1ldGljLnlhbWwSERoPCAEaC2FkZDppM" +
-        "zJfaTMyEhQaEggCEAEaDGNvbmNhdDp2Y2hhchoxChoaGBoEKgIQASIIGgYSBAoCEgAiBhoECgIoAhoTYWRkX3R3b190b19jb2x1" +
-        "bW5fYRpGCi0aKwgBGgRiAhABIgoaCBIGCgQSAggBIgkaBwoFYgMgLSAiChoIEgYKBBICCAEaFWNvbmNhdF9jb2x1bW5fYV9hbmR" +
-        "fYiIaCgJJRAoETkFNRRIOCgQqAhABCgRiAhABGAI=";
+    String binarySubstraitExpressionProject =
+        "Ch4IARIaL2Z1bmN0aW9uc19hcml0aG1ldGljLnlhbWwSERoPCAEaC2FkZDppM"
+            + "zJfaTMyEhQaEggCEAEaDGNvbmNhdDp2Y2hhchoxChoaGBoEKgIQASIIGgYSBAoCEgAiBhoECgIoAhoTYWRkX3R3b190b19jb2x1"
+            + "bW5fYRpGCi0aKwgBGgRiAhABIgoaCBIGCgQSAggBIgkaBwoFYgMgLSAiChoIEgYKBBICCAEaFWNvbmNhdF9jb2x1bW5fYV9hbmR"
+            + "fYiIaCgJJRAoETkFNRRIOCgQqAhABCgRiAhABGAI=";
     ByteBuffer substraitExpressionProject = getByteBuffer(binarySubstraitExpressionProject);
     // Substrait Extended Expression: Filter:
     // Expression 01: WHERE ID < 20
-    String base64EncodedSubstraitFilter = "Ch4IARIaL2Z1bmN0aW9uc19jb21wYXJpc29uLnlhbWwSEhoQCAIQAhoKbHQ6YW55X2F" +
-        "ueRo3ChwaGggCGgQKAhABIggaBhIECgISACIGGgQKAigUGhdmaWx0ZXJfaWRfbG93ZXJfdGhhbl8yMCIaCgJJRAoETkFNRRIOCgQqAhA" +
-        "BCgRiAhABGAI=";
+    String base64EncodedSubstraitFilter =
+        "Ch4IARIaL2Z1bmN0aW9uc19jb21wYXJpc29uLnlhbWwSEhoQCAIQAhoKbHQ6YW55X2F"
+            + "ueRo3ChwaGggCGgQKAhABIggaBhIECgISACIGGgQKAigUGhdmaWx0ZXJfaWRfbG93ZXJfdGhhbl8yMCIaCgJJRAoETkFNRRIOCgQqAhA"
+            + "BCgRiAhABGAI=";
     ByteBuffer substraitExpressionFilter = getByteBuffer(base64EncodedSubstraitFilter);
-    ParquetWriteSupport writeSupport = ParquetWriteSupport
-        .writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 19, "value_19", 1, "value_1",
-            11, "value_11", 21, "value_21", 45, "value_45");
-    ScanOptions options = new ScanOptions.Builder(/*batchSize*/ 32768)
-        .columns(Optional.empty())
-        .substraitProjection(substraitExpressionProject)
-        .substraitFilter(substraitExpressionFilter)
-        .build();
-    try (
-        DatasetFactory datasetFactory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(),
-            FileFormat.PARQUET, writeSupport.getOutputURI());
+    ParquetWriteSupport writeSupport =
+        ParquetWriteSupport.writeTempFile(
+            AVRO_SCHEMA_USER,
+            TMP,
+            19,
+            "value_19",
+            1,
+            "value_1",
+            11,
+            "value_11",
+            21,
+            "value_21",
+            45,
+            "value_45");
+    ScanOptions options =
+        new ScanOptions.Builder(/*batchSize*/ 32768)
+            .columns(Optional.empty())
+            .substraitProjection(substraitExpressionProject)
+            .substraitFilter(substraitExpressionFilter)
+            .build();
+    try (DatasetFactory datasetFactory =
+            new FileSystemDatasetFactory(
+                rootAllocator(),
+                NativeMemoryPool.getDefault(),
+                FileFormat.PARQUET,
+                writeSupport.getOutputURI());
         Dataset dataset = datasetFactory.finish();
         Scanner scanner = dataset.newScan(options);
-        ArrowReader reader = scanner.scanBatches()
-    ) {
+        ArrowReader reader = scanner.scanBatches()) {
       assertEquals(schema.getFields(), reader.getVectorSchemaRoot().getSchema().getFields());
       int rowcount = 0;
       while (reader.loadNextBatch()) {
-        assertTrue(reader.getVectorSchemaRoot().getVector("add_two_to_column_a").toString()
-            .equals("[21, 3, 13]"));
-        assertTrue(reader.getVectorSchemaRoot().getVector("concat_column_a_and_b").toString()
-            .equals("[value_19 - value_19, value_1 - value_1, value_11 - value_11]"));
+        final ValueIterableVector<Integer> sumVector =
+            (ValueIterableVector<Integer>)
+                reader.getVectorSchemaRoot().getVector("add_two_to_column_a");
+        assertThat(sumVector.getValueIterable(), IsIterableContainingInOrder.contains(21, 3, 13));
+        final ValueIterableVector<Text> nameVector =
+            (ValueIterableVector<Text>)
+                reader.getVectorSchemaRoot().getVector("concat_column_a_and_b");
+        assertThat(
+            nameVector.getValueIterable(),
+            IsIterableContainingInOrder.contains(
+                new Text("value_19 - value_19"),
+                new Text("value_1 - value_1"),
+                new Text("value_11 - value_11")));
         rowcount += reader.getVectorSchemaRoot().getRowCount();
       }
       assertEquals(3, rowcount);
diff --git a/java/dev/checkstyle/checkstyle.xml b/java/dev/checkstyle/checkstyle.xml
index b63a4a9cba1f3..eb63c3ff0fc61 100644
--- a/java/dev/checkstyle/checkstyle.xml
+++ b/java/dev/checkstyle/checkstyle.xml
@@ -60,11 +60,6 @@
       <property name="eachLine" value="true"/>
     </module>
 
-    <module name="LineLength">
-        <property name="max" value="120"/>
-        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-    </module>
-
     <module name="TreeWalker">
         <module name="OuterTypeFilename"/>
         <module name="IllegalTokenText">
@@ -84,21 +79,6 @@
             <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
         </module>
         <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-        <module name="RightCurly">
-            <property name="option" value="alone"/>
-            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
-        </module>
-        <module name="WhitespaceAround">
-            <property name="allowEmptyConstructors" value="true"/>
-            <property name="allowEmptyMethods" value="true"/>
-            <property name="allowEmptyTypes" value="true"/>
-            <property name="allowEmptyLoops" value="true"/>
-            <message key="ws.notFollowed"
-             value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
-             <message key="ws.notPreceded"
-             value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
-        </module>
         <module name="WhitespaceAfter">
             <property name="tokens" value="COMMA, SEMI, TYPECAST"/>
         </module>
@@ -109,9 +89,6 @@
         <module name="FallThrough"/>
         <module name="UpperEll"/>
         <module name="ModifierOrder"/>
-        <module name="EmptyLineSeparator">
-            <property name="allowNoEmptyLineBetweenFields" value="true"/>
-        </module>
         <module name="SeparatorWrap">
             <property name="tokens" value="DOT"/>
             <property name="option" value="nl"/>
@@ -177,34 +154,15 @@
              <message key="ws.notPreceded"
              value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
         </module>
-        <module name="Indentation">
-            <property name="basicOffset" value="2"/>
-            <property name="braceAdjustment" value="0"/>
-            <property name="caseIndent" value="2"/>
-            <property name="throwsIndent" value="4"/>
-            <property name="lineWrappingIndentation" value="4"/>
-            <property name="arrayInitIndent" value="2"/>
-        </module>
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="VariableDeclarationUsageDistance"/>
         <module name="AvoidStarImport">
             <property name="allowStaticMemberImports" value="true"/>
         </module>
-        <module name="ImportOrder">
-            <property name="groups" value="java,javax,org,com"/>
-            <property name="ordered" value="true"/>
-            <property name="separated" value="true"/>
-            <property name="option" value="top"/>
-            <property name="sortStaticImportsAlphabetically" value="true"/>
-        </module>
         <module name="SingleSpaceSeparator">
             <property name="validateComments" value="true"/>
         </module>
         <module name="MethodParamPad"/>
-        <module name="OperatorWrap">
-            <property name="option" value="eol"/>
-            <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/>
-        </module>
         <module name="AnnotationLocation">
             <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
         </module>
@@ -246,9 +204,6 @@
             <message key="name.invalidPattern"
              value="Method name ''{0}'' must match pattern ''{1}''."/>
         </module>
-        <module name="SingleLineJavadoc">
-            <property name="ignoreInlineTags" value="false"/>
-        </module>
         <module name="EmptyCatchBlock">
             <property name="exceptionVariableName" value="expected|ignore"/>
         </module>
diff --git a/java/dev/checkstyle/suppressions.xml b/java/dev/checkstyle/suppressions.xml
index a3536e2ca9212..e8669c54e61fd 100644
--- a/java/dev/checkstyle/suppressions.xml
+++ b/java/dev/checkstyle/suppressions.xml
@@ -36,6 +36,9 @@
   <!-- suppress files that include additional lines in license -->
   <suppress checks="Header" files="AutoCloseables.java|Collections2.java" />
 
+  <!-- no license file in vendored dependencies -->
+  <suppress checks="Header" files="IntObjectMap.java|IntObjectHashMap.java" />
+
   <!-- Suppress certain checks requiring many code changes, that add little benefit -->
   <suppress checks="NoFinalizer|OverloadMethodsDeclarationOrder|VariableDeclarationUsageDistance" files=".*" />
 
diff --git a/java/dev/checkstyle/checkstyle.license b/java/dev/license/asf-java.license
similarity index 100%
rename from java/dev/checkstyle/checkstyle.license
rename to java/dev/license/asf-java.license
diff --git a/java/dev/license/asf-xml.license b/java/dev/license/asf-xml.license
new file mode 100644
index 0000000000000..b1abef4bf4b64
--- /dev/null
+++ b/java/dev/license/asf-xml.license
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
diff --git a/java/flight/flight-core/pom.xml b/java/flight/flight-core/pom.xml
index 830caf8a28246..a60631dae01fa 100644
--- a/java/flight/flight-core/pom.xml
+++ b/java/flight/flight-core/pom.xml
@@ -1,27 +1,34 @@
-<?xml version="1.0"?>
-<!-- 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. -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>arrow-flight</artifactId>
     <groupId>org.apache.arrow</groupId>
-    <version>16.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
+    <artifactId>arrow-flight</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>flight-core</artifactId>
-  <name>Arrow Flight Core</name>
-  <description>(Experimental)An RPC mechanism for transferring ValueVectors.</description>
   <packaging>jar</packaging>
+  <name>Arrow Flight Core</name>
+  <description>An RPC mechanism for transferring ValueVectors.</description>
 
   <properties>
     <forkCount>1</forkCount>
@@ -116,16 +123,16 @@
     <dependency>
       <groupId>javax.annotation</groupId>
       <artifactId>javax.annotation-api</artifactId>
-     </dependency>
+    </dependency>
     <dependency>
       <groupId>org.immutables</groupId>
-      <artifactId>value</artifactId>
+      <artifactId>value-annotations</artifactId>
     </dependency>
 
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-common-protos</artifactId>
-      <version>2.37.1</version>
+      <version>2.40.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -138,13 +145,6 @@
     </dependency>
   </dependencies>
   <build>
-    <extensions>
-      <extension>
-        <groupId>kr.motd.maven</groupId>
-        <artifactId>os-maven-plugin</artifactId>
-        <version>1.7.1</version>
-      </extension>
-    </extensions>
     <plugins>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -158,21 +158,15 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <!--
-          Downgrade maven-shade-plugin specifically for this module.
-          Using a newer version up to at least 3.5.1 will cause
-          issues in the arrow-tools tests looking up FlatBuffer
-          dependencies.
-         -->
-        <version>3.5.2</version>
         <executions>
           <execution>
             <id>shade-main</id>
-            <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
+              <createDependencyReducedPom>false</createDependencyReducedPom>
               <shadedArtifactAttached>true</shadedArtifactAttached>
               <shadedClassifierName>shaded</shadedClassifierName>
               <artifactSet>
@@ -188,17 +182,18 @@
                 </relocation>
               </relocations>
               <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"></transformer>
               </transformers>
             </configuration>
           </execution>
           <execution>
             <id>shade-ext</id>
-            <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
+              <createDependencyReducedPom>false</createDependencyReducedPom>
               <shadedArtifactAttached>true</shadedArtifactAttached>
               <shadedClassifierName>shaded-ext</shadedClassifierName>
               <artifactSet>
@@ -219,7 +214,7 @@
                 </relocation>
               </relocations>
               <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"></transformer>
               </transformers>
             </configuration>
           </execution>
@@ -231,13 +226,13 @@
         <executions>
           <execution>
             <id>src</id>
-            <configuration>
-              <protoSourceRoot>${basedir}/../../../format/</protoSourceRoot>
-            </configuration>
             <goals>
               <goal>compile</goal>
               <goal>compile-custom</goal>
             </goals>
+            <configuration>
+              <protoSourceRoot>${basedir}/../../../format/</protoSourceRoot>
+            </configuration>
           </execution>
           <execution>
             <id>test</id>
@@ -251,14 +246,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.3.0</version>
         <executions>
           <execution>
             <id>analyze</id>
-            <phase>verify</phase>
             <goals>
               <goal>analyze-only</goal>
             </goals>
+            <phase>verify</phase>
             <configuration>
               <ignoredDependencies combine.children="append">
                 <ignoredDependency>io.netty:netty-tcnative-boringssl-static:*</ignoredDependency>
@@ -267,17 +261,17 @@
           </execution>
         </executions>
       </plugin>
-      <plugin> <!-- add generated sources to classpath -->
+      <plugin>
+        <!-- add generated sources to classpath -->
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.9.1</version>
         <executions>
           <execution>
             <id>add-generated-sources-to-classpath</id>
-            <phase>generate-sources</phase>
             <goals>
               <goal>add-source</goal>
             </goals>
+            <phase>generate-sources</phase>
             <configuration>
               <sources>
                 <source>${project.build.directory}/generated-sources/protobuf</source>
@@ -288,7 +282,6 @@
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.0.0</version>
         <configuration>
           <descriptorRefs>
             <descriptorRef>jar-with-dependencies</descriptorRef>
@@ -297,10 +290,10 @@
         <executions>
           <execution>
             <id>make-assembly</id>
-            <phase>package</phase>
             <goals>
               <goal>single</goal>
             </goals>
+            <phase>package</phase>
           </execution>
         </executions>
       </plugin>
@@ -312,18 +305,14 @@
       <id>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-opens=org.apache.arrow.flight.core/org.apache.arrow.flight.perf.impl=protobuf.java --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
-              <enableAssertions>false</enableAssertions>
+            <configuration>
+              <argLine combine.self="override">--add-opens=org.apache.arrow.flight.core/org.apache.arrow.flight.perf.impl=protobuf.java --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
               <systemPropertyVariables>
                 <arrow.test.dataRoot>${project.basedir}/../../../testing/data</arrow.test.dataRoot>
               </systemPropertyVariables>
@@ -333,5 +322,4 @@
       </build>
     </profile>
   </profiles>
-
 </project>
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Action.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Action.java
index 524ffcab9ad72..b1fece50000e0 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Action.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Action.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
-import org.apache.arrow.flight.impl.Flight;
-
 import com.google.protobuf.ByteString;
+import org.apache.arrow.flight.impl.Flight;
 
 /**
  * An opaque action for the service to perform.
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ActionType.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ActionType.java
index d89365612f362..669bf00adbd92 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ActionType.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ActionType.java
@@ -14,14 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import org.apache.arrow.flight.impl.Flight;
 
-/**
- * POJO wrapper around protocol specifics for Flight actions.
- */
+/** POJO wrapper around protocol specifics for Flight actions. */
 public class ActionType {
   private final String type;
   private final String description;
@@ -38,9 +35,7 @@ public ActionType(String type, String description) {
     this.description = description;
   }
 
-  /**
-   * Constructs a new instance from the corresponding protocol buffer object.
-   */
+  /** Constructs a new instance from the corresponding protocol buffer object. */
   ActionType(Flight.ActionType type) {
     this.type = type.getType();
     this.description = type.getDescription();
@@ -50,21 +45,13 @@ public String getType() {
     return type;
   }
 
-  /**
-   *  Converts the POJO to the corresponding protocol buffer type.
-   */
+  /** Converts the POJO to the corresponding protocol buffer type. */
   Flight.ActionType toProtocol() {
-    return Flight.ActionType.newBuilder()
-        .setType(type)
-        .setDescription(description)
-        .build();
+    return Flight.ActionType.newBuilder().setType(type).setDescription(description).build();
   }
 
   @Override
   public String toString() {
-    return "ActionType{" +
-        "type='" + type + '\'' +
-        ", description='" + description + '\'' +
-        '}';
+    return "ActionType{" + "type='" + type + '\'' + ", description='" + description + '\'' + '}';
   }
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ArrowMessage.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ArrowMessage.java
index 5b946932f39f2..9cefccb3fe66f 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ArrowMessage.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ArrowMessage.java
@@ -14,9 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+import com.google.common.io.ByteStreams;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.CodedInputStream;
+import com.google.protobuf.CodedOutputStream;
+import com.google.protobuf.WireFormat;
+import io.grpc.Drainable;
+import io.grpc.MethodDescriptor.Marshaller;
+import io.grpc.protobuf.ProtoUtils;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.CompositeByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.buffer.UnpooledByteBufAllocator;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,7 +40,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.flight.grpc.AddWritableBuffer;
 import org.apache.arrow.flight.grpc.GetReadableBuffer;
 import org.apache.arrow.flight.impl.Flight.FlightData;
@@ -43,26 +56,7 @@
 import org.apache.arrow.vector.types.MetadataVersion;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-import com.google.common.io.ByteStreams;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.CodedInputStream;
-import com.google.protobuf.CodedOutputStream;
-import com.google.protobuf.WireFormat;
-
-import io.grpc.Drainable;
-import io.grpc.MethodDescriptor.Marshaller;
-import io.grpc.protobuf.ProtoUtils;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ByteBufInputStream;
-import io.netty.buffer.CompositeByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.buffer.UnpooledByteBufAllocator;
-
-/**
- * The in-memory representation of FlightData used to manage a stream of Arrow messages.
- */
+/** The in-memory representation of FlightData used to manage a stream of Arrow messages. */
 class ArrowMessage implements AutoCloseable {
 
   // If true, deserialize Arrow data by giving Arrow a reference to the underlying gRPC buffer
@@ -97,7 +91,10 @@ class ArrowMessage implements AutoCloseable {
   private static final Marshaller<FlightData> NO_BODY_MARSHALLER =
       ProtoUtils.marshaller(FlightData.getDefaultInstance());
 
-  /** Get the application-specific metadata in this message. The ArrowMessage retains ownership of the buffer. */
+  /**
+   * Get the application-specific metadata in this message. The ArrowMessage retains ownership of
+   * the buffer.
+   */
   public ArrowBuf getApplicationMetadata() {
     return appMetadata;
   }
@@ -108,34 +105,37 @@ public enum HeaderType {
     SCHEMA,
     DICTIONARY_BATCH,
     RECORD_BATCH,
-    TENSOR
-    ;
+    TENSOR;
 
     public static HeaderType getHeader(byte b) {
       switch (b) {
-        case 0: return NONE;
-        case 1: return SCHEMA;
-        case 2: return DICTIONARY_BATCH;
-        case 3: return RECORD_BATCH;
-        case 4: return TENSOR;
+        case 0:
+          return NONE;
+        case 1:
+          return SCHEMA;
+        case 2:
+          return DICTIONARY_BATCH;
+        case 3:
+          return RECORD_BATCH;
+        case 4:
+          return TENSOR;
         default:
           throw new UnsupportedOperationException("unknown type: " + b);
       }
     }
-
   }
 
   // Pre-allocated buffers for padding serialized ArrowMessages.
-  private static final List<ByteBuf> PADDING_BUFFERS = Arrays.asList(
-      null,
-      Unpooled.copiedBuffer(new byte[] { 0 }),
-      Unpooled.copiedBuffer(new byte[] { 0, 0 }),
-      Unpooled.copiedBuffer(new byte[] { 0, 0, 0 }),
-      Unpooled.copiedBuffer(new byte[] { 0, 0, 0, 0 }),
-      Unpooled.copiedBuffer(new byte[] { 0, 0, 0, 0, 0 }),
-      Unpooled.copiedBuffer(new byte[] { 0, 0, 0, 0, 0, 0 }),
-      Unpooled.copiedBuffer(new byte[] { 0, 0, 0, 0, 0, 0, 0 })
-  );
+  private static final List<ByteBuf> PADDING_BUFFERS =
+      Arrays.asList(
+          null,
+          Unpooled.copiedBuffer(new byte[] {0}),
+          Unpooled.copiedBuffer(new byte[] {0, 0}),
+          Unpooled.copiedBuffer(new byte[] {0, 0, 0}),
+          Unpooled.copiedBuffer(new byte[] {0, 0, 0, 0}),
+          Unpooled.copiedBuffer(new byte[] {0, 0, 0, 0, 0}),
+          Unpooled.copiedBuffer(new byte[] {0, 0, 0, 0, 0, 0}),
+          Unpooled.copiedBuffer(new byte[] {0, 0, 0, 0, 0, 0, 0}));
 
   private final IpcOption writeOption;
   private final FlightDescriptor descriptor;
@@ -147,8 +147,8 @@ public static HeaderType getHeader(byte b) {
   public ArrowMessage(FlightDescriptor descriptor, Schema schema, IpcOption option) {
     this.writeOption = option;
     ByteBuffer serializedMessage = MessageSerializer.serializeMetadata(schema, writeOption);
-    this.message = MessageMetadataResult.create(serializedMessage.slice(),
-        serializedMessage.remaining());
+    this.message =
+        MessageMetadataResult.create(serializedMessage.slice(), serializedMessage.remaining());
     bufs = ImmutableList.of();
     this.descriptor = descriptor;
     this.appMetadata = null;
@@ -157,14 +157,17 @@ public ArrowMessage(FlightDescriptor descriptor, Schema schema, IpcOption option
 
   /**
    * Create an ArrowMessage from a record batch and app metadata.
+   *
    * @param batch The record batch.
    * @param appMetadata The app metadata. May be null. Takes ownership of the buffer otherwise.
    * @param tryZeroCopy Whether to enable the zero-copy optimization.
    */
-  public ArrowMessage(ArrowRecordBatch batch, ArrowBuf appMetadata, boolean tryZeroCopy, IpcOption option) {
+  public ArrowMessage(
+      ArrowRecordBatch batch, ArrowBuf appMetadata, boolean tryZeroCopy, IpcOption option) {
     this.writeOption = option;
     ByteBuffer serializedMessage = MessageSerializer.serializeMetadata(batch, writeOption);
-    this.message = MessageMetadataResult.create(serializedMessage.slice(), serializedMessage.remaining());
+    this.message =
+        MessageMetadataResult.create(serializedMessage.slice(), serializedMessage.remaining());
     this.bufs = ImmutableList.copyOf(batch.getBuffers());
     this.descriptor = null;
     this.appMetadata = appMetadata;
@@ -186,6 +189,7 @@ public ArrowMessage(ArrowDictionaryBatch batch, IpcOption option) {
 
   /**
    * Create an ArrowMessage containing only application metadata.
+   *
    * @param appMetadata The application-provided metadata buffer.
    */
   public ArrowMessage(ArrowBuf appMetadata) {
@@ -208,13 +212,18 @@ public ArrowMessage(FlightDescriptor descriptor) {
     this.tryZeroCopyWrite = false;
   }
 
-  private ArrowMessage(FlightDescriptor descriptor, MessageMetadataResult message, ArrowBuf appMetadata,
-                       ArrowBuf buf) {
+  private ArrowMessage(
+      FlightDescriptor descriptor,
+      MessageMetadataResult message,
+      ArrowBuf appMetadata,
+      ArrowBuf buf) {
     // No need to take IpcOption as this is used for deserialized ArrowMessage coming from the wire.
-    this.writeOption = message != null ?
-        // avoid writing legacy ipc format by default
-        new IpcOption(false, MetadataVersion.fromFlatbufID(message.getMessage().version())) :
-        IpcOption.DEFAULT;
+    this.writeOption =
+        message != null
+            ?
+            // avoid writing legacy ipc format by default
+            new IpcOption(false, MetadataVersion.fromFlatbufID(message.getMessage().version()))
+            : IpcOption.DEFAULT;
     this.message = message;
     this.descriptor = descriptor;
     this.appMetadata = appMetadata;
@@ -245,7 +254,8 @@ public Schema asSchema() {
   }
 
   public ArrowRecordBatch asRecordBatch() throws IOException {
-    Preconditions.checkArgument(bufs.size() == 1, "A batch can only be consumed if it contains a single ArrowBuf.");
+    Preconditions.checkArgument(
+        bufs.size() == 1, "A batch can only be consumed if it contains a single ArrowBuf.");
     Preconditions.checkArgument(getMessageType() == HeaderType.RECORD_BATCH);
 
     ArrowBuf underlying = bufs.get(0);
@@ -255,7 +265,8 @@ public ArrowRecordBatch asRecordBatch() throws IOException {
   }
 
   public ArrowDictionaryBatch asDictionaryBatch() throws IOException {
-    Preconditions.checkArgument(bufs.size() == 1, "A batch can only be consumed if it contains a single ArrowBuf.");
+    Preconditions.checkArgument(
+        bufs.size() == 1, "A batch can only be consumed if it contains a single ArrowBuf.");
     Preconditions.checkArgument(getMessageType() == HeaderType.DICTIONARY_BATCH);
     ArrowBuf underlying = bufs.get(0);
     // Retain a reference to keep the batch alive when the message is closed
@@ -278,27 +289,29 @@ private static ArrowMessage frame(BufferAllocator allocator, final InputStream s
       while (stream.available() > 0) {
         int tag = readRawVarint32(stream);
         switch (tag) {
-
-          case DESCRIPTOR_TAG: {
-            int size = readRawVarint32(stream);
-            byte[] bytes = new byte[size];
-            ByteStreams.readFully(stream, bytes);
-            descriptor = FlightDescriptor.parseFrom(bytes);
-            break;
-          }
-          case HEADER_TAG: {
-            int size = readRawVarint32(stream);
-            byte[] bytes = new byte[size];
-            ByteStreams.readFully(stream, bytes);
-            header = MessageMetadataResult.create(ByteBuffer.wrap(bytes), size);
-            break;
-          }
-          case APP_METADATA_TAG: {
-            int size = readRawVarint32(stream);
-            appMetadata = allocator.buffer(size);
-            GetReadableBuffer.readIntoBuffer(stream, appMetadata, size, ENABLE_ZERO_COPY_READ);
-            break;
-          }
+          case DESCRIPTOR_TAG:
+            {
+              int size = readRawVarint32(stream);
+              byte[] bytes = new byte[size];
+              ByteStreams.readFully(stream, bytes);
+              descriptor = FlightDescriptor.parseFrom(bytes);
+              break;
+            }
+          case HEADER_TAG:
+            {
+              int size = readRawVarint32(stream);
+              byte[] bytes = new byte[size];
+              ByteStreams.readFully(stream, bytes);
+              header = MessageMetadataResult.create(ByteBuffer.wrap(bytes), size);
+              break;
+            }
+          case APP_METADATA_TAG:
+            {
+              int size = readRawVarint32(stream);
+              appMetadata = allocator.buffer(size);
+              GetReadableBuffer.readIntoBuffer(stream, appMetadata, size, ENABLE_ZERO_COPY_READ);
+              break;
+            }
           case BODY_TAG:
             if (body != null) {
               // only read last body.
@@ -314,10 +327,13 @@ private static ArrowMessage frame(BufferAllocator allocator, final InputStream s
             // ignore unknown fields.
         }
       }
-      // Protobuf implementations can omit empty fields, such as body; for some message types, like RecordBatch,
-      // this will fail later as we still expect an empty buffer. In those cases only, fill in an empty buffer here -
+      // Protobuf implementations can omit empty fields, such as body; for some message types, like
+      // RecordBatch,
+      // this will fail later as we still expect an empty buffer. In those cases only, fill in an
+      // empty buffer here -
       // in other cases, like Schema, having an unexpected empty buffer will also cause failures.
-      // We don't fill in defaults for fields like header, for which there is no reasonable default, or for appMetadata
+      // We don't fill in defaults for fields like header, for which there is no reasonable default,
+      // or for appMetadata
       // or descriptor, which are intended to be empty in some cases.
       if (header != null) {
         switch (HeaderType.getHeader(header.headerType())) {
@@ -346,7 +362,6 @@ private static ArrowMessage frame(BufferAllocator allocator, final InputStream s
     } catch (Exception ioe) {
       throw new RuntimeException(ioe);
     }
-
   }
 
   private static int readRawVarint32(InputStream is) throws IOException {
@@ -375,13 +390,12 @@ private InputStream asInputStream() {
     }
 
     try {
-      final ByteString bytes = ByteString.copyFrom(message.getMessageBuffer(),
-          message.bytesAfterMessage());
+      final ByteString bytes =
+          ByteString.copyFrom(message.getMessageBuffer(), message.bytesAfterMessage());
 
       if (getMessageType() == HeaderType.SCHEMA) {
 
-        final FlightData.Builder builder = FlightData.newBuilder()
-            .setDataHeader(bytes);
+        final FlightData.Builder builder = FlightData.newBuilder().setDataHeader(bytes);
 
         if (descriptor != null) {
           builder.setFlightDescriptor(descriptor);
@@ -391,17 +405,20 @@ private InputStream asInputStream() {
         return NO_BODY_MARSHALLER.stream(builder.build());
       }
 
-      Preconditions.checkArgument(getMessageType() == HeaderType.RECORD_BATCH ||
-          getMessageType() == HeaderType.DICTIONARY_BATCH);
+      Preconditions.checkArgument(
+          getMessageType() == HeaderType.RECORD_BATCH
+              || getMessageType() == HeaderType.DICTIONARY_BATCH);
       // There may be no buffers in the case that we write only a null array
-      Preconditions.checkArgument(descriptor == null, "Descriptor should only be included in the schema message.");
+      Preconditions.checkArgument(
+          descriptor == null, "Descriptor should only be included in the schema message.");
 
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       CodedOutputStream cos = CodedOutputStream.newInstance(baos);
       cos.writeBytes(FlightData.DATA_HEADER_FIELD_NUMBER, bytes);
 
       if (appMetadata != null && appMetadata.capacity() > 0) {
-        // Must call slice() as CodedOutputStream#writeByteBuffer writes -capacity- bytes, not -limit- bytes
+        // Must call slice() as CodedOutputStream#writeByteBuffer writes -capacity- bytes, not
+        // -limit- bytes
         cos.writeByteBuffer(FlightData.APP_METADATA_FIELD_NUMBER, appMetadata.nioBuffer().slice());
       }
 
@@ -414,7 +431,8 @@ private InputStream asInputStream() {
         // below to tie the Arrow buffer refcnt to the Netty buffer refcnt
         allBufs.add(Unpooled.wrappedBuffer(b.nioBuffer()).retain());
         size += (int) b.readableBytes();
-        // [ARROW-4213] These buffers must be aligned to an 8-byte boundary in order to be readable from C++.
+        // [ARROW-4213] These buffers must be aligned to an 8-byte boundary in order to be readable
+        // from C++.
         if (b.readableBytes() % 8 != 0) {
           int paddingBytes = (int) (8 - (b.readableBytes() % 8));
           assert paddingBytes > 0 && paddingBytes < 8;
@@ -429,23 +447,26 @@ private InputStream asInputStream() {
       ByteBuf initialBuf = Unpooled.buffer(baos.size());
       initialBuf.writeBytes(baos.toByteArray());
       final CompositeByteBuf bb;
-      final ImmutableList<ByteBuf> byteBufs = ImmutableList.<ByteBuf>builder()
-          .add(initialBuf)
-          .addAll(allBufs)
-          .build();
+      final ImmutableList<ByteBuf> byteBufs =
+          ImmutableList.<ByteBuf>builder().add(initialBuf).addAll(allBufs).build();
       // See: https://github.com/apache/arrow/issues/40039
       // CompositeByteBuf requires us to pass maxNumComponents to constructor.
       // This number will be used to decide when to stop adding new components as separate buffers
       // and instead merge existing components into a new buffer by performing a memory copy.
-      // We want to avoind memory copies as much as possible so we want to set the limit that won't be reached.
+      // We want to avoind memory copies as much as possible so we want to set the limit that won't
+      // be reached.
       // At a first glance it seems reasonable to set limit to byteBufs.size() + 1,
       // because it will be enough to avoid merges of byteBufs that we pass to constructor.
       // But later this buffer will be written to socket by Netty
-      // and DefaultHttp2ConnectionEncoder uses CoalescingBufferQueue to combine small buffers into one.
-      // Method CoalescingBufferQueue.compose will check if current buffer is already a CompositeByteBuf
+      // and DefaultHttp2ConnectionEncoder uses CoalescingBufferQueue to combine small buffers into
+      // one.
+      // Method CoalescingBufferQueue.compose will check if current buffer is already a
+      // CompositeByteBuf
       // and if it's the case it will just add a new component to this buffer.
-      // But in out case if we set maxNumComponents=byteBufs.size() + 1 it will happen on the first attempt
-      // to write data to socket because header message is small and Netty will always try to compine it with the
+      // But in out case if we set maxNumComponents=byteBufs.size() + 1 it will happen on the first
+      // attempt
+      // to write data to socket because header message is small and Netty will always try to
+      // compine it with the
       // large CompositeByteBuf we're creating here.
       // We never want additional memory copies so setting the limit to Integer.MAX_VALUE
       final int maxNumComponents = Integer.MAX_VALUE;
@@ -453,31 +474,30 @@ private InputStream asInputStream() {
         bb = new ArrowBufRetainingCompositeByteBuf(maxNumComponents, byteBufs, bufs);
       } else {
         // Don't retain the buffers in the non-zero-copy path since we're copying them
-        bb = new CompositeByteBuf(UnpooledByteBufAllocator.DEFAULT, /* direct */ true, maxNumComponents, byteBufs);
+        bb =
+            new CompositeByteBuf(
+                UnpooledByteBufAllocator.DEFAULT, /* direct */ true, maxNumComponents, byteBufs);
       }
       return new DrainableByteBufInputStream(bb, tryZeroCopyWrite);
     } catch (Exception ex) {
       throw new RuntimeException("Unexpected IO Exception", ex);
     }
-
   }
 
   /**
    * ARROW-11066: enable the zero-copy optimization and protect against use-after-free.
    *
-   * When you send a message through gRPC, the following happens:
-   * 1. gRPC immediately serializes the message, eventually calling asInputStream above.
-   * 2. gRPC buffers the serialized message for sending.
-   * 3. Later, gRPC will actually write out the message.
+   * <p>When you send a message through gRPC, the following happens: 1. gRPC immediately serializes
+   * the message, eventually calling asInputStream above. 2. gRPC buffers the serialized message for
+   * sending. 3. Later, gRPC will actually write out the message.
    *
-   * The problem with this is that when the zero-copy optimization is enabled, Flight
-   * "serializes" the message by handing gRPC references to Arrow data. That means we need
-   * a way to keep the Arrow buffers valid until gRPC actually writes them, else, we'll read
-   * invalid data or segfault. gRPC doesn't know anything about Arrow buffers, either.
+   * <p>The problem with this is that when the zero-copy optimization is enabled, Flight
+   * "serializes" the message by handing gRPC references to Arrow data. That means we need a way to
+   * keep the Arrow buffers valid until gRPC actually writes them, else, we'll read invalid data or
+   * segfault. gRPC doesn't know anything about Arrow buffers, either.
    *
-   * This class solves that issue by bridging Arrow and Netty/gRPC. We increment the refcnt
-   * on a set of Arrow backing buffers and decrement them once the Netty buffers are freed
-   * by gRPC.
+   * <p>This class solves that issue by bridging Arrow and Netty/gRPC. We increment the refcnt on a
+   * set of Arrow backing buffers and decrement them once the Netty buffers are freed by gRPC.
    */
   private static final class ArrowBufRetainingCompositeByteBuf extends CompositeByteBuf {
     // Arrow buffers that back the Netty ByteBufs here; ByteBufs held by this class are
@@ -485,7 +505,8 @@ private static final class ArrowBufRetainingCompositeByteBuf extends CompositeBy
     final List<ArrowBuf> backingBuffers;
     boolean freed;
 
-    ArrowBufRetainingCompositeByteBuf(int maxNumComponents, Iterable<ByteBuf> buffers, List<ArrowBuf> backingBuffers) {
+    ArrowBufRetainingCompositeByteBuf(
+        int maxNumComponents, Iterable<ByteBuf> buffers, List<ArrowBuf> backingBuffers) {
       super(UnpooledByteBufAllocator.DEFAULT, /* direct */ true, maxNumComponents, buffers);
       this.backingBuffers = backingBuffers;
       this.freed = false;
@@ -530,9 +551,6 @@ public int drainTo(OutputStream target) throws IOException {
     public void close() {
       buf.release();
     }
-
-
-
   }
 
   public static Marshaller<ArrowMessage> createMarshaller(BufferAllocator allocator) {
@@ -556,7 +574,6 @@ public InputStream stream(ArrowMessage value) {
     public ArrowMessage parse(InputStream stream) {
       return ArrowMessage.frame(allocator, stream);
     }
-
   }
 
   @Override
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/AsyncPutListener.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/AsyncPutListener.java
index a454632258a76..85dde4ed7c1c6 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/AsyncPutListener.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/AsyncPutListener.java
@@ -14,19 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-
 import org.apache.arrow.flight.grpc.StatusUtils;
 
 /**
  * A handler for server-sent application metadata messages during a Flight DoPut operation.
  *
- * <p>To handle messages, create an instance of this class overriding {@link #onNext(PutResult)}. The other methods
- * should not be overridden.
+ * <p>To handle messages, create an instance of this class overriding {@link #onNext(PutResult)}.
+ * The other methods should not be overridden.
  */
 public class AsyncPutListener implements FlightClient.PutListener {
 
@@ -37,8 +35,8 @@ public AsyncPutListener() {
   }
 
   /**
-   * Wait for the stream to finish on the server side. You must call this to be notified of any errors that may have
-   * happened during the upload.
+   * Wait for the stream to finish on the server side. You must call this to be notified of any
+   * errors that may have happened during the upload.
    */
   @Override
   public final void getResult() {
@@ -52,8 +50,7 @@ public final void getResult() {
   }
 
   @Override
-  public void onNext(PutResult val) {
-  }
+  public void onNext(PutResult val) {}
 
   @Override
   public final void onError(Throwable t) {
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/BackpressureStrategy.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/BackpressureStrategy.java
index de34643a75816..1409ea7003ed7 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/BackpressureStrategy.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/BackpressureStrategy.java
@@ -14,49 +14,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
-import org.apache.arrow.vector.VectorSchemaRoot;
-
 import com.google.common.base.Preconditions;
+import org.apache.arrow.vector.VectorSchemaRoot;
 
 /**
- * Helper interface to dynamically handle backpressure when implementing FlightProducers.
- * This must only be used in FlightProducer implementations that are non-blocking.
+ * Helper interface to dynamically handle backpressure when implementing FlightProducers. This must
+ * only be used in FlightProducer implementations that are non-blocking.
  */
 public interface BackpressureStrategy {
-  /**
-   * The state of the client after a call to waitForListener.
-   */
+  /** The state of the client after a call to waitForListener. */
   enum WaitResult {
-    /**
-     * Listener is ready.
-     */
+    /** Listener is ready. */
     READY,
 
-    /**
-     * Listener was cancelled by the client.
-     */
+    /** Listener was cancelled by the client. */
     CANCELLED,
 
-    /**
-     * Timed out waiting for the listener to change state.
-     */
+    /** Timed out waiting for the listener to change state. */
     TIMEOUT,
 
-    /**
-     * Indicates that the wait was interrupted for a reason
-     * unrelated to the listener itself.
-     */
+    /** Indicates that the wait was interrupted for a reason unrelated to the listener itself. */
     OTHER
   }
 
   /**
    * Set up operations to work against the given listener.
    *
-   * This must be called exactly once and before any calls to {@link #waitForListener(long)} and
+   * <p>This must be called exactly once and before any calls to {@link #waitForListener(long)} and
    * {@link OutboundStreamListener#start(VectorSchemaRoot)}
+   *
    * @param listener The listener this strategy applies to.
    */
   void register(FlightProducer.ServerStreamListener listener);
@@ -121,9 +109,9 @@ public WaitResult waitForListener(long timeout) {
     /**
      * Interrupt waiting on the listener to change state.
      *
-     * This method can be used in conjunction with
-     * {@link #shouldContinueWaiting(FlightProducer.ServerStreamListener, long)} to allow FlightProducers to
-     * terminate streams internally and notify clients.
+     * <p>This method can be used in conjunction with {@link
+     * #shouldContinueWaiting(FlightProducer.ServerStreamListener, long)} to allow FlightProducers
+     * to terminate streams internally and notify clients.
      */
     public void interruptWait() {
       synchronized (lock) {
@@ -132,28 +120,23 @@ public void interruptWait() {
     }
 
     /**
-     * Callback function to run to check if the listener should continue
-     * to be waited on if it leaves the waiting state without being cancelled,
-     * ready, or timed out.
+     * Callback function to run to check if the listener should continue to be waited on if it
+     * leaves the waiting state without being cancelled, ready, or timed out.
      *
-     * This method should be used to determine if the wait on the listener was interrupted explicitly using a
-     * call to {@link #interruptWait()} or if it was woken up due to a spurious wake.
+     * <p>This method should be used to determine if the wait on the listener was interrupted
+     * explicitly using a call to {@link #interruptWait()} or if it was woken up due to a spurious
+     * wake.
      */
-    protected boolean shouldContinueWaiting(FlightProducer.ServerStreamListener listener, long remainingTimeout) {
+    protected boolean shouldContinueWaiting(
+        FlightProducer.ServerStreamListener listener, long remainingTimeout) {
       return true;
     }
 
-    /**
-     * Callback to execute when the listener becomes ready.
-     */
-    protected void readyCallback() {
-    }
+    /** Callback to execute when the listener becomes ready. */
+    protected void readyCallback() {}
 
-    /**
-     * Callback to execute when the listener is cancelled.
-     */
-    protected void cancelCallback() {
-    }
+    /** Callback to execute when the listener is cancelled. */
+    protected void cancelCallback() {}
 
     private void onReady() {
       synchronized (lock) {
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallHeaders.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallHeaders.java
index 32f9a8430d182..f4f6486a3c5df 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallHeaders.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallHeaders.java
@@ -14,33 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.util.Set;
 
-/**
- * A set of metadata key value pairs for a call (request or response).
- */
+/** A set of metadata key value pairs for a call (request or response). */
 public interface CallHeaders {
-  /**
-   * Get the value of a metadata key. If multiple values are present, then get the last one.
-   */
+  /** Get the value of a metadata key. If multiple values are present, then get the last one. */
   String get(String key);
 
-  /**
-   * Get the value of a metadata key. If multiple values are present, then get the last one.
-   */
+  /** Get the value of a metadata key. If multiple values are present, then get the last one. */
   byte[] getByte(String key);
 
-  /**
-   * Get all values present for the given metadata key.
-   */
+  /** Get all values present for the given metadata key. */
   Iterable<String> getAll(String key);
 
-  /**
-   * Get all values present for the given metadata key.
-   */
+  /** Get all values present for the given metadata key. */
   Iterable<byte[]> getAllByte(String key);
 
   /**
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallInfo.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallInfo.java
index 744584bdfd55f..24ef2053f3b42 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallInfo.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallInfo.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
-/**
- * A description of a Flight call for middleware to inspect.
- */
+/** A description of a Flight call for middleware to inspect. */
 public final class CallInfo {
   private final FlightMethod method;
 
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallOption.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallOption.java
index d3ee3ab4cee86..bb11ce79e50f7 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallOption.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallOption.java
@@ -14,11 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
-/**
- * Per-call RPC options. These are hints to the underlying RPC layer and may not be respected.
- */
-public interface CallOption {
-}
+/** Per-call RPC options. These are hints to the underlying RPC layer and may not be respected. */
+public interface CallOption {}
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallOptions.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallOptions.java
index bbb4edef9c03d..b6e052d223678 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallOptions.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallOptions.java
@@ -14,16 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
-import java.util.concurrent.TimeUnit;
-
 import io.grpc.stub.AbstractStub;
+import java.util.concurrent.TimeUnit;
 
-/**
- * Common call options.
- */
+/** Common call options. */
 public class CallOptions {
   public static CallOption timeout(long duration, TimeUnit unit) {
     return new Timeout(duration, unit);
@@ -53,9 +49,7 @@ public <T extends AbstractStub<T>> T wrapStub(T stub) {
     }
   }
 
-  /**
-   * CallOptions specific to GRPC stubs.
-   */
+  /** CallOptions specific to GRPC stubs. */
   public interface GrpcCallOption extends CallOption {
     <T extends AbstractStub<T>> T wrapStub(T stub);
   }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallStatus.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallStatus.java
index 991d0ed6a043b..809834f961d3e 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallStatus.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CallStatus.java
@@ -14,22 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.util.Objects;
-
 import org.apache.arrow.flight.FlightProducer.ServerStreamListener;
 import org.apache.arrow.flight.FlightProducer.StreamListener;
 
 /**
- * The result of a Flight RPC, consisting of a status code with an optional description and/or exception that led
- * to the status.
+ * The result of a Flight RPC, consisting of a status code with an optional description and/or
+ * exception that led to the status.
  *
- * <p>If raised or sent through {@link StreamListener#onError(Throwable)} or
- * {@link ServerStreamListener#error(Throwable)}, the client call will raise the same error (a
- * {@link FlightRuntimeException} with the same {@link FlightStatusCode} and description). The exception within, if
- * present, will not be sent to the client.
+ * <p>If raised or sent through {@link StreamListener#onError(Throwable)} or {@link
+ * ServerStreamListener#error(Throwable)}, the client call will raise the same error (a {@link
+ * FlightRuntimeException} with the same {@link FlightStatusCode} and description). The exception
+ * within, if present, will not be sent to the client.
  */
 public class CallStatus {
 
@@ -49,6 +47,8 @@ public class CallStatus {
   public static final CallStatus UNAUTHORIZED = FlightStatusCode.UNAUTHORIZED.toStatus();
   public static final CallStatus UNIMPLEMENTED = FlightStatusCode.UNIMPLEMENTED.toStatus();
   public static final CallStatus UNAVAILABLE = FlightStatusCode.UNAVAILABLE.toStatus();
+  public static final CallStatus RESOURCE_EXHAUSTED =
+      FlightStatusCode.RESOURCE_EXHAUSTED.toStatus();
 
   /**
    * Create a new status.
@@ -57,7 +57,8 @@ public class CallStatus {
    * @param cause An exception that resulted in this status (or null).
    * @param description A description of the status (or null).
    */
-  public CallStatus(FlightStatusCode code, Throwable cause, String description, ErrorFlightMetadata metadata) {
+  public CallStatus(
+      FlightStatusCode code, Throwable cause, String description, ErrorFlightMetadata metadata) {
     this.code = Objects.requireNonNull(code);
     this.cause = cause;
     this.description = description == null ? "" : description;
@@ -73,23 +74,17 @@ public CallStatus(FlightStatusCode code) {
     this(code, /* no cause */ null, /* no description */ null, /* no metadata */ null);
   }
 
-  /**
-   * The status code describing the result of the RPC.
-   */
+  /** The status code describing the result of the RPC. */
   public FlightStatusCode code() {
     return code;
   }
 
-  /**
-   * The exception that led to this result. May be null.
-   */
+  /** The exception that led to this result. May be null. */
   public Throwable cause() {
     return cause;
   }
 
-  /**
-   * A description of the result.
-   */
+  /** A description of the result. */
   public String description() {
     return description;
   }
@@ -97,47 +92,47 @@ public String description() {
   /**
    * Metadata associated with the exception.
    *
-   * May be null.
+   * <p>May be null.
    */
   public ErrorFlightMetadata metadata() {
     return metadata;
   }
 
-  /**
-   * Return a copy of this status with an error message.
-   */
+  /** Return a copy of this status with an error message. */
   public CallStatus withDescription(String message) {
     return new CallStatus(code, cause, message, metadata);
   }
 
   /**
-   * Return a copy of this status with the given exception as the cause. This will not be sent over the wire.
+   * Return a copy of this status with the given exception as the cause. This will not be sent over
+   * the wire.
    */
   public CallStatus withCause(Throwable t) {
     return new CallStatus(code, t, description, metadata);
   }
 
-  /**
-   * Return a copy of this status with associated exception metadata.
-   */
+  /** Return a copy of this status with associated exception metadata. */
   public CallStatus withMetadata(ErrorFlightMetadata metadata) {
     return new CallStatus(code, cause, description, metadata);
   }
 
-  /**
-   * Convert the status to an equivalent exception.
-   */
+  /** Convert the status to an equivalent exception. */
   public FlightRuntimeException toRuntimeException() {
     return new FlightRuntimeException(this);
   }
 
   @Override
   public String toString() {
-    return "CallStatus{" +
-        "code=" + code +
-        ", cause=" + cause +
-        ", description='" + description +
-        "', metadata='" + metadata + '\'' +
-        '}';
+    return "CallStatus{"
+        + "code="
+        + code
+        + ", cause="
+        + cause
+        + ", description='"
+        + description
+        + "', metadata='"
+        + metadata
+        + '\''
+        + '}';
   }
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CancelFlightInfoRequest.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CancelFlightInfoRequest.java
index 5d605f7941045..041a765455797 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CancelFlightInfoRequest.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CancelFlightInfoRequest.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.ByteBuffer;
 import java.util.Objects;
-
 import org.apache.arrow.flight.impl.Flight;
 
 /** A request to cancel a FlightInfo. */
@@ -49,7 +47,8 @@ Flight.CancelFlightInfoRequest toProtocol() {
   /**
    * Get the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight types.
+   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight
+   * types.
    */
   public ByteBuffer serialize() {
     return ByteBuffer.wrap(toProtocol().toByteArray());
@@ -58,13 +57,15 @@ public ByteBuffer serialize() {
   /**
    * Parse the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from non-Flight services.
+   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from
+   * non-Flight services.
    *
    * @param serialized The serialized form of the message, as returned by {@link #serialize()}.
    * @return The deserialized message.
    * @throws IOException if the serialized form is invalid.
    */
-  public static CancelFlightInfoRequest deserialize(ByteBuffer serialized) throws IOException, URISyntaxException {
+  public static CancelFlightInfoRequest deserialize(ByteBuffer serialized)
+      throws IOException, URISyntaxException {
     return new CancelFlightInfoRequest(Flight.CancelFlightInfoRequest.parseFrom(serialized));
   }
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CancelFlightInfoResult.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CancelFlightInfoResult.java
index 165afdff553df..1282f8abe0c9b 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CancelFlightInfoResult.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CancelFlightInfoResult.java
@@ -14,18 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Objects;
-
 import org.apache.arrow.flight.impl.Flight;
 
-/**
- * The result of cancelling a FlightInfo.
- */
+/** The result of cancelling a FlightInfo. */
 public class CancelFlightInfoResult {
   private final CancelStatus status;
 
@@ -81,7 +77,8 @@ Flight.CancelFlightInfoResult toProtocol() {
   /**
    * Get the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight types.
+   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight
+   * types.
    */
   public ByteBuffer serialize() {
     return ByteBuffer.wrap(toProtocol().toByteArray());
@@ -90,7 +87,8 @@ public ByteBuffer serialize() {
   /**
    * Parse the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from non-Flight services.
+   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from
+   * non-Flight services.
    *
    * @param serialized The serialized form of the message, as returned by {@link #serialize()}.
    * @return The deserialized message.
@@ -119,8 +117,6 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return "CancelFlightInfoResult{" +
-        "status=" + status +
-        '}';
+    return "CancelFlightInfoResult{" + "status=" + status + '}';
   }
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CancelStatus.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CancelStatus.java
index e92bcc8b25840..745b67db70596 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CancelStatus.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CancelStatus.java
@@ -14,31 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 /** The result of cancelling a FlightInfo. */
 public enum CancelStatus {
   /**
-   * The cancellation status is unknown. Servers should avoid using
-   * this value (send a NOT_FOUND error if the requested query is
-   * not known). Clients can retry the request.
+   * The cancellation status is unknown. Servers should avoid using this value (send a NOT_FOUND
+   * error if the requested query is not known). Clients can retry the request.
    */
   UNSPECIFIED,
   /**
-   * The cancellation request is complete. Subsequent requests with
-   * the same payload may return CANCELLED or a NOT_FOUND error.
+   * The cancellation request is complete. Subsequent requests with the same payload may return
+   * CANCELLED or a NOT_FOUND error.
    */
   CANCELLED,
-  /**
-   * The cancellation request is in progress. The client may retry
-   * the cancellation request.
-   */
+  /** The cancellation request is in progress. The client may retry the cancellation request. */
   CANCELLING,
-  /**
-   * The query is not cancellable. The client should not retry the
-   * cancellation request.
-   */
+  /** The query is not cancellable. The client should not retry the cancellation request. */
   NOT_CANCELLABLE,
   ;
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CloseSessionRequest.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CloseSessionRequest.java
index 29eb3664f6286..7eea788d7c7e6 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CloseSessionRequest.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CloseSessionRequest.java
@@ -14,21 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
-
 import org.apache.arrow.flight.impl.Flight;
 
 /** A request to close/invalidate a server session context. */
 public class CloseSessionRequest {
-  public CloseSessionRequest() {
-  }
+  public CloseSessionRequest() {}
 
-  CloseSessionRequest(Flight.CloseSessionRequest proto) {
-  }
+  CloseSessionRequest(Flight.CloseSessionRequest proto) {}
 
   Flight.CloseSessionRequest toProtocol() {
     return Flight.CloseSessionRequest.getDefaultInstance();
@@ -37,7 +33,8 @@ Flight.CloseSessionRequest toProtocol() {
   /**
    * Get the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight types.
+   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight
+   * types.
    */
   public ByteBuffer serialize() {
     return ByteBuffer.wrap(toProtocol().toByteArray());
@@ -46,7 +43,8 @@ public ByteBuffer serialize() {
   /**
    * Parse the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from non-Flight services.
+   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from
+   * non-Flight services.
    *
    * @param serialized The serialized form of the message, as returned by {@link #serialize()}.
    * @return The deserialized message.
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CloseSessionResult.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CloseSessionResult.java
index c3710a14b108a..73d7bc16a1a7d 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CloseSessionResult.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/CloseSessionResult.java
@@ -14,37 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
-
 import org.apache.arrow.flight.impl.Flight;
 
 /** The result of attempting to close/invalidate a server session context. */
 public class CloseSessionResult {
-  /**
-   * Close operation result status values.
-   */
+  /** Close operation result status values. */
   public enum Status {
     /**
-     * The session close status is unknown. Servers should avoid using this value
-     * (send a NOT_FOUND error if the requested session is not known). Clients can
-     * retry the request.
+     * The session close status is unknown. Servers should avoid using this value (send a NOT_FOUND
+     * error if the requested session is not known). Clients can retry the request.
      */
     UNSPECIFIED,
-    /**
-     * The session close request is complete.
-     */
+    /** The session close request is complete. */
     CLOSED,
-    /**
-     * The session close request is in progress. The client may retry the request.
-     */
+    /** The session close request is in progress. The client may retry the request. */
     CLOSING,
-    /**
-     * The session is not closeable.
-     */
+    /** The session is not closeable. */
     NOT_CLOSABLE,
     ;
 
@@ -84,7 +73,8 @@ Flight.CloseSessionResult toProtocol() {
   /**
    * Get the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight types.
+   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight
+   * types.
    */
   public ByteBuffer serialize() {
     return ByteBuffer.wrap(toProtocol().toByteArray());
@@ -93,7 +83,8 @@ public ByteBuffer serialize() {
   /**
    * Parse the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from non-Flight services.
+   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from
+   * non-Flight services.
    *
    * @param serialized The serialized form of the message, as returned by {@link #serialize()}.
    * @return The deserialized message.
@@ -102,5 +93,4 @@ public ByteBuffer serialize() {
   public static CloseSessionResult deserialize(ByteBuffer serialized) throws IOException {
     return new CloseSessionResult(Flight.CloseSessionResult.parseFrom(serialized));
   }
-
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Criteria.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Criteria.java
index 989cd658121ef..7698b83f98b35 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Criteria.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Criteria.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
-import org.apache.arrow.flight.impl.Flight;
-
 import com.google.protobuf.ByteString;
+import org.apache.arrow.flight.impl.Flight;
 
 /**
  * An opaque object that can be used to filter a list of streams available from a server.
@@ -40,9 +38,7 @@ public Criteria(byte[] bytes) {
     this.bytes = criteria.getExpression().toByteArray();
   }
 
-  /**
-   * Get the contained filter criteria.
-   */
+  /** Get the contained filter criteria. */
   public byte[] getExpression() {
     return bytes;
   }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/DictionaryUtils.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/DictionaryUtils.java
index 516dab01d8a1b..cecc1b876ecd9 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/DictionaryUtils.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/DictionaryUtils.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.util.ArrayList;
@@ -24,7 +23,6 @@
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.flight.impl.Flight;
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.vector.FieldVector;
@@ -39,9 +37,7 @@
 import org.apache.arrow.vector.util.DictionaryUtility;
 import org.apache.arrow.vector.validate.MetadataV4UnionChecker;
 
-/**
- * Utilities to work with dictionaries in Flight.
- */
+/** Utilities to work with dictionaries in Flight. */
 final class DictionaryUtils {
 
   private DictionaryUtils() {
@@ -51,16 +47,22 @@ private DictionaryUtils() {
   /**
    * Generate all the necessary Flight messages to send a schema and associated dictionaries.
    *
-   * @throws Exception if there was an error closing {@link ArrowMessage} objects. This is not generally expected.
+   * @throws Exception if there was an error closing {@link ArrowMessage} objects. This is not
+   *     generally expected.
    */
-  static Schema generateSchemaMessages(final Schema originalSchema, final FlightDescriptor descriptor,
-                                       final DictionaryProvider provider, final IpcOption option,
-                                       final Consumer<ArrowMessage> messageCallback) throws Exception {
+  static Schema generateSchemaMessages(
+      final Schema originalSchema,
+      final FlightDescriptor descriptor,
+      final DictionaryProvider provider,
+      final IpcOption option,
+      final Consumer<ArrowMessage> messageCallback)
+      throws Exception {
     final Set<Long> dictionaryIds = new HashSet<>();
     final Schema schema = generateSchema(originalSchema, provider, dictionaryIds);
     MetadataV4UnionChecker.checkForUnion(schema.getFields().iterator(), option.metadataVersion);
     // Send the schema message
-    final Flight.FlightDescriptor protoDescriptor = descriptor == null ? null : descriptor.toProtocol();
+    final Flight.FlightDescriptor protoDescriptor =
+        descriptor == null ? null : descriptor.toProtocol();
     try (final ArrowMessage message = new ArrowMessage(protoDescriptor, schema, option)) {
       messageCallback.accept(message);
     }
@@ -70,13 +72,14 @@ static Schema generateSchemaMessages(final Schema originalSchema, final FlightDe
       final FieldVector vector = dictionary.getVector();
       final int count = vector.getValueCount();
       // Do NOT close this root, as it does not actually own the vector.
-      final VectorSchemaRoot dictRoot = new VectorSchemaRoot(
-          Collections.singletonList(vector.getField()),
-          Collections.singletonList(vector),
-          count);
+      final VectorSchemaRoot dictRoot =
+          new VectorSchemaRoot(
+              Collections.singletonList(vector.getField()),
+              Collections.singletonList(vector),
+              count);
       final VectorUnloader unloader = new VectorUnloader(dictRoot);
-      try (final ArrowDictionaryBatch dictionaryBatch = new ArrowDictionaryBatch(
-          id, unloader.getRecordBatch());
+      try (final ArrowDictionaryBatch dictionaryBatch =
+              new ArrowDictionaryBatch(id, unloader.getRecordBatch());
           final ArrowMessage message = new ArrowMessage(dictionaryBatch, option)) {
         messageCallback.accept(message);
       }
@@ -84,27 +87,33 @@ static Schema generateSchemaMessages(final Schema originalSchema, final FlightDe
     return schema;
   }
 
-  static void closeDictionaries(final Schema schema, final DictionaryProvider provider) throws Exception {
+  static void closeDictionaries(final Schema schema, final DictionaryProvider provider)
+      throws Exception {
     // Close dictionaries
     final Set<Long> dictionaryIds = new HashSet<>();
-    schema.getFields().forEach(field -> DictionaryUtility.toMessageFormat(field, provider, dictionaryIds));
+    schema
+        .getFields()
+        .forEach(field -> DictionaryUtility.toMessageFormat(field, provider, dictionaryIds));
 
-    final List<AutoCloseable> dictionaryVectors = dictionaryIds.stream()
-            .map(id -> (AutoCloseable) provider.lookup(id).getVector()).collect(Collectors.toList());
+    final List<AutoCloseable> dictionaryVectors =
+        dictionaryIds.stream()
+            .map(id -> (AutoCloseable) provider.lookup(id).getVector())
+            .collect(Collectors.toList());
     AutoCloseables.close(dictionaryVectors);
   }
 
   /**
-   * Generates the schema to send with flight messages.
-   * If the schema contains no field with a dictionary, it will return the schema as is.
-   * Otherwise, it will return a newly created a new schema after converting the fields.
+   * Generates the schema to send with flight messages. If the schema contains no field with a
+   * dictionary, it will return the schema as is. Otherwise, it will return a newly created a new
+   * schema after converting the fields.
+   *
    * @param originalSchema the original schema.
    * @param provider the dictionary provider.
    * @param dictionaryIds dictionary IDs that are used.
    * @return the schema to send with the flight messages.
    */
   static Schema generateSchema(
-          final Schema originalSchema, final DictionaryProvider provider, Set<Long> dictionaryIds) {
+      final Schema originalSchema, final DictionaryProvider provider, Set<Long> dictionaryIds) {
     // first determine if a new schema needs to be created.
     boolean createSchema = false;
     for (Field field : originalSchema.getFields()) {
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ErrorFlightMetadata.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ErrorFlightMetadata.java
index 6e19d2750cb67..8f6c0513ac75a 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ErrorFlightMetadata.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ErrorFlightMetadata.java
@@ -14,27 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
+import com.google.common.collect.Iterables;
+import com.google.common.collect.LinkedListMultimap;
+import com.google.common.collect.Multimap;
 import java.nio.charset.StandardCharsets;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import com.google.common.collect.Iterables;
-import com.google.common.collect.LinkedListMultimap;
-import com.google.common.collect.Multimap;
-
-/**
- * metadata container specific to the binary metadata held in the grpc trailer.
- */
+/** metadata container specific to the binary metadata held in the grpc trailer. */
 public class ErrorFlightMetadata implements CallHeaders {
   private final Multimap<String, byte[]> metadata = LinkedListMultimap.create();
 
-  public ErrorFlightMetadata() {
-  }
-
+  public ErrorFlightMetadata() {}
 
   @Override
   public String get(String key) {
@@ -48,8 +42,7 @@ public byte[] getByte(String key) {
 
   @Override
   public Iterable<String> getAll(String key) {
-    return StreamSupport.stream(
-        getAllByte(key).spliterator(), false)
+    return StreamSupport.stream(getAllByte(key).spliterator(), false)
         .map(b -> new String(b, StandardCharsets.US_ASCII))
         .collect(Collectors.toList());
   }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightBindingService.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightBindingService.java
index ba5249b4a53ad..b68f3aa86caf3 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightBindingService.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightBindingService.java
@@ -14,20 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-
-import org.apache.arrow.flight.auth.ServerAuthHandler;
-import org.apache.arrow.flight.impl.Flight;
-import org.apache.arrow.flight.impl.Flight.PutResult;
-import org.apache.arrow.flight.impl.FlightServiceGrpc;
-import org.apache.arrow.memory.BufferAllocator;
-
 import com.google.common.collect.ImmutableSet;
-
 import io.grpc.BindableService;
 import io.grpc.MethodDescriptor;
 import io.grpc.MethodDescriptor.MethodType;
@@ -37,28 +26,39 @@
 import io.grpc.protobuf.ProtoUtils;
 import io.grpc.stub.ServerCalls;
 import io.grpc.stub.StreamObserver;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import org.apache.arrow.flight.auth.ServerAuthHandler;
+import org.apache.arrow.flight.impl.Flight;
+import org.apache.arrow.flight.impl.Flight.PutResult;
+import org.apache.arrow.flight.impl.FlightServiceGrpc;
+import org.apache.arrow.memory.BufferAllocator;
 
-/**
- * Extends the basic flight service to override some methods for more efficient implementations.
- */
+/** Extends the basic flight service to override some methods for more efficient implementations. */
 class FlightBindingService implements BindableService {
 
-  private static final String DO_GET = MethodDescriptor.generateFullMethodName(FlightConstants.SERVICE, "DoGet");
-  private static final String DO_PUT = MethodDescriptor.generateFullMethodName(FlightConstants.SERVICE, "DoPut");
-  private static final String DO_EXCHANGE = MethodDescriptor.generateFullMethodName(
-      FlightConstants.SERVICE, "DoExchange");
+  private static final String DO_GET =
+      MethodDescriptor.generateFullMethodName(FlightConstants.SERVICE, "DoGet");
+  private static final String DO_PUT =
+      MethodDescriptor.generateFullMethodName(FlightConstants.SERVICE, "DoPut");
+  private static final String DO_EXCHANGE =
+      MethodDescriptor.generateFullMethodName(FlightConstants.SERVICE, "DoExchange");
   private static final Set<String> OVERRIDE_METHODS = ImmutableSet.of(DO_GET, DO_PUT, DO_EXCHANGE);
 
   private final FlightService delegate;
   private final BufferAllocator allocator;
 
-  public FlightBindingService(BufferAllocator allocator, FlightProducer producer,
-      ServerAuthHandler authHandler, ExecutorService executor) {
+  public FlightBindingService(
+      BufferAllocator allocator,
+      FlightProducer producer,
+      ServerAuthHandler authHandler,
+      ExecutorService executor) {
     this.allocator = allocator;
     this.delegate = new FlightService(allocator, producer, authHandler, executor);
   }
 
-  public static MethodDescriptor<Flight.Ticket, ArrowMessage> getDoGetDescriptor(BufferAllocator allocator) {
+  public static MethodDescriptor<Flight.Ticket, ArrowMessage> getDoGetDescriptor(
+      BufferAllocator allocator) {
     return MethodDescriptor.<Flight.Ticket, ArrowMessage>newBuilder()
         .setType(io.grpc.MethodDescriptor.MethodType.SERVER_STREAMING)
         .setFullMethodName(DO_GET)
@@ -69,7 +69,8 @@ public static MethodDescriptor<Flight.Ticket, ArrowMessage> getDoGetDescriptor(B
         .build();
   }
 
-  public static MethodDescriptor<ArrowMessage, Flight.PutResult> getDoPutDescriptor(BufferAllocator allocator) {
+  public static MethodDescriptor<ArrowMessage, Flight.PutResult> getDoPutDescriptor(
+      BufferAllocator allocator) {
     return MethodDescriptor.<ArrowMessage, Flight.PutResult>newBuilder()
         .setType(MethodType.BIDI_STREAMING)
         .setFullMethodName(DO_PUT)
@@ -80,28 +81,33 @@ public static MethodDescriptor<ArrowMessage, Flight.PutResult> getDoPutDescripto
         .build();
   }
 
-  public static MethodDescriptor<ArrowMessage, ArrowMessage> getDoExchangeDescriptor(BufferAllocator allocator) {
+  public static MethodDescriptor<ArrowMessage, ArrowMessage> getDoExchangeDescriptor(
+      BufferAllocator allocator) {
     return MethodDescriptor.<ArrowMessage, ArrowMessage>newBuilder()
-            .setType(MethodType.BIDI_STREAMING)
-            .setFullMethodName(DO_EXCHANGE)
-            .setSampledToLocalTracing(false)
-            .setRequestMarshaller(ArrowMessage.createMarshaller(allocator))
-            .setResponseMarshaller(ArrowMessage.createMarshaller(allocator))
-            .setSchemaDescriptor(FlightServiceGrpc.getDoExchangeMethod().getSchemaDescriptor())
-            .build();
+        .setType(MethodType.BIDI_STREAMING)
+        .setFullMethodName(DO_EXCHANGE)
+        .setSampledToLocalTracing(false)
+        .setRequestMarshaller(ArrowMessage.createMarshaller(allocator))
+        .setResponseMarshaller(ArrowMessage.createMarshaller(allocator))
+        .setSchemaDescriptor(FlightServiceGrpc.getDoExchangeMethod().getSchemaDescriptor())
+        .build();
   }
 
   @Override
   public ServerServiceDefinition bindService() {
     final ServerServiceDefinition baseDefinition = delegate.bindService();
 
-    final MethodDescriptor<Flight.Ticket, ArrowMessage> doGetDescriptor = getDoGetDescriptor(allocator);
-    final MethodDescriptor<ArrowMessage, Flight.PutResult> doPutDescriptor = getDoPutDescriptor(allocator);
-    final MethodDescriptor<ArrowMessage, ArrowMessage> doExchangeDescriptor = getDoExchangeDescriptor(allocator);
+    final MethodDescriptor<Flight.Ticket, ArrowMessage> doGetDescriptor =
+        getDoGetDescriptor(allocator);
+    final MethodDescriptor<ArrowMessage, Flight.PutResult> doPutDescriptor =
+        getDoPutDescriptor(allocator);
+    final MethodDescriptor<ArrowMessage, ArrowMessage> doExchangeDescriptor =
+        getDoExchangeDescriptor(allocator);
 
     // Make sure we preserve SchemaDescriptor fields on methods so that gRPC reflection still works.
-    final ServiceDescriptor.Builder serviceDescriptorBuilder = ServiceDescriptor.newBuilder(FlightConstants.SERVICE)
-        .setSchemaDescriptor(baseDefinition.getServiceDescriptor().getSchemaDescriptor());
+    final ServiceDescriptor.Builder serviceDescriptorBuilder =
+        ServiceDescriptor.newBuilder(FlightConstants.SERVICE)
+            .setSchemaDescriptor(baseDefinition.getServiceDescriptor().getSchemaDescriptor());
     serviceDescriptorBuilder.addMethod(doGetDescriptor);
     serviceDescriptorBuilder.addMethod(doPutDescriptor);
     serviceDescriptorBuilder.addMethod(doExchangeDescriptor);
@@ -114,10 +120,14 @@ public ServerServiceDefinition bindService() {
     }
 
     final ServiceDescriptor serviceDescriptor = serviceDescriptorBuilder.build();
-    ServerServiceDefinition.Builder serviceBuilder = ServerServiceDefinition.builder(serviceDescriptor);
-    serviceBuilder.addMethod(doGetDescriptor, ServerCalls.asyncServerStreamingCall(new DoGetMethod(delegate)));
-    serviceBuilder.addMethod(doPutDescriptor, ServerCalls.asyncBidiStreamingCall(new DoPutMethod(delegate)));
-    serviceBuilder.addMethod(doExchangeDescriptor, ServerCalls.asyncBidiStreamingCall(new DoExchangeMethod(delegate)));
+    ServerServiceDefinition.Builder serviceBuilder =
+        ServerServiceDefinition.builder(serviceDescriptor);
+    serviceBuilder.addMethod(
+        doGetDescriptor, ServerCalls.asyncServerStreamingCall(new DoGetMethod(delegate)));
+    serviceBuilder.addMethod(
+        doPutDescriptor, ServerCalls.asyncBidiStreamingCall(new DoPutMethod(delegate)));
+    serviceBuilder.addMethod(
+        doExchangeDescriptor, ServerCalls.asyncBidiStreamingCall(new DoExchangeMethod(delegate)));
 
     // copy over not-overridden methods.
     for (ServerMethodDefinition<?, ?> definition : baseDefinition.getMethods()) {
@@ -131,7 +141,8 @@ public ServerServiceDefinition bindService() {
     return serviceBuilder.build();
   }
 
-  private static class DoGetMethod implements ServerCalls.ServerStreamingMethod<Flight.Ticket, ArrowMessage> {
+  private static class DoGetMethod
+      implements ServerCalls.ServerStreamingMethod<Flight.Ticket, ArrowMessage> {
 
     private final FlightService delegate;
 
@@ -145,7 +156,8 @@ public void invoke(Flight.Ticket request, StreamObserver<ArrowMessage> responseO
     }
   }
 
-  private static class DoPutMethod implements ServerCalls.BidiStreamingMethod<ArrowMessage, PutResult> {
+  private static class DoPutMethod
+      implements ServerCalls.BidiStreamingMethod<ArrowMessage, PutResult> {
     private final FlightService delegate;
 
     public DoPutMethod(FlightService delegate) {
@@ -158,7 +170,8 @@ public StreamObserver<ArrowMessage> invoke(StreamObserver<PutResult> responseObs
     }
   }
 
-  private static class DoExchangeMethod implements ServerCalls.BidiStreamingMethod<ArrowMessage, ArrowMessage> {
+  private static class DoExchangeMethod
+      implements ServerCalls.BidiStreamingMethod<ArrowMessage, ArrowMessage> {
     private final FlightService delegate;
 
     public DoExchangeMethod(FlightService delegate) {
@@ -170,5 +183,4 @@ public StreamObserver<ArrowMessage> invoke(StreamObserver<ArrowMessage> response
       return delegate.doExchangeCustom(responseObserver);
     }
   }
-
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightCallHeaders.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightCallHeaders.java
index 93b89e775507e..b7b1fdcacc2a4 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightCallHeaders.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightCallHeaders.java
@@ -14,24 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Multimap;
-
 import io.grpc.Metadata;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.Set;
+import java.util.stream.Collectors;
 
-/**
- * An implementation of the Flight headers interface for headers.
- */
+/** An implementation of the Flight headers interface for headers. */
 public class FlightCallHeaders implements CallHeaders {
   private final Multimap<String, Object> keysAndValues;
 
@@ -70,7 +65,8 @@ public byte[] getByte(String key) {
   @Override
   public Iterable<String> getAll(String key) {
     if (key.endsWith(Metadata.BINARY_HEADER_SUFFIX)) {
-      return this.keysAndValues.get(key).stream().map(o -> new String((byte[]) o, StandardCharsets.UTF_8))
+      return this.keysAndValues.get(key).stream()
+          .map(o -> new String((byte[]) o, StandardCharsets.UTF_8))
           .collect(Collectors.toList());
     }
     return (Collection<String>) (Collection<?>) this.keysAndValues.get(key);
@@ -81,7 +77,8 @@ public Iterable<byte[]> getAllByte(String key) {
     if (key.endsWith(Metadata.BINARY_HEADER_SUFFIX)) {
       return (Collection<byte[]>) (Collection<?>) this.keysAndValues.get(key);
     }
-    return this.keysAndValues.get(key).stream().map(o -> ((String) o).getBytes(StandardCharsets.UTF_8))
+    return this.keysAndValues.get(key).stream()
+        .map(o -> ((String) o).getBytes(StandardCharsets.UTF_8))
         .collect(Collectors.toList());
   }
 
@@ -92,7 +89,8 @@ public void insert(String key, String value) {
 
   @Override
   public void insert(String key, byte[] value) {
-    Preconditions.checkArgument(key.endsWith("-bin"), "Binary header is named %s. It must end with %s", key, "-bin");
+    Preconditions.checkArgument(
+        key.endsWith("-bin"), "Binary header is named %s. It must end with %s", key, "-bin");
     Preconditions.checkArgument(key.length() > "-bin".length(), "empty key name");
 
     this.keysAndValues.put(key, value);
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightClient.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightClient.java
index 49f9af4ebfbb7..62b3c1eedb69d 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightClient.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightClient.java
@@ -14,9 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
+import io.grpc.Channel;
+import io.grpc.ClientCall;
+import io.grpc.ClientInterceptor;
+import io.grpc.ClientInterceptors;
+import io.grpc.ManagedChannel;
+import io.grpc.MethodDescriptor;
+import io.grpc.StatusRuntimeException;
+import io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.NettyChannelBuilder;
+import io.grpc.stub.ClientCallStreamObserver;
+import io.grpc.stub.ClientCalls;
+import io.grpc.stub.ClientResponseObserver;
+import io.grpc.stub.StreamObserver;
+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.IOException;
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
@@ -29,9 +45,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BooleanSupplier;
-
 import javax.net.ssl.SSLException;
-
 import org.apache.arrow.flight.FlightProducer.StreamListener;
 import org.apache.arrow.flight.auth.BasicClientAuthHandler;
 import org.apache.arrow.flight.auth.ClientAuthHandler;
@@ -55,31 +69,15 @@
 import org.apache.arrow.vector.dictionary.DictionaryProvider;
 import org.apache.arrow.vector.dictionary.DictionaryProvider.MapDictionaryProvider;
 
-import io.grpc.Channel;
-import io.grpc.ClientCall;
-import io.grpc.ClientInterceptor;
-import io.grpc.ClientInterceptors;
-import io.grpc.ManagedChannel;
-import io.grpc.MethodDescriptor;
-import io.grpc.StatusRuntimeException;
-import io.grpc.netty.GrpcSslContexts;
-import io.grpc.netty.NettyChannelBuilder;
-import io.grpc.stub.ClientCallStreamObserver;
-import io.grpc.stub.ClientCalls;
-import io.grpc.stub.ClientResponseObserver;
-import io.grpc.stub.StreamObserver;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.ServerChannel;
-import io.netty.handler.ssl.SslContextBuilder;
-import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
-
-/**
- * Client for Flight services.
- */
+/** Client for Flight services. */
 public class FlightClient implements AutoCloseable {
   private static final int PENDING_REQUESTS = 5;
-  /** The maximum number of trace events to keep on the gRPC Channel. This value disables channel tracing. */
+  /**
+   * The maximum number of trace events to keep on the gRPC Channel. This value disables channel
+   * tracing.
+   */
   private static final int MAX_CHANNEL_TRACE_EVENTS = 0;
+
   private final BufferAllocator allocator;
   private final ManagedChannel channel;
 
@@ -91,17 +89,18 @@ public class FlightClient implements AutoCloseable {
   private final MethodDescriptor<ArrowMessage, ArrowMessage> doExchangeDescriptor;
   private final List<FlightClientMiddleware.Factory> middleware;
 
-  /**
-   * Create a Flight client from an allocator and a gRPC channel.
-   */
-  FlightClient(BufferAllocator incomingAllocator, ManagedChannel channel,
+  /** Create a Flight client from an allocator and a gRPC channel. */
+  FlightClient(
+      BufferAllocator incomingAllocator,
+      ManagedChannel channel,
       List<FlightClientMiddleware.Factory> middleware) {
     this.allocator = incomingAllocator.newChildAllocator("flight-client", 0, Long.MAX_VALUE);
     this.channel = channel;
     this.middleware = middleware;
 
     final ClientInterceptor[] interceptors;
-    interceptors = new ClientInterceptor[]{authInterceptor, new ClientInterceptorAdapter(middleware)};
+    interceptors =
+        new ClientInterceptor[] {authInterceptor, new ClientInterceptorAdapter(middleware)};
 
     // Create a channel with interceptors pre-applied for DoGet and DoPut
     Channel interceptedChannel = ClientInterceptors.intercept(channel, interceptors);
@@ -123,20 +122,23 @@ public class FlightClient implements AutoCloseable {
   public Iterable<FlightInfo> listFlights(Criteria criteria, CallOption... options) {
     final Iterator<Flight.FlightInfo> flights;
     try {
-      flights = CallOptions.wrapStub(blockingStub, options)
-          .listFlights(criteria.asCriteria());
+      flights = CallOptions.wrapStub(blockingStub, options).listFlights(criteria.asCriteria());
     } catch (StatusRuntimeException sre) {
       throw StatusUtils.fromGrpcRuntimeException(sre);
     }
-    return () -> StatusUtils.wrapIterator(flights, t -> {
-      try {
-        return new FlightInfo(t);
-      } catch (URISyntaxException e) {
-        // We don't expect this will happen for conforming Flight implementations. For instance, a Java server
-        // itself wouldn't be able to construct an invalid Location.
-        throw new RuntimeException(e);
-      }
-    });
+    return () ->
+        StatusUtils.wrapIterator(
+            flights,
+            t -> {
+              try {
+                return new FlightInfo(t);
+              } catch (URISyntaxException e) {
+                // We don't expect this will happen for conforming Flight implementations. For
+                // instance, a Java server
+                // itself wouldn't be able to construct an invalid Location.
+                throw new RuntimeException(e);
+              }
+            });
   }
 
   /**
@@ -147,8 +149,7 @@ public Iterable<FlightInfo> listFlights(Criteria criteria, CallOption... options
   public Iterable<ActionType> listActions(CallOption... options) {
     final Iterator<Flight.ActionType> actions;
     try {
-      actions = CallOptions.wrapStub(blockingStub, options)
-          .listActions(Empty.getDefaultInstance());
+      actions = CallOptions.wrapStub(blockingStub, options).listActions(Empty.getDefaultInstance());
     } catch (StatusRuntimeException sre) {
       throw StatusUtils.fromGrpcRuntimeException(sre);
     }
@@ -163,13 +164,11 @@ public Iterable<ActionType> listActions(CallOption... options) {
    * @return An iterator of results.
    */
   public Iterator<Result> doAction(Action action, CallOption... options) {
-    return StatusUtils
-        .wrapIterator(CallOptions.wrapStub(blockingStub, options).doAction(action.toProtocol()), Result::new);
+    return StatusUtils.wrapIterator(
+        CallOptions.wrapStub(blockingStub, options).doAction(action.toProtocol()), Result::new);
   }
 
-  /**
-   * Authenticates with a username and password.
-   */
+  /** Authenticates with a username and password. */
   public void authenticateBasic(String username, String password) {
     BasicClientAuthHandler basicClient = new BasicClientAuthHandler(username, password);
     authenticate(basicClient);
@@ -192,12 +191,12 @@ public void authenticate(ClientAuthHandler handler, CallOption... options) {
    *
    * @param username the username.
    * @param password the password.
-   * @return a CredentialCallOption containing a bearer token if the server emitted one, or
-   *     empty if no bearer token was returned. This can be used in subsequent API calls.
+   * @return a CredentialCallOption containing a bearer token if the server emitted one, or empty if
+   *     no bearer token was returned. This can be used in subsequent API calls.
    */
   public Optional<CredentialCallOption> authenticateBasicToken(String username, String password) {
     final ClientIncomingAuthHeaderMiddleware.Factory clientAuthMiddleware =
-            new ClientIncomingAuthHeaderMiddleware.Factory(new ClientBearerHeaderHandler());
+        new ClientIncomingAuthHeaderMiddleware.Factory(new ClientBearerHeaderHandler());
     middleware.add(clientAuthMiddleware);
     handshake(new CredentialCallOption(new BasicAuthCredentialWriter(username, password)));
 
@@ -218,27 +217,36 @@ public void handshake(CallOption... options) {
    *
    * @param descriptor FlightDescriptor the descriptor for the data
    * @param root VectorSchemaRoot the root containing data
-   * @param metadataListener A handler for metadata messages from the server. This will be passed buffers that will be
-   *     freed after {@link StreamListener#onNext(Object)} is called!
+   * @param metadataListener A handler for metadata messages from the server. This will be passed
+   *     buffers that will be freed after {@link StreamListener#onNext(Object)} is called!
    * @param options RPC-layer hints for this call.
    * @return ClientStreamListener an interface to control uploading data
    */
-  public ClientStreamListener startPut(FlightDescriptor descriptor, VectorSchemaRoot root,
-      PutListener metadataListener, CallOption... options) {
+  public ClientStreamListener startPut(
+      FlightDescriptor descriptor,
+      VectorSchemaRoot root,
+      PutListener metadataListener,
+      CallOption... options) {
     return startPut(descriptor, root, new MapDictionaryProvider(), metadataListener, options);
   }
 
   /**
    * Create or append a descriptor with another stream.
+   *
    * @param descriptor FlightDescriptor the descriptor for the data
    * @param root VectorSchemaRoot the root containing data
    * @param metadataListener A handler for metadata messages from the server.
    * @param options RPC-layer hints for this call.
-   * @return ClientStreamListener an interface to control uploading data.
-   *     {@link ClientStreamListener#start(VectorSchemaRoot, DictionaryProvider)} will already have been called.
+   * @return ClientStreamListener an interface to control uploading data. {@link
+   *     ClientStreamListener#start(VectorSchemaRoot, DictionaryProvider)} will already have been
+   *     called.
    */
-  public ClientStreamListener startPut(FlightDescriptor descriptor, VectorSchemaRoot root, DictionaryProvider provider,
-      PutListener metadataListener, CallOption... options) {
+  public ClientStreamListener startPut(
+      FlightDescriptor descriptor,
+      VectorSchemaRoot root,
+      DictionaryProvider provider,
+      PutListener metadataListener,
+      CallOption... options) {
     Preconditions.checkNotNull(root, "root must not be null");
     Preconditions.checkNotNull(provider, "provider must not be null");
     final ClientStreamListener writer = startPut(descriptor, metadataListener, options);
@@ -248,22 +256,26 @@ public ClientStreamListener startPut(FlightDescriptor descriptor, VectorSchemaRo
 
   /**
    * Create or append a descriptor with another stream.
+   *
    * @param descriptor FlightDescriptor the descriptor for the data
    * @param metadataListener A handler for metadata messages from the server.
    * @param options RPC-layer hints for this call.
-   * @return ClientStreamListener an interface to control uploading data.
-   *     {@link ClientStreamListener#start(VectorSchemaRoot, DictionaryProvider)} will NOT already have been called.
+   * @return ClientStreamListener an interface to control uploading data. {@link
+   *     ClientStreamListener#start(VectorSchemaRoot, DictionaryProvider)} will NOT already have
+   *     been called.
    */
-  public ClientStreamListener startPut(FlightDescriptor descriptor, PutListener metadataListener,
-                                       CallOption... options) {
+  public ClientStreamListener startPut(
+      FlightDescriptor descriptor, PutListener metadataListener, CallOption... options) {
     Preconditions.checkNotNull(descriptor, "descriptor must not be null");
     Preconditions.checkNotNull(metadataListener, "metadataListener must not be null");
 
     try {
-      final ClientCall<ArrowMessage, Flight.PutResult> call = asyncStubNewCall(doPutDescriptor, options);
+      final ClientCall<ArrowMessage, Flight.PutResult> call =
+          asyncStubNewCall(doPutDescriptor, options);
       final SetStreamObserver resultObserver = new SetStreamObserver(allocator, metadataListener);
-      ClientCallStreamObserver<ArrowMessage> observer = (ClientCallStreamObserver<ArrowMessage>)
-          ClientCalls.asyncBidiStreamingCall(call, resultObserver);
+      ClientCallStreamObserver<ArrowMessage> observer =
+          (ClientCallStreamObserver<ArrowMessage>)
+              ClientCalls.asyncBidiStreamingCall(call, resultObserver);
       return new PutObserver(
           descriptor, observer, metadataListener::isCancelled, metadataListener::getResult);
     } catch (StatusRuntimeException sre) {
@@ -273,14 +285,17 @@ public ClientStreamListener startPut(FlightDescriptor descriptor, PutListener me
 
   /**
    * Get info on a stream.
+   *
    * @param descriptor The descriptor for the stream.
    * @param options RPC-layer hints for this call.
    */
   public FlightInfo getInfo(FlightDescriptor descriptor, CallOption... options) {
     try {
-      return new FlightInfo(CallOptions.wrapStub(blockingStub, options).getFlightInfo(descriptor.toProtocol()));
+      return new FlightInfo(
+          CallOptions.wrapStub(blockingStub, options).getFlightInfo(descriptor.toProtocol()));
     } catch (URISyntaxException e) {
-      // We don't expect this will happen for conforming Flight implementations. For instance, a Java server
+      // We don't expect this will happen for conforming Flight implementations. For instance, a
+      // Java server
       // itself wouldn't be able to construct an invalid Location.
       throw new RuntimeException(e);
     } catch (StatusRuntimeException sre) {
@@ -297,7 +312,8 @@ public FlightInfo getInfo(FlightDescriptor descriptor, CallOption... options) {
    */
   public PollInfo pollInfo(FlightDescriptor descriptor, CallOption... options) {
     try {
-      return new PollInfo(CallOptions.wrapStub(blockingStub, options).pollFlightInfo(descriptor.toProtocol()));
+      return new PollInfo(
+          CallOptions.wrapStub(blockingStub, options).pollFlightInfo(descriptor.toProtocol()));
     } catch (URISyntaxException e) {
       throw new RuntimeException(e);
     } catch (StatusRuntimeException sre) {
@@ -307,13 +323,14 @@ public PollInfo pollInfo(FlightDescriptor descriptor, CallOption... options) {
 
   /**
    * Get schema for a stream.
+   *
    * @param descriptor The descriptor for the stream.
    * @param options RPC-layer hints for this call.
    */
   public SchemaResult getSchema(FlightDescriptor descriptor, CallOption... options) {
     try {
-      return SchemaResult.fromProtocol(CallOptions.wrapStub(blockingStub, options)
-          .getSchema(descriptor.toProtocol()));
+      return SchemaResult.fromProtocol(
+          CallOptions.wrapStub(blockingStub, options).getSchema(descriptor.toProtocol()));
     } catch (StatusRuntimeException sre) {
       throw StatusUtils.fromGrpcRuntimeException(sre);
     }
@@ -321,23 +338,26 @@ public SchemaResult getSchema(FlightDescriptor descriptor, CallOption... options
 
   /**
    * Retrieve a stream from the server.
+   *
    * @param ticket The ticket granting access to the data stream.
    * @param options RPC-layer hints for this call.
    */
   public FlightStream getStream(Ticket ticket, CallOption... options) {
     final ClientCall<Flight.Ticket, ArrowMessage> call = asyncStubNewCall(doGetDescriptor, options);
-    FlightStream stream = new FlightStream(
-        allocator,
-        PENDING_REQUESTS,
-        (String message, Throwable cause) -> call.cancel(message, cause),
-        (count) -> call.request(count));
+    FlightStream stream =
+        new FlightStream(
+            allocator,
+            PENDING_REQUESTS,
+            (String message, Throwable cause) -> call.cancel(message, cause),
+            (count) -> call.request(count));
 
     final StreamObserver<ArrowMessage> delegate = stream.asObserver();
     ClientResponseObserver<Flight.Ticket, ArrowMessage> clientResponseObserver =
         new ClientResponseObserver<Flight.Ticket, ArrowMessage>() {
 
           @Override
-          public void beforeStart(ClientCallStreamObserver<org.apache.arrow.flight.impl.Flight.Ticket> requestStream) {
+          public void beforeStart(
+              ClientCallStreamObserver<org.apache.arrow.flight.impl.Flight.Ticket> requestStream) {
             requestStream.disableAutoInboundFlowControl();
           }
 
@@ -355,7 +375,6 @@ public void onError(Throwable t) {
           public void onCompleted() {
             delegate.onCompleted();
           }
-
         };
 
     ClientCalls.asyncServerStreamingCall(call, ticket.toProtocol(), clientResponseObserver);
@@ -373,28 +392,34 @@ public ExchangeReaderWriter doExchange(FlightDescriptor descriptor, CallOption..
     Preconditions.checkNotNull(descriptor, "descriptor must not be null");
 
     try {
-      final ClientCall<ArrowMessage, ArrowMessage> call = asyncStubNewCall(doExchangeDescriptor, options);
-      final FlightStream stream = new FlightStream(allocator, PENDING_REQUESTS, call::cancel, call::request);
-      final ClientCallStreamObserver<ArrowMessage> observer = (ClientCallStreamObserver<ArrowMessage>)
+      final ClientCall<ArrowMessage, ArrowMessage> call =
+          asyncStubNewCall(doExchangeDescriptor, options);
+      final FlightStream stream =
+          new FlightStream(allocator, PENDING_REQUESTS, call::cancel, call::request);
+      final ClientCallStreamObserver<ArrowMessage> observer =
+          (ClientCallStreamObserver<ArrowMessage>)
               ClientCalls.asyncBidiStreamingCall(call, stream.asObserver());
-      final ClientStreamListener writer = new PutObserver(
-          descriptor, observer, stream.cancelled::isDone,
-          () -> {
-            try {
-              stream.completed.get();
-            } catch (InterruptedException e) {
-              Thread.currentThread().interrupt();
-              throw CallStatus.INTERNAL
-                  .withDescription("Client error: interrupted while completing call")
-                  .withCause(e)
-                  .toRuntimeException();
-            } catch (ExecutionException e) {
-              throw CallStatus.INTERNAL
-                  .withDescription("Client error: internal while completing call")
-                  .withCause(e)
-                  .toRuntimeException();
-            }
-          });
+      final ClientStreamListener writer =
+          new PutObserver(
+              descriptor,
+              observer,
+              stream.cancelled::isDone,
+              () -> {
+                try {
+                  stream.completed.get();
+                } catch (InterruptedException e) {
+                  Thread.currentThread().interrupt();
+                  throw CallStatus.INTERNAL
+                      .withDescription("Client error: interrupted while completing call")
+                      .withCause(e)
+                      .toRuntimeException();
+                } catch (ExecutionException e) {
+                  throw CallStatus.INTERNAL
+                      .withDescription("Client error: internal while completing call")
+                      .withCause(e)
+                      .toRuntimeException();
+                }
+              });
       // Send the descriptor to start.
       try (final ArrowMessage message = new ArrowMessage(descriptor.toProtocol())) {
         observer.onNext(message);
@@ -432,13 +457,12 @@ public ClientStreamListener getWriter() {
 
     /**
      * Make sure stream is drained. You must call this to be notified of any errors that may have
-     * happened after the exchange is complete. This should be called after `getWriter().completed()`
-     * and instead of `getWriter().getResult()`.
+     * happened after the exchange is complete. This should be called after
+     * `getWriter().completed()` and instead of `getWriter().getResult()`.
      */
     public void getResult() {
       // After exchange is complete, make sure stream is drained to propagate errors through reader
-      while (reader.next()) {
-      }
+      while (reader.next()) {}
     }
 
     /** Shut down the streams in this call. */
@@ -448,9 +472,7 @@ public void close() throws Exception {
     }
   }
 
-  /**
-   * A stream observer for Flight.PutResult
-   */
+  /** A stream observer for Flight.PutResult */
   private static class SetStreamObserver implements StreamObserver<Flight.PutResult> {
     private final BufferAllocator allocator;
     private final StreamListener<PutResult> listener;
@@ -479,9 +501,7 @@ public void onCompleted() {
     }
   }
 
-  /**
-   * The implementation of a {@link ClientStreamListener} for writing data to a Flight server.
-   */
+  /** The implementation of a {@link ClientStreamListener} for writing data to a Flight server. */
   static class PutObserver extends OutboundStreamListenerImpl implements ClientStreamListener {
     private final BooleanSupplier isCancelled;
     private final Runnable getResult;
@@ -494,8 +514,11 @@ static class PutObserver extends OutboundStreamListenerImpl implements ClientStr
      * @param isCancelled A flag to check if the call has been cancelled.
      * @param getResult A flag that blocks until the overall call completes.
      */
-    PutObserver(FlightDescriptor descriptor, ClientCallStreamObserver<ArrowMessage> observer,
-                BooleanSupplier isCancelled, Runnable getResult) {
+    PutObserver(
+        FlightDescriptor descriptor,
+        ClientCallStreamObserver<ArrowMessage> observer,
+        BooleanSupplier isCancelled,
+        Runnable getResult) {
       super(descriptor, observer);
       Preconditions.checkNotNull(descriptor, "descriptor must be provided");
       Preconditions.checkNotNull(isCancelled, "isCancelled must be provided");
@@ -527,8 +550,10 @@ public void getResult() {
    * @param options Call options.
    * @return The server response.
    */
-  public CancelFlightInfoResult cancelFlightInfo(CancelFlightInfoRequest request, CallOption... options) {
-    Action action = new Action(FlightConstants.CANCEL_FLIGHT_INFO.getType(), request.serialize().array());
+  public CancelFlightInfoResult cancelFlightInfo(
+      CancelFlightInfoRequest request, CallOption... options) {
+    Action action =
+        new Action(FlightConstants.CANCEL_FLIGHT_INFO.getType(), request.serialize().array());
     Iterator<Result> results = doAction(action, options);
     if (!results.hasNext()) {
       throw CallStatus.INTERNAL
@@ -545,8 +570,7 @@ public CancelFlightInfoResult cancelFlightInfo(CancelFlightInfoRequest request,
           .withCause(e)
           .toRuntimeException();
     }
-    results.forEachRemaining((ignored) -> {
-    });
+    results.forEachRemaining((ignored) -> {});
     return result;
   }
 
@@ -557,8 +581,10 @@ public CancelFlightInfoResult cancelFlightInfo(CancelFlightInfoRequest request,
    * @param options Call options.
    * @return The new endpoint with an updated expiration time.
    */
-  public FlightEndpoint renewFlightEndpoint(RenewFlightEndpointRequest request, CallOption... options) {
-    Action action = new Action(FlightConstants.RENEW_FLIGHT_ENDPOINT.getType(), request.serialize().array());
+  public FlightEndpoint renewFlightEndpoint(
+      RenewFlightEndpointRequest request, CallOption... options) {
+    Action action =
+        new Action(FlightConstants.RENEW_FLIGHT_ENDPOINT.getType(), request.serialize().array());
     Iterator<Result> results = doAction(action, options);
     if (!results.hasNext()) {
       throw CallStatus.INTERNAL
@@ -575,22 +601,23 @@ public FlightEndpoint renewFlightEndpoint(RenewFlightEndpointRequest request, Ca
           .withCause(e)
           .toRuntimeException();
     }
-    results.forEachRemaining((ignored) -> {
-    });
+    results.forEachRemaining((ignored) -> {});
     return result;
   }
 
   /**
    * Set server session option(s) by name/value.
    *
-   * Sessions are generally persisted via HTTP cookies.
+   * <p>Sessions are generally persisted via HTTP cookies.
    *
    * @param request The session options to set on the server.
    * @param options Call options.
    * @return The result containing per-value error statuses, if any.
    */
-  public SetSessionOptionsResult setSessionOptions(SetSessionOptionsRequest request, CallOption... options) {
-    Action action = new Action(FlightConstants.SET_SESSION_OPTIONS.getType(), request.serialize().array());
+  public SetSessionOptionsResult setSessionOptions(
+      SetSessionOptionsRequest request, CallOption... options) {
+    Action action =
+        new Action(FlightConstants.SET_SESSION_OPTIONS.getType(), request.serialize().array());
     Iterator<Result> results = doAction(action, options);
     if (!results.hasNext()) {
       throw CallStatus.INTERNAL
@@ -607,22 +634,23 @@ public SetSessionOptionsResult setSessionOptions(SetSessionOptionsRequest reques
           .withCause(e)
           .toRuntimeException();
     }
-    results.forEachRemaining((ignored) -> {
-    });
+    results.forEachRemaining((ignored) -> {});
     return result;
   }
 
   /**
    * Get the current server session options.
    *
-   * The session is generally accessed via an HTTP cookie.
+   * <p>The session is generally accessed via an HTTP cookie.
    *
    * @param request The (empty) GetSessionOptionsRequest.
    * @param options Call options.
    * @return The result containing the set of session options configured on the server.
    */
-  public GetSessionOptionsResult getSessionOptions(GetSessionOptionsRequest request, CallOption... options) {
-    Action action = new Action(FlightConstants.GET_SESSION_OPTIONS.getType(), request.serialize().array());
+  public GetSessionOptionsResult getSessionOptions(
+      GetSessionOptionsRequest request, CallOption... options) {
+    Action action =
+        new Action(FlightConstants.GET_SESSION_OPTIONS.getType(), request.serialize().array());
     Iterator<Result> results = doAction(action, options);
     if (!results.hasNext()) {
       throw CallStatus.INTERNAL
@@ -639,22 +667,22 @@ public GetSessionOptionsResult getSessionOptions(GetSessionOptionsRequest reques
           .withCause(e)
           .toRuntimeException();
     }
-    results.forEachRemaining((ignored) -> {
-    });
+    results.forEachRemaining((ignored) -> {});
     return result;
   }
 
   /**
    * Close/invalidate the current server session.
    *
-   * The session is generally accessed via an HTTP cookie.
+   * <p>The session is generally accessed via an HTTP cookie.
    *
    * @param request The (empty) CloseSessionRequest.
    * @param options Call options.
    * @return The result containing the status of the close operation.
    */
   public CloseSessionResult closeSession(CloseSessionRequest request, CallOption... options) {
-    Action action = new Action(FlightConstants.CLOSE_SESSION.getType(), request.serialize().array());
+    Action action =
+        new Action(FlightConstants.CLOSE_SESSION.getType(), request.serialize().array());
     Iterator<Result> results = doAction(action, options);
     if (!results.hasNext()) {
       throw CallStatus.INTERNAL
@@ -671,19 +699,16 @@ public CloseSessionResult closeSession(CloseSessionRequest request, CallOption..
           .withCause(e)
           .toRuntimeException();
     }
-    results.forEachRemaining((ignored) -> {
-    });
+    results.forEachRemaining((ignored) -> {});
     return result;
   }
 
-  /**
-   * Interface for writers to an Arrow data stream.
-   */
+  /** Interface for writers to an Arrow data stream. */
   public interface ClientStreamListener extends OutboundStreamListener {
 
     /**
-     * Wait for the stream to finish on the server side. You must call this to be notified of any errors that may have
-     * happened during the upload.
+     * Wait for the stream to finish on the server side. You must call this to be notified of any
+     * errors that may have happened during the upload.
      */
     void getResult();
   }
@@ -691,22 +716,22 @@ public interface ClientStreamListener extends OutboundStreamListener {
   /**
    * A handler for server-sent application metadata messages during a Flight DoPut operation.
    *
-   * <p>Generally, instead of implementing this yourself, you should use {@link AsyncPutListener} or {@link
-   * SyncPutListener}.
+   * <p>Generally, instead of implementing this yourself, you should use {@link AsyncPutListener} or
+   * {@link SyncPutListener}.
    */
   public interface PutListener extends StreamListener<PutResult> {
 
     /**
-     * Wait for the stream to finish on the server side. You must call this to be notified of any errors that may have
-     * happened during the upload.
+     * Wait for the stream to finish on the server side. You must call this to be notified of any
+     * errors that may have happened during the upload.
      */
     void getResult();
 
     /**
      * Called when a message from the server is received.
      *
-     * @param val The application metadata. This buffer will be reclaimed once onNext returns; you must retain a
-     *     reference to use it outside this method.
+     * @param val The application metadata. This buffer will be reclaimed once onNext returns; you
+     *     must retain a reference to use it outside this method.
      */
     @Override
     void onNext(PutResult val);
@@ -714,32 +739,29 @@ public interface PutListener extends StreamListener<PutResult> {
     /**
      * Check if the call has been cancelled.
      *
-     * <p>By default, this always returns false. Implementations should provide an appropriate implementation, as
-     * otherwise, a DoPut operation may inadvertently block forever.
+     * <p>By default, this always returns false. Implementations should provide an appropriate
+     * implementation, as otherwise, a DoPut operation may inadvertently block forever.
      */
     default boolean isCancelled() {
       return false;
     }
   }
 
-  /**
-   * Shut down this client.
-   */
+  /** Shut down this client. */
   @Override
   public void close() throws InterruptedException {
     channel.shutdown().awaitTermination(5, TimeUnit.SECONDS);
     allocator.close();
   }
 
-  /**
-   * Create a builder for a Flight client.
-   */
+  /** Create a builder for a Flight client. */
   public static Builder builder() {
     return new Builder();
   }
 
   /**
    * Create a builder for a Flight client.
+   *
    * @param allocator The allocator to use for the client.
    * @param location The location to connect to.
    */
@@ -747,9 +769,7 @@ public static Builder builder(BufferAllocator allocator, Location location) {
     return new Builder(allocator, location);
   }
 
-  /**
-   * A builder for Flight clients.
-   */
+  /** A builder for Flight clients. */
   public static final class Builder {
     private BufferAllocator allocator;
     private Location location;
@@ -762,17 +782,14 @@ public static final class Builder {
     private List<FlightClientMiddleware.Factory> middleware = new ArrayList<>();
     private boolean verifyServer = true;
 
-    private Builder() {
-    }
+    private Builder() {}
 
     private Builder(BufferAllocator allocator, Location location) {
       this.allocator = Preconditions.checkNotNull(allocator);
       this.location = Preconditions.checkNotNull(location);
     }
 
-    /**
-     * Force the client to connect over TLS.
-     */
+    /** Force the client to connect over TLS. */
     public Builder useTls() {
       this.forceTls = true;
       return this;
@@ -798,7 +815,8 @@ public Builder trustedCertificates(final InputStream stream) {
     }
 
     /** Set the trusted TLS certificates. */
-    public Builder clientCertificate(final InputStream clientCertificate, final InputStream clientKey) {
+    public Builder clientCertificate(
+        final InputStream clientCertificate, final InputStream clientKey) {
       Preconditions.checkNotNull(clientKey);
       this.clientCertificate = Preconditions.checkNotNull(clientCertificate);
       this.clientKey = Preconditions.checkNotNull(clientKey);
@@ -825,51 +843,59 @@ public Builder verifyServer(boolean verifyServer) {
       return this;
     }
 
-    /**
-     * Create the client from this builder.
-     */
+    /** Create the client from this builder. */
     public FlightClient build() {
       final NettyChannelBuilder builder;
 
       switch (location.getUri().getScheme()) {
         case LocationSchemes.GRPC:
         case LocationSchemes.GRPC_INSECURE:
-        case LocationSchemes.GRPC_TLS: {
-          builder = NettyChannelBuilder.forAddress(location.toSocketAddress());
-          break;
-        }
-        case LocationSchemes.GRPC_DOMAIN_SOCKET: {
-          // The implementation is platform-specific, so we have to find the classes at runtime
-          builder = NettyChannelBuilder.forAddress(location.toSocketAddress());
-          try {
+        case LocationSchemes.GRPC_TLS:
+          {
+            builder = NettyChannelBuilder.forAddress(location.toSocketAddress());
+            break;
+          }
+        case LocationSchemes.GRPC_DOMAIN_SOCKET:
+          {
+            // The implementation is platform-specific, so we have to find the classes at runtime
+            builder = NettyChannelBuilder.forAddress(location.toSocketAddress());
             try {
-              // Linux
-              builder.channelType(
-                  Class.forName("io.netty.channel.epoll.EpollDomainSocketChannel")
-                      .asSubclass(ServerChannel.class));
-              final EventLoopGroup elg =
-                  Class.forName("io.netty.channel.epoll.EpollEventLoopGroup").asSubclass(EventLoopGroup.class)
-                  .getDeclaredConstructor().newInstance();
-              builder.eventLoopGroup(elg);
-            } catch (ClassNotFoundException e) {
-              // BSD
-              builder.channelType(
-                  Class.forName("io.netty.channel.kqueue.KQueueDomainSocketChannel")
-                      .asSubclass(ServerChannel.class));
-              final EventLoopGroup elg = Class.forName("io.netty.channel.kqueue.KQueueEventLoopGroup")
-                  .asSubclass(EventLoopGroup.class)
-                  .getDeclaredConstructor().newInstance();
-              builder.eventLoopGroup(elg);
+              try {
+                // Linux
+                builder.channelType(
+                    Class.forName("io.netty.channel.epoll.EpollDomainSocketChannel")
+                        .asSubclass(ServerChannel.class));
+                final EventLoopGroup elg =
+                    Class.forName("io.netty.channel.epoll.EpollEventLoopGroup")
+                        .asSubclass(EventLoopGroup.class)
+                        .getDeclaredConstructor()
+                        .newInstance();
+                builder.eventLoopGroup(elg);
+              } catch (ClassNotFoundException e) {
+                // BSD
+                builder.channelType(
+                    Class.forName("io.netty.channel.kqueue.KQueueDomainSocketChannel")
+                        .asSubclass(ServerChannel.class));
+                final EventLoopGroup elg =
+                    Class.forName("io.netty.channel.kqueue.KQueueEventLoopGroup")
+                        .asSubclass(EventLoopGroup.class)
+                        .getDeclaredConstructor()
+                        .newInstance();
+                builder.eventLoopGroup(elg);
+              }
+            } catch (ClassNotFoundException
+                | InstantiationException
+                | IllegalAccessException
+                | NoSuchMethodException
+                | InvocationTargetException e) {
+              throw new UnsupportedOperationException(
+                  "Could not find suitable Netty native transport implementation for domain socket address.");
             }
-          } catch (ClassNotFoundException | InstantiationException | IllegalAccessException |
-                   NoSuchMethodException | InvocationTargetException e) {
-            throw new UnsupportedOperationException(
-                "Could not find suitable Netty native transport implementation for domain socket address.");
+            break;
           }
-          break;
-        }
         default:
-          throw new IllegalArgumentException("Scheme is not supported: " + location.getUri().getScheme());
+          throw new IllegalArgumentException(
+              "Scheme is not supported: " + location.getUri().getScheme());
       }
 
       if (this.forceTls || LocationSchemes.GRPC_TLS.equals(location.getUri().getScheme())) {
@@ -878,15 +904,18 @@ public FlightClient build() {
         final boolean hasTrustedCerts = this.trustedCertificates != null;
         final boolean hasKeyCertPair = this.clientCertificate != null && this.clientKey != null;
         if (!this.verifyServer && (hasTrustedCerts || hasKeyCertPair)) {
-          throw new IllegalArgumentException("FlightClient has been configured to disable server verification, " +
-              "but certificate options have been specified.");
+          throw new IllegalArgumentException(
+              "FlightClient has been configured to disable server verification, "
+                  + "but certificate options have been specified.");
         }
 
         final SslContextBuilder sslContextBuilder = GrpcSslContexts.forClient();
 
         if (!this.verifyServer) {
           sslContextBuilder.trustManager(InsecureTrustManagerFactory.INSTANCE);
-        } else if (this.trustedCertificates != null || this.clientCertificate != null || this.clientKey != null) {
+        } else if (this.trustedCertificates != null
+            || this.clientCertificate != null
+            || this.clientKey != null) {
           if (this.trustedCertificates != null) {
             sslContextBuilder.trustManager(this.trustedCertificates);
           }
@@ -916,11 +945,11 @@ public FlightClient build() {
   }
 
   /**
-   * Helper method to create a call from the asyncStub, method descriptor, and list of calling options.
+   * Helper method to create a call from the asyncStub, method descriptor, and list of calling
+   * options.
    */
   private <RequestT, ResponseT> ClientCall<RequestT, ResponseT> asyncStubNewCall(
-          MethodDescriptor<RequestT, ResponseT> descriptor,
-          CallOption... options) {
+      MethodDescriptor<RequestT, ResponseT> descriptor, CallOption... options) {
     FlightServiceStub wrappedStub = CallOptions.wrapStub(asyncStub, options);
     return wrappedStub.getChannel().newCall(descriptor, wrappedStub.getCallOptions());
   }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightClientMiddleware.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightClientMiddleware.java
index 1528ca6c67e59..238d4f29fe9ee 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightClientMiddleware.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightClientMiddleware.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 /**
@@ -23,29 +22,22 @@
  * <p>Middleware are instantiated per-call and should store state in the middleware instance.
  */
 public interface FlightClientMiddleware {
-  /**
-   * A callback used before request headers are sent. The headers may be manipulated.
-   */
+  /** A callback used before request headers are sent. The headers may be manipulated. */
   void onBeforeSendingHeaders(CallHeaders outgoingHeaders);
 
-  /**
-   * A callback called after response headers are received. The headers may be manipulated.
-   */
+  /** A callback called after response headers are received. The headers may be manipulated. */
   void onHeadersReceived(CallHeaders incomingHeaders);
 
-  /**
-   * A callback called after the call completes.
-   */
+  /** A callback called after the call completes. */
   void onCallCompleted(CallStatus status);
 
-  /**
-   * A factory for client middleware instances.
-   */
+  /** A factory for client middleware instances. */
   interface Factory {
     /**
      * Create a new middleware instance for the given call.
      *
-     * @throws FlightRuntimeException if the middleware wants to reject the call with the given status
+     * @throws FlightRuntimeException if the middleware wants to reject the call with the given
+     *     status
      */
     FlightClientMiddleware onCallStarted(CallInfo info);
   }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightConstants.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightConstants.java
index 4456e3dae4949..6b89c794d6ca7 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightConstants.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightConstants.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
-/**
- * String constants relevant to flight implementations.
- */
+/** String constants relevant to flight implementations. */
 public interface FlightConstants {
 
   String SERVICE = "arrow.flight.protocol.FlightService";
@@ -27,26 +24,36 @@ public interface FlightConstants {
   FlightServerMiddleware.Key<ServerHeaderMiddleware> HEADER_KEY =
       FlightServerMiddleware.Key.of("org.apache.arrow.flight.ServerHeaderMiddleware");
 
-  ActionType CANCEL_FLIGHT_INFO = new ActionType("CancelFlightInfo",
-      "Explicitly cancel a running FlightInfo.\n" +
-          "Request Message: CancelFlightInfoRequest\n" +
-          "Response Message: CancelFlightInfoResult");
-  ActionType RENEW_FLIGHT_ENDPOINT = new ActionType("RenewFlightEndpoint",
-      "Extend expiration time of the given FlightEndpoint.\n" +
-          "Request Message: RenewFlightEndpointRequest\n" +
-          "Response Message: Renewed FlightEndpoint");
+  ActionType CANCEL_FLIGHT_INFO =
+      new ActionType(
+          "CancelFlightInfo",
+          "Explicitly cancel a running FlightInfo.\n"
+              + "Request Message: CancelFlightInfoRequest\n"
+              + "Response Message: CancelFlightInfoResult");
+  ActionType RENEW_FLIGHT_ENDPOINT =
+      new ActionType(
+          "RenewFlightEndpoint",
+          "Extend expiration time of the given FlightEndpoint.\n"
+              + "Request Message: RenewFlightEndpointRequest\n"
+              + "Response Message: Renewed FlightEndpoint");
 
-  ActionType SET_SESSION_OPTIONS = new ActionType("SetSessionOptions",
-          "Set client session options by name/value pairs.\n" +
-          "Request Message: SetSessionOptionsRequest\n" +
-          "Response Message: SetSessionOptionsResult");
+  ActionType SET_SESSION_OPTIONS =
+      new ActionType(
+          "SetSessionOptions",
+          "Set client session options by name/value pairs.\n"
+              + "Request Message: SetSessionOptionsRequest\n"
+              + "Response Message: SetSessionOptionsResult");
 
-  ActionType GET_SESSION_OPTIONS = new ActionType("GetSessionOptions",
-          "Get current client session options\n" +
-          "Request Message: GetSessionOptionsRequest\n" +
-          "Response Message: GetSessionOptionsResult");
-  ActionType CLOSE_SESSION = new ActionType("CloseSession",
-          "Explicitly close/invalidate the cookie-specified client session.\n" +
-          "Request Message: CloseSessionRequest\n" +
-          "Response Message: CloseSessionResult");
+  ActionType GET_SESSION_OPTIONS =
+      new ActionType(
+          "GetSessionOptions",
+          "Get current client session options\n"
+              + "Request Message: GetSessionOptionsRequest\n"
+              + "Response Message: GetSessionOptionsResult");
+  ActionType CLOSE_SESSION =
+      new ActionType(
+          "CloseSession",
+          "Explicitly close/invalidate the cookie-specified client session.\n"
+              + "Request Message: CloseSessionRequest\n"
+              + "Response Message: CloseSessionResult");
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightDescriptor.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightDescriptor.java
index 1836f2edd94c0..cc8bc87c145b5 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightDescriptor.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightDescriptor.java
@@ -14,25 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableList;
+import com.google.protobuf.ByteString;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.arrow.flight.impl.Flight;
 import org.apache.arrow.flight.impl.Flight.FlightDescriptor.DescriptorType;
 import org.apache.arrow.util.Preconditions;
 
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableList;
-import com.google.protobuf.ByteString;
-
 /**
- * An identifier for a particular set of data.  This can either be an opaque command that generates
- * the data or a static "path" to the data.  This is a POJO wrapper around the protobuf message with
+ * An identifier for a particular set of data. This can either be an opaque command that generates
+ * the data or a static "path" to the data. This is a POJO wrapper around the protobuf message with
  * the same name.
  */
 public class FlightDescriptor {
@@ -56,7 +53,7 @@ public static FlightDescriptor path(Iterable<String> path) {
     return new FlightDescriptor(false, ImmutableList.copyOf(path), null);
   }
 
-  public static FlightDescriptor path(String...path) {
+  public static FlightDescriptor path(String... path) {
     return new FlightDescriptor(false, ImmutableList.copyOf(path), null);
   }
 
@@ -98,7 +95,8 @@ Flight.FlightDescriptor toProtocol() {
   /**
    * Get the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight types.
+   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight
+   * types.
    */
   public ByteBuffer serialize() {
     return ByteBuffer.wrap(toProtocol().toByteArray());
@@ -107,9 +105,11 @@ public ByteBuffer serialize() {
   /**
    * Parse the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from non-Flight services.
+   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from
+   * non-Flight services.
    *
-   * @param serialized The serialized form of the FlightDescriptor, as returned by {@link #serialize()}.
+   * @param serialized The serialized form of the FlightDescriptor, as returned by {@link
+   *     #serialize()}.
    * @return The deserialized FlightDescriptor.
    * @throws IOException if the serialized form is invalid.
    */
@@ -175,6 +175,4 @@ public boolean equals(Object obj) {
     }
     return true;
   }
-
-
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightEndpoint.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightEndpoint.java
index 41ead8e1fcddf..c8e472a050616 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightEndpoint.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightEndpoint.java
@@ -14,9 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
+import com.google.protobuf.ByteString;
+import com.google.protobuf.Timestamp;
+import com.google.protobuf.util.Timestamps;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.ByteBuffer;
@@ -28,16 +30,9 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-
 import org.apache.arrow.flight.impl.Flight;
 
-import com.google.protobuf.ByteString;
-import com.google.protobuf.Timestamp;
-import com.google.protobuf.util.Timestamps;
-
-/**
- * POJO to convert to/from the underlying protobuf FlightEndpoint.
- */
+/** POJO to convert to/from the underlying protobuf FlightEndpoint. */
 public class FlightEndpoint {
   private final List<Location> locations;
   private final Ticket ticket;
@@ -48,10 +43,10 @@ public class FlightEndpoint {
    * Constructs a new endpoint with no expiration time.
    *
    * @param ticket A ticket that describe the key of a data stream.
-   * @param locations  The possible locations the stream can be retrieved from.
+   * @param locations The possible locations the stream can be retrieved from.
    */
   public FlightEndpoint(Ticket ticket, Location... locations) {
-    this(ticket, /*expirationTime*/null, locations);
+    this(ticket, /*expirationTime*/ null, locations);
   }
 
   /**
@@ -59,16 +54,19 @@ public FlightEndpoint(Ticket ticket, Location... locations) {
    *
    * @param ticket A ticket that describe the key of a data stream.
    * @param expirationTime (optional) When this endpoint expires.
-   * @param locations  The possible locations the stream can be retrieved from.
+   * @param locations The possible locations the stream can be retrieved from.
    */
   public FlightEndpoint(Ticket ticket, Instant expirationTime, Location... locations) {
-    this(ticket, expirationTime, null, Collections.unmodifiableList(new ArrayList<>(Arrays.asList(locations))));
+    this(
+        ticket,
+        expirationTime,
+        null,
+        Collections.unmodifiableList(new ArrayList<>(Arrays.asList(locations))));
   }
 
-  /**
-   * Private constructor with all parameters. Should only be called by Builder.
-   */
-  private FlightEndpoint(Ticket ticket, Instant expirationTime, byte[] appMetadata, List<Location> locations) {
+  /** Private constructor with all parameters. Should only be called by Builder. */
+  private FlightEndpoint(
+      Ticket ticket, Instant expirationTime, byte[] appMetadata, List<Location> locations) {
     Objects.requireNonNull(ticket);
     this.locations = locations;
     this.expirationTime = expirationTime;
@@ -76,17 +74,16 @@ private FlightEndpoint(Ticket ticket, Instant expirationTime, byte[] appMetadata
     this.appMetadata = appMetadata;
   }
 
-  /**
-   * Constructs from the protocol buffer representation.
-   */
+  /** Constructs from the protocol buffer representation. */
   FlightEndpoint(Flight.FlightEndpoint flt) throws URISyntaxException {
     this.locations = new ArrayList<>();
     for (final Flight.Location location : flt.getLocationList()) {
       this.locations.add(new Location(location.getUri()));
     }
     if (flt.hasExpirationTime()) {
-      this.expirationTime = Instant.ofEpochSecond(
-          flt.getExpirationTime().getSeconds(), Timestamps.toNanos(flt.getExpirationTime()));
+      this.expirationTime =
+          Instant.ofEpochSecond(
+              flt.getExpirationTime().getSeconds(), Timestamps.toNanos(flt.getExpirationTime()));
     } else {
       this.expirationTime = null;
     }
@@ -110,12 +107,10 @@ public byte[] getAppMetadata() {
     return appMetadata;
   }
 
-  /**
-   * Converts to the protocol buffer representation.
-   */
+  /** Converts to the protocol buffer representation. */
   Flight.FlightEndpoint toProtocol() {
-    Flight.FlightEndpoint.Builder b = Flight.FlightEndpoint.newBuilder()
-        .setTicket(ticket.toProtocol());
+    Flight.FlightEndpoint.Builder b =
+        Flight.FlightEndpoint.newBuilder().setTicket(ticket.toProtocol());
 
     for (Location l : locations) {
       b.addLocation(l.toProtocol());
@@ -139,7 +134,8 @@ Flight.FlightEndpoint toProtocol() {
   /**
    * Get the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight types.
+   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight
+   * types.
    */
   public ByteBuffer serialize() {
     return ByteBuffer.wrap(toProtocol().toByteArray());
@@ -148,14 +144,16 @@ public ByteBuffer serialize() {
   /**
    * Parse the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from non-Flight services.
+   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from
+   * non-Flight services.
    *
    * @param serialized The serialized form of the message, as returned by {@link #serialize()}.
    * @return The deserialized message.
    * @throws IOException if the serialized form is invalid.
    * @throws URISyntaxException if the serialized form contains an unsupported URI format.
    */
-  public static FlightEndpoint deserialize(ByteBuffer serialized) throws IOException, URISyntaxException {
+  public static FlightEndpoint deserialize(ByteBuffer serialized)
+      throws IOException, URISyntaxException {
     return new FlightEndpoint(Flight.FlightEndpoint.parseFrom(serialized));
   }
 
@@ -168,10 +166,10 @@ public boolean equals(Object o) {
       return false;
     }
     FlightEndpoint that = (FlightEndpoint) o;
-    return locations.equals(that.locations) &&
-        ticket.equals(that.ticket) &&
-        Objects.equals(expirationTime, that.expirationTime) &&
-        Arrays.equals(appMetadata, that.appMetadata);
+    return locations.equals(that.locations)
+        && ticket.equals(that.ticket)
+        && Objects.equals(expirationTime, that.expirationTime)
+        && Arrays.equals(appMetadata, that.appMetadata);
   }
 
   @Override
@@ -181,27 +179,29 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return "FlightEndpoint{" +
-        "locations=" + locations +
-        ", ticket=" + ticket +
-        ", expirationTime=" + (expirationTime == null ? "(none)" : expirationTime.toString()) +
-        ", appMetadata=" + (appMetadata == null ? "(none)" : Base64.getEncoder().encodeToString(appMetadata)) +
-        '}';
+    return "FlightEndpoint{"
+        + "locations="
+        + locations
+        + ", ticket="
+        + ticket
+        + ", expirationTime="
+        + (expirationTime == null ? "(none)" : expirationTime.toString())
+        + ", appMetadata="
+        + (appMetadata == null ? "(none)" : Base64.getEncoder().encodeToString(appMetadata))
+        + '}';
   }
 
   /**
    * Create a builder for FlightEndpoint.
    *
    * @param ticket A ticket that describe the key of a data stream.
-   * @param locations  The possible locations the stream can be retrieved from.
+   * @param locations The possible locations the stream can be retrieved from.
    */
   public static Builder builder(Ticket ticket, Location... locations) {
     return new Builder(ticket, locations);
   }
 
-  /**
-   * Builder for FlightEndpoint.
-   */
+  /** Builder for FlightEndpoint. */
   public static final class Builder {
     private final Ticket ticket;
     private final List<Location> locations;
@@ -233,9 +233,7 @@ public Builder setAppMetadata(byte[] appMetadata) {
       return this;
     }
 
-    /**
-     * Build FlightEndpoint object.
-     */
+    /** Build FlightEndpoint object. */
     public FlightEndpoint build() {
       return new FlightEndpoint(ticket, expirationTime, appMetadata, locations);
     }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightGrpcUtils.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightGrpcUtils.java
index b711d7ef6b5d7..13e4f2f21503a 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightGrpcUtils.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightGrpcUtils.java
@@ -14,31 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
-import java.util.Collections;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.arrow.flight.auth.ServerAuthHandler;
-import org.apache.arrow.memory.BufferAllocator;
-import org.apache.arrow.util.VisibleForTesting;
-
 import io.grpc.BindableService;
 import io.grpc.CallOptions;
 import io.grpc.ClientCall;
 import io.grpc.ConnectivityState;
 import io.grpc.ManagedChannel;
 import io.grpc.MethodDescriptor;
+import java.util.Collections;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import org.apache.arrow.flight.auth.ServerAuthHandler;
+import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.util.VisibleForTesting;
 
-/**
- * Exposes Flight GRPC service & client.
- */
+/** Exposes Flight GRPC service & client. */
 public class FlightGrpcUtils {
-  /**
-   * Proxy class for ManagedChannel that makes closure a no-op.
-   */
+  /** Proxy class for ManagedChannel that makes closure a no-op. */
   @VisibleForTesting
   static class NonClosingProxyManagedChannel extends ManagedChannel {
     private final ManagedChannel channel;
@@ -107,9 +100,12 @@ public ConnectivityState getState(boolean requestConnection) {
 
     @Override
     public void notifyWhenStateChanged(ConnectivityState source, Runnable callback) {
-      // The proxy has no insight into the underlying channel state changes, so we'll have to leak the abstraction
-      // a bit here and simply pass to the underlying channel, even though it will never transition to shutdown via
-      // the proxy. This should be fine, since it's mainly targeted at the FlightClient and there's no getter for
+      // The proxy has no insight into the underlying channel state changes, so we'll have to leak
+      // the abstraction
+      // a bit here and simply pass to the underlying channel, even though it will never transition
+      // to shutdown via
+      // the proxy. This should be fine, since it's mainly targeted at the FlightClient and there's
+      // no getter for
       // the channel.
       this.channel.notifyWhenStateChanged(source, callback);
     }
@@ -125,38 +121,46 @@ public void enterIdle() {
     }
   }
 
-  private FlightGrpcUtils() {
-  }
+  private FlightGrpcUtils() {}
 
   /**
    * Creates a Flight service.
+   *
    * @param allocator Memory allocator
    * @param producer Specifies the service api
    * @param authHandler Authentication handler
    * @param executor Executor service
    * @return FlightBindingService
    */
-  public static BindableService createFlightService(BufferAllocator allocator, FlightProducer producer,
-                                                    ServerAuthHandler authHandler, ExecutorService executor) {
+  public static BindableService createFlightService(
+      BufferAllocator allocator,
+      FlightProducer producer,
+      ServerAuthHandler authHandler,
+      ExecutorService executor) {
     return new FlightBindingService(allocator, producer, authHandler, executor);
   }
 
   /**
    * Creates a Flight client.
-   * @param incomingAllocator  Memory allocator
+   *
+   * @param incomingAllocator Memory allocator
    * @param channel provides a connection to a gRPC server.
    */
-  public static FlightClient createFlightClient(BufferAllocator incomingAllocator, ManagedChannel channel) {
+  public static FlightClient createFlightClient(
+      BufferAllocator incomingAllocator, ManagedChannel channel) {
     return new FlightClient(incomingAllocator, channel, Collections.emptyList());
   }
 
   /**
    * Creates a Flight client.
-   * @param incomingAllocator  Memory allocator
-   * @param channel provides a connection to a gRPC server. Will not be closed on closure of the returned FlightClient.
+   *
+   * @param incomingAllocator Memory allocator
+   * @param channel provides a connection to a gRPC server. Will not be closed on closure of the
+   *     returned FlightClient.
    */
   public static FlightClient createFlightClientWithSharedChannel(
       BufferAllocator incomingAllocator, ManagedChannel channel) {
-    return new FlightClient(incomingAllocator, new NonClosingProxyManagedChannel(channel), Collections.emptyList());
+    return new FlightClient(
+        incomingAllocator, new NonClosingProxyManagedChannel(channel), Collections.emptyList());
   }
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightInfo.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightInfo.java
index 39e5f5e3a3ed6..88926ddba0def 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightInfo.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightInfo.java
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
+import com.fasterxml.jackson.databind.util.ByteBufferBackedInputStream;
+import com.google.protobuf.ByteString;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -30,7 +31,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.flight.impl.Flight;
 import org.apache.arrow.vector.ipc.ReadChannel;
 import org.apache.arrow.vector.ipc.WriteChannel;
@@ -39,12 +39,7 @@
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.arrow.vector.validate.MetadataV4UnionChecker;
 
-import com.fasterxml.jackson.databind.util.ByteBufferBackedInputStream;
-import com.google.protobuf.ByteString;
-
-/**
- * A POJO representation of a FlightInfo, metadata associated with a set of data records.
- */
+/** A POJO representation of a FlightInfo, metadata associated with a set of data records. */
 public class FlightInfo {
   private final Schema schema;
   private final FlightDescriptor descriptor;
@@ -64,7 +59,11 @@ public class FlightInfo {
    * @param bytes The number of bytes in the flight
    * @param records The number of records in the flight.
    */
-  public FlightInfo(Schema schema, FlightDescriptor descriptor, List<FlightEndpoint> endpoints, long bytes,
+  public FlightInfo(
+      Schema schema,
+      FlightDescriptor descriptor,
+      List<FlightEndpoint> endpoints,
+      long bytes,
       long records) {
     this(schema, descriptor, endpoints, bytes, records, /*ordered*/ false, IpcOption.DEFAULT);
   }
@@ -79,8 +78,13 @@ public FlightInfo(Schema schema, FlightDescriptor descriptor, List<FlightEndpoin
    * @param records The number of records in the flight.
    * @param option IPC write options.
    */
-  public FlightInfo(Schema schema, FlightDescriptor descriptor, List<FlightEndpoint> endpoints, long bytes,
-                    long records, IpcOption option) {
+  public FlightInfo(
+      Schema schema,
+      FlightDescriptor descriptor,
+      List<FlightEndpoint> endpoints,
+      long bytes,
+      long records,
+      IpcOption option) {
     this(schema, descriptor, endpoints, bytes, records, /*ordered*/ false, option);
   }
 
@@ -95,8 +99,14 @@ public FlightInfo(Schema schema, FlightDescriptor descriptor, List<FlightEndpoin
    * @param ordered Whether the endpoints in this flight are ordered.
    * @param option IPC write options.
    */
-  public FlightInfo(Schema schema, FlightDescriptor descriptor, List<FlightEndpoint> endpoints, long bytes,
-                    long records, boolean ordered, IpcOption option) {
+  public FlightInfo(
+      Schema schema,
+      FlightDescriptor descriptor,
+      List<FlightEndpoint> endpoints,
+      long bytes,
+      long records,
+      boolean ordered,
+      IpcOption option) {
     this(schema, descriptor, endpoints, bytes, records, ordered, option, null);
   }
 
@@ -112,8 +122,15 @@ public FlightInfo(Schema schema, FlightDescriptor descriptor, List<FlightEndpoin
    * @param option IPC write options.
    * @param appMetadata Metadata to send along with the flight
    */
-  public FlightInfo(Schema schema, FlightDescriptor descriptor, List<FlightEndpoint> endpoints, long bytes,
-                    long records, boolean ordered, IpcOption option, byte[] appMetadata) {
+  public FlightInfo(
+      Schema schema,
+      FlightDescriptor descriptor,
+      List<FlightEndpoint> endpoints,
+      long bytes,
+      long records,
+      boolean ordered,
+      IpcOption option,
+      byte[] appMetadata) {
     Objects.requireNonNull(descriptor);
     Objects.requireNonNull(endpoints);
     if (schema != null) {
@@ -129,18 +146,15 @@ public FlightInfo(Schema schema, FlightDescriptor descriptor, List<FlightEndpoin
     this.appMetadata = appMetadata;
   }
 
-  /**
-   * Constructs from the protocol buffer representation.
-   */
+  /** Constructs from the protocol buffer representation. */
   FlightInfo(Flight.FlightInfo pbFlightInfo) throws URISyntaxException {
     try {
       final ByteBuffer schemaBuf = pbFlightInfo.getSchema().asReadOnlyByteBuffer();
-      schema = pbFlightInfo.getSchema().size() > 0 ?
-          MessageSerializer.deserializeSchema(
-                          new ReadChannel(
-                                  Channels.newChannel(
-                                          new ByteBufferBackedInputStream(schemaBuf))))
-          : null;
+      schema =
+          pbFlightInfo.getSchema().size() > 0
+              ? MessageSerializer.deserializeSchema(
+                  new ReadChannel(Channels.newChannel(new ByteBufferBackedInputStream(schemaBuf))))
+              : null;
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
@@ -152,7 +166,10 @@ public FlightInfo(Schema schema, FlightDescriptor descriptor, List<FlightEndpoin
     bytes = pbFlightInfo.getTotalBytes();
     records = pbFlightInfo.getTotalRecords();
     ordered = pbFlightInfo.getOrdered();
-    appMetadata = (pbFlightInfo.getAppMetadata().size() == 0 ? null : pbFlightInfo.getAppMetadata().toByteArray());
+    appMetadata =
+        (pbFlightInfo.getAppMetadata().size() == 0
+            ? null
+            : pbFlightInfo.getAppMetadata().toByteArray());
     option = IpcOption.DEFAULT;
   }
 
@@ -162,6 +179,7 @@ public Optional<Schema> getSchemaOptional() {
 
   /**
    * Returns the schema, or an empty schema if no schema is present.
+   *
    * @deprecated Deprecated. Use {@link #getSchemaOptional()} instead.
    */
   @Deprecated
@@ -193,12 +211,12 @@ public byte[] getAppMetadata() {
     return appMetadata;
   }
 
-  /**
-   * Converts to the protocol buffer representation.
-   */
+  /** Converts to the protocol buffer representation. */
   Flight.FlightInfo toProtocol() {
-    Flight.FlightInfo.Builder builder = Flight.FlightInfo.newBuilder()
-            .addAllEndpoint(endpoints.stream().map(t -> t.toProtocol()).collect(Collectors.toList()))
+    Flight.FlightInfo.Builder builder =
+        Flight.FlightInfo.newBuilder()
+            .addAllEndpoint(
+                endpoints.stream().map(t -> t.toProtocol()).collect(Collectors.toList()))
             .setFlightDescriptor(descriptor.toProtocol())
             .setTotalBytes(FlightInfo.this.bytes)
             .setTotalRecords(records)
@@ -206,10 +224,7 @@ Flight.FlightInfo toProtocol() {
     if (schema != null) {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       try {
-        MessageSerializer.serialize(
-                new WriteChannel(Channels.newChannel(baos)),
-                schema,
-                option);
+        MessageSerializer.serialize(new WriteChannel(Channels.newChannel(baos)), schema, option);
         builder.setSchema(ByteString.copyFrom(baos.toByteArray()));
       } catch (IOException e) {
         throw new RuntimeException(e);
@@ -224,7 +239,8 @@ Flight.FlightInfo toProtocol() {
   /**
    * Get the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight types.
+   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight
+   * types.
    */
   public ByteBuffer serialize() {
     return ByteBuffer.wrap(toProtocol().toByteArray());
@@ -233,14 +249,16 @@ public ByteBuffer serialize() {
   /**
    * Parse the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from non-Flight services.
+   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from
+   * non-Flight services.
    *
    * @param serialized The serialized form of the FlightInfo, as returned by {@link #serialize()}.
    * @return The deserialized FlightInfo.
    * @throws IOException if the serialized form is invalid.
    * @throws URISyntaxException if the serialized form contains an unsupported URI format.
    */
-  public static FlightInfo deserialize(ByteBuffer serialized) throws IOException, URISyntaxException {
+  public static FlightInfo deserialize(ByteBuffer serialized)
+      throws IOException, URISyntaxException {
     return new FlightInfo(Flight.FlightInfo.parseFrom(serialized));
   }
 
@@ -253,47 +271,54 @@ public boolean equals(Object o) {
       return false;
     }
     FlightInfo that = (FlightInfo) o;
-    return bytes == that.bytes &&
-        records == that.records &&
-        schema.equals(that.schema) &&
-        descriptor.equals(that.descriptor) &&
-        endpoints.equals(that.endpoints) &&
-        ordered == that.ordered &&
-        Arrays.equals(appMetadata, that.appMetadata);
+    return bytes == that.bytes
+        && records == that.records
+        && schema.equals(that.schema)
+        && descriptor.equals(that.descriptor)
+        && endpoints.equals(that.endpoints)
+        && ordered == that.ordered
+        && Arrays.equals(appMetadata, that.appMetadata);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(schema, descriptor, endpoints, bytes, records, ordered, Arrays.hashCode(appMetadata));
+    return Objects.hash(
+        schema, descriptor, endpoints, bytes, records, ordered, Arrays.hashCode(appMetadata));
   }
 
   @Override
   public String toString() {
-    return "FlightInfo{" +
-        "schema=" + schema +
-        ", descriptor=" + descriptor +
-        ", endpoints=" + endpoints +
-        ", bytes=" + bytes +
-        ", records=" + records +
-        ", ordered=" + ordered +
-        ", appMetadata=" + (appMetadata == null ? "(none)" : Base64.getEncoder().encodeToString(appMetadata)) +
-        '}';
+    return "FlightInfo{"
+        + "schema="
+        + schema
+        + ", descriptor="
+        + descriptor
+        + ", endpoints="
+        + endpoints
+        + ", bytes="
+        + bytes
+        + ", records="
+        + records
+        + ", ordered="
+        + ordered
+        + ", appMetadata="
+        + (appMetadata == null ? "(none)" : Base64.getEncoder().encodeToString(appMetadata))
+        + '}';
   }
 
   /**
    * Create a builder for FlightInfo.
    *
-   * @param schema     The schema of the Flight
+   * @param schema The schema of the Flight
    * @param descriptor An identifier for the Flight.
-   * @param endpoints  A list of endpoints that have the flight available.
+   * @param endpoints A list of endpoints that have the flight available.
    */
-  public static Builder builder(Schema schema, FlightDescriptor descriptor, List<FlightEndpoint> endpoints) {
+  public static Builder builder(
+      Schema schema, FlightDescriptor descriptor, List<FlightEndpoint> endpoints) {
     return new Builder(schema, descriptor, endpoints);
   }
 
-  /**
-   * Builder for FlightInfo.
-   */
+  /** Builder for FlightInfo. */
   public static final class Builder {
     private final Schema schema;
     private final FlightDescriptor descriptor;
@@ -360,11 +385,10 @@ public Builder setAppMetadata(byte[] appMetadata) {
       return this;
     }
 
-    /**
-     * Build FlightInfo object.
-     */
+    /** Build FlightInfo object. */
     public FlightInfo build() {
-      return new FlightInfo(schema, descriptor, endpoints, bytes, records, ordered, option, appMetadata);
+      return new FlightInfo(
+          schema, descriptor, endpoints, bytes, records, ordered, option, appMetadata);
     }
   }
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightMethod.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightMethod.java
index b1331a8edd60f..c7ca0bb4a84a6 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightMethod.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightMethod.java
@@ -14,14 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import org.apache.arrow.flight.impl.FlightServiceGrpc;
 
-/**
- * All the RPC methods available in Flight.
- */
+/** All the RPC methods available in Flight. */
 public enum FlightMethod {
   HANDSHAKE,
   LIST_FLIGHTS,
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightProducer.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightProducer.java
index cdc29ae5de436..1662636075780 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightProducer.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightProducer.java
@@ -14,14 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.util.Map;
 
-/**
- * API to Implement an Arrow Flight producer.
- */
+/** API to Implement an Arrow Flight producer. */
 public interface FlightProducer {
 
   /**
@@ -40,8 +37,7 @@ public interface FlightProducer {
    * @param criteria Application-defined criteria for filtering streams.
    * @param listener An interface for sending data back to the client.
    */
-  void listFlights(CallContext context, Criteria criteria,
-      StreamListener<FlightInfo> listener);
+  void listFlights(CallContext context, Criteria criteria, StreamListener<FlightInfo> listener);
 
   /**
    * Get information about a particular data stream.
@@ -55,9 +51,9 @@ void listFlights(CallContext context, Criteria criteria,
   /**
    * Begin or get an update on execution of a long-running query.
    *
-   * <p>If the descriptor would begin a query, the server should return a response immediately to not
-   * block the client. Otherwise, the server should not return an update until progress is made to
-   * not spam the client with inactionable updates.
+   * <p>If the descriptor would begin a query, the server should return a response immediately to
+   * not block the client. Otherwise, the server should not return an update until progress is made
+   * to not spam the client with inactionable updates.
    *
    * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
@@ -77,26 +73,36 @@ default PollInfo pollFlightInfo(CallContext context, FlightDescriptor descriptor
    */
   default SchemaResult getSchema(CallContext context, FlightDescriptor descriptor) {
     FlightInfo info = getFlightInfo(context, descriptor);
-    return new SchemaResult(info
-            .getSchemaOptional()
-            .orElseThrow(() ->
-                    CallStatus
-                            .INVALID_ARGUMENT
-                            .withDescription("No schema is present in FlightInfo").toRuntimeException()));
+    return new SchemaResult(
+        info.getSchemaOptional()
+            .orElseThrow(
+                () ->
+                    CallStatus.INVALID_ARGUMENT
+                        .withDescription("No schema is present in FlightInfo")
+                        .toRuntimeException()));
   }
 
-
   /**
    * Accept uploaded data for a particular stream.
    *
    * @param context Per-call context.
    * @param flightStream The data stream being uploaded.
    */
-  Runnable acceptPut(CallContext context,
-      FlightStream flightStream, StreamListener<PutResult> ackStream);
+  Runnable acceptPut(
+      CallContext context, FlightStream flightStream, StreamListener<PutResult> ackStream);
 
+  /**
+   * This method is used to perform a bidirectional data exchange between a client and a server.
+   *
+   * @param context Per-call context.
+   * @param reader The FlightStream from which data is read.
+   * @param writer The ServerStreamListener to which data is written.
+   * @throws RuntimeException if the method is not implemented.
+   */
   default void doExchange(CallContext context, FlightStream reader, ServerStreamListener writer) {
-    throw CallStatus.UNIMPLEMENTED.withDescription("DoExchange is unimplemented").toRuntimeException();
+    throw CallStatus.UNIMPLEMENTED
+        .withDescription("DoExchange is unimplemented")
+        .toRuntimeException();
   }
 
   /**
@@ -106,32 +112,29 @@ default void doExchange(CallContext context, FlightStream reader, ServerStreamLi
    * @param action Client-supplied parameters.
    * @param listener A stream of responses.
    */
-  void doAction(CallContext context, Action action,
-      StreamListener<Result> listener);
+  void doAction(CallContext context, Action action, StreamListener<Result> listener);
 
   /**
    * List available application-defined RPCs.
+   *
    * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
   void listActions(CallContext context, StreamListener<ActionType> listener);
 
-  /**
-   * An interface for sending Arrow data back to a client.
-   */
+  /** An interface for sending Arrow data back to a client. */
   interface ServerStreamListener extends OutboundStreamListener {
 
-    /**
-     * Check whether the call has been cancelled. If so, stop sending data.
-     */
+    /** Check whether the call has been cancelled. If so, stop sending data. */
     boolean isCancelled();
 
     /**
-     * Set a callback for when the client cancels a call, i.e. {@link #isCancelled()} has become true.
+     * Set a callback for when the client cancels a call, i.e. {@link #isCancelled()} has become
+     * true.
      *
-     * <p>Note that this callback may only be called some time after {@link #isCancelled()} becomes true, and may never
-     * be called if all executor threads on the server are busy, or the RPC method body is implemented in a blocking
-     * fashion.
+     * <p>Note that this callback may only be called some time after {@link #isCancelled()} becomes
+     * true, and may never be called if all executor threads on the server are busy, or the RPC
+     * method body is implemented in a blocking fashion.
      */
     void setOnCancelHandler(Runnable handler);
   }
@@ -143,9 +146,7 @@ interface ServerStreamListener extends OutboundStreamListener {
    */
   interface StreamListener<T> {
 
-    /**
-     * Send the next value to the client.
-     */
+    /** Send the next value to the client. */
     void onNext(T val);
 
     /**
@@ -155,16 +156,11 @@ interface StreamListener<T> {
      */
     void onError(Throwable t);
 
-    /**
-     * Indicate that the transmission is finished.
-     */
+    /** Indicate that the transmission is finished. */
     void onCompleted();
-
   }
 
-  /**
-   * Call-specific context.
-   */
+  /** Call-specific context. */
   interface CallContext {
     /** The identity of the authenticated peer. May be the empty string if unknown. */
     String peerIdentity();
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightRuntimeException.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightRuntimeException.java
index 76d3349a2c37a..d002dd4867f8c 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightRuntimeException.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightRuntimeException.java
@@ -14,21 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 /**
  * An exception raised from a Flight RPC.
  *
- * <p>In service implementations, raising an instance of this exception will provide clients with a more detailed
- * message and error code.
+ * <p>In service implementations, raising an instance of this exception will provide clients with a
+ * more detailed message and error code.
  */
 public class FlightRuntimeException extends RuntimeException {
   private final CallStatus status;
 
-  /**
-   * Create a new exception from the given status.
-   */
+  /** Create a new exception from the given status. */
   FlightRuntimeException(CallStatus status) {
     super(status.description(), status.cause());
     this.status = status;
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightServer.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightServer.java
index d873f7d2828d0..05dbe42c49172 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightServer.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightServer.java
@@ -14,9 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import io.grpc.Server;
+import io.grpc.ServerInterceptors;
+import io.grpc.netty.GrpcSslContexts;
+import io.grpc.netty.NettyServerBuilder;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.ServerChannel;
+import io.netty.handler.ssl.ClientAuth;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -34,51 +43,41 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
-
 import javax.net.ssl.SSLException;
-
 import org.apache.arrow.flight.auth.ServerAuthHandler;
 import org.apache.arrow.flight.auth.ServerAuthInterceptor;
 import org.apache.arrow.flight.auth2.Auth2Constants;
 import org.apache.arrow.flight.auth2.CallHeaderAuthenticator;
 import org.apache.arrow.flight.auth2.ServerCallHeaderAuthMiddleware;
+import org.apache.arrow.flight.grpc.ServerBackpressureThresholdInterceptor;
 import org.apache.arrow.flight.grpc.ServerInterceptorAdapter;
 import org.apache.arrow.flight.grpc.ServerInterceptorAdapter.KeyFactory;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.util.VisibleForTesting;
 
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
-import io.grpc.Server;
-import io.grpc.ServerInterceptors;
-import io.grpc.netty.GrpcSslContexts;
-import io.grpc.netty.NettyServerBuilder;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.ServerChannel;
-import io.netty.handler.ssl.ClientAuth;
-import io.netty.handler.ssl.SslContext;
-import io.netty.handler.ssl.SslContextBuilder;
-
-
 /**
  * Generic server of flight data that is customized via construction with delegate classes for the
- * actual logic.  The server currently uses GRPC as its transport mechanism.
+ * actual logic. The server currently uses GRPC as its transport mechanism.
  */
 public class FlightServer implements AutoCloseable {
 
-  private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FlightServer.class);
+  private static final org.slf4j.Logger logger =
+      org.slf4j.LoggerFactory.getLogger(FlightServer.class);
 
   private final Location location;
   private final Server server;
-  // The executor used by the gRPC server. We don't use it here, but we do need to clean it up with the server.
+  // The executor used by the gRPC server. We don't use it here, but we do need to clean it up with
+  // the server.
   // May be null, if a user-supplied executor was provided (as we do not want to clean that up)
-  @VisibleForTesting
-  final ExecutorService grpcExecutor;
+  @VisibleForTesting final ExecutorService grpcExecutor;
 
   /** The maximum size of an individual gRPC message. This effectively disables the limit. */
   static final int MAX_GRPC_MESSAGE_SIZE = Integer.MAX_VALUE;
 
+  /** The default number of bytes that can be queued on an output stream before blocking. */
+  public static final int DEFAULT_BACKPRESSURE_THRESHOLD = 10 * 1024 * 1024; // 10MB
+
   /** Create a new instance from a gRPC server. For internal use only. */
   private FlightServer(Location location, Server server, ExecutorService grpcExecutor) {
     this.location = location;
@@ -103,8 +102,15 @@ public Location getLocation() {
       // If the server was bound to port 0, replace the port in the location with the real port.
       final URI uri = location.getUri();
       try {
-        return new Location(new URI(uri.getScheme(), uri.getUserInfo(), uri.getHost(), getPort(),
-            uri.getPath(), uri.getQuery(), uri.getFragment()));
+        return new Location(
+            new URI(
+                uri.getScheme(),
+                uri.getUserInfo(),
+                uri.getHost(),
+                getPort(),
+                uri.getPath(),
+                uri.getQuery(),
+                uri.getFragment()));
       } catch (URISyntaxException e) {
         // We don't expect this to happen
         throw new RuntimeException(e);
@@ -128,9 +134,11 @@ public void shutdown() {
 
   /**
    * Wait for the server to shut down with a timeout.
+   *
    * @return true if the server shut down successfully.
    */
-  public boolean awaitTermination(final long timeout, final TimeUnit unit) throws InterruptedException {
+  public boolean awaitTermination(final long timeout, final TimeUnit unit)
+      throws InterruptedException {
     return server.awaitTermination(timeout, unit);
   }
 
@@ -165,7 +173,8 @@ public static Builder builder() {
   }
 
   /** Create a builder for a Flight server. */
-  public static Builder builder(BufferAllocator allocator, Location location, FlightProducer producer) {
+  public static Builder builder(
+      BufferAllocator allocator, Location location, FlightProducer producer) {
     return new Builder(allocator, location, producer);
   }
 
@@ -179,6 +188,7 @@ public static final class Builder {
     private CallHeaderAuthenticator headerAuthenticator = CallHeaderAuthenticator.NO_OP;
     private ExecutorService executor = null;
     private int maxInboundMessageSize = MAX_GRPC_MESSAGE_SIZE;
+    private int backpressureThreshold = DEFAULT_BACKPRESSURE_THRESHOLD;
     private InputStream certChain;
     private InputStream key;
     private InputStream mTlsCACert;
@@ -204,7 +214,8 @@ public static final class Builder {
     public FlightServer build() {
       // Add the auth middleware if applicable.
       if (headerAuthenticator != CallHeaderAuthenticator.NO_OP) {
-        this.middleware(FlightServerMiddleware.Key.of(Auth2Constants.AUTHORIZATION_HEADER),
+        this.middleware(
+            FlightServerMiddleware.Key.of(Auth2Constants.AUTHORIZATION_HEADER),
             new ServerCallHeaderAuthMiddleware.Factory(headerAuthenticator));
       }
 
@@ -212,58 +223,69 @@ public FlightServer build() {
 
       final NettyServerBuilder builder;
       switch (location.getUri().getScheme()) {
-        case LocationSchemes.GRPC_DOMAIN_SOCKET: {
-          // The implementation is platform-specific, so we have to find the classes at runtime
-          builder = NettyServerBuilder.forAddress(location.toSocketAddress());
-          try {
+        case LocationSchemes.GRPC_DOMAIN_SOCKET:
+          {
+            // The implementation is platform-specific, so we have to find the classes at runtime
+            builder = NettyServerBuilder.forAddress(location.toSocketAddress());
             try {
-              // Linux
-              builder.channelType(Class
-                      .forName("io.netty.channel.epoll.EpollServerDomainSocketChannel")
-                      .asSubclass(ServerChannel.class));
-              final EventLoopGroup elg = Class.forName("io.netty.channel.epoll.EpollEventLoopGroup")
-                      .asSubclass(EventLoopGroup.class).getConstructor().newInstance();
-              builder.bossEventLoopGroup(elg).workerEventLoopGroup(elg);
-            } catch (ClassNotFoundException e) {
-              // BSD
-              builder.channelType(
-                      Class.forName("io.netty.channel.kqueue.KQueueServerDomainSocketChannel")
-                              .asSubclass(ServerChannel.class));
-              final EventLoopGroup elg = Class.forName("io.netty.channel.kqueue.KQueueEventLoopGroup")
-                      .asSubclass(EventLoopGroup.class).getConstructor().newInstance();
-              builder.bossEventLoopGroup(elg).workerEventLoopGroup(elg);
+              try {
+                // Linux
+                builder.channelType(
+                    Class.forName("io.netty.channel.epoll.EpollServerDomainSocketChannel")
+                        .asSubclass(ServerChannel.class));
+                final EventLoopGroup elg =
+                    Class.forName("io.netty.channel.epoll.EpollEventLoopGroup")
+                        .asSubclass(EventLoopGroup.class)
+                        .getConstructor()
+                        .newInstance();
+                builder.bossEventLoopGroup(elg).workerEventLoopGroup(elg);
+              } catch (ClassNotFoundException e) {
+                // BSD
+                builder.channelType(
+                    Class.forName("io.netty.channel.kqueue.KQueueServerDomainSocketChannel")
+                        .asSubclass(ServerChannel.class));
+                final EventLoopGroup elg =
+                    Class.forName("io.netty.channel.kqueue.KQueueEventLoopGroup")
+                        .asSubclass(EventLoopGroup.class)
+                        .getConstructor()
+                        .newInstance();
+                builder.bossEventLoopGroup(elg).workerEventLoopGroup(elg);
+              }
+            } catch (ClassNotFoundException
+                | InstantiationException
+                | IllegalAccessException
+                | NoSuchMethodException
+                | InvocationTargetException e) {
+              throw new UnsupportedOperationException(
+                  "Could not find suitable Netty native transport implementation for domain socket address.");
             }
-          } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException |
-                   InvocationTargetException e) {
-            throw new UnsupportedOperationException(
-                "Could not find suitable Netty native transport implementation for domain socket address.");
+            break;
           }
-          break;
-        }
         case LocationSchemes.GRPC:
-        case LocationSchemes.GRPC_INSECURE: {
-          builder = NettyServerBuilder.forAddress(location.toSocketAddress());
-          break;
-        }
-        case LocationSchemes.GRPC_TLS: {
-          if (certChain == null) {
-            throw new IllegalArgumentException("Must provide a certificate and key to serve gRPC over TLS");
+        case LocationSchemes.GRPC_INSECURE:
+          {
+            builder = NettyServerBuilder.forAddress(location.toSocketAddress());
+            break;
+          }
+        case LocationSchemes.GRPC_TLS:
+          {
+            if (certChain == null) {
+              throw new IllegalArgumentException(
+                  "Must provide a certificate and key to serve gRPC over TLS");
+            }
+            builder = NettyServerBuilder.forAddress(location.toSocketAddress());
+            break;
           }
-          builder = NettyServerBuilder.forAddress(location.toSocketAddress());
-          break;
-        }
         default:
-          throw new IllegalArgumentException("Scheme is not supported: " + location.getUri().getScheme());
+          throw new IllegalArgumentException(
+              "Scheme is not supported: " + location.getUri().getScheme());
       }
 
       if (certChain != null) {
-        SslContextBuilder sslContextBuilder = GrpcSslContexts
-                .forServer(certChain, key);
+        SslContextBuilder sslContextBuilder = GrpcSslContexts.forServer(certChain, key);
 
         if (mTlsCACert != null) {
-          sslContextBuilder
-                  .clientAuth(ClientAuth.REQUIRE)
-                  .trustManager(mTlsCACert);
+          sslContextBuilder.clientAuth(ClientAuth.REQUIRE).trustManager(mTlsCACert);
         }
         try {
           sslContext = sslContextBuilder.build();
@@ -280,56 +302,73 @@ public FlightServer build() {
 
       // Share one executor between the gRPC service, DoPut, and Handshake
       final ExecutorService exec;
-      // We only want to have FlightServer close the gRPC executor if we created it here. We should not close
+      // We only want to have FlightServer close the gRPC executor if we created it here. We should
+      // not close
       // user-supplied executors.
       final ExecutorService grpcExecutor;
       if (executor != null) {
         exec = executor;
         grpcExecutor = null;
       } else {
-        exec = Executors.newCachedThreadPool(
-            // Name threads for better debuggability
-            new ThreadFactoryBuilder().setNameFormat("flight-server-default-executor-%d").build());
+        exec =
+            Executors.newCachedThreadPool(
+                // Name threads for better debuggability
+                new ThreadFactoryBuilder()
+                    .setNameFormat("flight-server-default-executor-%d")
+                    .build());
         grpcExecutor = exec;
       }
 
-      final FlightBindingService flightService = new FlightBindingService(allocator, producer, authHandler, exec);
+      final FlightBindingService flightService =
+          new FlightBindingService(allocator, producer, authHandler, exec);
       builder
           .executor(exec)
           .maxInboundMessageSize(maxInboundMessageSize)
           .addService(
               ServerInterceptors.intercept(
                   flightService,
+                  new ServerBackpressureThresholdInterceptor(backpressureThreshold),
                   new ServerAuthInterceptor(authHandler)));
 
-      // Allow hooking into the gRPC builder. This is not guaranteed to be available on all Arrow versions or
+      // Allow hooking into the gRPC builder. This is not guaranteed to be available on all Arrow
+      // versions or
       // Flight implementations.
-      builderOptions.computeIfPresent("grpc.builderConsumer", (key, builderConsumer) -> {
-        final Consumer<NettyServerBuilder> consumer = (Consumer<NettyServerBuilder>) builderConsumer;
-        consumer.accept(builder);
-        return null;
-      });
+      builderOptions.computeIfPresent(
+          "grpc.builderConsumer",
+          (key, builderConsumer) -> {
+            final Consumer<NettyServerBuilder> consumer =
+                (Consumer<NettyServerBuilder>) builderConsumer;
+            consumer.accept(builder);
+            return null;
+          });
 
       // Allow explicitly setting some Netty-specific options
-      builderOptions.computeIfPresent("netty.channelType", (key, channelType) -> {
-        builder.channelType((Class<? extends ServerChannel>) channelType);
-        return null;
-      });
-      builderOptions.computeIfPresent("netty.bossEventLoopGroup", (key, elg) -> {
-        builder.bossEventLoopGroup((EventLoopGroup) elg);
-        return null;
-      });
-      builderOptions.computeIfPresent("netty.workerEventLoopGroup", (key, elg) -> {
-        builder.workerEventLoopGroup((EventLoopGroup) elg);
-        return null;
-      });
+      builderOptions.computeIfPresent(
+          "netty.channelType",
+          (key, channelType) -> {
+            builder.channelType((Class<? extends ServerChannel>) channelType);
+            return null;
+          });
+      builderOptions.computeIfPresent(
+          "netty.bossEventLoopGroup",
+          (key, elg) -> {
+            builder.bossEventLoopGroup((EventLoopGroup) elg);
+            return null;
+          });
+      builderOptions.computeIfPresent(
+          "netty.workerEventLoopGroup",
+          (key, elg) -> {
+            builder.workerEventLoopGroup((EventLoopGroup) elg);
+            return null;
+          });
 
       builder.intercept(new ServerInterceptorAdapter(interceptors));
       return new FlightServer(location, builder.build(), grpcExecutor);
     }
 
     /**
-     * Set the maximum size of a message. Defaults to "unlimited", depending on the underlying transport.
+     * Set the maximum size of a message. Defaults to "unlimited", depending on the underlying
+     * transport.
      */
     public Builder maxInboundMessageSize(int maxMessageSize) {
       this.maxInboundMessageSize = maxMessageSize;
@@ -337,8 +376,19 @@ public Builder maxInboundMessageSize(int maxMessageSize) {
     }
 
     /**
-     * A small utility function to ensure that InputStream attributes.
-     * are closed if they are not null
+     * Set the number of bytes that may be queued on a server output stream before writes are
+     * blocked.
+     */
+    public Builder backpressureThreshold(int backpressureThreshold) {
+      Preconditions.checkArgument(backpressureThreshold > 0);
+      this.backpressureThreshold = backpressureThreshold;
+      return this;
+    }
+
+    /**
+     * A small utility function to ensure that InputStream attributes. are closed if they are not
+     * null
+     *
      * @param stream The InputStream to close (if it is not null).
      */
     private void closeInputStreamIfNotNull(InputStream stream) {
@@ -352,8 +402,8 @@ private void closeInputStreamIfNotNull(InputStream stream) {
     }
 
     /**
-     * A small utility function to ensure that the certChain attribute
-     * is closed if it is not null.  It then sets the attribute to null.
+     * A small utility function to ensure that the certChain attribute is closed if it is not null.
+     * It then sets the attribute to null.
      */
     private void closeCertChain() {
       closeInputStreamIfNotNull(certChain);
@@ -361,8 +411,8 @@ private void closeCertChain() {
     }
 
     /**
-     * A small utility function to ensure that the key attribute
-     * is closed if it is not null.  It then sets the attribute to null.
+     * A small utility function to ensure that the key attribute is closed if it is not null. It
+     * then sets the attribute to null.
      */
     private void closeKey() {
       closeInputStreamIfNotNull(key);
@@ -370,8 +420,8 @@ private void closeKey() {
     }
 
     /**
-     * A small utility function to ensure that the mTlsCACert attribute
-     * is closed if it is not null.  It then sets the attribute to null.
+     * A small utility function to ensure that the mTlsCACert attribute is closed if it is not null.
+     * It then sets the attribute to null.
      */
     private void closeMTlsCACert() {
       closeInputStreamIfNotNull(mTlsCACert);
@@ -380,6 +430,7 @@ private void closeMTlsCACert() {
 
     /**
      * Enable TLS on the server.
+     *
      * @param certChain The certificate chain to use.
      * @param key The private key to use.
      */
@@ -395,6 +446,7 @@ public Builder useTls(final File certChain, final File key) throws IOException {
 
     /**
      * Enable Client Verification via mTLS on the server.
+     *
      * @param mTlsCACert The CA certificate to use for verifying clients.
      */
     public Builder useMTlsClientVerification(final File mTlsCACert) throws IOException {
@@ -405,6 +457,7 @@ public Builder useMTlsClientVerification(final File mTlsCACert) throws IOExcepti
 
     /**
      * Enable TLS on the server.
+     *
      * @param certChain The certificate chain to use.
      * @param key The private key to use.
      */
@@ -420,6 +473,7 @@ public Builder useTls(final InputStream certChain, final InputStream key) throws
 
     /**
      * Enable mTLS on the server.
+     *
      * @param mTlsCACert The CA certificate to use for verifying clients.
      */
     public Builder useMTlsClientVerification(final InputStream mTlsCACert) throws IOException {
@@ -431,33 +485,27 @@ public Builder useMTlsClientVerification(final InputStream mTlsCACert) throws IO
     /**
      * Set the executor used by the server.
      *
-     * <p>Flight will NOT take ownership of the executor. The application must clean it up if one is provided. (If not
-     * provided, Flight will use a default executor which it will clean up.)
+     * <p>Flight will NOT take ownership of the executor. The application must clean it up if one is
+     * provided. (If not provided, Flight will use a default executor which it will clean up.)
      */
     public Builder executor(ExecutorService executor) {
       this.executor = executor;
       return this;
     }
 
-    /**
-     * Set the authentication handler.
-     */
+    /** Set the authentication handler. */
     public Builder authHandler(ServerAuthHandler authHandler) {
       this.authHandler = authHandler;
       return this;
     }
 
-    /**
-     * Set the header-based authentication mechanism.
-     */
+    /** Set the header-based authentication mechanism. */
     public Builder headerAuthenticator(CallHeaderAuthenticator headerAuthenticator) {
       this.headerAuthenticator = headerAuthenticator;
       return this;
     }
 
-    /**
-     * Provide a transport-specific option. Not guaranteed to have any effect.
-     */
+    /** Provide a transport-specific option. Not guaranteed to have any effect. */
     public Builder transportHint(final String key, Object option) {
       builderOptions.put(key, option);
       return this;
@@ -466,14 +514,15 @@ public Builder transportHint(final String key, Object option) {
     /**
      * Add a Flight middleware component to inspect and modify requests to this service.
      *
-     * @param key An identifier for this middleware component. Service implementations can retrieve the middleware
-     *     instance for the current call using {@link org.apache.arrow.flight.FlightProducer.CallContext}.
+     * @param key An identifier for this middleware component. Service implementations can retrieve
+     *     the middleware instance for the current call using {@link
+     *     org.apache.arrow.flight.FlightProducer.CallContext}.
      * @param factory A factory for the middleware.
      * @param <T> The middleware type.
      * @throws IllegalArgumentException if the key already exists
      */
-    public <T extends FlightServerMiddleware> Builder middleware(final FlightServerMiddleware.Key<T> key,
-        final FlightServerMiddleware.Factory<T> factory) {
+    public <T extends FlightServerMiddleware> Builder middleware(
+        final FlightServerMiddleware.Key<T> key, final FlightServerMiddleware.Factory<T> factory) {
       if (interceptorKeys.contains(key.key)) {
         throw new IllegalArgumentException("Key already exists: " + key.key);
       }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightServerMiddleware.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightServerMiddleware.java
index 9bc8bbfe73976..b16df2c6cc363 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightServerMiddleware.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightServerMiddleware.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.util.Objects;
@@ -24,18 +23,20 @@
  *
  * <p>Middleware are instantiated per-call.
  *
- * <p>Methods are not guaranteed to be called on any particular thread, relative to the thread that Flight requests are
- * executed on. Do not depend on thread-local storage; instead, use state on the middleware instance. Service
- * implementations may communicate with middleware implementations through
- * {@link org.apache.arrow.flight.FlightProducer.CallContext#getMiddleware(Key)}. Methods on the middleware instance
- * are non-reentrant, that is, a particular RPC will not make multiple concurrent calls to methods on a single
- * middleware instance. However, methods on the factory instance are expected to be thread-safe, and if the factory
- * instance returns the same middleware object more than once, then that middleware object must be thread-safe.
+ * <p>Methods are not guaranteed to be called on any particular thread, relative to the thread that
+ * Flight requests are executed on. Do not depend on thread-local storage; instead, use state on the
+ * middleware instance. Service implementations may communicate with middleware implementations
+ * through {@link org.apache.arrow.flight.FlightProducer.CallContext#getMiddleware(Key)}. Methods on
+ * the middleware instance are non-reentrant, that is, a particular RPC will not make multiple
+ * concurrent calls to methods on a single middleware instance. However, methods on the factory
+ * instance are expected to be thread-safe, and if the factory instance returns the same middleware
+ * object more than once, then that middleware object must be thread-safe.
  */
 public interface FlightServerMiddleware {
 
   /**
    * A factory for Flight server middleware.
+   *
    * @param <T> The middleware type.
    */
   interface Factory<T extends FlightServerMiddleware> {
@@ -45,18 +46,20 @@ interface Factory<T extends FlightServerMiddleware> {
      * @param info Details about the call.
      * @param incomingHeaders A mutable set of request headers.
      * @param context Context about the current request.
-     *
-     * @throws FlightRuntimeException if the middleware wants to reject the call with the given status
+     * @throws FlightRuntimeException if the middleware wants to reject the call with the given
+     *     status
      */
     T onCallStarted(CallInfo info, CallHeaders incomingHeaders, RequestContext context);
   }
 
   /**
-   * A key for Flight server middleware. On a server, middleware instances are identified by this key.
+   * A key for Flight server middleware. On a server, middleware instances are identified by this
+   * key.
    *
    * <p>Keys use reference equality, so instances should be shared.
    *
-   * @param <T> The middleware class stored in this key. This provides a compile-time check when retrieving instances.
+   * @param <T> The middleware class stored in this key. This provides a compile-time check when
+   *     retrieving instances.
    */
   class Key<T extends FlightServerMiddleware> {
     final String key;
@@ -65,9 +68,7 @@ class Key<T extends FlightServerMiddleware> {
       this.key = Objects.requireNonNull(key, "Key must not be null.");
     }
 
-    /**
-     * Create a new key for the given type.
-     */
+    /** Create a new key for the given type. */
     public static <T extends FlightServerMiddleware> Key<T> of(String key) {
       return new Key<>(key);
     }
@@ -76,13 +77,14 @@ public static <T extends FlightServerMiddleware> Key<T> of(String key) {
   /**
    * Callback for when the underlying transport is about to send response headers.
    *
-   * @param outgoingHeaders A mutable set of response headers. These can be manipulated to send different headers to the
-   *     client.
+   * @param outgoingHeaders A mutable set of response headers. These can be manipulated to send
+   *     different headers to the client.
    */
   void onBeforeSendingHeaders(CallHeaders outgoingHeaders);
 
   /**
    * Callback for when the underlying transport has completed a call.
+   *
    * @param status Whether the call completed successfully or not.
    */
   void onCallCompleted(CallStatus status);
@@ -90,9 +92,10 @@ public static <T extends FlightServerMiddleware> Key<T> of(String key) {
   /**
    * Callback for when an RPC method implementation throws an uncaught exception.
    *
-   * <p>May be called multiple times, and may be called before or after {@link #onCallCompleted(CallStatus)}.
-   * Generally, an uncaught exception will end the call with a error {@link CallStatus}, and will be reported to {@link
-   * #onCallCompleted(CallStatus)}, but not necessarily this method.
+   * <p>May be called multiple times, and may be called before or after {@link
+   * #onCallCompleted(CallStatus)}. Generally, an uncaught exception will end the call with a error
+   * {@link CallStatus}, and will be reported to {@link #onCallCompleted(CallStatus)}, but not
+   * necessarily this method.
    *
    * @param err The exception that was thrown.
    */
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightService.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightService.java
index f55b47d2a945b..9f130463c0fab 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightService.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightService.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
+import com.google.common.base.Strings;
+import io.grpc.stub.ServerCallStreamObserver;
+import io.grpc.stub.StreamObserver;
 import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
-
 import org.apache.arrow.flight.FlightProducer.ServerStreamListener;
-import org.apache.arrow.flight.FlightServerMiddleware.Key;
 import org.apache.arrow.flight.auth.AuthConstants;
 import org.apache.arrow.flight.auth.ServerAuthHandler;
 import org.apache.arrow.flight.auth.ServerAuthWrapper;
@@ -41,14 +41,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Strings;
-
-import io.grpc.stub.ServerCallStreamObserver;
-import io.grpc.stub.StreamObserver;
-
-/**
- * GRPC service implementation for a flight server.
- */
+/** GRPC service implementation for a flight server. */
 class FlightService extends FlightServiceImplBase {
 
   private static final Logger logger = LoggerFactory.getLogger(FlightService.class);
@@ -59,7 +52,10 @@ class FlightService extends FlightServiceImplBase {
   private final ServerAuthHandler authHandler;
   private final ExecutorService executors;
 
-  FlightService(BufferAllocator allocator, FlightProducer producer, ServerAuthHandler authHandler,
+  FlightService(
+      BufferAllocator allocator,
+      FlightProducer producer,
+      ServerAuthHandler authHandler,
       ExecutorService executors) {
     this.allocator = allocator;
     this.producer = producer;
@@ -84,16 +80,19 @@ private CallContext makeContext(ServerCallStreamObserver<?> responseObserver) {
   }
 
   @Override
-  public StreamObserver<Flight.HandshakeRequest> handshake(StreamObserver<Flight.HandshakeResponse> responseObserver) {
+  public StreamObserver<Flight.HandshakeRequest> handshake(
+      StreamObserver<Flight.HandshakeResponse> responseObserver) {
     // This method is not meaningful with the auth2 interfaces. Authentication would already
     // have happened by header/middleware with the auth2 classes.
     return ServerAuthWrapper.wrapHandshake(authHandler, responseObserver, executors);
   }
 
   @Override
-  public void listFlights(Flight.Criteria criteria, StreamObserver<Flight.FlightInfo> responseObserver) {
-    final StreamPipe<FlightInfo, Flight.FlightInfo> listener = StreamPipe
-        .wrap(responseObserver, FlightInfo::toProtocol, this::handleExceptionWithMiddleware);
+  public void listFlights(
+      Flight.Criteria criteria, StreamObserver<Flight.FlightInfo> responseObserver) {
+    final StreamPipe<FlightInfo, Flight.FlightInfo> listener =
+        StreamPipe.wrap(
+            responseObserver, FlightInfo::toProtocol, this::handleExceptionWithMiddleware);
     try {
       final CallContext context = makeContext((ServerCallStreamObserver<?>) responseObserver);
       producer.listFlights(context, new Criteria(criteria), listener);
@@ -103,11 +102,13 @@ public void listFlights(Flight.Criteria criteria, StreamObserver<Flight.FlightIn
     // Do NOT call StreamPipe#onCompleted, as the FlightProducer implementation may be asynchronous
   }
 
-  public void doGetCustom(Flight.Ticket ticket, StreamObserver<ArrowMessage> responseObserverSimple) {
+  public void doGetCustom(
+      Flight.Ticket ticket, StreamObserver<ArrowMessage> responseObserverSimple) {
     final ServerCallStreamObserver<ArrowMessage> responseObserver =
         (ServerCallStreamObserver<ArrowMessage>) responseObserverSimple;
 
-    final GetListener listener = new GetListener(responseObserver, this::handleExceptionWithMiddleware);
+    final GetListener listener =
+        new GetListener(responseObserver, this::handleExceptionWithMiddleware);
     try {
       producer.getStream(makeContext(responseObserver), new Ticket(ticket), listener);
     } catch (Exception ex) {
@@ -118,8 +119,8 @@ public void doGetCustom(Flight.Ticket ticket, StreamObserver<ArrowMessage> respo
 
   @Override
   public void doAction(Flight.Action request, StreamObserver<Flight.Result> responseObserver) {
-    final StreamPipe<Result, Flight.Result> listener = StreamPipe
-        .wrap(responseObserver, Result::toProtocol, this::handleExceptionWithMiddleware);
+    final StreamPipe<Result, Flight.Result> listener =
+        StreamPipe.wrap(responseObserver, Result::toProtocol, this::handleExceptionWithMiddleware);
     try {
       final CallContext context = makeContext((ServerCallStreamObserver<?>) responseObserver);
       producer.doAction(context, new Action(request), listener);
@@ -130,9 +131,11 @@ public void doAction(Flight.Action request, StreamObserver<Flight.Result> respon
   }
 
   @Override
-  public void listActions(Flight.Empty request, StreamObserver<Flight.ActionType> responseObserver) {
-    final StreamPipe<org.apache.arrow.flight.ActionType, Flight.ActionType> listener = StreamPipe
-        .wrap(responseObserver, ActionType::toProtocol, this::handleExceptionWithMiddleware);
+  public void listActions(
+      Flight.Empty request, StreamObserver<Flight.ActionType> responseObserver) {
+    final StreamPipe<org.apache.arrow.flight.ActionType, Flight.ActionType> listener =
+        StreamPipe.wrap(
+            responseObserver, ActionType::toProtocol, this::handleExceptionWithMiddleware);
     try {
       final CallContext context = makeContext((ServerCallStreamObserver<?>) responseObserver);
       producer.listActions(context, listener);
@@ -142,14 +145,16 @@ public void listActions(Flight.Empty request, StreamObserver<Flight.ActionType>
     // Do NOT call StreamPipe#onCompleted, as the FlightProducer implementation may be asynchronous
   }
 
-  private static class GetListener extends OutboundStreamListenerImpl implements ServerStreamListener {
+  private static class GetListener extends OutboundStreamListenerImpl
+      implements ServerStreamListener {
     private final ServerCallStreamObserver<ArrowMessage> serverCallResponseObserver;
     private final Consumer<Throwable> errorHandler;
     private Runnable onCancelHandler = null;
     private Runnable onReadyHandler = null;
     private boolean completed;
 
-    public GetListener(ServerCallStreamObserver<ArrowMessage> responseObserver, Consumer<Throwable> errorHandler) {
+    public GetListener(
+        ServerCallStreamObserver<ArrowMessage> responseObserver, Consumer<Throwable> errorHandler) {
       super(null, responseObserver);
       this.errorHandler = errorHandler;
       this.completed = false;
@@ -213,45 +218,54 @@ public void completed() {
     }
   }
 
-  public StreamObserver<ArrowMessage> doPutCustom(final StreamObserver<Flight.PutResult> responseObserverSimple) {
+  public StreamObserver<ArrowMessage> doPutCustom(
+      final StreamObserver<Flight.PutResult> responseObserverSimple) {
     ServerCallStreamObserver<Flight.PutResult> responseObserver =
         (ServerCallStreamObserver<Flight.PutResult>) responseObserverSimple;
     responseObserver.disableAutoInboundFlowControl();
     responseObserver.request(1);
 
-    final StreamPipe<PutResult, Flight.PutResult> ackStream = StreamPipe
-        .wrap(responseObserver, PutResult::toProtocol, this::handleExceptionWithMiddleware);
-    final FlightStream fs = new FlightStream(
-        allocator,
-        PENDING_REQUESTS,
-        /* server-upload streams are not cancellable */null,
-        responseObserver::request);
+    final StreamPipe<PutResult, Flight.PutResult> ackStream =
+        StreamPipe.wrap(
+            responseObserver, PutResult::toProtocol, this::handleExceptionWithMiddleware);
+    final FlightStream fs =
+        new FlightStream(
+            allocator,
+            PENDING_REQUESTS,
+            /* server-upload streams are not cancellable */ null,
+            responseObserver::request);
     // When the ackStream is completed, the FlightStream will be closed with it
     ackStream.setAutoCloseable(fs);
     final StreamObserver<ArrowMessage> observer = fs.asObserver();
-    Future<?> unused = executors.submit(() -> {
-      try {
-        producer.acceptPut(makeContext(responseObserver), fs, ackStream).run();
-      } catch (Throwable ex) {
-        ackStream.onError(ex);
-      } finally {
-        // ARROW-6136: Close the stream if and only if acceptPut hasn't closed it itself
-        // We don't do this for other streams since the implementation may be asynchronous
-        ackStream.ensureCompleted();
-      }
-    });
+    Future<?> unused =
+        executors.submit(
+            () -> {
+              try {
+                producer.acceptPut(makeContext(responseObserver), fs, ackStream).run();
+              } catch (Throwable ex) {
+                ackStream.onError(ex);
+              } finally {
+                // ARROW-6136: Close the stream if and only if acceptPut hasn't closed it itself
+                // We don't do this for other streams since the implementation may be asynchronous
+                ackStream.ensureCompleted();
+              }
+            });
 
     return observer;
   }
 
   @Override
-  public void getFlightInfo(Flight.FlightDescriptor request, StreamObserver<Flight.FlightInfo> responseObserver) {
+  public void getFlightInfo(
+      Flight.FlightDescriptor request, StreamObserver<Flight.FlightInfo> responseObserver) {
     final FlightInfo info;
     try {
-      info = producer
-          .getFlightInfo(makeContext((ServerCallStreamObserver<?>) responseObserver), new FlightDescriptor(request));
+      info =
+          producer.getFlightInfo(
+              makeContext((ServerCallStreamObserver<?>) responseObserver),
+              new FlightDescriptor(request));
     } catch (Exception ex) {
-      // Don't capture exceptions from onNext or onCompleted with this block - because then we can't call onError
+      // Don't capture exceptions from onNext or onCompleted with this block - because then we can't
+      // call onError
       responseObserver.onError(StatusUtils.toGrpcException(ex));
       return;
     }
@@ -260,13 +274,17 @@ public void getFlightInfo(Flight.FlightDescriptor request, StreamObserver<Flight
   }
 
   @Override
-  public void pollFlightInfo(Flight.FlightDescriptor request, StreamObserver<Flight.PollInfo> responseObserver) {
+  public void pollFlightInfo(
+      Flight.FlightDescriptor request, StreamObserver<Flight.PollInfo> responseObserver) {
     final PollInfo info;
     try {
-      info = producer
-          .pollFlightInfo(makeContext((ServerCallStreamObserver<?>) responseObserver), new FlightDescriptor(request));
+      info =
+          producer.pollFlightInfo(
+              makeContext((ServerCallStreamObserver<?>) responseObserver),
+              new FlightDescriptor(request));
     } catch (Exception ex) {
-      // Don't capture exceptions from onNext or onCompleted with this block - because then we can't call onError
+      // Don't capture exceptions from onNext or onCompleted with this block - because then we can't
+      // call onError
       responseObserver.onError(StatusUtils.toGrpcException(ex));
       return;
     }
@@ -274,12 +292,10 @@ public void pollFlightInfo(Flight.FlightDescriptor request, StreamObserver<Fligh
     responseObserver.onCompleted();
   }
 
-  /**
-   * Broadcast the given exception to all registered middleware.
-   */
+  /** Broadcast the given exception to all registered middleware. */
   private void handleExceptionWithMiddleware(Throwable t) {
-    final Map<FlightServerMiddleware.Key<?>, FlightServerMiddleware> middleware = ServerInterceptorAdapter
-            .SERVER_MIDDLEWARE_KEY.get();
+    final Map<FlightServerMiddleware.Key<?>, FlightServerMiddleware> middleware =
+        ServerInterceptorAdapter.SERVER_MIDDLEWARE_KEY.get();
     if (middleware == null || middleware.isEmpty()) {
       logger.error("Uncaught exception in Flight method body", t);
       return;
@@ -288,11 +304,13 @@ private void handleExceptionWithMiddleware(Throwable t) {
   }
 
   @Override
-  public void getSchema(Flight.FlightDescriptor request, StreamObserver<Flight.SchemaResult> responseObserver) {
+  public void getSchema(
+      Flight.FlightDescriptor request, StreamObserver<Flight.SchemaResult> responseObserver) {
     try {
-      SchemaResult result = producer
-              .getSchema(makeContext((ServerCallStreamObserver<?>) responseObserver),
-                      new FlightDescriptor(request));
+      SchemaResult result =
+          producer.getSchema(
+              makeContext((ServerCallStreamObserver<?>) responseObserver),
+              new FlightDescriptor(request));
       responseObserver.onNext(result.toProtocol());
       responseObserver.onCompleted();
     } catch (Exception ex) {
@@ -300,30 +318,33 @@ public void getSchema(Flight.FlightDescriptor request, StreamObserver<Flight.Sch
     }
   }
 
-  /** Ensures that other resources are cleaned up when the service finishes its call.  */
+  /** Ensures that other resources are cleaned up when the service finishes its call. */
   private static class ExchangeListener extends GetListener {
 
     private AutoCloseable resource;
     private boolean closed = false;
     private Runnable onCancelHandler = null;
 
-    public ExchangeListener(ServerCallStreamObserver<ArrowMessage> responseObserver, Consumer<Throwable> errorHandler) {
+    public ExchangeListener(
+        ServerCallStreamObserver<ArrowMessage> responseObserver, Consumer<Throwable> errorHandler) {
       super(responseObserver, errorHandler);
       this.resource = null;
-      super.setOnCancelHandler(() -> {
-        try {
-          if (onCancelHandler != null) {
-            onCancelHandler.run();
-          }
-        } finally {
-          cleanup();
-        }
-      });
+      super.setOnCancelHandler(
+          () -> {
+            try {
+              if (onCancelHandler != null) {
+                onCancelHandler.run();
+              }
+            } finally {
+              cleanup();
+            }
+          });
     }
 
     private void cleanup() {
       if (closed) {
-        // Prevent double-free. gRPC will call the OnCancelHandler even on a normal call end, which means that
+        // Prevent double-free. gRPC will call the OnCancelHandler even on a normal call end, which
+        // means that
         // we'll double-free without this guard.
         return;
       }
@@ -362,41 +383,44 @@ public void setOnCancelHandler(Runnable handler) {
     }
   }
 
-  public StreamObserver<ArrowMessage> doExchangeCustom(StreamObserver<ArrowMessage> responseObserverSimple) {
+  public StreamObserver<ArrowMessage> doExchangeCustom(
+      StreamObserver<ArrowMessage> responseObserverSimple) {
     final ServerCallStreamObserver<ArrowMessage> responseObserver =
         (ServerCallStreamObserver<ArrowMessage>) responseObserverSimple;
-    final ExchangeListener listener = new ExchangeListener(
-        responseObserver,
-        this::handleExceptionWithMiddleware);
-    final FlightStream fs = new FlightStream(
-        allocator,
-        PENDING_REQUESTS,
-        /* server-upload streams are not cancellable */null,
-        responseObserver::request);
+    final ExchangeListener listener =
+        new ExchangeListener(responseObserver, this::handleExceptionWithMiddleware);
+    final FlightStream fs =
+        new FlightStream(
+            allocator,
+            PENDING_REQUESTS,
+            /* server-upload streams are not cancellable */ null,
+            responseObserver::request);
     // When service completes the call, this cleans up the FlightStream
     listener.resource = fs;
     responseObserver.disableAutoInboundFlowControl();
     responseObserver.request(1);
     final StreamObserver<ArrowMessage> observer = fs.asObserver();
     try {
-      Future<?> unused = executors.submit(() -> {
-        try {
-          producer.doExchange(makeContext(responseObserver), fs, listener);
-        } catch (Exception ex) {
-          listener.error(ex);
-        }
-        // We do not clean up or close anything here, to allow long-running asynchronous implementations.
-        // It is the service's responsibility to call completed() or error(), which will then clean up the FlightStream.
-      });
+      Future<?> unused =
+          executors.submit(
+              () -> {
+                try {
+                  producer.doExchange(makeContext(responseObserver), fs, listener);
+                } catch (Exception ex) {
+                  listener.error(ex);
+                }
+                // We do not clean up or close anything here, to allow long-running asynchronous
+                // implementations.
+                // It is the service's responsibility to call completed() or error(), which will
+                // then clean up the FlightStream.
+              });
     } catch (Exception ex) {
       listener.error(ex);
     }
     return observer;
   }
 
-  /**
-   * Call context for the service.
-   */
+  /** Call context for the service. */
   static class CallContext implements FlightProducer.CallContext {
 
     private final String peerIdentity;
@@ -419,8 +443,8 @@ public boolean isCancelled() {
 
     @Override
     public <T extends FlightServerMiddleware> T getMiddleware(FlightServerMiddleware.Key<T> key) {
-      final Map<FlightServerMiddleware.Key<?>, FlightServerMiddleware> middleware = ServerInterceptorAdapter
-              .SERVER_MIDDLEWARE_KEY.get();
+      final Map<FlightServerMiddleware.Key<?>, FlightServerMiddleware> middleware =
+          ServerInterceptorAdapter.SERVER_MIDDLEWARE_KEY.get();
       if (middleware == null) {
         return null;
       }
@@ -428,7 +452,8 @@ public <T extends FlightServerMiddleware> T getMiddleware(FlightServerMiddleware
       if (m == null) {
         return null;
       }
-      @SuppressWarnings("unchecked") final T result = (T) m;
+      @SuppressWarnings("unchecked")
+      final T result = (T) m;
       return result;
     }
 
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightStatusCode.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightStatusCode.java
index 3d96877ba02de..b2720e319424f 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightStatusCode.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightStatusCode.java
@@ -14,68 +14,47 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
-/**
- * A status code describing the result of a Flight call.
- */
+/** A status code describing the result of a Flight call. */
 public enum FlightStatusCode {
-  /**
-   * The call completed successfully. Generally clients will not see this, but middleware may.
-   */
+  /** The call completed successfully. Generally clients will not see this, but middleware may. */
   OK,
   /**
-   * An unknown error occurred. This may also be the result of an implementation error on the server-side; by default,
-   * unhandled server exceptions result in this code.
+   * An unknown error occurred. This may also be the result of an implementation error on the
+   * server-side; by default, unhandled server exceptions result in this code.
    */
   UNKNOWN,
-  /**
-   * An internal/implementation error occurred.
-   */
+  /** An internal/implementation error occurred. */
   INTERNAL,
-  /**
-   * One or more of the given arguments was invalid.
-   */
+  /** One or more of the given arguments was invalid. */
   INVALID_ARGUMENT,
-  /**
-   * The operation timed out.
-   */
+  /** The operation timed out. */
   TIMED_OUT,
-  /**
-   * The operation describes a resource that does not exist.
-   */
+  /** The operation describes a resource that does not exist. */
   NOT_FOUND,
-  /**
-   * The operation creates a resource that already exists.
-   */
+  /** The operation creates a resource that already exists. */
   ALREADY_EXISTS,
-  /**
-   * The operation was cancelled.
-   */
+  /** The operation was cancelled. */
   CANCELLED,
-  /**
-   * The client was not authenticated.
-   */
+  /** The client was not authenticated. */
   UNAUTHENTICATED,
-  /**
-   * The client did not have permission to make the call.
-   */
+  /** The client did not have permission to make the call. */
   UNAUTHORIZED,
-  /**
-   * The requested operation is not implemented.
-   */
+  /** The requested operation is not implemented. */
   UNIMPLEMENTED,
   /**
-   * The server cannot currently handle the request. This should be used for retriable requests, i.e. the server
-   * should send this code only if it has not done any work.
+   * The server cannot currently handle the request. This should be used for retriable requests,
+   * i.e. the server should send this code only if it has not done any work.
    */
   UNAVAILABLE,
-  ;
-
   /**
-   * Create a blank {@link CallStatus} with this code.
+   * Some resource has been exhausted, perhaps a per-user quota, or perhaps the entire file system
+   * is out of space. (see: https://grpc.github.io/grpc/core/md_doc_statuscodes.html)
    */
+  RESOURCE_EXHAUSTED;
+
+  /** Create a blank {@link CallStatus} with this code. */
   public CallStatus toStatus() {
     return new CallStatus(this);
   }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightStream.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightStream.java
index 84beee7d40564..15cfd6ba8547a 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightStream.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightStream.java
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
+import com.google.common.util.concurrent.SettableFuture;
+import io.grpc.stub.StreamObserver;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,7 +29,6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.apache.arrow.flight.ArrowMessage.HeaderType;
 import org.apache.arrow.flight.grpc.StatusUtils;
 import org.apache.arrow.memory.ArrowBuf;
@@ -48,27 +48,19 @@
 import org.apache.arrow.vector.util.DictionaryUtility;
 import org.apache.arrow.vector.validate.MetadataV4UnionChecker;
 
-import com.google.common.util.concurrent.SettableFuture;
-
-import io.grpc.stub.StreamObserver;
-
-/**
- * An adaptor between protobuf streams and flight data streams.
- */
+/** An adaptor between protobuf streams and flight data streams. */
 public class FlightStream implements AutoCloseable {
   // Use AutoCloseable sentinel objects to simplify logic in #close
-  private final AutoCloseable DONE = new AutoCloseable() {
-    @Override
-    public void close() throws Exception {
-
-    }
-  };
-  private final AutoCloseable DONE_EX = new AutoCloseable() {
-    @Override
-    public void close() throws Exception {
-
-    }
-  };
+  private final AutoCloseable DONE =
+      new AutoCloseable() {
+        @Override
+        public void close() throws Exception {}
+      };
+  private final AutoCloseable DONE_EX =
+      new AutoCloseable() {
+        @Override
+        public void close() throws Exception {}
+      };
 
   private final BufferAllocator allocator;
   private final Cancellable cancellable;
@@ -78,10 +70,12 @@ public void close() throws Exception {
   private final int pendingTarget;
   private final Requestor requestor;
   // The completion flags.
-  // This flag is only updated as the user iterates through the data, i.e. it tracks whether the user has read all the
+  // This flag is only updated as the user iterates through the data, i.e. it tracks whether the
+  // user has read all the
   // data and closed the stream
   final CompletableFuture<Void> completed;
-  // This flag is immediately updated when gRPC signals that the server has ended the call. This is used to make sure
+  // This flag is immediately updated when gRPC signals that the server has ended the call. This is
+  // used to make sure
   // we don't block forever trying to write to a server that has rejected a call.
   final CompletableFuture<Void> cancelled;
 
@@ -91,18 +85,18 @@ public void close() throws Exception {
   private volatile VectorLoader loader;
   private volatile Throwable ex;
   private volatile ArrowBuf applicationMetadata = null;
-  @VisibleForTesting
-  volatile MetadataVersion metadataVersion = null;
+  @VisibleForTesting volatile MetadataVersion metadataVersion = null;
 
   /**
    * Constructs a new instance.
    *
-   * @param allocator  The allocator to use for creating/reallocating buffers for Vectors.
+   * @param allocator The allocator to use for creating/reallocating buffers for Vectors.
    * @param pendingTarget Target number of messages to receive.
    * @param cancellable Used to cancel mid-stream requests.
    * @param requestor A callback to determine how many pending items there are.
    */
-  public FlightStream(BufferAllocator allocator, int pendingTarget, Cancellable cancellable, Requestor requestor) {
+  public FlightStream(
+      BufferAllocator allocator, int pendingTarget, Cancellable cancellable, Requestor requestor) {
     Objects.requireNonNull(allocator);
     Objects.requireNonNull(requestor);
     this.allocator = allocator;
@@ -114,9 +108,7 @@ public FlightStream(BufferAllocator allocator, int pendingTarget, Cancellable ca
     this.cancelled = new CompletableFuture<>();
   }
 
-  /**
-   * Get the schema for this stream. Blocks until the schema is available.
-   */
+  /** Get the schema for this stream. Blocks until the schema is available. */
   public Schema getSchema() {
     return getRoot().getSchema();
   }
@@ -124,9 +116,9 @@ public Schema getSchema() {
   /**
    * Get the provider for dictionaries in this stream.
    *
-   * <p>Does NOT retain a reference to the underlying dictionaries. Dictionaries may be updated as the stream is read.
-   * This method is intended for stream processing, where the application code will not retain references to values
-   * after the stream is closed.
+   * <p>Does NOT retain a reference to the underlying dictionaries. Dictionaries may be updated as
+   * the stream is read. This method is intended for stream processing, where the application code
+   * will not retain references to values after the stream is closed.
    *
    * @throws IllegalStateException if {@link #takeDictionaryOwnership()} was called
    * @see #takeDictionaryOwnership()
@@ -139,10 +131,11 @@ public DictionaryProvider getDictionaryProvider() {
   }
 
   /**
-   * Get an owned reference to the dictionaries in this stream. Should be called after finishing reading the stream,
-   * but before closing.
+   * Get an owned reference to the dictionaries in this stream. Should be called after finishing
+   * reading the stream, but before closing.
    *
-   * <p>If called, the client is responsible for closing the dictionaries in this provider. Can only be called once.
+   * <p>If called, the client is responsible for closing the dictionaries in this provider. Can only
+   * be called once.
    *
    * @return The dictionary provider for the stream.
    * @throws IllegalStateException if called more than once.
@@ -158,8 +151,8 @@ public DictionaryProvider takeDictionaryOwnership() {
   }
 
   /**
-   * Get the descriptor for this stream. Only applicable on the server side of a DoPut operation. Will block until the
-   * client sends the descriptor.
+   * Get the descriptor for this stream. Only applicable on the server side of a DoPut operation.
+   * Will block until the client sends the descriptor.
    */
   public FlightDescriptor getDescriptor() {
     // This blocks until the first message from the client is received.
@@ -169,39 +162,46 @@ public FlightDescriptor getDescriptor() {
       Thread.currentThread().interrupt();
       throw CallStatus.INTERNAL.withCause(e).withDescription("Interrupted").toRuntimeException();
     } catch (ExecutionException e) {
-      throw CallStatus.INTERNAL.withCause(e).withDescription("Error getting descriptor").toRuntimeException();
+      throw CallStatus.INTERNAL
+          .withCause(e)
+          .withDescription("Error getting descriptor")
+          .toRuntimeException();
     }
   }
 
   /**
    * Closes the stream (freeing any existing resources).
    *
-   * <p>If the stream isn't complete and is cancellable, this method will cancel and drain the stream first.
+   * <p>If the stream isn't complete and is cancellable, this method will cancel and drain the
+   * stream first.
    */
   @Override
   public void close() throws Exception {
     final List<AutoCloseable> closeables = new ArrayList<>();
     Throwable suppressor = null;
     if (cancellable != null) {
-      // Client-side stream. Cancel the call, to help ensure gRPC doesn't deliver a message after close() ends.
-      // On the server side, we can't rely on draining the stream , because this gRPC bug means the completion callback
+      // Client-side stream. Cancel the call, to help ensure gRPC doesn't deliver a message after
+      // close() ends.
+      // On the server side, we can't rely on draining the stream , because this gRPC bug means the
+      // completion callback
       // may never run https://github.com/grpc/grpc-java/issues/5882
       try {
         synchronized (cancellable) {
           if (!cancelled.isDone()) {
             // Only cancel if the call is not done on the gRPC side
-            cancellable.cancel("Stream closed before end", /* no exception to report */null);
+            cancellable.cancel("Stream closed before end", /* no exception to report */ null);
           }
         }
         // Drain the stream without the lock (as next() implicitly needs the lock)
-        while (next()) {
-        }
+        while (next()) {}
       } catch (FlightRuntimeException e) {
         suppressor = e;
       }
     }
-    // Perform these operations under a lock. This way the observer can't enqueue new messages while we're in the
-    // middle of cleanup. This should only be a concern for server-side streams since client-side streams are drained
+    // Perform these operations under a lock. This way the observer can't enqueue new messages while
+    // we're in the
+    // middle of cleanup. This should only be a concern for server-side streams since client-side
+    // streams are drained
     // by the lambda above.
     synchronized (completed) {
       try {
@@ -211,7 +211,9 @@ public void close() throws Exception {
         closeables.add(applicationMetadata);
         closeables.addAll(queue);
         if (dictionaries != null) {
-          dictionaries.getDictionaryIds().forEach(id -> closeables.add(dictionaries.lookup(id).getVector()));
+          dictionaries
+              .getDictionaryIds()
+              .forEach(id -> closeables.add(dictionaries.lookup(id).getVector()));
         }
         if (suppressor != null) {
           AutoCloseables.close(suppressor, closeables);
@@ -221,7 +223,8 @@ public void close() throws Exception {
         // Remove any metadata after closing to prevent negative refcnt
         applicationMetadata = null;
       } finally {
-        // The value of this CompletableFuture is meaningless, only whether it's completed (or has an exception)
+        // The value of this CompletableFuture is meaningless, only whether it's completed (or has
+        // an exception)
         // No-op if already complete
         completed.complete(null);
       }
@@ -230,6 +233,7 @@ public void close() throws Exception {
 
   /**
    * Blocking request to load next item into list.
+   *
    * @return Whether or not more data was found.
    */
   public boolean next() {
@@ -244,7 +248,8 @@ public boolean next() {
       Object data = queue.take();
       if (DONE == data) {
         queue.put(DONE);
-        // Other code ignores the value of this CompletableFuture, only whether it's completed (or has an exception)
+        // Other code ignores the value of this CompletableFuture, only whether it's completed (or
+        // has an exception)
         completed.complete(null);
         return false;
       } else if (DONE_EX == data) {
@@ -277,7 +282,8 @@ public boolean next() {
             try (ArrowDictionaryBatch arb = msg.asDictionaryBatch()) {
               final long id = arb.getDictionaryId();
               if (dictionaries == null) {
-                throw new IllegalStateException("Dictionary ownership was claimed by the application.");
+                throw new IllegalStateException(
+                    "Dictionary ownership was claimed by the application.");
               }
               final Dictionary dictionary = dictionaries.lookup(id);
               if (dictionary == null) {
@@ -285,14 +291,18 @@ public boolean next() {
               }
 
               final FieldVector vector = dictionary.getVector();
-              final VectorSchemaRoot dictionaryRoot = new VectorSchemaRoot(Collections.singletonList(vector.getField()),
-                  Collections.singletonList(vector), 0);
+              final VectorSchemaRoot dictionaryRoot =
+                  new VectorSchemaRoot(
+                      Collections.singletonList(vector.getField()),
+                      Collections.singletonList(vector),
+                      0);
               final VectorLoader dictionaryLoader = new VectorLoader(dictionaryRoot);
               dictionaryLoader.load(arb.getDictionary());
             }
             return next();
           } else {
-            throw new UnsupportedOperationException("Message type is unsupported: " + msg.getMessageType());
+            throw new UnsupportedOperationException(
+                "Message type is unsupported: " + msg.getMessageType());
           }
           return true;
         }
@@ -322,18 +332,22 @@ private void checkMetadataVersion(ArrowMessage msg) {
     if (msg.asSchemaMessage() == null) {
       return;
     }
-    MetadataVersion receivedVersion = MetadataVersion.fromFlatbufID(msg.asSchemaMessage().getMessage().version());
+    MetadataVersion receivedVersion =
+        MetadataVersion.fromFlatbufID(msg.asSchemaMessage().getMessage().version());
     if (this.metadataVersion != receivedVersion) {
-      throw new IllegalStateException("Metadata version mismatch: stream started as " +
-          this.metadataVersion + " but got message with version " + receivedVersion);
+      throw new IllegalStateException(
+          "Metadata version mismatch: stream started as "
+              + this.metadataVersion
+              + " but got message with version "
+              + receivedVersion);
     }
   }
 
   /**
    * Get the current vector data from the stream.
    *
-   * <p>The data in the root may change at any time. Clients should NOT modify the root, but instead unload the data
-   * into their own root.
+   * <p>The data in the root may change at any time. Clients should NOT modify the root, but instead
+   * unload the data into their own root.
    *
    * @throws FlightRuntimeException if there was an error reading the schema from the stream.
    */
@@ -350,7 +364,7 @@ public VectorSchemaRoot getRoot() {
   /**
    * Check if there is a root (i.e. whether the other end has started sending data).
    *
-   * Updated by calls to {@link #next()}.
+   * <p>Updated by calls to {@link #next()}.
    *
    * @return true if and only if the other end has started sending data.
    */
@@ -359,9 +373,10 @@ public boolean hasRoot() {
   }
 
   /**
-   * Get the most recent metadata sent from the server. This may be cleared by calls to {@link #next()} if the server
-   * sends a message without metadata. This does NOT take ownership of the buffer - call retain() to create a reference
-   * if you need the buffer after a call to {@link #next()}.
+   * Get the most recent metadata sent from the server. This may be cleared by calls to {@link
+   * #next()} if the server sends a message without metadata. This does NOT take ownership of the
+   * buffer - call retain() to create a reference if you need the buffer after a call to {@link
+   * #next()}.
    *
    * @return the application metadata. May be null.
    */
@@ -396,68 +411,75 @@ private void enqueue(AutoCloseable message) {
 
     @Override
     public void onNext(ArrowMessage msg) {
-      // Operations here have to be under a lock so that we don't add a message to the queue while in the middle of
+      // Operations here have to be under a lock so that we don't add a message to the queue while
+      // in the middle of
       // close().
       requestOutstanding();
       switch (msg.getMessageType()) {
-        case NONE: {
-          // No IPC message - pure metadata or descriptor
-          if (msg.getDescriptor() != null) {
-            descriptor.set(new FlightDescriptor(msg.getDescriptor()));
-          }
-          if (msg.getApplicationMetadata() != null) {
-            enqueue(msg);
-          }
-          break;
-        }
-        case SCHEMA: {
-          Schema schema = msg.asSchema();
-          
-          // if there is app metadata in the schema message, make sure
-          // that we don't leak it.
-          ArrowBuf meta = msg.getApplicationMetadata();
-          if (meta != null) {
-            meta.close();
-          }
-
-          final List<Field> fields = new ArrayList<>();
-          final Map<Long, Dictionary> dictionaryMap = new HashMap<>();
-          for (final Field originalField : schema.getFields()) {
-            final Field updatedField = DictionaryUtility.toMemoryFormat(originalField, allocator, dictionaryMap);
-            fields.add(updatedField);
-          }
-          for (final Map.Entry<Long, Dictionary> entry : dictionaryMap.entrySet()) {
-            dictionaries.put(entry.getValue());
-          }
-          schema = new Schema(fields, schema.getCustomMetadata());
-          metadataVersion = MetadataVersion.fromFlatbufID(msg.asSchemaMessage().getMessage().version());
-          try {
-            MetadataV4UnionChecker.checkRead(schema, metadataVersion);
-          } catch (IOException e) {
-            ex = e;
-            enqueue(DONE_EX);
+        case NONE:
+          {
+            // No IPC message - pure metadata or descriptor
+            if (msg.getDescriptor() != null) {
+              descriptor.set(new FlightDescriptor(msg.getDescriptor()));
+            }
+            if (msg.getApplicationMetadata() != null) {
+              enqueue(msg);
+            }
             break;
           }
+        case SCHEMA:
+          {
+            Schema schema = msg.asSchema();
+
+            // if there is app metadata in the schema message, make sure
+            // that we don't leak it.
+            ArrowBuf meta = msg.getApplicationMetadata();
+            if (meta != null) {
+              meta.close();
+            }
+
+            final List<Field> fields = new ArrayList<>();
+            final Map<Long, Dictionary> dictionaryMap = new HashMap<>();
+            for (final Field originalField : schema.getFields()) {
+              final Field updatedField =
+                  DictionaryUtility.toMemoryFormat(originalField, allocator, dictionaryMap);
+              fields.add(updatedField);
+            }
+            for (final Map.Entry<Long, Dictionary> entry : dictionaryMap.entrySet()) {
+              dictionaries.put(entry.getValue());
+            }
+            schema = new Schema(fields, schema.getCustomMetadata());
+            metadataVersion =
+                MetadataVersion.fromFlatbufID(msg.asSchemaMessage().getMessage().version());
+            try {
+              MetadataV4UnionChecker.checkRead(schema, metadataVersion);
+            } catch (IOException e) {
+              ex = e;
+              enqueue(DONE_EX);
+              break;
+            }
 
-          synchronized (completed) {
-            if (!completed.isDone()) {              
-              fulfilledRoot = VectorSchemaRoot.create(schema, allocator);
-              loader = new VectorLoader(fulfilledRoot);
-              if (msg.getDescriptor() != null) {
-                descriptor.set(new FlightDescriptor(msg.getDescriptor()));
+            synchronized (completed) {
+              if (!completed.isDone()) {
+                fulfilledRoot = VectorSchemaRoot.create(schema, allocator);
+                loader = new VectorLoader(fulfilledRoot);
+                if (msg.getDescriptor() != null) {
+                  descriptor.set(new FlightDescriptor(msg.getDescriptor()));
+                }
+                root.set(fulfilledRoot);
               }
-              root.set(fulfilledRoot);
             }
+            break;
           }
-          break;
-        }
         case RECORD_BATCH:
         case DICTIONARY_BATCH:
           enqueue(msg);
           break;
         case TENSOR:
         default:
-          ex = new UnsupportedOperationException("Unable to handle message of type: " + msg.getMessageType());
+          ex =
+              new UnsupportedOperationException(
+                  "Unable to handle message of type: " + msg.getMessageType());
           enqueue(DONE_EX);
       }
     }
@@ -481,13 +503,14 @@ public void onCompleted() {
   /**
    * Cancels sending the stream to a client.
    *
-   * <p>Callers should drain the stream (with {@link #next()}) to ensure all messages sent before cancellation are
-   * received and to wait for the underlying transport to acknowledge cancellation.
+   * <p>Callers should drain the stream (with {@link #next()}) to ensure all messages sent before
+   * cancellation are received and to wait for the underlying transport to acknowledge cancellation.
    */
   public void cancel(String message, Throwable exception) {
     if (cancellable == null) {
-      throw new UnsupportedOperationException("Streams cannot be cancelled that are produced by client. " +
-          "Instead, server should reject incoming messages.");
+      throw new UnsupportedOperationException(
+          "Streams cannot be cancelled that are produced by client. "
+              + "Instead, server should reject incoming messages.");
     }
     cancellable.cancel(message, exception);
     // Do not mark the stream as completed, as gRPC may still be delivering messages.
@@ -497,22 +520,16 @@ StreamObserver<ArrowMessage> asObserver() {
     return new Observer();
   }
 
-  /**
-   * Provides a callback to cancel a process that is in progress.
-   */
+  /** Provides a callback to cancel a process that is in progress. */
   @FunctionalInterface
   public interface Cancellable {
     void cancel(String message, Throwable exception);
   }
 
-  /**
-   * Provides a interface to request more items from a stream producer.
-   */
+  /** Provides a interface to request more items from a stream producer. */
   @FunctionalInterface
   public interface Requestor {
-    /**
-     * Requests <code>count</code> more messages from the instance of this object.
-     */
+    /** Requests <code>count</code> more messages from the instance of this object. */
     void request(int count);
   }
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/GetSessionOptionsRequest.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/GetSessionOptionsRequest.java
index 9d63e59027aac..d516ba5df4980 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/GetSessionOptionsRequest.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/GetSessionOptionsRequest.java
@@ -14,23 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
-
 import org.apache.arrow.flight.impl.Flight;
 
-/**
- * A request to get current session options.
- */
+/** A request to get current session options. */
 public class GetSessionOptionsRequest {
-  public GetSessionOptionsRequest() {
-  }
+  public GetSessionOptionsRequest() {}
 
-  GetSessionOptionsRequest(Flight.GetSessionOptionsRequest proto) {
-  }
+  GetSessionOptionsRequest(Flight.GetSessionOptionsRequest proto) {}
 
   Flight.GetSessionOptionsRequest toProtocol() {
     return Flight.GetSessionOptionsRequest.getDefaultInstance();
@@ -39,7 +33,8 @@ Flight.GetSessionOptionsRequest toProtocol() {
   /**
    * Get the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight types.
+   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight
+   * types.
    */
   public ByteBuffer serialize() {
     return ByteBuffer.wrap(toProtocol().toByteArray());
@@ -48,7 +43,8 @@ public ByteBuffer serialize() {
   /**
    * Parse the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from non-Flight services.
+   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from
+   * non-Flight services.
    *
    * @param serialized The serialized form of the message, as returned by {@link #serialize()}.
    * @return The deserialized message.
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/GetSessionOptionsResult.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/GetSessionOptionsResult.java
index c777bd39bd032..618b8c700801a 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/GetSessionOptionsResult.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/GetSessionOptionsResult.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.io.IOException;
@@ -23,7 +22,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.flight.impl.Flight;
 
 /** A request to view the currently-set options for the current server session. */
@@ -35,9 +33,13 @@ public GetSessionOptionsResult(Map<String, SessionOptionValue> sessionOptions) {
   }
 
   GetSessionOptionsResult(Flight.GetSessionOptionsResult proto) {
-    sessionOptions = Collections.unmodifiableMap(
-        proto.getSessionOptionsMap().entrySet().stream().collect(Collectors.toMap(
-            Map.Entry::getKey, (e) -> SessionOptionValueFactory.makeSessionOptionValue(e.getValue()))));
+    sessionOptions =
+        Collections.unmodifiableMap(
+            proto.getSessionOptionsMap().entrySet().stream()
+                .collect(
+                    Collectors.toMap(
+                        Map.Entry::getKey,
+                        (e) -> SessionOptionValueFactory.makeSessionOptionValue(e.getValue()))));
   }
 
   /**
@@ -51,15 +53,17 @@ public Map<String, SessionOptionValue> getSessionOptions() {
 
   Flight.GetSessionOptionsResult toProtocol() {
     Flight.GetSessionOptionsResult.Builder b = Flight.GetSessionOptionsResult.newBuilder();
-    b.putAllSessionOptions(sessionOptions.entrySet().stream().collect(Collectors.toMap(
-        Map.Entry::getKey, (e) -> e.getValue().toProtocol())));
+    b.putAllSessionOptions(
+        sessionOptions.entrySet().stream()
+            .collect(Collectors.toMap(Map.Entry::getKey, (e) -> e.getValue().toProtocol())));
     return b.build();
   }
 
   /**
    * Get the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight types.
+   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight
+   * types.
    */
   public ByteBuffer serialize() {
     return ByteBuffer.wrap(toProtocol().toByteArray());
@@ -68,7 +72,8 @@ public ByteBuffer serialize() {
   /**
    * Parse the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from non-Flight services.
+   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from
+   * non-Flight services.
    *
    * @param serialized The serialized form of the message, as returned by {@link #serialize()}.
    * @return The deserialized message.
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/HeaderCallOption.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/HeaderCallOption.java
index 1a04ca3d08534..34824bf05d1a5 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/HeaderCallOption.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/HeaderCallOption.java
@@ -14,24 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import io.grpc.Metadata;
 import io.grpc.stub.AbstractStub;
 import io.grpc.stub.MetadataUtils;
 
-/**
- * Method option for supplying headers to method calls.
- */
+/** Method option for supplying headers to method calls. */
 public class HeaderCallOption implements CallOptions.GrpcCallOption {
   private final Metadata propertiesMetadata = new Metadata();
 
   /**
    * Header property constructor.
    *
-   * @param headers the headers that should be sent across. If a header is a string, it should only be valid ASCII
-   *                characters. Binary headers should end in "-bin".
+   * @param headers the headers that should be sent across. If a header is a string, it should only
+   *     be valid ASCII characters. Binary headers should end in "-bin".
    */
   public HeaderCallOption(CallHeaders headers) {
     for (String key : headers.keys()) {
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Location.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Location.java
index 2eb3139c9dcdd..d76fbb47b3929 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Location.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Location.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.lang.reflect.InvocationTargetException;
@@ -23,7 +22,6 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Objects;
-
 import org.apache.arrow.flight.impl.Flight;
 
 /** A URI where a Flight stream is available. */
@@ -64,38 +62,43 @@ public SocketAddress toSocketAddress() {
     switch (uri.getScheme()) {
       case LocationSchemes.GRPC:
       case LocationSchemes.GRPC_TLS:
-      case LocationSchemes.GRPC_INSECURE: {
-        return new InetSocketAddress(uri.getHost(), uri.getPort());
-      }
-
-      case LocationSchemes.GRPC_DOMAIN_SOCKET: {
-        try {
-          // This dependency is not available on non-Unix platforms.
-          return Class.forName("io.netty.channel.unix.DomainSocketAddress").asSubclass(SocketAddress.class)
-              .getConstructor(String.class)
-              .newInstance(uri.getPath());
-        } catch (InstantiationException | ClassNotFoundException | InvocationTargetException |
-            NoSuchMethodException | IllegalAccessException e) {
-          return null;
+      case LocationSchemes.GRPC_INSECURE:
+        {
+          return new InetSocketAddress(uri.getHost(), uri.getPort());
+        }
+
+      case LocationSchemes.GRPC_DOMAIN_SOCKET:
+        {
+          try {
+            // This dependency is not available on non-Unix platforms.
+            return Class.forName("io.netty.channel.unix.DomainSocketAddress")
+                .asSubclass(SocketAddress.class)
+                .getConstructor(String.class)
+                .newInstance(uri.getPath());
+          } catch (InstantiationException
+              | ClassNotFoundException
+              | InvocationTargetException
+              | NoSuchMethodException
+              | IllegalAccessException e) {
+            return null;
+          }
         }
-      }
 
-      default: {
-        return null;
-      }
+      default:
+        {
+          return null;
+        }
     }
   }
 
-  /**
-   * Convert this Location into its protocol-level representation.
-   */
+  /** Convert this Location into its protocol-level representation. */
   Flight.Location toProtocol() {
     return Flight.Location.newBuilder().setUri(uri.toString()).build();
   }
 
   /**
-   * Construct a special URI to indicate to clients that they may fetch data by reusing
-   * an existing connection to a Flight RPC server.
+   * Construct a special URI to indicate to clients that they may fetch data by reusing an existing
+   * connection to a Flight RPC server.
    */
   public static Location reuseConnection() {
     try {
@@ -113,7 +116,8 @@ public static Location reuseConnection() {
    */
   public static Location forGrpcInsecure(String host, int port) {
     try {
-      return new Location(new URI(LocationSchemes.GRPC_INSECURE, null, host, port, null, null, null));
+      return new Location(
+          new URI(LocationSchemes.GRPC_INSECURE, null, host, port, null, null, null));
     } catch (URISyntaxException e) {
       throw new IllegalArgumentException(e);
     }
@@ -147,9 +151,7 @@ public static Location forGrpcDomainSocket(String path) {
 
   @Override
   public String toString() {
-    return "Location{" +
-        "uri=" + uri +
-        '}';
+    return "Location{" + "uri=" + uri + '}';
   }
 
   @Override
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/LocationSchemes.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/LocationSchemes.java
index f1dbfb95f237e..0c340452be2ba 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/LocationSchemes.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/LocationSchemes.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
-/**
- * Constants representing well-known URI schemes for Flight services.
- */
+/** Constants representing well-known URI schemes for Flight services. */
 public final class LocationSchemes {
   public static final String GRPC = "grpc";
   public static final String GRPC_INSECURE = "grpc+tcp";
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/NoOpFlightProducer.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/NoOpFlightProducer.java
index d1432f514d8df..6d968e174b338 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/NoOpFlightProducer.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/NoOpFlightProducer.java
@@ -14,48 +14,44 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
-/**
- * A {@link FlightProducer} that throws on all operations.
- */
+/** A {@link FlightProducer} that throws on all operations. */
 public class NoOpFlightProducer implements FlightProducer {
 
   @Override
-  public void getStream(CallContext context, Ticket ticket,
-      ServerStreamListener listener) {
-    listener.error(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+  public void getStream(CallContext context, Ticket ticket, ServerStreamListener listener) {
+    listener.error(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
 
   @Override
-  public void listFlights(CallContext context, Criteria criteria,
-      StreamListener<FlightInfo> listener) {
-    listener.onError(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+  public void listFlights(
+      CallContext context, Criteria criteria, StreamListener<FlightInfo> listener) {
+    listener.onError(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
 
   @Override
-  public FlightInfo getFlightInfo(CallContext context,
-      FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfo(CallContext context, FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
-  public Runnable acceptPut(CallContext context,
-      FlightStream flightStream, StreamListener<PutResult> ackStream) {
+  public Runnable acceptPut(
+      CallContext context, FlightStream flightStream, StreamListener<PutResult> ackStream) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
-  public void doAction(CallContext context, Action action,
-      StreamListener<Result> listener) {
-    listener.onError(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+  public void doAction(CallContext context, Action action, StreamListener<Result> listener) {
+    listener.onError(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
 
   @Override
-  public void listActions(CallContext context,
-      StreamListener<ActionType> listener) {
-    listener.onError(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+  public void listActions(CallContext context, StreamListener<ActionType> listener) {
+    listener.onError(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
-
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/NoOpSessionOptionValueVisitor.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/NoOpSessionOptionValueVisitor.java
index c951cce0ed42d..34695139107eb 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/NoOpSessionOptionValueVisitor.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/NoOpSessionOptionValueVisitor.java
@@ -14,48 +14,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 /**
  * A helper to facilitate easier anonymous subclass declaration.
  *
- * Implementations need only override callbacks for types they wish to do something with.
+ * <p>Implementations need only override callbacks for types they wish to do something with.
  *
  * @param <T> Return type of the visit operation.
  */
 public class NoOpSessionOptionValueVisitor<T> implements SessionOptionValueVisitor<T> {
-  /**
-   * A callback to handle SessionOptionValue containing a String.
-   */
+  /** A callback to handle SessionOptionValue containing a String. */
   public T visit(String value) {
     return null;
   }
 
-  /**
-   * A callback to handle SessionOptionValue containing a boolean.
-   */
+  /** A callback to handle SessionOptionValue containing a boolean. */
   public T visit(boolean value) {
     return null;
   }
 
-  /**
-   * A callback to handle SessionOptionValue containing a long.
-   */
+  /** A callback to handle SessionOptionValue containing a long. */
   public T visit(long value) {
     return null;
   }
 
-  /**
-   * A callback to handle SessionOptionValue containing a double.
-   */
+  /** A callback to handle SessionOptionValue containing a double. */
   public T visit(double value) {
     return null;
   }
 
-  /**
-   * A callback to handle SessionOptionValue containing an array of String.
-   */
+  /** A callback to handle SessionOptionValue containing an array of String. */
   public T visit(String[] value) {
     return null;
   }
@@ -63,8 +52,8 @@ public T visit(String[] value) {
   /**
    * A callback to handle SessionOptionValue containing no value.
    *
-   * By convention, an attempt to set a valueless SessionOptionValue should
-   * attempt to unset or clear the named option value on the server.
+   * <p>By convention, an attempt to set a valueless SessionOptionValue should attempt to unset or
+   * clear the named option value on the server.
    */
   public T visit(Void value) {
     return null;
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/NoOpStreamListener.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/NoOpStreamListener.java
index e06af1a1026cf..87081bbe389df 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/NoOpStreamListener.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/NoOpStreamListener.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import org.apache.arrow.flight.FlightProducer.StreamListener;
 
 /**
  * A {@link StreamListener} that does nothing for all callbacks.
+ *
  * @param <T> The type of the callback object.
  */
 public class NoOpStreamListener<T> implements StreamListener<T> {
@@ -28,18 +28,15 @@ public class NoOpStreamListener<T> implements StreamListener<T> {
 
   /** Ignores the value received. */
   @Override
-  public void onNext(T val) {
-  }
+  public void onNext(T val) {}
 
   /** Ignores the error received. */
   @Override
-  public void onError(Throwable t) {
-  }
+  public void onError(Throwable t) {}
 
   /** Ignores the stream completion event. */
   @Override
-  public void onCompleted() {
-  }
+  public void onCompleted() {}
 
   @SuppressWarnings("unchecked")
   public static <T> StreamListener<T> getInstance() {
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/OutboundStreamListener.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/OutboundStreamListener.java
index 80ddad90a1d28..94b01b2bfc545 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/OutboundStreamListener.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/OutboundStreamListener.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import org.apache.arrow.memory.ArrowBuf;
@@ -22,28 +21,26 @@
 import org.apache.arrow.vector.dictionary.DictionaryProvider;
 import org.apache.arrow.vector.ipc.message.IpcOption;
 
-/**
- * An interface for writing data to a peer, client or server.
- */
+/** An interface for writing data to a peer, client or server. */
 public interface OutboundStreamListener {
 
   /**
    * A hint indicating whether the client is ready to receive data without excessive buffering.
    *
-   * <p>Writers should poll this flag before sending data to respect backpressure from the client and
-   * avoid sending data faster than the client can handle. Ignoring this flag may mean that the server
-   * will start consuming excessive amounts of memory, as it may buffer messages in memory.
+   * <p>Writers should poll this flag before sending data to respect backpressure from the client
+   * and avoid sending data faster than the client can handle. Ignoring this flag may mean that the
+   * server will start consuming excessive amounts of memory, as it may buffer messages in memory.
    */
   boolean isReady();
 
   /**
-   * Set a callback for when the listener is ready for new calls to putNext(), i.e. {@link #isReady()}
-   * has become true.
+   * Set a callback for when the listener is ready for new calls to putNext(), i.e. {@link
+   * #isReady()} has become true.
    *
-   * <p>Note that this callback may only be called some time after {@link #isReady()} becomes true, and may never
-   * be called if all executor threads on the server are busy, or the RPC method body is implemented in a blocking
-   * fashion. Note that isReady() must still be checked after the callback is run as it may have been run
-   * spuriously.
+   * <p>Note that this callback may only be called some time after {@link #isReady()} becomes true,
+   * and may never be called if all executor threads on the server are busy, or the RPC method body
+   * is implemented in a blocking fashion. Note that isReady() must still be checked after the
+   * callback is run as it may have been run spuriously.
    */
   default void setOnReadyHandler(Runnable handler) {
     throw new UnsupportedOperationException("Not yet implemented.");
@@ -78,13 +75,17 @@ default void start(VectorSchemaRoot root, DictionaryProvider dictionaries) {
    * Send the current contents of the associated {@link VectorSchemaRoot}.
    *
    * <p>This will not necessarily block until the message is actually sent; it may buffer messages
-   * in memory. Use {@link #isReady()} to check if there is backpressure and avoid excessive buffering.
+   * in memory. Use {@link #isReady()} to check if there is backpressure and avoid excessive
+   * buffering.
    */
   void putNext();
 
   /**
-   * Send the current contents of the associated {@link VectorSchemaRoot} alongside application-defined metadata.
-   * @param metadata The metadata to send. Ownership of the buffer is transferred to the Flight implementation.
+   * Send the current contents of the associated {@link VectorSchemaRoot} alongside
+   * application-defined metadata.
+   *
+   * @param metadata The metadata to send. Ownership of the buffer is transferred to the Flight
+   *     implementation.
    */
   void putNext(ArrowBuf metadata);
 
@@ -96,29 +97,29 @@ default void start(VectorSchemaRoot root, DictionaryProvider dictionaries) {
   void putMetadata(ArrowBuf metadata);
 
   /**
-   * Indicate an error to the client. Terminates the stream; do not call {@link #completed()} afterwards.
+   * Indicate an error to the client. Terminates the stream; do not call {@link #completed()}
+   * afterwards.
    */
   void error(Throwable ex);
 
-  /**
-   * Indicate that transmission is finished.
-   */
+  /** Indicate that transmission is finished. */
   void completed();
 
   /**
    * Toggle whether to use the zero-copy write optimization.
    *
-   * <p>By default or when disabled, Arrow may copy data into a buffer for the underlying implementation to
-   * send. When enabled, Arrow will instead try to directly enqueue the Arrow buffer for sending. Not all
-   * implementations support this optimization, so even if enabled, you may not see a difference.
+   * <p>By default or when disabled, Arrow may copy data into a buffer for the underlying
+   * implementation to send. When enabled, Arrow will instead try to directly enqueue the Arrow
+   * buffer for sending. Not all implementations support this optimization, so even if enabled, you
+   * may not see a difference.
    *
-   * <p>In this mode, buffers must not be reused after they are written with {@link #putNext()}. For example,
-   * you would have to call {@link VectorSchemaRoot#allocateNew()} after every call to {@link #putNext()}.
-   * Hence, this is not enabled by default.
+   * <p>In this mode, buffers must not be reused after they are written with {@link #putNext()}. For
+   * example, you would have to call {@link VectorSchemaRoot#allocateNew()} after every call to
+   * {@link #putNext()}. Hence, this is not enabled by default.
    *
-   * <p>The default value can be toggled globally by setting the JVM property arrow.flight.enable_zero_copy_write
-   * or the environment variable ARROW_FLIGHT_ENABLE_ZERO_COPY_WRITE.
+   * <p>The default value can be toggled globally by setting the JVM property
+   * arrow.flight.enable_zero_copy_write or the environment variable
+   * ARROW_FLIGHT_ENABLE_ZERO_COPY_WRITE.
    */
-  default void setUseZeroCopy(boolean enabled) {
-  }
+  default void setUseZeroCopy(boolean enabled) {}
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/OutboundStreamListenerImpl.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/OutboundStreamListenerImpl.java
index 8c1cfde3ae9fc..a1bde3a848e42 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/OutboundStreamListenerImpl.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/OutboundStreamListenerImpl.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
+import io.grpc.stub.CallStreamObserver;
 import org.apache.arrow.flight.grpc.StatusUtils;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.util.Preconditions;
@@ -25,11 +25,7 @@
 import org.apache.arrow.vector.dictionary.DictionaryProvider;
 import org.apache.arrow.vector.ipc.message.IpcOption;
 
-import io.grpc.stub.CallStreamObserver;
-
-/**
- * A base class for writing Arrow data to a Flight stream.
- */
+/** A base class for writing Arrow data to a Flight stream. */
 abstract class OutboundStreamListenerImpl implements OutboundStreamListener {
   private final FlightDescriptor descriptor; // nullable
   protected final CallStreamObserver<ArrowMessage> responseObserver;
@@ -37,7 +33,8 @@ abstract class OutboundStreamListenerImpl implements OutboundStreamListener {
   protected IpcOption option; // null until stream started
   protected boolean tryZeroCopy = ArrowMessage.ENABLE_ZERO_COPY_WRITE;
 
-  OutboundStreamListenerImpl(FlightDescriptor descriptor, CallStreamObserver<ArrowMessage> responseObserver) {
+  OutboundStreamListenerImpl(
+      FlightDescriptor descriptor, CallStreamObserver<ArrowMessage> responseObserver) {
     Preconditions.checkNotNull(responseObserver, "responseObserver must be provided");
     this.descriptor = descriptor;
     this.responseObserver = responseObserver;
@@ -58,13 +55,15 @@ public void setOnReadyHandler(Runnable handler) {
   public void start(VectorSchemaRoot root, DictionaryProvider dictionaries, IpcOption option) {
     this.option = option;
     try {
-      DictionaryUtils.generateSchemaMessages(root.getSchema(), descriptor, dictionaries, option,
-          responseObserver::onNext);
+      DictionaryUtils.generateSchemaMessages(
+          root.getSchema(), descriptor, dictionaries, option, responseObserver::onNext);
     } catch (RuntimeException e) {
-      // Propagate runtime exceptions, like those raised when trying to write unions with V4 metadata
+      // Propagate runtime exceptions, like those raised when trying to write unions with V4
+      // metadata
       throw e;
     } catch (Exception e) {
-      // Only happens if closing buffers somehow fails - indicates application is an unknown state so propagate
+      // Only happens if closing buffers somehow fails - indicates application is an unknown state
+      // so propagate
       // the exception
       throw new RuntimeException("Could not generate and send all schema messages", e);
     }
@@ -87,19 +86,27 @@ public void putNext() {
   @Override
   public void putNext(ArrowBuf metadata) {
     if (unloader == null) {
-      throw CallStatus.INTERNAL.withDescription("Stream was not started, call start()").toRuntimeException();
+      throw CallStatus.INTERNAL
+          .withDescription("Stream was not started, call start()")
+          .toRuntimeException();
     }
 
     waitUntilStreamReady();
-    // close is a no-op if the message has been written to gRPC, otherwise frees the associated buffers
-    // in some code paths (e.g. if the call is cancelled), gRPC does not write the message, so we need to clean up
-    // ourselves. Normally, writing the ArrowMessage will transfer ownership of the data to gRPC/Netty.
-    try (final ArrowMessage message = new ArrowMessage(unloader.getRecordBatch(), metadata, tryZeroCopy, option)) {
+    // close is a no-op if the message has been written to gRPC, otherwise frees the associated
+    // buffers
+    // in some code paths (e.g. if the call is cancelled), gRPC does not write the message, so we
+    // need to clean up
+    // ourselves. Normally, writing the ArrowMessage will transfer ownership of the data to
+    // gRPC/Netty.
+    try (final ArrowMessage message =
+        new ArrowMessage(unloader.getRecordBatch(), metadata, tryZeroCopy, option)) {
       responseObserver.onNext(message);
     } catch (Exception e) {
       // This exception comes from ArrowMessage#close, not responseObserver#onNext.
-      // Generally this should not happen - ArrowMessage's implementation only closes non-throwing things.
-      // The user can't reasonably do anything about this, but if something does throw, we shouldn't let
+      // Generally this should not happen - ArrowMessage's implementation only closes non-throwing
+      // things.
+      // The user can't reasonably do anything about this, but if something does throw, we shouldn't
+      // let
       // execution continue since other state (e.g. allocators) may be in an odd state.
       throw new RuntimeException("Could not free ArrowMessage", e);
     }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/PollInfo.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/PollInfo.java
index 59150d8814cd9..906bb5385241b 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/PollInfo.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/PollInfo.java
@@ -14,24 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
+import com.google.protobuf.Timestamp;
+import com.google.protobuf.util.Timestamps;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.ByteBuffer;
 import java.time.Instant;
 import java.util.Objects;
 import java.util.Optional;
-
 import org.apache.arrow.flight.impl.Flight;
 
-import com.google.protobuf.Timestamp;
-import com.google.protobuf.util.Timestamps;
-
-/**
- * A POJO representation of the execution of a long-running query.
- */
+/** A POJO representation of the execution of a long-running query. */
 public class PollInfo {
   private final FlightInfo flightInfo;
   private final FlightDescriptor flightDescriptor;
@@ -42,11 +37,17 @@ public class PollInfo {
    * Create a new PollInfo.
    *
    * @param flightInfo The FlightInfo (must not be null).
-   * @param flightDescriptor The descriptor used to poll for more information; null if and only if query is finished.
+   * @param flightDescriptor The descriptor used to poll for more information; null if and only if
+   *     query is finished.
    * @param progress Optional progress info in [0.0, 1.0].
-   * @param expirationTime An expiration time, after which the server may no longer recognize the descriptor.
+   * @param expirationTime An expiration time, after which the server may no longer recognize the
+   *     descriptor.
    */
-  public PollInfo(FlightInfo flightInfo, FlightDescriptor flightDescriptor, Double progress, Instant expirationTime) {
+  public PollInfo(
+      FlightInfo flightInfo,
+      FlightDescriptor flightDescriptor,
+      Double progress,
+      Instant expirationTime) {
     this.flightInfo = Objects.requireNonNull(flightInfo);
     this.flightDescriptor = flightDescriptor;
     this.progress = progress;
@@ -55,19 +56,22 @@ public PollInfo(FlightInfo flightInfo, FlightDescriptor flightDescriptor, Double
 
   PollInfo(Flight.PollInfo flt) throws URISyntaxException {
     this.flightInfo = new FlightInfo(flt.getInfo());
-    this.flightDescriptor = flt.hasFlightDescriptor() ? new FlightDescriptor(flt.getFlightDescriptor()) : null;
+    this.flightDescriptor =
+        flt.hasFlightDescriptor() ? new FlightDescriptor(flt.getFlightDescriptor()) : null;
     this.progress = flt.hasProgress() ? flt.getProgress() : null;
-    this.expirationTime = flt.hasExpirationTime() ?
-        Instant.ofEpochSecond(flt.getExpirationTime().getSeconds(), Timestamps.toNanos(flt.getExpirationTime())) :
-        null;
+    this.expirationTime =
+        flt.hasExpirationTime()
+            ? Instant.ofEpochSecond(
+                flt.getExpirationTime().getSeconds(), Timestamps.toNanos(flt.getExpirationTime()))
+            : null;
   }
 
   /**
    * The FlightInfo describing the result set of the execution of a query.
    *
-   * <p>This is always present and always contains all endpoints for the query execution so far,
-   * not just new endpoints that completed execution since the last call to
-   * {@link FlightClient#pollInfo(FlightDescriptor, CallOption...)}.
+   * <p>This is always present and always contains all endpoints for the query execution so far, not
+   * just new endpoints that completed execution since the last call to {@link
+   * FlightClient#pollInfo(FlightDescriptor, CallOption...)}.
    */
   public FlightInfo getFlightInfo() {
     return flightInfo;
@@ -76,7 +80,7 @@ public FlightInfo getFlightInfo() {
   /**
    * The FlightDescriptor that should be used to get further updates on this query.
    *
-   * <p>It is present if and only if the query is still running.  If present, it should be passed to
+   * <p>It is present if and only if the query is still running. If present, it should be passed to
    * {@link FlightClient#pollInfo(FlightDescriptor, CallOption...)} to get an update.
    */
   public Optional<FlightDescriptor> getFlightDescriptor() {
@@ -86,7 +90,8 @@ public Optional<FlightDescriptor> getFlightDescriptor() {
   /**
    * The progress of the query.
    *
-   * <p>If present, should be a value in [0.0, 1.0]. It is not necessarily monotonic or non-decreasing.
+   * <p>If present, should be a value in [0.0, 1.0]. It is not necessarily monotonic or
+   * non-decreasing.
    */
   public Optional<Double> getProgress() {
     return Optional.ofNullable(progress);
@@ -95,8 +100,8 @@ public Optional<Double> getProgress() {
   /**
    * The expiration time of the query execution.
    *
-   * <p>After this passes, the server may not recognize the descriptor anymore and the client will not
-   * be able to track the query anymore.
+   * <p>After this passes, the server may not recognize the descriptor anymore and the client will
+   * not be able to track the query anymore.
    */
   public Optional<Instant> getExpirationTime() {
     return Optional.ofNullable(expirationTime);
@@ -139,10 +144,10 @@ public boolean equals(Object o) {
       return false;
     }
     PollInfo pollInfo = (PollInfo) o;
-    return Objects.equals(getFlightInfo(), pollInfo.getFlightInfo()) &&
-        Objects.equals(getFlightDescriptor(), pollInfo.getFlightDescriptor()) &&
-        Objects.equals(getProgress(), pollInfo.getProgress()) &&
-        Objects.equals(getExpirationTime(), pollInfo.getExpirationTime());
+    return Objects.equals(getFlightInfo(), pollInfo.getFlightInfo())
+        && Objects.equals(getFlightDescriptor(), pollInfo.getFlightDescriptor())
+        && Objects.equals(getProgress(), pollInfo.getProgress())
+        && Objects.equals(getExpirationTime(), pollInfo.getExpirationTime());
   }
 
   @Override
@@ -152,11 +157,15 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return "PollInfo{" +
-        "flightInfo=" + flightInfo +
-        ", flightDescriptor=" + flightDescriptor +
-        ", progress=" + progress +
-        ", expirationTime=" + expirationTime +
-        '}';
+    return "PollInfo{"
+        + "flightInfo="
+        + flightInfo
+        + ", flightDescriptor="
+        + flightDescriptor
+        + ", progress="
+        + progress
+        + ", expirationTime="
+        + expirationTime
+        + '}';
   }
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/PutResult.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/PutResult.java
index 862401312b4b8..c0bf6549339d7 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/PutResult.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/PutResult.java
@@ -14,16 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
+import com.google.protobuf.ByteString;
 import org.apache.arrow.flight.impl.Flight;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.ReferenceManager;
 
-import com.google.protobuf.ByteString;
-
 /**
  * A message from the server during a DoPut operation.
  *
@@ -57,8 +55,8 @@ public static PutResult empty() {
   /**
    * Get the metadata in this message. May be null.
    *
-   * <p>Ownership of the {@link ArrowBuf} is retained by this object. Call {@link ReferenceManager#retain()} to preserve
-   * a reference.
+   * <p>Ownership of the {@link ArrowBuf} is retained by this object. Call {@link
+   * ReferenceManager#retain()} to preserve a reference.
    */
   public ArrowBuf getApplicationMetadata() {
     return applicationMetadata;
@@ -68,22 +66,28 @@ Flight.PutResult toProtocol() {
     if (applicationMetadata == null) {
       return Flight.PutResult.getDefaultInstance();
     }
-    return Flight.PutResult.newBuilder().setAppMetadata(ByteString.copyFrom(applicationMetadata.nioBuffer())).build();
+    return Flight.PutResult.newBuilder()
+        .setAppMetadata(ByteString.copyFrom(applicationMetadata.nioBuffer()))
+        .build();
   }
 
   /**
    * Construct a PutResult from a Protobuf message.
    *
-   * @param allocator The allocator to use for allocating application metadata memory. The result object owns the
-   *     allocated buffer, if any.
+   * @param allocator The allocator to use for allocating application metadata memory. The result
+   *     object owns the allocated buffer, if any.
    * @param message The gRPC/Protobuf message.
    */
   static PutResult fromProtocol(BufferAllocator allocator, Flight.PutResult message) {
     final ArrowBuf buf = allocator.buffer(message.getAppMetadata().size());
-    message.getAppMetadata().asReadOnlyByteBufferList().forEach(bb -> {
-      buf.setBytes(buf.writerIndex(), bb);
-      buf.writerIndex(buf.writerIndex() + bb.limit());
-    });
+    message
+        .getAppMetadata()
+        .asReadOnlyByteBufferList()
+        .forEach(
+            bb -> {
+              buf.setBytes(buf.writerIndex(), bb);
+              buf.writerIndex(buf.writerIndex() + bb.limit());
+            });
     return new PutResult(buf);
   }
 
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/RenewFlightEndpointRequest.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/RenewFlightEndpointRequest.java
index ea233ff5ab0c2..f6c02a167bd85 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/RenewFlightEndpointRequest.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/RenewFlightEndpointRequest.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.ByteBuffer;
 import java.util.Objects;
-
 import org.apache.arrow.flight.impl.Flight;
 
 /** A request to extend the expiration time of a FlightEndpoint. */
@@ -49,7 +47,8 @@ Flight.RenewFlightEndpointRequest toProtocol() {
   /**
    * Get the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight types.
+   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight
+   * types.
    */
   public ByteBuffer serialize() {
     return ByteBuffer.wrap(toProtocol().toByteArray());
@@ -58,13 +57,15 @@ public ByteBuffer serialize() {
   /**
    * Parse the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from non-Flight services.
+   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from
+   * non-Flight services.
    *
    * @param serialized The serialized form of the message, as returned by {@link #serialize()}.
    * @return The deserialized message.
    * @throws IOException if the serialized form is invalid.
    */
-  public static RenewFlightEndpointRequest deserialize(ByteBuffer serialized) throws IOException, URISyntaxException {
+  public static RenewFlightEndpointRequest deserialize(ByteBuffer serialized)
+      throws IOException, URISyntaxException {
     return new RenewFlightEndpointRequest(Flight.RenewFlightEndpointRequest.parseFrom(serialized));
   }
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/RequestContext.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/RequestContext.java
index 5117d05c2d28d..e453e2f2642be 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/RequestContext.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/RequestContext.java
@@ -14,17 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.util.Set;
 
-/**
- * Tracks variables about the current request.
- */
+/** Tracks variables about the current request. */
 public interface RequestContext {
   /**
    * Register a variable and a value.
+   *
    * @param key the variable name.
    * @param value the value.
    */
@@ -32,6 +30,7 @@ public interface RequestContext {
 
   /**
    * Retrieve a registered variable.
+   *
    * @param key the variable name.
    * @return the value, or null if not found.
    */
@@ -39,12 +38,14 @@ public interface RequestContext {
 
   /**
    * Retrieves the keys that have been registered to this context.
+   *
    * @return the keys used in this context.
    */
   Set<String> keySet();
 
   /**
    * Deletes a registered variable.
+   *
    * @return the value associated with the deleted variable, or null if the key doesn't exist.
    */
   String remove(String key);
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Result.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Result.java
index 5d6ce485d65af..143951f8bc196 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Result.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Result.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
-import org.apache.arrow.flight.impl.Flight;
-
 import com.google.protobuf.ByteString;
+import org.apache.arrow.flight.impl.Flight;
 
 /**
  * Opaque result returned after executing an action.
@@ -43,8 +41,6 @@ public byte[] getBody() {
   }
 
   Flight.Result toProtocol() {
-    return Flight.Result.newBuilder()
-        .setBody(ByteString.copyFrom(body))
-        .build();
+    return Flight.Result.newBuilder().setBody(ByteString.copyFrom(body)).build();
   }
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SchemaResult.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SchemaResult.java
index 8becb85b8d32c..ee837dad11061 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SchemaResult.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SchemaResult.java
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
+import com.fasterxml.jackson.databind.util.ByteBufferBackedInputStream;
+import com.google.common.collect.ImmutableList;
+import com.google.protobuf.ByteString;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
 import java.util.Objects;
-
 import org.apache.arrow.flight.impl.Flight;
 import org.apache.arrow.vector.ipc.ReadChannel;
 import org.apache.arrow.vector.ipc.WriteChannel;
@@ -31,10 +32,6 @@
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.arrow.vector.validate.MetadataV4UnionChecker;
 
-import com.fasterxml.jackson.databind.util.ByteBufferBackedInputStream;
-import com.google.common.collect.ImmutableList;
-import com.google.protobuf.ByteString;
-
 /**
  * Opaque result returned after executing a getSchema request.
  *
@@ -49,9 +46,7 @@ public SchemaResult(Schema schema) {
     this(schema, IpcOption.DEFAULT);
   }
 
-  /**
-   * Create a schema result with specific IPC options for serialization.
-   */
+  /** Create a schema result with specific IPC options for serialization. */
   public SchemaResult(Schema schema, IpcOption option) {
     Objects.requireNonNull(schema);
     MetadataV4UnionChecker.checkForUnion(schema.getFields().iterator(), option.metadataVersion);
@@ -63,9 +58,7 @@ public Schema getSchema() {
     return schema;
   }
 
-  /**
-   * Converts to the protocol buffer representation.
-   */
+  /** Converts to the protocol buffer representation. */
   Flight.SchemaResult toProtocol() {
     // Encode schema in a Message payload
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -75,20 +68,18 @@ Flight.SchemaResult toProtocol() {
       throw new RuntimeException(e);
     }
     return Flight.SchemaResult.newBuilder()
-            .setSchema(ByteString.copyFrom(baos.toByteArray()))
-            .build();
-
+        .setSchema(ByteString.copyFrom(baos.toByteArray()))
+        .build();
   }
 
-  /**
-   * Converts from the protocol buffer representation.
-   */
+  /** Converts from the protocol buffer representation. */
   static SchemaResult fromProtocol(Flight.SchemaResult pbSchemaResult) {
     try {
       final ByteBuffer schemaBuf = pbSchemaResult.getSchema().asReadOnlyByteBuffer();
-      Schema schema = pbSchemaResult.getSchema().size() > 0 ?
-              MessageSerializer.deserializeSchema(
-                      new ReadChannel(Channels.newChannel(new ByteBufferBackedInputStream(schemaBuf))))
+      Schema schema =
+          pbSchemaResult.getSchema().size() > 0
+              ? MessageSerializer.deserializeSchema(
+                  new ReadChannel(Channels.newChannel(new ByteBufferBackedInputStream(schemaBuf))))
               : new Schema(ImmutableList.of());
       return new SchemaResult(schema);
     } catch (IOException e) {
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ServerHeaderMiddleware.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ServerHeaderMiddleware.java
index 527c3128c65ec..23c1f46d793b0 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ServerHeaderMiddleware.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ServerHeaderMiddleware.java
@@ -14,26 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
-/**
- * Middleware that's used to extract and pass headers to the server during requests.
- */
+/** Middleware that's used to extract and pass headers to the server during requests. */
 public class ServerHeaderMiddleware implements FlightServerMiddleware {
-  /**
-   * Factory for accessing ServerHeaderMiddleware.
-   */
+  /** Factory for accessing ServerHeaderMiddleware. */
   public static class Factory implements FlightServerMiddleware.Factory<ServerHeaderMiddleware> {
-    /**
-     * Construct a factory for receiving call headers.
-     */
-    public Factory() {
-    }
+    /** Construct a factory for receiving call headers. */
+    public Factory() {}
 
     @Override
-    public ServerHeaderMiddleware onCallStarted(CallInfo callInfo, CallHeaders incomingHeaders,
-                                                RequestContext context) {
+    public ServerHeaderMiddleware onCallStarted(
+        CallInfo callInfo, CallHeaders incomingHeaders, RequestContext context) {
       return new ServerHeaderMiddleware(incomingHeaders);
     }
   }
@@ -44,22 +36,17 @@ private ServerHeaderMiddleware(CallHeaders incomingHeaders) {
     this.headers = incomingHeaders;
   }
 
-  /**
-   * Retrieve the headers for this call.
-   */
+  /** Retrieve the headers for this call. */
   public CallHeaders headers() {
     return headers;
   }
 
   @Override
-  public void onBeforeSendingHeaders(CallHeaders outgoingHeaders) {
-  }
+  public void onBeforeSendingHeaders(CallHeaders outgoingHeaders) {}
 
   @Override
-  public void onCallCompleted(CallStatus status) {
-  }
+  public void onCallCompleted(CallStatus status) {}
 
   @Override
-  public void onCallErrored(Throwable err) {
-  }
+  public void onCallErrored(Throwable err) {}
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ServerSessionMiddleware.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ServerSessionMiddleware.java
index 7091caa5e98bc..47fd6f1366272 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ServerSessionMiddleware.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ServerSessionMiddleware.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.util.Collections;
@@ -24,11 +23,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-/**
- * Middleware for handling Flight SQL Sessions including session cookie handling.
- *
- * Currently experimental.
- */
+/** Middleware for handling Flight SQL Sessions including session cookie handling. */
 public class ServerSessionMiddleware implements FlightServerMiddleware {
   Factory factory;
   boolean existingSession;
@@ -37,18 +32,15 @@ public class ServerSessionMiddleware implements FlightServerMiddleware {
 
   public static final String sessionCookieName = "arrow_flight_session_id";
 
-  /**
-   * Factory for managing and accessing ServerSessionMiddleware.
-   */
+  /** Factory for managing and accessing ServerSessionMiddleware. */
   public static class Factory implements FlightServerMiddleware.Factory<ServerSessionMiddleware> {
-    private final ConcurrentMap<String, Session> sessionStore =
-        new ConcurrentHashMap<>();
+    private final ConcurrentMap<String, Session> sessionStore = new ConcurrentHashMap<>();
     private final Callable<String> idGenerator;
 
     /**
      * Construct a factory for ServerSessionMiddleware.
      *
-     * Factory manages and accesses persistent sessions based on HTTP cookies.
+     * <p>Factory manages and accesses persistent sessions based on HTTP cookies.
      *
      * @param idGenerator A Callable returning unique session id Strings.
      */
@@ -61,7 +53,8 @@ private synchronized Session createNewSession() {
       try {
         id = idGenerator.call();
       } catch (Exception ignored) {
-        // Most impls aren't going to throw so don't make caller handle a nonexistent checked exception
+        // Most impls aren't going to throw so don't make caller handle a nonexistent checked
+        // exception
         throw CallStatus.INTERNAL.withDescription("Session creation error").toRuntimeException();
       }
 
@@ -75,13 +68,15 @@ private synchronized Session createNewSession() {
 
     private void closeSession(String id) {
       if (sessionStore.remove(id) == null) {
-        throw CallStatus.NOT_FOUND.withDescription("Session id '" + id + "' not found.").toRuntimeException();
+        throw CallStatus.NOT_FOUND
+            .withDescription("Session id '" + id + "' not found.")
+            .toRuntimeException();
       }
     }
 
     @Override
-    public ServerSessionMiddleware onCallStarted(CallInfo callInfo, CallHeaders incomingHeaders,
-                                                RequestContext context) {
+    public ServerSessionMiddleware onCallStarted(
+        CallInfo callInfo, CallHeaders incomingHeaders, RequestContext context) {
       String sessionId = null;
 
       final Iterable<String> it = incomingHeaders.getAll("cookie");
@@ -111,17 +106,18 @@ public ServerSessionMiddleware onCallStarted(CallInfo callInfo, CallHeaders inco
       Session session = sessionStore.get(sessionId);
       // Cookie provided by caller, but invalid
       if (session == null) {
-        // Can't soft-fail/proceed here, clients will get unexpected behaviour without options they thought were set.
-        throw CallStatus.NOT_FOUND.withDescription("Invalid " + sessionCookieName + " cookie.").toRuntimeException();
+        // Can't soft-fail/proceed here, clients will get unexpected behaviour without options they
+        // thought were set.
+        throw CallStatus.NOT_FOUND
+            .withDescription("Invalid " + sessionCookieName + " cookie.")
+            .toRuntimeException();
       }
 
       return new ServerSessionMiddleware(this, incomingHeaders, session);
     }
   }
 
-  /**
-   * A thread-safe container for named SessionOptionValues.
-   */
+  /** A thread-safe container for named SessionOptionValues. */
   public static class Session {
     public final String id;
     private ConcurrentMap<String, SessionOptionValue> sessionData =
@@ -151,7 +147,7 @@ public void setSessionOption(String name, SessionOptionValue value) {
       sessionData.put(name, value);
     }
 
-    /** Idempotently  remove name from this session. */
+    /** Idempotently remove name from this session. */
     public void eraseSessionOption(String name) {
       sessionData.remove(name);
     }
@@ -159,8 +155,8 @@ public void eraseSessionOption(String name) {
 
   private final CallHeaders headers;
 
-  private ServerSessionMiddleware(ServerSessionMiddleware.Factory factory,
-                                  CallHeaders incomingHeaders, Session session) {
+  private ServerSessionMiddleware(
+      ServerSessionMiddleware.Factory factory, CallHeaders incomingHeaders, Session session) {
     this.factory = factory;
     headers = incomingHeaders;
     this.session = session;
@@ -192,11 +188,13 @@ public synchronized Session getSession() {
   /**
    * Close the current session.
    *
-   * It is an error to call this without a valid session specified via cookie or equivalent.
-   * */
+   * <p>It is an error to call this without a valid session specified via cookie or equivalent.
+   */
   public synchronized void closeSession() {
     if (session == null) {
-      throw CallStatus.NOT_FOUND.withDescription("No session found for the current call.").toRuntimeException();
+      throw CallStatus.NOT_FOUND
+          .withDescription("No session found for the current call.")
+          .toRuntimeException();
     }
     factory.closeSession(session.id);
     closedSessionId = session.id;
@@ -213,15 +211,14 @@ public void onBeforeSendingHeaders(CallHeaders outgoingHeaders) {
       outgoingHeaders.insert("set-cookie", sessionCookieName + "=" + session.id);
     }
     if (closedSessionId != null) {
-      outgoingHeaders.insert("set-cookie", sessionCookieName + "=" + closedSessionId + "; Max-Age=0");
+      outgoingHeaders.insert(
+          "set-cookie", sessionCookieName + "=" + closedSessionId + "; Max-Age=0");
     }
   }
 
   @Override
-  public void onCallCompleted(CallStatus status) {
-  }
+  public void onCallCompleted(CallStatus status) {}
 
   @Override
-  public void onCallErrored(Throwable err) {
-  }
+  public void onCallErrored(Throwable err) {}
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SessionOptionValue.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SessionOptionValue.java
index db22c736be182..5f342501fb0ad 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SessionOptionValue.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SessionOptionValue.java
@@ -14,23 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.util.Arrays;
-
 import org.apache.arrow.flight.impl.Flight;
 
-/**
- * A union-like container interface for supported session option value types.
- */
+/** A union-like container interface for supported session option value types. */
 public abstract class SessionOptionValue {
-  SessionOptionValue() {
-  }
+  SessionOptionValue() {}
 
-  /**
-   * Value access via a caller-provided visitor/functor.
-   */
+  /** Value access via a caller-provided visitor/functor. */
   public abstract <T> T acceptVisitor(SessionOptionValueVisitor<T> v);
 
   Flight.SessionOptionValue toProtocol() {
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SessionOptionValueFactory.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SessionOptionValueFactory.java
index 47c82fa7bb7fd..aff7dffddd487 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SessionOptionValueFactory.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SessionOptionValueFactory.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-
 import org.apache.arrow.flight.impl.Flight;
 
 /** Abstract factory for concrete SessionOptionValue instances. */
@@ -60,9 +58,12 @@ public static SessionOptionValue makeSessionOptionValue(Flight.SessionOptionValu
       case DOUBLE_VALUE:
         return new SessionOptionValueDouble(proto.getDoubleValue());
       case STRING_LIST_VALUE:
-        // Using ByteString::toByteArray() here otherwise we still somehow get `ByteArray`s with broken .equals(String)
-        return new SessionOptionValueStringList(proto.getStringListValue().getValuesList().asByteStringList().stream()
-            .map((e) -> new String(e.toByteArray(), StandardCharsets.UTF_8)).toArray(String[]::new));
+        // Using ByteString::toByteArray() here otherwise we still somehow get `ByteArray`s with
+        // broken .equals(String)
+        return new SessionOptionValueStringList(
+            proto.getStringListValue().getValuesList().asByteStringList().stream()
+                .map((e) -> new String(e.toByteArray(), StandardCharsets.UTF_8))
+                .toArray(String[]::new));
       case OPTIONVALUE_NOT_SET:
         return new SessionOptionValueEmpty();
       default:
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SessionOptionValueVisitor.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SessionOptionValueVisitor.java
index f2178224a0d29..324219f2eae51 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SessionOptionValueVisitor.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SessionOptionValueVisitor.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 /**
@@ -23,36 +22,26 @@
  * @param <T> Return type of the visit operation.
  */
 public interface SessionOptionValueVisitor<T> {
-  /**
-   * A callback to handle SessionOptionValue containing a String.
-   */
+  /** A callback to handle SessionOptionValue containing a String. */
   T visit(String value);
 
-  /**
-   * A callback to handle SessionOptionValue containing a boolean.
-   */
+  /** A callback to handle SessionOptionValue containing a boolean. */
   T visit(boolean value);
 
-  /**
-   * A callback to handle SessionOptionValue containing a long.
-   */
+  /** A callback to handle SessionOptionValue containing a long. */
   T visit(long value);
 
-  /**
-   * A callback to handle SessionOptionValue containing a double.
-   */
+  /** A callback to handle SessionOptionValue containing a double. */
   T visit(double value);
 
-  /**
-   * A callback to handle SessionOptionValue containing an array of String.
-   */
+  /** A callback to handle SessionOptionValue containing an array of String. */
   T visit(String[] value);
 
   /**
    * A callback to handle SessionOptionValue containing no value.
    *
-   * By convention, an attempt to set a valueless SessionOptionValue should
-   * attempt to unset or clear the named option value on the server.
+   * <p>By convention, an attempt to set a valueless SessionOptionValue should attempt to unset or
+   * clear the named option value on the server.
    */
   T visit(Void value);
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SetSessionOptionsRequest.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SetSessionOptionsRequest.java
index 8a5253e682162..2bd5718eb5070 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SetSessionOptionsRequest.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SetSessionOptionsRequest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.io.IOException;
@@ -23,7 +22,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.flight.impl.Flight;
 
 /** A request to set option(s) in an existing or implicitly-created server session. */
@@ -31,13 +29,18 @@ public class SetSessionOptionsRequest {
   private final Map<String, SessionOptionValue> sessionOptions;
 
   public SetSessionOptionsRequest(Map<String, SessionOptionValue> sessionOptions) {
-    this.sessionOptions = Collections.unmodifiableMap(new HashMap<String, SessionOptionValue>(sessionOptions));
+    this.sessionOptions =
+        Collections.unmodifiableMap(new HashMap<String, SessionOptionValue>(sessionOptions));
   }
 
   SetSessionOptionsRequest(Flight.SetSessionOptionsRequest proto) {
-    sessionOptions = Collections.unmodifiableMap(
-        proto.getSessionOptionsMap().entrySet().stream().collect(Collectors.toMap(
-            Map.Entry::getKey, (e) -> SessionOptionValueFactory.makeSessionOptionValue(e.getValue()))));
+    sessionOptions =
+        Collections.unmodifiableMap(
+            proto.getSessionOptionsMap().entrySet().stream()
+                .collect(
+                    Collectors.toMap(
+                        Map.Entry::getKey,
+                        (e) -> SessionOptionValueFactory.makeSessionOptionValue(e.getValue()))));
   }
 
   /**
@@ -51,15 +54,17 @@ public Map<String, SessionOptionValue> getSessionOptions() {
 
   Flight.SetSessionOptionsRequest toProtocol() {
     Flight.SetSessionOptionsRequest.Builder b = Flight.SetSessionOptionsRequest.newBuilder();
-    b.putAllSessionOptions(sessionOptions.entrySet().stream().collect(Collectors.toMap(
-        Map.Entry::getKey, (e) -> e.getValue().toProtocol())));
+    b.putAllSessionOptions(
+        sessionOptions.entrySet().stream()
+            .collect(Collectors.toMap(Map.Entry::getKey, (e) -> e.getValue().toProtocol())));
     return b.build();
   }
 
   /**
    * Get the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight types.
+   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight
+   * types.
    */
   public ByteBuffer serialize() {
     return ByteBuffer.wrap(toProtocol().toByteArray());
@@ -68,7 +73,8 @@ public ByteBuffer serialize() {
   /**
    * Parse the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from non-Flight services.
+   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from
+   * non-Flight services.
    *
    * @param serialized The serialized form of the message, as returned by {@link #serialize()}.
    * @return The deserialized message.
@@ -77,5 +83,4 @@ public ByteBuffer serialize() {
   public static SetSessionOptionsRequest deserialize(ByteBuffer serialized) throws IOException {
     return new SetSessionOptionsRequest(Flight.SetSessionOptionsRequest.parseFrom(serialized));
   }
-
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SetSessionOptionsResult.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SetSessionOptionsResult.java
index 14d53cc6767e0..8ea953fda3cd0 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SetSessionOptionsResult.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SetSessionOptionsResult.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.io.IOException;
@@ -23,7 +22,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.flight.impl.Flight;
 
 /** The result of attempting to set a set of session options. */
@@ -31,22 +29,15 @@ public class SetSessionOptionsResult {
   /** Error status value for per-option errors. */
   public enum ErrorValue {
     /**
-     * The status of setting the option is unknown. Servers should avoid using this value
-     * (send a NOT_FOUND error if the requested session is not known). Clients can retry
-     * the request.
-      */
-    UNSPECIFIED,
-    /**
-     * The given session option name is invalid.
+     * The status of setting the option is unknown. Servers should avoid using this value (send a
+     * NOT_FOUND error if the requested session is not known). Clients can retry the request.
      */
+    UNSPECIFIED,
+    /** The given session option name is invalid. */
     INVALID_NAME,
-    /**
-     * The session option value or type is invalid.
-     */
+    /** The session option value or type is invalid. */
     INVALID_VALUE,
-    /**
-     * The session option cannot be set.
-     */
+    /** The session option cannot be set. */
     ERROR,
     ;
 
@@ -72,7 +63,8 @@ public Error(ErrorValue value) {
     }
 
     Flight.SetSessionOptionsResult.Error toProtocol() {
-      Flight.SetSessionOptionsResult.Error.Builder b = Flight.SetSessionOptionsResult.Error.newBuilder();
+      Flight.SetSessionOptionsResult.Error.Builder b =
+          Flight.SetSessionOptionsResult.Error.newBuilder();
       b.setValue(value.toProtocol());
       return b.build();
     }
@@ -102,8 +94,10 @@ public SetSessionOptionsResult(Map<String, Error> errors) {
   }
 
   SetSessionOptionsResult(Flight.SetSessionOptionsResult proto) {
-    errors = Collections.unmodifiableMap(proto.getErrors().entrySet().stream().collect(
-        Collectors.toMap(Map.Entry::getKey, (e) -> new Error(e.getValue()))));
+    errors =
+        Collections.unmodifiableMap(
+            proto.getErrors().entrySet().stream()
+                .collect(Collectors.toMap(Map.Entry::getKey, (e) -> new Error(e.getValue()))));
   }
 
   /** Report whether the error map has nonzero length. */
@@ -122,16 +116,17 @@ public Map<String, Error> getErrors() {
 
   Flight.SetSessionOptionsResult toProtocol() {
     Flight.SetSessionOptionsResult.Builder b = Flight.SetSessionOptionsResult.newBuilder();
-    b.putAllErrors(errors.entrySet().stream().collect(Collectors.toMap(
-        Map.Entry::getKey,
-        (e) -> e.getValue().toProtocol())));
+    b.putAllErrors(
+        errors.entrySet().stream()
+            .collect(Collectors.toMap(Map.Entry::getKey, (e) -> e.getValue().toProtocol())));
     return b.build();
   }
 
   /**
    * Get the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight types.
+   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight
+   * types.
    */
   public ByteBuffer serialize() {
     return ByteBuffer.wrap(toProtocol().toByteArray());
@@ -140,7 +135,8 @@ public ByteBuffer serialize() {
   /**
    * Parse the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from non-Flight services.
+   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from
+   * non-Flight services.
    *
    * @param serialized The serialized form of the message, as returned by {@link #serialize()}.
    * @return The deserialized message.
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/StreamPipe.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/StreamPipe.java
index d506914d58809..3e8d097da6751 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/StreamPipe.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/StreamPipe.java
@@ -14,21 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
+import io.grpc.stub.StreamObserver;
 import java.util.function.Consumer;
 import java.util.function.Function;
-
 import org.apache.arrow.flight.FlightProducer.StreamListener;
 import org.apache.arrow.flight.grpc.StatusUtils;
 import org.apache.arrow.util.AutoCloseables;
 
-import io.grpc.stub.StreamObserver;
-
 /**
  * Shim listener to avoid exposing GRPC internals.
-
+ *
  * @param <FROM> From Type
  * @param <TO> To Type
  */
@@ -45,17 +42,19 @@ class StreamPipe<FROM, TO> implements StreamListener<FROM> {
    *
    * @param delegate The {@link StreamObserver} to wrap.
    * @param func The transformation function.
-   * @param errorHandler A handler for uncaught exceptions (e.g. if something tries to double-close this stream).
+   * @param errorHandler A handler for uncaught exceptions (e.g. if something tries to double-close
+   *     this stream).
    * @param <FROM> The source type.
    * @param <TO> The output type.
    * @return A wrapped listener.
    */
-  public static <FROM, TO> StreamPipe<FROM, TO> wrap(StreamObserver<TO> delegate, Function<FROM, TO> func,
-      Consumer<Throwable> errorHandler) {
+  public static <FROM, TO> StreamPipe<FROM, TO> wrap(
+      StreamObserver<TO> delegate, Function<FROM, TO> func, Consumer<Throwable> errorHandler) {
     return new StreamPipe<>(delegate, func, errorHandler);
   }
 
-  public StreamPipe(StreamObserver<TO> delegate, Function<FROM, TO> func, Consumer<Throwable> errorHandler) {
+  public StreamPipe(
+      StreamObserver<TO> delegate, Function<FROM, TO> func, Consumer<Throwable> errorHandler) {
     super();
     this.delegate = delegate;
     this.mapFunction = func;
@@ -107,9 +106,7 @@ public void onCompleted() {
     }
   }
 
-  /**
-   * Ensure this stream has been completed.
-   */
+  /** Ensure this stream has been completed. */
   void ensureCompleted() {
     if (!closed) {
       onCompleted();
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SyncPutListener.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SyncPutListener.java
index 730cf4924b3eb..0dd460f1fd02f 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SyncPutListener.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SyncPutListener.java
@@ -14,20 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.flight.grpc.StatusUtils;
 import org.apache.arrow.memory.ArrowBuf;
 
 /**
- * A listener for server-sent application metadata messages during a Flight DoPut. This class wraps the messages in a
- * synchronous interface.
+ * A listener for server-sent application metadata messages during a Flight DoPut. This class wraps
+ * the messages in a synchronous interface.
  */
 public final class SyncPutListener implements FlightClient.PutListener, AutoCloseable {
 
@@ -55,8 +53,8 @@ private PutResult unwrap(Object queueItem) throws InterruptedException, Executio
   /**
    * Get the next message from the server, blocking until it is available.
    *
-   * @return The next message, or null if the server is done sending messages. The caller assumes ownership of the
-   *     metadata and must remember to close it.
+   * @return The next message, or null if the server is done sending messages. The caller assumes
+   *     ownership of the metadata and must remember to close it.
    * @throws InterruptedException if interrupted while waiting.
    * @throws ExecutionException if the server sent an error, or if there was an internal error.
    */
@@ -65,14 +63,17 @@ public PutResult read() throws InterruptedException, ExecutionException {
   }
 
   /**
-   * Get the next message from the server, blocking for the specified amount of time until it is available.
+   * Get the next message from the server, blocking for the specified amount of time until it is
+   * available.
    *
-   * @return The next message, or null if the server is done sending messages or no message arrived before the timeout.
-   *     The caller assumes ownership of the metadata and must remember to close it.
+   * @return The next message, or null if the server is done sending messages or no message arrived
+   *     before the timeout. The caller assumes ownership of the metadata and must remember to close
+   *     it.
    * @throws InterruptedException if interrupted while waiting.
    * @throws ExecutionException if the server sent an error, or if there was an internal error.
    */
-  public PutResult poll(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException {
+  public PutResult poll(long timeout, TimeUnit unit)
+      throws InterruptedException, ExecutionException {
     return unwrap(queue.poll(timeout, unit));
   }
 
@@ -108,11 +109,12 @@ public void onCompleted() {
 
   @Override
   public void close() {
-    queue.forEach(o -> {
-      if (o instanceof PutResult) {
-        ((PutResult) o).close();
-      }
-    });
+    queue.forEach(
+        o -> {
+          if (o instanceof PutResult) {
+            ((PutResult) o).close();
+          }
+        });
   }
 
   @Override
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Ticket.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Ticket.java
index eb2f4af70d781..4a7fcda99f7b1 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Ticket.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/Ticket.java
@@ -14,20 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
+import com.google.protobuf.ByteString;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-
 import org.apache.arrow.flight.impl.Flight;
 
-import com.google.protobuf.ByteString;
-
-/**
- * Endpoint for a particular stream.
- */
+/** Endpoint for a particular stream. */
 public class Ticket {
   private final byte[] bytes;
 
@@ -45,15 +40,14 @@ public byte[] getBytes() {
   }
 
   Flight.Ticket toProtocol() {
-    return Flight.Ticket.newBuilder()
-        .setTicket(ByteString.copyFrom(bytes))
-        .build();
+    return Flight.Ticket.newBuilder().setTicket(ByteString.copyFrom(bytes)).build();
   }
 
   /**
    * Get the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight types.
+   * <p>Intended to help interoperability by allowing non-Flight services to still return Flight
+   * types.
    */
   public ByteBuffer serialize() {
     return ByteBuffer.wrap(toProtocol().toByteArray());
@@ -62,7 +56,8 @@ public ByteBuffer serialize() {
   /**
    * Parse the serialized form of this protocol message.
    *
-   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from non-Flight services.
+   * <p>Intended to help interoperability by allowing Flight clients to obtain stream info from
+   * non-Flight services.
    *
    * @param serialized The serialized form of the Ticket, as returned by {@link #serialize()}.
    * @return The deserialized Ticket.
@@ -97,6 +92,4 @@ public boolean equals(Object obj) {
     }
     return true;
   }
-
-
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/AuthConstants.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/AuthConstants.java
index 8a37115f1f024..1a775f33ed6e9 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/AuthConstants.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/AuthConstants.java
@@ -14,39 +14,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth;
 
-import org.apache.arrow.flight.FlightConstants;
-
 import io.grpc.Context;
 import io.grpc.Metadata;
 import io.grpc.Metadata.BinaryMarshaller;
 import io.grpc.MethodDescriptor;
+import org.apache.arrow.flight.FlightConstants;
 
-/**
- * Constants used in authorization of flight connections.
- */
+/** Constants used in authorization of flight connections. */
 public final class AuthConstants {
 
-  public static final String HANDSHAKE_DESCRIPTOR_NAME = MethodDescriptor
-      .generateFullMethodName(FlightConstants.SERVICE, "Handshake");
+  public static final String HANDSHAKE_DESCRIPTOR_NAME =
+      MethodDescriptor.generateFullMethodName(FlightConstants.SERVICE, "Handshake");
   public static final String TOKEN_NAME = "Auth-Token-bin";
-  public static final Metadata.Key<byte[]> TOKEN_KEY = Metadata.Key.of(TOKEN_NAME, new BinaryMarshaller<byte[]>() {
-
-    @Override
-    public byte[] toBytes(byte[] value) {
-      return value;
-    }
-
-    @Override
-    public byte[] parseBytes(byte[] serialized) {
-      return serialized;
-    }
-  });
-
-  public static final Context.Key<String> PEER_IDENTITY_KEY = Context.keyWithDefault("arrow-flight-peer-identity", "");
-
-  private AuthConstants() {
-  }
+  public static final Metadata.Key<byte[]> TOKEN_KEY =
+      Metadata.Key.of(
+          TOKEN_NAME,
+          new BinaryMarshaller<byte[]>() {
+
+            @Override
+            public byte[] toBytes(byte[] value) {
+              return value;
+            }
+
+            @Override
+            public byte[] parseBytes(byte[] serialized) {
+              return serialized;
+            }
+          });
+
+  public static final Context.Key<String> PEER_IDENTITY_KEY =
+      Context.keyWithDefault("arrow-flight-peer-identity", "");
+
+  private AuthConstants() {}
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/BasicClientAuthHandler.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/BasicClientAuthHandler.java
index c6dca97fb6ba9..a0fdf059bdce0 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/BasicClientAuthHandler.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/BasicClientAuthHandler.java
@@ -14,16 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth;
 
 import java.util.Iterator;
-
 import org.apache.arrow.flight.impl.Flight.BasicAuth;
 
-/**
- * A client auth handler that supports username and password.
- */
+/** A client auth handler that supports username and password. */
 public class BasicClientAuthHandler implements ClientAuthHandler {
 
   private final String name;
@@ -54,5 +50,4 @@ public void authenticate(ClientAuthSender outgoing, Iterator<byte[]> incoming) {
   public byte[] getCallToken() {
     return token;
   }
-
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/BasicServerAuthHandler.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/BasicServerAuthHandler.java
index 34e3efc0d11c1..d69039c48c034 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/BasicServerAuthHandler.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/BasicServerAuthHandler.java
@@ -14,21 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth;
 
+import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.Iterator;
 import java.util.Optional;
-
 import org.apache.arrow.flight.impl.Flight.BasicAuth;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.protobuf.InvalidProtocolBufferException;
-
-/**
- * A ServerAuthHandler for username/password authentication.
- */
+/** A ServerAuthHandler for username/password authentication. */
 public class BasicServerAuthHandler implements ServerAuthHandler {
 
   private static final Logger logger = LoggerFactory.getLogger(BasicServerAuthHandler.class);
@@ -39,15 +34,12 @@ public BasicServerAuthHandler(BasicAuthValidator authValidator) {
     this.authValidator = authValidator;
   }
 
-  /**
-   * Interface that this handler delegates for determining if credentials are valid.
-   */
+  /** Interface that this handler delegates for determining if credentials are valid. */
   public interface BasicAuthValidator {
 
     byte[] getToken(String username, String password) throws Exception;
 
     Optional<String> isValid(byte[] token);
-
   }
 
   @Override
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ClientAuthHandler.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ClientAuthHandler.java
index af7da86e009e6..3ca94006d8dbf 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ClientAuthHandler.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ClientAuthHandler.java
@@ -14,49 +14,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth;
 
 import java.util.Iterator;
-
 import org.apache.arrow.flight.FlightClient;
 
 /**
  * Implement authentication for Flight on the client side.
  *
  * @deprecated As of 14.0.0. This implements a stateful "login" flow that does not play well with
- *     distributed or stateless systems. It will not be removed, but should not be used. Instead
- *     see {@link FlightClient#authenticateBasicToken(String, String)}.
+ *     distributed or stateless systems. It will not be removed, but should not be used. Instead see
+ *     {@link FlightClient#authenticateBasicToken(String, String)}.
  */
 @Deprecated
 public interface ClientAuthHandler {
   /**
    * Handle the initial handshake with the server.
+   *
    * @param outgoing A channel to send data to the server.
    * @param incoming An iterator of incoming data from the server.
    */
   void authenticate(ClientAuthSender outgoing, Iterator<byte[]> incoming);
 
-  /**
-   * Get the per-call authentication token.
-   */
+  /** Get the per-call authentication token. */
   byte[] getCallToken();
 
-  /**
-   * A communication channel to the server during initial connection.
-   */
+  /** A communication channel to the server during initial connection. */
   interface ClientAuthSender {
 
-    /**
-     * Send the server a message.
-     */
+    /** Send the server a message. */
     void send(byte[] payload);
 
-    /**
-     * Signal an error to the server and abort the authentication attempt.
-     */
+    /** Signal an error to the server and abort the authentication attempt. */
     void onError(Throwable cause);
-
   }
-
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ClientAuthInterceptor.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ClientAuthInterceptor.java
index 3d28b7ba7e7cb..3cdddeddb7982 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ClientAuthInterceptor.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ClientAuthInterceptor.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth;
 
 import io.grpc.CallOptions;
@@ -25,9 +24,7 @@
 import io.grpc.Metadata;
 import io.grpc.MethodDescriptor;
 
-/**
- * GRPC client intercepter that handles authentication with the server.
- */
+/** GRPC client intercepter that handles authentication with the server. */
 public class ClientAuthInterceptor implements ClientInterceptor {
   private volatile ClientAuthHandler authHandler = null;
 
@@ -35,16 +32,15 @@ public void setAuthHandler(ClientAuthHandler authHandler) {
     this.authHandler = authHandler;
   }
 
-  public ClientAuthInterceptor() {
-  }
+  public ClientAuthInterceptor() {}
 
   public boolean hasAuthHandler() {
     return authHandler != null;
   }
 
   @Override
-  public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT, RespT> methodDescriptor,
-      CallOptions callOptions, Channel next) {
+  public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
+      MethodDescriptor<ReqT, RespT> methodDescriptor, CallOptions callOptions, Channel next) {
     ClientCall<ReqT, RespT> call = next.newCall(methodDescriptor, callOptions);
 
     // once we have an auth header, add that to the calls.
@@ -55,7 +51,8 @@ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT
     return call;
   }
 
-  private final class HeaderAttachingClientCall<ReqT, RespT> extends SimpleForwardingClientCall<ReqT, RespT> {
+  private final class HeaderAttachingClientCall<ReqT, RespT>
+      extends SimpleForwardingClientCall<ReqT, RespT> {
 
     private HeaderAttachingClientCall(ClientCall<ReqT, RespT> call) {
       super(call);
@@ -69,5 +66,4 @@ public void start(Listener<RespT> responseListener, Metadata headers) {
       super.start(responseListener, headers);
     }
   }
-
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ClientAuthWrapper.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ClientAuthWrapper.java
index e86dc163c5f59..dd62f7756e79b 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ClientAuthWrapper.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ClientAuthWrapper.java
@@ -14,32 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth;
 
+import com.google.protobuf.ByteString;
+import io.grpc.StatusRuntimeException;
+import io.grpc.stub.StreamObserver;
 import java.util.Iterator;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.LinkedBlockingQueue;
-
 import org.apache.arrow.flight.auth.ClientAuthHandler.ClientAuthSender;
 import org.apache.arrow.flight.grpc.StatusUtils;
 import org.apache.arrow.flight.impl.Flight.HandshakeRequest;
 import org.apache.arrow.flight.impl.Flight.HandshakeResponse;
 import org.apache.arrow.flight.impl.FlightServiceGrpc.FlightServiceStub;
 
-import com.google.protobuf.ByteString;
-
-import io.grpc.StatusRuntimeException;
-import io.grpc.stub.StreamObserver;
-
-/**
- * Utility class for performing authorization over using a GRPC stub.
- */
+/** Utility class for performing authorization over using a GRPC stub. */
 public class ClientAuthWrapper {
 
   /**
-   * Do client auth for a client.  The stub will be authenticated after this method returns.
+   * Do client auth for a client. The stub will be authenticated after this method returns.
    *
    * @param authHandler The handler to use.
    * @param stub The service stub.
@@ -87,43 +81,46 @@ public void onNext(HandshakeResponse value) {
       }
     }
 
-    private Iterator<byte[]> iter = new Iterator<byte[]>() {
-
-      @Override
-      public byte[] next() {
-        while (!completed.isDone() || !messages.isEmpty()) {
-          byte[] bytes = messages.poll();
-          if (bytes == null) {
-            // busy wait.
-            continue;
-          } else {
-            return bytes;
-          }
-        }
+    private Iterator<byte[]> iter =
+        new Iterator<byte[]>() {
+
+          @Override
+          public byte[] next() {
+            while (!completed.isDone() || !messages.isEmpty()) {
+              byte[] bytes = messages.poll();
+              if (bytes == null) {
+                // busy wait.
+                continue;
+              } else {
+                return bytes;
+              }
+            }
 
-        if (completed.isCompletedExceptionally()) {
-          // Preserve prior exception behavior
-          // TODO: with ARROW-5681, throw an appropriate Flight exception if gRPC raised an exception
-          try {
-            completed.get();
-          } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-          } catch (ExecutionException e) {
-            if (e.getCause() instanceof StatusRuntimeException) {
-              throw (StatusRuntimeException) e.getCause();
+            if (completed.isCompletedExceptionally()) {
+              // Preserve prior exception behavior
+              // TODO: with ARROW-5681, throw an appropriate Flight exception if gRPC raised an
+              // exception
+              try {
+                completed.get();
+              } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+              } catch (ExecutionException e) {
+                if (e.getCause() instanceof StatusRuntimeException) {
+                  throw (StatusRuntimeException) e.getCause();
+                }
+                throw new RuntimeException(e);
+              }
             }
-            throw new RuntimeException(e);
-          }
-        }
 
-        throw new IllegalStateException("You attempted to retrieve messages after there were none.");
-      }
+            throw new IllegalStateException(
+                "You attempted to retrieve messages after there were none.");
+          }
 
-      @Override
-      public boolean hasNext() {
-        return !messages.isEmpty();
-      }
-    };
+          @Override
+          public boolean hasNext() {
+            return !messages.isEmpty();
+          }
+        };
 
     @Override
     public void onError(Throwable t) {
@@ -137,9 +134,8 @@ private class AuthSender implements ClientAuthSender {
       @Override
       public void send(byte[] payload) {
         try {
-          responseObserver.onNext(HandshakeRequest.newBuilder()
-              .setPayload(ByteString.copyFrom(payload))
-              .build());
+          responseObserver.onNext(
+              HandshakeRequest.newBuilder().setPayload(ByteString.copyFrom(payload)).build());
         } catch (StatusRuntimeException sre) {
           throw StatusUtils.fromGrpcRuntimeException(sre);
         }
@@ -150,7 +146,6 @@ public void onError(Throwable cause) {
         this.errored = true;
         responseObserver.onError(StatusUtils.toGrpcException(cause));
       }
-
     }
 
     @Override
@@ -158,5 +153,4 @@ public void onCompleted() {
       completed.complete(true);
     }
   }
-
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ServerAuthHandler.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ServerAuthHandler.java
index 378027c9287fe..39fbcf15efba0 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ServerAuthHandler.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ServerAuthHandler.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth;
 
 import java.util.Iterator;
 import java.util.Optional;
-
 import org.apache.arrow.flight.FlightServer;
 import org.apache.arrow.flight.auth2.CallHeaderAuthenticator;
 
@@ -28,8 +26,8 @@
  *
  * @deprecated As of 14.0.0. This implements a stateful "login" flow that does not play well with
  *     distributed or stateless systems. It will not be removed, but should not be used. Instead,
- *     see {@link FlightServer.Builder#headerAuthenticator(CallHeaderAuthenticator)}
- *     and {@link CallHeaderAuthenticator}.
+ *     see {@link FlightServer.Builder#headerAuthenticator(CallHeaderAuthenticator)} and {@link
+ *     CallHeaderAuthenticator}.
  */
 @Deprecated
 public interface ServerAuthHandler {
@@ -37,8 +35,8 @@ public interface ServerAuthHandler {
   /**
    * Validate the client token provided on each call.
    *
-   * @return An empty optional if the client is not authenticated; the peer identity otherwise (may be the empty
-   *     string).
+   * @return An empty optional if the client is not authenticated; the peer identity otherwise (may
+   *     be the empty string).
    */
   Optional<String> isValid(byte[] token);
 
@@ -52,30 +50,27 @@ public interface ServerAuthHandler {
   boolean authenticate(ServerAuthSender outgoing, Iterator<byte[]> incoming);
 
   /**
-   * Interface for a server implementations to send back authentication messages
-   * back to the client.
+   * Interface for a server implementations to send back authentication messages back to the client.
    */
   interface ServerAuthSender {
 
     void send(byte[] payload);
 
     void onError(Throwable cause);
-
   }
 
-  /**
-   * An auth handler that does nothing.
-   */
-  ServerAuthHandler NO_OP = new ServerAuthHandler() {
+  /** An auth handler that does nothing. */
+  ServerAuthHandler NO_OP =
+      new ServerAuthHandler() {
 
-    @Override
-    public Optional<String> isValid(byte[] token) {
-      return Optional.of("");
-    }
+        @Override
+        public Optional<String> isValid(byte[] token) {
+          return Optional.of("");
+        }
 
-    @Override
-    public boolean authenticate(ServerAuthSender outgoing, Iterator<byte[]> incoming) {
-      return true;
-    }
-  };
+        @Override
+        public boolean authenticate(ServerAuthSender outgoing, Iterator<byte[]> incoming) {
+          return true;
+        }
+      };
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ServerAuthInterceptor.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ServerAuthInterceptor.java
index 5bff3784e1730..c52eaa444bc4b 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ServerAuthInterceptor.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ServerAuthInterceptor.java
@@ -14,14 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth;
 
-import java.util.Optional;
-
-import org.apache.arrow.flight.FlightRuntimeException;
-import org.apache.arrow.flight.grpc.StatusUtils;
-
 import io.grpc.Context;
 import io.grpc.Contexts;
 import io.grpc.Metadata;
@@ -31,10 +25,11 @@
 import io.grpc.ServerInterceptor;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
+import java.util.Optional;
+import org.apache.arrow.flight.FlightRuntimeException;
+import org.apache.arrow.flight.grpc.StatusUtils;
 
-/**
- * GRPC Interceptor for performing authentication.
- */
+/** GRPC Interceptor for performing authentication. */
 public class ServerAuthInterceptor implements ServerInterceptor {
 
   private final ServerAuthHandler authHandler;
@@ -44,9 +39,11 @@ public ServerAuthInterceptor(ServerAuthHandler authHandler) {
   }
 
   @Override
-  public <ReqT, RespT> Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call, Metadata headers,
-      ServerCallHandler<ReqT, RespT> next) {
-    if (!call.getMethodDescriptor().getFullMethodName().equals(AuthConstants.HANDSHAKE_DESCRIPTOR_NAME)) {
+  public <ReqT, RespT> Listener<ReqT> interceptCall(
+      ServerCall<ReqT, RespT> call, Metadata headers, ServerCallHandler<ReqT, RespT> next) {
+    if (!call.getMethodDescriptor()
+        .getFullMethodName()
+        .equals(AuthConstants.HANDSHAKE_DESCRIPTOR_NAME)) {
       final Optional<String> peerIdentity;
 
       // Allow customizing the response code by throwing FlightRuntimeException
@@ -64,12 +61,17 @@ public <ReqT, RespT> Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call,
 
       if (!peerIdentity.isPresent()) {
         // Send back a description along with the status code
-        call.close(Status.UNAUTHENTICATED
-            .withDescription("Unauthenticated (invalid or missing auth token)"), new Metadata());
+        call.close(
+            Status.UNAUTHENTICATED.withDescription(
+                "Unauthenticated (invalid or missing auth token)"),
+            new Metadata());
         return new NoopServerCallListener<>();
       }
-      return Contexts.interceptCall(Context.current().withValue(AuthConstants.PEER_IDENTITY_KEY, peerIdentity.get()),
-          call, headers, next);
+      return Contexts.interceptCall(
+          Context.current().withValue(AuthConstants.PEER_IDENTITY_KEY, peerIdentity.get()),
+          call,
+          headers,
+          next);
     }
 
     return next.startCall(call, headers);
@@ -80,6 +82,5 @@ private Optional<String> isValid(Metadata headers) {
     return authHandler.isValid(token);
   }
 
-  private static class NoopServerCallListener<T> extends ServerCall.Listener<T> {
-  }
+  private static class NoopServerCallListener<T> extends ServerCall.Listener<T> {}
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ServerAuthWrapper.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ServerAuthWrapper.java
index 3647e113cc0f6..879a93a73b5b6 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ServerAuthWrapper.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth/ServerAuthWrapper.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth;
 
+import com.google.protobuf.ByteString;
+import io.grpc.stub.StreamObserver;
 import java.util.Iterator;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.LinkedBlockingQueue;
-
 import org.apache.arrow.flight.CallStatus;
 import org.apache.arrow.flight.auth.ServerAuthHandler.ServerAuthSender;
 import org.apache.arrow.flight.grpc.StatusUtils;
@@ -30,13 +30,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.protobuf.ByteString;
-
-import io.grpc.stub.StreamObserver;
-
-/**
- * Contains utility methods for integrating authorization into a GRPC stream.
- */
+/** Contains utility methods for integrating authorization into a GRPC stream. */
 public class ServerAuthWrapper {
   private static final Logger LOGGER = LoggerFactory.getLogger(ServerAuthWrapper.class);
 
@@ -48,24 +42,28 @@ public class ServerAuthWrapper {
    * @param executors ExecutorService
    * @return AuthObserver
    */
-  public static StreamObserver<HandshakeRequest> wrapHandshake(ServerAuthHandler authHandler,
-      StreamObserver<HandshakeResponse> responseObserver, ExecutorService executors) {
+  public static StreamObserver<HandshakeRequest> wrapHandshake(
+      ServerAuthHandler authHandler,
+      StreamObserver<HandshakeResponse> responseObserver,
+      ExecutorService executors) {
 
     // stream started.
     AuthObserver observer = new AuthObserver(responseObserver);
-    final Runnable r = () -> {
-      try {
-        if (authHandler.authenticate(observer.sender, observer.iter)) {
-          responseObserver.onCompleted();
-          return;
-        }
-
-        responseObserver.onError(StatusUtils.toGrpcException(CallStatus.UNAUTHENTICATED.toRuntimeException()));
-      } catch (Exception ex) {
-        LOGGER.error("Error during authentication", ex);
-        responseObserver.onError(StatusUtils.toGrpcException(ex));
-      }
-    };
+    final Runnable r =
+        () -> {
+          try {
+            if (authHandler.authenticate(observer.sender, observer.iter)) {
+              responseObserver.onCompleted();
+              return;
+            }
+
+            responseObserver.onError(
+                StatusUtils.toGrpcException(CallStatus.UNAUTHENTICATED.toRuntimeException()));
+          } catch (Exception ex) {
+            LOGGER.error("Error during authentication", ex);
+            responseObserver.onError(StatusUtils.toGrpcException(ex));
+          }
+        };
     observer.future = executors.submit(r);
     return observer;
   }
@@ -91,26 +89,27 @@ public void onNext(HandshakeRequest value) {
       }
     }
 
-    private Iterator<byte[]> iter = new Iterator<byte[]>() {
-
-      @Override
-      public byte[] next() {
-        while (!completed || !messages.isEmpty()) {
-          byte[] bytes = messages.poll();
-          if (bytes == null) {
-            //busy wait.
-            continue;
+    private Iterator<byte[]> iter =
+        new Iterator<byte[]>() {
+
+          @Override
+          public byte[] next() {
+            while (!completed || !messages.isEmpty()) {
+              byte[] bytes = messages.poll();
+              if (bytes == null) {
+                // busy wait.
+                continue;
+              }
+              return bytes;
+            }
+            throw new IllegalStateException("Requesting more messages than client sent.");
           }
-          return bytes;
-        }
-        throw new IllegalStateException("Requesting more messages than client sent.");
-      }
 
-      @Override
-      public boolean hasNext() {
-        return !messages.isEmpty();
-      }
-    };
+          @Override
+          public boolean hasNext() {
+            return !messages.isEmpty();
+          }
+        };
 
     @Override
     public void onError(Throwable t) {
@@ -130,17 +129,14 @@ private class AuthSender implements ServerAuthSender {
 
       @Override
       public void send(byte[] payload) {
-        responseObserver.onNext(HandshakeResponse.newBuilder()
-            .setPayload(ByteString.copyFrom(payload))
-            .build());
+        responseObserver.onNext(
+            HandshakeResponse.newBuilder().setPayload(ByteString.copyFrom(payload)).build());
       }
 
       @Override
       public void onError(Throwable cause) {
         responseObserver.onError(StatusUtils.toGrpcException(cause));
       }
-
     }
   }
-
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/Auth2Constants.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/Auth2Constants.java
index 624d7d5ff7c5e..5736210a61aad 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/Auth2Constants.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/Auth2Constants.java
@@ -14,18 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth2;
 
-/**
- * Constants used in authorization of flight connections.
- */
+/** Constants used in authorization of flight connections. */
 public final class Auth2Constants {
   public static final String PEER_IDENTITY_KEY = "arrow-flight-peer-identity";
   public static final String BEARER_PREFIX = "Bearer ";
   public static final String BASIC_PREFIX = "Basic ";
   public static final String AUTHORIZATION_HEADER = "Authorization";
 
-  private Auth2Constants() {
-  }
+  private Auth2Constants() {}
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/AuthUtilities.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/AuthUtilities.java
index c73b7cf1a3a63..1c64ac7d60d72 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/AuthUtilities.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/AuthUtilities.java
@@ -14,23 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth2;
 
 import org.apache.arrow.flight.CallHeaders;
 
-/**
- * Utility class for completing the auth process.
- */
+/** Utility class for completing the auth process. */
 public final class AuthUtilities {
-  private AuthUtilities() {
-
-  }
+  private AuthUtilities() {}
 
   /**
    * Helper method for retrieving a value from the Authorization header.
    *
-   * @param headers     The headers to inspect.
+   * @param headers The headers to inspect.
    * @param valuePrefix The prefix within the value portion of the header to extract away.
    * @return The header value.
    */
@@ -43,5 +38,4 @@ public static String getValueFromAuthHeader(CallHeaders headers, String valuePre
     }
     return null;
   }
-
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/BasicAuthCredentialWriter.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/BasicAuthCredentialWriter.java
index 698287e880b2e..ab8fc96fb79d6 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/BasicAuthCredentialWriter.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/BasicAuthCredentialWriter.java
@@ -14,18 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth2;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.function.Consumer;
-
 import org.apache.arrow.flight.CallHeaders;
 
-/**
- * Client credentials that use a username and password.
- */
+/** Client credentials that use a username and password. */
 public final class BasicAuthCredentialWriter implements Consumer<CallHeaders> {
 
   private final String name;
@@ -38,7 +34,11 @@ public BasicAuthCredentialWriter(String name, String password) {
 
   @Override
   public void accept(CallHeaders outputHeaders) {
-    outputHeaders.insert(Auth2Constants.AUTHORIZATION_HEADER, Auth2Constants.BASIC_PREFIX +
-        Base64.getEncoder().encodeToString(String.format("%s:%s", name, password).getBytes(StandardCharsets.UTF_8)));
+    outputHeaders.insert(
+        Auth2Constants.AUTHORIZATION_HEADER,
+        Auth2Constants.BASIC_PREFIX
+            + Base64.getEncoder()
+                .encodeToString(
+                    String.format("%s:%s", name, password).getBytes(StandardCharsets.UTF_8)));
   }
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/BasicCallHeaderAuthenticator.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/BasicCallHeaderAuthenticator.java
index fff7b46909a4b..44fce5ec3df23 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/BasicCallHeaderAuthenticator.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/BasicCallHeaderAuthenticator.java
@@ -14,22 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth2;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
-
 import org.apache.arrow.flight.CallHeaders;
 import org.apache.arrow.flight.CallStatus;
 import org.apache.arrow.flight.FlightRuntimeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * A ServerAuthHandler for username/password authentication.
- */
+/** A ServerAuthHandler for username/password authentication. */
 public class BasicCallHeaderAuthenticator implements CallHeaderAuthenticator {
 
   private static final Logger logger = LoggerFactory.getLogger(BasicCallHeaderAuthenticator.class);
@@ -43,13 +39,14 @@ public BasicCallHeaderAuthenticator(CredentialValidator authValidator) {
   @Override
   public AuthResult authenticate(CallHeaders incomingHeaders) {
     try {
-      final String authEncoded = AuthUtilities.getValueFromAuthHeader(
-          incomingHeaders, Auth2Constants.BASIC_PREFIX);
+      final String authEncoded =
+          AuthUtilities.getValueFromAuthHeader(incomingHeaders, Auth2Constants.BASIC_PREFIX);
       if (authEncoded == null) {
         throw CallStatus.UNAUTHENTICATED.toRuntimeException();
       }
       // The value has the format Base64(<username>:<password>)
-      final String authDecoded = new String(Base64.getDecoder().decode(authEncoded), StandardCharsets.UTF_8);
+      final String authDecoded =
+          new String(Base64.getDecoder().decode(authEncoded), StandardCharsets.UTF_8);
       final int colonPos = authDecoded.indexOf(':');
       if (colonPos == -1) {
         throw CallStatus.UNAUTHENTICATED.toRuntimeException();
@@ -59,21 +56,21 @@ public AuthResult authenticate(CallHeaders incomingHeaders) {
       final String password = authDecoded.substring(colonPos + 1);
       return authValidator.validate(user, password);
     } catch (UnsupportedEncodingException ex) {
-      // Note: Intentionally discarding the exception cause when reporting back to the client for security purposes.
+      // Note: Intentionally discarding the exception cause when reporting back to the client for
+      // security purposes.
       logger.error("Authentication failed due to missing encoding.", ex);
       throw CallStatus.INTERNAL.toRuntimeException();
     } catch (FlightRuntimeException ex) {
       throw ex;
     } catch (Exception ex) {
-      // Note: Intentionally discarding the exception cause when reporting back to the client for security purposes.
+      // Note: Intentionally discarding the exception cause when reporting back to the client for
+      // security purposes.
       logger.error("Authentication failed.", ex);
       throw CallStatus.UNAUTHENTICATED.toRuntimeException();
     }
   }
 
-  /**
-   * Interface that this handler delegates to for validating the incoming headers.
-   */
+  /** Interface that this handler delegates to for validating the incoming headers. */
   public interface CredentialValidator {
     /**
      * Validate the supplied credentials (username/password) and return the peer identity.
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/BearerCredentialWriter.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/BearerCredentialWriter.java
index 715ee502b683d..c213d64fe7d0d 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/BearerCredentialWriter.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/BearerCredentialWriter.java
@@ -14,16 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth2;
 
 import java.util.function.Consumer;
-
 import org.apache.arrow.flight.CallHeaders;
 
-/**
- * Client credentials that use a bearer token.
- */
+/** Client credentials that use a bearer token. */
 public final class BearerCredentialWriter implements Consumer<CallHeaders> {
 
   private final String bearer;
@@ -34,6 +30,7 @@ public BearerCredentialWriter(String bearer) {
 
   @Override
   public void accept(CallHeaders outputHeaders) {
-    outputHeaders.insert(Auth2Constants.AUTHORIZATION_HEADER, Auth2Constants.BEARER_PREFIX + bearer);
+    outputHeaders.insert(
+        Auth2Constants.AUTHORIZATION_HEADER, Auth2Constants.BEARER_PREFIX + bearer);
   }
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/BearerTokenAuthenticator.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/BearerTokenAuthenticator.java
index 5eb5863e792d4..8d58d359d7774 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/BearerTokenAuthenticator.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/BearerTokenAuthenticator.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth2;
 
 import org.apache.arrow.flight.CallHeaders;
@@ -40,22 +39,25 @@ public AuthResult authenticate(CallHeaders incomingHeaders) {
     }
 
     // Delegate to the basic auth handler to do the validation.
-    final CallHeaderAuthenticator.AuthResult result = initialAuthenticator.authenticate(incomingHeaders);
+    final CallHeaderAuthenticator.AuthResult result =
+        initialAuthenticator.authenticate(incomingHeaders);
     return getAuthResultWithBearerToken(result);
   }
 
   /**
    * Callback to run when the initial authenticator succeeds.
+   *
    * @param authResult A successful initial authentication result.
-   * @return an alternate AuthResult based on the original AuthResult that will write a bearer token to output headers.
+   * @return an alternate AuthResult based on the original AuthResult that will write a bearer token
+   *     to output headers.
    */
   protected abstract AuthResult getAuthResultWithBearerToken(AuthResult authResult);
 
   /**
    * Validate the bearer token.
+   *
    * @param bearerToken The bearer token to validate.
    * @return A successful AuthResult if validation succeeded.
    */
   protected abstract AuthResult validateBearer(String bearerToken);
-
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/CallHeaderAuthenticator.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/CallHeaderAuthenticator.java
index 87e60f1fa811b..97382bffaf1cf 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/CallHeaderAuthenticator.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/CallHeaderAuthenticator.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth2;
 
 import org.apache.arrow.flight.CallHeaders;
@@ -23,33 +22,38 @@
 /**
  * Interface for Server side authentication handlers.
  *
- * A CallHeaderAuthenticator is used by {@link ServerCallHeaderAuthMiddleware} to validate headers sent by a Flight
- * client for authentication purposes. The headers validated do not necessarily have to be Authorization headers.
+ * <p>A CallHeaderAuthenticator is used by {@link ServerCallHeaderAuthMiddleware} to validate
+ * headers sent by a Flight client for authentication purposes. The headers validated do not
+ * necessarily have to be Authorization headers.
  *
- * The workflow is that the FlightServer will intercept headers on a request, validate the headers, and
- * either send back an UNAUTHENTICATED error, or succeed and potentially send back additional headers to the client.
+ * <p>The workflow is that the FlightServer will intercept headers on a request, validate the
+ * headers, and either send back an UNAUTHENTICATED error, or succeed and potentially send back
+ * additional headers to the client.
  *
- * Implementations of CallHeaderAuthenticator should take care not to provide leak confidential details (such as
- * indicating if usernames are valid or not) for security reasons when reporting errors back to clients.
+ * <p>Implementations of CallHeaderAuthenticator should take care not to provide leak confidential
+ * details (such as indicating if usernames are valid or not) for security reasons when reporting
+ * errors back to clients.
  *
- * Example CallHeaderAuthenticators provided include:
- * The {@link BasicCallHeaderAuthenticator} will authenticate basic HTTP credentials.
+ * <p>Example CallHeaderAuthenticators provided include: The {@link BasicCallHeaderAuthenticator}
+ * will authenticate basic HTTP credentials.
  *
- * The {@link BearerTokenAuthenticator} will authenticate basic HTTP credentials initially, then also send back a
- * bearer token that the client can use for subsequent requests. The {@link GeneratedBearerTokenAuthenticator} will
- * provide internally generated bearer tokens and maintain a cache of them.
+ * <p>The {@link BearerTokenAuthenticator} will authenticate basic HTTP credentials initially, then
+ * also send back a bearer token that the client can use for subsequent requests. The {@link
+ * GeneratedBearerTokenAuthenticator} will provide internally generated bearer tokens and maintain a
+ * cache of them.
  */
 public interface CallHeaderAuthenticator {
 
   /**
    * Encapsulates the result of the {@link CallHeaderAuthenticator} analysis of headers.
    *
-   * This includes the identity of the incoming user and any outbound headers to send as a response to the client.
+   * <p>This includes the identity of the incoming user and any outbound headers to send as a
+   * response to the client.
    */
   interface AuthResult {
     /**
-     * The peer identity that was determined by the handshake process based on the
-     * authentication credentials supplied by the client.
+     * The peer identity that was determined by the handshake process based on the authentication
+     * credentials supplied by the client.
      *
      * @return The peer identity.
      */
@@ -57,11 +61,10 @@ interface AuthResult {
 
     /**
      * Appends a header to the outgoing call headers.
+     *
      * @param outgoingHeaders The outgoing headers.
      */
-    default void appendToOutgoingHeaders(CallHeaders outgoingHeaders) {
-
-    }
+    default void appendToOutgoingHeaders(CallHeaders outgoingHeaders) {}
   }
 
   /**
@@ -74,13 +77,12 @@ default void appendToOutgoingHeaders(CallHeaders outgoingHeaders) {
    */
   AuthResult authenticate(CallHeaders incomingHeaders);
 
-  /**
-   * An auth handler that does nothing.
-   */
-  CallHeaderAuthenticator NO_OP = new CallHeaderAuthenticator() {
-    @Override
-    public AuthResult authenticate(CallHeaders incomingHeaders) {
-      return () -> "";
-    }
-  };
+  /** An auth handler that does nothing. */
+  CallHeaderAuthenticator NO_OP =
+      new CallHeaderAuthenticator() {
+        @Override
+        public AuthResult authenticate(CallHeaders incomingHeaders) {
+          return () -> "";
+        }
+      };
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ClientBearerHeaderHandler.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ClientBearerHeaderHandler.java
index 45bdb6d959f05..7a5e110be4e80 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ClientBearerHeaderHandler.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ClientBearerHeaderHandler.java
@@ -14,20 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth2;
 
 import org.apache.arrow.flight.CallHeaders;
 import org.apache.arrow.flight.grpc.CredentialCallOption;
 
-/**
- * A client header handler that parses the incoming headers for a bearer token.
- */
+/** A client header handler that parses the incoming headers for a bearer token. */
 public class ClientBearerHeaderHandler implements ClientHeaderHandler {
 
   @Override
-  public CredentialCallOption getCredentialCallOptionFromIncomingHeaders(CallHeaders incomingHeaders) {
-    final String bearerValue = AuthUtilities.getValueFromAuthHeader(incomingHeaders, Auth2Constants.BEARER_PREFIX);
+  public CredentialCallOption getCredentialCallOptionFromIncomingHeaders(
+      CallHeaders incomingHeaders) {
+    final String bearerValue =
+        AuthUtilities.getValueFromAuthHeader(incomingHeaders, Auth2Constants.BEARER_PREFIX);
     if (bearerValue != null) {
       return new CredentialCallOption(new BearerCredentialWriter(bearerValue));
     }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ClientHandshakeWrapper.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ClientHandshakeWrapper.java
index c84739d2e345c..1ce7d6896b08b 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ClientHandshakeWrapper.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ClientHandshakeWrapper.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth2;
 
+import io.grpc.StatusRuntimeException;
+import io.grpc.stub.StreamObserver;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-
 import org.apache.arrow.flight.CallStatus;
 import org.apache.arrow.flight.FlightRuntimeException;
 import org.apache.arrow.flight.grpc.StatusUtils;
@@ -27,17 +27,13 @@
 import org.apache.arrow.flight.impl.Flight.HandshakeResponse;
 import org.apache.arrow.flight.impl.FlightServiceGrpc.FlightServiceStub;
 
-import io.grpc.StatusRuntimeException;
-import io.grpc.stub.StreamObserver;
-
-/**
- * Utility class for executing a handshake with a FlightServer.
- */
+/** Utility class for executing a handshake with a FlightServer. */
 public class ClientHandshakeWrapper {
-  private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ClientHandshakeWrapper.class);
+  private static final org.slf4j.Logger logger =
+      org.slf4j.LoggerFactory.getLogger(ClientHandshakeWrapper.class);
 
   /**
-   * Do handshake for a client.  The stub will be authenticated after this method returns.
+   * Do handshake for a client. The stub will be authenticated after this method returns.
    *
    * @param stub The service stub.
    */
@@ -83,8 +79,7 @@ public HandshakeObserver() {
     }
 
     @Override
-    public void onNext(HandshakeResponse value) {
-    }
+    public void onNext(HandshakeResponse value) {}
 
     @Override
     public void onError(Throwable t) {
@@ -96,5 +91,4 @@ public void onCompleted() {
       completed.complete(true);
     }
   }
-
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ClientHeaderHandler.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ClientHeaderHandler.java
index 514189f9b13dc..2640af1290a76 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ClientHeaderHandler.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ClientHeaderHandler.java
@@ -14,30 +14,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth2;
 
 import org.apache.arrow.flight.CallHeaders;
 import org.apache.arrow.flight.grpc.CredentialCallOption;
 
-/**
- * Interface for client side header parsing and conversion to CredentialCallOption.
- */
+/** Interface for client side header parsing and conversion to CredentialCallOption. */
 public interface ClientHeaderHandler {
   /**
    * Parses the incoming headers and converts them into a CredentialCallOption.
+   *
    * @param incomingHeaders Incoming headers to parse.
    * @return An instance of CredentialCallOption.
    */
   CredentialCallOption getCredentialCallOptionFromIncomingHeaders(CallHeaders incomingHeaders);
-  
-  /**
-   * An client header handler that does nothing.
-   */
-  ClientHeaderHandler NO_OP = new ClientHeaderHandler() {
-    @Override
-    public CredentialCallOption getCredentialCallOptionFromIncomingHeaders(CallHeaders incomingHeaders) {
-      return null;
-    }
-  };
+
+  /** An client header handler that does nothing. */
+  ClientHeaderHandler NO_OP =
+      new ClientHeaderHandler() {
+        @Override
+        public CredentialCallOption getCredentialCallOptionFromIncomingHeaders(
+            CallHeaders incomingHeaders) {
+          return null;
+        }
+      };
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ClientIncomingAuthHeaderMiddleware.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ClientIncomingAuthHeaderMiddleware.java
index 7bb55d145d104..162f646cd7a0f 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ClientIncomingAuthHeaderMiddleware.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ClientIncomingAuthHeaderMiddleware.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth2;
 
 import org.apache.arrow.flight.CallHeaders;
@@ -23,22 +22,20 @@
 import org.apache.arrow.flight.FlightClientMiddleware;
 import org.apache.arrow.flight.grpc.CredentialCallOption;
 
-/**
- * Middleware for capturing bearer tokens sent back from the Flight server.
- */
+/** Middleware for capturing bearer tokens sent back from the Flight server. */
 public class ClientIncomingAuthHeaderMiddleware implements FlightClientMiddleware {
   private final Factory factory;
 
-  /**
-   * Factory used within FlightClient.
-   */
+  /** Factory used within FlightClient. */
   public static class Factory implements FlightClientMiddleware.Factory {
     private final ClientHeaderHandler headerHandler;
     private CredentialCallOption credentialCallOption = null;
 
     /**
      * Construct a factory with the given header handler.
-     * @param headerHandler The header handler that will be used for handling incoming headers from the flight server.
+     *
+     * @param headerHandler The header handler that will be used for handling incoming headers from
+     *     the flight server.
      */
     public Factory(ClientHeaderHandler headerHandler) {
       this.headerHandler = headerHandler;
@@ -63,16 +60,14 @@ private ClientIncomingAuthHeaderMiddleware(Factory factory) {
   }
 
   @Override
-  public void onBeforeSendingHeaders(CallHeaders outgoingHeaders) {
-  }
+  public void onBeforeSendingHeaders(CallHeaders outgoingHeaders) {}
 
   @Override
   public void onHeadersReceived(CallHeaders incomingHeaders) {
     factory.setCredentialCallOption(
-            factory.headerHandler.getCredentialCallOptionFromIncomingHeaders(incomingHeaders));
+        factory.headerHandler.getCredentialCallOptionFromIncomingHeaders(incomingHeaders));
   }
 
   @Override
-  public void onCallCompleted(CallStatus status) {
-  }
+  public void onCallCompleted(CallStatus status) {}
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/GeneratedBearerTokenAuthenticator.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/GeneratedBearerTokenAuthenticator.java
index 8b312b6b77a7b..c64577746f0ed 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/GeneratedBearerTokenAuthenticator.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/GeneratedBearerTokenAuthenticator.java
@@ -14,32 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth2;
 
+import com.google.common.base.Strings;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import io.grpc.Metadata;
 import java.nio.ByteBuffer;
 import java.util.Base64;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.flight.CallHeaders;
 import org.apache.arrow.flight.CallStatus;
 import org.apache.arrow.flight.grpc.MetadataAdapter;
 
-import com.google.common.base.Strings;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-
-import io.grpc.Metadata;
-
-/**
- * Generates and caches bearer tokens from user credentials.
- */
+/** Generates and caches bearer tokens from user credentials. */
 public class GeneratedBearerTokenAuthenticator extends BearerTokenAuthenticator {
   private final Cache<String, String> bearerToIdentityCache;
 
   /**
    * Generate bearer tokens for the given basic call authenticator.
+   *
    * @param authenticator The authenticator to initial validate inputs with.
    */
   public GeneratedBearerTokenAuthenticator(CallHeaderAuthenticator authenticator) {
@@ -48,20 +43,25 @@ public GeneratedBearerTokenAuthenticator(CallHeaderAuthenticator authenticator)
 
   /**
    * Generate bearer tokens for the given basic call authenticator.
+   *
    * @param authenticator The authenticator to initial validate inputs with.
    * @param timeoutMinutes The time before tokens expire after being accessed.
    */
-  public GeneratedBearerTokenAuthenticator(CallHeaderAuthenticator authenticator, int timeoutMinutes) {
-    this(authenticator, CacheBuilder.newBuilder().expireAfterAccess(timeoutMinutes, TimeUnit.MINUTES));
+  public GeneratedBearerTokenAuthenticator(
+      CallHeaderAuthenticator authenticator, int timeoutMinutes) {
+    this(
+        authenticator,
+        CacheBuilder.newBuilder().expireAfterAccess(timeoutMinutes, TimeUnit.MINUTES));
   }
 
   /**
    * Generate bearer tokens for the given basic call authenticator.
+   *
    * @param authenticator The authenticator to initial validate inputs with.
    * @param cacheBuilder The configuration of the cache of bearer tokens.
    */
-  public GeneratedBearerTokenAuthenticator(CallHeaderAuthenticator authenticator,
-      CacheBuilder<Object, Object> cacheBuilder) {
+  public GeneratedBearerTokenAuthenticator(
+      CallHeaderAuthenticator authenticator, CacheBuilder<Object, Object> cacheBuilder) {
     super(authenticator);
     bearerToIdentityCache = cacheBuilder.build();
   }
@@ -81,8 +81,11 @@ public String getPeerIdentity() {
 
       @Override
       public void appendToOutgoingHeaders(CallHeaders outgoingHeaders) {
-        if (null == AuthUtilities.getValueFromAuthHeader(outgoingHeaders, Auth2Constants.BEARER_PREFIX)) {
-          outgoingHeaders.insert(Auth2Constants.AUTHORIZATION_HEADER, Auth2Constants.BEARER_PREFIX + bearerToken);
+        if (null
+            == AuthUtilities.getValueFromAuthHeader(
+                outgoingHeaders, Auth2Constants.BEARER_PREFIX)) {
+          outgoingHeaders.insert(
+              Auth2Constants.AUTHORIZATION_HEADER, Auth2Constants.BEARER_PREFIX + bearerToken);
         }
       }
     };
@@ -96,7 +99,7 @@ protected AuthResult getAuthResultWithBearerToken(AuthResult authResult) {
     final CallHeaders dummyHeaders = new MetadataAdapter(new Metadata());
     authResult.appendToOutgoingHeaders(dummyHeaders);
     String bearerToken =
-            AuthUtilities.getValueFromAuthHeader(dummyHeaders, Auth2Constants.BEARER_PREFIX);
+        AuthUtilities.getValueFromAuthHeader(dummyHeaders, Auth2Constants.BEARER_PREFIX);
     final AuthResult authResultWithBearerToken;
     if (Strings.isNullOrEmpty(bearerToken)) {
       // Generate a new bearer token and return an AuthResult that can write it.
@@ -106,18 +109,20 @@ protected AuthResult getAuthResultWithBearerToken(AuthResult authResult) {
       byteBuffer.putLong(uuid.getLeastSignificantBits());
       final String newToken = Base64.getEncoder().encodeToString(byteBuffer.array());
       bearerToken = newToken;
-      authResultWithBearerToken = new AuthResult() {
-        @Override
-        public String getPeerIdentity() {
-          return authResult.getPeerIdentity();
-        }
+      authResultWithBearerToken =
+          new AuthResult() {
+            @Override
+            public String getPeerIdentity() {
+              return authResult.getPeerIdentity();
+            }
 
-        @Override
-        public void appendToOutgoingHeaders(CallHeaders outgoingHeaders) {
-          authResult.appendToOutgoingHeaders(outgoingHeaders);
-          outgoingHeaders.insert(Auth2Constants.AUTHORIZATION_HEADER, Auth2Constants.BEARER_PREFIX + newToken);
-        }
-      };
+            @Override
+            public void appendToOutgoingHeaders(CallHeaders outgoingHeaders) {
+              authResult.appendToOutgoingHeaders(outgoingHeaders);
+              outgoingHeaders.insert(
+                  Auth2Constants.AUTHORIZATION_HEADER, Auth2Constants.BEARER_PREFIX + newToken);
+            }
+          };
     } else {
       // Use the bearer token supplied by the original auth result.
       authResultWithBearerToken = authResult;
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ServerCallHeaderAuthMiddleware.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ServerCallHeaderAuthMiddleware.java
index 9bfa738184490..bc47f0d8538cf 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ServerCallHeaderAuthMiddleware.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/auth2/ServerCallHeaderAuthMiddleware.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth2;
 
 import static org.apache.arrow.flight.auth2.CallHeaderAuthenticator.AuthResult;
@@ -26,18 +25,18 @@
 import org.apache.arrow.flight.RequestContext;
 
 /**
- * Middleware that's used to validate credentials during the handshake and verify
- * the bearer token in subsequent requests.
+ * Middleware that's used to validate credentials during the handshake and verify the bearer token
+ * in subsequent requests.
  */
 public class ServerCallHeaderAuthMiddleware implements FlightServerMiddleware {
-  /**
-   * Factory for accessing ServerAuthMiddleware.
-   */
-  public static class Factory implements FlightServerMiddleware.Factory<ServerCallHeaderAuthMiddleware> {
+  /** Factory for accessing ServerAuthMiddleware. */
+  public static class Factory
+      implements FlightServerMiddleware.Factory<ServerCallHeaderAuthMiddleware> {
     private final CallHeaderAuthenticator authHandler;
 
     /**
      * Construct a factory with the given auth handler.
+     *
      * @param authHandler The auth handler what will be used for authenticating requests.
      */
     public Factory(CallHeaderAuthenticator authHandler) {
@@ -45,8 +44,8 @@ public Factory(CallHeaderAuthenticator authHandler) {
     }
 
     @Override
-    public ServerCallHeaderAuthMiddleware onCallStarted(CallInfo callInfo, CallHeaders incomingHeaders,
-                                                        RequestContext context) {
+    public ServerCallHeaderAuthMiddleware onCallStarted(
+        CallInfo callInfo, CallHeaders incomingHeaders, RequestContext context) {
       final AuthResult result = authHandler.authenticate(incomingHeaders);
       context.put(Auth2Constants.PEER_IDENTITY_KEY, result.getPeerIdentity());
       return new ServerCallHeaderAuthMiddleware(result);
@@ -65,10 +64,8 @@ public void onBeforeSendingHeaders(CallHeaders outgoingHeaders) {
   }
 
   @Override
-  public void onCallCompleted(CallStatus status) {
-  }
+  public void onCallCompleted(CallStatus status) {}
 
   @Override
-  public void onCallErrored(Throwable err) {
-  }
+  public void onCallErrored(Throwable err) {}
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/client/ClientCookieMiddleware.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/client/ClientCookieMiddleware.java
index 56f24e1019c9f..e5eb934001773 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/client/ClientCookieMiddleware.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/client/ClientCookieMiddleware.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.client;
 
 import java.net.HttpCookie;
@@ -23,7 +22,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.flight.CallHeaders;
 import org.apache.arrow.flight.CallInfo;
 import org.apache.arrow.flight.CallStatus;
@@ -33,13 +31,12 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * A client middleware for receiving and sending cookie information.
- * Note that this class will not persist permanent cookies beyond the lifetime
- * of this session.
+ * A client middleware for receiving and sending cookie information. Note that this class will not
+ * persist permanent cookies beyond the lifetime of this session.
  *
- * This middleware will automatically remove cookies that have expired.
- * <b>Note</b>: Negative max-age values currently do not get marked as expired due to
- * a JDK issue. Use max-age=0 to explicitly remove an existing cookie.
+ * <p>This middleware will automatically remove cookies that have expired. <b>Note</b>: Negative
+ * max-age values currently do not get marked as expired due to a JDK issue. Use max-age=0 to
+ * explicitly remove an existing cookie.
  */
 public class ClientCookieMiddleware implements FlightClientMiddleware {
   private static final Logger LOGGER = LoggerFactory.getLogger(ClientCookieMiddleware.class);
@@ -54,9 +51,7 @@ public class ClientCookieMiddleware implements FlightClientMiddleware {
     this.factory = factory;
   }
 
-  /**
-   * Factory used within FlightClient.
-   */
+  /** Factory used within FlightClient. */
   public static class Factory implements FlightClientMiddleware.Factory {
     // Use a map to track the most recent version of a cookie from the server.
     // Note that cookie names are case-sensitive (but header names aren't).
@@ -74,21 +69,24 @@ private void updateCookies(Iterable<String> newCookieHeaderValues) {
       // with a different value and the client will use the new value in future requests.
       // The server can also update a cookie to have an Expiry in the past or negative age
       // to signal that the client should stop using the cookie immediately.
-      newCookieHeaderValues.forEach(headerValue -> {
-        try {
-          final List<HttpCookie> parsedCookies = HttpCookie.parse(headerValue);
-          parsedCookies.forEach(parsedCookie -> {
-            final String cookieNameLc = parsedCookie.getName().toLowerCase(Locale.ENGLISH);
-            if (parsedCookie.hasExpired()) {
-              cookies.remove(cookieNameLc);
-            } else {
-              cookies.put(parsedCookie.getName().toLowerCase(Locale.ENGLISH), parsedCookie);
+      newCookieHeaderValues.forEach(
+          headerValue -> {
+            try {
+              final List<HttpCookie> parsedCookies = HttpCookie.parse(headerValue);
+              parsedCookies.forEach(
+                  parsedCookie -> {
+                    final String cookieNameLc = parsedCookie.getName().toLowerCase(Locale.ENGLISH);
+                    if (parsedCookie.hasExpired()) {
+                      cookies.remove(cookieNameLc);
+                    } else {
+                      cookies.put(parsedCookie.getName().toLowerCase(Locale.ENGLISH), parsedCookie);
+                    }
+                  });
+            } catch (IllegalArgumentException ex) {
+              LOGGER.warn(
+                  "Skipping incorrectly formatted Set-Cookie header with value '{}'.", headerValue);
             }
           });
-        } catch (IllegalArgumentException ex) {
-          LOGGER.warn("Skipping incorrectly formatted Set-Cookie header with value '{}'.", headerValue);
-        }
-      });
     }
   }
 
@@ -109,13 +107,9 @@ public void onHeadersReceived(CallHeaders incomingHeaders) {
   }
 
   @Override
-  public void onCallCompleted(CallStatus status) {
-
-  }
+  public void onCallCompleted(CallStatus status) {}
 
-  /**
-   * Discards expired cookies and returns the valid cookies as a String delimited by ';'.
-   */
+  /** Discards expired cookies and returns the valid cookies as a String delimited by ';'. */
   @VisibleForTesting
   String getValidCookiesAsString() {
     // Discard expired cookies.
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/AddWritableBuffer.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/AddWritableBuffer.java
index 4a99ab22842e2..6415bd1a2537a 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/AddWritableBuffer.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/AddWritableBuffer.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.grpc;
 
+import io.netty.buffer.ByteBuf;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.Constructor;
@@ -25,8 +25,6 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
-import io.netty.buffer.ByteBuf;
-
 /**
  * Allow a user to add a ByteBuf based InputStream directly into GRPC WritableBuffer to avoid an
  * extra copy. This could be solved in GRPC by adding a ByteBufListable interface on InputStream and
@@ -41,7 +39,6 @@ public class AddWritableBuffer {
   private static final Class<?> bufChainOut;
 
   static {
-
     Constructor<?> tmpConstruct = null;
     Field tmpBufferList = null;
     Field tmpCurrent = null;
@@ -54,7 +51,8 @@ public class AddWritableBuffer {
       Constructor<?> tmpConstruct2 = nwb.getDeclaredConstructor(ByteBuf.class);
       tmpConstruct2.setAccessible(true);
 
-      Class<?> tmpBufChainOut2 = Class.forName("io.grpc.internal.MessageFramer$BufferChainOutputStream");
+      Class<?> tmpBufChainOut2 =
+          Class.forName("io.grpc.internal.MessageFramer$BufferChainOutputStream");
 
       Field tmpBufferList2 = tmpBufChainOut2.getDeclaredField("bufferList");
       tmpBufferList2.setAccessible(true);
@@ -72,7 +70,8 @@ public class AddWritableBuffer {
       tmpBufChainOut = tmpBufChainOut2;
 
     } catch (Exception ex) {
-      new RuntimeException("Failed to initialize AddWritableBuffer, falling back to slow path", ex).printStackTrace();
+      new RuntimeException("Failed to initialize AddWritableBuffer, falling back to slow path", ex)
+          .printStackTrace();
     }
 
     bufConstruct = tmpConstruct;
@@ -80,18 +79,22 @@ public class AddWritableBuffer {
     current = tmpCurrent;
     listAdd = tmpListAdd;
     bufChainOut = tmpBufChainOut;
-
   }
 
   /**
-   * Add the provided ByteBuf to the gRPC BufferChainOutputStream if possible, else copy the buffer to the stream.
+   * Add the provided ByteBuf to the gRPC BufferChainOutputStream if possible, else copy the buffer
+   * to the stream.
+   *
    * @param buf The buffer to add.
    * @param stream The Candidate OutputStream to add to.
-   * @param tryZeroCopy If true, try to zero-copy append the buffer to the stream. This may not succeed.
+   * @param tryZeroCopy If true, try to zero-copy append the buffer to the stream. This may not
+   *     succeed.
    * @return True if buffer was zero-copy added to the stream. False if the buffer was copied.
-   * @throws IOException if the fast path is not enabled and there was an error copying the buffer to the stream.
+   * @throws IOException if the fast path is not enabled and there was an error copying the buffer
+   *     to the stream.
    */
-  public static boolean add(ByteBuf buf, OutputStream stream, boolean tryZeroCopy) throws IOException {
+  public static boolean add(ByteBuf buf, OutputStream stream, boolean tryZeroCopy)
+      throws IOException {
     if (!tryZeroCopy || !tryAddBuffer(buf, stream)) {
       buf.getBytes(0, stream, buf.readableBytes());
       return false;
@@ -120,7 +123,10 @@ private static boolean tryAddBuffer(ByteBuf buf, OutputStream stream) throws IOE
       listAdd.invoke(list, obj);
       current.set(stream, obj);
       return true;
-    } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | InstantiationException e) {
+    } catch (IllegalAccessException
+        | IllegalArgumentException
+        | InvocationTargetException
+        | InstantiationException e) {
       e.printStackTrace();
       return false;
     }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/CallCredentialAdapter.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/CallCredentialAdapter.java
index 285ddb9ba6ed8..f33e9b2f9469f 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/CallCredentialAdapter.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/CallCredentialAdapter.java
@@ -14,20 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.grpc;
 
+import io.grpc.CallCredentials;
+import io.grpc.Metadata;
 import java.util.concurrent.Executor;
 import java.util.function.Consumer;
-
 import org.apache.arrow.flight.CallHeaders;
 
-import io.grpc.CallCredentials;
-import io.grpc.Metadata;
-
-/**
- * Adapter class to utilize a CredentialWriter to implement Grpc CallCredentials.
- */
+/** Adapter class to utilize a CredentialWriter to implement Grpc CallCredentials. */
 public class CallCredentialAdapter extends CallCredentials {
 
   private final Consumer<CallHeaders> credentialWriter;
@@ -37,13 +32,14 @@ public CallCredentialAdapter(Consumer<CallHeaders> credentialWriter) {
   }
 
   @Override
-  public void applyRequestMetadata(RequestInfo requestInfo, Executor executor, MetadataApplier metadataApplier) {
-    executor.execute(() ->
-    {
-      final Metadata headers = new Metadata();
-      credentialWriter.accept(new MetadataAdapter(headers));
-      metadataApplier.apply(headers);
-    });
+  public void applyRequestMetadata(
+      RequestInfo requestInfo, Executor executor, MetadataApplier metadataApplier) {
+    executor.execute(
+        () -> {
+          final Metadata headers = new Metadata();
+          credentialWriter.accept(new MetadataAdapter(headers));
+          metadataApplier.apply(headers);
+        });
   }
 
   @Override
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/ClientInterceptorAdapter.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/ClientInterceptorAdapter.java
index db27aa481ec75..ae29fe8f770fb 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/ClientInterceptorAdapter.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/ClientInterceptorAdapter.java
@@ -14,19 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.grpc;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.arrow.flight.CallInfo;
-import org.apache.arrow.flight.CallStatus;
-import org.apache.arrow.flight.FlightClientMiddleware;
-import org.apache.arrow.flight.FlightMethod;
-import org.apache.arrow.flight.FlightRuntimeException;
-import org.apache.arrow.flight.FlightStatusCode;
-
 import io.grpc.CallOptions;
 import io.grpc.Channel;
 import io.grpc.ClientCall;
@@ -37,11 +26,20 @@
 import io.grpc.MethodDescriptor;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.arrow.flight.CallInfo;
+import org.apache.arrow.flight.CallStatus;
+import org.apache.arrow.flight.FlightClientMiddleware;
+import org.apache.arrow.flight.FlightMethod;
+import org.apache.arrow.flight.FlightRuntimeException;
+import org.apache.arrow.flight.FlightStatusCode;
 
 /**
  * An adapter between Flight client middleware and gRPC interceptors.
  *
- * <p>This is implemented as a single gRPC interceptor that runs all Flight client middleware sequentially.
+ * <p>This is implemented as a single gRPC interceptor that runs all Flight client middleware
+ * sequentially.
  */
 public class ClientInterceptorAdapter implements ClientInterceptor {
 
@@ -52,8 +50,8 @@ public ClientInterceptorAdapter(List<FlightClientMiddleware.Factory> factories)
   }
 
   @Override
-  public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT, RespT> method,
-      CallOptions callOptions, Channel next) {
+  public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
+      MethodDescriptor<ReqT, RespT> method, CallOptions callOptions, Channel next) {
     final List<FlightClientMiddleware> middleware = new ArrayList<>();
     final CallInfo info = new CallInfo(FlightMethod.fromProtocol(method.getFullMethodName()));
 
@@ -73,15 +71,17 @@ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT
   }
 
   /**
-   * The ClientCallListener which hooks into the gRPC request cycle and actually runs middleware at certain points.
+   * The ClientCallListener which hooks into the gRPC request cycle and actually runs middleware at
+   * certain points.
    */
-  private static class FlightClientCallListener<RespT> extends SimpleForwardingClientCallListener<RespT> {
+  private static class FlightClientCallListener<RespT>
+      extends SimpleForwardingClientCallListener<RespT> {
 
     private final List<FlightClientMiddleware> middleware;
     boolean receivedHeaders;
 
-    public FlightClientCallListener(ClientCall.Listener<RespT> responseListener,
-        List<FlightClientMiddleware> middleware) {
+    public FlightClientCallListener(
+        ClientCall.Listener<RespT> responseListener, List<FlightClientMiddleware> middleware) {
       super(responseListener);
       this.middleware = middleware;
       receivedHeaders = false;
@@ -103,8 +103,10 @@ public void onHeaders(Metadata headers) {
     public void onClose(Status status, Metadata trailers) {
       try {
         if (!receivedHeaders) {
-          // gRPC doesn't always send response headers if the call errors or completes immediately, but instead
-          // consolidates them with the trailers. If we never got headers, assume this happened and run the header
+          // gRPC doesn't always send response headers if the call errors or completes immediately,
+          // but instead
+          // consolidates them with the trailers. If we never got headers, assume this happened and
+          // run the header
           // callback with the trailers.
           final MetadataAdapter adapter = new MetadataAdapter(trailers);
           middleware.forEach(m -> m.onHeadersReceived(adapter));
@@ -121,11 +123,13 @@ public void onClose(Status status, Metadata trailers) {
   /**
    * The gRPC ClientCall which hooks into the gRPC request cycle and injects our ClientCallListener.
    */
-  private static class FlightClientCall<ReqT, RespT> extends SimpleForwardingClientCall<ReqT, RespT> {
+  private static class FlightClientCall<ReqT, RespT>
+      extends SimpleForwardingClientCall<ReqT, RespT> {
 
     private final List<FlightClientMiddleware> middleware;
 
-    public FlightClientCall(ClientCall<ReqT, RespT> clientCall, List<FlightClientMiddleware> middleware) {
+    public FlightClientCall(
+        ClientCall<ReqT, RespT> clientCall, List<FlightClientMiddleware> middleware) {
       super(clientCall);
       this.middleware = middleware;
     }
@@ -140,7 +144,8 @@ public void start(Listener<RespT> responseListener, Metadata headers) {
 
     @Override
     public void cancel(String message, Throwable cause) {
-      final CallStatus flightStatus = new CallStatus(FlightStatusCode.CANCELLED, cause, message, null);
+      final CallStatus flightStatus =
+          new CallStatus(FlightStatusCode.CANCELLED, cause, message, null);
       middleware.forEach(m -> m.onCallCompleted(flightStatus));
       super.cancel(message, cause);
     }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/ContextPropagatingExecutorService.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/ContextPropagatingExecutorService.java
index 8f6bb6db29b7c..d0187bbec846a 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/ContextPropagatingExecutorService.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/ContextPropagatingExecutorService.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.grpc;
 
+import io.grpc.Context;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -27,14 +27,12 @@
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
-import io.grpc.Context;
-
 /**
  * An {@link ExecutorService} that propagates the {@link Context}.
  *
- * <p>Context is used to propagate per-call state, like the authenticated user, between threads (as gRPC makes no
- * guarantees about what thread things execute on). This wrapper makes it easy to preserve this when using an Executor.
- * The Context itself is immutable, so it is thread-safe.
+ * <p>Context is used to propagate per-call state, like the authenticated user, between threads (as
+ * gRPC makes no guarantees about what thread things execute on). This wrapper makes it easy to
+ * preserve this when using an Executor. The Context itself is immutable, so it is thread-safe.
  */
 public class ContextPropagatingExecutorService implements ExecutorService {
 
@@ -89,25 +87,32 @@ public Future<?> submit(Runnable task) {
   }
 
   @Override
-  public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) throws InterruptedException {
-    return delegate.invokeAll(tasks.stream().map(Context.current()::wrap).collect(Collectors.toList()));
+  public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks)
+      throws InterruptedException {
+    return delegate.invokeAll(
+        tasks.stream().map(Context.current()::wrap).collect(Collectors.toList()));
   }
 
   @Override
-  public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout,
-      TimeUnit unit) throws InterruptedException {
-    return delegate.invokeAll(tasks.stream().map(Context.current()::wrap).collect(Collectors.toList()), timeout, unit);
+  public <T> List<Future<T>> invokeAll(
+      Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
+      throws InterruptedException {
+    return delegate.invokeAll(
+        tasks.stream().map(Context.current()::wrap).collect(Collectors.toList()), timeout, unit);
   }
 
   @Override
-  public <T> T invokeAny(Collection<? extends Callable<T>> tasks) throws InterruptedException, ExecutionException {
-    return delegate.invokeAny(tasks.stream().map(Context.current()::wrap).collect(Collectors.toList()));
+  public <T> T invokeAny(Collection<? extends Callable<T>> tasks)
+      throws InterruptedException, ExecutionException {
+    return delegate.invokeAny(
+        tasks.stream().map(Context.current()::wrap).collect(Collectors.toList()));
   }
 
   @Override
   public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit)
       throws InterruptedException, ExecutionException, TimeoutException {
-    return delegate.invokeAny(tasks.stream().map(Context.current()::wrap).collect(Collectors.toList()), timeout, unit);
+    return delegate.invokeAny(
+        tasks.stream().map(Context.current()::wrap).collect(Collectors.toList()), timeout, unit);
   }
 
   @Override
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/CredentialCallOption.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/CredentialCallOption.java
index 3bde7a835118d..11a7670849e33 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/CredentialCallOption.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/CredentialCallOption.java
@@ -14,19 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.grpc;
 
+import io.grpc.stub.AbstractStub;
 import java.util.function.Consumer;
-
 import org.apache.arrow.flight.CallHeaders;
 import org.apache.arrow.flight.CallOptions;
 
-import io.grpc.stub.AbstractStub;
-
-/**
- * Method option for supplying credentials to method calls.
- */
+/** Method option for supplying credentials to method calls. */
 public class CredentialCallOption implements CallOptions.GrpcCallOption {
   private final Consumer<CallHeaders> credentialWriter;
 
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/GetReadableBuffer.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/GetReadableBuffer.java
index 82cfd7f39c91c..45c32a86c6a78 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/GetReadableBuffer.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/GetReadableBuffer.java
@@ -14,20 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.grpc;
 
+import com.google.common.base.Throwables;
+import com.google.common.io.ByteStreams;
+import io.grpc.internal.ReadableBuffer;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
-
 import org.apache.arrow.memory.ArrowBuf;
 
-import com.google.common.base.Throwables;
-import com.google.common.io.ByteStreams;
-
-import io.grpc.internal.ReadableBuffer;
-
 /**
  * Enable access to ReadableBuffer directly to copy data from a BufferInputStream into a target
  * ByteBuffer/ByteBuf.
@@ -51,7 +47,8 @@ public class GetReadableBuffer {
       tmpField = f;
       tmpClazz = clazz;
     } catch (Exception e) {
-      new RuntimeException("Failed to initialize GetReadableBuffer, falling back to slow path", e).printStackTrace();
+      new RuntimeException("Failed to initialize GetReadableBuffer, falling back to slow path", e)
+          .printStackTrace();
     }
     READABLE_BUFFER = tmpField;
     BUFFER_INPUT_STREAM = tmpClazz;
@@ -60,8 +57,8 @@ public class GetReadableBuffer {
   /**
    * Extracts the ReadableBuffer for the given input stream.
    *
-   * @param is Must be an instance of io.grpc.internal.ReadableBuffers$BufferInputStream or
-   *     null will be returned.
+   * @param is Must be an instance of io.grpc.internal.ReadableBuffers$BufferInputStream or null
+   *     will be returned.
    */
   public static ReadableBuffer getReadableBuffer(InputStream is) {
 
@@ -78,14 +75,17 @@ public static ReadableBuffer getReadableBuffer(InputStream is) {
 
   /**
    * Helper method to read a gRPC-provided InputStream into an ArrowBuf.
+   *
    * @param stream The stream to read from. Should be an instance of {@link #BUFFER_INPUT_STREAM}.
    * @param buf The buffer to read into.
    * @param size The number of bytes to read.
-   * @param fastPath Whether to enable the fast path (i.e. detect whether the stream is a {@link #BUFFER_INPUT_STREAM}).
+   * @param fastPath Whether to enable the fast path (i.e. detect whether the stream is a {@link
+   *     #BUFFER_INPUT_STREAM}).
    * @throws IOException if there is an error reading form the stream
    */
-  public static void readIntoBuffer(final InputStream stream, final ArrowBuf buf, final int size,
-      final boolean fastPath) throws IOException {
+  public static void readIntoBuffer(
+      final InputStream stream, final ArrowBuf buf, final int size, final boolean fastPath)
+      throws IOException {
     ReadableBuffer readableBuffer = fastPath ? getReadableBuffer(stream) : null;
     if (readableBuffer != null) {
       readableBuffer.readBytes(buf.nioBuffer(0, size));
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/MetadataAdapter.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/MetadataAdapter.java
index 25e4fb0197f95..a1de16ede6502 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/MetadataAdapter.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/MetadataAdapter.java
@@ -14,24 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.grpc;
 
+import io.grpc.Metadata;
 import java.nio.charset.StandardCharsets;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
-
 import org.apache.arrow.flight.CallHeaders;
 
-import io.grpc.Metadata;
-import io.grpc.Metadata.Key;
-
 /**
  * A mutable adapter between the gRPC Metadata object and the Flight headers interface.
  *
- * <p>This allows us to present the headers (metadata) from gRPC without copying to/from our own object.
+ * <p>This allows us to present the headers (metadata) from gRPC without copying to/from our own
+ * object.
  */
 public class MetadataAdapter implements CallHeaders {
 
@@ -65,7 +62,8 @@ public Iterable<byte[]> getAllByte(String key) {
       return this.metadata.getAll(Metadata.Key.of(key, Metadata.BINARY_BYTE_MARSHALLER));
     }
     return StreamSupport.stream(getAll(key).spliterator(), false)
-        .map(String::getBytes).collect(Collectors.toList());
+        .map(String::getBytes)
+        .collect(Collectors.toList());
   }
 
   @Override
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/RequestContextAdapter.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/RequestContextAdapter.java
index 9be4d12b90ef2..978a5b9ac528e 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/RequestContextAdapter.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/RequestContextAdapter.java
@@ -14,29 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.grpc;
 
+import io.grpc.Context;
 import java.util.HashMap;
 import java.util.Set;
-
 import org.apache.arrow.flight.RequestContext;
 
-import io.grpc.Context;
-
-
-/**
- * Adapter for holding key value pairs.
- */
+/** Adapter for holding key value pairs. */
 public class RequestContextAdapter implements RequestContext {
   public static final Context.Key<RequestContext> REQUEST_CONTEXT_KEY =
-          Context.key("arrow-flight-request-context");
+      Context.key("arrow-flight-request-context");
   private final HashMap<String, String> map = new HashMap<>();
 
   @Override
   public void put(String key, String value) {
     if (map.putIfAbsent(key, value) != null) {
-      throw new IllegalArgumentException("Duplicate write to a RequestContext at key " + key + " not allowed.");
+      throw new IllegalArgumentException(
+          "Duplicate write to a RequestContext at key " + key + " not allowed.");
     }
   }
 
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/ServerBackpressureThresholdInterceptor.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/ServerBackpressureThresholdInterceptor.java
new file mode 100644
index 0000000000000..ca0d40e1abfda
--- /dev/null
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/ServerBackpressureThresholdInterceptor.java
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.flight.grpc;
+
+import io.grpc.Metadata;
+import io.grpc.ServerCall;
+import io.grpc.ServerCallHandler;
+import io.grpc.ServerInterceptor;
+
+/**
+ * An interceptor for specifying the number of bytes that can be queued before a call with an output
+ * stream gets blocked by backpressure.
+ */
+public class ServerBackpressureThresholdInterceptor implements ServerInterceptor {
+
+  private final int numBytes;
+
+  public ServerBackpressureThresholdInterceptor(int numBytes) {
+    this.numBytes = numBytes;
+  }
+
+  @Override
+  public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
+      ServerCall<ReqT, RespT> call, Metadata headers, ServerCallHandler<ReqT, RespT> next) {
+    call.setOnReadyThreshold(numBytes);
+    return next.startCall(call, headers);
+  }
+}
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/ServerInterceptorAdapter.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/ServerInterceptorAdapter.java
index 70c667df56020..e7a79b9f7b685 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/ServerInterceptorAdapter.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/ServerInterceptorAdapter.java
@@ -14,15 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.grpc;
 
+import io.grpc.Context;
+import io.grpc.Contexts;
+import io.grpc.ForwardingServerCall.SimpleForwardingServerCall;
+import io.grpc.Metadata;
+import io.grpc.ServerCall;
+import io.grpc.ServerCall.Listener;
+import io.grpc.ServerCallHandler;
+import io.grpc.ServerInterceptor;
+import io.grpc.Status;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.arrow.flight.CallInfo;
 import org.apache.arrow.flight.CallStatus;
 import org.apache.arrow.flight.FlightConstants;
@@ -30,24 +37,14 @@
 import org.apache.arrow.flight.FlightProducer.CallContext;
 import org.apache.arrow.flight.FlightRuntimeException;
 import org.apache.arrow.flight.FlightServerMiddleware;
-import org.apache.arrow.flight.FlightServerMiddleware.Factory;
 import org.apache.arrow.flight.FlightServerMiddleware.Key;
 
-import io.grpc.Context;
-import io.grpc.Contexts;
-import io.grpc.ForwardingServerCall.SimpleForwardingServerCall;
-import io.grpc.Metadata;
-import io.grpc.ServerCall;
-import io.grpc.ServerCall.Listener;
-import io.grpc.ServerCallHandler;
-import io.grpc.ServerInterceptor;
-import io.grpc.Status;
-
 /**
  * An adapter between Flight middleware and a gRPC interceptor.
  *
- * <p>This is implemented as a single gRPC interceptor that runs all Flight server middleware sequentially. Flight
- * middleware instances are stored in the gRPC Context so their state is accessible later.
+ * <p>This is implemented as a single gRPC interceptor that runs all Flight server middleware
+ * sequentially. Flight middleware instances are stored in the gRPC Context so their state is
+ * accessible later.
  */
 public class ServerInterceptorAdapter implements ServerInterceptor {
 
@@ -61,7 +58,8 @@ public static class KeyFactory<T extends FlightServerMiddleware> {
     private final FlightServerMiddleware.Key<T> key;
     private final FlightServerMiddleware.Factory<T> factory;
 
-    public KeyFactory(FlightServerMiddleware.Key<T> key, FlightServerMiddleware.Factory<T> factory) {
+    public KeyFactory(
+        FlightServerMiddleware.Key<T> key, FlightServerMiddleware.Factory<T> factory) {
       this.key = key;
       this.factory = factory;
     }
@@ -70,10 +68,12 @@ public KeyFactory(FlightServerMiddleware.Key<T> key, FlightServerMiddleware.Fact
   /**
    * The {@link Context.Key} that stores the Flight middleware active for a particular call.
    *
-   * <p>Applications should not use this directly. Instead, see {@link CallContext#getMiddleware(Key)}.
+   * <p>Applications should not use this directly. Instead, see {@link
+   * CallContext#getMiddleware(Key)}.
    */
-  public static final Context.Key<Map<FlightServerMiddleware.Key<?>, FlightServerMiddleware>> SERVER_MIDDLEWARE_KEY =
-      Context.key("arrow.flight.server_middleware");
+  public static final Context.Key<Map<FlightServerMiddleware.Key<?>, FlightServerMiddleware>>
+      SERVER_MIDDLEWARE_KEY = Context.key("arrow.flight.server_middleware");
+
   private final List<KeyFactory<?>> factories;
 
   public ServerInterceptorAdapter(List<KeyFactory<?>> factories) {
@@ -81,16 +81,18 @@ public ServerInterceptorAdapter(List<KeyFactory<?>> factories) {
   }
 
   @Override
-  public <ReqT, RespT> Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call, Metadata headers,
-      ServerCallHandler<ReqT, RespT> next) {
+  public <ReqT, RespT> Listener<ReqT> interceptCall(
+      ServerCall<ReqT, RespT> call, Metadata headers, ServerCallHandler<ReqT, RespT> next) {
     if (!FlightConstants.SERVICE.equals(call.getMethodDescriptor().getServiceName())) {
       return Contexts.interceptCall(Context.current(), call, headers, next);
     }
-    
-    final CallInfo info = new CallInfo(FlightMethod.fromProtocol(call.getMethodDescriptor().getFullMethodName()));
+
+    final CallInfo info =
+        new CallInfo(FlightMethod.fromProtocol(call.getMethodDescriptor().getFullMethodName()));
     final List<FlightServerMiddleware> middleware = new ArrayList<>();
     // Use LinkedHashMap to preserve insertion order
-    final Map<FlightServerMiddleware.Key<?>, FlightServerMiddleware> middlewareMap = new LinkedHashMap<>();
+    final Map<FlightServerMiddleware.Key<?>, FlightServerMiddleware> middlewareMap =
+        new LinkedHashMap<>();
     final MetadataAdapter headerAdapter = new MetadataAdapter(headers);
     final RequestContextAdapter requestContextAdapter = new RequestContextAdapter();
     for (final KeyFactory<?> factory : factories) {
@@ -106,45 +108,50 @@ public <ReqT, RespT> Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call,
       middlewareMap.put(factory.key, m);
     }
 
-    // Inject the middleware into the context so RPC method implementations can communicate with middleware instances
-    final Context contextWithMiddlewareAndRequestsOptions = Context.current()
-        .withValue(SERVER_MIDDLEWARE_KEY, Collections.unmodifiableMap(middlewareMap))
-        .withValue(RequestContextAdapter.REQUEST_CONTEXT_KEY, requestContextAdapter);
-
-    final SimpleForwardingServerCall<ReqT, RespT> forwardingServerCall = new SimpleForwardingServerCall<ReqT, RespT>(
-        call) {
-      boolean sentHeaders = false;
-
-      @Override
-      public void sendHeaders(Metadata headers) {
-        sentHeaders = true;
-        try {
-          final MetadataAdapter headerAdapter = new MetadataAdapter(headers);
-          middleware.forEach(m -> m.onBeforeSendingHeaders(headerAdapter));
-        } finally {
-          // Make sure to always call the gRPC callback to avoid interrupting the gRPC request cycle
-          super.sendHeaders(headers);
-        }
-      }
-
-      @Override
-      public void close(Status status, Metadata trailers) {
-        try {
-          if (!sentHeaders) {
-            // gRPC doesn't always send response headers if the call errors or completes immediately
-            final MetadataAdapter headerAdapter = new MetadataAdapter(trailers);
-            middleware.forEach(m -> m.onBeforeSendingHeaders(headerAdapter));
+    // Inject the middleware into the context so RPC method implementations can communicate with
+    // middleware instances
+    final Context contextWithMiddlewareAndRequestsOptions =
+        Context.current()
+            .withValue(SERVER_MIDDLEWARE_KEY, Collections.unmodifiableMap(middlewareMap))
+            .withValue(RequestContextAdapter.REQUEST_CONTEXT_KEY, requestContextAdapter);
+
+    final SimpleForwardingServerCall<ReqT, RespT> forwardingServerCall =
+        new SimpleForwardingServerCall<ReqT, RespT>(call) {
+          boolean sentHeaders = false;
+
+          @Override
+          public void sendHeaders(Metadata headers) {
+            sentHeaders = true;
+            try {
+              final MetadataAdapter headerAdapter = new MetadataAdapter(headers);
+              middleware.forEach(m -> m.onBeforeSendingHeaders(headerAdapter));
+            } finally {
+              // Make sure to always call the gRPC callback to avoid interrupting the gRPC request
+              // cycle
+              super.sendHeaders(headers);
+            }
           }
-        } finally {
-          // Make sure to always call the gRPC callback to avoid interrupting the gRPC request cycle
-          super.close(status, trailers);
-        }
-
-        final CallStatus flightStatus = StatusUtils.fromGrpcStatus(status);
-        middleware.forEach(m -> m.onCallCompleted(flightStatus));
-      }
-    };
-    return Contexts.interceptCall(contextWithMiddlewareAndRequestsOptions, forwardingServerCall, headers, next);
 
+          @Override
+          public void close(Status status, Metadata trailers) {
+            try {
+              if (!sentHeaders) {
+                // gRPC doesn't always send response headers if the call errors or completes
+                // immediately
+                final MetadataAdapter headerAdapter = new MetadataAdapter(trailers);
+                middleware.forEach(m -> m.onBeforeSendingHeaders(headerAdapter));
+              }
+            } finally {
+              // Make sure to always call the gRPC callback to avoid interrupting the gRPC request
+              // cycle
+              super.close(status, trailers);
+            }
+
+            final CallStatus flightStatus = StatusUtils.fromGrpcStatus(status);
+            middleware.forEach(m -> m.onCallCompleted(flightStatus));
+          }
+        };
+    return Contexts.interceptCall(
+        contextWithMiddlewareAndRequestsOptions, forwardingServerCall, headers, next);
   }
 }
diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/StatusUtils.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/StatusUtils.java
index 7f0dcf2da3f0d..1dd724477d6e7 100644
--- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/StatusUtils.java
+++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/StatusUtils.java
@@ -14,26 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.grpc;
 
+import io.grpc.InternalMetadata;
+import io.grpc.Metadata;
+import io.grpc.Status;
+import io.grpc.Status.Code;
+import io.grpc.StatusException;
+import io.grpc.StatusRuntimeException;
 import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 import java.util.Objects;
 import java.util.function.Function;
-
 import org.apache.arrow.flight.CallStatus;
 import org.apache.arrow.flight.ErrorFlightMetadata;
 import org.apache.arrow.flight.FlightRuntimeException;
 import org.apache.arrow.flight.FlightStatusCode;
 
-import io.grpc.InternalMetadata;
-import io.grpc.Metadata;
-import io.grpc.Status;
-import io.grpc.Status.Code;
-import io.grpc.StatusException;
-import io.grpc.StatusRuntimeException;
-
 /**
  * Utilities to adapt gRPC and Flight status objects.
  *
@@ -45,9 +42,7 @@ private StatusUtils() {
     throw new AssertionError("Do not instantiate this class.");
   }
 
-  /**
-   * Convert from a Flight status code to a gRPC status code.
-   */
+  /** Convert from a Flight status code to a gRPC status code. */
   public static Status.Code toGrpcStatusCode(FlightStatusCode code) {
     switch (code) {
       case OK:
@@ -74,14 +69,14 @@ public static Status.Code toGrpcStatusCode(FlightStatusCode code) {
         return Code.UNIMPLEMENTED;
       case UNAVAILABLE:
         return Code.UNAVAILABLE;
+      case RESOURCE_EXHAUSTED:
+        return Code.RESOURCE_EXHAUSTED;
       default:
         return Code.UNKNOWN;
     }
   }
 
-  /**
-   * Convert from a gRPC status code to a Flight status code.
-   */
+  /** Convert from a gRPC status code to a Flight status code. */
   public static FlightStatusCode fromGrpcStatusCode(Status.Code code) {
     switch (code) {
       case OK:
@@ -101,7 +96,7 @@ public static FlightStatusCode fromGrpcStatusCode(Status.Code code) {
       case PERMISSION_DENIED:
         return FlightStatusCode.UNAUTHORIZED;
       case RESOURCE_EXHAUSTED:
-        return FlightStatusCode.INVALID_ARGUMENT;
+        return FlightStatusCode.RESOURCE_EXHAUSTED;
       case FAILED_PRECONDITION:
         return FlightStatusCode.INVALID_ARGUMENT;
       case ABORTED:
@@ -136,28 +131,29 @@ static Metadata.Key<String> keyOfAscii(String name) {
 
   /** Convert from a gRPC Status & trailers to a Flight status. */
   public static CallStatus fromGrpcStatusAndTrailers(Status status, Metadata trailers) {
-    // gRPC may not always have trailers - this happens when the server internally generates an error, which is rare,
+    // gRPC may not always have trailers - this happens when the server internally generates an
+    // error, which is rare,
     // but can happen.
     final ErrorFlightMetadata errorMetadata = trailers == null ? null : parseTrailers(trailers);
     return new CallStatus(
-              fromGrpcStatusCode(status.getCode()),
-              status.getCause(),
-              status.getDescription(),
-              errorMetadata);
+        fromGrpcStatusCode(status.getCode()),
+        status.getCause(),
+        status.getDescription(),
+        errorMetadata);
   }
 
   /** Convert from a gRPC status to a Flight status. */
   public static CallStatus fromGrpcStatus(Status status) {
     return new CallStatus(
-              fromGrpcStatusCode(status.getCode()),
-              status.getCause(),
-              status.getDescription(),
-              null);
+        fromGrpcStatusCode(status.getCode()), status.getCause(), status.getDescription(), null);
   }
 
   /** Convert from a Flight status to a gRPC status. */
   public static Status toGrpcStatus(CallStatus status) {
-    return toGrpcStatusCode(status.code()).toStatus().withDescription(status.description()).withCause(status.cause());
+    return toGrpcStatusCode(status.code())
+        .toStatus()
+        .withDescription(status.description())
+        .withCause(status.cause());
   }
 
   /** Convert from a gRPC exception to a Flight exception. */
@@ -172,15 +168,15 @@ private static ErrorFlightMetadata parseTrailers(Metadata trailers) {
       if (key.endsWith(Metadata.BINARY_HEADER_SUFFIX)) {
         metadata.insert(key, trailers.get(keyOfBinary(key)));
       } else {
-        metadata.insert(key, Objects.requireNonNull(trailers.get(keyOfAscii(key))).getBytes(StandardCharsets.UTF_8));
+        metadata.insert(
+            key,
+            Objects.requireNonNull(trailers.get(keyOfAscii(key))).getBytes(StandardCharsets.UTF_8));
       }
     }
     return metadata;
   }
 
-  /**
-   * Convert arbitrary exceptions to a {@link FlightRuntimeException}.
-   */
+  /** Convert arbitrary exceptions to a {@link FlightRuntimeException}. */
   public static FlightRuntimeException fromThrowable(Throwable t) {
     if (t instanceof StatusRuntimeException) {
       return fromGrpcRuntimeException((StatusRuntimeException) t);
@@ -193,8 +189,8 @@ public static FlightRuntimeException fromThrowable(Throwable t) {
   /**
    * Convert arbitrary exceptions to a {@link StatusRuntimeException} or {@link StatusException}.
    *
-   * <p>Such exceptions can be passed to {@link io.grpc.stub.StreamObserver#onError(Throwable)} and will give the client
-   * a reasonable error message.
+   * <p>Such exceptions can be passed to {@link io.grpc.stub.StreamObserver#onError(Throwable)} and
+   * will give the client a reasonable error message.
    */
   public static Throwable toGrpcException(Throwable ex) {
     if (ex instanceof StatusRuntimeException) {
@@ -209,7 +205,9 @@ public static Throwable toGrpcException(Throwable ex) {
       }
       return toGrpcStatus(fre.status()).asRuntimeException();
     }
-    return Status.INTERNAL.withCause(ex).withDescription("There was an error servicing your request.")
+    return Status.INTERNAL
+        .withCause(ex)
+        .withDescription("There was an error servicing your request.")
         .asRuntimeException();
   }
 
@@ -226,11 +224,11 @@ private static Metadata toGrpcMetadata(ErrorFlightMetadata metadata) {
   }
 
   /**
-   * Maps a transformation function to the elements of an iterator, while wrapping exceptions in {@link
-   * FlightRuntimeException}.
+   * Maps a transformation function to the elements of an iterator, while wrapping exceptions in
+   * {@link FlightRuntimeException}.
    */
-  public static <FROM, TO> Iterator<TO> wrapIterator(Iterator<FROM> fromIterator,
-      Function<? super FROM, ? extends TO> transformer) {
+  public static <FROM, TO> Iterator<TO> wrapIterator(
+      Iterator<FROM> fromIterator, Function<? super FROM, ? extends TO> transformer) {
     Objects.requireNonNull(fromIterator);
     Objects.requireNonNull(transformer);
     return new Iterator<TO>() {
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/FlightTestUtil.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/FlightTestUtil.java
index 393fa086775ed..767687a51785e 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/FlightTestUtil.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/FlightTestUtil.java
@@ -14,23 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.arrow.vector.test.util.ArrowTestDataUtil;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.function.Executable;
 
-/**
- * Utility methods and constants for testing flight servers.
- */
+/** Utility methods and constants for testing flight servers. */
 public class FlightTestUtil {
 
   public static final String LOCALHOST = "localhost";
@@ -47,9 +45,12 @@ static List<CertKeyPair> exampleTlsCerts() {
     final Path root = getFlightTestDataRoot();
     final Path cert0Pem = root.resolve("cert0.pem");
     if (!Files.exists(cert0Pem)) {
-      throw new RuntimeException(cert0Pem + " doesn't exist. Make sure submodules are initialized (see https://arrow.apache.org/docs/dev/developers/java/building.html#building)");
+      throw new RuntimeException(
+          cert0Pem
+              + " doesn't exist. Make sure submodules are initialized (see https://arrow.apache.org/docs/dev/developers/java/building.html#building)");
     }
-    return Arrays.asList(new CertKeyPair(cert0Pem.toFile(), root.resolve("cert0.pkcs1").toFile()),
+    return Arrays.asList(
+        new CertKeyPair(cert0Pem.toFile(), root.resolve("cert0.pkcs1").toFile()),
         new CertKeyPair(root.resolve("cert1.pem").toFile(), root.resolve("cert1.pkcs1").toFile()));
   }
 
@@ -57,7 +58,10 @@ static boolean isEpollAvailable() {
     try {
       Class<?> epoll = Class.forName("io.netty.channel.epoll.Epoll");
       return (Boolean) epoll.getMethod("isAvailable").invoke(null);
-    } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+    } catch (ClassNotFoundException
+        | NoSuchMethodException
+        | IllegalAccessException
+        | InvocationTargetException e) {
       return false;
     }
   }
@@ -66,7 +70,10 @@ static boolean isKqueueAvailable() {
     try {
       Class<?> kqueue = Class.forName("io.netty.channel.kqueue.KQueue");
       return (Boolean) kqueue.getMethod("isAvailable").invoke(null);
-    } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+    } catch (ClassNotFoundException
+        | NoSuchMethodException
+        | IllegalAccessException
+        | InvocationTargetException e) {
       return false;
     }
   }
@@ -77,13 +84,14 @@ static boolean isNativeTransportAvailable() {
 
   /**
    * Assert that the given runnable fails with a Flight exception of the given code.
+   *
    * @param code The expected Flight status code.
    * @param r The code to run.
    * @return The thrown status.
    */
   public static CallStatus assertCode(FlightStatusCode code, Executable r) {
-    final FlightRuntimeException ex = Assertions.assertThrows(FlightRuntimeException.class, r);
-    Assertions.assertEquals(code, ex.status().code());
+    final FlightRuntimeException ex = assertThrows(FlightRuntimeException.class, r);
+    assertEquals(code, ex.status().code());
     return ex.status();
   }
 
@@ -98,6 +106,5 @@ public CertKeyPair(File cert, File key) {
     }
   }
 
-  private FlightTestUtil() {
-  }
+  private FlightTestUtil() {}
 }
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestApplicationMetadata.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestApplicationMetadata.java
index 77c039afd87a0..d8b1f6f05f880 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestApplicationMetadata.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestApplicationMetadata.java
@@ -14,11 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
 import static org.apache.arrow.flight.Location.forGrpcInsecure;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -26,7 +28,6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
-
 import org.apache.arrow.flight.FlightClient.PutListener;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
@@ -36,13 +37,10 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-/**
- * Tests for application-specific metadata support in Flight.
- */
+/** Tests for application-specific metadata support in Flight. */
 public class TestApplicationMetadata {
 
   // The command used to trigger the test for ARROW-6136.
@@ -50,178 +48,193 @@ public class TestApplicationMetadata {
   // The expected error message.
   private static final String MESSAGE_ARROW_6136 = "The stream should not be double-closed.";
 
-  /**
-   * Ensure that a client can read the metadata sent from the server.
-   */
+  /** Ensure that a client can read the metadata sent from the server. */
   @Test
   // This test is consistently flaky on CI, unfortunately.
   @Disabled
   public void retrieveMetadata() {
-    test((allocator, client) -> {
-      try (final FlightStream stream = client.getStream(new Ticket(new byte[0]))) {
-        byte i = 0;
-        while (stream.next()) {
-          final IntVector vector = (IntVector) stream.getRoot().getVector("a");
-          Assertions.assertEquals(1, vector.getValueCount());
-          Assertions.assertEquals(10, vector.get(0));
-          Assertions.assertEquals(i, stream.getLatestMetadata().getByte(0));
-          i++;
-        }
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    });
+    test(
+        (allocator, client) -> {
+          try (final FlightStream stream = client.getStream(new Ticket(new byte[0]))) {
+            byte i = 0;
+            while (stream.next()) {
+              final IntVector vector = (IntVector) stream.getRoot().getVector("a");
+              assertEquals(1, vector.getValueCount());
+              assertEquals(10, vector.get(0));
+              assertEquals(i, stream.getLatestMetadata().getByte(0));
+              i++;
+            }
+          } catch (Exception e) {
+            throw new RuntimeException(e);
+          }
+        });
   }
 
-  /** ARROW-6136: make sure that the Flight implementation doesn't double-close the server-to-client stream. */
+  /**
+   * ARROW-6136: make sure that the Flight implementation doesn't double-close the server-to-client
+   * stream.
+   */
   @Test
   public void arrow6136() {
     final Schema schema = new Schema(Collections.emptyList());
-    test((allocator, client) -> {
-      try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
-        final FlightDescriptor descriptor = FlightDescriptor.command(COMMAND_ARROW_6136);
+    test(
+        (allocator, client) -> {
+          try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+            final FlightDescriptor descriptor = FlightDescriptor.command(COMMAND_ARROW_6136);
 
-        final PutListener listener = new SyncPutListener();
-        final FlightClient.ClientStreamListener writer = client.startPut(descriptor, root, listener);
-        // Must attempt to retrieve the result to get any server-side errors.
-        final CallStatus status = FlightTestUtil.assertCode(FlightStatusCode.INTERNAL, writer::getResult);
-        Assertions.assertEquals(MESSAGE_ARROW_6136, status.description());
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    });
+            final PutListener listener = new SyncPutListener();
+            final FlightClient.ClientStreamListener writer =
+                client.startPut(descriptor, root, listener);
+            // Must attempt to retrieve the result to get any server-side errors.
+            final CallStatus status =
+                FlightTestUtil.assertCode(FlightStatusCode.INTERNAL, writer::getResult);
+            assertEquals(MESSAGE_ARROW_6136, status.description());
+          } catch (Exception e) {
+            throw new RuntimeException(e);
+          }
+        });
   }
 
-  /**
-   * Ensure that a client can send metadata to the server.
-   */
+  /** Ensure that a client can send metadata to the server. */
   @Test
   @Disabled
   public void uploadMetadataAsync() {
-    final Schema schema = new Schema(Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
-    test((allocator, client) -> {
-      try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
-        final FlightDescriptor descriptor = FlightDescriptor.path("test");
+    final Schema schema =
+        new Schema(Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
+    test(
+        (allocator, client) -> {
+          try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+            final FlightDescriptor descriptor = FlightDescriptor.path("test");
 
-        final PutListener listener = new AsyncPutListener() {
-          int counter = 0;
+            final PutListener listener =
+                new AsyncPutListener() {
+                  int counter = 0;
 
-          @Override
-          public void onNext(PutResult val) {
-            Assertions.assertNotNull(val);
-            Assertions.assertEquals(counter, val.getApplicationMetadata().getByte(0));
-            counter++;
-          }
-        };
-        final FlightClient.ClientStreamListener writer = client.startPut(descriptor, root, listener);
+                  @Override
+                  public void onNext(PutResult val) {
+                    assertNotNull(val);
+                    assertEquals(counter, val.getApplicationMetadata().getByte(0));
+                    counter++;
+                  }
+                };
+            final FlightClient.ClientStreamListener writer =
+                client.startPut(descriptor, root, listener);
 
-        root.allocateNew();
-        for (byte i = 0; i < 10; i++) {
-          final IntVector vector = (IntVector) root.getVector("a");
-          final ArrowBuf metadata = allocator.buffer(1);
-          metadata.writeByte(i);
-          vector.set(0, 10);
-          vector.setValueCount(1);
-          root.setRowCount(1);
-          writer.putNext(metadata);
-        }
-        writer.completed();
-        // Must attempt to retrieve the result to get any server-side errors.
-        writer.getResult();
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    });
+            root.allocateNew();
+            for (byte i = 0; i < 10; i++) {
+              final IntVector vector = (IntVector) root.getVector("a");
+              final ArrowBuf metadata = allocator.buffer(1);
+              metadata.writeByte(i);
+              vector.set(0, 10);
+              vector.setValueCount(1);
+              root.setRowCount(1);
+              writer.putNext(metadata);
+            }
+            writer.completed();
+            // Must attempt to retrieve the result to get any server-side errors.
+            writer.getResult();
+          } catch (Exception e) {
+            throw new RuntimeException(e);
+          }
+        });
   }
 
-  /**
-   * Ensure that a client can send metadata to the server. Uses the synchronous API.
-   */
+  /** Ensure that a client can send metadata to the server. Uses the synchronous API. */
   @Test
   @Disabled
   public void uploadMetadataSync() {
-    final Schema schema = new Schema(Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
-    test((allocator, client) -> {
-      try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator);
-          final SyncPutListener listener = new SyncPutListener()) {
-        final FlightDescriptor descriptor = FlightDescriptor.path("test");
-        final FlightClient.ClientStreamListener writer = client.startPut(descriptor, root, listener);
+    final Schema schema =
+        new Schema(Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
+    test(
+        (allocator, client) -> {
+          try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator);
+              final SyncPutListener listener = new SyncPutListener()) {
+            final FlightDescriptor descriptor = FlightDescriptor.path("test");
+            final FlightClient.ClientStreamListener writer =
+                client.startPut(descriptor, root, listener);
 
-        root.allocateNew();
-        for (byte i = 0; i < 10; i++) {
-          final IntVector vector = (IntVector) root.getVector("a");
-          final ArrowBuf metadata = allocator.buffer(1);
-          metadata.writeByte(i);
-          vector.set(0, 10);
-          vector.setValueCount(1);
-          root.setRowCount(1);
-          writer.putNext(metadata);
-          try (final PutResult message = listener.poll(5000, TimeUnit.SECONDS)) {
-            Assertions.assertNotNull(message);
-            Assertions.assertEquals(i, message.getApplicationMetadata().getByte(0));
-          } catch (InterruptedException | ExecutionException e) {
-            throw new RuntimeException(e);
+            root.allocateNew();
+            for (byte i = 0; i < 10; i++) {
+              final IntVector vector = (IntVector) root.getVector("a");
+              final ArrowBuf metadata = allocator.buffer(1);
+              metadata.writeByte(i);
+              vector.set(0, 10);
+              vector.setValueCount(1);
+              root.setRowCount(1);
+              writer.putNext(metadata);
+              try (final PutResult message = listener.poll(5000, TimeUnit.SECONDS)) {
+                assertNotNull(message);
+                assertEquals(i, message.getApplicationMetadata().getByte(0));
+              } catch (InterruptedException | ExecutionException e) {
+                throw new RuntimeException(e);
+              }
+            }
+            writer.completed();
+            // Must attempt to retrieve the result to get any server-side errors.
+            writer.getResult();
           }
-        }
-        writer.completed();
-        // Must attempt to retrieve the result to get any server-side errors.
-        writer.getResult();
-      }
-    });
+        });
   }
 
-  /**
-   * Make sure that a {@link SyncPutListener} properly reclaims memory if ignored.
-   */
+  /** Make sure that a {@link SyncPutListener} properly reclaims memory if ignored. */
   @Test
   @Disabled
   public void syncMemoryReclaimed() {
-    final Schema schema = new Schema(Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
-    test((allocator, client) -> {
-      try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator);
-          final SyncPutListener listener = new SyncPutListener()) {
-        final FlightDescriptor descriptor = FlightDescriptor.path("test");
-        final FlightClient.ClientStreamListener writer = client.startPut(descriptor, root, listener);
+    final Schema schema =
+        new Schema(Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
+    test(
+        (allocator, client) -> {
+          try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator);
+              final SyncPutListener listener = new SyncPutListener()) {
+            final FlightDescriptor descriptor = FlightDescriptor.path("test");
+            final FlightClient.ClientStreamListener writer =
+                client.startPut(descriptor, root, listener);
 
-        root.allocateNew();
-        for (byte i = 0; i < 10; i++) {
-          final IntVector vector = (IntVector) root.getVector("a");
-          final ArrowBuf metadata = allocator.buffer(1);
-          metadata.writeByte(i);
-          vector.set(0, 10);
-          vector.setValueCount(1);
-          root.setRowCount(1);
-          writer.putNext(metadata);
-        }
-        writer.completed();
-        // Must attempt to retrieve the result to get any server-side errors.
-        writer.getResult();
-      }
-    });
+            root.allocateNew();
+            for (byte i = 0; i < 10; i++) {
+              final IntVector vector = (IntVector) root.getVector("a");
+              final ArrowBuf metadata = allocator.buffer(1);
+              metadata.writeByte(i);
+              vector.set(0, 10);
+              vector.setValueCount(1);
+              root.setRowCount(1);
+              writer.putNext(metadata);
+            }
+            writer.completed();
+            // Must attempt to retrieve the result to get any server-side errors.
+            writer.getResult();
+          }
+        });
   }
 
   /**
-   * ARROW-9221: Flight copies metadata from the byte buffer of a Protobuf ByteString,
-   * which is in big-endian by default, thus mangling metadata.
+   * ARROW-9221: Flight copies metadata from the byte buffer of a Protobuf ByteString, which is in
+   * big-endian by default, thus mangling metadata.
    */
   @Test
   public void testMetadataEndianness() throws Exception {
     try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         final BufferAllocator serverAllocator = allocator.newChildAllocator("flight-server", 0, Long.MAX_VALUE);
-         final FlightServer server = FlightServer.builder(serverAllocator, forGrpcInsecure(LOCALHOST, 0),
-             new EndianFlightProducer(serverAllocator)).build().start();
-         final FlightClient client = FlightClient.builder(allocator, server.getLocation()).build()) {
+        final BufferAllocator serverAllocator =
+            allocator.newChildAllocator("flight-server", 0, Long.MAX_VALUE);
+        final FlightServer server =
+            FlightServer.builder(
+                    serverAllocator,
+                    forGrpcInsecure(LOCALHOST, 0),
+                    new EndianFlightProducer(serverAllocator))
+                .build()
+                .start();
+        final FlightClient client = FlightClient.builder(allocator, server.getLocation()).build()) {
       final Schema schema = new Schema(Collections.emptyList());
       final FlightDescriptor descriptor = FlightDescriptor.command(new byte[0]);
       try (final SyncPutListener reader = new SyncPutListener();
-           final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+          final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
         final FlightClient.ClientStreamListener writer = client.startPut(descriptor, root, reader);
         writer.completed();
         try (final PutResult metadata = reader.read()) {
-          Assertions.assertEquals(16, metadata.getApplicationMetadata().readableBytes());
+          assertEquals(16, metadata.getApplicationMetadata().readableBytes());
           byte[] bytes = new byte[16];
           metadata.getApplicationMetadata().readBytes(bytes);
-          Assertions.assertArrayEquals(EndianFlightProducer.EXPECTED_BYTES, bytes);
+          assertArrayEquals(EndianFlightProducer.EXPECTED_BYTES, bytes);
         }
         writer.getResult();
       }
@@ -230,18 +243,19 @@ public void testMetadataEndianness() throws Exception {
 
   private void test(BiConsumer<BufferAllocator, FlightClient> fun) {
     try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         final FlightServer s = FlightServer.builder(allocator, forGrpcInsecure(LOCALHOST, 0),
-             new MetadataFlightProducer(allocator)).build().start();
-         final FlightClient client = FlightClient.builder(allocator, s.getLocation()).build()) {
+        final FlightServer s =
+            FlightServer.builder(
+                    allocator, forGrpcInsecure(LOCALHOST, 0), new MetadataFlightProducer(allocator))
+                .build()
+                .start();
+        final FlightClient client = FlightClient.builder(allocator, s.getLocation()).build()) {
       fun.accept(allocator, client);
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
   }
 
-  /**
-   * A FlightProducer that always produces a fixed data stream with metadata on the side.
-   */
+  /** A FlightProducer that always produces a fixed data stream with metadata on the side. */
   private static class MetadataFlightProducer extends NoOpFlightProducer {
 
     private final BufferAllocator allocator;
@@ -252,7 +266,8 @@ public MetadataFlightProducer(BufferAllocator allocator) {
 
     @Override
     public void getStream(CallContext context, Ticket ticket, ServerStreamListener listener) {
-      final Schema schema = new Schema(Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
+      final Schema schema =
+          new Schema(Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
       try (VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
         root.allocateNew();
         listener.start(root);
@@ -270,12 +285,13 @@ public void getStream(CallContext context, Ticket ticket, ServerStreamListener l
     }
 
     @Override
-    public Runnable acceptPut(CallContext context, FlightStream stream, StreamListener<PutResult> ackStream) {
+    public Runnable acceptPut(
+        CallContext context, FlightStream stream, StreamListener<PutResult> ackStream) {
       return () -> {
         // Wait for the descriptor to be sent
         stream.getRoot();
-        if (stream.getDescriptor().isCommand() &&
-            Arrays.equals(stream.getDescriptor().getCommand(), COMMAND_ARROW_6136)) {
+        if (stream.getDescriptor().isCommand()
+            && Arrays.equals(stream.getDescriptor().getCommand(), COMMAND_ARROW_6136)) {
           // ARROW-6136: Try closing the stream
           ackStream.onError(
               CallStatus.INTERNAL.withDescription(MESSAGE_ARROW_6136).toRuntimeException());
@@ -286,16 +302,22 @@ public Runnable acceptPut(CallContext context, FlightStream stream, StreamListen
           while (stream.next()) {
             final ArrowBuf metadata = stream.getLatestMetadata();
             if (current != metadata.getByte(0)) {
-              ackStream.onError(CallStatus.INVALID_ARGUMENT.withDescription(String
-                  .format("Metadata does not match expected value; got %d but expected %d.", metadata.getByte(0),
-                      current)).toRuntimeException());
+              ackStream.onError(
+                  CallStatus.INVALID_ARGUMENT
+                      .withDescription(
+                          String.format(
+                              "Metadata does not match expected value; got %d but expected %d.",
+                              metadata.getByte(0), current))
+                      .toRuntimeException());
               return;
             }
             ackStream.onNext(PutResult.metadata(metadata));
             current++;
           }
           if (current != 10) {
-            throw CallStatus.INVALID_ARGUMENT.withDescription("Wrong number of messages sent.").toRuntimeException();
+            throw CallStatus.INVALID_ARGUMENT
+                .withDescription("Wrong number of messages sent.")
+                .toRuntimeException();
           }
         } catch (Exception e) {
           throw CallStatus.INTERNAL.withCause(e).withDescription(e.toString()).toRuntimeException();
@@ -313,7 +335,8 @@ private EndianFlightProducer(BufferAllocator allocator) {
     }
 
     @Override
-    public Runnable acceptPut(CallContext context, FlightStream flightStream, StreamListener<PutResult> ackStream) {
+    public Runnable acceptPut(
+        CallContext context, FlightStream flightStream, StreamListener<PutResult> ackStream) {
       return () -> {
         while (flightStream.next()) {
           // Ignore any data
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestAuth.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestAuth.java
index 1a38922010ae8..bd582e29a4332 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestAuth.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestAuth.java
@@ -14,20 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
 import static org.apache.arrow.flight.Location.forGrpcInsecure;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.Iterator;
 import java.util.Optional;
-
 import org.apache.arrow.flight.auth.ClientAuthHandler;
 import org.apache.arrow.flight.auth.ServerAuthHandler;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 public class TestAuth {
@@ -35,51 +33,64 @@ public class TestAuth {
   /** An auth handler that does not send messages should not block the server forever. */
   @Test
   public void noMessages() throws Exception {
-    Assertions.assertThrows(RuntimeException.class, () -> {
-      try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-           final FlightServer s = FlightServer.builder(allocator, forGrpcInsecure(LOCALHOST, 0),
-               new NoOpFlightProducer()).authHandler(
-               new OneshotAuthHandler()).build().start();
-           final FlightClient client = FlightClient.builder(allocator, s.getLocation()).build()) {
-        client.authenticate(new ClientAuthHandler() {
-          @Override
-          public void authenticate(ClientAuthSender outgoing, Iterator<byte[]> incoming) {
-          }
+    assertThrows(
+        RuntimeException.class,
+        () -> {
+          try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
+              final FlightServer s =
+                  FlightServer.builder(
+                          allocator, forGrpcInsecure(LOCALHOST, 0), new NoOpFlightProducer())
+                      .authHandler(new OneshotAuthHandler())
+                      .build()
+                      .start();
+              final FlightClient client =
+                  FlightClient.builder(allocator, s.getLocation()).build()) {
+            client.authenticate(
+                new ClientAuthHandler() {
+                  @Override
+                  public void authenticate(ClientAuthSender outgoing, Iterator<byte[]> incoming) {}
 
-          @Override
-          public byte[] getCallToken() {
-            return new byte[0];
+                  @Override
+                  public byte[] getCallToken() {
+                    return new byte[0];
+                  }
+                });
           }
         });
-      }
-    });
   }
 
   /** An auth handler that sends an error should not block the server forever. */
   @Test
   public void clientError() throws Exception {
-    Assertions.assertThrows(RuntimeException.class, () -> {
-      try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-           final FlightServer s = FlightServer.builder(allocator, forGrpcInsecure(LOCALHOST, 0),
-               new NoOpFlightProducer()).authHandler(
-               new OneshotAuthHandler()).build().start();
-           final FlightClient client = FlightClient.builder(allocator, s.getLocation()).build()) {
-        client.authenticate(new ClientAuthHandler() {
-          @Override
-          public void authenticate(ClientAuthSender outgoing, Iterator<byte[]> incoming) {
-            outgoing.send(new byte[0]);
-            // Ensure the server-side runs
-            incoming.next();
-            outgoing.onError(new RuntimeException("test"));
-          }
+    assertThrows(
+        RuntimeException.class,
+        () -> {
+          try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
+              final FlightServer s =
+                  FlightServer.builder(
+                          allocator, forGrpcInsecure(LOCALHOST, 0), new NoOpFlightProducer())
+                      .authHandler(new OneshotAuthHandler())
+                      .build()
+                      .start();
+              final FlightClient client =
+                  FlightClient.builder(allocator, s.getLocation()).build()) {
+            client.authenticate(
+                new ClientAuthHandler() {
+                  @Override
+                  public void authenticate(ClientAuthSender outgoing, Iterator<byte[]> incoming) {
+                    outgoing.send(new byte[0]);
+                    // Ensure the server-side runs
+                    incoming.next();
+                    outgoing.onError(new RuntimeException("test"));
+                  }
 
-          @Override
-          public byte[] getCallToken() {
-            return new byte[0];
+                  @Override
+                  public byte[] getCallToken() {
+                    return new byte[0];
+                  }
+                });
           }
         });
-      }
-    });
   }
 
   private static class OneshotAuthHandler implements ServerAuthHandler {
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestBackPressure.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestBackPressure.java
index 596debcf89dd2..52891dd9e7175 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestBackPressure.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestBackPressure.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
 import static org.apache.arrow.flight.Location.forGrpcInsecure;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.google.common.collect.ImmutableList;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
-
 import org.apache.arrow.flight.perf.PerformanceTestServer;
 import org.apache.arrow.flight.perf.TestPerf;
 import org.apache.arrow.memory.BufferAllocator;
@@ -34,38 +34,32 @@
 import org.apache.arrow.vector.types.Types.MinorType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import com.google.common.collect.ImmutableList;
-
 public class TestBackPressure {
 
   private static final int BATCH_SIZE = 4095;
 
-  /**
-   * Make sure that failing to consume one stream doesn't block other streams.
-   */
+  /** Make sure that failing to consume one stream doesn't block other streams. */
   @Disabled
   @Test
   public void ensureIndependentSteams() throws Exception {
     ensureIndependentSteams((b) -> (location -> new PerformanceTestServer(b, location)));
   }
 
-  /**
-   * Make sure that failing to consume one stream doesn't block other streams.
-   */
+  /** Make sure that failing to consume one stream doesn't block other streams. */
   @Disabled
   @Test
   public void ensureIndependentSteamsWithCallbacks() throws Exception {
-    ensureIndependentSteams((b) -> (location -> new PerformanceTestServer(b, location,
-        new BackpressureStrategy.CallbackBackpressureStrategy(), true)));
+    ensureIndependentSteams(
+        (b) ->
+            (location ->
+                new PerformanceTestServer(
+                    b, location, new BackpressureStrategy.CallbackBackpressureStrategy(), true)));
   }
 
-  /**
-   * Test to make sure stream doesn't go faster than the consumer is consuming.
-   */
+  /** Test to make sure stream doesn't go faster than the consumer is consuming. */
   @Disabled
   @Test
   public void ensureWaitUntilProceed() throws Exception {
@@ -73,8 +67,8 @@ public void ensureWaitUntilProceed() throws Exception {
   }
 
   /**
-   * Test to make sure stream doesn't go faster than the consumer is consuming using a callback-based
-   * backpressure strategy.
+   * Test to make sure stream doesn't go faster than the consumer is consuming using a
+   * callback-based backpressure strategy.
    */
   @Disabled
   @Test
@@ -82,25 +76,31 @@ public void ensureWaitUntilProceedWithCallbacks() throws Exception {
     ensureWaitUntilProceed(new RecordingCallbackBackpressureStrategy(), true);
   }
 
-  /**
-   * Make sure that failing to consume one stream doesn't block other streams.
-   */
-  private static void ensureIndependentSteams(Function<BufferAllocator, Function<Location, PerformanceTestServer>>
-                                                  serverConstructor) throws Exception {
-    try (
-        final BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
-        final PerformanceTestServer server = serverConstructor.apply(a).apply(forGrpcInsecure(LOCALHOST, 0)).start();
-        final FlightClient client = FlightClient.builder(a, server.getLocation()).build()
-    ) {
-      try (FlightStream fs1 = client.getStream(client.getInfo(
-          TestPerf.getPerfFlightDescriptor(110L * BATCH_SIZE, BATCH_SIZE, 1))
-          .getEndpoints().get(0).getTicket())) {
+  /** Make sure that failing to consume one stream doesn't block other streams. */
+  private static void ensureIndependentSteams(
+      Function<BufferAllocator, Function<Location, PerformanceTestServer>> serverConstructor)
+      throws Exception {
+    try (final BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
+        final PerformanceTestServer server =
+            serverConstructor.apply(a).apply(forGrpcInsecure(LOCALHOST, 0)).start();
+        final FlightClient client = FlightClient.builder(a, server.getLocation()).build()) {
+      try (FlightStream fs1 =
+          client.getStream(
+              client
+                  .getInfo(TestPerf.getPerfFlightDescriptor(110L * BATCH_SIZE, BATCH_SIZE, 1))
+                  .getEndpoints()
+                  .get(0)
+                  .getTicket())) {
         consume(fs1, 10);
 
         // stop consuming fs1 but make sure we can consume a large amount of fs2.
-        try (FlightStream fs2 = client.getStream(client.getInfo(
-            TestPerf.getPerfFlightDescriptor(200L * BATCH_SIZE, BATCH_SIZE, 1))
-            .getEndpoints().get(0).getTicket())) {
+        try (FlightStream fs2 =
+            client.getStream(
+                client
+                    .getInfo(TestPerf.getPerfFlightDescriptor(200L * BATCH_SIZE, BATCH_SIZE, 1))
+                    .getEndpoints()
+                    .get(0)
+                    .getTicket())) {
           consume(fs2, 100);
 
           consume(fs1, 100);
@@ -113,65 +113,67 @@ private static void ensureIndependentSteams(Function<BufferAllocator, Function<L
     }
   }
 
-  /**
-   * Make sure that a stream doesn't go faster than the consumer is consuming.
-   */
-  private static void ensureWaitUntilProceed(SleepTimeRecordingBackpressureStrategy bpStrategy, boolean isNonBlocking)
-      throws Exception {
+  /** Make sure that a stream doesn't go faster than the consumer is consuming. */
+  private static void ensureWaitUntilProceed(
+      SleepTimeRecordingBackpressureStrategy bpStrategy, boolean isNonBlocking) throws Exception {
     // request some values.
     final long wait = 3000;
     final long epsilon = 1000;
 
     try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE)) {
 
-      final FlightProducer producer = new NoOpFlightProducer() {
-
-        @Override
-        public void getStream(CallContext context, Ticket ticket, ServerStreamListener listener) {
-          bpStrategy.register(listener);
-          final Runnable loadData = () -> {
-            int batches = 0;
-            final Schema pojoSchema = new Schema(ImmutableList.of(Field.nullable("a", MinorType.BIGINT.getType())));
-            try (VectorSchemaRoot root = VectorSchemaRoot.create(pojoSchema, allocator)) {
-              listener.start(root);
-              while (true) {
-                bpStrategy.waitForListener(0);
-                if (batches > 100) {
-                  root.clear();
-                  listener.completed();
-                  return;
-                }
-
-                root.allocateNew();
-                root.setRowCount(4095);
-                listener.putNext();
-                batches++;
+      final FlightProducer producer =
+          new NoOpFlightProducer() {
+
+            @Override
+            public void getStream(
+                CallContext context, Ticket ticket, ServerStreamListener listener) {
+              bpStrategy.register(listener);
+              final Runnable loadData =
+                  () -> {
+                    int batches = 0;
+                    final Schema pojoSchema =
+                        new Schema(
+                            ImmutableList.of(Field.nullable("a", MinorType.BIGINT.getType())));
+                    try (VectorSchemaRoot root = VectorSchemaRoot.create(pojoSchema, allocator)) {
+                      listener.start(root);
+                      while (true) {
+                        bpStrategy.waitForListener(0);
+                        if (batches > 100) {
+                          root.clear();
+                          listener.completed();
+                          return;
+                        }
+
+                        root.allocateNew();
+                        root.setRowCount(4095);
+                        listener.putNext();
+                        batches++;
+                      }
+                    }
+                  };
+
+              if (!isNonBlocking) {
+                loadData.run();
+              } else {
+                final ExecutorService service = Executors.newSingleThreadExecutor();
+                Future<?> unused = service.submit(loadData);
+                service.shutdown();
               }
             }
           };
 
-          if (!isNonBlocking) {
-            loadData.run();
-          } else {
-            final ExecutorService service = Executors.newSingleThreadExecutor();
-            Future<?> unused = service.submit(loadData);
-            service.shutdown();
-          }
-        }
-      };
-
-
-      try (
-          BufferAllocator serverAllocator = allocator.newChildAllocator("server", 0, Long.MAX_VALUE);
-          FlightServer server = FlightServer.builder(serverAllocator, forGrpcInsecure(LOCALHOST, 0), producer)
-              .build().start();
-          BufferAllocator clientAllocator = allocator.newChildAllocator("client", 0, Long.MAX_VALUE);
+      try (BufferAllocator serverAllocator =
+              allocator.newChildAllocator("server", 0, Long.MAX_VALUE);
+          FlightServer server =
+              FlightServer.builder(serverAllocator, forGrpcInsecure(LOCALHOST, 0), producer)
+                  .build()
+                  .start();
+          BufferAllocator clientAllocator =
+              allocator.newChildAllocator("client", 0, Long.MAX_VALUE);
           FlightClient client =
-              FlightClient
-                  .builder(clientAllocator, server.getLocation())
-                  .build();
-          FlightStream stream = client.getStream(new Ticket(new byte[1]))
-      ) {
+              FlightClient.builder(clientAllocator, server.getLocation()).build();
+          FlightStream stream = client.getStream(new Ticket(new byte[1]))) {
         VectorSchemaRoot root = stream.getRoot();
         root.clear();
         Thread.sleep(wait);
@@ -179,15 +181,11 @@ public void getStream(CallContext context, Ticket ticket, ServerStreamListener l
           root.clear();
         }
         long expected = wait - epsilon;
-        Assertions.assertTrue(
+        assertTrue(
             bpStrategy.getSleepTime() > expected,
             String.format(
                 "Expected a sleep of at least %dms but only slept for %d",
-                expected,
-                bpStrategy.getSleepTime()
-            )
-        );
-
+                expected, bpStrategy.getSleepTime()));
       }
     }
   }
@@ -210,15 +208,18 @@ private static void consume(FlightStream stream, int batches) {
   private interface SleepTimeRecordingBackpressureStrategy extends BackpressureStrategy {
     /**
      * Returns the total time spent waiting on the listener to be ready.
+     *
      * @return the total time spent waiting on the listener to be ready.
      */
     long getSleepTime();
   }
 
   /**
-   * Implementation of a backpressure strategy that polls on isReady and records amount of time spent in Thread.sleep().
+   * Implementation of a backpressure strategy that polls on isReady and records amount of time
+   * spent in Thread.sleep().
    */
-  private static class PollingBackpressureStrategy implements SleepTimeRecordingBackpressureStrategy {
+  private static class PollingBackpressureStrategy
+      implements SleepTimeRecordingBackpressureStrategy {
     private final AtomicLong sleepTime = new AtomicLong(0);
     private FlightProducer.ServerStreamListener listener;
 
@@ -247,10 +248,11 @@ public WaitResult waitForListener(long timeout) {
   }
 
   /**
-   * Implementation of a backpressure strategy that uses callbacks to detect changes in client readiness state
-   * and records spent time waiting.
+   * Implementation of a backpressure strategy that uses callbacks to detect changes in client
+   * readiness state and records spent time waiting.
    */
-  private static class RecordingCallbackBackpressureStrategy extends BackpressureStrategy.CallbackBackpressureStrategy
+  private static class RecordingCallbackBackpressureStrategy
+      extends BackpressureStrategy.CallbackBackpressureStrategy
       implements SleepTimeRecordingBackpressureStrategy {
     private final AtomicLong sleepTime = new AtomicLong(0);
 
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestBasicOperation.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestBasicOperation.java
index bc34b5e6d6074..5e818e6f5d02e 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestBasicOperation.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestBasicOperation.java
@@ -14,13 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
-
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
 import static org.apache.arrow.flight.Location.forGrpcInsecure;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
+import com.google.common.base.Charsets;
+import com.google.protobuf.ByteString;
+import io.grpc.MethodDescriptor;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -39,7 +46,6 @@
 import java.util.Map;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
-
 import org.apache.arrow.flight.FlightClient.ClientStreamListener;
 import org.apache.arrow.flight.impl.Flight;
 import org.apache.arrow.flight.impl.Flight.FlightDescriptor.DescriptorType;
@@ -58,263 +64,295 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledOnOs;
 import org.junit.jupiter.api.condition.OS;
 
-import com.google.common.base.Charsets;
-import com.google.protobuf.ByteString;
-
-import io.grpc.MethodDescriptor;
-
-/**
- * Test the operations of a basic flight service.
- */
+/** Test the operations of a basic flight service. */
 public class TestBasicOperation {
 
   @Test
   public void fastPathDefaults() {
-    Assertions.assertTrue(ArrowMessage.ENABLE_ZERO_COPY_READ);
-    Assertions.assertFalse(ArrowMessage.ENABLE_ZERO_COPY_WRITE);
+    assertTrue(ArrowMessage.ENABLE_ZERO_COPY_READ);
+    assertFalse(ArrowMessage.ENABLE_ZERO_COPY_WRITE);
   }
 
   @Test
   public void fallbackLocation() {
-    Assertions.assertEquals("arrow-flight-reuse-connection://?",
-            Location.reuseConnection().getUri().toString());
+    assertEquals(
+        "arrow-flight-reuse-connection://?", Location.reuseConnection().getUri().toString());
   }
 
-  /**
-   * ARROW-6017: we should be able to construct locations for unknown schemes.
-   */
+  /** ARROW-6017: we should be able to construct locations for unknown schemes. */
   @Test
   public void unknownScheme() throws URISyntaxException {
     final Location location = new Location("s3://unknown");
-    Assertions.assertEquals("s3", location.getUri().getScheme());
+    assertEquals("s3", location.getUri().getScheme());
   }
 
   @Test
   public void unknownSchemeRemote() throws Exception {
-    test(c -> {
-      try {
-        final FlightInfo info = c.getInfo(FlightDescriptor.path("test"));
-        Assertions.assertEquals(new URI("https://example.com"), info.getEndpoints().get(0).getLocations().get(0).getUri());
-      } catch (URISyntaxException e) {
-        throw new RuntimeException(e);
-      }
-    });
+    test(
+        c -> {
+          try {
+            final FlightInfo info = c.getInfo(FlightDescriptor.path("test"));
+            assertEquals(
+                new URI("https://example.com"),
+                info.getEndpoints().get(0).getLocations().get(0).getUri());
+          } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
+          }
+        });
   }
 
   @Test
   public void roundTripTicket() throws Exception {
-    final Ticket ticket = new Ticket(new byte[]{0, 1, 2, 3, 4, 5});
-    Assertions.assertEquals(ticket, Ticket.deserialize(ticket.serialize()));
+    final Ticket ticket = new Ticket(new byte[] {0, 1, 2, 3, 4, 5});
+    assertEquals(ticket, Ticket.deserialize(ticket.serialize()));
   }
 
   @Test
   public void roundTripInfo() throws Exception {
     final Map<String, String> metadata = new HashMap<>();
     metadata.put("foo", "bar");
-    final Schema schema = new Schema(Arrays.asList(
-        Field.nullable("a", new ArrowType.Int(32, true)),
-        Field.nullable("b", new ArrowType.FixedSizeBinary(32))
-    ), metadata);
-    final FlightInfo info1 = FlightInfo.builder(schema, FlightDescriptor.path(), Collections.emptyList())
-            .setAppMetadata("foo".getBytes(StandardCharsets.UTF_8)).build();
-    final FlightInfo info2 = new FlightInfo(schema, FlightDescriptor.command(new byte[2]),
-        Collections.singletonList(
-                FlightEndpoint.builder(new Ticket(new byte[10]), Location.forGrpcDomainSocket("/tmp/test.sock"))
-                        .setAppMetadata("bar".getBytes(StandardCharsets.UTF_8)).build()
-        ), 200, 500);
-    final FlightInfo info3 = new FlightInfo(schema, FlightDescriptor.path("a", "b"),
-        Arrays.asList(new FlightEndpoint(
-                new Ticket(new byte[10]), Location.forGrpcDomainSocket("/tmp/test.sock")),
-            new FlightEndpoint(
-                new Ticket(new byte[10]), Location.forGrpcDomainSocket("/tmp/test.sock"),
-                forGrpcInsecure("localhost", 50051))
-        ), 200, 500);
-    final FlightInfo info4 = new FlightInfo(schema, FlightDescriptor.path("a", "b"),
-            Arrays.asList(new FlightEndpoint(
-                            new Ticket(new byte[10]), Location.forGrpcDomainSocket("/tmp/test.sock")),
-                    new FlightEndpoint(
-                            new Ticket(new byte[10]), Location.forGrpcDomainSocket("/tmp/test.sock"),
-                            forGrpcInsecure("localhost", 50051))
-            ), 200, 500, /*ordered*/ true, IpcOption.DEFAULT);
-
-    Assertions.assertEquals(info1, FlightInfo.deserialize(info1.serialize()));
-    Assertions.assertEquals(info2, FlightInfo.deserialize(info2.serialize()));
-    Assertions.assertEquals(info3, FlightInfo.deserialize(info3.serialize()));
-    Assertions.assertEquals(info4, FlightInfo.deserialize(info4.serialize()));
-
-    Assertions.assertNotEquals(info3, info4);
-
-    Assertions.assertFalse(info1.getOrdered());
-    Assertions.assertFalse(info2.getOrdered());
-    Assertions.assertFalse(info3.getOrdered());
-    Assertions.assertTrue(info4.getOrdered());
+    final Schema schema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("a", new ArrowType.Int(32, true)),
+                Field.nullable("b", new ArrowType.FixedSizeBinary(32))),
+            metadata);
+    final FlightInfo info1 =
+        FlightInfo.builder(schema, FlightDescriptor.path(), Collections.emptyList())
+            .setAppMetadata("foo".getBytes(StandardCharsets.UTF_8))
+            .build();
+    final FlightInfo info2 =
+        new FlightInfo(
+            schema,
+            FlightDescriptor.command(new byte[2]),
+            Collections.singletonList(
+                FlightEndpoint.builder(
+                        new Ticket(new byte[10]), Location.forGrpcDomainSocket("/tmp/test.sock"))
+                    .setAppMetadata("bar".getBytes(StandardCharsets.UTF_8))
+                    .build()),
+            200,
+            500);
+    final FlightInfo info3 =
+        new FlightInfo(
+            schema,
+            FlightDescriptor.path("a", "b"),
+            Arrays.asList(
+                new FlightEndpoint(
+                    new Ticket(new byte[10]), Location.forGrpcDomainSocket("/tmp/test.sock")),
+                new FlightEndpoint(
+                    new Ticket(new byte[10]),
+                    Location.forGrpcDomainSocket("/tmp/test.sock"),
+                    forGrpcInsecure("localhost", 50051))),
+            200,
+            500);
+    final FlightInfo info4 =
+        new FlightInfo(
+            schema,
+            FlightDescriptor.path("a", "b"),
+            Arrays.asList(
+                new FlightEndpoint(
+                    new Ticket(new byte[10]), Location.forGrpcDomainSocket("/tmp/test.sock")),
+                new FlightEndpoint(
+                    new Ticket(new byte[10]),
+                    Location.forGrpcDomainSocket("/tmp/test.sock"),
+                    forGrpcInsecure("localhost", 50051))),
+            200,
+            500, /*ordered*/
+            true,
+            IpcOption.DEFAULT);
+
+    assertEquals(info1, FlightInfo.deserialize(info1.serialize()));
+    assertEquals(info2, FlightInfo.deserialize(info2.serialize()));
+    assertEquals(info3, FlightInfo.deserialize(info3.serialize()));
+    assertEquals(info4, FlightInfo.deserialize(info4.serialize()));
+
+    assertNotEquals(info3, info4);
+
+    assertFalse(info1.getOrdered());
+    assertFalse(info2.getOrdered());
+    assertFalse(info3.getOrdered());
+    assertTrue(info4.getOrdered());
   }
 
   @Test
   public void roundTripDescriptor() throws Exception {
-    final FlightDescriptor cmd = FlightDescriptor.command("test command".getBytes(StandardCharsets.UTF_8));
-    Assertions.assertEquals(cmd, FlightDescriptor.deserialize(cmd.serialize()));
+    final FlightDescriptor cmd =
+        FlightDescriptor.command("test command".getBytes(StandardCharsets.UTF_8));
+    assertEquals(cmd, FlightDescriptor.deserialize(cmd.serialize()));
     final FlightDescriptor path = FlightDescriptor.path("foo", "bar", "test.arrow");
-    Assertions.assertEquals(path, FlightDescriptor.deserialize(path.serialize()));
+    assertEquals(path, FlightDescriptor.deserialize(path.serialize()));
   }
 
   @Test
   public void getDescriptors() throws Exception {
-    test(c -> {
-      int count = 0;
-      for (FlightInfo unused : c.listFlights(Criteria.ALL)) {
-        count += 1;
-      }
-      Assertions.assertEquals(1, count);
-    });
+    test(
+        c -> {
+          int count = 0;
+          for (FlightInfo unused : c.listFlights(Criteria.ALL)) {
+            count += 1;
+          }
+          assertEquals(1, count);
+        });
   }
 
   @Test
   public void getDescriptorsWithCriteria() throws Exception {
-    test(c -> {
-      int count = 0;
-      for (FlightInfo unused : c.listFlights(new Criteria(new byte[]{1}))) {
+    test(
+        c -> {
+          int count = 0;
+          for (FlightInfo unused : c.listFlights(new Criteria(new byte[] {1}))) {
 
-        count += 1;
-      }
-      Assertions.assertEquals(0, count);
-    });
+            count += 1;
+          }
+          assertEquals(0, count);
+        });
   }
 
   @Test
   public void getDescriptor() throws Exception {
-    test(c -> {
-      System.out.println(c.getInfo(FlightDescriptor.path("hello")).getDescriptor());
-    });
+    test(
+        c -> {
+          System.out.println(c.getInfo(FlightDescriptor.path("hello")).getDescriptor());
+        });
   }
 
   @Test
   public void getSchema() throws Exception {
-    test(c -> {
-      System.out.println(c.getSchema(FlightDescriptor.path("hello")).getSchema());
-    });
+    test(
+        c -> {
+          System.out.println(c.getSchema(FlightDescriptor.path("hello")).getSchema());
+        });
   }
 
-
   @Test
   public void listActions() throws Exception {
-    test(c -> {
-      for (ActionType at : c.listActions()) {
-        System.out.println(at.getType());
-      }
-    });
+    test(
+        c -> {
+          for (ActionType at : c.listActions()) {
+            System.out.println(at.getType());
+          }
+        });
   }
 
   @Test
   public void doAction() throws Exception {
-    test(c -> {
-      Iterator<Result> stream = c.doAction(new Action("hello"));
-
-      Assertions.assertTrue(stream.hasNext());
-      Result r = stream.next();
-      Assertions.assertArrayEquals("world".getBytes(Charsets.UTF_8), r.getBody());
-    });
-    test(c -> {
-      Iterator<Result> stream = c.doAction(new Action("hellooo"));
-
-      Assertions.assertTrue(stream.hasNext());
-      Result r = stream.next();
-      Assertions.assertArrayEquals("world".getBytes(Charsets.UTF_8), r.getBody());
-
-      Assertions.assertTrue(stream.hasNext());
-      r = stream.next();
-      Assertions.assertArrayEquals("!".getBytes(Charsets.UTF_8), r.getBody());
-      Assertions.assertFalse(stream.hasNext());
-    });
+    test(
+        c -> {
+          Iterator<Result> stream = c.doAction(new Action("hello"));
+
+          assertTrue(stream.hasNext());
+          Result r = stream.next();
+          assertArrayEquals("world".getBytes(Charsets.UTF_8), r.getBody());
+        });
+    test(
+        c -> {
+          Iterator<Result> stream = c.doAction(new Action("hellooo"));
+
+          assertTrue(stream.hasNext());
+          Result r = stream.next();
+          assertArrayEquals("world".getBytes(Charsets.UTF_8), r.getBody());
+
+          assertTrue(stream.hasNext());
+          r = stream.next();
+          assertArrayEquals("!".getBytes(Charsets.UTF_8), r.getBody());
+          assertFalse(stream.hasNext());
+        });
   }
 
   @Test
   public void putStream() throws Exception {
-    test((c, a) -> {
-      final int size = 10;
-
-      IntVector iv = new IntVector("c1", a);
-
-      try (VectorSchemaRoot root = VectorSchemaRoot.of(iv)) {
-        ClientStreamListener listener = c
-            .startPut(FlightDescriptor.path("hello"), root, new AsyncPutListener());
-
-        //batch 1
-        root.allocateNew();
-        for (int i = 0; i < size; i++) {
-          iv.set(i, i);
-        }
-        iv.setValueCount(size);
-        root.setRowCount(size);
-        listener.putNext();
-
-        // batch 2
-
-        root.allocateNew();
-        for (int i = 0; i < size; i++) {
-          iv.set(i, i + size);
-        }
-        iv.setValueCount(size);
-        root.setRowCount(size);
-        listener.putNext();
-        root.clear();
-        listener.completed();
-
-        // wait for ack to avoid memory leaks.
-        listener.getResult();
-      }
-    });
+    test(
+        (c, a) -> {
+          final int size = 10;
+
+          IntVector iv = new IntVector("c1", a);
+
+          try (VectorSchemaRoot root = VectorSchemaRoot.of(iv)) {
+            ClientStreamListener listener =
+                c.startPut(FlightDescriptor.path("hello"), root, new AsyncPutListener());
+
+            // batch 1
+            root.allocateNew();
+            for (int i = 0; i < size; i++) {
+              iv.set(i, i);
+            }
+            iv.setValueCount(size);
+            root.setRowCount(size);
+            listener.putNext();
+
+            // batch 2
+
+            root.allocateNew();
+            for (int i = 0; i < size; i++) {
+              iv.set(i, i + size);
+            }
+            iv.setValueCount(size);
+            root.setRowCount(size);
+            listener.putNext();
+            root.clear();
+            listener.completed();
+
+            // wait for ack to avoid memory leaks.
+            listener.getResult();
+          }
+        });
   }
 
   @Test
   public void propagateErrors() throws Exception {
-    test(client -> {
-      FlightTestUtil.assertCode(FlightStatusCode.UNIMPLEMENTED, () -> {
-        client.doAction(new Action("invalid-action")).forEachRemaining(action -> Assertions.fail());
-      });
-    });
+    test(
+        client -> {
+          FlightTestUtil.assertCode(
+              FlightStatusCode.UNIMPLEMENTED,
+              () -> {
+                client.doAction(new Action("invalid-action")).forEachRemaining(action -> fail());
+              });
+        });
   }
 
   @Test
   public void getStream() throws Exception {
-    test(c -> {
-      try (final FlightStream stream = c.getStream(new Ticket(new byte[0]))) {
-        VectorSchemaRoot root = stream.getRoot();
-        IntVector iv = (IntVector) root.getVector("c1");
-        int value = 0;
-        while (stream.next()) {
-          for (int i = 0; i < root.getRowCount(); i++) {
-            Assertions.assertEquals(value, iv.get(i));
-            value++;
+    test(
+        c -> {
+          try (final FlightStream stream = c.getStream(new Ticket(new byte[0]))) {
+            VectorSchemaRoot root = stream.getRoot();
+            IntVector iv = (IntVector) root.getVector("c1");
+            int value = 0;
+            while (stream.next()) {
+              for (int i = 0; i < root.getRowCount(); i++) {
+                assertEquals(value, iv.get(i));
+                value++;
+              }
+            }
+          } catch (Exception e) {
+            throw new RuntimeException(e);
           }
-        }
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    });
+        });
   }
 
   /** Ensure the client is configured to accept large messages. */
   @Test
-  @DisabledOnOs(value = {OS.WINDOWS}, disabledReason = "https://github.com/apache/arrow/issues/33237: flaky test")
+  @DisabledOnOs(
+      value = {OS.WINDOWS},
+      disabledReason = "https://github.com/apache/arrow/issues/33237: flaky test")
   public void getStreamLargeBatch() throws Exception {
-    test(c -> {
-      try (final FlightStream stream = c.getStream(new Ticket(Producer.TICKET_LARGE_BATCH))) {
-        Assertions.assertEquals(128, stream.getRoot().getFieldVectors().size());
-        Assertions.assertTrue(stream.next());
-        Assertions.assertEquals(65536, stream.getRoot().getRowCount());
-        Assertions.assertTrue(stream.next());
-        Assertions.assertEquals(65536, stream.getRoot().getRowCount());
-        Assertions.assertFalse(stream.next());
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    });
+    test(
+        c -> {
+          try (final FlightStream stream = c.getStream(new Ticket(Producer.TICKET_LARGE_BATCH))) {
+            assertEquals(128, stream.getRoot().getFieldVectors().size());
+            assertTrue(stream.next());
+            assertEquals(65536, stream.getRoot().getRowCount());
+            assertTrue(stream.next());
+            assertEquals(65536, stream.getRoot().getRowCount());
+            assertFalse(stream.next());
+          } catch (Exception e) {
+            throw new RuntimeException(e);
+          }
+        });
   }
 
   /** Ensure the server is configured to accept large messages. */
@@ -329,36 +367,37 @@ public void startPutLargeBatch() throws Exception {
         }
         vectors.add(vector);
       }
-      test(c -> {
-        try (final VectorSchemaRoot root = new VectorSchemaRoot(vectors)) {
-          root.setRowCount(65536);
-          final ClientStreamListener stream = c.startPut(FlightDescriptor.path(""), root, new SyncPutListener());
-          stream.putNext();
-          stream.putNext();
-          stream.completed();
-          stream.getResult();
-        } catch (Exception e) {
-          throw new RuntimeException(e);
-        }
-      });
+      test(
+          c -> {
+            try (final VectorSchemaRoot root = new VectorSchemaRoot(vectors)) {
+              root.setRowCount(65536);
+              final ClientStreamListener stream =
+                  c.startPut(FlightDescriptor.path(""), root, new SyncPutListener());
+              stream.putNext();
+              stream.putNext();
+              stream.completed();
+              stream.getResult();
+            } catch (Exception e) {
+              throw new RuntimeException(e);
+            }
+          });
     }
   }
 
   private void test(Consumer<FlightClient> consumer) throws Exception {
-    test((c, a) -> {
-      consumer.accept(c);
-    });
+    test(
+        (c, a) -> {
+          consumer.accept(c);
+        });
   }
 
   private void test(BiConsumer<FlightClient, BufferAllocator> consumer) throws Exception {
-    try (
-        BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
+    try (BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
         Producer producer = new Producer(a);
-        FlightServer s = FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), producer).build().start()) {
+        FlightServer s =
+            FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), producer).build().start()) {
 
-      try (
-          FlightClient c = FlightClient.builder(a, s.getLocation()).build()
-      ) {
+      try (FlightClient c = FlightClient.builder(a, s.getLocation()).build()) {
         try (BufferAllocator testAllocator = a.newChildAllocator("testcase", 0, Long.MAX_VALUE)) {
           consumer.accept(c, testAllocator);
         }
@@ -368,7 +407,8 @@ private void test(BiConsumer<FlightClient, BufferAllocator> consumer) throws Exc
 
   /** Helper method to convert an ArrowMessage into a Protobuf message. */
   private Flight.FlightData arrowMessageToProtobuf(
-      MethodDescriptor.Marshaller<ArrowMessage> marshaller, ArrowMessage message) throws IOException {
+      MethodDescriptor.Marshaller<ArrowMessage> marshaller, ArrowMessage message)
+      throws IOException {
     final ByteArrayOutputStream baos = new ByteArrayOutputStream();
     try (final InputStream serialized = marshaller.stream(message)) {
       final byte[] buf = new byte[1024];
@@ -384,62 +424,77 @@ private Flight.FlightData arrowMessageToProtobuf(
     return Flight.FlightData.parseFrom(serializedMessage);
   }
 
-  /** ARROW-10962: accept FlightData messages generated by Protobuf (which can omit empty fields). */
+  /**
+   * ARROW-10962: accept FlightData messages generated by Protobuf (which can omit empty fields).
+   */
   @Test
   public void testProtobufRecordBatchCompatibility() throws Exception {
-    final Schema schema = new Schema(Collections.singletonList(Field.nullable("foo", new ArrowType.Int(32, true))));
+    final Schema schema =
+        new Schema(Collections.singletonList(Field.nullable("foo", new ArrowType.Int(32, true))));
     try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       final VectorUnloader unloader = new VectorUnloader(root);
       root.setRowCount(0);
-      final MethodDescriptor.Marshaller<ArrowMessage> marshaller = ArrowMessage.createMarshaller(allocator);
-      try (final ArrowMessage message = new ArrowMessage(
-              unloader.getRecordBatch(), /* appMetadata */ null, /* tryZeroCopy */ false, IpcOption.DEFAULT)) {
-        Assertions.assertEquals(ArrowMessage.HeaderType.RECORD_BATCH, message.getMessageType());
-        // Should have at least one empty body buffer (there may be multiple for e.g. data and validity)
+      final MethodDescriptor.Marshaller<ArrowMessage> marshaller =
+          ArrowMessage.createMarshaller(allocator);
+      try (final ArrowMessage message =
+          new ArrowMessage(
+              unloader.getRecordBatch(), /* appMetadata */
+              null, /* tryZeroCopy */
+              false,
+              IpcOption.DEFAULT)) {
+        assertEquals(ArrowMessage.HeaderType.RECORD_BATCH, message.getMessageType());
+        // Should have at least one empty body buffer (there may be multiple for e.g. data and
+        // validity)
         Iterator<ArrowBuf> iterator = message.getBufs().iterator();
-        Assertions.assertTrue(iterator.hasNext());
+        assertTrue(iterator.hasNext());
         while (iterator.hasNext()) {
-          Assertions.assertEquals(0, iterator.next().capacity());
+          assertEquals(0, iterator.next().capacity());
         }
-        final Flight.FlightData protobufData = arrowMessageToProtobuf(marshaller, message)
-            .toBuilder()
-            .clearDataBody()
-            .build();
-        Assertions.assertEquals(0, protobufData.getDataBody().size());
-        ArrowMessage parsedMessage = marshaller.parse(new ByteArrayInputStream(protobufData.toByteArray()));
+        final Flight.FlightData protobufData =
+            arrowMessageToProtobuf(marshaller, message).toBuilder().clearDataBody().build();
+        assertEquals(0, protobufData.getDataBody().size());
+        ArrowMessage parsedMessage =
+            marshaller.parse(new ByteArrayInputStream(protobufData.toByteArray()));
         // Should have an empty body buffer
         Iterator<ArrowBuf> parsedIterator = parsedMessage.getBufs().iterator();
-        Assertions.assertTrue(parsedIterator.hasNext());
-        Assertions.assertEquals(0, parsedIterator.next().capacity());
-        // Should have only one (the parser synthesizes exactly one); in the case of empty buffers, this is equivalent
-        Assertions.assertFalse(parsedIterator.hasNext());
+        assertTrue(parsedIterator.hasNext());
+        assertEquals(0, parsedIterator.next().capacity());
+        // Should have only one (the parser synthesizes exactly one); in the case of empty buffers,
+        // this is equivalent
+        assertFalse(parsedIterator.hasNext());
         // Should not throw
         final ArrowRecordBatch rb = parsedMessage.asRecordBatch();
-        Assertions.assertEquals(rb.computeBodyLength(), 0);
+        assertEquals(rb.computeBodyLength(), 0);
       }
     }
   }
 
-  /** ARROW-10962: accept FlightData messages generated by Protobuf (which can omit empty fields). */
+  /**
+   * ARROW-10962: accept FlightData messages generated by Protobuf (which can omit empty fields).
+   */
   @Test
   public void testProtobufSchemaCompatibility() throws Exception {
-    final Schema schema = new Schema(Collections.singletonList(Field.nullable("foo", new ArrowType.Int(32, true))));
+    final Schema schema =
+        new Schema(Collections.singletonList(Field.nullable("foo", new ArrowType.Int(32, true))));
     try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE)) {
-      final MethodDescriptor.Marshaller<ArrowMessage> marshaller = ArrowMessage.createMarshaller(allocator);
+      final MethodDescriptor.Marshaller<ArrowMessage> marshaller =
+          ArrowMessage.createMarshaller(allocator);
       Flight.FlightDescriptor descriptor = FlightDescriptor.command(new byte[0]).toProtocol();
       try (final ArrowMessage message = new ArrowMessage(descriptor, schema, IpcOption.DEFAULT)) {
-        Assertions.assertEquals(ArrowMessage.HeaderType.SCHEMA, message.getMessageType());
+        assertEquals(ArrowMessage.HeaderType.SCHEMA, message.getMessageType());
         // Should have no body buffers
-        Assertions.assertFalse(message.getBufs().iterator().hasNext());
-        final Flight.FlightData protobufData = arrowMessageToProtobuf(marshaller, message)
-            .toBuilder()
-            .setDataBody(ByteString.EMPTY)
-            .build();
-        Assertions.assertEquals(0, protobufData.getDataBody().size());
-        final ArrowMessage parsedMessage = marshaller.parse(new ByteArrayInputStream(protobufData.toByteArray()));
+        assertFalse(message.getBufs().iterator().hasNext());
+        final Flight.FlightData protobufData =
+            arrowMessageToProtobuf(marshaller, message)
+                .toBuilder()
+                .setDataBody(ByteString.EMPTY)
+                .build();
+        assertEquals(0, protobufData.getDataBody().size());
+        final ArrowMessage parsedMessage =
+            marshaller.parse(new ByteArrayInputStream(protobufData.toByteArray()));
         // Should have no body buffers
-        Assertions.assertFalse(parsedMessage.getBufs().iterator().hasNext());
+        assertFalse(parsedMessage.getBufs().iterator().hasNext());
         // Should not throw
         parsedMessage.asSchema();
       }
@@ -449,24 +504,22 @@ public void testProtobufSchemaCompatibility() throws Exception {
   @Test
   public void testGrpcInsecureLocation() throws Exception {
     Location location = Location.forGrpcInsecure(LOCALHOST, 9000);
-    Assertions.assertEquals(
+    assertEquals(
         new URI(LocationSchemes.GRPC_INSECURE, null, LOCALHOST, 9000, null, null, null),
         location.getUri());
-    Assertions.assertEquals(new InetSocketAddress(LOCALHOST, 9000), location.toSocketAddress());
+    assertEquals(new InetSocketAddress(LOCALHOST, 9000), location.toSocketAddress());
   }
 
   @Test
   public void testGrpcTlsLocation() throws Exception {
     Location location = Location.forGrpcTls(LOCALHOST, 9000);
-    Assertions.assertEquals(
-            new URI(LocationSchemes.GRPC_TLS, null, LOCALHOST, 9000, null, null, null),
-            location.getUri());
-    Assertions.assertEquals(new InetSocketAddress(LOCALHOST, 9000), location.toSocketAddress());
+    assertEquals(
+        new URI(LocationSchemes.GRPC_TLS, null, LOCALHOST, 9000, null, null, null),
+        location.getUri());
+    assertEquals(new InetSocketAddress(LOCALHOST, 9000), location.toSocketAddress());
   }
 
-  /**
-   * An example FlightProducer for test purposes.
-   */
+  /** An example FlightProducer for test purposes. */
   public static class Producer implements FlightProducer, AutoCloseable {
     static final byte[] TICKET_LARGE_BATCH = "large-batch".getBytes(StandardCharsets.UTF_8);
 
@@ -478,18 +531,20 @@ public Producer(BufferAllocator allocator) {
     }
 
     @Override
-    public void listFlights(CallContext context, Criteria criteria,
-        StreamListener<FlightInfo> listener) {
+    public void listFlights(
+        CallContext context, Criteria criteria, StreamListener<FlightInfo> listener) {
       if (criteria.getExpression().length > 0) {
         // Don't send anything if criteria are set
         listener.onCompleted();
       }
 
-      Flight.FlightInfo getInfo = Flight.FlightInfo.newBuilder()
-          .setFlightDescriptor(Flight.FlightDescriptor.newBuilder()
-              .setType(DescriptorType.CMD)
-              .setCmd(ByteString.copyFrom("cool thing", Charsets.UTF_8)))
-          .build();
+      Flight.FlightInfo getInfo =
+          Flight.FlightInfo.newBuilder()
+              .setFlightDescriptor(
+                  Flight.FlightDescriptor.newBuilder()
+                      .setType(DescriptorType.CMD)
+                      .setCmd(ByteString.copyFrom("cool thing", Charsets.UTF_8)))
+              .build();
       try {
         listener.onNext(new FlightInfo(getInfo));
       } catch (URISyntaxException e) {
@@ -500,7 +555,8 @@ public void listFlights(CallContext context, Criteria criteria,
     }
 
     @Override
-    public Runnable acceptPut(CallContext context, FlightStream flightStream, StreamListener<PutResult> ackStream) {
+    public Runnable acceptPut(
+        CallContext context, FlightStream flightStream, StreamListener<PutResult> ackStream) {
       return () -> {
         while (flightStream.next()) {
           // Drain the stream
@@ -520,7 +576,7 @@ public void getStream(CallContext context, Ticket ticket, ServerStreamListener l
       VectorSchemaRoot root = VectorSchemaRoot.of(iv);
       listener.start(root);
 
-      //batch 1
+      // batch 1
       root.allocateNew();
       for (int i = 0; i < size; i++) {
         iv.set(i, i);
@@ -566,27 +622,29 @@ public void close() throws Exception {
     }
 
     @Override
-    public FlightInfo getFlightInfo(CallContext context,
-        FlightDescriptor descriptor) {
+    public FlightInfo getFlightInfo(CallContext context, FlightDescriptor descriptor) {
       try {
-        Flight.FlightInfo getInfo = Flight.FlightInfo.newBuilder()
-            .setSchema(schemaToByteString(new Schema(Collections.emptyList())))
-            .setFlightDescriptor(Flight.FlightDescriptor.newBuilder()
-                .setType(DescriptorType.CMD)
-                .setCmd(ByteString.copyFrom("cool thing", Charsets.UTF_8)))
-            .addEndpoint(
-                Flight.FlightEndpoint.newBuilder().addLocation(new Location("https://example.com").toProtocol()))
-            .build();
+        Flight.FlightInfo getInfo =
+            Flight.FlightInfo.newBuilder()
+                .setSchema(schemaToByteString(new Schema(Collections.emptyList())))
+                .setFlightDescriptor(
+                    Flight.FlightDescriptor.newBuilder()
+                        .setType(DescriptorType.CMD)
+                        .setCmd(ByteString.copyFrom("cool thing", Charsets.UTF_8)))
+                .addEndpoint(
+                    Flight.FlightEndpoint.newBuilder()
+                        .addLocation(new Location("https://example.com").toProtocol()))
+                .build();
         return new FlightInfo(getInfo);
       } catch (URISyntaxException e) {
         throw new RuntimeException(e);
       }
     }
 
-    private static ByteString schemaToByteString(Schema schema)
-    {
+    private static ByteString schemaToByteString(Schema schema) {
       try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
-        MessageSerializer.serialize(new WriteChannel(Channels.newChannel(baos)), schema, IpcOption.DEFAULT);
+        MessageSerializer.serialize(
+            new WriteChannel(Channels.newChannel(baos)), schema, IpcOption.DEFAULT);
         return ByteString.copyFrom(baos.toByteArray());
       } catch (IOException e) {
         throw new RuntimeException(e);
@@ -594,36 +652,35 @@ private static ByteString schemaToByteString(Schema schema)
     }
 
     @Override
-    public void doAction(CallContext context, Action action,
-        StreamListener<Result> listener) {
+    public void doAction(CallContext context, Action action, StreamListener<Result> listener) {
       switch (action.getType()) {
-        case "hello": {
-          listener.onNext(new Result("world".getBytes(Charsets.UTF_8)));
-          listener.onCompleted();
-          break;
-        }
-        case "hellooo": {
-          listener.onNext(new Result("world".getBytes(Charsets.UTF_8)));
-          listener.onNext(new Result("!".getBytes(Charsets.UTF_8)));
-          listener.onCompleted();
-          break;
-        }
+        case "hello":
+          {
+            listener.onNext(new Result("world".getBytes(Charsets.UTF_8)));
+            listener.onCompleted();
+            break;
+          }
+        case "hellooo":
+          {
+            listener.onNext(new Result("world".getBytes(Charsets.UTF_8)));
+            listener.onNext(new Result("!".getBytes(Charsets.UTF_8)));
+            listener.onCompleted();
+            break;
+          }
         default:
-          listener.onError(CallStatus.UNIMPLEMENTED.withDescription("Action not implemented: " + action.getType())
-              .toRuntimeException());
+          listener.onError(
+              CallStatus.UNIMPLEMENTED
+                  .withDescription("Action not implemented: " + action.getType())
+                  .toRuntimeException());
       }
     }
 
     @Override
-    public void listActions(CallContext context,
-        StreamListener<ActionType> listener) {
+    public void listActions(CallContext context, StreamListener<ActionType> listener) {
       listener.onNext(new ActionType("get", ""));
       listener.onNext(new ActionType("put", ""));
       listener.onNext(new ActionType("hello", ""));
       listener.onCompleted();
     }
-
   }
-
-
 }
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestCallOptions.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestCallOptions.java
index 41df36c863325..a54ce69812c8b 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestCallOptions.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestCallOptions.java
@@ -14,12 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
 import static org.apache.arrow.flight.Location.forGrpcInsecure;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
+import io.grpc.Metadata;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
@@ -27,47 +32,51 @@
 import java.util.Iterator;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import io.grpc.Metadata;
-
 public class TestCallOptions {
 
   @Test
   @Disabled
   public void timeoutFires() {
     // Ignored due to CI flakiness
-    test((client) -> {
-      Instant start = Instant.now();
-      Iterator<Result> results = client.doAction(new Action("hang"), CallOptions.timeout(1, TimeUnit.SECONDS));
-      try {
-        results.next();
-        Assertions.fail("Call should have failed");
-      } catch (RuntimeException e) {
-        Assertions.assertTrue(e.getMessage().contains("deadline exceeded"), e.getMessage());
-      }
-      Instant end = Instant.now();
-      Assertions.assertTrue(Duration.between(start, end).toMillis() < 1500, "Call took over 1500 ms despite timeout");
-    });
+    test(
+        (client) -> {
+          Instant start = Instant.now();
+          Iterator<Result> results =
+              client.doAction(new Action("hang"), CallOptions.timeout(1, TimeUnit.SECONDS));
+          try {
+            results.next();
+            fail("Call should have failed");
+          } catch (RuntimeException e) {
+            assertTrue(e.getMessage().contains("deadline exceeded"), e.getMessage());
+          }
+          Instant end = Instant.now();
+          assertTrue(
+              Duration.between(start, end).toMillis() < 1500,
+              "Call took over 1500 ms despite timeout");
+        });
   }
 
   @Test
   @Disabled
   public void underTimeout() {
     // Ignored due to CI flakiness
-    test((client) -> {
-      Instant start = Instant.now();
-      // This shouldn't fail and it should complete within the timeout
-      Iterator<Result> results = client.doAction(new Action("fast"), CallOptions.timeout(2, TimeUnit.SECONDS));
-      Assertions.assertArrayEquals(new byte[]{42, 42}, results.next().getBody());
-      Instant end = Instant.now();
-      Assertions.assertTrue(Duration.between(start, end).toMillis() < 2500, "Call took over 2500 ms despite timeout");
-    });
+    test(
+        (client) -> {
+          Instant start = Instant.now();
+          // This shouldn't fail and it should complete within the timeout
+          Iterator<Result> results =
+              client.doAction(new Action("fast"), CallOptions.timeout(2, TimeUnit.SECONDS));
+          assertArrayEquals(new byte[] {42, 42}, results.next().getBody());
+          Instant end = Instant.now();
+          assertTrue(
+              Duration.between(start, end).toMillis() < 2500,
+              "Call took over 2500 ms despite timeout");
+        });
   }
 
   @Test
@@ -102,18 +111,18 @@ public void mixedProperties() {
   }
 
   private void testHeaders(CallHeaders headers) {
-    try (
-        BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
+    try (BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
         HeaderProducer producer = new HeaderProducer();
-        FlightServer s = FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), producer).build().start();
+        FlightServer s =
+            FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), producer).build().start();
         FlightClient client = FlightClient.builder(a, s.getLocation()).build()) {
-      Assertions.assertFalse(client.doAction(new Action(""), new HeaderCallOption(headers)).hasNext());
+      assertFalse(client.doAction(new Action(""), new HeaderCallOption(headers)).hasNext());
       final CallHeaders incomingHeaders = producer.headers();
       for (String key : headers.keys()) {
         if (key.endsWith(Metadata.BINARY_HEADER_SUFFIX)) {
-          Assertions.assertArrayEquals(headers.getByte(key), incomingHeaders.getByte(key));
+          assertArrayEquals(headers.getByte(key), incomingHeaders.getByte(key));
         } else {
-          Assertions.assertEquals(headers.get(key), incomingHeaders.get(key));
+          assertEquals(headers.get(key), incomingHeaders.get(key));
         }
       }
     } catch (InterruptedException | IOException e) {
@@ -122,10 +131,10 @@ private void testHeaders(CallHeaders headers) {
   }
 
   void test(Consumer<FlightClient> testFn) {
-    try (
-        BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
+    try (BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
         Producer producer = new Producer();
-        FlightServer s = FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), producer).build().start();
+        FlightServer s =
+            FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), producer).build().start();
         FlightClient client = FlightClient.builder(a, s.getLocation()).build()) {
       testFn.accept(client);
     } catch (InterruptedException | IOException e) {
@@ -137,8 +146,7 @@ static class HeaderProducer extends NoOpFlightProducer implements AutoCloseable
     CallHeaders headers;
 
     @Override
-    public void close() {
-    }
+    public void close() {}
 
     public CallHeaders headers() {
       return headers;
@@ -153,39 +161,40 @@ public void doAction(CallContext context, Action action, StreamListener<Result>
 
   static class Producer extends NoOpFlightProducer implements AutoCloseable {
 
-    Producer() {
-    }
+    Producer() {}
 
     @Override
-    public void close() {
-    }
+    public void close() {}
 
     @Override
     public void doAction(CallContext context, Action action, StreamListener<Result> listener) {
       switch (action.getType()) {
-        case "hang": {
-          try {
-            Thread.sleep(25000);
-          } catch (InterruptedException e) {
-            throw new RuntimeException(e);
+        case "hang":
+          {
+            try {
+              Thread.sleep(25000);
+            } catch (InterruptedException e) {
+              throw new RuntimeException(e);
+            }
+            listener.onNext(new Result(new byte[] {}));
+            listener.onCompleted();
+            return;
           }
-          listener.onNext(new Result(new byte[]{}));
-          listener.onCompleted();
-          return;
-        }
-        case "fast": {
-          try {
-            Thread.sleep(500);
-          } catch (InterruptedException e) {
-            throw new RuntimeException(e);
+        case "fast":
+          {
+            try {
+              Thread.sleep(500);
+            } catch (InterruptedException e) {
+              throw new RuntimeException(e);
+            }
+            listener.onNext(new Result(new byte[] {42, 42}));
+            listener.onCompleted();
+            return;
+          }
+        default:
+          {
+            throw new UnsupportedOperationException(action.getType());
           }
-          listener.onNext(new Result(new byte[]{42, 42}));
-          listener.onCompleted();
-          return;
-        }
-        default: {
-          throw new UnsupportedOperationException(action.getType());
-        }
       }
     }
   }
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestClientMiddleware.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestClientMiddleware.java
index a1fa1f1d18509..a49406b121084 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestClientMiddleware.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestClientMiddleware.java
@@ -14,11 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
 import static org.apache.arrow.flight.Location.forGrpcInsecure;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -28,83 +31,91 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiConsumer;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-/**
- * A basic test of client middleware using a simplified OpenTracing-like example.
- */
+/** A basic test of client middleware using a simplified OpenTracing-like example. */
 public class TestClientMiddleware {
 
   /**
-   * Test that a client middleware can fail a call before it starts by throwing a {@link FlightRuntimeException}.
+   * Test that a client middleware can fail a call before it starts by throwing a {@link
+   * FlightRuntimeException}.
    */
   @Test
   public void clientMiddleware_failCallBeforeSending() {
-    test(new NoOpFlightProducer(), null, Collections.singletonList(new CallRejector.Factory()),
+    test(
+        new NoOpFlightProducer(),
+        null,
+        Collections.singletonList(new CallRejector.Factory()),
         (allocator, client) -> {
           FlightTestUtil.assertCode(FlightStatusCode.UNAVAILABLE, client::listActions);
         });
   }
 
   /**
-   * Test an OpenTracing-like scenario where client and server middleware work together to propagate a request ID
-   * without explicit intervention from the service implementation.
+   * Test an OpenTracing-like scenario where client and server middleware work together to propagate
+   * a request ID without explicit intervention from the service implementation.
    */
   @Test
   public void middleware_propagateHeader() {
     final Context context = new Context("span id");
-    test(new NoOpFlightProducer(),
+    test(
+        new NoOpFlightProducer(),
         new TestServerMiddleware.ServerMiddlewarePair<>(
             FlightServerMiddleware.Key.of("test"), new ServerSpanInjector.Factory()),
         Collections.singletonList(new ClientSpanInjector.Factory(context)),
         (allocator, client) -> {
-          FlightTestUtil.assertCode(FlightStatusCode.UNIMPLEMENTED, () -> client.listActions().forEach(actionType -> {
-          }));
+          FlightTestUtil.assertCode(
+              FlightStatusCode.UNIMPLEMENTED, () -> client.listActions().forEach(actionType -> {}));
         });
-    Assertions.assertEquals(context.outgoingSpanId, context.incomingSpanId);
-    Assertions.assertNotNull(context.finalStatus);
-    Assertions.assertEquals(FlightStatusCode.UNIMPLEMENTED, context.finalStatus.code());
+    assertEquals(context.outgoingSpanId, context.incomingSpanId);
+    assertNotNull(context.finalStatus);
+    assertEquals(FlightStatusCode.UNIMPLEMENTED, context.finalStatus.code());
   }
 
-  /** Ensure both server and client can send and receive multi-valued headers (both binary and text values). */
+  /**
+   * Ensure both server and client can send and receive multi-valued headers (both binary and text
+   * values).
+   */
   @Test
   public void testMultiValuedHeaders() {
-    final MultiHeaderClientMiddlewareFactory clientFactory = new MultiHeaderClientMiddlewareFactory();
-    test(new NoOpFlightProducer(),
+    final MultiHeaderClientMiddlewareFactory clientFactory =
+        new MultiHeaderClientMiddlewareFactory();
+    test(
+        new NoOpFlightProducer(),
         new TestServerMiddleware.ServerMiddlewarePair<>(
             FlightServerMiddleware.Key.of("test"), new MultiHeaderServerMiddlewareFactory()),
         Collections.singletonList(clientFactory),
         (allocator, client) -> {
-          FlightTestUtil.assertCode(FlightStatusCode.UNIMPLEMENTED, () -> client.listActions().forEach(actionType -> {
-          }));
+          FlightTestUtil.assertCode(
+              FlightStatusCode.UNIMPLEMENTED, () -> client.listActions().forEach(actionType -> {}));
         });
-    // The server echoes the headers we send back to us, so ensure all the ones we sent are present with the correct
+    // The server echoes the headers we send back to us, so ensure all the ones we sent are present
+    // with the correct
     // values in the correct order.
     for (final Map.Entry<String, List<byte[]>> entry : EXPECTED_BINARY_HEADERS.entrySet()) {
       // Compare header values entry-by-entry because byte arrays don't compare via equals
       final List<byte[]> receivedValues = clientFactory.lastBinaryHeaders.get(entry.getKey());
-      Assertions.assertNotNull(receivedValues, "Missing for header: " + entry.getKey());
-      Assertions.assertEquals(
+      assertNotNull(receivedValues, "Missing for header: " + entry.getKey());
+      assertEquals(
           entry.getValue().size(),
-          receivedValues.size(), "Missing or wrong value for header: " + entry.getKey());
+          receivedValues.size(),
+          "Missing or wrong value for header: " + entry.getKey());
       for (int i = 0; i < entry.getValue().size(); i++) {
-        Assertions.assertArrayEquals(entry.getValue().get(i), receivedValues.get(i));
+        assertArrayEquals(entry.getValue().get(i), receivedValues.get(i));
       }
     }
     for (final Map.Entry<String, List<String>> entry : EXPECTED_TEXT_HEADERS.entrySet()) {
-      Assertions.assertEquals(
+      assertEquals(
           entry.getValue(),
           clientFactory.lastTextHeaders.get(entry.getKey()),
-          "Missing or wrong value for header: " + entry.getKey()
-      );
+          "Missing or wrong value for header: " + entry.getKey());
     }
   }
 
-  private static <T extends FlightServerMiddleware> void test(FlightProducer producer,
+  private static <T extends FlightServerMiddleware> void test(
+      FlightProducer producer,
       TestServerMiddleware.ServerMiddlewarePair<T> serverMiddleware,
       List<FlightClientMiddleware.Factory> clientMiddleware,
       BiConsumer<BufferAllocator, FlightClient> body) {
@@ -119,8 +130,7 @@ private static <T extends FlightServerMiddleware> void test(FlightProducer produ
       FlightClient.Builder clientBuilder = FlightClient.builder(allocator, server.getLocation());
       clientMiddleware.forEach(clientBuilder::intercept);
       try (final FlightServer ignored = server;
-           final FlightClient client = clientBuilder.build()
-      ) {
+          final FlightClient client = clientBuilder.build()) {
         body.accept(allocator, client);
       }
     } catch (InterruptedException | IOException e) {
@@ -129,8 +139,8 @@ private static <T extends FlightServerMiddleware> void test(FlightProducer produ
   }
 
   /**
-   * A server middleware component that reads a request ID from incoming headers and sends the request ID back on
-   * outgoing headers.
+   * A server middleware component that reads a request ID from incoming headers and sends the
+   * request ID back on outgoing headers.
    */
   static class ServerSpanInjector implements FlightServerMiddleware {
 
@@ -146,27 +156,24 @@ public void onBeforeSendingHeaders(CallHeaders outgoingHeaders) {
     }
 
     @Override
-    public void onCallCompleted(CallStatus status) {
-
-    }
+    public void onCallCompleted(CallStatus status) {}
 
     @Override
-    public void onCallErrored(Throwable err) {
-
-    }
+    public void onCallErrored(Throwable err) {}
 
     static class Factory implements FlightServerMiddleware.Factory<ServerSpanInjector> {
 
       @Override
-      public ServerSpanInjector onCallStarted(CallInfo info, CallHeaders incomingHeaders, RequestContext context) {
+      public ServerSpanInjector onCallStarted(
+          CallInfo info, CallHeaders incomingHeaders, RequestContext context) {
         return new ServerSpanInjector(incomingHeaders.get("x-span"));
       }
     }
   }
 
   /**
-   * A client middleware component that, given a mock OpenTracing-like "request context", sends the request ID in the
-   * context on outgoing headers and reads it from incoming headers.
+   * A client middleware component that, given a mock OpenTracing-like "request context", sends the
+   * request ID in the context on outgoing headers and reads it from incoming headers.
    */
   static class ClientSpanInjector implements FlightClientMiddleware {
 
@@ -206,9 +213,7 @@ public FlightClientMiddleware onCallStarted(CallInfo info) {
     }
   }
 
-  /**
-   * A mock OpenTracing-like "request context".
-   */
+  /** A mock OpenTracing-like "request context". */
   static class Context {
 
     final String outgoingSpanId;
@@ -220,22 +225,17 @@ static class Context {
     }
   }
 
-  /**
-   * A client middleware that fails outgoing calls.
-   */
+  /** A client middleware that fails outgoing calls. */
   static class CallRejector implements FlightClientMiddleware {
 
     @Override
-    public void onBeforeSendingHeaders(CallHeaders outgoingHeaders) {
-    }
+    public void onBeforeSendingHeaders(CallHeaders outgoingHeaders) {}
 
     @Override
-    public void onHeadersReceived(CallHeaders incomingHeaders) {
-    }
+    public void onHeadersReceived(CallHeaders incomingHeaders) {}
 
     @Override
-    public void onCallCompleted(CallStatus status) {
-    }
+    public void onCallCompleted(CallStatus status) {}
 
     static class Factory implements FlightClientMiddleware.Factory {
 
@@ -251,36 +251,41 @@ public FlightClientMiddleware onCallStarted(CallInfo info) {
   static Map<String, List<String>> EXPECTED_TEXT_HEADERS = new HashMap<String, List<String>>();
 
   static {
-    EXPECTED_BINARY_HEADERS.put("x-binary-bin", Arrays.asList(new byte[] {0}, new byte[]{1}));
+    EXPECTED_BINARY_HEADERS.put("x-binary-bin", Arrays.asList(new byte[] {0}, new byte[] {1}));
     EXPECTED_TEXT_HEADERS.put("x-text", Arrays.asList("foo", "bar"));
   }
 
-  static class MultiHeaderServerMiddlewareFactory implements
-      FlightServerMiddleware.Factory<MultiHeaderServerMiddleware> {
+  static class MultiHeaderServerMiddlewareFactory
+      implements FlightServerMiddleware.Factory<MultiHeaderServerMiddleware> {
     @Override
-    public MultiHeaderServerMiddleware onCallStarted(CallInfo info, CallHeaders incomingHeaders,
-        RequestContext context) {
-      // Echo the headers back to the client. Copy values out of CallHeaders since the underlying gRPC metadata
+    public MultiHeaderServerMiddleware onCallStarted(
+        CallInfo info, CallHeaders incomingHeaders, RequestContext context) {
+      // Echo the headers back to the client. Copy values out of CallHeaders since the underlying
+      // gRPC metadata
       // object isn't safe to use after this function returns.
       Map<String, List<byte[]>> binaryHeaders = new HashMap<>();
       Map<String, List<String>> textHeaders = new HashMap<>();
       for (final String key : incomingHeaders.keys()) {
         if (key.endsWith("-bin")) {
-          binaryHeaders.compute(key, (ignored, values) -> {
-            if (values == null) {
-              values = new ArrayList<>();
-            }
-            incomingHeaders.getAllByte(key).forEach(values::add);
-            return values;
-          });
+          binaryHeaders.compute(
+              key,
+              (ignored, values) -> {
+                if (values == null) {
+                  values = new ArrayList<>();
+                }
+                incomingHeaders.getAllByte(key).forEach(values::add);
+                return values;
+              });
         } else {
-          textHeaders.compute(key, (ignored, values) -> {
-            if (values == null) {
-              values = new ArrayList<>();
-            }
-            incomingHeaders.getAll(key).forEach(values::add);
-            return values;
-          });
+          textHeaders.compute(
+              key,
+              (ignored, values) -> {
+                if (values == null) {
+                  values = new ArrayList<>();
+                }
+                incomingHeaders.getAll(key).forEach(values::add);
+                return values;
+              });
         }
       }
       return new MultiHeaderServerMiddleware(binaryHeaders, textHeaders);
@@ -291,24 +296,25 @@ static class MultiHeaderServerMiddleware implements FlightServerMiddleware {
     private final Map<String, List<byte[]>> binaryHeaders;
     private final Map<String, List<String>> textHeaders;
 
-    MultiHeaderServerMiddleware(Map<String, List<byte[]>> binaryHeaders, Map<String, List<String>> textHeaders) {
+    MultiHeaderServerMiddleware(
+        Map<String, List<byte[]>> binaryHeaders, Map<String, List<String>> textHeaders) {
       this.binaryHeaders = binaryHeaders;
       this.textHeaders = textHeaders;
     }
 
     @Override
     public void onBeforeSendingHeaders(CallHeaders outgoingHeaders) {
-      binaryHeaders.forEach((key, values) -> values.forEach(value -> outgoingHeaders.insert(key, value)));
-      textHeaders.forEach((key, values) -> values.forEach(value -> outgoingHeaders.insert(key, value)));
+      binaryHeaders.forEach(
+          (key, values) -> values.forEach(value -> outgoingHeaders.insert(key, value)));
+      textHeaders.forEach(
+          (key, values) -> values.forEach(value -> outgoingHeaders.insert(key, value)));
     }
 
     @Override
-    public void onCallCompleted(CallStatus status) {
-    }
+    public void onCallCompleted(CallStatus status) {}
 
     @Override
-    public void onCallErrored(Throwable err) {
-    }
+    public void onCallErrored(Throwable err) {}
   }
 
   static class MultiHeaderClientMiddlewareFactory implements FlightClientMiddleware.Factory {
@@ -332,11 +338,11 @@ public MultiHeaderClientMiddleware(MultiHeaderClientMiddlewareFactory factory) {
     public void onBeforeSendingHeaders(CallHeaders outgoingHeaders) {
       for (final Map.Entry<String, List<byte[]>> entry : EXPECTED_BINARY_HEADERS.entrySet()) {
         entry.getValue().forEach((value) -> outgoingHeaders.insert(entry.getKey(), value));
-        Assertions.assertTrue(outgoingHeaders.containsKey(entry.getKey()));
+        assertTrue(outgoingHeaders.containsKey(entry.getKey()));
       }
       for (final Map.Entry<String, List<String>> entry : EXPECTED_TEXT_HEADERS.entrySet()) {
         entry.getValue().forEach((value) -> outgoingHeaders.insert(entry.getKey(), value));
-        Assertions.assertTrue(outgoingHeaders.containsKey(entry.getKey()));
+        assertTrue(outgoingHeaders.containsKey(entry.getKey()));
       }
     }
 
@@ -344,21 +350,23 @@ public void onBeforeSendingHeaders(CallHeaders outgoingHeaders) {
     public void onHeadersReceived(CallHeaders incomingHeaders) {
       factory.lastBinaryHeaders = new HashMap<>();
       factory.lastTextHeaders = new HashMap<>();
-      incomingHeaders.keys().forEach(header -> {
-        if (header.endsWith("-bin")) {
-          final List<byte[]> values = new ArrayList<>();
-          incomingHeaders.getAllByte(header).forEach(values::add);
-          factory.lastBinaryHeaders.put(header, values);
-        } else {
-          final List<String> values = new ArrayList<>();
-          incomingHeaders.getAll(header).forEach(values::add);
-          factory.lastTextHeaders.put(header, values);
-        }
-      });
+      incomingHeaders
+          .keys()
+          .forEach(
+              header -> {
+                if (header.endsWith("-bin")) {
+                  final List<byte[]> values = new ArrayList<>();
+                  incomingHeaders.getAllByte(header).forEach(values::add);
+                  factory.lastBinaryHeaders.put(header, values);
+                } else {
+                  final List<String> values = new ArrayList<>();
+                  incomingHeaders.getAll(header).forEach(values::add);
+                  factory.lastTextHeaders.put(header, values);
+                }
+              });
     }
 
     @Override
-    public void onCallCompleted(CallStatus status) {
-    }
+    public void onCallCompleted(CallStatus status) {}
   }
 }
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestDictionaryUtils.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestDictionaryUtils.java
index 40930131e0ca8..12d5161ac02ef 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestDictionaryUtils.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestDictionaryUtils.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertSame;
 
+import com.google.common.collect.ImmutableList;
 import java.util.TreeSet;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.VarCharVector;
@@ -35,11 +34,7 @@
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.junit.jupiter.api.Test;
 
-import com.google.common.collect.ImmutableList;
-
-/**
- * Test cases for {@link DictionaryUtils}.
- */
+/** Test cases for {@link DictionaryUtils}. */
 public class TestDictionaryUtils {
 
   @Test
@@ -47,9 +42,9 @@ public void testReuseSchema() {
     FieldType varcharType = new FieldType(true, new ArrowType.Utf8(), null);
     FieldType intType = new FieldType(true, new ArrowType.Int(32, true), null);
 
-    ImmutableList<Field> build = ImmutableList.of(
-            new Field("stringCol", varcharType, null),
-            new Field("intCol", intType, null));
+    ImmutableList<Field> build =
+        ImmutableList.of(
+            new Field("stringCol", varcharType, null), new Field("intCol", intType, null));
 
     Schema schema = new Schema(build);
     Schema newSchema = DictionaryUtils.generateSchema(schema, null, new TreeSet<>());
@@ -62,18 +57,19 @@ public void testReuseSchema() {
   public void testCreateSchema() {
     try (BufferAllocator allocator = new RootAllocator(1024)) {
       DictionaryEncoding dictionaryEncoding =
-              new DictionaryEncoding(0, true, new ArrowType.Int(8, true));
+          new DictionaryEncoding(0, true, new ArrowType.Int(8, true));
       VarCharVector dictVec = new VarCharVector("dict vector", allocator);
       Dictionary dictionary = new Dictionary(dictVec, dictionaryEncoding);
       DictionaryProvider dictProvider = new DictionaryProvider.MapDictionaryProvider(dictionary);
       TreeSet<Long> dictionaryUsed = new TreeSet<>();
 
-      FieldType encodedVarcharType = new FieldType(true, new ArrowType.Int(8, true), dictionaryEncoding);
+      FieldType encodedVarcharType =
+          new FieldType(true, new ArrowType.Int(8, true), dictionaryEncoding);
       FieldType intType = new FieldType(true, new ArrowType.Int(32, true), null);
 
-      ImmutableList<Field> build = ImmutableList.of(
-              new Field("stringCol", encodedVarcharType, null),
-              new Field("intCol", intType, null));
+      ImmutableList<Field> build =
+          ImmutableList.of(
+              new Field("stringCol", encodedVarcharType, null), new Field("intCol", intType, null));
 
       Schema schema = new Schema(build);
       Schema newSchema = DictionaryUtils.generateSchema(schema, dictProvider, dictionaryUsed);
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestDoExchange.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestDoExchange.java
index b70353df8e9a7..1cd6e95e3dfb0 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestDoExchange.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestDoExchange.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -28,7 +27,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.stream.IntStream;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -67,7 +65,8 @@ public void setUp() throws Exception {
     final Location serverLocation = Location.forGrpcInsecure(FlightTestUtil.LOCALHOST, 0);
     server = FlightServer.builder(allocator, serverLocation, new Producer(allocator)).build();
     server.start();
-    final Location clientLocation = Location.forGrpcInsecure(FlightTestUtil.LOCALHOST, server.getPort());
+    final Location clientLocation =
+        Location.forGrpcInsecure(FlightTestUtil.LOCALHOST, server.getPort());
     client = FlightClient.builder(allocator, clientLocation).build();
   }
 
@@ -81,10 +80,11 @@ public void tearDown() throws Exception {
   public void testDoExchangeOnlyMetadata() throws Exception {
     // Send a particular descriptor to the server and check for a particular response pattern.
     try (final FlightClient.ExchangeReaderWriter stream =
-             client.doExchange(FlightDescriptor.command(EXCHANGE_METADATA_ONLY))) {
+        client.doExchange(FlightDescriptor.command(EXCHANGE_METADATA_ONLY))) {
       final FlightStream reader = stream.getReader();
 
-      // Server starts by sending a message without data (hence no VectorSchemaRoot should be present)
+      // Server starts by sending a message without data (hence no VectorSchemaRoot should be
+      // present)
       assertTrue(reader.next());
       assertFalse(reader.hasRoot());
       assertEquals(42, reader.getLatestMetadata().getInt(0));
@@ -109,7 +109,7 @@ public void testDoExchangeOnlyMetadata() throws Exception {
   @Test
   public void testDoExchangeDoGet() throws Exception {
     try (final FlightClient.ExchangeReaderWriter stream =
-             client.doExchange(FlightDescriptor.command(EXCHANGE_DO_GET))) {
+        client.doExchange(FlightDescriptor.command(EXCHANGE_DO_GET))) {
       final FlightStream reader = stream.getReader();
       VectorSchemaRoot root = reader.getRoot();
       IntVector iv = (IntVector) root.getVector("a");
@@ -128,31 +128,35 @@ public void testDoExchangeDoGet() throws Exception {
   /** Emulate a DoPut with a DoExchange. */
   @Test
   public void testDoExchangeDoPut() throws Exception {
-    final Schema schema = new Schema(Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
+    final Schema schema =
+        new Schema(Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
     try (final FlightClient.ExchangeReaderWriter stream =
-             client.doExchange(FlightDescriptor.command(EXCHANGE_DO_PUT));
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+            client.doExchange(FlightDescriptor.command(EXCHANGE_DO_PUT));
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       IntVector iv = (IntVector) root.getVector("a");
       iv.allocateNew();
 
       stream.getWriter().start(root);
       int counter = 0;
       for (int i = 0; i < 10; i++) {
-        ValueVectorDataPopulator.setVector(iv, IntStream.range(0, i).boxed().toArray(Integer[]::new));
+        ValueVectorDataPopulator.setVector(
+            iv, IntStream.range(0, i).boxed().toArray(Integer[]::new));
         root.setRowCount(i);
         counter += i;
         stream.getWriter().putNext();
 
         assertTrue(stream.getReader().next());
         assertFalse(stream.getReader().hasRoot());
-        // For each write, the server sends back a metadata message containing the index of the last written batch
+        // For each write, the server sends back a metadata message containing the index of the last
+        // written batch
         final ArrowBuf metadata = stream.getReader().getLatestMetadata();
         assertEquals(counter, metadata.getInt(0));
       }
       stream.getWriter().completed();
 
       while (stream.getReader().next()) {
-        // Drain the stream. Otherwise closing the stream sends a CANCEL which seriously screws with the server.
+        // Drain the stream. Otherwise closing the stream sends a CANCEL which seriously screws with
+        // the server.
         // CANCEL -> runs onCancel handler -> closes the FlightStream early
       }
     }
@@ -161,9 +165,11 @@ public void testDoExchangeDoPut() throws Exception {
   /** Test a DoExchange that echoes the client message. */
   @Test
   public void testDoExchangeEcho() throws Exception {
-    final Schema schema = new Schema(Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
-    try (final FlightClient.ExchangeReaderWriter stream = client.doExchange(FlightDescriptor.command(EXCHANGE_ECHO));
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+    final Schema schema =
+        new Schema(Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
+    try (final FlightClient.ExchangeReaderWriter stream =
+            client.doExchange(FlightDescriptor.command(EXCHANGE_ECHO));
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       final FlightStream reader = stream.getReader();
 
       // First try writing metadata without starting the Arrow data stream
@@ -208,12 +214,15 @@ public void testDoExchangeEcho() throws Exception {
   /** Write some data, have it transformed, then read it back. */
   @Test
   public void testTransform() throws Exception {
-    final Schema schema = new Schema(Arrays.asList(
-        Field.nullable("a", new ArrowType.Int(32, true)),
-        Field.nullable("b", new ArrowType.Int(32, true))));
+    final Schema schema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("a", new ArrowType.Int(32, true)),
+                Field.nullable("b", new ArrowType.Int(32, true))));
     try (final FlightClient.ExchangeReaderWriter stream =
-             client.doExchange(FlightDescriptor.command(EXCHANGE_TRANSFORM))) {
-      // Write ten batches of data to the stream, where batch N contains N rows of data (N in [0, 10))
+        client.doExchange(FlightDescriptor.command(EXCHANGE_TRANSFORM))) {
+      // Write ten batches of data to the stream, where batch N contains N rows of data (N in [0,
+      // 10))
       final FlightStream reader = stream.getReader();
       final FlightClient.ClientStreamListener writer = stream.getWriter();
       try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
@@ -221,7 +230,8 @@ public void testTransform() throws Exception {
         for (int batchIndex = 0; batchIndex < 10; batchIndex++) {
           for (final FieldVector rawVec : root.getFieldVectors()) {
             final IntVector vec = (IntVector) rawVec;
-            ValueVectorDataPopulator.setVector(vec, IntStream.range(0, batchIndex).boxed().toArray(Integer[]::new));
+            ValueVectorDataPopulator.setVector(
+                vec, IntStream.range(0, batchIndex).boxed().toArray(Integer[]::new));
           }
           root.setRowCount(batchIndex);
           writer.putNext();
@@ -255,12 +265,15 @@ public void testTransform() throws Exception {
   @Test
   public void testTransformZeroCopy() throws Exception {
     final int rowsPerBatch = 4096;
-    final Schema schema = new Schema(Arrays.asList(
-        Field.nullable("a", new ArrowType.Int(32, true)),
-        Field.nullable("b", new ArrowType.Int(32, true))));
+    final Schema schema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("a", new ArrowType.Int(32, true)),
+                Field.nullable("b", new ArrowType.Int(32, true))));
     try (final FlightClient.ExchangeReaderWriter stream =
-             client.doExchange(FlightDescriptor.command(EXCHANGE_TRANSFORM))) {
-      // Write ten batches of data to the stream, where batch N contains 1024 rows of data (N in [0, 10))
+        client.doExchange(FlightDescriptor.command(EXCHANGE_TRANSFORM))) {
+      // Write ten batches of data to the stream, where batch N contains 1024 rows of data (N in [0,
+      // 10))
       final FlightStream reader = stream.getReader();
       final FlightClient.ClientStreamListener writer = stream.getWriter();
       try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
@@ -311,7 +324,7 @@ public void testTransformZeroCopy() throws Exception {
   @Test
   public void testServerCancel() throws Exception {
     try (final FlightClient.ExchangeReaderWriter stream =
-             client.doExchange(FlightDescriptor.command(EXCHANGE_CANCEL))) {
+        client.doExchange(FlightDescriptor.command(EXCHANGE_CANCEL))) {
       final FlightStream reader = stream.getReader();
       final FlightClient.ClientStreamListener writer = stream.getWriter();
 
@@ -319,10 +332,14 @@ public void testServerCancel() throws Exception {
       assertEquals(FlightStatusCode.CANCELLED, fre.status().code());
       assertEquals("expected", fre.status().description());
 
-      // Before, this would hang forever, because the writer checks if the stream is ready and not cancelled.
-      // However, the cancellation flag (was) only updated by reading, and the stream is never ready once the call ends.
-      // The test looks weird since normally, an application shouldn't try to write after the read fails. However,
-      // an application that isn't reading data wouldn't notice, and would instead get stuck on the write.
+      // Before, this would hang forever, because the writer checks if the stream is ready and not
+      // cancelled.
+      // However, the cancellation flag (was) only updated by reading, and the stream is never ready
+      // once the call ends.
+      // The test looks weird since normally, an application shouldn't try to write after the read
+      // fails. However,
+      // an application that isn't reading data wouldn't notice, and would instead get stuck on the
+      // write.
       // Here, we read first to avoid a race condition in the test itself.
       writer.putMetadata(allocator.getEmpty());
     }
@@ -332,7 +349,7 @@ public void testServerCancel() throws Exception {
   @Test
   public void testServerCancelLeak() throws Exception {
     try (final FlightClient.ExchangeReaderWriter stream =
-             client.doExchange(FlightDescriptor.command(EXCHANGE_CANCEL))) {
+        client.doExchange(FlightDescriptor.command(EXCHANGE_CANCEL))) {
       final FlightStream reader = stream.getReader();
       final FlightClient.ClientStreamListener writer = stream.getWriter();
       try (final VectorSchemaRoot root = VectorSchemaRoot.create(Producer.SCHEMA, allocator)) {
@@ -358,7 +375,7 @@ public void testServerCancelLeak() throws Exception {
   @Disabled
   public void testClientCancel() throws Exception {
     try (final FlightClient.ExchangeReaderWriter stream =
-             client.doExchange(FlightDescriptor.command(EXCHANGE_DO_GET))) {
+        client.doExchange(FlightDescriptor.command(EXCHANGE_DO_GET))) {
       final FlightStream reader = stream.getReader();
       reader.cancel("", null);
       // Cancel should be idempotent
@@ -369,9 +386,11 @@ public void testClientCancel() throws Exception {
   /** Test a DoExchange error handling. */
   @Test
   public void testDoExchangeError() throws Exception {
-    final Schema schema = new Schema(Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
-    try (final FlightClient.ExchangeReaderWriter stream = client.doExchange(FlightDescriptor.command(EXCHANGE_ERROR));
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+    final Schema schema =
+        new Schema(Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
+    try (final FlightClient.ExchangeReaderWriter stream =
+            client.doExchange(FlightDescriptor.command(EXCHANGE_ERROR));
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       final FlightStream reader = stream.getReader();
 
       // Write data and check that it gets echoed back.
@@ -392,7 +411,8 @@ public void testDoExchangeError() throws Exception {
       stream.getWriter().completed();
 
       // Must call reader.next() to get any errors after exchange, will return false if no error
-      final FlightRuntimeException fre = assertThrows(FlightRuntimeException.class, stream::getResult);
+      final FlightRuntimeException fre =
+          assertThrows(FlightRuntimeException.class, stream::getResult);
       assertEquals("error completing exchange", fre.status().description());
     }
   }
@@ -401,11 +421,13 @@ public void testDoExchangeError() throws Exception {
   @Test
   public void testClientClose() throws Exception {
     try (final FlightClient.ExchangeReaderWriter stream =
-             client.doExchange(FlightDescriptor.command(EXCHANGE_DO_GET))) {
+        client.doExchange(FlightDescriptor.command(EXCHANGE_DO_GET))) {
       assertEquals(Producer.SCHEMA, stream.getReader().getSchema());
     }
-    // Intentionally leak the allocator in this test. gRPC has a bug where it does not wait for all calls to complete
-    // when shutting down the server, so this test will fail otherwise because it closes the allocator while the
+    // Intentionally leak the allocator in this test. gRPC has a bug where it does not wait for all
+    // calls to complete
+    // when shutting down the server, so this test will fail otherwise because it closes the
+    // allocator while the
     // server-side call still has memory allocated.
     // TODO(ARROW-9586): fix this once we track outstanding RPCs outside of gRPC.
     // https://stackoverflow.com/questions/46716024/
@@ -418,10 +440,11 @@ public void testClientClose() throws Exception {
   public void testCloseWithMetadata() throws Exception {
     // Send a particular descriptor to the server and check for a particular response pattern.
     try (final FlightClient.ExchangeReaderWriter stream =
-                 client.doExchange(FlightDescriptor.command(EXCHANGE_METADATA_ONLY))) {
+        client.doExchange(FlightDescriptor.command(EXCHANGE_METADATA_ONLY))) {
       final FlightStream reader = stream.getReader();
 
-      // Server starts by sending a message without data (hence no VectorSchemaRoot should be present)
+      // Server starts by sending a message without data (hence no VectorSchemaRoot should be
+      // present)
       assertTrue(reader.next());
       assertFalse(reader.hasRoot());
       assertEquals(42, reader.getLatestMetadata().getInt(0));
@@ -440,14 +463,15 @@ public void testCloseWithMetadata() throws Exception {
       stream.getWriter().completed();
       stream.getResult();
 
-      // Not necessary to close reader here, but check closing twice doesn't lead to negative refcnt from metadata
+      // Not necessary to close reader here, but check closing twice doesn't lead to negative refcnt
+      // from metadata
       stream.getReader().close();
     }
   }
 
   static class Producer extends NoOpFlightProducer {
-    static final Schema SCHEMA = new Schema(
-        Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
+    static final Schema SCHEMA =
+        new Schema(Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
     private final BufferAllocator allocator;
 
     Producer(BufferAllocator allocator) {
@@ -471,12 +495,16 @@ public void doExchange(CallContext context, FlightStream reader, ServerStreamLis
       } else if (Arrays.equals(reader.getDescriptor().getCommand(), EXCHANGE_ERROR)) {
         error(context, reader, writer);
       } else {
-        writer.error(CallStatus.UNIMPLEMENTED.withDescription("Command not implemented").toRuntimeException());
+        writer.error(
+            CallStatus.UNIMPLEMENTED
+                .withDescription("Command not implemented")
+                .toRuntimeException());
       }
     }
 
     /** Emulate DoGet. */
-    private void doGet(CallContext unusedContext, FlightStream unusedReader, ServerStreamListener writer) {
+    private void doGet(
+        CallContext unusedContext, FlightStream unusedReader, ServerStreamListener writer) {
       try (VectorSchemaRoot root = VectorSchemaRoot.create(SCHEMA, allocator)) {
         writer.start(root);
         root.allocateNew();
@@ -493,11 +521,15 @@ private void doGet(CallContext unusedContext, FlightStream unusedReader, ServerS
     }
 
     /** Emulate DoPut. */
-    private void doPut(CallContext unusedContext, FlightStream reader, ServerStreamListener writer) {
+    private void doPut(
+        CallContext unusedContext, FlightStream reader, ServerStreamListener writer) {
       int counter = 0;
       while (reader.next()) {
         if (!reader.hasRoot()) {
-          writer.error(CallStatus.INVALID_ARGUMENT.withDescription("Message has no data").toRuntimeException());
+          writer.error(
+              CallStatus.INVALID_ARGUMENT
+                  .withDescription("Message has no data")
+                  .toRuntimeException());
           return;
         }
         counter += reader.getRoot().getRowCount();
@@ -510,7 +542,8 @@ private void doPut(CallContext unusedContext, FlightStream reader, ServerStreamL
     }
 
     /** Exchange metadata without ever exchanging data. */
-    private void metadataOnly(CallContext unusedContext, FlightStream reader, ServerStreamListener writer) {
+    private void metadataOnly(
+        CallContext unusedContext, FlightStream reader, ServerStreamListener writer) {
       final ArrowBuf buf = allocator.buffer(4);
       buf.writeInt(42);
       writer.putMetadata(buf);
@@ -555,16 +588,23 @@ private void echo(CallContext unusedContext, FlightStream reader, ServerStreamLi
     }
 
     /** Accept a set of messages, then return some result. */
-    private void transform(CallContext unusedContext, FlightStream reader, ServerStreamListener writer) {
+    private void transform(
+        CallContext unusedContext, FlightStream reader, ServerStreamListener writer) {
       final Schema schema = reader.getSchema();
       for (final Field field : schema.getFields()) {
         if (!(field.getType() instanceof ArrowType.Int)) {
-          writer.error(CallStatus.INVALID_ARGUMENT.withDescription("Invalid type: " + field).toRuntimeException());
+          writer.error(
+              CallStatus.INVALID_ARGUMENT
+                  .withDescription("Invalid type: " + field)
+                  .toRuntimeException());
           return;
         }
         final ArrowType.Int intType = (ArrowType.Int) field.getType();
         if (!intType.getIsSigned() || intType.getBitWidth() != 32) {
-          writer.error(CallStatus.INVALID_ARGUMENT.withDescription("Must be i32: " + field).toRuntimeException());
+          writer.error(
+              CallStatus.INVALID_ARGUMENT
+                  .withDescription("Must be i32: " + field)
+                  .toRuntimeException());
           return;
         }
       }
@@ -597,11 +637,13 @@ private void transform(CallContext unusedContext, FlightStream reader, ServerStr
     }
 
     /** Immediately cancel the call. */
-    private void cancel(CallContext unusedContext, FlightStream unusedReader, ServerStreamListener writer) {
+    private void cancel(
+        CallContext unusedContext, FlightStream unusedReader, ServerStreamListener writer) {
       writer.error(CallStatus.CANCELLED.withDescription("expected").toRuntimeException());
     }
 
-    private void error(CallContext unusedContext, FlightStream reader, ServerStreamListener writer) {
+    private void error(
+        CallContext unusedContext, FlightStream reader, ServerStreamListener writer) {
       VectorSchemaRoot root = null;
       VectorLoader loader = null;
       while (reader.next()) {
@@ -623,7 +665,8 @@ private void error(CallContext unusedContext, FlightStream reader, ServerStreamL
       }
 
       // An error occurs before completing the writer
-      writer.error(CallStatus.INTERNAL.withDescription("error completing exchange").toRuntimeException());
+      writer.error(
+          CallStatus.INTERNAL.withDescription("error completing exchange").toRuntimeException());
     }
   }
 }
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestErrorMetadata.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestErrorMetadata.java
index 4ec7301466228..a9a3e355bc37f 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestErrorMetadata.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestErrorMetadata.java
@@ -14,67 +14,74 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
 import static org.apache.arrow.flight.Location.forGrpcInsecure;
-
-import java.nio.charset.StandardCharsets;
-
-import org.apache.arrow.flight.perf.impl.PerfOuterClass;
-import org.apache.arrow.memory.BufferAllocator;
-import org.apache.arrow.memory.RootAllocator;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import com.google.protobuf.Any;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.rpc.Status;
-
 import io.grpc.Metadata;
 import io.grpc.StatusRuntimeException;
 import io.grpc.protobuf.ProtoUtils;
 import io.grpc.protobuf.StatusProto;
+import java.nio.charset.StandardCharsets;
+import org.apache.arrow.flight.perf.impl.PerfOuterClass;
+import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.memory.RootAllocator;
+import org.junit.jupiter.api.Test;
 
 public class TestErrorMetadata {
   private static final Metadata.BinaryMarshaller<Status> marshaller =
-          ProtoUtils.metadataMarshaller(Status.getDefaultInstance());
+      ProtoUtils.metadataMarshaller(Status.getDefaultInstance());
 
   /** Ensure metadata attached to a gRPC error is propagated. */
   @Test
   public void testGrpcMetadata() throws Exception {
-    PerfOuterClass.Perf perf = PerfOuterClass.Perf.newBuilder()
-                .setStreamCount(12)
-                .setRecordsPerBatch(1000)
-                .setRecordsPerStream(1000000L)
-                .build();
+    PerfOuterClass.Perf perf =
+        PerfOuterClass.Perf.newBuilder()
+            .setStreamCount(12)
+            .setRecordsPerBatch(1000)
+            .setRecordsPerStream(1000000L)
+            .build();
     StatusRuntimeExceptionProducer producer = new StatusRuntimeExceptionProducer(perf);
     try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         final FlightServer s = FlightServer.builder(allocator, forGrpcInsecure(LOCALHOST, 0), producer).build()
-             .start();
-         final FlightClient client = FlightClient.builder(allocator, s.getLocation()).build()) {
-      final CallStatus flightStatus = FlightTestUtil.assertCode(FlightStatusCode.CANCELLED, () -> {
-        FlightStream stream = client.getStream(new Ticket("abs".getBytes(StandardCharsets.UTF_8)));
-        stream.next();
-      });
+        final FlightServer s =
+            FlightServer.builder(allocator, forGrpcInsecure(LOCALHOST, 0), producer)
+                .build()
+                .start();
+        final FlightClient client = FlightClient.builder(allocator, s.getLocation()).build()) {
+      final CallStatus flightStatus =
+          FlightTestUtil.assertCode(
+              FlightStatusCode.CANCELLED,
+              () -> {
+                FlightStream stream =
+                    client.getStream(new Ticket("abs".getBytes(StandardCharsets.UTF_8)));
+                stream.next();
+              });
       PerfOuterClass.Perf newPerf = null;
       ErrorFlightMetadata metadata = flightStatus.metadata();
-      Assertions.assertNotNull(metadata);
-      Assertions.assertEquals(2, metadata.keys().size());
-      Assertions.assertTrue(metadata.containsKey("grpc-status-details-bin"));
+      assertNotNull(metadata);
+      assertEquals(2, metadata.keys().size());
+      assertTrue(metadata.containsKey("grpc-status-details-bin"));
       Status status = marshaller.parseBytes(metadata.getByte("grpc-status-details-bin"));
       for (Any details : status.getDetailsList()) {
         if (details.is(PerfOuterClass.Perf.class)) {
           try {
             newPerf = details.unpack(PerfOuterClass.Perf.class);
           } catch (InvalidProtocolBufferException e) {
-            Assertions.fail();
+            fail();
           }
         }
       }
-      Assertions.assertNotNull(newPerf);
-      Assertions.assertEquals(perf, newPerf);
+      assertNotNull(newPerf);
+      assertEquals(perf, newPerf);
     }
   }
 
@@ -82,25 +89,33 @@ public void testGrpcMetadata() throws Exception {
   @Test
   public void testFlightMetadata() throws Exception {
     try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         final FlightServer s = FlightServer.builder(allocator, forGrpcInsecure(LOCALHOST, 0), new CallStatusProducer())
-             .build().start();
-         final FlightClient client = FlightClient.builder(allocator, s.getLocation()).build()) {
-      CallStatus flightStatus = FlightTestUtil.assertCode(FlightStatusCode.INVALID_ARGUMENT, () -> {
-        FlightStream stream = client.getStream(new Ticket(new byte[0]));
-        stream.next();
-      });
+        final FlightServer s =
+            FlightServer.builder(allocator, forGrpcInsecure(LOCALHOST, 0), new CallStatusProducer())
+                .build()
+                .start();
+        final FlightClient client = FlightClient.builder(allocator, s.getLocation()).build()) {
+      CallStatus flightStatus =
+          FlightTestUtil.assertCode(
+              FlightStatusCode.INVALID_ARGUMENT,
+              () -> {
+                FlightStream stream = client.getStream(new Ticket(new byte[0]));
+                stream.next();
+              });
       ErrorFlightMetadata metadata = flightStatus.metadata();
-      Assertions.assertNotNull(metadata);
-      Assertions.assertEquals("foo", metadata.get("x-foo"));
-      Assertions.assertArrayEquals(new byte[]{1}, metadata.getByte("x-bar-bin"));
-
-      flightStatus = FlightTestUtil.assertCode(FlightStatusCode.INVALID_ARGUMENT, () -> {
-        client.getInfo(FlightDescriptor.command(new byte[0]));
-      });
+      assertNotNull(metadata);
+      assertEquals("foo", metadata.get("x-foo"));
+      assertArrayEquals(new byte[] {1}, metadata.getByte("x-bar-bin"));
+
+      flightStatus =
+          FlightTestUtil.assertCode(
+              FlightStatusCode.INVALID_ARGUMENT,
+              () -> {
+                client.getInfo(FlightDescriptor.command(new byte[0]));
+              });
       metadata = flightStatus.metadata();
-      Assertions.assertNotNull(metadata);
-      Assertions.assertEquals("foo", metadata.get("x-foo"));
-      Assertions.assertArrayEquals(new byte[]{1}, metadata.getByte("x-bar-bin"));
+      assertNotNull(metadata);
+      assertEquals("foo", metadata.get("x-foo"));
+      assertArrayEquals(new byte[] {1}, metadata.getByte("x-bar-bin"));
     }
   }
 
@@ -113,11 +128,13 @@ private StatusRuntimeExceptionProducer(PerfOuterClass.Perf perf) {
 
     @Override
     public void getStream(CallContext context, Ticket ticket, ServerStreamListener listener) {
-      StatusRuntimeException sre = StatusProto.toStatusRuntimeException(Status.newBuilder()
-              .setCode(1)
-              .setMessage("Testing 1 2 3")
-              .addDetails(Any.pack(perf, "arrow/meta/types"))
-              .build());
+      StatusRuntimeException sre =
+          StatusProto.toStatusRuntimeException(
+              Status.newBuilder()
+                  .setCode(1)
+                  .setMessage("Testing 1 2 3")
+                  .addDetails(Any.pack(perf, "arrow/meta/types"))
+                  .build());
       listener.error(sre);
     }
   }
@@ -128,17 +145,24 @@ private static class CallStatusProducer extends NoOpFlightProducer {
     CallStatusProducer() {
       this.metadata = new ErrorFlightMetadata();
       metadata.insert("x-foo", "foo");
-      metadata.insert("x-bar-bin", new byte[]{1});
+      metadata.insert("x-bar-bin", new byte[] {1});
     }
 
     @Override
     public void getStream(CallContext context, Ticket ticket, ServerStreamListener listener) {
-      listener.error(CallStatus.INVALID_ARGUMENT.withDescription("Failed").withMetadata(metadata).toRuntimeException());
+      listener.error(
+          CallStatus.INVALID_ARGUMENT
+              .withDescription("Failed")
+              .withMetadata(metadata)
+              .toRuntimeException());
     }
 
     @Override
     public FlightInfo getFlightInfo(CallContext context, FlightDescriptor descriptor) {
-      throw CallStatus.INVALID_ARGUMENT.withDescription("Failed").withMetadata(metadata).toRuntimeException();
+      throw CallStatus.INVALID_ARGUMENT
+          .withDescription("Failed")
+          .withMetadata(metadata)
+          .toRuntimeException();
     }
   }
 }
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestFlightClient.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestFlightClient.java
index db05592ab37c5..86e7f2f19097c 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestFlightClient.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestFlightClient.java
@@ -14,16 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
 import static org.apache.arrow.flight.Location.forGrpcInsecure;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.flight.FlightClient.ClientStreamListener;
 import org.apache.arrow.flight.TestBasicOperation.Producer;
 import org.apache.arrow.memory.BufferAllocator;
@@ -43,27 +47,29 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 public class TestFlightClient {
-  /**
-   * ARROW-5063: make sure two clients to the same location can be closed independently.
-   */
+  /** ARROW-5063: make sure two clients to the same location can be closed independently. */
   @Test
   public void independentShutdown() throws Exception {
     try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-         final FlightServer server = FlightServer.builder(allocator, forGrpcInsecure(LOCALHOST, 0),
-             new Producer(allocator)).build().start()) {
-      final Schema schema = new Schema(Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
-      try (final FlightClient client1 = FlightClient.builder(allocator, server.getLocation()).build();
-           final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+        final FlightServer server =
+            FlightServer.builder(allocator, forGrpcInsecure(LOCALHOST, 0), new Producer(allocator))
+                .build()
+                .start()) {
+      final Schema schema =
+          new Schema(Collections.singletonList(Field.nullable("a", new ArrowType.Int(32, true))));
+      try (final FlightClient client1 =
+              FlightClient.builder(allocator, server.getLocation()).build();
+          final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
         // Use startPut as this ensures the RPC won't finish until we want it to
-        final ClientStreamListener listener = client1.startPut(FlightDescriptor.path("test"), root,
-            new AsyncPutListener());
-        try (final FlightClient client2 = FlightClient.builder(allocator, server.getLocation()).build()) {
-          client2.listActions().forEach(actionType -> Assertions.assertNotNull(actionType.getType()));
+        final ClientStreamListener listener =
+            client1.startPut(FlightDescriptor.path("test"), root, new AsyncPutListener());
+        try (final FlightClient client2 =
+            FlightClient.builder(allocator, server.getLocation()).build()) {
+          client2.listActions().forEach(actionType -> assertNotNull(actionType.getType()));
         }
         listener.completed();
         listener.getResult();
@@ -77,69 +83,93 @@ public void independentShutdown() throws Exception {
   @Disabled // Unfortunately this test is flaky in CI.
   @Test
   public void freeDictionaries() throws Exception {
-    final Schema expectedSchema = new Schema(Collections
-        .singletonList(new Field("encoded",
-            new FieldType(true, new ArrowType.Int(32, true), new DictionaryEncoding(1L, false, null)), null)));
+    final Schema expectedSchema =
+        new Schema(
+            Collections.singletonList(
+                new Field(
+                    "encoded",
+                    new FieldType(
+                        true, new ArrowType.Int(32, true), new DictionaryEncoding(1L, false, null)),
+                    null)));
     try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-         final BufferAllocator serverAllocator = allocator.newChildAllocator("flight-server", 0, Integer.MAX_VALUE);
-         final FlightServer server = FlightServer.builder(serverAllocator, forGrpcInsecure(LOCALHOST, 0),
-             new DictionaryProducer(serverAllocator)).build().start()) {
-      try (final FlightClient client = FlightClient.builder(allocator, server.getLocation()).build()) {
+        final BufferAllocator serverAllocator =
+            allocator.newChildAllocator("flight-server", 0, Integer.MAX_VALUE);
+        final FlightServer server =
+            FlightServer.builder(
+                    serverAllocator,
+                    forGrpcInsecure(LOCALHOST, 0),
+                    new DictionaryProducer(serverAllocator))
+                .build()
+                .start()) {
+      try (final FlightClient client =
+          FlightClient.builder(allocator, server.getLocation()).build()) {
         try (final FlightStream stream = client.getStream(new Ticket(new byte[0]))) {
-          Assertions.assertTrue(stream.next());
-          Assertions.assertNotNull(stream.getDictionaryProvider().lookup(1));
+          assertTrue(stream.next());
+          assertNotNull(stream.getDictionaryProvider().lookup(1));
           final VectorSchemaRoot root = stream.getRoot();
-          Assertions.assertEquals(expectedSchema, root.getSchema());
-          Assertions.assertEquals(6, root.getVector("encoded").getValueCount());
-          try (final ValueVector decoded = DictionaryEncoder
-              .decode(root.getVector("encoded"), stream.getDictionaryProvider().lookup(1))) {
-            Assertions.assertFalse(decoded.isNull(1));
-            Assertions.assertTrue(decoded instanceof VarCharVector);
-            Assertions.assertArrayEquals("one".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decoded).get(1));
+          assertEquals(expectedSchema, root.getSchema());
+          assertEquals(6, root.getVector("encoded").getValueCount());
+          try (final ValueVector decoded =
+              DictionaryEncoder.decode(
+                  root.getVector("encoded"), stream.getDictionaryProvider().lookup(1))) {
+            assertFalse(decoded.isNull(1));
+            assertTrue(decoded instanceof VarCharVector);
+            assertArrayEquals(
+                "one".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decoded).get(1));
           }
-          Assertions.assertFalse(stream.next());
+          assertFalse(stream.next());
         }
-        // Closing stream fails if it doesn't free dictionaries; closing dictionaries fails (refcount goes negative)
+        // Closing stream fails if it doesn't free dictionaries; closing dictionaries fails
+        // (refcount goes negative)
         // if reference isn't retained in ArrowMessage
       }
     }
   }
 
-  /**
-   * ARROW-5978: make sure that dictionary ownership can't be claimed twice.
-   */
+  /** ARROW-5978: make sure that dictionary ownership can't be claimed twice. */
   @Disabled // Unfortunately this test is flaky in CI.
   @Test
   public void ownDictionaries() throws Exception {
     try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-         final BufferAllocator serverAllocator = allocator.newChildAllocator("flight-server", 0, Integer.MAX_VALUE);
-         final FlightServer server = FlightServer.builder(serverAllocator, forGrpcInsecure(LOCALHOST, 0),
-             new DictionaryProducer(serverAllocator)).build().start()) {
-      try (final FlightClient client = FlightClient.builder(allocator, server.getLocation()).build()) {
+        final BufferAllocator serverAllocator =
+            allocator.newChildAllocator("flight-server", 0, Integer.MAX_VALUE);
+        final FlightServer server =
+            FlightServer.builder(
+                    serverAllocator,
+                    forGrpcInsecure(LOCALHOST, 0),
+                    new DictionaryProducer(serverAllocator))
+                .build()
+                .start()) {
+      try (final FlightClient client =
+          FlightClient.builder(allocator, server.getLocation()).build()) {
         try (final FlightStream stream = client.getStream(new Ticket(new byte[0]))) {
-          Assertions.assertTrue(stream.next());
-          Assertions.assertFalse(stream.next());
+          assertTrue(stream.next());
+          assertFalse(stream.next());
           final DictionaryProvider provider = stream.takeDictionaryOwnership();
-          Assertions.assertThrows(IllegalStateException.class, stream::takeDictionaryOwnership);
-          Assertions.assertThrows(IllegalStateException.class, stream::getDictionaryProvider);
+          assertThrows(IllegalStateException.class, stream::takeDictionaryOwnership);
+          assertThrows(IllegalStateException.class, stream::getDictionaryProvider);
           DictionaryUtils.closeDictionaries(stream.getSchema(), provider);
         }
       }
     }
   }
 
-  /**
-   * ARROW-5978: make sure that dictionaries can be used after closing the stream.
-   */
+  /** ARROW-5978: make sure that dictionaries can be used after closing the stream. */
   @Disabled // Unfortunately this test is flaky in CI.
   @Test
   public void useDictionariesAfterClose() throws Exception {
     try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-         final BufferAllocator serverAllocator = allocator.newChildAllocator("flight-server", 0, Integer.MAX_VALUE);
-         final FlightServer server = FlightServer.builder(serverAllocator, forGrpcInsecure(LOCALHOST, 0),
-                 new DictionaryProducer(serverAllocator))
-             .build().start()) {
-      try (final FlightClient client = FlightClient.builder(allocator, server.getLocation()).build()) {
+        final BufferAllocator serverAllocator =
+            allocator.newChildAllocator("flight-server", 0, Integer.MAX_VALUE);
+        final FlightServer server =
+            FlightServer.builder(
+                    serverAllocator,
+                    forGrpcInsecure(LOCALHOST, 0),
+                    new DictionaryProducer(serverAllocator))
+                .build()
+                .start()) {
+      try (final FlightClient client =
+          FlightClient.builder(allocator, server.getLocation()).build()) {
         final VectorSchemaRoot root;
         final DictionaryProvider provider;
         try (final FlightStream stream = client.getStream(new Ticket(new byte[0]))) {
@@ -153,11 +183,12 @@ public void useDictionariesAfterClose() throws Exception {
           }
           provider = stream.takeDictionaryOwnership();
         }
-        try (final ValueVector decoded = DictionaryEncoder
-            .decode(root.getVector("encoded"), provider.lookup(1))) {
-          Assertions.assertFalse(decoded.isNull(1));
-          Assertions.assertTrue(decoded instanceof VarCharVector);
-          Assertions.assertArrayEquals("one".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decoded).get(1));
+        try (final ValueVector decoded =
+            DictionaryEncoder.decode(root.getVector("encoded"), provider.lookup(1))) {
+          assertFalse(decoded.isNull(1));
+          assertTrue(decoded instanceof VarCharVector);
+          assertArrayEquals(
+              "one".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decoded).get(1));
         }
         root.close();
         DictionaryUtils.closeDictionaries(root.getSchema(), provider);
@@ -179,7 +210,8 @@ public void getStream(CallContext context, Ticket ticket, ServerStreamListener l
       final byte[] one = "one".getBytes(StandardCharsets.UTF_8);
       final byte[] two = "two".getBytes(StandardCharsets.UTF_8);
       try (final VarCharVector dictionaryVector = newVarCharVector("dictionary", allocator)) {
-        final DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();
+        final DictionaryProvider.MapDictionaryProvider provider =
+            new DictionaryProvider.MapDictionaryProvider();
 
         dictionaryVector.allocateNew(512, 3);
         dictionaryVector.setSafe(0, zero, 0, zero.length);
@@ -187,7 +219,8 @@ public void getStream(CallContext context, Ticket ticket, ServerStreamListener l
         dictionaryVector.setSafe(2, two, 0, two.length);
         dictionaryVector.setValueCount(3);
 
-        final Dictionary dictionary = new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
+        final Dictionary dictionary =
+            new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
         provider.put(dictionary);
 
         final FieldVector encodedVector;
@@ -204,7 +237,8 @@ public void getStream(CallContext context, Ticket ticket, ServerStreamListener l
         final List<Field> fields = Collections.singletonList(encodedVector.getField());
         final List<FieldVector> vectors = Collections.singletonList(encodedVector);
 
-        try (final VectorSchemaRoot root = new VectorSchemaRoot(fields, vectors, encodedVector.getValueCount())) {
+        try (final VectorSchemaRoot root =
+            new VectorSchemaRoot(fields, vectors, encodedVector.getValueCount())) {
           listener.start(root, provider);
           listener.putNext();
           listener.completed();
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestFlightGrpcUtils.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestFlightGrpcUtils.java
index 2569d2ac2b384..b82e9ee26b15d 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestFlightGrpcUtils.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestFlightGrpcUtils.java
@@ -14,36 +14,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
+import com.google.protobuf.Empty;
+import io.grpc.BindableService;
+import io.grpc.ConnectivityState;
+import io.grpc.ManagedChannel;
+import io.grpc.Server;
+import io.grpc.inprocess.InProcessChannelBuilder;
+import io.grpc.inprocess.InProcessServerBuilder;
+import io.grpc.stub.StreamObserver;
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-
 import org.apache.arrow.flight.auth.ServerAuthHandler;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import com.google.protobuf.Empty;
-
-import io.grpc.BindableService;
-import io.grpc.ConnectivityState;
-import io.grpc.ManagedChannel;
-import io.grpc.Server;
-import io.grpc.inprocess.InProcessChannelBuilder;
-import io.grpc.inprocess.InProcessServerBuilder;
-import io.grpc.stub.StreamObserver;
-
-/**
- * Unit test which adds 2 services to same server end point.
- */
+/** Unit test which adds 2 services to same server end point. */
 public class TestFlightGrpcUtils {
   private Server server;
   private BufferAllocator allocator;
@@ -51,21 +48,22 @@ public class TestFlightGrpcUtils {
 
   @BeforeEach
   public void setup() throws IOException {
-    //Defines flight service
+    // Defines flight service
     allocator = new RootAllocator(Integer.MAX_VALUE);
     final NoOpFlightProducer producer = new NoOpFlightProducer();
     final ServerAuthHandler authHandler = ServerAuthHandler.NO_OP;
     final ExecutorService exec = Executors.newCachedThreadPool();
-    final BindableService flightBindingService = FlightGrpcUtils.createFlightService(allocator, producer,
-        authHandler, exec);
+    final BindableService flightBindingService =
+        FlightGrpcUtils.createFlightService(allocator, producer, authHandler, exec);
 
-    //initializes server with 2 services - FlightBindingService & TestService
+    // initializes server with 2 services - FlightBindingService & TestService
     serverName = InProcessServerBuilder.generateName();
-    server = InProcessServerBuilder.forName(serverName)
-        .directExecutor()
-        .addService(flightBindingService)
-        .addService(new TestServiceAdapter())
-        .build();
+    server =
+        InProcessServerBuilder.forName(serverName)
+            .directExecutor()
+            .addService(flightBindingService)
+            .addService(new TestServiceAdapter())
+            .build();
     server.start();
   }
 
@@ -75,111 +73,113 @@ public void cleanup() {
   }
 
   /**
-   * This test checks if multiple gRPC services can be added to the same
-   * server endpoint and if they can be used by different clients via the same channel.
+   * This test checks if multiple gRPC services can be added to the same server endpoint and if they
+   * can be used by different clients via the same channel.
+   *
    * @throws IOException If server fails to start.
    */
   @Test
   public void testMultipleGrpcServices() throws IOException {
-    //Initializes channel so that multiple clients can communicate with server
-    final ManagedChannel managedChannel = InProcessChannelBuilder.forName(serverName)
-            .directExecutor()
-            .build();
+    // Initializes channel so that multiple clients can communicate with server
+    final ManagedChannel managedChannel =
+        InProcessChannelBuilder.forName(serverName).directExecutor().build();
 
-    //Defines flight client and calls service method. Since we use a NoOpFlightProducer we expect the service
-    //to throw a RunTimeException
+    // Defines flight client and calls service method. Since we use a NoOpFlightProducer we expect
+    // the service
+    // to throw a RunTimeException
     final FlightClient flightClient = FlightGrpcUtils.createFlightClient(allocator, managedChannel);
     final Iterable<ActionType> actionTypes = flightClient.listActions();
-    assertThrows(FlightRuntimeException.class, () -> actionTypes.forEach(
-        actionType -> System.out.println(actionType.toString())));
-
-    //Define Test client as a blocking stub and call test method which correctly returns an empty protobuf object
-    final TestServiceGrpc.TestServiceBlockingStub blockingStub = TestServiceGrpc.newBlockingStub(managedChannel);
-    Assertions.assertEquals(Empty.newBuilder().build(), blockingStub.test(Empty.newBuilder().build()));
+    assertThrows(
+        FlightRuntimeException.class,
+        () -> actionTypes.forEach(actionType -> System.out.println(actionType.toString())));
+
+    // Define Test client as a blocking stub and call test method which correctly returns an empty
+    // protobuf object
+    final TestServiceGrpc.TestServiceBlockingStub blockingStub =
+        TestServiceGrpc.newBlockingStub(managedChannel);
+    assertEquals(Empty.newBuilder().build(), blockingStub.test(Empty.newBuilder().build()));
   }
 
   @Test
   public void testShutdown() throws IOException, InterruptedException {
-    //Initializes channel so that multiple clients can communicate with server
-    final ManagedChannel managedChannel = InProcessChannelBuilder.forName(serverName)
-        .directExecutor()
-        .build();
+    // Initializes channel so that multiple clients can communicate with server
+    final ManagedChannel managedChannel =
+        InProcessChannelBuilder.forName(serverName).directExecutor().build();
 
-    //Defines flight client and calls service method. Since we use a NoOpFlightProducer we expect the service
-    //to throw a RunTimeException
-    final FlightClient flightClient = FlightGrpcUtils.createFlightClientWithSharedChannel(allocator, managedChannel);
+    // Defines flight client and calls service method. Since we use a NoOpFlightProducer we expect
+    // the service
+    // to throw a RunTimeException
+    final FlightClient flightClient =
+        FlightGrpcUtils.createFlightClientWithSharedChannel(allocator, managedChannel);
 
     // Should be a no-op.
     flightClient.close();
-    Assertions.assertFalse(managedChannel.isShutdown());
-    Assertions.assertFalse(managedChannel.isTerminated());
-    Assertions.assertEquals(ConnectivityState.IDLE, managedChannel.getState(false));
+    assertFalse(managedChannel.isShutdown());
+    assertFalse(managedChannel.isTerminated());
+    assertEquals(ConnectivityState.IDLE, managedChannel.getState(false));
     managedChannel.shutdownNow();
   }
 
   @Test
   public void testProxyChannel() throws IOException, InterruptedException {
-    //Initializes channel so that multiple clients can communicate with server
-    final ManagedChannel managedChannel = InProcessChannelBuilder.forName(serverName)
-        .directExecutor()
-        .build();
+    // Initializes channel so that multiple clients can communicate with server
+    final ManagedChannel managedChannel =
+        InProcessChannelBuilder.forName(serverName).directExecutor().build();
 
     final FlightGrpcUtils.NonClosingProxyManagedChannel proxyChannel =
         new FlightGrpcUtils.NonClosingProxyManagedChannel(managedChannel);
-    Assertions.assertFalse(proxyChannel.isShutdown());
-    Assertions.assertFalse(proxyChannel.isTerminated());
+    assertFalse(proxyChannel.isShutdown());
+    assertFalse(proxyChannel.isTerminated());
     proxyChannel.shutdown();
-    Assertions.assertTrue(proxyChannel.isShutdown());
-    Assertions.assertTrue(proxyChannel.isTerminated());
-    Assertions.assertEquals(ConnectivityState.SHUTDOWN, proxyChannel.getState(false));
+    assertTrue(proxyChannel.isShutdown());
+    assertTrue(proxyChannel.isTerminated());
+    assertEquals(ConnectivityState.SHUTDOWN, proxyChannel.getState(false));
     try {
       proxyChannel.newCall(null, null);
-      Assertions.fail();
+      fail();
     } catch (IllegalStateException e) {
       // This is expected, since the proxy channel is shut down.
     }
 
-    Assertions.assertFalse(managedChannel.isShutdown());
-    Assertions.assertFalse(managedChannel.isTerminated());
-    Assertions.assertEquals(ConnectivityState.IDLE, managedChannel.getState(false));
+    assertFalse(managedChannel.isShutdown());
+    assertFalse(managedChannel.isTerminated());
+    assertEquals(ConnectivityState.IDLE, managedChannel.getState(false));
 
     managedChannel.shutdownNow();
   }
 
   @Test
   public void testProxyChannelWithClosedChannel() throws IOException, InterruptedException {
-    //Initializes channel so that multiple clients can communicate with server
-    final ManagedChannel managedChannel = InProcessChannelBuilder.forName(serverName)
-        .directExecutor()
-        .build();
+    // Initializes channel so that multiple clients can communicate with server
+    final ManagedChannel managedChannel =
+        InProcessChannelBuilder.forName(serverName).directExecutor().build();
 
     final FlightGrpcUtils.NonClosingProxyManagedChannel proxyChannel =
         new FlightGrpcUtils.NonClosingProxyManagedChannel(managedChannel);
-    Assertions.assertFalse(proxyChannel.isShutdown());
-    Assertions.assertFalse(proxyChannel.isTerminated());
+    assertFalse(proxyChannel.isShutdown());
+    assertFalse(proxyChannel.isTerminated());
     managedChannel.shutdownNow();
-    Assertions.assertTrue(proxyChannel.isShutdown());
-    Assertions.assertTrue(proxyChannel.isTerminated());
-    Assertions.assertEquals(ConnectivityState.SHUTDOWN, proxyChannel.getState(false));
+    assertTrue(proxyChannel.isShutdown());
+    assertTrue(proxyChannel.isTerminated());
+    assertEquals(ConnectivityState.SHUTDOWN, proxyChannel.getState(false));
     try {
       proxyChannel.newCall(null, null);
-      Assertions.fail();
+      fail();
     } catch (IllegalStateException e) {
       // This is expected, since the proxy channel is shut down.
     }
 
-    Assertions.assertTrue(managedChannel.isShutdown());
-    Assertions.assertTrue(managedChannel.isTerminated());
-    Assertions.assertEquals(ConnectivityState.SHUTDOWN, managedChannel.getState(false));
+    assertTrue(managedChannel.isShutdown());
+    assertTrue(managedChannel.isTerminated());
+    assertEquals(ConnectivityState.SHUTDOWN, managedChannel.getState(false));
   }
 
-  /**
-   * Private class used for testing purposes that overrides service behavior.
-   */
+  /** Private class used for testing purposes that overrides service behavior. */
   private static class TestServiceAdapter extends TestServiceGrpc.TestServiceImplBase {
 
     /**
      * gRPC service that receives an empty object & returns and empty protobuf object.
+     *
      * @param request google.protobuf.Empty
      * @param responseObserver google.protobuf.Empty
      */
@@ -190,4 +190,3 @@ public void test(Empty request, StreamObserver<Empty> responseObserver) {
     }
   }
 }
-
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestFlightService.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestFlightService.java
index de1b7750da3bf..5ebeb44c1d36e 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestFlightService.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestFlightService.java
@@ -14,17 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
 import static org.apache.arrow.flight.Location.forGrpcInsecure;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.fail;
 
+import io.grpc.stub.ServerCallStreamObserver;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.Optional;
-
 import org.apache.arrow.flight.impl.Flight;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -32,12 +34,9 @@
 import org.apache.arrow.vector.ipc.message.IpcOption;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import io.grpc.stub.ServerCallStreamObserver;
-
 public class TestFlightService {
 
   private BufferAllocator allocator;
@@ -54,76 +53,63 @@ public void cleanup() throws Exception {
 
   @Test
   public void testFlightServiceWithNoAuthHandlerOrInterceptors() {
-    // This test is for ARROW-10491. There was a bug where FlightService would try to access the RequestContext,
-    // but the RequestContext was getting set to null because no interceptors were active to initialize it
+    // This test is for ARROW-10491. There was a bug where FlightService would try to access the
+    // RequestContext,
+    // but the RequestContext was getting set to null because no interceptors were active to
+    // initialize it
     // when using FlightService directly rather than starting up a FlightServer.
 
     // Arrange
-    final FlightProducer producer = new NoOpFlightProducer() {
-      @Override
-      public void getStream(CallContext context, Ticket ticket,
-                            ServerStreamListener listener) {
-        listener.completed();
-      }
-    };
+    final FlightProducer producer =
+        new NoOpFlightProducer() {
+          @Override
+          public void getStream(CallContext context, Ticket ticket, ServerStreamListener listener) {
+            listener.completed();
+          }
+        };
 
     // This response observer notifies that the test failed if onError() is called.
-    final ServerCallStreamObserver<ArrowMessage> observer = new ServerCallStreamObserver<ArrowMessage>() {
-      @Override
-      public boolean isCancelled() {
-        return false;
-      }
-
-      @Override
-      public void setOnCancelHandler(Runnable runnable) {
-
-      }
-
-      @Override
-      public void setCompression(String s) {
-
-      }
-
-      @Override
-      public boolean isReady() {
-        return false;
-      }
-
-      @Override
-      public void setOnReadyHandler(Runnable runnable) {
-
-      }
-
-      @Override
-      public void disableAutoInboundFlowControl() {
+    final ServerCallStreamObserver<ArrowMessage> observer =
+        new ServerCallStreamObserver<ArrowMessage>() {
+          @Override
+          public boolean isCancelled() {
+            return false;
+          }
 
-      }
+          @Override
+          public void setOnCancelHandler(Runnable runnable) {}
 
-      @Override
-      public void request(int i) {
+          @Override
+          public void setCompression(String s) {}
 
-      }
+          @Override
+          public boolean isReady() {
+            return false;
+          }
 
-      @Override
-      public void setMessageCompression(boolean b) {
+          @Override
+          public void setOnReadyHandler(Runnable runnable) {}
 
-      }
+          @Override
+          public void disableAutoInboundFlowControl() {}
 
-      @Override
-      public void onNext(ArrowMessage arrowMessage) {
+          @Override
+          public void request(int i) {}
 
-      }
+          @Override
+          public void setMessageCompression(boolean b) {}
 
-      @Override
-      public void onError(Throwable throwable) {
-        fail(throwable);
-      }
+          @Override
+          public void onNext(ArrowMessage arrowMessage) {}
 
-      @Override
-      public void onCompleted() {
+          @Override
+          public void onError(Throwable throwable) {
+            fail(throwable);
+          }
 
-      }
-    };
+          @Override
+          public void onCompleted() {}
+        };
     final FlightService flightService = new FlightService(allocator, producer, null, null);
 
     // Act
@@ -133,29 +119,37 @@ public void onCompleted() {
   }
 
   @Test
-  public void supportsNullSchemas() throws Exception
-  {
-    final FlightProducer producer = new NoOpFlightProducer() {
-      @Override
-      public FlightInfo getFlightInfo(CallContext context,
-              FlightDescriptor descriptor) {
-        return new FlightInfo(null, descriptor, Collections.emptyList(),
-                0, 0, false, IpcOption.DEFAULT, "foo".getBytes(StandardCharsets.UTF_8));
-      }
-    };
+  public void supportsNullSchemas() throws Exception {
+    final FlightProducer producer =
+        new NoOpFlightProducer() {
+          @Override
+          public FlightInfo getFlightInfo(CallContext context, FlightDescriptor descriptor) {
+            return new FlightInfo(
+                null,
+                descriptor,
+                Collections.emptyList(),
+                0,
+                0,
+                false,
+                IpcOption.DEFAULT,
+                "foo".getBytes(StandardCharsets.UTF_8));
+          }
+        };
 
     try (final FlightServer s =
-            FlightServer.builder(allocator, forGrpcInsecure(LOCALHOST, 0), producer).build().start();
-            final FlightClient client = FlightClient.builder(allocator, s.getLocation()).build()) {
+            FlightServer.builder(allocator, forGrpcInsecure(LOCALHOST, 0), producer)
+                .build()
+                .start();
+        final FlightClient client = FlightClient.builder(allocator, s.getLocation()).build()) {
       FlightInfo flightInfo = client.getInfo(FlightDescriptor.path("test"));
-      Assertions.assertEquals(Optional.empty(), flightInfo.getSchemaOptional());
-      Assertions.assertEquals(new Schema(Collections.emptyList()), flightInfo.getSchema());
-      Assertions.assertArrayEquals(flightInfo.getAppMetadata(), "foo".getBytes(StandardCharsets.UTF_8));
-
-      Exception e = Assertions.assertThrows(
-          FlightRuntimeException.class,
-          () -> client.getSchema(FlightDescriptor.path("test")));
-      Assertions.assertEquals("No schema is present in FlightInfo", e.getMessage());
+      assertEquals(Optional.empty(), flightInfo.getSchemaOptional());
+      assertEquals(new Schema(Collections.emptyList()), flightInfo.getSchema());
+      assertArrayEquals(flightInfo.getAppMetadata(), "foo".getBytes(StandardCharsets.UTF_8));
+
+      Exception e =
+          assertThrows(
+              FlightRuntimeException.class, () -> client.getSchema(FlightDescriptor.path("test")));
+      assertEquals("No schema is present in FlightInfo", e.getMessage());
     }
   }
 }
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestLargeMessage.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestLargeMessage.java
index 430dc29a7d0c2..9362e1f55258b 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestLargeMessage.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestLargeMessage.java
@@ -14,17 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
 import static org.apache.arrow.flight.Location.forGrpcInsecure;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Stream;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
@@ -33,28 +32,26 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 public class TestLargeMessage {
-  /**
-   * Make sure a Flight client accepts large message payloads by default.
-   */
+  /** Make sure a Flight client accepts large message payloads by default. */
   @Test
   public void getLargeMessage() throws Exception {
     try (final BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
-         final Producer producer = new Producer(a);
-         final FlightServer s = FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), producer).build().start()) {
+        final Producer producer = new Producer(a);
+        final FlightServer s =
+            FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), producer).build().start()) {
 
       try (FlightClient client = FlightClient.builder(a, s.getLocation()).build()) {
-        try (FlightStream stream = client.getStream(new Ticket(new byte[]{}));
+        try (FlightStream stream = client.getStream(new Ticket(new byte[] {}));
             VectorSchemaRoot root = stream.getRoot()) {
           while (stream.next()) {
             for (final Field field : root.getSchema().getFields()) {
               int value = 0;
               final IntVector iv = (IntVector) root.getVector(field.getName());
               for (int i = 0; i < root.getRowCount(); i++) {
-                Assertions.assertEquals(value, iv.get(i));
+                assertEquals(value, iv.get(i));
                 value++;
               }
             }
@@ -64,19 +61,18 @@ public void getLargeMessage() throws Exception {
     }
   }
 
-  /**
-   * Make sure a Flight server accepts large message payloads by default.
-   */
+  /** Make sure a Flight server accepts large message payloads by default. */
   @Test
   public void putLargeMessage() throws Exception {
     try (final BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
-         final Producer producer = new Producer(a);
-         final FlightServer s = FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), producer).build().start()) {
+        final Producer producer = new Producer(a);
+        final FlightServer s =
+            FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), producer).build().start()) {
       try (FlightClient client = FlightClient.builder(a, s.getLocation()).build();
-           BufferAllocator testAllocator = a.newChildAllocator("testcase", 0, Long.MAX_VALUE);
-           VectorSchemaRoot root = generateData(testAllocator)) {
-        final FlightClient.ClientStreamListener listener = client.startPut(FlightDescriptor.path("hello"), root,
-            new AsyncPutListener());
+          BufferAllocator testAllocator = a.newChildAllocator("testcase", 0, Long.MAX_VALUE);
+          VectorSchemaRoot root = generateData(testAllocator)) {
+        final FlightClient.ClientStreamListener listener =
+            client.startPut(FlightDescriptor.path("hello"), root, new AsyncPutListener());
         listener.putNext();
         listener.completed();
         listener.getResult();
@@ -86,10 +82,13 @@ public void putLargeMessage() throws Exception {
 
   private static VectorSchemaRoot generateData(BufferAllocator allocator) {
     final int size = 128 * 1024;
-    final List<String> fieldNames = Arrays.asList("c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10");
-    final Stream<Field> fields = fieldNames
-        .stream()
-        .map(fieldName -> new Field(fieldName, FieldType.nullable(new ArrowType.Int(32, true)), null));
+    final List<String> fieldNames =
+        Arrays.asList("c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "c10");
+    final Stream<Field> fields =
+        fieldNames.stream()
+            .map(
+                fieldName ->
+                    new Field(fieldName, FieldType.nullable(new ArrowType.Int(32, true)), null));
     final Schema schema = new Schema(fields.collect(toImmutableList()), null);
 
     final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator);
@@ -113,8 +112,7 @@ private static class Producer implements FlightProducer, AutoCloseable {
     }
 
     @Override
-    public void getStream(CallContext context, Ticket ticket,
-        ServerStreamListener listener) {
+    public void getStream(CallContext context, Ticket ticket, ServerStreamListener listener) {
       try (VectorSchemaRoot root = generateData(allocator)) {
         listener.start(root);
         listener.putNext();
@@ -123,39 +121,32 @@ public void getStream(CallContext context, Ticket ticket,
     }
 
     @Override
-    public void listFlights(CallContext context, Criteria criteria,
-        StreamListener<FlightInfo> listener) {
-
-    }
+    public void listFlights(
+        CallContext context, Criteria criteria, StreamListener<FlightInfo> listener) {}
 
     @Override
-    public FlightInfo getFlightInfo(CallContext context,
-        FlightDescriptor descriptor) {
+    public FlightInfo getFlightInfo(CallContext context, FlightDescriptor descriptor) {
       return null;
     }
 
     @Override
-    public Runnable acceptPut(CallContext context, FlightStream flightStream, StreamListener<PutResult> ackStream) {
+    public Runnable acceptPut(
+        CallContext context, FlightStream flightStream, StreamListener<PutResult> ackStream) {
       return () -> {
         try (VectorSchemaRoot root = flightStream.getRoot()) {
-          while (flightStream.next()) {
-            ;
+          while (flightStream.next()) {;
           }
         }
       };
     }
 
     @Override
-    public void doAction(CallContext context, Action action,
-        StreamListener<Result> listener) {
+    public void doAction(CallContext context, Action action, StreamListener<Result> listener) {
       listener.onCompleted();
     }
 
     @Override
-    public void listActions(CallContext context,
-        StreamListener<ActionType> listener) {
-
-    }
+    public void listActions(CallContext context, StreamListener<ActionType> listener) {}
 
     @Override
     public void close() throws Exception {
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestLeak.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestLeak.java
index 1e4d2470c6e8a..c9ca72e8454d3 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestLeak.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestLeak.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
@@ -23,7 +22,6 @@
 import java.util.Arrays;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.Float8Vector;
@@ -34,50 +32,53 @@
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.junit.jupiter.api.Test;
 
-/**
- * Tests for scenarios where Flight could leak memory.
- */
+/** Tests for scenarios where Flight could leak memory. */
 public class TestLeak {
 
   private static final int ROWS = 2048;
 
   private static Schema getSchema() {
-    return new Schema(Arrays.asList(
-        Field.nullable("0", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
-        Field.nullable("1", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
-        Field.nullable("2", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
-        Field.nullable("3", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
-        Field.nullable("4", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
-        Field.nullable("5", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
-        Field.nullable("6", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
-        Field.nullable("7", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
-        Field.nullable("8", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
-        Field.nullable("9", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
-        Field.nullable("10", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE))
-    ));
+    return new Schema(
+        Arrays.asList(
+            Field.nullable("0", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
+            Field.nullable("1", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
+            Field.nullable("2", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
+            Field.nullable("3", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
+            Field.nullable("4", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
+            Field.nullable("5", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
+            Field.nullable("6", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
+            Field.nullable("7", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
+            Field.nullable("8", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
+            Field.nullable("9", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
+            Field.nullable("10", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE))));
   }
 
   /**
    * Ensure that if the client cancels, the server does not leak memory.
    *
-   * <p>In gRPC, canceling the stream from the client sends an event to the server. Once processed, gRPC will start
-   * silently rejecting messages sent by the server. However, Flight depends on gRPC processing these messages in order
-   * to free the associated memory.
+   * <p>In gRPC, canceling the stream from the client sends an event to the server. Once processed,
+   * gRPC will start silently rejecting messages sent by the server. However, Flight depends on gRPC
+   * processing these messages in order to free the associated memory.
    */
   @Test
   public void testCancelingDoGetDoesNotLeak() throws Exception {
     final CountDownLatch callFinished = new CountDownLatch(1);
     try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         final FlightServer s = FlightServer.builder(allocator, forGrpcInsecure(LOCALHOST, 0),
-                 new LeakFlightProducer(allocator, callFinished))
-             .build().start();
-         final FlightClient client = FlightClient.builder(allocator, s.getLocation()).build()) {
+        final FlightServer s =
+            FlightServer.builder(
+                    allocator,
+                    forGrpcInsecure(LOCALHOST, 0),
+                    new LeakFlightProducer(allocator, callFinished))
+                .build()
+                .start();
+        final FlightClient client = FlightClient.builder(allocator, s.getLocation()).build()) {
 
       final FlightStream stream = client.getStream(new Ticket(new byte[0]));
       stream.getRoot();
       stream.cancel("Cancel", null);
 
-      // Wait for the call to finish. (Closing the allocator while a call is ongoing is a guaranteed leak.)
+      // Wait for the call to finish. (Closing the allocator while a call is ongoing is a guaranteed
+      // leak.)
       callFinished.await(60, TimeUnit.SECONDS);
 
       s.shutdown();
@@ -89,15 +90,20 @@ public void testCancelingDoGetDoesNotLeak() throws Exception {
   public void testCancelingDoPutDoesNotBlock() throws Exception {
     final CountDownLatch callFinished = new CountDownLatch(1);
     try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         final FlightServer s = FlightServer.builder(allocator, forGrpcInsecure(LOCALHOST, 0),
-                 new LeakFlightProducer(allocator, callFinished))
-             .build().start();
-         final FlightClient client = FlightClient.builder(allocator, s.getLocation()).build()) {
+        final FlightServer s =
+            FlightServer.builder(
+                    allocator,
+                    forGrpcInsecure(LOCALHOST, 0),
+                    new LeakFlightProducer(allocator, callFinished))
+                .build()
+                .start();
+        final FlightClient client = FlightClient.builder(allocator, s.getLocation()).build()) {
 
       try (final VectorSchemaRoot root = VectorSchemaRoot.create(getSchema(), allocator)) {
         final FlightDescriptor descriptor = FlightDescriptor.command(new byte[0]);
         final SyncPutListener listener = new SyncPutListener();
-        final FlightClient.ClientStreamListener stream = client.startPut(descriptor, root, listener);
+        final FlightClient.ClientStreamListener stream =
+            client.startPut(descriptor, root, listener);
         // Wait for the server to cancel
         callFinished.await(60, TimeUnit.SECONDS);
 
@@ -109,7 +115,8 @@ public void testCancelingDoPutDoesNotBlock() throws Exception {
           }
         }
         root.setRowCount(ROWS);
-        // Unlike DoGet, this method fairly reliably will write the message to the stream, so even without the fix
+        // Unlike DoGet, this method fairly reliably will write the message to the stream, so even
+        // without the fix
         // for ARROW-7343, this won't leak memory.
         // However, it will block if FlightClient doesn't check for cancellation.
         stream.putNext();
@@ -121,9 +128,7 @@ public void testCancelingDoPutDoesNotBlock() throws Exception {
     }
   }
 
-  /**
-   * A FlightProducer that always produces a fixed data stream with metadata on the side.
-   */
+  /** A FlightProducer that always produces a fixed data stream with metadata on the side. */
   private static class LeakFlightProducer extends NoOpFlightProducer {
 
     private final BufferAllocator allocator;
@@ -143,35 +148,38 @@ public void getStream(CallContext context, Ticket ticket, ServerStreamListener l
 
       // We can't poll listener#isCancelled since gRPC has two distinct "is cancelled" flags.
       // TODO: should we continue leaking gRPC semantics? Can we even avoid this?
-      listener.setOnCancelHandler(() -> {
-        try {
-          for (int col = 0; col < 11; col++) {
-            final Float8Vector vector = (Float8Vector) root.getVector(Integer.toString(col));
-            vector.allocateNew();
-            for (int row = 0; row < ROWS; row++) {
-              vector.setSafe(row, 10.);
+      listener.setOnCancelHandler(
+          () -> {
+            try {
+              for (int col = 0; col < 11; col++) {
+                final Float8Vector vector = (Float8Vector) root.getVector(Integer.toString(col));
+                vector.allocateNew();
+                for (int row = 0; row < ROWS; row++) {
+                  vector.setSafe(row, 10.);
+                }
+              }
+              root.setRowCount(ROWS);
+              // Once the call is "really cancelled" (setOnCancelListener has run/is running), this
+              // call is actually a
+              // no-op on the gRPC side and will leak the ArrowMessage unless Flight checks for
+              // this.
+              listener.putNext();
+              listener.completed();
+            } finally {
+              try {
+                root.close();
+                childAllocator.close();
+              } finally {
+                // Don't let the test hang if we throw above
+                callFinished.countDown();
+              }
             }
-          }
-          root.setRowCount(ROWS);
-          // Once the call is "really cancelled" (setOnCancelListener has run/is running), this call is actually a
-          // no-op on the gRPC side and will leak the ArrowMessage unless Flight checks for this.
-          listener.putNext();
-          listener.completed();
-        } finally {
-          try {
-            root.close();
-            childAllocator.close();
-          } finally {
-            // Don't let the test hang if we throw above
-            callFinished.countDown();
-          }
-        }
-      });
+          });
     }
 
     @Override
-    public Runnable acceptPut(CallContext context,
-        FlightStream flightStream, StreamListener<PutResult> ackStream) {
+    public Runnable acceptPut(
+        CallContext context, FlightStream flightStream, StreamListener<PutResult> ackStream) {
       return () -> {
         flightStream.getRoot();
         ackStream.onError(CallStatus.CANCELLED.withDescription("CANCELLED").toRuntimeException());
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestMetadataVersion.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestMetadataVersion.java
index 0d3f7d4ff843f..6af1d7154fbf7 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestMetadataVersion.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestMetadataVersion.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -26,7 +25,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Optional;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
@@ -41,9 +39,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-/**
- * Test clients/servers with different metadata versions.
- */
+/** Test clients/servers with different metadata versions. */
 public class TestMetadataVersion {
   private static BufferAllocator allocator;
   private static Schema schema;
@@ -54,9 +50,12 @@ public class TestMetadataVersion {
   @BeforeAll
   public static void setUpClass() {
     allocator = new RootAllocator(Integer.MAX_VALUE);
-    schema = new Schema(Collections.singletonList(Field.nullable("foo", new ArrowType.Int(32, true))));
-    unionSchema = new Schema(
-        Collections.singletonList(Field.nullable("union", new ArrowType.Union(UnionMode.Dense, new int[]{0}))));
+    schema =
+        new Schema(Collections.singletonList(Field.nullable("foo", new ArrowType.Int(32, true))));
+    unionSchema =
+        new Schema(
+            Collections.singletonList(
+                Field.nullable("union", new ArrowType.Union(UnionMode.Dense, new int[] {0}))));
 
     // avoid writing legacy ipc format by default
     optionV4 = new IpcOption(false, MetadataVersion.V4);
@@ -71,7 +70,7 @@ public static void tearDownClass() {
   @Test
   public void testGetFlightInfoV4() throws Exception {
     try (final FlightServer server = startServer(optionV4);
-         final FlightClient client = connect(server)) {
+        final FlightClient client = connect(server)) {
       final FlightInfo result = client.getInfo(FlightDescriptor.command(new byte[0]));
       assertEquals(Optional.of(schema), result.getSchemaOptional());
     }
@@ -80,7 +79,7 @@ public void testGetFlightInfoV4() throws Exception {
   @Test
   public void testGetSchemaV4() throws Exception {
     try (final FlightServer server = startServer(optionV4);
-         final FlightClient client = connect(server)) {
+        final FlightClient client = connect(server)) {
       final SchemaResult result = client.getSchema(FlightDescriptor.command(new byte[0]));
       assertEquals(schema, result.getSchema());
     }
@@ -89,32 +88,43 @@ public void testGetSchemaV4() throws Exception {
   @Test
   public void testUnionCheck() throws Exception {
     assertThrows(IllegalArgumentException.class, () -> new SchemaResult(unionSchema, optionV4));
-    assertThrows(IllegalArgumentException.class, () ->
-        new FlightInfo(unionSchema, FlightDescriptor.command(new byte[0]), Collections.emptyList(), -1, -1, optionV4));
+    assertThrows(
+        IllegalArgumentException.class,
+        () ->
+            new FlightInfo(
+                unionSchema,
+                FlightDescriptor.command(new byte[0]),
+                Collections.emptyList(),
+                -1,
+                -1,
+                optionV4));
     try (final FlightServer server = startServer(optionV4);
-         final FlightClient client = connect(server);
-         final FlightStream stream = client.getStream(new Ticket("union".getBytes(StandardCharsets.UTF_8)))) {
+        final FlightClient client = connect(server);
+        final FlightStream stream =
+            client.getStream(new Ticket("union".getBytes(StandardCharsets.UTF_8)))) {
       final FlightRuntimeException err = assertThrows(FlightRuntimeException.class, stream::next);
-      assertTrue(err.getMessage().contains("Cannot write union with V4 metadata"), err.getMessage());
+      assertTrue(
+          err.getMessage().contains("Cannot write union with V4 metadata"), err.getMessage());
     }
 
     try (final FlightServer server = startServer(optionV4);
-         final FlightClient client = connect(server);
-         final VectorSchemaRoot root = VectorSchemaRoot.create(unionSchema, allocator)) {
+        final FlightClient client = connect(server);
+        final VectorSchemaRoot root = VectorSchemaRoot.create(unionSchema, allocator)) {
       final FlightDescriptor descriptor = FlightDescriptor.command(new byte[0]);
       final SyncPutListener reader = new SyncPutListener();
       final FlightClient.ClientStreamListener listener = client.startPut(descriptor, reader);
-      final IllegalArgumentException err = assertThrows(IllegalArgumentException.class,
-          () -> listener.start(root, null, optionV4));
-      assertTrue(err.getMessage().contains("Cannot write union with V4 metadata"), err.getMessage());
+      final IllegalArgumentException err =
+          assertThrows(IllegalArgumentException.class, () -> listener.start(root, null, optionV4));
+      assertTrue(
+          err.getMessage().contains("Cannot write union with V4 metadata"), err.getMessage());
     }
   }
 
   @Test
   public void testPutV4() throws Exception {
     try (final FlightServer server = startServer(optionV4);
-         final FlightClient client = connect(server);
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+        final FlightClient client = connect(server);
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       generateData(root);
       final FlightDescriptor descriptor = FlightDescriptor.command(new byte[0]);
       final SyncPutListener reader = new SyncPutListener();
@@ -129,8 +139,8 @@ public void testPutV4() throws Exception {
   @Test
   public void testGetV4() throws Exception {
     try (final FlightServer server = startServer(optionV4);
-         final FlightClient client = connect(server);
-         final FlightStream stream = client.getStream(new Ticket(new byte[0]))) {
+        final FlightClient client = connect(server);
+        final FlightStream stream = client.getStream(new Ticket(new byte[0]))) {
       assertTrue(stream.next());
       assertEquals(optionV4.metadataVersion, stream.metadataVersion);
       validateRoot(stream.getRoot());
@@ -141,9 +151,10 @@ public void testGetV4() throws Exception {
   @Test
   public void testExchangeV4ToV5() throws Exception {
     try (final FlightServer server = startServer(optionV5);
-         final FlightClient client = connect(server);
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator);
-         final FlightClient.ExchangeReaderWriter stream = client.doExchange(FlightDescriptor.command(new byte[0]))) {
+        final FlightClient client = connect(server);
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator);
+        final FlightClient.ExchangeReaderWriter stream =
+            client.doExchange(FlightDescriptor.command(new byte[0]))) {
       stream.getWriter().start(root, null, optionV4);
       generateData(root);
       stream.getWriter().putNext();
@@ -158,9 +169,10 @@ public void testExchangeV4ToV5() throws Exception {
   @Test
   public void testExchangeV5ToV4() throws Exception {
     try (final FlightServer server = startServer(optionV4);
-         final FlightClient client = connect(server);
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator);
-         final FlightClient.ExchangeReaderWriter stream = client.doExchange(FlightDescriptor.command(new byte[0]))) {
+        final FlightClient client = connect(server);
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator);
+        final FlightClient.ExchangeReaderWriter stream =
+            client.doExchange(FlightDescriptor.command(new byte[0]))) {
       stream.getWriter().start(root, null, optionV5);
       generateData(root);
       stream.getWriter().putNext();
@@ -175,9 +187,10 @@ public void testExchangeV5ToV4() throws Exception {
   @Test
   public void testExchangeV4ToV4() throws Exception {
     try (final FlightServer server = startServer(optionV4);
-         final FlightClient client = connect(server);
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator);
-         final FlightClient.ExchangeReaderWriter stream = client.doExchange(FlightDescriptor.command(new byte[0]))) {
+        final FlightClient client = connect(server);
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator);
+        final FlightClient.ExchangeReaderWriter stream =
+            client.doExchange(FlightDescriptor.command(new byte[0]))) {
       stream.getWriter().start(root, null, optionV4);
       generateData(root);
       stream.getWriter().putNext();
@@ -245,10 +258,17 @@ public void getStream(CallContext context, Ticket ticket, ServerStreamListener l
         try (final VectorSchemaRoot root = VectorSchemaRoot.create(unionSchema, allocator)) {
           listener.start(root, null, option);
         } catch (IllegalArgumentException e) {
-          listener.error(CallStatus.INTERNAL.withCause(e).withDescription(e.getMessage()).toRuntimeException());
+          listener.error(
+              CallStatus.INTERNAL
+                  .withCause(e)
+                  .withDescription(e.getMessage())
+                  .toRuntimeException());
           return;
         }
-        listener.error(CallStatus.INTERNAL.withDescription("Expected exception not raised").toRuntimeException());
+        listener.error(
+            CallStatus.INTERNAL
+                .withDescription("Expected exception not raised")
+                .toRuntimeException());
         return;
       }
       try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
@@ -260,7 +280,8 @@ public void getStream(CallContext context, Ticket ticket, ServerStreamListener l
     }
 
     @Override
-    public Runnable acceptPut(CallContext context, FlightStream flightStream, StreamListener<PutResult> ackStream) {
+    public Runnable acceptPut(
+        CallContext context, FlightStream flightStream, StreamListener<PutResult> ackStream) {
       return () -> {
         try {
           assertTrue(flightStream.next());
@@ -269,17 +290,19 @@ public Runnable acceptPut(CallContext context, FlightStream flightStream, Stream
         } catch (AssertionError err) {
           // gRPC doesn't propagate stack traces across the wire.
           err.printStackTrace();
-          ackStream.onError(CallStatus.INVALID_ARGUMENT
-              .withCause(err)
-              .withDescription("Server assertion failed: " + err)
-              .toRuntimeException());
+          ackStream.onError(
+              CallStatus.INVALID_ARGUMENT
+                  .withCause(err)
+                  .withDescription("Server assertion failed: " + err)
+                  .toRuntimeException());
           return;
         } catch (RuntimeException err) {
           err.printStackTrace();
-          ackStream.onError(CallStatus.INTERNAL
-              .withCause(err)
-              .withDescription("Server assertion failed: " + err)
-              .toRuntimeException());
+          ackStream.onError(
+              CallStatus.INTERNAL
+                  .withCause(err)
+                  .withDescription("Server assertion failed: " + err)
+                  .toRuntimeException());
           return;
         }
         ackStream.onCompleted();
@@ -296,17 +319,19 @@ public void doExchange(CallContext context, FlightStream reader, ServerStreamLis
         } catch (AssertionError err) {
           // gRPC doesn't propagate stack traces across the wire.
           err.printStackTrace();
-          writer.error(CallStatus.INVALID_ARGUMENT
-              .withCause(err)
-              .withDescription("Server assertion failed: " + err)
-              .toRuntimeException());
+          writer.error(
+              CallStatus.INVALID_ARGUMENT
+                  .withCause(err)
+                  .withDescription("Server assertion failed: " + err)
+                  .toRuntimeException());
           return;
         } catch (RuntimeException err) {
           err.printStackTrace();
-          writer.error(CallStatus.INTERNAL
-              .withCause(err)
-              .withDescription("Server assertion failed: " + err)
-              .toRuntimeException());
+          writer.error(
+              CallStatus.INTERNAL
+                  .withCause(err)
+                  .withDescription("Server assertion failed: " + err)
+                  .toRuntimeException());
           return;
         }
 
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestServerMiddleware.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestServerMiddleware.java
index 3bc8f2f90a612..c60843d2a279c 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestServerMiddleware.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestServerMiddleware.java
@@ -14,191 +14,201 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
 import static org.apache.arrow.flight.Location.forGrpcInsecure;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.BiConsumer;
-
 import org.apache.arrow.flight.FlightClient.ClientStreamListener;
-import org.apache.arrow.flight.FlightServerMiddleware.Factory;
-import org.apache.arrow.flight.FlightServerMiddleware.Key;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 public class TestServerMiddleware {
 
-  /**
-   * Make sure errors in DoPut are intercepted.
-   */
+  /** Make sure errors in DoPut are intercepted. */
   @Test
   public void doPutErrors() {
     test(
         new ErrorProducer(new RuntimeException("test")),
         (allocator, client) -> {
           final FlightDescriptor descriptor = FlightDescriptor.path("test");
-          try (final VectorSchemaRoot root = VectorSchemaRoot.create(new Schema(Collections.emptyList()), allocator)) {
-            final ClientStreamListener listener = client.startPut(descriptor, root, new SyncPutListener());
+          try (final VectorSchemaRoot root =
+              VectorSchemaRoot.create(new Schema(Collections.emptyList()), allocator)) {
+            final ClientStreamListener listener =
+                client.startPut(descriptor, root, new SyncPutListener());
             listener.completed();
             FlightTestUtil.assertCode(FlightStatusCode.INTERNAL, listener::getResult);
           }
-        }, (recorder) -> {
+        },
+        (recorder) -> {
           final CallStatus status = recorder.statusFuture.get();
-          Assertions.assertNotNull(status);
-          Assertions.assertNotNull(status.cause());
-          Assertions.assertEquals(FlightStatusCode.INTERNAL, status.code());
+          assertNotNull(status);
+          assertNotNull(status.cause());
+          assertEquals(FlightStatusCode.INTERNAL, status.code());
         });
-    // Check the status after server shutdown (to make sure gRPC finishes pending calls on the server side)
+    // Check the status after server shutdown (to make sure gRPC finishes pending calls on the
+    // server side)
   }
 
-  /**
-   * Make sure custom error codes in DoPut are intercepted.
-   */
+  /** Make sure custom error codes in DoPut are intercepted. */
   @Test
   public void doPutCustomCode() {
     test(
-        new ErrorProducer(CallStatus.UNAVAILABLE.withDescription("description").toRuntimeException()),
+        new ErrorProducer(
+            CallStatus.UNAVAILABLE.withDescription("description").toRuntimeException()),
         (allocator, client) -> {
           final FlightDescriptor descriptor = FlightDescriptor.path("test");
-          try (final VectorSchemaRoot root = VectorSchemaRoot.create(new Schema(Collections.emptyList()), allocator)) {
-            final ClientStreamListener listener = client.startPut(descriptor, root, new SyncPutListener());
+          try (final VectorSchemaRoot root =
+              VectorSchemaRoot.create(new Schema(Collections.emptyList()), allocator)) {
+            final ClientStreamListener listener =
+                client.startPut(descriptor, root, new SyncPutListener());
             listener.completed();
             FlightTestUtil.assertCode(FlightStatusCode.UNAVAILABLE, listener::getResult);
           }
-        }, (recorder) -> {
+        },
+        (recorder) -> {
           final CallStatus status = recorder.statusFuture.get();
-          Assertions.assertNotNull(status);
-          Assertions.assertNull(status.cause());
-          Assertions.assertEquals(FlightStatusCode.UNAVAILABLE, status.code());
-          Assertions.assertEquals("description", status.description());
+          assertNotNull(status);
+          assertNull(status.cause());
+          assertEquals(FlightStatusCode.UNAVAILABLE, status.code());
+          assertEquals("description", status.description());
         });
   }
 
-  /**
-   * Make sure uncaught exceptions in DoPut are intercepted.
-   */
+  /** Make sure uncaught exceptions in DoPut are intercepted. */
   @Test
   public void doPutUncaught() {
-    test(new ServerErrorProducer(new RuntimeException("test")),
+    test(
+        new ServerErrorProducer(new RuntimeException("test")),
         (allocator, client) -> {
           final FlightDescriptor descriptor = FlightDescriptor.path("test");
-          try (final VectorSchemaRoot root = VectorSchemaRoot.create(new Schema(Collections.emptyList()), allocator)) {
-            final ClientStreamListener listener = client.startPut(descriptor, root, new SyncPutListener());
+          try (final VectorSchemaRoot root =
+              VectorSchemaRoot.create(new Schema(Collections.emptyList()), allocator)) {
+            final ClientStreamListener listener =
+                client.startPut(descriptor, root, new SyncPutListener());
             listener.completed();
             listener.getResult();
           }
-        }, (recorder) -> {
+        },
+        (recorder) -> {
           final CallStatus status = recorder.statusFuture.get();
           final Throwable err = recorder.errFuture.get();
-          Assertions.assertNotNull(status);
-          Assertions.assertEquals(FlightStatusCode.OK, status.code());
-          Assertions.assertNull(status.cause());
-          Assertions.assertNotNull(err);
-          Assertions.assertEquals("test", err.getMessage());
+          assertNotNull(status);
+          assertEquals(FlightStatusCode.OK, status.code());
+          assertNull(status.cause());
+          assertNotNull(err);
+          assertEquals("test", err.getMessage());
         });
   }
 
   @Test
   public void listFlightsUncaught() {
-    test(new ServerErrorProducer(new RuntimeException("test")),
-        (allocator, client) -> client.listFlights(new Criteria(new byte[0])).forEach((action) -> {
-        }), (recorder) -> {
+    test(
+        new ServerErrorProducer(new RuntimeException("test")),
+        (allocator, client) ->
+            client.listFlights(new Criteria(new byte[0])).forEach((action) -> {}),
+        (recorder) -> {
           final CallStatus status = recorder.statusFuture.get();
           final Throwable err = recorder.errFuture.get();
-          Assertions.assertNotNull(status);
-          Assertions.assertEquals(FlightStatusCode.OK, status.code());
-          Assertions.assertNull(status.cause());
-          Assertions.assertNotNull(err);
-          Assertions.assertEquals("test", err.getMessage());
+          assertNotNull(status);
+          assertEquals(FlightStatusCode.OK, status.code());
+          assertNull(status.cause());
+          assertNotNull(err);
+          assertEquals("test", err.getMessage());
         });
   }
 
   @Test
   public void doActionUncaught() {
-    test(new ServerErrorProducer(new RuntimeException("test")),
-        (allocator, client) -> client.doAction(new Action("test")).forEachRemaining(result -> {
-        }), (recorder) -> {
+    test(
+        new ServerErrorProducer(new RuntimeException("test")),
+        (allocator, client) -> client.doAction(new Action("test")).forEachRemaining(result -> {}),
+        (recorder) -> {
           final CallStatus status = recorder.statusFuture.get();
           final Throwable err = recorder.errFuture.get();
-          Assertions.assertNotNull(status);
-          Assertions.assertEquals(FlightStatusCode.OK, status.code());
-          Assertions.assertNull(status.cause());
-          Assertions.assertNotNull(err);
-          Assertions.assertEquals("test", err.getMessage());
+          assertNotNull(status);
+          assertEquals(FlightStatusCode.OK, status.code());
+          assertNull(status.cause());
+          assertNotNull(err);
+          assertEquals("test", err.getMessage());
         });
   }
 
   @Test
   public void listActionsUncaught() {
-    test(new ServerErrorProducer(new RuntimeException("test")),
-        (allocator, client) -> client.listActions().forEach(result -> {
-        }), (recorder) -> {
+    test(
+        new ServerErrorProducer(new RuntimeException("test")),
+        (allocator, client) -> client.listActions().forEach(result -> {}),
+        (recorder) -> {
           final CallStatus status = recorder.statusFuture.get();
           final Throwable err = recorder.errFuture.get();
-          Assertions.assertNotNull(status);
-          Assertions.assertEquals(FlightStatusCode.OK, status.code());
-          Assertions.assertNull(status.cause());
-          Assertions.assertNotNull(err);
-          Assertions.assertEquals("test", err.getMessage());
+          assertNotNull(status);
+          assertEquals(FlightStatusCode.OK, status.code());
+          assertNull(status.cause());
+          assertNotNull(err);
+          assertEquals("test", err.getMessage());
         });
   }
 
   @Test
   public void getFlightInfoUncaught() {
-    test(new ServerErrorProducer(new RuntimeException("test")),
+    test(
+        new ServerErrorProducer(new RuntimeException("test")),
         (allocator, client) -> {
-          FlightTestUtil.assertCode(FlightStatusCode.INTERNAL, () -> client.getInfo(FlightDescriptor.path("test")));
-        }, (recorder) -> {
+          FlightTestUtil.assertCode(
+              FlightStatusCode.INTERNAL, () -> client.getInfo(FlightDescriptor.path("test")));
+        },
+        (recorder) -> {
           final CallStatus status = recorder.statusFuture.get();
-          Assertions.assertNotNull(status);
-          Assertions.assertEquals(FlightStatusCode.INTERNAL, status.code());
-          Assertions.assertNotNull(status.cause());
-          Assertions.assertEquals(new RuntimeException("test").getMessage(), status.cause().getMessage());
+          assertNotNull(status);
+          assertEquals(FlightStatusCode.INTERNAL, status.code());
+          assertNotNull(status.cause());
+          assertEquals(new RuntimeException("test").getMessage(), status.cause().getMessage());
         });
   }
 
   @Test
   public void doGetUncaught() {
-    test(new ServerErrorProducer(new RuntimeException("test")),
+    test(
+        new ServerErrorProducer(new RuntimeException("test")),
         (allocator, client) -> {
           try (final FlightStream stream = client.getStream(new Ticket(new byte[0]))) {
-            while (stream.next()) {
-            }
+            while (stream.next()) {}
           } catch (Exception e) {
-            Assertions.fail(e.toString());
+            fail(e.toString());
           }
-        }, (recorder) -> {
+        },
+        (recorder) -> {
           final CallStatus status = recorder.statusFuture.get();
           final Throwable err = recorder.errFuture.get();
-          Assertions.assertNotNull(status);
-          Assertions.assertEquals(FlightStatusCode.OK, status.code());
-          Assertions.assertNull(status.cause());
-          Assertions.assertNotNull(err);
-          Assertions.assertEquals("test", err.getMessage());
+          assertNotNull(status);
+          assertEquals(FlightStatusCode.OK, status.code());
+          assertNull(status.cause());
+          assertNotNull(err);
+          assertEquals("test", err.getMessage());
         });
   }
 
-  /**
-   * A middleware that records the last error on any call.
-   */
+  /** A middleware that records the last error on any call. */
   static class ErrorRecorder implements FlightServerMiddleware {
 
     CompletableFuture<CallStatus> statusFuture = new CompletableFuture<>();
     CompletableFuture<Throwable> errFuture = new CompletableFuture<>();
 
     @Override
-    public void onBeforeSendingHeaders(CallHeaders outgoingHeaders) {
-    }
+    public void onBeforeSendingHeaders(CallHeaders outgoingHeaders) {}
 
     @Override
     public void onCallCompleted(CallStatus status) {
@@ -215,15 +225,14 @@ static class Factory implements FlightServerMiddleware.Factory<ErrorRecorder> {
       ErrorRecorder instance = new ErrorRecorder();
 
       @Override
-      public ErrorRecorder onCallStarted(CallInfo info, CallHeaders incomingHeaders, RequestContext context) {
+      public ErrorRecorder onCallStarted(
+          CallInfo info, CallHeaders incomingHeaders, RequestContext context) {
         return instance;
       }
     }
   }
 
-  /**
-   * A producer that throws the given exception on a call.
-   */
+  /** A producer that throws the given exception on a call. */
   static class ErrorProducer extends NoOpFlightProducer {
 
     final RuntimeException error;
@@ -233,18 +242,19 @@ static class ErrorProducer extends NoOpFlightProducer {
     }
 
     @Override
-    public Runnable acceptPut(CallContext context, FlightStream flightStream, StreamListener<PutResult> ackStream) {
+    public Runnable acceptPut(
+        CallContext context, FlightStream flightStream, StreamListener<PutResult> ackStream) {
       return () -> {
         // Drain queue to avoid FlightStream#close cancelling the call
-        while (flightStream.next()) {
-        }
+        while (flightStream.next()) {}
         throw error;
       };
     }
   }
 
   /**
-   * A producer that throws the given exception on a call, but only after sending a success to the client.
+   * A producer that throws the given exception on a call, but only after sending a success to the
+   * client.
    */
   static class ServerErrorProducer extends NoOpFlightProducer {
 
@@ -257,7 +267,8 @@ static class ServerErrorProducer extends NoOpFlightProducer {
     @Override
     public void getStream(CallContext context, Ticket ticket, ServerStreamListener listener) {
       try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-          final VectorSchemaRoot root = VectorSchemaRoot.create(new Schema(Collections.emptyList()), allocator)) {
+          final VectorSchemaRoot root =
+              VectorSchemaRoot.create(new Schema(Collections.emptyList()), allocator)) {
         listener.start(root);
         listener.completed();
       }
@@ -265,7 +276,8 @@ public void getStream(CallContext context, Ticket ticket, ServerStreamListener l
     }
 
     @Override
-    public void listFlights(CallContext context, Criteria criteria, StreamListener<FlightInfo> listener) {
+    public void listFlights(
+        CallContext context, Criteria criteria, StreamListener<FlightInfo> listener) {
       listener.onCompleted();
       throw error;
     }
@@ -276,10 +288,10 @@ public FlightInfo getFlightInfo(CallContext context, FlightDescriptor descriptor
     }
 
     @Override
-    public Runnable acceptPut(CallContext context, FlightStream flightStream, StreamListener<PutResult> ackStream) {
+    public Runnable acceptPut(
+        CallContext context, FlightStream flightStream, StreamListener<PutResult> ackStream) {
       return () -> {
-        while (flightStream.next()) {
-        }
+        while (flightStream.next()) {}
         ackStream.onCompleted();
         throw error;
       };
@@ -303,7 +315,8 @@ static class ServerMiddlewarePair<T extends FlightServerMiddleware> {
     final FlightServerMiddleware.Key<T> key;
     final FlightServerMiddleware.Factory<T> factory;
 
-    ServerMiddlewarePair(FlightServerMiddleware.Key<T> key, FlightServerMiddleware.Factory<T> factory) {
+    ServerMiddlewarePair(
+        FlightServerMiddleware.Key<T> key, FlightServerMiddleware.Factory<T> factory) {
       this.key = key;
       this.factory = factory;
     }
@@ -317,15 +330,18 @@ static class ServerMiddlewarePair<T extends FlightServerMiddleware> {
    * @param body A function to run as the body of the test.
    * @param <T> The middleware type.
    */
-  static <T extends FlightServerMiddleware> void test(FlightProducer producer, List<ServerMiddlewarePair<T>> middleware,
+  static <T extends FlightServerMiddleware> void test(
+      FlightProducer producer,
+      List<ServerMiddlewarePair<T>> middleware,
       BiConsumer<BufferAllocator, FlightClient> body) {
     try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE)) {
-      final FlightServer.Builder builder = FlightServer.builder(allocator, forGrpcInsecure(LOCALHOST, 0), producer);
+      final FlightServer.Builder builder =
+          FlightServer.builder(allocator, forGrpcInsecure(LOCALHOST, 0), producer);
       middleware.forEach(pair -> builder.middleware(pair.key, pair.factory));
       final FlightServer server = builder.build().start();
       try (final FlightServer ignored = server;
-          final FlightClient client = FlightClient.builder(allocator, server.getLocation()).build()
-      ) {
+          final FlightClient client =
+              FlightClient.builder(allocator, server.getLocation()).build()) {
         body.accept(allocator, client);
       }
     } catch (InterruptedException | IOException e) {
@@ -333,19 +349,25 @@ static <T extends FlightServerMiddleware> void test(FlightProducer producer, Lis
     }
   }
 
-  static void test(FlightProducer producer, BiConsumer<BufferAllocator, FlightClient> body,
+  static void test(
+      FlightProducer producer,
+      BiConsumer<BufferAllocator, FlightClient> body,
       ErrorConsumer<ErrorRecorder> verify) {
     final ErrorRecorder.Factory factory = new ErrorRecorder.Factory();
-    final List<ServerMiddlewarePair<ErrorRecorder>> middleware = Collections
-        .singletonList(new ServerMiddlewarePair<>(FlightServerMiddleware.Key.of("m"), factory));
-    test(producer, middleware, (allocator, client) -> {
-      body.accept(allocator, client);
-      try {
-        verify.accept(factory.instance);
-      } catch (Exception e) {
-        throw new RuntimeException(e);
-      }
-    });
+    final List<ServerMiddlewarePair<ErrorRecorder>> middleware =
+        Collections.singletonList(
+            new ServerMiddlewarePair<>(FlightServerMiddleware.Key.of("m"), factory));
+    test(
+        producer,
+        middleware,
+        (allocator, client) -> {
+          body.accept(allocator, client);
+          try {
+            verify.accept(factory.instance);
+          } catch (Exception e) {
+            throw new RuntimeException(e);
+          }
+        });
   }
 
   @FunctionalInterface
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestServerOptions.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestServerOptions.java
index f66b9e7fd26ba..c39ac922cfaad 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestServerOptions.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestServerOptions.java
@@ -14,14 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
 import static org.apache.arrow.flight.Location.forGrpcInsecure;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import io.grpc.Channel;
+import io.grpc.MethodDescriptor;
+import io.grpc.ServerServiceDefinition;
+import io.grpc.health.v1.HealthCheckRequest;
+import io.grpc.health.v1.HealthCheckResponse;
+import io.grpc.health.v1.HealthGrpc;
+import io.grpc.netty.NettyChannelBuilder;
+import io.grpc.netty.NettyServerBuilder;
+import io.grpc.protobuf.services.HealthStatusManager;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
@@ -29,7 +40,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
-
 import org.apache.arrow.flight.TestBasicOperation.Producer;
 import org.apache.arrow.flight.auth.ServerAuthHandler;
 import org.apache.arrow.flight.impl.FlightServiceGrpc;
@@ -37,20 +47,9 @@
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Test;
 
-import io.grpc.Channel;
-import io.grpc.MethodDescriptor;
-import io.grpc.ServerServiceDefinition;
-import io.grpc.health.v1.HealthCheckRequest;
-import io.grpc.health.v1.HealthCheckResponse;
-import io.grpc.health.v1.HealthGrpc;
-import io.grpc.netty.NettyChannelBuilder;
-import io.grpc.netty.NettyServerBuilder;
-import io.grpc.protobuf.services.HealthStatusManager;
-
 public class TestServerOptions {
 
   @Test
@@ -58,49 +57,49 @@ public void builderConsumer() throws Exception {
     final AtomicBoolean consumerCalled = new AtomicBoolean();
     final Consumer<NettyServerBuilder> consumer = (builder) -> consumerCalled.set(true);
 
-    try (
-        BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
+    try (BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
         Producer producer = new Producer(a);
-        FlightServer s = FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), producer)
-            .transportHint("grpc.builderConsumer", consumer).build().start()
-    ) {
-      Assertions.assertTrue(consumerCalled.get());
+        FlightServer s =
+            FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), producer)
+                .transportHint("grpc.builderConsumer", consumer)
+                .build()
+                .start()) {
+      assertTrue(consumerCalled.get());
     }
   }
 
   /**
-   * Make sure that if Flight supplies a default executor to gRPC, then it is closed along with the server.
+   * Make sure that if Flight supplies a default executor to gRPC, then it is closed along with the
+   * server.
    */
   @Test
   public void defaultExecutorClosed() throws Exception {
     final ExecutorService executor;
-    try (
-        BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
-        FlightServer server = FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), new NoOpFlightProducer())
-            .build().start()
-    ) {
+    try (BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
+        FlightServer server =
+            FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), new NoOpFlightProducer())
+                .build()
+                .start()) {
       assertNotNull(server.grpcExecutor);
       executor = server.grpcExecutor;
     }
-    Assertions.assertTrue(executor.isShutdown());
+    assertTrue(executor.isShutdown());
   }
 
-  /**
-   * Make sure that if the user provides an executor to gRPC, then Flight does not close it.
-   */
+  /** Make sure that if the user provides an executor to gRPC, then Flight does not close it. */
   @Test
   public void suppliedExecutorNotClosed() throws Exception {
     final ExecutorService executor = Executors.newSingleThreadExecutor();
     try {
-      try (
-          BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
-          FlightServer server = FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), new NoOpFlightProducer())
-              .executor(executor)
-              .build().start()
-      ) {
-        Assertions.assertNull(server.grpcExecutor);
+      try (BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
+          FlightServer server =
+              FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), new NoOpFlightProducer())
+                  .executor(executor)
+                  .build()
+                  .start()) {
+        assertNull(server.grpcExecutor);
       }
-      Assertions.assertFalse(executor.isShutdown());
+      assertFalse(executor.isShutdown());
     } finally {
       executor.shutdown();
     }
@@ -108,18 +107,20 @@ public void suppliedExecutorNotClosed() throws Exception {
 
   @Test
   public void domainSocket() throws Exception {
-    Assumptions.assumeTrue(FlightTestUtil.isNativeTransportAvailable(), "We have a native transport available");
+    Assumptions.assumeTrue(
+        FlightTestUtil.isNativeTransportAvailable(), "We have a native transport available");
     final File domainSocket = File.createTempFile("flight-unit-test-", ".sock");
-    Assertions.assertTrue(domainSocket.delete());
-    // Domain socket paths have a platform-dependent limit. Set a conservative limit and skip the test if the temporary
-    // file name is too long. (We do not assume a particular platform-dependent temporary directory path.)
-    Assumptions.assumeTrue(domainSocket.getAbsolutePath().length() < 100, "The domain socket path is not too long");
+    assertTrue(domainSocket.delete());
+    // Domain socket paths have a platform-dependent limit. Set a conservative limit and skip the
+    // test if the temporary
+    // file name is too long. (We do not assume a particular platform-dependent temporary directory
+    // path.)
+    Assumptions.assumeTrue(
+        domainSocket.getAbsolutePath().length() < 100, "The domain socket path is not too long");
     final Location location = Location.forGrpcDomainSocket(domainSocket.getAbsolutePath());
-    try (
-        BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
+    try (BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
         Producer producer = new Producer(a);
-        FlightServer s = FlightServer.builder(a, location, producer).build().start();
-    ) {
+        FlightServer s = FlightServer.builder(a, location, producer).build().start(); ) {
       try (FlightClient c = FlightClient.builder(a, location).build()) {
         try (FlightStream stream = c.getStream(new Ticket(new byte[0]))) {
           VectorSchemaRoot root = stream.getRoot();
@@ -127,7 +128,7 @@ public void domainSocket() throws Exception {
           int value = 0;
           while (stream.next()) {
             for (int i = 0; i < root.getRowCount(); i++) {
-              Assertions.assertEquals(value, iv.get(i));
+              assertEquals(value, iv.get(i));
               value++;
             }
           }
@@ -141,30 +142,45 @@ public void checkReflectionMetadata() {
     // This metadata is needed for gRPC reflection to work.
     final ExecutorService executorService = Executors.newSingleThreadExecutor();
     try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE)) {
-      final FlightBindingService service = new FlightBindingService(allocator, new NoOpFlightProducer(),
-          ServerAuthHandler.NO_OP, executorService);
+      final FlightBindingService service =
+          new FlightBindingService(
+              allocator, new NoOpFlightProducer(), ServerAuthHandler.NO_OP, executorService);
       final ServerServiceDefinition definition = service.bindService();
-      assertEquals(FlightServiceGrpc.getServiceDescriptor().getSchemaDescriptor(),
+      assertEquals(
+          FlightServiceGrpc.getServiceDescriptor().getSchemaDescriptor(),
           definition.getServiceDescriptor().getSchemaDescriptor());
 
       final Map<String, MethodDescriptor<?, ?>> definedMethods = new HashMap<>();
       final Map<String, MethodDescriptor<?, ?>> serviceMethods = new HashMap<>();
 
-      // Make sure that the reflection metadata object is identical across all the places where it's accessible
-      definition.getMethods().forEach(
-          method -> definedMethods.put(method.getMethodDescriptor().getFullMethodName(), method.getMethodDescriptor()));
-      definition.getServiceDescriptor().getMethods().forEach(
-          method -> serviceMethods.put(method.getFullMethodName(), method));
-
-      for (final MethodDescriptor<?, ?> descriptor : FlightServiceGrpc.getServiceDescriptor().getMethods()) {
+      // Make sure that the reflection metadata object is identical across all the places where it's
+      // accessible
+      definition
+          .getMethods()
+          .forEach(
+              method ->
+                  definedMethods.put(
+                      method.getMethodDescriptor().getFullMethodName(),
+                      method.getMethodDescriptor()));
+      definition
+          .getServiceDescriptor()
+          .getMethods()
+          .forEach(method -> serviceMethods.put(method.getFullMethodName(), method));
+
+      for (final MethodDescriptor<?, ?> descriptor :
+          FlightServiceGrpc.getServiceDescriptor().getMethods()) {
         final String methodName = descriptor.getFullMethodName();
-        Assertions.assertTrue(definedMethods.containsKey(methodName),
+        assertTrue(
+            definedMethods.containsKey(methodName),
             "Method is missing from ServerServiceDefinition: " + methodName);
-        Assertions.assertTrue(definedMethods.containsKey(methodName),
+        assertTrue(
+            definedMethods.containsKey(methodName),
             "Method is missing from ServiceDescriptor: " + methodName);
 
-        assertEquals(descriptor.getSchemaDescriptor(), definedMethods.get(methodName).getSchemaDescriptor());
-        assertEquals(descriptor.getSchemaDescriptor(), serviceMethods.get(methodName).getSchemaDescriptor());
+        assertEquals(
+            descriptor.getSchemaDescriptor(), definedMethods.get(methodName).getSchemaDescriptor());
+        assertEquals(
+            descriptor.getSchemaDescriptor(), serviceMethods.get(methodName).getSchemaDescriptor());
       }
     } finally {
       executorService.shutdown();
@@ -178,20 +194,22 @@ public void checkReflectionMetadata() {
   @Test
   public void addHealthCheckService() throws Exception {
     final HealthStatusManager statusManager = new HealthStatusManager();
-    final Consumer<NettyServerBuilder> consumer = (builder) -> {
-      builder.addService(statusManager.getHealthService());
-    };
+    final Consumer<NettyServerBuilder> consumer =
+        (builder) -> {
+          builder.addService(statusManager.getHealthService());
+        };
     final Location location = forGrpcInsecure(LOCALHOST, 5555);
-    try (
-        BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
+    try (BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
         Producer producer = new Producer(a);
-        FlightServer s = FlightServer.builder(a, location, producer)
-            .transportHint("grpc.builderConsumer", consumer).build().start();
-    ) {
-      Channel channel = NettyChannelBuilder.forAddress(location.toSocketAddress()).usePlaintext().build();
-      HealthCheckResponse response = HealthGrpc
-              .newBlockingStub(channel)
-              .check(HealthCheckRequest.getDefaultInstance());
+        FlightServer s =
+            FlightServer.builder(a, location, producer)
+                .transportHint("grpc.builderConsumer", consumer)
+                .build()
+                .start(); ) {
+      Channel channel =
+          NettyChannelBuilder.forAddress(location.toSocketAddress()).usePlaintext().build();
+      HealthCheckResponse response =
+          HealthGrpc.newBlockingStub(channel).check(HealthCheckRequest.getDefaultInstance());
 
       assertEquals(response.getStatus(), HealthCheckResponse.ServingStatus.SERVING);
     }
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestTls.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestTls.java
index 75bc5f6e61589..60dd131a182ed 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestTls.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestTls.java
@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight;
 
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
 import static org.apache.arrow.flight.Location.forGrpcInsecure;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -26,94 +27,91 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
 import java.util.function.Consumer;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-/**
- * Tests for TLS in Flight.
- */
+/** Tests for TLS in Flight. */
 public class TestTls {
 
-  /**
-   * Test a basic request over TLS.
-   */
+  /** Test a basic request over TLS. */
   @Test
   public void connectTls() {
-    test((builder) -> {
-      try (final InputStream roots = new FileInputStream(FlightTestUtil.exampleTlsRootCert().toFile());
-          final FlightClient client = builder.trustedCertificates(roots).build()) {
-        final Iterator<Result> responses = client.doAction(new Action("hello-world"));
-        final byte[] response = responses.next().getBody();
-        Assertions.assertEquals("Hello, world!", new String(response, StandardCharsets.UTF_8));
-        Assertions.assertFalse(responses.hasNext());
-      } catch (InterruptedException | IOException e) {
-        throw new RuntimeException(e);
-      }
-    });
+    test(
+        (builder) -> {
+          try (final InputStream roots =
+                  new FileInputStream(FlightTestUtil.exampleTlsRootCert().toFile());
+              final FlightClient client = builder.trustedCertificates(roots).build()) {
+            final Iterator<Result> responses = client.doAction(new Action("hello-world"));
+            final byte[] response = responses.next().getBody();
+            assertEquals("Hello, world!", new String(response, StandardCharsets.UTF_8));
+            assertFalse(responses.hasNext());
+          } catch (InterruptedException | IOException e) {
+            throw new RuntimeException(e);
+          }
+        });
   }
 
-  /**
-   * Make sure that connections are rejected when the root certificate isn't trusted.
-   */
+  /** Make sure that connections are rejected when the root certificate isn't trusted. */
   @Test
   public void rejectInvalidCert() {
-    test((builder) -> {
-      try (final FlightClient client = builder.build()) {
-        final Iterator<Result> responses = client.doAction(new Action("hello-world"));
-        FlightTestUtil.assertCode(FlightStatusCode.UNAVAILABLE, () -> responses.next().getBody());
-      } catch (InterruptedException e) {
-        throw new RuntimeException(e);
-      }
-    });
+    test(
+        (builder) -> {
+          try (final FlightClient client = builder.build()) {
+            final Iterator<Result> responses = client.doAction(new Action("hello-world"));
+            FlightTestUtil.assertCode(
+                FlightStatusCode.UNAVAILABLE, () -> responses.next().getBody());
+          } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+          }
+        });
   }
 
-  /**
-   * Make sure that connections are rejected when the hostname doesn't match.
-   */
+  /** Make sure that connections are rejected when the hostname doesn't match. */
   @Test
   public void rejectHostname() {
-    test((builder) -> {
-      try (final InputStream roots = new FileInputStream(FlightTestUtil.exampleTlsRootCert().toFile());
-          final FlightClient client = builder.trustedCertificates(roots).overrideHostname("fakehostname")
-              .build()) {
-        final Iterator<Result> responses = client.doAction(new Action("hello-world"));
-        FlightTestUtil.assertCode(FlightStatusCode.UNAVAILABLE, () -> responses.next().getBody());
-      } catch (InterruptedException | IOException e) {
-        throw new RuntimeException(e);
-      }
-    });
+    test(
+        (builder) -> {
+          try (final InputStream roots =
+                  new FileInputStream(FlightTestUtil.exampleTlsRootCert().toFile());
+              final FlightClient client =
+                  builder.trustedCertificates(roots).overrideHostname("fakehostname").build()) {
+            final Iterator<Result> responses = client.doAction(new Action("hello-world"));
+            FlightTestUtil.assertCode(
+                FlightStatusCode.UNAVAILABLE, () -> responses.next().getBody());
+          } catch (InterruptedException | IOException e) {
+            throw new RuntimeException(e);
+          }
+        });
   }
 
-  /**
-   * Test a basic request over TLS.
-   */
+  /** Test a basic request over TLS. */
   @Test
   public void connectTlsDisableServerVerification() {
-    test((builder) -> {
-      try (final FlightClient client = builder.verifyServer(false).build()) {
-        final Iterator<Result> responses = client.doAction(new Action("hello-world"));
-        final byte[] response = responses.next().getBody();
-        Assertions.assertEquals("Hello, world!", new String(response, StandardCharsets.UTF_8));
-        Assertions.assertFalse(responses.hasNext());
-      } catch (InterruptedException e) {
-        throw new RuntimeException(e);
-      }
-    });
+    test(
+        (builder) -> {
+          try (final FlightClient client = builder.verifyServer(false).build()) {
+            final Iterator<Result> responses = client.doAction(new Action("hello-world"));
+            final byte[] response = responses.next().getBody();
+            assertEquals("Hello, world!", new String(response, StandardCharsets.UTF_8));
+            assertFalse(responses.hasNext());
+          } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+          }
+        });
   }
 
   void test(Consumer<FlightClient.Builder> testFn) {
     final FlightTestUtil.CertKeyPair certKey = FlightTestUtil.exampleTlsCerts().get(0);
-    try (
-        BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
+    try (BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
         Producer producer = new Producer();
-        FlightServer s = FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), producer)
-            .useTls(certKey.cert, certKey.key)
-            .build().start()) {
-      final FlightClient.Builder builder = FlightClient.builder(a, Location.forGrpcTls(FlightTestUtil.LOCALHOST,
-              s.getPort()));
+        FlightServer s =
+            FlightServer.builder(a, forGrpcInsecure(LOCALHOST, 0), producer)
+                .useTls(certKey.cert, certKey.key)
+                .build()
+                .start()) {
+      final FlightClient.Builder builder =
+          FlightClient.builder(a, Location.forGrpcTls(FlightTestUtil.LOCALHOST, s.getPort()));
       testFn.accept(builder);
     } catch (InterruptedException | IOException e) {
       throw new RuntimeException(e);
@@ -129,12 +127,13 @@ public void doAction(CallContext context, Action action, StreamListener<Result>
         listener.onCompleted();
         return;
       }
-      listener
-          .onError(CallStatus.UNIMPLEMENTED.withDescription("Invalid action " + action.getType()).toRuntimeException());
+      listener.onError(
+          CallStatus.UNIMPLEMENTED
+              .withDescription("Invalid action " + action.getType())
+              .toRuntimeException());
     }
 
     @Override
-    public void close() {
-    }
+    public void close() {}
   }
 }
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/auth/TestBasicAuth.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/auth/TestBasicAuth.java
index 176277866b73a..0c63785c88fd1 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/auth/TestBasicAuth.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/auth/TestBasicAuth.java
@@ -14,17 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth;
 
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
 import static org.apache.arrow.flight.Location.forGrpcInsecure;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
+import com.google.common.collect.ImmutableList;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Optional;
-
 import org.apache.arrow.flight.Criteria;
 import org.apache.arrow.flight.FlightClient;
 import org.apache.arrow.flight.FlightInfo;
@@ -43,13 +44,10 @@
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import com.google.common.collect.ImmutableList;
-
 public class TestBasicAuth {
 
   private static final String USERNAME = "flight";
@@ -63,7 +61,7 @@ public class TestBasicAuth {
   @Test
   public void validAuth() {
     client.authenticateBasic(USERNAME, PASSWORD);
-    Assertions.assertTrue(ImmutableList.copyOf(client.listFlights(Criteria.ALL)).size() == 0);
+    assertEquals(0, ImmutableList.copyOf(client.listFlights(Criteria.ALL)).size());
   }
 
   @Test
@@ -72,27 +70,33 @@ public void asyncCall() throws Exception {
     client.listFlights(Criteria.ALL);
     try (final FlightStream s = client.getStream(new Ticket(new byte[1]))) {
       while (s.next()) {
-        Assertions.assertEquals(4095, s.getRoot().getRowCount());
+        assertEquals(4095, s.getRoot().getRowCount());
       }
     }
   }
 
   @Test
   public void invalidAuth() {
-    FlightTestUtil.assertCode(FlightStatusCode.UNAUTHENTICATED, () -> {
-      client.authenticateBasic(USERNAME, "WRONG");
-    });
-
-    FlightTestUtil.assertCode(FlightStatusCode.UNAUTHENTICATED, () -> {
-      client.listFlights(Criteria.ALL).forEach(action -> Assertions.fail());
-    });
+    FlightTestUtil.assertCode(
+        FlightStatusCode.UNAUTHENTICATED,
+        () -> {
+          client.authenticateBasic(USERNAME, "WRONG");
+        });
+
+    FlightTestUtil.assertCode(
+        FlightStatusCode.UNAUTHENTICATED,
+        () -> {
+          client.listFlights(Criteria.ALL).forEach(action -> fail());
+        });
   }
 
   @Test
   public void didntAuth() {
-    FlightTestUtil.assertCode(FlightStatusCode.UNAUTHENTICATED, () -> {
-      client.listFlights(Criteria.ALL).forEach(action -> Assertions.fail());
-    });
+    FlightTestUtil.assertCode(
+        FlightStatusCode.UNAUTHENTICATED,
+        () -> {
+          client.listFlights(Criteria.ALL).forEach(action -> fail());
+        });
   }
 
   @BeforeEach
@@ -103,56 +107,65 @@ public void testSetup() throws IOException {
   @BeforeAll
   public static void setup() throws IOException {
     allocator = new RootAllocator(Long.MAX_VALUE);
-    final BasicServerAuthHandler.BasicAuthValidator validator = new BasicServerAuthHandler.BasicAuthValidator() {
-
-      @Override
-      public Optional<String> isValid(byte[] token) {
-        if (Arrays.equals(token, VALID_TOKEN)) {
-          return Optional.of(USERNAME);
-        }
-        return Optional.empty();
-      }
-
-      @Override
-      public byte[] getToken(String username, String password) {
-        if (USERNAME.equals(username) && PASSWORD.equals(password)) {
-          return VALID_TOKEN;
-        } else {
-          throw new IllegalArgumentException("invalid credentials");
-        }
-      }
-    };
+    final BasicServerAuthHandler.BasicAuthValidator validator =
+        new BasicServerAuthHandler.BasicAuthValidator() {
 
-    server = FlightServer.builder(
-        allocator, forGrpcInsecure(LOCALHOST, 0),
-        new NoOpFlightProducer() {
           @Override
-          public void listFlights(CallContext context, Criteria criteria,
-              StreamListener<FlightInfo> listener) {
-            if (!context.peerIdentity().equals(USERNAME)) {
-              listener.onError(new IllegalArgumentException("Invalid username"));
-              return;
+          public Optional<String> isValid(byte[] token) {
+            if (Arrays.equals(token, VALID_TOKEN)) {
+              return Optional.of(USERNAME);
             }
-            listener.onCompleted();
+            return Optional.empty();
           }
 
           @Override
-          public void getStream(CallContext context, Ticket ticket, ServerStreamListener listener) {
-            if (!context.peerIdentity().equals(USERNAME)) {
-              listener.error(new IllegalArgumentException("Invalid username"));
-              return;
-            }
-            final Schema pojoSchema = new Schema(ImmutableList.of(Field.nullable("a",
-                Types.MinorType.BIGINT.getType())));
-            try (VectorSchemaRoot root = VectorSchemaRoot.create(pojoSchema, allocator)) {
-              listener.start(root);
-              root.allocateNew();
-              root.setRowCount(4095);
-              listener.putNext();
-              listener.completed();
+          public byte[] getToken(String username, String password) {
+            if (USERNAME.equals(username) && PASSWORD.equals(password)) {
+              return VALID_TOKEN;
+            } else {
+              throw new IllegalArgumentException("invalid credentials");
             }
           }
-        }).authHandler(new BasicServerAuthHandler(validator)).build().start();
+        };
+
+    server =
+        FlightServer.builder(
+                allocator,
+                forGrpcInsecure(LOCALHOST, 0),
+                new NoOpFlightProducer() {
+                  @Override
+                  public void listFlights(
+                      CallContext context, Criteria criteria, StreamListener<FlightInfo> listener) {
+                    if (!context.peerIdentity().equals(USERNAME)) {
+                      listener.onError(new IllegalArgumentException("Invalid username"));
+                      return;
+                    }
+                    listener.onCompleted();
+                  }
+
+                  @Override
+                  public void getStream(
+                      CallContext context, Ticket ticket, ServerStreamListener listener) {
+                    if (!context.peerIdentity().equals(USERNAME)) {
+                      listener.error(new IllegalArgumentException("Invalid username"));
+                      return;
+                    }
+                    final Schema pojoSchema =
+                        new Schema(
+                            ImmutableList.of(
+                                Field.nullable("a", Types.MinorType.BIGINT.getType())));
+                    try (VectorSchemaRoot root = VectorSchemaRoot.create(pojoSchema, allocator)) {
+                      listener.start(root);
+                      root.allocateNew();
+                      root.setRowCount(4095);
+                      listener.putNext();
+                      listener.completed();
+                    }
+                  }
+                })
+            .authHandler(new BasicServerAuthHandler(validator))
+            .build()
+            .start();
   }
 
   @AfterEach
@@ -167,5 +180,4 @@ public static void shutdown() throws Exception {
     allocator.getChildAllocators().forEach(BufferAllocator::close);
     AutoCloseables.close(allocator);
   }
-
 }
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/auth2/TestBasicAuth2.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/auth2/TestBasicAuth2.java
index cadd67d3ed241..2d1eb9331ee63 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/auth2/TestBasicAuth2.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/auth2/TestBasicAuth2.java
@@ -14,14 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.auth2;
 
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
 import static org.apache.arrow.flight.Location.forGrpcInsecure;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableList;
 import java.io.IOException;
-
 import org.apache.arrow.flight.CallStatus;
 import org.apache.arrow.flight.Criteria;
 import org.apache.arrow.flight.FlightClient;
@@ -42,13 +45,9 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableList;
-
 public class TestBasicAuth2 {
 
   private static final String USERNAME_1 = "flight1";
@@ -70,9 +69,10 @@ public static void setup() throws Exception {
   private static FlightProducer getFlightProducer() {
     return new NoOpFlightProducer() {
       @Override
-      public void listFlights(CallContext context, Criteria criteria,
-          StreamListener<FlightInfo> listener) {
-        if (!context.peerIdentity().equals(USERNAME_1) && !context.peerIdentity().equals(USERNAME_2)) {
+      public void listFlights(
+          CallContext context, Criteria criteria, StreamListener<FlightInfo> listener) {
+        if (!context.peerIdentity().equals(USERNAME_1)
+            && !context.peerIdentity().equals(USERNAME_2)) {
           listener.onError(new IllegalArgumentException("Invalid username"));
           return;
         }
@@ -81,12 +81,13 @@ public void listFlights(CallContext context, Criteria criteria,
 
       @Override
       public void getStream(CallContext context, Ticket ticket, ServerStreamListener listener) {
-        if (!context.peerIdentity().equals(USERNAME_1) && !context.peerIdentity().equals(USERNAME_2)) {
+        if (!context.peerIdentity().equals(USERNAME_1)
+            && !context.peerIdentity().equals(USERNAME_2)) {
           listener.error(new IllegalArgumentException("Invalid username"));
           return;
         }
-        final Schema pojoSchema = new Schema(ImmutableList.of(Field.nullable("a",
-                Types.MinorType.BIGINT.getType())));
+        final Schema pojoSchema =
+            new Schema(ImmutableList.of(Field.nullable("a", Types.MinorType.BIGINT.getType())));
         try (VectorSchemaRoot root = VectorSchemaRoot.create(pojoSchema, allocator)) {
           listener.start(root);
           root.allocateNew();
@@ -100,13 +101,14 @@ public void getStream(CallContext context, Ticket ticket, ServerStreamListener l
 
   private static void startServerAndClient() throws IOException {
     final FlightProducer flightProducer = getFlightProducer();
-    server = FlightServer
-        .builder(allocator, forGrpcInsecure(LOCALHOST, 0), flightProducer)
-        .headerAuthenticator(new GeneratedBearerTokenAuthenticator(
-            new BasicCallHeaderAuthenticator(TestBasicAuth2::validate)))
-        .build().start();
-    client = FlightClient.builder(allocator, server.getLocation())
-        .build();
+    server =
+        FlightServer.builder(allocator, forGrpcInsecure(LOCALHOST, 0), flightProducer)
+            .headerAuthenticator(
+                new GeneratedBearerTokenAuthenticator(
+                    new BasicCallHeaderAuthenticator(TestBasicAuth2::validate)))
+            .build()
+            .start();
+    client = FlightClient.builder(allocator, server.getLocation()).build();
   }
 
   @AfterAll
@@ -122,13 +124,14 @@ public static void shutdown() throws Exception {
   }
 
   private void startClient2() throws IOException {
-    client2 = FlightClient.builder(allocator, server.getLocation())
-        .build();
+    client2 = FlightClient.builder(allocator, server.getLocation()).build();
   }
 
   private static CallHeaderAuthenticator.AuthResult validate(String username, String password) {
     if (Strings.isNullOrEmpty(username)) {
-      throw CallStatus.UNAUTHENTICATED.withDescription("Credentials not supplied.").toRuntimeException();
+      throw CallStatus.UNAUTHENTICATED
+          .withDescription("Credentials not supplied.")
+          .toRuntimeException();
     }
     final String identity;
     if (USERNAME_1.equals(username) && PASSWORD_1.equals(password)) {
@@ -136,7 +139,9 @@ private static CallHeaderAuthenticator.AuthResult validate(String username, Stri
     } else if (USERNAME_2.equals(username) && PASSWORD_2.equals(password)) {
       identity = USERNAME_2;
     } else {
-      throw CallStatus.UNAUTHENTICATED.withDescription("Username or password is invalid.").toRuntimeException();
+      throw CallStatus.UNAUTHENTICATED
+          .withDescription("Username or password is invalid.")
+          .toRuntimeException();
     }
     return () -> identity;
   }
@@ -147,25 +152,27 @@ public void validAuthWithBearerAuthServer() throws IOException {
   }
 
   @Test
-  public void validAuthWithMultipleClientsWithSameCredentialsWithBearerAuthServer() throws IOException {
+  public void validAuthWithMultipleClientsWithSameCredentialsWithBearerAuthServer()
+      throws IOException {
     startClient2();
     testValidAuthWithMultipleClientsWithSameCredentials(client, client2);
   }
 
   @Test
-  public void validAuthWithMultipleClientsWithDifferentCredentialsWithBearerAuthServer() throws IOException {
+  public void validAuthWithMultipleClientsWithDifferentCredentialsWithBearerAuthServer()
+      throws IOException {
     startClient2();
     testValidAuthWithMultipleClientsWithDifferentCredentials(client, client2);
   }
 
   @Test
   public void asyncCall() throws Exception {
-    final CredentialCallOption bearerToken = client
-        .authenticateBasicToken(USERNAME_1, PASSWORD_1).get();
+    final CredentialCallOption bearerToken =
+        client.authenticateBasicToken(USERNAME_1, PASSWORD_1).get();
     client.listFlights(Criteria.ALL, bearerToken);
     try (final FlightStream s = client.getStream(new Ticket(new byte[1]), bearerToken)) {
       while (s.next()) {
-        Assertions.assertEquals(4095, s.getRoot().getRowCount());
+        assertEquals(4095, s.getRoot().getRowCount());
       }
     }
   }
@@ -181,54 +188,47 @@ public void didntAuthWithBearerAuthServer() throws IOException {
   }
 
   private void testValidAuth(FlightClient client) {
-    final CredentialCallOption bearerToken = client
-            .authenticateBasicToken(USERNAME_1, PASSWORD_1).get();
-    Assertions.assertTrue(ImmutableList.copyOf(client
-            .listFlights(Criteria.ALL, bearerToken))
-            .isEmpty());
+    final CredentialCallOption bearerToken =
+        client.authenticateBasicToken(USERNAME_1, PASSWORD_1).get();
+    assertTrue(ImmutableList.copyOf(client.listFlights(Criteria.ALL, bearerToken)).isEmpty());
   }
 
   private void testValidAuthWithMultipleClientsWithSameCredentials(
-          FlightClient client1, FlightClient client2) {
-    final CredentialCallOption bearerToken1 = client1
-            .authenticateBasicToken(USERNAME_1, PASSWORD_1).get();
-    final CredentialCallOption bearerToken2 = client2
-            .authenticateBasicToken(USERNAME_1, PASSWORD_1).get();
-    Assertions.assertTrue(ImmutableList.copyOf(client1
-            .listFlights(Criteria.ALL, bearerToken1))
-            .isEmpty());
-    Assertions.assertTrue(ImmutableList.copyOf(client2
-            .listFlights(Criteria.ALL, bearerToken2))
-            .isEmpty());
+      FlightClient client1, FlightClient client2) {
+    final CredentialCallOption bearerToken1 =
+        client1.authenticateBasicToken(USERNAME_1, PASSWORD_1).get();
+    final CredentialCallOption bearerToken2 =
+        client2.authenticateBasicToken(USERNAME_1, PASSWORD_1).get();
+    assertTrue(ImmutableList.copyOf(client1.listFlights(Criteria.ALL, bearerToken1)).isEmpty());
+    assertTrue(ImmutableList.copyOf(client2.listFlights(Criteria.ALL, bearerToken2)).isEmpty());
   }
 
   private void testValidAuthWithMultipleClientsWithDifferentCredentials(
-          FlightClient client1, FlightClient client2) {
-    final CredentialCallOption bearerToken1 = client1
-            .authenticateBasicToken(USERNAME_1, PASSWORD_1).get();
-    final CredentialCallOption bearerToken2 = client2
-            .authenticateBasicToken(USERNAME_2, PASSWORD_2).get();
-    Assertions.assertTrue(ImmutableList.copyOf(client1
-            .listFlights(Criteria.ALL, bearerToken1))
-            .isEmpty());
-    Assertions.assertTrue(ImmutableList.copyOf(client2
-            .listFlights(Criteria.ALL, bearerToken2))
-            .isEmpty());
+      FlightClient client1, FlightClient client2) {
+    final CredentialCallOption bearerToken1 =
+        client1.authenticateBasicToken(USERNAME_1, PASSWORD_1).get();
+    final CredentialCallOption bearerToken2 =
+        client2.authenticateBasicToken(USERNAME_2, PASSWORD_2).get();
+    assertTrue(ImmutableList.copyOf(client1.listFlights(Criteria.ALL, bearerToken1)).isEmpty());
+    assertTrue(ImmutableList.copyOf(client2.listFlights(Criteria.ALL, bearerToken2)).isEmpty());
   }
 
   private void testInvalidAuth(FlightClient client) {
-    FlightTestUtil.assertCode(FlightStatusCode.UNAUTHENTICATED, () ->
-            client.authenticateBasicToken(USERNAME_1, "WRONG"));
+    FlightTestUtil.assertCode(
+        FlightStatusCode.UNAUTHENTICATED, () -> client.authenticateBasicToken(USERNAME_1, "WRONG"));
 
-    FlightTestUtil.assertCode(FlightStatusCode.UNAUTHENTICATED, () ->
-            client.authenticateBasicToken(NO_USERNAME, PASSWORD_1));
+    FlightTestUtil.assertCode(
+        FlightStatusCode.UNAUTHENTICATED,
+        () -> client.authenticateBasicToken(NO_USERNAME, PASSWORD_1));
 
-    FlightTestUtil.assertCode(FlightStatusCode.UNAUTHENTICATED, () ->
-            client.listFlights(Criteria.ALL).forEach(action -> Assertions.fail()));
+    FlightTestUtil.assertCode(
+        FlightStatusCode.UNAUTHENTICATED,
+        () -> client.listFlights(Criteria.ALL).forEach(action -> fail()));
   }
 
   private void didntAuth(FlightClient client) {
-    FlightTestUtil.assertCode(FlightStatusCode.UNAUTHENTICATED, () ->
-            client.listFlights(Criteria.ALL).forEach(action -> Assertions.fail()));
+    FlightTestUtil.assertCode(
+        FlightStatusCode.UNAUTHENTICATED,
+        () -> client.listFlights(Criteria.ALL).forEach(action -> fail()));
   }
 }
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/client/CustomHeaderTest.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/client/CustomHeaderTest.java
index 8fc7557c0be78..059107b0106cc 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/client/CustomHeaderTest.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/client/CustomHeaderTest.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.client;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import com.google.common.collect.ImmutableMap;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.arrow.flight.Action;
 import org.apache.arrow.flight.CallHeaders;
 import org.apache.arrow.flight.CallInfo;
@@ -43,30 +44,24 @@
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.util.AutoCloseables;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableMap;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Tests to ensure custom headers are passed along to the server for each command.
- */
+/** Tests to ensure custom headers are passed along to the server for each command. */
 public class CustomHeaderTest {
   FlightServer server;
   FlightClient client;
   BufferAllocator allocator;
   TestCustomHeaderMiddleware.Factory headersMiddleware;
   HeaderCallOption headers;
-  Map<String, String> testHeaders = ImmutableMap.of(
+  Map<String, String> testHeaders =
+      ImmutableMap.of(
           "foo", "bar",
           "bar", "foo",
-          "answer", "42"
-  );
+          "answer", "42");
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     allocator = new RootAllocator(Integer.MAX_VALUE);
     headersMiddleware = new TestCustomHeaderMiddleware.Factory();
@@ -75,16 +70,18 @@ public void setUp() throws Exception {
       callHeaders.insert(entry.getKey(), entry.getValue());
     }
     headers = new HeaderCallOption(callHeaders);
-    server = FlightServer.builder(allocator,
-            Location.forGrpcInsecure(FlightTestUtil.LOCALHOST, /*port*/ 0),
-            new NoOpFlightProducer())
-        .middleware(FlightServerMiddleware.Key.of("customHeader"), headersMiddleware)
-        .build();
+    server =
+        FlightServer.builder(
+                allocator,
+                Location.forGrpcInsecure(FlightTestUtil.LOCALHOST, /*port*/ 0),
+                new NoOpFlightProducer())
+            .middleware(FlightServerMiddleware.Key.of("customHeader"), headersMiddleware)
+            .build();
     server.start();
     client = FlightClient.builder(allocator, server.getLocation()).build();
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     allocator.getChildAllocators().forEach(BufferAllocator::close);
     AutoCloseables.close(allocator, server, client);
@@ -94,7 +91,8 @@ public void tearDown() throws Exception {
   public void testHandshake() {
     try {
       client.handshake(headers);
-    } catch (Exception ignored) { }
+    } catch (Exception ignored) {
+    }
 
     assertHeadersMatch(FlightMethod.HANDSHAKE);
   }
@@ -103,7 +101,8 @@ public void testHandshake() {
   public void testGetSchema() {
     try {
       client.getSchema(FlightDescriptor.command(new byte[0]), headers);
-    } catch (Exception ignored) { }
+    } catch (Exception ignored) {
+    }
 
     assertHeadersMatch(FlightMethod.GET_SCHEMA);
   }
@@ -112,7 +111,8 @@ public void testGetSchema() {
   public void testGetFlightInfo() {
     try {
       client.getInfo(FlightDescriptor.command(new byte[0]), headers);
-    } catch (Exception ignored) { }
+    } catch (Exception ignored) {
+    }
 
     assertHeadersMatch(FlightMethod.GET_FLIGHT_INFO);
   }
@@ -121,7 +121,8 @@ public void testGetFlightInfo() {
   public void testListActions() {
     try {
       client.listActions(headers).iterator().next();
-    } catch (Exception ignored) { }
+    } catch (Exception ignored) {
+    }
 
     assertHeadersMatch(FlightMethod.LIST_ACTIONS);
   }
@@ -129,8 +130,9 @@ public void testListActions() {
   @Test
   public void testListFlights() {
     try {
-      client.listFlights(new Criteria(new byte[]{1}), headers).iterator().next();
-    } catch (Exception ignored) { }
+      client.listFlights(new Criteria(new byte[] {1}), headers).iterator().next();
+    } catch (Exception ignored) {
+    }
 
     assertHeadersMatch(FlightMethod.LIST_FLIGHTS);
   }
@@ -139,7 +141,8 @@ public void testListFlights() {
   public void testDoAction() {
     try {
       client.doAction(new Action("test"), headers).next();
-    } catch (Exception ignored) { }
+    } catch (Exception ignored) {
+    }
 
     assertHeadersMatch(FlightMethod.DO_ACTION);
   }
@@ -147,11 +150,11 @@ public void testDoAction() {
   @Test
   public void testStartPut() {
     try {
-      final ClientStreamListener listener = client.startPut(FlightDescriptor.command(new byte[0]),
-              new SyncPutListener(),
-              headers);
+      final ClientStreamListener listener =
+          client.startPut(FlightDescriptor.command(new byte[0]), new SyncPutListener(), headers);
       listener.getResult();
-    } catch (Exception ignored) { }
+    } catch (Exception ignored) {
+    }
 
     assertHeadersMatch(FlightMethod.DO_PUT);
   }
@@ -160,62 +163,53 @@ public void testStartPut() {
   public void testGetStream() {
     try (final FlightStream stream = client.getStream(new Ticket(new byte[0]), headers)) {
       stream.next();
-    } catch (Exception ignored) { }
+    } catch (Exception ignored) {
+    }
 
     assertHeadersMatch(FlightMethod.DO_GET);
   }
 
   @Test
   public void testDoExchange() {
-    try (final FlightClient.ExchangeReaderWriter stream = client.doExchange(
-            FlightDescriptor.command(new byte[0]),
-            headers)
-    ) {
+    try (final FlightClient.ExchangeReaderWriter stream =
+        client.doExchange(FlightDescriptor.command(new byte[0]), headers)) {
       stream.getReader().next();
-    } catch (Exception ignored) { }
+    } catch (Exception ignored) {
+    }
 
     assertHeadersMatch(FlightMethod.DO_EXCHANGE);
   }
 
   private void assertHeadersMatch(FlightMethod method) {
     for (Map.Entry<String, String> entry : testHeaders.entrySet()) {
-      Assert.assertEquals(entry.getValue(), headersMiddleware.getCustomHeader(method, entry.getKey()));
+      assertEquals(entry.getValue(), headersMiddleware.getCustomHeader(method, entry.getKey()));
     }
   }
 
-  /**
-   * A middleware used to test if customHeaders are being sent to the server properly.
-   */
+  /** A middleware used to test if customHeaders are being sent to the server properly. */
   static class TestCustomHeaderMiddleware implements FlightServerMiddleware {
 
-    public TestCustomHeaderMiddleware() {
-    }
+    public TestCustomHeaderMiddleware() {}
 
     @Override
-    public void onBeforeSendingHeaders(CallHeaders callHeaders) {
-
-    }
+    public void onBeforeSendingHeaders(CallHeaders callHeaders) {}
 
     @Override
-    public void onCallCompleted(CallStatus callStatus) {
-
-    }
+    public void onCallCompleted(CallStatus callStatus) {}
 
     @Override
-    public void onCallErrored(Throwable throwable) {
-
-    }
+    public void onCallErrored(Throwable throwable) {}
 
     /**
-     * A factory for the middleware that keeps track of the received headers and provides a way
-     * to check those values for a given Flight Method.
+     * A factory for the middleware that keeps track of the received headers and provides a way to
+     * check those values for a given Flight Method.
      */
     static class Factory implements FlightServerMiddleware.Factory<TestCustomHeaderMiddleware> {
       private final Map<FlightMethod, CallHeaders> receivedCallHeaders = new HashMap<>();
 
       @Override
-      public TestCustomHeaderMiddleware onCallStarted(CallInfo callInfo, CallHeaders callHeaders,
-                                                      RequestContext requestContext) {
+      public TestCustomHeaderMiddleware onCallStarted(
+          CallInfo callInfo, CallHeaders callHeaders, RequestContext requestContext) {
 
         receivedCallHeaders.put(callInfo.method(), callHeaders);
         return new TestCustomHeaderMiddleware();
@@ -229,5 +223,5 @@ public String getCustomHeader(FlightMethod method, String key) {
         return headers.get(key);
       }
     }
-  }   
+  }
 }
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/client/TestCookieHandling.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/client/TestCookieHandling.java
index d34a3a2d3a51e..d89fd64ebadf7 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/client/TestCookieHandling.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/client/TestCookieHandling.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.client;
 
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
 import static org.apache.arrow.flight.Location.forGrpcInsecure;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
-
 import org.apache.arrow.flight.CallHeaders;
 import org.apache.arrow.flight.CallInfo;
 import org.apache.arrow.flight.CallStatus;
@@ -39,7 +39,6 @@
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.util.AutoCloseables;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -79,7 +78,7 @@ public void basicCookie() {
     headersToSend.insert(SET_COOKIE_HEADER, "k=v");
     cookieMiddleware = testFactory.onCallStarted(new CallInfo(FlightMethod.DO_ACTION));
     cookieMiddleware.onHeadersReceived(headersToSend);
-    Assertions.assertEquals("k=v", cookieMiddleware.getValidCookiesAsString());
+    assertEquals("k=v", cookieMiddleware.getValidCookiesAsString());
   }
 
   @Test
@@ -88,17 +87,17 @@ public void cookieStaysAfterMultipleRequests() {
     headersToSend.insert(SET_COOKIE_HEADER, "k=v");
     cookieMiddleware = testFactory.onCallStarted(new CallInfo(FlightMethod.DO_ACTION));
     cookieMiddleware.onHeadersReceived(headersToSend);
-    Assertions.assertEquals("k=v", cookieMiddleware.getValidCookiesAsString());
+    assertEquals("k=v", cookieMiddleware.getValidCookiesAsString());
 
     headersToSend = new ErrorFlightMetadata();
     cookieMiddleware = testFactory.onCallStarted(new CallInfo(FlightMethod.DO_ACTION));
     cookieMiddleware.onHeadersReceived(headersToSend);
-    Assertions.assertEquals("k=v", cookieMiddleware.getValidCookiesAsString());
+    assertEquals("k=v", cookieMiddleware.getValidCookiesAsString());
 
     headersToSend = new ErrorFlightMetadata();
     cookieMiddleware = testFactory.onCallStarted(new CallInfo(FlightMethod.DO_ACTION));
     cookieMiddleware.onHeadersReceived(headersToSend);
-    Assertions.assertEquals("k=v", cookieMiddleware.getValidCookiesAsString());
+    assertEquals("k=v", cookieMiddleware.getValidCookiesAsString());
   }
 
   @Disabled
@@ -109,12 +108,12 @@ public void cookieAutoExpires() {
     cookieMiddleware = testFactory.onCallStarted(new CallInfo(FlightMethod.DO_ACTION));
     cookieMiddleware.onHeadersReceived(headersToSend);
     // Note: using max-age changes cookie version from 0->1, which quotes values.
-    Assertions.assertEquals("k=\"v\"", cookieMiddleware.getValidCookiesAsString());
+    assertEquals("k=\"v\"", cookieMiddleware.getValidCookiesAsString());
 
     headersToSend = new ErrorFlightMetadata();
     cookieMiddleware = testFactory.onCallStarted(new CallInfo(FlightMethod.DO_ACTION));
     cookieMiddleware.onHeadersReceived(headersToSend);
-    Assertions.assertEquals("k=\"v\"", cookieMiddleware.getValidCookiesAsString());
+    assertEquals("k=\"v\"", cookieMiddleware.getValidCookiesAsString());
 
     try {
       Thread.sleep(5000);
@@ -122,7 +121,7 @@ public void cookieAutoExpires() {
     }
 
     // Verify that the k cookie was discarded because it expired.
-    Assertions.assertTrue(cookieMiddleware.getValidCookiesAsString().isEmpty());
+    assertTrue(cookieMiddleware.getValidCookiesAsString().isEmpty());
   }
 
   @Test
@@ -132,7 +131,7 @@ public void cookieExplicitlyExpires() {
     cookieMiddleware = testFactory.onCallStarted(new CallInfo(FlightMethod.DO_ACTION));
     cookieMiddleware.onHeadersReceived(headersToSend);
     // Note: using max-age changes cookie version from 0->1, which quotes values.
-    Assertions.assertEquals("k=\"v\"", cookieMiddleware.getValidCookiesAsString());
+    assertEquals("k=\"v\"", cookieMiddleware.getValidCookiesAsString());
 
     // Note: The JDK treats Max-Age < 0 as not expired and treats 0 as expired.
     // This violates the RFC, which states that less than zero and zero should both be expired.
@@ -142,7 +141,7 @@ public void cookieExplicitlyExpires() {
     cookieMiddleware.onHeadersReceived(headersToSend);
 
     // Verify that the k cookie was discarded because the server told the client it is expired.
-    Assertions.assertTrue(cookieMiddleware.getValidCookiesAsString().isEmpty());
+    assertTrue(cookieMiddleware.getValidCookiesAsString().isEmpty());
   }
 
   @Disabled
@@ -153,7 +152,7 @@ public void cookieExplicitlyExpiresWithMaxAgeMinusOne() {
     cookieMiddleware = testFactory.onCallStarted(new CallInfo(FlightMethod.DO_ACTION));
     cookieMiddleware.onHeadersReceived(headersToSend);
     // Note: using max-age changes cookie version from 0->1, which quotes values.
-    Assertions.assertEquals("k=\"v\"", cookieMiddleware.getValidCookiesAsString());
+    assertEquals("k=\"v\"", cookieMiddleware.getValidCookiesAsString());
 
     headersToSend = new ErrorFlightMetadata();
 
@@ -164,7 +163,7 @@ public void cookieExplicitlyExpiresWithMaxAgeMinusOne() {
     cookieMiddleware.onHeadersReceived(headersToSend);
 
     // Verify that the k cookie was discarded because the server told the client it is expired.
-    Assertions.assertTrue(cookieMiddleware.getValidCookiesAsString().isEmpty());
+    assertTrue(cookieMiddleware.getValidCookiesAsString().isEmpty());
   }
 
   @Test
@@ -172,12 +171,12 @@ public void changeCookieValue() {
     CallHeaders headersToSend = new ErrorFlightMetadata();
     headersToSend.insert(SET_COOKIE_HEADER, "k=v");
     cookieMiddleware.onHeadersReceived(headersToSend);
-    Assertions.assertEquals("k=v", cookieMiddleware.getValidCookiesAsString());
+    assertEquals("k=v", cookieMiddleware.getValidCookiesAsString());
 
     headersToSend = new ErrorFlightMetadata();
     headersToSend.insert(SET_COOKIE_HEADER, "k=v2");
     cookieMiddleware.onHeadersReceived(headersToSend);
-    Assertions.assertEquals("k=v2", cookieMiddleware.getValidCookiesAsString());
+    assertEquals("k=v2", cookieMiddleware.getValidCookiesAsString());
   }
 
   @Test
@@ -186,22 +185,21 @@ public void multipleCookiesWithSetCookie() {
     headersToSend.insert(SET_COOKIE_HEADER, "firstKey=firstVal");
     headersToSend.insert(SET_COOKIE_HEADER, "secondKey=secondVal");
     cookieMiddleware.onHeadersReceived(headersToSend);
-    Assertions.assertEquals("firstKey=firstVal; secondKey=secondVal", cookieMiddleware.getValidCookiesAsString());
+    assertEquals(
+        "firstKey=firstVal; secondKey=secondVal", cookieMiddleware.getValidCookiesAsString());
   }
 
   @Test
   public void cookieStaysAfterMultipleRequestsEndToEnd() {
     client.handshake();
-    Assertions.assertEquals("k=v", testFactory.clientCookieMiddleware.getValidCookiesAsString());
+    assertEquals("k=v", testFactory.clientCookieMiddleware.getValidCookiesAsString());
     client.handshake();
-    Assertions.assertEquals("k=v", testFactory.clientCookieMiddleware.getValidCookiesAsString());
+    assertEquals("k=v", testFactory.clientCookieMiddleware.getValidCookiesAsString());
     client.listFlights(Criteria.ALL);
-    Assertions.assertEquals("k=v", testFactory.clientCookieMiddleware.getValidCookiesAsString());
+    assertEquals("k=v", testFactory.clientCookieMiddleware.getValidCookiesAsString());
   }
 
-  /**
-   * A server middleware component that injects SET_COOKIE_HEADER into the outgoing headers.
-   */
+  /** A server middleware component that injects SET_COOKIE_HEADER into the outgoing headers. */
   static class SetCookieHeaderInjector implements FlightServerMiddleware {
     private final Factory factory;
 
@@ -217,21 +215,17 @@ public void onBeforeSendingHeaders(CallHeaders outgoingHeaders) {
     }
 
     @Override
-    public void onCallCompleted(CallStatus status) {
-
-    }
+    public void onCallCompleted(CallStatus status) {}
 
     @Override
-    public void onCallErrored(Throwable err) {
-
-    }
+    public void onCallErrored(Throwable err) {}
 
     static class Factory implements FlightServerMiddleware.Factory<SetCookieHeaderInjector> {
       private boolean receivedCookieHeader = false;
 
       @Override
-      public SetCookieHeaderInjector onCallStarted(CallInfo info, CallHeaders incomingHeaders,
-                                                   RequestContext context) {
+      public SetCookieHeaderInjector onCallStarted(
+          CallInfo info, CallHeaders incomingHeaders, RequestContext context) {
         receivedCookieHeader = null != incomingHeaders.get(COOKIE_HEADER);
         return new SetCookieHeaderInjector(this);
       }
@@ -250,21 +244,23 @@ public ClientCookieMiddleware onCallStarted(CallInfo info) {
   }
 
   private void startServerAndClient() throws IOException {
-    final FlightProducer flightProducer = new NoOpFlightProducer() {
-      @Override
-      public void listFlights(CallContext context, Criteria criteria,
-                              StreamListener<FlightInfo> listener) {
-        listener.onCompleted();
-      }
-    };
-
-    this.server = FlightServer
-        .builder(allocator, forGrpcInsecure(LOCALHOST, 0), flightProducer)
-        .middleware(FlightServerMiddleware.Key.of("test"), new SetCookieHeaderInjector.Factory())
-        .build().start();
-
-    this.client = FlightClient.builder(allocator, server.getLocation())
-            .intercept(testFactory)
-            .build();
+    final FlightProducer flightProducer =
+        new NoOpFlightProducer() {
+          @Override
+          public void listFlights(
+              CallContext context, Criteria criteria, StreamListener<FlightInfo> listener) {
+            listener.onCompleted();
+          }
+        };
+
+    this.server =
+        FlightServer.builder(allocator, forGrpcInsecure(LOCALHOST, 0), flightProducer)
+            .middleware(
+                FlightServerMiddleware.Key.of("test"), new SetCookieHeaderInjector.Factory())
+            .build()
+            .start();
+
+    this.client =
+        FlightClient.builder(allocator, server.getLocation()).intercept(testFactory).build();
   }
 }
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/grpc/TestStatusUtils.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/grpc/TestStatusUtils.java
index 9912a26ea340a..f5ab712a75ff0 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/grpc/TestStatusUtils.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/grpc/TestStatusUtils.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.grpc;
 
-import org.apache.arrow.flight.CallStatus;
-import org.apache.arrow.flight.FlightStatusCode;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import io.grpc.Metadata;
 import io.grpc.Status;
+import org.apache.arrow.flight.CallStatus;
+import org.apache.arrow.flight.FlightStatusCode;
+import org.junit.jupiter.api.Test;
 
 public class TestStatusUtils {
 
@@ -40,12 +40,34 @@ public void testParseTrailers() {
 
     CallStatus callStatus = StatusUtils.fromGrpcStatusAndTrailers(status, trailers);
 
-    Assertions.assertEquals(FlightStatusCode.CANCELLED, callStatus.code());
-    Assertions.assertTrue(callStatus.metadata().containsKey(":status"));
-    Assertions.assertEquals("502", callStatus.metadata().get(":status"));
-    Assertions.assertTrue(callStatus.metadata().containsKey("date"));
-    Assertions.assertEquals("Fri, 13 Sep 2015 11:23:58 GMT", callStatus.metadata().get("date"));
-    Assertions.assertTrue(callStatus.metadata().containsKey("content-type"));
-    Assertions.assertEquals("text/html", callStatus.metadata().get("content-type"));
+    assertEquals(FlightStatusCode.CANCELLED, callStatus.code());
+    assertTrue(callStatus.metadata().containsKey(":status"));
+    assertEquals("502", callStatus.metadata().get(":status"));
+    assertTrue(callStatus.metadata().containsKey("date"));
+    assertEquals("Fri, 13 Sep 2015 11:23:58 GMT", callStatus.metadata().get("date"));
+    assertTrue(callStatus.metadata().containsKey("content-type"));
+    assertEquals("text/html", callStatus.metadata().get("content-type"));
+  }
+
+  @Test
+  public void testGrpcResourceExhaustedTranslatedToFlightStatus() {
+    Status status = Status.RESOURCE_EXHAUSTED;
+
+    CallStatus callStatus = StatusUtils.fromGrpcStatus(status);
+    assertEquals(FlightStatusCode.RESOURCE_EXHAUSTED, callStatus.code());
+
+    FlightStatusCode flightStatusCode = StatusUtils.fromGrpcStatusCode(status.getCode());
+    assertEquals(FlightStatusCode.RESOURCE_EXHAUSTED, flightStatusCode);
+  }
+
+  @Test
+  public void testFlightResourceExhaustedTranslatedToGrpcStatua() {
+    CallStatus callStatus = CallStatus.RESOURCE_EXHAUSTED;
+
+    Status.Code grpcStatusCode = StatusUtils.toGrpcStatusCode(callStatus.code());
+    assertEquals(Status.RESOURCE_EXHAUSTED.getCode(), grpcStatusCode);
+
+    Status grpcStatus = StatusUtils.toGrpcStatus(callStatus);
+    assertEquals(Status.RESOURCE_EXHAUSTED.getCode(), grpcStatus.getCode());
   }
 }
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/perf/PerformanceTestServer.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/perf/PerformanceTestServer.java
index b1e83ea61ed53..5f8bfe5f29b23 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/perf/PerformanceTestServer.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/perf/PerformanceTestServer.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.perf;
 
+import com.google.common.collect.ImmutableList;
+import com.google.protobuf.InvalidProtocolBufferException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-
 import org.apache.arrow.flight.BackpressureStrategy;
 import org.apache.arrow.flight.FlightDescriptor;
 import org.apache.arrow.flight.FlightEndpoint;
@@ -44,9 +44,6 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-import com.google.common.collect.ImmutableList;
-import com.google.protobuf.InvalidProtocolBufferException;
-
 public class PerformanceTestServer implements AutoCloseable {
 
   private final FlightServer flightServer;
@@ -55,26 +52,33 @@ public class PerformanceTestServer implements AutoCloseable {
   private final boolean isNonBlocking;
 
   public PerformanceTestServer(BufferAllocator incomingAllocator, Location location) {
-    this(incomingAllocator, location, new BackpressureStrategy() {
-      private FlightProducer.ServerStreamListener listener;
-
-      @Override
-      public void register(FlightProducer.ServerStreamListener listener) {
-        this.listener = listener;
-      }
+    this(
+        incomingAllocator,
+        location,
+        new BackpressureStrategy() {
+          private FlightProducer.ServerStreamListener listener;
+
+          @Override
+          public void register(FlightProducer.ServerStreamListener listener) {
+            this.listener = listener;
+          }
 
-      @Override
-      public WaitResult waitForListener(long timeout) {
-        while (!listener.isReady() && !listener.isCancelled()) {
-          // busy wait
-        }
-        return WaitResult.READY;
-      }
-    }, false);
+          @Override
+          public WaitResult waitForListener(long timeout) {
+            while (!listener.isReady() && !listener.isCancelled()) {
+              // busy wait
+            }
+            return WaitResult.READY;
+          }
+        },
+        false);
   }
 
-  public PerformanceTestServer(BufferAllocator incomingAllocator, Location location, BackpressureStrategy bpStrategy,
-                               boolean isNonBlocking) {
+  public PerformanceTestServer(
+      BufferAllocator incomingAllocator,
+      Location location,
+      BackpressureStrategy bpStrategy,
+      boolean isNonBlocking) {
     this.allocator = incomingAllocator.newChildAllocator("perf-server", 0, Long.MAX_VALUE);
     this.producer = new PerfProducer(bpStrategy);
     this.flightServer = FlightServer.builder(this.allocator, location, producer).build();
@@ -103,62 +107,60 @@ private PerfProducer(BackpressureStrategy bpStrategy) {
     }
 
     @Override
-    public void getStream(CallContext context, Ticket ticket,
-        ServerStreamListener listener) {
+    public void getStream(CallContext context, Ticket ticket, ServerStreamListener listener) {
       bpStrategy.register(listener);
-      final Runnable loadData = () -> {
-        Token token = null;
-        try {
-          token = Token.parseFrom(ticket.getBytes());
-        } catch (InvalidProtocolBufferException e) {
-          throw new RuntimeException(e);
-        }
-        Perf perf = token.getDefinition();
-        Schema schema = Schema.deserializeMessage(perf.getSchema().asReadOnlyByteBuffer());
-        try (
-            VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator);
-            BigIntVector a = (BigIntVector) root.getVector("a")
-        ) {
-          listener.setUseZeroCopy(true);
-          listener.start(root);
-          root.allocateNew();
-
-          int current = 0;
-          long i = token.getStart();
-          while (i < token.getEnd()) {
-            if (listener.isCancelled()) {
-              root.clear();
-              return;
-            }
-
-            if (TestPerf.VALIDATE) {
-              a.setSafe(current, i);
+      final Runnable loadData =
+          () -> {
+            Token token = null;
+            try {
+              token = Token.parseFrom(ticket.getBytes());
+            } catch (InvalidProtocolBufferException e) {
+              throw new RuntimeException(e);
             }
+            Perf perf = token.getDefinition();
+            Schema schema = Schema.deserializeMessage(perf.getSchema().asReadOnlyByteBuffer());
+            try (VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator);
+                BigIntVector a = (BigIntVector) root.getVector("a")) {
+              listener.setUseZeroCopy(true);
+              listener.start(root);
+              root.allocateNew();
 
-            i++;
-            current++;
-            if (i % perf.getRecordsPerBatch() == 0) {
-              root.setRowCount(current);
+              int current = 0;
+              long i = token.getStart();
+              while (i < token.getEnd()) {
+                if (listener.isCancelled()) {
+                  root.clear();
+                  return;
+                }
+
+                if (TestPerf.VALIDATE) {
+                  a.setSafe(current, i);
+                }
+
+                i++;
+                current++;
+                if (i % perf.getRecordsPerBatch() == 0) {
+                  root.setRowCount(current);
+
+                  bpStrategy.waitForListener(0);
+                  if (listener.isCancelled()) {
+                    root.clear();
+                    return;
+                  }
+                  listener.putNext();
+                  current = 0;
+                  root.allocateNew();
+                }
+              }
 
-              bpStrategy.waitForListener(0);
-              if (listener.isCancelled()) {
-                root.clear();
-                return;
+              // send last partial batch.
+              if (current != 0) {
+                root.setRowCount(current);
+                listener.putNext();
               }
-              listener.putNext();
-              current = 0;
-              root.allocateNew();
+              listener.completed();
             }
-          }
-
-          // send last partial batch.
-          if (current != 0) {
-            root.setRowCount(current);
-            listener.putNext();
-          }
-          listener.completed();
-        }
-      };
+          };
 
       if (!isNonBlocking) {
         loadData.run();
@@ -170,23 +172,25 @@ public void getStream(CallContext context, Ticket ticket,
     }
 
     @Override
-    public FlightInfo getFlightInfo(CallContext context,
-        FlightDescriptor descriptor) {
+    public FlightInfo getFlightInfo(CallContext context, FlightDescriptor descriptor) {
       try {
         Preconditions.checkArgument(descriptor.isCommand());
         Perf exec = Perf.parseFrom(descriptor.getCommand());
 
-        final Schema pojoSchema = new Schema(ImmutableList.of(
-            Field.nullable("a", MinorType.BIGINT.getType()),
-            Field.nullable("b", MinorType.BIGINT.getType()),
-            Field.nullable("c", MinorType.BIGINT.getType()),
-            Field.nullable("d", MinorType.BIGINT.getType())
-            ));
-
-        Token token = Token.newBuilder().setDefinition(exec)
-            .setStart(0)
-            .setEnd(exec.getRecordsPerStream())
-            .build();
+        final Schema pojoSchema =
+            new Schema(
+                ImmutableList.of(
+                    Field.nullable("a", MinorType.BIGINT.getType()),
+                    Field.nullable("b", MinorType.BIGINT.getType()),
+                    Field.nullable("c", MinorType.BIGINT.getType()),
+                    Field.nullable("d", MinorType.BIGINT.getType())));
+
+        Token token =
+            Token.newBuilder()
+                .setDefinition(exec)
+                .setStart(0)
+                .setEnd(exec.getRecordsPerStream())
+                .build();
         final Ticket ticket = new Ticket(token.toByteArray());
 
         List<FlightEndpoint> endpoints = new ArrayList<>();
@@ -194,7 +198,11 @@ public FlightInfo getFlightInfo(CallContext context,
           endpoints.add(new FlightEndpoint(ticket, getLocation()));
         }
 
-        return new FlightInfo(pojoSchema, descriptor, endpoints, -1,
+        return new FlightInfo(
+            pojoSchema,
+            descriptor,
+            endpoints,
+            -1,
             exec.getRecordsPerStream() * exec.getStreamCount());
       } catch (InvalidProtocolBufferException e) {
         throw new RuntimeException(e);
@@ -202,6 +210,3 @@ public FlightInfo getFlightInfo(CallContext context,
     }
   }
 }
-
-
-
diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/perf/TestPerf.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/perf/TestPerf.java
index 290e82de36c57..338771286d462 100644
--- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/perf/TestPerf.java
+++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/perf/TestPerf.java
@@ -14,19 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.perf;
 
 import static org.apache.arrow.flight.FlightTestUtil.LOCALHOST;
 import static org.apache.arrow.flight.Location.forGrpcInsecure;
 
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Stopwatch;
+import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import com.google.protobuf.ByteString;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.flight.FlightClient;
 import org.apache.arrow.flight.FlightDescriptor;
 import org.apache.arrow.flight.FlightInfo;
@@ -43,38 +49,32 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Stopwatch;
-import com.google.common.collect.ImmutableList;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.protobuf.ByteString;
-
 @Disabled
 public class TestPerf {
 
   public static final boolean VALIDATE = false;
 
-  public static FlightDescriptor getPerfFlightDescriptor(long recordCount, int recordsPerBatch, int streamCount) {
-    final Schema pojoSchema = new Schema(ImmutableList.of(
-        Field.nullable("a", MinorType.BIGINT.getType()),
-        Field.nullable("b", MinorType.BIGINT.getType()),
-        Field.nullable("c", MinorType.BIGINT.getType()),
-        Field.nullable("d", MinorType.BIGINT.getType())
-    ));
+  public static FlightDescriptor getPerfFlightDescriptor(
+      long recordCount, int recordsPerBatch, int streamCount) {
+    final Schema pojoSchema =
+        new Schema(
+            ImmutableList.of(
+                Field.nullable("a", MinorType.BIGINT.getType()),
+                Field.nullable("b", MinorType.BIGINT.getType()),
+                Field.nullable("c", MinorType.BIGINT.getType()),
+                Field.nullable("d", MinorType.BIGINT.getType())));
 
     byte[] bytes = pojoSchema.serializeAsMessage();
     ByteString serializedSchema = ByteString.copyFrom(bytes);
 
-    return FlightDescriptor.command(Perf.newBuilder()
-        .setRecordsPerStream(recordCount)
-        .setRecordsPerBatch(recordsPerBatch)
-        .setSchema(serializedSchema)
-        .setStreamCount(streamCount)
-        .build()
-        .toByteArray());
+    return FlightDescriptor.command(
+        Perf.newBuilder()
+            .setRecordsPerStream(recordCount)
+            .setRecordsPerBatch(recordsPerBatch)
+            .setSchema(serializedSchema)
+            .setStreamCount(streamCount)
+            .build()
+            .toByteArray());
   }
 
   public static void main(String[] args) throws Exception {
@@ -84,50 +84,55 @@ public static void main(String[] args) throws Exception {
   @Test
   public void throughput() throws Exception {
     final int numRuns = 10;
-    ListeningExecutorService pool = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(4));
-    double [] throughPuts = new double[numRuns];
+    ListeningExecutorService pool =
+        MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(4));
+    double[] throughPuts = new double[numRuns];
 
     for (int i = 0; i < numRuns; i++) {
-      try (
-          final BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
-          final PerformanceTestServer server = new PerformanceTestServer(a, forGrpcInsecure(LOCALHOST, 0)).start();
-          final FlightClient client = FlightClient.builder(a, server.getLocation()).build();
-      ) {
+      try (final BufferAllocator a = new RootAllocator(Long.MAX_VALUE);
+          final PerformanceTestServer server =
+              new PerformanceTestServer(a, forGrpcInsecure(LOCALHOST, 0)).start();
+          final FlightClient client = FlightClient.builder(a, server.getLocation()).build(); ) {
         final FlightInfo info = client.getInfo(getPerfFlightDescriptor(50_000_000L, 4095, 2));
-        List<ListenableFuture<Result>> results = info.getEndpoints()
-            .stream()
-            .map(t -> new Consumer(client, t.getTicket()))
-            .map(t -> pool.submit(t))
-            .collect(Collectors.toList());
-
-        final Result r = Futures.whenAllSucceed(results).call(() -> {
-          Result res = new Result();
-          for (ListenableFuture<Result> f : results) {
-            res.add(f.get());
-          }
-          return res;
-        }, pool).get();
+        List<ListenableFuture<Result>> results =
+            info.getEndpoints().stream()
+                .map(t -> new Consumer(client, t.getTicket()))
+                .map(t -> pool.submit(t))
+                .collect(Collectors.toList());
+
+        final Result r =
+            Futures.whenAllSucceed(results)
+                .call(
+                    () -> {
+                      Result res = new Result();
+                      for (ListenableFuture<Result> f : results) {
+                        res.add(f.get());
+                      }
+                      return res;
+                    },
+                    pool)
+                .get();
 
         double seconds = r.nanos * 1.0d / 1000 / 1000 / 1000;
         throughPuts[i] = (r.bytes * 1.0d / 1024 / 1024) / seconds;
         System.out.printf(
-                "Transferred %d records totaling %s bytes at %f MiB/s. %f record/s. %f batch/s.%n",
+            "Transferred %d records totaling %s bytes at %f MiB/s. %f record/s. %f batch/s.%n",
             r.rows,
             r.bytes,
             throughPuts[i],
             (r.rows * 1.0d) / seconds,
-            (r.batches * 1.0d) / seconds
-        );
+            (r.batches * 1.0d) / seconds);
       }
     }
     pool.shutdown();
 
     System.out.println("Summary: ");
     double average = Arrays.stream(throughPuts).sum() / numRuns;
-    double sqrSum = Arrays.stream(throughPuts).map(val -> val - average).map(val -> val * val).sum();
+    double sqrSum =
+        Arrays.stream(throughPuts).map(val -> val - average).map(val -> val * val).sum();
     double stddev = Math.sqrt(sqrSum / numRuns);
-    System.out.printf("Average throughput: %f MiB/s, standard deviation: %f MiB/s%n",
-            average, stddev);
+    System.out.printf(
+        "Average throughput: %f MiB/s, standard deviation: %f MiB/s%n", average, stddev);
   }
 
   private static final class Consumer implements Callable<Result> {
@@ -170,7 +175,6 @@ public Result call() throws Exception {
         }
       }
     }
-
   }
 
   private static final class Result {
diff --git a/java/flight/flight-integration-tests/pom.xml b/java/flight/flight-integration-tests/pom.xml
index 905c8bdaf013b..c5612644422e9 100644
--- a/java/flight/flight-integration-tests/pom.xml
+++ b/java/flight/flight-integration-tests/pom.xml
@@ -1,85 +1,90 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>arrow-flight</artifactId>
-        <groupId>org.apache.arrow</groupId>
-        <version>16.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
+<!--
+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
 
-    <artifactId>flight-integration-tests</artifactId>
-    <name>Arrow Flight Integration Tests</name>
-    <description>Integration tests for Flight RPC.</description>
-    <packaging>jar</packaging>
+    http://www.apache.org/licenses/LICENSE-2.0
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-vector</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-memory-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>flight-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>flight-sql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.6.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-    </dependencies>
+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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.arrow</groupId>
+    <artifactId>arrow-flight</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
+  </parent>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.0.0</version>
-                <configuration>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+  <artifactId>flight-integration-tests</artifactId>
+  <packaging>jar</packaging>
+  <name>Arrow Flight Integration Tests</name>
+  <description>Integration tests for Flight RPC.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-vector</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-memory-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>flight-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>flight-sql</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.8.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>package</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/AppMetadataFlightInfoEndpointScenario.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/AppMetadataFlightInfoEndpointScenario.java
index 3220bb5a2d20f..2599005275751 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/AppMetadataFlightInfoEndpointScenario.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/AppMetadataFlightInfoEndpointScenario.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.flight.FlightClient;
 import org.apache.arrow.flight.FlightDescriptor;
 import org.apache.arrow.flight.FlightEndpoint;
@@ -43,11 +41,11 @@ public FlightProducer producer(BufferAllocator allocator, Location location) thr
   }
 
   @Override
-  public void buildServer(FlightServer.Builder builder) throws Exception {
-  }
+  public void buildServer(FlightServer.Builder builder) throws Exception {}
 
   @Override
-  public void client(BufferAllocator allocator, Location location, FlightClient client) throws Exception {
+  public void client(BufferAllocator allocator, Location location, FlightClient client)
+      throws Exception {
     byte[] cmd = "foobar".getBytes(StandardCharsets.UTF_8);
     FlightInfo info = client.getInfo(FlightDescriptor.command(cmd));
     IntegrationAssertions.assertEquals(info.getAppMetadata(), cmd);
@@ -60,17 +58,19 @@ static class AppMetadataFlightInfoEndpointProducer extends NoOpFlightProducer {
     @Override
     public FlightInfo getFlightInfo(CallContext context, FlightDescriptor descriptor) {
       byte[] cmd = descriptor.getCommand();
-      
-      Schema schema = new Schema(
-              Collections.singletonList(Field.notNullable("number", Types.MinorType.UINT4.getType())));
 
-      List<FlightEndpoint> endpoints = Collections.singletonList(
-              FlightEndpoint.builder(
-                      new Ticket("".getBytes(StandardCharsets.UTF_8))).setAppMetadata(cmd).build());
+      Schema schema =
+          new Schema(
+              Collections.singletonList(
+                  Field.notNullable("number", Types.MinorType.UINT4.getType())));
+
+      List<FlightEndpoint> endpoints =
+          Collections.singletonList(
+              FlightEndpoint.builder(new Ticket("".getBytes(StandardCharsets.UTF_8)))
+                  .setAppMetadata(cmd)
+                  .build());
 
       return FlightInfo.builder(schema, descriptor, endpoints).setAppMetadata(cmd).build();
     }
   }
 }
-
-
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/AuthBasicProtoScenario.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/AuthBasicProtoScenario.java
index 1c95d4d5593c9..6fc96706c88c8 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/AuthBasicProtoScenario.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/AuthBasicProtoScenario.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Optional;
-
 import org.apache.arrow.flight.Action;
 import org.apache.arrow.flight.CallStatus;
 import org.apache.arrow.flight.FlightClient;
@@ -35,9 +33,7 @@
 import org.apache.arrow.flight.auth.BasicServerAuthHandler;
 import org.apache.arrow.memory.BufferAllocator;
 
-/**
- * A scenario testing the built-in basic authentication Protobuf.
- */
+/** A scenario testing the built-in basic authentication Protobuf. */
 final class AuthBasicProtoScenario implements Scenario {
 
   static final String USERNAME = "arrow";
@@ -56,34 +52,40 @@ public void doAction(CallContext context, Action action, StreamListener<Result>
 
   @Override
   public void buildServer(FlightServer.Builder builder) {
-    builder.authHandler(new BasicServerAuthHandler(new BasicServerAuthHandler.BasicAuthValidator() {
-      @Override
-      public byte[] getToken(String username, String password) throws Exception {
-        if (!USERNAME.equals(username) || !PASSWORD.equals(password)) {
-          throw CallStatus.UNAUTHENTICATED.withDescription("Username or password is invalid.").toRuntimeException();
-        }
-        return ("valid:" + username).getBytes(StandardCharsets.UTF_8);
-      }
+    builder.authHandler(
+        new BasicServerAuthHandler(
+            new BasicServerAuthHandler.BasicAuthValidator() {
+              @Override
+              public byte[] getToken(String username, String password) throws Exception {
+                if (!USERNAME.equals(username) || !PASSWORD.equals(password)) {
+                  throw CallStatus.UNAUTHENTICATED
+                      .withDescription("Username or password is invalid.")
+                      .toRuntimeException();
+                }
+                return ("valid:" + username).getBytes(StandardCharsets.UTF_8);
+              }
 
-      @Override
-      public Optional<String> isValid(byte[] token) {
-        if (token != null) {
-          final String credential = new String(token, StandardCharsets.UTF_8);
-          if (credential.startsWith("valid:")) {
-            return Optional.of(credential.substring(6));
-          }
-        }
-        return Optional.empty();
-      }
-    }));
+              @Override
+              public Optional<String> isValid(byte[] token) {
+                if (token != null) {
+                  final String credential = new String(token, StandardCharsets.UTF_8);
+                  if (credential.startsWith("valid:")) {
+                    return Optional.of(credential.substring(6));
+                  }
+                }
+                return Optional.empty();
+              }
+            }));
   }
 
   @Override
   public void client(BufferAllocator allocator, Location location, FlightClient client) {
-    final FlightRuntimeException e = IntegrationAssertions.assertThrows(FlightRuntimeException.class, () -> {
-      client.listActions().forEach(act -> {
-      });
-    });
+    final FlightRuntimeException e =
+        IntegrationAssertions.assertThrows(
+            FlightRuntimeException.class,
+            () -> {
+              client.listActions().forEach(act -> {});
+            });
     if (!FlightStatusCode.UNAUTHENTICATED.equals(e.status().code())) {
       throw new AssertionError("Expected UNAUTHENTICATED but found " + e.status().code(), e);
     }
@@ -91,7 +93,8 @@ public void client(BufferAllocator allocator, Location location, FlightClient cl
     client.authenticate(new BasicClientAuthHandler(USERNAME, PASSWORD));
     final Result result = client.doAction(new Action("")).next();
     if (!USERNAME.equals(new String(result.getBody(), StandardCharsets.UTF_8))) {
-      throw new AssertionError("Expected " + USERNAME + " but got " + Arrays.toString(result.getBody()));
+      throw new AssertionError(
+          "Expected " + USERNAME + " but got " + Arrays.toString(result.getBody()));
     }
   }
 }
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeCancelFlightInfoScenario.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeCancelFlightInfoScenario.java
index 244f4373b29e9..8d2f4b0e0ade5 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeCancelFlightInfoScenario.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeCancelFlightInfoScenario.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.nio.charset.StandardCharsets;
-
 import org.apache.arrow.flight.CancelFlightInfoRequest;
 import org.apache.arrow.flight.CancelFlightInfoResult;
 import org.apache.arrow.flight.CancelStatus;
@@ -41,24 +39,26 @@ public FlightProducer producer(BufferAllocator allocator, Location location) thr
   }
 
   @Override
-  public void buildServer(FlightServer.Builder builder) {
-  }
+  public void buildServer(FlightServer.Builder builder) {}
 
   @Override
-  public void client(BufferAllocator allocator, Location location, FlightClient client) throws Exception {
-    FlightInfo info = client.getInfo(FlightDescriptor.command("expiration".getBytes(StandardCharsets.UTF_8)));
+  public void client(BufferAllocator allocator, Location location, FlightClient client)
+      throws Exception {
+    FlightInfo info =
+        client.getInfo(FlightDescriptor.command("expiration".getBytes(StandardCharsets.UTF_8)));
     CancelFlightInfoRequest request = new CancelFlightInfoRequest(info);
     CancelFlightInfoResult result = client.cancelFlightInfo(request);
     IntegrationAssertions.assertEquals(CancelStatus.CANCELLED, result.getStatus());
 
     // All requests should fail
     for (FlightEndpoint endpoint : info.getEndpoints()) {
-      IntegrationAssertions.assertThrows(FlightRuntimeException.class, () -> {
-        try (FlightStream stream = client.getStream(endpoint.getTicket())) {
-          while (stream.next()) {
-          }
-        }
-      });
+      IntegrationAssertions.assertThrows(
+          FlightRuntimeException.class,
+          () -> {
+            try (FlightStream stream = client.getStream(endpoint.getTicket())) {
+              while (stream.next()) {}
+            }
+          });
     }
   }
 }
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeDoGetScenario.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeDoGetScenario.java
index 504836b334e82..d6f57aa2f046e 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeDoGetScenario.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeDoGetScenario.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.arrow.flight.FlightClient;
 import org.apache.arrow.flight.FlightDescriptor;
 import org.apache.arrow.flight.FlightEndpoint;
@@ -45,22 +43,26 @@ public FlightProducer producer(BufferAllocator allocator, Location location) thr
   }
 
   @Override
-  public void buildServer(FlightServer.Builder builder) {
-  }
+  public void buildServer(FlightServer.Builder builder) {}
 
   @Override
-  public void client(BufferAllocator allocator, Location location, FlightClient client) throws Exception {
-    FlightInfo info = client.getInfo(FlightDescriptor.command("expiration_time".getBytes(StandardCharsets.UTF_8)));
+  public void client(BufferAllocator allocator, Location location, FlightClient client)
+      throws Exception {
+    FlightInfo info =
+        client.getInfo(
+            FlightDescriptor.command("expiration_time".getBytes(StandardCharsets.UTF_8)));
 
     List<ArrowRecordBatch> batches = new ArrayList<>();
 
     try {
       for (FlightEndpoint endpoint : info.getEndpoints()) {
         if (batches.size() == 0) {
-          IntegrationAssertions.assertFalse("endpoints[0] must not have expiration time",
+          IntegrationAssertions.assertFalse(
+              "endpoints[0] must not have expiration time",
               endpoint.getExpirationTime().isPresent());
         } else {
-          IntegrationAssertions.assertTrue("endpoints[" + batches.size() + "] must have expiration time",
+          IntegrationAssertions.assertTrue(
+              "endpoints[" + batches.size() + "] must have expiration time",
               endpoint.getExpirationTime().isPresent());
         }
         try (FlightStream stream = client.getStream(endpoint.getTicket())) {
@@ -72,7 +74,8 @@ public void client(BufferAllocator allocator, Location location, FlightClient cl
 
       // Check data
       IntegrationAssertions.assertEquals(3, batches.size());
-      try (final VectorSchemaRoot root = VectorSchemaRoot.create(ExpirationTimeProducer.SCHEMA, allocator)) {
+      try (final VectorSchemaRoot root =
+          VectorSchemaRoot.create(ExpirationTimeProducer.SCHEMA, allocator)) {
         final VectorLoader loader = new VectorLoader(root);
 
         loader.load(batches.get(0));
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeListActionsScenario.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeListActionsScenario.java
index 26c4e7b604d63..2bfb01b766c00 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeListActionsScenario.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeListActionsScenario.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.util.Iterator;
-
 import org.apache.arrow.flight.ActionType;
 import org.apache.arrow.flight.FlightClient;
 import org.apache.arrow.flight.FlightConstants;
@@ -35,19 +33,21 @@ public FlightProducer producer(BufferAllocator allocator, Location location) thr
   }
 
   @Override
-  public void buildServer(FlightServer.Builder builder) {
-  }
+  public void buildServer(FlightServer.Builder builder) {}
 
   @Override
-  public void client(BufferAllocator allocator, Location location, FlightClient client) throws Exception {
+  public void client(BufferAllocator allocator, Location location, FlightClient client)
+      throws Exception {
     Iterator<ActionType> actions = client.listActions().iterator();
     IntegrationAssertions.assertTrue("Expected 2 actions", actions.hasNext());
     ActionType action = actions.next();
-    IntegrationAssertions.assertEquals(FlightConstants.CANCEL_FLIGHT_INFO.getType(), action.getType());
+    IntegrationAssertions.assertEquals(
+        FlightConstants.CANCEL_FLIGHT_INFO.getType(), action.getType());
 
     IntegrationAssertions.assertTrue("Expected 2 actions", actions.hasNext());
     action = actions.next();
-    IntegrationAssertions.assertEquals(FlightConstants.RENEW_FLIGHT_ENDPOINT.getType(), action.getType());
+    IntegrationAssertions.assertEquals(
+        FlightConstants.RENEW_FLIGHT_ENDPOINT.getType(), action.getType());
 
     IntegrationAssertions.assertFalse("Expected 2 actions", actions.hasNext());
   }
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeProducer.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeProducer.java
index 7838667e4d208..3dec8321b443b 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeProducer.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeProducer.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.io.IOException;
@@ -26,7 +25,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.flight.Action;
 import org.apache.arrow.flight.ActionType;
 import org.apache.arrow.flight.CallStatus;
@@ -49,35 +47,32 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-/** The server used for testing FlightEndpoint.expiration_time.
- * <p>
- * GetFlightInfo() returns a FlightInfo that has the following
- * three FlightEndpoints:
+/**
+ * The server used for testing FlightEndpoint.expiration_time.
+ *
+ * <p>GetFlightInfo() returns a FlightInfo that has the following three FlightEndpoints:
  *
  * <ol>
- * <li>No expiration time</li>
- * <li>5 seconds expiration time</li>
- * <li>6 seconds expiration time</li>
+ *   <li>No expiration time
+ *   <li>5 seconds expiration time
+ *   <li>6 seconds expiration time
  * </ol>
  *
- * The client can't read data from the first endpoint multiple times
- * but can read data from the second and third endpoints. The client
- * can't re-read data from the second endpoint 5 seconds later. The
- * client can't re-read data from the third endpoint 6 seconds
- * later.
- * <p>
- * The client can cancel a returned FlightInfo by pre-defined
- * CancelFlightInfo action. The client can't read data from endpoints
- * even within 6 seconds after the action.
- * <p>
- * The client can extend the expiration time of a FlightEndpoint in
- * a returned FlightInfo by pre-defined RenewFlightEndpoint
- * action. The client can read data from endpoints multiple times
+ * The client can't read data from the first endpoint multiple times but can read data from the
+ * second and third endpoints. The client can't re-read data from the second endpoint 5 seconds
+ * later. The client can't re-read data from the third endpoint 6 seconds later.
+ *
+ * <p>The client can cancel a returned FlightInfo by pre-defined CancelFlightInfo action. The client
+ * can't read data from endpoints even within 6 seconds after the action.
+ *
+ * <p>The client can extend the expiration time of a FlightEndpoint in a returned FlightInfo by
+ * pre-defined RenewFlightEndpoint action. The client can read data from endpoints multiple times
  * within more 10 seconds after the action.
  */
 final class ExpirationTimeProducer extends NoOpFlightProducer {
-  public static final Schema SCHEMA = new Schema(
-      Collections.singletonList(Field.notNullable("number", Types.MinorType.UINT4.getType())));
+  public static final Schema SCHEMA =
+      new Schema(
+          Collections.singletonList(Field.notNullable("number", Types.MinorType.UINT4.getType())));
 
   private final BufferAllocator allocator;
   private final List<EndpointStatus> statuses;
@@ -104,22 +99,28 @@ public void getStream(CallContext context, Ticket ticket, ServerStreamListener l
     int index = parseIndexFromTicket(ticket);
     EndpointStatus status = statuses.get(index);
     if (status.cancelled) {
-      listener.error(CallStatus.NOT_FOUND
-          .withDescription("Invalid flight: cancelled: " +
-                           new String(ticket.getBytes(), StandardCharsets.UTF_8))
-          .toRuntimeException());
+      listener.error(
+          CallStatus.NOT_FOUND
+              .withDescription(
+                  "Invalid flight: cancelled: "
+                      + new String(ticket.getBytes(), StandardCharsets.UTF_8))
+              .toRuntimeException());
       return;
     } else if (status.expirationTime != null && Instant.now().isAfter(status.expirationTime)) {
-      listener.error(CallStatus.NOT_FOUND
-          .withDescription("Invalid flight: expired: " +
-                           new String(ticket.getBytes(), StandardCharsets.UTF_8))
-          .toRuntimeException());
+      listener.error(
+          CallStatus.NOT_FOUND
+              .withDescription(
+                  "Invalid flight: expired: "
+                      + new String(ticket.getBytes(), StandardCharsets.UTF_8))
+              .toRuntimeException());
       return;
     } else if (status.expirationTime == null && status.numGets > 0) {
-      listener.error(CallStatus.NOT_FOUND
-          .withDescription("Invalid flight: can't read multiple times: " +
-                           new String(ticket.getBytes(), StandardCharsets.UTF_8))
-          .toRuntimeException());
+      listener.error(
+          CallStatus.NOT_FOUND
+              .withDescription(
+                  "Invalid flight: can't read multiple times: "
+                      + new String(ticket.getBytes(), StandardCharsets.UTF_8))
+              .toRuntimeException());
       return;
     }
     status.numGets++;
@@ -138,7 +139,8 @@ public void getStream(CallContext context, Ticket ticket, ServerStreamListener l
   public void doAction(CallContext context, Action action, StreamListener<Result> listener) {
     try {
       if (action.getType().equals(FlightConstants.CANCEL_FLIGHT_INFO.getType())) {
-        CancelFlightInfoRequest request = CancelFlightInfoRequest.deserialize(ByteBuffer.wrap(action.getBody()));
+        CancelFlightInfoRequest request =
+            CancelFlightInfoRequest.deserialize(ByteBuffer.wrap(action.getBody()));
         CancelStatus cancelStatus = CancelStatus.UNSPECIFIED;
         for (FlightEndpoint endpoint : request.getInfo().getEndpoints()) {
           int index = parseIndexFromTicket(endpoint.getTicket());
@@ -154,14 +156,16 @@ public void doAction(CallContext context, Action action, StreamListener<Result>
         }
         listener.onNext(new Result(new CancelFlightInfoResult(cancelStatus).serialize().array()));
       } else if (action.getType().equals(FlightConstants.RENEW_FLIGHT_ENDPOINT.getType())) {
-        RenewFlightEndpointRequest request = RenewFlightEndpointRequest.deserialize(ByteBuffer.wrap(action.getBody()));
+        RenewFlightEndpointRequest request =
+            RenewFlightEndpointRequest.deserialize(ByteBuffer.wrap(action.getBody()));
         FlightEndpoint endpoint = request.getFlightEndpoint();
         int index = parseIndexFromTicket(endpoint.getTicket());
         EndpointStatus status = statuses.get(index);
         if (status.cancelled) {
-          listener.onError(CallStatus.INVALID_ARGUMENT
-              .withDescription("Invalid flight: cancelled: " + index)
-              .toRuntimeException());
+          listener.onError(
+              CallStatus.INVALID_ARGUMENT
+                  .withDescription("Invalid flight: cancelled: " + index)
+                  .toRuntimeException());
           return;
         }
 
@@ -170,17 +174,20 @@ public void doAction(CallContext context, Action action, StreamListener<Result>
         Ticket ticket = new Ticket(ticketBody.getBytes(StandardCharsets.UTF_8));
         Instant expiration = Instant.now().plus(10, ChronoUnit.SECONDS);
         status.expirationTime = expiration;
-        FlightEndpoint newEndpoint = new FlightEndpoint(
-            ticket, expiration, endpoint.getLocations().toArray(new Location[0]));
+        FlightEndpoint newEndpoint =
+            new FlightEndpoint(
+                ticket, expiration, endpoint.getLocations().toArray(new Location[0]));
         listener.onNext(new Result(newEndpoint.serialize().array()));
       } else {
-        listener.onError(CallStatus.INVALID_ARGUMENT
-            .withDescription("Unknown action: " + action.getType())
-            .toRuntimeException());
+        listener.onError(
+            CallStatus.INVALID_ARGUMENT
+                .withDescription("Unknown action: " + action.getType())
+                .toRuntimeException());
         return;
       }
     } catch (IOException | URISyntaxException e) {
-      listener.onError(CallStatus.INTERNAL.withCause(e).withDescription(e.toString()).toRuntimeException());
+      listener.onError(
+          CallStatus.INTERNAL.withCause(e).withDescription(e.toString()).toRuntimeException());
       return;
     }
     listener.onCompleted();
@@ -194,7 +201,9 @@ public void listActions(CallContext context, StreamListener<ActionType> listener
   }
 
   private FlightEndpoint addEndpoint(String ticket, Instant expirationTime) {
-    Ticket flightTicket = new Ticket(String.format("%d: %s", statuses.size(), ticket).getBytes(StandardCharsets.UTF_8));
+    Ticket flightTicket =
+        new Ticket(
+            String.format("%d: %s", statuses.size(), ticket).getBytes(StandardCharsets.UTF_8));
     statuses.add(new EndpointStatus(expirationTime));
     return new FlightEndpoint(flightTicket, expirationTime);
   }
@@ -204,8 +213,8 @@ private int parseIndexFromTicket(Ticket ticket) {
     int index = contents.indexOf(':');
     if (index == -1) {
       throw CallStatus.INVALID_ARGUMENT
-          .withDescription("Invalid ticket: " +
-                           new String(ticket.getBytes(), StandardCharsets.UTF_8))
+          .withDescription(
+              "Invalid ticket: " + new String(ticket.getBytes(), StandardCharsets.UTF_8))
           .toRuntimeException();
     }
     int endpointIndex = Integer.parseInt(contents.substring(0, index));
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeRenewFlightEndpointScenario.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeRenewFlightEndpointScenario.java
index 6f47e2965a217..5b280746f09e7 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeRenewFlightEndpointScenario.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/ExpirationTimeRenewFlightEndpointScenario.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
-
 import org.apache.arrow.flight.FlightClient;
 import org.apache.arrow.flight.FlightDescriptor;
 import org.apache.arrow.flight.FlightEndpoint;
@@ -38,12 +36,13 @@ public FlightProducer producer(BufferAllocator allocator, Location location) thr
   }
 
   @Override
-  public void buildServer(FlightServer.Builder builder) {
-  }
+  public void buildServer(FlightServer.Builder builder) {}
 
   @Override
-  public void client(BufferAllocator allocator, Location location, FlightClient client) throws Exception {
-    FlightInfo info = client.getInfo(FlightDescriptor.command("expiration".getBytes(StandardCharsets.UTF_8)));
+  public void client(BufferAllocator allocator, Location location, FlightClient client)
+      throws Exception {
+    FlightInfo info =
+        client.getInfo(FlightDescriptor.command("expiration".getBytes(StandardCharsets.UTF_8)));
 
     // Renew all endpoints with expiration time
     for (FlightEndpoint endpoint : info.getEndpoints()) {
@@ -53,11 +52,12 @@ public void client(BufferAllocator allocator, Location location, FlightClient cl
       Instant expiration = endpoint.getExpirationTime().get();
       FlightEndpoint renewed = client.renewFlightEndpoint(new RenewFlightEndpointRequest(endpoint));
 
-      IntegrationAssertions.assertTrue("Renewed FlightEndpoint must have expiration time",
+      IntegrationAssertions.assertTrue(
+          "Renewed FlightEndpoint must have expiration time",
           renewed.getExpirationTime().isPresent());
-      IntegrationAssertions.assertTrue("Renewed FlightEndpoint must have newer expiration time",
+      IntegrationAssertions.assertTrue(
+          "Renewed FlightEndpoint must have newer expiration time",
           renewed.getExpirationTime().get().isAfter(expiration));
-
     }
   }
 }
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/FlightSqlExtensionScenario.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/FlightSqlExtensionScenario.java
index cd20ae4f46f1f..76d79b226623d 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/FlightSqlExtensionScenario.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/FlightSqlExtensionScenario.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.arrow.flight.FlightClient;
 import org.apache.arrow.flight.FlightInfo;
 import org.apache.arrow.flight.FlightStream;
@@ -38,9 +36,9 @@
 import org.apache.arrow.vector.types.pojo.Schema;
 
 /**
- * Integration test scenario for validating Flight SQL specs across multiple implementations.
- * This should ensure that RPC objects are being built and parsed correctly for multiple languages
- * and that the Arrow schemas are returned as expected.
+ * Integration test scenario for validating Flight SQL specs across multiple implementations. This
+ * should ensure that RPC objects are being built and parsed correctly for multiple languages and
+ * that the Arrow schemas are returned as expected.
  */
 public class FlightSqlExtensionScenario extends FlightSqlScenario {
   @Override
@@ -61,7 +59,8 @@ private void validateMetadataRetrieval(FlightSqlClient sqlClient) throws Excepti
     Map<Integer, Object> infoValues = new HashMap<>();
     try (FlightStream stream = sqlClient.getStream(ticket)) {
       Schema actualSchema = stream.getSchema();
-      IntegrationAssertions.assertEquals(FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA, actualSchema);
+      IntegrationAssertions.assertEquals(
+          FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA, actualSchema);
 
       while (stream.next()) {
         UInt4Vector infoName = (UInt4Vector) stream.getRoot().getVector(0);
@@ -76,9 +75,10 @@ private void validateMetadataRetrieval(FlightSqlClient sqlClient) throws Excepti
           byte typeId = value.getTypeId(i);
           switch (typeId) {
             case 0: // string
-              object = Preconditions.checkNotNull(value.getVarCharVector(typeId)
-                  .getObject(value.getOffset(i)))
-                  .toString();
+              object =
+                  Preconditions.checkNotNull(
+                          value.getVarCharVector(typeId).getObject(value.getOffset(i)))
+                      .toString();
               break;
             case 1: // bool
               object = value.getBitVector(typeId).getObject(value.getOffset(i));
@@ -97,22 +97,25 @@ private void validateMetadataRetrieval(FlightSqlClient sqlClient) throws Excepti
       }
     }
 
-    IntegrationAssertions.assertEquals(Boolean.FALSE,
-        infoValues.get(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_SQL_VALUE));
-    IntegrationAssertions.assertEquals(Boolean.TRUE,
-        infoValues.get(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_SUBSTRAIT_VALUE));
-    IntegrationAssertions.assertEquals("min_version",
+    IntegrationAssertions.assertEquals(
+        Boolean.FALSE, infoValues.get(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_SQL_VALUE));
+    IntegrationAssertions.assertEquals(
+        Boolean.TRUE, infoValues.get(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_SUBSTRAIT_VALUE));
+    IntegrationAssertions.assertEquals(
+        "min_version",
         infoValues.get(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_SUBSTRAIT_MIN_VERSION_VALUE));
-    IntegrationAssertions.assertEquals("max_version",
+    IntegrationAssertions.assertEquals(
+        "max_version",
         infoValues.get(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_SUBSTRAIT_MAX_VERSION_VALUE));
-    IntegrationAssertions.assertEquals(FlightSql.SqlSupportedTransaction.SQL_SUPPORTED_TRANSACTION_SAVEPOINT_VALUE,
+    IntegrationAssertions.assertEquals(
+        FlightSql.SqlSupportedTransaction.SQL_SUPPORTED_TRANSACTION_SAVEPOINT_VALUE,
         infoValues.get(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_TRANSACTION_VALUE));
-    IntegrationAssertions.assertEquals(Boolean.TRUE,
-        infoValues.get(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_CANCEL_VALUE));
-    IntegrationAssertions.assertEquals(42,
-        infoValues.get(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_STATEMENT_TIMEOUT_VALUE));
-    IntegrationAssertions.assertEquals(7,
-        infoValues.get(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_TRANSACTION_TIMEOUT_VALUE));
+    IntegrationAssertions.assertEquals(
+        Boolean.TRUE, infoValues.get(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_CANCEL_VALUE));
+    IntegrationAssertions.assertEquals(
+        42, infoValues.get(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_STATEMENT_TIMEOUT_VALUE));
+    IntegrationAssertions.assertEquals(
+        7, infoValues.get(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_TRANSACTION_TIMEOUT_VALUE));
   }
 
   private void validateStatementExecution(FlightSqlClient sqlClient) throws Exception {
@@ -124,15 +127,15 @@ private void validateStatementExecution(FlightSqlClient sqlClient) throws Except
 
     IntegrationAssertions.assertEquals(CancelResult.CANCELLED, sqlClient.cancelQuery(info));
 
-    IntegrationAssertions.assertEquals(sqlClient.executeSubstraitUpdate(SUBSTRAIT_PLAN),
-        UPDATE_STATEMENT_EXPECTED_ROWS);
+    IntegrationAssertions.assertEquals(
+        sqlClient.executeSubstraitUpdate(SUBSTRAIT_PLAN), UPDATE_STATEMENT_EXPECTED_ROWS);
   }
 
-  private void validatePreparedStatementExecution(BufferAllocator allocator,
-                                                  FlightSqlClient sqlClient) throws Exception {
+  private void validatePreparedStatementExecution(
+      BufferAllocator allocator, FlightSqlClient sqlClient) throws Exception {
     try (FlightSqlClient.PreparedStatement preparedStatement = sqlClient.prepare(SUBSTRAIT_PLAN);
-         VectorSchemaRoot parameters = VectorSchemaRoot.create(
-             FlightSqlScenarioProducer.getQuerySchema(), allocator)) {
+        VectorSchemaRoot parameters =
+            VectorSchemaRoot.create(FlightSqlScenarioProducer.getQuerySchema(), allocator)) {
       parameters.setRowCount(1);
       preparedStatement.setParameters(parameters);
       validate(FlightSqlScenarioProducer.getQuerySchema(), preparedStatement.execute(), sqlClient);
@@ -140,16 +143,18 @@ private void validatePreparedStatementExecution(BufferAllocator allocator,
     }
 
     try (FlightSqlClient.PreparedStatement preparedStatement = sqlClient.prepare(SUBSTRAIT_PLAN)) {
-      IntegrationAssertions.assertEquals(preparedStatement.executeUpdate(),
-          UPDATE_PREPARED_STATEMENT_EXPECTED_ROWS);
+      IntegrationAssertions.assertEquals(
+          preparedStatement.executeUpdate(), UPDATE_PREPARED_STATEMENT_EXPECTED_ROWS);
     }
   }
 
-  private void validateTransactions(BufferAllocator allocator, FlightSqlClient sqlClient) throws Exception {
+  private void validateTransactions(BufferAllocator allocator, FlightSqlClient sqlClient)
+      throws Exception {
     final FlightSqlClient.Transaction transaction = sqlClient.beginTransaction();
     IntegrationAssertions.assertEquals(TRANSACTION_ID, transaction.getTransactionId());
 
-    final FlightSqlClient.Savepoint savepoint = sqlClient.beginSavepoint(transaction, SAVEPOINT_NAME);
+    final FlightSqlClient.Savepoint savepoint =
+        sqlClient.beginSavepoint(transaction, SAVEPOINT_NAME);
     IntegrationAssertions.assertEquals(SAVEPOINT_ID, savepoint.getSavepointId());
 
     FlightInfo info = sqlClient.execute("SELECT STATEMENT", transaction);
@@ -164,47 +169,59 @@ private void validateTransactions(BufferAllocator allocator, FlightSqlClient sql
     schema = sqlClient.getExecuteSubstraitSchema(SUBSTRAIT_PLAN, transaction);
     validateSchema(FlightSqlScenarioProducer.getQueryWithTransactionSchema(), schema);
 
-    IntegrationAssertions.assertEquals(sqlClient.executeUpdate("UPDATE STATEMENT", transaction),
+    IntegrationAssertions.assertEquals(
+        sqlClient.executeUpdate("UPDATE STATEMENT", transaction),
         UPDATE_STATEMENT_WITH_TRANSACTION_EXPECTED_ROWS);
-    IntegrationAssertions.assertEquals(sqlClient.executeSubstraitUpdate(SUBSTRAIT_PLAN, transaction),
+    IntegrationAssertions.assertEquals(
+        sqlClient.executeSubstraitUpdate(SUBSTRAIT_PLAN, transaction),
         UPDATE_STATEMENT_WITH_TRANSACTION_EXPECTED_ROWS);
 
-    try (FlightSqlClient.PreparedStatement preparedStatement = sqlClient.prepare(
-        "SELECT PREPARED STATEMENT", transaction);
-         VectorSchemaRoot parameters = VectorSchemaRoot.create(
-             FlightSqlScenarioProducer.getQuerySchema(), allocator)) {
+    try (FlightSqlClient.PreparedStatement preparedStatement =
+            sqlClient.prepare("SELECT PREPARED STATEMENT", transaction);
+        VectorSchemaRoot parameters =
+            VectorSchemaRoot.create(FlightSqlScenarioProducer.getQuerySchema(), allocator)) {
       parameters.setRowCount(1);
       preparedStatement.setParameters(parameters);
-      validate(FlightSqlScenarioProducer.getQueryWithTransactionSchema(), preparedStatement.execute(), sqlClient);
+      validate(
+          FlightSqlScenarioProducer.getQueryWithTransactionSchema(),
+          preparedStatement.execute(),
+          sqlClient);
       schema = preparedStatement.fetchSchema();
       validateSchema(FlightSqlScenarioProducer.getQueryWithTransactionSchema(), schema);
     }
 
-    try (FlightSqlClient.PreparedStatement preparedStatement = sqlClient.prepare(SUBSTRAIT_PLAN, transaction);
-         VectorSchemaRoot parameters = VectorSchemaRoot.create(
-             FlightSqlScenarioProducer.getQuerySchema(), allocator)) {
+    try (FlightSqlClient.PreparedStatement preparedStatement =
+            sqlClient.prepare(SUBSTRAIT_PLAN, transaction);
+        VectorSchemaRoot parameters =
+            VectorSchemaRoot.create(FlightSqlScenarioProducer.getQuerySchema(), allocator)) {
       parameters.setRowCount(1);
       preparedStatement.setParameters(parameters);
-      validate(FlightSqlScenarioProducer.getQueryWithTransactionSchema(), preparedStatement.execute(), sqlClient);
+      validate(
+          FlightSqlScenarioProducer.getQueryWithTransactionSchema(),
+          preparedStatement.execute(),
+          sqlClient);
       schema = preparedStatement.fetchSchema();
       validateSchema(FlightSqlScenarioProducer.getQueryWithTransactionSchema(), schema);
     }
 
     try (FlightSqlClient.PreparedStatement preparedStatement =
-             sqlClient.prepare("UPDATE PREPARED STATEMENT", transaction)) {
-      IntegrationAssertions.assertEquals(preparedStatement.executeUpdate(),
+        sqlClient.prepare("UPDATE PREPARED STATEMENT", transaction)) {
+      IntegrationAssertions.assertEquals(
+          preparedStatement.executeUpdate(),
           UPDATE_PREPARED_STATEMENT_WITH_TRANSACTION_EXPECTED_ROWS);
     }
 
     try (FlightSqlClient.PreparedStatement preparedStatement =
-             sqlClient.prepare(SUBSTRAIT_PLAN, transaction)) {
-      IntegrationAssertions.assertEquals(preparedStatement.executeUpdate(),
+        sqlClient.prepare(SUBSTRAIT_PLAN, transaction)) {
+      IntegrationAssertions.assertEquals(
+          preparedStatement.executeUpdate(),
           UPDATE_PREPARED_STATEMENT_WITH_TRANSACTION_EXPECTED_ROWS);
     }
 
     sqlClient.rollback(savepoint);
 
-    final FlightSqlClient.Savepoint savepoint2 = sqlClient.beginSavepoint(transaction, SAVEPOINT_NAME);
+    final FlightSqlClient.Savepoint savepoint2 =
+        sqlClient.beginSavepoint(transaction, SAVEPOINT_NAME);
     IntegrationAssertions.assertEquals(SAVEPOINT_ID, savepoint2.getSavepointId());
     sqlClient.release(savepoint);
 
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/FlightSqlScenario.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/FlightSqlScenario.java
index 71f1f741d5871..8918b252700ac 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/FlightSqlScenario.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/FlightSqlScenario.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-
 import org.apache.arrow.flight.CallOption;
 import org.apache.arrow.flight.FlightClient;
 import org.apache.arrow.flight.FlightInfo;
@@ -38,9 +36,9 @@
 import org.apache.arrow.vector.types.pojo.Schema;
 
 /**
- * Integration test scenario for validating Flight SQL specs across multiple implementations.
- * This should ensure that RPC objects are being built and parsed correctly for multiple languages
- * and that the Arrow schemas are returned as expected.
+ * Integration test scenario for validating Flight SQL specs across multiple implementations. This
+ * should ensure that RPC objects are being built and parsed correctly for multiple languages and
+ * that the Arrow schemas are returned as expected.
  */
 public class FlightSqlScenario implements Scenario {
   public static final long UPDATE_STATEMENT_EXPECTED_ROWS = 10000L;
@@ -61,9 +59,7 @@ public FlightProducer producer(BufferAllocator allocator, Location location) thr
   }
 
   @Override
-  public void buildServer(FlightServer.Builder builder) throws Exception {
-
-  }
+  public void buildServer(FlightServer.Builder builder) throws Exception {}
 
   @Override
   public void client(BufferAllocator allocator, Location location, FlightClient client)
@@ -78,72 +74,111 @@ public void client(BufferAllocator allocator, Location location, FlightClient cl
   private void validateMetadataRetrieval(FlightSqlClient sqlClient) throws Exception {
     final CallOption[] options = new CallOption[0];
 
-    validate(FlightSqlProducer.Schemas.GET_CATALOGS_SCHEMA, sqlClient.getCatalogs(options),
-        sqlClient);
-    validateSchema(FlightSqlProducer.Schemas.GET_CATALOGS_SCHEMA, sqlClient.getCatalogsSchema(options));
+    validate(
+        FlightSqlProducer.Schemas.GET_CATALOGS_SCHEMA, sqlClient.getCatalogs(options), sqlClient);
+    validateSchema(
+        FlightSqlProducer.Schemas.GET_CATALOGS_SCHEMA, sqlClient.getCatalogsSchema(options));
 
-    validate(FlightSqlProducer.Schemas.GET_SCHEMAS_SCHEMA,
+    validate(
+        FlightSqlProducer.Schemas.GET_SCHEMAS_SCHEMA,
         sqlClient.getSchemas("catalog", "db_schema_filter_pattern", options),
         sqlClient);
     validateSchema(FlightSqlProducer.Schemas.GET_SCHEMAS_SCHEMA, sqlClient.getSchemasSchema());
 
-    validate(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA,
-        sqlClient.getTables("catalog", "db_schema_filter_pattern", "table_filter_pattern",
-            Arrays.asList("table", "view"), true, options), sqlClient);
-    validateSchema(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA,
-        sqlClient.getTablesSchema(/*includeSchema*/true, options));
-    validateSchema(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA_NO_SCHEMA,
-        sqlClient.getTablesSchema(/*includeSchema*/false, options));
-
-    validate(FlightSqlProducer.Schemas.GET_TABLE_TYPES_SCHEMA, sqlClient.getTableTypes(options), sqlClient);
-    validateSchema(FlightSqlProducer.Schemas.GET_TABLE_TYPES_SCHEMA, sqlClient.getTableTypesSchema(options));
+    validate(
+        FlightSqlProducer.Schemas.GET_TABLES_SCHEMA,
+        sqlClient.getTables(
+            "catalog",
+            "db_schema_filter_pattern",
+            "table_filter_pattern",
+            Arrays.asList("table", "view"),
+            true,
+            options),
+        sqlClient);
+    validateSchema(
+        FlightSqlProducer.Schemas.GET_TABLES_SCHEMA,
+        sqlClient.getTablesSchema(/*includeSchema*/ true, options));
+    validateSchema(
+        FlightSqlProducer.Schemas.GET_TABLES_SCHEMA_NO_SCHEMA,
+        sqlClient.getTablesSchema(/*includeSchema*/ false, options));
+
+    validate(
+        FlightSqlProducer.Schemas.GET_TABLE_TYPES_SCHEMA,
+        sqlClient.getTableTypes(options),
+        sqlClient);
+    validateSchema(
+        FlightSqlProducer.Schemas.GET_TABLE_TYPES_SCHEMA, sqlClient.getTableTypesSchema(options));
 
-    validate(FlightSqlProducer.Schemas.GET_PRIMARY_KEYS_SCHEMA,
+    validate(
+        FlightSqlProducer.Schemas.GET_PRIMARY_KEYS_SCHEMA,
         sqlClient.getPrimaryKeys(TableRef.of("catalog", "db_schema", "table"), options),
         sqlClient);
-    validateSchema(FlightSqlProducer.Schemas.GET_PRIMARY_KEYS_SCHEMA, sqlClient.getPrimaryKeysSchema(options));
+    validateSchema(
+        FlightSqlProducer.Schemas.GET_PRIMARY_KEYS_SCHEMA, sqlClient.getPrimaryKeysSchema(options));
 
-    validate(FlightSqlProducer.Schemas.GET_EXPORTED_KEYS_SCHEMA,
+    validate(
+        FlightSqlProducer.Schemas.GET_EXPORTED_KEYS_SCHEMA,
         sqlClient.getExportedKeys(TableRef.of("catalog", "db_schema", "table"), options),
         sqlClient);
-    validateSchema(FlightSqlProducer.Schemas.GET_EXPORTED_KEYS_SCHEMA, sqlClient.getExportedKeysSchema(options));
+    validateSchema(
+        FlightSqlProducer.Schemas.GET_EXPORTED_KEYS_SCHEMA,
+        sqlClient.getExportedKeysSchema(options));
 
-    validate(FlightSqlProducer.Schemas.GET_IMPORTED_KEYS_SCHEMA,
+    validate(
+        FlightSqlProducer.Schemas.GET_IMPORTED_KEYS_SCHEMA,
         sqlClient.getImportedKeys(TableRef.of("catalog", "db_schema", "table"), options),
         sqlClient);
-    validateSchema(FlightSqlProducer.Schemas.GET_IMPORTED_KEYS_SCHEMA, sqlClient.getImportedKeysSchema(options));
-
-    validate(FlightSqlProducer.Schemas.GET_CROSS_REFERENCE_SCHEMA,
-        sqlClient.getCrossReference(TableRef.of("pk_catalog", "pk_db_schema", "pk_table"),
-            TableRef.of("fk_catalog", "fk_db_schema", "fk_table"), options),
+    validateSchema(
+        FlightSqlProducer.Schemas.GET_IMPORTED_KEYS_SCHEMA,
+        sqlClient.getImportedKeysSchema(options));
+
+    validate(
+        FlightSqlProducer.Schemas.GET_CROSS_REFERENCE_SCHEMA,
+        sqlClient.getCrossReference(
+            TableRef.of("pk_catalog", "pk_db_schema", "pk_table"),
+            TableRef.of("fk_catalog", "fk_db_schema", "fk_table"),
+            options),
         sqlClient);
-    validateSchema(FlightSqlProducer.Schemas.GET_CROSS_REFERENCE_SCHEMA, sqlClient.getCrossReferenceSchema(options));
+    validateSchema(
+        FlightSqlProducer.Schemas.GET_CROSS_REFERENCE_SCHEMA,
+        sqlClient.getCrossReferenceSchema(options));
 
-    validate(FlightSqlProducer.Schemas.GET_TYPE_INFO_SCHEMA, sqlClient.getXdbcTypeInfo(options), sqlClient);
-    validateSchema(FlightSqlProducer.Schemas.GET_TYPE_INFO_SCHEMA, sqlClient.getXdbcTypeInfoSchema(options));
-
-    validate(FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA,
-        sqlClient.getSqlInfo(new FlightSql.SqlInfo[] {FlightSql.SqlInfo.FLIGHT_SQL_SERVER_NAME,
-            FlightSql.SqlInfo.FLIGHT_SQL_SERVER_READ_ONLY}, options), sqlClient);
-    validateSchema(FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA, sqlClient.getSqlInfoSchema(options));
+    validate(
+        FlightSqlProducer.Schemas.GET_TYPE_INFO_SCHEMA,
+        sqlClient.getXdbcTypeInfo(options),
+        sqlClient);
+    validateSchema(
+        FlightSqlProducer.Schemas.GET_TYPE_INFO_SCHEMA, sqlClient.getXdbcTypeInfoSchema(options));
+
+    validate(
+        FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA,
+        sqlClient.getSqlInfo(
+            new FlightSql.SqlInfo[] {
+              FlightSql.SqlInfo.FLIGHT_SQL_SERVER_NAME,
+              FlightSql.SqlInfo.FLIGHT_SQL_SERVER_READ_ONLY
+            },
+            options),
+        sqlClient);
+    validateSchema(
+        FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA, sqlClient.getSqlInfoSchema(options));
   }
 
   private void validateStatementExecution(FlightSqlClient sqlClient) throws Exception {
     FlightInfo info = sqlClient.execute("SELECT STATEMENT");
     validate(FlightSqlScenarioProducer.getQuerySchema(), info, sqlClient);
-    validateSchema(FlightSqlScenarioProducer.getQuerySchema(),
-        sqlClient.getExecuteSchema("SELECT STATEMENT"));
+    validateSchema(
+        FlightSqlScenarioProducer.getQuerySchema(), sqlClient.getExecuteSchema("SELECT STATEMENT"));
 
-    IntegrationAssertions.assertEquals(sqlClient.executeUpdate("UPDATE STATEMENT"),
-        UPDATE_STATEMENT_EXPECTED_ROWS);
+    IntegrationAssertions.assertEquals(
+        sqlClient.executeUpdate("UPDATE STATEMENT"), UPDATE_STATEMENT_EXPECTED_ROWS);
   }
 
-  private void validatePreparedStatementExecution(BufferAllocator allocator,
-                                                  FlightSqlClient sqlClient) throws Exception {
-    try (FlightSqlClient.PreparedStatement preparedStatement = sqlClient.prepare(
-        "SELECT PREPARED STATEMENT");
-         VectorSchemaRoot parameters = VectorSchemaRoot.create(
-             FlightSqlScenarioProducer.getQuerySchema(), allocator)) {
+  private void validatePreparedStatementExecution(
+      BufferAllocator allocator, FlightSqlClient sqlClient) throws Exception {
+    try (FlightSqlClient.PreparedStatement preparedStatement =
+            sqlClient.prepare("SELECT PREPARED STATEMENT");
+        VectorSchemaRoot parameters =
+            VectorSchemaRoot.create(FlightSqlScenarioProducer.getQuerySchema(), allocator)) {
       parameters.setRowCount(1);
       preparedStatement.setParameters(parameters);
       validate(FlightSqlScenarioProducer.getQuerySchema(), preparedStatement.execute(), sqlClient);
@@ -151,14 +186,14 @@ private void validatePreparedStatementExecution(BufferAllocator allocator,
     }
 
     try (FlightSqlClient.PreparedStatement preparedStatement =
-             sqlClient.prepare("UPDATE PREPARED STATEMENT")) {
-      IntegrationAssertions.assertEquals(preparedStatement.executeUpdate(),
-          UPDATE_PREPARED_STATEMENT_EXPECTED_ROWS);
+        sqlClient.prepare("UPDATE PREPARED STATEMENT")) {
+      IntegrationAssertions.assertEquals(
+          preparedStatement.executeUpdate(), UPDATE_PREPARED_STATEMENT_EXPECTED_ROWS);
     }
   }
 
-  protected void validate(Schema expectedSchema, FlightInfo flightInfo,
-                        FlightSqlClient sqlClient) throws Exception {
+  protected void validate(Schema expectedSchema, FlightInfo flightInfo, FlightSqlClient sqlClient)
+      throws Exception {
     Ticket ticket = flightInfo.getEndpoints().get(0).getTicket();
     try (FlightStream stream = sqlClient.getStream(ticket)) {
       Schema actualSchema = stream.getSchema();
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/FlightSqlScenarioProducer.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/FlightSqlScenarioProducer.java
index 4ed9a3df0fc62..b7a75b459d176 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/FlightSqlScenarioProducer.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/FlightSqlScenarioProducer.java
@@ -14,13 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
+import com.google.protobuf.Any;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.Message;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.flight.CallStatus;
 import org.apache.arrow.flight.Criteria;
 import org.apache.arrow.flight.FlightDescriptor;
@@ -44,14 +46,7 @@
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-import com.google.protobuf.Any;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.Message;
-
-/**
- * Hardcoded Flight SQL producer used for cross-language integration tests.
- */
+/** Hardcoded Flight SQL producer used for cross-language integration tests. */
 public class FlightSqlScenarioProducer implements FlightSqlProducer {
   private final BufferAllocator allocator;
 
@@ -60,157 +55,200 @@ public FlightSqlScenarioProducer(BufferAllocator allocator) {
   }
 
   /**
-   * Schema to be returned for mocking the statement/prepared statement results.
-   * Must be the same across all languages.
+   * Schema to be returned for mocking the statement/prepared statement results. Must be the same
+   * across all languages.
    */
   static Schema getQuerySchema() {
     return new Schema(
         Collections.singletonList(
-            new Field("id", new FieldType(true, new ArrowType.Int(64, true),
-                null, new FlightSqlColumnMetadata.Builder()
-                .tableName("test")
-                .isAutoIncrement(true)
-                .isCaseSensitive(false)
-                .typeName("type_test")
-                .schemaName("schema_test")
-                .isSearchable(true)
-                .catalogName("catalog_test")
-                .precision(100)
-                .build().getMetadataMap()), null)
-        )
-    );
+            new Field(
+                "id",
+                new FieldType(
+                    true,
+                    new ArrowType.Int(64, true),
+                    null,
+                    new FlightSqlColumnMetadata.Builder()
+                        .tableName("test")
+                        .isAutoIncrement(true)
+                        .isCaseSensitive(false)
+                        .typeName("type_test")
+                        .schemaName("schema_test")
+                        .isSearchable(true)
+                        .catalogName("catalog_test")
+                        .precision(100)
+                        .build()
+                        .getMetadataMap()),
+                null)));
   }
 
   /**
    * The expected schema for queries with transactions.
-   * <p>
-   * Must be the same across all languages.
+   *
+   * <p>Must be the same across all languages.
    */
   static Schema getQueryWithTransactionSchema() {
     return new Schema(
         Collections.singletonList(
-            new Field("pkey", new FieldType(true, new ArrowType.Int(32, true),
-                null, new FlightSqlColumnMetadata.Builder()
-                .tableName("test")
-                .isAutoIncrement(true)
-                .isCaseSensitive(false)
-                .typeName("type_test")
-                .schemaName("schema_test")
-                .isSearchable(true)
-                .catalogName("catalog_test")
-                .precision(100)
-                .build().getMetadataMap()), null)
-        )
-    );
-  }
-
-  @Override
-  public void beginSavepoint(FlightSql.ActionBeginSavepointRequest request, CallContext context,
-                             StreamListener<FlightSql.ActionBeginSavepointResult> listener) {
+            new Field(
+                "pkey",
+                new FieldType(
+                    true,
+                    new ArrowType.Int(32, true),
+                    null,
+                    new FlightSqlColumnMetadata.Builder()
+                        .tableName("test")
+                        .isAutoIncrement(true)
+                        .isCaseSensitive(false)
+                        .typeName("type_test")
+                        .schemaName("schema_test")
+                        .isSearchable(true)
+                        .catalogName("catalog_test")
+                        .precision(100)
+                        .build()
+                        .getMetadataMap()),
+                null)));
+  }
+
+  @Override
+  public void beginSavepoint(
+      FlightSql.ActionBeginSavepointRequest request,
+      CallContext context,
+      StreamListener<FlightSql.ActionBeginSavepointResult> listener) {
     if (!request.getName().equals(FlightSqlScenario.SAVEPOINT_NAME)) {
-      listener.onError(CallStatus.INVALID_ARGUMENT
-          .withDescription(String.format("Expected name '%s', not '%s'",
-              FlightSqlScenario.SAVEPOINT_NAME, request.getName()))
-          .toRuntimeException());
+      listener.onError(
+          CallStatus.INVALID_ARGUMENT
+              .withDescription(
+                  String.format(
+                      "Expected name '%s', not '%s'",
+                      FlightSqlScenario.SAVEPOINT_NAME, request.getName()))
+              .toRuntimeException());
       return;
     }
-    if (!Arrays.equals(request.getTransactionId().toByteArray(), FlightSqlScenario.TRANSACTION_ID)) {
-      listener.onError(CallStatus.INVALID_ARGUMENT
-          .withDescription(String.format("Expected transaction ID '%s', not '%s'",
-              Arrays.toString(FlightSqlScenario.TRANSACTION_ID),
-              Arrays.toString(request.getTransactionId().toByteArray())))
-          .toRuntimeException());
+    if (!Arrays.equals(
+        request.getTransactionId().toByteArray(), FlightSqlScenario.TRANSACTION_ID)) {
+      listener.onError(
+          CallStatus.INVALID_ARGUMENT
+              .withDescription(
+                  String.format(
+                      "Expected transaction ID '%s', not '%s'",
+                      Arrays.toString(FlightSqlScenario.TRANSACTION_ID),
+                      Arrays.toString(request.getTransactionId().toByteArray())))
+              .toRuntimeException());
       return;
     }
-    listener.onNext(FlightSql.ActionBeginSavepointResult.newBuilder()
-        .setSavepointId(ByteString.copyFrom(FlightSqlScenario.SAVEPOINT_ID))
-        .build());
+    listener.onNext(
+        FlightSql.ActionBeginSavepointResult.newBuilder()
+            .setSavepointId(ByteString.copyFrom(FlightSqlScenario.SAVEPOINT_ID))
+            .build());
     listener.onCompleted();
   }
 
   @Override
-  public void beginTransaction(FlightSql.ActionBeginTransactionRequest request, CallContext context,
-                               StreamListener<FlightSql.ActionBeginTransactionResult> listener) {
-    listener.onNext(FlightSql.ActionBeginTransactionResult.newBuilder()
-        .setTransactionId(ByteString.copyFrom(FlightSqlScenario.TRANSACTION_ID))
-        .build());
+  public void beginTransaction(
+      FlightSql.ActionBeginTransactionRequest request,
+      CallContext context,
+      StreamListener<FlightSql.ActionBeginTransactionResult> listener) {
+    listener.onNext(
+        FlightSql.ActionBeginTransactionResult.newBuilder()
+            .setTransactionId(ByteString.copyFrom(FlightSqlScenario.TRANSACTION_ID))
+            .build());
     listener.onCompleted();
   }
 
   @Override
-  public void cancelQuery(FlightInfo info, CallContext context, StreamListener<CancelResult> listener) {
+  public void cancelQuery(
+      FlightInfo info, CallContext context, StreamListener<CancelResult> listener) {
     final String expectedTicket = "PLAN HANDLE";
     if (info.getEndpoints().size() != 1) {
-      listener.onError(CallStatus.INVALID_ARGUMENT
-          .withDescription(String.format("Expected 1 endpoint, got %d", info.getEndpoints().size()))
-          .toRuntimeException());
+      listener.onError(
+          CallStatus.INVALID_ARGUMENT
+              .withDescription(
+                  String.format("Expected 1 endpoint, got %d", info.getEndpoints().size()))
+              .toRuntimeException());
     }
     final FlightEndpoint endpoint = info.getEndpoints().get(0);
     try {
       final Any any = Any.parseFrom(endpoint.getTicket().getBytes());
       if (!any.is(FlightSql.TicketStatementQuery.class)) {
-        listener.onError(CallStatus.INVALID_ARGUMENT
-            .withDescription(String.format("Expected TicketStatementQuery, found '%s'", any.getTypeUrl()))
-            .toRuntimeException());
+        listener.onError(
+            CallStatus.INVALID_ARGUMENT
+                .withDescription(
+                    String.format("Expected TicketStatementQuery, found '%s'", any.getTypeUrl()))
+                .toRuntimeException());
       }
-      final FlightSql.TicketStatementQuery ticket = any.unpack(FlightSql.TicketStatementQuery.class);
+      final FlightSql.TicketStatementQuery ticket =
+          any.unpack(FlightSql.TicketStatementQuery.class);
       if (!ticket.getStatementHandle().toStringUtf8().equals(expectedTicket)) {
-        listener.onError(CallStatus.INVALID_ARGUMENT
-            .withDescription(String.format("Expected ticket '%s'", expectedTicket))
-            .toRuntimeException());
+        listener.onError(
+            CallStatus.INVALID_ARGUMENT
+                .withDescription(String.format("Expected ticket '%s'", expectedTicket))
+                .toRuntimeException());
       }
       listener.onNext(CancelResult.CANCELLED);
       listener.onCompleted();
     } catch (InvalidProtocolBufferException e) {
-      listener.onError(CallStatus.INVALID_ARGUMENT
-          .withDescription("Invalid Protobuf:" + e)
-          .withCause(e)
-          .toRuntimeException());
+      listener.onError(
+          CallStatus.INVALID_ARGUMENT
+              .withDescription("Invalid Protobuf:" + e)
+              .withCause(e)
+              .toRuntimeException());
     }
   }
 
   @Override
-  public void createPreparedStatement(FlightSql.ActionCreatePreparedStatementRequest request,
-                                      CallContext context, StreamListener<Result> listener) {
-    IntegrationAssertions.assertTrue("Expect to be one of the two queries used on tests",
-        request.getQuery().equals("SELECT PREPARED STATEMENT") ||
-            request.getQuery().equals("UPDATE PREPARED STATEMENT"));
+  public void createPreparedStatement(
+      FlightSql.ActionCreatePreparedStatementRequest request,
+      CallContext context,
+      StreamListener<Result> listener) {
+    IntegrationAssertions.assertTrue(
+        "Expect to be one of the two queries used on tests",
+        request.getQuery().equals("SELECT PREPARED STATEMENT")
+            || request.getQuery().equals("UPDATE PREPARED STATEMENT"));
 
     String text = request.getQuery();
     if (!request.getTransactionId().isEmpty()) {
       text += " WITH TXN";
     }
     text += " HANDLE";
-    final FlightSql.ActionCreatePreparedStatementResult
-        result = FlightSql.ActionCreatePreparedStatementResult.newBuilder()
-        .setPreparedStatementHandle(ByteString.copyFromUtf8(text))
-        .build();
+    final FlightSql.ActionCreatePreparedStatementResult result =
+        FlightSql.ActionCreatePreparedStatementResult.newBuilder()
+            .setPreparedStatementHandle(ByteString.copyFromUtf8(text))
+            .build();
     listener.onNext(new Result(Any.pack(result).toByteArray()));
     listener.onCompleted();
   }
 
   @Override
-  public void createPreparedSubstraitPlan(FlightSql.ActionCreatePreparedSubstraitPlanRequest request,
-                                          CallContext context,
-                                          StreamListener<FlightSql.ActionCreatePreparedStatementResult> listener) {
-    if (!Arrays.equals(request.getPlan().getPlan().toByteArray(), FlightSqlScenario.SUBSTRAIT_PLAN_TEXT)) {
-      listener.onError(CallStatus.INVALID_ARGUMENT
-          .withDescription(String.format("Expected plan '%s', not '%s'",
-              Arrays.toString(FlightSqlScenario.SUBSTRAIT_PLAN_TEXT),
-              Arrays.toString(request.getPlan().getPlan().toByteArray())))
-          .toRuntimeException());
+  public void createPreparedSubstraitPlan(
+      FlightSql.ActionCreatePreparedSubstraitPlanRequest request,
+      CallContext context,
+      StreamListener<FlightSql.ActionCreatePreparedStatementResult> listener) {
+    if (!Arrays.equals(
+        request.getPlan().getPlan().toByteArray(), FlightSqlScenario.SUBSTRAIT_PLAN_TEXT)) {
+      listener.onError(
+          CallStatus.INVALID_ARGUMENT
+              .withDescription(
+                  String.format(
+                      "Expected plan '%s', not '%s'",
+                      Arrays.toString(FlightSqlScenario.SUBSTRAIT_PLAN_TEXT),
+                      Arrays.toString(request.getPlan().getPlan().toByteArray())))
+              .toRuntimeException());
       return;
     }
     if (!FlightSqlScenario.SUBSTRAIT_VERSION.equals(request.getPlan().getVersion())) {
-      listener.onError(CallStatus.INVALID_ARGUMENT
-          .withDescription(String.format("Expected version '%s', not '%s'",
-              FlightSqlScenario.SUBSTRAIT_VERSION,
-              request.getPlan().getVersion()))
-          .toRuntimeException());
+      listener.onError(
+          CallStatus.INVALID_ARGUMENT
+              .withDescription(
+                  String.format(
+                      "Expected version '%s', not '%s'",
+                      FlightSqlScenario.SUBSTRAIT_VERSION, request.getPlan().getVersion()))
+              .toRuntimeException());
       return;
     }
-    final String handle = request.getTransactionId().isEmpty() ?
-        "PREPARED PLAN HANDLE" : "PREPARED PLAN WITH TXN HANDLE";
+    final String handle =
+        request.getTransactionId().isEmpty()
+            ? "PREPARED PLAN HANDLE"
+            : "PREPARED PLAN WITH TXN HANDLE";
     final FlightSql.ActionCreatePreparedStatementResult result =
         FlightSql.ActionCreatePreparedStatementResult.newBuilder()
             .setPreparedStatementHandle(ByteString.copyFromUtf8(handle))
@@ -220,116 +258,141 @@ public void createPreparedSubstraitPlan(FlightSql.ActionCreatePreparedSubstraitP
   }
 
   @Override
-  public void closePreparedStatement(FlightSql.ActionClosePreparedStatementRequest request,
-                                     CallContext context, StreamListener<Result> listener) {
+  public void closePreparedStatement(
+      FlightSql.ActionClosePreparedStatementRequest request,
+      CallContext context,
+      StreamListener<Result> listener) {
     final String handle = request.getPreparedStatementHandle().toStringUtf8();
-    IntegrationAssertions.assertTrue("Expect to be one of the queries used on tests",
-        handle.equals("SELECT PREPARED STATEMENT HANDLE") ||
-            handle.equals("SELECT PREPARED STATEMENT WITH TXN HANDLE") ||
-            handle.equals("UPDATE PREPARED STATEMENT HANDLE") ||
-            handle.equals("UPDATE PREPARED STATEMENT WITH TXN HANDLE") ||
-            handle.equals("PREPARED PLAN HANDLE") ||
-            handle.equals("PREPARED PLAN WITH TXN HANDLE"));
+    IntegrationAssertions.assertTrue(
+        "Expect to be one of the queries used on tests",
+        handle.equals("SELECT PREPARED STATEMENT HANDLE")
+            || handle.equals("SELECT PREPARED STATEMENT WITH TXN HANDLE")
+            || handle.equals("UPDATE PREPARED STATEMENT HANDLE")
+            || handle.equals("UPDATE PREPARED STATEMENT WITH TXN HANDLE")
+            || handle.equals("PREPARED PLAN HANDLE")
+            || handle.equals("PREPARED PLAN WITH TXN HANDLE"));
     listener.onCompleted();
   }
 
   @Override
-  public void endSavepoint(FlightSql.ActionEndSavepointRequest request, CallContext context,
-                           StreamListener<Result> listener) {
+  public void endSavepoint(
+      FlightSql.ActionEndSavepointRequest request,
+      CallContext context,
+      StreamListener<Result> listener) {
     switch (request.getAction()) {
       case END_SAVEPOINT_RELEASE:
       case END_SAVEPOINT_ROLLBACK:
-        if (!Arrays.equals(request.getSavepointId().toByteArray(), FlightSqlScenario.SAVEPOINT_ID)) {
-          listener.onError(CallStatus.INVALID_ARGUMENT
-              .withDescription("Unexpected ID: " + Arrays.toString(request.getSavepointId().toByteArray()))
-              .toRuntimeException());
+        if (!Arrays.equals(
+            request.getSavepointId().toByteArray(), FlightSqlScenario.SAVEPOINT_ID)) {
+          listener.onError(
+              CallStatus.INVALID_ARGUMENT
+                  .withDescription(
+                      "Unexpected ID: " + Arrays.toString(request.getSavepointId().toByteArray()))
+                  .toRuntimeException());
         }
         break;
       case UNRECOGNIZED:
-      default: {
-        listener.onError(CallStatus.INVALID_ARGUMENT
-            .withDescription("Unknown action: " + request.getAction())
-            .toRuntimeException());
-        return;
-      }
+      default:
+        {
+          listener.onError(
+              CallStatus.INVALID_ARGUMENT
+                  .withDescription("Unknown action: " + request.getAction())
+                  .toRuntimeException());
+          return;
+        }
     }
     listener.onCompleted();
   }
 
   @Override
-  public void endTransaction(FlightSql.ActionEndTransactionRequest request, CallContext context,
-                             StreamListener<Result> listener) {
+  public void endTransaction(
+      FlightSql.ActionEndTransactionRequest request,
+      CallContext context,
+      StreamListener<Result> listener) {
     switch (request.getAction()) {
       case END_TRANSACTION_COMMIT:
       case END_TRANSACTION_ROLLBACK:
-        if (!Arrays.equals(request.getTransactionId().toByteArray(), FlightSqlScenario.TRANSACTION_ID)) {
-          listener.onError(CallStatus.INVALID_ARGUMENT
-              .withDescription("Unexpected ID: " + Arrays.toString(request.getTransactionId().toByteArray()))
-              .toRuntimeException());
+        if (!Arrays.equals(
+            request.getTransactionId().toByteArray(), FlightSqlScenario.TRANSACTION_ID)) {
+          listener.onError(
+              CallStatus.INVALID_ARGUMENT
+                  .withDescription(
+                      "Unexpected ID: " + Arrays.toString(request.getTransactionId().toByteArray()))
+                  .toRuntimeException());
         }
         break;
       case UNRECOGNIZED:
-      default: {
-        listener.onError(CallStatus.INVALID_ARGUMENT
-            .withDescription("Unknown action: " + request.getAction())
-            .toRuntimeException());
-        return;
-      }
+      default:
+        {
+          listener.onError(
+              CallStatus.INVALID_ARGUMENT
+                  .withDescription("Unknown action: " + request.getAction())
+                  .toRuntimeException());
+          return;
+        }
     }
     listener.onCompleted();
   }
 
   @Override
-  public FlightInfo getFlightInfoStatement(FlightSql.CommandStatementQuery command,
-                                           CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoStatement(
+      FlightSql.CommandStatementQuery command, CallContext context, FlightDescriptor descriptor) {
     IntegrationAssertions.assertEquals(command.getQuery(), "SELECT STATEMENT");
     if (command.getTransactionId().isEmpty()) {
       String handle = "SELECT STATEMENT HANDLE";
-      FlightSql.TicketStatementQuery ticket = FlightSql.TicketStatementQuery.newBuilder()
-          .setStatementHandle(ByteString.copyFromUtf8(handle))
-          .build();
+      FlightSql.TicketStatementQuery ticket =
+          FlightSql.TicketStatementQuery.newBuilder()
+              .setStatementHandle(ByteString.copyFromUtf8(handle))
+              .build();
       return getFlightInfoForSchema(ticket, descriptor, getQuerySchema());
     } else {
       String handle = "SELECT STATEMENT WITH TXN HANDLE";
-      FlightSql.TicketStatementQuery ticket = FlightSql.TicketStatementQuery.newBuilder()
-          .setStatementHandle(ByteString.copyFromUtf8(handle))
-          .build();
+      FlightSql.TicketStatementQuery ticket =
+          FlightSql.TicketStatementQuery.newBuilder()
+              .setStatementHandle(ByteString.copyFromUtf8(handle))
+              .build();
       return getFlightInfoForSchema(ticket, descriptor, getQueryWithTransactionSchema());
     }
   }
 
   @Override
-  public FlightInfo getFlightInfoSubstraitPlan(FlightSql.CommandStatementSubstraitPlan command, CallContext context,
-                                               FlightDescriptor descriptor) {
-    IntegrationAssertions.assertEquals(command.getPlan().getPlan().toByteArray(),
-        FlightSqlScenario.SUBSTRAIT_PLAN_TEXT);
-    IntegrationAssertions.assertEquals(command.getPlan().getVersion(), FlightSqlScenario.SUBSTRAIT_VERSION);
-    String handle = command.getTransactionId().isEmpty() ?
-        "PLAN HANDLE" : "PLAN WITH TXN HANDLE";
-    FlightSql.TicketStatementQuery ticket = FlightSql.TicketStatementQuery.newBuilder()
-        .setStatementHandle(ByteString.copyFromUtf8(handle))
-        .build();
+  public FlightInfo getFlightInfoSubstraitPlan(
+      FlightSql.CommandStatementSubstraitPlan command,
+      CallContext context,
+      FlightDescriptor descriptor) {
+    IntegrationAssertions.assertEquals(
+        command.getPlan().getPlan().toByteArray(), FlightSqlScenario.SUBSTRAIT_PLAN_TEXT);
+    IntegrationAssertions.assertEquals(
+        command.getPlan().getVersion(), FlightSqlScenario.SUBSTRAIT_VERSION);
+    String handle = command.getTransactionId().isEmpty() ? "PLAN HANDLE" : "PLAN WITH TXN HANDLE";
+    FlightSql.TicketStatementQuery ticket =
+        FlightSql.TicketStatementQuery.newBuilder()
+            .setStatementHandle(ByteString.copyFromUtf8(handle))
+            .build();
     return getFlightInfoForSchema(ticket, descriptor, getQuerySchema());
   }
 
   @Override
-  public FlightInfo getFlightInfoPreparedStatement(FlightSql.CommandPreparedStatementQuery command,
-                                                   CallContext context,
-                                                   FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoPreparedStatement(
+      FlightSql.CommandPreparedStatementQuery command,
+      CallContext context,
+      FlightDescriptor descriptor) {
     String handle = command.getPreparedStatementHandle().toStringUtf8();
-    if (handle.equals("SELECT PREPARED STATEMENT HANDLE") ||
-        handle.equals("PREPARED PLAN HANDLE")) {
+    if (handle.equals("SELECT PREPARED STATEMENT HANDLE")
+        || handle.equals("PREPARED PLAN HANDLE")) {
       return getFlightInfoForSchema(command, descriptor, getQuerySchema());
-    } else if (handle.equals("SELECT PREPARED STATEMENT WITH TXN HANDLE") ||
-        handle.equals("PREPARED PLAN WITH TXN HANDLE")) {
+    } else if (handle.equals("SELECT PREPARED STATEMENT WITH TXN HANDLE")
+        || handle.equals("PREPARED PLAN WITH TXN HANDLE")) {
       return getFlightInfoForSchema(command, descriptor, getQueryWithTransactionSchema());
     }
-    throw CallStatus.INVALID_ARGUMENT.withDescription("Unknown handle: " + handle).toRuntimeException();
+    throw CallStatus.INVALID_ARGUMENT
+        .withDescription("Unknown handle: " + handle)
+        .toRuntimeException();
   }
 
   @Override
-  public SchemaResult getSchemaStatement(FlightSql.CommandStatementQuery command,
-                                         CallContext context, FlightDescriptor descriptor) {
+  public SchemaResult getSchemaStatement(
+      FlightSql.CommandStatementQuery command, CallContext context, FlightDescriptor descriptor) {
     IntegrationAssertions.assertEquals(command.getQuery(), "SELECT STATEMENT");
     if (command.getTransactionId().isEmpty()) {
       return new SchemaResult(getQuerySchema());
@@ -338,34 +401,44 @@ public SchemaResult getSchemaStatement(FlightSql.CommandStatementQuery command,
   }
 
   @Override
-  public SchemaResult getSchemaPreparedStatement(FlightSql.CommandPreparedStatementQuery command, CallContext context,
-                                                 FlightDescriptor descriptor) {
+  public SchemaResult getSchemaPreparedStatement(
+      FlightSql.CommandPreparedStatementQuery command,
+      CallContext context,
+      FlightDescriptor descriptor) {
     String handle = command.getPreparedStatementHandle().toStringUtf8();
-    if (handle.equals("SELECT PREPARED STATEMENT HANDLE") ||
-        handle.equals("PREPARED PLAN HANDLE")) {
+    if (handle.equals("SELECT PREPARED STATEMENT HANDLE")
+        || handle.equals("PREPARED PLAN HANDLE")) {
       return new SchemaResult(getQuerySchema());
-    } else if (handle.equals("SELECT PREPARED STATEMENT WITH TXN HANDLE") ||
-        handle.equals("PREPARED PLAN WITH TXN HANDLE")) {
+    } else if (handle.equals("SELECT PREPARED STATEMENT WITH TXN HANDLE")
+        || handle.equals("PREPARED PLAN WITH TXN HANDLE")) {
       return new SchemaResult(getQueryWithTransactionSchema());
     }
-    throw CallStatus.INVALID_ARGUMENT.withDescription("Unknown handle: " + handle).toRuntimeException();
+    throw CallStatus.INVALID_ARGUMENT
+        .withDescription("Unknown handle: " + handle)
+        .toRuntimeException();
   }
 
   @Override
-  public SchemaResult getSchemaSubstraitPlan(FlightSql.CommandStatementSubstraitPlan command, CallContext context,
-                                             FlightDescriptor descriptor) {
-    if (!Arrays.equals(command.getPlan().getPlan().toByteArray(), FlightSqlScenario.SUBSTRAIT_PLAN_TEXT)) {
+  public SchemaResult getSchemaSubstraitPlan(
+      FlightSql.CommandStatementSubstraitPlan command,
+      CallContext context,
+      FlightDescriptor descriptor) {
+    if (!Arrays.equals(
+        command.getPlan().getPlan().toByteArray(), FlightSqlScenario.SUBSTRAIT_PLAN_TEXT)) {
       throw CallStatus.INVALID_ARGUMENT
-          .withDescription(String.format("Expected plan '%s', not '%s'",
-              Arrays.toString(FlightSqlScenario.SUBSTRAIT_PLAN_TEXT),
-              Arrays.toString(command.getPlan().getPlan().toByteArray())))
+          .withDescription(
+              String.format(
+                  "Expected plan '%s', not '%s'",
+                  Arrays.toString(FlightSqlScenario.SUBSTRAIT_PLAN_TEXT),
+                  Arrays.toString(command.getPlan().getPlan().toByteArray())))
           .toRuntimeException();
     }
     if (!FlightSqlScenario.SUBSTRAIT_VERSION.equals(command.getPlan().getVersion())) {
       throw CallStatus.INVALID_ARGUMENT
-          .withDescription(String.format("Expected version '%s', not '%s'",
-              FlightSqlScenario.SUBSTRAIT_VERSION,
-              command.getPlan().getVersion()))
+          .withDescription(
+              String.format(
+                  "Expected version '%s', not '%s'",
+                  FlightSqlScenario.SUBSTRAIT_VERSION, command.getPlan().getVersion()))
           .toRuntimeException();
     }
     if (command.getTransactionId().isEmpty()) {
@@ -375,31 +448,39 @@ public SchemaResult getSchemaSubstraitPlan(FlightSql.CommandStatementSubstraitPl
   }
 
   @Override
-  public void getStreamStatement(FlightSql.TicketStatementQuery ticket, CallContext context,
-                                 ServerStreamListener listener) {
+  public void getStreamStatement(
+      FlightSql.TicketStatementQuery ticket, CallContext context, ServerStreamListener listener) {
     final String handle = ticket.getStatementHandle().toStringUtf8();
     if (handle.equals("SELECT STATEMENT HANDLE") || handle.equals("PLAN HANDLE")) {
       putEmptyBatchToStreamListener(listener, getQuerySchema());
-    } else if (handle.equals("SELECT STATEMENT WITH TXN HANDLE") || handle.equals("PLAN WITH TXN HANDLE")) {
+    } else if (handle.equals("SELECT STATEMENT WITH TXN HANDLE")
+        || handle.equals("PLAN WITH TXN HANDLE")) {
       putEmptyBatchToStreamListener(listener, getQueryWithTransactionSchema());
     } else {
-      listener.error(CallStatus.INVALID_ARGUMENT.withDescription("Unknown handle: " + handle).toRuntimeException());
+      listener.error(
+          CallStatus.INVALID_ARGUMENT
+              .withDescription("Unknown handle: " + handle)
+              .toRuntimeException());
     }
   }
 
   @Override
-  public void getStreamPreparedStatement(FlightSql.CommandPreparedStatementQuery command,
-                                         CallContext context, ServerStreamListener listener) {
+  public void getStreamPreparedStatement(
+      FlightSql.CommandPreparedStatementQuery command,
+      CallContext context,
+      ServerStreamListener listener) {
     String handle = command.getPreparedStatementHandle().toStringUtf8();
-    if (handle.equals("SELECT PREPARED STATEMENT HANDLE") || handle.equals("PREPARED PLAN HANDLE")) {
+    if (handle.equals("SELECT PREPARED STATEMENT HANDLE")
+        || handle.equals("PREPARED PLAN HANDLE")) {
       putEmptyBatchToStreamListener(listener, getQuerySchema());
-    } else if (handle.equals("SELECT PREPARED STATEMENT WITH TXN HANDLE") ||
-        handle.equals("PREPARED PLAN WITH TXN HANDLE")) {
+    } else if (handle.equals("SELECT PREPARED STATEMENT WITH TXN HANDLE")
+        || handle.equals("PREPARED PLAN WITH TXN HANDLE")) {
       putEmptyBatchToStreamListener(listener, getQueryWithTransactionSchema());
     } else {
-      listener.error(CallStatus.INVALID_ARGUMENT
-          .withDescription("Unknown handle: " + handle)
-          .toRuntimeException());
+      listener.error(
+          CallStatus.INVALID_ARGUMENT
+              .withDescription("Unknown handle: " + handle)
+              .toRuntimeException());
     }
   }
 
@@ -417,113 +498,134 @@ private Runnable acceptPutReturnConstant(StreamListener<PutResult> ackStream, lo
   }
 
   @Override
-  public Runnable acceptPutStatement(FlightSql.CommandStatementUpdate command, CallContext context,
-                                     FlightStream flightStream,
-                                     StreamListener<PutResult> ackStream) {
+  public Runnable acceptPutStatement(
+      FlightSql.CommandStatementUpdate command,
+      CallContext context,
+      FlightStream flightStream,
+      StreamListener<PutResult> ackStream) {
     IntegrationAssertions.assertEquals(command.getQuery(), "UPDATE STATEMENT");
-    return acceptPutReturnConstant(ackStream,
-        command.getTransactionId().isEmpty() ? FlightSqlScenario.UPDATE_STATEMENT_EXPECTED_ROWS :
-            FlightSqlScenario.UPDATE_STATEMENT_WITH_TRANSACTION_EXPECTED_ROWS);
-  }
-
-  @Override
-  public Runnable acceptPutSubstraitPlan(FlightSql.CommandStatementSubstraitPlan command, CallContext context,
-                                         FlightStream flightStream, StreamListener<PutResult> ackStream) {
-    IntegrationAssertions.assertEquals(command.getPlan().getPlan().toByteArray(),
-        FlightSqlScenario.SUBSTRAIT_PLAN_TEXT);
-    IntegrationAssertions.assertEquals(command.getPlan().getVersion(), FlightSqlScenario.SUBSTRAIT_VERSION);
-    return acceptPutReturnConstant(ackStream,
-        command.getTransactionId().isEmpty() ? FlightSqlScenario.UPDATE_STATEMENT_EXPECTED_ROWS :
-            FlightSqlScenario.UPDATE_STATEMENT_WITH_TRANSACTION_EXPECTED_ROWS);
-  }
-
-  @Override
-  public Runnable acceptPutPreparedStatementUpdate(FlightSql.CommandPreparedStatementUpdate command,
-                                                   CallContext context, FlightStream flightStream,
-                                                   StreamListener<PutResult> ackStream) {
+    return acceptPutReturnConstant(
+        ackStream,
+        command.getTransactionId().isEmpty()
+            ? FlightSqlScenario.UPDATE_STATEMENT_EXPECTED_ROWS
+            : FlightSqlScenario.UPDATE_STATEMENT_WITH_TRANSACTION_EXPECTED_ROWS);
+  }
+
+  @Override
+  public Runnable acceptPutSubstraitPlan(
+      FlightSql.CommandStatementSubstraitPlan command,
+      CallContext context,
+      FlightStream flightStream,
+      StreamListener<PutResult> ackStream) {
+    IntegrationAssertions.assertEquals(
+        command.getPlan().getPlan().toByteArray(), FlightSqlScenario.SUBSTRAIT_PLAN_TEXT);
+    IntegrationAssertions.assertEquals(
+        command.getPlan().getVersion(), FlightSqlScenario.SUBSTRAIT_VERSION);
+    return acceptPutReturnConstant(
+        ackStream,
+        command.getTransactionId().isEmpty()
+            ? FlightSqlScenario.UPDATE_STATEMENT_EXPECTED_ROWS
+            : FlightSqlScenario.UPDATE_STATEMENT_WITH_TRANSACTION_EXPECTED_ROWS);
+  }
+
+  @Override
+  public Runnable acceptPutPreparedStatementUpdate(
+      FlightSql.CommandPreparedStatementUpdate command,
+      CallContext context,
+      FlightStream flightStream,
+      StreamListener<PutResult> ackStream) {
     final String handle = command.getPreparedStatementHandle().toStringUtf8();
-    if (handle.equals("UPDATE PREPARED STATEMENT HANDLE") ||
-        handle.equals("PREPARED PLAN HANDLE")) {
-      return acceptPutReturnConstant(ackStream, FlightSqlScenario.UPDATE_PREPARED_STATEMENT_EXPECTED_ROWS);
-    } else if (handle.equals("UPDATE PREPARED STATEMENT WITH TXN HANDLE") ||
-        handle.equals("PREPARED PLAN WITH TXN HANDLE")) {
+    if (handle.equals("UPDATE PREPARED STATEMENT HANDLE")
+        || handle.equals("PREPARED PLAN HANDLE")) {
+      return acceptPutReturnConstant(
+          ackStream, FlightSqlScenario.UPDATE_PREPARED_STATEMENT_EXPECTED_ROWS);
+    } else if (handle.equals("UPDATE PREPARED STATEMENT WITH TXN HANDLE")
+        || handle.equals("PREPARED PLAN WITH TXN HANDLE")) {
       return acceptPutReturnConstant(
           ackStream, FlightSqlScenario.UPDATE_PREPARED_STATEMENT_WITH_TRANSACTION_EXPECTED_ROWS);
     }
     return () -> {
-      ackStream.onError(CallStatus.INVALID_ARGUMENT
-          .withDescription("Unknown handle: " + handle)
-          .toRuntimeException());
+      ackStream.onError(
+          CallStatus.INVALID_ARGUMENT
+              .withDescription("Unknown handle: " + handle)
+              .toRuntimeException());
     };
   }
 
   @Override
-  public Runnable acceptPutPreparedStatementQuery(FlightSql.CommandPreparedStatementQuery command,
-                                                  CallContext context, FlightStream flightStream,
-                                                  StreamListener<PutResult> ackStream) {
+  public Runnable acceptPutPreparedStatementQuery(
+      FlightSql.CommandPreparedStatementQuery command,
+      CallContext context,
+      FlightStream flightStream,
+      StreamListener<PutResult> ackStream) {
     final String handle = command.getPreparedStatementHandle().toStringUtf8();
-    if (handle.equals("SELECT PREPARED STATEMENT HANDLE") ||
-        handle.equals("SELECT PREPARED STATEMENT WITH TXN HANDLE") ||
-        handle.equals("PREPARED PLAN HANDLE") ||
-        handle.equals("PREPARED PLAN WITH TXN HANDLE")) {
+    if (handle.equals("SELECT PREPARED STATEMENT HANDLE")
+        || handle.equals("SELECT PREPARED STATEMENT WITH TXN HANDLE")
+        || handle.equals("PREPARED PLAN HANDLE")
+        || handle.equals("PREPARED PLAN WITH TXN HANDLE")) {
       IntegrationAssertions.assertEquals(getQuerySchema(), flightStream.getSchema());
       return ackStream::onCompleted;
     }
     return () -> {
-      ackStream.onError(CallStatus.INVALID_ARGUMENT
-          .withDescription("Unknown handle: " + handle)
-          .toRuntimeException());
+      ackStream.onError(
+          CallStatus.INVALID_ARGUMENT
+              .withDescription("Unknown handle: " + handle)
+              .toRuntimeException());
     };
   }
 
   @Override
-  public FlightInfo getFlightInfoSqlInfo(FlightSql.CommandGetSqlInfo request, CallContext context,
-                                         FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoSqlInfo(
+      FlightSql.CommandGetSqlInfo request, CallContext context, FlightDescriptor descriptor) {
     if (request.getInfoCount() == 2) {
       // Integration test for the protocol messages
-      IntegrationAssertions.assertEquals(request.getInfo(0),
-          FlightSql.SqlInfo.FLIGHT_SQL_SERVER_NAME_VALUE);
-      IntegrationAssertions.assertEquals(request.getInfo(1),
-          FlightSql.SqlInfo.FLIGHT_SQL_SERVER_READ_ONLY_VALUE);
+      IntegrationAssertions.assertEquals(
+          request.getInfo(0), FlightSql.SqlInfo.FLIGHT_SQL_SERVER_NAME_VALUE);
+      IntegrationAssertions.assertEquals(
+          request.getInfo(1), FlightSql.SqlInfo.FLIGHT_SQL_SERVER_READ_ONLY_VALUE);
     }
     return getFlightInfoForSchema(request, descriptor, Schemas.GET_SQL_INFO_SCHEMA);
   }
 
   @Override
-  public void getStreamSqlInfo(FlightSql.CommandGetSqlInfo command, CallContext context,
-                               ServerStreamListener listener) {
+  public void getStreamSqlInfo(
+      FlightSql.CommandGetSqlInfo command, CallContext context, ServerStreamListener listener) {
     if (command.getInfoCount() == 2) {
       // Integration test for the protocol messages
       putEmptyBatchToStreamListener(listener, Schemas.GET_SQL_INFO_SCHEMA);
       return;
     }
-    SqlInfoBuilder sqlInfoBuilder = new SqlInfoBuilder()
-        .withFlightSqlServerSql(false)
-        .withFlightSqlServerSubstrait(true)
-        .withFlightSqlServerSubstraitMinVersion("min_version")
-        .withFlightSqlServerSubstraitMaxVersion("max_version")
-        .withFlightSqlServerTransaction(FlightSql.SqlSupportedTransaction.SQL_SUPPORTED_TRANSACTION_SAVEPOINT)
-        .withFlightSqlServerCancel(true)
-        .withFlightSqlServerStatementTimeout(42)
-        .withFlightSqlServerTransactionTimeout(7);
+    SqlInfoBuilder sqlInfoBuilder =
+        new SqlInfoBuilder()
+            .withFlightSqlServerSql(false)
+            .withFlightSqlServerSubstrait(true)
+            .withFlightSqlServerSubstraitMinVersion("min_version")
+            .withFlightSqlServerSubstraitMaxVersion("max_version")
+            .withFlightSqlServerTransaction(
+                FlightSql.SqlSupportedTransaction.SQL_SUPPORTED_TRANSACTION_SAVEPOINT)
+            .withFlightSqlServerCancel(true)
+            .withFlightSqlServerStatementTimeout(42)
+            .withFlightSqlServerTransactionTimeout(7);
     sqlInfoBuilder.send(command.getInfoList(), listener);
   }
 
   @Override
-  public void getStreamTypeInfo(FlightSql.CommandGetXdbcTypeInfo request,
-                                CallContext context, ServerStreamListener listener) {
+  public void getStreamTypeInfo(
+      FlightSql.CommandGetXdbcTypeInfo request,
+      CallContext context,
+      ServerStreamListener listener) {
     putEmptyBatchToStreamListener(listener, Schemas.GET_TYPE_INFO_SCHEMA);
   }
 
   @Override
-  public FlightInfo getFlightInfoTypeInfo(FlightSql.CommandGetXdbcTypeInfo request, CallContext context,
-                                          FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoTypeInfo(
+      FlightSql.CommandGetXdbcTypeInfo request, CallContext context, FlightDescriptor descriptor) {
     return getFlightInfoForSchema(request, descriptor, Schemas.GET_TYPE_INFO_SCHEMA);
   }
 
   @Override
-  public FlightInfo getFlightInfoCatalogs(FlightSql.CommandGetCatalogs request, CallContext context,
-                                          FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoCatalogs(
+      FlightSql.CommandGetCatalogs request, CallContext context, FlightDescriptor descriptor) {
     return getFlightInfoForSchema(request, descriptor, Schemas.GET_CATALOGS_SCHEMA);
   }
 
@@ -541,27 +643,27 @@ public void getStreamCatalogs(CallContext context, ServerStreamListener listener
   }
 
   @Override
-  public FlightInfo getFlightInfoSchemas(FlightSql.CommandGetDbSchemas request, CallContext context,
-                                         FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoSchemas(
+      FlightSql.CommandGetDbSchemas request, CallContext context, FlightDescriptor descriptor) {
     IntegrationAssertions.assertEquals(request.getCatalog(), "catalog");
-    IntegrationAssertions.assertEquals(request.getDbSchemaFilterPattern(),
-        "db_schema_filter_pattern");
+    IntegrationAssertions.assertEquals(
+        request.getDbSchemaFilterPattern(), "db_schema_filter_pattern");
 
     return getFlightInfoForSchema(request, descriptor, Schemas.GET_SCHEMAS_SCHEMA);
   }
 
   @Override
-  public void getStreamSchemas(FlightSql.CommandGetDbSchemas command, CallContext context,
-                               ServerStreamListener listener) {
+  public void getStreamSchemas(
+      FlightSql.CommandGetDbSchemas command, CallContext context, ServerStreamListener listener) {
     putEmptyBatchToStreamListener(listener, Schemas.GET_SCHEMAS_SCHEMA);
   }
 
   @Override
-  public FlightInfo getFlightInfoTables(FlightSql.CommandGetTables request, CallContext context,
-                                        FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoTables(
+      FlightSql.CommandGetTables request, CallContext context, FlightDescriptor descriptor) {
     IntegrationAssertions.assertEquals(request.getCatalog(), "catalog");
-    IntegrationAssertions.assertEquals(request.getDbSchemaFilterPattern(),
-        "db_schema_filter_pattern");
+    IntegrationAssertions.assertEquals(
+        request.getDbSchemaFilterPattern(), "db_schema_filter_pattern");
     IntegrationAssertions.assertEquals(request.getTableNameFilterPattern(), "table_filter_pattern");
     IntegrationAssertions.assertEquals(request.getTableTypesCount(), 2);
     IntegrationAssertions.assertEquals(request.getTableTypes(0), "table");
@@ -571,14 +673,14 @@ public FlightInfo getFlightInfoTables(FlightSql.CommandGetTables request, CallCo
   }
 
   @Override
-  public void getStreamTables(FlightSql.CommandGetTables command, CallContext context,
-                              ServerStreamListener listener) {
+  public void getStreamTables(
+      FlightSql.CommandGetTables command, CallContext context, ServerStreamListener listener) {
     putEmptyBatchToStreamListener(listener, Schemas.GET_TABLES_SCHEMA);
   }
 
   @Override
-  public FlightInfo getFlightInfoTableTypes(FlightSql.CommandGetTableTypes request,
-                                            CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoTableTypes(
+      FlightSql.CommandGetTableTypes request, CallContext context, FlightDescriptor descriptor) {
     return getFlightInfoForSchema(request, descriptor, Schemas.GET_TABLE_TYPES_SCHEMA);
   }
 
@@ -588,8 +690,8 @@ public void getStreamTableTypes(CallContext context, ServerStreamListener listen
   }
 
   @Override
-  public FlightInfo getFlightInfoPrimaryKeys(FlightSql.CommandGetPrimaryKeys request,
-                                             CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoPrimaryKeys(
+      FlightSql.CommandGetPrimaryKeys request, CallContext context, FlightDescriptor descriptor) {
     IntegrationAssertions.assertEquals(request.getCatalog(), "catalog");
     IntegrationAssertions.assertEquals(request.getDbSchema(), "db_schema");
     IntegrationAssertions.assertEquals(request.getTable(), "table");
@@ -598,14 +700,14 @@ public FlightInfo getFlightInfoPrimaryKeys(FlightSql.CommandGetPrimaryKeys reque
   }
 
   @Override
-  public void getStreamPrimaryKeys(FlightSql.CommandGetPrimaryKeys command, CallContext context,
-                                   ServerStreamListener listener) {
+  public void getStreamPrimaryKeys(
+      FlightSql.CommandGetPrimaryKeys command, CallContext context, ServerStreamListener listener) {
     putEmptyBatchToStreamListener(listener, Schemas.GET_PRIMARY_KEYS_SCHEMA);
   }
 
   @Override
-  public FlightInfo getFlightInfoExportedKeys(FlightSql.CommandGetExportedKeys request,
-                                              CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoExportedKeys(
+      FlightSql.CommandGetExportedKeys request, CallContext context, FlightDescriptor descriptor) {
     IntegrationAssertions.assertEquals(request.getCatalog(), "catalog");
     IntegrationAssertions.assertEquals(request.getDbSchema(), "db_schema");
     IntegrationAssertions.assertEquals(request.getTable(), "table");
@@ -614,8 +716,8 @@ public FlightInfo getFlightInfoExportedKeys(FlightSql.CommandGetExportedKeys req
   }
 
   @Override
-  public FlightInfo getFlightInfoImportedKeys(FlightSql.CommandGetImportedKeys request,
-                                              CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoImportedKeys(
+      FlightSql.CommandGetImportedKeys request, CallContext context, FlightDescriptor descriptor) {
     IntegrationAssertions.assertEquals(request.getCatalog(), "catalog");
     IntegrationAssertions.assertEquals(request.getDbSchema(), "db_schema");
     IntegrationAssertions.assertEquals(request.getTable(), "table");
@@ -624,8 +726,10 @@ public FlightInfo getFlightInfoImportedKeys(FlightSql.CommandGetImportedKeys req
   }
 
   @Override
-  public FlightInfo getFlightInfoCrossReference(FlightSql.CommandGetCrossReference request,
-                                                CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoCrossReference(
+      FlightSql.CommandGetCrossReference request,
+      CallContext context,
+      FlightDescriptor descriptor) {
     IntegrationAssertions.assertEquals(request.getPkCatalog(), "pk_catalog");
     IntegrationAssertions.assertEquals(request.getPkDbSchema(), "pk_db_schema");
     IntegrationAssertions.assertEquals(request.getPkTable(), "pk_table");
@@ -637,37 +741,38 @@ public FlightInfo getFlightInfoCrossReference(FlightSql.CommandGetCrossReference
   }
 
   @Override
-  public void getStreamExportedKeys(FlightSql.CommandGetExportedKeys command, CallContext context,
-                                    ServerStreamListener listener) {
+  public void getStreamExportedKeys(
+      FlightSql.CommandGetExportedKeys command,
+      CallContext context,
+      ServerStreamListener listener) {
     putEmptyBatchToStreamListener(listener, Schemas.GET_EXPORTED_KEYS_SCHEMA);
   }
 
   @Override
-  public void getStreamImportedKeys(FlightSql.CommandGetImportedKeys command, CallContext context,
-                                    ServerStreamListener listener) {
+  public void getStreamImportedKeys(
+      FlightSql.CommandGetImportedKeys command,
+      CallContext context,
+      ServerStreamListener listener) {
     putEmptyBatchToStreamListener(listener, Schemas.GET_IMPORTED_KEYS_SCHEMA);
   }
 
   @Override
-  public void getStreamCrossReference(FlightSql.CommandGetCrossReference command,
-                                      CallContext context, ServerStreamListener listener) {
+  public void getStreamCrossReference(
+      FlightSql.CommandGetCrossReference command,
+      CallContext context,
+      ServerStreamListener listener) {
     putEmptyBatchToStreamListener(listener, Schemas.GET_CROSS_REFERENCE_SCHEMA);
   }
 
   @Override
-  public void close() throws Exception {
-
-  }
+  public void close() throws Exception {}
 
   @Override
-  public void listFlights(CallContext context, Criteria criteria,
-                          StreamListener<FlightInfo> listener) {
-
-  }
+  public void listFlights(
+      CallContext context, Criteria criteria, StreamListener<FlightInfo> listener) {}
 
-  private <T extends Message> FlightInfo getFlightInfoForSchema(final T request,
-                                                                final FlightDescriptor descriptor,
-                                                                final Schema schema) {
+  private <T extends Message> FlightInfo getFlightInfoForSchema(
+      final T request, final FlightDescriptor descriptor, final Schema schema) {
     final Ticket ticket = new Ticket(Any.pack(request).toByteArray());
     final List<FlightEndpoint> endpoints = Collections.singletonList(new FlightEndpoint(ticket));
 
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/IntegrationAssertions.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/IntegrationAssertions.java
index 036bcc3811b08..92d4c73f2be87 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/IntegrationAssertions.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/IntegrationAssertions.java
@@ -14,20 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Arrays;
 import java.util.Objects;
-
 import org.apache.arrow.flight.CallStatus;
 import org.apache.arrow.flight.FlightRuntimeException;
 
-/**
- * Utility methods to implement integration tests without using JUnit assertions.
- */
+/** Utility methods to implement integration tests without using JUnit assertions. */
 final class IntegrationAssertions {
 
   /**
@@ -46,42 +42,36 @@ static <T extends Throwable> T assertThrows(Class<T> clazz, AssertThrows body) {
       if (clazz.isInstance(t)) {
         return (T) t;
       }
-      throw new AssertionError("Expected exception of class " + clazz + " but got " + t.getClass(), t);
+      throw new AssertionError(
+          "Expected exception of class " + clazz + " but got " + t.getClass(), t);
     }
     throw new AssertionError("Expected exception of class " + clazz + " but did not throw.");
   }
 
-  /**
-   * Assert that the two (non-array) objects are equal.
-   */
+  /** Assert that the two (non-array) objects are equal. */
   static void assertEquals(Object expected, Object actual) {
     if (!Objects.equals(expected, actual)) {
       throw new AssertionError("Expected:\n" + expected + "\nbut got:\n" + actual);
     }
   }
 
-  /**
-   * Assert that the two arrays are equal.
-   */
+  /** Assert that the two arrays are equal. */
   static void assertEquals(byte[] expected, byte[] actual) {
     if (!Arrays.equals(expected, actual)) {
       throw new AssertionError(
-          String.format("Expected:\n%s\nbut got:\n%s", Arrays.toString(expected), Arrays.toString(actual)));
+          String.format(
+              "Expected:\n%s\nbut got:\n%s", Arrays.toString(expected), Arrays.toString(actual)));
     }
   }
 
-  /**
-   * Assert that the value is false, using the given message as an error otherwise.
-   */
+  /** Assert that the value is false, using the given message as an error otherwise. */
   static void assertFalse(String message, boolean value) {
     if (value) {
       throw new AssertionError("Expected false: " + message);
     }
   }
 
-  /**
-   * Assert that the value is true, using the given message as an error otherwise.
-   */
+  /** Assert that the value is true, using the given message as an error otherwise. */
   static void assertTrue(String message, boolean value) {
     if (!value) {
       throw new AssertionError("Expected true: " + message);
@@ -94,22 +84,18 @@ static void assertNotNull(Object actual) {
     }
   }
 
-  /**
-   * Convert a throwable into a FlightRuntimeException with error details, for debugging.
-   */
+  /** Convert a throwable into a FlightRuntimeException with error details, for debugging. */
   static FlightRuntimeException toFlightRuntimeException(Throwable t) {
     final StringWriter stringWriter = new StringWriter();
     final PrintWriter writer = new PrintWriter(stringWriter);
     t.printStackTrace(writer);
     return CallStatus.UNKNOWN
-            .withCause(t)
-            .withDescription("Unknown error: " + t + "\n. Stack trace:\n" + stringWriter.toString())
-            .toRuntimeException();
+        .withCause(t)
+        .withDescription("Unknown error: " + t + "\n. Stack trace:\n" + stringWriter.toString())
+        .toRuntimeException();
   }
 
-  /**
-   * An interface used with {@link #assertThrows(Class, AssertThrows)}.
-   */
+  /** An interface used with {@link #assertThrows(Class, AssertThrows)}. */
   @FunctionalInterface
   interface AssertThrows {
 
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/IntegrationProducer.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/IntegrationProducer.java
index aed3045accb2f..8cbfa4547e405 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/IntegrationProducer.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/IntegrationProducer.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.nio.ByteBuffer;
@@ -27,7 +26,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.flight.CallStatus;
 import org.apache.arrow.flight.FlightDescriptor;
 import org.apache.arrow.flight.FlightEndpoint;
@@ -81,10 +79,14 @@ public void setLocation(Location location) {
   @Override
   public void getStream(CallContext context, Ticket ticket, ServerStreamListener listener) {
     try {
-      FlightDescriptor descriptor = FlightDescriptor.deserialize(ByteBuffer.wrap(ticket.getBytes()));
+      FlightDescriptor descriptor =
+          FlightDescriptor.deserialize(ByteBuffer.wrap(ticket.getBytes()));
       Dataset dataset = datasets.get(descriptor);
       if (dataset == null) {
-        listener.error(CallStatus.NOT_FOUND.withDescription("Unknown ticket: " + descriptor).toRuntimeException());
+        listener.error(
+            CallStatus.NOT_FOUND
+                .withDescription("Unknown ticket: " + descriptor)
+                .toRuntimeException());
         return;
       }
       dataset.streamTo(allocator, listener);
@@ -97,14 +99,18 @@ public void getStream(CallContext context, Ticket ticket, ServerStreamListener l
   public FlightInfo getFlightInfo(CallContext context, FlightDescriptor descriptor) {
     Dataset h = datasets.get(descriptor);
     if (h == null) {
-      throw CallStatus.NOT_FOUND.withDescription("Unknown descriptor: " + descriptor).toRuntimeException();
+      throw CallStatus.NOT_FOUND
+          .withDescription("Unknown descriptor: " + descriptor)
+          .toRuntimeException();
     }
     return h.getFlightInfo(location);
   }
 
   @Override
-  public Runnable acceptPut(CallContext context,
-      final FlightStream flightStream, final StreamListener<PutResult> ackStream) {
+  public Runnable acceptPut(
+      CallContext context,
+      final FlightStream flightStream,
+      final StreamListener<PutResult> ackStream) {
     return () -> {
       List<ArrowRecordBatch> batches = new ArrayList<>();
       try {
@@ -115,7 +121,8 @@ public Runnable acceptPut(CallContext context,
             batches.add(unloader.getRecordBatch());
           }
           // Closing the stream will release the dictionaries, take ownership
-          final Dataset dataset = new Dataset(
+          final Dataset dataset =
+              new Dataset(
                   flightStream.getDescriptor(),
                   flightStream.getSchema(),
                   flightStream.takeDictionaryOwnership(),
@@ -143,10 +150,11 @@ private static final class Dataset implements AutoCloseable {
     private final DictionaryProvider dictionaryProvider;
     private final List<ArrowRecordBatch> batches;
 
-    private Dataset(FlightDescriptor descriptor,
-                    Schema schema,
-                    DictionaryProvider dictionaryProvider,
-                    List<ArrowRecordBatch> batches) {
+    private Dataset(
+        FlightDescriptor descriptor,
+        Schema schema,
+        DictionaryProvider dictionaryProvider,
+        List<ArrowRecordBatch> batches) {
       this.descriptor = descriptor;
       this.schema = schema;
       this.dictionaryProvider = dictionaryProvider;
@@ -157,20 +165,20 @@ public FlightInfo getFlightInfo(Location location) {
       ByteBuffer serializedDescriptor = descriptor.serialize();
       byte[] descriptorBytes = new byte[serializedDescriptor.remaining()];
       serializedDescriptor.get(descriptorBytes);
-      final List<FlightEndpoint> endpoints = Collections.singletonList(
-              new FlightEndpoint(new Ticket(descriptorBytes), location));
+      final List<FlightEndpoint> endpoints =
+          Collections.singletonList(new FlightEndpoint(new Ticket(descriptorBytes), location));
       return new FlightInfo(
-              messageFormatSchema(),
-              descriptor,
-              endpoints,
-              batches.stream().mapToLong(ArrowRecordBatch::computeBodyLength).sum(),
-              batches.stream().mapToInt(ArrowRecordBatch::getLength).sum());
+          messageFormatSchema(),
+          descriptor,
+          endpoints,
+          batches.stream().mapToLong(ArrowRecordBatch::computeBodyLength).sum(),
+          batches.stream().mapToInt(ArrowRecordBatch::getLength).sum());
     }
 
     private Schema messageFormatSchema() {
       final Set<Long> dictionaryIdsUsed = new HashSet<>();
-      final List<Field> messageFormatFields = schema.getFields()
-              .stream()
+      final List<Field> messageFormatFields =
+          schema.getFields().stream()
               .map(f -> DictionaryUtility.toMessageFormat(f, dictionaryProvider, dictionaryIdsUsed))
               .collect(Collectors.toList());
       return new Schema(messageFormatFields, schema.getCustomMetadata());
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/IntegrationTestClient.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/IntegrationTestClient.java
index 64b5882c0f50d..f40102c1fae87 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/IntegrationTestClient.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/IntegrationTestClient.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
@@ -23,7 +22,6 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-
 import org.apache.arrow.flight.AsyncPutListener;
 import org.apache.arrow.flight.FlightClient;
 import org.apache.arrow.flight.FlightDescriptor;
@@ -49,11 +47,10 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 
-/**
- * A Flight client for integration testing.
- */
+/** A Flight client for integration testing. */
 class IntegrationTestClient {
-  private static final org.slf4j.Logger LOGGER = org.slf4j.LoggerFactory.getLogger(IntegrationTestClient.class);
+  private static final org.slf4j.Logger LOGGER =
+      org.slf4j.LoggerFactory.getLogger(IntegrationTestClient.class);
   private final Options options;
 
   private IntegrationTestClient() {
@@ -92,10 +89,11 @@ private void run(String[] args) throws Exception {
 
     final Location defaultLocation = Location.forGrpcInsecure(host, port);
     try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-         final FlightClient client = FlightClient.builder(allocator, defaultLocation).build()) {
+        final FlightClient client = FlightClient.builder(allocator, defaultLocation).build()) {
 
       if (cmd.hasOption("scenario")) {
-        Scenarios.getScenario(cmd.getOptionValue("scenario")).client(allocator, defaultLocation, client);
+        Scenarios.getScenario(cmd.getOptionValue("scenario"))
+            .client(allocator, defaultLocation, client);
       } else {
         final String inputPath = cmd.getOptionValue("j");
         testStream(allocator, client, inputPath);
@@ -110,23 +108,30 @@ private static void testStream(BufferAllocator allocator, FlightClient client, S
     // 1. Read data from JSON and upload to server.
     FlightDescriptor descriptor = FlightDescriptor.path(inputPath);
     try (JsonFileReader reader = new JsonFileReader(new File(inputPath), allocator);
-         VectorSchemaRoot root = VectorSchemaRoot.create(reader.start(), allocator)) {
-      FlightClient.ClientStreamListener stream = client.startPut(descriptor, root, reader,
-          new AsyncPutListener() {
-            int counter = 0;
-
-            @Override
-            public void onNext(PutResult val) {
-              final byte[] metadataRaw = new byte[checkedCastToInt(val.getApplicationMetadata().readableBytes())];
-              val.getApplicationMetadata().readBytes(metadataRaw);
-              final String metadata = new String(metadataRaw, StandardCharsets.UTF_8);
-              if (!Integer.toString(counter).equals(metadata)) {
-                throw new RuntimeException(
-                    String.format("Invalid ACK from server. Expected '%d' but got '%s'.", counter, metadata));
-              }
-              counter++;
-            }
-          });
+        VectorSchemaRoot root = VectorSchemaRoot.create(reader.start(), allocator)) {
+      FlightClient.ClientStreamListener stream =
+          client.startPut(
+              descriptor,
+              root,
+              reader,
+              new AsyncPutListener() {
+                int counter = 0;
+
+                @Override
+                public void onNext(PutResult val) {
+                  final byte[] metadataRaw =
+                      new byte[checkedCastToInt(val.getApplicationMetadata().readableBytes())];
+                  val.getApplicationMetadata().readBytes(metadataRaw);
+                  final String metadata = new String(metadataRaw, StandardCharsets.UTF_8);
+                  if (!Integer.toString(counter).equals(metadata)) {
+                    throw new RuntimeException(
+                        String.format(
+                            "Invalid ACK from server. Expected '%d' but got '%s'.",
+                            counter, metadata));
+                  }
+                  counter++;
+                }
+              });
       int counter = 0;
       while (reader.read(root)) {
         final byte[] rawMetadata = Integer.toString(counter).getBytes(StandardCharsets.UTF_8);
@@ -168,11 +173,12 @@ public void onNext(PutResult val) {
     }
   }
 
-  private static void testTicket(BufferAllocator allocator, FlightClient readClient, Ticket ticket, String inputPath) {
+  private static void testTicket(
+      BufferAllocator allocator, FlightClient readClient, Ticket ticket, String inputPath) {
     try (FlightStream stream = readClient.getStream(ticket);
-         VectorSchemaRoot root = stream.getRoot();
-         VectorSchemaRoot downloadedRoot = VectorSchemaRoot.create(root.getSchema(), allocator);
-         JsonFileReader reader = new JsonFileReader(new File(inputPath), allocator)) {
+        VectorSchemaRoot root = stream.getRoot();
+        VectorSchemaRoot downloadedRoot = VectorSchemaRoot.create(root.getSchema(), allocator);
+        JsonFileReader reader = new JsonFileReader(new File(inputPath), allocator)) {
       VectorLoader loader = new VectorLoader(downloadedRoot);
       VectorUnloader unloader = new VectorUnloader(root);
 
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/IntegrationTestServer.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/IntegrationTestServer.java
index 6e22eb1ec3131..d6e53cd427c73 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/IntegrationTestServer.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/IntegrationTestServer.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import org.apache.arrow.flight.FlightServer;
@@ -28,11 +27,10 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 
-/**
- * Flight server for integration testing.
- */
+/** Flight server for integration testing. */
 class IntegrationTestServer {
-  private static final org.slf4j.Logger LOGGER = org.slf4j.LoggerFactory.getLogger(IntegrationTestServer.class);
+  private static final org.slf4j.Logger LOGGER =
+      org.slf4j.LoggerFactory.getLogger(IntegrationTestServer.class);
   private final Options options;
 
   private IntegrationTestServer() {
@@ -48,7 +46,8 @@ private void run(String[] args) throws Exception {
     final Location location = Location.forGrpcInsecure("localhost", port);
 
     final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-    final FlightServer.Builder builder = FlightServer.builder().allocator(allocator).location(location);
+    final FlightServer.Builder builder =
+        FlightServer.builder().allocator(allocator).location(location);
 
     final FlightServer server;
     if (cmd.hasOption("scenario")) {
@@ -64,14 +63,17 @@ private void run(String[] args) throws Exception {
     // Print out message for integration test script
     System.out.println("Server listening on localhost:" + server.getPort());
 
-    Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-      try {
-        System.out.println("\nExiting...");
-        AutoCloseables.close(server, allocator);
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
-    }));
+    Runtime.getRuntime()
+        .addShutdownHook(
+            new Thread(
+                () -> {
+                  try {
+                    System.out.println("\nExiting...");
+                    AutoCloseables.close(server, allocator);
+                  } catch (Exception e) {
+                    e.printStackTrace();
+                  }
+                }));
 
     server.awaitTermination();
   }
@@ -92,5 +94,4 @@ private static void fatalError(String message, Throwable e) {
     LOGGER.error(message, e);
     System.exit(1);
   }
-
 }
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/LocationReuseConnectionScenario.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/LocationReuseConnectionScenario.java
index 7ffd09c5bf4e8..0f6154ccd7071 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/LocationReuseConnectionScenario.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/LocationReuseConnectionScenario.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.flight.FlightClient;
 import org.apache.arrow.flight.FlightDescriptor;
 import org.apache.arrow.flight.FlightEndpoint;
@@ -41,13 +39,13 @@ public FlightProducer producer(BufferAllocator allocator, Location location) thr
   }
 
   @Override
-  public void buildServer(FlightServer.Builder builder) throws Exception {
-  }
+  public void buildServer(FlightServer.Builder builder) throws Exception {}
 
   @Override
   public void client(BufferAllocator allocator, Location location, FlightClient client)
       throws Exception {
-    final FlightInfo info = client.getInfo(FlightDescriptor.command("reuse".getBytes(StandardCharsets.UTF_8)));
+    final FlightInfo info =
+        client.getInfo(FlightDescriptor.command("reuse".getBytes(StandardCharsets.UTF_8)));
     IntegrationAssertions.assertEquals(1, info.getEndpoints().size());
     IntegrationAssertions.assertEquals(1, info.getEndpoints().get(0).getLocations().size());
     Location actual = info.getEndpoints().get(0).getLocations().get(0);
@@ -57,7 +55,8 @@ public void client(BufferAllocator allocator, Location location, FlightClient cl
   private static class ReuseConnectionProducer extends NoOpFlightProducer {
     @Override
     public FlightInfo getFlightInfo(CallContext context, FlightDescriptor descriptor) {
-      List<FlightEndpoint> endpoints = Collections.singletonList(
+      List<FlightEndpoint> endpoints =
+          Collections.singletonList(
               new FlightEndpoint(new Ticket(new byte[0]), Location.reuseConnection()));
       return new FlightInfo(
           new Schema(Collections.emptyList()), descriptor, endpoints, /*bytes*/ -1, /*records*/ -1);
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/MiddlewareScenario.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/MiddlewareScenario.java
index c284a577c08f2..ee1ac8ada2701 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/MiddlewareScenario.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/MiddlewareScenario.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collections;
-
 import org.apache.arrow.flight.CallHeaders;
 import org.apache.arrow.flight.CallInfo;
 import org.apache.arrow.flight.CallStatus;
@@ -39,9 +37,9 @@
 import org.apache.arrow.vector.types.pojo.Schema;
 
 /**
- * Test an edge case in middleware: gRPC-Java consolidates headers and trailers if a call fails immediately. On the
- * gRPC implementation side, we need to watch for this, or else we'll have a call with "no headers" if we only look
- * for headers.
+ * Test an edge case in middleware: gRPC-Java consolidates headers and trailers if a call fails
+ * immediately. On the gRPC implementation side, we need to watch for this, or else we'll have a
+ * call with "no headers" if we only look for headers.
  */
 final class MiddlewareScenario implements Scenario {
 
@@ -56,7 +54,8 @@ public FlightProducer producer(BufferAllocator allocator, Location location) {
       public FlightInfo getFlightInfo(CallContext context, FlightDescriptor descriptor) {
         if (descriptor.isCommand()) {
           if (Arrays.equals(COMMAND_SUCCESS, descriptor.getCommand())) {
-            return new FlightInfo(new Schema(Collections.emptyList()), descriptor, Collections.emptyList(), -1, -1);
+            return new FlightInfo(
+                new Schema(Collections.emptyList()), descriptor, Collections.emptyList(), -1, -1);
           }
         }
         throw CallStatus.UNIMPLEMENTED.toRuntimeException();
@@ -66,22 +65,26 @@ public FlightInfo getFlightInfo(CallContext context, FlightDescriptor descriptor
 
   @Override
   public void buildServer(FlightServer.Builder builder) {
-    builder.middleware(FlightServerMiddleware.Key.of("test"), new InjectingServerMiddleware.Factory());
+    builder.middleware(
+        FlightServerMiddleware.Key.of("test"), new InjectingServerMiddleware.Factory());
   }
 
   @Override
-  public void client(BufferAllocator allocator, Location location, FlightClient ignored) throws Exception {
+  public void client(BufferAllocator allocator, Location location, FlightClient ignored)
+      throws Exception {
     final ExtractingClientMiddleware.Factory factory = new ExtractingClientMiddleware.Factory();
-    try (final FlightClient client = FlightClient.builder(allocator, location).intercept(factory).build()) {
+    try (final FlightClient client =
+        FlightClient.builder(allocator, location).intercept(factory).build()) {
       // Should fail immediately
-      IntegrationAssertions.assertThrows(FlightRuntimeException.class,
+      IntegrationAssertions.assertThrows(
+          FlightRuntimeException.class,
           () -> client.getInfo(FlightDescriptor.command(new byte[0])));
       if (!EXPECTED_HEADER_VALUE.equals(factory.extractedHeader)) {
         throw new AssertionError(
-            "Expected to extract the header value '" +
-                EXPECTED_HEADER_VALUE +
-                "', but found: " +
-                factory.extractedHeader);
+            "Expected to extract the header value '"
+                + EXPECTED_HEADER_VALUE
+                + "', but found: "
+                + factory.extractedHeader);
       }
 
       // Should not fail
@@ -89,10 +92,10 @@ public void client(BufferAllocator allocator, Location location, FlightClient ig
       client.getInfo(FlightDescriptor.command(COMMAND_SUCCESS));
       if (!EXPECTED_HEADER_VALUE.equals(factory.extractedHeader)) {
         throw new AssertionError(
-            "Expected to extract the header value '" +
-                EXPECTED_HEADER_VALUE +
-                "', but found: " +
-                factory.extractedHeader);
+            "Expected to extract the header value '"
+                + EXPECTED_HEADER_VALUE
+                + "', but found: "
+                + factory.extractedHeader);
       }
     }
   }
@@ -112,19 +115,17 @@ public void onBeforeSendingHeaders(CallHeaders outgoingHeaders) {
     }
 
     @Override
-    public void onCallCompleted(CallStatus status) {
-    }
+    public void onCallCompleted(CallStatus status) {}
 
     @Override
-    public void onCallErrored(Throwable err) {
-    }
+    public void onCallErrored(Throwable err) {}
 
     /** The factory for the server middleware. */
     static class Factory implements FlightServerMiddleware.Factory<InjectingServerMiddleware> {
 
       @Override
-      public InjectingServerMiddleware onCallStarted(CallInfo info, CallHeaders incomingHeaders,
-          RequestContext context) {
+      public InjectingServerMiddleware onCallStarted(
+          CallInfo info, CallHeaders incomingHeaders, RequestContext context) {
         String incoming = incomingHeaders.get(HEADER);
         return new InjectingServerMiddleware(incoming == null ? "" : incoming);
       }
@@ -151,8 +152,7 @@ public void onHeadersReceived(CallHeaders incomingHeaders) {
     }
 
     @Override
-    public void onCallCompleted(CallStatus status) {
-    }
+    public void onCallCompleted(CallStatus status) {}
 
     /** The factory for the client middleware. */
     static class Factory implements FlightClientMiddleware.Factory {
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/OrderedScenario.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/OrderedScenario.java
index 13238f318eaaa..0e08a8afa3e09 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/OrderedScenario.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/OrderedScenario.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.nio.charset.StandardCharsets;
@@ -22,7 +21,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-
 import org.apache.arrow.flight.CallStatus;
 import org.apache.arrow.flight.FlightClient;
 import org.apache.arrow.flight.FlightDescriptor;
@@ -55,8 +53,7 @@ public FlightProducer producer(BufferAllocator allocator, Location location) thr
   }
 
   @Override
-  public void buildServer(FlightServer.Builder builder) throws Exception {
-  }
+  public void buildServer(FlightServer.Builder builder) throws Exception {}
 
   @Override
   public void client(BufferAllocator allocator, Location location, FlightClient client)
@@ -125,7 +122,8 @@ public void getStream(CallContext context, Ticket ticket, ServerStreamListener l
           listener.error(
               CallStatus.INVALID_ARGUMENT
                   .withDescription(
-                      "Could not find flight: " + new String(ticket.getBytes(), StandardCharsets.UTF_8))
+                      "Could not find flight: "
+                          + new String(ticket.getBytes(), StandardCharsets.UTF_8))
                   .toRuntimeException());
           return;
         }
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/PollFlightInfoProducer.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/PollFlightInfoProducer.java
index 61312db56bc61..c01f46cde06fc 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/PollFlightInfoProducer.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/PollFlightInfoProducer.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.nio.charset.StandardCharsets;
@@ -23,7 +22,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.flight.FlightDescriptor;
 import org.apache.arrow.flight.FlightEndpoint;
 import org.apache.arrow.flight.FlightInfo;
@@ -40,17 +38,22 @@ class PollFlightInfoProducer extends NoOpFlightProducer {
 
   @Override
   public PollInfo pollFlightInfo(CallContext context, FlightDescriptor descriptor) {
-    Schema schema = new Schema(
-        Collections.singletonList(Field.notNullable("number", Types.MinorType.UINT4.getType())));
-    List<FlightEndpoint> endpoints = Collections.singletonList(
-        new FlightEndpoint(
-            new Ticket("long-running query".getBytes(StandardCharsets.UTF_8))));
-    FlightInfo info = new FlightInfo(schema, descriptor, endpoints, -1, -1 );
+    Schema schema =
+        new Schema(
+            Collections.singletonList(
+                Field.notNullable("number", Types.MinorType.UINT4.getType())));
+    List<FlightEndpoint> endpoints =
+        Collections.singletonList(
+            new FlightEndpoint(new Ticket("long-running query".getBytes(StandardCharsets.UTF_8))));
+    FlightInfo info = new FlightInfo(schema, descriptor, endpoints, -1, -1);
     if (descriptor.isCommand() && Arrays.equals(descriptor.getCommand(), POLL_DESCRIPTOR)) {
       return new PollInfo(info, null, 1.0, null);
     } else {
       return new PollInfo(
-          info, FlightDescriptor.command(POLL_DESCRIPTOR), 0.1, Instant.now().plus(10, ChronoUnit.SECONDS));
+          info,
+          FlightDescriptor.command(POLL_DESCRIPTOR),
+          0.1,
+          Instant.now().plus(10, ChronoUnit.SECONDS));
     }
   }
 }
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/PollFlightInfoScenario.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/PollFlightInfoScenario.java
index 1ffbe3c726216..0282ba76ccd69 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/PollFlightInfoScenario.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/PollFlightInfoScenario.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Optional;
-
 import org.apache.arrow.flight.FlightClient;
 import org.apache.arrow.flight.FlightDescriptor;
 import org.apache.arrow.flight.FlightProducer;
@@ -36,27 +34,31 @@ public FlightProducer producer(BufferAllocator allocator, Location location) thr
   }
 
   @Override
-  public void buildServer(FlightServer.Builder builder) throws Exception {
-  }
+  public void buildServer(FlightServer.Builder builder) throws Exception {}
 
   @Override
-  public void client(BufferAllocator allocator, Location location, FlightClient client) throws Exception {
-    PollInfo info = client.pollInfo(FlightDescriptor.command("heavy query".getBytes(StandardCharsets.UTF_8)));
+  public void client(BufferAllocator allocator, Location location, FlightClient client)
+      throws Exception {
+    PollInfo info =
+        client.pollInfo(FlightDescriptor.command("heavy query".getBytes(StandardCharsets.UTF_8)));
     IntegrationAssertions.assertNotNull(info.getFlightInfo());
     Optional<Double> progress = info.getProgress();
     IntegrationAssertions.assertTrue("progress is missing", progress.isPresent());
-    IntegrationAssertions.assertTrue("progress is invalid", progress.get() >= 0.0 && progress.get() <= 1.0);
+    IntegrationAssertions.assertTrue(
+        "progress is invalid", progress.get() >= 0.0 && progress.get() <= 1.0);
     IntegrationAssertions.assertTrue("expiration is missing", info.getExpirationTime().isPresent());
-    IntegrationAssertions.assertTrue("descriptor is missing",
-        info.getFlightDescriptor().isPresent());
+    IntegrationAssertions.assertTrue(
+        "descriptor is missing", info.getFlightDescriptor().isPresent());
 
     info = client.pollInfo(info.getFlightDescriptor().get());
     IntegrationAssertions.assertNotNull(info.getFlightInfo());
     progress = info.getProgress();
     IntegrationAssertions.assertTrue("progress is missing in finished query", progress.isPresent());
-    IntegrationAssertions.assertTrue("progress isn't 1.0 in finished query",
-        Math.abs(progress.get() - 1.0) < Math.ulp(1.0));
-    IntegrationAssertions.assertFalse("expiration is set in finished query", info.getExpirationTime().isPresent());
-    IntegrationAssertions.assertFalse("descriptor is set in finished query", info.getFlightDescriptor().isPresent());
+    IntegrationAssertions.assertTrue(
+        "progress isn't 1.0 in finished query", Math.abs(progress.get() - 1.0) < Math.ulp(1.0));
+    IntegrationAssertions.assertFalse(
+        "expiration is set in finished query", info.getExpirationTime().isPresent());
+    IntegrationAssertions.assertFalse(
+        "descriptor is set in finished query", info.getFlightDescriptor().isPresent());
   }
 }
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/Scenario.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/Scenario.java
index bcc657b765c77..23f3375c2077c 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/Scenario.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/Scenario.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import org.apache.arrow.flight.FlightClient;
@@ -23,23 +22,15 @@
 import org.apache.arrow.flight.Location;
 import org.apache.arrow.memory.BufferAllocator;
 
-/**
- * A particular scenario in integration testing.
- */
+/** A particular scenario in integration testing. */
 interface Scenario {
 
-  /**
-   * Construct the FlightProducer for a server in this scenario.
-   */
+  /** Construct the FlightProducer for a server in this scenario. */
   FlightProducer producer(BufferAllocator allocator, Location location) throws Exception;
 
-  /**
-   * Set any other server options.
-   */
+  /** Set any other server options. */
   void buildServer(FlightServer.Builder builder) throws Exception;
 
-  /**
-   * Run as the client in the scenario.
-   */
+  /** Run as the client in the scenario. */
   void client(BufferAllocator allocator, Location location, FlightClient client) throws Exception;
 }
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/Scenarios.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/Scenarios.java
index 5ce82e712ab77..a294902a26d35 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/Scenarios.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/Scenarios.java
@@ -14,23 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
-
 import org.apache.arrow.flight.FlightClient;
 import org.apache.arrow.flight.FlightServer;
 import org.apache.arrow.flight.Location;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 
-/**
- * Scenarios for integration testing.
- */
+/** Scenarios for integration testing. */
 final class Scenarios {
 
   private static Scenarios INSTANCE;
@@ -40,8 +36,10 @@ final class Scenarios {
   private Scenarios() {
     scenarios = new TreeMap<>();
     scenarios.put("auth:basic_proto", AuthBasicProtoScenario::new);
-    scenarios.put("expiration_time:cancel_flight_info", ExpirationTimeCancelFlightInfoScenario::new);
-    scenarios.put("expiration_time:renew_flight_endpoint", ExpirationTimeRenewFlightEndpointScenario::new);
+    scenarios.put(
+        "expiration_time:cancel_flight_info", ExpirationTimeCancelFlightInfoScenario::new);
+    scenarios.put(
+        "expiration_time:renew_flight_endpoint", ExpirationTimeRenewFlightEndpointScenario::new);
     scenarios.put("expiration_time:do_get", ExpirationTimeDoGetScenario::new);
     scenarios.put("expiration_time:list_actions", ExpirationTimeListActionsScenario::new);
     scenarios.put("location:reuse_connection", LocationReuseConnectionScenario::new);
@@ -78,8 +76,8 @@ public static void main(String[] args) {
       System.out.println("Running test scenario: " + entry.getKey());
       final Scenario scenario = entry.getValue().get();
       try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE)) {
-        final FlightServer.Builder builder = FlightServer
-            .builder(allocator, location, scenario.producer(allocator, location));
+        final FlightServer.Builder builder =
+            FlightServer.builder(allocator, location, scenario.producer(allocator, location));
         scenario.buildServer(builder);
         try (final FlightServer server = builder.build()) {
           server.start();
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/SessionOptionsProducer.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/SessionOptionsProducer.java
index 6bd3f8ddf8592..788419deb0ff2 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/SessionOptionsProducer.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/SessionOptionsProducer.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.arrow.flight.CloseSessionRequest;
 import org.apache.arrow.flight.CloseSessionResult;
 import org.apache.arrow.flight.FlightRuntimeException;
@@ -33,10 +31,11 @@
 import org.apache.arrow.flight.SetSessionOptionsResult;
 import org.apache.arrow.flight.sql.NoOpFlightSqlProducer;
 
-/** The server used for testing Sessions.
- * <p>
- * SetSessionOptions(), GetSessionOptions(), and CloseSession() operate on a
- * simple SessionOptionValue store.
+/**
+ * The server used for testing Sessions.
+ *
+ * <p>SetSessionOptions(), GetSessionOptions(), and CloseSession() operate on a simple
+ * SessionOptionValue store.
  */
 final class SessionOptionsProducer extends NoOpFlightSqlProducer {
   private static final SessionOptionValue invalidOptionValue =
@@ -48,8 +47,10 @@ final class SessionOptionsProducer extends NoOpFlightSqlProducer {
   }
 
   @Override
-  public void setSessionOptions(SetSessionOptionsRequest request, CallContext context,
-                         StreamListener<SetSessionOptionsResult> listener) {
+  public void setSessionOptions(
+      SetSessionOptionsRequest request,
+      CallContext context,
+      StreamListener<SetSessionOptionsResult> listener) {
     Map<String, SetSessionOptionsResult.Error> errors = new HashMap();
 
     ServerSessionMiddleware middleware = context.getMiddleware(sessionMiddlewareKey);
@@ -57,14 +58,16 @@ public void setSessionOptions(SetSessionOptionsRequest request, CallContext cont
     for (Map.Entry<String, SessionOptionValue> entry : request.getSessionOptions().entrySet()) {
       // Blacklisted option name
       if (entry.getKey().equals("lol_invalid")) {
-        errors.put(entry.getKey(),
+        errors.put(
+            entry.getKey(),
             new SetSessionOptionsResult.Error(SetSessionOptionsResult.ErrorValue.INVALID_NAME));
         continue;
       }
       // Blacklisted option value
       // Recommend using a visitor to check polymorphic equality, but this check is easy
       if (entry.getValue().equals(invalidOptionValue)) {
-        errors.put(entry.getKey(),
+        errors.put(
+            entry.getKey(),
             new SetSessionOptionsResult.Error(SetSessionOptionsResult.ErrorValue.INVALID_VALUE));
         continue;
       }
@@ -80,17 +83,22 @@ public void setSessionOptions(SetSessionOptionsRequest request, CallContext cont
   }
 
   @Override
-  public void getSessionOptions(GetSessionOptionsRequest request, CallContext context,
-                         StreamListener<GetSessionOptionsResult> listener) {
+  public void getSessionOptions(
+      GetSessionOptionsRequest request,
+      CallContext context,
+      StreamListener<GetSessionOptionsResult> listener) {
     ServerSessionMiddleware middleware = context.getMiddleware(sessionMiddlewareKey);
-    final Map<String, SessionOptionValue> sessionOptions = middleware.getSession().getSessionOptions();
+    final Map<String, SessionOptionValue> sessionOptions =
+        middleware.getSession().getSessionOptions();
     listener.onNext(new GetSessionOptionsResult(sessionOptions));
     listener.onCompleted();
   }
 
   @Override
-  public void closeSession(CloseSessionRequest request, CallContext context,
-                    StreamListener<CloseSessionResult> listener) {
+  public void closeSession(
+      CloseSessionRequest request,
+      CallContext context,
+      StreamListener<CloseSessionResult> listener) {
     ServerSessionMiddleware middleware = context.getMiddleware(sessionMiddlewareKey);
     try {
       middleware.closeSession();
diff --git a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/SessionOptionsScenario.java b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/SessionOptionsScenario.java
index c150cfa6ef137..76d5ce1509b00 100644
--- a/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/SessionOptionsScenario.java
+++ b/java/flight/flight-integration-tests/src/main/java/org/apache/arrow/flight/integration/tests/SessionOptionsScenario.java
@@ -14,11 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
+import com.google.common.collect.ImmutableMap;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import org.apache.arrow.flight.FlightClient;
 import org.apache.arrow.flight.FlightProducer;
 import org.apache.arrow.flight.FlightServer;
@@ -35,11 +34,7 @@
 import org.apache.arrow.flight.sql.FlightSqlClient;
 import org.apache.arrow.memory.BufferAllocator;
 
-import com.google.common.collect.ImmutableMap;
-
-/**
- * Scenario to exercise Session Options functionality.
- */
+/** Scenario to exercise Session Options functionality. */
 final class SessionOptionsScenario implements Scenario {
   private final FlightServerMiddleware.Key<ServerSessionMiddleware> key =
       FlightServerMiddleware.Key.of("sessionmiddleware");
@@ -52,55 +47,82 @@ public FlightProducer producer(BufferAllocator allocator, Location location) thr
   @Override
   public void buildServer(FlightServer.Builder builder) {
     AtomicInteger counter = new AtomicInteger(1000);
-    builder.middleware(key, new ServerSessionMiddleware.Factory(() -> String.valueOf(counter.getAndIncrement())));
+    builder.middleware(
+        key, new ServerSessionMiddleware.Factory(() -> String.valueOf(counter.getAndIncrement())));
   }
 
   @Override
-  public void client(BufferAllocator allocator, Location location, FlightClient ignored) throws Exception {
+  public void client(BufferAllocator allocator, Location location, FlightClient ignored)
+      throws Exception {
     final ClientCookieMiddleware.Factory factory = new ClientCookieMiddleware.Factory();
-    try (final FlightClient flightClient = FlightClient.builder(allocator, location).intercept(factory).build()) {
+    try (final FlightClient flightClient =
+        FlightClient.builder(allocator, location).intercept(factory).build()) {
       final FlightSqlClient client = new FlightSqlClient(flightClient);
 
       // Set
-      SetSessionOptionsRequest req1 = new SetSessionOptionsRequest(ImmutableMap.<String, SessionOptionValue>builder()
-          .put("foolong", SessionOptionValueFactory.makeSessionOptionValue(123L))
-          .put("bardouble", SessionOptionValueFactory.makeSessionOptionValue(456.0))
-          .put("lol_invalid", SessionOptionValueFactory.makeSessionOptionValue("this won't get set"))
-          .put("key_with_invalid_value", SessionOptionValueFactory.makeSessionOptionValue("lol_invalid"))
-          .put("big_ol_string_list", SessionOptionValueFactory.makeSessionOptionValue(
-              new String[]{"a", "b", "sea", "dee", " ", "  ", "geee", "(づ｡◕‿‿◕｡)づ"}))
-          .build());
+      SetSessionOptionsRequest req1 =
+          new SetSessionOptionsRequest(
+              ImmutableMap.<String, SessionOptionValue>builder()
+                  .put("foolong", SessionOptionValueFactory.makeSessionOptionValue(123L))
+                  .put("bardouble", SessionOptionValueFactory.makeSessionOptionValue(456.0))
+                  .put(
+                      "lol_invalid",
+                      SessionOptionValueFactory.makeSessionOptionValue("this won't get set"))
+                  .put(
+                      "key_with_invalid_value",
+                      SessionOptionValueFactory.makeSessionOptionValue("lol_invalid"))
+                  .put(
+                      "big_ol_string_list",
+                      SessionOptionValueFactory.makeSessionOptionValue(
+                          new String[] {"a", "b", "sea", "dee", " ", "  ", "geee", "(づ｡◕‿‿◕｡)づ"}))
+                  .build());
       SetSessionOptionsResult res1 = client.setSessionOptions(req1);
       // Some errors
-      IntegrationAssertions.assertEquals(ImmutableMap.<String, SetSessionOptionsResult.Error>builder()
-            .put("lol_invalid", new SetSessionOptionsResult.Error(SetSessionOptionsResult.ErrorValue.INVALID_NAME))
-            .put("key_with_invalid_value", new SetSessionOptionsResult.Error(
-                SetSessionOptionsResult.ErrorValue.INVALID_VALUE))
-            .build(),
+      IntegrationAssertions.assertEquals(
+          ImmutableMap.<String, SetSessionOptionsResult.Error>builder()
+              .put(
+                  "lol_invalid",
+                  new SetSessionOptionsResult.Error(
+                      SetSessionOptionsResult.ErrorValue.INVALID_NAME))
+              .put(
+                  "key_with_invalid_value",
+                  new SetSessionOptionsResult.Error(
+                      SetSessionOptionsResult.ErrorValue.INVALID_VALUE))
+              .build(),
           res1.getErrors());
       // Some set, some omitted due to above errors
       GetSessionOptionsResult res2 = client.getSessionOptions(new GetSessionOptionsRequest());
-      IntegrationAssertions.assertEquals(ImmutableMap.<String, SessionOptionValue>builder()
-            .put("foolong", SessionOptionValueFactory.makeSessionOptionValue(123L))
-            .put("bardouble", SessionOptionValueFactory.makeSessionOptionValue(456.0))
-            .put("big_ol_string_list", SessionOptionValueFactory.makeSessionOptionValue(
-                new String[]{"a", "b", "sea", "dee", " ", "  ", "geee", "(づ｡◕‿‿◕｡)づ"}))
-            .build(),
+      IntegrationAssertions.assertEquals(
+          ImmutableMap.<String, SessionOptionValue>builder()
+              .put("foolong", SessionOptionValueFactory.makeSessionOptionValue(123L))
+              .put("bardouble", SessionOptionValueFactory.makeSessionOptionValue(456.0))
+              .put(
+                  "big_ol_string_list",
+                  SessionOptionValueFactory.makeSessionOptionValue(
+                      new String[] {"a", "b", "sea", "dee", " ", "  ", "geee", "(づ｡◕‿‿◕｡)づ"}))
+              .build(),
           res2.getSessionOptions());
       // Update
-      client.setSessionOptions(new SetSessionOptionsRequest(ImmutableMap.<String, SessionOptionValue>builder()
-          // Delete
-          .put("foolong", SessionOptionValueFactory.makeEmptySessionOptionValue())
-          // Update
-          .put("big_ol_string_list",
-              SessionOptionValueFactory.makeSessionOptionValue("a,b,sea,dee, ,  ,geee,(づ｡◕‿‿◕｡)づ"))
-          .build()));
+      client.setSessionOptions(
+          new SetSessionOptionsRequest(
+              ImmutableMap.<String, SessionOptionValue>builder()
+                  // Delete
+                  .put("foolong", SessionOptionValueFactory.makeEmptySessionOptionValue())
+                  // Update
+                  .put(
+                      "big_ol_string_list",
+                      SessionOptionValueFactory.makeSessionOptionValue(
+                          "a,b,sea,dee, ,  ,geee,(づ｡◕‿‿◕｡)づ"))
+                  .build()));
       GetSessionOptionsResult res4 = client.getSessionOptions(new GetSessionOptionsRequest());
-      IntegrationAssertions.assertEquals(ImmutableMap.<String, SessionOptionValue>builder()
-            .put("bardouble", SessionOptionValueFactory.makeSessionOptionValue(456.0))
-            .put("big_ol_string_list",
-                SessionOptionValueFactory.makeSessionOptionValue("a,b,sea,dee, ,  ,geee,(づ｡◕‿‿◕｡)づ"))
-            .build(),
+      IntegrationAssertions.assertEquals(
+          ImmutableMap.<String, SessionOptionValue>builder()
+              .put("bardouble", SessionOptionValueFactory.makeSessionOptionValue(456.0))
+              .put(
+                  "big_ol_string_list",
+                  SessionOptionValueFactory.makeSessionOptionValue(
+                      "a,b,sea,dee, ,  ,geee,(づ｡◕‿‿◕｡)づ"))
+              .build(),
           res4.getSessionOptions());
     }
   }
diff --git a/java/flight/flight-integration-tests/src/test/java/org/apache/arrow/flight/integration/tests/IntegrationTest.java b/java/flight/flight-integration-tests/src/test/java/org/apache/arrow/flight/integration/tests/IntegrationTest.java
index 40aceb336e0ea..bdf1c43ce9da6 100644
--- a/java/flight/flight-integration-tests/src/test/java/org/apache/arrow/flight/integration/tests/IntegrationTest.java
+++ b/java/flight/flight-integration-tests/src/test/java/org/apache/arrow/flight/integration/tests/IntegrationTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.integration.tests;
 
 import org.apache.arrow.flight.FlightClient;
@@ -24,9 +23,7 @@
 import org.apache.arrow.memory.RootAllocator;
 import org.junit.jupiter.api.Test;
 
-/**
- * Run the integration test scenarios in-process.
- */
+/** Run the integration test scenarios in-process. */
 class IntegrationTest {
   @Test
   void authBasicProto() throws Exception {
@@ -95,9 +92,10 @@ void sessionOptions() throws Exception {
 
   void testScenario(String scenarioName) throws Exception {
     try (final BufferAllocator allocator = new RootAllocator()) {
-      final FlightServer.Builder builder = FlightServer.builder()
-          .allocator(allocator)
-          .location(Location.forGrpcInsecure("0.0.0.0", 0));
+      final FlightServer.Builder builder =
+          FlightServer.builder()
+              .allocator(allocator)
+              .location(Location.forGrpcInsecure("0.0.0.0", 0));
       final Scenario scenario = Scenarios.getScenario(scenarioName);
       scenario.buildServer(builder);
       builder.producer(scenario.producer(allocator, Location.forGrpcInsecure("0.0.0.0", 0)));
diff --git a/java/flight/flight-sql-jdbc-core/pom.xml b/java/flight/flight-sql-jdbc-core/pom.xml
index 20996d7496c05..5f7bd63f8f935 100644
--- a/java/flight/flight-sql-jdbc-core/pom.xml
+++ b/java/flight/flight-sql-jdbc-core/pom.xml
@@ -1,176 +1,162 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>arrow-flight</artifactId>
-        <groupId>org.apache.arrow</groupId>
-        <version>16.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>flight-sql-jdbc-core</artifactId>
-    <name>Arrow Flight SQL JDBC Driver Core</name>
-    <description>Core implementation of JDBC driver based on Arrow Flight SQL.</description>
-    <packaging>jar</packaging>
-    <url>https://arrow.apache.org</url>
-
-    <properties>
-        <org.apache.arrow.flight.name>${project.parent.groupId}:${project.parent.artifactId}</org.apache.arrow.flight.name>
-        <org.apache.arrow.flight.version>${project.parent.version}</org.apache.arrow.flight.version>
-        <org.apache.arrow.flight.jdbc-driver.name>${project.name}</org.apache.arrow.flight.jdbc-driver.name>
-        <org.apache.arrow.flight.jdbc-driver.version>${project.version}</org.apache.arrow.flight.jdbc-driver.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>flight-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>netty-transport-native-kqueue</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>netty-transport-native-epoll</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-core -->
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-memory-core</artifactId>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-netty -->
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-memory-netty</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-vector -->
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-vector</artifactId>
-            <classifier>${arrow.vector.classifier}</classifier>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <version>2.2</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.15.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito.core.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <version>${mockito.inline.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-common</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>flight-sql</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.calcite.avatica</groupId>
-            <artifactId>avatica</artifactId>
-            <version>1.24.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.70</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <enableAssertions>false</enableAssertions>
-                    <systemPropertyVariables>
-                        <arrow.test.dataRoot>${project.basedir}/../../../testing/data</arrow.test.dataRoot>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>properties-maven-plugin</artifactId>
-                <version>1.2.1</version>
-                <executions>
-                    <execution>
-                        <id>write-project-properties-to-file</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>write-project-properties</goal>
-                        </goals>
-                        <configuration>
-                            <outputFile>src/main/resources/properties/flight.properties</outputFile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+<!--
+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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.arrow</groupId>
+    <artifactId>arrow-flight</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>flight-sql-jdbc-core</artifactId>
+  <packaging>jar</packaging>
+  <name>Arrow Flight SQL JDBC Driver Core</name>
+  <description>Core implementation of JDBC driver based on Arrow Flight SQL.</description>
+  <url>https://arrow.apache.org</url>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>flight-core</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport-native-kqueue</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>io.netty</groupId>
+          <artifactId>netty-transport-native-epoll</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-memory-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-memory-netty</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-vector</artifactId>
+      <classifier>${arrow.vector.classifier}</classifier>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.16.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>${mockito.core.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-inline</artifactId>
+      <version>${mockito.inline.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>flight-sql</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.calcite.avatica</groupId>
+      <artifactId>avatica</artifactId>
+      <version>1.25.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <version>1.78.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>3.0.2</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <resources>
+      <resource>
+        <filtering>true</filtering>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <enableAssertions>false</enableAssertions>
+          <systemPropertyVariables>
+            <arrow.test.dataRoot>${project.basedir}/../../../testing/data</arrow.test.dataRoot>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowDatabaseMetadata.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowDatabaseMetadata.java
index d68b8070e2bb7..3f072d071b047 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowDatabaseMetadata.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowDatabaseMetadata.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import static java.sql.Types.BIGINT;
@@ -35,6 +34,7 @@
 import static java.sql.Types.VARCHAR;
 import static org.apache.arrow.flight.sql.util.SqlInfoOptionsUtils.doesBitmaskTranslateToEnum;
 
+import com.google.protobuf.ProtocolMessageEnum;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.channels.Channels;
@@ -49,10 +49,10 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.driver.jdbc.utils.SqlTypes;
 import org.apache.arrow.driver.jdbc.utils.VectorSchemaRootTransformer;
 import org.apache.arrow.flight.FlightInfo;
@@ -85,11 +85,7 @@
 import org.apache.calcite.avatica.AvaticaConnection;
 import org.apache.calcite.avatica.AvaticaDatabaseMetaData;
 
-import com.google.protobuf.ProtocolMessageEnum;
-
-/**
- * Arrow Flight JDBC's implementation of {@link DatabaseMetaData}.
- */
+/** Arrow Flight JDBC's implementation of {@link DatabaseMetaData}. */
 public class ArrowDatabaseMetadata extends AvaticaDatabaseMetaData {
   private static final String JAVA_REGEX_SPECIALS = "[]()|^-+*?{}$\\.";
   private static final Charset CHARSET = StandardCharsets.UTF_8;
@@ -118,33 +114,33 @@ public class ArrowDatabaseMetadata extends AvaticaDatabaseMetaData {
   static final int DECIMAL_DIGITS_TIME_MILLISECONDS = 3;
   static final int DECIMAL_DIGITS_TIME_MICROSECONDS = 6;
   static final int DECIMAL_DIGITS_TIME_NANOSECONDS = 9;
-  private static final Schema GET_COLUMNS_SCHEMA = new Schema(
-      Arrays.asList(
-          Field.nullable("TABLE_CAT", Types.MinorType.VARCHAR.getType()),
-          Field.nullable("TABLE_SCHEM", Types.MinorType.VARCHAR.getType()),
-          Field.notNullable("TABLE_NAME", Types.MinorType.VARCHAR.getType()),
-          Field.notNullable("COLUMN_NAME", Types.MinorType.VARCHAR.getType()),
-          Field.nullable("DATA_TYPE", Types.MinorType.INT.getType()),
-          Field.nullable("TYPE_NAME", Types.MinorType.VARCHAR.getType()),
-          Field.nullable("COLUMN_SIZE", Types.MinorType.INT.getType()),
-          Field.nullable("BUFFER_LENGTH", Types.MinorType.INT.getType()),
-          Field.nullable("DECIMAL_DIGITS", Types.MinorType.INT.getType()),
-          Field.nullable("NUM_PREC_RADIX", Types.MinorType.INT.getType()),
-          Field.notNullable("NULLABLE", Types.MinorType.INT.getType()),
-          Field.nullable("REMARKS", Types.MinorType.VARCHAR.getType()),
-          Field.nullable("COLUMN_DEF", Types.MinorType.VARCHAR.getType()),
-          Field.nullable("SQL_DATA_TYPE", Types.MinorType.INT.getType()),
-          Field.nullable("SQL_DATETIME_SUB", Types.MinorType.INT.getType()),
-          Field.notNullable("CHAR_OCTET_LENGTH", Types.MinorType.INT.getType()),
-          Field.notNullable("ORDINAL_POSITION", Types.MinorType.INT.getType()),
-          Field.notNullable("IS_NULLABLE", Types.MinorType.VARCHAR.getType()),
-          Field.nullable("SCOPE_CATALOG", Types.MinorType.VARCHAR.getType()),
-          Field.nullable("SCOPE_SCHEMA", Types.MinorType.VARCHAR.getType()),
-          Field.nullable("SCOPE_TABLE", Types.MinorType.VARCHAR.getType()),
-          Field.nullable("SOURCE_DATA_TYPE", Types.MinorType.SMALLINT.getType()),
-          Field.notNullable("IS_AUTOINCREMENT", Types.MinorType.VARCHAR.getType()),
-          Field.notNullable("IS_GENERATEDCOLUMN", Types.MinorType.VARCHAR.getType())
-      ));
+  private static final Schema GET_COLUMNS_SCHEMA =
+      new Schema(
+          Arrays.asList(
+              Field.nullable("TABLE_CAT", Types.MinorType.VARCHAR.getType()),
+              Field.nullable("TABLE_SCHEM", Types.MinorType.VARCHAR.getType()),
+              Field.notNullable("TABLE_NAME", Types.MinorType.VARCHAR.getType()),
+              Field.notNullable("COLUMN_NAME", Types.MinorType.VARCHAR.getType()),
+              Field.nullable("DATA_TYPE", Types.MinorType.INT.getType()),
+              Field.nullable("TYPE_NAME", Types.MinorType.VARCHAR.getType()),
+              Field.nullable("COLUMN_SIZE", Types.MinorType.INT.getType()),
+              Field.nullable("BUFFER_LENGTH", Types.MinorType.INT.getType()),
+              Field.nullable("DECIMAL_DIGITS", Types.MinorType.INT.getType()),
+              Field.nullable("NUM_PREC_RADIX", Types.MinorType.INT.getType()),
+              Field.notNullable("NULLABLE", Types.MinorType.INT.getType()),
+              Field.nullable("REMARKS", Types.MinorType.VARCHAR.getType()),
+              Field.nullable("COLUMN_DEF", Types.MinorType.VARCHAR.getType()),
+              Field.nullable("SQL_DATA_TYPE", Types.MinorType.INT.getType()),
+              Field.nullable("SQL_DATETIME_SUB", Types.MinorType.INT.getType()),
+              Field.notNullable("CHAR_OCTET_LENGTH", Types.MinorType.INT.getType()),
+              Field.notNullable("ORDINAL_POSITION", Types.MinorType.INT.getType()),
+              Field.notNullable("IS_NULLABLE", Types.MinorType.VARCHAR.getType()),
+              Field.nullable("SCOPE_CATALOG", Types.MinorType.VARCHAR.getType()),
+              Field.nullable("SCOPE_SCHEMA", Types.MinorType.VARCHAR.getType()),
+              Field.nullable("SCOPE_TABLE", Types.MinorType.VARCHAR.getType()),
+              Field.nullable("SOURCE_DATA_TYPE", Types.MinorType.SMALLINT.getType()),
+              Field.notNullable("IS_AUTOINCREMENT", Types.MinorType.VARCHAR.getType()),
+              Field.notNullable("IS_GENERATEDCOLUMN", Types.MinorType.VARCHAR.getType())));
   private final AtomicBoolean isCachePopulated = new AtomicBoolean(false);
   private final Map<SqlInfo, Object> cachedSqlInfo = new EnumMap<>(SqlInfo.class);
   private static final Map<Integer, Integer> sqlTypesToFlightEnumConvertTypes = new HashMap<>();
@@ -160,12 +156,12 @@ public class ArrowDatabaseMetadata extends AvaticaDatabaseMetaData {
     sqlTypesToFlightEnumConvertTypes.put(REAL, SqlSupportsConvert.SQL_CONVERT_REAL_VALUE);
     sqlTypesToFlightEnumConvertTypes.put(DECIMAL, SqlSupportsConvert.SQL_CONVERT_DECIMAL_VALUE);
     sqlTypesToFlightEnumConvertTypes.put(BINARY, SqlSupportsConvert.SQL_CONVERT_BINARY_VALUE);
-    sqlTypesToFlightEnumConvertTypes.put(LONGVARBINARY,
-        SqlSupportsConvert.SQL_CONVERT_LONGVARBINARY_VALUE);
+    sqlTypesToFlightEnumConvertTypes.put(
+        LONGVARBINARY, SqlSupportsConvert.SQL_CONVERT_LONGVARBINARY_VALUE);
     sqlTypesToFlightEnumConvertTypes.put(CHAR, SqlSupportsConvert.SQL_CONVERT_CHAR_VALUE);
     sqlTypesToFlightEnumConvertTypes.put(VARCHAR, SqlSupportsConvert.SQL_CONVERT_VARCHAR_VALUE);
-    sqlTypesToFlightEnumConvertTypes.put(LONGNVARCHAR,
-        SqlSupportsConvert.SQL_CONVERT_LONGVARCHAR_VALUE);
+    sqlTypesToFlightEnumConvertTypes.put(
+        LONGNVARCHAR, SqlSupportsConvert.SQL_CONVERT_LONGVARCHAR_VALUE);
     sqlTypesToFlightEnumConvertTypes.put(DATE, SqlSupportsConvert.SQL_CONVERT_DATE_VALUE);
     sqlTypesToFlightEnumConvertTypes.put(TIMESTAMP, SqlSupportsConvert.SQL_CONVERT_TIMESTAMP_VALUE);
   }
@@ -197,31 +193,36 @@ public boolean isReadOnly() throws SQLException {
   @Override
   public String getSQLKeywords() throws SQLException {
     return convertListSqlInfoToString(
-        getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_KEYWORDS, List.class));
+            getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_KEYWORDS, List.class))
+        .orElse("");
   }
 
   @Override
   public String getNumericFunctions() throws SQLException {
     return convertListSqlInfoToString(
-        getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_NUMERIC_FUNCTIONS, List.class));
+            getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_NUMERIC_FUNCTIONS, List.class))
+        .orElse("");
   }
 
   @Override
   public String getStringFunctions() throws SQLException {
     return convertListSqlInfoToString(
-        getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_STRING_FUNCTIONS, List.class));
+            getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_STRING_FUNCTIONS, List.class))
+        .orElse("");
   }
 
   @Override
   public String getSystemFunctions() throws SQLException {
     return convertListSqlInfoToString(
-        getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_SYSTEM_FUNCTIONS, List.class));
+            getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_SYSTEM_FUNCTIONS, List.class))
+        .orElse("");
   }
 
   @Override
   public String getTimeDateFunctions() throws SQLException {
     return convertListSqlInfoToString(
-        getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_DATETIME_FUNCTIONS, List.class));
+            getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_DATETIME_FUNCTIONS, List.class))
+        .orElse("");
   }
 
   @Override
@@ -266,20 +267,20 @@ public boolean supportsConvert(final int fromType, final int toType) throws SQLE
 
   @Override
   public boolean supportsTableCorrelationNames() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTS_TABLE_CORRELATION_NAMES,
-        Boolean.class);
+    return getSqlInfoAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_SUPPORTS_TABLE_CORRELATION_NAMES, Boolean.class);
   }
 
   @Override
   public boolean supportsDifferentTableCorrelationNames() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTS_DIFFERENT_TABLE_CORRELATION_NAMES,
-        Boolean.class);
+    return getSqlInfoAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_SUPPORTS_DIFFERENT_TABLE_CORRELATION_NAMES, Boolean.class);
   }
 
   @Override
   public boolean supportsExpressionsInOrderBy() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTS_EXPRESSIONS_IN_ORDER_BY,
-        Boolean.class);
+    return getSqlInfoAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_SUPPORTS_EXPRESSIONS_IN_ORDER_BY, Boolean.class);
   }
 
   @Override
@@ -296,8 +297,8 @@ public boolean supportsGroupBy() throws SQLException {
 
   @Override
   public boolean supportsGroupByUnrelated() throws SQLException {
-    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTED_GROUP_BY,
-        SqlSupportedGroupBy.SQL_GROUP_BY_UNRELATED);
+    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_SUPPORTED_GROUP_BY, SqlSupportedGroupBy.SQL_GROUP_BY_UNRELATED);
   }
 
   @Override
@@ -307,66 +308,75 @@ public boolean supportsLikeEscapeClause() throws SQLException {
 
   @Override
   public boolean supportsNonNullableColumns() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTS_NON_NULLABLE_COLUMNS,
-        Boolean.class);
+    return getSqlInfoAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_SUPPORTS_NON_NULLABLE_COLUMNS, Boolean.class);
   }
 
   @Override
   public boolean supportsMinimumSQLGrammar() throws SQLException {
     return checkEnumLevel(
-        Arrays.asList(getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTED_GRAMMAR,
-                SupportedSqlGrammar.SQL_EXTENDED_GRAMMAR),
-            getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTED_GRAMMAR,
-                SupportedSqlGrammar.SQL_CORE_GRAMMAR),
-            getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTED_GRAMMAR,
-                SupportedSqlGrammar.SQL_MINIMUM_GRAMMAR)));
+        Arrays.asList(
+            getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+                SqlInfo.SQL_SUPPORTED_GRAMMAR, SupportedSqlGrammar.SQL_EXTENDED_GRAMMAR),
+            getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+                SqlInfo.SQL_SUPPORTED_GRAMMAR, SupportedSqlGrammar.SQL_CORE_GRAMMAR),
+            getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+                SqlInfo.SQL_SUPPORTED_GRAMMAR, SupportedSqlGrammar.SQL_MINIMUM_GRAMMAR)));
   }
 
   @Override
   public boolean supportsCoreSQLGrammar() throws SQLException {
     return checkEnumLevel(
-        Arrays.asList(getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTED_GRAMMAR,
-                SupportedSqlGrammar.SQL_EXTENDED_GRAMMAR),
-            getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTED_GRAMMAR,
-                SupportedSqlGrammar.SQL_CORE_GRAMMAR)));
+        Arrays.asList(
+            getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+                SqlInfo.SQL_SUPPORTED_GRAMMAR, SupportedSqlGrammar.SQL_EXTENDED_GRAMMAR),
+            getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+                SqlInfo.SQL_SUPPORTED_GRAMMAR, SupportedSqlGrammar.SQL_CORE_GRAMMAR)));
   }
 
   @Override
   public boolean supportsExtendedSQLGrammar() throws SQLException {
-    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTED_GRAMMAR,
-        SupportedSqlGrammar.SQL_EXTENDED_GRAMMAR);
+    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_SUPPORTED_GRAMMAR, SupportedSqlGrammar.SQL_EXTENDED_GRAMMAR);
   }
 
   @Override
   public boolean supportsANSI92EntryLevelSQL() throws SQLException {
     return checkEnumLevel(
-        Arrays.asList(getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_ANSI92_SUPPORTED_LEVEL,
+        Arrays.asList(
+            getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+                SqlInfo.SQL_ANSI92_SUPPORTED_LEVEL,
                 SupportedAnsi92SqlGrammarLevel.ANSI92_ENTRY_SQL),
-            getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_ANSI92_SUPPORTED_LEVEL,
+            getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+                SqlInfo.SQL_ANSI92_SUPPORTED_LEVEL,
                 SupportedAnsi92SqlGrammarLevel.ANSI92_INTERMEDIATE_SQL),
-            getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_ANSI92_SUPPORTED_LEVEL,
+            getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+                SqlInfo.SQL_ANSI92_SUPPORTED_LEVEL,
                 SupportedAnsi92SqlGrammarLevel.ANSI92_FULL_SQL)));
   }
 
   @Override
   public boolean supportsANSI92IntermediateSQL() throws SQLException {
     return checkEnumLevel(
-        Arrays.asList(getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_ANSI92_SUPPORTED_LEVEL,
+        Arrays.asList(
+            getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+                SqlInfo.SQL_ANSI92_SUPPORTED_LEVEL,
                 SupportedAnsi92SqlGrammarLevel.ANSI92_ENTRY_SQL),
-            getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_ANSI92_SUPPORTED_LEVEL,
+            getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+                SqlInfo.SQL_ANSI92_SUPPORTED_LEVEL,
                 SupportedAnsi92SqlGrammarLevel.ANSI92_INTERMEDIATE_SQL)));
   }
 
   @Override
   public boolean supportsANSI92FullSQL() throws SQLException {
-    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_ANSI92_SUPPORTED_LEVEL,
-        SupportedAnsi92SqlGrammarLevel.ANSI92_FULL_SQL);
+    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_ANSI92_SUPPORTED_LEVEL, SupportedAnsi92SqlGrammarLevel.ANSI92_FULL_SQL);
   }
 
   @Override
   public boolean supportsIntegrityEnhancementFacility() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTS_INTEGRITY_ENHANCEMENT_FACILITY,
-        Boolean.class);
+    return getSqlInfoAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_SUPPORTS_INTEGRITY_ENHANCEMENT_FACILITY, Boolean.class);
   }
 
   @Override
@@ -378,14 +388,14 @@ public boolean supportsOuterJoins() throws SQLException {
 
   @Override
   public boolean supportsFullOuterJoins() throws SQLException {
-    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_OUTER_JOINS_SUPPORT_LEVEL,
-        SqlOuterJoinsSupportLevel.SQL_FULL_OUTER_JOINS);
+    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_OUTER_JOINS_SUPPORT_LEVEL, SqlOuterJoinsSupportLevel.SQL_FULL_OUTER_JOINS);
   }
 
   @Override
   public boolean supportsLimitedOuterJoins() throws SQLException {
-    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_OUTER_JOINS_SUPPORT_LEVEL,
-        SqlOuterJoinsSupportLevel.SQL_LIMITED_OUTER_JOINS);
+    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_OUTER_JOINS_SUPPORT_LEVEL, SqlOuterJoinsSupportLevel.SQL_LIMITED_OUTER_JOINS);
   }
 
   @Override
@@ -410,43 +420,50 @@ public boolean isCatalogAtStart() throws SQLException {
 
   @Override
   public boolean supportsSchemasInProcedureCalls() throws SQLException {
-    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_SCHEMAS_SUPPORTED_ACTIONS,
+    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_SCHEMAS_SUPPORTED_ACTIONS,
         SqlSupportedElementActions.SQL_ELEMENT_IN_PROCEDURE_CALLS);
   }
 
   @Override
   public boolean supportsSchemasInIndexDefinitions() throws SQLException {
-    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_SCHEMAS_SUPPORTED_ACTIONS,
+    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_SCHEMAS_SUPPORTED_ACTIONS,
         SqlSupportedElementActions.SQL_ELEMENT_IN_INDEX_DEFINITIONS);
   }
 
   @Override
   public boolean supportsSchemasInPrivilegeDefinitions() throws SQLException {
-    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_SCHEMAS_SUPPORTED_ACTIONS,
+    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_SCHEMAS_SUPPORTED_ACTIONS,
         SqlSupportedElementActions.SQL_ELEMENT_IN_PRIVILEGE_DEFINITIONS);
   }
 
   @Override
   public boolean supportsCatalogsInIndexDefinitions() throws SQLException {
-    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_CATALOGS_SUPPORTED_ACTIONS,
+    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_CATALOGS_SUPPORTED_ACTIONS,
         SqlSupportedElementActions.SQL_ELEMENT_IN_INDEX_DEFINITIONS);
   }
 
   @Override
   public boolean supportsCatalogsInPrivilegeDefinitions() throws SQLException {
-    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_CATALOGS_SUPPORTED_ACTIONS,
+    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_CATALOGS_SUPPORTED_ACTIONS,
         SqlSupportedElementActions.SQL_ELEMENT_IN_PRIVILEGE_DEFINITIONS);
   }
 
   @Override
   public boolean supportsPositionedDelete() throws SQLException {
-    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTED_POSITIONED_COMMANDS,
+    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_SUPPORTED_POSITIONED_COMMANDS,
         SqlSupportedPositionedCommands.SQL_POSITIONED_DELETE);
   }
 
   @Override
   public boolean supportsPositionedUpdate() throws SQLException {
-    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTED_POSITIONED_COMMANDS,
+    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_SUPPORTED_POSITIONED_COMMANDS,
         SqlSupportedPositionedCommands.SQL_POSITIONED_UPDATE);
   }
 
@@ -457,14 +474,14 @@ public boolean supportsResultSetType(final int type) throws SQLException {
 
     switch (type) {
       case ResultSet.TYPE_FORWARD_ONLY:
-        return doesBitmaskTranslateToEnum(SqlSupportedResultSetType.SQL_RESULT_SET_TYPE_FORWARD_ONLY,
-            bitmask);
+        return doesBitmaskTranslateToEnum(
+            SqlSupportedResultSetType.SQL_RESULT_SET_TYPE_FORWARD_ONLY, bitmask);
       case ResultSet.TYPE_SCROLL_INSENSITIVE:
-        return doesBitmaskTranslateToEnum(SqlSupportedResultSetType.SQL_RESULT_SET_TYPE_SCROLL_INSENSITIVE,
-            bitmask);
+        return doesBitmaskTranslateToEnum(
+            SqlSupportedResultSetType.SQL_RESULT_SET_TYPE_SCROLL_INSENSITIVE, bitmask);
       case ResultSet.TYPE_SCROLL_SENSITIVE:
-        return doesBitmaskTranslateToEnum(SqlSupportedResultSetType.SQL_RESULT_SET_TYPE_SCROLL_SENSITIVE,
-            bitmask);
+        return doesBitmaskTranslateToEnum(
+            SqlSupportedResultSetType.SQL_RESULT_SET_TYPE_SCROLL_SENSITIVE, bitmask);
       default:
         throw new SQLException(
             "Invalid result set type argument. The informed type is not defined in java.sql.ResultSet.");
@@ -483,32 +500,32 @@ public boolean supportsStoredProcedures() throws SQLException {
 
   @Override
   public boolean supportsSubqueriesInComparisons() throws SQLException {
-    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTED_SUBQUERIES,
-        SqlSupportedSubqueries.SQL_SUBQUERIES_IN_COMPARISONS);
+    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_SUPPORTED_SUBQUERIES, SqlSupportedSubqueries.SQL_SUBQUERIES_IN_COMPARISONS);
   }
 
   @Override
   public boolean supportsSubqueriesInExists() throws SQLException {
-    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTED_SUBQUERIES,
-        SqlSupportedSubqueries.SQL_SUBQUERIES_IN_EXISTS);
+    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_SUPPORTED_SUBQUERIES, SqlSupportedSubqueries.SQL_SUBQUERIES_IN_EXISTS);
   }
 
   @Override
   public boolean supportsSubqueriesInIns() throws SQLException {
-    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTED_SUBQUERIES,
-        SqlSupportedSubqueries.SQL_SUBQUERIES_IN_INS);
+    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_SUPPORTED_SUBQUERIES, SqlSupportedSubqueries.SQL_SUBQUERIES_IN_INS);
   }
 
   @Override
   public boolean supportsSubqueriesInQuantifieds() throws SQLException {
-    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTED_SUBQUERIES,
-        SqlSupportedSubqueries.SQL_SUBQUERIES_IN_QUANTIFIEDS);
+    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_SUPPORTED_SUBQUERIES, SqlSupportedSubqueries.SQL_SUBQUERIES_IN_QUANTIFIEDS);
   }
 
   @Override
   public boolean supportsCorrelatedSubqueries() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_CORRELATED_SUBQUERIES_SUPPORTED,
-        Boolean.class);
+    return getSqlInfoAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_CORRELATED_SUBQUERIES_SUPPORTED, Boolean.class);
   }
 
   @Override
@@ -520,56 +537,56 @@ public boolean supportsUnion() throws SQLException {
 
   @Override
   public boolean supportsUnionAll() throws SQLException {
-    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTED_UNIONS,
-        SqlSupportedUnions.SQL_UNION_ALL);
+    return getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_SUPPORTED_UNIONS, SqlSupportedUnions.SQL_UNION_ALL);
   }
 
   @Override
   public int getMaxBinaryLiteralLength() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_BINARY_LITERAL_LENGTH,
-        Long.class).intValue();
+    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_BINARY_LITERAL_LENGTH, Long.class)
+        .intValue();
   }
 
   @Override
   public int getMaxCharLiteralLength() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_CHAR_LITERAL_LENGTH,
-        Long.class).intValue();
+    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_CHAR_LITERAL_LENGTH, Long.class)
+        .intValue();
   }
 
   @Override
   public int getMaxColumnNameLength() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_COLUMN_NAME_LENGTH,
-        Long.class).intValue();
+    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_COLUMN_NAME_LENGTH, Long.class)
+        .intValue();
   }
 
   @Override
   public int getMaxColumnsInGroupBy() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_COLUMNS_IN_GROUP_BY,
-        Long.class).intValue();
+    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_COLUMNS_IN_GROUP_BY, Long.class)
+        .intValue();
   }
 
   @Override
   public int getMaxColumnsInIndex() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_COLUMNS_IN_INDEX,
-        Long.class).intValue();
+    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_COLUMNS_IN_INDEX, Long.class)
+        .intValue();
   }
 
   @Override
   public int getMaxColumnsInOrderBy() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_COLUMNS_IN_ORDER_BY,
-        Long.class).intValue();
+    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_COLUMNS_IN_ORDER_BY, Long.class)
+        .intValue();
   }
 
   @Override
   public int getMaxColumnsInSelect() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_COLUMNS_IN_SELECT,
-        Long.class).intValue();
+    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_COLUMNS_IN_SELECT, Long.class)
+        .intValue();
   }
 
   @Override
   public int getMaxColumnsInTable() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_COLUMNS_IN_TABLE,
-        Long.class).intValue();
+    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_COLUMNS_IN_TABLE, Long.class)
+        .intValue();
   }
 
   @Override
@@ -579,8 +596,8 @@ public int getMaxConnections() throws SQLException {
 
   @Override
   public int getMaxCursorNameLength() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_CURSOR_NAME_LENGTH,
-        Long.class).intValue();
+    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_CURSOR_NAME_LENGTH, Long.class)
+        .intValue();
   }
 
   @Override
@@ -590,20 +607,20 @@ public int getMaxIndexLength() throws SQLException {
 
   @Override
   public int getMaxSchemaNameLength() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_DB_SCHEMA_NAME_LENGTH,
-        Long.class).intValue();
+    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_DB_SCHEMA_NAME_LENGTH, Long.class)
+        .intValue();
   }
 
   @Override
   public int getMaxProcedureNameLength() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_PROCEDURE_NAME_LENGTH,
-        Long.class).intValue();
+    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_PROCEDURE_NAME_LENGTH, Long.class)
+        .intValue();
   }
 
   @Override
   public int getMaxCatalogNameLength() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_CATALOG_NAME_LENGTH,
-        Long.class).intValue();
+    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_CATALOG_NAME_LENGTH, Long.class)
+        .intValue();
   }
 
   @Override
@@ -618,8 +635,8 @@ public boolean doesMaxRowSizeIncludeBlobs() throws SQLException {
 
   @Override
   public int getMaxStatementLength() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_STATEMENT_LENGTH,
-        Long.class).intValue();
+    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_STATEMENT_LENGTH, Long.class)
+        .intValue();
   }
 
   @Override
@@ -629,14 +646,14 @@ public int getMaxStatements() throws SQLException {
 
   @Override
   public int getMaxTableNameLength() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_TABLE_NAME_LENGTH,
-        Long.class).intValue();
+    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_TABLE_NAME_LENGTH, Long.class)
+        .intValue();
   }
 
   @Override
   public int getMaxTablesInSelect() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_TABLES_IN_SELECT,
-        Long.class).intValue();
+    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_MAX_TABLES_IN_SELECT, Long.class)
+        .intValue();
   }
 
   @Override
@@ -646,8 +663,8 @@ public int getMaxUserNameLength() throws SQLException {
 
   @Override
   public int getDefaultTransactionIsolation() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_DEFAULT_TRANSACTION_ISOLATION,
-        Long.class).intValue();
+    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_DEFAULT_TRANSACTION_ISOLATION, Long.class)
+        .intValue();
   }
 
   @Override
@@ -658,24 +675,25 @@ public boolean supportsTransactions() throws SQLException {
   @Override
   public boolean supportsTransactionIsolationLevel(final int level) throws SQLException {
     final int bitmask =
-        getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_SUPPORTED_TRANSACTIONS_ISOLATION_LEVELS,
-            Integer.class);
+        getSqlInfoAndCacheIfCacheIsEmpty(
+            SqlInfo.SQL_SUPPORTED_TRANSACTIONS_ISOLATION_LEVELS, Integer.class);
 
     switch (level) {
       case Connection.TRANSACTION_NONE:
-        return doesBitmaskTranslateToEnum(SqlTransactionIsolationLevel.SQL_TRANSACTION_NONE, bitmask);
+        return doesBitmaskTranslateToEnum(
+            SqlTransactionIsolationLevel.SQL_TRANSACTION_NONE, bitmask);
       case Connection.TRANSACTION_READ_COMMITTED:
-        return doesBitmaskTranslateToEnum(SqlTransactionIsolationLevel.SQL_TRANSACTION_READ_COMMITTED,
-            bitmask);
+        return doesBitmaskTranslateToEnum(
+            SqlTransactionIsolationLevel.SQL_TRANSACTION_READ_COMMITTED, bitmask);
       case Connection.TRANSACTION_READ_UNCOMMITTED:
-        return doesBitmaskTranslateToEnum(SqlTransactionIsolationLevel.SQL_TRANSACTION_READ_UNCOMMITTED,
-            bitmask);
+        return doesBitmaskTranslateToEnum(
+            SqlTransactionIsolationLevel.SQL_TRANSACTION_READ_UNCOMMITTED, bitmask);
       case Connection.TRANSACTION_REPEATABLE_READ:
-        return doesBitmaskTranslateToEnum(SqlTransactionIsolationLevel.SQL_TRANSACTION_REPEATABLE_READ,
-            bitmask);
+        return doesBitmaskTranslateToEnum(
+            SqlTransactionIsolationLevel.SQL_TRANSACTION_REPEATABLE_READ, bitmask);
       case Connection.TRANSACTION_SERIALIZABLE:
-        return doesBitmaskTranslateToEnum(SqlTransactionIsolationLevel.SQL_TRANSACTION_SERIALIZABLE,
-            bitmask);
+        return doesBitmaskTranslateToEnum(
+            SqlTransactionIsolationLevel.SQL_TRANSACTION_SERIALIZABLE, bitmask);
       default:
         throw new SQLException(
             "Invalid transaction isolation level argument. The informed level is not defined in java.sql.Connection.");
@@ -684,14 +702,14 @@ public boolean supportsTransactionIsolationLevel(final int level) throws SQLExce
 
   @Override
   public boolean dataDefinitionCausesTransactionCommit() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_DATA_DEFINITION_CAUSES_TRANSACTION_COMMIT,
-        Boolean.class);
+    return getSqlInfoAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_DATA_DEFINITION_CAUSES_TRANSACTION_COMMIT, Boolean.class);
   }
 
   @Override
   public boolean dataDefinitionIgnoredInTransactions() throws SQLException {
-    return getSqlInfoAndCacheIfCacheIsEmpty(SqlInfo.SQL_DATA_DEFINITIONS_IN_TRANSACTIONS_IGNORED,
-        Boolean.class);
+    return getSqlInfoAndCacheIfCacheIsEmpty(
+        SqlInfo.SQL_DATA_DEFINITIONS_IN_TRANSACTIONS_IGNORED, Boolean.class);
   }
 
   @Override
@@ -725,24 +743,25 @@ public ArrowFlightConnection getConnection() throws SQLException {
     return (ArrowFlightConnection) super.getConnection();
   }
 
-  private <T> T getSqlInfoAndCacheIfCacheIsEmpty(final SqlInfo sqlInfoCommand,
-                                                 final Class<T> desiredType)
-      throws SQLException {
+  private <T> T getSqlInfoAndCacheIfCacheIsEmpty(
+      final SqlInfo sqlInfoCommand, final Class<T> desiredType) throws SQLException {
     final ArrowFlightConnection connection = getConnection();
     if (!isCachePopulated.get()) {
       // Lock-and-populate the cache. Only issue the call to getSqlInfo() once,
       // populate the cache, then mark it as populated.
-      // Note that multiple callers from separate threads can see that the cache is not populated, but only
-      // one thread will try to populate the cache. Other threads will see the cache is non-empty when acquiring
+      // Note that multiple callers from separate threads can see that the cache is not populated,
+      // but only
+      // one thread will try to populate the cache. Other threads will see the cache is non-empty
+      // when acquiring
       // the lock on the cache and skip population.
       synchronized (cachedSqlInfo) {
         if (cachedSqlInfo.isEmpty()) {
           final FlightInfo sqlInfo = connection.getClientHandler().getSqlInfo();
           try (final ResultSet resultSet =
-                   ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(
-                       connection, sqlInfo, null)) {
+              ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(connection, sqlInfo, null)) {
             while (resultSet.next()) {
-              cachedSqlInfo.put(SqlInfo.forNumber((Integer) resultSet.getObject("info_name")),
+              cachedSqlInfo.put(
+                  SqlInfo.forNumber((Integer) resultSet.getObject("info_name")),
                   resultSet.getObject("value"));
             }
           }
@@ -753,14 +772,17 @@ private <T> T getSqlInfoAndCacheIfCacheIsEmpty(final SqlInfo sqlInfoCommand,
     return desiredType.cast(cachedSqlInfo.get(sqlInfoCommand));
   }
 
-  private String convertListSqlInfoToString(final List<?> sqlInfoList) {
-    return sqlInfoList.stream().map(Object::toString).collect(Collectors.joining(", "));
+  private Optional<String> convertListSqlInfoToString(final List<?> sqlInfoList) {
+    if (sqlInfoList == null) {
+      return Optional.empty();
+    } else {
+      return Optional.of(
+          sqlInfoList.stream().map(Object::toString).collect(Collectors.joining(", ")));
+    }
   }
 
   private boolean getSqlInfoEnumOptionAndCacheIfCacheIsEmpty(
-      final SqlInfo sqlInfoCommand,
-      final ProtocolMessageEnum enumInstance
-  ) throws SQLException {
+      final SqlInfo sqlInfoCommand, final ProtocolMessageEnum enumInstance) throws SQLException {
     final int bitmask = getSqlInfoAndCacheIfCacheIsEmpty(sqlInfoCommand, Integer.class);
     return doesBitmaskTranslateToEnum(enumInstance, bitmask);
   }
@@ -779,8 +801,8 @@ public ResultSet getCatalogs() throws SQLException {
         new VectorSchemaRootTransformer.Builder(Schemas.GET_CATALOGS_SCHEMA, allocator)
             .renameFieldVector("catalog_name", "TABLE_CAT")
             .build();
-    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(connection, flightInfoCatalogs,
-        transformer);
+    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(
+        connection, flightInfoCatalogs, transformer);
   }
 
   @Override
@@ -792,8 +814,8 @@ public ResultSet getImportedKeys(final String catalog, final String schema, fina
 
     final BufferAllocator allocator = connection.getBufferAllocator();
     final VectorSchemaRootTransformer transformer = getForeignKeysTransformer(allocator);
-    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(connection, flightInfoImportedKeys,
-        transformer);
+    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(
+        connection, flightInfoImportedKeys, transformer);
   }
 
   @Override
@@ -805,33 +827,43 @@ public ResultSet getExportedKeys(final String catalog, final String schema, fina
 
     final BufferAllocator allocator = connection.getBufferAllocator();
     final VectorSchemaRootTransformer transformer = getForeignKeysTransformer(allocator);
-    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(connection, flightInfoExportedKeys,
-        transformer);
+    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(
+        connection, flightInfoExportedKeys, transformer);
   }
 
   @Override
-  public ResultSet getCrossReference(final String parentCatalog, final String parentSchema,
-                                     final String parentTable,
-                                     final String foreignCatalog, final String foreignSchema,
-                                     final String foreignTable)
+  public ResultSet getCrossReference(
+      final String parentCatalog,
+      final String parentSchema,
+      final String parentTable,
+      final String foreignCatalog,
+      final String foreignSchema,
+      final String foreignTable)
       throws SQLException {
     final ArrowFlightConnection connection = getConnection();
-    final FlightInfo flightInfoCrossReference = connection.getClientHandler().getCrossReference(
-        parentCatalog, parentSchema, parentTable, foreignCatalog, foreignSchema, foreignTable);
+    final FlightInfo flightInfoCrossReference =
+        connection
+            .getClientHandler()
+            .getCrossReference(
+                parentCatalog,
+                parentSchema,
+                parentTable,
+                foreignCatalog,
+                foreignSchema,
+                foreignTable);
 
     final BufferAllocator allocator = connection.getBufferAllocator();
     final VectorSchemaRootTransformer transformer = getForeignKeysTransformer(allocator);
-    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(connection, flightInfoCrossReference,
-        transformer);
+    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(
+        connection, flightInfoCrossReference, transformer);
   }
 
   /**
-   * Transformer used on getImportedKeys, getExportedKeys and getCrossReference methods, since
-   * all three share the same schema.
+   * Transformer used on getImportedKeys, getExportedKeys and getCrossReference methods, since all
+   * three share the same schema.
    */
   private VectorSchemaRootTransformer getForeignKeysTransformer(final BufferAllocator allocator) {
-    return new VectorSchemaRootTransformer.Builder(Schemas.GET_IMPORTED_KEYS_SCHEMA,
-        allocator)
+    return new VectorSchemaRootTransformer.Builder(Schemas.GET_IMPORTED_KEYS_SCHEMA, allocator)
         .renameFieldVector("pk_catalog_name", "PKTABLE_CAT")
         .renameFieldVector("pk_db_schema_name", "PKTABLE_SCHEM")
         .renameFieldVector("pk_table_name", "PKTABLE_NAME")
@@ -862,8 +894,8 @@ public ResultSet getSchemas(final String catalog, final String schemaPattern)
             .renameFieldVector("db_schema_name", "TABLE_SCHEM")
             .renameFieldVector("catalog_name", "TABLE_CATALOG")
             .build();
-    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(connection, flightInfoSchemas,
-        transformer);
+    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(
+        connection, flightInfoSchemas, transformer);
   }
 
   @Override
@@ -876,19 +908,22 @@ public ResultSet getTableTypes() throws SQLException {
         new VectorSchemaRootTransformer.Builder(Schemas.GET_TABLE_TYPES_SCHEMA, allocator)
             .renameFieldVector("table_type", "TABLE_TYPE")
             .build();
-    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(connection, flightInfoTableTypes,
-        transformer);
+    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(
+        connection, flightInfoTableTypes, transformer);
   }
 
   @Override
-  public ResultSet getTables(final String catalog, final String schemaPattern,
-                             final String tableNamePattern,
-                             final String[] types)
+  public ResultSet getTables(
+      final String catalog,
+      final String schemaPattern,
+      final String tableNamePattern,
+      final String[] types)
       throws SQLException {
     final ArrowFlightConnection connection = getConnection();
     final List<String> typesList = types == null ? null : Arrays.asList(types);
     final FlightInfo flightInfoTables =
-        connection.getClientHandler()
+        connection
+            .getClientHandler()
             .getTables(catalog, schemaPattern, tableNamePattern, typesList, false);
 
     final BufferAllocator allocator = connection.getBufferAllocator();
@@ -905,8 +940,8 @@ public ResultSet getTables(final String catalog, final String schemaPattern,
             .addEmptyField("SELF_REFERENCING_COL_NAME", Types.MinorType.VARBINARY)
             .addEmptyField("REF_GENERATION", Types.MinorType.VARBINARY)
             .build();
-    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(connection, flightInfoTables,
-        transformer);
+    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(
+        connection, flightInfoTables, transformer);
   }
 
   @Override
@@ -926,18 +961,21 @@ public ResultSet getPrimaryKeys(final String catalog, final String schema, final
             .renameFieldVector("key_sequence", "KEY_SEQ")
             .renameFieldVector("key_name", "PK_NAME")
             .build();
-    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(connection, flightInfoPrimaryKeys,
-        transformer);
+    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(
+        connection, flightInfoPrimaryKeys, transformer);
   }
 
   @Override
-  public ResultSet getColumns(final String catalog, final String schemaPattern,
-                              final String tableNamePattern,
-                              final String columnNamePattern)
+  public ResultSet getColumns(
+      final String catalog,
+      final String schemaPattern,
+      final String tableNamePattern,
+      final String columnNamePattern)
       throws SQLException {
     final ArrowFlightConnection connection = getConnection();
     final FlightInfo flightInfoTables =
-        connection.getClientHandler()
+        connection
+            .getClientHandler()
             .getTables(catalog, schemaPattern, tableNamePattern, null, true);
 
     final BufferAllocator allocator = connection.getBufferAllocator();
@@ -945,7 +983,9 @@ public ResultSet getColumns(final String catalog, final String schemaPattern,
     final Pattern columnNamePat =
         columnNamePattern != null ? Pattern.compile(sqlToRegexLike(columnNamePattern)) : null;
 
-    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(connection, flightInfoTables,
+    return ArrowFlightJdbcFlightStreamResultSet.fromFlightInfo(
+        connection,
+        flightInfoTables,
         (originalRoot, transformedRoot) -> {
           int columnCounter = 0;
           if (transformedRoot == null) {
@@ -971,18 +1011,25 @@ public ResultSet getColumns(final String catalog, final String schemaPattern,
 
             final Schema currentSchema;
             try {
-              currentSchema = MessageSerializer.deserializeSchema(
-                  new ReadChannel(Channels.newChannel(
-                      new ByteArrayInputStream(schemaVector.get(i)))));
+              currentSchema =
+                  MessageSerializer.deserializeSchema(
+                      new ReadChannel(
+                          Channels.newChannel(new ByteArrayInputStream(schemaVector.get(i)))));
             } catch (final IOException e) {
               throw new IOException(
                   String.format("Failed to deserialize schema for table %s", tableName), e);
             }
             final List<Field> tableColumns = currentSchema.getFields();
 
-            columnCounter = setGetColumnsVectorSchemaRootFromFields(transformedRoot, columnCounter,
-                tableColumns,
-                catalogName, tableName, schemaName, columnNamePat);
+            columnCounter =
+                setGetColumnsVectorSchemaRootFromFields(
+                    transformedRoot,
+                    columnCounter,
+                    tableColumns,
+                    catalogName,
+                    tableName,
+                    schemaName,
+                    columnNamePat);
           }
 
           transformedRoot.setRowCount(columnCounter);
@@ -992,12 +1039,14 @@ public ResultSet getColumns(final String catalog, final String schemaPattern,
         });
   }
 
-  private int setGetColumnsVectorSchemaRootFromFields(final VectorSchemaRoot currentRoot,
-                                                      int insertIndex,
-                                                      final List<Field> tableColumns,
-                                                      final Text catalogName,
-                                                      final Text tableName, final Text schemaName,
-                                                      final Pattern columnNamePattern) {
+  private int setGetColumnsVectorSchemaRootFromFields(
+      final VectorSchemaRoot currentRoot,
+      int insertIndex,
+      final List<Field> tableColumns,
+      final Text catalogName,
+      final Text tableName,
+      final Text schemaName,
+      final Pattern columnNamePattern) {
     int ordinalIndex = 1;
     final int tableColumnsSize = tableColumns.size();
 
@@ -1013,12 +1062,15 @@ private int setGetColumnsVectorSchemaRootFromFields(final VectorSchemaRoot curre
     final IntVector nullableVector = (IntVector) currentRoot.getVector("NULLABLE");
     final IntVector ordinalPositionVector = (IntVector) currentRoot.getVector("ORDINAL_POSITION");
     final VarCharVector isNullableVector = (VarCharVector) currentRoot.getVector("IS_NULLABLE");
-    final VarCharVector isAutoincrementVector = (VarCharVector) currentRoot.getVector("IS_AUTOINCREMENT");
-    final VarCharVector isGeneratedColumnVector = (VarCharVector) currentRoot.getVector("IS_GENERATEDCOLUMN");
+    final VarCharVector isAutoincrementVector =
+        (VarCharVector) currentRoot.getVector("IS_AUTOINCREMENT");
+    final VarCharVector isGeneratedColumnVector =
+        (VarCharVector) currentRoot.getVector("IS_GENERATEDCOLUMN");
 
     for (int i = 0; i < tableColumnsSize; i++, ordinalIndex++) {
       final Field field = tableColumns.get(i);
-      final FlightSqlColumnMetadata columnMetadata = new FlightSqlColumnMetadata(field.getMetadata());
+      final FlightSqlColumnMetadata columnMetadata =
+          new FlightSqlColumnMetadata(field.getMetadata());
       final String columnName = field.getName();
 
       if (columnNamePattern != null && !columnNamePattern.matcher(columnName).matches()) {
@@ -1043,13 +1095,15 @@ private int setGetColumnsVectorSchemaRootFromFields(final VectorSchemaRoot curre
       }
 
       dataTypeVector.setSafe(insertIndex, SqlTypes.getSqlTypeIdFromArrowType(fieldType));
-      byte[] typeName = columnMetadata.getTypeName() != null ?
-          columnMetadata.getTypeName().getBytes(CHARSET) :
-          SqlTypes.getSqlTypeNameFromArrowType(fieldType).getBytes(CHARSET);
+      byte[] typeName =
+          columnMetadata.getTypeName() != null
+              ? columnMetadata.getTypeName().getBytes(CHARSET)
+              : SqlTypes.getSqlTypeNameFromArrowType(fieldType).getBytes(CHARSET);
       typeNameVector.setSafe(insertIndex, typeName);
 
       // We aren't setting COLUMN_SIZE for ROWID SQL Types, as there's no such Arrow type.
-      // We aren't setting COLUMN_SIZE nor DECIMAL_DIGITS for Float/Double as their precision and scale are variable.
+      // We aren't setting COLUMN_SIZE nor DECIMAL_DIGITS for Float/Double as their precision and
+      // scale are variable.
       if (fieldType instanceof ArrowType.Decimal) {
         numPrecRadixVector.setSafe(insertIndex, BASE10_RADIX);
       } else if (fieldType instanceof ArrowType.Int) {
@@ -1142,7 +1196,8 @@ static Integer getDecimalDigits(final ArrowType fieldType) {
 
   static Integer getColumnSize(final ArrowType fieldType) {
     // We aren't setting COLUMN_SIZE for ROWID SQL Types, as there's no such Arrow type.
-    // We aren't setting COLUMN_SIZE nor DECIMAL_DIGITS for Float/Double as their precision and scale are variable.
+    // We aren't setting COLUMN_SIZE nor DECIMAL_DIGITS for Float/Double as their precision and
+    // scale are variable.
     if (fieldType instanceof ArrowType.Decimal) {
       final ArrowType.Decimal thisDecimal = (ArrowType.Decimal) fieldType;
       return thisDecimal.getPrecision();
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightConnection.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightConnection.java
index ad19c616ff29a..c1b1c8f8e6add 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightConnection.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightConnection.java
@@ -14,16 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import static org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.replaceSemiColons;
 
+import io.netty.util.concurrent.DefaultThreadFactory;
 import java.sql.SQLException;
 import java.util.Properties;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-
 import org.apache.arrow.driver.jdbc.client.ArrowFlightSqlClientHandler;
 import org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl;
 import org.apache.arrow.flight.FlightClient;
@@ -33,11 +32,7 @@
 import org.apache.calcite.avatica.AvaticaConnection;
 import org.apache.calcite.avatica.AvaticaFactory;
 
-import io.netty.util.concurrent.DefaultThreadFactory;
-
-/**
- * Connection to the Arrow Flight server.
- */
+/** Connection to the Arrow Flight server. */
 public final class ArrowFlightConnection extends AvaticaConnection {
 
   private final BufferAllocator allocator;
@@ -48,19 +43,22 @@ public final class ArrowFlightConnection extends AvaticaConnection {
   /**
    * Creates a new {@link ArrowFlightConnection}.
    *
-   * @param driver        the {@link ArrowFlightJdbcDriver} to use.
-   * @param factory       the {@link AvaticaFactory} to use.
-   * @param url           the URL to use.
-   * @param properties    the {@link Properties} to use.
-   * @param config        the {@link ArrowFlightConnectionConfigImpl} to use.
-   * @param allocator     the {@link BufferAllocator} to use.
+   * @param driver the {@link ArrowFlightJdbcDriver} to use.
+   * @param factory the {@link AvaticaFactory} to use.
+   * @param url the URL to use.
+   * @param properties the {@link Properties} to use.
+   * @param config the {@link ArrowFlightConnectionConfigImpl} to use.
+   * @param allocator the {@link BufferAllocator} to use.
    * @param clientHandler the {@link ArrowFlightSqlClientHandler} to use.
    */
-  private ArrowFlightConnection(final ArrowFlightJdbcDriver driver, final AvaticaFactory factory,
-                                final String url, final Properties properties,
-                                final ArrowFlightConnectionConfigImpl config,
-                                final BufferAllocator allocator,
-                                final ArrowFlightSqlClientHandler clientHandler) {
+  private ArrowFlightConnection(
+      final ArrowFlightJdbcDriver driver,
+      final AvaticaFactory factory,
+      final String url,
+      final Properties properties,
+      final ArrowFlightConnectionConfigImpl config,
+      final BufferAllocator allocator,
+      final ArrowFlightSqlClientHandler clientHandler) {
     super(driver, factory, url, properties);
     this.config = Preconditions.checkNotNull(config, "Config cannot be null.");
     this.allocator = Preconditions.checkNotNull(allocator, "Allocator cannot be null.");
@@ -70,28 +68,31 @@ private ArrowFlightConnection(final ArrowFlightJdbcDriver driver, final AvaticaF
   /**
    * Creates a new {@link ArrowFlightConnection} to a {@link FlightClient}.
    *
-   * @param driver     the {@link ArrowFlightJdbcDriver} to use.
-   * @param factory    the {@link AvaticaFactory} to use.
-   * @param url        the URL to establish the connection to.
+   * @param driver the {@link ArrowFlightJdbcDriver} to use.
+   * @param factory the {@link AvaticaFactory} to use.
+   * @param url the URL to establish the connection to.
    * @param properties the {@link Properties} to use for this session.
-   * @param allocator  the {@link BufferAllocator} to use.
+   * @param allocator the {@link BufferAllocator} to use.
    * @return a new {@link ArrowFlightConnection}.
    * @throws SQLException on error.
    */
-  static ArrowFlightConnection createNewConnection(final ArrowFlightJdbcDriver driver,
-                                                   final AvaticaFactory factory,
-                                                   String url, final Properties properties,
-                                                   final BufferAllocator allocator)
+  static ArrowFlightConnection createNewConnection(
+      final ArrowFlightJdbcDriver driver,
+      final AvaticaFactory factory,
+      String url,
+      final Properties properties,
+      final BufferAllocator allocator)
       throws SQLException {
     url = replaceSemiColons(url);
     final ArrowFlightConnectionConfigImpl config = new ArrowFlightConnectionConfigImpl(properties);
     final ArrowFlightSqlClientHandler clientHandler = createNewClientHandler(config, allocator);
-    return new ArrowFlightConnection(driver, factory, url, properties, config, allocator, clientHandler);
+    return new ArrowFlightConnection(
+        driver, factory, url, properties, config, allocator, clientHandler);
   }
 
   private static ArrowFlightSqlClientHandler createNewClientHandler(
-      final ArrowFlightConnectionConfigImpl config,
-      final BufferAllocator allocator) throws SQLException {
+      final ArrowFlightConnectionConfigImpl config, final BufferAllocator allocator)
+      throws SQLException {
     try {
       return new ArrowFlightSqlClientHandler.Builder()
           .withHost(config.getHost())
@@ -111,6 +112,7 @@ private static ArrowFlightSqlClientHandler createNewClientHandler(
           .withCallOptions(config.toCallOption())
           .withRetainCookies(config.retainCookies())
           .withRetainAuth(config.retainAuth())
+          .withCatalog(config.getCatalog())
           .build();
     } catch (final SQLException e) {
       try {
@@ -154,10 +156,11 @@ ArrowFlightSqlClientHandler getClientHandler() {
    * @return the {@link #executorService}.
    */
   synchronized ExecutorService getExecutorService() {
-    return executorService = executorService == null ?
-        Executors.newFixedThreadPool(config.threadPoolSize(),
-            new DefaultThreadFactory(getClass().getSimpleName())) :
-        executorService;
+    return executorService =
+        executorService == null
+            ? Executors.newFixedThreadPool(
+                config.threadPoolSize(), new DefaultThreadFactory(getClass().getSimpleName()))
+            : executorService;
   }
 
   @Override
@@ -169,6 +172,7 @@ public Properties getClientInfo() {
 
   @Override
   public void close() throws SQLException {
+    clientHandler.close();
     if (executorService != null) {
       executorService.shutdown();
     }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightInfoStatement.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightInfoStatement.java
index 8365c7bb57a4a..37ee93722a524 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightInfoStatement.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightInfoStatement.java
@@ -14,17 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import java.sql.SQLException;
 import java.sql.Statement;
-
 import org.apache.arrow.flight.FlightInfo;
 
-/**
- * A {@link Statement} that deals with {@link FlightInfo}.
- */
+/** A {@link Statement} that deals with {@link FlightInfo}. */
 public interface ArrowFlightInfoStatement extends Statement {
 
   @Override
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcArray.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcArray.java
index ed67c97cf691e..9b9eba51e5ae6 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcArray.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcArray.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import java.sql.Array;
@@ -23,7 +22,6 @@
 import java.sql.SQLFeatureNotSupportedException;
 import java.util.Arrays;
 import java.util.Map;
-
 import org.apache.arrow.driver.jdbc.accessor.impl.complex.AbstractArrowFlightJdbcListVectorAccessor;
 import org.apache.arrow.driver.jdbc.utils.SqlTypes;
 import org.apache.arrow.memory.util.LargeMemoryUtil;
@@ -46,9 +44,10 @@ public class ArrowFlightJdbcArray implements Array {
   private final long valuesCount;
 
   /**
-   * Instantiate an {@link Array} backed up by given {@link FieldVector}, limited by a start offset and values count.
+   * Instantiate an {@link Array} backed up by given {@link FieldVector}, limited by a start offset
+   * and values count.
    *
-   * @param dataVector  underlying FieldVector, containing the Array items.
+   * @param dataVector underlying FieldVector, containing the Array items.
    * @param startOffset offset from FieldVector pointing to this Array's first value.
    * @param valuesCount how many items this Array contains.
    */
@@ -111,8 +110,8 @@ public Object getArray(long index, int count, Map<String, Class<?>> map) throws
     }
 
     checkBoundaries(index, count);
-    return getArrayNoBoundCheck(this.dataVector,
-        LargeMemoryUtil.checkedCastToInt(this.startOffset + index), count);
+    return getArrayNoBoundCheck(
+        this.dataVector, LargeMemoryUtil.checkedCastToInt(this.startOffset + index), count);
   }
 
   @Override
@@ -134,12 +133,11 @@ public ResultSet getResultSet(long index, int count) throws SQLException {
     return getResultSet(index, count, null);
   }
 
-  private static ResultSet getResultSetNoBoundariesCheck(ValueVector dataVector, long start,
-                                                         long count)
-      throws SQLException {
+  private static ResultSet getResultSetNoBoundariesCheck(
+      ValueVector dataVector, long start, long count) throws SQLException {
     TransferPair transferPair = dataVector.getTransferPair(dataVector.getAllocator());
-    transferPair.splitAndTransfer(LargeMemoryUtil.checkedCastToInt(start),
-        LargeMemoryUtil.checkedCastToInt(count));
+    transferPair.splitAndTransfer(
+        LargeMemoryUtil.checkedCastToInt(start), LargeMemoryUtil.checkedCastToInt(count));
     FieldVector vectorSlice = (FieldVector) transferPair.getTo();
 
     VectorSchemaRoot vectorSchemaRoot = VectorSchemaRoot.of(vectorSlice);
@@ -154,14 +152,12 @@ public ResultSet getResultSet(long index, int count, Map<String, Class<?>> map)
     }
 
     checkBoundaries(index, count);
-    return getResultSetNoBoundariesCheck(this.dataVector,
-        LargeMemoryUtil.checkedCastToInt(this.startOffset + index), count);
+    return getResultSetNoBoundariesCheck(
+        this.dataVector, LargeMemoryUtil.checkedCastToInt(this.startOffset + index), count);
   }
 
   @Override
-  public void free() {
-
-  }
+  public void free() {}
 
   @Override
   public String toString() {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionPoolDataSource.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionPoolDataSource.java
index 46a1d3ff87c34..8303ea32864a9 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionPoolDataSource.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionPoolDataSource.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import java.sql.SQLException;
@@ -23,17 +22,13 @@
 import java.util.Queue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
-
 import javax.sql.ConnectionEvent;
 import javax.sql.ConnectionEventListener;
 import javax.sql.ConnectionPoolDataSource;
 import javax.sql.PooledConnection;
-
 import org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl;
 
-/**
- * {@link ConnectionPoolDataSource} implementation for Arrow Flight JDBC Driver.
- */
+/** {@link ConnectionPoolDataSource} implementation for Arrow Flight JDBC Driver. */
 public class ArrowFlightJdbcConnectionPoolDataSource extends ArrowFlightJdbcDataSource
     implements ConnectionPoolDataSource, ConnectionEventListener, AutoCloseable {
   private final Map<Properties, Queue<ArrowFlightJdbcPooledConnection>> pool =
@@ -43,10 +38,10 @@ public class ArrowFlightJdbcConnectionPoolDataSource extends ArrowFlightJdbcData
    * Instantiates a new DataSource.
    *
    * @param properties the properties
-   * @param config     the config.
+   * @param config the config.
    */
-  protected ArrowFlightJdbcConnectionPoolDataSource(final Properties properties,
-                                                    final ArrowFlightConnectionConfigImpl config) {
+  protected ArrowFlightJdbcConnectionPoolDataSource(
+      final Properties properties, final ArrowFlightConnectionConfigImpl config) {
     super(properties, config);
   }
 
@@ -58,8 +53,8 @@ protected ArrowFlightJdbcConnectionPoolDataSource(final Properties properties,
    */
   public static ArrowFlightJdbcConnectionPoolDataSource createNewDataSource(
       final Properties properties) {
-    return new ArrowFlightJdbcConnectionPoolDataSource(properties,
-        new ArrowFlightConnectionConfigImpl(properties));
+    return new ArrowFlightJdbcConnectionPoolDataSource(
+        properties, new ArrowFlightConnectionConfigImpl(properties));
   }
 
   @Override
@@ -84,8 +79,7 @@ public PooledConnection getPooledConnection(final String username, final String
   }
 
   private ArrowFlightJdbcPooledConnection createPooledConnection(
-      final ArrowFlightConnectionConfigImpl config)
-      throws SQLException {
+      final ArrowFlightConnectionConfigImpl config) throws SQLException {
     ArrowFlightJdbcPooledConnection pooledConnection =
         new ArrowFlightJdbcPooledConnection(getConnection(config.getUser(), config.getPassword()));
     pooledConnection.addConnectionEventListener(this);
@@ -102,9 +96,7 @@ public void connectionClosed(ConnectionEvent connectionEvent) {
   }
 
   @Override
-  public void connectionErrorOccurred(ConnectionEvent connectionEvent) {
-
-  }
+  public void connectionErrorOccurred(ConnectionEvent connectionEvent) {}
 
   @Override
   public void close() throws Exception {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcCursor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcCursor.java
index 45c23e4d5298b..fbf0b308c2d6d 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcCursor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcCursor.java
@@ -14,16 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
-
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.vector.FieldVector;
@@ -34,9 +31,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * Arrow Flight Jdbc's Cursor class.
- */
+/** Arrow Flight Jdbc's Cursor class. */
 public class ArrowFlightJdbcCursor extends AbstractCursor {
 
   private static final Logger LOGGER;
@@ -54,18 +49,20 @@ public ArrowFlightJdbcCursor(VectorSchemaRoot root) {
   }
 
   @Override
-  public List<Accessor> createAccessors(List<ColumnMetaData> columns,
-                                        Calendar localCalendar,
-                                        ArrayImpl.Factory factory) {
+  public List<Accessor> createAccessors(
+      List<ColumnMetaData> columns, Calendar localCalendar, ArrayImpl.Factory factory) {
     final List<FieldVector> fieldVectors = root.getFieldVectors();
 
-    return IntStream.range(0, fieldVectors.size()).mapToObj(root::getVector)
+    return IntStream.range(0, fieldVectors.size())
+        .mapToObj(root::getVector)
         .map(this::createAccessor)
         .collect(Collectors.toCollection(() -> new ArrayList<>(fieldVectors.size())));
   }
 
   private Accessor createAccessor(FieldVector vector) {
-    return ArrowFlightJdbcAccessorFactory.createAccessor(vector, this::getCurrentRow,
+    return ArrowFlightJdbcAccessorFactory.createAccessor(
+        vector,
+        this::getCurrentRow,
         (boolean wasNull) -> {
           // AbstractCursor creates a boolean array of length 1 to hold the wasNull value
           this.wasNull[0] = wasNull;
@@ -73,8 +70,9 @@ private Accessor createAccessor(FieldVector vector) {
   }
 
   /**
-   * ArrowFlightJdbcAccessors do not use {@link AbstractCursor.Getter}, as it would box primitive types and cause
-   * performance issues. Each Accessor implementation works directly on Arrow Vectors.
+   * ArrowFlightJdbcAccessors do not use {@link AbstractCursor.Getter}, as it would box primitive
+   * types and cause performance issues. Each Accessor implementation works directly on Arrow
+   * Vectors.
    */
   @Override
   protected Getter createGetter(int column) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDataSource.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDataSource.java
index a57eeaa830492..0b5d7fd368bcf 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDataSource.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDataSource.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import static org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty;
@@ -24,25 +23,19 @@
 import java.sql.SQLFeatureNotSupportedException;
 import java.util.Properties;
 import java.util.logging.Logger;
-
 import javax.sql.DataSource;
-
 import org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl;
 import org.apache.arrow.util.Preconditions;
 
-/**
- * {@link DataSource} implementation for Arrow Flight JDBC Driver.
- */
+/** {@link DataSource} implementation for Arrow Flight JDBC Driver. */
 public class ArrowFlightJdbcDataSource implements DataSource {
   private final Properties properties;
   private final ArrowFlightConnectionConfigImpl config;
   private PrintWriter logWriter;
 
-  /**
-   * Instantiates a new DataSource.
-   */
-  protected ArrowFlightJdbcDataSource(final Properties properties,
-                                      final ArrowFlightConnectionConfigImpl config) {
+  /** Instantiates a new DataSource. */
+  protected ArrowFlightJdbcDataSource(
+      final Properties properties, final ArrowFlightConnectionConfigImpl config) {
     this.properties = Preconditions.checkNotNull(properties);
     this.config = Preconditions.checkNotNull(config);
   }
@@ -57,8 +50,8 @@ protected final ArrowFlightConnectionConfigImpl getConfig() {
   }
 
   /**
-   * Gets a copy of the {@link #properties} for this {@link ArrowFlightJdbcDataSource} with
-   * the provided {@code username} and {@code password}.
+   * Gets a copy of the {@link #properties} for this {@link ArrowFlightJdbcDataSource} with the
+   * provided {@code username} and {@code password}.
    *
    * @return the {@link Properties} for this data source.
    */
@@ -81,8 +74,8 @@ protected final Properties getProperties(final String username, final String pas
    * @return a new data source.
    */
   public static ArrowFlightJdbcDataSource createNewDataSource(final Properties properties) {
-    return new ArrowFlightJdbcDataSource(properties,
-        new ArrowFlightConnectionConfigImpl(properties));
+    return new ArrowFlightJdbcDataSource(
+        properties, new ArrowFlightConnectionConfigImpl(properties));
   }
 
   @Override
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriver.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriver.java
index 183e3d5c7b055..53e6120f6271b 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriver.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriver.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import static org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.replaceSemiColons;
@@ -31,7 +30,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Properties;
-
+import java.util.logging.Logger;
 import org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty;
 import org.apache.arrow.driver.jdbc.utils.UrlParser;
 import org.apache.arrow.flight.FlightRuntimeException;
@@ -43,14 +42,12 @@
 import org.apache.calcite.avatica.Meta;
 import org.apache.calcite.avatica.UnregisteredDriver;
 
-
-/**
- * JDBC driver for querying data from an Apache Arrow Flight server.
- */
+/** JDBC driver for querying data from an Apache Arrow Flight server. */
 public class ArrowFlightJdbcDriver extends UnregisteredDriver {
   private static final String CONNECT_STRING_PREFIX = "jdbc:arrow-flight-sql://";
   private static final String CONNECT_STRING_PREFIX_DEPRECATED = "jdbc:arrow-flight://";
-  private static final String CONNECTION_STRING_EXPECTED = "jdbc:arrow-flight-sql://[host][:port][?param1=value&...]";
+  private static final String CONNECTION_STRING_EXPECTED =
+      "jdbc:arrow-flight-sql://[host][:port][?param1=value&...]";
   private static DriverVersion version;
 
   static {
@@ -58,7 +55,7 @@ public class ArrowFlightJdbcDriver extends UnregisteredDriver {
     // Netty requires some extra properties to unlock some native memory management api
     // Setting this property if not already set externally
     // This has to be done before any netty class is being loaded
-    final String key = "cfjd.io.netty.tryReflectionSetAccessible";
+    final String key = "io.netty.tryReflectionSetAccessible";
     final String tryReflectionSetAccessible = System.getProperty(key);
     if (tryReflectionSetAccessible == null) {
       System.setProperty(key, Boolean.TRUE.toString());
@@ -67,6 +64,13 @@ public class ArrowFlightJdbcDriver extends UnregisteredDriver {
     new ArrowFlightJdbcDriver().register();
   }
 
+  @Override
+  public Logger getParentLogger() {
+    // Return the logger associated with the driver package ('org.apache.arrow.driver.jdbc')
+    // When packaged in flight-sql-jdbc-driver, it will also apply to all shaded dependencies
+    return Logger.getLogger(getClass().getPackage().getName());
+  }
+
   @Override
   public ArrowFlightConnection connect(final String url, final Properties info)
       throws SQLException {
@@ -84,11 +88,7 @@ public ArrowFlightConnection connect(final String url, final Properties info)
 
     try {
       return ArrowFlightConnection.createNewConnection(
-          this,
-          factory,
-          url,
-          lowerCasePropertyKeys(properties),
-          new RootAllocator(Long.MAX_VALUE));
+          this, factory, url, lowerCasePropertyKeys(properties), new RootAllocator(Long.MAX_VALUE));
     } catch (final FlightRuntimeException e) {
       throw new SQLException("Failed to connect.", e);
     }
@@ -103,11 +103,14 @@ protected String getFactoryClassName(final JdbcVersion jdbcVersion) {
   @SuppressWarnings("StringSplitter")
   protected DriverVersion createDriverVersion() {
     if (version == null) {
-      final InputStream flightProperties = this.getClass().getResourceAsStream("/properties/flight.properties");
+      final InputStream flightProperties =
+          this.getClass().getResourceAsStream("/properties/flight.properties");
       if (flightProperties == null) {
-        throw new RuntimeException("Flight Properties not found. Ensure the JAR was built properly.");
+        throw new RuntimeException(
+            "Flight Properties not found. Ensure the JAR was built properly.");
       }
-      try (final Reader reader = new BufferedReader(new InputStreamReader(flightProperties, StandardCharsets.UTF_8))) {
+      try (final Reader reader =
+          new BufferedReader(new InputStreamReader(flightProperties, StandardCharsets.UTF_8))) {
         final Properties properties = new Properties();
         properties.load(reader);
 
@@ -119,22 +122,24 @@ protected DriverVersion createDriverVersion() {
         final int parentMinorVersion = Integer.parseInt(pVersion[1]);
 
         final String childName = properties.getProperty("org.apache.arrow.flight.jdbc-driver.name");
-        final String childVersion = properties.getProperty("org.apache.arrow.flight.jdbc-driver.version");
+        final String childVersion =
+            properties.getProperty("org.apache.arrow.flight.jdbc-driver.version");
         final String[] cVersion = childVersion.split("\\.");
 
         final int childMajorVersion = Integer.parseInt(cVersion[0]);
         final int childMinorVersion = Integer.parseInt(cVersion[1]);
 
-        version = new DriverVersion(
-            childName,
-            childVersion,
-            parentName,
-            parentVersion,
-            true,
-            childMajorVersion,
-            childMinorVersion,
-            parentMajorVersion,
-            parentMinorVersion);
+        version =
+            new DriverVersion(
+                childName,
+                childVersion,
+                parentName,
+                parentVersion,
+                true,
+                childMajorVersion,
+                childMinorVersion,
+                parentMajorVersion,
+                parentMinorVersion);
       } catch (final IOException e) {
         throw new RuntimeException("Failed to load driver version.", e);
       }
@@ -156,15 +161,16 @@ protected String getConnectStringPrefix() {
   @Override
   public boolean acceptsURL(final String url) {
     Preconditions.checkNotNull(url);
-    return url.startsWith(CONNECT_STRING_PREFIX) || url.startsWith(CONNECT_STRING_PREFIX_DEPRECATED);
+    return url.startsWith(CONNECT_STRING_PREFIX)
+        || url.startsWith(CONNECT_STRING_PREFIX_DEPRECATED);
   }
 
   /**
-   * Parses the provided url based on the format this driver accepts, retrieving
-   * arguments after the {@link #CONNECT_STRING_PREFIX}.
-   * <p>
-   * This method gets the args if the provided URL follows this pattern:
-   * {@code jdbc:arrow-flight-sql://<host>:<port>[/?key1=val1&key2=val2&(...)]}
+   * Parses the provided url based on the format this driver accepts, retrieving arguments after the
+   * {@link #CONNECT_STRING_PREFIX}.
+   *
+   * <p>This method gets the args if the provided URL follows this pattern: {@code
+   * jdbc:arrow-flight-sql://<host>:<port>[/?key1=val1&key2=val2&(...)]}
    *
    * <table border="1">
    *    <tr>
@@ -210,8 +216,7 @@ public boolean acceptsURL(final String url) {
    * @throws SQLException If an error occurs while trying to parse the URL.
    */
   @VisibleForTesting // ArrowFlightJdbcDriverTest
-  Optional<Map<Object, Object>> getUrlsArgs(String url)
-      throws SQLException {
+  Optional<Map<Object, Object>> getUrlsArgs(String url) throws SQLException {
 
     /*
      *
@@ -230,8 +235,9 @@ Optional<Map<Object, Object>> getUrlsArgs(String url)
     url = replaceSemiColons(url);
 
     if (!url.startsWith("jdbc:")) {
-      throw new SQLException("Connection string must start with 'jdbc:'. Expected format: " +
-          CONNECTION_STRING_EXPECTED);
+      throw new SQLException(
+          "Connection string must start with 'jdbc:'. Expected format: "
+              + CONNECTION_STRING_EXPECTED);
     }
 
     // It's necessary to use a string without "jdbc:" at the beginning to be parsed as a valid URL.
@@ -245,15 +251,17 @@ Optional<Map<Object, Object>> getUrlsArgs(String url)
       throw new SQLException("Malformed/invalid URL!", e);
     }
 
-    if (!Objects.equals(uri.getScheme(), "arrow-flight") &&
-        !Objects.equals(uri.getScheme(), "arrow-flight-sql")) {
+    if (!Objects.equals(uri.getScheme(), "arrow-flight")
+        && !Objects.equals(uri.getScheme(), "arrow-flight-sql")) {
       return Optional.empty();
     }
 
     if (uri.getHost() == null) {
-      throw new SQLException("URL must have a host. Expected format: " + CONNECTION_STRING_EXPECTED);
+      throw new SQLException(
+          "URL must have a host. Expected format: " + CONNECTION_STRING_EXPECTED);
     } else if (uri.getPort() < 0) {
-      throw new SQLException("URL must have a port. Expected format: " + CONNECTION_STRING_EXPECTED);
+      throw new SQLException(
+          "URL must have a port. Expected format: " + CONNECTION_STRING_EXPECTED);
     }
     resultMap.put(ArrowFlightConnectionProperty.HOST.camelName(), uri.getHost()); // host
     resultMap.put(ArrowFlightConnectionProperty.PORT.camelName(), uri.getPort()); // port
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFactory.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFactory.java
index 16bdede02d039..e1ccfc820f0d6 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFactory.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFactory.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.util.Properties;
 import java.util.TimeZone;
-
 import org.apache.arrow.driver.jdbc.client.ArrowFlightSqlClientHandler;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.calcite.avatica.AvaticaConnection;
@@ -33,9 +31,7 @@
 import org.apache.calcite.avatica.QueryState;
 import org.apache.calcite.avatica.UnregisteredDriver;
 
-/**
- * Factory for the Arrow Flight JDBC Driver.
- */
+/** Factory for the Arrow Flight JDBC Driver. */
 public class ArrowFlightJdbcFactory implements AvaticaFactory {
   private final int major;
   private final int minor;
@@ -51,16 +47,14 @@ private ArrowFlightJdbcFactory(final int major, final int minor) {
   }
 
   @Override
-  public AvaticaConnection newConnection(final UnregisteredDriver driver,
-                                         final AvaticaFactory factory,
-                                         final String url,
-                                         final Properties info) throws SQLException {
+  public AvaticaConnection newConnection(
+      final UnregisteredDriver driver,
+      final AvaticaFactory factory,
+      final String url,
+      final Properties info)
+      throws SQLException {
     return ArrowFlightConnection.createNewConnection(
-        (ArrowFlightJdbcDriver) driver,
-        factory,
-        url,
-        info,
-        new RootAllocator(Long.MAX_VALUE));
+        (ArrowFlightJdbcDriver) driver, factory, url, info, new RootAllocator(Long.MAX_VALUE));
   }
 
   @Override
@@ -70,8 +64,12 @@ public AvaticaStatement newStatement(
       final int resultType,
       final int resultSetConcurrency,
       final int resultSetHoldability) {
-    return new ArrowFlightStatement((ArrowFlightConnection) connection,
-        handle, resultType, resultSetConcurrency, resultSetHoldability);
+    return new ArrowFlightStatement(
+        (ArrowFlightConnection) connection,
+        handle,
+        resultType,
+        resultSetConcurrency,
+        resultSetHoldability);
   }
 
   @Override
@@ -81,27 +79,34 @@ public ArrowFlightPreparedStatement newPreparedStatement(
       final Meta.Signature signature,
       final int resultType,
       final int resultSetConcurrency,
-      final int resultSetHoldability) throws SQLException {
+      final int resultSetHoldability)
+      throws SQLException {
     final ArrowFlightConnection flightConnection = (ArrowFlightConnection) connection;
     ArrowFlightSqlClientHandler.PreparedStatement preparedStatement =
         flightConnection.getMeta().getPreparedStatement(statementHandle);
 
     return ArrowFlightPreparedStatement.newPreparedStatement(
-        flightConnection, preparedStatement, statementHandle,
-        signature, resultType, resultSetConcurrency, resultSetHoldability);
+        flightConnection,
+        preparedStatement,
+        statementHandle,
+        signature,
+        resultType,
+        resultSetConcurrency,
+        resultSetHoldability);
   }
 
   @Override
-  public ArrowFlightJdbcVectorSchemaRootResultSet newResultSet(final AvaticaStatement statement,
-                                                               final QueryState state,
-                                                               final Meta.Signature signature,
-                                                               final TimeZone timeZone,
-                                                               final Meta.Frame frame)
+  public ArrowFlightJdbcVectorSchemaRootResultSet newResultSet(
+      final AvaticaStatement statement,
+      final QueryState state,
+      final Meta.Signature signature,
+      final TimeZone timeZone,
+      final Meta.Frame frame)
       throws SQLException {
     final ResultSetMetaData metaData = newResultSetMetaData(statement, signature);
 
-    return new ArrowFlightJdbcFlightStreamResultSet(statement, state, signature, metaData, timeZone,
-        frame);
+    return new ArrowFlightJdbcFlightStreamResultSet(
+        statement, state, signature, metaData, timeZone, frame);
   }
 
   @Override
@@ -111,10 +116,8 @@ public AvaticaSpecificDatabaseMetaData newDatabaseMetaData(final AvaticaConnecti
 
   @Override
   public ResultSetMetaData newResultSetMetaData(
-      final AvaticaStatement avaticaStatement,
-      final Meta.Signature signature) {
-    return new AvaticaResultSetMetaData(avaticaStatement,
-        null, signature);
+      final AvaticaStatement avaticaStatement, final Meta.Signature signature) {
+    return new AvaticaResultSetMetaData(avaticaStatement, null, signature);
   }
 
   @Override
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFlightStreamResultSet.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFlightStreamResultSet.java
index f69681d77a585..aabaf01e638a4 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFlightStreamResultSet.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFlightStreamResultSet.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import static org.apache.arrow.driver.jdbc.utils.FlightEndpointDataQueue.createNewQueue;
@@ -25,7 +24,6 @@
 import java.util.Optional;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.driver.jdbc.client.CloseableEndpointStreamPair;
 import org.apache.arrow.driver.jdbc.utils.FlightEndpointDataQueue;
 import org.apache.arrow.driver.jdbc.utils.VectorSchemaRootTransformer;
@@ -41,8 +39,8 @@
 import org.apache.calcite.avatica.QueryState;
 
 /**
- * {@link ResultSet} implementation for Arrow Flight used to access the results of multiple {@link FlightStream}
- * objects.
+ * {@link ResultSet} implementation for Arrow Flight used to access the results of multiple {@link
+ * FlightStream} objects.
  */
 public final class ArrowFlightJdbcFlightStreamResultSet
     extends ArrowFlightJdbcVectorSchemaRootResultSet {
@@ -57,49 +55,50 @@ public final class ArrowFlightJdbcFlightStreamResultSet
 
   private Schema schema;
 
-  /**
-   * Public constructor used by ArrowFlightJdbcFactory.
-   */
-  ArrowFlightJdbcFlightStreamResultSet(final AvaticaStatement statement,
-                                       final QueryState state,
-                                       final Meta.Signature signature,
-                                       final ResultSetMetaData resultSetMetaData,
-                                       final TimeZone timeZone,
-                                       final Meta.Frame firstFrame) throws SQLException {
+  /** Public constructor used by ArrowFlightJdbcFactory. */
+  ArrowFlightJdbcFlightStreamResultSet(
+      final AvaticaStatement statement,
+      final QueryState state,
+      final Meta.Signature signature,
+      final ResultSetMetaData resultSetMetaData,
+      final TimeZone timeZone,
+      final Meta.Frame firstFrame)
+      throws SQLException {
     super(statement, state, signature, resultSetMetaData, timeZone, firstFrame);
     this.connection = (ArrowFlightConnection) statement.connection;
     this.flightInfo = ((ArrowFlightInfoStatement) statement).executeFlightInfoQuery();
   }
 
-  /**
-   * Private constructor for fromFlightInfo.
-   */
-  private ArrowFlightJdbcFlightStreamResultSet(final ArrowFlightConnection connection,
-                                               final QueryState state,
-                                               final Meta.Signature signature,
-                                               final ResultSetMetaData resultSetMetaData,
-                                               final TimeZone timeZone,
-                                               final Meta.Frame firstFrame,
-                                               final FlightInfo flightInfo
-  ) throws SQLException {
+  /** Private constructor for fromFlightInfo. */
+  private ArrowFlightJdbcFlightStreamResultSet(
+      final ArrowFlightConnection connection,
+      final QueryState state,
+      final Meta.Signature signature,
+      final ResultSetMetaData resultSetMetaData,
+      final TimeZone timeZone,
+      final Meta.Frame firstFrame,
+      final FlightInfo flightInfo)
+      throws SQLException {
     super(null, state, signature, resultSetMetaData, timeZone, firstFrame);
     this.connection = connection;
     this.flightInfo = flightInfo;
   }
 
   /**
-   * Create a {@link ResultSet} which pulls data from given {@link FlightInfo}. This is used to fetch result sets
-   * from DatabaseMetadata calls and skips the Avatica factory.
+   * Create a {@link ResultSet} which pulls data from given {@link FlightInfo}. This is used to
+   * fetch result sets from DatabaseMetadata calls and skips the Avatica factory.
    *
-   * @param connection  The connection linked to the returned ResultSet.
-   * @param flightInfo  The FlightInfo from which data will be iterated by the returned ResultSet.
-   * @param transformer Optional transformer for processing VectorSchemaRoot before access from ResultSet
+   * @param connection The connection linked to the returned ResultSet.
+   * @param flightInfo The FlightInfo from which data will be iterated by the returned ResultSet.
+   * @param transformer Optional transformer for processing VectorSchemaRoot before access from
+   *     ResultSet
    * @return A ResultSet which pulls data from given FlightInfo.
    */
   static ArrowFlightJdbcFlightStreamResultSet fromFlightInfo(
       final ArrowFlightConnection connection,
       final FlightInfo flightInfo,
-      final VectorSchemaRootTransformer transformer) throws SQLException {
+      final VectorSchemaRootTransformer transformer)
+      throws SQLException {
     // Similar to how org.apache.calcite.avatica.util.ArrayFactoryImpl does
 
     final TimeZone timeZone = TimeZone.getDefault();
@@ -110,8 +109,8 @@ static ArrowFlightJdbcFlightStreamResultSet fromFlightInfo(
     final AvaticaResultSetMetaData resultSetMetaData =
         new AvaticaResultSetMetaData(null, null, signature);
     final ArrowFlightJdbcFlightStreamResultSet resultSet =
-        new ArrowFlightJdbcFlightStreamResultSet(connection, state, signature, resultSetMetaData,
-            timeZone, null, flightInfo);
+        new ArrowFlightJdbcFlightStreamResultSet(
+            connection, state, signature, resultSetMetaData, timeZone, null, flightInfo);
 
     resultSet.transformer = transformer;
 
@@ -167,9 +166,7 @@ private void populateDataForCurrentFlightStream() throws SQLException {
     populateData(currentVectorSchemaRoot, schema);
   }
 
-  /**
-   * Expose appMetadata associated with the underlying FlightInfo for this ResultSet.
-   */
+  /** Expose appMetadata associated with the underlying FlightInfo for this ResultSet. */
   public byte[] getAppMetadata() {
     return flightInfo.getAppMetadata();
   }
@@ -253,11 +250,13 @@ public synchronized void close() {
     }
   }
 
-  private CloseableEndpointStreamPair getNextEndpointStream(final boolean canTimeout) throws SQLException {
+  private CloseableEndpointStreamPair getNextEndpointStream(final boolean canTimeout)
+      throws SQLException {
     if (canTimeout) {
       final int statementTimeout = statement != null ? statement.getQueryTimeout() : 0;
-      return statementTimeout != 0 ?
-          flightEndpointDataQueue.next(statementTimeout, TimeUnit.SECONDS) : flightEndpointDataQueue.next();
+      return statementTimeout != 0
+          ? flightEndpointDataQueue.next(statementTimeout, TimeUnit.SECONDS)
+          : flightEndpointDataQueue.next();
     } else {
       return flightEndpointDataQueue.next();
     }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcPooledConnection.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcPooledConnection.java
index 96a2d9dda1d18..96dd356141acd 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcPooledConnection.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcPooledConnection.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import java.sql.Connection;
@@ -23,17 +22,13 @@
 import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
-
 import javax.sql.ConnectionEvent;
 import javax.sql.ConnectionEventListener;
 import javax.sql.PooledConnection;
 import javax.sql.StatementEventListener;
-
 import org.apache.arrow.driver.jdbc.utils.ConnectionWrapper;
 
-/**
- * {@link PooledConnection} implementation for Arrow Flight JDBC Driver.
- */
+/** {@link PooledConnection} implementation for Arrow Flight JDBC Driver. */
 public class ArrowFlightJdbcPooledConnection implements PooledConnection {
 
   private final ArrowFlightConnection connection;
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcTime.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcTime.java
index 109048bc05c91..f87d7f9004c30 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcTime.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcTime.java
@@ -14,24 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import static org.apache.calcite.avatica.util.DateTimeUtils.MILLIS_PER_DAY;
 
+import com.google.common.collect.ImmutableList;
 import java.sql.Time;
 import java.time.LocalTime;
 import java.time.temporal.ChronoField;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.util.VisibleForTesting;
 
-import com.google.common.collect.ImmutableList;
-
 /**
- * Wrapper class for Time objects to include the milliseconds part in ISO 8601 format in this#toString.
+ * Wrapper class for Time objects to include the milliseconds part in ISO 8601 format in
+ * this#toString.
  */
 public class ArrowFlightJdbcTime extends Time {
   private static final List<String> LEADING_ZEROES = ImmutableList.of("", "0", "00");
@@ -54,7 +52,8 @@ public ArrowFlightJdbcTime(final long milliseconds) {
 
   @VisibleForTesting
   ArrowFlightJdbcTime(final LocalTime time) {
-    // Although the constructor is deprecated, this is the exact same code as Time#valueOf(LocalTime)
+    // Although the constructor is deprecated, this is the exact same code as
+    // Time#valueOf(LocalTime)
     super(time.getHour(), time.getMinute(), time.getSecond());
     millisReprValue = time.get(ChronoField.MILLI_OF_SECOND);
   }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcVectorSchemaRootResultSet.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcVectorSchemaRootResultSet.java
index 626ae95bc5bbe..0dc2b07c974f6 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcVectorSchemaRootResultSet.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcVectorSchemaRootResultSet.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import java.sql.ResultSet;
@@ -25,7 +24,6 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.TimeZone;
-
 import org.apache.arrow.driver.jdbc.utils.ConvertUtils;
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.vector.VectorSchemaRoot;
@@ -41,19 +39,20 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * {@link ResultSet} implementation used to access a {@link VectorSchemaRoot}.
- */
+/** {@link ResultSet} implementation used to access a {@link VectorSchemaRoot}. */
 public class ArrowFlightJdbcVectorSchemaRootResultSet extends AvaticaResultSet {
 
   private static final Logger LOGGER =
       LoggerFactory.getLogger(ArrowFlightJdbcVectorSchemaRootResultSet.class);
   VectorSchemaRoot vectorSchemaRoot;
 
-  ArrowFlightJdbcVectorSchemaRootResultSet(final AvaticaStatement statement, final QueryState state,
-                                           final Signature signature,
-                                           final ResultSetMetaData resultSetMetaData,
-                                           final TimeZone timeZone, final Frame firstFrame)
+  ArrowFlightJdbcVectorSchemaRootResultSet(
+      final AvaticaStatement statement,
+      final QueryState state,
+      final Signature signature,
+      final ResultSetMetaData resultSetMetaData,
+      final TimeZone timeZone,
+      final Frame firstFrame)
       throws SQLException {
     super(statement, state, signature, resultSetMetaData, timeZone, firstFrame);
   }
@@ -65,8 +64,7 @@ public class ArrowFlightJdbcVectorSchemaRootResultSet extends AvaticaResultSet {
    * @return a ResultSet which accesses the given VectorSchemaRoot
    */
   public static ArrowFlightJdbcVectorSchemaRootResultSet fromVectorSchemaRoot(
-      final VectorSchemaRoot vectorSchemaRoot)
-      throws SQLException {
+      final VectorSchemaRoot vectorSchemaRoot) throws SQLException {
     // Similar to how org.apache.calcite.avatica.util.ArrayFactoryImpl does
 
     final TimeZone timeZone = TimeZone.getDefault();
@@ -76,10 +74,9 @@ public static ArrowFlightJdbcVectorSchemaRootResultSet fromVectorSchemaRoot(
 
     final AvaticaResultSetMetaData resultSetMetaData =
         new AvaticaResultSetMetaData(null, null, signature);
-    final ArrowFlightJdbcVectorSchemaRootResultSet
-        resultSet =
-        new ArrowFlightJdbcVectorSchemaRootResultSet(null, state, signature, resultSetMetaData,
-            timeZone, null);
+    final ArrowFlightJdbcVectorSchemaRootResultSet resultSet =
+        new ArrowFlightJdbcVectorSchemaRootResultSet(
+            null, state, signature, resultSetMetaData, timeZone, null);
 
     resultSet.populateData(vectorSchemaRoot);
     return resultSet;
@@ -96,7 +93,8 @@ void populateData(final VectorSchemaRoot vectorSchemaRoot) {
 
   void populateData(final VectorSchemaRoot vectorSchemaRoot, final Schema schema) {
     Schema currentSchema = schema == null ? vectorSchemaRoot.getSchema() : schema;
-    final List<ColumnMetaData> columns = ConvertUtils.convertArrowFieldsToColumnMetaDataList(currentSchema.getFields());
+    final List<ColumnMetaData> columns =
+        ConvertUtils.convertArrowFieldsToColumnMetaDataList(currentSchema.getFields());
     signature.columns.clear();
     signature.columns.addAll(columns);
 
@@ -138,9 +136,11 @@ public void close() {
       }
     }
     exceptions.parallelStream().forEach(e -> LOGGER.error(e.getMessage(), e));
-    exceptions.stream().findAny().ifPresent(e -> {
-      throw new RuntimeException(e);
-    });
+    exceptions.stream()
+        .findAny()
+        .ifPresent(
+            e -> {
+              throw new RuntimeException(e);
+            });
   }
-
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightMetaImpl.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightMetaImpl.java
index d25f03ac27b48..9c7112f1c30d8 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightMetaImpl.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightMetaImpl.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import java.sql.Connection;
@@ -25,7 +24,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-
 import org.apache.arrow.driver.jdbc.client.ArrowFlightSqlClientHandler.PreparedStatement;
 import org.apache.arrow.driver.jdbc.utils.AvaticaParameterBinder;
 import org.apache.arrow.driver.jdbc.utils.ConvertUtils;
@@ -39,14 +37,13 @@
 import org.apache.calcite.avatica.QueryState;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * Metadata handler for Arrow Flight.
- */
+/** Metadata handler for Arrow Flight. */
 public class ArrowFlightMetaImpl extends MetaImpl {
   private final Map<StatementHandleKey, PreparedStatement> statementHandlePreparedStatementMap;
 
   /**
    * Constructs a {@link MetaImpl} object specific for Arrow Flight.
+   *
    * @param connection A {@link AvaticaConnection}.
    */
   public ArrowFlightMetaImpl(final AvaticaConnection connection) {
@@ -55,14 +52,16 @@ public ArrowFlightMetaImpl(final AvaticaConnection connection) {
     setDefaultConnectionProperties();
   }
 
-  /**
-   * Construct a signature.
-   */
+  /** Construct a signature. */
   static Signature newSignature(final String sql, Schema resultSetSchema, Schema parameterSchema) {
-    List<ColumnMetaData> columnMetaData = resultSetSchema == null ?
-            new ArrayList<>() : ConvertUtils.convertArrowFieldsToColumnMetaDataList(resultSetSchema.getFields());
-    List<AvaticaParameter> parameters = parameterSchema == null ?
-            new ArrayList<>() : ConvertUtils.convertArrowFieldsToAvaticaParameters(parameterSchema.getFields());
+    List<ColumnMetaData> columnMetaData =
+        resultSetSchema == null
+            ? new ArrayList<>()
+            : ConvertUtils.convertArrowFieldsToColumnMetaDataList(resultSetSchema.getFields());
+    List<AvaticaParameter> parameters =
+        parameterSchema == null
+            ? new ArrayList<>()
+            : ConvertUtils.convertArrowFieldsToAvaticaParameters(parameterSchema.getFields());
 
     return new Signature(
         columnMetaData,
@@ -70,15 +69,15 @@ static Signature newSignature(final String sql, Schema resultSetSchema, Schema p
         parameters,
         Collections.emptyMap(),
         null, // unnecessary, as SQL requests use ArrowFlightJdbcCursor
-        StatementType.SELECT
-    );
+        StatementType.SELECT);
   }
 
   @Override
   public void closeStatement(final StatementHandle statementHandle) {
     PreparedStatement preparedStatement =
         statementHandlePreparedStatementMap.remove(new StatementHandleKey(statementHandle));
-    // Testing if the prepared statement was created because the statement can be not created until this moment
+    // Testing if the prepared statement was created because the statement can be not created until
+    // this moment
     if (preparedStatement != null) {
       preparedStatement.close();
     }
@@ -90,54 +89,64 @@ public void commit(final ConnectionHandle connectionHandle) {
   }
 
   @Override
-  public ExecuteResult execute(final StatementHandle statementHandle,
-                               final List<TypedValue> typedValues, final long maxRowCount) {
-    Preconditions.checkArgument(connection.id.equals(statementHandle.connectionId),
-            "Connection IDs are not consistent");
+  public ExecuteResult execute(
+      final StatementHandle statementHandle,
+      final List<TypedValue> typedValues,
+      final long maxRowCount) {
+    Preconditions.checkArgument(
+        connection.id.equals(statementHandle.connectionId), "Connection IDs are not consistent");
     PreparedStatement preparedStatement = getPreparedStatement(statementHandle);
 
     if (preparedStatement == null) {
       throw new IllegalStateException("Prepared statement not found: " + statementHandle);
     }
 
-
-    new AvaticaParameterBinder(preparedStatement, ((ArrowFlightConnection) connection).getBufferAllocator())
-            .bind(typedValues);
+    new AvaticaParameterBinder(
+            preparedStatement, ((ArrowFlightConnection) connection).getBufferAllocator())
+        .bind(typedValues);
 
     if (statementHandle.signature == null) {
       // Update query
       long updatedCount = preparedStatement.executeUpdate();
-      return new ExecuteResult(Collections.singletonList(MetaResultSet.count(statementHandle.connectionId,
-              statementHandle.id, updatedCount)));
+      return new ExecuteResult(
+          Collections.singletonList(
+              MetaResultSet.count(statementHandle.connectionId, statementHandle.id, updatedCount)));
     } else {
       // TODO Why is maxRowCount ignored?
       return new ExecuteResult(
-              Collections.singletonList(MetaResultSet.create(
-                      statementHandle.connectionId, statementHandle.id,
-                      true, statementHandle.signature, null)));
+          Collections.singletonList(
+              MetaResultSet.create(
+                  statementHandle.connectionId,
+                  statementHandle.id,
+                  true,
+                  statementHandle.signature,
+                  null)));
     }
   }
 
   @Override
-  public ExecuteResult execute(final StatementHandle statementHandle,
-                               final List<TypedValue> typedValues, final int maxRowsInFirstFrame) {
+  public ExecuteResult execute(
+      final StatementHandle statementHandle,
+      final List<TypedValue> typedValues,
+      final int maxRowsInFirstFrame) {
     return execute(statementHandle, typedValues, (long) maxRowsInFirstFrame);
   }
 
   @Override
-  public ExecuteBatchResult executeBatch(final StatementHandle statementHandle,
-                                         final List<List<TypedValue>> parameterValuesList)
+  public ExecuteBatchResult executeBatch(
+      final StatementHandle statementHandle, final List<List<TypedValue>> parameterValuesList)
       throws IllegalStateException {
-    Preconditions.checkArgument(connection.id.equals(statementHandle.connectionId),
-            "Connection IDs are not consistent");
+    Preconditions.checkArgument(
+        connection.id.equals(statementHandle.connectionId), "Connection IDs are not consistent");
     PreparedStatement preparedStatement = getPreparedStatement(statementHandle);
 
     if (preparedStatement == null) {
       throw new IllegalStateException("Prepared statement not found: " + statementHandle);
     }
 
-    final AvaticaParameterBinder binder = new AvaticaParameterBinder(preparedStatement,
-            ((ArrowFlightConnection) connection).getBufferAllocator());
+    final AvaticaParameterBinder binder =
+        new AvaticaParameterBinder(
+            preparedStatement, ((ArrowFlightConnection) connection).getBufferAllocator());
     for (int i = 0; i < parameterValuesList.size(); i++) {
       binder.bind(parameterValuesList.get(i), i);
     }
@@ -148,49 +157,53 @@ public ExecuteBatchResult executeBatch(final StatementHandle statementHandle,
   }
 
   @Override
-  public Frame fetch(final StatementHandle statementHandle, final long offset,
-                     final int fetchMaxRowCount) {
+  public Frame fetch(
+      final StatementHandle statementHandle, final long offset, final int fetchMaxRowCount) {
     /*
      * ArrowFlightMetaImpl does not use frames.
      * Instead, we have accessors that contain a VectorSchemaRoot with
      * the results.
      */
     throw AvaticaConnection.HELPER.wrap(
-        String.format("%s does not use frames.", this),
-        AvaticaConnection.HELPER.unsupported());
+        String.format("%s does not use frames.", this), AvaticaConnection.HELPER.unsupported());
   }
 
   private PreparedStatement prepareForHandle(final String query, StatementHandle handle) {
     final PreparedStatement preparedStatement =
         ((ArrowFlightConnection) connection).getClientHandler().prepare(query);
-    handle.signature = newSignature(query, preparedStatement.getDataSetSchema(),
-            preparedStatement.getParameterSchema());
+    handle.signature =
+        newSignature(
+            query, preparedStatement.getDataSetSchema(), preparedStatement.getParameterSchema());
     statementHandlePreparedStatementMap.put(new StatementHandleKey(handle), preparedStatement);
     return preparedStatement;
   }
 
   @Override
-  public StatementHandle prepare(final ConnectionHandle connectionHandle,
-                                 final String query, final long maxRowCount) {
+  public StatementHandle prepare(
+      final ConnectionHandle connectionHandle, final String query, final long maxRowCount) {
     final StatementHandle handle = super.createStatement(connectionHandle);
     prepareForHandle(query, handle);
     return handle;
   }
 
   @Override
-  public ExecuteResult prepareAndExecute(final StatementHandle statementHandle,
-                                         final String query, final long maxRowCount,
-                                         final PrepareCallback prepareCallback)
+  public ExecuteResult prepareAndExecute(
+      final StatementHandle statementHandle,
+      final String query,
+      final long maxRowCount,
+      final PrepareCallback prepareCallback)
       throws NoSuchStatementException {
     return prepareAndExecute(
         statementHandle, query, maxRowCount, -1 /* Not used */, prepareCallback);
   }
 
   @Override
-  public ExecuteResult prepareAndExecute(final StatementHandle handle,
-                                         final String query, final long maxRowCount,
-                                         final int maxRowsInFirstFrame,
-                                         final PrepareCallback callback)
+  public ExecuteResult prepareAndExecute(
+      final StatementHandle handle,
+      final String query,
+      final long maxRowCount,
+      final int maxRowsInFirstFrame,
+      final PrepareCallback callback)
       throws NoSuchStatementException {
     try {
       PreparedStatement preparedStatement = prepareForHandle(query, handle);
@@ -203,11 +216,12 @@ public ExecuteResult prepareAndExecute(final StatementHandle handle,
         callback.assign(handle.signature, null, updateCount);
       }
       callback.execute();
-      final MetaResultSet metaResultSet = MetaResultSet.create(handle.connectionId, handle.id,
-          false, handle.signature, null);
+      final MetaResultSet metaResultSet =
+          MetaResultSet.create(handle.connectionId, handle.id, false, handle.signature, null);
       return new ExecuteResult(Collections.singletonList(metaResultSet));
     } catch (SQLTimeoutException e) {
-      // So far AvaticaStatement(executeInternal) only handles NoSuchStatement and Runtime Exceptions.
+      // So far AvaticaStatement(executeInternal) only handles NoSuchStatement and Runtime
+      // Exceptions.
       throw new RuntimeException(e);
     } catch (SQLException e) {
       throw new NoSuchStatementException(handle);
@@ -228,8 +242,8 @@ public void rollback(final ConnectionHandle connectionHandle) {
   }
 
   @Override
-  public boolean syncResults(final StatementHandle statementHandle,
-                             final QueryState queryState, final long offset)
+  public boolean syncResults(
+      final StatementHandle statementHandle, final QueryState queryState, final long offset)
       throws NoSuchStatementException {
     // TODO Fill this stub.
     return false;
@@ -237,7 +251,8 @@ public boolean syncResults(final StatementHandle statementHandle,
 
   void setDefaultConnectionProperties() {
     // TODO Double-check this.
-    connProps.setDirty(false)
+    connProps
+        .setDirty(false)
         .setAutoCommit(true)
         .setReadOnly(true)
         .setCatalog(null)
@@ -249,7 +264,8 @@ PreparedStatement getPreparedStatement(StatementHandle statementHandle) {
     return statementHandlePreparedStatementMap.get(new StatementHandleKey(statementHandle));
   }
 
-  // Helper used to look up prepared statement instances later. Avatica doesn't give us the signature in
+  // Helper used to look up prepared statement instances later. Avatica doesn't give us the
+  // signature in
   // an UPDATE code path so we can't directly use StatementHandle as a map key.
   private static final class StatementHandleKey {
     public final String connectionId;
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightPreparedStatement.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightPreparedStatement.java
index 7203f02daa9a1..d7af6902f43b8 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightPreparedStatement.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightPreparedStatement.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-
 import org.apache.arrow.driver.jdbc.client.ArrowFlightSqlClientHandler;
 import org.apache.arrow.flight.FlightInfo;
 import org.apache.arrow.util.Preconditions;
@@ -27,36 +25,42 @@
 import org.apache.calcite.avatica.Meta.Signature;
 import org.apache.calcite.avatica.Meta.StatementHandle;
 
-
-/**
- * Arrow Flight JBCS's implementation {@link PreparedStatement}.
- */
+/** Arrow Flight JBCS's implementation {@link PreparedStatement}. */
 public class ArrowFlightPreparedStatement extends AvaticaPreparedStatement
     implements ArrowFlightInfoStatement {
 
   private final ArrowFlightSqlClientHandler.PreparedStatement preparedStatement;
 
-  private ArrowFlightPreparedStatement(final ArrowFlightConnection connection,
-                                       final ArrowFlightSqlClientHandler.PreparedStatement preparedStatement,
-                                       final StatementHandle handle,
-                                       final Signature signature, final int resultSetType,
-                                       final int resultSetConcurrency,
-                                       final int resultSetHoldability)
+  private ArrowFlightPreparedStatement(
+      final ArrowFlightConnection connection,
+      final ArrowFlightSqlClientHandler.PreparedStatement preparedStatement,
+      final StatementHandle handle,
+      final Signature signature,
+      final int resultSetType,
+      final int resultSetConcurrency,
+      final int resultSetHoldability)
       throws SQLException {
     super(connection, handle, signature, resultSetType, resultSetConcurrency, resultSetHoldability);
     this.preparedStatement = Preconditions.checkNotNull(preparedStatement);
   }
 
-  static ArrowFlightPreparedStatement newPreparedStatement(final ArrowFlightConnection connection,
+  static ArrowFlightPreparedStatement newPreparedStatement(
+      final ArrowFlightConnection connection,
       final ArrowFlightSqlClientHandler.PreparedStatement preparedStmt,
       final StatementHandle statementHandle,
       final Signature signature,
       final int resultSetType,
       final int resultSetConcurrency,
-      final int resultSetHoldability) throws SQLException {
+      final int resultSetHoldability)
+      throws SQLException {
     return new ArrowFlightPreparedStatement(
-        connection, preparedStmt, statementHandle,
-        signature, resultSetType, resultSetConcurrency, resultSetHoldability);
+        connection,
+        preparedStmt,
+        statementHandle,
+        signature,
+        resultSetType,
+        resultSetConcurrency,
+        resultSetHoldability);
   }
 
   @Override
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightStatement.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightStatement.java
index 5bc7c2ab9b4f8..577aee3b4ac6b 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightStatement.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightStatement.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import java.sql.SQLException;
-
 import org.apache.arrow.driver.jdbc.client.ArrowFlightSqlClientHandler.PreparedStatement;
 import org.apache.arrow.driver.jdbc.utils.ConvertUtils;
 import org.apache.arrow.flight.FlightInfo;
@@ -27,14 +25,15 @@
 import org.apache.calcite.avatica.Meta;
 import org.apache.calcite.avatica.Meta.StatementHandle;
 
-/**
- * A SQL statement for querying data from an Arrow Flight server.
- */
+/** A SQL statement for querying data from an Arrow Flight server. */
 public class ArrowFlightStatement extends AvaticaStatement implements ArrowFlightInfoStatement {
 
-  ArrowFlightStatement(final ArrowFlightConnection connection,
-                       final StatementHandle handle, final int resultSetType,
-                       final int resultSetConcurrency, final int resultSetHoldability) {
+  ArrowFlightStatement(
+      final ArrowFlightConnection connection,
+      final StatementHandle handle,
+      final int resultSetType,
+      final int resultSetConcurrency,
+      final int resultSetHoldability) {
     super(connection, handle, resultSetType, resultSetConcurrency, resultSetHoldability);
   }
 
@@ -45,14 +44,16 @@ public ArrowFlightConnection getConnection() throws SQLException {
 
   @Override
   public FlightInfo executeFlightInfoQuery() throws SQLException {
-    final PreparedStatement preparedStatement = getConnection().getMeta().getPreparedStatement(handle);
+    final PreparedStatement preparedStatement =
+        getConnection().getMeta().getPreparedStatement(handle);
     final Meta.Signature signature = getSignature();
     if (signature == null) {
       return null;
     }
 
     final Schema resultSetSchema = preparedStatement.getDataSetSchema();
-    signature.columns.addAll(ConvertUtils.convertArrowFieldsToColumnMetaDataList(resultSetSchema.getFields()));
+    signature.columns.addAll(
+        ConvertUtils.convertArrowFieldsToColumnMetaDataList(resultSetSchema.getFields()));
     setSignature(signature);
 
     return preparedStatement.executeQuery();
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/ArrowFlightJdbcAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/ArrowFlightJdbcAccessor.java
index 3821ee1dc8755..f0fa55fa826bb 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/ArrowFlightJdbcAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/ArrowFlightJdbcAccessor.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor;
 
 import static org.apache.calcite.avatica.util.Cursor.Accessor;
@@ -38,9 +37,7 @@
 import java.util.Map;
 import java.util.function.IntSupplier;
 
-/**
- * Base Jdbc Accessor.
- */
+/** Base Jdbc Accessor. */
 public abstract class ArrowFlightJdbcAccessor implements Accessor {
   private final IntSupplier currentRowSupplier;
 
@@ -48,8 +45,9 @@ public abstract class ArrowFlightJdbcAccessor implements Accessor {
   protected boolean wasNull;
   protected ArrowFlightJdbcAccessorFactory.WasNullConsumer wasNullConsumer;
 
-  protected ArrowFlightJdbcAccessor(final IntSupplier currentRowSupplier,
-                                    ArrowFlightJdbcAccessorFactory.WasNullConsumer wasNullConsumer) {
+  protected ArrowFlightJdbcAccessor(
+      final IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer wasNullConsumer) {
     this.currentRowSupplier = currentRowSupplier;
     this.wasNullConsumer = wasNullConsumer;
   }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/ArrowFlightJdbcAccessorFactory.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/ArrowFlightJdbcAccessorFactory.java
index 813b40a8070f7..dad1fa5f73acd 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/ArrowFlightJdbcAccessorFactory.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/ArrowFlightJdbcAccessorFactory.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor;
 
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.impl.ArrowFlightJdbcNullVectorAccessor;
 import org.apache.arrow.driver.jdbc.accessor.impl.binary.ArrowFlightJdbcBinaryVectorAccessor;
 import org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcDateVectorAccessor;
@@ -51,6 +49,7 @@
 import org.apache.arrow.vector.Float8Vector;
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.IntervalDayVector;
+import org.apache.arrow.vector.IntervalMonthDayNanoVector;
 import org.apache.arrow.vector.IntervalYearVector;
 import org.apache.arrow.vector.LargeVarBinaryVector;
 import org.apache.arrow.vector.LargeVarCharVector;
@@ -77,136 +76,135 @@
 import org.apache.arrow.vector.complex.StructVector;
 import org.apache.arrow.vector.complex.UnionVector;
 
-/**
- * Factory to instantiate the accessors.
- */
+/** Factory to instantiate the accessors. */
 public class ArrowFlightJdbcAccessorFactory {
 
   /**
    * Create an accessor according to its type.
    *
-   * @param vector        an instance of an arrow vector.
+   * @param vector an instance of an arrow vector.
    * @param getCurrentRow a supplier to check which row is being accessed.
    * @return an instance of one of the accessors.
    */
-  public static ArrowFlightJdbcAccessor createAccessor(ValueVector vector,
-                                                       IntSupplier getCurrentRow,
-                                                       WasNullConsumer setCursorWasNull) {
+  public static ArrowFlightJdbcAccessor createAccessor(
+      ValueVector vector, IntSupplier getCurrentRow, WasNullConsumer setCursorWasNull) {
     if (vector instanceof UInt1Vector) {
-      return new ArrowFlightJdbcBaseIntVectorAccessor((UInt1Vector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcBaseIntVectorAccessor(
+          (UInt1Vector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof UInt2Vector) {
-      return new ArrowFlightJdbcBaseIntVectorAccessor((UInt2Vector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcBaseIntVectorAccessor(
+          (UInt2Vector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof UInt4Vector) {
-      return new ArrowFlightJdbcBaseIntVectorAccessor((UInt4Vector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcBaseIntVectorAccessor(
+          (UInt4Vector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof UInt8Vector) {
-      return new ArrowFlightJdbcBaseIntVectorAccessor((UInt8Vector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcBaseIntVectorAccessor(
+          (UInt8Vector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof TinyIntVector) {
-      return new ArrowFlightJdbcBaseIntVectorAccessor((TinyIntVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcBaseIntVectorAccessor(
+          (TinyIntVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof SmallIntVector) {
-      return new ArrowFlightJdbcBaseIntVectorAccessor((SmallIntVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcBaseIntVectorAccessor(
+          (SmallIntVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof IntVector) {
-      return new ArrowFlightJdbcBaseIntVectorAccessor((IntVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcBaseIntVectorAccessor(
+          (IntVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof BigIntVector) {
-      return new ArrowFlightJdbcBaseIntVectorAccessor((BigIntVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcBaseIntVectorAccessor(
+          (BigIntVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof Float4Vector) {
-      return new ArrowFlightJdbcFloat4VectorAccessor((Float4Vector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcFloat4VectorAccessor(
+          (Float4Vector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof Float8Vector) {
-      return new ArrowFlightJdbcFloat8VectorAccessor((Float8Vector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcFloat8VectorAccessor(
+          (Float8Vector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof BitVector) {
-      return new ArrowFlightJdbcBitVectorAccessor((BitVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcBitVectorAccessor(
+          (BitVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof DecimalVector) {
-      return new ArrowFlightJdbcDecimalVectorAccessor((DecimalVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcDecimalVectorAccessor(
+          (DecimalVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof Decimal256Vector) {
-      return new ArrowFlightJdbcDecimalVectorAccessor((Decimal256Vector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcDecimalVectorAccessor(
+          (Decimal256Vector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof VarBinaryVector) {
-      return new ArrowFlightJdbcBinaryVectorAccessor((VarBinaryVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcBinaryVectorAccessor(
+          (VarBinaryVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof LargeVarBinaryVector) {
-      return new ArrowFlightJdbcBinaryVectorAccessor((LargeVarBinaryVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcBinaryVectorAccessor(
+          (LargeVarBinaryVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof FixedSizeBinaryVector) {
-      return new ArrowFlightJdbcBinaryVectorAccessor((FixedSizeBinaryVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcBinaryVectorAccessor(
+          (FixedSizeBinaryVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof TimeStampVector) {
-      return new ArrowFlightJdbcTimeStampVectorAccessor((TimeStampVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcTimeStampVectorAccessor(
+          (TimeStampVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof TimeNanoVector) {
-      return new ArrowFlightJdbcTimeVectorAccessor((TimeNanoVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcTimeVectorAccessor(
+          (TimeNanoVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof TimeMicroVector) {
-      return new ArrowFlightJdbcTimeVectorAccessor((TimeMicroVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcTimeVectorAccessor(
+          (TimeMicroVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof TimeMilliVector) {
-      return new ArrowFlightJdbcTimeVectorAccessor((TimeMilliVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcTimeVectorAccessor(
+          (TimeMilliVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof TimeSecVector) {
-      return new ArrowFlightJdbcTimeVectorAccessor((TimeSecVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcTimeVectorAccessor(
+          (TimeSecVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof DateDayVector) {
-      return new ArrowFlightJdbcDateVectorAccessor(((DateDayVector) vector), getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcDateVectorAccessor(
+          ((DateDayVector) vector), getCurrentRow, setCursorWasNull);
     } else if (vector instanceof DateMilliVector) {
-      return new ArrowFlightJdbcDateVectorAccessor(((DateMilliVector) vector), getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcDateVectorAccessor(
+          ((DateMilliVector) vector), getCurrentRow, setCursorWasNull);
     } else if (vector instanceof VarCharVector) {
-      return new ArrowFlightJdbcVarCharVectorAccessor((VarCharVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcVarCharVectorAccessor(
+          (VarCharVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof LargeVarCharVector) {
-      return new ArrowFlightJdbcVarCharVectorAccessor((LargeVarCharVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcVarCharVectorAccessor(
+          (LargeVarCharVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof DurationVector) {
-      return new ArrowFlightJdbcDurationVectorAccessor((DurationVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcDurationVectorAccessor(
+          (DurationVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof IntervalDayVector) {
-      return new ArrowFlightJdbcIntervalVectorAccessor(((IntervalDayVector) vector), getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcIntervalVectorAccessor(
+          ((IntervalDayVector) vector), getCurrentRow, setCursorWasNull);
     } else if (vector instanceof IntervalYearVector) {
-      return new ArrowFlightJdbcIntervalVectorAccessor(((IntervalYearVector) vector), getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcIntervalVectorAccessor(
+          ((IntervalYearVector) vector), getCurrentRow, setCursorWasNull);
+    } else if (vector instanceof IntervalMonthDayNanoVector) {
+      return new ArrowFlightJdbcIntervalVectorAccessor(
+          ((IntervalMonthDayNanoVector) vector), getCurrentRow, setCursorWasNull);
     } else if (vector instanceof StructVector) {
-      return new ArrowFlightJdbcStructVectorAccessor((StructVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcStructVectorAccessor(
+          (StructVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof MapVector) {
-      return new ArrowFlightJdbcMapVectorAccessor((MapVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcMapVectorAccessor(
+          (MapVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof ListVector) {
-      return new ArrowFlightJdbcListVectorAccessor((ListVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcListVectorAccessor(
+          (ListVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof LargeListVector) {
-      return new ArrowFlightJdbcLargeListVectorAccessor((LargeListVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcLargeListVectorAccessor(
+          (LargeListVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof FixedSizeListVector) {
-      return new ArrowFlightJdbcFixedSizeListVectorAccessor((FixedSizeListVector) vector,
-          getCurrentRow, setCursorWasNull);
+      return new ArrowFlightJdbcFixedSizeListVectorAccessor(
+          (FixedSizeListVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof UnionVector) {
-      return new ArrowFlightJdbcUnionVectorAccessor((UnionVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcUnionVectorAccessor(
+          (UnionVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof DenseUnionVector) {
-      return new ArrowFlightJdbcDenseUnionVectorAccessor((DenseUnionVector) vector, getCurrentRow,
-          setCursorWasNull);
+      return new ArrowFlightJdbcDenseUnionVectorAccessor(
+          (DenseUnionVector) vector, getCurrentRow, setCursorWasNull);
     } else if (vector instanceof NullVector || vector == null) {
       return new ArrowFlightJdbcNullVectorAccessor(setCursorWasNull);
     }
 
-    throw new UnsupportedOperationException("Unsupported vector type: " + vector.getClass().getName());
+    throw new UnsupportedOperationException(
+        "Unsupported vector type: " + vector.getClass().getName());
   }
 
-  /**
-   * Functional interface used to propagate that the value accessed was null or not.
-   */
+  /** Functional interface used to propagate that the value accessed was null or not. */
   @FunctionalInterface
   public interface WasNullConsumer {
     void setWasNull(boolean wasNull);
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/ArrowFlightJdbcNullVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/ArrowFlightJdbcNullVectorAccessor.java
index f40a5797293f9..56092ec3e7f32 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/ArrowFlightJdbcNullVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/ArrowFlightJdbcNullVectorAccessor.java
@@ -14,16 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl;
 
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.vector.NullVector;
 
-/**
- * Accessor for the Arrow type {@link NullVector}.
- */
+/** Accessor for the Arrow type {@link NullVector}. */
 public class ArrowFlightJdbcNullVectorAccessor extends ArrowFlightJdbcAccessor {
   public ArrowFlightJdbcNullVectorAccessor(
       ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/binary/ArrowFlightJdbcBinaryVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/binary/ArrowFlightJdbcBinaryVectorAccessor.java
index c50d734972134..30dfffce6406a 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/binary/ArrowFlightJdbcBinaryVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/binary/ArrowFlightJdbcBinaryVectorAccessor.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.binary;
 
 import java.io.ByteArrayInputStream;
@@ -23,7 +22,6 @@
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.vector.FixedSizeBinaryVector;
@@ -31,8 +29,8 @@
 import org.apache.arrow.vector.VarBinaryVector;
 
 /**
- * Accessor for the Arrow types: {@link FixedSizeBinaryVector}, {@link VarBinaryVector}
- * and {@link LargeVarBinaryVector}.
+ * Accessor for the Arrow types: {@link FixedSizeBinaryVector}, {@link VarBinaryVector} and {@link
+ * LargeVarBinaryVector}.
  */
 public class ArrowFlightJdbcBinaryVectorAccessor extends ArrowFlightJdbcAccessor {
 
@@ -42,26 +40,31 @@ private interface ByteArrayGetter {
 
   private final ByteArrayGetter getter;
 
-  public ArrowFlightJdbcBinaryVectorAccessor(FixedSizeBinaryVector vector,
-                                             IntSupplier currentRowSupplier,
-                                             ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcBinaryVectorAccessor(
+      FixedSizeBinaryVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     this(vector::get, currentRowSupplier, setCursorWasNull);
   }
 
-  public ArrowFlightJdbcBinaryVectorAccessor(VarBinaryVector vector, IntSupplier currentRowSupplier,
-                                             ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcBinaryVectorAccessor(
+      VarBinaryVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     this(vector::get, currentRowSupplier, setCursorWasNull);
   }
 
-  public ArrowFlightJdbcBinaryVectorAccessor(LargeVarBinaryVector vector,
-                                             IntSupplier currentRowSupplier,
-                                             ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcBinaryVectorAccessor(
+      LargeVarBinaryVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     this(vector::get, currentRowSupplier, setCursorWasNull);
   }
 
-  private ArrowFlightJdbcBinaryVectorAccessor(ByteArrayGetter getter,
-                                              IntSupplier currentRowSupplier,
-                                              ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  private ArrowFlightJdbcBinaryVectorAccessor(
+      ByteArrayGetter getter,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.getter = getter;
   }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDateVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDateVectorAccessor.java
index f6c14a47f521c..ebe4016209527 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDateVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDateVectorAccessor.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.calendar;
 
 import static org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcDateVectorGetter.Getter;
@@ -29,7 +28,6 @@
 import java.util.Calendar;
 import java.util.concurrent.TimeUnit;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.driver.jdbc.utils.DateTimeUtils;
@@ -37,9 +35,7 @@
 import org.apache.arrow.vector.DateMilliVector;
 import org.apache.arrow.vector.ValueVector;
 
-/**
- * Accessor for the Arrow types: {@link DateDayVector} and {@link DateMilliVector}.
- */
+/** Accessor for the Arrow types: {@link DateDayVector} and {@link DateMilliVector}. */
 public class ArrowFlightJdbcDateVectorAccessor extends ArrowFlightJdbcAccessor {
 
   private final Getter getter;
@@ -49,12 +45,14 @@ public class ArrowFlightJdbcDateVectorAccessor extends ArrowFlightJdbcAccessor {
   /**
    * Instantiate an accessor for a {@link DateDayVector}.
    *
-   * @param vector             an instance of a DateDayVector.
+   * @param vector an instance of a DateDayVector.
    * @param currentRowSupplier the supplier to track the lines.
-   * @param setCursorWasNull   the consumer to set if value was null.
+   * @param setCursorWasNull the consumer to set if value was null.
    */
-  public ArrowFlightJdbcDateVectorAccessor(DateDayVector vector, IntSupplier currentRowSupplier,
-                                           ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcDateVectorAccessor(
+      DateDayVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.holder = new Holder();
     this.getter = createGetter(vector);
@@ -64,11 +62,13 @@ public ArrowFlightJdbcDateVectorAccessor(DateDayVector vector, IntSupplier curre
   /**
    * Instantiate an accessor for a {@link DateMilliVector}.
    *
-   * @param vector             an instance of a DateMilliVector.
+   * @param vector an instance of a DateMilliVector.
    * @param currentRowSupplier the supplier to track the lines.
    */
-  public ArrowFlightJdbcDateVectorAccessor(DateMilliVector vector, IntSupplier currentRowSupplier,
-                                           ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcDateVectorAccessor(
+      DateMilliVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.holder = new Holder();
     this.getter = createGetter(vector);
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDateVectorGetter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDateVectorGetter.java
index ea545851a3aeb..5b99e9ec369f3 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDateVectorGetter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDateVectorGetter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.calendar;
 
 import org.apache.arrow.vector.DateDayVector;
@@ -22,9 +21,7 @@
 import org.apache.arrow.vector.holders.NullableDateDayHolder;
 import org.apache.arrow.vector.holders.NullableDateMilliHolder;
 
-/**
- * Auxiliary class used to unify data access on TimeStampVectors.
- */
+/** Auxiliary class used to unify data access on TimeStampVectors. */
 final class ArrowFlightJdbcDateVectorGetter {
 
   private ArrowFlightJdbcDateVectorGetter() {
@@ -32,16 +29,15 @@ private ArrowFlightJdbcDateVectorGetter() {
   }
 
   /**
-   * Auxiliary class meant to unify Date*Vector#get implementations with different classes of ValueHolders.
+   * Auxiliary class meant to unify Date*Vector#get implementations with different classes of
+   * ValueHolders.
    */
   static class Holder {
     int isSet; // Tells if value is set; 0 = not set, 1 = set
     long value; // Holds actual value in its respective timeunit
   }
 
-  /**
-   * Functional interface used to unify Date*Vector#get implementations.
-   */
+  /** Functional interface used to unify Date*Vector#get implementations. */
   @FunctionalInterface
   interface Getter {
     void get(int index, Holder holder);
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDurationVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDurationVectorAccessor.java
index 22a0e6f892378..2a5eedd0c0b65 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDurationVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDurationVectorAccessor.java
@@ -14,26 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.calendar;
 
 import java.time.Duration;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.vector.DurationVector;
 
-/**
- * Accessor for the Arrow type {@link DurationVector}.
- */
+/** Accessor for the Arrow type {@link DurationVector}. */
 public class ArrowFlightJdbcDurationVectorAccessor extends ArrowFlightJdbcAccessor {
 
   private final DurationVector vector;
 
-  public ArrowFlightJdbcDurationVectorAccessor(DurationVector vector,
-                                               IntSupplier currentRowSupplier,
-                                               ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcDurationVectorAccessor(
+      DurationVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.vector = vector;
   }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcIntervalVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcIntervalVectorAccessor.java
index 21d1c15712cdb..4a3a70b0dfe7a 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcIntervalVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcIntervalVectorAccessor.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.calendar;
 
 import static org.apache.arrow.driver.jdbc.utils.IntervalStringUtils.formatIntervalDay;
@@ -25,18 +24,18 @@
 import java.time.Duration;
 import java.time.Period;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.vector.BaseFixedWidthVector;
 import org.apache.arrow.vector.IntervalDayVector;
+import org.apache.arrow.vector.IntervalMonthDayNanoVector;
 import org.apache.arrow.vector.IntervalYearVector;
+import org.apache.arrow.vector.PeriodDuration;
 import org.apache.arrow.vector.holders.NullableIntervalDayHolder;
+import org.apache.arrow.vector.holders.NullableIntervalMonthDayNanoHolder;
 import org.apache.arrow.vector.holders.NullableIntervalYearHolder;
 
-/**
- * Accessor for the Arrow type {@link IntervalDayVector}.
- */
+/** Accessor for the Arrow type {@link IntervalDayVector}. */
 public class ArrowFlightJdbcIntervalVectorAccessor extends ArrowFlightJdbcAccessor {
 
   private final BaseFixedWidthVector vector;
@@ -46,56 +45,92 @@ public class ArrowFlightJdbcIntervalVectorAccessor extends ArrowFlightJdbcAccess
   /**
    * Instantiate an accessor for a {@link IntervalDayVector}.
    *
-   * @param vector             an instance of a IntervalDayVector.
+   * @param vector an instance of a IntervalDayVector.
    * @param currentRowSupplier the supplier to track the rows.
-   * @param setCursorWasNull   the consumer to set if value was null.
+   * @param setCursorWasNull the consumer to set if value was null.
    */
-  public ArrowFlightJdbcIntervalVectorAccessor(IntervalDayVector vector,
-                                               IntSupplier currentRowSupplier,
-                                               ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcIntervalVectorAccessor(
+      IntervalDayVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.vector = vector;
-    stringGetter = (index) -> {
-      final NullableIntervalDayHolder holder = new NullableIntervalDayHolder();
-      vector.get(index, holder);
-      if (holder.isSet == 0) {
-        return null;
-      } else {
-        final int days = holder.days;
-        final int millis = holder.milliseconds;
-        return formatIntervalDay(Duration.ofDays(days).plusMillis(millis));
-      }
-    };
+    stringGetter =
+        (index) -> {
+          final NullableIntervalDayHolder holder = new NullableIntervalDayHolder();
+          vector.get(index, holder);
+          if (holder.isSet == 0) {
+            return null;
+          } else {
+            final int days = holder.days;
+            final int millis = holder.milliseconds;
+            return formatIntervalDay(Duration.ofDays(days).plusMillis(millis));
+          }
+        };
     objectClass = java.time.Duration.class;
   }
 
   /**
    * Instantiate an accessor for a {@link IntervalYearVector}.
    *
-   * @param vector             an instance of a IntervalYearVector.
+   * @param vector an instance of a IntervalYearVector.
    * @param currentRowSupplier the supplier to track the rows.
-   * @param setCursorWasNull   the consumer to set if value was null.
+   * @param setCursorWasNull the consumer to set if value was null.
    */
-  public ArrowFlightJdbcIntervalVectorAccessor(IntervalYearVector vector,
-                                               IntSupplier currentRowSupplier,
-                                               ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcIntervalVectorAccessor(
+      IntervalYearVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.vector = vector;
-    stringGetter = (index) -> {
-      final NullableIntervalYearHolder holder = new NullableIntervalYearHolder();
-      vector.get(index, holder);
-      if (holder.isSet == 0) {
-        return null;
-      } else {
-        final int interval = holder.value;
-        final int years = (interval / yearsToMonths);
-        final int months = (interval % yearsToMonths);
-        return formatIntervalYear(Period.ofYears(years).plusMonths(months));
-      }
-    };
+    stringGetter =
+        (index) -> {
+          final NullableIntervalYearHolder holder = new NullableIntervalYearHolder();
+          vector.get(index, holder);
+          if (holder.isSet == 0) {
+            return null;
+          } else {
+            final int interval = holder.value;
+            final int years = (interval / yearsToMonths);
+            final int months = (interval % yearsToMonths);
+            return formatIntervalYear(Period.ofYears(years).plusMonths(months));
+          }
+        };
     objectClass = java.time.Period.class;
   }
 
+  /**
+   * Instantiate an accessor for a {@link IntervalMonthDayNanoVector}.
+   *
+   * @param vector an instance of a IntervalMonthDayNanoVector.
+   * @param currentRowSupplier the supplier to track the rows.
+   * @param setCursorWasNull the consumer to set if value was null.
+   */
+  public ArrowFlightJdbcIntervalVectorAccessor(
+      IntervalMonthDayNanoVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+    super(currentRowSupplier, setCursorWasNull);
+    this.vector = vector;
+    stringGetter =
+        (index) -> {
+          final NullableIntervalMonthDayNanoHolder holder =
+              new NullableIntervalMonthDayNanoHolder();
+          vector.get(index, holder);
+          if (holder.isSet == 0) {
+            return null;
+          } else {
+            final int months = holder.months;
+            final int days = holder.days;
+            final long nanos = holder.nanoseconds;
+            final Period period = Period.ofMonths(months).plusDays(days);
+            final Duration duration = Duration.ofNanos(nanos);
+            return new PeriodDuration(period, duration).toISO8601IntervalString();
+          }
+        };
+    objectClass = PeriodDuration.class;
+  }
+
   @Override
   public Class<?> getObjectClass() {
     return objectClass;
@@ -117,9 +152,7 @@ public Object getObject() {
     return object;
   }
 
-  /**
-   * Functional interface used to unify Interval*Vector#getAsStringBuilder implementations.
-   */
+  /** Functional interface used to unify Interval*Vector#getAsStringBuilder implementations. */
   @FunctionalInterface
   interface StringGetter {
     String get(int index);
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeStampVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeStampVectorAccessor.java
index a23883baf1e9b..debdd0fcb4b65 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeStampVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeStampVectorAccessor.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.calendar;
 
 import static org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcTimeStampVectorGetter.Getter;
@@ -30,16 +29,13 @@
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.vector.TimeStampVector;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.util.DateUtility;
 
-/**
- * Accessor for the Arrow types extending from {@link TimeStampVector}.
- */
+/** Accessor for the Arrow types extending from {@link TimeStampVector}. */
 public class ArrowFlightJdbcTimeStampVectorAccessor extends ArrowFlightJdbcAccessor {
 
   private final TimeZone timeZone;
@@ -48,19 +44,16 @@ public class ArrowFlightJdbcTimeStampVectorAccessor extends ArrowFlightJdbcAcces
   private final LongToLocalDateTime longToLocalDateTime;
   private final Holder holder;
 
-  /**
-   * Functional interface used to convert a number (in any time resolution) to LocalDateTime.
-   */
+  /** Functional interface used to convert a number (in any time resolution) to LocalDateTime. */
   interface LongToLocalDateTime {
     LocalDateTime fromLong(long value);
   }
 
-  /**
-   * Instantiate a ArrowFlightJdbcTimeStampVectorAccessor for given vector.
-   */
-  public ArrowFlightJdbcTimeStampVectorAccessor(TimeStampVector vector,
-                                                IntSupplier currentRowSupplier,
-                                                ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  /** Instantiate a ArrowFlightJdbcTimeStampVectorAccessor for given vector. */
+  public ArrowFlightJdbcTimeStampVectorAccessor(
+      TimeStampVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.holder = new Holder();
     this.getter = createGetter(vector);
@@ -95,8 +88,9 @@ private LocalDateTime getLocalDateTime(Calendar calendar) {
     if (calendar != null) {
       TimeZone timeZone = calendar.getTimeZone();
       long millis = this.timeUnit.toMillis(value);
-      localDateTime = localDateTime
-          .minus(timeZone.getOffset(millis) - this.timeZone.getOffset(millis), ChronoUnit.MILLIS);
+      localDateTime =
+          localDateTime.minus(
+              timeZone.getOffset(millis) - this.timeZone.getOffset(millis), ChronoUnit.MILLIS);
     }
     return localDateTime;
   }
@@ -149,8 +143,8 @@ protected static TimeUnit getTimeUnitForVector(TimeStampVector vector) {
     }
   }
 
-  protected static LongToLocalDateTime getLongToLocalDateTimeForVector(TimeStampVector vector,
-                                                                       TimeZone timeZone) {
+  protected static LongToLocalDateTime getLongToLocalDateTimeForVector(
+      TimeStampVector vector, TimeZone timeZone) {
     String timeZoneID = timeZone.getID();
 
     ArrowType.Timestamp arrowType =
@@ -164,8 +158,9 @@ protected static LongToLocalDateTime getLongToLocalDateTimeForVector(TimeStampVe
       case MILLISECOND:
         return milliseconds -> DateUtility.getLocalDateTimeFromEpochMilli(milliseconds, timeZoneID);
       case SECOND:
-        return seconds -> DateUtility.getLocalDateTimeFromEpochMilli(
-            TimeUnit.SECONDS.toMillis(seconds), timeZoneID);
+        return seconds ->
+            DateUtility.getLocalDateTimeFromEpochMilli(
+                TimeUnit.SECONDS.toMillis(seconds), timeZoneID);
       default:
         throw new UnsupportedOperationException("Invalid Arrow time unit");
     }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeStampVectorGetter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeStampVectorGetter.java
index 03fb35face722..7fb74f4a7fba4 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeStampVectorGetter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeStampVectorGetter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.calendar;
 
 import org.apache.arrow.vector.TimeStampMicroTZVector;
@@ -35,9 +34,7 @@
 import org.apache.arrow.vector.holders.NullableTimeStampSecHolder;
 import org.apache.arrow.vector.holders.NullableTimeStampSecTZHolder;
 
-/**
- * Auxiliary class used to unify data access on TimeStampVectors.
- */
+/** Auxiliary class used to unify data access on TimeStampVectors. */
 final class ArrowFlightJdbcTimeStampVectorGetter {
 
   private ArrowFlightJdbcTimeStampVectorGetter() {
@@ -45,16 +42,15 @@ private ArrowFlightJdbcTimeStampVectorGetter() {
   }
 
   /**
-   * Auxiliary class meant to unify TimeStamp*Vector#get implementations with different classes of ValueHolders.
+   * Auxiliary class meant to unify TimeStamp*Vector#get implementations with different classes of
+   * ValueHolders.
    */
   static class Holder {
     int isSet; // Tells if value is set; 0 = not set, 1 = set
     long value; // Holds actual value in its respective timeunit
   }
 
-  /**
-   * Functional interface used to unify TimeStamp*Vector#get implementations.
-   */
+  /** Functional interface used to unify TimeStamp*Vector#get implementations. */
   @FunctionalInterface
   interface Getter {
     void get(int index, Holder holder);
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeVectorAccessor.java
index 6c2173d5e5656..2c03ee631ec96 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeVectorAccessor.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.calendar;
 
 import static org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcTimeVectorGetter.Getter;
@@ -26,7 +25,6 @@
 import java.util.Calendar;
 import java.util.concurrent.TimeUnit;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.ArrowFlightJdbcTime;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
@@ -38,8 +36,8 @@
 import org.apache.arrow.vector.ValueVector;
 
 /**
- * Accessor for the Arrow types: {@link TimeNanoVector}, {@link TimeMicroVector}, {@link TimeMilliVector}
- * and {@link TimeSecVector}.
+ * Accessor for the Arrow types: {@link TimeNanoVector}, {@link TimeMicroVector}, {@link
+ * TimeMilliVector} and {@link TimeSecVector}.
  */
 public class ArrowFlightJdbcTimeVectorAccessor extends ArrowFlightJdbcAccessor {
 
@@ -50,12 +48,14 @@ public class ArrowFlightJdbcTimeVectorAccessor extends ArrowFlightJdbcAccessor {
   /**
    * Instantiate an accessor for a {@link TimeNanoVector}.
    *
-   * @param vector             an instance of a TimeNanoVector.
+   * @param vector an instance of a TimeNanoVector.
    * @param currentRowSupplier the supplier to track the lines.
-   * @param setCursorWasNull   the consumer to set if value was null.
+   * @param setCursorWasNull the consumer to set if value was null.
    */
-  public ArrowFlightJdbcTimeVectorAccessor(TimeNanoVector vector, IntSupplier currentRowSupplier,
-                                           ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcTimeVectorAccessor(
+      TimeNanoVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.holder = new Holder();
     this.getter = createGetter(vector);
@@ -65,12 +65,14 @@ public ArrowFlightJdbcTimeVectorAccessor(TimeNanoVector vector, IntSupplier curr
   /**
    * Instantiate an accessor for a {@link TimeMicroVector}.
    *
-   * @param vector             an instance of a TimeMicroVector.
+   * @param vector an instance of a TimeMicroVector.
    * @param currentRowSupplier the supplier to track the lines.
-   * @param setCursorWasNull   the consumer to set if value was null.
+   * @param setCursorWasNull the consumer to set if value was null.
    */
-  public ArrowFlightJdbcTimeVectorAccessor(TimeMicroVector vector, IntSupplier currentRowSupplier,
-                                           ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcTimeVectorAccessor(
+      TimeMicroVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.holder = new Holder();
     this.getter = createGetter(vector);
@@ -80,11 +82,13 @@ public ArrowFlightJdbcTimeVectorAccessor(TimeMicroVector vector, IntSupplier cur
   /**
    * Instantiate an accessor for a {@link TimeMilliVector}.
    *
-   * @param vector             an instance of a TimeMilliVector.
+   * @param vector an instance of a TimeMilliVector.
    * @param currentRowSupplier the supplier to track the lines.
    */
-  public ArrowFlightJdbcTimeVectorAccessor(TimeMilliVector vector, IntSupplier currentRowSupplier,
-                                           ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcTimeVectorAccessor(
+      TimeMilliVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.holder = new Holder();
     this.getter = createGetter(vector);
@@ -94,11 +98,13 @@ public ArrowFlightJdbcTimeVectorAccessor(TimeMilliVector vector, IntSupplier cur
   /**
    * Instantiate an accessor for a {@link TimeSecVector}.
    *
-   * @param vector             an instance of a TimeSecVector.
+   * @param vector an instance of a TimeSecVector.
    * @param currentRowSupplier the supplier to track the lines.
    */
-  public ArrowFlightJdbcTimeVectorAccessor(TimeSecVector vector, IntSupplier currentRowSupplier,
-                                           ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcTimeVectorAccessor(
+      TimeSecVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.holder = new Holder();
     this.getter = createGetter(vector);
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeVectorGetter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeVectorGetter.java
index fb254c694014d..ebe159b318efd 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeVectorGetter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeVectorGetter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.calendar;
 
 import org.apache.arrow.vector.TimeMicroVector;
@@ -26,9 +25,7 @@
 import org.apache.arrow.vector.holders.NullableTimeNanoHolder;
 import org.apache.arrow.vector.holders.NullableTimeSecHolder;
 
-/**
- * Auxiliary class used to unify data access on Time*Vectors.
- */
+/** Auxiliary class used to unify data access on Time*Vectors. */
 final class ArrowFlightJdbcTimeVectorGetter {
 
   private ArrowFlightJdbcTimeVectorGetter() {
@@ -36,16 +33,15 @@ private ArrowFlightJdbcTimeVectorGetter() {
   }
 
   /**
-   * Auxiliary class meant to unify TimeStamp*Vector#get implementations with different classes of ValueHolders.
+   * Auxiliary class meant to unify TimeStamp*Vector#get implementations with different classes of
+   * ValueHolders.
    */
   static class Holder {
     int isSet; // Tells if value is set; 0 = not set, 1 = set
     long value; // Holds actual value in its respective timeunit
   }
 
-  /**
-   * Functional interface used to unify TimeStamp*Vector#get implementations.
-   */
+  /** Functional interface used to unify TimeStamp*Vector#get implementations. */
   @FunctionalInterface
   interface Getter {
     void get(int index, Holder holder);
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/AbstractArrowFlightJdbcListVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/AbstractArrowFlightJdbcListVectorAccessor.java
index d3338608f8352..cbd07b7d4ca5e 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/AbstractArrowFlightJdbcListVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/AbstractArrowFlightJdbcListVectorAccessor.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.complex;
 
 import java.sql.Array;
 import java.util.List;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.ArrowFlightJdbcArray;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
@@ -30,12 +28,14 @@
 import org.apache.arrow.vector.complex.ListVector;
 
 /**
- * Base Accessor for the Arrow types {@link ListVector}, {@link LargeListVector} and {@link FixedSizeListVector}.
+ * Base Accessor for the Arrow types {@link ListVector}, {@link LargeListVector} and {@link
+ * FixedSizeListVector}.
  */
 public abstract class AbstractArrowFlightJdbcListVectorAccessor extends ArrowFlightJdbcAccessor {
 
-  protected AbstractArrowFlightJdbcListVectorAccessor(IntSupplier currentRowSupplier,
-                                                      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  protected AbstractArrowFlightJdbcListVectorAccessor(
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
   }
 
@@ -70,4 +70,3 @@ public final Array getArray() {
     return new ArrowFlightJdbcArray(dataVector, startOffset, valuesCount);
   }
 }
-
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/AbstractArrowFlightJdbcUnionVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/AbstractArrowFlightJdbcUnionVectorAccessor.java
index 0465765f18358..99364be2abdd6 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/AbstractArrowFlightJdbcUnionVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/AbstractArrowFlightJdbcUnionVectorAccessor.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.complex;
 
 import java.io.InputStream;
@@ -35,7 +34,6 @@
 import java.util.Calendar;
 import java.util.Map;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.driver.jdbc.accessor.impl.ArrowFlightJdbcNullVectorAccessor;
@@ -43,22 +41,20 @@
 import org.apache.arrow.vector.complex.DenseUnionVector;
 import org.apache.arrow.vector.complex.UnionVector;
 
-/**
- * Base accessor for {@link UnionVector} and {@link DenseUnionVector}.
- */
+/** Base accessor for {@link UnionVector} and {@link DenseUnionVector}. */
 public abstract class AbstractArrowFlightJdbcUnionVectorAccessor extends ArrowFlightJdbcAccessor {
 
   /**
-   * Array of accessors for each type contained in UnionVector.
-   * Index corresponds to UnionVector and DenseUnionVector typeIds which are both limited to 128.
+   * Array of accessors for each type contained in UnionVector. Index corresponds to UnionVector and
+   * DenseUnionVector typeIds which are both limited to 128.
    */
   private final ArrowFlightJdbcAccessor[] accessors = new ArrowFlightJdbcAccessor[128];
 
   private final ArrowFlightJdbcNullVectorAccessor nullAccessor =
-      new ArrowFlightJdbcNullVectorAccessor((boolean wasNull) -> {
-      });
+      new ArrowFlightJdbcNullVectorAccessor((boolean wasNull) -> {});
 
-  protected AbstractArrowFlightJdbcUnionVectorAccessor(IntSupplier currentRowSupplier,
+  protected AbstractArrowFlightJdbcUnionVectorAccessor(
+      IntSupplier currentRowSupplier,
       ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
   }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcDenseUnionVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcDenseUnionVectorAccessor.java
index ba5b83ade63ab..b847cc74f0e19 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcDenseUnionVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcDenseUnionVectorAccessor.java
@@ -14,19 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.complex;
 
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.complex.DenseUnionVector;
 
-/**
- * Accessor for the Arrow type {@link DenseUnionVector}.
- */
+/** Accessor for the Arrow type {@link DenseUnionVector}. */
 public class ArrowFlightJdbcDenseUnionVectorAccessor
     extends AbstractArrowFlightJdbcUnionVectorAccessor {
 
@@ -35,22 +31,22 @@ public class ArrowFlightJdbcDenseUnionVectorAccessor
   /**
    * Instantiate an accessor for a {@link DenseUnionVector}.
    *
-   * @param vector             an instance of a DenseUnionVector.
+   * @param vector an instance of a DenseUnionVector.
    * @param currentRowSupplier the supplier to track the rows.
-   * @param setCursorWasNull   the consumer to set if value was null.
+   * @param setCursorWasNull the consumer to set if value was null.
    */
-  public ArrowFlightJdbcDenseUnionVectorAccessor(DenseUnionVector vector,
-                                                 IntSupplier currentRowSupplier,
-                                                 ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcDenseUnionVectorAccessor(
+      DenseUnionVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.vector = vector;
   }
 
   @Override
   protected ArrowFlightJdbcAccessor createAccessorForVector(ValueVector vector) {
-    return ArrowFlightJdbcAccessorFactory.createAccessor(vector,
-        () -> this.vector.getOffset(this.getCurrentRow()), (boolean wasNull) -> {
-        });
+    return ArrowFlightJdbcAccessorFactory.createAccessor(
+        vector, () -> this.vector.getOffset(this.getCurrentRow()), (boolean wasNull) -> {});
   }
 
   @Override
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcFixedSizeListVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcFixedSizeListVectorAccessor.java
index 7bdd3abfd0cad..970418475ea32 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcFixedSizeListVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcFixedSizeListVectorAccessor.java
@@ -14,27 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.complex;
 
 import java.util.List;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.complex.FixedSizeListVector;
 
-/**
- * Accessor for the Arrow type {@link FixedSizeListVector}.
- */
+/** Accessor for the Arrow type {@link FixedSizeListVector}. */
 public class ArrowFlightJdbcFixedSizeListVectorAccessor
     extends AbstractArrowFlightJdbcListVectorAccessor {
 
   private final FixedSizeListVector vector;
 
-  public ArrowFlightJdbcFixedSizeListVectorAccessor(FixedSizeListVector vector,
-                                                    IntSupplier currentRowSupplier,
-                                                    ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcFixedSizeListVectorAccessor(
+      FixedSizeListVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.vector = vector;
   }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcLargeListVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcLargeListVectorAccessor.java
index f7608bb06e5fe..33e1a85897be6 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcLargeListVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcLargeListVectorAccessor.java
@@ -14,27 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.complex;
 
 import java.util.List;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.complex.LargeListVector;
 
-/**
- * Accessor for the Arrow type {@link LargeListVector}.
- */
+/** Accessor for the Arrow type {@link LargeListVector}. */
 public class ArrowFlightJdbcLargeListVectorAccessor
     extends AbstractArrowFlightJdbcListVectorAccessor {
 
   private final LargeListVector vector;
 
-  public ArrowFlightJdbcLargeListVectorAccessor(LargeListVector vector,
-                                                IntSupplier currentRowSupplier,
-                                                ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcLargeListVectorAccessor(
+      LargeListVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.vector = vector;
   }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcListVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcListVectorAccessor.java
index a329a344073a6..8827fdf6a08c1 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcListVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcListVectorAccessor.java
@@ -14,26 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.complex;
 
 import java.util.List;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.complex.BaseRepeatedValueVector;
 import org.apache.arrow.vector.complex.ListVector;
 
-/**
- * Accessor for the Arrow type {@link ListVector}.
- */
+/** Accessor for the Arrow type {@link ListVector}. */
 public class ArrowFlightJdbcListVectorAccessor extends AbstractArrowFlightJdbcListVectorAccessor {
 
   private final ListVector vector;
 
-  public ArrowFlightJdbcListVectorAccessor(ListVector vector, IntSupplier currentRowSupplier,
-                                           ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcListVectorAccessor(
+      ListVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.vector = vector;
   }
@@ -45,7 +43,8 @@ protected long getStartOffset(int index) {
 
   @Override
   protected long getEndOffset(int index) {
-    return vector.getOffsetBuffer()
+    return vector
+        .getOffsetBuffer()
         .getInt((long) (index + 1) * BaseRepeatedValueVector.OFFSET_WIDTH);
   }
 
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcMapVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcMapVectorAccessor.java
index bf1225b33de64..32336f31ecf1b 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcMapVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcMapVectorAccessor.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.complex;
 
 import java.util.Map;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.complex.BaseRepeatedValueVector;
@@ -27,15 +25,15 @@
 import org.apache.arrow.vector.complex.impl.UnionMapReader;
 import org.apache.arrow.vector.util.JsonStringHashMap;
 
-/**
- * Accessor for the Arrow type {@link MapVector}.
- */
+/** Accessor for the Arrow type {@link MapVector}. */
 public class ArrowFlightJdbcMapVectorAccessor extends AbstractArrowFlightJdbcListVectorAccessor {
 
   private final MapVector vector;
 
-  public ArrowFlightJdbcMapVectorAccessor(MapVector vector, IntSupplier currentRowSupplier,
-                                          ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcMapVectorAccessor(
+      MapVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.vector = vector;
   }
@@ -76,7 +74,8 @@ protected long getStartOffset(int index) {
 
   @Override
   protected long getEndOffset(int index) {
-    return vector.getOffsetBuffer()
+    return vector
+        .getOffsetBuffer()
         .getInt((long) (index + 1) * BaseRepeatedValueVector.OFFSET_WIDTH);
   }
 
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcStructVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcStructVectorAccessor.java
index 8a7ac117113c5..b5f054edcb883 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcStructVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcStructVectorAccessor.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.complex;
 
 import java.sql.Struct;
@@ -22,21 +21,20 @@
 import java.util.Map;
 import java.util.function.IntSupplier;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.vector.complex.StructVector;
 import org.apache.calcite.avatica.util.StructImpl;
 
-/**
- * Accessor for the Arrow type {@link StructVector}.
- */
+/** Accessor for the Arrow type {@link StructVector}. */
 public class ArrowFlightJdbcStructVectorAccessor extends ArrowFlightJdbcAccessor {
 
   private final StructVector vector;
 
-  public ArrowFlightJdbcStructVectorAccessor(StructVector vector, IntSupplier currentRowSupplier,
-                                             ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcStructVectorAccessor(
+      StructVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.vector = vector;
   }
@@ -65,10 +63,10 @@ public Struct getStruct() {
       return null;
     }
 
-    List<Object> attributes = vector.getChildrenFromFields()
-        .stream()
-        .map(vector -> vector.getObject(currentRow))
-        .collect(Collectors.toList());
+    List<Object> attributes =
+        vector.getChildrenFromFields().stream()
+            .map(vector -> vector.getObject(currentRow))
+            .collect(Collectors.toList());
 
     return new StructImpl(attributes);
   }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcUnionVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcUnionVectorAccessor.java
index 5b5a0a472d5a3..5b4d7dce38b38 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcUnionVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcUnionVectorAccessor.java
@@ -14,19 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.complex;
 
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.complex.UnionVector;
 
-/**
- * Accessor for the Arrow type {@link UnionVector}.
- */
+/** Accessor for the Arrow type {@link UnionVector}. */
 public class ArrowFlightJdbcUnionVectorAccessor extends AbstractArrowFlightJdbcUnionVectorAccessor {
 
   private final UnionVector vector;
@@ -34,21 +30,22 @@ public class ArrowFlightJdbcUnionVectorAccessor extends AbstractArrowFlightJdbcU
   /**
    * Instantiate an accessor for a {@link UnionVector}.
    *
-   * @param vector             an instance of a UnionVector.
+   * @param vector an instance of a UnionVector.
    * @param currentRowSupplier the supplier to track the rows.
-   * @param setCursorWasNull   the consumer to set if value was null.
+   * @param setCursorWasNull the consumer to set if value was null.
    */
-  public ArrowFlightJdbcUnionVectorAccessor(UnionVector vector, IntSupplier currentRowSupplier,
-                                            ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcUnionVectorAccessor(
+      UnionVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.vector = vector;
   }
 
   @Override
   protected ArrowFlightJdbcAccessor createAccessorForVector(ValueVector vector) {
-    return ArrowFlightJdbcAccessorFactory.createAccessor(vector, this::getCurrentRow,
-        (boolean wasNull) -> {
-        });
+    return ArrowFlightJdbcAccessorFactory.createAccessor(
+        vector, this::getCurrentRow, (boolean wasNull) -> {});
   }
 
   @Override
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBaseIntVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBaseIntVectorAccessor.java
index 8d2fe1cc70319..cdddbb327e0f5 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBaseIntVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBaseIntVectorAccessor.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.numeric;
 
 import static org.apache.arrow.driver.jdbc.accessor.impl.numeric.ArrowFlightJdbcNumericGetter.Getter;
@@ -23,7 +22,6 @@
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.driver.jdbc.accessor.impl.numeric.ArrowFlightJdbcNumericGetter.NumericHolder;
@@ -49,48 +47,66 @@ public class ArrowFlightJdbcBaseIntVectorAccessor extends ArrowFlightJdbcAccesso
   private final Getter getter;
   private final NumericHolder holder;
 
-  public ArrowFlightJdbcBaseIntVectorAccessor(UInt1Vector vector, IntSupplier currentRowSupplier,
-                                              ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcBaseIntVectorAccessor(
+      UInt1Vector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     this(vector, currentRowSupplier, true, setCursorWasNull);
   }
 
-  public ArrowFlightJdbcBaseIntVectorAccessor(UInt2Vector vector, IntSupplier currentRowSupplier,
-                                              ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcBaseIntVectorAccessor(
+      UInt2Vector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     this(vector, currentRowSupplier, true, setCursorWasNull);
   }
 
-  public ArrowFlightJdbcBaseIntVectorAccessor(UInt4Vector vector, IntSupplier currentRowSupplier,
-                                              ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcBaseIntVectorAccessor(
+      UInt4Vector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     this(vector, currentRowSupplier, true, setCursorWasNull);
   }
 
-  public ArrowFlightJdbcBaseIntVectorAccessor(UInt8Vector vector, IntSupplier currentRowSupplier,
-                                              ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcBaseIntVectorAccessor(
+      UInt8Vector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     this(vector, currentRowSupplier, true, setCursorWasNull);
   }
 
-  public ArrowFlightJdbcBaseIntVectorAccessor(TinyIntVector vector, IntSupplier currentRowSupplier,
-                                              ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcBaseIntVectorAccessor(
+      TinyIntVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     this(vector, currentRowSupplier, false, setCursorWasNull);
   }
 
-  public ArrowFlightJdbcBaseIntVectorAccessor(SmallIntVector vector, IntSupplier currentRowSupplier,
-                                              ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcBaseIntVectorAccessor(
+      SmallIntVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     this(vector, currentRowSupplier, false, setCursorWasNull);
   }
 
-  public ArrowFlightJdbcBaseIntVectorAccessor(IntVector vector, IntSupplier currentRowSupplier,
-                                              ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcBaseIntVectorAccessor(
+      IntVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     this(vector, currentRowSupplier, false, setCursorWasNull);
   }
 
-  public ArrowFlightJdbcBaseIntVectorAccessor(BigIntVector vector, IntSupplier currentRowSupplier,
-                                              ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcBaseIntVectorAccessor(
+      BigIntVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     this(vector, currentRowSupplier, false, setCursorWasNull);
   }
 
-  private ArrowFlightJdbcBaseIntVectorAccessor(BaseIntVector vector, IntSupplier currentRowSupplier,
-                                               boolean isUnsigned,
+  private ArrowFlightJdbcBaseIntVectorAccessor(
+      BaseIntVector vector,
+      IntSupplier currentRowSupplier,
+      boolean isUnsigned,
       ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.type = vector.getMinorType();
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBitVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBitVectorAccessor.java
index 67d98c2e69847..65252d5e068d6 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBitVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBitVectorAccessor.java
@@ -14,20 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.numeric;
 
 import java.math.BigDecimal;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.vector.BitVector;
 import org.apache.arrow.vector.holders.NullableBitHolder;
 
-/**
- * Accessor for the arrow {@link BitVector}.
- */
+/** Accessor for the arrow {@link BitVector}. */
 public class ArrowFlightJdbcBitVectorAccessor extends ArrowFlightJdbcAccessor {
 
   private final BitVector vector;
@@ -36,12 +32,14 @@ public class ArrowFlightJdbcBitVectorAccessor extends ArrowFlightJdbcAccessor {
   /**
    * Constructor for the BitVectorAccessor.
    *
-   * @param vector             an instance of a {@link BitVector}.
+   * @param vector an instance of a {@link BitVector}.
    * @param currentRowSupplier a supplier to check which row is being accessed.
-   * @param setCursorWasNull   the consumer to set if value was null.
+   * @param setCursorWasNull the consumer to set if value was null.
    */
-  public ArrowFlightJdbcBitVectorAccessor(BitVector vector, IntSupplier currentRowSupplier,
-                                          ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcBitVectorAccessor(
+      BitVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.vector = vector;
     this.holder = new NullableBitHolder();
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcDecimalVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcDecimalVectorAccessor.java
index 0f7d618a6090f..325e9bc700ad9 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcDecimalVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcDecimalVectorAccessor.java
@@ -14,42 +14,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.numeric;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.vector.Decimal256Vector;
 import org.apache.arrow.vector.DecimalVector;
 
-/**
- * Accessor for {@link DecimalVector} and {@link Decimal256Vector}.
- */
+/** Accessor for {@link DecimalVector} and {@link Decimal256Vector}. */
 public class ArrowFlightJdbcDecimalVectorAccessor extends ArrowFlightJdbcAccessor {
 
   private final Getter getter;
 
-  /**
-   * Functional interface used to unify Decimal*Vector#getObject implementations.
-   */
+  /** Functional interface used to unify Decimal*Vector#getObject implementations. */
   @FunctionalInterface
   interface Getter {
     BigDecimal getObject(int index);
   }
 
-  public ArrowFlightJdbcDecimalVectorAccessor(DecimalVector vector, IntSupplier currentRowSupplier,
-                                              ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcDecimalVectorAccessor(
+      DecimalVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.getter = vector::getObject;
   }
 
-  public ArrowFlightJdbcDecimalVectorAccessor(Decimal256Vector vector,
-                                              IntSupplier currentRowSupplier,
-                                              ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcDecimalVectorAccessor(
+      Decimal256Vector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.getter = vector::getObject;
   }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcFloat4VectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcFloat4VectorAccessor.java
index cbf2d36ff80b1..4d9d0d7261876 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcFloat4VectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcFloat4VectorAccessor.java
@@ -14,22 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.numeric;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.SQLException;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.vector.Float4Vector;
 import org.apache.arrow.vector.holders.NullableFloat4Holder;
 
-/**
- * Accessor for the Float4Vector.
- */
+/** Accessor for the Float4Vector. */
 public class ArrowFlightJdbcFloat4VectorAccessor extends ArrowFlightJdbcAccessor {
 
   private final Float4Vector vector;
@@ -38,13 +34,14 @@ public class ArrowFlightJdbcFloat4VectorAccessor extends ArrowFlightJdbcAccessor
   /**
    * Instantiate a accessor for the {@link Float4Vector}.
    *
-   * @param vector             an instance of a Float4Vector.
+   * @param vector an instance of a Float4Vector.
    * @param currentRowSupplier the supplier to track the lines.
-   * @param setCursorWasNull   the consumer to set if value was null.
+   * @param setCursorWasNull the consumer to set if value was null.
    */
-  public ArrowFlightJdbcFloat4VectorAccessor(Float4Vector vector,
-                                             IntSupplier currentRowSupplier,
-                                             ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcFloat4VectorAccessor(
+      Float4Vector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.holder = new NullableFloat4Holder();
     this.vector = vector;
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcFloat8VectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcFloat8VectorAccessor.java
index dc5542ffc58d8..10dbb1351949f 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcFloat8VectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcFloat8VectorAccessor.java
@@ -14,22 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.numeric;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.SQLException;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.vector.Float8Vector;
 import org.apache.arrow.vector.holders.NullableFloat8Holder;
 
-/**
- * Accessor for the Float8Vector.
- */
+/** Accessor for the Float8Vector. */
 public class ArrowFlightJdbcFloat8VectorAccessor extends ArrowFlightJdbcAccessor {
 
   private final Float8Vector vector;
@@ -38,13 +34,14 @@ public class ArrowFlightJdbcFloat8VectorAccessor extends ArrowFlightJdbcAccessor
   /**
    * Instantiate a accessor for the {@link Float8Vector}.
    *
-   * @param vector             an instance of a Float8Vector.
+   * @param vector an instance of a Float8Vector.
    * @param currentRowSupplier the supplier to track the lines.
-   * @param setCursorWasNull   the consumer to set if value was null.
+   * @param setCursorWasNull the consumer to set if value was null.
    */
-  public ArrowFlightJdbcFloat8VectorAccessor(Float8Vector vector,
-                                             IntSupplier currentRowSupplier,
-                                             ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcFloat8VectorAccessor(
+      Float8Vector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.holder = new NullableFloat8Holder();
     this.vector = vector;
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcNumericGetter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcNumericGetter.java
index cc802a0089d3e..5e96cc9e0986b 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcNumericGetter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcNumericGetter.java
@@ -14,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.arrow.driver.jdbc.accessor.impl.numeric;
 
 import org.apache.arrow.vector.BaseIntVector;
@@ -36,29 +34,22 @@
 import org.apache.arrow.vector.holders.NullableUInt4Holder;
 import org.apache.arrow.vector.holders.NullableUInt8Holder;
 
-/**
- * A custom getter for values from the {@link BaseIntVector}.
- */
+/** A custom getter for values from the {@link BaseIntVector}. */
 class ArrowFlightJdbcNumericGetter {
-  /**
-   * A holder for values from the {@link BaseIntVector}.
-   */
+  /** A holder for values from the {@link BaseIntVector}. */
   static class NumericHolder {
     int isSet; // Tells if value is set; 0 = not set, 1 = set
     long value; // Holds actual value
   }
 
-  /**
-   * Functional interface for a getter to baseInt values.
-   */
+  /** Functional interface for a getter to baseInt values. */
   @FunctionalInterface
   interface Getter {
     void get(int index, NumericHolder holder);
   }
 
   /**
-   * Main class that will check the type of the vector to create
-   * a specific getter.
+   * Main class that will check the type of the vector to create a specific getter.
    *
    * @param vector an instance of the {@link BaseIntVector}
    * @return a getter.
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/text/ArrowFlightJdbcVarCharVectorAccessor.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/text/ArrowFlightJdbcVarCharVectorAccessor.java
index 56c29492c578b..ebebf6ca747ce 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/text/ArrowFlightJdbcVarCharVectorAccessor.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/text/ArrowFlightJdbcVarCharVectorAccessor.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.text;
 
 import static java.nio.charset.StandardCharsets.US_ASCII;
@@ -31,7 +30,6 @@
 import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.driver.jdbc.utils.DateTimeUtils;
@@ -39,14 +37,10 @@
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.arrow.vector.util.Text;
 
-/**
- * Accessor for the Arrow types: {@link VarCharVector} and {@link LargeVarCharVector}.
- */
+/** Accessor for the Arrow types: {@link VarCharVector} and {@link LargeVarCharVector}. */
 public class ArrowFlightJdbcVarCharVectorAccessor extends ArrowFlightJdbcAccessor {
 
-  /**
-   * Functional interface to help integrating VarCharVector and LargeVarCharVector.
-   */
+  /** Functional interface to help integrating VarCharVector and LargeVarCharVector. */
   @FunctionalInterface
   interface Getter {
     byte[] get(int index);
@@ -54,21 +48,24 @@ interface Getter {
 
   private final Getter getter;
 
-  public ArrowFlightJdbcVarCharVectorAccessor(VarCharVector vector,
-                                              IntSupplier currentRowSupplier,
-                                              ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcVarCharVectorAccessor(
+      VarCharVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     this(vector::get, currentRowSupplier, setCursorWasNull);
   }
 
-  public ArrowFlightJdbcVarCharVectorAccessor(LargeVarCharVector vector,
-                                              IntSupplier currentRowSupplier,
-                                              ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  public ArrowFlightJdbcVarCharVectorAccessor(
+      LargeVarCharVector vector,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     this(vector::get, currentRowSupplier, setCursorWasNull);
   }
 
-  ArrowFlightJdbcVarCharVectorAccessor(Getter getter,
-                                       IntSupplier currentRowSupplier,
-                                       ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
+  ArrowFlightJdbcVarCharVectorAccessor(
+      Getter getter,
+      IntSupplier currentRowSupplier,
+      ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
     super(currentRowSupplier, setCursorWasNull);
     this.getter = getter;
   }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java
index edd888ef4df81..845f5372d3f74 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.client;
 
+import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
 import java.net.URI;
 import java.security.GeneralSecurityException;
@@ -26,10 +26,14 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
-
+import javax.annotation.Nullable;
 import org.apache.arrow.driver.jdbc.client.utils.ClientAuthenticationUtils;
 import org.apache.arrow.flight.CallOption;
+import org.apache.arrow.flight.CallStatus;
+import org.apache.arrow.flight.CloseSessionRequest;
 import org.apache.arrow.flight.FlightClient;
 import org.apache.arrow.flight.FlightClientMiddleware;
 import org.apache.arrow.flight.FlightEndpoint;
@@ -38,6 +42,10 @@
 import org.apache.arrow.flight.FlightStatusCode;
 import org.apache.arrow.flight.Location;
 import org.apache.arrow.flight.LocationSchemes;
+import org.apache.arrow.flight.SessionOptionValue;
+import org.apache.arrow.flight.SessionOptionValueFactory;
+import org.apache.arrow.flight.SetSessionOptionsRequest;
+import org.apache.arrow.flight.SetSessionOptionsResult;
 import org.apache.arrow.flight.auth2.BearerCredentialWriter;
 import org.apache.arrow.flight.auth2.ClientBearerHeaderHandler;
 import org.apache.arrow.flight.auth2.ClientIncomingAuthHeaderMiddleware;
@@ -56,36 +64,46 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * A {@link FlightSqlClient} handler.
- */
+/** A {@link FlightSqlClient} handler. */
 public final class ArrowFlightSqlClientHandler implements AutoCloseable {
   private static final Logger LOGGER = LoggerFactory.getLogger(ArrowFlightSqlClientHandler.class);
+  // JDBC connection string query parameter
+  private static final String CATALOG = "catalog";
 
   private final FlightSqlClient sqlClient;
   private final Set<CallOption> options = new HashSet<>();
   private final Builder builder;
+  private final Optional<String> catalog;
 
-  ArrowFlightSqlClientHandler(final FlightSqlClient sqlClient,
-                              final Builder builder,
-                              final Collection<CallOption> credentialOptions) {
+  ArrowFlightSqlClientHandler(
+      final FlightSqlClient sqlClient,
+      final Builder builder,
+      final Collection<CallOption> credentialOptions,
+      final Optional<String> catalog) {
     this.options.addAll(builder.options);
     this.options.addAll(credentialOptions);
     this.sqlClient = Preconditions.checkNotNull(sqlClient);
     this.builder = builder;
+    this.catalog = catalog;
   }
 
   /**
-   * Creates a new {@link ArrowFlightSqlClientHandler} from the provided {@code client} and {@code options}.
+   * Creates a new {@link ArrowFlightSqlClientHandler} from the provided {@code client} and {@code
+   * options}.
    *
-   * @param client  the {@link FlightClient} to manage under a {@link FlightSqlClient} wrapper.
+   * @param client the {@link FlightClient} to manage under a {@link FlightSqlClient} wrapper.
    * @param options the {@link CallOption}s to persist in between subsequent client calls.
    * @return a new {@link ArrowFlightSqlClientHandler}.
    */
-  public static ArrowFlightSqlClientHandler createNewHandler(final FlightClient client,
-                                                             final Builder builder,
-                                                             final Collection<CallOption> options) {
-    return new ArrowFlightSqlClientHandler(new FlightSqlClient(client), builder, options);
+  static ArrowFlightSqlClientHandler createNewHandler(
+      final FlightClient client,
+      final Builder builder,
+      final Collection<CallOption> options,
+      final Optional<String> catalog) {
+    final ArrowFlightSqlClientHandler handler =
+        new ArrowFlightSqlClientHandler(new FlightSqlClient(client), builder, options, catalog);
+    handler.setSetCatalogInSessionIfPresent();
+    return handler;
   }
 
   /**
@@ -98,13 +116,14 @@ private CallOption[] getOptions() {
   }
 
   /**
-   * Makes an RPC "getStream" request based on the provided {@link FlightInfo}
-   * object. Retrieves the result of the query previously prepared with "getInfo."
+   * Makes an RPC "getStream" request based on the provided {@link FlightInfo} object. Retrieves the
+   * result of the query previously prepared with "getInfo."
    *
    * @param flightInfo The {@link FlightInfo} instance from which to fetch results.
    * @return a {@code FlightStream} of results.
    */
-  public List<CloseableEndpointStreamPair> getStreams(final FlightInfo flightInfo) throws SQLException {
+  public List<CloseableEndpointStreamPair> getStreams(final FlightInfo flightInfo)
+      throws SQLException {
     final ArrayList<CloseableEndpointStreamPair> endpoints =
         new ArrayList<>(flightInfo.getEndpoints().size());
 
@@ -112,25 +131,31 @@ public List<CloseableEndpointStreamPair> getStreams(final FlightInfo flightInfo)
       for (FlightEndpoint endpoint : flightInfo.getEndpoints()) {
         if (endpoint.getLocations().isEmpty()) {
           // Create a stream using the current client only and do not close the client at the end.
-          endpoints.add(new CloseableEndpointStreamPair(
-              sqlClient.getStream(endpoint.getTicket(), getOptions()), null));
+          endpoints.add(
+              new CloseableEndpointStreamPair(
+                  sqlClient.getStream(endpoint.getTicket(), getOptions()), null));
         } else {
           // Clone the builder and then set the new endpoint on it.
 
-          // GH-38574: Currently a new FlightClient will be made for each partition that returns a non-empty Location
-          // then disposed of. It may be better to cache clients because a server may report the same Locations.
-          // It would also be good to identify when the reported location is the same as the original connection's
+          // GH-38574: Currently a new FlightClient will be made for each partition that returns a
+          // non-empty Location
+          // then disposed of. It may be better to cache clients because a server may report the
+          // same Locations.
+          // It would also be good to identify when the reported location is the same as the
+          // original connection's
           // Location and skip creating a FlightClient in that scenario.
           List<Exception> exceptions = new ArrayList<>();
           CloseableEndpointStreamPair stream = null;
           for (Location location : endpoint.getLocations()) {
             final URI endpointUri = location.getUri();
             if (endpointUri.getScheme().equals(LocationSchemes.REUSE_CONNECTION)) {
-              stream = new CloseableEndpointStreamPair(
+              stream =
+                  new CloseableEndpointStreamPair(
                       sqlClient.getStream(endpoint.getTicket(), getOptions()), null);
               break;
             }
-            final Builder builderForEndpoint = new Builder(ArrowFlightSqlClientHandler.this.builder)
+            final Builder builderForEndpoint =
+                new Builder(ArrowFlightSqlClientHandler.this.builder)
                     .withHost(endpointUri.getHost())
                     .withPort(endpointUri.getPort())
                     .withEncryption(endpointUri.getScheme().equals(LocationSchemes.GRPC_TLS));
@@ -138,9 +163,11 @@ public List<CloseableEndpointStreamPair> getStreams(final FlightInfo flightInfo)
             ArrowFlightSqlClientHandler endpointHandler = null;
             try {
               endpointHandler = builderForEndpoint.build();
-              stream = new CloseableEndpointStreamPair(
-                      endpointHandler.sqlClient.getStream(endpoint.getTicket(),
-                              endpointHandler.getOptions()), endpointHandler.sqlClient);
+              stream =
+                  new CloseableEndpointStreamPair(
+                      endpointHandler.sqlClient.getStream(
+                          endpoint.getTicket(), endpointHandler.getOptions()),
+                      endpointHandler.sqlClient);
               // Make sure we actually get data from the server
               stream.getStream().getSchema();
             } catch (Exception ex) {
@@ -182,8 +209,7 @@ public List<CloseableEndpointStreamPair> getStreams(final FlightInfo flightInfo)
   }
 
   /**
-   * Makes an RPC "getInfo" request based on the provided {@code query}
-   * object.
+   * Makes an RPC "getInfo" request based on the provided {@code query} object.
    *
    * @param query The query.
    * @return a {@code FlightStream} of results.
@@ -194,6 +220,9 @@ public FlightInfo getInfo(final String query) {
 
   @Override
   public void close() throws SQLException {
+    if (catalog.isPresent()) {
+      sqlClient.closeSession(new CloseSessionRequest(), getOptions());
+    }
     try {
       AutoCloseables.close(sqlClient);
     } catch (final Exception e) {
@@ -201,9 +230,7 @@ public void close() throws SQLException {
     }
   }
 
-  /**
-   * A prepared statement handler.
-   */
+  /** A prepared statement handler. */
   public interface PreparedStatement extends AutoCloseable {
     /**
      * Executes this {@link PreparedStatement}.
@@ -247,6 +274,31 @@ public interface PreparedStatement extends AutoCloseable {
     void close();
   }
 
+  /** A connection is created with catalog set as a session option. */
+  private void setSetCatalogInSessionIfPresent() {
+    if (catalog.isPresent()) {
+      final SetSessionOptionsRequest setSessionOptionRequest =
+          new SetSessionOptionsRequest(
+              ImmutableMap.<String, SessionOptionValue>builder()
+                  .put(CATALOG, SessionOptionValueFactory.makeSessionOptionValue(catalog.get()))
+                  .build());
+      final SetSessionOptionsResult result =
+          sqlClient.setSessionOptions(setSessionOptionRequest, getOptions());
+
+      if (result.hasErrors()) {
+        Map<String, SetSessionOptionsResult.Error> errors = result.getErrors();
+        for (Map.Entry<String, SetSessionOptionsResult.Error> error : errors.entrySet()) {
+          LOGGER.warn(error.toString());
+        }
+        throw CallStatus.INVALID_ARGUMENT
+            .withDescription(
+                String.format(
+                    "Cannot set session option for catalog = %s. Check log for details.", catalog))
+            .toRuntimeException();
+      }
+    }
+  }
+
   /**
    * Creates a new {@link PreparedStatement} for the given {@code query}.
    *
@@ -294,9 +346,9 @@ public void close() {
           preparedStatement.close(getOptions());
         } catch (FlightRuntimeException fre) {
           // ARROW-17785: suppress exceptions caused by flaky gRPC layer
-          if (fre.status().code().equals(FlightStatusCode.UNAVAILABLE) ||
-              (fre.status().code().equals(FlightStatusCode.INTERNAL) &&
-                  fre.getMessage().contains("Connection closed after GOAWAY"))) {
+          if (fre.status().code().equals(FlightStatusCode.UNAVAILABLE)
+              || (fre.status().code().equals(FlightStatusCode.INTERNAL)
+                  && fre.getMessage().contains("Connection closed after GOAWAY"))) {
             LOGGER.warn("Supressed error closing PreparedStatement", fre);
             return;
           }
@@ -319,12 +371,12 @@ public FlightInfo getCatalogs() {
    * Makes an RPC "getImportedKeys" request based on the provided info.
    *
    * @param catalog The catalog name. Must match the catalog name as it is stored in the database.
-   *                Retrieves those without a catalog. Null means that the catalog name should not be used to
-   *                narrow the search.
-   * @param schema  The schema name. Must match the schema name as it is stored in the database.
-   *                "" retrieves those without a schema. Null means that the schema name should not be used to narrow
-   *                the search.
-   * @param table   The table name. Must match the table name as it is stored in the database.
+   *     Retrieves those without a catalog. Null means that the catalog name should not be used to
+   *     narrow the search.
+   * @param schema The schema name. Must match the schema name as it is stored in the database. ""
+   *     retrieves those without a schema. Null means that the schema name should not be used to
+   *     narrow the search.
+   * @param table The table name. Must match the table name as it is stored in the database.
    * @return a {@code FlightStream} of results.
    */
   public FlightInfo getImportedKeys(final String catalog, final String schema, final String table) {
@@ -335,12 +387,12 @@ public FlightInfo getImportedKeys(final String catalog, final String schema, fin
    * Makes an RPC "getExportedKeys" request based on the provided info.
    *
    * @param catalog The catalog name. Must match the catalog name as it is stored in the database.
-   *                Retrieves those without a catalog. Null means that the catalog name should not be used to
-   *                narrow the search.
-   * @param schema  The schema name. Must match the schema name as it is stored in the database.
-   *                "" retrieves those without a schema. Null means that the schema name should not be used to narrow
-   *                the search.
-   * @param table   The table name. Must match the table name as it is stored in the database.
+   *     Retrieves those without a catalog. Null means that the catalog name should not be used to
+   *     narrow the search.
+   * @param schema The schema name. Must match the schema name as it is stored in the database. ""
+   *     retrieves those without a schema. Null means that the schema name should not be used to
+   *     narrow the search.
+   * @param table The table name. Must match the table name as it is stored in the database.
    * @return a {@code FlightStream} of results.
    */
   public FlightInfo getExportedKeys(final String catalog, final String schema, final String table) {
@@ -350,11 +402,11 @@ public FlightInfo getExportedKeys(final String catalog, final String schema, fin
   /**
    * Makes an RPC "getSchemas" request based on the provided info.
    *
-   * @param catalog       The catalog name. Must match the catalog name as it is stored in the database.
-   *                      Retrieves those without a catalog. Null means that the catalog name should not be used to
-   *                      narrow the search.
-   * @param schemaPattern The schema name pattern. Must match the schema name as it is stored in the database.
-   *                      Null means that schema name should not be used to narrow down the search.
+   * @param catalog The catalog name. Must match the catalog name as it is stored in the database.
+   *     Retrieves those without a catalog. Null means that the catalog name should not be used to
+   *     narrow the search.
+   * @param schemaPattern The schema name pattern. Must match the schema name as it is stored in the
+   *     database. Null means that schema name should not be used to narrow down the search.
    * @return a {@code FlightStream} of results.
    */
   public FlightInfo getSchemas(final String catalog, final String schemaPattern) {
@@ -373,24 +425,28 @@ public FlightInfo getTableTypes() {
   /**
    * Makes an RPC "getTables" request based on the provided info.
    *
-   * @param catalog          The catalog name. Must match the catalog name as it is stored in the database.
-   *                         Retrieves those without a catalog. Null means that the catalog name should not be used to
-   *                         narrow the search.
-   * @param schemaPattern    The schema name pattern. Must match the schema name as it is stored in the database.
-   *                         "" retrieves those without a schema. Null means that the schema name should not be used to
-   *                         narrow the search.
-   * @param tableNamePattern The table name pattern. Must match the table name as it is stored in the database.
-   * @param types            The list of table types, which must be from the list of table types to include.
-   *                         Null returns all types.
-   * @param includeSchema    Whether to include schema.
+   * @param catalog The catalog name. Must match the catalog name as it is stored in the database.
+   *     Retrieves those without a catalog. Null means that the catalog name should not be used to
+   *     narrow the search.
+   * @param schemaPattern The schema name pattern. Must match the schema name as it is stored in the
+   *     database. "" retrieves those without a schema. Null means that the schema name should not
+   *     be used to narrow the search.
+   * @param tableNamePattern The table name pattern. Must match the table name as it is stored in
+   *     the database.
+   * @param types The list of table types, which must be from the list of table types to include.
+   *     Null returns all types.
+   * @param includeSchema Whether to include schema.
    * @return a {@code FlightStream} of results.
    */
-  public FlightInfo getTables(final String catalog, final String schemaPattern,
-                              final String tableNamePattern,
-                              final List<String> types, final boolean includeSchema) {
-
-    return sqlClient.getTables(catalog, schemaPattern, tableNamePattern, types, includeSchema,
-        getOptions());
+  public FlightInfo getTables(
+      final String catalog,
+      final String schemaPattern,
+      final String tableNamePattern,
+      final List<String> types,
+      final boolean includeSchema) {
+
+    return sqlClient.getTables(
+        catalog, schemaPattern, tableNamePattern, types, includeSchema, getOptions());
   }
 
   /**
@@ -406,12 +462,12 @@ public FlightInfo getSqlInfo(SqlInfo... info) {
    * Makes an RPC "getPrimaryKeys" request based on the provided info.
    *
    * @param catalog The catalog name; must match the catalog name as it is stored in the database.
-   *                "" retrieves those without a catalog.
-   *                Null means that the catalog name should not be used to narrow the search.
-   * @param schema  The schema name; must match the schema name as it is stored in the database.
-   *                "" retrieves those without a schema. Null means that the schema name should not be used to narrow
-   *                the search.
-   * @param table   The table name. Must match the table name as it is stored in the database.
+   *     "" retrieves those without a catalog. Null means that the catalog name should not be used
+   *     to narrow the search.
+   * @param schema The schema name; must match the schema name as it is stored in the database. ""
+   *     retrieves those without a schema. Null means that the schema name should not be used to
+   *     narrow the search.
+   * @param table The table name. Must match the table name as it is stored in the database.
    * @return a {@code FlightStream} of results.
    */
   public FlightInfo getPrimaryKeys(final String catalog, final String schema, final String table) {
@@ -422,90 +478,82 @@ public FlightInfo getPrimaryKeys(final String catalog, final String schema, fina
    * Makes an RPC "getCrossReference" request based on the provided info.
    *
    * @param pkCatalog The catalog name. Must match the catalog name as it is stored in the database.
-   *                  Retrieves those without a catalog. Null means that the catalog name should not be used to
-   *                  narrow the search.
-   * @param pkSchema  The schema name. Must match the schema name as it is stored in the database.
-   *                  "" retrieves those without a schema. Null means that the schema name should not be used to narrow
-   *                  the search.
-   * @param pkTable   The table name. Must match the table name as it is stored in the database.
+   *     Retrieves those without a catalog. Null means that the catalog name should not be used to
+   *     narrow the search.
+   * @param pkSchema The schema name. Must match the schema name as it is stored in the database. ""
+   *     retrieves those without a schema. Null means that the schema name should not be used to
+   *     narrow the search.
+   * @param pkTable The table name. Must match the table name as it is stored in the database.
    * @param fkCatalog The catalog name. Must match the catalog name as it is stored in the database.
-   *                  Retrieves those without a catalog. Null means that the catalog name should not be used to
-   *                  narrow the search.
-   * @param fkSchema  The schema name. Must match the schema name as it is stored in the database.
-   *                  "" retrieves those without a schema. Null means that the schema name should not be used to narrow
-   *                  the search.
-   * @param fkTable   The table name. Must match the table name as it is stored in the database.
+   *     Retrieves those without a catalog. Null means that the catalog name should not be used to
+   *     narrow the search.
+   * @param fkSchema The schema name. Must match the schema name as it is stored in the database. ""
+   *     retrieves those without a schema. Null means that the schema name should not be used to
+   *     narrow the search.
+   * @param fkTable The table name. Must match the table name as it is stored in the database.
    * @return a {@code FlightStream} of results.
    */
-  public FlightInfo getCrossReference(String pkCatalog, String pkSchema, String pkTable,
-                                      String fkCatalog, String fkSchema, String fkTable) {
-    return sqlClient.getCrossReference(TableRef.of(pkCatalog, pkSchema, pkTable),
+  public FlightInfo getCrossReference(
+      String pkCatalog,
+      String pkSchema,
+      String pkTable,
+      String fkCatalog,
+      String fkSchema,
+      String fkTable) {
+    return sqlClient.getCrossReference(
+        TableRef.of(pkCatalog, pkSchema, pkTable),
         TableRef.of(fkCatalog, fkSchema, fkTable),
         getOptions());
   }
 
-  /**
-   * Builder for {@link ArrowFlightSqlClientHandler}.
-   */
+  /** Builder for {@link ArrowFlightSqlClientHandler}. */
   public static final class Builder {
     private final Set<FlightClientMiddleware.Factory> middlewareFactories = new HashSet<>();
     private final Set<CallOption> options = new HashSet<>();
     private String host;
     private int port;
 
-    @VisibleForTesting
-    String username;
+    @VisibleForTesting String username;
 
-    @VisibleForTesting
-    String password;
+    @VisibleForTesting String password;
 
-    @VisibleForTesting
-    String trustStorePath;
+    @VisibleForTesting String trustStorePath;
 
-    @VisibleForTesting
-    String trustStorePassword;
+    @VisibleForTesting String trustStorePassword;
 
-    @VisibleForTesting
-    String token;
+    @VisibleForTesting String token;
 
-    @VisibleForTesting
-    boolean useEncryption = true;
+    @VisibleForTesting boolean useEncryption = true;
 
-    @VisibleForTesting
-    boolean disableCertificateVerification;
+    @VisibleForTesting boolean disableCertificateVerification;
 
-    @VisibleForTesting
-    boolean useSystemTrustStore = true;
+    @VisibleForTesting boolean useSystemTrustStore = true;
 
-    @VisibleForTesting
-    String tlsRootCertificatesPath;
+    @VisibleForTesting String tlsRootCertificatesPath;
 
-    @VisibleForTesting
-    String clientCertificatePath;
+    @VisibleForTesting String clientCertificatePath;
 
-    @VisibleForTesting
-    String clientKeyPath;
+    @VisibleForTesting String clientKeyPath;
 
-    @VisibleForTesting
-    private BufferAllocator allocator;
+    @VisibleForTesting private BufferAllocator allocator;
 
-    @VisibleForTesting
-    boolean retainCookies = true;
+    @VisibleForTesting boolean retainCookies = true;
 
-    @VisibleForTesting
-    boolean retainAuth = true;
+    @VisibleForTesting boolean retainAuth = true;
+
+    @VisibleForTesting Optional<String> catalog = Optional.empty();
 
-    // These two middleware are for internal use within build() and should not be exposed by builder APIs.
+    // These two middleware are for internal use within build() and should not be exposed by builder
+    // APIs.
     // Note that these middleware may not necessarily be registered.
     @VisibleForTesting
-    ClientIncomingAuthHeaderMiddleware.Factory authFactory
-        = new ClientIncomingAuthHeaderMiddleware.Factory(new ClientBearerHeaderHandler());
+    ClientIncomingAuthHeaderMiddleware.Factory authFactory =
+        new ClientIncomingAuthHeaderMiddleware.Factory(new ClientBearerHeaderHandler());
 
     @VisibleForTesting
     ClientCookieMiddleware.Factory cookieFactory = new ClientCookieMiddleware.Factory();
 
-    public Builder() {
-    }
+    public Builder() {}
 
     /**
      * Copies the builder.
@@ -530,6 +578,7 @@ public Builder() {
       this.clientCertificatePath = original.clientCertificatePath;
       this.clientKeyPath = original.clientKeyPath;
       this.allocator = original.allocator;
+      this.catalog = original.catalog;
 
       if (original.retainCookies) {
         this.cookieFactory = original.cookieFactory;
@@ -623,7 +672,8 @@ public Builder withEncryption(final boolean useEncryption) {
      * @param disableCertificateVerification whether to disable certificate verification.
      * @return this instance.
      */
-    public Builder withDisableCertificateVerification(final boolean disableCertificateVerification) {
+    public Builder withDisableCertificateVerification(
+        final boolean disableCertificateVerification) {
       this.disableCertificateVerification = disableCertificateVerification;
       return this;
     }
@@ -640,8 +690,8 @@ public Builder withSystemTrustStore(final boolean useSystemTrustStore) {
     }
 
     /**
-     * Sets the TLS root certificate path as an alternative to using the System
-     * or other Trust Store.  The path must contain a valid PEM file.
+     * Sets the TLS root certificate path as an alternative to using the System or other Trust
+     * Store. The path must contain a valid PEM file.
      *
      * @param tlsRootCertificatesPath the TLS root certificate path (if TLS is required).
      * @return this instance.
@@ -672,12 +722,12 @@ public Builder withClientKey(final String clientKeyPath) {
       this.clientKeyPath = clientKeyPath;
       return this;
     }
-    
+
     /**
      * Sets the token used in the token authentication.
      *
      * @param token the token value.
-     * @return      this builder instance.
+     * @return this builder instance.
      */
     public Builder withToken(final String token) {
       this.token = token;
@@ -691,15 +741,16 @@ public Builder withToken(final String token) {
      * @return this instance.
      */
     public Builder withBufferAllocator(final BufferAllocator allocator) {
-      this.allocator = allocator
-          .newChildAllocator("ArrowFlightSqlClientHandler", 0, allocator.getLimit());
+      this.allocator =
+          allocator.newChildAllocator("ArrowFlightSqlClientHandler", 0, allocator.getLimit());
       return this;
     }
 
     /**
      * Indicates if cookies should be re-used by connections spawned for getStreams() calls.
+     *
      * @param retainCookies The flag indicating if cookies should be re-used.
-     * @return      this builder instance.
+     * @return this builder instance.
      */
     public Builder withRetainCookies(boolean retainCookies) {
       this.retainCookies = retainCookies;
@@ -707,11 +758,11 @@ public Builder withRetainCookies(boolean retainCookies) {
     }
 
     /**
-     * Indicates if bearer tokens negotiated should be re-used by connections
-     * spawned for getStreams() calls.
+     * Indicates if bearer tokens negotiated should be re-used by connections spawned for
+     * getStreams() calls.
      *
      * @param retainAuth The flag indicating if auth tokens should be re-used.
-     * @return      this builder instance.
+     * @return this builder instance.
      */
     public Builder withRetainAuth(boolean retainAuth) {
       this.retainAuth = retainAuth;
@@ -719,7 +770,8 @@ public Builder withRetainAuth(boolean retainAuth) {
     }
 
     /**
-     * Adds the provided {@code factories} to the list of {@link #middlewareFactories} of this handler.
+     * Adds the provided {@code factories} to the list of {@link #middlewareFactories} of this
+     * handler.
      *
      * @param factories the factories to add.
      * @return this instance.
@@ -729,7 +781,8 @@ public Builder withMiddlewareFactories(final FlightClientMiddleware.Factory... f
     }
 
     /**
-     * Adds the provided {@code factories} to the list of {@link #middlewareFactories} of this handler.
+     * Adds the provided {@code factories} to the list of {@link #middlewareFactories} of this
+     * handler.
      *
      * @param factories the factories to add.
      * @return this instance.
@@ -761,6 +814,17 @@ public Builder withCallOptions(final Collection<CallOption> options) {
       return this;
     }
 
+    /**
+     * Sets the catalog for this handler if it is not null.
+     *
+     * @param catalog the catalog
+     * @return this instance.
+     */
+    public Builder withCatalog(@Nullable final String catalog) {
+      this.catalog = Optional.ofNullable(catalog);
+      return this;
+    }
+
     /**
      * Builds a new {@link ArrowFlightSqlClientHandler} from the provided fields.
      *
@@ -768,13 +832,16 @@ public Builder withCallOptions(final Collection<CallOption> options) {
      * @throws SQLException on error.
      */
     public ArrowFlightSqlClientHandler build() throws SQLException {
-      // Copy middleware so that the build method doesn't change the state of the builder fields itself.
-      Set<FlightClientMiddleware.Factory> buildTimeMiddlewareFactories = new HashSet<>(this.middlewareFactories);
+      // Copy middleware so that the build method doesn't change the state of the builder fields
+      // itself.
+      Set<FlightClientMiddleware.Factory> buildTimeMiddlewareFactories =
+          new HashSet<>(this.middlewareFactories);
       FlightClient client = null;
       boolean isUsingUserPasswordAuth = username != null && token == null;
 
       try {
-        // Token should take priority since some apps pass in a username/password even when a token is provided
+        // Token should take priority since some apps pass in a username/password even when a token
+        // is provided
         if (isUsingUserPasswordAuth) {
           buildTimeMiddlewareFactories.add(authFactory);
         }
@@ -797,13 +864,15 @@ public ArrowFlightSqlClientHandler build() throws SQLException {
           } else {
             if (tlsRootCertificatesPath != null) {
               clientBuilder.trustedCertificates(
-                      ClientAuthenticationUtils.getTlsRootCertificatesStream(tlsRootCertificatesPath));
+                  ClientAuthenticationUtils.getTlsRootCertificatesStream(tlsRootCertificatesPath));
             } else if (useSystemTrustStore) {
               clientBuilder.trustedCertificates(
-                  ClientAuthenticationUtils.getCertificateInputStreamFromSystem(trustStorePassword));
+                  ClientAuthenticationUtils.getCertificateInputStreamFromSystem(
+                      trustStorePassword));
             } else if (trustStorePath != null) {
               clientBuilder.trustedCertificates(
-                  ClientAuthenticationUtils.getCertificateStream(trustStorePath, trustStorePassword));
+                  ClientAuthenticationUtils.getCertificateStream(
+                      trustStorePath, trustStorePassword));
             }
           }
 
@@ -818,7 +887,8 @@ public ArrowFlightSqlClientHandler build() throws SQLException {
         final ArrayList<CallOption> credentialOptions = new ArrayList<>();
         if (isUsingUserPasswordAuth) {
           // If the authFactory has already been used for a handshake, use the existing token.
-          // This can occur if the authFactory is being re-used for a new connection spawned for getStream().
+          // This can occur if the authFactory is being re-used for a new connection spawned for
+          // getStream().
           if (authFactory.getCredentialCallOption() != null) {
             credentialOptions.add(authFactory.getCredentialCallOption());
           } else {
@@ -830,12 +900,17 @@ public ArrowFlightSqlClientHandler build() throws SQLException {
         } else if (token != null) {
           credentialOptions.add(
               ClientAuthenticationUtils.getAuthenticate(
-                  client, new CredentialCallOption(new BearerCredentialWriter(token)), options.toArray(
-                          new CallOption[0])));
+                  client,
+                  new CredentialCallOption(new BearerCredentialWriter(token)),
+                  options.toArray(new CallOption[0])));
         }
-        return ArrowFlightSqlClientHandler.createNewHandler(client, this, credentialOptions);
+        return ArrowFlightSqlClientHandler.createNewHandler(
+            client, this, credentialOptions, catalog);
 
-      } catch (final IllegalArgumentException | GeneralSecurityException | IOException | FlightRuntimeException e) {
+      } catch (final IllegalArgumentException
+          | GeneralSecurityException
+          | IOException
+          | FlightRuntimeException e) {
         final SQLException originalException = new SQLException(e);
         if (client != null) {
           try {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/CloseableEndpointStreamPair.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/CloseableEndpointStreamPair.java
index 6c37a5b0c626c..9a5f4db468d5c 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/CloseableEndpointStreamPair.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/CloseableEndpointStreamPair.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.client;
 
 import org.apache.arrow.flight.FlightStream;
@@ -22,9 +21,7 @@
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.util.Preconditions;
 
-/**
- * Represents a connection to a {@link org.apache.arrow.flight.FlightEndpoint}.
- */
+/** Represents a connection to a {@link org.apache.arrow.flight.FlightEndpoint}. */
 public class CloseableEndpointStreamPair implements AutoCloseable {
 
   private final FlightStream stream;
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/utils/ClientAuthenticationUtils.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/utils/ClientAuthenticationUtils.java
index ffb0048181c7c..8b3c3a9ed350c 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/utils/ClientAuthenticationUtils.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/utils/ClientAuthenticationUtils.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.client.utils;
 
 import java.io.ByteArrayInputStream;
@@ -36,7 +35,6 @@
 import java.util.Collection;
 import java.util.Enumeration;
 import java.util.List;
-
 import org.apache.arrow.flight.CallOption;
 import org.apache.arrow.flight.FlightClient;
 import org.apache.arrow.flight.auth2.BasicAuthCredentialWriter;
@@ -46,9 +44,7 @@
 import org.apache.arrow.util.VisibleForTesting;
 import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
 
-/**
- * Utils for {@link FlightClientHandler} authentication.
- */
+/** Utils for {@link FlightClientHandler} authentication. */
 public final class ClientAuthenticationUtils {
 
   private ClientAuthenticationUtils() {
@@ -58,14 +54,15 @@ private ClientAuthenticationUtils() {
   /**
    * Gets the {@link CredentialCallOption} for the provided authentication info.
    *
-   * @param client      the client.
-   * @param credential  the credential as CallOptions.
-   * @param options     the {@link CallOption}s to use.
+   * @param client the client.
+   * @param credential the credential as CallOptions.
+   * @param options the {@link CallOption}s to use.
    * @return the credential call option.
    */
-  public static CredentialCallOption getAuthenticate(final FlightClient client,
-                                                     final CredentialCallOption credential,
-                                                     final CallOption... options) {
+  public static CredentialCallOption getAuthenticate(
+      final FlightClient client,
+      final CredentialCallOption credential,
+      final CallOption... options) {
 
     final List<CallOption> theseOptions = new ArrayList<>();
     theseOptions.add(credential);
@@ -78,27 +75,32 @@ public static CredentialCallOption getAuthenticate(final FlightClient client,
   /**
    * Gets the {@link CredentialCallOption} for the provided authentication info.
    *
-   * @param client   the client.
+   * @param client the client.
    * @param username the username.
    * @param password the password.
-   * @param factory  the {@link ClientIncomingAuthHeaderMiddleware.Factory} to use.
-   * @param options  the {@link CallOption}s to use.
+   * @param factory the {@link ClientIncomingAuthHeaderMiddleware.Factory} to use.
+   * @param options the {@link CallOption}s to use.
    * @return the credential call option.
    */
-  public static CredentialCallOption getAuthenticate(final FlightClient client,
-                                                     final String username, final String password,
-                                                     final ClientIncomingAuthHeaderMiddleware.Factory factory,
-                                                     final CallOption... options) {
-
-    return getAuthenticate(client,
+  public static CredentialCallOption getAuthenticate(
+      final FlightClient client,
+      final String username,
+      final String password,
+      final ClientIncomingAuthHeaderMiddleware.Factory factory,
+      final CallOption... options) {
+
+    return getAuthenticate(
+        client,
         new CredentialCallOption(new BasicAuthCredentialWriter(username, password)),
-        factory, options);
+        factory,
+        options);
   }
 
-  private static CredentialCallOption getAuthenticate(final FlightClient client,
-                                                      final CredentialCallOption token,
-                                                      final ClientIncomingAuthHeaderMiddleware.Factory factory,
-                                                      final CallOption... options) {
+  private static CredentialCallOption getAuthenticate(
+      final FlightClient client,
+      final CredentialCallOption token,
+      final ClientIncomingAuthHeaderMiddleware.Factory factory,
+      final CallOption... options) {
     final List<CallOption> theseOptions = new ArrayList<>();
     theseOptions.add(token);
     theseOptions.addAll(Arrays.asList(options));
@@ -148,17 +150,16 @@ public static boolean isMac() {
   }
 
   /**
-   * It gets the trusted certificate based on the operating system and loads all the certificate into a
-   * {@link InputStream}.
+   * It gets the trusted certificate based on the operating system and loads all the certificate
+   * into a {@link InputStream}.
    *
    * @return An input stream with all the certificates.
-   *
-   * @throws KeyStoreException        if a key store could not be loaded.
-   * @throws CertificateException     if a certificate could not be found.
-   * @throws IOException              if it fails reading the file.
+   * @throws KeyStoreException if a key store could not be loaded.
+   * @throws CertificateException if a certificate could not be found.
+   * @throws IOException if it fails reading the file.
    */
-  public static InputStream getCertificateInputStreamFromSystem(String password) throws KeyStoreException,
-      CertificateException, IOException, NoSuchAlgorithmException {
+  public static InputStream getCertificateInputStreamFromSystem(String password)
+      throws KeyStoreException, CertificateException, IOException, NoSuchAlgorithmException {
 
     List<KeyStore> keyStoreList = new ArrayList<>();
     if (isWindows()) {
@@ -201,36 +202,33 @@ static void getCertificatesInputStream(KeyStore keyStore, JcaPEMWriter pemWriter
   static InputStream getCertificatesInputStream(Collection<KeyStore> keyStores)
       throws IOException, KeyStoreException {
     try (final StringWriter writer = new StringWriter();
-         final JcaPEMWriter pemWriter = new JcaPEMWriter(writer)) {
+        final JcaPEMWriter pemWriter = new JcaPEMWriter(writer)) {
 
       for (KeyStore keyStore : keyStores) {
         getCertificatesInputStream(keyStore, pemWriter);
       }
 
-      return new ByteArrayInputStream(
-        writer.toString().getBytes(StandardCharsets.UTF_8));
+      return new ByteArrayInputStream(writer.toString().getBytes(StandardCharsets.UTF_8));
     }
   }
 
   /**
-   * Generates an {@link InputStream} that contains certificates for a private
-   * key.
+   * Generates an {@link InputStream} that contains certificates for a private key.
    *
    * @param keyStorePath The path of the KeyStore.
    * @param keyStorePass The password of the KeyStore.
    * @return a new {code InputStream} containing the certificates.
    * @throws GeneralSecurityException on error.
-   * @throws IOException              on error.
+   * @throws IOException on error.
    */
-  public static InputStream getCertificateStream(final String keyStorePath,
-                                                 final String keyStorePass)
+  public static InputStream getCertificateStream(
+      final String keyStorePath, final String keyStorePass)
       throws GeneralSecurityException, IOException {
     Preconditions.checkNotNull(keyStorePath, "KeyStore path cannot be null!");
     Preconditions.checkNotNull(keyStorePass, "KeyStorePass cannot be null!");
     final KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
 
-    try (final InputStream keyStoreStream = Files
-        .newInputStream(Paths.get(keyStorePath))) {
+    try (final InputStream keyStoreStream = Files.newInputStream(Paths.get(keyStorePath))) {
       keyStore.load(keyStoreStream, keyStorePass.toCharArray());
     }
 
@@ -238,54 +236,51 @@ public static InputStream getCertificateStream(final String keyStorePath,
   }
 
   /**
-   * Generates an {@link InputStream} that contains certificates for path-based
-   * TLS Root Certificates.
+   * Generates an {@link InputStream} that contains certificates for path-based TLS Root
+   * Certificates.
    *
    * @param tlsRootsCertificatesPath The path of the TLS Root Certificates.
    * @return a new {code InputStream} containing the certificates.
    * @throws GeneralSecurityException on error.
-   * @throws IOException              on error.
+   * @throws IOException on error.
    */
   public static InputStream getTlsRootCertificatesStream(final String tlsRootsCertificatesPath)
-          throws GeneralSecurityException, IOException {
-    Preconditions.checkNotNull(tlsRootsCertificatesPath, "TLS Root certificates path cannot be null!");
+      throws GeneralSecurityException, IOException {
+    Preconditions.checkNotNull(
+        tlsRootsCertificatesPath, "TLS Root certificates path cannot be null!");
 
-    return Files
-      .newInputStream(Paths.get(tlsRootsCertificatesPath));
+    return Files.newInputStream(Paths.get(tlsRootsCertificatesPath));
   }
 
   /**
-   * Generates an {@link InputStream} that contains certificates for a path-based
-   * mTLS Client Certificate.
+   * Generates an {@link InputStream} that contains certificates for a path-based mTLS Client
+   * Certificate.
    *
    * @param clientCertificatePath The path of the mTLS Client Certificate.
    * @return a new {code InputStream} containing the certificates.
    * @throws GeneralSecurityException on error.
-   * @throws IOException              on error.
+   * @throws IOException on error.
    */
   public static InputStream getClientCertificateStream(final String clientCertificatePath)
       throws GeneralSecurityException, IOException {
     Preconditions.checkNotNull(clientCertificatePath, "Client certificate path cannot be null!");
 
-    return Files
-      .newInputStream(Paths.get(clientCertificatePath));
+    return Files.newInputStream(Paths.get(clientCertificatePath));
   }
 
   /**
-   * Generates an {@link InputStream} that contains certificates for a path-based
-   * mTLS Client Key.
+   * Generates an {@link InputStream} that contains certificates for a path-based mTLS Client Key.
    *
    * @param clientKeyPath The path of the mTLS Client Key.
    * @return a new {code InputStream} containing the certificates.
    * @throws GeneralSecurityException on error.
-   * @throws IOException              on error.
+   * @throws IOException on error.
    */
   public static InputStream getClientKeyStream(final String clientKeyPath)
-          throws GeneralSecurityException, IOException {
+      throws GeneralSecurityException, IOException {
     Preconditions.checkNotNull(clientKeyPath, "Client key path cannot be null!");
 
-    return Files
-      .newInputStream(Paths.get(clientKeyPath));
+    return Files.newInputStream(Paths.get(clientKeyPath));
   }
 
   private static InputStream getSingleCertificateInputStream(KeyStore keyStore)
@@ -302,16 +297,14 @@ private static InputStream getSingleCertificateInputStream(KeyStore keyStore)
     throw new CertificateException("Keystore did not have a certificate.");
   }
 
-  private static InputStream toInputStream(final Certificate certificate)
-      throws IOException {
+  private static InputStream toInputStream(final Certificate certificate) throws IOException {
 
     try (final StringWriter writer = new StringWriter();
-         final JcaPEMWriter pemWriter = new JcaPEMWriter(writer)) {
+        final JcaPEMWriter pemWriter = new JcaPEMWriter(writer)) {
 
       pemWriter.writeObject(certificate);
       pemWriter.flush();
-      return new ByteArrayInputStream(
-          writer.toString().getBytes(StandardCharsets.UTF_8));
+      return new ByteArrayInputStream(writer.toString().getBytes(StandardCharsets.UTF_8));
     }
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/AvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/AvaticaParameterConverter.java
index db34a8c9e1582..0bc38a2772026 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/AvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/AvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter;
 
 import org.apache.arrow.vector.FieldVector;
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/BaseAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/BaseAvaticaParameterConverter.java
index f5cf8358b7a14..6dd4c965c2a2b 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/BaseAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/BaseAvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.driver.jdbc.converter.AvaticaParameterConverter;
@@ -34,7 +33,8 @@ protected AvaticaParameter createParameter(Field field, boolean signed) {
     final ArrowType arrowType = field.getType();
     final String typeName = arrowType.toString();
     final int precision = 0; // Would have to know about the actual number
-    final int scale = 0; // According to https://www.postgresql.org/docs/current/datatype-numeric.html
+    final int scale =
+        0; // According to https://www.postgresql.org/docs/current/datatype-numeric.html
     final int jdbcType = SqlTypes.getSqlTypeIdFromArrowType(arrowType);
     final String className = SqlType.valueOf(jdbcType).clazz.getCanonicalName();
     return new AvaticaParameter(signed, precision, scale, jdbcType, typeName, className, name);
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/BinaryAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/BinaryAvaticaParameterConverter.java
index d244848955e52..ce13cdbc93d31 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/BinaryAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/BinaryAvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.vector.FieldVector;
@@ -24,13 +23,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for Binary Arrow types.
- */
+/** AvaticaParameterConverter for Binary Arrow types. */
 public class BinaryAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public BinaryAvaticaParameterConverter(ArrowType.Binary type) {
-  }
+  public BinaryAvaticaParameterConverter(ArrowType.Binary type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/BinaryViewAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/BinaryViewAvaticaParameterConverter.java
new file mode 100644
index 0000000000000..a035bbba491d2
--- /dev/null
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/BinaryViewAvaticaParameterConverter.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.driver.jdbc.converter.impl;
+
+import org.apache.arrow.vector.FieldVector;
+import org.apache.arrow.vector.types.pojo.ArrowType;
+import org.apache.arrow.vector.types.pojo.Field;
+import org.apache.calcite.avatica.AvaticaParameter;
+import org.apache.calcite.avatica.remote.TypedValue;
+
+/** AvaticaParameterConverter for BinaryView Arrow types. */
+public class BinaryViewAvaticaParameterConverter extends BaseAvaticaParameterConverter {
+
+  public BinaryViewAvaticaParameterConverter(ArrowType.BinaryView type) {}
+
+  @Override
+  public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
+    throw new UnsupportedOperationException("Not implemented");
+  }
+
+  @Override
+  public AvaticaParameter createParameter(Field field) {
+    return createParameter(field, false);
+  }
+}
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/BoolAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/BoolAvaticaParameterConverter.java
index 6725154d03c25..e26c0ad73d84c 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/BoolAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/BoolAvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.vector.BitVector;
@@ -24,13 +23,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for Bool Arrow types.
- */
+/** AvaticaParameterConverter for Bool Arrow types. */
 public class BoolAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public BoolAvaticaParameterConverter(ArrowType.Bool type) {
-  }
+  public BoolAvaticaParameterConverter(ArrowType.Bool type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/DateAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/DateAvaticaParameterConverter.java
index 0da1dabe43721..8795213530358 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/DateAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/DateAvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.vector.DateDayVector;
@@ -25,13 +24,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for Date Arrow types.
- */
+/** AvaticaParameterConverter for Date Arrow types. */
 public class DateAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public DateAvaticaParameterConverter(ArrowType.Date type) {
-  }
+  public DateAvaticaParameterConverter(ArrowType.Date type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/DecimalAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/DecimalAvaticaParameterConverter.java
index fad43e2e06a76..92faa119bdd76 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/DecimalAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/DecimalAvaticaParameterConverter.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import java.math.BigDecimal;
-
 import org.apache.arrow.vector.DecimalVector;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.types.pojo.ArrowType;
@@ -26,13 +24,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for Decimal Arrow types.
- */
+/** AvaticaParameterConverter for Decimal Arrow types. */
 public class DecimalAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public DecimalAvaticaParameterConverter(ArrowType.Decimal type) {
-  }
+  public DecimalAvaticaParameterConverter(ArrowType.Decimal type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/DurationAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/DurationAvaticaParameterConverter.java
index 89f2fc1d5c12f..5c985d544a2b6 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/DurationAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/DurationAvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.vector.FieldVector;
@@ -23,13 +22,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for Duration Arrow types.
- */
+/** AvaticaParameterConverter for Duration Arrow types. */
 public class DurationAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public DurationAvaticaParameterConverter(ArrowType.Duration type) {
-  }
+  public DurationAvaticaParameterConverter(ArrowType.Duration type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/FixedSizeBinaryAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/FixedSizeBinaryAvaticaParameterConverter.java
index a90434f695ac3..6fc58e36813be 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/FixedSizeBinaryAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/FixedSizeBinaryAvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.vector.FieldVector;
@@ -24,13 +23,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for FixedSizeBinary Arrow types.
- */
+/** AvaticaParameterConverter for FixedSizeBinary Arrow types. */
 public class FixedSizeBinaryAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public FixedSizeBinaryAvaticaParameterConverter(ArrowType.FixedSizeBinary type) {
-  }
+  public FixedSizeBinaryAvaticaParameterConverter(ArrowType.FixedSizeBinary type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/FixedSizeListAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/FixedSizeListAvaticaParameterConverter.java
index 1525bcaaf51b1..05c82a932ed93 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/FixedSizeListAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/FixedSizeListAvaticaParameterConverter.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import java.util.List;
-
 import org.apache.arrow.driver.jdbc.utils.AvaticaParameterBinder;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.complex.FixedSizeListVector;
@@ -27,13 +25,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for FixedSizeList Arrow types.
- */
+/** AvaticaParameterConverter for FixedSizeList Arrow types. */
 public class FixedSizeListAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public FixedSizeListAvaticaParameterConverter(ArrowType.FixedSizeList type) {
-  }
+  public FixedSizeListAvaticaParameterConverter(ArrowType.FixedSizeList type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
@@ -47,9 +42,11 @@ public boolean bindParameter(FieldVector vector, TypedValue typedValue, int inde
 
       if (arraySize != maxArraySize) {
         if (!childVector.getField().isNullable()) {
-          throw new UnsupportedOperationException("Each array must contain " + maxArraySize + " elements");
+          throw new UnsupportedOperationException(
+              "Each array must contain " + maxArraySize + " elements");
         } else if (arraySize > maxArraySize) {
-          throw new UnsupportedOperationException("Each array must contain at most " + maxArraySize + " elements");
+          throw new UnsupportedOperationException(
+              "Each array must contain at most " + maxArraySize + " elements");
         }
       }
 
@@ -64,9 +61,12 @@ public boolean bindParameter(FieldVector vector, TypedValue typedValue, int inde
             throw new UnsupportedOperationException("Can't set null on non-nullable child list");
           }
         } else {
-          childVector.getField().getType().accept(
+          childVector
+              .getField()
+              .getType()
+              .accept(
                   new AvaticaParameterBinder.BinderVisitor(
-                          childVector, TypedValue.ofSerial(typedValue.componentType, val), childIndex));
+                      childVector, TypedValue.ofSerial(typedValue.componentType, val), childIndex));
         }
       }
       listVector.setValueCount(index + 1);
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/FloatingPointAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/FloatingPointAvaticaParameterConverter.java
index 9f305a2b6f20d..13d3e9ad8f663 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/FloatingPointAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/FloatingPointAvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.vector.FieldVector;
@@ -25,13 +24,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for FloatingPoint Arrow types.
- */
+/** AvaticaParameterConverter for FloatingPoint Arrow types. */
 public class FloatingPointAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public FloatingPointAvaticaParameterConverter(ArrowType.FloatingPoint type) {
-  }
+  public FloatingPointAvaticaParameterConverter(ArrowType.FloatingPoint type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/IntAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/IntAvaticaParameterConverter.java
index 6684e8d32c9a9..b77c33325fc68 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/IntAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/IntAvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.vector.BigIntVector;
@@ -31,9 +30,7 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for Int Arrow types.
- */
+/** AvaticaParameterConverter for Int Arrow types. */
 public class IntAvaticaParameterConverter extends BaseAvaticaParameterConverter {
   private final ArrowType.Int type;
 
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/IntervalAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/IntervalAvaticaParameterConverter.java
index 724275d51091e..18de8d6b7523f 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/IntervalAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/IntervalAvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.vector.FieldVector;
@@ -23,13 +22,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for Interval Arrow types.
- */
+/** AvaticaParameterConverter for Interval Arrow types. */
 public class IntervalAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public IntervalAvaticaParameterConverter(ArrowType.Interval type) {
-  }
+  public IntervalAvaticaParameterConverter(ArrowType.Interval type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/LargeBinaryAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/LargeBinaryAvaticaParameterConverter.java
index 133ec2072d583..2d707d0ea488a 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/LargeBinaryAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/LargeBinaryAvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.vector.FieldVector;
@@ -24,13 +23,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for LargeBinary Arrow types.
- */
+/** AvaticaParameterConverter for LargeBinary Arrow types. */
 public class LargeBinaryAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public LargeBinaryAvaticaParameterConverter(ArrowType.LargeBinary type) {
-  }
+  public LargeBinaryAvaticaParameterConverter(ArrowType.LargeBinary type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/LargeListAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/LargeListAvaticaParameterConverter.java
index a20747693e35a..3d03e93b1ff1a 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/LargeListAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/LargeListAvaticaParameterConverter.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import java.util.List;
-
 import org.apache.arrow.driver.jdbc.utils.AvaticaParameterBinder;
 import org.apache.arrow.memory.util.LargeMemoryUtil;
 import org.apache.arrow.vector.FieldVector;
@@ -28,13 +26,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for LargeList Arrow types.
- */
+/** AvaticaParameterConverter for LargeList Arrow types. */
 public class LargeListAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public LargeListAvaticaParameterConverter(ArrowType.LargeList type) {
-  }
+  public LargeListAvaticaParameterConverter(ArrowType.LargeList type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
@@ -55,9 +50,12 @@ public boolean bindParameter(FieldVector vector, TypedValue typedValue, int inde
             throw new UnsupportedOperationException("Can't set null on non-nullable child list");
           }
         } else {
-          childVector.getField().getType().accept(
+          childVector
+              .getField()
+              .getType()
+              .accept(
                   new AvaticaParameterBinder.BinderVisitor(
-                          childVector, TypedValue.ofSerial(typedValue.componentType, val), childIndex));
+                      childVector, TypedValue.ofSerial(typedValue.componentType, val), childIndex));
         }
       }
       listVector.endValue(index, values.size());
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/LargeUtf8AvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/LargeUtf8AvaticaParameterConverter.java
index d412ab007ac67..4a89f5ccc0005 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/LargeUtf8AvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/LargeUtf8AvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.vector.FieldVector;
@@ -25,13 +24,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for LargeUtf8 Arrow types.
- */
+/** AvaticaParameterConverter for LargeUtf8 Arrow types. */
 public class LargeUtf8AvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public LargeUtf8AvaticaParameterConverter(ArrowType.LargeUtf8 type) {
-  }
+  public LargeUtf8AvaticaParameterConverter(ArrowType.LargeUtf8 type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/ListAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/ListAvaticaParameterConverter.java
index f6cb9f3be2a4c..f4f9faaa22093 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/ListAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/ListAvaticaParameterConverter.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import java.util.List;
-
 import org.apache.arrow.driver.jdbc.utils.AvaticaParameterBinder;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.complex.ListVector;
@@ -27,13 +25,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for List Arrow types.
- */
+/** AvaticaParameterConverter for List Arrow types. */
 public class ListAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public ListAvaticaParameterConverter(ArrowType.List type) {
-  }
+  public ListAvaticaParameterConverter(ArrowType.List type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
@@ -54,9 +49,12 @@ public boolean bindParameter(FieldVector vector, TypedValue typedValue, int inde
             throw new UnsupportedOperationException("Can't set null on non-nullable child list");
           }
         } else {
-          childVector.getField().getType().accept(
+          childVector
+              .getField()
+              .getType()
+              .accept(
                   new AvaticaParameterBinder.BinderVisitor(
-                          childVector, TypedValue.ofSerial(typedValue.componentType, val), childIndex));
+                      childVector, TypedValue.ofSerial(typedValue.componentType, val), childIndex));
         }
       }
       listVector.endValue(index, values.size());
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/MapAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/MapAvaticaParameterConverter.java
index feac3794d222b..002c9d5a04fcd 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/MapAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/MapAvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.vector.FieldVector;
@@ -23,13 +22,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for Map Arrow types.
- */
+/** AvaticaParameterConverter for Map Arrow types. */
 public class MapAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public MapAvaticaParameterConverter(ArrowType.Map type) {
-  }
+  public MapAvaticaParameterConverter(ArrowType.Map type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/NullAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/NullAvaticaParameterConverter.java
index e2c184fb11a09..c92b950d3bd9d 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/NullAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/NullAvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.vector.FieldVector;
@@ -24,19 +23,18 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for Null Arrow types.
- */
+/** AvaticaParameterConverter for Null Arrow types. */
 public class NullAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public NullAvaticaParameterConverter(ArrowType.Null type) {
-  }
+  public NullAvaticaParameterConverter(ArrowType.Null type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
     Object value = typedValue.toLocal();
     if (vector instanceof NullVector) {
-      if (value != null) { throw new RuntimeException("Can't set non-null value on NullVector"); }
+      if (value != null) {
+        throw new RuntimeException("Can't set non-null value on NullVector");
+      }
       vector.setNull(index);
     }
     return false;
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/StructAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/StructAvaticaParameterConverter.java
index 5dfe923cb516e..b3613447d2c62 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/StructAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/StructAvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.vector.FieldVector;
@@ -23,13 +22,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for Struct Arrow types.
- */
+/** AvaticaParameterConverter for Struct Arrow types. */
 public class StructAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public StructAvaticaParameterConverter(ArrowType.Struct type) {
-  }
+  public StructAvaticaParameterConverter(ArrowType.Struct type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/TimeAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/TimeAvaticaParameterConverter.java
index c6b79537fd435..0340eb6099ec5 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/TimeAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/TimeAvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.vector.FieldVector;
@@ -27,13 +26,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for Time Arrow types.
- */
+/** AvaticaParameterConverter for Time Arrow types. */
 public class TimeAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public TimeAvaticaParameterConverter(ArrowType.Time type) {
-  }
+  public TimeAvaticaParameterConverter(ArrowType.Time type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/TimestampAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/TimestampAvaticaParameterConverter.java
index eb3316a1bdbed..add3e305984da 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/TimestampAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/TimestampAvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.vector.FieldVector;
@@ -31,13 +30,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for Timestamp Arrow types.
- */
+/** AvaticaParameterConverter for Timestamp Arrow types. */
 public class TimestampAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public TimestampAvaticaParameterConverter(ArrowType.Timestamp type) {
-  }
+  public TimestampAvaticaParameterConverter(ArrowType.Timestamp type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/UnionAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/UnionAvaticaParameterConverter.java
index 6b171e685579a..e7a3b6eed2a9f 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/UnionAvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/UnionAvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.vector.FieldVector;
@@ -23,13 +22,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for Union Arrow types.
- */
+/** AvaticaParameterConverter for Union Arrow types. */
 public class UnionAvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public UnionAvaticaParameterConverter(ArrowType.Union type) {
-  }
+  public UnionAvaticaParameterConverter(ArrowType.Union type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/Utf8AvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/Utf8AvaticaParameterConverter.java
index 9223e5361d2d5..8b868b44a507b 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/Utf8AvaticaParameterConverter.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/Utf8AvaticaParameterConverter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.converter.impl;
 
 import org.apache.arrow.vector.FieldVector;
@@ -25,13 +24,10 @@
 import org.apache.calcite.avatica.AvaticaParameter;
 import org.apache.calcite.avatica.remote.TypedValue;
 
-/**
- * AvaticaParameterConverter for Utf8 Arrow types.
- */
+/** AvaticaParameterConverter for Utf8 Arrow types. */
 public class Utf8AvaticaParameterConverter extends BaseAvaticaParameterConverter {
 
-  public Utf8AvaticaParameterConverter(ArrowType.Utf8 type) {
-  }
+  public Utf8AvaticaParameterConverter(ArrowType.Utf8 type) {}
 
   @Override
   public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/Utf8ViewAvaticaParameterConverter.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/Utf8ViewAvaticaParameterConverter.java
new file mode 100644
index 0000000000000..076fefc42a39c
--- /dev/null
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/Utf8ViewAvaticaParameterConverter.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.driver.jdbc.converter.impl;
+
+import org.apache.arrow.vector.FieldVector;
+import org.apache.arrow.vector.types.pojo.ArrowType;
+import org.apache.arrow.vector.types.pojo.Field;
+import org.apache.calcite.avatica.AvaticaParameter;
+import org.apache.calcite.avatica.remote.TypedValue;
+
+/** AvaticaParameterConverter for Utf8View Arrow types. */
+public class Utf8ViewAvaticaParameterConverter extends BaseAvaticaParameterConverter {
+
+  public Utf8ViewAvaticaParameterConverter(ArrowType.Utf8View type) {}
+
+  @Override
+  public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
+    throw new UnsupportedOperationException("Utf8View not supported");
+  }
+
+  @Override
+  public AvaticaParameter createParameter(Field field) {
+    return createParameter(field, false);
+  }
+}
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/ArrowFlightConnectionConfigImpl.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/ArrowFlightConnectionConfigImpl.java
index e95cf00bc7a21..e8bae2a207346 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/ArrowFlightConnectionConfigImpl.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/ArrowFlightConnectionConfigImpl.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import java.util.Arrays;
@@ -22,7 +21,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
-
 import org.apache.arrow.driver.jdbc.ArrowFlightConnection;
 import org.apache.arrow.flight.CallHeaders;
 import org.apache.arrow.flight.CallOption;
@@ -33,10 +31,7 @@
 import org.apache.calcite.avatica.ConnectionConfigImpl;
 import org.apache.calcite.avatica.ConnectionProperty;
 
-
-/**
- * A {@link ConnectionConfig} for the {@link ArrowFlightConnection}.
- */
+/** A {@link ConnectionConfig} for the {@link ArrowFlightConnection}. */
 public final class ArrowFlightConnectionConfigImpl extends ConnectionConfigImpl {
   public ArrowFlightConnectionConfigImpl(final Properties properties) {
     super(properties);
@@ -78,7 +73,6 @@ public String getPassword() {
     return ArrowFlightConnectionProperty.PASSWORD.getString(properties);
   }
 
-
   public String getToken() {
     return ArrowFlightConnectionProperty.TOKEN.getString(properties);
   }
@@ -145,21 +139,30 @@ public int threadPoolSize() {
   }
 
   /**
-   * Indicates if sub-connections created for stream retrieval
-   * should reuse cookies from the main connection.
+   * Indicates if sub-connections created for stream retrieval should reuse cookies from the main
+   * connection.
    */
   public boolean retainCookies() {
     return ArrowFlightConnectionProperty.RETAIN_COOKIES.getBoolean(properties);
   }
 
   /**
-   * Indicates if sub-connections created for stream retrieval
-   * should reuse bearer tokens created from the main connection.
+   * Indicates if sub-connections created for stream retrieval should reuse bearer tokens created
+   * from the main connection.
    */
   public boolean retainAuth() {
     return ArrowFlightConnectionProperty.RETAIN_AUTH.getBoolean(properties);
   }
 
+  /**
+   * The catalog to which a connection is made.
+   *
+   * @return the catalog.
+   */
+  public String getCatalog() {
+    return ArrowFlightConnectionProperty.CATALOG.getString(properties);
+  }
+
   /**
    * Gets the {@link CallOption}s from this {@link ConnectionConfig}.
    *
@@ -184,16 +187,15 @@ public Map<String, String> getHeaderAttributes() {
         (key, val) -> {
           // For built-in properties before adding new headers
           if (Arrays.stream(builtInProperties)
-              .noneMatch(builtInProperty -> builtInProperty.camelName.equalsIgnoreCase(key.toString()))) {
+              .noneMatch(
+                  builtInProperty -> builtInProperty.camelName.equalsIgnoreCase(key.toString()))) {
             headers.put(key.toString(), val.toString());
           }
         });
     return headers;
   }
 
-  /**
-   * Custom {@link ConnectionProperty} for the {@link ArrowFlightConnectionConfigImpl}.
-   */
+  /** Custom {@link ConnectionProperty} for the {@link ArrowFlightConnectionConfigImpl}. */
   public enum ArrowFlightConnectionProperty implements ConnectionProperty {
     HOST("host", null, Type.STRING, true),
     PORT("port", null, Type.NUMBER, true),
@@ -210,15 +212,19 @@ public enum ArrowFlightConnectionProperty implements ConnectionProperty {
     THREAD_POOL_SIZE("threadPoolSize", 1, Type.NUMBER, false),
     TOKEN("token", null, Type.STRING, false),
     RETAIN_COOKIES("retainCookies", true, Type.BOOLEAN, false),
-    RETAIN_AUTH("retainAuth", true, Type.BOOLEAN, false);
+    RETAIN_AUTH("retainAuth", true, Type.BOOLEAN, false),
+    CATALOG("catalog", null, Type.STRING, false);
 
     private final String camelName;
     private final Object defaultValue;
     private final Type type;
     private final boolean required;
 
-    ArrowFlightConnectionProperty(final String camelName, final Object defaultValue,
-                                  final Type type, final boolean required) {
+    ArrowFlightConnectionProperty(
+        final String camelName,
+        final Object defaultValue,
+        final Type type,
+        final boolean required) {
       this.camelName = Preconditions.checkNotNull(camelName);
       this.defaultValue = defaultValue;
       this.type = Preconditions.checkNotNull(type);
@@ -239,7 +245,8 @@ public Object get(final Properties properties) {
       }
       if (required) {
         if (value == null) {
-          throw new IllegalStateException(String.format("Required property not provided: <%s>.", this));
+          throw new IllegalStateException(
+              String.format("Required property not provided: <%s>.", this));
         }
         return value;
       } else {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/AvaticaParameterBinder.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/AvaticaParameterBinder.java
index b2bd8e745ecca..7acffb4bc9722 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/AvaticaParameterBinder.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/AvaticaParameterBinder.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import java.util.List;
-
 import org.apache.arrow.driver.jdbc.client.ArrowFlightSqlClientHandler.PreparedStatement;
 import org.apache.arrow.driver.jdbc.converter.impl.BinaryAvaticaParameterConverter;
 import org.apache.arrow.driver.jdbc.converter.impl.BoolAvaticaParameterConverter;
@@ -48,22 +46,31 @@
 import org.apache.calcite.avatica.remote.TypedValue;
 
 /**
- * Convert Avatica PreparedStatement parameters from a list of TypedValue to Arrow and bind them to the
- * VectorSchemaRoot representing the PreparedStatement parameters.
- * <p>
- * NOTE: Make sure to close the parameters VectorSchemaRoot once we're done with them.
+ * Convert Avatica PreparedStatement parameters from a list of TypedValue to Arrow and bind them to
+ * the VectorSchemaRoot representing the PreparedStatement parameters.
+ *
+ * <p>NOTE: Make sure to close the parameters VectorSchemaRoot once we're done with them.
  */
 public class AvaticaParameterBinder {
   private final PreparedStatement preparedStatement;
   private final VectorSchemaRoot parameters;
 
-  public AvaticaParameterBinder(PreparedStatement preparedStatement, BufferAllocator bufferAllocator) {
-    this.parameters = VectorSchemaRoot.create(preparedStatement.getParameterSchema(), bufferAllocator);
+  /**
+   * Instantiate a new AvaticaParameterBinder.
+   *
+   * @param preparedStatement The PreparedStatement to bind parameters to.
+   * @param bufferAllocator The BufferAllocator to use for allocating memory.
+   */
+  public AvaticaParameterBinder(
+      PreparedStatement preparedStatement, BufferAllocator bufferAllocator) {
+    this.parameters =
+        VectorSchemaRoot.create(preparedStatement.getParameterSchema(), bufferAllocator);
     this.preparedStatement = preparedStatement;
   }
 
   /**
    * Bind the given Avatica values to the prepared statement.
+   *
    * @param typedValues The parameter values.
    */
   public void bind(List<TypedValue> typedValues) {
@@ -72,15 +79,16 @@ public void bind(List<TypedValue> typedValues) {
 
   /**
    * Bind the given Avatica values to the prepared statement at the given index.
+   *
    * @param typedValues The parameter values.
    * @param index index for parameter.
    */
   public void bind(List<TypedValue> typedValues, int index) {
     if (preparedStatement.getParameterSchema().getFields().size() != typedValues.size()) {
       throw new IllegalStateException(
-          String.format("Prepared statement has %s parameters, but only received %s",
-              preparedStatement.getParameterSchema().getFields().size(),
-              typedValues.size()));
+          String.format(
+              "Prepared statement has %s parameters, but only received %s",
+              preparedStatement.getParameterSchema().getFields().size(), typedValues.size()));
     }
 
     for (int i = 0; i < typedValues.size(); i++) {
@@ -96,9 +104,9 @@ public void bind(List<TypedValue> typedValues, int index) {
   /**
    * Bind a TypedValue to the given index on the FieldVector.
    *
-   * @param vector     FieldVector to bind to.
+   * @param vector FieldVector to bind to.
    * @param typedValue TypedValue to bind to the vector.
-   * @param index      Vector index to bind the value at.
+   * @param index Vector index to bind the value at.
    */
   private void bind(FieldVector vector, TypedValue typedValue, int index) {
     try {
@@ -108,19 +116,24 @@ private void bind(FieldVector vector, TypedValue typedValue, int index) {
         } else {
           throw new UnsupportedOperationException("Can't set null on non-nullable parameter");
         }
-      } else if (!vector.getField().getType().accept(new BinderVisitor(vector, typedValue, index))) {
+      } else if (!vector
+          .getField()
+          .getType()
+          .accept(new BinderVisitor(vector, typedValue, index))) {
         throw new UnsupportedOperationException(
-                String.format("Binding to vector type %s is not yet supported", vector.getClass()));
+            String.format("Binding to vector type %s is not yet supported", vector.getClass()));
       }
     } catch (ClassCastException e) {
       throw new UnsupportedOperationException(
-              String.format("Binding value of type %s is not yet supported for expected Arrow type %s",
-                      typedValue.type, vector.getField().getType()));
+          String.format(
+              "Binding value of type %s is not yet supported for expected Arrow type %s",
+              typedValue.type, vector.getField().getType()));
     }
   }
 
   /**
-   * ArrowTypeVisitor that binds Avatica TypedValues to the given FieldVector at the specified index.
+   * ArrowTypeVisitor that binds Avatica TypedValues to the given FieldVector at the specified
+   * index.
    */
   public static class BinderVisitor implements ArrowType.ArrowTypeVisitor<Boolean> {
     private final FieldVector vector;
@@ -162,7 +175,8 @@ public Boolean visit(ArrowType.LargeList type) {
 
     @Override
     public Boolean visit(ArrowType.FixedSizeList type) {
-      return new FixedSizeListAvaticaParameterConverter(type).bindParameter(vector, typedValue, index);
+      return new FixedSizeListAvaticaParameterConverter(type)
+          .bindParameter(vector, typedValue, index);
     }
 
     @Override
@@ -182,7 +196,8 @@ public Boolean visit(ArrowType.Int type) {
 
     @Override
     public Boolean visit(ArrowType.FloatingPoint type) {
-      return new FloatingPointAvaticaParameterConverter(type).bindParameter(vector, typedValue, index);
+      return new FloatingPointAvaticaParameterConverter(type)
+          .bindParameter(vector, typedValue, index);
     }
 
     @Override
@@ -190,6 +205,11 @@ public Boolean visit(ArrowType.Utf8 type) {
       return new Utf8AvaticaParameterConverter(type).bindParameter(vector, typedValue, index);
     }
 
+    @Override
+    public Boolean visit(ArrowType.Utf8View type) {
+      throw new UnsupportedOperationException("Utf8View is unsupported");
+    }
+
     @Override
     public Boolean visit(ArrowType.LargeUtf8 type) {
       return new LargeUtf8AvaticaParameterConverter(type).bindParameter(vector, typedValue, index);
@@ -200,14 +220,21 @@ public Boolean visit(ArrowType.Binary type) {
       return new BinaryAvaticaParameterConverter(type).bindParameter(vector, typedValue, index);
     }
 
+    @Override
+    public Boolean visit(ArrowType.BinaryView type) {
+      throw new UnsupportedOperationException("BinaryView is unsupported");
+    }
+
     @Override
     public Boolean visit(ArrowType.LargeBinary type) {
-      return new LargeBinaryAvaticaParameterConverter(type).bindParameter(vector, typedValue, index);
+      return new LargeBinaryAvaticaParameterConverter(type)
+          .bindParameter(vector, typedValue, index);
     }
 
     @Override
     public Boolean visit(ArrowType.FixedSizeBinary type) {
-      return new FixedSizeBinaryAvaticaParameterConverter(type).bindParameter(vector, typedValue, index);
+      return new FixedSizeBinaryAvaticaParameterConverter(type)
+          .bindParameter(vector, typedValue, index);
     }
 
     @Override
@@ -244,6 +271,10 @@ public Boolean visit(ArrowType.Interval type) {
     public Boolean visit(ArrowType.Duration type) {
       return new DurationAvaticaParameterConverter(type).bindParameter(vector, typedValue, index);
     }
-  }
 
+    @Override
+    public Boolean visit(ArrowType.ListView type) {
+      throw new UnsupportedOperationException("Binding is not yet supported for type " + type);
+    }
+  }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/ConnectionWrapper.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/ConnectionWrapper.java
index c28071490caa6..9a17c97c9d64d 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/ConnectionWrapper.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/ConnectionWrapper.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -37,7 +36,6 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;
-
 import org.apache.arrow.driver.jdbc.ArrowFlightJdbcPooledConnection;
 
 /**
@@ -162,15 +160,15 @@ public Statement createStatement(final int resultSetTypeId, final int resultSetC
   }
 
   @Override
-  public PreparedStatement prepareStatement(final String sqlQuery, final int resultSetTypeId,
-                                            final int resultSetConcurrencyId)
+  public PreparedStatement prepareStatement(
+      final String sqlQuery, final int resultSetTypeId, final int resultSetConcurrencyId)
       throws SQLException {
     return realConnection.prepareStatement(sqlQuery, resultSetTypeId, resultSetConcurrencyId);
   }
 
   @Override
-  public CallableStatement prepareCall(final String query, final int resultSetTypeId,
-                                       final int resultSetConcurrencyId)
+  public CallableStatement prepareCall(
+      final String query, final int resultSetTypeId, final int resultSetConcurrencyId)
       throws SQLException {
     return realConnection.prepareCall(query, resultSetTypeId, resultSetConcurrencyId);
   }
@@ -216,29 +214,33 @@ public void releaseSavepoint(final Savepoint savepoint) throws SQLException {
   }
 
   @Override
-  public Statement createStatement(final int resultSetType,
-                                   final int resultSetConcurrency,
-                                   final int resultSetHoldability) throws SQLException {
-    return realConnection.createStatement(resultSetType, resultSetConcurrency,
-        resultSetHoldability);
+  public Statement createStatement(
+      final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability)
+      throws SQLException {
+    return realConnection.createStatement(
+        resultSetType, resultSetConcurrency, resultSetHoldability);
   }
 
   @Override
-  public PreparedStatement prepareStatement(final String sqlQuery,
-                                            final int resultSetType,
-                                            final int resultSetConcurrency,
-                                            final int resultSetHoldability) throws SQLException {
-    return realConnection.prepareStatement(sqlQuery, resultSetType, resultSetConcurrency,
-        resultSetHoldability);
+  public PreparedStatement prepareStatement(
+      final String sqlQuery,
+      final int resultSetType,
+      final int resultSetConcurrency,
+      final int resultSetHoldability)
+      throws SQLException {
+    return realConnection.prepareStatement(
+        sqlQuery, resultSetType, resultSetConcurrency, resultSetHoldability);
   }
 
   @Override
-  public CallableStatement prepareCall(final String sqlQuery,
-                                       final int resultSetType,
-                                       final int resultSetConcurrency,
-                                       final int resultSetHoldability) throws SQLException {
-    return realConnection.prepareCall(sqlQuery, resultSetType, resultSetConcurrency,
-        resultSetHoldability);
+  public CallableStatement prepareCall(
+      final String sqlQuery,
+      final int resultSetType,
+      final int resultSetConcurrency,
+      final int resultSetHoldability)
+      throws SQLException {
+    return realConnection.prepareCall(
+        sqlQuery, resultSetType, resultSetConcurrency, resultSetHoldability);
   }
 
   @Override
@@ -311,8 +313,7 @@ public Array createArrayOf(final String typeName, final Object[] elements) throw
   }
 
   @Override
-  public Struct createStruct(final String typeName, final Object[] attributes)
-      throws SQLException {
+  public Struct createStruct(final String typeName, final Object[] attributes) throws SQLException {
     return realConnection.createStruct(typeName, attributes);
   }
 
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/ConvertUtils.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/ConvertUtils.java
index 843fe0cb89d9f..77b7a88536149 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/ConvertUtils.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/ConvertUtils.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.apache.arrow.driver.jdbc.converter.impl.BinaryAvaticaParameterConverter;
+import org.apache.arrow.driver.jdbc.converter.impl.BinaryViewAvaticaParameterConverter;
 import org.apache.arrow.driver.jdbc.converter.impl.BoolAvaticaParameterConverter;
 import org.apache.arrow.driver.jdbc.converter.impl.DateAvaticaParameterConverter;
 import org.apache.arrow.driver.jdbc.converter.impl.DecimalAvaticaParameterConverter;
@@ -43,6 +42,7 @@
 import org.apache.arrow.driver.jdbc.converter.impl.TimestampAvaticaParameterConverter;
 import org.apache.arrow.driver.jdbc.converter.impl.UnionAvaticaParameterConverter;
 import org.apache.arrow.driver.jdbc.converter.impl.Utf8AvaticaParameterConverter;
+import org.apache.arrow.driver.jdbc.converter.impl.Utf8ViewAvaticaParameterConverter;
 import org.apache.arrow.flight.sql.FlightSqlColumnMetadata;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
@@ -50,13 +50,10 @@
 import org.apache.calcite.avatica.ColumnMetaData;
 import org.apache.calcite.avatica.proto.Common;
 
-/**
- * Convert objects between Arrow and Avatica.
- */
+/** Convert objects between Arrow and Avatica. */
 public final class ConvertUtils {
 
-  private ConvertUtils() {
-  }
+  private ConvertUtils() {}
 
   /**
    * Convert Fields To Column MetaData List functions.
@@ -64,36 +61,42 @@ private ConvertUtils() {
    * @param fields list of {@link Field}.
    * @return list of {@link ColumnMetaData}.
    */
-  public static List<ColumnMetaData> convertArrowFieldsToColumnMetaDataList(final List<Field> fields) {
-    return Stream.iterate(0, Math::incrementExact).limit(fields.size())
-        .map(index -> {
-          final Field field = fields.get(index);
-          final ArrowType fieldType = field.getType();
-
-          final Common.ColumnMetaData.Builder builder = Common.ColumnMetaData.newBuilder()
-              .setOrdinal(index)
-              .setColumnName(field.getName())
-              .setLabel(field.getName());
-
-          setOnColumnMetaDataBuilder(builder, field.getMetadata());
-
-          builder.setType(Common.AvaticaType.newBuilder()
-              .setId(SqlTypes.getSqlTypeIdFromArrowType(fieldType))
-              .setName(SqlTypes.getSqlTypeNameFromArrowType(fieldType))
-              .build());
-
-          return ColumnMetaData.fromProto(builder.build());
-        }).collect(Collectors.toList());
+  public static List<ColumnMetaData> convertArrowFieldsToColumnMetaDataList(
+      final List<Field> fields) {
+    return Stream.iterate(0, Math::incrementExact)
+        .limit(fields.size())
+        .map(
+            index -> {
+              final Field field = fields.get(index);
+              final ArrowType fieldType = field.getType();
+
+              final Common.ColumnMetaData.Builder builder =
+                  Common.ColumnMetaData.newBuilder()
+                      .setOrdinal(index)
+                      .setColumnName(field.getName())
+                      .setLabel(field.getName());
+
+              setOnColumnMetaDataBuilder(builder, field.getMetadata());
+
+              builder.setType(
+                  Common.AvaticaType.newBuilder()
+                      .setId(SqlTypes.getSqlTypeIdFromArrowType(fieldType))
+                      .setName(SqlTypes.getSqlTypeNameFromArrowType(fieldType))
+                      .build());
+
+              return ColumnMetaData.fromProto(builder.build());
+            })
+        .collect(Collectors.toList());
   }
 
   /**
    * Set on Column MetaData Builder.
    *
-   * @param builder     {@link Common.ColumnMetaData.Builder}
+   * @param builder {@link Common.ColumnMetaData.Builder}
    * @param metadataMap {@link Map}
    */
-  public static void setOnColumnMetaDataBuilder(final Common.ColumnMetaData.Builder builder,
-                                                final Map<String, String> metadataMap) {
+  public static void setOnColumnMetaDataBuilder(
+      final Common.ColumnMetaData.Builder builder, final Map<String, String> metadataMap) {
     final FlightSqlColumnMetadata columnMetadata = new FlightSqlColumnMetadata(metadataMap);
     final String catalogName = columnMetadata.getCatalogName();
     if (catalogName != null) {
@@ -141,10 +144,11 @@ public static void setOnColumnMetaDataBuilder(final Common.ColumnMetaData.Builde
    * @param fields list of {@link Field}.
    * @return list of {@link AvaticaParameter}.
    */
-  public static List<AvaticaParameter> convertArrowFieldsToAvaticaParameters(final List<Field> fields) {
+  public static List<AvaticaParameter> convertArrowFieldsToAvaticaParameters(
+      final List<Field> fields) {
     return fields.stream()
-            .map(field -> field.getType().accept(new ConverterVisitor(field)))
-            .collect(Collectors.toList());
+        .map(field -> field.getType().accept(new ConverterVisitor(field)))
+        .collect(Collectors.toList());
   }
 
   private static class ConverterVisitor implements ArrowType.ArrowTypeVisitor<AvaticaParameter> {
@@ -167,25 +171,21 @@ public AvaticaParameter visit(ArrowType.Struct type) {
     @Override
     public AvaticaParameter visit(ArrowType.List type) {
       return new ListAvaticaParameterConverter(type).createParameter(field);
-
     }
 
     @Override
     public AvaticaParameter visit(ArrowType.LargeList type) {
       return new LargeListAvaticaParameterConverter(type).createParameter(field);
-
     }
 
     @Override
     public AvaticaParameter visit(ArrowType.FixedSizeList type) {
       return new FixedSizeListAvaticaParameterConverter(type).createParameter(field);
-
     }
 
     @Override
     public AvaticaParameter visit(ArrowType.Union type) {
       return new UnionAvaticaParameterConverter(type).createParameter(field);
-
     }
 
     @Override
@@ -208,6 +208,11 @@ public AvaticaParameter visit(ArrowType.Utf8 type) {
       return new Utf8AvaticaParameterConverter(type).createParameter(field);
     }
 
+    @Override
+    public AvaticaParameter visit(ArrowType.Utf8View type) {
+      return new Utf8ViewAvaticaParameterConverter(type).createParameter(field);
+    }
+
     @Override
     public AvaticaParameter visit(ArrowType.LargeUtf8 type) {
       return new LargeUtf8AvaticaParameterConverter(type).createParameter(field);
@@ -218,6 +223,11 @@ public AvaticaParameter visit(ArrowType.Binary type) {
       return new BinaryAvaticaParameterConverter(type).createParameter(field);
     }
 
+    @Override
+    public AvaticaParameter visit(ArrowType.BinaryView type) {
+      return new BinaryViewAvaticaParameterConverter(type).createParameter(field);
+    }
+
     @Override
     public AvaticaParameter visit(ArrowType.LargeBinary type) {
       return new LargeBinaryAvaticaParameterConverter(type).createParameter(field);
@@ -262,6 +272,11 @@ public AvaticaParameter visit(ArrowType.Interval type) {
     public AvaticaParameter visit(ArrowType.Duration type) {
       return new DurationAvaticaParameterConverter(type).createParameter(field);
     }
-  }
 
+    @Override
+    public AvaticaParameter visit(ArrowType.ListView type) {
+      throw new UnsupportedOperationException(
+          "AvaticaParameter not yet supported for type " + type);
+    }
+  }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/DateTimeUtils.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/DateTimeUtils.java
index dd94a09256dd5..9363e3486c560 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/DateTimeUtils.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/DateTimeUtils.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import static org.apache.calcite.avatica.util.DateTimeUtils.MILLIS_PER_DAY;
@@ -27,17 +26,13 @@
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 
-/**
- * Datetime utility functions.
- */
+/** Datetime utility functions. */
 public class DateTimeUtils {
   private DateTimeUtils() {
     // Prevent instantiation.
   }
 
-  /**
-   * Subtracts given Calendar's TimeZone offset from epoch milliseconds.
-   */
+  /** Subtracts given Calendar's TimeZone offset from epoch milliseconds. */
   public static long applyCalendarOffset(long milliseconds, Calendar calendar) {
     if (calendar == null) {
       calendar = Calendar.getInstance();
@@ -53,7 +48,6 @@ public static long applyCalendarOffset(long milliseconds, Calendar calendar) {
     return milliseconds;
   }
 
-
   /**
    * Converts Epoch millis to a {@link Timestamp} object.
    *
@@ -70,7 +64,6 @@ public static Timestamp getTimestampValue(long millisWithCalendar) {
     return Timestamp.valueOf(
         LocalDateTime.of(
             LocalDate.ofEpochDay(millisWithCalendar / MILLIS_PER_DAY),
-            LocalTime.ofNanoOfDay(TimeUnit.MILLISECONDS.toNanos(milliseconds % MILLIS_PER_DAY)))
-    );
+            LocalTime.ofNanoOfDay(TimeUnit.MILLISECONDS.toNanos(milliseconds % MILLIS_PER_DAY))));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/FlightEndpointDataQueue.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/FlightEndpointDataQueue.java
index d617026c682d2..7c1c569fda729 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/FlightEndpointDataQueue.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/FlightEndpointDataQueue.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import static java.lang.String.format;
@@ -35,7 +34,6 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-
 import org.apache.arrow.driver.jdbc.client.CloseableEndpointStreamPair;
 import org.apache.arrow.flight.CallStatus;
 import org.apache.arrow.flight.FlightRuntimeException;
@@ -46,27 +44,29 @@
 
 /**
  * Auxiliary class used to handle consuming of multiple {@link FlightStream}.
- * <p>
- * The usage follows this routine:
+ *
+ * <p>The usage follows this routine:
+ *
  * <ol>
- *   <li>Create a <code>FlightStreamQueue</code>;</li>
- *   <li>Call <code>enqueue(FlightStream)</code> for all streams to be consumed;</li>
- *   <li>Call <code>next()</code> to get a FlightStream that is ready to consume</li>
- *   <li>Consume the given FlightStream and add it back to the queue - call <code>enqueue(FlightStream)</code></li>
- *   <li>Repeat from (3) until <code>next()</code> returns null.</li>
+ *   <li>Create a <code>FlightStreamQueue</code>;
+ *   <li>Call <code>enqueue(FlightStream)</code> for all streams to be consumed;
+ *   <li>Call <code>next()</code> to get a FlightStream that is ready to consume
+ *   <li>Consume the given FlightStream and add it back to the queue - call <code>
+ *       enqueue(FlightStream)</code>
+ *   <li>Repeat from (3) until <code>next()</code> returns null.
  * </ol>
  */
 public class FlightEndpointDataQueue implements AutoCloseable {
   private static final Logger LOGGER = LoggerFactory.getLogger(FlightEndpointDataQueue.class);
   private final CompletionService<CloseableEndpointStreamPair> completionService;
   private final Set<Future<CloseableEndpointStreamPair>> futures = synchronizedSet(new HashSet<>());
-  private final Set<CloseableEndpointStreamPair> endpointsToClose = synchronizedSet(new HashSet<>());
+  private final Set<CloseableEndpointStreamPair> endpointsToClose =
+      synchronizedSet(new HashSet<>());
   private final AtomicBoolean closed = new AtomicBoolean();
 
-  /**
-   * Instantiate a new FlightStreamQueue.
-   */
-  protected FlightEndpointDataQueue(final CompletionService<CloseableEndpointStreamPair> executorService) {
+  /** Instantiate a new FlightStreamQueue. */
+  protected FlightEndpointDataQueue(
+      final CompletionService<CloseableEndpointStreamPair> executorService) {
     completionService = checkNotNull(executorService);
   }
 
@@ -89,15 +89,14 @@ public boolean isClosed() {
     return closed.get();
   }
 
-  /**
-   * Auxiliary functional interface for getting ready-to-consume FlightStreams.
-   */
+  /** Auxiliary functional interface for getting ready-to-consume FlightStreams. */
   @FunctionalInterface
   interface EndpointStreamSupplier {
     Future<CloseableEndpointStreamPair> get() throws SQLException;
   }
 
-  private CloseableEndpointStreamPair next(final EndpointStreamSupplier endpointStreamSupplier) throws SQLException {
+  private CloseableEndpointStreamPair next(final EndpointStreamSupplier endpointStreamSupplier)
+      throws SQLException {
     checkOpen();
     while (!futures.isEmpty()) {
       final Future<CloseableEndpointStreamPair> future = endpointStreamSupplier.get();
@@ -126,24 +125,26 @@ private CloseableEndpointStreamPair next(final EndpointStreamSupplier endpointSt
    * Blocking request with timeout to get the next ready FlightStream in queue.
    *
    * @param timeoutValue the amount of time to be waited
-   * @param timeoutUnit  the timeoutValue time unit
+   * @param timeoutUnit the timeoutValue time unit
    * @return a FlightStream that is ready to consume or null if all FlightStreams are ended.
    */
   public CloseableEndpointStreamPair next(final long timeoutValue, final TimeUnit timeoutUnit)
       throws SQLException {
-    return next(() -> {
-      try {
-        final Future<CloseableEndpointStreamPair> future = completionService.poll(timeoutValue, timeoutUnit);
-        if (future != null) {
-          return future;
-        }
-      } catch (final InterruptedException e) {
-        throw new SQLTimeoutException("Query was interrupted", e);
-      }
+    return next(
+        () -> {
+          try {
+            final Future<CloseableEndpointStreamPair> future =
+                completionService.poll(timeoutValue, timeoutUnit);
+            if (future != null) {
+              return future;
+            }
+          } catch (final InterruptedException e) {
+            throw new SQLTimeoutException("Query was interrupted", e);
+          }
 
-      throw new SQLTimeoutException(
-          String.format("Query timed out after %d %s", timeoutValue, timeoutUnit));
-    });
+          throw new SQLTimeoutException(
+              String.format("Query timed out after %d %s", timeoutValue, timeoutUnit));
+        });
   }
 
   /**
@@ -152,50 +153,47 @@ public CloseableEndpointStreamPair next(final long timeoutValue, final TimeUnit
    * @return a FlightStream that is ready to consume or null if all FlightStreams are ended.
    */
   public CloseableEndpointStreamPair next() throws SQLException {
-    return next(() -> {
-      try {
-        return completionService.take();
-      } catch (final InterruptedException e) {
-        throw AvaticaConnection.HELPER.wrap(e.getMessage(), e);
-      }
-    });
+    return next(
+        () -> {
+          try {
+            return completionService.take();
+          } catch (final InterruptedException e) {
+            throw AvaticaConnection.HELPER.wrap(e.getMessage(), e);
+          }
+        });
   }
 
-  /**
-   * Checks if this queue is open.
-   */
+  /** Checks if this queue is open. */
   public synchronized void checkOpen() {
     checkState(!isClosed(), format("%s closed", this.getClass().getSimpleName()));
   }
 
-  /**
-   * Readily adds given {@link FlightStream}s to the queue.
-   */
+  /** Readily adds given {@link FlightStream}s to the queue. */
   public void enqueue(final Collection<CloseableEndpointStreamPair> endpointRequests) {
     endpointRequests.forEach(this::enqueue);
   }
 
-  /**
-   * Adds given {@link FlightStream} to the queue.
-   */
+  /** Adds given {@link FlightStream} to the queue. */
   public synchronized void enqueue(final CloseableEndpointStreamPair endpointRequest) {
     checkNotNull(endpointRequest);
     checkOpen();
     endpointsToClose.add(endpointRequest);
-    futures.add(completionService.submit(() -> {
-      // `FlightStream#next` will block until new data can be read or stream is over.
-      while (endpointRequest.getStream().next()) {
-        if (endpointRequest.getStream().getRoot().getRowCount() > 0) {
-          return endpointRequest;
-        }
-      }
-      return null;
-    }));
+    futures.add(
+        completionService.submit(
+            () -> {
+              // `FlightStream#next` will block until new data can be read or stream is over.
+              while (endpointRequest.getStream().next()) {
+                if (endpointRequest.getStream().getRoot().getRowCount() > 0) {
+                  return endpointRequest;
+                }
+              }
+              return null;
+            }));
   }
 
   private static boolean isCallStatusCancelled(final Exception e) {
-    return e.getCause() instanceof FlightRuntimeException &&
-        ((FlightRuntimeException) e.getCause()).status().code() == CallStatus.CANCELLED.code();
+    return e.getCause() instanceof FlightRuntimeException
+        && ((FlightRuntimeException) e.getCause()).status().code() == CallStatus.CANCELLED.code();
   }
 
   @Override
@@ -215,19 +213,20 @@ public synchronized void close() throws SQLException {
           exceptions.add(new SQLException(errorMsg, e));
         }
       }
-      futures.forEach(future -> {
-        try {
-          // TODO: Consider adding a hardcoded timeout?
-          future.get();
-        } catch (final InterruptedException | ExecutionException e) {
-          // Ignore if future is already cancelled
-          if (!isCallStatusCancelled(e)) {
-            final String errorMsg = "Failed consuming a future during close.";
-            LOGGER.error(errorMsg, e);
-            exceptions.add(new SQLException(errorMsg, e));
-          }
-        }
-      });
+      futures.forEach(
+          future -> {
+            try {
+              // TODO: Consider adding a hardcoded timeout?
+              future.get();
+            } catch (final InterruptedException | ExecutionException e) {
+              // Ignore if future is already cancelled
+              if (!isCallStatusCancelled(e)) {
+                final String errorMsg = "Failed consuming a future during close.";
+                LOGGER.error(errorMsg, e);
+                exceptions.add(new SQLException(errorMsg, e));
+              }
+            }
+          });
       for (final CloseableEndpointStreamPair endpointToClose : endpointsToClose) {
         try {
           endpointToClose.close();
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/IntervalStringUtils.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/IntervalStringUtils.java
index de6dccad4a846..1aed6cd2cb2cc 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/IntervalStringUtils.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/IntervalStringUtils.java
@@ -14,29 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import java.time.Duration;
 import java.time.Period;
-
 import org.apache.arrow.vector.util.DateUtility;
 
 /**
- * Utility class to format periods similar to Oracle's representation
- * of "INTERVAL * to *" data type.
+ * Utility class to format periods similar to Oracle's representation of "INTERVAL * to *" data
+ * type.
  */
 public final class IntervalStringUtils {
 
-  /**
-   * Constructor Method of class.
-   */
-  private IntervalStringUtils( ) {
-  }
+  /** Constructor Method of class. */
+  private IntervalStringUtils() {}
 
   /**
-   * Formats a period similar to Oracle INTERVAL YEAR TO MONTH data type<br>.
-   * For example, the string "+21-02" defines an interval of 21 years and 2 months.
+   * Formats a period similar to Oracle INTERVAL YEAR TO MONTH data type<br>
+   * . For example, the string "+21-02" defines an interval of 21 years and 2 months.
    */
   public static String formatIntervalYear(final Period p) {
     long months = p.toTotalMonths();
@@ -52,9 +47,9 @@ public static String formatIntervalYear(final Period p) {
   }
 
   /**
-   * Formats a period similar to Oracle INTERVAL DAY TO SECOND data type.<br>.
-   * For example, the string "-001 18:25:16.766" defines an interval of
-   * - 1 day 18 hours 25 minutes 16 seconds and 766 milliseconds.
+   * Formats a period similar to Oracle INTERVAL DAY TO SECOND data type.<br>
+   * . For example, the string "-001 18:25:16.766" defines an interval of - 1 day 18 hours 25
+   * minutes 16 seconds and 766 milliseconds.
    */
   public static String formatIntervalDay(final Duration d) {
     long millis = d.toMillis();
@@ -77,6 +72,7 @@ public static String formatIntervalDay(final Duration d) {
     final int seconds = (int) (millis / DateUtility.secondsToMillis);
     millis = millis % DateUtility.secondsToMillis;
 
-    return String.format("%c%03d %02d:%02d:%02d.%03d", neg ? '-' : '+', days, hours, minutes, seconds, millis);
+    return String.format(
+        "%c%03d %02d:%02d:%02d.%03d", neg ? '-' : '+', days, hours, minutes, seconds, millis);
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/SqlTypes.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/SqlTypes.java
index 85c3964303c45..96cb056db2bf4 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/SqlTypes.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/SqlTypes.java
@@ -14,19 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import java.sql.Types;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.arrow.vector.types.FloatingPointPrecision;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 
-/**
- * SQL Types utility functions.
- */
+/** SQL Types utility functions. */
 public class SqlTypes {
   private static final Map<Integer, String> typeIdToName = new HashMap<>();
 
@@ -84,7 +80,6 @@ public static String getSqlTypeNameFromArrowType(ArrowType arrowType) {
     return typeIdToName.get(typeId);
   }
 
-
   /**
    * Convert given {@link ArrowType} to its corresponding SQL type ID.
    *
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/UrlParser.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/UrlParser.java
index 64255e2213a1a..5d4d9ce1aa37f 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/UrlParser.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/UrlParser.java
@@ -14,20 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.Map;
-/**
- * URL Parser for extracting key values from a connection string.
- */
 
+/** URL Parser for extracting key values from a connection string. */
 public final class UrlParser {
-  private UrlParser() {
-  }
+  private UrlParser() {}
 
   /**
    * Parse URL key value parameters.
@@ -45,8 +41,10 @@ public static Map<String, String> parse(String url, String separator) {
 
       for (String keyValue : keyValues) {
         try {
-          int separatorKey = keyValue.indexOf("="); // Find the first equal sign to split key and value.
-          if (separatorKey != -1) { // Avoid crashes when not finding an equal sign in the property value.
+          int separatorKey =
+              keyValue.indexOf("="); // Find the first equal sign to split key and value.
+          if (separatorKey
+              != -1) { // Avoid crashes when not finding an equal sign in the property value.
             String key = keyValue.substring(0, separatorKey);
             key = URLDecoder.decode(key, "UTF-8");
             String value = "";
diff --git a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/VectorSchemaRootTransformer.java b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/VectorSchemaRootTransformer.java
index 52a1d7db791c2..b651e1eb9bcae 100644
--- a/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/VectorSchemaRootTransformer.java
+++ b/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/VectorSchemaRootTransformer.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.BaseFixedWidthVector;
 import org.apache.arrow.vector.BaseVariableWidthVector;
@@ -32,17 +30,13 @@
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-/**
- * Converts Arrow's {@link VectorSchemaRoot} format to one JDBC would expect.
- */
+/** Converts Arrow's {@link VectorSchemaRoot} format to one JDBC would expect. */
 @FunctionalInterface
 public interface VectorSchemaRootTransformer {
   VectorSchemaRoot transform(VectorSchemaRoot originalRoot, VectorSchemaRoot transformedRoot)
       throws Exception;
 
-  /**
-   * Transformer's helper class; builds a new {@link VectorSchemaRoot}.
-   */
+  /** Transformer's helper class; builds a new {@link VectorSchemaRoot}. */
   class Builder {
 
     private final Schema schema;
@@ -52,50 +46,57 @@ class Builder {
 
     public Builder(final Schema schema, final BufferAllocator bufferAllocator) {
       this.schema = schema;
-      this.bufferAllocator = bufferAllocator
-          .newChildAllocator("VectorSchemaRootTransformer", 0, bufferAllocator.getLimit());
+      this.bufferAllocator =
+          bufferAllocator.newChildAllocator(
+              "VectorSchemaRootTransformer", 0, bufferAllocator.getLimit());
     }
 
     /**
-     * Add task to transform a vector to a new vector renaming it.
-     * This also adds transformedVectorName to the transformed {@link VectorSchemaRoot} schema.
+     * Add task to transform a vector to a new vector renaming it. This also adds
+     * transformedVectorName to the transformed {@link VectorSchemaRoot} schema.
      *
-     * @param originalVectorName    Name of the original vector to be transformed.
+     * @param originalVectorName Name of the original vector to be transformed.
      * @param transformedVectorName Name of the vector that is the result of the transformation.
      * @return a VectorSchemaRoot instance with a task to rename a field vector.
      */
-    public Builder renameFieldVector(final String originalVectorName,
-                                     final String transformedVectorName) {
-      tasks.add((originalRoot, transformedRoot) -> {
-        final FieldVector originalVector = originalRoot.getVector(originalVectorName);
-        final FieldVector transformedVector = transformedRoot.getVector(transformedVectorName);
-
-        final ArrowType originalType = originalVector.getField().getType();
-        final ArrowType transformedType = transformedVector.getField().getType();
-        if (!originalType.equals(transformedType)) {
-          throw new IllegalArgumentException(String.format(
-              "Cannot transfer vector with field type %s to %s", originalType, transformedType));
-        }
-
-        if (originalVector instanceof BaseVariableWidthVector) {
-          ((BaseVariableWidthVector) originalVector).transferTo(
-              ((BaseVariableWidthVector) transformedVector));
-        } else if (originalVector instanceof BaseFixedWidthVector) {
-          ((BaseFixedWidthVector) originalVector).transferTo(
-              ((BaseFixedWidthVector) transformedVector));
-        } else {
-          throw new IllegalStateException(String.format(
-              "Cannot transfer vector of type %s", originalVector.getClass()));
-        }
-      });
+    public Builder renameFieldVector(
+        final String originalVectorName, final String transformedVectorName) {
+      tasks.add(
+          (originalRoot, transformedRoot) -> {
+            final FieldVector originalVector = originalRoot.getVector(originalVectorName);
+            final FieldVector transformedVector = transformedRoot.getVector(transformedVectorName);
+
+            final ArrowType originalType = originalVector.getField().getType();
+            final ArrowType transformedType = transformedVector.getField().getType();
+            if (!originalType.equals(transformedType)) {
+              throw new IllegalArgumentException(
+                  String.format(
+                      "Cannot transfer vector with field type %s to %s",
+                      originalType, transformedType));
+            }
+
+            if (originalVector instanceof BaseVariableWidthVector) {
+              ((BaseVariableWidthVector) originalVector)
+                  .transferTo(((BaseVariableWidthVector) transformedVector));
+            } else if (originalVector instanceof BaseFixedWidthVector) {
+              ((BaseFixedWidthVector) originalVector)
+                  .transferTo(((BaseFixedWidthVector) transformedVector));
+            } else {
+              throw new IllegalStateException(
+                  String.format("Cannot transfer vector of type %s", originalVector.getClass()));
+            }
+          });
 
       final Field originalField = schema.findField(originalVectorName);
-      newFields.add(new Field(
-          transformedVectorName,
-          new FieldType(originalField.isNullable(), originalField.getType(),
-              originalField.getDictionary(), originalField.getMetadata()),
-          originalField.getChildren())
-      );
+      newFields.add(
+          new Field(
+              transformedVectorName,
+              new FieldType(
+                  originalField.isNullable(),
+                  originalField.getType(),
+                  originalField.getDictionary(),
+                  originalField.getMetadata()),
+              originalField.getChildren()));
 
       return this;
     }
@@ -144,7 +145,8 @@ public VectorSchemaRootTransformer build() {
     }
 
     /**
-     * Functional interface used to a task to transform a VectorSchemaRoot into a new VectorSchemaRoot.
+     * Functional interface used to a task to transform a VectorSchemaRoot into a new
+     * VectorSchemaRoot.
      */
     @FunctionalInterface
     interface Task {
diff --git a/java/flight/flight-sql-jdbc-core/src/main/resources/properties/flight.properties b/java/flight/flight-sql-jdbc-core/src/main/resources/properties/flight.properties
new file mode 100644
index 0000000000000..4ba818d81bb28
--- /dev/null
+++ b/java/flight/flight-sql-jdbc-core/src/main/resources/properties/flight.properties
@@ -0,0 +1,18 @@
+# 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.
+org.apache.arrow.flight.jdbc-driver.name=${project.name}
+org.apache.arrow.flight.jdbc-driver.version=${project.version}
+org.apache.arrow.flight.name=${project.groupId}\:${project.artifactId}
+org.apache.arrow.flight.version=${project.version}
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowDatabaseMetadataTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowDatabaseMetadataTest.java
index 0d930f4c44e1f..88a172e4f2b3f 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowDatabaseMetadataTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowDatabaseMetadataTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import static com.google.protobuf.ByteString.copyFrom;
@@ -32,7 +31,14 @@
 import static org.apache.arrow.flight.sql.impl.FlightSql.SqlSupportsConvert.SQL_CONVERT_BIT_VALUE;
 import static org.apache.arrow.flight.sql.impl.FlightSql.SqlSupportsConvert.SQL_CONVERT_INTEGER_VALUE;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.protobuf.Message;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
@@ -45,7 +51,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Consumer;
-
 import org.apache.arrow.driver.jdbc.utils.MockFlightSqlProducer;
 import org.apache.arrow.driver.jdbc.utils.ResultSetTestUtils;
 import org.apache.arrow.driver.jdbc.utils.ThrowableAssertionUtils;
@@ -76,28 +81,27 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.arrow.vector.util.Text;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.protobuf.Message;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
-/**
- * Class containing the tests from the {@link ArrowDatabaseMetadata}.
- */
+/** Class containing the tests from the {@link ArrowDatabaseMetadata}. */
 @SuppressWarnings("DoubleBraceInitialization")
 public class ArrowDatabaseMetadataTest {
   public static final boolean EXPECTED_MAX_ROW_SIZE_INCLUDES_BLOBS = false;
   private static final MockFlightSqlProducer FLIGHT_SQL_PRODUCER = new MockFlightSqlProducer();
-  @ClassRule
-  public static final FlightServerTestRule FLIGHT_SERVER_TEST_RULE = FlightServerTestRule
-      .createStandardTestRule(FLIGHT_SQL_PRODUCER);
+  private static final MockFlightSqlProducer FLIGHT_SQL_PRODUCER_EMPTY_SQLINFO =
+      new MockFlightSqlProducer();
+
+  @RegisterExtension
+  public static final FlightServerTestExtension FLIGHT_SERVER_TEST_EXTENSION =
+      FlightServerTestExtension.createStandardTestExtension(FLIGHT_SQL_PRODUCER);
+
+  @RegisterExtension
+  public static final FlightServerTestExtension FLIGHT_SERVER_EMPTY_SQLINFO_TEST_RULE =
+      FlightServerTestExtension.createStandardTestExtension(FLIGHT_SQL_PRODUCER_EMPTY_SQLINFO);
+
   private static final int ROW_COUNT = 10;
   private static final List<List<Object>> EXPECTED_GET_CATALOGS_RESULTS =
       range(0, ROW_COUNT)
@@ -113,61 +117,85 @@ public class ArrowDatabaseMetadataTest {
           .collect(toList());
   private static final List<List<Object>> EXPECTED_GET_TABLES_RESULTS =
       range(0, ROW_COUNT)
-          .mapToObj(i -> new Object[] {
-              format("catalog_name #%d", i),
-              format("db_schema_name #%d", i),
-              format("table_name #%d", i),
-              format("table_type #%d", i),
-              // TODO Add these fields to FlightSQL, as it's currently not possible to fetch them.
-              null, null, null, null, null, null})
+          .mapToObj(
+              i ->
+                  new Object[] {
+                    format("catalog_name #%d", i),
+                    format("db_schema_name #%d", i),
+                    format("table_name #%d", i),
+                    format("table_type #%d", i),
+                    // TODO Add these fields to FlightSQL, as it's currently not possible to fetch
+                    // them.
+                    null,
+                    null,
+                    null,
+                    null,
+                    null,
+                    null
+                  })
           .map(Arrays::asList)
           .collect(toList());
   private static final List<List<Object>> EXPECTED_GET_SCHEMAS_RESULTS =
       range(0, ROW_COUNT)
-          .mapToObj(i -> new Object[] {
-              format("db_schema_name #%d", i),
-              format("catalog_name #%d", i)})
+          .mapToObj(
+              i -> new Object[] {format("db_schema_name #%d", i), format("catalog_name #%d", i)})
           .map(Arrays::asList)
           .collect(toList());
   private static final List<List<Object>> EXPECTED_GET_EXPORTED_AND_IMPORTED_KEYS_RESULTS =
       range(0, ROW_COUNT)
-          .mapToObj(i -> new Object[] {
-              format("pk_catalog_name #%d", i),
-              format("pk_db_schema_name #%d", i),
-              format("pk_table_name #%d", i),
-              format("pk_column_name #%d", i),
-              format("fk_catalog_name #%d", i),
-              format("fk_db_schema_name #%d", i),
-              format("fk_table_name #%d", i),
-              format("fk_column_name #%d", i),
-              i,
-              format("fk_key_name #%d", i),
-              format("pk_key_name #%d", i),
-              (byte) i,
-              (byte) i,
-              // TODO Add this field to FlightSQL, as it's currently not possible to fetch it.
-              null})
+          .mapToObj(
+              i ->
+                  new Object[] {
+                    format("pk_catalog_name #%d", i),
+                    format("pk_db_schema_name #%d", i),
+                    format("pk_table_name #%d", i),
+                    format("pk_column_name #%d", i),
+                    format("fk_catalog_name #%d", i),
+                    format("fk_db_schema_name #%d", i),
+                    format("fk_table_name #%d", i),
+                    format("fk_column_name #%d", i),
+                    i,
+                    format("fk_key_name #%d", i),
+                    format("pk_key_name #%d", i),
+                    (byte) i,
+                    (byte) i,
+                    // TODO Add this field to FlightSQL, as it's currently not possible to fetch it.
+                    null
+                  })
           .map(Arrays::asList)
           .collect(toList());
   private static final List<List<Object>> EXPECTED_CROSS_REFERENCE_RESULTS =
       EXPECTED_GET_EXPORTED_AND_IMPORTED_KEYS_RESULTS;
   private static final List<List<Object>> EXPECTED_PRIMARY_KEYS_RESULTS =
       range(0, ROW_COUNT)
-          .mapToObj(i -> new Object[] {
-              format("catalog_name #%d", i),
-              format("db_schema_name #%d", i),
-              format("table_name #%d", i),
-              format("column_name #%d", i),
-              i,
-              format("key_name #%d", i)})
+          .mapToObj(
+              i ->
+                  new Object[] {
+                    format("catalog_name #%d", i),
+                    format("db_schema_name #%d", i),
+                    format("table_name #%d", i),
+                    format("column_name #%d", i),
+                    i,
+                    format("key_name #%d", i)
+                  })
           .map(Arrays::asList)
           .collect(toList());
-  private static final List<String> FIELDS_GET_IMPORTED_EXPORTED_KEYS = ImmutableList.of(
-      "PKTABLE_CAT", "PKTABLE_SCHEM", "PKTABLE_NAME",
-      "PKCOLUMN_NAME", "FKTABLE_CAT", "FKTABLE_SCHEM",
-      "FKTABLE_NAME", "FKCOLUMN_NAME", "KEY_SEQ",
-      "FK_NAME", "PK_NAME", "UPDATE_RULE", "DELETE_RULE",
-      "DEFERRABILITY");
+  private static final List<String> FIELDS_GET_IMPORTED_EXPORTED_KEYS =
+      ImmutableList.of(
+          "PKTABLE_CAT",
+          "PKTABLE_SCHEM",
+          "PKTABLE_NAME",
+          "PKCOLUMN_NAME",
+          "FKTABLE_CAT",
+          "FKTABLE_SCHEM",
+          "FKTABLE_NAME",
+          "FKCOLUMN_NAME",
+          "KEY_SEQ",
+          "FK_NAME",
+          "PK_NAME",
+          "UPDATE_RULE",
+          "DELETE_RULE",
+          "DEFERRABILITY");
   private static final List<String> FIELDS_GET_CROSS_REFERENCE = FIELDS_GET_IMPORTED_EXPORTED_KEYS;
   private static final String TARGET_TABLE = "TARGET_TABLE";
   private static final String TARGET_FOREIGN_TABLE = "FOREIGN_TABLE";
@@ -229,8 +257,8 @@ public class ArrowDatabaseMetadataTest {
   private static final boolean EXPECTED_SUBQUERIES_IN_EXISTS = false;
   private static final boolean EXPECTED_SUBQUERIES_IN_INS = false;
   private static final boolean EXPECTED_SUBQUERIES_IN_QUANTIFIEDS = false;
-  private static final SqlSupportedSubqueries[] EXPECTED_SUPPORTED_SUBQUERIES = new SqlSupportedSubqueries[]
-      {SqlSupportedSubqueries.SQL_SUBQUERIES_IN_COMPARISONS};
+  private static final SqlSupportedSubqueries[] EXPECTED_SUPPORTED_SUBQUERIES =
+      new SqlSupportedSubqueries[] {SqlSupportedSubqueries.SQL_SUBQUERIES_IN_COMPARISONS};
   private static final boolean EXPECTED_CORRELATED_SUBQUERIES_SUPPORTED = true;
   private static final boolean EXPECTED_SUPPORTS_UNION = true;
   private static final boolean EXPECTED_SUPPORTS_UNION_ALL = true;
@@ -277,171 +305,190 @@ public class ArrowDatabaseMetadataTest {
     List<Integer> expectedGetColumnsColumnSize = Arrays.asList(5, 29, 10);
     List<Integer> expectedGetColumnsDecimalDigits = Arrays.asList(2, 9, 0);
     List<String> expectedGetColumnsIsNullable = Arrays.asList("YES", "YES", "NO");
-    EXPECTED_GET_COLUMNS_RESULTS = range(0, ROW_COUNT * 3)
-        .mapToObj(i -> new Object[] {
-            format("catalog_name #%d", i / 3),
-            format("db_schema_name #%d", i / 3),
-            format("table_name%d", i / 3),
-            format("column_%d", (i % 3) + 1),
-            expectedGetColumnsDataTypes.get(i % 3),
-            expectedGetColumnsTypeName.get(i % 3),
-            expectedGetColumnsColumnSize.get(i % 3),
-            null,
-            expectedGetColumnsDecimalDigits.get(i % 3),
-            expectedGetColumnsRadix.get(i % 3),
-            !Objects.equals(expectedGetColumnsIsNullable.get(i % 3), "NO") ? 1 : 0,
-            null, null, null, null, null,
-            (i % 3) + 1,
-            expectedGetColumnsIsNullable.get(i % 3),
-            null, null, null, null,
-            "", ""})
-        .map(Arrays::asList)
-        .collect(toList());
+    EXPECTED_GET_COLUMNS_RESULTS =
+        range(0, ROW_COUNT * 3)
+            .mapToObj(
+                i ->
+                    new Object[] {
+                      format("catalog_name #%d", i / 3),
+                      format("db_schema_name #%d", i / 3),
+                      format("table_name%d", i / 3),
+                      format("column_%d", (i % 3) + 1),
+                      expectedGetColumnsDataTypes.get(i % 3),
+                      expectedGetColumnsTypeName.get(i % 3),
+                      expectedGetColumnsColumnSize.get(i % 3),
+                      null,
+                      expectedGetColumnsDecimalDigits.get(i % 3),
+                      expectedGetColumnsRadix.get(i % 3),
+                      !Objects.equals(expectedGetColumnsIsNullable.get(i % 3), "NO") ? 1 : 0,
+                      null,
+                      null,
+                      null,
+                      null,
+                      null,
+                      (i % 3) + 1,
+                      expectedGetColumnsIsNullable.get(i % 3),
+                      null,
+                      null,
+                      null,
+                      null,
+                      "",
+                      ""
+                    })
+            .map(Arrays::asList)
+            .collect(toList());
   }
 
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
-  public final ResultSetTestUtils resultSetTestUtils = new ResultSetTestUtils(collector);
+  public final ResultSetTestUtils resultSetTestUtils = new ResultSetTestUtils();
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpBeforeClass() throws SQLException {
-    connection = FLIGHT_SERVER_TEST_RULE.getConnection(false);
+    connection = FLIGHT_SERVER_TEST_EXTENSION.getConnection(false);
 
     final Message commandGetCatalogs = CommandGetCatalogs.getDefaultInstance();
-    final Consumer<ServerStreamListener> commandGetCatalogsResultProducer = listener -> {
-      try (final BufferAllocator allocator = new RootAllocator();
-           final VectorSchemaRoot root = VectorSchemaRoot.create(Schemas.GET_CATALOGS_SCHEMA,
-               allocator)) {
-        final VarCharVector catalogName = (VarCharVector) root.getVector("catalog_name");
-        range(0, ROW_COUNT).forEach(
-            i -> catalogName.setSafe(i, new Text(format("catalog #%d", i))));
-        root.setRowCount(ROW_COUNT);
-        listener.start(root);
-        listener.putNext();
-      } catch (final Throwable throwable) {
-        listener.error(throwable);
-      } finally {
-        listener.completed();
-      }
-    };
+    final Consumer<ServerStreamListener> commandGetCatalogsResultProducer =
+        listener -> {
+          try (final BufferAllocator allocator = new RootAllocator();
+              final VectorSchemaRoot root =
+                  VectorSchemaRoot.create(Schemas.GET_CATALOGS_SCHEMA, allocator)) {
+            final VarCharVector catalogName = (VarCharVector) root.getVector("catalog_name");
+            range(0, ROW_COUNT)
+                .forEach(i -> catalogName.setSafe(i, new Text(format("catalog #%d", i))));
+            root.setRowCount(ROW_COUNT);
+            listener.start(root);
+            listener.putNext();
+          } catch (final Throwable throwable) {
+            listener.error(throwable);
+          } finally {
+            listener.completed();
+          }
+        };
     FLIGHT_SQL_PRODUCER.addCatalogQuery(commandGetCatalogs, commandGetCatalogsResultProducer);
 
     final Message commandGetTableTypes = CommandGetTableTypes.getDefaultInstance();
-    final Consumer<ServerStreamListener> commandGetTableTypesResultProducer = listener -> {
-      try (final BufferAllocator allocator = new RootAllocator();
-           final VectorSchemaRoot root = VectorSchemaRoot.create(Schemas.GET_TABLE_TYPES_SCHEMA,
-               allocator)) {
-        final VarCharVector tableType = (VarCharVector) root.getVector("table_type");
-        range(0, ROW_COUNT).forEach(
-            i -> tableType.setSafe(i, new Text(format("table_type #%d", i))));
-        root.setRowCount(ROW_COUNT);
-        listener.start(root);
-        listener.putNext();
-      } catch (final Throwable throwable) {
-        listener.error(throwable);
-      } finally {
-        listener.completed();
-      }
-    };
+    final Consumer<ServerStreamListener> commandGetTableTypesResultProducer =
+        listener -> {
+          try (final BufferAllocator allocator = new RootAllocator();
+              final VectorSchemaRoot root =
+                  VectorSchemaRoot.create(Schemas.GET_TABLE_TYPES_SCHEMA, allocator)) {
+            final VarCharVector tableType = (VarCharVector) root.getVector("table_type");
+            range(0, ROW_COUNT)
+                .forEach(i -> tableType.setSafe(i, new Text(format("table_type #%d", i))));
+            root.setRowCount(ROW_COUNT);
+            listener.start(root);
+            listener.putNext();
+          } catch (final Throwable throwable) {
+            listener.error(throwable);
+          } finally {
+            listener.completed();
+          }
+        };
     FLIGHT_SQL_PRODUCER.addCatalogQuery(commandGetTableTypes, commandGetTableTypesResultProducer);
 
     final Message commandGetTables = CommandGetTables.getDefaultInstance();
-    final Consumer<ServerStreamListener> commandGetTablesResultProducer = listener -> {
-      try (final BufferAllocator allocator = new RootAllocator();
-           final VectorSchemaRoot root = VectorSchemaRoot.create(
-               Schemas.GET_TABLES_SCHEMA_NO_SCHEMA, allocator)) {
-        final VarCharVector catalogName = (VarCharVector) root.getVector("catalog_name");
-        final VarCharVector schemaName = (VarCharVector) root.getVector("db_schema_name");
-        final VarCharVector tableName = (VarCharVector) root.getVector("table_name");
-        final VarCharVector tableType = (VarCharVector) root.getVector("table_type");
-        range(0, ROW_COUNT)
-            .peek(i -> catalogName.setSafe(i, new Text(format("catalog_name #%d", i))))
-            .peek(i -> schemaName.setSafe(i, new Text(format("db_schema_name #%d", i))))
-            .peek(i -> tableName.setSafe(i, new Text(format("table_name #%d", i))))
-            .forEach(i -> tableType.setSafe(i, new Text(format("table_type #%d", i))));
-        root.setRowCount(ROW_COUNT);
-        listener.start(root);
-        listener.putNext();
-      } catch (final Throwable throwable) {
-        listener.error(throwable);
-      } finally {
-        listener.completed();
-      }
-    };
+    final Consumer<ServerStreamListener> commandGetTablesResultProducer =
+        listener -> {
+          try (final BufferAllocator allocator = new RootAllocator();
+              final VectorSchemaRoot root =
+                  VectorSchemaRoot.create(Schemas.GET_TABLES_SCHEMA_NO_SCHEMA, allocator)) {
+            final VarCharVector catalogName = (VarCharVector) root.getVector("catalog_name");
+            final VarCharVector schemaName = (VarCharVector) root.getVector("db_schema_name");
+            final VarCharVector tableName = (VarCharVector) root.getVector("table_name");
+            final VarCharVector tableType = (VarCharVector) root.getVector("table_type");
+            range(0, ROW_COUNT)
+                .peek(i -> catalogName.setSafe(i, new Text(format("catalog_name #%d", i))))
+                .peek(i -> schemaName.setSafe(i, new Text(format("db_schema_name #%d", i))))
+                .peek(i -> tableName.setSafe(i, new Text(format("table_name #%d", i))))
+                .forEach(i -> tableType.setSafe(i, new Text(format("table_type #%d", i))));
+            root.setRowCount(ROW_COUNT);
+            listener.start(root);
+            listener.putNext();
+          } catch (final Throwable throwable) {
+            listener.error(throwable);
+          } finally {
+            listener.completed();
+          }
+        };
     FLIGHT_SQL_PRODUCER.addCatalogQuery(commandGetTables, commandGetTablesResultProducer);
 
-    final Message commandGetTablesWithSchema = CommandGetTables.newBuilder()
-        .setIncludeSchema(true)
-        .build();
-    final Consumer<ServerStreamListener> commandGetTablesWithSchemaResultProducer = listener -> {
-      try (final BufferAllocator allocator = new RootAllocator();
-           final VectorSchemaRoot root = VectorSchemaRoot.create(Schemas.GET_TABLES_SCHEMA,
-               allocator)) {
-        final byte[] filledTableSchemaBytes =
-            copyFrom(
-                serializeSchema(new Schema(Arrays.asList(
-                    Field.nullable("column_1", ArrowType.Decimal.createDecimal(5, 2, 128)),
-                    Field.nullable("column_2", new ArrowType.Timestamp(TimeUnit.NANOSECOND, "UTC")),
-                    Field.notNullable("column_3", Types.MinorType.INT.getType())))))
-                .toByteArray();
-        final VarCharVector catalogName = (VarCharVector) root.getVector("catalog_name");
-        final VarCharVector schemaName = (VarCharVector) root.getVector("db_schema_name");
-        final VarCharVector tableName = (VarCharVector) root.getVector("table_name");
-        final VarCharVector tableType = (VarCharVector) root.getVector("table_type");
-        final VarBinaryVector tableSchema = (VarBinaryVector) root.getVector("table_schema");
-        range(0, ROW_COUNT)
-            .peek(i -> catalogName.setSafe(i, new Text(format("catalog_name #%d", i))))
-            .peek(i -> schemaName.setSafe(i, new Text(format("db_schema_name #%d", i))))
-            .peek(i -> tableName.setSafe(i, new Text(format("table_name%d", i))))
-            .peek(i -> tableType.setSafe(i, new Text(format("table_type #%d", i))))
-            .forEach(i -> tableSchema.setSafe(i, filledTableSchemaBytes));
-        root.setRowCount(ROW_COUNT);
-        listener.start(root);
-        listener.putNext();
-      } catch (final Throwable throwable) {
-        listener.error(throwable);
-      } finally {
-        listener.completed();
-      }
-    };
-    FLIGHT_SQL_PRODUCER.addCatalogQuery(commandGetTablesWithSchema,
-        commandGetTablesWithSchemaResultProducer);
+    final Message commandGetTablesWithSchema =
+        CommandGetTables.newBuilder().setIncludeSchema(true).build();
+    final Consumer<ServerStreamListener> commandGetTablesWithSchemaResultProducer =
+        listener -> {
+          try (final BufferAllocator allocator = new RootAllocator();
+              final VectorSchemaRoot root =
+                  VectorSchemaRoot.create(Schemas.GET_TABLES_SCHEMA, allocator)) {
+            final byte[] filledTableSchemaBytes =
+                copyFrom(
+                        serializeSchema(
+                            new Schema(
+                                Arrays.asList(
+                                    Field.nullable(
+                                        "column_1", ArrowType.Decimal.createDecimal(5, 2, 128)),
+                                    Field.nullable(
+                                        "column_2",
+                                        new ArrowType.Timestamp(TimeUnit.NANOSECOND, "UTC")),
+                                    Field.notNullable("column_3", Types.MinorType.INT.getType())))))
+                    .toByteArray();
+            final VarCharVector catalogName = (VarCharVector) root.getVector("catalog_name");
+            final VarCharVector schemaName = (VarCharVector) root.getVector("db_schema_name");
+            final VarCharVector tableName = (VarCharVector) root.getVector("table_name");
+            final VarCharVector tableType = (VarCharVector) root.getVector("table_type");
+            final VarBinaryVector tableSchema = (VarBinaryVector) root.getVector("table_schema");
+            range(0, ROW_COUNT)
+                .peek(i -> catalogName.setSafe(i, new Text(format("catalog_name #%d", i))))
+                .peek(i -> schemaName.setSafe(i, new Text(format("db_schema_name #%d", i))))
+                .peek(i -> tableName.setSafe(i, new Text(format("table_name%d", i))))
+                .peek(i -> tableType.setSafe(i, new Text(format("table_type #%d", i))))
+                .forEach(i -> tableSchema.setSafe(i, filledTableSchemaBytes));
+            root.setRowCount(ROW_COUNT);
+            listener.start(root);
+            listener.putNext();
+          } catch (final Throwable throwable) {
+            listener.error(throwable);
+          } finally {
+            listener.completed();
+          }
+        };
+    FLIGHT_SQL_PRODUCER.addCatalogQuery(
+        commandGetTablesWithSchema, commandGetTablesWithSchemaResultProducer);
 
     final Message commandGetDbSchemas = CommandGetDbSchemas.getDefaultInstance();
-    final Consumer<ServerStreamListener> commandGetSchemasResultProducer = listener -> {
-      try (final BufferAllocator allocator = new RootAllocator();
-           final VectorSchemaRoot root = VectorSchemaRoot.create(Schemas.GET_SCHEMAS_SCHEMA,
-               allocator)) {
-        final VarCharVector catalogName = (VarCharVector) root.getVector("catalog_name");
-        final VarCharVector schemaName = (VarCharVector) root.getVector("db_schema_name");
-        range(0, ROW_COUNT)
-            .peek(i -> catalogName.setSafe(i, new Text(format("catalog_name #%d", i))))
-            .forEach(i -> schemaName.setSafe(i, new Text(format("db_schema_name #%d", i))));
-        root.setRowCount(ROW_COUNT);
-        listener.start(root);
-        listener.putNext();
-      } catch (final Throwable throwable) {
-        listener.error(throwable);
-      } finally {
-        listener.completed();
-      }
-    };
+    final Consumer<ServerStreamListener> commandGetSchemasResultProducer =
+        listener -> {
+          try (final BufferAllocator allocator = new RootAllocator();
+              final VectorSchemaRoot root =
+                  VectorSchemaRoot.create(Schemas.GET_SCHEMAS_SCHEMA, allocator)) {
+            final VarCharVector catalogName = (VarCharVector) root.getVector("catalog_name");
+            final VarCharVector schemaName = (VarCharVector) root.getVector("db_schema_name");
+            range(0, ROW_COUNT)
+                .peek(i -> catalogName.setSafe(i, new Text(format("catalog_name #%d", i))))
+                .forEach(i -> schemaName.setSafe(i, new Text(format("db_schema_name #%d", i))));
+            root.setRowCount(ROW_COUNT);
+            listener.start(root);
+            listener.putNext();
+          } catch (final Throwable throwable) {
+            listener.error(throwable);
+          } finally {
+            listener.completed();
+          }
+        };
     FLIGHT_SQL_PRODUCER.addCatalogQuery(commandGetDbSchemas, commandGetSchemasResultProducer);
 
     final Message commandGetExportedKeys =
         CommandGetExportedKeys.newBuilder().setTable(TARGET_TABLE).build();
     final Message commandGetImportedKeys =
         CommandGetImportedKeys.newBuilder().setTable(TARGET_TABLE).build();
-    final Message commandGetCrossReference = CommandGetCrossReference.newBuilder()
-        .setPkTable(TARGET_TABLE)
-        .setFkTable(TARGET_FOREIGN_TABLE)
-        .build();
+    final Message commandGetCrossReference =
+        CommandGetCrossReference.newBuilder()
+            .setPkTable(TARGET_TABLE)
+            .setFkTable(TARGET_FOREIGN_TABLE)
+            .build();
     final Consumer<ServerStreamListener> commandGetExportedAndImportedKeysResultProducer =
         listener -> {
           try (final BufferAllocator allocator = new RootAllocator();
-               final VectorSchemaRoot root = VectorSchemaRoot.create(
-                   Schemas.GET_IMPORTED_KEYS_SCHEMA,
-                   allocator)) {
+              final VectorSchemaRoot root =
+                  VectorSchemaRoot.create(Schemas.GET_IMPORTED_KEYS_SCHEMA, allocator)) {
             final VarCharVector pkCatalogName = (VarCharVector) root.getVector("pk_catalog_name");
             final VarCharVector pkSchemaName = (VarCharVector) root.getVector("pk_db_schema_name");
             final VarCharVector pkTableName = (VarCharVector) root.getVector("pk_table_name");
@@ -478,44 +525,46 @@ public static void setUpBeforeClass() throws SQLException {
             listener.completed();
           }
         };
-    FLIGHT_SQL_PRODUCER.addCatalogQuery(commandGetExportedKeys,
-        commandGetExportedAndImportedKeysResultProducer);
-    FLIGHT_SQL_PRODUCER.addCatalogQuery(commandGetImportedKeys,
-        commandGetExportedAndImportedKeysResultProducer);
-    FLIGHT_SQL_PRODUCER.addCatalogQuery(commandGetCrossReference,
-        commandGetExportedAndImportedKeysResultProducer);
+    FLIGHT_SQL_PRODUCER.addCatalogQuery(
+        commandGetExportedKeys, commandGetExportedAndImportedKeysResultProducer);
+    FLIGHT_SQL_PRODUCER.addCatalogQuery(
+        commandGetImportedKeys, commandGetExportedAndImportedKeysResultProducer);
+    FLIGHT_SQL_PRODUCER.addCatalogQuery(
+        commandGetCrossReference, commandGetExportedAndImportedKeysResultProducer);
 
     final Message commandGetPrimaryKeys =
         CommandGetPrimaryKeys.newBuilder().setTable(TARGET_TABLE).build();
-    final Consumer<ServerStreamListener> commandGetPrimaryKeysResultProducer = listener -> {
-      try (final BufferAllocator allocator = new RootAllocator();
-           final VectorSchemaRoot root = VectorSchemaRoot.create(Schemas.GET_PRIMARY_KEYS_SCHEMA,
-               allocator)) {
-        final VarCharVector catalogName = (VarCharVector) root.getVector("catalog_name");
-        final VarCharVector schemaName = (VarCharVector) root.getVector("db_schema_name");
-        final VarCharVector tableName = (VarCharVector) root.getVector("table_name");
-        final VarCharVector columnName = (VarCharVector) root.getVector("column_name");
-        final IntVector keySequence = (IntVector) root.getVector("key_sequence");
-        final VarCharVector keyName = (VarCharVector) root.getVector("key_name");
-        range(0, ROW_COUNT)
-            .peek(i -> catalogName.setSafe(i, new Text(format("catalog_name #%d", i))))
-            .peek(i -> schemaName.setSafe(i, new Text(format("db_schema_name #%d", i))))
-            .peek(i -> tableName.setSafe(i, new Text(format("table_name #%d", i))))
-            .peek(i -> columnName.setSafe(i, new Text(format("column_name #%d", i))))
-            .peek(i -> keySequence.setSafe(i, i))
-            .forEach(i -> keyName.setSafe(i, new Text(format("key_name #%d", i))));
-        root.setRowCount(ROW_COUNT);
-        listener.start(root);
-        listener.putNext();
-      } catch (final Throwable throwable) {
-        listener.error(throwable);
-      } finally {
-        listener.completed();
-      }
-    };
+    final Consumer<ServerStreamListener> commandGetPrimaryKeysResultProducer =
+        listener -> {
+          try (final BufferAllocator allocator = new RootAllocator();
+              final VectorSchemaRoot root =
+                  VectorSchemaRoot.create(Schemas.GET_PRIMARY_KEYS_SCHEMA, allocator)) {
+            final VarCharVector catalogName = (VarCharVector) root.getVector("catalog_name");
+            final VarCharVector schemaName = (VarCharVector) root.getVector("db_schema_name");
+            final VarCharVector tableName = (VarCharVector) root.getVector("table_name");
+            final VarCharVector columnName = (VarCharVector) root.getVector("column_name");
+            final IntVector keySequence = (IntVector) root.getVector("key_sequence");
+            final VarCharVector keyName = (VarCharVector) root.getVector("key_name");
+            range(0, ROW_COUNT)
+                .peek(i -> catalogName.setSafe(i, new Text(format("catalog_name #%d", i))))
+                .peek(i -> schemaName.setSafe(i, new Text(format("db_schema_name #%d", i))))
+                .peek(i -> tableName.setSafe(i, new Text(format("table_name #%d", i))))
+                .peek(i -> columnName.setSafe(i, new Text(format("column_name #%d", i))))
+                .peek(i -> keySequence.setSafe(i, i))
+                .forEach(i -> keyName.setSafe(i, new Text(format("key_name #%d", i))));
+            root.setRowCount(ROW_COUNT);
+            listener.start(root);
+            listener.putNext();
+          } catch (final Throwable throwable) {
+            listener.error(throwable);
+          } finally {
+            listener.completed();
+          }
+        };
     FLIGHT_SQL_PRODUCER.addCatalogQuery(commandGetPrimaryKeys, commandGetPrimaryKeysResultProducer);
 
-    FLIGHT_SQL_PRODUCER.getSqlInfoBuilder()
+    FLIGHT_SQL_PRODUCER
+        .getSqlInfoBuilder()
         .withSqlOuterJoinSupportLevel(FlightSql.SqlOuterJoinsSupportLevel.SQL_FULL_OUTER_JOINS)
         .withFlightSqlServerName(EXPECTED_DATABASE_PRODUCT_NAME)
         .withFlightSqlServerVersion(EXPECTED_DATABASE_PRODUCT_VERSION)
@@ -530,8 +579,10 @@ public static void setUpBeforeClass() throws SQLException {
         .withSqlExtraNameCharacters(EXPECTED_EXTRA_NAME_CHARACTERS)
         .withSqlSupportsColumnAliasing(EXPECTED_SUPPORTS_COLUMN_ALIASING)
         .withSqlNullPlusNullIsNull(EXPECTED_NULL_PLUS_NULL_IS_NULL)
-        .withSqlSupportsConvert(ImmutableMap.of(SQL_CONVERT_BIT_VALUE,
-            Arrays.asList(SQL_CONVERT_INTEGER_VALUE, SQL_CONVERT_BIGINT_VALUE)))
+        .withSqlSupportsConvert(
+            ImmutableMap.of(
+                SQL_CONVERT_BIT_VALUE,
+                Arrays.asList(SQL_CONVERT_INTEGER_VALUE, SQL_CONVERT_BIGINT_VALUE)))
         .withSqlSupportsTableCorrelationNames(EXPECTED_SUPPORTS_TABLE_CORRELATION_NAMES)
         .withSqlSupportsDifferentTableCorrelationNames(
             EXPECTED_SUPPORTS_DIFFERENT_TABLE_CORRELATION_NAMES)
@@ -540,9 +591,11 @@ public static void setUpBeforeClass() throws SQLException {
         .withSqlSupportedGroupBy(FlightSql.SqlSupportedGroupBy.SQL_GROUP_BY_UNRELATED)
         .withSqlSupportsLikeEscapeClause(EXPECTED_SUPPORTS_LIKE_ESCAPE_CLAUSE)
         .withSqlSupportsNonNullableColumns(EXPECTED_NON_NULLABLE_COLUMNS)
-        .withSqlSupportedGrammar(FlightSql.SupportedSqlGrammar.SQL_CORE_GRAMMAR,
+        .withSqlSupportedGrammar(
+            FlightSql.SupportedSqlGrammar.SQL_CORE_GRAMMAR,
             FlightSql.SupportedSqlGrammar.SQL_MINIMUM_GRAMMAR)
-        .withSqlAnsi92SupportedLevel(FlightSql.SupportedAnsi92SqlGrammarLevel.ANSI92_ENTRY_SQL,
+        .withSqlAnsi92SupportedLevel(
+            FlightSql.SupportedAnsi92SqlGrammarLevel.ANSI92_ENTRY_SQL,
             FlightSql.SupportedAnsi92SqlGrammarLevel.ANSI92_INTERMEDIATE_SQL)
         .withSqlSupportsIntegrityEnhancementFacility(
             EXPECTED_SUPPORTS_INTEGRITY_ENHANCEMENT_FACILITY)
@@ -602,12 +655,11 @@ public static void setUpBeforeClass() throws SQLException {
             EXPECTED_STORED_FUNCTIONS_USING_CALL_SYNTAX_SUPPORTED);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() throws Exception {
-    AutoCloseables.close(connection, FLIGHT_SQL_PRODUCER);
+    AutoCloseables.close(connection, FLIGHT_SQL_PRODUCER, FLIGHT_SQL_PRODUCER_EMPTY_SQLINFO);
   }
 
-
   @Test
   public void testGetCatalogsCanBeAccessedByIndices() throws SQLException {
     try (final ResultSet resultSet = connection.getMetaData().getCatalogs()) {
@@ -618,8 +670,8 @@ public void testGetCatalogsCanBeAccessedByIndices() throws SQLException {
   @Test
   public void testGetCatalogsCanBeAccessedByNames() throws SQLException {
     try (final ResultSet resultSet = connection.getMetaData().getCatalogs()) {
-      resultSetTestUtils.testData(resultSet, singletonList("TABLE_CAT"),
-          EXPECTED_GET_CATALOGS_RESULTS);
+      resultSetTestUtils.testData(
+          resultSet, singletonList("TABLE_CAT"), EXPECTED_GET_CATALOGS_RESULTS);
     }
   }
 
@@ -633,8 +685,8 @@ public void testTableTypesCanBeAccessedByIndices() throws SQLException {
   @Test
   public void testTableTypesCanBeAccessedByNames() throws SQLException {
     try (final ResultSet resultSet = connection.getMetaData().getTableTypes()) {
-      resultSetTestUtils.testData(resultSet, singletonList("TABLE_TYPE"),
-          EXPECTED_GET_TABLE_TYPES_RESULTS);
+      resultSetTestUtils.testData(
+          resultSet, singletonList("TABLE_TYPE"), EXPECTED_GET_TABLE_TYPES_RESULTS);
     }
   }
 
@@ -661,8 +713,7 @@ public void testGetTablesCanBeAccessedByNames() throws SQLException {
               "TYPE_NAME",
               "SELF_REFERENCING_COL_NAME",
               "REF_GENERATION"),
-          EXPECTED_GET_TABLES_RESULTS
-      );
+          EXPECTED_GET_TABLES_RESULTS);
     }
   }
 
@@ -676,59 +727,67 @@ public void testGetSchemasCanBeAccessedByIndices() throws SQLException {
   @Test
   public void testGetSchemasCanBeAccessedByNames() throws SQLException {
     try (final ResultSet resultSet = connection.getMetaData().getSchemas()) {
-      resultSetTestUtils.testData(resultSet, ImmutableList.of("TABLE_SCHEM", "TABLE_CATALOG"),
+      resultSetTestUtils.testData(
+          resultSet,
+          ImmutableList.of("TABLE_SCHEM", "TABLE_CATALOG"),
           EXPECTED_GET_SCHEMAS_RESULTS);
     }
   }
 
   @Test
   public void testGetExportedKeysCanBeAccessedByIndices() throws SQLException {
-    try (final ResultSet resultSet = connection.getMetaData()
-        .getExportedKeys(null, null, TARGET_TABLE)) {
+    try (final ResultSet resultSet =
+        connection.getMetaData().getExportedKeys(null, null, TARGET_TABLE)) {
       resultSetTestUtils.testData(resultSet, EXPECTED_GET_EXPORTED_AND_IMPORTED_KEYS_RESULTS);
     }
   }
 
   @Test
   public void testGetExportedKeysCanBeAccessedByNames() throws SQLException {
-    try (final ResultSet resultSet = connection.getMetaData()
-        .getExportedKeys(null, null, TARGET_TABLE)) {
+    try (final ResultSet resultSet =
+        connection.getMetaData().getExportedKeys(null, null, TARGET_TABLE)) {
       resultSetTestUtils.testData(
-          resultSet, FIELDS_GET_IMPORTED_EXPORTED_KEYS,
+          resultSet,
+          FIELDS_GET_IMPORTED_EXPORTED_KEYS,
           EXPECTED_GET_EXPORTED_AND_IMPORTED_KEYS_RESULTS);
     }
   }
 
   @Test
   public void testGetImportedKeysCanBeAccessedByIndices() throws SQLException {
-    try (final ResultSet resultSet = connection.getMetaData()
-        .getImportedKeys(null, null, TARGET_TABLE)) {
+    try (final ResultSet resultSet =
+        connection.getMetaData().getImportedKeys(null, null, TARGET_TABLE)) {
       resultSetTestUtils.testData(resultSet, EXPECTED_GET_EXPORTED_AND_IMPORTED_KEYS_RESULTS);
     }
   }
 
   @Test
   public void testGetImportedKeysCanBeAccessedByNames() throws SQLException {
-    try (final ResultSet resultSet = connection.getMetaData()
-        .getImportedKeys(null, null, TARGET_TABLE)) {
+    try (final ResultSet resultSet =
+        connection.getMetaData().getImportedKeys(null, null, TARGET_TABLE)) {
       resultSetTestUtils.testData(
-          resultSet, FIELDS_GET_IMPORTED_EXPORTED_KEYS,
+          resultSet,
+          FIELDS_GET_IMPORTED_EXPORTED_KEYS,
           EXPECTED_GET_EXPORTED_AND_IMPORTED_KEYS_RESULTS);
     }
   }
 
   @Test
   public void testGetCrossReferenceCanBeAccessedByIndices() throws SQLException {
-    try (final ResultSet resultSet = connection.getMetaData().getCrossReference(null, null,
-        TARGET_TABLE, null, null, TARGET_FOREIGN_TABLE)) {
+    try (final ResultSet resultSet =
+        connection
+            .getMetaData()
+            .getCrossReference(null, null, TARGET_TABLE, null, null, TARGET_FOREIGN_TABLE)) {
       resultSetTestUtils.testData(resultSet, EXPECTED_CROSS_REFERENCE_RESULTS);
     }
   }
 
   @Test
   public void testGetGetCrossReferenceCanBeAccessedByNames() throws SQLException {
-    try (final ResultSet resultSet = connection.getMetaData().getCrossReference(null, null,
-        TARGET_TABLE, null, null, TARGET_FOREIGN_TABLE)) {
+    try (final ResultSet resultSet =
+        connection
+            .getMetaData()
+            .getCrossReference(null, null, TARGET_TABLE, null, null, TARGET_FOREIGN_TABLE)) {
       resultSetTestUtils.testData(
           resultSet, FIELDS_GET_CROSS_REFERENCE, EXPECTED_CROSS_REFERENCE_RESULTS);
     }
@@ -736,27 +795,21 @@ public void testGetGetCrossReferenceCanBeAccessedByNames() throws SQLException {
 
   @Test
   public void testPrimaryKeysCanBeAccessedByIndices() throws SQLException {
-    try (final ResultSet resultSet = connection.getMetaData()
-        .getPrimaryKeys(null, null, TARGET_TABLE)) {
+    try (final ResultSet resultSet =
+        connection.getMetaData().getPrimaryKeys(null, null, TARGET_TABLE)) {
       resultSetTestUtils.testData(resultSet, EXPECTED_PRIMARY_KEYS_RESULTS);
     }
   }
 
   @Test
   public void testPrimaryKeysCanBeAccessedByNames() throws SQLException {
-    try (final ResultSet resultSet = connection.getMetaData()
-        .getPrimaryKeys(null, null, TARGET_TABLE)) {
+    try (final ResultSet resultSet =
+        connection.getMetaData().getPrimaryKeys(null, null, TARGET_TABLE)) {
       resultSetTestUtils.testData(
           resultSet,
           ImmutableList.of(
-              "TABLE_CAT",
-              "TABLE_SCHEM",
-              "TABLE_NAME",
-              "COLUMN_NAME",
-              "KEY_SEQ",
-              "PK_NAME"),
-          EXPECTED_PRIMARY_KEYS_RESULTS
-      );
+              "TABLE_CAT", "TABLE_SCHEM", "TABLE_NAME", "COLUMN_NAME", "KEY_SEQ", "PK_NAME"),
+          EXPECTED_PRIMARY_KEYS_RESULTS);
     }
   }
 
@@ -769,164 +822,161 @@ public void testGetColumnsCanBeAccessedByIndices() throws SQLException {
 
   @Test
   public void testGetColumnsCanByIndicesFilteringColumnNames() throws SQLException {
-    try (
-        final ResultSet resultSet = connection.getMetaData()
-            .getColumns(null, null, null, "column_1")) {
-      resultSetTestUtils.testData(resultSet, EXPECTED_GET_COLUMNS_RESULTS
-          .stream()
-          .filter(insideList -> Objects.equals(insideList.get(3), "column_1"))
-          .collect(toList())
-      );
+    try (final ResultSet resultSet =
+        connection.getMetaData().getColumns(null, null, null, "column_1")) {
+      resultSetTestUtils.testData(
+          resultSet,
+          EXPECTED_GET_COLUMNS_RESULTS.stream()
+              .filter(insideList -> Objects.equals(insideList.get(3), "column_1"))
+              .collect(toList()));
     }
   }
 
   @Test
   public void testGetSqlInfo() throws SQLException {
     final DatabaseMetaData metaData = connection.getMetaData();
-    collector.checkThat(metaData.getDatabaseProductName(), is(EXPECTED_DATABASE_PRODUCT_NAME));
-    collector.checkThat(metaData.getDatabaseProductVersion(),
-        is(EXPECTED_DATABASE_PRODUCT_VERSION));
-    collector.checkThat(metaData.getIdentifierQuoteString(), is(EXPECTED_IDENTIFIER_QUOTE_STRING));
-    collector.checkThat(metaData.isReadOnly(), is(EXPECTED_IS_READ_ONLY));
-    collector.checkThat(metaData.getSQLKeywords(), is(EXPECTED_SQL_KEYWORDS));
-    collector.checkThat(metaData.getNumericFunctions(), is(EXPECTED_NUMERIC_FUNCTIONS));
-    collector.checkThat(metaData.getStringFunctions(), is(EXPECTED_STRING_FUNCTIONS));
-    collector.checkThat(metaData.getSystemFunctions(), is(EXPECTED_SYSTEM_FUNCTIONS));
-    collector.checkThat(metaData.getTimeDateFunctions(), is(EXPECTED_TIME_DATE_FUNCTIONS));
-    collector.checkThat(metaData.getSearchStringEscape(), is(EXPECTED_SEARCH_STRING_ESCAPE));
-    collector.checkThat(metaData.getExtraNameCharacters(), is(EXPECTED_EXTRA_NAME_CHARACTERS));
-    collector.checkThat(metaData.supportsConvert(), is(EXPECTED_SQL_SUPPORTS_CONVERT));
-    collector.checkThat(metaData.supportsConvert(BIT, INTEGER), is(EXPECTED_SQL_SUPPORTS_CONVERT));
-    collector.checkThat(metaData.supportsConvert(BIT, BIGINT), is(EXPECTED_SQL_SUPPORTS_CONVERT));
-    collector.checkThat(metaData.supportsConvert(BIGINT, INTEGER),
-        is(EXPECTED_INVALID_SQL_SUPPORTS_CONVERT));
-    collector.checkThat(metaData.supportsConvert(JAVA_OBJECT, INTEGER),
-        is(EXPECTED_INVALID_SQL_SUPPORTS_CONVERT));
-    collector.checkThat(metaData.supportsTableCorrelationNames(),
-        is(EXPECTED_SUPPORTS_TABLE_CORRELATION_NAMES));
-    collector.checkThat(metaData.supportsExpressionsInOrderBy(),
-        is(EXPECTED_EXPRESSIONS_IN_ORDER_BY));
-    collector.checkThat(metaData.supportsOrderByUnrelated(),
-        is(EXPECTED_SUPPORTS_ORDER_BY_UNRELATED));
-    collector.checkThat(metaData.supportsGroupBy(), is(EXPECTED_SUPPORTS_GROUP_BY));
-    collector.checkThat(metaData.supportsGroupByUnrelated(),
-        is(EXPECTED_SUPPORTS_GROUP_BY_UNRELATED));
-    collector.checkThat(metaData.supportsLikeEscapeClause(),
-        is(EXPECTED_SUPPORTS_LIKE_ESCAPE_CLAUSE));
-    collector.checkThat(metaData.supportsNonNullableColumns(), is(EXPECTED_NON_NULLABLE_COLUMNS));
-    collector.checkThat(metaData.supportsMinimumSQLGrammar(), is(EXPECTED_MINIMUM_SQL_GRAMMAR));
-    collector.checkThat(metaData.supportsCoreSQLGrammar(), is(EXPECTED_CORE_SQL_GRAMMAR));
-    collector.checkThat(metaData.supportsExtendedSQLGrammar(), is(EXPECTED_EXTEND_SQL_GRAMMAR));
-    collector.checkThat(metaData.supportsANSI92EntryLevelSQL(),
-        is(EXPECTED_ANSI92_ENTRY_LEVEL_SQL));
-    collector.checkThat(metaData.supportsANSI92IntermediateSQL(),
-        is(EXPECTED_ANSI92_INTERMEDIATE_SQL));
-    collector.checkThat(metaData.supportsANSI92FullSQL(), is(EXPECTED_ANSI92_FULL_SQL));
-    collector.checkThat(metaData.supportsOuterJoins(), is(EXPECTED_SUPPORTS_OUTER_JOINS));
-    collector.checkThat(metaData.supportsFullOuterJoins(), is(EXPECTED_SUPPORTS_FULL_OUTER_JOINS));
-    collector.checkThat(metaData.supportsLimitedOuterJoins(), is(EXPECTED_SUPPORTS_LIMITED_JOINS));
-    collector.checkThat(metaData.getSchemaTerm(), is(EXPECTED_SCHEMA_TERM));
-    collector.checkThat(metaData.getProcedureTerm(), is(EXPECTED_PROCEDURE_TERM));
-    collector.checkThat(metaData.getCatalogTerm(), is(EXPECTED_CATALOG_TERM));
-    collector.checkThat(metaData.isCatalogAtStart(), is(EXPECTED_CATALOG_AT_START));
-    collector.checkThat(metaData.supportsSchemasInProcedureCalls(),
-        is(EXPECTED_SCHEMAS_IN_PROCEDURE_CALLS));
-    collector.checkThat(metaData.supportsSchemasInIndexDefinitions(),
-        is(EXPECTED_SCHEMAS_IN_INDEX_DEFINITIONS));
-    collector.checkThat(metaData.supportsCatalogsInIndexDefinitions(),
-        is(EXPECTED_CATALOGS_IN_INDEX_DEFINITIONS));
-    collector.checkThat(metaData.supportsPositionedDelete(), is(EXPECTED_POSITIONED_DELETE));
-    collector.checkThat(metaData.supportsPositionedUpdate(), is(EXPECTED_POSITIONED_UPDATE));
-    collector.checkThat(metaData.supportsResultSetType(ResultSet.TYPE_FORWARD_ONLY),
+    assertThat(metaData.getDatabaseProductName(), is(EXPECTED_DATABASE_PRODUCT_NAME));
+    assertThat(metaData.getDatabaseProductVersion(), is(EXPECTED_DATABASE_PRODUCT_VERSION));
+    assertThat(metaData.getIdentifierQuoteString(), is(EXPECTED_IDENTIFIER_QUOTE_STRING));
+    assertThat(metaData.isReadOnly(), is(EXPECTED_IS_READ_ONLY));
+    assertThat(metaData.getSQLKeywords(), is(EXPECTED_SQL_KEYWORDS));
+    assertThat(metaData.getNumericFunctions(), is(EXPECTED_NUMERIC_FUNCTIONS));
+    assertThat(metaData.getStringFunctions(), is(EXPECTED_STRING_FUNCTIONS));
+    assertThat(metaData.getSystemFunctions(), is(EXPECTED_SYSTEM_FUNCTIONS));
+    assertThat(metaData.getTimeDateFunctions(), is(EXPECTED_TIME_DATE_FUNCTIONS));
+    assertThat(metaData.getSearchStringEscape(), is(EXPECTED_SEARCH_STRING_ESCAPE));
+    assertThat(metaData.getExtraNameCharacters(), is(EXPECTED_EXTRA_NAME_CHARACTERS));
+    assertThat(metaData.supportsConvert(), is(EXPECTED_SQL_SUPPORTS_CONVERT));
+    assertThat(metaData.supportsConvert(BIT, INTEGER), is(EXPECTED_SQL_SUPPORTS_CONVERT));
+    assertThat(metaData.supportsConvert(BIT, BIGINT), is(EXPECTED_SQL_SUPPORTS_CONVERT));
+    assertThat(
+        metaData.supportsConvert(BIGINT, INTEGER), is(EXPECTED_INVALID_SQL_SUPPORTS_CONVERT));
+    assertThat(
+        metaData.supportsConvert(JAVA_OBJECT, INTEGER), is(EXPECTED_INVALID_SQL_SUPPORTS_CONVERT));
+    assertThat(
+        metaData.supportsTableCorrelationNames(), is(EXPECTED_SUPPORTS_TABLE_CORRELATION_NAMES));
+    assertThat(metaData.supportsExpressionsInOrderBy(), is(EXPECTED_EXPRESSIONS_IN_ORDER_BY));
+    assertThat(metaData.supportsOrderByUnrelated(), is(EXPECTED_SUPPORTS_ORDER_BY_UNRELATED));
+    assertThat(metaData.supportsGroupBy(), is(EXPECTED_SUPPORTS_GROUP_BY));
+    assertThat(metaData.supportsGroupByUnrelated(), is(EXPECTED_SUPPORTS_GROUP_BY_UNRELATED));
+    assertThat(metaData.supportsLikeEscapeClause(), is(EXPECTED_SUPPORTS_LIKE_ESCAPE_CLAUSE));
+    assertThat(metaData.supportsNonNullableColumns(), is(EXPECTED_NON_NULLABLE_COLUMNS));
+    assertThat(metaData.supportsMinimumSQLGrammar(), is(EXPECTED_MINIMUM_SQL_GRAMMAR));
+    assertThat(metaData.supportsCoreSQLGrammar(), is(EXPECTED_CORE_SQL_GRAMMAR));
+    assertThat(metaData.supportsExtendedSQLGrammar(), is(EXPECTED_EXTEND_SQL_GRAMMAR));
+    assertThat(metaData.supportsANSI92EntryLevelSQL(), is(EXPECTED_ANSI92_ENTRY_LEVEL_SQL));
+    assertThat(metaData.supportsANSI92IntermediateSQL(), is(EXPECTED_ANSI92_INTERMEDIATE_SQL));
+    assertThat(metaData.supportsANSI92FullSQL(), is(EXPECTED_ANSI92_FULL_SQL));
+    assertThat(metaData.supportsOuterJoins(), is(EXPECTED_SUPPORTS_OUTER_JOINS));
+    assertThat(metaData.supportsFullOuterJoins(), is(EXPECTED_SUPPORTS_FULL_OUTER_JOINS));
+    assertThat(metaData.supportsLimitedOuterJoins(), is(EXPECTED_SUPPORTS_LIMITED_JOINS));
+    assertThat(metaData.getSchemaTerm(), is(EXPECTED_SCHEMA_TERM));
+    assertThat(metaData.getProcedureTerm(), is(EXPECTED_PROCEDURE_TERM));
+    assertThat(metaData.getCatalogTerm(), is(EXPECTED_CATALOG_TERM));
+    assertThat(metaData.isCatalogAtStart(), is(EXPECTED_CATALOG_AT_START));
+    assertThat(metaData.supportsSchemasInProcedureCalls(), is(EXPECTED_SCHEMAS_IN_PROCEDURE_CALLS));
+    assertThat(
+        metaData.supportsSchemasInIndexDefinitions(), is(EXPECTED_SCHEMAS_IN_INDEX_DEFINITIONS));
+    assertThat(
+        metaData.supportsCatalogsInIndexDefinitions(), is(EXPECTED_CATALOGS_IN_INDEX_DEFINITIONS));
+    assertThat(metaData.supportsPositionedDelete(), is(EXPECTED_POSITIONED_DELETE));
+    assertThat(metaData.supportsPositionedUpdate(), is(EXPECTED_POSITIONED_UPDATE));
+    assertThat(
+        metaData.supportsResultSetType(ResultSet.TYPE_FORWARD_ONLY),
         is(EXPECTED_TYPE_FORWARD_ONLY));
-    collector.checkThat(metaData.supportsSelectForUpdate(),
-        is(EXPECTED_SELECT_FOR_UPDATE_SUPPORTED));
-    collector.checkThat(metaData.supportsStoredProcedures(),
-        is(EXPECTED_STORED_PROCEDURES_SUPPORTED));
-    collector.checkThat(metaData.supportsSubqueriesInComparisons(),
-        is(EXPECTED_SUBQUERIES_IN_COMPARISON));
-    collector.checkThat(metaData.supportsSubqueriesInExists(), is(EXPECTED_SUBQUERIES_IN_EXISTS));
-    collector.checkThat(metaData.supportsSubqueriesInIns(), is(EXPECTED_SUBQUERIES_IN_INS));
-    collector.checkThat(metaData.supportsSubqueriesInQuantifieds(),
-        is(EXPECTED_SUBQUERIES_IN_QUANTIFIEDS));
-    collector.checkThat(metaData.supportsCorrelatedSubqueries(),
-        is(EXPECTED_CORRELATED_SUBQUERIES_SUPPORTED));
-    collector.checkThat(metaData.supportsUnion(), is(EXPECTED_SUPPORTS_UNION));
-    collector.checkThat(metaData.supportsUnionAll(), is(EXPECTED_SUPPORTS_UNION_ALL));
-    collector.checkThat(metaData.getMaxBinaryLiteralLength(),
-        is(EXPECTED_MAX_BINARY_LITERAL_LENGTH));
-    collector.checkThat(metaData.getMaxCharLiteralLength(), is(EXPECTED_MAX_CHAR_LITERAL_LENGTH));
-    collector.checkThat(metaData.getMaxColumnsInGroupBy(), is(EXPECTED_MAX_COLUMNS_IN_GROUP_BY));
-    collector.checkThat(metaData.getMaxColumnsInIndex(), is(EXPECTED_MAX_COLUMNS_IN_INDEX));
-    collector.checkThat(metaData.getMaxColumnsInOrderBy(), is(EXPECTED_MAX_COLUMNS_IN_ORDER_BY));
-    collector.checkThat(metaData.getMaxColumnsInSelect(), is(EXPECTED_MAX_COLUMNS_IN_SELECT));
-    collector.checkThat(metaData.getMaxConnections(), is(EXPECTED_MAX_CONNECTIONS));
-    collector.checkThat(metaData.getMaxCursorNameLength(), is(EXPECTED_MAX_CURSOR_NAME_LENGTH));
-    collector.checkThat(metaData.getMaxIndexLength(), is(EXPECTED_MAX_INDEX_LENGTH));
-    collector.checkThat(metaData.getMaxSchemaNameLength(), is(EXPECTED_SCHEMA_NAME_LENGTH));
-    collector.checkThat(metaData.getMaxProcedureNameLength(),
-        is(EXPECTED_MAX_PROCEDURE_NAME_LENGTH));
-    collector.checkThat(metaData.getMaxCatalogNameLength(), is(EXPECTED_MAX_CATALOG_NAME_LENGTH));
-    collector.checkThat(metaData.getMaxRowSize(), is(EXPECTED_MAX_ROW_SIZE));
-    collector.checkThat(metaData.doesMaxRowSizeIncludeBlobs(),
-        is(EXPECTED_MAX_ROW_SIZE_INCLUDES_BLOBS));
-    collector.checkThat(metaData.getMaxStatementLength(), is(EXPECTED_MAX_STATEMENT_LENGTH));
-    collector.checkThat(metaData.getMaxStatements(), is(EXPECTED_MAX_STATEMENTS));
-    collector.checkThat(metaData.getMaxTableNameLength(), is(EXPECTED_MAX_TABLE_NAME_LENGTH));
-    collector.checkThat(metaData.getMaxTablesInSelect(), is(EXPECTED_MAX_TABLES_IN_SELECT));
-    collector.checkThat(metaData.getMaxUserNameLength(), is(EXPECTED_MAX_USERNAME_LENGTH));
-    collector.checkThat(metaData.getDefaultTransactionIsolation(),
-        is(EXPECTED_DEFAULT_TRANSACTION_ISOLATION));
-    collector.checkThat(metaData.supportsTransactions(), is(EXPECTED_TRANSACTIONS_SUPPORTED));
-    collector.checkThat(metaData.supportsBatchUpdates(), is(EXPECTED_BATCH_UPDATES_SUPPORTED));
-    collector.checkThat(metaData.supportsSavepoints(), is(EXPECTED_SAVEPOINTS_SUPPORTED));
-    collector.checkThat(metaData.supportsNamedParameters(),
-        is(EXPECTED_NAMED_PARAMETERS_SUPPORTED));
-    collector.checkThat(metaData.locatorsUpdateCopy(), is(EXPECTED_LOCATORS_UPDATE_COPY));
-
-    collector.checkThat(metaData.supportsResultSetType(ResultSet.TYPE_SCROLL_INSENSITIVE),
+    assertThat(metaData.supportsSelectForUpdate(), is(EXPECTED_SELECT_FOR_UPDATE_SUPPORTED));
+    assertThat(metaData.supportsStoredProcedures(), is(EXPECTED_STORED_PROCEDURES_SUPPORTED));
+    assertThat(metaData.supportsSubqueriesInComparisons(), is(EXPECTED_SUBQUERIES_IN_COMPARISON));
+    assertThat(metaData.supportsSubqueriesInExists(), is(EXPECTED_SUBQUERIES_IN_EXISTS));
+    assertThat(metaData.supportsSubqueriesInIns(), is(EXPECTED_SUBQUERIES_IN_INS));
+    assertThat(metaData.supportsSubqueriesInQuantifieds(), is(EXPECTED_SUBQUERIES_IN_QUANTIFIEDS));
+    assertThat(
+        metaData.supportsCorrelatedSubqueries(), is(EXPECTED_CORRELATED_SUBQUERIES_SUPPORTED));
+    assertThat(metaData.supportsUnion(), is(EXPECTED_SUPPORTS_UNION));
+    assertThat(metaData.supportsUnionAll(), is(EXPECTED_SUPPORTS_UNION_ALL));
+    assertThat(metaData.getMaxBinaryLiteralLength(), is(EXPECTED_MAX_BINARY_LITERAL_LENGTH));
+    assertThat(metaData.getMaxCharLiteralLength(), is(EXPECTED_MAX_CHAR_LITERAL_LENGTH));
+    assertThat(metaData.getMaxColumnsInGroupBy(), is(EXPECTED_MAX_COLUMNS_IN_GROUP_BY));
+    assertThat(metaData.getMaxColumnsInIndex(), is(EXPECTED_MAX_COLUMNS_IN_INDEX));
+    assertThat(metaData.getMaxColumnsInOrderBy(), is(EXPECTED_MAX_COLUMNS_IN_ORDER_BY));
+    assertThat(metaData.getMaxColumnsInSelect(), is(EXPECTED_MAX_COLUMNS_IN_SELECT));
+    assertThat(metaData.getMaxConnections(), is(EXPECTED_MAX_CONNECTIONS));
+    assertThat(metaData.getMaxCursorNameLength(), is(EXPECTED_MAX_CURSOR_NAME_LENGTH));
+    assertThat(metaData.getMaxIndexLength(), is(EXPECTED_MAX_INDEX_LENGTH));
+    assertThat(metaData.getMaxSchemaNameLength(), is(EXPECTED_SCHEMA_NAME_LENGTH));
+    assertThat(metaData.getMaxProcedureNameLength(), is(EXPECTED_MAX_PROCEDURE_NAME_LENGTH));
+    assertThat(metaData.getMaxCatalogNameLength(), is(EXPECTED_MAX_CATALOG_NAME_LENGTH));
+    assertThat(metaData.getMaxRowSize(), is(EXPECTED_MAX_ROW_SIZE));
+    assertThat(metaData.doesMaxRowSizeIncludeBlobs(), is(EXPECTED_MAX_ROW_SIZE_INCLUDES_BLOBS));
+    assertThat(metaData.getMaxStatementLength(), is(EXPECTED_MAX_STATEMENT_LENGTH));
+    assertThat(metaData.getMaxStatements(), is(EXPECTED_MAX_STATEMENTS));
+    assertThat(metaData.getMaxTableNameLength(), is(EXPECTED_MAX_TABLE_NAME_LENGTH));
+    assertThat(metaData.getMaxTablesInSelect(), is(EXPECTED_MAX_TABLES_IN_SELECT));
+    assertThat(metaData.getMaxUserNameLength(), is(EXPECTED_MAX_USERNAME_LENGTH));
+    assertThat(
+        metaData.getDefaultTransactionIsolation(), is(EXPECTED_DEFAULT_TRANSACTION_ISOLATION));
+    assertThat(metaData.supportsTransactions(), is(EXPECTED_TRANSACTIONS_SUPPORTED));
+    assertThat(metaData.supportsBatchUpdates(), is(EXPECTED_BATCH_UPDATES_SUPPORTED));
+    assertThat(metaData.supportsSavepoints(), is(EXPECTED_SAVEPOINTS_SUPPORTED));
+    assertThat(metaData.supportsNamedParameters(), is(EXPECTED_NAMED_PARAMETERS_SUPPORTED));
+    assertThat(metaData.locatorsUpdateCopy(), is(EXPECTED_LOCATORS_UPDATE_COPY));
+
+    assertThat(
+        metaData.supportsResultSetType(ResultSet.TYPE_SCROLL_INSENSITIVE),
         is(EXPECTED_TYPE_SCROLL_INSENSITIVE));
-    collector.checkThat(metaData.supportsResultSetType(ResultSet.TYPE_SCROLL_SENSITIVE),
+    assertThat(
+        metaData.supportsResultSetType(ResultSet.TYPE_SCROLL_SENSITIVE),
         is(EXPECTED_TYPE_SCROLL_SENSITIVE));
-    collector.checkThat(metaData.supportsSchemasInPrivilegeDefinitions(),
+    assertThat(
+        metaData.supportsSchemasInPrivilegeDefinitions(),
         is(EXPECTED_SCHEMAS_IN_PRIVILEGE_DEFINITIONS));
-    collector.checkThat(metaData.supportsCatalogsInPrivilegeDefinitions(),
+    assertThat(
+        metaData.supportsCatalogsInPrivilegeDefinitions(),
         is(EXPECTED_CATALOGS_IN_PRIVILEGE_DEFINITIONS));
-    collector.checkThat(metaData.supportsTransactionIsolationLevel(Connection.TRANSACTION_NONE),
+    assertThat(
+        metaData.supportsTransactionIsolationLevel(Connection.TRANSACTION_NONE),
         is(EXPECTED_TRANSACTION_NONE));
-    collector.checkThat(
+    assertThat(
         metaData.supportsTransactionIsolationLevel(Connection.TRANSACTION_READ_COMMITTED),
         is(EXPECTED_TRANSACTION_READ_COMMITTED));
-    collector.checkThat(
+    assertThat(
         metaData.supportsTransactionIsolationLevel(Connection.TRANSACTION_READ_UNCOMMITTED),
         is(EXPECTED_TRANSACTION_READ_UNCOMMITTED));
-    collector.checkThat(
+    assertThat(
         metaData.supportsTransactionIsolationLevel(Connection.TRANSACTION_REPEATABLE_READ),
         is(EXPECTED_TRANSACTION_REPEATABLE_READ));
-    collector.checkThat(
+    assertThat(
         metaData.supportsTransactionIsolationLevel(Connection.TRANSACTION_SERIALIZABLE),
         is(EXPECTED_TRANSACTION_SERIALIZABLE));
-    collector.checkThat(metaData.dataDefinitionCausesTransactionCommit(),
+    assertThat(
+        metaData.dataDefinitionCausesTransactionCommit(),
         is(EXPECTED_DATA_DEFINITION_CAUSES_TRANSACTION_COMMIT));
-    collector.checkThat(metaData.dataDefinitionIgnoredInTransactions(),
+    assertThat(
+        metaData.dataDefinitionIgnoredInTransactions(),
         is(EXPECTED_DATA_DEFINITIONS_IN_TRANSACTIONS_IGNORED));
-    collector.checkThat(metaData.supportsStoredFunctionsUsingCallSyntax(),
+    assertThat(
+        metaData.supportsStoredFunctionsUsingCallSyntax(),
         is(EXPECTED_STORED_FUNCTIONS_USING_CALL_SYNTAX_SUPPORTED));
-    collector.checkThat(metaData.supportsIntegrityEnhancementFacility(),
+    assertThat(
+        metaData.supportsIntegrityEnhancementFacility(),
         is(EXPECTED_SUPPORTS_INTEGRITY_ENHANCEMENT_FACILITY));
-    collector.checkThat(metaData.supportsDifferentTableCorrelationNames(),
+    assertThat(
+        metaData.supportsDifferentTableCorrelationNames(),
         is(EXPECTED_SUPPORTS_DIFFERENT_TABLE_CORRELATION_NAMES));
 
-    ThrowableAssertionUtils.simpleAssertThrowableClass(SQLException.class,
+    ThrowableAssertionUtils.simpleAssertThrowableClass(
+        SQLException.class,
         () -> metaData.supportsTransactionIsolationLevel(Connection.TRANSACTION_SERIALIZABLE + 1));
-    ThrowableAssertionUtils.simpleAssertThrowableClass(SQLException.class,
+    ThrowableAssertionUtils.simpleAssertThrowableClass(
+        SQLException.class,
         () -> metaData.supportsResultSetType(ResultSet.HOLD_CURSORS_OVER_COMMIT));
   }
 
   @Test
   public void testGetColumnsCanBeAccessedByNames() throws SQLException {
     try (final ResultSet resultSet = connection.getMetaData().getColumns(null, null, null, null)) {
-      resultSetTestUtils.testData(resultSet,
+      resultSetTestUtils.testData(
+          resultSet,
           ImmutableList.of(
               "TABLE_CAT",
               "TABLE_SCHEM",
@@ -952,8 +1002,7 @@ public void testGetColumnsCanBeAccessedByNames() throws SQLException {
               "SOURCE_DATA_TYPE",
               "IS_AUTOINCREMENT",
               "IS_GENERATEDCOLUMN"),
-          EXPECTED_GET_COLUMNS_RESULTS
-      );
+          EXPECTED_GET_COLUMNS_RESULTS);
     }
   }
 
@@ -961,27 +1010,28 @@ public void testGetColumnsCanBeAccessedByNames() throws SQLException {
   public void testGetProcedures() throws SQLException {
     try (final ResultSet resultSet = connection.getMetaData().getProcedures(null, null, null)) {
       // Maps ordinal index to column name according to JDBC documentation
-      final Map<Integer, String> expectedGetProceduresSchema = new HashMap<Integer, String>() {
-        {
-          put(1, "PROCEDURE_CAT");
-          put(2, "PROCEDURE_SCHEM");
-          put(3, "PROCEDURE_NAME");
-          put(4, "FUTURE_USE1");
-          put(5, "FUTURE_USE2");
-          put(6, "FUTURE_USE3");
-          put(7, "REMARKS");
-          put(8, "PROCEDURE_TYPE");
-          put(9, "SPECIFIC_NAME");
-        }
-      };
+      final Map<Integer, String> expectedGetProceduresSchema =
+          new HashMap<Integer, String>() {
+            {
+              put(1, "PROCEDURE_CAT");
+              put(2, "PROCEDURE_SCHEM");
+              put(3, "PROCEDURE_NAME");
+              put(4, "FUTURE_USE1");
+              put(5, "FUTURE_USE2");
+              put(6, "FUTURE_USE3");
+              put(7, "REMARKS");
+              put(8, "PROCEDURE_TYPE");
+              put(9, "SPECIFIC_NAME");
+            }
+          };
       testEmptyResultSet(resultSet, expectedGetProceduresSchema);
     }
   }
 
   @Test
   public void testGetProcedureColumns() throws SQLException {
-    try (ResultSet resultSet = connection.getMetaData()
-        .getProcedureColumns(null, null, null, null)) {
+    try (ResultSet resultSet =
+        connection.getMetaData().getProcedureColumns(null, null, null, null)) {
       // Maps ordinal index to column name according to JDBC documentation
       final Map<Integer, String> expectedGetProcedureColumnsSchema =
           new HashMap<Integer, String>() {
@@ -1014,8 +1064,8 @@ public void testGetProcedureColumns() throws SQLException {
 
   @Test
   public void testGetColumnPrivileges() throws SQLException {
-    try (ResultSet resultSet = connection.getMetaData()
-        .getColumnPrivileges(null, null, null, null)) {
+    try (ResultSet resultSet =
+        connection.getMetaData().getColumnPrivileges(null, null, null, null)) {
       // Maps ordinal index to column name according to JDBC documentation
       final Map<Integer, String> expectedGetColumnPrivilegesSchema =
           new HashMap<Integer, String>() {
@@ -1038,25 +1088,26 @@ public void testGetColumnPrivileges() throws SQLException {
   public void testGetTablePrivileges() throws SQLException {
     try (ResultSet resultSet = connection.getMetaData().getTablePrivileges(null, null, null)) {
       // Maps ordinal index to column name according to JDBC documentation
-      final Map<Integer, String> expectedGetTablePrivilegesSchema = new HashMap<Integer, String>() {
-        {
-          put(1, "TABLE_CAT");
-          put(2, "TABLE_SCHEM");
-          put(3, "TABLE_NAME");
-          put(4, "GRANTOR");
-          put(5, "GRANTEE");
-          put(6, "PRIVILEGE");
-          put(7, "IS_GRANTABLE");
-        }
-      };
+      final Map<Integer, String> expectedGetTablePrivilegesSchema =
+          new HashMap<Integer, String>() {
+            {
+              put(1, "TABLE_CAT");
+              put(2, "TABLE_SCHEM");
+              put(3, "TABLE_NAME");
+              put(4, "GRANTOR");
+              put(5, "GRANTEE");
+              put(6, "PRIVILEGE");
+              put(7, "IS_GRANTABLE");
+            }
+          };
       testEmptyResultSet(resultSet, expectedGetTablePrivilegesSchema);
     }
   }
 
   @Test
   public void testGetBestRowIdentifier() throws SQLException {
-    try (ResultSet resultSet = connection.getMetaData()
-        .getBestRowIdentifier(null, null, null, 0, true)) {
+    try (ResultSet resultSet =
+        connection.getMetaData().getBestRowIdentifier(null, null, null, 0, true)) {
       // Maps ordinal index to column name according to JDBC documentation
       final Map<Integer, String> expectedGetBestRowIdentifierSchema =
           new HashMap<Integer, String>() {
@@ -1079,18 +1130,19 @@ public void testGetBestRowIdentifier() throws SQLException {
   public void testGetVersionColumns() throws SQLException {
     try (ResultSet resultSet = connection.getMetaData().getVersionColumns(null, null, null)) {
       // Maps ordinal index to column name according to JDBC documentation
-      final Map<Integer, String> expectedGetVersionColumnsSchema = new HashMap<Integer, String>() {
-        {
-          put(1, "SCOPE");
-          put(2, "COLUMN_NAME");
-          put(3, "DATA_TYPE");
-          put(4, "TYPE_NAME");
-          put(5, "COLUMN_SIZE");
-          put(6, "BUFFER_LENGTH");
-          put(7, "DECIMAL_DIGITS");
-          put(8, "PSEUDO_COLUMN");
-        }
-      };
+      final Map<Integer, String> expectedGetVersionColumnsSchema =
+          new HashMap<Integer, String>() {
+            {
+              put(1, "SCOPE");
+              put(2, "COLUMN_NAME");
+              put(3, "DATA_TYPE");
+              put(4, "TYPE_NAME");
+              put(5, "COLUMN_SIZE");
+              put(6, "BUFFER_LENGTH");
+              put(7, "DECIMAL_DIGITS");
+              put(8, "PSEUDO_COLUMN");
+            }
+          };
       testEmptyResultSet(resultSet, expectedGetVersionColumnsSchema);
     }
   }
@@ -1099,54 +1151,56 @@ public void testGetVersionColumns() throws SQLException {
   public void testGetTypeInfo() throws SQLException {
     try (ResultSet resultSet = connection.getMetaData().getTypeInfo()) {
       // Maps ordinal index to column name according to JDBC documentation
-      final Map<Integer, String> expectedGetTypeInfoSchema = new HashMap<Integer, String>() {
-        {
-          put(1, "TYPE_NAME");
-          put(2, "DATA_TYPE");
-          put(3, "PRECISION");
-          put(4, "LITERAL_PREFIX");
-          put(5, "LITERAL_SUFFIX");
-          put(6, "CREATE_PARAMS");
-          put(7, "NULLABLE");
-          put(8, "CASE_SENSITIVE");
-          put(9, "SEARCHABLE");
-          put(10, "UNSIGNED_ATTRIBUTE");
-          put(11, "FIXED_PREC_SCALE");
-          put(12, "AUTO_INCREMENT");
-          put(13, "LOCAL_TYPE_NAME");
-          put(14, "MINIMUM_SCALE");
-          put(15, "MAXIMUM_SCALE");
-          put(16, "SQL_DATA_TYPE");
-          put(17, "SQL_DATETIME_SUB");
-          put(18, "NUM_PREC_RADIX");
-        }
-      };
+      final Map<Integer, String> expectedGetTypeInfoSchema =
+          new HashMap<Integer, String>() {
+            {
+              put(1, "TYPE_NAME");
+              put(2, "DATA_TYPE");
+              put(3, "PRECISION");
+              put(4, "LITERAL_PREFIX");
+              put(5, "LITERAL_SUFFIX");
+              put(6, "CREATE_PARAMS");
+              put(7, "NULLABLE");
+              put(8, "CASE_SENSITIVE");
+              put(9, "SEARCHABLE");
+              put(10, "UNSIGNED_ATTRIBUTE");
+              put(11, "FIXED_PREC_SCALE");
+              put(12, "AUTO_INCREMENT");
+              put(13, "LOCAL_TYPE_NAME");
+              put(14, "MINIMUM_SCALE");
+              put(15, "MAXIMUM_SCALE");
+              put(16, "SQL_DATA_TYPE");
+              put(17, "SQL_DATETIME_SUB");
+              put(18, "NUM_PREC_RADIX");
+            }
+          };
       testEmptyResultSet(resultSet, expectedGetTypeInfoSchema);
     }
   }
 
   @Test
   public void testGetIndexInfo() throws SQLException {
-    try (ResultSet resultSet = connection.getMetaData()
-        .getIndexInfo(null, null, null, false, true)) {
+    try (ResultSet resultSet =
+        connection.getMetaData().getIndexInfo(null, null, null, false, true)) {
       // Maps ordinal index to column name according to JDBC documentation
-      final Map<Integer, String> expectedGetIndexInfoSchema = new HashMap<Integer, String>() {
-        {
-          put(1, "TABLE_CAT");
-          put(2, "TABLE_SCHEM");
-          put(3, "TABLE_NAME");
-          put(4, "NON_UNIQUE");
-          put(5, "INDEX_QUALIFIER");
-          put(6, "INDEX_NAME");
-          put(7, "TYPE");
-          put(8, "ORDINAL_POSITION");
-          put(9, "COLUMN_NAME");
-          put(10, "ASC_OR_DESC");
-          put(11, "CARDINALITY");
-          put(12, "PAGES");
-          put(13, "FILTER_CONDITION");
-        }
-      };
+      final Map<Integer, String> expectedGetIndexInfoSchema =
+          new HashMap<Integer, String>() {
+            {
+              put(1, "TABLE_CAT");
+              put(2, "TABLE_SCHEM");
+              put(3, "TABLE_NAME");
+              put(4, "NON_UNIQUE");
+              put(5, "INDEX_QUALIFIER");
+              put(6, "INDEX_NAME");
+              put(7, "TYPE");
+              put(8, "ORDINAL_POSITION");
+              put(9, "COLUMN_NAME");
+              put(10, "ASC_OR_DESC");
+              put(11, "CARDINALITY");
+              put(12, "PAGES");
+              put(13, "FILTER_CONDITION");
+            }
+          };
       testEmptyResultSet(resultSet, expectedGetIndexInfoSchema);
     }
   }
@@ -1155,17 +1209,18 @@ public void testGetIndexInfo() throws SQLException {
   public void testGetUDTs() throws SQLException {
     try (ResultSet resultSet = connection.getMetaData().getUDTs(null, null, null, null)) {
       // Maps ordinal index to column name according to JDBC documentation
-      final Map<Integer, String> expectedGetUDTsSchema = new HashMap<Integer, String>() {
-        {
-          put(1, "TYPE_CAT");
-          put(2, "TYPE_SCHEM");
-          put(3, "TYPE_NAME");
-          put(4, "CLASS_NAME");
-          put(5, "DATA_TYPE");
-          put(6, "REMARKS");
-          put(7, "BASE_TYPE");
-        }
-      };
+      final Map<Integer, String> expectedGetUDTsSchema =
+          new HashMap<Integer, String>() {
+            {
+              put(1, "TYPE_CAT");
+              put(2, "TYPE_SCHEM");
+              put(3, "TYPE_NAME");
+              put(4, "CLASS_NAME");
+              put(5, "DATA_TYPE");
+              put(6, "REMARKS");
+              put(7, "BASE_TYPE");
+            }
+          };
       testEmptyResultSet(resultSet, expectedGetUDTsSchema);
     }
   }
@@ -1174,16 +1229,17 @@ public void testGetUDTs() throws SQLException {
   public void testGetSuperTypes() throws SQLException {
     try (ResultSet resultSet = connection.getMetaData().getSuperTypes(null, null, null)) {
       // Maps ordinal index to column name according to JDBC documentation
-      final Map<Integer, String> expectedGetSuperTypesSchema = new HashMap<Integer, String>() {
-        {
-          put(1, "TYPE_CAT");
-          put(2, "TYPE_SCHEM");
-          put(3, "TYPE_NAME");
-          put(4, "SUPERTYPE_CAT");
-          put(5, "SUPERTYPE_SCHEM");
-          put(6, "SUPERTYPE_NAME");
-        }
-      };
+      final Map<Integer, String> expectedGetSuperTypesSchema =
+          new HashMap<Integer, String>() {
+            {
+              put(1, "TYPE_CAT");
+              put(2, "TYPE_SCHEM");
+              put(3, "TYPE_NAME");
+              put(4, "SUPERTYPE_CAT");
+              put(5, "SUPERTYPE_SCHEM");
+              put(6, "SUPERTYPE_NAME");
+            }
+          };
       testEmptyResultSet(resultSet, expectedGetSuperTypesSchema);
     }
   }
@@ -1192,14 +1248,15 @@ public void testGetSuperTypes() throws SQLException {
   public void testGetSuperTables() throws SQLException {
     try (ResultSet resultSet = connection.getMetaData().getSuperTables(null, null, null)) {
       // Maps ordinal index to column name according to JDBC documentation
-      final Map<Integer, String> expectedGetSuperTablesSchema = new HashMap<Integer, String>() {
-        {
-          put(1, "TABLE_CAT");
-          put(2, "TABLE_SCHEM");
-          put(3, "TABLE_NAME");
-          put(4, "SUPERTABLE_NAME");
-        }
-      };
+      final Map<Integer, String> expectedGetSuperTablesSchema =
+          new HashMap<Integer, String>() {
+            {
+              put(1, "TABLE_CAT");
+              put(2, "TABLE_SCHEM");
+              put(3, "TABLE_NAME");
+              put(4, "SUPERTABLE_NAME");
+            }
+          };
       testEmptyResultSet(resultSet, expectedGetSuperTablesSchema);
     }
   }
@@ -1208,31 +1265,32 @@ public void testGetSuperTables() throws SQLException {
   public void testGetAttributes() throws SQLException {
     try (ResultSet resultSet = connection.getMetaData().getAttributes(null, null, null, null)) {
       // Maps ordinal index to column name according to JDBC documentation
-      final Map<Integer, String> expectedGetAttributesSchema = new HashMap<Integer, String>() {
-        {
-          put(1, "TYPE_CAT");
-          put(2, "TYPE_SCHEM");
-          put(3, "TYPE_NAME");
-          put(4, "ATTR_NAME");
-          put(5, "DATA_TYPE");
-          put(6, "ATTR_TYPE_NAME");
-          put(7, "ATTR_SIZE");
-          put(8, "DECIMAL_DIGITS");
-          put(9, "NUM_PREC_RADIX");
-          put(10, "NULLABLE");
-          put(11, "REMARKS");
-          put(12, "ATTR_DEF");
-          put(13, "SQL_DATA_TYPE");
-          put(14, "SQL_DATETIME_SUB");
-          put(15, "CHAR_OCTET_LENGTH");
-          put(16, "ORDINAL_POSITION");
-          put(17, "IS_NULLABLE");
-          put(18, "SCOPE_CATALOG");
-          put(19, "SCOPE_SCHEMA");
-          put(20, "SCOPE_TABLE");
-          put(21, "SOURCE_DATA_TYPE");
-        }
-      };
+      final Map<Integer, String> expectedGetAttributesSchema =
+          new HashMap<Integer, String>() {
+            {
+              put(1, "TYPE_CAT");
+              put(2, "TYPE_SCHEM");
+              put(3, "TYPE_NAME");
+              put(4, "ATTR_NAME");
+              put(5, "DATA_TYPE");
+              put(6, "ATTR_TYPE_NAME");
+              put(7, "ATTR_SIZE");
+              put(8, "DECIMAL_DIGITS");
+              put(9, "NUM_PREC_RADIX");
+              put(10, "NULLABLE");
+              put(11, "REMARKS");
+              put(12, "ATTR_DEF");
+              put(13, "SQL_DATA_TYPE");
+              put(14, "SQL_DATETIME_SUB");
+              put(15, "CHAR_OCTET_LENGTH");
+              put(16, "ORDINAL_POSITION");
+              put(17, "IS_NULLABLE");
+              put(18, "SCOPE_CATALOG");
+              put(19, "SCOPE_SCHEMA");
+              put(20, "SCOPE_TABLE");
+              put(21, "SOURCE_DATA_TYPE");
+            }
+          };
       testEmptyResultSet(resultSet, expectedGetAttributesSchema);
     }
   }
@@ -1258,46 +1316,48 @@ public void testGetClientInfoProperties() throws SQLException {
   public void testGetFunctions() throws SQLException {
     try (ResultSet resultSet = connection.getMetaData().getFunctions(null, null, null)) {
       // Maps ordinal index to column name according to JDBC documentation
-      final Map<Integer, String> expectedGetFunctionsSchema = new HashMap<Integer, String>() {
-        {
-          put(1, "FUNCTION_CAT");
-          put(2, "FUNCTION_SCHEM");
-          put(3, "FUNCTION_NAME");
-          put(4, "REMARKS");
-          put(5, "FUNCTION_TYPE");
-          put(6, "SPECIFIC_NAME");
-        }
-      };
+      final Map<Integer, String> expectedGetFunctionsSchema =
+          new HashMap<Integer, String>() {
+            {
+              put(1, "FUNCTION_CAT");
+              put(2, "FUNCTION_SCHEM");
+              put(3, "FUNCTION_NAME");
+              put(4, "REMARKS");
+              put(5, "FUNCTION_TYPE");
+              put(6, "SPECIFIC_NAME");
+            }
+          };
       testEmptyResultSet(resultSet, expectedGetFunctionsSchema);
     }
   }
 
   @Test
   public void testGetFunctionColumns() throws SQLException {
-    try (
-        ResultSet resultSet = connection.getMetaData().getFunctionColumns(null, null, null, null)) {
+    try (ResultSet resultSet =
+        connection.getMetaData().getFunctionColumns(null, null, null, null)) {
       // Maps ordinal index to column name according to JDBC documentation
-      final Map<Integer, String> expectedGetFunctionColumnsSchema = new HashMap<Integer, String>() {
-        {
-          put(1, "FUNCTION_CAT");
-          put(2, "FUNCTION_SCHEM");
-          put(3, "FUNCTION_NAME");
-          put(4, "COLUMN_NAME");
-          put(5, "COLUMN_TYPE");
-          put(6, "DATA_TYPE");
-          put(7, "TYPE_NAME");
-          put(8, "PRECISION");
-          put(9, "LENGTH");
-          put(10, "SCALE");
-          put(11, "RADIX");
-          put(12, "NULLABLE");
-          put(13, "REMARKS");
-          put(14, "CHAR_OCTET_LENGTH");
-          put(15, "ORDINAL_POSITION");
-          put(16, "IS_NULLABLE");
-          put(17, "SPECIFIC_NAME");
-        }
-      };
+      final Map<Integer, String> expectedGetFunctionColumnsSchema =
+          new HashMap<Integer, String>() {
+            {
+              put(1, "FUNCTION_CAT");
+              put(2, "FUNCTION_SCHEM");
+              put(3, "FUNCTION_NAME");
+              put(4, "COLUMN_NAME");
+              put(5, "COLUMN_TYPE");
+              put(6, "DATA_TYPE");
+              put(7, "TYPE_NAME");
+              put(8, "PRECISION");
+              put(9, "LENGTH");
+              put(10, "SCALE");
+              put(11, "RADIX");
+              put(12, "NULLABLE");
+              put(13, "REMARKS");
+              put(14, "CHAR_OCTET_LENGTH");
+              put(15, "ORDINAL_POSITION");
+              put(16, "IS_NULLABLE");
+              put(17, "SPECIFIC_NAME");
+            }
+          };
       testEmptyResultSet(resultSet, expectedGetFunctionColumnsSchema);
     }
   }
@@ -1306,118 +1366,158 @@ public void testGetFunctionColumns() throws SQLException {
   public void testGetPseudoColumns() throws SQLException {
     try (ResultSet resultSet = connection.getMetaData().getPseudoColumns(null, null, null, null)) {
       // Maps ordinal index to column name according to JDBC documentation
-      final Map<Integer, String> expectedGetPseudoColumnsSchema = new HashMap<Integer, String>() {
-        {
-          put(1, "TABLE_CAT");
-          put(2, "TABLE_SCHEM");
-          put(3, "TABLE_NAME");
-          put(4, "COLUMN_NAME");
-          put(5, "DATA_TYPE");
-          put(6, "COLUMN_SIZE");
-          put(7, "DECIMAL_DIGITS");
-          put(8, "NUM_PREC_RADIX");
-          put(9, "COLUMN_USAGE");
-          put(10, "REMARKS");
-          put(11, "CHAR_OCTET_LENGTH");
-          put(12, "IS_NULLABLE");
-        }
-      };
+      final Map<Integer, String> expectedGetPseudoColumnsSchema =
+          new HashMap<Integer, String>() {
+            {
+              put(1, "TABLE_CAT");
+              put(2, "TABLE_SCHEM");
+              put(3, "TABLE_NAME");
+              put(4, "COLUMN_NAME");
+              put(5, "DATA_TYPE");
+              put(6, "COLUMN_SIZE");
+              put(7, "DECIMAL_DIGITS");
+              put(8, "NUM_PREC_RADIX");
+              put(9, "COLUMN_USAGE");
+              put(10, "REMARKS");
+              put(11, "CHAR_OCTET_LENGTH");
+              put(12, "IS_NULLABLE");
+            }
+          };
       testEmptyResultSet(resultSet, expectedGetPseudoColumnsSchema);
     }
   }
 
-  private void testEmptyResultSet(final ResultSet resultSet,
-                                  final Map<Integer, String> expectedResultSetSchema)
+  private void testEmptyResultSet(
+      final ResultSet resultSet, final Map<Integer, String> expectedResultSetSchema)
       throws SQLException {
-    Assert.assertFalse(resultSet.next());
+    assertFalse(resultSet.next());
     final ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
     for (final Map.Entry<Integer, String> entry : expectedResultSetSchema.entrySet()) {
-      Assert.assertEquals(entry.getValue(), resultSetMetaData.getColumnLabel(entry.getKey()));
+      assertEquals(entry.getValue(), resultSetMetaData.getColumnLabel(entry.getKey()));
     }
   }
 
   @Test
   public void testGetColumnSize() {
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_BYTE),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_BYTE),
         ArrowDatabaseMetadata.getColumnSize(new ArrowType.Int(Byte.SIZE, true)));
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_SHORT),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_SHORT),
         ArrowDatabaseMetadata.getColumnSize(new ArrowType.Int(Short.SIZE, true)));
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_INT),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_INT),
         ArrowDatabaseMetadata.getColumnSize(new ArrowType.Int(Integer.SIZE, true)));
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_LONG),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_LONG),
         ArrowDatabaseMetadata.getColumnSize(new ArrowType.Int(Long.SIZE, true)));
 
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_VARCHAR_AND_BINARY),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_VARCHAR_AND_BINARY),
         ArrowDatabaseMetadata.getColumnSize(new ArrowType.Utf8()));
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_VARCHAR_AND_BINARY),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_VARCHAR_AND_BINARY),
         ArrowDatabaseMetadata.getColumnSize(new ArrowType.Binary()));
 
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_TIMESTAMP_SECONDS),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_TIMESTAMP_SECONDS),
         ArrowDatabaseMetadata.getColumnSize(new ArrowType.Timestamp(TimeUnit.SECOND, null)));
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_TIMESTAMP_MILLISECONDS),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_TIMESTAMP_MILLISECONDS),
         ArrowDatabaseMetadata.getColumnSize(new ArrowType.Timestamp(TimeUnit.MILLISECOND, null)));
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_TIMESTAMP_MICROSECONDS),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_TIMESTAMP_MICROSECONDS),
         ArrowDatabaseMetadata.getColumnSize(new ArrowType.Timestamp(TimeUnit.MICROSECOND, null)));
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_TIMESTAMP_NANOSECONDS),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_TIMESTAMP_NANOSECONDS),
         ArrowDatabaseMetadata.getColumnSize(new ArrowType.Timestamp(TimeUnit.NANOSECOND, null)));
 
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_TIME),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_TIME),
         ArrowDatabaseMetadata.getColumnSize(new ArrowType.Time(TimeUnit.SECOND, Integer.SIZE)));
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_TIME_MILLISECONDS),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_TIME_MILLISECONDS),
         ArrowDatabaseMetadata.getColumnSize(
             new ArrowType.Time(TimeUnit.MILLISECOND, Integer.SIZE)));
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_TIME_MICROSECONDS),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_TIME_MICROSECONDS),
         ArrowDatabaseMetadata.getColumnSize(
             new ArrowType.Time(TimeUnit.MICROSECOND, Integer.SIZE)));
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_TIME_NANOSECONDS),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_TIME_NANOSECONDS),
         ArrowDatabaseMetadata.getColumnSize(new ArrowType.Time(TimeUnit.NANOSECOND, Integer.SIZE)));
 
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_DATE),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.COLUMN_SIZE_DATE),
         ArrowDatabaseMetadata.getColumnSize(new ArrowType.Date(DateUnit.DAY)));
 
-    Assert.assertNull(ArrowDatabaseMetadata.getColumnSize(new ArrowType.FloatingPoint(
-        FloatingPointPrecision.DOUBLE)));
+    assertNull(
+        ArrowDatabaseMetadata.getColumnSize(
+            new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)));
   }
 
   @Test
   public void testGetDecimalDigits() {
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.NO_DECIMAL_DIGITS),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.NO_DECIMAL_DIGITS),
         ArrowDatabaseMetadata.getDecimalDigits(new ArrowType.Int(Byte.SIZE, true)));
 
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.NO_DECIMAL_DIGITS),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.NO_DECIMAL_DIGITS),
         ArrowDatabaseMetadata.getDecimalDigits(new ArrowType.Timestamp(TimeUnit.SECOND, null)));
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.DECIMAL_DIGITS_TIME_MILLISECONDS),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.DECIMAL_DIGITS_TIME_MILLISECONDS),
         ArrowDatabaseMetadata.getDecimalDigits(
             new ArrowType.Timestamp(TimeUnit.MILLISECOND, null)));
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.DECIMAL_DIGITS_TIME_MICROSECONDS),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.DECIMAL_DIGITS_TIME_MICROSECONDS),
         ArrowDatabaseMetadata.getDecimalDigits(
             new ArrowType.Timestamp(TimeUnit.MICROSECOND, null)));
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.DECIMAL_DIGITS_TIME_NANOSECONDS),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.DECIMAL_DIGITS_TIME_NANOSECONDS),
         ArrowDatabaseMetadata.getDecimalDigits(new ArrowType.Timestamp(TimeUnit.NANOSECOND, null)));
 
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.NO_DECIMAL_DIGITS),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.NO_DECIMAL_DIGITS),
         ArrowDatabaseMetadata.getDecimalDigits(new ArrowType.Time(TimeUnit.SECOND, Integer.SIZE)));
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.DECIMAL_DIGITS_TIME_MILLISECONDS),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.DECIMAL_DIGITS_TIME_MILLISECONDS),
         ArrowDatabaseMetadata.getDecimalDigits(
             new ArrowType.Time(TimeUnit.MILLISECOND, Integer.SIZE)));
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.DECIMAL_DIGITS_TIME_MICROSECONDS),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.DECIMAL_DIGITS_TIME_MICROSECONDS),
         ArrowDatabaseMetadata.getDecimalDigits(
             new ArrowType.Time(TimeUnit.MICROSECOND, Integer.SIZE)));
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.DECIMAL_DIGITS_TIME_NANOSECONDS),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.DECIMAL_DIGITS_TIME_NANOSECONDS),
         ArrowDatabaseMetadata.getDecimalDigits(
             new ArrowType.Time(TimeUnit.NANOSECOND, Integer.SIZE)));
 
-    Assert.assertEquals(Integer.valueOf(ArrowDatabaseMetadata.NO_DECIMAL_DIGITS),
+    assertEquals(
+        Integer.valueOf(ArrowDatabaseMetadata.NO_DECIMAL_DIGITS),
         ArrowDatabaseMetadata.getDecimalDigits(new ArrowType.Date(DateUnit.DAY)));
 
-    Assert.assertNull(ArrowDatabaseMetadata.getDecimalDigits(new ArrowType.Utf8()));
+    assertNull(ArrowDatabaseMetadata.getDecimalDigits(new ArrowType.Utf8()));
   }
 
   @Test
   public void testSqlToRegexLike() {
-    Assert.assertEquals(".*", ArrowDatabaseMetadata.sqlToRegexLike("%"));
-    Assert.assertEquals(".", ArrowDatabaseMetadata.sqlToRegexLike("_"));
-    Assert.assertEquals("\\*", ArrowDatabaseMetadata.sqlToRegexLike("*"));
-    Assert.assertEquals("T\\*E.S.*T", ArrowDatabaseMetadata.sqlToRegexLike("T*E_S%T"));
+    assertEquals(".*", ArrowDatabaseMetadata.sqlToRegexLike("%"));
+    assertEquals(".", ArrowDatabaseMetadata.sqlToRegexLike("_"));
+    assertEquals("\\*", ArrowDatabaseMetadata.sqlToRegexLike("*"));
+    assertEquals("T\\*E.S.*T", ArrowDatabaseMetadata.sqlToRegexLike("T*E_S%T"));
+  }
+
+  @Test
+  public void testEmptySqlInfo() throws Exception {
+    try (final Connection testConnection =
+        FLIGHT_SERVER_EMPTY_SQLINFO_TEST_RULE.getConnection(false)) {
+      final DatabaseMetaData metaData = testConnection.getMetaData();
+      assertThat(metaData.getSQLKeywords(), is(""));
+      assertThat(metaData.getNumericFunctions(), is(""));
+      assertThat(metaData.getStringFunctions(), is(""));
+      assertThat(metaData.getSystemFunctions(), is(""));
+      assertThat(metaData.getTimeDateFunctions(), is(""));
+    }
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcArrayTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcArrayTest.java
index 76f01514c9501..06d101724cd0d 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcArrayTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcArrayTest.java
@@ -14,41 +14,43 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
 import java.sql.Types;
 import java.util.Arrays;
 import java.util.HashMap;
-
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.util.JsonStringArrayList;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
 public class ArrowFlightJdbcArrayTest {
 
-  @Rule
-  public RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
   IntVector dataVector;
 
-  @Before
+  @BeforeEach
   public void setup() {
-    dataVector = rootAllocatorTestRule.createIntVector();
+    dataVector = rootAllocatorTestExtension.createIntVector();
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     this.dataVector.close();
   }
@@ -57,14 +59,14 @@ public void tearDown() {
   public void testShouldGetBaseTypeNameReturnCorrectTypeName() {
     ArrowFlightJdbcArray arrowFlightJdbcArray =
         new ArrowFlightJdbcArray(dataVector, 0, dataVector.getValueCount());
-    Assert.assertEquals("INTEGER", arrowFlightJdbcArray.getBaseTypeName());
+    assertEquals("INTEGER", arrowFlightJdbcArray.getBaseTypeName());
   }
 
   @Test
   public void testShouldGetBaseTypeReturnCorrectType() {
     ArrowFlightJdbcArray arrowFlightJdbcArray =
         new ArrowFlightJdbcArray(dataVector, 0, dataVector.getValueCount());
-    Assert.assertEquals(Types.INTEGER, arrowFlightJdbcArray.getBaseType());
+    assertEquals(Types.INTEGER, arrowFlightJdbcArray.getBaseType());
   }
 
   @Test
@@ -77,7 +79,7 @@ public void testShouldGetArrayReturnValidArray() throws SQLException {
     for (int i = 0; i < expected.length; i++) {
       expected[i] = dataVector.getObject(i);
     }
-    Assert.assertArrayEquals(array, expected);
+    assertArrayEquals(array, expected);
   }
 
   @Test
@@ -90,31 +92,34 @@ public void testShouldGetArrayReturnValidArrayWithOffsets() throws SQLException
     for (int i = 0; i < expected.length; i++) {
       expected[i] = dataVector.getObject(i + 1);
     }
-    Assert.assertArrayEquals(array, expected);
+    assertArrayEquals(array, expected);
   }
 
-  @Test(expected = ArrayIndexOutOfBoundsException.class)
+  @Test
   public void testShouldGetArrayWithOffsetsThrowArrayIndexOutOfBoundsException()
       throws SQLException {
     ArrowFlightJdbcArray arrowFlightJdbcArray =
         new ArrowFlightJdbcArray(dataVector, 0, dataVector.getValueCount());
-    arrowFlightJdbcArray.getArray(0, dataVector.getValueCount() + 1);
+    assertThrows(
+        ArrayIndexOutOfBoundsException.class,
+        () -> arrowFlightJdbcArray.getArray(0, dataVector.getValueCount() + 1));
   }
 
-  @Test(expected = SQLFeatureNotSupportedException.class)
+  @Test
   public void testShouldGetArrayWithMapNotBeSupported() throws SQLException {
     ArrowFlightJdbcArray arrowFlightJdbcArray =
         new ArrowFlightJdbcArray(dataVector, 0, dataVector.getValueCount());
     HashMap<String, Class<?>> map = new HashMap<>();
-    arrowFlightJdbcArray.getArray(map);
+    assertThrows(SQLFeatureNotSupportedException.class, () -> arrowFlightJdbcArray.getArray(map));
   }
 
-  @Test(expected = SQLFeatureNotSupportedException.class)
+  @Test
   public void testShouldGetArrayWithOffsetsAndMapNotBeSupported() throws SQLException {
     ArrowFlightJdbcArray arrowFlightJdbcArray =
         new ArrowFlightJdbcArray(dataVector, 0, dataVector.getValueCount());
     HashMap<String, Class<?>> map = new HashMap<>();
-    arrowFlightJdbcArray.getArray(0, 5, map);
+    assertThrows(
+        SQLFeatureNotSupportedException.class, () -> arrowFlightJdbcArray.getArray(0, 5, map));
   }
 
   @Test
@@ -124,7 +129,7 @@ public void testShouldGetResultSetReturnValidResultSet() throws SQLException {
     try (ResultSet resultSet = arrowFlightJdbcArray.getResultSet()) {
       int count = 0;
       while (resultSet.next()) {
-        Assert.assertEquals((Object) resultSet.getInt(1), dataVector.getObject(count));
+        assertEquals((Object) resultSet.getInt(1), dataVector.getObject(count));
         count++;
       }
     }
@@ -137,10 +142,10 @@ public void testShouldGetResultSetReturnValidResultSetWithOffsets() throws SQLEx
     try (ResultSet resultSet = arrowFlightJdbcArray.getResultSet(3, 5)) {
       int count = 0;
       while (resultSet.next()) {
-        Assert.assertEquals((Object) resultSet.getInt(1), dataVector.getObject(count + 3));
+        assertEquals((Object) resultSet.getInt(1), dataVector.getObject(count + 3));
         count++;
       }
-      Assert.assertEquals(5, count);
+      assertEquals(5, count);
     }
   }
 
@@ -152,22 +157,24 @@ public void testToString() throws SQLException {
     JsonStringArrayList<Object> array = new JsonStringArrayList<>();
     array.addAll(Arrays.asList((Object[]) arrowFlightJdbcArray.getArray()));
 
-    Assert.assertEquals(array.toString(), arrowFlightJdbcArray.toString());
+    assertEquals(array.toString(), arrowFlightJdbcArray.toString());
   }
 
-  @Test(expected = SQLFeatureNotSupportedException.class)
+  @Test
   public void testShouldGetResultSetWithMapNotBeSupported() throws SQLException {
     ArrowFlightJdbcArray arrowFlightJdbcArray =
         new ArrowFlightJdbcArray(dataVector, 0, dataVector.getValueCount());
     HashMap<String, Class<?>> map = new HashMap<>();
-    arrowFlightJdbcArray.getResultSet(map);
+    assertThrows(
+        SQLFeatureNotSupportedException.class, () -> arrowFlightJdbcArray.getResultSet(map));
   }
 
-  @Test(expected = SQLFeatureNotSupportedException.class)
+  @Test
   public void testShouldGetResultSetWithOffsetsAndMapNotBeSupported() throws SQLException {
     ArrowFlightJdbcArray arrowFlightJdbcArray =
         new ArrowFlightJdbcArray(dataVector, 0, dataVector.getValueCount());
     HashMap<String, Class<?>> map = new HashMap<>();
-    arrowFlightJdbcArray.getResultSet(0, 5, map);
+    assertThrows(
+        SQLFeatureNotSupportedException.class, () -> arrowFlightJdbcArray.getResultSet(0, 5, map));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionCookieTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionCookieTest.java
index c7268e0594ecc..1977b61392eb4 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionCookieTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionCookieTest.java
@@ -14,41 +14,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
-
 import org.apache.arrow.driver.jdbc.utils.CoreMockedSqlProducers;
-import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class ArrowFlightJdbcConnectionCookieTest {
 
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
-
-  @ClassRule
-  public static final FlightServerTestRule FLIGHT_SERVER_TEST_RULE =
-      FlightServerTestRule.createStandardTestRule(CoreMockedSqlProducers.getLegacyProducer());
+  @RegisterExtension
+  public static final FlightServerTestExtension FLIGHT_SERVER_TEST_EXTENSION =
+      FlightServerTestExtension.createStandardTestExtension(
+          CoreMockedSqlProducers.getLegacyProducer());
 
   @Test
   public void testCookies() throws SQLException {
-    try (Connection connection = FLIGHT_SERVER_TEST_RULE.getConnection(false);
-         Statement statement = connection.createStatement()) {
+    try (Connection connection = FLIGHT_SERVER_TEST_EXTENSION.getConnection(false);
+        Statement statement = connection.createStatement()) {
 
       // Expect client didn't receive cookies before any operation
-      Assert.assertNull(FLIGHT_SERVER_TEST_RULE.getMiddlewareCookieFactory().getCookie());
+      assertNull(FLIGHT_SERVER_TEST_EXTENSION.getMiddlewareCookieFactory().getCookie());
 
       // Run another action for check if the cookies was sent by the server.
       statement.execute(CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD);
-      Assert.assertEquals("k=v", FLIGHT_SERVER_TEST_RULE.getMiddlewareCookieFactory().getCookie());
+      assertEquals("k=v", FLIGHT_SERVER_TEST_EXTENSION.getMiddlewareCookieFactory().getCookie());
     }
   }
 }
-
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionPoolDataSourceTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionPoolDataSourceTest.java
index bdf2826c41e97..18ff45bbde6f6 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionPoolDataSourceTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionPoolDataSourceTest.java
@@ -14,25 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
-import java.sql.Connection;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.sql.Connection;
 import javax.sql.PooledConnection;
-
 import org.apache.arrow.driver.jdbc.authentication.UserPasswordAuthentication;
 import org.apache.arrow.driver.jdbc.utils.ConnectionWrapper;
 import org.apache.arrow.driver.jdbc.utils.MockFlightSqlProducer;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class ArrowFlightJdbcConnectionPoolDataSourceTest {
-  @ClassRule
-  public static final FlightServerTestRule FLIGHT_SERVER_TEST_RULE;
+
+  @RegisterExtension public static final FlightServerTestExtension FLIGHT_SERVER_TEST_EXTENSION;
 
   private static final MockFlightSqlProducer PRODUCER = new MockFlightSqlProducer();
 
@@ -43,20 +44,21 @@ public class ArrowFlightJdbcConnectionPoolDataSourceTest {
             .user("user2", "pass2")
             .build();
 
-    FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
-        .authentication(authentication)
-        .producer(PRODUCER)
-        .build();
+    FLIGHT_SERVER_TEST_EXTENSION =
+        new FlightServerTestExtension.Builder()
+            .authentication(authentication)
+            .producer(PRODUCER)
+            .build();
   }
 
   private ArrowFlightJdbcConnectionPoolDataSource dataSource;
 
-  @Before
+  @BeforeEach
   public void setUp() {
-    dataSource = FLIGHT_SERVER_TEST_RULE.createConnectionPoolDataSource(false);
+    dataSource = FLIGHT_SERVER_TEST_EXTENSION.createConnectionPoolDataSource(false);
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     dataSource.close();
   }
@@ -65,18 +67,18 @@ public void tearDown() throws Exception {
   public void testShouldInnerConnectionIsClosedReturnCorrectly() throws Exception {
     PooledConnection pooledConnection = dataSource.getPooledConnection();
     Connection connection = pooledConnection.getConnection();
-    Assert.assertFalse(connection.isClosed());
+    assertFalse(connection.isClosed());
     connection.close();
-    Assert.assertTrue(connection.isClosed());
+    assertTrue(connection.isClosed());
   }
 
   @Test
   public void testShouldInnerConnectionShouldIgnoreDoubleClose() throws Exception {
     PooledConnection pooledConnection = dataSource.getPooledConnection();
     Connection connection = pooledConnection.getConnection();
-    Assert.assertFalse(connection.isClosed());
+    assertFalse(connection.isClosed());
     connection.close();
-    Assert.assertTrue(connection.isClosed());
+    assertTrue(connection.isClosed());
   }
 
   @Test
@@ -84,30 +86,31 @@ public void testShouldInnerConnectionIsClosedReturnTrueIfPooledConnectionCloses(
       throws Exception {
     PooledConnection pooledConnection = dataSource.getPooledConnection();
     Connection connection = pooledConnection.getConnection();
-    Assert.assertFalse(connection.isClosed());
+    assertFalse(connection.isClosed());
     pooledConnection.close();
-    Assert.assertTrue(connection.isClosed());
+    assertTrue(connection.isClosed());
   }
 
   @Test
   public void testShouldReuseConnectionsOnPool() throws Exception {
     PooledConnection pooledConnection = dataSource.getPooledConnection("user1", "pass1");
     ConnectionWrapper connection = ((ConnectionWrapper) pooledConnection.getConnection());
-    Assert.assertFalse(connection.isClosed());
+    assertFalse(connection.isClosed());
     connection.close();
-    Assert.assertTrue(connection.isClosed());
-    Assert.assertFalse(connection.unwrap(ArrowFlightConnection.class).isClosed());
+    assertTrue(connection.isClosed());
+    assertFalse(connection.unwrap(ArrowFlightConnection.class).isClosed());
 
     PooledConnection pooledConnection2 = dataSource.getPooledConnection("user1", "pass1");
     ConnectionWrapper connection2 = ((ConnectionWrapper) pooledConnection2.getConnection());
-    Assert.assertFalse(connection2.isClosed());
+    assertFalse(connection2.isClosed());
     connection2.close();
-    Assert.assertTrue(connection2.isClosed());
-    Assert.assertFalse(connection2.unwrap(ArrowFlightConnection.class).isClosed());
+    assertTrue(connection2.isClosed());
+    assertFalse(connection2.unwrap(ArrowFlightConnection.class).isClosed());
 
-    Assert.assertSame(pooledConnection, pooledConnection2);
-    Assert.assertNotSame(connection, connection2);
-    Assert.assertSame(connection.unwrap(ArrowFlightConnection.class),
+    assertSame(pooledConnection, pooledConnection2);
+    assertNotSame(connection, connection2);
+    assertSame(
+        connection.unwrap(ArrowFlightConnection.class),
         connection2.unwrap(ArrowFlightConnection.class));
   }
 
@@ -115,21 +118,22 @@ public void testShouldReuseConnectionsOnPool() throws Exception {
   public void testShouldNotMixConnectionsForDifferentUsers() throws Exception {
     PooledConnection pooledConnection = dataSource.getPooledConnection("user1", "pass1");
     ConnectionWrapper connection = ((ConnectionWrapper) pooledConnection.getConnection());
-    Assert.assertFalse(connection.isClosed());
+    assertFalse(connection.isClosed());
     connection.close();
-    Assert.assertTrue(connection.isClosed());
-    Assert.assertFalse(connection.unwrap(ArrowFlightConnection.class).isClosed());
+    assertTrue(connection.isClosed());
+    assertFalse(connection.unwrap(ArrowFlightConnection.class).isClosed());
 
     PooledConnection pooledConnection2 = dataSource.getPooledConnection("user2", "pass2");
     ConnectionWrapper connection2 = ((ConnectionWrapper) pooledConnection2.getConnection());
-    Assert.assertFalse(connection2.isClosed());
+    assertFalse(connection2.isClosed());
     connection2.close();
-    Assert.assertTrue(connection2.isClosed());
-    Assert.assertFalse(connection2.unwrap(ArrowFlightConnection.class).isClosed());
+    assertTrue(connection2.isClosed());
+    assertFalse(connection2.unwrap(ArrowFlightConnection.class).isClosed());
 
-    Assert.assertNotSame(pooledConnection, pooledConnection2);
-    Assert.assertNotSame(connection, connection2);
-    Assert.assertNotSame(connection.unwrap(ArrowFlightConnection.class),
+    assertNotSame(pooledConnection, pooledConnection2);
+    assertNotSame(connection, connection2);
+    assertNotSame(
+        connection.unwrap(ArrowFlightConnection.class),
         connection2.unwrap(ArrowFlightConnection.class));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcCursorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcCursorTest.java
index b818f7115b7f9..5cfe8ae74e567 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcCursorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcCursorTest.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.google.common.collect.ImmutableList;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.BitVector;
@@ -52,20 +51,16 @@
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.calcite.avatica.util.Cursor;
-import org.junit.After;
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableList;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Tests for {@link ArrowFlightJdbcCursor}.
- */
+/** Tests for {@link ArrowFlightJdbcCursor}. */
 public class ArrowFlightJdbcCursorTest {
 
   ArrowFlightJdbcCursor cursor;
   BufferAllocator allocator;
 
-  @After
+  @AfterEach
   public void cleanUp() {
     allocator.close();
     cursor.close();
@@ -88,44 +83,42 @@ public void testDateVectorNullTrue() throws SQLException {
 
   @Test
   public void testDurationVectorNullTrue() throws SQLException {
-    final VectorSchemaRoot root = getVectorSchemaRoot("Duration",
-        new ArrowType.Duration(TimeUnit.MILLISECOND), null);
+    final VectorSchemaRoot root =
+        getVectorSchemaRoot("Duration", new ArrowType.Duration(TimeUnit.MILLISECOND), null);
     ((DurationVector) root.getVector("Duration")).setNull(0);
     testCursorWasNull(root);
   }
 
   @Test
   public void testDateInternalNullTrue() throws SQLException {
-    final VectorSchemaRoot root = getVectorSchemaRoot("Interval",
-        new ArrowType.Interval(IntervalUnit.DAY_TIME), null);
+    final VectorSchemaRoot root =
+        getVectorSchemaRoot("Interval", new ArrowType.Interval(IntervalUnit.DAY_TIME), null);
     ((IntervalDayVector) root.getVector("Interval")).setNull(0);
     testCursorWasNull(root);
   }
 
   @Test
   public void testTimeStampVectorNullTrue() throws SQLException {
-    final VectorSchemaRoot root = getVectorSchemaRoot("TimeStamp",
-        new ArrowType.Timestamp(TimeUnit.MILLISECOND, null), null);
+    final VectorSchemaRoot root =
+        getVectorSchemaRoot("TimeStamp", new ArrowType.Timestamp(TimeUnit.MILLISECOND, null), null);
     ((TimeStampMilliVector) root.getVector("TimeStamp")).setNull(0);
     testCursorWasNull(root);
   }
 
   @Test
   public void testTimeVectorNullTrue() throws SQLException {
-    final VectorSchemaRoot root = getVectorSchemaRoot("Time",
-        new ArrowType.Time(TimeUnit.MILLISECOND, 32), null);
+    final VectorSchemaRoot root =
+        getVectorSchemaRoot("Time", new ArrowType.Time(TimeUnit.MILLISECOND, 32), null);
     ((TimeMilliVector) root.getVector("Time")).setNull(0);
     testCursorWasNull(root);
-
   }
 
   @Test
   public void testFixedSizeListVectorNullTrue() throws SQLException {
     List<Field> fieldList = new ArrayList<>();
-    fieldList.add(new Field("Null", new FieldType(true, new ArrowType.Null(), null),
-        null));
-    final VectorSchemaRoot root = getVectorSchemaRoot("FixedSizeList",
-        new ArrowType.FixedSizeList(10), fieldList);
+    fieldList.add(new Field("Null", new FieldType(true, new ArrowType.Null(), null), null));
+    final VectorSchemaRoot root =
+        getVectorSchemaRoot("FixedSizeList", new ArrowType.FixedSizeList(10), fieldList);
     ((FixedSizeListVector) root.getVector("FixedSizeList")).setNull(0);
     testCursorWasNull(root);
   }
@@ -133,8 +126,7 @@ public void testFixedSizeListVectorNullTrue() throws SQLException {
   @Test
   public void testLargeListVectorNullTrue() throws SQLException {
     List<Field> fieldList = new ArrayList<>();
-    fieldList.add(new Field("Null", new FieldType(true, new ArrowType.Null(), null),
-        null));
+    fieldList.add(new Field("Null", new FieldType(true, new ArrowType.Null(), null), null));
     final VectorSchemaRoot root =
         getVectorSchemaRoot("LargeList", new ArrowType.LargeList(), fieldList);
     ((LargeListVector) root.getVector("LargeList")).setNull(0);
@@ -144,8 +136,7 @@ public void testLargeListVectorNullTrue() throws SQLException {
   @Test
   public void testListVectorNullTrue() throws SQLException {
     List<Field> fieldList = new ArrayList<>();
-    fieldList.add(new Field("Null", new FieldType(true, new ArrowType.Null(), null),
-        null));
+    fieldList.add(new Field("Null", new FieldType(true, new ArrowType.Null(), null), null));
     final VectorSchemaRoot root = getVectorSchemaRoot("List", new ArrowType.List(), fieldList);
     ((ListVector) root.getVector("List")).setNull(0);
     testCursorWasNull(root);
@@ -154,13 +145,11 @@ public void testListVectorNullTrue() throws SQLException {
   @Test
   public void testMapVectorNullTrue() throws SQLException {
     List<Field> structChildren = new ArrayList<>();
-    structChildren.add(new Field("Key", new FieldType(false, new ArrowType.Utf8(), null),
-        null));
-    structChildren.add(new Field("Value", new FieldType(false, new ArrowType.Utf8(), null),
-        null));
+    structChildren.add(new Field("Key", new FieldType(false, new ArrowType.Utf8(), null), null));
+    structChildren.add(new Field("Value", new FieldType(false, new ArrowType.Utf8(), null), null));
     List<Field> fieldList = new ArrayList<>();
-    fieldList.add(new Field("Struct", new FieldType(false, new ArrowType.Struct(), null),
-        structChildren));
+    fieldList.add(
+        new Field("Struct", new FieldType(false, new ArrowType.Struct(), null), structChildren));
     final VectorSchemaRoot root = getVectorSchemaRoot("Map", new ArrowType.Map(false), fieldList);
     ((MapVector) root.getVector("Map")).setNull(0);
     testCursorWasNull(root);
@@ -175,8 +164,8 @@ public void testStructVectorNullTrue() throws SQLException {
 
   @Test
   public void testBaseIntVectorNullTrue() throws SQLException {
-    final VectorSchemaRoot root = getVectorSchemaRoot("BaseInt",
-        new ArrowType.Int(32, false), null);
+    final VectorSchemaRoot root =
+        getVectorSchemaRoot("BaseInt", new ArrowType.Int(32, false), null);
     ((UInt4Vector) root.getVector("BaseInt")).setNull(0);
     testCursorWasNull(root);
   }
@@ -190,24 +179,26 @@ public void testBitVectorNullTrue() throws SQLException {
 
   @Test
   public void testDecimalVectorNullTrue() throws SQLException {
-    final VectorSchemaRoot root = getVectorSchemaRoot("Decimal",
-        new ArrowType.Decimal(2, 2, 128), null);
+    final VectorSchemaRoot root =
+        getVectorSchemaRoot("Decimal", new ArrowType.Decimal(2, 2, 128), null);
     ((DecimalVector) root.getVector("Decimal")).setNull(0);
     testCursorWasNull(root);
   }
 
   @Test
   public void testFloat4VectorNullTrue() throws SQLException {
-    final VectorSchemaRoot root = getVectorSchemaRoot("Float4",
-        new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE), null);
+    final VectorSchemaRoot root =
+        getVectorSchemaRoot(
+            "Float4", new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE), null);
     ((Float4Vector) root.getVector("Float4")).setNull(0);
     testCursorWasNull(root);
   }
 
   @Test
   public void testFloat8VectorNullTrue() throws SQLException {
-    final VectorSchemaRoot root = getVectorSchemaRoot("Float8",
-        new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE), null);
+    final VectorSchemaRoot root =
+        getVectorSchemaRoot(
+            "Float8", new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE), null);
     ((Float8Vector) root.getVector("Float8")).setNull(0);
     testCursorWasNull(root);
   }
@@ -225,14 +216,11 @@ public void testNullVectorNullTrue() throws SQLException {
     testCursorWasNull(root);
   }
 
-  private VectorSchemaRoot getVectorSchemaRoot(String name, ArrowType arrowType,
-                                               List<Field> children) {
-    final Schema schema = new Schema(ImmutableList.of(
-        new Field(
-            name,
-            new FieldType(true, arrowType,
-                null),
-            children)));
+  private VectorSchemaRoot getVectorSchemaRoot(
+      String name, ArrowType arrowType, List<Field> children) {
+    final Schema schema =
+        new Schema(
+            ImmutableList.of(new Field(name, new FieldType(true, arrowType, null), children)));
     allocator = new RootAllocator(Long.MAX_VALUE);
     final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator);
     root.allocateNew();
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriverTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriverTest.java
index e1f64c9dd8732..ae355829d7ecc 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriverTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriverTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -30,48 +29,47 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.Properties;
-
 import org.apache.arrow.driver.jdbc.authentication.UserPasswordAuthentication;
 import org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty;
 import org.apache.arrow.driver.jdbc.utils.MockFlightSqlProducer;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.util.AutoCloseables;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
-/**
- * Tests for {@link ArrowFlightJdbcDriver}.
- */
+/** Tests for {@link ArrowFlightJdbcDriver}. */
 public class ArrowFlightJdbcDriverTest {
 
-  @ClassRule
-  public static final FlightServerTestRule FLIGHT_SERVER_TEST_RULE;
+  @RegisterExtension public static final FlightServerTestExtension FLIGHT_SERVER_TEST_EXTENSION;
   private static final MockFlightSqlProducer PRODUCER = new MockFlightSqlProducer();
 
   static {
     UserPasswordAuthentication authentication =
-        new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
+        new UserPasswordAuthentication.Builder()
+            .user("user1", "pass1")
+            .user("user2", "pass2")
             .build();
 
-    FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
-        .authentication(authentication)
-        .producer(PRODUCER)
-        .build();
+    FLIGHT_SERVER_TEST_EXTENSION =
+        new FlightServerTestExtension.Builder()
+            .authentication(authentication)
+            .producer(PRODUCER)
+            .build();
   }
 
   private BufferAllocator allocator;
   private ArrowFlightJdbcConnectionPoolDataSource dataSource;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     allocator = new RootAllocator(Long.MAX_VALUE);
-    dataSource = FLIGHT_SERVER_TEST_RULE.createConnectionPoolDataSource();
+    dataSource = FLIGHT_SERVER_TEST_EXTENSION.createConnectionPoolDataSource();
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     Collection<BufferAllocator> childAllocators = allocator.getChildAllocators();
     AutoCloseables.close(childAllocators.toArray(new AutoCloseable[0]));
@@ -79,34 +77,36 @@ public void tearDown() throws Exception {
   }
 
   /**
-   * Tests whether the {@link ArrowFlightJdbcDriver} is registered in the
-   * {@link DriverManager}.
+   * Tests whether the {@link ArrowFlightJdbcDriver} is registered in the {@link DriverManager}.
    *
    * @throws SQLException If an error occurs. (This is not supposed to happen.)
    */
   @Test
   public void testDriverIsRegisteredInDriverManager() throws Exception {
-    assertTrue(DriverManager.getDriver("jdbc:arrow-flight://localhost:32010") instanceof
-        ArrowFlightJdbcDriver);
-    assertTrue(DriverManager.getDriver("jdbc:arrow-flight-sql://localhost:32010") instanceof
-        ArrowFlightJdbcDriver);
+    assertTrue(
+        DriverManager.getDriver("jdbc:arrow-flight://localhost:32010")
+            instanceof ArrowFlightJdbcDriver);
+    assertTrue(
+        DriverManager.getDriver("jdbc:arrow-flight-sql://localhost:32010")
+            instanceof ArrowFlightJdbcDriver);
   }
 
   /**
-   * Tests whether the {@link ArrowFlightJdbcDriver} returns null when provided with an
-   * unsupported URL prefix.
+   * Tests whether the {@link ArrowFlightJdbcDriver} returns null when provided with an unsupported
+   * URL prefix.
    */
   @Test
   public void testShouldDeclineUrlWithUnsupportedPrefix() throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
 
-    assertNull(driver.connect("jdbc:mysql://localhost:32010",
-        dataSource.getProperties("flight", "flight123")));
+    assertNull(
+        driver.connect(
+            "jdbc:mysql://localhost:32010", dataSource.getProperties("flight", "flight123")));
   }
 
   /**
-   * Tests whether the {@link ArrowFlightJdbcDriver} can establish a successful
-   * connection to the Arrow Flight client.
+   * Tests whether the {@link ArrowFlightJdbcDriver} can establish a successful connection to the
+   * Arrow Flight client.
    *
    * @throws Exception If the connection fails to be established.
    */
@@ -116,19 +116,27 @@ public void testShouldConnectWhenProvidedWithValidUrl() throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
 
     try (Connection connection =
-             driver.connect("jdbc:arrow-flight://" +
-                     dataSource.getConfig().getHost() + ":" +
-                     dataSource.getConfig().getPort() + "?" +
-                     "useEncryption=false",
-                 dataSource.getProperties(dataSource.getConfig().getUser(), dataSource.getConfig().getPassword()))) {
+        driver.connect(
+            "jdbc:arrow-flight://"
+                + dataSource.getConfig().getHost()
+                + ":"
+                + dataSource.getConfig().getPort()
+                + "?"
+                + "useEncryption=false",
+            dataSource.getProperties(
+                dataSource.getConfig().getUser(), dataSource.getConfig().getPassword()))) {
       assertTrue(connection.isValid(300));
     }
     try (Connection connection =
-             driver.connect("jdbc:arrow-flight-sql://" +
-                     dataSource.getConfig().getHost() + ":" +
-                     dataSource.getConfig().getPort() + "?" +
-                     "useEncryption=false",
-                 dataSource.getProperties(dataSource.getConfig().getUser(), dataSource.getConfig().getPassword()))) {
+        driver.connect(
+            "jdbc:arrow-flight-sql://"
+                + dataSource.getConfig().getHost()
+                + ":"
+                + dataSource.getConfig().getPort()
+                + "?"
+                + "useEncryption=false",
+            dataSource.getProperties(
+                dataSource.getConfig().getUser(), dataSource.getConfig().getPassword()))) {
       assertTrue(connection.isValid(300));
     }
   }
@@ -139,19 +147,27 @@ public void testConnectWithInsensitiveCasePropertyKeys() throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
 
     try (Connection connection =
-             driver.connect("jdbc:arrow-flight://" +
-                     dataSource.getConfig().getHost() + ":" +
-                     dataSource.getConfig().getPort() + "?" +
-                     "UseEncryptIon=false",
-                 dataSource.getProperties(dataSource.getConfig().getUser(), dataSource.getConfig().getPassword()))) {
+        driver.connect(
+            "jdbc:arrow-flight://"
+                + dataSource.getConfig().getHost()
+                + ":"
+                + dataSource.getConfig().getPort()
+                + "?"
+                + "UseEncryptIon=false",
+            dataSource.getProperties(
+                dataSource.getConfig().getUser(), dataSource.getConfig().getPassword()))) {
       assertTrue(connection.isValid(300));
     }
     try (Connection connection =
-             driver.connect("jdbc:arrow-flight-sql://" +
-                     dataSource.getConfig().getHost() + ":" +
-                     dataSource.getConfig().getPort() + "?" +
-                     "UseEncryptIon=false",
-                 dataSource.getProperties(dataSource.getConfig().getUser(), dataSource.getConfig().getPassword()))) {
+        driver.connect(
+            "jdbc:arrow-flight-sql://"
+                + dataSource.getConfig().getHost()
+                + ":"
+                + dataSource.getConfig().getPort()
+                + "?"
+                + "UseEncryptIon=false",
+            dataSource.getProperties(
+                dataSource.getConfig().getUser(), dataSource.getConfig().getPassword()))) {
       assertTrue(connection.isValid(300));
     }
   }
@@ -161,102 +177,124 @@ public void testConnectWithInsensitiveCasePropertyKeys2() throws Exception {
     // Get the Arrow Flight JDBC driver by providing a property object with insensitive case keys.
     final Driver driver = new ArrowFlightJdbcDriver();
     Properties properties =
-        dataSource.getProperties(dataSource.getConfig().getUser(), dataSource.getConfig().getPassword());
+        dataSource.getProperties(
+            dataSource.getConfig().getUser(), dataSource.getConfig().getPassword());
     properties.put("UseEncryptIon", "false");
 
     try (Connection connection =
-             driver.connect("jdbc:arrow-flight://" +
-                 dataSource.getConfig().getHost() + ":" +
-                 dataSource.getConfig().getPort(), properties)) {
+        driver.connect(
+            "jdbc:arrow-flight://"
+                + dataSource.getConfig().getHost()
+                + ":"
+                + dataSource.getConfig().getPort(),
+            properties)) {
       assertTrue(connection.isValid(300));
     }
     try (Connection connection =
-             driver.connect("jdbc:arrow-flight-sql://" +
-                 dataSource.getConfig().getHost() + ":" +
-                 dataSource.getConfig().getPort(), properties)) {
+        driver.connect(
+            "jdbc:arrow-flight-sql://"
+                + dataSource.getConfig().getHost()
+                + ":"
+                + dataSource.getConfig().getPort(),
+            properties)) {
       assertTrue(connection.isValid(300));
     }
   }
 
   /**
-   * Tests whether an exception is thrown upon attempting to connect to a
-   * malformed URI.
+   * Tests whether an exception is thrown upon attempting to connect to a malformed URI.
    *
    * @throws SQLException If an error occurs.
    */
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldThrowExceptionWhenAttemptingToConnectToMalformedUrl() throws SQLException {
     final Driver driver = new ArrowFlightJdbcDriver();
     final String malformedUri = "yes:??/chainsaw.i=T333";
 
-    driver.connect(malformedUri, dataSource.getProperties("flight", "flight123"));
+    assertThrows(
+        SQLException.class,
+        () -> driver.connect(malformedUri, dataSource.getProperties("flight", "flight123")));
   }
 
   /**
-   * Tests whether an exception is thrown upon attempting to connect to a
-   * malformed URI.
+   * Tests whether an exception is thrown upon attempting to connect to a malformed URI.
    *
    * @throws SQLException If an error occurs.
    */
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldThrowExceptionWhenAttemptingToConnectToUrlNoPrefix() throws SQLException {
     final Driver driver = new ArrowFlightJdbcDriver();
     final String malformedUri = "localhost:32010";
 
-    driver.connect(malformedUri, dataSource.getProperties(dataSource.getConfig().getUser(),
-        dataSource.getConfig().getPassword()));
+    assertThrows(
+        SQLException.class,
+        () ->
+            driver.connect(
+                malformedUri,
+                dataSource.getProperties(
+                    dataSource.getConfig().getUser(), dataSource.getConfig().getPassword())));
   }
 
-  /**
-   * Tests whether an exception is thrown upon attempting to connect to a
-   * malformed URI.
-   */
+  /** Tests whether an exception is thrown upon attempting to connect to a malformed URI. */
   @Test
   public void testShouldThrowExceptionWhenAttemptingToConnectToUrlNoPort() {
     final Driver driver = new ArrowFlightJdbcDriver();
-    SQLException e = assertThrows(SQLException.class, () -> {
-      Properties properties = dataSource.getProperties(dataSource.getConfig().getUser(),
-          dataSource.getConfig().getPassword());
-      Connection conn = driver.connect("jdbc:arrow-flight://localhost", properties);
-      conn.close();
-    });
+    SQLException e =
+        assertThrows(
+            SQLException.class,
+            () -> {
+              Properties properties =
+                  dataSource.getProperties(
+                      dataSource.getConfig().getUser(), dataSource.getConfig().getPassword());
+              Connection conn = driver.connect("jdbc:arrow-flight://localhost", properties);
+              conn.close();
+            });
     assertTrue(e.getMessage().contains("URL must have a port"));
-    e = assertThrows(SQLException.class, () -> {
-      Properties properties = dataSource.getProperties(dataSource.getConfig().getUser(),
-          dataSource.getConfig().getPassword());
-      Connection conn = driver.connect("jdbc:arrow-flight-sql://localhost", properties);
-      conn.close();
-    });
+    e =
+        assertThrows(
+            SQLException.class,
+            () -> {
+              Properties properties =
+                  dataSource.getProperties(
+                      dataSource.getConfig().getUser(), dataSource.getConfig().getPassword());
+              Connection conn = driver.connect("jdbc:arrow-flight-sql://localhost", properties);
+              conn.close();
+            });
     assertTrue(e.getMessage().contains("URL must have a port"));
   }
 
-  /**
-   * Tests whether an exception is thrown upon attempting to connect to a
-   * malformed URI.
-   */
+  /** Tests whether an exception is thrown upon attempting to connect to a malformed URI. */
   @Test
   public void testShouldThrowExceptionWhenAttemptingToConnectToUrlNoHost() {
     final Driver driver = new ArrowFlightJdbcDriver();
-    SQLException e = assertThrows(SQLException.class, () -> {
-      Properties properties = dataSource.getProperties(dataSource.getConfig().getUser(),
-          dataSource.getConfig().getPassword());
-      Connection conn = driver.connect("jdbc:arrow-flight://32010:localhost", properties);
-      conn.close();
-    });
+    SQLException e =
+        assertThrows(
+            SQLException.class,
+            () -> {
+              Properties properties =
+                  dataSource.getProperties(
+                      dataSource.getConfig().getUser(), dataSource.getConfig().getPassword());
+              Connection conn = driver.connect("jdbc:arrow-flight://32010:localhost", properties);
+              conn.close();
+            });
     assertTrue(e.getMessage().contains("URL must have a host"));
 
-    e = assertThrows(SQLException.class, () -> {
-      Properties properties = dataSource.getProperties(dataSource.getConfig().getUser(),
-          dataSource.getConfig().getPassword());
-      Connection conn = driver.connect("jdbc:arrow-flight-sql://32010:localhost", properties);
-      conn.close();
-    });
+    e =
+        assertThrows(
+            SQLException.class,
+            () -> {
+              Properties properties =
+                  dataSource.getProperties(
+                      dataSource.getConfig().getUser(), dataSource.getConfig().getPassword());
+              Connection conn =
+                  driver.connect("jdbc:arrow-flight-sql://32010:localhost", properties);
+              conn.close();
+            });
     assertTrue(e.getMessage().contains("URL must have a host"));
   }
 
   /**
-   * Tests whether {@link ArrowFlightJdbcDriver#getUrlsArgs} returns the
-   * correct URL parameters.
+   * Tests whether {@link ArrowFlightJdbcDriver#getUrlsArgs} returns the correct URL parameters.
    *
    * @throws Exception If an error occurs.
    */
@@ -264,9 +302,10 @@ public void testShouldThrowExceptionWhenAttemptingToConnectToUrlNoHost() {
   public void testDriverUrlParsingMechanismShouldReturnTheDesiredArgsFromUrl() throws Exception {
     final ArrowFlightJdbcDriver driver = new ArrowFlightJdbcDriver();
 
-    final Map<Object, Object> parsedArgs = driver.getUrlsArgs(
-        "jdbc:arrow-flight-sql://localhost:2222/?key1=value1&key2=value2&a=b")
-        .orElseThrow(() -> new RuntimeException("URL was rejected"));
+    final Map<Object, Object> parsedArgs =
+        driver
+            .getUrlsArgs("jdbc:arrow-flight-sql://localhost:2222/?key1=value1&key2=value2&a=b")
+            .orElseThrow(() -> new RuntimeException("URL was rejected"));
 
     // Check size == the amount of args provided (scheme not included)
     assertEquals(5, parsedArgs.size());
@@ -284,11 +323,13 @@ public void testDriverUrlParsingMechanismShouldReturnTheDesiredArgsFromUrl() thr
   }
 
   @Test
-  public void testDriverUrlParsingMechanismShouldReturnTheDesiredArgsFromUrlWithSemicolon() throws Exception {
+  public void testDriverUrlParsingMechanismShouldReturnTheDesiredArgsFromUrlWithSemicolon()
+      throws Exception {
     final ArrowFlightJdbcDriver driver = new ArrowFlightJdbcDriver();
-    final Map<Object, Object> parsedArgs = driver.getUrlsArgs(
-        "jdbc:arrow-flight-sql://localhost:2222/;key1=value1;key2=value2;a=b")
-        .orElseThrow(() -> new RuntimeException("URL was rejected"));
+    final Map<Object, Object> parsedArgs =
+        driver
+            .getUrlsArgs("jdbc:arrow-flight-sql://localhost:2222/;key1=value1;key2=value2;a=b")
+            .orElseThrow(() -> new RuntimeException("URL was rejected"));
 
     // Check size == the amount of args provided (scheme not included)
     assertEquals(5, parsedArgs.size());
@@ -306,11 +347,13 @@ public void testDriverUrlParsingMechanismShouldReturnTheDesiredArgsFromUrlWithSe
   }
 
   @Test
-  public void testDriverUrlParsingMechanismShouldReturnTheDesiredArgsFromUrlWithOneSemicolon() throws Exception {
+  public void testDriverUrlParsingMechanismShouldReturnTheDesiredArgsFromUrlWithOneSemicolon()
+      throws Exception {
     final ArrowFlightJdbcDriver driver = new ArrowFlightJdbcDriver();
-    final Map<Object, Object> parsedArgs = driver.getUrlsArgs(
-        "jdbc:arrow-flight-sql://localhost:2222/;key1=value1")
-        .orElseThrow(() -> new RuntimeException("URL was rejected"));
+    final Map<Object, Object> parsedArgs =
+        driver
+            .getUrlsArgs("jdbc:arrow-flight-sql://localhost:2222/;key1=value1")
+            .orElseThrow(() -> new RuntimeException("URL was rejected"));
 
     // Check size == the amount of args provided (scheme not included)
     assertEquals(3, parsedArgs.size());
@@ -326,22 +369,25 @@ public void testDriverUrlParsingMechanismShouldReturnTheDesiredArgsFromUrlWithOn
   }
 
   @Test
-  public void testDriverUrlParsingMechanismShouldReturnEmptyOptionalForUnknownScheme() throws SQLException {
+  public void testDriverUrlParsingMechanismShouldReturnEmptyOptionalForUnknownScheme()
+      throws SQLException {
     final ArrowFlightJdbcDriver driver = new ArrowFlightJdbcDriver();
     assertFalse(driver.getUrlsArgs("jdbc:malformed-url-flight://localhost:2222").isPresent());
   }
 
   /**
-   * Tests whether {@code ArrowFlightJdbcDriverTest#getUrlsArgs} returns the
-   * correct URL parameters when the host is an IP Address.
+   * Tests whether {@code ArrowFlightJdbcDriverTest#getUrlsArgs} returns the correct URL parameters
+   * when the host is an IP Address.
    *
    * @throws Exception If an error occurs.
    */
   @Test
   public void testDriverUrlParsingMechanismShouldWorkWithIPAddress() throws Exception {
     final ArrowFlightJdbcDriver driver = new ArrowFlightJdbcDriver();
-    final Map<Object, Object> parsedArgs = driver.getUrlsArgs("jdbc:arrow-flight-sql://0.0.0.0:2222")
-        .orElseThrow(() -> new RuntimeException("URL was rejected"));
+    final Map<Object, Object> parsedArgs =
+        driver
+            .getUrlsArgs("jdbc:arrow-flight-sql://0.0.0.0:2222")
+            .orElseThrow(() -> new RuntimeException("URL was rejected"));
 
     // Check size == the amount of args provided (scheme not included)
     assertEquals(2, parsedArgs.size());
@@ -354,8 +400,9 @@ public void testDriverUrlParsingMechanismShouldWorkWithIPAddress() throws Except
   }
 
   /**
-   * Tests whether {@code ArrowFlightJdbcDriverTest#getUrlsArgs} escape especial characters and returns the
-   * correct URL parameters when the especial character '&' is embedded in the query parameters values.
+   * Tests whether {@code ArrowFlightJdbcDriverTest#getUrlsArgs} escape especial characters and
+   * returns the correct URL parameters when the especial character '&' is embedded in the query
+   * parameters values.
    *
    * @throws Exception If an error occurs.
    */
@@ -363,9 +410,11 @@ public void testDriverUrlParsingMechanismShouldWorkWithIPAddress() throws Except
   public void testDriverUrlParsingMechanismShouldWorkWithEmbeddedEspecialCharacter()
       throws Exception {
     final ArrowFlightJdbcDriver driver = new ArrowFlightJdbcDriver();
-    final Map<Object, Object> parsedArgs = driver.getUrlsArgs(
-        "jdbc:arrow-flight-sql://0.0.0.0:2222?test1=test1value&test2%26continue=test2value&test3=test3value")
-        .orElseThrow(() -> new RuntimeException("URL was rejected"));
+    final Map<Object, Object> parsedArgs =
+        driver
+            .getUrlsArgs(
+                "jdbc:arrow-flight-sql://0.0.0.0:2222?test1=test1value&test2%26continue=test2value&test3=test3value")
+            .orElseThrow(() -> new RuntimeException("URL was rejected"));
 
     // Check size == the amount of args provided (scheme not included)
     assertEquals(5, parsedArgs.size());
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFactoryTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFactoryTest.java
index a355e7156f7db..d3b0c3700846a 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFactoryTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFactoryTest.java
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
+import com.google.common.collect.ImmutableMap;
 import java.lang.reflect.Constructor;
 import java.sql.Connection;
 import java.util.Properties;
-
 import org.apache.arrow.driver.jdbc.authentication.UserPasswordAuthentication;
 import org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty;
 import org.apache.arrow.driver.jdbc.utils.MockFlightSqlProducer;
@@ -28,43 +27,41 @@
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.calcite.avatica.UnregisteredDriver;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
-import com.google.common.collect.ImmutableMap;
-
-/**
- * Tests for {@link ArrowFlightJdbcDriver}.
- */
+/** Tests for {@link ArrowFlightJdbcDriver}. */
 public class ArrowFlightJdbcFactoryTest {
 
-  @ClassRule
-  public static final FlightServerTestRule FLIGHT_SERVER_TEST_RULE;
+  @RegisterExtension public static final FlightServerTestExtension FLIGHT_SERVER_TEST_EXTENSION;
   private static final MockFlightSqlProducer PRODUCER = new MockFlightSqlProducer();
 
   static {
     UserPasswordAuthentication authentication =
-        new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
+        new UserPasswordAuthentication.Builder()
+            .user("user1", "pass1")
+            .user("user2", "pass2")
             .build();
 
-    FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
-        .authentication(authentication)
-        .producer(PRODUCER)
-        .build();
+    FLIGHT_SERVER_TEST_EXTENSION =
+        new FlightServerTestExtension.Builder()
+            .authentication(authentication)
+            .producer(PRODUCER)
+            .build();
   }
 
   private BufferAllocator allocator;
   private ArrowFlightJdbcConnectionPoolDataSource dataSource;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     allocator = new RootAllocator(Long.MAX_VALUE);
-    dataSource = FLIGHT_SERVER_TEST_RULE.createConnectionPoolDataSource();
+    dataSource = FLIGHT_SERVER_TEST_EXTENSION.createConnectionPoolDataSource();
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     AutoCloseables.close(dataSource, allocator);
   }
@@ -77,13 +74,21 @@ public void testShouldBeAbleToEstablishAConnectionSuccessfully() throws Exceptio
     ArrowFlightJdbcFactory factory = constructor.newInstance();
 
     final Properties properties = new Properties();
-    properties.putAll(ImmutableMap.of(
-        ArrowFlightConnectionProperty.HOST.camelName(), "localhost",
-        ArrowFlightConnectionProperty.PORT.camelName(), 32010,
-        ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), false));
+    properties.putAll(
+        ImmutableMap.of(
+            ArrowFlightConnectionProperty.HOST.camelName(),
+            "localhost",
+            ArrowFlightConnectionProperty.PORT.camelName(),
+            32010,
+            ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(),
+            false));
 
-    try (Connection connection = factory.newConnection(driver, constructor.newInstance(),
-        "jdbc:arrow-flight-sql://localhost:32010", properties)) {
+    try (Connection connection =
+        factory.newConnection(
+            driver,
+            constructor.newInstance(),
+            "jdbc:arrow-flight-sql://localhost:32010",
+            properties)) {
       assert connection.isValid(300);
     }
   }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcTimeTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcTimeTest.java
index 104794b3ad145..aa499d805bcf2 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcTimeTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcTimeTest.java
@@ -14,23 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import static org.hamcrest.CoreMatchers.endsWith;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.time.LocalTime;
 import java.util.concurrent.TimeUnit;
-
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
+import org.junit.jupiter.api.Test;
 
 public class ArrowFlightJdbcTimeTest {
 
-  @ClassRule
-  public static final ErrorCollector collector = new ErrorCollector();
   final int hour = 5;
   final int minute = 6;
   final int second = 7;
@@ -38,23 +33,25 @@ public class ArrowFlightJdbcTimeTest {
   @Test
   public void testPrintingMillisNoLeadingZeroes() {
     // testing the regular case where the precision of the millisecond is 3
-    LocalTime dateTime = LocalTime.of(hour, minute, second, (int) TimeUnit.MILLISECONDS.toNanos(999));
+    LocalTime dateTime =
+        LocalTime.of(hour, minute, second, (int) TimeUnit.MILLISECONDS.toNanos(999));
     ArrowFlightJdbcTime time = new ArrowFlightJdbcTime(dateTime);
-    collector.checkThat(time.toString(), endsWith(".999"));
-    collector.checkThat(time.getHours(), is(hour));
-    collector.checkThat(time.getMinutes(), is(minute));
-    collector.checkThat(time.getSeconds(), is(second));
+    assertThat(time.toString(), endsWith(".999"));
+    assertThat(time.getHours(), is(hour));
+    assertThat(time.getMinutes(), is(minute));
+    assertThat(time.getSeconds(), is(second));
   }
 
   @Test
   public void testPrintingMillisOneLeadingZeroes() {
     // test case where one leading zero needs to be added
-    LocalTime dateTime = LocalTime.of(hour, minute, second, (int) TimeUnit.MILLISECONDS.toNanos(99));
+    LocalTime dateTime =
+        LocalTime.of(hour, minute, second, (int) TimeUnit.MILLISECONDS.toNanos(99));
     ArrowFlightJdbcTime time = new ArrowFlightJdbcTime(dateTime);
-    collector.checkThat(time.toString(), endsWith(".099"));
-    collector.checkThat(time.getHours(), is(hour));
-    collector.checkThat(time.getMinutes(), is(minute));
-    collector.checkThat(time.getSeconds(), is(second));
+    assertThat(time.toString(), endsWith(".099"));
+    assertThat(time.getHours(), is(hour));
+    assertThat(time.getMinutes(), is(minute));
+    assertThat(time.getSeconds(), is(second));
   }
 
   @Test
@@ -62,10 +59,10 @@ public void testPrintingMillisTwoLeadingZeroes() {
     // test case where two leading zeroes needs to be added
     LocalTime dateTime = LocalTime.of(hour, minute, second, (int) TimeUnit.MILLISECONDS.toNanos(1));
     ArrowFlightJdbcTime time = new ArrowFlightJdbcTime(dateTime);
-    collector.checkThat(time.toString(), endsWith(".001"));
-    collector.checkThat(time.getHours(), is(hour));
-    collector.checkThat(time.getMinutes(), is(minute));
-    collector.checkThat(time.getSeconds(), is(second));
+    assertThat(time.toString(), endsWith(".001"));
+    assertThat(time.getHours(), is(hour));
+    assertThat(time.getMinutes(), is(minute));
+    assertThat(time.getSeconds(), is(second));
   }
 
   @Test
@@ -74,7 +71,7 @@ public void testEquality() {
     LocalTime dateTime = LocalTime.of(hour, minute, second, (int) TimeUnit.MILLISECONDS.toNanos(1));
     ArrowFlightJdbcTime time1 = new ArrowFlightJdbcTime(dateTime);
     ArrowFlightJdbcTime time2 = new ArrowFlightJdbcTime(dateTime);
-    collector.checkThat(time1, is(time2));
-    collector.checkThat(time1.hashCode(), is(time2.hashCode()));
+    assertThat(time1, is(time2));
+    assertThat(time1.hashCode(), is(time2.hashCode()));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightPreparedStatementTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightPreparedStatementTest.java
index 0b521a704bb6a..774ad0081e846 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightPreparedStatementTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightPreparedStatementTest.java
@@ -14,10 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.nio.charset.StandardCharsets;
@@ -28,7 +29,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.driver.jdbc.utils.CoreMockedSqlProducers;
 import org.apache.arrow.driver.jdbc.utils.MockFlightSqlProducer;
 import org.apache.arrow.flight.sql.FlightSqlUtils;
@@ -42,38 +42,34 @@
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.arrow.vector.util.Text;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class ArrowFlightPreparedStatementTest {
 
   public static final MockFlightSqlProducer PRODUCER = CoreMockedSqlProducers.getLegacyProducer();
-  @ClassRule
-  public static final FlightServerTestRule FLIGHT_SERVER_TEST_RULE = FlightServerTestRule
-      .createStandardTestRule(PRODUCER);
 
-  private static Connection connection;
+  @RegisterExtension
+  public static final FlightServerTestExtension FLIGHT_SERVER_TEST_EXTENSION =
+      FlightServerTestExtension.createStandardTestExtension(PRODUCER);
 
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
+  private static Connection connection;
 
-  @BeforeClass
+  @BeforeAll
   public static void setup() throws SQLException {
-    connection = FLIGHT_SERVER_TEST_RULE.getConnection(false);
+    connection = FLIGHT_SERVER_TEST_EXTENSION.getConnection(false);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() throws SQLException {
     connection.close();
   }
 
-  @Before
+  @BeforeEach
   public void before() {
     PRODUCER.clearActionTypeCounter();
   }
@@ -82,28 +78,34 @@ public void before() {
   public void testSimpleQueryNoParameterBinding() throws SQLException {
     final String query = CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD;
     try (final PreparedStatement preparedStatement = connection.prepareStatement(query);
-         final ResultSet resultSet = preparedStatement.executeQuery()) {
-      CoreMockedSqlProducers.assertLegacyRegularSqlResultSet(resultSet, collector);
+        final ResultSet resultSet = preparedStatement.executeQuery()) {
+      CoreMockedSqlProducers.assertLegacyRegularSqlResultSet(resultSet);
     }
   }
 
   @Test
   public void testQueryWithParameterBinding() throws SQLException {
     final String query = "Fake query with parameters";
-    final Schema schema = new Schema(Collections.singletonList(Field.nullable("", Types.MinorType.INT.getType())));
-    final Schema parameterSchema = new Schema(Arrays.asList(
-            Field.nullable("", ArrowType.Utf8.INSTANCE),
-            new Field("", FieldType.nullable(ArrowType.List.INSTANCE),
+    final Schema schema =
+        new Schema(Collections.singletonList(Field.nullable("", Types.MinorType.INT.getType())));
+    final Schema parameterSchema =
+        new Schema(
+            Arrays.asList(
+                Field.nullable("", ArrowType.Utf8.INSTANCE),
+                new Field(
+                    "",
+                    FieldType.nullable(ArrowType.List.INSTANCE),
                     Collections.singletonList(Field.nullable("", Types.MinorType.INT.getType())))));
-    final List<List<Object>> expected = Collections.singletonList(Arrays.asList(
-                    new Text("foo"),
-                    new Integer[]{1, 2, null}));
-
-    PRODUCER.addSelectQuery(query, schema,
-            Collections.singletonList(listener -> {
+    final List<List<Object>> expected =
+        Collections.singletonList(Arrays.asList(new Text("foo"), new Integer[] {1, 2, null}));
+
+    PRODUCER.addSelectQuery(
+        query,
+        schema,
+        Collections.singletonList(
+            listener -> {
               try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-                   final VectorSchemaRoot root = VectorSchemaRoot.create(schema,
-                           allocator)) {
+                  final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
                 ((IntVector) root.getVector(0)).setSafe(0, 10);
                 root.setRowCount(1);
                 listener.start(root);
@@ -119,7 +121,8 @@ public void testQueryWithParameterBinding() throws SQLException {
 
     try (final PreparedStatement preparedStatement = connection.prepareStatement(query)) {
       preparedStatement.setString(1, "foo");
-      preparedStatement.setArray(2, connection.createArrayOf("INTEGER", new Integer[]{1, 2, null}));
+      preparedStatement.setArray(
+          2, connection.createArrayOf("INTEGER", new Integer[] {1, 2, null}));
 
       try (final ResultSet resultSet = preparedStatement.executeQuery()) {
         resultSet.next();
@@ -128,15 +131,20 @@ public void testQueryWithParameterBinding() throws SQLException {
     }
   }
 
-
   @Test
-  @Ignore("https://github.com/apache/arrow/issues/34741: flaky test")
+  @Disabled("https://github.com/apache/arrow/issues/34741: flaky test")
   public void testPreparedStatementExecutionOnce() throws SQLException {
-    final PreparedStatement statement = connection.prepareStatement(CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD);
-    // Expect that there is one entry in the map -- {prepared statement action type, invocation count}.
+    final PreparedStatement statement =
+        connection.prepareStatement(CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD);
+    // Expect that there is one entry in the map -- {prepared statement action type, invocation
+    // count}.
     assertEquals(PRODUCER.getActionTypeCounter().size(), 1);
     // Expect that the prepared statement was executed exactly once.
-    assertEquals(PRODUCER.getActionTypeCounter().get(FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_STATEMENT.getType()), 1);
+    assertEquals(
+        PRODUCER
+            .getActionTypeCounter()
+            .get(FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_STATEMENT.getType()),
+        1);
     statement.close();
   }
 
@@ -144,20 +152,22 @@ public void testPreparedStatementExecutionOnce() throws SQLException {
   public void testReturnColumnCount() throws SQLException {
     final String query = CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD;
     try (final PreparedStatement psmt = connection.prepareStatement(query)) {
-      collector.checkThat("ID", equalTo(psmt.getMetaData().getColumnName(1)));
-      collector.checkThat("Name", equalTo(psmt.getMetaData().getColumnName(2)));
-      collector.checkThat("Age", equalTo(psmt.getMetaData().getColumnName(3)));
-      collector.checkThat("Salary", equalTo(psmt.getMetaData().getColumnName(4)));
-      collector.checkThat("Hire Date", equalTo(psmt.getMetaData().getColumnName(5)));
-      collector.checkThat("Last Sale", equalTo(psmt.getMetaData().getColumnName(6)));
-      collector.checkThat(6, equalTo(psmt.getMetaData().getColumnCount()));
+      assertAll(
+          "Column count is as expected",
+          () -> assertThat("ID", equalTo(psmt.getMetaData().getColumnName(1))),
+          () -> assertThat("Name", equalTo(psmt.getMetaData().getColumnName(2))),
+          () -> assertThat("Age", equalTo(psmt.getMetaData().getColumnName(3))),
+          () -> assertThat("Salary", equalTo(psmt.getMetaData().getColumnName(4))),
+          () -> assertThat("Hire Date", equalTo(psmt.getMetaData().getColumnName(5))),
+          () -> assertThat("Last Sale", equalTo(psmt.getMetaData().getColumnName(6))),
+          () -> assertThat(6, equalTo(psmt.getMetaData().getColumnCount())));
     }
   }
 
   @Test
   public void testUpdateQuery() throws SQLException {
     String query = "Fake update";
-    PRODUCER.addUpdateQuery(query, /*updatedRows*/42);
+    PRODUCER.addUpdateQuery(query, /*updatedRows*/ 42);
     try (final PreparedStatement stmt = connection.prepareStatement(query)) {
       int updated = stmt.executeUpdate();
       assertEquals(42, updated);
@@ -167,10 +177,12 @@ public void testUpdateQuery() throws SQLException {
   @Test
   public void testUpdateQueryWithParameters() throws SQLException {
     String query = "Fake update with parameters";
-    PRODUCER.addUpdateQuery(query, /*updatedRows*/42);
-    PRODUCER.addExpectedParameters(query,
+    PRODUCER.addUpdateQuery(query, /*updatedRows*/ 42);
+    PRODUCER.addExpectedParameters(
+        query,
         new Schema(Collections.singletonList(Field.nullable("", ArrowType.Utf8.INSTANCE))),
-        Collections.singletonList(Collections.singletonList(new Text("foo".getBytes(StandardCharsets.UTF_8)))));
+        Collections.singletonList(
+            Collections.singletonList(new Text("foo".getBytes(StandardCharsets.UTF_8)))));
     try (final PreparedStatement stmt = connection.prepareStatement(query)) {
       // TODO: make sure this is validated on the server too
       stmt.setString(1, "foo");
@@ -182,29 +194,29 @@ public void testUpdateQueryWithParameters() throws SQLException {
   @Test
   public void testUpdateQueryWithBatchedParameters() throws SQLException {
     String query = "Fake update with batched parameters";
-    Schema parameterSchema = new Schema(Arrays.asList(
-            Field.nullable("", ArrowType.Utf8.INSTANCE),
-            new Field("", FieldType.nullable(ArrowType.List.INSTANCE),
-                    Collections.singletonList(Field.nullable("", Types.MinorType.INT.getType())))));
-    List<List<Object>> expected = Arrays.asList(
+    Schema parameterSchema =
+        new Schema(
             Arrays.asList(
-                    new Text("foo"),
-                    new Integer[]{1, 2, null}),
-            Arrays.asList(
-                    new Text("bar"),
-                    new Integer[]{0, -1, 100000})
-            );
+                Field.nullable("", ArrowType.Utf8.INSTANCE),
+                new Field(
+                    "",
+                    FieldType.nullable(ArrowType.List.INSTANCE),
+                    Collections.singletonList(Field.nullable("", Types.MinorType.INT.getType())))));
+    List<List<Object>> expected =
+        Arrays.asList(
+            Arrays.asList(new Text("foo"), new Integer[] {1, 2, null}),
+            Arrays.asList(new Text("bar"), new Integer[] {0, -1, 100000}));
 
-    PRODUCER.addUpdateQuery(query, /*updatedRows*/42);
+    PRODUCER.addUpdateQuery(query, /*updatedRows*/ 42);
     PRODUCER.addExpectedParameters(query, parameterSchema, expected);
 
     try (final PreparedStatement stmt = connection.prepareStatement(query)) {
       // TODO: make sure this is validated on the server too
       stmt.setString(1, "foo");
-      stmt.setArray(2, connection.createArrayOf("INTEGER", new Integer[]{1, 2, null}));
+      stmt.setArray(2, connection.createArrayOf("INTEGER", new Integer[] {1, 2, null}));
       stmt.addBatch();
       stmt.setString(1, "bar");
-      stmt.setArray(2, connection.createArrayOf("INTEGER", new Integer[]{0, -1, 100000}));
+      stmt.setArray(2, connection.createArrayOf("INTEGER", new Integer[] {0, -1, 100000}));
       stmt.addBatch();
       int[] updated = stmt.executeBatch();
       assertEquals(42, updated[0]);
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightStatementExecuteTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightStatementExecuteTest.java
index 155fcc50827a1..632cb0ba5619b 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightStatementExecuteTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightStatementExecuteTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import static org.hamcrest.CoreMatchers.allOf;
@@ -22,6 +21,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -32,7 +32,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.apache.arrow.driver.jdbc.utils.MockFlightSqlProducer;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -43,18 +42,14 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.calcite.avatica.AvaticaUtils;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
-/**
- * Tests for {@link ArrowFlightStatement#execute}.
- */
+/** Tests for {@link ArrowFlightStatement#execute}. */
 public class ArrowFlightStatementExecuteTest {
   private static final String SAMPLE_QUERY_CMD = "SELECT * FROM this_test";
   private static final int SAMPLE_QUERY_ROWS = Byte.MAX_VALUE;
@@ -68,106 +63,109 @@ public class ArrowFlightStatementExecuteTest {
       "UPDATE this_large_table SET this_large_field = that_large_field FROM this_large_test WHERE this_large_condition";
   private static final long SAMPLE_LARGE_UPDATE_COUNT = Long.MAX_VALUE;
   private static final MockFlightSqlProducer PRODUCER = new MockFlightSqlProducer();
-  @ClassRule
-  public static final FlightServerTestRule SERVER_TEST_RULE = FlightServerTestRule.createStandardTestRule(PRODUCER);
 
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
+  @RegisterExtension
+  public static final FlightServerTestExtension FLIGHT_SERVER_TEST_EXTENSION =
+      FlightServerTestExtension.createStandardTestExtension(PRODUCER);
+
   private Connection connection;
   private Statement statement;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpBeforeClass() {
     PRODUCER.addSelectQuery(
         SAMPLE_QUERY_CMD,
         SAMPLE_QUERY_SCHEMA,
-        Collections.singletonList(listener -> {
-          try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-               final VectorSchemaRoot root = VectorSchemaRoot.create(SAMPLE_QUERY_SCHEMA,
-                   allocator)) {
-            final UInt1Vector vector = (UInt1Vector) root.getVector(VECTOR_NAME);
-            IntStream.range(0, SAMPLE_QUERY_ROWS).forEach(index -> vector.setSafe(index, index));
-            vector.setValueCount(SAMPLE_QUERY_ROWS);
-            root.setRowCount(SAMPLE_QUERY_ROWS);
-            listener.start(root);
-            listener.putNext();
-          } catch (final Throwable throwable) {
-            listener.error(throwable);
-          } finally {
-            listener.completed();
-          }
-        }));
+        Collections.singletonList(
+            listener -> {
+              try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
+                  final VectorSchemaRoot root =
+                      VectorSchemaRoot.create(SAMPLE_QUERY_SCHEMA, allocator)) {
+                final UInt1Vector vector = (UInt1Vector) root.getVector(VECTOR_NAME);
+                IntStream.range(0, SAMPLE_QUERY_ROWS)
+                    .forEach(index -> vector.setSafe(index, index));
+                vector.setValueCount(SAMPLE_QUERY_ROWS);
+                root.setRowCount(SAMPLE_QUERY_ROWS);
+                listener.start(root);
+                listener.putNext();
+              } catch (final Throwable throwable) {
+                listener.error(throwable);
+              } finally {
+                listener.completed();
+              }
+            }));
     PRODUCER.addUpdateQuery(SAMPLE_UPDATE_QUERY, SAMPLE_UPDATE_COUNT);
     PRODUCER.addUpdateQuery(SAMPLE_LARGE_UPDATE_QUERY, SAMPLE_LARGE_UPDATE_COUNT);
   }
 
-  @Before
+  @BeforeEach
   public void setUp() throws SQLException {
-    connection = SERVER_TEST_RULE.getConnection(false);
+    connection = FLIGHT_SERVER_TEST_EXTENSION.getConnection(false);
     statement = connection.createStatement();
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     AutoCloseables.close(statement, connection);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDownAfterClass() throws Exception {
     AutoCloseables.close(PRODUCER);
   }
 
   @Test
   public void testExecuteShouldRunSelectQuery() throws SQLException {
-    collector.checkThat(statement.execute(SAMPLE_QUERY_CMD),
-        is(true)); // Means this is a SELECT query.
+    assertThat(statement.execute(SAMPLE_QUERY_CMD), is(true)); // Means this is a SELECT query.
     final Set<Byte> numbers =
-        IntStream.range(0, SAMPLE_QUERY_ROWS).boxed()
+        IntStream.range(0, SAMPLE_QUERY_ROWS)
+            .boxed()
             .map(Integer::byteValue)
             .collect(Collectors.toCollection(HashSet::new));
     try (final ResultSet resultSet = statement.getResultSet()) {
       final int columnCount = resultSet.getMetaData().getColumnCount();
-      collector.checkThat(columnCount, is(1));
+      assertThat(columnCount, is(1));
       int rowCount = 0;
       for (; resultSet.next(); rowCount++) {
-        collector.checkThat(numbers.remove(resultSet.getByte(1)), is(true));
+        assertThat(numbers.remove(resultSet.getByte(1)), is(true));
       }
-      collector.checkThat(rowCount, is(equalTo(SAMPLE_QUERY_ROWS)));
+      assertThat(rowCount, is(equalTo(SAMPLE_QUERY_ROWS)));
     }
-    collector.checkThat(numbers, is(Collections.emptySet()));
-    collector.checkThat(
+    assertThat(numbers, is(Collections.emptySet()));
+    assertThat(
         (long) statement.getUpdateCount(),
         is(allOf(equalTo(statement.getLargeUpdateCount()), equalTo(-1L))));
   }
 
   @Test
   public void testExecuteShouldRunUpdateQueryForSmallUpdate() throws SQLException {
-    collector.checkThat(statement.execute(SAMPLE_UPDATE_QUERY),
-        is(false)); // Means this is an UPDATE query.
-    collector.checkThat(
+    assertThat(statement.execute(SAMPLE_UPDATE_QUERY), is(false)); // Means this is an UPDATE query.
+    assertThat(
         (long) statement.getUpdateCount(),
         is(allOf(equalTo(statement.getLargeUpdateCount()), equalTo(SAMPLE_UPDATE_COUNT))));
-    collector.checkThat(statement.getResultSet(), is(nullValue()));
+    assertThat(statement.getResultSet(), is(nullValue()));
   }
 
   @Test
   public void testExecuteShouldRunUpdateQueryForLargeUpdate() throws SQLException {
-    collector.checkThat(statement.execute(SAMPLE_LARGE_UPDATE_QUERY), is(false)); // UPDATE query.
+    assertThat(statement.execute(SAMPLE_LARGE_UPDATE_QUERY), is(false)); // UPDATE query.
     final long updateCountSmall = statement.getUpdateCount();
     final long updateCountLarge = statement.getLargeUpdateCount();
-    collector.checkThat(updateCountLarge, is(equalTo(SAMPLE_LARGE_UPDATE_COUNT)));
-    collector.checkThat(
+    assertThat(updateCountLarge, is(equalTo(SAMPLE_LARGE_UPDATE_COUNT)));
+    assertThat(
         updateCountSmall,
-        is(allOf(equalTo((long) AvaticaUtils.toSaturatedInt(updateCountLarge)),
-            not(equalTo(updateCountLarge)))));
-    collector.checkThat(statement.getResultSet(), is(nullValue()));
+        is(
+            allOf(
+                equalTo((long) AvaticaUtils.toSaturatedInt(updateCountLarge)),
+                not(equalTo(updateCountLarge)))));
+    assertThat(statement.getResultSet(), is(nullValue()));
   }
 
   @Test
   public void testUpdateCountShouldStartOnZero() throws SQLException {
-    collector.checkThat(
+    assertThat(
         (long) statement.getUpdateCount(),
         is(allOf(equalTo(statement.getLargeUpdateCount()), equalTo(0L))));
-    collector.checkThat(statement.getResultSet(), is(nullValue()));
+    assertThat(statement.getResultSet(), is(nullValue()));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightStatementExecuteUpdateTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightStatementExecuteUpdateTest.java
index 43209d8913ebd..f7c31c590c556 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightStatementExecuteUpdateTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightStatementExecuteUpdateTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import static java.lang.String.format;
@@ -23,13 +22,14 @@
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
 import java.sql.Statement;
 import java.util.Collections;
-
 import org.apache.arrow.driver.jdbc.utils.MockFlightSqlProducer;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -39,18 +39,14 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.calcite.avatica.AvaticaUtils;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-
-/**
- * Tests for {@link ArrowFlightStatement#executeUpdate}.
- */
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+/** Tests for {@link ArrowFlightStatement#executeUpdate}. */
 public class ArrowFlightStatementExecuteUpdateTest {
   private static final String UPDATE_SAMPLE_QUERY =
       "UPDATE sample_table SET sample_col = sample_val WHERE sample_condition";
@@ -63,47 +59,48 @@ public class ArrowFlightStatementExecuteUpdateTest {
       new Schema(
           Collections.singletonList(Field.nullable("placeholder", MinorType.VARCHAR.getType())));
   private static final MockFlightSqlProducer PRODUCER = new MockFlightSqlProducer();
-  @ClassRule
-  public static final FlightServerTestRule SERVER_TEST_RULE = FlightServerTestRule.createStandardTestRule(PRODUCER);
 
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
+  @RegisterExtension
+  public static final FlightServerTestExtension FLIGHT_SERVER_TEST_EXTENSION =
+      FlightServerTestExtension.createStandardTestExtension(PRODUCER);
+
   public Connection connection;
   public Statement statement;
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpBeforeClass() {
     PRODUCER.addUpdateQuery(UPDATE_SAMPLE_QUERY, UPDATE_SAMPLE_QUERY_AFFECTED_COLS);
     PRODUCER.addUpdateQuery(LARGE_UPDATE_SAMPLE_QUERY, LARGE_UPDATE_SAMPLE_QUERY_AFFECTED_COLS);
     PRODUCER.addSelectQuery(
         REGULAR_QUERY_SAMPLE,
         REGULAR_QUERY_SCHEMA,
-        Collections.singletonList(listener -> {
-          try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-               final VectorSchemaRoot root = VectorSchemaRoot.create(REGULAR_QUERY_SCHEMA,
-                   allocator)) {
-            listener.start(root);
-            listener.putNext();
-          } catch (final Throwable throwable) {
-            listener.error(throwable);
-          } finally {
-            listener.completed();
-          }
-        }));
+        Collections.singletonList(
+            listener -> {
+              try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
+                  final VectorSchemaRoot root =
+                      VectorSchemaRoot.create(REGULAR_QUERY_SCHEMA, allocator)) {
+                listener.start(root);
+                listener.putNext();
+              } catch (final Throwable throwable) {
+                listener.error(throwable);
+              } finally {
+                listener.completed();
+              }
+            }));
   }
 
-  @Before
+  @BeforeEach
   public void setUp() throws SQLException {
-    connection = SERVER_TEST_RULE.getConnection(false);
+    connection = FLIGHT_SERVER_TEST_EXTENSION.getConnection(false);
     statement = connection.createStatement();
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     AutoCloseables.close(statement, connection);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDownAfterClass() throws Exception {
     AutoCloseables.close(PRODUCER);
   }
@@ -111,8 +108,7 @@ public static void tearDownAfterClass() throws Exception {
   @Test
   public void testExecuteUpdateShouldReturnNumColsAffectedForNumRowsFittingInt()
       throws SQLException {
-    collector.checkThat(statement.executeUpdate(UPDATE_SAMPLE_QUERY),
-        is(UPDATE_SAMPLE_QUERY_AFFECTED_COLS));
+    assertThat(statement.executeUpdate(UPDATE_SAMPLE_QUERY), is(UPDATE_SAMPLE_QUERY_AFFECTED_COLS));
   }
 
   @Test
@@ -120,77 +116,92 @@ public void testExecuteUpdateShouldReturnSaturatedNumColsAffectedIfDoesNotFitInI
       throws SQLException {
     final long result = statement.executeUpdate(LARGE_UPDATE_SAMPLE_QUERY);
     final long expectedRowCountRaw = LARGE_UPDATE_SAMPLE_QUERY_AFFECTED_COLS;
-    collector.checkThat(
+    assertThat(
         result,
-        is(allOf(
-            not(equalTo(expectedRowCountRaw)),
-            equalTo((long) AvaticaUtils.toSaturatedInt(
-                expectedRowCountRaw))))); // Because of long-to-integer overflow.
+        is(
+            allOf(
+                not(equalTo(expectedRowCountRaw)),
+                equalTo(
+                    (long)
+                        AvaticaUtils.toSaturatedInt(
+                            expectedRowCountRaw))))); // Because of long-to-integer overflow.
   }
 
   @Test
   public void testExecuteLargeUpdateShouldReturnNumColsAffected() throws SQLException {
-    collector.checkThat(
+    assertThat(
         statement.executeLargeUpdate(LARGE_UPDATE_SAMPLE_QUERY),
         is(LARGE_UPDATE_SAMPLE_QUERY_AFFECTED_COLS));
   }
 
-  @Test(expected = SQLFeatureNotSupportedException.class)
+  @Test
   // TODO Implement `Statement#executeUpdate(String, int)`
   public void testExecuteUpdateUnsupportedWithDriverFlag() throws SQLException {
-    collector.checkThat(
-        statement.executeUpdate(UPDATE_SAMPLE_QUERY, Statement.RETURN_GENERATED_KEYS),
-        is(UPDATE_SAMPLE_QUERY_AFFECTED_COLS));
+    assertThrows(
+        SQLFeatureNotSupportedException.class,
+        () -> {
+          assertThat(
+              statement.executeUpdate(UPDATE_SAMPLE_QUERY, Statement.NO_GENERATED_KEYS),
+              is(UPDATE_SAMPLE_QUERY_AFFECTED_COLS));
+        });
   }
 
-  @Test(expected = SQLFeatureNotSupportedException.class)
+  @Test
   // TODO Implement `Statement#executeUpdate(String, int[])`
   public void testExecuteUpdateUnsupportedWithArrayOfInts() throws SQLException {
-    collector.checkThat(
-        statement.executeUpdate(UPDATE_SAMPLE_QUERY, new int[0]),
-        is(UPDATE_SAMPLE_QUERY_AFFECTED_COLS));
+    assertThrows(
+        SQLFeatureNotSupportedException.class,
+        () -> {
+          assertThat(
+              statement.executeUpdate(UPDATE_SAMPLE_QUERY, new int[0]),
+              is(UPDATE_SAMPLE_QUERY_AFFECTED_COLS));
+        });
   }
 
-  @Test(expected = SQLFeatureNotSupportedException.class)
+  @Test
   // TODO Implement `Statement#executeUpdate(String, String[])`
   public void testExecuteUpdateUnsupportedWithArraysOfStrings() throws SQLException {
-    collector.checkThat(
-        statement.executeUpdate(UPDATE_SAMPLE_QUERY, new String[0]),
-        is(UPDATE_SAMPLE_QUERY_AFFECTED_COLS));
+    assertThrows(
+        SQLFeatureNotSupportedException.class,
+        () -> {
+          assertThat(
+              statement.executeUpdate(UPDATE_SAMPLE_QUERY, new String[0]),
+              is(UPDATE_SAMPLE_QUERY_AFFECTED_COLS));
+        });
   }
 
   @Test
   public void testExecuteShouldExecuteUpdateQueryAutomatically() throws SQLException {
-    collector.checkThat(statement.execute(UPDATE_SAMPLE_QUERY),
-        is(false)); // Meaning there was an update query.
-    collector.checkThat(statement.execute(REGULAR_QUERY_SAMPLE),
-        is(true)); // Meaning there was a select query.
+    assertThat(
+        statement.execute(UPDATE_SAMPLE_QUERY), is(false)); // Meaning there was an update query.
+    assertThat(
+        statement.execute(REGULAR_QUERY_SAMPLE), is(true)); // Meaning there was a select query.
   }
 
   @Test
   public void testShouldFailToPrepareStatementForNullQuery() {
     int count = 0;
     try {
-      collector.checkThat(statement.execute(null), is(false));
+      assertThat(statement.execute(null), is(false));
     } catch (final SQLException e) {
       count++;
-      collector.checkThat(e.getCause(), is(instanceOf(NullPointerException.class)));
+      assertThat(e.getCause(), is(instanceOf(NullPointerException.class)));
     }
-    collector.checkThat(count, is(1));
+    assertThat(count, is(1));
   }
 
   @Test
   public void testShouldFailToPrepareStatementForClosedStatement() throws SQLException {
     statement.close();
-    collector.checkThat(statement.isClosed(), is(true));
+    assertThat(statement.isClosed(), is(true));
     int count = 0;
     try {
       statement.execute(UPDATE_SAMPLE_QUERY);
     } catch (final SQLException e) {
       count++;
-      collector.checkThat(e.getMessage(), is("Statement closed"));
+      assertThat(e.getMessage(), is("Statement closed"));
     }
-    collector.checkThat(count, is(1));
+    assertThat(count, is(1));
   }
 
   @Test
@@ -207,10 +218,10 @@ public void testShouldFailToPrepareStatementForBadStatement() {
        * we simply throw an `IllegalArgumentException` for queries not registered
        * in our `MockFlightSqlProducer`.
        */
-      collector.checkThat(
+      assertThat(
           e.getMessage(),
           is(format("Error while executing SQL \"%s\": Query not found", badQuery)));
     }
-    collector.checkThat(count, is(1));
+    assertThat(count, is(1));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionMutualTlsTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionMutualTlsTest.java
index 03f15d77ade11..cc95115b9330b 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionMutualTlsTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionMutualTlsTest.java
@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.File;
 import java.net.URLEncoder;
@@ -27,7 +28,6 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Properties;
-
 import org.apache.arrow.driver.jdbc.authentication.UserPasswordAuthentication;
 import org.apache.arrow.driver.jdbc.client.ArrowFlightSqlClientHandler;
 import org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty;
@@ -36,19 +36,15 @@
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.util.AutoCloseables;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-/**
- * Tests encrypted connections.
- */
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+/** Tests encrypted connections. */
 public class ConnectionMutualTlsTest {
 
-  @ClassRule
-  public static final FlightServerTestRule FLIGHT_SERVER_TEST_RULE;
+  @RegisterExtension public static final FlightServerTestExtension FLIGHT_SERVER_TEST_EXTENSION;
   private static final String tlsRootCertsPath;
   private static final String clientMTlsCertPath;
   private static final String badClientMTlsCertPath;
@@ -59,15 +55,15 @@ public class ConnectionMutualTlsTest {
   private static final String passTest = "pass1";
 
   static {
-    final FlightSqlTestCertificates.CertKeyPair
-        certKey = FlightSqlTestCertificates.exampleTlsCerts().get(0);
+    final FlightSqlTestCertificates.CertKeyPair certKey =
+        FlightSqlTestCertificates.exampleTlsCerts().get(0);
 
     tlsRootCertsPath = certKey.cert.getPath();
 
     final File serverMTlsCACert = FlightSqlTestCertificates.exampleCACert();
 
-    final FlightSqlTestCertificates.CertKeyPair
-        clientMTlsCertKey = FlightSqlTestCertificates.exampleTlsCerts().get(1);
+    final FlightSqlTestCertificates.CertKeyPair clientMTlsCertKey =
+        FlightSqlTestCertificates.exampleTlsCerts().get(1);
 
     clientMTlsCertPath = clientMTlsCertKey.cert.getPath();
     clientMTlsKeyPath = clientMTlsCertKey.key.getPath();
@@ -75,26 +71,26 @@ public class ConnectionMutualTlsTest {
     badClientMTlsCertPath = clientMTlsCertPath + ".bad";
     badClientMTlsKeyPath = clientMTlsKeyPath + ".bad";
 
-    UserPasswordAuthentication authentication = new UserPasswordAuthentication.Builder()
-            .user(userTest, passTest)
-            .build();
+    UserPasswordAuthentication authentication =
+        new UserPasswordAuthentication.Builder().user(userTest, passTest).build();
 
-    FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
-        .authentication(authentication)
-        .useEncryption(certKey.cert, certKey.key)
-        .useMTlsClientVerification(serverMTlsCACert)
-        .producer(PRODUCER)
-        .build();
+    FLIGHT_SERVER_TEST_EXTENSION =
+        new FlightServerTestExtension.Builder()
+            .authentication(authentication)
+            .useEncryption(certKey.cert, certKey.key)
+            .useMTlsClientVerification(serverMTlsCACert)
+            .producer(PRODUCER)
+            .build();
   }
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     allocator.getChildAllocators().forEach(BufferAllocator::close);
     AutoCloseables.close(allocator);
@@ -109,17 +105,17 @@ public void tearDown() throws Exception {
   public void testGetEncryptedClientAuthenticated() throws Exception {
 
     try (ArrowFlightSqlClientHandler client =
-             new ArrowFlightSqlClientHandler.Builder()
-                 .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
-                 .withPort(FLIGHT_SERVER_TEST_RULE.getPort())
-                 .withUsername(userTest)
-                 .withPassword(passTest)
-                 .withTlsRootCertificates(tlsRootCertsPath)
-                 .withClientCertificate(clientMTlsCertPath)
-                 .withClientKey(clientMTlsKeyPath)
-                 .withBufferAllocator(allocator)
-                 .withEncryption(true)
-                 .build()) {
+        new ArrowFlightSqlClientHandler.Builder()
+            .withHost(FLIGHT_SERVER_TEST_EXTENSION.getHost())
+            .withPort(FLIGHT_SERVER_TEST_EXTENSION.getPort())
+            .withUsername(userTest)
+            .withPassword(passTest)
+            .withTlsRootCertificates(tlsRootCertsPath)
+            .withClientCertificate(clientMTlsCertPath)
+            .withClientKey(clientMTlsKeyPath)
+            .withBufferAllocator(allocator)
+            .withEncryption(true)
+            .build()) {
       assertNotNull(client);
     }
   }
@@ -131,21 +127,24 @@ public void testGetEncryptedClientAuthenticated() throws Exception {
   @Test
   public void testGetEncryptedClientWithBadMTlsCertPath() {
 
-    assertThrows(SQLException.class, () -> {
-      try (ArrowFlightSqlClientHandler handler = new ArrowFlightSqlClientHandler.Builder()
-          .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
-          .withPort(FLIGHT_SERVER_TEST_RULE.getPort())
-          .withUsername(userTest)
-          .withPassword(passTest)
-          .withTlsRootCertificates(tlsRootCertsPath)
-          .withClientCertificate(badClientMTlsCertPath)
-          .withClientKey(clientMTlsKeyPath)
-          .withBufferAllocator(allocator)
-          .withEncryption(true)
-          .build()) {
-        Assert.fail();
-      }
-    });
+    assertThrows(
+        SQLException.class,
+        () -> {
+          try (ArrowFlightSqlClientHandler handler =
+              new ArrowFlightSqlClientHandler.Builder()
+                  .withHost(FLIGHT_SERVER_TEST_EXTENSION.getHost())
+                  .withPort(FLIGHT_SERVER_TEST_EXTENSION.getPort())
+                  .withUsername(userTest)
+                  .withPassword(passTest)
+                  .withTlsRootCertificates(tlsRootCertsPath)
+                  .withClientCertificate(badClientMTlsCertPath)
+                  .withClientKey(clientMTlsKeyPath)
+                  .withBufferAllocator(allocator)
+                  .withEncryption(true)
+                  .build()) {
+            fail();
+          }
+        });
   }
 
   /**
@@ -155,21 +154,24 @@ public void testGetEncryptedClientWithBadMTlsCertPath() {
   @Test
   public void testGetEncryptedClientWithBadMTlsKeyPath() {
 
-    assertThrows(SQLException.class, () -> {
-      try (ArrowFlightSqlClientHandler handler = new ArrowFlightSqlClientHandler.Builder()
-          .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
-          .withPort(FLIGHT_SERVER_TEST_RULE.getPort())
-          .withUsername(userTest)
-          .withPassword(passTest)
-          .withTlsRootCertificates(tlsRootCertsPath)
-          .withClientCertificate(clientMTlsCertPath)
-          .withClientKey(badClientMTlsKeyPath)
-          .withBufferAllocator(allocator)
-          .withEncryption(true)
-          .build()) {
-        Assert.fail();
-      }
-    });
+    assertThrows(
+        SQLException.class,
+        () -> {
+          try (ArrowFlightSqlClientHandler handler =
+              new ArrowFlightSqlClientHandler.Builder()
+                  .withHost(FLIGHT_SERVER_TEST_EXTENSION.getHost())
+                  .withPort(FLIGHT_SERVER_TEST_EXTENSION.getPort())
+                  .withUsername(userTest)
+                  .withPassword(passTest)
+                  .withTlsRootCertificates(tlsRootCertsPath)
+                  .withClientCertificate(clientMTlsCertPath)
+                  .withClientKey(badClientMTlsKeyPath)
+                  .withBufferAllocator(allocator)
+                  .withEncryption(true)
+                  .build()) {
+            fail();
+          }
+        });
   }
 
   /**
@@ -180,21 +182,21 @@ public void testGetEncryptedClientWithBadMTlsKeyPath() {
   @Test
   public void testGetNonAuthenticatedEncryptedClientNoAuth() throws Exception {
     try (ArrowFlightSqlClientHandler client =
-             new ArrowFlightSqlClientHandler.Builder()
-                 .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
-                 .withTlsRootCertificates(tlsRootCertsPath)
-                 .withClientCertificate(clientMTlsCertPath)
-                 .withClientKey(clientMTlsKeyPath)
-                 .withBufferAllocator(allocator)
-                 .withEncryption(true)
-                 .build()) {
+        new ArrowFlightSqlClientHandler.Builder()
+            .withHost(FLIGHT_SERVER_TEST_EXTENSION.getHost())
+            .withTlsRootCertificates(tlsRootCertsPath)
+            .withClientCertificate(clientMTlsCertPath)
+            .withClientKey(clientMTlsKeyPath)
+            .withBufferAllocator(allocator)
+            .withEncryption(true)
+            .build()) {
       assertNotNull(client);
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when the
-   * provided valid credentials and a valid TLS Root Certs path.
+   * Check if an encrypted connection can be established successfully when the provided valid
+   * credentials and a valid TLS Root Certs path.
    *
    * @throws Exception on error.
    */
@@ -203,29 +205,25 @@ public void testGetEncryptedConnectionWithValidCredentialsAndTlsRootsPath() thro
     final Properties properties = new Properties();
 
     properties.put(ArrowFlightConnectionProperty.HOST.camelName(), "localhost");
-    properties.put(ArrowFlightConnectionProperty.PORT.camelName(),
-        FLIGHT_SERVER_TEST_RULE.getPort());
-    properties.put(ArrowFlightConnectionProperty.USER.camelName(),
-        userTest);
-    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(),
-        passTest);
-    properties.put(ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(),
-        tlsRootCertsPath);
-    properties.put(ArrowFlightConnectionProperty.CLIENT_CERTIFICATE.camelName(),
-        clientMTlsCertPath);
-    properties.put(ArrowFlightConnectionProperty.CLIENT_KEY.camelName(),
-        clientMTlsKeyPath);
+    properties.put(
+        ArrowFlightConnectionProperty.PORT.camelName(), FLIGHT_SERVER_TEST_EXTENSION.getPort());
+    properties.put(ArrowFlightConnectionProperty.USER.camelName(), userTest);
+    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
+    properties.put(ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(), tlsRootCertsPath);
+    properties.put(
+        ArrowFlightConnectionProperty.CLIENT_CERTIFICATE.camelName(), clientMTlsCertPath);
+    properties.put(ArrowFlightConnectionProperty.CLIENT_KEY.camelName(), clientMTlsKeyPath);
 
     final ArrowFlightJdbcDataSource dataSource =
         ArrowFlightJdbcDataSource.createNewDataSource(properties);
     try (final Connection connection = dataSource.getConnection()) {
-      Assert.assertTrue(connection.isValid(300));
+      assertTrue(connection.isValid(300));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when not
-   * providing authentication.
+   * Check if an encrypted connection can be established successfully when not providing
+   * authentication.
    *
    * @throws Exception on error.
    */
@@ -233,22 +231,26 @@ public void testGetEncryptedConnectionWithValidCredentialsAndTlsRootsPath() thro
   public void testGetNonAuthenticatedEncryptedConnection() throws Exception {
     final Properties properties = new Properties();
 
-    properties.put(ArrowFlightConnectionProperty.HOST.camelName(), FLIGHT_SERVER_TEST_RULE.getHost());
-    properties.put(ArrowFlightConnectionProperty.PORT.camelName(), FLIGHT_SERVER_TEST_RULE.getPort());
+    properties.put(
+        ArrowFlightConnectionProperty.HOST.camelName(), FLIGHT_SERVER_TEST_EXTENSION.getHost());
+    properties.put(
+        ArrowFlightConnectionProperty.PORT.camelName(), FLIGHT_SERVER_TEST_EXTENSION.getPort());
     properties.put(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), true);
     properties.put(ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(), tlsRootCertsPath);
-    properties.put(ArrowFlightConnectionProperty.CLIENT_CERTIFICATE.camelName(), clientMTlsCertPath);
+    properties.put(
+        ArrowFlightConnectionProperty.CLIENT_CERTIFICATE.camelName(), clientMTlsCertPath);
     properties.put(ArrowFlightConnectionProperty.CLIENT_KEY.camelName(), clientMTlsKeyPath);
 
-    final ArrowFlightJdbcDataSource dataSource = ArrowFlightJdbcDataSource.createNewDataSource(properties);
+    final ArrowFlightJdbcDataSource dataSource =
+        ArrowFlightJdbcDataSource.createNewDataSource(properties);
     try (final Connection connection = dataSource.getConnection()) {
-      Assert.assertTrue(connection.isValid(300));
+      assertTrue(connection.isValid(300));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through
-   * the DriverManager using just a connection url.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using just a connection url.
    *
    * @throws Exception on error.
    */
@@ -257,10 +259,11 @@ public void testTLSConnectionPropertyTrueCorrectCastUrlWithDriverManager() throw
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
-    final String jdbcUrl = String.format(
-            "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s" +
-                    "&useEncryption=true&%s=%s&%s=%s&%s=%s",
-            FLIGHT_SERVER_TEST_RULE.getPort(),
+    final String jdbcUrl =
+        String.format(
+            "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s"
+                + "&useEncryption=true&%s=%s&%s=%s&%s=%s",
+            FLIGHT_SERVER_TEST_EXTENSION.getPort(),
             userTest,
             passTest,
             ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(),
@@ -271,19 +274,20 @@ public void testTLSConnectionPropertyTrueCorrectCastUrlWithDriverManager() throw
             URLEncoder.encode(clientMTlsKeyPath, "UTF-8"));
 
     try (Connection connection = DriverManager.getConnection(jdbcUrl)) {
-      Assert.assertTrue(connection.isValid(0));
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through the DriverManager using
-   * a connection url and properties with String K-V pairs.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using a connection url and properties with String K-V pairs.
    *
    * @throws Exception on error.
    */
   @Test
-  public void testTLSConnectionPropertyTrueCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
-      throws Exception {
+  public void
+      testTLSConnectionPropertyTrueCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
+          throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
@@ -291,23 +295,25 @@ public void testTLSConnectionPropertyTrueCorrectCastUrlAndPropertiesUsingSetProp
 
     properties.setProperty(ArrowFlightConnectionProperty.USER.camelName(), userTest);
     properties.setProperty(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
-    properties.setProperty(ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(), tlsRootCertsPath);
+    properties.setProperty(
+        ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(), tlsRootCertsPath);
     properties.setProperty(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), "true");
-    properties.setProperty(ArrowFlightConnectionProperty.CLIENT_CERTIFICATE.camelName(), clientMTlsCertPath);
+    properties.setProperty(
+        ArrowFlightConnectionProperty.CLIENT_CERTIFICATE.camelName(), clientMTlsCertPath);
     properties.setProperty(ArrowFlightConnectionProperty.CLIENT_KEY.camelName(), clientMTlsKeyPath);
 
-    final String jdbcUrl = String.format(
-            "jdbc:arrow-flight-sql://localhost:%s",
-            FLIGHT_SERVER_TEST_RULE.getPort());
+    final String jdbcUrl =
+        String.format(
+            "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort());
 
     try (Connection connection = DriverManager.getConnection(jdbcUrl, properties)) {
-      Assert.assertTrue(connection.isValid(0));
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through the DriverManager using
-   * a connection url and properties with Object K-V pairs.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using a connection url and properties with Object K-V pairs.
    *
    * @throws Exception on error.
    */
@@ -323,21 +329,22 @@ public void testTLSConnectionPropertyTrueCorrectCastUrlAndPropertiesUsingPutWith
     properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
     properties.put(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), true);
     properties.put(ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(), tlsRootCertsPath);
-    properties.put(ArrowFlightConnectionProperty.CLIENT_CERTIFICATE.camelName(), clientMTlsCertPath);
+    properties.put(
+        ArrowFlightConnectionProperty.CLIENT_CERTIFICATE.camelName(), clientMTlsCertPath);
     properties.put(ArrowFlightConnectionProperty.CLIENT_KEY.camelName(), clientMTlsKeyPath);
 
-    final String jdbcUrl = String.format(
-            "jdbc:arrow-flight-sql://localhost:%s",
-            FLIGHT_SERVER_TEST_RULE.getPort());
+    final String jdbcUrl =
+        String.format(
+            "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort());
 
     try (Connection connection = DriverManager.getConnection(jdbcUrl, properties)) {
-      Assert.assertTrue(connection.isValid(0));
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through the DriverManager using
-   * just a connection url and using 0 and 1 as ssl values.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using just a connection url and using 0 and 1 as ssl values.
    *
    * @throws Exception on error.
    */
@@ -347,10 +354,11 @@ public void testTLSConnectionPropertyTrueIntegerCorrectCastUrlWithDriverManager(
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
-    final String jdbcUrl = String.format(
-            "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s" +
-                    "&useEncryption=1&useSystemTrustStore=0&%s=%s&%s=%s&%s=%s",
-            FLIGHT_SERVER_TEST_RULE.getPort(),
+    final String jdbcUrl =
+        String.format(
+            "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s"
+                + "&useEncryption=1&useSystemTrustStore=0&%s=%s&%s=%s&%s=%s",
+            FLIGHT_SERVER_TEST_EXTENSION.getPort(),
             userTest,
             passTest,
             ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(),
@@ -361,19 +369,21 @@ public void testTLSConnectionPropertyTrueIntegerCorrectCastUrlWithDriverManager(
             URLEncoder.encode(clientMTlsKeyPath, "UTF-8"));
 
     try (Connection connection = DriverManager.getConnection(jdbcUrl)) {
-      Assert.assertTrue(connection.isValid(0));
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through the DriverManager using
-   * a connection url and properties with String K-V pairs and using 0 and 1 as ssl values.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using a connection url and properties with String K-V pairs and using 0 and 1 as
+   * ssl values.
    *
    * @throws Exception on error.
    */
   @Test
-  public void testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
-      throws Exception {
+  public void
+      testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
+          throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
@@ -381,27 +391,33 @@ public void testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsing
 
     properties.setProperty(ArrowFlightConnectionProperty.USER.camelName(), userTest);
     properties.setProperty(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
-    properties.setProperty(ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(), tlsRootCertsPath);
+    properties.setProperty(
+        ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(), tlsRootCertsPath);
     properties.setProperty(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), "1");
-    properties.setProperty(ArrowFlightConnectionProperty.CLIENT_CERTIFICATE.camelName(), clientMTlsCertPath);
+    properties.setProperty(
+        ArrowFlightConnectionProperty.CLIENT_CERTIFICATE.camelName(), clientMTlsCertPath);
     properties.setProperty(ArrowFlightConnectionProperty.CLIENT_KEY.camelName(), clientMTlsKeyPath);
 
-    final String jdbcUrl = String.format("jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_RULE.getPort());
+    final String jdbcUrl =
+        String.format(
+            "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort());
 
     try (Connection connection = DriverManager.getConnection(jdbcUrl, properties)) {
-      Assert.assertTrue(connection.isValid(0));
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through the DriverManager using
-   * a connection url and properties with Object K-V pairs and using 0 and 1 as ssl values.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using a connection url and properties with Object K-V pairs and using 0 and 1 as
+   * ssl values.
    *
    * @throws Exception on error.
    */
   @Test
-  public void testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsingPutWithDriverManager()
-      throws Exception {
+  public void
+      testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsingPutWithDriverManager()
+          throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
@@ -411,14 +427,16 @@ public void testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsing
     properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
     properties.put(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), 1);
     properties.put(ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(), tlsRootCertsPath);
-    properties.put(ArrowFlightConnectionProperty.CLIENT_CERTIFICATE.camelName(), clientMTlsCertPath);
+    properties.put(
+        ArrowFlightConnectionProperty.CLIENT_CERTIFICATE.camelName(), clientMTlsCertPath);
     properties.put(ArrowFlightConnectionProperty.CLIENT_KEY.camelName(), clientMTlsKeyPath);
 
-    final String jdbcUrl = String.format("jdbc:arrow-flight-sql://localhost:%s",
-            FLIGHT_SERVER_TEST_RULE.getPort());
+    final String jdbcUrl =
+        String.format(
+            "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort());
 
     try (Connection connection = DriverManager.getConnection(jdbcUrl, properties)) {
-      Assert.assertTrue(connection.isValid(0));
+      assertTrue(connection.isValid(0));
     }
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTest.java
index 357506b3d177c..8e872a11671c5 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTest.java
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.net.URISyntaxException;
 import java.sql.Connection;
@@ -28,7 +27,6 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Properties;
-
 import org.apache.arrow.driver.jdbc.authentication.UserPasswordAuthentication;
 import org.apache.arrow.driver.jdbc.client.ArrowFlightSqlClientHandler;
 import org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty;
@@ -36,51 +34,46 @@
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.util.AutoCloseables;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-/**
- * Tests for {@link Connection}.
- */
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+/** Tests for {@link Connection}. */
 public class ConnectionTest {
 
-  @ClassRule
-  public static final FlightServerTestRule FLIGHT_SERVER_TEST_RULE;
+  @RegisterExtension public static final FlightServerTestExtension FLIGHT_SERVER_TEST_EXTENSION;
   private static final MockFlightSqlProducer PRODUCER = new MockFlightSqlProducer();
   private static final String userTest = "user1";
   private static final String passTest = "pass1";
 
   static {
     UserPasswordAuthentication authentication =
-        new UserPasswordAuthentication.Builder()
-            .user(userTest, passTest)
-            .build();
+        new UserPasswordAuthentication.Builder().user(userTest, passTest).build();
 
-    FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
-        .authentication(authentication)
-        .producer(PRODUCER)
-        .build();
+    FLIGHT_SERVER_TEST_EXTENSION =
+        new FlightServerTestExtension.Builder()
+            .authentication(authentication)
+            .producer(PRODUCER)
+            .build();
   }
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     allocator.getChildAllocators().forEach(BufferAllocator::close);
     AutoCloseables.close(allocator);
   }
 
   /**
-   * Checks if an unencrypted connection can be established successfully when
-   * the provided valid credentials.
+   * Checks if an unencrypted connection can be established successfully when the provided valid
+   * credentials.
    *
    * @throws SQLException on error.
    */
@@ -90,67 +83,77 @@ public void testUnencryptedConnectionShouldOpenSuccessfullyWhenProvidedValidCred
     final Properties properties = new Properties();
 
     properties.put(ArrowFlightConnectionProperty.HOST.camelName(), "localhost");
-    properties.put(ArrowFlightConnectionProperty.PORT.camelName(),
-        FLIGHT_SERVER_TEST_RULE.getPort());
-    properties.put(ArrowFlightConnectionProperty.USER.camelName(),
-        userTest);
-    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(),
-        passTest);
+    properties.put(
+        ArrowFlightConnectionProperty.PORT.camelName(), FLIGHT_SERVER_TEST_EXTENSION.getPort());
+    properties.put(ArrowFlightConnectionProperty.USER.camelName(), userTest);
+    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
     properties.put("useEncryption", false);
 
-    try (Connection connection = DriverManager.getConnection(
-        "jdbc:arrow-flight-sql://" + FLIGHT_SERVER_TEST_RULE.getHost() + ":" +
-            FLIGHT_SERVER_TEST_RULE.getPort(), properties)) {
-      Assert.assertTrue(connection.isValid(300));
+    try (Connection connection =
+        DriverManager.getConnection(
+            "jdbc:arrow-flight-sql://"
+                + FLIGHT_SERVER_TEST_EXTENSION.getHost()
+                + ":"
+                + FLIGHT_SERVER_TEST_EXTENSION.getPort(),
+            properties)) {
+      assertTrue(connection.isValid(300));
     }
   }
 
   /**
-   * Checks if a token is provided it takes precedence over username/pass. In this case,
-   * the connection should fail if a token is passed in.
+   * Checks if a token is provided it takes precedence over username/pass. In this case, the
+   * connection should fail if a token is passed in.
    */
   @Test
   public void testTokenOverridesUsernameAndPasswordAuth() {
     final Properties properties = new Properties();
 
     properties.put(ArrowFlightConnectionProperty.HOST.camelName(), "localhost");
-    properties.put(ArrowFlightConnectionProperty.PORT.camelName(),
-        FLIGHT_SERVER_TEST_RULE.getPort());
-    properties.put(ArrowFlightConnectionProperty.USER.camelName(),
-        userTest);
-    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(),
-        passTest);
+    properties.put(
+        ArrowFlightConnectionProperty.PORT.camelName(), FLIGHT_SERVER_TEST_EXTENSION.getPort());
+    properties.put(ArrowFlightConnectionProperty.USER.camelName(), userTest);
+    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
     properties.put(ArrowFlightConnectionProperty.TOKEN.camelName(), "token");
     properties.put("useEncryption", false);
 
-    SQLException e = assertThrows(SQLException.class, () -> {
-      try (Connection conn = DriverManager.getConnection(
-          "jdbc:arrow-flight-sql://" + FLIGHT_SERVER_TEST_RULE.getHost() + ":" + FLIGHT_SERVER_TEST_RULE.getPort(),
-          properties)) {
-        Assert.fail();
-      }
-    });
+    SQLException e =
+        assertThrows(
+            SQLException.class,
+            () -> {
+              try (Connection conn =
+                  DriverManager.getConnection(
+                      "jdbc:arrow-flight-sql://"
+                          + FLIGHT_SERVER_TEST_EXTENSION.getHost()
+                          + ":"
+                          + FLIGHT_SERVER_TEST_EXTENSION.getPort(),
+                      properties)) {
+                fail();
+              }
+            });
     assertTrue(e.getMessage().contains("UNAUTHENTICATED"));
   }
 
-
   /**
-   * Checks if the exception SQLException is thrown when trying to establish a connection without a host.
+   * Checks if the exception SQLException is thrown when trying to establish a connection without a
+   * host.
    *
    * @throws SQLException on error.
    */
-  @Test(expected = SQLException.class)
-  public void testUnencryptedConnectionWithEmptyHost()
-      throws Exception {
+  @Test
+  public void testUnencryptedConnectionWithEmptyHost() throws Exception {
     final Properties properties = new Properties();
 
     properties.put("user", userTest);
     properties.put("password", passTest);
     final String invalidUrl = "jdbc:arrow-flight-sql://";
 
-    try (Connection conn = DriverManager.getConnection(invalidUrl, properties)) {
-      Assert.fail("Expected SQLException.");
-    }
+    assertThrows(
+        SQLException.class,
+        () -> {
+          try (Connection conn = DriverManager.getConnection(invalidUrl, properties)) {
+            fail("Expected SQLException.");
+          }
+        });
   }
 
   /**
@@ -159,47 +162,46 @@ public void testUnencryptedConnectionWithEmptyHost()
    * @throws URISyntaxException on error.
    */
   @Test
-  public void testGetBasicClientAuthenticatedShouldOpenConnection()
-      throws Exception {
+  public void testGetBasicClientAuthenticatedShouldOpenConnection() throws Exception {
 
     try (ArrowFlightSqlClientHandler client =
-             new ArrowFlightSqlClientHandler.Builder()
-                 .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
-                 .withPort(FLIGHT_SERVER_TEST_RULE.getPort())
-                 .withEncryption(false)
-                 .withUsername(userTest)
-                 .withPassword(passTest)
-                 .withBufferAllocator(allocator)
-                 .build()) {
+        new ArrowFlightSqlClientHandler.Builder()
+            .withHost(FLIGHT_SERVER_TEST_EXTENSION.getHost())
+            .withPort(FLIGHT_SERVER_TEST_EXTENSION.getPort())
+            .withEncryption(false)
+            .withUsername(userTest)
+            .withPassword(passTest)
+            .withBufferAllocator(allocator)
+            .build()) {
 
       assertNotNull(client);
     }
   }
 
   /**
-   * Checks if the exception IllegalArgumentException is thrown when trying to establish an  unencrypted
-   * connection providing with an invalid port.
+   * Checks if the exception IllegalArgumentException is thrown when trying to establish an
+   * unencrypted connection providing with an invalid port.
    *
    * @throws SQLException on error.
    */
-  @Test(expected = SQLException.class)
-  public void testUnencryptedConnectionProvidingInvalidPort()
-      throws Exception {
+  @Test
+  public void testUnencryptedConnectionProvidingInvalidPort() throws Exception {
     final Properties properties = new Properties();
 
     properties.put(ArrowFlightConnectionProperty.HOST.camelName(), "localhost");
-    properties.put(ArrowFlightConnectionProperty.USER.camelName(),
-        userTest);
-    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(),
-        passTest);
-    properties.put(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(),
-        false);
-    final String invalidUrl = "jdbc:arrow-flight-sql://" + FLIGHT_SERVER_TEST_RULE.getHost() +
-        ":" + 65537;
-
-    try (Connection conn = DriverManager.getConnection(invalidUrl, properties)) {
-      fail("Expected SQLException");
-    }
+    properties.put(ArrowFlightConnectionProperty.USER.camelName(), userTest);
+    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
+    properties.put(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), false);
+    final String invalidUrl =
+        "jdbc:arrow-flight-sql://" + FLIGHT_SERVER_TEST_EXTENSION.getHost() + ":" + 65537;
+
+    assertThrows(
+        SQLException.class,
+        () -> {
+          try (Connection conn = DriverManager.getConnection(invalidUrl, properties)) {
+            fail("Expected SQLException");
+          }
+        });
   }
 
   /**
@@ -211,18 +213,18 @@ public void testUnencryptedConnectionProvidingInvalidPort()
   public void testGetBasicClientNoAuthShouldOpenConnection() throws Exception {
 
     try (ArrowFlightSqlClientHandler client =
-             new ArrowFlightSqlClientHandler.Builder()
-                 .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
-                 .withBufferAllocator(allocator)
-                 .withEncryption(false)
-                 .build()) {
+        new ArrowFlightSqlClientHandler.Builder()
+            .withHost(FLIGHT_SERVER_TEST_EXTENSION.getHost())
+            .withBufferAllocator(allocator)
+            .withEncryption(false)
+            .build()) {
       assertNotNull(client);
     }
   }
 
   /**
-   * Checks if an unencrypted connection can be established successfully when
-   * not providing credentials.
+   * Checks if an unencrypted connection can be established successfully when not providing
+   * credentials.
    *
    * @throws SQLException on error.
    */
@@ -231,42 +233,41 @@ public void testUnencryptedConnectionShouldOpenSuccessfullyWithoutAuthentication
       throws Exception {
     final Properties properties = new Properties();
     properties.put(ArrowFlightConnectionProperty.HOST.camelName(), "localhost");
-    properties.put(ArrowFlightConnectionProperty.PORT.camelName(),
-        FLIGHT_SERVER_TEST_RULE.getPort());
-    properties.put(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(),
-        false);
-    try (Connection connection = DriverManager
-        .getConnection("jdbc:arrow-flight-sql://localhost:32010", properties)) {
-      Assert.assertTrue(connection.isValid(300));
+    properties.put(
+        ArrowFlightConnectionProperty.PORT.camelName(), FLIGHT_SERVER_TEST_EXTENSION.getPort());
+    properties.put(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), false);
+    try (Connection connection =
+        DriverManager.getConnection("jdbc:arrow-flight-sql://localhost:32010", properties)) {
+      assertTrue(connection.isValid(300));
     }
   }
 
   /**
-   * Check if an unencrypted connection throws an exception when provided with
-   * invalid credentials.
+   * Check if an unencrypted connection throws an exception when provided with invalid credentials.
    *
    * @throws SQLException The exception expected to be thrown.
    */
-  @Test(expected = SQLException.class)
+  @Test
   public void testUnencryptedConnectionShouldThrowExceptionWhenProvidedWithInvalidCredentials()
       throws Exception {
 
     final Properties properties = new Properties();
 
     properties.put(ArrowFlightConnectionProperty.HOST.camelName(), "localhost");
-    properties.put(ArrowFlightConnectionProperty.USER.camelName(),
-        "invalidUser");
-    properties.put(ArrowFlightConnectionProperty.PORT.camelName(),
-        FLIGHT_SERVER_TEST_RULE.getPort());
-    properties.put(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(),
-        false);
-    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(),
-        "invalidPassword");
-
-    try (Connection ignored = DriverManager.getConnection("jdbc:arrow-flight-sql://localhost:32010",
-        properties)) {
-      Assert.fail();
-    }
+    properties.put(ArrowFlightConnectionProperty.USER.camelName(), "invalidUser");
+    properties.put(
+        ArrowFlightConnectionProperty.PORT.camelName(), FLIGHT_SERVER_TEST_EXTENSION.getPort());
+    properties.put(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), false);
+    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(), "invalidPassword");
+
+    assertThrows(
+        SQLException.class,
+        () -> {
+          try (Connection ignored =
+              DriverManager.getConnection("jdbc:arrow-flight-sql://localhost:32010", properties)) {
+            fail();
+          }
+        });
   }
 
   /**
@@ -280,13 +281,12 @@ public void testTLSConnectionPropertyFalseCorrectCastUrlWithDriverManager() thro
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
-    try (Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s&useEncryption=false",
-            FLIGHT_SERVER_TEST_RULE.getPort(),
-            userTest,
-            passTest))) {
-      Assert.assertTrue(connection.isValid(0));
+    try (Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s&useEncryption=false",
+                FLIGHT_SERVER_TEST_EXTENSION.getPort(), userTest, passTest))) {
+      assertTrue(connection.isValid(0));
     }
   }
 
@@ -297,25 +297,24 @@ public void testTLSConnectionPropertyFalseCorrectCastUrlWithDriverManager() thro
    * @throws Exception on error.
    */
   @Test
-  public void testTLSConnectionPropertyFalseCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
-      throws Exception {
+  public void
+      testTLSConnectionPropertyFalseCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
+          throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
     Properties properties = new Properties();
 
-    properties.setProperty(ArrowFlightConnectionProperty.USER.camelName(),
-        userTest);
-    properties.setProperty(ArrowFlightConnectionProperty.PASSWORD.camelName(),
-        passTest);
+    properties.setProperty(ArrowFlightConnectionProperty.USER.camelName(), userTest);
+    properties.setProperty(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
     properties.setProperty(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), "false");
 
-    try (Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s",
-            FLIGHT_SERVER_TEST_RULE.getPort()),
-        properties)) {
-      Assert.assertTrue(connection.isValid(0));
+    try (Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort()),
+            properties)) {
+      assertTrue(connection.isValid(0));
     }
   }
 
@@ -332,18 +331,16 @@ public void testTLSConnectionPropertyFalseCorrectCastUrlAndPropertiesUsingPutWit
     DriverManager.registerDriver(driver);
 
     Properties properties = new Properties();
-    properties.put(ArrowFlightConnectionProperty.USER.camelName(),
-        userTest);
-    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(),
-        passTest);
+    properties.put(ArrowFlightConnectionProperty.USER.camelName(), userTest);
+    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
     properties.put(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), false);
 
-    try (Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s",
-            FLIGHT_SERVER_TEST_RULE.getPort()),
-        properties)) {
-      Assert.assertTrue(connection.isValid(0));
+    try (Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort()),
+            properties)) {
+      assertTrue(connection.isValid(0));
     }
   }
 
@@ -359,71 +356,68 @@ public void testTLSConnectionPropertyFalseIntegerCorrectCastUrlWithDriverManager
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
-    try (Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s&useEncryption=0",
-            FLIGHT_SERVER_TEST_RULE.getPort(),
-            userTest,
-            passTest))) {
-      Assert.assertTrue(connection.isValid(0));
+    try (Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s&useEncryption=0",
+                FLIGHT_SERVER_TEST_EXTENSION.getPort(), userTest, passTest))) {
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
    * Check if an non-encrypted connection can be established successfully when connecting through
-   * the DriverManager using a connection url and properties with String K-V pairs and using
-   * 0 and 1 as ssl values.
+   * the DriverManager using a connection url and properties with String K-V pairs and using 0 and 1
+   * as ssl values.
    *
    * @throws Exception on error.
    */
   @Test
-  public void testTLSConnectionPropertyFalseIntegerCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
-      throws Exception {
+  public void
+      testTLSConnectionPropertyFalseIntegerCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
+          throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
     Properties properties = new Properties();
 
-    properties.setProperty(ArrowFlightConnectionProperty.USER.camelName(),
-        userTest);
-    properties.setProperty(ArrowFlightConnectionProperty.PASSWORD.camelName(),
-        passTest);
+    properties.setProperty(ArrowFlightConnectionProperty.USER.camelName(), userTest);
+    properties.setProperty(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
     properties.setProperty(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), "0");
 
-    try (Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s",
-            FLIGHT_SERVER_TEST_RULE.getPort()),
-        properties)) {
-      Assert.assertTrue(connection.isValid(0));
+    try (Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort()),
+            properties)) {
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
    * Check if an non-encrypted connection can be established successfully when connecting through
-   * the DriverManager using a connection url and properties with Object K-V pairs and using
-   * 0 and 1 as ssl values.
+   * the DriverManager using a connection url and properties with Object K-V pairs and using 0 and 1
+   * as ssl values.
    *
    * @throws Exception on error.
    */
   @Test
-  public void testTLSConnectionPropertyFalseIntegerCorrectCastUrlAndPropertiesUsingPutWithDriverManager()
-      throws Exception {
+  public void
+      testTLSConnectionPropertyFalseIntegerCorrectCastUrlAndPropertiesUsingPutWithDriverManager()
+          throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
     Properties properties = new Properties();
-    properties.put(ArrowFlightConnectionProperty.USER.camelName(),
-        userTest);
-    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(),
-        passTest);
+    properties.put(ArrowFlightConnectionProperty.USER.camelName(), userTest);
+    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
     properties.put(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), 0);
 
-    try (Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s",
-            FLIGHT_SERVER_TEST_RULE.getPort()),
-        properties)) {
-      Assert.assertTrue(connection.isValid(0));
+    try (Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort()),
+            properties)) {
+      assertTrue(connection.isValid(0));
     }
   }
 
@@ -439,74 +433,70 @@ public void testThreadPoolSizeConnectionPropertyCorrectCastUrlWithDriverManager(
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
-    try (Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s&threadPoolSize=1&useEncryption=%s",
-            FLIGHT_SERVER_TEST_RULE.getPort(),
-            userTest,
-            passTest,
-            false))) {
-      Assert.assertTrue(connection.isValid(0));
+    try (Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s&threadPoolSize=1&useEncryption=%s",
+                FLIGHT_SERVER_TEST_EXTENSION.getPort(), userTest, passTest, false))) {
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
    * Check if an non-encrypted connection can be established successfully when connecting through
-   * the DriverManager using a connection url and properties with String K-V pairs and using
-   * 0 and 1 as ssl values.
+   * the DriverManager using a connection url and properties with String K-V pairs and using 0 and 1
+   * as ssl values.
    *
    * @throws Exception on error.
    */
   @Test
-  public void testThreadPoolSizeConnectionPropertyCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
-      throws Exception {
+  public void
+      testThreadPoolSizeConnectionPropertyCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
+          throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
     Properties properties = new Properties();
 
-    properties.setProperty(ArrowFlightConnectionProperty.USER.camelName(),
-        userTest);
-    properties.setProperty(ArrowFlightConnectionProperty.PASSWORD.camelName(),
-        passTest);
+    properties.setProperty(ArrowFlightConnectionProperty.USER.camelName(), userTest);
+    properties.setProperty(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
     properties.setProperty(ArrowFlightConnectionProperty.THREAD_POOL_SIZE.camelName(), "1");
     properties.put("useEncryption", false);
 
-    try (Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s",
-            FLIGHT_SERVER_TEST_RULE.getPort()),
-        properties)) {
-      Assert.assertTrue(connection.isValid(0));
+    try (Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort()),
+            properties)) {
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
    * Check if an non-encrypted connection can be established successfully when connecting through
-   * the DriverManager using a connection url and properties with Object K-V pairs and using
-   * 0 and 1 as ssl values.
+   * the DriverManager using a connection url and properties with Object K-V pairs and using 0 and 1
+   * as ssl values.
    *
    * @throws Exception on error.
    */
   @Test
-  public void testThreadPoolSizeConnectionPropertyCorrectCastUrlAndPropertiesUsingPutWithDriverManager()
-      throws Exception {
+  public void
+      testThreadPoolSizeConnectionPropertyCorrectCastUrlAndPropertiesUsingPutWithDriverManager()
+          throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
     Properties properties = new Properties();
-    properties.put(ArrowFlightConnectionProperty.USER.camelName(),
-        userTest);
-    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(),
-        passTest);
+    properties.put(ArrowFlightConnectionProperty.USER.camelName(), userTest);
+    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
     properties.put(ArrowFlightConnectionProperty.THREAD_POOL_SIZE.camelName(), 1);
     properties.put("useEncryption", false);
 
-    try (Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s",
-            FLIGHT_SERVER_TEST_RULE.getPort()),
-        properties)) {
-      Assert.assertTrue(connection.isValid(0));
+    try (Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort()),
+            properties)) {
+      assertTrue(connection.isValid(0));
     }
   }
 
@@ -522,72 +512,68 @@ public void testPasswordConnectionPropertyIntegerCorrectCastUrlWithDriverManager
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
-    try (Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s&useEncryption=%s",
-            FLIGHT_SERVER_TEST_RULE.getPort(),
-            userTest,
-            passTest,
-            false))) {
-      Assert.assertTrue(connection.isValid(0));
+    try (Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s&useEncryption=%s",
+                FLIGHT_SERVER_TEST_EXTENSION.getPort(), userTest, passTest, false))) {
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
    * Check if an non-encrypted connection can be established successfully when connecting through
-   * the DriverManager using a connection url and properties with String K-V pairs and using
-   * 0 and 1 as ssl values.
+   * the DriverManager using a connection url and properties with String K-V pairs and using 0 and 1
+   * as ssl values.
    *
    * @throws Exception on error.
    */
   @Test
-  public void testPasswordConnectionPropertyIntegerCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
-      throws Exception {
+  public void
+      testPasswordConnectionPropertyIntegerCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
+          throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
     Properties properties = new Properties();
 
-    properties.setProperty(ArrowFlightConnectionProperty.USER.camelName(),
-        userTest);
-    properties.setProperty(ArrowFlightConnectionProperty.PASSWORD.camelName(),
-        passTest);
+    properties.setProperty(ArrowFlightConnectionProperty.USER.camelName(), userTest);
+    properties.setProperty(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
     properties.put("useEncryption", false);
 
-    try (Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s",
-            FLIGHT_SERVER_TEST_RULE.getPort()),
-        properties)) {
-      Assert.assertTrue(connection.isValid(0));
+    try (Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort()),
+            properties)) {
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
    * Check if an non-encrypted connection can be established successfully when connecting through
-   * the DriverManager using a connection url and properties with Object K-V pairs and using
-   * 0 and 1 as ssl values.
+   * the DriverManager using a connection url and properties with Object K-V pairs and using 0 and 1
+   * as ssl values.
    *
    * @throws Exception on error.
    */
   @Test
-  public void testPasswordConnectionPropertyIntegerCorrectCastUrlAndPropertiesUsingPutWithDriverManager()
-      throws Exception {
+  public void
+      testPasswordConnectionPropertyIntegerCorrectCastUrlAndPropertiesUsingPutWithDriverManager()
+          throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
     Properties properties = new Properties();
-    properties.put(ArrowFlightConnectionProperty.USER.camelName(),
-        userTest);
-    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(),
-        passTest);
+    properties.put(ArrowFlightConnectionProperty.USER.camelName(), userTest);
+    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
     properties.put("useEncryption", false);
 
-    try (Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s",
-            FLIGHT_SERVER_TEST_RULE.getPort()),
-        properties)) {
-      Assert.assertTrue(connection.isValid(0));
+    try (Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort()),
+            properties)) {
+      assertTrue(connection.isValid(0));
     }
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsRootCertsTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsRootCertsTest.java
index e5ffc2bcf79c8..f46ab1fa1c373 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsRootCertsTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsRootCertsTest.java
@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.net.URLEncoder;
 import java.sql.Connection;
@@ -26,7 +27,6 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Properties;
-
 import org.apache.arrow.driver.jdbc.authentication.UserPasswordAuthentication;
 import org.apache.arrow.driver.jdbc.client.ArrowFlightSqlClientHandler;
 import org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty;
@@ -35,20 +35,15 @@
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.util.AutoCloseables;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
-
-/**
- * Tests encrypted connections.
- */
+/** Tests encrypted connections. */
 public class ConnectionTlsRootCertsTest {
 
-  @ClassRule
-  public static final FlightServerTestRule FLIGHT_SERVER_TEST_RULE;
+  @RegisterExtension public static final FlightServerTestExtension FLIGHT_SERVER_TEST_EXTENSION;
   private static final String tlsRootCertsPath;
   private static final String badTlsRootCertsPath;
   private static final MockFlightSqlProducer PRODUCER = new MockFlightSqlProducer();
@@ -56,32 +51,32 @@ public class ConnectionTlsRootCertsTest {
   private static final String passTest = "pass1";
 
   static {
-    final FlightSqlTestCertificates.CertKeyPair
-        certKey = FlightSqlTestCertificates.exampleTlsCerts().get(0);
+    final FlightSqlTestCertificates.CertKeyPair certKey =
+        FlightSqlTestCertificates.exampleTlsCerts().get(0);
 
     tlsRootCertsPath = certKey.cert.getPath();
 
     badTlsRootCertsPath = certKey.cert.getPath() + ".bad";
 
-    UserPasswordAuthentication authentication = new UserPasswordAuthentication.Builder()
-            .user(userTest, passTest)
-            .build();
+    UserPasswordAuthentication authentication =
+        new UserPasswordAuthentication.Builder().user(userTest, passTest).build();
 
-    FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
-        .authentication(authentication)
-        .useEncryption(certKey.cert, certKey.key)
-        .producer(PRODUCER)
-        .build();
+    FLIGHT_SERVER_TEST_EXTENSION =
+        new FlightServerTestExtension.Builder()
+            .authentication(authentication)
+            .useEncryption(certKey.cert, certKey.key)
+            .producer(PRODUCER)
+            .build();
   }
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     allocator.getChildAllocators().forEach(BufferAllocator::close);
     AutoCloseables.close(allocator);
@@ -96,35 +91,38 @@ public void tearDown() throws Exception {
   public void testGetEncryptedClientAuthenticated() throws Exception {
 
     try (ArrowFlightSqlClientHandler client =
-             new ArrowFlightSqlClientHandler.Builder()
-                 .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
-                 .withPort(FLIGHT_SERVER_TEST_RULE.getPort())
-                 .withUsername(userTest)
-                 .withPassword(passTest)
-                 .withTlsRootCertificates(tlsRootCertsPath)
-                 .withBufferAllocator(allocator)
-                 .withEncryption(true)
-                 .build()) {
+        new ArrowFlightSqlClientHandler.Builder()
+            .withHost(FLIGHT_SERVER_TEST_EXTENSION.getHost())
+            .withPort(FLIGHT_SERVER_TEST_EXTENSION.getPort())
+            .withUsername(userTest)
+            .withPassword(passTest)
+            .withTlsRootCertificates(tlsRootCertsPath)
+            .withBufferAllocator(allocator)
+            .withEncryption(true)
+            .build()) {
       assertNotNull(client);
     }
   }
 
   /**
-   * Try to instantiate an encrypted FlightClient providing a bad TLS Root Certs Path. It's expected to
-   * receive the SQLException.
+   * Try to instantiate an encrypted FlightClient providing a bad TLS Root Certs Path. It's expected
+   * to receive the SQLException.
    */
   @Test
   public void testGetEncryptedClientWithNoCertificateOnKeyStore() {
-    assertThrows(SQLException.class, () -> {
-      try (ArrowFlightSqlClientHandler handler = new ArrowFlightSqlClientHandler.Builder()
-          .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
-          .withTlsRootCertificates(badTlsRootCertsPath)
-          .withBufferAllocator(allocator)
-          .withEncryption(true)
-          .build()) {
-        Assert.fail();
-      }
-    });
+    assertThrows(
+        SQLException.class,
+        () -> {
+          try (ArrowFlightSqlClientHandler handler =
+              new ArrowFlightSqlClientHandler.Builder()
+                  .withHost(FLIGHT_SERVER_TEST_EXTENSION.getHost())
+                  .withTlsRootCertificates(badTlsRootCertsPath)
+                  .withBufferAllocator(allocator)
+                  .withEncryption(true)
+                  .build()) {
+            fail();
+          }
+        });
   }
 
   /**
@@ -135,19 +133,19 @@ public void testGetEncryptedClientWithNoCertificateOnKeyStore() {
   @Test
   public void testGetNonAuthenticatedEncryptedClientNoAuth() throws Exception {
     try (ArrowFlightSqlClientHandler client =
-             new ArrowFlightSqlClientHandler.Builder()
-                 .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
-                 .withTlsRootCertificates(tlsRootCertsPath)
-                 .withBufferAllocator(allocator)
-                 .withEncryption(true)
-                 .build()) {
+        new ArrowFlightSqlClientHandler.Builder()
+            .withHost(FLIGHT_SERVER_TEST_EXTENSION.getHost())
+            .withTlsRootCertificates(tlsRootCertsPath)
+            .withBufferAllocator(allocator)
+            .withEncryption(true)
+            .build()) {
       assertNotNull(client);
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when the
-   * provided valid credentials and a valid TLS Root Certs path.
+   * Check if an encrypted connection can be established successfully when the provided valid
+   * credentials and a valid TLS Root Certs path.
    *
    * @throws Exception on error.
    */
@@ -156,25 +154,22 @@ public void testGetEncryptedConnectionWithValidCredentialsAndTlsRootsPath() thro
     final Properties properties = new Properties();
 
     properties.put(ArrowFlightConnectionProperty.HOST.camelName(), "localhost");
-    properties.put(ArrowFlightConnectionProperty.PORT.camelName(),
-        FLIGHT_SERVER_TEST_RULE.getPort());
-    properties.put(ArrowFlightConnectionProperty.USER.camelName(),
-        userTest);
-    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(),
-        passTest);
-    properties.put(ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(),
-        tlsRootCertsPath);
+    properties.put(
+        ArrowFlightConnectionProperty.PORT.camelName(), FLIGHT_SERVER_TEST_EXTENSION.getPort());
+    properties.put(ArrowFlightConnectionProperty.USER.camelName(), userTest);
+    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
+    properties.put(ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(), tlsRootCertsPath);
 
     final ArrowFlightJdbcDataSource dataSource =
         ArrowFlightJdbcDataSource.createNewDataSource(properties);
     try (final Connection connection = dataSource.getConnection()) {
-      Assert.assertTrue(connection.isValid(300));
+      assertTrue(connection.isValid(300));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when not
-   * providing authentication.
+   * Check if an encrypted connection can be established successfully when not providing
+   * authentication.
    *
    * @throws Exception on error.
    */
@@ -182,20 +177,23 @@ public void testGetEncryptedConnectionWithValidCredentialsAndTlsRootsPath() thro
   public void testGetNonAuthenticatedEncryptedConnection() throws Exception {
     final Properties properties = new Properties();
 
-    properties.put(ArrowFlightConnectionProperty.HOST.camelName(), FLIGHT_SERVER_TEST_RULE.getHost());
-    properties.put(ArrowFlightConnectionProperty.PORT.camelName(), FLIGHT_SERVER_TEST_RULE.getPort());
+    properties.put(
+        ArrowFlightConnectionProperty.HOST.camelName(), FLIGHT_SERVER_TEST_EXTENSION.getHost());
+    properties.put(
+        ArrowFlightConnectionProperty.PORT.camelName(), FLIGHT_SERVER_TEST_EXTENSION.getPort());
     properties.put(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), true);
     properties.put(ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(), tlsRootCertsPath);
 
-    final ArrowFlightJdbcDataSource dataSource = ArrowFlightJdbcDataSource.createNewDataSource(properties);
+    final ArrowFlightJdbcDataSource dataSource =
+        ArrowFlightJdbcDataSource.createNewDataSource(properties);
     try (final Connection connection = dataSource.getConnection()) {
-      Assert.assertTrue(connection.isValid(300));
+      assertTrue(connection.isValid(300));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through
-   * the DriverManager using just a connection url.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using just a connection url.
    *
    * @throws Exception on error.
    */
@@ -204,28 +202,30 @@ public void testTLSConnectionPropertyTrueCorrectCastUrlWithDriverManager() throw
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
-    try (final Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s" +
-                "&useEncryption=true&%s=%s",
-            FLIGHT_SERVER_TEST_RULE.getPort(),
-            userTest,
-            passTest,
-            ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(),
-            URLEncoder.encode(tlsRootCertsPath, "UTF-8")))) {
-      Assert.assertTrue(connection.isValid(0));
+    try (final Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s"
+                    + "&useEncryption=true&%s=%s",
+                FLIGHT_SERVER_TEST_EXTENSION.getPort(),
+                userTest,
+                passTest,
+                ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(),
+                URLEncoder.encode(tlsRootCertsPath, "UTF-8")))) {
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through the DriverManager using
-   * a connection url and properties with String K-V pairs.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using a connection url and properties with String K-V pairs.
    *
    * @throws Exception on error.
    */
   @Test
-  public void testTLSConnectionPropertyTrueCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
-      throws Exception {
+  public void
+      testTLSConnectionPropertyTrueCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
+          throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
@@ -233,21 +233,22 @@ public void testTLSConnectionPropertyTrueCorrectCastUrlAndPropertiesUsingSetProp
 
     properties.setProperty(ArrowFlightConnectionProperty.USER.camelName(), userTest);
     properties.setProperty(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
-    properties.setProperty(ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(), tlsRootCertsPath);
+    properties.setProperty(
+        ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(), tlsRootCertsPath);
     properties.setProperty(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), "true");
 
-    try (final Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s",
-            FLIGHT_SERVER_TEST_RULE.getPort()),
-        properties)) {
-      Assert.assertTrue(connection.isValid(0));
+    try (final Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort()),
+            properties)) {
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through the DriverManager using
-   * a connection url and properties with Object K-V pairs.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using a connection url and properties with Object K-V pairs.
    *
    * @throws Exception on error.
    */
@@ -264,18 +265,18 @@ public void testTLSConnectionPropertyTrueCorrectCastUrlAndPropertiesUsingPutWith
     properties.put(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), true);
     properties.put(ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(), tlsRootCertsPath);
 
-    try (final Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s",
-            FLIGHT_SERVER_TEST_RULE.getPort()),
-        properties)) {
-      Assert.assertTrue(connection.isValid(0));
+    try (final Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort()),
+            properties)) {
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through the DriverManager using
-   * just a connection url and using 0 and 1 as ssl values.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using just a connection url and using 0 and 1 as ssl values.
    *
    * @throws Exception on error.
    */
@@ -285,28 +286,31 @@ public void testTLSConnectionPropertyTrueIntegerCorrectCastUrlWithDriverManager(
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
-    try (final Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s" +
-                "&useEncryption=1&useSystemTrustStore=0&%s=%s",
-            FLIGHT_SERVER_TEST_RULE.getPort(),
-            userTest,
-            passTest,
-            ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(),
-            URLEncoder.encode(tlsRootCertsPath, "UTF-8")))) {
-      Assert.assertTrue(connection.isValid(0));
+    try (final Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s"
+                    + "&useEncryption=1&useSystemTrustStore=0&%s=%s",
+                FLIGHT_SERVER_TEST_EXTENSION.getPort(),
+                userTest,
+                passTest,
+                ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(),
+                URLEncoder.encode(tlsRootCertsPath, "UTF-8")))) {
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through the DriverManager using
-   * a connection url and properties with String K-V pairs and using 0 and 1 as ssl values.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using a connection url and properties with String K-V pairs and using 0 and 1 as
+   * ssl values.
    *
    * @throws Exception on error.
    */
   @Test
-  public void testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
-      throws Exception {
+  public void
+      testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
+          throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
@@ -314,25 +318,30 @@ public void testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsing
 
     properties.setProperty(ArrowFlightConnectionProperty.USER.camelName(), userTest);
     properties.setProperty(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
-    properties.setProperty(ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(), tlsRootCertsPath);
+    properties.setProperty(
+        ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(), tlsRootCertsPath);
     properties.setProperty(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), "1");
 
-    try (final Connection connection = DriverManager.getConnection(
-        String.format("jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_RULE.getPort()),
-        properties)) {
-      Assert.assertTrue(connection.isValid(0));
+    try (final Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort()),
+            properties)) {
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through the DriverManager using
-   * a connection url and properties with Object K-V pairs and using 0 and 1 as ssl values.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using a connection url and properties with Object K-V pairs and using 0 and 1 as
+   * ssl values.
    *
    * @throws Exception on error.
    */
   @Test
-  public void testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsingPutWithDriverManager()
-      throws Exception {
+  public void
+      testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsingPutWithDriverManager()
+          throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
@@ -343,11 +352,12 @@ public void testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsing
     properties.put(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), 1);
     properties.put(ArrowFlightConnectionProperty.TLS_ROOT_CERTS.camelName(), tlsRootCertsPath);
 
-    try (final Connection connection = DriverManager.getConnection(
-        String.format("jdbc:arrow-flight-sql://localhost:%s",
-            FLIGHT_SERVER_TEST_RULE.getPort()),
-        properties)) {
-      Assert.assertTrue(connection.isValid(0));
+    try (final Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort()),
+            properties)) {
+      assertTrue(connection.isValid(0));
     }
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsTest.java
index f5a7b68e06cd8..387436afe99d2 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsTest.java
@@ -14,10 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.net.URLEncoder;
 import java.nio.file.Paths;
@@ -26,7 +28,6 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Properties;
-
 import org.apache.arrow.driver.jdbc.authentication.UserPasswordAuthentication;
 import org.apache.arrow.driver.jdbc.client.ArrowFlightSqlClientHandler;
 import org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty;
@@ -36,36 +37,32 @@
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.util.Preconditions;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-/**
- * Tests encrypted connections.
- */
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+/** Tests encrypted connections. */
 public class ConnectionTlsTest {
 
-  @ClassRule
-  public static final FlightServerTestRule FLIGHT_SERVER_TEST_RULE;
+  @RegisterExtension public static final FlightServerTestExtension FLIGHT_SERVER_TEST_EXTENSION;
   private static final MockFlightSqlProducer PRODUCER = new MockFlightSqlProducer();
   private static final String userTest = "user1";
   private static final String passTest = "pass1";
 
   static {
-    final FlightSqlTestCertificates.CertKeyPair
-        certKey = FlightSqlTestCertificates.exampleTlsCerts().get(0);
+    final FlightSqlTestCertificates.CertKeyPair certKey =
+        FlightSqlTestCertificates.exampleTlsCerts().get(0);
 
-    UserPasswordAuthentication authentication = new UserPasswordAuthentication.Builder()
-            .user(userTest, passTest)
-            .build();
+    UserPasswordAuthentication authentication =
+        new UserPasswordAuthentication.Builder().user(userTest, passTest).build();
 
-    FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
-        .authentication(authentication)
-        .useEncryption(certKey.cert, certKey.key)
-        .producer(PRODUCER)
-        .build();
+    FLIGHT_SERVER_TEST_EXTENSION =
+        new FlightServerTestExtension.Builder()
+            .authentication(authentication)
+            .useEncryption(certKey.cert, certKey.key)
+            .producer(PRODUCER)
+            .build();
   }
 
   private String trustStorePath;
@@ -73,16 +70,20 @@ public class ConnectionTlsTest {
   private final String trustStorePass = "flight";
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
-    trustStorePath = Paths.get(
-        Preconditions.checkNotNull(getClass().getResource("/keys/keyStore.jks")).toURI()).toString();
-    noCertificateKeyStorePath = Paths.get(
-        Preconditions.checkNotNull(getClass().getResource("/keys/noCertificate.jks")).toURI()).toString();
+    trustStorePath =
+        Paths.get(Preconditions.checkNotNull(getClass().getResource("/keys/keyStore.jks")).toURI())
+            .toString();
+    noCertificateKeyStorePath =
+        Paths.get(
+                Preconditions.checkNotNull(getClass().getResource("/keys/noCertificate.jks"))
+                    .toURI())
+            .toString();
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     allocator.getChildAllocators().forEach(BufferAllocator::close);
     AutoCloseables.close(allocator);
@@ -97,15 +98,15 @@ public void tearDown() throws Exception {
   public void testGetEncryptedClientAuthenticatedWithDisableCertVerification() throws Exception {
 
     try (ArrowFlightSqlClientHandler client =
-             new ArrowFlightSqlClientHandler.Builder()
-                 .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
-                 .withPort(FLIGHT_SERVER_TEST_RULE.getPort())
-                 .withUsername(userTest)
-                 .withPassword(passTest)
-                 .withDisableCertificateVerification(true)
-                 .withBufferAllocator(allocator)
-                 .withEncryption(true)
-                 .build()) {
+        new ArrowFlightSqlClientHandler.Builder()
+            .withHost(FLIGHT_SERVER_TEST_EXTENSION.getHost())
+            .withPort(FLIGHT_SERVER_TEST_EXTENSION.getPort())
+            .withUsername(userTest)
+            .withPassword(passTest)
+            .withDisableCertificateVerification(true)
+            .withBufferAllocator(allocator)
+            .withEncryption(true)
+            .build()) {
       assertNotNull(client);
     }
   }
@@ -119,42 +120,46 @@ public void testGetEncryptedClientAuthenticatedWithDisableCertVerification() thr
   public void testGetEncryptedClientAuthenticated() throws Exception {
 
     try (ArrowFlightSqlClientHandler client =
-             new ArrowFlightSqlClientHandler.Builder()
-                 .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
-                 .withPort(FLIGHT_SERVER_TEST_RULE.getPort())
-                 .withSystemTrustStore(false)
-                 .withUsername(userTest)
-                 .withPassword(passTest)
-                 .withTrustStorePath(trustStorePath)
-                 .withTrustStorePassword(trustStorePass)
-                 .withBufferAllocator(allocator)
-                 .withEncryption(true)
-                 .build()) {
+        new ArrowFlightSqlClientHandler.Builder()
+            .withHost(FLIGHT_SERVER_TEST_EXTENSION.getHost())
+            .withPort(FLIGHT_SERVER_TEST_EXTENSION.getPort())
+            .withSystemTrustStore(false)
+            .withUsername(userTest)
+            .withPassword(passTest)
+            .withTrustStorePath(trustStorePath)
+            .withTrustStorePassword(trustStorePass)
+            .withBufferAllocator(allocator)
+            .withEncryption(true)
+            .build()) {
       assertNotNull(client);
     }
   }
 
   /**
-   * Try to instantiate an encrypted FlightClient providing a keystore without certificate. It's expected to
-   * receive the SQLException.
+   * Try to instantiate an encrypted FlightClient providing a keystore without certificate. It's
+   * expected to receive the SQLException.
    *
    * @throws Exception on error.
    */
-  @Test(expected = SQLException.class)
+  @Test
   public void testGetEncryptedClientWithNoCertificateOnKeyStore() throws Exception {
     final String noCertificateKeyStorePassword = "flight1";
 
-    try (ArrowFlightSqlClientHandler ignored =
-             new ArrowFlightSqlClientHandler.Builder()
-                 .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
-                 .withTrustStorePath(noCertificateKeyStorePath)
-                 .withTrustStorePassword(noCertificateKeyStorePassword)
-                 .withSystemTrustStore(false)
-                 .withBufferAllocator(allocator)
-                 .withEncryption(true)
-                 .build()) {
-      Assert.fail();
-    }
+    assertThrows(
+        SQLException.class,
+        () -> {
+          try (ArrowFlightSqlClientHandler ignored =
+              new ArrowFlightSqlClientHandler.Builder()
+                  .withHost(FLIGHT_SERVER_TEST_EXTENSION.getHost())
+                  .withTrustStorePath(noCertificateKeyStorePath)
+                  .withTrustStorePassword(noCertificateKeyStorePassword)
+                  .withSystemTrustStore(false)
+                  .withBufferAllocator(allocator)
+                  .withEncryption(true)
+                  .build()) {
+            fail();
+          }
+        });
   }
 
   /**
@@ -165,14 +170,14 @@ public void testGetEncryptedClientWithNoCertificateOnKeyStore() throws Exception
   @Test
   public void testGetNonAuthenticatedEncryptedClientNoAuth() throws Exception {
     try (ArrowFlightSqlClientHandler client =
-             new ArrowFlightSqlClientHandler.Builder()
-                 .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
-                 .withSystemTrustStore(false)
-                 .withTrustStorePath(trustStorePath)
-                 .withTrustStorePassword(trustStorePass)
-                 .withBufferAllocator(allocator)
-                 .withEncryption(true)
-                 .build()) {
+        new ArrowFlightSqlClientHandler.Builder()
+            .withHost(FLIGHT_SERVER_TEST_EXTENSION.getHost())
+            .withSystemTrustStore(false)
+            .withTrustStorePath(trustStorePath)
+            .withTrustStorePassword(trustStorePass)
+            .withBufferAllocator(allocator)
+            .withEncryption(true)
+            .build()) {
       assertNotNull(client);
     }
   }
@@ -183,26 +188,30 @@ public void testGetNonAuthenticatedEncryptedClientNoAuth() throws Exception {
    *
    * @throws Exception on error.
    */
-  @Test(expected = SQLException.class)
+  @Test
   public void testGetEncryptedClientWithKeyStoreBadPasswordAndNoAuth() throws Exception {
     String keyStoreBadPassword = "badPassword";
 
-    try (ArrowFlightSqlClientHandler ignored =
-             new ArrowFlightSqlClientHandler.Builder()
-                 .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
-                 .withSystemTrustStore(false)
-                 .withTrustStorePath(trustStorePath)
-                 .withTrustStorePassword(keyStoreBadPassword)
-                 .withBufferAllocator(allocator)
-                 .withEncryption(true)
-                 .build()) {
-      Assert.fail();
-    }
+    assertThrows(
+        SQLException.class,
+        () -> {
+          try (ArrowFlightSqlClientHandler ignored =
+              new ArrowFlightSqlClientHandler.Builder()
+                  .withHost(FLIGHT_SERVER_TEST_EXTENSION.getHost())
+                  .withSystemTrustStore(false)
+                  .withTrustStorePath(trustStorePath)
+                  .withTrustStorePassword(keyStoreBadPassword)
+                  .withBufferAllocator(allocator)
+                  .withEncryption(true)
+                  .build()) {
+            fail();
+          }
+        });
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when the
-   * provided valid credentials and a valid Keystore.
+   * Check if an encrypted connection can be established successfully when the provided valid
+   * credentials and a valid Keystore.
    *
    * @throws Exception on error.
    */
@@ -211,12 +220,10 @@ public void testGetEncryptedConnectionWithValidCredentialsAndKeyStore() throws E
     final Properties properties = new Properties();
 
     properties.put(ArrowFlightConnectionProperty.HOST.camelName(), "localhost");
-    properties.put(ArrowFlightConnectionProperty.PORT.camelName(),
-        FLIGHT_SERVER_TEST_RULE.getPort());
-    properties.put(ArrowFlightConnectionProperty.USER.camelName(),
-        userTest);
-    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(),
-        passTest);
+    properties.put(
+        ArrowFlightConnectionProperty.PORT.camelName(), FLIGHT_SERVER_TEST_EXTENSION.getPort());
+    properties.put(ArrowFlightConnectionProperty.USER.camelName(), userTest);
+    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
     properties.put(ArrowFlightConnectionProperty.TRUST_STORE.camelName(), trustStorePath);
     properties.put(ArrowFlightConnectionProperty.USE_SYSTEM_TRUST_STORE.camelName(), false);
     properties.put(ArrowFlightConnectionProperty.TRUST_STORE_PASSWORD.camelName(), trustStorePass);
@@ -224,41 +231,45 @@ public void testGetEncryptedConnectionWithValidCredentialsAndKeyStore() throws E
     final ArrowFlightJdbcDataSource dataSource =
         ArrowFlightJdbcDataSource.createNewDataSource(properties);
     try (final Connection connection = dataSource.getConnection()) {
-      Assert.assertTrue(connection.isValid(300));
+      assertTrue(connection.isValid(300));
     }
   }
 
   /**
-   * Check if the SQLException is thrown when trying to establish an encrypted connection
-   * providing valid credentials but invalid password to the Keystore.
+   * Check if the SQLException is thrown when trying to establish an encrypted connection providing
+   * valid credentials but invalid password to the Keystore.
    *
    * @throws SQLException on error.
    */
-  @Test(expected = SQLException.class)
+  @Test
   public void testGetAuthenticatedEncryptedConnectionWithKeyStoreBadPassword() throws Exception {
     final Properties properties = new Properties();
 
-    properties.put(ArrowFlightConnectionProperty.HOST.camelName(),
-        FLIGHT_SERVER_TEST_RULE.getHost());
-    properties.put(ArrowFlightConnectionProperty.PORT.camelName(),
-        FLIGHT_SERVER_TEST_RULE.getPort());
-    properties.put(ArrowFlightConnectionProperty.USER.camelName(),
-        userTest);
-    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(),
-        passTest);
+    properties.put(
+        ArrowFlightConnectionProperty.HOST.camelName(), FLIGHT_SERVER_TEST_EXTENSION.getHost());
+    properties.put(
+        ArrowFlightConnectionProperty.PORT.camelName(), FLIGHT_SERVER_TEST_EXTENSION.getPort());
+    properties.put(ArrowFlightConnectionProperty.USER.camelName(), userTest);
+    properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
     properties.put(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), true);
     properties.put(ArrowFlightConnectionProperty.TRUST_STORE.camelName(), trustStorePath);
     properties.put(ArrowFlightConnectionProperty.TRUST_STORE_PASSWORD.camelName(), "badpassword");
 
     final ArrowFlightJdbcDataSource dataSource =
         ArrowFlightJdbcDataSource.createNewDataSource(properties);
-    try (final Connection ignored = dataSource.getConnection()) {
-      Assert.fail();
-    }
+
+    assertThrows(
+        SQLException.class,
+        () -> {
+          try (final Connection ignored = dataSource.getConnection()) {
+            fail();
+          }
+        });
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when not providing authentication.
+   * Check if an encrypted connection can be established successfully when not providing
+   * authentication.
    *
    * @throws Exception on error.
    */
@@ -266,22 +277,25 @@ public void testGetAuthenticatedEncryptedConnectionWithKeyStoreBadPassword() thr
   public void testGetNonAuthenticatedEncryptedConnection() throws Exception {
     final Properties properties = new Properties();
 
-    properties.put(ArrowFlightConnectionProperty.HOST.camelName(), FLIGHT_SERVER_TEST_RULE.getHost());
-    properties.put(ArrowFlightConnectionProperty.PORT.camelName(), FLIGHT_SERVER_TEST_RULE.getPort());
+    properties.put(
+        ArrowFlightConnectionProperty.HOST.camelName(), FLIGHT_SERVER_TEST_EXTENSION.getHost());
+    properties.put(
+        ArrowFlightConnectionProperty.PORT.camelName(), FLIGHT_SERVER_TEST_EXTENSION.getPort());
     properties.put(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), true);
     properties.put(ArrowFlightConnectionProperty.USE_SYSTEM_TRUST_STORE.camelName(), false);
     properties.put(ArrowFlightConnectionProperty.TRUST_STORE.camelName(), trustStorePath);
     properties.put(ArrowFlightConnectionProperty.TRUST_STORE_PASSWORD.camelName(), trustStorePass);
 
-    final ArrowFlightJdbcDataSource dataSource = ArrowFlightJdbcDataSource.createNewDataSource(properties);
+    final ArrowFlightJdbcDataSource dataSource =
+        ArrowFlightJdbcDataSource.createNewDataSource(properties);
     try (final Connection connection = dataSource.getConnection()) {
-      Assert.assertTrue(connection.isValid(300));
+      assertTrue(connection.isValid(300));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through the DriverManager using
-   * just a connection url.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using just a connection url.
    *
    * @throws Exception on error.
    */
@@ -290,30 +304,32 @@ public void testTLSConnectionPropertyTrueCorrectCastUrlWithDriverManager() throw
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
-    try (final Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s" +
-                "&useEncryption=true&useSystemTrustStore=false&%s=%s&%s=%s",
-            FLIGHT_SERVER_TEST_RULE.getPort(),
-            userTest,
-            passTest,
-            ArrowFlightConnectionProperty.TRUST_STORE.camelName(),
-            URLEncoder.encode(trustStorePath, "UTF-8"),
-            ArrowFlightConnectionProperty.TRUST_STORE_PASSWORD.camelName(),
-            URLEncoder.encode(trustStorePass, "UTF-8")))) {
-      Assert.assertTrue(connection.isValid(0));
+    try (final Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s"
+                    + "&useEncryption=true&useSystemTrustStore=false&%s=%s&%s=%s",
+                FLIGHT_SERVER_TEST_EXTENSION.getPort(),
+                userTest,
+                passTest,
+                ArrowFlightConnectionProperty.TRUST_STORE.camelName(),
+                URLEncoder.encode(trustStorePath, "UTF-8"),
+                ArrowFlightConnectionProperty.TRUST_STORE_PASSWORD.camelName(),
+                URLEncoder.encode(trustStorePass, "UTF-8")))) {
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through the DriverManager using
-   * a connection url and properties with String K-V pairs.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using a connection url and properties with String K-V pairs.
    *
    * @throws Exception on error.
    */
   @Test
-  public void testTLSConnectionPropertyTrueCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
-      throws Exception {
+  public void
+      testTLSConnectionPropertyTrueCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
+          throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
@@ -322,22 +338,24 @@ public void testTLSConnectionPropertyTrueCorrectCastUrlAndPropertiesUsingSetProp
     properties.setProperty(ArrowFlightConnectionProperty.USER.camelName(), userTest);
     properties.setProperty(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
     properties.setProperty(ArrowFlightConnectionProperty.TRUST_STORE.camelName(), trustStorePath);
-    properties.setProperty(ArrowFlightConnectionProperty.TRUST_STORE_PASSWORD.camelName(), trustStorePass);
+    properties.setProperty(
+        ArrowFlightConnectionProperty.TRUST_STORE_PASSWORD.camelName(), trustStorePass);
     properties.setProperty(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), "true");
-    properties.setProperty(ArrowFlightConnectionProperty.USE_SYSTEM_TRUST_STORE.camelName(), "false");
-
-    try (final Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s",
-            FLIGHT_SERVER_TEST_RULE.getPort()),
-        properties)) {
-      Assert.assertTrue(connection.isValid(0));
+    properties.setProperty(
+        ArrowFlightConnectionProperty.USE_SYSTEM_TRUST_STORE.camelName(), "false");
+
+    try (final Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort()),
+            properties)) {
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through the DriverManager using
-   * a connection url and properties with Object K-V pairs.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using a connection url and properties with Object K-V pairs.
    *
    * @throws Exception on error.
    */
@@ -356,18 +374,18 @@ public void testTLSConnectionPropertyTrueCorrectCastUrlAndPropertiesUsingPutWith
     properties.put(ArrowFlightConnectionProperty.TRUST_STORE.camelName(), trustStorePath);
     properties.put(ArrowFlightConnectionProperty.TRUST_STORE_PASSWORD.camelName(), trustStorePass);
 
-    try (final Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s",
-            FLIGHT_SERVER_TEST_RULE.getPort()),
-        properties)) {
-      Assert.assertTrue(connection.isValid(0));
+    try (final Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort()),
+            properties)) {
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through the DriverManager using
-   * just a connection url and using 0 and 1 as ssl values.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using just a connection url and using 0 and 1 as ssl values.
    *
    * @throws Exception on error.
    */
@@ -377,30 +395,33 @@ public void testTLSConnectionPropertyTrueIntegerCorrectCastUrlWithDriverManager(
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
-    try (final Connection connection = DriverManager.getConnection(
-        String.format(
-            "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s" +
-                "&useEncryption=1&useSystemTrustStore=0&%s=%s&%s=%s",
-            FLIGHT_SERVER_TEST_RULE.getPort(),
-            userTest,
-            passTest,
-            ArrowFlightConnectionProperty.TRUST_STORE.camelName(),
-            URLEncoder.encode(trustStorePath, "UTF-8"),
-            ArrowFlightConnectionProperty.TRUST_STORE_PASSWORD.camelName(),
-            URLEncoder.encode(trustStorePass, "UTF-8")))) {
-      Assert.assertTrue(connection.isValid(0));
+    try (final Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s?user=%s&password=%s"
+                    + "&useEncryption=1&useSystemTrustStore=0&%s=%s&%s=%s",
+                FLIGHT_SERVER_TEST_EXTENSION.getPort(),
+                userTest,
+                passTest,
+                ArrowFlightConnectionProperty.TRUST_STORE.camelName(),
+                URLEncoder.encode(trustStorePath, "UTF-8"),
+                ArrowFlightConnectionProperty.TRUST_STORE_PASSWORD.camelName(),
+                URLEncoder.encode(trustStorePass, "UTF-8")))) {
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through the DriverManager using
-   * a connection url and properties with String K-V pairs and using 0 and 1 as ssl values.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using a connection url and properties with String K-V pairs and using 0 and 1 as
+   * ssl values.
    *
    * @throws Exception on error.
    */
   @Test
-  public void testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
-      throws Exception {
+  public void
+      testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsingSetPropertyWithDriverManager()
+          throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
@@ -409,26 +430,31 @@ public void testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsing
     properties.setProperty(ArrowFlightConnectionProperty.USER.camelName(), userTest);
     properties.setProperty(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
     properties.setProperty(ArrowFlightConnectionProperty.TRUST_STORE.camelName(), trustStorePath);
-    properties.setProperty(ArrowFlightConnectionProperty.TRUST_STORE_PASSWORD.camelName(), trustStorePass);
+    properties.setProperty(
+        ArrowFlightConnectionProperty.TRUST_STORE_PASSWORD.camelName(), trustStorePass);
     properties.setProperty(ArrowFlightConnectionProperty.USE_ENCRYPTION.camelName(), "1");
     properties.setProperty(ArrowFlightConnectionProperty.USE_SYSTEM_TRUST_STORE.camelName(), "0");
 
-    try (final Connection connection = DriverManager.getConnection(
-        String.format("jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_RULE.getPort()),
-        properties)) {
-      Assert.assertTrue(connection.isValid(0));
+    try (final Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort()),
+            properties)) {
+      assertTrue(connection.isValid(0));
     }
   }
 
   /**
-   * Check if an encrypted connection can be established successfully when connecting through the DriverManager using
-   * a connection url and properties with Object K-V pairs and using 0 and 1 as ssl values.
+   * Check if an encrypted connection can be established successfully when connecting through the
+   * DriverManager using a connection url and properties with Object K-V pairs and using 0 and 1 as
+   * ssl values.
    *
    * @throws Exception on error.
    */
   @Test
-  public void testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsingPutWithDriverManager()
-      throws Exception {
+  public void
+      testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsingPutWithDriverManager()
+          throws Exception {
     final Driver driver = new ArrowFlightJdbcDriver();
     DriverManager.registerDriver(driver);
 
@@ -441,11 +467,12 @@ public void testTLSConnectionPropertyTrueIntegerCorrectCastUrlAndPropertiesUsing
     properties.put(ArrowFlightConnectionProperty.TRUST_STORE.camelName(), trustStorePath);
     properties.put(ArrowFlightConnectionProperty.TRUST_STORE_PASSWORD.camelName(), trustStorePass);
 
-    try (final Connection connection = DriverManager.getConnection(
-        String.format("jdbc:arrow-flight-sql://localhost:%s",
-            FLIGHT_SERVER_TEST_RULE.getPort()),
-        properties)) {
-      Assert.assertTrue(connection.isValid(0));
+    try (final Connection connection =
+        DriverManager.getConnection(
+            String.format(
+                "jdbc:arrow-flight-sql://localhost:%s", FLIGHT_SERVER_TEST_EXTENSION.getPort()),
+            properties)) {
+      assertTrue(connection.isValid(0));
     }
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/FlightServerTestRule.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/FlightServerTestExtension.java
similarity index 70%
rename from java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/FlightServerTestRule.java
rename to java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/FlightServerTestExtension.java
index 39eb0a29866f1..aa586651f569f 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/FlightServerTestRule.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/FlightServerTestExtension.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import static org.apache.arrow.driver.jdbc.utils.FlightSqlTestCertificates.CertKeyPair;
@@ -27,7 +26,6 @@
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.Properties;
-
 import org.apache.arrow.driver.jdbc.authentication.Authentication;
 import org.apache.arrow.driver.jdbc.authentication.TokenAuthentication;
 import org.apache.arrow.driver.jdbc.authentication.UserPasswordAuthentication;
@@ -44,21 +42,22 @@
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.util.Preconditions;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Utility class for unit tests that need to instantiate a {@link FlightServer}
- * and interact with it.
+ * Utility class for unit tests that need to instantiate a {@link FlightServer} and interact with
+ * it.
  */
-public class FlightServerTestRule implements TestRule, AutoCloseable {
+public class FlightServerTestExtension
+    implements BeforeAllCallback, AfterAllCallback, AutoCloseable {
   public static final String DEFAULT_USER = "flight-test-user";
   public static final String DEFAULT_PASSWORD = "flight-test-password";
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(FlightServerTestRule.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(FlightServerTestExtension.class);
 
   private final Properties properties;
   private final ArrowFlightConnectionConfigImpl config;
@@ -70,13 +69,14 @@ public class FlightServerTestRule implements TestRule, AutoCloseable {
 
   private final MiddlewareCookie.Factory middlewareCookieFactory = new MiddlewareCookie.Factory();
 
-  private FlightServerTestRule(final Properties properties,
-                               final ArrowFlightConnectionConfigImpl config,
-                               final BufferAllocator allocator,
-                               final FlightSqlProducer producer,
-                               final Authentication authentication,
-                               final CertKeyPair certKeyPair,
-                               final File mTlsCACert) {
+  private FlightServerTestExtension(
+      final Properties properties,
+      final ArrowFlightConnectionConfigImpl config,
+      final BufferAllocator allocator,
+      final FlightSqlProducer producer,
+      final Authentication authentication,
+      final CertKeyPair certKeyPair,
+      final File mTlsCACert) {
     this.properties = Preconditions.checkNotNull(properties);
     this.config = Preconditions.checkNotNull(config);
     this.allocator = Preconditions.checkNotNull(allocator);
@@ -87,21 +87,18 @@ private FlightServerTestRule(final Properties properties,
   }
 
   /**
-   * Create a {@link FlightServerTestRule} with standard values such as: user, password, localhost.
+   * Create a {@link FlightServerTestExtension} with standard values such as: user, password,
+   * localhost.
    *
-   * @param producer the producer used to create the FlightServerTestRule.
-   * @return the FlightServerTestRule.
+   * @param producer the producer used to create the FlightServerTestExtension.
+   * @return the FlightServerTestExtension.
    */
-  public static FlightServerTestRule createStandardTestRule(final FlightSqlProducer producer) {
+  public static FlightServerTestExtension createStandardTestExtension(
+      final FlightSqlProducer producer) {
     UserPasswordAuthentication authentication =
-        new UserPasswordAuthentication.Builder()
-            .user(DEFAULT_USER, DEFAULT_PASSWORD)
-            .build();
-
-    return new Builder()
-        .authentication(authentication)
-        .producer(producer)
-        .build();
+        new UserPasswordAuthentication.Builder().user(DEFAULT_USER, DEFAULT_PASSWORD).build();
+
+    return new Builder().authentication(authentication).producer(producer).build();
   }
 
   ArrowFlightJdbcDataSource createDataSource() {
@@ -112,7 +109,8 @@ public ArrowFlightJdbcConnectionPoolDataSource createConnectionPoolDataSource()
     return ArrowFlightJdbcConnectionPoolDataSource.createNewDataSource(properties);
   }
 
-  public ArrowFlightJdbcConnectionPoolDataSource createConnectionPoolDataSource(boolean useEncryption) {
+  public ArrowFlightJdbcConnectionPoolDataSource createConnectionPoolDataSource(
+      boolean useEncryption) {
     setUseEncryption(useEncryption);
     return ArrowFlightJdbcConnectionPoolDataSource.createNewDataSource(properties);
   }
@@ -142,9 +140,10 @@ public interface CheckedFunction<T, R> {
   }
 
   private FlightServer initiateServer(Location location) throws IOException {
-    FlightServer.Builder builder = FlightServer.builder(allocator, location, producer)
-        .headerAuthenticator(authentication.authenticate())
-        .middleware(FlightServerMiddleware.Key.of("KEY"), middlewareCookieFactory);
+    FlightServer.Builder builder =
+        FlightServer.builder(allocator, location, producer)
+            .headerAuthenticator(authentication.authenticate())
+            .middleware(FlightServerMiddleware.Key.of("KEY"), middlewareCookieFactory);
     if (certKeyPair != null) {
       builder.useTls(certKeyPair.cert, certKeyPair.key);
     }
@@ -155,27 +154,35 @@ private FlightServer initiateServer(Location location) throws IOException {
   }
 
   @Override
-  public Statement apply(Statement base, Description description) {
-    return new Statement() {
-      @Override
-      public void evaluate() throws Throwable {
-        try (FlightServer flightServer = getStartServer(location -> initiateServer(location), 3)) {
-          properties.put("port", flightServer.getPort());
-          LOGGER.info("Started " + FlightServer.class.getName() + " as " + flightServer);
-          base.evaluate();
-        } finally {
-          close();
-        }
-      }
-    };
+  public void beforeAll(ExtensionContext context) throws Exception {
+    try {
+      FlightServer flightServer = getStartServer(this::initiateServer, 3);
+      properties.put("port", flightServer.getPort());
+      LOGGER.info("Started " + FlightServer.class.getName() + " as " + flightServer);
+      context.getStore(ExtensionContext.Namespace.GLOBAL).put("flightServer", flightServer);
+    } catch (Exception e) {
+      LOGGER.error("Failed to start FlightServer", e);
+      throw e;
+    }
+  }
+
+  @Override
+  public void afterAll(ExtensionContext context) throws Exception {
+    FlightServer flightServer =
+        context.getStore(ExtensionContext.Namespace.GLOBAL).get("flightServer", FlightServer.class);
+    if (flightServer != null) {
+      flightServer.close();
+    }
+    close();
   }
 
-  private FlightServer getStartServer(CheckedFunction<Location, FlightServer> newServerFromLocation,
-                                      int retries)
+  private FlightServer getStartServer(
+      CheckedFunction<Location, FlightServer> newServerFromLocation, int retries)
       throws IOException {
     final Deque<ReflectiveOperationException> exceptions = new ArrayDeque<>();
     for (; retries > 0; retries--) {
-      final FlightServer server = newServerFromLocation.apply(Location.forGrpcInsecure("localhost", 0));
+      final FlightServer server =
+          newServerFromLocation.apply(Location.forGrpcInsecure("localhost", 0));
       try {
         Method start = server.getClass().getMethod("start");
         start.setAccessible(true);
@@ -213,9 +220,7 @@ public void close() throws Exception {
     AutoCloseables.close(allocator);
   }
 
-  /**
-   * Builder for {@link FlightServerTestRule}.
-   */
+  /** Builder for {@link FlightServerTestExtension}. */
   public static final class Builder {
     private final Properties properties;
     private FlightSqlProducer producer;
@@ -240,9 +245,8 @@ public Builder producer(final FlightSqlProducer producer) {
     }
 
     /**
-     * Sets the type of the authentication that will be used in the server rules.
-     * There are two types of authentication: {@link UserPasswordAuthentication} and
-     * {@link TokenAuthentication}.
+     * Sets the type of the authentication that will be used in the server rules. There are two
+     * types of authentication: {@link UserPasswordAuthentication} and {@link TokenAuthentication}.
      *
      * @param authentication the type of authentication.
      * @return the Builder.
@@ -256,7 +260,7 @@ public Builder authentication(final Authentication authentication) {
      * Enable TLS on the server.
      *
      * @param certChain The certificate chain to use.
-     * @param key       The private key to use.
+     * @param key The private key to use.
      * @return the Builder.
      */
     public Builder useEncryption(final File certChain, final File key) {
@@ -276,20 +280,26 @@ public Builder useMTlsClientVerification(final File mTlsCACert) {
     }
 
     /**
-     * Builds the {@link FlightServerTestRule} using the provided values.
+     * Builds the {@link FlightServerTestExtension} using the provided values.
      *
-     * @return a {@link FlightServerTestRule}.
+     * @return a {@link FlightServerTestExtension}.
      */
-    public FlightServerTestRule build() {
+    public FlightServerTestExtension build() {
       authentication.populateProperties(properties);
-      return new FlightServerTestRule(properties, new ArrowFlightConnectionConfigImpl(properties),
-          new RootAllocator(Long.MAX_VALUE), producer, authentication, certKeyPair, mTlsCACert);
+      return new FlightServerTestExtension(
+          properties,
+          new ArrowFlightConnectionConfigImpl(properties),
+          new RootAllocator(Long.MAX_VALUE),
+          producer,
+          authentication,
+          certKeyPair,
+          mTlsCACert);
     }
   }
 
   /**
-   * A middleware to handle with the cookies in the server. It is used to test if cookies are
-   * being sent properly.
+   * A middleware to handle with the cookies in the server. It is used to test if cookies are being
+   * sent properly.
    */
   static class MiddlewareCookie implements FlightServerMiddleware {
 
@@ -307,26 +317,20 @@ public void onBeforeSendingHeaders(CallHeaders callHeaders) {
     }
 
     @Override
-    public void onCallCompleted(CallStatus callStatus) {
-
-    }
+    public void onCallCompleted(CallStatus callStatus) {}
 
     @Override
-    public void onCallErrored(Throwable throwable) {
+    public void onCallErrored(Throwable throwable) {}
 
-    }
-
-    /**
-     * A factory for the MiddlewareCookie.
-     */
+    /** A factory for the MiddlewareCookie. */
     static class Factory implements FlightServerMiddleware.Factory<MiddlewareCookie> {
 
       private boolean receivedCookieHeader = false;
       private String cookie;
 
       @Override
-      public MiddlewareCookie onCallStarted(CallInfo callInfo, CallHeaders callHeaders,
-                                            RequestContext requestContext) {
+      public MiddlewareCookie onCallStarted(
+          CallInfo callInfo, CallHeaders callHeaders, RequestContext requestContext) {
         cookie = callHeaders.get("Cookie");
         receivedCookieHeader = null != cookie;
         return new MiddlewareCookie(this);
@@ -337,5 +341,4 @@ public String getCookie() {
       }
     }
   }
-
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ResultSetMetadataTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ResultSetMetadataTest.java
index 64ec7f7d9e1a5..4583194f50897 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ResultSetMetadataTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ResultSetMetadataTest.java
@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -26,51 +27,43 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Types;
-
 import org.apache.arrow.driver.jdbc.utils.CoreMockedSqlProducers;
 import org.hamcrest.CoreMatchers;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class ResultSetMetadataTest {
   private static ResultSetMetaData metadata;
 
   private static Connection connection;
 
-  @Rule
-  public ErrorCollector collector = new ErrorCollector();
-
-  @ClassRule
-  public static final FlightServerTestRule SERVER_TEST_RULE = FlightServerTestRule
-      .createStandardTestRule(CoreMockedSqlProducers.getLegacyProducer());
+  @RegisterExtension
+  public static final FlightServerTestExtension FLIGHT_SERVER_TEST_EXTENSION =
+      FlightServerTestExtension.createStandardTestExtension(
+          CoreMockedSqlProducers.getLegacyProducer());
 
-  @BeforeClass
+  @BeforeAll
   public static void setup() throws SQLException {
-    connection = SERVER_TEST_RULE.getConnection(false);
+    connection = FLIGHT_SERVER_TEST_EXTENSION.getConnection(false);
 
     try (Statement statement = connection.createStatement();
-         ResultSet resultSet = statement.executeQuery(
-             CoreMockedSqlProducers.LEGACY_METADATA_SQL_CMD)) {
+        ResultSet resultSet =
+            statement.executeQuery(CoreMockedSqlProducers.LEGACY_METADATA_SQL_CMD)) {
       metadata = resultSet.getMetaData();
     }
   }
 
-  @AfterClass
+  @AfterAll
   public static void teardown() throws SQLException {
     connection.close();
   }
 
-  /**
-   * Test if {@link ResultSetMetaData} object is not null.
-   */
+  /** Test if {@link ResultSetMetaData} object is not null. */
   @Test
   public void testShouldGetResultSetMetadata() {
-    collector.checkThat(metadata, CoreMatchers.is(notNullValue()));
+    assertThat(metadata, CoreMatchers.is(notNullValue()));
   }
 
   /**
@@ -86,7 +79,7 @@ public void testShouldGetColumnCount() throws SQLException {
   }
 
   /**
-   * Test if {@link ResultSetMetaData#getColumnTypeName(int)}  returns the correct type name for each
+   * Test if {@link ResultSetMetaData#getColumnTypeName(int)} returns the correct type name for each
    * column.
    *
    * @throws SQLException in case of error.
@@ -97,21 +90,22 @@ public void testShouldGetColumnTypesName() throws SQLException {
     final String secondColumn = metadata.getColumnTypeName(2);
     final String thirdColumn = metadata.getColumnTypeName(3);
 
-    collector.checkThat(firstColumn, equalTo("BIGINT"));
-    collector.checkThat(secondColumn, equalTo("VARCHAR"));
-    collector.checkThat(thirdColumn, equalTo("FLOAT"));
+    assertThat(firstColumn, equalTo("BIGINT"));
+    assertThat(secondColumn, equalTo("VARCHAR"));
+    assertThat(thirdColumn, equalTo("FLOAT"));
   }
 
   /**
-   * Test if {@link ResultSetMetaData#getColumnTypeName(int)} passing an column index that does not exist.
-   *
-   * @throws SQLException in case of error.
+   * Test if {@link ResultSetMetaData#getColumnTypeName(int)} passing an column index that does not
+   * exist.
    */
-  @Test(expected = IndexOutOfBoundsException.class)
-  public void testShouldGetColumnTypesNameFromOutOfBoundIndex() throws SQLException {
-    metadata.getColumnTypeName(4);
-
-    Assert.fail();
+  @Test
+  public void testShouldGetColumnTypesNameFromOutOfBoundIndex() {
+    assertThrows(
+        IndexOutOfBoundsException.class,
+        () -> {
+          metadata.getColumnTypeName(4);
+        });
   }
 
   /**
@@ -125,22 +119,18 @@ public void testShouldGetColumnNames() throws SQLException {
     final String secondColumn = metadata.getColumnName(2);
     final String thirdColumn = metadata.getColumnName(3);
 
-    collector.checkThat(firstColumn, equalTo("integer0"));
-    collector.checkThat(secondColumn, equalTo("string1"));
-    collector.checkThat(thirdColumn, equalTo("float2"));
+    assertThat(firstColumn, equalTo("integer0"));
+    assertThat(secondColumn, equalTo("string1"));
+    assertThat(thirdColumn, equalTo("float2"));
   }
 
-
   /**
-   * Test {@link ResultSetMetaData#getColumnTypeName(int)} passing an column index that does not exist.
-   *
-   * @throws SQLException in case of error.
+   * Test {@link ResultSetMetaData#getColumnTypeName(int)} passing an column index that does not
+   * exist.
    */
-  @Test(expected = IndexOutOfBoundsException.class)
-  public void testShouldGetColumnNameFromOutOfBoundIndex() throws SQLException {
-    metadata.getColumnName(4);
-
-    Assert.fail();
+  @Test
+  public void testShouldGetColumnNameFromOutOfBoundIndex() {
+    assertThrows(IndexOutOfBoundsException.class, () -> metadata.getColumnName(4));
   }
 
   /**
@@ -154,83 +144,80 @@ public void testShouldGetColumnType() throws SQLException {
     final int secondColumn = metadata.getColumnType(2);
     final int thirdColumn = metadata.getColumnType(3);
 
-    collector.checkThat(firstColumn, equalTo(Types.BIGINT));
-    collector.checkThat(secondColumn, equalTo(Types.VARCHAR));
-    collector.checkThat(thirdColumn, equalTo(Types.FLOAT));
+    assertThat(firstColumn, equalTo(Types.BIGINT));
+    assertThat(secondColumn, equalTo(Types.VARCHAR));
+    assertThat(thirdColumn, equalTo(Types.FLOAT));
   }
 
   @Test
   public void testShouldGetPrecision() throws SQLException {
-    collector.checkThat(metadata.getPrecision(1), equalTo(10));
-    collector.checkThat(metadata.getPrecision(2), equalTo(65535));
-    collector.checkThat(metadata.getPrecision(3), equalTo(15));
+    assertThat(metadata.getPrecision(1), equalTo(10));
+    assertThat(metadata.getPrecision(2), equalTo(65535));
+    assertThat(metadata.getPrecision(3), equalTo(15));
   }
 
   @Test
   public void testShouldGetScale() throws SQLException {
-    collector.checkThat(metadata.getScale(1), equalTo(0));
-    collector.checkThat(metadata.getScale(2), equalTo(0));
-    collector.checkThat(metadata.getScale(3), equalTo(20));
+    assertThat(metadata.getScale(1), equalTo(0));
+    assertThat(metadata.getScale(2), equalTo(0));
+    assertThat(metadata.getScale(3), equalTo(20));
   }
 
   @Test
   public void testShouldGetCatalogName() throws SQLException {
-    collector.checkThat(metadata.getCatalogName(1), equalTo("CATALOG_NAME_1"));
-    collector.checkThat(metadata.getCatalogName(2), equalTo("CATALOG_NAME_2"));
-    collector.checkThat(metadata.getCatalogName(3), equalTo("CATALOG_NAME_3"));
+    assertThat(metadata.getCatalogName(1), equalTo("CATALOG_NAME_1"));
+    assertThat(metadata.getCatalogName(2), equalTo("CATALOG_NAME_2"));
+    assertThat(metadata.getCatalogName(3), equalTo("CATALOG_NAME_3"));
   }
 
   @Test
   public void testShouldGetSchemaName() throws SQLException {
-    collector.checkThat(metadata.getSchemaName(1), equalTo("SCHEMA_NAME_1"));
-    collector.checkThat(metadata.getSchemaName(2), equalTo("SCHEMA_NAME_2"));
-    collector.checkThat(metadata.getSchemaName(3), equalTo("SCHEMA_NAME_3"));
+    assertThat(metadata.getSchemaName(1), equalTo("SCHEMA_NAME_1"));
+    assertThat(metadata.getSchemaName(2), equalTo("SCHEMA_NAME_2"));
+    assertThat(metadata.getSchemaName(3), equalTo("SCHEMA_NAME_3"));
   }
 
   @Test
   public void testShouldGetTableName() throws SQLException {
-    collector.checkThat(metadata.getTableName(1), equalTo("TABLE_NAME_1"));
-    collector.checkThat(metadata.getTableName(2), equalTo("TABLE_NAME_2"));
-    collector.checkThat(metadata.getTableName(3), equalTo("TABLE_NAME_3"));
+    assertThat(metadata.getTableName(1), equalTo("TABLE_NAME_1"));
+    assertThat(metadata.getTableName(2), equalTo("TABLE_NAME_2"));
+    assertThat(metadata.getTableName(3), equalTo("TABLE_NAME_3"));
   }
 
   @Test
   public void testShouldIsAutoIncrement() throws SQLException {
-    collector.checkThat(metadata.isAutoIncrement(1), equalTo(true));
-    collector.checkThat(metadata.isAutoIncrement(2), equalTo(false));
-    collector.checkThat(metadata.isAutoIncrement(3), equalTo(false));
+    assertThat(metadata.isAutoIncrement(1), equalTo(true));
+    assertThat(metadata.isAutoIncrement(2), equalTo(false));
+    assertThat(metadata.isAutoIncrement(3), equalTo(false));
   }
 
   @Test
   public void testShouldIsCaseSensitive() throws SQLException {
-    collector.checkThat(metadata.isCaseSensitive(1), equalTo(false));
-    collector.checkThat(metadata.isCaseSensitive(2), equalTo(true));
-    collector.checkThat(metadata.isCaseSensitive(3), equalTo(false));
+    assertThat(metadata.isCaseSensitive(1), equalTo(false));
+    assertThat(metadata.isCaseSensitive(2), equalTo(true));
+    assertThat(metadata.isCaseSensitive(3), equalTo(false));
   }
 
   @Test
   public void testShouldIsReadonly() throws SQLException {
-    collector.checkThat(metadata.isReadOnly(1), equalTo(true));
-    collector.checkThat(metadata.isReadOnly(2), equalTo(false));
-    collector.checkThat(metadata.isReadOnly(3), equalTo(false));
+    assertThat(metadata.isReadOnly(1), equalTo(true));
+    assertThat(metadata.isReadOnly(2), equalTo(false));
+    assertThat(metadata.isReadOnly(3), equalTo(false));
   }
 
   @Test
   public void testShouldIsSearchable() throws SQLException {
-    collector.checkThat(metadata.isSearchable(1), equalTo(true));
-    collector.checkThat(metadata.isSearchable(2), equalTo(true));
-    collector.checkThat(metadata.isSearchable(3), equalTo(true));
+    assertThat(metadata.isSearchable(1), equalTo(true));
+    assertThat(metadata.isSearchable(2), equalTo(true));
+    assertThat(metadata.isSearchable(3), equalTo(true));
   }
 
   /**
-   * Test if {@link ResultSetMetaData#getColumnTypeName(int)} passing an column index that does not exist.
-   *
-   * @throws SQLException in case of error.
+   * Test if {@link ResultSetMetaData#getColumnTypeName(int)} passing an column index that does not
+   * exist.
    */
-  @Test(expected = IndexOutOfBoundsException.class)
-  public void testShouldGetColumnTypesFromOutOfBoundIndex() throws SQLException {
-    metadata.getColumnType(4);
-
-    Assert.fail();
+  @Test
+  public void testShouldGetColumnTypesFromOutOfBoundIndex() {
+    assertThrows(IndexOutOfBoundsException.class, () -> metadata.getColumnType(4));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ResultSetTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ResultSetTest.java
index 17fb09e26d29d..a8d04dfc83ac0 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ResultSetTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ResultSetTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
 import static java.lang.String.format;
@@ -25,11 +24,15 @@
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
+import com.google.common.collect.ImmutableSet;
 import java.nio.charset.StandardCharsets;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -45,7 +48,6 @@
 import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
-
 import org.apache.arrow.driver.jdbc.utils.CoreMockedSqlProducers;
 import org.apache.arrow.driver.jdbc.utils.FallbackFlightSqlProducer;
 import org.apache.arrow.driver.jdbc.utils.PartitionedFlightSqlProducer;
@@ -64,32 +66,27 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
-import org.junit.rules.ErrorCollector;
-
-import com.google.common.collect.ImmutableSet;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class ResultSetTest {
   private static final Random RANDOM = new Random(10);
-  @ClassRule
-  public static final FlightServerTestRule SERVER_TEST_RULE = FlightServerTestRule
-      .createStandardTestRule(CoreMockedSqlProducers.getLegacyProducer());
-  private static Connection connection;
 
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
+  @RegisterExtension
+  public static final FlightServerTestExtension FLIGHT_SERVER_TEST_EXTENSION =
+      FlightServerTestExtension.createStandardTestExtension(
+          CoreMockedSqlProducers.getLegacyProducer());
 
-  @BeforeClass
+  private static Connection connection;
+
+  @BeforeAll
   public static void setup() throws SQLException {
-    connection = SERVER_TEST_RULE.getConnection(false);
+    connection = FLIGHT_SERVER_TEST_EXTENSION.getConnection(false);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() throws SQLException {
     connection.close();
   }
@@ -109,17 +106,17 @@ private static void resultSetNextUntilDone(ResultSet resultSet) throws SQLExcept
   @Test
   public void testShouldRunSelectQuery() throws Exception {
     try (Statement statement = connection.createStatement();
-         ResultSet resultSet = statement.executeQuery(
-             CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
-      CoreMockedSqlProducers.assertLegacyRegularSqlResultSet(resultSet, collector);
+        ResultSet resultSet =
+            statement.executeQuery(CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
+      CoreMockedSqlProducers.assertLegacyRegularSqlResultSet(resultSet);
     }
   }
 
   @Test
   public void testShouldExecuteQueryNotBlockIfClosedBeforeEnd() throws Exception {
     try (Statement statement = connection.createStatement();
-         ResultSet resultSet = statement.executeQuery(
-             CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
+        ResultSet resultSet =
+            statement.executeQuery(CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
 
       for (int i = 0; i < 7500; i++) {
         assertTrue(resultSet.next());
@@ -128,21 +125,21 @@ public void testShouldExecuteQueryNotBlockIfClosedBeforeEnd() throws Exception {
   }
 
   /**
-   * Tests whether the {@link ArrowFlightJdbcDriver} query only returns only the
-   * amount of value set by {@link org.apache.calcite.avatica.AvaticaStatement#setMaxRows(int)}.
+   * Tests whether the {@link ArrowFlightJdbcDriver} query only returns only the amount of value set
+   * by {@link org.apache.calcite.avatica.AvaticaStatement#setMaxRows(int)}.
    *
    * @throws Exception If the connection fails to be established.
    */
   @Test
   public void testShouldRunSelectQuerySettingMaxRowLimit() throws Exception {
     try (Statement statement = connection.createStatement();
-         ResultSet resultSet = statement.executeQuery(
-             CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
+        ResultSet resultSet =
+            statement.executeQuery(CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
 
       final int maxRowsLimit = 3;
       statement.setMaxRows(maxRowsLimit);
 
-      collector.checkThat(statement.getMaxRows(), is(maxRowsLimit));
+      assertThat(statement.getMaxRows(), is(maxRowsLimit));
 
       int count = 0;
       int columns = 6;
@@ -150,43 +147,45 @@ public void testShouldRunSelectQuerySettingMaxRowLimit() throws Exception {
         for (int column = 1; column <= columns; column++) {
           resultSet.getObject(column);
         }
-        collector.checkThat("Test Name #" + count, is(resultSet.getString(2)));
+        assertThat("Test Name #" + count, is(resultSet.getString(2)));
       }
 
-      collector.checkThat(maxRowsLimit, is(count));
+      assertThat(maxRowsLimit, is(count));
     }
   }
 
   /**
-   * Tests whether the {@link ArrowFlightJdbcDriver} fails upon attempting
-   * to run an invalid query.
+   * Tests whether the {@link ArrowFlightJdbcDriver} fails upon attempting to run an invalid query.
    *
    * @throws Exception If the connection fails to be established.
    */
-  @Test(expected = SQLException.class)
-  public void testShouldThrowExceptionUponAttemptingToExecuteAnInvalidSelectQuery()
-      throws Exception {
-    try (Statement statement = connection.createStatement();
-         ResultSet result = statement.executeQuery("SELECT * FROM SHOULD-FAIL")) {
-      fail();
-    }
+  @Test
+  public void testShouldThrowExceptionUponAttemptingToExecuteAnInvalidSelectQuery() {
+    assertThrows(
+        SQLException.class,
+        () -> {
+          try (Statement statement = connection.createStatement();
+              ResultSet resultSet = statement.executeQuery("SELECT * FROM SHOULD-FAIL")) {
+            fail();
+          }
+        });
   }
 
   /**
-   * Tests whether the {@link ArrowFlightJdbcDriver} query only returns only the
-   * amount of value set by {@link org.apache.calcite.avatica.AvaticaStatement#setLargeMaxRows(long)} (int)}.
+   * Tests whether the {@link ArrowFlightJdbcDriver} query only returns only the amount of value set
+   * by {@link org.apache.calcite.avatica.AvaticaStatement#setLargeMaxRows(long)} (int)}.
    *
    * @throws Exception If the connection fails to be established.
    */
   @Test
   public void testShouldRunSelectQuerySettingLargeMaxRowLimit() throws Exception {
     try (Statement statement = connection.createStatement();
-         ResultSet resultSet = statement.executeQuery(
-             CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
+        ResultSet resultSet =
+            statement.executeQuery(CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
       final long maxRowsLimit = 3;
       statement.setLargeMaxRows(maxRowsLimit);
 
-      collector.checkThat(statement.getLargeMaxRows(), is(maxRowsLimit));
+      assertThat(statement.getLargeMaxRows(), is(maxRowsLimit));
 
       int count = 0;
       int columns = resultSet.getMetaData().getColumnCount();
@@ -206,13 +205,13 @@ public void testColumnCountShouldRemainConsistentForResultSetThroughoutEntireDur
       throws SQLException {
     final Set<Integer> counts = new HashSet<>();
     try (final Statement statement = connection.createStatement();
-         final ResultSet resultSet = statement.executeQuery(
-             CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
+        final ResultSet resultSet =
+            statement.executeQuery(CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
       while (resultSet.next()) {
         counts.add(resultSet.getMetaData().getColumnCount());
       }
     }
-    collector.checkThat(counts, is(ImmutableSet.of(6)));
+    assertThat(counts, is(ImmutableSet.of(6)));
   }
 
   /**
@@ -224,26 +223,29 @@ public void testColumnCountShouldRemainConsistentForResultSetThroughoutEntireDur
   @Test
   public void testShouldCloseStatementWhenIsCloseOnCompletion() throws Exception {
     try (Statement statement = connection.createStatement();
-        ResultSet resultSet = statement.executeQuery(CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
+        ResultSet resultSet =
+            statement.executeQuery(CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
 
       statement.closeOnCompletion();
 
       resultSetNextUntilDone(resultSet);
 
-      collector.checkThat(statement.isClosed(), is(true));
+      assertThat(statement.isClosed(), is(true));
     }
   }
 
   /**
-   * Tests whether the {@link ArrowFlightJdbcDriver} close the statement after complete ResultSet with max rows limit
-   * when call {@link org.apache.calcite.avatica.AvaticaStatement#closeOnCompletion()}.
+   * Tests whether the {@link ArrowFlightJdbcDriver} close the statement after complete ResultSet
+   * with max rows limit when call {@link
+   * org.apache.calcite.avatica.AvaticaStatement#closeOnCompletion()}.
    *
    * @throws Exception If the connection fails to be established.
    */
   @Test
   public void testShouldCloseStatementWhenIsCloseOnCompletionWithMaxRowsLimit() throws Exception {
     try (Statement statement = connection.createStatement();
-         ResultSet resultSet = statement.executeQuery(CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
+        ResultSet resultSet =
+            statement.executeQuery(CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
 
       final long maxRowsLimit = 3;
       statement.setLargeMaxRows(maxRowsLimit);
@@ -251,13 +253,14 @@ public void testShouldCloseStatementWhenIsCloseOnCompletionWithMaxRowsLimit() th
 
       resultSetNextUntilDone(resultSet);
 
-      collector.checkThat(statement.isClosed(), is(true));
+      assertThat(statement.isClosed(), is(true));
     }
   }
 
   /**
-   * Tests whether the {@link ArrowFlightJdbcDriver} not close the statement after complete ResultSet with max rows
-   * limit when call {@link org.apache.calcite.avatica.AvaticaStatement#closeOnCompletion()}.
+   * Tests whether the {@link ArrowFlightJdbcDriver} not close the statement after complete
+   * ResultSet with max rows limit when call {@link
+   * org.apache.calcite.avatica.AvaticaStatement#closeOnCompletion()}.
    *
    * @throws Exception If the connection fails to be established.
    */
@@ -265,33 +268,33 @@ public void testShouldCloseStatementWhenIsCloseOnCompletionWithMaxRowsLimit() th
   public void testShouldNotCloseStatementWhenIsNotCloseOnCompletionWithMaxRowsLimit()
       throws Exception {
     try (Statement statement = connection.createStatement();
-         ResultSet resultSet = statement.executeQuery(
-             CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
+        ResultSet resultSet =
+            statement.executeQuery(CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
 
       final long maxRowsLimit = 3;
       statement.setLargeMaxRows(maxRowsLimit);
 
-      collector.checkThat(statement.isClosed(), is(false));
+      assertThat(statement.isClosed(), is(false));
       resultSetNextUntilDone(resultSet);
-      collector.checkThat(resultSet.isClosed(), is(false));
-      collector.checkThat(resultSet, is(instanceOf(ArrowFlightJdbcFlightStreamResultSet.class)));
+      assertThat(resultSet.isClosed(), is(false));
+      assertThat(resultSet, is(instanceOf(ArrowFlightJdbcFlightStreamResultSet.class)));
     }
   }
 
   @Test
   public void testShouldCancelQueryUponCancelAfterQueryingResultSet() throws SQLException {
     try (final Statement statement = connection.createStatement();
-         final ResultSet resultSet = statement.executeQuery(
-             CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
+        final ResultSet resultSet =
+            statement.executeQuery(CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
       final int column = RANDOM.nextInt(resultSet.getMetaData().getColumnCount()) + 1;
-      collector.checkThat(resultSet.isClosed(), is(false));
-      collector.checkThat(resultSet.next(), is(true));
-      collector.checkSucceeds(() -> resultSet.getObject(column));
+      assertThat(resultSet.isClosed(), is(false));
+      assertThat(resultSet.next(), is(true));
+      assertDoesNotThrow(() -> resultSet.getObject(column));
       statement.cancel();
       // Should reset `ResultSet`; keep both `ResultSet` and `Connection` open.
-      collector.checkThat(statement.isClosed(), is(false));
-      collector.checkThat(resultSet.isClosed(), is(false));
-      collector.checkThat(resultSet.getMetaData().getColumnCount(), is(0));
+      assertThat(statement.isClosed(), is(false));
+      assertThat(resultSet.isClosed(), is(false));
+      assertThat(resultSet.getMetaData().getColumnCount(), is(0));
     }
   }
 
@@ -301,25 +304,27 @@ public void testShouldInterruptFlightStreamsIfQueryIsCancelledMidQuerying()
     try (final Statement statement = connection.createStatement()) {
       final CountDownLatch latch = new CountDownLatch(1);
       final Set<Exception> exceptions = synchronizedSet(new HashSet<>(1));
-      final Thread thread = new Thread(() -> {
-        try (final ResultSet resultSet = statement.executeQuery(
-            CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
-          final int cachedColumnCount = resultSet.getMetaData().getColumnCount();
-          Thread.sleep(300);
-          while (resultSet.next()) {
-            resultSet.getObject(RANDOM.nextInt(cachedColumnCount) + 1);
-          }
-        } catch (final SQLException | InterruptedException e) {
-          exceptions.add(e);
-        } finally {
-          latch.countDown();
-        }
-      });
+      final Thread thread =
+          new Thread(
+              () -> {
+                try (final ResultSet resultSet =
+                    statement.executeQuery(CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
+                  final int cachedColumnCount = resultSet.getMetaData().getColumnCount();
+                  Thread.sleep(300);
+                  while (resultSet.next()) {
+                    resultSet.getObject(RANDOM.nextInt(cachedColumnCount) + 1);
+                  }
+                } catch (final SQLException | InterruptedException e) {
+                  exceptions.add(e);
+                } finally {
+                  latch.countDown();
+                }
+              });
       thread.setName("Test Case: interrupt query execution before first retrieval");
       thread.start();
       statement.cancel();
       thread.join();
-      collector.checkThat(
+      assertThat(
           exceptions.stream()
               .map(Exception::getMessage)
               .map(StringBuilder::new)
@@ -331,33 +336,38 @@ public void testShouldInterruptFlightStreamsIfQueryIsCancelledMidQuerying()
   }
 
   @Test
-  public void testShouldInterruptFlightStreamsIfQueryIsCancelledMidProcessingForTimeConsumingQueries()
-      throws SQLException, InterruptedException {
+  public void
+      testShouldInterruptFlightStreamsIfQueryIsCancelledMidProcessingForTimeConsumingQueries()
+          throws SQLException, InterruptedException {
     final String query = CoreMockedSqlProducers.LEGACY_CANCELLATION_SQL_CMD;
     try (final Statement statement = connection.createStatement()) {
       final Set<Exception> exceptions = synchronizedSet(new HashSet<>(1));
-      final Thread thread = new Thread(() -> {
-        try (final ResultSet ignored = statement.executeQuery(query)) {
-          fail();
-        } catch (final SQLException e) {
-          exceptions.add(e);
-        }
-      });
+      final Thread thread =
+          new Thread(
+              () -> {
+                try (final ResultSet ignored = statement.executeQuery(query)) {
+                  fail();
+                } catch (final SQLException e) {
+                  exceptions.add(e);
+                }
+              });
       thread.setName("Test Case: interrupt query execution mid-process");
       thread.setPriority(Thread.MAX_PRIORITY);
       thread.start();
       Thread.sleep(5000); // Let the other thread attempt to retrieve results.
       statement.cancel();
       thread.join();
-      collector.checkThat(
+      assertThat(
           exceptions.stream()
               .map(Exception::getMessage)
               .map(StringBuilder::new)
               .reduce(StringBuilder::append)
               .orElseThrow(IllegalStateException::new)
               .toString(),
-          anyOf(is(format("Error while executing SQL \"%s\": Query canceled", query)),
-              allOf(containsString(format("Error while executing SQL \"%s\"", query)),
+          anyOf(
+              is(format("Error while executing SQL \"%s\": Query canceled", query)),
+              allOf(
+                  containsString(format("Error while executing SQL \"%s\"", query)),
                   anyOf(containsString("CANCELLED"), containsString("Cancelling")))));
     }
   }
@@ -375,14 +385,11 @@ public void testShouldInterruptFlightStreamsIfQueryTimeoutIsOver() throws SQLExc
       } catch (final Exception e) {
         exceptions.add(e);
       }
-      final Throwable comparisonCause = exceptions.stream()
-          .findFirst()
-          .orElseThrow(RuntimeException::new)
-          .getCause()
-          .getCause();
-      collector.checkThat(comparisonCause,
-          is(instanceOf(SQLTimeoutException.class)));
-      collector.checkThat(comparisonCause.getMessage(),
+      final Throwable comparisonCause =
+          exceptions.stream().findFirst().orElseThrow(RuntimeException::new).getCause().getCause();
+      assertThat(comparisonCause, is(instanceOf(SQLTimeoutException.class)));
+      assertThat(
+          comparisonCause.getMessage(),
           is(format("Query timed out after %d %s", timeoutValue, timeoutUnit)));
     }
   }
@@ -394,7 +401,7 @@ public void testFlightStreamsQueryShouldNotTimeout() throws SQLException {
     try (Statement statement = connection.createStatement()) {
       statement.setQueryTimeout(timeoutValue);
       try (ResultSet resultSet = statement.executeQuery(query)) {
-        CoreMockedSqlProducers.assertLegacyRegularSqlResultSet(resultSet, collector);
+        CoreMockedSqlProducers.assertLegacyRegularSqlResultSet(resultSet);
       }
     }
   }
@@ -402,8 +409,9 @@ public void testFlightStreamsQueryShouldNotTimeout() throws SQLException {
   @Test
   public void testPartitionedFlightServer() throws Exception {
     // Arrange
-    final Schema schema = new Schema(
-        Arrays.asList(Field.nullablePrimitive("int_column", new ArrowType.Int(32, true))));
+    final Schema schema =
+        new Schema(
+            Arrays.asList(Field.nullablePrimitive("int_column", new ArrowType.Int(32, true))));
     try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
         VectorSchemaRoot firstPartition = VectorSchemaRoot.create(schema, allocator);
         VectorSchemaRoot secondPartition = VectorSchemaRoot.create(schema, allocator)) {
@@ -413,48 +421,55 @@ public void testPartitionedFlightServer() throws Exception {
       ((IntVector) secondPartition.getVector(0)).set(0, 2);
 
       // Construct the data-only nodes first.
-      FlightProducer firstProducer = new PartitionedFlightSqlProducer.DataOnlyFlightSqlProducer(
-          new Ticket("first".getBytes(StandardCharsets.UTF_8)), firstPartition);
-      FlightProducer secondProducer = new PartitionedFlightSqlProducer.DataOnlyFlightSqlProducer(
-          new Ticket("second".getBytes(StandardCharsets.UTF_8)), secondPartition);
+      FlightProducer firstProducer =
+          new PartitionedFlightSqlProducer.DataOnlyFlightSqlProducer(
+              new Ticket("first".getBytes(StandardCharsets.UTF_8)), firstPartition);
+      FlightProducer secondProducer =
+          new PartitionedFlightSqlProducer.DataOnlyFlightSqlProducer(
+              new Ticket("second".getBytes(StandardCharsets.UTF_8)), secondPartition);
 
-      final FlightServer.Builder firstBuilder = FlightServer.builder(
-          allocator, forGrpcInsecure("localhost", 0), firstProducer);
+      final FlightServer.Builder firstBuilder =
+          FlightServer.builder(allocator, forGrpcInsecure("localhost", 0), firstProducer);
 
-      final FlightServer.Builder secondBuilder = FlightServer.builder(
-          allocator, forGrpcInsecure("localhost", 0), secondProducer);
+      final FlightServer.Builder secondBuilder =
+          FlightServer.builder(allocator, forGrpcInsecure("localhost", 0), secondProducer);
 
       // Run the data-only nodes so that we can get the Locations they are running at.
       try (FlightServer firstServer = firstBuilder.build();
-           FlightServer secondServer = secondBuilder.build()) {
+          FlightServer secondServer = secondBuilder.build()) {
         firstServer.start();
         secondServer.start();
         final FlightEndpoint firstEndpoint =
-            new FlightEndpoint(new Ticket("first".getBytes(StandardCharsets.UTF_8)), firstServer.getLocation());
+            new FlightEndpoint(
+                new Ticket("first".getBytes(StandardCharsets.UTF_8)), firstServer.getLocation());
 
         final FlightEndpoint secondEndpoint =
-            new FlightEndpoint(new Ticket("second".getBytes(StandardCharsets.UTF_8)), secondServer.getLocation());
+            new FlightEndpoint(
+                new Ticket("second".getBytes(StandardCharsets.UTF_8)), secondServer.getLocation());
 
         // Finally start the root node.
-        try (final PartitionedFlightSqlProducer rootProducer = new PartitionedFlightSqlProducer(
-            schema, firstEndpoint, secondEndpoint);
-             FlightServer rootServer = FlightServer.builder(
-                 allocator, forGrpcInsecure("localhost", 0), rootProducer)
-                 .build()
-                 .start();
-             Connection newConnection = DriverManager.getConnection(String.format(
-                 "jdbc:arrow-flight-sql://%s:%d/?useEncryption=false",
-                 rootServer.getLocation().getUri().getHost(), rootServer.getPort()));
-             Statement newStatement = newConnection.createStatement();
-             // Act
-             ResultSet result = newStatement.executeQuery("Select partitioned_data")) {
+        try (final PartitionedFlightSqlProducer rootProducer =
+                new PartitionedFlightSqlProducer(schema, firstEndpoint, secondEndpoint);
+            FlightServer rootServer =
+                FlightServer.builder(allocator, forGrpcInsecure("localhost", 0), rootProducer)
+                    .build()
+                    .start();
+            Connection newConnection =
+                DriverManager.getConnection(
+                    String.format(
+                        "jdbc:arrow-flight-sql://%s:%d/?useEncryption=false",
+                        rootServer.getLocation().getUri().getHost(), rootServer.getPort()));
+            Statement newStatement = newConnection.createStatement();
+            // Act
+            ResultSet result = newStatement.executeQuery("Select partitioned_data")) {
           List<Integer> resultData = new ArrayList<>();
           while (result.next()) {
             resultData.add(result.getInt(1));
           }
 
           // Assert
-          assertEquals(firstPartition.getRowCount() + secondPartition.getRowCount(), resultData.size());
+          assertEquals(
+              firstPartition.getRowCount() + secondPartition.getRowCount(), resultData.size());
           assertTrue(resultData.contains(((IntVector) firstPartition.getVector(0)).get(0)));
           assertTrue(resultData.contains(((IntVector) secondPartition.getVector(0)).get(0)));
         }
@@ -464,33 +479,40 @@ allocator, forGrpcInsecure("localhost", 0), rootProducer)
 
   @Test
   public void testPartitionedFlightServerIgnoreFailure() throws Exception {
-    final Schema schema = new Schema(
-            Collections.singletonList(Field.nullablePrimitive("int_column", new ArrowType.Int(32, true))));
+    final Schema schema =
+        new Schema(
+            Collections.singletonList(
+                Field.nullablePrimitive("int_column", new ArrowType.Int(32, true))));
     try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE)) {
       final FlightEndpoint firstEndpoint =
-              new FlightEndpoint(new Ticket("first".getBytes(StandardCharsets.UTF_8)),
-                      Location.forGrpcInsecure("127.0.0.2", 1234),
-                      Location.forGrpcInsecure("127.0.0.3", 1234));
-
-      try (final PartitionedFlightSqlProducer rootProducer = new PartitionedFlightSqlProducer(
-              schema, firstEndpoint);
-           FlightServer rootServer = FlightServer.builder(
-                           allocator, forGrpcInsecure("localhost", 0), rootProducer)
-                   .build()
-                   .start();
-           Connection newConnection = DriverManager.getConnection(String.format(
-                   "jdbc:arrow-flight-sql://%s:%d/?useEncryption=false",
-                   rootServer.getLocation().getUri().getHost(), rootServer.getPort()));
-           Statement newStatement = newConnection.createStatement()) {
-        final SQLException e = Assertions.assertThrows(SQLException.class, () -> {
-          ResultSet result = newStatement.executeQuery("Select partitioned_data");
-          while (result.next()) {
-          }
-        });
+          new FlightEndpoint(
+              new Ticket("first".getBytes(StandardCharsets.UTF_8)),
+              Location.forGrpcInsecure("127.0.0.2", 1234),
+              Location.forGrpcInsecure("127.0.0.3", 1234));
+
+      try (final PartitionedFlightSqlProducer rootProducer =
+              new PartitionedFlightSqlProducer(schema, firstEndpoint);
+          FlightServer rootServer =
+              FlightServer.builder(allocator, forGrpcInsecure("localhost", 0), rootProducer)
+                  .build()
+                  .start();
+          Connection newConnection =
+              DriverManager.getConnection(
+                  String.format(
+                      "jdbc:arrow-flight-sql://%s:%d/?useEncryption=false",
+                      rootServer.getLocation().getUri().getHost(), rootServer.getPort()));
+          Statement newStatement = newConnection.createStatement()) {
+        final SQLException e =
+            assertThrows(
+                SQLException.class,
+                () -> {
+                  ResultSet result = newStatement.executeQuery("Select partitioned_data");
+                  while (result.next()) {}
+                });
         final Throwable cause = e.getCause();
-        Assertions.assertTrue(cause instanceof FlightRuntimeException);
+        assertTrue(cause instanceof FlightRuntimeException);
         final FlightRuntimeException fre = (FlightRuntimeException) cause;
-        Assertions.assertEquals(FlightStatusCode.UNAVAILABLE, fre.status().code());
+        assertEquals(FlightStatusCode.UNAVAILABLE, fre.status().code());
       }
     }
   }
@@ -498,41 +520,48 @@ allocator, forGrpcInsecure("localhost", 0), rootProducer)
   @Test
   public void testPartitionedFlightServerAllFailure() throws Exception {
     // Arrange
-    final Schema schema = new Schema(
-            Collections.singletonList(Field.nullablePrimitive("int_column", new ArrowType.Int(32, true))));
+    final Schema schema =
+        new Schema(
+            Collections.singletonList(
+                Field.nullablePrimitive("int_column", new ArrowType.Int(32, true))));
     try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         VectorSchemaRoot firstPartition = VectorSchemaRoot.create(schema, allocator)) {
+        VectorSchemaRoot firstPartition = VectorSchemaRoot.create(schema, allocator)) {
       firstPartition.setRowCount(1);
       ((IntVector) firstPartition.getVector(0)).set(0, 1);
 
       // Construct the data-only nodes first.
-      FlightProducer firstProducer = new PartitionedFlightSqlProducer.DataOnlyFlightSqlProducer(
+      FlightProducer firstProducer =
+          new PartitionedFlightSqlProducer.DataOnlyFlightSqlProducer(
               new Ticket("first".getBytes(StandardCharsets.UTF_8)), firstPartition);
 
-      final FlightServer.Builder firstBuilder = FlightServer.builder(
-              allocator, forGrpcInsecure("localhost", 0), firstProducer);
+      final FlightServer.Builder firstBuilder =
+          FlightServer.builder(allocator, forGrpcInsecure("localhost", 0), firstProducer);
 
       // Run the data-only nodes so that we can get the Locations they are running at.
       try (FlightServer firstServer = firstBuilder.build()) {
         firstServer.start();
         final Location badLocation = Location.forGrpcInsecure("127.0.0.2", 1234);
         final FlightEndpoint firstEndpoint =
-                new FlightEndpoint(new Ticket("first".getBytes(StandardCharsets.UTF_8)),
-                        badLocation, firstServer.getLocation());
+            new FlightEndpoint(
+                new Ticket("first".getBytes(StandardCharsets.UTF_8)),
+                badLocation,
+                firstServer.getLocation());
 
         // Finally start the root node.
-        try (final PartitionedFlightSqlProducer rootProducer = new PartitionedFlightSqlProducer(
-                schema, firstEndpoint);
-             FlightServer rootServer = FlightServer.builder(
-                             allocator, forGrpcInsecure("localhost", 0), rootProducer)
-                     .build()
-                     .start();
-             Connection newConnection = DriverManager.getConnection(String.format(
-                     "jdbc:arrow-flight-sql://%s:%d/?useEncryption=false",
-                     rootServer.getLocation().getUri().getHost(), rootServer.getPort()));
-             Statement newStatement = newConnection.createStatement();
-             // Act
-             ResultSet result = newStatement.executeQuery("Select partitioned_data")) {
+        try (final PartitionedFlightSqlProducer rootProducer =
+                new PartitionedFlightSqlProducer(schema, firstEndpoint);
+            FlightServer rootServer =
+                FlightServer.builder(allocator, forGrpcInsecure("localhost", 0), rootProducer)
+                    .build()
+                    .start();
+            Connection newConnection =
+                DriverManager.getConnection(
+                    String.format(
+                        "jdbc:arrow-flight-sql://%s:%d/?useEncryption=false",
+                        rootServer.getLocation().getUri().getHost(), rootServer.getPort()));
+            Statement newStatement = newConnection.createStatement();
+            // Act
+            ResultSet result = newStatement.executeQuery("Select partitioned_data")) {
           List<Integer> resultData = new ArrayList<>();
           while (result.next()) {
             resultData.add(result.getInt(1));
@@ -548,23 +577,27 @@ allocator, forGrpcInsecure("localhost", 0), rootProducer)
 
   @Test
   public void testFallbackFlightServer() throws Exception {
-    final Schema schema = new Schema(
+    final Schema schema =
+        new Schema(
             Collections.singletonList(Field.nullable("int_column", Types.MinorType.INT.getType())));
     try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         VectorSchemaRoot resultData = VectorSchemaRoot.create(schema, allocator)) {
+        VectorSchemaRoot resultData = VectorSchemaRoot.create(schema, allocator)) {
       resultData.setRowCount(1);
       ((IntVector) resultData.getVector(0)).set(0, 1);
 
-      try (final FallbackFlightSqlProducer rootProducer = new FallbackFlightSqlProducer(resultData);
-           FlightServer rootServer = FlightServer.builder(
-                           allocator, forGrpcInsecure("localhost", 0), rootProducer)
-                   .build()
-                   .start();
-           Connection newConnection = DriverManager.getConnection(String.format(
-                   "jdbc:arrow-flight-sql://%s:%d/?useEncryption=false",
-                   rootServer.getLocation().getUri().getHost(), rootServer.getPort()));
-           Statement newStatement = newConnection.createStatement();
-           ResultSet result = newStatement.executeQuery("fallback")) {
+      try (final FallbackFlightSqlProducer rootProducer =
+              new FallbackFlightSqlProducer(resultData);
+          FlightServer rootServer =
+              FlightServer.builder(allocator, forGrpcInsecure("localhost", 0), rootProducer)
+                  .build()
+                  .start();
+          Connection newConnection =
+              DriverManager.getConnection(
+                  String.format(
+                      "jdbc:arrow-flight-sql://%s:%d/?useEncryption=false",
+                      rootServer.getLocation().getUri().getHost(), rootServer.getPort()));
+          Statement newStatement = newConnection.createStatement();
+          ResultSet result = newStatement.executeQuery("fallback")) {
         List<Integer> actualData = new ArrayList<>();
         while (result.next()) {
           actualData.add(result.getInt(1));
@@ -579,23 +612,27 @@ allocator, forGrpcInsecure("localhost", 0), rootProducer)
 
   @Test
   public void testFallbackSecondFlightServer() throws Exception {
-    final Schema schema = new Schema(
+    final Schema schema =
+        new Schema(
             Collections.singletonList(Field.nullable("int_column", Types.MinorType.INT.getType())));
     try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         VectorSchemaRoot resultData = VectorSchemaRoot.create(schema, allocator)) {
+        VectorSchemaRoot resultData = VectorSchemaRoot.create(schema, allocator)) {
       resultData.setRowCount(1);
       ((IntVector) resultData.getVector(0)).set(0, 1);
 
-      try (final FallbackFlightSqlProducer rootProducer = new FallbackFlightSqlProducer(resultData);
-           FlightServer rootServer = FlightServer.builder(
-                           allocator, forGrpcInsecure("localhost", 0), rootProducer)
-                   .build()
-                   .start();
-           Connection newConnection = DriverManager.getConnection(String.format(
-                   "jdbc:arrow-flight-sql://%s:%d/?useEncryption=false",
-                   rootServer.getLocation().getUri().getHost(), rootServer.getPort()));
-           Statement newStatement = newConnection.createStatement();
-           ResultSet result = newStatement.executeQuery("fallback with error")) {
+      try (final FallbackFlightSqlProducer rootProducer =
+              new FallbackFlightSqlProducer(resultData);
+          FlightServer rootServer =
+              FlightServer.builder(allocator, forGrpcInsecure("localhost", 0), rootProducer)
+                  .build()
+                  .start();
+          Connection newConnection =
+              DriverManager.getConnection(
+                  String.format(
+                      "jdbc:arrow-flight-sql://%s:%d/?useEncryption=false",
+                      rootServer.getLocation().getUri().getHost(), rootServer.getPort()));
+          Statement newStatement = newConnection.createStatement();
+          ResultSet result = newStatement.executeQuery("fallback with error")) {
         List<Integer> actualData = new ArrayList<>();
         while (result.next()) {
           actualData.add(result.getInt(1));
@@ -611,8 +648,8 @@ allocator, forGrpcInsecure("localhost", 0), rootProducer)
   @Test
   public void testShouldRunSelectQueryWithEmptyVectorsEmbedded() throws Exception {
     try (Statement statement = connection.createStatement();
-         ResultSet resultSet = statement.executeQuery(
-             CoreMockedSqlProducers.LEGACY_REGULAR_WITH_EMPTY_SQL_CMD)) {
+        ResultSet resultSet =
+            statement.executeQuery(CoreMockedSqlProducers.LEGACY_REGULAR_WITH_EMPTY_SQL_CMD)) {
       long rowCount = 0;
       while (resultSet.next()) {
         ++rowCount;
@@ -624,10 +661,11 @@ public void testShouldRunSelectQueryWithEmptyVectorsEmbedded() throws Exception
   @Test
   public void testResultSetAppMetadata() throws Exception {
     try (Statement statement = connection.createStatement();
-         ResultSet resultSet = statement.executeQuery(
-             CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
-      assertArrayEquals(((ArrowFlightJdbcFlightStreamResultSet) resultSet).getAppMetadata(),
-              "foo".getBytes(StandardCharsets.UTF_8));
+        ResultSet resultSet =
+            statement.executeQuery(CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {
+      assertArrayEquals(
+          ((ArrowFlightJdbcFlightStreamResultSet) resultSet).getAppMetadata(),
+          "foo".getBytes(StandardCharsets.UTF_8));
     }
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/TokenAuthenticationTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/TokenAuthenticationTest.java
index 9fe506231ec6a..1dfb1efcf16ce 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/TokenAuthenticationTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/TokenAuthenticationTest.java
@@ -14,51 +14,48 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.sql.Connection;
 import java.sql.SQLException;
-
 import org.apache.arrow.driver.jdbc.authentication.TokenAuthentication;
 import org.apache.arrow.driver.jdbc.utils.MockFlightSqlProducer;
 import org.apache.arrow.util.AutoCloseables;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class TokenAuthenticationTest {
   private static final MockFlightSqlProducer FLIGHT_SQL_PRODUCER = new MockFlightSqlProducer();
 
-  @ClassRule
-  public static FlightServerTestRule FLIGHT_SERVER_TEST_RULE;
+  @RegisterExtension public static FlightServerTestExtension FLIGHT_SERVER_TEST_EXTENSION;
 
   static {
-    FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
-        .authentication(new TokenAuthentication.Builder()
-            .token("1234")
-            .build())
-        .producer(FLIGHT_SQL_PRODUCER)
-        .build();
+    FLIGHT_SERVER_TEST_EXTENSION =
+        new FlightServerTestExtension.Builder()
+            .authentication(new TokenAuthentication.Builder().token("1234").build())
+            .producer(FLIGHT_SQL_PRODUCER)
+            .build();
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDownAfterClass() {
     AutoCloseables.closeNoChecked(FLIGHT_SQL_PRODUCER);
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void connectUsingTokenAuthenticationShouldFail() throws SQLException {
-    try (Connection ignored = FLIGHT_SERVER_TEST_RULE.getConnection(false, "invalid")) {
-      Assert.fail();
-    }
+    assertThrows(
+        SQLException.class, () -> FLIGHT_SERVER_TEST_EXTENSION.getConnection(false, "invalid"));
   }
 
   @Test
   public void connectUsingTokenAuthenticationShouldSuccess() throws SQLException {
-    try (Connection connection = FLIGHT_SERVER_TEST_RULE.getConnection(false, "1234")) {
-      Assert.assertFalse(connection.isClosed());
+    try (Connection connection = FLIGHT_SERVER_TEST_EXTENSION.getConnection(false, "1234")) {
+      assertFalse(connection.isClosed());
     }
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/ArrowFlightJdbcAccessorFactoryTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/ArrowFlightJdbcAccessorFactoryTest.java
index 4b3744372c0e8..b56bf3c63d8e3 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/ArrowFlightJdbcAccessorFactoryTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/ArrowFlightJdbcAccessorFactoryTest.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor;
 
-import java.util.function.IntSupplier;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.util.function.IntSupplier;
 import org.apache.arrow.driver.jdbc.accessor.impl.binary.ArrowFlightJdbcBinaryVectorAccessor;
 import org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcDateVectorAccessor;
 import org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcDurationVectorAccessor;
@@ -38,9 +38,10 @@
 import org.apache.arrow.driver.jdbc.accessor.impl.numeric.ArrowFlightJdbcFloat4VectorAccessor;
 import org.apache.arrow.driver.jdbc.accessor.impl.numeric.ArrowFlightJdbcFloat8VectorAccessor;
 import org.apache.arrow.driver.jdbc.accessor.impl.text.ArrowFlightJdbcVarCharVectorAccessor;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.DurationVector;
 import org.apache.arrow.vector.IntervalDayVector;
+import org.apache.arrow.vector.IntervalMonthDayNanoVector;
 import org.apache.arrow.vector.IntervalYearVector;
 import org.apache.arrow.vector.LargeVarCharVector;
 import org.apache.arrow.vector.ValueVector;
@@ -52,445 +53,422 @@
 import org.apache.arrow.vector.types.TimeUnit;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.FieldType;
-import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class ArrowFlightJdbcAccessorFactoryTest {
   public static final IntSupplier GET_CURRENT_ROW = () -> 0;
 
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
   @Test
   public void createAccessorForUInt1Vector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createUInt1Vector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createUInt1Vector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcBaseIntVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcBaseIntVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForUInt2Vector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createUInt2Vector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createUInt2Vector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcBaseIntVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcBaseIntVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForUInt4Vector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createUInt4Vector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createUInt4Vector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcBaseIntVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcBaseIntVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForUInt8Vector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createUInt8Vector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createUInt8Vector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcBaseIntVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcBaseIntVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForTinyIntVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createTinyIntVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createTinyIntVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcBaseIntVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcBaseIntVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForSmallIntVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createSmallIntVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createSmallIntVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcBaseIntVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcBaseIntVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForIntVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createIntVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createIntVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcBaseIntVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcBaseIntVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForBigIntVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createBigIntVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createBigIntVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcBaseIntVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcBaseIntVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForFloat4Vector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createFloat4Vector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createFloat4Vector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcFloat4VectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcFloat4VectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForFloat8Vector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createFloat8Vector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createFloat8Vector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcFloat8VectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcFloat8VectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForBitVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createBitVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createBitVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcBitVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcBitVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForDecimalVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createDecimalVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createDecimalVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcDecimalVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcDecimalVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForDecimal256Vector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createDecimal256Vector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createDecimal256Vector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcDecimalVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcDecimalVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForVarBinaryVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createVarBinaryVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createVarBinaryVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcBinaryVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcBinaryVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForLargeVarBinaryVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createLargeVarBinaryVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createLargeVarBinaryVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcBinaryVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcBinaryVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForFixedSizeBinaryVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createFixedSizeBinaryVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createFixedSizeBinaryVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcBinaryVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcBinaryVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForTimeStampVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createTimeStampMilliVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createTimeStampMilliVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcTimeStampVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcTimeStampVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForTimeNanoVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createTimeNanoVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createTimeNanoVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcTimeVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcTimeVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForTimeMicroVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createTimeMicroVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createTimeMicroVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcTimeVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcTimeVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForTimeMilliVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createTimeMilliVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createTimeMilliVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcTimeVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcTimeVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForTimeSecVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createTimeSecVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createTimeSecVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcTimeVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcTimeVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForDateDayVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createDateDayVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createDateDayVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcDateVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcDateVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForDateMilliVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createDateMilliVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createDateMilliVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcDateVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcDateVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForVarCharVector() {
-    try (
-        ValueVector valueVector = new VarCharVector("", rootAllocatorTestRule.getRootAllocator())) {
+    try (ValueVector valueVector =
+        new VarCharVector("", rootAllocatorTestExtension.getRootAllocator())) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcVarCharVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcVarCharVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForLargeVarCharVector() {
-    try (ValueVector valueVector = new LargeVarCharVector("",
-        rootAllocatorTestRule.getRootAllocator())) {
+    try (ValueVector valueVector =
+        new LargeVarCharVector("", rootAllocatorTestExtension.getRootAllocator())) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcVarCharVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcVarCharVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForDurationVector() {
     try (ValueVector valueVector =
-             new DurationVector("",
-                 new FieldType(true, new ArrowType.Duration(TimeUnit.MILLISECOND), null),
-                 rootAllocatorTestRule.getRootAllocator())) {
+        new DurationVector(
+            "",
+            new FieldType(true, new ArrowType.Duration(TimeUnit.MILLISECOND), null),
+            rootAllocatorTestExtension.getRootAllocator())) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcDurationVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcDurationVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForIntervalDayVector() {
-    try (ValueVector valueVector = new IntervalDayVector("",
-        rootAllocatorTestRule.getRootAllocator())) {
+    try (ValueVector valueVector =
+        new IntervalDayVector("", rootAllocatorTestExtension.getRootAllocator())) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcIntervalVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcIntervalVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForIntervalYearVector() {
-    try (ValueVector valueVector = new IntervalYearVector("",
-        rootAllocatorTestRule.getRootAllocator())) {
+    try (ValueVector valueVector =
+        new IntervalYearVector("", rootAllocatorTestExtension.getRootAllocator())) {
+      ArrowFlightJdbcAccessor accessor =
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
+
+      assertTrue(accessor instanceof ArrowFlightJdbcIntervalVectorAccessor);
+    }
+  }
+
+  @Test
+  public void createAccessorForIntervalMonthDayNanoVector() {
+    try (ValueVector valueVector =
+        new IntervalMonthDayNanoVector("", rootAllocatorTestExtension.getRootAllocator())) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcIntervalVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcIntervalVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForUnionVector() {
-    try (ValueVector valueVector = new UnionVector("", rootAllocatorTestRule.getRootAllocator(),
-        null, null)) {
+    try (ValueVector valueVector =
+        new UnionVector("", rootAllocatorTestExtension.getRootAllocator(), null, null)) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcUnionVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcUnionVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForDenseUnionVector() {
-    try (
-        ValueVector valueVector = new DenseUnionVector("", rootAllocatorTestRule.getRootAllocator(),
-            null, null)) {
+    try (ValueVector valueVector =
+        new DenseUnionVector("", rootAllocatorTestExtension.getRootAllocator(), null, null)) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcDenseUnionVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcDenseUnionVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForStructVector() {
-    try (ValueVector valueVector = StructVector.empty("",
-        rootAllocatorTestRule.getRootAllocator())) {
+    try (ValueVector valueVector =
+        StructVector.empty("", rootAllocatorTestExtension.getRootAllocator())) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcStructVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcStructVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForListVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createListVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createListVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcListVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcListVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForLargeListVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createLargeListVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createLargeListVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcLargeListVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcLargeListVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForFixedSizeListVector() {
-    try (ValueVector valueVector = rootAllocatorTestRule.createFixedSizeListVector()) {
+    try (ValueVector valueVector = rootAllocatorTestExtension.createFixedSizeListVector()) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcFixedSizeListVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcFixedSizeListVectorAccessor);
     }
   }
 
   @Test
   public void createAccessorForMapVector() {
-    try (ValueVector valueVector = MapVector.empty("", rootAllocatorTestRule.getRootAllocator(),
-        true)) {
+    try (ValueVector valueVector =
+        MapVector.empty("", rootAllocatorTestExtension.getRootAllocator(), true)) {
       ArrowFlightJdbcAccessor accessor =
-          ArrowFlightJdbcAccessorFactory.createAccessor(valueVector, GET_CURRENT_ROW,
-              (boolean wasNull) -> {
-              });
+          ArrowFlightJdbcAccessorFactory.createAccessor(
+              valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});
 
-      Assert.assertTrue(accessor instanceof ArrowFlightJdbcMapVectorAccessor);
+      assertTrue(accessor instanceof ArrowFlightJdbcMapVectorAccessor);
     }
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/ArrowFlightJdbcAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/ArrowFlightJdbcAccessorTest.java
index a9b5c46e01e9b..6a101e90d3a27 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/ArrowFlightJdbcAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/ArrowFlightJdbcAccessorTest.java
@@ -14,9 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -25,21 +27,18 @@
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ArrowFlightJdbcAccessorTest {
 
   static class MockedArrowFlightJdbcAccessor extends ArrowFlightJdbcAccessor {
 
     protected MockedArrowFlightJdbcAccessor() {
-      super(() -> 0, (boolean wasNull) -> {
-      });
+      super(() -> 0, (boolean wasNull) -> {});
     }
 
     @Override
@@ -48,8 +47,7 @@ public Class<?> getObjectClass() {
     }
   }
 
-  @Mock
-  MockedArrowFlightJdbcAccessor accessor;
+  @Mock MockedArrowFlightJdbcAccessor accessor;
 
   @Test
   public void testShouldGetObjectWithByteClassReturnGetByte() throws SQLException {
@@ -58,7 +56,7 @@ public void testShouldGetObjectWithByteClassReturnGetByte() throws SQLException
 
     when(accessor.getObject(Byte.class)).thenCallRealMethod();
 
-    Assert.assertEquals(accessor.getObject(Byte.class), (Object) expected);
+    assertEquals(accessor.getObject(Byte.class), (Object) expected);
     verify(accessor).getByte();
   }
 
@@ -69,7 +67,7 @@ public void testShouldGetObjectWithShortClassReturnGetShort() throws SQLExceptio
 
     when(accessor.getObject(Short.class)).thenCallRealMethod();
 
-    Assert.assertEquals(accessor.getObject(Short.class), (Object) expected);
+    assertEquals(accessor.getObject(Short.class), (Object) expected);
     verify(accessor).getShort();
   }
 
@@ -80,7 +78,7 @@ public void testShouldGetObjectWithIntegerClassReturnGetInt() throws SQLExceptio
 
     when(accessor.getObject(Integer.class)).thenCallRealMethod();
 
-    Assert.assertEquals(accessor.getObject(Integer.class), (Object) expected);
+    assertEquals(accessor.getObject(Integer.class), (Object) expected);
     verify(accessor).getInt();
   }
 
@@ -91,7 +89,7 @@ public void testShouldGetObjectWithLongClassReturnGetLong() throws SQLException
 
     when(accessor.getObject(Long.class)).thenCallRealMethod();
 
-    Assert.assertEquals(accessor.getObject(Long.class), (Object) expected);
+    assertEquals(accessor.getObject(Long.class), (Object) expected);
     verify(accessor).getLong();
   }
 
@@ -102,7 +100,7 @@ public void testShouldGetObjectWithFloatClassReturnGetFloat() throws SQLExceptio
 
     when(accessor.getObject(Float.class)).thenCallRealMethod();
 
-    Assert.assertEquals(accessor.getObject(Float.class), (Object) expected);
+    assertEquals(accessor.getObject(Float.class), (Object) expected);
     verify(accessor).getFloat();
   }
 
@@ -113,7 +111,7 @@ public void testShouldGetObjectWithDoubleClassReturnGetDouble() throws SQLExcept
 
     when(accessor.getObject(Double.class)).thenCallRealMethod();
 
-    Assert.assertEquals(accessor.getObject(Double.class), (Object) expected);
+    assertEquals(accessor.getObject(Double.class), (Object) expected);
     verify(accessor).getDouble();
   }
 
@@ -123,7 +121,7 @@ public void testShouldGetObjectWithBooleanClassReturnGetBoolean() throws SQLExce
 
     when(accessor.getObject(Boolean.class)).thenCallRealMethod();
 
-    Assert.assertEquals(true, accessor.getObject(Boolean.class));
+    assertEquals(true, accessor.getObject(Boolean.class));
     verify(accessor).getBoolean();
   }
 
@@ -134,7 +132,7 @@ public void testShouldGetObjectWithBigDecimalClassReturnGetBigDecimal() throws S
 
     when(accessor.getObject(BigDecimal.class)).thenCallRealMethod();
 
-    Assert.assertEquals(expected, accessor.getObject(BigDecimal.class));
+    assertEquals(expected, accessor.getObject(BigDecimal.class));
     verify(accessor).getBigDecimal();
   }
 
@@ -145,7 +143,7 @@ public void testShouldGetObjectWithStringClassReturnGetString() throws SQLExcept
 
     when(accessor.getObject(String.class)).thenCallRealMethod();
 
-    Assert.assertEquals(expected, accessor.getObject(String.class));
+    assertEquals(expected, accessor.getObject(String.class));
     verify(accessor).getString();
   }
 
@@ -156,7 +154,7 @@ public void testShouldGetObjectWithByteArrayClassReturnGetBytes() throws SQLExce
 
     when(accessor.getObject(byte[].class)).thenCallRealMethod();
 
-    Assert.assertArrayEquals(accessor.getObject(byte[].class), expected);
+    assertArrayEquals(accessor.getObject(byte[].class), expected);
     verify(accessor).getBytes();
   }
 
@@ -167,7 +165,7 @@ public void testShouldGetObjectWithObjectClassReturnGetObject() throws SQLExcept
 
     when(accessor.getObject(Object.class)).thenCallRealMethod();
 
-    Assert.assertEquals(expected, accessor.getObject(Object.class));
+    assertEquals(expected, accessor.getObject(Object.class));
     verify(accessor).getObject();
   }
 
@@ -181,178 +179,178 @@ public void testShouldGetObjectWithAccessorsObjectClassReturnGetObject() throws
     verify(accessor).getObject(objectClass);
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetBoolean() throws SQLException {
     when(accessor.getBoolean()).thenCallRealMethod();
-    accessor.getBoolean();
+    assertThrows(SQLException.class, () -> accessor.getBoolean());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetByte() throws SQLException {
     when(accessor.getByte()).thenCallRealMethod();
-    accessor.getByte();
+    assertThrows(SQLException.class, () -> accessor.getByte());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetShort() throws SQLException {
     when(accessor.getShort()).thenCallRealMethod();
-    accessor.getShort();
+    assertThrows(SQLException.class, () -> accessor.getShort());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetInt() throws SQLException {
     when(accessor.getInt()).thenCallRealMethod();
-    accessor.getInt();
+    assertThrows(SQLException.class, () -> accessor.getInt());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetLong() throws SQLException {
     when(accessor.getLong()).thenCallRealMethod();
-    accessor.getLong();
+    assertThrows(SQLException.class, () -> accessor.getLong());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetFloat() throws SQLException {
     when(accessor.getFloat()).thenCallRealMethod();
-    accessor.getFloat();
+    assertThrows(SQLException.class, () -> accessor.getFloat());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetDouble() throws SQLException {
     when(accessor.getDouble()).thenCallRealMethod();
-    accessor.getDouble();
+    assertThrows(SQLException.class, () -> accessor.getDouble());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetBigDecimal() throws SQLException {
     when(accessor.getBigDecimal()).thenCallRealMethod();
-    accessor.getBigDecimal();
+    assertThrows(SQLException.class, () -> accessor.getBigDecimal());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetBytes() throws SQLException {
     when(accessor.getBytes()).thenCallRealMethod();
-    accessor.getBytes();
+    assertThrows(SQLException.class, () -> accessor.getBytes());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetAsciiStream() throws SQLException {
     when(accessor.getAsciiStream()).thenCallRealMethod();
-    accessor.getAsciiStream();
+    assertThrows(SQLException.class, () -> accessor.getAsciiStream());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetUnicodeStream() throws SQLException {
     when(accessor.getUnicodeStream()).thenCallRealMethod();
-    accessor.getUnicodeStream();
+    assertThrows(SQLException.class, () -> accessor.getUnicodeStream());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetBinaryStream() throws SQLException {
     when(accessor.getBinaryStream()).thenCallRealMethod();
-    accessor.getBinaryStream();
+    assertThrows(SQLException.class, () -> accessor.getBinaryStream());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetObject() throws SQLException {
     when(accessor.getObject()).thenCallRealMethod();
-    accessor.getObject();
+    assertThrows(SQLException.class, () -> accessor.getObject());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetObjectMap() throws SQLException {
     Map<String, Class<?>> map = new HashMap<>();
     when(accessor.getObject(map)).thenCallRealMethod();
-    accessor.getObject(map);
+    assertThrows(SQLException.class, () -> accessor.getObject(map));
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetCharacterStream() throws SQLException {
     when(accessor.getCharacterStream()).thenCallRealMethod();
-    accessor.getCharacterStream();
+    assertThrows(SQLException.class, () -> accessor.getCharacterStream());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetRef() throws SQLException {
     when(accessor.getRef()).thenCallRealMethod();
-    accessor.getRef();
+    assertThrows(SQLException.class, () -> accessor.getRef());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetBlob() throws SQLException {
     when(accessor.getBlob()).thenCallRealMethod();
-    accessor.getBlob();
+    assertThrows(SQLException.class, () -> accessor.getBlob());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetClob() throws SQLException {
     when(accessor.getClob()).thenCallRealMethod();
-    accessor.getClob();
+    assertThrows(SQLException.class, () -> accessor.getClob());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetArray() throws SQLException {
     when(accessor.getArray()).thenCallRealMethod();
-    accessor.getArray();
+    assertThrows(SQLException.class, () -> accessor.getArray());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetStruct() throws SQLException {
     when(accessor.getStruct()).thenCallRealMethod();
-    accessor.getStruct();
+    assertThrows(SQLException.class, () -> accessor.getStruct());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetURL() throws SQLException {
     when(accessor.getURL()).thenCallRealMethod();
-    accessor.getURL();
+    assertThrows(SQLException.class, () -> accessor.getURL());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetNClob() throws SQLException {
     when(accessor.getNClob()).thenCallRealMethod();
-    accessor.getNClob();
+    assertThrows(SQLException.class, () -> accessor.getNClob());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetSQLXML() throws SQLException {
     when(accessor.getSQLXML()).thenCallRealMethod();
-    accessor.getSQLXML();
+    assertThrows(SQLException.class, () -> accessor.getSQLXML());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetNString() throws SQLException {
     when(accessor.getNString()).thenCallRealMethod();
-    accessor.getNString();
+    assertThrows(SQLException.class, () -> accessor.getNString());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetNCharacterStream() throws SQLException {
     when(accessor.getNCharacterStream()).thenCallRealMethod();
-    accessor.getNCharacterStream();
+    assertThrows(SQLException.class, () -> accessor.getNCharacterStream());
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetDate() throws SQLException {
     when(accessor.getDate(null)).thenCallRealMethod();
-    accessor.getDate(null);
+    assertThrows(SQLException.class, () -> accessor.getDate(null));
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetTime() throws SQLException {
     when(accessor.getTime(null)).thenCallRealMethod();
-    accessor.getTime(null);
+    assertThrows(SQLException.class, () -> accessor.getTime(null));
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetTimestamp() throws SQLException {
     when(accessor.getTimestamp(null)).thenCallRealMethod();
-    accessor.getTimestamp(null);
+    assertThrows(SQLException.class, () -> accessor.getTimestamp(null));
   }
 
-  @Test(expected = SQLException.class)
+  @Test
   public void testShouldFailToGetBigDecimalWithValue() throws SQLException {
     when(accessor.getBigDecimal(0)).thenCallRealMethod();
-    accessor.getBigDecimal(0);
+    assertThrows(SQLException.class, () -> accessor.getBigDecimal(0));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/ArrowFlightJdbcNullVectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/ArrowFlightJdbcNullVectorAccessorTest.java
index 57e7ecfe02580..2db957badf02d 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/ArrowFlightJdbcNullVectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/ArrowFlightJdbcNullVectorAccessorTest.java
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
 
 public class ArrowFlightJdbcNullVectorAccessorTest {
 
   ArrowFlightJdbcNullVectorAccessor accessor =
-      new ArrowFlightJdbcNullVectorAccessor((boolean wasNull) -> {
-      });
+      new ArrowFlightJdbcNullVectorAccessor((boolean wasNull) -> {});
 
   @Test
   public void testShouldWasNullReturnTrue() {
-    Assert.assertTrue(accessor.wasNull());
+    assertTrue(accessor.wasNull());
   }
 
   @Test
   public void testShouldGetObjectReturnNull() {
-    Assert.assertNull(accessor.getObject());
+    assertNull(accessor.getObject());
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/binary/ArrowFlightJdbcBinaryVectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/binary/ArrowFlightJdbcBinaryVectorAccessorTest.java
index f4d256c4cf8ac..f445fb15a46ae 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/binary/ArrowFlightJdbcBinaryVectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/binary/ArrowFlightJdbcBinaryVectorAccessorTest.java
@@ -14,116 +14,113 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.binary;
 
 import static java.nio.charset.StandardCharsets.US_ASCII;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.InputStream;
 import java.io.Reader;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.function.Supplier;
-
+import java.util.stream.Stream;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.FixedSizeBinaryVector;
 import org.apache.arrow.vector.LargeVarBinaryVector;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.VarBinaryVector;
 import org.apache.commons.io.IOUtils;
 import org.hamcrest.CoreMatchers;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class ArrowFlightJdbcBinaryVectorAccessorTest {
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
+public class ArrowFlightJdbcBinaryVectorAccessorTest {
 
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
   private ValueVector vector;
-  private final Supplier<ValueVector> vectorSupplier;
 
   private final AccessorTestUtils.AccessorSupplier<ArrowFlightJdbcBinaryVectorAccessor>
-      accessorSupplier = (vector, getCurrentRow) -> {
-        ArrowFlightJdbcAccessorFactory.WasNullConsumer noOpWasNullConsumer = (boolean wasNull) -> {
-        };
-        if (vector instanceof VarBinaryVector) {
-          return new ArrowFlightJdbcBinaryVectorAccessor(((VarBinaryVector) vector), getCurrentRow,
-              noOpWasNullConsumer);
-        } else if (vector instanceof LargeVarBinaryVector) {
-          return new ArrowFlightJdbcBinaryVectorAccessor(((LargeVarBinaryVector) vector),
-              getCurrentRow, noOpWasNullConsumer);
-        } else if (vector instanceof FixedSizeBinaryVector) {
-          return new ArrowFlightJdbcBinaryVectorAccessor(((FixedSizeBinaryVector) vector),
-              getCurrentRow, noOpWasNullConsumer);
-        }
-        return null;
-      };
+      accessorSupplier =
+          (vector, getCurrentRow) -> {
+            ArrowFlightJdbcAccessorFactory.WasNullConsumer noOpWasNullConsumer =
+                (boolean wasNull) -> {};
+            if (vector instanceof VarBinaryVector) {
+              return new ArrowFlightJdbcBinaryVectorAccessor(
+                  ((VarBinaryVector) vector), getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof LargeVarBinaryVector) {
+              return new ArrowFlightJdbcBinaryVectorAccessor(
+                  ((LargeVarBinaryVector) vector), getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof FixedSizeBinaryVector) {
+              return new ArrowFlightJdbcBinaryVectorAccessor(
+                  ((FixedSizeBinaryVector) vector), getCurrentRow, noOpWasNullConsumer);
+            }
+            return null;
+          };
 
   private final AccessorTestUtils.AccessorIterator<ArrowFlightJdbcBinaryVectorAccessor>
-      accessorIterator =
-      new AccessorTestUtils.AccessorIterator<>(collector, accessorSupplier);
-
-  @Parameterized.Parameters(name = "{1}")
-  public static Collection<Object[]> data() {
-    return Arrays.asList(new Object[][] {
-        {(Supplier<ValueVector>) () -> rootAllocatorTestRule.createVarBinaryVector(),
-            "VarBinaryVector"},
-        {(Supplier<ValueVector>) () -> rootAllocatorTestRule.createLargeVarBinaryVector(),
-            "LargeVarBinaryVector"},
-        {(Supplier<ValueVector>) () -> rootAllocatorTestRule.createFixedSizeBinaryVector(),
-            "FixedSizeBinaryVector"},
-    });
-  }
-
-  public ArrowFlightJdbcBinaryVectorAccessorTest(Supplier<ValueVector> vectorSupplier,
-                                                 String vectorType) {
-    this.vectorSupplier = vectorSupplier;
+      accessorIterator = new AccessorTestUtils.AccessorIterator<>(accessorSupplier);
+
+  public static Stream<Arguments> data() {
+    return Stream.of(
+        Arguments.of(
+            (Supplier<ValueVector>) () -> rootAllocatorTestExtension.createVarBinaryVector(),
+            "VarBinaryVector"),
+        Arguments.of(
+            (Supplier<ValueVector>) () -> rootAllocatorTestExtension.createLargeVarBinaryVector(),
+            "LargeVarBinaryVector"),
+        Arguments.of(
+            (Supplier<ValueVector>) () -> rootAllocatorTestExtension.createFixedSizeBinaryVector(),
+            "FixedSizeBinaryVector"));
   }
 
-  @Before
-  public void setup() {
+  public void setup(Supplier<ValueVector> vectorSupplier) {
     this.vector = vectorSupplier.get();
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     this.vector.close();
   }
 
-  @Test
-  public void testShouldGetStringReturnExpectedString() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcBinaryVectorAccessor::getString,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetStringReturnExpectedString(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcBinaryVectorAccessor::getString,
         (accessor) -> is(new String(accessor.getBytes(), UTF_8)));
   }
 
-  @Test
-  public void testShouldGetStringReturnNull() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetStringReturnNull(Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
     vector.reset();
     vector.setValueCount(5);
 
-    accessorIterator
-        .assertAccessorGetter(vector, ArrowFlightJdbcBinaryVectorAccessor::getString,
-            CoreMatchers.nullValue());
+    accessorIterator.assertAccessorGetter(
+        vector, ArrowFlightJdbcBinaryVectorAccessor::getString, CoreMatchers.nullValue());
   }
 
-  @Test
-  public void testShouldGetBytesReturnExpectedByteArray() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcBinaryVectorAccessor::getBytes,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetBytesReturnExpectedByteArray(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcBinaryVectorAccessor::getBytes,
         (accessor, currentRow) -> {
           if (vector instanceof VarBinaryVector) {
             return is(((VarBinaryVector) vector).get(currentRow));
@@ -136,109 +133,146 @@ public void testShouldGetBytesReturnExpectedByteArray() throws Exception {
         });
   }
 
-  @Test
-  public void testShouldGetBytesReturnNull() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetBytesReturnNull(Supplier<ValueVector> vectorSupplier) {
+    setup(vectorSupplier);
     vector.reset();
     vector.setValueCount(5);
 
     ArrowFlightJdbcBinaryVectorAccessor accessor = accessorSupplier.supply(vector, () -> 0);
-    collector.checkThat(accessor.getBytes(), CoreMatchers.equalTo(null));
-    collector.checkThat(accessor.wasNull(), is(true));
+    assertThat(accessor.getBytes(), CoreMatchers.equalTo(null));
+    assertThat(accessor.wasNull(), is(true));
   }
 
-  @Test
-  public void testShouldGetObjectReturnAsGetBytes() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcBinaryVectorAccessor::getObject,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetObjectReturnAsGetBytes(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcBinaryVectorAccessor::getObject,
         (accessor) -> is(accessor.getBytes()));
   }
 
-  @Test
-  public void testShouldGetObjectReturnNull() {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetObjectReturnNull(Supplier<ValueVector> vectorSupplier) {
+    setup(vectorSupplier);
     vector.reset();
     vector.setValueCount(5);
 
     ArrowFlightJdbcBinaryVectorAccessor accessor = accessorSupplier.supply(vector, () -> 0);
-    collector.checkThat(accessor.getObject(), CoreMatchers.equalTo(null));
-    collector.checkThat(accessor.wasNull(), is(true));
+    assertThat(accessor.getObject(), CoreMatchers.equalTo(null));
+    assertThat(accessor.wasNull(), is(true));
   }
 
-  @Test
-  public void testShouldGetUnicodeStreamReturnCorrectInputStream() throws Exception {
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      InputStream inputStream = accessor.getUnicodeStream();
-      String actualString = IOUtils.toString(inputStream, UTF_8);
-      collector.checkThat(accessor.wasNull(), is(false));
-      collector.checkThat(actualString, is(accessor.getString()));
-    });
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetUnicodeStreamReturnCorrectInputStream(
+      Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          InputStream inputStream = accessor.getUnicodeStream();
+          String actualString = IOUtils.toString(inputStream, UTF_8);
+          assertThat(accessor.wasNull(), is(false));
+          assertThat(actualString, is(accessor.getString()));
+        });
   }
 
-  @Test
-  public void testShouldGetUnicodeStreamReturnNull() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetUnicodeStreamReturnNull(Supplier<ValueVector> vectorSupplier) {
+    setup(vectorSupplier);
     vector.reset();
     vector.setValueCount(5);
 
     ArrowFlightJdbcBinaryVectorAccessor accessor = accessorSupplier.supply(vector, () -> 0);
-    collector.checkThat(accessor.getUnicodeStream(), CoreMatchers.equalTo(null));
-    collector.checkThat(accessor.wasNull(), is(true));
+    assertThat(accessor.getUnicodeStream(), CoreMatchers.equalTo(null));
+    assertThat(accessor.wasNull(), is(true));
   }
 
-  @Test
-  public void testShouldGetAsciiStreamReturnCorrectInputStream() throws Exception {
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      InputStream inputStream = accessor.getAsciiStream();
-      String actualString = IOUtils.toString(inputStream, US_ASCII);
-      collector.checkThat(accessor.wasNull(), is(false));
-      collector.checkThat(actualString, is(accessor.getString()));
-    });
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetAsciiStreamReturnCorrectInputStream(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          InputStream inputStream = accessor.getAsciiStream();
+          String actualString = IOUtils.toString(inputStream, US_ASCII);
+          assertThat(accessor.wasNull(), is(false));
+          assertThat(actualString, is(accessor.getString()));
+        });
   }
 
-  @Test
-  public void testShouldGetAsciiStreamReturnNull() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetAsciiStreamReturnNull(Supplier<ValueVector> vectorSupplier) {
+    setup(vectorSupplier);
     vector.reset();
     vector.setValueCount(5);
 
     ArrowFlightJdbcBinaryVectorAccessor accessor = accessorSupplier.supply(vector, () -> 0);
-    collector.checkThat(accessor.getAsciiStream(), CoreMatchers.equalTo(null));
-    collector.checkThat(accessor.wasNull(), is(true));
+    assertThat(accessor.getAsciiStream(), CoreMatchers.equalTo(null));
+    assertThat(accessor.wasNull(), is(true));
   }
 
-  @Test
-  public void testShouldGetBinaryStreamReturnCurrentInputStream() throws Exception {
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      InputStream inputStream = accessor.getBinaryStream();
-      String actualString = IOUtils.toString(inputStream, UTF_8);
-      collector.checkThat(accessor.wasNull(), is(false));
-      collector.checkThat(actualString, is(accessor.getString()));
-    });
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetBinaryStreamReturnCurrentInputStream(
+      Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          InputStream inputStream = accessor.getBinaryStream();
+          String actualString = IOUtils.toString(inputStream, UTF_8);
+          assertThat(accessor.wasNull(), is(false));
+          assertThat(actualString, is(accessor.getString()));
+        });
   }
 
-  @Test
-  public void testShouldGetBinaryStreamReturnNull() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetBinaryStreamReturnNull(Supplier<ValueVector> vectorSupplier) {
+    setup(vectorSupplier);
     vector.reset();
     vector.setValueCount(5);
 
     ArrowFlightJdbcBinaryVectorAccessor accessor = accessorSupplier.supply(vector, () -> 0);
-    collector.checkThat(accessor.getBinaryStream(), CoreMatchers.equalTo(null));
-    collector.checkThat(accessor.wasNull(), is(true));
+    assertThat(accessor.getBinaryStream(), CoreMatchers.equalTo(null));
+    assertThat(accessor.wasNull(), is(true));
   }
 
-  @Test
-  public void testShouldGetCharacterStreamReturnCorrectReader() throws Exception {
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      Reader characterStream = accessor.getCharacterStream();
-      String actualString = IOUtils.toString(characterStream);
-      collector.checkThat(accessor.wasNull(), is(false));
-      collector.checkThat(actualString, is(accessor.getString()));
-    });
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetCharacterStreamReturnCorrectReader(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          Reader characterStream = accessor.getCharacterStream();
+          String actualString = IOUtils.toString(characterStream);
+          assertThat(accessor.wasNull(), is(false));
+          assertThat(actualString, is(accessor.getString()));
+        });
   }
 
-  @Test
-  public void testShouldGetCharacterStreamReturnNull() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetCharacterStreamReturnNull(Supplier<ValueVector> vectorSupplier) {
+    setup(vectorSupplier);
     vector.reset();
     vector.setValueCount(5);
 
     ArrowFlightJdbcBinaryVectorAccessor accessor = accessorSupplier.supply(vector, () -> 0);
-    collector.checkThat(accessor.getCharacterStream(), CoreMatchers.equalTo(null));
-    collector.checkThat(accessor.wasNull(), is(true));
+    assertThat(accessor.getCharacterStream(), CoreMatchers.equalTo(null));
+    assertThat(accessor.wasNull(), is(true));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDateVectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDateVectorAccessorTest.java
index 36af5134626a5..3bbe3e1711124 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDateVectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDateVectorAccessorTest.java
@@ -14,163 +14,175 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.calendar;
 
 import static org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcDateVectorAccessor.getTimeUnitForVector;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.sql.Date;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
-import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Collection;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
-
+import java.util.stream.Stream;
 import org.apache.arrow.driver.jdbc.accessor.impl.text.ArrowFlightJdbcVarCharVectorAccessor;
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.BaseFixedWidthVector;
 import org.apache.arrow.vector.DateDayVector;
 import org.apache.arrow.vector.DateMilliVector;
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.arrow.vector.util.Text;
 import org.hamcrest.CoreMatchers;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
 public class ArrowFlightJdbcDateVectorAccessorTest {
 
   public static final String AMERICA_VANCOUVER = "America/Vancouver";
 
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
-
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
   private BaseFixedWidthVector vector;
-  private final Supplier<BaseFixedWidthVector> vectorSupplier;
 
   private final AccessorTestUtils.AccessorSupplier<ArrowFlightJdbcDateVectorAccessor>
-      accessorSupplier = (vector, getCurrentRow) -> {
-        if (vector instanceof DateDayVector) {
-          return new ArrowFlightJdbcDateVectorAccessor((DateDayVector) vector, getCurrentRow,
-              (boolean wasNull) -> {
-              });
-        } else if (vector instanceof DateMilliVector) {
-          return new ArrowFlightJdbcDateVectorAccessor((DateMilliVector) vector, getCurrentRow,
-              (boolean wasNull) -> {
-              });
-        }
-        return null;
-      };
+      accessorSupplier =
+          (vector, getCurrentRow) -> {
+            if (vector instanceof DateDayVector) {
+              return new ArrowFlightJdbcDateVectorAccessor(
+                  (DateDayVector) vector, getCurrentRow, (boolean wasNull) -> {});
+            } else if (vector instanceof DateMilliVector) {
+              return new ArrowFlightJdbcDateVectorAccessor(
+                  (DateMilliVector) vector, getCurrentRow, (boolean wasNull) -> {});
+            }
+            return null;
+          };
 
   private final AccessorTestUtils.AccessorIterator<ArrowFlightJdbcDateVectorAccessor>
-      accessorIterator =
-      new AccessorTestUtils.AccessorIterator<>(collector, accessorSupplier);
-
-  @Parameterized.Parameters(name = "{1}")
-  public static Collection<Object[]> data() {
-    return Arrays.asList(new Object[][] {
-        {(Supplier<DateDayVector>) () -> rootAllocatorTestRule.createDateDayVector(),
-            "DateDayVector"},
-        {(Supplier<DateMilliVector>) () -> rootAllocatorTestRule.createDateMilliVector(),
-            "DateMilliVector"},
-    });
-  }
-
-  public ArrowFlightJdbcDateVectorAccessorTest(Supplier<BaseFixedWidthVector> vectorSupplier,
-                                               String vectorType) {
-    this.vectorSupplier = vectorSupplier;
+      accessorIterator = new AccessorTestUtils.AccessorIterator<>(accessorSupplier);
+
+  public static Stream<Arguments> data() {
+    return Stream.of(
+        Arguments.of(
+            (Supplier<DateDayVector>) () -> rootAllocatorTestExtension.createDateDayVector(),
+            "DateDayVector"),
+        Arguments.of(
+            (Supplier<DateMilliVector>) () -> rootAllocatorTestExtension.createDateMilliVector(),
+            "DateMilliVector"));
   }
 
-  @Before
-  public void setup() {
+  public void setup(Supplier<BaseFixedWidthVector> vectorSupplier) {
     this.vector = vectorSupplier.get();
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     this.vector.close();
   }
 
-  @Test
-  public void testShouldGetTimestampReturnValidTimestampWithoutCalendar() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, accessor -> accessor.getTimestamp(null),
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetTimestampReturnValidTimestampWithoutCalendar(
+      Supplier<BaseFixedWidthVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        accessor -> accessor.getTimestamp(null),
         (accessor, currentRow) -> is(getTimestampForVector(currentRow)));
   }
 
-  @Test
-  public void testShouldGetObjectWithDateClassReturnValidDateWithoutCalendar() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, accessor -> accessor.getObject(Date.class),
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetObjectWithDateClassReturnValidDateWithoutCalendar(
+      Supplier<BaseFixedWidthVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        accessor -> accessor.getObject(Date.class),
         (accessor, currentRow) -> is(new Date(getTimestampForVector(currentRow).getTime())));
   }
 
-  @Test
-  public void testShouldGetTimestampReturnValidTimestampWithCalendar() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetTimestampReturnValidTimestampWithCalendar(
+      Supplier<BaseFixedWidthVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
     TimeZone timeZone = TimeZone.getTimeZone(AMERICA_VANCOUVER);
     Calendar calendar = Calendar.getInstance(timeZone);
 
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      final Timestamp resultWithoutCalendar = accessor.getTimestamp(null);
-      final Timestamp result = accessor.getTimestamp(calendar);
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          final Timestamp resultWithoutCalendar = accessor.getTimestamp(null);
+          final Timestamp result = accessor.getTimestamp(calendar);
 
-      long offset = timeZone.getOffset(resultWithoutCalendar.getTime());
+          long offset = timeZone.getOffset(resultWithoutCalendar.getTime());
 
-      collector.checkThat(resultWithoutCalendar.getTime() - result.getTime(), is(offset));
-      collector.checkThat(accessor.wasNull(), is(false));
-    });
+          assertThat(resultWithoutCalendar.getTime() - result.getTime(), is(offset));
+          assertThat(accessor.wasNull(), is(false));
+        });
   }
 
-  @Test
-  public void testShouldGetTimestampReturnNull() {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetTimestampReturnNull(Supplier<BaseFixedWidthVector> vectorSupplier) {
+    setup(vectorSupplier);
     vector.setNull(0);
     ArrowFlightJdbcDateVectorAccessor accessor = accessorSupplier.supply(vector, () -> 0);
-    collector.checkThat(accessor.getTimestamp(null), CoreMatchers.equalTo(null));
-    collector.checkThat(accessor.wasNull(), is(true));
+    assertThat(accessor.getTimestamp(null), CoreMatchers.equalTo(null));
+    assertThat(accessor.wasNull(), is(true));
   }
 
-  @Test
-  public void testShouldGetDateReturnValidDateWithoutCalendar() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, accessor -> accessor.getDate(null),
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetDateReturnValidDateWithoutCalendar(
+      Supplier<BaseFixedWidthVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        accessor -> accessor.getDate(null),
         (accessor, currentRow) -> is(new Date(getTimestampForVector(currentRow).getTime())));
   }
 
-  @Test
-  public void testShouldGetDateReturnValidDateWithCalendar() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetDateReturnValidDateWithCalendar(
+      Supplier<BaseFixedWidthVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
     TimeZone timeZone = TimeZone.getTimeZone(AMERICA_VANCOUVER);
     Calendar calendar = Calendar.getInstance(timeZone);
 
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      final Date resultWithoutCalendar = accessor.getDate(null);
-      final Date result = accessor.getDate(calendar);
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          final Date resultWithoutCalendar = accessor.getDate(null);
+          final Date result = accessor.getDate(calendar);
 
-      long offset = timeZone.getOffset(resultWithoutCalendar.getTime());
+          long offset = timeZone.getOffset(resultWithoutCalendar.getTime());
 
-      collector.checkThat(resultWithoutCalendar.getTime() - result.getTime(), is(offset));
-      collector.checkThat(accessor.wasNull(), is(false));
-    });
+          assertThat(resultWithoutCalendar.getTime() - result.getTime(), is(offset));
+          assertThat(accessor.wasNull(), is(false));
+        });
   }
 
-  @Test
-  public void testShouldGetDateReturnNull() {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetDateReturnNull(Supplier<BaseFixedWidthVector> vectorSupplier) {
+    setup(vectorSupplier);
     vector.setNull(0);
     ArrowFlightJdbcDateVectorAccessor accessor = accessorSupplier.supply(vector, () -> 0);
-    collector.checkThat(accessor.getDate(null), CoreMatchers.equalTo(null));
-    collector.checkThat(accessor.wasNull(), is(true));
+    assertThat(accessor.getDate(null), CoreMatchers.equalTo(null));
+    assertThat(accessor.wasNull(), is(true));
   }
 
   private Timestamp getTimestampForVector(int currentRow) {
@@ -188,67 +200,82 @@ private Timestamp getTimestampForVector(int currentRow) {
     return expectedTimestamp;
   }
 
-  @Test
-  public void testShouldGetObjectClass() throws Exception {
-    accessorIterator
-        .assertAccessorGetter(vector, ArrowFlightJdbcDateVectorAccessor::getObjectClass,
-            equalTo(Date.class));
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetObjectClass(Supplier<BaseFixedWidthVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector, ArrowFlightJdbcDateVectorAccessor::getObjectClass, equalTo(Date.class));
   }
 
-  @Test
-  public void testShouldGetStringBeConsistentWithVarCharAccessorWithoutCalendar() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetStringBeConsistentWithVarCharAccessorWithoutCalendar(
+      Supplier<BaseFixedWidthVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
     assertGetStringIsConsistentWithVarCharAccessor(null);
   }
 
-  @Test
-  public void testShouldGetStringBeConsistentWithVarCharAccessorWithCalendar() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetStringBeConsistentWithVarCharAccessorWithCalendar(
+      Supplier<BaseFixedWidthVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
     Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone(AMERICA_VANCOUVER));
     assertGetStringIsConsistentWithVarCharAccessor(calendar);
   }
 
-  @Test
-  public void testValidateGetStringTimeZoneConsistency() throws Exception {
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      final TimeZone defaultTz = TimeZone.getDefault();
-      try {
-        final String string = accessor.getString(); // Should always be UTC as no calendar is provided
-
-        // Validate with UTC
-        Date date = accessor.getDate(null);
-        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
-        collector.checkThat(date.toString(), is(string));
-
-        // Validate with different TZ
-        TimeZone.setDefault(TimeZone.getTimeZone(AMERICA_VANCOUVER));
-        collector.checkThat(date.toString(), not(string));
-
-        collector.checkThat(accessor.wasNull(), is(false));
-      } finally {
-        // Set default Tz back
-        TimeZone.setDefault(defaultTz);
-      }
-    });
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testValidateGetStringTimeZoneConsistency(
+      Supplier<BaseFixedWidthVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          final TimeZone defaultTz = TimeZone.getDefault();
+          try {
+            final String string =
+                accessor.getString(); // Should always be UTC as no calendar is provided
+
+            // Validate with UTC
+            Date date = accessor.getDate(null);
+            TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+            assertThat(date.toString(), is(string));
+
+            // Validate with different TZ
+            TimeZone.setDefault(TimeZone.getTimeZone(AMERICA_VANCOUVER));
+            assertThat(date.toString(), not(string));
+
+            assertThat(accessor.wasNull(), is(false));
+          } finally {
+            // Set default Tz back
+            TimeZone.setDefault(defaultTz);
+          }
+        });
   }
 
   private void assertGetStringIsConsistentWithVarCharAccessor(Calendar calendar) throws Exception {
-    try (VarCharVector varCharVector = new VarCharVector("",
-        rootAllocatorTestRule.getRootAllocator())) {
+    try (VarCharVector varCharVector =
+        new VarCharVector("", rootAllocatorTestExtension.getRootAllocator())) {
       varCharVector.allocateNew(1);
       ArrowFlightJdbcVarCharVectorAccessor varCharVectorAccessor =
-          new ArrowFlightJdbcVarCharVectorAccessor(varCharVector, () -> 0, (boolean wasNull) -> {
-          });
+          new ArrowFlightJdbcVarCharVectorAccessor(varCharVector, () -> 0, (boolean wasNull) -> {});
 
-      accessorIterator.iterate(vector, (accessor, currentRow) -> {
-        final String string = accessor.getString();
-        varCharVector.set(0, new Text(string));
-        varCharVector.setValueCount(1);
+      accessorIterator.iterate(
+          vector,
+          (accessor, currentRow) -> {
+            final String string = accessor.getString();
+            varCharVector.set(0, new Text(string));
+            varCharVector.setValueCount(1);
 
-        Date dateFromVarChar = varCharVectorAccessor.getDate(calendar);
-        Date date = accessor.getDate(calendar);
+            Date dateFromVarChar = varCharVectorAccessor.getDate(calendar);
+            Date date = accessor.getDate(calendar);
 
-        collector.checkThat(date, is(dateFromVarChar));
-        collector.checkThat(accessor.wasNull(), is(false));
-      });
+            assertThat(date, is(dateFromVarChar));
+            assertThat(accessor.wasNull(), is(false));
+          });
     }
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDurationVectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDurationVectorAccessorTest.java
index 64ddb573f1bfb..48492e21224b2 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDurationVectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDurationVectorAccessorTest.java
@@ -14,52 +14,45 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.calendar;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 
 import java.time.Duration;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.DurationVector;
 import org.apache.arrow.vector.types.TimeUnit;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.FieldType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class ArrowFlightJdbcDurationVectorAccessorTest {
 
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
-
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
   private DurationVector vector;
 
   private final AccessorTestUtils.AccessorSupplier<ArrowFlightJdbcDurationVectorAccessor>
       accessorSupplier =
-          (vector, getCurrentRow) -> new ArrowFlightJdbcDurationVectorAccessor((DurationVector) vector,
-              getCurrentRow, (boolean wasNull) -> {
-          });
+          (vector, getCurrentRow) ->
+              new ArrowFlightJdbcDurationVectorAccessor(
+                  (DurationVector) vector, getCurrentRow, (boolean wasNull) -> {});
 
   private final AccessorTestUtils.AccessorIterator<ArrowFlightJdbcDurationVectorAccessor>
-      accessorIterator =
-      new AccessorTestUtils.AccessorIterator<>(collector, accessorSupplier);
+      accessorIterator = new AccessorTestUtils.AccessorIterator<>(accessorSupplier);
 
-  @Before
+  @BeforeEach
   public void setup() {
     FieldType fieldType = new FieldType(true, new ArrowType.Duration(TimeUnit.MILLISECOND), null);
-    this.vector = new DurationVector("", fieldType, rootAllocatorTestRule.getRootAllocator());
+    this.vector = new DurationVector("", fieldType, rootAllocatorTestExtension.getRootAllocator());
 
     int valueCount = 10;
     this.vector.setValueCount(valueCount);
@@ -68,14 +61,16 @@ public void setup() {
     }
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     this.vector.close();
   }
 
   @Test
   public void getObject() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcDurationVectorAccessor::getObject,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcDurationVectorAccessor::getObject,
         (accessor, currentRow) -> is(Duration.ofDays(currentRow + 1)));
   }
 
@@ -86,13 +81,17 @@ public void getObjectForNull() throws Exception {
       vector.setNull(i);
     }
 
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcDurationVectorAccessor::getObject,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcDurationVectorAccessor::getObject,
         (accessor, currentRow) -> equalTo(null));
   }
 
   @Test
   public void getString() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcAccessor::getString,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcAccessor::getString,
         (accessor, currentRow) -> is(Duration.ofDays(currentRow + 1).toString()));
   }
 
@@ -103,13 +102,15 @@ public void getStringForNull() throws Exception {
       vector.setNull(i);
     }
 
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcAccessor::getString,
-        (accessor, currentRow) -> equalTo(null));
+    accessorIterator.assertAccessorGetter(
+        vector, ArrowFlightJdbcAccessor::getString, (accessor, currentRow) -> equalTo(null));
   }
 
   @Test
   public void testShouldGetObjectClass() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcAccessor::getObjectClass,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcAccessor::getObjectClass,
         (accessor, currentRow) -> equalTo(Duration.class));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcIntervalVectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcIntervalVectorAccessorTest.java
index 322b7d40bd6e1..521debc323e83 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcIntervalVectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcIntervalVectorAccessorTest.java
@@ -14,208 +14,276 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.calendar;
 
 import static org.apache.arrow.driver.jdbc.utils.IntervalStringUtils.formatIntervalDay;
 import static org.apache.arrow.driver.jdbc.utils.IntervalStringUtils.formatIntervalYear;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.Duration;
 import java.time.Period;
-import java.util.Arrays;
-import java.util.Collection;
+import java.time.format.DateTimeParseException;
 import java.util.function.Supplier;
-
+import java.util.stream.Stream;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.IntervalDayVector;
+import org.apache.arrow.vector.IntervalMonthDayNanoVector;
 import org.apache.arrow.vector.IntervalYearVector;
+import org.apache.arrow.vector.PeriodDuration;
 import org.apache.arrow.vector.ValueVector;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class ArrowFlightJdbcIntervalVectorAccessorTest {
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
+public class ArrowFlightJdbcIntervalVectorAccessorTest {
 
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
-  private final Supplier<ValueVector> vectorSupplier;
   private ValueVector vector;
 
   private final AccessorTestUtils.AccessorSupplier<ArrowFlightJdbcIntervalVectorAccessor>
-      accessorSupplier = (vector, getCurrentRow) -> {
-        ArrowFlightJdbcAccessorFactory.WasNullConsumer noOpWasNullConsumer = (boolean wasNull) -> {
-        };
-        if (vector instanceof IntervalDayVector) {
-          return new ArrowFlightJdbcIntervalVectorAccessor((IntervalDayVector) vector,
-              getCurrentRow, noOpWasNullConsumer);
-        } else if (vector instanceof IntervalYearVector) {
-          return new ArrowFlightJdbcIntervalVectorAccessor((IntervalYearVector) vector,
-              getCurrentRow, noOpWasNullConsumer);
-        }
-        return null;
-      };
+      accessorSupplier =
+          (vector, getCurrentRow) -> {
+            ArrowFlightJdbcAccessorFactory.WasNullConsumer noOpWasNullConsumer =
+                (boolean wasNull) -> {};
+            if (vector instanceof IntervalDayVector) {
+              return new ArrowFlightJdbcIntervalVectorAccessor(
+                  (IntervalDayVector) vector, getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof IntervalYearVector) {
+              return new ArrowFlightJdbcIntervalVectorAccessor(
+                  (IntervalYearVector) vector, getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof IntervalMonthDayNanoVector) {
+              return new ArrowFlightJdbcIntervalVectorAccessor(
+                  (IntervalMonthDayNanoVector) vector, getCurrentRow, noOpWasNullConsumer);
+            }
+            return null;
+          };
 
   final AccessorTestUtils.AccessorIterator<ArrowFlightJdbcIntervalVectorAccessor> accessorIterator =
-      new AccessorTestUtils.AccessorIterator<>(collector, accessorSupplier);
-
-  @Parameterized.Parameters(name = "{1}")
-  public static Collection<Object[]> data() {
-    return Arrays.asList(new Object[][] {
-        {(Supplier<ValueVector>) () -> {
-          IntervalDayVector vector =
-              new IntervalDayVector("", rootAllocatorTestRule.getRootAllocator());
-
-          int valueCount = 10;
-          vector.setValueCount(valueCount);
-          for (int i = 0; i < valueCount; i++) {
-            vector.set(i, i + 1, (i + 1) * 1000);
-          }
-          return vector;
-        }, "IntervalDayVector"},
-        {(Supplier<ValueVector>) () -> {
-          IntervalYearVector vector =
-              new IntervalYearVector("", rootAllocatorTestRule.getRootAllocator());
-
-          int valueCount = 10;
-          vector.setValueCount(valueCount);
-          for (int i = 0; i < valueCount; i++) {
-            vector.set(i, i + 1);
-          }
-          return vector;
-        }, "IntervalYearVector"},
-    });
-  }
-
-  public ArrowFlightJdbcIntervalVectorAccessorTest(Supplier<ValueVector> vectorSupplier,
-                                                   String vectorType) {
-    this.vectorSupplier = vectorSupplier;
-  }
-
-  @Before
-  public void setup() {
+      new AccessorTestUtils.AccessorIterator<>(accessorSupplier);
+
+  public static Stream<Arguments> data() {
+    return Stream.of(
+        Arguments.of(
+            (Supplier<ValueVector>)
+                () -> {
+                  IntervalDayVector vector =
+                      new IntervalDayVector("", rootAllocatorTestExtension.getRootAllocator());
+
+                  int valueCount = 10;
+                  vector.setValueCount(valueCount);
+                  for (int i = 0; i < valueCount; i++) {
+                    vector.set(i, i + 1, (i + 1) * 1000);
+                  }
+                  return vector;
+                },
+            "IntervalDayVector"),
+        Arguments.of(
+            (Supplier<ValueVector>)
+                () -> {
+                  IntervalYearVector vector =
+                      new IntervalYearVector("", rootAllocatorTestExtension.getRootAllocator());
+
+                  int valueCount = 10;
+                  vector.setValueCount(valueCount);
+                  for (int i = 0; i < valueCount; i++) {
+                    vector.set(i, i + 1);
+                  }
+                  return vector;
+                },
+            "IntervalYearVector"),
+        Arguments.of(
+            (Supplier<ValueVector>)
+                () -> {
+                  IntervalMonthDayNanoVector vector =
+                      new IntervalMonthDayNanoVector(
+                          "", rootAllocatorTestExtension.getRootAllocator());
+
+                  int valueCount = 10;
+                  vector.setValueCount(valueCount);
+                  for (int i = 0; i < valueCount; i++) {
+                    vector.set(i, i + 1, (i + 1) * 10, (i + 1) * 100);
+                  }
+                  return vector;
+                },
+            "IntervalMonthDayNanoVector"));
+  }
+
+  public void setup(Supplier<ValueVector> vectorSupplier) {
     this.vector = vectorSupplier.get();
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
-    this.vector.close();
+    if (this.vector != null) {
+      this.vector.close();
+    }
   }
 
-  @Test
-  public void testShouldGetObjectReturnValidObject() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcIntervalVectorAccessor::getObject,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetObjectReturnValidObject(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcIntervalVectorAccessor::getObject,
         (accessor, currentRow) -> is(getExpectedObject(vector, currentRow)));
   }
 
-  @Test
-  public void testShouldGetObjectPassingObjectClassAsParameterReturnValidObject() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetObjectPassingObjectClassAsParameterReturnValidObject(
+      Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
     Class<?> objectClass = getExpectedObjectClassForVector(vector);
-    accessorIterator.assertAccessorGetter(vector, accessor -> accessor.getObject(objectClass),
+    accessorIterator.assertAccessorGetter(
+        vector,
+        accessor -> accessor.getObject(objectClass),
         (accessor, currentRow) -> is(getExpectedObject(vector, currentRow)));
   }
 
-  @Test
-  public void testShouldGetObjectReturnNull() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetObjectReturnNull(Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
     setAllNullOnVector(vector);
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcIntervalVectorAccessor::getObject,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcIntervalVectorAccessor::getObject,
         (accessor, currentRow) -> equalTo(null));
   }
 
   private String getStringOnVector(ValueVector vector, int index) {
-    String object = getExpectedObject(vector, index).toString();
+    Object object = getExpectedObject(vector, index);
     if (object == null) {
       return null;
     } else if (vector instanceof IntervalDayVector) {
-      return formatIntervalDay(Duration.parse(object));
+      return formatIntervalDay(Duration.parse(object.toString()));
     } else if (vector instanceof IntervalYearVector) {
-      return formatIntervalYear(Period.parse(object));
+      return formatIntervalYear(Period.parse(object.toString()));
+    } else if (vector instanceof IntervalMonthDayNanoVector) {
+      String iso8601IntervalString = ((PeriodDuration) object).toISO8601IntervalString();
+      String[] periodAndDuration = iso8601IntervalString.split("T");
+      if (periodAndDuration.length == 1) {
+        // If there is no 'T', then either Period or Duration is zero, and the other one will
+        // successfully parse it
+        String periodOrDuration = periodAndDuration[0];
+        try {
+          return new PeriodDuration(Period.parse(periodOrDuration), Duration.ZERO)
+              .toISO8601IntervalString();
+        } catch (DateTimeParseException e) {
+          return new PeriodDuration(Period.ZERO, Duration.parse(periodOrDuration))
+              .toISO8601IntervalString();
+        }
+      } else {
+        // If there is a 'T', both Period and Duration are non-zero, and we just need to prepend the
+        // 'PT' to the
+        // duration for both to parse successfully
+        Period parse = Period.parse(periodAndDuration[0]);
+        Duration duration = Duration.parse("PT" + periodAndDuration[1]);
+        return new PeriodDuration(parse, duration).toISO8601IntervalString();
+      }
     }
     return null;
   }
 
-  @Test
-  public void testShouldGetIntervalYear( ) {
-    Assert.assertEquals("-002-00", formatIntervalYear(Period.parse("P-2Y")));
-    Assert.assertEquals("-001-01", formatIntervalYear(Period.parse("P-1Y-1M")));
-    Assert.assertEquals("-001-02", formatIntervalYear(Period.parse("P-1Y-2M")));
-    Assert.assertEquals("-002-03", formatIntervalYear(Period.parse("P-2Y-3M")));
-    Assert.assertEquals("-002-04", formatIntervalYear(Period.parse("P-2Y-4M")));
-    Assert.assertEquals("-011-01", formatIntervalYear(Period.parse("P-11Y-1M")));
-    Assert.assertEquals("+002-00", formatIntervalYear(Period.parse("P+2Y")));
-    Assert.assertEquals("+001-01", formatIntervalYear(Period.parse("P+1Y1M")));
-    Assert.assertEquals("+001-02", formatIntervalYear(Period.parse("P+1Y2M")));
-    Assert.assertEquals("+002-03", formatIntervalYear(Period.parse("P+2Y3M")));
-    Assert.assertEquals("+002-04", formatIntervalYear(Period.parse("P+2Y4M")));
-    Assert.assertEquals("+011-01", formatIntervalYear(Period.parse("P+11Y1M")));
-  }
-
-  @Test
-  public void testShouldGetIntervalDay( ) {
-    Assert.assertEquals("-001 00:00:00.000", formatIntervalDay(Duration.parse("PT-24H")));
-    Assert.assertEquals("+001 00:00:00.000", formatIntervalDay(Duration.parse("PT+24H")));
-    Assert.assertEquals("-000 01:00:00.000", formatIntervalDay(Duration.parse("PT-1H")));
-    // "JDK-8054978: java.time.Duration.parse() fails for negative duration with 0 seconds and nanos" not fixed on JDK8
-    //Assert.assertEquals("-000 01:00:00.001", formatIntervalDay(Duration.parse("PT-1H-0M-00.001S")));
-    Assert.assertEquals("-000 01:00:00.001", formatIntervalDay(Duration.ofHours(-1).minusMillis(1)));
-    Assert.assertEquals("-000 01:01:01.000", formatIntervalDay(Duration.parse("PT-1H-1M-1S")));
-    Assert.assertEquals("-000 02:02:02.002", formatIntervalDay(Duration.parse("PT-2H-2M-02.002S")));
-    Assert.assertEquals("-000 23:59:59.999", formatIntervalDay(Duration.parse("PT-23H-59M-59.999S")));
-    // "JDK-8054978: java.time.Duration.parse() fails for negative duration with 0 seconds and nanos" not fixed on JDK8
-    //Assert.assertEquals("-000 11:59:00.100", formatIntervalDay(Duration.parse("PT-11H-59M-00.100S")));
-    Assert.assertEquals("-000 11:59:00.100", 
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetIntervalYear(Supplier<ValueVector> vectorSupplier) {
+    setup(vectorSupplier);
+    assertEquals("-002-00", formatIntervalYear(Period.parse("P-2Y")));
+    assertEquals("-001-01", formatIntervalYear(Period.parse("P-1Y-1M")));
+    assertEquals("-001-02", formatIntervalYear(Period.parse("P-1Y-2M")));
+    assertEquals("-002-03", formatIntervalYear(Period.parse("P-2Y-3M")));
+    assertEquals("-002-04", formatIntervalYear(Period.parse("P-2Y-4M")));
+    assertEquals("-011-01", formatIntervalYear(Period.parse("P-11Y-1M")));
+    assertEquals("+002-00", formatIntervalYear(Period.parse("P+2Y")));
+    assertEquals("+001-01", formatIntervalYear(Period.parse("P+1Y1M")));
+    assertEquals("+001-02", formatIntervalYear(Period.parse("P+1Y2M")));
+    assertEquals("+002-03", formatIntervalYear(Period.parse("P+2Y3M")));
+    assertEquals("+002-04", formatIntervalYear(Period.parse("P+2Y4M")));
+    assertEquals("+011-01", formatIntervalYear(Period.parse("P+11Y1M")));
+  }
+
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetIntervalDay(Supplier<ValueVector> vectorSupplier) {
+    setup(vectorSupplier);
+    assertEquals("-001 00:00:00.000", formatIntervalDay(Duration.parse("PT-24H")));
+    assertEquals("+001 00:00:00.000", formatIntervalDay(Duration.parse("PT+24H")));
+    assertEquals("-000 01:00:00.000", formatIntervalDay(Duration.parse("PT-1H")));
+    // "JDK-8054978: java.time.Duration.parse() fails for negative duration with 0 seconds and
+    // nanos" not fixed on JDK8
+    // assertEquals("-000 01:00:00.001", formatIntervalDay(Duration.parse("PT-1H-0M-00.001S")));
+    assertEquals("-000 01:00:00.001", formatIntervalDay(Duration.ofHours(-1).minusMillis(1)));
+    assertEquals("-000 01:01:01.000", formatIntervalDay(Duration.parse("PT-1H-1M-1S")));
+    assertEquals("-000 02:02:02.002", formatIntervalDay(Duration.parse("PT-2H-2M-02.002S")));
+    assertEquals("-000 23:59:59.999", formatIntervalDay(Duration.parse("PT-23H-59M-59.999S")));
+    // "JDK-8054978: java.time.Duration.parse() fails for negative duration with 0 seconds and
+    // nanos" not fixed on JDK8
+    // assertEquals("-000 11:59:00.100", formatIntervalDay(Duration.parse("PT-11H-59M-00.100S")));
+    assertEquals(
+        "-000 11:59:00.100",
         formatIntervalDay(Duration.ofHours(-11).minusMinutes(59).minusMillis(100)));
-    Assert.assertEquals("-000 05:02:03.000", formatIntervalDay(Duration.parse("PT-5H-2M-3S")));
-    Assert.assertEquals("-000 22:22:22.222", formatIntervalDay(Duration.parse("PT-22H-22M-22.222S")));
-    Assert.assertEquals("+000 01:00:00.000", formatIntervalDay(Duration.parse("PT+1H")));
-    Assert.assertEquals("+000 01:00:00.001", formatIntervalDay(Duration.parse("PT+1H0M00.001S")));
-    Assert.assertEquals("+000 01:01:01.000", formatIntervalDay(Duration.parse("PT+1H1M1S")));
-    Assert.assertEquals("+000 02:02:02.002", formatIntervalDay(Duration.parse("PT+2H2M02.002S")));
-    Assert.assertEquals("+000 23:59:59.999", formatIntervalDay(Duration.parse("PT+23H59M59.999S")));
-    Assert.assertEquals("+000 11:59:00.100", formatIntervalDay(Duration.parse("PT+11H59M00.100S")));
-    Assert.assertEquals("+000 05:02:03.000", formatIntervalDay(Duration.parse("PT+5H2M3S")));
-    Assert.assertEquals("+000 22:22:22.222", formatIntervalDay(Duration.parse("PT+22H22M22.222S")));
-  }
-
-  @Test
-  public void testIntervalDayWithJodaPeriodObject() {
-    Assert.assertEquals("+1567 00:00:00.000",
-        formatIntervalDay(Duration.ofDays(1567)));
-    Assert.assertEquals("-1567 00:00:00.000",
-        formatIntervalDay(Duration.ofDays(-1567)));
-  }
-
-  @Test
-  public void testShouldGetStringReturnCorrectString() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcIntervalVectorAccessor::getString,
+    assertEquals("-000 05:02:03.000", formatIntervalDay(Duration.parse("PT-5H-2M-3S")));
+    assertEquals("-000 22:22:22.222", formatIntervalDay(Duration.parse("PT-22H-22M-22.222S")));
+    assertEquals("+000 01:00:00.000", formatIntervalDay(Duration.parse("PT+1H")));
+    assertEquals("+000 01:00:00.001", formatIntervalDay(Duration.parse("PT+1H0M00.001S")));
+    assertEquals("+000 01:01:01.000", formatIntervalDay(Duration.parse("PT+1H1M1S")));
+    assertEquals("+000 02:02:02.002", formatIntervalDay(Duration.parse("PT+2H2M02.002S")));
+    assertEquals("+000 23:59:59.999", formatIntervalDay(Duration.parse("PT+23H59M59.999S")));
+    assertEquals("+000 11:59:00.100", formatIntervalDay(Duration.parse("PT+11H59M00.100S")));
+    assertEquals("+000 05:02:03.000", formatIntervalDay(Duration.parse("PT+5H2M3S")));
+    assertEquals("+000 22:22:22.222", formatIntervalDay(Duration.parse("PT+22H22M22.222S")));
+  }
+
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testIntervalDayWithJodaPeriodObject(Supplier<ValueVector> vectorSupplier) {
+    setup(vectorSupplier);
+    assertEquals("+1567 00:00:00.000", formatIntervalDay(Duration.ofDays(1567)));
+    assertEquals("-1567 00:00:00.000", formatIntervalDay(Duration.ofDays(-1567)));
+  }
+
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetStringReturnCorrectString(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcIntervalVectorAccessor::getString,
         (accessor, currentRow) -> is(getStringOnVector(vector, currentRow)));
   }
 
-  @Test
-  public void testShouldGetStringReturnNull() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetStringReturnNull(Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
     setAllNullOnVector(vector);
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcIntervalVectorAccessor::getString,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcIntervalVectorAccessor::getString,
         (accessor, currentRow) -> equalTo(null));
   }
 
-  @Test
-  public void testShouldGetObjectClassReturnCorrectClass() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetObjectClassReturnCorrectClass(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
     Class<?> expectedObjectClass = getExpectedObjectClassForVector(vector);
-    accessorIterator.assertAccessorGetter(vector,
+    accessorIterator.assertAccessorGetter(
+        vector,
         ArrowFlightJdbcIntervalVectorAccessor::getObjectClass,
         (accessor, currentRow) -> equalTo(expectedObjectClass));
   }
@@ -225,6 +293,8 @@ private Class<?> getExpectedObjectClassForVector(ValueVector vector) {
       return Duration.class;
     } else if (vector instanceof IntervalYearVector) {
       return Period.class;
+    } else if (vector instanceof IntervalMonthDayNanoVector) {
+      return PeriodDuration.class;
     }
     return null;
   }
@@ -239,6 +309,10 @@ private void setAllNullOnVector(ValueVector vector) {
       for (int i = 0; i < valueCount; i++) {
         ((IntervalYearVector) vector).setNull(i);
       }
+    } else if (vector instanceof IntervalMonthDayNanoVector) {
+      for (int i = 0; i < valueCount; i++) {
+        ((IntervalMonthDayNanoVector) vector).setNull(i);
+      }
     }
   }
 
@@ -247,6 +321,10 @@ private Object getExpectedObject(ValueVector vector, int currentRow) {
       return Duration.ofDays(currentRow + 1).plusMillis((currentRow + 1) * 1000L);
     } else if (vector instanceof IntervalYearVector) {
       return Period.ofMonths(currentRow + 1);
+    } else if (vector instanceof IntervalMonthDayNanoVector) {
+      Period period = Period.ofMonths(currentRow + 1).plusDays((currentRow + 1) * 10L);
+      Duration duration = Duration.ofNanos((currentRow + 1) * 100L);
+      return new PeriodDuration(period, duration);
     }
     return null;
   }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeStampVectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeStampVectorAccessorTest.java
index e2c17b2f085ae..2e329f148e66c 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeStampVectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeStampVectorAccessorTest.java
@@ -14,28 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.calendar;
 
 import static org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcTimeStampVectorAccessor.getTimeUnitForVector;
 import static org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcTimeStampVectorAccessor.getTimeZoneForVector;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
-import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Collection;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
-
+import java.util.stream.Stream;
 import org.apache.arrow.driver.jdbc.accessor.impl.text.ArrowFlightJdbcVarCharVectorAccessor;
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.TimeStampMicroVector;
 import org.apache.arrow.vector.TimeStampMilliVector;
 import org.apache.arrow.vector.TimeStampNanoVector;
@@ -44,224 +42,270 @@
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.arrow.vector.util.Text;
 import org.hamcrest.CoreMatchers;
-import org.junit.After;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
 public class ArrowFlightJdbcTimeStampVectorAccessorTest {
 
   public static final String AMERICA_VANCOUVER = "America/Vancouver";
   public static final String ASIA_BANGKOK = "Asia/Bangkok";
   public static final String AMERICA_SAO_PAULO = "America/Sao_Paulo";
 
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
-
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
-  private final String timeZone;
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
   private TimeStampVector vector;
-  private final Supplier<TimeStampVector> vectorSupplier;
 
   private final AccessorTestUtils.AccessorSupplier<ArrowFlightJdbcTimeStampVectorAccessor>
       accessorSupplier =
-          (vector, getCurrentRow) -> new ArrowFlightJdbcTimeStampVectorAccessor(
-              (TimeStampVector) vector, getCurrentRow, (boolean wasNull) -> {
-          });
+          (vector, getCurrentRow) ->
+              new ArrowFlightJdbcTimeStampVectorAccessor(
+                  (TimeStampVector) vector, getCurrentRow, (boolean wasNull) -> {});
 
   private final AccessorTestUtils.AccessorIterator<ArrowFlightJdbcTimeStampVectorAccessor>
-      accessorIterator =
-      new AccessorTestUtils.AccessorIterator<>(collector, accessorSupplier);
+      accessorIterator = new AccessorTestUtils.AccessorIterator<>(accessorSupplier);
 
-  @Parameterized.Parameters(name = "{1} - TimeZone: {2}")
-  public static Collection<Object[]> data() {
-    return Arrays.asList(new Object[][] {
-        {(Supplier<TimeStampVector>) () -> rootAllocatorTestRule.createTimeStampNanoVector(),
+  public static Stream<Arguments> data() {
+    return Stream.of(
+        Arguments.of(
+            (Supplier<TimeStampVector>)
+                () -> rootAllocatorTestExtension.createTimeStampNanoVector(),
             "TimeStampNanoVector",
-            null},
-        {(Supplier<TimeStampVector>) () -> rootAllocatorTestRule.createTimeStampNanoTZVector("UTC"),
+            null),
+        Arguments.of(
+            (Supplier<TimeStampVector>)
+                () -> rootAllocatorTestExtension.createTimeStampNanoTZVector("UTC"),
+            "TimeStampNanoTZVector",
+            "UTC"),
+        Arguments.of(
+            (Supplier<TimeStampVector>)
+                () -> rootAllocatorTestExtension.createTimeStampNanoTZVector(AMERICA_VANCOUVER),
             "TimeStampNanoTZVector",
-            "UTC"},
-        {(Supplier<TimeStampVector>) () -> rootAllocatorTestRule.createTimeStampNanoTZVector(
             AMERICA_VANCOUVER),
+        Arguments.of(
+            (Supplier<TimeStampVector>)
+                () -> rootAllocatorTestExtension.createTimeStampNanoTZVector(ASIA_BANGKOK),
             "TimeStampNanoTZVector",
-            AMERICA_VANCOUVER},
-        {(Supplier<TimeStampVector>) () -> rootAllocatorTestRule.createTimeStampNanoTZVector(
             ASIA_BANGKOK),
-            "TimeStampNanoTZVector",
-            ASIA_BANGKOK},
-        {(Supplier<TimeStampVector>) () -> rootAllocatorTestRule.createTimeStampMicroVector(),
+        Arguments.of(
+            (Supplier<TimeStampVector>)
+                () -> rootAllocatorTestExtension.createTimeStampMicroVector(),
             "TimeStampMicroVector",
-            null},
-        {(Supplier<TimeStampVector>) () -> rootAllocatorTestRule.createTimeStampMicroTZVector(
+            null),
+        Arguments.of(
+            (Supplier<TimeStampVector>)
+                () -> rootAllocatorTestExtension.createTimeStampMicroTZVector("UTC"),
+            "TimeStampMicroTZVector",
             "UTC"),
+        Arguments.of(
+            (Supplier<TimeStampVector>)
+                () -> rootAllocatorTestExtension.createTimeStampMicroTZVector(AMERICA_VANCOUVER),
             "TimeStampMicroTZVector",
-            "UTC"},
-        {(Supplier<TimeStampVector>) () -> rootAllocatorTestRule.createTimeStampMicroTZVector(
             AMERICA_VANCOUVER),
+        Arguments.of(
+            (Supplier<TimeStampVector>)
+                () -> rootAllocatorTestExtension.createTimeStampMicroTZVector(ASIA_BANGKOK),
             "TimeStampMicroTZVector",
-            AMERICA_VANCOUVER},
-        {(Supplier<TimeStampVector>) () -> rootAllocatorTestRule.createTimeStampMicroTZVector(
             ASIA_BANGKOK),
-            "TimeStampMicroTZVector",
-            ASIA_BANGKOK},
-        {(Supplier<TimeStampVector>) () -> rootAllocatorTestRule.createTimeStampMilliVector(),
+        Arguments.of(
+            (Supplier<TimeStampVector>)
+                () -> rootAllocatorTestExtension.createTimeStampMilliVector(),
             "TimeStampMilliVector",
-            null},
-        {(Supplier<TimeStampVector>) () -> rootAllocatorTestRule.createTimeStampMilliTZVector(
+            null),
+        Arguments.of(
+            (Supplier<TimeStampVector>)
+                () -> rootAllocatorTestExtension.createTimeStampMilliTZVector("UTC"),
+            "TimeStampMilliTZVector",
             "UTC"),
+        Arguments.of(
+            (Supplier<TimeStampVector>)
+                () -> rootAllocatorTestExtension.createTimeStampMilliTZVector(AMERICA_VANCOUVER),
             "TimeStampMilliTZVector",
-            "UTC"},
-        {(Supplier<TimeStampVector>) () -> rootAllocatorTestRule.createTimeStampMilliTZVector(
             AMERICA_VANCOUVER),
+        Arguments.of(
+            (Supplier<TimeStampVector>)
+                () -> rootAllocatorTestExtension.createTimeStampMilliTZVector(ASIA_BANGKOK),
             "TimeStampMilliTZVector",
-            AMERICA_VANCOUVER},
-        {(Supplier<TimeStampVector>) () -> rootAllocatorTestRule.createTimeStampMilliTZVector(
             ASIA_BANGKOK),
-            "TimeStampMilliTZVector",
-            ASIA_BANGKOK},
-        {(Supplier<TimeStampVector>) () -> rootAllocatorTestRule.createTimeStampSecVector(),
+        Arguments.of(
+            (Supplier<TimeStampVector>) () -> rootAllocatorTestExtension.createTimeStampSecVector(),
             "TimeStampSecVector",
-            null},
-        {(Supplier<TimeStampVector>) () -> rootAllocatorTestRule.createTimeStampSecTZVector("UTC"),
+            null),
+        Arguments.of(
+            (Supplier<TimeStampVector>)
+                () -> rootAllocatorTestExtension.createTimeStampSecTZVector("UTC"),
             "TimeStampSecTZVector",
-            "UTC"},
-        {(Supplier<TimeStampVector>) () -> rootAllocatorTestRule.createTimeStampSecTZVector(
-            AMERICA_VANCOUVER),
+            "UTC"),
+        Arguments.of(
+            (Supplier<TimeStampVector>)
+                () -> rootAllocatorTestExtension.createTimeStampSecTZVector(AMERICA_VANCOUVER),
             "TimeStampSecTZVector",
-            AMERICA_VANCOUVER},
-        {(Supplier<TimeStampVector>) () -> rootAllocatorTestRule.createTimeStampSecTZVector(
-            ASIA_BANGKOK),
+            AMERICA_VANCOUVER),
+        Arguments.of(
+            (Supplier<TimeStampVector>)
+                () -> rootAllocatorTestExtension.createTimeStampSecTZVector(ASIA_BANGKOK),
             "TimeStampSecTZVector",
-            ASIA_BANGKOK}
-    });
-  }
-
-  public ArrowFlightJdbcTimeStampVectorAccessorTest(Supplier<TimeStampVector> vectorSupplier,
-                                                    String vectorType,
-                                                    String timeZone) {
-    this.vectorSupplier = vectorSupplier;
-    this.timeZone = timeZone;
+            ASIA_BANGKOK));
   }
 
-  @Before
-  public void setup() {
+  public void setup(Supplier<TimeStampVector> vectorSupplier) {
     this.vector = vectorSupplier.get();
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     this.vector.close();
   }
 
-  @Test
-  public void testShouldGetTimestampReturnValidTimestampWithoutCalendar() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, accessor -> accessor.getTimestamp(null),
-        (accessor, currentRow) -> is(getTimestampForVector(currentRow)));
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetTimestampReturnValidTimestampWithoutCalendar(
+      Supplier<TimeStampVector> vectorSupplier, String vectorType, String timeZone)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        accessor -> accessor.getTimestamp(null),
+        (accessor, currentRow) -> is(getTimestampForVector(currentRow, timeZone)));
   }
 
-  @Test
-  public void testShouldGetTimestampReturnValidTimestampWithCalendar() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetTimestampReturnValidTimestampWithCalendar(
+      Supplier<TimeStampVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
     TimeZone timeZone = TimeZone.getTimeZone(AMERICA_SAO_PAULO);
     Calendar calendar = Calendar.getInstance(timeZone);
 
     TimeZone timeZoneForVector = getTimeZoneForVector(vector);
 
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      final Timestamp resultWithoutCalendar = accessor.getTimestamp(null);
-      final Timestamp result = accessor.getTimestamp(calendar);
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          final Timestamp resultWithoutCalendar = accessor.getTimestamp(null);
+          final Timestamp result = accessor.getTimestamp(calendar);
 
-      long offset = (long) timeZone.getOffset(resultWithoutCalendar.getTime()) -
-          timeZoneForVector.getOffset(resultWithoutCalendar.getTime());
+          long offset =
+              (long) timeZone.getOffset(resultWithoutCalendar.getTime())
+                  - timeZoneForVector.getOffset(resultWithoutCalendar.getTime());
 
-      collector.checkThat(resultWithoutCalendar.getTime() - result.getTime(), is(offset));
-      collector.checkThat(accessor.wasNull(), is(false));
-    });
+          assertThat(resultWithoutCalendar.getTime() - result.getTime(), is(offset));
+          assertThat(accessor.wasNull(), is(false));
+        });
   }
 
-  @Test
-  public void testShouldGetTimestampReturnNull() {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetTimestampReturnNull(Supplier<TimeStampVector> vectorSupplier) {
+    setup(vectorSupplier);
     vector.setNull(0);
     ArrowFlightJdbcTimeStampVectorAccessor accessor = accessorSupplier.supply(vector, () -> 0);
-    collector.checkThat(accessor.getTimestamp(null), CoreMatchers.equalTo(null));
-    collector.checkThat(accessor.wasNull(), is(true));
+    assertThat(accessor.getTimestamp(null), CoreMatchers.equalTo(null));
+    assertThat(accessor.wasNull(), is(true));
   }
 
-  @Test
-  public void testShouldGetDateReturnValidDateWithoutCalendar() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, accessor -> accessor.getDate(null),
-        (accessor, currentRow) -> is(new Date(getTimestampForVector(currentRow).getTime())));
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetDateReturnValidDateWithoutCalendar(
+      Supplier<TimeStampVector> vectorSupplier, String vectorType, String timeZone)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        accessor -> accessor.getDate(null),
+        (accessor, currentRow) ->
+            is(new Date(getTimestampForVector(currentRow, timeZone).getTime())));
   }
 
-  @Test
-  public void testShouldGetDateReturnValidDateWithCalendar() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetDateReturnValidDateWithCalendar(Supplier<TimeStampVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
     TimeZone timeZone = TimeZone.getTimeZone(AMERICA_SAO_PAULO);
     Calendar calendar = Calendar.getInstance(timeZone);
 
     TimeZone timeZoneForVector = getTimeZoneForVector(vector);
 
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      final Date resultWithoutCalendar = accessor.getDate(null);
-      final Date result = accessor.getDate(calendar);
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          final Date resultWithoutCalendar = accessor.getDate(null);
+          final Date result = accessor.getDate(calendar);
 
-      long offset = (long) timeZone.getOffset(resultWithoutCalendar.getTime()) -
-          timeZoneForVector.getOffset(resultWithoutCalendar.getTime());
+          long offset =
+              (long) timeZone.getOffset(resultWithoutCalendar.getTime())
+                  - timeZoneForVector.getOffset(resultWithoutCalendar.getTime());
 
-      collector.checkThat(resultWithoutCalendar.getTime() - result.getTime(), is(offset));
-      collector.checkThat(accessor.wasNull(), is(false));
-    });
+          assertThat(resultWithoutCalendar.getTime() - result.getTime(), is(offset));
+          assertThat(accessor.wasNull(), is(false));
+        });
   }
 
-  @Test
-  public void testShouldGetDateReturnNull() {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetDateReturnNull(Supplier<TimeStampVector> vectorSupplier) {
+    setup(vectorSupplier);
     vector.setNull(0);
     ArrowFlightJdbcTimeStampVectorAccessor accessor = accessorSupplier.supply(vector, () -> 0);
-    collector.checkThat(accessor.getDate(null), CoreMatchers.equalTo(null));
-    collector.checkThat(accessor.wasNull(), is(true));
+    assertThat(accessor.getDate(null), CoreMatchers.equalTo(null));
+    assertThat(accessor.wasNull(), is(true));
   }
 
-  @Test
-  public void testShouldGetTimeReturnValidTimeWithoutCalendar() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, accessor -> accessor.getTime(null),
-        (accessor, currentRow) -> is(new Time(getTimestampForVector(currentRow).getTime())));
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetTimeReturnValidTimeWithoutCalendar(
+      Supplier<TimeStampVector> vectorSupplier, String vectorType, String timeZone)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        accessor -> accessor.getTime(null),
+        (accessor, currentRow) ->
+            is(new Time(getTimestampForVector(currentRow, timeZone).getTime())));
   }
 
-  @Test
-  public void testShouldGetTimeReturnValidTimeWithCalendar() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetTimeReturnValidTimeWithCalendar(Supplier<TimeStampVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
     TimeZone timeZone = TimeZone.getTimeZone(AMERICA_SAO_PAULO);
     Calendar calendar = Calendar.getInstance(timeZone);
 
     TimeZone timeZoneForVector = getTimeZoneForVector(vector);
 
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      final Time resultWithoutCalendar = accessor.getTime(null);
-      final Time result = accessor.getTime(calendar);
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          final Time resultWithoutCalendar = accessor.getTime(null);
+          final Time result = accessor.getTime(calendar);
 
-      long offset = (long) timeZone.getOffset(resultWithoutCalendar.getTime()) -
-          timeZoneForVector.getOffset(resultWithoutCalendar.getTime());
+          long offset =
+              (long) timeZone.getOffset(resultWithoutCalendar.getTime())
+                  - timeZoneForVector.getOffset(resultWithoutCalendar.getTime());
 
-      collector.checkThat(resultWithoutCalendar.getTime() - result.getTime(), is(offset));
-      collector.checkThat(accessor.wasNull(), is(false));
-    });
+          assertThat(resultWithoutCalendar.getTime() - result.getTime(), is(offset));
+          assertThat(accessor.wasNull(), is(false));
+        });
   }
 
-  @Test
-  public void testShouldGetTimeReturnNull() {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetTimeReturnNull(Supplier<TimeStampVector> vectorSupplier) {
+    setup(vectorSupplier);
     vector.setNull(0);
     ArrowFlightJdbcTimeStampVectorAccessor accessor = accessorSupplier.supply(vector, () -> 0);
-    collector.checkThat(accessor.getTime(null), CoreMatchers.equalTo(null));
-    collector.checkThat(accessor.wasNull(), is(true));
+    assertThat(accessor.getTime(null), CoreMatchers.equalTo(null));
+    assertThat(accessor.wasNull(), is(true));
   }
 
-  private Timestamp getTimestampForVector(int currentRow) {
+  private Timestamp getTimestampForVector(int currentRow, String timeZone) {
     Object object = vector.getObject(currentRow);
 
     Timestamp expectedTimestamp = null;
@@ -276,47 +320,57 @@ private Timestamp getTimestampForVector(int currentRow) {
     return expectedTimestamp;
   }
 
-  @Test
-  public void testShouldGetObjectClass() throws Exception {
-    accessorIterator.assertAccessorGetter(vector,
-        ArrowFlightJdbcTimeStampVectorAccessor::getObjectClass,
-        equalTo(Timestamp.class));
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetObjectClass(Supplier<TimeStampVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector, ArrowFlightJdbcTimeStampVectorAccessor::getObjectClass, equalTo(Timestamp.class));
   }
 
-  @Test
-  public void testShouldGetStringBeConsistentWithVarCharAccessorWithoutCalendar() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetStringBeConsistentWithVarCharAccessorWithoutCalendar(
+      Supplier<TimeStampVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
     assertGetStringIsConsistentWithVarCharAccessor(null);
   }
 
-  @Test
-  public void testShouldGetStringBeConsistentWithVarCharAccessorWithCalendar() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetStringBeConsistentWithVarCharAccessorWithCalendar(
+      Supplier<TimeStampVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
     // Ignore for TimeStamp vectors with TZ, as VarChar accessor won't consider their TZ
-    Assume.assumeTrue(
-        vector instanceof TimeStampNanoVector || vector instanceof TimeStampMicroVector ||
-            vector instanceof TimeStampMilliVector || vector instanceof TimeStampSecVector);
+    Assumptions.assumeTrue(
+        vector instanceof TimeStampNanoVector
+            || vector instanceof TimeStampMicroVector
+            || vector instanceof TimeStampMilliVector
+            || vector instanceof TimeStampSecVector);
     Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone(AMERICA_VANCOUVER));
     assertGetStringIsConsistentWithVarCharAccessor(calendar);
   }
 
   private void assertGetStringIsConsistentWithVarCharAccessor(Calendar calendar) throws Exception {
-    try (VarCharVector varCharVector = new VarCharVector("",
-        rootAllocatorTestRule.getRootAllocator())) {
+    try (VarCharVector varCharVector =
+        new VarCharVector("", rootAllocatorTestExtension.getRootAllocator())) {
       varCharVector.allocateNew(1);
       ArrowFlightJdbcVarCharVectorAccessor varCharVectorAccessor =
-          new ArrowFlightJdbcVarCharVectorAccessor(varCharVector, () -> 0, (boolean wasNull) -> {
-          });
+          new ArrowFlightJdbcVarCharVectorAccessor(varCharVector, () -> 0, (boolean wasNull) -> {});
 
-      accessorIterator.iterate(vector, (accessor, currentRow) -> {
-        final String string = accessor.getString();
-        varCharVector.set(0, new Text(string));
-        varCharVector.setValueCount(1);
+      accessorIterator.iterate(
+          vector,
+          (accessor, currentRow) -> {
+            final String string = accessor.getString();
+            varCharVector.set(0, new Text(string));
+            varCharVector.setValueCount(1);
 
-        Timestamp timestampFromVarChar = varCharVectorAccessor.getTimestamp(calendar);
-        Timestamp timestamp = accessor.getTimestamp(calendar);
+            Timestamp timestampFromVarChar = varCharVectorAccessor.getTimestamp(calendar);
+            Timestamp timestamp = accessor.getTimestamp(calendar);
 
-        collector.checkThat(timestamp, is(timestampFromVarChar));
-        collector.checkThat(accessor.wasNull(), is(false));
-      });
+            assertThat(timestamp, is(timestampFromVarChar));
+            assertThat(accessor.wasNull(), is(false));
+          });
     }
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeVectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeVectorAccessorTest.java
index d2f7eb336af59..24971052db1be 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeVectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeVectorAccessorTest.java
@@ -14,28 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.calendar;
 
 import static org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcTimeVectorAccessor.getTimeUnitForVector;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
-import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Collection;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
-
+import java.util.stream.Stream;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.driver.jdbc.accessor.impl.text.ArrowFlightJdbcVarCharVectorAccessor;
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.BaseFixedWidthVector;
 import org.apache.arrow.vector.TimeMicroVector;
 import org.apache.arrow.vector.TimeMilliVector;
@@ -44,143 +42,156 @@
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.arrow.vector.util.Text;
 import org.hamcrest.CoreMatchers;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
 public class ArrowFlightJdbcTimeVectorAccessorTest {
 
   public static final String AMERICA_VANCOUVER = "America/Vancouver";
 
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
-
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
   private BaseFixedWidthVector vector;
-  private final Supplier<BaseFixedWidthVector> vectorSupplier;
 
   private final AccessorTestUtils.AccessorSupplier<ArrowFlightJdbcTimeVectorAccessor>
-      accessorSupplier = (vector, getCurrentRow) -> {
-        ArrowFlightJdbcAccessorFactory.WasNullConsumer noOpWasNullConsumer = (boolean wasNull) -> {
-        };
-        if (vector instanceof TimeNanoVector) {
-          return new ArrowFlightJdbcTimeVectorAccessor((TimeNanoVector) vector, getCurrentRow,
-              noOpWasNullConsumer);
-        } else if (vector instanceof TimeMicroVector) {
-          return new ArrowFlightJdbcTimeVectorAccessor((TimeMicroVector) vector, getCurrentRow,
-              noOpWasNullConsumer);
-        } else if (vector instanceof TimeMilliVector) {
-          return new ArrowFlightJdbcTimeVectorAccessor((TimeMilliVector) vector, getCurrentRow,
-              noOpWasNullConsumer);
-        } else if (vector instanceof TimeSecVector) {
-          return new ArrowFlightJdbcTimeVectorAccessor((TimeSecVector) vector, getCurrentRow,
-              noOpWasNullConsumer);
-        }
-        return null;
-      };
+      accessorSupplier =
+          (vector, getCurrentRow) -> {
+            ArrowFlightJdbcAccessorFactory.WasNullConsumer noOpWasNullConsumer =
+                (boolean wasNull) -> {};
+            if (vector instanceof TimeNanoVector) {
+              return new ArrowFlightJdbcTimeVectorAccessor(
+                  (TimeNanoVector) vector, getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof TimeMicroVector) {
+              return new ArrowFlightJdbcTimeVectorAccessor(
+                  (TimeMicroVector) vector, getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof TimeMilliVector) {
+              return new ArrowFlightJdbcTimeVectorAccessor(
+                  (TimeMilliVector) vector, getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof TimeSecVector) {
+              return new ArrowFlightJdbcTimeVectorAccessor(
+                  (TimeSecVector) vector, getCurrentRow, noOpWasNullConsumer);
+            }
+            return null;
+          };
 
   private final AccessorTestUtils.AccessorIterator<ArrowFlightJdbcTimeVectorAccessor>
-      accessorIterator =
-      new AccessorTestUtils.AccessorIterator<>(collector, accessorSupplier);
-
-  @Parameterized.Parameters(name = "{1}")
-  public static Collection<Object[]> data() {
-    return Arrays.asList(new Object[][] {
-        {(Supplier<TimeNanoVector>) () -> rootAllocatorTestRule.createTimeNanoVector(),
-            "TimeNanoVector"},
-        {(Supplier<TimeMicroVector>) () -> rootAllocatorTestRule.createTimeMicroVector(),
-            "TimeMicroVector"},
-        {(Supplier<TimeMilliVector>) () -> rootAllocatorTestRule.createTimeMilliVector(),
-            "TimeMilliVector"},
-        {(Supplier<TimeSecVector>) () -> rootAllocatorTestRule.createTimeSecVector(),
-            "TimeSecVector"}
-    });
+      accessorIterator = new AccessorTestUtils.AccessorIterator<>(accessorSupplier);
+
+  public static Stream<Arguments> data() {
+    return Stream.of(
+        Arguments.of(
+            (Supplier<TimeNanoVector>) () -> rootAllocatorTestExtension.createTimeNanoVector(),
+            "TimeNanoVector"),
+        Arguments.of(
+            (Supplier<TimeMicroVector>) () -> rootAllocatorTestExtension.createTimeMicroVector(),
+            "TimeMicroVector"),
+        Arguments.of(
+            (Supplier<TimeMilliVector>) () -> rootAllocatorTestExtension.createTimeMilliVector(),
+            "TimeMilliVector"),
+        Arguments.of(
+            (Supplier<TimeSecVector>) () -> rootAllocatorTestExtension.createTimeSecVector(),
+            "TimeSecVector"));
   }
 
-  public ArrowFlightJdbcTimeVectorAccessorTest(Supplier<BaseFixedWidthVector> vectorSupplier,
-                                               String vectorType) {
-    this.vectorSupplier = vectorSupplier;
-  }
-
-  @Before
-  public void setup() {
+  public void setup(Supplier<BaseFixedWidthVector> vectorSupplier) {
     this.vector = vectorSupplier.get();
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     this.vector.close();
   }
 
-  @Test
-  public void testShouldGetTimestampReturnValidTimestampWithoutCalendar() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, accessor -> accessor.getTimestamp(null),
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetTimestampReturnValidTimestampWithoutCalendar(
+      Supplier<BaseFixedWidthVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        accessor -> accessor.getTimestamp(null),
         (accessor, currentRow) -> is(getTimestampForVector(currentRow)));
   }
 
-  @Test
-  public void testShouldGetTimestampReturnValidTimestampWithCalendar() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetTimestampReturnValidTimestampWithCalendar(
+      Supplier<BaseFixedWidthVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
     TimeZone timeZone = TimeZone.getTimeZone(AMERICA_VANCOUVER);
     Calendar calendar = Calendar.getInstance(timeZone);
 
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      final Timestamp resultWithoutCalendar = accessor.getTimestamp(null);
-      final Timestamp result = accessor.getTimestamp(calendar);
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          final Timestamp resultWithoutCalendar = accessor.getTimestamp(null);
+          final Timestamp result = accessor.getTimestamp(calendar);
 
-      long offset = timeZone.getOffset(resultWithoutCalendar.getTime());
+          long offset = timeZone.getOffset(resultWithoutCalendar.getTime());
 
-      collector.checkThat(resultWithoutCalendar.getTime() - result.getTime(), is(offset));
-      collector.checkThat(accessor.wasNull(), is(false));
-    });
+          assertThat(resultWithoutCalendar.getTime() - result.getTime(), is(offset));
+          assertThat(accessor.wasNull(), is(false));
+        });
   }
 
-  @Test
-  public void testShouldGetTimestampReturnNull() {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetTimestampReturnNull(Supplier<BaseFixedWidthVector> vectorSupplier) {
+    setup(vectorSupplier);
     vector.setNull(0);
     ArrowFlightJdbcTimeVectorAccessor accessor = accessorSupplier.supply(vector, () -> 0);
-    collector.checkThat(accessor.getTimestamp(null), CoreMatchers.equalTo(null));
-    collector.checkThat(accessor.wasNull(), is(true));
+    assertThat(accessor.getTimestamp(null), CoreMatchers.equalTo(null));
+    assertThat(accessor.wasNull(), is(true));
   }
 
-  @Test
-  public void testShouldGetTimeReturnValidTimeWithoutCalendar() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, accessor -> accessor.getTime(null),
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetTimeReturnValidTimeWithoutCalendar(
+      Supplier<BaseFixedWidthVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        accessor -> accessor.getTime(null),
         (accessor, currentRow) -> {
           Timestamp expectedTimestamp = getTimestampForVector(currentRow);
           return is(new Time(expectedTimestamp.getTime()));
         });
   }
 
-  @Test
-  public void testShouldGetTimeReturnValidTimeWithCalendar() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetTimeReturnValidTimeWithCalendar(
+      Supplier<BaseFixedWidthVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
     TimeZone timeZone = TimeZone.getTimeZone(AMERICA_VANCOUVER);
     Calendar calendar = Calendar.getInstance(timeZone);
 
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      final Time resultWithoutCalendar = accessor.getTime(null);
-      final Time result = accessor.getTime(calendar);
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          final Time resultWithoutCalendar = accessor.getTime(null);
+          final Time result = accessor.getTime(calendar);
 
-      long offset = timeZone.getOffset(resultWithoutCalendar.getTime());
+          long offset = timeZone.getOffset(resultWithoutCalendar.getTime());
 
-      collector.checkThat(resultWithoutCalendar.getTime() - result.getTime(), is(offset));
-      collector.checkThat(accessor.wasNull(), is(false));
-    });
+          assertThat(resultWithoutCalendar.getTime() - result.getTime(), is(offset));
+          assertThat(accessor.wasNull(), is(false));
+        });
   }
 
-  @Test
-  public void testShouldGetTimeReturnNull() {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetTimeReturnNull(Supplier<BaseFixedWidthVector> vectorSupplier) {
+    setup(vectorSupplier);
     vector.setNull(0);
     ArrowFlightJdbcTimeVectorAccessor accessor = accessorSupplier.supply(vector, () -> 0);
-    collector.checkThat(accessor.getTime(null), CoreMatchers.equalTo(null));
-    collector.checkThat(accessor.wasNull(), is(true));
+    assertThat(accessor.getTime(null), CoreMatchers.equalTo(null));
+    assertThat(accessor.wasNull(), is(true));
   }
 
   private Timestamp getTimestampForVector(int currentRow) {
@@ -198,66 +209,82 @@ private Timestamp getTimestampForVector(int currentRow) {
     return expectedTimestamp;
   }
 
-  @Test
-  public void testShouldGetObjectClass() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcTimeVectorAccessor::getObjectClass,
-        equalTo(Time.class));
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetObjectClass(Supplier<BaseFixedWidthVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector, ArrowFlightJdbcTimeVectorAccessor::getObjectClass, equalTo(Time.class));
   }
 
-  @Test
-  public void testShouldGetStringBeConsistentWithVarCharAccessorWithoutCalendar() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetStringBeConsistentWithVarCharAccessorWithoutCalendar(
+      Supplier<BaseFixedWidthVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
     assertGetStringIsConsistentWithVarCharAccessor(null);
   }
 
-  @Test
-  public void testShouldGetStringBeConsistentWithVarCharAccessorWithCalendar() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetStringBeConsistentWithVarCharAccessorWithCalendar(
+      Supplier<BaseFixedWidthVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
     Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone(AMERICA_VANCOUVER));
     assertGetStringIsConsistentWithVarCharAccessor(calendar);
   }
 
-  @Test
-  public void testValidateGetStringTimeZoneConsistency() throws Exception {
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      final TimeZone defaultTz = TimeZone.getDefault();
-      try {
-        final String string = accessor.getString(); // Should always be UTC as no calendar is provided
-
-        // Validate with UTC
-        Time time = accessor.getTime(null);
-        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
-        collector.checkThat(time.toString(), is(string));
-
-        // Validate with different TZ
-        TimeZone.setDefault(TimeZone.getTimeZone(AMERICA_VANCOUVER));
-        collector.checkThat(time.toString(), not(string));
-
-        collector.checkThat(accessor.wasNull(), is(false));
-      } finally {
-        // Set default Tz back
-        TimeZone.setDefault(defaultTz);
-      }
-    });
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testValidateGetStringTimeZoneConsistency(
+      Supplier<BaseFixedWidthVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          final TimeZone defaultTz = TimeZone.getDefault();
+          try {
+            final String string =
+                accessor.getString(); // Should always be UTC as no calendar is provided
+
+            // Validate with UTC
+            Time time = accessor.getTime(null);
+            TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+            assertThat(time.toString(), is(string));
+
+            // Validate with different TZ
+            TimeZone.setDefault(TimeZone.getTimeZone(AMERICA_VANCOUVER));
+            assertThat(time.toString(), not(string));
+
+            assertThat(accessor.wasNull(), is(false));
+          } finally {
+            // Set default Tz back
+            TimeZone.setDefault(defaultTz);
+          }
+        });
   }
 
   private void assertGetStringIsConsistentWithVarCharAccessor(Calendar calendar) throws Exception {
-    try (VarCharVector varCharVector = new VarCharVector("",
-        rootAllocatorTestRule.getRootAllocator())) {
+    try (VarCharVector varCharVector =
+        new VarCharVector("", rootAllocatorTestExtension.getRootAllocator())) {
       varCharVector.allocateNew(1);
       ArrowFlightJdbcVarCharVectorAccessor varCharVectorAccessor =
-          new ArrowFlightJdbcVarCharVectorAccessor(varCharVector, () -> 0, (boolean wasNull) -> {
-          });
+          new ArrowFlightJdbcVarCharVectorAccessor(varCharVector, () -> 0, (boolean wasNull) -> {});
 
-      accessorIterator.iterate(vector, (accessor, currentRow) -> {
-        final String string = accessor.getString();
-        varCharVector.set(0, new Text(string));
-        varCharVector.setValueCount(1);
+      accessorIterator.iterate(
+          vector,
+          (accessor, currentRow) -> {
+            final String string = accessor.getString();
+            varCharVector.set(0, new Text(string));
+            varCharVector.setValueCount(1);
 
-        Time timeFromVarChar = varCharVectorAccessor.getTime(calendar);
-        Time time = accessor.getTime(calendar);
+            Time timeFromVarChar = varCharVectorAccessor.getTime(calendar);
+            Time time = accessor.getTime(calendar);
 
-        collector.checkThat(time, is(timeFromVarChar));
-        collector.checkThat(accessor.wasNull(), is(false));
-      });
+            assertThat(time, is(timeFromVarChar));
+            assertThat(accessor.wasNull(), is(false));
+          });
     }
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/AbstractArrowFlightJdbcListAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/AbstractArrowFlightJdbcListAccessorTest.java
index e958fb60ba41e..ad689837e2201 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/AbstractArrowFlightJdbcListAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/AbstractArrowFlightJdbcListAccessorTest.java
@@ -14,172 +14,189 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.complex;
 
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.sql.Array;
 import java.sql.ResultSet;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 import java.util.function.Supplier;
-
+import java.util.stream.Stream;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.complex.FixedSizeListVector;
 import org.apache.arrow.vector.complex.LargeListVector;
 import org.apache.arrow.vector.complex.ListVector;
 import org.hamcrest.CoreMatchers;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class AbstractArrowFlightJdbcListAccessorTest {
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
+public class AbstractArrowFlightJdbcListAccessorTest {
 
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
-  private final Supplier<ValueVector> vectorSupplier;
   private ValueVector vector;
 
   private final AccessorTestUtils.AccessorSupplier<AbstractArrowFlightJdbcListVectorAccessor>
-      accessorSupplier = (vector, getCurrentRow) -> {
-        ArrowFlightJdbcAccessorFactory.WasNullConsumer noOpWasNullConsumer = (boolean wasNull) -> {
-        };
-        if (vector instanceof ListVector) {
-          return new ArrowFlightJdbcListVectorAccessor((ListVector) vector, getCurrentRow,
-              noOpWasNullConsumer);
-        } else if (vector instanceof LargeListVector) {
-          return new ArrowFlightJdbcLargeListVectorAccessor((LargeListVector) vector, getCurrentRow,
-              noOpWasNullConsumer);
-        } else if (vector instanceof FixedSizeListVector) {
-          return new ArrowFlightJdbcFixedSizeListVectorAccessor((FixedSizeListVector) vector,
-              getCurrentRow, noOpWasNullConsumer);
-        }
-        return null;
-      };
+      accessorSupplier =
+          (vector, getCurrentRow) -> {
+            ArrowFlightJdbcAccessorFactory.WasNullConsumer noOpWasNullConsumer =
+                (boolean wasNull) -> {};
+            if (vector instanceof ListVector) {
+              return new ArrowFlightJdbcListVectorAccessor(
+                  (ListVector) vector, getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof LargeListVector) {
+              return new ArrowFlightJdbcLargeListVectorAccessor(
+                  (LargeListVector) vector, getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof FixedSizeListVector) {
+              return new ArrowFlightJdbcFixedSizeListVectorAccessor(
+                  (FixedSizeListVector) vector, getCurrentRow, noOpWasNullConsumer);
+            }
+            return null;
+          };
 
   final AccessorTestUtils.AccessorIterator<AbstractArrowFlightJdbcListVectorAccessor>
-      accessorIterator =
-      new AccessorTestUtils.AccessorIterator<>(collector, accessorSupplier);
-
-  @Parameterized.Parameters(name = "{1}")
-  public static Collection<Object[]> data() {
-    return Arrays.asList(new Object[][] {
-        {(Supplier<ValueVector>) () -> rootAllocatorTestRule.createListVector(), "ListVector"},
-        {(Supplier<ValueVector>) () -> rootAllocatorTestRule.createLargeListVector(),
-            "LargeListVector"},
-        {(Supplier<ValueVector>) () -> rootAllocatorTestRule.createFixedSizeListVector(),
-            "FixedSizeListVector"},
-    });
-  }
-
-  public AbstractArrowFlightJdbcListAccessorTest(Supplier<ValueVector> vectorSupplier,
-                                                 String vectorType) {
-    this.vectorSupplier = vectorSupplier;
+      accessorIterator = new AccessorTestUtils.AccessorIterator<>(accessorSupplier);
+
+  public static Stream<Arguments> data() {
+    return Stream.of(
+        Arguments.of(
+            (Supplier<ValueVector>) () -> rootAllocatorTestExtension.createListVector(),
+            "ListVector"),
+        Arguments.of(
+            (Supplier<ValueVector>) () -> rootAllocatorTestExtension.createLargeListVector(),
+            "LargeListVector"),
+        Arguments.of(
+            (Supplier<ValueVector>) () -> rootAllocatorTestExtension.createFixedSizeListVector(),
+            "FixedSizeListVector"));
   }
 
-  @Before
-  public void setup() {
-    this.vector = this.vectorSupplier.get();
+  public void setup(Supplier<ValueVector> vectorSupplier) {
+    this.vector = vectorSupplier.get();
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     this.vector.close();
   }
 
-  @Test
-  public void testShouldGetObjectClassReturnCorrectClass() throws Exception {
-    accessorIterator.assertAccessorGetter(vector,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetObjectClassReturnCorrectClass(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
         AbstractArrowFlightJdbcListVectorAccessor::getObjectClass,
         (accessor, currentRow) -> equalTo(List.class));
   }
 
-  @Test
-  public void testShouldGetObjectReturnValidList() throws Exception {
-    accessorIterator.assertAccessorGetter(vector,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetObjectReturnValidList(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
         AbstractArrowFlightJdbcListVectorAccessor::getObject,
-        (accessor, currentRow) -> equalTo(
-            Arrays.asList(0, currentRow, currentRow * 2, currentRow * 3, currentRow * 4)));
+        (accessor, currentRow) ->
+            equalTo(Arrays.asList(0, currentRow, currentRow * 2, currentRow * 3, currentRow * 4)));
   }
 
-  @Test
-  public void testShouldGetObjectReturnNull() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetObjectReturnNull(Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
     vector.clear();
     vector.allocateNewSafe();
     vector.setValueCount(5);
 
-    accessorIterator.assertAccessorGetter(vector,
+    accessorIterator.assertAccessorGetter(
+        vector,
         AbstractArrowFlightJdbcListVectorAccessor::getObject,
         (accessor, currentRow) -> CoreMatchers.nullValue());
   }
 
-  @Test
-  public void testShouldGetArrayReturnValidArray() throws Exception {
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      Array array = accessor.getArray();
-      assert array != null;
-
-      Object[] arrayObject = (Object[]) array.getArray();
-
-      collector.checkThat(arrayObject, equalTo(
-          new Object[] {0, currentRow, currentRow * 2, currentRow * 3, currentRow * 4}));
-    });
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetArrayReturnValidArray(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          Array array = accessor.getArray();
+          assert array != null;
+
+          Object[] arrayObject = (Object[]) array.getArray();
+
+          assertThat(
+              arrayObject,
+              equalTo(
+                  new Object[] {0, currentRow, currentRow * 2, currentRow * 3, currentRow * 4}));
+        });
   }
 
-  @Test
-  public void testShouldGetArrayReturnNull() throws Exception {
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetArrayReturnNull(Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
     vector.clear();
     vector.allocateNewSafe();
     vector.setValueCount(5);
 
-    accessorIterator.assertAccessorGetter(vector,
-        AbstractArrowFlightJdbcListVectorAccessor::getArray,
-        CoreMatchers.nullValue());
+    accessorIterator.assertAccessorGetter(
+        vector, AbstractArrowFlightJdbcListVectorAccessor::getArray, CoreMatchers.nullValue());
   }
 
-  @Test
-  public void testShouldGetArrayReturnValidArrayPassingOffsets() throws Exception {
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      Array array = accessor.getArray();
-      assert array != null;
-
-      Object[] arrayObject = (Object[]) array.getArray(1, 3);
-
-      collector.checkThat(arrayObject, equalTo(
-          new Object[] {currentRow, currentRow * 2, currentRow * 3}));
-    });
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetArrayReturnValidArrayPassingOffsets(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          Array array = accessor.getArray();
+          assert array != null;
+
+          Object[] arrayObject = (Object[]) array.getArray(1, 3);
+
+          assertThat(
+              arrayObject, equalTo(new Object[] {currentRow, currentRow * 2, currentRow * 3}));
+        });
   }
 
-  @Test
-  public void testShouldGetArrayGetResultSetReturnValidResultSet() throws Exception {
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      Array array = accessor.getArray();
-      assert array != null;
-
-      try (ResultSet rs = array.getResultSet()) {
-        int count = 0;
-        while (rs.next()) {
-          final int value = rs.getInt(1);
-          collector.checkThat(value, equalTo(currentRow * count));
-          count++;
-        }
-        collector.checkThat(count, equalTo(5));
-      }
-    });
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetArrayGetResultSetReturnValidResultSet(
+      Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          Array array = accessor.getArray();
+          assert array != null;
+
+          try (ResultSet rs = array.getResultSet()) {
+            int count = 0;
+            while (rs.next()) {
+              final int value = rs.getInt(1);
+              assertThat(value, equalTo(currentRow * count));
+              count++;
+            }
+            assertThat(count, equalTo(5));
+          }
+        });
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/AbstractArrowFlightJdbcUnionVectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/AbstractArrowFlightJdbcUnionVectorAccessorTest.java
index 2b53b27dc9e13..6a143d2ee888f 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/AbstractArrowFlightJdbcUnionVectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/AbstractArrowFlightJdbcUnionVectorAccessorTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.complex;
 
 import static org.mockito.Mockito.mock;
@@ -24,27 +23,24 @@
 import java.sql.SQLException;
 import java.util.Calendar;
 import java.util.Map;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.driver.jdbc.accessor.impl.ArrowFlightJdbcNullVectorAccessor;
 import org.apache.arrow.vector.NullVector;
 import org.apache.arrow.vector.ValueVector;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Spy;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class AbstractArrowFlightJdbcUnionVectorAccessorTest {
 
-  @Mock
-  ArrowFlightJdbcAccessor innerAccessor;
-  @Spy
-  AbstractArrowFlightJdbcUnionVectorAccessorMock accessor;
+  @Mock ArrowFlightJdbcAccessor innerAccessor;
+  @Spy AbstractArrowFlightJdbcUnionVectorAccessorMock accessor;
 
-  @Before
+  @BeforeEach
   public void setup() {
     when(accessor.getAccessor()).thenReturn(innerAccessor);
   }
@@ -242,14 +238,12 @@ public void testGetBigDecimalWithScaleUsesSpecificAccessor() throws SQLException
   private static class AbstractArrowFlightJdbcUnionVectorAccessorMock
       extends AbstractArrowFlightJdbcUnionVectorAccessor {
     protected AbstractArrowFlightJdbcUnionVectorAccessorMock() {
-      super(() -> 0, (boolean wasNull) -> {
-      });
+      super(() -> 0, (boolean wasNull) -> {});
     }
 
     @Override
     protected ArrowFlightJdbcAccessor createAccessorForVector(ValueVector vector) {
-      return new ArrowFlightJdbcNullVectorAccessor((boolean wasNull) -> {
-      });
+      return new ArrowFlightJdbcNullVectorAccessor((boolean wasNull) -> {});
     }
 
     @Override
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcDenseUnionVectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcDenseUnionVectorAccessorTest.java
index 41d5eb97e85f6..6832ac0850d4c 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcDenseUnionVectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcDenseUnionVectorAccessorTest.java
@@ -14,55 +14,52 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.complex;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.complex.DenseUnionVector;
 import org.apache.arrow.vector.holders.NullableBigIntHolder;
 import org.apache.arrow.vector.holders.NullableFloat8Holder;
 import org.apache.arrow.vector.holders.NullableTimeStampMilliHolder;
 import org.apache.arrow.vector.types.Types;
 import org.apache.arrow.vector.types.pojo.Field;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class ArrowFlightJdbcDenseUnionVectorAccessorTest {
 
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
-
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
   private DenseUnionVector vector;
 
   private final AccessorTestUtils.AccessorSupplier<ArrowFlightJdbcDenseUnionVectorAccessor>
       accessorSupplier =
-          (vector, getCurrentRow) -> new ArrowFlightJdbcDenseUnionVectorAccessor(
-              (DenseUnionVector) vector, getCurrentRow, (boolean wasNull) -> {
-            //No Operation
-          });
+          (vector, getCurrentRow) ->
+              new ArrowFlightJdbcDenseUnionVectorAccessor(
+                  (DenseUnionVector) vector,
+                  getCurrentRow,
+                  (boolean wasNull) -> {
+                    // No Operation
+                  });
 
   private final AccessorTestUtils.AccessorIterator<ArrowFlightJdbcDenseUnionVectorAccessor>
-      accessorIterator =
-      new AccessorTestUtils.AccessorIterator<>(collector, accessorSupplier);
+      accessorIterator = new AccessorTestUtils.AccessorIterator<>(accessorSupplier);
 
-  @Before
+  @BeforeEach
   public void setup() throws Exception {
-    this.vector = DenseUnionVector.empty("", rootAllocatorTestRule.getRootAllocator());
+    this.vector = DenseUnionVector.empty("", rootAllocatorTestExtension.getRootAllocator());
     this.vector.allocateNew();
 
     // write some data
@@ -98,7 +95,7 @@ public void setup() throws Exception {
     this.vector.setValueCount(5);
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     this.vector.close();
   }
@@ -106,21 +103,17 @@ public void tearDown() {
   @Test
   public void getObject() throws Exception {
     List<Object> result = accessorIterator.toList(vector);
-    List<Object> expected = Arrays.asList(
-        Long.MAX_VALUE,
-        Math.PI,
-        new Timestamp(1625702400000L),
-        null,
-        null);
-
-    collector.checkThat(result, is(expected));
+    List<Object> expected =
+        Arrays.asList(Long.MAX_VALUE, Math.PI, new Timestamp(1625702400000L), null, null);
+
+    assertThat(result, is(expected));
   }
 
   @Test
   public void getObjectForNull() throws Exception {
     vector.reset();
     vector.setValueCount(5);
-    accessorIterator.assertAccessorGetter(vector,
-        AbstractArrowFlightJdbcUnionVectorAccessor::getObject, equalTo(null));
+    accessorIterator.assertAccessorGetter(
+        vector, AbstractArrowFlightJdbcUnionVectorAccessor::getObject, equalTo(null));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcMapVectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcMapVectorAccessorTest.java
index 7a81da4240b1a..696e5afb71171 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcMapVectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcMapVectorAccessorTest.java
@@ -14,40 +14,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.complex;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.sql.Array;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Map;
-
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.complex.MapVector;
 import org.apache.arrow.vector.complex.StructVector;
 import org.apache.arrow.vector.complex.impl.UnionMapWriter;
 import org.apache.arrow.vector.util.JsonStringHashMap;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class ArrowFlightJdbcMapVectorAccessorTest {
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
-
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
   private MapVector vector;
 
-  @Before
+  @BeforeEach
   public void setup() {
-    vector = MapVector.empty("", rootAllocatorTestRule.getRootAllocator(), false);
+    vector = MapVector.empty("", rootAllocatorTestExtension.getRootAllocator(), false);
     UnionMapWriter writer = vector.getWriter();
     writer.allocate();
     writer.setPosition(0); // optional
@@ -96,7 +95,7 @@ public void setup() {
     writer.setValueCount(3);
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     vector.close();
   }
@@ -105,21 +104,21 @@ public void tearDown() {
   public void testShouldGetObjectReturnValidMap() {
     AccessorTestUtils.Cursor cursor = new AccessorTestUtils.Cursor(vector.getValueCount());
     ArrowFlightJdbcMapVectorAccessor accessor =
-        new ArrowFlightJdbcMapVectorAccessor(vector, cursor::getCurrentRow, (boolean wasNull) -> {
-        });
+        new ArrowFlightJdbcMapVectorAccessor(
+            vector, cursor::getCurrentRow, (boolean wasNull) -> {});
 
     Map<Object, Object> expected = new JsonStringHashMap<>();
     expected.put(1, 11);
     expected.put(2, 22);
     expected.put(3, 33);
-    Assert.assertEquals(expected, accessor.getObject());
-    Assert.assertFalse(accessor.wasNull());
+    assertEquals(expected, accessor.getObject());
+    assertFalse(accessor.wasNull());
 
     cursor.next();
     expected = new JsonStringHashMap<>();
     expected.put(2, null);
-    Assert.assertEquals(expected, accessor.getObject());
-    Assert.assertFalse(accessor.wasNull());
+    assertEquals(expected, accessor.getObject());
+    assertFalse(accessor.wasNull());
 
     cursor.next();
     expected = new JsonStringHashMap<>();
@@ -127,82 +126,81 @@ public void testShouldGetObjectReturnValidMap() {
     expected.put(1, 2001);
     expected.put(2, 2002);
     expected.put(3, 2003);
-    Assert.assertEquals(expected, accessor.getObject());
-    Assert.assertFalse(accessor.wasNull());
+    assertEquals(expected, accessor.getObject());
+    assertFalse(accessor.wasNull());
   }
 
   @Test
   public void testShouldGetObjectReturnNull() {
     vector.setNull(0);
     ArrowFlightJdbcMapVectorAccessor accessor =
-        new ArrowFlightJdbcMapVectorAccessor(vector, () -> 0, (boolean wasNull) -> {
-        });
+        new ArrowFlightJdbcMapVectorAccessor(vector, () -> 0, (boolean wasNull) -> {});
 
-    Assert.assertNull(accessor.getObject());
-    Assert.assertTrue(accessor.wasNull());
+    assertNull(accessor.getObject());
+    assertTrue(accessor.wasNull());
   }
 
   @Test
   public void testShouldGetArrayReturnValidArray() throws SQLException {
     AccessorTestUtils.Cursor cursor = new AccessorTestUtils.Cursor(vector.getValueCount());
     ArrowFlightJdbcMapVectorAccessor accessor =
-        new ArrowFlightJdbcMapVectorAccessor(vector, cursor::getCurrentRow, (boolean wasNull) -> {
-        });
+        new ArrowFlightJdbcMapVectorAccessor(
+            vector, cursor::getCurrentRow, (boolean wasNull) -> {});
 
     Array array = accessor.getArray();
-    Assert.assertNotNull(array);
-    Assert.assertFalse(accessor.wasNull());
+    assertNotNull(array);
+    assertFalse(accessor.wasNull());
 
     try (ResultSet resultSet = array.getResultSet()) {
-      Assert.assertTrue(resultSet.next());
+      assertTrue(resultSet.next());
       Map<?, ?> entry = resultSet.getObject(1, Map.class);
-      Assert.assertEquals(1, entry.get("key"));
-      Assert.assertEquals(11, entry.get("value"));
-      Assert.assertTrue(resultSet.next());
+      assertEquals(1, entry.get("key"));
+      assertEquals(11, entry.get("value"));
+      assertTrue(resultSet.next());
       entry = resultSet.getObject(1, Map.class);
-      Assert.assertEquals(2, entry.get("key"));
-      Assert.assertEquals(22, entry.get("value"));
-      Assert.assertTrue(resultSet.next());
+      assertEquals(2, entry.get("key"));
+      assertEquals(22, entry.get("value"));
+      assertTrue(resultSet.next());
       entry = resultSet.getObject(1, Map.class);
-      Assert.assertEquals(3, entry.get("key"));
-      Assert.assertEquals(33, entry.get("value"));
-      Assert.assertFalse(resultSet.next());
+      assertEquals(3, entry.get("key"));
+      assertEquals(33, entry.get("value"));
+      assertFalse(resultSet.next());
     }
 
     cursor.next();
     array = accessor.getArray();
-    Assert.assertNotNull(array);
-    Assert.assertFalse(accessor.wasNull());
+    assertNotNull(array);
+    assertFalse(accessor.wasNull());
     try (ResultSet resultSet = array.getResultSet()) {
-      Assert.assertTrue(resultSet.next());
+      assertTrue(resultSet.next());
       Map<?, ?> entry = resultSet.getObject(1, Map.class);
-      Assert.assertEquals(2, entry.get("key"));
-      Assert.assertNull(entry.get("value"));
-      Assert.assertFalse(resultSet.next());
+      assertEquals(2, entry.get("key"));
+      assertNull(entry.get("value"));
+      assertFalse(resultSet.next());
     }
 
     cursor.next();
     array = accessor.getArray();
-    Assert.assertNotNull(array);
-    Assert.assertFalse(accessor.wasNull());
+    assertNotNull(array);
+    assertFalse(accessor.wasNull());
     try (ResultSet resultSet = array.getResultSet()) {
-      Assert.assertTrue(resultSet.next());
+      assertTrue(resultSet.next());
       Map<?, ?> entry = resultSet.getObject(1, Map.class);
-      Assert.assertEquals(0, entry.get("key"));
-      Assert.assertEquals(2000, entry.get("value"));
-      Assert.assertTrue(resultSet.next());
+      assertEquals(0, entry.get("key"));
+      assertEquals(2000, entry.get("value"));
+      assertTrue(resultSet.next());
       entry = resultSet.getObject(1, Map.class);
-      Assert.assertEquals(1, entry.get("key"));
-      Assert.assertEquals(2001, entry.get("value"));
-      Assert.assertTrue(resultSet.next());
+      assertEquals(1, entry.get("key"));
+      assertEquals(2001, entry.get("value"));
+      assertTrue(resultSet.next());
       entry = resultSet.getObject(1, Map.class);
-      Assert.assertEquals(2, entry.get("key"));
-      Assert.assertEquals(2002, entry.get("value"));
-      Assert.assertTrue(resultSet.next());
+      assertEquals(2, entry.get("key"));
+      assertEquals(2002, entry.get("value"));
+      assertTrue(resultSet.next());
       entry = resultSet.getObject(1, Map.class);
-      Assert.assertEquals(3, entry.get("key"));
-      Assert.assertEquals(2003, entry.get("value"));
-      Assert.assertFalse(resultSet.next());
+      assertEquals(3, entry.get("key"));
+      assertEquals(2003, entry.get("value"));
+      assertFalse(resultSet.next());
     }
   }
 
@@ -212,10 +210,9 @@ public void testShouldGetArrayReturnNull() {
     ((StructVector) vector.getDataVector()).setNull(0);
 
     ArrowFlightJdbcMapVectorAccessor accessor =
-        new ArrowFlightJdbcMapVectorAccessor(vector, () -> 0, (boolean wasNull) -> {
-        });
+        new ArrowFlightJdbcMapVectorAccessor(vector, () -> 0, (boolean wasNull) -> {});
 
-    Assert.assertNull(accessor.getArray());
-    Assert.assertTrue(accessor.wasNull());
+    assertNull(accessor.getArray());
+    assertTrue(accessor.wasNull());
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcStructVectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcStructVectorAccessorTest.java
index 735fe9f40ba0e..d3cc7f8544579 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcStructVectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcStructVectorAccessorTest.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.complex;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.sql.SQLException;
 import java.sql.Struct;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.Float8Vector;
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.complex.ListVector;
@@ -39,47 +39,41 @@
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.util.JsonStringArrayList;
 import org.apache.arrow.vector.util.JsonStringHashMap;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class ArrowFlightJdbcStructVectorAccessorTest {
 
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
-
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
   private StructVector vector;
 
   private final AccessorTestUtils.AccessorSupplier<ArrowFlightJdbcStructVectorAccessor>
       accessorSupplier =
-          (vector, getCurrentRow) -> new ArrowFlightJdbcStructVectorAccessor((StructVector) vector,
-              getCurrentRow, (boolean wasNull) -> {
-          });
+          (vector, getCurrentRow) ->
+              new ArrowFlightJdbcStructVectorAccessor(
+                  (StructVector) vector, getCurrentRow, (boolean wasNull) -> {});
 
   private final AccessorTestUtils.AccessorIterator<ArrowFlightJdbcStructVectorAccessor>
-      accessorIterator =
-      new AccessorTestUtils.AccessorIterator<>(collector, accessorSupplier);
+      accessorIterator = new AccessorTestUtils.AccessorIterator<>(accessorSupplier);
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     Map<String, String> metadata = new HashMap<>();
     metadata.put("k1", "v1");
     FieldType type = new FieldType(true, ArrowType.Struct.INSTANCE, null, metadata);
-    vector = new StructVector("", rootAllocatorTestRule.getRootAllocator(), type, null);
+    vector = new StructVector("", rootAllocatorTestExtension.getRootAllocator(), type, null);
     vector.allocateNew();
 
     IntVector intVector =
         vector.addOrGet("int", FieldType.nullable(Types.MinorType.INT.getType()), IntVector.class);
     Float8Vector float8Vector =
-        vector.addOrGet("float8", FieldType.nullable(Types.MinorType.FLOAT8.getType()),
-            Float8Vector.class);
+        vector.addOrGet(
+            "float8", FieldType.nullable(Types.MinorType.FLOAT8.getType()), Float8Vector.class);
 
     intVector.setSafe(0, 100);
     float8Vector.setSafe(0, 100.05);
@@ -91,21 +85,24 @@ public void setUp() throws Exception {
     vector.setValueCount(2);
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     vector.close();
   }
 
   @Test
   public void testShouldGetObjectClassReturnMapClass() throws Exception {
-    accessorIterator.assertAccessorGetter(vector,
+    accessorIterator.assertAccessorGetter(
+        vector,
         ArrowFlightJdbcStructVectorAccessor::getObjectClass,
         (accessor, currentRow) -> equalTo(Map.class));
   }
 
   @Test
   public void testShouldGetObjectReturnValidMap() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcStructVectorAccessor::getObject,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcStructVectorAccessor::getObject,
         (accessor, currentRow) -> {
           Map<String, Object> expected = new HashMap<>();
           expected.put("int", 100 * (currentRow + 1));
@@ -119,37 +116,40 @@ public void testShouldGetObjectReturnValidMap() throws Exception {
   public void testShouldGetObjectReturnNull() throws Exception {
     vector.setNull(0);
     vector.setNull(1);
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcStructVectorAccessor::getObject,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcStructVectorAccessor::getObject,
         (accessor, currentRow) -> nullValue());
   }
 
   @Test
   public void testShouldGetStructReturnValidStruct() throws Exception {
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      Struct struct = accessor.getStruct();
-      assert struct != null;
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          Struct struct = accessor.getStruct();
+          assert struct != null;
 
-      Object[] expected = new Object[] {
-          100 * (currentRow + 1),
-          100.05 * (currentRow + 1)
-      };
+          Object[] expected = new Object[] {100 * (currentRow + 1), 100.05 * (currentRow + 1)};
 
-      collector.checkThat(struct.getAttributes(), equalTo(expected));
-    });
+          assertThat(struct.getAttributes(), equalTo(expected));
+        });
   }
 
   @Test
   public void testShouldGetStructReturnNull() throws Exception {
     vector.setNull(0);
     vector.setNull(1);
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcStructVectorAccessor::getStruct,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcStructVectorAccessor::getStruct,
         (accessor, currentRow) -> nullValue());
   }
 
   @Test
   public void testShouldGetObjectWorkWithNestedComplexData() throws SQLException {
-    try (StructVector rootVector = StructVector.empty("",
-        rootAllocatorTestRule.getRootAllocator())) {
+    try (StructVector rootVector =
+        StructVector.empty("", rootAllocatorTestExtension.getRootAllocator())) {
       StructVector structVector = rootVector.addOrGetStruct("struct");
 
       FieldType intFieldType = FieldType.nullable(Types.MinorType.INT.getType());
@@ -199,11 +199,10 @@ public void testShouldGetObjectWorkWithNestedComplexData() throws SQLException {
       expected.put("union", true);
 
       ArrowFlightJdbcStructVectorAccessor accessor =
-          new ArrowFlightJdbcStructVectorAccessor(rootVector, () -> 0, (boolean wasNull) -> {
-          });
+          new ArrowFlightJdbcStructVectorAccessor(rootVector, () -> 0, (boolean wasNull) -> {});
 
-      Assert.assertEquals(expected, accessor.getObject());
-      Assert.assertEquals(expected.toString(), accessor.getString());
+      assertEquals(expected, accessor.getObject());
+      assertEquals(expected.toString(), accessor.getString());
     }
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcUnionVectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcUnionVectorAccessorTest.java
index 9ec9388ff87c9..82cd882393cfa 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcUnionVectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcUnionVectorAccessorTest.java
@@ -14,53 +14,47 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.complex;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.sql.Timestamp;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.complex.UnionVector;
 import org.apache.arrow.vector.holders.NullableBigIntHolder;
 import org.apache.arrow.vector.holders.NullableFloat8Holder;
 import org.apache.arrow.vector.holders.NullableTimeStampMilliHolder;
 import org.apache.arrow.vector.types.Types;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class ArrowFlightJdbcUnionVectorAccessorTest {
 
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
-
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
   private UnionVector vector;
 
   private final AccessorTestUtils.AccessorSupplier<ArrowFlightJdbcUnionVectorAccessor>
       accessorSupplier =
-          (vector, getCurrentRow) -> new ArrowFlightJdbcUnionVectorAccessor((UnionVector) vector,
-              getCurrentRow, (boolean wasNull) -> {
-          });
+          (vector, getCurrentRow) ->
+              new ArrowFlightJdbcUnionVectorAccessor(
+                  (UnionVector) vector, getCurrentRow, (boolean wasNull) -> {});
 
   private final AccessorTestUtils.AccessorIterator<ArrowFlightJdbcUnionVectorAccessor>
-      accessorIterator =
-      new AccessorTestUtils.AccessorIterator<>(collector, accessorSupplier);
+      accessorIterator = new AccessorTestUtils.AccessorIterator<>(accessorSupplier);
 
-  @Before
+  @BeforeEach
   public void setup() {
-    this.vector = UnionVector.empty("", rootAllocatorTestRule.getRootAllocator());
+    this.vector = UnionVector.empty("", rootAllocatorTestExtension.getRootAllocator());
     this.vector.allocateNew();
 
     NullableBigIntHolder nullableBigIntHolder = new NullableBigIntHolder();
@@ -88,7 +82,7 @@ public void setup() {
     this.vector.setValueCount(5);
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     this.vector.close();
   }
@@ -96,14 +90,10 @@ public void tearDown() {
   @Test
   public void getObject() throws Exception {
     List<Object> result = accessorIterator.toList(vector);
-    List<Object> expected = Arrays.asList(
-        Long.MAX_VALUE,
-        Math.PI,
-        new Timestamp(1625702400000L),
-        null,
-        null);
-
-    collector.checkThat(result, is(expected));
+    List<Object> expected =
+        Arrays.asList(Long.MAX_VALUE, Math.PI, new Timestamp(1625702400000L), null, null);
+
+    assertThat(result, is(expected));
   }
 
   @Test
@@ -111,8 +101,7 @@ public void getObjectForNull() throws Exception {
     vector.reset();
     vector.setValueCount(5);
 
-    accessorIterator.assertAccessorGetter(vector,
-        AbstractArrowFlightJdbcUnionVectorAccessor::getObject,
-        equalTo(null));
+    accessorIterator.assertAccessorGetter(
+        vector, AbstractArrowFlightJdbcUnionVectorAccessor::getObject, equalTo(null));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBaseIntVectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBaseIntVectorAccessorTest.java
index 5e54b545a85ac..c7b050d00021c 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBaseIntVectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBaseIntVectorAccessorTest.java
@@ -14,18 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.numeric;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.function.Supplier;
-
+import java.util.stream.Stream;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.BaseIntVector;
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.IntVector;
@@ -35,137 +32,166 @@
 import org.apache.arrow.vector.UInt2Vector;
 import org.apache.arrow.vector.UInt4Vector;
 import org.apache.arrow.vector.UInt8Vector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@RunWith(Parameterized.class)
 public class ArrowFlightJdbcBaseIntVectorAccessorTest {
 
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
-
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
   private BaseIntVector vector;
-  private final Supplier<BaseIntVector> vectorSupplier;
 
   private final AccessorTestUtils.AccessorSupplier<ArrowFlightJdbcBaseIntVectorAccessor>
-      accessorSupplier = (vector, getCurrentRow) -> {
-        ArrowFlightJdbcAccessorFactory.WasNullConsumer noOpWasNullConsumer = (boolean wasNull) -> {
-        };
-        if (vector instanceof UInt1Vector) {
-          return new ArrowFlightJdbcBaseIntVectorAccessor((UInt1Vector) vector, getCurrentRow,
-              noOpWasNullConsumer);
-        } else if (vector instanceof UInt2Vector) {
-          return new ArrowFlightJdbcBaseIntVectorAccessor((UInt2Vector) vector, getCurrentRow,
-              noOpWasNullConsumer);
-        } else {
-          if (vector instanceof UInt4Vector) {
-            return new ArrowFlightJdbcBaseIntVectorAccessor((UInt4Vector) vector, getCurrentRow,
-                noOpWasNullConsumer);
-          } else if (vector instanceof UInt8Vector) {
-            return new ArrowFlightJdbcBaseIntVectorAccessor((UInt8Vector) vector, getCurrentRow,
-                noOpWasNullConsumer);
-          } else if (vector instanceof TinyIntVector) {
-            return new ArrowFlightJdbcBaseIntVectorAccessor((TinyIntVector) vector, getCurrentRow,
-                noOpWasNullConsumer);
-          } else if (vector instanceof SmallIntVector) {
-            return new ArrowFlightJdbcBaseIntVectorAccessor((SmallIntVector) vector, getCurrentRow,
-                noOpWasNullConsumer);
-          } else if (vector instanceof IntVector) {
-            return new ArrowFlightJdbcBaseIntVectorAccessor((IntVector) vector, getCurrentRow,
-                noOpWasNullConsumer);
-          } else if (vector instanceof BigIntVector) {
-            return new ArrowFlightJdbcBaseIntVectorAccessor((BigIntVector) vector, getCurrentRow,
-                noOpWasNullConsumer);
-          }
-        }
-        throw new UnsupportedOperationException();
-      };
+      accessorSupplier =
+          (vector, getCurrentRow) -> {
+            ArrowFlightJdbcAccessorFactory.WasNullConsumer noOpWasNullConsumer =
+                (boolean wasNull) -> {};
+            if (vector instanceof UInt1Vector) {
+              return new ArrowFlightJdbcBaseIntVectorAccessor(
+                  (UInt1Vector) vector, getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof UInt2Vector) {
+              return new ArrowFlightJdbcBaseIntVectorAccessor(
+                  (UInt2Vector) vector, getCurrentRow, noOpWasNullConsumer);
+            } else {
+              if (vector instanceof UInt4Vector) {
+                return new ArrowFlightJdbcBaseIntVectorAccessor(
+                    (UInt4Vector) vector, getCurrentRow, noOpWasNullConsumer);
+              } else if (vector instanceof UInt8Vector) {
+                return new ArrowFlightJdbcBaseIntVectorAccessor(
+                    (UInt8Vector) vector, getCurrentRow, noOpWasNullConsumer);
+              } else if (vector instanceof TinyIntVector) {
+                return new ArrowFlightJdbcBaseIntVectorAccessor(
+                    (TinyIntVector) vector, getCurrentRow, noOpWasNullConsumer);
+              } else if (vector instanceof SmallIntVector) {
+                return new ArrowFlightJdbcBaseIntVectorAccessor(
+                    (SmallIntVector) vector, getCurrentRow, noOpWasNullConsumer);
+              } else if (vector instanceof IntVector) {
+                return new ArrowFlightJdbcBaseIntVectorAccessor(
+                    (IntVector) vector, getCurrentRow, noOpWasNullConsumer);
+              } else if (vector instanceof BigIntVector) {
+                return new ArrowFlightJdbcBaseIntVectorAccessor(
+                    (BigIntVector) vector, getCurrentRow, noOpWasNullConsumer);
+              }
+            }
+            throw new UnsupportedOperationException();
+          };
 
   private final AccessorTestUtils.AccessorIterator<ArrowFlightJdbcBaseIntVectorAccessor>
-      accessorIterator = new AccessorTestUtils.AccessorIterator<>(collector, accessorSupplier);
-
-  @Parameterized.Parameters(name = "{1}")
-  public static Collection<Object[]> data() {
-    return Arrays.asList(new Object[][] {
-        {(Supplier<BaseIntVector>) () -> rootAllocatorTestRule.createIntVector(), "IntVector"},
-        {(Supplier<BaseIntVector>) () -> rootAllocatorTestRule.createSmallIntVector(),
-            "SmallIntVector"},
-        {(Supplier<BaseIntVector>) () -> rootAllocatorTestRule.createTinyIntVector(),
-            "TinyIntVector"},
-        {(Supplier<BaseIntVector>) () -> rootAllocatorTestRule.createBigIntVector(),
-            "BigIntVector"},
-        {(Supplier<BaseIntVector>) () -> rootAllocatorTestRule.createUInt1Vector(), "UInt1Vector"},
-        {(Supplier<BaseIntVector>) () -> rootAllocatorTestRule.createUInt2Vector(), "UInt2Vector"},
-        {(Supplier<BaseIntVector>) () -> rootAllocatorTestRule.createUInt4Vector(), "UInt4Vector"},
-        {(Supplier<BaseIntVector>) () -> rootAllocatorTestRule.createUInt8Vector(), "UInt8Vector"}
-    });
-  }
-
-  public ArrowFlightJdbcBaseIntVectorAccessorTest(Supplier<BaseIntVector> vectorSupplier,
-                                                  String vectorType) {
-    this.vectorSupplier = vectorSupplier;
+      accessorIterator = new AccessorTestUtils.AccessorIterator<>(accessorSupplier);
+
+  public static Stream<Arguments> data() {
+    return Stream.of(
+        Arguments.of(
+            (Supplier<BaseIntVector>) () -> rootAllocatorTestExtension.createIntVector(),
+            "IntVector"),
+        Arguments.of(
+            (Supplier<BaseIntVector>) () -> rootAllocatorTestExtension.createSmallIntVector(),
+            "SmallIntVector"),
+        Arguments.of(
+            (Supplier<BaseIntVector>) () -> rootAllocatorTestExtension.createTinyIntVector(),
+            "TinyIntVector"),
+        Arguments.of(
+            (Supplier<BaseIntVector>) () -> rootAllocatorTestExtension.createBigIntVector(),
+            "BigIntVector"),
+        Arguments.of(
+            (Supplier<BaseIntVector>) () -> rootAllocatorTestExtension.createUInt1Vector(),
+            "UInt1Vector"),
+        Arguments.of(
+            (Supplier<BaseIntVector>) () -> rootAllocatorTestExtension.createUInt2Vector(),
+            "UInt2Vector"),
+        Arguments.of(
+            (Supplier<BaseIntVector>) () -> rootAllocatorTestExtension.createUInt4Vector(),
+            "UInt4Vector"),
+        Arguments.of(
+            (Supplier<BaseIntVector>) () -> rootAllocatorTestExtension.createUInt8Vector(),
+            "UInt8Vector"));
   }
 
-  @Before
-  public void setup() {
+  public void setup(Supplier<BaseIntVector> vectorSupplier) {
     this.vector = vectorSupplier.get();
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     this.vector.close();
   }
 
-  @Test
-  public void testShouldConvertToByteMethodFromBaseIntVector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcBaseIntVectorAccessor::getByte,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldConvertToByteMethodFromBaseIntVector(Supplier<BaseIntVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcBaseIntVectorAccessor::getByte,
         (accessor, currentRow) -> equalTo((byte) accessor.getLong()));
   }
 
-  @Test
-  public void testShouldConvertToShortMethodFromBaseIntVector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcBaseIntVectorAccessor::getShort,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldConvertToShortMethodFromBaseIntVector(
+      Supplier<BaseIntVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcBaseIntVectorAccessor::getShort,
         (accessor, currentRow) -> equalTo((short) accessor.getLong()));
   }
 
-  @Test
-  public void testShouldConvertToIntegerMethodFromBaseIntVector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcBaseIntVectorAccessor::getInt,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldConvertToIntegerMethodFromBaseIntVector(
+      Supplier<BaseIntVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcBaseIntVectorAccessor::getInt,
         (accessor, currentRow) -> equalTo((int) accessor.getLong()));
   }
 
-  @Test
-  public void testShouldConvertToFloatMethodFromBaseIntVector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcBaseIntVectorAccessor::getFloat,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldConvertToFloatMethodFromBaseIntVector(
+      Supplier<BaseIntVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcBaseIntVectorAccessor::getFloat,
         (accessor, currentRow) -> equalTo((float) accessor.getLong()));
   }
 
-  @Test
-  public void testShouldConvertToDoubleMethodFromBaseIntVector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcBaseIntVectorAccessor::getDouble,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldConvertToDoubleMethodFromBaseIntVector(
+      Supplier<BaseIntVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcBaseIntVectorAccessor::getDouble,
         (accessor, currentRow) -> equalTo((double) accessor.getLong()));
   }
 
-  @Test
-  public void testShouldConvertToBooleanMethodFromBaseIntVector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcBaseIntVectorAccessor::getBoolean,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldConvertToBooleanMethodFromBaseIntVector(
+      Supplier<BaseIntVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcBaseIntVectorAccessor::getBoolean,
         (accessor, currentRow) -> equalTo(accessor.getLong() != 0L));
   }
 
-  @Test
-  public void testShouldGetObjectClass() throws Exception {
-    accessorIterator.assertAccessorGetter(vector,
-        ArrowFlightJdbcBaseIntVectorAccessor::getObjectClass,
-        equalTo(Long.class));
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetObjectClass(Supplier<BaseIntVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector, ArrowFlightJdbcBaseIntVectorAccessor::getObjectClass, equalTo(Long.class));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBaseIntVectorAccessorUnitTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBaseIntVectorAccessorUnitTest.java
index 2e64b6fb40276..e629d2f6ecd1c 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBaseIntVectorAccessorUnitTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBaseIntVectorAccessorUnitTest.java
@@ -14,14 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.numeric;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.IntVector;
@@ -32,20 +31,20 @@
 import org.apache.arrow.vector.UInt4Vector;
 import org.apache.arrow.vector.UInt8Vector;
 import org.hamcrest.CoreMatchers;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+@ExtendWith(MockitoExtension.class)
 public class ArrowFlightJdbcBaseIntVectorAccessorUnitTest {
 
-  @ClassRule
-  public static RootAllocatorTestRule rule = new RootAllocatorTestRule();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
+
   private static UInt4Vector int4Vector;
   private static UInt8Vector int8Vector;
   private static IntVector intVectorWithNull;
@@ -53,161 +52,178 @@ public class ArrowFlightJdbcBaseIntVectorAccessorUnitTest {
   private static SmallIntVector smallIntVector;
   private static IntVector intVector;
   private static BigIntVector bigIntVector;
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
 
   private final AccessorTestUtils.AccessorSupplier<ArrowFlightJdbcBaseIntVectorAccessor>
-      accessorSupplier = (vector, getCurrentRow) -> {
-        ArrowFlightJdbcAccessorFactory.WasNullConsumer noOpWasNullConsumer = (boolean wasNull) -> {
-        };
-        if (vector instanceof UInt1Vector) {
-          return new ArrowFlightJdbcBaseIntVectorAccessor((UInt1Vector) vector, getCurrentRow,
-            noOpWasNullConsumer);
-        } else if (vector instanceof UInt2Vector) {
-          return new ArrowFlightJdbcBaseIntVectorAccessor((UInt2Vector) vector, getCurrentRow,
-            noOpWasNullConsumer);
-        } else if (vector instanceof UInt4Vector) {
-          return new ArrowFlightJdbcBaseIntVectorAccessor((UInt4Vector) vector, getCurrentRow,
-            noOpWasNullConsumer);
-        } else if (vector instanceof UInt8Vector) {
-          return new ArrowFlightJdbcBaseIntVectorAccessor((UInt8Vector) vector, getCurrentRow,
-            noOpWasNullConsumer);
-        } else if (vector instanceof TinyIntVector) {
-          return new ArrowFlightJdbcBaseIntVectorAccessor((TinyIntVector) vector, getCurrentRow,
-            noOpWasNullConsumer);
-        } else if (vector instanceof SmallIntVector) {
-          return new ArrowFlightJdbcBaseIntVectorAccessor((SmallIntVector) vector, getCurrentRow,
-            noOpWasNullConsumer);
-        } else if (vector instanceof IntVector) {
-          return new ArrowFlightJdbcBaseIntVectorAccessor((IntVector) vector, getCurrentRow,
-            noOpWasNullConsumer);
-        } else if (vector instanceof BigIntVector) {
-          return new ArrowFlightJdbcBaseIntVectorAccessor((BigIntVector) vector, getCurrentRow,
-            noOpWasNullConsumer);
-        }
-        return null;
-      };
+      accessorSupplier =
+          (vector, getCurrentRow) -> {
+            ArrowFlightJdbcAccessorFactory.WasNullConsumer noOpWasNullConsumer =
+                (boolean wasNull) -> {};
+            if (vector instanceof UInt1Vector) {
+              return new ArrowFlightJdbcBaseIntVectorAccessor(
+                  (UInt1Vector) vector, getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof UInt2Vector) {
+              return new ArrowFlightJdbcBaseIntVectorAccessor(
+                  (UInt2Vector) vector, getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof UInt4Vector) {
+              return new ArrowFlightJdbcBaseIntVectorAccessor(
+                  (UInt4Vector) vector, getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof UInt8Vector) {
+              return new ArrowFlightJdbcBaseIntVectorAccessor(
+                  (UInt8Vector) vector, getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof TinyIntVector) {
+              return new ArrowFlightJdbcBaseIntVectorAccessor(
+                  (TinyIntVector) vector, getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof SmallIntVector) {
+              return new ArrowFlightJdbcBaseIntVectorAccessor(
+                  (SmallIntVector) vector, getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof IntVector) {
+              return new ArrowFlightJdbcBaseIntVectorAccessor(
+                  (IntVector) vector, getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof BigIntVector) {
+              return new ArrowFlightJdbcBaseIntVectorAccessor(
+                  (BigIntVector) vector, getCurrentRow, noOpWasNullConsumer);
+            }
+            return null;
+          };
 
   private final AccessorTestUtils.AccessorIterator<ArrowFlightJdbcBaseIntVectorAccessor>
-      accessorIterator = new AccessorTestUtils.AccessorIterator<>(collector, accessorSupplier);
+      accessorIterator = new AccessorTestUtils.AccessorIterator<>(accessorSupplier);
 
-  @BeforeClass
+  @BeforeAll
   public static void setup() {
-    int4Vector = new UInt4Vector("ID", rule.getRootAllocator());
+    int4Vector = new UInt4Vector("ID", rootAllocatorTestExtension.getRootAllocator());
     int4Vector.setSafe(0, 0x80000001);
     int4Vector.setValueCount(1);
 
-    int8Vector = new UInt8Vector("ID", rule.getRootAllocator());
+    int8Vector = new UInt8Vector("ID", rootAllocatorTestExtension.getRootAllocator());
     int8Vector.setSafe(0, 0xFFFFFFFFFFFFFFFFL);
     int8Vector.setValueCount(1);
 
-    intVectorWithNull = new IntVector("ID", rule.getRootAllocator());
+    intVectorWithNull = new IntVector("ID", rootAllocatorTestExtension.getRootAllocator());
     intVectorWithNull.setNull(0);
     intVectorWithNull.setValueCount(1);
 
-    tinyIntVector = new TinyIntVector("ID", rule.getRootAllocator());
+    tinyIntVector = new TinyIntVector("ID", rootAllocatorTestExtension.getRootAllocator());
     tinyIntVector.setSafe(0, 0xAA);
     tinyIntVector.setValueCount(1);
 
-    smallIntVector = new SmallIntVector("ID", rule.getRootAllocator());
+    smallIntVector = new SmallIntVector("ID", rootAllocatorTestExtension.getRootAllocator());
     smallIntVector.setSafe(0, 0xAABB);
     smallIntVector.setValueCount(1);
 
-    intVector = new IntVector("ID", rule.getRootAllocator());
+    intVector = new IntVector("ID", rootAllocatorTestExtension.getRootAllocator());
     intVector.setSafe(0, 0xAABBCCDD);
     intVector.setValueCount(1);
 
-    bigIntVector = new BigIntVector("ID", rule.getRootAllocator());
+    bigIntVector = new BigIntVector("ID", rootAllocatorTestExtension.getRootAllocator());
     bigIntVector.setSafe(0, 0xAABBCCDDEEFFAABBL);
     bigIntVector.setValueCount(1);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() throws Exception {
-    AutoCloseables.close(bigIntVector, intVector, smallIntVector, tinyIntVector, int4Vector,
-        int8Vector, intVectorWithNull, rule);
+    AutoCloseables.close(
+        bigIntVector,
+        intVector,
+        smallIntVector,
+        tinyIntVector,
+        int4Vector,
+        int8Vector,
+        intVectorWithNull,
+        rootAllocatorTestExtension);
   }
 
   @Test
   public void testShouldGetStringFromUnsignedValue() throws Exception {
-    accessorIterator.assertAccessorGetter(int8Vector,
-        ArrowFlightJdbcBaseIntVectorAccessor::getString, equalTo("18446744073709551615"));
+    accessorIterator.assertAccessorGetter(
+        int8Vector,
+        ArrowFlightJdbcBaseIntVectorAccessor::getString,
+        equalTo("18446744073709551615"));
   }
 
   @Test
   public void testShouldGetBytesFromIntVectorThrowsSqlException() throws Exception {
-    accessorIterator.assertAccessorGetterThrowingException(intVector, ArrowFlightJdbcBaseIntVectorAccessor::getBytes);
+    accessorIterator.assertAccessorGetterThrowingException(
+        intVector, ArrowFlightJdbcBaseIntVectorAccessor::getBytes);
   }
 
   @Test
   public void testShouldGetStringFromIntVectorWithNull() throws Exception {
-    accessorIterator.assertAccessorGetter(intVectorWithNull,
-        ArrowFlightJdbcBaseIntVectorAccessor::getString, CoreMatchers.nullValue());
+    accessorIterator.assertAccessorGetter(
+        intVectorWithNull,
+        ArrowFlightJdbcBaseIntVectorAccessor::getString,
+        CoreMatchers.nullValue());
   }
 
   @Test
   public void testShouldGetObjectFromInt() throws Exception {
-    accessorIterator.assertAccessorGetter(intVector,
-        ArrowFlightJdbcBaseIntVectorAccessor::getObject, equalTo(0xAABBCCDD));
+    accessorIterator.assertAccessorGetter(
+        intVector, ArrowFlightJdbcBaseIntVectorAccessor::getObject, equalTo(0xAABBCCDD));
   }
 
   @Test
   public void testShouldGetObjectFromTinyInt() throws Exception {
-    accessorIterator.assertAccessorGetter(tinyIntVector,
-        ArrowFlightJdbcBaseIntVectorAccessor::getObject, equalTo((byte) 0xAA));
+    accessorIterator.assertAccessorGetter(
+        tinyIntVector, ArrowFlightJdbcBaseIntVectorAccessor::getObject, equalTo((byte) 0xAA));
   }
 
   @Test
   public void testShouldGetObjectFromSmallInt() throws Exception {
-    accessorIterator.assertAccessorGetter(smallIntVector,
-        ArrowFlightJdbcBaseIntVectorAccessor::getObject, equalTo((short) 0xAABB));
+    accessorIterator.assertAccessorGetter(
+        smallIntVector, ArrowFlightJdbcBaseIntVectorAccessor::getObject, equalTo((short) 0xAABB));
   }
 
   @Test
   public void testShouldGetObjectFromBigInt() throws Exception {
-    accessorIterator.assertAccessorGetter(bigIntVector,
-        ArrowFlightJdbcBaseIntVectorAccessor::getObject, equalTo(0xAABBCCDDEEFFAABBL));
+    accessorIterator.assertAccessorGetter(
+        bigIntVector,
+        ArrowFlightJdbcBaseIntVectorAccessor::getObject,
+        equalTo(0xAABBCCDDEEFFAABBL));
   }
 
   @Test
   public void testShouldGetObjectFromUnsignedInt() throws Exception {
-    accessorIterator.assertAccessorGetter(int4Vector,
-        ArrowFlightJdbcBaseIntVectorAccessor::getObject, equalTo(0x80000001));
+    accessorIterator.assertAccessorGetter(
+        int4Vector, ArrowFlightJdbcBaseIntVectorAccessor::getObject, equalTo(0x80000001));
   }
 
   @Test
   public void testShouldGetObjectFromIntVectorWithNull() throws Exception {
-    accessorIterator.assertAccessorGetter(intVectorWithNull,
-        ArrowFlightJdbcBaseIntVectorAccessor::getObject, CoreMatchers.nullValue());
+    accessorIterator.assertAccessorGetter(
+        intVectorWithNull,
+        ArrowFlightJdbcBaseIntVectorAccessor::getObject,
+        CoreMatchers.nullValue());
   }
 
   @Test
   public void testShouldGetBigDecimalFromIntVectorWithNull() throws Exception {
-    accessorIterator.assertAccessorGetter(intVectorWithNull,
-        ArrowFlightJdbcBaseIntVectorAccessor::getBigDecimal, CoreMatchers.nullValue());
+    accessorIterator.assertAccessorGetter(
+        intVectorWithNull,
+        ArrowFlightJdbcBaseIntVectorAccessor::getBigDecimal,
+        CoreMatchers.nullValue());
   }
 
   @Test
   public void testShouldGetBigDecimalWithScaleFromIntVectorWithNull() throws Exception {
-    accessorIterator.assertAccessorGetter(intVectorWithNull, accessor -> accessor.getBigDecimal(2),
-        CoreMatchers.nullValue());
+    accessorIterator.assertAccessorGetter(
+        intVectorWithNull, accessor -> accessor.getBigDecimal(2), CoreMatchers.nullValue());
   }
 
   @Test
   public void testShouldGetBytesFromSmallVectorThrowsSqlException() throws Exception {
-    accessorIterator.assertAccessorGetterThrowingException(smallIntVector,
-        ArrowFlightJdbcBaseIntVectorAccessor::getBytes);
+    accessorIterator.assertAccessorGetterThrowingException(
+        smallIntVector, ArrowFlightJdbcBaseIntVectorAccessor::getBytes);
   }
 
   @Test
   public void testShouldGetBytesFromTinyIntVectorThrowsSqlException() throws Exception {
-    accessorIterator.assertAccessorGetterThrowingException(tinyIntVector,
-        ArrowFlightJdbcBaseIntVectorAccessor::getBytes);
+    accessorIterator.assertAccessorGetterThrowingException(
+        tinyIntVector, ArrowFlightJdbcBaseIntVectorAccessor::getBytes);
   }
 
   @Test
   public void testShouldGetBytesFromBigIntVectorThrowsSqlException() throws Exception {
-    accessorIterator.assertAccessorGetterThrowingException(bigIntVector,
-        ArrowFlightJdbcBaseIntVectorAccessor::getBytes);
+    accessorIterator.assertAccessorGetterThrowingException(
+        bigIntVector, ArrowFlightJdbcBaseIntVectorAccessor::getBytes);
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBitVectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBitVectorAccessorTest.java
index 00537bfa028e9..20c086b26dbdc 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBitVectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcBitVectorAccessorTest.java
@@ -14,62 +14,62 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.numeric;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 
 import java.math.BigDecimal;
-
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils;
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils.AccessorIterator;
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils.CheckedFunction;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.BitVector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class ArrowFlightJdbcBitVectorAccessorTest {
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
 
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
+
   private final AccessorTestUtils.AccessorSupplier<ArrowFlightJdbcBitVectorAccessor>
-      accessorSupplier = (vector, getCurrentRow) -> new ArrowFlightJdbcBitVectorAccessor((BitVector) vector,
-          getCurrentRow, (boolean wasNull) -> {
-      });
-  private final AccessorIterator<ArrowFlightJdbcBitVectorAccessor>
-      accessorIterator =
-      new AccessorIterator<>(collector, accessorSupplier);
+      accessorSupplier =
+          (vector, getCurrentRow) ->
+              new ArrowFlightJdbcBitVectorAccessor(
+                  (BitVector) vector, getCurrentRow, (boolean wasNull) -> {});
+  private final AccessorIterator<ArrowFlightJdbcBitVectorAccessor> accessorIterator =
+      new AccessorIterator<>(accessorSupplier);
   private BitVector vector;
   private BitVector vectorWithNull;
   private boolean[] arrayToAssert;
 
-  @Before
+  @BeforeEach
   public void setup() {
     this.arrayToAssert = new boolean[] {false, true};
-    this.vector = rootAllocatorTestRule.createBitVector();
-    this.vectorWithNull = rootAllocatorTestRule.createBitVectorForNullTests();
+    this.vector = rootAllocatorTestExtension.createBitVector();
+    this.vectorWithNull = rootAllocatorTestExtension.createBitVectorForNullTests();
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     this.vector.close();
     this.vectorWithNull.close();
   }
 
-  private <T> void iterate(final CheckedFunction<ArrowFlightJdbcBitVectorAccessor, T> function,
-                           final T result,
-                           final T resultIfFalse, final BitVector vector) throws Exception {
-    accessorIterator.assertAccessorGetter(vector, function,
-        (accessor, currentRow) -> is(arrayToAssert[currentRow] ? result : resultIfFalse)
-    );
+  private <T> void iterate(
+      final CheckedFunction<ArrowFlightJdbcBitVectorAccessor, T> function,
+      final T result,
+      final T resultIfFalse,
+      final BitVector vector)
+      throws Exception {
+    accessorIterator.assertAccessorGetter(
+        vector,
+        function,
+        (accessor, currentRow) -> is(arrayToAssert[currentRow] ? result : resultIfFalse));
   }
 
   @Test
@@ -90,66 +90,57 @@ public void testShouldGetShortMethodFromBitVector() throws Exception {
   @Test
   public void testShouldGetIntMethodFromBitVector() throws Exception {
     iterate(ArrowFlightJdbcBitVectorAccessor::getInt, 1, 0, vector);
-
   }
 
   @Test
   public void testShouldGetLongMethodFromBitVector() throws Exception {
     iterate(ArrowFlightJdbcBitVectorAccessor::getLong, (long) 1, (long) 0, vector);
-
   }
 
   @Test
   public void testShouldGetFloatMethodFromBitVector() throws Exception {
     iterate(ArrowFlightJdbcBitVectorAccessor::getFloat, (float) 1, (float) 0, vector);
-
   }
 
   @Test
   public void testShouldGetDoubleMethodFromBitVector() throws Exception {
     iterate(ArrowFlightJdbcBitVectorAccessor::getDouble, (double) 1, (double) 0, vector);
-
   }
 
   @Test
   public void testShouldGetBigDecimalMethodFromBitVector() throws Exception {
-    iterate(ArrowFlightJdbcBitVectorAccessor::getBigDecimal, BigDecimal.ONE, BigDecimal.ZERO,
-        vector);
+    iterate(
+        ArrowFlightJdbcBitVectorAccessor::getBigDecimal, BigDecimal.ONE, BigDecimal.ZERO, vector);
   }
 
   @Test
   public void testShouldGetBigDecimalMethodFromBitVectorFromNull() throws Exception {
     iterate(ArrowFlightJdbcBitVectorAccessor::getBigDecimal, null, null, vectorWithNull);
-
   }
 
   @Test
   public void testShouldGetObjectMethodFromBitVector() throws Exception {
     iterate(ArrowFlightJdbcBitVectorAccessor::getObject, true, false, vector);
-
   }
 
   @Test
   public void testShouldGetObjectMethodFromBitVectorFromNull() throws Exception {
     iterate(ArrowFlightJdbcBitVectorAccessor::getObject, null, null, vectorWithNull);
-
   }
 
   @Test
   public void testShouldGetStringMethodFromBitVector() throws Exception {
     iterate(ArrowFlightJdbcBitVectorAccessor::getString, "true", "false", vector);
-
   }
 
   @Test
   public void testShouldGetStringMethodFromBitVectorFromNull() throws Exception {
     iterate(ArrowFlightJdbcBitVectorAccessor::getString, null, null, vectorWithNull);
-
   }
 
   @Test
   public void testShouldGetObjectClass() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcBitVectorAccessor::getObjectClass,
-        equalTo(Boolean.class));
+    accessorIterator.assertAccessorGetter(
+        vector, ArrowFlightJdbcBitVectorAccessor::getObjectClass, equalTo(Boolean.class));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcDecimalVectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcDecimalVectorAccessorTest.java
index b7bd7c40fef20..668c50a843386 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcDecimalVectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcDecimalVectorAccessorTest.java
@@ -14,81 +14,65 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.numeric;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 
 import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.function.Supplier;
-
+import java.util.stream.Stream;
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessorFactory;
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.Decimal256Vector;
 import org.apache.arrow.vector.DecimalVector;
 import org.apache.arrow.vector.ValueVector;
 import org.hamcrest.CoreMatchers;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class ArrowFlightJdbcDecimalVectorAccessorTest {
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
+public class ArrowFlightJdbcDecimalVectorAccessorTest {
 
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
-  private final Supplier<ValueVector> vectorSupplier;
   private ValueVector vector;
   private ValueVector vectorWithNull;
 
   private final AccessorTestUtils.AccessorSupplier<ArrowFlightJdbcDecimalVectorAccessor>
-      accessorSupplier = (vector, getCurrentRow) -> {
-        ArrowFlightJdbcAccessorFactory.WasNullConsumer noOpWasNullConsumer = (boolean wasNull) -> {
-        };
-        if (vector instanceof DecimalVector) {
-          return new ArrowFlightJdbcDecimalVectorAccessor((DecimalVector) vector, getCurrentRow,
-              noOpWasNullConsumer);
-        } else if (vector instanceof Decimal256Vector) {
-          return new ArrowFlightJdbcDecimalVectorAccessor((Decimal256Vector) vector, getCurrentRow,
-              noOpWasNullConsumer);
-        }
-        return null;
-      };
+      accessorSupplier =
+          (vector, getCurrentRow) -> {
+            ArrowFlightJdbcAccessorFactory.WasNullConsumer noOpWasNullConsumer =
+                (boolean wasNull) -> {};
+            if (vector instanceof DecimalVector) {
+              return new ArrowFlightJdbcDecimalVectorAccessor(
+                  (DecimalVector) vector, getCurrentRow, noOpWasNullConsumer);
+            } else if (vector instanceof Decimal256Vector) {
+              return new ArrowFlightJdbcDecimalVectorAccessor(
+                  (Decimal256Vector) vector, getCurrentRow, noOpWasNullConsumer);
+            }
+            return null;
+          };
 
   private final AccessorTestUtils.AccessorIterator<ArrowFlightJdbcDecimalVectorAccessor>
-      accessorIterator =
-      new AccessorTestUtils.AccessorIterator<>(collector, accessorSupplier);
-
-  @Parameterized.Parameters(name = "{1}")
-  public static Collection<Object[]> data() {
-    return Arrays.asList(new Object[][] {
-        {(Supplier<ValueVector>) () -> rootAllocatorTestRule.createDecimalVector(),
-            "DecimalVector"},
-        {(Supplier<ValueVector>) () -> rootAllocatorTestRule.createDecimal256Vector(),
-            "Decimal256Vector"},
-    });
-  }
-
-  public ArrowFlightJdbcDecimalVectorAccessorTest(Supplier<ValueVector> vectorSupplier,
-                                                  String vectorType) {
-    this.vectorSupplier = vectorSupplier;
+      accessorIterator = new AccessorTestUtils.AccessorIterator<>(accessorSupplier);
+
+  public static Stream<Arguments> data() {
+    return Stream.of(
+        Arguments.of(
+            (Supplier<ValueVector>) () -> rootAllocatorTestExtension.createDecimalVector(),
+            "DecimalVector"),
+        Arguments.of(
+            (Supplier<ValueVector>) () -> rootAllocatorTestExtension.createDecimal256Vector(),
+            "Decimal256Vector"));
   }
 
-  @Before
-  public void setup() {
+  public void setup(Supplier<ValueVector> vectorSupplier) {
     this.vector = vectorSupplier.get();
 
     this.vectorWithNull = vectorSupplier.get();
@@ -96,153 +80,250 @@ public void setup() {
     this.vectorWithNull.setValueCount(5);
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     this.vector.close();
     this.vectorWithNull.close();
   }
 
-  @Test
-  public void testShouldGetBigDecimalFromDecimalVector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetBigDecimalFromDecimalVector(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
         ArrowFlightJdbcDecimalVectorAccessor::getBigDecimal,
         (accessor, currentRow) -> CoreMatchers.notNullValue());
   }
 
-  @Test
-  public void testShouldGetDoubleMethodFromDecimalVector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcDecimalVectorAccessor::getDouble,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetDoubleMethodFromDecimalVector(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcDecimalVectorAccessor::getDouble,
         (accessor, currentRow) -> equalTo(accessor.getBigDecimal().doubleValue()));
   }
 
-  @Test
-  public void testShouldGetFloatMethodFromDecimalVector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcDecimalVectorAccessor::getFloat,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetFloatMethodFromDecimalVector(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcDecimalVectorAccessor::getFloat,
         (accessor, currentRow) -> equalTo(accessor.getBigDecimal().floatValue()));
   }
 
-  @Test
-  public void testShouldGetLongMethodFromDecimalVector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcDecimalVectorAccessor::getLong,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetLongMethodFromDecimalVector(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcDecimalVectorAccessor::getLong,
         (accessor, currentRow) -> equalTo(accessor.getBigDecimal().longValue()));
   }
 
-  @Test
-  public void testShouldGetIntMethodFromDecimalVector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcDecimalVectorAccessor::getInt,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetIntMethodFromDecimalVector(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcDecimalVectorAccessor::getInt,
         (accessor, currentRow) -> equalTo(accessor.getBigDecimal().intValue()));
   }
 
-  @Test
-  public void testShouldGetShortMethodFromDecimalVector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcDecimalVectorAccessor::getShort,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetShortMethodFromDecimalVector(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcDecimalVectorAccessor::getShort,
         (accessor, currentRow) -> equalTo(accessor.getBigDecimal().shortValue()));
   }
 
-  @Test
-  public void testShouldGetByteMethodFromDecimalVector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcDecimalVectorAccessor::getByte,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetByteMethodFromDecimalVector(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcDecimalVectorAccessor::getByte,
         (accessor, currentRow) -> equalTo(accessor.getBigDecimal().byteValue()));
   }
 
-  @Test
-  public void testShouldGetStringMethodFromDecimalVector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcDecimalVectorAccessor::getString,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetStringMethodFromDecimalVector(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcDecimalVectorAccessor::getString,
         (accessor, currentRow) -> equalTo(accessor.getBigDecimal().toString()));
   }
 
-  @Test
-  public void testShouldGetBooleanMethodFromDecimalVector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcDecimalVectorAccessor::getBoolean,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetBooleanMethodFromDecimalVector(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcDecimalVectorAccessor::getBoolean,
         (accessor, currentRow) -> equalTo(!accessor.getBigDecimal().equals(BigDecimal.ZERO)));
   }
 
-  @Test
-  public void testShouldGetObjectMethodFromDecimalVector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcDecimalVectorAccessor::getObject,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetObjectMethodFromDecimalVector(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcDecimalVectorAccessor::getObject,
         (accessor, currentRow) -> equalTo(accessor.getBigDecimal()));
   }
 
-  @Test
-  public void testShouldGetObjectClass() throws Exception {
-    accessorIterator.assertAccessorGetter(vector,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetObjectClass(Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vector,
         ArrowFlightJdbcDecimalVectorAccessor::getObjectClass,
         (accessor, currentRow) -> equalTo(BigDecimal.class));
   }
 
-  @Test
-  public void testShouldGetBigDecimalMethodFromDecimalVectorWithNull() throws Exception {
-    accessorIterator.assertAccessorGetter(vectorWithNull,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetBigDecimalMethodFromDecimalVectorWithNull(
+      Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vectorWithNull,
         ArrowFlightJdbcDecimalVectorAccessor::getBigDecimal,
         (accessor, currentRow) -> CoreMatchers.nullValue());
   }
 
-  @Test
-  public void testShouldGetObjectMethodFromDecimalVectorWithNull() throws Exception {
-    accessorIterator.assertAccessorGetter(vectorWithNull,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetObjectMethodFromDecimalVectorWithNull(
+      Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vectorWithNull,
         ArrowFlightJdbcDecimalVectorAccessor::getObject,
         (accessor, currentRow) -> CoreMatchers.nullValue());
   }
 
-  @Test
-  public void testShouldGetStringMethodFromDecimalVectorWithNull() throws Exception {
-    accessorIterator.assertAccessorGetter(vectorWithNull,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetStringMethodFromDecimalVectorWithNull(
+      Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vectorWithNull,
         ArrowFlightJdbcDecimalVectorAccessor::getString,
         (accessor, currentRow) -> CoreMatchers.nullValue());
   }
 
-  @Test
-  public void testShouldGetByteMethodFromDecimalVectorWithNull() throws Exception {
-    accessorIterator.assertAccessorGetter(vectorWithNull,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetByteMethodFromDecimalVectorWithNull(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vectorWithNull,
         ArrowFlightJdbcDecimalVectorAccessor::getByte,
         (accessor, currentRow) -> is((byte) 0));
   }
 
-  @Test
-  public void testShouldGetShortMethodFromDecimalVectorWithNull() throws Exception {
-    accessorIterator.assertAccessorGetter(vectorWithNull,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetShortMethodFromDecimalVectorWithNull(
+      Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vectorWithNull,
         ArrowFlightJdbcDecimalVectorAccessor::getShort,
         (accessor, currentRow) -> is((short) 0));
   }
 
-  @Test
-  public void testShouldGetIntMethodFromDecimalVectorWithNull() throws Exception {
-    accessorIterator.assertAccessorGetter(vectorWithNull,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetIntMethodFromDecimalVectorWithNull(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vectorWithNull,
         ArrowFlightJdbcDecimalVectorAccessor::getInt,
         (accessor, currentRow) -> is(0));
   }
 
-  @Test
-  public void testShouldGetLongMethodFromDecimalVectorWithNull() throws Exception {
-    accessorIterator.assertAccessorGetter(vectorWithNull,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetLongMethodFromDecimalVectorWithNull(Supplier<ValueVector> vectorSupplier)
+      throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vectorWithNull,
         ArrowFlightJdbcDecimalVectorAccessor::getLong,
         (accessor, currentRow) -> is((long) 0));
   }
 
-  @Test
-  public void testShouldGetFloatMethodFromDecimalVectorWithNull() throws Exception {
-    accessorIterator.assertAccessorGetter(vectorWithNull,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetFloatMethodFromDecimalVectorWithNull(
+      Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vectorWithNull,
         ArrowFlightJdbcDecimalVectorAccessor::getFloat,
         (accessor, currentRow) -> is(0.0f));
   }
 
-  @Test
-  public void testShouldGetDoubleMethodFromDecimalVectorWithNull() throws Exception {
-    accessorIterator.assertAccessorGetter(vectorWithNull,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetDoubleMethodFromDecimalVectorWithNull(
+      Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vectorWithNull,
         ArrowFlightJdbcDecimalVectorAccessor::getDouble,
         (accessor, currentRow) -> is(0.0D));
   }
 
-  @Test
-  public void testShouldGetBooleanMethodFromDecimalVectorWithNull() throws Exception {
-    accessorIterator.assertAccessorGetter(vectorWithNull,
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetBooleanMethodFromDecimalVectorWithNull(
+      Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vectorWithNull,
         ArrowFlightJdbcDecimalVectorAccessor::getBoolean,
         (accessor, currentRow) -> is(false));
   }
 
-  @Test
-  public void testShouldGetBigDecimalWithScaleMethodFromDecimalVectorWithNull() throws Exception {
-    accessorIterator.assertAccessorGetter(vectorWithNull, accessor -> accessor.getBigDecimal(2),
+  @ParameterizedTest
+  @MethodSource("data")
+  public void testShouldGetBigDecimalWithScaleMethodFromDecimalVectorWithNull(
+      Supplier<ValueVector> vectorSupplier) throws Exception {
+    setup(vectorSupplier);
+    accessorIterator.assertAccessorGetter(
+        vectorWithNull,
+        accessor -> accessor.getBigDecimal(2),
         (accessor, currentRow) -> CoreMatchers.nullValue());
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcFloat4VectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcFloat4VectorAccessorTest.java
index 74a65715ec0fb..89ebc5336dae3 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcFloat4VectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcFloat4VectorAccessorTest.java
@@ -14,112 +14,109 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.numeric;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.SQLException;
-
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.Float4Vector;
 import org.hamcrest.CoreMatchers;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class ArrowFlightJdbcFloat4VectorAccessorTest {
 
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
-
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
-
-  @Rule
-  public ExpectedException exceptionCollector = ExpectedException.none();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
   private Float4Vector vector;
 
   private final AccessorTestUtils.AccessorSupplier<ArrowFlightJdbcFloat4VectorAccessor>
       accessorSupplier =
-          (vector, getCurrentRow) -> new ArrowFlightJdbcFloat4VectorAccessor((Float4Vector) vector,
-              getCurrentRow, (boolean wasNull) -> {
-          });
+          (vector, getCurrentRow) ->
+              new ArrowFlightJdbcFloat4VectorAccessor(
+                  (Float4Vector) vector, getCurrentRow, (boolean wasNull) -> {});
 
   private final AccessorTestUtils.AccessorIterator<ArrowFlightJdbcFloat4VectorAccessor>
-      accessorIterator =
-      new AccessorTestUtils.AccessorIterator<>(collector, accessorSupplier);
+      accessorIterator = new AccessorTestUtils.AccessorIterator<>(accessorSupplier);
 
-  @Before
+  @BeforeEach
   public void setup() {
-    this.vector = rootAllocatorTestRule.createFloat4Vector();
+    this.vector = rootAllocatorTestExtension.createFloat4Vector();
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     this.vector.close();
   }
 
   @Test
   public void testShouldGetFloatMethodFromFloat4Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat4VectorAccessor::getFloat,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat4VectorAccessor::getFloat,
         (accessor, currentRow) -> is(vector.get(currentRow)));
   }
 
   @Test
   public void testShouldGetObjectMethodFromFloat4Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat4VectorAccessor::getObject,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat4VectorAccessor::getObject,
         (accessor) -> is(accessor.getFloat()));
   }
 
   @Test
   public void testShouldGetStringMethodFromFloat4Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat4VectorAccessor::getString,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat4VectorAccessor::getString,
         accessor -> is(Float.toString(accessor.getFloat())));
   }
 
   @Test
   public void testShouldGetStringMethodFromFloat4VectorWithNull() throws Exception {
-    try (final Float4Vector float4Vector = new Float4Vector("ID",
-        rootAllocatorTestRule.getRootAllocator())) {
+    try (final Float4Vector float4Vector =
+        new Float4Vector("ID", rootAllocatorTestExtension.getRootAllocator())) {
       float4Vector.setNull(0);
       float4Vector.setValueCount(1);
 
-      accessorIterator.assertAccessorGetter(float4Vector,
-          ArrowFlightJdbcFloat4VectorAccessor::getString,
-          CoreMatchers.nullValue());
+      accessorIterator.assertAccessorGetter(
+          float4Vector, ArrowFlightJdbcFloat4VectorAccessor::getString, CoreMatchers.nullValue());
     }
   }
 
   @Test
   public void testShouldGetFloatMethodFromFloat4VectorWithNull() throws Exception {
-    try (final Float4Vector float4Vector = new Float4Vector("ID",
-        rootAllocatorTestRule.getRootAllocator())) {
+    try (final Float4Vector float4Vector =
+        new Float4Vector("ID", rootAllocatorTestExtension.getRootAllocator())) {
       float4Vector.setNull(0);
       float4Vector.setValueCount(1);
 
-      accessorIterator.assertAccessorGetter(float4Vector,
-          ArrowFlightJdbcFloat4VectorAccessor::getFloat, is(0.0f));
+      accessorIterator.assertAccessorGetter(
+          float4Vector, ArrowFlightJdbcFloat4VectorAccessor::getFloat, is(0.0f));
     }
   }
 
   @Test
   public void testShouldGetBigDecimalMethodFromFloat4VectorWithNull() throws Exception {
-    try (final Float4Vector float4Vector = new Float4Vector("ID",
-        rootAllocatorTestRule.getRootAllocator())) {
+    try (final Float4Vector float4Vector =
+        new Float4Vector("ID", rootAllocatorTestExtension.getRootAllocator())) {
       float4Vector.setNull(0);
       float4Vector.setValueCount(1);
 
-      accessorIterator.assertAccessorGetter(float4Vector,
+      accessorIterator.assertAccessorGetter(
+          float4Vector,
           ArrowFlightJdbcFloat4VectorAccessor::getBigDecimal,
           CoreMatchers.nullValue());
     }
@@ -127,79 +124,98 @@ public void testShouldGetBigDecimalMethodFromFloat4VectorWithNull() throws Excep
 
   @Test
   public void testShouldGetObjectMethodFromFloat4VectorWithNull() throws Exception {
-    try (final Float4Vector float4Vector = new Float4Vector("ID",
-        rootAllocatorTestRule.getRootAllocator())) {
+    try (final Float4Vector float4Vector =
+        new Float4Vector("ID", rootAllocatorTestExtension.getRootAllocator())) {
       float4Vector.setNull(0);
       float4Vector.setValueCount(1);
 
-      accessorIterator.assertAccessorGetter(float4Vector,
-          ArrowFlightJdbcFloat4VectorAccessor::getObject,
-          CoreMatchers.nullValue());
+      accessorIterator.assertAccessorGetter(
+          float4Vector, ArrowFlightJdbcFloat4VectorAccessor::getObject, CoreMatchers.nullValue());
     }
   }
 
   @Test
   public void testShouldGetBooleanMethodFromFloat4Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat4VectorAccessor::getBoolean,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat4VectorAccessor::getBoolean,
         accessor -> is(accessor.getFloat() != 0.0f));
   }
 
   @Test
   public void testShouldGetByteMethodFromFloat4Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat4VectorAccessor::getByte,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat4VectorAccessor::getByte,
         accessor -> is((byte) accessor.getFloat()));
   }
 
   @Test
   public void testShouldGetShortMethodFromFloat4Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat4VectorAccessor::getShort,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat4VectorAccessor::getShort,
         accessor -> is((short) accessor.getFloat()));
   }
 
   @Test
   public void testShouldGetIntMethodFromFloat4Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat4VectorAccessor::getInt,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat4VectorAccessor::getInt,
         accessor -> is((int) accessor.getFloat()));
   }
 
   @Test
   public void testShouldGetLongMethodFromFloat4Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat4VectorAccessor::getLong,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat4VectorAccessor::getLong,
         accessor -> is((long) accessor.getFloat()));
   }
 
   @Test
   public void testShouldGetDoubleMethodFromFloat4Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat4VectorAccessor::getDouble,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat4VectorAccessor::getDouble,
         accessor -> is((double) accessor.getFloat()));
   }
 
   @Test
   public void testShouldGetBigDecimalMethodFromFloat4Vector() throws Exception {
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      float value = accessor.getFloat();
-      if (Float.isInfinite(value) || Float.isNaN(value)) {
-        exceptionCollector.expect(SQLException.class);
-      }
-      collector.checkThat(accessor.getBigDecimal(), is(BigDecimal.valueOf(value)));
-    });
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          float value = accessor.getFloat();
+          if (Float.isInfinite(value) || Float.isNaN(value)) {
+            assertThrows(SQLException.class, accessor::getBigDecimal);
+          } else {
+            assertThat(accessor.getBigDecimal(), is(BigDecimal.valueOf(value)));
+          }
+        });
   }
 
   @Test
   public void testShouldGetBigDecimalWithScaleMethodFromFloat4Vector() throws Exception {
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      float value = accessor.getFloat();
-      if (Float.isInfinite(value) || Float.isNaN(value)) {
-        exceptionCollector.expect(SQLException.class);
-      }
-      collector.checkThat(accessor.getBigDecimal(9),
-          is(BigDecimal.valueOf(value).setScale(9, RoundingMode.HALF_UP)));
-    });
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          float value = accessor.getFloat();
+          if (Float.isInfinite(value) || Float.isNaN(value)) {
+            assertThrows(SQLException.class, () -> accessor.getBigDecimal(9));
+          } else {
+            assertThat(
+                accessor.getBigDecimal(9),
+                is(BigDecimal.valueOf(value).setScale(9, RoundingMode.HALF_UP)));
+          }
+        });
   }
 
   @Test
   public void testShouldGetObjectClass() throws Exception {
-    accessorIterator.assertAccessorGetter(vector,
+    accessorIterator.assertAccessorGetter(
+        vector,
         ArrowFlightJdbcFloat4VectorAccessor::getObjectClass,
         accessor -> equalTo(Float.class));
   }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcFloat8VectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcFloat8VectorAccessorTest.java
index 26758287a96f3..90870e95384ad 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcFloat8VectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/numeric/ArrowFlightJdbcFloat8VectorAccessorTest.java
@@ -14,60 +14,50 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.numeric;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.SQLException;
-
 import org.apache.arrow.driver.jdbc.utils.AccessorTestUtils;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.vector.Float8Vector;
 import org.hamcrest.CoreMatchers;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class ArrowFlightJdbcFloat8VectorAccessorTest {
 
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
-
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
-
-  @Rule
-  public ExpectedException exceptionCollector = ExpectedException.none();
-
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
   private Float8Vector vector;
   private Float8Vector vectorWithNull;
 
   private final AccessorTestUtils.AccessorSupplier<ArrowFlightJdbcFloat8VectorAccessor>
       accessorSupplier =
-          (vector, getCurrentRow) -> new ArrowFlightJdbcFloat8VectorAccessor((Float8Vector) vector,
-              getCurrentRow, (boolean wasNull) -> {
-          });
+          (vector, getCurrentRow) ->
+              new ArrowFlightJdbcFloat8VectorAccessor(
+                  (Float8Vector) vector, getCurrentRow, (boolean wasNull) -> {});
 
   private final AccessorTestUtils.AccessorIterator<ArrowFlightJdbcFloat8VectorAccessor>
-      accessorIterator =
-      new AccessorTestUtils.AccessorIterator<>(collector, accessorSupplier);
+      accessorIterator = new AccessorTestUtils.AccessorIterator<>(accessorSupplier);
 
-  @Before
+  @BeforeEach
   public void setup() {
-    this.vector = rootAllocatorTestRule.createFloat8Vector();
-    this.vectorWithNull = rootAllocatorTestRule.createFloat8VectorForNullTests();
+    this.vector = rootAllocatorTestExtension.createFloat8Vector();
+    this.vectorWithNull = rootAllocatorTestExtension.createFloat8VectorForNullTests();
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     this.vector.close();
     this.vectorWithNull.close();
@@ -75,113 +65,135 @@ public void tearDown() {
 
   @Test
   public void testShouldGetDoubleMethodFromFloat8Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat8VectorAccessor::getDouble,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat8VectorAccessor::getDouble,
         (accessor, currentRow) -> is(vector.getValueAsDouble(currentRow)));
   }
 
   @Test
   public void testShouldGetObjectMethodFromFloat8Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat8VectorAccessor::getObject,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat8VectorAccessor::getObject,
         (accessor) -> is(accessor.getDouble()));
   }
 
   @Test
   public void testShouldGetStringMethodFromFloat8Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat8VectorAccessor::getString,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat8VectorAccessor::getString,
         (accessor) -> is(Double.toString(accessor.getDouble())));
   }
 
   @Test
   public void testShouldGetBooleanMethodFromFloat8Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat8VectorAccessor::getBoolean,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat8VectorAccessor::getBoolean,
         (accessor) -> is(accessor.getDouble() != 0.0));
   }
 
   @Test
   public void testShouldGetByteMethodFromFloat8Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat8VectorAccessor::getByte,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat8VectorAccessor::getByte,
         (accessor) -> is((byte) accessor.getDouble()));
   }
 
   @Test
   public void testShouldGetShortMethodFromFloat8Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat8VectorAccessor::getShort,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat8VectorAccessor::getShort,
         (accessor) -> is((short) accessor.getDouble()));
   }
 
   @Test
   public void testShouldGetIntMethodFromFloat8Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat8VectorAccessor::getInt,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat8VectorAccessor::getInt,
         (accessor) -> is((int) accessor.getDouble()));
   }
 
   @Test
   public void testShouldGetLongMethodFromFloat8Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat8VectorAccessor::getLong,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat8VectorAccessor::getLong,
         (accessor) -> is((long) accessor.getDouble()));
   }
 
   @Test
   public void testShouldGetFloatMethodFromFloat8Vector() throws Exception {
-    accessorIterator.assertAccessorGetter(vector, ArrowFlightJdbcFloat8VectorAccessor::getFloat,
+    accessorIterator.assertAccessorGetter(
+        vector,
+        ArrowFlightJdbcFloat8VectorAccessor::getFloat,
         (accessor) -> is((float) accessor.getDouble()));
   }
 
   @Test
   public void testShouldGetBigDecimalMethodFromFloat8Vector() throws Exception {
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      double value = accessor.getDouble();
-      if (Double.isInfinite(value) || Double.isNaN(value)) {
-        exceptionCollector.expect(SQLException.class);
-      }
-      collector.checkThat(accessor.getBigDecimal(), is(BigDecimal.valueOf(value)));
-    });
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          double value = accessor.getDouble();
+          if (Double.isInfinite(value) || Double.isNaN(value)) {
+            assertThrows(SQLException.class, accessor::getBigDecimal);
+          } else {
+            assertThat(accessor.getBigDecimal(), is(BigDecimal.valueOf(value)));
+          }
+        });
   }
 
   @Test
   public void testShouldGetObjectClass() throws Exception {
-    accessorIterator
-        .assertAccessorGetter(vector, ArrowFlightJdbcFloat8VectorAccessor::getObjectClass,
-            equalTo(Double.class));
+    accessorIterator.assertAccessorGetter(
+        vector, ArrowFlightJdbcFloat8VectorAccessor::getObjectClass, equalTo(Double.class));
   }
 
   @Test
   public void testShouldGetStringMethodFromFloat8VectorWithNull() throws Exception {
-    accessorIterator
-        .assertAccessorGetter(vectorWithNull, ArrowFlightJdbcFloat8VectorAccessor::getString,
-            CoreMatchers.nullValue());
+    accessorIterator.assertAccessorGetter(
+        vectorWithNull, ArrowFlightJdbcFloat8VectorAccessor::getString, CoreMatchers.nullValue());
   }
 
   @Test
   public void testShouldGetFloatMethodFromFloat8VectorWithNull() throws Exception {
-    accessorIterator
-        .assertAccessorGetter(vectorWithNull, ArrowFlightJdbcFloat8VectorAccessor::getFloat,
-            is(0.0f));
+    accessorIterator.assertAccessorGetter(
+        vectorWithNull, ArrowFlightJdbcFloat8VectorAccessor::getFloat, is(0.0f));
   }
 
   @Test
   public void testShouldGetBigDecimalMethodFromFloat8VectorWithNull() throws Exception {
-    accessorIterator.assertAccessorGetter(vectorWithNull,
+    accessorIterator.assertAccessorGetter(
+        vectorWithNull,
         ArrowFlightJdbcFloat8VectorAccessor::getBigDecimal,
         CoreMatchers.nullValue());
   }
 
   @Test
   public void testShouldGetBigDecimalWithScaleMethodFromFloat4Vector() throws Exception {
-    accessorIterator.iterate(vector, (accessor, currentRow) -> {
-      double value = accessor.getDouble();
-      if (Double.isInfinite(value) || Double.isNaN(value)) {
-        exceptionCollector.expect(SQLException.class);
-      }
-      collector.checkThat(accessor.getBigDecimal(9),
-          is(BigDecimal.valueOf(value).setScale(9, RoundingMode.HALF_UP)));
-    });
+    accessorIterator.iterate(
+        vector,
+        (accessor, currentRow) -> {
+          double value = accessor.getDouble();
+          if (Double.isInfinite(value) || Double.isNaN(value)) {
+            assertThrows(SQLException.class, () -> accessor.getBigDecimal(9));
+          } else {
+            assertThat(
+                accessor.getBigDecimal(9),
+                is(BigDecimal.valueOf(value).setScale(9, RoundingMode.HALF_UP)));
+          }
+        });
   }
 
   @Test
   public void testShouldGetObjectMethodFromFloat8VectorWithNull() throws Exception {
-    accessorIterator
-        .assertAccessorGetter(vectorWithNull, ArrowFlightJdbcFloat8VectorAccessor::getObject,
-            CoreMatchers.nullValue());
+    accessorIterator.assertAccessorGetter(
+        vectorWithNull, ArrowFlightJdbcFloat8VectorAccessor::getObject, CoreMatchers.nullValue());
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/text/ArrowFlightJdbcVarCharVectorAccessorTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/text/ArrowFlightJdbcVarCharVectorAccessorTest.java
index 799c517dd561b..a2f6fd586fa5b 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/text/ArrowFlightJdbcVarCharVectorAccessorTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/accessor/impl/text/ArrowFlightJdbcVarCharVectorAccessorTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.accessor.impl.text;
 
 import static java.nio.charset.StandardCharsets.US_ASCII;
@@ -23,6 +22,9 @@
 import static org.apache.commons.io.IOUtils.toCharArray;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.when;
 
 import java.io.InputStream;
@@ -36,29 +38,23 @@
 import java.util.Calendar;
 import java.util.TimeZone;
 import java.util.function.IntSupplier;
-
 import org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcDateVectorAccessor;
 import org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcTimeStampVectorAccessor;
 import org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcTimeVectorAccessor;
-import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestRule;
+import org.apache.arrow.driver.jdbc.utils.RootAllocatorTestExtension;
 import org.apache.arrow.driver.jdbc.utils.ThrowableAssertionUtils;
 import org.apache.arrow.vector.DateMilliVector;
 import org.apache.arrow.vector.TimeMilliVector;
 import org.apache.arrow.vector.TimeStampVector;
 import org.apache.arrow.vector.util.Text;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ArrowFlightJdbcVarCharVectorAccessorTest {
 
   private ArrowFlightJdbcVarCharVectorAccessor accessor;
@@ -66,24 +62,18 @@ public class ArrowFlightJdbcVarCharVectorAccessorTest {
       new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
   private final SimpleDateFormat timeFormat = new SimpleDateFormat("HH:mm:ss.SSSXXX");
 
-  @ClassRule
-  public static RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
-
-  @Mock
-  private ArrowFlightJdbcVarCharVectorAccessor.Getter getter;
-
-  @Rule
-  public ErrorCollector collector = new ErrorCollector();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
 
-  @Rule
-  public ExpectedException thrown = ExpectedException.none();
+  @Mock private ArrowFlightJdbcVarCharVectorAccessor.Getter getter;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     IntSupplier currentRowSupplier = () -> 0;
     accessor =
-        new ArrowFlightJdbcVarCharVectorAccessor(getter, currentRowSupplier, (boolean wasNull) -> {
-        });
+        new ArrowFlightJdbcVarCharVectorAccessor(
+            getter, currentRowSupplier, (boolean wasNull) -> {});
   }
 
   @Test
@@ -91,7 +81,7 @@ public void testShouldGetStringFromNullReturnNull() {
     when(getter.get(0)).thenReturn(null);
     final String result = accessor.getString();
 
-    collector.checkThat(result, equalTo(null));
+    assertThat(result, equalTo(null));
   }
 
   @Test
@@ -101,8 +91,8 @@ public void testShouldGetStringReturnValidString() {
 
     final String result = accessor.getString();
 
-    collector.checkThat(result, instanceOf(String.class));
-    collector.checkThat(result, equalTo(value.toString()));
+    assertThat(result, instanceOf(String.class));
+    assertThat(result, equalTo(value.toString()));
   }
 
   @Test
@@ -112,35 +102,32 @@ public void testShouldGetObjectReturnValidString() {
 
     final String result = accessor.getObject();
 
-    collector.checkThat(result, instanceOf(String.class));
-    collector.checkThat(result, equalTo(value.toString()));
+    assertThat(result, instanceOf(String.class));
+    assertThat(result, equalTo(value.toString()));
   }
 
   @Test
-  public void testShouldGetByteThrowsExceptionForNonNumericValue() throws Exception {
+  public void testShouldGetByteThrowsExceptionForNonNumericValue() {
     Text value = new Text("Invalid value for byte.");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getByte();
+    assertThrows(SQLException.class, () -> accessor.getByte());
   }
 
   @Test
-  public void testShouldGetByteThrowsExceptionForOutOfRangePositiveValue() throws Exception {
+  public void testShouldGetByteThrowsExceptionForOutOfRangePositiveValue() {
     Text value = new Text("128");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getByte();
+    assertThrows(SQLException.class, () -> accessor.getByte());
   }
 
   @Test
-  public void testShouldGetByteThrowsExceptionForOutOfRangeNegativeValue() throws Exception {
+  public void testShouldGetByteThrowsExceptionForOutOfRangeNegativeValue() {
     Text value = new Text("-129");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getByte();
+    assertThrows(SQLException.class, () -> accessor.getByte());
   }
 
   @Test
@@ -150,8 +137,8 @@ public void testShouldGetByteReturnValidPositiveByte() throws Exception {
 
     byte result = accessor.getByte();
 
-    collector.checkThat(result, instanceOf(Byte.class));
-    collector.checkThat(result, equalTo((byte) 127));
+    assertThat(result, instanceOf(Byte.class));
+    assertThat(result, equalTo((byte) 127));
   }
 
   @Test
@@ -161,35 +148,32 @@ public void testShouldGetByteReturnValidNegativeByte() throws Exception {
 
     byte result = accessor.getByte();
 
-    collector.checkThat(result, instanceOf(Byte.class));
-    collector.checkThat(result, equalTo((byte) -128));
+    assertThat(result, instanceOf(Byte.class));
+    assertThat(result, equalTo((byte) -128));
   }
 
   @Test
-  public void testShouldGetShortThrowsExceptionForNonNumericValue() throws Exception {
+  public void testShouldGetShortThrowsExceptionForNonNumericValue() {
     Text value = new Text("Invalid value for short.");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getShort();
+    assertThrows(SQLException.class, () -> accessor.getShort());
   }
 
   @Test
-  public void testShouldGetShortThrowsExceptionForOutOfRangePositiveValue() throws Exception {
+  public void testShouldGetShortThrowsExceptionForOutOfRangePositiveValue() {
     Text value = new Text("32768");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getShort();
+    assertThrows(SQLException.class, () -> accessor.getShort());
   }
 
   @Test
-  public void testShouldGetShortThrowsExceptionForOutOfRangeNegativeValue() throws Exception {
+  public void testShouldGetShortThrowsExceptionForOutOfRangeNegativeValue() {
     Text value = new Text("-32769");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getShort();
+    assertThrows(SQLException.class, () -> accessor.getShort());
   }
 
   @Test
@@ -199,8 +183,8 @@ public void testShouldGetShortReturnValidPositiveShort() throws Exception {
 
     short result = accessor.getShort();
 
-    collector.checkThat(result, instanceOf(Short.class));
-    collector.checkThat(result, equalTo((short) 32767));
+    assertThat(result, instanceOf(Short.class));
+    assertThat(result, equalTo((short) 32767));
   }
 
   @Test
@@ -210,35 +194,32 @@ public void testShouldGetShortReturnValidNegativeShort() throws Exception {
 
     short result = accessor.getShort();
 
-    collector.checkThat(result, instanceOf(Short.class));
-    collector.checkThat(result, equalTo((short) -32768));
+    assertThat(result, instanceOf(Short.class));
+    assertThat(result, equalTo((short) -32768));
   }
 
   @Test
-  public void testShouldGetIntThrowsExceptionForNonNumericValue() throws Exception {
+  public void testShouldGetIntThrowsExceptionForNonNumericValue() {
     Text value = new Text("Invalid value for int.");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getInt();
+    assertThrows(SQLException.class, () -> accessor.getInt());
   }
 
   @Test
-  public void testShouldGetIntThrowsExceptionForOutOfRangePositiveValue() throws Exception {
+  public void testShouldGetIntThrowsExceptionForOutOfRangePositiveValue() {
     Text value = new Text("2147483648");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getInt();
+    assertThrows(SQLException.class, () -> accessor.getInt());
   }
 
   @Test
-  public void testShouldGetIntThrowsExceptionForOutOfRangeNegativeValue() throws Exception {
+  public void testShouldGetIntThrowsExceptionForOutOfRangeNegativeValue() {
     Text value = new Text("-2147483649");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getInt();
+    assertThrows(SQLException.class, () -> accessor.getInt());
   }
 
   @Test
@@ -248,8 +229,8 @@ public void testShouldGetIntReturnValidPositiveInteger() throws Exception {
 
     int result = accessor.getInt();
 
-    collector.checkThat(result, instanceOf(Integer.class));
-    collector.checkThat(result, equalTo(2147483647));
+    assertThat(result, instanceOf(Integer.class));
+    assertThat(result, equalTo(2147483647));
   }
 
   @Test
@@ -259,35 +240,32 @@ public void testShouldGetIntReturnValidNegativeInteger() throws Exception {
 
     int result = accessor.getInt();
 
-    collector.checkThat(result, instanceOf(Integer.class));
-    collector.checkThat(result, equalTo(-2147483648));
+    assertThat(result, instanceOf(Integer.class));
+    assertThat(result, equalTo(-2147483648));
   }
 
   @Test
-  public void testShouldGetLongThrowsExceptionForNonNumericValue() throws Exception {
+  public void testShouldGetLongThrowsExceptionForNonNumericValue() {
     Text value = new Text("Invalid value for long.");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getLong();
+    assertThrows(SQLException.class, () -> accessor.getLong());
   }
 
   @Test
-  public void testShouldGetLongThrowsExceptionForOutOfRangePositiveValue() throws Exception {
+  public void testShouldGetLongThrowsExceptionForOutOfRangePositiveValue() {
     Text value = new Text("9223372036854775808");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getLong();
+    assertThrows(SQLException.class, () -> accessor.getLong());
   }
 
   @Test
-  public void testShouldGetLongThrowsExceptionForOutOfRangeNegativeValue() throws Exception {
+  public void testShouldGetLongThrowsExceptionForOutOfRangeNegativeValue() {
     Text value = new Text("-9223372036854775809");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getLong();
+    assertThrows(SQLException.class, () -> accessor.getLong());
   }
 
   @Test
@@ -297,8 +275,8 @@ public void testShouldGetLongReturnValidPositiveLong() throws Exception {
 
     long result = accessor.getLong();
 
-    collector.checkThat(result, instanceOf(Long.class));
-    collector.checkThat(result, equalTo(9223372036854775807L));
+    assertThat(result, instanceOf(Long.class));
+    assertThat(result, equalTo(9223372036854775807L));
   }
 
   @Test
@@ -308,26 +286,24 @@ public void testShouldGetLongReturnValidNegativeLong() throws Exception {
 
     long result = accessor.getLong();
 
-    collector.checkThat(result, instanceOf(Long.class));
-    collector.checkThat(result, equalTo(-9223372036854775808L));
+    assertThat(result, instanceOf(Long.class));
+    assertThat(result, equalTo(-9223372036854775808L));
   }
 
   @Test
-  public void testShouldBigDecimalWithParametersThrowsExceptionForNonNumericValue() throws Exception {
+  public void testShouldBigDecimalWithParametersThrowsExceptionForNonNumericValue() {
     Text value = new Text("Invalid value for BigDecimal.");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getBigDecimal(1);
+    assertThrows(SQLException.class, () -> accessor.getBigDecimal(1));
   }
 
   @Test
-  public void testShouldGetBigDecimalThrowsExceptionForNonNumericValue() throws Exception {
+  public void testShouldGetBigDecimalThrowsExceptionForNonNumericValue() {
     Text value = new Text("Invalid value for BigDecimal.");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getBigDecimal();
+    assertThrows(SQLException.class, () -> accessor.getBigDecimal());
   }
 
   @Test
@@ -337,8 +313,8 @@ public void testShouldGetBigDecimalReturnValidPositiveBigDecimal() throws Except
 
     BigDecimal result = accessor.getBigDecimal();
 
-    collector.checkThat(result, instanceOf(BigDecimal.class));
-    collector.checkThat(result, equalTo(new BigDecimal("9223372036854775807000.999")));
+    assertThat(result, instanceOf(BigDecimal.class));
+    assertThat(result, equalTo(new BigDecimal("9223372036854775807000.999")));
   }
 
   @Test
@@ -348,17 +324,16 @@ public void testShouldGetBigDecimalReturnValidNegativeBigDecimal() throws Except
 
     BigDecimal result = accessor.getBigDecimal();
 
-    collector.checkThat(result, instanceOf(BigDecimal.class));
-    collector.checkThat(result, equalTo(new BigDecimal("-9223372036854775807000.999")));
+    assertThat(result, instanceOf(BigDecimal.class));
+    assertThat(result, equalTo(new BigDecimal("-9223372036854775807000.999")));
   }
 
   @Test
-  public void testShouldGetDoubleThrowsExceptionForNonNumericValue() throws Exception {
+  public void testShouldGetDoubleThrowsExceptionForNonNumericValue() {
     Text value = new Text("Invalid value for double.");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getDouble();
+    assertThrows(SQLException.class, () -> accessor.getDouble());
   }
 
   @Test
@@ -368,8 +343,8 @@ public void testShouldGetDoubleReturnValidPositiveDouble() throws Exception {
 
     double result = accessor.getDouble();
 
-    collector.checkThat(result, instanceOf(Double.class));
-    collector.checkThat(result, equalTo(1.7976931348623157E308D));
+    assertThat(result, instanceOf(Double.class));
+    assertThat(result, equalTo(1.7976931348623157E308D));
   }
 
   @Test
@@ -379,8 +354,8 @@ public void testShouldGetDoubleReturnValidNegativeDouble() throws Exception {
 
     double result = accessor.getDouble();
 
-    collector.checkThat(result, instanceOf(Double.class));
-    collector.checkThat(result, equalTo(-1.7976931348623157E308D));
+    assertThat(result, instanceOf(Double.class));
+    assertThat(result, equalTo(-1.7976931348623157E308D));
   }
 
   @Test
@@ -390,8 +365,8 @@ public void testShouldGetDoubleWorkWithPositiveInfinity() throws Exception {
 
     double result = accessor.getDouble();
 
-    collector.checkThat(result, instanceOf(Double.class));
-    collector.checkThat(result, equalTo(Double.POSITIVE_INFINITY));
+    assertThat(result, instanceOf(Double.class));
+    assertThat(result, equalTo(Double.POSITIVE_INFINITY));
   }
 
   @Test
@@ -401,8 +376,8 @@ public void testShouldGetDoubleWorkWithNegativeInfinity() throws Exception {
 
     double result = accessor.getDouble();
 
-    collector.checkThat(result, instanceOf(Double.class));
-    collector.checkThat(result, equalTo(Double.NEGATIVE_INFINITY));
+    assertThat(result, instanceOf(Double.class));
+    assertThat(result, equalTo(Double.NEGATIVE_INFINITY));
   }
 
   @Test
@@ -412,17 +387,16 @@ public void testShouldGetDoubleWorkWithNaN() throws Exception {
 
     double result = accessor.getDouble();
 
-    collector.checkThat(result, instanceOf(Double.class));
-    collector.checkThat(result, equalTo(Double.NaN));
+    assertThat(result, instanceOf(Double.class));
+    assertThat(result, equalTo(Double.NaN));
   }
 
   @Test
-  public void testShouldGetFloatThrowsExceptionForNonNumericValue() throws Exception {
+  public void testShouldGetFloatThrowsExceptionForNonNumericValue() {
     Text value = new Text("Invalid value for float.");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getFloat();
+    assertThrows(SQLException.class, () -> accessor.getFloat());
   }
 
   @Test
@@ -432,8 +406,8 @@ public void testShouldGetFloatReturnValidPositiveFloat() throws Exception {
 
     float result = accessor.getFloat();
 
-    collector.checkThat(result, instanceOf(Float.class));
-    collector.checkThat(result, equalTo(3.4028235E38F));
+    assertThat(result, instanceOf(Float.class));
+    assertThat(result, equalTo(3.4028235E38F));
   }
 
   @Test
@@ -443,8 +417,8 @@ public void testShouldGetFloatReturnValidNegativeFloat() throws Exception {
 
     float result = accessor.getFloat();
 
-    collector.checkThat(result, instanceOf(Float.class));
-    collector.checkThat(result, equalTo(-3.4028235E38F));
+    assertThat(result, instanceOf(Float.class));
+    assertThat(result, equalTo(-3.4028235E38F));
   }
 
   @Test
@@ -454,8 +428,8 @@ public void testShouldGetFloatWorkWithPositiveInfinity() throws Exception {
 
     float result = accessor.getFloat();
 
-    collector.checkThat(result, instanceOf(Float.class));
-    collector.checkThat(result, equalTo(Float.POSITIVE_INFINITY));
+    assertThat(result, instanceOf(Float.class));
+    assertThat(result, equalTo(Float.POSITIVE_INFINITY));
   }
 
   @Test
@@ -465,8 +439,8 @@ public void testShouldGetFloatWorkWithNegativeInfinity() throws Exception {
 
     float result = accessor.getFloat();
 
-    collector.checkThat(result, instanceOf(Float.class));
-    collector.checkThat(result, equalTo(Float.NEGATIVE_INFINITY));
+    assertThat(result, instanceOf(Float.class));
+    assertThat(result, equalTo(Float.NEGATIVE_INFINITY));
   }
 
   @Test
@@ -476,17 +450,16 @@ public void testShouldGetFloatWorkWithNaN() throws Exception {
 
     float result = accessor.getFloat();
 
-    collector.checkThat(result, instanceOf(Float.class));
-    collector.checkThat(result, equalTo(Float.NaN));
+    assertThat(result, instanceOf(Float.class));
+    assertThat(result, equalTo(Float.NaN));
   }
 
   @Test
-  public void testShouldGetDateThrowsExceptionForNonDateValue() throws Exception {
+  public void testShouldGetDateThrowsExceptionForNonDateValue() {
     Text value = new Text("Invalid value for date.");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getDate(null);
+    assertThrows(SQLException.class, () -> accessor.getDate(null));
   }
 
   @Test
@@ -496,13 +469,12 @@ public void testShouldGetDateReturnValidDateWithoutCalendar() throws Exception {
 
     Date result = accessor.getDate(null);
 
-    collector.checkThat(result, instanceOf(Date.class));
+    assertThat(result, instanceOf(Date.class));
 
     Calendar calendar = Calendar.getInstance();
     calendar.setTime(result);
 
-    collector.checkThat(dateTimeFormat.format(calendar.getTime()),
-        equalTo("2021-07-02T00:00:00.000Z"));
+    assertThat(dateTimeFormat.format(calendar.getTime()), equalTo("2021-07-02T00:00:00.000Z"));
   }
 
   @Test
@@ -516,17 +488,15 @@ public void testShouldGetDateReturnValidDateWithCalendar() throws Exception {
     calendar = Calendar.getInstance(TimeZone.getTimeZone("Etc/UTC"));
     calendar.setTime(result);
 
-    collector.checkThat(dateTimeFormat.format(calendar.getTime()),
-        equalTo("2021-07-02T03:00:00.000Z"));
+    assertThat(dateTimeFormat.format(calendar.getTime()), equalTo("2021-07-02T03:00:00.000Z"));
   }
 
   @Test
-  public void testShouldGetTimeThrowsExceptionForNonTimeValue() throws Exception {
+  public void testShouldGetTimeThrowsExceptionForNonTimeValue() {
     Text value = new Text("Invalid value for time.");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getTime(null);
+    assertThrows(SQLException.class, () -> accessor.getTime(null));
   }
 
   @Test
@@ -539,7 +509,7 @@ public void testShouldGetTimeReturnValidDateWithoutCalendar() throws Exception {
     Calendar calendar = Calendar.getInstance();
     calendar.setTime(result);
 
-    collector.checkThat(timeFormat.format(calendar.getTime()), equalTo("02:30:00.000Z"));
+    assertThat(timeFormat.format(calendar.getTime()), equalTo("02:30:00.000Z"));
   }
 
   @Test
@@ -553,16 +523,15 @@ public void testShouldGetTimeReturnValidDateWithCalendar() throws Exception {
     calendar = Calendar.getInstance(TimeZone.getTimeZone("Etc/UTC"));
     calendar.setTime(result);
 
-    collector.checkThat(timeFormat.format(calendar.getTime()), equalTo("05:30:00.000Z"));
+    assertThat(timeFormat.format(calendar.getTime()), equalTo("05:30:00.000Z"));
   }
 
   @Test
-  public void testShouldGetTimestampThrowsExceptionForNonTimeValue() throws Exception {
+  public void testShouldGetTimestampThrowsExceptionForNonTimeValue() {
     Text value = new Text("Invalid value for timestamp.");
     when(getter.get(0)).thenReturn(value.copyBytes());
 
-    thrown.expect(SQLException.class);
-    accessor.getTimestamp(null);
+    assertThrows(SQLException.class, () -> accessor.getTimestamp(null));
   }
 
   @Test
@@ -575,8 +544,7 @@ public void testShouldGetTimestampReturnValidDateWithoutCalendar() throws Except
     Calendar calendar = Calendar.getInstance();
     calendar.setTime(result);
 
-    collector.checkThat(dateTimeFormat.format(calendar.getTime()),
-        equalTo("2021-07-02T02:30:00.000Z"));
+    assertThat(dateTimeFormat.format(calendar.getTime()), equalTo("2021-07-02T02:30:00.000Z"));
   }
 
   @Test
@@ -590,19 +558,19 @@ public void testShouldGetTimestampReturnValidDateWithCalendar() throws Exception
     calendar = Calendar.getInstance(TimeZone.getTimeZone("Etc/UTC"));
     calendar.setTime(result);
 
-    collector.checkThat(dateTimeFormat.format(calendar.getTime()),
-        equalTo("2021-07-02T05:30:00.000Z"));
+    assertThat(dateTimeFormat.format(calendar.getTime()), equalTo("2021-07-02T05:30:00.000Z"));
   }
 
   private void assertGetBoolean(Text value, boolean expectedResult) throws SQLException {
     when(getter.get(0)).thenReturn(value == null ? null : value.copyBytes());
     boolean result = accessor.getBoolean();
-    collector.checkThat(result, equalTo(expectedResult));
+    assertThat(result, equalTo(expectedResult));
   }
 
   private void assertGetBooleanForSQLException(Text value) {
     when(getter.get(0)).thenReturn(value == null ? null : value.copyBytes());
-    ThrowableAssertionUtils.simpleAssertThrowableClass(SQLException.class, () -> accessor.getBoolean());
+    ThrowableAssertionUtils.simpleAssertThrowableClass(
+        SQLException.class, () -> accessor.getBoolean());
   }
 
   @Test
@@ -637,8 +605,8 @@ public void testShouldGetBytesReturnValidByteArray() {
 
     final byte[] result = accessor.getBytes();
 
-    collector.checkThat(result, instanceOf(byte[].class));
-    collector.checkThat(result, equalTo(value.toString().getBytes(UTF_8)));
+    assertThat(result, instanceOf(byte[].class));
+    assertThat(result, equalTo(value.toString().getBytes(UTF_8)));
   }
 
   @Test
@@ -649,8 +617,7 @@ public void testShouldGetUnicodeStreamReturnValidInputStream() throws Exception
     try (final InputStream result = accessor.getUnicodeStream()) {
       byte[] resultBytes = toByteArray(result);
 
-      collector.checkThat(new String(resultBytes, UTF_8),
-          equalTo(value.toString()));
+      assertThat(new String(resultBytes, UTF_8), equalTo(value.toString()));
     }
   }
 
@@ -663,7 +630,7 @@ public void testShouldGetAsciiStreamReturnValidInputStream() throws Exception {
     try (final InputStream result = accessor.getAsciiStream()) {
       byte[] resultBytes = toByteArray(result);
 
-      Assert.assertArrayEquals(valueAscii, resultBytes);
+      assertArrayEquals(valueAscii, resultBytes);
     }
   }
 
@@ -675,59 +642,57 @@ public void testShouldGetCharacterStreamReturnValidReader() throws Exception {
     try (Reader result = accessor.getCharacterStream()) {
       char[] resultChars = toCharArray(result);
 
-      collector.checkThat(new String(resultChars), equalTo(value.toString()));
+      assertThat(new String(resultChars), equalTo(value.toString()));
     }
   }
 
   @Test
   public void testShouldGetTimeStampBeConsistentWithTimeStampAccessor() throws Exception {
-    try (TimeStampVector timeStampVector = rootAllocatorTestRule.createTimeStampMilliVector()) {
+    try (TimeStampVector timeStampVector =
+        rootAllocatorTestExtension.createTimeStampMilliVector()) {
       ArrowFlightJdbcTimeStampVectorAccessor timeStampVectorAccessor =
-          new ArrowFlightJdbcTimeStampVectorAccessor(timeStampVector, () -> 0,
-              (boolean wasNull) -> {
-              });
+          new ArrowFlightJdbcTimeStampVectorAccessor(
+              timeStampVector, () -> 0, (boolean wasNull) -> {});
 
       Text value = new Text(timeStampVectorAccessor.getString());
       when(getter.get(0)).thenReturn(value.copyBytes());
 
       Timestamp timestamp = accessor.getTimestamp(null);
-      collector.checkThat(timestamp, equalTo(timeStampVectorAccessor.getTimestamp(null)));
+      assertThat(timestamp, equalTo(timeStampVectorAccessor.getTimestamp(null)));
     }
   }
 
   @Test
   public void testShouldGetTimeBeConsistentWithTimeAccessor() throws Exception {
-    try (TimeMilliVector timeVector = rootAllocatorTestRule.createTimeMilliVector()) {
+    try (TimeMilliVector timeVector = rootAllocatorTestExtension.createTimeMilliVector()) {
       ArrowFlightJdbcTimeVectorAccessor timeVectorAccessor =
-          new ArrowFlightJdbcTimeVectorAccessor(timeVector, () -> 0, (boolean wasNull) -> {
-          });
+          new ArrowFlightJdbcTimeVectorAccessor(timeVector, () -> 0, (boolean wasNull) -> {});
 
       Text value = new Text(timeVectorAccessor.getString());
       when(getter.get(0)).thenReturn(value.copyBytes());
 
       Time time = accessor.getTime(null);
-      collector.checkThat(time, equalTo(timeVectorAccessor.getTime(null)));
+      assertThat(time, equalTo(timeVectorAccessor.getTime(null)));
     }
   }
 
   @Test
   public void testShouldGetDateBeConsistentWithDateAccessor() throws Exception {
-    try (DateMilliVector dateVector = rootAllocatorTestRule.createDateMilliVector()) {
+    try (DateMilliVector dateVector = rootAllocatorTestExtension.createDateMilliVector()) {
       ArrowFlightJdbcDateVectorAccessor dateVectorAccessor =
-          new ArrowFlightJdbcDateVectorAccessor(dateVector, () -> 0, (boolean wasNull) -> {
-          });
+          new ArrowFlightJdbcDateVectorAccessor(dateVector, () -> 0, (boolean wasNull) -> {});
 
       Text value = new Text(dateVectorAccessor.getString());
       when(getter.get(0)).thenReturn(value.copyBytes());
 
       Date date = accessor.getDate(null);
-      collector.checkThat(date, equalTo(dateVectorAccessor.getDate(null)));
+      assertThat(date, equalTo(dateVectorAccessor.getDate(null)));
     }
   }
 
   @Test
   public void testShouldGetObjectClassReturnString() {
     final Class<?> clazz = accessor.getObjectClass();
-    collector.checkThat(clazz, equalTo(String.class));
+    assertThat(clazz, equalTo(String.class));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/authentication/Authentication.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/authentication/Authentication.java
index 5fe2b0dc057fd..7e2d8621785aa 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/authentication/Authentication.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/authentication/Authentication.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.authentication;
 
 import java.util.Properties;
-
 import org.apache.arrow.flight.auth2.CallHeaderAuthenticator;
 
 public interface Authentication {
@@ -31,6 +29,7 @@ public interface Authentication {
 
   /**
    * Uses the validCredentials variable and populate the Properties object.
+   *
    * @param properties the Properties object that will be populated.
    */
   void populateProperties(Properties properties);
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/authentication/TokenAuthentication.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/authentication/TokenAuthentication.java
index 605705d1ca95a..6d93ff705bd62 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/authentication/TokenAuthentication.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/authentication/TokenAuthentication.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.authentication;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
-
 import org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl;
 import org.apache.arrow.flight.CallHeaders;
 import org.apache.arrow.flight.CallStatus;
@@ -40,7 +38,9 @@ public CallHeaderAuthenticator authenticate() {
       public AuthResult authenticate(CallHeaders incomingHeaders) {
         String authorization = incomingHeaders.get("authorization");
         if (!validCredentials.contains(authorization)) {
-          throw CallStatus.UNAUTHENTICATED.withDescription("Invalid credentials.").toRuntimeException();
+          throw CallStatus.UNAUTHENTICATED
+              .withDescription("Invalid credentials.")
+              .toRuntimeException();
         }
         return new AuthResult() {
           @Override
@@ -54,8 +54,11 @@ public String getPeerIdentity() {
 
   @Override
   public void populateProperties(Properties properties) {
-    this.validCredentials.forEach(value -> properties.put(
-        ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.TOKEN.camelName(), value));
+    this.validCredentials.forEach(
+        value ->
+            properties.put(
+                ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.TOKEN.camelName(),
+                value));
   }
 
   public static final class Builder {
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/authentication/UserPasswordAuthentication.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/authentication/UserPasswordAuthentication.java
index 5dc97c858f352..2b74c880b3135 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/authentication/UserPasswordAuthentication.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/authentication/UserPasswordAuthentication.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.authentication;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-
 import org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl;
 import org.apache.arrow.flight.CallStatus;
 import org.apache.arrow.flight.auth2.BasicCallHeaderAuthenticator;
@@ -42,20 +40,28 @@ private String getCredentials(String key) {
   @Override
   public CallHeaderAuthenticator authenticate() {
     return new GeneratedBearerTokenAuthenticator(
-        new BasicCallHeaderAuthenticator((username, password) -> {
-          if (validCredentials.containsKey(username) && getCredentials(username).equals(password)) {
-            return () -> username;
-          }
-          throw CallStatus.UNAUTHENTICATED.withDescription("Invalid credentials.").toRuntimeException();
-        }));
+        new BasicCallHeaderAuthenticator(
+            (username, password) -> {
+              if (validCredentials.containsKey(username)
+                  && getCredentials(username).equals(password)) {
+                return () -> username;
+              }
+              throw CallStatus.UNAUTHENTICATED
+                  .withDescription("Invalid credentials.")
+                  .toRuntimeException();
+            }));
   }
 
   @Override
   public void populateProperties(Properties properties) {
-    validCredentials.forEach((key, value) -> {
-      properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.USER.camelName(), key);
-      properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PASSWORD.camelName(), value);
-    });
+    validCredentials.forEach(
+        (key, value) -> {
+          properties.put(
+              ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.USER.camelName(), key);
+          properties.put(
+              ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PASSWORD.camelName(),
+              value);
+        });
   }
 
   public static class Builder {
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandlerBuilderTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandlerBuilderTest.java
index 6565a85ddf99f..4f16a4fa60932 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandlerBuilderTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandlerBuilderTest.java
@@ -14,40 +14,41 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.client;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.apache.arrow.driver.jdbc.FlightServerTestRule;
+import java.util.Optional;
+import org.apache.arrow.driver.jdbc.FlightServerTestExtension;
 import org.apache.arrow.driver.jdbc.utils.CoreMockedSqlProducers;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
-/**
- * Test the behavior of ArrowFlightSqlClientHandler.Builder
- */
+/** Test the behavior of ArrowFlightSqlClientHandler.Builder */
 public class ArrowFlightSqlClientHandlerBuilderTest {
-  @ClassRule
-  public static final FlightServerTestRule FLIGHT_SERVER_TEST_RULE = FlightServerTestRule
-      .createStandardTestRule(CoreMockedSqlProducers.getLegacyProducer());
+
+  @RegisterExtension
+  public static final FlightServerTestExtension FLIGHT_SERVER_TEST_EXTENSION =
+      FlightServerTestExtension.createStandardTestExtension(
+          CoreMockedSqlProducers.getLegacyProducer());
 
   private static BufferAllocator allocator;
 
-  @BeforeClass
+  @BeforeAll
   public static void setup() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDown() {
     allocator.close();
   }
@@ -55,19 +56,21 @@ public static void tearDown() {
   @Test
   public void testRetainCookiesOnAuthOff() throws Exception {
     // Arrange
-    final ArrowFlightSqlClientHandler.Builder rootBuilder = new ArrowFlightSqlClientHandler.Builder()
-        .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
-        .withPort(FLIGHT_SERVER_TEST_RULE.getPort())
-        .withBufferAllocator(allocator)
-        .withUsername(FlightServerTestRule.DEFAULT_USER)
-        .withPassword(FlightServerTestRule.DEFAULT_PASSWORD)
-        .withEncryption(false)
-        .withRetainCookies(true)
-        .withRetainAuth(false);
+    final ArrowFlightSqlClientHandler.Builder rootBuilder =
+        new ArrowFlightSqlClientHandler.Builder()
+            .withHost(FLIGHT_SERVER_TEST_EXTENSION.getHost())
+            .withPort(FLIGHT_SERVER_TEST_EXTENSION.getPort())
+            .withBufferAllocator(allocator)
+            .withUsername(FlightServerTestExtension.DEFAULT_USER)
+            .withPassword(FlightServerTestExtension.DEFAULT_PASSWORD)
+            .withEncryption(false)
+            .withRetainCookies(true)
+            .withRetainAuth(false);
 
     try (ArrowFlightSqlClientHandler rootHandler = rootBuilder.build()) {
       // Act
-      final ArrowFlightSqlClientHandler.Builder testBuilder = new ArrowFlightSqlClientHandler.Builder(rootBuilder);
+      final ArrowFlightSqlClientHandler.Builder testBuilder =
+          new ArrowFlightSqlClientHandler.Builder(rootBuilder);
 
       // Assert
       assertSame(rootBuilder.cookieFactory, testBuilder.cookieFactory);
@@ -78,19 +81,21 @@ public void testRetainCookiesOnAuthOff() throws Exception {
   @Test
   public void testRetainCookiesOffAuthOff() throws Exception {
     // Arrange
-    final ArrowFlightSqlClientHandler.Builder rootBuilder = new ArrowFlightSqlClientHandler.Builder()
-        .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
-        .withPort(FLIGHT_SERVER_TEST_RULE.getPort())
-        .withBufferAllocator(allocator)
-        .withUsername(FlightServerTestRule.DEFAULT_USER)
-        .withPassword(FlightServerTestRule.DEFAULT_PASSWORD)
-        .withEncryption(false)
-        .withRetainCookies(false)
-        .withRetainAuth(false);
+    final ArrowFlightSqlClientHandler.Builder rootBuilder =
+        new ArrowFlightSqlClientHandler.Builder()
+            .withHost(FLIGHT_SERVER_TEST_EXTENSION.getHost())
+            .withPort(FLIGHT_SERVER_TEST_EXTENSION.getPort())
+            .withBufferAllocator(allocator)
+            .withUsername(FlightServerTestExtension.DEFAULT_USER)
+            .withPassword(FlightServerTestExtension.DEFAULT_PASSWORD)
+            .withEncryption(false)
+            .withRetainCookies(false)
+            .withRetainAuth(false);
 
     try (ArrowFlightSqlClientHandler rootHandler = rootBuilder.build()) {
       // Act
-      final ArrowFlightSqlClientHandler.Builder testBuilder = new ArrowFlightSqlClientHandler.Builder(rootBuilder);
+      final ArrowFlightSqlClientHandler.Builder testBuilder =
+          new ArrowFlightSqlClientHandler.Builder(rootBuilder);
 
       // Assert
       assertNotSame(rootBuilder.cookieFactory, testBuilder.cookieFactory);
@@ -101,19 +106,21 @@ public void testRetainCookiesOffAuthOff() throws Exception {
   @Test
   public void testRetainCookiesOnAuthOn() throws Exception {
     // Arrange
-    final ArrowFlightSqlClientHandler.Builder rootBuilder = new ArrowFlightSqlClientHandler.Builder()
-        .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
-        .withPort(FLIGHT_SERVER_TEST_RULE.getPort())
-        .withBufferAllocator(allocator)
-        .withUsername(FlightServerTestRule.DEFAULT_USER)
-        .withPassword(FlightServerTestRule.DEFAULT_PASSWORD)
-        .withEncryption(false)
-        .withRetainCookies(true)
-        .withRetainAuth(true);
+    final ArrowFlightSqlClientHandler.Builder rootBuilder =
+        new ArrowFlightSqlClientHandler.Builder()
+            .withHost(FLIGHT_SERVER_TEST_EXTENSION.getHost())
+            .withPort(FLIGHT_SERVER_TEST_EXTENSION.getPort())
+            .withBufferAllocator(allocator)
+            .withUsername(FlightServerTestExtension.DEFAULT_USER)
+            .withPassword(FlightServerTestExtension.DEFAULT_PASSWORD)
+            .withEncryption(false)
+            .withRetainCookies(true)
+            .withRetainAuth(true);
 
     try (ArrowFlightSqlClientHandler rootHandler = rootBuilder.build()) {
       // Act
-      final ArrowFlightSqlClientHandler.Builder testBuilder = new ArrowFlightSqlClientHandler.Builder(rootBuilder);
+      final ArrowFlightSqlClientHandler.Builder testBuilder =
+          new ArrowFlightSqlClientHandler.Builder(rootBuilder);
 
       // Assert
       assertSame(rootBuilder.cookieFactory, testBuilder.cookieFactory);
@@ -139,5 +146,30 @@ public void testDefaults() {
     assertNull(builder.tlsRootCertificatesPath);
     assertNull(builder.clientCertificatePath);
     assertNull(builder.clientKeyPath);
+    assertEquals(Optional.empty(), builder.catalog);
+  }
+
+  @Test
+  public void testCatalog() {
+    ArrowFlightSqlClientHandler.Builder rootBuilder = new ArrowFlightSqlClientHandler.Builder();
+
+    rootBuilder.withCatalog(null);
+    assertFalse(rootBuilder.catalog.isPresent());
+
+    rootBuilder.withCatalog("");
+    assertTrue(rootBuilder.catalog.isPresent());
+
+    rootBuilder.withCatalog("   ");
+    assertTrue(rootBuilder.catalog.isPresent());
+
+    final String noSpaces = "noSpaces";
+    rootBuilder.withCatalog(noSpaces);
+    assertTrue(rootBuilder.catalog.isPresent());
+    assertEquals(noSpaces, rootBuilder.catalog.get());
+
+    final String nameWithSpaces = "  spaces ";
+    rootBuilder.withCatalog(nameWithSpaces);
+    assertTrue(rootBuilder.catalog.isPresent());
+    assertEquals(nameWithSpaces, rootBuilder.catalog.get());
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/client/utils/ClientAuthenticationUtilsTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/client/utils/ClientAuthenticationUtilsTest.java
index 78d252f7824c3..0d1498abe4ae1 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/client/utils/ClientAuthenticationUtilsTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/client/utils/ClientAuthenticationUtilsTest.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.client.utils;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 
 import java.io.IOException;
@@ -30,20 +30,17 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Enumeration;
-
 import org.bouncycastle.openssl.jcajce.JcaPEMWriter;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ClientAuthenticationUtilsTest {
-  @Mock
-  KeyStore keyStoreMock;
+  @Mock KeyStore keyStoreMock;
 
   @Test
   public void testGetCertificatesInputStream() throws IOException, KeyStoreException {
@@ -61,86 +58,84 @@ public void testGetCertificatesInputStream() throws IOException, KeyStoreExcepti
   }
 
   @Test
-  public void testGetKeyStoreInstance() throws IOException,
-      KeyStoreException, CertificateException, NoSuchAlgorithmException {
+  public void testGetKeyStoreInstance()
+      throws IOException, KeyStoreException, CertificateException, NoSuchAlgorithmException {
     try (MockedStatic<KeyStore> keyStoreMockedStatic = Mockito.mockStatic(KeyStore.class)) {
       keyStoreMockedStatic
           .when(() -> ClientAuthenticationUtils.getKeyStoreInstance(Mockito.any()))
           .thenReturn(keyStoreMock);
 
       KeyStore receiveKeyStore = ClientAuthenticationUtils.getKeyStoreInstance("test1");
-      Mockito
-          .verify(keyStoreMock)
-          .load(null, null);
+      Mockito.verify(keyStoreMock).load(null, null);
 
-      Assert.assertEquals(receiveKeyStore, keyStoreMock);
+      assertEquals(receiveKeyStore, keyStoreMock);
     }
   }
 
   @Test
-  public void testGetDefaultKeyStoreInstancePassword() throws IOException,
-          KeyStoreException, CertificateException, NoSuchAlgorithmException {
+  public void testGetDefaultKeyStoreInstancePassword()
+      throws IOException, KeyStoreException, CertificateException, NoSuchAlgorithmException {
     try (MockedStatic<KeyStore> keyStoreMockedStatic = Mockito.mockStatic(KeyStore.class)) {
 
       keyStoreMockedStatic
-         .when(() -> ClientAuthenticationUtils.getDefaultKeyStoreInstance("changeit"))
+          .when(() -> ClientAuthenticationUtils.getDefaultKeyStoreInstance("changeit"))
           .thenReturn(keyStoreMock);
       KeyStore receiveKeyStore = ClientAuthenticationUtils.getDefaultKeyStoreInstance("changeit");
-      Assert.assertEquals(receiveKeyStore, keyStoreMock);
+      assertEquals(receiveKeyStore, keyStoreMock);
     }
   }
 
   @Test
-  public void testGetDefaultKeyStoreInstanceNoPassword() throws IOException,
-          KeyStoreException, CertificateException, NoSuchAlgorithmException {
+  public void testGetDefaultKeyStoreInstanceNoPassword()
+      throws IOException, KeyStoreException, CertificateException, NoSuchAlgorithmException {
     try (MockedStatic<KeyStore> keyStoreMockedStatic = Mockito.mockStatic(KeyStore.class)) {
 
       keyStoreMockedStatic
           .when(() -> ClientAuthenticationUtils.getDefaultKeyStoreInstance(null))
           .thenReturn(keyStoreMock);
       KeyStore receiveKeyStore = ClientAuthenticationUtils.getDefaultKeyStoreInstance(null);
-      Assert.assertEquals(receiveKeyStore, keyStoreMock);
+      assertEquals(receiveKeyStore, keyStoreMock);
     }
   }
 
-
   @Test
-  public void testGetCertificateInputStreamFromMacSystem() throws IOException,
-      KeyStoreException, CertificateException, NoSuchAlgorithmException {
+  public void testGetCertificateInputStreamFromMacSystem()
+      throws IOException, KeyStoreException, CertificateException, NoSuchAlgorithmException {
     InputStream mock = mock(InputStream.class);
 
     try (MockedStatic<KeyStore> keyStoreMockedStatic = createKeyStoreStaticMock();
-         MockedStatic<ClientAuthenticationUtils>
-             clientAuthenticationUtilsMockedStatic = createClientAuthenticationUtilsStaticMock()) {
+        MockedStatic<ClientAuthenticationUtils> clientAuthenticationUtilsMockedStatic =
+            createClientAuthenticationUtilsStaticMock()) {
 
       setOperatingSystemMock(clientAuthenticationUtilsMockedStatic, false, true);
-      keyStoreMockedStatic.when(() -> ClientAuthenticationUtils
-          .getKeyStoreInstance("KeychainStore"))
+      keyStoreMockedStatic
+          .when(() -> ClientAuthenticationUtils.getKeyStoreInstance("KeychainStore"))
           .thenReturn(keyStoreMock);
-      keyStoreMockedStatic.when(() -> ClientAuthenticationUtils
-          .getDefaultKeyStoreInstance("changeit"))
+      keyStoreMockedStatic
+          .when(() -> ClientAuthenticationUtils.getDefaultKeyStoreInstance("changeit"))
           .thenReturn(keyStoreMock);
       clientAuthenticationUtilsMockedStatic
           .when(ClientAuthenticationUtils::getKeystoreInputStream)
           .thenCallRealMethod();
       keyStoreMockedStatic.when(KeyStore::getDefaultType).thenCallRealMethod();
-      keyStoreMockedStatic.when(() -> ClientAuthenticationUtils
-          .getCertificatesInputStream(Mockito.any()))
+      keyStoreMockedStatic
+          .when(() -> ClientAuthenticationUtils.getCertificatesInputStream(Mockito.any()))
           .thenReturn(mock);
 
-      InputStream inputStream = ClientAuthenticationUtils.getCertificateInputStreamFromSystem("changeit");
-      Assert.assertEquals(inputStream, mock);
+      InputStream inputStream =
+          ClientAuthenticationUtils.getCertificateInputStreamFromSystem("changeit");
+      assertEquals(inputStream, mock);
     }
   }
 
   @Test
-  public void testGetCertificateInputStreamFromWindowsSystem() throws IOException,
-      KeyStoreException, CertificateException, NoSuchAlgorithmException {
+  public void testGetCertificateInputStreamFromWindowsSystem()
+      throws IOException, KeyStoreException, CertificateException, NoSuchAlgorithmException {
     InputStream mock = mock(InputStream.class);
 
     try (MockedStatic<KeyStore> keyStoreMockedStatic = createKeyStoreStaticMock();
-        MockedStatic<ClientAuthenticationUtils>
-            clientAuthenticationUtilsMockedStatic = createClientAuthenticationUtilsStaticMock()) {
+        MockedStatic<ClientAuthenticationUtils> clientAuthenticationUtilsMockedStatic =
+            createClientAuthenticationUtilsStaticMock()) {
 
       setOperatingSystemMock(clientAuthenticationUtilsMockedStatic, true, false);
       keyStoreMockedStatic
@@ -153,67 +148,74 @@ public void testGetCertificateInputStreamFromWindowsSystem() throws IOException,
           .when(() -> ClientAuthenticationUtils.getCertificatesInputStream(Mockito.any()))
           .thenReturn(mock);
 
-      InputStream inputStream = ClientAuthenticationUtils.getCertificateInputStreamFromSystem("test");
-      Assert.assertEquals(inputStream, mock);
+      InputStream inputStream =
+          ClientAuthenticationUtils.getCertificateInputStreamFromSystem("test");
+      assertEquals(inputStream, mock);
     }
   }
 
   @Test
-  public void testGetCertificateInputStreamFromLinuxSystem() throws IOException,
-      KeyStoreException, CertificateException, NoSuchAlgorithmException {
+  public void testGetCertificateInputStreamFromLinuxSystem()
+      throws IOException, KeyStoreException, CertificateException, NoSuchAlgorithmException {
     InputStream mock = mock(InputStream.class);
 
-    try (
-        MockedStatic<KeyStore> keyStoreMockedStatic = createKeyStoreStaticMock();
-        MockedStatic<ClientAuthenticationUtils>
-            clientAuthenticationUtilsMockedStatic = createClientAuthenticationUtilsStaticMock()) {
+    try (MockedStatic<KeyStore> keyStoreMockedStatic = createKeyStoreStaticMock();
+        MockedStatic<ClientAuthenticationUtils> clientAuthenticationUtilsMockedStatic =
+            createClientAuthenticationUtilsStaticMock()) {
 
       setOperatingSystemMock(clientAuthenticationUtilsMockedStatic, false, false);
-      keyStoreMockedStatic.when(() -> ClientAuthenticationUtils
-          .getCertificatesInputStream(Mockito.any()))
+      keyStoreMockedStatic
+          .when(() -> ClientAuthenticationUtils.getCertificatesInputStream(Mockito.any()))
           .thenReturn(mock);
-      keyStoreMockedStatic.when(() -> ClientAuthenticationUtils
-          .getDefaultKeyStoreInstance(Mockito.any()))
+      keyStoreMockedStatic
+          .when(() -> ClientAuthenticationUtils.getDefaultKeyStoreInstance(Mockito.any()))
           .thenReturn(keyStoreMock);
       clientAuthenticationUtilsMockedStatic
           .when(ClientAuthenticationUtils::getKeystoreInputStream)
           .thenCallRealMethod();
       keyStoreMockedStatic.when(KeyStore::getDefaultType).thenCallRealMethod();
 
-      InputStream inputStream = ClientAuthenticationUtils.getCertificateInputStreamFromSystem("changeit");
-      Assert.assertEquals(inputStream, mock);
+      InputStream inputStream =
+          ClientAuthenticationUtils.getCertificateInputStreamFromSystem("changeit");
+      assertEquals(inputStream, mock);
       inputStream = ClientAuthenticationUtils.getCertificateInputStreamFromSystem(null);
-      Assert.assertEquals(inputStream, mock);
+      assertEquals(inputStream, mock);
     }
   }
 
-
   private MockedStatic<KeyStore> createKeyStoreStaticMock() {
-    return Mockito.mockStatic(KeyStore.class, invocationOnMock -> {
+    return Mockito.mockStatic(
+        KeyStore.class,
+        invocationOnMock -> {
           Method method = invocationOnMock.getMethod();
           if (method.getName().equals("getInstance")) {
             return invocationOnMock.callRealMethod();
           }
           return method.invoke(invocationOnMock.getMock(), invocationOnMock.getArguments());
-        }
-    );
+        });
   }
 
   private MockedStatic<ClientAuthenticationUtils> createClientAuthenticationUtilsStaticMock() {
-    return Mockito.mockStatic(ClientAuthenticationUtils.class , invocationOnMock -> {
-      Method method = invocationOnMock.getMethod();
-      if (method.getName().equals("getCertificateInputStreamFromSystem")) {
-        return invocationOnMock.callRealMethod();
-      }
-      return method.invoke(invocationOnMock.getMock(), invocationOnMock.getArguments());
-    });
+    return Mockito.mockStatic(
+        ClientAuthenticationUtils.class,
+        invocationOnMock -> {
+          Method method = invocationOnMock.getMethod();
+          if (method.getName().equals("getCertificateInputStreamFromSystem")) {
+            return invocationOnMock.callRealMethod();
+          }
+          return method.invoke(invocationOnMock.getMock(), invocationOnMock.getArguments());
+        });
   }
 
-  private void setOperatingSystemMock(MockedStatic<ClientAuthenticationUtils> clientAuthenticationUtilsMockedStatic,
-                                      boolean isWindows, boolean isMac) {
+  private void setOperatingSystemMock(
+      MockedStatic<ClientAuthenticationUtils> clientAuthenticationUtilsMockedStatic,
+      boolean isWindows,
+      boolean isMac) {
     clientAuthenticationUtilsMockedStatic.when(ClientAuthenticationUtils::isMac).thenReturn(isMac);
-    Assert.assertEquals(ClientAuthenticationUtils.isMac(), isMac);
-    clientAuthenticationUtilsMockedStatic.when(ClientAuthenticationUtils::isWindows).thenReturn(isWindows);
-    Assert.assertEquals(ClientAuthenticationUtils.isWindows(), isWindows);
+    assertEquals(ClientAuthenticationUtils.isMac(), isMac);
+    clientAuthenticationUtilsMockedStatic
+        .when(ClientAuthenticationUtils::isWindows)
+        .thenReturn(isWindows);
+    assertEquals(ClientAuthenticationUtils.isWindows(), isWindows);
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/AccessorTestUtils.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/AccessorTestUtils.java
index bc1e8a042035b..6285cf5d25506 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/AccessorTestUtils.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/AccessorTestUtils.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -26,11 +26,9 @@
 import java.util.function.Function;
 import java.util.function.IntSupplier;
 import java.util.function.Supplier;
-
 import org.apache.arrow.driver.jdbc.accessor.ArrowFlightJdbcAccessor;
 import org.apache.arrow.vector.ValueVector;
 import org.hamcrest.Matcher;
-import org.junit.rules.ErrorCollector;
 
 public class AccessorTestUtils {
   @FunctionalInterface
@@ -72,11 +70,9 @@ public int getCurrentRow() {
   }
 
   public static class AccessorIterator<T extends ArrowFlightJdbcAccessor> {
-    private final ErrorCollector collector;
     private final AccessorSupplier<T> accessorSupplier;
 
-    public AccessorIterator(ErrorCollector collector, AccessorSupplier<T> accessorSupplier) {
-      this.collector = collector;
+    public AccessorIterator(AccessorSupplier<T> accessorSupplier) {
       this.accessorSupplier = accessorSupplier;
     }
 
@@ -106,35 +102,43 @@ public List<Object> toList(ValueVector vector) throws Exception {
       return result;
     }
 
-    public <R> void assertAccessorGetter(ValueVector vector, CheckedFunction<T, R> getter,
-                                         MatcherGetter<T, R> matcherGetter) throws Exception {
-      iterate(vector, (accessor, currentRow) -> {
-        R object = getter.apply(accessor);
-        boolean wasNull = accessor.wasNull();
-
-        collector.checkThat(object, matcherGetter.get(accessor, currentRow));
-        collector.checkThat(wasNull, is(accessor.getObject() == null));
-      });
+    public <R> void assertAccessorGetter(
+        ValueVector vector, CheckedFunction<T, R> getter, MatcherGetter<T, R> matcherGetter)
+        throws Exception {
+      iterate(
+          vector,
+          (accessor, currentRow) -> {
+            R object = getter.apply(accessor);
+            boolean wasNull = accessor.wasNull();
+
+            assertThat(object, matcherGetter.get(accessor, currentRow));
+            assertThat(wasNull, is(accessor.getObject() == null));
+          });
     }
 
-    public <R> void assertAccessorGetterThrowingException(ValueVector vector, CheckedFunction<T, R> getter)
-        throws Exception {
-      iterate(vector, (accessor, currentRow) ->
-          ThrowableAssertionUtils.simpleAssertThrowableClass(SQLException.class, () -> getter.apply(accessor)));
+    public <R> void assertAccessorGetterThrowingException(
+        ValueVector vector, CheckedFunction<T, R> getter) throws Exception {
+      iterate(
+          vector,
+          (accessor, currentRow) ->
+              ThrowableAssertionUtils.simpleAssertThrowableClass(
+                  SQLException.class, () -> getter.apply(accessor)));
     }
 
-    public <R> void assertAccessorGetter(ValueVector vector, CheckedFunction<T, R> getter,
-                                         Function<T, Matcher<R>> matcherGetter) throws Exception {
+    public <R> void assertAccessorGetter(
+        ValueVector vector, CheckedFunction<T, R> getter, Function<T, Matcher<R>> matcherGetter)
+        throws Exception {
       assertAccessorGetter(vector, getter, (accessor, currentRow) -> matcherGetter.apply(accessor));
     }
 
-    public <R> void assertAccessorGetter(ValueVector vector, CheckedFunction<T, R> getter,
-                                         Supplier<Matcher<R>> matcherGetter) throws Exception {
+    public <R> void assertAccessorGetter(
+        ValueVector vector, CheckedFunction<T, R> getter, Supplier<Matcher<R>> matcherGetter)
+        throws Exception {
       assertAccessorGetter(vector, getter, (accessor, currentRow) -> matcherGetter.get());
     }
 
-    public <R> void assertAccessorGetter(ValueVector vector, CheckedFunction<T, R> getter,
-                                         Matcher<R> matcher) throws Exception {
+    public <R> void assertAccessorGetter(
+        ValueVector vector, CheckedFunction<T, R> getter, Matcher<R> matcher) throws Exception {
       assertAccessorGetter(vector, getter, (accessor, currentRow) -> matcher);
     }
   }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ArrowFlightConnectionConfigImplTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ArrowFlightConnectionConfigImplTest.java
index 4fb07428af4ef..4a46b5f5bedb5 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ArrowFlightConnectionConfigImplTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ArrowFlightConnectionConfigImplTest.java
@@ -14,11 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import static java.lang.Runtime.getRuntime;
-import static java.util.Arrays.asList;
+import static org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.CATALOG;
 import static org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.HOST;
 import static org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PASSWORD;
 import static org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PORT;
@@ -26,71 +25,83 @@
 import static org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.USER;
 import static org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.USE_ENCRYPTION;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
-import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 import java.util.function.Function;
-
+import java.util.stream.Stream;
 import org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-@RunWith(Parameterized.class)
 public final class ArrowFlightConnectionConfigImplTest {
 
   private static final Random RANDOM = new Random(12L);
 
-  private final Properties properties = new Properties();
+  private Properties properties;
   private ArrowFlightConnectionConfigImpl arrowFlightConnectionConfig;
 
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
-
-  @Parameter
   public ArrowFlightConnectionProperty property;
-
-  @Parameter(value = 1)
   public Object value;
-
-  @Parameter(value = 2)
   public Function<ArrowFlightConnectionConfigImpl, ?> arrowFlightConnectionConfigFunction;
 
-  @Before
+  @BeforeEach
   public void setUp() {
+    properties = new Properties();
     arrowFlightConnectionConfig = new ArrowFlightConnectionConfigImpl(properties);
-    properties.put(property.camelName(), value);
   }
 
-  @Test
-  public void testGetProperty() {
-    collector.checkThat(arrowFlightConnectionConfigFunction.apply(arrowFlightConnectionConfig),
-        is(value));
+  @ParameterizedTest
+  @MethodSource("provideParameters")
+  public void testGetProperty(
+      ArrowFlightConnectionProperty property,
+      Object value,
+      Function<ArrowFlightConnectionConfigImpl, ?> configFunction) {
+    properties.put(property.camelName(), value);
+    arrowFlightConnectionConfigFunction = configFunction;
+    assertThat(configFunction.apply(arrowFlightConnectionConfig), is(value));
+    assertThat(arrowFlightConnectionConfigFunction.apply(arrowFlightConnectionConfig), is(value));
   }
 
-  @Parameters(name = "<{0}> as <{1}>")
-  public static List<Object[]> provideParameters() {
-    return asList(new Object[][] {
-        {HOST, "host",
-            (Function<ArrowFlightConnectionConfigImpl, ?>) ArrowFlightConnectionConfigImpl::getHost},
-        {PORT,
+  public static Stream<Arguments> provideParameters() {
+    return Stream.of(
+        Arguments.of(
+            HOST,
+            "host",
+            (Function<ArrowFlightConnectionConfigImpl, ?>)
+                ArrowFlightConnectionConfigImpl::getHost),
+        Arguments.of(
+            PORT,
             RANDOM.nextInt(Short.toUnsignedInt(Short.MAX_VALUE)),
-            (Function<ArrowFlightConnectionConfigImpl, ?>) ArrowFlightConnectionConfigImpl::getPort},
-        {USER, "user",
-            (Function<ArrowFlightConnectionConfigImpl, ?>) ArrowFlightConnectionConfigImpl::getUser},
-        {PASSWORD, "password",
-            (Function<ArrowFlightConnectionConfigImpl, ?>) ArrowFlightConnectionConfigImpl::getPassword},
-        {USE_ENCRYPTION, RANDOM.nextBoolean(),
-            (Function<ArrowFlightConnectionConfigImpl, ?>) ArrowFlightConnectionConfigImpl::useEncryption},
-        {THREAD_POOL_SIZE,
+            (Function<ArrowFlightConnectionConfigImpl, ?>)
+                ArrowFlightConnectionConfigImpl::getPort),
+        Arguments.of(
+            USER,
+            "user",
+            (Function<ArrowFlightConnectionConfigImpl, ?>)
+                ArrowFlightConnectionConfigImpl::getUser),
+        Arguments.of(
+            PASSWORD,
+            "password",
+            (Function<ArrowFlightConnectionConfigImpl, ?>)
+                ArrowFlightConnectionConfigImpl::getPassword),
+        Arguments.of(
+            USE_ENCRYPTION,
+            RANDOM.nextBoolean(),
+            (Function<ArrowFlightConnectionConfigImpl, ?>)
+                ArrowFlightConnectionConfigImpl::useEncryption),
+        Arguments.of(
+            THREAD_POOL_SIZE,
             RANDOM.nextInt(getRuntime().availableProcessors()),
-            (Function<ArrowFlightConnectionConfigImpl, ?>) ArrowFlightConnectionConfigImpl::threadPoolSize},
-    });
+            (Function<ArrowFlightConnectionConfigImpl, ?>)
+                ArrowFlightConnectionConfigImpl::threadPoolSize),
+        Arguments.of(
+            CATALOG,
+            "catalog",
+            (Function<ArrowFlightConnectionConfigImpl, ?>)
+                ArrowFlightConnectionConfigImpl::getCatalog));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ArrowFlightConnectionPropertyTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ArrowFlightConnectionPropertyTest.java
index 25a48612cbd0b..5929b9f94a5ef 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ArrowFlightConnectionPropertyTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ArrowFlightConnectionPropertyTest.java
@@ -14,76 +14,79 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import static org.apache.arrow.util.AutoCloseables.close;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 import static org.mockito.MockitoAnnotations.openMocks;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
-
 import org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(Parameterized.class)
+@ExtendWith(MockitoExtension.class)
 public final class ArrowFlightConnectionPropertyTest {
 
-  @Mock
-  public Properties properties;
+  @Mock public Properties properties;
 
   private AutoCloseable mockitoResource;
 
-  @Parameter
   public ArrowFlightConnectionProperty arrowFlightConnectionProperty;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     mockitoResource = openMocks(this);
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     close(mockitoResource);
   }
 
-  @Test
-  public void testWrapIsUnsupported() {
-    ThrowableAssertionUtils.simpleAssertThrowableClass(UnsupportedOperationException.class,
-        () -> arrowFlightConnectionProperty.wrap(properties));
+  @ParameterizedTest
+  @MethodSource("provideParameters")
+  public void testWrapIsUnsupported(ArrowFlightConnectionProperty property) {
+    this.arrowFlightConnectionProperty = property;
+    ThrowableAssertionUtils.simpleAssertThrowableClass(
+        UnsupportedOperationException.class, () -> arrowFlightConnectionProperty.wrap(properties));
   }
 
-  @Test
-  public void testRequiredPropertyThrows() {
-    Assume.assumeTrue(arrowFlightConnectionProperty.required());
-    ThrowableAssertionUtils.simpleAssertThrowableClass(IllegalStateException.class,
-        () -> arrowFlightConnectionProperty.get(new Properties()));
+  @ParameterizedTest
+  @MethodSource("provideParameters")
+  public void testRequiredPropertyThrows(ArrowFlightConnectionProperty property) {
+    this.arrowFlightConnectionProperty = property;
+    assumeTrue(arrowFlightConnectionProperty.required());
+    ThrowableAssertionUtils.simpleAssertThrowableClass(
+        IllegalStateException.class, () -> arrowFlightConnectionProperty.get(new Properties()));
   }
 
-  @Test
-  public void testOptionalPropertyReturnsDefault() {
-    Assume.assumeTrue(!arrowFlightConnectionProperty.required());
-    Assert.assertEquals(arrowFlightConnectionProperty.defaultValue(),
+  @ParameterizedTest
+  @MethodSource("provideParameters")
+  public void testOptionalPropertyReturnsDefault(ArrowFlightConnectionProperty property) {
+    this.arrowFlightConnectionProperty = property;
+    assumeTrue(!arrowFlightConnectionProperty.required());
+    assertEquals(
+        arrowFlightConnectionProperty.defaultValue(),
         arrowFlightConnectionProperty.get(new Properties()));
   }
 
-  @Parameters
-  public static List<Object[]> provideParameters() {
+  public static List<Arguments> provideParameters() {
     final ArrowFlightConnectionProperty[] arrowFlightConnectionProperties =
         ArrowFlightConnectionProperty.values();
-    final List<Object[]> parameters = new ArrayList<>(arrowFlightConnectionProperties.length);
-    for (final ArrowFlightConnectionProperty arrowFlightConnectionProperty : arrowFlightConnectionProperties) {
-      parameters.add(new Object[] {arrowFlightConnectionProperty});
+    final List<Arguments> parameters = new ArrayList<>(arrowFlightConnectionProperties.length);
+    for (final ArrowFlightConnectionProperty arrowFlightConnectionProperty :
+        arrowFlightConnectionProperties) {
+      parameters.add(Arguments.of(arrowFlightConnectionProperty));
     }
     return parameters;
   }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ConnectionWrapperTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ConnectionWrapperTest.java
index 6044f3a363c7e..b481ef43522ef 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ConnectionWrapperTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ConnectionWrapperTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import static java.lang.String.format;
@@ -24,6 +23,8 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -35,20 +36,17 @@
 import java.sql.Statement;
 import java.util.Arrays;
 import java.util.Random;
-
 import org.apache.arrow.driver.jdbc.ArrowFlightConnection;
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.calcite.avatica.AvaticaConnection;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public final class ConnectionWrapperTest {
 
   private static final String SCHEMA_NAME = "SCHEMA";
@@ -66,104 +64,116 @@ public final class ConnectionWrapperTest {
   private static final Random RANDOM = new Random(Long.MAX_VALUE);
   private static final int TIMEOUT = RANDOM.nextInt(Integer.MAX_VALUE);
 
-  @Mock
-  public AvaticaConnection underlyingConnection;
+  @Mock public AvaticaConnection underlyingConnection;
   private ConnectionWrapper connectionWrapper;
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
 
-  @Before
+  @BeforeEach
   public void setUp() {
     connectionWrapper = new ConnectionWrapper(underlyingConnection);
   }
 
-  @After
+  @AfterEach
   public void tearDown() throws Exception {
     AutoCloseables.close(connectionWrapper, underlyingConnection);
   }
 
   @Test
   public void testUnwrappingUnderlyingConnectionShouldReturnUnderlyingConnection() {
-    collector.checkThat(
-        collector.checkSucceeds(() -> connectionWrapper.unwrap(Object.class)),
+    assertThat(
+        assertDoesNotThrow(() -> connectionWrapper.unwrap(Object.class)),
         is(sameInstance(underlyingConnection)));
-    collector.checkThat(
-        collector.checkSucceeds(() -> connectionWrapper.unwrap(Connection.class)),
+    assertThat(
+        assertDoesNotThrow(() -> connectionWrapper.unwrap(Connection.class)),
         is(sameInstance(underlyingConnection)));
-    collector.checkThat(
-        collector.checkSucceeds(() -> connectionWrapper.unwrap(AvaticaConnection.class)),
+    assertThat(
+        assertDoesNotThrow(() -> connectionWrapper.unwrap(AvaticaConnection.class)),
         is(sameInstance(underlyingConnection)));
-    ThrowableAssertionUtils.simpleAssertThrowableClass(ClassCastException.class,
-        () -> connectionWrapper.unwrap(ArrowFlightConnection.class));
-    ThrowableAssertionUtils.simpleAssertThrowableClass(ClassCastException.class,
-        () -> connectionWrapper.unwrap(ConnectionWrapper.class));
+    ThrowableAssertionUtils.simpleAssertThrowableClass(
+        ClassCastException.class, () -> connectionWrapper.unwrap(ArrowFlightConnection.class));
+    ThrowableAssertionUtils.simpleAssertThrowableClass(
+        ClassCastException.class, () -> connectionWrapper.unwrap(ConnectionWrapper.class));
   }
 
   @Test
   public void testCreateStatementShouldCreateStatementFromUnderlyingConnection()
       throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.createStatement(),
         is(sameInstance(verify(underlyingConnection, times(1)).createStatement())));
-    collector.checkThat(
-        connectionWrapper.createStatement(RESULT_SET_TYPE, RESULT_SET_CONCURRENCY,
-            RESULT_SET_HOLDABILITY),
-        is(verify(underlyingConnection, times(1))
-            .createStatement(RESULT_SET_TYPE, RESULT_SET_CONCURRENCY, RESULT_SET_HOLDABILITY)));
-    collector.checkThat(
+    assertThat(
+        connectionWrapper.createStatement(
+            RESULT_SET_TYPE, RESULT_SET_CONCURRENCY, RESULT_SET_HOLDABILITY),
+        is(
+            verify(underlyingConnection, times(1))
+                .createStatement(RESULT_SET_TYPE, RESULT_SET_CONCURRENCY, RESULT_SET_HOLDABILITY)));
+    assertThat(
         connectionWrapper.createStatement(RESULT_SET_TYPE, RESULT_SET_CONCURRENCY),
-        is(verify(underlyingConnection, times(1))
-            .createStatement(RESULT_SET_TYPE, RESULT_SET_CONCURRENCY)));
+        is(
+            verify(underlyingConnection, times(1))
+                .createStatement(RESULT_SET_TYPE, RESULT_SET_CONCURRENCY)));
   }
 
   @Test
   public void testPrepareStatementShouldPrepareStatementFromUnderlyingConnection()
       throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.prepareStatement(PLACEHOLDER_QUERY),
-        is(sameInstance(
-            verify(underlyingConnection, times(1)).prepareStatement(PLACEHOLDER_QUERY))));
-    collector.checkThat(
+        is(
+            sameInstance(
+                verify(underlyingConnection, times(1)).prepareStatement(PLACEHOLDER_QUERY))));
+    assertThat(
         connectionWrapper.prepareStatement(PLACEHOLDER_QUERY, COLUMN_INDICES),
-        is(allOf(sameInstance(verify(underlyingConnection, times(1))
-                .prepareStatement(PLACEHOLDER_QUERY, COLUMN_INDICES)),
-            nullValue())));
-    collector.checkThat(
+        is(
+            allOf(
+                sameInstance(
+                    verify(underlyingConnection, times(1))
+                        .prepareStatement(PLACEHOLDER_QUERY, COLUMN_INDICES)),
+                nullValue())));
+    assertThat(
         connectionWrapper.prepareStatement(PLACEHOLDER_QUERY, COLUMN_NAMES),
-        is(allOf(sameInstance(verify(underlyingConnection, times(1))
-                .prepareStatement(PLACEHOLDER_QUERY, COLUMN_NAMES)),
-            nullValue())));
-    collector.checkThat(
-        connectionWrapper.prepareStatement(PLACEHOLDER_QUERY, RESULT_SET_TYPE,
-            RESULT_SET_CONCURRENCY),
-        is(allOf(sameInstance(verify(underlyingConnection, times(1))
-                .prepareStatement(PLACEHOLDER_QUERY, RESULT_SET_TYPE, RESULT_SET_CONCURRENCY)),
-            nullValue())));
-    collector.checkThat(
+        is(
+            allOf(
+                sameInstance(
+                    verify(underlyingConnection, times(1))
+                        .prepareStatement(PLACEHOLDER_QUERY, COLUMN_NAMES)),
+                nullValue())));
+    assertThat(
+        connectionWrapper.prepareStatement(
+            PLACEHOLDER_QUERY, RESULT_SET_TYPE, RESULT_SET_CONCURRENCY),
+        is(
+            allOf(
+                sameInstance(
+                    verify(underlyingConnection, times(1))
+                        .prepareStatement(
+                            PLACEHOLDER_QUERY, RESULT_SET_TYPE, RESULT_SET_CONCURRENCY)),
+                nullValue())));
+    assertThat(
         connectionWrapper.prepareStatement(PLACEHOLDER_QUERY, GENERATED_KEYS),
-        is(allOf(sameInstance(verify(underlyingConnection, times(1))
-                .prepareStatement(PLACEHOLDER_QUERY, GENERATED_KEYS)),
-            nullValue())));
+        is(
+            allOf(
+                sameInstance(
+                    verify(underlyingConnection, times(1))
+                        .prepareStatement(PLACEHOLDER_QUERY, GENERATED_KEYS)),
+                nullValue())));
   }
 
   @Test
   public void testPrepareCallShouldPrepareCallFromUnderlyingConnection() throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.prepareCall(PLACEHOLDER_QUERY),
-        is(sameInstance(
-            verify(underlyingConnection, times(1)).prepareCall(PLACEHOLDER_QUERY))));
-    collector.checkThat(
+        is(sameInstance(verify(underlyingConnection, times(1)).prepareCall(PLACEHOLDER_QUERY))));
+    assertThat(
         connectionWrapper.prepareCall(PLACEHOLDER_QUERY, RESULT_SET_TYPE, RESULT_SET_CONCURRENCY),
-        is(verify(underlyingConnection, times(1))
-            .prepareCall(PLACEHOLDER_QUERY, RESULT_SET_TYPE, RESULT_SET_CONCURRENCY)));
+        is(
+            verify(underlyingConnection, times(1))
+                .prepareCall(PLACEHOLDER_QUERY, RESULT_SET_TYPE, RESULT_SET_CONCURRENCY)));
   }
 
   @Test
   public void testNativeSqlShouldGetNativeSqlFromUnderlyingConnection() throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.nativeSQL(PLACEHOLDER_QUERY),
-        is(sameInstance(
-            verify(underlyingConnection, times(1)).nativeSQL(PLACEHOLDER_QUERY))));
+        is(sameInstance(verify(underlyingConnection, times(1)).nativeSQL(PLACEHOLDER_QUERY))));
   }
 
   @Test
@@ -176,7 +186,7 @@ public void testSetAutoCommitShouldSetAutoCommitInUnderlyingConnection() throws
 
   @Test
   public void testGetAutoCommitShouldGetAutoCommitFromUnderlyingConnection() throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.getAutoCommit(),
         is(verify(underlyingConnection, times(1)).getAutoCommit()));
   }
@@ -201,13 +211,12 @@ public void testCloseShouldCloseUnderlyingConnection() throws SQLException {
 
   @Test
   public void testIsClosedShouldGetStatusFromUnderlyingConnection() throws SQLException {
-    collector.checkThat(
-        connectionWrapper.isClosed(), is(verify(underlyingConnection, times(1)).isClosed()));
+    assertThat(connectionWrapper.isClosed(), is(verify(underlyingConnection, times(1)).isClosed()));
   }
 
   @Test
   public void testGetMetadataShouldGetMetadataFromUnderlyingConnection() throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.getMetaData(), is(verify(underlyingConnection, times(1)).getMetaData()));
   }
 
@@ -221,8 +230,7 @@ public void testSetReadOnlyShouldSetUnderlyingConnectionAsReadOnly() throws SQLE
 
   @Test
   public void testSetIsReadOnlyShouldGetStatusFromUnderlyingConnection() throws SQLException {
-    collector.checkThat(connectionWrapper.isReadOnly(),
-        is(verify(underlyingConnection).isReadOnly()));
+    assertThat(connectionWrapper.isReadOnly(), is(verify(underlyingConnection).isReadOnly()));
   }
 
   @Test
@@ -234,7 +242,7 @@ public void testSetCatalogShouldSetCatalogInUnderlyingConnection() throws SQLExc
 
   @Test
   public void testGetCatalogShouldGetCatalogFromUnderlyingConnection() throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.getCatalog(),
         is(allOf(sameInstance(verify(underlyingConnection, times(1)).getCatalog()), nullValue())));
   }
@@ -248,18 +256,16 @@ public void setTransactionIsolationShouldSetUnderlyingTransactionIsolation() thr
 
   @Test
   public void getTransactionIsolationShouldGetUnderlyingConnectionIsolation() throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.getTransactionIsolation(),
         is(equalTo(verify(underlyingConnection, times(1)).getTransactionIsolation())));
   }
 
   @Test
   public void getWarningShouldGetWarningsFromUnderlyingConnection() throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.getWarnings(),
-        is(allOf(
-            sameInstance(verify(underlyingConnection, times(1)).getWarnings()),
-            nullValue())));
+        is(allOf(sameInstance(verify(underlyingConnection, times(1)).getWarnings()), nullValue())));
   }
 
   @Test
@@ -271,9 +277,8 @@ public void testClearWarningShouldClearWarningsFromUnderlyingConnection() throws
   @Test
   public void getTypeMapShouldGetTypeMapFromUnderlyingConnection() throws SQLException {
     when(underlyingConnection.getTypeMap()).thenReturn(null);
-    collector.checkThat(
-        connectionWrapper.getTypeMap(),
-        is(verify(underlyingConnection, times(1)).getTypeMap()));
+    assertThat(
+        connectionWrapper.getTypeMap(), is(verify(underlyingConnection, times(1)).getTypeMap()));
   }
 
   @Test
@@ -290,22 +295,21 @@ public void testSetHoldabilityShouldSetUnderlyingConnection() throws SQLExceptio
 
   @Test
   public void testGetHoldabilityShouldGetHoldabilityFromUnderlyingConnection() throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.getHoldability(),
         is(equalTo(verify(underlyingConnection, times(1)).getHoldability())));
   }
 
   @Test
   public void testSetSavepointShouldSetSavepointInUnderlyingConnection() throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.setSavepoint(),
-        is(allOf(
-            sameInstance(verify(underlyingConnection, times(1)).setSavepoint()),
-            nullValue())));
-    collector.checkThat(
+        is(
+            allOf(
+                sameInstance(verify(underlyingConnection, times(1)).setSavepoint()), nullValue())));
+    assertThat(
         connectionWrapper.setSavepoint(SAVEPOINT_NAME),
-        is(sameInstance(
-            verify(underlyingConnection, times(1)).setSavepoint(SAVEPOINT_NAME))));
+        is(sameInstance(verify(underlyingConnection, times(1)).setSavepoint(SAVEPOINT_NAME))));
   }
 
   @Test
@@ -323,39 +327,37 @@ public void testReleaseSavepointShouldReleaseSavepointFromUnderlyingConnection()
 
   @Test
   public void testCreateClobShouldCreateClobFromUnderlyingConnection() throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.createClob(),
-        is(allOf(sameInstance(
-            verify(underlyingConnection, times(1)).createClob()), nullValue())));
+        is(allOf(sameInstance(verify(underlyingConnection, times(1)).createClob()), nullValue())));
   }
 
   @Test
   public void testCreateBlobShouldCreateBlobFromUnderlyingConnection() throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.createBlob(),
-        is(allOf(sameInstance(
-            verify(underlyingConnection, times(1)).createBlob()), nullValue())));
+        is(allOf(sameInstance(verify(underlyingConnection, times(1)).createBlob()), nullValue())));
   }
 
   @Test
   public void testCreateNClobShouldCreateNClobFromUnderlyingConnection() throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.createNClob(),
-        is(allOf(sameInstance(
-            verify(underlyingConnection, times(1)).createNClob()), nullValue())));
+        is(allOf(sameInstance(verify(underlyingConnection, times(1)).createNClob()), nullValue())));
   }
 
   @Test
   public void testCreateSQLXMLShouldCreateSQLXMLFromUnderlyingConnection() throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.createSQLXML(),
-        is(allOf(sameInstance(
-            verify(underlyingConnection, times(1)).createSQLXML()), nullValue())));
+        is(
+            allOf(
+                sameInstance(verify(underlyingConnection, times(1)).createSQLXML()), nullValue())));
   }
 
   @Test
   public void testIsValidShouldReturnWhetherUnderlyingConnectionIsValid() throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.isValid(TIMEOUT),
         is(verify(underlyingConnection, times(1)).isValid(TIMEOUT)));
   }
@@ -369,40 +371,42 @@ public void testSetClientInfoShouldSetClientInfoInUnderlyingConnection()
 
   @Test
   public void testGetClientInfoShouldGetClientInfoFromUnderlyingConnection() throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.getClientInfo(CLIENT_INFO),
-        is(allOf(
-            sameInstance(
-                verify(underlyingConnection, times(1)).getClientInfo(CLIENT_INFO)),
-            nullValue())));
-    collector.checkThat(
+        is(
+            allOf(
+                sameInstance(verify(underlyingConnection, times(1)).getClientInfo(CLIENT_INFO)),
+                nullValue())));
+    assertThat(
         connectionWrapper.getClientInfo(),
-        is(allOf(
-            sameInstance(
-                verify(underlyingConnection, times(1)).getClientInfo()),
-            nullValue())));
+        is(
+            allOf(
+                sameInstance(verify(underlyingConnection, times(1)).getClientInfo()),
+                nullValue())));
   }
 
   @Test
   public void testCreateArrayOfShouldCreateArrayFromUnderlyingConnection() throws SQLException {
     final Object[] elements = range(0, 100).boxed().toArray();
-    collector.checkThat(
+    assertThat(
         connectionWrapper.createArrayOf(TYPE_NAME, elements),
-        is(allOf(
-            sameInstance(
-                verify(underlyingConnection, times(1)).createArrayOf(TYPE_NAME, elements)),
-            nullValue())));
+        is(
+            allOf(
+                sameInstance(
+                    verify(underlyingConnection, times(1)).createArrayOf(TYPE_NAME, elements)),
+                nullValue())));
   }
 
   @Test
   public void testCreateStructShouldCreateStructFromUnderlyingConnection() throws SQLException {
     final Object[] attributes = range(0, 120).boxed().toArray();
-    collector.checkThat(
+    assertThat(
         connectionWrapper.createStruct(TYPE_NAME, attributes),
-        is(allOf(
-            sameInstance(
-                verify(underlyingConnection, times(1)).createStruct(TYPE_NAME, attributes)),
-            nullValue())));
+        is(
+            allOf(
+                sameInstance(
+                    verify(underlyingConnection, times(1)).createStruct(TYPE_NAME, attributes)),
+                nullValue())));
   }
 
   @Test
@@ -413,11 +417,9 @@ public void testSetSchemaShouldSetSchemaInUnderlyingConnection() throws SQLExcep
 
   @Test
   public void testGetSchemaShouldGetSchemaFromUnderlyingConnection() throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.getSchema(),
-        is(allOf(
-            sameInstance(verify(underlyingConnection, times(1)).getSchema()),
-            nullValue())));
+        is(allOf(sameInstance(verify(underlyingConnection, times(1)).getSchema()), nullValue())));
   }
 
   @Test
@@ -436,7 +438,7 @@ public void testSetNetworkTimeoutShouldSetNetworkTimeoutInUnderlyingConnection()
   @Test
   public void testGetNetworkTimeoutShouldGetNetworkTimeoutFromUnderlyingConnection()
       throws SQLException {
-    collector.checkThat(
+    assertThat(
         connectionWrapper.getNetworkTimeout(),
         is(equalTo(verify(underlyingConnection, times(1)).getNetworkTimeout())));
   }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ConvertUtilsTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ConvertUtilsTest.java
index 5cea3749283d7..f6f549b5ed3d8 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ConvertUtilsTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ConvertUtilsTest.java
@@ -14,45 +14,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
 
+import com.google.common.collect.ImmutableList;
 import java.util.List;
-
 import org.apache.arrow.flight.sql.FlightSqlColumnMetadata;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.calcite.avatica.ColumnMetaData;
 import org.apache.calcite.avatica.proto.Common;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-
-import com.google.common.collect.ImmutableList;
+import org.junit.jupiter.api.Test;
 
 public class ConvertUtilsTest {
 
-  @Rule
-  public ErrorCollector collector = new ErrorCollector();
-
   @Test
   public void testShouldSetOnColumnMetaDataBuilder() {
 
     final Common.ColumnMetaData.Builder builder = Common.ColumnMetaData.newBuilder();
-    final FlightSqlColumnMetadata expectedColumnMetaData = new FlightSqlColumnMetadata.Builder()
-        .catalogName("catalog1")
-        .schemaName("schema1")
-        .tableName("table1")
-        .isAutoIncrement(true)
-        .isCaseSensitive(true)
-        .isReadOnly(true)
-        .isSearchable(true)
-        .precision(20)
-        .scale(10)
-        .build();
+    final FlightSqlColumnMetadata expectedColumnMetaData =
+        new FlightSqlColumnMetadata.Builder()
+            .catalogName("catalog1")
+            .schemaName("schema1")
+            .tableName("table1")
+            .isAutoIncrement(true)
+            .isCaseSensitive(true)
+            .isReadOnly(true)
+            .isSearchable(true)
+            .precision(20)
+            .scale(10)
+            .build();
     ConvertUtils.setOnColumnMetaDataBuilder(builder, expectedColumnMetaData.getMetadataMap());
     assertBuilder(builder, expectedColumnMetaData);
   }
@@ -60,60 +54,70 @@ public void testShouldSetOnColumnMetaDataBuilder() {
   @Test
   public void testShouldConvertArrowFieldsToColumnMetaDataList() {
 
-    final List<Field> listField = ImmutableList.of(
-        new Field("col1",
-            new FieldType(true, ArrowType.Utf8.INSTANCE, null,
-                new FlightSqlColumnMetadata.Builder()
-                    .catalogName("catalog1")
-                    .schemaName("schema1")
-                    .tableName("table1")
-                    .build().getMetadataMap()
-            ), null));
-
-    final List<ColumnMetaData> expectedColumnMetaData = ImmutableList.of(
-        ColumnMetaData.fromProto(
-            Common.ColumnMetaData.newBuilder()
-                .setCatalogName("catalog1")
-                .setSchemaName("schema1")
-                .setTableName("table1")
-                .build()));
-
-    final List<ColumnMetaData> actualColumnMetaData = ConvertUtils.convertArrowFieldsToColumnMetaDataList(listField);
+    final List<Field> listField =
+        ImmutableList.of(
+            new Field(
+                "col1",
+                new FieldType(
+                    true,
+                    ArrowType.Utf8.INSTANCE,
+                    null,
+                    new FlightSqlColumnMetadata.Builder()
+                        .catalogName("catalog1")
+                        .schemaName("schema1")
+                        .tableName("table1")
+                        .build()
+                        .getMetadataMap()),
+                null));
+
+    final List<ColumnMetaData> expectedColumnMetaData =
+        ImmutableList.of(
+            ColumnMetaData.fromProto(
+                Common.ColumnMetaData.newBuilder()
+                    .setCatalogName("catalog1")
+                    .setSchemaName("schema1")
+                    .setTableName("table1")
+                    .build()));
+
+    final List<ColumnMetaData> actualColumnMetaData =
+        ConvertUtils.convertArrowFieldsToColumnMetaDataList(listField);
     assertColumnMetaData(expectedColumnMetaData, actualColumnMetaData);
   }
 
-  private void assertColumnMetaData(final List<ColumnMetaData> expected, final List<ColumnMetaData> actual) {
-    collector.checkThat(expected.size(), equalTo(actual.size()));
+  private void assertColumnMetaData(
+      final List<ColumnMetaData> expected, final List<ColumnMetaData> actual) {
+    assertThat(expected.size(), equalTo(actual.size()));
     int size = expected.size();
     for (int i = 0; i < size; i++) {
       final ColumnMetaData expectedColumnMetaData = expected.get(i);
       final ColumnMetaData actualColumnMetaData = actual.get(i);
-      collector.checkThat(expectedColumnMetaData.catalogName, equalTo(actualColumnMetaData.catalogName));
-      collector.checkThat(expectedColumnMetaData.schemaName, equalTo(actualColumnMetaData.schemaName));
-      collector.checkThat(expectedColumnMetaData.tableName, equalTo(actualColumnMetaData.tableName));
-      collector.checkThat(expectedColumnMetaData.readOnly, equalTo(actualColumnMetaData.readOnly));
-      collector.checkThat(expectedColumnMetaData.autoIncrement, equalTo(actualColumnMetaData.autoIncrement));
-      collector.checkThat(expectedColumnMetaData.precision, equalTo(actualColumnMetaData.precision));
-      collector.checkThat(expectedColumnMetaData.scale, equalTo(actualColumnMetaData.scale));
-      collector.checkThat(expectedColumnMetaData.caseSensitive, equalTo(actualColumnMetaData.caseSensitive));
-      collector.checkThat(expectedColumnMetaData.searchable, equalTo(actualColumnMetaData.searchable));
+      assertThat(expectedColumnMetaData.catalogName, equalTo(actualColumnMetaData.catalogName));
+      assertThat(expectedColumnMetaData.schemaName, equalTo(actualColumnMetaData.schemaName));
+      assertThat(expectedColumnMetaData.tableName, equalTo(actualColumnMetaData.tableName));
+      assertThat(expectedColumnMetaData.readOnly, equalTo(actualColumnMetaData.readOnly));
+      assertThat(expectedColumnMetaData.autoIncrement, equalTo(actualColumnMetaData.autoIncrement));
+      assertThat(expectedColumnMetaData.precision, equalTo(actualColumnMetaData.precision));
+      assertThat(expectedColumnMetaData.scale, equalTo(actualColumnMetaData.scale));
+      assertThat(expectedColumnMetaData.caseSensitive, equalTo(actualColumnMetaData.caseSensitive));
+      assertThat(expectedColumnMetaData.searchable, equalTo(actualColumnMetaData.searchable));
     }
   }
 
-  private void assertBuilder(final Common.ColumnMetaData.Builder builder,
-                             final FlightSqlColumnMetadata flightSqlColumnMetaData) {
+  private void assertBuilder(
+      final Common.ColumnMetaData.Builder builder,
+      final FlightSqlColumnMetadata flightSqlColumnMetaData) {
 
     final Integer precision = flightSqlColumnMetaData.getPrecision();
     final Integer scale = flightSqlColumnMetaData.getScale();
 
-    collector.checkThat(flightSqlColumnMetaData.getCatalogName(), equalTo(builder.getCatalogName()));
-    collector.checkThat(flightSqlColumnMetaData.getSchemaName(), equalTo(builder.getSchemaName()));
-    collector.checkThat(flightSqlColumnMetaData.getTableName(), equalTo(builder.getTableName()));
-    collector.checkThat(flightSqlColumnMetaData.isAutoIncrement(), equalTo(builder.getAutoIncrement()));
-    collector.checkThat(flightSqlColumnMetaData.isCaseSensitive(), equalTo(builder.getCaseSensitive()));
-    collector.checkThat(flightSqlColumnMetaData.isSearchable(), equalTo(builder.getSearchable()));
-    collector.checkThat(flightSqlColumnMetaData.isReadOnly(), equalTo(builder.getReadOnly()));
-    collector.checkThat(precision == null ? 0 : precision, equalTo(builder.getPrecision()));
-    collector.checkThat(scale == null ? 0 : scale, equalTo(builder.getScale()));
+    assertThat(flightSqlColumnMetaData.getCatalogName(), equalTo(builder.getCatalogName()));
+    assertThat(flightSqlColumnMetaData.getSchemaName(), equalTo(builder.getSchemaName()));
+    assertThat(flightSqlColumnMetaData.getTableName(), equalTo(builder.getTableName()));
+    assertThat(flightSqlColumnMetaData.isAutoIncrement(), equalTo(builder.getAutoIncrement()));
+    assertThat(flightSqlColumnMetaData.isCaseSensitive(), equalTo(builder.getCaseSensitive()));
+    assertThat(flightSqlColumnMetaData.isSearchable(), equalTo(builder.getSearchable()));
+    assertThat(flightSqlColumnMetaData.isReadOnly(), equalTo(builder.getReadOnly()));
+    assertThat(precision == null ? 0 : precision, equalTo(builder.getPrecision()));
+    assertThat(scale == null ? 0 : scale, equalTo(builder.getScale()));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/CoreMockedSqlProducers.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/CoreMockedSqlProducers.java
index a8e2e7f2e4ce5..8197d7d95f09a 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/CoreMockedSqlProducers.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/CoreMockedSqlProducers.java
@@ -14,13 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import static java.lang.String.format;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertAll;
 
+import com.google.common.collect.ImmutableList;
 import java.sql.Date;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -30,7 +32,6 @@
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.IntStream;
-
 import org.apache.arrow.flight.FlightProducer.ServerStreamListener;
 import org.apache.arrow.flight.sql.FlightSqlColumnMetadata;
 import org.apache.arrow.memory.BufferAllocator;
@@ -51,13 +52,8 @@
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.arrow.vector.util.Text;
-import org.junit.rules.ErrorCollector;
 
-import com.google.common.collect.ImmutableList;
-
-/**
- * Standard {@link MockFlightSqlProducer} instances for tests.
- */
+/** Standard {@link MockFlightSqlProducer} instances for tests. */
 // TODO Remove this once all tests are refactor to use only the queries they need.
 public final class CoreMockedSqlProducers {
 
@@ -86,209 +82,214 @@ public static MockFlightSqlProducer getLegacyProducer() {
   }
 
   private static void addQueryWithEmbeddedEmptyRoot(final MockFlightSqlProducer producer) {
-    final Schema querySchema = new Schema(ImmutableList.of(
-        new Field(
-            "ID",
-            new FieldType(true, new ArrowType.Int(64, true),
-                null),
-            null)
-    ));
+    final Schema querySchema =
+        new Schema(
+            ImmutableList.of(
+                new Field("ID", new FieldType(true, new ArrowType.Int(64, true), null), null)));
 
     final List<Consumer<ServerStreamListener>> resultProducers = new ArrayList<>();
-    Consumer<ServerStreamListener> dataRoot = listener -> {
-      try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-           final VectorSchemaRoot root = VectorSchemaRoot.create(querySchema, allocator)) {
-        root.allocateNew();
-        root.setRowCount(0);
-        listener.start(root);
-        listener.putNext(); // empty root
-        ((BigIntVector) root.getVector("ID")).setSafe(0, 100L);
-        root.setRowCount(1);
-        listener.putNext(); // data root
-        root.clear();
-        root.setRowCount(0);
-        listener.putNext(); // empty root
-        ((BigIntVector) root.getVector("ID")).setSafe(0, 100L);
-        root.setRowCount(1);
-        listener.putNext(); // data root
-      } finally {
-        listener.completed();
-      }
-    };
+    Consumer<ServerStreamListener> dataRoot =
+        listener -> {
+          try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
+              final VectorSchemaRoot root = VectorSchemaRoot.create(querySchema, allocator)) {
+            root.allocateNew();
+            root.setRowCount(0);
+            listener.start(root);
+            listener.putNext(); // empty root
+            ((BigIntVector) root.getVector("ID")).setSafe(0, 100L);
+            root.setRowCount(1);
+            listener.putNext(); // data root
+            root.clear();
+            root.setRowCount(0);
+            listener.putNext(); // empty root
+            ((BigIntVector) root.getVector("ID")).setSafe(0, 100L);
+            root.setRowCount(1);
+            listener.putNext(); // data root
+          } finally {
+            listener.completed();
+          }
+        };
     resultProducers.add(dataRoot);
     producer.addSelectQuery(LEGACY_REGULAR_WITH_EMPTY_SQL_CMD, querySchema, resultProducers);
   }
 
   private static void addLegacyRegularSqlCmdSupport(final MockFlightSqlProducer producer) {
-    final Schema querySchema = new Schema(ImmutableList.of(
-        new Field(
-            "ID",
-            new FieldType(true, new ArrowType.Int(64, true),
-                null),
-            null),
-        new Field(
-            "Name",
-            new FieldType(true, new ArrowType.Utf8(), null),
-            null),
-        new Field(
-            "Age",
-            new FieldType(true, new ArrowType.Int(32, false),
-                null),
-            null),
-        new Field(
-            "Salary",
-            new FieldType(true, new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE),
-                null),
-            null),
-        new Field(
-            "Hire Date",
-            new FieldType(true, new ArrowType.Date(DateUnit.DAY), null),
-            null),
-        new Field(
-            "Last Sale",
-            new FieldType(true, new ArrowType.Timestamp(TimeUnit.MILLISECOND, null),
-                null),
-            null)
-    ));
+    final Schema querySchema =
+        new Schema(
+            ImmutableList.of(
+                new Field("ID", new FieldType(true, new ArrowType.Int(64, true), null), null),
+                new Field("Name", new FieldType(true, new ArrowType.Utf8(), null), null),
+                new Field("Age", new FieldType(true, new ArrowType.Int(32, false), null), null),
+                new Field(
+                    "Salary",
+                    new FieldType(
+                        true, new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE), null),
+                    null),
+                new Field(
+                    "Hire Date", new FieldType(true, new ArrowType.Date(DateUnit.DAY), null), null),
+                new Field(
+                    "Last Sale",
+                    new FieldType(true, new ArrowType.Timestamp(TimeUnit.MILLISECOND, null), null),
+                    null)));
     final List<Consumer<ServerStreamListener>> resultProducers = new ArrayList<>();
-    IntStream.range(0, 10).forEach(page -> {
-      resultProducers.add(listener -> {
-        final int rowsPerPage = 5000;
-        try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-             final VectorSchemaRoot root = VectorSchemaRoot.create(querySchema, allocator)) {
-          root.allocateNew();
-          listener.start(root);
-          int batchSize = 500;
-          int indexOnBatch = 0;
-          int resultsOffset = page * rowsPerPage;
-          for (int i = 0; i < rowsPerPage; i++) {
-            ((BigIntVector) root.getVector("ID"))
-                .setSafe(indexOnBatch, (long) Integer.MAX_VALUE + 1 + i + resultsOffset);
-            ((VarCharVector) root.getVector("Name"))
-                .setSafe(indexOnBatch, new Text("Test Name #" + (resultsOffset + i)));
-            ((UInt4Vector) root.getVector("Age"))
-                .setSafe(indexOnBatch, (int) Short.MAX_VALUE + 1 + i + resultsOffset);
-            ((Float8Vector) root.getVector("Salary"))
-                .setSafe(indexOnBatch,
-                    Math.scalb((double) (i + resultsOffset) / 2, i + resultsOffset));
-            ((DateDayVector) root.getVector("Hire Date"))
-                .setSafe(indexOnBatch, i + resultsOffset);
-            ((TimeStampMilliVector) root.getVector("Last Sale"))
-                .setSafe(indexOnBatch, Long.MAX_VALUE - i - resultsOffset);
-            indexOnBatch++;
-            if (indexOnBatch == batchSize) {
-              root.setRowCount(indexOnBatch);
-              if (listener.isCancelled()) {
-                return;
-              }
-              listener.putNext();
-              root.allocateNew();
-              indexOnBatch = 0;
-            }
-          }
-          if (listener.isCancelled()) {
-            return;
-          }
-          root.setRowCount(indexOnBatch);
-          listener.putNext();
-        } finally {
-          listener.completed();
-        }
-      });
-    });
+    IntStream.range(0, 10)
+        .forEach(
+            page -> {
+              resultProducers.add(
+                  listener -> {
+                    final int rowsPerPage = 5000;
+                    try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
+                        final VectorSchemaRoot root =
+                            VectorSchemaRoot.create(querySchema, allocator)) {
+                      root.allocateNew();
+                      listener.start(root);
+                      int batchSize = 500;
+                      int indexOnBatch = 0;
+                      int resultsOffset = page * rowsPerPage;
+                      for (int i = 0; i < rowsPerPage; i++) {
+                        ((BigIntVector) root.getVector("ID"))
+                            .setSafe(
+                                indexOnBatch, (long) Integer.MAX_VALUE + 1 + i + resultsOffset);
+                        ((VarCharVector) root.getVector("Name"))
+                            .setSafe(indexOnBatch, new Text("Test Name #" + (resultsOffset + i)));
+                        ((UInt4Vector) root.getVector("Age"))
+                            .setSafe(indexOnBatch, (int) Short.MAX_VALUE + 1 + i + resultsOffset);
+                        ((Float8Vector) root.getVector("Salary"))
+                            .setSafe(
+                                indexOnBatch,
+                                Math.scalb((double) (i + resultsOffset) / 2, i + resultsOffset));
+                        ((DateDayVector) root.getVector("Hire Date"))
+                            .setSafe(indexOnBatch, i + resultsOffset);
+                        ((TimeStampMilliVector) root.getVector("Last Sale"))
+                            .setSafe(indexOnBatch, Long.MAX_VALUE - i - resultsOffset);
+                        indexOnBatch++;
+                        if (indexOnBatch == batchSize) {
+                          root.setRowCount(indexOnBatch);
+                          if (listener.isCancelled()) {
+                            return;
+                          }
+                          listener.putNext();
+                          root.allocateNew();
+                          indexOnBatch = 0;
+                        }
+                      }
+                      if (listener.isCancelled()) {
+                        return;
+                      }
+                      root.setRowCount(indexOnBatch);
+                      listener.putNext();
+                    } finally {
+                      listener.completed();
+                    }
+                  });
+            });
     producer.addSelectQuery(LEGACY_REGULAR_SQL_CMD, querySchema, resultProducers);
   }
 
   private static void addLegacyMetadataSqlCmdSupport(final MockFlightSqlProducer producer) {
-    final Schema metadataSchema = new Schema(ImmutableList.of(
-        new Field(
-            "integer0",
-            new FieldType(true, new ArrowType.Int(64, true),
-                null, new FlightSqlColumnMetadata.Builder()
-                .catalogName("CATALOG_NAME_1")
-                .schemaName("SCHEMA_NAME_1")
-                .tableName("TABLE_NAME_1")
-                .typeName("TYPE_NAME_1")
-                .precision(10)
-                .scale(0)
-                .isAutoIncrement(true)
-                .isCaseSensitive(false)
-                .isReadOnly(true)
-                .isSearchable(true)
-                .build().getMetadataMap()),
-            null),
-        new Field(
-            "string1",
-            new FieldType(true, new ArrowType.Utf8(),
-                null, new FlightSqlColumnMetadata.Builder()
-                .catalogName("CATALOG_NAME_2")
-                .schemaName("SCHEMA_NAME_2")
-                .tableName("TABLE_NAME_2")
-                .typeName("TYPE_NAME_2")
-                .precision(65535)
-                .scale(0)
-                .isAutoIncrement(false)
-                .isCaseSensitive(true)
-                .isReadOnly(false)
-                .isSearchable(true)
-                .build().getMetadataMap()),
-            null),
-        new Field(
-            "float2",
-            new FieldType(true, new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE),
-                null, new FlightSqlColumnMetadata.Builder()
-                .catalogName("CATALOG_NAME_3")
-                .schemaName("SCHEMA_NAME_3")
-                .tableName("TABLE_NAME_3")
-                .typeName("TYPE_NAME_3")
-                .precision(15)
-                .scale(20)
-                .isAutoIncrement(false)
-                .isCaseSensitive(false)
-                .isReadOnly(false)
-                .isSearchable(true)
-                .build().getMetadataMap()),
-            null)));
-    final Consumer<ServerStreamListener> formula = listener -> {
-      try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-           final VectorSchemaRoot root = VectorSchemaRoot.create(metadataSchema, allocator)) {
-        root.allocateNew();
-        ((BigIntVector) root.getVector("integer0")).setSafe(0, 1);
-        ((VarCharVector) root.getVector("string1")).setSafe(0, new Text("teste"));
-        ((Float4Vector) root.getVector("float2")).setSafe(0, (float) 4.1);
-        root.setRowCount(1);
-        listener.start(root);
-        listener.putNext();
-      } finally {
-        listener.completed();
-      }
-    };
-    producer.addSelectQuery(LEGACY_METADATA_SQL_CMD, metadataSchema,
-        Collections.singletonList(formula));
+    final Schema metadataSchema =
+        new Schema(
+            ImmutableList.of(
+                new Field(
+                    "integer0",
+                    new FieldType(
+                        true,
+                        new ArrowType.Int(64, true),
+                        null,
+                        new FlightSqlColumnMetadata.Builder()
+                            .catalogName("CATALOG_NAME_1")
+                            .schemaName("SCHEMA_NAME_1")
+                            .tableName("TABLE_NAME_1")
+                            .typeName("TYPE_NAME_1")
+                            .precision(10)
+                            .scale(0)
+                            .isAutoIncrement(true)
+                            .isCaseSensitive(false)
+                            .isReadOnly(true)
+                            .isSearchable(true)
+                            .build()
+                            .getMetadataMap()),
+                    null),
+                new Field(
+                    "string1",
+                    new FieldType(
+                        true,
+                        new ArrowType.Utf8(),
+                        null,
+                        new FlightSqlColumnMetadata.Builder()
+                            .catalogName("CATALOG_NAME_2")
+                            .schemaName("SCHEMA_NAME_2")
+                            .tableName("TABLE_NAME_2")
+                            .typeName("TYPE_NAME_2")
+                            .precision(65535)
+                            .scale(0)
+                            .isAutoIncrement(false)
+                            .isCaseSensitive(true)
+                            .isReadOnly(false)
+                            .isSearchable(true)
+                            .build()
+                            .getMetadataMap()),
+                    null),
+                new Field(
+                    "float2",
+                    new FieldType(
+                        true,
+                        new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE),
+                        null,
+                        new FlightSqlColumnMetadata.Builder()
+                            .catalogName("CATALOG_NAME_3")
+                            .schemaName("SCHEMA_NAME_3")
+                            .tableName("TABLE_NAME_3")
+                            .typeName("TYPE_NAME_3")
+                            .precision(15)
+                            .scale(20)
+                            .isAutoIncrement(false)
+                            .isCaseSensitive(false)
+                            .isReadOnly(false)
+                            .isSearchable(true)
+                            .build()
+                            .getMetadataMap()),
+                    null)));
+    final Consumer<ServerStreamListener> formula =
+        listener -> {
+          try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
+              final VectorSchemaRoot root = VectorSchemaRoot.create(metadataSchema, allocator)) {
+            root.allocateNew();
+            ((BigIntVector) root.getVector("integer0")).setSafe(0, 1);
+            ((VarCharVector) root.getVector("string1")).setSafe(0, new Text("teste"));
+            ((Float4Vector) root.getVector("float2")).setSafe(0, (float) 4.1);
+            root.setRowCount(1);
+            listener.start(root);
+            listener.putNext();
+          } finally {
+            listener.completed();
+          }
+        };
+    producer.addSelectQuery(
+        LEGACY_METADATA_SQL_CMD, metadataSchema, Collections.singletonList(formula));
   }
 
   private static void addLegacyCancellationSqlCmdSupport(final MockFlightSqlProducer producer) {
     producer.addSelectQuery(
         LEGACY_CANCELLATION_SQL_CMD,
-        new Schema(Collections.singletonList(new Field(
-            "integer0",
-            new FieldType(true, new ArrowType.Int(64, true), null),
-            null))),
-        Collections.singletonList(listener -> {
-          // Should keep hanging until canceled.
-        }));
+        new Schema(
+            Collections.singletonList(
+                new Field(
+                    "integer0", new FieldType(true, new ArrowType.Int(64, true), null), null))),
+        Collections.singletonList(
+            listener -> {
+              // Should keep hanging until canceled.
+            }));
   }
 
   /**
-   * Asserts that the values in the provided {@link ResultSet} are expected for the
-   * legacy {@link MockFlightSqlProducer}.
+   * Asserts that the values in the provided {@link ResultSet} are expected for the legacy {@link
+   * MockFlightSqlProducer}.
    *
    * @param resultSet the result set.
-   * @param collector the {@link ErrorCollector} to use.
    * @throws SQLException on error.
    */
-  public static void assertLegacyRegularSqlResultSet(final ResultSet resultSet,
-                                                     final ErrorCollector collector)
+  public static void assertLegacyRegularSqlResultSet(final ResultSet resultSet)
       throws SQLException {
     final int expectedRowCount = 50_000;
 
@@ -323,12 +324,16 @@ public static void assertLegacyRegularSqlResultSet(final ResultSet resultSet,
       actualHireDates.add((Date) resultSet.getObject(5));
       actualLastSales.add((Timestamp) resultSet.getObject(6));
     }
-    collector.checkThat(actualRowCount, is(equalTo(expectedRowCount)));
-    collector.checkThat(actualIds, is(expectedIds));
-    collector.checkThat(actualNames, is(expectedNames));
-    collector.checkThat(actualAges, is(expectedAges));
-    collector.checkThat(actualSalaries, is(expectedSalaries));
-    collector.checkThat(actualHireDates, is(expectedHireDates));
-    collector.checkThat(actualLastSales, is(expectedLastSales));
+
+    final int finalActualRowCount = actualRowCount;
+    assertAll(
+        "ResultSet values are as expected",
+        () -> assertThat(finalActualRowCount, is(equalTo(expectedRowCount))),
+        () -> assertThat(actualIds, is(expectedIds)),
+        () -> assertThat(actualNames, is(expectedNames)),
+        () -> assertThat(actualAges, is(expectedAges)),
+        () -> assertThat(actualSalaries, is(expectedSalaries)),
+        () -> assertThat(actualHireDates, is(expectedHireDates)),
+        () -> assertThat(actualLastSales, is(expectedLastSales)));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/DateTimeUtilsTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/DateTimeUtilsTest.java
index adb892fcdc76b..9c6635202349b 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/DateTimeUtilsTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/DateTimeUtilsTest.java
@@ -14,24 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.sql.Timestamp;
 import java.time.Instant;
 import java.util.Calendar;
 import java.util.TimeZone;
-
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
+import org.junit.jupiter.api.Test;
 
 public class DateTimeUtilsTest {
 
-  @ClassRule
-  public static final ErrorCollector collector = new ErrorCollector();
   private final TimeZone defaultTimezone = TimeZone.getTimeZone("UTC");
   private final TimeZone alternateTimezone = TimeZone.getTimeZone("America/Vancouver");
   private final long positiveEpochMilli = 959817600000L; // 2000-06-01 00:00:00 UTC
@@ -48,9 +43,10 @@ public void testShouldGetOffsetWithSameTimeZone() {
 
     try { // Trying to guarantee timezone returns to its original value
       final long expected = epochMillis + offset;
-      final long actual = DateTimeUtils.applyCalendarOffset(epochMillis, Calendar.getInstance(defaultTimezone));
+      final long actual =
+          DateTimeUtils.applyCalendarOffset(epochMillis, Calendar.getInstance(defaultTimezone));
 
-      collector.checkThat(actual, is(expected));
+      assertThat(actual, is(expected));
     } finally {
       // Reset Timezone
       TimeZone.setDefault(currentTimezone);
@@ -68,10 +64,10 @@ public void testShouldGetOffsetWithDifferentTimeZone() {
 
     try { // Trying to guarantee timezone returns to its original value
       final long expectedEpochMillis = epochMillis + offset;
-      final long actualEpochMillis = DateTimeUtils.applyCalendarOffset(epochMillis, Calendar.getInstance(
-          defaultTimezone));
+      final long actualEpochMillis =
+          DateTimeUtils.applyCalendarOffset(epochMillis, Calendar.getInstance(defaultTimezone));
 
-      collector.checkThat(actualEpochMillis, is(expectedEpochMillis));
+      assertThat(actualEpochMillis, is(expectedEpochMillis));
     } finally {
       // Reset Timezone
       TimeZone.setDefault(currentTimezone);
@@ -86,7 +82,7 @@ public void testShouldGetTimestampPositive() {
     final Timestamp expected = Timestamp.from(instant);
     final Timestamp actual = DateTimeUtils.getTimestampValue(epochMilli);
 
-    collector.checkThat(expected, is(actual));
+    assertThat(expected, is(actual));
   }
 
   @Test
@@ -97,6 +93,6 @@ public void testShouldGetTimestampNegative() {
     final Timestamp expected = Timestamp.from(instant);
     final Timestamp actual = DateTimeUtils.getTimestampValue(epochMilli);
 
-    collector.checkThat(expected, is(actual));
+    assertThat(expected, is(actual));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/FallbackFlightSqlProducer.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/FallbackFlightSqlProducer.java
index 2257220a4c845..9aa257172cc22 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/FallbackFlightSqlProducer.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/FallbackFlightSqlProducer.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
+import com.google.protobuf.Any;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.Message;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.flight.CallStatus;
 import org.apache.arrow.flight.FlightDescriptor;
 import org.apache.arrow.flight.FlightEndpoint;
@@ -32,10 +33,6 @@
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-import com.google.protobuf.Any;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.Message;
-
 public class FallbackFlightSqlProducer extends BasicFlightSqlProducer {
   private final VectorSchemaRoot data;
 
@@ -45,18 +42,21 @@ public FallbackFlightSqlProducer(VectorSchemaRoot resultData) {
 
   @Override
   protected <T extends Message> List<FlightEndpoint> determineEndpoints(
-          T request, FlightDescriptor flightDescriptor, Schema schema) {
+      T request, FlightDescriptor flightDescriptor, Schema schema) {
     return Collections.emptyList();
   }
 
   @Override
-  public void createPreparedStatement(FlightSql.ActionCreatePreparedStatementRequest request,
-                                      CallContext context, StreamListener<Result> listener) {
+  public void createPreparedStatement(
+      FlightSql.ActionCreatePreparedStatementRequest request,
+      CallContext context,
+      StreamListener<Result> listener) {
     final FlightSql.ActionCreatePreparedStatementResult.Builder resultBuilder =
-            FlightSql.ActionCreatePreparedStatementResult.newBuilder()
-                    .setPreparedStatementHandle(request.getQueryBytes());
+        FlightSql.ActionCreatePreparedStatementResult.newBuilder()
+            .setPreparedStatementHandle(request.getQueryBytes());
 
-    final ByteString datasetSchemaBytes = ByteString.copyFrom(data.getSchema().serializeAsMessage());
+    final ByteString datasetSchemaBytes =
+        ByteString.copyFrom(data.getSchema().serializeAsMessage());
 
     resultBuilder.setDatasetSchema(datasetSchemaBytes);
     listener.onNext(new Result(Any.pack(resultBuilder.build()).toByteArray()));
@@ -65,41 +65,50 @@ public void createPreparedStatement(FlightSql.ActionCreatePreparedStatementReque
 
   @Override
   public FlightInfo getFlightInfoStatement(
-          FlightSql.CommandStatementQuery command, CallContext context, FlightDescriptor descriptor) {
+      FlightSql.CommandStatementQuery command, CallContext context, FlightDescriptor descriptor) {
     return getFlightInfo(descriptor, command.getQuery());
   }
 
   @Override
-  public FlightInfo getFlightInfoPreparedStatement(FlightSql.CommandPreparedStatementQuery command,
-                                                   CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoPreparedStatement(
+      FlightSql.CommandPreparedStatementQuery command,
+      CallContext context,
+      FlightDescriptor descriptor) {
     return getFlightInfo(descriptor, command.getPreparedStatementHandle().toStringUtf8());
   }
 
   @Override
-  public void getStreamStatement(FlightSql.TicketStatementQuery ticket, CallContext context,
-                                 ServerStreamListener listener) {
+  public void getStreamStatement(
+      FlightSql.TicketStatementQuery ticket, CallContext context, ServerStreamListener listener) {
     listener.start(data);
     listener.putNext();
     listener.completed();
   }
 
   @Override
-  public void closePreparedStatement(FlightSql.ActionClosePreparedStatementRequest request,
-                                     CallContext context, StreamListener<Result> listener) {
+  public void closePreparedStatement(
+      FlightSql.ActionClosePreparedStatementRequest request,
+      CallContext context,
+      StreamListener<Result> listener) {
     listener.onCompleted();
   }
 
   private FlightInfo getFlightInfo(FlightDescriptor descriptor, String query) {
     final List<FlightEndpoint> endpoints;
-    final Ticket ticket = new Ticket(
-            Any.pack(FlightSql.TicketStatementQuery.getDefaultInstance()).toByteArray());
+    final Ticket ticket =
+        new Ticket(Any.pack(FlightSql.TicketStatementQuery.getDefaultInstance()).toByteArray());
     if (query.equals("fallback")) {
-      endpoints = Collections.singletonList(FlightEndpoint.builder(ticket, Location.reuseConnection()).build());
+      endpoints =
+          Collections.singletonList(
+              FlightEndpoint.builder(ticket, Location.reuseConnection()).build());
     } else if (query.equals("fallback with error")) {
-      endpoints = Collections.singletonList(
-                FlightEndpoint.builder(ticket,
-                        Location.forGrpcInsecure("localhost", 9999),
-                        Location.reuseConnection()).build());
+      endpoints =
+          Collections.singletonList(
+              FlightEndpoint.builder(
+                      ticket,
+                      Location.forGrpcInsecure("localhost", 9999),
+                      Location.reuseConnection())
+                  .build());
     } else {
       throw CallStatus.UNIMPLEMENTED.withDescription(query).toRuntimeException();
     }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/FlightEndpointDataQueueTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/FlightEndpointDataQueueTest.java
index 05325faa18ef3..f40610a0320ab 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/FlightEndpointDataQueueTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/FlightEndpointDataQueueTest.java
@@ -14,73 +14,69 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.Mockito.mock;
 
 import java.util.concurrent.CompletionService;
-
 import org.apache.arrow.driver.jdbc.client.CloseableEndpointStreamPair;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ErrorCollector;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-/**
- * Tests for {@link FlightEndpointDataQueue}.
- */
-@RunWith(MockitoJUnitRunner.class)
+/** Tests for {@link FlightEndpointDataQueue}. */
+@ExtendWith(MockitoExtension.class)
 public class FlightEndpointDataQueueTest {
 
-  @Rule
-  public final ErrorCollector collector = new ErrorCollector();
-  @Mock
-  private CompletionService<CloseableEndpointStreamPair> mockedService;
+  @Mock private CompletionService<CloseableEndpointStreamPair> mockedService;
   private FlightEndpointDataQueue queue;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     queue = new FlightEndpointDataQueue(mockedService);
   }
 
   @Test
   public void testNextShouldRetrieveNullIfEmpty() throws Exception {
-    collector.checkThat(queue.next(), is(nullValue()));
+    assertThat(queue.next(), is(nullValue()));
   }
 
   @Test
   public void testNextShouldThrowExceptionUponClose() throws Exception {
     queue.close();
-    ThrowableAssertionUtils.simpleAssertThrowableClass(IllegalStateException.class, () -> queue.next());
+    ThrowableAssertionUtils.simpleAssertThrowableClass(
+        IllegalStateException.class, () -> queue.next());
   }
 
   @Test
   public void testEnqueueShouldThrowExceptionUponClose() throws Exception {
     queue.close();
-    ThrowableAssertionUtils.simpleAssertThrowableClass(IllegalStateException.class,
-        () -> queue.enqueue(mock(CloseableEndpointStreamPair.class)));
+    ThrowableAssertionUtils.simpleAssertThrowableClass(
+        IllegalStateException.class, () -> queue.enqueue(mock(CloseableEndpointStreamPair.class)));
   }
 
   @Test
   public void testCheckOpen() throws Exception {
-    collector.checkSucceeds(() -> {
-      queue.checkOpen();
-      return true;
-    });
+    assertDoesNotThrow(
+        () -> {
+          queue.checkOpen();
+          return true;
+        });
     queue.close();
-    ThrowableAssertionUtils.simpleAssertThrowableClass(IllegalStateException.class, () -> queue.checkOpen());
+    ThrowableAssertionUtils.simpleAssertThrowableClass(
+        IllegalStateException.class, () -> queue.checkOpen());
   }
 
   @Test
   public void testShouldCloseQueue() throws Exception {
-    collector.checkThat(queue.isClosed(), is(false));
+    assertThat(queue.isClosed(), is(false));
     queue.close();
-    collector.checkThat(queue.isClosed(), is(true));
+    assertThat(queue.isClosed(), is(true));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/FlightSqlTestCertificates.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/FlightSqlTestCertificates.java
index 89e27be9f53da..b72dcef743329 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/FlightSqlTestCertificates.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/FlightSqlTestCertificates.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import java.io.File;
@@ -24,9 +23,7 @@
 import java.util.List;
 import java.util.Objects;
 
-/**
- * Utility class for unit tests that need to reference the certificate params.
- */
+/** Utility class for unit tests that need to reference the certificate params. */
 public class FlightSqlTestCertificates {
 
   public static final String TEST_DATA_ENV_VAR = "ARROW_TEST_DATA";
@@ -37,9 +34,12 @@ static Path getTestDataRoot() {
     if (path == null) {
       path = System.getProperty(TEST_DATA_PROPERTY);
     }
-    return Paths.get(Objects.requireNonNull(path,
-        String.format("Could not find test data path. Set the environment variable %s or the JVM property %s.",
-            TEST_DATA_ENV_VAR, TEST_DATA_PROPERTY)));
+    return Paths.get(
+        Objects.requireNonNull(
+            path,
+            String.format(
+                "Could not find test data path. Set the environment variable %s or the JVM property %s.",
+                TEST_DATA_ENV_VAR, TEST_DATA_PROPERTY)));
   }
 
   /**
@@ -68,10 +68,9 @@ public static File exampleCACert() {
    */
   public static List<CertKeyPair> exampleTlsCerts() {
     final Path root = getFlightTestDataRoot();
-    return Arrays.asList(new CertKeyPair(root.resolve("cert0.pem")
-            .toFile(), root.resolve("cert0.pkcs1").toFile()),
-        new CertKeyPair(root.resolve("cert1.pem")
-            .toFile(), root.resolve("cert1.pkcs1").toFile()));
+    return Arrays.asList(
+        new CertKeyPair(root.resolve("cert0.pem").toFile(), root.resolve("cert0.pkcs1").toFile()),
+        new CertKeyPair(root.resolve("cert1.pem").toFile(), root.resolve("cert1.pkcs1").toFile()));
   }
 
   public static class CertKeyPair {
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/MockFlightSqlProducer.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/MockFlightSqlProducer.java
index 52a397edab18f..a8874c48693f1 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/MockFlightSqlProducer.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/MockFlightSqlProducer.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import static com.google.protobuf.Any.pack;
@@ -23,6 +22,9 @@
 import static java.util.UUID.randomUUID;
 import static java.util.stream.Collectors.toList;
 
+import com.google.protobuf.Any;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.Message;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -40,7 +42,6 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.stream.IntStream;
-
 import org.apache.arrow.flight.Action;
 import org.apache.arrow.flight.CallStatus;
 import org.apache.arrow.flight.Criteria;
@@ -84,13 +85,7 @@
 import org.apache.arrow.vector.util.JsonStringArrayList;
 import org.apache.calcite.avatica.Meta.StatementType;
 
-import com.google.protobuf.Any;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.Message;
-
-/**
- * An ad-hoc {@link FlightSqlProducer} for tests.
- */
+/** An ad-hoc {@link FlightSqlProducer} for tests. */
 public final class MockFlightSqlProducer implements FlightSqlProducer {
 
   private final Map<String, Entry<Schema, List<UUID>>> queryResults = new HashMap<>();
@@ -99,26 +94,26 @@ public final class MockFlightSqlProducer implements FlightSqlProducer {
   private final Map<Message, Consumer<ServerStreamListener>> catalogQueriesResults =
       new HashMap<>();
   private final Map<String, BiConsumer<FlightStream, StreamListener<PutResult>>>
-      updateResultProviders =
-      new HashMap<>();
+      updateResultProviders = new HashMap<>();
   private final SqlInfoBuilder sqlInfoBuilder = new SqlInfoBuilder();
   private final Map<String, Schema> parameterSchemas = new HashMap<>();
   private final Map<String, List<List<Object>>> expectedParameterValues = new HashMap<>();
 
   private final Map<String, Integer> actionTypeCounter = new HashMap<>();
 
-  private static FlightInfo getFlightInfoExportedAndImportedKeys(final Message message,
-                                                                 final FlightDescriptor descriptor) {
+  private static FlightInfo getFlightInfoExportedAndImportedKeys(
+      final Message message, final FlightDescriptor descriptor) {
     return getFlightInfo(message, Schemas.GET_IMPORTED_KEYS_SCHEMA, descriptor);
   }
 
-  private static FlightInfo getFlightInfo(final Message message, final Schema schema,
-                                          final FlightDescriptor descriptor) {
+  private static FlightInfo getFlightInfo(
+      final Message message, final Schema schema, final FlightDescriptor descriptor) {
     return new FlightInfo(
         schema,
         descriptor,
         Collections.singletonList(new FlightEndpoint(new Ticket(Any.pack(message).toByteArray()))),
-        -1, -1);
+        -1,
+        -1);
   }
 
   public static ByteBuffer serializeSchema(final Schema schema) {
@@ -135,12 +130,14 @@ public static ByteBuffer serializeSchema(final Schema schema) {
   /**
    * Registers a new {@link StatementType#SELECT} SQL query.
    *
-   * @param sqlCommand      the SQL command under which to register the new query.
-   * @param schema          the schema to use for the query result.
+   * @param sqlCommand the SQL command under which to register the new query.
+   * @param schema the schema to use for the query result.
    * @param resultProviders the result provider for this query.
    */
-  public void addSelectQuery(final String sqlCommand, final Schema schema,
-                             final List<Consumer<ServerStreamListener>> resultProviders) {
+  public void addSelectQuery(
+      final String sqlCommand,
+      final Schema schema,
+      final List<Consumer<ServerStreamListener>> resultProviders) {
     final int providers = resultProviders.size();
     final List<UUID> uuids =
         IntStream.range(0, providers)
@@ -155,59 +152,64 @@ public void addSelectQuery(final String sqlCommand, final Schema schema,
   /**
    * Registers a new {@link StatementType#UPDATE} SQL query.
    *
-   * @param sqlCommand  the SQL command.
+   * @param sqlCommand the SQL command.
    * @param updatedRows the number of rows affected.
    */
   public void addUpdateQuery(final String sqlCommand, final long updatedRows) {
-    addUpdateQuery(sqlCommand, (flightStream, putResultStreamListener) -> {
-      final DoPutUpdateResult result =
-          DoPutUpdateResult.newBuilder().setRecordCount(updatedRows).build();
-      try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-           final ArrowBuf buffer = allocator.buffer(result.getSerializedSize())) {
-        buffer.writeBytes(result.toByteArray());
-        putResultStreamListener.onNext(PutResult.metadata(buffer));
-      } catch (final Throwable throwable) {
-        putResultStreamListener.onError(throwable);
-      } finally {
-        putResultStreamListener.onCompleted();
-      }
-    });
+    addUpdateQuery(
+        sqlCommand,
+        (flightStream, putResultStreamListener) -> {
+          final DoPutUpdateResult result =
+              DoPutUpdateResult.newBuilder().setRecordCount(updatedRows).build();
+          try (final BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
+              final ArrowBuf buffer = allocator.buffer(result.getSerializedSize())) {
+            buffer.writeBytes(result.toByteArray());
+            putResultStreamListener.onNext(PutResult.metadata(buffer));
+          } catch (final Throwable throwable) {
+            putResultStreamListener.onError(throwable);
+          } finally {
+            putResultStreamListener.onCompleted();
+          }
+        });
   }
 
   /**
    * Adds a catalog query to the results.
    *
-   * @param message         the {@link Message} corresponding to the catalog query request type to register.
+   * @param message the {@link Message} corresponding to the catalog query request type to register.
    * @param resultsProvider the results provider.
    */
-  public void addCatalogQuery(final Message message,
-                              final Consumer<ServerStreamListener> resultsProvider) {
+  public void addCatalogQuery(
+      final Message message, final Consumer<ServerStreamListener> resultsProvider) {
     catalogQueriesResults.put(message, resultsProvider);
   }
 
   /**
    * Registers a new {@link StatementType#UPDATE} SQL query.
    *
-   * @param sqlCommand      the SQL command.
+   * @param sqlCommand the SQL command.
    * @param resultsProvider consumer for producing update results.
    */
-  void addUpdateQuery(final String sqlCommand,
-                      final BiConsumer<FlightStream, StreamListener<PutResult>> resultsProvider) {
+  void addUpdateQuery(
+      final String sqlCommand,
+      final BiConsumer<FlightStream, StreamListener<PutResult>> resultsProvider) {
     Preconditions.checkState(
         updateResultProviders.putIfAbsent(sqlCommand, resultsProvider) == null,
         format("Attempted to overwrite preexisting query: <%s>.", sqlCommand));
   }
 
   /** Registers parameters expected to be provided with a prepared statement. */
-  public void addExpectedParameters(String query, Schema parameterSchema, List<List<Object>> expectedValues) {
+  public void addExpectedParameters(
+      String query, Schema parameterSchema, List<List<Object>> expectedValues) {
     parameterSchemas.put(query, parameterSchema);
     expectedParameterValues.put(query, expectedValues);
   }
 
   @Override
-  public void createPreparedStatement(final ActionCreatePreparedStatementRequest request,
-                                      final CallContext callContext,
-                                      final StreamListener<Result> listener) {
+  public void createPreparedStatement(
+      final ActionCreatePreparedStatementRequest request,
+      final CallContext callContext,
+      final StreamListener<Result> listener) {
     try {
       final ByteString preparedStatementHandle =
           copyFrom(randomUUID().toString().getBytes(StandardCharsets.UTF_8));
@@ -222,8 +224,7 @@ public void createPreparedStatement(final ActionCreatePreparedStatementRequest r
         preparedStatements.put(preparedStatementHandle, query);
 
         final Schema datasetSchema = entry.getKey();
-        final ByteString datasetSchemaBytes =
-            ByteString.copyFrom(serializeSchema(datasetSchema));
+        final ByteString datasetSchemaBytes = ByteString.copyFrom(serializeSchema(datasetSchema));
 
         resultBuilder.setDatasetSchema(datasetSchemaBytes);
       } else if (updateResultProviders.containsKey(query)) {
@@ -238,7 +239,8 @@ public void createPreparedStatement(final ActionCreatePreparedStatementRequest r
       final Schema parameterSchema = parameterSchemas.get(query);
       if (parameterSchema != null) {
         final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        MessageSerializer.serialize(new WriteChannel(Channels.newChannel(outputStream)), parameterSchema);
+        MessageSerializer.serialize(
+            new WriteChannel(Channels.newChannel(outputStream)), parameterSchema);
         resultBuilder.setParameterSchema(ByteString.copyFrom(outputStream.toByteArray()));
       }
 
@@ -253,19 +255,21 @@ public void createPreparedStatement(final ActionCreatePreparedStatementRequest r
   @Override
   public void closePreparedStatement(
       final ActionClosePreparedStatementRequest actionClosePreparedStatementRequest,
-      final CallContext callContext, final StreamListener<Result> streamListener) {
+      final CallContext callContext,
+      final StreamListener<Result> streamListener) {
     // TODO Implement this method.
     streamListener.onCompleted();
   }
 
   @Override
-  public FlightInfo getFlightInfoStatement(final CommandStatementQuery commandStatementQuery,
-                                           final CallContext callContext,
-                                           final FlightDescriptor flightDescriptor) {
+  public FlightInfo getFlightInfoStatement(
+      final CommandStatementQuery commandStatementQuery,
+      final CallContext callContext,
+      final FlightDescriptor flightDescriptor) {
     final String query = commandStatementQuery.getQuery();
     final Entry<Schema, List<UUID>> queryInfo =
-        Preconditions.checkNotNull(queryResults.get(query),
-            format("Query not registered: <%s>.", query));
+        Preconditions.checkNotNull(
+            queryResults.get(query), format("Query not registered: <%s>.", query));
     final List<FlightEndpoint> endpoints =
         queryInfo.getValue().stream()
             .map(TicketConversionUtils::getTicketBytesFromUuid)
@@ -273,8 +277,8 @@ public FlightInfo getFlightInfoStatement(final CommandStatementQuery commandStat
             .map(TicketConversionUtils::getEndpointFromMessage)
             .collect(toList());
     return FlightInfo.builder(queryInfo.getKey(), flightDescriptor, endpoints)
-            .setAppMetadata("foo".getBytes(StandardCharsets.UTF_8))
-            .build();
+        .setAppMetadata("foo".getBytes(StandardCharsets.UTF_8))
+        .build();
   }
 
   @Override
@@ -285,12 +289,13 @@ public FlightInfo getFlightInfoPreparedStatement(
     final ByteString preparedStatementHandle =
         commandPreparedStatementQuery.getPreparedStatementHandle();
 
-    final String query = Preconditions.checkNotNull(
-        preparedStatements.get(preparedStatementHandle),
-        format("No query registered under handle: <%s>.", preparedStatementHandle));
+    final String query =
+        Preconditions.checkNotNull(
+            preparedStatements.get(preparedStatementHandle),
+            format("No query registered under handle: <%s>.", preparedStatementHandle));
     final Entry<Schema, List<UUID>> queryInfo =
-        Preconditions.checkNotNull(queryResults.get(query),
-            format("Query not registered: <%s>.", query));
+        Preconditions.checkNotNull(
+            queryResults.get(query), format("Query not registered: <%s>.", query));
     final List<FlightEndpoint> endpoints =
         queryInfo.getValue().stream()
             .map(TicketConversionUtils::getTicketBytesFromUuid)
@@ -298,30 +303,33 @@ public FlightInfo getFlightInfoPreparedStatement(
             .map(TicketConversionUtils::getEndpointFromMessage)
             .collect(toList());
     return FlightInfo.builder(queryInfo.getKey(), flightDescriptor, endpoints)
-            .setAppMetadata("foo".getBytes(StandardCharsets.UTF_8))
-            .build();
+        .setAppMetadata("foo".getBytes(StandardCharsets.UTF_8))
+        .build();
   }
 
   @Override
-  public SchemaResult getSchemaStatement(final CommandStatementQuery commandStatementQuery,
-                                         final CallContext callContext,
-                                         final FlightDescriptor flightDescriptor) {
+  public SchemaResult getSchemaStatement(
+      final CommandStatementQuery commandStatementQuery,
+      final CallContext callContext,
+      final FlightDescriptor flightDescriptor) {
     final String query = commandStatementQuery.getQuery();
     final Entry<Schema, List<UUID>> queryInfo =
-        Preconditions.checkNotNull(queryResults.get(query),
-            format("Query not registered: <%s>.", query));
+        Preconditions.checkNotNull(
+            queryResults.get(query), format("Query not registered: <%s>.", query));
 
     return new SchemaResult(queryInfo.getKey());
   }
 
   @Override
-  public void getStreamStatement(final TicketStatementQuery ticketStatementQuery,
-                                 final CallContext callContext,
-                                 final ServerStreamListener serverStreamListener) {
+  public void getStreamStatement(
+      final TicketStatementQuery ticketStatementQuery,
+      final CallContext callContext,
+      final ServerStreamListener serverStreamListener) {
     final UUID uuid = UUID.fromString(ticketStatementQuery.getStatementHandle().toStringUtf8());
     Preconditions.checkNotNull(
             selectResultProviders.get(uuid),
-            "No consumer was registered for the specified UUID: <%s>.", uuid)
+            "No consumer was registered for the specified UUID: <%s>.",
+            uuid)
         .accept(serverStreamListener);
   }
 
@@ -334,15 +342,17 @@ public void getStreamPreparedStatement(
         UUID.fromString(commandPreparedStatementQuery.getPreparedStatementHandle().toStringUtf8());
     Preconditions.checkNotNull(
             selectResultProviders.get(uuid),
-            "No consumer was registered for the specified UUID: <%s>.", uuid)
+            "No consumer was registered for the specified UUID: <%s>.",
+            uuid)
         .accept(serverStreamListener);
   }
 
   @Override
-  public Runnable acceptPutStatement(final CommandStatementUpdate commandStatementUpdate,
-                                     final CallContext callContext,
-                                     final FlightStream flightStream,
-                                     final StreamListener<PutResult> streamListener) {
+  public Runnable acceptPutStatement(
+      final CommandStatementUpdate commandStatementUpdate,
+      final CallContext callContext,
+      final FlightStream flightStream,
+      final StreamListener<PutResult> streamListener) {
     return () -> {
       final String query = commandStatementUpdate.getQuery();
       final BiConsumer<FlightStream, StreamListener<PutResult>> resultProvider =
@@ -353,9 +363,8 @@ public Runnable acceptPutStatement(final CommandStatementUpdate commandStatement
     };
   }
 
-  private boolean validateParameters(String query,
-                                     FlightStream flightStream,
-                                     StreamListener<PutResult> streamListener) {
+  private boolean validateParameters(
+      String query, FlightStream flightStream, StreamListener<PutResult> streamListener) {
     final List<List<Object>> expectedValues = expectedParameterValues.get(query);
     if (expectedValues != null) {
       int index = 0;
@@ -363,16 +372,18 @@ private boolean validateParameters(String query,
         final VectorSchemaRoot root = flightStream.getRoot();
         for (int i = 0; i < root.getRowCount(); i++) {
           if (index >= expectedValues.size()) {
-            streamListener.onError(CallStatus.INVALID_ARGUMENT
-                .withDescription("More parameter rows provided than expected")
-                .toRuntimeException());
+            streamListener.onError(
+                CallStatus.INVALID_ARGUMENT
+                    .withDescription("More parameter rows provided than expected")
+                    .toRuntimeException());
             return true;
           }
           List<Object> expectedRow = expectedValues.get(index++);
           if (root.getFieldVectors().size() != expectedRow.size()) {
-            streamListener.onError(CallStatus.INVALID_ARGUMENT
-                .withDescription("Parameter count mismatch")
-                .toRuntimeException());
+            streamListener.onError(
+                CallStatus.INVALID_ARGUMENT
+                    .withDescription("Parameter count mismatch")
+                    .toRuntimeException());
             return true;
           }
 
@@ -381,23 +392,28 @@ private boolean validateParameters(String query,
             Object actual = root.getVector(paramIndex).getObject(i);
             boolean matches;
             if (expected.getClass().isArray()) {
-              matches = Arrays.equals((Object[]) expected, ((JsonStringArrayList) actual).toArray());
+              matches =
+                  Arrays.equals((Object[]) expected, ((JsonStringArrayList) actual).toArray());
             } else {
               matches = Objects.equals(expected, actual);
             }
             if (!matches) {
-              streamListener.onError(CallStatus.INVALID_ARGUMENT
-                  .withDescription(String.format("Parameter mismatch. Expected: %s Actual: %s", expected, actual))
-                  .toRuntimeException());
+              streamListener.onError(
+                  CallStatus.INVALID_ARGUMENT
+                      .withDescription(
+                          String.format(
+                              "Parameter mismatch. Expected: %s Actual: %s", expected, actual))
+                      .toRuntimeException());
               return true;
             }
           }
         }
       }
       if (index < expectedValues.size()) {
-        streamListener.onError(CallStatus.INVALID_ARGUMENT
-            .withDescription("Fewer parameter rows provided than expected")
-            .toRuntimeException());
+        streamListener.onError(
+            CallStatus.INVALID_ARGUMENT
+                .withDescription("Fewer parameter rows provided than expected")
+                .toRuntimeException());
         return true;
       }
     }
@@ -407,147 +423,167 @@ private boolean validateParameters(String query,
   @Override
   public Runnable acceptPutPreparedStatementUpdate(
       final CommandPreparedStatementUpdate commandPreparedStatementUpdate,
-      final CallContext callContext, final FlightStream flightStream,
+      final CallContext callContext,
+      final FlightStream flightStream,
       final StreamListener<PutResult> streamListener) {
     final ByteString handle = commandPreparedStatementUpdate.getPreparedStatementHandle();
-    final String query = Preconditions.checkNotNull(
-        preparedStatements.get(handle),
-        format("No query registered under handle: <%s>.", handle));
+    final String query =
+        Preconditions.checkNotNull(
+            preparedStatements.get(handle),
+            format("No query registered under handle: <%s>.", handle));
 
     if (validateParameters(query, flightStream, streamListener)) {
-      return () -> { };
+      return () -> {};
     }
 
     return acceptPutStatement(
-        CommandStatementUpdate.newBuilder().setQuery(query).build(), callContext, flightStream,
+        CommandStatementUpdate.newBuilder().setQuery(query).build(),
+        callContext,
+        flightStream,
         streamListener);
   }
 
   @Override
   public Runnable acceptPutPreparedStatementQuery(
       final CommandPreparedStatementQuery commandPreparedStatementQuery,
-      final CallContext callContext, final FlightStream flightStream,
+      final CallContext callContext,
+      final FlightStream flightStream,
       final StreamListener<PutResult> streamListener) {
     final ByteString handle = commandPreparedStatementQuery.getPreparedStatementHandle();
-    final String query = Preconditions.checkNotNull(
-        preparedStatements.get(handle),
-        format("No query registered under handle: <%s>.", handle));
+    final String query =
+        Preconditions.checkNotNull(
+            preparedStatements.get(handle),
+            format("No query registered under handle: <%s>.", handle));
 
     if (validateParameters(query, flightStream, streamListener)) {
-      return () -> { };
+      return () -> {};
     }
 
     return streamListener::onCompleted;
   }
 
   @Override
-  public FlightInfo getFlightInfoSqlInfo(final CommandGetSqlInfo commandGetSqlInfo,
-                                         final CallContext callContext,
-                                         final FlightDescriptor flightDescriptor) {
+  public FlightInfo getFlightInfoSqlInfo(
+      final CommandGetSqlInfo commandGetSqlInfo,
+      final CallContext callContext,
+      final FlightDescriptor flightDescriptor) {
     return getFlightInfo(commandGetSqlInfo, Schemas.GET_SQL_INFO_SCHEMA, flightDescriptor);
   }
 
   @Override
-  public void getStreamSqlInfo(final CommandGetSqlInfo commandGetSqlInfo,
-                               final CallContext callContext,
-                               final ServerStreamListener serverStreamListener) {
+  public void getStreamSqlInfo(
+      final CommandGetSqlInfo commandGetSqlInfo,
+      final CallContext callContext,
+      final ServerStreamListener serverStreamListener) {
     sqlInfoBuilder.send(commandGetSqlInfo.getInfoList(), serverStreamListener);
   }
 
   @Override
-  public FlightInfo getFlightInfoTypeInfo(FlightSql.CommandGetXdbcTypeInfo request, CallContext context,
-                                          FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoTypeInfo(
+      FlightSql.CommandGetXdbcTypeInfo request, CallContext context, FlightDescriptor descriptor) {
     // TODO Implement this
     return null;
   }
 
   @Override
-  public void getStreamTypeInfo(FlightSql.CommandGetXdbcTypeInfo request, CallContext context,
-                                ServerStreamListener listener) {
+  public void getStreamTypeInfo(
+      FlightSql.CommandGetXdbcTypeInfo request,
+      CallContext context,
+      ServerStreamListener listener) {
     // TODO Implement this
   }
 
   @Override
-  public FlightInfo getFlightInfoCatalogs(final CommandGetCatalogs commandGetCatalogs,
-                                          final CallContext callContext,
-                                          final FlightDescriptor flightDescriptor) {
+  public FlightInfo getFlightInfoCatalogs(
+      final CommandGetCatalogs commandGetCatalogs,
+      final CallContext callContext,
+      final FlightDescriptor flightDescriptor) {
     return getFlightInfo(commandGetCatalogs, Schemas.GET_CATALOGS_SCHEMA, flightDescriptor);
   }
 
   @Override
-  public void getStreamCatalogs(final CallContext callContext,
-                                final ServerStreamListener serverStreamListener) {
+  public void getStreamCatalogs(
+      final CallContext callContext, final ServerStreamListener serverStreamListener) {
     final CommandGetCatalogs command = CommandGetCatalogs.getDefaultInstance();
     getStreamCatalogFunctions(command, serverStreamListener);
   }
 
   @Override
-  public FlightInfo getFlightInfoSchemas(final CommandGetDbSchemas commandGetSchemas,
-                                         final CallContext callContext,
-                                         final FlightDescriptor flightDescriptor) {
+  public FlightInfo getFlightInfoSchemas(
+      final CommandGetDbSchemas commandGetSchemas,
+      final CallContext callContext,
+      final FlightDescriptor flightDescriptor) {
     return getFlightInfo(commandGetSchemas, Schemas.GET_SCHEMAS_SCHEMA, flightDescriptor);
   }
 
   @Override
-  public void getStreamSchemas(final CommandGetDbSchemas commandGetSchemas,
-                               final CallContext callContext,
-                               final ServerStreamListener serverStreamListener) {
+  public void getStreamSchemas(
+      final CommandGetDbSchemas commandGetSchemas,
+      final CallContext callContext,
+      final ServerStreamListener serverStreamListener) {
     getStreamCatalogFunctions(commandGetSchemas, serverStreamListener);
   }
 
   @Override
-  public FlightInfo getFlightInfoTables(final CommandGetTables commandGetTables,
-                                        final CallContext callContext,
-                                        final FlightDescriptor flightDescriptor) {
+  public FlightInfo getFlightInfoTables(
+      final CommandGetTables commandGetTables,
+      final CallContext callContext,
+      final FlightDescriptor flightDescriptor) {
     return getFlightInfo(commandGetTables, Schemas.GET_TABLES_SCHEMA_NO_SCHEMA, flightDescriptor);
   }
 
   @Override
-  public void getStreamTables(final CommandGetTables commandGetTables,
-                              final CallContext callContext,
-                              final ServerStreamListener serverStreamListener) {
+  public void getStreamTables(
+      final CommandGetTables commandGetTables,
+      final CallContext callContext,
+      final ServerStreamListener serverStreamListener) {
     getStreamCatalogFunctions(commandGetTables, serverStreamListener);
   }
 
   @Override
-  public FlightInfo getFlightInfoTableTypes(final CommandGetTableTypes commandGetTableTypes,
-                                            final CallContext callContext,
-                                            final FlightDescriptor flightDescriptor) {
+  public FlightInfo getFlightInfoTableTypes(
+      final CommandGetTableTypes commandGetTableTypes,
+      final CallContext callContext,
+      final FlightDescriptor flightDescriptor) {
     return getFlightInfo(commandGetTableTypes, Schemas.GET_TABLE_TYPES_SCHEMA, flightDescriptor);
   }
 
   @Override
-  public void getStreamTableTypes(final CallContext callContext,
-                                  final ServerStreamListener serverStreamListener) {
+  public void getStreamTableTypes(
+      final CallContext callContext, final ServerStreamListener serverStreamListener) {
     final CommandGetTableTypes command = CommandGetTableTypes.getDefaultInstance();
     getStreamCatalogFunctions(command, serverStreamListener);
   }
 
   @Override
-  public FlightInfo getFlightInfoPrimaryKeys(final CommandGetPrimaryKeys commandGetPrimaryKeys,
-                                             final CallContext callContext,
-                                             final FlightDescriptor flightDescriptor) {
+  public FlightInfo getFlightInfoPrimaryKeys(
+      final CommandGetPrimaryKeys commandGetPrimaryKeys,
+      final CallContext callContext,
+      final FlightDescriptor flightDescriptor) {
     return getFlightInfo(commandGetPrimaryKeys, Schemas.GET_PRIMARY_KEYS_SCHEMA, flightDescriptor);
   }
 
   @Override
-  public void getStreamPrimaryKeys(final CommandGetPrimaryKeys commandGetPrimaryKeys,
-                                   final CallContext callContext,
-                                   final ServerStreamListener serverStreamListener) {
+  public void getStreamPrimaryKeys(
+      final CommandGetPrimaryKeys commandGetPrimaryKeys,
+      final CallContext callContext,
+      final ServerStreamListener serverStreamListener) {
     getStreamCatalogFunctions(commandGetPrimaryKeys, serverStreamListener);
   }
 
   @Override
-  public FlightInfo getFlightInfoExportedKeys(final CommandGetExportedKeys commandGetExportedKeys,
-                                              final CallContext callContext,
-                                              final FlightDescriptor flightDescriptor) {
+  public FlightInfo getFlightInfoExportedKeys(
+      final CommandGetExportedKeys commandGetExportedKeys,
+      final CallContext callContext,
+      final FlightDescriptor flightDescriptor) {
     return getFlightInfoExportedAndImportedKeys(commandGetExportedKeys, flightDescriptor);
   }
 
   @Override
-  public FlightInfo getFlightInfoImportedKeys(final CommandGetImportedKeys commandGetImportedKeys,
-                                              final CallContext callContext,
-                                              final FlightDescriptor flightDescriptor) {
+  public FlightInfo getFlightInfoImportedKeys(
+      final CommandGetImportedKeys commandGetImportedKeys,
+      final CallContext callContext,
+      final FlightDescriptor flightDescriptor) {
     return getFlightInfoExportedAndImportedKeys(commandGetImportedKeys, flightDescriptor);
   }
 
@@ -560,23 +596,26 @@ public FlightInfo getFlightInfoCrossReference(
   }
 
   @Override
-  public void getStreamExportedKeys(final CommandGetExportedKeys commandGetExportedKeys,
-                                    final CallContext callContext,
-                                    final ServerStreamListener serverStreamListener) {
+  public void getStreamExportedKeys(
+      final CommandGetExportedKeys commandGetExportedKeys,
+      final CallContext callContext,
+      final ServerStreamListener serverStreamListener) {
     getStreamCatalogFunctions(commandGetExportedKeys, serverStreamListener);
   }
 
   @Override
-  public void getStreamImportedKeys(final CommandGetImportedKeys commandGetImportedKeys,
-                                    final CallContext callContext,
-                                    final ServerStreamListener serverStreamListener) {
+  public void getStreamImportedKeys(
+      final CommandGetImportedKeys commandGetImportedKeys,
+      final CallContext callContext,
+      final ServerStreamListener serverStreamListener) {
     getStreamCatalogFunctions(commandGetImportedKeys, serverStreamListener);
   }
 
   @Override
-  public void getStreamCrossReference(final CommandGetCrossReference commandGetCrossReference,
-                                      final CallContext callContext,
-                                      final ServerStreamListener serverStreamListener) {
+  public void getStreamCrossReference(
+      final CommandGetCrossReference commandGetCrossReference,
+      final CallContext callContext,
+      final ServerStreamListener serverStreamListener) {
     getStreamCatalogFunctions(commandGetCrossReference, serverStreamListener);
   }
 
@@ -586,8 +625,10 @@ public void close() {
   }
 
   @Override
-  public void listFlights(final CallContext callContext, final Criteria criteria,
-                          final StreamListener<FlightInfo> streamListener) {
+  public void listFlights(
+      final CallContext callContext,
+      final Criteria criteria,
+      final StreamListener<FlightInfo> streamListener) {
     // TODO Implement this method.
     throw CallStatus.UNIMPLEMENTED.toRuntimeException();
   }
@@ -595,11 +636,13 @@ public void listFlights(final CallContext callContext, final Criteria criteria,
   @Override
   public void doAction(CallContext context, Action action, StreamListener<Result> listener) {
     FlightSqlProducer.super.doAction(context, action, listener);
-    actionTypeCounter.put(action.getType(), actionTypeCounter.getOrDefault(action.getType(), 0) + 1);
+    actionTypeCounter.put(
+        action.getType(), actionTypeCounter.getOrDefault(action.getType(), 0) + 1);
   }
 
   /**
-   * Clear the `actionTypeCounter` map and restore to its default state. Intended to be used in tests.
+   * Clear the `actionTypeCounter` map and restore to its default state. Intended to be used in
+   * tests.
    */
   public void clearActionTypeCounter() {
     actionTypeCounter.clear();
@@ -609,9 +652,8 @@ public Map<String, Integer> getActionTypeCounter() {
     return actionTypeCounter;
   }
 
-
-  private void getStreamCatalogFunctions(final Message ticket,
-                                         final ServerStreamListener serverStreamListener) {
+  private void getStreamCatalogFunctions(
+      final Message ticket, final ServerStreamListener serverStreamListener) {
     Preconditions.checkNotNull(
             catalogQueriesResults.get(ticket),
             format("Query not registered for ticket: <%s>", ticket))
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/PartitionedFlightSqlProducer.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/PartitionedFlightSqlProducer.java
index 3230ce626fac6..d96fef2bbdd58 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/PartitionedFlightSqlProducer.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/PartitionedFlightSqlProducer.java
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import static com.google.protobuf.Any.pack;
 
+import com.google.protobuf.ByteString;
+import com.google.protobuf.Message;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.arrow.flight.CallStatus;
 import org.apache.arrow.flight.FlightDescriptor;
 import org.apache.arrow.flight.FlightEndpoint;
@@ -34,14 +34,9 @@
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-import com.google.protobuf.ByteString;
-import com.google.protobuf.Message;
-
 public class PartitionedFlightSqlProducer extends BasicFlightSqlProducer {
 
-  /**
-   * A minimal FlightProducer intended to just serve data when given the correct Ticket.
-   */
+  /** A minimal FlightProducer intended to just serve data when given the correct Ticket. */
   public static class DataOnlyFlightSqlProducer extends NoOpFlightProducer {
     private final Ticket ticket;
     private final VectorSchemaRoot data;
@@ -54,7 +49,8 @@ public DataOnlyFlightSqlProducer(Ticket ticket, VectorSchemaRoot data) {
     @Override
     public void getStream(CallContext context, Ticket ticket, ServerStreamListener listener) {
       if (!Arrays.equals(ticket.getBytes(), this.ticket.getBytes())) {
-        listener.error(CallStatus.INVALID_ARGUMENT.withDescription("Illegal ticket.").toRuntimeException());
+        listener.error(
+            CallStatus.INVALID_ARGUMENT.withDescription("Illegal ticket.").toRuntimeException());
         return;
       }
 
@@ -80,8 +76,10 @@ protected <T extends Message> List<FlightEndpoint> determineEndpoints(
   }
 
   @Override
-  public void createPreparedStatement(FlightSql.ActionCreatePreparedStatementRequest request,
-                                      CallContext context, StreamListener<Result> listener) {
+  public void createPreparedStatement(
+      FlightSql.ActionCreatePreparedStatementRequest request,
+      CallContext context,
+      StreamListener<Result> listener) {
     final FlightSql.ActionCreatePreparedStatementResult.Builder resultBuilder =
         FlightSql.ActionCreatePreparedStatementResult.newBuilder()
             .setPreparedStatementHandle(ByteString.EMPTY);
@@ -100,14 +98,18 @@ public FlightInfo getFlightInfoStatement(
   }
 
   @Override
-  public FlightInfo getFlightInfoPreparedStatement(FlightSql.CommandPreparedStatementQuery command,
-                                                   CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoPreparedStatement(
+      FlightSql.CommandPreparedStatementQuery command,
+      CallContext context,
+      FlightDescriptor descriptor) {
     return FlightInfo.builder(schema, descriptor, endpoints).build();
   }
 
   @Override
-  public void closePreparedStatement(FlightSql.ActionClosePreparedStatementRequest request,
-                                     CallContext context, StreamListener<Result> listener) {
+  public void closePreparedStatement(
+      FlightSql.ActionClosePreparedStatementRequest request,
+      CallContext context,
+      StreamListener<Result> listener) {
     listener.onCompleted();
   }
 
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ResultSetTestUtils.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ResultSetTestUtils.java
index d5ce7fb8fb36f..bcefbf68bc25b 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ResultSetTestUtils.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ResultSetTestUtils.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import static java.util.stream.IntStream.range;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -26,57 +26,44 @@
 import java.util.List;
 import java.util.function.Function;
 
-import org.apache.arrow.util.Preconditions;
-import org.junit.rules.ErrorCollector;
-
 /**
- * Utility class for testing that require asserting that the values in a {@link ResultSet} are expected.
+ * Utility class for testing that require asserting that the values in a {@link ResultSet} are
+ * expected.
  */
 public final class ResultSetTestUtils {
-  private final ErrorCollector collector;
-
-  public ResultSetTestUtils(final ErrorCollector collector) {
-    this.collector =
-        Preconditions.checkNotNull(collector, "Error collector cannot be null.");
-  }
 
   /**
    * Checks that the values (rows and columns) in the provided {@link ResultSet} are expected.
    *
-   * @param resultSet       the {@code ResultSet} to assert.
+   * @param resultSet the {@code ResultSet} to assert.
    * @param expectedResults the rows and columns representing the only values the {@code resultSet}
-   *                        is expected to have.
-   * @param collector       the {@link ErrorCollector} to use for asserting that the {@code resultSet}
-   *                        has the expected values.
-   * @param <T>             the type to be found in the expected results for the {@code resultSet}.
+   *     is expected to have.
+   * @param <T> the type to be found in the expected results for the {@code resultSet}.
    * @throws SQLException if querying the {@code ResultSet} fails at some point unexpectedly.
    */
-  public static <T> void testData(final ResultSet resultSet, final List<List<T>> expectedResults,
-                                  final ErrorCollector collector)
+  public static <T> void testData(final ResultSet resultSet, final List<List<T>> expectedResults)
       throws SQLException {
     testData(
         resultSet,
         range(1, resultSet.getMetaData().getColumnCount() + 1).toArray(),
-        expectedResults,
-        collector);
+        expectedResults);
   }
 
   /**
    * Checks that the values (rows and columns) in the provided {@link ResultSet} are expected.
    *
-   * @param resultSet       the {@code ResultSet} to assert.
-   * @param columnNames     the column names to fetch in the {@code ResultSet} for comparison.
+   * @param resultSet the {@code ResultSet} to assert.
+   * @param columnNames the column names to fetch in the {@code ResultSet} for comparison.
    * @param expectedResults the rows and columns representing the only values the {@code resultSet}
-   *                        is expected to have.
-   * @param collector       the {@link ErrorCollector} to use for asserting that the {@code resultSet}
-   *                        has the expected values.
-   * @param <T>             the type to be found in the expected results for the {@code resultSet}.
+   *     is expected to have.
+   * @param <T> the type to be found in the expected results for the {@code resultSet}.
    * @throws SQLException if querying the {@code ResultSet} fails at some point unexpectedly.
    */
   @SuppressWarnings("unchecked")
-  public static <T> void testData(final ResultSet resultSet, final List<String> columnNames,
-                                  final List<List<T>> expectedResults,
-                                  final ErrorCollector collector)
+  public static <T> void testData(
+      final ResultSet resultSet,
+      final List<String> columnNames,
+      final List<List<T>> expectedResults)
       throws SQLException {
     testData(
         resultSet,
@@ -86,31 +73,27 @@ public static <T> void testData(final ResultSet resultSet, final List<String> co
             try {
               columns.add((T) resultSet.getObject(columnName));
             } catch (final SQLException e) {
-              collector.addError(e);
+              throw new RuntimeException(e);
             }
           }
           return columns;
         },
-        expectedResults,
-        collector);
+        expectedResults);
   }
 
   /**
    * Checks that the values (rows and columns) in the provided {@link ResultSet} are expected.
    *
-   * @param resultSet       the {@code ResultSet} to assert.
-   * @param columnIndices   the column indices to fetch in the {@code ResultSet} for comparison.
+   * @param resultSet the {@code ResultSet} to assert.
+   * @param columnIndices the column indices to fetch in the {@code ResultSet} for comparison.
    * @param expectedResults the rows and columns representing the only values the {@code resultSet}
-   *                        is expected to have.
-   * @param collector       the {@link ErrorCollector} to use for asserting that the {@code resultSet}
-   *                        has the expected values.
-   * @param <T>             the type to be found in the expected results for the {@code resultSet}.
+   *     is expected to have.
+   * @param <T> the type to be found in the expected results for the {@code resultSet}.
    * @throws SQLException if querying the {@code ResultSet} fails at some point unexpectedly.
    */
   @SuppressWarnings("unchecked")
-  public static <T> void testData(final ResultSet resultSet, final int[] columnIndices,
-                                  final List<List<T>> expectedResults,
-                                  final ErrorCollector collector)
+  public static <T> void testData(
+      final ResultSet resultSet, final int[] columnIndices, final List<List<T>> expectedResults)
       throws SQLException {
     testData(
         resultSet,
@@ -120,94 +103,33 @@ public static <T> void testData(final ResultSet resultSet, final int[] columnInd
             try {
               columns.add((T) resultSet.getObject(columnIndex));
             } catch (final SQLException e) {
-              collector.addError(e);
+              throw new RuntimeException(e);
             }
           }
           return columns;
         },
-        expectedResults,
-        collector);
+        expectedResults);
   }
 
   /**
    * Checks that the values (rows and columns) in the provided {@link ResultSet} are expected.
    *
-   * @param resultSet       the {@code ResultSet} to assert.
-   * @param dataConsumer    the column indices to fetch in the {@code ResultSet} for comparison.
+   * @param resultSet the {@code ResultSet} to assert.
+   * @param dataConsumer the column indices to fetch in the {@code ResultSet} for comparison.
    * @param expectedResults the rows and columns representing the only values the {@code resultSet}
-   *                        is expected to have.
-   * @param collector       the {@link ErrorCollector} to use for asserting that the {@code resultSet}
-   *                        has the expected values.
-   * @param <T>             the type to be found in the expected results for the {@code resultSet}.
+   *     is expected to have.
+   * @param <T> the type to be found in the expected results for the {@code resultSet}.
    * @throws SQLException if querying the {@code ResultSet} fails at some point unexpectedly.
    */
-  public static <T> void testData(final ResultSet resultSet,
-                                  final Function<ResultSet, List<T>> dataConsumer,
-                                  final List<List<T>> expectedResults,
-                                  final ErrorCollector collector)
+  public static <T> void testData(
+      final ResultSet resultSet,
+      final Function<ResultSet, List<T>> dataConsumer,
+      final List<List<T>> expectedResults)
       throws SQLException {
     final List<List<T>> actualResults = new ArrayList<>();
     while (resultSet.next()) {
       actualResults.add(dataConsumer.apply(resultSet));
     }
-    collector.checkThat(actualResults, is(expectedResults));
-  }
-
-  /**
-   * Checks that the values (rows and columns) in the provided {@link ResultSet} are expected.
-   *
-   * @param resultSet       the {@code ResultSet} to assert.
-   * @param expectedResults the rows and columns representing the only values the {@code resultSet} is expected to have.
-   * @param <T>             the type to be found in the expected results for the {@code resultSet}.
-   * @throws SQLException if querying the {@code ResultSet} fails at some point unexpectedly.
-   */
-  public <T> void testData(final ResultSet resultSet, final List<List<T>> expectedResults)
-      throws SQLException {
-    testData(resultSet, expectedResults, collector);
-  }
-
-  /**
-   * Checks that the values (rows and columns) in the provided {@link ResultSet} are expected.
-   *
-   * @param resultSet       the {@code ResultSet} to assert.
-   * @param columnNames     the column names to fetch in the {@code ResultSet} for comparison.
-   * @param expectedResults the rows and columns representing the only values the {@code resultSet} is expected to have.
-   * @param <T>             the type to be found in the expected results for the {@code resultSet}.
-   * @throws SQLException if querying the {@code ResultSet} fails at some point unexpectedly.
-   */
-  @SuppressWarnings("unchecked")
-  public <T> void testData(final ResultSet resultSet, final List<String> columnNames,
-                           final List<List<T>> expectedResults) throws SQLException {
-    testData(resultSet, columnNames, expectedResults, collector);
-  }
-
-  /**
-   * Checks that the values (rows and columns) in the provided {@link ResultSet} are expected.
-   *
-   * @param resultSet       the {@code ResultSet} to assert.
-   * @param columnIndices   the column indices to fetch in the {@code ResultSet} for comparison.
-   * @param expectedResults the rows and columns representing the only values the {@code resultSet} is expected to have.
-   * @param <T>             the type to be found in the expected results for the {@code resultSet}.
-   * @throws SQLException if querying the {@code ResultSet} fails at some point unexpectedly.
-   */
-  @SuppressWarnings("unchecked")
-  public <T> void testData(final ResultSet resultSet, final int[] columnIndices,
-                           final List<List<T>> expectedResults) throws SQLException {
-    testData(resultSet, columnIndices, expectedResults, collector);
-  }
-
-  /**
-   * Checks that the values (rows and columns) in the provided {@link ResultSet} are expected.
-   *
-   * @param resultSet       the {@code ResultSet} to assert.
-   * @param dataConsumer    the column indices to fetch in the {@code ResultSet} for comparison.
-   * @param expectedResults the rows and columns representing the only values the {@code resultSet} is expected to have.
-   * @param <T>             the type to be found in the expected results for the {@code resultSet}.
-   * @throws SQLException if querying the {@code ResultSet} fails at some point unexpectedly.
-   */
-  public <T> void testData(final ResultSet resultSet,
-                           final Function<ResultSet, List<T>> dataConsumer,
-                           final List<List<T>> expectedResults) throws SQLException {
-    testData(resultSet, dataConsumer, expectedResults, collector);
+    assertThat(actualResults, is(expectedResults));
   }
 }
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/RootAllocatorTestRule.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/RootAllocatorTestExtension.java
similarity index 76%
rename from java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/RootAllocatorTestRule.java
rename to java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/RootAllocatorTestExtension.java
index fd8fb57fcafde..347e92a16c4e5 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/RootAllocatorTestRule.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/RootAllocatorTestExtension.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import java.math.BigDecimal;
@@ -22,7 +21,6 @@
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.IntStream;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.util.AutoCloseables;
@@ -62,11 +60,12 @@
 import org.apache.arrow.vector.complex.impl.UnionFixedSizeListWriter;
 import org.apache.arrow.vector.complex.impl.UnionLargeListWriter;
 import org.apache.arrow.vector.complex.impl.UnionListWriter;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
 
-public class RootAllocatorTestRule implements TestRule, AutoCloseable {
+public class RootAllocatorTestExtension
+    implements BeforeAllCallback, AfterAllCallback, AutoCloseable {
 
   public static final byte MAX_VALUE = Byte.MAX_VALUE;
   private final BufferAllocator rootAllocator = new RootAllocator();
@@ -74,17 +73,17 @@ public class RootAllocatorTestRule implements TestRule, AutoCloseable {
   private final Random random = new Random(10);
 
   @Override
-  public Statement apply(Statement base, Description description) {
-    return new Statement() {
-      @Override
-      public void evaluate() throws Throwable {
-        try {
-          base.evaluate();
-        } finally {
-          close();
-        }
-      }
-    };
+  public void beforeAll(ExtensionContext context) {
+    // no-op
+  }
+
+  @Override
+  public void afterAll(ExtensionContext context) {
+    try {
+      close();
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
   }
 
   public BufferAllocator getRootAllocator() {
@@ -103,31 +102,32 @@ public void close() throws Exception {
    * @return Float8Vector
    */
   public Float8Vector createFloat8Vector() {
-    double[] doubleVectorValues = new double[] {
-        0,
-        1,
-        -1,
-        Byte.MIN_VALUE,
-        Byte.MAX_VALUE,
-        Short.MIN_VALUE,
-        Short.MAX_VALUE,
-        Integer.MIN_VALUE,
-        Integer.MAX_VALUE,
-        Long.MIN_VALUE,
-        Long.MAX_VALUE,
-        Float.MAX_VALUE,
-        -Float.MAX_VALUE,
-        Float.NEGATIVE_INFINITY,
-        Float.POSITIVE_INFINITY,
-        Float.MIN_VALUE,
-        -Float.MIN_VALUE,
-        Double.MAX_VALUE,
-        -Double.MAX_VALUE,
-        Double.NEGATIVE_INFINITY,
-        Double.POSITIVE_INFINITY,
-        Double.MIN_VALUE,
-        -Double.MIN_VALUE,
-    };
+    double[] doubleVectorValues =
+        new double[] {
+          0,
+          1,
+          -1,
+          Byte.MIN_VALUE,
+          Byte.MAX_VALUE,
+          Short.MIN_VALUE,
+          Short.MAX_VALUE,
+          Integer.MIN_VALUE,
+          Integer.MAX_VALUE,
+          Long.MIN_VALUE,
+          Long.MAX_VALUE,
+          Float.MAX_VALUE,
+          -Float.MAX_VALUE,
+          Float.NEGATIVE_INFINITY,
+          Float.POSITIVE_INFINITY,
+          Float.MIN_VALUE,
+          -Float.MIN_VALUE,
+          Double.MAX_VALUE,
+          -Double.MAX_VALUE,
+          Double.NEGATIVE_INFINITY,
+          Double.POSITIVE_INFINITY,
+          Double.MIN_VALUE,
+          -Double.MIN_VALUE,
+        };
 
     Float8Vector result = new Float8Vector("", this.getRootAllocator());
     result.setValueCount(MAX_VALUE);
@@ -158,25 +158,26 @@ public Float8Vector createFloat8VectorForNullTests() {
    */
   public Float4Vector createFloat4Vector() {
 
-    float[] floatVectorValues = new float[] {
-        0,
-        1,
-        -1,
-        Byte.MIN_VALUE,
-        Byte.MAX_VALUE,
-        Short.MIN_VALUE,
-        Short.MAX_VALUE,
-        Integer.MIN_VALUE,
-        Integer.MAX_VALUE,
-        Long.MIN_VALUE,
-        Long.MAX_VALUE,
-        Float.MAX_VALUE,
-        -Float.MAX_VALUE,
-        Float.NEGATIVE_INFINITY,
-        Float.POSITIVE_INFINITY,
-        Float.MIN_VALUE,
-        -Float.MIN_VALUE,
-    };
+    float[] floatVectorValues =
+        new float[] {
+          0,
+          1,
+          -1,
+          Byte.MIN_VALUE,
+          Byte.MAX_VALUE,
+          Short.MIN_VALUE,
+          Short.MAX_VALUE,
+          Integer.MIN_VALUE,
+          Integer.MAX_VALUE,
+          Long.MIN_VALUE,
+          Long.MAX_VALUE,
+          Float.MAX_VALUE,
+          -Float.MAX_VALUE,
+          Float.NEGATIVE_INFINITY,
+          Float.POSITIVE_INFINITY,
+          Float.MIN_VALUE,
+          -Float.MIN_VALUE,
+        };
 
     Float4Vector result = new Float4Vector("", this.getRootAllocator());
     result.setValueCount(MAX_VALUE);
@@ -198,17 +199,18 @@ public Float4Vector createFloat4Vector() {
    */
   public IntVector createIntVector() {
 
-    int[] intVectorValues = new int[] {
-        0,
-        1,
-        -1,
-        Byte.MIN_VALUE,
-        Byte.MAX_VALUE,
-        Short.MIN_VALUE,
-        Short.MAX_VALUE,
-        Integer.MIN_VALUE,
-        Integer.MAX_VALUE,
-    };
+    int[] intVectorValues =
+        new int[] {
+          0,
+          1,
+          -1,
+          Byte.MIN_VALUE,
+          Byte.MAX_VALUE,
+          Short.MIN_VALUE,
+          Short.MAX_VALUE,
+          Integer.MIN_VALUE,
+          Integer.MAX_VALUE,
+        };
 
     IntVector result = new IntVector("", this.getRootAllocator());
     result.setValueCount(MAX_VALUE);
@@ -230,15 +232,10 @@ public IntVector createIntVector() {
    */
   public SmallIntVector createSmallIntVector() {
 
-    short[] smallIntVectorValues = new short[] {
-        0,
-        1,
-        -1,
-        Byte.MIN_VALUE,
-        Byte.MAX_VALUE,
-        Short.MIN_VALUE,
-        Short.MAX_VALUE,
-    };
+    short[] smallIntVectorValues =
+        new short[] {
+          0, 1, -1, Byte.MIN_VALUE, Byte.MAX_VALUE, Short.MIN_VALUE, Short.MAX_VALUE,
+        };
 
     SmallIntVector result = new SmallIntVector("", this.getRootAllocator());
     result.setValueCount(MAX_VALUE);
@@ -260,13 +257,10 @@ public SmallIntVector createSmallIntVector() {
    */
   public TinyIntVector createTinyIntVector() {
 
-    byte[] byteVectorValues = new byte[] {
-        0,
-        1,
-        -1,
-        Byte.MIN_VALUE,
-        Byte.MAX_VALUE,
-    };
+    byte[] byteVectorValues =
+        new byte[] {
+          0, 1, -1, Byte.MIN_VALUE, Byte.MAX_VALUE,
+        };
 
     TinyIntVector result = new TinyIntVector("", this.getRootAllocator());
     result.setValueCount(MAX_VALUE);
@@ -288,19 +282,20 @@ public TinyIntVector createTinyIntVector() {
    */
   public BigIntVector createBigIntVector() {
 
-    long[] longVectorValues = new long[] {
-        0,
-        1,
-        -1,
-        Byte.MIN_VALUE,
-        Byte.MAX_VALUE,
-        Short.MIN_VALUE,
-        Short.MAX_VALUE,
-        Integer.MIN_VALUE,
-        Integer.MAX_VALUE,
-        Long.MIN_VALUE,
-        Long.MAX_VALUE,
-    };
+    long[] longVectorValues =
+        new long[] {
+          0,
+          1,
+          -1,
+          Byte.MIN_VALUE,
+          Byte.MAX_VALUE,
+          Short.MIN_VALUE,
+          Short.MAX_VALUE,
+          Integer.MIN_VALUE,
+          Integer.MAX_VALUE,
+          Long.MIN_VALUE,
+          Long.MAX_VALUE,
+        };
 
     BigIntVector result = new BigIntVector("", this.getRootAllocator());
     result.setValueCount(MAX_VALUE);
@@ -322,13 +317,10 @@ public BigIntVector createBigIntVector() {
    */
   public UInt1Vector createUInt1Vector() {
 
-    short[] uInt1VectorValues = new short[] {
-        0,
-        1,
-        -1,
-        Byte.MIN_VALUE,
-        Byte.MAX_VALUE,
-    };
+    short[] uInt1VectorValues =
+        new short[] {
+          0, 1, -1, Byte.MIN_VALUE, Byte.MAX_VALUE,
+        };
 
     UInt1Vector result = new UInt1Vector("", this.getRootAllocator());
     result.setValueCount(MAX_VALUE);
@@ -350,15 +342,10 @@ public UInt1Vector createUInt1Vector() {
    */
   public UInt2Vector createUInt2Vector() {
 
-    int[] uInt2VectorValues = new int[] {
-        0,
-        1,
-        -1,
-        Byte.MIN_VALUE,
-        Byte.MAX_VALUE,
-        Short.MIN_VALUE,
-        Short.MAX_VALUE,
-    };
+    int[] uInt2VectorValues =
+        new int[] {
+          0, 1, -1, Byte.MIN_VALUE, Byte.MAX_VALUE, Short.MIN_VALUE, Short.MAX_VALUE,
+        };
 
     UInt2Vector result = new UInt2Vector("", this.getRootAllocator());
     result.setValueCount(MAX_VALUE);
@@ -380,18 +367,18 @@ public UInt2Vector createUInt2Vector() {
    */
   public UInt4Vector createUInt4Vector() {
 
-
-    int[] uInt4VectorValues = new int[] {
-        0,
-        1,
-        -1,
-        Byte.MIN_VALUE,
-        Byte.MAX_VALUE,
-        Short.MIN_VALUE,
-        Short.MAX_VALUE,
-        Integer.MIN_VALUE,
-        Integer.MAX_VALUE
-    };
+    int[] uInt4VectorValues =
+        new int[] {
+          0,
+          1,
+          -1,
+          Byte.MIN_VALUE,
+          Byte.MAX_VALUE,
+          Short.MIN_VALUE,
+          Short.MAX_VALUE,
+          Integer.MIN_VALUE,
+          Integer.MAX_VALUE
+        };
 
     UInt4Vector result = new UInt4Vector("", this.getRootAllocator());
     result.setValueCount(MAX_VALUE);
@@ -413,19 +400,20 @@ public UInt4Vector createUInt4Vector() {
    */
   public UInt8Vector createUInt8Vector() {
 
-    long[] uInt8VectorValues = new long[] {
-        0,
-        1,
-        -1,
-        Byte.MIN_VALUE,
-        Byte.MAX_VALUE,
-        Short.MIN_VALUE,
-        Short.MAX_VALUE,
-        Integer.MIN_VALUE,
-        Integer.MAX_VALUE,
-        Long.MIN_VALUE,
-        Long.MAX_VALUE
-    };
+    long[] uInt8VectorValues =
+        new long[] {
+          0,
+          1,
+          -1,
+          Byte.MIN_VALUE,
+          Byte.MAX_VALUE,
+          Short.MIN_VALUE,
+          Short.MAX_VALUE,
+          Integer.MIN_VALUE,
+          Integer.MAX_VALUE,
+          Long.MIN_VALUE,
+          Long.MAX_VALUE
+        };
 
     UInt8Vector result = new UInt8Vector("", this.getRootAllocator());
     result.setValueCount(MAX_VALUE);
@@ -504,20 +492,21 @@ public FixedSizeBinaryVector createFixedSizeBinaryVector() {
    */
   public DecimalVector createDecimalVector() {
 
-    BigDecimal[] bigDecimalValues = new BigDecimal[] {
-        new BigDecimal(0),
-        new BigDecimal(1),
-        new BigDecimal(-1),
-        new BigDecimal(Byte.MIN_VALUE),
-        new BigDecimal(Byte.MAX_VALUE),
-        new BigDecimal(-Short.MAX_VALUE),
-        new BigDecimal(Short.MIN_VALUE),
-        new BigDecimal(Integer.MIN_VALUE),
-        new BigDecimal(Integer.MAX_VALUE),
-        new BigDecimal(Long.MIN_VALUE),
-        new BigDecimal(-Long.MAX_VALUE),
-        new BigDecimal("170141183460469231731687303715884105727")
-    };
+    BigDecimal[] bigDecimalValues =
+        new BigDecimal[] {
+          new BigDecimal(0),
+          new BigDecimal(1),
+          new BigDecimal(-1),
+          new BigDecimal(Byte.MIN_VALUE),
+          new BigDecimal(Byte.MAX_VALUE),
+          new BigDecimal(-Short.MAX_VALUE),
+          new BigDecimal(Short.MIN_VALUE),
+          new BigDecimal(Integer.MIN_VALUE),
+          new BigDecimal(Integer.MAX_VALUE),
+          new BigDecimal(Long.MIN_VALUE),
+          new BigDecimal(-Long.MAX_VALUE),
+          new BigDecimal("170141183460469231731687303715884105727")
+        };
 
     DecimalVector result = new DecimalVector("ID", this.getRootAllocator(), 39, 0);
     result.setValueCount(MAX_VALUE);
@@ -539,30 +528,31 @@ public DecimalVector createDecimalVector() {
    */
   public Decimal256Vector createDecimal256Vector() {
 
-    BigDecimal[] bigDecimalValues = new BigDecimal[] {
-        new BigDecimal(0),
-        new BigDecimal(1),
-        new BigDecimal(-1),
-        new BigDecimal(Byte.MIN_VALUE),
-        new BigDecimal(Byte.MAX_VALUE),
-        new BigDecimal(-Short.MAX_VALUE),
-        new BigDecimal(Short.MIN_VALUE),
-        new BigDecimal(Integer.MIN_VALUE),
-        new BigDecimal(Integer.MAX_VALUE),
-        new BigDecimal(Long.MIN_VALUE),
-        new BigDecimal(-Long.MAX_VALUE),
-        new BigDecimal("170141183460469231731687303715884105727"),
-        new BigDecimal("17014118346046923173168234157303715884105727"),
-        new BigDecimal("1701411834604692317316823415265417303715884105727"),
-        new BigDecimal("-17014118346046923173168234152654115451237303715884105727"),
-        new BigDecimal("-17014118346046923173168234152654115451231545157303715884105727"),
-        new BigDecimal("1701411834604692315815656534152654115451231545157303715884105727"),
-        new BigDecimal("30560141183460469231581565634152654115451231545157303715884105727"),
-        new BigDecimal(
-            "57896044618658097711785492504343953926634992332820282019728792003956564819967"),
-        new BigDecimal(
-            "-56896044618658097711785492504343953926634992332820282019728792003956564819967")
-    };
+    BigDecimal[] bigDecimalValues =
+        new BigDecimal[] {
+          new BigDecimal(0),
+          new BigDecimal(1),
+          new BigDecimal(-1),
+          new BigDecimal(Byte.MIN_VALUE),
+          new BigDecimal(Byte.MAX_VALUE),
+          new BigDecimal(-Short.MAX_VALUE),
+          new BigDecimal(Short.MIN_VALUE),
+          new BigDecimal(Integer.MIN_VALUE),
+          new BigDecimal(Integer.MAX_VALUE),
+          new BigDecimal(Long.MIN_VALUE),
+          new BigDecimal(-Long.MAX_VALUE),
+          new BigDecimal("170141183460469231731687303715884105727"),
+          new BigDecimal("17014118346046923173168234157303715884105727"),
+          new BigDecimal("1701411834604692317316823415265417303715884105727"),
+          new BigDecimal("-17014118346046923173168234152654115451237303715884105727"),
+          new BigDecimal("-17014118346046923173168234152654115451231545157303715884105727"),
+          new BigDecimal("1701411834604692315815656534152654115451231545157303715884105727"),
+          new BigDecimal("30560141183460469231581565634152654115451231545157303715884105727"),
+          new BigDecimal(
+              "57896044618658097711785492504343953926634992332820282019728792003956564819967"),
+          new BigDecimal(
+              "-56896044618658097711785492504343953926634992332820282019728792003956564819967")
+        };
 
     Decimal256Vector result = new Decimal256Vector("ID", this.getRootAllocator(), 77, 0);
     result.setValueCount(MAX_VALUE);
@@ -764,13 +754,14 @@ public ListVector createListVector(String fieldName) {
 
     IntStream range = IntStream.range(0, MAX_VALUE);
 
-    range.forEach(row -> {
-      writer.startList();
-      writer.setPosition(row);
-      IntStream.range(0, 5).map(j -> j * row).forEach(writer::writeInt);
-      writer.setValueCount(5);
-      writer.endList();
-    });
+    range.forEach(
+        row -> {
+          writer.startList();
+          writer.setPosition(row);
+          IntStream.range(0, 5).map(j -> j * row).forEach(writer::writeInt);
+          writer.setValueCount(5);
+          writer.endList();
+        });
 
     valueVector.setValueCount(MAX_VALUE);
 
@@ -785,13 +776,14 @@ public LargeListVector createLargeListVector() {
 
     IntStream range = IntStream.range(0, MAX_VALUE);
 
-    range.forEach(row -> {
-      writer.startList();
-      writer.setPosition(row);
-      IntStream.range(0, 5).map(j -> j * row).forEach(writer::writeInt);
-      writer.setValueCount(5);
-      writer.endList();
-    });
+    range.forEach(
+        row -> {
+          writer.startList();
+          writer.setPosition(row);
+          IntStream.range(0, 5).map(j -> j * row).forEach(writer::writeInt);
+          writer.setValueCount(5);
+          writer.endList();
+        });
 
     valueVector.setValueCount(MAX_VALUE);
 
@@ -806,13 +798,14 @@ public FixedSizeListVector createFixedSizeListVector() {
 
     IntStream range = IntStream.range(0, MAX_VALUE);
 
-    range.forEach(row -> {
-      writer.startList();
-      writer.setPosition(row);
-      IntStream.range(0, 5).map(j -> j * row).forEach(writer::writeInt);
-      writer.setValueCount(5);
-      writer.endList();
-    });
+    range.forEach(
+        row -> {
+          writer.startList();
+          writer.setPosition(row);
+          IntStream.range(0, 5).map(j -> j * row).forEach(writer::writeInt);
+          writer.setValueCount(5);
+          writer.endList();
+        });
 
     valueVector.setValueCount(MAX_VALUE);
 
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/SqlTypesTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/SqlTypesTest.java
index 5c7c873e55c41..00af3c96ba054 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/SqlTypesTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/SqlTypesTest.java
@@ -14,22 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import static org.apache.arrow.driver.jdbc.utils.SqlTypes.getSqlTypeIdFromArrowType;
 import static org.apache.arrow.driver.jdbc.utils.SqlTypes.getSqlTypeNameFromArrowType;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.sql.Types;
-
 import org.apache.arrow.vector.types.DateUnit;
 import org.apache.arrow.vector.types.FloatingPointPrecision;
 import org.apache.arrow.vector.types.IntervalUnit;
 import org.apache.arrow.vector.types.TimeUnit;
 import org.apache.arrow.vector.types.UnionMode;
 import org.apache.arrow.vector.types.pojo.ArrowType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SqlTypesTest {
 
@@ -48,17 +46,20 @@ public void testGetSqlTypeIdFromArrowType() {
     assertEquals(Types.LONGVARCHAR, getSqlTypeIdFromArrowType(new ArrowType.LargeUtf8()));
 
     assertEquals(Types.DATE, getSqlTypeIdFromArrowType(new ArrowType.Date(DateUnit.MILLISECOND)));
-    assertEquals(Types.TIME,
-        getSqlTypeIdFromArrowType(new ArrowType.Time(TimeUnit.MILLISECOND, 32)));
-    assertEquals(Types.TIMESTAMP,
+    assertEquals(
+        Types.TIME, getSqlTypeIdFromArrowType(new ArrowType.Time(TimeUnit.MILLISECOND, 32)));
+    assertEquals(
+        Types.TIMESTAMP,
         getSqlTypeIdFromArrowType(new ArrowType.Timestamp(TimeUnit.MILLISECOND, "")));
 
     assertEquals(Types.BOOLEAN, getSqlTypeIdFromArrowType(new ArrowType.Bool()));
 
     assertEquals(Types.DECIMAL, getSqlTypeIdFromArrowType(new ArrowType.Decimal(0, 0, 64)));
-    assertEquals(Types.DOUBLE,
+    assertEquals(
+        Types.DOUBLE,
         getSqlTypeIdFromArrowType(new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)));
-    assertEquals(Types.FLOAT,
+    assertEquals(
+        Types.FLOAT,
         getSqlTypeIdFromArrowType(new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)));
 
     assertEquals(Types.ARRAY, getSqlTypeIdFromArrowType(new ArrowType.List()));
@@ -66,12 +67,13 @@ public void testGetSqlTypeIdFromArrowType() {
     assertEquals(Types.ARRAY, getSqlTypeIdFromArrowType(new ArrowType.FixedSizeList(10)));
 
     assertEquals(Types.JAVA_OBJECT, getSqlTypeIdFromArrowType(new ArrowType.Struct()));
-    assertEquals(Types.JAVA_OBJECT,
-        getSqlTypeIdFromArrowType(new ArrowType.Duration(TimeUnit.MILLISECOND)));
-    assertEquals(Types.JAVA_OBJECT,
+    assertEquals(
+        Types.JAVA_OBJECT, getSqlTypeIdFromArrowType(new ArrowType.Duration(TimeUnit.MILLISECOND)));
+    assertEquals(
+        Types.JAVA_OBJECT,
         getSqlTypeIdFromArrowType(new ArrowType.Interval(IntervalUnit.DAY_TIME)));
-    assertEquals(Types.JAVA_OBJECT,
-        getSqlTypeIdFromArrowType(new ArrowType.Union(UnionMode.Dense, null)));
+    assertEquals(
+        Types.JAVA_OBJECT, getSqlTypeIdFromArrowType(new ArrowType.Union(UnionMode.Dense, null)));
     assertEquals(Types.JAVA_OBJECT, getSqlTypeIdFromArrowType(new ArrowType.Map(true)));
 
     assertEquals(Types.NULL, getSqlTypeIdFromArrowType(new ArrowType.Null()));
@@ -93,15 +95,18 @@ public void testGetSqlTypeNameFromArrowType() {
 
     assertEquals("DATE", getSqlTypeNameFromArrowType(new ArrowType.Date(DateUnit.MILLISECOND)));
     assertEquals("TIME", getSqlTypeNameFromArrowType(new ArrowType.Time(TimeUnit.MILLISECOND, 32)));
-    assertEquals("TIMESTAMP",
+    assertEquals(
+        "TIMESTAMP",
         getSqlTypeNameFromArrowType(new ArrowType.Timestamp(TimeUnit.MILLISECOND, "")));
 
     assertEquals("BOOLEAN", getSqlTypeNameFromArrowType(new ArrowType.Bool()));
 
     assertEquals("DECIMAL", getSqlTypeNameFromArrowType(new ArrowType.Decimal(0, 0, 64)));
-    assertEquals("DOUBLE",
+    assertEquals(
+        "DOUBLE",
         getSqlTypeNameFromArrowType(new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)));
-    assertEquals("FLOAT",
+    assertEquals(
+        "FLOAT",
         getSqlTypeNameFromArrowType(new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)));
 
     assertEquals("ARRAY", getSqlTypeNameFromArrowType(new ArrowType.List()));
@@ -110,12 +115,12 @@ public void testGetSqlTypeNameFromArrowType() {
 
     assertEquals("JAVA_OBJECT", getSqlTypeNameFromArrowType(new ArrowType.Struct()));
 
-    assertEquals("JAVA_OBJECT",
-        getSqlTypeNameFromArrowType(new ArrowType.Duration(TimeUnit.MILLISECOND)));
-    assertEquals("JAVA_OBJECT",
-        getSqlTypeNameFromArrowType(new ArrowType.Interval(IntervalUnit.DAY_TIME)));
-    assertEquals("JAVA_OBJECT",
-        getSqlTypeNameFromArrowType(new ArrowType.Union(UnionMode.Dense, null)));
+    assertEquals(
+        "JAVA_OBJECT", getSqlTypeNameFromArrowType(new ArrowType.Duration(TimeUnit.MILLISECOND)));
+    assertEquals(
+        "JAVA_OBJECT", getSqlTypeNameFromArrowType(new ArrowType.Interval(IntervalUnit.DAY_TIME)));
+    assertEquals(
+        "JAVA_OBJECT", getSqlTypeNameFromArrowType(new ArrowType.Union(UnionMode.Dense, null)));
     assertEquals("JAVA_OBJECT", getSqlTypeNameFromArrowType(new ArrowType.Map(true)));
 
     assertEquals("NULL", getSqlTypeNameFromArrowType(new ArrowType.Null()));
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ThrowableAssertionUtils.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ThrowableAssertionUtils.java
index 48334dc0f92e2..0280cbc910dba 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ThrowableAssertionUtils.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ThrowableAssertionUtils.java
@@ -14,16 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 /**
- * Utility class to avoid upgrading JUnit to version >= 4.13 and keep using code to assert a {@link Throwable}.
- * This should be removed as soon as we can use the proper assertThrows/checkThrows.
+ * Utility class to avoid upgrading JUnit to version >= 4.13 and keep using code to assert a {@link
+ * Throwable}. This should be removed as soon as we can use the proper assertThrows/checkThrows.
  */
 public class ThrowableAssertionUtils {
-  private ThrowableAssertionUtils() {
-  }
+  private ThrowableAssertionUtils() {}
 
   public static void simpleAssertThrowableClass(
       final Class<? extends Throwable> expectedThrowable, final ThrowingRunnable runnable) {
@@ -33,15 +31,17 @@ public static void simpleAssertThrowableClass(
       if (expectedThrowable.isInstance(actualThrown)) {
         return;
       } else {
-        final String mismatchMessage = String.format("unexpected exception type thrown;\nexpected: %s\nactual: %s",
-            formatClass(expectedThrowable),
-            formatClass(actualThrown.getClass()));
+        final String mismatchMessage =
+            String.format(
+                "unexpected exception type thrown;\nexpected: %s\nactual: %s",
+                formatClass(expectedThrowable), formatClass(actualThrown.getClass()));
 
         throw new AssertionError(mismatchMessage, actualThrown);
       }
     }
-    final String notThrownMessage = String.format("expected %s to be thrown, but nothing was thrown",
-        formatClass(expectedThrowable));
+    final String notThrownMessage =
+        String.format(
+            "expected %s to be thrown, but nothing was thrown", formatClass(expectedThrowable));
     throw new AssertionError(notThrownMessage);
   }
 
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/UrlParserTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/UrlParserTest.java
index 4e764ab322c69..529a05e881374 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/UrlParserTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/UrlParserTest.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.util.Map;
-
 import org.junit.jupiter.api.Test;
 
 class UrlParserTest {
diff --git a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/VectorSchemaRootTransformerTest.java b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/VectorSchemaRootTransformerTest.java
index 1804b42cecb88..a4499ab0aa1c1 100644
--- a/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/VectorSchemaRootTransformerTest.java
+++ b/java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/VectorSchemaRootTransformerTest.java
@@ -14,12 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.driver.jdbc.utils;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+
+import com.google.common.collect.ImmutableList;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.VarBinaryVector;
@@ -30,30 +34,28 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableList;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class VectorSchemaRootTransformerTest {
 
-  @Rule
-  public RootAllocatorTestRule rootAllocatorTestRule = new RootAllocatorTestRule();
-  private final BufferAllocator rootAllocator = rootAllocatorTestRule.getRootAllocator();
+  @RegisterExtension
+  public static RootAllocatorTestExtension rootAllocatorTestExtension =
+      new RootAllocatorTestExtension();
+
+  private final BufferAllocator rootAllocator = rootAllocatorTestExtension.getRootAllocator();
 
   @Test
   public void testTransformerBuilderWorksCorrectly() throws Exception {
-    final VarBinaryVector field1 = rootAllocatorTestRule.createVarBinaryVector("FIELD_1");
-    final VarBinaryVector field2 = rootAllocatorTestRule.createVarBinaryVector("FIELD_2");
-    final VarBinaryVector field3 = rootAllocatorTestRule.createVarBinaryVector("FIELD_3");
+    final VarBinaryVector field1 = rootAllocatorTestExtension.createVarBinaryVector("FIELD_1");
+    final VarBinaryVector field2 = rootAllocatorTestExtension.createVarBinaryVector("FIELD_2");
+    final VarBinaryVector field3 = rootAllocatorTestExtension.createVarBinaryVector("FIELD_3");
 
     try (final VectorSchemaRoot originalRoot = VectorSchemaRoot.of(field1, field2, field3);
-         final VectorSchemaRoot clonedRoot = cloneVectorSchemaRoot(originalRoot)) {
+        final VectorSchemaRoot clonedRoot = cloneVectorSchemaRoot(originalRoot)) {
 
       final VectorSchemaRootTransformer.Builder builder =
-          new VectorSchemaRootTransformer.Builder(originalRoot.getSchema(),
-              rootAllocator);
+          new VectorSchemaRootTransformer.Builder(originalRoot.getSchema(), rootAllocator);
 
       builder.renameFieldVector("FIELD_3", "FIELD_3_RENAMED");
       builder.addEmptyField("EMPTY_FIELD", new ArrowType.Bool());
@@ -62,25 +64,23 @@ public void testTransformerBuilderWorksCorrectly() throws Exception {
 
       final VectorSchemaRootTransformer transformer = builder.build();
 
-      final Schema transformedSchema = new Schema(ImmutableList.of(
-          Field.nullable("FIELD_3_RENAMED", new ArrowType.Binary()),
-          Field.nullable("EMPTY_FIELD", new ArrowType.Bool()),
-          Field.nullable("FIELD_2_RENAMED", new ArrowType.Binary()),
-          Field.nullable("FIELD_1_RENAMED", new ArrowType.Binary())
-      ));
+      final Schema transformedSchema =
+          new Schema(
+              ImmutableList.of(
+                  Field.nullable("FIELD_3_RENAMED", new ArrowType.Binary()),
+                  Field.nullable("EMPTY_FIELD", new ArrowType.Bool()),
+                  Field.nullable("FIELD_2_RENAMED", new ArrowType.Binary()),
+                  Field.nullable("FIELD_1_RENAMED", new ArrowType.Binary())));
       try (final VectorSchemaRoot transformedRoot = createVectorSchemaRoot(transformedSchema)) {
-        Assert.assertSame(transformedRoot, transformer.transform(clonedRoot, transformedRoot));
-        Assert.assertEquals(transformedSchema, transformedRoot.getSchema());
+        assertSame(transformedRoot, transformer.transform(clonedRoot, transformedRoot));
+        assertEquals(transformedSchema, transformedRoot.getSchema());
 
         final int rowCount = originalRoot.getRowCount();
-        Assert.assertEquals(rowCount, transformedRoot.getRowCount());
+        assertEquals(rowCount, transformedRoot.getRowCount());
 
-        final VarBinaryVector originalField1 =
-            (VarBinaryVector) originalRoot.getVector("FIELD_1");
-        final VarBinaryVector originalField2 =
-            (VarBinaryVector) originalRoot.getVector("FIELD_2");
-        final VarBinaryVector originalField3 =
-            (VarBinaryVector) originalRoot.getVector("FIELD_3");
+        final VarBinaryVector originalField1 = (VarBinaryVector) originalRoot.getVector("FIELD_1");
+        final VarBinaryVector originalField2 = (VarBinaryVector) originalRoot.getVector("FIELD_2");
+        final VarBinaryVector originalField3 = (VarBinaryVector) originalRoot.getVector("FIELD_3");
 
         final VarBinaryVector transformedField1 =
             (VarBinaryVector) transformedRoot.getVector("FIELD_1_RENAMED");
@@ -91,10 +91,10 @@ public void testTransformerBuilderWorksCorrectly() throws Exception {
         final FieldVector emptyField = transformedRoot.getVector("EMPTY_FIELD");
 
         for (int i = 0; i < rowCount; i++) {
-          Assert.assertArrayEquals(originalField1.getObject(i), transformedField1.getObject(i));
-          Assert.assertArrayEquals(originalField2.getObject(i), transformedField2.getObject(i));
-          Assert.assertArrayEquals(originalField3.getObject(i), transformedField3.getObject(i));
-          Assert.assertNull(emptyField.getObject(i));
+          assertArrayEquals(originalField1.getObject(i), transformedField1.getObject(i));
+          assertArrayEquals(originalField2.getObject(i), transformedField2.getObject(i));
+          assertArrayEquals(originalField3.getObject(i), transformedField3.getObject(i));
+          assertNull(emptyField.getObject(i));
         }
       }
     }
@@ -111,9 +111,10 @@ private VectorSchemaRoot cloneVectorSchemaRoot(final VectorSchemaRoot originalRo
   }
 
   private VectorSchemaRoot createVectorSchemaRoot(final Schema schema) {
-    final List<FieldVector> fieldVectors = schema.getFields().stream()
-        .map(field -> field.createVector(rootAllocator))
-        .collect(Collectors.toList());
+    final List<FieldVector> fieldVectors =
+        schema.getFields().stream()
+            .map(field -> field.createVector(rootAllocator))
+            .collect(Collectors.toList());
     return new VectorSchemaRoot(fieldVectors);
   }
 }
diff --git a/java/flight/flight-sql-jdbc-driver/pom.xml b/java/flight/flight-sql-jdbc-driver/pom.xml
index 84ec1ff8c1f95..23b2c9c7cbef4 100644
--- a/java/flight/flight-sql-jdbc-driver/pom.xml
+++ b/java/flight/flight-sql-jdbc-driver/pom.xml
@@ -1,239 +1,173 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>arrow-flight</artifactId>
-        <groupId>org.apache.arrow</groupId>
-        <version>16.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>flight-sql-jdbc-driver</artifactId>
-    <name>Arrow Flight SQL JDBC Driver</name>
-    <description>A JDBC driver based on Arrow Flight SQL.</description>
-    <packaging>jar</packaging>
-    <url>https://arrow.apache.org</url>
-
-    <dependencies>
-        <!-- https://mvnrepository.com/artifact/org.hamcrest/hamcrest -->
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest</artifactId>
-            <version>2.2</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>flight-sql-jdbc-core</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.70</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-core -->
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-memory-core</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>flight-sql</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito.core.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <version>${mockito.inline.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>flight-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>netty-transport-native-kqueue</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.netty</groupId>
-                    <artifactId>netty-transport-native-epoll</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-common</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>2.12.6</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.calcite.avatica</groupId>
-            <artifactId>avatica</artifactId>
-            <version>1.24.0</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-vector</artifactId>
-            <classifier>${arrow.vector.classifier}</classifier>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.15.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <enableAssertions>false</enableAssertions>
-                    <systemPropertyVariables>
-                        <arrow.test.dataRoot>${project.basedir}/../../../testing/data</arrow.test.dataRoot>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <shadedArtifactAttached>false</shadedArtifactAttached>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                            <minimizeJar>false</minimizeJar>
-                            <artifactSet>
-                                <includes>
-                                    <include>*:*</include>
-                                </includes>
-                            </artifactSet>
-                            <relocations>
-                                <relocation>
-                                    <pattern>com.</pattern>
-                                    <shadedPattern>cfjd.com.</shadedPattern>
-                                    <excludes>
-                                        <exclude>com.sun.**</exclude>
-                                    </excludes>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.</pattern>
-                                    <shadedPattern>cfjd.org.</shadedPattern>
-                                    <excludes>
-                                        <exclude>org.apache.arrow.driver.jdbc.**</exclude>
-                                        <exclude>org.slf4j.**</exclude>
-                                        <!-- Avoid shading Flight JDBC Properties -->
-                                        <exclude>org.apache.arrow.flight.name</exclude>
-                                        <exclude>org.apache.arrow.flight.version</exclude>
-                                        <exclude>org.apache.arrow.flight.jdbc-driver.name</exclude>
-                                        <exclude>org.apache.arrow.flight.jdbc-driver.version</exclude>
-                                    </excludes>
-                                </relocation>
-                                <relocation>
-                                    <pattern>io.</pattern>
-                                    <shadedPattern>cfjd.io.</shadedPattern>
-                                </relocation>
-                                <!-- Entries to relocate netty native libraries  -->
-                                <relocation>
-                                    <pattern>META-INF.native.libnetty_</pattern>
-                                    <shadedPattern>META-INF.native.libcfjd_netty_</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>META-INF.native.netty_</pattern>
-                                    <shadedPattern>META-INF.native.cfjd_netty_</shadedPattern>
-                                </relocation>
-                            </relocations>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                            </transformers>
-                            <filters>
-                                <filter>
-                                    <artifact>org.apache.calcite.avatica:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/services/java.sql.Driver</exclude>
-                                    </excludes>
-                                </filter>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>**/*.SF</exclude>
-                                        <exclude>**/*.RSA</exclude>
-                                        <exclude>**/*.DSA</exclude>
-                                        <exclude>META-INF/native/libio_grpc_netty*</exclude>
-                                        <exclude>META-INF/native/io_grpc_netty_shaded*</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+<!--
+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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.arrow</groupId>
+    <artifactId>arrow-flight</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>flight-sql-jdbc-driver</artifactId>
+  <packaging>jar</packaging>
+  <name>Arrow Flight SQL JDBC Driver</name>
+  <description>A JDBC driver based on Arrow Flight SQL.</description>
+  <url>https://arrow.apache.org</url>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>flight-sql-jdbc-core</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <!-- Used for tests but need runtime scope. See MNG-4156 -->
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <shadedArtifactAttached>false</shadedArtifactAttached>
+              <createDependencyReducedPom>true</createDependencyReducedPom>
+              <minimizeJar>false</minimizeJar>
+              <artifactSet>
+                <includes>
+                  <include>*:*</include>
+                </includes>
+                <excludes>
+                  <!-- Source annotations -->
+                  <exclude>org.checkerframework:checker-qual</exclude>
+                  <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
+                  <exclude>javax.annotation:javax.annotation-api</exclude>
+                  <exclude>com.google.android:annotations</exclude>
+                  <exclude>com.google.errorprone:error_prone_annotations</exclude>
+                  <exclude>com.google.code.findbugs:jsr305</exclude>
+                  <exclude>com.google.j2objc:j2objc-annotations</exclude>
+                </excludes>
+              </artifactSet>
+              <relocations>
+                <relocation>
+                  <pattern>com.</pattern>
+                  <shadedPattern>org.apache.arrow.driver.jdbc.shaded.com.</shadedPattern>
+                  <excludes>
+                    <exclude>com.sun.**</exclude>
+                  </excludes>
+                </relocation>
+                <relocation>
+                  <pattern>org.</pattern>
+                  <shadedPattern>org.apache.arrow.driver.jdbc.shaded.org.</shadedPattern>
+                  <excludes>
+                    <exclude>org.apache.arrow.driver.jdbc.**</exclude>
+                    <!-- Avoid shading Flight JDBC Properties -->
+                    <exclude>org.apache.arrow.flight.name</exclude>
+                    <exclude>org.apache.arrow.flight.version</exclude>
+                    <exclude>org.apache.arrow.flight.jdbc-driver.name</exclude>
+                    <exclude>org.apache.arrow.flight.jdbc-driver.version</exclude>
+                  </excludes>
+                </relocation>
+                <relocation>
+                  <pattern>io.</pattern>
+                  <shadedPattern>org.apache.arrow.driver.jdbc.shaded.io.</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>net.</pattern>
+                  <shadedPattern>org.apache.arrow.driver.jdbc.shaded.net.</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>mozilla.</pattern>
+                  <shadedPattern>org.apache.arrow.driver.jdbc.shaded.mozilla.</shadedPattern>
+                </relocation>
+                <!-- Entries to relocate netty native libraries  -->
+                <relocation>
+                  <pattern>META-INF.native.libnetty_</pattern>
+                  <shadedPattern>META-INF.native.liboaadj_netty_</shadedPattern>
+                </relocation>
+                <relocation>
+                  <pattern>META-INF.native.netty_</pattern>
+                  <shadedPattern>META-INF.native.oaadj_netty_</shadedPattern>
+                </relocation>
+              </relocations>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"></transformer>
+              </transformers>
+              <filters>
+                <filter>
+                  <artifact>org.apache.arrow:arrow-vector</artifact>
+                  <excludes>
+                    <exclude>codegen/**</exclude>
+                  </excludes>
+                </filter>
+                <filter>
+                  <artifact>org.apache.calcite.avatica:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/services/java.sql.Driver</exclude>
+                  </excludes>
+                </filter>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>**/*.SF</exclude>
+                    <exclude>**/*.RSA</exclude>
+                    <exclude>**/*.DSA</exclude>
+                    <exclude>META-INF/native/libio_grpc_netty*</exclude>
+                    <exclude>META-INF/native/io_grpc_netty_shaded*</exclude>
+                    <exclude>**/*.proto</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/java/flight/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ITDriverJarValidation.java b/java/flight/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ITDriverJarValidation.java
new file mode 100644
index 0000000000000..b45845485a041
--- /dev/null
+++ b/java/flight/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ITDriverJarValidation.java
@@ -0,0 +1,124 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.driver.jdbc;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import com.google.common.collect.ImmutableSet;
+import java.io.File;
+import java.io.IOException;
+import java.net.JarURLConnection;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+/**
+ * Check the content of the JDBC driver jar
+ *
+ * <p>After shading everything should be either under org.apache.arrow.driver.jdbc. package
+ */
+public class ITDriverJarValidation {
+  /**
+   * Use this property to provide path to the JDBC driver jar. Can be used to run the test from an
+   * IDE
+   */
+  public static final String JDBC_DRIVER_PATH_OVERRIDE =
+      System.getProperty("arrow-flight-jdbc-driver.jar.override");
+
+  /** List of allowed prefixes a jar entry may match. */
+  public static final Set<String> ALLOWED_PREFIXES =
+      ImmutableSet.of("org/apache/arrow/driver/jdbc/", "META-INF/");
+
+  /** List of allowed files a jar entry may match. */
+  public static final Set<String> ALLOWED_FILES =
+      ImmutableSet.of("arrow-git.properties", "properties/flight.properties");
+
+  // This method is designed to work with Maven failsafe plugin and expects the
+  // JDBC driver jar to be present in the test classpath (instead of the individual classes)
+  private static JarFile getJdbcJarFile() throws IOException {
+    // Check if an override has been set
+    if (JDBC_DRIVER_PATH_OVERRIDE != null) {
+      return new JarFile(new File(JDBC_DRIVER_PATH_OVERRIDE));
+    }
+
+    // Check classpath to find the driver jar
+    URL driverClassURL =
+        ITDriverJarValidation.class
+            .getClassLoader()
+            .getResource("org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriver.class");
+
+    assertNotNull(driverClassURL, "Driver jar was not detected in the classpath");
+    assertEquals(
+        "jar", driverClassURL.getProtocol(), "Driver jar was not detected in the classpath");
+
+    JarURLConnection connection = (JarURLConnection) driverClassURL.openConnection();
+    return connection.getJarFile();
+  }
+
+  @Test
+  @Timeout(value = 2, unit = TimeUnit.MINUTES)
+  public void validateShadedJar() throws IOException {
+    // Validate the content of the jar to enforce all 3rd party dependencies have
+    // been shaded
+    try (JarFile jar = getJdbcJarFile()) {
+      for (Enumeration<JarEntry> entries = jar.entries(); entries.hasMoreElements(); ) {
+        final JarEntry entry = entries.nextElement();
+        if (entry.isDirectory()) {
+          // Directories are ignored
+          continue;
+        }
+
+        try {
+          checkEntryAllowed(entry.getName());
+        } catch (AssertionError e) {
+          fail(e.getMessage());
+        }
+      }
+    }
+  }
+
+  /**
+   * Check if a jar entry is allowed.
+   *
+   * <p>A jar entry is allowed if either it is part of the allowed files or it matches one of the
+   * allowed prefixes
+   *
+   * @param name the jar entry name
+   * @throws AssertionError if the entry is not allowed
+   */
+  private void checkEntryAllowed(String name) {
+    // Check if there's a matching file entry first
+    if (ALLOWED_FILES.contains(name)) {
+      return;
+    }
+
+    for (String prefix : ALLOWED_PREFIXES) {
+      if (name.startsWith(prefix)) {
+        return;
+      }
+    }
+
+    throw new AssertionError("'" + name + "' is not an allowed jar entry");
+  }
+}
diff --git a/java/flight/flight-sql/pom.xml b/java/flight/flight-sql/pom.xml
index 1da6ed276011b..9c7b5b956d354 100644
--- a/java/flight/flight-sql/pom.xml
+++ b/java/flight/flight-sql/pom.xml
@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>arrow-flight</artifactId>
     <groupId>org.apache.arrow</groupId>
-    <version>16.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
+    <artifactId>arrow-flight</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>flight-sql</artifactId>
-  <name>Arrow Flight SQL</name>
-  <description>(Experimental)Contains utility classes to expose Flight SQL semantics for clients and servers over Arrow Flight</description>
   <packaging>jar</packaging>
+  <name>Arrow Flight SQL</name>
+  <description>Contains utility classes to expose Flight SQL semantics for clients and servers over Arrow Flight</description>
 
   <properties>
     <forkCount>1</forkCount>
@@ -52,7 +59,7 @@
     </dependency>
     <dependency>
       <groupId>org.immutables</groupId>
-      <artifactId>value</artifactId>
+      <artifactId>value-annotations</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.arrow</groupId>
@@ -109,7 +116,7 @@
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>1.6.0</version>
+      <version>1.8.0</version>
       <optional>true</optional>
     </dependency>
   </dependencies>
@@ -119,9 +126,6 @@
       <id>jdk11+</id>
       <activation>
         <jdk>[11,]</jdk>
-        <property>
-          <name>!m2e.version</name>
-        </property>
       </activation>
       <build>
         <plugins>
@@ -136,5 +140,4 @@
       </build>
     </profile>
   </profiles>
-
 </project>
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/BasicFlightSqlProducer.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/BasicFlightSqlProducer.java
index ea99191f28e13..74bfd654497db 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/BasicFlightSqlProducer.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/BasicFlightSqlProducer.java
@@ -14,51 +14,46 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql;
 
+import com.google.protobuf.Message;
 import java.util.List;
-
 import org.apache.arrow.flight.FlightDescriptor;
 import org.apache.arrow.flight.FlightEndpoint;
 import org.apache.arrow.flight.FlightInfo;
 import org.apache.arrow.flight.sql.impl.FlightSql;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-import com.google.protobuf.Message;
-
-/**
- * A {@link FlightSqlProducer} that implements getting FlightInfo for each metadata request.
- */
+/** A {@link FlightSqlProducer} that implements getting FlightInfo for each metadata request. */
 public abstract class BasicFlightSqlProducer extends NoOpFlightSqlProducer {
 
   @Override
-  public FlightInfo getFlightInfoSqlInfo(FlightSql.CommandGetSqlInfo request, CallContext context,
-                                         FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoSqlInfo(
+      FlightSql.CommandGetSqlInfo request, CallContext context, FlightDescriptor descriptor) {
     return generateFlightInfo(request, descriptor, Schemas.GET_SQL_INFO_SCHEMA);
   }
 
   @Override
-  public FlightInfo getFlightInfoTypeInfo(FlightSql.CommandGetXdbcTypeInfo request, CallContext context,
-                                          FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoTypeInfo(
+      FlightSql.CommandGetXdbcTypeInfo request, CallContext context, FlightDescriptor descriptor) {
     return generateFlightInfo(request, descriptor, Schemas.GET_TYPE_INFO_SCHEMA);
   }
 
   @Override
-  public FlightInfo getFlightInfoCatalogs(FlightSql.CommandGetCatalogs request, CallContext context,
-                                          FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoCatalogs(
+      FlightSql.CommandGetCatalogs request, CallContext context, FlightDescriptor descriptor) {
     return generateFlightInfo(request, descriptor, Schemas.GET_CATALOGS_SCHEMA);
   }
 
   @Override
-  public FlightInfo getFlightInfoSchemas(FlightSql.CommandGetDbSchemas request, CallContext context,
-                                         FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoSchemas(
+      FlightSql.CommandGetDbSchemas request, CallContext context, FlightDescriptor descriptor) {
     return generateFlightInfo(request, descriptor, Schemas.GET_SCHEMAS_SCHEMA);
   }
 
   @Override
-  public FlightInfo getFlightInfoTables(FlightSql.CommandGetTables request, CallContext context,
-                                        FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoTables(
+      FlightSql.CommandGetTables request, CallContext context, FlightDescriptor descriptor) {
     if (request.getIncludeSchema()) {
       return generateFlightInfo(request, descriptor, Schemas.GET_TABLES_SCHEMA);
     }
@@ -66,43 +61,46 @@ public FlightInfo getFlightInfoTables(FlightSql.CommandGetTables request, CallCo
   }
 
   @Override
-  public FlightInfo getFlightInfoTableTypes(FlightSql.CommandGetTableTypes request, CallContext context,
-                                            FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoTableTypes(
+      FlightSql.CommandGetTableTypes request, CallContext context, FlightDescriptor descriptor) {
     return generateFlightInfo(request, descriptor, Schemas.GET_TABLE_TYPES_SCHEMA);
   }
 
   @Override
-  public FlightInfo getFlightInfoPrimaryKeys(FlightSql.CommandGetPrimaryKeys request, CallContext context,
-                                             FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoPrimaryKeys(
+      FlightSql.CommandGetPrimaryKeys request, CallContext context, FlightDescriptor descriptor) {
     return generateFlightInfo(request, descriptor, Schemas.GET_PRIMARY_KEYS_SCHEMA);
   }
 
   @Override
-  public FlightInfo getFlightInfoExportedKeys(FlightSql.CommandGetExportedKeys request, CallContext context,
-                                              FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoExportedKeys(
+      FlightSql.CommandGetExportedKeys request, CallContext context, FlightDescriptor descriptor) {
     return generateFlightInfo(request, descriptor, Schemas.GET_EXPORTED_KEYS_SCHEMA);
   }
 
   @Override
-  public FlightInfo getFlightInfoImportedKeys(FlightSql.CommandGetImportedKeys request, CallContext context,
-                                              FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoImportedKeys(
+      FlightSql.CommandGetImportedKeys request, CallContext context, FlightDescriptor descriptor) {
     return generateFlightInfo(request, descriptor, Schemas.GET_IMPORTED_KEYS_SCHEMA);
   }
 
   @Override
-  public FlightInfo getFlightInfoCrossReference(FlightSql.CommandGetCrossReference request, CallContext context,
-                                                FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoCrossReference(
+      FlightSql.CommandGetCrossReference request,
+      CallContext context,
+      FlightDescriptor descriptor) {
     return generateFlightInfo(request, descriptor, Schemas.GET_CROSS_REFERENCE_SCHEMA);
   }
 
   /**
-   * Return a list of FlightEndpoints for the given request and FlightDescriptor. This method should validate that
-   * the request is supported by this FlightSqlProducer.
+   * Return a list of FlightEndpoints for the given request and FlightDescriptor. This method should
+   * validate that the request is supported by this FlightSqlProducer.
    */
-  protected abstract <T extends Message>
-        List<FlightEndpoint> determineEndpoints(T request, FlightDescriptor flightDescriptor, Schema schema);
+  protected abstract <T extends Message> List<FlightEndpoint> determineEndpoints(
+      T request, FlightDescriptor flightDescriptor, Schema schema);
 
-  protected <T extends Message> FlightInfo generateFlightInfo(T request, FlightDescriptor descriptor, Schema schema) {
+  protected <T extends Message> FlightInfo generateFlightInfo(
+      T request, FlightDescriptor descriptor, Schema schema) {
     final List<FlightEndpoint> endpoints = determineEndpoints(request, descriptor, schema);
     return new FlightInfo(schema, descriptor, endpoints, -1, -1);
   }
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/CancelListener.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/CancelListener.java
index e7b645be7478f..869eda7379a5b 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/CancelListener.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/CancelListener.java
@@ -14,15 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql;
 
+import com.google.protobuf.Any;
 import org.apache.arrow.flight.FlightProducer;
 import org.apache.arrow.flight.Result;
 import org.apache.arrow.flight.sql.impl.FlightSql;
 
-import com.google.protobuf.Any;
-
 /** Typed StreamListener for cancelQuery. */
 @SuppressWarnings("deprecation")
 class CancelListener implements FlightProducer.StreamListener<CancelResult> {
@@ -34,9 +32,8 @@ class CancelListener implements FlightProducer.StreamListener<CancelResult> {
 
   @Override
   public void onNext(CancelResult val) {
-    FlightSql.ActionCancelQueryResult result = FlightSql.ActionCancelQueryResult.newBuilder()
-        .setResult(val.toProtocol())
-        .build();
+    FlightSql.ActionCancelQueryResult result =
+        FlightSql.ActionCancelQueryResult.newBuilder().setResult(val.toProtocol()).build();
     listener.onNext(new Result(Any.pack(result).toByteArray()));
   }
 
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/CancelResult.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/CancelResult.java
index 28fa197cd6055..0802b8605aebc 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/CancelResult.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/CancelResult.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql;
 
 import org.apache.arrow.flight.sql.impl.FlightSql;
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/CancelStatusListener.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/CancelStatusListener.java
index e7f5beee4d3cb..e2b78750a7dec 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/CancelStatusListener.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/CancelStatusListener.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql;
 
 import org.apache.arrow.flight.CancelFlightInfoResult;
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/CloseSessionResultListener.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/CloseSessionResultListener.java
index e1a5b369fe16c..4114ac0444ead 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/CloseSessionResultListener.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/CloseSessionResultListener.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql;
 
 import org.apache.arrow.flight.CloseSessionResult;
@@ -22,7 +21,8 @@
 import org.apache.arrow.flight.Result;
 
 /** Typed StreamListener for closeSession. */
-public class CloseSessionResultListener implements FlightProducer.StreamListener<CloseSessionResult> {
+public class CloseSessionResultListener
+    implements FlightProducer.StreamListener<CloseSessionResult> {
   private final FlightProducer.StreamListener<Result> listener;
 
   CloseSessionResultListener(FlightProducer.StreamListener<Result> listener) {
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightEndpointListener.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightEndpointListener.java
index c92888f6c92df..43a430b81078a 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightEndpointListener.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightEndpointListener.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql;
 
 import org.apache.arrow.flight.FlightEndpoint;
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlClient.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlClient.java
index e6eb28fe317e1..4bc12d86b1d0e 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlClient.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlClient.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql;
 
 import static org.apache.arrow.flight.sql.impl.FlightSql.ActionBeginSavepointRequest;
@@ -45,6 +44,9 @@
 import static org.apache.arrow.flight.sql.impl.FlightSql.DoPutUpdateResult;
 import static org.apache.arrow.flight.sql.impl.FlightSql.SqlInfo;
 
+import com.google.protobuf.Any;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.channels.Channels;
@@ -55,7 +57,6 @@
 import java.util.Objects;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.flight.Action;
 import org.apache.arrow.flight.CallOption;
 import org.apache.arrow.flight.CallStatus;
@@ -78,6 +79,7 @@
 import org.apache.arrow.flight.SetSessionOptionsResult;
 import org.apache.arrow.flight.SyncPutListener;
 import org.apache.arrow.flight.Ticket;
+import org.apache.arrow.flight.sql.impl.FlightSql;
 import org.apache.arrow.flight.sql.impl.FlightSql.ActionCreatePreparedStatementResult;
 import org.apache.arrow.flight.sql.impl.FlightSql.CommandPreparedStatementQuery;
 import org.apache.arrow.flight.sql.util.TableRef;
@@ -89,13 +91,7 @@
 import org.apache.arrow.vector.ipc.message.MessageSerializer;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-import com.google.protobuf.Any;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
-
-/**
- * Flight client with Flight SQL semantics.
- */
+/** Flight client with Flight SQL semantics. */
 public class FlightSqlClient implements AutoCloseable {
   private final FlightClient client;
 
@@ -106,7 +102,7 @@ public FlightSqlClient(final FlightClient client) {
   /**
    * Execute a query on the server.
    *
-   * @param query   The query to execute.
+   * @param query The query to execute.
    * @param options RPC-layer hints for this call.
    * @return a FlightInfo object representing the stream(s) to fetch.
    */
@@ -122,12 +118,15 @@ public FlightInfo execute(final String query, final CallOption... options) {
    * @param options RPC-layer hints for this call.
    * @return a FlightInfo object representing the stream(s) to fetch.
    */
-  public FlightInfo execute(final String query, Transaction transaction, final CallOption... options) {
-    final CommandStatementQuery.Builder builder = CommandStatementQuery.newBuilder().setQuery(query);
+  public FlightInfo execute(
+      final String query, Transaction transaction, final CallOption... options) {
+    final CommandStatementQuery.Builder builder =
+        CommandStatementQuery.newBuilder().setQuery(query);
     if (transaction != null) {
       builder.setTransactionId(ByteString.copyFrom(transaction.getTransactionId()));
     }
-    final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
+    final FlightDescriptor descriptor =
+        FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
     return client.getInfo(descriptor, options);
   }
 
@@ -150,61 +149,67 @@ public FlightInfo executeSubstrait(SubstraitPlan plan, CallOption... options) {
    * @param options RPC-layer hints for this call.
    * @return a FlightInfo object representing the stream(s) to fetch.
    */
-  public FlightInfo executeSubstrait(SubstraitPlan plan, Transaction transaction, CallOption... options) {
-    final CommandStatementSubstraitPlan.Builder builder = CommandStatementSubstraitPlan.newBuilder();
-    builder.getPlanBuilder().setPlan(ByteString.copyFrom(plan.getPlan())).setVersion(plan.getVersion());
+  public FlightInfo executeSubstrait(
+      SubstraitPlan plan, Transaction transaction, CallOption... options) {
+    final CommandStatementSubstraitPlan.Builder builder =
+        CommandStatementSubstraitPlan.newBuilder();
+    builder
+        .getPlanBuilder()
+        .setPlan(ByteString.copyFrom(plan.getPlan()))
+        .setVersion(plan.getVersion());
     if (transaction != null) {
       builder.setTransactionId(ByteString.copyFrom(transaction.getTransactionId()));
     }
-    final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
+    final FlightDescriptor descriptor =
+        FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
     return client.getInfo(descriptor, options);
   }
 
-  /**
-   * Get the schema of the result set of a query.
-   */
-  public SchemaResult getExecuteSchema(String query, Transaction transaction, CallOption... options) {
+  /** Get the schema of the result set of a query. */
+  public SchemaResult getExecuteSchema(
+      String query, Transaction transaction, CallOption... options) {
     final CommandStatementQuery.Builder builder = CommandStatementQuery.newBuilder();
     builder.setQuery(query);
     if (transaction != null) {
       builder.setTransactionId(ByteString.copyFrom(transaction.getTransactionId()));
     }
-    final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
+    final FlightDescriptor descriptor =
+        FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
     return client.getSchema(descriptor, options);
   }
 
-  /**
-   * Get the schema of the result set of a query.
-   */
+  /** Get the schema of the result set of a query. */
   public SchemaResult getExecuteSchema(String query, CallOption... options) {
-    return getExecuteSchema(query, /*transaction*/null, options);
+    return getExecuteSchema(query, /*transaction*/ null, options);
   }
 
-  /**
-   * Get the schema of the result set of a Substrait plan.
-   */
-  public SchemaResult getExecuteSubstraitSchema(SubstraitPlan plan, Transaction transaction,
-                                                final CallOption... options) {
-    final CommandStatementSubstraitPlan.Builder builder = CommandStatementSubstraitPlan.newBuilder();
-    builder.getPlanBuilder().setPlan(ByteString.copyFrom(plan.getPlan())).setVersion(plan.getVersion());
+  /** Get the schema of the result set of a Substrait plan. */
+  public SchemaResult getExecuteSubstraitSchema(
+      SubstraitPlan plan, Transaction transaction, final CallOption... options) {
+    final CommandStatementSubstraitPlan.Builder builder =
+        CommandStatementSubstraitPlan.newBuilder();
+    builder
+        .getPlanBuilder()
+        .setPlan(ByteString.copyFrom(plan.getPlan()))
+        .setVersion(plan.getVersion());
     if (transaction != null) {
       builder.setTransactionId(ByteString.copyFrom(transaction.getTransactionId()));
     }
-    final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
+    final FlightDescriptor descriptor =
+        FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
     return client.getSchema(descriptor, options);
   }
 
-  /**
-   * Get the schema of the result set of a Substrait plan.
-   */
-  public SchemaResult getExecuteSubstraitSchema(SubstraitPlan substraitPlan, final CallOption... options) {
-    return getExecuteSubstraitSchema(substraitPlan, /*transaction*/null, options);
+  /** Get the schema of the result set of a Substrait plan. */
+  public SchemaResult getExecuteSubstraitSchema(
+      SubstraitPlan substraitPlan, final CallOption... options) {
+    return getExecuteSubstraitSchema(substraitPlan, /*transaction*/ null, options);
   }
 
   /**
    * Execute an update query on the server.
    *
-   * @param query   The query to execute.
+   * @param query The query to execute.
    * @param options RPC-layer hints for this call.
    * @return the number of rows affected.
    */
@@ -215,24 +220,27 @@ public long executeUpdate(final String query, final CallOption... options) {
   /**
    * Execute an update query on the server.
    *
-   * @param query   The query to execute.
+   * @param query The query to execute.
    * @param transaction The transaction that this query is part of.
    * @param options RPC-layer hints for this call.
    * @return the number of rows affected.
    */
-  public long executeUpdate(final String query, Transaction transaction, final CallOption... options) {
-    final CommandStatementUpdate.Builder builder = CommandStatementUpdate.newBuilder().setQuery(query);
+  public long executeUpdate(
+      final String query, Transaction transaction, final CallOption... options) {
+    final CommandStatementUpdate.Builder builder =
+        CommandStatementUpdate.newBuilder().setQuery(query);
     if (transaction != null) {
       builder.setTransactionId(ByteString.copyFrom(transaction.getTransactionId()));
     }
 
-    final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
+    final FlightDescriptor descriptor =
+        FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
     try (final SyncPutListener putListener = new SyncPutListener()) {
       final FlightClient.ClientStreamListener listener =
           client.startPut(descriptor, VectorSchemaRoot.of(), putListener, options);
       try (final PutResult result = putListener.read()) {
-        final DoPutUpdateResult doPutUpdateResult = DoPutUpdateResult.parseFrom(
-            result.getApplicationMetadata().nioBuffer());
+        final DoPutUpdateResult doPutUpdateResult =
+            DoPutUpdateResult.parseFrom(result.getApplicationMetadata().nioBuffer());
         return doPutUpdateResult.getRecordCount();
       } finally {
         listener.getResult();
@@ -263,20 +271,26 @@ public long executeSubstraitUpdate(SubstraitPlan plan, CallOption... options) {
    * @param options RPC-layer hints for this call.
    * @return the number of rows affected.
    */
-  public long executeSubstraitUpdate(SubstraitPlan plan, Transaction transaction, CallOption... options) {
-    final CommandStatementSubstraitPlan.Builder builder = CommandStatementSubstraitPlan.newBuilder();
-    builder.getPlanBuilder().setPlan(ByteString.copyFrom(plan.getPlan())).setVersion(plan.getVersion());
+  public long executeSubstraitUpdate(
+      SubstraitPlan plan, Transaction transaction, CallOption... options) {
+    final CommandStatementSubstraitPlan.Builder builder =
+        CommandStatementSubstraitPlan.newBuilder();
+    builder
+        .getPlanBuilder()
+        .setPlan(ByteString.copyFrom(plan.getPlan()))
+        .setVersion(plan.getVersion());
     if (transaction != null) {
       builder.setTransactionId(ByteString.copyFrom(transaction.getTransactionId()));
     }
 
-    final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
+    final FlightDescriptor descriptor =
+        FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
     try (final SyncPutListener putListener = new SyncPutListener()) {
       final FlightClient.ClientStreamListener listener =
           client.startPut(descriptor, VectorSchemaRoot.of(), putListener, options);
       try (final PutResult result = putListener.read()) {
-        final DoPutUpdateResult doPutUpdateResult = DoPutUpdateResult.parseFrom(
-            result.getApplicationMetadata().nioBuffer());
+        final DoPutUpdateResult doPutUpdateResult =
+            DoPutUpdateResult.parseFrom(result.getApplicationMetadata().nioBuffer());
         return doPutUpdateResult.getRecordCount();
       } finally {
         listener.getResult();
@@ -296,7 +310,8 @@ public long executeSubstraitUpdate(SubstraitPlan plan, Transaction transaction,
    */
   public FlightInfo getCatalogs(final CallOption... options) {
     final CommandGetCatalogs.Builder builder = CommandGetCatalogs.newBuilder();
-    final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
+    final FlightDescriptor descriptor =
+        FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
     return client.getInfo(descriptor, options);
   }
 
@@ -314,12 +329,13 @@ public SchemaResult getCatalogsSchema(final CallOption... options) {
   /**
    * Request a list of schemas.
    *
-   * @param catalog               The catalog.
+   * @param catalog The catalog.
    * @param dbSchemaFilterPattern The schema filter pattern.
-   * @param options               RPC-layer hints for this call.
+   * @param options RPC-layer hints for this call.
    * @return a FlightInfo object representing the stream(s) to fetch.
    */
-  public FlightInfo getSchemas(final String catalog, final String dbSchemaFilterPattern, final CallOption... options) {
+  public FlightInfo getSchemas(
+      final String catalog, final String dbSchemaFilterPattern, final CallOption... options) {
     final CommandGetDbSchemas.Builder builder = CommandGetDbSchemas.newBuilder();
 
     if (catalog != null) {
@@ -330,7 +346,8 @@ public FlightInfo getSchemas(final String catalog, final String dbSchemaFilterPa
       builder.setDbSchemaFilterPattern(dbSchemaFilterPattern);
     }
 
-    final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
+    final FlightDescriptor descriptor =
+        FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
     return client.getInfo(descriptor, options);
   }
 
@@ -349,7 +366,7 @@ public SchemaResult getSchemasSchema(final CallOption... options) {
    * Get schema for a stream.
    *
    * @param descriptor The descriptor for the stream.
-   * @param options    RPC-layer hints for this call.
+   * @param options RPC-layer hints for this call.
    */
   public SchemaResult getSchema(FlightDescriptor descriptor, CallOption... options) {
     return client.getSchema(descriptor, options);
@@ -358,7 +375,7 @@ public SchemaResult getSchema(FlightDescriptor descriptor, CallOption... options
   /**
    * Retrieve a stream from the server.
    *
-   * @param ticket  The ticket granting access to the data stream.
+   * @param ticket The ticket granting access to the data stream.
    * @param options RPC-layer hints for this call.
    */
   public FlightStream getStream(Ticket ticket, CallOption... options) {
@@ -378,7 +395,7 @@ public FlightInfo getSqlInfo(final SqlInfo... info) {
   /**
    * Request a set of Flight SQL metadata.
    *
-   * @param info    The set of metadata to retrieve. None to retrieve all metadata.
+   * @param info The set of metadata to retrieve. None to retrieve all metadata.
    * @param options RPC-layer hints for this call.
    * @return a FlightInfo object representing the stream(s) to fetch.
    */
@@ -388,11 +405,10 @@ public FlightInfo getSqlInfo(final SqlInfo[] info, final CallOption... options)
   }
 
   /**
-   * Request a set of Flight SQL metadata.
-   * Use this method if you would like to retrieve custom metadata, where the custom metadata key values start
-   * from 10_000.
+   * Request a set of Flight SQL metadata. Use this method if you would like to retrieve custom
+   * metadata, where the custom metadata key values start from 10_000.
    *
-   * @param info    The set of metadata to retrieve. None to retrieve all metadata.
+   * @param info The set of metadata to retrieve. None to retrieve all metadata.
    * @param options RPC-layer hints for this call.
    * @return a FlightInfo object representing the stream(s) to fetch.
    */
@@ -401,18 +417,18 @@ public FlightInfo getSqlInfo(final int[] info, final CallOption... options) {
   }
 
   /**
-   * Request a set of Flight SQL metadata.
-   * Use this method if you would like to retrieve custom metadata, where the custom metadata key values start
-   * from 10_000.
+   * Request a set of Flight SQL metadata. Use this method if you would like to retrieve custom
+   * metadata, where the custom metadata key values start from 10_000.
    *
-   * @param info    The set of metadata to retrieve. None to retrieve all metadata.
+   * @param info The set of metadata to retrieve. None to retrieve all metadata.
    * @param options RPC-layer hints for this call.
    * @return a FlightInfo object representing the stream(s) to fetch.
    */
   public FlightInfo getSqlInfo(final Iterable<Integer> info, final CallOption... options) {
     final CommandGetSqlInfo.Builder builder = CommandGetSqlInfo.newBuilder();
     builder.addAllInfo(info);
-    final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
+    final FlightDescriptor descriptor =
+        FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
     return client.getInfo(descriptor, options);
   }
 
@@ -428,11 +444,10 @@ public SchemaResult getSqlInfoSchema(final CallOption... options) {
   }
 
   /**
-   * Request the information about the data types supported related to
-   * a filter data type.
+   * Request the information about the data types supported related to a filter data type.
    *
-   * @param dataType  the data type to be used as filter.
-   * @param options   RPC-layer hints for this call.
+   * @param dataType the data type to be used as filter.
+   * @param options RPC-layer hints for this call.
    * @return a FlightInfo object representing the stream(s) to fetch.
    */
   public FlightInfo getXdbcTypeInfo(final int dataType, final CallOption... options) {
@@ -440,20 +455,22 @@ public FlightInfo getXdbcTypeInfo(final int dataType, final CallOption... option
 
     builder.setDataType(dataType);
 
-    final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
+    final FlightDescriptor descriptor =
+        FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
     return client.getInfo(descriptor, options);
   }
 
   /**
    * Request the information about all the data types supported.
    *
-   * @param options   RPC-layer hints for this call.
+   * @param options RPC-layer hints for this call.
    * @return a FlightInfo object representing the stream(s) to fetch.
    */
   public FlightInfo getXdbcTypeInfo(final CallOption... options) {
     final CommandGetXdbcTypeInfo.Builder builder = CommandGetXdbcTypeInfo.newBuilder();
 
-    final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
+    final FlightDescriptor descriptor =
+        FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
     return client.getInfo(descriptor, options);
   }
 
@@ -471,17 +488,21 @@ public SchemaResult getXdbcTypeInfoSchema(final CallOption... options) {
   /**
    * Request a list of tables.
    *
-   * @param catalog               The catalog.
+   * @param catalog The catalog.
    * @param dbSchemaFilterPattern The schema filter pattern.
-   * @param tableFilterPattern    The table filter pattern.
-   * @param tableTypes            The table types to include.
-   * @param includeSchema         True to include the schema upon return, false to not include the schema.
-   * @param options               RPC-layer hints for this call.
+   * @param tableFilterPattern The table filter pattern.
+   * @param tableTypes The table types to include.
+   * @param includeSchema True to include the schema upon return, false to not include the schema.
+   * @param options RPC-layer hints for this call.
    * @return a FlightInfo object representing the stream(s) to fetch.
    */
-  public FlightInfo getTables(final String catalog, final String dbSchemaFilterPattern,
-                              final String tableFilterPattern, final List<String> tableTypes,
-                              final boolean includeSchema, final CallOption... options) {
+  public FlightInfo getTables(
+      final String catalog,
+      final String dbSchemaFilterPattern,
+      final String tableFilterPattern,
+      final List<String> tableTypes,
+      final boolean includeSchema,
+      final CallOption... options) {
     final CommandGetTables.Builder builder = CommandGetTables.newBuilder();
 
     if (catalog != null) {
@@ -501,18 +522,21 @@ public FlightInfo getTables(final String catalog, final String dbSchemaFilterPat
     }
     builder.setIncludeSchema(includeSchema);
 
-    final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
+    final FlightDescriptor descriptor =
+        FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
     return client.getInfo(descriptor, options);
   }
 
   /**
-   * Get the schema of {@link #getTables(String, String, String, List, boolean, CallOption...)} from the server.
+   * Get the schema of {@link #getTables(String, String, String, List, boolean, CallOption...)} from
+   * the server.
    *
-   * <p>Should be identical to {@link FlightSqlProducer.Schemas#GET_TABLES_SCHEMA} or
-   * {@link FlightSqlProducer.Schemas#GET_TABLES_SCHEMA_NO_SCHEMA}.
+   * <p>Should be identical to {@link FlightSqlProducer.Schemas#GET_TABLES_SCHEMA} or {@link
+   * FlightSqlProducer.Schemas#GET_TABLES_SCHEMA_NO_SCHEMA}.
    */
   public SchemaResult getTablesSchema(boolean includeSchema, final CallOption... options) {
-    final CommandGetTables command = CommandGetTables.newBuilder().setIncludeSchema(includeSchema).build();
+    final CommandGetTables command =
+        CommandGetTables.newBuilder().setIncludeSchema(includeSchema).build();
     final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(command).toByteArray());
     return client.getSchema(descriptor, options);
   }
@@ -520,8 +544,8 @@ public SchemaResult getTablesSchema(boolean includeSchema, final CallOption... o
   /**
    * Request the primary keys for a table.
    *
-   * @param tableRef  An object which hold info about catalog, dbSchema and table.
-   * @param options   RPC-layer hints for this call.
+   * @param tableRef An object which hold info about catalog, dbSchema and table.
+   * @param options RPC-layer hints for this call.
    * @return a FlightInfo object representing the stream(s) to fetch.
    */
   public FlightInfo getPrimaryKeys(final TableRef tableRef, final CallOption... options) {
@@ -538,7 +562,8 @@ public FlightInfo getPrimaryKeys(final TableRef tableRef, final CallOption... op
     Objects.requireNonNull(tableRef.getTable());
     builder.setTable(tableRef.getTable());
 
-    final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
+    final FlightDescriptor descriptor =
+        FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
     return client.getInfo(descriptor, options);
   }
 
@@ -554,10 +579,11 @@ public SchemaResult getPrimaryKeysSchema(final CallOption... options) {
   }
 
   /**
-   * Retrieves a description about the foreign key columns that reference the primary key columns of the given table.
+   * Retrieves a description about the foreign key columns that reference the primary key columns of
+   * the given table.
    *
-   * @param tableRef  An object which hold info about catalog, dbSchema and table.
-   * @param options   RPC-layer hints for this call.
+   * @param tableRef An object which hold info about catalog, dbSchema and table.
+   * @param options RPC-layer hints for this call.
    * @return a FlightInfo object representing the stream(s) to fetch.
    */
   public FlightInfo getExportedKeys(final TableRef tableRef, final CallOption... options) {
@@ -576,7 +602,8 @@ public FlightInfo getExportedKeys(final TableRef tableRef, final CallOption... o
     Objects.requireNonNull(tableRef.getTable());
     builder.setTable(tableRef.getTable());
 
-    final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
+    final FlightDescriptor descriptor =
+        FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
     return client.getInfo(descriptor, options);
   }
 
@@ -594,12 +621,11 @@ public SchemaResult getExportedKeysSchema(final CallOption... options) {
   /**
    * Retrieves the foreign key columns for the given table.
    *
-   * @param tableRef  An object which hold info about catalog, dbSchema and table.
-   * @param options   RPC-layer hints for this call.
+   * @param tableRef An object which hold info about catalog, dbSchema and table.
+   * @param options RPC-layer hints for this call.
    * @return a FlightInfo object representing the stream(s) to fetch.
    */
-  public FlightInfo getImportedKeys(final TableRef tableRef,
-                                    final CallOption... options) {
+  public FlightInfo getImportedKeys(final TableRef tableRef, final CallOption... options) {
     Objects.requireNonNull(tableRef.getTable(), "Table cannot be null.");
 
     final CommandGetImportedKeys.Builder builder = CommandGetImportedKeys.newBuilder();
@@ -615,7 +641,8 @@ public FlightInfo getImportedKeys(final TableRef tableRef,
     Objects.requireNonNull(tableRef.getTable());
     builder.setTable(tableRef.getTable());
 
-    final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
+    final FlightDescriptor descriptor =
+        FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
     return client.getInfo(descriptor, options);
   }
 
@@ -631,16 +658,18 @@ public SchemaResult getImportedKeysSchema(final CallOption... options) {
   }
 
   /**
-   * Retrieves a description of the foreign key columns that reference the given table's
-   * primary key columns (the foreign keys exported by a table).
+   * Retrieves a description of the foreign key columns that reference the given table's primary key
+   * columns (the foreign keys exported by a table).
    *
-   * @param pkTableRef    An object which hold info about catalog, dbSchema and table from a primary table.
-   * @param fkTableRef    An object which hold info about catalog, dbSchema and table from a foreign table.
-   * @param options       RPC-layer hints for this call.
+   * @param pkTableRef An object which hold info about catalog, dbSchema and table from a primary
+   *     table.
+   * @param fkTableRef An object which hold info about catalog, dbSchema and table from a foreign
+   *     table.
+   * @param options RPC-layer hints for this call.
    * @return a FlightInfo object representing the stream(s) to fetch.
    */
-  public FlightInfo getCrossReference(final TableRef pkTableRef,
-                                      final TableRef fkTableRef, final CallOption... options) {
+  public FlightInfo getCrossReference(
+      final TableRef pkTableRef, final TableRef fkTableRef, final CallOption... options) {
     Objects.requireNonNull(pkTableRef.getTable(), "Parent Table cannot be null.");
     Objects.requireNonNull(fkTableRef.getTable(), "Foreign Table cannot be null.");
 
@@ -665,12 +694,14 @@ public FlightInfo getCrossReference(final TableRef pkTableRef,
     builder.setPkTable(pkTableRef.getTable());
     builder.setFkTable(fkTableRef.getTable());
 
-    final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
+    final FlightDescriptor descriptor =
+        FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
     return client.getInfo(descriptor, options);
   }
 
   /**
-   * Get the schema of {@link #getCrossReference(TableRef, TableRef, CallOption...)} from the server.
+   * Get the schema of {@link #getCrossReference(TableRef, TableRef, CallOption...)} from the
+   * server.
    *
    * <p>Should be identical to {@link FlightSqlProducer.Schemas#GET_CROSS_REFERENCE_SCHEMA}.
    */
@@ -688,7 +719,8 @@ public SchemaResult getCrossReferenceSchema(final CallOption... options) {
    */
   public FlightInfo getTableTypes(final CallOption... options) {
     final CommandGetTableTypes.Builder builder = CommandGetTableTypes.newBuilder();
-    final FlightDescriptor descriptor = FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
+    final FlightDescriptor descriptor =
+        FlightDescriptor.command(Any.pack(builder.build()).toByteArray());
     return client.getInfo(descriptor, options);
   }
 
@@ -706,7 +738,7 @@ public SchemaResult getTableTypesSchema(final CallOption... options) {
   /**
    * Create a prepared statement for a SQL query on the server.
    *
-   * @param query   The query to prepare.
+   * @param query The query to prepare.
    * @param options RPC-layer hints for this call.
    * @return The representation of the prepared statement which exists on the server.
    */
@@ -728,7 +760,8 @@ public PreparedStatement prepare(String query, Transaction transaction, CallOpti
     if (transaction != null) {
       builder.setTransactionId(ByteString.copyFrom(transaction.getTransactionId()));
     }
-    return new PreparedStatement(client,
+    return new PreparedStatement(
+        client,
         new Action(
             FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_STATEMENT.getType(),
             Any.pack(builder.build()).toByteArray()),
@@ -738,7 +771,7 @@ public PreparedStatement prepare(String query, Transaction transaction, CallOpti
   /**
    * Create a prepared statement for a Substrait plan on the server.
    *
-   * @param plan    The query to prepare.
+   * @param plan The query to prepare.
    * @param options RPC-layer hints for this call.
    * @return The representation of the prepared statement which exists on the server.
    */
@@ -754,14 +787,19 @@ public PreparedStatement prepare(SubstraitPlan plan, CallOption... options) {
    * @param options RPC-layer hints for this call.
    * @return The representation of the prepared statement which exists on the server.
    */
-  public PreparedStatement prepare(SubstraitPlan plan, Transaction transaction, CallOption... options) {
+  public PreparedStatement prepare(
+      SubstraitPlan plan, Transaction transaction, CallOption... options) {
     ActionCreatePreparedSubstraitPlanRequest.Builder builder =
         ActionCreatePreparedSubstraitPlanRequest.newBuilder();
-    builder.getPlanBuilder().setPlan(ByteString.copyFrom(plan.getPlan())).setVersion(plan.getVersion());
+    builder
+        .getPlanBuilder()
+        .setPlan(ByteString.copyFrom(plan.getPlan()))
+        .setVersion(plan.getVersion());
     if (transaction != null) {
       builder.setTransactionId(ByteString.copyFrom(transaction.getTransactionId()));
     }
-    return new PreparedStatement(client,
+    return new PreparedStatement(
+        client,
         new Action(
             FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_SUBSTRAIT_PLAN.getType(),
             Any.pack(builder.build()).toByteArray()),
@@ -770,95 +808,114 @@ public PreparedStatement prepare(SubstraitPlan plan, Transaction transaction, Ca
 
   /** Begin a transaction. */
   public Transaction beginTransaction(CallOption... options) {
-    final Action action = new Action(
-        FlightSqlUtils.FLIGHT_SQL_BEGIN_TRANSACTION.getType(),
-        Any.pack(ActionBeginTransactionRequest.getDefaultInstance()).toByteArray());
+    final Action action =
+        new Action(
+            FlightSqlUtils.FLIGHT_SQL_BEGIN_TRANSACTION.getType(),
+            Any.pack(ActionBeginTransactionRequest.getDefaultInstance()).toByteArray());
     final Iterator<Result> preparedStatementResults = client.doAction(action, options);
-    final ActionBeginTransactionResult result = FlightSqlUtils.unpackAndParseOrThrow(
-        preparedStatementResults.next().getBody(),
-        ActionBeginTransactionResult.class);
-    preparedStatementResults.forEachRemaining((ignored) -> { });
+    final ActionBeginTransactionResult result =
+        FlightSqlUtils.unpackAndParseOrThrow(
+            preparedStatementResults.next().getBody(), ActionBeginTransactionResult.class);
+    preparedStatementResults.forEachRemaining((ignored) -> {});
     if (result.getTransactionId().isEmpty()) {
-      throw CallStatus.INTERNAL.withDescription("Server returned an empty transaction ID").toRuntimeException();
+      throw CallStatus.INTERNAL
+          .withDescription("Server returned an empty transaction ID")
+          .toRuntimeException();
     }
     return new Transaction(result.getTransactionId().toByteArray());
   }
 
   /** Create a savepoint within a transaction. */
   public Savepoint beginSavepoint(Transaction transaction, String name, CallOption... options) {
-    Preconditions.checkArgument(transaction.getTransactionId().length != 0, "Transaction must be initialized");
-    ActionBeginSavepointRequest request = ActionBeginSavepointRequest.newBuilder()
-        .setTransactionId(ByteString.copyFrom(transaction.getTransactionId()))
-        .setName(name)
-        .build();
-    final Action action = new Action(
-        FlightSqlUtils.FLIGHT_SQL_BEGIN_SAVEPOINT.getType(),
-        Any.pack(request).toByteArray());
+    Preconditions.checkArgument(
+        transaction.getTransactionId().length != 0, "Transaction must be initialized");
+    ActionBeginSavepointRequest request =
+        ActionBeginSavepointRequest.newBuilder()
+            .setTransactionId(ByteString.copyFrom(transaction.getTransactionId()))
+            .setName(name)
+            .build();
+    final Action action =
+        new Action(
+            FlightSqlUtils.FLIGHT_SQL_BEGIN_SAVEPOINT.getType(), Any.pack(request).toByteArray());
     final Iterator<Result> preparedStatementResults = client.doAction(action, options);
-    final ActionBeginSavepointResult result = FlightSqlUtils.unpackAndParseOrThrow(
-        preparedStatementResults.next().getBody(),
-        ActionBeginSavepointResult.class);
-    preparedStatementResults.forEachRemaining((ignored) -> { });
+    final ActionBeginSavepointResult result =
+        FlightSqlUtils.unpackAndParseOrThrow(
+            preparedStatementResults.next().getBody(), ActionBeginSavepointResult.class);
+    preparedStatementResults.forEachRemaining((ignored) -> {});
     if (result.getSavepointId().isEmpty()) {
-      throw CallStatus.INTERNAL.withDescription("Server returned an empty transaction ID").toRuntimeException();
+      throw CallStatus.INTERNAL
+          .withDescription("Server returned an empty transaction ID")
+          .toRuntimeException();
     }
     return new Savepoint(result.getSavepointId().toByteArray());
   }
 
   /** Commit a transaction. */
   public void commit(Transaction transaction, CallOption... options) {
-    Preconditions.checkArgument(transaction.getTransactionId().length != 0, "Transaction must be initialized");
-    ActionEndTransactionRequest request = ActionEndTransactionRequest.newBuilder()
-        .setTransactionId(ByteString.copyFrom(transaction.getTransactionId()))
-        .setActionValue(ActionEndTransactionRequest.EndTransaction.END_TRANSACTION_COMMIT.getNumber())
-        .build();
-    final Action action = new Action(
-        FlightSqlUtils.FLIGHT_SQL_END_TRANSACTION.getType(),
-        Any.pack(request).toByteArray());
+    Preconditions.checkArgument(
+        transaction.getTransactionId().length != 0, "Transaction must be initialized");
+    ActionEndTransactionRequest request =
+        ActionEndTransactionRequest.newBuilder()
+            .setTransactionId(ByteString.copyFrom(transaction.getTransactionId()))
+            .setActionValue(
+                ActionEndTransactionRequest.EndTransaction.END_TRANSACTION_COMMIT.getNumber())
+            .build();
+    final Action action =
+        new Action(
+            FlightSqlUtils.FLIGHT_SQL_END_TRANSACTION.getType(), Any.pack(request).toByteArray());
     final Iterator<Result> preparedStatementResults = client.doAction(action, options);
-    preparedStatementResults.forEachRemaining((ignored) -> { });
+    preparedStatementResults.forEachRemaining((ignored) -> {});
   }
 
   /** Release a savepoint. */
   public void release(Savepoint savepoint, CallOption... options) {
-    Preconditions.checkArgument(savepoint.getSavepointId().length != 0, "Savepoint must be initialized");
-    ActionEndSavepointRequest request = ActionEndSavepointRequest.newBuilder()
-        .setSavepointId(ByteString.copyFrom(savepoint.getSavepointId()))
-        .setActionValue(ActionEndSavepointRequest.EndSavepoint.END_SAVEPOINT_RELEASE.getNumber())
-        .build();
-    final Action action = new Action(
-        FlightSqlUtils.FLIGHT_SQL_END_SAVEPOINT.getType(),
-        Any.pack(request).toByteArray());
+    Preconditions.checkArgument(
+        savepoint.getSavepointId().length != 0, "Savepoint must be initialized");
+    ActionEndSavepointRequest request =
+        ActionEndSavepointRequest.newBuilder()
+            .setSavepointId(ByteString.copyFrom(savepoint.getSavepointId()))
+            .setActionValue(
+                ActionEndSavepointRequest.EndSavepoint.END_SAVEPOINT_RELEASE.getNumber())
+            .build();
+    final Action action =
+        new Action(
+            FlightSqlUtils.FLIGHT_SQL_END_SAVEPOINT.getType(), Any.pack(request).toByteArray());
     final Iterator<Result> preparedStatementResults = client.doAction(action, options);
-    preparedStatementResults.forEachRemaining((ignored) -> { });
+    preparedStatementResults.forEachRemaining((ignored) -> {});
   }
 
   /** Rollback a transaction. */
   public void rollback(Transaction transaction, CallOption... options) {
-    Preconditions.checkArgument(transaction.getTransactionId().length != 0, "Transaction must be initialized");
-    ActionEndTransactionRequest request = ActionEndTransactionRequest.newBuilder()
-        .setTransactionId(ByteString.copyFrom(transaction.getTransactionId()))
-        .setActionValue(ActionEndTransactionRequest.EndTransaction.END_TRANSACTION_ROLLBACK.getNumber())
-        .build();
-    final Action action = new Action(
-        FlightSqlUtils.FLIGHT_SQL_END_TRANSACTION.getType(),
-        Any.pack(request).toByteArray());
+    Preconditions.checkArgument(
+        transaction.getTransactionId().length != 0, "Transaction must be initialized");
+    ActionEndTransactionRequest request =
+        ActionEndTransactionRequest.newBuilder()
+            .setTransactionId(ByteString.copyFrom(transaction.getTransactionId()))
+            .setActionValue(
+                ActionEndTransactionRequest.EndTransaction.END_TRANSACTION_ROLLBACK.getNumber())
+            .build();
+    final Action action =
+        new Action(
+            FlightSqlUtils.FLIGHT_SQL_END_TRANSACTION.getType(), Any.pack(request).toByteArray());
     final Iterator<Result> preparedStatementResults = client.doAction(action, options);
-    preparedStatementResults.forEachRemaining((ignored) -> { });
+    preparedStatementResults.forEachRemaining((ignored) -> {});
   }
 
   /** Rollback to a savepoint. */
   public void rollback(Savepoint savepoint, CallOption... options) {
-    Preconditions.checkArgument(savepoint.getSavepointId().length != 0, "Savepoint must be initialized");
-    ActionEndSavepointRequest request = ActionEndSavepointRequest.newBuilder()
-        .setSavepointId(ByteString.copyFrom(savepoint.getSavepointId()))
-        .setActionValue(ActionEndSavepointRequest.EndSavepoint.END_SAVEPOINT_RELEASE.getNumber())
-        .build();
-    final Action action = new Action(
-        FlightSqlUtils.FLIGHT_SQL_END_SAVEPOINT.getType(),
-        Any.pack(request).toByteArray());
+    Preconditions.checkArgument(
+        savepoint.getSavepointId().length != 0, "Savepoint must be initialized");
+    ActionEndSavepointRequest request =
+        ActionEndSavepointRequest.newBuilder()
+            .setSavepointId(ByteString.copyFrom(savepoint.getSavepointId()))
+            .setActionValue(
+                ActionEndSavepointRequest.EndSavepoint.END_SAVEPOINT_RELEASE.getNumber())
+            .build();
+    final Action action =
+        new Action(
+            FlightSqlUtils.FLIGHT_SQL_END_SAVEPOINT.getType(), Any.pack(request).toByteArray());
     final Iterator<Result> preparedStatementResults = client.doAction(action, options);
-    preparedStatementResults.forEachRemaining((ignored) -> { });
+    preparedStatementResults.forEachRemaining((ignored) -> {});
   }
 
   /**
@@ -868,35 +925,36 @@ public void rollback(Savepoint savepoint, CallOption... options) {
    * @param options Call options.
    * @return The server response.
    */
-  public CancelFlightInfoResult cancelFlightInfo(CancelFlightInfoRequest request, CallOption... options) {
+  public CancelFlightInfoResult cancelFlightInfo(
+      CancelFlightInfoRequest request, CallOption... options) {
     return client.cancelFlightInfo(request, options);
   }
 
   /**
    * Explicitly cancel a running query.
-   * <p>
-   * This lets a single client explicitly cancel work, no matter how many clients
-   * are involved/whether the query is distributed or not, given server support.
-   * The transaction/statement is not rolled back; it is the application's job to
-   * commit or rollback as appropriate. This only indicates the client no longer
-   * wishes to read the remainder of the query results or continue submitting
-   * data.
+   *
+   * <p>This lets a single client explicitly cancel work, no matter how many clients are
+   * involved/whether the query is distributed or not, given server support. The
+   * transaction/statement is not rolled back; it is the application's job to commit or rollback as
+   * appropriate. This only indicates the client no longer wishes to read the remainder of the query
+   * results or continue submitting data.
    *
    * @deprecated Prefer {@link #cancelFlightInfo}.
    */
   @Deprecated
   public CancelResult cancelQuery(FlightInfo info, CallOption... options) {
-    ActionCancelQueryRequest request = ActionCancelQueryRequest.newBuilder()
-        .setInfo(ByteString.copyFrom(info.serialize()))
-        .build();
-    final Action action = new Action(
-        FlightSqlUtils.FLIGHT_SQL_CANCEL_QUERY.getType(),
-        Any.pack(request).toByteArray());
+    ActionCancelQueryRequest request =
+        ActionCancelQueryRequest.newBuilder()
+            .setInfo(ByteString.copyFrom(info.serialize()))
+            .build();
+    final Action action =
+        new Action(
+            FlightSqlUtils.FLIGHT_SQL_CANCEL_QUERY.getType(), Any.pack(request).toByteArray());
     final Iterator<Result> preparedStatementResults = client.doAction(action, options);
-    final ActionCancelQueryResult result = FlightSqlUtils.unpackAndParseOrThrow(
-        preparedStatementResults.next().getBody(),
-        ActionCancelQueryResult.class);
-    preparedStatementResults.forEachRemaining((ignored) -> { });
+    final ActionCancelQueryResult result =
+        FlightSqlUtils.unpackAndParseOrThrow(
+            preparedStatementResults.next().getBody(), ActionCancelQueryResult.class);
+    preparedStatementResults.forEachRemaining((ignored) -> {});
     switch (result.getResult()) {
       case CANCEL_RESULT_UNSPECIFIED:
         return CancelResult.UNSPECIFIED;
@@ -908,7 +966,9 @@ public CancelResult cancelQuery(FlightInfo info, CallOption... options) {
         return CancelResult.NOT_CANCELLABLE;
       case UNRECOGNIZED:
       default:
-        throw CallStatus.INTERNAL.withDescription("Unknown result: " + result.getResult()).toRuntimeException();
+        throw CallStatus.INTERNAL
+            .withDescription("Unknown result: " + result.getResult())
+            .toRuntimeException();
     }
   }
 
@@ -919,15 +979,18 @@ public CancelResult cancelQuery(FlightInfo info, CallOption... options) {
    * @param options Call options.
    * @return The new endpoint with an updated expiration time.
    */
-  public FlightEndpoint renewFlightEndpoint(RenewFlightEndpointRequest request, CallOption... options) {
+  public FlightEndpoint renewFlightEndpoint(
+      RenewFlightEndpointRequest request, CallOption... options) {
     return client.renewFlightEndpoint(request, options);
   }
 
-  public SetSessionOptionsResult setSessionOptions(SetSessionOptionsRequest request, CallOption... options) {
+  public SetSessionOptionsResult setSessionOptions(
+      SetSessionOptionsRequest request, CallOption... options) {
     return client.setSessionOptions(request, options);
   }
 
-  public GetSessionOptionsResult getSessionOptions(GetSessionOptionsRequest request, CallOption... options) {
+  public GetSessionOptionsResult getSessionOptions(
+      GetSessionOptionsRequest request, CallOption... options) {
     return client.getSessionOptions(request, options);
   }
 
@@ -940,9 +1003,7 @@ public void close() throws Exception {
     AutoCloseables.close(client);
   }
 
-  /**
-   * Helper class to encapsulate Flight SQL prepared statement logic.
-   */
+  /** Helper class to encapsulate Flight SQL prepared statement logic. */
   public static class PreparedStatement implements AutoCloseable {
     private final FlightClient client;
     private final ActionCreatePreparedStatementResult preparedStatementResult;
@@ -955,18 +1016,18 @@ public static class PreparedStatement implements AutoCloseable {
       this.client = client;
 
       final Iterator<Result> preparedStatementResults = client.doAction(action, options);
-      preparedStatementResult = FlightSqlUtils.unpackAndParseOrThrow(
-          preparedStatementResults.next().getBody(),
-          ActionCreatePreparedStatementResult.class);
+      preparedStatementResult =
+          FlightSqlUtils.unpackAndParseOrThrow(
+              preparedStatementResults.next().getBody(), ActionCreatePreparedStatementResult.class);
       isClosed = false;
     }
 
     /**
-     * Set the {@link #parameterBindingRoot} containing the parameter binding from a {@link PreparedStatement}
-     * operation.
+     * Set the {@link #parameterBindingRoot} containing the parameter binding from a {@link
+     * PreparedStatement} operation.
      *
-     * @param parameterBindingRoot a {@code VectorSchemaRoot} object containing the values to be used in the
-     *                             {@code PreparedStatement} setters.
+     * @param parameterBindingRoot a {@code VectorSchemaRoot} object containing the values to be
+     *     used in the {@code PreparedStatement} setters.
      */
     public void setParameters(final VectorSchemaRoot parameterBindingRoot) {
       if (parameterBindingRoot == this.parameterBindingRoot) {
@@ -978,8 +1039,8 @@ public void setParameters(final VectorSchemaRoot parameterBindingRoot) {
     }
 
     /**
-     * Closes the {@link #parameterBindingRoot}, which contains the parameter binding from
-     * a {@link PreparedStatement} operation, releasing its resources.
+     * Closes the {@link #parameterBindingRoot}, which contains the parameter binding from a {@link
+     * PreparedStatement} operation, releasing its resources.
      */
     public void clearParameters() {
       if (parameterBindingRoot != null) {
@@ -1013,27 +1074,28 @@ public Schema getParameterSchema() {
       return parameterSchema;
     }
 
-    /**
-     * Get the schema of the result set (should be identical to {@link #getResultSetSchema()}).
-     */
+    /** Get the schema of the result set (should be identical to {@link #getResultSetSchema()}). */
     public SchemaResult fetchSchema(CallOption... options) {
       checkOpen();
 
-      final FlightDescriptor descriptor = FlightDescriptor
-          .command(Any.pack(CommandPreparedStatementQuery.newBuilder()
-                  .setPreparedStatementHandle(preparedStatementResult.getPreparedStatementHandle())
-                  .build())
-              .toByteArray());
+      final FlightDescriptor descriptor =
+          FlightDescriptor.command(
+              Any.pack(
+                      CommandPreparedStatementQuery.newBuilder()
+                          .setPreparedStatementHandle(
+                              preparedStatementResult.getPreparedStatementHandle())
+                          .build())
+                  .toByteArray());
       return client.getSchema(descriptor, options);
     }
 
     private Schema deserializeSchema(final ByteString bytes) {
       try {
-        return bytes.isEmpty() ?
-            new Schema(Collections.emptyList()) :
-            MessageSerializer.deserializeSchema(
-                new ReadChannel(Channels.newChannel(
-                    new ByteArrayInputStream(bytes.toByteArray()))));
+        return bytes.isEmpty()
+            ? new Schema(Collections.emptyList())
+            : MessageSerializer.deserializeSchema(
+                new ReadChannel(
+                    Channels.newChannel(new ByteArrayInputStream(bytes.toByteArray()))));
       } catch (final IOException e) {
         throw new RuntimeException("Failed to deserialize schema", e);
       }
@@ -1048,14 +1110,41 @@ private Schema deserializeSchema(final ByteString bytes) {
     public FlightInfo execute(final CallOption... options) {
       checkOpen();
 
-      final FlightDescriptor descriptor = FlightDescriptor
-          .command(Any.pack(CommandPreparedStatementQuery.newBuilder()
-                  .setPreparedStatementHandle(preparedStatementResult.getPreparedStatementHandle())
-                  .build())
-              .toByteArray());
+      FlightDescriptor descriptor =
+          FlightDescriptor.command(
+              Any.pack(
+                      CommandPreparedStatementQuery.newBuilder()
+                          .setPreparedStatementHandle(
+                              preparedStatementResult.getPreparedStatementHandle())
+                          .build())
+                  .toByteArray());
 
       if (parameterBindingRoot != null && parameterBindingRoot.getRowCount() > 0) {
-        putParameters(descriptor, options);
+        try (final SyncPutListener putListener = putParameters(descriptor, options)) {
+          if (getParameterSchema().getFields().size() > 0
+              && parameterBindingRoot != null
+              && parameterBindingRoot.getRowCount() > 0) {
+            final PutResult read = putListener.read();
+            if (read != null) {
+              try (final ArrowBuf metadata = read.getApplicationMetadata()) {
+                final FlightSql.DoPutPreparedStatementResult doPutPreparedStatementResult =
+                    FlightSql.DoPutPreparedStatementResult.parseFrom(metadata.nioBuffer());
+                descriptor =
+                    FlightDescriptor.command(
+                        Any.pack(
+                                CommandPreparedStatementQuery.newBuilder()
+                                    .setPreparedStatementHandle(
+                                        doPutPreparedStatementResult.getPreparedStatementHandle())
+                                    .build())
+                            .toByteArray());
+              }
+            }
+          }
+        } catch (final InterruptedException | ExecutionException e) {
+          throw CallStatus.CANCELLED.withCause(e).toRuntimeException();
+        } catch (final InvalidProtocolBufferException e) {
+          throw CallStatus.INVALID_ARGUMENT.withCause(e).toRuntimeException();
+        }
       }
 
       return client.getInfo(descriptor, options);
@@ -1065,7 +1154,7 @@ private SyncPutListener putParameters(FlightDescriptor descriptor, CallOption...
       final SyncPutListener putListener = new SyncPutListener();
 
       FlightClient.ClientStreamListener listener =
-              client.startPut(descriptor, parameterBindingRoot, putListener, options);
+          client.startPut(descriptor, parameterBindingRoot, putListener, options);
 
       listener.putNext();
       listener.completed();
@@ -1091,11 +1180,14 @@ protected final void checkOpen() {
      */
     public long executeUpdate(final CallOption... options) {
       checkOpen();
-      final FlightDescriptor descriptor = FlightDescriptor
-          .command(Any.pack(CommandPreparedStatementUpdate.newBuilder()
-                  .setPreparedStatementHandle(preparedStatementResult.getPreparedStatementHandle())
-                  .build())
-              .toByteArray());
+      final FlightDescriptor descriptor =
+          FlightDescriptor.command(
+              Any.pack(
+                      CommandPreparedStatementUpdate.newBuilder()
+                          .setPreparedStatementHandle(
+                              preparedStatementResult.getPreparedStatementHandle())
+                          .build())
+                  .toByteArray());
       setParameters(parameterBindingRoot == null ? VectorSchemaRoot.of() : parameterBindingRoot);
       SyncPutListener putListener = putParameters(descriptor, options);
 
@@ -1123,15 +1215,17 @@ public void close(final CallOption... options) {
         return;
       }
       isClosed = true;
-      final Action action = new Action(
-          FlightSqlUtils.FLIGHT_SQL_CLOSE_PREPARED_STATEMENT.getType(),
-          Any.pack(ActionClosePreparedStatementRequest.newBuilder()
-                  .setPreparedStatementHandle(preparedStatementResult.getPreparedStatementHandle())
-                  .build())
-              .toByteArray());
+      final Action action =
+          new Action(
+              FlightSqlUtils.FLIGHT_SQL_CLOSE_PREPARED_STATEMENT.getType(),
+              Any.pack(
+                      ActionClosePreparedStatementRequest.newBuilder()
+                          .setPreparedStatementHandle(
+                              preparedStatementResult.getPreparedStatementHandle())
+                          .build())
+                  .toByteArray());
       final Iterator<Result> closePreparedStatementResults = client.doAction(action, options);
-      closePreparedStatementResults.forEachRemaining(result -> {
-      });
+      closePreparedStatementResults.forEachRemaining(result -> {});
       clearParameters();
     }
 
@@ -1220,10 +1314,13 @@ public int hashCode() {
 
     @Override
     public String toString() {
-      return "SubstraitPlan{" +
-          "plan=" + Arrays.toString(plan) +
-          ", version='" + version + '\'' +
-          '}';
+      return "SubstraitPlan{"
+          + "plan="
+          + Arrays.toString(plan)
+          + ", version='"
+          + version
+          + '\''
+          + '}';
     }
   }
 }
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlColumnMetadata.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlColumnMetadata.java
index 186e8bc04ec9c..1bcc55a6605b5 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlColumnMetadata.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlColumnMetadata.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql;
 
 import java.util.Collections;
@@ -24,14 +23,16 @@
 /**
  * Metadata for a column in a Flight SQL query.
  *
- * This can be used with FlightSqlClient to access column's metadata contained in schemas returned
- * by GetTables and query execution as follows:
+ * <p>This can be used with FlightSqlClient to access column's metadata contained in schemas
+ * returned by GetTables and query execution as follows:
+ *
  * <pre>
  *   FlightSqlColumnMetadata metadata = new FlightSqlColumnMetadata(field.getMetadata());
  *   Integer precision = metadata.getPrecision();
  * </pre>
  *
  * FlightSqlProducer can use this to set metadata on a column in a schema as follows:
+ *
  * <pre>
  *   FlightSqlColumnMetadata metadata = new FlightSqlColumnMetadata.Builder()
  *         .precision(10)
@@ -58,15 +59,14 @@ public class FlightSqlColumnMetadata {
 
   private final Map<String, String> metadataMap;
 
-  /**
-   * Creates a new instance of FlightSqlColumnMetadata.
-   */
+  /** Creates a new instance of FlightSqlColumnMetadata. */
   public FlightSqlColumnMetadata(Map<String, String> metadataMap) {
     this.metadataMap = new HashMap<>(metadataMap);
   }
 
   /**
    * Returns the metadata map.
+   *
    * @return The metadata map.
    */
   public Map<String, String> getMetadataMap() {
@@ -75,6 +75,7 @@ public Map<String, String> getMetadataMap() {
 
   /**
    * Returns the catalog name.
+   *
    * @return The catalog name.
    */
   public String getCatalogName() {
@@ -83,6 +84,7 @@ public String getCatalogName() {
 
   /**
    * Returns the schema name.
+   *
    * @return The schema name.
    */
   public String getSchemaName() {
@@ -91,6 +93,7 @@ public String getSchemaName() {
 
   /**
    * Returns the table name.
+   *
    * @return The table name.
    */
   public String getTableName() {
@@ -99,6 +102,7 @@ public String getTableName() {
 
   /**
    * Returns the type name.
+   *
    * @return The type name.
    */
   public String getTypeName() {
@@ -107,6 +111,7 @@ public String getTypeName() {
 
   /**
    * Returns the precision / column size.
+   *
    * @return The precision / column size.
    */
   public Integer getPrecision() {
@@ -120,6 +125,7 @@ public Integer getPrecision() {
 
   /**
    * Returns the scale / decimal digits.
+   *
    * @return The scale / decimal digits.
    */
   public Integer getScale() {
@@ -133,6 +139,7 @@ public Integer getScale() {
 
   /**
    * Returns if the column is auto incremented.
+   *
    * @return True if the column is auto incremented, false otherwise.
    */
   public Boolean isAutoIncrement() {
@@ -146,6 +153,7 @@ public Boolean isAutoIncrement() {
 
   /**
    * Returns if the column is case-sensitive.
+   *
    * @return True if the column is case-sensitive, false otherwise.
    */
   public Boolean isCaseSensitive() {
@@ -159,6 +167,7 @@ public Boolean isCaseSensitive() {
 
   /**
    * Returns if the column is read only.
+   *
    * @return True if the column is read only, false otherwise.
    */
   public Boolean isReadOnly() {
@@ -172,6 +181,7 @@ public Boolean isReadOnly() {
 
   /**
    * Returns if the column is searchable.
+   *
    * @return True if the column is searchable, false otherwise.
    */
   public Boolean isSearchable() {
@@ -183,21 +193,18 @@ public Boolean isSearchable() {
     return stringToBoolean(value);
   }
 
-  /**
-   * Builder of FlightSqlColumnMetadata, used on FlightSqlProducer implementations.
-   */
+  /** Builder of FlightSqlColumnMetadata, used on FlightSqlProducer implementations. */
   public static class Builder {
     private final Map<String, String> metadataMap;
 
-    /**
-     * Creates a new instance of FlightSqlColumnMetadata.Builder.
-     */
+    /** Creates a new instance of FlightSqlColumnMetadata.Builder. */
     public Builder() {
       this.metadataMap = new HashMap<>();
     }
 
     /**
      * Sets the catalog name.
+     *
      * @param catalogName the catalog name.
      * @return This builder.
      */
@@ -208,6 +215,7 @@ public Builder catalogName(String catalogName) {
 
     /**
      * Sets the schema name.
+     *
      * @param schemaName The schema name.
      * @return This builder.
      */
@@ -218,6 +226,7 @@ public Builder schemaName(String schemaName) {
 
     /**
      * Sets the table name.
+     *
      * @param tableName The table name.
      * @return This builder.
      */
@@ -228,6 +237,7 @@ public Builder tableName(String tableName) {
 
     /**
      * Sets the type name.
+     *
      * @param typeName The type name.
      * @return This builder.
      */
@@ -238,6 +248,7 @@ public Builder typeName(String typeName) {
 
     /**
      * Sets the precision / column size.
+     *
      * @param precision The precision / column size.
      * @return This builder.
      */
@@ -248,6 +259,7 @@ public Builder precision(int precision) {
 
     /**
      * Sets the scale / decimal digits.
+     *
      * @param scale The scale / decimal digits.
      * @return This builder.
      */
@@ -258,6 +270,7 @@ public Builder scale(int scale) {
 
     /**
      * Sets if the column is auto incremented.
+     *
      * @param isAutoIncrement True if the column is auto incremented.
      * @return This builder.
      */
@@ -268,6 +281,7 @@ public Builder isAutoIncrement(boolean isAutoIncrement) {
 
     /**
      * Sets if the column is case-sensitive.
+     *
      * @param isCaseSensitive If the column is case-sensitive.
      * @return This builder.
      */
@@ -278,6 +292,7 @@ public Builder isCaseSensitive(boolean isCaseSensitive) {
 
     /**
      * Sets if the column is read only.
+     *
      * @param isReadOnly If the column is read only.
      * @return This builder.
      */
@@ -288,6 +303,7 @@ public Builder isReadOnly(boolean isReadOnly) {
 
     /**
      * Sets if the column is searchable.
+     *
      * @param isSearchable If the column is searchable.
      * @return This builder.
      */
@@ -298,6 +314,7 @@ public Builder isSearchable(boolean isSearchable) {
 
     /**
      * Builds a new instance of FlightSqlColumnMetadata.
+     *
      * @return A new instance of FlightSqlColumnMetadata.
      */
     public FlightSqlColumnMetadata build() {
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlProducer.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlProducer.java
index f06c1b868f4fd..0afef79160621 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlProducer.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlProducer.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql;
 
 import static java.util.Arrays.asList;
@@ -46,11 +45,13 @@
 import static org.apache.arrow.vector.types.Types.MinorType.UINT4;
 import static org.apache.arrow.vector.types.Types.MinorType.VARCHAR;
 
+import com.google.common.collect.ImmutableList;
+import com.google.protobuf.Any;
+import com.google.protobuf.InvalidProtocolBufferException;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.ByteBuffer;
 import java.util.List;
-
 import org.apache.arrow.flight.Action;
 import org.apache.arrow.flight.ActionType;
 import org.apache.arrow.flight.CallStatus;
@@ -94,20 +95,13 @@
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-import com.google.common.collect.ImmutableList;
-import com.google.protobuf.Any;
-import com.google.protobuf.InvalidProtocolBufferException;
-
-/**
- * API to Implement an Arrow Flight SQL producer.
- */
+/** API to Implement an Arrow Flight SQL producer. */
 public interface FlightSqlProducer extends FlightProducer, AutoCloseable {
   /**
-   * Depending on the provided command, method either:
-   * 1. Return information about a SQL query, or
+   * Depending on the provided command, method either: 1. Return information about a SQL query, or
    * 2. Return information about a prepared statement. In this case, parameters binding is allowed.
    *
-   * @param context    Per-call context.
+   * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
    * @return information about the given SQL query, or the given prepared statement.
    */
@@ -120,10 +114,14 @@ default FlightInfo getFlightInfo(CallContext context, FlightDescriptor descripto
           FlightSqlUtils.unpackOrThrow(command, CommandStatementQuery.class), context, descriptor);
     } else if (command.is(CommandStatementSubstraitPlan.class)) {
       return getFlightInfoSubstraitPlan(
-          FlightSqlUtils.unpackOrThrow(command, CommandStatementSubstraitPlan.class), context, descriptor);
+          FlightSqlUtils.unpackOrThrow(command, CommandStatementSubstraitPlan.class),
+          context,
+          descriptor);
     } else if (command.is(CommandPreparedStatementQuery.class)) {
       return getFlightInfoPreparedStatement(
-          FlightSqlUtils.unpackOrThrow(command, CommandPreparedStatementQuery.class), context, descriptor);
+          FlightSqlUtils.unpackOrThrow(command, CommandPreparedStatementQuery.class),
+          context,
+          descriptor);
     } else if (command.is(CommandGetCatalogs.class)) {
       return getFlightInfoCatalogs(
           FlightSqlUtils.unpackOrThrow(command, CommandGetCatalogs.class), context, descriptor);
@@ -150,7 +148,9 @@ default FlightInfo getFlightInfo(CallContext context, FlightDescriptor descripto
           FlightSqlUtils.unpackOrThrow(command, CommandGetImportedKeys.class), context, descriptor);
     } else if (command.is(CommandGetCrossReference.class)) {
       return getFlightInfoCrossReference(
-          FlightSqlUtils.unpackOrThrow(command, CommandGetCrossReference.class), context, descriptor);
+          FlightSqlUtils.unpackOrThrow(command, CommandGetCrossReference.class),
+          context,
+          descriptor);
     } else if (command.is(CommandGetXdbcTypeInfo.class)) {
       return getFlightInfoTypeInfo(
           FlightSqlUtils.unpackOrThrow(command, CommandGetXdbcTypeInfo.class), context, descriptor);
@@ -164,7 +164,7 @@ default FlightInfo getFlightInfo(CallContext context, FlightDescriptor descripto
   /**
    * Returns the schema of the result produced by the SQL query.
    *
-   * @param context    Per-call context.
+   * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
    * @return the result set schema.
    */
@@ -177,10 +177,14 @@ default SchemaResult getSchema(CallContext context, FlightDescriptor descriptor)
           FlightSqlUtils.unpackOrThrow(command, CommandStatementQuery.class), context, descriptor);
     } else if (command.is(CommandPreparedStatementQuery.class)) {
       return getSchemaPreparedStatement(
-          FlightSqlUtils.unpackOrThrow(command, CommandPreparedStatementQuery.class), context, descriptor);
+          FlightSqlUtils.unpackOrThrow(command, CommandPreparedStatementQuery.class),
+          context,
+          descriptor);
     } else if (command.is(CommandStatementSubstraitPlan.class)) {
       return getSchemaSubstraitPlan(
-          FlightSqlUtils.unpackOrThrow(command, CommandStatementSubstraitPlan.class), context, descriptor);
+          FlightSqlUtils.unpackOrThrow(command, CommandStatementSubstraitPlan.class),
+          context,
+          descriptor);
     } else if (command.is(CommandGetCatalogs.class)) {
       return new SchemaResult(Schemas.GET_CATALOGS_SCHEMA);
     } else if (command.is(CommandGetCrossReference.class)) {
@@ -212,12 +216,12 @@ default SchemaResult getSchema(CallContext context, FlightDescriptor descriptor)
   }
 
   /**
-   * Depending on the provided command, method either:
-   * 1. Return data for a stream produced by executing the provided SQL query, or
-   * 2. Return data for a prepared statement. In this case, parameters binding is allowed.
+   * Depending on the provided command, method either: 1. Return data for a stream produced by
+   * executing the provided SQL query, or 2. Return data for a prepared statement. In this case,
+   * parameters binding is allowed.
    *
-   * @param context  Per-call context.
-   * @param ticket   The application-defined ticket identifying this stream.
+   * @param context Per-call context.
+   * @param ticket The application-defined ticket identifying this stream.
    * @param listener An interface for sending data back to the client.
    */
   @Override
@@ -236,73 +240,94 @@ default void getStream(CallContext context, Ticket ticket, ServerStreamListener
           FlightSqlUtils.unpackOrThrow(command, TicketStatementQuery.class), context, listener);
     } else if (command.is(CommandPreparedStatementQuery.class)) {
       getStreamPreparedStatement(
-          FlightSqlUtils.unpackOrThrow(command, CommandPreparedStatementQuery.class), context, listener);
+          FlightSqlUtils.unpackOrThrow(command, CommandPreparedStatementQuery.class),
+          context,
+          listener);
     } else if (command.is(CommandGetCatalogs.class)) {
       getStreamCatalogs(context, listener);
     } else if (command.is(CommandGetDbSchemas.class)) {
-      getStreamSchemas(FlightSqlUtils.unpackOrThrow(command, CommandGetDbSchemas.class), context, listener);
+      getStreamSchemas(
+          FlightSqlUtils.unpackOrThrow(command, CommandGetDbSchemas.class), context, listener);
     } else if (command.is(CommandGetTables.class)) {
-      getStreamTables(FlightSqlUtils.unpackOrThrow(command, CommandGetTables.class), context, listener);
+      getStreamTables(
+          FlightSqlUtils.unpackOrThrow(command, CommandGetTables.class), context, listener);
     } else if (command.is(CommandGetTableTypes.class)) {
       getStreamTableTypes(context, listener);
     } else if (command.is(CommandGetSqlInfo.class)) {
-      getStreamSqlInfo(FlightSqlUtils.unpackOrThrow(command, CommandGetSqlInfo.class), context, listener);
+      getStreamSqlInfo(
+          FlightSqlUtils.unpackOrThrow(command, CommandGetSqlInfo.class), context, listener);
     } else if (command.is(CommandGetPrimaryKeys.class)) {
-      getStreamPrimaryKeys(FlightSqlUtils.unpackOrThrow(command, CommandGetPrimaryKeys.class), context, listener);
+      getStreamPrimaryKeys(
+          FlightSqlUtils.unpackOrThrow(command, CommandGetPrimaryKeys.class), context, listener);
     } else if (command.is(CommandGetExportedKeys.class)) {
-      getStreamExportedKeys(FlightSqlUtils.unpackOrThrow(command, CommandGetExportedKeys.class), context, listener);
+      getStreamExportedKeys(
+          FlightSqlUtils.unpackOrThrow(command, CommandGetExportedKeys.class), context, listener);
     } else if (command.is(CommandGetImportedKeys.class)) {
-      getStreamImportedKeys(FlightSqlUtils.unpackOrThrow(command, CommandGetImportedKeys.class), context, listener);
+      getStreamImportedKeys(
+          FlightSqlUtils.unpackOrThrow(command, CommandGetImportedKeys.class), context, listener);
     } else if (command.is(CommandGetCrossReference.class)) {
-      getStreamCrossReference(FlightSqlUtils.unpackOrThrow(command, CommandGetCrossReference.class), context, listener);
+      getStreamCrossReference(
+          FlightSqlUtils.unpackOrThrow(command, CommandGetCrossReference.class), context, listener);
     } else if (command.is(CommandGetXdbcTypeInfo.class)) {
-      getStreamTypeInfo(FlightSqlUtils.unpackOrThrow(command, CommandGetXdbcTypeInfo.class), context, listener);
+      getStreamTypeInfo(
+          FlightSqlUtils.unpackOrThrow(command, CommandGetXdbcTypeInfo.class), context, listener);
     } else {
-      throw CallStatus.INVALID_ARGUMENT.withDescription("The defined request is invalid.").toRuntimeException();
+      throw CallStatus.INVALID_ARGUMENT
+          .withDescription("The defined request is invalid.")
+          .toRuntimeException();
     }
   }
 
   /**
-   * Depending on the provided command, method either:
-   * 1. Execute provided SQL query as an update statement, or
-   * 2. Execute provided update SQL query prepared statement. In this case, parameters binding
-   * is allowed, or
-   * 3. Binds parameters to the provided prepared statement.
+   * Depending on the provided command, method either: 1. Execute provided SQL query as an update
+   * statement, or 2. Execute provided update SQL query prepared statement. In this case, parameters
+   * binding is allowed, or 3. Binds parameters to the provided prepared statement.
    *
-   * @param context      Per-call context.
+   * @param context Per-call context.
    * @param flightStream The data stream being uploaded.
-   * @param ackStream    The data stream listener for update result acknowledgement.
+   * @param ackStream The data stream listener for update result acknowledgement.
    * @return a Runnable to process the stream.
    */
   @Override
-  default Runnable acceptPut(CallContext context, FlightStream flightStream, StreamListener<PutResult> ackStream) {
+  default Runnable acceptPut(
+      CallContext context, FlightStream flightStream, StreamListener<PutResult> ackStream) {
     final Any command = FlightSqlUtils.parseOrThrow(flightStream.getDescriptor().getCommand());
 
     if (command.is(CommandStatementUpdate.class)) {
       return acceptPutStatement(
           FlightSqlUtils.unpackOrThrow(command, CommandStatementUpdate.class),
-          context, flightStream, ackStream);
+          context,
+          flightStream,
+          ackStream);
     } else if (command.is(CommandStatementSubstraitPlan.class)) {
       return acceptPutSubstraitPlan(
           FlightSqlUtils.unpackOrThrow(command, CommandStatementSubstraitPlan.class),
-          context, flightStream, ackStream);
+          context,
+          flightStream,
+          ackStream);
     } else if (command.is(CommandPreparedStatementUpdate.class)) {
       return acceptPutPreparedStatementUpdate(
           FlightSqlUtils.unpackOrThrow(command, CommandPreparedStatementUpdate.class),
-          context, flightStream, ackStream);
+          context,
+          flightStream,
+          ackStream);
     } else if (command.is(CommandPreparedStatementQuery.class)) {
       return acceptPutPreparedStatementQuery(
           FlightSqlUtils.unpackOrThrow(command, CommandPreparedStatementQuery.class),
-          context, flightStream, ackStream);
+          context,
+          flightStream,
+          ackStream);
     }
 
-    throw CallStatus.INVALID_ARGUMENT.withDescription("The defined request is invalid.").toRuntimeException();
+    throw CallStatus.INVALID_ARGUMENT
+        .withDescription("The defined request is invalid.")
+        .toRuntimeException();
   }
 
   /**
    * Lists all available Flight SQL actions.
    *
-   * @param context  Per-call context.
+   * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
   @Override
@@ -314,8 +339,8 @@ default void listActions(CallContext context, StreamListener<ActionType> listene
   /**
    * Performs the requested Flight SQL action.
    *
-   * @param context  Per-call context.
-   * @param action   Client-supplied parameters.
+   * @param context Per-call context.
+   * @param action Client-supplied parameters.
    * @param listener A stream of responses.
    */
   @Override
@@ -328,7 +353,8 @@ default void doAction(CallContext context, Action action, StreamListener<Result>
       beginSavepoint(request, context, new ProtoListener<>(listener));
     } else if (actionType.equals(FlightSqlUtils.FLIGHT_SQL_BEGIN_TRANSACTION.getType())) {
       final ActionBeginTransactionRequest request =
-          FlightSqlUtils.unpackAndParseOrThrow(action.getBody(), ActionBeginTransactionRequest.class);
+          FlightSqlUtils.unpackAndParseOrThrow(
+              action.getBody(), ActionBeginTransactionRequest.class);
       beginTransaction(request, context, new ProtoListener<>(listener));
     } else if (actionType.equals(FlightSqlUtils.FLIGHT_SQL_CANCEL_QUERY.getType())) {
       //noinspection deprecation
@@ -338,24 +364,29 @@ default void doAction(CallContext context, Action action, StreamListener<Result>
       try {
         info = FlightInfo.deserialize(request.getInfo().asReadOnlyByteBuffer());
       } catch (IOException | URISyntaxException e) {
-        listener.onError(CallStatus.INTERNAL
-            .withDescription("Could not unpack FlightInfo: " + e)
-            .withCause(e)
-            .toRuntimeException());
+        listener.onError(
+            CallStatus.INTERNAL
+                .withDescription("Could not unpack FlightInfo: " + e)
+                .withCause(e)
+                .toRuntimeException());
         return;
       }
       cancelQuery(info, context, new CancelListener(listener));
     } else if (actionType.equals(FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_STATEMENT.getType())) {
-      final ActionCreatePreparedStatementRequest request = FlightSqlUtils.unpackAndParseOrThrow(action.getBody(),
-          ActionCreatePreparedStatementRequest.class);
+      final ActionCreatePreparedStatementRequest request =
+          FlightSqlUtils.unpackAndParseOrThrow(
+              action.getBody(), ActionCreatePreparedStatementRequest.class);
       createPreparedStatement(request, context, listener);
-    } else if (actionType.equals(FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_SUBSTRAIT_PLAN.getType())) {
+    } else if (actionType.equals(
+        FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_SUBSTRAIT_PLAN.getType())) {
       final ActionCreatePreparedSubstraitPlanRequest request =
-          FlightSqlUtils.unpackAndParseOrThrow(action.getBody(), ActionCreatePreparedSubstraitPlanRequest.class);
+          FlightSqlUtils.unpackAndParseOrThrow(
+              action.getBody(), ActionCreatePreparedSubstraitPlanRequest.class);
       createPreparedSubstraitPlan(request, context, new ProtoListener<>(listener));
     } else if (actionType.equals(FlightSqlUtils.FLIGHT_SQL_CLOSE_PREPARED_STATEMENT.getType())) {
       final ActionClosePreparedStatementRequest request =
-          FlightSqlUtils.unpackAndParseOrThrow(action.getBody(), ActionClosePreparedStatementRequest.class);
+          FlightSqlUtils.unpackAndParseOrThrow(
+              action.getBody(), ActionClosePreparedStatementRequest.class);
       closePreparedStatement(request, context, new NoResultListener(listener));
     } else if (actionType.equals(FlightSqlUtils.FLIGHT_SQL_END_SAVEPOINT.getType())) {
       ActionEndSavepointRequest request =
@@ -370,10 +401,11 @@ default void doAction(CallContext context, Action action, StreamListener<Result>
       try {
         request = CancelFlightInfoRequest.deserialize(ByteBuffer.wrap(action.getBody()));
       } catch (IOException | URISyntaxException e) {
-        listener.onError(CallStatus.INTERNAL
-            .withDescription("Could not unpack FlightInfo: " + e)
-            .withCause(e)
-            .toRuntimeException());
+        listener.onError(
+            CallStatus.INTERNAL
+                .withDescription("Could not unpack FlightInfo: " + e)
+                .withCause(e)
+                .toRuntimeException());
         return;
       }
       cancelFlightInfo(request, context, new CancelStatusListener(listener));
@@ -382,10 +414,11 @@ default void doAction(CallContext context, Action action, StreamListener<Result>
       try {
         request = RenewFlightEndpointRequest.deserialize(ByteBuffer.wrap(action.getBody()));
       } catch (IOException | URISyntaxException e) {
-        listener.onError(CallStatus.INTERNAL
-            .withDescription("Could not unpack FlightInfo: " + e)
-            .withCause(e)
-            .toRuntimeException());
+        listener.onError(
+            CallStatus.INTERNAL
+                .withDescription("Could not unpack FlightInfo: " + e)
+                .withCause(e)
+                .toRuntimeException());
         return;
       }
       renewFlightEndpoint(request, context, new FlightEndpointListener(listener));
@@ -394,10 +427,11 @@ default void doAction(CallContext context, Action action, StreamListener<Result>
       try {
         request = SetSessionOptionsRequest.deserialize(ByteBuffer.wrap(action.getBody()));
       } catch (IOException e) {
-        listener.onError(CallStatus.INTERNAL
-            .withDescription("Could not unpack SetSessionOptionsRequest: " + e)
-            .withCause(e)
-            .toRuntimeException());
+        listener.onError(
+            CallStatus.INTERNAL
+                .withDescription("Could not unpack SetSessionOptionsRequest: " + e)
+                .withCause(e)
+                .toRuntimeException());
         return;
       }
       setSessionOptions(request, context, new SetSessionOptionsResultListener(listener));
@@ -406,10 +440,11 @@ default void doAction(CallContext context, Action action, StreamListener<Result>
       try {
         request = GetSessionOptionsRequest.deserialize(ByteBuffer.wrap(action.getBody()));
       } catch (IOException e) {
-        listener.onError(CallStatus.INTERNAL
-            .withDescription("Could not unpack GetSessionOptionsRequest: " + e)
-            .withCause(e)
-            .toRuntimeException());
+        listener.onError(
+            CallStatus.INTERNAL
+                .withDescription("Could not unpack GetSessionOptionsRequest: " + e)
+                .withCause(e)
+                .toRuntimeException());
         return;
       }
       getSessionOptions(request, context, new GetSessionOptionsResultListener(listener));
@@ -418,10 +453,11 @@ default void doAction(CallContext context, Action action, StreamListener<Result>
       try {
         request = CloseSessionRequest.deserialize(ByteBuffer.wrap(action.getBody()));
       } catch (IOException e) {
-        listener.onError(CallStatus.INTERNAL
-            .withDescription("Could not unpack CloseSessionRequest: " + e)
-            .withCause(e)
-            .toRuntimeException());
+        listener.onError(
+            CallStatus.INTERNAL
+                .withDescription("Could not unpack CloseSessionRequest: " + e)
+                .withCause(e)
+                .toRuntimeException());
         return;
       }
       closeSession(request, context, new CloseSessionResultListener(listener));
@@ -435,24 +471,28 @@ default void doAction(CallContext context, Action action, StreamListener<Result>
   /**
    * Create a savepoint within a transaction.
    *
-   * @param request  The savepoint request.
-   * @param context  Per-call context.
+   * @param request The savepoint request.
+   * @param context Per-call context.
    * @param listener The newly created savepoint ID.
    */
-  default void beginSavepoint(ActionBeginSavepointRequest request, CallContext context,
-                              StreamListener<ActionBeginSavepointResult> listener) {
+  default void beginSavepoint(
+      ActionBeginSavepointRequest request,
+      CallContext context,
+      StreamListener<ActionBeginSavepointResult> listener) {
     listener.onError(CallStatus.UNIMPLEMENTED.toRuntimeException());
   }
 
   /**
    * Begin a transaction.
    *
-   * @param request  The transaction request.
-   * @param context  Per-call context.
+   * @param request The transaction request.
+   * @param context Per-call context.
    * @param listener The newly created transaction ID.
    */
-  default void beginTransaction(ActionBeginTransactionRequest request, CallContext context,
-                                StreamListener<ActionBeginTransactionResult> listener) {
+  default void beginTransaction(
+      ActionBeginTransactionRequest request,
+      CallContext context,
+      StreamListener<ActionBeginTransactionResult> listener) {
     listener.onError(CallStatus.UNIMPLEMENTED.toRuntimeException());
   }
 
@@ -463,67 +503,73 @@ default void beginTransaction(ActionBeginTransactionRequest request, CallContext
    * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
-  default void cancelFlightInfo(CancelFlightInfoRequest request, CallContext context,
-                                StreamListener<CancelStatus> listener) {
+  default void cancelFlightInfo(
+      CancelFlightInfoRequest request, CallContext context, StreamListener<CancelStatus> listener) {
     listener.onError(CallStatus.UNIMPLEMENTED.toRuntimeException());
   }
 
-
   /**
    * Explicitly cancel a query.
    *
-   * @param info     The FlightInfo of the query to cancel.
-   * @param context  Per-call context.
+   * @param info The FlightInfo of the query to cancel.
+   * @param context Per-call context.
    * @param listener Whether cancellation succeeded.
-   * @deprecated Prefer {@link #cancelFlightInfo(CancelFlightInfoRequest, CallContext, StreamListener)}.
+   * @deprecated Prefer {@link #cancelFlightInfo(CancelFlightInfoRequest, CallContext,
+   *     StreamListener)}.
    */
   @Deprecated
-  default void cancelQuery(FlightInfo info, CallContext context, StreamListener<CancelResult> listener) {
+  default void cancelQuery(
+      FlightInfo info, CallContext context, StreamListener<CancelResult> listener) {
     CancelFlightInfoRequest request = new CancelFlightInfoRequest(info);
-    cancelFlightInfo(request, context, new StreamListener<CancelStatus>() {
-      @Override
-      public void onNext(CancelStatus val) {
-        switch (val) {
-          case UNSPECIFIED:
-            listener.onNext(CancelResult.UNSPECIFIED);
-            break;
-          case CANCELLED:
-            listener.onNext(CancelResult.CANCELLED);
-            break;
-          case CANCELLING:
-            listener.onNext(CancelResult.CANCELLING);
-            break;
-          case NOT_CANCELLABLE:
-            listener.onNext(CancelResult.NOT_CANCELLABLE);
-            break;
-          default:
-            // XXX: CheckStyle requires a default clause which arguably makes the code worse.
-            throw new AssertionError("Unknown enum variant " + val);
-        }
-      }
-
-      @Override
-      public void onError(Throwable t) {
-        listener.onError(t);
-      }
-
-      @Override
-      public void onCompleted() {
-        listener.onCompleted();
-      }
-    });
+    cancelFlightInfo(
+        request,
+        context,
+        new StreamListener<CancelStatus>() {
+          @Override
+          public void onNext(CancelStatus val) {
+            switch (val) {
+              case UNSPECIFIED:
+                listener.onNext(CancelResult.UNSPECIFIED);
+                break;
+              case CANCELLED:
+                listener.onNext(CancelResult.CANCELLED);
+                break;
+              case CANCELLING:
+                listener.onNext(CancelResult.CANCELLING);
+                break;
+              case NOT_CANCELLABLE:
+                listener.onNext(CancelResult.NOT_CANCELLABLE);
+                break;
+              default:
+                // XXX: CheckStyle requires a default clause which arguably makes the code worse.
+                throw new AssertionError("Unknown enum variant " + val);
+            }
+          }
+
+          @Override
+          public void onError(Throwable t) {
+            listener.onError(t);
+          }
+
+          @Override
+          public void onCompleted() {
+            listener.onCompleted();
+          }
+        });
   }
 
   /**
    * Set server session options(s).
    *
-   * @param request The session options to set. For *DBC driver compatibility, servers
-   *                should support converting values from strings.
+   * @param request The session options to set. For *DBC driver compatibility, servers should
+   *     support converting values from strings.
    * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
-  default void setSessionOptions(SetSessionOptionsRequest request, CallContext context,
-                                StreamListener<SetSessionOptionsResult> listener) {
+  default void setSessionOptions(
+      SetSessionOptionsRequest request,
+      CallContext context,
+      StreamListener<SetSessionOptionsResult> listener) {
     listener.onError(CallStatus.UNIMPLEMENTED.toRuntimeException());
   }
 
@@ -534,8 +580,10 @@ default void setSessionOptions(SetSessionOptionsRequest request, CallContext con
    * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
-  default void getSessionOptions(GetSessionOptionsRequest request, CallContext context,
-                                StreamListener<GetSessionOptionsResult> listener) {
+  default void getSessionOptions(
+      GetSessionOptionsRequest request,
+      CallContext context,
+      StreamListener<GetSessionOptionsResult> listener) {
     listener.onError(CallStatus.UNIMPLEMENTED.toRuntimeException());
   }
 
@@ -546,126 +594,134 @@ default void getSessionOptions(GetSessionOptionsRequest request, CallContext con
    * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
-  default void closeSession(CloseSessionRequest request, CallContext context,
-                                StreamListener<CloseSessionResult> listener) {
+  default void closeSession(
+      CloseSessionRequest request,
+      CallContext context,
+      StreamListener<CloseSessionResult> listener) {
     listener.onError(CallStatus.UNIMPLEMENTED.toRuntimeException());
   }
 
   /**
-   * Creates a prepared statement on the server and returns a handle and metadata for in a
-   * {@link ActionCreatePreparedStatementResult} object in a {@link Result}
-   * object.
+   * Creates a prepared statement on the server and returns a handle and metadata for in a {@link
+   * ActionCreatePreparedStatementResult} object in a {@link Result} object.
    *
-   * @param request  The sql command to generate the prepared statement.
-   * @param context  Per-call context.
+   * @param request The sql command to generate the prepared statement.
+   * @param context Per-call context.
    * @param listener A stream of responses.
    */
-  void createPreparedStatement(ActionCreatePreparedStatementRequest request, CallContext context,
-                               StreamListener<Result> listener);
+  void createPreparedStatement(
+      ActionCreatePreparedStatementRequest request,
+      CallContext context,
+      StreamListener<Result> listener);
 
   /**
    * Pre-compile a Substrait plan.
-   * @param request  The plan.
-   * @param context  Per-call context.
+   *
+   * @param request The plan.
+   * @param context Per-call context.
    * @param listener The resulting prepared statement.
    */
-  default void createPreparedSubstraitPlan(ActionCreatePreparedSubstraitPlanRequest request, CallContext context,
-                                           StreamListener<ActionCreatePreparedStatementResult> listener) {
+  default void createPreparedSubstraitPlan(
+      ActionCreatePreparedSubstraitPlanRequest request,
+      CallContext context,
+      StreamListener<ActionCreatePreparedStatementResult> listener) {
     listener.onError(CallStatus.UNIMPLEMENTED.toRuntimeException());
   }
 
   /**
    * Closes a prepared statement on the server. No result is expected.
    *
-   * @param request  The sql command to generate the prepared statement.
-   * @param context  Per-call context.
+   * @param request The sql command to generate the prepared statement.
+   * @param context Per-call context.
    * @param listener A stream of responses.
    */
-  void closePreparedStatement(ActionClosePreparedStatementRequest request, CallContext context,
-                              StreamListener<Result> listener);
+  void closePreparedStatement(
+      ActionClosePreparedStatementRequest request,
+      CallContext context,
+      StreamListener<Result> listener);
 
   /**
    * Release or roll back to a savepoint.
    *
-   * @param request  The savepoint, and whether to release/rollback.
-   * @param context  Per-call context.
-   * @param listener Call {@link StreamListener#onCompleted()} or
-   *                 {@link StreamListener#onError(Throwable)} when done; do not send a result.
+   * @param request The savepoint, and whether to release/rollback.
+   * @param context Per-call context.
+   * @param listener Call {@link StreamListener#onCompleted()} or {@link
+   *     StreamListener#onError(Throwable)} when done; do not send a result.
    */
-  default void endSavepoint(ActionEndSavepointRequest request, CallContext context,
-                            StreamListener<Result> listener) {
+  default void endSavepoint(
+      ActionEndSavepointRequest request, CallContext context, StreamListener<Result> listener) {
     listener.onError(CallStatus.UNIMPLEMENTED.toRuntimeException());
   }
 
   /**
    * Commit or roll back to a transaction.
    *
-   * @param request  The transaction, and whether to release/rollback.
-   * @param context  Per-call context.
-   * @param listener Call {@link StreamListener#onCompleted()} or
-   *                 {@link StreamListener#onError(Throwable)} when done; do not send a result.
+   * @param request The transaction, and whether to release/rollback.
+   * @param context Per-call context.
+   * @param listener Call {@link StreamListener#onCompleted()} or {@link
+   *     StreamListener#onError(Throwable)} when done; do not send a result.
    */
-  default void endTransaction(ActionEndTransactionRequest request, CallContext context,
-                              StreamListener<Result> listener) {
+  default void endTransaction(
+      ActionEndTransactionRequest request, CallContext context, StreamListener<Result> listener) {
     listener.onError(CallStatus.UNIMPLEMENTED.toRuntimeException());
   }
 
   /**
    * Evaluate a SQL query.
    *
-   * @param command    The SQL query.
-   * @param context    Per-call context.
+   * @param command The SQL query.
+   * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
    * @return Metadata about the stream.
    */
-  FlightInfo getFlightInfoStatement(CommandStatementQuery command, CallContext context,
-                                    FlightDescriptor descriptor);
+  FlightInfo getFlightInfoStatement(
+      CommandStatementQuery command, CallContext context, FlightDescriptor descriptor);
 
   /**
    * Evaluate a Substrait plan.
    *
-   * @param command    The Substrait plan.
-   * @param context    Per-call context.
+   * @param command The Substrait plan.
+   * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
    * @return Metadata about the stream.
    */
-  default FlightInfo getFlightInfoSubstraitPlan(CommandStatementSubstraitPlan command, CallContext context,
-                                                FlightDescriptor descriptor) {
+  default FlightInfo getFlightInfoSubstraitPlan(
+      CommandStatementSubstraitPlan command, CallContext context, FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED.toRuntimeException();
   }
 
   /**
    * Gets information about a particular prepared statement data stream.
    *
-   * @param command    The prepared statement to generate the data stream.
-   * @param context    Per-call context.
+   * @param command The prepared statement to generate the data stream.
+   * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
    * @return Metadata about the stream.
    */
-  FlightInfo getFlightInfoPreparedStatement(CommandPreparedStatementQuery command,
-                                            CallContext context, FlightDescriptor descriptor);
+  FlightInfo getFlightInfoPreparedStatement(
+      CommandPreparedStatementQuery command, CallContext context, FlightDescriptor descriptor);
 
   /**
    * Get the result schema for a SQL query.
    *
-   * @param command    The SQL query.
-   * @param context    Per-call context.
+   * @param command The SQL query.
+   * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
    * @return the schema of the result set.
    */
-  SchemaResult getSchemaStatement(CommandStatementQuery command, CallContext context,
-                                  FlightDescriptor descriptor);
+  SchemaResult getSchemaStatement(
+      CommandStatementQuery command, CallContext context, FlightDescriptor descriptor);
 
   /**
    * Get the schema of the result set of a prepared statement.
    *
-   * @param command    The prepared statement handle.
-   * @param context    Per-call context.
+   * @param command The prepared statement handle.
+   * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
    * @return the schema of the result set.
    */
-  default SchemaResult getSchemaPreparedStatement(CommandPreparedStatementQuery command, CallContext context,
-                                  FlightDescriptor descriptor) {
+  default SchemaResult getSchemaPreparedStatement(
+      CommandPreparedStatementQuery command, CallContext context, FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED
         .withDescription("GetSchema with CommandPreparedStatementQuery is not implemented")
         .toRuntimeException();
@@ -674,59 +730,67 @@ default SchemaResult getSchemaPreparedStatement(CommandPreparedStatementQuery co
   /**
    * Get the result schema for a Substrait plan.
    *
-   * @param command    The Substrait plan.
-   * @param context    Per-call context.
+   * @param command The Substrait plan.
+   * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
    * @return Schema for the stream.
    */
-  default SchemaResult getSchemaSubstraitPlan(CommandStatementSubstraitPlan command, CallContext context,
-                                              FlightDescriptor descriptor) {
+  default SchemaResult getSchemaSubstraitPlan(
+      CommandStatementSubstraitPlan command, CallContext context, FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED.toRuntimeException();
   }
 
   /**
    * Returns data for a SQL query based data stream.
-   * @param ticket   Ticket message containing the statement handle.
-   * @param context  Per-call context.
+   *
+   * @param ticket Ticket message containing the statement handle.
+   * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
-  void getStreamStatement(TicketStatementQuery ticket, CallContext context,
-                          ServerStreamListener listener);
+  void getStreamStatement(
+      TicketStatementQuery ticket, CallContext context, ServerStreamListener listener);
 
   /**
    * Returns data for a particular prepared statement query instance.
    *
-   * @param command  The prepared statement to generate the data stream.
-   * @param context  Per-call context.
+   * @param command The prepared statement to generate the data stream.
+   * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
-  void getStreamPreparedStatement(CommandPreparedStatementQuery command, CallContext context,
-                                  ServerStreamListener listener);
+  void getStreamPreparedStatement(
+      CommandPreparedStatementQuery command, CallContext context, ServerStreamListener listener);
 
   /**
    * Accepts uploaded data for a particular SQL query based data stream.
+   *
    * <p>`PutResult`s must be in the form of a {@link DoPutUpdateResult}.
    *
-   * @param command      The sql command to generate the data stream.
-   * @param context      Per-call context.
+   * @param command The sql command to generate the data stream.
+   * @param context Per-call context.
    * @param flightStream The data stream being uploaded.
-   * @param ackStream    The result data stream.
+   * @param ackStream The result data stream.
    * @return A runnable to process the stream.
    */
-  Runnable acceptPutStatement(CommandStatementUpdate command, CallContext context,
-                              FlightStream flightStream, StreamListener<PutResult> ackStream);
+  Runnable acceptPutStatement(
+      CommandStatementUpdate command,
+      CallContext context,
+      FlightStream flightStream,
+      StreamListener<PutResult> ackStream);
 
   /**
    * Handle a Substrait plan with uploaded data.
    *
-   * @param command      The Substrait plan to evaluate.
-   * @param context      Per-call context.
+   * @param command The Substrait plan to evaluate.
+   * @param context Per-call context.
    * @param flightStream The data stream being uploaded.
-   * @param ackStream    The result data stream.
+   * @param ackStream The result data stream.
    * @return A runnable to process the stream.
    */
-  default Runnable acceptPutSubstraitPlan(CommandStatementSubstraitPlan command, CallContext context,
-                                          FlightStream flightStream, StreamListener<PutResult> ackStream) {
+  default Runnable acceptPutSubstraitPlan(
+      CommandStatementSubstraitPlan command,
+      CallContext context,
+      FlightStream flightStream,
+      StreamListener<PutResult> ackStream) {
     return () -> {
       ackStream.onError(CallStatus.UNIMPLEMENTED.toRuntimeException());
     };
@@ -734,239 +798,247 @@ default Runnable acceptPutSubstraitPlan(CommandStatementSubstraitPlan command, C
 
   /**
    * Accepts uploaded data for a particular prepared statement data stream.
+   *
    * <p>`PutResult`s must be in the form of a {@link DoPutUpdateResult}.
    *
-   * @param command      The prepared statement to generate the data stream.
-   * @param context      Per-call context.
+   * @param command The prepared statement to generate the data stream.
+   * @param context Per-call context.
    * @param flightStream The data stream being uploaded.
-   * @param ackStream    The result data stream.
+   * @param ackStream The result data stream.
    * @return A runnable to process the stream.
    */
-  Runnable acceptPutPreparedStatementUpdate(CommandPreparedStatementUpdate command,
-                                            CallContext context, FlightStream flightStream,
-                                            StreamListener<PutResult> ackStream);
+  Runnable acceptPutPreparedStatementUpdate(
+      CommandPreparedStatementUpdate command,
+      CallContext context,
+      FlightStream flightStream,
+      StreamListener<PutResult> ackStream);
 
   /**
    * Accepts uploaded parameter values for a particular prepared statement query.
    *
-   * @param command      The prepared statement the parameter values will bind to.
-   * @param context      Per-call context.
+   * @param command The prepared statement the parameter values will bind to.
+   * @param context Per-call context.
    * @param flightStream The data stream being uploaded.
-   * @param ackStream    The result data stream.
+   * @param ackStream The result data stream.
    * @return A runnable to process the stream.
    */
-  Runnable acceptPutPreparedStatementQuery(CommandPreparedStatementQuery command,
-                                           CallContext context, FlightStream flightStream,
-                                           StreamListener<PutResult> ackStream);
+  Runnable acceptPutPreparedStatementQuery(
+      CommandPreparedStatementQuery command,
+      CallContext context,
+      FlightStream flightStream,
+      StreamListener<PutResult> ackStream);
 
   /**
-   * Returns the SQL Info of the server by returning a
-   * {@link CommandGetSqlInfo} in a {@link Result}.
+   * Returns the SQL Info of the server by returning a {@link CommandGetSqlInfo} in a {@link
+   * Result}.
    *
-   * @param request    request filter parameters.
-   * @param context    Per-call context.
+   * @param request request filter parameters.
+   * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
    * @return Metadata about the stream.
    */
-  FlightInfo getFlightInfoSqlInfo(CommandGetSqlInfo request, CallContext context,
-                                  FlightDescriptor descriptor);
+  FlightInfo getFlightInfoSqlInfo(
+      CommandGetSqlInfo request, CallContext context, FlightDescriptor descriptor);
 
   /**
    * Returns data for SQL info based data stream.
    *
-   * @param command  The command to generate the data stream.
-   * @param context  Per-call context.
+   * @param command The command to generate the data stream.
+   * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
-  void getStreamSqlInfo(CommandGetSqlInfo command, CallContext context, ServerStreamListener listener);
-
+  void getStreamSqlInfo(
+      CommandGetSqlInfo command, CallContext context, ServerStreamListener listener);
 
   /**
    * Returns a description of all the data types supported by source.
    *
-   * @param request     request filter parameters.
-   * @param descriptor  The descriptor identifying the data stream.
-   * @return  Metadata about the stream.
+   * @param request request filter parameters.
+   * @param descriptor The descriptor identifying the data stream.
+   * @return Metadata about the stream.
    */
-  FlightInfo getFlightInfoTypeInfo(CommandGetXdbcTypeInfo request, CallContext context,
-                                   FlightDescriptor descriptor);
+  FlightInfo getFlightInfoTypeInfo(
+      CommandGetXdbcTypeInfo request, CallContext context, FlightDescriptor descriptor);
 
   /**
    * Returns data for type info based data stream.
    *
-   * @param context  Per-call context.
+   * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
-  void getStreamTypeInfo(CommandGetXdbcTypeInfo request, CallContext context, ServerStreamListener listener);
+  void getStreamTypeInfo(
+      CommandGetXdbcTypeInfo request, CallContext context, ServerStreamListener listener);
 
   /**
-   * Returns the available catalogs by returning a stream of
-   * {@link CommandGetCatalogs} objects in {@link Result} objects.
+   * Returns the available catalogs by returning a stream of {@link CommandGetCatalogs} objects in
+   * {@link Result} objects.
    *
-   * @param request    request filter parameters.
-   * @param context    Per-call context.
+   * @param request request filter parameters.
+   * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
    * @return Metadata about the stream.
    */
-  FlightInfo getFlightInfoCatalogs(CommandGetCatalogs request, CallContext context,
-                                   FlightDescriptor descriptor);
+  FlightInfo getFlightInfoCatalogs(
+      CommandGetCatalogs request, CallContext context, FlightDescriptor descriptor);
 
   /**
    * Returns data for catalogs based data stream.
    *
-   * @param context  Per-call context.
+   * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
   void getStreamCatalogs(CallContext context, ServerStreamListener listener);
 
   /**
-   * Returns the available schemas by returning a stream of
-   * {@link CommandGetDbSchemas} objects in {@link Result} objects.
+   * Returns the available schemas by returning a stream of {@link CommandGetDbSchemas} objects in
+   * {@link Result} objects.
    *
-   * @param request    request filter parameters.
-   * @param context    Per-call context.
+   * @param request request filter parameters.
+   * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
    * @return Metadata about the stream.
    */
-  FlightInfo getFlightInfoSchemas(CommandGetDbSchemas request, CallContext context,
-                                  FlightDescriptor descriptor);
+  FlightInfo getFlightInfoSchemas(
+      CommandGetDbSchemas request, CallContext context, FlightDescriptor descriptor);
 
   /**
    * Returns data for schemas based data stream.
    *
-   * @param command  The command to generate the data stream.
-   * @param context  Per-call context.
+   * @param command The command to generate the data stream.
+   * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
-  void getStreamSchemas(CommandGetDbSchemas command, CallContext context, ServerStreamListener listener);
+  void getStreamSchemas(
+      CommandGetDbSchemas command, CallContext context, ServerStreamListener listener);
 
   /**
-   * Returns the available tables by returning a stream of
-   * {@link CommandGetTables} objects in {@link Result} objects.
+   * Returns the available tables by returning a stream of {@link CommandGetTables} objects in
+   * {@link Result} objects.
    *
-   * @param request    request filter parameters.
-   * @param context    Per-call context.
+   * @param request request filter parameters.
+   * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
    * @return Metadata about the stream.
    */
-  FlightInfo getFlightInfoTables(CommandGetTables request, CallContext context,
-                                 FlightDescriptor descriptor);
+  FlightInfo getFlightInfoTables(
+      CommandGetTables request, CallContext context, FlightDescriptor descriptor);
 
   /**
    * Returns data for tables based data stream.
    *
-   * @param command  The command to generate the data stream.
-   * @param context  Per-call context.
+   * @param command The command to generate the data stream.
+   * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
-  void getStreamTables(CommandGetTables command, CallContext context, ServerStreamListener listener);
+  void getStreamTables(
+      CommandGetTables command, CallContext context, ServerStreamListener listener);
 
   /**
-   * Returns the available table types by returning a stream of
-   * {@link CommandGetTableTypes} objects in {@link Result} objects.
+   * Returns the available table types by returning a stream of {@link CommandGetTableTypes} objects
+   * in {@link Result} objects.
    *
-   * @param context    Per-call context.
+   * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
    * @return Metadata about the stream.
    */
-  FlightInfo getFlightInfoTableTypes(CommandGetTableTypes request, CallContext context,
-                                     FlightDescriptor descriptor);
+  FlightInfo getFlightInfoTableTypes(
+      CommandGetTableTypes request, CallContext context, FlightDescriptor descriptor);
 
   /**
    * Returns data for table types based data stream.
    *
-   * @param context  Per-call context.
+   * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
   void getStreamTableTypes(CallContext context, ServerStreamListener listener);
 
   /**
-   * Returns the available primary keys by returning a stream of
-   * {@link CommandGetPrimaryKeys} objects in {@link Result} objects.
+   * Returns the available primary keys by returning a stream of {@link CommandGetPrimaryKeys}
+   * objects in {@link Result} objects.
    *
-   * @param request    request filter parameters.
-   * @param context    Per-call context.
+   * @param request request filter parameters.
+   * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
    * @return Metadata about the stream.
    */
-  FlightInfo getFlightInfoPrimaryKeys(CommandGetPrimaryKeys request, CallContext context,
-                                      FlightDescriptor descriptor);
+  FlightInfo getFlightInfoPrimaryKeys(
+      CommandGetPrimaryKeys request, CallContext context, FlightDescriptor descriptor);
 
   /**
    * Returns data for primary keys based data stream.
    *
-   * @param command  The command to generate the data stream.
-   * @param context  Per-call context.
+   * @param command The command to generate the data stream.
+   * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
-  void getStreamPrimaryKeys(CommandGetPrimaryKeys command, CallContext context,
-                            ServerStreamListener listener);
+  void getStreamPrimaryKeys(
+      CommandGetPrimaryKeys command, CallContext context, ServerStreamListener listener);
 
   /**
-   * Retrieves a description of the foreign key columns that reference the given table's primary key columns
-   * {@link CommandGetExportedKeys} objects in {@link Result} objects.
+   * Retrieves a description of the foreign key columns that reference the given table's primary key
+   * columns {@link CommandGetExportedKeys} objects in {@link Result} objects.
    *
-   * @param request    request filter parameters.
-   * @param context    Per-call context.
+   * @param request request filter parameters.
+   * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
    * @return Metadata about the stream.
    */
-  FlightInfo getFlightInfoExportedKeys(CommandGetExportedKeys request, CallContext context,
-                                       FlightDescriptor descriptor);
+  FlightInfo getFlightInfoExportedKeys(
+      CommandGetExportedKeys request, CallContext context, FlightDescriptor descriptor);
 
   /**
-   * Retrieves a description of the primary key columns that are referenced by given table's foreign key columns
-   * {@link CommandGetImportedKeys} objects in {@link Result} objects.
+   * Retrieves a description of the primary key columns that are referenced by given table's foreign
+   * key columns {@link CommandGetImportedKeys} objects in {@link Result} objects.
    *
-   * @param request    request filter parameters.
-   * @param context    Per-call context.
+   * @param request request filter parameters.
+   * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
    * @return Metadata about the stream.
    */
-  FlightInfo getFlightInfoImportedKeys(CommandGetImportedKeys request, CallContext context,
-                                       FlightDescriptor descriptor);
+  FlightInfo getFlightInfoImportedKeys(
+      CommandGetImportedKeys request, CallContext context, FlightDescriptor descriptor);
 
   /**
-   * Retrieve a description of the foreign key columns that reference the given table's primary key columns
-   * {@link CommandGetCrossReference} objects in {@link Result} objects.
+   * Retrieve a description of the foreign key columns that reference the given table's primary key
+   * columns {@link CommandGetCrossReference} objects in {@link Result} objects.
    *
-   * @param request    request filter parameters.
-   * @param context    Per-call context.
+   * @param request request filter parameters.
+   * @param context Per-call context.
    * @param descriptor The descriptor identifying the data stream.
    * @return Metadata about the stream.
    */
-  FlightInfo getFlightInfoCrossReference(CommandGetCrossReference request, CallContext context,
-                                         FlightDescriptor descriptor);
+  FlightInfo getFlightInfoCrossReference(
+      CommandGetCrossReference request, CallContext context, FlightDescriptor descriptor);
 
   /**
    * Returns data for foreign keys based data stream.
    *
-   * @param command  The command to generate the data stream.
-   * @param context  Per-call context.
+   * @param command The command to generate the data stream.
+   * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
-  void getStreamExportedKeys(CommandGetExportedKeys command, CallContext context,
-                             ServerStreamListener listener);
+  void getStreamExportedKeys(
+      CommandGetExportedKeys command, CallContext context, ServerStreamListener listener);
 
   /**
    * Returns data for foreign keys based data stream.
    *
-   * @param command  The command to generate the data stream.
-   * @param context  Per-call context.
+   * @param command The command to generate the data stream.
+   * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
-  void getStreamImportedKeys(CommandGetImportedKeys command, CallContext context,
-                             ServerStreamListener listener);
+  void getStreamImportedKeys(
+      CommandGetImportedKeys command, CallContext context, ServerStreamListener listener);
 
   /**
    * Returns data for cross reference based data stream.
    *
-   * @param command  The command to generate the data stream.
-   * @param context  Per-call context.
+   * @param command The command to generate the data stream.
+   * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
-  void getStreamCrossReference(CommandGetCrossReference command, CallContext context,
-                             ServerStreamListener listener);
+  void getStreamCrossReference(
+      CommandGetCrossReference command, CallContext context, ServerStreamListener listener);
 
   /**
    * Renew the duration of the given endpoint.
@@ -975,107 +1047,129 @@ void getStreamCrossReference(CommandGetCrossReference command, CallContext conte
    * @param context Per-call context.
    * @param listener An interface for sending data back to the client.
    */
-  default void renewFlightEndpoint(RenewFlightEndpointRequest request, CallContext context,
-                                   StreamListener<FlightEndpoint> listener) {
+  default void renewFlightEndpoint(
+      RenewFlightEndpointRequest request,
+      CallContext context,
+      StreamListener<FlightEndpoint> listener) {
     listener.onError(CallStatus.UNIMPLEMENTED.toRuntimeException());
   }
 
-  /**
-   * Default schema templates for the {@link FlightSqlProducer}.
-   */
+  /** Default schema templates for the {@link FlightSqlProducer}. */
   final class Schemas {
-    public static final Schema GET_TABLES_SCHEMA = new Schema(asList(
-        Field.nullable("catalog_name", VARCHAR.getType()),
-        Field.nullable("db_schema_name", VARCHAR.getType()),
-        Field.notNullable("table_name", VARCHAR.getType()),
-        Field.notNullable("table_type", VARCHAR.getType()),
-        Field.notNullable("table_schema", MinorType.VARBINARY.getType())));
-    public static final Schema GET_TABLES_SCHEMA_NO_SCHEMA = new Schema(asList(
-        Field.nullable("catalog_name", VARCHAR.getType()),
-        Field.nullable("db_schema_name", VARCHAR.getType()),
-        Field.notNullable("table_name", VARCHAR.getType()),
-        Field.notNullable("table_type", VARCHAR.getType())));
-    public static final Schema GET_CATALOGS_SCHEMA = new Schema(
-        singletonList(Field.notNullable("catalog_name", VARCHAR.getType())));
+    public static final Schema GET_TABLES_SCHEMA =
+        new Schema(
+            asList(
+                Field.nullable("catalog_name", VARCHAR.getType()),
+                Field.nullable("db_schema_name", VARCHAR.getType()),
+                Field.notNullable("table_name", VARCHAR.getType()),
+                Field.notNullable("table_type", VARCHAR.getType()),
+                Field.notNullable("table_schema", MinorType.VARBINARY.getType())));
+    public static final Schema GET_TABLES_SCHEMA_NO_SCHEMA =
+        new Schema(
+            asList(
+                Field.nullable("catalog_name", VARCHAR.getType()),
+                Field.nullable("db_schema_name", VARCHAR.getType()),
+                Field.notNullable("table_name", VARCHAR.getType()),
+                Field.notNullable("table_type", VARCHAR.getType())));
+    public static final Schema GET_CATALOGS_SCHEMA =
+        new Schema(singletonList(Field.notNullable("catalog_name", VARCHAR.getType())));
     public static final Schema GET_TABLE_TYPES_SCHEMA =
         new Schema(singletonList(Field.notNullable("table_type", VARCHAR.getType())));
     public static final Schema GET_SCHEMAS_SCHEMA =
-        new Schema(asList(
-            Field.nullable("catalog_name", VARCHAR.getType()),
-            Field.notNullable("db_schema_name", VARCHAR.getType())));
+        new Schema(
+            asList(
+                Field.nullable("catalog_name", VARCHAR.getType()),
+                Field.notNullable("db_schema_name", VARCHAR.getType())));
     private static final Schema GET_IMPORTED_EXPORTED_AND_CROSS_REFERENCE_KEYS_SCHEMA =
-        new Schema(asList(
-            Field.nullable("pk_catalog_name", VARCHAR.getType()),
-            Field.nullable("pk_db_schema_name", VARCHAR.getType()),
-            Field.notNullable("pk_table_name", VARCHAR.getType()),
-            Field.notNullable("pk_column_name", VARCHAR.getType()),
-            Field.nullable("fk_catalog_name", VARCHAR.getType()),
-            Field.nullable("fk_db_schema_name", VARCHAR.getType()),
-            Field.notNullable("fk_table_name", VARCHAR.getType()),
-            Field.notNullable("fk_column_name", VARCHAR.getType()),
-            Field.notNullable("key_sequence", INT.getType()),
-            Field.nullable("fk_key_name", VARCHAR.getType()),
-            Field.nullable("pk_key_name", VARCHAR.getType()),
-            Field.notNullable("update_rule", MinorType.UINT1.getType()),
-            Field.notNullable("delete_rule", MinorType.UINT1.getType())));
-    public static final Schema GET_IMPORTED_KEYS_SCHEMA = GET_IMPORTED_EXPORTED_AND_CROSS_REFERENCE_KEYS_SCHEMA;
-    public static final Schema GET_EXPORTED_KEYS_SCHEMA = GET_IMPORTED_EXPORTED_AND_CROSS_REFERENCE_KEYS_SCHEMA;
-    public static final Schema GET_CROSS_REFERENCE_SCHEMA = GET_IMPORTED_EXPORTED_AND_CROSS_REFERENCE_KEYS_SCHEMA;
-    private static final List<Field> GET_SQL_INFO_DENSE_UNION_SCHEMA_FIELDS = asList(
-        Field.notNullable("string_value", VARCHAR.getType()),
-        Field.notNullable("bool_value", BIT.getType()),
-        Field.notNullable("bigint_value", BIGINT.getType()),
-        Field.notNullable("int32_bitmask", INT.getType()),
-        new Field(
-            "string_list", FieldType.notNullable(LIST.getType()),
-            singletonList(Field.nullable("item", VARCHAR.getType()))),
-        new Field(
-            "int32_to_int32_list_map", FieldType.notNullable(new ArrowType.Map(false)),
-            singletonList(new Field(DATA_VECTOR_NAME, new FieldType(false, STRUCT.getType(), null),
-                ImmutableList.of(
-                    Field.notNullable(KEY_NAME, INT.getType()),
+        new Schema(
+            asList(
+                Field.nullable("pk_catalog_name", VARCHAR.getType()),
+                Field.nullable("pk_db_schema_name", VARCHAR.getType()),
+                Field.notNullable("pk_table_name", VARCHAR.getType()),
+                Field.notNullable("pk_column_name", VARCHAR.getType()),
+                Field.nullable("fk_catalog_name", VARCHAR.getType()),
+                Field.nullable("fk_db_schema_name", VARCHAR.getType()),
+                Field.notNullable("fk_table_name", VARCHAR.getType()),
+                Field.notNullable("fk_column_name", VARCHAR.getType()),
+                Field.notNullable("key_sequence", INT.getType()),
+                Field.nullable("fk_key_name", VARCHAR.getType()),
+                Field.nullable("pk_key_name", VARCHAR.getType()),
+                Field.notNullable("update_rule", MinorType.UINT1.getType()),
+                Field.notNullable("delete_rule", MinorType.UINT1.getType())));
+    public static final Schema GET_IMPORTED_KEYS_SCHEMA =
+        GET_IMPORTED_EXPORTED_AND_CROSS_REFERENCE_KEYS_SCHEMA;
+    public static final Schema GET_EXPORTED_KEYS_SCHEMA =
+        GET_IMPORTED_EXPORTED_AND_CROSS_REFERENCE_KEYS_SCHEMA;
+    public static final Schema GET_CROSS_REFERENCE_SCHEMA =
+        GET_IMPORTED_EXPORTED_AND_CROSS_REFERENCE_KEYS_SCHEMA;
+    private static final List<Field> GET_SQL_INFO_DENSE_UNION_SCHEMA_FIELDS =
+        asList(
+            Field.notNullable("string_value", VARCHAR.getType()),
+            Field.notNullable("bool_value", BIT.getType()),
+            Field.notNullable("bigint_value", BIGINT.getType()),
+            Field.notNullable("int32_bitmask", INT.getType()),
+            new Field(
+                "string_list",
+                FieldType.notNullable(LIST.getType()),
+                singletonList(Field.nullable("item", VARCHAR.getType()))),
+            new Field(
+                "int32_to_int32_list_map",
+                FieldType.notNullable(new ArrowType.Map(false)),
+                singletonList(
                     new Field(
-                        VALUE_NAME, FieldType.nullable(LIST.getType()),
-                        singletonList(Field.nullable("item", INT.getType()))))))));
+                        DATA_VECTOR_NAME,
+                        new FieldType(false, STRUCT.getType(), null),
+                        ImmutableList.of(
+                            Field.notNullable(KEY_NAME, INT.getType()),
+                            new Field(
+                                VALUE_NAME,
+                                FieldType.nullable(LIST.getType()),
+                                singletonList(Field.nullable("item", INT.getType()))))))));
     public static final Schema GET_SQL_INFO_SCHEMA =
-        new Schema(asList(
-            Field.notNullable("info_name", UINT4.getType()),
-            new Field("value",
-                FieldType.notNullable(
-                    new Union(UnionMode.Dense, range(0, GET_SQL_INFO_DENSE_UNION_SCHEMA_FIELDS.size()).toArray())),
-                GET_SQL_INFO_DENSE_UNION_SCHEMA_FIELDS)));
+        new Schema(
+            asList(
+                Field.notNullable("info_name", UINT4.getType()),
+                new Field(
+                    "value",
+                    FieldType.notNullable(
+                        new Union(
+                            UnionMode.Dense,
+                            range(0, GET_SQL_INFO_DENSE_UNION_SCHEMA_FIELDS.size()).toArray())),
+                    GET_SQL_INFO_DENSE_UNION_SCHEMA_FIELDS)));
     public static final Schema GET_TYPE_INFO_SCHEMA =
-        new Schema(asList(
-            Field.notNullable("type_name", VARCHAR.getType()),
-            Field.notNullable("data_type", INT.getType()),
-            Field.nullable("column_size", INT.getType()),
-            Field.nullable("literal_prefix", VARCHAR.getType()),
-            Field.nullable("literal_suffix", VARCHAR.getType()),
-            new Field(
-                "create_params", FieldType.nullable(LIST.getType()),
-                singletonList(Field.notNullable("item", VARCHAR.getType()))),
-            Field.notNullable("nullable", INT.getType()),
-            Field.notNullable("case_sensitive", BIT.getType()),
-            Field.notNullable("searchable", INT.getType()),
-            Field.nullable("unsigned_attribute", BIT.getType()),
-            Field.notNullable("fixed_prec_scale", BIT.getType()),
-            Field.nullable("auto_increment", BIT.getType()),
-            Field.nullable("local_type_name", VARCHAR.getType()),
-            Field.nullable("minimum_scale", INT.getType()),
-            Field.nullable("maximum_scale", INT.getType()),
-            Field.notNullable("sql_data_type", INT.getType()),
-            Field.nullable("datetime_subcode", INT.getType()),
-            Field.nullable("num_prec_radix", INT.getType()),
-            Field.nullable("interval_precision", INT.getType())
-        ));
+        new Schema(
+            asList(
+                Field.notNullable("type_name", VARCHAR.getType()),
+                Field.notNullable("data_type", INT.getType()),
+                Field.nullable("column_size", INT.getType()),
+                Field.nullable("literal_prefix", VARCHAR.getType()),
+                Field.nullable("literal_suffix", VARCHAR.getType()),
+                new Field(
+                    "create_params",
+                    FieldType.nullable(LIST.getType()),
+                    singletonList(Field.notNullable("item", VARCHAR.getType()))),
+                Field.notNullable("nullable", INT.getType()),
+                Field.notNullable("case_sensitive", BIT.getType()),
+                Field.notNullable("searchable", INT.getType()),
+                Field.nullable("unsigned_attribute", BIT.getType()),
+                Field.notNullable("fixed_prec_scale", BIT.getType()),
+                Field.nullable("auto_increment", BIT.getType()),
+                Field.nullable("local_type_name", VARCHAR.getType()),
+                Field.nullable("minimum_scale", INT.getType()),
+                Field.nullable("maximum_scale", INT.getType()),
+                Field.notNullable("sql_data_type", INT.getType()),
+                Field.nullable("datetime_subcode", INT.getType()),
+                Field.nullable("num_prec_radix", INT.getType()),
+                Field.nullable("interval_precision", INT.getType())));
     public static final Schema GET_PRIMARY_KEYS_SCHEMA =
-        new Schema(asList(
-            Field.nullable("catalog_name", VARCHAR.getType()),
-            Field.nullable("db_schema_name", VARCHAR.getType()),
-            Field.notNullable("table_name", VARCHAR.getType()),
-            Field.notNullable("column_name", VARCHAR.getType()),
-            Field.notNullable("key_sequence", INT.getType()),
-            Field.nullable("key_name", VARCHAR.getType())));
+        new Schema(
+            asList(
+                Field.nullable("catalog_name", VARCHAR.getType()),
+                Field.nullable("db_schema_name", VARCHAR.getType()),
+                Field.notNullable("table_name", VARCHAR.getType()),
+                Field.notNullable("column_name", VARCHAR.getType()),
+                Field.notNullable("key_sequence", INT.getType()),
+                Field.nullable("key_name", VARCHAR.getType())));
 
     private Schemas() {
       // Prevent instantiation.
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlUtils.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlUtils.java
index 532921a8ac6e7..9bb95047691ae 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlUtils.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/FlightSqlUtils.java
@@ -14,72 +14,75 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql;
 
-import java.util.List;
-
-import org.apache.arrow.flight.ActionType;
-import org.apache.arrow.flight.CallStatus;
-
 import com.google.common.collect.ImmutableList;
 import com.google.protobuf.Any;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Message;
+import java.util.List;
+import org.apache.arrow.flight.ActionType;
+import org.apache.arrow.flight.CallStatus;
 
-/**
- * Utilities to work with Flight SQL semantics.
- */
+/** Utilities to work with Flight SQL semantics. */
 public final class FlightSqlUtils {
 
   public static final ActionType FLIGHT_SQL_BEGIN_SAVEPOINT =
-      new ActionType("BeginSavepoint",
-          "Create a new savepoint.\n" +
-              "Request Message: ActionBeginSavepointRequest\n" +
-              "Response Message: ActionBeginSavepointResult");
+      new ActionType(
+          "BeginSavepoint",
+          "Create a new savepoint.\n"
+              + "Request Message: ActionBeginSavepointRequest\n"
+              + "Response Message: ActionBeginSavepointResult");
 
   public static final ActionType FLIGHT_SQL_BEGIN_TRANSACTION =
-      new ActionType("BeginTransaction",
-          "Start a new transaction.\n" +
-              "Request Message: ActionBeginTransactionRequest\n" +
-              "Response Message: ActionBeginTransactionResult");
-  public static final ActionType FLIGHT_SQL_CREATE_PREPARED_STATEMENT = new ActionType("CreatePreparedStatement",
-      "Creates a reusable prepared statement resource on the server. \n" +
-          "Request Message: ActionCreatePreparedStatementRequest\n" +
-          "Response Message: ActionCreatePreparedStatementResult");
+      new ActionType(
+          "BeginTransaction",
+          "Start a new transaction.\n"
+              + "Request Message: ActionBeginTransactionRequest\n"
+              + "Response Message: ActionBeginTransactionResult");
+  public static final ActionType FLIGHT_SQL_CREATE_PREPARED_STATEMENT =
+      new ActionType(
+          "CreatePreparedStatement",
+          "Creates a reusable prepared statement resource on the server. \n"
+              + "Request Message: ActionCreatePreparedStatementRequest\n"
+              + "Response Message: ActionCreatePreparedStatementResult");
 
-  public static final ActionType FLIGHT_SQL_CLOSE_PREPARED_STATEMENT = new ActionType("ClosePreparedStatement",
-      "Closes a reusable prepared statement resource on the server. \n" +
-          "Request Message: ActionClosePreparedStatementRequest\n" +
-          "Response Message: N/A");
+  public static final ActionType FLIGHT_SQL_CLOSE_PREPARED_STATEMENT =
+      new ActionType(
+          "ClosePreparedStatement",
+          "Closes a reusable prepared statement resource on the server. \n"
+              + "Request Message: ActionClosePreparedStatementRequest\n"
+              + "Response Message: N/A");
 
   public static final ActionType FLIGHT_SQL_CREATE_PREPARED_SUBSTRAIT_PLAN =
-      new ActionType("CreatePreparedSubstraitPlan",
-          "Creates a reusable prepared statement resource on the server.\n" +
-              "Request Message: ActionCreatePreparedSubstraitPlanRequest\n" +
-              "Response Message: ActionCreatePreparedStatementResult");
+      new ActionType(
+          "CreatePreparedSubstraitPlan",
+          "Creates a reusable prepared statement resource on the server.\n"
+              + "Request Message: ActionCreatePreparedSubstraitPlanRequest\n"
+              + "Response Message: ActionCreatePreparedStatementResult");
 
   public static final ActionType FLIGHT_SQL_CANCEL_QUERY =
-      new ActionType("CancelQuery",
-          "Explicitly cancel a running query.\n" +
-              "Request Message: ActionCancelQueryRequest\n" +
-              "Response Message: ActionCancelQueryResult");
+      new ActionType(
+          "CancelQuery",
+          "Explicitly cancel a running query.\n"
+              + "Request Message: ActionCancelQueryRequest\n"
+              + "Response Message: ActionCancelQueryResult");
 
   public static final ActionType FLIGHT_SQL_END_SAVEPOINT =
-      new ActionType("EndSavepoint",
-          "End a savepoint.\n" +
-              "Request Message: ActionEndSavepointRequest\n" +
-              "Response Message: N/A");
+      new ActionType(
+          "EndSavepoint",
+          "End a savepoint.\n"
+              + "Request Message: ActionEndSavepointRequest\n"
+              + "Response Message: N/A");
   public static final ActionType FLIGHT_SQL_END_TRANSACTION =
-      new ActionType("EndTransaction",
-          "End a transaction.\n" +
-              "Request Message: ActionEndTransactionRequest\n" +
-              "Response Message: N/A");
+      new ActionType(
+          "EndTransaction",
+          "End a transaction.\n"
+              + "Request Message: ActionEndTransactionRequest\n"
+              + "Response Message: N/A");
 
-  public static final List<ActionType> FLIGHT_SQL_ACTIONS = ImmutableList.of(
-      FLIGHT_SQL_CREATE_PREPARED_STATEMENT,
-      FLIGHT_SQL_CLOSE_PREPARED_STATEMENT
-  );
+  public static final List<ActionType> FLIGHT_SQL_ACTIONS =
+      ImmutableList.of(FLIGHT_SQL_CREATE_PREPARED_STATEMENT, FLIGHT_SQL_CLOSE_PREPARED_STATEMENT);
 
   /**
    * Helper to parse {@link com.google.protobuf.Any} objects to the specific protobuf object.
@@ -102,8 +105,8 @@ public static Any parseOrThrow(byte[] source) {
    * Helper to unpack {@link com.google.protobuf.Any} objects to the specific protobuf object.
    *
    * @param source the parsed Source value.
-   * @param as     the class to unpack as.
-   * @param <T>    the class to unpack as.
+   * @param as the class to unpack as.
+   * @param <T> the class to unpack as.
    * @return the materialized protobuf object.
    */
   public static <T extends Message> T unpackOrThrow(Any source, Class<T> as) {
@@ -118,11 +121,12 @@ public static <T extends Message> T unpackOrThrow(Any source, Class<T> as) {
   }
 
   /**
-   * Helper to parse and unpack {@link com.google.protobuf.Any} objects to the specific protobuf object.
+   * Helper to parse and unpack {@link com.google.protobuf.Any} objects to the specific protobuf
+   * object.
    *
    * @param source the raw bytes source value.
-   * @param as     the class to unpack as.
-   * @param <T>    the class to unpack as.
+   * @param as the class to unpack as.
+   * @param <T> the class to unpack as.
    * @return the materialized protobuf object.
    */
   public static <T extends Message> T unpackAndParseOrThrow(byte[] source, Class<T> as) {
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/GetSessionOptionsResultListener.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/GetSessionOptionsResultListener.java
index 4fdffd076243c..8590eda35b48c 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/GetSessionOptionsResultListener.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/GetSessionOptionsResultListener.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql;
 
 import org.apache.arrow.flight.FlightProducer;
@@ -22,7 +21,8 @@
 import org.apache.arrow.flight.Result;
 
 /** Typed StreamListener for getSessionOptions. */
-public class GetSessionOptionsResultListener implements FlightProducer.StreamListener<GetSessionOptionsResult> {
+public class GetSessionOptionsResultListener
+    implements FlightProducer.StreamListener<GetSessionOptionsResult> {
   private final FlightProducer.StreamListener<Result> listener;
 
   GetSessionOptionsResultListener(FlightProducer.StreamListener<Result> listener) {
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/NoOpFlightSqlProducer.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/NoOpFlightSqlProducer.java
index a02cee64bd855..5091017c13cd8 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/NoOpFlightSqlProducer.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/NoOpFlightSqlProducer.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql;
 
 import org.apache.arrow.flight.CallStatus;
@@ -27,195 +26,233 @@
 import org.apache.arrow.flight.SchemaResult;
 import org.apache.arrow.flight.sql.impl.FlightSql;
 
-/**
- * A {@link FlightSqlProducer} that throws on all FlightSql-specific operations.
- */
+/** A {@link FlightSqlProducer} that throws on all FlightSql-specific operations. */
 public class NoOpFlightSqlProducer implements FlightSqlProducer {
   @Override
-  public void createPreparedStatement(FlightSql.ActionCreatePreparedStatementRequest request,
-                                      CallContext context, StreamListener<Result> listener) {
-    listener.onError(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+  public void createPreparedStatement(
+      FlightSql.ActionCreatePreparedStatementRequest request,
+      CallContext context,
+      StreamListener<Result> listener) {
+    listener.onError(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
 
   @Override
-  public void closePreparedStatement(FlightSql.ActionClosePreparedStatementRequest request,
-                                     CallContext context, StreamListener<Result> listener) {
-    listener.onError(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+  public void closePreparedStatement(
+      FlightSql.ActionClosePreparedStatementRequest request,
+      CallContext context,
+      StreamListener<Result> listener) {
+    listener.onError(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
 
   @Override
-  public FlightInfo getFlightInfoStatement(FlightSql.CommandStatementQuery command,
-                                           CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoStatement(
+      FlightSql.CommandStatementQuery command, CallContext context, FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
-  public FlightInfo getFlightInfoPreparedStatement(FlightSql.CommandPreparedStatementQuery command,
-                                                   CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoPreparedStatement(
+      FlightSql.CommandPreparedStatementQuery command,
+      CallContext context,
+      FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
-  public SchemaResult getSchemaStatement(FlightSql.CommandStatementQuery command,
-                                         CallContext context, FlightDescriptor descriptor) {
+  public SchemaResult getSchemaStatement(
+      FlightSql.CommandStatementQuery command, CallContext context, FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
-  public void getStreamStatement(FlightSql.TicketStatementQuery ticket,
-                                 CallContext context, ServerStreamListener listener) {
-    listener.error(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+  public void getStreamStatement(
+      FlightSql.TicketStatementQuery ticket, CallContext context, ServerStreamListener listener) {
+    listener.error(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
 
   @Override
-  public void getStreamPreparedStatement(FlightSql.CommandPreparedStatementQuery command,
-                                         CallContext context, ServerStreamListener listener) {
-    listener.error(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+  public void getStreamPreparedStatement(
+      FlightSql.CommandPreparedStatementQuery command,
+      CallContext context,
+      ServerStreamListener listener) {
+    listener.error(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
 
   @Override
-  public Runnable acceptPutStatement(FlightSql.CommandStatementUpdate command, CallContext context,
-                                     FlightStream flightStream, StreamListener<PutResult> ackStream) {
+  public Runnable acceptPutStatement(
+      FlightSql.CommandStatementUpdate command,
+      CallContext context,
+      FlightStream flightStream,
+      StreamListener<PutResult> ackStream) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
-  public Runnable acceptPutPreparedStatementUpdate(FlightSql.CommandPreparedStatementUpdate command,
-                                                   CallContext context, FlightStream flightStream,
-                                                   StreamListener<PutResult> ackStream) {
+  public Runnable acceptPutPreparedStatementUpdate(
+      FlightSql.CommandPreparedStatementUpdate command,
+      CallContext context,
+      FlightStream flightStream,
+      StreamListener<PutResult> ackStream) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
-  public Runnable acceptPutPreparedStatementQuery(FlightSql.CommandPreparedStatementQuery command, CallContext context,
-                                                  FlightStream flightStream, StreamListener<PutResult> ackStream) {
+  public Runnable acceptPutPreparedStatementQuery(
+      FlightSql.CommandPreparedStatementQuery command,
+      CallContext context,
+      FlightStream flightStream,
+      StreamListener<PutResult> ackStream) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
-  public FlightInfo getFlightInfoSqlInfo(FlightSql.CommandGetSqlInfo request, CallContext context,
-                                         FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoSqlInfo(
+      FlightSql.CommandGetSqlInfo request, CallContext context, FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
-  public void getStreamSqlInfo(FlightSql.CommandGetSqlInfo command, CallContext context,
-                               ServerStreamListener listener) {
-    listener.error(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+  public void getStreamSqlInfo(
+      FlightSql.CommandGetSqlInfo command, CallContext context, ServerStreamListener listener) {
+    listener.error(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
 
   @Override
-  public FlightInfo getFlightInfoTypeInfo(FlightSql.CommandGetXdbcTypeInfo request,
-                                          CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoTypeInfo(
+      FlightSql.CommandGetXdbcTypeInfo request, CallContext context, FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
-  public void getStreamTypeInfo(FlightSql.CommandGetXdbcTypeInfo request,
-                                CallContext context, ServerStreamListener listener) {
-    listener.error(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+  public void getStreamTypeInfo(
+      FlightSql.CommandGetXdbcTypeInfo request,
+      CallContext context,
+      ServerStreamListener listener) {
+    listener.error(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
 
   @Override
-  public FlightInfo getFlightInfoCatalogs(FlightSql.CommandGetCatalogs request,
-                                          CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoCatalogs(
+      FlightSql.CommandGetCatalogs request, CallContext context, FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
   public void getStreamCatalogs(CallContext context, ServerStreamListener listener) {
-    listener.error(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+    listener.error(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
 
   @Override
-  public FlightInfo getFlightInfoSchemas(FlightSql.CommandGetDbSchemas request,
-                                         CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoSchemas(
+      FlightSql.CommandGetDbSchemas request, CallContext context, FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
-  public void getStreamSchemas(FlightSql.CommandGetDbSchemas command,
-                               CallContext context, ServerStreamListener listener) {
-    listener.error(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+  public void getStreamSchemas(
+      FlightSql.CommandGetDbSchemas command, CallContext context, ServerStreamListener listener) {
+    listener.error(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
 
   @Override
-  public FlightInfo getFlightInfoTables(FlightSql.CommandGetTables request,
-                                        CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoTables(
+      FlightSql.CommandGetTables request, CallContext context, FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
-  public void getStreamTables(FlightSql.CommandGetTables command, CallContext context, ServerStreamListener listener) {
-    listener.error(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+  public void getStreamTables(
+      FlightSql.CommandGetTables command, CallContext context, ServerStreamListener listener) {
+    listener.error(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
 
   @Override
-  public FlightInfo getFlightInfoTableTypes(FlightSql.CommandGetTableTypes request, CallContext context,
-                                            FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoTableTypes(
+      FlightSql.CommandGetTableTypes request, CallContext context, FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
   public void getStreamTableTypes(CallContext context, ServerStreamListener listener) {
-    listener.error(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+    listener.error(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
 
   @Override
-  public FlightInfo getFlightInfoPrimaryKeys(FlightSql.CommandGetPrimaryKeys request,
-                                             CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoPrimaryKeys(
+      FlightSql.CommandGetPrimaryKeys request, CallContext context, FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
-  public void getStreamPrimaryKeys(FlightSql.CommandGetPrimaryKeys command,
-                                   CallContext context, ServerStreamListener listener) {
-    listener.error(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+  public void getStreamPrimaryKeys(
+      FlightSql.CommandGetPrimaryKeys command, CallContext context, ServerStreamListener listener) {
+    listener.error(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
 
   @Override
-  public FlightInfo getFlightInfoExportedKeys(FlightSql.CommandGetExportedKeys request,
-                                              CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoExportedKeys(
+      FlightSql.CommandGetExportedKeys request, CallContext context, FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
-  public FlightInfo getFlightInfoImportedKeys(FlightSql.CommandGetImportedKeys request,
-                                              CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoImportedKeys(
+      FlightSql.CommandGetImportedKeys request, CallContext context, FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
-  public FlightInfo getFlightInfoCrossReference(FlightSql.CommandGetCrossReference request,
-                                                CallContext context, FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoCrossReference(
+      FlightSql.CommandGetCrossReference request,
+      CallContext context,
+      FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 
   @Override
-  public void getStreamExportedKeys(FlightSql.CommandGetExportedKeys command,
-                                    CallContext context, ServerStreamListener listener) {
-    listener.error(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+  public void getStreamExportedKeys(
+      FlightSql.CommandGetExportedKeys command,
+      CallContext context,
+      ServerStreamListener listener) {
+    listener.error(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
 
   @Override
-  public void getStreamImportedKeys(FlightSql.CommandGetImportedKeys command, CallContext context,
-                                    ServerStreamListener listener) {
-    listener.error(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+  public void getStreamImportedKeys(
+      FlightSql.CommandGetImportedKeys command,
+      CallContext context,
+      ServerStreamListener listener) {
+    listener.error(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
 
   @Override
-  public void getStreamCrossReference(FlightSql.CommandGetCrossReference command, CallContext context,
-                                      ServerStreamListener listener) {
-    listener.error(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+  public void getStreamCrossReference(
+      FlightSql.CommandGetCrossReference command,
+      CallContext context,
+      ServerStreamListener listener) {
+    listener.error(
+        CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
   }
 
   @Override
-  public void close() throws Exception {
-
-  }
+  public void close() throws Exception {}
 
   @Override
-  public void listFlights(CallContext context, Criteria criteria, StreamListener<FlightInfo> listener) {
+  public void listFlights(
+      CallContext context, Criteria criteria, StreamListener<FlightInfo> listener) {
     throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
   }
 }
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/NoResultListener.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/NoResultListener.java
index 2c80076a8f57f..cda9589db010d 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/NoResultListener.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/NoResultListener.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql;
 
 import org.apache.arrow.flight.FlightProducer;
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/ProtoListener.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/ProtoListener.java
index fd5fd0489628d..e1d9a57335b04 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/ProtoListener.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/ProtoListener.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql;
 
-import org.apache.arrow.flight.FlightProducer;
-import org.apache.arrow.flight.Result;
-
 import com.google.protobuf.Any;
 import com.google.protobuf.Message;
+import org.apache.arrow.flight.FlightProducer;
+import org.apache.arrow.flight.Result;
 
 /**
  * A StreamListener that accepts a particular type.
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/SetSessionOptionsResultListener.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/SetSessionOptionsResultListener.java
index 230be2bf1b316..f7c4539795bf2 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/SetSessionOptionsResultListener.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/SetSessionOptionsResultListener.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql;
 
 import org.apache.arrow.flight.FlightProducer;
@@ -22,7 +21,8 @@
 import org.apache.arrow.flight.SetSessionOptionsResult;
 
 /** Typed StreamListener for setSessionOptions. */
-public class SetSessionOptionsResultListener implements FlightProducer.StreamListener<SetSessionOptionsResult> {
+public class SetSessionOptionsResultListener
+    implements FlightProducer.StreamListener<SetSessionOptionsResult> {
   private final FlightProducer.StreamListener<Result> listener;
 
   SetSessionOptionsResultListener(FlightProducer.StreamListener<Result> listener) {
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/SqlInfoBuilder.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/SqlInfoBuilder.java
index 338a60e2ae6df..2a31bc77365e2 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/SqlInfoBuilder.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/SqlInfoBuilder.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql;
 
 import static java.util.stream.IntStream.range;
@@ -22,6 +21,7 @@
 import static org.apache.arrow.flight.sql.impl.FlightSql.SqlSupportedTransaction;
 import static org.apache.arrow.flight.sql.util.SqlInfoOptionsUtils.createBitmaskFromEnums;
 
+import com.google.protobuf.ProtocolMessageEnum;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -29,7 +29,6 @@
 import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.ObjIntConsumer;
-
 import org.apache.arrow.flight.sql.impl.FlightSql.SqlInfo;
 import org.apache.arrow.flight.sql.impl.FlightSql.SqlNullOrdering;
 import org.apache.arrow.flight.sql.impl.FlightSql.SqlOuterJoinsSupportLevel;
@@ -59,24 +58,24 @@
 import org.apache.arrow.vector.holders.NullableIntHolder;
 import org.apache.arrow.vector.holders.NullableVarCharHolder;
 
-import com.google.protobuf.ProtocolMessageEnum;
-
 /**
- * Auxiliary class meant to facilitate the implementation of {@link FlightSqlProducer#getStreamSqlInfo}.
- * <p>
- * Usage requires the user to add the required SqlInfo values using the {@code with*} methods
- * like {@link SqlInfoBuilder#withFlightSqlServerName(String)}, and request it back
- * through the {@link SqlInfoBuilder#send(List, ServerStreamListener)} method.
+ * Auxiliary class meant to facilitate the implementation of {@link
+ * FlightSqlProducer#getStreamSqlInfo}.
+ *
+ * <p>Usage requires the user to add the required SqlInfo values using the {@code with*} methods
+ * like {@link SqlInfoBuilder#withFlightSqlServerName(String)}, and request it back through the
+ * {@link SqlInfoBuilder#send(List, ServerStreamListener)} method.
  */
 @SuppressWarnings({"unused"})
 public class SqlInfoBuilder {
   private final Map<Integer, ObjIntConsumer<VectorSchemaRoot>> providers = new HashMap<>();
 
   /**
-   * Gets a {@link NullableVarCharHolder} from the provided {@code string} using the provided {@code buf}.
+   * Gets a {@link NullableVarCharHolder} from the provided {@code string} using the provided {@code
+   * buf}.
    *
    * @param string the {@link StandardCharsets#UTF_8}-encoded text input to store onto the holder.
-   * @param buf    the {@link ArrowBuf} from which to create the new holder.
+   * @param buf the {@link ArrowBuf} from which to create the new holder.
    * @return a new {@link NullableVarCharHolder} with the provided input data {@code string}.
    */
   public static NullableVarCharHolder getHolderForUtf8(final String string, final ArrowBuf buf) {
@@ -292,7 +291,8 @@ public SqlInfoBuilder withSqlSupportsTableCorrelationNames(final boolean value)
   /**
    * Sets a value for {@link SqlInfo#SQL_SUPPORTS_DIFFERENT_TABLE_CORRELATION_NAMES} in the builder.
    *
-   * @param value the value for {@link SqlInfo#SQL_SUPPORTS_DIFFERENT_TABLE_CORRELATION_NAMES} to be set.
+   * @param value the value for {@link SqlInfo#SQL_SUPPORTS_DIFFERENT_TABLE_CORRELATION_NAMES} to be
+   *     set.
    * @return the SqlInfoBuilder itself.
    */
   public SqlInfoBuilder withSqlSupportsDifferentTableCorrelationNames(final boolean value) {
@@ -342,7 +342,8 @@ public SqlInfoBuilder withSqlSupportsNonNullableColumns(final boolean value) {
   /**
    * Sets a value for {@link SqlInfo#SQL_SUPPORTS_INTEGRITY_ENHANCEMENT_FACILITY} in the builder.
    *
-   * @param value the value for {@link SqlInfo#SQL_SUPPORTS_INTEGRITY_ENHANCEMENT_FACILITY} to be set.
+   * @param value the value for {@link SqlInfo#SQL_SUPPORTS_INTEGRITY_ENHANCEMENT_FACILITY} to be
+   *     set.
    * @return the SqlInfoBuilder itself.
    */
   public SqlInfoBuilder withSqlSupportsIntegrityEnhancementFacility(final boolean value) {
@@ -412,23 +413,23 @@ public SqlInfoBuilder withSqlTransactionsSupported(final boolean value) {
   /**
    * Sets a value for {@link SqlInfo#SQL_DATA_DEFINITION_CAUSES_TRANSACTION_COMMIT} in the builder.
    *
-   * @param value the value for {@link SqlInfo#SQL_DATA_DEFINITION_CAUSES_TRANSACTION_COMMIT} to be set.
+   * @param value the value for {@link SqlInfo#SQL_DATA_DEFINITION_CAUSES_TRANSACTION_COMMIT} to be
+   *     set.
    * @return the SqlInfoBuilder itself.
    */
   public SqlInfoBuilder withSqlDataDefinitionCausesTransactionCommit(final boolean value) {
-    return withBooleanProvider(SqlInfo.SQL_DATA_DEFINITION_CAUSES_TRANSACTION_COMMIT_VALUE,
-        value);
+    return withBooleanProvider(SqlInfo.SQL_DATA_DEFINITION_CAUSES_TRANSACTION_COMMIT_VALUE, value);
   }
 
   /**
    * Sets a value for {@link SqlInfo#SQL_DATA_DEFINITIONS_IN_TRANSACTIONS_IGNORED} in the builder.
    *
-   * @param value the value for {@link SqlInfo#SQL_DATA_DEFINITIONS_IN_TRANSACTIONS_IGNORED} to be set.
+   * @param value the value for {@link SqlInfo#SQL_DATA_DEFINITIONS_IN_TRANSACTIONS_IGNORED} to be
+   *     set.
    * @return the SqlInfoBuilder itself.
    */
   public SqlInfoBuilder withSqlDataDefinitionsInTransactionsIgnored(final boolean value) {
-    return withBooleanProvider(SqlInfo.SQL_DATA_DEFINITIONS_IN_TRANSACTIONS_IGNORED_VALUE,
-        value);
+    return withBooleanProvider(SqlInfo.SQL_DATA_DEFINITIONS_IN_TRANSACTIONS_IGNORED_VALUE, value);
   }
 
   /**
@@ -472,14 +473,16 @@ public SqlInfoBuilder withSqlLocatorsUpdateCopy(final boolean value) {
   }
 
   /**
-   * Sets a value for {@link SqlInfo#SQL_STORED_FUNCTIONS_USING_CALL_SYNTAX_SUPPORTED} in the builder.
+   * Sets a value for {@link SqlInfo#SQL_STORED_FUNCTIONS_USING_CALL_SYNTAX_SUPPORTED} in the
+   * builder.
    *
-   * @param value the value for {@link SqlInfo#SQL_STORED_FUNCTIONS_USING_CALL_SYNTAX_SUPPORTED} to be set.
+   * @param value the value for {@link SqlInfo#SQL_STORED_FUNCTIONS_USING_CALL_SYNTAX_SUPPORTED} to
+   *     be set.
    * @return the SqlInfoBuilder itself.
    */
   public SqlInfoBuilder withSqlStoredFunctionsUsingCallSyntaxSupported(final boolean value) {
-    return withBooleanProvider(SqlInfo.SQL_STORED_FUNCTIONS_USING_CALL_SYNTAX_SUPPORTED_VALUE,
-        value);
+    return withBooleanProvider(
+        SqlInfo.SQL_STORED_FUNCTIONS_USING_CALL_SYNTAX_SUPPORTED_VALUE, value);
   }
 
   /**
@@ -758,7 +761,8 @@ public SqlInfoBuilder withSqlSupportedGrammar(final SupportedSqlGrammar... value
    * @param values the value for {@link SqlInfo#SQL_ANSI92_SUPPORTED_LEVEL} to be set.
    * @return the SqlInfoBuilder itself.
    */
-  public SqlInfoBuilder withSqlAnsi92SupportedLevel(final SupportedAnsi92SqlGrammarLevel... values) {
+  public SqlInfoBuilder withSqlAnsi92SupportedLevel(
+      final SupportedAnsi92SqlGrammarLevel... values) {
     return withEnumProvider(SqlInfo.SQL_ANSI92_SUPPORTED_LEVEL_VALUE, values);
   }
 
@@ -778,7 +782,8 @@ public SqlInfoBuilder withSqlSchemasSupportedActions(final SqlSupportedElementAc
    * @param values the value for {@link SqlInfo#SQL_CATALOGS_SUPPORTED_ACTIONS} to be set.
    * @return the SqlInfoBuilder itself.
    */
-  public SqlInfoBuilder withSqlCatalogsSupportedActions(final SqlSupportedElementActions... values) {
+  public SqlInfoBuilder withSqlCatalogsSupportedActions(
+      final SqlSupportedElementActions... values) {
     return withEnumProvider(SqlInfo.SQL_CATALOGS_SUPPORTED_ACTIONS_VALUE, values);
   }
 
@@ -788,7 +793,8 @@ public SqlInfoBuilder withSqlCatalogsSupportedActions(final SqlSupportedElementA
    * @param values the value for {@link SqlInfo#SQL_SUPPORTED_POSITIONED_COMMANDS} to be set.
    * @return the SqlInfoBuilder itself.
    */
-  public SqlInfoBuilder withSqlSupportedPositionedCommands(final SqlSupportedPositionedCommands... values) {
+  public SqlInfoBuilder withSqlSupportedPositionedCommands(
+      final SqlSupportedPositionedCommands... values) {
     return withEnumProvider(SqlInfo.SQL_SUPPORTED_POSITIONED_COMMANDS_VALUE, values);
   }
 
@@ -825,10 +831,12 @@ public SqlInfoBuilder withSqlOuterJoinSupportLevel(final SqlOuterJoinsSupportLev
   /**
    * Sets a value for {@link SqlInfo#SQL_SUPPORTED_TRANSACTIONS_ISOLATION_LEVELS} in the builder.
    *
-   * @param values the values for {@link SqlInfo#SQL_SUPPORTED_TRANSACTIONS_ISOLATION_LEVELS} to be set.
+   * @param values the values for {@link SqlInfo#SQL_SUPPORTED_TRANSACTIONS_ISOLATION_LEVELS} to be
+   *     set.
    * @return the SqlInfoBuilder itself.
    */
-  public SqlInfoBuilder withSqlSupportedTransactionsIsolationLevels(final SqlTransactionIsolationLevel... values) {
+  public SqlInfoBuilder withSqlSupportedTransactionsIsolationLevels(
+      final SqlTransactionIsolationLevel... values) {
     return withEnumProvider(SqlInfo.SQL_SUPPORTED_TRANSACTIONS_ISOLATION_LEVELS_VALUE, values);
   }
 
@@ -839,8 +847,7 @@ public SqlInfoBuilder withSqlSupportedTransactionsIsolationLevels(final SqlTrans
    * @return the SqlInfoBuilder itself.
    */
   public SqlInfoBuilder withSqlSupportedResultSetTypes(final SqlSupportedResultSetType... values) {
-    return withEnumProvider(SqlInfo.SQL_SUPPORTED_RESULT_SET_TYPES_VALUE, values
-    );
+    return withEnumProvider(SqlInfo.SQL_SUPPORTED_RESULT_SET_TYPES_VALUE, values);
   }
 
   /**
@@ -921,8 +928,7 @@ private SqlInfoBuilder withBitIntProvider(final int sqlInfo, final long value) {
     return this;
   }
 
-  private SqlInfoBuilder withBooleanProvider(final int sqlInfo,
-                                             final boolean value) {
+  private SqlInfoBuilder withBooleanProvider(final int sqlInfo, final boolean value) {
     addProvider(sqlInfo, (root, index) -> setDataForBooleanField(root, index, sqlInfo, value));
     return this;
   }
@@ -932,14 +938,13 @@ private SqlInfoBuilder withStringProvider(final int sqlInfo, final String value)
     return this;
   }
 
-  private SqlInfoBuilder withStringArrayProvider(final int sqlInfo,
-                                                 final String[] value) {
+  private SqlInfoBuilder withStringArrayProvider(final int sqlInfo, final String[] value) {
     addProvider(sqlInfo, (root, index) -> setDataVarCharListField(root, index, sqlInfo, value));
     return this;
   }
 
-  private SqlInfoBuilder withIntToIntListMapProvider(final int sqlInfo,
-                                                     final Map<Integer, List<Integer>> value) {
+  private SqlInfoBuilder withIntToIntListMapProvider(
+      final int sqlInfo, final Map<Integer, List<Integer>> value) {
     addProvider(sqlInfo, (root, index) -> setIntToIntListMapField(root, index, sqlInfo, value));
     return this;
   }
@@ -947,7 +952,7 @@ private SqlInfoBuilder withIntToIntListMapProvider(final int sqlInfo,
   /**
    * Send the requested information to given ServerStreamListener.
    *
-   * @param infos    List of SqlInfo to be sent.
+   * @param infos List of SqlInfo to be sent.
    * @param listener ServerStreamListener to send data to.
    */
   public void send(List<Integer> infos, final ServerStreamListener listener) {
@@ -955,9 +960,8 @@ public void send(List<Integer> infos, final ServerStreamListener listener) {
       infos = new ArrayList<>(providers.keySet());
     }
     try (final BufferAllocator allocator = new RootAllocator();
-         final VectorSchemaRoot root = VectorSchemaRoot.create(
-             FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA,
-             allocator)) {
+        final VectorSchemaRoot root =
+            VectorSchemaRoot.create(FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA, allocator)) {
       final int rows = infos.size();
       for (int i = 0; i < rows; i++) {
         providers.get(infos.get(i)).accept(root, i);
@@ -977,8 +981,11 @@ private void setInfoName(final VectorSchemaRoot root, final int index, final int
     infoName.setSafe(index, info);
   }
 
-  private void setValues(final VectorSchemaRoot root, final int index, final byte typeId,
-                         final Consumer<DenseUnionVector> dataSetter) {
+  private void setValues(
+      final VectorSchemaRoot root,
+      final int index,
+      final byte typeId,
+      final Consumer<DenseUnionVector> dataSetter) {
     final DenseUnionVector values = (DenseUnionVector) root.getVector("value");
     values.setTypeId(index, typeId);
     dataSetter.accept(values);
@@ -991,23 +998,24 @@ private void setValues(final VectorSchemaRoot root, final int index, final byte
    */
   private void onCreateArrowBuf(final Consumer<ArrowBuf> executor) {
     try (final BufferAllocator allocator = new RootAllocator();
-         final ArrowBuf buf = allocator.buffer(1024)) {
+        final ArrowBuf buf = allocator.buffer(1024)) {
       executor.accept(buf);
     }
   }
 
-  private void setDataForUtf8Field(final VectorSchemaRoot root, final int index,
-                                   final int sqlInfo, final String value) {
+  private void setDataForUtf8Field(
+      final VectorSchemaRoot root, final int index, final int sqlInfo, final String value) {
     setInfoName(root, index, sqlInfo);
-    onCreateArrowBuf(buf -> {
-      final Consumer<DenseUnionVector> producer =
-          values -> values.setSafe(index, getHolderForUtf8(value, buf));
-      setValues(root, index, (byte) 0, producer);
-    });
+    onCreateArrowBuf(
+        buf -> {
+          final Consumer<DenseUnionVector> producer =
+              values -> values.setSafe(index, getHolderForUtf8(value, buf));
+          setValues(root, index, (byte) 0, producer);
+        });
   }
 
-  private void setDataForIntField(final VectorSchemaRoot root, final int index,
-                                  final int sqlInfo, final int value) {
+  private void setDataForIntField(
+      final VectorSchemaRoot root, final int index, final int sqlInfo, final int value) {
     setInfoName(root, index, sqlInfo);
     final NullableIntHolder dataHolder = new NullableIntHolder();
     dataHolder.isSet = 1;
@@ -1015,8 +1023,8 @@ private void setDataForIntField(final VectorSchemaRoot root, final int index,
     setValues(root, index, (byte) 3, values -> values.setSafe(index, dataHolder));
   }
 
-  private void setDataForBigIntField(final VectorSchemaRoot root, final int index,
-                                     final int sqlInfo, final long value) {
+  private void setDataForBigIntField(
+      final VectorSchemaRoot root, final int index, final int sqlInfo, final long value) {
     setInfoName(root, index, sqlInfo);
     final NullableBigIntHolder dataHolder = new NullableBigIntHolder();
     dataHolder.isSet = 1;
@@ -1024,8 +1032,8 @@ private void setDataForBigIntField(final VectorSchemaRoot root, final int index,
     setValues(root, index, (byte) 2, values -> values.setSafe(index, dataHolder));
   }
 
-  private void setDataForBooleanField(final VectorSchemaRoot root, final int index,
-                                      final int sqlInfo, final boolean value) {
+  private void setDataForBooleanField(
+      final VectorSchemaRoot root, final int index, final int sqlInfo, final boolean value) {
     setInfoName(root, index, sqlInfo);
     final NullableBitHolder dataHolder = new NullableBitHolder();
     dataHolder.isSet = 1;
@@ -1033,9 +1041,8 @@ private void setDataForBooleanField(final VectorSchemaRoot root, final int index
     setValues(root, index, (byte) 1, values -> values.setSafe(index, dataHolder));
   }
 
-  private void setDataVarCharListField(final VectorSchemaRoot root, final int index,
-                                       final int sqlInfo,
-                                       final String[] values) {
+  private void setDataVarCharListField(
+      final VectorSchemaRoot root, final int index, final int sqlInfo, final String[] values) {
     final DenseUnionVector denseUnion = (DenseUnionVector) root.getVector("value");
     final ListVector listVector = denseUnion.getList((byte) 4);
     final int listIndex = listVector.getValueCount();
@@ -1049,11 +1056,14 @@ private void setDataVarCharListField(final VectorSchemaRoot root, final int inde
     writer.startList();
     final int length = values.length;
     range(0, length)
-        .forEach(i -> onCreateArrowBuf(buf -> {
-          final byte[] bytes = values[i].getBytes(StandardCharsets.UTF_8);
-          buf.setBytes(0, bytes);
-          writer.writeVarChar(0, bytes.length, buf);
-        }));
+        .forEach(
+            i ->
+                onCreateArrowBuf(
+                    buf -> {
+                      final byte[] bytes = values[i].getBytes(StandardCharsets.UTF_8);
+                      buf.setBytes(0, bytes);
+                      writer.writeVarChar(0, bytes.length, buf);
+                    }));
     writer.endList();
     writer.setValueCount(listVectorValueCount);
 
@@ -1062,9 +1072,11 @@ private void setDataVarCharListField(final VectorSchemaRoot root, final int inde
     setInfoName(root, index, sqlInfo);
   }
 
-  private void setIntToIntListMapField(final VectorSchemaRoot root, final int index,
-                                       final int sqlInfo,
-                                       final Map<Integer, List<Integer>> values) {
+  private void setIntToIntListMapField(
+      final VectorSchemaRoot root,
+      final int index,
+      final int sqlInfo,
+      final Map<Integer, List<Integer>> values) {
     final DenseUnionVector denseUnion = (DenseUnionVector) root.getVector("value");
     final MapVector mapVector = denseUnion.getMap((byte) 5);
     final int mapIndex = mapVector.getValueCount();
@@ -1074,17 +1086,18 @@ private void setIntToIntListMapField(final VectorSchemaRoot root, final int inde
     final UnionMapWriter mapWriter = mapVector.getWriter();
     mapWriter.setPosition(mapIndex);
     mapWriter.startMap();
-    values.forEach((key, value) -> {
-      mapWriter.startEntry();
-      mapWriter.key().integer().writeInt(key);
-      final BaseWriter.ListWriter listWriter = mapWriter.value().list();
-      listWriter.startList();
-      for (final int v : value) {
-        listWriter.integer().writeInt(v);
-      }
-      listWriter.endList();
-      mapWriter.endEntry();
-    });
+    values.forEach(
+        (key, value) -> {
+          mapWriter.startEntry();
+          mapWriter.key().integer().writeInt(key);
+          final BaseWriter.ListWriter listWriter = mapWriter.value().list();
+          listWriter.startList();
+          for (final int v : value) {
+            listWriter.integer().writeInt(v);
+          }
+          listWriter.endList();
+          mapWriter.endEntry();
+        });
     mapWriter.endMap();
     mapWriter.setValueCount(mapIndex + 1);
 
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/example/FlightSqlClientDemoApp.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/example/FlightSqlClientDemoApp.java
index 4d3241c7c37f3..7dbbe4c39583a 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/example/FlightSqlClientDemoApp.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/example/FlightSqlClientDemoApp.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql.example;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.arrow.flight.CallOption;
 import org.apache.arrow.flight.FlightClient;
 import org.apache.arrow.flight.FlightInfo;
@@ -37,9 +35,7 @@
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 
-/**
- * Flight SQL Client Demo CLI Application.
- */
+/** Flight SQL Client Demo CLI Application. */
 public class FlightSqlClientDemoApp implements AutoCloseable {
   public final List<CallOption> callOptions = new ArrayList<>();
   public final BufferAllocator allocator;
@@ -67,7 +63,8 @@ public static void main(final String[] args) throws Exception {
 
     try {
       cmd = parser.parse(options, args);
-      try (final FlightSqlClientDemoApp thisApp = new FlightSqlClientDemoApp(new RootAllocator(Integer.MAX_VALUE))) {
+      try (final FlightSqlClientDemoApp thisApp =
+          new FlightSqlClientDemoApp(new RootAllocator(Integer.MAX_VALUE))) {
         thisApp.executeApp(cmd);
       }
 
@@ -79,8 +76,8 @@ public static void main(final String[] args) throws Exception {
   }
 
   /**
-   * Gets the current {@link CallOption} as an array; usually used as an
-   * argument in {@link FlightSqlClient} methods.
+   * Gets the current {@link CallOption} as an array; usually used as an argument in {@link
+   * FlightSqlClient} methods.
    *
    * @return current {@link CallOption} array.
    */
@@ -89,12 +86,12 @@ public CallOption[] getCallOptions() {
   }
 
   /**
-   * Calls {@link FlightSqlClientDemoApp#createFlightSqlClient(String, int)}
-   * in order to create a {@link FlightSqlClient} to be used in future calls,
-   * and then calls {@link FlightSqlClientDemoApp#executeCommand(CommandLine)}
-   * to execute the command parsed at execution.
+   * Calls {@link FlightSqlClientDemoApp#createFlightSqlClient(String, int)} in order to create a
+   * {@link FlightSqlClient} to be used in future calls, and then calls {@link
+   * FlightSqlClientDemoApp#executeCommand(CommandLine)} to execute the command parsed at execution.
    *
-   * @param cmd parsed {@link CommandLine}; often the result of {@link DefaultParser#parse(Options, String[])}.
+   * @param cmd parsed {@link CommandLine}; often the result of {@link DefaultParser#parse(Options,
+   *     String[])}.
    */
   public void executeApp(final CommandLine cmd) throws Exception {
     final String host = cmd.getOptionValue("host").trim();
@@ -107,29 +104,22 @@ public void executeApp(final CommandLine cmd) throws Exception {
   /**
    * Parses the "{@code command}" CLI argument and redirects to the appropriate method.
    *
-   * @param cmd parsed {@link CommandLine}; often the result of
-   *            {@link DefaultParser#parse(Options, String[])}.
+   * @param cmd parsed {@link CommandLine}; often the result of {@link DefaultParser#parse(Options,
+   *     String[])}.
    */
   public void executeCommand(CommandLine cmd) throws Exception {
     switch (cmd.getOptionValue("command").trim()) {
       case "Execute":
-        exampleExecute(
-            cmd.getOptionValue("query")
-        );
+        exampleExecute(cmd.getOptionValue("query"));
         break;
       case "ExecuteUpdate":
-        exampleExecuteUpdate(
-            cmd.getOptionValue("query")
-        );
+        exampleExecuteUpdate(cmd.getOptionValue("query"));
         break;
       case "GetCatalogs":
         exampleGetCatalogs();
         break;
       case "GetSchemas":
-        exampleGetSchemas(
-            cmd.getOptionValue("catalog"),
-            cmd.getOptionValue("schema")
-        );
+        exampleGetSchemas(cmd.getOptionValue("catalog"), cmd.getOptionValue("schema"));
         break;
       case "GetTableTypes":
         exampleGetTableTypes();
@@ -138,41 +128,38 @@ public void executeCommand(CommandLine cmd) throws Exception {
         exampleGetTables(
             cmd.getOptionValue("catalog"),
             cmd.getOptionValue("schema"),
-            cmd.getOptionValue("table")
-        );
+            cmd.getOptionValue("table"));
         break;
       case "GetExportedKeys":
         exampleGetExportedKeys(
             cmd.getOptionValue("catalog"),
             cmd.getOptionValue("schema"),
-            cmd.getOptionValue("table")
-        );
+            cmd.getOptionValue("table"));
         break;
       case "GetImportedKeys":
         exampleGetImportedKeys(
             cmd.getOptionValue("catalog"),
             cmd.getOptionValue("schema"),
-            cmd.getOptionValue("table")
-        );
+            cmd.getOptionValue("table"));
         break;
       case "GetPrimaryKeys":
         exampleGetPrimaryKeys(
             cmd.getOptionValue("catalog"),
             cmd.getOptionValue("schema"),
-            cmd.getOptionValue("table")
-        );
+            cmd.getOptionValue("table"));
         break;
       default:
-        System.out.println("Command used is not valid! Please use one of: \n" +
-            "[\"ExecuteUpdate\",\n" +
-            "\"Execute\",\n" +
-            "\"GetCatalogs\",\n" +
-            "\"GetSchemas\",\n" +
-            "\"GetTableTypes\",\n" +
-            "\"GetTables\",\n" +
-            "\"GetExportedKeys\",\n" +
-            "\"GetImportedKeys\",\n" +
-            "\"GetPrimaryKeys\"]");
+        System.out.println(
+            "Command used is not valid! Please use one of: \n"
+                + "[\"ExecuteUpdate\",\n"
+                + "\"Execute\",\n"
+                + "\"GetCatalogs\",\n"
+                + "\"GetSchemas\",\n"
+                + "\"GetTableTypes\",\n"
+                + "\"GetTables\",\n"
+                + "\"GetExportedKeys\",\n"
+                + "\"GetImportedKeys\",\n"
+                + "\"GetPrimaryKeys\"]");
     }
   }
 
@@ -192,7 +179,8 @@ private void exampleExecute(final String query) throws Exception {
   }
 
   private void exampleExecuteUpdate(final String query) {
-    System.out.println("Updated: " + flightSqlClient.executeUpdate(query, getCallOptions()) + "rows.");
+    System.out.println(
+        "Updated: " + flightSqlClient.executeUpdate(query, getCallOptions()) + "rows.");
   }
 
   private void exampleGetCatalogs() throws Exception {
@@ -207,22 +195,29 @@ private void exampleGetTableTypes() throws Exception {
     printFlightInfoResults(flightSqlClient.getTableTypes(getCallOptions()));
   }
 
-  private void exampleGetTables(final String catalog, final String schema, final String table) throws Exception {
+  private void exampleGetTables(final String catalog, final String schema, final String table)
+      throws Exception {
     // For now, this won't filter by table types.
-    printFlightInfoResults(flightSqlClient.getTables(
-        catalog, schema, table, null, false, getCallOptions()));
+    printFlightInfoResults(
+        flightSqlClient.getTables(catalog, schema, table, null, false, getCallOptions()));
   }
 
-  private void exampleGetExportedKeys(final String catalog, final String schema, final String table) throws Exception {
-    printFlightInfoResults(flightSqlClient.getExportedKeys(TableRef.of(catalog, schema, table), getCallOptions()));
+  private void exampleGetExportedKeys(final String catalog, final String schema, final String table)
+      throws Exception {
+    printFlightInfoResults(
+        flightSqlClient.getExportedKeys(TableRef.of(catalog, schema, table), getCallOptions()));
   }
 
-  private void exampleGetImportedKeys(final String catalog, final String schema, final String table) throws Exception {
-    printFlightInfoResults(flightSqlClient.getImportedKeys(TableRef.of(catalog, schema, table), getCallOptions()));
+  private void exampleGetImportedKeys(final String catalog, final String schema, final String table)
+      throws Exception {
+    printFlightInfoResults(
+        flightSqlClient.getImportedKeys(TableRef.of(catalog, schema, table), getCallOptions()));
   }
 
-  private void exampleGetPrimaryKeys(final String catalog, final String schema, final String table) throws Exception {
-    printFlightInfoResults(flightSqlClient.getPrimaryKeys(TableRef.of(catalog, schema, table), getCallOptions()));
+  private void exampleGetPrimaryKeys(final String catalog, final String schema, final String table)
+      throws Exception {
+    printFlightInfoResults(
+        flightSqlClient.getPrimaryKeys(TableRef.of(catalog, schema, table), getCallOptions()));
   }
 
   private void printFlightInfoResults(final FlightInfo flightInfo) throws Exception {
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/util/SqlInfoOptionsUtils.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/util/SqlInfoOptionsUtils.java
index c43c48eb8e0dd..3d3d3921022a9 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/util/SqlInfoOptionsUtils.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/util/SqlInfoOptionsUtils.java
@@ -14,34 +14,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql.util;
 
+import com.google.protobuf.ProtocolMessageEnum;
 import java.util.Arrays;
 import java.util.Collection;
-
 import org.apache.arrow.flight.sql.FlightSqlClient;
 import org.apache.arrow.flight.sql.impl.FlightSql.SqlInfo;
 
-import com.google.protobuf.ProtocolMessageEnum;
-
-/**
- * Utility class for {@link SqlInfo} and {@link FlightSqlClient#getSqlInfo} option parsing.
- */
+/** Utility class for {@link SqlInfo} and {@link FlightSqlClient#getSqlInfo} option parsing. */
 public final class SqlInfoOptionsUtils {
   private SqlInfoOptionsUtils() {
     // Prevent instantiation.
   }
 
   /**
-   * Returns whether the provided {@code bitmask} points to the provided {@link ProtocolMessageEnum} by comparing
-   * {@link ProtocolMessageEnum#getNumber} with the respective bit index of the {@code bitmask}.
+   * Returns whether the provided {@code bitmask} points to the provided {@link ProtocolMessageEnum}
+   * by comparing {@link ProtocolMessageEnum#getNumber} with the respective bit index of the {@code
+   * bitmask}.
    *
    * @param enumInstance the protobuf message enum to use.
-   * @param bitmask      the bitmask response from {@link FlightSqlClient#getSqlInfo}.
+   * @param bitmask the bitmask response from {@link FlightSqlClient#getSqlInfo}.
    * @return whether the provided {@code bitmask} points to the specified {@code enumInstance}.
    */
-  public static boolean doesBitmaskTranslateToEnum(final ProtocolMessageEnum enumInstance, final long bitmask) {
+  public static boolean doesBitmaskTranslateToEnum(
+      final ProtocolMessageEnum enumInstance, final long bitmask) {
     return ((bitmask >> enumInstance.getNumber()) & 1) == 1;
   }
 
diff --git a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/util/TableRef.java b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/util/TableRef.java
index b3751cab9038a..15167a8f00d53 100644
--- a/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/util/TableRef.java
+++ b/java/flight/flight-sql/src/main/java/org/apache/arrow/flight/sql/util/TableRef.java
@@ -14,13 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql.util;
 
-/**
- * A helper class to reference a table to be passed to the flight
- * sql client.
- */
+/** A helper class to reference a table to be passed to the flight sql client. */
 public class TableRef {
   private final String catalog;
   private final String dbSchema;
@@ -28,9 +24,10 @@ public class TableRef {
 
   /**
    * The complete constructor for the TableRef class.
-   * @param catalog   the catalog from a table.
-   * @param dbSchema  the database schema from a table.
-   * @param table     the table name from a table.
+   *
+   * @param catalog the catalog from a table.
+   * @param dbSchema the database schema from a table.
+   * @param table the table name from a table.
    */
   public TableRef(String catalog, String dbSchema, String table) {
     this.catalog = catalog;
@@ -40,10 +37,11 @@ public TableRef(String catalog, String dbSchema, String table) {
 
   /**
    * A static initializer of the TableRef with all the arguments.
-   * @param catalog   the catalog from a table.
-   * @param dbSchema  the database schema from a table.
-   * @param table     the table name from a table.
-   * @return  A TableRef object.
+   *
+   * @param catalog the catalog from a table.
+   * @param dbSchema the database schema from a table.
+   * @param table the table name from a table.
+   * @return A TableRef object.
    */
   public static TableRef of(String catalog, String dbSchema, String table) {
     return new TableRef(catalog, dbSchema, table);
@@ -51,7 +49,8 @@ public static TableRef of(String catalog, String dbSchema, String table) {
 
   /**
    * Retrieve the catalog from the object.
-   * @return  the catalog.
+   *
+   * @return the catalog.
    */
   public String getCatalog() {
     return catalog;
@@ -59,7 +58,8 @@ public String getCatalog() {
 
   /**
    * Retrieves the db schema from the object.
-   * @return  the dbSchema
+   *
+   * @return the dbSchema
    */
   public String getDbSchema() {
     return dbSchema;
@@ -67,10 +67,10 @@ public String getDbSchema() {
 
   /**
    * Retrieves the table from the object.
-   * @return  the table.
+   *
+   * @return the table.
    */
   public String getTable() {
     return table;
   }
 }
-
diff --git a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/DoPutPreparedStatementResultPOJO.java b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/DoPutPreparedStatementResultPOJO.java
new file mode 100644
index 0000000000000..f6bfbcd2e5457
--- /dev/null
+++ b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/DoPutPreparedStatementResultPOJO.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.flight.sql.example;
+
+import java.io.Serializable;
+
+public class DoPutPreparedStatementResultPOJO implements Serializable {
+  private String query;
+  private byte[] parameters;
+
+  public DoPutPreparedStatementResultPOJO(String query, byte[] parameters) {
+    this.query = query;
+    this.parameters = parameters.clone();
+  }
+
+  public String getQuery() {
+    return query;
+  }
+
+  public byte[] getParameters() {
+    return parameters;
+  }
+}
diff --git a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/FlightSqlExample.java b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/FlightSqlExample.java
index 52c402efd6f0b..e7127faf97539 100644
--- a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/FlightSqlExample.java
+++ b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/FlightSqlExample.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql.example;
 
 import static com.google.common.base.Strings.emptyToNull;
@@ -37,6 +36,15 @@
 import static org.apache.arrow.util.Preconditions.checkState;
 import static org.slf4j.LoggerFactory.getLogger;
 
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.RemovalListener;
+import com.google.common.cache.RemovalNotification;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.Message;
+import com.google.protobuf.ProtocolStringList;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -75,7 +83,6 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
-
 import org.apache.arrow.adapter.jdbc.ArrowVectorIterator;
 import org.apache.arrow.adapter.jdbc.JdbcFieldInfo;
 import org.apache.arrow.adapter.jdbc.JdbcParameterBinder;
@@ -141,54 +148,49 @@
 import org.apache.commons.pool2.impl.GenericObjectPool;
 import org.slf4j.Logger;
 
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.RemovalListener;
-import com.google.common.cache.RemovalNotification;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.Message;
-import com.google.protobuf.ProtocolStringList;
-
 /**
- * Example {@link FlightSqlProducer} implementation showing an Apache Derby backed Flight SQL server that generally
- * supports all current features of Flight SQL.
+ * Example {@link FlightSqlProducer} implementation showing an Apache Derby backed Flight SQL server
+ * that generally supports all current features of Flight SQL.
  */
 public class FlightSqlExample implements FlightSqlProducer, AutoCloseable {
-  private static final String DATABASE_URI = "jdbc:derby:target/derbyDB";
   private static final Logger LOGGER = getLogger(FlightSqlExample.class);
-  private static final Calendar DEFAULT_CALENDAR = JdbcToArrowUtils.getUtcCalendar();
+  protected static final Calendar DEFAULT_CALENDAR = JdbcToArrowUtils.getUtcCalendar();
+  public static final String DB_NAME = "derbyDB";
+  private final String databaseUri;
   // ARROW-15315: Use ExecutorService to simulate an async scenario
   private final ExecutorService executorService = Executors.newFixedThreadPool(10);
   private final Location location;
-  private final PoolingDataSource<PoolableConnection> dataSource;
-  private final BufferAllocator rootAllocator = new RootAllocator();
-  private final Cache<ByteString, StatementContext<PreparedStatement>> preparedStatementLoadingCache;
+  protected final PoolingDataSource<PoolableConnection> dataSource;
+  protected final BufferAllocator rootAllocator = new RootAllocator();
+  private final Cache<ByteString, StatementContext<PreparedStatement>>
+      preparedStatementLoadingCache;
   private final Cache<ByteString, StatementContext<Statement>> statementLoadingCache;
   private final SqlInfoBuilder sqlInfoBuilder;
 
   public static void main(String[] args) throws Exception {
     Location location = Location.forGrpcInsecure("localhost", 55555);
-    final FlightSqlExample example = new FlightSqlExample(location);
+    final FlightSqlExample example = new FlightSqlExample(location, DB_NAME);
     Location listenLocation = Location.forGrpcInsecure("0.0.0.0", 55555);
     try (final BufferAllocator allocator = new RootAllocator();
-         final FlightServer server = FlightServer.builder(allocator, listenLocation, example).build()) {
+        final FlightServer server =
+            FlightServer.builder(allocator, listenLocation, example).build()) {
       server.start();
       server.awaitTermination();
     }
   }
 
-  public FlightSqlExample(final Location location) {
+  public FlightSqlExample(final Location location, final String dbName) {
     // TODO Constructor should not be doing work.
     checkState(
-        removeDerbyDatabaseIfExists() && populateDerbyDatabase(),
+        removeDerbyDatabaseIfExists(dbName) && populateDerbyDatabase(dbName),
         "Failed to reset Derby database!");
+    databaseUri = "jdbc:derby:target/" + dbName;
     final ConnectionFactory connectionFactory =
-        new DriverManagerConnectionFactory(DATABASE_URI, new Properties());
+        new DriverManagerConnectionFactory(databaseUri, new Properties());
     final PoolableConnectionFactory poolableConnectionFactory =
         new PoolableConnectionFactory(connectionFactory, null);
-    final ObjectPool<PoolableConnection> connectionPool = new GenericObjectPool<>(poolableConnectionFactory);
+    final ObjectPool<PoolableConnection> connectionPool =
+        new GenericObjectPool<>(poolableConnectionFactory);
 
     poolableConnectionFactory.setPool(connectionPool);
     // PoolingDataSource takes ownership of `connectionPool`
@@ -214,7 +216,8 @@ public FlightSqlExample(final Location location) {
     try (final Connection connection = dataSource.getConnection()) {
       final DatabaseMetaData metaData = connection.getMetaData();
 
-      sqlInfoBuilder.withFlightSqlServerName(metaData.getDatabaseProductName())
+      sqlInfoBuilder
+          .withFlightSqlServerName(metaData.getDatabaseProductName())
           .withFlightSqlServerVersion(metaData.getDatabaseProductVersion())
           .withFlightSqlServerArrowVersion(metaData.getDriverVersion())
           .withFlightSqlServerReadOnly(metaData.isReadOnly())
@@ -223,34 +226,35 @@ public FlightSqlExample(final Location location) {
           .withFlightSqlServerTransaction(SqlSupportedTransaction.SQL_SUPPORTED_TRANSACTION_NONE)
           .withSqlIdentifierQuoteChar(metaData.getIdentifierQuoteString())
           .withSqlDdlCatalog(metaData.supportsCatalogsInDataManipulation())
-          .withSqlDdlSchema( metaData.supportsSchemasInDataManipulation())
-          .withSqlDdlTable( metaData.allTablesAreSelectable())
-          .withSqlIdentifierCase(metaData.storesMixedCaseIdentifiers() ?
-              SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_CASE_INSENSITIVE :
-              metaData.storesUpperCaseIdentifiers() ?
-                  SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_UPPERCASE :
-                  metaData.storesLowerCaseIdentifiers() ?
-                      SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_LOWERCASE :
-                      SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_UNKNOWN)
-          .withSqlQuotedIdentifierCase(metaData.storesMixedCaseQuotedIdentifiers() ?
-              SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_CASE_INSENSITIVE :
-              metaData.storesUpperCaseQuotedIdentifiers() ?
-                  SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_UPPERCASE :
-                  metaData.storesLowerCaseQuotedIdentifiers() ?
-                      SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_LOWERCASE :
-                      SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_UNKNOWN)
+          .withSqlDdlSchema(metaData.supportsSchemasInDataManipulation())
+          .withSqlDdlTable(metaData.allTablesAreSelectable())
+          .withSqlIdentifierCase(
+              metaData.storesMixedCaseIdentifiers()
+                  ? SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_CASE_INSENSITIVE
+                  : metaData.storesUpperCaseIdentifiers()
+                      ? SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_UPPERCASE
+                      : metaData.storesLowerCaseIdentifiers()
+                          ? SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_LOWERCASE
+                          : SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_UNKNOWN)
+          .withSqlQuotedIdentifierCase(
+              metaData.storesMixedCaseQuotedIdentifiers()
+                  ? SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_CASE_INSENSITIVE
+                  : metaData.storesUpperCaseQuotedIdentifiers()
+                      ? SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_UPPERCASE
+                      : metaData.storesLowerCaseQuotedIdentifiers()
+                          ? SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_LOWERCASE
+                          : SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_UNKNOWN)
           .withSqlAllTablesAreSelectable(true)
           .withSqlNullOrdering(SqlNullOrdering.SQL_NULLS_SORTED_AT_END)
           .withSqlMaxColumnsInTable(42);
     } catch (SQLException e) {
       throw new RuntimeException(e);
     }
-
   }
 
-  private static boolean removeDerbyDatabaseIfExists() {
+  public static boolean removeDerbyDatabaseIfExists(final String dbName) {
     boolean wasSuccess;
-    final Path path = Paths.get("target" + File.separator + "derbyDB");
+    final Path path = Paths.get("target" + File.separator + dbName);
 
     try (final Stream<Path> walk = Files.walk(path)) {
       /*
@@ -261,8 +265,12 @@ private static boolean removeDerbyDatabaseIfExists() {
        * If for whatever reason the resulting `Stream<Boolean>` is empty, throw an `IOException`;
        * this not expected.
        */
-      wasSuccess = walk.sorted(Comparator.reverseOrder()).map(Path::toFile).map(File::delete)
-          .reduce(Boolean::logicalAnd).orElseThrow(IOException::new);
+      wasSuccess =
+          walk.sorted(Comparator.reverseOrder())
+              .map(Path::toFile)
+              .map(File::delete)
+              .reduce(Boolean::logicalAnd)
+              .orElseThrow(IOException::new);
     } catch (IOException e) {
       /*
        * The only acceptable scenario for an `IOException` to be thrown here is if
@@ -277,24 +285,31 @@ private static boolean removeDerbyDatabaseIfExists() {
     return wasSuccess;
   }
 
-  private static boolean populateDerbyDatabase() {
-    try (final Connection connection = DriverManager.getConnection("jdbc:derby:target/derbyDB;create=true");
-         Statement statement = connection.createStatement()) {
-      statement.execute("CREATE TABLE foreignTable (" +
-          "id INT not null primary key GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), " +
-          "foreignName varchar(100), " +
-          "value int)");
-      statement.execute("CREATE TABLE intTable (" +
-          "id INT not null primary key GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), " +
-          "keyName varchar(100), " +
-          "value int, " +
-          "foreignId int references foreignTable(id))");
+  private static boolean populateDerbyDatabase(final String dbName) {
+    try (final Connection connection =
+            DriverManager.getConnection("jdbc:derby:target/" + dbName + ";create=true");
+        Statement statement = connection.createStatement()) {
+
+      dropTable(statement, "intTable");
+      dropTable(statement, "foreignTable");
+      statement.execute(
+          "CREATE TABLE foreignTable ("
+              + "id INT not null primary key GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), "
+              + "foreignName varchar(100), "
+              + "value int)");
+      statement.execute(
+          "CREATE TABLE intTable ("
+              + "id INT not null primary key GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1), "
+              + "keyName varchar(100), "
+              + "value int, "
+              + "foreignId int references foreignTable(id))");
       statement.execute("INSERT INTO foreignTable (foreignName, value) VALUES ('keyOne', 1)");
       statement.execute("INSERT INTO foreignTable (foreignName, value) VALUES ('keyTwo', 0)");
       statement.execute("INSERT INTO foreignTable (foreignName, value) VALUES ('keyThree', -1)");
       statement.execute("INSERT INTO intTable (keyName, value, foreignId) VALUES ('one', 1, 1)");
       statement.execute("INSERT INTO intTable (keyName, value, foreignId) VALUES ('zero', 0, 1)");
-      statement.execute("INSERT INTO intTable (keyName, value, foreignId) VALUES ('negative one', -1, 1)");
+      statement.execute(
+          "INSERT INTO intTable (keyName, value, foreignId) VALUES ('negative one', -1, 1)");
     } catch (final SQLException e) {
       LOGGER.error(format("Failed attempt to populate DerbyDB: <%s>", e.getMessage()), e);
       return false;
@@ -302,10 +317,24 @@ private static boolean populateDerbyDatabase() {
     return true;
   }
 
-  private static ArrowType getArrowTypeFromJdbcType(final int jdbcDataType, final int precision, final int scale) {
+  private static void dropTable(final Statement statement, final String tableName)
+      throws SQLException {
     try {
-      return JdbcToArrowUtils.getArrowTypeFromJdbcType(new JdbcFieldInfo(jdbcDataType, precision, scale),
-              DEFAULT_CALENDAR);
+      statement.execute("DROP TABLE " + tableName);
+    } catch (SQLException e) {
+      // sql error code for "object does not exist"; which is fine, we're trying to delete the table
+      // see https://db.apache.org/derby/docs/10.17/ref/rrefexcept71493.html
+      if (!"42Y55".equals(e.getSQLState())) {
+        throw e;
+      }
+    }
+  }
+
+  private static ArrowType getArrowTypeFromJdbcType(
+      final int jdbcDataType, final int precision, final int scale) {
+    try {
+      return JdbcToArrowUtils.getArrowTypeFromJdbcType(
+          new JdbcFieldInfo(jdbcDataType, precision, scale), DEFAULT_CALENDAR);
     } catch (UnsupportedOperationException ignored) {
       return ArrowType.Utf8.INSTANCE;
     }
@@ -329,19 +358,29 @@ private static void saveToVector(final Byte data, final BitVector vector, final
 
   private static void saveToVector(final String data, final VarCharVector vector, final int index) {
     preconditionCheckSaveToVector(vector, index);
-    vectorConsumer(data, vector, fieldVector -> fieldVector.setNull(index),
+    vectorConsumer(
+        data,
+        vector,
+        fieldVector -> fieldVector.setNull(index),
         (theData, fieldVector) -> fieldVector.setSafe(index, new Text(theData)));
   }
 
   private static void saveToVector(final Integer data, final IntVector vector, final int index) {
     preconditionCheckSaveToVector(vector, index);
-    vectorConsumer(data, vector, fieldVector -> fieldVector.setNull(index),
+    vectorConsumer(
+        data,
+        vector,
+        fieldVector -> fieldVector.setNull(index),
         (theData, fieldVector) -> fieldVector.setSafe(index, theData));
   }
 
-  private static void saveToVector(final byte[] data, final VarBinaryVector vector, final int index) {
+  private static void saveToVector(
+      final byte[] data, final VarBinaryVector vector, final int index) {
     preconditionCheckSaveToVector(vector, index);
-    vectorConsumer(data, vector, fieldVector -> fieldVector.setNull(index),
+    vectorConsumer(
+        data,
+        vector,
+        fieldVector -> fieldVector.setNull(index),
         (theData, fieldVector) -> fieldVector.setSafe(index, theData));
   }
 
@@ -350,9 +389,11 @@ private static void preconditionCheckSaveToVector(final FieldVector vector, fina
     checkState(index >= 0, "Index must be a positive number!");
   }
 
-  private static <T, V extends FieldVector> void vectorConsumer(final T data, final V vector,
-                                                                final Consumer<V> consumerIfNullable,
-                                                                final BiConsumer<T, V> defaultConsumer) {
+  private static <T, V extends FieldVector> void vectorConsumer(
+      final T data,
+      final V vector,
+      final Consumer<V> consumerIfNullable,
+      final BiConsumer<T, V> defaultConsumer) {
     if (isNull(data)) {
       consumerIfNullable.accept(vector);
       return;
@@ -360,33 +401,41 @@ private static <T, V extends FieldVector> void vectorConsumer(final T data, fina
     defaultConsumer.accept(data, vector);
   }
 
-  private static VectorSchemaRoot getSchemasRoot(final ResultSet data, final BufferAllocator allocator)
-      throws SQLException {
+  private static VectorSchemaRoot getSchemasRoot(
+      final ResultSet data, final BufferAllocator allocator) throws SQLException {
     final VarCharVector catalogs = new VarCharVector("catalog_name", allocator);
     final VarCharVector schemas =
-        new VarCharVector("db_schema_name", FieldType.notNullable(MinorType.VARCHAR.getType()), allocator);
+        new VarCharVector(
+            "db_schema_name", FieldType.notNullable(MinorType.VARCHAR.getType()), allocator);
     final List<FieldVector> vectors = ImmutableList.of(catalogs, schemas);
     vectors.forEach(FieldVector::allocateNew);
-    final Map<FieldVector, String> vectorToColumnName = ImmutableMap.of(
-        catalogs, "TABLE_CATALOG",
-        schemas, "TABLE_SCHEM");
+    final Map<FieldVector, String> vectorToColumnName =
+        ImmutableMap.of(
+            catalogs, "TABLE_CATALOG",
+            schemas, "TABLE_SCHEM");
     saveToVectors(vectorToColumnName, data);
-    final int rows = vectors.stream().map(FieldVector::getValueCount).findAny().orElseThrow(IllegalStateException::new);
+    final int rows =
+        vectors.stream()
+            .map(FieldVector::getValueCount)
+            .findAny()
+            .orElseThrow(IllegalStateException::new);
     vectors.forEach(vector -> vector.setValueCount(rows));
     return new VectorSchemaRoot(vectors);
   }
 
-  private static <T extends FieldVector> int saveToVectors(final Map<T, String> vectorToColumnName,
-                                                           final ResultSet data, boolean emptyToNull)
+  private static <T extends FieldVector> int saveToVectors(
+      final Map<T, String> vectorToColumnName, final ResultSet data, boolean emptyToNull)
       throws SQLException {
     Predicate<ResultSet> alwaysTrue = (resultSet) -> true;
     return saveToVectors(vectorToColumnName, data, emptyToNull, alwaysTrue);
   }
 
   @SuppressWarnings("StringSplitter")
-  private static <T extends FieldVector> int saveToVectors(final Map<T, String> vectorToColumnName,
-                                                           final ResultSet data, boolean emptyToNull,
-                                                           Predicate<ResultSet> resultSetPredicate)
+  private static <T extends FieldVector> int saveToVectors(
+      final Map<T, String> vectorToColumnName,
+      final ResultSet data,
+      boolean emptyToNull,
+      Predicate<ResultSet> resultSetPredicate)
       throws SQLException {
     Objects.requireNonNull(vectorToColumnName, "vectorToColumnName cannot be null.");
     Objects.requireNonNull(data, "data cannot be null.");
@@ -402,7 +451,8 @@ private static <T extends FieldVector> int saveToVectors(final Map<T, String> ve
         final String columnName = vectorToColumn.getValue();
         if (vector instanceof VarCharVector) {
           String thisData = data.getString(columnName);
-          saveToVector(emptyToNull ? emptyToNull(thisData) : thisData, (VarCharVector) vector, rows);
+          saveToVector(
+              emptyToNull ? emptyToNull(thisData) : thisData, (VarCharVector) vector, rows);
         } else if (vector instanceof IntVector) {
           final int intValue = data.getInt(columnName);
           saveToVector(data.wasNull() ? null : intValue, (IntVector) vector, rows);
@@ -427,21 +477,25 @@ private static <T extends FieldVector> int saveToVectors(final Map<T, String> ve
             String[] split = createParamsValues.split(",");
 
             range(0, split.length)
-                .forEach(i -> {
-                  byte[] bytes = split[i].getBytes(StandardCharsets.UTF_8);
-                  Preconditions.checkState(bytes.length < 1024,
-                      "The amount of bytes is greater than what the ArrowBuf supports");
-                  buf.setBytes(0, bytes);
-                  writer.varChar().writeVarChar(0, bytes.length, buf);
-                });
+                .forEach(
+                    i -> {
+                      byte[] bytes = split[i].getBytes(StandardCharsets.UTF_8);
+                      Preconditions.checkState(
+                          bytes.length < 1024,
+                          "The amount of bytes is greater than what the ArrowBuf supports");
+                      buf.setBytes(0, bytes);
+                      writer.varChar().writeVarChar(0, bytes.length, buf);
+                    });
           }
           buf.close();
           writer.endList();
         } else {
-          throw CallStatus.INVALID_ARGUMENT.withDescription("Provided vector not supported").toRuntimeException();
+          throw CallStatus.INVALID_ARGUMENT
+              .withDescription("Provided vector not supported")
+              .toRuntimeException();
         }
       }
-      rows ++;
+      rows++;
     }
     for (final Entry<T, String> vectorToColumn : entrySet) {
       vectorToColumn.getKey().setValueCount(rows);
@@ -450,35 +504,38 @@ private static <T extends FieldVector> int saveToVectors(final Map<T, String> ve
     return rows;
   }
 
-  private static <T extends FieldVector> void saveToVectors(final Map<T, String> vectorToColumnName,
-                                                            final ResultSet data)
-      throws SQLException {
+  private static <T extends FieldVector> void saveToVectors(
+      final Map<T, String> vectorToColumnName, final ResultSet data) throws SQLException {
     saveToVectors(vectorToColumnName, data, false);
   }
 
-  private static VectorSchemaRoot getTableTypesRoot(final ResultSet data, final BufferAllocator allocator)
-      throws SQLException {
+  private static VectorSchemaRoot getTableTypesRoot(
+      final ResultSet data, final BufferAllocator allocator) throws SQLException {
     return getRoot(data, allocator, "table_type", "TABLE_TYPE");
   }
 
-  private static VectorSchemaRoot getCatalogsRoot(final ResultSet data, final BufferAllocator allocator)
-      throws SQLException {
+  private static VectorSchemaRoot getCatalogsRoot(
+      final ResultSet data, final BufferAllocator allocator) throws SQLException {
     return getRoot(data, allocator, "catalog_name", "TABLE_CATALOG");
   }
 
-  private static VectorSchemaRoot getRoot(final ResultSet data, final BufferAllocator allocator,
-                                          final String fieldVectorName, final String columnName)
+  private static VectorSchemaRoot getRoot(
+      final ResultSet data,
+      final BufferAllocator allocator,
+      final String fieldVectorName,
+      final String columnName)
       throws SQLException {
     final VarCharVector dataVector =
-        new VarCharVector(fieldVectorName, FieldType.notNullable(MinorType.VARCHAR.getType()), allocator);
+        new VarCharVector(
+            fieldVectorName, FieldType.notNullable(MinorType.VARCHAR.getType()), allocator);
     saveToVectors(ImmutableMap.of(dataVector, columnName), data);
     final int rows = dataVector.getValueCount();
     dataVector.setValueCount(rows);
     return new VectorSchemaRoot(singletonList(dataVector));
   }
 
-  private static VectorSchemaRoot getTypeInfoRoot(CommandGetXdbcTypeInfo request, ResultSet typeInfo,
-                                                  final BufferAllocator allocator)
+  private static VectorSchemaRoot getTypeInfoRoot(
+      CommandGetXdbcTypeInfo request, ResultSet typeInfo, final BufferAllocator allocator)
       throws SQLException {
     Preconditions.checkNotNull(allocator, "BufferAllocator cannot be null.");
 
@@ -506,13 +563,14 @@ private static VectorSchemaRoot getTypeInfoRoot(CommandGetXdbcTypeInfo request,
 
     Predicate<ResultSet> predicate;
     if (request.hasDataType()) {
-      predicate = (resultSet) -> {
-        try {
-          return resultSet.getInt("DATA_TYPE") == request.getDataType();
-        } catch (SQLException e) {
-          throw new RuntimeException(e);
-        }
-      };
+      predicate =
+          (resultSet) -> {
+            try {
+              return resultSet.getInt("DATA_TYPE") == request.getDataType();
+            } catch (SQLException e) {
+              throw new RuntimeException(e);
+            }
+          };
     } else {
       predicate = resultSet -> true;
     }
@@ -523,13 +581,14 @@ private static VectorSchemaRoot getTypeInfoRoot(CommandGetXdbcTypeInfo request,
     return root;
   }
 
-  private static VectorSchemaRoot getTablesRoot(final DatabaseMetaData databaseMetaData,
-                                                final BufferAllocator allocator,
-                                                final boolean includeSchema,
-                                                final String catalog,
-                                                final String schemaFilterPattern,
-                                                final String tableFilterPattern,
-                                                final String... tableTypes)
+  private static VectorSchemaRoot getTablesRoot(
+      final DatabaseMetaData databaseMetaData,
+      final BufferAllocator allocator,
+      final boolean includeSchema,
+      final String catalog,
+      final String schemaFilterPattern,
+      final String tableFilterPattern,
+      final String... tableTypes)
       throws SQLException, IOException {
     /*
      * TODO Fix DerbyDB inconsistency if possible.
@@ -545,9 +604,11 @@ private static VectorSchemaRoot getTablesRoot(final DatabaseMetaData databaseMet
     final VarCharVector catalogNameVector = new VarCharVector("catalog_name", allocator);
     final VarCharVector schemaNameVector = new VarCharVector("db_schema_name", allocator);
     final VarCharVector tableNameVector =
-        new VarCharVector("table_name", FieldType.notNullable(MinorType.VARCHAR.getType()), allocator);
+        new VarCharVector(
+            "table_name", FieldType.notNullable(MinorType.VARCHAR.getType()), allocator);
     final VarCharVector tableTypeVector =
-        new VarCharVector("table_type", FieldType.notNullable(MinorType.VARCHAR.getType()), allocator);
+        new VarCharVector(
+            "table_type", FieldType.notNullable(MinorType.VARCHAR.getType()), allocator);
 
     final List<FieldVector> vectors = new ArrayList<>(4);
     vectors.add(catalogNameVector);
@@ -557,30 +618,35 @@ private static VectorSchemaRoot getTablesRoot(final DatabaseMetaData databaseMet
 
     vectors.forEach(FieldVector::allocateNew);
 
-    final Map<FieldVector, String> vectorToColumnName = ImmutableMap.of(
-        catalogNameVector, "TABLE_CAT",
-        schemaNameVector, "TABLE_SCHEM",
-        tableNameVector, "TABLE_NAME",
-        tableTypeVector, "TABLE_TYPE");
+    final Map<FieldVector, String> vectorToColumnName =
+        ImmutableMap.of(
+            catalogNameVector, "TABLE_CAT",
+            schemaNameVector, "TABLE_SCHEM",
+            tableNameVector, "TABLE_NAME",
+            tableTypeVector, "TABLE_TYPE");
 
     try (final ResultSet data =
-             Objects.requireNonNull(
-                     databaseMetaData,
-                     format("%s cannot be null.", databaseMetaData.getClass().getName()))
-                 .getTables(catalog, schemaFilterPattern, tableFilterPattern, tableTypes)) {
+        Objects.requireNonNull(
+                databaseMetaData,
+                format("%s cannot be null.", databaseMetaData.getClass().getName()))
+            .getTables(catalog, schemaFilterPattern, tableFilterPattern, tableTypes)) {
 
       saveToVectors(vectorToColumnName, data, true);
       final int rows =
-          vectors.stream().map(FieldVector::getValueCount).findAny().orElseThrow(IllegalStateException::new);
+          vectors.stream()
+              .map(FieldVector::getValueCount)
+              .findAny()
+              .orElseThrow(IllegalStateException::new);
       vectors.forEach(vector -> vector.setValueCount(rows));
 
       if (includeSchema) {
         final VarBinaryVector tableSchemaVector =
-            new VarBinaryVector("table_schema", FieldType.notNullable(MinorType.VARBINARY.getType()), allocator);
+            new VarBinaryVector(
+                "table_schema", FieldType.notNullable(MinorType.VARBINARY.getType()), allocator);
         tableSchemaVector.allocateNew(rows);
 
         try (final ResultSet columnsData =
-                 databaseMetaData.getColumns(catalog, schemaFilterPattern, tableFilterPattern, null)) {
+            databaseMetaData.getColumns(catalog, schemaFilterPattern, tableFilterPattern, null)) {
           final Map<String, List<Field>> tableToFields = new HashMap<>();
 
           while (columnsData.next()) {
@@ -590,23 +656,26 @@ private static VectorSchemaRoot getTablesRoot(final DatabaseMetaData databaseMet
             final String typeName = columnsData.getString("TYPE_NAME");
             final String fieldName = columnsData.getString("COLUMN_NAME");
             final int dataType = columnsData.getInt("DATA_TYPE");
-            final boolean isNullable = columnsData.getInt("NULLABLE") != DatabaseMetaData.columnNoNulls;
+            final boolean isNullable =
+                columnsData.getInt("NULLABLE") != DatabaseMetaData.columnNoNulls;
             final int precision = columnsData.getInt("COLUMN_SIZE");
             final int scale = columnsData.getInt("DECIMAL_DIGITS");
             boolean isAutoIncrement =
                 Objects.equals(columnsData.getString("IS_AUTOINCREMENT"), "YES");
 
-            final List<Field> fields = tableToFields.computeIfAbsent(tableName, tableName_ -> new ArrayList<>());
+            final List<Field> fields =
+                tableToFields.computeIfAbsent(tableName, tableName_ -> new ArrayList<>());
 
-            final FlightSqlColumnMetadata columnMetadata = new FlightSqlColumnMetadata.Builder()
-                .catalogName(catalogName)
-                .schemaName(schemaName)
-                .tableName(tableName)
-                .typeName(typeName)
-                .precision(precision)
-                .scale(scale)
-                .isAutoIncrement(isAutoIncrement)
-                .build();
+            final FlightSqlColumnMetadata columnMetadata =
+                new FlightSqlColumnMetadata.Builder()
+                    .catalogName(catalogName)
+                    .schemaName(schemaName)
+                    .tableName(tableName)
+                    .typeName(typeName)
+                    .precision(precision)
+                    .scale(scale)
+                    .isAutoIncrement(isAutoIncrement)
+                    .build();
 
             final Field field =
                 new Field(
@@ -624,8 +693,7 @@ private static VectorSchemaRoot getTablesRoot(final DatabaseMetaData databaseMet
             final String tableName = tableNameVector.getObject(index).toString();
             final Schema schema = new Schema(tableToFields.get(tableName));
             saveToVector(
-                copyFrom(serializeMetadata(schema)).toByteArray(),
-                tableSchemaVector, index);
+                copyFrom(serializeMetadata(schema)).toByteArray(), tableSchemaVector, index);
           }
         }
 
@@ -649,15 +717,19 @@ private static ByteBuffer serializeMetadata(final Schema schema) {
   }
 
   @Override
-  public void getStreamPreparedStatement(final CommandPreparedStatementQuery command, final CallContext context,
-                                         final ServerStreamListener listener) {
+  public void getStreamPreparedStatement(
+      final CommandPreparedStatementQuery command,
+      final CallContext context,
+      final ServerStreamListener listener) {
     final ByteString handle = command.getPreparedStatementHandle();
-    StatementContext<PreparedStatement> statementContext = preparedStatementLoadingCache.getIfPresent(handle);
+    StatementContext<PreparedStatement> statementContext =
+        preparedStatementLoadingCache.getIfPresent(handle);
     Objects.requireNonNull(statementContext);
     final PreparedStatement statement = statementContext.getStatement();
     try (final ResultSet resultSet = statement.executeQuery()) {
       final Schema schema = jdbcToArrowSchema(resultSet.getMetaData(), DEFAULT_CALENDAR);
-      try (final VectorSchemaRoot vectorSchemaRoot = VectorSchemaRoot.create(schema, rootAllocator)) {
+      try (final VectorSchemaRoot vectorSchemaRoot =
+          VectorSchemaRoot.create(schema, rootAllocator)) {
         final VectorLoader loader = new VectorLoader(vectorSchemaRoot);
         listener.start(vectorSchemaRoot);
 
@@ -677,60 +749,68 @@ public void getStreamPreparedStatement(final CommandPreparedStatementQuery comma
       }
     } catch (final SQLException | IOException e) {
       LOGGER.error(format("Failed to getStreamPreparedStatement: <%s>.", e.getMessage()), e);
-      listener.error(CallStatus.INTERNAL.withDescription("Failed to prepare statement: " + e).toRuntimeException());
+      listener.error(
+          CallStatus.INTERNAL
+              .withDescription("Failed to prepare statement: " + e)
+              .toRuntimeException());
     } finally {
       listener.completed();
     }
   }
 
   @Override
-  public void closePreparedStatement(final ActionClosePreparedStatementRequest request, final CallContext context,
-                                     final StreamListener<Result> listener) {
+  public void closePreparedStatement(
+      final ActionClosePreparedStatementRequest request,
+      final CallContext context,
+      final StreamListener<Result> listener) {
     // Running on another thread
-    Future<?> unused = executorService.submit(() -> {
-      try {
-        preparedStatementLoadingCache.invalidate(request.getPreparedStatementHandle());
-      } catch (final Exception e) {
-        listener.onError(e);
-        return;
-      }
-      listener.onCompleted();
-    });
+    Future<?> unused =
+        executorService.submit(
+            () -> {
+              try {
+                preparedStatementLoadingCache.invalidate(request.getPreparedStatementHandle());
+              } catch (final Exception e) {
+                listener.onError(e);
+                return;
+              }
+              listener.onCompleted();
+            });
   }
 
   @Override
-  public FlightInfo getFlightInfoStatement(final CommandStatementQuery request, final CallContext context,
-                                           final FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoStatement(
+      final CommandStatementQuery request,
+      final CallContext context,
+      final FlightDescriptor descriptor) {
     ByteString handle = copyFrom(randomUUID().toString().getBytes(StandardCharsets.UTF_8));
 
     try {
       // Ownership of the connection will be passed to the context. Do NOT close!
       final Connection connection = dataSource.getConnection();
-      final Statement statement = connection.createStatement(
-          ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
+      final Statement statement =
+          connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
       final String query = request.getQuery();
       final StatementContext<Statement> statementContext = new StatementContext<>(statement, query);
 
       statementLoadingCache.put(handle, statementContext);
       final ResultSet resultSet = statement.executeQuery(query);
 
-      TicketStatementQuery ticket = TicketStatementQuery.newBuilder()
-          .setStatementHandle(handle)
-          .build();
-      return getFlightInfoForSchema(ticket, descriptor,
-          jdbcToArrowSchema(resultSet.getMetaData(), DEFAULT_CALENDAR));
+      TicketStatementQuery ticket =
+          TicketStatementQuery.newBuilder().setStatementHandle(handle).build();
+      return getFlightInfoForSchema(
+          ticket, descriptor, jdbcToArrowSchema(resultSet.getMetaData(), DEFAULT_CALENDAR));
     } catch (final SQLException e) {
       LOGGER.error(
-          format("There was a problem executing the prepared statement: <%s>.", e.getMessage()),
-          e);
+          format("There was a problem executing the prepared statement: <%s>.", e.getMessage()), e);
       throw CallStatus.INTERNAL.withCause(e).toRuntimeException();
     }
   }
 
   @Override
-  public FlightInfo getFlightInfoPreparedStatement(final CommandPreparedStatementQuery command,
-                                                   final CallContext context,
-                                                   final FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoPreparedStatement(
+      final CommandPreparedStatementQuery command,
+      final CallContext context,
+      final FlightDescriptor descriptor) {
     final ByteString preparedStatementHandle = command.getPreparedStatementHandle();
     StatementContext<PreparedStatement> statementContext =
         preparedStatementLoadingCache.getIfPresent(preparedStatementHandle);
@@ -739,19 +819,20 @@ public FlightInfo getFlightInfoPreparedStatement(final CommandPreparedStatementQ
       PreparedStatement statement = statementContext.getStatement();
 
       ResultSetMetaData metaData = statement.getMetaData();
-      return getFlightInfoForSchema(command, descriptor,
-          jdbcToArrowSchema(metaData, DEFAULT_CALENDAR));
+      return getFlightInfoForSchema(
+          command, descriptor, jdbcToArrowSchema(metaData, DEFAULT_CALENDAR));
     } catch (final SQLException e) {
       LOGGER.error(
-          format("There was a problem executing the prepared statement: <%s>.", e.getMessage()),
-          e);
+          format("There was a problem executing the prepared statement: <%s>.", e.getMessage()), e);
       throw CallStatus.INTERNAL.withCause(e).toRuntimeException();
     }
   }
 
   @Override
-  public SchemaResult getSchemaStatement(final CommandStatementQuery command, final CallContext context,
-                                         final FlightDescriptor descriptor) {
+  public SchemaResult getSchemaStatement(
+      final CommandStatementQuery command,
+      final CallContext context,
+      final FlightDescriptor descriptor) {
     throw CallStatus.UNIMPLEMENTED.toRuntimeException();
   }
 
@@ -767,52 +848,68 @@ public void close() throws Exception {
   }
 
   @Override
-  public void listFlights(CallContext context, Criteria criteria, StreamListener<FlightInfo> listener) {
+  public void listFlights(
+      CallContext context, Criteria criteria, StreamListener<FlightInfo> listener) {
     // TODO - build example implementation
     throw CallStatus.UNIMPLEMENTED.toRuntimeException();
   }
 
   @Override
-  public void createPreparedStatement(final ActionCreatePreparedStatementRequest request, final CallContext context,
-                                      final StreamListener<Result> listener) {
+  public void createPreparedStatement(
+      final ActionCreatePreparedStatementRequest request,
+      final CallContext context,
+      final StreamListener<Result> listener) {
     // Running on another thread
-    Future<?> unused = executorService.submit(() -> {
-      try {
-        final ByteString preparedStatementHandle = copyFrom(randomUUID().toString().getBytes(StandardCharsets.UTF_8));
-        // Ownership of the connection will be passed to the context. Do NOT close!
-        final Connection connection = dataSource.getConnection();
-        final PreparedStatement preparedStatement = connection.prepareStatement(request.getQuery(),
-            ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
-        final StatementContext<PreparedStatement> preparedStatementContext =
-            new StatementContext<>(preparedStatement, request.getQuery());
-
-        preparedStatementLoadingCache.put(preparedStatementHandle, preparedStatementContext);
-
-        final Schema parameterSchema =
-            jdbcToArrowSchema(preparedStatement.getParameterMetaData(), DEFAULT_CALENDAR);
-
-        final ResultSetMetaData metaData = preparedStatement.getMetaData();
-        final ByteString bytes = isNull(metaData) ?
-            ByteString.EMPTY :
-            ByteString.copyFrom(
-                serializeMetadata(jdbcToArrowSchema(metaData, DEFAULT_CALENDAR)));
-        final ActionCreatePreparedStatementResult result = ActionCreatePreparedStatementResult.newBuilder()
-            .setDatasetSchema(bytes)
-            .setParameterSchema(copyFrom(serializeMetadata(parameterSchema)))
-            .setPreparedStatementHandle(preparedStatementHandle)
-            .build();
-        listener.onNext(new Result(pack(result).toByteArray()));
-      } catch (final SQLException e) {
-        listener.onError(CallStatus.INTERNAL
-            .withDescription("Failed to create prepared statement: " + e)
-            .toRuntimeException());
-        return;
-      } catch (final Throwable t) {
-        listener.onError(CallStatus.INTERNAL.withDescription("Unknown error: " + t).toRuntimeException());
-        return;
-      }
-      listener.onCompleted();
-    });
+    Future<?> unused =
+        executorService.submit(
+            () -> {
+              try {
+                final ByteString preparedStatementHandle =
+                    copyFrom(request.getQuery().getBytes(StandardCharsets.UTF_8));
+                // Ownership of the connection will be passed to the context. Do NOT close!
+                final Connection connection = dataSource.getConnection();
+                final PreparedStatement preparedStatement =
+                    connection.prepareStatement(
+                        request.getQuery(),
+                        ResultSet.TYPE_SCROLL_INSENSITIVE,
+                        ResultSet.CONCUR_READ_ONLY);
+                final StatementContext<PreparedStatement> preparedStatementContext =
+                    new StatementContext<>(preparedStatement, request.getQuery());
+
+                preparedStatementLoadingCache.put(
+                    preparedStatementHandle, preparedStatementContext);
+
+                final Schema parameterSchema =
+                    jdbcToArrowSchema(preparedStatement.getParameterMetaData(), DEFAULT_CALENDAR);
+
+                final ResultSetMetaData metaData = preparedStatement.getMetaData();
+                final ByteString bytes =
+                    isNull(metaData)
+                        ? ByteString.EMPTY
+                        : ByteString.copyFrom(
+                            serializeMetadata(jdbcToArrowSchema(metaData, DEFAULT_CALENDAR)));
+                final ActionCreatePreparedStatementResult result =
+                    ActionCreatePreparedStatementResult.newBuilder()
+                        .setDatasetSchema(bytes)
+                        .setParameterSchema(copyFrom(serializeMetadata(parameterSchema)))
+                        .setPreparedStatementHandle(preparedStatementHandle)
+                        .build();
+                listener.onNext(new Result(pack(result).toByteArray()));
+              } catch (final SQLException e) {
+                listener.onError(
+                    CallStatus.INTERNAL
+                        .withDescription("Failed to create prepared statement: " + e)
+                        .toRuntimeException());
+                return;
+              } catch (final Throwable t) {
+                listener.onError(
+                    CallStatus.INTERNAL
+                        .withDescription("Unknown error: " + t)
+                        .toRuntimeException());
+                return;
+              }
+              listener.onCompleted();
+            });
   }
 
   @Override
@@ -822,14 +919,16 @@ public void doExchange(CallContext context, FlightStream reader, ServerStreamLis
   }
 
   @Override
-  public Runnable acceptPutStatement(CommandStatementUpdate command,
-                                     CallContext context, FlightStream flightStream,
-                                     StreamListener<PutResult> ackStream) {
+  public Runnable acceptPutStatement(
+      CommandStatementUpdate command,
+      CallContext context,
+      FlightStream flightStream,
+      StreamListener<PutResult> ackStream) {
     final String query = command.getQuery();
 
     return () -> {
       try (final Connection connection = dataSource.getConnection();
-           final Statement statement = connection.createStatement()) {
+          final Statement statement = connection.createStatement()) {
         final int result = statement.executeUpdate(query);
 
         final DoPutUpdateResult build =
@@ -841,28 +940,34 @@ public Runnable acceptPutStatement(CommandStatementUpdate command,
           ackStream.onCompleted();
         }
       } catch (SQLSyntaxErrorException e) {
-        ackStream.onError(CallStatus.INVALID_ARGUMENT
-            .withDescription("Failed to execute statement (invalid syntax): " + e)
-            .toRuntimeException());
+        ackStream.onError(
+            CallStatus.INVALID_ARGUMENT
+                .withDescription("Failed to execute statement (invalid syntax): " + e)
+                .toRuntimeException());
       } catch (SQLException e) {
-        ackStream.onError(CallStatus.INTERNAL
-            .withDescription("Failed to execute statement: " + e)
-            .toRuntimeException());
+        ackStream.onError(
+            CallStatus.INTERNAL
+                .withDescription("Failed to execute statement: " + e)
+                .toRuntimeException());
       }
     };
   }
 
   @Override
-  public Runnable acceptPutPreparedStatementUpdate(CommandPreparedStatementUpdate command, CallContext context,
-                                                   FlightStream flightStream, StreamListener<PutResult> ackStream) {
+  public Runnable acceptPutPreparedStatementUpdate(
+      CommandPreparedStatementUpdate command,
+      CallContext context,
+      FlightStream flightStream,
+      StreamListener<PutResult> ackStream) {
     final StatementContext<PreparedStatement> statement =
         preparedStatementLoadingCache.getIfPresent(command.getPreparedStatementHandle());
 
     return () -> {
       if (statement == null) {
-        ackStream.onError(CallStatus.NOT_FOUND
-            .withDescription("Prepared statement does not exist")
-            .toRuntimeException());
+        ackStream.onError(
+            CallStatus.NOT_FOUND
+                .withDescription("Prepared statement does not exist")
+                .toRuntimeException());
         return;
       }
       try {
@@ -878,11 +983,12 @@ public Runnable acceptPutPreparedStatementUpdate(CommandPreparedStatementUpdate
             preparedStatement.execute();
             recordCount = preparedStatement.getUpdateCount();
           } else {
-            final JdbcParameterBinder binder = JdbcParameterBinder.builder(preparedStatement, root).bindAll().build();
+            final JdbcParameterBinder binder =
+                JdbcParameterBinder.builder(preparedStatement, root).bindAll().build();
             while (binder.next()) {
               preparedStatement.addBatch();
             }
-            int[] recordCounts = preparedStatement.executeBatch();
+            final int[] recordCounts = preparedStatement.executeBatch();
             recordCount = Arrays.stream(recordCounts).sum();
           }
 
@@ -895,7 +1001,10 @@ public Runnable acceptPutPreparedStatementUpdate(CommandPreparedStatementUpdate
           }
         }
       } catch (SQLException e) {
-        ackStream.onError(CallStatus.INTERNAL.withDescription("Failed to execute update: " + e).toRuntimeException());
+        ackStream.onError(
+            CallStatus.INTERNAL
+                .withDescription("Failed to execute update: " + e)
+                .toRuntimeException());
         return;
       }
       ackStream.onCompleted();
@@ -903,8 +1012,11 @@ public Runnable acceptPutPreparedStatementUpdate(CommandPreparedStatementUpdate
   }
 
   @Override
-  public Runnable acceptPutPreparedStatementQuery(CommandPreparedStatementQuery command, CallContext context,
-                                                  FlightStream flightStream, StreamListener<PutResult> ackStream) {
+  public Runnable acceptPutPreparedStatementQuery(
+      CommandPreparedStatementQuery command,
+      CallContext context,
+      FlightStream flightStream,
+      StreamListener<PutResult> ackStream) {
     final StatementContext<PreparedStatement> statementContext =
         preparedStatementLoadingCache.getIfPresent(command.getPreparedStatementHandle());
 
@@ -915,47 +1027,55 @@ public Runnable acceptPutPreparedStatementQuery(CommandPreparedStatementQuery co
       try {
         while (flightStream.next()) {
           final VectorSchemaRoot root = flightStream.getRoot();
-          final JdbcParameterBinder binder = JdbcParameterBinder.builder(preparedStatement, root).bindAll().build();
+          final JdbcParameterBinder binder =
+              JdbcParameterBinder.builder(preparedStatement, root).bindAll().build();
           while (binder.next()) {
             // Do not execute() - will be done in a getStream call
           }
         }
 
       } catch (SQLException e) {
-        ackStream.onError(CallStatus.INTERNAL
-            .withDescription("Failed to bind parameters: " + e.getMessage())
-            .withCause(e)
-            .toRuntimeException());
+        ackStream.onError(
+            CallStatus.INTERNAL
+                .withDescription("Failed to bind parameters: " + e.getMessage())
+                .withCause(e)
+                .toRuntimeException());
         return;
       }
+
       ackStream.onCompleted();
     };
   }
 
   @Override
-  public FlightInfo getFlightInfoSqlInfo(final CommandGetSqlInfo request, final CallContext context,
-                                         final FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoSqlInfo(
+      final CommandGetSqlInfo request,
+      final CallContext context,
+      final FlightDescriptor descriptor) {
     return getFlightInfoForSchema(request, descriptor, Schemas.GET_SQL_INFO_SCHEMA);
   }
 
   @Override
-  public void getStreamSqlInfo(final CommandGetSqlInfo command, final CallContext context,
-                               final ServerStreamListener listener) {
+  public void getStreamSqlInfo(
+      final CommandGetSqlInfo command,
+      final CallContext context,
+      final ServerStreamListener listener) {
     this.sqlInfoBuilder.send(command.getInfoList(), listener);
   }
 
   @Override
-  public FlightInfo getFlightInfoTypeInfo(CommandGetXdbcTypeInfo request, CallContext context,
-                                          FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoTypeInfo(
+      CommandGetXdbcTypeInfo request, CallContext context, FlightDescriptor descriptor) {
     return getFlightInfoForSchema(request, descriptor, Schemas.GET_TYPE_INFO_SCHEMA);
   }
 
   @Override
-  public void getStreamTypeInfo(CommandGetXdbcTypeInfo request, CallContext context,
-                                ServerStreamListener listener) {
+  public void getStreamTypeInfo(
+      CommandGetXdbcTypeInfo request, CallContext context, ServerStreamListener listener) {
     try (final Connection connection = dataSource.getConnection();
-         final ResultSet typeInfo = connection.getMetaData().getTypeInfo();
-         final VectorSchemaRoot vectorSchemaRoot = getTypeInfoRoot(request, typeInfo, rootAllocator)) {
+        final ResultSet typeInfo = connection.getMetaData().getTypeInfo();
+        final VectorSchemaRoot vectorSchemaRoot =
+            getTypeInfoRoot(request, typeInfo, rootAllocator)) {
       listener.start(vectorSchemaRoot);
       listener.putNext();
     } catch (SQLException e) {
@@ -967,16 +1087,18 @@ public void getStreamTypeInfo(CommandGetXdbcTypeInfo request, CallContext contex
   }
 
   @Override
-  public FlightInfo getFlightInfoCatalogs(final CommandGetCatalogs request, final CallContext context,
-                                          final FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoCatalogs(
+      final CommandGetCatalogs request,
+      final CallContext context,
+      final FlightDescriptor descriptor) {
     return getFlightInfoForSchema(request, descriptor, Schemas.GET_CATALOGS_SCHEMA);
   }
 
   @Override
   public void getStreamCatalogs(final CallContext context, final ServerStreamListener listener) {
     try (final Connection connection = dataSource.getConnection();
-         final ResultSet catalogs = connection.getMetaData().getCatalogs();
-         final VectorSchemaRoot vectorSchemaRoot = getCatalogsRoot(catalogs, rootAllocator)) {
+        final ResultSet catalogs = connection.getMetaData().getCatalogs();
+        final VectorSchemaRoot vectorSchemaRoot = getCatalogsRoot(catalogs, rootAllocator)) {
       listener.start(vectorSchemaRoot);
       listener.putNext();
     } catch (SQLException e) {
@@ -988,19 +1110,25 @@ public void getStreamCatalogs(final CallContext context, final ServerStreamListe
   }
 
   @Override
-  public FlightInfo getFlightInfoSchemas(final CommandGetDbSchemas request, final CallContext context,
-                                         final FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoSchemas(
+      final CommandGetDbSchemas request,
+      final CallContext context,
+      final FlightDescriptor descriptor) {
     return getFlightInfoForSchema(request, descriptor, Schemas.GET_SCHEMAS_SCHEMA);
   }
 
   @Override
-  public void getStreamSchemas(final CommandGetDbSchemas command, final CallContext context,
-                               final ServerStreamListener listener) {
+  public void getStreamSchemas(
+      final CommandGetDbSchemas command,
+      final CallContext context,
+      final ServerStreamListener listener) {
     final String catalog = command.hasCatalog() ? command.getCatalog() : null;
-    final String schemaFilterPattern = command.hasDbSchemaFilterPattern() ? command.getDbSchemaFilterPattern() : null;
+    final String schemaFilterPattern =
+        command.hasDbSchemaFilterPattern() ? command.getDbSchemaFilterPattern() : null;
     try (final Connection connection = dataSource.getConnection();
-         final ResultSet schemas = connection.getMetaData().getSchemas(catalog, schemaFilterPattern);
-         final VectorSchemaRoot vectorSchemaRoot = getSchemasRoot(schemas, rootAllocator)) {
+        final ResultSet schemas =
+            connection.getMetaData().getSchemas(catalog, schemaFilterPattern);
+        final VectorSchemaRoot vectorSchemaRoot = getSchemasRoot(schemas, rootAllocator)) {
       listener.start(vectorSchemaRoot);
       listener.putNext();
     } catch (SQLException e) {
@@ -1012,8 +1140,10 @@ public void getStreamSchemas(final CommandGetDbSchemas command, final CallContex
   }
 
   @Override
-  public FlightInfo getFlightInfoTables(final CommandGetTables request, final CallContext context,
-                                        final FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoTables(
+      final CommandGetTables request,
+      final CallContext context,
+      final FlightDescriptor descriptor) {
     Schema schemaToUse = Schemas.GET_TABLES_SCHEMA;
     if (!request.getIncludeSchema()) {
       schemaToUse = Schemas.GET_TABLES_SCHEMA_NO_SCHEMA;
@@ -1022,8 +1152,10 @@ public FlightInfo getFlightInfoTables(final CommandGetTables request, final Call
   }
 
   @Override
-  public void getStreamTables(final CommandGetTables command, final CallContext context,
-                              final ServerStreamListener listener) {
+  public void getStreamTables(
+      final CommandGetTables command,
+      final CallContext context,
+      final ServerStreamListener listener) {
     final String catalog = command.hasCatalog() ? command.getCatalog() : null;
     final String schemaFilterPattern =
         command.hasDbSchemaFilterPattern() ? command.getDbSchemaFilterPattern() : null;
@@ -1035,12 +1167,16 @@ public void getStreamTables(final CommandGetTables command, final CallContext co
     final String[] tableTypes =
         protocolSize == 0 ? null : protocolStringList.toArray(new String[protocolSize]);
 
-    try (final Connection connection = DriverManager.getConnection(DATABASE_URI);
-         final VectorSchemaRoot vectorSchemaRoot = getTablesRoot(
-             connection.getMetaData(),
-             rootAllocator,
-             command.getIncludeSchema(),
-             catalog, schemaFilterPattern, tableFilterPattern, tableTypes)) {
+    try (final Connection connection = DriverManager.getConnection(databaseUri);
+        final VectorSchemaRoot vectorSchemaRoot =
+            getTablesRoot(
+                connection.getMetaData(),
+                rootAllocator,
+                command.getIncludeSchema(),
+                catalog,
+                schemaFilterPattern,
+                tableFilterPattern,
+                tableTypes)) {
       listener.start(vectorSchemaRoot);
       listener.putNext();
     } catch (SQLException | IOException e) {
@@ -1052,16 +1188,18 @@ public void getStreamTables(final CommandGetTables command, final CallContext co
   }
 
   @Override
-  public FlightInfo getFlightInfoTableTypes(final CommandGetTableTypes request, final CallContext context,
-                                            final FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoTableTypes(
+      final CommandGetTableTypes request,
+      final CallContext context,
+      final FlightDescriptor descriptor) {
     return getFlightInfoForSchema(request, descriptor, Schemas.GET_TABLE_TYPES_SCHEMA);
   }
 
   @Override
   public void getStreamTableTypes(final CallContext context, final ServerStreamListener listener) {
     try (final Connection connection = dataSource.getConnection();
-         final ResultSet tableTypes = connection.getMetaData().getTableTypes();
-         final VectorSchemaRoot vectorSchemaRoot = getTableTypesRoot(tableTypes, rootAllocator)) {
+        final ResultSet tableTypes = connection.getMetaData().getTableTypes();
+        final VectorSchemaRoot vectorSchemaRoot = getTableTypesRoot(tableTypes, rootAllocator)) {
       listener.start(vectorSchemaRoot);
       listener.putNext();
     } catch (SQLException e) {
@@ -1073,20 +1211,24 @@ public void getStreamTableTypes(final CallContext context, final ServerStreamLis
   }
 
   @Override
-  public FlightInfo getFlightInfoPrimaryKeys(final CommandGetPrimaryKeys request, final CallContext context,
-                                             final FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoPrimaryKeys(
+      final CommandGetPrimaryKeys request,
+      final CallContext context,
+      final FlightDescriptor descriptor) {
     return getFlightInfoForSchema(request, descriptor, Schemas.GET_PRIMARY_KEYS_SCHEMA);
   }
 
   @Override
-  public void getStreamPrimaryKeys(final CommandGetPrimaryKeys command, final CallContext context,
-                                   final ServerStreamListener listener) {
+  public void getStreamPrimaryKeys(
+      final CommandGetPrimaryKeys command,
+      final CallContext context,
+      final ServerStreamListener listener) {
 
     final String catalog = command.hasCatalog() ? command.getCatalog() : null;
     final String schema = command.hasDbSchema() ? command.getDbSchema() : null;
     final String table = command.getTable();
 
-    try (Connection connection = DriverManager.getConnection(DATABASE_URI)) {
+    try (Connection connection = DriverManager.getConnection(databaseUri)) {
       final ResultSet primaryKeys = connection.getMetaData().getPrimaryKeys(catalog, schema, table);
 
       final VarCharVector catalogNameVector = new VarCharVector("catalog_name", rootAllocator);
@@ -1099,7 +1241,11 @@ public void getStreamPrimaryKeys(final CommandGetPrimaryKeys command, final Call
       final List<FieldVector> vectors =
           new ArrayList<>(
               ImmutableList.of(
-                  catalogNameVector, schemaNameVector, tableNameVector, columnNameVector, keySequenceVector,
+                  catalogNameVector,
+                  schemaNameVector,
+                  tableNameVector,
+                  columnNameVector,
+                  keySequenceVector,
                   keyNameVector));
       vectors.forEach(FieldVector::allocateNew);
 
@@ -1128,21 +1274,25 @@ public void getStreamPrimaryKeys(final CommandGetPrimaryKeys command, final Call
   }
 
   @Override
-  public FlightInfo getFlightInfoExportedKeys(final CommandGetExportedKeys request, final CallContext context,
-                                              final FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoExportedKeys(
+      final CommandGetExportedKeys request,
+      final CallContext context,
+      final FlightDescriptor descriptor) {
     return getFlightInfoForSchema(request, descriptor, Schemas.GET_EXPORTED_KEYS_SCHEMA);
   }
 
   @Override
-  public void getStreamExportedKeys(final CommandGetExportedKeys command, final CallContext context,
-                                    final ServerStreamListener listener) {
+  public void getStreamExportedKeys(
+      final CommandGetExportedKeys command,
+      final CallContext context,
+      final ServerStreamListener listener) {
     String catalog = command.hasCatalog() ? command.getCatalog() : null;
     String schema = command.hasDbSchema() ? command.getDbSchema() : null;
     String table = command.getTable();
 
-    try (Connection connection = DriverManager.getConnection(DATABASE_URI);
-         ResultSet keys = connection.getMetaData().getExportedKeys(catalog, schema, table);
-         VectorSchemaRoot vectorSchemaRoot = createVectors(keys)) {
+    try (Connection connection = DriverManager.getConnection(databaseUri);
+        ResultSet keys = connection.getMetaData().getExportedKeys(catalog, schema, table);
+        VectorSchemaRoot vectorSchemaRoot = createVectors(keys)) {
       listener.start(vectorSchemaRoot);
       listener.putNext();
     } catch (SQLException e) {
@@ -1153,21 +1303,25 @@ public void getStreamExportedKeys(final CommandGetExportedKeys command, final Ca
   }
 
   @Override
-  public FlightInfo getFlightInfoImportedKeys(final CommandGetImportedKeys request, final CallContext context,
-                                              final FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoImportedKeys(
+      final CommandGetImportedKeys request,
+      final CallContext context,
+      final FlightDescriptor descriptor) {
     return getFlightInfoForSchema(request, descriptor, Schemas.GET_IMPORTED_KEYS_SCHEMA);
   }
 
   @Override
-  public void getStreamImportedKeys(final CommandGetImportedKeys command, final CallContext context,
-                                    final ServerStreamListener listener) {
+  public void getStreamImportedKeys(
+      final CommandGetImportedKeys command,
+      final CallContext context,
+      final ServerStreamListener listener) {
     String catalog = command.hasCatalog() ? command.getCatalog() : null;
     String schema = command.hasDbSchema() ? command.getDbSchema() : null;
     String table = command.getTable();
 
-    try (Connection connection = DriverManager.getConnection(DATABASE_URI);
-         ResultSet keys = connection.getMetaData().getImportedKeys(catalog, schema, table);
-         VectorSchemaRoot vectorSchemaRoot = createVectors(keys)) {
+    try (Connection connection = DriverManager.getConnection(databaseUri);
+        ResultSet keys = connection.getMetaData().getImportedKeys(catalog, schema, table);
+        VectorSchemaRoot vectorSchemaRoot = createVectors(keys)) {
       listener.start(vectorSchemaRoot);
       listener.putNext();
     } catch (final SQLException e) {
@@ -1178,14 +1332,14 @@ public void getStreamImportedKeys(final CommandGetImportedKeys command, final Ca
   }
 
   @Override
-  public FlightInfo getFlightInfoCrossReference(CommandGetCrossReference request, CallContext context,
-                                                FlightDescriptor descriptor) {
+  public FlightInfo getFlightInfoCrossReference(
+      CommandGetCrossReference request, CallContext context, FlightDescriptor descriptor) {
     return getFlightInfoForSchema(request, descriptor, Schemas.GET_CROSS_REFERENCE_SCHEMA);
   }
 
   @Override
-  public void getStreamCrossReference(CommandGetCrossReference command, CallContext context,
-                                      ServerStreamListener listener) {
+  public void getStreamCrossReference(
+      CommandGetCrossReference command, CallContext context, ServerStreamListener listener) {
     final String pkCatalog = command.hasPkCatalog() ? command.getPkCatalog() : null;
     final String pkSchema = command.hasPkDbSchema() ? command.getPkDbSchema() : null;
     final String fkCatalog = command.hasFkCatalog() ? command.getFkCatalog() : null;
@@ -1193,10 +1347,12 @@ public void getStreamCrossReference(CommandGetCrossReference command, CallContex
     final String pkTable = command.getPkTable();
     final String fkTable = command.getFkTable();
 
-    try (Connection connection = DriverManager.getConnection(DATABASE_URI);
-         ResultSet keys = connection.getMetaData()
-             .getCrossReference(pkCatalog, pkSchema, pkTable, fkCatalog, fkSchema, fkTable);
-         VectorSchemaRoot vectorSchemaRoot = createVectors(keys)) {
+    try (Connection connection = DriverManager.getConnection(databaseUri);
+        ResultSet keys =
+            connection
+                .getMetaData()
+                .getCrossReference(pkCatalog, pkSchema, pkTable, fkCatalog, fkSchema, fkTable);
+        VectorSchemaRoot vectorSchemaRoot = createVectors(keys)) {
       listener.start(vectorSchemaRoot);
       listener.putNext();
     } catch (final SQLException e) {
@@ -1236,10 +1392,21 @@ private VectorSchemaRoot createVectors(ResultSet keys) throws SQLException {
     vectorToColumnName.put(fkKeyNameVector, "FK_NAME");
     vectorToColumnName.put(pkKeyNameVector, "PK_NAME");
 
-    final VectorSchemaRoot vectorSchemaRoot = VectorSchemaRoot.of(
-        pkCatalogNameVector, pkSchemaNameVector, pkTableNameVector, pkColumnNameVector, fkCatalogNameVector,
-        fkSchemaNameVector, fkTableNameVector, fkColumnNameVector, keySequenceVector, fkKeyNameVector,
-        pkKeyNameVector, updateRuleVector, deleteRuleVector);
+    final VectorSchemaRoot vectorSchemaRoot =
+        VectorSchemaRoot.of(
+            pkCatalogNameVector,
+            pkSchemaNameVector,
+            pkTableNameVector,
+            pkColumnNameVector,
+            fkCatalogNameVector,
+            fkSchemaNameVector,
+            fkTableNameVector,
+            fkColumnNameVector,
+            keySequenceVector,
+            fkKeyNameVector,
+            pkKeyNameVector,
+            updateRuleVector,
+            deleteRuleVector);
 
     vectorSchemaRoot.allocateNew();
     final int rowCount = saveToVectors(vectorToColumnName, keys, true);
@@ -1250,8 +1417,10 @@ private VectorSchemaRoot createVectors(ResultSet keys) throws SQLException {
   }
 
   @Override
-  public void getStreamStatement(final TicketStatementQuery ticketStatementQuery, final CallContext context,
-                                 final ServerStreamListener listener) {
+  public void getStreamStatement(
+      final TicketStatementQuery ticketStatementQuery,
+      final CallContext context,
+      final ServerStreamListener listener) {
     final ByteString handle = ticketStatementQuery.getStatementHandle();
     final StatementContext<Statement> statementContext =
         Objects.requireNonNull(statementLoadingCache.getIfPresent(handle));
@@ -1280,8 +1449,8 @@ public void getStreamStatement(final TicketStatementQuery ticketStatementQuery,
     }
   }
 
-  private <T extends Message> FlightInfo getFlightInfoForSchema(final T request, final FlightDescriptor descriptor,
-                                                                final Schema schema) {
+  protected <T extends Message> FlightInfo getFlightInfoForSchema(
+      final T request, final FlightDescriptor descriptor, final Schema schema) {
     final Ticket ticket = new Ticket(pack(request).toByteArray());
     // TODO Support multiple endpoints.
     final List<FlightEndpoint> endpoints = singletonList(new FlightEndpoint(ticket, location));
diff --git a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/FlightSqlStatelessExample.java b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/FlightSqlStatelessExample.java
new file mode 100644
index 0000000000000..b281d8e52685b
--- /dev/null
+++ b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/FlightSqlStatelessExample.java
@@ -0,0 +1,256 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.flight.sql.example;
+
+import static java.lang.String.format;
+import static org.apache.arrow.adapter.jdbc.JdbcToArrow.sqlToArrowVectorIterator;
+import static org.apache.arrow.adapter.jdbc.JdbcToArrowUtils.jdbcToArrowSchema;
+import static org.apache.arrow.flight.sql.impl.FlightSql.*;
+import static org.slf4j.LoggerFactory.getLogger;
+
+import com.google.protobuf.ByteString;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.StreamCorruptedException;
+import java.nio.ByteBuffer;
+import java.nio.channels.Channels;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import org.apache.arrow.adapter.jdbc.ArrowVectorIterator;
+import org.apache.arrow.adapter.jdbc.JdbcParameterBinder;
+import org.apache.arrow.flight.CallStatus;
+import org.apache.arrow.flight.FlightDescriptor;
+import org.apache.arrow.flight.FlightInfo;
+import org.apache.arrow.flight.FlightStream;
+import org.apache.arrow.flight.Location;
+import org.apache.arrow.flight.PutResult;
+import org.apache.arrow.flight.sql.FlightSqlProducer;
+import org.apache.arrow.memory.ArrowBuf;
+import org.apache.arrow.vector.VectorLoader;
+import org.apache.arrow.vector.VectorSchemaRoot;
+import org.apache.arrow.vector.VectorUnloader;
+import org.apache.arrow.vector.ipc.ArrowFileReader;
+import org.apache.arrow.vector.ipc.ArrowFileWriter;
+import org.apache.arrow.vector.ipc.SeekableReadChannel;
+import org.apache.arrow.vector.ipc.message.ArrowBlock;
+import org.apache.arrow.vector.types.pojo.Schema;
+import org.apache.arrow.vector.util.ByteArrayReadableSeekableByteChannel;
+import org.slf4j.Logger;
+
+/**
+ * Example {@link FlightSqlProducer} implementation showing an Apache Derby backed Flight SQL server
+ * that generally supports all current features of Flight SQL.
+ */
+public class FlightSqlStatelessExample extends FlightSqlExample {
+  private static final Logger LOGGER = getLogger(FlightSqlStatelessExample.class);
+  public static final String DB_NAME = "derbyStatelessDB";
+
+  public FlightSqlStatelessExample(final Location location, final String dbName) {
+    super(location, dbName);
+  }
+
+  @Override
+  public Runnable acceptPutPreparedStatementQuery(
+      CommandPreparedStatementQuery command,
+      CallContext context,
+      FlightStream flightStream,
+      StreamListener<PutResult> ackStream) {
+
+    return () -> {
+      final String query = new String(command.getPreparedStatementHandle().toStringUtf8());
+      try (Connection connection = dataSource.getConnection();
+          PreparedStatement preparedStatement = createPreparedStatement(connection, query)) {
+        while (flightStream.next()) {
+          final VectorSchemaRoot root = flightStream.getRoot();
+          final JdbcParameterBinder binder =
+              JdbcParameterBinder.builder(preparedStatement, root).bindAll().build();
+          while (binder.next()) {
+            // Do not execute() - will be done in a getStream call
+          }
+
+          final ByteArrayOutputStream parametersStream = new ByteArrayOutputStream();
+          try (ArrowFileWriter writer =
+              new ArrowFileWriter(root, null, Channels.newChannel(parametersStream))) {
+            writer.start();
+            writer.writeBatch();
+          }
+
+          if (parametersStream.size() > 0) {
+            final DoPutPreparedStatementResultPOJO doPutPreparedStatementResultPOJO =
+                new DoPutPreparedStatementResultPOJO(query, parametersStream.toByteArray());
+
+            final byte[] doPutPreparedStatementResultPOJOArr =
+                serializePOJO(doPutPreparedStatementResultPOJO);
+            final DoPutPreparedStatementResult doPutPreparedStatementResult =
+                DoPutPreparedStatementResult.newBuilder()
+                    .setPreparedStatementHandle(
+                        ByteString.copyFrom(ByteBuffer.wrap(doPutPreparedStatementResultPOJOArr)))
+                    .build();
+
+            try (final ArrowBuf buffer =
+                rootAllocator.buffer(doPutPreparedStatementResult.getSerializedSize())) {
+              buffer.writeBytes(doPutPreparedStatementResult.toByteArray());
+              ackStream.onNext(PutResult.metadata(buffer));
+            }
+          }
+        }
+
+      } catch (SQLException | IOException e) {
+        ackStream.onError(
+            CallStatus.INTERNAL
+                .withDescription("Failed to bind parameters: " + e.getMessage())
+                .withCause(e)
+                .toRuntimeException());
+        return;
+      }
+
+      ackStream.onCompleted();
+    };
+  }
+
+  @Override
+  public void getStreamPreparedStatement(
+      final CommandPreparedStatementQuery command,
+      final CallContext context,
+      final ServerStreamListener listener) {
+    final byte[] handle = command.getPreparedStatementHandle().toByteArray();
+    try {
+      // Case where there are parameters
+      try {
+        final DoPutPreparedStatementResultPOJO doPutPreparedStatementResultPOJO =
+            deserializePOJO(handle);
+        final String query = doPutPreparedStatementResultPOJO.getQuery();
+
+        try (Connection connection = dataSource.getConnection();
+            PreparedStatement statement = createPreparedStatement(connection, query);
+            ArrowFileReader reader =
+                new ArrowFileReader(
+                    new SeekableReadChannel(
+                        new ByteArrayReadableSeekableByteChannel(
+                            doPutPreparedStatementResultPOJO.getParameters())),
+                    rootAllocator)) {
+
+          for (ArrowBlock arrowBlock : reader.getRecordBlocks()) {
+            reader.loadRecordBatch(arrowBlock);
+            VectorSchemaRoot vectorSchemaRootRecover = reader.getVectorSchemaRoot();
+            JdbcParameterBinder binder =
+                JdbcParameterBinder.builder(statement, vectorSchemaRootRecover).bindAll().build();
+
+            while (binder.next()) {
+              executeQuery(statement, listener);
+            }
+          }
+        }
+      } catch (StreamCorruptedException e) {
+        // Case where there are no parameters
+        final String query = new String(command.getPreparedStatementHandle().toStringUtf8());
+        try (Connection connection = dataSource.getConnection();
+            PreparedStatement preparedStatement = createPreparedStatement(connection, query)) {
+          executeQuery(preparedStatement, listener);
+        }
+      }
+    } catch (final SQLException | IOException | ClassNotFoundException e) {
+      LOGGER.error(format("Failed to getStreamPreparedStatement: <%s>.", e.getMessage()), e);
+      listener.error(
+          CallStatus.INTERNAL
+              .withDescription("Failed to prepare statement: " + e)
+              .toRuntimeException());
+    } finally {
+      listener.completed();
+    }
+  }
+
+  private void executeQuery(PreparedStatement statement, final ServerStreamListener listener)
+      throws IOException, SQLException {
+    try (final ResultSet resultSet = statement.executeQuery()) {
+      final Schema schema = jdbcToArrowSchema(resultSet.getMetaData(), DEFAULT_CALENDAR);
+      try (final VectorSchemaRoot vectorSchemaRoot =
+          VectorSchemaRoot.create(schema, rootAllocator)) {
+        final VectorLoader loader = new VectorLoader(vectorSchemaRoot);
+        listener.start(vectorSchemaRoot);
+
+        final ArrowVectorIterator iterator = sqlToArrowVectorIterator(resultSet, rootAllocator);
+        while (iterator.hasNext()) {
+          final VectorSchemaRoot batch = iterator.next();
+          if (batch.getRowCount() == 0) {
+            break;
+          }
+          final VectorUnloader unloader = new VectorUnloader(batch);
+          loader.load(unloader.getRecordBatch());
+          listener.putNext();
+          vectorSchemaRoot.clear();
+        }
+        listener.putNext();
+      }
+    }
+  }
+
+  @Override
+  public FlightInfo getFlightInfoPreparedStatement(
+      final CommandPreparedStatementQuery command,
+      final CallContext context,
+      final FlightDescriptor descriptor) {
+    final byte[] handle = command.getPreparedStatementHandle().toByteArray();
+    try {
+      String query;
+      try {
+        query = deserializePOJO(handle).getQuery();
+      } catch (StreamCorruptedException e) {
+        query = new String(command.getPreparedStatementHandle().toStringUtf8());
+      }
+      try (Connection connection = dataSource.getConnection();
+          PreparedStatement statement = createPreparedStatement(connection, query)) {
+        ResultSetMetaData metaData = statement.getMetaData();
+        return getFlightInfoForSchema(
+            command, descriptor, jdbcToArrowSchema(metaData, DEFAULT_CALENDAR));
+      }
+    } catch (final SQLException | IOException | ClassNotFoundException e) {
+      LOGGER.error(
+          format("There was a problem executing the prepared statement: <%s>.", e.getMessage()), e);
+      throw CallStatus.INTERNAL.withCause(e).toRuntimeException();
+    }
+  }
+
+  private DoPutPreparedStatementResultPOJO deserializePOJO(byte[] handle)
+      throws IOException, ClassNotFoundException {
+    try (ByteArrayInputStream bis = new ByteArrayInputStream(handle);
+        ObjectInputStream ois = new ObjectInputStream(bis)) {
+      return (DoPutPreparedStatementResultPOJO) ois.readObject();
+    }
+  }
+
+  private byte[] serializePOJO(DoPutPreparedStatementResultPOJO doPutPreparedStatementResultPOJO)
+      throws IOException {
+    try (ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        ObjectOutputStream oos = new ObjectOutputStream(bos)) {
+      oos.writeObject(doPutPreparedStatementResultPOJO);
+      return bos.toByteArray();
+    }
+  }
+
+  private PreparedStatement createPreparedStatement(Connection connection, String query)
+      throws SQLException {
+    return connection.prepareStatement(
+        query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
+  }
+}
diff --git a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/StatementContext.java b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/StatementContext.java
index 764ef3f54aae3..d6e21a341e52d 100644
--- a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/StatementContext.java
+++ b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/example/StatementContext.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql.example;
 
 import java.sql.Connection;
 import java.sql.Statement;
 import java.util.Objects;
-
 import org.apache.arrow.flight.sql.FlightSqlProducer;
 import org.apache.arrow.util.AutoCloseables;
 
diff --git a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/test/TestFlightSql.java b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/test/TestFlightSql.java
index a39736e939f0b..8387834947283 100644
--- a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/test/TestFlightSql.java
+++ b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/test/TestFlightSql.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql.test;
 
 import static java.util.Arrays.asList;
@@ -26,9 +25,11 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import com.google.common.collect.ImmutableList;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -37,7 +38,6 @@
 import java.util.Map;
 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;
@@ -68,86 +68,100 @@
 import org.hamcrest.Matcher;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
 
-import com.google.common.collect.ImmutableList;
-
-/**
- * Test direct usage of Flight SQL workflows.
- */
+/** Test direct usage of Flight SQL workflows. */
 public class TestFlightSql {
 
-  protected static final Schema SCHEMA_INT_TABLE = new Schema(asList(
-      new Field("ID", new FieldType(false, MinorType.INT.getType(), null), null),
-      Field.nullable("KEYNAME", MinorType.VARCHAR.getType()),
-      Field.nullable("VALUE", MinorType.INT.getType()),
-      Field.nullable("FOREIGNID", MinorType.INT.getType())));
-  private static final List<List<String>> EXPECTED_RESULTS_FOR_STAR_SELECT_QUERY = ImmutableList.of(
-      asList("1", "one", "1", "1"), asList("2", "zero", "0", "1"), asList("3", "negative one", "-1", "1"));
-  private static final List<List<String>> EXPECTED_RESULTS_FOR_PARAMETER_BINDING = ImmutableList.of(
-      asList("1", "one", "1", "1"));
-  private static final Map<String, String> GET_SQL_INFO_EXPECTED_RESULTS_MAP = new LinkedHashMap<>();
-  private static final String LOCALHOST = "localhost";
-  private static BufferAllocator allocator;
-  private static FlightServer server;
-  private static FlightSqlClient sqlClient;
+  protected static final Schema SCHEMA_INT_TABLE =
+      new Schema(
+          asList(
+              new Field("ID", new FieldType(false, MinorType.INT.getType(), null), null),
+              Field.nullable("KEYNAME", MinorType.VARCHAR.getType()),
+              Field.nullable("VALUE", MinorType.INT.getType()),
+              Field.nullable("FOREIGNID", MinorType.INT.getType())));
+  private static final List<List<String>> EXPECTED_RESULTS_FOR_STAR_SELECT_QUERY =
+      ImmutableList.of(
+          asList("1", "one", "1", "1"),
+          asList("2", "zero", "0", "1"),
+          asList("3", "negative one", "-1", "1"));
+  protected static final List<List<String>> EXPECTED_RESULTS_FOR_PARAMETER_BINDING =
+      ImmutableList.of(asList("1", "one", "1", "1"));
+  private static final Map<String, String> GET_SQL_INFO_EXPECTED_RESULTS_MAP =
+      new LinkedHashMap<>();
+  protected static final String LOCALHOST = "localhost";
+  protected static BufferAllocator allocator;
+  protected static FlightServer server;
+  protected static FlightSqlClient sqlClient;
 
   @BeforeAll
   public static void setUp() throws Exception {
+    setUpClientServer();
+    setUpExpectedResultsMap();
+  }
+
+  private static void setUpClientServer() throws Exception {
     allocator = new RootAllocator(Integer.MAX_VALUE);
 
     final Location serverLocation = Location.forGrpcInsecure(LOCALHOST, 0);
-    server = FlightServer.builder(allocator, serverLocation, new FlightSqlExample(serverLocation))
-        .build()
-        .start();
+    server =
+        FlightServer.builder(
+                allocator,
+                serverLocation,
+                new FlightSqlExample(serverLocation, FlightSqlExample.DB_NAME))
+            .build()
+            .start();
 
     final Location clientLocation = Location.forGrpcInsecure(LOCALHOST, server.getPort());
     sqlClient = new FlightSqlClient(FlightClient.builder(allocator, clientLocation).build());
+  }
 
-    GET_SQL_INFO_EXPECTED_RESULTS_MAP
-        .put(Integer.toString(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_NAME_VALUE), "Apache Derby");
-    GET_SQL_INFO_EXPECTED_RESULTS_MAP
-        .put(Integer.toString(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_VERSION_VALUE), "10.14.2.0 - (1828579)");
-    GET_SQL_INFO_EXPECTED_RESULTS_MAP
-        .put(Integer.toString(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_ARROW_VERSION_VALUE), "10.14.2.0 - (1828579)");
-    GET_SQL_INFO_EXPECTED_RESULTS_MAP
-        .put(Integer.toString(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_READ_ONLY_VALUE), "false");
-    GET_SQL_INFO_EXPECTED_RESULTS_MAP
-        .put(Integer.toString(FlightSql.SqlInfo.SQL_ALL_TABLES_ARE_SELECTABLE_VALUE), "true");
-    GET_SQL_INFO_EXPECTED_RESULTS_MAP
-        .put(
-            Integer.toString(FlightSql.SqlInfo.SQL_NULL_ORDERING_VALUE),
-            Integer.toString(FlightSql.SqlNullOrdering.SQL_NULLS_SORTED_AT_END_VALUE));
-    GET_SQL_INFO_EXPECTED_RESULTS_MAP
-        .put(Integer.toString(FlightSql.SqlInfo.SQL_DDL_CATALOG_VALUE), "false");
-    GET_SQL_INFO_EXPECTED_RESULTS_MAP
-        .put(Integer.toString(FlightSql.SqlInfo.SQL_DDL_SCHEMA_VALUE), "true");
-    GET_SQL_INFO_EXPECTED_RESULTS_MAP
-        .put(Integer.toString(FlightSql.SqlInfo.SQL_DDL_TABLE_VALUE), "true");
-    GET_SQL_INFO_EXPECTED_RESULTS_MAP
-        .put(
-            Integer.toString(FlightSql.SqlInfo.SQL_IDENTIFIER_CASE_VALUE),
-            Integer.toString(SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_UPPERCASE_VALUE));
-    GET_SQL_INFO_EXPECTED_RESULTS_MAP
-        .put(Integer.toString(FlightSql.SqlInfo.SQL_IDENTIFIER_QUOTE_CHAR_VALUE), "\"");
-    GET_SQL_INFO_EXPECTED_RESULTS_MAP
-        .put(
-            Integer.toString(FlightSql.SqlInfo.SQL_QUOTED_IDENTIFIER_CASE_VALUE),
-            Integer.toString(SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_CASE_INSENSITIVE_VALUE));
-    GET_SQL_INFO_EXPECTED_RESULTS_MAP
-        .put(Integer.toString(FlightSql.SqlInfo.SQL_MAX_COLUMNS_IN_TABLE_VALUE), "42");
+  protected static void setUpExpectedResultsMap() {
+    GET_SQL_INFO_EXPECTED_RESULTS_MAP.put(
+        Integer.toString(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_NAME_VALUE), "Apache Derby");
+    GET_SQL_INFO_EXPECTED_RESULTS_MAP.put(
+        Integer.toString(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_VERSION_VALUE),
+        "10.14.2.0 - (1828579)");
+    GET_SQL_INFO_EXPECTED_RESULTS_MAP.put(
+        Integer.toString(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_ARROW_VERSION_VALUE),
+        "10.14.2.0 - (1828579)");
+    GET_SQL_INFO_EXPECTED_RESULTS_MAP.put(
+        Integer.toString(FlightSql.SqlInfo.FLIGHT_SQL_SERVER_READ_ONLY_VALUE), "false");
+    GET_SQL_INFO_EXPECTED_RESULTS_MAP.put(
+        Integer.toString(FlightSql.SqlInfo.SQL_ALL_TABLES_ARE_SELECTABLE_VALUE), "true");
+    GET_SQL_INFO_EXPECTED_RESULTS_MAP.put(
+        Integer.toString(FlightSql.SqlInfo.SQL_NULL_ORDERING_VALUE),
+        Integer.toString(FlightSql.SqlNullOrdering.SQL_NULLS_SORTED_AT_END_VALUE));
+    GET_SQL_INFO_EXPECTED_RESULTS_MAP.put(
+        Integer.toString(FlightSql.SqlInfo.SQL_DDL_CATALOG_VALUE), "false");
+    GET_SQL_INFO_EXPECTED_RESULTS_MAP.put(
+        Integer.toString(FlightSql.SqlInfo.SQL_DDL_SCHEMA_VALUE), "true");
+    GET_SQL_INFO_EXPECTED_RESULTS_MAP.put(
+        Integer.toString(FlightSql.SqlInfo.SQL_DDL_TABLE_VALUE), "true");
+    GET_SQL_INFO_EXPECTED_RESULTS_MAP.put(
+        Integer.toString(FlightSql.SqlInfo.SQL_IDENTIFIER_CASE_VALUE),
+        Integer.toString(SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_UPPERCASE_VALUE));
+    GET_SQL_INFO_EXPECTED_RESULTS_MAP.put(
+        Integer.toString(FlightSql.SqlInfo.SQL_IDENTIFIER_QUOTE_CHAR_VALUE), "\"");
+    GET_SQL_INFO_EXPECTED_RESULTS_MAP.put(
+        Integer.toString(FlightSql.SqlInfo.SQL_QUOTED_IDENTIFIER_CASE_VALUE),
+        Integer.toString(SqlSupportedCaseSensitivity.SQL_CASE_SENSITIVITY_CASE_INSENSITIVE_VALUE));
+    GET_SQL_INFO_EXPECTED_RESULTS_MAP.put(
+        Integer.toString(FlightSql.SqlInfo.SQL_MAX_COLUMNS_IN_TABLE_VALUE), "42");
   }
 
   @AfterAll
   public static void tearDown() throws Exception {
     close(sqlClient, server, allocator);
+    FlightSqlExample.removeDerbyDatabaseIfExists(FlightSqlExample.DB_NAME);
   }
 
-  private static List<List<String>> getNonConformingResultsForGetSqlInfo(final List<? extends List<String>> results) {
-    return getNonConformingResultsForGetSqlInfo(results,
+  private static List<List<String>> getNonConformingResultsForGetSqlInfo(
+      final List<? extends List<String>> results) {
+    return getNonConformingResultsForGetSqlInfo(
+        results,
         FlightSql.SqlInfo.FLIGHT_SQL_SERVER_NAME,
         FlightSql.SqlInfo.FLIGHT_SQL_SERVER_VERSION,
         FlightSql.SqlInfo.FLIGHT_SQL_SERVER_ARROW_VERSION,
@@ -164,8 +178,7 @@ private static List<List<String>> getNonConformingResultsForGetSqlInfo(final Lis
   }
 
   private static List<List<String>> getNonConformingResultsForGetSqlInfo(
-      final List<? extends List<String>> results,
-      final FlightSql.SqlInfo... args) {
+      final List<? extends List<String>> results, final FlightSql.SqlInfo... args) {
     final List<List<String>> nonConformingResults = new ArrayList<>();
     if (results.size() == args.length) {
       for (int index = 0; index < results.size(); index++) {
@@ -173,8 +186,8 @@ private static List<List<String>> getNonConformingResultsForGetSqlInfo(
         final String providedName = result.get(0);
         final String expectedName = Integer.toString(args[index].getNumber());
         System.err.println(expectedName);
-        if (!(GET_SQL_INFO_EXPECTED_RESULTS_MAP.get(providedName).equals(result.get(1)) &&
-            providedName.equals(expectedName))) {
+        if (!(GET_SQL_INFO_EXPECTED_RESULTS_MAP.get(providedName).equals(result.get(1))
+            && providedName.equals(expectedName))) {
           nonConformingResults.add(result);
           break;
         }
@@ -186,210 +199,276 @@ private static List<List<String>> getNonConformingResultsForGetSqlInfo(
   @Test
   public void testGetTablesSchema() {
     final FlightInfo info = sqlClient.getTables(null, null, null, null, true);
-    MatcherAssert.assertThat(info.getSchemaOptional(), is(Optional.of(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA)));
+    MatcherAssert.assertThat(
+        info.getSchemaOptional(), is(Optional.of(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA)));
   }
 
   @Test
   public void testGetTablesSchemaExcludeSchema() {
     final FlightInfo info = sqlClient.getTables(null, null, null, null, false);
     MatcherAssert.assertThat(
-            info.getSchemaOptional(),
-            is(Optional.of(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA_NO_SCHEMA)));
+        info.getSchemaOptional(),
+        is(Optional.of(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA_NO_SCHEMA)));
   }
 
   @Test
   public void testGetTablesResultNoSchema() throws Exception {
     try (final FlightStream stream =
-             sqlClient.getStream(
-                 sqlClient.getTables(null, null, null, null, false)
-                     .getEndpoints().get(0).getTicket())) {
-      Assertions.assertAll(
+        sqlClient.getStream(
+            sqlClient.getTables(null, null, null, null, false).getEndpoints().get(0).getTicket())) {
+      assertAll(
           () -> {
-            MatcherAssert.assertThat(stream.getSchema(), is(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA_NO_SCHEMA));
+            MatcherAssert.assertThat(
+                stream.getSchema(), is(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA_NO_SCHEMA));
           },
           () -> {
             final List<List<String>> results = getResults(stream);
-            final List<List<String>> expectedResults = ImmutableList.of(
-                // catalog_name | schema_name | table_name | table_type | table_schema
-                asList(null /* TODO No catalog yet */, "SYS", "SYSALIASES", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSCHECKS", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSCOLPERMS", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSCOLUMNS", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSCONGLOMERATES", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSCONSTRAINTS", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSDEPENDS", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSFILES", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSFOREIGNKEYS", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSKEYS", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSPERMS", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSROLES", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSROUTINEPERMS", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSSCHEMAS", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSSEQUENCES", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSSTATEMENTS", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSSTATISTICS", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSTABLEPERMS", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSTABLES", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSTRIGGERS", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSUSERS", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYS", "SYSVIEWS", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "SYSIBM", "SYSDUMMY1", "SYSTEM TABLE"),
-                asList(null /* TODO No catalog yet */, "APP", "FOREIGNTABLE", "TABLE"),
-                asList(null /* TODO No catalog yet */, "APP", "INTTABLE", "TABLE"));
+            final List<List<String>> expectedResults =
+                ImmutableList.of(
+                    // catalog_name | schema_name | table_name | table_type | table_schema
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSALIASES", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSCHECKS", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSCOLPERMS", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSCOLUMNS", "SYSTEM TABLE"),
+                    asList(
+                        null /* TODO No catalog yet */, "SYS", "SYSCONGLOMERATES", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSCONSTRAINTS", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSDEPENDS", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSFILES", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSFOREIGNKEYS", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSKEYS", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSPERMS", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSROLES", "SYSTEM TABLE"),
+                    asList(
+                        null /* TODO No catalog yet */, "SYS", "SYSROUTINEPERMS", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSSCHEMAS", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSSEQUENCES", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSSTATEMENTS", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSSTATISTICS", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSTABLEPERMS", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSTABLES", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSTRIGGERS", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSUSERS", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYS", "SYSVIEWS", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "SYSIBM", "SYSDUMMY1", "SYSTEM TABLE"),
+                    asList(null /* TODO No catalog yet */, "APP", "FOREIGNTABLE", "TABLE"),
+                    asList(null /* TODO No catalog yet */, "APP", "INTTABLE", "TABLE"));
             MatcherAssert.assertThat(results, is(expectedResults));
-          }
-      );
+          });
     }
   }
 
   @Test
   public void testGetTablesResultFilteredNoSchema() throws Exception {
     try (final FlightStream stream =
-             sqlClient.getStream(
-                 sqlClient.getTables(null, null, null, singletonList("TABLE"), false)
-                     .getEndpoints().get(0).getTicket())) {
-
-      Assertions.assertAll(
-          () -> MatcherAssert.assertThat(stream.getSchema(), is(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA_NO_SCHEMA)),
+        sqlClient.getStream(
+            sqlClient
+                .getTables(null, null, null, singletonList("TABLE"), false)
+                .getEndpoints()
+                .get(0)
+                .getTicket())) {
+
+      assertAll(
+          () ->
+              MatcherAssert.assertThat(
+                  stream.getSchema(), is(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA_NO_SCHEMA)),
           () -> {
             final List<List<String>> results = getResults(stream);
-            final List<List<String>> expectedResults = ImmutableList.of(
-                // catalog_name | schema_name | table_name | table_type | table_schema
-                asList(null /* TODO No catalog yet */, "APP", "FOREIGNTABLE", "TABLE"),
-                asList(null /* TODO No catalog yet */, "APP", "INTTABLE", "TABLE"));
+            final List<List<String>> expectedResults =
+                ImmutableList.of(
+                    // catalog_name | schema_name | table_name | table_type | table_schema
+                    asList(null /* TODO No catalog yet */, "APP", "FOREIGNTABLE", "TABLE"),
+                    asList(null /* TODO No catalog yet */, "APP", "INTTABLE", "TABLE"));
             MatcherAssert.assertThat(results, is(expectedResults));
-          }
-      );
+          });
     }
   }
 
   @Test
   public void testGetTablesResultFilteredWithSchema() throws Exception {
     try (final FlightStream stream =
-             sqlClient.getStream(
-                 sqlClient.getTables(null, null, null, singletonList("TABLE"), true)
-                     .getEndpoints().get(0).getTicket())) {
-      Assertions.assertAll(
-          () -> MatcherAssert.assertThat(stream.getSchema(), is(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA)),
+        sqlClient.getStream(
+            sqlClient
+                .getTables(null, null, null, singletonList("TABLE"), true)
+                .getEndpoints()
+                .get(0)
+                .getTicket())) {
+      assertAll(
+          () ->
+              MatcherAssert.assertThat(
+                  stream.getSchema(), is(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA)),
           () -> {
-            MatcherAssert.assertThat(stream.getSchema(), is(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA));
+            MatcherAssert.assertThat(
+                stream.getSchema(), is(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA));
             final List<List<String>> results = getResults(stream);
-            final List<List<String>> expectedResults = ImmutableList.of(
-                // catalog_name | schema_name | table_name | table_type | table_schema
-                asList(
-                    null /* TODO No catalog yet */,
-                    "APP",
-                    "FOREIGNTABLE",
-                    "TABLE",
-                    new Schema(asList(
-                        new Field("ID", new FieldType(false, MinorType.INT.getType(), null,
-                            new FlightSqlColumnMetadata.Builder()
-                                .catalogName("")
-                                .typeName("INTEGER")
-                                .schemaName("APP")
-                                .tableName("FOREIGNTABLE")
-                                .precision(10)
-                                .scale(0)
-                                .isAutoIncrement(true)
-                                .build().getMetadataMap()), null),
-                        new Field("FOREIGNNAME", new FieldType(true, MinorType.VARCHAR.getType(), null,
-                            new FlightSqlColumnMetadata.Builder()
-                                .catalogName("")
-                                .typeName("VARCHAR")
-                                .schemaName("APP")
-                                .tableName("FOREIGNTABLE")
-                                .precision(100)
-                                .scale(0)
-                                .isAutoIncrement(false)
-                                .build().getMetadataMap()), null),
-                        new Field("VALUE", new FieldType(true, MinorType.INT.getType(), null,
-                            new FlightSqlColumnMetadata.Builder()
-                                .catalogName("")
-                                .typeName("INTEGER")
-                                .schemaName("APP")
-                                .tableName("FOREIGNTABLE")
-                                .precision(10)
-                                .scale(0)
-                                .isAutoIncrement(false)
-                                .build().getMetadataMap()), null))).toJson()),
-                asList(
-                    null /* TODO No catalog yet */,
-                    "APP",
-                    "INTTABLE",
-                    "TABLE",
-                    new Schema(asList(
-                        new Field("ID", new FieldType(false, MinorType.INT.getType(), null,
-                            new FlightSqlColumnMetadata.Builder()
-                                .catalogName("")
-                                .typeName("INTEGER")
-                                .schemaName("APP")
-                                .tableName("INTTABLE")
-                                .precision(10)
-                                .scale(0)
-                                .isAutoIncrement(true)
-                                .build().getMetadataMap()), null),
-                        new Field("KEYNAME", new FieldType(true, MinorType.VARCHAR.getType(), null,
-                            new FlightSqlColumnMetadata.Builder()
-                                .catalogName("")
-                                .typeName("VARCHAR")
-                                .schemaName("APP")
-                                .tableName("INTTABLE")
-                                .precision(100)
-                                .scale(0)
-                                .isAutoIncrement(false)
-                                .build().getMetadataMap()), null),
-                        new Field("VALUE", new FieldType(true, MinorType.INT.getType(), null,
-                            new FlightSqlColumnMetadata.Builder()
-                                .catalogName("")
-                                .typeName("INTEGER")
-                                .schemaName("APP")
-                                .tableName("INTTABLE")
-                                .precision(10)
-                                .scale(0)
-                                .isAutoIncrement(false)
-                                .build().getMetadataMap()), null),
-                        new Field("FOREIGNID", new FieldType(true, MinorType.INT.getType(), null,
-                            new FlightSqlColumnMetadata.Builder()
-                                .catalogName("")
-                                .typeName("INTEGER")
-                                .schemaName("APP")
-                                .tableName("INTTABLE")
-                                .precision(10)
-                                .scale(0)
-                                .isAutoIncrement(false)
-                                .build().getMetadataMap()), null))).toJson()));
+            final List<List<String>> expectedResults =
+                ImmutableList.of(
+                    // catalog_name | schema_name | table_name | table_type | table_schema
+                    asList(
+                        null /* TODO No catalog yet */,
+                        "APP",
+                        "FOREIGNTABLE",
+                        "TABLE",
+                        new Schema(
+                                asList(
+                                    new Field(
+                                        "ID",
+                                        new FieldType(
+                                            false,
+                                            MinorType.INT.getType(),
+                                            null,
+                                            new FlightSqlColumnMetadata.Builder()
+                                                .catalogName("")
+                                                .typeName("INTEGER")
+                                                .schemaName("APP")
+                                                .tableName("FOREIGNTABLE")
+                                                .precision(10)
+                                                .scale(0)
+                                                .isAutoIncrement(true)
+                                                .build()
+                                                .getMetadataMap()),
+                                        null),
+                                    new Field(
+                                        "FOREIGNNAME",
+                                        new FieldType(
+                                            true,
+                                            MinorType.VARCHAR.getType(),
+                                            null,
+                                            new FlightSqlColumnMetadata.Builder()
+                                                .catalogName("")
+                                                .typeName("VARCHAR")
+                                                .schemaName("APP")
+                                                .tableName("FOREIGNTABLE")
+                                                .precision(100)
+                                                .scale(0)
+                                                .isAutoIncrement(false)
+                                                .build()
+                                                .getMetadataMap()),
+                                        null),
+                                    new Field(
+                                        "VALUE",
+                                        new FieldType(
+                                            true,
+                                            MinorType.INT.getType(),
+                                            null,
+                                            new FlightSqlColumnMetadata.Builder()
+                                                .catalogName("")
+                                                .typeName("INTEGER")
+                                                .schemaName("APP")
+                                                .tableName("FOREIGNTABLE")
+                                                .precision(10)
+                                                .scale(0)
+                                                .isAutoIncrement(false)
+                                                .build()
+                                                .getMetadataMap()),
+                                        null)))
+                            .toJson()),
+                    asList(
+                        null /* TODO No catalog yet */,
+                        "APP",
+                        "INTTABLE",
+                        "TABLE",
+                        new Schema(
+                                asList(
+                                    new Field(
+                                        "ID",
+                                        new FieldType(
+                                            false,
+                                            MinorType.INT.getType(),
+                                            null,
+                                            new FlightSqlColumnMetadata.Builder()
+                                                .catalogName("")
+                                                .typeName("INTEGER")
+                                                .schemaName("APP")
+                                                .tableName("INTTABLE")
+                                                .precision(10)
+                                                .scale(0)
+                                                .isAutoIncrement(true)
+                                                .build()
+                                                .getMetadataMap()),
+                                        null),
+                                    new Field(
+                                        "KEYNAME",
+                                        new FieldType(
+                                            true,
+                                            MinorType.VARCHAR.getType(),
+                                            null,
+                                            new FlightSqlColumnMetadata.Builder()
+                                                .catalogName("")
+                                                .typeName("VARCHAR")
+                                                .schemaName("APP")
+                                                .tableName("INTTABLE")
+                                                .precision(100)
+                                                .scale(0)
+                                                .isAutoIncrement(false)
+                                                .build()
+                                                .getMetadataMap()),
+                                        null),
+                                    new Field(
+                                        "VALUE",
+                                        new FieldType(
+                                            true,
+                                            MinorType.INT.getType(),
+                                            null,
+                                            new FlightSqlColumnMetadata.Builder()
+                                                .catalogName("")
+                                                .typeName("INTEGER")
+                                                .schemaName("APP")
+                                                .tableName("INTTABLE")
+                                                .precision(10)
+                                                .scale(0)
+                                                .isAutoIncrement(false)
+                                                .build()
+                                                .getMetadataMap()),
+                                        null),
+                                    new Field(
+                                        "FOREIGNID",
+                                        new FieldType(
+                                            true,
+                                            MinorType.INT.getType(),
+                                            null,
+                                            new FlightSqlColumnMetadata.Builder()
+                                                .catalogName("")
+                                                .typeName("INTEGER")
+                                                .schemaName("APP")
+                                                .tableName("INTTABLE")
+                                                .precision(10)
+                                                .scale(0)
+                                                .isAutoIncrement(false)
+                                                .build()
+                                                .getMetadataMap()),
+                                        null)))
+                            .toJson()));
             MatcherAssert.assertThat(results, is(expectedResults));
-          }
-      );
+          });
     }
   }
 
   @Test
   public void testSimplePreparedStatementSchema() throws Exception {
     try (final PreparedStatement preparedStatement = sqlClient.prepare("SELECT * FROM intTable")) {
-      Assertions.assertAll(
+      assertAll(
           () -> {
             final Schema actualSchema = preparedStatement.getResultSetSchema();
             MatcherAssert.assertThat(actualSchema, is(SCHEMA_INT_TABLE));
-
           },
           () -> {
             final FlightInfo info = preparedStatement.execute();
             MatcherAssert.assertThat(info.getSchemaOptional(), is(Optional.of(SCHEMA_INT_TABLE)));
-          }
-      );
+          });
     }
   }
 
   @Test
   public void testSimplePreparedStatementResults() throws Exception {
     try (final PreparedStatement preparedStatement = sqlClient.prepare("SELECT * FROM intTable");
-         final FlightStream stream = sqlClient.getStream(
-             preparedStatement.execute().getEndpoints().get(0).getTicket())) {
-      Assertions.assertAll(
+        final FlightStream stream =
+            sqlClient.getStream(preparedStatement.execute().getEndpoints().get(0).getTicket())) {
+      assertAll(
           () -> MatcherAssert.assertThat(stream.getSchema(), is(SCHEMA_INT_TABLE)),
-          () -> MatcherAssert.assertThat(getResults(stream), is(EXPECTED_RESULTS_FOR_STAR_SELECT_QUERY))
-      );
+          () ->
+              MatcherAssert.assertThat(
+                  getResults(stream), is(EXPECTED_RESULTS_FOR_STAR_SELECT_QUERY)));
     }
   }
 
@@ -397,7 +476,8 @@ public void testSimplePreparedStatementResults() throws Exception {
   public void testSimplePreparedStatementResultsWithParameterBinding() throws Exception {
     try (PreparedStatement prepare = sqlClient.prepare("SELECT * FROM intTable WHERE id = ?")) {
       final Schema parameterSchema = prepare.getParameterSchema();
-      try (final VectorSchemaRoot insertRoot = VectorSchemaRoot.create(parameterSchema, allocator)) {
+      try (final VectorSchemaRoot insertRoot =
+          VectorSchemaRoot.create(parameterSchema, allocator)) {
         insertRoot.allocateNew();
 
         final IntVector valueVector = (IntVector) insertRoot.getVector(0);
@@ -407,24 +487,26 @@ public void testSimplePreparedStatementResultsWithParameterBinding() throws Exce
         prepare.setParameters(insertRoot);
         FlightInfo flightInfo = prepare.execute();
 
-        FlightStream stream = sqlClient.getStream(flightInfo
-            .getEndpoints()
-            .get(0).getTicket());
+        FlightStream stream = sqlClient.getStream(flightInfo.getEndpoints().get(0).getTicket());
 
-        Assertions.assertAll(
+        assertAll(
             () -> MatcherAssert.assertThat(stream.getSchema(), is(SCHEMA_INT_TABLE)),
-            () -> MatcherAssert.assertThat(getResults(stream), is(EXPECTED_RESULTS_FOR_PARAMETER_BINDING))
-        );
+            () ->
+                MatcherAssert.assertThat(
+                    getResults(stream), is(EXPECTED_RESULTS_FOR_PARAMETER_BINDING)));
       }
     }
   }
 
   @Test
   public void testSimplePreparedStatementUpdateResults() throws SQLException {
-    try (PreparedStatement prepare = sqlClient.prepare("INSERT INTO INTTABLE (keyName, value ) VALUES (?, ?)");
-         PreparedStatement deletePrepare = sqlClient.prepare("DELETE FROM INTTABLE WHERE keyName = ?")) {
+    try (PreparedStatement prepare =
+            sqlClient.prepare("INSERT INTO INTTABLE (keyName, value ) VALUES (?, ?)");
+        PreparedStatement deletePrepare =
+            sqlClient.prepare("DELETE FROM INTTABLE WHERE keyName = ?")) {
       final Schema parameterSchema = prepare.getParameterSchema();
-      try (final VectorSchemaRoot insertRoot = VectorSchemaRoot.create(parameterSchema, allocator)) {
+      try (final VectorSchemaRoot insertRoot =
+          VectorSchemaRoot.create(parameterSchema, allocator)) {
         final VarCharVector varCharVector = (VarCharVector) insertRoot.getVector(0);
         final IntVector valueVector = (IntVector) insertRoot.getVector(1);
         final int counter = 10;
@@ -432,10 +514,11 @@ public void testSimplePreparedStatementUpdateResults() throws SQLException {
 
         final IntStream range = IntStream.range(0, counter);
 
-        range.forEach(i -> {
-          valueVector.setSafe(i, i * counter);
-          varCharVector.setSafe(i, new Text("value" + i));
-        });
+        range.forEach(
+            i -> {
+              valueVector.setSafe(i, i * counter);
+              varCharVector.setSafe(i, new Text("value" + i));
+            });
 
         insertRoot.setRowCount(counter);
 
@@ -447,61 +530,61 @@ public void testSimplePreparedStatementUpdateResults() throws SQLException {
           deletePrepare.setParameters(deleteRoot);
           deletedRows = deletePrepare.executeUpdate();
         }
-        Assertions.assertAll(
+        assertAll(
             () -> MatcherAssert.assertThat(updatedRows, is(10L)),
-            () -> MatcherAssert.assertThat(deletedRows, is(10L))
-        );
+            () -> MatcherAssert.assertThat(deletedRows, is(10L)));
       }
     }
   }
 
   @Test
   public void testSimplePreparedStatementUpdateResultsWithoutParameters() throws SQLException {
-    try (PreparedStatement prepare = sqlClient
-        .prepare("INSERT INTO INTTABLE (keyName, value ) VALUES ('test', 1000)");
-         PreparedStatement deletePrepare = sqlClient.prepare("DELETE FROM INTTABLE WHERE keyName = 'test'")) {
+    try (PreparedStatement prepare =
+            sqlClient.prepare("INSERT INTO INTTABLE (keyName, value ) VALUES ('test', 1000)");
+        PreparedStatement deletePrepare =
+            sqlClient.prepare("DELETE FROM INTTABLE WHERE keyName = 'test'")) {
       final long updatedRows = prepare.executeUpdate();
 
       final long deletedRows = deletePrepare.executeUpdate();
 
-      Assertions.assertAll(
+      assertAll(
           () -> MatcherAssert.assertThat(updatedRows, is(1L)),
-          () -> MatcherAssert.assertThat(deletedRows, is(1L))
-      );
+          () -> MatcherAssert.assertThat(deletedRows, is(1L)));
     }
   }
 
   @Test
   public void testSimplePreparedStatementClosesProperly() {
     final PreparedStatement preparedStatement = sqlClient.prepare("SELECT * FROM intTable");
-    Assertions.assertAll(
+    assertAll(
         () -> {
           MatcherAssert.assertThat(preparedStatement.isClosed(), is(false));
         },
         () -> {
           preparedStatement.close();
           MatcherAssert.assertThat(preparedStatement.isClosed(), is(true));
-        }
-    );
+        });
   }
 
   @Test
   public void testGetCatalogsSchema() {
     final FlightInfo info = sqlClient.getCatalogs();
-    MatcherAssert.assertThat(info.getSchemaOptional(), is(Optional.of(FlightSqlProducer.Schemas.GET_CATALOGS_SCHEMA)));
+    MatcherAssert.assertThat(
+        info.getSchemaOptional(), is(Optional.of(FlightSqlProducer.Schemas.GET_CATALOGS_SCHEMA)));
   }
 
   @Test
   public void testGetCatalogsResults() throws Exception {
     try (final FlightStream stream =
-             sqlClient.getStream(sqlClient.getCatalogs().getEndpoints().get(0).getTicket())) {
-      Assertions.assertAll(
-          () -> MatcherAssert.assertThat(stream.getSchema(), is(FlightSqlProducer.Schemas.GET_CATALOGS_SCHEMA)),
+        sqlClient.getStream(sqlClient.getCatalogs().getEndpoints().get(0).getTicket())) {
+      assertAll(
+          () ->
+              MatcherAssert.assertThat(
+                  stream.getSchema(), is(FlightSqlProducer.Schemas.GET_CATALOGS_SCHEMA)),
           () -> {
             List<List<String>> catalogs = getResults(stream);
             MatcherAssert.assertThat(catalogs, is(emptyList()));
-          }
-      );
+          });
     }
   }
 
@@ -509,65 +592,67 @@ public void testGetCatalogsResults() throws Exception {
   public void testGetTableTypesSchema() {
     final FlightInfo info = sqlClient.getTableTypes();
     MatcherAssert.assertThat(
-            info.getSchemaOptional(),
-            is(Optional.of(FlightSqlProducer.Schemas.GET_TABLE_TYPES_SCHEMA)));
+        info.getSchemaOptional(),
+        is(Optional.of(FlightSqlProducer.Schemas.GET_TABLE_TYPES_SCHEMA)));
   }
 
   @Test
   public void testGetTableTypesResult() throws Exception {
     try (final FlightStream stream =
-             sqlClient.getStream(sqlClient.getTableTypes().getEndpoints().get(0).getTicket())) {
-      Assertions.assertAll(
+        sqlClient.getStream(sqlClient.getTableTypes().getEndpoints().get(0).getTicket())) {
+      assertAll(
           () -> {
-            MatcherAssert.assertThat(stream.getSchema(), is(FlightSqlProducer.Schemas.GET_TABLE_TYPES_SCHEMA));
+            MatcherAssert.assertThat(
+                stream.getSchema(), is(FlightSqlProducer.Schemas.GET_TABLE_TYPES_SCHEMA));
           },
           () -> {
             final List<List<String>> tableTypes = getResults(stream);
-            final List<List<String>> expectedTableTypes = ImmutableList.of(
-                // table_type
-                singletonList("SYNONYM"),
-                singletonList("SYSTEM TABLE"),
-                singletonList("TABLE"),
-                singletonList("VIEW")
-            );
+            final List<List<String>> expectedTableTypes =
+                ImmutableList.of(
+                    // table_type
+                    singletonList("SYNONYM"),
+                    singletonList("SYSTEM TABLE"),
+                    singletonList("TABLE"),
+                    singletonList("VIEW"));
             MatcherAssert.assertThat(tableTypes, is(expectedTableTypes));
-          }
-      );
+          });
     }
   }
 
   @Test
   public void testGetSchemasSchema() {
     final FlightInfo info = sqlClient.getSchemas(null, null);
-    MatcherAssert.assertThat(info.getSchemaOptional(), is(Optional.of(FlightSqlProducer.Schemas.GET_SCHEMAS_SCHEMA)));
+    MatcherAssert.assertThat(
+        info.getSchemaOptional(), is(Optional.of(FlightSqlProducer.Schemas.GET_SCHEMAS_SCHEMA)));
   }
 
   @Test
   public void testGetSchemasResult() throws Exception {
     try (final FlightStream stream =
-             sqlClient.getStream(sqlClient.getSchemas(null, null).getEndpoints().get(0).getTicket())) {
-      Assertions.assertAll(
+        sqlClient.getStream(sqlClient.getSchemas(null, null).getEndpoints().get(0).getTicket())) {
+      assertAll(
           () -> {
-            MatcherAssert.assertThat(stream.getSchema(), is(FlightSqlProducer.Schemas.GET_SCHEMAS_SCHEMA));
+            MatcherAssert.assertThat(
+                stream.getSchema(), is(FlightSqlProducer.Schemas.GET_SCHEMAS_SCHEMA));
           },
           () -> {
             final List<List<String>> schemas = getResults(stream);
-            final List<List<String>> expectedSchemas = ImmutableList.of(
-                // catalog_name | schema_name
-                asList(null /* TODO Add catalog. */, "APP"),
-                asList(null /* TODO Add catalog. */, "NULLID"),
-                asList(null /* TODO Add catalog. */, "SQLJ"),
-                asList(null /* TODO Add catalog. */, "SYS"),
-                asList(null /* TODO Add catalog. */, "SYSCAT"),
-                asList(null /* TODO Add catalog. */, "SYSCS_DIAG"),
-                asList(null /* TODO Add catalog. */, "SYSCS_UTIL"),
-                asList(null /* TODO Add catalog. */, "SYSFUN"),
-                asList(null /* TODO Add catalog. */, "SYSIBM"),
-                asList(null /* TODO Add catalog. */, "SYSPROC"),
-                asList(null /* TODO Add catalog. */, "SYSSTAT"));
+            final List<List<String>> expectedSchemas =
+                ImmutableList.of(
+                    // catalog_name | schema_name
+                    asList(null /* TODO Add catalog. */, "APP"),
+                    asList(null /* TODO Add catalog. */, "NULLID"),
+                    asList(null /* TODO Add catalog. */, "SQLJ"),
+                    asList(null /* TODO Add catalog. */, "SYS"),
+                    asList(null /* TODO Add catalog. */, "SYSCAT"),
+                    asList(null /* TODO Add catalog. */, "SYSCS_DIAG"),
+                    asList(null /* TODO Add catalog. */, "SYSCS_UTIL"),
+                    asList(null /* TODO Add catalog. */, "SYSFUN"),
+                    asList(null /* TODO Add catalog. */, "SYSIBM"),
+                    asList(null /* TODO Add catalog. */, "SYSPROC"),
+                    asList(null /* TODO Add catalog. */, "SYSSTAT"));
             MatcherAssert.assertThat(schemas, is(expectedSchemas));
-          }
-      );
+          });
     }
   }
 
@@ -578,36 +663,38 @@ public void testGetPrimaryKey() {
 
     final List<List<String>> results = getResults(stream);
 
-    Assertions.assertAll(
+    assertAll(
         () -> MatcherAssert.assertThat(results.size(), is(1)),
         () -> {
           final List<String> result = results.get(0);
-          Assertions.assertAll(
+          assertAll(
               () -> MatcherAssert.assertThat(result.get(0), is("")),
               () -> MatcherAssert.assertThat(result.get(1), is("APP")),
               () -> MatcherAssert.assertThat(result.get(2), is("INTTABLE")),
               () -> MatcherAssert.assertThat(result.get(3), is("ID")),
               () -> MatcherAssert.assertThat(result.get(4), is("1")),
-              () -> MatcherAssert.assertThat(result.get(5), notNullValue())
-          );
-        }
-    );
+              () -> MatcherAssert.assertThat(result.get(5), notNullValue()));
+        });
   }
 
   @Test
   public void testGetSqlInfoSchema() {
     final FlightInfo info = sqlClient.getSqlInfo();
-    MatcherAssert.assertThat(info.getSchemaOptional(), is(Optional.of(FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA)));
+    MatcherAssert.assertThat(
+        info.getSchemaOptional(), is(Optional.of(FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA)));
   }
 
   @Test
   public void testGetSqlInfoResults() throws Exception {
     final FlightInfo info = sqlClient.getSqlInfo();
     try (final FlightStream stream = sqlClient.getStream(info.getEndpoints().get(0).getTicket())) {
-      Assertions.assertAll(
-          () -> MatcherAssert.assertThat(stream.getSchema(), is(FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA)),
-          () -> MatcherAssert.assertThat(getNonConformingResultsForGetSqlInfo(getResults(stream)), is(emptyList()))
-      );
+      assertAll(
+          () ->
+              MatcherAssert.assertThat(
+                  stream.getSchema(), is(FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA)),
+          () ->
+              MatcherAssert.assertThat(
+                  getNonConformingResultsForGetSqlInfo(getResults(stream)), is(emptyList())));
     }
   }
 
@@ -616,41 +703,42 @@ public void testGetSqlInfoResultsWithSingleArg() throws Exception {
     final FlightSql.SqlInfo arg = FlightSql.SqlInfo.FLIGHT_SQL_SERVER_NAME;
     final FlightInfo info = sqlClient.getSqlInfo(arg);
     try (final FlightStream stream = sqlClient.getStream(info.getEndpoints().get(0).getTicket())) {
-      Assertions.assertAll(
-          () -> MatcherAssert.assertThat(stream.getSchema(), is(FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA)),
-          () -> MatcherAssert.assertThat(getNonConformingResultsForGetSqlInfo(getResults(stream), arg), is(emptyList()))
-      );
+      assertAll(
+          () ->
+              MatcherAssert.assertThat(
+                  stream.getSchema(), is(FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA)),
+          () ->
+              MatcherAssert.assertThat(
+                  getNonConformingResultsForGetSqlInfo(getResults(stream), arg), is(emptyList())));
     }
   }
 
   @Test
   public void testGetSqlInfoResultsWithManyArgs() throws Exception {
     final FlightSql.SqlInfo[] args = {
-        FlightSql.SqlInfo.FLIGHT_SQL_SERVER_NAME,
-        FlightSql.SqlInfo.FLIGHT_SQL_SERVER_VERSION,
-        FlightSql.SqlInfo.FLIGHT_SQL_SERVER_ARROW_VERSION,
-        FlightSql.SqlInfo.FLIGHT_SQL_SERVER_READ_ONLY,
-        FlightSql.SqlInfo.SQL_ALL_TABLES_ARE_SELECTABLE,
-        FlightSql.SqlInfo.SQL_NULL_ORDERING,
-        FlightSql.SqlInfo.SQL_DDL_CATALOG,
-        FlightSql.SqlInfo.SQL_DDL_SCHEMA,
-        FlightSql.SqlInfo.SQL_DDL_TABLE,
-        FlightSql.SqlInfo.SQL_IDENTIFIER_CASE,
-        FlightSql.SqlInfo.SQL_IDENTIFIER_QUOTE_CHAR,
-        FlightSql.SqlInfo.SQL_QUOTED_IDENTIFIER_CASE,
-        FlightSql.SqlInfo.SQL_MAX_COLUMNS_IN_TABLE};
+      FlightSql.SqlInfo.FLIGHT_SQL_SERVER_NAME,
+      FlightSql.SqlInfo.FLIGHT_SQL_SERVER_VERSION,
+      FlightSql.SqlInfo.FLIGHT_SQL_SERVER_ARROW_VERSION,
+      FlightSql.SqlInfo.FLIGHT_SQL_SERVER_READ_ONLY,
+      FlightSql.SqlInfo.SQL_ALL_TABLES_ARE_SELECTABLE,
+      FlightSql.SqlInfo.SQL_NULL_ORDERING,
+      FlightSql.SqlInfo.SQL_DDL_CATALOG,
+      FlightSql.SqlInfo.SQL_DDL_SCHEMA,
+      FlightSql.SqlInfo.SQL_DDL_TABLE,
+      FlightSql.SqlInfo.SQL_IDENTIFIER_CASE,
+      FlightSql.SqlInfo.SQL_IDENTIFIER_QUOTE_CHAR,
+      FlightSql.SqlInfo.SQL_QUOTED_IDENTIFIER_CASE,
+      FlightSql.SqlInfo.SQL_MAX_COLUMNS_IN_TABLE
+    };
     final FlightInfo info = sqlClient.getSqlInfo(args);
     try (final FlightStream stream = sqlClient.getStream(info.getEndpoints().get(0).getTicket())) {
-      Assertions.assertAll(
-          () -> MatcherAssert.assertThat(
-              stream.getSchema(),
-              is(FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA)
-          ),
-          () -> MatcherAssert.assertThat(
-              getNonConformingResultsForGetSqlInfo(getResults(stream), args),
-              is(emptyList())
-          )
-      );
+      assertAll(
+          () ->
+              MatcherAssert.assertThat(
+                  stream.getSchema(), is(FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA)),
+          () ->
+              MatcherAssert.assertThat(
+                  getNonConformingResultsForGetSqlInfo(getResults(stream), args), is(emptyList())));
     }
   }
 
@@ -658,34 +746,38 @@ public void testGetSqlInfoResultsWithManyArgs() throws Exception {
   public void testGetCommandExportedKeys() throws Exception {
     try (final FlightStream stream =
         sqlClient.getStream(
-            sqlClient.getExportedKeys(TableRef.of(null, null, "FOREIGNTABLE"))
-                .getEndpoints().get(0).getTicket())) {
+            sqlClient
+                .getExportedKeys(TableRef.of(null, null, "FOREIGNTABLE"))
+                .getEndpoints()
+                .get(0)
+                .getTicket())) {
 
       final List<List<String>> results = getResults(stream);
 
-      final List<Matcher<String>> matchers = asList(
-          nullValue(String.class), // pk_catalog_name
-          is("APP"), // pk_schema_name
-          is("FOREIGNTABLE"), // pk_table_name
-          is("ID"), // pk_column_name
-          nullValue(String.class), // fk_catalog_name
-          is("APP"), // fk_schema_name
-          is("INTTABLE"), // fk_table_name
-          is("FOREIGNID"), // fk_column_name
-          is("1"), // key_sequence
-          containsString("SQL"), // fk_key_name
-          containsString("SQL"), // pk_key_name
-          is("3"), // update_rule
-          is("3")); // delete_rule
+      final List<Matcher<String>> matchers =
+          asList(
+              nullValue(String.class), // pk_catalog_name
+              is("APP"), // pk_schema_name
+              is("FOREIGNTABLE"), // pk_table_name
+              is("ID"), // pk_column_name
+              nullValue(String.class), // fk_catalog_name
+              is("APP"), // fk_schema_name
+              is("INTTABLE"), // fk_table_name
+              is("FOREIGNID"), // fk_column_name
+              is("1"), // key_sequence
+              containsString("SQL"), // fk_key_name
+              containsString("SQL"), // pk_key_name
+              is("3"), // update_rule
+              is("3")); // delete_rule
 
       final List<Executable> assertions = new ArrayList<>();
-      Assertions.assertEquals(1, results.size());
+      assertEquals(1, results.size());
       for (int i = 0; i < matchers.size(); i++) {
         final String actual = results.get(0).get(i);
         final Matcher<String> expected = matchers.get(i);
         assertions.add(() -> MatcherAssert.assertThat(actual, expected));
       }
-      Assertions.assertAll(assertions);
+      assertAll(assertions);
     }
   }
 
@@ -693,34 +785,38 @@ public void testGetCommandExportedKeys() throws Exception {
   public void testGetCommandImportedKeys() throws Exception {
     try (final FlightStream stream =
         sqlClient.getStream(
-            sqlClient.getImportedKeys(TableRef.of(null, null, "INTTABLE"))
-                .getEndpoints().get(0).getTicket())) {
+            sqlClient
+                .getImportedKeys(TableRef.of(null, null, "INTTABLE"))
+                .getEndpoints()
+                .get(0)
+                .getTicket())) {
 
       final List<List<String>> results = getResults(stream);
 
-      final List<Matcher<String>> matchers = asList(
-          nullValue(String.class), // pk_catalog_name
-          is("APP"), // pk_schema_name
-          is("FOREIGNTABLE"), // pk_table_name
-          is("ID"), // pk_column_name
-          nullValue(String.class), // fk_catalog_name
-          is("APP"), // fk_schema_name
-          is("INTTABLE"), // fk_table_name
-          is("FOREIGNID"), // fk_column_name
-          is("1"), // key_sequence
-          containsString("SQL"), // fk_key_name
-          containsString("SQL"), // pk_key_name
-          is("3"), // update_rule
-          is("3")); // delete_rule
-
-      Assertions.assertEquals(1, results.size());
+      final List<Matcher<String>> matchers =
+          asList(
+              nullValue(String.class), // pk_catalog_name
+              is("APP"), // pk_schema_name
+              is("FOREIGNTABLE"), // pk_table_name
+              is("ID"), // pk_column_name
+              nullValue(String.class), // fk_catalog_name
+              is("APP"), // fk_schema_name
+              is("INTTABLE"), // fk_table_name
+              is("FOREIGNID"), // fk_column_name
+              is("1"), // key_sequence
+              containsString("SQL"), // fk_key_name
+              containsString("SQL"), // pk_key_name
+              is("3"), // update_rule
+              is("3")); // delete_rule
+
+      assertEquals(1, results.size());
       final List<Executable> assertions = new ArrayList<>();
       for (int i = 0; i < matchers.size(); i++) {
         final String actual = results.get(0).get(i);
         final Matcher<String> expected = matchers.get(i);
         assertions.add(() -> MatcherAssert.assertThat(actual, expected));
       }
-      Assertions.assertAll(assertions);
+      assertAll(assertions);
     }
   }
 
@@ -732,73 +828,448 @@ public void testGetTypeInfo() throws Exception {
 
       final List<List<String>> results = getResults(stream);
 
-      final List<List<String>> matchers = ImmutableList.of(
-          asList("BIGINT", "-5", "19", null, null, emptyList().toString(), "1", "false", "2", "false", "false", "true",
-              "BIGINT", "0", "0",
-              null, null, "10", null),
-          asList("LONG VARCHAR FOR BIT DATA", "-4", "32700", "X'", "'", emptyList().toString(), "1", "false", "0",
-              "true", "false", "false",
-              "LONG VARCHAR FOR BIT DATA", null, null, null, null, null, null),
-          asList("VARCHAR () FOR BIT DATA", "-3", "32672", "X'", "'", singletonList("length").toString(), "1", "false",
-              "2", "true", "false",
-              "false", "VARCHAR () FOR BIT DATA", null, null, null, null, null, null),
-          asList("CHAR () FOR BIT DATA", "-2", "254", "X'", "'", singletonList("length").toString(), "1", "false", "2",
-              "true", "false", "false",
-              "CHAR () FOR BIT DATA", null, null, null, null, null, null),
-          asList("LONG VARCHAR", "-1", "32700", "'", "'", emptyList().toString(), "1", "true", "1", "true", "false",
-              "false",
-              "LONG VARCHAR", null, null, null, null, null, null),
-          asList("CHAR", "1", "254", "'", "'", singletonList("length").toString(), "1", "true", "3", "true", "false",
-              "false", "CHAR", null, null,
-              null, null, null, null),
-          asList("NUMERIC", "2", "31", null, null, Arrays.asList("precision", "scale").toString(), "1", "false", "2",
-              "false", "true", "false",
-              "NUMERIC", "0", "31", null, null, "10", null),
-          asList("DECIMAL", "3", "31", null, null, Arrays.asList("precision", "scale").toString(), "1", "false", "2",
-              "false", "true", "false",
-              "DECIMAL", "0", "31", null, null, "10", null),
-          asList("INTEGER", "4", "10", null, null, emptyList().toString(), "1", "false", "2", "false", "false", "true",
-              "INTEGER", "0", "0",
-              null, null, "10", null),
-          asList("SMALLINT", "5", "5", null, null, emptyList().toString(), "1", "false", "2", "false", "false", "true",
-              "SMALLINT", "0",
-              "0", null, null, "10", null),
-          asList("FLOAT", "6", "52", null, null, singletonList("precision").toString(), "1", "false", "2", "false",
-              "false", "false", "FLOAT", null,
-              null, null, null, "2", null),
-          asList("REAL", "7", "23", null, null, emptyList().toString(), "1", "false", "2", "false", "false", "false",
-              "REAL", null, null,
-              null, null, "2", null),
-          asList("DOUBLE", "8", "52", null, null, emptyList().toString(), "1", "false", "2", "false", "false", "false",
-              "DOUBLE", null,
-              null, null, null, "2", null),
-          asList("VARCHAR", "12", "32672", "'", "'", singletonList("length").toString(), "1", "true", "3", "true",
-              "false", "false", "VARCHAR",
-              null, null, null, null, null, null),
-          asList("BOOLEAN", "16", "1", null, null, emptyList().toString(), "1", "false", "2", "true", "false", "false",
-              "BOOLEAN", null,
-              null, null, null, null, null),
-          asList("DATE", "91", "10", "DATE'", "'", emptyList().toString(), "1", "false", "2", "true", "false", "false",
-              "DATE", "0", "0",
-              null, null, "10", null),
-          asList("TIME", "92", "8", "TIME'", "'", emptyList().toString(), "1", "false", "2", "true", "false", "false",
-              "TIME", "0", "0",
-              null, null, "10", null),
-          asList("TIMESTAMP", "93", "29", "TIMESTAMP'", "'", emptyList().toString(), "1", "false", "2", "true", "false",
-              "false",
-              "TIMESTAMP", "0", "9", null, null, "10", null),
-          asList("OBJECT", "2000", null, null, null, emptyList().toString(), "1", "false", "2", "true", "false",
-              "false", "OBJECT", null,
-              null, null, null, null, null),
-          asList("BLOB", "2004", "2147483647", null, null, singletonList("length").toString(), "1", "false", "0", null,
-              "false", null, "BLOB", null,
-              null, null, null, null, null),
-          asList("CLOB", "2005", "2147483647", "'", "'", singletonList("length").toString(), "1", "true", "1", null,
-              "false", null, "CLOB", null,
-              null, null, null, null, null),
-          asList("XML", "2009", null, null, null, emptyList().toString(), "1", "true", "0", "false", "false", "false",
-              "XML", null, null,
-              null, null, null, null));
+      final List<List<String>> matchers =
+          ImmutableList.of(
+              asList(
+                  "BIGINT",
+                  "-5",
+                  "19",
+                  null,
+                  null,
+                  emptyList().toString(),
+                  "1",
+                  "false",
+                  "2",
+                  "false",
+                  "false",
+                  "true",
+                  "BIGINT",
+                  "0",
+                  "0",
+                  null,
+                  null,
+                  "10",
+                  null),
+              asList(
+                  "LONG VARCHAR FOR BIT DATA",
+                  "-4",
+                  "32700",
+                  "X'",
+                  "'",
+                  emptyList().toString(),
+                  "1",
+                  "false",
+                  "0",
+                  "true",
+                  "false",
+                  "false",
+                  "LONG VARCHAR FOR BIT DATA",
+                  null,
+                  null,
+                  null,
+                  null,
+                  null,
+                  null),
+              asList(
+                  "VARCHAR () FOR BIT DATA",
+                  "-3",
+                  "32672",
+                  "X'",
+                  "'",
+                  singletonList("length").toString(),
+                  "1",
+                  "false",
+                  "2",
+                  "true",
+                  "false",
+                  "false",
+                  "VARCHAR () FOR BIT DATA",
+                  null,
+                  null,
+                  null,
+                  null,
+                  null,
+                  null),
+              asList(
+                  "CHAR () FOR BIT DATA",
+                  "-2",
+                  "254",
+                  "X'",
+                  "'",
+                  singletonList("length").toString(),
+                  "1",
+                  "false",
+                  "2",
+                  "true",
+                  "false",
+                  "false",
+                  "CHAR () FOR BIT DATA",
+                  null,
+                  null,
+                  null,
+                  null,
+                  null,
+                  null),
+              asList(
+                  "LONG VARCHAR",
+                  "-1",
+                  "32700",
+                  "'",
+                  "'",
+                  emptyList().toString(),
+                  "1",
+                  "true",
+                  "1",
+                  "true",
+                  "false",
+                  "false",
+                  "LONG VARCHAR",
+                  null,
+                  null,
+                  null,
+                  null,
+                  null,
+                  null),
+              asList(
+                  "CHAR",
+                  "1",
+                  "254",
+                  "'",
+                  "'",
+                  singletonList("length").toString(),
+                  "1",
+                  "true",
+                  "3",
+                  "true",
+                  "false",
+                  "false",
+                  "CHAR",
+                  null,
+                  null,
+                  null,
+                  null,
+                  null,
+                  null),
+              asList(
+                  "NUMERIC",
+                  "2",
+                  "31",
+                  null,
+                  null,
+                  Arrays.asList("precision", "scale").toString(),
+                  "1",
+                  "false",
+                  "2",
+                  "false",
+                  "true",
+                  "false",
+                  "NUMERIC",
+                  "0",
+                  "31",
+                  null,
+                  null,
+                  "10",
+                  null),
+              asList(
+                  "DECIMAL",
+                  "3",
+                  "31",
+                  null,
+                  null,
+                  Arrays.asList("precision", "scale").toString(),
+                  "1",
+                  "false",
+                  "2",
+                  "false",
+                  "true",
+                  "false",
+                  "DECIMAL",
+                  "0",
+                  "31",
+                  null,
+                  null,
+                  "10",
+                  null),
+              asList(
+                  "INTEGER",
+                  "4",
+                  "10",
+                  null,
+                  null,
+                  emptyList().toString(),
+                  "1",
+                  "false",
+                  "2",
+                  "false",
+                  "false",
+                  "true",
+                  "INTEGER",
+                  "0",
+                  "0",
+                  null,
+                  null,
+                  "10",
+                  null),
+              asList(
+                  "SMALLINT",
+                  "5",
+                  "5",
+                  null,
+                  null,
+                  emptyList().toString(),
+                  "1",
+                  "false",
+                  "2",
+                  "false",
+                  "false",
+                  "true",
+                  "SMALLINT",
+                  "0",
+                  "0",
+                  null,
+                  null,
+                  "10",
+                  null),
+              asList(
+                  "FLOAT",
+                  "6",
+                  "52",
+                  null,
+                  null,
+                  singletonList("precision").toString(),
+                  "1",
+                  "false",
+                  "2",
+                  "false",
+                  "false",
+                  "false",
+                  "FLOAT",
+                  null,
+                  null,
+                  null,
+                  null,
+                  "2",
+                  null),
+              asList(
+                  "REAL",
+                  "7",
+                  "23",
+                  null,
+                  null,
+                  emptyList().toString(),
+                  "1",
+                  "false",
+                  "2",
+                  "false",
+                  "false",
+                  "false",
+                  "REAL",
+                  null,
+                  null,
+                  null,
+                  null,
+                  "2",
+                  null),
+              asList(
+                  "DOUBLE",
+                  "8",
+                  "52",
+                  null,
+                  null,
+                  emptyList().toString(),
+                  "1",
+                  "false",
+                  "2",
+                  "false",
+                  "false",
+                  "false",
+                  "DOUBLE",
+                  null,
+                  null,
+                  null,
+                  null,
+                  "2",
+                  null),
+              asList(
+                  "VARCHAR",
+                  "12",
+                  "32672",
+                  "'",
+                  "'",
+                  singletonList("length").toString(),
+                  "1",
+                  "true",
+                  "3",
+                  "true",
+                  "false",
+                  "false",
+                  "VARCHAR",
+                  null,
+                  null,
+                  null,
+                  null,
+                  null,
+                  null),
+              asList(
+                  "BOOLEAN",
+                  "16",
+                  "1",
+                  null,
+                  null,
+                  emptyList().toString(),
+                  "1",
+                  "false",
+                  "2",
+                  "true",
+                  "false",
+                  "false",
+                  "BOOLEAN",
+                  null,
+                  null,
+                  null,
+                  null,
+                  null,
+                  null),
+              asList(
+                  "DATE",
+                  "91",
+                  "10",
+                  "DATE'",
+                  "'",
+                  emptyList().toString(),
+                  "1",
+                  "false",
+                  "2",
+                  "true",
+                  "false",
+                  "false",
+                  "DATE",
+                  "0",
+                  "0",
+                  null,
+                  null,
+                  "10",
+                  null),
+              asList(
+                  "TIME",
+                  "92",
+                  "8",
+                  "TIME'",
+                  "'",
+                  emptyList().toString(),
+                  "1",
+                  "false",
+                  "2",
+                  "true",
+                  "false",
+                  "false",
+                  "TIME",
+                  "0",
+                  "0",
+                  null,
+                  null,
+                  "10",
+                  null),
+              asList(
+                  "TIMESTAMP",
+                  "93",
+                  "29",
+                  "TIMESTAMP'",
+                  "'",
+                  emptyList().toString(),
+                  "1",
+                  "false",
+                  "2",
+                  "true",
+                  "false",
+                  "false",
+                  "TIMESTAMP",
+                  "0",
+                  "9",
+                  null,
+                  null,
+                  "10",
+                  null),
+              asList(
+                  "OBJECT",
+                  "2000",
+                  null,
+                  null,
+                  null,
+                  emptyList().toString(),
+                  "1",
+                  "false",
+                  "2",
+                  "true",
+                  "false",
+                  "false",
+                  "OBJECT",
+                  null,
+                  null,
+                  null,
+                  null,
+                  null,
+                  null),
+              asList(
+                  "BLOB",
+                  "2004",
+                  "2147483647",
+                  null,
+                  null,
+                  singletonList("length").toString(),
+                  "1",
+                  "false",
+                  "0",
+                  null,
+                  "false",
+                  null,
+                  "BLOB",
+                  null,
+                  null,
+                  null,
+                  null,
+                  null,
+                  null),
+              asList(
+                  "CLOB",
+                  "2005",
+                  "2147483647",
+                  "'",
+                  "'",
+                  singletonList("length").toString(),
+                  "1",
+                  "true",
+                  "1",
+                  null,
+                  "false",
+                  null,
+                  "CLOB",
+                  null,
+                  null,
+                  null,
+                  null,
+                  null,
+                  null),
+              asList(
+                  "XML",
+                  "2009",
+                  null,
+                  null,
+                  null,
+                  emptyList().toString(),
+                  "1",
+                  "true",
+                  "0",
+                  "false",
+                  "false",
+                  "false",
+                  "XML",
+                  null,
+                  null,
+                  null,
+                  null,
+                  null,
+                  null));
       MatcherAssert.assertThat(results, is(matchers));
     }
   }
@@ -811,45 +1282,66 @@ public void testGetTypeInfoWithFiltering() throws Exception {
 
       final List<List<String>> results = getResults(stream);
 
-      final List<List<String>> matchers = ImmutableList.of(
-          asList("BIGINT", "-5", "19", null, null, emptyList().toString(), "1", "false", "2", "false", "false", "true",
-              "BIGINT", "0", "0",
-              null, null, "10", null));
+      final List<List<String>> matchers =
+          ImmutableList.of(
+              asList(
+                  "BIGINT",
+                  "-5",
+                  "19",
+                  null,
+                  null,
+                  emptyList().toString(),
+                  "1",
+                  "false",
+                  "2",
+                  "false",
+                  "false",
+                  "true",
+                  "BIGINT",
+                  "0",
+                  "0",
+                  null,
+                  null,
+                  "10",
+                  null));
       MatcherAssert.assertThat(results, is(matchers));
     }
   }
 
   @Test
   public void testGetCommandCrossReference() throws Exception {
-    final FlightInfo flightInfo = sqlClient.getCrossReference(TableRef.of(null, null,
-        "FOREIGNTABLE"), TableRef.of(null, null, "INTTABLE"));
-    try (final FlightStream stream = sqlClient.getStream(flightInfo.getEndpoints().get(0).getTicket())) {
+    final FlightInfo flightInfo =
+        sqlClient.getCrossReference(
+            TableRef.of(null, null, "FOREIGNTABLE"), TableRef.of(null, null, "INTTABLE"));
+    try (final FlightStream stream =
+        sqlClient.getStream(flightInfo.getEndpoints().get(0).getTicket())) {
 
       final List<List<String>> results = getResults(stream);
 
-      final List<Matcher<String>> matchers = asList(
-          nullValue(String.class), // pk_catalog_name
-          is("APP"), // pk_schema_name
-          is("FOREIGNTABLE"), // pk_table_name
-          is("ID"), // pk_column_name
-          nullValue(String.class), // fk_catalog_name
-          is("APP"), // fk_schema_name
-          is("INTTABLE"), // fk_table_name
-          is("FOREIGNID"), // fk_column_name
-          is("1"), // key_sequence
-          containsString("SQL"), // fk_key_name
-          containsString("SQL"), // pk_key_name
-          is("3"), // update_rule
-          is("3")); // delete_rule
-
-      Assertions.assertEquals(1, results.size());
+      final List<Matcher<String>> matchers =
+          asList(
+              nullValue(String.class), // pk_catalog_name
+              is("APP"), // pk_schema_name
+              is("FOREIGNTABLE"), // pk_table_name
+              is("ID"), // pk_column_name
+              nullValue(String.class), // fk_catalog_name
+              is("APP"), // fk_schema_name
+              is("INTTABLE"), // fk_table_name
+              is("FOREIGNID"), // fk_column_name
+              is("1"), // key_sequence
+              containsString("SQL"), // fk_key_name
+              containsString("SQL"), // pk_key_name
+              is("3"), // update_rule
+              is("3")); // delete_rule
+
+      assertEquals(1, results.size());
       final List<Executable> assertions = new ArrayList<>();
       for (int i = 0; i < matchers.size(); i++) {
         final String actual = results.get(0).get(i);
         final Matcher<String> expected = matchers.get(i);
         assertions.add(() -> MatcherAssert.assertThat(actual, expected));
       }
-      Assertions.assertAll(assertions);
+      assertAll(assertions);
     }
   }
 
@@ -868,53 +1360,56 @@ public void testCreateStatementSchema() throws Exception {
 
   @Test
   public void testCreateStatementResults() throws Exception {
-    try (final FlightStream stream = sqlClient
-        .getStream(sqlClient.execute("SELECT * FROM intTable").getEndpoints().get(0).getTicket())) {
-      Assertions.assertAll(
+    try (final FlightStream stream =
+        sqlClient.getStream(
+            sqlClient.execute("SELECT * FROM intTable").getEndpoints().get(0).getTicket())) {
+      assertAll(
           () -> {
             MatcherAssert.assertThat(stream.getSchema(), is(SCHEMA_INT_TABLE));
           },
           () -> {
-            MatcherAssert.assertThat(getResults(stream), is(EXPECTED_RESULTS_FOR_STAR_SELECT_QUERY));
-          }
-      );
+            MatcherAssert.assertThat(
+                getResults(stream), is(EXPECTED_RESULTS_FOR_STAR_SELECT_QUERY));
+          });
     }
   }
 
   @Test
   public void testExecuteUpdate() {
-    Assertions.assertAll(
+    assertAll(
         () -> {
-          long insertedCount = sqlClient.executeUpdate("INSERT INTO INTTABLE (keyName, value) VALUES " +
-              "('KEYNAME1', 1001), ('KEYNAME2', 1002), ('KEYNAME3', 1003)");
+          long insertedCount =
+              sqlClient.executeUpdate(
+                  "INSERT INTO INTTABLE (keyName, value) VALUES "
+                      + "('KEYNAME1', 1001), ('KEYNAME2', 1002), ('KEYNAME3', 1003)");
           MatcherAssert.assertThat(insertedCount, is(3L));
-
         },
         () -> {
-          long updatedCount = sqlClient.executeUpdate("UPDATE INTTABLE SET keyName = 'KEYNAME1' " +
-              "WHERE keyName = 'KEYNAME2' OR keyName = 'KEYNAME3'");
+          long updatedCount =
+              sqlClient.executeUpdate(
+                  "UPDATE INTTABLE SET keyName = 'KEYNAME1' "
+                      + "WHERE keyName = 'KEYNAME2' OR keyName = 'KEYNAME3'");
           MatcherAssert.assertThat(updatedCount, is(2L));
-
         },
         () -> {
-          long deletedCount = sqlClient.executeUpdate("DELETE FROM INTTABLE WHERE keyName = 'KEYNAME1'");
+          long deletedCount =
+              sqlClient.executeUpdate("DELETE FROM INTTABLE WHERE keyName = 'KEYNAME1'");
           MatcherAssert.assertThat(deletedCount, is(3L));
-        }
-    );
+        });
   }
 
   @Test
   public void testQueryWithNoResultsShouldNotHang() throws Exception {
-    try (final PreparedStatement preparedStatement = sqlClient.prepare("SELECT * FROM intTable WHERE 1 = 0");
-         final FlightStream stream = sqlClient
-             .getStream(preparedStatement.execute().getEndpoints().get(0).getTicket())) {
-      Assertions.assertAll(
+    try (final PreparedStatement preparedStatement =
+            sqlClient.prepare("SELECT * FROM intTable WHERE 1 = 0");
+        final FlightStream stream =
+            sqlClient.getStream(preparedStatement.execute().getEndpoints().get(0).getTicket())) {
+      assertAll(
           () -> MatcherAssert.assertThat(stream.getSchema(), is(SCHEMA_INT_TABLE)),
           () -> {
             final List<List<String>> result = getResults(stream);
             MatcherAssert.assertThat(result, is(emptyList()));
-          }
-      );
+          });
     }
   }
 
@@ -922,22 +1417,28 @@ public void testQueryWithNoResultsShouldNotHang() throws Exception {
   public void testCancelFlightInfo() {
     FlightInfo info = sqlClient.getSqlInfo();
     CancelFlightInfoRequest request = new CancelFlightInfoRequest(info);
-    FlightRuntimeException fre = assertThrows(FlightRuntimeException.class, () -> sqlClient.cancelFlightInfo(request));
-    Assertions.assertEquals(FlightStatusCode.UNIMPLEMENTED, fre.status().code());
+    FlightRuntimeException fre =
+        assertThrows(FlightRuntimeException.class, () -> sqlClient.cancelFlightInfo(request));
+    assertEquals(FlightStatusCode.UNIMPLEMENTED, fre.status().code());
   }
 
   @Test
   public void testCancelQuery() {
     FlightInfo info = sqlClient.getSqlInfo();
-    FlightRuntimeException fre = assertThrows(FlightRuntimeException.class, () -> sqlClient.cancelQuery(info));
+    FlightRuntimeException fre =
+        assertThrows(FlightRuntimeException.class, () -> sqlClient.cancelQuery(info));
     assertEquals(FlightStatusCode.UNIMPLEMENTED, fre.status().code());
   }
 
   @Test
   public void testRenewEndpoint() {
     FlightInfo info = sqlClient.getSqlInfo();
-    FlightRuntimeException fre = assertThrows(FlightRuntimeException.class,
-        () -> sqlClient.renewFlightEndpoint(new RenewFlightEndpointRequest(info.getEndpoints().get(0))));
+    FlightRuntimeException fre =
+        assertThrows(
+            FlightRuntimeException.class,
+            () ->
+                sqlClient.renewFlightEndpoint(
+                    new RenewFlightEndpointRequest(info.getEndpoints().get(0))));
     assertEquals(FlightStatusCode.UNIMPLEMENTED, fre.status().code());
   }
 }
diff --git a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/test/TestFlightSqlStateless.java b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/test/TestFlightSqlStateless.java
new file mode 100644
index 0000000000000..36d621ad64c6a
--- /dev/null
+++ b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/test/TestFlightSqlStateless.java
@@ -0,0 +1,101 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.flight.sql.test;
+
+import static org.apache.arrow.flight.sql.util.FlightStreamUtils.getResults;
+import static org.apache.arrow.util.AutoCloseables.close;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.jupiter.api.Assertions.assertAll;
+
+import org.apache.arrow.flight.FlightClient;
+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.sql.FlightSqlClient;
+import org.apache.arrow.flight.sql.FlightSqlClient.PreparedStatement;
+import org.apache.arrow.flight.sql.example.FlightSqlStatelessExample;
+import org.apache.arrow.memory.RootAllocator;
+import org.apache.arrow.vector.IntVector;
+import org.apache.arrow.vector.VectorSchemaRoot;
+import org.apache.arrow.vector.types.pojo.Schema;
+import org.hamcrest.MatcherAssert;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/** Test direct usage of Flight SQL workflows. */
+public class TestFlightSqlStateless extends TestFlightSql {
+
+  @BeforeAll
+  public static void setUp() throws Exception {
+    setUpClientServer();
+    setUpExpectedResultsMap();
+  }
+
+  @AfterAll
+  public static void tearDown() throws Exception {
+    close(sqlClient, server, allocator);
+    FlightSqlStatelessExample.removeDerbyDatabaseIfExists(FlightSqlStatelessExample.DB_NAME);
+  }
+
+  private static void setUpClientServer() throws Exception {
+    allocator = new RootAllocator(Integer.MAX_VALUE);
+
+    final Location serverLocation = Location.forGrpcInsecure(LOCALHOST, 0);
+    server =
+        FlightServer.builder(
+                allocator,
+                serverLocation,
+                new FlightSqlStatelessExample(serverLocation, FlightSqlStatelessExample.DB_NAME))
+            .build()
+            .start();
+
+    final Location clientLocation = Location.forGrpcInsecure(LOCALHOST, server.getPort());
+    sqlClient = new FlightSqlClient(FlightClient.builder(allocator, clientLocation).build());
+  }
+
+  @Override
+  @Test
+  public void testSimplePreparedStatementResultsWithParameterBinding() throws Exception {
+    try (PreparedStatement prepare = sqlClient.prepare("SELECT * FROM intTable WHERE id = ?")) {
+      final Schema parameterSchema = prepare.getParameterSchema();
+      try (final VectorSchemaRoot insertRoot =
+          VectorSchemaRoot.create(parameterSchema, allocator)) {
+        insertRoot.allocateNew();
+
+        final IntVector valueVector = (IntVector) insertRoot.getVector(0);
+        valueVector.setSafe(0, 1);
+        insertRoot.setRowCount(1);
+
+        prepare.setParameters(insertRoot);
+        final FlightInfo flightInfo = prepare.execute();
+
+        for (FlightEndpoint endpoint : flightInfo.getEndpoints()) {
+          try (FlightStream stream = sqlClient.getStream(endpoint.getTicket())) {
+            assertAll(
+                () -> MatcherAssert.assertThat(stream.getSchema(), is(SCHEMA_INT_TABLE)),
+                () ->
+                    MatcherAssert.assertThat(
+                        getResults(stream), is(EXPECTED_RESULTS_FOR_PARAMETER_BINDING)));
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/test/TestFlightSqlStreams.java b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/test/TestFlightSqlStreams.java
index 1dd96f0fd4e9c..71c0dc88e4ec2 100644
--- a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/test/TestFlightSqlStreams.java
+++ b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/test/TestFlightSqlStreams.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql.test;
 
 import static java.util.Arrays.asList;
@@ -24,10 +23,13 @@
 import static org.apache.arrow.util.AutoCloseables.close;
 import static org.apache.arrow.vector.types.Types.MinorType.INT;
 import static org.hamcrest.CoreMatchers.is;
+import static org.junit.jupiter.api.Assertions.assertAll;
 
+import com.google.common.collect.ImmutableList;
+import com.google.protobuf.Any;
+import com.google.protobuf.Message;
 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;
@@ -53,27 +55,24 @@
 import org.apache.arrow.vector.util.Text;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import com.google.common.collect.ImmutableList;
-import com.google.protobuf.Any;
-import com.google.protobuf.Message;
-
 public class TestFlightSqlStreams {
 
   /**
-   * A limited {@link FlightSqlProducer} for testing GetTables, GetTableTypes, GetSqlInfo, and limited SQL commands.
+   * A limited {@link FlightSqlProducer} for testing GetTables, GetTableTypes, GetSqlInfo, and
+   * limited SQL commands.
    */
   private static class FlightSqlTestProducer extends BasicFlightSqlProducer {
 
-    // Note that for simplicity the getStream* implementations are blocking, but a proper FlightSqlProducer should
+    // Note that for simplicity the getStream* implementations are blocking, but a proper
+    // FlightSqlProducer should
     // have non-blocking implementations of getStream*.
 
     private static final String FIXED_QUERY = "SELECT 1 AS c1 FROM test_table";
-    private static final Schema FIXED_SCHEMA = new Schema(asList(
-        Field.nullable("c1", Types.MinorType.INT.getType())));
+    private static final Schema FIXED_SCHEMA =
+        new Schema(asList(Field.nullable("c1", Types.MinorType.INT.getType())));
 
     private BufferAllocator allocator;
 
@@ -82,39 +81,45 @@ private static class FlightSqlTestProducer extends BasicFlightSqlProducer {
     }
 
     @Override
-    protected <T extends Message> List<FlightEndpoint> determineEndpoints(T request, FlightDescriptor flightDescriptor,
-                                                                          Schema schema) {
-      if (request instanceof FlightSql.CommandGetTables ||
-          request instanceof FlightSql.CommandGetTableTypes ||
-          request instanceof FlightSql.CommandGetXdbcTypeInfo ||
-          request instanceof FlightSql.CommandGetSqlInfo) {
-        return Collections.singletonList(new FlightEndpoint(new Ticket(Any.pack(request).toByteArray())));
-      } else if (request instanceof FlightSql.CommandStatementQuery &&
-          ((FlightSql.CommandStatementQuery) request).getQuery().equals(FIXED_QUERY)) {
-
-        // Tickets from CommandStatementQuery requests should be built using TicketStatementQuery then packed() into
-        // a ticket. The content of the statement handle is specific to the FlightSqlProducer. It does not need to
+    protected <T extends Message> List<FlightEndpoint> determineEndpoints(
+        T request, FlightDescriptor flightDescriptor, Schema schema) {
+      if (request instanceof FlightSql.CommandGetTables
+          || request instanceof FlightSql.CommandGetTableTypes
+          || request instanceof FlightSql.CommandGetXdbcTypeInfo
+          || request instanceof FlightSql.CommandGetSqlInfo) {
+        return Collections.singletonList(
+            new FlightEndpoint(new Ticket(Any.pack(request).toByteArray())));
+      } else if (request instanceof FlightSql.CommandStatementQuery
+          && ((FlightSql.CommandStatementQuery) request).getQuery().equals(FIXED_QUERY)) {
+
+        // Tickets from CommandStatementQuery requests should be built using TicketStatementQuery
+        // then packed() into
+        // a ticket. The content of the statement handle is specific to the FlightSqlProducer. It
+        // does not need to
         // be the query. It can be a query ID for example.
-        FlightSql.TicketStatementQuery ticketStatementQuery = FlightSql.TicketStatementQuery.newBuilder()
-            .setStatementHandle(((FlightSql.CommandStatementQuery) request).getQueryBytes())
-            .build();
-        return Collections.singletonList(new FlightEndpoint(new Ticket(Any.pack(ticketStatementQuery).toByteArray())));
+        FlightSql.TicketStatementQuery ticketStatementQuery =
+            FlightSql.TicketStatementQuery.newBuilder()
+                .setStatementHandle(((FlightSql.CommandStatementQuery) request).getQueryBytes())
+                .build();
+        return Collections.singletonList(
+            new FlightEndpoint(new Ticket(Any.pack(ticketStatementQuery).toByteArray())));
       }
       throw CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException();
     }
 
     @Override
-    public FlightInfo getFlightInfoStatement(FlightSql.CommandStatementQuery command,
-                                             CallContext context, FlightDescriptor descriptor) {
+    public FlightInfo getFlightInfoStatement(
+        FlightSql.CommandStatementQuery command, CallContext context, FlightDescriptor descriptor) {
       return generateFlightInfo(command, descriptor, FIXED_SCHEMA);
     }
 
     @Override
-    public void getStreamStatement(FlightSql.TicketStatementQuery ticket,
-                                   CallContext context, ServerStreamListener listener) {
+    public void getStreamStatement(
+        FlightSql.TicketStatementQuery ticket, CallContext context, ServerStreamListener listener) {
       final String query = ticket.getStatementHandle().toStringUtf8();
       if (!query.equals(FIXED_QUERY)) {
-        listener.error(CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
+        listener.error(
+            CallStatus.UNIMPLEMENTED.withDescription("Not implemented.").toRuntimeException());
       }
 
       try (VectorSchemaRoot root = VectorSchemaRoot.create(FIXED_SCHEMA, allocator)) {
@@ -127,9 +132,10 @@ public void getStreamStatement(FlightSql.TicketStatementQuery ticket,
     }
 
     @Override
-    public void getStreamSqlInfo(FlightSql.CommandGetSqlInfo command, CallContext context,
-                                 ServerStreamListener listener) {
-      try (VectorSchemaRoot root = VectorSchemaRoot.create(Schemas.GET_SQL_INFO_SCHEMA, allocator)) {
+    public void getStreamSqlInfo(
+        FlightSql.CommandGetSqlInfo command, CallContext context, ServerStreamListener listener) {
+      try (VectorSchemaRoot root =
+          VectorSchemaRoot.create(Schemas.GET_SQL_INFO_SCHEMA, allocator)) {
         root.setRowCount(0);
         listener.start(root);
         listener.putNext();
@@ -138,9 +144,12 @@ public void getStreamSqlInfo(FlightSql.CommandGetSqlInfo command, CallContext co
     }
 
     @Override
-    public void getStreamTypeInfo(FlightSql.CommandGetXdbcTypeInfo request,
-                                  CallContext context, ServerStreamListener listener) {
-      try (VectorSchemaRoot root = VectorSchemaRoot.create(Schemas.GET_TYPE_INFO_SCHEMA, allocator)) {
+    public void getStreamTypeInfo(
+        FlightSql.CommandGetXdbcTypeInfo request,
+        CallContext context,
+        ServerStreamListener listener) {
+      try (VectorSchemaRoot root =
+          VectorSchemaRoot.create(Schemas.GET_TYPE_INFO_SCHEMA, allocator)) {
         root.setRowCount(1);
         ((VarCharVector) root.getVector("type_name")).setSafe(0, new Text("Integer"));
         ((IntVector) root.getVector("data_type")).setSafe(0, INT.ordinal());
@@ -148,9 +157,11 @@ public void getStreamTypeInfo(FlightSql.CommandGetXdbcTypeInfo request,
         root.getVector("literal_prefix").setNull(0);
         root.getVector("literal_suffix").setNull(0);
         root.getVector("create_params").setNull(0);
-        ((IntVector) root.getVector("nullable")).setSafe(0, FlightSql.Nullable.NULLABILITY_NULLABLE.getNumber());
+        ((IntVector) root.getVector("nullable"))
+            .setSafe(0, FlightSql.Nullable.NULLABILITY_NULLABLE.getNumber());
         ((BitVector) root.getVector("case_sensitive")).setSafe(0, 1);
-        ((IntVector) root.getVector("nullable")).setSafe(0, FlightSql.Searchable.SEARCHABLE_FULL.getNumber());
+        ((IntVector) root.getVector("nullable"))
+            .setSafe(0, FlightSql.Searchable.SEARCHABLE_FULL.getNumber());
         ((BitVector) root.getVector("unsigned_attribute")).setSafe(0, 1);
         root.getVector("fixed_prec_scale").setNull(0);
         ((BitVector) root.getVector("auto_increment")).setSafe(0, 1);
@@ -169,9 +180,10 @@ public void getStreamTypeInfo(FlightSql.CommandGetXdbcTypeInfo request,
     }
 
     @Override
-    public void getStreamTables(FlightSql.CommandGetTables command, CallContext context,
-                                ServerStreamListener listener) {
-      try (VectorSchemaRoot root = VectorSchemaRoot.create(Schemas.GET_TABLES_SCHEMA_NO_SCHEMA, allocator)) {
+    public void getStreamTables(
+        FlightSql.CommandGetTables command, CallContext context, ServerStreamListener listener) {
+      try (VectorSchemaRoot root =
+          VectorSchemaRoot.create(Schemas.GET_TABLES_SCHEMA_NO_SCHEMA, allocator)) {
         root.setRowCount(1);
         root.getVector("catalog_name").setNull(0);
         root.getVector("db_schema_name").setNull(0);
@@ -186,7 +198,8 @@ public void getStreamTables(FlightSql.CommandGetTables command, CallContext cont
 
     @Override
     public void getStreamTableTypes(CallContext context, ServerStreamListener listener) {
-      try (VectorSchemaRoot root = VectorSchemaRoot.create(Schemas.GET_TABLE_TYPES_SCHEMA, allocator)) {
+      try (VectorSchemaRoot root =
+          VectorSchemaRoot.create(Schemas.GET_TABLE_TYPES_SCHEMA, allocator)) {
         root.setRowCount(1);
         ((VarCharVector) root.getVector("table_type")).setSafe(0, new Text("TABLE"));
 
@@ -207,9 +220,10 @@ public static void setUp() throws Exception {
     allocator = new RootAllocator(Integer.MAX_VALUE);
 
     final Location serverLocation = Location.forGrpcInsecure("localhost", 0);
-    server = FlightServer.builder(allocator, serverLocation, new FlightSqlTestProducer(allocator))
-        .build()
-        .start();
+    server =
+        FlightServer.builder(allocator, serverLocation, new FlightSqlTestProducer(allocator))
+            .build()
+            .start();
 
     final Location clientLocation = Location.forGrpcInsecure("localhost", server.getPort());
     sqlClient = new FlightSqlClient(FlightClient.builder(allocator, clientLocation).build());
@@ -227,37 +241,39 @@ public static void tearDown() throws Exception {
   @Test
   public void testGetTablesResultNoSchema() throws Exception {
     try (final FlightStream stream =
-             sqlClient.getStream(
-                 sqlClient.getTables(null, null, null, null, false)
-                     .getEndpoints().get(0).getTicket())) {
-      Assertions.assertAll(
-          () -> MatcherAssert.assertThat(stream.getSchema(), is(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA_NO_SCHEMA)),
+        sqlClient.getStream(
+            sqlClient.getTables(null, null, null, null, false).getEndpoints().get(0).getTicket())) {
+      assertAll(
+          () ->
+              MatcherAssert.assertThat(
+                  stream.getSchema(), is(FlightSqlProducer.Schemas.GET_TABLES_SCHEMA_NO_SCHEMA)),
           () -> {
             final List<List<String>> results = getResults(stream);
-            final List<List<String>> expectedResults = ImmutableList.of(
-                // catalog_name | schema_name | table_name | table_type | table_schema
-                asList(null, null, "test_table", "TABLE"));
+            final List<List<String>> expectedResults =
+                ImmutableList.of(
+                    // catalog_name | schema_name | table_name | table_type | table_schema
+                    asList(null, null, "test_table", "TABLE"));
             MatcherAssert.assertThat(results, is(expectedResults));
-          }
-      );
+          });
     }
   }
 
   @Test
   public void testGetTableTypesResult() throws Exception {
     try (final FlightStream stream =
-             sqlClient.getStream(sqlClient.getTableTypes().getEndpoints().get(0).getTicket())) {
-      Assertions.assertAll(
-          () -> MatcherAssert.assertThat(stream.getSchema(), is(FlightSqlProducer.Schemas.GET_TABLE_TYPES_SCHEMA)),
+        sqlClient.getStream(sqlClient.getTableTypes().getEndpoints().get(0).getTicket())) {
+      assertAll(
+          () ->
+              MatcherAssert.assertThat(
+                  stream.getSchema(), is(FlightSqlProducer.Schemas.GET_TABLE_TYPES_SCHEMA)),
           () -> {
             final List<List<String>> tableTypes = getResults(stream);
-            final List<List<String>> expectedTableTypes = ImmutableList.of(
-                // table_type
-                singletonList("TABLE")
-            );
+            final List<List<String>> expectedTableTypes =
+                ImmutableList.of(
+                    // table_type
+                    singletonList("TABLE"));
             MatcherAssert.assertThat(tableTypes, is(expectedTableTypes));
-          }
-      );
+          });
     }
   }
 
@@ -265,10 +281,11 @@ public void testGetTableTypesResult() throws Exception {
   public void testGetSqlInfoResults() throws Exception {
     final FlightInfo info = sqlClient.getSqlInfo();
     try (final FlightStream stream = sqlClient.getStream(info.getEndpoints().get(0).getTicket())) {
-      Assertions.assertAll(
-          () -> MatcherAssert.assertThat(stream.getSchema(), is(FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA)),
-          () -> MatcherAssert.assertThat(getResults(stream), is(emptyList()))
-      );
+      assertAll(
+          () ->
+              MatcherAssert.assertThat(
+                  stream.getSchema(), is(FlightSqlProducer.Schemas.GET_SQL_INFO_SCHEMA)),
+          () -> MatcherAssert.assertThat(getResults(stream), is(emptyList())));
     }
   }
 
@@ -280,9 +297,11 @@ public void testGetTypeInfo() throws Exception {
 
       final List<List<String>> results = getResults(stream);
 
-      final List<List<String>> matchers = ImmutableList.of(
-          asList("Integer", "4", "400", null, null, "3", "true", null, "true", null, "true",
-              "Integer", null, null, "4", null, "10", null));
+      final List<List<String>> matchers =
+          ImmutableList.of(
+              asList(
+                  "Integer", "4", "400", null, null, "3", "true", null, "true", null, "true",
+                  "Integer", null, null, "4", null, "10", null));
 
       MatcherAssert.assertThat(results, is(matchers));
     }
@@ -290,12 +309,18 @@ public void testGetTypeInfo() throws Exception {
 
   @Test
   public void testExecuteQuery() throws Exception {
-    try (final FlightStream stream = sqlClient
-        .getStream(sqlClient.execute(FlightSqlTestProducer.FIXED_QUERY).getEndpoints().get(0).getTicket())) {
-      Assertions.assertAll(
-          () -> MatcherAssert.assertThat(stream.getSchema(), is(FlightSqlTestProducer.FIXED_SCHEMA)),
-          () -> MatcherAssert.assertThat(getResults(stream), is(singletonList(singletonList("1"))))
-      );
+    try (final FlightStream stream =
+        sqlClient.getStream(
+            sqlClient
+                .execute(FlightSqlTestProducer.FIXED_QUERY)
+                .getEndpoints()
+                .get(0)
+                .getTicket())) {
+      assertAll(
+          () ->
+              MatcherAssert.assertThat(stream.getSchema(), is(FlightSqlTestProducer.FIXED_SCHEMA)),
+          () ->
+              MatcherAssert.assertThat(getResults(stream), is(singletonList(singletonList("1")))));
     }
   }
 }
diff --git a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/util/AdhocTestOption.java b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/util/AdhocTestOption.java
index 6988a86049dbb..82aa883935f27 100644
--- a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/util/AdhocTestOption.java
+++ b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/util/AdhocTestOption.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql.util;
 
 import com.google.protobuf.Descriptors.EnumDescriptor;
@@ -22,7 +21,9 @@
 import com.google.protobuf.ProtocolMessageEnum;
 
 enum AdhocTestOption implements ProtocolMessageEnum {
-  OPTION_A, OPTION_B, OPTION_C;
+  OPTION_A,
+  OPTION_B,
+  OPTION_C;
 
   @Override
   public int getNumber() {
@@ -40,6 +41,7 @@ public EnumDescriptor getDescriptorForType() {
   }
 
   private UnsupportedOperationException getUnsupportedException() {
-    return new UnsupportedOperationException("Unimplemented method is irrelevant for the scope of this test.");
+    return new UnsupportedOperationException(
+        "Unimplemented method is irrelevant for the scope of this test.");
   }
 }
diff --git a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/util/FlightStreamUtils.java b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/util/FlightStreamUtils.java
index fbbe9ef01816e..58981edd34802 100644
--- a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/util/FlightStreamUtils.java
+++ b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/util/FlightStreamUtils.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql.util;
 
 import static java.util.Objects.isNull;
@@ -25,7 +24,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-
 import org.apache.arrow.flight.FlightStream;
 import org.apache.arrow.vector.BitVector;
 import org.apache.arrow.vector.FieldVector;
@@ -52,75 +50,82 @@ public static List<List<String>> getResults(FlightStream stream) {
           results.add(new ArrayList<>());
         }
 
-        root.getSchema().getFields().forEach(field -> {
-          try (final FieldVector fieldVector = root.getVector(field.getName())) {
-            if (fieldVector instanceof VarCharVector) {
-              final VarCharVector varcharVector = (VarCharVector) fieldVector;
-              for (int rowIndex = 0; rowIndex < rowCount; rowIndex++) {
-                final Text data = varcharVector.getObject(rowIndex);
-                results.get(rowIndex).add(isNull(data) ? null : data.toString());
-              }
-            } else if (fieldVector instanceof IntVector) {
-              for (int rowIndex = 0; rowIndex < rowCount; rowIndex++) {
-                Object data = fieldVector.getObject(rowIndex);
-                results.get(rowIndex).add(isNull(data) ? null : Objects.toString(data));
-              }
-            } else if (fieldVector instanceof VarBinaryVector) {
-              final VarBinaryVector varbinaryVector = (VarBinaryVector) fieldVector;
-              for (int rowIndex = 0; rowIndex < rowCount; rowIndex++) {
-                final byte[] data = varbinaryVector.getObject(rowIndex);
-                final String output;
-                try {
-                  output = isNull(data) ?
-                      null :
-                      MessageSerializer.deserializeSchema(
-                          new ReadChannel(Channels.newChannel(new ByteArrayInputStream(data)))).toJson();
-                } catch (final IOException e) {
-                  throw new RuntimeException("Failed to deserialize schema", e);
-                }
-                results.get(rowIndex).add(output);
-              }
-            } else if (fieldVector instanceof DenseUnionVector) {
-              final DenseUnionVector denseUnionVector = (DenseUnionVector) fieldVector;
-              for (int rowIndex = 0; rowIndex < rowCount; rowIndex++) {
-                final Object data = denseUnionVector.getObject(rowIndex);
-                results.get(rowIndex).add(isNull(data) ? null : Objects.toString(data));
-              }
-            } else if (fieldVector instanceof ListVector) {
-              for (int i = 0; i < fieldVector.getValueCount(); i++) {
-                if (!fieldVector.isNull(i)) {
-                  List<Text> elements = (List<Text>) ((ListVector) fieldVector).getObject(i);
-                  List<String> values = new ArrayList<>();
+        root.getSchema()
+            .getFields()
+            .forEach(
+                field -> {
+                  try (final FieldVector fieldVector = root.getVector(field.getName())) {
+                    if (fieldVector instanceof VarCharVector) {
+                      final VarCharVector varcharVector = (VarCharVector) fieldVector;
+                      for (int rowIndex = 0; rowIndex < rowCount; rowIndex++) {
+                        final Text data = varcharVector.getObject(rowIndex);
+                        results.get(rowIndex).add(isNull(data) ? null : data.toString());
+                      }
+                    } else if (fieldVector instanceof IntVector) {
+                      for (int rowIndex = 0; rowIndex < rowCount; rowIndex++) {
+                        Object data = fieldVector.getObject(rowIndex);
+                        results.get(rowIndex).add(isNull(data) ? null : Objects.toString(data));
+                      }
+                    } else if (fieldVector instanceof VarBinaryVector) {
+                      final VarBinaryVector varbinaryVector = (VarBinaryVector) fieldVector;
+                      for (int rowIndex = 0; rowIndex < rowCount; rowIndex++) {
+                        final byte[] data = varbinaryVector.getObject(rowIndex);
+                        final String output;
+                        try {
+                          output =
+                              isNull(data)
+                                  ? null
+                                  : MessageSerializer.deserializeSchema(
+                                          new ReadChannel(
+                                              Channels.newChannel(new ByteArrayInputStream(data))))
+                                      .toJson();
+                        } catch (final IOException e) {
+                          throw new RuntimeException("Failed to deserialize schema", e);
+                        }
+                        results.get(rowIndex).add(output);
+                      }
+                    } else if (fieldVector instanceof DenseUnionVector) {
+                      final DenseUnionVector denseUnionVector = (DenseUnionVector) fieldVector;
+                      for (int rowIndex = 0; rowIndex < rowCount; rowIndex++) {
+                        final Object data = denseUnionVector.getObject(rowIndex);
+                        results.get(rowIndex).add(isNull(data) ? null : Objects.toString(data));
+                      }
+                    } else if (fieldVector instanceof ListVector) {
+                      for (int i = 0; i < fieldVector.getValueCount(); i++) {
+                        if (!fieldVector.isNull(i)) {
+                          List<Text> elements =
+                              (List<Text>) ((ListVector) fieldVector).getObject(i);
+                          List<String> values = new ArrayList<>();
 
-                  for (Text element : elements) {
-                    values.add(element.toString());
-                  }
-                  results.get(i).add(values.toString());
-                }
-              }
+                          for (Text element : elements) {
+                            values.add(element.toString());
+                          }
+                          results.get(i).add(values.toString());
+                        }
+                      }
 
-            } else if (fieldVector instanceof UInt4Vector) {
-              final UInt4Vector uInt4Vector = (UInt4Vector) fieldVector;
-              for (int rowIndex = 0; rowIndex < rowCount; rowIndex++) {
-                final Object data = uInt4Vector.getObject(rowIndex);
-                results.get(rowIndex).add(isNull(data) ? null : Objects.toString(data));
-              }
-            } else if (fieldVector instanceof UInt1Vector) {
-              final UInt1Vector uInt1Vector = (UInt1Vector) fieldVector;
-              for (int rowIndex = 0; rowIndex < rowCount; rowIndex++) {
-                final Object data = uInt1Vector.getObject(rowIndex);
-                results.get(rowIndex).add(isNull(data) ? null : Objects.toString(data));
-              }
-            } else if (fieldVector instanceof BitVector) {
-              for (int rowIndex = 0; rowIndex < rowCount; rowIndex++) {
-                Object data = fieldVector.getObject(rowIndex);
-                results.get(rowIndex).add(isNull(data) ? null : Objects.toString(data));
-              }
-            } else {
-              throw new UnsupportedOperationException("Not yet implemented");
-            }
-          }
-        });
+                    } else if (fieldVector instanceof UInt4Vector) {
+                      final UInt4Vector uInt4Vector = (UInt4Vector) fieldVector;
+                      for (int rowIndex = 0; rowIndex < rowCount; rowIndex++) {
+                        final Object data = uInt4Vector.getObject(rowIndex);
+                        results.get(rowIndex).add(isNull(data) ? null : Objects.toString(data));
+                      }
+                    } else if (fieldVector instanceof UInt1Vector) {
+                      final UInt1Vector uInt1Vector = (UInt1Vector) fieldVector;
+                      for (int rowIndex = 0; rowIndex < rowCount; rowIndex++) {
+                        final Object data = uInt1Vector.getObject(rowIndex);
+                        results.get(rowIndex).add(isNull(data) ? null : Objects.toString(data));
+                      }
+                    } else if (fieldVector instanceof BitVector) {
+                      for (int rowIndex = 0; rowIndex < rowCount; rowIndex++) {
+                        Object data = fieldVector.getObject(rowIndex);
+                        results.get(rowIndex).add(isNull(data) ? null : Objects.toString(data));
+                      }
+                    } else {
+                      throw new UnsupportedOperationException("Not yet implemented");
+                    }
+                  }
+                });
       }
     }
 
diff --git a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/util/SqlInfoOptionsUtilsBitmaskCreationTest.java b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/util/SqlInfoOptionsUtilsBitmaskCreationTest.java
index dfb1b9da3e249..3e7552a0a39f3 100644
--- a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/util/SqlInfoOptionsUtilsBitmaskCreationTest.java
+++ b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/util/SqlInfoOptionsUtilsBitmaskCreationTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql.util;
 
 import static java.util.Arrays.asList;
@@ -22,10 +21,9 @@
 import static org.apache.arrow.flight.sql.util.AdhocTestOption.OPTION_B;
 import static org.apache.arrow.flight.sql.util.AdhocTestOption.OPTION_C;
 import static org.apache.arrow.flight.sql.util.SqlInfoOptionsUtils.createBitmaskFromEnums;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
-
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -33,23 +31,22 @@ public final class SqlInfoOptionsUtilsBitmaskCreationTest {
 
   public static List<Object[]> provideParameters() {
     return asList(
-        new Object[][]{
-            {new AdhocTestOption[0], 0L},
-            {new AdhocTestOption[]{OPTION_A}, 1L},
-            {new AdhocTestOption[]{OPTION_B}, 0b10L},
-            {new AdhocTestOption[]{OPTION_A, OPTION_B}, 0b11L},
-            {new AdhocTestOption[]{OPTION_C}, 0b100L},
-            {new AdhocTestOption[]{OPTION_A, OPTION_C}, 0b101L},
-            {new AdhocTestOption[]{OPTION_B, OPTION_C}, 0b110L},
-            {AdhocTestOption.values(), 0b111L},
+        new Object[][] {
+          {new AdhocTestOption[0], 0L},
+          {new AdhocTestOption[] {OPTION_A}, 1L},
+          {new AdhocTestOption[] {OPTION_B}, 0b10L},
+          {new AdhocTestOption[] {OPTION_A, OPTION_B}, 0b11L},
+          {new AdhocTestOption[] {OPTION_C}, 0b100L},
+          {new AdhocTestOption[] {OPTION_A, OPTION_C}, 0b101L},
+          {new AdhocTestOption[] {OPTION_B, OPTION_C}, 0b110L},
+          {AdhocTestOption.values(), 0b111L},
         });
   }
 
   @ParameterizedTest
   @MethodSource("provideParameters")
   public void testShouldBuildBitmaskFromEnums(
-      AdhocTestOption[] adhocTestOptions, long expectedBitmask
-  ) {
-    Assertions.assertEquals(createBitmaskFromEnums(adhocTestOptions), expectedBitmask);
+      AdhocTestOption[] adhocTestOptions, long expectedBitmask) {
+    assertEquals(createBitmaskFromEnums(adhocTestOptions), expectedBitmask);
   }
 }
diff --git a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/util/SqlInfoOptionsUtilsBitmaskParsingTest.java b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/util/SqlInfoOptionsUtilsBitmaskParsingTest.java
index 818326a582da8..f3bac067edcb2 100644
--- a/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/util/SqlInfoOptionsUtilsBitmaskParsingTest.java
+++ b/java/flight/flight-sql/src/test/java/org/apache/arrow/flight/sql/util/SqlInfoOptionsUtilsBitmaskParsingTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.flight.sql.util;
 
 import static java.util.Arrays.asList;
@@ -24,12 +23,11 @@
 import static org.apache.arrow.flight.sql.util.AdhocTestOption.OPTION_B;
 import static org.apache.arrow.flight.sql.util.AdhocTestOption.OPTION_C;
 import static org.apache.arrow.flight.sql.util.SqlInfoOptionsUtils.doesBitmaskTranslateToEnum;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
-
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
@@ -37,25 +35,26 @@ public final class SqlInfoOptionsUtilsBitmaskParsingTest {
 
   public static List<Object[]> provideParameters() {
     return asList(
-        new Object[][]{
-            {0L, EnumSet.noneOf(AdhocTestOption.class)},
-            {1L, EnumSet.of(OPTION_A)},
-            {0b10L, EnumSet.of(OPTION_B)},
-            {0b11L, EnumSet.of(OPTION_A, OPTION_B)},
-            {0b100L, EnumSet.of(OPTION_C)},
-            {0b101L, EnumSet.of(OPTION_A, OPTION_C)},
-            {0b110L, EnumSet.of(OPTION_B, OPTION_C)},
-            {0b111L, EnumSet.allOf(AdhocTestOption.class)},
+        new Object[][] {
+          {0L, EnumSet.noneOf(AdhocTestOption.class)},
+          {1L, EnumSet.of(OPTION_A)},
+          {0b10L, EnumSet.of(OPTION_B)},
+          {0b11L, EnumSet.of(OPTION_A, OPTION_B)},
+          {0b100L, EnumSet.of(OPTION_C)},
+          {0b101L, EnumSet.of(OPTION_A, OPTION_C)},
+          {0b110L, EnumSet.of(OPTION_B, OPTION_C)},
+          {0b111L, EnumSet.allOf(AdhocTestOption.class)},
         });
   }
 
   @ParameterizedTest
   @MethodSource("provideParameters")
-  public void testShouldFilterOutEnumsBasedOnBitmask(long bitmask, Set<AdhocTestOption> expectedOptions) {
+  public void testShouldFilterOutEnumsBasedOnBitmask(
+      long bitmask, Set<AdhocTestOption> expectedOptions) {
     final Set<AdhocTestOption> actualOptions =
         stream(AdhocTestOption.values())
             .filter(enumInstance -> doesBitmaskTranslateToEnum(enumInstance, bitmask))
             .collect(toCollection(() -> EnumSet.noneOf(AdhocTestOption.class)));
-    Assertions.assertEquals(actualOptions, expectedOptions);
+    assertEquals(actualOptions, expectedOptions);
   }
 }
diff --git a/java/flight/pom.xml b/java/flight/pom.xml
index 5b9caafa82ef9..38495fa356e51 100644
--- a/java/flight/pom.xml
+++ b/java/flight/pom.xml
@@ -1,47 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>arrow-java-root</artifactId>
-        <groupId>org.apache.arrow</groupId>
-        <version>16.0.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+<!--
+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
 
-    <name>Arrow Flight</name>
-    <artifactId>arrow-flight</artifactId>
+    http://www.apache.org/licenses/LICENSE-2.0
 
-    <packaging>pom</packaging>
+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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.arrow</groupId>
+    <artifactId>arrow-java-root</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>arrow-flight</artifactId>
 
-    <modules>
-        <module>flight-core</module>
-        <module>flight-sql</module>
-        <module>flight-sql-jdbc-core</module>
-        <module>flight-sql-jdbc-driver</module>
-        <module>flight-integration-tests</module>
-    </modules>
+  <packaging>pom</packaging>
 
-    <profiles>
-        <profile>
-            <id>pin-mockito-jdk8</id>
-            <activation>
-                <jdk>1.8</jdk>
-            </activation>
-            <properties>
-                <mockito.core.version>4.11.0</mockito.core.version>
-                <mockito.inline.version>5.2.0</mockito.inline.version>
-            </properties>
-        </profile>
-    </profiles>
+  <name>Arrow Flight</name>
+
+  <modules>
+    <module>flight-core</module>
+    <module>flight-sql</module>
+    <module>flight-sql-jdbc-core</module>
+    <module>flight-sql-jdbc-driver</module>
+    <module>flight-integration-tests</module>
+  </modules>
+
+  <profiles>
+    <profile>
+      <id>pin-mockito-jdk8</id>
+      <activation>
+        <jdk>1.8</jdk>
+      </activation>
+      <properties>
+        <mockito.core.version>4.11.0</mockito.core.version>
+        <mockito.inline.version>5.2.0</mockito.inline.version>
+      </properties>
+    </profile>
+  </profiles>
 </project>
diff --git a/java/format/pom.xml b/java/format/pom.xml
index a98edefbeb217..f1edfb86253c0 100644
--- a/java/format/pom.xml
+++ b/java/format/pom.xml
@@ -1,27 +1,35 @@
-<?xml version="1.0"?>
-<!-- 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. -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-<modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-<parent>
-  <artifactId>arrow-java-root</artifactId>
-  <groupId>org.apache.arrow</groupId>
-  <version>16.0.0-SNAPSHOT</version>
-</parent>
+  <parent>
+    <groupId>org.apache.arrow</groupId>
+    <artifactId>arrow-java-root</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
+  </parent>
 
-<artifactId>arrow-format</artifactId>
-<packaging>jar</packaging>
-<name>Arrow Format</name>
-<description>Generated Java files from the IPC Flatbuffer definitions.</description>
+  <artifactId>arrow-format</artifactId>
+  <packaging>jar</packaging>
+  <name>Arrow Format</name>
+  <description>Generated Java files from the IPC Flatbuffer definitions.</description>
 
   <dependencies>
     <dependency>
@@ -30,17 +38,29 @@
     </dependency>
   </dependencies>
 
- <build>
-
-  <plugins>
-    <plugin> <!-- no checkstyle on the generated code -->
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-checkstyle-plugin</artifactId>
-      <configuration>
-        <skip>true</skip>
-      </configuration>
-    </plugin>
-  </plugins>
-
-</build>
+  <build>
+    <plugins>
+      <plugin>
+        <!-- no checkstyle on the generated code -->
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <configuration>
+          <!-- no format on the generated code -->
+          <java combine.self="override">
+            <licenseHeader>
+              <file>${maven.multiModuleProjectDirectory}/dev/license/asf-java.license</file>
+              <delimiter>package</delimiter>
+            </licenseHeader>
+          </java>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Binary.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Binary.java
index 08674cbccae98..1d076742850c3 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Binary.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Binary.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -40,7 +38,7 @@
  */
 @SuppressWarnings("unused")
 public final class Binary extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Binary getRootAsBinary(ByteBuffer _bb) { return getRootAsBinary(_bb, new Binary()); }
   public static Binary getRootAsBinary(ByteBuffer _bb, Binary obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/BinaryView.java b/java/format/src/main/java/org/apache/arrow/flatbuf/BinaryView.java
index 6b58f1c6738f1..d76cf70b9b3a5 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/BinaryView.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/BinaryView.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -46,7 +44,7 @@
  */
 @SuppressWarnings("unused")
 public final class BinaryView extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static BinaryView getRootAsBinaryView(ByteBuffer _bb) { return getRootAsBinaryView(_bb, new BinaryView()); }
   public static BinaryView getRootAsBinaryView(ByteBuffer _bb, BinaryView obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Block.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Block.java
index c56d52463af85..f844e815cd7b9 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Block.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Block.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompression.java b/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompression.java
index b33006081154a..e5c93a6b75c3e 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompression.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompression.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -42,7 +40,7 @@
  */
 @SuppressWarnings("unused")
 public final class BodyCompression extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static BodyCompression getRootAsBodyCompression(ByteBuffer _bb) { return getRootAsBodyCompression(_bb, new BodyCompression()); }
   public static BodyCompression getRootAsBodyCompression(ByteBuffer _bb, BodyCompression obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompressionMethod.java b/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompressionMethod.java
index eb63b073d7027..91f846cc60366 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompressionMethod.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/BodyCompressionMethod.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 /**
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Bool.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Bool.java
index 1f0ec75d6925f..d1b61c3d30d0d 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Bool.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Bool.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -37,7 +35,7 @@
 
 @SuppressWarnings("unused")
 public final class Bool extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Bool getRootAsBool(ByteBuffer _bb) { return getRootAsBool(_bb, new Bool()); }
   public static Bool getRootAsBool(ByteBuffer _bb, Bool obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Buffer.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Buffer.java
index c92c0c1751313..6451f0fdaeec7 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Buffer.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Buffer.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/CompressionType.java b/java/format/src/main/java/org/apache/arrow/flatbuf/CompressionType.java
index c9850a2633f97..4a7467c0b2f54 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/CompressionType.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/CompressionType.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 @SuppressWarnings("unused")
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Date.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Date.java
index d52b0b18864ba..9ad3a523fe777 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Date.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Date.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -45,7 +43,7 @@
  */
 @SuppressWarnings("unused")
 public final class Date extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Date getRootAsDate(ByteBuffer _bb) { return getRootAsDate(_bb, new Date()); }
   public static Date getRootAsDate(ByteBuffer _bb, Date obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java b/java/format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java
index 75b8b4cf7a32e..6d1116e7335f9 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/DateUnit.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 @SuppressWarnings("unused")
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java
index 87c7c7bc05d3a..13b13dd917083 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Decimal.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -43,7 +41,7 @@
  */
 @SuppressWarnings("unused")
 public final class Decimal extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Decimal getRootAsDecimal(ByteBuffer _bb) { return getRootAsDecimal(_bb, new Decimal()); }
   public static Decimal getRootAsDecimal(ByteBuffer _bb, Decimal obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java
index f0e894238e9f4..b29097d8a562b 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryBatch.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -45,7 +43,7 @@
  */
 @SuppressWarnings("unused")
 public final class DictionaryBatch extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static DictionaryBatch getRootAsDictionaryBatch(ByteBuffer _bb) { return getRootAsDictionaryBatch(_bb, new DictionaryBatch()); }
   public static DictionaryBatch getRootAsDictionaryBatch(ByteBuffer _bb, DictionaryBatch obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java
index c314ebb124e25..6b94889dc8fed 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryEncoding.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -37,7 +35,7 @@
 
 @SuppressWarnings("unused")
 public final class DictionaryEncoding extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static DictionaryEncoding getRootAsDictionaryEncoding(ByteBuffer _bb) { return getRootAsDictionaryEncoding(_bb, new DictionaryEncoding()); }
   public static DictionaryEncoding getRootAsDictionaryEncoding(ByteBuffer _bb, DictionaryEncoding obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java
index ed9337a560279..7039b0522c27a 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/DictionaryKind.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 /**
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Duration.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Duration.java
index 1518bd599da95..86974b611b354 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Duration.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Duration.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -37,7 +35,7 @@
 
 @SuppressWarnings("unused")
 public final class Duration extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Duration getRootAsDuration(ByteBuffer _bb) { return getRootAsDuration(_bb, new Duration()); }
   public static Duration getRootAsDuration(ByteBuffer _bb, Duration obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Endianness.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Endianness.java
index 266cb73d505c9..f033ccb5832c3 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Endianness.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Endianness.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 /**
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Feature.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Feature.java
index c0428c0bf44a3..cad9b75c1621e 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Feature.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Feature.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 /**
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Field.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Field.java
index 9724070bc00fd..28d6fd1bad755 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Field.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Field.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -42,7 +40,7 @@
  */
 @SuppressWarnings("unused")
 public final class Field extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Field getRootAsField(ByteBuffer _bb) { return getRootAsField(_bb, new Field()); }
   public static Field getRootAsField(ByteBuffer _bb, Field obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/FieldNode.java b/java/format/src/main/java/org/apache/arrow/flatbuf/FieldNode.java
index 16594fb7d9b87..77f2cd1ca1a8e 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/FieldNode.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/FieldNode.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java b/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java
index 8e090a30e1a6c..c09e428d6f683 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeBinary.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -37,7 +35,7 @@
 
 @SuppressWarnings("unused")
 public final class FixedSizeBinary extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static FixedSizeBinary getRootAsFixedSizeBinary(ByteBuffer _bb) { return getRootAsFixedSizeBinary(_bb, new FixedSizeBinary()); }
   public static FixedSizeBinary getRootAsFixedSizeBinary(ByteBuffer _bb, FixedSizeBinary obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java b/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java
index ce96771819186..d36cd8359f99e 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/FixedSizeList.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -37,7 +35,7 @@
 
 @SuppressWarnings("unused")
 public final class FixedSizeList extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static FixedSizeList getRootAsFixedSizeList(ByteBuffer _bb) { return getRootAsFixedSizeList(_bb, new FixedSizeList()); }
   public static FixedSizeList getRootAsFixedSizeList(ByteBuffer _bb, FixedSizeList obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java b/java/format/src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java
index e602ebedd35df..72ec44d3add35 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/FloatingPoint.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -37,7 +35,7 @@
 
 @SuppressWarnings("unused")
 public final class FloatingPoint extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static FloatingPoint getRootAsFloatingPoint(ByteBuffer _bb) { return getRootAsFloatingPoint(_bb, new FloatingPoint()); }
   public static FloatingPoint getRootAsFloatingPoint(ByteBuffer _bb, FloatingPoint obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Footer.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Footer.java
index 9cc7d67bcb9d2..63f32d33cafae 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Footer.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Footer.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -42,7 +40,7 @@
  */
 @SuppressWarnings("unused")
 public final class Footer extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Footer getRootAsFooter(ByteBuffer _bb) { return getRootAsFooter(_bb, new Footer()); }
   public static Footer getRootAsFooter(ByteBuffer _bb, Footer obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Int.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Int.java
index 8bb2866c38480..5a12d82ee7b57 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Int.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Int.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -37,7 +35,7 @@
 
 @SuppressWarnings("unused")
 public final class Int extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Int getRootAsInt(ByteBuffer _bb) { return getRootAsInt(_bb, new Int()); }
   public static Int getRootAsInt(ByteBuffer _bb, Int obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Interval.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Interval.java
index c2cd1e5d6acc0..6598d4858033b 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Interval.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Interval.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -37,7 +35,7 @@
 
 @SuppressWarnings("unused")
 public final class Interval extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Interval getRootAsInterval(ByteBuffer _bb) { return getRootAsInterval(_bb, new Interval()); }
   public static Interval getRootAsInterval(ByteBuffer _bb, Interval obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java b/java/format/src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java
index 8a8332468b7bb..45b47fdf67810 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/IntervalUnit.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 @SuppressWarnings("unused")
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java b/java/format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java
index dcbd0744fd0d1..bc64bb32e59c1 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/KeyValue.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -42,7 +40,7 @@
  */
 @SuppressWarnings("unused")
 public final class KeyValue extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static KeyValue getRootAsKeyValue(ByteBuffer _bb) { return getRootAsKeyValue(_bb, new KeyValue()); }
   public static KeyValue getRootAsKeyValue(ByteBuffer _bb, KeyValue obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeBinary.java b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeBinary.java
index 65d9314858885..d32b284644ba4 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeBinary.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeBinary.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -41,7 +39,7 @@
  */
 @SuppressWarnings("unused")
 public final class LargeBinary extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static LargeBinary getRootAsLargeBinary(ByteBuffer _bb) { return getRootAsLargeBinary(_bb, new LargeBinary()); }
   public static LargeBinary getRootAsLargeBinary(ByteBuffer _bb, LargeBinary obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeList.java b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeList.java
index 144454d5bfaf5..d5ad4d1600f98 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeList.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeList.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -41,7 +39,7 @@
  */
 @SuppressWarnings("unused")
 public final class LargeList extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static LargeList getRootAsLargeList(ByteBuffer _bb) { return getRootAsLargeList(_bb, new LargeList()); }
   public static LargeList getRootAsLargeList(ByteBuffer _bb, LargeList obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeListView.java b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeListView.java
index c88ff0bdc951a..fff70d20e2320 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeListView.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeListView.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -41,7 +39,7 @@
  */
 @SuppressWarnings("unused")
 public final class LargeListView extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static LargeListView getRootAsLargeListView(ByteBuffer _bb) { return getRootAsLargeListView(_bb, new LargeListView()); }
   public static LargeListView getRootAsLargeListView(ByteBuffer _bb, LargeListView obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java
index 4c3532250dd9d..83e280020403a 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/LargeUtf8.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -41,7 +39,7 @@
  */
 @SuppressWarnings("unused")
 public final class LargeUtf8 extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static LargeUtf8 getRootAsLargeUtf8(ByteBuffer _bb) { return getRootAsLargeUtf8(_bb, new LargeUtf8()); }
   public static LargeUtf8 getRootAsLargeUtf8(ByteBuffer _bb, LargeUtf8 obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/List.java b/java/format/src/main/java/org/apache/arrow/flatbuf/List.java
index 00b56652da884..2dbd9171443de 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/List.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/List.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -37,7 +35,7 @@
 
 @SuppressWarnings("unused")
 public final class List extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static List getRootAsList(ByteBuffer _bb) { return getRootAsList(_bb, new List()); }
   public static List getRootAsList(ByteBuffer _bb, List obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/ListView.java b/java/format/src/main/java/org/apache/arrow/flatbuf/ListView.java
index e211600c0eefc..387b2b9662297 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/ListView.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/ListView.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -42,7 +40,7 @@
  */
 @SuppressWarnings("unused")
 public final class ListView extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static ListView getRootAsListView(ByteBuffer _bb) { return getRootAsListView(_bb, new ListView()); }
   public static ListView getRootAsListView(ByteBuffer _bb, ListView obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Map.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Map.java
index b8a36a8b19f79..5a100fb1735f8 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Map.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Map.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -64,7 +62,7 @@
  */
 @SuppressWarnings("unused")
 public final class Map extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Map getRootAsMap(ByteBuffer _bb) { return getRootAsMap(_bb, new Map()); }
   public static Map getRootAsMap(ByteBuffer _bb, Map obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Message.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Message.java
index 32941ad7b3d77..2349b8053a170 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Message.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Message.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -37,7 +35,7 @@
 
 @SuppressWarnings("unused")
 public final class Message extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Message getRootAsMessage(ByteBuffer _bb) { return getRootAsMessage(_bb, new Message()); }
   public static Message getRootAsMessage(ByteBuffer _bb, Message obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/MessageHeader.java b/java/format/src/main/java/org/apache/arrow/flatbuf/MessageHeader.java
index cc23ce3728cb4..f2be733f4b1b7 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/MessageHeader.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/MessageHeader.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 /**
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java b/java/format/src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java
index 83b44b50668c6..cbfa0ee90f32f 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/MetadataVersion.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 @SuppressWarnings("unused")
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Null.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Null.java
index e0cbf21b723c5..37cb705ec10cb 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Null.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Null.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -40,7 +38,7 @@
  */
 @SuppressWarnings("unused")
 public final class Null extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Null getRootAsNull(ByteBuffer _bb) { return getRootAsNull(_bb, new Null()); }
   public static Null getRootAsNull(ByteBuffer _bb, Null obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Precision.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Precision.java
index ff36882576742..e2140834ff4da 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Precision.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Precision.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 @SuppressWarnings("unused")
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/RecordBatch.java b/java/format/src/main/java/org/apache/arrow/flatbuf/RecordBatch.java
index 286ef0840a613..78208064ec018 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/RecordBatch.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/RecordBatch.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -42,7 +40,7 @@
  */
 @SuppressWarnings("unused")
 public final class RecordBatch extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static RecordBatch getRootAsRecordBatch(ByteBuffer _bb) { return getRootAsRecordBatch(_bb, new RecordBatch()); }
   public static RecordBatch getRootAsRecordBatch(ByteBuffer _bb, RecordBatch obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java b/java/format/src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java
index 89e8f0039a5ca..4ad73827b971f 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/RunEndEncoded.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -44,7 +42,7 @@
  */
 @SuppressWarnings("unused")
 public final class RunEndEncoded extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static RunEndEncoded getRootAsRunEndEncoded(ByteBuffer _bb) { return getRootAsRunEndEncoded(_bb, new RunEndEncoded()); }
   public static RunEndEncoded getRootAsRunEndEncoded(ByteBuffer _bb, RunEndEncoded obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Schema.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Schema.java
index a81c052ec0907..52c0ab26f0fe9 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Schema.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Schema.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -41,7 +39,7 @@
  */
 @SuppressWarnings("unused")
 public final class Schema extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Schema getRootAsSchema(ByteBuffer _bb) { return getRootAsSchema(_bb, new Schema()); }
   public static Schema getRootAsSchema(ByteBuffer _bb, Schema obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java
index ddfc63a11867d..160b783fe2d34 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixCompressedAxis.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 @SuppressWarnings("unused")
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java
index 9874899141172..9fc345aa4aa82 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseMatrixIndexCSX.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -40,7 +38,7 @@
  */
 @SuppressWarnings("unused")
 public final class SparseMatrixIndexCSX extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static SparseMatrixIndexCSX getRootAsSparseMatrixIndexCSX(ByteBuffer _bb) { return getRootAsSparseMatrixIndexCSX(_bb, new SparseMatrixIndexCSX()); }
   public static SparseMatrixIndexCSX getRootAsSparseMatrixIndexCSX(ByteBuffer _bb, SparseMatrixIndexCSX obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensor.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensor.java
index 62b4274146c08..3d01281204549 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensor.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensor.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -37,7 +35,7 @@
 
 @SuppressWarnings("unused")
 public final class SparseTensor extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static SparseTensor getRootAsSparseTensor(ByteBuffer _bb) { return getRootAsSparseTensor(_bb, new SparseTensor()); }
   public static SparseTensor getRootAsSparseTensor(ByteBuffer _bb, SparseTensor obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java
index f2a0455312b51..b05aef44b2573 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndex.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 @SuppressWarnings("unused")
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java
index 80c524c75c7e3..3ce20921334b8 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCOO.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -71,7 +69,7 @@
  */
 @SuppressWarnings("unused")
 public final class SparseTensorIndexCOO extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static SparseTensorIndexCOO getRootAsSparseTensorIndexCOO(ByteBuffer _bb) { return getRootAsSparseTensorIndexCOO(_bb, new SparseTensorIndexCOO()); }
   public static SparseTensorIndexCOO getRootAsSparseTensorIndexCOO(ByteBuffer _bb, SparseTensorIndexCOO obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java
index 87f269de551f5..91bb3574fd078 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/SparseTensorIndexCSF.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -40,7 +38,7 @@
  */
 @SuppressWarnings("unused")
 public final class SparseTensorIndexCSF extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static SparseTensorIndexCSF getRootAsSparseTensorIndexCSF(ByteBuffer _bb) { return getRootAsSparseTensorIndexCSF(_bb, new SparseTensorIndexCSF()); }
   public static SparseTensorIndexCSF getRootAsSparseTensorIndexCSF(ByteBuffer _bb, SparseTensorIndexCSF obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java
index 0517be6153c29..3af1c91f08c80 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Struct_.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -42,7 +40,7 @@
  */
 @SuppressWarnings("unused")
 public final class Struct_ extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Struct_ getRootAsStruct_(ByteBuffer _bb) { return getRootAsStruct_(_bb, new Struct_()); }
   public static Struct_ getRootAsStruct_(ByteBuffer _bb, Struct_ obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java
index 5892b6aca90f1..4fd46467389b7 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Tensor.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -37,7 +35,7 @@
 
 @SuppressWarnings("unused")
 public final class Tensor extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Tensor getRootAsTensor(ByteBuffer _bb) { return getRootAsTensor(_bb, new Tensor()); }
   public static Tensor getRootAsTensor(ByteBuffer _bb, Tensor obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/TensorDim.java b/java/format/src/main/java/org/apache/arrow/flatbuf/TensorDim.java
index 3c85786f409e8..1ebaa8c4339ff 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/TensorDim.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/TensorDim.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -42,7 +40,7 @@
  */
 @SuppressWarnings("unused")
 public final class TensorDim extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static TensorDim getRootAsTensorDim(ByteBuffer _bb) { return getRootAsTensorDim(_bb, new TensorDim()); }
   public static TensorDim getRootAsTensorDim(ByteBuffer _bb, TensorDim obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Time.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Time.java
index d5a320f493596..63bee08ce64e4 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Time.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Time.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -53,7 +51,7 @@
  */
 @SuppressWarnings("unused")
 public final class Time extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Time getRootAsTime(ByteBuffer _bb) { return getRootAsTime(_bb, new Time()); }
   public static Time getRootAsTime(ByteBuffer _bb, Time obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java b/java/format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java
index 2a7bfad5c614d..0df6867609b61 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/TimeUnit.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 @SuppressWarnings("unused")
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Timestamp.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Timestamp.java
index d906fbeea1b9b..d45d866daf3e1 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Timestamp.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Timestamp.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -144,7 +142,7 @@
  */
 @SuppressWarnings("unused")
 public final class Timestamp extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Timestamp getRootAsTimestamp(ByteBuffer _bb) { return getRootAsTimestamp(_bb, new Timestamp()); }
   public static Timestamp getRootAsTimestamp(ByteBuffer _bb, Timestamp obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Type.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Type.java
index 07bb34b11ca12..ba0f665f647d4 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Type.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Type.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 /**
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Union.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Union.java
index 1a106919cb137..70f007833d14f 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Union.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Union.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -43,7 +41,7 @@
  */
 @SuppressWarnings("unused")
 public final class Union extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Union getRootAsUnion(ByteBuffer _bb) { return getRootAsUnion(_bb, new Union()); }
   public static Union getRootAsUnion(ByteBuffer _bb, Union obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/UnionMode.java b/java/format/src/main/java/org/apache/arrow/flatbuf/UnionMode.java
index d66ddc318e81f..3f3eb8c728339 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/UnionMode.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/UnionMode.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 @SuppressWarnings("unused")
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java
index 60933cf25aff5..62e2eb45d5e63 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -40,7 +38,7 @@
  */
 @SuppressWarnings("unused")
 public final class Utf8 extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Utf8 getRootAsUtf8(ByteBuffer _bb) { return getRootAsUtf8(_bb, new Utf8()); }
   public static Utf8 getRootAsUtf8(ByteBuffer _bb, Utf8 obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java b/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java
index 377ba034cbb7f..792969563507a 100644
--- a/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java
+++ b/java/format/src/main/java/org/apache/arrow/flatbuf/Utf8View.java
@@ -1,21 +1,19 @@
-// 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.
-// 
-// automatically generated by the FlatBuffers compiler, do not modify
-
+/*
+ * 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.
+ */
 package org.apache.arrow.flatbuf;
 
 import com.google.flatbuffers.BaseVector;
@@ -46,7 +44,7 @@
  */
 @SuppressWarnings("unused")
 public final class Utf8View extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_23_5_26(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_24_3_25(); }
   public static Utf8View getRootAsUtf8View(ByteBuffer _bb) { return getRootAsUtf8View(_bb, new Utf8View()); }
   public static Utf8View getRootAsUtf8View(ByteBuffer _bb, Utf8View obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
diff --git a/java/gandiva/pom.xml b/java/gandiva/pom.xml
index 0d2a23345f6ea..2a1e83f3e21fc 100644
--- a/java/gandiva/pom.xml
+++ b/java/gandiva/pom.xml
@@ -1,150 +1,145 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-      <groupId>org.apache.arrow</groupId>
-      <artifactId>arrow-java-root</artifactId>
-      <version>16.0.0-SNAPSHOT</version>
-    </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.arrow</groupId>
+    <artifactId>arrow-java-root</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
+  </parent>
 
-    <groupId>org.apache.arrow.gandiva</groupId>
-    <artifactId>arrow-gandiva</artifactId>
-    <packaging>jar</packaging>
-    <name>Arrow Gandiva</name>
-    <description>Java wrappers around the native Gandiva SQL expression compiler.</description>
-    <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <protobuf.version>3.25.1</protobuf.version>
-        <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
-        <arrow.cpp.build.dir>../../../cpp/release-build</arrow.cpp.build.dir>
-    </properties>
-    <dependencies>
-        <dependency>
-            <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-memory-netty</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-vector</artifactId>
-            <classifier>${arrow.vector.classifier}</classifier>
-        </dependency>
-        <dependency>
-            <groupId>com.google.protobuf</groupId>
-            <artifactId>protobuf-java</artifactId>
-            <version>${protobuf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-    </dependencies>
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>2.2.1</version>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar-no-fork</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.6.3</version>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.1.0</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-    <build>
-        <resources>
-            <resource>
-                <directory>${arrow.cpp.build.dir}</directory>
-                <includes>
-                    <include>**/*gandiva_jni.*</include>
-                </includes>
-            </resource>
-        </resources>
+  <groupId>org.apache.arrow.gandiva</groupId>
+  <artifactId>arrow-gandiva</artifactId>
+  <packaging>jar</packaging>
+  <name>Arrow Gandiva</name>
+  <description>Java wrappers around the native Gandiva SQL expression compiler.</description>
 
-        <extensions>
-            <extension>
-                <groupId>kr.motd.maven</groupId>
-                <artifactId>os-maven-plugin</artifactId>
-                <version>1.7.1</version>
-            </extension>
-        </extensions>
+  <properties>
+    <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
+    <arrow.cpp.build.dir>../../../cpp/release-build</arrow.cpp.build.dir>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-memory-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.immutables</groupId>
+      <artifactId>value-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-memory-netty</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-vector</artifactId>
+      <classifier>${arrow.vector.classifier}</classifier>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>${arrow.cpp.build.dir}</directory>
+        <includes>
+          <include>**/*gandiva_jni.*</include>
+        </includes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.xolstice.maven.plugins</groupId>
+        <artifactId>protobuf-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>src</id>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <protoSourceRoot>proto</protoSourceRoot>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>release</id>
+      <build>
         <plugins>
-            <plugin>
-                <groupId>org.xolstice.maven.plugins</groupId>
-                <artifactId>protobuf-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>src</id>
-                        <goals>
-                            <goal>compile</goal>
-                        </goals>
-                        <configuration>
-                            <protoSourceRoot>proto</protoSourceRoot>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+                <phase>verify</phase>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
-    </build>
-
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/java/gandiva/src/main/java/module-info.java b/java/gandiva/src/main/java/module-info.java
index 533717d91f7f0..5bce445707a3b 100644
--- a/java/gandiva/src/main/java/module-info.java
+++ b/java/gandiva/src/main/java/module-info.java
@@ -26,4 +26,4 @@
   requires org.apache.arrow.vector;
   requires org.slf4j;
   requires protobuf.java;
-}
\ No newline at end of file
+}
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/ConfigurationBuilder.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/ConfigurationBuilder.java
index fa5d285b90997..70c181e8ee0b1 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/ConfigurationBuilder.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/ConfigurationBuilder.java
@@ -14,14 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
 import java.util.Objects;
 
-/**
- * Used to construct gandiva configuration objects.
- */
+/** Used to construct gandiva configuration objects. */
 public class ConfigurationBuilder {
 
   public long buildConfigInstance(ConfigOptions configOptions) {
@@ -32,9 +29,7 @@ public long buildConfigInstance(ConfigOptions configOptions) {
 
   public native void releaseConfigInstance(long configId);
 
-  /**
-   * ConfigOptions contains the configuration parameters to provide to gandiva.
-   */
+  /** ConfigOptions contains the configuration parameters to provide to gandiva. */
   public static class ConfigOptions {
     private boolean optimize = true;
     private boolean targetCPU = true;
@@ -43,8 +38,7 @@ public static ConfigOptions getDefault() {
       return new ConfigOptions();
     }
 
-    public ConfigOptions() {
-    }
+    public ConfigOptions() {}
 
     public ConfigOptions withOptimize(boolean optimize) {
       this.optimize = optimize;
@@ -66,8 +60,8 @@ public boolean equals(Object obj) {
       if (!(obj instanceof ConfigOptions)) {
         return false;
       }
-      return this.optimize == ((ConfigOptions) obj).optimize &&
-              this.targetCPU == ((ConfigOptions) obj).targetCPU;
+      return this.optimize == ((ConfigOptions) obj).optimize
+          && this.targetCPU == ((ConfigOptions) obj).targetCPU;
     }
   }
 }
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/DecimalTypeUtil.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/DecimalTypeUtil.java
index 703cfaa8be88b..13c86285c0aa5 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/DecimalTypeUtil.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/DecimalTypeUtil.java
@@ -14,21 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
 import org.apache.arrow.vector.types.pojo.ArrowType.Decimal;
 
-/**
- * Utility methods for working with {@link Decimal} values.
- */
+/** Utility methods for working with {@link Decimal} values. */
 public class DecimalTypeUtil {
-  private DecimalTypeUtil() {
-  }
+  private DecimalTypeUtil() {}
 
-  /**
-   * Enum for supported mathematical operations.
-   */
+  /** Enum for supported mathematical operations. */
   public enum OperationType {
     ADD,
     SUBTRACT,
@@ -41,11 +35,9 @@ public enum OperationType {
   /// The maximum precision representable by a 16-byte decimal
   private static final int MAX_PRECISION = 38;
 
-  /**
-   * Determines the scale and precision of applying the given operation to the operands.
-   */
-  public static Decimal getResultTypeForOperation(OperationType operation, Decimal operand1, Decimal
-          operand2) {
+  /** Determines the scale and precision of applying the given operation to the operands. */
+  public static Decimal getResultTypeForOperation(
+      OperationType operation, Decimal operand1, Decimal operand2) {
     int s1 = operand1.getScale();
     int s2 = operand2.getScale();
     int p1 = operand1.getPrecision();
@@ -56,8 +48,12 @@ public static Decimal getResultTypeForOperation(OperationType operation, Decimal
       case ADD:
       case SUBTRACT:
         resultScale = Math.max(operand1.getScale(), operand2.getScale());
-        resultPrecision = resultScale + Math.max(operand1.getPrecision() - operand1.getScale(),
-                operand2.getPrecision() - operand2.getScale()) + 1;
+        resultPrecision =
+            resultScale
+                + Math.max(
+                    operand1.getPrecision() - operand1.getScale(),
+                    operand2.getPrecision() - operand2.getScale())
+                + 1;
         break;
       case MULTIPLY:
         resultScale = s1 + s2;
@@ -65,15 +61,17 @@ public static Decimal getResultTypeForOperation(OperationType operation, Decimal
         break;
       case DIVIDE:
         resultScale =
-                Math.max(MIN_ADJUSTED_SCALE, operand1.getScale() + operand2.getPrecision() + 1);
+            Math.max(MIN_ADJUSTED_SCALE, operand1.getScale() + operand2.getPrecision() + 1);
         resultPrecision =
-                operand1.getPrecision() - operand1.getScale() + operand2.getScale() + resultScale;
+            operand1.getPrecision() - operand1.getScale() + operand2.getScale() + resultScale;
         break;
       case MOD:
         resultScale = Math.max(operand1.getScale(), operand2.getScale());
-        resultPrecision = Math.min(operand1.getPrecision() - operand1.getScale(),
-                                    operand2.getPrecision() - operand2.getScale()) +
-                           resultScale;
+        resultPrecision =
+            Math.min(
+                    operand1.getPrecision() - operand1.getScale(),
+                    operand2.getPrecision() - operand2.getScale())
+                + resultScale;
         break;
       default:
         throw new RuntimeException("Needs support");
@@ -90,6 +88,4 @@ private static Decimal adjustScaleIfNeeded(int precision, int scale) {
     }
     return new Decimal(precision, scale, 128);
   }
-
 }
-
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/ExpressionRegistry.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/ExpressionRegistry.java
index 0155af08234ad..49625edf27a53 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/ExpressionRegistry.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/ExpressionRegistry.java
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.google.protobuf.InvalidProtocolBufferException;
 import java.util.List;
 import java.util.Set;
-
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 import org.apache.arrow.gandiva.ipc.GandivaTypes.ExtGandivaType;
@@ -32,14 +33,8 @@
 import org.apache.arrow.vector.types.TimeUnit;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-import com.google.protobuf.InvalidProtocolBufferException;
-
 /**
- * Used to get the functions and data types supported by
- * Gandiva.
- * All types are in Arrow namespace.
+ * Used to get the functions and data types supported by Gandiva. All types are in Arrow namespace.
  */
 public class ExpressionRegistry {
 
@@ -55,14 +50,15 @@ public class ExpressionRegistry {
 
   private static volatile ExpressionRegistry INSTANCE;
 
-  private ExpressionRegistry(Set<ArrowType> supportedTypes,
-                             Set<FunctionSignature> functionSignatures) {
+  private ExpressionRegistry(
+      Set<ArrowType> supportedTypes, Set<FunctionSignature> functionSignatures) {
     this.supportedTypes = supportedTypes;
     this.functionSignatures = functionSignatures;
   }
 
   /**
    * Returns a singleton instance of the class.
+   *
    * @return singleton instance
    * @throws GandivaException if error in Gandiva Library integration.
    */
@@ -92,8 +88,8 @@ public Set<ArrowType> getSupportedTypes() {
   private static Set<ArrowType> getSupportedTypesFromGandiva() throws GandivaException {
     Set<ArrowType> supportedTypes = Sets.newHashSet();
     try {
-      byte[] gandivaSupportedDataTypes = new ExpressionRegistryJniHelper()
-              .getGandivaSupportedDataTypes();
+      byte[] gandivaSupportedDataTypes =
+          new ExpressionRegistryJniHelper().getGandivaSupportedDataTypes();
       GandivaDataTypes gandivaDataTypes = GandivaDataTypes.parseFrom(gandivaSupportedDataTypes);
       for (ExtGandivaType type : gandivaDataTypes.getDataTypeList()) {
         supportedTypes.add(getArrowType(type));
@@ -104,15 +100,14 @@ private static Set<ArrowType> getSupportedTypesFromGandiva() throws GandivaExcep
     return supportedTypes;
   }
 
-  private static Set<FunctionSignature> getSupportedFunctionsFromGandiva() throws
-          GandivaException {
+  private static Set<FunctionSignature> getSupportedFunctionsFromGandiva() throws GandivaException {
     Set<FunctionSignature> supportedTypes = Sets.newHashSet();
     try {
-      byte[] gandivaSupportedFunctions = new ExpressionRegistryJniHelper()
-              .getGandivaSupportedFunctions();
+      byte[] gandivaSupportedFunctions =
+          new ExpressionRegistryJniHelper().getGandivaSupportedFunctions();
       GandivaFunctions gandivaFunctions = GandivaFunctions.parseFrom(gandivaSupportedFunctions);
-      for (GandivaTypes.FunctionSignature protoFunctionSignature
-              : gandivaFunctions.getFunctionList()) {
+      for (GandivaTypes.FunctionSignature protoFunctionSignature :
+          gandivaFunctions.getFunctionList()) {
 
         String functionName = protoFunctionSignature.getName();
         ArrowType returnType = getArrowType(protoFunctionSignature.getReturnType());
@@ -120,8 +115,8 @@ private static Set<FunctionSignature> getSupportedFunctionsFromGandiva() throws
         for (ExtGandivaType type : protoFunctionSignature.getParamTypesList()) {
           paramTypes.add(getArrowType(type));
         }
-        FunctionSignature functionSignature = new FunctionSignature(functionName,
-                                                                    returnType, paramTypes);
+        FunctionSignature functionSignature =
+            new FunctionSignature(functionName, returnType, paramTypes);
         supportedTypes.add(functionSignature);
       }
     } catch (InvalidProtocolBufferException invalidProtException) {
@@ -167,11 +162,9 @@ private static ArrowType getArrowType(ExtGandivaType type) {
       case GandivaType.TIMESTAMP_VALUE:
         return new ArrowType.Timestamp(mapArrowTimeUnit(type.getTimeUnit()), null);
       case GandivaType.TIME32_VALUE:
-        return new ArrowType.Time(mapArrowTimeUnit(type.getTimeUnit()),
-                BIT_WIDTH_32);
+        return new ArrowType.Time(mapArrowTimeUnit(type.getTimeUnit()), BIT_WIDTH_32);
       case GandivaType.TIME64_VALUE:
-        return new ArrowType.Time(mapArrowTimeUnit(type.getTimeUnit()),
-                BIT_WIDTH_64);
+        return new ArrowType.Time(mapArrowTimeUnit(type.getTimeUnit()), BIT_WIDTH_64);
       case GandivaType.NONE_VALUE:
         return new ArrowType.Null();
       case GandivaType.DECIMAL_VALUE:
@@ -215,6 +208,4 @@ private static IntervalUnit mapArrowIntervalUnit(GandivaTypes.IntervalType inter
         return null;
     }
   }
-
 }
-
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/ExpressionRegistryJniHelper.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/ExpressionRegistryJniHelper.java
index 86c1eaaedac8b..6c0ee1f2751a7 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/ExpressionRegistryJniHelper.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/ExpressionRegistryJniHelper.java
@@ -14,13 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
-/**
- * JNI Adapter used to get supported types and functions
- * from Gandiva.
- */
+/** JNI Adapter used to get supported types and functions from Gandiva. */
 class ExpressionRegistryJniHelper {
 
   native byte[] getGandivaSupportedDataTypes();
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/Filter.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/Filter.java
index 010d644d107a2..f584564e0920c 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/Filter.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/Filter.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.arrow.gandiva.exceptions.EvaluatorClosedException;
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.expression.ArrowTypeHelper;
@@ -59,7 +57,7 @@ private Filter(JniWrapper wrapper, long moduleId, Schema schema) {
    * Filter::Evaluate() against a RecordBatch to evaluate the filter on this record batch
    *
    * @param schema Table schema. The field names in the schema should match the fields used to
-   *               create the TreeNodes
+   *     create the TreeNodes
    * @param condition condition to be evaluated against data
    * @return A native filter object that can be used to invoke on a RecordBatch
    */
@@ -72,13 +70,14 @@ public static Filter make(Schema schema, Condition condition) throws GandivaExce
    * Filter::Evaluate() against a RecordBatch to evaluate the filter on this record batch
    *
    * @param schema Table schema. The field names in the schema should match the fields used to
-   *               create the TreeNodes
+   *     create the TreeNodes
    * @param condition condition to be evaluated against data
    * @param configOptions ConfigOptions parameter
    * @return A native filter object that can be used to invoke on a RecordBatch
    */
-  public static Filter make(Schema schema, Condition condition, ConfigurationBuilder.ConfigOptions configOptions)
-          throws GandivaException {
+  public static Filter make(
+      Schema schema, Condition condition, ConfigurationBuilder.ConfigOptions configOptions)
+      throws GandivaException {
     return make(schema, condition, JniLoader.getConfiguration(configOptions));
   }
 
@@ -87,15 +86,19 @@ public static Filter make(Schema schema, Condition condition, ConfigurationBuild
    * Filter::Evaluate() against a RecordBatch to evaluate the filter on this record batch
    *
    * @param schema Table schema. The field names in the schema should match the fields used to
-   *               create the TreeNodes
+   *     create the TreeNodes
    * @param condition condition to be evaluated against data
    * @param optimize Flag to choose if the generated llvm code is to be optimized
    * @return A native filter object that can be used to invoke on a RecordBatch
    */
   @Deprecated
-  public static Filter make(Schema schema, Condition condition, boolean optimize) throws GandivaException {
-    return make(schema, condition, JniLoader.getConfiguration((new ConfigurationBuilder.ConfigOptions())
-            .withOptimize(optimize)));
+  public static Filter make(Schema schema, Condition condition, boolean optimize)
+      throws GandivaException {
+    return make(
+        schema,
+        condition,
+        JniLoader.getConfiguration(
+            (new ConfigurationBuilder.ConfigOptions()).withOptimize(optimize)));
   }
 
   /**
@@ -103,7 +106,7 @@ public static Filter make(Schema schema, Condition condition, boolean optimize)
    * Filter::Evaluate() against a RecordBatch to evaluate the filter on this record batch
    *
    * @param schema Table schema. The field names in the schema should match the fields used to
-   *               create the TreeNodes
+   *     create the TreeNodes
    * @param condition condition to be evaluated against data
    * @param configurationId Custom configuration created through config builder.
    * @return A native evaluator object that can be used to invoke these projections on a RecordBatch
@@ -114,8 +117,8 @@ public static Filter make(Schema schema, Condition condition, long configuration
     GandivaTypes.Condition conditionBuf = condition.toProtobuf();
     GandivaTypes.Schema schemaBuf = ArrowTypeHelper.arrowSchemaToProtobuf(schema);
     JniWrapper wrapper = JniLoader.getInstance().getWrapper();
-    long moduleId = wrapper.buildFilter(schemaBuf.toByteArray(),
-        conditionBuf.toByteArray(), configurationId);
+    long moduleId =
+        wrapper.buildFilter(schemaBuf.toByteArray(), conditionBuf.toByteArray(), configurationId);
     logger.debug("Created module for the filter with id {}", moduleId);
     return new Filter(wrapper, moduleId, schema);
   }
@@ -128,7 +131,10 @@ public static Filter make(Schema schema, Condition condition, long configuration
    */
   public void evaluate(ArrowRecordBatch recordBatch, SelectionVector selectionVector)
       throws GandivaException {
-    evaluate(recordBatch.getLength(), recordBatch.getBuffers(), recordBatch.getBuffersLayout(),
+    evaluate(
+        recordBatch.getLength(),
+        recordBatch.getBuffers(),
+        recordBatch.getBuffersLayout(),
         selectionVector);
   }
 
@@ -140,8 +146,8 @@ public void evaluate(ArrowRecordBatch recordBatch, SelectionVector selectionVect
    * @param buffers List of input arrow buffers
    * @param selectionVector Result of applying the filter on the data
    */
-  public void evaluate(int numRows, List<ArrowBuf> buffers,
-      SelectionVector selectionVector) throws GandivaException {
+  public void evaluate(int numRows, List<ArrowBuf> buffers, SelectionVector selectionVector)
+      throws GandivaException {
     List<ArrowBuffer> buffersLayout = new ArrayList<>();
     long offset = 0;
     for (ArrowBuf arrowBuf : buffers) {
@@ -152,14 +158,21 @@ public void evaluate(int numRows, List<ArrowBuf> buffers,
     evaluate(numRows, buffers, buffersLayout, selectionVector);
   }
 
-  private void evaluate(int numRows, List<ArrowBuf> buffers, List<ArrowBuffer> buffersLayout,
-      SelectionVector selectionVector) throws GandivaException {
+  private void evaluate(
+      int numRows,
+      List<ArrowBuf> buffers,
+      List<ArrowBuffer> buffersLayout,
+      SelectionVector selectionVector)
+      throws GandivaException {
     if (this.closed) {
       throw new EvaluatorClosedException();
     }
     if (selectionVector.getMaxRecords() < numRows) {
-      logger.error("selectionVector has capacity for " + selectionVector.getMaxRecords() +
-          " rows, minimum required " + numRows);
+      logger.error(
+          "selectionVector has capacity for "
+              + selectionVector.getMaxRecords()
+              + " rows, minimum required "
+              + numRows);
       throw new GandivaException("SelectionVector too small");
     }
 
@@ -176,18 +189,21 @@ private void evaluate(int numRows, List<ArrowBuf> buffers, List<ArrowBuffer> buf
       bufSizes[idx++] = bufLayout.getSize();
     }
 
-    int numRecords = wrapper.evaluateFilter(this.moduleId, numRows,
-        bufAddrs, bufSizes,
-        selectionVector.getType().getNumber(),
-        selectionVector.getBuffer().memoryAddress(), selectionVector.getBuffer().capacity());
+    int numRecords =
+        wrapper.evaluateFilter(
+            this.moduleId,
+            numRows,
+            bufAddrs,
+            bufSizes,
+            selectionVector.getType().getNumber(),
+            selectionVector.getBuffer().memoryAddress(),
+            selectionVector.getBuffer().capacity());
     if (numRecords >= 0) {
       selectionVector.setRecordCount(numRecords);
     }
   }
 
-  /**
-   * Closes the LLVM module representing this filter.
-   */
+  /** Closes the LLVM module representing this filter. */
   public void close() throws GandivaException {
     if (this.closed) {
       return;
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/FunctionSignature.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/FunctionSignature.java
index d01881843de47..164b6aaac6684 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/FunctionSignature.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/FunctionSignature.java
@@ -14,19 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
-import java.util.List;
-
-import org.apache.arrow.vector.types.pojo.ArrowType;
-
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
+import java.util.List;
+import org.apache.arrow.vector.types.pojo.ArrowType;
 
-/**
- * POJO to define a function signature.
- */
+/** POJO to define a function signature. */
 public class FunctionSignature {
   private final String name;
   private final ArrowType returnType;
@@ -46,6 +41,7 @@ public String getName() {
 
   /**
    * Ctor.
+   *
    * @param name - name of the function.
    * @param returnType - data type of return
    * @param paramTypes - data type of input args.
@@ -58,6 +54,7 @@ public FunctionSignature(String name, ArrowType returnType, List<ArrowType> para
 
   /**
    * Override equals.
+   *
    * @param signature - signature to compare
    * @return true if equal and false if not.
    */
@@ -69,9 +66,9 @@ public boolean equals(Object signature) {
       return false;
     }
     final FunctionSignature other = (FunctionSignature) signature;
-    return this.name.equalsIgnoreCase(other.name) &&
-        Objects.equal(this.returnType, other.returnType) &&
-        Objects.equal(this.paramTypes, other.paramTypes);
+    return this.name.equalsIgnoreCase(other.name)
+        && Objects.equal(this.returnType, other.returnType)
+        && Objects.equal(this.paramTypes, other.paramTypes);
   }
 
   @Override
@@ -82,12 +79,9 @@ public int hashCode() {
   @Override
   public String toString() {
     return MoreObjects.toStringHelper(this)
-            .add("name ", name)
-            .add("return type ", returnType)
-            .add("param types ", paramTypes)
-            .toString();
-
+        .add("name ", name)
+        .add("return type ", returnType)
+        .add("param types ", paramTypes)
+        .toString();
   }
-
-
 }
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/JniLoader.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/JniLoader.java
index 57748e9c8e1af..6f4cdc58c5a98 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/JniLoader.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/JniLoader.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
 import static java.util.UUID.randomUUID;
@@ -27,19 +26,16 @@
 import java.util.Locale;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 
-/**
- * This class handles loading of the jni library, and acts as a bridge for the native functions.
- */
+/** This class handles loading of the jni library, and acts as a bridge for the native functions. */
 class JniLoader {
   private static final String LIBRARY_NAME = "gandiva_jni";
 
   private static volatile JniLoader INSTANCE;
   private static volatile long defaultConfiguration = 0L;
-  private static final ConcurrentMap<ConfigurationBuilder.ConfigOptions, Long> configurationMap
-          = new ConcurrentHashMap<>();
+  private static final ConcurrentMap<ConfigurationBuilder.ConfigOptions, Long> configurationMap =
+      new ConcurrentHashMap<>();
 
   private final JniWrapper wrapper;
 
@@ -69,7 +65,7 @@ private static JniLoader setupInstance() throws GandivaException {
   }
 
   private static void loadGandivaLibraryFromJar(final String tmpDir)
-          throws IOException, GandivaException {
+      throws IOException, GandivaException {
     final String libraryToLoad =
         LIBRARY_NAME + "/" + getNormalizedArch() + "/" + System.mapLibraryName(LIBRARY_NAME);
     final File libraryFile = moveFileFromJarToTemp(tmpDir, libraryToLoad, LIBRARY_NAME);
@@ -91,11 +87,12 @@ private static String getNormalizedArch() {
     return arch;
   }
 
-  private static File moveFileFromJarToTemp(final String tmpDir, String libraryToLoad, String libraryName)
-          throws IOException, GandivaException {
+  private static File moveFileFromJarToTemp(
+      final String tmpDir, String libraryToLoad, String libraryName)
+      throws IOException, GandivaException {
     final File temp = setupFile(tmpDir, libraryName);
-    try (final InputStream is = JniLoader.class.getClassLoader()
-            .getResourceAsStream(libraryToLoad)) {
+    try (final InputStream is =
+        JniLoader.class.getClassLoader().getResourceAsStream(libraryToLoad)) {
       if (is == null) {
         throw new GandivaException(libraryToLoad + " was not found inside JAR.");
       } else {
@@ -106,37 +103,34 @@ private static File moveFileFromJarToTemp(final String tmpDir, String libraryToL
   }
 
   private static File setupFile(String tmpDir, String libraryToLoad)
-          throws IOException, GandivaException {
+      throws IOException, GandivaException {
     // accommodate multiple processes running with gandiva jar.
     // length should be ok since uuid is only 36 characters.
     final String randomizeFileName = libraryToLoad + randomUUID();
     final File temp = new File(tmpDir, randomizeFileName);
     if (temp.exists() && !temp.delete()) {
-      throw new GandivaException("File: " + temp.getAbsolutePath() +
-          " already exists and cannot be removed.");
+      throw new GandivaException(
+          "File: " + temp.getAbsolutePath() + " already exists and cannot be removed.");
     }
     if (!temp.createNewFile()) {
-      throw new GandivaException("File: " + temp.getAbsolutePath() +
-          " could not be created.");
+      throw new GandivaException("File: " + temp.getAbsolutePath() + " could not be created.");
     }
     temp.deleteOnExit();
     return temp;
   }
 
-  /**
-   * Returns the jni wrapper.
-   */
+  /** Returns the jni wrapper. */
   JniWrapper getWrapper() throws GandivaException {
     return wrapper;
   }
 
-  static long getConfiguration(ConfigurationBuilder.ConfigOptions configOptions) throws GandivaException {
+  static long getConfiguration(ConfigurationBuilder.ConfigOptions configOptions)
+      throws GandivaException {
     if (!configurationMap.containsKey(configOptions)) {
       synchronized (ConfigurationBuilder.class) {
         if (!configurationMap.containsKey(configOptions)) {
           JniLoader.getInstance(); // setup
-          long configInstance = new ConfigurationBuilder()
-                  .buildConfigInstance(configOptions);
+          long configInstance = new ConfigurationBuilder().buildConfigInstance(configOptions);
           configurationMap.put(configOptions, configInstance);
           if (ConfigurationBuilder.ConfigOptions.getDefault().equals(configOptions)) {
             defaultConfiguration = configInstance;
@@ -150,6 +144,7 @@ static long getConfiguration(ConfigurationBuilder.ConfigOptions configOptions) t
 
   /**
    * Get the default configuration to invoke gandiva.
+   *
    * @return default configuration
    * @throws GandivaException if unable to get native builder instance.
    */
@@ -158,9 +153,10 @@ static long getDefaultConfiguration() throws GandivaException {
       synchronized (ConfigurationBuilder.class) {
         if (defaultConfiguration == 0L) {
           JniLoader.getInstance(); // setup
-          ConfigurationBuilder.ConfigOptions defaultConfigOptions = ConfigurationBuilder.ConfigOptions.getDefault();
-          defaultConfiguration = new ConfigurationBuilder()
-            .buildConfigInstance(defaultConfigOptions);
+          ConfigurationBuilder.ConfigOptions defaultConfigOptions =
+              ConfigurationBuilder.ConfigOptions.getDefault();
+          defaultConfiguration =
+              new ConfigurationBuilder().buildConfigInstance(defaultConfigOptions);
           configurationMap.put(defaultConfigOptions, defaultConfiguration);
         }
       }
@@ -168,14 +164,13 @@ static long getDefaultConfiguration() throws GandivaException {
     return defaultConfiguration;
   }
 
-  /**
-   * Remove the configuration.
-   */
+  /** Remove the configuration. */
   static void removeConfiguration(ConfigurationBuilder.ConfigOptions configOptions) {
     if (configurationMap.containsKey(configOptions)) {
       synchronized (ConfigurationBuilder.class) {
         if (configurationMap.containsKey(configOptions)) {
-          (new ConfigurationBuilder()).releaseConfigInstance(configurationMap.remove(configOptions));
+          (new ConfigurationBuilder())
+              .releaseConfigInstance(configurationMap.remove(configOptions));
           if (configOptions.equals(ConfigurationBuilder.ConfigOptions.getDefault())) {
             defaultConfiguration = 0;
           }
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/JniWrapper.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/JniWrapper.java
index 520ef5f443e18..acb25ebae28a9 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/JniWrapper.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/JniWrapper.java
@@ -14,59 +14,60 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 
 /**
- * This class is implemented in JNI. This provides the Java interface
- * to invoke functions in JNI.
- * This file is used to generated the .h files required for jni. Avoid all
- * external dependencies in this file.
+ * This class is implemented in JNI. This provides the Java interface to invoke functions in JNI.
+ * This file is used to generated the .h files required for jni. Avoid all external dependencies in
+ * this file.
  */
 public class JniWrapper {
 
   /**
-   * Generates the projector module to evaluate the expressions with
-   * custom configuration.
+   * Generates the projector module to evaluate the expressions with custom configuration.
    *
-   * @param schemaBuf   The schema serialized as a protobuf. See Types.proto
-   *                    to see the protobuf specification
-   * @param exprListBuf The serialized protobuf of the expression vector. Each
-   *                    expression is created using TreeBuilder::MakeExpression.
+   * @param schemaBuf The schema serialized as a protobuf. See Types.proto to see the protobuf
+   *     specification
+   * @param exprListBuf The serialized protobuf of the expression vector. Each expression is created
+   *     using TreeBuilder::MakeExpression.
    * @param selectionVectorType type of selection vector
-   * @param configId    Configuration to gandiva.
+   * @param configId Configuration to gandiva.
    * @return A moduleId that is passed to the evaluateProjector() and closeProjector() methods
-   *
    */
-  native long buildProjector(byte[] schemaBuf, byte[] exprListBuf,
-                             int selectionVectorType,
-                             long configId) throws GandivaException;
+  native long buildProjector(
+      byte[] schemaBuf, byte[] exprListBuf, int selectionVectorType, long configId)
+      throws GandivaException;
 
   /**
-   * Evaluate the expressions represented by the moduleId on a record batch
-   * and store the output in ValueVectors. Throws an exception in case of errors
+   * Evaluate the expressions represented by the moduleId on a record batch and store the output in
+   * ValueVectors. Throws an exception in case of errors
    *
    * @param expander VectorExpander object. Used for callbacks from cpp.
-   * @param moduleId moduleId representing expressions. Created using a call to
-   *                 buildNativeCode
+   * @param moduleId moduleId representing expressions. Created using a call to buildNativeCode
    * @param numRows Number of rows in the record batch
-   * @param bufAddrs An array of memory addresses. Each memory address points to
-   *                 a validity vector or a data vector (will add support for offset
-   *                 vectors later).
-   * @param bufSizes An array of buffer sizes. For each memory address in bufAddrs,
-   *                 the size of the buffer is present in bufSizes
-   * @param outAddrs An array of output buffers, including the validity and data
-   *                 addresses.
-   * @param outSizes The allocated size of the output buffers. On successful evaluation,
-   *                 the result is stored in the output buffers
+   * @param bufAddrs An array of memory addresses. Each memory address points to a validity vector
+   *     or a data vector (will add support for offset vectors later).
+   * @param bufSizes An array of buffer sizes. For each memory address in bufAddrs, the size of the
+   *     buffer is present in bufSizes
+   * @param outAddrs An array of output buffers, including the validity and data addresses.
+   * @param outSizes The allocated size of the output buffers. On successful evaluation, the result
+   *     is stored in the output buffers
    */
-  native void evaluateProjector(Object expander, long moduleId, int numRows,
-                                long[] bufAddrs, long[] bufSizes,
-                                int selectionVectorType, int selectionVectorSize,
-                                long selectionVectorBufferAddr, long selectionVectorBufferSize,
-                                long[] outAddrs, long[] outSizes) throws GandivaException;
+  native void evaluateProjector(
+      Object expander,
+      long moduleId,
+      int numRows,
+      long[] bufAddrs,
+      long[] bufSizes,
+      int selectionVectorType,
+      int selectionVectorSize,
+      long selectionVectorBufferAddr,
+      long selectionVectorBufferSize,
+      long[] outAddrs,
+      long[] outSizes)
+      throws GandivaException;
 
   /**
    * Closes the projector referenced by moduleId.
@@ -76,40 +77,42 @@ native void evaluateProjector(Object expander, long moduleId, int numRows,
   native void closeProjector(long moduleId);
 
   /**
-   * Generates the filter module to evaluate the condition expression with
-   * custom configuration.
+   * Generates the filter module to evaluate the condition expression with custom configuration.
    *
-   * @param schemaBuf    The schema serialized as a protobuf. See Types.proto
-   *                     to see the protobuf specification
-   * @param conditionBuf The serialized protobuf of the condition expression. Each
-   *                     expression is created using TreeBuilder::MakeCondition
-   * @param configId     Configuration to gandiva.
+   * @param schemaBuf The schema serialized as a protobuf. See Types.proto to see the protobuf
+   *     specification
+   * @param conditionBuf The serialized protobuf of the condition expression. Each expression is
+   *     created using TreeBuilder::MakeCondition
+   * @param configId Configuration to gandiva.
    * @return A moduleId that is passed to the evaluateFilter() and closeFilter() methods
-   *
    */
-  native long buildFilter(byte[] schemaBuf, byte[] conditionBuf,
-                          long configId) throws GandivaException;
+  native long buildFilter(byte[] schemaBuf, byte[] conditionBuf, long configId)
+      throws GandivaException;
 
   /**
-   * Evaluate the filter represented by the moduleId on a record batch
-   * and store the output in buffer 'outAddr'. Throws an exception in case of errors
+   * Evaluate the filter represented by the moduleId on a record batch and store the output in
+   * buffer 'outAddr'. Throws an exception in case of errors
    *
-   * @param moduleId moduleId representing expressions. Created using a call to
-   *                 buildNativeCode
+   * @param moduleId moduleId representing expressions. Created using a call to buildNativeCode
    * @param numRows Number of rows in the record batch
-   * @param bufAddrs An array of memory addresses. Each memory address points to
-   *                 a validity vector or a data vector (will add support for offset
-   *                 vectors later).
-   * @param bufSizes An array of buffer sizes. For each memory address in bufAddrs,
-   *                 the size of the buffer is present in bufSizes
+   * @param bufAddrs An array of memory addresses. Each memory address points to a validity vector
+   *     or a data vector (will add support for offset vectors later).
+   * @param bufSizes An array of buffer sizes. For each memory address in bufAddrs, the size of the
+   *     buffer is present in bufSizes
    * @param selectionVectorType type of selection vector
-   * @param outAddr  output buffer, whose type is represented by selectionVectorType
-   * @param outSize The allocated size of the output buffer. On successful evaluation,
-   *                the result is stored in the output buffer
+   * @param outAddr output buffer, whose type is represented by selectionVectorType
+   * @param outSize The allocated size of the output buffer. On successful evaluation, the result is
+   *     stored in the output buffer
    */
-  native int evaluateFilter(long moduleId, int numRows, long[] bufAddrs, long[] bufSizes,
-                            int selectionVectorType,
-                            long outAddr, long outSize) throws GandivaException;
+  native int evaluateFilter(
+      long moduleId,
+      int numRows,
+      long[] bufAddrs,
+      long[] bufSizes,
+      int selectionVectorType,
+      long outAddr,
+      long outSize)
+      throws GandivaException;
 
   /**
    * Closes the filter referenced by moduleId.
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/Projector.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/Projector.java
index 471ddbced0e66..5c16c46e5ea46 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/Projector.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/Projector.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.arrow.gandiva.exceptions.EvaluatorClosedException;
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.exceptions.UnsupportedTypeException;
@@ -37,16 +35,13 @@
 import org.apache.arrow.vector.types.pojo.Schema;
 
 /**
- * This class provides a mechanism to evaluate a set of expressions against a RecordBatch.
- * Follow these steps to use this class:
- * 1) Use the static method make() to create an instance of this class that evaluates a
- *    set of expressions
- * 2) Invoke the method evaluate() to evaluate these expressions against a RecordBatch
- * 3) Invoke close() to release resources
+ * This class provides a mechanism to evaluate a set of expressions against a RecordBatch. Follow
+ * these steps to use this class: 1) Use the static method make() to create an instance of this
+ * class that evaluates a set of expressions 2) Invoke the method evaluate() to evaluate these
+ * expressions against a RecordBatch 3) Invoke close() to release resources
  */
 public class Projector {
-  private static final org.slf4j.Logger logger =
-          org.slf4j.LoggerFactory.getLogger(Projector.class);
+  private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(Projector.class);
 
   private JniWrapper wrapper;
   private final long moduleId;
@@ -63,130 +58,142 @@ private Projector(JniWrapper wrapper, long moduleId, Schema schema, int numExprs
   }
 
   /**
-   * Invoke this function to generate LLVM code to evaluate the list of project expressions.
-   * Invoke Projector::Evaluate() against a RecordBatch to evaluate the record batch
-   * against these projections.
-   *
-   * @param schema Table schema. The field names in the schema should match the fields used
-   *               to create the TreeNodes
-   * @param exprs  List of expressions to be evaluated against data
+   * Invoke this function to generate LLVM code to evaluate the list of project expressions. Invoke
+   * Projector::Evaluate() against a RecordBatch to evaluate the record batch against these
+   * projections.
    *
+   * @param schema Table schema. The field names in the schema should match the fields used to
+   *     create the TreeNodes
+   * @param exprs List of expressions to be evaluated against data
    * @return A native evaluator object that can be used to invoke these projections on a RecordBatch
    */
-  public static Projector make(Schema schema, List<ExpressionTree> exprs)
-      throws GandivaException {
+  public static Projector make(Schema schema, List<ExpressionTree> exprs) throws GandivaException {
     return make(schema, exprs, SelectionVectorType.SV_NONE, JniLoader.getDefaultConfiguration());
   }
 
   /**
-   * Invoke this function to generate LLVM code to evaluate the list of project expressions.
-   * Invoke Projector::Evaluate() against a RecordBatch to evaluate the record batch
-   * against these projections.
+   * Invoke this function to generate LLVM code to evaluate the list of project expressions. Invoke
+   * Projector::Evaluate() against a RecordBatch to evaluate the record batch against these
+   * projections.
    *
-   * @param schema Table schema. The field names in the schema should match the fields used
-   *               to create the TreeNodes
-   * @param exprs  List of expressions to be evaluated against data
+   * @param schema Table schema. The field names in the schema should match the fields used to
+   *     create the TreeNodes
+   * @param exprs List of expressions to be evaluated against data
    * @param configOptions ConfigOptions parameter
-   *
    * @return A native evaluator object that can be used to invoke these projections on a RecordBatch
    */
-  public static Projector make(Schema schema, List<ExpressionTree> exprs,
-                               ConfigurationBuilder.ConfigOptions configOptions) throws GandivaException {
-    return make(schema, exprs, SelectionVectorType.SV_NONE, JniLoader.getConfiguration(configOptions));
+  public static Projector make(
+      Schema schema, List<ExpressionTree> exprs, ConfigurationBuilder.ConfigOptions configOptions)
+      throws GandivaException {
+    return make(
+        schema, exprs, SelectionVectorType.SV_NONE, JniLoader.getConfiguration(configOptions));
   }
 
   /**
-   * Invoke this function to generate LLVM code to evaluate the list of project expressions.
-   * Invoke Projector::Evaluate() against a RecordBatch to evaluate the record batch
-   * against these projections.
+   * Invoke this function to generate LLVM code to evaluate the list of project expressions. Invoke
+   * Projector::Evaluate() against a RecordBatch to evaluate the record batch against these
+   * projections.
    *
-   * @param schema Table schema. The field names in the schema should match the fields used
-   *               to create the TreeNodes
-   * @param exprs  List of expressions to be evaluated against data
+   * @param schema Table schema. The field names in the schema should match the fields used to
+   *     create the TreeNodes
+   * @param exprs List of expressions to be evaluated against data
    * @param optimize Flag to choose if the generated llvm code is to be optimized
-   *
    * @return A native evaluator object that can be used to invoke these projections on a RecordBatch
    */
   @Deprecated
   public static Projector make(Schema schema, List<ExpressionTree> exprs, boolean optimize)
       throws GandivaException {
-    return make(schema, exprs, SelectionVectorType.SV_NONE,
-            JniLoader.getConfiguration((new ConfigurationBuilder.ConfigOptions()).withOptimize(optimize)));
+    return make(
+        schema,
+        exprs,
+        SelectionVectorType.SV_NONE,
+        JniLoader.getConfiguration(
+            (new ConfigurationBuilder.ConfigOptions()).withOptimize(optimize)));
   }
 
   /**
-   * Invoke this function to generate LLVM code to evaluate the list of project expressions.
-   * Invoke Projector::Evaluate() against a RecordBatch to evaluate the record batch
-   * against these projections.
+   * Invoke this function to generate LLVM code to evaluate the list of project expressions. Invoke
+   * Projector::Evaluate() against a RecordBatch to evaluate the record batch against these
+   * projections.
    *
-   * @param schema Table schema. The field names in the schema should match the fields used
-   *               to create the TreeNodes
-   * @param exprs  List of expressions to be evaluated against data
+   * @param schema Table schema. The field names in the schema should match the fields used to
+   *     create the TreeNodes
+   * @param exprs List of expressions to be evaluated against data
    * @param selectionVectorType type of selection vector
-   *
    * @return A native evaluator object that can be used to invoke these projections on a RecordBatch
    */
-  public static Projector make(Schema schema, List<ExpressionTree> exprs,
-      SelectionVectorType selectionVectorType)
-          throws GandivaException {
+  public static Projector make(
+      Schema schema, List<ExpressionTree> exprs, SelectionVectorType selectionVectorType)
+      throws GandivaException {
     return make(schema, exprs, selectionVectorType, JniLoader.getDefaultConfiguration());
   }
 
   /**
-   * Invoke this function to generate LLVM code to evaluate the list of project expressions.
-   * Invoke Projector::Evaluate() against a RecordBatch to evaluate the record batch
-   * against these projections.
+   * Invoke this function to generate LLVM code to evaluate the list of project expressions. Invoke
+   * Projector::Evaluate() against a RecordBatch to evaluate the record batch against these
+   * projections.
    *
-   * @param schema Table schema. The field names in the schema should match the fields used
-   *               to create the TreeNodes
-   * @param exprs  List of expressions to be evaluated against data
+   * @param schema Table schema. The field names in the schema should match the fields used to
+   *     create the TreeNodes
+   * @param exprs List of expressions to be evaluated against data
    * @param selectionVectorType type of selection vector
    * @param configOptions ConfigOptions parameter
-   *
    * @return A native evaluator object that can be used to invoke these projections on a RecordBatch
    */
-  public static Projector make(Schema schema, List<ExpressionTree> exprs, SelectionVectorType selectionVectorType,
-                               ConfigurationBuilder.ConfigOptions configOptions) throws GandivaException {
+  public static Projector make(
+      Schema schema,
+      List<ExpressionTree> exprs,
+      SelectionVectorType selectionVectorType,
+      ConfigurationBuilder.ConfigOptions configOptions)
+      throws GandivaException {
     return make(schema, exprs, selectionVectorType, JniLoader.getConfiguration(configOptions));
   }
 
   /**
-   * Invoke this function to generate LLVM code to evaluate the list of project expressions.
-   * Invoke Projector::Evaluate() against a RecordBatch to evaluate the record batch
-   * against these projections.
+   * Invoke this function to generate LLVM code to evaluate the list of project expressions. Invoke
+   * Projector::Evaluate() against a RecordBatch to evaluate the record batch against these
+   * projections.
    *
-   * @param schema Table schema. The field names in the schema should match the fields used
-   *               to create the TreeNodes
-   * @param exprs  List of expressions to be evaluated against data
+   * @param schema Table schema. The field names in the schema should match the fields used to
+   *     create the TreeNodes
+   * @param exprs List of expressions to be evaluated against data
    * @param selectionVectorType type of selection vector
    * @param optimize Flag to choose if the generated llvm code is to be optimized
-   *
    * @return A native evaluator object that can be used to invoke these projections on a RecordBatch
    */
   @Deprecated
-  public static Projector make(Schema schema, List<ExpressionTree> exprs,
-                               SelectionVectorType selectionVectorType, boolean optimize)
+  public static Projector make(
+      Schema schema,
+      List<ExpressionTree> exprs,
+      SelectionVectorType selectionVectorType,
+      boolean optimize)
       throws GandivaException {
-    return make(schema, exprs, selectionVectorType,
-            JniLoader.getConfiguration((new ConfigurationBuilder.ConfigOptions()).withOptimize(optimize)));
+    return make(
+        schema,
+        exprs,
+        selectionVectorType,
+        JniLoader.getConfiguration(
+            (new ConfigurationBuilder.ConfigOptions()).withOptimize(optimize)));
   }
 
   /**
-   * Invoke this function to generate LLVM code to evaluate the list of project expressions.
-   * Invoke Projector::Evaluate() against a RecordBatch to evaluate the record batch
-   * against these projections.
+   * Invoke this function to generate LLVM code to evaluate the list of project expressions. Invoke
+   * Projector::Evaluate() against a RecordBatch to evaluate the record batch against these
+   * projections.
    *
-   * @param schema Table schema. The field names in the schema should match the fields used
-   *               to create the TreeNodes
-   * @param exprs  List of expressions to be evaluated against data
+   * @param schema Table schema. The field names in the schema should match the fields used to
+   *     create the TreeNodes
+   * @param exprs List of expressions to be evaluated against data
    * @param selectionVectorType type of selection vector
    * @param configurationId Custom configuration created through config builder.
-   *
    * @return A native evaluator object that can be used to invoke these projections on a RecordBatch
    */
-  public static Projector make(Schema schema, List<ExpressionTree> exprs,
+  public static Projector make(
+      Schema schema,
+      List<ExpressionTree> exprs,
       SelectionVectorType selectionVectorType,
-      long configurationId) throws GandivaException {
+      long configurationId)
+      throws GandivaException {
     // serialize the schema and the list of expressions as a protobuf
     GandivaTypes.ExpressionList.Builder builder = GandivaTypes.ExpressionList.newBuilder();
     for (ExpressionTree expr : exprs) {
@@ -196,8 +203,12 @@ public static Projector make(Schema schema, List<ExpressionTree> exprs,
     // Invoke the JNI layer to create the LLVM module representing the expressions
     GandivaTypes.Schema schemaBuf = ArrowTypeHelper.arrowSchemaToProtobuf(schema);
     JniWrapper wrapper = JniLoader.getInstance().getWrapper();
-    long moduleId = wrapper.buildProjector(schemaBuf.toByteArray(),
-        builder.build().toByteArray(), selectionVectorType.getNumber(), configurationId);
+    long moduleId =
+        wrapper.buildProjector(
+            schemaBuf.toByteArray(),
+            builder.build().toByteArray(),
+            selectionVectorType.getNumber(),
+            configurationId);
     logger.debug("Created module for the projector with id {}", moduleId);
     return new Projector(wrapper, moduleId, schema, exprs.size());
   }
@@ -209,23 +220,28 @@ public static Projector make(Schema schema, List<ExpressionTree> exprs,
    * @param outColumns Result of applying the project on the data
    */
   public void evaluate(ArrowRecordBatch recordBatch, List<ValueVector> outColumns)
-          throws GandivaException {
-    evaluate(recordBatch.getLength(), recordBatch.getBuffers(),
-             recordBatch.getBuffersLayout(),
-             SelectionVectorType.SV_NONE.getNumber(), recordBatch.getLength(),
-             0, 0, outColumns);
+      throws GandivaException {
+    evaluate(
+        recordBatch.getLength(),
+        recordBatch.getBuffers(),
+        recordBatch.getBuffersLayout(),
+        SelectionVectorType.SV_NONE.getNumber(),
+        recordBatch.getLength(),
+        0,
+        0,
+        outColumns);
   }
 
   /**
-   * Invoke this function to evaluate a set of expressions against a set of arrow buffers.
-   * (this is an optimised version that skips taking references).
+   * Invoke this function to evaluate a set of expressions against a set of arrow buffers. (this is
+   * an optimised version that skips taking references).
    *
    * @param numRows number of rows.
    * @param buffers List of input arrow buffers
    * @param outColumns Result of applying the project on the data
    */
-  public void evaluate(int numRows, List<ArrowBuf> buffers,
-                       List<ValueVector> outColumns) throws GandivaException {
+  public void evaluate(int numRows, List<ArrowBuf> buffers, List<ValueVector> outColumns)
+      throws GandivaException {
     List<ArrowBuffer> buffersLayout = new ArrayList<>();
     long offset = 0;
     for (ArrowBuf arrowBuf : buffers) {
@@ -233,9 +249,15 @@ public void evaluate(int numRows, List<ArrowBuf> buffers,
       buffersLayout.add(new ArrowBuffer(offset, size));
       offset += size;
     }
-    evaluate(numRows, buffers, buffersLayout,
-             SelectionVectorType.SV_NONE.getNumber(),
-             numRows, 0, 0, outColumns);
+    evaluate(
+        numRows,
+        buffers,
+        buffersLayout,
+        SelectionVectorType.SV_NONE.getNumber(),
+        numRows,
+        0,
+        0,
+        outColumns);
   }
 
   /**
@@ -245,10 +267,12 @@ public void evaluate(int numRows, List<ArrowBuf> buffers,
    * @param selectionVector Selection vector which stores the selected rows.
    * @param outColumns Result of applying the project on the data
    */
-  public void evaluate(ArrowRecordBatch recordBatch,
-                     SelectionVector selectionVector, List<ValueVector> outColumns)
-        throws GandivaException {
-    evaluate(recordBatch.getLength(), recordBatch.getBuffers(),
+  public void evaluate(
+      ArrowRecordBatch recordBatch, SelectionVector selectionVector, List<ValueVector> outColumns)
+      throws GandivaException {
+    evaluate(
+        recordBatch.getLength(),
+        recordBatch.getBuffers(),
         recordBatch.getBuffersLayout(),
         selectionVector.getType().getNumber(),
         selectionVector.getRecordCount(),
@@ -258,18 +282,20 @@ public void evaluate(ArrowRecordBatch recordBatch,
   }
 
   /**
- * Invoke this function to evaluate a set of expressions against a set of arrow buffers
- * on the selected positions.
- * (this is an optimised version that skips taking references).
- *
- * @param numRows number of rows.
- * @param buffers List of input arrow buffers
- * @param selectionVector Selection vector which stores the selected rows.
- * @param outColumns Result of applying the project on the data
- */
-  public void evaluate(int numRows, List<ArrowBuf> buffers,
-                     SelectionVector selectionVector,
-                     List<ValueVector> outColumns) throws GandivaException {
+   * Invoke this function to evaluate a set of expressions against a set of arrow buffers on the
+   * selected positions. (this is an optimised version that skips taking references).
+   *
+   * @param numRows number of rows.
+   * @param buffers List of input arrow buffers
+   * @param selectionVector Selection vector which stores the selected rows.
+   * @param outColumns Result of applying the project on the data
+   */
+  public void evaluate(
+      int numRows,
+      List<ArrowBuf> buffers,
+      SelectionVector selectionVector,
+      List<ValueVector> outColumns)
+      throws GandivaException {
     List<ArrowBuffer> buffersLayout = new ArrayList<>();
     long offset = 0;
     for (ArrowBuf arrowBuf : buffers) {
@@ -277,7 +303,10 @@ public void evaluate(int numRows, List<ArrowBuf> buffers,
       buffersLayout.add(new ArrowBuffer(offset, size));
       offset += size;
     }
-    evaluate(numRows, buffers, buffersLayout,
+    evaluate(
+        numRows,
+        buffers,
+        buffersLayout,
         selectionVector.getType().getNumber(),
         selectionVector.getRecordCount(),
         selectionVector.getBuffer().memoryAddress(),
@@ -285,10 +314,16 @@ public void evaluate(int numRows, List<ArrowBuf> buffers,
         outColumns);
   }
 
-  private void evaluate(int numRows, List<ArrowBuf> buffers, List<ArrowBuffer> buffersLayout,
-                       int selectionVectorType, int selectionVectorRecordCount,
-                       long selectionVectorAddr, long selectionVectorSize,
-                       List<ValueVector> outColumns) throws GandivaException {
+  private void evaluate(
+      int numRows,
+      List<ArrowBuf> buffers,
+      List<ArrowBuffer> buffersLayout,
+      int selectionVectorType,
+      int selectionVectorRecordCount,
+      long selectionVectorAddr,
+      long selectionVectorSize,
+      List<ValueVector> outColumns)
+      throws GandivaException {
     if (this.closed) {
       throw new EvaluatorClosedException();
     }
@@ -344,15 +379,19 @@ private void evaluate(int numRows, List<ArrowBuf> buffers, List<ArrowBuffer> buf
 
     wrapper.evaluateProjector(
         hasVariableWidthColumns ? new VectorExpander(resizableVectors) : null,
-        this.moduleId, numRows, bufAddrs, bufSizes,
-        selectionVectorType, selectionVectorRecordCount,
-        selectionVectorAddr, selectionVectorSize,
-        outAddrs, outSizes);
+        this.moduleId,
+        numRows,
+        bufAddrs,
+        bufSizes,
+        selectionVectorType,
+        selectionVectorRecordCount,
+        selectionVectorAddr,
+        selectionVectorSize,
+        outAddrs,
+        outSizes);
   }
 
-  /**
-   * Closes the LLVM module representing this evaluator.
-   */
+  /** Closes the LLVM module representing this evaluator. */
   public void close() throws GandivaException {
     if (this.closed) {
       return;
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVector.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVector.java
index 2af88b52636eb..4bb1f2be74a0e 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVector.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
 import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
@@ -24,8 +23,7 @@
 
 /**
  * A selection vector contains the indexes of "selected" records in a row batch. It is backed by an
- * arrow buffer.
- * Client manages the lifecycle of the arrow buffer - to release the reference.
+ * arrow buffer. Client manages the lifecycle of the arrow buffer - to release the reference.
  */
 public abstract class SelectionVector {
   private int recordCount;
@@ -58,9 +56,13 @@ public final int getRecordCount() {
    */
   final void setRecordCount(int recordCount) {
     if (recordCount * getRecordSize() > buffer.capacity()) {
-      throw new IllegalArgumentException("recordCount " + recordCount +
-          " of size " + getRecordSize() +
-          " exceeds buffer capacity " + buffer.capacity());
+      throw new IllegalArgumentException(
+          "recordCount "
+              + recordCount
+              + " of size "
+              + getRecordSize()
+              + " exceeds buffer capacity "
+              + buffer.capacity());
     }
 
     this.recordCount = recordCount;
@@ -83,5 +85,4 @@ final void checkReadBounds(int index) {
       throw new IllegalArgumentException("index " + index + " is >= recordCount " + recordCount);
     }
   }
-
 }
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVectorInt16.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVectorInt16.java
index 84c795b67027c..8ef35d0073cbb 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVectorInt16.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVectorInt16.java
@@ -14,15 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
 import org.apache.arrow.gandiva.ipc.GandivaTypes.SelectionVectorType;
 import org.apache.arrow.memory.ArrowBuf;
 
-/**
- * Selection vector with records of arrow type INT16.
- */
+/** Selection vector with records of arrow type INT16. */
 public class SelectionVectorInt16 extends SelectionVector {
 
   public SelectionVectorInt16(ArrowBuf buffer) {
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVectorInt32.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVectorInt32.java
index c938f6691117e..324dd54be244b 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVectorInt32.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVectorInt32.java
@@ -14,15 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
 import org.apache.arrow.gandiva.ipc.GandivaTypes.SelectionVectorType;
 import org.apache.arrow.memory.ArrowBuf;
 
-/**
- * Selection vector with records of arrow type INT32.
- */
+/** Selection vector with records of arrow type INT32. */
 public class SelectionVectorInt32 extends SelectionVector {
 
   public SelectionVectorInt32(ArrowBuf buffer) {
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/VectorExpander.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/VectorExpander.java
index f22ebbd37878f..a50a1f5677006 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/VectorExpander.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/VectorExpander.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
 import org.apache.arrow.vector.BaseVariableWidthVector;
@@ -30,9 +29,7 @@ public VectorExpander(BaseVariableWidthVector[] vectors) {
     this.vectors = vectors;
   }
 
-  /**
-   * Result of vector expansion.
-   */
+  /** Result of vector expansion. */
   public static class ExpandResult {
     public long address;
     public long capacity;
@@ -44,13 +41,12 @@ public ExpandResult(long address, long capacity) {
   }
 
   /**
-   * Expand vector at specified index. This is used as a back call from jni, and is only
-   * relevant for variable width vectors.
+   * Expand vector at specified index. This is used as a back call from jni, and is only relevant
+   * for variable width vectors.
    *
    * @param index index of buffer in the list passed to jni.
    * @param toCapacity the size to which the buffer should be expanded to.
-   *
-   * @return address and size  of the buffer after expansion.
+   * @return address and size of the buffer after expansion.
    */
   public ExpandResult expandOutputVectorAtIndex(int index, long toCapacity) {
     if (index >= vectors.length || vectors[index] == null) {
@@ -62,8 +58,6 @@ public ExpandResult expandOutputVectorAtIndex(int index, long toCapacity) {
       vector.reallocDataBuffer();
     }
     return new ExpandResult(
-        vector.getDataBuffer().memoryAddress(),
-        vector.getDataBuffer().capacity());
+        vector.getDataBuffer().memoryAddress(), vector.getDataBuffer().capacity());
   }
-
 }
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/exceptions/EvaluatorClosedException.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/exceptions/EvaluatorClosedException.java
index d3fb8b60df0bf..0526e2cdeaf67 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/exceptions/EvaluatorClosedException.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/exceptions/EvaluatorClosedException.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.exceptions;
 
 /** Indicates an attempted call to methods on a closed evaluator. */
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/exceptions/GandivaException.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/exceptions/GandivaException.java
index e7fce58a38dab..4f3f0f8fcf29d 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/exceptions/GandivaException.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/exceptions/GandivaException.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.exceptions;
 
 /** Base class for all specialized exceptions this package uses. */
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/exceptions/UnsupportedTypeException.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/exceptions/UnsupportedTypeException.java
index 90e06e80ec55d..82b4b371d2bee 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/exceptions/UnsupportedTypeException.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/exceptions/UnsupportedTypeException.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.exceptions;
 
-/**
- * Represents an exception thrown while dealing with unsupported types.
- */
+/** Represents an exception thrown while dealing with unsupported types. */
 public class UnsupportedTypeException extends GandivaException {
   public UnsupportedTypeException(String msg) {
     super(msg);
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/AndNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/AndNode.java
index ecc577fa78d41..5fdff20b2a8c5 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/AndNode.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/AndNode.java
@@ -14,17 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
 import java.util.List;
-
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 
-/**
- * Node representing a logical And expression.
- */
+/** Node representing a logical And expression. */
 class AndNode implements TreeNode {
   private final List<TreeNode> children;
 
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/ArrowTypeHelper.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/ArrowTypeHelper.java
index e7377cc5c9db4..1bfac58b270c1 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/ArrowTypeHelper.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/ArrowTypeHelper.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
 import org.apache.arrow.flatbuf.DateUnit;
@@ -29,12 +28,9 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-/**
- * Utility methods to convert between Arrow and Gandiva types.
- */
+/** Utility methods to convert between Arrow and Gandiva types. */
 public class ArrowTypeHelper {
-  private ArrowTypeHelper() {
-  }
+  private ArrowTypeHelper() {}
 
   static final int WIDTH_8 = 8;
   static final int WIDTH_16 = 16;
@@ -47,49 +43,59 @@ private static void initArrowTypeInt(
 
     if (intType.getIsSigned()) {
       switch (width) {
-        case WIDTH_8: {
-          builder.setType(GandivaTypes.GandivaType.INT8);
+        case WIDTH_8:
+          {
+            builder.setType(GandivaTypes.GandivaType.INT8);
+            return;
+          }
+        case WIDTH_16:
+          {
+            builder.setType(GandivaTypes.GandivaType.INT16);
+            return;
+          }
+        case WIDTH_32:
+          {
+            builder.setType(GandivaTypes.GandivaType.INT32);
+            return;
+          }
+        case WIDTH_64:
+          {
+            builder.setType(GandivaTypes.GandivaType.INT64);
+            return;
+          }
+        default:
+          {
+            throw new UnsupportedTypeException("Unsupported width for integer type");
+          }
+      }
+    }
+
+    // unsigned int
+    switch (width) {
+      case WIDTH_8:
+        {
+          builder.setType(GandivaTypes.GandivaType.UINT8);
           return;
         }
-        case WIDTH_16: {
-          builder.setType(GandivaTypes.GandivaType.INT16);
+      case WIDTH_16:
+        {
+          builder.setType(GandivaTypes.GandivaType.UINT16);
           return;
         }
-        case WIDTH_32: {
-          builder.setType(GandivaTypes.GandivaType.INT32);
+      case WIDTH_32:
+        {
+          builder.setType(GandivaTypes.GandivaType.UINT32);
           return;
         }
-        case WIDTH_64: {
-          builder.setType(GandivaTypes.GandivaType.INT64);
+      case WIDTH_64:
+        {
+          builder.setType(GandivaTypes.GandivaType.UINT64);
           return;
         }
-        default: {
+      default:
+        {
           throw new UnsupportedTypeException("Unsupported width for integer type");
         }
-      }
-    }
-
-    // unsigned int
-    switch (width) {
-      case WIDTH_8: {
-        builder.setType(GandivaTypes.GandivaType.UINT8);
-        return;
-      }
-      case WIDTH_16: {
-        builder.setType(GandivaTypes.GandivaType.UINT16);
-        return;
-      }
-      case WIDTH_32: {
-        builder.setType(GandivaTypes.GandivaType.UINT32);
-        return;
-      }
-      case WIDTH_64: {
-        builder.setType(GandivaTypes.GandivaType.UINT64);
-        return;
-      }
-      default: {
-        throw new UnsupportedTypeException("Unsupported width for integer type");
-      }
     }
   }
 
@@ -97,130 +103,152 @@ private static void initArrowTypeFloat(
       ArrowType.FloatingPoint floatType, GandivaTypes.ExtGandivaType.Builder builder)
       throws GandivaException {
     switch (floatType.getPrecision()) {
-      case HALF: {
-        builder.setType(GandivaTypes.GandivaType.HALF_FLOAT);
-        break;
-      }
-      case SINGLE: {
-        builder.setType(GandivaTypes.GandivaType.FLOAT);
-        break;
-      }
-      case DOUBLE: {
-        builder.setType(GandivaTypes.GandivaType.DOUBLE);
-        break;
-      }
-      default: {
-        throw new UnsupportedTypeException("Floating point type with unknown precision");
-      }
+      case HALF:
+        {
+          builder.setType(GandivaTypes.GandivaType.HALF_FLOAT);
+          break;
+        }
+      case SINGLE:
+        {
+          builder.setType(GandivaTypes.GandivaType.FLOAT);
+          break;
+        }
+      case DOUBLE:
+        {
+          builder.setType(GandivaTypes.GandivaType.DOUBLE);
+          break;
+        }
+      default:
+        {
+          throw new UnsupportedTypeException("Floating point type with unknown precision");
+        }
     }
   }
 
-  private static void initArrowTypeDecimal(ArrowType.Decimal decimalType,
-                                           GandivaTypes.ExtGandivaType.Builder builder) {
-    Preconditions.checkArgument(decimalType.getPrecision() > 0 &&
-            decimalType.getPrecision() <= 38, "Gandiva only supports decimals of upto 38 " +
-            "precision. Input precision : " + decimalType.getPrecision());
+  private static void initArrowTypeDecimal(
+      ArrowType.Decimal decimalType, GandivaTypes.ExtGandivaType.Builder builder) {
+    Preconditions.checkArgument(
+        decimalType.getPrecision() > 0 && decimalType.getPrecision() <= 38,
+        "Gandiva only supports decimals of upto 38 "
+            + "precision. Input precision : "
+            + decimalType.getPrecision());
     builder.setPrecision(decimalType.getPrecision());
     builder.setScale(decimalType.getScale());
     builder.setType(GandivaTypes.GandivaType.DECIMAL);
   }
 
-  private static void initArrowTypeDate(ArrowType.Date dateType,
-                                        GandivaTypes.ExtGandivaType.Builder builder) {
+  private static void initArrowTypeDate(
+      ArrowType.Date dateType, GandivaTypes.ExtGandivaType.Builder builder) {
     short dateUnit = dateType.getUnit().getFlatbufID();
     switch (dateUnit) {
-      case DateUnit.DAY: {
-        builder.setType(GandivaTypes.GandivaType.DATE32);
-        break;
-      }
-      case DateUnit.MILLISECOND: {
-        builder.setType(GandivaTypes.GandivaType.DATE64);
-        break;
-      }
-      default: {
-        // not supported
-        break;
-      }
+      case DateUnit.DAY:
+        {
+          builder.setType(GandivaTypes.GandivaType.DATE32);
+          break;
+        }
+      case DateUnit.MILLISECOND:
+        {
+          builder.setType(GandivaTypes.GandivaType.DATE64);
+          break;
+        }
+      default:
+        {
+          // not supported
+          break;
+        }
     }
   }
 
-  private static void initArrowTypeTime(ArrowType.Time timeType,
-                                        GandivaTypes.ExtGandivaType.Builder builder) {
+  private static void initArrowTypeTime(
+      ArrowType.Time timeType, GandivaTypes.ExtGandivaType.Builder builder) {
     short timeUnit = timeType.getUnit().getFlatbufID();
     switch (timeUnit) {
-      case TimeUnit.SECOND: {
-        builder.setType(GandivaTypes.GandivaType.TIME32);
-        builder.setTimeUnit(GandivaTypes.TimeUnit.SEC);
-        break;
-      }
-      case TimeUnit.MILLISECOND: {
-        builder.setType(GandivaTypes.GandivaType.TIME32);
-        builder.setTimeUnit(GandivaTypes.TimeUnit.MILLISEC);
-        break;
-      }
-      case TimeUnit.MICROSECOND: {
-        builder.setType(GandivaTypes.GandivaType.TIME64);
-        builder.setTimeUnit(GandivaTypes.TimeUnit.MICROSEC);
-        break;
-      }
-      case TimeUnit.NANOSECOND: {
-        builder.setType(GandivaTypes.GandivaType.TIME64);
-        builder.setTimeUnit(GandivaTypes.TimeUnit.NANOSEC);
-        break;
-      }
-      default: {
-        // not supported
-      }
+      case TimeUnit.SECOND:
+        {
+          builder.setType(GandivaTypes.GandivaType.TIME32);
+          builder.setTimeUnit(GandivaTypes.TimeUnit.SEC);
+          break;
+        }
+      case TimeUnit.MILLISECOND:
+        {
+          builder.setType(GandivaTypes.GandivaType.TIME32);
+          builder.setTimeUnit(GandivaTypes.TimeUnit.MILLISEC);
+          break;
+        }
+      case TimeUnit.MICROSECOND:
+        {
+          builder.setType(GandivaTypes.GandivaType.TIME64);
+          builder.setTimeUnit(GandivaTypes.TimeUnit.MICROSEC);
+          break;
+        }
+      case TimeUnit.NANOSECOND:
+        {
+          builder.setType(GandivaTypes.GandivaType.TIME64);
+          builder.setTimeUnit(GandivaTypes.TimeUnit.NANOSEC);
+          break;
+        }
+      default:
+        {
+          // not supported
+        }
     }
   }
 
-  private static void initArrowTypeTimestamp(ArrowType.Timestamp timestampType,
-                                             GandivaTypes.ExtGandivaType.Builder builder) {
+  private static void initArrowTypeTimestamp(
+      ArrowType.Timestamp timestampType, GandivaTypes.ExtGandivaType.Builder builder) {
     short timeUnit = timestampType.getUnit().getFlatbufID();
     switch (timeUnit) {
-      case TimeUnit.SECOND: {
-        builder.setType(GandivaTypes.GandivaType.TIMESTAMP);
-        builder.setTimeUnit(GandivaTypes.TimeUnit.SEC);
-        break;
-      }
-      case TimeUnit.MILLISECOND: {
-        builder.setType(GandivaTypes.GandivaType.TIMESTAMP);
-        builder.setTimeUnit(GandivaTypes.TimeUnit.MILLISEC);
-        break;
-      }
-      case TimeUnit.MICROSECOND: {
-        builder.setType(GandivaTypes.GandivaType.TIMESTAMP);
-        builder.setTimeUnit(GandivaTypes.TimeUnit.MICROSEC);
-        break;
-      }
-      case TimeUnit.NANOSECOND: {
-        builder.setType(GandivaTypes.GandivaType.TIMESTAMP);
-        builder.setTimeUnit(GandivaTypes.TimeUnit.NANOSEC);
-        break;
-      }
-      default: {
-        // not supported
-      }
+      case TimeUnit.SECOND:
+        {
+          builder.setType(GandivaTypes.GandivaType.TIMESTAMP);
+          builder.setTimeUnit(GandivaTypes.TimeUnit.SEC);
+          break;
+        }
+      case TimeUnit.MILLISECOND:
+        {
+          builder.setType(GandivaTypes.GandivaType.TIMESTAMP);
+          builder.setTimeUnit(GandivaTypes.TimeUnit.MILLISEC);
+          break;
+        }
+      case TimeUnit.MICROSECOND:
+        {
+          builder.setType(GandivaTypes.GandivaType.TIMESTAMP);
+          builder.setTimeUnit(GandivaTypes.TimeUnit.MICROSEC);
+          break;
+        }
+      case TimeUnit.NANOSECOND:
+        {
+          builder.setType(GandivaTypes.GandivaType.TIMESTAMP);
+          builder.setTimeUnit(GandivaTypes.TimeUnit.NANOSEC);
+          break;
+        }
+      default:
+        {
+          // not supported
+        }
     }
   }
 
-  private static void initArrowTypeInterval(ArrowType.Interval interval,
-                                             GandivaTypes.ExtGandivaType.Builder builder) {
+  private static void initArrowTypeInterval(
+      ArrowType.Interval interval, GandivaTypes.ExtGandivaType.Builder builder) {
     short intervalUnit = interval.getUnit().getFlatbufID();
     switch (intervalUnit) {
-      case IntervalUnit.YEAR_MONTH: {
-        builder.setType(GandivaTypes.GandivaType.INTERVAL);
-        builder.setIntervalType(GandivaTypes.IntervalType.YEAR_MONTH);
-        break;
-      }
-      case IntervalUnit.DAY_TIME: {
-        builder.setType(GandivaTypes.GandivaType.INTERVAL);
-        builder.setIntervalType(GandivaTypes.IntervalType.DAY_TIME);
-        break;
-      }
-      default: {
-        // not supported
-      }
+      case IntervalUnit.YEAR_MONTH:
+        {
+          builder.setType(GandivaTypes.GandivaType.INTERVAL);
+          builder.setIntervalType(GandivaTypes.IntervalType.YEAR_MONTH);
+          break;
+        }
+      case IntervalUnit.DAY_TIME:
+        {
+          builder.setType(GandivaTypes.GandivaType.INTERVAL);
+          builder.setIntervalType(GandivaTypes.IntervalType.DAY_TIME);
+          break;
+        }
+      default:
+        {
+          // not supported
+        }
     }
   }
 
@@ -236,75 +264,94 @@ public static GandivaTypes.ExtGandivaType arrowTypeToProtobuf(ArrowType arrowTyp
 
     byte typeId = arrowType.getTypeID().getFlatbufID();
     switch (typeId) {
-      case Type.NONE: { // 0
-        builder.setType(GandivaTypes.GandivaType.NONE);
-        break;
-      }
-      case Type.Null: { // 1
-        // TODO: Need to handle this later
-        break;
-      }
-      case Type.Int: { // 2
-        ArrowTypeHelper.initArrowTypeInt((ArrowType.Int) arrowType, builder);
-        break;
-      }
-      case Type.FloatingPoint: { // 3
-        ArrowTypeHelper.initArrowTypeFloat((ArrowType.FloatingPoint) arrowType, builder);
-        break;
-      }
-      case Type.Binary: { // 4
-        builder.setType(GandivaTypes.GandivaType.BINARY);
-        break;
-      }
-      case Type.Utf8: { // 5
-        builder.setType(GandivaTypes.GandivaType.UTF8);
-        break;
-      }
-      case Type.Bool: { // 6
-        builder.setType(GandivaTypes.GandivaType.BOOL);
-        break;
-      }
-      case Type.Decimal: { // 7
-        ArrowTypeHelper.initArrowTypeDecimal((ArrowType.Decimal) arrowType, builder);
-        break;
-      }
-      case Type.Date: { // 8
-        ArrowTypeHelper.initArrowTypeDate((ArrowType.Date) arrowType, builder);
-        break;
-      }
-      case Type.Time: { // 9
-        ArrowTypeHelper.initArrowTypeTime((ArrowType.Time) arrowType, builder);
-        break;
-      }
-      case Type.Timestamp: { // 10
-        ArrowTypeHelper.initArrowTypeTimestamp((ArrowType.Timestamp) arrowType, builder);
-        break;
-      }
-      case Type.Interval: { // 11
-        ArrowTypeHelper.initArrowTypeInterval((ArrowType.Interval) arrowType, builder);
-        break;
-      }
-      case Type.List: { // 12
-        break;
-      }
-      case Type.Struct_: { // 13
-        break;
-      }
-      case Type.Union: { // 14
-        break;
-      }
-      case Type.FixedSizeBinary: { // 15
-        break;
-      }
-      case Type.FixedSizeList: { // 16
-        break;
-      }
-      case Type.Map: { // 17
-        break;
-      }
-      default: {
-        break;
-      }
+      case Type.NONE:
+        { // 0
+          builder.setType(GandivaTypes.GandivaType.NONE);
+          break;
+        }
+      case Type.Null:
+        { // 1
+          // TODO: Need to handle this later
+          break;
+        }
+      case Type.Int:
+        { // 2
+          ArrowTypeHelper.initArrowTypeInt((ArrowType.Int) arrowType, builder);
+          break;
+        }
+      case Type.FloatingPoint:
+        { // 3
+          ArrowTypeHelper.initArrowTypeFloat((ArrowType.FloatingPoint) arrowType, builder);
+          break;
+        }
+      case Type.Binary:
+        { // 4
+          builder.setType(GandivaTypes.GandivaType.BINARY);
+          break;
+        }
+      case Type.Utf8:
+        { // 5
+          builder.setType(GandivaTypes.GandivaType.UTF8);
+          break;
+        }
+      case Type.Bool:
+        { // 6
+          builder.setType(GandivaTypes.GandivaType.BOOL);
+          break;
+        }
+      case Type.Decimal:
+        { // 7
+          ArrowTypeHelper.initArrowTypeDecimal((ArrowType.Decimal) arrowType, builder);
+          break;
+        }
+      case Type.Date:
+        { // 8
+          ArrowTypeHelper.initArrowTypeDate((ArrowType.Date) arrowType, builder);
+          break;
+        }
+      case Type.Time:
+        { // 9
+          ArrowTypeHelper.initArrowTypeTime((ArrowType.Time) arrowType, builder);
+          break;
+        }
+      case Type.Timestamp:
+        { // 10
+          ArrowTypeHelper.initArrowTypeTimestamp((ArrowType.Timestamp) arrowType, builder);
+          break;
+        }
+      case Type.Interval:
+        { // 11
+          ArrowTypeHelper.initArrowTypeInterval((ArrowType.Interval) arrowType, builder);
+          break;
+        }
+      case Type.List:
+        { // 12
+          break;
+        }
+      case Type.Struct_:
+        { // 13
+          break;
+        }
+      case Type.Union:
+        { // 14
+          break;
+        }
+      case Type.FixedSizeBinary:
+        { // 15
+          break;
+        }
+      case Type.FixedSizeList:
+        { // 16
+          break;
+        }
+      case Type.Map:
+        { // 17
+          break;
+        }
+      default:
+        {
+          break;
+        }
     }
 
     if (!builder.hasType()) {
@@ -318,6 +365,7 @@ public static GandivaTypes.ExtGandivaType arrowTypeToProtobuf(ArrowType arrowTyp
 
   /**
    * Converts an arrow field object to a protobuf.
+   *
    * @param field Arrow field to be converted
    * @return Protobuf representing the arrow field
    */
@@ -336,6 +384,7 @@ public static GandivaTypes.Field arrowFieldToProtobuf(Field field) throws Gandiv
 
   /**
    * Converts a schema object to a protobuf.
+   *
    * @param schema Schema object to be converted
    * @return Protobuf representing a schema object
    */
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/BinaryNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/BinaryNode.java
index 8455f29b2d921..2559a398fdfe8 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/BinaryNode.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/BinaryNode.java
@@ -14,17 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
+import com.google.protobuf.ByteString;
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 
-import com.google.protobuf.ByteString;
-
-/**
- * Used to represent expression tree nodes representing binary constants.
- */
+/** Used to represent expression tree nodes representing binary constants. */
 class BinaryNode implements TreeNode {
   private final byte[] value;
 
@@ -34,12 +30,9 @@ public BinaryNode(byte[] value) {
 
   @Override
   public GandivaTypes.TreeNode toProtobuf() throws GandivaException {
-    GandivaTypes.BinaryNode binaryNode = GandivaTypes.BinaryNode.newBuilder()
-        .setValue(ByteString.copyFrom(value))
-        .build();
+    GandivaTypes.BinaryNode binaryNode =
+        GandivaTypes.BinaryNode.newBuilder().setValue(ByteString.copyFrom(value)).build();
 
-    return GandivaTypes.TreeNode.newBuilder()
-        .setBinaryNode(binaryNode)
-        .build();
+    return GandivaTypes.TreeNode.newBuilder().setBinaryNode(binaryNode).build();
   }
 }
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/BooleanNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/BooleanNode.java
index 505f01919c991..5cbc0ace3ea7e 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/BooleanNode.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/BooleanNode.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 
 /**
- * Used to represent expression tree nodes representing boolean constants.
- * Used while creating expressions like if (!x).
+ * Used to represent expression tree nodes representing boolean constants. Used while creating
+ * expressions like if (!x).
  */
 class BooleanNode implements TreeNode {
   private final Boolean value;
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/Condition.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/Condition.java
index 1d584d673f6f8..89cc39812cd10 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/Condition.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/Condition.java
@@ -14,15 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 
-/**
- * Opaque class representing a filter condition.
- */
+/** Opaque class representing a filter condition. */
 public class Condition {
   private final TreeNode root;
 
@@ -32,6 +29,7 @@ public class Condition {
 
   /**
    * Converts an condition expression into a protobuf.
+   *
    * @return A protobuf representing the condition expression tree
    */
   public GandivaTypes.Condition toProtobuf() throws GandivaException {
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/DecimalNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/DecimalNode.java
index bf17aa0aa6d1e..0d0f72226e847 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/DecimalNode.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/DecimalNode.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 
 /**
- * Used to represent expression tree nodes representing decimal constants.
- * Used in the expression (x + 5.0)
+ * Used to represent expression tree nodes representing decimal constants. Used in the expression (x
+ * + 5.0)
  */
 class DecimalNode implements TreeNode {
   private final String value;
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/DoubleNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/DoubleNode.java
index f7a9436f1f38a..0fbb92d8a5678 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/DoubleNode.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/DoubleNode.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 
 /**
- * Used to represent expression tree nodes representing double constants.
- * Used in the expression (x + 5.0)
+ * Used to represent expression tree nodes representing double constants. Used in the expression (x
+ * + 5.0)
  */
 class DoubleNode implements TreeNode {
   private final Double value;
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/ExpressionTree.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/ExpressionTree.java
index 353c8d12b3e57..67ad8eef53b8f 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/ExpressionTree.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/ExpressionTree.java
@@ -14,16 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 import org.apache.arrow.vector.types.pojo.Field;
 
-/**
- * Opaque class representing an expression.
- */
+/** Opaque class representing an expression. */
 public class ExpressionTree {
   private final TreeNode root;
   private final Field resultField;
@@ -35,6 +32,7 @@ public class ExpressionTree {
 
   /**
    * Converts an expression tree into a protobuf.
+   *
    * @return A protobuf representing the expression tree
    */
   public GandivaTypes.ExpressionRoot toProtobuf() throws GandivaException {
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FieldNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FieldNode.java
index 893bf71912588..b1667fdaec6bf 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FieldNode.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FieldNode.java
@@ -14,16 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 import org.apache.arrow.vector.types.pojo.Field;
 
-/**
- * Opaque class that represents a tree node.
- */
+/** Opaque class that represents a tree node. */
 class FieldNode implements TreeNode {
   private final Field field;
 
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FloatNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FloatNode.java
index 6afe96bfe8fc1..ae152372212ef 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FloatNode.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FloatNode.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 
 /**
- * Used to represent expression tree nodes representing float constants.
- * Used in the expression (x + 5.0)
+ * Used to represent expression tree nodes representing float constants. Used in the expression (x +
+ * 5.0)
  */
 class FloatNode implements TreeNode {
   private final Float value;
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FunctionNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FunctionNode.java
index ead1e146d5d8c..a5c6fb77f9623 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FunctionNode.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FunctionNode.java
@@ -14,18 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
 import java.util.List;
-
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 
-/**
- * Node representing an arbitrary function in an expression.
- */
+/** Node representing an arbitrary function in an expression. */
 class FunctionNode implements TreeNode {
   private final String function;
   private final List<TreeNode> children;
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/IfNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/IfNode.java
index 19f9095fb7626..cbb3f80f4e357 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/IfNode.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/IfNode.java
@@ -14,16 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 
-/**
- * Node representing a if-then-else block expression.
- */
+/** Node representing a if-then-else block expression. */
 class IfNode implements TreeNode {
   private final TreeNode condition;
   private final TreeNode thenNode;
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/InNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/InNode.java
index bb1391b4001ea..2089c9b7cbe67 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/InNode.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/InNode.java
@@ -14,21 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
+import com.google.protobuf.ByteString;
 import java.math.BigDecimal;
 import java.nio.charset.Charset;
 import java.util.Set;
-
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 
-import com.google.protobuf.ByteString;
-
-/**
- * In Node representation in java.
- */
+/** In Node representation in java. */
 public class InNode implements TreeNode {
   private static final Charset charset = Charset.forName("UTF-8");
 
@@ -44,9 +39,17 @@ public class InNode implements TreeNode {
   private final Integer precision;
   private final Integer scale;
 
-  private InNode(Set<Integer> values, Set<Long> longValues, Set<String> stringValues, Set<byte[]>
-          binaryValues, Set<BigDecimal> decimalValues, Integer precision, Integer scale,
-                 Set<Float> floatValues, Set<Double> doubleValues, TreeNode node) {
+  private InNode(
+      Set<Integer> values,
+      Set<Long> longValues,
+      Set<String> stringValues,
+      Set<byte[]> binaryValues,
+      Set<BigDecimal> decimalValues,
+      Integer precision,
+      Integer scale,
+      Set<Float> floatValues,
+      Set<Double> doubleValues,
+      TreeNode node) {
     this.intValues = values;
     this.longValues = longValues;
     this.decimalValues = decimalValues;
@@ -62,67 +65,58 @@ private InNode(Set<Integer> values, Set<Long> longValues, Set<String> stringValu
   /**
    * Makes an IN node for int values.
    *
-   * @param node      Node with the 'IN' clause.
+   * @param node Node with the 'IN' clause.
    * @param intValues Int values to build the IN node.
    * @return InNode referring to tree node.
    */
   public static InNode makeIntInExpr(TreeNode node, Set<Integer> intValues) {
-    return new InNode(intValues,
-            null, null, null, null, null, null, null,
-            null, node);
+    return new InNode(intValues, null, null, null, null, null, null, null, null, node);
   }
 
   /**
    * Makes an IN node for long values.
    *
-   * @param node      Node with the 'IN' clause.
+   * @param node Node with the 'IN' clause.
    * @param longValues Long values to build the IN node.
    * @return InNode referring to tree node.
    */
   public static InNode makeLongInExpr(TreeNode node, Set<Long> longValues) {
-    return new InNode(null, longValues,
-            null, null, null, null, null, null,
-            null, node);
+    return new InNode(null, longValues, null, null, null, null, null, null, null, node);
   }
 
   /**
    * Makes an IN node for float values.
    *
-   * @param node      Node with the 'IN' clause.
+   * @param node Node with the 'IN' clause.
    * @param floatValues Float values to build the IN node.
    * @return InNode referring to tree node.
    */
   public static InNode makeFloatInExpr(TreeNode node, Set<Float> floatValues) {
-    return new InNode(null, null, null, null, null, null,
-            null, floatValues, null, node);
+    return new InNode(null, null, null, null, null, null, null, floatValues, null, node);
   }
 
   /**
    * Makes an IN node for double values.
    *
-   * @param node      Node with the 'IN' clause.
+   * @param node Node with the 'IN' clause.
    * @param doubleValues Double values to build the IN node.
    * @return InNode referring to tree node.
    */
   public static InNode makeDoubleInExpr(TreeNode node, Set<Double> doubleValues) {
-    return new InNode(null, null, null, null, null,
-            null, null, null, doubleValues, node);
+    return new InNode(null, null, null, null, null, null, null, null, doubleValues, node);
   }
 
-  public static InNode makeDecimalInExpr(TreeNode node, Set<BigDecimal> decimalValues,
-                                         Integer precision, Integer scale) {
-    return new InNode(null, null, null, null,
-            decimalValues, precision, scale, null, null, node);
+  public static InNode makeDecimalInExpr(
+      TreeNode node, Set<BigDecimal> decimalValues, Integer precision, Integer scale) {
+    return new InNode(null, null, null, null, decimalValues, precision, scale, null, null, node);
   }
 
   public static InNode makeStringInExpr(TreeNode node, Set<String> stringValues) {
-    return new InNode(null, null, stringValues, null,
-            null, null, null, null, null, node);
+    return new InNode(null, null, stringValues, null, null, null, null, null, null, node);
   }
 
   public static InNode makeBinaryInExpr(TreeNode node, Set<byte[]> binaryValues) {
-    return new InNode(null, null, null, binaryValues,
-            null, null, null, null, null, node);
+    return new InNode(null, null, null, binaryValues, null, null, null, null, null, node);
   }
 
   @Override
@@ -133,40 +127,71 @@ public GandivaTypes.TreeNode toProtobuf() throws GandivaException {
 
     if (intValues != null) {
       GandivaTypes.IntConstants.Builder intConstants = GandivaTypes.IntConstants.newBuilder();
-      intValues.stream().forEach(val -> intConstants.addIntValues(GandivaTypes.IntNode.newBuilder()
-              .setValue(val).build()));
+      intValues.stream()
+          .forEach(
+              val ->
+                  intConstants.addIntValues(
+                      GandivaTypes.IntNode.newBuilder().setValue(val).build()));
       inNode.setIntValues(intConstants.build());
     } else if (longValues != null) {
       GandivaTypes.LongConstants.Builder longConstants = GandivaTypes.LongConstants.newBuilder();
-      longValues.stream().forEach(val -> longConstants.addLongValues(GandivaTypes.LongNode.newBuilder()
-              .setValue(val).build()));
+      longValues.stream()
+          .forEach(
+              val ->
+                  longConstants.addLongValues(
+                      GandivaTypes.LongNode.newBuilder().setValue(val).build()));
       inNode.setLongValues(longConstants.build());
     } else if (floatValues != null) {
       GandivaTypes.FloatConstants.Builder floatConstants = GandivaTypes.FloatConstants.newBuilder();
-      floatValues.stream().forEach(val -> floatConstants.addFloatValues(GandivaTypes.FloatNode.newBuilder()
-              .setValue(val).build()));
+      floatValues.stream()
+          .forEach(
+              val ->
+                  floatConstants.addFloatValues(
+                      GandivaTypes.FloatNode.newBuilder().setValue(val).build()));
       inNode.setFloatValues(floatConstants.build());
     } else if (doubleValues != null) {
-      GandivaTypes.DoubleConstants.Builder doubleConstants = GandivaTypes.DoubleConstants.newBuilder();
-      doubleValues.stream().forEach(val -> doubleConstants.addDoubleValues(GandivaTypes.DoubleNode.newBuilder()
-              .setValue(val).build()));
+      GandivaTypes.DoubleConstants.Builder doubleConstants =
+          GandivaTypes.DoubleConstants.newBuilder();
+      doubleValues.stream()
+          .forEach(
+              val ->
+                  doubleConstants.addDoubleValues(
+                      GandivaTypes.DoubleNode.newBuilder().setValue(val).build()));
       inNode.setDoubleValues(doubleConstants.build());
     } else if (decimalValues != null) {
-      GandivaTypes.DecimalConstants.Builder decimalConstants = GandivaTypes.DecimalConstants.newBuilder();
-      decimalValues.stream().forEach(val -> decimalConstants.addDecimalValues(GandivaTypes.DecimalNode.newBuilder()
-              .setValue(val.toPlainString()).setPrecision(precision).setScale(scale).build()));
+      GandivaTypes.DecimalConstants.Builder decimalConstants =
+          GandivaTypes.DecimalConstants.newBuilder();
+      decimalValues.stream()
+          .forEach(
+              val ->
+                  decimalConstants.addDecimalValues(
+                      GandivaTypes.DecimalNode.newBuilder()
+                          .setValue(val.toPlainString())
+                          .setPrecision(precision)
+                          .setScale(scale)
+                          .build()));
       inNode.setDecimalValues(decimalConstants.build());
     } else if (stringValues != null) {
-      GandivaTypes.StringConstants.Builder stringConstants = GandivaTypes.StringConstants
-              .newBuilder();
-      stringValues.stream().forEach(val -> stringConstants.addStringValues(GandivaTypes.StringNode
-              .newBuilder().setValue(ByteString.copyFrom(val.getBytes(charset))).build()));
+      GandivaTypes.StringConstants.Builder stringConstants =
+          GandivaTypes.StringConstants.newBuilder();
+      stringValues.stream()
+          .forEach(
+              val ->
+                  stringConstants.addStringValues(
+                      GandivaTypes.StringNode.newBuilder()
+                          .setValue(ByteString.copyFrom(val.getBytes(charset)))
+                          .build()));
       inNode.setStringValues(stringConstants.build());
     } else if (binaryValues != null) {
-      GandivaTypes.BinaryConstants.Builder binaryConstants = GandivaTypes.BinaryConstants
-              .newBuilder();
-      binaryValues.stream().forEach(val -> binaryConstants.addBinaryValues(GandivaTypes.BinaryNode
-              .newBuilder().setValue(ByteString.copyFrom(val)).build()));
+      GandivaTypes.BinaryConstants.Builder binaryConstants =
+          GandivaTypes.BinaryConstants.newBuilder();
+      binaryValues.stream()
+          .forEach(
+              val ->
+                  binaryConstants.addBinaryValues(
+                      GandivaTypes.BinaryNode.newBuilder()
+                          .setValue(ByteString.copyFrom(val))
+                          .build()));
       inNode.setBinaryValues(binaryConstants.build());
     }
     GandivaTypes.TreeNode.Builder builder = GandivaTypes.TreeNode.newBuilder();
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/IntNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/IntNode.java
index c3858ef7ec926..26321b4dfd4e7 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/IntNode.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/IntNode.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 
 /**
- * Used to represent expression tree nodes representing int constants.
- * Used in the expression (x + 5)
+ * Used to represent expression tree nodes representing int constants. Used in the expression (x +
+ * 5)
  */
 class IntNode implements TreeNode {
   private final Integer value;
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/LongNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/LongNode.java
index 311c5d94d3304..8a2c8812603f6 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/LongNode.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/LongNode.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 
 /**
- * Used to represent expression tree nodes representing long constants.
- * Used in the expression (x + 5L)
+ * Used to represent expression tree nodes representing long constants. Used in the expression (x +
+ * 5L)
  */
 class LongNode implements TreeNode {
   private final Long value;
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/NullNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/NullNode.java
index a8e7d6f82e522..110b367ff835b 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/NullNode.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/NullNode.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
 import org.apache.arrow.gandiva.exceptions.GandivaException;
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/OrNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/OrNode.java
index 2dbdfed7c7a6a..b8e273a5faf90 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/OrNode.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/OrNode.java
@@ -14,17 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
 import java.util.List;
-
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 
-/**
- * Represents a logical OR Node.
- */
+/** Represents a logical OR Node. */
 class OrNode implements TreeNode {
   private final List<TreeNode> children;
 
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/StringNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/StringNode.java
index a44329739dbed..ad7ff9197aedf 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/StringNode.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/StringNode.java
@@ -14,19 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
+import com.google.protobuf.ByteString;
 import java.nio.charset.Charset;
-
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 
-import com.google.protobuf.ByteString;
-
-/**
- * Used to represent expression tree nodes representing utf8 constants.
- */
+/** Used to represent expression tree nodes representing utf8 constants. */
 class StringNode implements TreeNode {
   private static final Charset charset = Charset.forName("UTF-8");
   private final String value;
@@ -37,12 +32,11 @@ public StringNode(String value) {
 
   @Override
   public GandivaTypes.TreeNode toProtobuf() throws GandivaException {
-    GandivaTypes.StringNode stringNode = GandivaTypes.StringNode.newBuilder()
-        .setValue(ByteString.copyFrom(value.getBytes(charset)))
-        .build();
+    GandivaTypes.StringNode stringNode =
+        GandivaTypes.StringNode.newBuilder()
+            .setValue(ByteString.copyFrom(value.getBytes(charset)))
+            .build();
 
-    return GandivaTypes.TreeNode.newBuilder()
-        .setStringNode(stringNode)
-        .build();
+    return GandivaTypes.TreeNode.newBuilder().setStringNode(stringNode).build();
   }
 }
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/TreeBuilder.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/TreeBuilder.java
index 3d2ea27d044e7..96838e5ad1533 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/TreeBuilder.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/TreeBuilder.java
@@ -14,27 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 
-/**
- * Contains helper functions for constructing expression trees.
- */
+/** Contains helper functions for constructing expression trees. */
 public class TreeBuilder {
-  private TreeBuilder() {
-  }
+  private TreeBuilder() {}
 
-  /**
-   * Helper functions to create literal constants.
-   */
+  /** Helper functions to create literal constants. */
   public static TreeNode makeLiteral(Boolean booleanConstant) {
     return new BooleanNode(booleanConstant);
   }
@@ -67,9 +60,7 @@ public static TreeNode makeDecimalLiteral(String decimalConstant, int precision,
     return new DecimalNode(decimalConstant, precision, scale);
   }
 
-  /**
-   * create a null literal.
-   */
+  /** create a null literal. */
   public static TreeNode makeNull(ArrowType type) {
     return new NullNode(type);
   }
@@ -89,12 +80,10 @@ public static TreeNode makeField(Field field) {
    *
    * @param function Name of the function, e.g. add
    * @param children The arguments to the function
-   * @param retType  The type of the return value of the operator
+   * @param retType The type of the return value of the operator
    * @return Node representing a function
    */
-  public static TreeNode makeFunction(String function,
-                                      List<TreeNode> children,
-                                      ArrowType retType) {
+  public static TreeNode makeFunction(String function, List<TreeNode> children, ArrowType retType) {
     return new FunctionNode(function, children, retType);
   }
 
@@ -102,22 +91,20 @@ public static TreeNode makeFunction(String function,
    * Invoke this function to create a node representing an if-clause.
    *
    * @param condition Node representing the condition
-   * @param thenNode  Node representing the if-block
-   * @param elseNode  Node representing the else-block
-   * @param retType   Return type of the node
+   * @param thenNode Node representing the if-block
+   * @param elseNode Node representing the else-block
+   * @param retType Return type of the node
    * @return Node representing an if-clause
    */
-  public static TreeNode makeIf(TreeNode condition,
-                                TreeNode thenNode,
-                                TreeNode elseNode,
-                                ArrowType retType) {
+  public static TreeNode makeIf(
+      TreeNode condition, TreeNode thenNode, TreeNode elseNode, ArrowType retType) {
     return new IfNode(condition, thenNode, elseNode, retType);
   }
 
   /**
    * Invoke this function to create a node representing an and-clause.
    *
-   * @param nodes  Nodes in the 'and' clause.
+   * @param nodes Nodes in the 'and' clause.
    * @return Node representing an and-clause
    */
   public static TreeNode makeAnd(List<TreeNode> nodes) {
@@ -127,7 +114,7 @@ public static TreeNode makeAnd(List<TreeNode> nodes) {
   /**
    * Invoke this function to create a node representing an or-clause.
    *
-   * @param nodes  Nodes in the 'or' clause.
+   * @param nodes Nodes in the 'or' clause.
    * @return Node representing an or-clause
    */
   public static TreeNode makeOr(List<TreeNode> nodes) {
@@ -137,26 +124,24 @@ public static TreeNode makeOr(List<TreeNode> nodes) {
   /**
    * Invoke this function to create an expression tree.
    *
-   * @param root         is returned by a call to MakeField, MakeFunction, or MakeIf
+   * @param root is returned by a call to MakeField, MakeFunction, or MakeIf
    * @param resultField represents the return value of the expression
    * @return ExpressionTree referring to the root of an expression tree
    */
-  public static ExpressionTree makeExpression(TreeNode root,
-                                              Field resultField) {
+  public static ExpressionTree makeExpression(TreeNode root, Field resultField) {
     return new ExpressionTree(root, resultField);
   }
 
   /**
    * Short cut to create an expression tree involving a single function, e.g. a+b+c.
    *
-   * @param function    Name of the function, e.g. add()
-   * @param inFields   In arguments to the function
+   * @param function Name of the function, e.g. add()
+   * @param inFields In arguments to the function
    * @param resultField represents the return value of the expression
    * @return ExpressionTree referring to the root of an expression tree
    */
-  public static ExpressionTree makeExpression(String function,
-                                              List<Field> inFields,
-                                              Field resultField) {
+  public static ExpressionTree makeExpression(
+      String function, List<Field> inFields, Field resultField) {
     List<TreeNode> children = new ArrayList<TreeNode>(inFields.size());
     for (Field field : inFields) {
       children.add(makeField(field));
@@ -169,8 +154,8 @@ public static ExpressionTree makeExpression(String function,
   /**
    * Invoke this function to create a condition.
    *
-   * @param root        is returned by a call to MakeField, MakeFunction, MakeIf, ..
-   * @return condition  referring to the root of an expression tree
+   * @param root is returned by a call to MakeField, MakeFunction, MakeIf, ..
+   * @return condition referring to the root of an expression tree
    */
   public static Condition makeCondition(TreeNode root) {
     return new Condition(root);
@@ -179,12 +164,11 @@ public static Condition makeCondition(TreeNode root) {
   /**
    * Short cut to create an expression tree involving a single function, e.g. a+b+c.
    *
-   * @param function    Name of the function, e.g. add()
-   * @param inFields    In arguments to the function
-   * @return condition  referring to the root of an expression tree
+   * @param function Name of the function, e.g. add()
+   * @param inFields In arguments to the function
+   * @return condition referring to the root of an expression tree
    */
-  public static Condition makeCondition(String function,
-                                        List<Field> inFields) {
+  public static Condition makeCondition(String function, List<Field> inFields) {
     List<TreeNode> children = new ArrayList<>(inFields.size());
     for (Field field : inFields) {
       children.add(makeField(field));
@@ -194,38 +178,32 @@ public static Condition makeCondition(String function,
     return makeCondition(root);
   }
 
-  public static TreeNode makeInExpressionInt32(TreeNode resultNode,
-                                               Set<Integer> intValues) {
+  public static TreeNode makeInExpressionInt32(TreeNode resultNode, Set<Integer> intValues) {
     return InNode.makeIntInExpr(resultNode, intValues);
   }
 
-  public static TreeNode makeInExpressionBigInt(TreeNode resultNode,
-                                               Set<Long> longValues) {
+  public static TreeNode makeInExpressionBigInt(TreeNode resultNode, Set<Long> longValues) {
     return InNode.makeLongInExpr(resultNode, longValues);
   }
 
-  public static TreeNode makeInExpressionDecimal(TreeNode resultNode,
-                                                 Set<BigDecimal> decimalValues, Integer precision, Integer scale) {
+  public static TreeNode makeInExpressionDecimal(
+      TreeNode resultNode, Set<BigDecimal> decimalValues, Integer precision, Integer scale) {
     return InNode.makeDecimalInExpr(resultNode, decimalValues, precision, scale);
   }
 
-  public static TreeNode makeInExpressionFloat(TreeNode resultNode,
-                                                Set<Float> floatValues) {
+  public static TreeNode makeInExpressionFloat(TreeNode resultNode, Set<Float> floatValues) {
     return InNode.makeFloatInExpr(resultNode, floatValues);
   }
 
-  public static TreeNode makeInExpressionDouble(TreeNode resultNode,
-                                                Set<Double> doubleValues) {
+  public static TreeNode makeInExpressionDouble(TreeNode resultNode, Set<Double> doubleValues) {
     return InNode.makeDoubleInExpr(resultNode, doubleValues);
   }
 
-  public static TreeNode makeInExpressionString(TreeNode resultNode,
-                                                Set<String> stringValues) {
+  public static TreeNode makeInExpressionString(TreeNode resultNode, Set<String> stringValues) {
     return InNode.makeStringInExpr(resultNode, stringValues);
   }
 
-  public static TreeNode makeInExpressionBinary(TreeNode resultNode,
-                                                Set<byte[]> binaryValues) {
+  public static TreeNode makeInExpressionBinary(TreeNode resultNode, Set<byte[]> binaryValues) {
     return InNode.makeBinaryInExpr(resultNode, binaryValues);
   }
 }
diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/TreeNode.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/TreeNode.java
index b8d70d6e76840..b79ec6df2153c 100644
--- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/TreeNode.java
+++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/expression/TreeNode.java
@@ -14,15 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 
-/**
- * Defines an internal node in the expression tree.
- */
+/** Defines an internal node in the expression tree. */
 public interface TreeNode {
   /**
    * Converts a TreeNode into a protobuf.
diff --git a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/BaseEvaluatorTest.java b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/BaseEvaluatorTest.java
index 4a36c0405bd26..5f585e671f676 100644
--- a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/BaseEvaluatorTest.java
+++ b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/BaseEvaluatorTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
 import java.math.BigDecimal;
@@ -25,7 +24,6 @@
 import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.expression.Condition;
 import org.apache.arrow.gandiva.expression.ExpressionTree;
@@ -41,8 +39,8 @@
 import org.apache.arrow.vector.types.FloatingPointPrecision;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 class BaseEvaluatorTest {
 
@@ -62,10 +60,8 @@ class ProjectEvaluator implements BaseEvaluator {
     private long elapsedTime = 0;
     private List<ValueVector> outputVectors = new ArrayList<>();
 
-    public ProjectEvaluator(Projector projector,
-                            DataAndVectorGenerator generator,
-                            int numExprs,
-                            int maxRowsInBatch) {
+    public ProjectEvaluator(
+        Projector projector, DataAndVectorGenerator generator, int numExprs, int maxRowsInBatch) {
       this.projector = projector;
       this.generator = generator;
       this.numExprs = numExprs;
@@ -73,8 +69,8 @@ public ProjectEvaluator(Projector projector,
     }
 
     @Override
-    public void evaluate(ArrowRecordBatch recordBatch,
-                         BufferAllocator allocator) throws GandivaException {
+    public void evaluate(ArrowRecordBatch recordBatch, BufferAllocator allocator)
+        throws GandivaException {
       // set up output vectors
       // for each expression, generate the output vector
       for (int i = 0; i < numExprs; i++) {
@@ -111,8 +107,8 @@ public FilterEvaluator(Filter filter) {
     }
 
     @Override
-    public void evaluate(ArrowRecordBatch recordBatch,
-                         BufferAllocator allocator) throws GandivaException {
+    public void evaluate(ArrowRecordBatch recordBatch, BufferAllocator allocator)
+        throws GandivaException {
       ArrowBuf selectionBuffer = allocator.buffer(recordBatch.getLength() * 2);
       SelectionVectorInt16 selectionVector = new SelectionVectorInt16(selectionBuffer);
 
@@ -189,7 +185,7 @@ public void writeData(ArrowBuf buffer) {
   protected ArrowType int64;
   protected ArrowType float64;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
     boolType = new ArrowType.Bool();
@@ -199,7 +195,7 @@ public void init() {
     float64 = new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE);
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     allocator.close();
   }
@@ -234,7 +230,8 @@ ArrowBuf intBuf(int[] ints) {
   }
 
   DecimalVector decimalVector(String[] values, int precision, int scale) {
-    DecimalVector vector = new DecimalVector("decimal" + Math.random(), allocator, precision, scale);
+    DecimalVector vector =
+        new DecimalVector("decimal" + Math.random(), allocator, precision, scale);
     vector.allocateNew();
     for (int i = 0; i < values.length; i++) {
       BigDecimal decimal = new BigDecimal(values[i]).setScale(scale);
@@ -324,10 +321,12 @@ void generateData(DataAndVectorGenerator generator, int numRecords, ArrowBuf buf
     }
   }
 
-  private void generateDataAndEvaluate(DataAndVectorGenerator generator,
+  private void generateDataAndEvaluate(
+      DataAndVectorGenerator generator,
       BaseEvaluator evaluator,
       int numFields,
-      int numRows, int maxRowsInBatch,
+      int numRows,
+      int maxRowsInBatch,
       int inputFieldSize)
       throws GandivaException, Exception {
     int numRemaining = numRows;
@@ -368,34 +367,40 @@ private void generateDataAndEvaluate(DataAndVectorGenerator generator,
     }
   }
 
-  long timedProject(DataAndVectorGenerator generator,
-      Schema schema, List<ExpressionTree> exprs,
-      int numRows, int maxRowsInBatch,
+  long timedProject(
+      DataAndVectorGenerator generator,
+      Schema schema,
+      List<ExpressionTree> exprs,
+      int numRows,
+      int maxRowsInBatch,
       int inputFieldSize)
       throws GandivaException, Exception {
     Projector projector = Projector.make(schema, exprs);
     try {
       ProjectEvaluator evaluator =
           new ProjectEvaluator(projector, generator, exprs.size(), maxRowsInBatch);
-      generateDataAndEvaluate(generator, evaluator,
-          schema.getFields().size(), numRows, maxRowsInBatch, inputFieldSize);
+      generateDataAndEvaluate(
+          generator, evaluator, schema.getFields().size(), numRows, maxRowsInBatch, inputFieldSize);
       return evaluator.getElapsedMillis();
     } finally {
       projector.close();
     }
   }
 
-  long timedFilter(DataAndVectorGenerator generator,
-      Schema schema, Condition condition,
-      int numRows, int maxRowsInBatch,
+  long timedFilter(
+      DataAndVectorGenerator generator,
+      Schema schema,
+      Condition condition,
+      int numRows,
+      int maxRowsInBatch,
       int inputFieldSize)
       throws GandivaException, Exception {
 
     Filter filter = Filter.make(schema, condition);
     try {
       FilterEvaluator evaluator = new FilterEvaluator(filter);
-      generateDataAndEvaluate(generator, evaluator,
-          schema.getFields().size(), numRows, maxRowsInBatch, inputFieldSize);
+      generateDataAndEvaluate(
+          generator, evaluator, schema.getFields().size(), numRows, maxRowsInBatch, inputFieldSize);
       return evaluator.getElapsedMillis();
     } finally {
       filter.close();
diff --git a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/DecimalTypeUtilTest.java b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/DecimalTypeUtilTest.java
index fe51c09e33d57..b5a7af23bebb7 100644
--- a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/DecimalTypeUtilTest.java
+++ b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/DecimalTypeUtilTest.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.apache.arrow.vector.types.pojo.ArrowType;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DecimalTypeUtilTest {
 
@@ -27,63 +27,68 @@ public class DecimalTypeUtilTest {
   public void testOutputTypesForAdd() {
     ArrowType.Decimal operand1 = getDecimal(30, 10);
     ArrowType.Decimal operand2 = getDecimal(30, 10);
-    ArrowType.Decimal resultType = DecimalTypeUtil.getResultTypeForOperation(DecimalTypeUtil
-            .OperationType.ADD, operand1, operand2);
-    Assert.assertTrue(getDecimal(31, 10).equals(resultType));
+    ArrowType.Decimal resultType =
+        DecimalTypeUtil.getResultTypeForOperation(
+            DecimalTypeUtil.OperationType.ADD, operand1, operand2);
+    assertTrue(getDecimal(31, 10).equals(resultType));
 
     operand1 = getDecimal(30, 6);
     operand2 = getDecimal(30, 5);
-    resultType = DecimalTypeUtil.getResultTypeForOperation(DecimalTypeUtil
-            .OperationType.ADD, operand1, operand2);
-    Assert.assertTrue(getDecimal(32, 6).equals(resultType));
+    resultType =
+        DecimalTypeUtil.getResultTypeForOperation(
+            DecimalTypeUtil.OperationType.ADD, operand1, operand2);
+    assertTrue(getDecimal(32, 6).equals(resultType));
 
     operand1 = getDecimal(30, 10);
     operand2 = getDecimal(38, 10);
-    resultType = DecimalTypeUtil.getResultTypeForOperation(DecimalTypeUtil
-            .OperationType.ADD, operand1, operand2);
-    Assert.assertTrue(getDecimal(38, 9).equals(resultType));
+    resultType =
+        DecimalTypeUtil.getResultTypeForOperation(
+            DecimalTypeUtil.OperationType.ADD, operand1, operand2);
+    assertTrue(getDecimal(38, 9).equals(resultType));
 
     operand1 = getDecimal(38, 10);
     operand2 = getDecimal(38, 38);
-    resultType = DecimalTypeUtil.getResultTypeForOperation(DecimalTypeUtil
-            .OperationType.ADD, operand1, operand2);
-    Assert.assertTrue(getDecimal(38, 9).equals(resultType));
+    resultType =
+        DecimalTypeUtil.getResultTypeForOperation(
+            DecimalTypeUtil.OperationType.ADD, operand1, operand2);
+    assertTrue(getDecimal(38, 9).equals(resultType));
 
     operand1 = getDecimal(38, 10);
     operand2 = getDecimal(38, 2);
-    resultType = DecimalTypeUtil.getResultTypeForOperation(DecimalTypeUtil
-            .OperationType.ADD, operand1, operand2);
-    Assert.assertTrue(getDecimal(38, 6).equals(resultType));
-
+    resultType =
+        DecimalTypeUtil.getResultTypeForOperation(
+            DecimalTypeUtil.OperationType.ADD, operand1, operand2);
+    assertTrue(getDecimal(38, 6).equals(resultType));
   }
 
   @Test
   public void testOutputTypesForMultiply() {
     ArrowType.Decimal operand1 = getDecimal(30, 10);
     ArrowType.Decimal operand2 = getDecimal(30, 10);
-    ArrowType.Decimal resultType = DecimalTypeUtil.getResultTypeForOperation(DecimalTypeUtil
-                    .OperationType.MULTIPLY, operand1, operand2);
-    Assert.assertTrue(getDecimal(38, 6).equals(resultType));
+    ArrowType.Decimal resultType =
+        DecimalTypeUtil.getResultTypeForOperation(
+            DecimalTypeUtil.OperationType.MULTIPLY, operand1, operand2);
+    assertTrue(getDecimal(38, 6).equals(resultType));
 
     operand1 = getDecimal(38, 10);
     operand2 = getDecimal(9, 2);
-    resultType = DecimalTypeUtil.getResultTypeForOperation(DecimalTypeUtil
-            .OperationType.MULTIPLY, operand1, operand2);
-    Assert.assertTrue(getDecimal(38, 6).equals(resultType));
-
+    resultType =
+        DecimalTypeUtil.getResultTypeForOperation(
+            DecimalTypeUtil.OperationType.MULTIPLY, operand1, operand2);
+    assertTrue(getDecimal(38, 6).equals(resultType));
   }
 
   @Test
   public void testOutputTypesForMod() {
     ArrowType.Decimal operand1 = getDecimal(30, 10);
     ArrowType.Decimal operand2 = getDecimal(28, 7);
-    ArrowType.Decimal resultType = DecimalTypeUtil.getResultTypeForOperation(DecimalTypeUtil
-                    .OperationType.MOD, operand1, operand2);
-    Assert.assertTrue(getDecimal(30, 10).equals(resultType));
+    ArrowType.Decimal resultType =
+        DecimalTypeUtil.getResultTypeForOperation(
+            DecimalTypeUtil.OperationType.MOD, operand1, operand2);
+    assertTrue(getDecimal(30, 10).equals(resultType));
   }
 
   private ArrowType.Decimal getDecimal(int precision, int scale) {
     return new ArrowType.Decimal(precision, scale, 128);
   }
-
 }
diff --git a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ExpressionRegistryTest.java b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ExpressionRegistryTest.java
index a51ac09ba1a51..58279b15c3b54 100644
--- a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ExpressionRegistryTest.java
+++ b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ExpressionRegistryTest.java
@@ -14,17 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
-import java.util.Set;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.google.common.collect.Lists;
+import java.util.Set;
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.vector.types.pojo.ArrowType;
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.google.common.collect.Lists;
+import org.junit.jupiter.api.Test;
 
 public class ExpressionRegistryTest {
 
@@ -32,7 +30,7 @@ public class ExpressionRegistryTest {
   public void testTypes() throws GandivaException {
     Set<ArrowType> types = ExpressionRegistry.getInstance().getSupportedTypes();
     ArrowType.Int uint8 = new ArrowType.Int(8, false);
-    Assert.assertTrue(types.contains(uint8));
+    assertTrue(types.contains(uint8));
   }
 
   @Test
@@ -41,7 +39,7 @@ public void testFunctions() throws GandivaException {
     FunctionSignature signature =
         new FunctionSignature("add", uint8, Lists.newArrayList(uint8, uint8));
     Set<FunctionSignature> functions = ExpressionRegistry.getInstance().getSupportedFunctions();
-    Assert.assertTrue(functions.contains(signature));
+    assertTrue(functions.contains(signature));
   }
 
   @Test
@@ -50,7 +48,7 @@ public void testFunctionAliases() throws GandivaException {
     FunctionSignature signature =
         new FunctionSignature("modulo", int64, Lists.newArrayList(int64, int64));
     Set<FunctionSignature> functions = ExpressionRegistry.getInstance().getSupportedFunctions();
-    Assert.assertTrue(functions.contains(signature));
+    assertTrue(functions.contains(signature));
   }
 
   @Test
@@ -60,6 +58,6 @@ public void testCaseInsensitiveFunctionName() throws GandivaException {
     FunctionSignature signature =
         new FunctionSignature("castvarchar", utf8, Lists.newArrayList(utf8, int64));
     Set<FunctionSignature> functions = ExpressionRegistry.getInstance().getSupportedFunctions();
-    Assert.assertTrue(functions.contains(signature));
+    assertTrue(functions.contains(signature));
   }
 }
diff --git a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterProjectTest.java b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterProjectTest.java
index 51fc1c2915ed4..80427de0f03f8 100644
--- a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterProjectTest.java
+++ b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterProjectTest.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
+import com.google.common.collect.Lists;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.expression.Condition;
 import org.apache.arrow.gandiva.expression.ExpressionTree;
@@ -35,9 +34,7 @@
 import org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Test;
-
-import com.google.common.collect.Lists;
+import org.junit.jupiter.api.Test;
 
 public class FilterProjectTest extends BaseEvaluatorTest {
 
@@ -54,25 +51,34 @@ public void testSimpleSV16() throws GandivaException, Exception {
     Filter filter = Filter.make(schema, condition);
 
     ExpressionTree expression = TreeBuilder.makeExpression("add", Lists.newArrayList(a, b), c);
-    Projector projector = Projector.make(schema, Lists.newArrayList(expression), SelectionVectorType.SV_INT16);
+    Projector projector =
+        Projector.make(schema, Lists.newArrayList(expression), SelectionVectorType.SV_INT16);
 
     int numRows = 16;
-    byte[] validity = new byte[]{(byte) 255, 0};
+    byte[] validity = new byte[] {(byte) 255, 0};
     // second half is "undefined"
-    int[] aValues = new int[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-    int[] bValues = new int[]{2, 1, 4, 3, 6, 5, 8, 7, 10, 9, 12, 11, 14, 13, 14, 15};
+    int[] aValues = new int[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
+    int[] bValues = new int[] {2, 1, 4, 3, 6, 5, 8, 7, 10, 9, 12, 11, 14, 13, 14, 15};
     int[] expected = {3, 7, 11, 15};
 
     verifyTestCaseFor16(filter, projector, numRows, validity, aValues, bValues, expected);
   }
 
-  private void verifyTestCaseFor16(Filter filter, Projector projector, int numRows, byte[] validity,
-                              int[] aValues, int[] bValues, int[] expected) throws GandivaException {
+  private void verifyTestCaseFor16(
+      Filter filter,
+      Projector projector,
+      int numRows,
+      byte[] validity,
+      int[] aValues,
+      int[] bValues,
+      int[] expected)
+      throws GandivaException {
     ArrowBuf validitya = buf(validity);
     ArrowBuf valuesa = intBuf(aValues);
     ArrowBuf validityb = buf(validity);
     ArrowBuf valuesb = intBuf(bValues);
-    ArrowRecordBatch batch = new ArrowRecordBatch(
+    ArrowRecordBatch batch =
+        new ArrowRecordBatch(
             numRows,
             Lists.newArrayList(new ArrowFieldNode(numRows, 0), new ArrowFieldNode(numRows, 0)),
             Lists.newArrayList(validitya, valuesa, validityb, valuesb));
diff --git a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterTest.java b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterTest.java
index ed6e43cd6c400..7563465f37483 100644
--- a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterTest.java
+++ b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterTest.java
@@ -14,14 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.IntStream;
-
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.expression.Condition;
 import org.apache.arrow.gandiva.expression.TreeBuilder;
@@ -32,11 +34,7 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
+import org.junit.jupiter.api.Test;
 
 public class FilterTest extends BaseEvaluatorTest {
 
@@ -83,7 +81,7 @@ public void testSimpleInString() throws GandivaException, Exception {
     List<TreeNode> args = Lists.newArrayList(TreeBuilder.makeField(c1), l1, l2);
     TreeNode substr = TreeBuilder.makeFunction("substr", args, new ArrowType.Utf8());
     TreeNode inExpr =
-            TreeBuilder.makeInExpressionString(substr, Sets.newHashSet("one", "two", "thr", "fou"));
+        TreeBuilder.makeInExpressionString(substr, Sets.newHashSet("one", "two", "thr", "fou"));
 
     Condition condition = TreeBuilder.makeCondition(inExpr);
 
@@ -93,9 +91,25 @@ public void testSimpleInString() throws GandivaException, Exception {
     int numRows = 16;
     byte[] validity = new byte[] {(byte) 255, 0};
     // second half is "undefined"
-    String[] c1Values = new String[]{"one", "two", "three", "four", "five", "six", "seven",
-      "eight", "nine", "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen",
-      "sixteen"};
+    String[] c1Values =
+        new String[] {
+          "one",
+          "two",
+          "three",
+          "four",
+          "five",
+          "six",
+          "seven",
+          "eight",
+          "nine",
+          "ten",
+          "eleven",
+          "twelve",
+          "thirteen",
+          "fourteen",
+          "fifteen",
+          "sixteen"
+        };
     int[] expected = {0, 1, 2, 3};
     ArrowBuf c1Validity = buf(validity);
     ArrowBuf c2Validity = buf(validity);
@@ -103,10 +117,10 @@ public void testSimpleInString() throws GandivaException, Exception {
 
     ArrowFieldNode fieldNode = new ArrowFieldNode(numRows, 0);
     ArrowRecordBatch batch =
-            new ArrowRecordBatch(
-                    numRows,
-                    Lists.newArrayList(fieldNode),
-                    Lists.newArrayList(c1Validity, dataBufsX.get(0), dataBufsX.get(1), c2Validity));
+        new ArrowRecordBatch(
+            numRows,
+            Lists.newArrayList(fieldNode),
+            Lists.newArrayList(c1Validity, dataBufsX.get(0), dataBufsX.get(1), c2Validity));
 
     ArrowBuf selectionBuffer = buf(numRows * 2);
     SelectionVectorInt16 selectionVector = new SelectionVectorInt16(selectionBuffer);
@@ -117,7 +131,7 @@ public void testSimpleInString() throws GandivaException, Exception {
     releaseRecordBatch(batch);
     selectionBuffer.close();
     filter.close();
-    Assert.assertArrayEquals(expected, actual);
+    assertArrayEquals(expected, actual);
   }
 
   @Test
@@ -126,7 +140,7 @@ public void testSimpleInInt() throws GandivaException, Exception {
 
     List<Field> argsSchema = Lists.newArrayList(c1);
     TreeNode inExpr =
-            TreeBuilder.makeInExpressionInt32(TreeBuilder.makeField(c1), Sets.newHashSet(1, 2, 3, 4));
+        TreeBuilder.makeInExpressionInt32(TreeBuilder.makeField(c1), Sets.newHashSet(1, 2, 3, 4));
 
     Condition condition = TreeBuilder.makeCondition(inExpr);
 
@@ -145,10 +159,10 @@ public void testSimpleInInt() throws GandivaException, Exception {
 
     ArrowFieldNode fieldNode = new ArrowFieldNode(numRows, 0);
     ArrowRecordBatch batch =
-            new ArrowRecordBatch(
-                    numRows,
-                    Lists.newArrayList(fieldNode),
-                    Lists.newArrayList(validitya, valuesa, validityb));
+        new ArrowRecordBatch(
+            numRows,
+            Lists.newArrayList(fieldNode),
+            Lists.newArrayList(validitya, valuesa, validityb));
 
     ArrowBuf selectionBuffer = buf(numRows * 2);
     SelectionVectorInt16 selectionVector = new SelectionVectorInt16(selectionBuffer);
@@ -160,7 +174,7 @@ public void testSimpleInInt() throws GandivaException, Exception {
     releaseRecordBatch(batch);
     selectionBuffer.close();
     filter.close();
-    Assert.assertArrayEquals(expected, actual);
+    assertArrayEquals(expected, actual);
   }
 
   @Test
@@ -310,6 +324,6 @@ private void verifyTestCase(
     selectionBuffer.close();
     filter.close();
 
-    Assert.assertArrayEquals(expected, actual);
+    assertArrayEquals(expected, actual);
   }
 }
diff --git a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/MicroBenchmarkTest.java b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/MicroBenchmarkTest.java
index 6934c3f9e7d1a..65409938a9142 100644
--- a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/MicroBenchmarkTest.java
+++ b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/MicroBenchmarkTest.java
@@ -14,24 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.google.common.collect.Lists;
+import java.util.List;
 import org.apache.arrow.gandiva.expression.Condition;
 import org.apache.arrow.gandiva.expression.ExpressionTree;
 import org.apache.arrow.gandiva.expression.TreeBuilder;
 import org.apache.arrow.gandiva.expression.TreeNode;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.google.common.collect.Lists;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-@Ignore
+@Disabled
 public class MicroBenchmarkTest extends BaseEvaluatorTest {
 
   private double toleranceRatio = 4.0;
@@ -54,13 +52,16 @@ public void testAdd3() throws Exception {
     List<Field> cols = Lists.newArrayList(x, n2x, n3x);
     Schema schema = new Schema(cols);
 
-    long timeTaken = timedProject(new Int32DataAndVectorGenerator(allocator),
-        schema,
-        Lists.newArrayList(expr),
-        1 * MILLION, 16 * THOUSAND,
-        4);
+    long timeTaken =
+        timedProject(
+            new Int32DataAndVectorGenerator(allocator),
+            schema,
+            Lists.newArrayList(expr),
+            1 * MILLION,
+            16 * THOUSAND,
+            4);
     System.out.println("Time taken for projecting 1m records of add3 is " + timeTaken + "ms");
-    Assert.assertTrue(timeTaken <= 13 * toleranceRatio);
+    assertTrue(timeTaken <= 13 * toleranceRatio);
   }
 
   @Test
@@ -115,13 +116,16 @@ public void testIf() throws Exception {
     ExpressionTree expr = TreeBuilder.makeExpression(topNode, x);
     Schema schema = new Schema(Lists.newArrayList(x));
 
-    long timeTaken = timedProject(new BoundedInt32DataAndVectorGenerator(allocator, 250),
-        schema,
-        Lists.newArrayList(expr),
-        1 * MILLION, 16 * THOUSAND,
-        4);
+    long timeTaken =
+        timedProject(
+            new BoundedInt32DataAndVectorGenerator(allocator, 250),
+            schema,
+            Lists.newArrayList(expr),
+            1 * MILLION,
+            16 * THOUSAND,
+            4);
     System.out.println("Time taken for projecting 10m records of nestedIf is " + timeTaken + "ms");
-    Assert.assertTrue(timeTaken <= 15 * toleranceRatio);
+    assertTrue(timeTaken <= 15 * toleranceRatio);
   }
 
   @Test
@@ -131,21 +135,26 @@ public void testFilterAdd2() throws Exception {
     Field n3x = Field.nullable("n3x", int32);
 
     // x + n2x < n3x
-    TreeNode add = TreeBuilder.makeFunction("add",
-        Lists.newArrayList(TreeBuilder.makeField(x), TreeBuilder.makeField(n2x)), int32);
-    TreeNode lessThan = TreeBuilder
-        .makeFunction("less_than", Lists.newArrayList(add, TreeBuilder.makeField(n3x)), boolType);
+    TreeNode add =
+        TreeBuilder.makeFunction(
+            "add", Lists.newArrayList(TreeBuilder.makeField(x), TreeBuilder.makeField(n2x)), int32);
+    TreeNode lessThan =
+        TreeBuilder.makeFunction(
+            "less_than", Lists.newArrayList(add, TreeBuilder.makeField(n3x)), boolType);
     Condition condition = TreeBuilder.makeCondition(lessThan);
 
     List<Field> cols = Lists.newArrayList(x, n2x, n3x);
     Schema schema = new Schema(cols);
 
-    long timeTaken = timedFilter(new Int32DataAndVectorGenerator(allocator),
-        schema,
-        condition,
-        1 * MILLION, 16 * THOUSAND,
-        4);
+    long timeTaken =
+        timedFilter(
+            new Int32DataAndVectorGenerator(allocator),
+            schema,
+            condition,
+            1 * MILLION,
+            16 * THOUSAND,
+            4);
     System.out.println("Time taken for filtering 10m records of a+b<c is " + timeTaken + "ms");
-    Assert.assertTrue(timeTaken <= 12 * toleranceRatio);
+    assertTrue(timeTaken <= 12 * toleranceRatio);
   }
 }
diff --git a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorDecimalTest.java b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorDecimalTest.java
index 28a57c9f8a4e1..3916051224436 100644
--- a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorDecimalTest.java
+++ b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorDecimalTest.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.google.common.collect.Lists;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.expression.ExpressionTree;
 import org.apache.arrow.gandiva.expression.TreeBuilder;
@@ -42,15 +42,9 @@
 import org.apache.arrow.vector.types.pojo.ArrowType.Decimal;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import com.google.common.collect.Lists;
+import org.junit.jupiter.api.Test;
 
 public class ProjectorDecimalTest extends org.apache.arrow.gandiva.evaluator.BaseEvaluatorTest {
-  @Rule
-  public ExpectedException exception = ExpectedException.none();
 
   @Test
   public void test_add() throws GandivaException {
@@ -61,8 +55,9 @@ public void test_add() throws GandivaException {
     Field b = Field.nullable("b", decimal);
     List<Field> args = Lists.newArrayList(a, b);
 
-    ArrowType.Decimal outputType = DecimalTypeUtil.getResultTypeForOperation(DecimalTypeUtil
-            .OperationType.ADD, decimal, decimal);
+    ArrowType.Decimal outputType =
+        DecimalTypeUtil.getResultTypeForOperation(
+            DecimalTypeUtil.OperationType.ADD, decimal, decimal);
     Field retType = Field.nullable("c", outputType);
     ExpressionTree root = TreeBuilder.makeExpression("add", args, retType);
 
@@ -72,21 +67,25 @@ public void test_add() throws GandivaException {
     Projector eval = Projector.make(schema, exprs);
 
     int numRows = 4;
-    byte[] validity = new byte[]{(byte) 255};
-    String[] aValues = new String[]{"1.12345678", "2.12345678", "3.12345678", "4.12345678"};
-    String[] bValues = new String[]{"2.12345678", "3.12345678", "4.12345678", "5.12345678"};
+    byte[] validity = new byte[] {(byte) 255};
+    String[] aValues = new String[] {"1.12345678", "2.12345678", "3.12345678", "4.12345678"};
+    String[] bValues = new String[] {"2.12345678", "3.12345678", "4.12345678", "5.12345678"};
 
     DecimalVector valuesa = decimalVector(aValues, precision, scale);
     DecimalVector valuesb = decimalVector(bValues, precision, scale);
     ArrowRecordBatch batch =
-            new ArrowRecordBatch(
-                    numRows,
-                    Lists.newArrayList(new ArrowFieldNode(numRows, 0), new ArrowFieldNode(numRows, 0)),
-                    Lists.newArrayList(valuesa.getValidityBuffer(), valuesa.getDataBuffer(),
-                            valuesb.getValidityBuffer(), valuesb.getDataBuffer()));
-
-    DecimalVector outVector = new DecimalVector("decimal_output", allocator, outputType.getPrecision(),
-            outputType.getScale());
+        new ArrowRecordBatch(
+            numRows,
+            Lists.newArrayList(new ArrowFieldNode(numRows, 0), new ArrowFieldNode(numRows, 0)),
+            Lists.newArrayList(
+                valuesa.getValidityBuffer(),
+                valuesa.getDataBuffer(),
+                valuesb.getValidityBuffer(),
+                valuesb.getDataBuffer()));
+
+    DecimalVector outVector =
+        new DecimalVector(
+            "decimal_output", allocator, outputType.getPrecision(), outputType.getScale());
     outVector.allocateNew(numRows);
 
     List<ValueVector> output = new ArrayList<ValueVector>();
@@ -94,15 +93,18 @@ public void test_add() throws GandivaException {
     eval.evaluate(batch, output);
 
     // should have scaled down.
-    BigDecimal[] expOutput = new BigDecimal[]{BigDecimal.valueOf(3.2469136),
-                                              BigDecimal.valueOf(5.2469136),
-                                              BigDecimal.valueOf(7.2469136),
-                                              BigDecimal.valueOf(9.2469136)};
+    BigDecimal[] expOutput =
+        new BigDecimal[] {
+          BigDecimal.valueOf(3.2469136),
+          BigDecimal.valueOf(5.2469136),
+          BigDecimal.valueOf(7.2469136),
+          BigDecimal.valueOf(9.2469136)
+        };
 
     for (int i = 0; i < 4; i++) {
       assertFalse(outVector.isNull(i));
-      assertTrue("index : " + i + " failed compare", expOutput[i].compareTo(outVector.getObject(i)
-      ) == 0);
+      assertTrue(
+          expOutput[i].compareTo(outVector.getObject(i)) == 0, "index : " + i + " failed compare");
     }
 
     // free buffers
@@ -119,8 +121,9 @@ public void test_add_literal() throws GandivaException {
     ArrowType.Decimal literalType = new ArrowType.Decimal(2, 1, 128);
     Field a = Field.nullable("a", decimal);
 
-    ArrowType.Decimal outputType = DecimalTypeUtil.getResultTypeForOperation(DecimalTypeUtil
-            .OperationType.ADD, decimal, literalType);
+    ArrowType.Decimal outputType =
+        DecimalTypeUtil.getResultTypeForOperation(
+            DecimalTypeUtil.OperationType.ADD, decimal, literalType);
     Field retType = Field.nullable("c", outputType);
     TreeNode field = TreeBuilder.makeField(a);
     TreeNode literal = TreeBuilder.makeDecimalLiteral("6", 2, 1);
@@ -134,25 +137,31 @@ public void test_add_literal() throws GandivaException {
     Projector eval = Projector.make(schema, exprs);
 
     int numRows = 4;
-    String[] aValues = new String[]{"1", "2", "3", "4"};
+    String[] aValues = new String[] {"1", "2", "3", "4"};
 
     DecimalVector valuesa = decimalVector(aValues, precision, scale);
     ArrowRecordBatch batch =
-            new ArrowRecordBatch(
-                    numRows,
-                    Lists.newArrayList(new ArrowFieldNode(numRows, 0)),
-                    Lists.newArrayList(valuesa.getValidityBuffer(), valuesa.getDataBuffer()));
+        new ArrowRecordBatch(
+            numRows,
+            Lists.newArrayList(new ArrowFieldNode(numRows, 0)),
+            Lists.newArrayList(valuesa.getValidityBuffer(), valuesa.getDataBuffer()));
 
-    DecimalVector outVector = new DecimalVector("decimal_output", allocator, outputType.getPrecision(),
-            outputType.getScale());
+    DecimalVector outVector =
+        new DecimalVector(
+            "decimal_output", allocator, outputType.getPrecision(), outputType.getScale());
     outVector.allocateNew(numRows);
 
     List<ValueVector> output = new ArrayList<ValueVector>();
     output.add(outVector);
     eval.evaluate(batch, output);
 
-    BigDecimal[] expOutput = new BigDecimal[]{BigDecimal.valueOf(1.6), BigDecimal.valueOf(2.6),
-            BigDecimal.valueOf(3.6), BigDecimal.valueOf(4.6)};
+    BigDecimal[] expOutput =
+        new BigDecimal[] {
+          BigDecimal.valueOf(1.6),
+          BigDecimal.valueOf(2.6),
+          BigDecimal.valueOf(3.6),
+          BigDecimal.valueOf(4.6)
+        };
 
     for (int i = 0; i < 4; i++) {
       assertFalse(outVector.isNull(i));
@@ -174,8 +183,9 @@ public void test_multiply() throws GandivaException {
     Field b = Field.nullable("b", decimal);
     List<Field> args = Lists.newArrayList(a, b);
 
-    ArrowType.Decimal outputType = DecimalTypeUtil.getResultTypeForOperation(DecimalTypeUtil
-        .OperationType.MULTIPLY, decimal, decimal);
+    ArrowType.Decimal outputType =
+        DecimalTypeUtil.getResultTypeForOperation(
+            DecimalTypeUtil.OperationType.MULTIPLY, decimal, decimal);
     Field retType = Field.nullable("c", outputType);
     ExpressionTree root = TreeBuilder.makeExpression("multiply", args, retType);
 
@@ -185,9 +195,11 @@ public void test_multiply() throws GandivaException {
     Projector eval = Projector.make(schema, exprs);
 
     int numRows = 4;
-    byte[] validity = new byte[]{(byte) 255};
-    String[] aValues = new String[]{"1.12345678", "2.12345678", "3.12345678", "999999999999.99999999"};
-    String[] bValues = new String[]{"2.12345678", "3.12345678", "4.12345678", "999999999999.99999999"};
+    byte[] validity = new byte[] {(byte) 255};
+    String[] aValues =
+        new String[] {"1.12345678", "2.12345678", "3.12345678", "999999999999.99999999"};
+    String[] bValues =
+        new String[] {"2.12345678", "3.12345678", "4.12345678", "999999999999.99999999"};
 
     DecimalVector valuesa = decimalVector(aValues, precision, scale);
     DecimalVector valuesb = decimalVector(bValues, precision, scale);
@@ -195,11 +207,15 @@ public void test_multiply() throws GandivaException {
         new ArrowRecordBatch(
             numRows,
             Lists.newArrayList(new ArrowFieldNode(numRows, 0), new ArrowFieldNode(numRows, 0)),
-            Lists.newArrayList(valuesa.getValidityBuffer(), valuesa.getDataBuffer(),
-                valuesb.getValidityBuffer(), valuesb.getDataBuffer()));
-
-    DecimalVector outVector = new DecimalVector("decimal_output", allocator, outputType.getPrecision(),
-        outputType.getScale());
+            Lists.newArrayList(
+                valuesa.getValidityBuffer(),
+                valuesa.getDataBuffer(),
+                valuesb.getValidityBuffer(),
+                valuesb.getDataBuffer()));
+
+    DecimalVector outVector =
+        new DecimalVector(
+            "decimal_output", allocator, outputType.getPrecision(), outputType.getScale());
     outVector.allocateNew(numRows);
 
     List<ValueVector> output = new ArrayList<ValueVector>();
@@ -207,15 +223,18 @@ public void test_multiply() throws GandivaException {
     eval.evaluate(batch, output);
 
     // should have scaled down.
-    BigDecimal[] expOutput = new BigDecimal[]{BigDecimal.valueOf(2.385612),
-        BigDecimal.valueOf(6.632525),
-        BigDecimal.valueOf(12.879439),
-        new BigDecimal("999999999999999999980000.000000")};
+    BigDecimal[] expOutput =
+        new BigDecimal[] {
+          BigDecimal.valueOf(2.385612),
+          BigDecimal.valueOf(6.632525),
+          BigDecimal.valueOf(12.879439),
+          new BigDecimal("999999999999999999980000.000000")
+        };
 
     for (int i = 0; i < 4; i++) {
       assertFalse(outVector.isNull(i));
-      assertTrue("index : " + i + " failed compare", expOutput[i].compareTo(outVector.getObject(i)
-      ) == 0);
+      assertTrue(
+          expOutput[i].compareTo(outVector.getObject(i)) == 0, "index : " + i + " failed compare");
     }
 
     // free buffers
@@ -232,16 +251,17 @@ public void testCompare() throws GandivaException {
     Field b = Field.nullable("b", bType);
     List<Field> args = Lists.newArrayList(a, b);
 
-    List<ExpressionTree> exprs = new ArrayList<>(
-        Arrays.asList(
-            TreeBuilder.makeExpression("equal", args, Field.nullable("eq", boolType)),
-            TreeBuilder.makeExpression("not_equal", args, Field.nullable("ne", boolType)),
-            TreeBuilder.makeExpression("less_than", args, Field.nullable("lt", boolType)),
-            TreeBuilder.makeExpression("less_than_or_equal_to", args, Field.nullable("le", boolType)),
-            TreeBuilder.makeExpression("greater_than", args, Field.nullable("gt", boolType)),
-            TreeBuilder.makeExpression("greater_than_or_equal_to", args, Field.nullable("ge", boolType))
-        )
-    );
+    List<ExpressionTree> exprs =
+        new ArrayList<>(
+            Arrays.asList(
+                TreeBuilder.makeExpression("equal", args, Field.nullable("eq", boolType)),
+                TreeBuilder.makeExpression("not_equal", args, Field.nullable("ne", boolType)),
+                TreeBuilder.makeExpression("less_than", args, Field.nullable("lt", boolType)),
+                TreeBuilder.makeExpression(
+                    "less_than_or_equal_to", args, Field.nullable("le", boolType)),
+                TreeBuilder.makeExpression("greater_than", args, Field.nullable("gt", boolType)),
+                TreeBuilder.makeExpression(
+                    "greater_than_or_equal_to", args, Field.nullable("ge", boolType))));
 
     Schema schema = new Schema(args);
     Projector eval = Projector.make(schema, exprs);
@@ -250,8 +270,8 @@ public void testCompare() throws GandivaException {
     ArrowRecordBatch batch = null;
     try {
       int numRows = 4;
-      String[] aValues = new String[]{"7.620", "2.380", "3.860", "-18.160"};
-      String[] bValues = new String[]{"7.62", "3.50", "1.90", "-1.45"};
+      String[] aValues = new String[] {"7.620", "2.380", "3.860", "-18.160"};
+      String[] bValues = new String[] {"7.62", "3.50", "1.90", "-1.45"};
 
       DecimalVector valuesa = decimalVector(aValues, aType.getPrecision(), aType.getScale());
       DecimalVector valuesb = decimalVector(bValues, bType.getPrecision(), bType.getScale());
@@ -259,30 +279,32 @@ public void testCompare() throws GandivaException {
           new ArrowRecordBatch(
               numRows,
               Lists.newArrayList(new ArrowFieldNode(numRows, 0), new ArrowFieldNode(numRows, 0)),
-              Lists.newArrayList(valuesa.getValidityBuffer(), valuesa.getDataBuffer(),
-                  valuesb.getValidityBuffer(), valuesb.getDataBuffer()));
+              Lists.newArrayList(
+                  valuesa.getValidityBuffer(),
+                  valuesa.getDataBuffer(),
+                  valuesb.getValidityBuffer(),
+                  valuesb.getDataBuffer()));
 
       // expected results.
       boolean[][] expected = {
-          {true, false, false, false}, // eq
-          {false, true, true, true}, // ne
-          {false, true, false, true}, // lt
-          {true, true, false, true}, // le
-          {false, false, true, false}, // gt
-          {true, false, true, false}, // ge
+        {true, false, false, false}, // eq
+        {false, true, true, true}, // ne
+        {false, true, false, true}, // lt
+        {true, true, false, true}, // le
+        {false, false, true, false}, // gt
+        {true, false, true, false}, // ge
       };
 
       // Allocate output vectors.
-      output = new ArrayList<>(
-          Arrays.asList(
-              new BitVector("eq", allocator),
-              new BitVector("ne", allocator),
-              new BitVector("lt", allocator),
-              new BitVector("le", allocator),
-              new BitVector("gt", allocator),
-              new BitVector("ge", allocator)
-          )
-      );
+      output =
+          new ArrayList<>(
+              Arrays.asList(
+                  new BitVector("eq", allocator),
+                  new BitVector("ne", allocator),
+                  new BitVector("lt", allocator),
+                  new BitVector("le", allocator),
+                  new BitVector("gt", allocator),
+                  new BitVector("ge", allocator)));
       for (ValueVector v : output) {
         v.allocateNew();
       }
@@ -297,8 +319,10 @@ public void testCompare() throws GandivaException {
 
         for (int i = 0; i < numRows; i++) {
           assertFalse(resultVector.isNull(i));
-          assertEquals("mismatch in result for expr at idx " + idx + " for row " + i,
-              expectedArray[i], resultVector.getObject(i).booleanValue());
+          assertEquals(
+              expectedArray[i],
+              resultVector.getObject(i).booleanValue(),
+              "mismatch in result for expr at idx " + idx + " for row " + i);
         }
       }
     } finally {
@@ -321,25 +345,27 @@ public void testRound() throws GandivaException {
     Field a = Field.nullable("a", aType);
     List<Field> args = Lists.newArrayList(a);
 
-    List<ExpressionTree> exprs = new ArrayList<>(
-        Arrays.asList(
-            TreeBuilder.makeExpression("abs", args, Field.nullable("abs", aType)),
-            TreeBuilder.makeExpression("ceil", args, Field.nullable("ceil", aWithScaleZero)),
-            TreeBuilder.makeExpression("floor", args, Field.nullable("floor", aWithScaleZero)),
-            TreeBuilder.makeExpression("round", args, Field.nullable("round", aWithScaleZero)),
-            TreeBuilder.makeExpression("truncate", args, Field.nullable("truncate", aWithScaleZero)),
-            TreeBuilder.makeExpression(
-                TreeBuilder.makeFunction("round",
-                    Lists.newArrayList(TreeBuilder.makeField(a), TreeBuilder.makeLiteral(1)),
-                    aWithScaleOne),
-                Field.nullable("round_scale_1", aWithScaleOne)),
-            TreeBuilder.makeExpression(
-                TreeBuilder.makeFunction("truncate",
-                    Lists.newArrayList(TreeBuilder.makeField(a), TreeBuilder.makeLiteral(1)),
-                    aWithScaleOne),
-                Field.nullable("truncate_scale_1", aWithScaleOne))
-        )
-    );
+    List<ExpressionTree> exprs =
+        new ArrayList<>(
+            Arrays.asList(
+                TreeBuilder.makeExpression("abs", args, Field.nullable("abs", aType)),
+                TreeBuilder.makeExpression("ceil", args, Field.nullable("ceil", aWithScaleZero)),
+                TreeBuilder.makeExpression("floor", args, Field.nullable("floor", aWithScaleZero)),
+                TreeBuilder.makeExpression("round", args, Field.nullable("round", aWithScaleZero)),
+                TreeBuilder.makeExpression(
+                    "truncate", args, Field.nullable("truncate", aWithScaleZero)),
+                TreeBuilder.makeExpression(
+                    TreeBuilder.makeFunction(
+                        "round",
+                        Lists.newArrayList(TreeBuilder.makeField(a), TreeBuilder.makeLiteral(1)),
+                        aWithScaleOne),
+                    Field.nullable("round_scale_1", aWithScaleOne)),
+                TreeBuilder.makeExpression(
+                    TreeBuilder.makeFunction(
+                        "truncate",
+                        Lists.newArrayList(TreeBuilder.makeField(a), TreeBuilder.makeLiteral(1)),
+                        aWithScaleOne),
+                    Field.nullable("truncate_scale_1", aWithScaleOne))));
 
     Schema schema = new Schema(args);
     Projector eval = Projector.make(schema, exprs);
@@ -348,7 +374,7 @@ public void testRound() throws GandivaException {
     ArrowRecordBatch batch = null;
     try {
       int numRows = 4;
-      String[] aValues = new String[]{"1.23", "1.58", "-1.23", "-1.58"};
+      String[] aValues = new String[] {"1.23", "1.58", "-1.23", "-1.58"};
 
       DecimalVector valuesa = decimalVector(aValues, aType.getPrecision(), aType.getScale());
       batch =
@@ -359,30 +385,61 @@ public void testRound() throws GandivaException {
 
       // expected results.
       BigDecimal[][] expected = {
-          {BigDecimal.valueOf(1.23), BigDecimal.valueOf(1.58),
-              BigDecimal.valueOf(1.23), BigDecimal.valueOf(1.58)}, // abs
-          {BigDecimal.valueOf(2), BigDecimal.valueOf(2), BigDecimal.valueOf(-1), BigDecimal.valueOf(-1)}, // ceil
-          {BigDecimal.valueOf(1), BigDecimal.valueOf(1), BigDecimal.valueOf(-2), BigDecimal.valueOf(-2)}, // floor
-          {BigDecimal.valueOf(1), BigDecimal.valueOf(2), BigDecimal.valueOf(-1), BigDecimal.valueOf(-2)}, // round
-          {BigDecimal.valueOf(1), BigDecimal.valueOf(1), BigDecimal.valueOf(-1), BigDecimal.valueOf(-1)}, // truncate
-          {BigDecimal.valueOf(1.2), BigDecimal.valueOf(1.6),
-              BigDecimal.valueOf(-1.2), BigDecimal.valueOf(-1.6)}, // round-to-scale-1
-          {BigDecimal.valueOf(1.2), BigDecimal.valueOf(1.5),
-              BigDecimal.valueOf(-1.2), BigDecimal.valueOf(-1.5)}, // truncate-to-scale-1
+        {
+          BigDecimal.valueOf(1.23),
+          BigDecimal.valueOf(1.58),
+          BigDecimal.valueOf(1.23),
+          BigDecimal.valueOf(1.58)
+        }, // abs
+        {
+          BigDecimal.valueOf(2),
+          BigDecimal.valueOf(2),
+          BigDecimal.valueOf(-1),
+          BigDecimal.valueOf(-1)
+        }, // ceil
+        {
+          BigDecimal.valueOf(1),
+          BigDecimal.valueOf(1),
+          BigDecimal.valueOf(-2),
+          BigDecimal.valueOf(-2)
+        }, // floor
+        {
+          BigDecimal.valueOf(1),
+          BigDecimal.valueOf(2),
+          BigDecimal.valueOf(-1),
+          BigDecimal.valueOf(-2)
+        }, // round
+        {
+          BigDecimal.valueOf(1),
+          BigDecimal.valueOf(1),
+          BigDecimal.valueOf(-1),
+          BigDecimal.valueOf(-1)
+        }, // truncate
+        {
+          BigDecimal.valueOf(1.2),
+          BigDecimal.valueOf(1.6),
+          BigDecimal.valueOf(-1.2),
+          BigDecimal.valueOf(-1.6)
+        }, // round-to-scale-1
+        {
+          BigDecimal.valueOf(1.2),
+          BigDecimal.valueOf(1.5),
+          BigDecimal.valueOf(-1.2),
+          BigDecimal.valueOf(-1.5)
+        }, // truncate-to-scale-1
       };
 
       // Allocate output vectors.
-      output = new ArrayList<>(
-          Arrays.asList(
-              new DecimalVector("abs", allocator, aType.getPrecision(), aType.getScale()),
-              new DecimalVector("ceil", allocator, aType.getPrecision(), 0),
-              new DecimalVector("floor", allocator, aType.getPrecision(), 0),
-              new DecimalVector("round", allocator, aType.getPrecision(), 0),
-              new DecimalVector("truncate", allocator, aType.getPrecision(), 0),
-              new DecimalVector("round_to_scale_1", allocator, aType.getPrecision(), 1),
-              new DecimalVector("truncate_to_scale_1", allocator, aType.getPrecision(), 1)
-          )
-      );
+      output =
+          new ArrayList<>(
+              Arrays.asList(
+                  new DecimalVector("abs", allocator, aType.getPrecision(), aType.getScale()),
+                  new DecimalVector("ceil", allocator, aType.getPrecision(), 0),
+                  new DecimalVector("floor", allocator, aType.getPrecision(), 0),
+                  new DecimalVector("round", allocator, aType.getPrecision(), 0),
+                  new DecimalVector("truncate", allocator, aType.getPrecision(), 0),
+                  new DecimalVector("round_to_scale_1", allocator, aType.getPrecision(), 1),
+                  new DecimalVector("truncate_to_scale_1", allocator, aType.getPrecision(), 1)));
       for (ValueVector v : output) {
         v.allocateNew();
       }
@@ -397,12 +454,17 @@ public void testRound() throws GandivaException {
 
         for (int i = 0; i < numRows; i++) {
           assertFalse(resultVector.isNull(i));
-          assertTrue("mismatch in result for " +
-                  "field " + resultVector.getField().getName() +
-                  " for row " + i +
-                  " expected " + expectedArray[i] +
-                  ", got " + resultVector.getObject(i),
-              expectedArray[i].compareTo(resultVector.getObject(i)) == 0);
+          assertTrue(
+              expectedArray[i].compareTo(resultVector.getObject(i)) == 0,
+              "mismatch in result for "
+                  + "field "
+                  + resultVector.getField().getName()
+                  + " for row "
+                  + i
+                  + " expected "
+                  + expectedArray[i]
+                  + ", got "
+                  + resultVector.getObject(i));
         }
       }
     } finally {
@@ -425,21 +487,21 @@ public void testCastToDecimal() throws GandivaException {
     Field int64f = Field.nullable("int64", int64);
     Field doublef = Field.nullable("float64", float64);
 
-    List<ExpressionTree> exprs = new ArrayList<>(
-        Arrays.asList(
-            TreeBuilder.makeExpression("castDECIMAL",
-                Lists.newArrayList(int64f),
-                Field.nullable("int64_to_dec", decimalType)),
-
-            TreeBuilder.makeExpression("castDECIMAL",
-                Lists.newArrayList(doublef),
-                Field.nullable("float64_to_dec", decimalType)),
-
-            TreeBuilder.makeExpression("castDECIMAL",
-                Lists.newArrayList(dec),
-                Field.nullable("dec_to_dec", decimalWithScaleOne))
-        )
-    );
+    List<ExpressionTree> exprs =
+        new ArrayList<>(
+            Arrays.asList(
+                TreeBuilder.makeExpression(
+                    "castDECIMAL",
+                    Lists.newArrayList(int64f),
+                    Field.nullable("int64_to_dec", decimalType)),
+                TreeBuilder.makeExpression(
+                    "castDECIMAL",
+                    Lists.newArrayList(doublef),
+                    Field.nullable("float64_to_dec", decimalType)),
+                TreeBuilder.makeExpression(
+                    "castDECIMAL",
+                    Lists.newArrayList(dec),
+                    Field.nullable("dec_to_dec", decimalWithScaleOne))));
 
     Schema schema = new Schema(Lists.newArrayList(int64f, doublef, dec));
     Projector eval = Projector.make(schema, exprs);
@@ -448,32 +510,43 @@ public void testCastToDecimal() throws GandivaException {
     ArrowRecordBatch batch = null;
     try {
       int numRows = 4;
-      String[] aValues = new String[]{"1.23", "1.58", "-1.23", "-1.58"};
-      DecimalVector valuesa = decimalVector(aValues, decimalType.getPrecision(), decimalType.getScale());
-      batch = new ArrowRecordBatch(
-          numRows,
-          Lists.newArrayList(
-              new ArrowFieldNode(numRows, 0),
-              new ArrowFieldNode(numRows, 0),
-              new ArrowFieldNode(numRows, 0)),
-          Lists.newArrayList(
-              arrowBufWithAllValid(4),
-              longBuf(new long[]{123, 158, -123, -158}),
-              arrowBufWithAllValid(4),
-              doubleBuf(new double[]{1.23, 1.58, -1.23, -1.58}),
-              valuesa.getValidityBuffer(),
-              valuesa.getDataBuffer())
-          );
+      String[] aValues = new String[] {"1.23", "1.58", "-1.23", "-1.58"};
+      DecimalVector valuesa =
+          decimalVector(aValues, decimalType.getPrecision(), decimalType.getScale());
+      batch =
+          new ArrowRecordBatch(
+              numRows,
+              Lists.newArrayList(
+                  new ArrowFieldNode(numRows, 0),
+                  new ArrowFieldNode(numRows, 0),
+                  new ArrowFieldNode(numRows, 0)),
+              Lists.newArrayList(
+                  arrowBufWithAllValid(4),
+                  longBuf(new long[] {123, 158, -123, -158}),
+                  arrowBufWithAllValid(4),
+                  doubleBuf(new double[] {1.23, 1.58, -1.23, -1.58}),
+                  valuesa.getValidityBuffer(),
+                  valuesa.getDataBuffer()));
 
       // Allocate output vectors.
-      output = new ArrayList<>(
-          Arrays.asList(
-              new DecimalVector("int64_to_dec", allocator, decimalType.getPrecision(), decimalType.getScale()),
-              new DecimalVector("float64_to_dec", allocator, decimalType.getPrecision(), decimalType.getScale()),
-              new DecimalVector("dec_to_dec", allocator,
-                  decimalWithScaleOne.getPrecision(), decimalWithScaleOne.getScale())
-          )
-      );
+      output =
+          new ArrayList<>(
+              Arrays.asList(
+                  new DecimalVector(
+                      "int64_to_dec",
+                      allocator,
+                      decimalType.getPrecision(),
+                      decimalType.getScale()),
+                  new DecimalVector(
+                      "float64_to_dec",
+                      allocator,
+                      decimalType.getPrecision(),
+                      decimalType.getScale()),
+                  new DecimalVector(
+                      "dec_to_dec",
+                      allocator,
+                      decimalWithScaleOne.getPrecision(),
+                      decimalWithScaleOne.getScale())));
       for (ValueVector v : output) {
         v.allocateNew();
       }
@@ -483,24 +556,41 @@ public void testCastToDecimal() throws GandivaException {
 
       // compare the outputs.
       BigDecimal[][] expected = {
-          { BigDecimal.valueOf(123), BigDecimal.valueOf(158),
-              BigDecimal.valueOf(-123), BigDecimal.valueOf(-158)},
-          { BigDecimal.valueOf(1.23), BigDecimal.valueOf(1.58),
-              BigDecimal.valueOf(-1.23), BigDecimal.valueOf(-1.58)},
-          { BigDecimal.valueOf(1.2), BigDecimal.valueOf(1.6),
-              BigDecimal.valueOf(-1.2), BigDecimal.valueOf(-1.6)}
+        {
+          BigDecimal.valueOf(123),
+          BigDecimal.valueOf(158),
+          BigDecimal.valueOf(-123),
+          BigDecimal.valueOf(-158)
+        },
+        {
+          BigDecimal.valueOf(1.23),
+          BigDecimal.valueOf(1.58),
+          BigDecimal.valueOf(-1.23),
+          BigDecimal.valueOf(-1.58)
+        },
+        {
+          BigDecimal.valueOf(1.2),
+          BigDecimal.valueOf(1.6),
+          BigDecimal.valueOf(-1.2),
+          BigDecimal.valueOf(-1.6)
+        }
       };
       for (int idx = 0; idx < output.size(); ++idx) {
         BigDecimal[] expectedArray = expected[idx];
         DecimalVector resultVector = (DecimalVector) output.get(idx);
         for (int i = 0; i < numRows; i++) {
           assertFalse(resultVector.isNull(i));
-          assertTrue("mismatch in result for " +
-                  "field " + resultVector.getField().getName() +
-                  " for row " + i +
-                  " expected " + expectedArray[i] +
-                  ", got " + resultVector.getObject(i),
-                expectedArray[i].compareTo(resultVector.getObject(i)) == 0);
+          assertTrue(
+              expectedArray[i].compareTo(resultVector.getObject(i)) == 0,
+              "mismatch in result for "
+                  + "field "
+                  + resultVector.getField().getName()
+                  + " for row "
+                  + i
+                  + " expected "
+                  + expectedArray[i]
+                  + ", got "
+                  + resultVector.getObject(i));
         }
       }
     } finally {
@@ -521,31 +611,25 @@ public void testCastToLong() throws GandivaException {
     Field dec = Field.nullable("dec", decimalType);
 
     Schema schema = new Schema(Lists.newArrayList(dec));
-    Projector eval = Projector.make(schema,
-        Lists.newArrayList(
-            TreeBuilder.makeExpression("castBIGINT",
-                Lists.newArrayList(dec),
-                Field.nullable("dec_to_int64", int64)
-            )
-        )
-    );
+    Projector eval =
+        Projector.make(
+            schema,
+            Lists.newArrayList(
+                TreeBuilder.makeExpression(
+                    "castBIGINT", Lists.newArrayList(dec), Field.nullable("dec_to_int64", int64))));
 
     List<ValueVector> output = null;
     ArrowRecordBatch batch = null;
     try {
       int numRows = 5;
-      String[] aValues = new String[]{"1.23", "1.50", "98765.78", "-1.23", "-1.58"};
-      DecimalVector valuesa = decimalVector(aValues, decimalType.getPrecision(), decimalType.getScale());
-      batch = new ArrowRecordBatch(
-          numRows,
-          Lists.newArrayList(
-              new ArrowFieldNode(numRows, 0)
-          ),
-          Lists.newArrayList(
-              valuesa.getValidityBuffer(),
-              valuesa.getDataBuffer()
-          )
-      );
+      String[] aValues = new String[] {"1.23", "1.50", "98765.78", "-1.23", "-1.58"};
+      DecimalVector valuesa =
+          decimalVector(aValues, decimalType.getPrecision(), decimalType.getScale());
+      batch =
+          new ArrowRecordBatch(
+              numRows,
+              Lists.newArrayList(new ArrowFieldNode(numRows, 0)),
+              Lists.newArrayList(valuesa.getValidityBuffer(), valuesa.getDataBuffer()));
 
       // Allocate output vectors.
       BigIntVector resultVector = new BigIntVector("dec_to_int64", allocator);
@@ -579,31 +663,27 @@ public void testCastToDouble() throws GandivaException {
     Field dec = Field.nullable("dec", decimalType);
 
     Schema schema = new Schema(Lists.newArrayList(dec));
-    Projector eval = Projector.make(schema,
-        Lists.newArrayList(
-            TreeBuilder.makeExpression("castFLOAT8",
-                Lists.newArrayList(dec),
-                Field.nullable("dec_to_float64", float64)
-            )
-        )
-    );
+    Projector eval =
+        Projector.make(
+            schema,
+            Lists.newArrayList(
+                TreeBuilder.makeExpression(
+                    "castFLOAT8",
+                    Lists.newArrayList(dec),
+                    Field.nullable("dec_to_float64", float64))));
 
     List<ValueVector> output = null;
     ArrowRecordBatch batch = null;
     try {
       int numRows = 4;
-      String[] aValues = new String[]{"1.23", "1.58", "-1.23", "-1.58"};
-      DecimalVector valuesa = decimalVector(aValues, decimalType.getPrecision(), decimalType.getScale());
-      batch = new ArrowRecordBatch(
-          numRows,
-          Lists.newArrayList(
-              new ArrowFieldNode(numRows, 0)
-          ),
-          Lists.newArrayList(
-              valuesa.getValidityBuffer(),
-              valuesa.getDataBuffer()
-          )
-      );
+      String[] aValues = new String[] {"1.23", "1.58", "-1.23", "-1.58"};
+      DecimalVector valuesa =
+          decimalVector(aValues, decimalType.getPrecision(), decimalType.getScale());
+      batch =
+          new ArrowRecordBatch(
+              numRows,
+              Lists.newArrayList(new ArrowFieldNode(numRows, 0)),
+              Lists.newArrayList(valuesa.getValidityBuffer(), valuesa.getDataBuffer()));
 
       // Allocate output vectors.
       Float8Vector resultVector = new Float8Vector("dec_to_float64", allocator);
@@ -640,35 +720,34 @@ public void testCastToString() throws GandivaException {
     TreeNode literal = TreeBuilder.makeLiteral(5L);
     List<TreeNode> args = Lists.newArrayList(field, literal);
     TreeNode cast = TreeBuilder.makeFunction("castVARCHAR", args, new ArrowType.Utf8());
-    TreeNode root = TreeBuilder.makeFunction("equal",
-        Lists.newArrayList(cast, TreeBuilder.makeField(str)), new ArrowType.Bool());
-    ExpressionTree tree = TreeBuilder.makeExpression(root, Field.nullable("are_equal", new ArrowType.Bool()));
+    TreeNode root =
+        TreeBuilder.makeFunction(
+            "equal", Lists.newArrayList(cast, TreeBuilder.makeField(str)), new ArrowType.Bool());
+    ExpressionTree tree =
+        TreeBuilder.makeExpression(root, Field.nullable("are_equal", new ArrowType.Bool()));
 
     Schema schema = new Schema(Lists.newArrayList(dec, str));
-    Projector eval = Projector.make(schema, Lists.newArrayList(tree)
-    );
+    Projector eval = Projector.make(schema, Lists.newArrayList(tree));
 
     List<ValueVector> output = null;
     ArrowRecordBatch batch = null;
     try {
       int numRows = 4;
-      String[] aValues = new String[]{"10.51", "100.23", "-1000.23", "-0000.10"};
+      String[] aValues = new String[] {"10.51", "100.23", "-1000.23", "-0000.10"};
       String[] expected = {"10.51", "100.2", "-1000", "-0.10"};
-      DecimalVector valuesa = decimalVector(aValues, decimalType.getPrecision(), decimalType.getScale());
+      DecimalVector valuesa =
+          decimalVector(aValues, decimalType.getPrecision(), decimalType.getScale());
       VarCharVector result = varcharVector(expected);
-      batch = new ArrowRecordBatch(
-          numRows,
-          Lists.newArrayList(
-              new ArrowFieldNode(numRows, 0)
-          ),
-          Lists.newArrayList(
-              valuesa.getValidityBuffer(),
-              valuesa.getDataBuffer(),
-              result.getValidityBuffer(),
-              result.getOffsetBuffer(),
-              result.getDataBuffer()
-          )
-      );
+      batch =
+          new ArrowRecordBatch(
+              numRows,
+              Lists.newArrayList(new ArrowFieldNode(numRows, 0)),
+              Lists.newArrayList(
+                  valuesa.getValidityBuffer(),
+                  valuesa.getDataBuffer(),
+                  result.getValidityBuffer(),
+                  result.getOffsetBuffer(),
+                  result.getDataBuffer()));
 
       BitVector resultVector = new BitVector("res", allocator);
       resultVector.allocateNew();
@@ -705,44 +784,48 @@ public void testCastStringToDecimal() throws GandivaException {
     ExpressionTree tree = TreeBuilder.makeExpression(cast, Field.nullable("dec_str", decimalType));
 
     Schema schema = new Schema(Lists.newArrayList(str));
-    Projector eval = Projector.make(schema, Lists.newArrayList(tree)
-    );
+    Projector eval = Projector.make(schema, Lists.newArrayList(tree));
 
     List<ValueVector> output = null;
     ArrowRecordBatch batch = null;
     try {
       int numRows = 4;
-      String[] aValues = new String[]{"10.5134", "-0.1", "10.516", "-1000"};
+      String[] aValues = new String[] {"10.5134", "-0.1", "10.516", "-1000"};
       VarCharVector valuesa = varcharVector(aValues);
-      batch = new ArrowRecordBatch(
-          numRows,
-          Lists.newArrayList(
-              new ArrowFieldNode(numRows, 0)
-          ),
-          Lists.newArrayList(
-              valuesa.getValidityBuffer(),
-              valuesa.getOffsetBuffer(),
-              valuesa.getDataBuffer()
-          )
-      );
-
-      DecimalVector resultVector = new DecimalVector("res", allocator,
-          decimalType.getPrecision(), decimalType.getScale());
+      batch =
+          new ArrowRecordBatch(
+              numRows,
+              Lists.newArrayList(new ArrowFieldNode(numRows, 0)),
+              Lists.newArrayList(
+                  valuesa.getValidityBuffer(), valuesa.getOffsetBuffer(), valuesa.getDataBuffer()));
+
+      DecimalVector resultVector =
+          new DecimalVector("res", allocator, decimalType.getPrecision(), decimalType.getScale());
       resultVector.allocateNew();
       output = new ArrayList<>(Arrays.asList(resultVector));
 
-      BigDecimal[] expected = {BigDecimal.valueOf(10.51), BigDecimal.valueOf(-0.10),
-          BigDecimal.valueOf(10.52), BigDecimal.valueOf(0.00)};
+      BigDecimal[] expected = {
+        BigDecimal.valueOf(10.51),
+        BigDecimal.valueOf(-0.10),
+        BigDecimal.valueOf(10.52),
+        BigDecimal.valueOf(0.00)
+      };
       // evaluate expressions.
       eval.evaluate(batch, output);
 
       // compare the outputs.
       for (int i = 0; i < numRows; i++) {
-        assertTrue("mismatch in result for " +
-            "field " + resultVector.getField().getName() +
-            " for row " + i +
-            " expected " + expected[i] +
-            ", got " + resultVector.getObject(i), expected[i].compareTo(resultVector.getObject(i)) == 0);
+        assertTrue(
+            expected[i].compareTo(resultVector.getObject(i)) == 0,
+            "mismatch in result for "
+                + "field "
+                + resultVector.getField().getName()
+                + " for row "
+                + i
+                + " expected "
+                + expected[i]
+                + ", got "
+                + resultVector.getObject(i));
       }
     } finally {
       // free buffers
@@ -758,40 +841,49 @@ public void testCastStringToDecimal() throws GandivaException {
 
   @Test
   public void testInvalidDecimal() throws GandivaException {
-    exception.expect(IllegalArgumentException.class);
-    exception.expectMessage("Gandiva only supports decimals of upto 38 precision. Input precision" +
-            " : 0");
     Decimal decimalType = new Decimal(0, 0, 128);
     Field int64f = Field.nullable("int64", int64);
 
     Schema schema = new Schema(Lists.newArrayList(int64f));
-    Projector eval = Projector.make(schema,
-            Lists.newArrayList(
-                    TreeBuilder.makeExpression("castDECIMAL",
-                            Lists.newArrayList(int64f),
-                            Field.nullable("invalid_dec", decimalType)
-                    )
-            )
-    );
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              Projector eval =
+                  Projector.make(
+                      schema,
+                      Lists.newArrayList(
+                          TreeBuilder.makeExpression(
+                              "castDECIMAL",
+                              Lists.newArrayList(int64f),
+                              Field.nullable("invalid_dec", decimalType))));
+            });
+    assertEquals(
+        "Gandiva only supports decimals of upto 38 precision. Input precision : 0",
+        exception.getMessage());
   }
 
   @Test
   public void testInvalidDecimalGt38() throws GandivaException {
-    exception.expect(IllegalArgumentException.class);
-    exception.expectMessage("Gandiva only supports decimals of upto 38 precision. Input precision" +
-            " : 42");
     Decimal decimalType = new Decimal(42, 0, 128);
     Field int64f = Field.nullable("int64", int64);
 
     Schema schema = new Schema(Lists.newArrayList(int64f));
-    Projector eval = Projector.make(schema,
-            Lists.newArrayList(
-                    TreeBuilder.makeExpression("castDECIMAL",
-                            Lists.newArrayList(int64f),
-                            Field.nullable("invalid_dec", decimalType)
-                    )
-            )
-    );
+    IllegalArgumentException exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              Projector eval =
+                  Projector.make(
+                      schema,
+                      Lists.newArrayList(
+                          TreeBuilder.makeExpression(
+                              "castDECIMAL",
+                              Lists.newArrayList(int64f),
+                              Field.nullable("invalid_dec", decimalType))));
+            });
+    assertEquals(
+        "Gandiva only supports decimals of upto 38 precision. Input precision : 42",
+        exception.getMessage());
   }
 }
-
diff --git a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorTest.java b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorTest.java
index fce983fdeca68..f2590226b1a74 100644
--- a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorTest.java
+++ b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorTest.java
@@ -14,14 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import java.math.BigDecimal;
 import java.nio.charset.Charset;
 import java.time.Instant;
@@ -33,7 +35,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.IntStream;
-
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.expression.ExpressionTree;
 import org.apache.arrow.gandiva.expression.TreeBuilder;
@@ -58,23 +59,14 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class ProjectorTest extends BaseEvaluatorTest {
 
   private Charset utf8Charset = Charset.forName("UTF-8");
   private Charset utf16Charset = Charset.forName("UTF-16");
 
-  @Rule
-  public ExpectedException thrown = ExpectedException.none();
-
   List<ArrowBuf> varBufs(String[] strings, Charset charset) {
     ArrowBuf offsetsBuffer = allocator.buffer((strings.length + 1) * 4);
 
@@ -107,7 +99,8 @@ List<ArrowBuf> binaryBufs(String[] strings) {
     return varBufs(strings, utf16Charset);
   }
 
-  private void testMakeProjectorParallel(ConfigurationBuilder.ConfigOptions configOptions) throws InterruptedException {
+  private void testMakeProjectorParallel(ConfigurationBuilder.ConfigOptions configOptions)
+      throws InterruptedException {
     List<Schema> schemas = Lists.newArrayList();
     Field a = Field.nullable("a", int64);
     Field b = Field.nullable("b", int64);
@@ -140,9 +133,11 @@ private void testMakeProjectorParallel(ConfigurationBuilder.ConfigOptions config
               executors.submit(
                   () -> {
                     try {
-                      Projector evaluator = configOptions == null ?
-                          Projector.make(schemas.get((int) (Math.random() * 100)), exprs) :
-                          Projector.make(schemas.get((int) (Math.random() * 100)), exprs, configOptions);
+                      Projector evaluator =
+                          configOptions == null
+                              ? Projector.make(schemas.get((int) (Math.random() * 100)), exprs)
+                              : Projector.make(
+                                  schemas.get((int) (Math.random() * 100)), exprs, configOptions);
                       evaluator.close();
                     } catch (GandivaException e) {
                       e.printStackTrace();
@@ -157,11 +152,12 @@ private void testMakeProjectorParallel(ConfigurationBuilder.ConfigOptions config
   public void testMakeProjectorParallel() throws Exception {
     testMakeProjectorParallel(null);
     testMakeProjectorParallel(new ConfigurationBuilder.ConfigOptions().withTargetCPU(false));
-    testMakeProjectorParallel(new ConfigurationBuilder.ConfigOptions().withTargetCPU(false).withOptimize(false));
+    testMakeProjectorParallel(
+        new ConfigurationBuilder.ConfigOptions().withTargetCPU(false).withOptimize(false));
   }
 
   // Will be fixed by https://issues.apache.org/jira/browse/ARROW-4371
-  @Ignore
+  @Disabled
   @Test
   public void testMakeProjector() throws GandivaException {
     Field a = Field.nullable("a", int64);
@@ -192,7 +188,7 @@ public void testMakeProjector() throws GandivaException {
     long timeToMakeProjector = (System.currentTimeMillis() - startTime);
     // should be getting the projector from the cache;
     // giving 5ms for varying system load.
-    Assert.assertTrue(timeToMakeProjector < 5L);
+    assertTrue(timeToMakeProjector < 5L);
 
     evaluator1.close();
     evaluator2.close();
@@ -221,7 +217,7 @@ public void testMakeProjectorValidationError() throws InterruptedException {
       exceptionThrown = true;
     }
 
-    Assert.assertTrue(exceptionThrown);
+    assertTrue(exceptionThrown);
 
     // allow GC to collect any temp resources.
     Thread.sleep(1000);
@@ -234,7 +230,7 @@ public void testMakeProjectorValidationError() throws InterruptedException {
       exceptionThrown = true;
     }
 
-    Assert.assertTrue(exceptionThrown);
+    assertTrue(exceptionThrown);
   }
 
   @Test
@@ -252,10 +248,10 @@ public void testEvaluate() throws GandivaException, Exception {
     Projector eval = Projector.make(schema, exprs);
 
     int numRows = 16;
-    byte[] validity = new byte[]{(byte) 255, 0};
+    byte[] validity = new byte[] {(byte) 255, 0};
     // second half is "undefined"
-    int[] aValues = new int[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-    int[] bValues = new int[]{16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
+    int[] aValues = new int[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
+    int[] bValues = new int[] {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
 
     ArrowBuf validitya = buf(validity);
     ArrowBuf valuesa = intBuf(aValues);
@@ -303,19 +299,20 @@ public void testEvaluateDivZero() throws GandivaException, Exception {
     Projector eval = Projector.make(schema, exprs);
 
     int numRows = 2;
-    byte[] validity = new byte[]{(byte) 255};
+    byte[] validity = new byte[] {(byte) 255};
     // second half is "undefined"
-    int[] aValues = new int[]{2, 2};
-    int[] bValues = new int[]{1, 0};
+    int[] aValues = new int[] {2, 2};
+    int[] bValues = new int[] {1, 0};
 
     ArrowBuf validitya = buf(validity);
     ArrowBuf valuesa = intBuf(aValues);
     ArrowBuf validityb = buf(validity);
     ArrowBuf valuesb = intBuf(bValues);
-    ArrowRecordBatch batch = new ArrowRecordBatch(
-        numRows,
-        Lists.newArrayList(new ArrowFieldNode(numRows, 0), new ArrowFieldNode(numRows, 0)),
-        Lists.newArrayList(validitya, valuesa, validityb, valuesb));
+    ArrowRecordBatch batch =
+        new ArrowRecordBatch(
+            numRows,
+            Lists.newArrayList(new ArrowFieldNode(numRows, 0), new ArrowFieldNode(numRows, 0)),
+            Lists.newArrayList(validitya, valuesa, validityb, valuesb));
 
     IntVector intVector = new IntVector(EMPTY_SCHEMA_PATH, allocator);
     intVector.allocateNew(numRows);
@@ -326,10 +323,10 @@ public void testEvaluateDivZero() throws GandivaException, Exception {
     try {
       eval.evaluate(batch, output);
     } catch (GandivaException e) {
-      Assert.assertTrue(e.getMessage().contains("divide by zero"));
+      assertTrue(e.getMessage().contains("divide by zero"));
       exceptionThrown = true;
     }
-    Assert.assertTrue(exceptionThrown);
+    assertTrue(exceptionThrown);
 
     // free buffers
     releaseRecordBatch(batch);
@@ -357,53 +354,57 @@ public void testDivZeroParallel() throws GandivaException, InterruptedException
     // pre-build the projector so that same projector is used for all executions.
     Projector test = Projector.make(s, exprs);
 
-    IntStream.range(0, 1000).forEach(i -> {
-      executors.submit(() -> {
-        try {
-          Projector evaluator = Projector.make(s, exprs);
-          int numRows = 2;
-          byte[] validity = new byte[]{(byte) 255};
-          int[] aValues = new int[]{2, 2};
-          int[] bValues;
-          if (i % 2 == 0) {
-            errorCountExp.incrementAndGet();
-            bValues = new int[]{1, 0};
-          } else {
-            bValues = new int[]{1, 1};
-          }
-
-          ArrowBuf validitya = buf(validity);
-          ArrowBuf valuesa = intBuf(aValues);
-          ArrowBuf validityb = buf(validity);
-          ArrowBuf valuesb = intBuf(bValues);
-          ArrowRecordBatch batch = new ArrowRecordBatch(
-              numRows,
-              Lists.newArrayList(new ArrowFieldNode(numRows, 0), new ArrowFieldNode(numRows,
-                  0)),
-              Lists.newArrayList(validitya, valuesa, validityb, valuesb));
-
-          IntVector intVector = new IntVector(EMPTY_SCHEMA_PATH, allocator);
-          intVector.allocateNew(numRows);
-
-          List<ValueVector> output = new ArrayList<ValueVector>();
-          output.add(intVector);
-          try {
-            evaluator.evaluate(batch, output);
-          } catch (GandivaException e) {
-            errorCount.incrementAndGet();
-          }
-          // free buffers
-          releaseRecordBatch(batch);
-          releaseValueVectors(output);
-          evaluator.close();
-        } catch (GandivaException ignore) {
-        }
-      });
-    });
+    IntStream.range(0, 1000)
+        .forEach(
+            i -> {
+              executors.submit(
+                  () -> {
+                    try {
+                      Projector evaluator = Projector.make(s, exprs);
+                      int numRows = 2;
+                      byte[] validity = new byte[] {(byte) 255};
+                      int[] aValues = new int[] {2, 2};
+                      int[] bValues;
+                      if (i % 2 == 0) {
+                        errorCountExp.incrementAndGet();
+                        bValues = new int[] {1, 0};
+                      } else {
+                        bValues = new int[] {1, 1};
+                      }
+
+                      ArrowBuf validitya = buf(validity);
+                      ArrowBuf valuesa = intBuf(aValues);
+                      ArrowBuf validityb = buf(validity);
+                      ArrowBuf valuesb = intBuf(bValues);
+                      ArrowRecordBatch batch =
+                          new ArrowRecordBatch(
+                              numRows,
+                              Lists.newArrayList(
+                                  new ArrowFieldNode(numRows, 0), new ArrowFieldNode(numRows, 0)),
+                              Lists.newArrayList(validitya, valuesa, validityb, valuesb));
+
+                      IntVector intVector = new IntVector(EMPTY_SCHEMA_PATH, allocator);
+                      intVector.allocateNew(numRows);
+
+                      List<ValueVector> output = new ArrayList<ValueVector>();
+                      output.add(intVector);
+                      try {
+                        evaluator.evaluate(batch, output);
+                      } catch (GandivaException e) {
+                        errorCount.incrementAndGet();
+                      }
+                      // free buffers
+                      releaseRecordBatch(batch);
+                      releaseValueVectors(output);
+                      evaluator.close();
+                    } catch (GandivaException ignore) {
+                    }
+                  });
+            });
     executors.shutdown();
     executors.awaitTermination(100, java.util.concurrent.TimeUnit.SECONDS);
     test.close();
-    Assert.assertEquals(errorCountExp.intValue(), errorCount.intValue());
+    assertEquals(errorCountExp.intValue(), errorCount.intValue());
   }
 
   @Test
@@ -429,13 +430,13 @@ public void testAdd3() throws GandivaException, Exception {
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 16;
-    byte[] validity = new byte[]{(byte) 255, 0};
+    byte[] validity = new byte[] {(byte) 255, 0};
     // second half is "undefined"
-    int[] xValues = new int[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-    int[] n2xValues = new int[]{16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
-    int[] n3xValues = new int[]{1, 2, 3, 4, 4, 3, 2, 1, 5, 6, 7, 8, 8, 7, 6, 5};
+    int[] xValues = new int[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
+    int[] n2xValues = new int[] {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
+    int[] n3xValues = new int[] {1, 2, 3, 4, 4, 3, 2, 1, 5, 6, 7, 8, 8, 7, 6, 5};
 
-    int[] expected = new int[]{18, 19, 20, 21, 21, 20, 19, 18, 18, 19, 20, 21, 21, 20, 19, 18};
+    int[] expected = new int[] {18, 19, 20, 21, 21, 20, 19, 18, 18, 19, 20, 21, 21, 20, 19, 18};
 
     ArrowBuf xValidity = buf(validity);
     ArrowBuf xData = intBuf(xValues);
@@ -506,12 +507,12 @@ public void testStringFields() throws GandivaException {
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 5;
-    byte[] validity = new byte[]{(byte) 255, 0};
+    byte[] validity = new byte[] {(byte) 255, 0};
     // "A função" means "The function" in portugese
-    String[] valuesX = new String[]{"hell", "abc", "hellox", "ijk", "A função"};
-    int[] valuesA = new int[]{10, 20, 30, 40, 50};
-    int[] valuesB = new int[]{110, 120, 130, 140, 150};
-    int[] expected = new int[]{14, 23, 136, 143, 60};
+    String[] valuesX = new String[] {"hell", "abc", "hellox", "ijk", "A função"};
+    int[] valuesA = new int[] {10, 20, 30, 40, 50};
+    int[] valuesB = new int[] {110, 120, 130, 140, 150};
+    int[] expected = new int[] {14, 23, 136, 143, 60};
 
     ArrowBuf validityX = buf(validity);
     List<ArrowBuf> dataBufsX = stringBufs(valuesX);
@@ -554,17 +555,15 @@ public void testStringOutput() throws GandivaException {
 
     ArrowType retType = new ArrowType.Utf8();
 
-    TreeNode ifHiBye = TreeBuilder.makeIf(
-        TreeBuilder.makeFunction(
-            "greater_than_or_equal_to",
-            Lists.newArrayList(
-                TreeBuilder.makeField(x),
-                TreeBuilder.makeLiteral(0)
-            ),
-            boolType),
-        TreeBuilder.makeStringLiteral("hi"),
-        TreeBuilder.makeStringLiteral("bye"),
-        retType);
+    TreeNode ifHiBye =
+        TreeBuilder.makeIf(
+            TreeBuilder.makeFunction(
+                "greater_than_or_equal_to",
+                Lists.newArrayList(TreeBuilder.makeField(x), TreeBuilder.makeLiteral(0)),
+                boolType),
+            TreeBuilder.makeStringLiteral("hi"),
+            TreeBuilder.makeStringLiteral("bye"),
+            retType);
 
     ExpressionTree expr = TreeBuilder.makeExpression(ifHiBye, Field.nullable("res", retType));
     Schema schema = new Schema(Lists.newArrayList(x));
@@ -572,22 +571,21 @@ public void testStringOutput() throws GandivaException {
 
     // fill up input record batch
     int numRows = 4;
-    byte[] validity = new byte[]{(byte) 255, 0};
-    int[] xValues = new int[]{10, -10, 20, -20};
-    String[] expected = new String[]{"hi", "bye", "hi", "bye"};
+    byte[] validity = new byte[] {(byte) 255, 0};
+    int[] xValues = new int[] {10, -10, 20, -20};
+    String[] expected = new String[] {"hi", "bye", "hi", "bye"};
     ArrowBuf validityX = buf(validity);
     ArrowBuf dataX = intBuf(xValues);
     ArrowRecordBatch batch =
         new ArrowRecordBatch(
             numRows,
             Lists.newArrayList(new ArrowFieldNode(numRows, 0)),
-            Lists.newArrayList( validityX, dataX));
+            Lists.newArrayList(validityX, dataX));
 
     // allocate data for output vector.
     VarCharVector outVector = new VarCharVector(EMPTY_SCHEMA_PATH, allocator);
     outVector.allocateNew(64, numRows);
 
-
     // evaluate expression
     List<ValueVector> output = new ArrayList<>();
     output.add(outVector);
@@ -628,9 +626,9 @@ public void testRegex() throws GandivaException {
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 5;
-    byte[] validity = new byte[]{(byte) 255, 0};
-    String[] valuesX = new String[]{"mapD", "maps", "google maps", "map", "MapR"};
-    boolean[] expected = new boolean[]{true, true, true, true, false};
+    byte[] validity = new byte[] {(byte) 255, 0};
+    String[] valuesX = new String[] {"mapD", "maps", "google maps", "map", "MapR"};
+    boolean[] expected = new boolean[] {true, true, true, true, false};
 
     ArrowBuf validityX = buf(validity);
     List<ArrowBuf> dataBufsX = stringBufs(valuesX);
@@ -667,20 +665,22 @@ public void testRegexpReplace() throws GandivaException {
     Field retType = Field.nullable("c", new ArrowType.Utf8());
 
     TreeNode cond =
-            TreeBuilder.makeFunction(
-                    "regexp_replace",
-                    Lists.newArrayList(TreeBuilder.makeField(x), TreeBuilder.makeStringLiteral("ana"),
-                            TreeBuilder.makeField(replaceString)),
-                    new ArrowType.Utf8());
+        TreeBuilder.makeFunction(
+            "regexp_replace",
+            Lists.newArrayList(
+                TreeBuilder.makeField(x),
+                TreeBuilder.makeStringLiteral("ana"),
+                TreeBuilder.makeField(replaceString)),
+            new ArrowType.Utf8());
     ExpressionTree expr = TreeBuilder.makeExpression(cond, retType);
     Schema schema = new Schema(Lists.newArrayList(x, replaceString));
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 5;
-    byte[] validity = new byte[]{(byte) 15, 0};
-    String[] valuesX = new String[]{"banana", "bananaana", "bananana", "anaana", "anaana"};
-    String[] valuesReplace = new String[]{"ue", "", "", "c", ""};
-    String[] expected = new String[]{"buena", "bna", "bn", "cc", null};
+    byte[] validity = new byte[] {(byte) 15, 0};
+    String[] valuesX = new String[] {"banana", "bananaana", "bananana", "anaana", "anaana"};
+    String[] valuesReplace = new String[] {"ue", "", "", "c", ""};
+    String[] expected = new String[] {"buena", "bna", "bn", "cc", null};
 
     ArrowBuf validityX = buf(validity);
     ArrowBuf validityReplace = buf(validity);
@@ -690,11 +690,16 @@ public void testRegexpReplace() throws GandivaException {
     ArrowFieldNode fieldNode = new ArrowFieldNode(numRows, 0);
 
     ArrowRecordBatch batch =
-            new ArrowRecordBatch(
-                    numRows,
-                    Lists.newArrayList(fieldNode, fieldNode),
-                    Lists.newArrayList(validityX, dataBufsX.get(0), dataBufsX.get(1), validityReplace,
-                            dataBufsReplace.get(0), dataBufsReplace.get(1)));
+        new ArrowRecordBatch(
+            numRows,
+            Lists.newArrayList(fieldNode, fieldNode),
+            Lists.newArrayList(
+                validityX,
+                dataBufsX.get(0),
+                dataBufsX.get(1),
+                validityReplace,
+                dataBufsReplace.get(0),
+                dataBufsReplace.get(1)));
 
     // allocate data for output vector.
     VarCharVector outVector = new VarCharVector(EMPTY_SCHEMA_PATH, allocator);
@@ -708,11 +713,11 @@ public void testRegexpReplace() throws GandivaException {
 
     // match expected output.
     for (int i = 0; i < numRows - 1; i++) {
-      assertFalse("Expect none value equals null", outVector.isNull(i));
+      assertFalse(outVector.isNull(i), "Expect none value equals null");
       assertEquals(expected[i], new String(outVector.get(i)));
     }
 
-    assertTrue("Last value must be null", outVector.isNull(numRows - 1));
+    assertTrue(outVector.isNull(numRows - 1), "Last value must be null");
 
     releaseRecordBatch(batch);
     releaseValueVectors(output);
@@ -726,23 +731,21 @@ public void testCastIntervalDay() throws GandivaException {
     Field retType = Field.nullable("c", new ArrowType.Interval(IntervalUnit.DAY_TIME));
 
     TreeNode cond =
-            TreeBuilder.makeFunction(
-                    "castintervalday",
-                    Lists.newArrayList(TreeBuilder.makeField(x)),
-                    new ArrowType.Interval(IntervalUnit.DAY_TIME));
+        TreeBuilder.makeFunction(
+            "castintervalday",
+            Lists.newArrayList(TreeBuilder.makeField(x)),
+            new ArrowType.Interval(IntervalUnit.DAY_TIME));
     ExpressionTree expr = TreeBuilder.makeExpression(cond, retType);
     Schema schema = new Schema(Lists.newArrayList(x));
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 4;
-    byte[] validity = new byte[]{(byte) 7, 0};
-    String[] valuesX = new String[]{"1742461111", "P1Y1M1DT1H1M1S", "PT48H1M1S", "test"};
+    byte[] validity = new byte[] {(byte) 7, 0};
+    String[] valuesX = new String[] {"1742461111", "P1Y1M1DT1H1M1S", "PT48H1M1S", "test"};
     int[][] expected =
-            new int[][]{ // day and millis
-                {20, 14461111},
-                {1, 3661000},
-                {2, 61000},
-                null};
+        new int[][] { // day and millis
+          {20, 14461111}, {1, 3661000}, {2, 61000}, null
+        };
 
     ArrowBuf validityX = buf(validity);
     List<ArrowBuf> dataBufsX = stringBufs(valuesX);
@@ -750,10 +753,10 @@ public void testCastIntervalDay() throws GandivaException {
     ArrowFieldNode fieldNode = new ArrowFieldNode(numRows, 0);
 
     ArrowRecordBatch batch =
-            new ArrowRecordBatch(
-                    numRows,
-                    Lists.newArrayList(fieldNode, fieldNode),
-                    Lists.newArrayList(validityX, dataBufsX.get(0), dataBufsX.get(1)));
+        new ArrowRecordBatch(
+            numRows,
+            Lists.newArrayList(fieldNode, fieldNode),
+            Lists.newArrayList(validityX, dataBufsX.get(0), dataBufsX.get(1)));
 
     // allocate data for output vector.
     IntervalDayVector outVector = new IntervalDayVector(EMPTY_SCHEMA_PATH, allocator);
@@ -768,14 +771,14 @@ public void testCastIntervalDay() throws GandivaException {
     // match expected output.
     NullableIntervalDayHolder holder = new NullableIntervalDayHolder();
     for (int i = 0; i < numRows - 1; i++) {
-      assertFalse("Expect none value equals null", outVector.isNull(i));
+      assertFalse(outVector.isNull(i), "Expect none value equals null");
       outVector.get(i, holder);
 
       assertEquals(expected[i][0], holder.days);
       assertEquals(expected[i][1], holder.milliseconds);
     }
 
-    assertTrue("Last value must be null", outVector.isNull(numRows - 1));
+    assertTrue(outVector.isNull(numRows - 1), "Last value must be null");
 
     releaseRecordBatch(batch);
     releaseValueVectors(output);
@@ -789,23 +792,21 @@ public void testCastIntervalYear() throws GandivaException {
     Field retType = Field.nullable("c", new ArrowType.Interval(IntervalUnit.YEAR_MONTH));
 
     TreeNode cond =
-            TreeBuilder.makeFunction(
-                    "castintervalyear",
-                    Lists.newArrayList(TreeBuilder.makeField(x)),
-                    new ArrowType.Interval(IntervalUnit.YEAR_MONTH));
+        TreeBuilder.makeFunction(
+            "castintervalyear",
+            Lists.newArrayList(TreeBuilder.makeField(x)),
+            new ArrowType.Interval(IntervalUnit.YEAR_MONTH));
     ExpressionTree expr = TreeBuilder.makeExpression(cond, retType);
     Schema schema = new Schema(Lists.newArrayList(x));
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 4;
-    byte[] validity = new byte[]{(byte) 7, 0};
-    String[] valuesX = new String[]{"65851111", "P1Y1M1DT1H1M1S", "P1Y", "test"};
+    byte[] validity = new byte[] {(byte) 7, 0};
+    String[] valuesX = new String[] {"65851111", "P1Y1M1DT1H1M1S", "P1Y", "test"};
     int[][] expected =
-            new int[][]{ // year and month
-                {0, 65851111},
-                {1, 1},
-                {1, 0},
-                null};
+        new int[][] { // year and month
+          {0, 65851111}, {1, 1}, {1, 0}, null
+        };
 
     ArrowBuf validityX = buf(validity);
     List<ArrowBuf> dataBufsX = stringBufs(valuesX);
@@ -813,10 +814,10 @@ public void testCastIntervalYear() throws GandivaException {
     ArrowFieldNode fieldNode = new ArrowFieldNode(numRows, 0);
 
     ArrowRecordBatch batch =
-            new ArrowRecordBatch(
-                    numRows,
-                    Lists.newArrayList(fieldNode, fieldNode),
-                    Lists.newArrayList(validityX, dataBufsX.get(0), dataBufsX.get(1)));
+        new ArrowRecordBatch(
+            numRows,
+            Lists.newArrayList(fieldNode, fieldNode),
+            Lists.newArrayList(validityX, dataBufsX.get(0), dataBufsX.get(1)));
 
     // allocate data for output vector.
     IntervalYearVector outVector = new IntervalYearVector(EMPTY_SCHEMA_PATH, allocator);
@@ -831,16 +832,18 @@ public void testCastIntervalYear() throws GandivaException {
     // match expected output.
     NullableIntervalYearHolder holder = new NullableIntervalYearHolder();
     for (int i = 0; i < numRows - 1; i++) {
-      assertFalse("Expect none value equals null", outVector.isNull(i));
+      assertFalse(outVector.isNull(i), "Expect none value equals null");
       outVector.get(i, holder);
 
-      int numberMonths = expected[i][0] * 12 + // number of years
+      int numberMonths =
+          expected[i][0] * 12
+              + // number of years
               expected[i][1]; // number of months
 
       assertEquals(numberMonths, holder.value);
     }
 
-    assertTrue("Last value must be null", outVector.isNull(numRows - 1));
+    assertTrue(outVector.isNull(numRows - 1), "Last value must be null");
 
     releaseRecordBatch(batch);
     releaseValueVectors(output);
@@ -850,16 +853,10 @@ public void testCastIntervalYear() throws GandivaException {
   public void testRand() throws GandivaException {
 
     TreeNode randWithSeed =
-        TreeBuilder.makeFunction(
-            "rand",
-            Lists.newArrayList(TreeBuilder.makeLiteral(12)),
-            float64);
-    TreeNode rand =
-        TreeBuilder.makeFunction(
-            "rand",
-            Lists.newArrayList(),
-            float64);
-    ExpressionTree exprWithSeed = TreeBuilder.makeExpression(randWithSeed, Field.nullable("res", float64));
+        TreeBuilder.makeFunction("rand", Lists.newArrayList(TreeBuilder.makeLiteral(12)), float64);
+    TreeNode rand = TreeBuilder.makeFunction("rand", Lists.newArrayList(), float64);
+    ExpressionTree exprWithSeed =
+        TreeBuilder.makeExpression(randWithSeed, Field.nullable("res", float64));
     ExpressionTree expr = TreeBuilder.makeExpression(rand, Field.nullable("res2", float64));
     Field x = Field.nullable("x", new ArrowType.Utf8());
     Schema schema = new Schema(Lists.newArrayList(x));
@@ -869,8 +866,14 @@ public void testRand() throws GandivaException {
     int numRows = 5;
     byte[] validity = new byte[] {(byte) 255, 0};
     String[] valuesX = new String[] {"mapD", "maps", "google maps", "map", "MapR"};
-    double[] expected = new double[] {0.1597116001879662D, 0.7347813877263527D, 0.6069965050584282D,
-        0.7240285696335824D, 0.09975540272957834D};
+    double[] expected =
+        new double[] {
+          0.1597116001879662D,
+          0.7347813877263527D,
+          0.6069965050584282D,
+          0.7240285696335824D,
+          0.09975540272957834D
+        };
 
     ArrowBuf validityX = buf(validity);
     List<ArrowBuf> dataBufsX = stringBufs(valuesX);
@@ -915,10 +918,10 @@ public void testBinaryFields() throws GandivaException {
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 5;
-    byte[] validity = new byte[]{(byte) 255, 0};
-    String[] valuesA = new String[]{"a", "aa", "aaa", "aaaa", "A função"};
-    String[] valuesB = new String[]{"a", "bb", "aaa", "bbbbb", "A função"};
-    boolean[] expected = new boolean[]{true, false, true, false, true};
+    byte[] validity = new byte[] {(byte) 255, 0};
+    String[] valuesA = new String[] {"a", "aa", "aaa", "aaaa", "A função"};
+    String[] valuesB = new String[] {"a", "bb", "aaa", "bbbbb", "A função"};
+    boolean[] expected = new boolean[] {true, false, true, false, true};
 
     ArrowBuf validitya = buf(validity);
     ArrowBuf validityb = buf(validity);
@@ -1014,9 +1017,9 @@ public void testIf() throws GandivaException, Exception {
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 16;
-    byte[] validity = new byte[]{(byte) 255, (byte) 255};
-    long[] xValues = new long[]{9, 15, 21, 32, 43, 54, 65, 76, 87, 98, 109, 200, -10, 60, 77, 80};
-    long[] expected = new long[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 0, 6, 7, 8};
+    byte[] validity = new byte[] {(byte) 255, (byte) 255};
+    long[] xValues = new long[] {9, 15, 21, 32, 43, 54, 65, 76, 87, 98, 109, 200, -10, 60, 77, 80};
+    long[] expected = new long[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 0, 6, 7, 8};
 
     ArrowBuf bufValidity = buf(validity);
     ArrowBuf xData = longBuf(xValues);
@@ -1063,9 +1066,9 @@ public void testAnd() throws GandivaException, Exception {
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 4;
-    byte[] validity = new byte[]{(byte) 255};
-    long[] xValues = new long[]{9, 15, 17, 25};
-    boolean[] expected = new boolean[]{false, true, true, false};
+    byte[] validity = new byte[] {(byte) 255};
+    long[] xValues = new long[] {9, 15, 17, 25};
+    boolean[] expected = new boolean[] {false, true, true, false};
 
     ArrowBuf bufValidity = buf(validity);
     ArrowBuf xData = longBuf(xValues);
@@ -1112,9 +1115,9 @@ public void testOr() throws GandivaException, Exception {
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 4;
-    byte[] validity = new byte[]{(byte) 255};
-    long[] xValues = new long[]{4, 9, 15, 17};
-    boolean[] expected = new boolean[]{true, false, true, true};
+    byte[] validity = new byte[] {(byte) 255};
+    long[] xValues = new long[] {4, 9, 15, 17};
+    boolean[] expected = new boolean[] {true, false, true, true};
 
     ArrowBuf bufValidity = buf(validity);
     ArrowBuf xData = longBuf(xValues);
@@ -1160,9 +1163,9 @@ public void testNull() throws GandivaException, Exception {
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 2;
-    byte[] validity = new byte[]{(byte) 255};
-    long[] xValues = new long[]{5, 32};
-    long[] expected = new long[]{1, 0};
+    byte[] validity = new byte[] {(byte) 255};
+    long[] xValues = new long[] {5, 32};
+    long[] expected = new long[] {1, 0};
 
     ArrowBuf bufValidity = buf(validity);
     ArrowBuf xData = longBuf(xValues);
@@ -1204,8 +1207,8 @@ public void testTimeNull() throws GandivaException, Exception {
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 2;
-    byte[] validity = new byte[]{(byte) 255};
-    int[] xValues = new int[]{5, 32};
+    byte[] validity = new byte[] {(byte) 255};
+    int[] xValues = new int[] {5, 32};
 
     ArrowBuf bufValidity = buf(validity);
     ArrowBuf xData = intBuf(xValues);
@@ -1231,10 +1234,11 @@ public void testTimeNull() throws GandivaException, Exception {
   }
 
   @Test
-  public void testTimeEquals() throws GandivaException, Exception { /*
-   * when isnotnull(x) then x
-   * else y
-   */
+  public void testTimeEquals() throws GandivaException, Exception {
+    /*
+     * when isnotnull(x) then x
+     * else y
+     */
     Field x = Field.nullable("x", new ArrowType.Time(TimeUnit.MILLISECOND, 32));
     TreeNode xNode = TreeBuilder.makeField(x);
 
@@ -1242,24 +1246,20 @@ public void testTimeEquals() throws GandivaException, Exception { /*
     TreeNode yNode = TreeBuilder.makeField(y);
 
     // if isnotnull(x) then x else y
-    TreeNode condition = TreeBuilder.makeFunction("isnotnull", Lists.newArrayList(xNode),
-        boolType);
-    TreeNode ifCoalesce = TreeBuilder.makeIf(
-        condition,
-        xNode,
-        yNode,
-        new ArrowType.Time(TimeUnit.MILLISECOND, 32));
+    TreeNode condition = TreeBuilder.makeFunction("isnotnull", Lists.newArrayList(xNode), boolType);
+    TreeNode ifCoalesce =
+        TreeBuilder.makeIf(condition, xNode, yNode, new ArrowType.Time(TimeUnit.MILLISECOND, 32));
 
     ExpressionTree expr = TreeBuilder.makeExpression(ifCoalesce, x);
     Schema schema = new Schema(Lists.newArrayList(x, y));
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 2;
-    byte[] validity = new byte[]{(byte) 1};
-    byte[] yValidity = new byte[]{(byte) 3};
-    int[] xValues = new int[]{5, 1};
-    int[] yValues = new int[]{10, 2};
-    int[] expected = new int[]{5, 2};
+    byte[] validity = new byte[] {(byte) 1};
+    byte[] yValidity = new byte[] {(byte) 3};
+    int[] xValues = new int[] {5, 1};
+    int[] yValues = new int[] {10, 2};
+    int[] expected = new int[] {5, 2};
 
     ArrowBuf bufValidity = buf(validity);
     ArrowBuf xData = intBuf(xValues);
@@ -1268,10 +1268,11 @@ public void testTimeEquals() throws GandivaException, Exception { /*
     ArrowBuf yData = intBuf(yValues);
 
     ArrowFieldNode fieldNode = new ArrowFieldNode(numRows, 0);
-    ArrowRecordBatch batch = new ArrowRecordBatch(
-        numRows,
-        Lists.newArrayList(fieldNode),
-        Lists.newArrayList(bufValidity, xData, yBufValidity, yData));
+    ArrowRecordBatch batch =
+        new ArrowRecordBatch(
+            numRows,
+            Lists.newArrayList(fieldNode),
+            Lists.newArrayList(bufValidity, xData, yBufValidity, yData));
 
     IntVector intVector = new IntVector(EMPTY_SCHEMA_PATH, allocator);
     intVector.allocateNew(numRows);
@@ -1301,10 +1302,10 @@ public void testIsNull() throws GandivaException, Exception {
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 16;
-    byte[] validity = new byte[]{(byte) 255, 0};
+    byte[] validity = new byte[] {(byte) 255, 0};
     double[] xValues =
-        new double[]{
-            1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0
+        new double[] {
+          1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0
         };
 
     ArrowBuf bufValidity = buf(validity);
@@ -1348,9 +1349,9 @@ public void testEquals() throws GandivaException, Exception {
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 16;
-    byte[] validity = new byte[]{(byte) 255, 0};
-    int[] c1Values = new int[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-    int[] c2Values = new int[]{1, 2, 3, 4, 8, 7, 6, 5, 16, 15, 14, 13, 12, 11, 10, 9};
+    byte[] validity = new byte[] {(byte) 255, 0};
+    int[] c1Values = new int[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
+    int[] c2Values = new int[] {1, 2, 3, 4, 8, 7, 6, 5, 16, 15, 14, 13, 12, 11, 10, 9};
 
     ArrowBuf c1Validity = buf(validity);
     ArrowBuf c1Data = intBuf(c1Values);
@@ -1391,14 +1392,15 @@ public void testInExpr() throws GandivaException, Exception {
     Field c1 = Field.nullable("c1", int32);
 
     TreeNode inExpr =
-        TreeBuilder.makeInExpressionInt32(TreeBuilder.makeField(c1), Sets.newHashSet(1, 2, 3, 4, 5, 15, 16));
+        TreeBuilder.makeInExpressionInt32(
+            TreeBuilder.makeField(c1), Sets.newHashSet(1, 2, 3, 4, 5, 15, 16));
     ExpressionTree expr = TreeBuilder.makeExpression(inExpr, Field.nullable("result", boolType));
     Schema schema = new Schema(Lists.newArrayList(c1));
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 16;
-    byte[] validity = new byte[]{(byte) 255, 0};
-    int[] c1Values = new int[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
+    byte[] validity = new byte[] {(byte) 255, 0};
+    int[] c1Values = new int[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
 
     ArrowBuf c1Validity = buf(validity);
     ArrowBuf c1Data = intBuf(c1Values);
@@ -1437,25 +1439,39 @@ public void testInExprDecimal() throws GandivaException, Exception {
     ArrowType.Decimal decimal = new ArrowType.Decimal(precision, scale, 128);
     Field c1 = Field.nullable("c1", decimal);
 
-    String[] values = new String[]{"1", "2", "3", "4"};
+    String[] values = new String[] {"1", "2", "3", "4"};
     Set<BigDecimal> decimalSet = decimalSet(values, scale);
     decimalSet.add(new BigDecimal(-0.0));
     decimalSet.add(new BigDecimal(Long.MAX_VALUE));
     decimalSet.add(new BigDecimal(Long.MIN_VALUE));
     TreeNode inExpr =
-        TreeBuilder.makeInExpressionDecimal(TreeBuilder.makeField(c1),
-            decimalSet, precision, scale);
-    ExpressionTree expr = TreeBuilder.makeExpression(inExpr,
-        Field.nullable("result", boolType));
+        TreeBuilder.makeInExpressionDecimal(
+            TreeBuilder.makeField(c1), decimalSet, precision, scale);
+    ExpressionTree expr = TreeBuilder.makeExpression(inExpr, Field.nullable("result", boolType));
     Schema schema = new Schema(Lists.newArrayList(c1));
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 16;
-    byte[] validity = new byte[]{(byte) 255, 0};
+    byte[] validity = new byte[] {(byte) 255, 0};
     String[] c1Values =
-        new String[]{"1", "2", "3", "4", "-0.0", "6", "7", "8", "9", "10", "11", "12", "13", "14",
-            String.valueOf(Long.MAX_VALUE),
-            String.valueOf(Long.MIN_VALUE)};
+        new String[] {
+          "1",
+          "2",
+          "3",
+          "4",
+          "-0.0",
+          "6",
+          "7",
+          "8",
+          "9",
+          "10",
+          "11",
+          "12",
+          "13",
+          "14",
+          String.valueOf(Long.MAX_VALUE),
+          String.valueOf(Long.MIN_VALUE)
+        };
 
     DecimalVector c1Data = decimalVector(c1Values, precision, scale);
     ArrowBuf c1Validity = buf(validity);
@@ -1491,9 +1507,16 @@ public void testInExprDouble() throws GandivaException, Exception {
     Field c1 = Field.nullable("c1", float64);
 
     TreeNode inExpr =
-        TreeBuilder.makeInExpressionDouble(TreeBuilder.makeField(c1),
-            Sets.newHashSet(1.0, -0.0, 3.0, 4.0, Double.NaN,
-                Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY));
+        TreeBuilder.makeInExpressionDouble(
+            TreeBuilder.makeField(c1),
+            Sets.newHashSet(
+                1.0,
+                -0.0,
+                3.0,
+                4.0,
+                Double.NaN,
+                Double.POSITIVE_INFINITY,
+                Double.NEGATIVE_INFINITY));
     ExpressionTree expr = TreeBuilder.makeExpression(inExpr, Field.nullable("result", boolType));
     Schema schema = new Schema(Lists.newArrayList(c1));
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
@@ -1501,9 +1524,26 @@ public void testInExprDouble() throws GandivaException, Exception {
     // Create a row-batch with some sample data to look for
     int numRows = 16;
     // Only the first 8 values will be valid.
-    byte[] validity = new byte[]{(byte) 255, 0};
-    double[] c1Values = new double[]{1, -0.0, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, Double.NaN,
-        6, 7, 8, 9, 10, 11, 12, 13, 14, 4, 3};
+    byte[] validity = new byte[] {(byte) 255, 0};
+    double[] c1Values =
+        new double[] {
+          1,
+          -0.0,
+          Double.NEGATIVE_INFINITY,
+          Double.POSITIVE_INFINITY,
+          Double.NaN,
+          6,
+          7,
+          8,
+          9,
+          10,
+          11,
+          12,
+          13,
+          14,
+          4,
+          3
+        };
 
     ArrowBuf c1Validity = buf(validity);
     ArrowBuf c1Data = doubleBuf(c1Values);
@@ -1551,10 +1591,26 @@ public void testInExprStrings() throws GandivaException, Exception {
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 16;
-    byte[] validity = new byte[]{(byte) 255, 0};
-    String[] c1Values = new String[]{"one", "two", "three", "four", "five", "six", "seven",
-        "eight", "nine", "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen",
-        "sixteen"};
+    byte[] validity = new byte[] {(byte) 255, 0};
+    String[] c1Values =
+        new String[] {
+          "one",
+          "two",
+          "three",
+          "four",
+          "five",
+          "six",
+          "seven",
+          "eight",
+          "nine",
+          "ten",
+          "eleven",
+          "twelve",
+          "thirteen",
+          "fourteen",
+          "fifteen",
+          "sixteen"
+        };
 
     ArrowBuf c1Validity = buf(validity);
     List<ArrowBuf> dataBufsX = stringBufs(c1Values);
@@ -1601,10 +1657,10 @@ public void testSmallOutputVectors() throws GandivaException, Exception {
     Projector eval = Projector.make(schema, exprs);
 
     int numRows = 16;
-    byte[] validity = new byte[]{(byte) 255, 0};
+    byte[] validity = new byte[] {(byte) 255, 0};
     // second half is "undefined"
-    int[] aValues = new int[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-    int[] bValues = new int[]{16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
+    int[] aValues = new int[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
+    int[] bValues = new int[] {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
 
     ArrowBuf aValidity = buf(validity);
     ArrowBuf aData = intBuf(aValues);
@@ -1686,27 +1742,27 @@ public void testDateTime() throws GandivaException, Exception {
     Projector eval = Projector.make(schema, exprs);
 
     int numRows = 8;
-    byte[] validity = new byte[]{(byte) 255};
+    byte[] validity = new byte[] {(byte) 255};
     String[] values =
-        new String[]{
-            "2007-01-01T01:00:00.00Z",
-            "2007-03-05T03:40:00.00Z",
-            "2008-05-31T13:55:00.00Z",
-            "2000-06-30T23:20:00.00Z",
-            "2000-07-10T20:30:00.00Z",
-            "2000-08-20T00:14:00.00Z",
-            "2000-09-30T02:29:00.00Z",
-            "2000-10-31T05:33:00.00Z"
+        new String[] {
+          "2007-01-01T01:00:00.00Z",
+          "2007-03-05T03:40:00.00Z",
+          "2008-05-31T13:55:00.00Z",
+          "2000-06-30T23:20:00.00Z",
+          "2000-07-10T20:30:00.00Z",
+          "2000-08-20T00:14:00.00Z",
+          "2000-09-30T02:29:00.00Z",
+          "2000-10-31T05:33:00.00Z"
         };
-    long[] expYearFromDate = new long[]{2007, 2007, 2008, 2000, 2000, 2000, 2000, 2000};
-    long[] expMonthFromDate = new long[]{1, 3, 5, 6, 7, 8, 9, 10};
-    long[] expDayFromDate = new long[]{1, 5, 31, 30, 10, 20, 30, 31};
-    long[] expHourFromDate = new long[]{1, 3, 13, 23, 20, 0, 2, 5};
-    long[] expMinFromDate = new long[]{0, 40, 55, 20, 30, 14, 29, 33};
+    long[] expYearFromDate = new long[] {2007, 2007, 2008, 2000, 2000, 2000, 2000, 2000};
+    long[] expMonthFromDate = new long[] {1, 3, 5, 6, 7, 8, 9, 10};
+    long[] expDayFromDate = new long[] {1, 5, 31, 30, 10, 20, 30, 31};
+    long[] expHourFromDate = new long[] {1, 3, 13, 23, 20, 0, 2, 5};
+    long[] expMinFromDate = new long[] {0, 40, 55, 20, 30, 14, 29, 33};
 
     long[][] expValues =
-        new long[][]{
-            expYearFromDate, expMonthFromDate, expDayFromDate, expHourFromDate, expMinFromDate
+        new long[][] {
+          expYearFromDate, expMonthFromDate, expDayFromDate, expHourFromDate, expMinFromDate
         };
 
     ArrowBuf bufValidity = buf(validity);
@@ -1765,27 +1821,30 @@ public void testDateTrunc() throws Exception {
     Projector eval = Projector.make(schema, exprs);
 
     int numRows = 4;
-    byte[] validity = new byte[]{(byte) 255};
-    String[] values = new String[]{
-        "2007-01-01T01:00:00.00Z",
-        "2007-03-05T03:40:00.00Z",
-        "2008-05-31T13:55:00.00Z",
-        "2000-06-30T23:20:00.00Z",
-    };
-    String[] expYearFromDate = new String[]{
-        "2007-01-01T00:00:00.00Z",
-        "2007-01-01T00:00:00.00Z",
-        "2008-01-01T00:00:00.00Z",
-        "2000-01-01T00:00:00.00Z",
-    };
-    String[] expMonthFromDate = new String[]{
-        "2007-01-01T00:00:00.00Z",
-        "2007-03-01T00:00:00.00Z",
-        "2008-05-01T00:00:00.00Z",
-        "2000-06-01T00:00:00.00Z",
-    };
-
-    String[][] expValues = new String[][]{ expYearFromDate, expMonthFromDate};
+    byte[] validity = new byte[] {(byte) 255};
+    String[] values =
+        new String[] {
+          "2007-01-01T01:00:00.00Z",
+          "2007-03-05T03:40:00.00Z",
+          "2008-05-31T13:55:00.00Z",
+          "2000-06-30T23:20:00.00Z",
+        };
+    String[] expYearFromDate =
+        new String[] {
+          "2007-01-01T00:00:00.00Z",
+          "2007-01-01T00:00:00.00Z",
+          "2008-01-01T00:00:00.00Z",
+          "2000-01-01T00:00:00.00Z",
+        };
+    String[] expMonthFromDate =
+        new String[] {
+          "2007-01-01T00:00:00.00Z",
+          "2007-03-01T00:00:00.00Z",
+          "2008-05-01T00:00:00.00Z",
+          "2000-06-01T00:00:00.00Z",
+        };
+
+    String[][] expValues = new String[][] {expYearFromDate, expMonthFromDate};
 
     ArrowBuf bufValidity = buf(validity);
     ArrowBuf millisData = stringToMillis(values);
@@ -1793,9 +1852,7 @@ public void testDateTrunc() throws Exception {
     ArrowFieldNode fieldNode = new ArrowFieldNode(numRows, 0);
     ArrowRecordBatch batch =
         new ArrowRecordBatch(
-            numRows,
-            Lists.newArrayList(fieldNode),
-            Lists.newArrayList(bufValidity, millisData));
+            numRows, Lists.newArrayList(fieldNode), Lists.newArrayList(bufValidity, millisData));
 
     List<ValueVector> output = new ArrayList<ValueVector>();
     for (int i = 0; i < exprs.size(); i++) {
@@ -1852,13 +1909,13 @@ public void testCastTimestampToString() throws Exception {
     TreeNode tsNode = TreeBuilder.makeField(tsField);
     TreeNode lenNode = TreeBuilder.makeField(lenField);
 
-    TreeNode tsToString = TreeBuilder.makeFunction("castVARCHAR", Lists.newArrayList(tsNode, lenNode),
-        new ArrowType.Utf8());
+    TreeNode tsToString =
+        TreeBuilder.makeFunction(
+            "castVARCHAR", Lists.newArrayList(tsNode, lenNode), new ArrowType.Utf8());
 
     Field resultField = Field.nullable("result", new ArrowType.Utf8());
     List<ExpressionTree> exprs =
-        Lists.newArrayList(
-            TreeBuilder.makeExpression(tsToString, resultField));
+        Lists.newArrayList(TreeBuilder.makeExpression(tsToString, resultField));
 
     Schema schema = new Schema(Lists.newArrayList(tsField, lenField));
     Projector eval = Projector.make(schema, exprs);
@@ -1867,24 +1924,21 @@ public void testCastTimestampToString() throws Exception {
     byte[] validity = new byte[] {(byte) 255};
     String[] values =
         new String[] {
-            "0007-01-01T01:00:00Z",
-            "2007-03-05T03:40:00Z",
-            "2008-05-31T13:55:00Z",
-            "2000-06-30T23:20:00Z",
-            "2000-07-10T20:30:00Z",
-        };
-    long[] lenValues =
-        new long[] {
-            23L, 24L, 22L, 0L, 4L
+          "0007-01-01T01:00:00Z",
+          "2007-03-05T03:40:00Z",
+          "2008-05-31T13:55:00Z",
+          "2000-06-30T23:20:00Z",
+          "2000-07-10T20:30:00Z",
         };
+    long[] lenValues = new long[] {23L, 24L, 22L, 0L, 4L};
 
     String[] expValues =
         new String[] {
-            "0007-01-01 01:00:00.000",
-            "2007-03-05 03:40:00.000",
-            "2008-05-31 13:55:00.00",
-            "",
-            "2000",
+          "0007-01-01 01:00:00.000",
+          "2007-03-05 03:40:00.000",
+          "2008-05-31 13:55:00.00",
+          "",
+          "2000",
         };
 
     ArrowBuf bufValidity = buf(validity);
@@ -1930,34 +1984,34 @@ public void testCastDayIntervalToBigInt() throws Exception {
 
     TreeNode intervalNode = TreeBuilder.makeField(dayIntervalField);
 
-    TreeNode intervalToBigint = TreeBuilder.makeFunction("castBIGINT", Lists.newArrayList(intervalNode), int64);
+    TreeNode intervalToBigint =
+        TreeBuilder.makeFunction("castBIGINT", Lists.newArrayList(intervalNode), int64);
 
     Field resultField = Field.nullable("result", int64);
     List<ExpressionTree> exprs =
-        Lists.newArrayList(
-            TreeBuilder.makeExpression(intervalToBigint, resultField));
+        Lists.newArrayList(TreeBuilder.makeExpression(intervalToBigint, resultField));
 
     Schema schema = new Schema(Lists.newArrayList(dayIntervalField));
     Projector eval = Projector.make(schema, exprs);
 
     int numRows = 5;
-    byte[] validity = new byte[]{(byte) 255};
+    byte[] validity = new byte[] {(byte) 255};
     String[] values =
-        new String[]{
-            "1 0", // "days millis"
-            "2 0",
-            "1 1",
-            "10 5000",
-            "11 86400001",
+        new String[] {
+          "1 0", // "days millis"
+          "2 0",
+          "1 1",
+          "10 5000",
+          "11 86400001",
         };
 
     Long[] expValues =
-        new Long[]{
-            86400000L,
-            2 * 86400000L,
-            86400000L + 1L,
-            10 * 86400000L + 5000L,
-            11 * 86400000L + 86400001L
+        new Long[] {
+          86400000L,
+          2 * 86400000L,
+          86400000L + 1L,
+          10 * 86400000L + 5000L,
+          11 * 86400000L + 86400001L
         };
 
     ArrowBuf bufValidity = buf(validity);
@@ -2000,8 +2054,7 @@ public void testCaseInsensitiveFunctions() throws Exception {
 
     TreeNode tsNode = TreeBuilder.makeField(tsField);
 
-    TreeNode extractday = TreeBuilder.makeFunction("extractday", Lists.newArrayList(tsNode),
-        int64);
+    TreeNode extractday = TreeBuilder.makeFunction("extractday", Lists.newArrayList(tsNode), int64);
 
     ExpressionTree expr = TreeBuilder.makeExpression(extractday, Field.nullable("result", int64));
     Schema schema = new Schema(Lists.newArrayList(tsField));
@@ -2011,28 +2064,22 @@ public void testCaseInsensitiveFunctions() throws Exception {
     byte[] validity = new byte[] {(byte) 255};
     String[] values =
         new String[] {
-            "0007-01-01T01:00:00Z",
-            "2007-03-05T03:40:00Z",
-            "2008-05-31T13:55:00Z",
-            "2000-06-30T23:20:00Z",
-            "2000-07-10T20:30:00Z",
+          "0007-01-01T01:00:00Z",
+          "2007-03-05T03:40:00Z",
+          "2008-05-31T13:55:00Z",
+          "2000-06-30T23:20:00Z",
+          "2000-07-10T20:30:00Z",
         };
 
-    long[] expValues =
-        new long[] {
-            1, 5, 31, 30, 10
-        };
+    long[] expValues = new long[] {1, 5, 31, 30, 10};
 
     ArrowBuf bufValidity = buf(validity);
     ArrowBuf millisData = stringToMillis(values);
 
-
     ArrowFieldNode fieldNode = new ArrowFieldNode(numRows, 0);
     ArrowRecordBatch batch =
         new ArrowRecordBatch(
-            numRows,
-            Lists.newArrayList(fieldNode),
-            Lists.newArrayList(bufValidity, millisData));
+            numRows, Lists.newArrayList(fieldNode), Lists.newArrayList(bufValidity, millisData));
 
     List<ValueVector> output = new ArrayList<>();
     BigIntVector bigIntVector = new BigIntVector(EMPTY_SCHEMA_PATH, allocator);
@@ -2059,24 +2106,16 @@ public void testCaseInsensitiveFunctions() throws Exception {
   public void testCastInt() throws Exception {
     Field inField = Field.nullable("input", new ArrowType.Utf8());
     TreeNode inNode = TreeBuilder.makeField(inField);
-    TreeNode castINTFn = TreeBuilder.makeFunction("castINT", Lists.newArrayList(inNode),
-        int32);
+    TreeNode castINTFn = TreeBuilder.makeFunction("castINT", Lists.newArrayList(inNode), int32);
     Field resultField = Field.nullable("result", int32);
     List<ExpressionTree> exprs =
-        Lists.newArrayList(
-            TreeBuilder.makeExpression(castINTFn, resultField));
+        Lists.newArrayList(TreeBuilder.makeExpression(castINTFn, resultField));
     Schema schema = new Schema(Lists.newArrayList(inField));
     Projector eval = Projector.make(schema, exprs);
     int numRows = 5;
     byte[] validity = new byte[] {(byte) 255};
-    String[] values =
-        new String[] {
-            "0", "123", "-123", "-1", "1"
-        };
-    int[] expValues =
-        new int[] {
-            0, 123, -123, -1, 1
-        };
+    String[] values = new String[] {"0", "123", "-123", "-1", "1"};
+    int[] expValues = new int[] {0, 123, -123, -1, 1};
     ArrowBuf bufValidity = buf(validity);
     List<ArrowBuf> bufData = stringBufs(values);
     ArrowFieldNode fieldNode = new ArrowFieldNode(numRows, 0);
@@ -2104,24 +2143,19 @@ public void testCastInt() throws Exception {
     releaseValueVectors(output);
   }
 
-  @Test(expected = GandivaException.class)
+  @Test
   public void testCastIntInvalidValue() throws Exception {
     Field inField = Field.nullable("input", new ArrowType.Utf8());
     TreeNode inNode = TreeBuilder.makeField(inField);
-    TreeNode castINTFn = TreeBuilder.makeFunction("castINT", Lists.newArrayList(inNode),
-        int32);
+    TreeNode castINTFn = TreeBuilder.makeFunction("castINT", Lists.newArrayList(inNode), int32);
     Field resultField = Field.nullable("result", int32);
     List<ExpressionTree> exprs =
-        Lists.newArrayList(
-            TreeBuilder.makeExpression(castINTFn, resultField));
+        Lists.newArrayList(TreeBuilder.makeExpression(castINTFn, resultField));
     Schema schema = new Schema(Lists.newArrayList(inField));
     Projector eval = Projector.make(schema, exprs);
     int numRows = 1;
     byte[] validity = new byte[] {(byte) 255};
-    String[] values =
-        new String[] {
-            "abc"
-        };
+    String[] values = new String[] {"abc"};
     ArrowBuf bufValidity = buf(validity);
     List<ArrowBuf> bufData = stringBufs(values);
     ArrowFieldNode fieldNode = new ArrowFieldNode(numRows, 0);
@@ -2136,41 +2170,35 @@ public void testCastIntInvalidValue() throws Exception {
       intVector.allocateNew(numRows);
       output.add(intVector);
     }
-    try {
-      eval.evaluate(batch, output);
-    } finally {
-      eval.close();
-      releaseRecordBatch(batch);
-      releaseValueVectors(output);
-    }
+
+    assertThrows(
+        GandivaException.class,
+        () -> {
+          try {
+            eval.evaluate(batch, output);
+          } finally {
+            eval.close();
+            releaseRecordBatch(batch);
+            releaseValueVectors(output);
+          }
+        });
   }
 
   @Test
   public void testCastFloat() throws Exception {
     Field inField = Field.nullable("input", new ArrowType.Utf8());
     TreeNode inNode = TreeBuilder.makeField(inField);
-    TreeNode castFLOAT8Fn = TreeBuilder.makeFunction("castFLOAT8", Lists.newArrayList(inNode),
-        float64);
+    TreeNode castFLOAT8Fn =
+        TreeBuilder.makeFunction("castFLOAT8", Lists.newArrayList(inNode), float64);
     Field resultField = Field.nullable("result", float64);
     List<ExpressionTree> exprs =
-        Lists.newArrayList(
-            TreeBuilder.makeExpression(castFLOAT8Fn, resultField));
+        Lists.newArrayList(TreeBuilder.makeExpression(castFLOAT8Fn, resultField));
     Schema schema = new Schema(Lists.newArrayList(inField));
     Projector eval = Projector.make(schema, exprs);
     int numRows = 5;
     byte[] validity = new byte[] {(byte) 255};
-    String[] values =
-        new String[] {
-            "2.3",
-            "-11.11",
-            "0",
-            "111",
-            "12345.67"
-        };
-    double[] expValues =
-        new double[] {
-            2.3, -11.11, 0, 111, 12345.67
-        };
+    String[] values = new String[] {"2.3", "-11.11", "0", "111", "12345.67"};
+    double[] expValues = new double[] {2.3, -11.11, 0, 111, 12345.67};
     ArrowBuf bufValidity = buf(validity);
     List<ArrowBuf> bufData = stringBufs(values);
     ArrowFieldNode fieldNode = new ArrowFieldNode(numRows, 0);
@@ -2202,36 +2230,25 @@ public void testCastFloat() throws Exception {
   public void testCastFloatVarbinary() throws Exception {
     Field inField = Field.nullable("input", new ArrowType.Binary());
     TreeNode inNode = TreeBuilder.makeField(inField);
-    TreeNode castFLOAT8Fn = TreeBuilder.makeFunction("castFLOAT8", Lists.newArrayList(inNode),
-            float64);
+    TreeNode castFLOAT8Fn =
+        TreeBuilder.makeFunction("castFLOAT8", Lists.newArrayList(inNode), float64);
     Field resultField = Field.nullable("result", float64);
     List<ExpressionTree> exprs =
-            Lists.newArrayList(
-                    TreeBuilder.makeExpression(castFLOAT8Fn, resultField));
+        Lists.newArrayList(TreeBuilder.makeExpression(castFLOAT8Fn, resultField));
     Schema schema = new Schema(Lists.newArrayList(inField));
     Projector eval = Projector.make(schema, exprs);
     int numRows = 5;
     byte[] validity = new byte[] {(byte) 255};
-    String[] values =
-        new String[] {
-            "2.3",
-            "-11.11",
-            "0",
-            "111",
-            "12345.67"
-        };
-    double[] expValues =
-        new double[] {
-            2.3, -11.11, 0, 111, 12345.67
-        };
+    String[] values = new String[] {"2.3", "-11.11", "0", "111", "12345.67"};
+    double[] expValues = new double[] {2.3, -11.11, 0, 111, 12345.67};
     ArrowBuf bufValidity = buf(validity);
     List<ArrowBuf> bufData = stringBufs(values);
     ArrowFieldNode fieldNode = new ArrowFieldNode(numRows, 0);
     ArrowRecordBatch batch =
-            new ArrowRecordBatch(
-                    numRows,
-                    Lists.newArrayList(fieldNode),
-                    Lists.newArrayList(bufValidity, bufData.get(0), bufData.get(1)));
+        new ArrowRecordBatch(
+            numRows,
+            Lists.newArrayList(fieldNode),
+            Lists.newArrayList(bufValidity, bufData.get(0), bufData.get(1)));
     List<ValueVector> output = new ArrayList<>();
     for (int i = 0; i < exprs.size(); i++) {
       Float8Vector float8Vector = new Float8Vector(EMPTY_SCHEMA_PATH, allocator);
@@ -2251,28 +2268,20 @@ public void testCastFloatVarbinary() throws Exception {
     releaseValueVectors(output);
   }
 
-  @Test(expected = GandivaException.class)
+  @Test
   public void testCastFloatInvalidValue() throws Exception {
     Field inField = Field.nullable("input", new ArrowType.Utf8());
     TreeNode inNode = TreeBuilder.makeField(inField);
-    TreeNode castFLOAT8Fn = TreeBuilder.makeFunction("castFLOAT8", Lists.newArrayList(inNode),
-        float64);
+    TreeNode castFLOAT8Fn =
+        TreeBuilder.makeFunction("castFLOAT8", Lists.newArrayList(inNode), float64);
     Field resultField = Field.nullable("result", float64);
     List<ExpressionTree> exprs =
-        Lists.newArrayList(
-            TreeBuilder.makeExpression(castFLOAT8Fn, resultField));
+        Lists.newArrayList(TreeBuilder.makeExpression(castFLOAT8Fn, resultField));
     Schema schema = new Schema(Lists.newArrayList(inField));
     Projector eval = Projector.make(schema, exprs);
     int numRows = 5;
     byte[] validity = new byte[] {(byte) 255};
-    String[] values =
-        new String[] {
-            "2.3",
-            "-11.11",
-            "abc",
-            "111",
-            "12345.67"
-        };
+    String[] values = new String[] {"2.3", "-11.11", "abc", "111", "12345.67"};
     ArrowBuf bufValidity = buf(validity);
     List<ArrowBuf> bufData = stringBufs(values);
     ArrowFieldNode fieldNode = new ArrowFieldNode(numRows, 0);
@@ -2287,13 +2296,18 @@ public void testCastFloatInvalidValue() throws Exception {
       float8Vector.allocateNew(numRows);
       output.add(float8Vector);
     }
-    try {
-      eval.evaluate(batch, output);
-    } finally {
-      eval.close();
-      releaseRecordBatch(batch);
-      releaseValueVectors(output);
-    }
+
+    assertThrows(
+        GandivaException.class,
+        () -> {
+          try {
+            eval.evaluate(batch, output);
+          } finally {
+            eval.close();
+            releaseRecordBatch(batch);
+            releaseValueVectors(output);
+          }
+        });
   }
 
   @Test
@@ -2308,23 +2322,25 @@ public void testEvaluateWithUnsetTargetHostCPU() throws Exception {
     List<ExpressionTree> exprs = Lists.newArrayList(root);
 
     Schema schema = new Schema(args);
-    Projector eval = Projector.make(schema, exprs, new ConfigurationBuilder.ConfigOptions().withTargetCPU(false ));
+    Projector eval =
+        Projector.make(
+            schema, exprs, new ConfigurationBuilder.ConfigOptions().withTargetCPU(false));
 
     int numRows = 16;
-    byte[] validity = new byte[]{(byte) 255, 0};
+    byte[] validity = new byte[] {(byte) 255, 0};
     // second half is "undefined"
-    int[] aValues = new int[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-    int[] bValues = new int[]{16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
+    int[] aValues = new int[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
+    int[] bValues = new int[] {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1};
 
     ArrowBuf validitya = buf(validity);
     ArrowBuf valuesa = intBuf(aValues);
     ArrowBuf validityb = buf(validity);
     ArrowBuf valuesb = intBuf(bValues);
     ArrowRecordBatch batch =
-            new ArrowRecordBatch(
-                    numRows,
-                    Lists.newArrayList(new ArrowFieldNode(numRows, 8), new ArrowFieldNode(numRows, 8)),
-                    Lists.newArrayList(validitya, valuesa, validityb, valuesb));
+        new ArrowRecordBatch(
+            numRows,
+            Lists.newArrayList(new ArrowFieldNode(numRows, 8), new ArrowFieldNode(numRows, 8)),
+            Lists.newArrayList(validitya, valuesa, validityb, valuesb));
 
     IntVector intVector = new IntVector(EMPTY_SCHEMA_PATH, allocator);
     intVector.allocateNew(numRows);
@@ -2355,13 +2371,13 @@ public void testCastVarcharFromInteger() throws Exception {
     TreeNode inNode = TreeBuilder.makeField(inField);
     TreeNode lenNode = TreeBuilder.makeField(lenField);
 
-    TreeNode tsToString = TreeBuilder.makeFunction("castVARCHAR", Lists.newArrayList(inNode, lenNode),
-        new ArrowType.Utf8());
+    TreeNode tsToString =
+        TreeBuilder.makeFunction(
+            "castVARCHAR", Lists.newArrayList(inNode, lenNode), new ArrowType.Utf8());
 
     Field resultField = Field.nullable("result", new ArrowType.Utf8());
     List<ExpressionTree> exprs =
-        Lists.newArrayList(
-            TreeBuilder.makeExpression(tsToString, resultField));
+        Lists.newArrayList(TreeBuilder.makeExpression(tsToString, resultField));
 
     Schema schema = new Schema(Lists.newArrayList(inField, lenField));
     Projector eval = Projector.make(schema, exprs);
@@ -2370,24 +2386,17 @@ public void testCastVarcharFromInteger() throws Exception {
     byte[] validity = new byte[] {(byte) 255};
     int[] values =
         new int[] {
-            2345,
-            2345,
-            2345,
-            2345,
-            -2345,
-        };
-    long[] lenValues =
-        new long[] {
-            0L, 4L, 2L, 6L, 5L
+          2345, 2345, 2345, 2345, -2345,
         };
+    long[] lenValues = new long[] {0L, 4L, 2L, 6L, 5L};
 
     String[] expValues =
         new String[] {
-            "",
-            Integer.toString(2345).substring(0, 4),
-            Integer.toString(2345).substring(0, 2),
-            Integer.toString(2345),
-            Integer.toString(-2345)
+          "",
+          Integer.toString(2345).substring(0, 4),
+          Integer.toString(2345).substring(0, 2),
+          Integer.toString(2345),
+          Integer.toString(-2345)
         };
 
     ArrowBuf bufValidity = buf(validity);
@@ -2433,13 +2442,13 @@ public void testCastVarcharFromFloat() throws Exception {
     TreeNode inNode = TreeBuilder.makeField(inField);
     TreeNode lenNode = TreeBuilder.makeField(lenField);
 
-    TreeNode tsToString = TreeBuilder.makeFunction("castVARCHAR", Lists.newArrayList(inNode, lenNode),
-        new ArrowType.Utf8());
+    TreeNode tsToString =
+        TreeBuilder.makeFunction(
+            "castVARCHAR", Lists.newArrayList(inNode, lenNode), new ArrowType.Utf8());
 
     Field resultField = Field.nullable("result", new ArrowType.Utf8());
     List<ExpressionTree> exprs =
-        Lists.newArrayList(
-            TreeBuilder.makeExpression(tsToString, resultField));
+        Lists.newArrayList(TreeBuilder.makeExpression(tsToString, resultField));
 
     Schema schema = new Schema(Lists.newArrayList(inField, lenField));
     Projector eval = Projector.make(schema, exprs);
@@ -2448,27 +2457,24 @@ public void testCastVarcharFromFloat() throws Exception {
     byte[] validity = new byte[] {(byte) 255};
     double[] values =
         new double[] {
-            0.0,
-            -0.0,
-            1.0,
-            0.001,
-            0.0009,
-            0.00099893,
-            999999.9999,
-            10000000.0,
-            23943410000000.343434,
-            Double.POSITIVE_INFINITY,
-            Double.NEGATIVE_INFINITY,
-            Double.NaN,
-            23.45,
-            23.45,
-            -23.45,
+          0.0,
+          -0.0,
+          1.0,
+          0.001,
+          0.0009,
+          0.00099893,
+          999999.9999,
+          10000000.0,
+          23943410000000.343434,
+          Double.POSITIVE_INFINITY,
+          Double.NEGATIVE_INFINITY,
+          Double.NaN,
+          23.45,
+          23.45,
+          -23.45,
         };
     long[] lenValues =
-        new long[] {
-            6L, 6L, 6L, 6L, 10L, 15L, 15L, 15L, 30L,
-            15L, 15L, 15L, 0L, 6L, 6L
-        };
+        new long[] {6L, 6L, 6L, 6L, 10L, 15L, 15L, 15L, 30L, 15L, 15L, 15L, 0L, 6L, 6L};
 
     /* The Java real numbers are represented in two ways and Gandiva must
      * follow the same rules:
@@ -2483,21 +2489,21 @@ public void testCastVarcharFromFloat() throws Exception {
      * */
     String[] expValues =
         new String[] {
-            Double.toString(0.0), // must be cast to -> "0.0"
-            Double.toString(-0.0), // must be cast to -> "-0.0"
-            Double.toString(1.0), // must be cast to -> "1.0"
-            Double.toString(0.001), // must be cast to -> "0.001"
-            Double.toString(0.0009), // must be cast to -> "9E-4"
-            Double.toString(0.00099893), // must be cast to -> "9E-4"
-            Double.toString(999999.9999), // must be cast to -> "999999.9999"
-            Double.toString(10000000.0), // must be cast to 1E7
-            Double.toString(23943410000000.343434),
-            Double.toString(Double.POSITIVE_INFINITY),
-            Double.toString(Double.NEGATIVE_INFINITY),
-            Double.toString(Double.NaN),
-            "",
-            Double.toString(23.45),
-            Double.toString(-23.45)
+          Double.toString(0.0), // must be cast to -> "0.0"
+          Double.toString(-0.0), // must be cast to -> "-0.0"
+          Double.toString(1.0), // must be cast to -> "1.0"
+          Double.toString(0.001), // must be cast to -> "0.001"
+          Double.toString(0.0009), // must be cast to -> "9E-4"
+          Double.toString(0.00099893), // must be cast to -> "9E-4"
+          Double.toString(999999.9999), // must be cast to -> "999999.9999"
+          Double.toString(10000000.0), // must be cast to 1E7
+          Double.toString(23943410000000.343434),
+          Double.toString(Double.POSITIVE_INFINITY),
+          Double.toString(Double.NEGATIVE_INFINITY),
+          Double.toString(Double.NaN),
+          "",
+          Double.toString(23.45),
+          Double.toString(-23.45)
         };
 
     ArrowBuf bufValidity = buf(validity);
@@ -2543,40 +2549,40 @@ public void testInitCap() throws Exception {
     Field retType = Field.nullable("c", new ArrowType.Utf8());
 
     TreeNode cond =
-            TreeBuilder.makeFunction(
-                    "initcap",
-                    Lists.newArrayList(TreeBuilder.makeField(x)),
-                    new ArrowType.Utf8());
+        TreeBuilder.makeFunction(
+            "initcap", Lists.newArrayList(TreeBuilder.makeField(x)), new ArrowType.Utf8());
     ExpressionTree expr = TreeBuilder.makeExpression(cond, retType);
     Schema schema = new Schema(Lists.newArrayList(x));
     Projector eval = Projector.make(schema, Lists.newArrayList(expr));
 
     int numRows = 5;
-    byte[] validity = new byte[]{(byte) 15, 0};
-    String[] valuesX = new String[]{
-        "  øhpqršvñ  \n\n",
-        "möbelträger1füße   \nmöbelträge'rfüße",
-        "ÂbĆDËFgh\néll",
-        "citroën CaR",
-        "kjk"
-    };
-
-    String[] expected = new String[]{
-        "  Øhpqršvñ  \n\n",
-        "Möbelträger1füße   \nMöbelträge'Rfüße",
-        "Âbćdëfgh\nÉll",
-        "Citroën Car",
-        null
-    };
+    byte[] validity = new byte[] {(byte) 15, 0};
+    String[] valuesX =
+        new String[] {
+          "  øhpqršvñ  \n\n",
+          "möbelträger1füße   \nmöbelträge'rfüße",
+          "ÂbĆDËFgh\néll",
+          "citroën CaR",
+          "kjk"
+        };
+
+    String[] expected =
+        new String[] {
+          "  Øhpqršvñ  \n\n",
+          "Möbelträger1füße   \nMöbelträge'Rfüße",
+          "Âbćdëfgh\nÉll",
+          "Citroën Car",
+          null
+        };
 
     ArrowBuf validityX = buf(validity);
     List<ArrowBuf> dataBufsX = stringBufs(valuesX);
 
     ArrowRecordBatch batch =
-            new ArrowRecordBatch(
-                    numRows,
-                    Lists.newArrayList(new ArrowFieldNode(numRows, 0)),
-                    Lists.newArrayList(validityX, dataBufsX.get(0), dataBufsX.get(1)));
+        new ArrowRecordBatch(
+            numRows,
+            Lists.newArrayList(new ArrowFieldNode(numRows, 0)),
+            Lists.newArrayList(validityX, dataBufsX.get(0), dataBufsX.get(1)));
 
     // allocate data for output vector.
     VarCharVector outVector = new VarCharVector(EMPTY_SCHEMA_PATH, allocator);
@@ -2590,11 +2596,11 @@ public void testInitCap() throws Exception {
 
     // match expected output.
     for (int i = 0; i < numRows - 1; i++) {
-      assertFalse("Expect none value equals null", outVector.isNull(i));
+      assertFalse(outVector.isNull(i), "Expect none value equals null");
       assertEquals(expected[i], new String(outVector.get(i)));
     }
 
-    assertTrue("Last value must be null", outVector.isNull(numRows - 1));
+    assertTrue(outVector.isNull(numRows - 1), "Last value must be null");
 
     releaseRecordBatch(batch);
     releaseValueVectors(output);
diff --git a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/TestJniLoader.java b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/TestJniLoader.java
index 116f0dd9eab00..4541dba92c928 100644
--- a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/TestJniLoader.java
+++ b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/TestJniLoader.java
@@ -14,40 +14,53 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.evaluator;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
 
 public class TestJniLoader {
 
   @Test
   public void testDefaultConfiguration() throws Exception {
     long configId = JniLoader.getConfiguration(ConfigurationBuilder.ConfigOptions.getDefault());
-    Assert.assertEquals(configId, JniLoader.getDefaultConfiguration());
-    Assert.assertEquals(configId, JniLoader.getConfiguration(ConfigurationBuilder.ConfigOptions.getDefault()));
+    assertEquals(configId, JniLoader.getDefaultConfiguration());
+    assertEquals(
+        configId, JniLoader.getConfiguration(ConfigurationBuilder.ConfigOptions.getDefault()));
 
-    long configId2 = JniLoader.getConfiguration(new ConfigurationBuilder.ConfigOptions().withOptimize(false));
-    long configId3 = JniLoader.getConfiguration(new ConfigurationBuilder.ConfigOptions().withTargetCPU(false));
-    long configId4 = JniLoader.getConfiguration(new ConfigurationBuilder.ConfigOptions().withOptimize(false)
-        .withTargetCPU(false));
+    long configId2 =
+        JniLoader.getConfiguration(new ConfigurationBuilder.ConfigOptions().withOptimize(false));
+    long configId3 =
+        JniLoader.getConfiguration(new ConfigurationBuilder.ConfigOptions().withTargetCPU(false));
+    long configId4 =
+        JniLoader.getConfiguration(
+            new ConfigurationBuilder.ConfigOptions().withOptimize(false).withTargetCPU(false));
 
-    Assert.assertTrue(configId != configId2 && configId2 != configId3 && configId3 != configId4);
+    assertTrue(configId != configId2 && configId2 != configId3 && configId3 != configId4);
 
-    Assert.assertEquals(configId2, JniLoader.getConfiguration(new ConfigurationBuilder.ConfigOptions()
-        .withOptimize(false)));
-    Assert.assertEquals(configId3, JniLoader.getConfiguration(new ConfigurationBuilder.ConfigOptions()
-        .withTargetCPU(false)));
-    Assert.assertEquals(configId4, JniLoader.getConfiguration(new ConfigurationBuilder.ConfigOptions()
-        .withOptimize(false).withTargetCPU(false)));
+    assertEquals(
+        configId2,
+        JniLoader.getConfiguration(new ConfigurationBuilder.ConfigOptions().withOptimize(false)));
+    assertEquals(
+        configId3,
+        JniLoader.getConfiguration(new ConfigurationBuilder.ConfigOptions().withTargetCPU(false)));
+    assertEquals(
+        configId4,
+        JniLoader.getConfiguration(
+            new ConfigurationBuilder.ConfigOptions().withOptimize(false).withTargetCPU(false)));
 
     JniLoader.removeConfiguration(new ConfigurationBuilder.ConfigOptions().withOptimize(false));
-    // configids are monotonically updated. after a config is removed, new one is assigned with higher id
-    Assert.assertNotEquals(configId2, JniLoader.getConfiguration(new ConfigurationBuilder.ConfigOptions()
-        .withOptimize(false)));
+    // configids are monotonically updated. after a config is removed, new one is assigned with
+    // higher id
+    assertNotEquals(
+        configId2,
+        JniLoader.getConfiguration(new ConfigurationBuilder.ConfigOptions().withOptimize(false)));
 
     JniLoader.removeConfiguration(new ConfigurationBuilder.ConfigOptions());
-    Assert.assertNotEquals(configId, JniLoader.getConfiguration(ConfigurationBuilder.ConfigOptions.getDefault()));
+    assertNotEquals(
+        configId, JniLoader.getConfiguration(ConfigurationBuilder.ConfigOptions.getDefault()));
   }
 }
diff --git a/java/gandiva/src/test/java/org/apache/arrow/gandiva/expression/ArrowTypeHelperTest.java b/java/gandiva/src/test/java/org/apache/arrow/gandiva/expression/ArrowTypeHelperTest.java
index 7ddd602bfcef0..33cc4ec382fb9 100644
--- a/java/gandiva/src/test/java/org/apache/arrow/gandiva/expression/ArrowTypeHelperTest.java
+++ b/java/gandiva/src/test/java/org/apache/arrow/gandiva/expression/ArrowTypeHelperTest.java
@@ -14,21 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 import org.apache.arrow.vector.types.FloatingPointPrecision;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ArrowTypeHelperTest {
 
diff --git a/java/gandiva/src/test/java/org/apache/arrow/gandiva/expression/TreeBuilderTest.java b/java/gandiva/src/test/java/org/apache/arrow/gandiva/expression/TreeBuilderTest.java
index 90373cf792a63..63b31f1fb30d8 100644
--- a/java/gandiva/src/test/java/org/apache/arrow/gandiva/expression/TreeBuilderTest.java
+++ b/java/gandiva/src/test/java/org/apache/arrow/gandiva/expression/TreeBuilderTest.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.gandiva.expression;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.arrow.gandiva.exceptions.GandivaException;
 import org.apache.arrow.gandiva.ipc.GandivaTypes;
 import org.apache.arrow.vector.types.FloatingPointPrecision;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TreeBuilderTest {
 
diff --git a/java/maven/module-info-compiler-maven-plugin/pom.xml b/java/maven/module-info-compiler-maven-plugin/pom.xml
index 6881018933d3f..b00c03a014980 100644
--- a/java/maven/module-info-compiler-maven-plugin/pom.xml
+++ b/java/maven/module-info-compiler-maven-plugin/pom.xml
@@ -1,22 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.arrow.maven.plugins</groupId>
     <artifactId>arrow-maven-plugins</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>17.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>module-info-compiler-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
@@ -66,43 +72,19 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.6.0</version>
+      <version>${maven.plugin.tools.version}</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
 
   <build>
-    <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+    <pluginManagement>
       <plugins>
-        <plugin>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>3.1.0</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-plugin-plugin</artifactId>
-          <version>3.11.0</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>3.3.0</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-install-plugin</artifactId>
-          <version>3.1.1</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>3.1.1</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-invoker-plugin</artifactId>
-          <version>3.1.0</version>
-        </plugin>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <normalization>
                 <runtimeClassPath>
                   <ignoredFiles>
@@ -110,16 +92,15 @@
                   </ignoredFiles>
                 </runtimeClassPath>
               </normalization>
-            </gradleEnterprise>
+            </develocity>
           </configuration>
-          </plugin>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.11.0</version>
         <configuration>
           <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
         </configuration>
diff --git a/java/maven/module-info-compiler-maven-plugin/src/main/java/org/apache/arrow/maven/plugins/BaseModuleInfoCompilerPlugin.java b/java/maven/module-info-compiler-maven-plugin/src/main/java/org/apache/arrow/maven/plugins/BaseModuleInfoCompilerPlugin.java
index 37cbf5d7e772b..4fc8fc46e6bcc 100644
--- a/java/maven/module-info-compiler-maven-plugin/src/main/java/org/apache/arrow/maven/plugins/BaseModuleInfoCompilerPlugin.java
+++ b/java/maven/module-info-compiler-maven-plugin/src/main/java/org/apache/arrow/maven/plugins/BaseModuleInfoCompilerPlugin.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.maven.plugins;
 
 import java.io.File;
@@ -28,14 +27,11 @@
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Optional;
-
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.glavo.mic.ModuleInfoCompiler;
 
-/**
- * Compiles the first module-info.java file in the project purely syntactically.
- */
+/** Compiles the first module-info.java file in the project purely syntactically. */
 public abstract class BaseModuleInfoCompilerPlugin extends AbstractMojo {
   protected abstract List<String> getSourceRoots();
 
@@ -60,9 +56,10 @@ public void execute() throws MojoExecutionException {
 
       // Invoke the compiler,
       ModuleInfoCompiler compiler = new ModuleInfoCompiler();
-      try (Reader reader = new InputStreamReader(Files.newInputStream(moduleInfoFile.get().toPath()),
-          StandardCharsets.UTF_8);
-           OutputStream output = Files.newOutputStream(targetPath)) {
+      try (Reader reader =
+              new InputStreamReader(
+                  Files.newInputStream(moduleInfoFile.get().toPath()), StandardCharsets.UTF_8);
+          OutputStream output = Files.newOutputStream(targetPath)) {
         compiler.compile(reader, output);
         getLog().info("Successfully wrote module-info.class file.");
       } catch (IOException ex) {
@@ -73,18 +70,17 @@ public void execute() throws MojoExecutionException {
     }
   }
 
-  /**
-   * Finds the first module-info.java file in the set of source directories.
-   */
+  /** Finds the first module-info.java file in the set of source directories. */
   private Optional<File> findFirstModuleInfo(List<String> sourceDirectories) {
     if (sourceDirectories == null) {
       return Optional.empty();
     }
 
-    return sourceDirectories.stream().map(Paths::get)
-        .map(sourcePath ->
-            sourcePath.toFile().listFiles(file ->
-                file.getName().equals("module-info.java")))
+    return sourceDirectories.stream()
+        .map(Paths::get)
+        .map(
+            sourcePath ->
+                sourcePath.toFile().listFiles(file -> file.getName().equals("module-info.java")))
         .filter(matchingFiles -> matchingFiles != null && matchingFiles.length != 0)
         .map(matchingFiles -> matchingFiles[0])
         .findAny();
diff --git a/java/maven/module-info-compiler-maven-plugin/src/main/java/org/apache/arrow/maven/plugins/ModuleInfoCompilerPlugin.java b/java/maven/module-info-compiler-maven-plugin/src/main/java/org/apache/arrow/maven/plugins/ModuleInfoCompilerPlugin.java
index 31df6372925cc..e66a475dbf8be 100644
--- a/java/maven/module-info-compiler-maven-plugin/src/main/java/org/apache/arrow/maven/plugins/ModuleInfoCompilerPlugin.java
+++ b/java/maven/module-info-compiler-maven-plugin/src/main/java/org/apache/arrow/maven/plugins/ModuleInfoCompilerPlugin.java
@@ -14,24 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.maven.plugins;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 
-/**
- * A maven plugin for compiler module-info files in main code with JDK8.
- */
+/** A maven plugin for compiler module-info files in main code with JDK8. */
 @Mojo(name = "compile", defaultPhase = LifecyclePhase.COMPILE)
 public class ModuleInfoCompilerPlugin extends BaseModuleInfoCompilerPlugin {
 
-  @Parameter(defaultValue = "${project.compileSourceRoots}", property = "compileSourceRoots",
+  @Parameter(
+      defaultValue = "${project.compileSourceRoots}",
+      property = "compileSourceRoots",
       required = true)
   private final List<String> compileSourceRoots = new ArrayList<>();
 
diff --git a/java/maven/module-info-compiler-maven-plugin/src/main/java/org/apache/arrow/maven/plugins/ModuleInfoTestCompilerPlugin.java b/java/maven/module-info-compiler-maven-plugin/src/main/java/org/apache/arrow/maven/plugins/ModuleInfoTestCompilerPlugin.java
index 4705506ac5346..f18ac9faac735 100644
--- a/java/maven/module-info-compiler-maven-plugin/src/main/java/org/apache/arrow/maven/plugins/ModuleInfoTestCompilerPlugin.java
+++ b/java/maven/module-info-compiler-maven-plugin/src/main/java/org/apache/arrow/maven/plugins/ModuleInfoTestCompilerPlugin.java
@@ -14,19 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.maven.plugins;
 
 import java.util.List;
-
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 
-/**
- * A maven plugin for compiler module-info files in unit tests with JDK8.
- */
+/** A maven plugin for compiler module-info files in unit tests with JDK8. */
 @Mojo(name = "testCompile", defaultPhase = LifecyclePhase.TEST_COMPILE)
 public class ModuleInfoTestCompilerPlugin extends BaseModuleInfoCompilerPlugin {
 
diff --git a/java/maven/pom.xml b/java/maven/pom.xml
index ccc12f5397fb7..54b7757e8cebf 100644
--- a/java/maven/pom.xml
+++ b/java/maven/pom.xml
@@ -1,25 +1,40 @@
-<?xml version="1.0"?>
-<!-- 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. -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <!--
     Note: Do not inherit from the Arrow parent POM as plugins can be referenced
     during the parent POM, introducing circular dependencies.
   -->
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>31</version>
+    <relativePath></relativePath>
+  </parent>
+
   <groupId>org.apache.arrow.maven.plugins</groupId>
   <artifactId>arrow-maven-plugins</artifactId>
-  <version>16.0.0-SNAPSHOT</version>
-  <name>Arrow Maven Plugins</name>
+  <version>17.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
+  <name>Arrow Maven Plugins</name>
 
   <modules>
     <module>module-info-compiler-maven-plugin</module>
@@ -27,22 +42,45 @@
 
   <properties>
     <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
+    <!-- org.apache:apache overrides -->
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.plugin.tools.version>3.13.1</maven.plugin.tools.version>
+    <surefire.version>3.2.5</surefire.version>
+    <version.apache-rat-plugin>0.16.1</version.apache-rat-plugin>
+    <version.maven-assembly-plugin>3.7.1</version.maven-assembly-plugin>
+    <version.maven-compiler-plugin>3.12.1</version.maven-compiler-plugin>
+    <version.maven-dependency-plugin>3.6.1</version.maven-dependency-plugin>
+    <version.maven-gpg-plugin>3.2.4</version.maven-gpg-plugin>
+    <version.maven-jar-plugin>3.2.2</version.maven-jar-plugin>
+    <version.maven-javadoc-plugin>3.6.3</version.maven-javadoc-plugin>
+    <version.maven-project-info-reports-plugin>3.5.0</version.maven-project-info-reports-plugin>
   </properties>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>com.diffplug.spotless</groupId>
+          <artifactId>spotless-maven-plugin</artifactId>
+          <version>2.30.0</version>
+        </plugin>
+        <plugin>
+          <groupId>pl.project13.maven</groupId>
+          <artifactId>git-commit-id-plugin</artifactId>
+          <version>4.9.10</version>
+        </plugin>
+        <plugin>
+          <groupId>org.cyclonedx</groupId>
+          <artifactId>cyclonedx-maven-plugin</artifactId>
+          <version>2.8.0</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>rat-checks</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
         <configuration>
           <excludeSubProjects>false</excludeSubProjects>
           <excludes>
@@ -87,6 +125,15 @@
             <exclude>**/*.idea/**</exclude>
           </excludes>
         </configuration>
+        <executions>
+          <execution>
+            <id>rat-checks</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>validate</phase>
+          </execution>
+        </executions>
       </plugin>
 
       <plugin>
@@ -100,11 +147,6 @@
             <exclude>**/logback.xml</exclude>
           </excludes>
           <archive>
-            <index>true</index>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
             <manifestEntries>
               <Extension-Name>org.apache.arrow</Extension-Name>
               <Built-By>${username}</Built-By>
@@ -124,50 +166,23 @@
         </executions>
       </plugin>
 
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <configuration>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <encoding>UTF-8</encoding>
-          <source>1.8</source>
-          <target>1.8</target>
           <maxmem>2048m</maxmem>
-          <useIncrementalCompilation>false</useIncrementalCompilation>
           <fork>true</fork>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-enforcer-plugin</artifactId>
         <executions>
-          <execution>
-            <id>validate_java_and_maven_version</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <inherited>false</inherited>
-            <configuration>
-              <rules>
-                <requireMavenVersion>
-                  <version>[3.3.0,4)</version>
-                </requireMavenVersion>
-              </rules>
-            </configuration>
-          </execution>
           <execution>
             <id>avoid_bad_dependencies</id>
-            <phase>verify</phase>
             <goals>
               <goal>enforce</goal>
             </goals>
+            <phase>verify</phase>
             <configuration>
               <rules>
                 <bannedDependencies>
@@ -187,14 +202,27 @@
       <plugin>
         <groupId>pl.project13.maven</groupId>
         <artifactId>git-commit-id-plugin</artifactId>
-        <version>4.0.5</version>
+        <configuration>
+          <dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat>
+          <verbose>false</verbose>
+          <skipPoms>false</skipPoms>
+          <generateGitPropertiesFile>true</generateGitPropertiesFile>
+          <failOnNoGitDirectory>false</failOnNoGitDirectory>
+          <gitDescribe>
+            <skip>false</skip>
+            <always>false</always>
+            <abbrev>7</abbrev>
+            <dirty>-dirty</dirty>
+            <forceLongFormat>true</forceLongFormat>
+          </gitDescribe>
+        </configuration>
         <executions>
           <execution>
             <id>for-jars</id>
-            <inherited>true</inherited>
             <goals>
               <goal>revision</goal>
             </goals>
+            <inherited>true</inherited>
             <configuration>
               <generateGitPropertiesFilename>target/classes/arrow-git.properties</generateGitPropertiesFilename>
             </configuration>
@@ -210,27 +238,25 @@
             </configuration>
           </execution>
         </executions>
-
-        <configuration>
-          <dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat>
-          <verbose>false</verbose>
-          <skipPoms>false</skipPoms>
-          <generateGitPropertiesFile>true</generateGitPropertiesFile>
-          <failOnNoGitDirectory>false</failOnNoGitDirectory>
-          <gitDescribe>
-            <skip>false</skip>
-            <always>false</always>
-            <abbrev>7</abbrev>
-            <dirty>-dirty</dirty>
-            <forceLongFormat>true</forceLongFormat>
-          </gitDescribe>
-        </configuration>
       </plugin>
 
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.1.0</version>
+        <configuration>
+          <configLocation>../dev/checkstyle/checkstyle.xml</configLocation>
+          <headerLocation>../dev/license/asf-java.license</headerLocation>
+          <suppressionsLocation>../dev/checkstyle/suppressions.xml</suppressionsLocation>
+          <includeTestSourceDirectory>true</includeTestSourceDirectory>
+          <inputEncoding>UTF-8</inputEncoding>
+          <consoleOutput>true</consoleOutput>
+          <failsOnError>${checkstyle.failOnViolation}</failsOnError>
+          <failOnViolation>${checkstyle.failOnViolation}</failOnViolation>
+          <violationSeverity>warning</violationSeverity>
+          <outputFileFormat>xml</outputFileFormat>
+          <outputFile>${project.build.directory}/test/checkstyle-errors.xml</outputFile>
+          <linkXRef>false</linkXRef>
+        </configuration>
         <dependencies>
           <dependency>
             <groupId>com.puppycrawl.tools</groupId>
@@ -240,69 +266,31 @@
           <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
-            <version>2.0.11</version>
+            <version>2.0.13</version>
           </dependency>
         </dependencies>
         <executions>
           <execution>
             <id>validate</id>
-            <phase>validate</phase>
             <goals>
               <goal>check</goal>
             </goals>
+            <phase>validate</phase>
           </execution>
         </executions>
-        <configuration>
-          <configLocation>../dev/checkstyle/checkstyle.xml</configLocation>
-          <headerLocation>../dev/checkstyle/checkstyle.license</headerLocation>
-          <suppressionsLocation>../dev/checkstyle/suppressions.xml</suppressionsLocation>
-          <includeTestSourceDirectory>true</includeTestSourceDirectory>
-          <encoding>UTF-8</encoding>
-          <consoleOutput>true</consoleOutput>
-          <failsOnError>${checkstyle.failOnViolation}</failsOnError>
-          <failOnViolation>${checkstyle.failOnViolation}</failOnViolation>
-          <violationSeverity>warning</violationSeverity>
-          <format>xml</format>
-          <format>html</format>
-          <outputFile>${project.build.directory}/test/checkstyle-errors.xml</outputFile>
-          <linkXRef>false</linkXRef>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.cyclonedx</groupId>
         <artifactId>cyclonedx-maven-plugin</artifactId>
-        <version>2.7.11</version>
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>makeBom</goal>
             </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!--
-      Generate custom Arrow Java Maven Plugin for module-info.java compiler.
-      Needed to pass GitHub CI validation `$ mvn assembly:single`
-      -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
             <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
           </execution>
         </executions>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>src</descriptorRef>
-          </descriptorRefs>
-        </configuration>
       </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
@@ -311,21 +299,38 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <configuration>
+          <pom>
+            <licenseHeader>
+              <file>${maven.multiModuleProjectDirectory}/dev/license/asf-xml.license</file>
+              <delimiter>(&lt;configuration|&lt;project)</delimiter>
+            </licenseHeader>
+            <sortPom></sortPom>
+          </pom>
+          <java>
+            <googleJavaFormat>
+              <version>1.7</version>
+              <style>GOOGLE</style>
+            </googleJavaFormat>
+            <licenseHeader>
+              <file>${maven.multiModuleProjectDirectory}/dev/license/asf-java.license</file>
+              <delimiter>package</delimiter>
+            </licenseHeader>
+          </java>
+        </configuration>
+        <executions>
+          <execution>
+            <id>spotless-check</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>3.5.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.12.1</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
   </build>
 
   <reporting>
@@ -333,13 +338,34 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>3.5.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.12.1</version>
       </plugin>
     </plugins>
   </reporting>
+
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>source-release-assembly</id>
+                <configuration>
+                  <!-- source release assembly is managed at the root of the project. -->
+                  <skipAssembly>true</skipAssembly>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/java/memory/memory-core/pom.xml b/java/memory/memory-core/pom.xml
index 2a92d032942c9..729cc512ab111 100644
--- a/java/memory/memory-core/pom.xml
+++ b/java/memory/memory-core/pom.xml
@@ -1,21 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>arrow-memory</artifactId>
     <groupId>org.apache.arrow</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <artifactId>arrow-memory</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>arrow-memory-core</artifactId>
 
@@ -33,7 +41,7 @@
     </dependency>
     <dependency>
       <groupId>org.immutables</groupId>
-      <artifactId>value</artifactId>
+      <artifactId>value-annotations</artifactId>
     </dependency>
     <dependency>
       <groupId>org.checkerframework</groupId>
@@ -61,9 +69,6 @@
       <id>jdk11+</id>
       <activation>
         <jdk>[11,]</jdk>
-        <property>
-          <name>!m2e.version</name>
-        </property>
       </activation>
       <build>
         <plugins>
@@ -92,21 +97,17 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
-
             <executions>
               <execution>
                 <id>opens-tests</id>
-                <phase>test</phase>
                 <goals>
                   <goal>test</goal>
                 </goals>
+                <phase>test</phase>
                 <configuration>
-                  <!-- Dummy value to stop inheriting the default add-opens flag -->
-                  <argLine>-Dfoo=bar</argLine>
-                  <excludes>
-                    <!-- Need something (anything) here to make Maven not inherit the value above -->
-                    <exclude>**/TestArrowBuf.java</exclude>
-                  </excludes>
+                  <!-- Do not inherit the default add-opens flag and excludes -->
+                  <argLine combine.self="override"></argLine>
+                  <excludes combine.self="override"></excludes>
                   <includes>
                     <include>**/TestOpens.java</include>
                   </includes>
@@ -129,16 +130,16 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
-              <source>8</source>
-              <target>8</target>
-              <encoding>UTF-8</encoding>
               <compilerArgs combine.children="append">
-                <arg>-Xmaxerrs</arg> <!-- javac only reports the first 100 errors or warnings -->
+                <arg>-Xmaxerrs</arg>
+                <!-- javac only reports the first 100 errors or warnings -->
                 <arg>10000</arg>
                 <arg>-Xmaxwarns</arg>
                 <arg>10000</arg>
-                <arg>-AskipDefs=.*Test</arg> <!-- Skip analysis for Testing classes -->
-                <arg>-AatfDoNotCache</arg> <!-- not cache results -->
+                <arg>-AskipDefs=.*Test</arg>
+                <!-- Skip analysis for Testing classes -->
+                <arg>-AatfDoNotCache</arg>
+                <!-- not cache results -->
               </compilerArgs>
               <annotationProcessorPaths combine.children="append">
                 <path>
@@ -147,12 +148,6 @@
                   <version>${checker.framework.version}</version>
                 </path>
               </annotationProcessorPaths>
-              <annotationProcessors>
-                <!-- To support @Value.Immutable processors -->
-                <annotationProcessor>org.immutables.value.internal.$processor$.$Processor</annotationProcessor>
-                <!-- Add all the checkers you want to enable here -->
-                <annotationProcessor>org.checkerframework.checker.nullness.NullnessChecker</annotationProcessor>
-              </annotationProcessors>
             </configuration>
           </plugin>
         </plugins>
diff --git a/java/memory/memory-core/src/main/java/module-info.java b/java/memory/memory-core/src/main/java/module-info.java
index 34ba34e80bc69..52fcb52d014a5 100644
--- a/java/memory/memory-core/src/main/java/module-info.java
+++ b/java/memory/memory-core/src/main/java/module-info.java
@@ -21,8 +21,8 @@
   exports org.apache.arrow.memory.util;
   exports org.apache.arrow.memory.util.hash;
   exports org.apache.arrow.util;
+
   requires transitive jdk.unsupported;
   requires jsr305;
-  requires org.immutables.value;
   requires org.slf4j;
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/Accountant.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/Accountant.java
index b87f1345a510e..5a31f4cd1914a 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/Accountant.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/Accountant.java
@@ -14,59 +14,54 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 import java.util.concurrent.atomic.AtomicLong;
-
 import javax.annotation.concurrent.ThreadSafe;
-
 import org.apache.arrow.util.Preconditions;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
- * Provides a concurrent way to manage account for memory usage without locking. Used as basis
- * for Allocators. All
- * operations are threadsafe (except for close).
+ * Provides a concurrent way to manage account for memory usage without locking. Used as basis for
+ * Allocators. All operations are threadsafe (except for close).
  */
 @ThreadSafe
 class Accountant implements AutoCloseable {
 
-  /**
-   * The parent allocator.
-   */
+  /** The parent allocator. */
   protected final @Nullable Accountant parent;
 
   private final String name;
 
   /**
-   * The amount of memory reserved for this allocator. Releases below this amount of memory will
-   * not be returned to the
-   * parent Accountant until this Accountant is closed.
+   * The amount of memory reserved for this allocator. Releases below this amount of memory will not
+   * be returned to the parent Accountant until this Accountant is closed.
    */
   protected final long reservation;
 
   private final AtomicLong peakAllocation = new AtomicLong();
 
   /**
-   * Maximum local memory that can be held. This can be externally updated. Changing it won't
-   * cause past memory to
-   * change but will change responses to future allocation efforts
+   * Maximum local memory that can be held. This can be externally updated. Changing it won't cause
+   * past memory to change but will change responses to future allocation efforts
    */
   private final AtomicLong allocationLimit = new AtomicLong();
 
-  /**
-   * Currently allocated amount of memory.
-   */
+  /** Currently allocated amount of memory. */
   private final AtomicLong locallyHeldMemory = new AtomicLong();
 
-  public Accountant(@Nullable Accountant parent, String name, long reservation, long maxAllocation) {
+  public Accountant(
+      @Nullable Accountant parent, String name, long reservation, long maxAllocation) {
     Preconditions.checkNotNull(name, "name must not be null");
-    Preconditions.checkArgument(reservation >= 0, "The initial reservation size must be non-negative.");
-    Preconditions.checkArgument(maxAllocation >= 0, "The maximum allocation limit must be non-negative.");
-    Preconditions.checkArgument(reservation <= maxAllocation,
+    Preconditions.checkArgument(
+        reservation >= 0, "The initial reservation size must be non-negative.");
+    Preconditions.checkArgument(
+        maxAllocation >= 0, "The maximum allocation limit must be non-negative.");
+    Preconditions.checkArgument(
+        reservation <= maxAllocation,
         "The initial reservation size must be <= the maximum allocation.");
-    Preconditions.checkArgument(reservation == 0 || parent != null, "The root accountant can't reserve memory.");
+    Preconditions.checkArgument(
+        reservation == 0 || parent != null, "The root accountant can't reserve memory.");
 
     this.parent = parent;
     this.name = name;
@@ -78,9 +73,12 @@ public Accountant(@Nullable Accountant parent, String name, long reservation, lo
       // we will allocate a reservation from our parent.
       final AllocationOutcome outcome = parent.allocateBytes(reservation);
       if (!outcome.isOk()) {
-        throw new OutOfMemoryException(String.format(
-                "Failure trying to allocate initial reservation for Allocator. " +
-                        "Attempted to allocate %d bytes.", reservation), outcome.getDetails());
+        throw new OutOfMemoryException(
+            String.format(
+                "Failure trying to allocate initial reservation for Allocator. "
+                    + "Attempted to allocate %d bytes.",
+                reservation),
+            outcome.getDetails());
       }
     }
   }
@@ -98,16 +96,18 @@ AllocationOutcome allocateBytes(long size) {
       return AllocationOutcome.SUCCESS_INSTANCE;
     } else {
       // Try again, but with details this time.
-      // Populating details only on failures avoids performance overhead in the common case (success case).
+      // Populating details only on failures avoids performance overhead in the common case (success
+      // case).
       AllocationOutcomeDetails details = new AllocationOutcomeDetails();
       status = allocateBytesInternal(size, details);
       return new AllocationOutcome(status, details);
     }
   }
 
-  private AllocationOutcome.Status allocateBytesInternal(long size, @Nullable AllocationOutcomeDetails details) {
-    final AllocationOutcome.Status status = allocate(size,
-        true /*incomingUpdatePeek*/, false /*forceAllocation*/, details);
+  private AllocationOutcome.Status allocateBytesInternal(
+      long size, @Nullable AllocationOutcomeDetails details) {
+    final AllocationOutcome.Status status =
+        allocate(size, true /*incomingUpdatePeek*/, false /*forceAllocation*/, details);
     if (!status.isOk()) {
       releaseBytes(size);
     }
@@ -135,7 +135,6 @@ private void updatePeak() {
     }
   }
 
-
   /**
    * Increase the accounting. Returns whether the allocation fit within limits.
    *
@@ -149,33 +148,32 @@ public boolean forceAllocate(long size) {
 
   /**
    * Internal method for allocation. This takes a forced approach to allocation to ensure that we
-   * manage reservation
-   * boundary issues consistently. Allocation is always done through the entire tree. The two
-   * options that we influence
-   * are whether the allocation should be forced and whether or not the peak memory allocation
-   * should be updated. If at
-   * some point during allocation escalation we determine that the allocation is no longer
-   * possible, we will continue to
-   * do a complete and consistent allocation but we will stop updating the peak allocation. We do
-   * this because we know
-   * that we will be directly unwinding this allocation (and thus never actually making the
-   * allocation). If force
-   * allocation is passed, then we continue to update the peak limits since we now know that this
-   * allocation will occur
-   * despite our moving past one or more limits.
+   * manage reservation boundary issues consistently. Allocation is always done through the entire
+   * tree. The two options that we influence are whether the allocation should be forced and whether
+   * or not the peak memory allocation should be updated. If at some point during allocation
+   * escalation we determine that the allocation is no longer possible, we will continue to do a
+   * complete and consistent allocation but we will stop updating the peak allocation. We do this
+   * because we know that we will be directly unwinding this allocation (and thus never actually
+   * making the allocation). If force allocation is passed, then we continue to update the peak
+   * limits since we now know that this allocation will occur despite our moving past one or more
+   * limits.
    *
-   * @param size               The size of the allocation.
+   * @param size The size of the allocation.
    * @param incomingUpdatePeak Whether we should update the local peak for this allocation.
-   * @param forceAllocation    Whether we should force the allocation.
+   * @param forceAllocation Whether we should force the allocation.
    * @return The outcome of the allocation.
    */
-  private AllocationOutcome.Status allocate(final long size, final boolean incomingUpdatePeak,
-      final boolean forceAllocation, @Nullable AllocationOutcomeDetails details) {
+  private AllocationOutcome.Status allocate(
+      final long size,
+      final boolean incomingUpdatePeak,
+      final boolean forceAllocation,
+      @Nullable AllocationOutcomeDetails details) {
     final long oldLocal = locallyHeldMemory.getAndAdd(size);
     final long newLocal = oldLocal + size;
     // Borrowed from Math.addExact (but avoid exception here)
     // Overflow if result has opposite sign of both arguments
-    // No need to reset locallyHeldMemory on overflow; allocateBytesInternal will releaseBytes on failure
+    // No need to reset locallyHeldMemory on overflow; allocateBytesInternal will releaseBytes on
+    // failure
     final boolean overflow = ((oldLocal ^ newLocal) & (size ^ newLocal)) < 0;
     final long beyondReservation = newLocal - reservation;
     final boolean beyondLimit = overflow || newLocal > allocationLimit.get();
@@ -203,8 +201,10 @@ private AllocationOutcome.Status allocate(final long size, final boolean incomin
     if (beyondLimit) {
       finalOutcome = AllocationOutcome.Status.FAILED_LOCAL;
     } else {
-      finalOutcome = parentOutcome.isOk() ? AllocationOutcome.Status.SUCCESS
-          : AllocationOutcome.Status.FAILED_PARENT;
+      finalOutcome =
+          parentOutcome.isOk()
+              ? AllocationOutcome.Status.SUCCESS
+              : AllocationOutcome.Status.FAILED_PARENT;
     }
 
     if (updatePeak) {
@@ -233,9 +233,7 @@ public boolean isOverLimit() {
     return getAllocatedMemory() > getLimit() || (parent != null && parent.isOverLimit());
   }
 
-  /**
-   * Close this Accountant. This will release any reservation bytes back to a parent Accountant.
-   */
+  /** Close this Accountant. This will release any reservation bytes back to a parent Accountant. */
   @Override
   public void close() {
     // return memory reservation to parent allocator.
@@ -272,8 +270,8 @@ public long getInitReservation() {
   }
 
   /**
-   * Set the maximum amount of memory that can be allocated in the this Accountant before failing
-   * an allocation.
+   * Set the maximum amount of memory that can be allocated in the this Accountant before failing an
+   * allocation.
    *
    * @param newLimit The limit in bytes.
    */
@@ -282,9 +280,8 @@ public void setLimit(long newLimit) {
   }
 
   /**
-   * Return the current amount of allocated memory that this Accountant is managing accounting
-   * for. Note this does not
-   * include reservation memory that hasn't been allocated.
+   * Return the current amount of allocated memory that this Accountant is managing accounting for.
+   * Note this does not include reservation memory that hasn't been allocated.
    *
    * @return Currently allocate memory in bytes.
    */
@@ -311,5 +308,4 @@ public long getHeadroom() {
     long reservedHeadroom = Math.max(0, reservation - locallyHeldMemory.get());
     return Math.min(localHeadroom, parent.getHeadroom() + reservedHeadroom);
   }
-
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationListener.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationListener.java
index b8de6d819eaf8..b82099ee3a428 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationListener.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationListener.java
@@ -14,14 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 /**
  * An allocation listener being notified for allocation/deallocation
  *
- * <p>It might be called from multiple threads if the allocator hierarchy shares a listener, in which
- * case, the provider should take care of making the implementation thread-safe.
+ * <p>It might be called from multiple threads if the allocator hierarchy shares a listener, in
+ * which case, the provider should take care of making the implementation thread-safe.
  */
 public interface AllocationListener {
 
@@ -34,8 +33,7 @@ public interface AllocationListener {
    *
    * @param size the buffer size being allocated
    */
-  default void onPreAllocation(long size) {
-  }
+  default void onPreAllocation(long size) {}
 
   /**
    * Called each time a new buffer has been allocated.
@@ -44,26 +42,24 @@ default void onPreAllocation(long size) {
    *
    * @param size the buffer size being allocated
    */
-  default void onAllocation(long size) {
-  }
+  default void onAllocation(long size) {}
 
   /**
    * Informed each time a buffer is released from allocation.
    *
    * <p>An exception cannot be thrown by this method.
+   *
    * @param size The size of the buffer being released.
    */
-  default void onRelease(long size) {
-  }
-
+  default void onRelease(long size) {}
 
   /**
    * Called whenever an allocation failed, giving the caller a chance to create some space in the
    * allocator (either by freeing some resource, or by changing the limit), and, if successful,
    * allowing the allocator to retry the allocation.
    *
-   * @param size     the buffer size that was being allocated
-   * @param outcome  the outcome of the failed allocation. Carries information of what failed
+   * @param size the buffer size that was being allocated
+   * @param outcome the outcome of the failed allocation. Carries information of what failed
    * @return true, if the allocation can be retried; false if the allocation should fail
    */
   default boolean onFailedAllocation(long size, AllocationOutcome outcome) {
@@ -74,10 +70,9 @@ default boolean onFailedAllocation(long size, AllocationOutcome outcome) {
    * Called immediately after a child allocator was added to the parent allocator.
    *
    * @param parentAllocator The parent allocator to which a child was added
-   * @param childAllocator  The child allocator that was just added
+   * @param childAllocator The child allocator that was just added
    */
-  default void onChildAdded(BufferAllocator parentAllocator, BufferAllocator childAllocator) {
-  }
+  default void onChildAdded(BufferAllocator parentAllocator, BufferAllocator childAllocator) {}
 
   /**
    * Called immediately after a child allocator was removed from the parent allocator.
@@ -85,6 +80,5 @@ default void onChildAdded(BufferAllocator parentAllocator, BufferAllocator child
    * @param parentAllocator The parent allocator from which a child was removed
    * @param childAllocator The child allocator that was just removed
    */
-  default void onChildRemoved(BufferAllocator parentAllocator, BufferAllocator childAllocator) {
-  }
+  default void onChildRemoved(BufferAllocator parentAllocator, BufferAllocator childAllocator) {}
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationManager.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationManager.java
index 6ccefdd9c1695..e9dd8cb9d28f4 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationManager.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationManager.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 import org.apache.arrow.util.Preconditions;
@@ -23,35 +22,47 @@
 /**
  * An AllocationManager is the implementation of a physical memory allocation.
  *
- * <p>Manages the relationship between the allocators and a particular memory allocation. Ensures that
- * one allocator owns the memory that multiple allocators may be referencing. Manages a BufferLedger between
- * each of its associated allocators. It does not track the reference count; that is the role of {@link BufferLedger}
- * (aka {@link ReferenceManager}).
+ * <p>Manages the relationship between the allocators and a particular memory allocation. Ensures
+ * that one allocator owns the memory that multiple allocators may be referencing. Manages a
+ * BufferLedger between each of its associated allocators. It does not track the reference count;
+ * that is the role of {@link BufferLedger} (aka {@link ReferenceManager}).
  *
- * <p>This is a public interface implemented by concrete allocator implementations (e.g. Netty or Unsafe).
+ * <p>This is a public interface implemented by concrete allocator implementations (e.g. Netty or
+ * Unsafe).
  *
  * <p>Threading: AllocationManager manages thread-safety internally. Operations within the context
- * of a single BufferLedger are lockless in nature and can be leveraged by multiple threads. Operations that cross the
- * context of two ledgers will acquire a lock on the AllocationManager instance. Important note, there is one
- * AllocationManager per physical buffer allocation. As such, there will be thousands of these in a
- * typical query. The contention of acquiring a lock on AllocationManager should be very low.
+ * of a single BufferLedger are lockless in nature and can be leveraged by multiple threads.
+ * Operations that cross the context of two ledgers will acquire a lock on the AllocationManager
+ * instance. Important note, there is one AllocationManager per physical buffer allocation. As such,
+ * there will be thousands of these in a typical query. The contention of acquiring a lock on
+ * AllocationManager should be very low.
  */
 public abstract class AllocationManager {
-  // The RootAllocator we are associated with. An allocation can only ever be associated with a single RootAllocator.
+  // The RootAllocator we are associated with. An allocation can only ever be associated with a
+  // single RootAllocator.
   private final BufferAllocator root;
-  // An allocation can be tracked by multiple allocators. (This is because an allocator is more like a ledger.)
-  // All such allocators track reference counts individually, via BufferLedger instances. When an individual
-  // reference count reaches zero, the allocator will be dissociated from this allocation. If that was via the
-  // owningLedger, then no more allocators should be tracking this allocation, and the allocation will be freed.
+  // An allocation can be tracked by multiple allocators. (This is because an allocator is more like
+  // a ledger.)
+  // All such allocators track reference counts individually, via BufferLedger instances. When an
+  // individual
+  // reference count reaches zero, the allocator will be dissociated from this allocation. If that
+  // was via the
+  // owningLedger, then no more allocators should be tracking this allocation, and the allocation
+  // will be freed.
   // ARROW-1627: Trying to minimize memory overhead caused by previously used IdentityHashMap
-  private final LowCostIdentityHashMap<BufferAllocator, BufferLedger> map = new LowCostIdentityHashMap<>();
+  private final LowCostIdentityHashMap<BufferAllocator, BufferLedger> map =
+      new LowCostIdentityHashMap<>();
   // The primary BufferLedger (i.e. reference count) tracking this allocation.
-  // This is mostly a semantic constraint on the API user: if the reference count reaches 0 in the owningLedger, then
-  // there are not supposed to be any references through other allocators. In practice, this doesn't do anything
-  // as the implementation just forces ownership to be transferred to one of the other extant references.
+  // This is mostly a semantic constraint on the API user: if the reference count reaches 0 in the
+  // owningLedger, then
+  // there are not supposed to be any references through other allocators. In practice, this doesn't
+  // do anything
+  // as the implementation just forces ownership to be transferred to one of the other extant
+  // references.
   private volatile @Nullable BufferLedger owningLedger;
 
-  @SuppressWarnings("nullness:method.invocation") //call to associate(a, b) not allowed on the given receiver
+  @SuppressWarnings(
+      "nullness:method.invocation") // call to associate(a, b) not allowed on the given receiver
   protected AllocationManager(BufferAllocator accountingAllocator) {
     Preconditions.checkNotNull(accountingAllocator);
     accountingAllocator.assertOpen();
@@ -63,7 +74,8 @@ protected AllocationManager(BufferAllocator accountingAllocator) {
     this.owningLedger = associate(accountingAllocator, false);
   }
 
-  @Nullable BufferLedger getOwningLedger() {
+  @Nullable
+  BufferLedger getOwningLedger() {
     return owningLedger;
   }
 
@@ -72,12 +84,12 @@ void setOwningLedger(final BufferLedger ledger) {
   }
 
   /**
-   * Associate the existing underlying buffer with a new allocator. This will increase the
-   * reference count on the corresponding buffer ledger by 1.
+   * Associate the existing underlying buffer with a new allocator. This will increase the reference
+   * count on the corresponding buffer ledger by 1.
    *
    * @param allocator The target allocator to associate this buffer with.
-   * @return The reference manager (new or existing) that associates the underlying
-   *         buffer to this new ledger.
+   * @return The reference manager (new or existing) that associates the underlying buffer to this
+   *     new ledger.
    */
   BufferLedger associate(final BufferAllocator allocator) {
     return associate(allocator, true);
@@ -85,8 +97,9 @@ BufferLedger associate(final BufferAllocator allocator) {
 
   private BufferLedger associate(final BufferAllocator allocator, final boolean retain) {
     allocator.assertOpen();
-    Preconditions.checkState(root == allocator.getRoot(),
-          "A buffer can only be associated between two allocators that share the same root");
+    Preconditions.checkState(
+        root == allocator.getRoot(),
+        "A buffer can only be associated between two allocators that share the same root");
 
     synchronized (this) {
       BufferLedger ledger = map.get(allocator);
@@ -109,7 +122,8 @@ private BufferLedger associate(final BufferAllocator allocator, final boolean re
 
       // store the mapping for <allocator, reference manager>
       BufferLedger oldLedger = map.put(ledger);
-      Preconditions.checkState(oldLedger == null,
+      Preconditions.checkState(
+          oldLedger == null,
           "Detected inconsistent state: A reference manager already exists for this allocator");
 
       if (allocator instanceof BaseAllocator) {
@@ -123,10 +137,9 @@ private BufferLedger associate(final BufferAllocator allocator, final boolean re
 
   /**
    * The way that a particular ReferenceManager (BufferLedger) communicates back to the
-   * AllocationManager that it no longer needs to hold a reference to a particular
-   * piece of memory. Reference manager needs to hold a lock to invoke this method
-   * It is called when the shared refcount of all the ArrowBufs managed by the
-   * calling ReferenceManager drops to 0.
+   * AllocationManager that it no longer needs to hold a reference to a particular piece of memory.
+   * Reference manager needs to hold a lock to invoke this method It is called when the shared
+   * refcount of all the ArrowBufs managed by the calling ReferenceManager drops to 0.
    */
   void release(final BufferLedger ledger) {
     final BufferAllocator allocator = ledger.getAllocator();
@@ -134,10 +147,11 @@ void release(final BufferLedger ledger) {
 
     // remove the <BaseAllocator, BufferLedger> mapping for the allocator
     // of calling BufferLedger
-    Preconditions.checkState(map.containsKey(allocator),
-            "Expecting a mapping for allocator and reference manager");
+    Preconditions.checkState(
+        map.containsKey(allocator), "Expecting a mapping for allocator and reference manager");
     final BufferLedger oldLedger = map.remove(allocator);
-    Preconditions.checkState(oldLedger != null, "Expecting a mapping for allocator and reference manager");
+    Preconditions.checkState(
+        oldLedger != null, "Expecting a mapping for allocator and reference manager");
     BufferAllocator oldAllocator = oldLedger.getAllocator();
     if (oldAllocator instanceof BaseAllocator) {
       // needed for debug only: tell the allocator that AllocationManager is removing a
@@ -169,8 +183,9 @@ void release(final BufferLedger ledger) {
     } else {
       // the release call was made by a non-owning reference manager, so after remove there have
       // to be 1 or more <allocator, reference manager> mappings
-      Preconditions.checkState(map.size() > 0,
-              "The final removal of reference manager should be connected to owning reference manager");
+      Preconditions.checkState(
+          map.size() > 0,
+          "The final removal of reference manager should be connected to owning reference manager");
     }
   }
 
@@ -183,27 +198,23 @@ void release(final BufferLedger ledger) {
    */
   public abstract long getSize();
 
-  /**
-   * Return the absolute memory address pointing to the fist byte of underlying memory chunk.
-   */
+  /** Return the absolute memory address pointing to the fist byte of underlying memory chunk. */
   protected abstract long memoryAddress();
 
-  /**
-   * Release the underlying memory chunk.
-   */
+  /** Release the underlying memory chunk. */
   protected abstract void release0();
 
   /**
-   * A factory interface for creating {@link AllocationManager}.
-   * One may extend this interface to use a user-defined AllocationManager implementation.
+   * A factory interface for creating {@link AllocationManager}. One may extend this interface to
+   * use a user-defined AllocationManager implementation.
    */
   public interface Factory {
 
     /**
      * Create an {@link AllocationManager}.
      *
-     * @param accountingAllocator The allocator that are expected to be associated with newly created AllocationManager.
-     *                            Currently it is always equivalent to "this"
+     * @param accountingAllocator The allocator that are expected to be associated with newly
+     *     created AllocationManager. Currently it is always equivalent to "this"
      * @param size Size (in bytes) of memory managed by the AllocationManager
      * @return The created AllocationManager used by this allocator
      */
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationOutcome.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationOutcome.java
index 21a57eee49b11..d6361f0461bc1 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationOutcome.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationOutcome.java
@@ -14,17 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 import java.util.Optional;
-
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-
-/**
- * Describes the type of outcome that occurred when trying to account for allocation of memory.
- */
+/** Describes the type of outcome that occurred when trying to account for allocation of memory. */
 public class AllocationOutcome {
   private final Status status;
   private final @Nullable AllocationOutcomeDetails details;
@@ -41,6 +36,7 @@ public class AllocationOutcome {
 
   /**
    * Get the status of the allocation.
+   *
    * @return status code.
    */
   public Status getStatus() {
@@ -49,6 +45,7 @@ public Status getStatus() {
 
   /**
    * Get additional details of the allocation (like the status at each allocator in the hierarchy).
+   *
    * @return details of allocation
    */
   public Optional<AllocationOutcomeDetails> getDetails() {
@@ -57,34 +54,25 @@ public Optional<AllocationOutcomeDetails> getDetails() {
 
   /**
    * Returns true if the allocation was a success.
+   *
    * @return true if allocation was successful, false otherwise.
    */
   public boolean isOk() {
     return status.isOk();
   }
 
-  /**
-   * Allocation status code.
-   */
+  /** Allocation status code. */
   public enum Status {
-    /**
-     * Allocation succeeded.
-     */
+    /** Allocation succeeded. */
     SUCCESS(true),
 
-    /**
-     * Allocation succeeded but only because the allocator was forced to move beyond a limit.
-     */
+    /** Allocation succeeded but only because the allocator was forced to move beyond a limit. */
     FORCED_SUCCESS(true),
 
-    /**
-     * Allocation failed because the local allocator's limits were exceeded.
-     */
+    /** Allocation failed because the local allocator's limits were exceeded. */
     FAILED_LOCAL(false),
 
-    /**
-     * Allocation failed because a parent allocator's limits were exceeded.
-     */
+    /** Allocation failed because a parent allocator's limits were exceeded. */
     FAILED_PARENT(false);
 
     private final boolean ok;
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationOutcomeDetails.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationOutcomeDetails.java
index 3ceda71cce0fe..61db6898127c4 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationOutcomeDetails.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationOutcomeDetails.java
@@ -14,18 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
-
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-
-/**
- * Captures details of allocation for each accountant in the hierarchical chain.
- */
+/** Captures details of allocation for each accountant in the hierarchical chain. */
 public class AllocationOutcomeDetails {
   Deque<Entry> allocEntries;
 
@@ -33,8 +28,12 @@ public class AllocationOutcomeDetails {
     allocEntries = new ArrayDeque<>();
   }
 
-  void pushEntry(Accountant accountant, long totalUsedBeforeAllocation, long requestedSize,
-      long allocatedSize, boolean allocationFailed) {
+  void pushEntry(
+      Accountant accountant,
+      long totalUsedBeforeAllocation,
+      long requestedSize,
+      long allocatedSize,
+      boolean allocationFailed) {
 
     Entry top = allocEntries.peekLast();
     if (top != null && top.allocationFailed) {
@@ -42,12 +41,14 @@ void pushEntry(Accountant accountant, long totalUsedBeforeAllocation, long reque
       return;
     }
 
-    allocEntries.addLast(new Entry(accountant, totalUsedBeforeAllocation, requestedSize,
-        allocatedSize, allocationFailed));
+    allocEntries.addLast(
+        new Entry(
+            accountant, totalUsedBeforeAllocation, requestedSize, allocatedSize, allocationFailed));
   }
 
   /**
    * Get the allocator that caused the failure.
+   *
    * @return the allocator that caused failure, null if there was no failure.
    */
   public @Nullable BufferAllocator getFailedAllocator() {
@@ -67,9 +68,7 @@ public String toString() {
     return sb.toString();
   }
 
-  /**
-   * Outcome of the allocation request at one accountant in the hierarchy.
-   */
+  /** Outcome of the allocation request at one accountant in the hierarchy. */
   public static class Entry {
     private final Accountant accountant;
 
@@ -82,8 +81,12 @@ public static class Entry {
     private final long allocatedSize;
     private final boolean allocationFailed;
 
-    Entry(Accountant accountant, long totalUsedBeforeAllocation, long requestedSize,
-        long allocatedSize, boolean allocationFailed) {
+    Entry(
+        Accountant accountant,
+        long totalUsedBeforeAllocation,
+        long requestedSize,
+        long allocatedSize,
+        boolean allocationFailed) {
       this.accountant = accountant;
       this.limit = accountant.getLimit();
       this.used = totalUsedBeforeAllocation;
@@ -119,17 +122,22 @@ public boolean isAllocationFailed() {
 
     @Override
     public String toString() {
-      return new StringBuilder()
-          .append("allocator[" + accountant.getName() + "]")
-          .append(" reservation: " + accountant.getInitReservation())
-          .append(" limit: " + limit)
-          .append(" used: " + used)
-          .append(" requestedSize: " + requestedSize)
-          .append(" allocatedSize: " + allocatedSize)
-          .append(" localAllocationStatus: " + (allocationFailed ? "fail" : "success"))
-          .append("\n")
-          .toString();
+      return "allocator["
+          + accountant.getName()
+          + "]"
+          + " reservation: "
+          + accountant.getInitReservation()
+          + " limit: "
+          + limit
+          + " used: "
+          + used
+          + " requestedSize: "
+          + requestedSize
+          + " allocatedSize: "
+          + allocatedSize
+          + " localAllocationStatus: "
+          + (allocationFailed ? "fail" : "success")
+          + "\n";
     }
   }
-
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationReservation.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationReservation.java
index c672dc48d79ca..20066ed14b65a 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationReservation.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocationReservation.java
@@ -14,27 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 /**
  * Supports cumulative allocation reservation. Clients may increase the size of the reservation
- * repeatedly until they
- * call for an allocation of the current total size. The reservation can only be used once, and
- * will throw an exception
- * if it is used more than once.
- * <p>
- * For the purposes of airtight memory accounting, the reservation must be close()d whether it is
- * used or not.
- * This is not threadsafe.
- * </p>
+ * repeatedly until they call for an allocation of the current total size. The reservation can only
+ * be used once, and will throw an exception if it is used more than once.
+ *
+ * <p>For the purposes of airtight memory accounting, the reservation must be close()d whether it is
+ * used or not. This is not threadsafe.
  */
 public interface AllocationReservation extends AutoCloseable {
 
   /**
    * Add to the current reservation.
    *
-   * <p>Adding may fail if the allocator is not allowed to consume any more space.</p>
+   * <p>Adding may fail if the allocator is not allowed to consume any more space.
    *
    * @param nBytes the number of bytes to add
    * @return true if the addition is possible, false otherwise
@@ -45,7 +40,7 @@ public interface AllocationReservation extends AutoCloseable {
   /**
    * Requests a reservation of additional space.
    *
-   * <p>The implementation of the allocator's inner class provides this.</p>
+   * <p>The implementation of the allocator's inner class provides this.
    *
    * @param nBytes the amount to reserve
    * @return true if the reservation can be satisfied, false otherwise
@@ -55,8 +50,8 @@ public interface AllocationReservation extends AutoCloseable {
   /**
    * Allocate a buffer whose size is the total of all the add()s made.
    *
-   * <p>The allocation request can still fail, even if the amount of space
-   * requested is available, if the allocation cannot be made contiguously.</p>
+   * <p>The allocation request can still fail, even if the amount of space requested is available,
+   * if the allocation cannot be made contiguously.
    *
    * @return the buffer, or null, if the request cannot be satisfied
    * @throws IllegalStateException if called more than once
@@ -84,5 +79,6 @@ public interface AllocationReservation extends AutoCloseable {
    */
   boolean isClosed();
 
+  @Override
   void close();
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocatorClosedException.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocatorClosedException.java
index 39c2ef82e0994..eba71f24c880d 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocatorClosedException.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/AllocatorClosedException.java
@@ -14,13 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
-/**
- * Exception thrown when a closed BufferAllocator is used. Note
- * this is an unchecked exception.
- */
+/** Exception thrown when a closed BufferAllocator is used. Note this is an unchecked exception. */
 @SuppressWarnings("serial")
 public class AllocatorClosedException extends RuntimeException {
 
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ArrowBuf.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ArrowBuf.java
index 112d36ece0418..24a0ea0761ec0 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ArrowBuf.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ArrowBuf.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
@@ -26,7 +25,6 @@
 import java.nio.ByteOrder;
 import java.nio.ReadOnlyBufferException;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.apache.arrow.memory.BaseAllocator.Verbosity;
 import org.apache.arrow.memory.util.CommonUtil;
 import org.apache.arrow.memory.util.HistoricalLog;
@@ -36,24 +34,18 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
- * ArrowBuf serves as a facade over underlying memory by providing
- * several access APIs to read/write data into a chunk of direct
- * memory. All the accounting, ownership and reference management
- * is done by {@link ReferenceManager} and ArrowBuf can work
- * with a custom user provided implementation of ReferenceManager
- * <p>
- * Two important instance variables of an ArrowBuf:
- * (1) address - starting virtual address in the underlying memory
- * chunk that this ArrowBuf has access to
- * (2) length - length (in bytes) in the underlying memory chunk
- * that this ArrowBuf has access to
- * </p>
- * <p>
- * The management (allocation, deallocation, reference counting etc) for
- * the memory chunk is not done by ArrowBuf.
- * Default implementation of ReferenceManager, allocation is in
- * {@link BaseAllocator}, {@link BufferLedger} and {@link AllocationManager}
- * </p>
+ * ArrowBuf serves as a facade over underlying memory by providing several access APIs to read/write
+ * data into a chunk of direct memory. All the accounting, ownership and reference management is
+ * done by {@link ReferenceManager} and ArrowBuf can work with a custom user provided implementation
+ * of ReferenceManager
+ *
+ * <p>Two important instance variables of an ArrowBuf: (1) address - starting virtual address in the
+ * underlying memory chunk that this ArrowBuf has access to (2) length - length (in bytes) in the
+ * underlying memory chunk that this ArrowBuf has access to
+ *
+ * <p>The management (allocation, deallocation, reference counting etc) for the memory chunk is not
+ * done by ArrowBuf. Default implementation of ReferenceManager, allocation is in {@link
+ * BaseAllocator}, {@link BufferLedger} and {@link AllocationManager}
  */
 public final class ArrowBuf implements AutoCloseable {
 
@@ -73,14 +65,17 @@ public final class ArrowBuf implements AutoCloseable {
   private final long addr;
   private long readerIndex;
   private long writerIndex;
-  private final @Nullable HistoricalLog historicalLog = BaseAllocator.DEBUG ?
-          new HistoricalLog(BaseAllocator.DEBUG_LOG_LENGTH, "ArrowBuf[%d]", id) : null;
+  private final @Nullable HistoricalLog historicalLog =
+      BaseAllocator.DEBUG
+          ? new HistoricalLog(BaseAllocator.DEBUG_LOG_LENGTH, "ArrowBuf[%d]", id)
+          : null;
   private volatile long capacity;
 
   /**
    * Constructs a new ArrowBuf.
    *
-   * @param referenceManager The memory manager to track memory usage and reference count of this buffer
+   * @param referenceManager The memory manager to track memory usage and reference count of this
+   *     buffer
    * @param capacity The capacity in bytes of this buffer
    */
   public ArrowBuf(
@@ -107,11 +102,10 @@ public int refCnt() {
    * Allows a function to determine whether not reading a particular string of bytes is valid.
    *
    * <p>Will throw an exception if the memory is not readable for some reason. Only doesn't
-   * something in the case that
-   * AssertionUtil.BOUNDS_CHECKING_ENABLED is true.
+   * something in the case that AssertionUtil.BOUNDS_CHECKING_ENABLED is true.
    *
    * @param start The starting position of the bytes to be read.
-   * @param end   The exclusive endpoint of the bytes to be read.
+   * @param end The exclusive endpoint of the bytes to be read.
    */
   public void checkBytes(long start, long end) {
     if (BoundsChecking.BOUNDS_CHECKING_ENABLED) {
@@ -119,9 +113,7 @@ public void checkBytes(long start, long end) {
     }
   }
 
-  /**
-   * For get/set operations, reference count should be >= 1.
-   */
+  /** For get/set operations, reference count should be >= 1. */
   private void ensureAccessible() {
     if (this.refCnt() == 0) {
       throw new IllegalStateException("Ref count should be >= 1 for accessing the ArrowBuf");
@@ -130,6 +122,7 @@ private void ensureAccessible() {
 
   /**
    * Get reference manager for this ArrowBuf.
+   *
    * @return user provided implementation of {@link ReferenceManager}
    */
   public ReferenceManager getReferenceManager() {
@@ -141,7 +134,7 @@ public long capacity() {
   }
 
   /**
-   * Adjusts the capacity of this buffer.  Size increases are NOT supported.
+   * Adjusts the capacity of this buffer. Size increases are NOT supported.
    *
    * @param newCapacity Must be in in the range [0, length).
    */
@@ -158,42 +151,36 @@ public synchronized ArrowBuf capacity(long newCapacity) {
       return this;
     }
 
-    throw new UnsupportedOperationException("Buffers don't support resizing that increases the size.");
+    throw new UnsupportedOperationException(
+        "Buffers don't support resizing that increases the size.");
   }
 
-  /**
-   * Returns the byte order of elements in this buffer.
-   */
+  /** Returns the byte order of elements in this buffer. */
   public ByteOrder order() {
     return ByteOrder.nativeOrder();
   }
 
-  /**
-   * Returns the number of bytes still available to read in this buffer.
-   */
+  /** Returns the number of bytes still available to read in this buffer. */
   public long readableBytes() {
-    Preconditions.checkState(writerIndex >= readerIndex,
-            "Writer index cannot be less than reader index");
+    Preconditions.checkState(
+        writerIndex >= readerIndex, "Writer index cannot be less than reader index");
     return writerIndex - readerIndex;
   }
 
   /**
-   * Returns the number of bytes still available to write into this buffer before capacity is reached.
+   * Returns the number of bytes still available to write into this buffer before capacity is
+   * reached.
    */
   public long writableBytes() {
     return capacity() - writerIndex;
   }
 
-  /**
-   * Returns a slice of only the readable bytes in the buffer.
-   */
+  /** Returns a slice of only the readable bytes in the buffer. */
   public ArrowBuf slice() {
     return slice(readerIndex, readableBytes());
   }
 
-  /**
-   *  Returns a slice (view) starting at <code>index</code> with the given <code>length</code>.
-   */
+  /** Returns a slice (view) starting at <code>index</code> with the given <code>length</code>. */
   public ArrowBuf slice(long index, long length) {
 
     Preconditions.checkPositionIndex(index, this.capacity);
@@ -209,17 +196,12 @@ public ArrowBuf slice(long index, long length) {
     return newBuf;
   }
 
-  /**
-   * Make a nio byte buffer from this arrowbuf.
-   */
+  /** Make a nio byte buffer from this arrowbuf. */
   public ByteBuffer nioBuffer() {
     return nioBuffer(readerIndex, checkedCastToInt(readableBytes()));
   }
 
-
-  /**
-   *  Make a nio byte buffer from this ArrowBuf.
-   */
+  /** Make a nio byte buffer from this ArrowBuf. */
   public ByteBuffer nioBuffer(long index, int length) {
     chk(index, length);
     return getDirectBuffer(index, length);
@@ -283,22 +265,18 @@ private long addr(long index) {
     return addr + index;
   }
 
-
-
   /*-------------------------------------------------*
-   | Following are a set of fast path data set and   |
-   | get APIs to write/read data from ArrowBuf       |
-   | at a given index (0 based relative to this      |
-   | ArrowBuf and not relative to the underlying     |
-   | memory chunk).                                  |
-   |                                                 |
-   *-------------------------------------------------*/
-
-
+  | Following are a set of fast path data set and   |
+  | get APIs to write/read data from ArrowBuf       |
+  | at a given index (0 based relative to this      |
+  | ArrowBuf and not relative to the underlying     |
+  | memory chunk).                                  |
+  |                                                 |
+  *-------------------------------------------------*/
 
   /**
-   * Helper function to do bounds checking at a particular
-   * index for particular length of data.
+   * Helper function to do bounds checking at a particular index for particular length of data.
+   *
    * @param index index (0 based relative to this ArrowBuf)
    * @param length provided length of data for get/set
    */
@@ -317,16 +295,17 @@ private void checkIndexD(long index, long fieldLength) {
       if (historicalLog != null) {
         historicalLog.logHistory(logger);
       }
-      throw new IndexOutOfBoundsException(String.format(
-        "index: %d, length: %d (expected: range(0, %d))", index, fieldLength, capacity()));
+      throw new IndexOutOfBoundsException(
+          String.format(
+              "index: %d, length: %d (expected: range(0, %d))", index, fieldLength, capacity()));
     }
   }
 
   /**
-   * Get long value stored at a particular index in the
-   * underlying memory chunk this ArrowBuf has access to.
-   * @param index index (0 based relative to this ArrowBuf)
-   *              where the value will be read from
+   * Get long value stored at a particular index in the underlying memory chunk this ArrowBuf has
+   * access to.
+   *
+   * @param index index (0 based relative to this ArrowBuf) where the value will be read from
    * @return 8 byte long value
    */
   public long getLong(long index) {
@@ -335,10 +314,10 @@ public long getLong(long index) {
   }
 
   /**
-   * Set long value at a particular index in the
-   * underlying memory chunk this ArrowBuf has access to.
-   * @param index index (0 based relative to this ArrowBuf)
-   *              where the value will be written
+   * Set long value at a particular index in the underlying memory chunk this ArrowBuf has access
+   * to.
+   *
+   * @param index index (0 based relative to this ArrowBuf) where the value will be written
    * @param value value to write
    */
   public void setLong(long index, long value) {
@@ -347,10 +326,10 @@ public void setLong(long index, long value) {
   }
 
   /**
-   * Get float value stored at a particular index in the
-   * underlying memory chunk this ArrowBuf has access to.
-   * @param index index (0 based relative to this ArrowBuf)
-   *              where the value will be read from
+   * Get float value stored at a particular index in the underlying memory chunk this ArrowBuf has
+   * access to.
+   *
+   * @param index index (0 based relative to this ArrowBuf) where the value will be read from
    * @return 4 byte float value
    */
   public float getFloat(long index) {
@@ -358,10 +337,10 @@ public float getFloat(long index) {
   }
 
   /**
-   * Set float value at a particular index in the
-   * underlying memory chunk this ArrowBuf has access to.
-   * @param index index (0 based relative to this ArrowBuf)
-   *              where the value will be written
+   * Set float value at a particular index in the underlying memory chunk this ArrowBuf has access
+   * to.
+   *
+   * @param index index (0 based relative to this ArrowBuf) where the value will be written
    * @param value value to write
    */
   public void setFloat(long index, float value) {
@@ -370,10 +349,10 @@ public void setFloat(long index, float value) {
   }
 
   /**
-   * Get double value stored at a particular index in the
-   * underlying memory chunk this ArrowBuf has access to.
-   * @param index index (0 based relative to this ArrowBuf)
-   *              where the value will be read from
+   * Get double value stored at a particular index in the underlying memory chunk this ArrowBuf has
+   * access to.
+   *
+   * @param index index (0 based relative to this ArrowBuf) where the value will be read from
    * @return 8 byte double value
    */
   public double getDouble(long index) {
@@ -381,10 +360,10 @@ public double getDouble(long index) {
   }
 
   /**
-   * Set double value at a particular index in the
-   * underlying memory chunk this ArrowBuf has access to.
-   * @param index index (0 based relative to this ArrowBuf)
-   *              where the value will be written
+   * Set double value at a particular index in the underlying memory chunk this ArrowBuf has access
+   * to.
+   *
+   * @param index index (0 based relative to this ArrowBuf) where the value will be written
    * @param value value to write
    */
   public void setDouble(long index, double value) {
@@ -393,10 +372,10 @@ public void setDouble(long index, double value) {
   }
 
   /**
-   * Get char value stored at a particular index in the
-   * underlying memory chunk this ArrowBuf has access to.
-   * @param index index (0 based relative to this ArrowBuf)
-   *              where the value will be read from
+   * Get char value stored at a particular index in the underlying memory chunk this ArrowBuf has
+   * access to.
+   *
+   * @param index index (0 based relative to this ArrowBuf) where the value will be read from
    * @return 2 byte char value
    */
   public char getChar(long index) {
@@ -404,10 +383,10 @@ public char getChar(long index) {
   }
 
   /**
-   * Set char value at a particular index in the
-   * underlying memory chunk this ArrowBuf has access to.
-   * @param index index (0 based relative to this ArrowBuf)
-   *              where the value will be written
+   * Set char value at a particular index in the underlying memory chunk this ArrowBuf has access
+   * to.
+   *
+   * @param index index (0 based relative to this ArrowBuf) where the value will be written
    * @param value value to write
    */
   public void setChar(long index, int value) {
@@ -416,10 +395,10 @@ public void setChar(long index, int value) {
   }
 
   /**
-   * Get int value stored at a particular index in the
-   * underlying memory chunk this ArrowBuf has access to.
-   * @param index index (0 based relative to this ArrowBuf)
-   *              where the value will be read from
+   * Get int value stored at a particular index in the underlying memory chunk this ArrowBuf has
+   * access to.
+   *
+   * @param index index (0 based relative to this ArrowBuf) where the value will be read from
    * @return 4 byte int value
    */
   public int getInt(long index) {
@@ -428,10 +407,9 @@ public int getInt(long index) {
   }
 
   /**
-   * Set int value at a particular index in the
-   * underlying memory chunk this ArrowBuf has access to.
-   * @param index index (0 based relative to this ArrowBuf)
-   *              where the value will be written
+   * Set int value at a particular index in the underlying memory chunk this ArrowBuf has access to.
+   *
+   * @param index index (0 based relative to this ArrowBuf) where the value will be written
    * @param value value to write
    */
   public void setInt(long index, int value) {
@@ -440,10 +418,10 @@ public void setInt(long index, int value) {
   }
 
   /**
-   * Get short value stored at a particular index in the
-   * underlying memory chunk this ArrowBuf has access to.
-   * @param index index (0 based relative to this ArrowBuf)
-   *              where the value will be read from
+   * Get short value stored at a particular index in the underlying memory chunk this ArrowBuf has
+   * access to.
+   *
+   * @param index index (0 based relative to this ArrowBuf) where the value will be read from
    * @return 2 byte short value
    */
   public short getShort(long index) {
@@ -452,10 +430,10 @@ public short getShort(long index) {
   }
 
   /**
-   * Set short value at a particular index in the
-   * underlying memory chunk this ArrowBuf has access to.
-   * @param index index (0 based relative to this ArrowBuf)
-   *              where the value will be written
+   * Set short value at a particular index in the underlying memory chunk this ArrowBuf has access
+   * to.
+   *
+   * @param index index (0 based relative to this ArrowBuf) where the value will be written
    * @param value value to write
    */
   public void setShort(long index, int value) {
@@ -463,10 +441,10 @@ public void setShort(long index, int value) {
   }
 
   /**
-   * Set short value at a particular index in the
-   * underlying memory chunk this ArrowBuf has access to.
-   * @param index index (0 based relative to this ArrowBuf)
-   *              where the value will be written
+   * Set short value at a particular index in the underlying memory chunk this ArrowBuf has access
+   * to.
+   *
+   * @param index index (0 based relative to this ArrowBuf) where the value will be written
    * @param value value to write
    */
   public void setShort(long index, short value) {
@@ -475,10 +453,10 @@ public void setShort(long index, short value) {
   }
 
   /**
-   * Set byte value at a particular index in the
-   * underlying memory chunk this ArrowBuf has access to.
-   * @param index index (0 based relative to this ArrowBuf)
-   *              where the value will be written
+   * Set byte value at a particular index in the underlying memory chunk this ArrowBuf has access
+   * to.
+   *
+   * @param index index (0 based relative to this ArrowBuf) where the value will be written
    * @param value value to write
    */
   public void setByte(long index, int value) {
@@ -487,10 +465,10 @@ public void setByte(long index, int value) {
   }
 
   /**
-   * Set byte value at a particular index in the
-   * underlying memory chunk this ArrowBuf has access to.
-   * @param index index (0 based relative to this ArrowBuf)
-   *              where the value will be written
+   * Set byte value at a particular index in the underlying memory chunk this ArrowBuf has access
+   * to.
+   *
+   * @param index index (0 based relative to this ArrowBuf) where the value will be written
    * @param value value to write
    */
   public void setByte(long index, byte value) {
@@ -499,10 +477,10 @@ public void setByte(long index, byte value) {
   }
 
   /**
-   * Get byte value stored at a particular index in the
-   * underlying memory chunk this ArrowBuf has access to.
-   * @param index index (0 based relative to this ArrowBuf)
-   *              where the value will be read from
+   * Get byte value stored at a particular index in the underlying memory chunk this ArrowBuf has
+   * access to.
+   *
+   * @param index index (0 based relative to this ArrowBuf) where the value will be read from
    * @return byte value
    */
   public byte getByte(long index) {
@@ -510,20 +488,16 @@ public byte getByte(long index) {
     return MemoryUtil.UNSAFE.getByte(addr(index));
   }
 
-
-
   /*--------------------------------------------------*
-   | Following are another set of data set APIs       |
-   | that directly work with writerIndex              |
-   |                                                  |
-   *--------------------------------------------------*/
-
-
+  | Following are another set of data set APIs       |
+  | that directly work with writerIndex              |
+  |                                                  |
+  *--------------------------------------------------*/
 
   /**
-   * Helper function to do bound checking w.r.t writerIndex
-   * by checking if we can set "length" bytes of data at the
-   * writerIndex in this ArrowBuf.
+   * Helper function to do bound checking w.r.t writerIndex by checking if we can set "length" bytes
+   * of data at the writerIndex in this ArrowBuf.
+   *
    * @param length provided length of data for set
    */
   private void ensureWritable(final int length) {
@@ -534,15 +508,17 @@ private void ensureWritable(final int length) {
       // check bounds
       if (length > writableBytes()) {
         throw new IndexOutOfBoundsException(
-          String.format("writerIndex(%d) + length(%d) exceeds capacity(%d)", writerIndex, length, capacity()));
+            String.format(
+                "writerIndex(%d) + length(%d) exceeds capacity(%d)",
+                writerIndex, length, capacity()));
       }
     }
   }
 
   /**
-   * Helper function to do bound checking w.r.t readerIndex
-   * by checking if we can read "length" bytes of data at the
-   * readerIndex in this ArrowBuf.
+   * Helper function to do bound checking w.r.t readerIndex by checking if we can read "length"
+   * bytes of data at the readerIndex in this ArrowBuf.
+   *
    * @param length provided length of data for get
    */
   private void ensureReadable(final int length) {
@@ -553,13 +529,16 @@ private void ensureReadable(final int length) {
       // check bounds
       if (length > readableBytes()) {
         throw new IndexOutOfBoundsException(
-          String.format("readerIndex(%d) + length(%d) exceeds writerIndex(%d)", readerIndex, length, writerIndex));
+            String.format(
+                "readerIndex(%d) + length(%d) exceeds writerIndex(%d)",
+                readerIndex, length, writerIndex));
       }
     }
   }
 
   /**
    * Read the byte at readerIndex.
+   *
    * @return byte value
    */
   public byte readByte() {
@@ -571,6 +550,7 @@ public byte readByte() {
 
   /**
    * Read dst.length bytes at readerIndex into dst byte array
+   *
    * @param dst byte array where the data will be written
    */
   public void readBytes(byte[] dst) {
@@ -581,6 +561,7 @@ public void readBytes(byte[] dst) {
 
   /**
    * Set the provided byte value at the writerIndex.
+   *
    * @param value value to set
    */
   public void writeByte(byte value) {
@@ -590,8 +571,8 @@ public void writeByte(byte value) {
   }
 
   /**
-   * Set the lower order byte for the provided value at
-   * the writerIndex.
+   * Set the lower order byte for the provided value at the writerIndex.
+   *
    * @param value value to be set
    */
   public void writeByte(int value) {
@@ -601,8 +582,8 @@ public void writeByte(int value) {
   }
 
   /**
-   * Write the bytes from given byte array into this
-   * ArrowBuf starting at writerIndex.
+   * Write the bytes from given byte array into this ArrowBuf starting at writerIndex.
+   *
    * @param src src byte array
    */
   public void writeBytes(byte[] src) {
@@ -611,8 +592,9 @@ public void writeBytes(byte[] src) {
   }
 
   /**
-   * Write the bytes from given byte array starting at srcIndex
-   * into this ArrowBuf starting at writerIndex.
+   * Write the bytes from given byte array starting at srcIndex into this ArrowBuf starting at
+   * writerIndex.
+   *
    * @param src src byte array
    * @param srcIndex index in the byte array where the copy will being from
    * @param length length of data to copy
@@ -625,6 +607,7 @@ public void writeBytes(byte[] src, int srcIndex, int length) {
 
   /**
    * Set the provided int value as short at the writerIndex.
+   *
    * @param value value to set
    */
   public void writeShort(int value) {
@@ -635,6 +618,7 @@ public void writeShort(int value) {
 
   /**
    * Set the provided int value at the writerIndex.
+   *
    * @param value value to set
    */
   public void writeInt(int value) {
@@ -645,6 +629,7 @@ public void writeInt(int value) {
 
   /**
    * Set the provided long value at the writerIndex.
+   *
    * @param value value to set
    */
   public void writeLong(long value) {
@@ -655,6 +640,7 @@ public void writeLong(long value) {
 
   /**
    * Set the provided float value at the writerIndex.
+   *
    * @param value value to set
    */
   public void writeFloat(float value) {
@@ -665,6 +651,7 @@ public void writeFloat(float value) {
 
   /**
    * Set the provided double value at the writerIndex.
+   *
    * @param value value to set
    */
   public void writeDouble(double value) {
@@ -673,21 +660,21 @@ public void writeDouble(double value) {
     writerIndex += DOUBLE_SIZE;
   }
 
-
   /*--------------------------------------------------*
-   | Following are another set of data set/get APIs   |
-   | that read and write stream of bytes from/to byte |
-   | arrays, ByteBuffer, ArrowBuf etc                 |
-   |                                                  |
-   *--------------------------------------------------*/
+  | Following are another set of data set/get APIs   |
+  | that read and write stream of bytes from/to byte |
+  | arrays, ByteBuffer, ArrowBuf etc                 |
+  |                                                  |
+  *--------------------------------------------------*/
 
   /**
    * Determine if the requested {@code index} and {@code length} will fit within {@code capacity}.
+   *
    * @param index The starting index.
    * @param length The length which will be utilized (starting from {@code index}).
    * @param capacity The capacity that {@code index + length} is allowed to be within.
-   * @return {@code true} if the requested {@code index} and {@code length} will fit within {@code capacity}.
-   * {@code false} if this would result in an index out of bounds exception.
+   * @return {@code true} if the requested {@code index} and {@code length} will fit within {@code
+   *     capacity}. {@code false} if this would result in an index out of bounds exception.
    */
   private static boolean isOutOfBounds(long index, long length, long capacity) {
     return (index | length | (index + length) | (capacity - (index + length))) < 0;
@@ -699,17 +686,19 @@ private void checkIndex(long index, long fieldLength) {
       this.ensureAccessible();
       // check bounds
       if (isOutOfBounds(index, fieldLength, this.capacity())) {
-        throw new IndexOutOfBoundsException(String.format("index: %d, length: %d (expected: range(0, %d))",
+        throw new IndexOutOfBoundsException(
+            String.format(
+                "index: %d, length: %d (expected: range(0, %d))",
                 index, fieldLength, this.capacity()));
       }
     }
   }
 
   /**
-   * Copy data from this ArrowBuf at a given index in into destination
-   * byte array.
-   * @param index starting index (0 based relative to the portion of memory)
-   *              this ArrowBuf has access to
+   * Copy data from this ArrowBuf at a given index in into destination byte array.
+   *
+   * @param index starting index (0 based relative to the portion of memory) this ArrowBuf has
+   *     access to
    * @param dst byte array to copy the data into
    */
   public void getBytes(long index, byte[] dst) {
@@ -718,8 +707,8 @@ public void getBytes(long index, byte[] dst) {
 
   /**
    * Copy data from this ArrowBuf at a given index into destination byte array.
-   * @param index index (0 based relative to the portion of memory
-   *              this ArrowBuf has access to)
+   *
+   * @param index index (0 based relative to the portion of memory this ArrowBuf has access to)
    * @param dst byte array to copy the data into
    * @param dstIndex starting index in dst byte array to copy into
    * @param length length of data to copy from this ArrowBuf
@@ -732,20 +721,22 @@ public void getBytes(long index, byte[] dst, int dstIndex, int length) {
     // bound check for dst byte array where the data will be copied to
     if (isOutOfBounds(dstIndex, length, dst.length)) {
       // not enough space to copy "length" bytes into dst array from dstIndex onwards
-      throw new IndexOutOfBoundsException("Not enough space to copy data into destination" + dstIndex);
+      throw new IndexOutOfBoundsException(
+          "Not enough space to copy data into destination" + dstIndex);
     }
     if (length != 0) {
       // copy "length" bytes from this ArrowBuf starting at addr(index) address
       // into dst byte array at dstIndex onwards
-      MemoryUtil.copyMemory(null, addr(index), dst, MemoryUtil.BYTE_ARRAY_BASE_OFFSET + dstIndex, length);
+      MemoryUtil.copyMemory(
+          null, addr(index), dst, MemoryUtil.BYTE_ARRAY_BASE_OFFSET + dstIndex, length);
     }
   }
 
   /**
-   * Copy data from a given byte array into this ArrowBuf starting at
-   * a given index.
-   * @param index starting index (0 based relative to the portion of memory)
-   *              this ArrowBuf has access to
+   * Copy data from a given byte array into this ArrowBuf starting at a given index.
+   *
+   * @param index starting index (0 based relative to the portion of memory) this ArrowBuf has
+   *     access to
    * @param src byte array to copy the data from
    */
   public void setBytes(long index, byte[] src) {
@@ -753,10 +744,10 @@ public void setBytes(long index, byte[] src) {
   }
 
   /**
-   * Copy data from a given byte array starting at the given source index into
-   * this ArrowBuf at a given index.
-   * @param index index (0 based relative to the portion of memory this ArrowBuf
-   *              has access to)
+   * Copy data from a given byte array starting at the given source index into this ArrowBuf at a
+   * given index.
+   *
+   * @param index index (0 based relative to the portion of memory this ArrowBuf has access to)
    * @param src src byte array to copy the data from
    * @param srcIndex index in the byte array where the copy will start from
    * @param length length of data to copy from byte array
@@ -769,20 +760,21 @@ public void setBytes(long index, byte[] src, int srcIndex, long length) {
     // bound check for src byte array where the data will be copied from
     if (isOutOfBounds(srcIndex, length, src.length)) {
       // not enough space to copy "length" bytes into dst array from dstIndex onwards
-      throw new IndexOutOfBoundsException("Not enough space to copy data from byte array" + srcIndex);
+      throw new IndexOutOfBoundsException(
+          "Not enough space to copy data from byte array" + srcIndex);
     }
     if (length > 0) {
       // copy "length" bytes from src byte array at the starting index (srcIndex)
       // into this ArrowBuf starting at address "addr(index)"
-      MemoryUtil.copyMemory(src, MemoryUtil.BYTE_ARRAY_BASE_OFFSET + srcIndex, null, addr(index), length);
+      MemoryUtil.copyMemory(
+          src, MemoryUtil.BYTE_ARRAY_BASE_OFFSET + srcIndex, null, addr(index), length);
     }
   }
 
   /**
-   * Copy data from this ArrowBuf at a given index into the destination
-   * ByteBuffer.
-   * @param index index (0 based relative to the portion of memory this ArrowBuf
-   *              has access to)
+   * Copy data from this ArrowBuf at a given index into the destination ByteBuffer.
+   *
+   * @param index index (0 based relative to the portion of memory this ArrowBuf has access to)
    * @param dst dst ByteBuffer where the data will be copied into
    */
   public void getBytes(long index, ByteBuffer dst) {
@@ -809,20 +801,25 @@ public void getBytes(long index, ByteBuffer dst) {
         // index dstIndex
         final int dstIndex = dst.arrayOffset() + dst.position();
         MemoryUtil.copyMemory(
-                null, srcAddress, dst.array(), MemoryUtil.BYTE_ARRAY_BASE_OFFSET + dstIndex, dst.remaining());
+            null,
+            srcAddress,
+            dst.array(),
+            MemoryUtil.BYTE_ARRAY_BASE_OFFSET + dstIndex,
+            dst.remaining());
         // after copy, bump the next write position for the dst ByteBuffer
         dst.position(dst.position() + dst.remaining());
       } else {
-        throw new UnsupportedOperationException("Copy from this ArrowBuf to ByteBuffer is not supported");
+        throw new UnsupportedOperationException(
+            "Copy from this ArrowBuf to ByteBuffer is not supported");
       }
     }
   }
 
   /**
-   * Copy data into this ArrowBuf at a given index onwards from
-   * a source ByteBuffer.
-   * @param index index index (0 based relative to the portion of memory
-   *              this ArrowBuf has access to)
+   * Copy data into this ArrowBuf at a given index onwards from a source ByteBuffer.
+   *
+   * @param index index index (0 based relative to the portion of memory this ArrowBuf has access
+   *     to)
    * @param src src ByteBuffer where the data will be copied from
    */
   public void setBytes(long index, ByteBuffer src) {
@@ -845,7 +842,7 @@ public void setBytes(long index, ByteBuffer src) {
         // index srcIndex into this ArrowBuf starting at address dstAddress
         final int srcIndex = src.arrayOffset() + src.position();
         MemoryUtil.copyMemory(
-                src.array(), MemoryUtil.BYTE_ARRAY_BASE_OFFSET + srcIndex, null, dstAddress, length);
+            src.array(), MemoryUtil.BYTE_ARRAY_BASE_OFFSET + srcIndex, null, dstAddress, length);
         // after copy, bump the next read position for the src ByteBuffer
         src.position(src.position() + length);
       } else {
@@ -879,14 +876,12 @@ public void setBytes(long index, ByteBuffer src) {
   }
 
   /**
-   * Copy data into this ArrowBuf at a given index onwards from
-   * a source ByteBuffer starting at a given srcIndex for a certain
-   * length.
-   * @param index index (0 based relative to the portion of memory
-   *              this ArrowBuf has access to)
+   * Copy data into this ArrowBuf at a given index onwards from a source ByteBuffer starting at a
+   * given srcIndex for a certain length.
+   *
+   * @param index index (0 based relative to the portion of memory this ArrowBuf has access to)
    * @param src src ByteBuffer where the data will be copied from
-   * @param srcIndex starting index in the src ByteBuffer where the data copy
-   *                 will start from
+   * @param srcIndex starting index in the src ByteBuffer where the data copy will start from
    * @param length length of data to copy from src ByteBuffer
    */
   public void setBytes(long index, ByteBuffer src, int srcIndex, int length) {
@@ -912,13 +907,12 @@ public void setBytes(long index, ByteBuffer src, int srcIndex, int length) {
   }
 
   /**
-   * Copy a given length of data from this ArrowBuf starting at a given index
-   * into a dst ArrowBuf at dstIndex.
-   * @param index index (0 based relative to the portion of memory
-   *              this ArrowBuf has access to)
+   * Copy a given length of data from this ArrowBuf starting at a given index into a dst ArrowBuf at
+   * dstIndex.
+   *
+   * @param index index (0 based relative to the portion of memory this ArrowBuf has access to)
    * @param dst dst ArrowBuf where the data will be copied into
-   * @param dstIndex index (0 based relative to the portion of memory
-   *              dst ArrowBuf has access to)
+   * @param dstIndex index (0 based relative to the portion of memory dst ArrowBuf has access to)
    * @param length length of data to copy
    */
   public void getBytes(long index, ArrowBuf dst, long dstIndex, int length) {
@@ -928,8 +922,9 @@ public void getBytes(long index, ArrowBuf dst, long dstIndex, int length) {
     Preconditions.checkArgument(dst != null, "expecting a valid ArrowBuf");
     // bound check for dst ArrowBuf
     if (isOutOfBounds(dstIndex, length, dst.capacity())) {
-      throw new IndexOutOfBoundsException(String.format("index: %d, length: %d (expected: range(0, %d))",
-        dstIndex, length, dst.capacity()));
+      throw new IndexOutOfBoundsException(
+          String.format(
+              "index: %d, length: %d (expected: range(0, %d))", dstIndex, length, dst.capacity()));
     }
     if (length != 0) {
       // copy length bytes of data from this ArrowBuf starting at
@@ -942,13 +937,12 @@ public void getBytes(long index, ArrowBuf dst, long dstIndex, int length) {
   }
 
   /**
-   * Copy data from src ArrowBuf starting at index srcIndex into this
-   * ArrowBuf at given index.
-   * @param index index index (0 based relative to the portion of memory
-   *              this ArrowBuf has access to)
+   * Copy data from src ArrowBuf starting at index srcIndex into this ArrowBuf at given index.
+   *
+   * @param index index index (0 based relative to the portion of memory this ArrowBuf has access
+   *     to)
    * @param src src ArrowBuf where the data will be copied from
-   * @param srcIndex starting index in the src ArrowBuf where the copy
-   *                 will begin from
+   * @param srcIndex starting index in the src ArrowBuf where the copy will begin from
    * @param length length of data to copy from src ArrowBuf
    */
   public void setBytes(long index, ArrowBuf src, long srcIndex, long length) {
@@ -958,8 +952,9 @@ public void setBytes(long index, ArrowBuf src, long srcIndex, long length) {
     Preconditions.checkArgument(src != null, "expecting a valid ArrowBuf");
     // bound check for src ArrowBuf
     if (isOutOfBounds(srcIndex, length, src.capacity())) {
-      throw new IndexOutOfBoundsException(String.format("index: %d, length: %d (expected: range(0, %d))",
-        index, length, src.capacity()));
+      throw new IndexOutOfBoundsException(
+          String.format(
+              "index: %d, length: %d (expected: range(0, %d))", srcIndex, length, src.capacity()));
     }
     if (length != 0) {
       // copy length bytes of data from src ArrowBuf starting at
@@ -972,11 +967,11 @@ public void setBytes(long index, ArrowBuf src, long srcIndex, long length) {
   }
 
   /**
-   * Copy readableBytes() number of bytes from src ArrowBuf
-   * starting from its readerIndex into this ArrowBuf starting
-   * at the given index.
-   * @param index index index (0 based relative to the portion of memory
-   *              this ArrowBuf has access to)
+   * Copy readableBytes() number of bytes from src ArrowBuf starting from its readerIndex into this
+   * ArrowBuf starting at the given index.
+   *
+   * @param index index index (0 based relative to the portion of memory this ArrowBuf has access
+   *     to)
    * @param src src ArrowBuf where the data will be copied from
    */
   public void setBytes(long index, ArrowBuf src) {
@@ -992,10 +987,10 @@ public void setBytes(long index, ArrowBuf src) {
   }
 
   /**
-   * Copy a certain length of bytes from given InputStream
-   * into this ArrowBuf at the provided index.
-   * @param index index index (0 based relative to the portion of memory
-   *              this ArrowBuf has access to)
+   * Copy a certain length of bytes from given InputStream into this ArrowBuf at the provided index.
+   *
+   * @param index index index (0 based relative to the portion of memory this ArrowBuf has access
+   *     to)
    * @param in src stream to copy from
    * @param length length of data to copy
    * @return number of bytes copied from stream into ArrowBuf
@@ -1019,10 +1014,10 @@ public int setBytes(long index, InputStream in, int length) throws IOException {
   }
 
   /**
-   * Copy a certain length of bytes from this ArrowBuf at a given
-   * index into the given OutputStream.
-   * @param index index index (0 based relative to the portion of memory
-   *              this ArrowBuf has access to)
+   * Copy a certain length of bytes from this ArrowBuf at a given index into the given OutputStream.
+   *
+   * @param index index index (0 based relative to the portion of memory this ArrowBuf has access
+   *     to)
    * @param out dst stream to copy data into
    * @param length length of data to copy
    * @throws IOException on failing to write to stream
@@ -1046,8 +1041,9 @@ public void close() {
   }
 
   /**
-   * Returns the possible memory consumed by this ArrowBuf in the worse case scenario.
-   * (not shared, connected to larger underlying buffer of allocated memory)
+   * Returns the possible memory consumed by this ArrowBuf in the worse case scenario. (not shared,
+   * connected to larger underlying buffer of allocated memory)
+   *
    * @return Size in bytes.
    */
   public long getPossibleMemoryConsumed() {
@@ -1057,6 +1053,7 @@ public long getPossibleMemoryConsumed() {
   /**
    * Return that is Accounted for by this buffer (and its potentially shared siblings within the
    * context of the associated allocator).
+   *
    * @return Size in bytes.
    */
   public long getActualMemoryConsumed() {
@@ -1066,7 +1063,7 @@ public long getActualMemoryConsumed() {
   /**
    * Return the buffer's byte contents in the form of a hex dump.
    *
-   * @param start  the starting byte index
+   * @param start the starting byte index
    * @param length how many bytes to log
    * @return A hex dump in a String.
    */
@@ -1092,6 +1089,7 @@ public String toHexString(final long start, final int length) {
 
   /**
    * Get the integer id assigned to this ArrowBuf for debugging purposes.
+   *
    * @return integer id
    */
   public long getId() {
@@ -1099,12 +1097,11 @@ public long getId() {
   }
 
   /**
-   * Print information of this buffer into <code>sb</code> at the given
-   * indentation and verbosity level.
-   *
-   * <p>It will include history if BaseAllocator.DEBUG is true and
-   * the verbosity.includeHistoricalLog are true.
+   * Print information of this buffer into <code>sb</code> at the given indentation and verbosity
+   * level.
    *
+   * <p>It will include history if BaseAllocator.DEBUG is true and the
+   * verbosity.includeHistoricalLog are true.
    */
   @VisibleForTesting
   public void print(StringBuilder sb, int indent, Verbosity verbosity) {
@@ -1120,7 +1117,6 @@ public void print(StringBuilder sb, int indent, Verbosity verbosity) {
    * Print detailed information of this buffer into <code>sb</code>.
    *
    * <p>Most information will only be present if BaseAllocator.DEBUG is true.
-   *
    */
   public void print(StringBuilder sb, int indent) {
     print(sb, indent, Verbosity.LOG_WITH_STACKTRACE);
@@ -1128,6 +1124,7 @@ public void print(StringBuilder sb, int indent) {
 
   /**
    * Get the index at which the next byte will be read from.
+   *
    * @return reader index
    */
   public long readerIndex() {
@@ -1136,6 +1133,7 @@ public long readerIndex() {
 
   /**
    * Get the index at which next byte will be written to.
+   *
    * @return writer index
    */
   public long writerIndex() {
@@ -1144,6 +1142,7 @@ public long writerIndex() {
 
   /**
    * Set the reader index for this ArrowBuf.
+   *
    * @param readerIndex new reader index
    * @return this ArrowBuf
    */
@@ -1154,6 +1153,7 @@ public ArrowBuf readerIndex(long readerIndex) {
 
   /**
    * Set the writer index for this ArrowBuf.
+   *
    * @param writerIndex new writer index
    * @return this ArrowBuf
    */
@@ -1163,10 +1163,10 @@ public ArrowBuf writerIndex(long writerIndex) {
   }
 
   /**
-   * Zero-out the bytes in this ArrowBuf starting at
-   * the given index for the given length.
-   * @param index index index (0 based relative to the portion of memory
-   *              this ArrowBuf has access to)
+   * Zero-out the bytes in this ArrowBuf starting at the given index for the given length.
+   *
+   * @param index index index (0 based relative to the portion of memory this ArrowBuf has access
+   *     to)
    * @param length length of bytes to zero-out
    * @return this ArrowBuf
    */
@@ -1180,8 +1180,9 @@ public ArrowBuf setZero(long index, long length) {
 
   /**
    * Sets all bits to one in the specified range.
-   * @param index index index (0 based relative to the portion of memory
-   *              this ArrowBuf has access to)
+   *
+   * @param index index index (0 based relative to the portion of memory this ArrowBuf has access
+   *     to)
    * @param length length of bytes to set.
    * @return this ArrowBuf
    * @deprecated use {@link ArrowBuf#setOne(long, long)} instead.
@@ -1197,8 +1198,9 @@ public ArrowBuf setOne(int index, int length) {
 
   /**
    * Sets all bits to one in the specified range.
-   * @param index index index (0 based relative to the portion of memory
-   *              this ArrowBuf has access to)
+   *
+   * @param index index index (0 based relative to the portion of memory this ArrowBuf has access
+   *     to)
    * @param length length of bytes to set.
    * @return this ArrowBuf
    */
@@ -1211,8 +1213,8 @@ public ArrowBuf setOne(long index, long length) {
   }
 
   /**
-   * Returns <code>this</code> if size is less than {@link #capacity()}, otherwise
-   * delegates to {@link BufferManager#replace(ArrowBuf, long)} to get a new buffer.
+   * Returns <code>this</code> if size is less than {@link #capacity()}, otherwise delegates to
+   * {@link BufferManager#replace(ArrowBuf, long)} to get a new buffer.
    */
   public ArrowBuf reallocIfNeeded(final long size) {
     Preconditions.checkArgument(size >= 0, "reallocation size must be non-negative");
@@ -1223,7 +1225,7 @@ public ArrowBuf reallocIfNeeded(final long size) {
       return bufferManager.replace(this, size);
     } else {
       throw new UnsupportedOperationException(
-              "Realloc is only available in the context of operator's UDFs");
+          "Realloc is only available in the context of operator's UDFs");
     }
   }
 
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java
index 189c800ba0fe5..3f4426d2c36e5 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BaseAllocator.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 import java.util.Collection;
@@ -23,7 +22,6 @@
 import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.arrow.memory.rounding.DefaultRoundingPolicy;
 import org.apache.arrow.memory.rounding.RoundingPolicy;
 import org.apache.arrow.memory.util.AssertionUtil;
@@ -39,17 +37,19 @@
 /**
  * A base-class that implements all functionality of {@linkplain BufferAllocator}s.
  *
- * <p>The class is abstract to enforce usage of {@linkplain RootAllocator}/{@linkplain ChildAllocator}
- * facades.
+ * <p>The class is abstract to enforce usage of {@linkplain RootAllocator}/{@linkplain
+ * ChildAllocator} facades.
  */
 abstract class BaseAllocator extends Accountant implements BufferAllocator {
 
   public static final String DEBUG_ALLOCATOR = "arrow.memory.debug.allocator";
   public static final int DEBUG_LOG_LENGTH = 6;
   public static final boolean DEBUG;
-  private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(BaseAllocator.class);
+  private static final org.slf4j.Logger logger =
+      org.slf4j.LoggerFactory.getLogger(BaseAllocator.class);
 
-  // Initialize this before DEFAULT_CONFIG as DEFAULT_CONFIG will eventually initialize the allocation manager,
+  // Initialize this before DEFAULT_CONFIG as DEFAULT_CONFIG will eventually initialize the
+  // allocation manager,
   // which in turn allocates an ArrowBuf, which requires DEBUG to have been properly initialized
   static {
     // the system property takes precedence.
@@ -59,8 +59,11 @@ abstract class BaseAllocator extends Accountant implements BufferAllocator {
     } else {
       DEBUG = false;
     }
-    logger.info("Debug mode " + (DEBUG ? "enabled."
-        : "disabled. Enable with the VM option -Darrow.memory.debug.allocator=true."));
+    logger.info(
+        "Debug mode "
+            + (DEBUG
+                ? "enabled."
+                : "disabled. Enable with the VM option -Darrow.memory.debug.allocator=true."));
   }
 
   public static final Config DEFAULT_CONFIG = ImmutableConfig.builder().build();
@@ -85,18 +88,16 @@ abstract class BaseAllocator extends Accountant implements BufferAllocator {
   /**
    * Initialize an allocator.
    *
-   * @param parentAllocator   parent allocator. null if defining a root allocator
-   * @param name              name of this allocator
-   * @param config            configuration including other options of this allocator
-   *
+   * @param parentAllocator parent allocator. null if defining a root allocator
+   * @param name name of this allocator
+   * @param config configuration including other options of this allocator
    * @see Config
    */
   @SuppressWarnings({"nullness:method.invocation", "nullness:cast.unsafe"})
-  //{"call to hist(,...) not allowed on the given receiver.", "cast cannot be statically verified"}
+  // {"call to hist(,...) not allowed on the given receiver.", "cast cannot be statically verified"}
   protected BaseAllocator(
-      final @Nullable BaseAllocator parentAllocator,
-      final String name,
-      final Config config) throws OutOfMemoryException {
+      final @Nullable BaseAllocator parentAllocator, final String name, final Config config)
+      throws OutOfMemoryException {
     super(parentAllocator, name, config.getInitReservation(), config.getMaxAllocation());
 
     this.listener = config.getListener();
@@ -109,8 +110,8 @@ protected BaseAllocator(
       this.root = (@Initialized RootAllocator) this;
       empty = createEmpty();
     } else {
-      throw new IllegalStateException("An parent allocator must either carry a root or be the " +
-        "root.");
+      throw new IllegalStateException(
+          "An parent allocator must either carry a root or be the " + "root.");
     }
 
     this.parentAllocator = parentAllocator;
@@ -148,15 +149,17 @@ public Collection<BufferAllocator> getChildAllocators() {
     }
   }
 
-  private static String createErrorMsg(final BufferAllocator allocator, final long rounded, final long requested) {
+  private static String createErrorMsg(
+      final BufferAllocator allocator, final long rounded, final long requested) {
     if (rounded != requested) {
       return String.format(
-        "Unable to allocate buffer of size %d (rounded from %d) due to memory limit. Current " +
-          "allocation: %d", rounded, requested, allocator.getAllocatedMemory());
+          "Unable to allocate buffer of size %d (rounded from %d) due to memory limit. Current "
+              + "allocation: %d",
+          rounded, requested, allocator.getAllocatedMemory());
     } else {
       return String.format(
-        "Unable to allocate buffer of size %d due to memory limit. Current " +
-          "allocation: %d", rounded, allocator.getAllocatedMemory());
+          "Unable to allocate buffer of size %d due to memory limit. Current " + "allocation: %d",
+          rounded, allocator.getAllocatedMemory());
     }
   }
 
@@ -168,8 +171,8 @@ public static boolean isDebug() {
   public void assertOpen() {
     if (AssertionUtil.ASSERT_ENABLED) {
       if (isClosed) {
-        throw new IllegalStateException("Attempting operation on allocator when allocator is closed.\n" +
-          toVerboseString());
+        throw new IllegalStateException(
+            "Attempting operation on allocator when allocator is closed.\n" + toVerboseString());
       }
     }
   }
@@ -185,9 +188,8 @@ public ArrowBuf getEmpty() {
   }
 
   /**
-   * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
-   * we have a new ledger
-   * associated with this allocator.
+   * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that we
+   * have a new ledger associated with this allocator.
    */
   void associateLedger(BufferLedger ledger) {
     assertOpen();
@@ -201,9 +203,8 @@ void associateLedger(BufferLedger ledger) {
   }
 
   /**
-   * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that
-   * we are removing a
-   * ledger associated with this allocator
+   * For debug/verification purposes only. Allows an AllocationManager to tell the allocator that we
+   * are removing a ledger associated with this allocator
    */
   void dissociateLedger(BufferLedger ledger) {
     assertOpen();
@@ -235,8 +236,12 @@ private void childClosed(final BaseAllocator childAllocator) {
           if (childAllocator.historicalLog != null) {
             childAllocator.historicalLog.logHistory(logger);
           }
-          throw new IllegalStateException("Child allocator[" + childAllocator.name +
-            "] not found in parent allocator[" + name + "]'s childAllocators");
+          throw new IllegalStateException(
+              "Child allocator["
+                  + childAllocator.name
+                  + "] not found in parent allocator["
+                  + name
+                  + "]'s childAllocators");
         }
       }
     } else {
@@ -257,15 +262,14 @@ public ArrowBuf wrapForeignAllocation(ForeignAllocation allocation) {
         outcome = this.allocateBytes(size);
       }
       if (!outcome.isOk()) {
-        throw new OutOfMemoryException(createErrorMsg(this, size,
-            size), outcome.getDetails());
+        throw new OutOfMemoryException(createErrorMsg(this, size, size), outcome.getDetails());
       }
     }
     try {
       final AllocationManager manager = new ForeignAllocationManager(this, allocation);
       final BufferLedger ledger = manager.associate(this);
       final ArrowBuf buf =
-          new ArrowBuf(ledger, /*bufferManager=*/null, size, allocation.memoryAddress());
+          new ArrowBuf(ledger, /*bufferManager=*/ null, size, allocation.memoryAddress());
       buf.writerIndex(size);
       listener.onAllocation(size);
       return buf;
@@ -291,7 +295,8 @@ public ArrowBuf buffer(final long initialRequestSize) {
     return buffer(initialRequestSize, null);
   }
 
-  @SuppressWarnings("nullness:dereference.of.nullable")//dereference of possibly-null reference allocationManagerFactory
+  @SuppressWarnings("nullness:dereference.of.nullable") // dereference of possibly-null reference
+  // allocationManagerFactory
   private ArrowBuf createEmpty() {
     return allocationManagerFactory.empty();
   }
@@ -318,8 +323,8 @@ public ArrowBuf buffer(final long initialRequestSize, @Nullable BufferManager ma
         outcome = this.allocateBytes(actualRequestSize);
       }
       if (!outcome.isOk()) {
-        throw new OutOfMemoryException(createErrorMsg(this, actualRequestSize,
-            initialRequestSize), outcome.getDetails());
+        throw new OutOfMemoryException(
+            createErrorMsg(this, actualRequestSize, initialRequestSize), outcome.getDetails());
       }
     }
 
@@ -339,12 +344,11 @@ public ArrowBuf buffer(final long initialRequestSize, @Nullable BufferManager ma
   }
 
   /**
-   * Used by usual allocation as well as for allocating a pre-reserved buffer.
-   * Skips the typical accounting associated with creating a new buffer.
+   * Used by usual allocation as well as for allocating a pre-reserved buffer. Skips the typical
+   * accounting associated with creating a new buffer.
    */
-  private ArrowBuf bufferWithoutReservation(
-      final long size,
-      @Nullable BufferManager bufferManager) throws OutOfMemoryException {
+  private ArrowBuf bufferWithoutReservation(final long size, @Nullable BufferManager bufferManager)
+      throws OutOfMemoryException {
     assertOpen();
 
     final AllocationManager manager = newAllocationManager(size);
@@ -352,8 +356,11 @@ private ArrowBuf bufferWithoutReservation(
     final ArrowBuf buffer = ledger.newArrowBuf(size, bufferManager);
 
     // make sure that our allocation is equal to what we expected.
-    Preconditions.checkArgument(buffer.capacity() == size,
-        "Allocated capacity %d was not equal to requested capacity %d.", buffer.capacity(), size);
+    Preconditions.checkArgument(
+        buffer.capacity() == size,
+        "Allocated capacity %d was not equal to requested capacity %d.",
+        buffer.capacity(),
+        size);
 
     return buffer;
   }
@@ -362,7 +369,6 @@ private AllocationManager newAllocationManager(long size) {
     return newAllocationManager(this, size);
   }
 
-
   private AllocationManager newAllocationManager(BaseAllocator accountingAllocator, long size) {
     return allocationManagerFactory.create(accountingAllocator, size);
   }
@@ -374,9 +380,7 @@ public BufferAllocator getRoot() {
 
   @Override
   public BufferAllocator newChildAllocator(
-      final String name,
-      final long initReservation,
-      final long maxAllocation) {
+      final String name, final long initReservation, final long maxAllocation) {
     return newChildAllocator(name, this.listener, initReservation, maxAllocation);
   }
 
@@ -389,20 +393,23 @@ public BufferAllocator newChildAllocator(
     assertOpen();
 
     final ChildAllocator childAllocator =
-        new ChildAllocator(this, name, configBuilder()
-            .listener(listener)
-            .initReservation(initReservation)
-            .maxAllocation(maxAllocation)
-            .roundingPolicy(roundingPolicy)
-            .allocationManagerFactory(allocationManagerFactory)
-            .build());
+        new ChildAllocator(
+            this,
+            name,
+            configBuilder()
+                .listener(listener)
+                .initReservation(initReservation)
+                .maxAllocation(maxAllocation)
+                .roundingPolicy(roundingPolicy)
+                .allocationManagerFactory(allocationManagerFactory)
+                .build());
 
     if (DEBUG) {
       synchronized (DEBUG_LOCK) {
         childAllocators.put(childAllocator, childAllocator);
         if (historicalLog != null) {
-          historicalLog.recordEvent("allocator[%s] created new child allocator[%s]", name,
-              childAllocator.getName());
+          historicalLog.recordEvent(
+              "allocator[%s] created new child allocator[%s]", name, childAllocator.getName());
         }
       }
     } else {
@@ -441,32 +448,33 @@ public synchronized void close() {
         if (!childAllocators.isEmpty()) {
           for (final BaseAllocator childAllocator : childAllocators.keySet()) {
             if (childAllocator.isClosed) {
-              logger.warn(String.format(
-                  "Closed child allocator[%s] on parent allocator[%s]'s child list.\n%s",
-                  childAllocator.name, name, toString()));
+              logger.warn(
+                  String.format(
+                      "Closed child allocator[%s] on parent allocator[%s]'s child list.\n%s",
+                      childAllocator.name, name, toString()));
             }
           }
 
           throw new IllegalStateException(
-            String.format("Allocator[%s] closed with outstanding child allocators.\n%s", name,
-              toString()));
+              String.format(
+                  "Allocator[%s] closed with outstanding child allocators.\n%s", name, toString()));
         }
 
         // are there outstanding buffers?
         final int allocatedCount = childLedgers != null ? childLedgers.size() : 0;
         if (allocatedCount > 0) {
           throw new IllegalStateException(
-            String.format("Allocator[%s] closed with outstanding buffers allocated (%d).\n%s",
-              name, allocatedCount, toString()));
+              String.format(
+                  "Allocator[%s] closed with outstanding buffers allocated (%d).\n%s",
+                  name, allocatedCount, toString()));
         }
 
         if (reservations != null && reservations.size() != 0) {
           throw new IllegalStateException(
-            String.format("Allocator[%s] closed with outstanding reservations (%d).\n%s", name,
-              reservations.size(),
-              toString()));
+              String.format(
+                  "Allocator[%s] closed with outstanding reservations (%d).\n%s",
+                  name, reservations.size(), toString()));
         }
-
       }
     } else {
       if (!childAllocators.isEmpty()) {
@@ -485,8 +493,10 @@ public synchronized void close() {
       if (parent != null && reservation > allocated) {
         parent.releaseBytes(reservation - allocated);
       }
-      String msg = String.format("Memory was leaked by query. Memory leaked: (%d)\n%s%s", allocated,
-          outstandingChildAllocators.toString(), toString());
+      String msg =
+          String.format(
+              "Memory was leaked by query. Memory leaked: (%d)\n%s%s",
+              allocated, outstandingChildAllocators.toString(), toString());
       logger.error(msg);
       throw new IllegalStateException(msg);
     }
@@ -505,14 +515,12 @@ public synchronized void close() {
       }
       logger.debug(String.format("closed allocator[%s].", name));
     }
-
-
   }
 
   @Override
   public String toString() {
-    final Verbosity verbosity = logger.isTraceEnabled() ? Verbosity.LOG_WITH_STACKTRACE
-        : Verbosity.BASIC;
+    final Verbosity verbosity =
+        logger.isTraceEnabled() ? Verbosity.LOG_WITH_STACKTRACE : Verbosity.BASIC;
     final StringBuilder sb = new StringBuilder();
     print(sb, 0, verbosity);
     return sb.toString();
@@ -520,8 +528,7 @@ public String toString() {
 
   /**
    * Provide a verbose string of the current allocator state. Includes the state of all child
-   * allocators, along with
-   * historical logs of each object and including stacktraces.
+   * allocators, along with historical logs of each object and including stacktraces.
    *
    * @return A Verbose string of current allocator state.
    */
@@ -532,6 +539,8 @@ public String toVerboseString() {
     return sb.toString();
   }
 
+  /* Remove @SuppressWarnings after fixing https://github.com/apache/arrow/issues/41951 */
+  @SuppressWarnings("FormatStringAnnotation")
   private void hist(String noteFormat, Object... args) {
     if (historicalLog != null) {
       historicalLog.recordEvent(noteFormat, args);
@@ -549,12 +558,12 @@ void verifyAllocator() {
   }
 
   /**
-   * Verifies the accounting state of the allocator (Only works for DEBUG)
-   * This overload is used for recursive calls, allowing for checking
-   * that ArrowBufs are unique across all allocators that are checked.
+   * Verifies the accounting state of the allocator (Only works for DEBUG) This overload is used for
+   * recursive calls, allowing for checking that ArrowBufs are unique across all allocators that are
+   * checked.
    *
    * @param buffersSeen a map of buffers that have already been seen when walking a tree of
-   *                    allocators
+   *     allocators
    * @throws IllegalStateException when any problems are found
    */
   private void verifyAllocator(
@@ -596,15 +605,20 @@ private void verifyAllocator(
         }
         logger.debug("allocator[" + name + "] child event logs END");
         throw new IllegalStateException(
-          "Child allocators own more memory (" + childTotal + ") than their parent (name = " +
-            name + " ) has allocated (" + getAllocatedMemory() + ')');
+            "Child allocators own more memory ("
+                + childTotal
+                + ") than their parent (name = "
+                + name
+                + " ) has allocated ("
+                + getAllocatedMemory()
+                + ')');
       }
 
       // Furthermore, the amount I've allocated should be that plus buffers I've allocated.
       long bufferTotal = 0;
 
-      final Set<@KeyFor("this.childLedgers") BufferLedger> ledgerSet = childLedgers != null ?
-              childLedgers.keySet() : null;
+      final Set<@KeyFor("this.childLedgers") BufferLedger> ledgerSet =
+          childLedgers != null ? childLedgers.keySet() : null;
       if (ledgerSet != null) {
         for (final BufferLedger ledger : ledgerSet) {
           if (!ledger.isOwningLedger()) {
@@ -618,8 +632,8 @@ private void verifyAllocator(
            */
           final BaseAllocator otherOwner = buffersSeen.get(am);
           if (otherOwner != null) {
-            throw new IllegalStateException("This allocator's ArrowBuf already owned by another " +
-              "allocator");
+            throw new IllegalStateException(
+                "This allocator's ArrowBuf already owned by another " + "allocator");
           }
           buffersSeen.put(am, this);
 
@@ -628,8 +642,8 @@ private void verifyAllocator(
       }
 
       // Preallocated space has to be accounted for
-      final Set<@KeyFor("this.reservations") Reservation> reservationSet = reservations != null ?
-              reservations.keySet() : null;
+      final Set<@KeyFor("this.reservations") Reservation> reservationSet =
+          reservations != null ? reservations.keySet() : null;
       long reservedTotal = 0;
       if (reservationSet != null) {
         for (final Reservation reservation : reservationSet) {
@@ -687,14 +701,15 @@ private void verifyAllocator(
         final long allocated2 = getAllocatedMemory();
 
         if (allocated2 != allocated) {
-          throw new IllegalStateException(String.format(
-            "allocator[%s]: allocated t1 (%d) + allocated t2 (%d). Someone released memory while in verification.",
-            name, allocated, allocated2));
-
+          throw new IllegalStateException(
+              String.format(
+                  "allocator[%s]: allocated t1 (%d) + allocated t2 (%d). Someone released memory while in verification.",
+                  name, allocated, allocated2));
         }
-        throw new IllegalStateException(String.format(
-          "allocator[%s]: buffer space (%d) + prealloc space (%d) + child space (%d) != allocated (%d)",
-          name, bufferTotal, reservedTotal, childTotal, allocated));
+        throw new IllegalStateException(
+            String.format(
+                "allocator[%s]: buffer space (%d) + prealloc space (%d) + child space (%d) != allocated (%d)",
+                name, bufferTotal, reservedTotal, childTotal, allocated));
       }
     }
   }
@@ -716,23 +731,25 @@ void print(StringBuilder sb, int level, Verbosity verbosity) {
         .append('\n');
 
     if (DEBUG) {
-      CommonUtil.indent(sb, level + 1).append(String.format("child allocators: %d\n", childAllocators.size()));
+      CommonUtil.indent(sb, level + 1)
+          .append(String.format("child allocators: %d\n", childAllocators.size()));
       for (BaseAllocator child : childAllocators.keySet()) {
         child.print(sb, level + 2, verbosity);
       }
 
-      CommonUtil.indent(sb, level + 1).append(String.format("ledgers: %d\n", childLedgers != null ?
-              childLedgers.size() : 0));
+      CommonUtil.indent(sb, level + 1)
+          .append(String.format("ledgers: %d\n", childLedgers != null ? childLedgers.size() : 0));
       if (childLedgers != null) {
         for (BufferLedger ledger : childLedgers.keySet()) {
           ledger.print(sb, level + 2, verbosity);
         }
       }
 
-      final Set<@KeyFor("this.reservations") Reservation> reservations = this.reservations != null ?
-              this.reservations.keySet() : null;
-      CommonUtil.indent(sb, level + 1).append(String.format("reservations: %d\n",
-              reservations != null ? reservations.size() : 0));
+      final Set<@KeyFor("this.reservations") Reservation> reservations =
+          this.reservations != null ? this.reservations.keySet() : null;
+      CommonUtil.indent(sb, level + 1)
+          .append(
+              String.format("reservations: %d\n", reservations != null ? reservations.size() : 0));
       if (reservations != null) {
         for (final Reservation reservation : reservations) {
           if (verbosity.includeHistoricalLog) {
@@ -742,13 +759,12 @@ void print(StringBuilder sb, int level, Verbosity verbosity) {
           }
         }
       }
-
     }
-
   }
 
-  private void dumpBuffers(final StringBuilder sb,
-                           final @Nullable Set<@KeyFor("this.childLedgers") BufferLedger> ledgerSet) {
+  private void dumpBuffers(
+      final StringBuilder sb,
+      final @Nullable Set<@KeyFor("this.childLedgers") BufferLedger> ledgerSet) {
     if (ledgerSet != null) {
       for (final BufferLedger ledger : ledgerSet) {
         if (!ledger.isOwningLedger()) {
@@ -764,14 +780,12 @@ private void dumpBuffers(final StringBuilder sb,
     }
   }
 
-  /**
-   * Enum for logging verbosity.
-   */
+  /** Enum for logging verbosity. */
   public enum Verbosity {
     BASIC(false, false), // only include basic information
     LOG(true, false), // include basic
     LOG_WITH_STACKTRACE(true, true) //
-    ;
+  ;
 
     public final boolean includeHistoricalLog;
     public final boolean includeStackTraces;
@@ -789,12 +803,9 @@ public enum Verbosity {
    */
   public static Config defaultConfig() {
     return DEFAULT_CONFIG;
-
   }
 
-  /**
-   * Returns a builder class for configuring BaseAllocator's options.
-   */
+  /** Returns a builder class for configuring BaseAllocator's options. */
   public static ImmutableConfig.Builder configBuilder() {
     return ImmutableConfig.builder();
   }
@@ -804,47 +815,37 @@ public RoundingPolicy getRoundingPolicy() {
     return roundingPolicy;
   }
 
-  /**
-   * Config class of {@link BaseAllocator}.
-   */
+  /** Config class of {@link BaseAllocator}. */
   @Value.Immutable
   abstract static class Config {
-    /**
-     * Factory for creating {@link AllocationManager} instances.
-     */
+    /** Factory for creating {@link AllocationManager} instances. */
     @Value.Default
     AllocationManager.Factory getAllocationManagerFactory() {
       return DefaultAllocationManagerOption.getDefaultAllocationManagerFactory();
     }
 
-    /**
-     * Listener callback. Must be non-null.
-     */
+    /** Listener callback. Must be non-null. */
     @Value.Default
     AllocationListener getListener() {
       return AllocationListener.NOOP;
     }
 
-    /**
-     * Initial reservation size (in bytes) for this allocator.
-     */
+    /** Initial reservation size (in bytes) for this allocator. */
     @Value.Default
     long getInitReservation() {
       return 0;
     }
 
     /**
-     * Max allocation size (in bytes) for this allocator, allocations past this limit fail.
-     * Can be modified after construction.
+     * Max allocation size (in bytes) for this allocator, allocations past this limit fail. Can be
+     * modified after construction.
      */
     @Value.Default
     long getMaxAllocation() {
       return Long.MAX_VALUE;
     }
 
-    /**
-     * The policy for rounding the buffer size.
-     */
+    /** The policy for rounding the buffer size. */
     @Value.Default
     RoundingPolicy getRoundingPolicy() {
       return DefaultRoundingPolicy.DEFAULT_ROUNDING_POLICY;
@@ -852,8 +853,8 @@ RoundingPolicy getRoundingPolicy() {
   }
 
   /**
-   * Implementation of {@link AllocationReservation} that supports
-   * history tracking under {@linkplain #DEBUG} is true.
+   * Implementation of {@link AllocationReservation} that supports history tracking under
+   * {@linkplain #DEBUG} is true.
    */
   public class Reservation implements AllocationReservation {
 
@@ -865,14 +866,16 @@ public class Reservation implements AllocationReservation {
     /**
      * Creates a new reservation.
      *
-     * <p>If {@linkplain #DEBUG} is true this will capture a historical
-     * log of events relevant to this Reservation.
+     * <p>If {@linkplain #DEBUG} is true this will capture a historical log of events relevant to
+     * this Reservation.
      */
-    @SuppressWarnings("nullness:argument")//to handle null assignment on third party dependency: System.identityHashCode
+    @SuppressWarnings("nullness:argument") // to handle null assignment on third party dependency:
+    // System.identityHashCode
     public Reservation() {
       if (DEBUG) {
-        historicalLog = new HistoricalLog("Reservation[allocator[%s], %d]", name, System
-          .identityHashCode(this));
+        historicalLog =
+            new HistoricalLog(
+                "Reservation[allocator[%s], %d]", name, System.identityHashCode(this));
         historicalLog.recordEvent("created");
         synchronized (DEBUG_LOCK) {
           if (reservations != null) {
@@ -889,8 +892,10 @@ public boolean add(final int nBytes) {
       assertOpen();
 
       Preconditions.checkArgument(nBytes >= 0, "nBytes(%d) < 0", nBytes);
-      Preconditions.checkState(!closed, "Attempt to increase reservation after reservation has been closed");
-      Preconditions.checkState(!used, "Attempt to increase reservation after reservation has been used");
+      Preconditions.checkState(
+          !closed, "Attempt to increase reservation after reservation has been closed");
+      Preconditions.checkState(
+          !used, "Attempt to increase reservation after reservation has been used");
 
       // we round up to next power of two since all reservations are done in powers of two. This
       // may overestimate the
@@ -954,8 +959,9 @@ public void close() {
             final StringBuilder sb = new StringBuilder();
             print(sb, 0, Verbosity.LOG_WITH_STACKTRACE);
             logger.debug(sb.toString());
-            throw new IllegalStateException(String.format("Didn't find closing reservation[%d]",
-              System.identityHashCode(this)));
+            throw new IllegalStateException(
+                String.format(
+                    "Didn't find closing reservation[%d]", System.identityHashCode(this)));
           }
 
           if (historicalLog != null) {
@@ -1001,7 +1007,7 @@ private ArrowBuf allocate(int nBytes) {
        * The reservation already added the requested bytes to the allocators owned and allocated
        * bytes via reserve().
        * This ensures that they can't go away. But when we ask for the buffer here, that will add
-        * to the allocated bytes
+       * to the allocated bytes
        * as well, so we need to return the same number back to avoid double-counting them.
        */
       try {
@@ -1009,8 +1015,8 @@ private ArrowBuf allocate(int nBytes) {
 
         listener.onAllocation(nBytes);
         if (historicalLog != null) {
-          historicalLog.recordEvent("allocate() => %s", String.format("ArrowBuf[%d]", arrowBuf
-              .getId()));
+          historicalLog.recordEvent(
+              "allocate() => %s", String.format("ArrowBuf[%d]", arrowBuf.getId()));
         }
         success = true;
         return arrowBuf;
@@ -1035,6 +1041,5 @@ private void releaseReservation(int nBytes) {
         historicalLog.recordEvent("releaseReservation(%d)", nBytes);
       }
     }
-
   }
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BoundsChecking.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BoundsChecking.java
index bbf7ff34dc964..50be9ad1fbc32 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BoundsChecking.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BoundsChecking.java
@@ -14,19 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 /**
  * Configuration class to determine if bounds checking should be turned on or off.
  *
- * <p>
- * Bounds checking is on by default.  You can disable it by setting either the system property or
- * the environmental variable to "true". The system property can be "arrow.enable_unsafe_memory_access"
- * or "drill.enable_unsafe_memory_access". The latter is deprecated. The environmental variable is named
- * "ARROW_ENABLE_UNSAFE_MEMORY_ACCESS".
- * When both the system property and the environmental variable are set, the system property takes precedence.
- * </p>
+ * <p>Bounds checking is on by default. You can disable it by setting either the system property or
+ * the environmental variable to "true". The system property can be
+ * "arrow.enable_unsafe_memory_access" or "drill.enable_unsafe_memory_access". The latter is
+ * deprecated. The environmental variable is named "ARROW_ENABLE_UNSAFE_MEMORY_ACCESS". When both
+ * the system property and the environmental variable are set, the system property takes precedence.
  */
 public class BoundsChecking {
 
@@ -37,9 +34,11 @@ public class BoundsChecking {
     String envProperty = System.getenv("ARROW_ENABLE_UNSAFE_MEMORY_ACCESS");
     String oldProperty = System.getProperty("drill.enable_unsafe_memory_access");
     if (oldProperty != null) {
-      logger.warn("\"drill.enable_unsafe_memory_access\" has been renamed to \"arrow.enable_unsafe_memory_access\"");
-      logger.warn("\"arrow.enable_unsafe_memory_access\" can be set to: " +
-              " true (to not check) or false (to check, default)");
+      logger.warn(
+          "\"drill.enable_unsafe_memory_access\" has been renamed to \"arrow.enable_unsafe_memory_access\"");
+      logger.warn(
+          "\"arrow.enable_unsafe_memory_access\" can be set to: "
+              + " true (to not check) or false (to check, default)");
     }
     String newProperty = System.getProperty("arrow.enable_unsafe_memory_access");
 
@@ -57,7 +56,5 @@ public class BoundsChecking {
     BOUNDS_CHECKING_ENABLED = !"true".equals(unsafeFlagValue);
   }
 
-  private BoundsChecking() {
-  }
-
+  private BoundsChecking() {}
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferAllocator.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferAllocator.java
index c279e18f1eafb..a4db99f619323 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferAllocator.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferAllocator.java
@@ -14,25 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 import java.util.Collection;
-
 import org.apache.arrow.memory.rounding.DefaultRoundingPolicy;
 import org.apache.arrow.memory.rounding.RoundingPolicy;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-/**
- * Wrapper class to deal with byte buffer allocation. Ensures users only use designated methods.
- */
+/** Wrapper class to deal with byte buffer allocation. Ensures users only use designated methods. */
 public interface BufferAllocator extends AutoCloseable {
 
   /**
-   * Allocate a new or reused buffer of the provided size. Note that the buffer may technically
-   * be larger than the
-   * requested size for rounding purposes. However, the buffer's capacity will be set to the
-   * configured size.
+   * Allocate a new or reused buffer of the provided size. Note that the buffer may technically be
+   * larger than the requested size for rounding purposes. However, the buffer's capacity will be
+   * set to the configured size.
    *
    * @param size The size in bytes.
    * @return a new ArrowBuf, or null if the request can't be satisfied
@@ -41,12 +36,11 @@ public interface BufferAllocator extends AutoCloseable {
   ArrowBuf buffer(long size);
 
   /**
-   * Allocate a new or reused buffer of the provided size. Note that the buffer may technically
-   * be larger than the
-   * requested size for rounding purposes. However, the buffer's capacity will be set to the
-   * configured size.
+   * Allocate a new or reused buffer of the provided size. Note that the buffer may technically be
+   * larger than the requested size for rounding purposes. However, the buffer's capacity will be
+   * set to the configured size.
    *
-   * @param size    The size in bytes.
+   * @param size The size in bytes.
    * @param manager A buffer manager to manage reallocation.
    * @return a new ArrowBuf, or null if the request can't be satisfied
    * @throws OutOfMemoryException if buffer cannot be allocated
@@ -54,8 +48,8 @@ public interface BufferAllocator extends AutoCloseable {
   ArrowBuf buffer(long size, BufferManager manager);
 
   /**
-   * Get the root allocator of this allocator. If this allocator is already a root, return
-   * this directly.
+   * Get the root allocator of this allocator. If this allocator is already a root, return this
+   * directly.
    *
    * @return The root allocator
    */
@@ -64,9 +58,9 @@ public interface BufferAllocator extends AutoCloseable {
   /**
    * Create a new child allocator.
    *
-   * @param name            the name of the allocator.
+   * @param name the name of the allocator.
    * @param initReservation the initial space reservation (obtained from this allocator)
-   * @param maxAllocation   maximum amount of space the new allocator can allocate
+   * @param maxAllocation maximum amount of space the new allocator can allocate
    * @return the new allocator, or null if it can't be created
    */
   BufferAllocator newChildAllocator(String name, long initReservation, long maxAllocation);
@@ -74,23 +68,20 @@ public interface BufferAllocator extends AutoCloseable {
   /**
    * Create a new child allocator.
    *
-   * @param name            the name of the allocator.
-   * @param listener        allocation listener for the newly created child
+   * @param name the name of the allocator.
+   * @param listener allocation listener for the newly created child
    * @param initReservation the initial space reservation (obtained from this allocator)
-   * @param maxAllocation   maximum amount of space the new allocator can allocate
+   * @param maxAllocation maximum amount of space the new allocator can allocate
    * @return the new allocator, or null if it can't be created
    */
   BufferAllocator newChildAllocator(
-      String name,
-      AllocationListener listener,
-      long initReservation,
-      long maxAllocation);
+      String name, AllocationListener listener, long initReservation, long maxAllocation);
 
   /**
    * Close and release all buffers generated from this buffer pool.
    *
-   * <p>When assertions are on, complains if there are any outstanding buffers; to avoid
-   * that, release all buffers before the allocator is closed.</p>
+   * <p>When assertions are on, complains if there are any outstanding buffers; to avoid that,
+   * release all buffers before the allocator is closed.
    */
   @Override
   void close();
@@ -131,8 +122,8 @@ BufferAllocator newChildAllocator(
   long getPeakMemoryAllocation();
 
   /**
-   * Returns the amount of memory that can probably be allocated at this moment
-   * without exceeding this or any parents allocation maximum.
+   * Returns the amount of memory that can probably be allocated at this moment without exceeding
+   * this or any parents allocation maximum.
    *
    * @return Headroom in bytes
    */
@@ -146,7 +137,6 @@ BufferAllocator newChildAllocator(
    */
   boolean forceAllocate(long size);
 
-
   /**
    * Release bytes from this allocator.
    *
@@ -157,8 +147,8 @@ BufferAllocator newChildAllocator(
   /**
    * Returns the allocation listener used by this allocator.
    *
-   * @return the {@link AllocationListener} instance. Or {@link AllocationListener#NOOP} by default if no listener
-   *         is configured when this allocator was created.
+   * @return the {@link AllocationListener} instance. Or {@link AllocationListener#NOOP} by default
+   *     if no listener is configured when this allocator was created.
    */
   AllocationListener getListener();
 
@@ -167,7 +157,8 @@ BufferAllocator newChildAllocator(
    *
    * @return parent allocator
    */
-  @Nullable BufferAllocator getParentAllocator();
+  @Nullable
+  BufferAllocator getParentAllocator();
 
   /**
    * Returns the set of child allocators.
@@ -177,8 +168,8 @@ BufferAllocator newChildAllocator(
   Collection<BufferAllocator> getChildAllocators();
 
   /**
-   * Create an allocation reservation. A reservation is a way of building up
-   * a request for a buffer whose size is not known in advance. See
+   * Create an allocation reservation. A reservation is a way of building up a request for a buffer
+   * whose size is not known in advance. See
    *
    * @return the newly created reservation
    * @see AllocationReservation
@@ -186,10 +177,9 @@ BufferAllocator newChildAllocator(
   AllocationReservation newReservation();
 
   /**
-   * Get a reference to the empty buffer associated with this allocator. Empty buffers are
-   * special because we don't
-   * worry about them leaking or managing reference counts on them since they don't actually
-   * point to any memory.
+   * Get a reference to the empty buffer associated with this allocator. Empty buffers are special
+   * because we don't worry about them leaking or managing reference counts on them since they don't
+   * actually point to any memory.
    *
    * @return the empty buffer
    */
@@ -197,8 +187,7 @@ BufferAllocator newChildAllocator(
 
   /**
    * Return the name of this allocator. This is a human readable name that can help debugging.
-   * Typically provides
-   * coordinates about where this allocator was created
+   * Typically provides coordinates about where this allocator was created
    *
    * @return the name of the allocator
    */
@@ -206,9 +195,8 @@ BufferAllocator newChildAllocator(
 
   /**
    * Return whether or not this allocator (or one if its parents) is over its limits. In the case
-   * that an allocator is
-   * over its limit, all consumers of that allocator should aggressively try to address the
-   * overlimit situation.
+   * that an allocator is over its limit, all consumers of that allocator should aggressively try to
+   * address the overlimit situation.
    *
    * @return whether or not this allocator (or one if its parents) is over its limits
    */
@@ -216,8 +204,7 @@ BufferAllocator newChildAllocator(
 
   /**
    * Return a verbose string describing this allocator. If in DEBUG mode, this will also include
-   * relevant stacktraces
-   * and historical logs for underlying objects
+   * relevant stacktraces and historical logs for underlying objects
    *
    * @return A very verbose description of the allocator hierarchy.
    */
@@ -225,14 +212,11 @@ BufferAllocator newChildAllocator(
 
   /**
    * Asserts (using java assertions) that the provided allocator is currently open. If assertions
-   * are disabled, this is
-   * a no-op.
+   * are disabled, this is a no-op.
    */
   void assertOpen();
 
-  /**
-   * Gets the rounding policy of the allocator.
-   */
+  /** Gets the rounding policy of the allocator. */
   default RoundingPolicy getRoundingPolicy() {
     return DefaultRoundingPolicy.DEFAULT_ROUNDING_POLICY;
   }
@@ -240,12 +224,12 @@ default RoundingPolicy getRoundingPolicy() {
   /**
    * EXPERIMENTAL: Wrap an allocation created outside this BufferAllocator.
    *
-   * <p>This is useful to integrate allocations from native code into the same memory management framework as
-   * Java-allocated buffers, presenting users a consistent API. The created buffer will be tracked by this allocator
-   * and can be transferred like Java-allocated buffers.
+   * <p>This is useful to integrate allocations from native code into the same memory management
+   * framework as Java-allocated buffers, presenting users a consistent API. The created buffer will
+   * be tracked by this allocator and can be transferred like Java-allocated buffers.
    *
-   * <p>The underlying allocation will be closed when all references to the buffer are released. If this method throws,
-   * the underlying allocation will also be closed.
+   * <p>The underlying allocation will be closed when all references to the buffer are released. If
+   * this method throws, the underlying allocation will also be closed.
    *
    * @param allocation The underlying allocation.
    */
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferLedger.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferLedger.java
index 62d268a1f4493..b562a421e7f89 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferLedger.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferLedger.java
@@ -14,27 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 import java.util.IdentityHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.apache.arrow.memory.util.CommonUtil;
 import org.apache.arrow.memory.util.HistoricalLog;
 import org.apache.arrow.util.Preconditions;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
- * The reference manager that binds an {@link AllocationManager} to
- * {@link BufferAllocator} and a set of {@link ArrowBuf}. The set of
- * ArrowBufs managed by this reference manager share a common
+ * The reference manager that binds an {@link AllocationManager} to {@link BufferAllocator} and a
+ * set of {@link ArrowBuf}. The set of ArrowBufs managed by this reference manager share a common
  * fate (same reference count).
  */
 public class BufferLedger implements ValueWithKeyIncluded<BufferAllocator>, ReferenceManager {
   private final @Nullable IdentityHashMap<ArrowBuf, @Nullable Object> buffers =
-          BaseAllocator.DEBUG ? new IdentityHashMap<>() : null;
+      BaseAllocator.DEBUG ? new IdentityHashMap<>() : null;
   private static final AtomicLong LEDGER_ID_GENERATOR = new AtomicLong(0);
   // unique ID assigned to each ledger
   private final long ledgerId = LEDGER_ID_GENERATOR.incrementAndGet();
@@ -45,8 +42,9 @@ public class BufferLedger implements ValueWithKeyIncluded<BufferAllocator>, Refe
   private final BufferAllocator allocator;
   private final AllocationManager allocationManager;
   private final @Nullable HistoricalLog historicalLog =
-      BaseAllocator.DEBUG ? new HistoricalLog(BaseAllocator.DEBUG_LOG_LENGTH,
-        "BufferLedger[%d]", 1) : null;
+      BaseAllocator.DEBUG
+          ? new HistoricalLog(BaseAllocator.DEBUG_LOG_LENGTH, "BufferLedger[%d]", 1)
+          : null;
   private volatile long lDestructionTime = 0;
 
   BufferLedger(final BufferAllocator allocator, final AllocationManager allocationManager) {
@@ -58,12 +56,14 @@ boolean isOwningLedger() {
     return this == allocationManager.getOwningLedger();
   }
 
+  @Override
   public BufferAllocator getKey() {
     return allocator;
   }
 
   /**
    * Get the buffer allocator associated with this reference manager.
+   *
    * @return buffer allocator
    */
   @Override
@@ -73,6 +73,7 @@ public BufferAllocator getAllocator() {
 
   /**
    * Get this ledger's reference count.
+   *
    * @return reference count
    */
   @Override
@@ -81,23 +82,21 @@ public int getRefCount() {
   }
 
   /**
-   * Increment the ledger's reference count for the associated
-   * underlying memory chunk. All ArrowBufs managed by this ledger
-   * will share the ref count.
+   * Increment the ledger's reference count for the associated underlying memory chunk. All
+   * ArrowBufs managed by this ledger will share the ref count.
    */
   void increment() {
     bufRefCnt.incrementAndGet();
   }
 
   /**
-   * Decrement the ledger's reference count by 1 for the associated underlying
-   * memory chunk. If the reference count drops to 0, it implies that
-   * no ArrowBufs managed by this reference manager need access to the memory
-   * chunk. In that case, the ledger should inform the allocation manager
-   * about releasing its ownership for the chunk. Whether or not the memory
-   * chunk will be released is something that {@link AllocationManager} will
-   * decide since tracks the usage of memory chunk across multiple reference
-   * managers and allocators.
+   * Decrement the ledger's reference count by 1 for the associated underlying memory chunk. If the
+   * reference count drops to 0, it implies that no ArrowBufs managed by this reference manager need
+   * access to the memory chunk. In that case, the ledger should inform the allocation manager about
+   * releasing its ownership for the chunk. Whether or not the memory chunk will be released is
+   * something that {@link AllocationManager} will decide since tracks the usage of memory chunk
+   * across multiple reference managers and allocators.
+   *
    * @return true if the new ref count has dropped to 0, false otherwise
    */
   @Override
@@ -106,26 +105,24 @@ public boolean release() {
   }
 
   /**
-   * Decrement the ledger's reference count for the associated underlying
-   * memory chunk. If the reference count drops to 0, it implies that
-   * no ArrowBufs managed by this reference manager need access to the memory
-   * chunk. In that case, the ledger should inform the allocation manager
-   * about releasing its ownership for the chunk. Whether or not the memory
-   * chunk will be released is something that {@link AllocationManager} will
-   * decide since tracks the usage of memory chunk across multiple reference
-   * managers and allocators.
+   * Decrement the ledger's reference count for the associated underlying memory chunk. If the
+   * reference count drops to 0, it implies that no ArrowBufs managed by this reference manager need
+   * access to the memory chunk. In that case, the ledger should inform the allocation manager about
+   * releasing its ownership for the chunk. Whether or not the memory chunk will be released is
+   * something that {@link AllocationManager} will decide since tracks the usage of memory chunk
+   * across multiple reference managers and allocators.
+   *
    * @param decrement amount to decrease the reference count by
    * @return true if the new ref count has dropped to 0, false otherwise
    */
   @Override
   public boolean release(int decrement) {
-    Preconditions.checkState(decrement >= 1,
-          "ref count decrement should be greater than or equal to 1");
+    Preconditions.checkState(
+        decrement >= 1, "ref count decrement should be greater than or equal to 1");
     // decrement the ref count
     final int refCnt = decrement(decrement);
     if (historicalLog != null) {
-      historicalLog.recordEvent("release(%d). original value: %d",
-          decrement, refCnt + decrement);
+      historicalLog.recordEvent("release(%d). original value: %d", decrement, refCnt + decrement);
     }
     // the new ref count should be >= 0
     Preconditions.checkState(refCnt >= 0, "RefCnt has gone negative");
@@ -133,14 +130,12 @@ public boolean release(int decrement) {
   }
 
   /**
-   * Decrement the ledger's reference count for the associated underlying
-   * memory chunk. If the reference count drops to 0, it implies that
-   * no ArrowBufs managed by this reference manager need access to the memory
-   * chunk. In that case, the ledger should inform the allocation manager
-   * about releasing its ownership for the chunk. Whether or not the memory
-   * chunk will be released is something that {@link AllocationManager} will
-   * decide since tracks the usage of memory chunk across multiple reference
-   * managers and allocators.
+   * Decrement the ledger's reference count for the associated underlying memory chunk. If the
+   * reference count drops to 0, it implies that no ArrowBufs managed by this reference manager need
+   * access to the memory chunk. In that case, the ledger should inform the allocation manager about
+   * releasing its ownership for the chunk. Whether or not the memory chunk will be released is
+   * something that {@link AllocationManager} will decide since tracks the usage of memory chunk
+   * across multiple reference managers and allocators.
    *
    * @param decrement amount to decrease the reference count by
    * @return the new reference count
@@ -161,18 +156,15 @@ private int decrement(int decrement) {
     return outcome;
   }
 
-  /**
-   * Increment the ledger's reference count for associated
-   * underlying memory chunk by 1.
-   */
+  /** Increment the ledger's reference count for associated underlying memory chunk by 1. */
   @Override
   public void retain() {
     retain(1);
   }
 
   /**
-   * Increment the ledger's reference count for associated
-   * underlying memory chunk by the given amount.
+   * Increment the ledger's reference count for associated underlying memory chunk by the given
+   * amount.
    *
    * @param increment amount to increase the reference count by
    */
@@ -187,21 +179,19 @@ public void retain(int increment) {
   }
 
   /**
-   * Derive a new ArrowBuf from a given source ArrowBuf. The new derived
-   * ArrowBuf will share the same reference count as rest of the ArrowBufs
-   * associated with this ledger. This operation is typically used for
-   * slicing -- creating new ArrowBufs from a compound ArrowBuf starting at
-   * a particular index in the underlying memory and having access to a
-   * particular length (in bytes) of data in memory chunk.
-   * <p>
-   * This method is also used as a helper for transferring ownership and retain to target
+   * Derive a new ArrowBuf from a given source ArrowBuf. The new derived ArrowBuf will share the
+   * same reference count as rest of the ArrowBufs associated with this ledger. This operation is
+   * typically used for slicing -- creating new ArrowBufs from a compound ArrowBuf starting at a
+   * particular index in the underlying memory and having access to a particular length (in bytes)
+   * of data in memory chunk.
+   *
+   * <p>This method is also used as a helper for transferring ownership and retain to target
    * allocator.
-   * </p>
+   *
    * @param sourceBuffer source ArrowBuf
-   * @param index index (relative to source ArrowBuf) new ArrowBuf should be
-   *              derived from
-   * @param length length (bytes) of data in underlying memory that derived buffer will
-   *               have access to in underlying memory
+   * @param index index (relative to source ArrowBuf) new ArrowBuf should be derived from
+   * @param length length (bytes) of data in underlying memory that derived buffer will have access
+   *     to in underlying memory
    * @return derived buffer
    */
   @Override
@@ -226,11 +216,13 @@ public ArrowBuf deriveBuffer(final ArrowBuf sourceBuffer, long index, long lengt
     final long derivedBufferAddress = sourceBuffer.memoryAddress() + index;
 
     // create new ArrowBuf
-    final ArrowBuf derivedBuf = new ArrowBuf(
+    final ArrowBuf derivedBuf =
+        new ArrowBuf(
             this,
             null,
             length, // length (in bytes) in the underlying memory chunk for this new ArrowBuf
-            derivedBufferAddress // starting byte address in the underlying memory for this new ArrowBuf
+            derivedBufferAddress // starting byte address in the underlying memory for this new
+            // ArrowBuf
             );
 
     // logging
@@ -238,16 +230,15 @@ public ArrowBuf deriveBuffer(final ArrowBuf sourceBuffer, long index, long lengt
   }
 
   /**
-   * Used by an allocator to create a new ArrowBuf. This is provided
-   * as a helper method for the allocator when it allocates a new memory chunk
-   * using a new instance of allocation manager and creates a new reference manager
-   * too.
+   * Used by an allocator to create a new ArrowBuf. This is provided as a helper method for the
+   * allocator when it allocates a new memory chunk using a new instance of allocation manager and
+   * creates a new reference manager too.
    *
-   * @param length  The length in bytes that this ArrowBuf will provide access to.
-   * @param manager An optional BufferManager argument that can be used to manage expansion of
-   *                this ArrowBuf
-   * @return A new ArrowBuf that shares references with all ArrowBufs associated
-   *         with this BufferLedger
+   * @param length The length in bytes that this ArrowBuf will provide access to.
+   * @param manager An optional BufferManager argument that can be used to manage expansion of this
+   *     ArrowBuf
+   * @return A new ArrowBuf that shares references with all ArrowBufs associated with this
+   *     BufferLedger
    */
   ArrowBuf newArrowBuf(final long length, final @Nullable BufferManager manager) {
     allocator.assertOpen();
@@ -265,9 +256,12 @@ ArrowBuf newArrowBuf(final long length, final @Nullable BufferManager manager) {
   private ArrowBuf loggingArrowBufHistoricalLog(ArrowBuf buf) {
     if (historicalLog != null) {
       historicalLog.recordEvent(
-          "ArrowBuf(BufferLedger, BufferAllocator[%s], " +
-          "UnsafeDirectLittleEndian[identityHashCode == " + "%d](%s)) => ledger hc == %d",
-          allocator.getName(), System.identityHashCode(buf), buf.toString(),
+          "ArrowBuf(BufferLedger, BufferAllocator[%s], "
+              + "UnsafeDirectLittleEndian[identityHashCode == "
+              + "%d](%s)) => ledger hc == %d",
+          allocator.getName(),
+          System.identityHashCode(buf),
+          buf.toString(),
           System.identityHashCode(this));
       Preconditions.checkState(buffers != null, "IdentityHashMap of buffers must not be null");
       synchronized (buffers) {
@@ -281,15 +275,15 @@ private ArrowBuf loggingArrowBufHistoricalLog(ArrowBuf buf) {
   /**
    * Create a new ArrowBuf that is associated with an alternative allocator for the purposes of
    * memory ownership and accounting. This has no impact on the reference counting for the current
-   * ArrowBuf except in the situation where the passed in Allocator is the same as the current buffer.
-   * <p>
-   * This operation has no impact on the reference count of this ArrowBuf. The newly created
+   * ArrowBuf except in the situation where the passed in Allocator is the same as the current
+   * buffer.
+   *
+   * <p>This operation has no impact on the reference count of this ArrowBuf. The newly created
    * ArrowBuf with either have a reference count of 1 (in the case that this is the first time this
-   * memory is being associated with the target allocator or in other words allocation manager currently
-   * doesn't hold a mapping for the target allocator) or the current value of the reference count for
-   * the target allocator-reference manager combination + 1 in the case that the provided allocator
-   * already had an association to this underlying memory.
-   * </p>
+   * memory is being associated with the target allocator or in other words allocation manager
+   * currently doesn't hold a mapping for the target allocator) or the current value of the
+   * reference count for the target allocator-reference manager combination + 1 in the case that the
+   * provided allocator already had an association to this underlying memory.
    *
    * @param srcBuffer source ArrowBuf
    * @param target The target allocator to create an association with.
@@ -319,20 +313,21 @@ public ArrowBuf retain(final ArrowBuf srcBuffer, BufferAllocator target) {
   }
 
   /**
-   * Transfer any balance the current ledger has to the target ledger. In the case
-   * that the current ledger holds no memory, no transfer is made to the new ledger.
+   * Transfer any balance the current ledger has to the target ledger. In the case that the current
+   * ledger holds no memory, no transfer is made to the new ledger.
    *
    * @param targetReferenceManager The ledger to transfer ownership account to.
    * @return Whether transfer fit within target ledgers limits.
    */
   boolean transferBalance(final @Nullable ReferenceManager targetReferenceManager) {
-    Preconditions.checkArgument(targetReferenceManager != null,
-            "Expecting valid target reference manager");
+    Preconditions.checkArgument(
+        targetReferenceManager != null, "Expecting valid target reference manager");
     boolean overlimit = false;
     if (targetReferenceManager != null) {
       final BufferAllocator targetAllocator = targetReferenceManager.getAllocator();
-      Preconditions.checkArgument(allocator.getRoot() == targetAllocator.getRoot(),
-              "You can only transfer between two allocators that share the same root.");
+      Preconditions.checkArgument(
+          allocator.getRoot() == targetAllocator.getRoot(),
+          "You can only transfer between two allocators that share the same root.");
 
       allocator.assertOpen();
       targetReferenceManager.getAllocator().assertOpen();
@@ -354,8 +349,8 @@ boolean transferBalance(final @Nullable ReferenceManager targetReferenceManager)
         }
 
         if (BaseAllocator.DEBUG && this.historicalLog != null) {
-          this.historicalLog.recordEvent("transferBalance(%s)",
-                  targetReferenceManager.getAllocator().getName());
+          this.historicalLog.recordEvent(
+              "transferBalance(%s)", targetReferenceManager.getAllocator().getName());
         }
 
         overlimit = targetAllocator.forceAllocate(allocationManager.getSize());
@@ -370,32 +365,30 @@ boolean transferBalance(final @Nullable ReferenceManager targetReferenceManager)
   }
 
   /**
-   * Transfer the memory accounting ownership of this ArrowBuf to another allocator.
-   * This will generate a new ArrowBuf that carries an association with the underlying memory
-   * of this ArrowBuf. If this ArrowBuf is connected to the owning BufferLedger of this memory,
-   * that memory ownership/accounting will be transferred to the target allocator. If this
-   * ArrowBuf does not currently own the memory underlying it (and is only associated with it),
-   * this does not transfer any ownership to the newly created ArrowBuf.
-   * <p>
-   * This operation has no impact on the reference count of this ArrowBuf. The newly created
-   * ArrowBuf with either have a reference count of 1 (in the case that this is the first time
-   * this memory is being associated with the new allocator) or the current value of the reference
-   * count for the other AllocationManager/BufferLedger combination + 1 in the case that the provided
+   * Transfer the memory accounting ownership of this ArrowBuf to another allocator. This will
+   * generate a new ArrowBuf that carries an association with the underlying memory of this
+   * ArrowBuf. If this ArrowBuf is connected to the owning BufferLedger of this memory, that memory
+   * ownership/accounting will be transferred to the target allocator. If this ArrowBuf does not
+   * currently own the memory underlying it (and is only associated with it), this does not transfer
+   * any ownership to the newly created ArrowBuf.
+   *
+   * <p>This operation has no impact on the reference count of this ArrowBuf. The newly created
+   * ArrowBuf with either have a reference count of 1 (in the case that this is the first time this
+   * memory is being associated with the new allocator) or the current value of the reference count
+   * for the other AllocationManager/BufferLedger combination + 1 in the case that the provided
    * allocator already had an association to this underlying memory.
-   * </p>
-   * <p>
-   * Transfers will always succeed, even if that puts the other allocator into an overlimit
+   *
+   * <p>Transfers will always succeed, even if that puts the other allocator into an overlimit
    * situation. This is possible due to the fact that the original owning allocator may have
    * allocated this memory out of a local reservation whereas the target allocator may need to
    * allocate new memory from a parent or RootAllocator. This operation is done n a mostly-lockless
    * but consistent manner. As such, the overlimit==true situation could occur slightly prematurely
    * to an actual overlimit==true condition. This is simply conservative behavior which means we may
    * return overlimit slightly sooner than is necessary.
-   * </p>
    *
    * @param target The allocator to transfer ownership to.
    * @return A new transfer result with the impact of the transfer (whether it was overlimit) as
-   *         well as the newly created ArrowBuf.
+   *     well as the newly created ArrowBuf.
    */
   @Override
   public TransferResult transferOwnership(final ArrowBuf srcBuffer, final BufferAllocator target) {
@@ -416,10 +409,8 @@ public TransferResult transferOwnership(final ArrowBuf srcBuffer, final BufferAl
     return new TransferResult(allocationFit, targetArrowBuf);
   }
 
-  /**
-   * The outcome of a Transfer.
-   */
-  public class TransferResult implements OwnershipTransferResult {
+  /** The outcome of a Transfer. */
+  public static class TransferResult implements OwnershipTransferResult {
 
     // Whether this transfer fit within the target allocator's capacity.
     final boolean allocationFit;
@@ -445,6 +436,7 @@ public boolean getAllocationFit() {
 
   /**
    * Total size (in bytes) of memory underlying this reference manager.
+   *
    * @return Size (in bytes) of the memory chunk
    */
   @Override
@@ -453,9 +445,10 @@ public long getSize() {
   }
 
   /**
-   * How much memory is accounted for by this ledger. This is either getSize()
-   * if this is the owning ledger for the memory or zero in the case that this
-   * is not the owning ledger associated with this memory.
+   * How much memory is accounted for by this ledger. This is either getSize() if this is the owning
+   * ledger for the memory or zero in the case that this is not the owning ledger associated with
+   * this memory.
+   *
    * @return Amount of accounted(owned) memory associated with this ledger.
    */
   @Override
@@ -472,8 +465,8 @@ public long getAccountedSize() {
   /**
    * Print the current ledger state to the provided StringBuilder.
    *
-   * @param sb        The StringBuilder to populate.
-   * @param indent    The level of indentation to position the data.
+   * @param sb The StringBuilder to populate.
+   * @param indent The level of indentation to position the data.
    * @param verbosity The level of verbosity to print.
    */
   void print(StringBuilder sb, int indent, BaseAllocator.Verbosity verbosity) {
@@ -498,9 +491,7 @@ void print(StringBuilder sb, int indent, BaseAllocator.Verbosity verbosity) {
     } else {
       Preconditions.checkArgument(buffers != null, "IdentityHashMap of buffers must not be null");
       synchronized (buffers) {
-        sb.append("] holds ")
-            .append(buffers.size())
-            .append(" buffers. \n");
+        sb.append("] holds ").append(buffers.size()).append(" buffers. \n");
         for (ArrowBuf buf : buffers.keySet()) {
           buf.print(sb, indent + 2, verbosity);
           sb.append('\n');
@@ -517,5 +508,4 @@ void print(StringBuilder sb, int indent, BaseAllocator.Verbosity verbosity) {
   public AllocationManager getAllocationManager() {
     return allocationManager;
   }
-
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferManager.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferManager.java
index 6b622e7192789..e73f6c119e7ea 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferManager.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/BufferManager.java
@@ -14,21 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 /**
- * Manages a list of {@link ArrowBuf}s that can be reallocated as needed. Upon
- * re-allocation the old buffer will be freed. Managing a list of these buffers
- * prevents some parts of the system from needing to define a correct location
- * to place the final call to free them.
+ * Manages a list of {@link ArrowBuf}s that can be reallocated as needed. Upon re-allocation the old
+ * buffer will be freed. Managing a list of these buffers prevents some parts of the system from
+ * needing to define a correct location to place the final call to free them.
  */
 public interface BufferManager extends AutoCloseable {
 
   /**
    * Replace an old buffer with a new version at least of the provided size. Does not copy data.
    *
-   * @param old     Old Buffer that the user is no longer going to use.
+   * @param old Old Buffer that the user is no longer going to use.
    * @param newSize Size of new replacement buffer.
    * @return A new version of the buffer.
    */
@@ -49,5 +47,6 @@ public interface BufferManager extends AutoCloseable {
    */
   ArrowBuf getManagedBuffer(long size);
 
+  @Override
   void close();
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/CheckAllocator.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/CheckAllocator.java
index dac4a3fcff59a..f595858ebf531 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/CheckAllocator.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/CheckAllocator.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 import java.io.IOException;
@@ -22,7 +21,6 @@
 import java.util.Enumeration;
 import java.util.LinkedHashSet;
 import java.util.Set;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,27 +37,28 @@ final class CheckAllocator {
   private static final String ALLOCATOR_PATH_NETTY =
       "org/apache/arrow/memory/netty/DefaultAllocationManagerFactory.class";
 
-  private CheckAllocator() {
-  }
+  private CheckAllocator() {}
 
   static String check() {
     Set<URL> urls = scanClasspath();
     URL rootAllocator = assertOnlyOne(urls);
     reportResult(rootAllocator);
-    if (rootAllocator.getPath().contains("memory-core") ||
-        rootAllocator.getPath().contains("/org/apache/arrow/memory/core/")) {
+    if (rootAllocator.getPath().contains("memory-core")
+        || rootAllocator.getPath().contains("/org/apache/arrow/memory/core/")) {
       return "org.apache.arrow.memory.DefaultAllocationManagerFactory";
-    } else if (rootAllocator.getPath().contains("memory-unsafe") ||
-        rootAllocator.getPath().contains("/org/apache/arrow/memory/unsafe/")) {
+    } else if (rootAllocator.getPath().contains("memory-unsafe")
+        || rootAllocator.getPath().contains("/org/apache/arrow/memory/unsafe/")) {
       return "org.apache.arrow.memory.unsafe.DefaultAllocationManagerFactory";
-    } else if (rootAllocator.getPath().contains("memory-netty") ||
-        rootAllocator.getPath().contains("/org/apache/arrow/memory/netty/")) {
+    } else if (rootAllocator.getPath().contains("memory-netty")
+        || rootAllocator.getPath().contains("/org/apache/arrow/memory/netty/")) {
       return "org.apache.arrow.memory.netty.DefaultAllocationManagerFactory";
     } else {
-      throw new IllegalStateException("Unknown allocation manager type to infer. Current: " + rootAllocator.getPath());
+      throw new IllegalStateException(
+          "Unknown allocation manager type to infer. Current: " + rootAllocator.getPath());
     }
   }
 
+  @SuppressWarnings("URLEqualsHashCode")
   private static Set<URL> scanClasspath() {
     // LinkedHashSet appropriate here because it preserves insertion order
     // during iteration
@@ -105,10 +104,10 @@ private static URL assertOnlyOne(Set<URL> urls) {
       logger.warn("More than one DefaultAllocationManager on classpath. Choosing first found");
     }
     if (urls.isEmpty()) {
-      throw new RuntimeException("No DefaultAllocationManager found on classpath. Can't allocate Arrow buffers." +
-          " Please consider adding arrow-memory-netty or arrow-memory-unsafe as a dependency.");
+      throw new RuntimeException(
+          "No DefaultAllocationManager found on classpath. Can't allocate Arrow buffers."
+              + " Please consider adding arrow-memory-netty or arrow-memory-unsafe as a dependency.");
     }
     return urls.iterator().next();
   }
-
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ChildAllocator.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ChildAllocator.java
index 67156f89d13aa..f8dd7e1d1cb38 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ChildAllocator.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ChildAllocator.java
@@ -14,17 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
-
 /**
- * Child allocator class. Only slightly different from the {@see RootAllocator},
- * in that these can't be created directly, but must be obtained from
- * {@see BufferAllocator#newChildAllocator(AllocatorOwner, long, long, int)}.
+ * Child allocator class. Only slightly different from the {@see RootAllocator}, in that these can't
+ * be created directly, but must be obtained from {@link BufferAllocator#newChildAllocator(String,
+ * AllocationListener, long, long)}.
  *
- * <p>Child allocators can only be created by the root, or other children, so
- * this class is package private.</p>
+ * <p>Child allocators can only be created by the root, or other children, so this class is package
+ * private.
  */
 class ChildAllocator extends BaseAllocator {
 
@@ -32,13 +30,10 @@ class ChildAllocator extends BaseAllocator {
    * Constructor.
    *
    * @param parentAllocator parent allocator -- the one creating this child
-   * @param name            the name of this child allocator
-   * @param config          configuration of this child allocator
+   * @param name the name of this child allocator
+   * @param config configuration of this child allocator
    */
-  ChildAllocator(
-          BaseAllocator parentAllocator,
-          String name,
-          Config config) {
+  ChildAllocator(BaseAllocator parentAllocator, String name, Config config) {
     super(parentAllocator, name, config);
   }
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/DefaultAllocationManagerOption.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/DefaultAllocationManagerOption.java
index 6d408abcc3433..b5e508017155a 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/DefaultAllocationManagerOption.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/DefaultAllocationManagerOption.java
@@ -14,62 +14,46 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 import java.lang.reflect.Field;
-
 import org.apache.arrow.util.VisibleForTesting;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-
-/**
- * A class for choosing the default allocation manager.
- */
+/** A class for choosing the default allocation manager. */
 public class DefaultAllocationManagerOption {
 
-  /**
-   * The environmental variable to set the default allocation manager type.
-   */
+  /** The environmental variable to set the default allocation manager type. */
   public static final String ALLOCATION_MANAGER_TYPE_ENV_NAME = "ARROW_ALLOCATION_MANAGER_TYPE";
 
-  /**
-   * The system property to set the default allocation manager type.
-   */
-  public static final String ALLOCATION_MANAGER_TYPE_PROPERTY_NAME = "arrow.allocation.manager.type";
+  /** The system property to set the default allocation manager type. */
+  public static final String ALLOCATION_MANAGER_TYPE_PROPERTY_NAME =
+      "arrow.allocation.manager.type";
 
-  static final org.slf4j.Logger LOGGER = org.slf4j.LoggerFactory.getLogger(DefaultAllocationManagerOption.class);
+  static final org.slf4j.Logger LOGGER =
+      org.slf4j.LoggerFactory.getLogger(DefaultAllocationManagerOption.class);
 
-  /**
-   * The default allocation manager factory.
-   */
+  /** The default allocation manager factory. */
   private static AllocationManager.@Nullable Factory DEFAULT_ALLOCATION_MANAGER_FACTORY = null;
 
-  /**
-   * The allocation manager type.
-   */
+  /** The allocation manager type. */
   public enum AllocationManagerType {
-    /**
-     * Netty based allocation manager.
-     */
+    /** Netty based allocation manager. */
     Netty,
 
-    /**
-     * Unsafe based allocation manager.
-     */
+    /** Unsafe based allocation manager. */
     Unsafe,
 
-    /**
-     * Unknown type.
-     */
+    /** Unknown type. */
     Unknown,
   }
 
   /**
    * Returns the default allocation manager type.
+   *
    * @return the default allocation manager type.
    */
-  @SuppressWarnings("nullness:argument") //enum types valueOf are implicitly non-null
+  @SuppressWarnings("nullness:argument") // enum types valueOf are implicitly non-null
   @VisibleForTesting
   public static AllocationManagerType getDefaultAllocationManagerType() {
     AllocationManagerType ret = AllocationManagerType.Unknown;
@@ -114,7 +98,7 @@ static AllocationManager.Factory getDefaultAllocationManagerFactory() {
   }
 
   @SuppressWarnings({"nullness:argument", "nullness:return"})
-  //incompatible argument for parameter obj of Field.get
+  // incompatible argument for parameter obj of Field.get
   // Static member qualifying type may not be annotated
   private static AllocationManager.Factory getFactory(String clazzName) {
     try {
@@ -130,8 +114,10 @@ private static AllocationManager.Factory getUnsafeFactory() {
     try {
       return getFactory("org.apache.arrow.memory.unsafe.UnsafeAllocationManager");
     } catch (RuntimeException e) {
-      throw new RuntimeException("Please add arrow-memory-unsafe to your classpath," +
-          " No DefaultAllocationManager found to instantiate an UnsafeAllocationManager", e);
+      throw new RuntimeException(
+          "Please add arrow-memory-unsafe to your classpath,"
+              + " No DefaultAllocationManager found to instantiate an UnsafeAllocationManager",
+          e);
     }
   }
 
@@ -139,8 +125,10 @@ private static AllocationManager.Factory getNettyFactory() {
     try {
       return getFactory("org.apache.arrow.memory.netty.NettyAllocationManager");
     } catch (RuntimeException e) {
-      throw new RuntimeException("Please add arrow-memory-netty to your classpath," +
-          " No DefaultAllocationManager found to instantiate an NettyAllocationManager", e);
+      throw new RuntimeException(
+          "Please add arrow-memory-netty to your classpath,"
+              + " No DefaultAllocationManager found to instantiate an NettyAllocationManager",
+          e);
     }
   }
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ForeignAllocation.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ForeignAllocation.java
index c1b47382a3884..536275b724070 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ForeignAllocation.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ForeignAllocation.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 /**
- * EXPERIMENTAL: a memory allocation that does not come from a BufferAllocator, but rather an outside source (like JNI).
+ * EXPERIMENTAL: a memory allocation that does not come from a BufferAllocator, but rather an
+ * outside source (like JNI).
  *
  * <p>To use this, subclass this class and implement {@link #release0()} to free the allocation.
  */
@@ -37,22 +37,16 @@ protected ForeignAllocation(long size, long memoryAddress) {
     this.size = size;
   }
 
-  /**
-   * Get the size of this allocation.
-   */
+  /** Get the size of this allocation. */
   public long getSize() {
     return size;
   }
 
-  /**
-   * Get the address of this allocation.
-   */
+  /** Get the address of this allocation. */
   protected long memoryAddress() {
     return memoryAddress;
   }
 
-  /**
-   * Free this allocation. Will only be called once.
-   */
+  /** Free this allocation. Will only be called once. */
   protected abstract void release0();
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ForeignAllocationManager.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ForeignAllocationManager.java
index 741b866f819ec..7b66e0c8c2fd2 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ForeignAllocationManager.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ForeignAllocationManager.java
@@ -14,16 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
-/**
- * An AllocationManager wrapping a ForeignAllocation.
- */
+/** An AllocationManager wrapping a ForeignAllocation. */
 class ForeignAllocationManager extends AllocationManager {
   private final ForeignAllocation allocation;
 
-  protected ForeignAllocationManager(BufferAllocator accountingAllocator, ForeignAllocation allocation) {
+  protected ForeignAllocationManager(
+      BufferAllocator accountingAllocator, ForeignAllocation allocation) {
     super(accountingAllocator);
     this.allocation = allocation;
   }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/LowCostIdentityHashMap.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/LowCostIdentityHashMap.java
index 740233ef411ff..d40b7ea7c524f 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/LowCostIdentityHashMap.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/LowCostIdentityHashMap.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 import org.apache.arrow.util.Preconditions;
@@ -24,11 +23,9 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
- * Highly specialized IdentityHashMap that implements only partial
- * Map APIs.
- * It incurs low initial cost (just two elements by default).
- * It assumes Value includes the Key - Implements @ValueWithKeyIncluded iface
- * that provides "getKey" method.
+ * Highly specialized IdentityHashMap that implements only partial Map APIs. It incurs low initial
+ * cost (just two elements by default). It assumes Value includes the Key -
+ * Implements @ValueWithKeyIncluded iface that provides "getKey" method.
  *
  * @param <K> Key type
  * @param <V> Value type
@@ -38,7 +35,7 @@ public class LowCostIdentityHashMap<K, V extends ValueWithKeyIncluded<K>> {
   /*
    * The internal data structure to hold values.
    */
-  private @Nullable Object [] elementData; // elementData[index] = null;
+  private @Nullable Object[] elementData; // elementData[index] = null;
 
   /* Actual number of values. */
   private int size;
@@ -54,9 +51,7 @@ public class LowCostIdentityHashMap<K, V extends ValueWithKeyIncluded<K>> {
   /* Default load factor of 0.75; */
   private static final int LOAD_FACTOR = 7500;
 
-  /**
-   * Creates a Map with default expected maximum size.
-   */
+  /** Creates a Map with default expected maximum size. */
   public LowCostIdentityHashMap() {
     this(DEFAULT_MIN_SIZE);
   }
@@ -64,9 +59,7 @@ public LowCostIdentityHashMap() {
   /**
    * Creates a Map with the specified maximum size parameter.
    *
-   * @param maxSize
-   *            The estimated maximum number of entries that will be put in
-   *            this map.
+   * @param maxSize The estimated maximum number of entries that will be put in this map.
    */
   public LowCostIdentityHashMap(int maxSize) {
     if (maxSize >= 0) {
@@ -78,8 +71,7 @@ public LowCostIdentityHashMap(int maxSize) {
     }
   }
 
-  private int getThreshold(@UnderInitialization LowCostIdentityHashMap<K, V> this,
-                           int maxSize) {
+  private int getThreshold(@UnderInitialization LowCostIdentityHashMap<K, V> this, int maxSize) {
     // assign the threshold to maxSize initially, this will change to a
     // higher value if rehashing occurs.
     return maxSize > 2 ? maxSize : 2;
@@ -95,22 +87,22 @@ private int computeElementArraySize(@UnderInitialization LowCostIdentityHashMap<
   /**
    * Create a new element array.
    *
-   * @param s
-   *            the number of elements
+   * @param s the number of elements
    * @return Reference to the element array
    */
-  private Object[] newElementArrayInitialized(@Initialized LowCostIdentityHashMap<K, V> this, int s) {
+  private Object[] newElementArrayInitialized(
+      @Initialized LowCostIdentityHashMap<K, V> this, int s) {
     return new Object[s];
   }
 
   /**
    * Create a new element array.
    *
-   * @param s
-   *            the number of elements
+   * @param s the number of elements
    * @return Reference to the element array
    */
-  private Object[] newElementArrayUnderInitialized(@UnderInitialization LowCostIdentityHashMap<K, V> this, int s) {
+  private Object[] newElementArrayUnderInitialized(
+      @UnderInitialization LowCostIdentityHashMap<K, V> this, int s) {
     return new Object[s];
   }
 
@@ -130,10 +122,8 @@ public void clear() {
   /**
    * Returns whether this map contains the specified key.
    *
-   * @param key
-   *            the key to search for.
-   * @return {@code true} if this map contains the specified key,
-   *         {@code false} otherwise.
+   * @param key the key to search for.
+   * @return {@code true} if this map contains the specified key, {@code false} otherwise.
    */
   public boolean containsKey(K key) {
     Preconditions.checkNotNull(key);
@@ -145,10 +135,8 @@ public boolean containsKey(K key) {
   /**
    * Returns whether this map contains the specified value.
    *
-   * @param value
-   *            the value to search for.
-   * @return {@code true} if this map contains the specified value,
-   *         {@code false} otherwise.
+   * @param value the value to search for.
+   * @return {@code true} if this map contains the specified value, {@code false} otherwise.
    */
   public boolean containsValue(V value) {
     Preconditions.checkNotNull(value);
@@ -172,13 +160,14 @@ public boolean containsValue(V value) {
 
     int index = findIndex(key, elementData);
 
-    return (elementData[index] == null) ? null :
-      (((V) elementData[index]).getKey() == key) ? (V) elementData[index] : null;
+    return (elementData[index] == null)
+        ? null
+        : (((V) elementData[index]).getKey() == key) ? (V) elementData[index] : null;
   }
 
   /**
-   * Returns the index where the key is found at, or the index of the next
-   * empty spot if the key is not found in this table.
+   * Returns the index where the key is found at, or the index of the next empty spot if the key is
+   * not found in this table.
    */
   @VisibleForTesting
   int findIndex(@Nullable Object key, @Nullable Object[] array) {
@@ -207,8 +196,8 @@ static int getModuloHash(@Nullable Object key, int length) {
    * Maps the specified key to the specified value.
    *
    * @param value the value.
-   * @return the value of any previous mapping with the specified key or
-   *         {@code null} if there was no such mapping.
+   * @return the value of any previous mapping with the specified key or {@code null} if there was
+   *     no such mapping.
    */
   public V put(V value) {
     Preconditions.checkNotNull(value);
@@ -255,15 +244,15 @@ void rehash() {
   }
 
   private void computeMaxSize() {
-    threshold = (int) ((long) (elementData.length) * LOAD_FACTOR / 10000);
+    threshold = (int) ((long) elementData.length * LOAD_FACTOR / 10000);
   }
 
   /**
    * Removes the mapping with the specified key from this map.
    *
    * @param key the key of the mapping to remove.
-   * @return the value of the removed mapping, or {@code null} if no mapping
-   *         for the specified key was found.
+   * @return the value of the removed mapping, or {@code null} if no mapping for the specified key
+   *     was found.
    */
   public @Nullable V remove(K key) {
     Preconditions.checkNotNull(key);
@@ -309,17 +298,13 @@ private void computeMaxSize() {
         elementData[index] = null;
       }
     }
-
     return (V) result;
   }
 
-
-
   /**
    * Returns whether this Map has no elements.
    *
-   * @return {@code true} if this Map has no elements,
-   *         {@code false} otherwise.
+   * @return {@code true} if this Map has no elements, {@code false} otherwise.
    * @see #size()
    */
   public boolean isEmpty() {
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/OutOfMemoryException.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/OutOfMemoryException.java
index 841ffcd8fa467..7a0f7f32107e2 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/OutOfMemoryException.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/OutOfMemoryException.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 import java.util.Optional;
@@ -22,14 +21,14 @@
 /**
  * Indicates memory could not be allocated for Arrow buffers.
  *
- * <p>This is different from {@linkplain OutOfMemoryError} which indicates the JVM
- * is out of memory.  This error indicates that static limit of one of Arrow's
- * allocators (e.g. {@linkplain BaseAllocator}) has been exceeded.
+ * <p>This is different from {@linkplain OutOfMemoryError} which indicates the JVM is out of memory.
+ * This error indicates that static limit of one of Arrow's allocators (e.g. {@linkplain
+ * BaseAllocator}) has been exceeded.
  */
 public class OutOfMemoryException extends RuntimeException {
 
-  static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(OutOfMemoryException
-      .class);
+  static final org.slf4j.Logger logger =
+      org.slf4j.LoggerFactory.getLogger(OutOfMemoryException.class);
   private static final long serialVersionUID = -6858052345185793382L;
   private Optional<AllocationOutcomeDetails> outcomeDetails = Optional.empty();
 
@@ -37,14 +36,13 @@ public OutOfMemoryException() {
     super();
   }
 
-  public OutOfMemoryException(String message, Throwable cause, boolean enableSuppression, boolean
-      writableStackTrace) {
+  public OutOfMemoryException(
+      String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
     super(message, cause, enableSuppression, writableStackTrace);
   }
 
   public OutOfMemoryException(String message, Throwable cause) {
     super(message, cause);
-
   }
 
   public OutOfMemoryException(String message) {
@@ -58,7 +56,6 @@ public OutOfMemoryException(String message, Optional<AllocationOutcomeDetails> d
 
   public OutOfMemoryException(Throwable cause) {
     super(cause);
-
   }
 
   public Optional<AllocationOutcomeDetails> getOutcomeDetails() {
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/OwnershipTransferNOOP.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/OwnershipTransferNOOP.java
index d4fed8448bf91..6b9e029719d0c 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/OwnershipTransferNOOP.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/OwnershipTransferNOOP.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
-/**
- * An {@link OwnershipTransferResult} indicating no transfer needed.
- */
+/** An {@link OwnershipTransferResult} indicating no transfer needed. */
 public class OwnershipTransferNOOP implements OwnershipTransferResult {
   private final ArrowBuf buffer;
 
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/OwnershipTransferResult.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/OwnershipTransferResult.java
index ef857d827a65a..04c223aa18f83 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/OwnershipTransferResult.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/OwnershipTransferResult.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
-/**
- * The result of transferring an {@link ArrowBuf} between {@linkplain BufferAllocator}s.
- */
+/** The result of transferring an {@link ArrowBuf} between {@linkplain BufferAllocator}s. */
 public interface OwnershipTransferResult {
 
   boolean getAllocationFit();
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ReferenceManager.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ReferenceManager.java
index 64a4232d8aeb7..48b937453f227 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ReferenceManager.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ReferenceManager.java
@@ -14,49 +14,52 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 /**
  * ReferenceManager is the reference count for one or more allocations.
  *
- * <p>In order to integrate with the core {@link BufferAllocator} implementation, the allocation itself should
- * be represented by an {@link AllocationManager}, though this is not required by the API.
+ * <p>In order to integrate with the core {@link BufferAllocator} implementation, the allocation
+ * itself should be represented by an {@link AllocationManager}, though this is not required by the
+ * API.
  */
 public interface ReferenceManager {
 
   /**
    * Return the reference count.
+   *
    * @return reference count
    */
   int getRefCount();
 
   /**
-   * Decrement this reference manager's reference count by 1 for the associated underlying
-   * memory. If the reference count drops to 0, it implies that ArrowBufs managed by this
-   * reference manager no longer need access to the underlying memory
+   * Decrement this reference manager's reference count by 1 for the associated underlying memory.
+   * If the reference count drops to 0, it implies that ArrowBufs managed by this reference manager
+   * no longer need access to the underlying memory
+   *
    * @return true if ref count has dropped to 0, false otherwise
    */
   boolean release();
 
   /**
-   * Decrement this reference manager's reference count for the associated underlying
-   * memory. If the reference count drops to 0, it implies that ArrowBufs managed by this
-   * reference manager no longer need access to the underlying memory
+   * Decrement this reference manager's reference count for the associated underlying memory. If the
+   * reference count drops to 0, it implies that ArrowBufs managed by this reference manager no
+   * longer need access to the underlying memory
+   *
    * @param decrement the count to decrease the reference count by
    * @return the new reference count
    */
   boolean release(int decrement);
 
   /**
-   * Increment this reference manager's reference count by 1 for the associated underlying
-   * memory.
+   * Increment this reference manager's reference count by 1 for the associated underlying memory.
    */
   void retain();
 
   /**
-   * Increment this reference manager's reference count by a given amount for the
-   * associated underlying memory.
+   * Increment this reference manager's reference count by a given amount for the associated
+   * underlying memory.
+   *
    * @param increment the count to increase the reference count by
    */
   void retain(int increment);
@@ -64,13 +67,13 @@ public interface ReferenceManager {
   /**
    * Create a new ArrowBuf that is associated with an alternative allocator for the purposes of
    * memory ownership and accounting. This has no impact on the reference counting for the current
-   * ArrowBuf except in the situation where the passed in Allocator is the same as the current buffer.
-   * This operation has no impact on the reference count of this ArrowBuf. The newly created
+   * ArrowBuf except in the situation where the passed in Allocator is the same as the current
+   * buffer. This operation has no impact on the reference count of this ArrowBuf. The newly created
    * ArrowBuf with either have a reference count of 1 (in the case that this is the first time this
-   * memory is being associated with the target allocator or in other words allocation manager currently
-   * doesn't hold a mapping for the target allocator) or the current value of the reference count for
-   * the target allocator-reference manager combination + 1 in the case that the provided allocator
-   * already had an association to this underlying memory.
+   * memory is being associated with the target allocator or in other words allocation manager
+   * currently doesn't hold a mapping for the target allocator) or the current value of the
+   * reference count for the target allocator-reference manager combination + 1 in the case that the
+   * provided allocator already had an association to this underlying memory.
    *
    * <p>The underlying allocation ({@link AllocationManager}) will not be copied.
    *
@@ -81,21 +84,21 @@ public interface ReferenceManager {
   ArrowBuf retain(ArrowBuf srcBuffer, BufferAllocator targetAllocator);
 
   /**
-   * Derive a new ArrowBuf from a given source ArrowBuf. The new derived
-   * ArrowBuf will share the same reference count as rest of the ArrowBufs
-   * associated with this reference manager.
+   * Derive a new ArrowBuf from a given source ArrowBuf. The new derived ArrowBuf will share the
+   * same reference count as rest of the ArrowBufs associated with this reference manager.
+   *
    * @param sourceBuffer source ArrowBuf
    * @param index index (relative to source ArrowBuf) new ArrowBuf should be derived from
-   * @param length length (bytes) of data in underlying memory that derived buffer will
-   *               have access to in underlying memory
+   * @param length length (bytes) of data in underlying memory that derived buffer will have access
+   *     to in underlying memory
    * @return derived buffer
    */
   ArrowBuf deriveBuffer(ArrowBuf sourceBuffer, long index, long length);
 
   /**
-   * Duplicate the memory accounting ownership of the backing allocation of the given ArrowBuf in another allocator.
-   * This will generate a new ArrowBuf that carries an association with the same underlying memory
-   * ({@link AllocationManager}s) as the given ArrowBuf.
+   * Duplicate the memory accounting ownership of the backing allocation of the given ArrowBuf in
+   * another allocator. This will generate a new ArrowBuf that carries an association with the same
+   * underlying memory ({@link AllocationManager}s) as the given ArrowBuf.
    *
    * @param sourceBuffer source ArrowBuf
    * @param targetAllocator The target allocator to create an association with
@@ -105,18 +108,21 @@ public interface ReferenceManager {
 
   /**
    * Get the buffer allocator associated with this reference manager.
+   *
    * @return buffer allocator.
    */
   BufferAllocator getAllocator();
 
   /**
    * Total size (in bytes) of memory underlying this reference manager.
+   *
    * @return Size (in bytes) of the memory chunk.
    */
   long getSize();
 
   /**
    * Get the total accounted size (in bytes).
+   *
    * @return accounted size.
    */
   long getAccountedSize();
@@ -124,59 +130,58 @@ public interface ReferenceManager {
   String NO_OP_ERROR_MESSAGE = "Operation not supported on NO_OP Reference Manager";
 
   // currently used for empty ArrowBufs
-  ReferenceManager NO_OP = new ReferenceManager() {
-    @Override
-    public int getRefCount() {
-      return 1;
-    }
-
-    @Override
-    public boolean release() {
-      return false;
-    }
-
-    @Override
-    public boolean release(int decrement) {
-      return false;
-    }
-
-    @Override
-    public void retain() {
-    }
-
-    @Override
-    public void retain(int increment) {
-    }
-
-    @Override
-    public ArrowBuf retain(ArrowBuf srcBuffer, BufferAllocator targetAllocator) {
-      return srcBuffer;
-    }
-
-    @Override
-    public ArrowBuf deriveBuffer(ArrowBuf sourceBuffer, long index, long length) {
-      return sourceBuffer;
-    }
-
-    @Override
-    public OwnershipTransferResult transferOwnership(ArrowBuf sourceBuffer, BufferAllocator targetAllocator) {
-      return new OwnershipTransferNOOP(sourceBuffer);
-    }
-
-    @Override
-    public BufferAllocator getAllocator() {
-      return new RootAllocator(0);
-    }
-
-    @Override
-    public long getSize() {
-      return 0L;
-    }
-
-    @Override
-    public long getAccountedSize() {
-      return 0L;
-    }
-
-  };
+  ReferenceManager NO_OP =
+      new ReferenceManager() {
+        @Override
+        public int getRefCount() {
+          return 1;
+        }
+
+        @Override
+        public boolean release() {
+          return false;
+        }
+
+        @Override
+        public boolean release(int decrement) {
+          return false;
+        }
+
+        @Override
+        public void retain() {}
+
+        @Override
+        public void retain(int increment) {}
+
+        @Override
+        public ArrowBuf retain(ArrowBuf srcBuffer, BufferAllocator targetAllocator) {
+          return srcBuffer;
+        }
+
+        @Override
+        public ArrowBuf deriveBuffer(ArrowBuf sourceBuffer, long index, long length) {
+          return sourceBuffer;
+        }
+
+        @Override
+        public OwnershipTransferResult transferOwnership(
+            ArrowBuf sourceBuffer, BufferAllocator targetAllocator) {
+          return new OwnershipTransferNOOP(sourceBuffer);
+        }
+
+        @Override
+        public BufferAllocator getAllocator() {
+          return new RootAllocator(0);
+        }
+
+        @Override
+        public long getSize() {
+          return 0L;
+        }
+
+        @Override
+        public long getAccountedSize() {
+          return 0L;
+        }
+      };
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ReusableBuffer.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ReusableBuffer.java
index 3530b819aadff..85359a0febba5 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ReusableBuffer.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ReusableBuffer.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 /**
  * A lightweight, automatically expanding container for holding byte data.
+ *
  * @param <T> The type of the underlying buffer.
  */
 public interface ReusableBuffer<T> {
@@ -29,19 +29,18 @@ public interface ReusableBuffer<T> {
    */
   long getLength();
 
-  /**
-   * Get the buffer backing this ReusableBuffer.
-   */
+  /** Get the buffer backing this ReusableBuffer. */
   T getBuffer();
 
   /**
-   * Set the buffer to the contents of the given ArrowBuf.
-   * The internal buffer must resize if it cannot fit the contents
-   * of the data.
+   * Set the buffer to the contents of the given ArrowBuf. The internal buffer must resize if it
+   * cannot fit the contents of the data.
    *
-   * @param srcBytes  the data to copy from
-   * @param start     the first position of the new data
-   * @param len       the number of bytes of the new data
+   * @param srcBytes the data to copy from
+   * @param start the first position of the new data
+   * @param len the number of bytes of the new data
    */
   void set(ArrowBuf srcBytes, long start, long len);
+
+  void set(byte[] srcBytes, long start, long len);
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/RootAllocator.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/RootAllocator.java
index 89889118c05a6..fcd1be6856937 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/RootAllocator.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/RootAllocator.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 import org.apache.arrow.memory.rounding.DefaultRoundingPolicy;
@@ -22,9 +21,8 @@
 import org.apache.arrow.util.VisibleForTesting;
 
 /**
- * A root allocator for using direct memory for Arrow Vectors/Arrays. Supports creating a
- * tree of descendant child allocators to facilitate better instrumentation of memory
- * allocations.
+ * A root allocator for using direct memory for Arrow Vectors/Arrays. Supports creating a tree of
+ * descendant child allocators to facilitate better instrumentation of memory allocations.
  */
 public class RootAllocator extends BaseAllocator {
 
@@ -37,33 +35,32 @@ public RootAllocator(final long limit) {
   }
 
   public RootAllocator(final AllocationListener listener, final long limit) {
-    //todo fix DefaultRoundingPolicy when using Netty
+    // todo fix DefaultRoundingPolicy when using Netty
     this(listener, limit, DefaultRoundingPolicy.DEFAULT_ROUNDING_POLICY);
   }
 
   /**
    * Constructor.
    *
-   * @param listener        the allocation listener
-   * @param limit           max allocation size in bytes
-   * @param roundingPolicy  the policy for rounding the buffer size
+   * @param listener the allocation listener
+   * @param limit max allocation size in bytes
+   * @param roundingPolicy the policy for rounding the buffer size
    */
-  public RootAllocator(final AllocationListener listener, final long limit, RoundingPolicy roundingPolicy) {
-    this(configBuilder()
-        .listener(listener)
-        .maxAllocation(limit)
-        .roundingPolicy(roundingPolicy)
-        .build()
-    );
+  public RootAllocator(
+      final AllocationListener listener, final long limit, RoundingPolicy roundingPolicy) {
+    this(
+        configBuilder()
+            .listener(listener)
+            .maxAllocation(limit)
+            .roundingPolicy(roundingPolicy)
+            .build());
   }
 
   public RootAllocator(Config config) {
     super(null, "ROOT", config);
   }
 
-  /**
-   * Verify the accounting state of the allocation system.
-   */
+  /** Verify the accounting state of the allocation system. */
   @VisibleForTesting
   public void verify() {
     verifyAllocator();
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ValueWithKeyIncluded.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ValueWithKeyIncluded.java
index 2699b6a464f25..0d480575ba81d 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ValueWithKeyIncluded.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/ValueWithKeyIncluded.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 /**
- * Helper interface to generify a value to be included in the map where
- * key is part of the value.
+ * Helper interface to generify a value to be included in the map where key is part of the value.
  *
  * @param <K> The type of the key.
  */
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/package-info.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/package-info.java
index c04df2e0c6fa8..de9c82ae56309 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/package-info.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/package-info.java
@@ -16,9 +16,7 @@
  */
 
 /**
- *  Memory Allocation, Accounting and Management.
- *  See the Arrow Java documentation for details: <a href="https://arrow.apache.org/docs/java/memory.html">Memory Management</a>
- *
+ * Memory Allocation, Accounting and Management. See the Arrow Java documentation for details: <a
+ * href="https://arrow.apache.org/docs/java/memory.html">Memory Management</a>
  */
-
 package org.apache.arrow.memory;
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/rounding/DefaultRoundingPolicy.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/rounding/DefaultRoundingPolicy.java
index 7ba231b0c2095..289b10634d84e 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/rounding/DefaultRoundingPolicy.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/rounding/DefaultRoundingPolicy.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.rounding;
 
 import org.apache.arrow.memory.util.CommonUtil;
@@ -22,9 +21,9 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The default rounding policy. That is, if the requested size is within the chunk size,
- * the rounded size will be the next power of two. Otherwise, the rounded size
- * will be identical to the requested size.
+ * The default rounding policy. That is, if the requested size is within the chunk size, the rounded
+ * size will be the next power of two. Otherwise, the rounded size will be identical to the
+ * requested size.
  */
 public class DefaultRoundingPolicy implements RoundingPolicy {
   private static final Logger logger = LoggerFactory.getLogger(DefaultRoundingPolicy.class);
@@ -33,31 +32,25 @@ public class DefaultRoundingPolicy implements RoundingPolicy {
   /**
    * The variables here and the static block calculates the DEFAULT_CHUNK_SIZE.
    *
-   * <p>
-   *   It was copied from {@link io.netty.buffer.PooledByteBufAllocator}.
-   * </p>
+   * <p>It was copied from {@link io.netty.buffer.PooledByteBufAllocator}.
    */
   private static final int MIN_PAGE_SIZE = 4096;
+
   private static final int MAX_CHUNK_SIZE = (int) (((long) Integer.MAX_VALUE + 1) / 2);
   private static final long DEFAULT_CHUNK_SIZE;
 
-
   static {
     int defaultPageSize = Integer.getInteger("org.apache.memory.allocator.pageSize", 8192);
-    Throwable pageSizeFallbackCause = null;
     try {
       validateAndCalculatePageShifts(defaultPageSize);
     } catch (Throwable t) {
-      pageSizeFallbackCause = t;
       defaultPageSize = 8192;
     }
 
     int defaultMaxOrder = Integer.getInteger("org.apache.memory.allocator.maxOrder", 11);
-    Throwable maxOrderFallbackCause = null;
     try {
       validateAndCalculateChunkSize(defaultPageSize, defaultMaxOrder);
     } catch (Throwable t) {
-      maxOrderFallbackCause = t;
       defaultMaxOrder = 11;
     }
     DEFAULT_CHUNK_SIZE = validateAndCalculateChunkSize(defaultPageSize, defaultMaxOrder);
@@ -69,7 +62,8 @@ public class DefaultRoundingPolicy implements RoundingPolicy {
 
   private static int validateAndCalculatePageShifts(int pageSize) {
     if (pageSize < MIN_PAGE_SIZE) {
-      throw new IllegalArgumentException("pageSize: " + pageSize + " (expected: " + MIN_PAGE_SIZE + ")");
+      throw new IllegalArgumentException(
+          "pageSize: " + pageSize + " (expected: " + MIN_PAGE_SIZE + ")");
     }
 
     if ((pageSize & pageSize - 1) != 0) {
@@ -87,20 +81,21 @@ private static int validateAndCalculateChunkSize(int pageSize, int maxOrder) {
 
     // Ensure the resulting chunkSize does not overflow.
     int chunkSize = pageSize;
-    for (int i = maxOrder; i > 0; i --) {
+    for (int i = maxOrder; i > 0; i--) {
       if (chunkSize > MAX_CHUNK_SIZE / 2) {
-        throw new IllegalArgumentException(String.format(
-            "pageSize (%d) << maxOrder (%d) must not exceed %d", pageSize, maxOrder, MAX_CHUNK_SIZE));
+        throw new IllegalArgumentException(
+            String.format(
+                "pageSize (%d) << maxOrder (%d) must not exceed %d",
+                pageSize, maxOrder, MAX_CHUNK_SIZE));
       }
       chunkSize <<= 1;
     }
     return chunkSize;
   }
 
-  /**
-   * The singleton instance.
-   */
-  public static final DefaultRoundingPolicy DEFAULT_ROUNDING_POLICY = new DefaultRoundingPolicy(DEFAULT_CHUNK_SIZE);
+  /** The singleton instance. */
+  public static final DefaultRoundingPolicy DEFAULT_ROUNDING_POLICY =
+      new DefaultRoundingPolicy(DEFAULT_CHUNK_SIZE);
 
   private DefaultRoundingPolicy(long chunkSize) {
     this.chunkSize = chunkSize;
@@ -108,7 +103,6 @@ private DefaultRoundingPolicy(long chunkSize) {
 
   @Override
   public long getRoundedSize(long requestSize) {
-    return requestSize < chunkSize ?
-            CommonUtil.nextPowerOfTwo(requestSize) : requestSize;
+    return requestSize < chunkSize ? CommonUtil.nextPowerOfTwo(requestSize) : requestSize;
   }
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/rounding/RoundingPolicy.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/rounding/RoundingPolicy.java
index 434b9a0cdf761..5270bce99a8da 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/rounding/RoundingPolicy.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/rounding/RoundingPolicy.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.rounding;
 
 /**
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/rounding/SegmentRoundingPolicy.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/rounding/SegmentRoundingPolicy.java
index d2bc4451d0a3c..f501cfedd168d 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/rounding/SegmentRoundingPolicy.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/rounding/SegmentRoundingPolicy.java
@@ -14,38 +14,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.rounding;
 
 import org.apache.arrow.util.Preconditions;
 
-/**
- * The rounding policy that each buffer size must a multiple of the segment size.
- */
+/** The rounding policy that each buffer size must a multiple of the segment size. */
 public class SegmentRoundingPolicy implements RoundingPolicy {
 
-  /**
-   * The minimal segment size.
-   */
+  /** The minimal segment size. */
   public static final long MIN_SEGMENT_SIZE = 1024L;
 
   /**
-   * The segment size. It must be at least {@link SegmentRoundingPolicy#MIN_SEGMENT_SIZE},
-   * and be a power of 2.
+   * The segment size. It must be at least {@link SegmentRoundingPolicy#MIN_SEGMENT_SIZE}, and be a
+   * power of 2.
    */
   private int segmentSize;
 
   /**
    * Constructor for the segment rounding policy.
+   *
    * @param segmentSize the segment size.
-   * @throws IllegalArgumentException if the segment size is smaller than
-   * {@link SegmentRoundingPolicy#MIN_SEGMENT_SIZE}, or is not a power of 2.
+   * @throws IllegalArgumentException if the segment size is smaller than {@link
+   *     SegmentRoundingPolicy#MIN_SEGMENT_SIZE}, or is not a power of 2.
    */
   public SegmentRoundingPolicy(int segmentSize) {
-    Preconditions.checkArgument(segmentSize >= MIN_SEGMENT_SIZE,
-            "The segment size cannot be smaller than %s", MIN_SEGMENT_SIZE);
-    Preconditions.checkArgument((segmentSize & (segmentSize - 1)) == 0,
-            "The segment size must be a power of 2");
+    Preconditions.checkArgument(
+        segmentSize >= MIN_SEGMENT_SIZE,
+        "The segment size cannot be smaller than %s",
+        MIN_SEGMENT_SIZE);
+    Preconditions.checkArgument(
+        (segmentSize & (segmentSize - 1)) == 0, "The segment size must be a power of 2");
     this.segmentSize = segmentSize;
   }
 
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/ArrowBufPointer.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/ArrowBufPointer.java
index b41576847d6b7..610ce04647ec7 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/ArrowBufPointer.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/ArrowBufPointer.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util;
 
 import org.apache.arrow.memory.ArrowBuf;
@@ -24,14 +23,12 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
- * Pointer to a memory region within an {@link ArrowBuf}.
- * It will be used as the basis for calculating hash code within a vector, and equality determination.
+ * Pointer to a memory region within an {@link ArrowBuf}. It will be used as the basis for
+ * calculating hash code within a vector, and equality determination.
  */
-public final class ArrowBufPointer {
+public final class ArrowBufPointer implements Comparable<ArrowBufPointer> {
 
-  /**
-   * The hash code when the arrow buffer is null.
-   */
+  /** The hash code when the arrow buffer is null. */
   public static final int NULL_HASH_CODE = 0;
 
   private @Nullable ArrowBuf buf;
@@ -44,20 +41,17 @@ public final class ArrowBufPointer {
 
   private final ArrowBufHasher hasher;
 
-  /**
-   * A flag indicating if the underlying memory region has changed.
-   */
+  /** A flag indicating if the underlying memory region has changed. */
   private boolean hashCodeChanged = false;
 
-  /**
-   * The default constructor.
-   */
+  /** The default constructor. */
   public ArrowBufPointer() {
     this(SimpleHasher.INSTANCE);
   }
 
   /**
    * Constructs an arrow buffer pointer with the specified hasher.
+   *
    * @param hasher the hasher to use.
    */
   public ArrowBufPointer(ArrowBufHasher hasher) {
@@ -68,6 +62,7 @@ public ArrowBufPointer(ArrowBufHasher hasher) {
 
   /**
    * Constructs an Arrow buffer pointer.
+   *
    * @param buf the underlying {@link ArrowBuf}, which can be null.
    * @param offset the start off set of the memory region pointed to.
    * @param length the length off set of the memory region pointed to.
@@ -78,6 +73,7 @@ public ArrowBufPointer(ArrowBuf buf, long offset, long length) {
 
   /**
    * Constructs an Arrow buffer pointer.
+   *
    * @param buf the underlying {@link ArrowBuf}, which can be null.
    * @param offset the start off set of the memory region pointed to.
    * @param length the length off set of the memory region pointed to.
@@ -91,11 +87,11 @@ public ArrowBufPointer(ArrowBuf buf, long offset, long length, ArrowBufHasher ha
 
   /**
    * Sets this pointer.
+   *
    * @param buf the underlying {@link ArrowBuf}, which can be null.
    * @param offset the start off set of the memory region pointed to.
    * @param length the length off set of the memory region pointed to.
    */
-
   public void set(ArrowBuf buf, long offset, long length) {
     this.buf = buf;
     this.offset = offset;
@@ -106,6 +102,7 @@ public void set(ArrowBuf buf, long offset, long length) {
 
   /**
    * Gets the underlying buffer, or null if the underlying data is invalid or null.
+   *
    * @return the underlying buffer, if any, or null if the underlying data is invalid or null.
    */
   public @Nullable ArrowBuf getBuf() {
@@ -145,8 +142,9 @@ public boolean equals(@Nullable Object o) {
       }
     }
 
-    return ByteFunctionHelpers.equal(buf, offset, offset + length,
-            other.buf, other.offset, other.offset + other.length) != 0;
+    return ByteFunctionHelpers.equal(
+            buf, offset, offset + length, other.buf, other.offset, other.offset + other.length)
+        != 0;
   }
 
   @Override
@@ -167,13 +165,13 @@ public int hashCode() {
   }
 
   /**
-   * Compare two arrow buffer pointers.
-   * The comparison is based on lexicographic order.
+   * Compare two arrow buffer pointers. The comparison is based on lexicographic order.
+   *
    * @param that the other pointer to compare.
-   * @return 0 if the two pointers are equal;
-   *     a positive integer if this pointer is larger;
-   *     a negative integer if this pointer is smaller.
+   * @return 0 if the two pointers are equal; a positive integer if this pointer is larger; a
+   *     negative integer if this pointer is smaller.
    */
+  @Override
   public int compareTo(ArrowBufPointer that) {
     if (this.buf == null || that.buf == null) {
       if (this.buf == null && that.buf == null) {
@@ -184,7 +182,12 @@ public int compareTo(ArrowBufPointer that) {
       }
     }
 
-    return ByteFunctionHelpers.compare(this.buf, this.offset, this.offset + this.length,
-            that.buf, that.offset, that.offset + that.length);
+    return ByteFunctionHelpers.compare(
+        this.buf,
+        this.offset,
+        this.offset + this.length,
+        that.buf,
+        that.offset,
+        that.offset + that.length);
   }
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/AssertionUtil.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/AssertionUtil.java
index 5e5b331faeb7b..c2712eb4776cd 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/AssertionUtil.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/AssertionUtil.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util;
 
 /**
- * Utility class to that provides {@link #ASSERT_ENABLED} constant to determine if assertions are enabled.
+ * Utility class to that provides {@link #ASSERT_ENABLED} constant to determine if assertions are
+ * enabled.
  */
 public class AssertionUtil {
 
@@ -31,8 +31,7 @@ public class AssertionUtil {
     ASSERT_ENABLED = isAssertEnabled;
   }
 
-  private AssertionUtil() {
-  }
+  private AssertionUtil() {}
 
   public static boolean isAssertionsEnabled() {
     return ASSERT_ENABLED;
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/AutoCloseableLock.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/AutoCloseableLock.java
index 95228cf78c7c9..961e772ac4896 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/AutoCloseableLock.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/AutoCloseableLock.java
@@ -14,14 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util;
 
 import java.util.concurrent.locks.Lock;
 
-/**
- * Simple wrapper class that allows Locks to be released via a try-with-resources block.
- */
+/** Simple wrapper class that allows Locks to be released via a try-with-resources block. */
 public class AutoCloseableLock implements AutoCloseable {
 
   private final Lock lock;
@@ -39,5 +36,4 @@ public AutoCloseableLock open() {
   public void close() {
     lock.unlock();
   }
-
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/ByteFunctionHelpers.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/ByteFunctionHelpers.java
index 79d21fa040876..44289183a318d 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/ByteFunctionHelpers.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/ByteFunctionHelpers.java
@@ -14,39 +14,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util;
 
 import java.nio.ByteOrder;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BoundsChecking;
 import org.apache.arrow.memory.util.hash.ArrowBufHasher;
 import org.apache.arrow.memory.util.hash.SimpleHasher;
 
-/**
- * Utility methods for memory comparison at a byte level.
- */
+/** Utility methods for memory comparison at a byte level. */
 public class ByteFunctionHelpers {
-  static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ByteFunctionHelpers.class);
+  static final org.slf4j.Logger logger =
+      org.slf4j.LoggerFactory.getLogger(ByteFunctionHelpers.class);
 
   private static final boolean LITTLE_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN;
 
-  private ByteFunctionHelpers() {
-  }
+  private ByteFunctionHelpers() {}
 
   /**
    * Helper function to check for equality of bytes in two ArrowBufs.
    *
-   * @param left   Left ArrowBuf for comparison
+   * @param left Left ArrowBuf for comparison
    * @param lStart start offset in the buffer
-   * @param lEnd   end offset in the buffer
-   * @param right  Right ArrowBuf for comparison
+   * @param lEnd end offset in the buffer
+   * @param right Right ArrowBuf for comparison
    * @param rStart start offset in the buffer
-   * @param rEnd   end offset in the buffer
+   * @param rEnd end offset in the buffer
    * @return 1 if equals, 0 otherwise
    */
-  public static int equal(final ArrowBuf left, long lStart, long lEnd, final ArrowBuf right, long rStart, long rEnd) {
+  public static int equal(
+      final ArrowBuf left, long lStart, long lEnd, final ArrowBuf right, long rStart, long rEnd) {
     if (BoundsChecking.BOUNDS_CHECKING_ENABLED) {
       left.checkBytes(lStart, lEnd);
       right.checkBytes(rStart, rEnd);
@@ -54,8 +51,8 @@ public static int equal(final ArrowBuf left, long lStart, long lEnd, final Arrow
     return memEqual(left.memoryAddress(), lStart, lEnd, right.memoryAddress(), rStart, rEnd);
   }
 
-  private static int memEqual(final long laddr, long lStart, long lEnd, final long raddr, long rStart,
-                                    final long rEnd) {
+  private static int memEqual(
+      final long laddr, long lStart, long lEnd, final long raddr, long rStart, final long rEnd) {
 
     long n = lEnd - lStart;
     if (n == rEnd - rStart) {
@@ -117,21 +114,16 @@ private static int memEqual(final long laddr, long lStart, long lEnd, final long
    *
    * <p>Function will check data before completing in the case that
    *
-   * @param left   Left ArrowBuf to compare
+   * @param left Left ArrowBuf to compare
    * @param lStart start offset in the buffer
-   * @param lEnd   end offset in the buffer
-   * @param right  Right ArrowBuf to compare
+   * @param lEnd end offset in the buffer
+   * @param right Right ArrowBuf to compare
    * @param rStart start offset in the buffer
-   * @param rEnd   end offset in the buffer
+   * @param rEnd end offset in the buffer
    * @return 1 if left input is greater, -1 if left input is smaller, 0 otherwise
    */
   public static int compare(
-      final ArrowBuf left,
-      long lStart,
-      long lEnd,
-      final ArrowBuf right,
-      long rStart,
-      long rEnd) {
+      final ArrowBuf left, long lStart, long lEnd, final ArrowBuf right, long rStart, long rEnd) {
     if (BoundsChecking.BOUNDS_CHECKING_ENABLED) {
       left.checkBytes(lStart, lEnd);
       right.checkBytes(rStart, rEnd);
@@ -140,12 +132,7 @@ public static int compare(
   }
 
   private static int memcmp(
-      final long laddr,
-      long lStart,
-      long lEnd,
-      final long raddr,
-      long rStart,
-      final long rEnd) {
+      final long laddr, long lStart, long lEnd, final long raddr, long rStart, final long rEnd) {
     long lLen = lEnd - lStart;
     long rLen = rEnd - rStart;
     long n = Math.min(rLen, lLen);
@@ -214,37 +201,30 @@ private static int memcmp(
     }
 
     return lLen > rLen ? 1 : -1;
-
   }
 
   /**
    * Helper function to compare a set of bytes in ArrowBuf to a ByteArray.
    *
-   * @param left   Left ArrowBuf for comparison purposes
+   * @param left Left ArrowBuf for comparison purposes
    * @param lStart start offset in the buffer
-   * @param lEnd   end offset in the buffer
-   * @param right  second input to be compared
+   * @param lEnd end offset in the buffer
+   * @param right second input to be compared
    * @param rStart start offset in the byte array
-   * @param rEnd   end offset in the byte array
+   * @param rEnd end offset in the byte array
    * @return 1 if left input is greater, -1 if left input is smaller, 0 otherwise
    */
   public static int compare(
-      final ArrowBuf left,
-      int lStart,
-      int lEnd,
-      final byte[] right,
-      int rStart,
-      final int rEnd) {
+      final ArrowBuf left, int lStart, int lEnd, final byte[] right, int rStart, final int rEnd) {
     if (BoundsChecking.BOUNDS_CHECKING_ENABLED) {
       left.checkBytes(lStart, lEnd);
     }
     return memcmp(left.memoryAddress(), lStart, lEnd, right, rStart, rEnd);
   }
 
-
   /**
-   * Compares the two specified {@code long} values, treating them as unsigned values between
-   * {@code 0} and {@code 2^64 - 1} inclusive.
+   * Compares the two specified {@code long} values, treating them as unsigned values between {@code
+   * 0} and {@code 2^64 - 1} inclusive.
    *
    * @param a the first unsigned {@code long} to compare
    * @param b the second unsigned {@code long} to compare
@@ -260,12 +240,7 @@ public static int unsignedIntCompare(int a, int b) {
   }
 
   private static int memcmp(
-      final long laddr,
-      int lStart,
-      int lEnd,
-      final byte[] right,
-      int rStart,
-      final int rEnd) {
+      final long laddr, int lStart, int lEnd, final byte[] right, int rStart, final int rEnd) {
     int lLen = lEnd - lStart;
     int rLen = rEnd - rStart;
     int n = Math.min(rLen, lLen);
@@ -319,9 +294,7 @@ private static int memcmp(
     return lLen > rLen ? 1 : -1;
   }
 
-  /**
-   * Compute hashCode with the given {@link ArrowBuf} and start/end index.
-   */
+  /** Compute hashCode with the given {@link ArrowBuf} and start/end index. */
   public static int hash(final ArrowBuf buf, long start, long end) {
 
     return hash(SimpleHasher.INSTANCE, buf, start, end);
@@ -339,9 +312,7 @@ public static final int hash(ArrowBufHasher hasher, final ArrowBuf buf, long sta
     return hasher.hashCode(buf, start, end - start);
   }
 
-  /**
-   * Generate a new hashCode with the given current hashCode and new hashCode.
-   */
+  /** Generate a new hashCode with the given current hashCode and new hashCode. */
   public static int combineHash(int currentHash, int newHash) {
     return currentHash * 31 + newHash;
   }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/CommonUtil.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/CommonUtil.java
index 707c5f1556062..d8e7be7a95125 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/CommonUtil.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/CommonUtil.java
@@ -14,18 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util;
 
 import java.util.Arrays;
 
-/**
- * Utilities and static methods needed for arrow-memory.
- */
+/** Utilities and static methods needed for arrow-memory. */
 public final class CommonUtil {
 
-  private CommonUtil() {
-  }
+  private CommonUtil() {}
 
   /**
    * Rounds up the provided value to the nearest power of two.
@@ -77,4 +73,3 @@ public static StringBuilder indent(StringBuilder sb, int indent) {
     return sb;
   }
 }
-
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/Float16.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/Float16.java
index 8040158fd090e..f19f50956eb16 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/Float16.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/Float16.java
@@ -14,34 +14,35 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util;
 
-
 import org.apache.arrow.util.VisibleForTesting;
 
 /**
  * Lifted from Apache Parquet MR project:
  * https://github.com/apache/parquet-mr/blob/e87b80308869b77f914fcfd04364686e11158950/parquet-column/src/main/java/org/apache/parquet/schema/Float16.java
+ *
  * <ul>
- * Changes made:
- * <li>Modify the data type input from Parquet-MR Binary (toFloat(Binary b)) to Arrow Java short (toFloat(short b))</li>
- * <li>Expose NAN and POSITIVE_INFINITY variables</li>
+ *   Changes made:
+ *   <li>Modify the data type input from Parquet-MR Binary (toFloat(Binary b)) to Arrow Java short
+ *       (toFloat(short b))
+ *   <li>Expose NAN and POSITIVE_INFINITY variables
  * </ul>
  *
+ * The class is a utility class to manipulate half-precision 16-bit <a
+ * href="https://en.wikipedia.org/wiki/Half-precision_floating-point_format">IEEE 754</a> floating
+ * point data types (also called fp16 or binary16). A half-precision float can be created from or
+ * converted to single-precision floats, and is stored in a short data type. The IEEE 754 standard
+ * specifies an float16 as having the following format:
  *
- * The class is a utility class to manipulate half-precision 16-bit
- * <a href="https://en.wikipedia.org/wiki/Half-precision_floating-point_format">IEEE 754</a>
- * floating point data types (also called fp16 or binary16). A half-precision float can be
- * created from or converted to single-precision floats, and is stored in a short data type.
- * The IEEE 754 standard specifies an float16 as having the following format:
  * <ul>
- * <li>Sign bit: 1 bit</li>
- * <li>Exponent width: 5 bits</li>
- * <li>Significand: 10 bits</li>
+ *   <li>Sign bit: 1 bit
+ *   <li>Exponent width: 5 bits
+ *   <li>Significand: 10 bits
  * </ul>
  *
- * <p>The format is laid out as follows:</p>
+ * <p>The format is laid out as follows:
+ *
  * <pre>
  * 1   11111   1111111111
  * ^   --^--   -----^----
@@ -49,10 +50,10 @@
  *       |
  *      -- exponent
  * </pre>
- * Half-precision floating points can be useful to save memory and/or
- * bandwidth at the expense of range and precision when compared to single-precision
- * floating points (float32).
- * Ref: https://android.googlesource.com/platform/libcore/+/master/luni/src/main/java/libcore/util/FP16.java
+ *
+ * Half-precision floating points can be useful to save memory and/or bandwidth at the expense of
+ * range and precision when compared to single-precision floating points (float32). Ref:
+ * https://android.googlesource.com/platform/libcore/+/master/luni/src/main/java/libcore/util/FP16.java
  */
 public class Float16 {
   // Positive infinity of type half-precision float.
@@ -84,12 +85,11 @@ public class Float16 {
   private static final float FP32_DENORMAL_FLOAT = Float.intBitsToFloat(FP32_DENORMAL_MAGIC);
 
   /**
-   * Returns true if the specified half-precision float value represents
-   * a Not-a-Number, false otherwise.
+   * Returns true if the specified half-precision float value represents a Not-a-Number, false
+   * otherwise.
    *
    * @param h A half-precision float value
    * @return True if the value is a NaN, false otherwise
-   *
    */
   @VisibleForTesting
   public static boolean isNaN(short h) {
@@ -97,23 +97,20 @@ public static boolean isNaN(short h) {
   }
 
   /**
-   * <p>Compares the two specified half-precision float values. The following
-   * conditions apply during the comparison:</p>
+   * Compares the two specified half-precision float values. The following conditions apply during
+   * the comparison:
    *
    * <ul>
-   * <li>NaN is considered by this method to be equal to itself and greater
-   * than all other half-precision float values (including {@code #POSITIVE_INFINITY})</li>
-   * <li>POSITIVE_ZERO is considered by this method to be greater than NEGATIVE_ZERO.</li>
+   *   <li>NaN is considered by this method to be equal to itself and greater than all other
+   *       half-precision float values (including {@code #POSITIVE_INFINITY})
+   *   <li>POSITIVE_ZERO is considered by this method to be greater than NEGATIVE_ZERO.
    * </ul>
    *
    * @param x The first half-precision float value to compare.
    * @param y The second half-precision float value to compare
-   *
-   * @return  The value {@code 0} if {@code x} is numerically equal to {@code y}, a
-   *          value less than {@code 0} if {@code x} is numerically less than {@code y},
-   *          and a value greater than {@code 0} if {@code x} is numerically greater
-   *          than {@code y}
-   *
+   * @return The value {@code 0} if {@code x} is numerically equal to {@code y}, a value less than
+   *     {@code 0} if {@code x} is numerically less than {@code y}, and a value greater than {@code
+   *     0} if {@code x} is numerically greater than {@code y}
    */
   @VisibleForTesting
   public static int compare(short x, short y) {
@@ -145,13 +142,12 @@ public static int compare(short x, short y) {
   }
 
   /**
-   * Converts the specified half-precision float value into a
-   * single-precision float value. The following special cases are handled:
-   * If the input is NaN, the returned value is Float NaN.
-   * If the input is POSITIVE_INFINITY or NEGATIVE_INFINITY, the returned value is respectively
-   *   Float POSITIVE_INFINITY or Float NEGATIVE_INFINITY.
-   * If the input is 0 (positive or negative), the returned value is +/-0.0f.
-   * Otherwise, the returned value is a normalized single-precision float value.
+   * Converts the specified half-precision float value into a single-precision float value. The
+   * following special cases are handled: If the input is NaN, the returned value is Float NaN. If
+   * the input is POSITIVE_INFINITY or NEGATIVE_INFINITY, the returned value is respectively Float
+   * POSITIVE_INFINITY or Float NEGATIVE_INFINITY. If the input is 0 (positive or negative), the
+   * returned value is +/-0.0f. Otherwise, the returned value is a normalized single-precision float
+   * value.
    *
    * @param b The half-precision float value to convert to single-precision
    * @return A normalized single-precision float value
@@ -161,7 +157,7 @@ public static float toFloat(short b) {
     int bits = b & 0xffff;
     int s = bits & SIGN_MASK;
     int e = (bits >>> EXPONENT_SHIFT) & SHIFTED_EXPONENT_MASK;
-    int m = (bits) & SIGNIFICAND_MASK;
+    int m = bits & SIGNIFICAND_MASK;
     int outE = 0;
     int outM = 0;
     if (e == 0) { // Denormal or 0
@@ -187,20 +183,16 @@ public static float toFloat(short b) {
   }
 
   /**
-   * Converts the specified single-precision float value into a
-   * half-precision float value. The following special cases are handled:
+   * Converts the specified single-precision float value into a half-precision float value. The
+   * following special cases are handled:
    *
-   * If the input is NaN, the returned value is NaN.
-   * If the input is Float POSITIVE_INFINITY or Float NEGATIVE_INFINITY,
-   *   the returned value is respectively POSITIVE_INFINITY or NEGATIVE_INFINITY.
-   * If the input is 0 (positive or negative), the returned value is
-   *   POSITIVE_ZERO or NEGATIVE_ZERO.
-   * If the input is a less than MIN_VALUE, the returned value
-   *   is flushed to POSITIVE_ZERO or NEGATIVE_ZERO.
-   * If the input is a less than MIN_NORMAL, the returned value
-   *   is a denorm half-precision float.
-   * Otherwise, the returned value is rounded to the nearest
-   *   representable half-precision float value.
+   * <p>If the input is NaN, the returned value is NaN. If the input is Float POSITIVE_INFINITY or
+   * Float NEGATIVE_INFINITY, the returned value is respectively POSITIVE_INFINITY or
+   * NEGATIVE_INFINITY. If the input is 0 (positive or negative), the returned value is
+   * POSITIVE_ZERO or NEGATIVE_ZERO. If the input is a less than MIN_VALUE, the returned value is
+   * flushed to POSITIVE_ZERO or NEGATIVE_ZERO. If the input is a less than MIN_NORMAL, the returned
+   * value is a denorm half-precision float. Otherwise, the returned value is rounded to the nearest
+   * representable half-precision float value.
    *
    * @param f The single-precision float value to convert to half-precision
    * @return A half-precision float value
@@ -209,7 +201,7 @@ public static short toFloat16(float f) {
     int bits = Float.floatToRawIntBits(f);
     int s = (bits >>> FP32_SIGN_SHIFT);
     int e = (bits >>> FP32_EXPONENT_SHIFT) & FP32_SHIFTED_EXPONENT_MASK;
-    int m = (bits) & FP32_SIGNIFICAND_MASK;
+    int m = bits & FP32_SIGNIFICAND_MASK;
     int outE = 0;
     int outM = 0;
     if (e == 0xff) { // Infinite or NaN
@@ -256,10 +248,9 @@ public static short toFloat16(float f) {
   }
 
   /**
-   * Returns a string representation of the specified half-precision
-   * float value. Calling this method is equivalent to calling
-   * <code>Float.toString(toFloat(h))</code>. See {@link Float#toString(float)}
-   * for more information on the format of the string representation.
+   * Returns a string representation of the specified half-precision float value. Calling this
+   * method is equivalent to calling <code>Float.toString(toFloat(h))</code>. See {@link
+   * Float#toString(float)} for more information on the format of the string representation.
    *
    * @param h A half-precision float value in binary little-endian format
    * @return A string representation of the specified value
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/HistoricalLog.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/HistoricalLog.java
index 21f063c939ec8..659ddde28df9b 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/HistoricalLog.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/HistoricalLog.java
@@ -14,73 +14,75 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util;
 
+import java.util.ArrayDeque;
 import java.util.Arrays;
-import java.util.LinkedList;
-
+import java.util.Deque;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.slf4j.Logger;
 
 /**
- * Utility class that can be used to log activity within a class
- * for later logging and debugging. Supports recording events and
- * recording the stack at the time they occur.
+ * Utility class that can be used to log activity within a class for later logging and debugging.
+ * Supports recording events and recording the stack at the time they occur.
  */
 public class HistoricalLog {
 
-  private final LinkedList<Event> history = new LinkedList<>();
+  private final Deque<Event> history = new ArrayDeque<>();
   private final String idString; // the formatted id string
   private final int limit; // the limit on the number of events kept
   private @Nullable Event firstEvent; // the first stack trace recorded
 
   /**
-   * Constructor. The format string will be formatted and have its arguments
-   * substituted at the time this is called.
+   * Constructor. The format string will be formatted and have its arguments substituted at the time
+   * this is called.
    *
    * @param idStringFormat {@link String#format} format string that can be used to identify this
-   *                       object in a log. Including some kind of unique identifier that can be
-   *                       associated with the object instance is best.
-   * @param args           for the format string, or nothing if none are required
+   *     object in a log. Including some kind of unique identifier that can be associated with the
+   *     object instance is best.
+   * @param args for the format string, or nothing if none are required
    */
+  @SuppressWarnings("FormatStringAnnotation")
+  /* Remove @SuppressWarnings after fixing https://github.com/apache/arrow/issues/41951 */
   public HistoricalLog(final String idStringFormat, Object... args) {
     this(Integer.MAX_VALUE, idStringFormat, args);
   }
 
   /**
-   * Constructor. The format string will be formatted and have its arguments
-   * substituted at the time this is called.
+   * Constructor. The format string will be formatted and have its arguments substituted at the time
+   * this is called.
    *
-   * <p>This form supports the specification of a limit that will limit the
-   * number of historical entries kept (which keeps down the amount of memory
-   * used). With the limit, the first entry made is always kept (under the
-   * assumption that this is the creation site of the object, which is usually
-   * interesting), and then up to the limit number of entries are kept after that.
-   * Each time a new entry is made, the oldest that is not the first is dropped.
+   * <p>This form supports the specification of a limit that will limit the number of historical
+   * entries kept (which keeps down the amount of memory used). With the limit, the first entry made
+   * is always kept (under the assumption that this is the creation site of the object, which is
+   * usually interesting), and then up to the limit number of entries are kept after that. Each time
+   * a new entry is made, the oldest that is not the first is dropped.
    *
-   * @param limit          the maximum number of historical entries that will be kept, not including
-   *                       the first entry made
+   * @param limit the maximum number of historical entries that will be kept, not including the
+   *     first entry made
    * @param idStringFormat {@link String#format} format string that can be used to identify this
-   *                       object in a log. Including some kind of unique identifier that can be
-   *                       associated with the object instance is best.
-   * @param args           for the format string, or nothing if none are required
+   *     object in a log. Including some kind of unique identifier that can be associated with the
+   *     object instance is best.
+   * @param args for the format string, or nothing if none are required
    */
+  @SuppressWarnings("AnnotateFormatMethod")
   public HistoricalLog(final int limit, final String idStringFormat, Object... args) {
+    // Remove @SuppressWarnings after fixing https://github.com/apache/arrow/issues/41951
     this.limit = limit;
     this.idString = String.format(idStringFormat, args);
     this.firstEvent = null;
   }
 
   /**
-   * Record an event. Automatically captures the stack trace at the time this is
-   * called. The format string will be formatted and have its arguments substituted
-   * at the time this is called.
+   * Record an event. Automatically captures the stack trace at the time this is called. The format
+   * string will be formatted and have its arguments substituted at the time this is called.
    *
    * @param noteFormat {@link String#format} format string that describes the event
-   * @param args       for the format string, or nothing if none are required
+   * @param args for the format string, or nothing if none are required
    */
+  @SuppressWarnings("AnnotateFormatMethod")
   public synchronized void recordEvent(final String noteFormat, Object... args) {
+    // Remove @SuppressWarnings after fixing https://github.com/apache/arrow/issues/41951
     final String note = String.format(noteFormat, args);
     final Event event = new Event(note);
     if (firstEvent == null) {
@@ -93,11 +95,11 @@ public synchronized void recordEvent(final String noteFormat, Object... args) {
   }
 
   /**
-   * Write the history of this object to the given {@link StringBuilder}. The history
-   * includes the identifying string provided at construction time, and all the recorded
-   * events with their stack traces.
+   * Write the history of this object to the given {@link StringBuilder}. The history includes the
+   * identifying string provided at construction time, and all the recorded events with their stack
+   * traces.
    *
-   * @param sb                {@link StringBuilder} to write to
+   * @param sb {@link StringBuilder} to write to
    * @param includeStackTrace whether to include the stacktrace of each event in the history
    */
   public void buildHistory(final StringBuilder sb, boolean includeStackTrace) {
@@ -107,8 +109,8 @@ public void buildHistory(final StringBuilder sb, boolean includeStackTrace) {
   /**
    * Build the history and write it to sb.
    *
-   * @param sb                output
-   * @param indent            starting indent (usually "")
+   * @param sb output
+   * @param indent starting indent (usually "")
    * @param includeStackTrace whether to include the stacktrace of each event.
    */
   public synchronized void buildHistory(
@@ -118,20 +120,13 @@ public synchronized void buildHistory(
     Arrays.fill(indentation, ' ');
     Arrays.fill(innerIndentation, ' ');
 
-    sb.append(indentation)
-        .append("event log for: ")
-        .append(idString)
-        .append('\n');
+    sb.append(indentation).append("event log for: ").append(idString).append('\n');
 
     if (firstEvent != null) {
       long time = firstEvent.time;
       String note = firstEvent.note;
       final StackTrace stackTrace = firstEvent.stackTrace;
-      sb.append(innerIndentation)
-          .append(time)
-          .append(' ')
-          .append(note)
-          .append('\n');
+      sb.append(innerIndentation).append(time).append(' ').append(note).append('\n');
       if (includeStackTrace) {
         stackTrace.writeToBuilder(sb, indent + 2);
       }
@@ -156,9 +151,9 @@ public synchronized void buildHistory(
   }
 
   /**
-   * Write the history of this object to the given {@link Logger}. The history
-   * includes the identifying string provided at construction time, and all the recorded
-   * events with their stack traces.
+   * Write the history of this object to the given {@link Logger}. The history includes the
+   * identifying string provided at construction time, and all the recorded events with their stack
+   * traces.
    *
    * @param logger {@link Logger} to write to
    */
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/LargeMemoryUtil.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/LargeMemoryUtil.java
index 94a7873664216..5d6f11b1fa41f 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/LargeMemoryUtil.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/LargeMemoryUtil.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util;
 
 import org.apache.arrow.memory.BoundsChecking;
@@ -22,13 +21,9 @@
 /** Contains utilities for dealing with a 64-bit address base. */
 public final class LargeMemoryUtil {
 
-  private LargeMemoryUtil() {
-  }
+  private LargeMemoryUtil() {}
 
-  /**
-   * Casts length to an int, but raises an exception the value is outside
-   * the range of an int.
-   */
+  /** Casts length to an int, but raises an exception the value is outside the range of an int. */
   public static int checkedCastToInt(long length) {
     if (BoundsChecking.BOUNDS_CHECKING_ENABLED) {
       return Math.toIntExact(length);
@@ -36,9 +31,7 @@ public static int checkedCastToInt(long length) {
     return (int) length;
   }
 
-  /**
-   * Returns a min(Integer.MAX_VALUE, length).
-   */
+  /** Returns a min(Integer.MAX_VALUE, length). */
   public static int capAtMaxInt(long length) {
     return (int) Math.min(length, Integer.MAX_VALUE);
   }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/MemoryUtil.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/MemoryUtil.java
index 2f74a985a3ff4..c1b44c3932659 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/MemoryUtil.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/MemoryUtil.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util;
 
 import java.lang.reflect.Constructor;
@@ -24,61 +23,52 @@
 import java.nio.ByteOrder;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-
 import org.checkerframework.checker.nullness.qual.Nullable;
-
 import sun.misc.Unsafe;
 
-
-/**
- * Utilities for memory related operations.
- */
+/** Utilities for memory related operations. */
 public class MemoryUtil {
-  private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(MemoryUtil.class);
+  private static final org.slf4j.Logger logger =
+      org.slf4j.LoggerFactory.getLogger(MemoryUtil.class);
 
   private static final @Nullable Constructor<?> DIRECT_BUFFER_CONSTRUCTOR;
-  /**
-   * The unsafe object from which to access the off-heap memory.
-   */
+  /** The unsafe object from which to access the off-heap memory. */
   public static final Unsafe UNSAFE;
 
-  /**
-   * The start offset of array data relative to the start address of the array object.
-   */
+  /** The start offset of array data relative to the start address of the array object. */
   public static final long BYTE_ARRAY_BASE_OFFSET;
 
-  /**
-   * The offset of the address field with the {@link java.nio.ByteBuffer} object.
-   */
+  /** The offset of the address field with the {@link java.nio.ByteBuffer} object. */
   static final long BYTE_BUFFER_ADDRESS_OFFSET;
 
-  /**
-   * If the native byte order is little-endian.
-   */
+  /** If the native byte order is little-endian. */
   public static final boolean LITTLE_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN;
 
   // Java 1.8, 9, 11, 17, 21 becomes 1, 9, 11, 17, and 21.
+  @SuppressWarnings("StringSplitter")
   private static final int majorVersion =
       Integer.parseInt(System.getProperty("java.specification.version").split("\\D+")[0]);
 
   static {
     try {
       // try to get the unsafe object
-      final Object maybeUnsafe = AccessController.doPrivileged(new PrivilegedAction<Object>() {
-        @Override
-        @SuppressWarnings({"nullness:argument", "nullness:return"})
-        // incompatible argument for parameter obj of Field.get
-        // incompatible types in return
-        public Object run() {
-          try {
-            final Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe");
-            unsafeField.setAccessible(true);
-            return unsafeField.get(null);
-          } catch (Throwable e) {
-            return e;
-          }
-        }
-      });
+      final Object maybeUnsafe =
+          AccessController.doPrivileged(
+              new PrivilegedAction<Object>() {
+                @Override
+                @SuppressWarnings({"nullness:argument", "nullness:return"})
+                // incompatible argument for parameter obj of Field.get
+                // incompatible types in return
+                public Object run() {
+                  try {
+                    final Field unsafeField = Unsafe.class.getDeclaredField("theUnsafe");
+                    unsafeField.setAccessible(true);
+                    return unsafeField.get(null);
+                  } catch (Throwable e) {
+                    return e;
+                  }
+                }
+              });
 
       if (maybeUnsafe instanceof Throwable) {
         throw (Throwable) maybeUnsafe;
@@ -100,25 +90,27 @@ public Object run() {
       try {
 
         final Object maybeDirectBufferConstructor =
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-              @Override
-              public Object run() {
-                try {
-                  final Constructor<?> constructor = (majorVersion >= 21) ?
-                      direct.getClass().getDeclaredConstructor(long.class, long.class) :
-                      direct.getClass().getDeclaredConstructor(long.class, int.class);
-                  constructor.setAccessible(true);
-                  logger.debug("Constructor for direct buffer found and made accessible");
-                  return constructor;
-                } catch (NoSuchMethodException e) {
-                  logger.debug("Cannot get constructor for direct buffer allocation", e);
-                  return e;
-                } catch (SecurityException e) {
-                  logger.debug("Cannot get constructor for direct buffer allocation", e);
-                  return e;
-                }
-              }
-            });
+            AccessController.doPrivileged(
+                new PrivilegedAction<Object>() {
+                  @Override
+                  public Object run() {
+                    try {
+                      final Constructor<?> constructor =
+                          (majorVersion >= 21)
+                              ? direct.getClass().getDeclaredConstructor(long.class, long.class)
+                              : direct.getClass().getDeclaredConstructor(long.class, int.class);
+                      constructor.setAccessible(true);
+                      logger.debug("Constructor for direct buffer found and made accessible");
+                      return constructor;
+                    } catch (NoSuchMethodException e) {
+                      logger.debug("Cannot get constructor for direct buffer allocation", e);
+                      return e;
+                    } catch (SecurityException e) {
+                      logger.debug("Cannot get constructor for direct buffer allocation", e);
+                      return e;
+                    }
+                  }
+                });
 
         if (maybeDirectBufferConstructor instanceof Constructor<?>) {
           address = UNSAFE.allocateMemory(1);
@@ -133,8 +125,7 @@ public Object run() {
           }
         } else {
           logger.debug(
-              "direct buffer constructor: unavailable",
-              (Throwable) maybeDirectBufferConstructor);
+              "direct buffer constructor: unavailable", (Throwable) maybeDirectBufferConstructor);
           directBufferConstructor = null;
         }
       } finally {
@@ -146,10 +137,12 @@ public Object run() {
     } catch (Throwable e) {
       // This exception will get swallowed, but it's necessary for the static analysis that ensures
       // the static fields above get initialized
-      final RuntimeException failure = new RuntimeException(
-          "Failed to initialize MemoryUtil. You must start Java with " +
-              "`--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED` " +
-              "(See https://arrow.apache.org/docs/java/install.html)", e);
+      final RuntimeException failure =
+          new RuntimeException(
+              "Failed to initialize MemoryUtil. You must start Java with "
+                  + "`--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED` "
+                  + "(See https://arrow.apache.org/docs/java/install.html)",
+              e);
       failure.printStackTrace();
       throw failure;
     }
@@ -165,12 +158,9 @@ public static long getByteBufferAddress(ByteBuffer buf) {
     return UNSAFE.getLong(buf, BYTE_BUFFER_ADDRESS_OFFSET);
   }
 
-  private MemoryUtil() {
-  }
+  private MemoryUtil() {}
 
-  /**
-   * Create nio byte buffer.
-   */
+  /** Create nio byte buffer. */
   public static ByteBuffer directBuffer(long address, int capacity) {
     if (DIRECT_BUFFER_CONSTRUCTOR != null) {
       if (capacity < 0) {
@@ -186,10 +176,14 @@ public static ByteBuffer directBuffer(long address, int capacity) {
         "sun.misc.Unsafe or java.nio.DirectByteBuffer.<init>(long, int) not available");
   }
 
-  @SuppressWarnings("nullness:argument") //to handle null assignment on third party dependency: Unsafe
-  public static void copyMemory(@Nullable Object srcBase, long srcOffset,
-                                @Nullable Object destBase, long destOffset,
-                                long bytes) {
+  @SuppressWarnings(
+      "nullness:argument") // to handle null assignment on third party dependency: Unsafe
+  public static void copyMemory(
+      @Nullable Object srcBase,
+      long srcOffset,
+      @Nullable Object destBase,
+      long destOffset,
+      long bytes) {
     UNSAFE.copyMemory(srcBase, srcOffset, destBase, destOffset, bytes);
   }
 }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/StackTrace.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/StackTrace.java
index a533edd79370a..6edf7e3787ec8 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/StackTrace.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/StackTrace.java
@@ -14,24 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util;
 
 import java.util.Arrays;
-
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-
-/**
- * Convenient way of obtaining and manipulating stack traces for debugging.
- */
+/** Convenient way of obtaining and manipulating stack traces for debugging. */
 public class StackTrace {
 
-  private final @Nullable StackTraceElement [] stackTraceElements;
+  private final @Nullable StackTraceElement[] stackTraceElements;
 
-  /**
-   * Constructor. Captures the current stack trace.
-   */
+  /** Constructor. Captures the current stack trace. */
   public StackTrace() {
     final StackTraceElement[] stack = Thread.currentThread().getStackTrace();
     // Skip first two elements to remove getStackTrace/StackTrace.<init>
@@ -41,7 +34,7 @@ public StackTrace() {
   /**
    * Write the stack trace to a StringBuilder.
    *
-   * @param sb     where to write it
+   * @param sb where to write it
    * @param indent how many double spaces to indent each line
    */
   public void writeToBuilder(final StringBuilder sb, final int indent) {
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/ArrowBufHasher.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/ArrowBufHasher.java
index 0de8e62a4a4b7..883381b48558a 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/ArrowBufHasher.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/ArrowBufHasher.java
@@ -14,22 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util.hash;
 
 import org.apache.arrow.memory.ArrowBuf;
 
 /**
- * Utility for calculating the hash code for a consecutive memory region.
- * This class provides the basic framework for efficiently calculating the hash code.
- * <p>
- *   A default light-weight implementation is given in {@link SimpleHasher}.
- * </p>
+ * Utility for calculating the hash code for a consecutive memory region. This class provides the
+ * basic framework for efficiently calculating the hash code.
+ *
+ * <p>A default light-weight implementation is given in {@link SimpleHasher}.
  */
 public interface ArrowBufHasher {
 
   /**
    * Calculates the hash code for a memory region.
+   *
    * @param address start address of the memory region.
    * @param length length of the memory region.
    * @return the hash code.
@@ -38,6 +37,7 @@ public interface ArrowBufHasher {
 
   /**
    * Calculates the hash code for a memory region.
+   *
    * @param buf the buffer for the memory region.
    * @param offset offset within the buffer for the memory region.
    * @param length length of the memory region.
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/MurmurHasher.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/MurmurHasher.java
index 5de98d23bb83b..eaf4a833c4eeb 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/MurmurHasher.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/MurmurHasher.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util.hash;
 
 import org.apache.arrow.memory.ArrowBuf;
@@ -22,32 +21,28 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
- * Implementation of the Murmur hashing algorithm.
- * Details of the algorithm can be found in
+ * Implementation of the Murmur hashing algorithm. Details of the algorithm can be found in
  * https://en.wikipedia.org/wiki/MurmurHash
- * <p>
- *   Murmur hashing is computationally expensive, as it involves several
- *   integer multiplications. However, the produced hash codes have
- *   good quality in the sense that they are uniformly distributed in the universe.
- * </p>
- * <p>
- *   Therefore, this algorithm is suitable for scenarios where uniform hashing
- *   is desired (e.g. in an open addressing hash table/hash set).
- * </p>
+ *
+ * <p>Murmur hashing is computationally expensive, as it involves several integer multiplications.
+ * However, the produced hash codes have good quality in the sense that they are uniformly
+ * distributed in the universe.
+ *
+ * <p>Therefore, this algorithm is suitable for scenarios where uniform hashing is desired (e.g. in
+ * an open addressing hash table/hash set).
  */
 public class MurmurHasher implements ArrowBufHasher {
 
   private final int seed;
 
-  /**
-   * Creates a default Murmur hasher, with seed 0.
-   */
+  /** Creates a default Murmur hasher, with seed 0. */
   public MurmurHasher() {
     this(0);
   }
 
   /**
    * Creates a Murmur hasher.
+   *
    * @param seed the seed for the hasher.
    */
   public MurmurHasher(int seed) {
@@ -67,6 +62,7 @@ public int hashCode(ArrowBuf buf, long offset, long length) {
 
   /**
    * Calculates the hash code for a memory region.
+   *
    * @param buf the buffer for the memory region.
    * @param offset offset within the buffer for the memory region.
    * @param length length of the memory region.
@@ -80,6 +76,7 @@ public static int hashCode(ArrowBuf buf, long offset, long length, int seed) {
 
   /**
    * Calculates the hash code for a memory region.
+   *
    * @param address start address of the memory region.
    * @param length length of the memory region.
    * @param seed the seed.
@@ -108,8 +105,8 @@ public static int hashCode(long address, long length, int seed) {
   }
 
   /**
-   * Combine the current hash code and a new int value to calculate
-   * a new hash code.
+   * Combine the current hash code and a new int value to calculate a new hash code.
+   *
    * @param currentHashCode the current hash code.
    * @param intValue the new int value.
    * @return the new hah code.
@@ -137,6 +134,7 @@ public static int combineHashCode(int currentHashCode, int intValue) {
 
   /**
    * Finalizing the hash code.
+   *
    * @param hashCode the current hash code.
    * @param length the length of the memory region.
    * @return the finalized hash code.
@@ -162,7 +160,7 @@ public boolean equals(@Nullable Object o) {
     if (this == o) {
       return true;
     }
-    if (o == null || getClass() != o.getClass()) {
+    if (!(o instanceof MurmurHasher)) {
       return false;
     }
     MurmurHasher that = (MurmurHasher) o;
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/SimpleHasher.java b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/SimpleHasher.java
index 3bf3c2a828338..b9987a5ecb049 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/SimpleHasher.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/hash/SimpleHasher.java
@@ -14,45 +14,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util.hash;
 
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.util.MemoryUtil;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
- * A simple hasher that calculates the hash code of integers as is,
- * and does not perform any finalization. So the computation is extremely
- * efficient.
- * <p>
- *   This algorithm only provides the most basic semantics for the hash code. That is,
- *   if two objects are equal, they must have equal hash code. However, the quality of the
- *   produced hash code may not be good. In other words, the generated hash codes are
- *   far from being uniformly distributed in the universe.
- * </p>
- * <p>
- *   Therefore, this algorithm is suitable only for scenarios where the most basic semantics
- *   of the hash code is required (e.g. in scenarios that require fast and proactive data pruning)
- * </p>
- * <p>
- *   An object of this class is stateless, so it can be shared between threads.
- * </p>
+ * A simple hasher that calculates the hash code of integers as is, and does not perform any
+ * finalization. So the computation is extremely efficient.
+ *
+ * <p>This algorithm only provides the most basic semantics for the hash code. That is, if two
+ * objects are equal, they must have equal hash code. However, the quality of the produced hash code
+ * may not be good. In other words, the generated hash codes are far from being uniformly
+ * distributed in the universe.
+ *
+ * <p>Therefore, this algorithm is suitable only for scenarios where the most basic semantics of the
+ * hash code is required (e.g. in scenarios that require fast and proactive data pruning)
+ *
+ * <p>An object of this class is stateless, so it can be shared between threads.
  */
 public class SimpleHasher implements ArrowBufHasher {
 
   public static SimpleHasher INSTANCE = new SimpleHasher();
 
-  protected SimpleHasher() {
-  }
+  protected SimpleHasher() {}
 
   /**
    * Calculates the hash code for a memory region.
+   *
    * @param address start address of the memory region.
    * @param length length of the memory region.
    * @return the hash code.
    */
+  @Override
   public int hashCode(long address, long length) {
     int hashValue = 0;
     int index = 0;
@@ -82,6 +77,7 @@ public int hashCode(long address, long length) {
 
   /**
    * Calculates the hash code for a memory region.
+   *
    * @param buf the buffer for the memory region.
    * @param offset offset within the buffer for the memory region.
    * @param length length of the memory region.
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/util/AutoCloseables.java b/java/memory/memory-core/src/main/java/org/apache/arrow/util/AutoCloseables.java
index d965f2aed4120..3796fb94bcfd6 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/util/AutoCloseables.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/util/AutoCloseables.java
@@ -1,4 +1,4 @@
-/**
+/*
  * 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.
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.util;
 
 import java.util.ArrayList;
@@ -25,17 +24,14 @@
 import java.util.List;
 import java.util.stream.StreamSupport;
 
-/**
- * Utilities for AutoCloseable classes.
- */
+/** Utilities for AutoCloseable classes. */
 public final class AutoCloseables {
   // Utility class. Should not be instantiated
-  private AutoCloseables() {
-  }
+  private AutoCloseables() {}
 
   /**
-   * Returns a new {@link AutoCloseable} that calls {@link #close(Iterable)} on <code>autoCloseables</code>
-   * when close is called.
+   * Returns a new {@link AutoCloseable} that calls {@link #close(Iterable)} on <code>autoCloseables
+   * </code> when close is called.
    */
   public static AutoCloseable all(final Collection<? extends AutoCloseable> autoCloseables) {
     return new AutoCloseable() {
@@ -48,6 +44,7 @@ public void close() throws Exception {
 
   /**
    * Closes all autoCloseables if not null and suppresses exceptions by adding them to t.
+   *
    * @param t the throwable to add suppressed exception to
    * @param autoCloseables the closeables to close
    */
@@ -57,6 +54,7 @@ public static void close(Throwable t, AutoCloseable... autoCloseables) {
 
   /**
    * Closes all autoCloseables if not null and suppresses exceptions by adding them to t.
+   *
    * @param t the throwable to add suppressed exception to
    * @param autoCloseables the closeables to close
    */
@@ -70,6 +68,7 @@ public static void close(Throwable t, Iterable<? extends AutoCloseable> autoClos
 
   /**
    * Closes all autoCloseables if not null and suppresses subsequent exceptions if more than one.
+   *
    * @param autoCloseables the closeables to close
    */
   public static void close(AutoCloseable... autoCloseables) throws Exception {
@@ -78,6 +77,7 @@ public static void close(AutoCloseable... autoCloseables) throws Exception {
 
   /**
    * Closes all autoCloseables if not null and suppresses subsequent exceptions if more than one.
+   *
    * @param ac the closeables to close
    */
   public static void close(Iterable<? extends AutoCloseable> ac) throws Exception {
@@ -109,33 +109,32 @@ public static void close(Iterable<? extends AutoCloseable> ac) throws Exception
     }
   }
 
-  /**
-   * Calls {@link #close(Iterable)} on the flattened list of closeables.
-   */
+  /** Calls {@link #close(Iterable)} on the flattened list of closeables. */
   @SafeVarargs
-  public static void close(Iterable<? extends AutoCloseable>...closeables) throws Exception {
+  public static void close(Iterable<? extends AutoCloseable>... closeables) throws Exception {
     close(flatten(closeables));
   }
 
   @SafeVarargs
   private static Iterable<AutoCloseable> flatten(Iterable<? extends AutoCloseable>... closeables) {
     return new Iterable<AutoCloseable>() {
-      // Cast from Iterable<? extends AutoCloseable> to Iterable<AutoCloseable> is safe in this context
+      // Cast from Iterable<? extends AutoCloseable> to Iterable<AutoCloseable> is safe in this
+      // context
       // since there's no modification of the original collection
       @SuppressWarnings("unchecked")
       @Override
       public Iterator<AutoCloseable> iterator() {
         return Arrays.stream(closeables)
-            .flatMap((Iterable<? extends AutoCloseable> i)
-                -> StreamSupport.stream(((Iterable<AutoCloseable>) i).spliterator(), /*parallel=*/false))
+            .flatMap(
+                (Iterable<? extends AutoCloseable> i) ->
+                    StreamSupport.stream(
+                        ((Iterable<AutoCloseable>) i).spliterator(), /*parallel=*/ false))
             .iterator();
       }
     };
   }
 
-  /**
-   * Converts <code>ac</code> to a {@link Iterable} filtering out any null values.
-   */
+  /** Converts <code>ac</code> to a {@link Iterable} filtering out any null values. */
   public static Iterable<AutoCloseable> iter(AutoCloseable... ac) {
     if (ac.length == 0) {
       return Collections.emptyList();
@@ -150,9 +149,7 @@ public static Iterable<AutoCloseable> iter(AutoCloseable... ac) {
     }
   }
 
-  /**
-   * A closeable wrapper that will close the underlying closeables if a commit does not occur.
-   */
+  /** A closeable wrapper that will close the underlying closeables if a commit does not occur. */
   public static class RollbackCloseable implements AutoCloseable {
 
     private boolean commit = false;
@@ -167,16 +164,12 @@ public <T extends AutoCloseable> T add(T t) {
       return t;
     }
 
-    /**
-     * Add all of <code>list</code> to the rollback list.
-     */
+    /** Add all of <code>list</code> to the rollback list. */
     public void addAll(AutoCloseable... list) {
       closeables.addAll(Arrays.asList(list));
     }
 
-    /**
-     * Add all of <code>list</code> to the rollback list.
-     */
+    /** Add all of <code>list</code> to the rollback list. */
     public void addAll(Iterable<? extends AutoCloseable> list) {
       for (AutoCloseable ac : list) {
         closeables.add(ac);
@@ -193,26 +186,22 @@ public void close() throws Exception {
         AutoCloseables.close(closeables);
       }
     }
-
   }
 
-  /**
-   * Creates an {@link RollbackCloseable} from the given closeables.
-   */
+  /** Creates an {@link RollbackCloseable} from the given closeables. */
   public static RollbackCloseable rollbackable(AutoCloseable... closeables) {
     return new RollbackCloseable(closeables);
   }
 
   /**
-   * close() an {@link java.lang.AutoCloseable} without throwing a (checked)
-   * {@link java.lang.Exception}. This wraps the close() call with a
-   * try-catch that will rethrow an Exception wrapped with a
-   * {@link java.lang.RuntimeException}, providing a way to call close()
+   * close() an {@link java.lang.AutoCloseable} without throwing a (checked) {@link
+   * java.lang.Exception}. This wraps the close() call with a try-catch that will rethrow an
+   * Exception wrapped with a {@link java.lang.RuntimeException}, providing a way to call close()
    * without having to do the try-catch everywhere or propagate the Exception.
    *
    * @param autoCloseable the AutoCloseable to close; may be null
-   * @throws RuntimeException if an Exception occurs; the Exception is
-   *         wrapped by the RuntimeException
+   * @throws RuntimeException if an Exception occurs; the Exception is wrapped by the
+   *     RuntimeException
    */
   public static void closeNoChecked(final AutoCloseable autoCloseable) {
     if (autoCloseable != null) {
@@ -224,11 +213,11 @@ public static void closeNoChecked(final AutoCloseable autoCloseable) {
     }
   }
 
-  private static final AutoCloseable noOpAutocloseable = new AutoCloseable() {
-    @Override
-    public void close() {
-    }
-  };
+  private static final AutoCloseable noOpAutocloseable =
+      new AutoCloseable() {
+        @Override
+        public void close() {}
+      };
 
   /**
    * Get an AutoCloseable that does nothing.
@@ -239,4 +228,3 @@ public static AutoCloseable noop() {
     return noOpAutocloseable;
   }
 }
-
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/util/Collections2.java b/java/memory/memory-core/src/main/java/org/apache/arrow/util/Collections2.java
index b88372abaaee1..9293d87397f42 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/util/Collections2.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/util/Collections2.java
@@ -1,4 +1,4 @@
-/**
+/*
  * 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.
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.util;
 
 import java.util.ArrayList;
@@ -31,24 +30,20 @@
 import java.util.stream.StreamSupport;
 
 /**
- * Utility methods for manipulating {@link java.util.Collections} and their subclasses/implementations.
+ * Utility methods for manipulating {@link java.util.Collections} and their
+ * subclasses/implementations.
  */
 public final class Collections2 {
-  private Collections2() {
-  }
+  private Collections2() {}
 
-  /**
-   * Creates a {@link List} from the elements remaining in iterator.
-   */
+  /** Creates a {@link List} from the elements remaining in iterator. */
   public static <T> List<T> toList(Iterator<T> iterator) {
     List<T> target = new ArrayList<>();
     iterator.forEachRemaining(target::add);
     return target;
   }
 
-  /**
-   * Converts the iterable into a new {@link List}.
-   */
+  /** Converts the iterable into a new {@link List}. */
   public static <T> List<T> toList(Iterable<T> iterable) {
     if (iterable instanceof Collection<?>) {
       // If iterable is a collection, take advantage of it for a more efficient copy
@@ -57,14 +52,11 @@ public static <T> List<T> toList(Iterable<T> iterable) {
     return toList(iterable.iterator());
   }
 
-  /**
-   * Converts the iterable into a new immutable {@link List}.
-   */
+  /** Converts the iterable into a new immutable {@link List}. */
   public static <T> List<T> toImmutableList(Iterable<T> iterable) {
     return Collections.unmodifiableList(toList(iterable));
   }
 
-
   /** Copies the elements of <code>map</code> to a new unmodifiable map. */
   public static <K, V> Map<K, V> immutableMapCopy(Map<K, V> map) {
     return Collections.unmodifiableMap(new HashMap<>(map));
@@ -76,17 +68,18 @@ public static <V> List<V> immutableListCopy(List<V> list) {
   }
 
   /** Copies the values to a new unmodifiable list. */
-  public static <V> List<V> asImmutableList(V...values) {
+  public static <V> List<V> asImmutableList(V... values) {
     return Collections.unmodifiableList(Arrays.asList(values));
   }
 
   /**
    * Creates a human readable string from the remaining elements in iterator.
    *
-   * The output should be similar to {@code Arrays#toString(Object[])}
+   * <p>The output should be similar to {@code Arrays#toString(Object[])}
    */
   public static String toString(Iterator<?> iterator) {
-    return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, Spliterator.ORDERED), false)
+    return StreamSupport.stream(
+            Spliterators.spliteratorUnknownSize(iterator, Spliterator.ORDERED), false)
         .map(String::valueOf)
         .collect(Collectors.joining(", ", "[", "]"));
   }
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/util/Preconditions.java b/java/memory/memory-core/src/main/java/org/apache/arrow/util/Preconditions.java
index 5e4323cfc9c61..71e622b45f7a5 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/util/Preconditions.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/util/Preconditions.java
@@ -14,23 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-/*
- * Lifted from Guava 20.0 to avoid dependency for core Arrow libraries.
- *
- * Copyright (C) 2007 The Guava Authors
- *
- * Licensed 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.
- */
-
 package org.apache.arrow.util;
 
 import org.checkerframework.dataflow.qual.AssertMethod;
@@ -42,21 +25,23 @@
  * checkNotNull}, an object reference which is expected to be non-null). When {@code false} (or
  * {@code null}) is passed instead, the {@code Preconditions} method throws an unchecked exception,
  * which helps the calling method communicate to <i>its</i> caller that <i>that</i> caller has made
- * a mistake. Example: <pre>   {@code
+ * a mistake. Example:
  *
- *   /**
- *    * Returns the positive square root of the given value.
- *    *
- *    * @throws IllegalArgumentException if the value is negative
- *    *}{@code /
- *   public static double sqrt(double value) {
- *     Preconditions.checkArgument(value >= 0.0, "negative value: %s", value);
- *     // calculate the square root
- *   }
+ * <pre>{@code
+ * /**
+ *  * Returns the positive square root of the given value.
+ *  *
+ *  * @throws IllegalArgumentException if the value is negative
+ *  *}{@code /
+ * public static double sqrt(double value) {
+ *   Preconditions.checkArgument(value >= 0.0, "negative value: %s", value);
+ *   // calculate the square root
+ * }
  *
- *   void exampleBadCaller() {
- *     double d = sqrt(-1.0);
- *   }}</pre>
+ * void exampleBadCaller() {
+ *   double d = sqrt(-1.0);
+ * }
+ * }</pre>
  *
  * <p>In this example, {@code checkArgument} throws an {@code IllegalArgumentException} to indicate
  * that {@code exampleBadCaller} made an error in <i>its</i> call to {@code sqrt}.
@@ -69,32 +54,33 @@
  * when the precondition check then succeeds (as it should almost always do in production). In some
  * circumstances these wasted CPU cycles and allocations can add up to a real problem.
  * Performance-sensitive precondition checks can always be converted to the customary form:
- * <pre>   {@code
  *
- *   if (value < 0.0) {
- *     throw new IllegalArgumentException("negative value: " + value);
- *   }}</pre>
+ * <pre>{@code
+ * if (value < 0.0) {
+ *   throw new IllegalArgumentException("negative value: " + value);
+ * }
+ * }</pre>
  *
  * <h3>Other types of preconditions</h3>
  *
  * <p>Not every type of precondition failure is supported by these methods. Continue to throw
- * standard JDK exceptions such as {@link java.util.NoSuchElementException} or
- * {@link UnsupportedOperationException} in the situations they are intended for.
+ * standard JDK exceptions such as {@link java.util.NoSuchElementException} or {@link
+ * UnsupportedOperationException} in the situations they are intended for.
  *
  * <h3>Non-preconditions</h3>
  *
  * <p>It is of course possible to use the methods of this class to check for invalid conditions
  * which are <i>not the caller's fault</i>. Doing so is <b>not recommended</b> because it is
- * misleading to future readers of the code and of stack traces. See
- * <a href="https://github.com/google/guava/wiki/ConditionalFailuresExplained">Conditional failures
+ * misleading to future readers of the code and of stack traces. See <a
+ * href="https://github.com/google/guava/wiki/ConditionalFailuresExplained">Conditional failures
  * explained</a> in the Guava User Guide for more advice.
  *
  * <h3>{@code java.util.Objects.requireNonNull()}</h3>
  *
- * <p>Projects which use {@code com.google.common} should generally avoid the use of
- * {@link java.util.Objects#requireNonNull(Object)}. Instead, use whichever of
- * {@link #checkNotNull(Object)} or {@link Verify#verifyNotNull(Object)} is appropriate to the
- * situation. (The same goes for the message-accepting overloads.)
+ * <p>Projects which use {@code com.google.common} should generally avoid the use of {@link
+ * java.util.Objects#requireNonNull(Object)}. Instead, use whichever of {@link
+ * #checkNotNull(Object)} or {@link Verify#verifyNotNull(Object)} is appropriate to the situation.
+ * (The same goes for the message-accepting overloads.)
  *
  * <h3>Only {@code %s} is supported</h3>
  *
@@ -103,16 +89,15 @@
  *
  * <h3>More information</h3>
  *
- * <p>See the Guava User Guide on
- * <a href="https://github.com/google/guava/wiki/PreconditionsExplained">using {@code
+ * <p>See the Guava User Guide on <a
+ * href="https://github.com/google/guava/wiki/PreconditionsExplained">using {@code
  * Preconditions}</a>.
  *
  * @author Kevin Bourrillion
  * @since 2.0
  */
 public final class Preconditions {
-  private Preconditions() {
-  }
+  private Preconditions() {}
 
   /**
    * Ensures the truth of an expression involving one or more parameters to the calling method.
@@ -158,9 +143,7 @@ public static void checkArgument(boolean expression, Object errorMessage) {
    *     {@code errorMessageArgs} is null (don't let this happen)
    */
   public static void checkArgument(
-      boolean expression,
-      String errorMessageTemplate,
-      Object... errorMessageArgs) {
+      boolean expression, String errorMessageTemplate, Object... errorMessageArgs) {
     if (!expression) {
       throw new IllegalArgumentException(format(errorMessageTemplate, errorMessageArgs));
     }
@@ -204,8 +187,7 @@ public static void checkArgument(boolean b, String errorMessageTemplate, long p1
    *
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
-  public static void checkArgument(
-      boolean b, String errorMessageTemplate, Object p1) {
+  public static void checkArgument(boolean b, String errorMessageTemplate, Object p1) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1));
     }
@@ -216,8 +198,7 @@ public static void checkArgument(
    *
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
-  public static void checkArgument(
-      boolean b, String errorMessageTemplate, char p1, char p2) {
+  public static void checkArgument(boolean b, String errorMessageTemplate, char p1, char p2) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2));
     }
@@ -228,8 +209,7 @@ public static void checkArgument(
    *
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
-  public static void checkArgument(
-      boolean b, String errorMessageTemplate, char p1, int p2) {
+  public static void checkArgument(boolean b, String errorMessageTemplate, char p1, int p2) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2));
     }
@@ -240,8 +220,7 @@ public static void checkArgument(
    *
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
-  public static void checkArgument(
-      boolean b, String errorMessageTemplate, char p1, long p2) {
+  public static void checkArgument(boolean b, String errorMessageTemplate, char p1, long p2) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2));
     }
@@ -252,8 +231,7 @@ public static void checkArgument(
    *
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
-  public static void checkArgument(
-      boolean b, String errorMessageTemplate, char p1, Object p2) {
+  public static void checkArgument(boolean b, String errorMessageTemplate, char p1, Object p2) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2));
     }
@@ -264,8 +242,7 @@ public static void checkArgument(
    *
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
-  public static void checkArgument(
-      boolean b, String errorMessageTemplate, int p1, char p2) {
+  public static void checkArgument(boolean b, String errorMessageTemplate, int p1, char p2) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2));
     }
@@ -276,8 +253,7 @@ public static void checkArgument(
    *
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
-  public static void checkArgument(
-      boolean b, String errorMessageTemplate, int p1, int p2) {
+  public static void checkArgument(boolean b, String errorMessageTemplate, int p1, int p2) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2));
     }
@@ -288,8 +264,7 @@ public static void checkArgument(
    *
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
-  public static void checkArgument(
-      boolean b, String errorMessageTemplate, int p1, long p2) {
+  public static void checkArgument(boolean b, String errorMessageTemplate, int p1, long p2) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2));
     }
@@ -300,8 +275,7 @@ public static void checkArgument(
    *
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
-  public static void checkArgument(
-      boolean b, String errorMessageTemplate, int p1, Object p2) {
+  public static void checkArgument(boolean b, String errorMessageTemplate, int p1, Object p2) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2));
     }
@@ -312,8 +286,7 @@ public static void checkArgument(
    *
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
-  public static void checkArgument(
-      boolean b, String errorMessageTemplate, long p1, char p2) {
+  public static void checkArgument(boolean b, String errorMessageTemplate, long p1, char p2) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2));
     }
@@ -324,8 +297,7 @@ public static void checkArgument(
    *
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
-  public static void checkArgument(
-      boolean b, String errorMessageTemplate, long p1, int p2) {
+  public static void checkArgument(boolean b, String errorMessageTemplate, long p1, int p2) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2));
     }
@@ -336,8 +308,7 @@ public static void checkArgument(
    *
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
-  public static void checkArgument(
-      boolean b, String errorMessageTemplate, long p1, long p2) {
+  public static void checkArgument(boolean b, String errorMessageTemplate, long p1, long p2) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2));
     }
@@ -348,8 +319,7 @@ public static void checkArgument(
    *
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
-  public static void checkArgument(
-      boolean b, String errorMessageTemplate, long p1, Object p2) {
+  public static void checkArgument(boolean b, String errorMessageTemplate, long p1, Object p2) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2));
     }
@@ -360,8 +330,7 @@ public static void checkArgument(
    *
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
-  public static void checkArgument(
-      boolean b, String errorMessageTemplate, Object p1, char p2) {
+  public static void checkArgument(boolean b, String errorMessageTemplate, Object p1, char p2) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2));
     }
@@ -372,8 +341,7 @@ public static void checkArgument(
    *
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
-  public static void checkArgument(
-      boolean b, String errorMessageTemplate, Object p1, int p2) {
+  public static void checkArgument(boolean b, String errorMessageTemplate, Object p1, int p2) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2));
     }
@@ -384,8 +352,7 @@ public static void checkArgument(
    *
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
-  public static void checkArgument(
-      boolean b, String errorMessageTemplate, Object p1, long p2) {
+  public static void checkArgument(boolean b, String errorMessageTemplate, Object p1, long p2) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2));
     }
@@ -396,8 +363,7 @@ public static void checkArgument(
    *
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
-  public static void checkArgument(
-      boolean b, String errorMessageTemplate, Object p1, Object p2) {
+  public static void checkArgument(boolean b, String errorMessageTemplate, Object p1, Object p2) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2));
     }
@@ -409,11 +375,7 @@ public static void checkArgument(
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
   public static void checkArgument(
-      boolean b,
-      String errorMessageTemplate,
-      Object p1,
-      Object p2,
-      Object p3) {
+      boolean b, String errorMessageTemplate, Object p1, Object p2, Object p3) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2, p3));
     }
@@ -425,12 +387,7 @@ public static void checkArgument(
    * <p>See {@link #checkArgument(boolean, String, Object...)} for details.
    */
   public static void checkArgument(
-      boolean b,
-      String errorMessageTemplate,
-      Object p1,
-      Object p2,
-      Object p3,
-      Object p4) {
+      boolean b, String errorMessageTemplate, Object p1, Object p2, Object p3, Object p4) {
     if (!b) {
       throw new IllegalArgumentException(format(errorMessageTemplate, p1, p2, p3, p4));
     }
@@ -483,9 +440,7 @@ public static void checkState(boolean expression, Object errorMessage) {
    *     {@code errorMessageArgs} is null (don't let this happen)
    */
   public static void checkState(
-      boolean expression,
-      String errorMessageTemplate,
-      Object... errorMessageArgs) {
+      boolean expression, String errorMessageTemplate, Object... errorMessageArgs) {
     if (!expression) {
       throw new IllegalStateException(format(errorMessageTemplate, errorMessageArgs));
     }
@@ -533,8 +488,7 @@ public static void checkState(boolean b, String errorMessageTemplate, long p1) {
    *
    * <p>See {@link #checkState(boolean, String, Object...)} for details.
    */
-  public static void checkState(
-      boolean b, String errorMessageTemplate, Object p1) {
+  public static void checkState(boolean b, String errorMessageTemplate, Object p1) {
     if (!b) {
       throw new IllegalStateException(format(errorMessageTemplate, p1));
     }
@@ -546,8 +500,7 @@ public static void checkState(
    *
    * <p>See {@link #checkState(boolean, String, Object...)} for details.
    */
-  public static void checkState(
-      boolean b, String errorMessageTemplate, char p1, char p2) {
+  public static void checkState(boolean b, String errorMessageTemplate, char p1, char p2) {
     if (!b) {
       throw new IllegalStateException(format(errorMessageTemplate, p1, p2));
     }
@@ -571,8 +524,7 @@ public static void checkState(boolean b, String errorMessageTemplate, char p1, i
    *
    * <p>See {@link #checkState(boolean, String, Object...)} for details.
    */
-  public static void checkState(
-      boolean b, String errorMessageTemplate, char p1, long p2) {
+  public static void checkState(boolean b, String errorMessageTemplate, char p1, long p2) {
     if (!b) {
       throw new IllegalStateException(format(errorMessageTemplate, p1, p2));
     }
@@ -584,8 +536,7 @@ public static void checkState(
    *
    * <p>See {@link #checkState(boolean, String, Object...)} for details.
    */
-  public static void checkState(
-      boolean b, String errorMessageTemplate, char p1, Object p2) {
+  public static void checkState(boolean b, String errorMessageTemplate, char p1, Object p2) {
     if (!b) {
       throw new IllegalStateException(format(errorMessageTemplate, p1, p2));
     }
@@ -633,8 +584,7 @@ public static void checkState(boolean b, String errorMessageTemplate, int p1, lo
    *
    * <p>See {@link #checkState(boolean, String, Object...)} for details.
    */
-  public static void checkState(
-      boolean b, String errorMessageTemplate, int p1, Object p2) {
+  public static void checkState(boolean b, String errorMessageTemplate, int p1, Object p2) {
     if (!b) {
       throw new IllegalStateException(format(errorMessageTemplate, p1, p2));
     }
@@ -646,8 +596,7 @@ public static void checkState(
    *
    * <p>See {@link #checkState(boolean, String, Object...)} for details.
    */
-  public static void checkState(
-      boolean b, String errorMessageTemplate, long p1, char p2) {
+  public static void checkState(boolean b, String errorMessageTemplate, long p1, char p2) {
     if (!b) {
       throw new IllegalStateException(format(errorMessageTemplate, p1, p2));
     }
@@ -671,8 +620,7 @@ public static void checkState(boolean b, String errorMessageTemplate, long p1, i
    *
    * <p>See {@link #checkState(boolean, String, Object...)} for details.
    */
-  public static void checkState(
-      boolean b, String errorMessageTemplate, long p1, long p2) {
+  public static void checkState(boolean b, String errorMessageTemplate, long p1, long p2) {
     if (!b) {
       throw new IllegalStateException(format(errorMessageTemplate, p1, p2));
     }
@@ -684,8 +632,7 @@ public static void checkState(
    *
    * <p>See {@link #checkState(boolean, String, Object...)} for details.
    */
-  public static void checkState(
-      boolean b, String errorMessageTemplate, long p1, Object p2) {
+  public static void checkState(boolean b, String errorMessageTemplate, long p1, Object p2) {
     if (!b) {
       throw new IllegalStateException(format(errorMessageTemplate, p1, p2));
     }
@@ -697,8 +644,7 @@ public static void checkState(
    *
    * <p>See {@link #checkState(boolean, String, Object...)} for details.
    */
-  public static void checkState(
-      boolean b, String errorMessageTemplate, Object p1, char p2) {
+  public static void checkState(boolean b, String errorMessageTemplate, Object p1, char p2) {
     if (!b) {
       throw new IllegalStateException(format(errorMessageTemplate, p1, p2));
     }
@@ -710,8 +656,7 @@ public static void checkState(
    *
    * <p>See {@link #checkState(boolean, String, Object...)} for details.
    */
-  public static void checkState(
-      boolean b, String errorMessageTemplate, Object p1, int p2) {
+  public static void checkState(boolean b, String errorMessageTemplate, Object p1, int p2) {
     if (!b) {
       throw new IllegalStateException(format(errorMessageTemplate, p1, p2));
     }
@@ -723,8 +668,7 @@ public static void checkState(
    *
    * <p>See {@link #checkState(boolean, String, Object...)} for details.
    */
-  public static void checkState(
-      boolean b, String errorMessageTemplate, Object p1, long p2) {
+  public static void checkState(boolean b, String errorMessageTemplate, Object p1, long p2) {
     if (!b) {
       throw new IllegalStateException(format(errorMessageTemplate, p1, p2));
     }
@@ -736,8 +680,7 @@ public static void checkState(
    *
    * <p>See {@link #checkState(boolean, String, Object...)} for details.
    */
-  public static void checkState(
-      boolean b, String errorMessageTemplate, Object p1, Object p2) {
+  public static void checkState(boolean b, String errorMessageTemplate, Object p1, Object p2) {
     if (!b) {
       throw new IllegalStateException(format(errorMessageTemplate, p1, p2));
     }
@@ -750,11 +693,7 @@ public static void checkState(
    * <p>See {@link #checkState(boolean, String, Object...)} for details.
    */
   public static void checkState(
-      boolean b,
-      String errorMessageTemplate,
-      Object p1,
-      Object p2,
-      Object p3) {
+      boolean b, String errorMessageTemplate, Object p1, Object p2, Object p3) {
     if (!b) {
       throw new IllegalStateException(format(errorMessageTemplate, p1, p2, p3));
     }
@@ -767,12 +706,7 @@ public static void checkState(
    * <p>See {@link #checkState(boolean, String, Object...)} for details.
    */
   public static void checkState(
-      boolean b,
-      String errorMessageTemplate,
-      Object p1,
-      Object p2,
-      Object p3,
-      Object p4) {
+      boolean b, String errorMessageTemplate, Object p1, Object p2, Object p3, Object p4) {
     if (!b) {
       throw new IllegalStateException(format(errorMessageTemplate, p1, p2, p3, p4));
     }
@@ -785,7 +719,6 @@ public static void checkState(
    * @return the non-null reference that was validated
    * @throws NullPointerException if {@code reference} is null
    */
-
   public static <T> T checkNotNull(T reference) {
     if (reference == null) {
       throw new NullPointerException();
@@ -802,7 +735,6 @@ public static <T> T checkNotNull(T reference) {
    * @return the non-null reference that was validated
    * @throws NullPointerException if {@code reference} is null
    */
-
   public static <T> T checkNotNull(T reference, Object errorMessage) {
     if (reference == null) {
       throw new NullPointerException(String.valueOf(errorMessage));
@@ -824,7 +756,6 @@ public static <T> T checkNotNull(T reference, Object errorMessage) {
    * @return the non-null reference that was validated
    * @throws NullPointerException if {@code reference} is null
    */
-
   public static <T> T checkNotNull(
       T reference, String errorMessageTemplate, Object... errorMessageArgs) {
     if (reference == null) {
@@ -839,7 +770,6 @@ public static <T> T checkNotNull(
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
   public static <T> T checkNotNull(T obj, String errorMessageTemplate, char p1) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1));
@@ -852,7 +782,6 @@ public static <T> T checkNotNull(T obj, String errorMessageTemplate, char p1) {
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
   public static <T> T checkNotNull(T obj, String errorMessageTemplate, int p1) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1));
@@ -865,7 +794,6 @@ public static <T> T checkNotNull(T obj, String errorMessageTemplate, int p1) {
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
   public static <T> T checkNotNull(T obj, String errorMessageTemplate, long p1) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1));
@@ -878,9 +806,7 @@ public static <T> T checkNotNull(T obj, String errorMessageTemplate, long p1) {
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
-  public static <T> T checkNotNull(
-      T obj, String errorMessageTemplate, Object p1) {
+  public static <T> T checkNotNull(T obj, String errorMessageTemplate, Object p1) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1));
     }
@@ -892,7 +818,6 @@ public static <T> T checkNotNull(
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
   public static <T> T checkNotNull(T obj, String errorMessageTemplate, char p1, char p2) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2));
@@ -905,7 +830,6 @@ public static <T> T checkNotNull(T obj, String errorMessageTemplate, char p1, ch
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
   public static <T> T checkNotNull(T obj, String errorMessageTemplate, char p1, int p2) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2));
@@ -918,7 +842,6 @@ public static <T> T checkNotNull(T obj, String errorMessageTemplate, char p1, in
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
   public static <T> T checkNotNull(T obj, String errorMessageTemplate, char p1, long p2) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2));
@@ -931,9 +854,7 @@ public static <T> T checkNotNull(T obj, String errorMessageTemplate, char p1, lo
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
-  public static <T> T checkNotNull(
-      T obj, String errorMessageTemplate, char p1, Object p2) {
+  public static <T> T checkNotNull(T obj, String errorMessageTemplate, char p1, Object p2) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2));
     }
@@ -945,7 +866,6 @@ public static <T> T checkNotNull(
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
   public static <T> T checkNotNull(T obj, String errorMessageTemplate, int p1, char p2) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2));
@@ -958,7 +878,6 @@ public static <T> T checkNotNull(T obj, String errorMessageTemplate, int p1, cha
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
   public static <T> T checkNotNull(T obj, String errorMessageTemplate, int p1, int p2) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2));
@@ -971,7 +890,6 @@ public static <T> T checkNotNull(T obj, String errorMessageTemplate, int p1, int
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
   public static <T> T checkNotNull(T obj, String errorMessageTemplate, int p1, long p2) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2));
@@ -984,9 +902,7 @@ public static <T> T checkNotNull(T obj, String errorMessageTemplate, int p1, lon
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
-  public static <T> T checkNotNull(
-      T obj, String errorMessageTemplate, int p1, Object p2) {
+  public static <T> T checkNotNull(T obj, String errorMessageTemplate, int p1, Object p2) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2));
     }
@@ -998,7 +914,6 @@ public static <T> T checkNotNull(
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
   public static <T> T checkNotNull(T obj, String errorMessageTemplate, long p1, char p2) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2));
@@ -1011,7 +926,6 @@ public static <T> T checkNotNull(T obj, String errorMessageTemplate, long p1, ch
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
   public static <T> T checkNotNull(T obj, String errorMessageTemplate, long p1, int p2) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2));
@@ -1024,7 +938,6 @@ public static <T> T checkNotNull(T obj, String errorMessageTemplate, long p1, in
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
   public static <T> T checkNotNull(T obj, String errorMessageTemplate, long p1, long p2) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2));
@@ -1037,9 +950,7 @@ public static <T> T checkNotNull(T obj, String errorMessageTemplate, long p1, lo
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
-  public static <T> T checkNotNull(
-      T obj, String errorMessageTemplate, long p1, Object p2) {
+  public static <T> T checkNotNull(T obj, String errorMessageTemplate, long p1, Object p2) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2));
     }
@@ -1051,9 +962,7 @@ public static <T> T checkNotNull(
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
-  public static <T> T checkNotNull(
-      T obj, String errorMessageTemplate, Object p1, char p2) {
+  public static <T> T checkNotNull(T obj, String errorMessageTemplate, Object p1, char p2) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2));
     }
@@ -1065,9 +974,7 @@ public static <T> T checkNotNull(
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
-  public static <T> T checkNotNull(
-      T obj, String errorMessageTemplate, Object p1, int p2) {
+  public static <T> T checkNotNull(T obj, String errorMessageTemplate, Object p1, int p2) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2));
     }
@@ -1079,9 +986,7 @@ public static <T> T checkNotNull(
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
-  public static <T> T checkNotNull(
-      T obj, String errorMessageTemplate, Object p1, long p2) {
+  public static <T> T checkNotNull(T obj, String errorMessageTemplate, Object p1, long p2) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2));
     }
@@ -1093,9 +998,7 @@ public static <T> T checkNotNull(
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
-  public static <T> T checkNotNull(
-      T obj, String errorMessageTemplate, Object p1, Object p2) {
+  public static <T> T checkNotNull(T obj, String errorMessageTemplate, Object p1, Object p2) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2));
     }
@@ -1107,13 +1010,8 @@ public static <T> T checkNotNull(
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
   public static <T> T checkNotNull(
-      T obj,
-      String errorMessageTemplate,
-      Object p1,
-      Object p2,
-      Object p3) {
+      T obj, String errorMessageTemplate, Object p1, Object p2, Object p3) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2, p3));
     }
@@ -1125,14 +1023,8 @@ public static <T> T checkNotNull(
    *
    * <p>See {@link #checkNotNull(Object, String, Object...)} for details.
    */
-
   public static <T> T checkNotNull(
-      T obj,
-      String errorMessageTemplate,
-      Object p1,
-      Object p2,
-      Object p3,
-      Object p4) {
+      T obj, String errorMessageTemplate, Object p1, Object p2, Object p3, Object p4) {
     if (obj == null) {
       throw new NullPointerException(format(errorMessageTemplate, p1, p2, p3, p4));
     }
@@ -1175,7 +1067,6 @@ public static <T> T checkNotNull(
    * @throws IndexOutOfBoundsException if {@code index} is negative or is not less than {@code size}
    * @throws IllegalArgumentException if {@code size} is negative
    */
-
   public static int checkElementIndex(int index, int size) {
     return checkElementIndex(index, size, "index");
   }
@@ -1191,7 +1082,6 @@ public static int checkElementIndex(int index, int size) {
    * @throws IndexOutOfBoundsException if {@code index} is negative or is not less than {@code size}
    * @throws IllegalArgumentException if {@code size} is negative
    */
-
   public static int checkElementIndex(int index, int size, String desc) {
     // Carefully optimized for execution by hotspot (explanatory comment above)
     if (index < 0 || index >= size) {
@@ -1220,7 +1110,6 @@ private static String badElementIndex(int index, int size, String desc) {
    * @throws IndexOutOfBoundsException if {@code index} is negative or is greater than {@code size}
    * @throws IllegalArgumentException if {@code size} is negative
    */
-
   public static long checkPositionIndex(long index, long size) {
     return checkPositionIndex(index, size, "index");
   }
@@ -1236,7 +1125,6 @@ public static long checkPositionIndex(long index, long size) {
    * @throws IndexOutOfBoundsException if {@code index} is negative or is greater than {@code size}
    * @throws IllegalArgumentException if {@code size} is negative
    */
-
   public static long checkPositionIndex(long index, long size, String desc) {
     // Carefully optimized for execution by hotspot (explanatory comment above)
     if (index < 0 || index > size) {
diff --git a/java/memory/memory-core/src/main/java/org/apache/arrow/util/VisibleForTesting.java b/java/memory/memory-core/src/main/java/org/apache/arrow/util/VisibleForTesting.java
index b6ed378bba6e8..44473dc8cc637 100644
--- a/java/memory/memory-core/src/main/java/org/apache/arrow/util/VisibleForTesting.java
+++ b/java/memory/memory-core/src/main/java/org/apache/arrow/util/VisibleForTesting.java
@@ -14,13 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.util;
 
 /**
- * Annotation to indicate a class member or class is visible
- * only for the purposes of testing and otherwise should not
- * be referenced by other classes.
+ * Annotation to indicate a class member or class is visible only for the purposes of testing and
+ * otherwise should not be referenced by other classes.
  */
-public @interface VisibleForTesting {
-}
+public @interface VisibleForTesting {}
diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/CountingAllocationListener.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/CountingAllocationListener.java
index 38e1a582b8c81..cd2038440c7fb 100644
--- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/CountingAllocationListener.java
+++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/CountingAllocationListener.java
@@ -14,18 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
-import org.apache.arrow.memory.AllocationListener;
-import org.apache.arrow.memory.AllocationOutcome;
-import org.apache.arrow.memory.BufferAllocator;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
- * Counting allocation listener.
- * It counts the number of times it has been invoked, and how much memory allocation it has seen
- * When set to 'expand on fail', it attempts to expand the associated allocator's limit.
+ * Counting allocation listener. It counts the number of times it has been invoked, and how much
+ * memory allocation it has seen When set to 'expand on fail', it attempts to expand the associated
+ * allocator's limit.
  */
 final class CountingAllocationListener implements AllocationListener {
   private int numPreCalls;
@@ -35,8 +31,7 @@ final class CountingAllocationListener implements AllocationListener {
   private long totalMem;
   private long currentMem;
   private boolean expandOnFail;
-  @Nullable
-  BufferAllocator expandAlloc;
+  @Nullable BufferAllocator expandAlloc;
   long expandLimit;
 
   CountingAllocationListener() {
@@ -65,8 +60,8 @@ public void onAllocation(long size) {
   public boolean onFailedAllocation(long size, AllocationOutcome outcome) {
     if (expandOnFail) {
       if (expandAlloc == null) {
-        throw new IllegalStateException("expandAlloc must be non-null because this " +
-            "listener is set to expand on failure.");
+        throw new IllegalStateException(
+            "expandAlloc must be non-null because this " + "listener is set to expand on failure.");
       }
       expandAlloc.setLimit(expandLimit);
       return true;
@@ -74,7 +69,6 @@ public boolean onFailedAllocation(long size, AllocationOutcome outcome) {
     return false;
   }
 
-
   @Override
   public void onRelease(long size) {
     numReleaseCalls++;
diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/DefaultAllocationManagerFactory.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/DefaultAllocationManagerFactory.java
index bfe496532b106..83118face8674 100644
--- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/DefaultAllocationManagerFactory.java
+++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/DefaultAllocationManagerFactory.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 import org.apache.arrow.memory.util.MemoryUtil;
@@ -22,16 +21,13 @@
 /**
  * The default Allocation Manager Factory for a module.
  *
- * This is only used by tests and contains only a simplistic allocator method.
- *
+ * <p>This is only used by tests and contains only a simplistic allocator method.
  */
 public class DefaultAllocationManagerFactory implements AllocationManager.Factory {
 
   public static final AllocationManager.Factory FACTORY = new DefaultAllocationManagerFactory();
-  private static final ArrowBuf EMPTY = new ArrowBuf(ReferenceManager.NO_OP,
-      null,
-      0,
-      MemoryUtil.UNSAFE.allocateMemory(0));
+  private static final ArrowBuf EMPTY =
+      new ArrowBuf(ReferenceManager.NO_OP, null, 0, MemoryUtil.UNSAFE.allocateMemory(0));
 
   @Override
   public AllocationManager create(BufferAllocator accountingAllocator, long size) {
diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestAccountant.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestAccountant.java
index 13fa4a64d0a75..07663b4ab67ed 100644
--- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestAccountant.java
+++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestAccountant.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestAccountant {
 
@@ -46,21 +46,21 @@ public void multiThread() throws InterruptedException {
     Thread[] threads = new Thread[numberOfThreads];
 
     for (int i = 0; i < numberOfThreads; i++) {
-      Thread t = new Thread() {
-
-        @Override
-        public void run() {
-          try {
-            for (int i = 0; i < loops; i++) {
-              ensureAccurateReservations(parent);
+      Thread t =
+          new Thread() {
+
+            @Override
+            public void run() {
+              try {
+                for (int i = 0; i < loops; i++) {
+                  ensureAccurateReservations(parent);
+                }
+              } catch (Exception ex) {
+                ex.printStackTrace();
+                fail(ex.getMessage());
+              }
             }
-          } catch (Exception ex) {
-            ex.printStackTrace();
-            Assert.fail(ex.getMessage());
-          }
-        }
-
-      };
+          };
       threads[i] = t;
       t.start();
     }
@@ -152,7 +152,7 @@ private void ensureAccurateReservations(Accountant outsideParent) {
     assertEquals(2, parent.getAllocatedMemory());
 
     boolean withinLimit = child.forceAllocate(10);
-    assertEquals(false, withinLimit);
+    assertFalse(withinLimit);
 
     // at new limit
     assertEquals(child.getAllocatedMemory(), 11);
diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestAllocationManager.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestAllocationManager.java
index df28424b3a9e3..b1a360a7b3f3d 100644
--- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestAllocationManager.java
+++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestAllocationManager.java
@@ -14,16 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link AllocationManager}.
- */
+/** Test cases for {@link AllocationManager}. */
 public class TestAllocationManager {
 
   @Test
diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestArrowBuf.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestArrowBuf.java
index b4385b72a38cf..60e118d557cf6 100644
--- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestArrowBuf.java
+++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestArrowBuf.java
@@ -14,65 +14,58 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Arrays;
-
 import org.apache.arrow.memory.util.Float16;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.LoggerFactory;
 
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-
 public class TestArrowBuf {
 
-  @Test(expected = IndexOutOfBoundsException.class)
+  @Test
   public void testSliceOutOfBoundsLength_RaisesIndexOutOfBoundsException() {
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(2)
-    ) {
+        ArrowBuf buf = allocator.buffer(2)) {
       assertEquals(2, buf.capacity());
-      buf.slice(0, 3);
+      assertThrows(IndexOutOfBoundsException.class, () -> buf.slice(0, 3));
     }
   }
 
-  @Test(expected = IndexOutOfBoundsException.class)
+  @Test
   public void testSliceOutOfBoundsIndexPlusLength_RaisesIndexOutOfBoundsException() {
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(2)
-    ) {
+        ArrowBuf buf = allocator.buffer(2)) {
       assertEquals(2, buf.capacity());
-      buf.slice(1, 2);
+      assertThrows(IndexOutOfBoundsException.class, () -> buf.slice(1, 2));
     }
   }
 
-  @Test(expected = IndexOutOfBoundsException.class)
+  @Test
   public void testSliceOutOfBoundsIndex_RaisesIndexOutOfBoundsException() {
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(2)
-    ) {
+        ArrowBuf buf = allocator.buffer(2)) {
       assertEquals(2, buf.capacity());
-      buf.slice(3, 0);
+      assertThrows(IndexOutOfBoundsException.class, () -> buf.slice(3, 0));
     }
   }
 
   @Test
   public void testSliceWithinBoundsLength_ReturnsSlice() {
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(2)
-    ) {
+        ArrowBuf buf = allocator.buffer(2)) {
       assertEquals(2, buf.capacity());
       assertEquals(1, buf.slice(1, 1).capacity());
       assertEquals(2, buf.slice(0, 2).capacity());
@@ -88,7 +81,7 @@ public void testSetBytesSliced() {
     }
     ByteBuffer data = ByteBuffer.wrap(expected);
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(expected.length)) {
+        ArrowBuf buf = allocator.buffer(expected.length)) {
       buf.setBytes(0, data, 0, data.capacity());
 
       byte[] actual = new byte[expected.length];
@@ -126,7 +119,8 @@ public void testSetBytesBigEndian() {
     for (int i = 0; i < expected.length; i++) {
       expected[i] = (byte) i;
     }
-    // Only this code path is susceptible: others use unsafe or byte-by-byte copies, while this override copies longs.
+    // Only this code path is susceptible: others use unsafe or byte-by-byte copies, while this
+    // override copies longs.
     final ByteBuffer data = ByteBuffer.wrap(expected).asReadOnlyBuffer();
     assertFalse(data.hasArray());
     assertFalse(data.isDirect());
@@ -141,7 +135,7 @@ public void testSetBytesBigEndian() {
   }
 
   @Test
-  /**
+  /*
    * Test that allocation history is not recorded even though
    * assertions are enabled in tests (GH-34338).
    */
@@ -149,7 +143,7 @@ public void testEnabledAssertion() {
     ((Logger) LoggerFactory.getLogger("org.apache.arrow")).setLevel(Level.TRACE);
     try (BufferAllocator allocator = new RootAllocator(128)) {
       allocator.buffer(2);
-      Exception e = assertThrows(IllegalStateException.class, () -> allocator.close());
+      Exception e = assertThrows(IllegalStateException.class, allocator::close);
       assertFalse(e.getMessage().contains("event log for:"));
     } finally {
       ((Logger) LoggerFactory.getLogger("org.apache.arrow")).setLevel(null);
@@ -169,14 +163,16 @@ public void testEnabledHistoricalLog() {
       try (BufferAllocator allocator = new RootAllocator(128)) {
         allocator.buffer(2);
         Exception e = assertThrows(IllegalStateException.class, allocator::close);
-        assertTrue("Exception had the following message: " + e.getMessage(),
-            e.getMessage().contains("event log for:")); // JDK8, JDK11
+        assertTrue(
+            e.getMessage().contains("event log for:"), // JDK8, JDK11
+            "Exception had the following message: " + e.getMessage());
       } finally {
         fieldDebug.set(null, false);
       }
     } catch (Exception e) {
-      assertTrue("Exception had the following toString(): " + e.toString(),
-          e.toString().contains("java.lang.NoSuchFieldException: modifiers")); // JDK17+
+      assertTrue(
+          e.toString().contains("java.lang.NoSuchFieldException: modifiers"),
+          "Exception had the following toString(): " + e); // JDK17+
     } finally {
       ((Logger) LoggerFactory.getLogger("org.apache.arrow")).setLevel(null);
     }
@@ -185,8 +181,7 @@ public void testEnabledHistoricalLog() {
   @Test
   public void testArrowBufFloat16() {
     try (BufferAllocator allocator = new RootAllocator();
-         ArrowBuf buf = allocator.buffer(1024)
-    ) {
+        ArrowBuf buf = allocator.buffer(1024)) {
       buf.setShort(0, Float16.toFloat16(+32.875f));
       assertEquals((short) 0x501c, buf.getShort(0));
     }
diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java
index 535d5c15e8916..d7d7fde00ac63 100644
--- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java
+++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java
@@ -14,33 +14,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
-
 import org.apache.arrow.memory.AllocationOutcomeDetails.Entry;
 import org.apache.arrow.memory.rounding.RoundingPolicy;
 import org.apache.arrow.memory.rounding.SegmentRoundingPolicy;
 import org.apache.arrow.memory.util.AssertionUtil;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
-
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import sun.misc.Unsafe;
 
 public class TestBaseAllocator {
@@ -69,18 +64,16 @@ public void checkBuffers() {
   // ---------------------------------------- DEBUG ------------------------------------
   */
 
-
   @Test
   public void test_privateMax() throws Exception {
-    try (final RootAllocator rootAllocator =
-             new RootAllocator(MAX_ALLOCATION)) {
+    try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
       final ArrowBuf arrowBuf1 = rootAllocator.buffer(MAX_ALLOCATION / 2);
-      assertNotNull("allocation failed", arrowBuf1);
+      assertNotNull(arrowBuf1, "allocation failed");
 
       try (final BufferAllocator childAllocator =
-               rootAllocator.newChildAllocator("noLimits", 0, MAX_ALLOCATION)) {
+          rootAllocator.newChildAllocator("noLimits", 0, MAX_ALLOCATION)) {
         final ArrowBuf arrowBuf2 = childAllocator.buffer(MAX_ALLOCATION / 2);
-        assertNotNull("allocation failed", arrowBuf2);
+        assertNotNull(arrowBuf2, "allocation failed");
         arrowBuf2.getReferenceManager().release();
       }
 
@@ -88,56 +81,60 @@ public void test_privateMax() throws Exception {
     }
   }
 
-  @Test(expected = IllegalStateException.class)
+  @Test
   public void testRootAllocator_closeWithOutstanding() throws Exception {
-    try {
-      try (final RootAllocator rootAllocator =
-               new RootAllocator(MAX_ALLOCATION)) {
-        final ArrowBuf arrowBuf = rootAllocator.buffer(512);
-        assertNotNull("allocation failed", arrowBuf);
-      }
-    } finally {
-      /*
-       * We expect there to be one unreleased underlying buffer because we're closing
-       * without releasing it.
-       */
-      /*
-      // ------------------------------- DEBUG ---------------------------------
-      final int bufferCount = UnsafeDirectLittleEndian.getBufferCount();
-      UnsafeDirectLittleEndian.releaseBuffers();
-      assertEquals(1, bufferCount);
-      // ------------------------------- DEBUG ---------------------------------
-      */
-    }
+    assertThrows(
+        IllegalStateException.class,
+        () -> {
+          try {
+            try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
+              final ArrowBuf arrowBuf = rootAllocator.buffer(512);
+              assertNotNull(arrowBuf, "allocation failed");
+            }
+          } finally {
+            /*
+             * We expect there to be one unreleased underlying buffer because we're closing
+             * without releasing it.
+             */
+            /*
+            // ------------------------------- DEBUG ---------------------------------
+            final int bufferCount = UnsafeDirectLittleEndian.getBufferCount();
+            UnsafeDirectLittleEndian.releaseBuffers();
+            assertEquals(1, bufferCount);
+            // ------------------------------- DEBUG ---------------------------------
+            */
+          }
+        });
   }
 
   @Test
-  @Ignore
+  @Disabled
   public void testRootAllocator_getEmpty() throws Exception {
-    try (final RootAllocator rootAllocator =
-             new RootAllocator(MAX_ALLOCATION)) {
+    try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
       final ArrowBuf arrowBuf = rootAllocator.buffer(0);
-      assertNotNull("allocation failed", arrowBuf);
-      assertEquals("capacity was non-zero", 0, arrowBuf.capacity());
-      assertTrue("address should be valid", arrowBuf.memoryAddress() != 0);
+      assertNotNull(arrowBuf, "allocation failed");
+      assertEquals(0, arrowBuf.capacity(), "capacity was non-zero");
+      assertTrue(arrowBuf.memoryAddress() != 0, "address should be valid");
       arrowBuf.getReferenceManager().release();
     }
   }
 
-  @Ignore // TODO(DRILL-2740)
-  @Test(expected = IllegalStateException.class)
+  @Disabled // TODO(DRILL-2740)
+  @Test
   public void testAllocator_unreleasedEmpty() throws Exception {
-    try (final RootAllocator rootAllocator =
-             new RootAllocator(MAX_ALLOCATION)) {
-      @SuppressWarnings("unused")
-      final ArrowBuf arrowBuf = rootAllocator.buffer(0);
-    }
+    assertThrows(
+        IllegalStateException.class,
+        () -> {
+          try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
+            @SuppressWarnings("unused")
+            final ArrowBuf arrowBuf = rootAllocator.buffer(0);
+          }
+        });
   }
 
   @Test
   public void testAllocator_transferOwnership() throws Exception {
-    try (final RootAllocator rootAllocator =
-             new RootAllocator(MAX_ALLOCATION)) {
+    try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
       final BufferAllocator childAllocator1 =
           rootAllocator.newChildAllocator("changeOwnership1", 0, MAX_ALLOCATION);
       final BufferAllocator childAllocator2 =
@@ -146,7 +143,8 @@ public void testAllocator_transferOwnership() throws Exception {
       final ArrowBuf arrowBuf1 = childAllocator1.buffer(MAX_ALLOCATION / 4);
       rootAllocator.verify();
       final ReferenceManager referenceManager = arrowBuf1.getReferenceManager();
-      OwnershipTransferResult transferOwnership = referenceManager.transferOwnership(arrowBuf1, childAllocator2);
+      OwnershipTransferResult transferOwnership =
+          referenceManager.transferOwnership(arrowBuf1, childAllocator2);
       assertEquiv(arrowBuf1, transferOwnership.getTransferredBuffer());
       final boolean allocationFit = transferOwnership.getAllocationFit();
       rootAllocator.verify();
@@ -168,7 +166,7 @@ static <T> boolean equalsIgnoreOrder(Collection<T> c1, Collection<T> c2) {
   @Test
   public void testAllocator_getParentAndChild() throws Exception {
     try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
-      assertEquals(rootAllocator.getParentAllocator(), null);
+      assertNull(rootAllocator.getParentAllocator());
 
       try (final BufferAllocator childAllocator1 =
           rootAllocator.newChildAllocator("child1", 0, MAX_ALLOCATION)) {
@@ -179,14 +177,17 @@ public void testAllocator_getParentAndChild() throws Exception {
         try (final BufferAllocator childAllocator2 =
             rootAllocator.newChildAllocator("child2", 0, MAX_ALLOCATION)) {
           assertEquals(childAllocator2.getParentAllocator(), rootAllocator);
-          assertTrue(equalsIgnoreOrder(Arrays.asList(childAllocator1, childAllocator2),
-              rootAllocator.getChildAllocators()));
+          assertTrue(
+              equalsIgnoreOrder(
+                  Arrays.asList(childAllocator1, childAllocator2),
+                  rootAllocator.getChildAllocators()));
 
           try (final BufferAllocator grandChildAllocator =
               childAllocator1.newChildAllocator("grand-child", 0, MAX_ALLOCATION)) {
             assertEquals(grandChildAllocator.getParentAllocator(), childAllocator1);
-            assertTrue(equalsIgnoreOrder(Arrays.asList(grandChildAllocator),
-                childAllocator1.getChildAllocators()));
+            assertTrue(
+                equalsIgnoreOrder(
+                    Arrays.asList(grandChildAllocator), childAllocator1.getChildAllocators()));
           }
         }
       }
@@ -202,15 +203,18 @@ public void testAllocator_childRemovedOnClose() throws Exception {
             rootAllocator.newChildAllocator("child2", 0, MAX_ALLOCATION)) {
 
           // root has two child allocators
-          assertTrue(equalsIgnoreOrder(Arrays.asList(childAllocator1, childAllocator2),
-              rootAllocator.getChildAllocators()));
+          assertTrue(
+              equalsIgnoreOrder(
+                  Arrays.asList(childAllocator1, childAllocator2),
+                  rootAllocator.getChildAllocators()));
 
           try (final BufferAllocator grandChildAllocator =
               childAllocator1.newChildAllocator("grand-child", 0, MAX_ALLOCATION)) {
 
             // child1 has one allocator i.e grand-child
-            assertTrue(equalsIgnoreOrder(Arrays.asList(grandChildAllocator),
-                childAllocator1.getChildAllocators()));
+            assertTrue(
+                equalsIgnoreOrder(
+                    Arrays.asList(grandChildAllocator), childAllocator1.getChildAllocators()));
           }
 
           // grand-child closed
@@ -229,10 +233,10 @@ public void testAllocator_childRemovedOnClose() throws Exception {
   @Test
   public void testAllocator_shareOwnership() throws Exception {
     try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
-      final BufferAllocator childAllocator1 = rootAllocator.newChildAllocator("shareOwnership1", 0,
-          MAX_ALLOCATION);
-      final BufferAllocator childAllocator2 = rootAllocator.newChildAllocator("shareOwnership2", 0,
-          MAX_ALLOCATION);
+      final BufferAllocator childAllocator1 =
+          rootAllocator.newChildAllocator("shareOwnership1", 0, MAX_ALLOCATION);
+      final BufferAllocator childAllocator2 =
+          rootAllocator.newChildAllocator("shareOwnership2", 0, MAX_ALLOCATION);
       final ArrowBuf arrowBuf1 = childAllocator1.buffer(MAX_ALLOCATION / 4);
       rootAllocator.verify();
 
@@ -250,8 +254,8 @@ public void testAllocator_shareOwnership() throws Exception {
       childAllocator1.close();
       rootAllocator.verify();
 
-      final BufferAllocator childAllocator3 = rootAllocator.newChildAllocator("shareOwnership3", 0,
-          MAX_ALLOCATION);
+      final BufferAllocator childAllocator3 =
+          rootAllocator.newChildAllocator("shareOwnership3", 0, MAX_ALLOCATION);
       final ArrowBuf arrowBuf3 = arrowBuf1.getReferenceManager().retain(arrowBuf1, childAllocator3);
       assertNotNull(arrowBuf3);
       assertNotEquals(arrowBuf3, arrowBuf1);
@@ -273,43 +277,48 @@ public void testAllocator_shareOwnership() throws Exception {
   @Test
   public void testRootAllocator_createChildAndUse() throws Exception {
     try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
-      try (final BufferAllocator childAllocator = rootAllocator.newChildAllocator(
-          "createChildAndUse", 0, MAX_ALLOCATION)) {
+      try (final BufferAllocator childAllocator =
+          rootAllocator.newChildAllocator("createChildAndUse", 0, MAX_ALLOCATION)) {
         final ArrowBuf arrowBuf = childAllocator.buffer(512);
-        assertNotNull("allocation failed", arrowBuf);
+        assertNotNull(arrowBuf, "allocation failed");
         arrowBuf.getReferenceManager().release();
       }
     }
   }
 
-  @Test(expected = IllegalStateException.class)
+  @Test
   public void testRootAllocator_createChildDontClose() throws Exception {
-    try {
-      try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
-        final BufferAllocator childAllocator = rootAllocator.newChildAllocator(
-            "createChildDontClose", 0, MAX_ALLOCATION);
-        final ArrowBuf arrowBuf = childAllocator.buffer(512);
-        assertNotNull("allocation failed", arrowBuf);
-      }
-    } finally {
-      /*
-       * We expect one underlying buffer because we closed a child allocator without
-       * releasing the buffer allocated from it.
-       */
-      /*
-      // ------------------------------- DEBUG ---------------------------------
-      final int bufferCount = UnsafeDirectLittleEndian.getBufferCount();
-      UnsafeDirectLittleEndian.releaseBuffers();
-      assertEquals(1, bufferCount);
-      // ------------------------------- DEBUG ---------------------------------
-      */
-    }
+    assertThrows(
+        IllegalStateException.class,
+        () -> {
+          try {
+            try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
+              final BufferAllocator childAllocator =
+                  rootAllocator.newChildAllocator("createChildDontClose", 0, MAX_ALLOCATION);
+              final ArrowBuf arrowBuf = childAllocator.buffer(512);
+              assertNotNull(arrowBuf, "allocation failed");
+            }
+          } finally {
+            /*
+             * We expect one underlying buffer because we closed a child allocator without
+             * releasing the buffer allocated from it.
+             */
+            /*
+            // ------------------------------- DEBUG ---------------------------------
+            final int bufferCount = UnsafeDirectLittleEndian.getBufferCount();
+            UnsafeDirectLittleEndian.releaseBuffers();
+            assertEquals(1, bufferCount);
+            // ------------------------------- DEBUG ---------------------------------
+            */
+          }
+        });
   }
 
   @Test
   public void testSegmentAllocator() {
     RoundingPolicy policy = new SegmentRoundingPolicy(1024);
-    try (RootAllocator allocator = new RootAllocator(AllocationListener.NOOP, 1024 * 1024, policy)) {
+    try (RootAllocator allocator =
+        new RootAllocator(AllocationListener.NOOP, 1024 * 1024, policy)) {
       ArrowBuf buf = allocator.buffer(798);
       assertEquals(1024, buf.capacity());
       buf.setInt(333, 959);
@@ -348,19 +357,15 @@ public void testSegmentAllocator_childAllocator() {
 
   @Test
   public void testSegmentAllocator_smallSegment() {
-    IllegalArgumentException e = Assertions.assertThrows(
-            IllegalArgumentException.class,
-        () -> new SegmentRoundingPolicy(128)
-    );
+    IllegalArgumentException e =
+        assertThrows(IllegalArgumentException.class, () -> new SegmentRoundingPolicy(128));
     assertEquals("The segment size cannot be smaller than 1024", e.getMessage());
   }
 
   @Test
   public void testSegmentAllocator_segmentSizeNotPowerOf2() {
-    IllegalArgumentException e = Assertions.assertThrows(
-            IllegalArgumentException.class,
-        () -> new SegmentRoundingPolicy(4097)
-    );
+    IllegalArgumentException e =
+        assertThrows(IllegalArgumentException.class, () -> new SegmentRoundingPolicy(4097));
     assertEquals("The segment size must be a power of 2", e.getMessage());
   }
 
@@ -368,13 +373,13 @@ public void testSegmentAllocator_segmentSizeNotPowerOf2() {
   public void testCustomizedAllocationManager() {
     try (BaseAllocator allocator = createAllocatorWithCustomizedAllocationManager()) {
       final ArrowBuf arrowBuf1 = allocator.buffer(MAX_ALLOCATION);
-      assertNotNull("allocation failed", arrowBuf1);
+      assertNotNull(arrowBuf1, "allocation failed");
 
       arrowBuf1.setInt(0, 1);
       assertEquals(1, arrowBuf1.getInt(0));
 
       try {
-        final ArrowBuf arrowBuf2 = allocator.buffer(1);
+        allocator.buffer(1);
         fail("allocated memory beyond max allowed");
       } catch (OutOfMemoryException e) {
         // expected
@@ -391,145 +396,150 @@ public void testCustomizedAllocationManager() {
   }
 
   private BaseAllocator createAllocatorWithCustomizedAllocationManager() {
-    return new RootAllocator(BaseAllocator.configBuilder()
-        .maxAllocation(MAX_ALLOCATION)
-        .allocationManagerFactory(new AllocationManager.Factory() {
-          @Override
-          public AllocationManager create(BufferAllocator accountingAllocator, long requestedSize) {
-            return new AllocationManager(accountingAllocator) {
-              private final Unsafe unsafe = getUnsafe();
-              private final long address = unsafe.allocateMemory(requestedSize);
-
-              @Override
-              protected long memoryAddress() {
-                return address;
-              }
-
-              @Override
-              protected void release0() {
-                unsafe.setMemory(address, requestedSize, (byte) 0);
-                unsafe.freeMemory(address);
-              }
-
-              @Override
-              public long getSize() {
-                return requestedSize;
-              }
-
-              private Unsafe getUnsafe() {
-                Field f = null;
-                try {
-                  f = Unsafe.class.getDeclaredField("theUnsafe");
-                  f.setAccessible(true);
-                  return (Unsafe) f.get(null);
-                } catch (NoSuchFieldException | IllegalAccessException e) {
-                  throw new RuntimeException(e);
-                } finally {
-                  if (f != null) {
-                    f.setAccessible(false);
+    return new RootAllocator(
+        BaseAllocator.configBuilder()
+            .maxAllocation(MAX_ALLOCATION)
+            .allocationManagerFactory(
+                new AllocationManager.Factory() {
+                  @Override
+                  public AllocationManager create(
+                      BufferAllocator accountingAllocator, long requestedSize) {
+                    return new AllocationManager(accountingAllocator) {
+                      private final Unsafe unsafe = getUnsafe();
+                      private final long address = unsafe.allocateMemory(requestedSize);
+
+                      @Override
+                      protected long memoryAddress() {
+                        return address;
+                      }
+
+                      @Override
+                      protected void release0() {
+                        unsafe.setMemory(address, requestedSize, (byte) 0);
+                        unsafe.freeMemory(address);
+                      }
+
+                      @Override
+                      public long getSize() {
+                        return requestedSize;
+                      }
+
+                      private Unsafe getUnsafe() {
+                        Field f = null;
+                        try {
+                          f = Unsafe.class.getDeclaredField("theUnsafe");
+                          f.setAccessible(true);
+                          return (Unsafe) f.get(null);
+                        } catch (NoSuchFieldException | IllegalAccessException e) {
+                          throw new RuntimeException(e);
+                        } finally {
+                          if (f != null) {
+                            f.setAccessible(false);
+                          }
+                        }
+                      }
+                    };
                   }
-                }
-              }
-            };
-          }
 
-          @Override
-          public ArrowBuf empty() {
-            return null;
-          }
-        }).build());
+                  @Override
+                  public ArrowBuf empty() {
+                    return null;
+                  }
+                })
+            .build());
   }
 
   @Test
   public void testRootAllocator_listeners() throws Exception {
     CountingAllocationListener listener1 = new CountingAllocationListener();
-    Assert.assertEquals(0, listener1.getNumPreCalls());
-    Assert.assertEquals(0, listener1.getNumCalls());
-    Assert.assertEquals(0, listener1.getNumReleaseCalls());
-    Assert.assertEquals(0, listener1.getNumChildren());
-    Assert.assertEquals(0, listener1.getTotalMem());
+    assertEquals(0, listener1.getNumPreCalls());
+    assertEquals(0, listener1.getNumCalls());
+    assertEquals(0, listener1.getNumReleaseCalls());
+    assertEquals(0, listener1.getNumChildren());
+    assertEquals(0, listener1.getTotalMem());
     CountingAllocationListener listener2 = new CountingAllocationListener();
-    Assert.assertEquals(0, listener2.getNumPreCalls());
-    Assert.assertEquals(0, listener2.getNumCalls());
-    Assert.assertEquals(0, listener2.getNumReleaseCalls());
-    Assert.assertEquals(0, listener2.getNumChildren());
-    Assert.assertEquals(0, listener2.getTotalMem());
+    assertEquals(0, listener2.getNumPreCalls());
+    assertEquals(0, listener2.getNumCalls());
+    assertEquals(0, listener2.getNumReleaseCalls());
+    assertEquals(0, listener2.getNumChildren());
+    assertEquals(0, listener2.getTotalMem());
     // root and first-level child share the first listener
     // second-level and third-level child share the second listener
     try (final RootAllocator rootAllocator = new RootAllocator(listener1, MAX_ALLOCATION)) {
       try (final BufferAllocator c1 = rootAllocator.newChildAllocator("c1", 0, MAX_ALLOCATION)) {
-        Assert.assertEquals(1, listener1.getNumChildren());
+        assertEquals(1, listener1.getNumChildren());
         final ArrowBuf buf1 = c1.buffer(16);
-        assertNotNull("allocation failed", buf1);
-        Assert.assertEquals(1, listener1.getNumPreCalls());
-        Assert.assertEquals(1, listener1.getNumCalls());
-        Assert.assertEquals(0, listener1.getNumReleaseCalls());
-        Assert.assertEquals(16, listener1.getTotalMem());
+        assertNotNull(buf1, "allocation failed");
+        assertEquals(1, listener1.getNumPreCalls());
+        assertEquals(1, listener1.getNumCalls());
+        assertEquals(0, listener1.getNumReleaseCalls());
+        assertEquals(16, listener1.getTotalMem());
         buf1.getReferenceManager().release();
         try (final BufferAllocator c2 = c1.newChildAllocator("c2", listener2, 0, MAX_ALLOCATION)) {
-          Assert.assertEquals(2, listener1.getNumChildren()); // c1 got a new child, so listener1 is notified.
-          Assert.assertEquals(0, listener2.getNumChildren());
+          assertEquals(
+              2, listener1.getNumChildren()); // c1 got a new child, so listener1 is notified.
+          assertEquals(0, listener2.getNumChildren());
           final ArrowBuf buf2 = c2.buffer(32);
-          assertNotNull("allocation failed", buf2);
-          Assert.assertEquals(1, listener1.getNumCalls());
-          Assert.assertEquals(16, listener1.getTotalMem());
-          Assert.assertEquals(1, listener2.getNumPreCalls());
-          Assert.assertEquals(1, listener2.getNumCalls());
-          Assert.assertEquals(0, listener2.getNumReleaseCalls());
-          Assert.assertEquals(32, listener2.getTotalMem());
+          assertNotNull(buf2, "allocation failed");
+          assertEquals(1, listener1.getNumCalls());
+          assertEquals(16, listener1.getTotalMem());
+          assertEquals(1, listener2.getNumPreCalls());
+          assertEquals(1, listener2.getNumCalls());
+          assertEquals(0, listener2.getNumReleaseCalls());
+          assertEquals(32, listener2.getTotalMem());
           buf2.getReferenceManager().release();
           try (final BufferAllocator c3 = c2.newChildAllocator("c3", 0, MAX_ALLOCATION)) {
-            Assert.assertEquals(2, listener1.getNumChildren());
-            Assert.assertEquals(1, listener2.getNumChildren());
+            assertEquals(2, listener1.getNumChildren());
+            assertEquals(1, listener2.getNumChildren());
             final ArrowBuf buf3 = c3.buffer(64);
-            assertNotNull("allocation failed", buf3);
-            Assert.assertEquals(1, listener1.getNumPreCalls());
-            Assert.assertEquals(1, listener1.getNumCalls());
-            Assert.assertEquals(1, listener1.getNumReleaseCalls());
-            Assert.assertEquals(16, listener1.getTotalMem());
-            Assert.assertEquals(2, listener2.getNumPreCalls());
-            Assert.assertEquals(2, listener2.getNumCalls());
-            Assert.assertEquals(1, listener2.getNumReleaseCalls());
-            Assert.assertEquals(32 + 64, listener2.getTotalMem());
+            assertNotNull(buf3, "allocation failed");
+            assertEquals(1, listener1.getNumPreCalls());
+            assertEquals(1, listener1.getNumCalls());
+            assertEquals(1, listener1.getNumReleaseCalls());
+            assertEquals(16, listener1.getTotalMem());
+            assertEquals(2, listener2.getNumPreCalls());
+            assertEquals(2, listener2.getNumCalls());
+            assertEquals(1, listener2.getNumReleaseCalls());
+            assertEquals(32 + 64, listener2.getTotalMem());
             buf3.getReferenceManager().release();
           }
-          Assert.assertEquals(2, listener1.getNumChildren());
-          Assert.assertEquals(0, listener2.getNumChildren()); // third-level child removed
+          assertEquals(2, listener1.getNumChildren());
+          assertEquals(0, listener2.getNumChildren()); // third-level child removed
         }
-        Assert.assertEquals(1, listener1.getNumChildren()); // second-level child removed
-        Assert.assertEquals(0, listener2.getNumChildren());
+        assertEquals(1, listener1.getNumChildren()); // second-level child removed
+        assertEquals(0, listener2.getNumChildren());
       }
-      Assert.assertEquals(0, listener1.getNumChildren()); // first-level child removed
+      assertEquals(0, listener1.getNumChildren()); // first-level child removed
 
-      Assert.assertEquals(2, listener2.getNumReleaseCalls());
+      assertEquals(2, listener2.getNumReleaseCalls());
     }
   }
 
   @Test
   public void testRootAllocator_listenerAllocationFail() throws Exception {
     CountingAllocationListener listener1 = new CountingAllocationListener();
-    Assert.assertEquals(0, listener1.getNumCalls());
-    Assert.assertEquals(0, listener1.getTotalMem());
+    assertEquals(0, listener1.getNumCalls());
+    assertEquals(0, listener1.getTotalMem());
     // Test attempts to allocate too much from a child whose limit is set to half of the max
     // allocation. The listener's callback triggers, expanding the child allocator's limit, so then
     // the allocation succeeds.
     try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
-      try (final BufferAllocator c1 = rootAllocator.newChildAllocator("c1", listener1, 0,
-          MAX_ALLOCATION / 2)) {
+      try (final BufferAllocator c1 =
+          rootAllocator.newChildAllocator("c1", listener1, 0, MAX_ALLOCATION / 2)) {
         try {
           c1.buffer(MAX_ALLOCATION);
           fail("allocated memory beyond max allowed");
         } catch (OutOfMemoryException e) {
           // expected
         }
-        Assert.assertEquals(0, listener1.getNumCalls());
-        Assert.assertEquals(0, listener1.getTotalMem());
+        assertEquals(0, listener1.getNumCalls());
+        assertEquals(0, listener1.getTotalMem());
 
         listener1.setExpandOnFail(c1, MAX_ALLOCATION);
         ArrowBuf arrowBuf = c1.buffer(MAX_ALLOCATION);
-        assertNotNull("allocation failed", arrowBuf);
-        Assert.assertEquals(1, listener1.getNumCalls());
-        Assert.assertEquals(MAX_ALLOCATION, listener1.getTotalMem());
+        assertNotNull(arrowBuf, "allocation failed");
+        assertEquals(1, listener1.getNumCalls());
+        assertEquals(MAX_ALLOCATION, listener1.getTotalMem());
         arrowBuf.getReferenceManager().release();
       }
     }
@@ -537,18 +547,18 @@ public void testRootAllocator_listenerAllocationFail() throws Exception {
 
   private static void allocateAndFree(final BufferAllocator allocator) {
     final ArrowBuf arrowBuf = allocator.buffer(512);
-    assertNotNull("allocation failed", arrowBuf);
+    assertNotNull(arrowBuf, "allocation failed");
     arrowBuf.getReferenceManager().release();
 
     final ArrowBuf arrowBuf2 = allocator.buffer(MAX_ALLOCATION);
-    assertNotNull("allocation failed", arrowBuf2);
+    assertNotNull(arrowBuf2, "allocation failed");
     arrowBuf2.getReferenceManager().release();
 
     final int nBufs = 8;
     final ArrowBuf[] arrowBufs = new ArrowBuf[nBufs];
     for (int i = 0; i < arrowBufs.length; ++i) {
       ArrowBuf arrowBufi = allocator.buffer(MAX_ALLOCATION / nBufs);
-      assertNotNull("allocation failed", arrowBufi);
+      assertNotNull(arrowBufi, "allocation failed");
       arrowBufs[i] = arrowBufi;
     }
     for (ArrowBuf arrowBufi : arrowBufs) {
@@ -558,10 +568,9 @@ private static void allocateAndFree(final BufferAllocator allocator) {
 
   @Test
   public void testAllocator_manyAllocations() throws Exception {
-    try (final RootAllocator rootAllocator =
-             new RootAllocator(MAX_ALLOCATION)) {
+    try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
       try (final BufferAllocator childAllocator =
-               rootAllocator.newChildAllocator("manyAllocations", 0, MAX_ALLOCATION)) {
+          rootAllocator.newChildAllocator("manyAllocations", 0, MAX_ALLOCATION)) {
         allocateAndFree(childAllocator);
       }
     }
@@ -569,10 +578,9 @@ public void testAllocator_manyAllocations() throws Exception {
 
   @Test
   public void testAllocator_overAllocate() throws Exception {
-    try (final RootAllocator rootAllocator =
-             new RootAllocator(MAX_ALLOCATION)) {
+    try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
       try (final BufferAllocator childAllocator =
-               rootAllocator.newChildAllocator("overAllocate", 0, MAX_ALLOCATION)) {
+          rootAllocator.newChildAllocator("overAllocate", 0, MAX_ALLOCATION)) {
         allocateAndFree(childAllocator);
 
         try {
@@ -587,14 +595,13 @@ public void testAllocator_overAllocate() throws Exception {
 
   @Test
   public void testAllocator_overAllocateParent() throws Exception {
-    try (final RootAllocator rootAllocator =
-             new RootAllocator(MAX_ALLOCATION)) {
+    try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
       try (final BufferAllocator childAllocator =
-               rootAllocator.newChildAllocator("overAllocateParent", 0, MAX_ALLOCATION)) {
+          rootAllocator.newChildAllocator("overAllocateParent", 0, MAX_ALLOCATION)) {
         final ArrowBuf arrowBuf1 = rootAllocator.buffer(MAX_ALLOCATION / 2);
-        assertNotNull("allocation failed", arrowBuf1);
+        assertNotNull(arrowBuf1, "allocation failed");
         final ArrowBuf arrowBuf2 = childAllocator.buffer(MAX_ALLOCATION / 2);
-        assertNotNull("allocation failed", arrowBuf2);
+        assertNotNull(arrowBuf2, "allocation failed");
 
         try {
           childAllocator.buffer(MAX_ALLOCATION / 4);
@@ -611,18 +618,18 @@ public void testAllocator_overAllocateParent() throws Exception {
 
   @Test
   public void testAllocator_failureAtParentLimitOutcomeDetails() throws Exception {
-    try (final RootAllocator rootAllocator =
-        new RootAllocator(MAX_ALLOCATION)) {
+    try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
       try (final BufferAllocator childAllocator =
           rootAllocator.newChildAllocator("child", 0, MAX_ALLOCATION / 2)) {
         try (final BufferAllocator grandChildAllocator =
             childAllocator.newChildAllocator("grandchild", MAX_ALLOCATION / 4, MAX_ALLOCATION)) {
-          OutOfMemoryException e = assertThrows(OutOfMemoryException.class,
-              () -> grandChildAllocator.buffer(MAX_ALLOCATION));
+          OutOfMemoryException e =
+              assertThrows(
+                  OutOfMemoryException.class, () -> grandChildAllocator.buffer(MAX_ALLOCATION));
           // expected
           assertTrue(e.getMessage().contains("Unable to allocate buffer"));
 
-          assertTrue("missing outcome details", e.getOutcomeDetails().isPresent());
+          assertTrue(e.getOutcomeDetails().isPresent(), "missing outcome details");
           AllocationOutcomeDetails outcomeDetails = e.getOutcomeDetails().get();
 
           assertEquals(outcomeDetails.getFailedAllocator(), childAllocator);
@@ -633,12 +640,12 @@ public void testAllocator_failureAtParentLimitOutcomeDetails() throws Exception
           AllocationOutcomeDetails.Entry first = iterator.next();
           assertEquals(MAX_ALLOCATION / 4, first.getAllocatedSize());
           assertEquals(MAX_ALLOCATION, first.getRequestedSize());
-          assertEquals(false, first.isAllocationFailed());
+          assertFalse(first.isAllocationFailed());
 
           AllocationOutcomeDetails.Entry second = iterator.next();
           assertEquals(MAX_ALLOCATION - MAX_ALLOCATION / 4, second.getRequestedSize());
           assertEquals(0, second.getAllocatedSize());
-          assertEquals(true, second.isAllocationFailed());
+          assertTrue(second.isAllocationFailed());
 
           assertFalse(iterator.hasNext());
         }
@@ -648,17 +655,17 @@ public void testAllocator_failureAtParentLimitOutcomeDetails() throws Exception
 
   @Test
   public void testAllocator_failureAtRootLimitOutcomeDetails() throws Exception {
-    try (final RootAllocator rootAllocator =
-        new RootAllocator(MAX_ALLOCATION)) {
+    try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
       try (final BufferAllocator childAllocator =
           rootAllocator.newChildAllocator("child", MAX_ALLOCATION / 2, Long.MAX_VALUE)) {
         try (final BufferAllocator grandChildAllocator =
             childAllocator.newChildAllocator("grandchild", MAX_ALLOCATION / 4, Long.MAX_VALUE)) {
-          OutOfMemoryException e = assertThrows(OutOfMemoryException.class,
-              () -> grandChildAllocator.buffer(MAX_ALLOCATION * 2));
+          OutOfMemoryException e =
+              assertThrows(
+                  OutOfMemoryException.class, () -> grandChildAllocator.buffer(MAX_ALLOCATION * 2));
 
           assertTrue(e.getMessage().contains("Unable to allocate buffer"));
-          assertTrue("missing outcome details", e.getOutcomeDetails().isPresent());
+          assertTrue(e.getOutcomeDetails().isPresent(), "missing outcome details");
           AllocationOutcomeDetails outcomeDetails = e.getOutcomeDetails().get();
 
           assertEquals(outcomeDetails.getFailedAllocator(), rootAllocator);
@@ -669,16 +676,16 @@ public void testAllocator_failureAtRootLimitOutcomeDetails() throws Exception {
           AllocationOutcomeDetails.Entry first = iterator.next();
           assertEquals(MAX_ALLOCATION / 4, first.getAllocatedSize());
           assertEquals(2 * MAX_ALLOCATION, first.getRequestedSize());
-          assertEquals(false, first.isAllocationFailed());
+          assertFalse(first.isAllocationFailed());
 
           AllocationOutcomeDetails.Entry second = iterator.next();
           assertEquals(MAX_ALLOCATION / 4, second.getAllocatedSize());
           assertEquals(2 * MAX_ALLOCATION - MAX_ALLOCATION / 4, second.getRequestedSize());
-          assertEquals(false, second.isAllocationFailed());
+          assertFalse(second.isAllocationFailed());
 
           AllocationOutcomeDetails.Entry third = iterator.next();
           assertEquals(0, third.getAllocatedSize());
-          assertEquals(true, third.isAllocationFailed());
+          assertTrue(third.isAllocationFailed());
 
           assertFalse(iterator.hasNext());
         }
@@ -699,7 +706,9 @@ private static void testAllocator_sliceUpBufferAndRelease(
     final ArrowBuf arrowBuf4 = arrowBuf3.slice(16, arrowBuf3.capacity() - 32);
     rootAllocator.verify();
 
-    arrowBuf3.getReferenceManager().release(); // since they share refcounts, one is enough to release them all
+    arrowBuf3
+        .getReferenceManager()
+        .release(); // since they share refcounts, one is enough to release them all
     rootAllocator.verify();
   }
 
@@ -708,18 +717,18 @@ public void testAllocator_createSlices() throws Exception {
     try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
       testAllocator_sliceUpBufferAndRelease(rootAllocator, rootAllocator);
 
-      try (final BufferAllocator childAllocator = rootAllocator.newChildAllocator("createSlices", 0,
-          MAX_ALLOCATION)) {
+      try (final BufferAllocator childAllocator =
+          rootAllocator.newChildAllocator("createSlices", 0, MAX_ALLOCATION)) {
         testAllocator_sliceUpBufferAndRelease(rootAllocator, childAllocator);
       }
       rootAllocator.verify();
 
       testAllocator_sliceUpBufferAndRelease(rootAllocator, rootAllocator);
 
-      try (final BufferAllocator childAllocator = rootAllocator.newChildAllocator("createSlices", 0,
-          MAX_ALLOCATION)) {
+      try (final BufferAllocator childAllocator =
+          rootAllocator.newChildAllocator("createSlices", 0, MAX_ALLOCATION)) {
         try (final BufferAllocator childAllocator2 =
-                 childAllocator.newChildAllocator("createSlices", 0, MAX_ALLOCATION)) {
+            childAllocator.newChildAllocator("createSlices", 0, MAX_ALLOCATION)) {
           final ArrowBuf arrowBuf1 = childAllocator2.buffer(MAX_ALLOCATION / 8);
           @SuppressWarnings("unused")
           final ArrowBuf arrowBuf2 = arrowBuf1.slice(MAX_ALLOCATION / 16, MAX_ALLOCATION / 16);
@@ -738,8 +747,7 @@ public void testAllocator_createSlices() throws Exception {
   @Test
   public void testAllocator_sliceRanges() throws Exception {
     // final AllocatorOwner allocatorOwner = new NamedOwner("sliceRanges");
-    try (final RootAllocator rootAllocator =
-             new RootAllocator(MAX_ALLOCATION)) {
+    try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
       // Populate a buffer with byte values corresponding to their indices.
       final ArrowBuf arrowBuf = rootAllocator.buffer(256);
       assertEquals(256, arrowBuf.capacity());
@@ -797,8 +805,7 @@ public void testAllocator_sliceRanges() throws Exception {
   @Test
   public void testAllocator_slicesOfSlices() throws Exception {
     // final AllocatorOwner allocatorOwner = new NamedOwner("slicesOfSlices");
-    try (final RootAllocator rootAllocator =
-             new RootAllocator(MAX_ALLOCATION)) {
+    try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
       // Populate a buffer with byte values corresponding to their indices.
       final ArrowBuf arrowBuf = rootAllocator.buffer(256);
       for (int i = 0; i < 256; ++i) {
@@ -833,8 +840,10 @@ public void testAllocator_slicesOfSlices() throws Exception {
   @Test
   public void testAllocator_transferSliced() throws Exception {
     try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
-      final BufferAllocator childAllocator1 = rootAllocator.newChildAllocator("transferSliced1", 0, MAX_ALLOCATION);
-      final BufferAllocator childAllocator2 = rootAllocator.newChildAllocator("transferSliced2", 0, MAX_ALLOCATION);
+      final BufferAllocator childAllocator1 =
+          rootAllocator.newChildAllocator("transferSliced1", 0, MAX_ALLOCATION);
+      final BufferAllocator childAllocator2 =
+          rootAllocator.newChildAllocator("transferSliced2", 0, MAX_ALLOCATION);
 
       final ArrowBuf arrowBuf1 = childAllocator1.buffer(MAX_ALLOCATION / 8);
       final ArrowBuf arrowBuf2 = childAllocator2.buffer(MAX_ALLOCATION / 8);
@@ -844,10 +853,12 @@ public void testAllocator_transferSliced() throws Exception {
 
       rootAllocator.verify();
 
-      OwnershipTransferResult result1 = arrowBuf2s.getReferenceManager().transferOwnership(arrowBuf2s, childAllocator1);
+      OwnershipTransferResult result1 =
+          arrowBuf2s.getReferenceManager().transferOwnership(arrowBuf2s, childAllocator1);
       assertEquiv(arrowBuf2s, result1.getTransferredBuffer());
       rootAllocator.verify();
-      OwnershipTransferResult result2 = arrowBuf1s.getReferenceManager().transferOwnership(arrowBuf1s, childAllocator2);
+      OwnershipTransferResult result2 =
+          arrowBuf1s.getReferenceManager().transferOwnership(arrowBuf1s, childAllocator2);
       assertEquiv(arrowBuf1s, result2.getTransferredBuffer());
       rootAllocator.verify();
 
@@ -865,8 +876,10 @@ public void testAllocator_transferSliced() throws Exception {
   @Test
   public void testAllocator_shareSliced() throws Exception {
     try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
-      final BufferAllocator childAllocator1 = rootAllocator.newChildAllocator("transferSliced", 0, MAX_ALLOCATION);
-      final BufferAllocator childAllocator2 = rootAllocator.newChildAllocator("transferSliced", 0, MAX_ALLOCATION);
+      final BufferAllocator childAllocator1 =
+          rootAllocator.newChildAllocator("transferSliced", 0, MAX_ALLOCATION);
+      final BufferAllocator childAllocator2 =
+          rootAllocator.newChildAllocator("transferSliced", 0, MAX_ALLOCATION);
 
       final ArrowBuf arrowBuf1 = childAllocator1.buffer(MAX_ALLOCATION / 8);
       final ArrowBuf arrowBuf2 = childAllocator2.buffer(MAX_ALLOCATION / 8);
@@ -876,9 +889,11 @@ public void testAllocator_shareSliced() throws Exception {
 
       rootAllocator.verify();
 
-      final ArrowBuf arrowBuf2s1 = arrowBuf2s.getReferenceManager().retain(arrowBuf2s, childAllocator1);
+      final ArrowBuf arrowBuf2s1 =
+          arrowBuf2s.getReferenceManager().retain(arrowBuf2s, childAllocator1);
       assertEquiv(arrowBuf2s, arrowBuf2s1);
-      final ArrowBuf arrowBuf1s2 = arrowBuf1s.getReferenceManager().retain(arrowBuf1s, childAllocator2);
+      final ArrowBuf arrowBuf1s2 =
+          arrowBuf1s.getReferenceManager().retain(arrowBuf1s, childAllocator2);
       assertEquiv(arrowBuf1s, arrowBuf1s2);
       rootAllocator.verify();
 
@@ -897,9 +912,12 @@ public void testAllocator_shareSliced() throws Exception {
   @Test
   public void testAllocator_transferShared() throws Exception {
     try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
-      final BufferAllocator childAllocator1 = rootAllocator.newChildAllocator("transferShared1", 0, MAX_ALLOCATION);
-      final BufferAllocator childAllocator2 = rootAllocator.newChildAllocator("transferShared2", 0, MAX_ALLOCATION);
-      final BufferAllocator childAllocator3 = rootAllocator.newChildAllocator("transferShared3", 0, MAX_ALLOCATION);
+      final BufferAllocator childAllocator1 =
+          rootAllocator.newChildAllocator("transferShared1", 0, MAX_ALLOCATION);
+      final BufferAllocator childAllocator2 =
+          rootAllocator.newChildAllocator("transferShared2", 0, MAX_ALLOCATION);
+      final BufferAllocator childAllocator3 =
+          rootAllocator.newChildAllocator("transferShared3", 0, MAX_ALLOCATION);
 
       final ArrowBuf arrowBuf1 = childAllocator1.buffer(MAX_ALLOCATION / 8);
 
@@ -912,7 +930,8 @@ public void testAllocator_transferShared() throws Exception {
       assertEquiv(arrowBuf1, arrowBuf2);
 
       final ReferenceManager refManager1 = arrowBuf1.getReferenceManager();
-      final OwnershipTransferResult result1 = refManager1.transferOwnership(arrowBuf1, childAllocator3);
+      final OwnershipTransferResult result1 =
+          refManager1.transferOwnership(arrowBuf1, childAllocator3);
       allocationFit = result1.getAllocationFit();
       final ArrowBuf arrowBuf3 = result1.getTransferredBuffer();
       assertTrue(allocationFit);
@@ -928,9 +947,11 @@ public void testAllocator_transferShared() throws Exception {
       childAllocator2.close();
       rootAllocator.verify();
 
-      final BufferAllocator childAllocator4 = rootAllocator.newChildAllocator("transferShared4", 0, MAX_ALLOCATION);
+      final BufferAllocator childAllocator4 =
+          rootAllocator.newChildAllocator("transferShared4", 0, MAX_ALLOCATION);
       final ReferenceManager refManager3 = arrowBuf3.getReferenceManager();
-      final OwnershipTransferResult result3 = refManager3.transferOwnership(arrowBuf3, childAllocator4);
+      final OwnershipTransferResult result3 =
+          refManager3.transferOwnership(arrowBuf3, childAllocator4);
       allocationFit = result3.getAllocationFit();
       final ArrowBuf arrowBuf4 = result3.getTransferredBuffer();
       assertTrue(allocationFit);
@@ -951,7 +972,7 @@ public void testAllocator_transferShared() throws Exception {
   public void testAllocator_unclaimedReservation() throws Exception {
     try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
       try (final BufferAllocator childAllocator1 =
-               rootAllocator.newChildAllocator("unclaimedReservation", 0, MAX_ALLOCATION)) {
+          rootAllocator.newChildAllocator("unclaimedReservation", 0, MAX_ALLOCATION)) {
         try (final AllocationReservation reservation = childAllocator1.newReservation()) {
           assertTrue(reservation.add(64));
         }
@@ -964,8 +985,8 @@ public void testAllocator_unclaimedReservation() throws Exception {
   public void testAllocator_claimedReservation() throws Exception {
     try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
 
-      try (final BufferAllocator childAllocator1 = rootAllocator.newChildAllocator(
-          "claimedReservation", 0, MAX_ALLOCATION)) {
+      try (final BufferAllocator childAllocator1 =
+          rootAllocator.newChildAllocator("claimedReservation", 0, MAX_ALLOCATION)) {
 
         try (final AllocationReservation reservation = childAllocator1.newReservation()) {
           assertTrue(reservation.add(32));
@@ -986,8 +1007,8 @@ public void testAllocator_claimedReservation() throws Exception {
   @Test
   public void testInitReservationAndLimit() throws Exception {
     try (final RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
-      try (final BufferAllocator childAllocator = rootAllocator.newChildAllocator(
-              "child", 2048, 4096)) {
+      try (final BufferAllocator childAllocator =
+          rootAllocator.newChildAllocator("child", 2048, 4096)) {
         assertEquals(2048, childAllocator.getInitReservation());
         assertEquals(4096, childAllocator.getLimit());
       }
@@ -1055,39 +1076,38 @@ public void multiple() throws Exception {
       frag1.close();
       frag2.close();
       frag3.close();
-
     }
   }
 
-  // This test needs to run in non-debug mode. So disabling the assertion status through class loader for this.
+  // This test needs to run in non-debug mode. So disabling the assertion status through class
+  // loader for this.
   // The test passes if run individually with -Dtest=TestBaseAllocator#testMemoryLeakWithReservation
   // but fails generally since the assertion status cannot be changed once the class is initialized.
   // So setting the test to @ignore
-  @Test(expected = IllegalStateException.class)
-  @Ignore
+  @Test
+  @Disabled
   public void testMemoryLeakWithReservation() throws Exception {
     // disabling assertion status
-    AssertionUtil.class.getClassLoader().setClassAssertionStatus(AssertionUtil.class.getName(), false);
+    AssertionUtil.class
+        .getClassLoader()
+        .setClassAssertionStatus(AssertionUtil.class.getName(), false);
+
     try (RootAllocator rootAllocator = new RootAllocator(MAX_ALLOCATION)) {
-      ChildAllocator childAllocator1 = (ChildAllocator) rootAllocator.newChildAllocator(
-          "child1", 1024, MAX_ALLOCATION);
+      ChildAllocator childAllocator1 =
+          (ChildAllocator) rootAllocator.newChildAllocator("child1", 1024, MAX_ALLOCATION);
       rootAllocator.verify();
 
-      ChildAllocator childAllocator2 = (ChildAllocator) childAllocator1.newChildAllocator(
-          "child2", 1024, MAX_ALLOCATION);
+      ChildAllocator childAllocator2 =
+          (ChildAllocator) childAllocator1.newChildAllocator("child2", 1024, MAX_ALLOCATION);
       rootAllocator.verify();
 
-      ArrowBuf buff = childAllocator2.buffer(256);
+      childAllocator2.buffer(256);
 
-      Exception exception = assertThrows(IllegalStateException.class, () -> {
-        childAllocator2.close();
-      });
+      Exception exception = assertThrows(IllegalStateException.class, childAllocator2::close);
       String exMessage = exception.getMessage();
       assertTrue(exMessage.contains("Memory leaked: (256)"));
 
-      exception = assertThrows(IllegalStateException.class, () -> {
-        childAllocator1.close();
-      });
+      exception = assertThrows(IllegalStateException.class, childAllocator1::close);
       exMessage = exception.getMessage();
       assertTrue(exMessage.contains("Memory leaked: (256)"));
     }
@@ -1097,11 +1117,13 @@ public void testMemoryLeakWithReservation() throws Exception {
   public void testOverlimit() {
     try (BufferAllocator allocator = new RootAllocator(1024)) {
       try (BufferAllocator child1 = allocator.newChildAllocator("ChildA", 0, 1024);
-           BufferAllocator child2 = allocator.newChildAllocator("ChildB", 1024, 1024)) {
-        assertThrows(OutOfMemoryException.class, () -> {
-          ArrowBuf buf1 = child1.buffer(8);
-          buf1.close();
-        });
+          BufferAllocator child2 = allocator.newChildAllocator("ChildB", 1024, 1024)) {
+        assertThrows(
+            OutOfMemoryException.class,
+            () -> {
+              ArrowBuf buf1 = child1.buffer(8);
+              buf1.close();
+            });
         assertEquals(0, child1.getAllocatedMemory());
         assertEquals(0, child2.getAllocatedMemory());
         assertEquals(1024, allocator.getAllocatedMemory());
@@ -1114,11 +1136,14 @@ public void testOverlimitOverflow() {
     // Regression test for https://github.com/apache/arrow/issues/35960
     try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE)) {
       try (BufferAllocator child1 = allocator.newChildAllocator("ChildA", 0, Long.MAX_VALUE);
-           BufferAllocator child2 = allocator.newChildAllocator("ChildB", Long.MAX_VALUE, Long.MAX_VALUE)) {
-        assertThrows(OutOfMemoryException.class, () -> {
-          ArrowBuf buf1 = child1.buffer(1024);
-          buf1.close();
-        });
+          BufferAllocator child2 =
+              allocator.newChildAllocator("ChildB", Long.MAX_VALUE, Long.MAX_VALUE)) {
+        assertThrows(
+            OutOfMemoryException.class,
+            () -> {
+              ArrowBuf buf1 = child1.buffer(1024);
+              buf1.close();
+            });
         assertEquals(0, child1.getAllocatedMemory());
         assertEquals(0, child2.getAllocatedMemory());
         assertEquals(Long.MAX_VALUE, allocator.getAllocatedMemory());
diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestBoundaryChecking.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestBoundaryChecking.java
index 5b86bed406b3a..7d4d1e7b67260 100644
--- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestBoundaryChecking.java
+++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestBoundaryChecking.java
@@ -14,22 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.lang.reflect.Field;
 import java.net.URLClassLoader;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Test cases for evaluating the value of {@link BoundsChecking#BOUNDS_CHECKING_ENABLED}.
- */
+/** Test cases for evaluating the value of {@link BoundsChecking#BOUNDS_CHECKING_ENABLED}. */
 public class TestBoundaryChecking {
 
   /**
    * Get a copy of the current class loader.
+   *
    * @return the newly created class loader.
    */
   private ClassLoader copyClassLoader() {
@@ -44,7 +43,8 @@ private ClassLoader copyClassLoader() {
   }
 
   /**
-   * Get the value of flag  {@link BoundsChecking#BOUNDS_CHECKING_ENABLED}.
+   * Get the value of flag {@link BoundsChecking#BOUNDS_CHECKING_ENABLED}.
+   *
    * @param classLoader the class loader from which to get the flag value.
    * @return value of the flag.
    */
@@ -55,20 +55,21 @@ private boolean getFlagValue(ClassLoader classLoader) throws Exception {
   }
 
   /**
-   * Ensure the flag for bounds checking is enabled by default.
-   * This will protect users from JVM crashes.
+   * Ensure the flag for bounds checking is enabled by default. This will protect users from JVM
+   * crashes.
    */
   @Test
   public void testDefaultValue() throws Exception {
     ClassLoader classLoader = copyClassLoader();
     if (classLoader != null) {
       boolean boundsCheckingEnabled = getFlagValue(classLoader);
-      Assert.assertTrue(boundsCheckingEnabled);
+      assertTrue(boundsCheckingEnabled);
     }
   }
 
   /**
    * Test setting the bounds checking flag by the old property.
+   *
    * @throws Exception if loading class {@link BoundsChecking#BOUNDS_CHECKING_ENABLED} fails.
    */
   @Test
@@ -79,7 +80,7 @@ public void testEnableOldProperty() throws Exception {
     ClassLoader classLoader = copyClassLoader();
     if (classLoader != null) {
       boolean boundsCheckingEnabled = getFlagValue(classLoader);
-      Assert.assertFalse(boundsCheckingEnabled);
+      assertFalse(boundsCheckingEnabled);
     }
 
     // restore system property
@@ -92,6 +93,7 @@ public void testEnableOldProperty() throws Exception {
 
   /**
    * Test setting the bounds checking flag by the new property.
+   *
    * @throws Exception if loading class {@link BoundsChecking#BOUNDS_CHECKING_ENABLED} fails.
    */
   @Test
@@ -103,7 +105,7 @@ public void testEnableNewProperty() throws Exception {
     ClassLoader classLoader = copyClassLoader();
     if (classLoader != null) {
       boolean boundsCheckingEnabled = getFlagValue(classLoader);
-      Assert.assertFalse(boundsCheckingEnabled);
+      assertFalse(boundsCheckingEnabled);
     }
 
     // restore system property
@@ -115,8 +117,9 @@ public void testEnableNewProperty() throws Exception {
   }
 
   /**
-   * Test setting the bounds checking flag by both old and new properties.
-   * In this case, the new property should take precedence.
+   * Test setting the bounds checking flag by both old and new properties. In this case, the new
+   * property should take precedence.
+   *
    * @throws Exception if loading class {@link BoundsChecking#BOUNDS_CHECKING_ENABLED} fails.
    */
   @Test
@@ -131,7 +134,7 @@ public void testEnableBothProperties() throws Exception {
     ClassLoader classLoader = copyClassLoader();
     if (classLoader != null) {
       boolean boundsCheckingEnabled = getFlagValue(classLoader);
-      Assert.assertFalse(boundsCheckingEnabled);
+      assertFalse(boundsCheckingEnabled);
     }
 
     // restore system property
diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestForeignAllocation.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestForeignAllocation.java
index 46e94fad37b05..162bbbcbe939c 100644
--- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestForeignAllocation.java
+++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestForeignAllocation.java
@@ -14,36 +14,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
-
-import org.apache.arrow.memory.AllocationListener;
-import org.apache.arrow.memory.AllocationOutcome;
-import org.apache.arrow.memory.ArrowBuf;
-import org.apache.arrow.memory.BufferAllocator;
-import org.apache.arrow.memory.ForeignAllocation;
-import org.apache.arrow.memory.OutOfMemoryException;
-import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.memory.util.MemoryUtil;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestForeignAllocation {
   BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void before() {
     allocator = new RootAllocator();
   }
 
-  @After
+  @AfterEach
   public void after() {
     allocator.close();
   }
@@ -91,25 +83,28 @@ public void wrapForeignAllocationWithAllocationListener() {
     assertEquals(16, listener.getTotalMem());
   }
 
-  @Test(expected = OutOfMemoryException.class)
+  @Test
   public void wrapForeignAllocationFailedWithAllocationListener() {
-    final long bufferSize = 16;
-    final long limit = bufferSize - 1;
-
-    final CountingAllocationListener listener = new CountingAllocationListener();
-    try (BufferAllocator listenedAllocator =
-        allocator.newChildAllocator("child", listener, 0L, limit)) {
-      UnsafeForeignAllocation allocation = new UnsafeForeignAllocation(bufferSize);
-      try {
-        assertEquals(0, listenedAllocator.getAllocatedMemory());
-        ArrowBuf buf = listenedAllocator.wrapForeignAllocation(allocation);
-        assertEquals(bufferSize, buf.capacity());
-        buf.close();
-        assertTrue(allocation.released);
-      } finally {
-        allocation.release0();
-      }
-    }
+    assertThrows(
+        OutOfMemoryException.class,
+        () -> {
+          final long bufferSize = 16;
+          final long limit = bufferSize - 1;
+          final CountingAllocationListener listener = new CountingAllocationListener();
+          try (BufferAllocator listenedAllocator =
+              allocator.newChildAllocator("child", listener, 0L, limit)) {
+            UnsafeForeignAllocation allocation = new UnsafeForeignAllocation(bufferSize);
+            try {
+              assertEquals(0, listenedAllocator.getAllocatedMemory());
+              ArrowBuf buf = listenedAllocator.wrapForeignAllocation(allocation);
+              assertEquals(bufferSize, buf.capacity());
+              buf.close();
+              assertTrue(allocation.released);
+            } finally {
+              allocation.release0();
+            }
+          }
+        });
   }
 
   @Test
@@ -118,13 +113,14 @@ public void wrapForeignAllocationWithAllocationListenerReclaimingSpace() {
     final long limit = 2 * bufferSize - 1;
 
     final List<ArrowBuf> buffersToBeFreed = new ArrayList<>();
-    final AllocationListener listener = new AllocationListener() {
-      @Override
-      public boolean onFailedAllocation(long size, AllocationOutcome outcome) {
-        buffersToBeFreed.forEach(ArrowBuf::close);
-        return true;
-      }
-    };
+    final AllocationListener listener =
+        new AllocationListener() {
+          @Override
+          public boolean onFailedAllocation(long size, AllocationOutcome outcome) {
+            buffersToBeFreed.forEach(ArrowBuf::close);
+            return true;
+          }
+        };
 
     try (BufferAllocator listenedAllocator =
         allocator.newChildAllocator("child", listener, 0L, limit)) {
@@ -133,7 +129,8 @@ public boolean onFailedAllocation(long size, AllocationOutcome outcome) {
       UnsafeForeignAllocation allocation = new UnsafeForeignAllocation(bufferSize);
       try (final ArrowBuf buffer2 = listenedAllocator.wrapForeignAllocation(allocation)) {
         assertEquals(bufferSize, buffer2.capacity());
-        assertEquals(0, buffer1.getReferenceManager().getRefCount()); // buffer1 was closed by listener
+        assertEquals(
+            0, buffer1.getReferenceManager().getRefCount()); // buffer1 was closed by listener
       }
     }
   }
diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestLowCostIdentityHashMap.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestLowCostIdentityHashMap.java
index 0cabc4a0571f2..5fbf6a55dc53f 100644
--- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestLowCostIdentityHashMap.java
+++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestLowCostIdentityHashMap.java
@@ -14,23 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
-import static junit.framework.TestCase.assertNotNull;
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-/**
- * To test simplified implementation of IdentityHashMap.
- */
+/** To test simplified implementation of IdentityHashMap. */
 public class TestLowCostIdentityHashMap {
 
   @Test
-  public void testIdentityHashMap() throws Exception {
+  public void testIdentityHashMap() {
     LowCostIdentityHashMap<String, StringWithKey> hashMap = new LowCostIdentityHashMap<>();
 
     StringWithKey obj1 = new StringWithKey("s1key", "s1value");
@@ -55,14 +53,16 @@ public void testIdentityHashMap() throws Exception {
 
     assertEquals(3, hashMap.size());
 
-    assertTrue(!hashMap.isEmpty());
+    assertFalse(hashMap.isEmpty());
 
     StringWithKey nextValue = hashMap.getNextValue();
 
     assertNotNull(nextValue);
 
-    assertTrue((hashMap.get("s1key") == nextValue || hashMap.get("s2key") == nextValue ||
-        hashMap.get("s5key") == nextValue));
+    assertTrue(
+        (hashMap.get("s1key") == nextValue
+            || hashMap.get("s2key") == nextValue
+            || hashMap.get("s5key") == nextValue));
 
     assertTrue(hashMap.containsValue(obj4));
     assertTrue(hashMap.containsValue(obj2));
@@ -87,10 +87,10 @@ public void testIdentityHashMap() throws Exception {
   }
 
   @Test
-  public void testLargeMap() throws Exception {
+  public void testLargeMap() {
     LowCostIdentityHashMap<String, StringWithKey> hashMap = new LowCostIdentityHashMap<>();
 
-    String [] keys = new String[200];
+    String[] keys = new String[200];
     for (int i = 0; i < 200; i++) {
       keys[i] = "s" + i + "key";
     }
@@ -128,7 +128,7 @@ public void testLargeMap() throws Exception {
       if (i % 4 == 0) {
         StringWithKey returnObj = hashMap.remove(keys[i]);
         assertNotNull(returnObj);
-        assertTrue(!hashMap.containsKey(keys[i]));
+        assertFalse(hashMap.containsKey(keys[i]));
       }
       StringWithKey obj = new StringWithKey(keys[100 + i], "s" + (100 + i) + "value");
       StringWithKey retObj = hashMap.put(obj);
@@ -141,16 +141,16 @@ public void testLargeMap() throws Exception {
       assertNotNull(retObj);
       hashMap.remove(retObj.getKey());
     }
-    assertTrue(!hashMap.isEmpty());
+    assertFalse(hashMap.isEmpty());
     assertEquals(75, hashMap.size());
     hashMap.clear();
     assertTrue(hashMap.isEmpty());
   }
 
-  private class StringWithKey implements ValueWithKeyIncluded<String> {
+  private static class StringWithKey implements ValueWithKeyIncluded<String> {
 
-    private String myValue;
-    private String myKey;
+    private final String myValue;
+    private final String myKey;
 
     StringWithKey(String myKey, String myValue) {
       this.myKey = myKey;
diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestOpens.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestOpens.java
index 7efc11a08acf2..756aa2919789b 100644
--- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestOpens.java
+++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/TestOpens.java
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestOpens {
   /** Instantiating the RootAllocator should poke MemoryUtil and fail. */
@@ -29,14 +28,18 @@ public void testMemoryUtilFailsLoudly() {
     // This test is configured by Maven to run WITHOUT add-opens. So this should fail on JDK16+
     // (where JEP396 means that add-opens is required to access JDK internals).
     // The test will likely fail in your IDE if it doesn't correctly pick this up.
-    Throwable e = assertThrows(Throwable.class, () -> {
-      BufferAllocator allocator = new RootAllocator();
-      allocator.close();
-    });
+    Throwable e =
+        assertThrows(
+            Throwable.class,
+            () -> {
+              BufferAllocator allocator = new RootAllocator();
+              allocator.close();
+            });
     boolean found = false;
     while (e != null) {
       e = e.getCause();
-      if (e instanceof RuntimeException && e.getMessage().contains("Failed to initialize MemoryUtil")) {
+      if (e instanceof RuntimeException
+          && e.getMessage().contains("Failed to initialize MemoryUtil")) {
         found = true;
         break;
       }
diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestArrowBufPointer.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestArrowBufPointer.java
index a1d5624a7e8c0..bb94ed71a8dee 100644
--- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestArrowBufPointer.java
+++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestArrowBufPointer.java
@@ -14,38 +14,35 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util;
 
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertNotSame;
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.memory.util.hash.ArrowBufHasher;
 import org.apache.arrow.memory.util.hash.SimpleHasher;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link ArrowBufPointer}.
- */
+/** Test cases for {@link ArrowBufPointer}. */
 public class TestArrowBufPointer {
 
   private final int BUFFER_LENGTH = 1024;
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -55,17 +52,17 @@ public void testArrowBufPointersEqual() {
     try (ArrowBuf buf1 = allocator.buffer(BUFFER_LENGTH);
         ArrowBuf buf2 = allocator.buffer(BUFFER_LENGTH)) {
       for (int i = 0; i < BUFFER_LENGTH / 4; i++) {
-        buf1.setInt(i * 4, i * 1234);
-        buf2.setInt(i * 4, i * 1234);
+        buf1.setInt(i * 4L, i * 1234);
+        buf2.setInt(i * 4L, i * 1234);
       }
 
       ArrowBufPointer ptr1 = new ArrowBufPointer(null, 0, 100);
       ArrowBufPointer ptr2 = new ArrowBufPointer(null, 100, 5032);
-      assertTrue(ptr1.equals(ptr2));
+      assertEquals(ptr1, ptr2);
       for (int i = 0; i < BUFFER_LENGTH / 4; i++) {
-        ptr1.set(buf1, i * 4, 4);
-        ptr2.set(buf2, i * 4, 4);
-        assertTrue(ptr1.equals(ptr2));
+        ptr1.set(buf1, i * 4L, 4);
+        ptr2.set(buf2, i * 4L, 4);
+        assertEquals(ptr1, ptr2);
       }
     }
   }
@@ -74,10 +71,10 @@ public void testArrowBufPointersEqual() {
   public void testArrowBufPointersHashCode() {
     final int vectorLength = 100;
     try (ArrowBuf buf1 = allocator.buffer(vectorLength * 4);
-         ArrowBuf buf2 = allocator.buffer(vectorLength * 4)) {
+        ArrowBuf buf2 = allocator.buffer(vectorLength * 4)) {
       for (int i = 0; i < vectorLength; i++) {
-        buf1.setInt(i * 4, i);
-        buf2.setInt(i * 4, i);
+        buf1.setInt(i * 4L, i);
+        buf2.setInt(i * 4L, i);
       }
 
       CounterHasher hasher1 = new CounterHasher();
@@ -90,8 +87,8 @@ public void testArrowBufPointersHashCode() {
       assertEquals(ArrowBufPointer.NULL_HASH_CODE, pointer2.hashCode());
 
       for (int i = 0; i < vectorLength; i++) {
-        pointer1.set(buf1, i * 4, 4);
-        pointer2.set(buf2, i * 4, 4);
+        pointer1.set(buf1, i * 4L, 4);
+        pointer2.set(buf2, i * 4L, 4);
 
         assertEquals(pointer1.hashCode(), pointer2.hashCode());
 
@@ -147,7 +144,7 @@ public void testHashersForEquality() {
       ArrowBufPointer pointer2 = new ArrowBufPointer(buf, 0, 10, new CounterHasher());
 
       // the two pointers cannot be equal, since they have different hashers
-      assertFalse(pointer1.equals(pointer2));
+      assertNotEquals(pointer1, pointer2);
     }
   }
 
@@ -155,7 +152,7 @@ public void testHashersForEquality() {
   public void testArrowBufPointersComparison() {
     final int vectorLength = 100;
     try (ArrowBuf buf1 = allocator.buffer(vectorLength);
-         ArrowBuf buf2 = allocator.buffer(vectorLength)) {
+        ArrowBuf buf2 = allocator.buffer(vectorLength)) {
       for (int i = 0; i < vectorLength; i++) {
         buf1.setByte(i, i);
         buf2.setByte(i, i);
@@ -185,10 +182,10 @@ public void testArrowBufPointersComparison() {
   }
 
   /**
-   * Hasher with a counter that increments each time a hash code is calculated.
-   * This is to validate that the hash code in {@link ArrowBufPointer} is reused.
+   * Hasher with a counter that increments each time a hash code is calculated. This is to validate
+   * that the hash code in {@link ArrowBufPointer} is reused.
    */
-  class CounterHasher implements ArrowBufHasher {
+  static class CounterHasher implements ArrowBufHasher {
 
     protected int counter = 0;
 
@@ -211,7 +208,7 @@ public int hashCode() {
 
     @Override
     public boolean equals(Object o) {
-      return o != null && this.getClass() == o.getClass();
+      return o instanceof CounterHasher;
     }
   }
 }
diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestByteFunctionHelpers.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestByteFunctionHelpers.java
index 04a715962dfe9..757bc85b47f21 100644
--- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestByteFunctionHelpers.java
+++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestByteFunctionHelpers.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.nio.charset.StandardCharsets;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestByteFunctionHelpers {
 
@@ -32,13 +32,12 @@ public class TestByteFunctionHelpers {
 
   private static final int SIZE = 100;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
-
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -53,28 +52,21 @@ public void testEquals() {
       buffer2.setByte(i, i);
     }
 
-    //test three cases, length>8, length>3, length<3
+    // test three cases, length>8, length>3, length<3
 
-    assertEquals(1, ByteFunctionHelpers.equal(buffer1, 0, SIZE - 1,
-        buffer2, 0, SIZE - 1));
-    assertEquals(1, ByteFunctionHelpers.equal(buffer1, 0, 6,
-        buffer2, 0, 6));
-    assertEquals(1, ByteFunctionHelpers.equal(buffer1, 0, 2,
-        buffer2, 0, 2));
+    assertEquals(1, ByteFunctionHelpers.equal(buffer1, 0, SIZE - 1, buffer2, 0, SIZE - 1));
+    assertEquals(1, ByteFunctionHelpers.equal(buffer1, 0, 6, buffer2, 0, 6));
+    assertEquals(1, ByteFunctionHelpers.equal(buffer1, 0, 2, buffer2, 0, 2));
 
-    //change value at index1
+    // change value at index1
     buffer1.setByte(1, 10);
 
-    assertEquals(0, ByteFunctionHelpers.equal(buffer1, 0, SIZE - 1,
-        buffer2, 0, SIZE - 1));
-    assertEquals(0, ByteFunctionHelpers.equal(buffer1, 0, 6,
-        buffer2, 0, 6));
-    assertEquals(0, ByteFunctionHelpers.equal(buffer1, 0, 2,
-        buffer2, 0, 2));
+    assertEquals(0, ByteFunctionHelpers.equal(buffer1, 0, SIZE - 1, buffer2, 0, SIZE - 1));
+    assertEquals(0, ByteFunctionHelpers.equal(buffer1, 0, 6, buffer2, 0, 6));
+    assertEquals(0, ByteFunctionHelpers.equal(buffer1, 0, 2, buffer2, 0, 2));
 
     buffer1.close();
     buffer2.close();
-
   }
 
   @Test
@@ -87,28 +79,21 @@ public void testCompare() {
       buffer2.setByte(i, i);
     }
 
-    //test three cases, length>8, length>3, length<3
+    // test three cases, length>8, length>3, length<3
 
-    assertEquals(0, ByteFunctionHelpers.compare(buffer1, 0, SIZE - 1,
-        buffer2, 0, SIZE - 1));
-    assertEquals(0, ByteFunctionHelpers.compare(buffer1, 0, 6,
-        buffer2, 0, 6));
-    assertEquals(0, ByteFunctionHelpers.compare(buffer1, 0, 2,
-        buffer2, 0, 2));
+    assertEquals(0, ByteFunctionHelpers.compare(buffer1, 0, SIZE - 1, buffer2, 0, SIZE - 1));
+    assertEquals(0, ByteFunctionHelpers.compare(buffer1, 0, 6, buffer2, 0, 6));
+    assertEquals(0, ByteFunctionHelpers.compare(buffer1, 0, 2, buffer2, 0, 2));
 
-    //change value at index 1
+    // change value at index 1
     buffer1.setByte(1, 0);
 
-    assertEquals(-1, ByteFunctionHelpers.compare(buffer1, 0, SIZE - 1,
-        buffer2, 0, SIZE - 1));
-    assertEquals(-1, ByteFunctionHelpers.compare(buffer1, 0, 6,
-        buffer2, 0, 6));
-    assertEquals(-1, ByteFunctionHelpers.compare(buffer1, 0, 2,
-        buffer2, 0, 2));
+    assertEquals(-1, ByteFunctionHelpers.compare(buffer1, 0, SIZE - 1, buffer2, 0, SIZE - 1));
+    assertEquals(-1, ByteFunctionHelpers.compare(buffer1, 0, 6, buffer2, 0, 6));
+    assertEquals(-1, ByteFunctionHelpers.compare(buffer1, 0, 2, buffer2, 0, 2));
 
     buffer1.close();
     buffer2.close();
-
   }
 
   @Test
@@ -121,11 +106,12 @@ public void testStringCompare() {
       String rightStr = rightStrings[i];
 
       ArrowBuf left = allocator.buffer(SIZE);
-      left.setBytes(0, leftStr.getBytes());
+      left.setBytes(0, leftStr.getBytes(StandardCharsets.UTF_8));
       ArrowBuf right = allocator.buffer(SIZE);
-      right.setBytes(0, rightStr.getBytes());
+      right.setBytes(0, rightStr.getBytes(StandardCharsets.UTF_8));
 
-      assertEquals(leftStr.compareTo(rightStr) < 0 ? -1 : 1,
+      assertEquals(
+          leftStr.compareTo(rightStr) < 0 ? -1 : 1,
           ByteFunctionHelpers.compare(left, 0, leftStr.length(), right, 0, rightStr.length()));
 
       left.close();
@@ -143,24 +129,18 @@ public void testCompareWithByteArray() {
       buffer2[i] = (byte) i;
     }
 
-    //test three cases, length>8, length>3, length<3
+    // test three cases, length>8, length>3, length<3
 
-    assertEquals(0, ByteFunctionHelpers.compare(buffer1, 0, SIZE - 1,
-        buffer2, 0, SIZE - 1));
-    assertEquals(0, ByteFunctionHelpers.compare(buffer1, 0, 6,
-        buffer2, 0, 6));
-    assertEquals(0, ByteFunctionHelpers.compare(buffer1, 0, 2,
-        buffer2, 0, 2));
+    assertEquals(0, ByteFunctionHelpers.compare(buffer1, 0, SIZE - 1, buffer2, 0, SIZE - 1));
+    assertEquals(0, ByteFunctionHelpers.compare(buffer1, 0, 6, buffer2, 0, 6));
+    assertEquals(0, ByteFunctionHelpers.compare(buffer1, 0, 2, buffer2, 0, 2));
 
-    //change value at index 1
+    // change value at index 1
     buffer1.setByte(1, 0);
 
-    assertEquals(-1, ByteFunctionHelpers.compare(buffer1, 0, SIZE - 1,
-        buffer2, 0, SIZE - 1));
-    assertEquals(-1, ByteFunctionHelpers.compare(buffer1, 0, 6,
-        buffer2, 0, 6));
-    assertEquals(-1, ByteFunctionHelpers.compare(buffer1, 0, 2,
-        buffer2, 0, 2));
+    assertEquals(-1, ByteFunctionHelpers.compare(buffer1, 0, SIZE - 1, buffer2, 0, SIZE - 1));
+    assertEquals(-1, ByteFunctionHelpers.compare(buffer1, 0, 6, buffer2, 0, 6));
+    assertEquals(-1, ByteFunctionHelpers.compare(buffer1, 0, 2, buffer2, 0, 2));
 
     buffer1.close();
   }
diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestLargeMemoryUtil.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestLargeMemoryUtil.java
index 952fcb5f051c1..ae72e6714344e 100755
--- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestLargeMemoryUtil.java
+++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/TestLargeMemoryUtil.java
@@ -1,105 +1,107 @@
-/*
- * 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.
- */
-
-package org.apache.arrow.memory.util;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URLClassLoader;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
-
-public class TestLargeMemoryUtil {
-
-  /**
-   * Get a copy of the current class loader.
-   * @return the newly created class loader.
-   */
-  private ClassLoader copyClassLoader() {
-    ClassLoader curClassLoader = this.getClass().getClassLoader();
-    if (curClassLoader instanceof URLClassLoader) {
-      // for Java 1.8
-      return new URLClassLoader(((URLClassLoader) curClassLoader).getURLs(), null);
-    }
-
-    // for Java 1.9 and Java 11.
-    return null;
-  }
-
-  /**
-   * Use the checkedCastToInt method from the current classloader.
-   * @param classLoader the class loader from which to call the method.
-   * @return the return value of the method.
-   */
-  private int checkedCastToInt(ClassLoader classLoader, long value) throws Exception {
-    Class<?> clazz = classLoader.loadClass("org.apache.arrow.memory.util.LargeMemoryUtil");
-    Method method = clazz.getMethod("checkedCastToInt", long.class);
-    return (int) method.invoke(null, value);
-  }
-
-  private void checkExpectedOverflow(ClassLoader classLoader, long value) {
-    InvocationTargetException ex = Assertions.assertThrows(InvocationTargetException.class, () -> {
-      checkedCastToInt(classLoader, value);
-    });
-    Assert.assertTrue(ex.getCause() instanceof ArithmeticException);
-    Assert.assertEquals("integer overflow", ex.getCause().getMessage());
-  }
-
-  @Test
-  public void testEnableLargeMemoryUtilCheck() throws Exception {
-    String savedNewProperty = System.getProperty("arrow.enable_unsafe_memory_access");
-    System.setProperty("arrow.enable_unsafe_memory_access", "false");
-    try {
-      ClassLoader classLoader = copyClassLoader();
-      if (classLoader != null) {
-        Assert.assertEquals(Integer.MAX_VALUE, checkedCastToInt(classLoader, Integer.MAX_VALUE));
-        checkExpectedOverflow(classLoader, Integer.MAX_VALUE + 1L);
-        checkExpectedOverflow(classLoader, Integer.MIN_VALUE - 1L);
-      }
-    } finally {
-      // restore system property
-      if (savedNewProperty != null) {
-        System.setProperty("arrow.enable_unsafe_memory_access", savedNewProperty);
-      } else {
-        System.clearProperty("arrow.enable_unsafe_memory_access");
-      }
-    }
-  }
-
-  @Test
-  public void testDisabledLargeMemoryUtilCheck() throws Exception {
-    String savedNewProperty = System.getProperty("arrow.enable_unsafe_memory_access");
-    System.setProperty("arrow.enable_unsafe_memory_access", "true");
-    try {
-      ClassLoader classLoader = copyClassLoader();
-      if (classLoader != null) {
-        Assert.assertEquals(Integer.MAX_VALUE, checkedCastToInt(classLoader, Integer.MAX_VALUE));
-        Assert.assertEquals(Integer.MIN_VALUE, checkedCastToInt(classLoader, Integer.MAX_VALUE + 1L));
-        Assert.assertEquals(Integer.MAX_VALUE, checkedCastToInt(classLoader, Integer.MIN_VALUE - 1L));
-      }
-    } finally {
-      // restore system property
-      if (savedNewProperty != null) {
-        System.setProperty("arrow.enable_unsafe_memory_access", savedNewProperty);
-      } else {
-        System.clearProperty("arrow.enable_unsafe_memory_access");
-      }
-    }
-  }
-}
+/*
+ * 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.
+ */
+package org.apache.arrow.memory.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URLClassLoader;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class TestLargeMemoryUtil {
+
+  /**
+   * Get a copy of the current class loader.
+   *
+   * @return the newly created class loader.
+   */
+  private ClassLoader copyClassLoader() {
+    ClassLoader curClassLoader = this.getClass().getClassLoader();
+    if (curClassLoader instanceof URLClassLoader) {
+      // for Java 1.8
+      return new URLClassLoader(((URLClassLoader) curClassLoader).getURLs(), null);
+    }
+
+    // for Java 1.9 and Java 11.
+    return null;
+  }
+
+  /**
+   * Use the checkedCastToInt method from the current classloader.
+   *
+   * @param classLoader the class loader from which to call the method.
+   * @return the return value of the method.
+   */
+  private int checkedCastToInt(ClassLoader classLoader, long value) throws Exception {
+    Class<?> clazz = classLoader.loadClass("org.apache.arrow.memory.util.LargeMemoryUtil");
+    Method method = clazz.getMethod("checkedCastToInt", long.class);
+    return (int) method.invoke(null, value);
+  }
+
+  private void checkExpectedOverflow(ClassLoader classLoader, long value) {
+    InvocationTargetException ex =
+        Assertions.assertThrows(
+            InvocationTargetException.class, () -> checkedCastToInt(classLoader, value));
+    assertInstanceOf(ArithmeticException.class, ex.getCause());
+    assertEquals("integer overflow", ex.getCause().getMessage());
+  }
+
+  @Test
+  public void testEnableLargeMemoryUtilCheck() throws Exception {
+    String savedNewProperty = System.getProperty("arrow.enable_unsafe_memory_access");
+    System.setProperty("arrow.enable_unsafe_memory_access", "false");
+    try {
+      ClassLoader classLoader = copyClassLoader();
+      if (classLoader != null) {
+        assertEquals(Integer.MAX_VALUE, checkedCastToInt(classLoader, Integer.MAX_VALUE));
+        checkExpectedOverflow(classLoader, Integer.MAX_VALUE + 1L);
+        checkExpectedOverflow(classLoader, Integer.MIN_VALUE - 1L);
+      }
+    } finally {
+      // restore system property
+      if (savedNewProperty != null) {
+        System.setProperty("arrow.enable_unsafe_memory_access", savedNewProperty);
+      } else {
+        System.clearProperty("arrow.enable_unsafe_memory_access");
+      }
+    }
+  }
+
+  @Test
+  public void testDisabledLargeMemoryUtilCheck() throws Exception {
+    String savedNewProperty = System.getProperty("arrow.enable_unsafe_memory_access");
+    System.setProperty("arrow.enable_unsafe_memory_access", "true");
+    try {
+      ClassLoader classLoader = copyClassLoader();
+      if (classLoader != null) {
+        assertEquals(Integer.MAX_VALUE, checkedCastToInt(classLoader, Integer.MAX_VALUE));
+        assertEquals(Integer.MIN_VALUE, checkedCastToInt(classLoader, Integer.MAX_VALUE + 1L));
+        assertEquals(Integer.MAX_VALUE, checkedCastToInt(classLoader, Integer.MIN_VALUE - 1L));
+      }
+    } finally {
+      // restore system property
+      if (savedNewProperty != null) {
+        System.setProperty("arrow.enable_unsafe_memory_access", savedNewProperty);
+      } else {
+        System.clearProperty("arrow.enable_unsafe_memory_access");
+      }
+    }
+  }
+}
diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/hash/TestArrowBufHasher.java b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/hash/TestArrowBufHasher.java
index 3da0602bdfd9c..c261fd090b923 100644
--- a/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/hash/TestArrowBufHasher.java
+++ b/java/memory/memory-core/src/test/java/org/apache/arrow/memory/util/hash/TestArrowBufHasher.java
@@ -14,132 +14,118 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util.hash;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collection;
-
+import java.util.stream.Stream;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-/**
- * Test cases for {@link ArrowBufHasher} and its subclasses.
- */
-@RunWith(Parameterized.class)
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/** Test cases for {@link ArrowBufHasher} and its subclasses. */
 public class TestArrowBufHasher {
 
   private final int BUFFER_LENGTH = 1024;
 
   private BufferAllocator allocator;
 
-  private ArrowBufHasher hasher;
-
-  public TestArrowBufHasher(String name, ArrowBufHasher hasher) {
-    this.hasher = hasher;
-  }
-
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
 
-  @Test
-  public void testHasher() {
+  @ParameterizedTest(name = "hasher = {0}")
+  @MethodSource("getHasher")
+  void testHasher(String name, ArrowBufHasher hasher) {
     try (ArrowBuf buf1 = allocator.buffer(BUFFER_LENGTH);
-         ArrowBuf buf2 = allocator.buffer(BUFFER_LENGTH)) {
+        ArrowBuf buf2 = allocator.buffer(BUFFER_LENGTH)) {
       // prepare data
       for (int i = 0; i < BUFFER_LENGTH / 4; i++) {
-        buf1.setFloat(i * 4, i / 10.0f);
-        buf2.setFloat(i * 4, i / 10.0f);
+        buf1.setFloat(i * 4L, i / 10.0f);
+        buf2.setFloat(i * 4L, i / 10.0f);
       }
 
-      verifyHashCodesEqual(buf1, 0, 100, buf2, 0, 100);
-      verifyHashCodesEqual(buf1, 1, 5, buf2, 1, 5);
-      verifyHashCodesEqual(buf1, 10, 17, buf2, 10, 17);
-      verifyHashCodesEqual(buf1, 33, 25, buf2, 33, 25);
-      verifyHashCodesEqual(buf1, 22, 22, buf2, 22, 22);
-      verifyHashCodesEqual(buf1, 123, 333, buf2, 123, 333);
-      verifyHashCodesEqual(buf1, 374, 1, buf2, 374, 1);
-      verifyHashCodesEqual(buf1, 11, 0, buf2, 11, 0);
-      verifyHashCodesEqual(buf1, 75, 25, buf2, 75, 25);
-      verifyHashCodesEqual(buf1, 0, 1024, buf2, 0, 1024);
+      verifyHashCodesEqual(hasher, buf1, 0, 100, buf2, 0, 100);
+      verifyHashCodesEqual(hasher, buf1, 1, 5, buf2, 1, 5);
+      verifyHashCodesEqual(hasher, buf1, 10, 17, buf2, 10, 17);
+      verifyHashCodesEqual(hasher, buf1, 33, 25, buf2, 33, 25);
+      verifyHashCodesEqual(hasher, buf1, 22, 22, buf2, 22, 22);
+      verifyHashCodesEqual(hasher, buf1, 123, 333, buf2, 123, 333);
+      verifyHashCodesEqual(hasher, buf1, 374, 1, buf2, 374, 1);
+      verifyHashCodesEqual(hasher, buf1, 11, 0, buf2, 11, 0);
+      verifyHashCodesEqual(hasher, buf1, 75, 25, buf2, 75, 25);
+      verifyHashCodesEqual(hasher, buf1, 0, 1024, buf2, 0, 1024);
     }
   }
 
-  private void verifyHashCodesEqual(ArrowBuf buf1, int offset1, int length1,
-                                    ArrowBuf buf2, int offset2, int length2) {
+  private void verifyHashCodesEqual(
+      ArrowBufHasher hasher,
+      ArrowBuf buf1,
+      int offset1,
+      int length1,
+      ArrowBuf buf2,
+      int offset2,
+      int length2) {
     int hashCode1 = hasher.hashCode(buf1, offset1, length1);
     int hashCode2 = hasher.hashCode(buf2, offset2, length2);
     assertEquals(hashCode1, hashCode2);
   }
 
-  @Test
-  public void testHasherNegative() {
+  @ParameterizedTest(name = "hasher = {0}")
+  @MethodSource("getHasher")
+  public void testHasherNegative(String name, ArrowBufHasher hasher) {
     try (ArrowBuf buf = allocator.buffer(BUFFER_LENGTH)) {
       // prepare data
       for (int i = 0; i < BUFFER_LENGTH / 4; i++) {
-        buf.setFloat(i * 4, i / 10.0f);
+        buf.setFloat(i * 4L, i / 10.0f);
       }
 
-      assertThrows(IllegalArgumentException.class, () -> {
-        hasher.hashCode(buf, 0, -1);
-      });
+      assertThrows(IllegalArgumentException.class, () -> hasher.hashCode(buf, 0, -1));
 
-      assertThrows(IndexOutOfBoundsException.class, () -> {
-        hasher.hashCode(buf, 0, 1028);
-      });
+      assertThrows(IndexOutOfBoundsException.class, () -> hasher.hashCode(buf, 0, 1028));
 
-      assertThrows(IndexOutOfBoundsException.class, () -> {
-        hasher.hashCode(buf, 500, 1000);
-      });
+      assertThrows(IndexOutOfBoundsException.class, () -> hasher.hashCode(buf, 500, 1000));
     }
   }
 
-  @Test
-  public void testHasherLessThanInt() {
+  @ParameterizedTest(name = "hasher = {0}")
+  @MethodSource("getHasher")
+  public void testHasherLessThanInt(String name, ArrowBufHasher hasher) {
     try (ArrowBuf buf1 = allocator.buffer(4);
-         ArrowBuf buf2 = allocator.buffer(4)) {
+        ArrowBuf buf2 = allocator.buffer(4)) {
       buf1.writeBytes("foo1".getBytes(StandardCharsets.UTF_8));
       buf2.writeBytes("bar2".getBytes(StandardCharsets.UTF_8));
 
-      for (int i = 1; i <= 4; i ++) {
-        verifyHashCodeNotEqual(buf1, 0, i, buf2, 0, i);
+      for (int i = 1; i <= 4; i++) {
+        verifyHashCodeNotEqual(hasher, buf1, i, buf2, i);
       }
     }
   }
 
-  private void verifyHashCodeNotEqual(ArrowBuf buf1, int offset1, int length1,
-                                      ArrowBuf buf2, int offset2, int length2) {
+  private void verifyHashCodeNotEqual(
+      ArrowBufHasher hasher, ArrowBuf buf1, int length1, ArrowBuf buf2, int length2) {
     int hashCode1 = hasher.hashCode(buf1, 0, length1);
     int hashCode2 = hasher.hashCode(buf2, 0, length2);
     assertNotEquals(hashCode1, hashCode2);
   }
 
-  @Parameterized.Parameters(name = "hasher = {0}")
-  public static Collection<Object[]> getHasher() {
-    return Arrays.asList(
-      new Object[] {SimpleHasher.class.getSimpleName(),
-        SimpleHasher.INSTANCE},
-      new Object[] {MurmurHasher.class.getSimpleName(),
-        new MurmurHasher()
-      }
-    );
+  private static Stream<Arguments> getHasher() {
+    return Stream.of(
+        Arguments.of(SimpleHasher.class.getSimpleName(), SimpleHasher.INSTANCE),
+        Arguments.of(MurmurHasher.class.getSimpleName(), new MurmurHasher()));
   }
 }
diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/util/TestCollections2.java b/java/memory/memory-core/src/test/java/org/apache/arrow/util/TestCollections2.java
index c858ebe62a90f..20052e42b367f 100644
--- a/java/memory/memory-core/src/test/java/org/apache/arrow/util/TestCollections2.java
+++ b/java/memory/memory-core/src/test/java/org/apache/arrow/util/TestCollections2.java
@@ -14,26 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.util;
 
-import static org.junit.Assert.fail;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Test;
-
-/**
- * Tests for {@code Collections2} class.
- */
+/** Tests for {@code Collections2} class. */
 public class TestCollections2 {
 
-
   @Test
   public void testToImmutableListFromIterable() {
     final List<String> source = new ArrayList<>(Arrays.asList("foo", "bar", "baz"));
@@ -66,7 +62,6 @@ public void testToImmutableListFromIterable() {
     assertEquals(3, copy.size());
   }
 
-
   @Test
   public void testStringFromEmptyIterator() {
     assertEquals("[]", Collections2.toString(Collections.emptyIterator()));
@@ -78,6 +73,6 @@ public void testStringFromIterator() {
     iterator.next();
 
     assertEquals("[bar, baz]", Collections2.toString(iterator));
-    assertEquals(false, iterator.hasNext());
+    assertFalse(iterator.hasNext());
   }
 }
diff --git a/java/memory/memory-core/src/test/java/org/apache/arrow/util/TestStackTrace.java b/java/memory/memory-core/src/test/java/org/apache/arrow/util/TestStackTrace.java
index 4418bec187212..cf1e69a7b6577 100644
--- a/java/memory/memory-core/src/test/java/org/apache/arrow/util/TestStackTrace.java
+++ b/java/memory/memory-core/src/test/java/org/apache/arrow/util/TestStackTrace.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.util;
 
 import org.apache.arrow.memory.util.StackTrace;
@@ -22,22 +21,19 @@
 import org.junit.jupiter.api.Test;
 
 public class TestStackTrace {
-  /**
-   * Check that the stack trace includes the origin line.
-   */
+  /** Check that the stack trace includes the origin line. */
   @Test
   public void testStackTraceComplete() {
     final String stackTrace = new StackTrace().toString();
     Assertions.assertTrue(stackTrace.contains("TestStackTrace.testStackTraceComplete"), stackTrace);
   }
 
-  /**
-   * Check that the stack trace doesn't include getStackTrace or StackTrace.
-   */
+  /** Check that the stack trace doesn't include getStackTrace or StackTrace. */
   @Test
   public void testStackTraceOmit() {
     final String stackTrace = new StackTrace().toString();
     Assertions.assertFalse(stackTrace.contains("Thread.getStackTrace"), stackTrace);
-    Assertions.assertFalse(stackTrace.contains("org.apache.arrow.memory.util.StackTrace"), stackTrace);
+    Assertions.assertFalse(
+        stackTrace.contains("org.apache.arrow.memory.util.StackTrace"), stackTrace);
   }
 }
diff --git a/java/memory/memory-netty-buffer-patch/pom.xml b/java/memory/memory-netty-buffer-patch/pom.xml
index 97b224e9ccc5c..1f645472a3398 100644
--- a/java/memory/memory-netty-buffer-patch/pom.xml
+++ b/java/memory/memory-netty-buffer-patch/pom.xml
@@ -1,23 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>arrow-memory</artifactId>
     <groupId>org.apache.arrow</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <artifactId>arrow-memory</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>arrow-memory-netty-buffer-patch</artifactId>
   <name>Arrow Memory - Netty Buffer</name>
diff --git a/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/ExpandableByteBuf.java b/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/ExpandableByteBuf.java
index 09b7300444ca5..ef8afcac1f94f 100644
--- a/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/ExpandableByteBuf.java
+++ b/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/ExpandableByteBuf.java
@@ -14,15 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.netty.buffer;
 
 import org.apache.arrow.memory.BufferAllocator;
 
 /**
  * Allows us to decorate ArrowBuf to make it expandable so that we can use them in the context of
- * the Netty framework
- * (thus supporting RPC level memory accounting).
+ * the Netty framework (thus supporting RPC level memory accounting).
  */
 public class ExpandableByteBuf extends MutableWrappedByteBuf {
 
@@ -52,5 +50,4 @@ public ByteBuf capacity(int newCapacity) {
       return super.capacity(newCapacity);
     }
   }
-
 }
diff --git a/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/LargeBuffer.java b/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/LargeBuffer.java
index 792b3b8148b8f..c29f1f0b2ad85 100644
--- a/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/LargeBuffer.java
+++ b/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/LargeBuffer.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.netty.buffer;
 
 /**
diff --git a/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/MutableWrappedByteBuf.java b/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/MutableWrappedByteBuf.java
index 5221dd3c19d0b..1db4645a47311 100644
--- a/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/MutableWrappedByteBuf.java
+++ b/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/MutableWrappedByteBuf.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.netty.buffer;
 
+import io.netty.util.ByteProcessor;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -26,11 +26,9 @@
 import java.nio.channels.GatheringByteChannel;
 import java.nio.channels.ScatteringByteChannel;
 
-import io.netty.util.ByteProcessor;
-
 /**
- * This is basically a complete copy of netty's DuplicatedByteBuf. We copy because we want to override
- * some behaviors and make buffer mutable.
+ * This is basically a complete copy of netty's DuplicatedByteBuf. We copy because we want to
+ * override some behaviors and make buffer mutable.
  */
 abstract class MutableWrappedByteBuf extends AbstractByteBuf {
 
@@ -343,40 +341,33 @@ public ByteBuf setBytes(int index, ByteBuffer src) {
   }
 
   @Override
-  public int setBytes(int index, FileChannel in, long position, int length)
-      throws IOException {
+  public int setBytes(int index, FileChannel in, long position, int length) throws IOException {
     return buffer.setBytes(index, in, position, length);
   }
 
   @Override
-  public ByteBuf getBytes(int index, OutputStream out, int length)
-      throws IOException {
+  public ByteBuf getBytes(int index, OutputStream out, int length) throws IOException {
     buffer.getBytes(index, out, length);
     return this;
   }
 
   @Override
-  public int getBytes(int index, GatheringByteChannel out, int length)
-      throws IOException {
+  public int getBytes(int index, GatheringByteChannel out, int length) throws IOException {
     return buffer.getBytes(index, out, length);
   }
 
   @Override
-  public int setBytes(int index, InputStream in, int length)
-      throws IOException {
+  public int setBytes(int index, InputStream in, int length) throws IOException {
     return buffer.setBytes(index, in, length);
   }
 
   @Override
-  public int setBytes(int index, ScatteringByteChannel in, int length)
-      throws IOException {
+  public int setBytes(int index, ScatteringByteChannel in, int length) throws IOException {
     return buffer.setBytes(index, in, length);
   }
 
-
   @Override
-  public int getBytes(int index, FileChannel out, long position, int length)
-      throws IOException {
+  public int getBytes(int index, FileChannel out, long position, int length) throws IOException {
     return buffer.getBytes(index, out, position, length);
   }
 
@@ -444,5 +435,4 @@ public boolean release(int decrement) {
     boolean released = unwrap().release(decrement);
     return released;
   }
-
 }
diff --git a/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/NettyArrowBuf.java b/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/NettyArrowBuf.java
index 466444c7d53e8..bdad3700cb311 100644
--- a/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/NettyArrowBuf.java
+++ b/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/NettyArrowBuf.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.netty.buffer;
 
+import io.netty.util.internal.PlatformDependent;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -25,7 +25,6 @@
 import java.nio.channels.FileChannel;
 import java.nio.channels.GatheringByteChannel;
 import java.nio.channels.ScatteringByteChannel;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BoundsChecking;
 import org.apache.arrow.memory.BufferAllocator;
@@ -34,11 +33,7 @@
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.util.VisibleForTesting;
 
-import io.netty.util.internal.PlatformDependent;
-
-/**
- * Netty specific wrapper over ArrowBuf for use in Netty framework.
- */
+/** Netty specific wrapper over ArrowBuf for use in Netty framework. */
 public class NettyArrowBuf extends AbstractByteBuf implements AutoCloseable {
 
   private final ArrowBuf arrowBuf;
@@ -49,14 +44,12 @@ public class NettyArrowBuf extends AbstractByteBuf implements AutoCloseable {
   /**
    * Constructs a new instance.
    *
-   * @param arrowBuf        The buffer to wrap.
+   * @param arrowBuf The buffer to wrap.
    * @param bufferAllocator The allocator for the buffer.
-   * @param length          The length of this buffer.
+   * @param length The length of this buffer.
    */
   public NettyArrowBuf(
-      final ArrowBuf arrowBuf,
-      final BufferAllocator bufferAllocator,
-      final int length) {
+      final ArrowBuf arrowBuf, final BufferAllocator bufferAllocator, final int length) {
     super(length);
     this.arrowBuf = arrowBuf;
     this.arrowByteBufAllocator = new ArrowByteBufAllocator(bufferAllocator);
@@ -105,13 +98,15 @@ public synchronized ByteBuf capacity(int newCapacity) {
       length = newCapacity;
       return this;
     }
-    throw new UnsupportedOperationException("Buffers don't support resizing that increases the size.");
+    throw new UnsupportedOperationException(
+        "Buffers don't support resizing that increases the size.");
   }
 
   @Override
   public ByteBuf unwrap() {
 
-    // According to Netty's ByteBuf interface, unwrap() should return null if the buffer cannot be unwrapped
+    // According to Netty's ByteBuf interface, unwrap() should return null if the buffer cannot be
+    // unwrapped
     // https://github.com/netty/netty/blob/9fe796e10a433b6cd20ad78b2c39cd56b86ccd2e/buffer/src/main/java/io/netty/buffer/ByteBuf.java#L305
 
     // Throwing here breaks toString() in AbstractByteBuf
@@ -234,10 +229,9 @@ public ByteBuffer nioBuffer() {
     return nioBuffer(readerIndex(), readableBytes());
   }
 
-
   /**
-   * Returns a buffer that is zero positioned but points
-   * to a slice of the original buffer starting at given index.
+   * Returns a buffer that is zero positioned but points to a slice of the original buffer starting
+   * at given index.
    */
   @Override
   public ByteBuffer nioBuffer(int index, int length) {
@@ -248,8 +242,8 @@ public ByteBuffer nioBuffer(int index, int length) {
   }
 
   /**
-   * Returns a buffer that is zero positioned but points
-   * to a slice of the original buffer starting at given index.
+   * Returns a buffer that is zero positioned but points to a slice of the original buffer starting
+   * at given index.
    */
   public ByteBuffer nioBuffer(long index, int length) {
     chk(index, length);
@@ -264,7 +258,8 @@ public ByteBuffer nioBuffer(long index, int length) {
    * @return ByteBuffer
    */
   private ByteBuffer getDirectBuffer(long index) {
-    return PlatformDependent.directBuffer(addr(index), LargeMemoryUtil.checkedCastToInt(length - index));
+    return PlatformDependent.directBuffer(
+        addr(index), LargeMemoryUtil.checkedCastToInt(length - index));
   }
 
   @Override
@@ -294,11 +289,11 @@ public ByteBuf setBytes(int index, byte[] src, int srcIndex, int length) {
   /**
    * Determine if the requested {@code index} and {@code length} will fit within {@code capacity}.
    *
-   * @param index    The starting index.
-   * @param length   The length which will be utilized (starting from {@code index}).
+   * @param index The starting index.
+   * @param length The length which will be utilized (starting from {@code index}).
    * @param capacity The capacity that {@code index + length} is allowed to be within.
-   * @return {@code true} if the requested {@code index} and {@code length} will fit within {@code capacity}.
-   * {@code false} if this would result in an index out of bounds exception.
+   * @return {@code true} if the requested {@code index} and {@code length} will fit within {@code
+   *     capacity}. {@code false} if this would result in an index out of bounds exception.
    */
   private static boolean isOutOfBounds(int index, int length, int capacity) {
     return (index | length | (index + length) | (capacity - (index + length))) < 0;
@@ -413,17 +408,15 @@ protected int _getUnsignedMedium(int index) {
   protected int _getUnsignedMediumLE(int index) {
     this.chk(index, 3);
     long addr = this.addr(index);
-    return PlatformDependent.getByte(addr) & 255 |
-        (Short.reverseBytes(PlatformDependent.getShort(addr + 1L)) & '\uffff') << 8;
+    return (PlatformDependent.getByte(addr) & 255)
+        | (Short.reverseBytes(PlatformDependent.getShort(addr + 1L)) & '\uffff') << 8;
   }
 
-
   /*-------------------------------------------------*
-   |                                                 |
-   |            get() APIs                           |
-   |                                                 |
-   *-------------------------------------------------*/
-
+  |                                                 |
+  |            get() APIs                           |
+  |                                                 |
+  *-------------------------------------------------*/
 
   @Override
   protected byte _getByte(int index) {
@@ -483,13 +476,11 @@ public long getLong(int index) {
     return arrowBuf.getLong(index);
   }
 
-
   /*-------------------------------------------------*
-   |                                                 |
-   |            set() APIs                           |
-   |                                                 |
-   *-------------------------------------------------*/
-
+  |                                                 |
+  |            set() APIs                           |
+  |                                                 |
+  *-------------------------------------------------*/
 
   @Override
   protected void _setByte(int index, int value) {
@@ -524,10 +515,9 @@ private long addr(long index) {
   }
 
   /**
-   * Helper function to do bounds checking at a particular
-   * index for particular length of data.
+   * Helper function to do bounds checking at a particular index for particular length of data.
    *
-   * @param index       index (0 based relative to this ArrowBuf)
+   * @param index index (0 based relative to this ArrowBuf)
    * @param fieldLength provided length of data for get/set
    */
   private void chk(long index, long fieldLength) {
@@ -539,8 +529,9 @@ private void chk(long index, long fieldLength) {
         throw new IllegalArgumentException("length: " + fieldLength + " (expected: >= 0)");
       }
       if (index < 0 || index > capacity() - fieldLength) {
-        throw new IndexOutOfBoundsException(String.format(
-            "index: %d, length: %d (expected: range(0, %d))", index, fieldLength, capacity()));
+        throw new IndexOutOfBoundsException(
+            String.format(
+                "index: %d, length: %d (expected: range(0, %d))", index, fieldLength, capacity()));
       }
     }
   }
@@ -615,17 +606,15 @@ public NettyArrowBuf setLong(int index, long value) {
     return this;
   }
 
-  /**
-   * unwrap arrow buffer into a netty buffer.
-   */
+  /** unwrap arrow buffer into a netty buffer. */
   public static NettyArrowBuf unwrapBuffer(ArrowBuf buf) {
-    final NettyArrowBuf nettyArrowBuf = new NettyArrowBuf(
-        buf,
-        buf.getReferenceManager().getAllocator(),
-        LargeMemoryUtil.checkedCastToInt(buf.capacity()));
+    final NettyArrowBuf nettyArrowBuf =
+        new NettyArrowBuf(
+            buf,
+            buf.getReferenceManager().getAllocator(),
+            LargeMemoryUtil.checkedCastToInt(buf.capacity()));
     nettyArrowBuf.readerIndex(LargeMemoryUtil.checkedCastToInt(buf.readerIndex()));
     nettyArrowBuf.writerIndex(LargeMemoryUtil.checkedCastToInt(buf.writerIndex()));
     return nettyArrowBuf;
   }
-
 }
diff --git a/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java b/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java
index ea84a3258e823..b3d79c34cea0b 100644
--- a/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java
+++ b/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java
@@ -14,27 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.netty.buffer;
 
+import io.netty.util.internal.OutOfDirectMemoryError;
+import io.netty.util.internal.StringUtil;
 import java.lang.reflect.Field;
 import java.nio.ByteBuffer;
 import java.util.concurrent.atomic.AtomicLong;
-
 import org.apache.arrow.memory.OutOfMemoryException;
 import org.apache.arrow.memory.util.AssertionUtil;
 import org.apache.arrow.memory.util.LargeMemoryUtil;
 
-import io.netty.util.internal.OutOfDirectMemoryError;
-import io.netty.util.internal.StringUtil;
-
 /**
  * The base allocator that we use for all of Arrow's memory management. Returns
  * UnsafeDirectLittleEndian buffers.
  */
 public class PooledByteBufAllocatorL {
 
-  private static final org.slf4j.Logger memoryLogger = org.slf4j.LoggerFactory.getLogger("arrow.allocator");
+  private static final org.slf4j.Logger memoryLogger =
+      org.slf4j.LoggerFactory.getLogger("arrow.allocator");
 
   private static final int MEMORY_LOGGER_FREQUENCY_SECONDS = 60;
   public final UnsafeDirectLittleEndian empty;
@@ -49,9 +47,7 @@ public PooledByteBufAllocatorL() {
     empty = new UnsafeDirectLittleEndian(new DuplicatedByteBuf(Unpooled.EMPTY_BUFFER));
   }
 
-  /**
-   * Returns a {@linkplain UnsafeDirectLittleEndian} of the given size.
-   */
+  /** Returns a {@linkplain UnsafeDirectLittleEndian} of the given size. */
   public UnsafeDirectLittleEndian allocate(long size) {
     try {
       return allocator.directBuffer(LargeMemoryUtil.checkedCastToInt(size), Integer.MAX_VALUE);
@@ -102,8 +98,8 @@ private AccountedUnsafeDirectLittleEndian(LargeBuffer buf, AtomicLong count, Ato
       this.size = size;
     }
 
-    private AccountedUnsafeDirectLittleEndian(PooledUnsafeDirectByteBuf buf, AtomicLong count,
-                                              AtomicLong size) {
+    private AccountedUnsafeDirectLittleEndian(
+        PooledUnsafeDirectByteBuf buf, AtomicLong count, AtomicLong size) {
       super(buf);
       this.initialCapacity = buf.capacity();
       this.count = count;
@@ -129,7 +125,6 @@ public boolean release(int decrement) {
       }
       return released;
     }
-
   }
 
   private class InnerAllocator extends PooledByteBufAllocator {
@@ -145,7 +140,8 @@ public InnerAllocator() {
         f.setAccessible(true);
         this.directArenas = (PoolArena<ByteBuffer>[]) f.get(this);
       } catch (Exception e) {
-        throw new RuntimeException("Failure while initializing allocator.  Unable to retrieve direct arenas field.", e);
+        throw new RuntimeException(
+            "Failure while initializing allocator.  Unable to retrieve direct arenas field.", e);
       }
 
       if (memoryLogger.isTraceEnabled()) {
@@ -170,8 +166,8 @@ private UnsafeDirectLittleEndian newDirectBufferL(int initialCapacity, int maxCa
           hugeBufferCount.incrementAndGet();
 
           // logger.debug("Allocating huge buffer of size {}", initialCapacity, new Exception());
-          return new AccountedUnsafeDirectLittleEndian(new LargeBuffer(buf), hugeBufferCount,
-              hugeBufferSize);
+          return new AccountedUnsafeDirectLittleEndian(
+              new LargeBuffer(buf), hugeBufferCount, hugeBufferSize);
         } else {
           // within chunk, use arena.
           ByteBuf buf = directArena.allocate(cache, initialCapacity, maxCapacity);
@@ -186,8 +182,8 @@ private UnsafeDirectLittleEndian newDirectBufferL(int initialCapacity, int maxCa
           normalBufferSize.addAndGet(buf.capacity());
           normalBufferCount.incrementAndGet();
 
-          return new AccountedUnsafeDirectLittleEndian((PooledUnsafeDirectByteBuf) buf,
-              normalBufferCount, normalBufferSize);
+          return new AccountedUnsafeDirectLittleEndian(
+              (PooledUnsafeDirectByteBuf) buf, normalBufferCount, normalBufferSize);
         }
 
       } else {
@@ -197,8 +193,8 @@ private UnsafeDirectLittleEndian newDirectBufferL(int initialCapacity, int maxCa
 
     private UnsupportedOperationException fail() {
       return new UnsupportedOperationException(
-          "Arrow requires that the JVM used supports access sun.misc.Unsafe.  This platform " +
-              "didn't provide that functionality.");
+          "Arrow requires that the JVM used supports access sun.misc.Unsafe.  This platform "
+              + "didn't provide that functionality.");
     }
 
     @Override
@@ -215,15 +211,16 @@ public ByteBuf heapBuffer(int initialCapacity, int maxCapacity) {
       throw new UnsupportedOperationException("Arrow doesn't support using heap buffers.");
     }
 
-
     private void validate(int initialCapacity, int maxCapacity) {
       if (initialCapacity < 0) {
-        throw new IllegalArgumentException("initialCapacity: " + initialCapacity + " (expected: 0+)");
+        throw new IllegalArgumentException(
+            "initialCapacity: " + initialCapacity + " (expected: 0+)");
       }
       if (initialCapacity > maxCapacity) {
-        throw new IllegalArgumentException(String.format(
-            "initialCapacity: %d (expected: not greater than maxCapacity(%d)",
-            initialCapacity, maxCapacity));
+        throw new IllegalArgumentException(
+            String.format(
+                "initialCapacity: %d (expected: not greater than maxCapacity(%d)",
+                initialCapacity, maxCapacity));
       }
     }
 
@@ -272,7 +269,5 @@ public void run() {
         }
       }
     }
-
-
   }
 }
diff --git a/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java b/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java
index e51c6c3d48882..9dd5b58d248e8 100644
--- a/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java
+++ b/java/memory/memory-netty-buffer-patch/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java
@@ -14,21 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.netty.buffer;
 
+import io.netty.util.internal.PlatformDependent;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.ByteOrder;
 import java.util.concurrent.atomic.AtomicLong;
 
-import io.netty.util.internal.PlatformDependent;
-
 /**
- * The underlying class we use for little-endian access to memory. Is used underneath ArrowBufs
- * to abstract away the
- * Netty classes and underlying Netty memory management.
+ * The underlying class we use for little-endian access to memory. Is used underneath ArrowBufs to
+ * abstract away the Netty classes and underlying Netty memory management.
  */
 public class UnsafeDirectLittleEndian extends WrappedByteBuf {
   private static final AtomicLong ID_GENERATOR = new AtomicLong(0);
@@ -36,19 +33,12 @@ public class UnsafeDirectLittleEndian extends WrappedByteBuf {
   private final AbstractByteBuf wrapped;
   private final long memoryAddress;
 
-  UnsafeDirectLittleEndian(DuplicatedByteBuf buf) {
-    this(buf, true);
-  }
-
-  UnsafeDirectLittleEndian(LargeBuffer buf) {
-    this(buf, true);
-  }
-
-  UnsafeDirectLittleEndian(PooledUnsafeDirectByteBuf buf) {
-    this(buf, true);
-  }
-
-  private UnsafeDirectLittleEndian(AbstractByteBuf buf, boolean fake) {
+  /**
+   * Constructs a new instance.
+   *
+   * @param buf The buffer to wrap
+   */
+  public UnsafeDirectLittleEndian(AbstractByteBuf buf) {
     super(buf);
 
     this.wrapped = buf;
diff --git a/java/memory/memory-netty-buffer-patch/src/main/java/org/apache/arrow/memory/patch/ArrowByteBufAllocator.java b/java/memory/memory-netty-buffer-patch/src/main/java/org/apache/arrow/memory/patch/ArrowByteBufAllocator.java
index 6ce08b5a5902b..930ad95145e03 100644
--- a/java/memory/memory-netty-buffer-patch/src/main/java/org/apache/arrow/memory/patch/ArrowByteBufAllocator.java
+++ b/java/memory/memory-netty-buffer-patch/src/main/java/org/apache/arrow/memory/patch/ArrowByteBufAllocator.java
@@ -14,25 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.patch;
 
-import org.apache.arrow.memory.BufferAllocator;
-
 import io.netty.buffer.AbstractByteBufAllocator;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.CompositeByteBuf;
 import io.netty.buffer.ExpandableByteBuf;
 import io.netty.buffer.NettyArrowBuf;
+import org.apache.arrow.memory.BufferAllocator;
 
 /**
  * An implementation of ByteBufAllocator that wraps a Arrow BufferAllocator. This allows the RPC
- * layer to be accounted
- * and managed using Arrow's BufferAllocator infrastructure. The only thin different from a
- * typical BufferAllocator is
- * the signature and the fact that this Allocator returns ExpandableByteBufs which enable
- * otherwise non-expandable
- * ArrowBufs to be expandable.
+ * layer to be accounted and managed using Arrow's BufferAllocator infrastructure. The only thin
+ * different from a typical BufferAllocator is the signature and the fact that this Allocator
+ * returns ExpandableByteBufs which enable otherwise non-expandable ArrowBufs to be expandable.
  *
  * @deprecated This class may be removed in a future release.
  */
@@ -59,7 +54,8 @@ public ByteBuf buffer() {
 
   @Override
   public ByteBuf buffer(int initialCapacity) {
-    return new ExpandableByteBuf(NettyArrowBuf.unwrapBuffer(allocator.buffer(initialCapacity)), allocator);
+    return new ExpandableByteBuf(
+        NettyArrowBuf.unwrapBuffer(allocator.buffer(initialCapacity)), allocator);
   }
 
   @Override
diff --git a/java/memory/memory-netty-buffer-patch/src/test/java/io/netty/buffer/TestUnsafeDirectLittleEndian.java b/java/memory/memory-netty-buffer-patch/src/test/java/io/netty/buffer/TestUnsafeDirectLittleEndian.java
index 043c2c1605a63..e548bbf0c2187 100644
--- a/java/memory/memory-netty-buffer-patch/src/test/java/io/netty/buffer/TestUnsafeDirectLittleEndian.java
+++ b/java/memory/memory-netty-buffer-patch/src/test/java/io/netty/buffer/TestUnsafeDirectLittleEndian.java
@@ -14,45 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.netty.buffer;
 
-
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
-
-import org.junit.Test;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.LargeBuffer;
-import io.netty.buffer.Unpooled;
-import io.netty.buffer.UnsafeDirectLittleEndian;
+import org.junit.jupiter.api.Test;
 
 public class TestUnsafeDirectLittleEndian {
-  private static final boolean LITTLE_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN;
 
   @Test
+  @SuppressWarnings("CatchAndPrintStackTrace")
   public void testPrimitiveGetSet() {
     ByteBuf byteBuf = Unpooled.directBuffer(64);
-    UnsafeDirectLittleEndian unsafeDirect = new UnsafeDirectLittleEndian(new LargeBuffer(byteBuf));
-
-    unsafeDirect.setByte(0, Byte.MAX_VALUE);
-    unsafeDirect.setByte(1, -1); // 0xFF
-    unsafeDirect.setShort(2, Short.MAX_VALUE);
-    unsafeDirect.setShort(4, -2); // 0xFFFE
-    unsafeDirect.setInt(8, Integer.MAX_VALUE);
-    unsafeDirect.setInt(12, -66052); // 0xFFFE FDFC
-    unsafeDirect.setLong(16, Long.MAX_VALUE);
-    unsafeDirect.setLong(24, -4295098372L); // 0xFFFF FFFE FFFD FFFC
-    unsafeDirect.setFloat(32, 1.23F);
-    unsafeDirect.setFloat(36, -1.23F);
-    unsafeDirect.setDouble(40, 1.234567D);
-    unsafeDirect.setDouble(48, -1.234567D);
+    UnsafeDirectLittleEndian unsafeDirect = getUnsafeDirectLittleEndian(byteBuf);
 
     assertEquals(Byte.MAX_VALUE, unsafeDirect.getByte(0));
     assertEquals(-1, unsafeDirect.getByte(1));
@@ -71,7 +49,7 @@ public void testPrimitiveGetSet() {
 
     byte[] inBytes = "1234567".getBytes(StandardCharsets.UTF_8);
     try (ByteArrayInputStream bais = new ByteArrayInputStream(inBytes);
-         ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
       assertEquals(5, unsafeDirect.setBytes(56, bais, 5));
       unsafeDirect.getBytes(56, baos, 5);
       assertEquals("12345", new String(baos.toByteArray(), StandardCharsets.UTF_8));
@@ -79,4 +57,22 @@ public void testPrimitiveGetSet() {
       e.printStackTrace();
     }
   }
+
+  private static UnsafeDirectLittleEndian getUnsafeDirectLittleEndian(ByteBuf byteBuf) {
+    UnsafeDirectLittleEndian unsafeDirect = new UnsafeDirectLittleEndian(new LargeBuffer(byteBuf));
+
+    unsafeDirect.setByte(0, Byte.MAX_VALUE);
+    unsafeDirect.setByte(1, -1); // 0xFF
+    unsafeDirect.setShort(2, Short.MAX_VALUE);
+    unsafeDirect.setShort(4, -2); // 0xFFFE
+    unsafeDirect.setInt(8, Integer.MAX_VALUE);
+    unsafeDirect.setInt(12, -66052); // 0xFFFE FDFC
+    unsafeDirect.setLong(16, Long.MAX_VALUE);
+    unsafeDirect.setLong(24, -4295098372L); // 0xFFFF FFFE FFFD FFFC
+    unsafeDirect.setFloat(32, 1.23F);
+    unsafeDirect.setFloat(36, -1.23F);
+    unsafeDirect.setDouble(40, 1.234567D);
+    unsafeDirect.setDouble(48, -1.234567D);
+    return unsafeDirect;
+  }
 }
diff --git a/java/memory/memory-netty/pom.xml b/java/memory/memory-netty/pom.xml
index 9b20e1bde2ae7..f66899151128a 100644
--- a/java/memory/memory-netty/pom.xml
+++ b/java/memory/memory-netty/pom.xml
@@ -1,21 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>arrow-memory</artifactId>
     <groupId>org.apache.arrow</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <artifactId>arrow-memory</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>arrow-memory-netty</artifactId>
   <name>Arrow Memory - Netty</name>
@@ -53,7 +61,7 @@
     </dependency>
     <dependency>
       <groupId>org.immutables</groupId>
-      <artifactId>value</artifactId>
+      <artifactId>value-annotations</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/java/memory/memory-netty/src/main/java/org/apache/arrow/memory/netty/DefaultAllocationManagerFactory.java b/java/memory/memory-netty/src/main/java/org/apache/arrow/memory/netty/DefaultAllocationManagerFactory.java
index 8ece77178f09f..985999cab9180 100644
--- a/java/memory/memory-netty/src/main/java/org/apache/arrow/memory/netty/DefaultAllocationManagerFactory.java
+++ b/java/memory/memory-netty/src/main/java/org/apache/arrow/memory/netty/DefaultAllocationManagerFactory.java
@@ -14,17 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.netty;
 
 import org.apache.arrow.memory.AllocationManager;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 
-/**
- * The default Allocation Manager Factory for a module.
- *
- */
+/** The default Allocation Manager Factory for a module. */
 public class DefaultAllocationManagerFactory implements AllocationManager.Factory {
 
   public static final AllocationManager.Factory FACTORY = NettyAllocationManager.FACTORY;
@@ -38,5 +34,4 @@ public AllocationManager create(BufferAllocator accountingAllocator, long size)
   public ArrowBuf empty() {
     return FACTORY.empty();
   }
-
 }
diff --git a/java/memory/memory-netty/src/main/java/org/apache/arrow/memory/netty/NettyAllocationManager.java b/java/memory/memory-netty/src/main/java/org/apache/arrow/memory/netty/NettyAllocationManager.java
index 58354d0c2eebd..5b44096ab0efa 100644
--- a/java/memory/memory-netty/src/main/java/org/apache/arrow/memory/netty/NettyAllocationManager.java
+++ b/java/memory/memory-netty/src/main/java/org/apache/arrow/memory/netty/NettyAllocationManager.java
@@ -14,65 +14,57 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.netty;
 
+import io.netty.buffer.PooledByteBufAllocatorL;
+import io.netty.buffer.UnsafeDirectLittleEndian;
+import io.netty.util.internal.PlatformDependent;
 import org.apache.arrow.memory.AllocationManager;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.ReferenceManager;
 
-import io.netty.buffer.PooledByteBufAllocatorL;
-import io.netty.buffer.UnsafeDirectLittleEndian;
-import io.netty.util.internal.PlatformDependent;
-
 /**
- * The default implementation of {@link AllocationManager}. The implementation is responsible for managing when memory
- * is allocated and returned to the Netty-based PooledByteBufAllocatorL.
+ * The default implementation of {@link AllocationManager}. The implementation is responsible for
+ * managing when memory is allocated and returned to the Netty-based PooledByteBufAllocatorL.
  */
 public class NettyAllocationManager extends AllocationManager {
 
-  public static final AllocationManager.Factory FACTORY = new AllocationManager.Factory() {
+  public static final AllocationManager.Factory FACTORY =
+      new AllocationManager.Factory() {
 
-    @Override
-    public AllocationManager create(BufferAllocator accountingAllocator, long size) {
-      return new NettyAllocationManager(accountingAllocator, size);
-    }
+        @Override
+        public AllocationManager create(BufferAllocator accountingAllocator, long size) {
+          return new NettyAllocationManager(accountingAllocator, size);
+        }
 
-    @Override
-    public ArrowBuf empty() {
-      return EMPTY_BUFFER;
-    }
-  };
+        @Override
+        public ArrowBuf empty() {
+          return EMPTY_BUFFER;
+        }
+      };
 
   /**
-   * The default cut-off value for switching allocation strategies.
-   * If the request size is not greater than the cut-off value, we will allocate memory by
-   * {@link PooledByteBufAllocatorL} APIs,
-   * otherwise, we will use {@link PlatformDependent} APIs.
+   * The default cut-off value for switching allocation strategies. If the request size is not
+   * greater than the cut-off value, we will allocate memory by {@link PooledByteBufAllocatorL}
+   * APIs, otherwise, we will use {@link PlatformDependent} APIs.
    */
   public static final int DEFAULT_ALLOCATION_CUTOFF_VALUE = Integer.MAX_VALUE;
 
   private static final PooledByteBufAllocatorL INNER_ALLOCATOR = new PooledByteBufAllocatorL();
   static final UnsafeDirectLittleEndian EMPTY = INNER_ALLOCATOR.empty;
-  static final ArrowBuf EMPTY_BUFFER = new ArrowBuf(ReferenceManager.NO_OP,
-      null,
-      0,
-      NettyAllocationManager.EMPTY.memoryAddress());
+  static final ArrowBuf EMPTY_BUFFER =
+      new ArrowBuf(ReferenceManager.NO_OP, null, 0, NettyAllocationManager.EMPTY.memoryAddress());
   static final long CHUNK_SIZE = INNER_ALLOCATOR.getChunkSize();
 
   private final long allocatedSize;
   private final UnsafeDirectLittleEndian memoryChunk;
   private final long allocatedAddress;
 
-  /**
-   * The cut-off value for switching allocation strategies.
-   */
-  private final int allocationCutOffValue;
-
-  NettyAllocationManager(BufferAllocator accountingAllocator, long requestedSize, int allocationCutOffValue) {
+  /** The cut-off value for switching allocation strategies. */
+  NettyAllocationManager(
+      BufferAllocator accountingAllocator, long requestedSize, int allocationCutOffValue) {
     super(accountingAllocator);
-    this.allocationCutOffValue = allocationCutOffValue;
 
     if (requestedSize > allocationCutOffValue) {
       this.memoryChunk = null;
@@ -91,9 +83,9 @@ public ArrowBuf empty() {
 
   /**
    * Get the underlying memory chunk managed by this AllocationManager.
-   * @return the underlying memory chunk if the request size is not greater than the
-   *   {@link NettyAllocationManager#allocationCutOffValue}, or null otherwise.
    *
+   * @return the underlying memory chunk if the request size is not greater than the cutoff value
+   *     provided in the constructor , or null otherwise.
    * @deprecated this method will be removed in a future release.
    */
   @Deprecated
@@ -124,5 +116,4 @@ protected void release0() {
   public long getSize() {
     return allocatedSize;
   }
-
 }
diff --git a/java/memory/memory-netty/src/test/java/io/netty/buffer/TestExpandableByteBuf.java b/java/memory/memory-netty/src/test/java/io/netty/buffer/TestExpandableByteBuf.java
index 67557b65a6267..45aa0f38a590b 100644
--- a/java/memory/memory-netty/src/test/java/io/netty/buffer/TestExpandableByteBuf.java
+++ b/java/memory/memory-netty/src/test/java/io/netty/buffer/TestExpandableByteBuf.java
@@ -14,60 +14,61 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.netty.buffer;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.Assert;
-import org.junit.Test;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.ExpandableByteBuf;
-import io.netty.buffer.NettyArrowBuf;
+import org.junit.jupiter.api.Test;
 
 public class TestExpandableByteBuf {
 
   @Test
   public void testCapacity() {
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(20);
-    ) {
+        ArrowBuf buf = allocator.buffer(20)) {
       NettyArrowBuf srcByteBuf = NettyArrowBuf.unwrapBuffer(buf);
       ExpandableByteBuf expandableByteBuf = new ExpandableByteBuf(srcByteBuf, allocator);
       ByteBuf newByteBuf = expandableByteBuf.capacity(31);
       int capacity = newByteBuf.capacity();
-      Assert.assertEquals(32, capacity);
+      assertEquals(32, capacity);
     }
   }
 
   @Test
   public void testCapacity1() {
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(20);
-    ) {
+        ArrowBuf buf = allocator.buffer(20)) {
       NettyArrowBuf srcByteBuf = NettyArrowBuf.unwrapBuffer(buf);
       ExpandableByteBuf expandableByteBuf = new ExpandableByteBuf(srcByteBuf, allocator);
       ByteBuf newByteBuf = expandableByteBuf.capacity(32);
       int capacity = newByteBuf.capacity();
-      Assert.assertEquals(32, capacity);
+      assertEquals(32, capacity);
     }
   }
 
   @Test
   public void testSetAndGetIntValues() {
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(20);
-    ) {
+        ArrowBuf buf = allocator.buffer(20)) {
       NettyArrowBuf srcByteBuf = NettyArrowBuf.unwrapBuffer(buf);
       ExpandableByteBuf expandableByteBuf = new ExpandableByteBuf(srcByteBuf, allocator);
-      int [] intVals = new int[] {Integer.MIN_VALUE, Short.MIN_VALUE - 1, Short.MIN_VALUE, 0 ,
-        Short.MAX_VALUE , Short.MAX_VALUE + 1, Integer.MAX_VALUE};
-      for (int intValue :intVals) {
+      int[] intVals =
+          new int[] {
+            Integer.MIN_VALUE,
+            Short.MIN_VALUE - 1,
+            Short.MIN_VALUE,
+            0,
+            Short.MAX_VALUE,
+            Short.MAX_VALUE + 1,
+            Integer.MAX_VALUE
+          };
+      for (int intValue : intVals) {
         expandableByteBuf.setInt(0, intValue);
-        Assert.assertEquals(expandableByteBuf.getInt(0), intValue);
-        Assert.assertEquals(expandableByteBuf.getIntLE(0), Integer.reverseBytes(intValue));
+        assertEquals(expandableByteBuf.getInt(0), intValue);
+        assertEquals(expandableByteBuf.getIntLE(0), Integer.reverseBytes(intValue));
       }
     }
   }
@@ -75,15 +76,14 @@ public void testSetAndGetIntValues() {
   @Test
   public void testSetAndGetLongValues() {
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(20);
-    ) {
+        ArrowBuf buf = allocator.buffer(20)) {
       NettyArrowBuf srcByteBuf = NettyArrowBuf.unwrapBuffer(buf);
       ExpandableByteBuf expandableByteBuf = new ExpandableByteBuf(srcByteBuf, allocator);
-      long [] longVals = new long[] {Long.MIN_VALUE, 0 , Long.MAX_VALUE};
-      for (long longValue :longVals) {
+      long[] longVals = new long[] {Long.MIN_VALUE, 0, Long.MAX_VALUE};
+      for (long longValue : longVals) {
         expandableByteBuf.setLong(0, longValue);
-        Assert.assertEquals(expandableByteBuf.getLong(0), longValue);
-        Assert.assertEquals(expandableByteBuf.getLongLE(0), Long.reverseBytes(longValue));
+        assertEquals(expandableByteBuf.getLong(0), longValue);
+        assertEquals(expandableByteBuf.getLongLE(0), Long.reverseBytes(longValue));
       }
     }
   }
@@ -91,15 +91,14 @@ public void testSetAndGetLongValues() {
   @Test
   public void testSetAndGetShortValues() {
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(20);
-    ) {
+        ArrowBuf buf = allocator.buffer(20)) {
       NettyArrowBuf srcByteBuf = NettyArrowBuf.unwrapBuffer(buf);
       ExpandableByteBuf expandableByteBuf = new ExpandableByteBuf(srcByteBuf, allocator);
-      short [] shortVals = new short[] {Short.MIN_VALUE, 0 , Short.MAX_VALUE};
-      for (short shortValue :shortVals) {
+      short[] shortVals = new short[] {Short.MIN_VALUE, 0, Short.MAX_VALUE};
+      for (short shortValue : shortVals) {
         expandableByteBuf.setShort(0, shortValue);
-        Assert.assertEquals(expandableByteBuf.getShort(0), shortValue);
-        Assert.assertEquals(expandableByteBuf.getShortLE(0), Short.reverseBytes(shortValue));
+        assertEquals(expandableByteBuf.getShort(0), shortValue);
+        assertEquals(expandableByteBuf.getShortLE(0), Short.reverseBytes(shortValue));
       }
     }
   }
@@ -107,14 +106,13 @@ public void testSetAndGetShortValues() {
   @Test
   public void testSetAndGetByteValues() {
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(20);
-    ) {
+        ArrowBuf buf = allocator.buffer(20)) {
       NettyArrowBuf srcByteBuf = NettyArrowBuf.unwrapBuffer(buf);
       ExpandableByteBuf expandableByteBuf = new ExpandableByteBuf(srcByteBuf, allocator);
-      byte [] byteVals = new byte[] {Byte.MIN_VALUE, 0 , Byte.MAX_VALUE};
-      for (short byteValue :byteVals) {
+      byte[] byteVals = new byte[] {Byte.MIN_VALUE, 0, Byte.MAX_VALUE};
+      for (short byteValue : byteVals) {
         expandableByteBuf.setByte(0, byteValue);
-        Assert.assertEquals(expandableByteBuf.getByte(0), byteValue);
+        assertEquals(expandableByteBuf.getByte(0), byteValue);
       }
     }
   }
diff --git a/java/memory/memory-netty/src/test/java/io/netty/buffer/TestNettyArrowBuf.java b/java/memory/memory-netty/src/test/java/io/netty/buffer/TestNettyArrowBuf.java
index f18bccb4c9d8f..19d793d0fc036 100644
--- a/java/memory/memory-netty/src/test/java/io/netty/buffer/TestNettyArrowBuf.java
+++ b/java/memory/memory-netty/src/test/java/io/netty/buffer/TestNettyArrowBuf.java
@@ -14,91 +14,90 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package io.netty.buffer;
 
-import java.nio.ByteBuffer;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
+import java.nio.ByteBuffer;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.memory.patch.ArrowByteBufAllocator;
-import org.junit.Assert;
-import org.junit.Test;
-
-import io.netty.buffer.CompositeByteBuf;
-import io.netty.buffer.NettyArrowBuf;
+import org.junit.jupiter.api.Test;
 
 public class TestNettyArrowBuf {
 
   @Test
   public void testSliceWithoutArgs() {
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(20);
-    ) {
+        ArrowBuf buf = allocator.buffer(20)) {
       NettyArrowBuf nettyBuf = NettyArrowBuf.unwrapBuffer(buf);
       nettyBuf.writerIndex(20);
       nettyBuf.readerIndex(10);
       NettyArrowBuf slicedBuffer = nettyBuf.slice();
       int readableBytes = slicedBuffer.readableBytes();
-      Assert.assertEquals(10, readableBytes);
+      assertEquals(10, readableBytes);
     }
   }
 
   @Test
   public void testNioBuffer() {
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(20);
-    ) {
+        ArrowBuf buf = allocator.buffer(20)) {
       NettyArrowBuf nettyBuf = NettyArrowBuf.unwrapBuffer(buf);
       ByteBuffer byteBuffer = nettyBuf.nioBuffer(4, 6);
       // Nio Buffers should always be 0 indexed
-      Assert.assertEquals(0, byteBuffer.position());
-      Assert.assertEquals(6, byteBuffer.limit());
+      assertEquals(0, byteBuffer.position());
+      assertEquals(6, byteBuffer.limit());
       // Underlying buffer has size 32 excluding 4 should have capacity of 28.
-      Assert.assertEquals(28, byteBuffer.capacity());
-
+      assertEquals(28, byteBuffer.capacity());
     }
   }
 
   @Test
   public void testInternalNioBuffer() {
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(20);
-    ) {
+        ArrowBuf buf = allocator.buffer(20)) {
       NettyArrowBuf nettyBuf = NettyArrowBuf.unwrapBuffer(buf);
       ByteBuffer byteBuffer = nettyBuf.internalNioBuffer(4, 6);
-      Assert.assertEquals(0, byteBuffer.position());
-      Assert.assertEquals(6, byteBuffer.limit());
+      assertEquals(0, byteBuffer.position());
+      assertEquals(6, byteBuffer.limit());
       // Underlying buffer has size 32 excluding 4 should have capacity of 28.
-      Assert.assertEquals(28, byteBuffer.capacity());
-
+      assertEquals(28, byteBuffer.capacity());
     }
   }
 
   @Test
   public void testSetLEValues() {
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(20);
-    ) {
+        ArrowBuf buf = allocator.buffer(20)) {
       NettyArrowBuf nettyBuf = NettyArrowBuf.unwrapBuffer(buf);
-      int [] intVals = new int[] {Integer.MIN_VALUE, Short.MIN_VALUE - 1, Short.MIN_VALUE, 0 ,
-        Short.MAX_VALUE , Short.MAX_VALUE + 1, Integer.MAX_VALUE};
-      for (int intValue :intVals ) {
+      int[] intVals =
+          new int[] {
+            Integer.MIN_VALUE,
+            Short.MIN_VALUE - 1,
+            Short.MIN_VALUE,
+            0,
+            Short.MAX_VALUE,
+            Short.MAX_VALUE + 1,
+            Integer.MAX_VALUE
+          };
+      for (int intValue : intVals) {
         nettyBuf._setInt(0, intValue);
-        Assert.assertEquals(nettyBuf._getIntLE(0), Integer.reverseBytes(intValue));
+        assertEquals(nettyBuf._getIntLE(0), Integer.reverseBytes(intValue));
       }
 
-      long [] longVals = new long[] {Long.MIN_VALUE, 0 , Long.MAX_VALUE};
-      for (long longValue :longVals ) {
+      long[] longVals = new long[] {Long.MIN_VALUE, 0, Long.MAX_VALUE};
+      for (long longValue : longVals) {
         nettyBuf._setLong(0, longValue);
-        Assert.assertEquals(nettyBuf._getLongLE(0), Long.reverseBytes(longValue));
+        assertEquals(nettyBuf._getLongLE(0), Long.reverseBytes(longValue));
       }
 
-      short [] shortVals = new short[] {Short.MIN_VALUE, 0 , Short.MAX_VALUE};
-      for (short shortValue :shortVals ) {
+      short[] shortVals = new short[] {Short.MIN_VALUE, 0, Short.MAX_VALUE};
+      for (short shortValue : shortVals) {
         nettyBuf._setShort(0, shortValue);
-        Assert.assertEquals(nettyBuf._getShortLE(0), Short.reverseBytes(shortValue));
+        assertEquals(nettyBuf._getShortLE(0), Short.reverseBytes(shortValue));
       }
     }
   }
@@ -106,28 +105,26 @@ public void testSetLEValues() {
   @Test
   public void testSetCompositeBuffer() {
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(20);
-         NettyArrowBuf buf2 = NettyArrowBuf.unwrapBuffer(allocator.buffer(20));
-    ) {
-      CompositeByteBuf byteBufs = new CompositeByteBuf(new ArrowByteBufAllocator(allocator),
-              true, 1);
+        ArrowBuf buf = allocator.buffer(20);
+        NettyArrowBuf buf2 = NettyArrowBuf.unwrapBuffer(allocator.buffer(20))) {
+      CompositeByteBuf byteBufs =
+          new CompositeByteBuf(new ArrowByteBufAllocator(allocator), true, 1);
       int expected = 4;
       buf2.setInt(0, expected);
       buf2.writerIndex(4);
       byteBufs.addComponent(true, buf2);
       NettyArrowBuf.unwrapBuffer(buf).setBytes(0, byteBufs, 4);
       int actual = buf.getInt(0);
-      Assert.assertEquals(expected, actual);
+      assertEquals(expected, actual);
     }
   }
 
   @Test
   public void testGetCompositeBuffer() {
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(20);
-    ) {
-      CompositeByteBuf byteBufs = new CompositeByteBuf(new ArrowByteBufAllocator(allocator),
-              true, 1);
+        ArrowBuf buf = allocator.buffer(20)) {
+      CompositeByteBuf byteBufs =
+          new CompositeByteBuf(new ArrowByteBufAllocator(allocator), true, 1);
       int expected = 4;
       buf.setInt(0, expected);
       NettyArrowBuf buf2 = NettyArrowBuf.unwrapBuffer(allocator.buffer(20));
@@ -137,7 +134,7 @@ public void testGetCompositeBuffer() {
       byteBufs.capacity(20);
       NettyArrowBuf.unwrapBuffer(buf).getBytes(0, byteBufs, 4);
       int actual = byteBufs.getInt(0);
-      Assert.assertEquals(expected, actual);
+      assertEquals(expected, actual);
       byteBufs.component(0).release();
     }
   }
@@ -145,11 +142,10 @@ public void testGetCompositeBuffer() {
   @Test
   public void testUnwrapReturnsNull() {
     try (BufferAllocator allocator = new RootAllocator(128);
-         ArrowBuf buf = allocator.buffer(20);
-    ) {
+        ArrowBuf buf = allocator.buffer(20)) {
       NettyArrowBuf nettyBuf = NettyArrowBuf.unwrapBuffer(buf);
       // NettyArrowBuf cannot be unwrapped, so unwrap() should return null per the Netty ByteBuf API
-      Assert.assertNull(nettyBuf.unwrap());
+      assertNull(nettyBuf.unwrap());
     }
   }
 }
diff --git a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/ITTestLargeArrowBuf.java b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/ITTestLargeArrowBuf.java
index 71dba73d2896e..1029ed738407c 100644
--- a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/ITTestLargeArrowBuf.java
+++ b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/ITTestLargeArrowBuf.java
@@ -14,29 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.netty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
- * Integration test for large (more than 2GB) {@link org.apache.arrow.memory.ArrowBuf}.
- * To run this test, please make sure there is at least 4GB memory in the system.
+ * Integration test for large (more than 2GB) {@link org.apache.arrow.memory.ArrowBuf}. To run this
+ * test, please make sure there is at least 4GB memory in the system.
  */
 public class ITTestLargeArrowBuf {
   private static final Logger logger = LoggerFactory.getLogger(ITTestLargeArrowBuf.class);
 
   private void run(long bufSize) {
     try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         ArrowBuf largeBuf = allocator.buffer(bufSize)) {
+        ArrowBuf largeBuf = allocator.buffer(bufSize)) {
       assertEquals(bufSize, largeBuf.capacity());
       logger.trace("Successfully allocated a buffer with capacity {}", largeBuf.capacity());
 
@@ -71,5 +69,4 @@ public void testLargeArrowBuf() {
   public void testMaxIntArrowBuf() {
     run(Integer.MAX_VALUE);
   }
-
 }
diff --git a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestAllocationManagerNetty.java b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestAllocationManagerNetty.java
index 7f1e34ddc5fc2..655129909a535 100644
--- a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestAllocationManagerNetty.java
+++ b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestAllocationManagerNetty.java
@@ -14,18 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.netty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.arrow.memory.AllocationManager;
 import org.apache.arrow.memory.DefaultAllocationManagerOption;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link AllocationManager}.
- */
+/** Test cases for {@link AllocationManager}. */
 public class TestAllocationManagerNetty {
 
   @Test
diff --git a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestEmptyArrowBuf.java b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestEmptyArrowBuf.java
index b9948083e6f82..3ce0705b4ead0 100644
--- a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestEmptyArrowBuf.java
+++ b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestEmptyArrowBuf.java
@@ -14,32 +14,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.netty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
+import io.netty.buffer.PooledByteBufAllocatorL;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.ReferenceManager;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import io.netty.buffer.PooledByteBufAllocatorL;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class TestEmptyArrowBuf {
 
   private static final int MAX_ALLOCATION = 8 * 1024;
   private static RootAllocator allocator;
 
-  @BeforeClass
+  @BeforeAll
   public static void beforeClass() {
     allocator = new RootAllocator(MAX_ALLOCATION);
   }
-  
+
   /** Ensure the allocator is closed. */
-  @AfterClass
+  @AfterAll
   public static void afterClass() {
     if (allocator != null) {
       allocator.close();
@@ -48,16 +47,22 @@ public static void afterClass() {
 
   @Test
   public void testZeroBuf() {
-    // Exercise the historical log inside the empty ArrowBuf. This is initialized statically, and there is a circular
-    // dependency between ArrowBuf and BaseAllocator, so if the initialization happens in the wrong order, the
+    // Exercise the historical log inside the empty ArrowBuf. This is initialized statically, and
+    // there is a circular
+    // dependency between ArrowBuf and BaseAllocator, so if the initialization happens in the wrong
+    // order, the
     // historical log will be null even though RootAllocator.DEBUG is true.
     allocator.getEmpty().print(new StringBuilder(), 0, RootAllocator.Verbosity.LOG_WITH_STACKTRACE);
   }
 
   @Test
   public void testEmptyArrowBuf() {
-    ArrowBuf buf = new ArrowBuf(ReferenceManager.NO_OP, null,
-        1024, new PooledByteBufAllocatorL().empty.memoryAddress());
+    ArrowBuf buf =
+        new ArrowBuf(
+            ReferenceManager.NO_OP,
+            null,
+            1024,
+            new PooledByteBufAllocatorL().empty.memoryAddress());
 
     buf.getReferenceManager().retain();
     buf.getReferenceManager().retain(8);
@@ -71,10 +76,11 @@ public void testEmptyArrowBuf() {
     assertEquals(0, buf.getActualMemoryConsumed());
     assertEquals(0, buf.getReferenceManager().getSize());
     assertEquals(0, buf.getReferenceManager().getAccountedSize());
-    assertEquals(false, buf.getReferenceManager().release());
-    assertEquals(false, buf.getReferenceManager().release(2));
+    assertFalse(buf.getReferenceManager().release());
+    assertFalse(buf.getReferenceManager().release(2));
     assertEquals(0, buf.getReferenceManager().getAllocator().getLimit());
-    assertEquals(buf, buf.getReferenceManager().transferOwnership(buf, allocator).getTransferredBuffer());
+    assertEquals(
+        buf, buf.getReferenceManager().transferOwnership(buf, allocator).getTransferredBuffer());
     assertEquals(0, buf.readerIndex());
     assertEquals(0, buf.writerIndex());
     assertEquals(1, buf.refCnt());
@@ -85,7 +91,5 @@ public void testEmptyArrowBuf() {
     assertEquals(1, derive.refCnt());
 
     buf.close();
-
   }
-
 }
diff --git a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestEndianness.java b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestEndianness.java
index a782523cbc6d6..eb5c3a43ab8f0 100644
--- a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestEndianness.java
+++ b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestEndianness.java
@@ -14,19 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.netty;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.NettyArrowBuf;
 import java.nio.ByteOrder;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.Test;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.NettyArrowBuf;
+import org.junit.jupiter.api.Test;
 
 public class TestEndianness {
 
@@ -36,18 +33,17 @@ public void testNativeEndian() {
     final ByteBuf b = NettyArrowBuf.unwrapBuffer(a.buffer(4));
     b.setInt(0, 35);
     if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) {
-      assertEquals(b.getByte(0), 35);
-      assertEquals(b.getByte(1), 0);
-      assertEquals(b.getByte(2), 0);
-      assertEquals(b.getByte(3), 0);
+      assertEquals(35, b.getByte(0));
+      assertEquals(0, b.getByte(1));
+      assertEquals(0, b.getByte(2));
+      assertEquals(0, b.getByte(3));
     } else {
-      assertEquals(b.getByte(0), 0);
-      assertEquals(b.getByte(1), 0);
-      assertEquals(b.getByte(2), 0);
-      assertEquals(b.getByte(3), 35);
+      assertEquals(0, b.getByte(0));
+      assertEquals(0, b.getByte(1));
+      assertEquals(0, b.getByte(2));
+      assertEquals(35, b.getByte(3));
     }
     b.release();
     a.close();
   }
-
 }
diff --git a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocationManager.java b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocationManager.java
index 39692c96ceb3d..2144b2d930276 100644
--- a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocationManager.java
+++ b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocationManager.java
@@ -14,41 +14,42 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.netty;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.apache.arrow.memory.AllocationManager;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.BufferLedger;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link NettyAllocationManager}.
- */
+/** Test cases for {@link NettyAllocationManager}. */
 public class TestNettyAllocationManager {
 
   static int CUSTOMIZED_ALLOCATION_CUTOFF_VALUE = 1024;
 
   private RootAllocator createCustomizedAllocator() {
-    return new RootAllocator(RootAllocator.configBuilder()
-        .allocationManagerFactory(new AllocationManager.Factory() {
-          @Override
-          public AllocationManager create(BufferAllocator accountingAllocator, long size) {
-            return new NettyAllocationManager(accountingAllocator, size, CUSTOMIZED_ALLOCATION_CUTOFF_VALUE);
-          }
-
-          @Override
-          public ArrowBuf empty() {
-            return null;
-          }
-        }).build());
+    return new RootAllocator(
+        RootAllocator.configBuilder()
+            .allocationManagerFactory(
+                new AllocationManager.Factory() {
+                  @Override
+                  public AllocationManager create(BufferAllocator accountingAllocator, long size) {
+                    return new NettyAllocationManager(
+                        accountingAllocator, size, CUSTOMIZED_ALLOCATION_CUTOFF_VALUE);
+                  }
+
+                  @Override
+                  public ArrowBuf empty() {
+                    return null;
+                  }
+                })
+            .build());
   }
 
   private void readWriteArrowBuf(ArrowBuf buffer) {
@@ -64,21 +65,19 @@ private void readWriteArrowBuf(ArrowBuf buffer) {
     }
   }
 
-  /**
-   * Test the allocation strategy for small buffers..
-   */
+  /** Test the allocation strategy for small buffers.. */
   @Test
   public void testSmallBufferAllocation() {
     final long bufSize = CUSTOMIZED_ALLOCATION_CUTOFF_VALUE - 512L;
     try (RootAllocator allocator = createCustomizedAllocator();
-         ArrowBuf buffer = allocator.buffer(bufSize)) {
+        ArrowBuf buffer = allocator.buffer(bufSize)) {
 
-      assertTrue(buffer.getReferenceManager() instanceof BufferLedger);
+      assertInstanceOf(BufferLedger.class, buffer.getReferenceManager());
       BufferLedger bufferLedger = (BufferLedger) buffer.getReferenceManager();
 
       // make sure we are using netty allocation manager
       AllocationManager allocMgr = bufferLedger.getAllocationManager();
-      assertTrue(allocMgr instanceof NettyAllocationManager);
+      assertInstanceOf(NettyAllocationManager.class, allocMgr);
       NettyAllocationManager nettyMgr = (NettyAllocationManager) allocMgr;
 
       // for the small buffer allocation strategy, the chunk is not null
@@ -88,20 +87,18 @@ public void testSmallBufferAllocation() {
     }
   }
 
-  /**
-   * Test the allocation strategy for large buffers..
-   */
+  /** Test the allocation strategy for large buffers.. */
   @Test
   public void testLargeBufferAllocation() {
     final long bufSize = CUSTOMIZED_ALLOCATION_CUTOFF_VALUE + 1024L;
     try (RootAllocator allocator = createCustomizedAllocator();
-         ArrowBuf buffer = allocator.buffer(bufSize)) {
-      assertTrue(buffer.getReferenceManager() instanceof BufferLedger);
+        ArrowBuf buffer = allocator.buffer(bufSize)) {
+      assertInstanceOf(BufferLedger.class, buffer.getReferenceManager());
       BufferLedger bufferLedger = (BufferLedger) buffer.getReferenceManager();
 
       // make sure we are using netty allocation manager
       AllocationManager allocMgr = bufferLedger.getAllocationManager();
-      assertTrue(allocMgr instanceof NettyAllocationManager);
+      assertInstanceOf(NettyAllocationManager.class, allocMgr);
       NettyAllocationManager nettyMgr = (NettyAllocationManager) allocMgr;
 
       // for the large buffer allocation strategy, the chunk is null
diff --git a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocator.java b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocator.java
index 07fdc3f784e43..5be42ecb089c9 100644
--- a/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocator.java
+++ b/java/memory/memory-netty/src/test/java/org/apache/arrow/memory/netty/TestNettyAllocator.java
@@ -14,31 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.netty;
 
-import static org.junit.Assert.assertTrue;
-
-import java.util.Collections;
-import java.util.stream.Collectors;
-
-import org.apache.arrow.memory.ArrowBuf;
-import org.apache.arrow.memory.ReferenceManager;
-import org.junit.Test;
-import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.read.ListAppender;
 import io.netty.buffer.PooledByteBufAllocatorL;
+import java.util.Collections;
+import java.util.stream.Collectors;
+import org.apache.arrow.memory.ArrowBuf;
+import org.apache.arrow.memory.ReferenceManager;
+import org.junit.jupiter.api.Test;
+import org.slf4j.LoggerFactory;
 
-/**
- * Test netty allocators.
- */
+/** Test netty allocators. */
 public class TestNettyAllocator {
 
   @Test
+  @SuppressWarnings("SynchronizeOnNonFinalField")
   public void testMemoryUsage() {
     ListAppender<ILoggingEvent> memoryLogsAppender = new ListAppender<>();
     memoryLogsAppender.list = Collections.synchronizedList(memoryLogsAppender.list);
@@ -47,31 +43,45 @@ public void testMemoryUsage() {
       logger.setLevel(Level.TRACE);
       logger.addAppender(memoryLogsAppender);
       memoryLogsAppender.start();
-      try (ArrowBuf buf = new ArrowBuf(ReferenceManager.NO_OP, null,
-          1024, new PooledByteBufAllocatorL().empty.memoryAddress())) {
+      try (ArrowBuf buf =
+          new ArrowBuf(
+              ReferenceManager.NO_OP,
+              null,
+              1024,
+              new PooledByteBufAllocatorL().empty.memoryAddress())) {
         buf.memoryAddress();
       }
       boolean result = false;
       long startTime = System.currentTimeMillis();
-      while ((System.currentTimeMillis() - startTime) < 10000) { // 10 seconds maximum for time to read logs
-        // Lock on the list backing the appender since a background thread might try to add more logs
-        // while stream() is iterating over list elements. This would throw a flakey ConcurrentModificationException.
+      while ((System.currentTimeMillis() - startTime)
+          < 10000) { // 10 seconds maximum for time to read logs
+        // Lock on the list backing the appender since a background thread might try to add more
+        // logs
+        // while stream() is iterating over list elements. This would throw a flakey
+        // ConcurrentModificationException.
         synchronized (memoryLogsAppender.list) {
-          result = memoryLogsAppender.list.stream()
-              .anyMatch(
-                  log -> log.toString().contains("Memory Usage: \n") &&
-                      log.toString().contains("Large buffers outstanding: ") &&
-                      log.toString().contains("Normal buffers outstanding: ") &&
-                      log.getLevel().equals(Level.TRACE)
-              );
+          result =
+              memoryLogsAppender.list.stream()
+                  .anyMatch(
+                      log ->
+                          log.toString().contains("Memory Usage: \n")
+                              && log.toString().contains("Large buffers outstanding: ")
+                              && log.toString().contains("Normal buffers outstanding: ")
+                              && log.getLevel().equals(Level.TRACE));
         }
         if (result) {
           break;
         }
       }
-      assertTrue("Log messages are:\n" +
-              memoryLogsAppender.list.stream().map(ILoggingEvent::toString).collect(Collectors.joining("\n")),
-          result);
+      synchronized (memoryLogsAppender.list) {
+        assertTrue(
+            result,
+            "Log messages are:\n"
+                + memoryLogsAppender.list.stream()
+                    .map(ILoggingEvent::toString)
+                    .collect(Collectors.joining("\n")));
+      }
+
     } finally {
       memoryLogsAppender.stop();
       logger.detachAppender(memoryLogsAppender);
diff --git a/java/memory/memory-unsafe/pom.xml b/java/memory/memory-unsafe/pom.xml
index 07a140e594522..c1a42e3ff0081 100644
--- a/java/memory/memory-unsafe/pom.xml
+++ b/java/memory/memory-unsafe/pom.xml
@@ -1,27 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
-    <artifactId>arrow-memory</artifactId>
     <groupId>org.apache.arrow</groupId>
-    <version>16.0.0-SNAPSHOT</version>
+    <artifactId>arrow-memory</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
 
   <artifactId>arrow-memory-unsafe</artifactId>
   <name>Arrow Memory - Unsafe</name>
   <description>Allocator and utils for allocating memory in Arrow based on sun.misc.Unsafe</description>
 
-
   <dependencies>
     <dependency>
       <groupId>org.apache.arrow</groupId>
@@ -29,7 +36,7 @@
     </dependency>
     <dependency>
       <groupId>org.immutables</groupId>
-      <artifactId>value</artifactId>
+      <artifactId>value-annotations</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/java/memory/memory-unsafe/src/main/java/module-info.java b/java/memory/memory-unsafe/src/main/java/module-info.java
index aa340d21716bd..526ebbdabbf8e 100644
--- a/java/memory/memory-unsafe/src/main/java/module-info.java
+++ b/java/memory/memory-unsafe/src/main/java/module-info.java
@@ -16,7 +16,8 @@
  */
 
 module org.apache.arrow.memory.unsafe {
-  exports org.apache.arrow.memory.unsafe to org.apache.arrow.memory.core;
-  
+  exports org.apache.arrow.memory.unsafe to
+      org.apache.arrow.memory.core;
+
   requires org.apache.arrow.memory.core;
 }
diff --git a/java/memory/memory-unsafe/src/main/java/org/apache/arrow/memory/unsafe/DefaultAllocationManagerFactory.java b/java/memory/memory-unsafe/src/main/java/org/apache/arrow/memory/unsafe/DefaultAllocationManagerFactory.java
index dfb6c706856b6..aed20209ffae5 100644
--- a/java/memory/memory-unsafe/src/main/java/org/apache/arrow/memory/unsafe/DefaultAllocationManagerFactory.java
+++ b/java/memory/memory-unsafe/src/main/java/org/apache/arrow/memory/unsafe/DefaultAllocationManagerFactory.java
@@ -14,17 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.unsafe;
 
 import org.apache.arrow.memory.AllocationManager;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 
-/**
- * The default Allocation Manager Factory for a module.
- *
- */
+/** The default Allocation Manager Factory for a module. */
 public class DefaultAllocationManagerFactory implements AllocationManager.Factory {
 
   public static final AllocationManager.Factory FACTORY = UnsafeAllocationManager.FACTORY;
diff --git a/java/memory/memory-unsafe/src/main/java/org/apache/arrow/memory/unsafe/UnsafeAllocationManager.java b/java/memory/memory-unsafe/src/main/java/org/apache/arrow/memory/unsafe/UnsafeAllocationManager.java
index 3468a6ec65c2f..31af262a5720e 100644
--- a/java/memory/memory-unsafe/src/main/java/org/apache/arrow/memory/unsafe/UnsafeAllocationManager.java
+++ b/java/memory/memory-unsafe/src/main/java/org/apache/arrow/memory/unsafe/UnsafeAllocationManager.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.unsafe;
 
 import org.apache.arrow.memory.AllocationManager;
@@ -23,28 +22,24 @@
 import org.apache.arrow.memory.ReferenceManager;
 import org.apache.arrow.memory.util.MemoryUtil;
 
-/**
- * Allocation manager based on unsafe API.
- */
+/** Allocation manager based on unsafe API. */
 public final class UnsafeAllocationManager extends AllocationManager {
 
-  private static final ArrowBuf EMPTY = new ArrowBuf(ReferenceManager.NO_OP,
-      null,
-      0,
-      MemoryUtil.UNSAFE.allocateMemory(0)
-  );
+  private static final ArrowBuf EMPTY =
+      new ArrowBuf(ReferenceManager.NO_OP, null, 0, MemoryUtil.UNSAFE.allocateMemory(0));
 
-  public static final AllocationManager.Factory FACTORY = new Factory() {
-    @Override
-    public AllocationManager create(BufferAllocator accountingAllocator, long size) {
-      return new UnsafeAllocationManager(accountingAllocator, size);
-    }
+  public static final AllocationManager.Factory FACTORY =
+      new Factory() {
+        @Override
+        public AllocationManager create(BufferAllocator accountingAllocator, long size) {
+          return new UnsafeAllocationManager(accountingAllocator, size);
+        }
 
-    @Override
-    public ArrowBuf empty() {
-      return EMPTY;
-    }
-  };
+        @Override
+        public ArrowBuf empty() {
+          return EMPTY;
+        }
+      };
 
   private final long allocatedSize;
 
@@ -70,5 +65,4 @@ protected long memoryAddress() {
   protected void release0() {
     MemoryUtil.UNSAFE.freeMemory(allocatedAddress);
   }
-
 }
diff --git a/java/memory/memory-unsafe/src/test/java/org/apache/arrow/memory/unsafe/TestAllocationManagerUnsafe.java b/java/memory/memory-unsafe/src/test/java/org/apache/arrow/memory/unsafe/TestAllocationManagerUnsafe.java
index f1ca96eea0f20..0187d63046f41 100644
--- a/java/memory/memory-unsafe/src/test/java/org/apache/arrow/memory/unsafe/TestAllocationManagerUnsafe.java
+++ b/java/memory/memory-unsafe/src/test/java/org/apache/arrow/memory/unsafe/TestAllocationManagerUnsafe.java
@@ -14,18 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.unsafe;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.arrow.memory.AllocationManager;
 import org.apache.arrow.memory.DefaultAllocationManagerOption;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link AllocationManager}.
- */
+/** Test cases for {@link AllocationManager}. */
 public class TestAllocationManagerUnsafe {
 
   @Test
@@ -38,6 +35,5 @@ public void testAllocationManagerType() {
         DefaultAllocationManagerOption.getDefaultAllocationManagerType();
 
     assertEquals(DefaultAllocationManagerOption.AllocationManagerType.Unsafe, mgrType);
-
   }
 }
diff --git a/java/memory/memory-unsafe/src/test/java/org/apache/arrow/memory/unsafe/TestUnsafeAllocationManager.java b/java/memory/memory-unsafe/src/test/java/org/apache/arrow/memory/unsafe/TestUnsafeAllocationManager.java
index 77233e73cb303..947570f76b82e 100644
--- a/java/memory/memory-unsafe/src/test/java/org/apache/arrow/memory/unsafe/TestUnsafeAllocationManager.java
+++ b/java/memory/memory-unsafe/src/test/java/org/apache/arrow/memory/unsafe/TestUnsafeAllocationManager.java
@@ -14,27 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.unsafe;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 
 import org.apache.arrow.memory.AllocationManager;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.BufferLedger;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link UnsafeAllocationManager}.
- */
+/** Test cases for {@link UnsafeAllocationManager}. */
 public class TestUnsafeAllocationManager {
 
   private BufferAllocator createUnsafeAllocator() {
-    return new RootAllocator(RootAllocator.configBuilder().allocationManagerFactory(UnsafeAllocationManager.FACTORY)
-        .build());
+    return new RootAllocator(
+        RootAllocator.configBuilder()
+            .allocationManagerFactory(UnsafeAllocationManager.FACTORY)
+            .build());
   }
 
   private void readWriteArrowBuf(ArrowBuf buffer) {
@@ -50,20 +49,18 @@ private void readWriteArrowBuf(ArrowBuf buffer) {
     }
   }
 
-  /**
-   * Test the memory allocation for {@link UnsafeAllocationManager}.
-   */
+  /** Test the memory allocation for {@link UnsafeAllocationManager}. */
   @Test
   public void testBufferAllocation() {
     final long bufSize = 4096L;
     try (BufferAllocator allocator = createUnsafeAllocator();
-         ArrowBuf buffer = allocator.buffer(bufSize)) {
-      assertTrue(buffer.getReferenceManager() instanceof BufferLedger);
+        ArrowBuf buffer = allocator.buffer(bufSize)) {
+      assertInstanceOf(BufferLedger.class, buffer.getReferenceManager());
       BufferLedger bufferLedger = (BufferLedger) buffer.getReferenceManager();
 
       // make sure we are using unsafe allocation manager
       AllocationManager allocMgr = bufferLedger.getAllocationManager();
-      assertTrue(allocMgr instanceof UnsafeAllocationManager);
+      assertInstanceOf(UnsafeAllocationManager.class, allocMgr);
       UnsafeAllocationManager unsafeMgr = (UnsafeAllocationManager) allocMgr;
 
       assertEquals(bufSize, unsafeMgr.getSize());
diff --git a/java/memory/pom.xml b/java/memory/pom.xml
index 9e2d612765738..9eaad8a467895 100644
--- a/java/memory/pom.xml
+++ b/java/memory/pom.xml
@@ -1,24 +1,32 @@
-<?xml version="1.0"?>
-<!-- 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. -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.arrow</groupId>
     <artifactId>arrow-java-root</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>17.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>arrow-memory</artifactId>
-  <name>Arrow Memory</name>
   <packaging>pom</packaging>
+  <name>Arrow Memory</name>
 
   <modules>
     <module>memory-core</module>
@@ -26,5 +34,4 @@
     <module>memory-netty-buffer-patch</module>
     <module>memory-netty</module>
   </modules>
-
 </project>
diff --git a/java/performance/pom.xml b/java/performance/pom.xml
index 3f69be32a20e5..83b0a88da063b 100644
--- a/java/performance/pom.xml
+++ b/java/performance/pom.xml
@@ -1,216 +1,176 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <artifactId>arrow-java-root</artifactId>
-        <groupId>org.apache.arrow</groupId>
-        <version>16.0.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>arrow-performance</artifactId>
-    <packaging>jar</packaging>
-    <name>Arrow Performance Benchmarks</name>
-    <description>JMH Performance benchmarks for other Arrow libraries.</description>
+<!--
+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
 
-    <dependencies>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-core</artifactId>
-            <version>${jmh.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.openjdk.jmh</groupId>
-            <artifactId>jmh-generator-annprocess</artifactId>
-            <version>${jmh.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-vector</artifactId>
-            <classifier>${arrow.vector.classifier}</classifier>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-memory-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-memory-netty</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.avro</groupId>
-            <artifactId>avro</artifactId>
-            <version>${dep.avro.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-avro</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>2.2.224</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-jdbc</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-algorithm</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.arrow</groupId>
+    <artifactId>arrow-java-root</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>arrow-performance</artifactId>
+  <packaging>jar</packaging>
+  <name>Arrow Performance Benchmarks</name>
+  <description>JMH Performance benchmarks for other Arrow libraries.</description>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jmh.version>1.37</jmh.version>
-        <javac.target>1.8</javac.target>
-        <uberjar.name>benchmarks</uberjar.name>
-        <skip.perf.benchmarks>true</skip.perf.benchmarks>
-        <benchmark.filter>.*</benchmark.filter>
-        <benchmark.forks>1</benchmark.forks>
-        <benchmark.jvmargs> </benchmark.jvmargs>
-        <benchmark.warmups>5</benchmark.warmups>
-        <benchmark.runs>5</benchmark.runs>
-        <benchmark.list> </benchmark.list>
-        <benchmark.resultfile>jmh-result.json</benchmark.resultfile>
-        <benchmark.resultformat>json</benchmark.resultformat>
-    </properties>
+  <properties>
+    <jmh.version>1.37</jmh.version>
+    <uberjar.name>benchmarks</uberjar.name>
+    <skip.perf.benchmarks>true</skip.perf.benchmarks>
+    <benchmark.filter>.*</benchmark.filter>
+    <benchmark.forks>1</benchmark.forks>
+    <benchmark.jvmargs></benchmark.jvmargs>
+    <benchmark.warmups>5</benchmark.warmups>
+    <benchmark.runs>5</benchmark.runs>
+    <benchmark.list></benchmark.list>
+    <benchmark.resultfile>jmh-result.json</benchmark.resultfile>
+    <benchmark.resultformat>json</benchmark.resultformat>
+  </properties>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration combine.self="override">
-                    <compilerVersion>${javac.target}</compilerVersion>
-                    <source>${javac.target}</source>
-                    <target>${javac.target}</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <finalName>${uberjar.name}</finalName>
-                            <transformers>
-                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>org.openjdk.jmh.Main</mainClass>
-                                </transformer>
-                            </transformers>
-                            <filters>
-                                <filter>
-                                    <artifact>*:*</artifact>
-                                    <excludes>
-                                        <exclude>META-INF/*.SF</exclude>
-                                        <exclude>META-INF/*.DSA</exclude>
-                                        <exclude>META-INF/*.RSA</exclude>
-                                    </excludes>
-                                </filter>
-                            </filters>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>3.2.0</version>
-                <executions>
-                    <execution>
-                        <id>run-java-benchmarks</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <skip>${skip.perf.benchmarks}</skip>
-                    <classpathScope>test</classpathScope>
-                    <executable>java</executable>
-                    <arguments>
-                        <argument>-classpath</argument>
-                        <classpath />
-                        <argument>org.openjdk.jmh.Main</argument>
-                        <argument>${benchmark.filter}</argument>
-                        <argument>-f</argument>
-                        <argument>${benchmark.forks}</argument>
-                        <argument>-jvmArgs</argument>
-                        <argument>${benchmark.jvmargs}</argument>
-                        <argument>-wi</argument>
-                        <argument>${benchmark.warmups}</argument>
-                        <argument>-i</argument>
-                        <argument>${benchmark.runs}</argument>
-                        <argument>${benchmark.list}</argument>
-                        <argument>-rff</argument>
-                        <argument>${benchmark.resultfile}</argument>
-                        <argument>-rf</argument>
-                        <argument>${benchmark.resultformat}</argument>
-                    </arguments>
-                </configuration>
-            </plugin>
-        </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <version>2.5</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>3.1.1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-install-plugin</artifactId>
-                    <version>3.1.1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.3.0</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.6.3</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.3.1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>2.2.1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.2.5</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.openjdk.jmh</groupId>
+      <artifactId>jmh-core</artifactId>
+      <version>${jmh.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-vector</artifactId>
+      <classifier>${arrow.vector.classifier}</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-memory-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-memory-netty</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avro</groupId>
+      <artifactId>avro</artifactId>
+      <version>${dep.avro.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-avro</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>2.2.224</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-jdbc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-algorithm</artifactId>
+    </dependency>
+  </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <annotationProcessorPaths combine.children="append">
+            <path>
+              <groupId>org.openjdk.jmh</groupId>
+              <artifactId>jmh-generator-annprocess</artifactId>
+              <version>${jmh.version}</version>
+            </path>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <finalName>${uberjar.name}</finalName>
+              <createDependencyReducedPom>false</createDependencyReducedPom>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>org.openjdk.jmh.Main</mainClass>
+                </transformer>
+              </transformers>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <configuration>
+          <skip>${skip.perf.benchmarks}</skip>
+          <classpathScope>test</classpathScope>
+          <executable>java</executable>
+          <arguments>
+            <argument>-classpath</argument>
+            <classpath></classpath>
+            <argument>org.openjdk.jmh.Main</argument>
+            <argument>${benchmark.filter}</argument>
+            <argument>-f</argument>
+            <argument>${benchmark.forks}</argument>
+            <argument>-jvmArgs</argument>
+            <argument>${benchmark.jvmargs}</argument>
+            <argument>-wi</argument>
+            <argument>${benchmark.warmups}</argument>
+            <argument>-i</argument>
+            <argument>${benchmark.runs}</argument>
+            <argument>${benchmark.list}</argument>
+            <argument>-rff</argument>
+            <argument>${benchmark.resultfile}</argument>
+            <argument>-rf</argument>
+            <argument>${benchmark.resultformat}</argument>
+          </arguments>
+        </configuration>
+        <executions>
+          <execution>
+            <id>run-java-benchmarks</id>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <phase>integration-test</phase>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/java/performance/src/test/java/org/apache/arrow/adapter/AvroAdapterBenchmarks.java b/java/performance/src/main/java/org/apache/arrow/adapter/AvroAdapterBenchmarks.java
similarity index 80%
rename from java/performance/src/test/java/org/apache/arrow/adapter/AvroAdapterBenchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/adapter/AvroAdapterBenchmarks.java
index c07aeffafb10c..6032a79ecec77 100644
--- a/java/performance/src/test/java/org/apache/arrow/adapter/AvroAdapterBenchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/adapter/AvroAdapterBenchmarks.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.adapter.avro.AvroToArrow;
 import org.apache.arrow.adapter.avro.AvroToArrowConfig;
 import org.apache.arrow.adapter.avro.AvroToArrowConfigBuilder;
@@ -52,9 +50,7 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for avro adapter.
- */
+/** Benchmarks for avro adapter. */
 @State(Scope.Benchmark)
 public class AvroAdapterBenchmarks {
 
@@ -65,21 +61,25 @@ public class AvroAdapterBenchmarks {
   private Schema schema;
   private BinaryDecoder decoder;
 
-  /**
-   * Setup benchmarks.
-   */
+  /** Setup benchmarks. */
   @Setup
   public void prepare() throws Exception {
     BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
     config = new AvroToArrowConfigBuilder(allocator).build();
 
-    String schemaStr = "{\n" + " \"namespace\": \"org.apache.arrow.avro\",\n" +
-         " \"type\": \"record\",\n" + " \"name\": \"testBenchmark\",\n" + " \"fields\": [\n" +
-         "    {\"name\": \"f0\", \"type\": \"string\"},\n" +
-         "    {\"name\": \"f1\", \"type\": \"int\"},\n" +
-         "    {\"name\": \"f2\", \"type\": \"long\"},\n" +
-         "    {\"name\": \"f3\", \"type\": \"boolean\"},\n" +
-         "    {\"name\": \"f4\", \"type\": \"float\"}\n" + "  ]\n" + "}";
+    String schemaStr =
+        "{\n"
+            + " \"namespace\": \"org.apache.arrow.avro\",\n"
+            + " \"type\": \"record\",\n"
+            + " \"name\": \"testBenchmark\",\n"
+            + " \"fields\": [\n"
+            + "    {\"name\": \"f0\", \"type\": \"string\"},\n"
+            + "    {\"name\": \"f1\", \"type\": \"int\"},\n"
+            + "    {\"name\": \"f2\", \"type\": \"long\"},\n"
+            + "    {\"name\": \"f3\", \"type\": \"boolean\"},\n"
+            + "    {\"name\": \"f4\", \"type\": \"float\"}\n"
+            + "  ]\n"
+            + "}";
     schema = new Schema.Parser().parse(schemaStr);
 
     ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -96,12 +96,11 @@ public void prepare() throws Exception {
       writer.write(record, encoder);
     }
 
-    decoder = new DecoderFactory().directBinaryDecoder(new ByteArrayInputStream(out.toByteArray()), null);
+    decoder =
+        new DecoderFactory().directBinaryDecoder(new ByteArrayInputStream(out.toByteArray()), null);
   }
 
-  /**
-   * Tear down benchmarks.
-   */
+  /** Tear down benchmarks. */
   @TearDown
   public void tearDown() {
     config.getAllocator().close();
@@ -109,6 +108,7 @@ public void tearDown() {
 
   /**
    * Test {@link AvroToArrow#avroToArrowIterator(Schema, Decoder, AvroToArrowConfig)}.
+   *
    * @return useless. To avoid DCE by JIT.
    */
   @Benchmark
@@ -117,7 +117,8 @@ public void tearDown() {
   public int testAvroToArrow() throws Exception {
     decoder.inputStream().reset();
     int sum = 0;
-    try (AvroToArrowVectorIterator iter = AvroToArrow.avroToArrowIterator(schema, decoder, config)) {
+    try (AvroToArrowVectorIterator iter =
+        AvroToArrow.avroToArrowIterator(schema, decoder, config)) {
       while (iter.hasNext()) {
         VectorSchemaRoot root = iter.next();
         IntVector intVector = (IntVector) root.getVector("f1");
@@ -131,10 +132,8 @@ public int testAvroToArrow() throws Exception {
   }
 
   public static void main(String[] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
-        .include(AvroAdapterBenchmarks.class.getSimpleName())
-        .forks(1)
-        .build();
+    Options opt =
+        new OptionsBuilder().include(AvroAdapterBenchmarks.class.getSimpleName()).forks(1).build();
 
     new Runner(opt).run();
   }
diff --git a/java/performance/src/test/java/org/apache/arrow/adapter/jdbc/JdbcAdapterBenchmarks.java b/java/performance/src/main/java/org/apache/arrow/adapter/jdbc/JdbcAdapterBenchmarks.java
similarity index 90%
rename from java/performance/src/test/java/org/apache/arrow/adapter/jdbc/JdbcAdapterBenchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/adapter/jdbc/JdbcAdapterBenchmarks.java
index fd3940b4c872c..a2eb9674e4d37 100644
--- a/java/performance/src/test/java/org/apache/arrow/adapter/jdbc/JdbcAdapterBenchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/adapter/jdbc/JdbcAdapterBenchmarks.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.adapter.jdbc;
 
 import java.sql.Connection;
@@ -23,7 +22,6 @@
 import java.sql.ResultSet;
 import java.sql.Statement;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.adapter.jdbc.consumer.BigIntConsumer;
 import org.apache.arrow.adapter.jdbc.consumer.BitConsumer;
 import org.apache.arrow.adapter.jdbc.consumer.IntConsumer;
@@ -50,26 +48,23 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for Jdbc adapter.
- */
+/** Benchmarks for Jdbc adapter. */
 public class JdbcAdapterBenchmarks {
+  // checkstyle:off: MissingJavadocMethod
 
   private static final int VALUE_COUNT = 3000;
 
   private static final String CREATE_STATEMENT =
-          "CREATE TABLE test_table (f0 INT, f1 LONG, f2 VARCHAR, f3 BOOLEAN);";
+      "CREATE TABLE test_table (f0 INT, f1 LONG, f2 VARCHAR, f3 BOOLEAN);";
   private static final String INSERT_STATEMENT =
-          "INSERT INTO test_table (f0, f1, f2, f3) VALUES (?, ?, ?, ?);";
+      "INSERT INTO test_table (f0, f1, f2, f3) VALUES (?, ?, ?, ?);";
   private static final String QUERY = "SELECT f0, f1, f2, f3 FROM test_table;";
   private static final String DROP_STATEMENT = "DROP TABLE test_table;";
 
   private static final String URL = "jdbc:h2:mem:JdbcAdapterBenchmarks";
   private static final String DRIVER = "org.h2.Driver";
 
-  /**
-   * State object for the jdbc e2e benchmark.
-   */
+  /** State object for the jdbc e2e benchmark. */
   @State(Scope.Benchmark)
   public static class JdbcState {
 
@@ -86,7 +81,8 @@ public static class JdbcState {
     @Setup(Level.Trial)
     public void prepareState() throws Exception {
       allocator = new RootAllocator(Integer.MAX_VALUE);
-      config = new JdbcToArrowConfigBuilder().setAllocator(allocator).setTargetBatchSize(1024).build();
+      config =
+          new JdbcToArrowConfigBuilder().setAllocator(allocator).setTargetBatchSize(1024).build();
       Class.forName(DRIVER);
       conn = DriverManager.getConnection(URL);
 
@@ -128,9 +124,7 @@ public void tearDownState() throws Exception {
     }
   }
 
-  /**
-   * State object for the consume benchmark.
-   */
+  /** State object for the consume benchmark. */
   @State(Scope.Benchmark)
   public static class ConsumeState {
 
@@ -165,7 +159,8 @@ public static class ConsumeState {
     @Setup(Level.Trial)
     public void prepare() throws Exception {
       allocator = new RootAllocator(Integer.MAX_VALUE);
-      config = new JdbcToArrowConfigBuilder().setAllocator(allocator).setTargetBatchSize(1024).build();
+      config =
+          new JdbcToArrowConfigBuilder().setAllocator(allocator).setTargetBatchSize(1024).build();
 
       Class.forName(DRIVER);
       conn = DriverManager.getConnection(URL);
@@ -232,9 +227,7 @@ public void tearDown() throws Exception {
     }
   }
 
-  /**
-   * State object for the jdbc row consume benchmark.
-   */
+  /** State object for the jdbc row consume benchmark. */
   @State(Scope.Benchmark)
   public static class RowConsumeState {
 
@@ -255,7 +248,11 @@ public static class RowConsumeState {
     @Setup(Level.Trial)
     public void prepareState() throws Exception {
       allocator = new RootAllocator(Integer.MAX_VALUE);
-      config = new JdbcToArrowConfigBuilder().setAllocator(allocator).setTargetBatchSize(VALUE_COUNT).build();
+      config =
+          new JdbcToArrowConfigBuilder()
+              .setAllocator(allocator)
+              .setTargetBatchSize(VALUE_COUNT)
+              .build();
       Class.forName(DRIVER);
       conn = DriverManager.getConnection(URL);
 
@@ -304,6 +301,7 @@ public void tearDownState() throws Exception {
 
   /**
    * Test {@link JdbcToArrow#sqlToArrowVectorIterator(ResultSet, JdbcToArrowConfig)}.
+   *
    * @return useless. To avoid DCE by JIT.
    */
   @Benchmark
@@ -311,7 +309,8 @@ public void tearDownState() throws Exception {
   @OutputTimeUnit(TimeUnit.MICROSECONDS)
   public int testJdbcToArrow(JdbcState state) throws Exception {
     int valueCount = 0;
-    try (ArrowVectorIterator iter = JdbcToArrow.sqlToArrowVectorIterator(state.resultSet, state.config)) {
+    try (ArrowVectorIterator iter =
+        JdbcToArrow.sqlToArrowVectorIterator(state.resultSet, state.config)) {
       while (iter.hasNext()) {
         VectorSchemaRoot root = iter.next();
         IntVector intVector = (IntVector) root.getFieldVectors().get(0);
@@ -348,12 +347,10 @@ public void consumeRowsBenchmark(RowConsumeState state) throws Exception {
   }
 
   public static void main(String[] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
-        .include(JdbcAdapterBenchmarks.class.getSimpleName())
-        .forks(1)
-        .build();
+    Options opt =
+        new OptionsBuilder().include(JdbcAdapterBenchmarks.class.getSimpleName()).forks(1).build();
 
     new Runner(opt).run();
   }
+  // checkstyle:on: MissingJavadocMethod
 }
-
diff --git a/java/performance/src/test/java/org/apache/arrow/algorithm/search/ParallelSearcherBenchmarks.java b/java/performance/src/main/java/org/apache/arrow/algorithm/search/ParallelSearcherBenchmarks.java
similarity index 94%
rename from java/performance/src/test/java/org/apache/arrow/algorithm/search/ParallelSearcherBenchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/algorithm/search/ParallelSearcherBenchmarks.java
index 1c3af77e73a05..83d555560d372 100644
--- a/java/performance/src/test/java/org/apache/arrow/algorithm/search/ParallelSearcherBenchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/algorithm/search/ParallelSearcherBenchmarks.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.algorithm.search;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
@@ -39,16 +37,13 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for {@link ParallelSearcher}.
- */
+/** Benchmarks for {@link ParallelSearcher}. */
 public class ParallelSearcherBenchmarks {
+  // checkstyle:off: MissingJavadocMethod
 
   private static final int VECTOR_LENGTH = 1024 * 1024;
 
-  /**
-   * State object for the benchmarks.
-   */
+  /** State object for the benchmarks. */
   @State(Scope.Benchmark)
   public static class SearchState {
 
@@ -105,11 +100,13 @@ public void searchBenchmark(SearchState state) throws Exception {
   }
 
   public static void main(String[] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
+    Options opt =
+        new OptionsBuilder()
             .include(ParallelSearcherBenchmarks.class.getSimpleName())
             .forks(1)
             .build();
 
     new Runner(opt).run();
   }
+  // checkstyle:on: MissingJavadocMethod
 }
diff --git a/java/performance/src/test/java/org/apache/arrow/memory/AllocatorBenchmarks.java b/java/performance/src/main/java/org/apache/arrow/memory/AllocatorBenchmarks.java
similarity index 84%
rename from java/performance/src/test/java/org/apache/arrow/memory/AllocatorBenchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/memory/AllocatorBenchmarks.java
index 88fcf73f0303b..f275090aae6bf 100644
--- a/java/performance/src/test/java/org/apache/arrow/memory/AllocatorBenchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/memory/AllocatorBenchmarks.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 import java.util.concurrent.TimeUnit;
-
-import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.rounding.RoundingPolicy;
 import org.apache.arrow.memory.rounding.SegmentRoundingPolicy;
 import org.openjdk.jmh.annotations.Benchmark;
@@ -31,14 +28,10 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for allocators.
- */
+/** Benchmarks for allocators. */
 public class AllocatorBenchmarks {
 
-  /**
-   * Benchmark for the default allocator.
-   */
+  /** Benchmark for the default allocator. */
   @Benchmark
   @BenchmarkMode(Mode.AverageTime)
   @OutputTimeUnit(TimeUnit.MICROSECONDS)
@@ -59,9 +52,7 @@ public void defaultAllocatorBenchmark() {
     }
   }
 
-  /**
-   * Benchmark for allocator with segment rounding policy.
-   */
+  /** Benchmark for allocator with segment rounding policy. */
   @Benchmark
   @BenchmarkMode(Mode.AverageTime)
   @OutputTimeUnit(TimeUnit.MICROSECONDS)
@@ -71,7 +62,8 @@ public void segmentRoundingPolicyBenchmark() {
     final int segmentSize = 1024;
 
     RoundingPolicy policy = new SegmentRoundingPolicy(segmentSize);
-    try (RootAllocator allocator = new RootAllocator(AllocationListener.NOOP, bufferSize * numBuffers, policy)) {
+    try (RootAllocator allocator =
+        new RootAllocator(AllocationListener.NOOP, bufferSize * numBuffers, policy)) {
       ArrowBuf[] buffers = new ArrowBuf[numBuffers];
 
       for (int i = 0; i < numBuffers; i++) {
@@ -85,10 +77,8 @@ public void segmentRoundingPolicyBenchmark() {
   }
 
   public static void main(String[] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
-            .include(AllocatorBenchmarks.class.getSimpleName())
-            .forks(1)
-            .build();
+    Options opt =
+        new OptionsBuilder().include(AllocatorBenchmarks.class.getSimpleName()).forks(1).build();
 
     new Runner(opt).run();
   }
diff --git a/java/performance/src/test/java/org/apache/arrow/memory/ArrowBufBenchmarks.java b/java/performance/src/main/java/org/apache/arrow/memory/ArrowBufBenchmarks.java
similarity index 90%
rename from java/performance/src/test/java/org/apache/arrow/memory/ArrowBufBenchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/memory/ArrowBufBenchmarks.java
index ef4da582829bd..8aaee28e77417 100644
--- a/java/performance/src/test/java/org/apache/arrow/memory/ArrowBufBenchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/memory/ArrowBufBenchmarks.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory;
 
 import java.util.concurrent.TimeUnit;
-
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Mode;
@@ -32,9 +30,7 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for {@link ArrowBuf}.
- */
+/** Benchmarks for {@link ArrowBuf}. */
 @State(Scope.Benchmark)
 public class ArrowBufBenchmarks {
 
@@ -46,18 +42,14 @@ public class ArrowBufBenchmarks {
 
   private ArrowBuf buffer;
 
-  /**
-   * Setup benchmarks.
-   */
+  /** Setup benchmarks. */
   @Setup
   public void prepare() {
     allocator = new RootAllocator(ALLOCATOR_CAPACITY);
     buffer = allocator.buffer(BUFFER_CAPACITY);
   }
 
-  /**
-   * Tear down benchmarks.
-   */
+  /** Tear down benchmarks. */
   @TearDown
   public void tearDown() {
     buffer.close();
@@ -72,10 +64,8 @@ public void setZero() {
   }
 
   public static void main(String[] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
-            .include(ArrowBufBenchmarks.class.getSimpleName())
-            .forks(1)
-            .build();
+    Options opt =
+        new OptionsBuilder().include(ArrowBufBenchmarks.class.getSimpleName()).forks(1).build();
 
     new Runner(opt).run();
   }
diff --git a/java/performance/src/test/java/org/apache/arrow/memory/util/ArrowBufPointerBenchmarks.java b/java/performance/src/main/java/org/apache/arrow/memory/util/ArrowBufPointerBenchmarks.java
similarity index 94%
rename from java/performance/src/test/java/org/apache/arrow/memory/util/ArrowBufPointerBenchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/memory/util/ArrowBufPointerBenchmarks.java
index 8e2c9cc51a346..3d82b46b094c6 100644
--- a/java/performance/src/test/java/org/apache/arrow/memory/util/ArrowBufPointerBenchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/memory/util/ArrowBufPointerBenchmarks.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util;
 
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -35,9 +33,7 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for {@link ArrowBufPointer}.
- */
+/** Benchmarks for {@link ArrowBufPointer}. */
 @State(Scope.Benchmark)
 public class ArrowBufPointerBenchmarks {
 
@@ -55,9 +51,7 @@ public class ArrowBufPointerBenchmarks {
 
   private ArrowBufPointer pointer2;
 
-  /**
-   * Setup benchmarks.
-   */
+  /** Setup benchmarks. */
   @Setup
   public void prepare() {
     allocator = new RootAllocator(ALLOCATOR_CAPACITY);
@@ -77,9 +71,7 @@ public void prepare() {
     pointer2 = new ArrowBufPointer(buffer2, 0, BUFFER_CAPACITY);
   }
 
-  /**
-   * Tear down benchmarks.
-   */
+  /** Tear down benchmarks. */
   @TearDown
   public void tearDown() {
     buffer1.close();
@@ -95,7 +87,8 @@ public int compareBenchmark() {
   }
 
   public static void main(String[] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
+    Options opt =
+        new OptionsBuilder()
             .include(ArrowBufPointerBenchmarks.class.getSimpleName())
             .forks(1)
             .build();
@@ -103,5 +96,3 @@ public static void main(String[] args) throws RunnerException {
     new Runner(opt).run();
   }
 }
-
-
diff --git a/java/performance/src/test/java/org/apache/arrow/memory/util/ByteFunctionHelpersBenchmarks.java b/java/performance/src/main/java/org/apache/arrow/memory/util/ByteFunctionHelpersBenchmarks.java
similarity index 81%
rename from java/performance/src/test/java/org/apache/arrow/memory/util/ByteFunctionHelpersBenchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/memory/util/ByteFunctionHelpersBenchmarks.java
index 4d0dfcb5da80d..c5f1036d69127 100644
--- a/java/performance/src/test/java/org/apache/arrow/memory/util/ByteFunctionHelpersBenchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/memory/util/ByteFunctionHelpersBenchmarks.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.memory.util;
 
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -36,19 +34,18 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for {@link ByteFunctionHelpers}.
- */
+/** Benchmarks for {@link ByteFunctionHelpers}. */
 public class ByteFunctionHelpersBenchmarks {
 
   private static final int ALLOCATOR_CAPACITY = 1024 * 1024;
 
   /**
-   * State object for the {@link ByteFunctionHelpersBenchmarks#arrowBufEquals(ArrowEqualState)} benchmark.
+   * State object for the {@link ByteFunctionHelpersBenchmarks#arrowBufEquals(ArrowEqualState)}
+   * benchmark.
    */
   @State(Scope.Benchmark)
   public static class ArrowEqualState {
-
+    // checkstyle:off: MissingJavadocMethod
     private static final int BUFFER_CAPACITY = 7;
 
     private BufferAllocator allocator;
@@ -81,12 +78,18 @@ public void tearDown() {
   @BenchmarkMode(Mode.AverageTime)
   @OutputTimeUnit(TimeUnit.NANOSECONDS)
   public void arrowBufEquals(ArrowEqualState state) {
-    ByteFunctionHelpers.equal(state.buffer1, 0, ArrowEqualState.BUFFER_CAPACITY - 1,
-            state.buffer2, 0, ArrowEqualState.BUFFER_CAPACITY - 1);
+    ByteFunctionHelpers.equal(
+        state.buffer1,
+        0,
+        ArrowEqualState.BUFFER_CAPACITY - 1,
+        state.buffer2,
+        0,
+        ArrowEqualState.BUFFER_CAPACITY - 1);
   }
 
   /**
-   * State object for the {@link ByteFunctionHelpersBenchmarks#arrowBufArrayEquals(ArrowArrayEqualState)} benchmark.
+   * State object for the {@link
+   * ByteFunctionHelpersBenchmarks#arrowBufArrayEquals(ArrowArrayEqualState)} benchmark.
    */
   @State(Scope.Benchmark)
   public static class ArrowArrayEqualState {
@@ -123,16 +126,22 @@ public void tearDown() {
   @OutputTimeUnit(TimeUnit.NANOSECONDS)
   public int arrowBufArrayEquals(ArrowArrayEqualState state) {
     return ByteFunctionHelpers.compare(
-            state.buffer1, 0, ArrowArrayEqualState.BUFFER_CAPACITY,
-            state.buffer2, 0, ArrowArrayEqualState.BUFFER_CAPACITY);
+        state.buffer1,
+        0,
+        ArrowArrayEqualState.BUFFER_CAPACITY,
+        state.buffer2,
+        0,
+        ArrowArrayEqualState.BUFFER_CAPACITY);
   }
 
   public static void main(String[] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
-        .include(ByteFunctionHelpersBenchmarks.class.getSimpleName())
-        .forks(1)
-        .build();
+    Options opt =
+        new OptionsBuilder()
+            .include(ByteFunctionHelpersBenchmarks.class.getSimpleName())
+            .forks(1)
+            .build();
 
     new Runner(opt).run();
   }
+  // checkstyle:on: MissingJavadocMethod
 }
diff --git a/java/performance/src/test/java/org/apache/arrow/vector/BaseValueVectorBenchmarks.java b/java/performance/src/main/java/org/apache/arrow/vector/BaseValueVectorBenchmarks.java
similarity index 88%
rename from java/performance/src/test/java/org/apache/arrow/vector/BaseValueVectorBenchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/vector/BaseValueVectorBenchmarks.java
index 5d6441cd5a747..bd53b13823622 100644
--- a/java/performance/src/test/java/org/apache/arrow/vector/BaseValueVectorBenchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/vector/BaseValueVectorBenchmarks.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.openjdk.jmh.annotations.Benchmark;
@@ -34,9 +32,7 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for {@link BaseValueVector}.
- */
+/** Benchmarks for {@link BaseValueVector}. */
 @State(Scope.Benchmark)
 public class BaseValueVectorBenchmarks {
 
@@ -48,9 +44,7 @@ public class BaseValueVectorBenchmarks {
 
   private IntVector vector;
 
-  /**
-   * Setup benchmarks.
-   */
+  /** Setup benchmarks. */
   @Setup
   public void prepare() {
     allocator = new RootAllocator(ALLOCATOR_CAPACITY);
@@ -58,9 +52,7 @@ public void prepare() {
     vector.allocateNew(VECTOR_LENGTH);
   }
 
-  /**
-   * Tear down benchmarks.
-   */
+  /** Tear down benchmarks. */
   @TearDown
   public void tearDown() {
     vector.close();
@@ -69,6 +61,7 @@ public void tearDown() {
 
   /**
    * Test {@link BaseValueVector#computeCombinedBufferSize(int, int)}.
+   *
    * @return useless. To avoid DCE by JIT.
    */
   @Benchmark
@@ -82,14 +75,13 @@ public int testComputeCombinedBufferSize() {
     return totalSize;
   }
 
-  public static void main(String [] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
-        .include(BaseValueVectorBenchmarks.class.getSimpleName())
-        .forks(1)
-        .build();
+  public static void main(String[] args) throws RunnerException {
+    Options opt =
+        new OptionsBuilder()
+            .include(BaseValueVectorBenchmarks.class.getSimpleName())
+            .forks(1)
+            .build();
 
     new Runner(opt).run();
   }
-
-
 }
diff --git a/java/performance/src/test/java/org/apache/arrow/vector/BitVectorHelperBenchmarks.java b/java/performance/src/main/java/org/apache/arrow/vector/BitVectorHelperBenchmarks.java
similarity index 84%
rename from java/performance/src/test/java/org/apache/arrow/vector/BitVectorHelperBenchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/vector/BitVectorHelperBenchmarks.java
index 5f6e5ca28fbab..f794efe91b88b 100644
--- a/java/performance/src/test/java/org/apache/arrow/vector/BitVectorHelperBenchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/vector/BitVectorHelperBenchmarks.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -37,14 +35,11 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for {@link BitVectorHelper}.
- */
+/** Benchmarks for {@link BitVectorHelper}. */
 public class BitVectorHelperBenchmarks {
+  // checkstyle:off: MissingJavadocMethod
 
-  /**
-   * State object for general benchmarks.
-   */
+  /** State object for general benchmarks. */
   @State(Scope.Benchmark)
   public static class BenchmarkState {
 
@@ -58,9 +53,7 @@ public static class BenchmarkState {
 
     private ArrowBuf oneBitValidityBuffer;
 
-    /**
-     * Setup benchmarks.
-     */
+    /** Setup benchmarks. */
     @Setup(Level.Trial)
     public void prepare() {
       allocator = new RootAllocator(ALLOCATOR_CAPACITY);
@@ -80,9 +73,7 @@ public void prepare() {
       BitVectorHelper.setBit(oneBitValidityBuffer, VALIDITY_BUFFER_CAPACITY / 2);
     }
 
-    /**
-     * Tear down benchmarks.
-     */
+    /** Tear down benchmarks. */
     @TearDown(Level.Trial)
     public void tearDown() {
       validityBuffer.close();
@@ -95,7 +86,8 @@ public void tearDown() {
   @BenchmarkMode(Mode.AverageTime)
   @OutputTimeUnit(TimeUnit.NANOSECONDS)
   public int getNullCountBenchmark(BenchmarkState state) {
-    return BitVectorHelper.getNullCount(state.validityBuffer, BenchmarkState.VALIDITY_BUFFER_CAPACITY);
+    return BitVectorHelper.getNullCount(
+        state.validityBuffer, BenchmarkState.VALIDITY_BUFFER_CAPACITY);
   }
 
   @Benchmark
@@ -103,12 +95,10 @@ public int getNullCountBenchmark(BenchmarkState state) {
   @OutputTimeUnit(TimeUnit.NANOSECONDS)
   public boolean allBitsNullBenchmark(BenchmarkState state) {
     return BitVectorHelper.checkAllBitsEqualTo(
-            state.oneBitValidityBuffer, BenchmarkState.VALIDITY_BUFFER_CAPACITY, true);
+        state.oneBitValidityBuffer, BenchmarkState.VALIDITY_BUFFER_CAPACITY, true);
   }
 
-  /**
-   * State object for {@link #loadValidityBufferAllOne(NonNullableValidityBufferState)}..
-   */
+  /** State object for {@link #loadValidityBufferAllOne(NonNullableValidityBufferState)}.. */
   @State(Scope.Benchmark)
   public static class NonNullableValidityBufferState {
 
@@ -124,9 +114,7 @@ public static class NonNullableValidityBufferState {
 
     private ArrowFieldNode fieldNode;
 
-    /**
-     * Setup benchmarks.
-     */
+    /** Setup benchmarks. */
     @Setup(Level.Trial)
     public void prepare() {
       allocator = new RootAllocator(ALLOCATOR_CAPACITY);
@@ -144,9 +132,7 @@ public void tearDownInvoke() {
       loadResult.close();
     }
 
-    /**
-     * Tear down benchmarks.
-     */
+    /** Tear down benchmarks. */
     @TearDown(Level.Trial)
     public void tearDown() {
       validityBuffer.close();
@@ -155,19 +141,18 @@ public void tearDown() {
   }
 
   /**
-   * Benchmark for {@link BitVectorHelper#loadValidityBuffer(ArrowFieldNode, ArrowBuf, BufferAllocator)}
-   * when all elements are not null.
+   * Benchmark for {@link BitVectorHelper#loadValidityBuffer(ArrowFieldNode, ArrowBuf,
+   * BufferAllocator)} when all elements are not null.
    */
   @Benchmark
   @BenchmarkMode(Mode.AverageTime)
   @OutputTimeUnit(TimeUnit.NANOSECONDS)
   public void loadValidityBufferAllOne(NonNullableValidityBufferState state) {
-    state.loadResult = BitVectorHelper.loadValidityBuffer(state.fieldNode, state.validityBuffer, state.allocator);
+    state.loadResult =
+        BitVectorHelper.loadValidityBuffer(state.fieldNode, state.validityBuffer, state.allocator);
   }
 
-  /**
-   * State object for {@link #setValidityBitBenchmark(ClearBitStateState)}.
-   */
+  /** State object for {@link #setValidityBitBenchmark(ClearBitStateState)}. */
   @State(Scope.Benchmark)
   public static class ClearBitStateState {
 
@@ -181,18 +166,14 @@ public static class ClearBitStateState {
 
     private int bitToSet = 0;
 
-    /**
-     * Setup benchmarks.
-     */
+    /** Setup benchmarks. */
     @Setup(Level.Trial)
     public void prepare() {
       allocator = new RootAllocator(ALLOCATOR_CAPACITY);
       validityBuffer = allocator.buffer(VALIDITY_BUFFER_CAPACITY / 8);
     }
 
-    /**
-     * Tear down benchmarks.
-     */
+    /** Tear down benchmarks. */
     @TearDown(Level.Trial)
     public void tearDown() {
       validityBuffer.close();
@@ -218,12 +199,14 @@ public void setValidityBitToZeroBenchmark(ClearBitStateState state) {
     }
   }
 
-  public static void main(String [] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
+  public static void main(String[] args) throws RunnerException {
+    Options opt =
+        new OptionsBuilder()
             .include(BitVectorHelperBenchmarks.class.getSimpleName())
             .forks(1)
             .build();
 
     new Runner(opt).run();
   }
+  // checkstyle:on: MissingJavadocMethod
 }
diff --git a/java/performance/src/test/java/org/apache/arrow/vector/DecimalVectorBenchmarks.java b/java/performance/src/main/java/org/apache/arrow/vector/DecimalVectorBenchmarks.java
similarity index 86%
rename from java/performance/src/test/java/org/apache/arrow/vector/DecimalVectorBenchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/vector/DecimalVectorBenchmarks.java
index 72f5659907af0..6cb54bc62a3a6 100644
--- a/java/performance/src/test/java/org/apache/arrow/vector/DecimalVectorBenchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/vector/DecimalVectorBenchmarks.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import java.math.BigDecimal;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -36,9 +34,7 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for {@link DecimalVector}.
- */
+/** Benchmarks for {@link DecimalVector}. */
 @State(Scope.Benchmark)
 public class DecimalVectorBenchmarks {
 
@@ -54,9 +50,7 @@ public class DecimalVectorBenchmarks {
 
   byte[] fromByteArray;
 
-  /**
-   * Setup benchmarks.
-   */
+  /** Setup benchmarks. */
   @Setup
   public void prepare() {
     allocator = new RootAllocator(ALLOCATOR_CAPACITY);
@@ -73,9 +67,7 @@ public void prepare() {
     fromBuf.getBytes(0, fromByteArray);
   }
 
-  /**
-   * Tear down benchmarks.
-   */
+  /** Tear down benchmarks. */
   @TearDown
   public void tearDown() {
     fromBuf.close();
@@ -83,9 +75,7 @@ public void tearDown() {
     allocator.close();
   }
 
-  /**
-   * Test writing on {@link DecimalVector} from arrow buf.
-   */
+  /** Test writing on {@link DecimalVector} from arrow buf. */
   @Benchmark
   @BenchmarkMode(Mode.AverageTime)
   @OutputTimeUnit(TimeUnit.MICROSECONDS)
@@ -98,9 +88,7 @@ public void setBigEndianArrowBufBenchmark() {
     }
   }
 
-  /**
-   * Test writing on {@link DecimalVector} from byte array.
-   */
+  /** Test writing on {@link DecimalVector} from byte array. */
   @Benchmark
   @BenchmarkMode(Mode.AverageTime)
   @OutputTimeUnit(TimeUnit.MICROSECONDS)
@@ -110,11 +98,12 @@ public void setBigEndianByteArrayBenchmark() {
     }
   }
 
-  public static void main(String [] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
-        .include(DecimalVectorBenchmarks.class.getSimpleName())
-        .forks(1)
-        .build();
+  public static void main(String[] args) throws RunnerException {
+    Options opt =
+        new OptionsBuilder()
+            .include(DecimalVectorBenchmarks.class.getSimpleName())
+            .forks(1)
+            .build();
 
     new Runner(opt).run();
   }
diff --git a/java/performance/src/test/java/org/apache/arrow/vector/Float8Benchmarks.java b/java/performance/src/main/java/org/apache/arrow/vector/Float8Benchmarks.java
similarity index 81%
rename from java/performance/src/test/java/org/apache/arrow/vector/Float8Benchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/vector/Float8Benchmarks.java
index 874e0d9f82ee7..f2b6a134bdb57 100644
--- a/java/performance/src/test/java/org/apache/arrow/vector/Float8Benchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/vector/Float8Benchmarks.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.memory.BoundsChecking;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -35,11 +33,10 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for {@link Float8Vector}.
- */
+/** Benchmarks for {@link Float8Vector}. */
 @State(Scope.Benchmark)
 public class Float8Benchmarks {
+  // checkstyle:off: MissingJavadocMethod
 
   private static final int VECTOR_LENGTH = 1024;
 
@@ -51,9 +48,7 @@ public class Float8Benchmarks {
 
   private Float8Vector fromVector;
 
-  /**
-   * Setup benchmarks.
-   */
+  /** Setup benchmarks. */
   @Setup
   public void prepare() {
     allocator = new RootAllocator(ALLOCATOR_CAPACITY);
@@ -73,9 +68,7 @@ public void prepare() {
     fromVector.setValueCount(VECTOR_LENGTH);
   }
 
-  /**
-   * Tear down benchmarks.
-   */
+  /** Tear down benchmarks. */
   @TearDown
   public void tearDown() {
     vector.close();
@@ -84,10 +77,11 @@ public void tearDown() {
   }
 
   /**
-   * Test reading/writing on {@link Float8Vector}.
-   * The performance of this benchmark is influenced by the states of two flags:
-   * 1. The flag for boundary checking. For details, please see {@link BoundsChecking}.
-   * 2. The flag for null checking in get methods. For details, please see {@link NullCheckingForGet}.
+   * Test reading/writing on {@link Float8Vector}. The performance of this benchmark is influenced
+   * by the states of two flags: 1. The flag for boundary checking. For details, please see {@link
+   * BoundsChecking}. 2. The flag for null checking in get methods. For details, please see {@link
+   * NullCheckingForGet}.
+   *
    * @return useless. To avoid DCE by JIT.
    */
   @Benchmark
@@ -111,12 +105,11 @@ public void copyFromBenchmark() {
     }
   }
 
-  public static void main(String [] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
-            .include(Float8Benchmarks.class.getSimpleName())
-            .forks(1)
-            .build();
+  public static void main(String[] args) throws RunnerException {
+    Options opt =
+        new OptionsBuilder().include(Float8Benchmarks.class.getSimpleName()).forks(1).build();
 
     new Runner(opt).run();
   }
+  // checkstyle:on: MissingJavadocMethod
 }
diff --git a/java/performance/src/test/java/org/apache/arrow/vector/FloatingPointBenchmarks.java b/java/performance/src/main/java/org/apache/arrow/vector/FloatingPointBenchmarks.java
similarity index 93%
rename from java/performance/src/test/java/org/apache/arrow/vector/FloatingPointBenchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/vector/FloatingPointBenchmarks.java
index 079672e9f2a98..a7e6789889277 100644
--- a/java/performance/src/test/java/org/apache/arrow/vector/FloatingPointBenchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/vector/FloatingPointBenchmarks.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.compare.ApproxEqualsVisitor;
@@ -36,11 +34,10 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for floating point vectors.
- */
+/** Benchmarks for floating point vectors. */
 @State(Scope.Benchmark)
 public class FloatingPointBenchmarks {
+  // checkstyle:off: MissingJavadocMethod
 
   private static final int VECTOR_LENGTH = 1024;
 
@@ -62,9 +59,7 @@ public class FloatingPointBenchmarks {
 
   private Range range;
 
-  /**
-   * Setup benchmarks.
-   */
+  /** Setup benchmarks. */
   @Setup
   public void prepare() {
     allocator = new RootAllocator(ALLOCATOR_CAPACITY);
@@ -101,9 +96,7 @@ public void prepare() {
     range = new Range(0, 0, VECTOR_LENGTH);
   }
 
-  /**
-   * Tear down benchmarks.
-   */
+  /** Tear down benchmarks. */
   @TearDown
   public void tearDown() {
     floatVector1.close();
@@ -122,13 +115,14 @@ public int approxEqualsBenchmark() {
     return (floatResult ? 1 : 0) + (doubleResult ? 1 : 0);
   }
 
-  public static void main(String [] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
+  public static void main(String[] args) throws RunnerException {
+    Options opt =
+        new OptionsBuilder()
             .include(FloatingPointBenchmarks.class.getSimpleName())
             .forks(1)
             .build();
 
     new Runner(opt).run();
   }
+  // checkstyle:on: MissingJavadocMethod
 }
-
diff --git a/java/performance/src/test/java/org/apache/arrow/vector/IntBenchmarks.java b/java/performance/src/main/java/org/apache/arrow/vector/IntBenchmarks.java
similarity index 91%
rename from java/performance/src/test/java/org/apache/arrow/vector/IntBenchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/vector/IntBenchmarks.java
index 036768d445e55..315f1f83ccdee 100644
--- a/java/performance/src/test/java/org/apache/arrow/vector/IntBenchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/vector/IntBenchmarks.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.complex.impl.IntWriterImpl;
@@ -36,11 +34,10 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for {@link IntVector}.
- */
+/** Benchmarks for {@link IntVector}. */
 @State(Scope.Benchmark)
 public class IntBenchmarks {
+  // checkstyle:off: MissingJavadocMethod
 
   private static final int VECTOR_LENGTH = 1024;
 
@@ -99,12 +96,11 @@ public void setWithWriter() {
     }
   }
 
-  public static void main(String [] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
-            .include(IntBenchmarks.class.getSimpleName())
-            .forks(1)
-            .build();
+  public static void main(String[] args) throws RunnerException {
+    Options opt =
+        new OptionsBuilder().include(IntBenchmarks.class.getSimpleName()).forks(1).build();
 
     new Runner(opt).run();
   }
+  // checkstyle:on: MissingJavadocMethod
 }
diff --git a/java/performance/src/test/java/org/apache/arrow/vector/VarCharBenchmarks.java b/java/performance/src/main/java/org/apache/arrow/vector/VarCharBenchmarks.java
similarity index 88%
rename from java/performance/src/test/java/org/apache/arrow/vector/VarCharBenchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/vector/VarCharBenchmarks.java
index 1ab4b7bc20dad..b3924a7dd9461 100644
--- a/java/performance/src/test/java/org/apache/arrow/vector/VarCharBenchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/vector/VarCharBenchmarks.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.openjdk.jmh.annotations.Benchmark;
@@ -34,11 +32,10 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for {@link VarCharVector}.
- */
+/** Benchmarks for {@link VarCharVector}. */
 @State(Scope.Benchmark)
 public class VarCharBenchmarks {
+  // checkstyle:off: MissingJavadocMethod
 
   private static final int VECTOR_LENGTH = 1024;
 
@@ -50,9 +47,7 @@ public class VarCharBenchmarks {
 
   private VarCharVector fromVector;
 
-  /**
-   * Setup benchmarks.
-   */
+  /** Setup benchmarks. */
   @Setup
   public void prepare() {
     allocator = new RootAllocator(ALLOCATOR_CAPACITY);
@@ -72,9 +67,7 @@ public void prepare() {
     fromVector.setValueCount(VECTOR_LENGTH);
   }
 
-  /**
-   * Tear down benchmarks.
-   */
+  /** Tear down benchmarks. */
   @TearDown
   public void tearDown() {
     vector.close();
@@ -91,12 +84,11 @@ public void copyFromBenchmark() {
     }
   }
 
-  public static void main(String [] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
-            .include(VarCharBenchmarks.class.getSimpleName())
-            .forks(1)
-            .build();
+  public static void main(String[] args) throws RunnerException {
+    Options opt =
+        new OptionsBuilder().include(VarCharBenchmarks.class.getSimpleName()).forks(1).build();
 
     new Runner(opt).run();
   }
+  // checkstyle:on: MissingJavadocMethod
 }
diff --git a/java/performance/src/test/java/org/apache/arrow/vector/VariableWidthVectorBenchmarks.java b/java/performance/src/main/java/org/apache/arrow/vector/VariableWidthVectorBenchmarks.java
similarity index 92%
rename from java/performance/src/test/java/org/apache/arrow/vector/VariableWidthVectorBenchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/vector/VariableWidthVectorBenchmarks.java
index 7eee981f13327..0bce6569d268f 100644
--- a/java/performance/src/test/java/org/apache/arrow/vector/VariableWidthVectorBenchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/vector/VariableWidthVectorBenchmarks.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -36,11 +34,10 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for {@link BaseVariableWidthVector}.
- */
+/** Benchmarks for {@link BaseVariableWidthVector}. */
 @State(Scope.Benchmark)
 public class VariableWidthVectorBenchmarks {
+  // checkstyle:off: MissingJavadocMethod
 
   private static final int VECTOR_CAPACITY = 16 * 1024;
 
@@ -55,9 +52,7 @@ public class VariableWidthVectorBenchmarks {
 
   private VarCharVector vector;
 
-  /**
-   * Setup benchmarks.
-   */
+  /** Setup benchmarks. */
   @Setup
   public void prepare() {
     allocator = new RootAllocator(ALLOCATOR_CAPACITY);
@@ -67,9 +62,7 @@ public void prepare() {
     arrowBuff.setBytes(0, bytes, 0, bytes.length);
   }
 
-  /**
-   * Tear down benchmarks.
-   */
+  /** Tear down benchmarks. */
   @TearDown
   public void tearDown() {
     arrowBuff.close();
@@ -79,6 +72,7 @@ public void tearDown() {
 
   /**
    * Test {@link BaseVariableWidthVector#getValueCapacity()}.
+   *
    * @return useless. To avoid DCE by JIT.
    */
   @Benchmark
@@ -118,13 +112,14 @@ public int setSafeFromNullableVarcharHolder() {
     return vector.getBufferSize();
   }
 
-
-  public static void main(String [] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
+  public static void main(String[] args) throws RunnerException {
+    Options opt =
+        new OptionsBuilder()
             .include(VariableWidthVectorBenchmarks.class.getSimpleName())
             .forks(1)
             .build();
 
     new Runner(opt).run();
   }
+  // checkstyle:on: MissingJavadocMethod
 }
diff --git a/java/performance/src/test/java/org/apache/arrow/vector/VectorLoaderBenchmark.java b/java/performance/src/main/java/org/apache/arrow/vector/VectorLoaderBenchmark.java
similarity index 89%
rename from java/performance/src/test/java/org/apache/arrow/vector/VectorLoaderBenchmark.java
rename to java/performance/src/main/java/org/apache/arrow/vector/VectorLoaderBenchmark.java
index 416d126419e56..85a4b33a4e5da 100644
--- a/java/performance/src/test/java/org/apache/arrow/vector/VectorLoaderBenchmark.java
+++ b/java/performance/src/main/java/org/apache/arrow/vector/VectorLoaderBenchmark.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
@@ -36,18 +34,15 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for {@link VectorLoader}.
- */
+/** Benchmarks for {@link VectorLoader}. */
 public class VectorLoaderBenchmark {
+  // checkstyle:off: MissingJavadocMethod
 
   private static final int ALLOCATOR_CAPACITY = 1024 * 1024;
 
   private static final int VECTOR_COUNT = 10;
 
-  /**
-   * State for vector load benchmark.
-   */
+  /** State for vector load benchmark. */
   @State(Scope.Benchmark)
   public static class LoadState {
 
@@ -61,9 +56,7 @@ public static class LoadState {
 
     private VectorLoader loader;
 
-    /**
-     * Setup benchmarks.
-     */
+    /** Setup benchmarks. */
     @Setup(Level.Trial)
     public void prepare() {
       allocator = new RootAllocator(ALLOCATOR_CAPACITY);
@@ -90,9 +83,7 @@ public void tearDownInvoke() {
       root.close();
     }
 
-    /**
-     * Tear down benchmarks.
-     */
+    /** Tear down benchmarks. */
     @TearDown(Level.Trial)
     public void tearDown() {
       allocator.close();
@@ -107,11 +98,10 @@ public void loadBenchmark(LoadState state) {
   }
 
   public static void main(String[] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
-            .include(VectorLoaderBenchmark.class.getSimpleName())
-            .forks(1)
-            .build();
+    Options opt =
+        new OptionsBuilder().include(VectorLoaderBenchmark.class.getSimpleName()).forks(1).build();
 
     new Runner(opt).run();
   }
+  // checkstyle:on: MissingJavadocMethod
 }
diff --git a/java/performance/src/test/java/org/apache/arrow/vector/VectorUnloaderBenchmark.java b/java/performance/src/main/java/org/apache/arrow/vector/VectorUnloaderBenchmark.java
similarity index 91%
rename from java/performance/src/test/java/org/apache/arrow/vector/VectorUnloaderBenchmark.java
rename to java/performance/src/main/java/org/apache/arrow/vector/VectorUnloaderBenchmark.java
index d125172450004..2f7edc6f8aa17 100644
--- a/java/performance/src/test/java/org/apache/arrow/vector/VectorUnloaderBenchmark.java
+++ b/java/performance/src/main/java/org/apache/arrow/vector/VectorUnloaderBenchmark.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
@@ -36,11 +34,10 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for {@link VectorUnloader}.
- */
+/** Benchmarks for {@link VectorUnloader}. */
 @State(Scope.Benchmark)
 public class VectorUnloaderBenchmark {
+  // checkstyle:off: MissingJavadocMethod
 
   private static final int ALLOCATOR_CAPACITY = 1024 * 1024;
 
@@ -48,15 +45,13 @@ public class VectorUnloaderBenchmark {
 
   private BufferAllocator allocator;
 
-  private VarCharVector [] vectors;
+  private VarCharVector[] vectors;
 
   private VectorUnloader unloader;
 
   private ArrowRecordBatch recordBatch;
 
-  /**
-   * Setup benchmarks.
-   */
+  /** Setup benchmarks. */
   @Setup(Level.Trial)
   public void prepare() {
     allocator = new RootAllocator(ALLOCATOR_CAPACITY);
@@ -83,9 +78,7 @@ public void tearDownInvoke() {
     }
   }
 
-  /**
-   * Tear down benchmarks.
-   */
+  /** Tear down benchmarks. */
   @TearDown(Level.Trial)
   public void tearDown() {
     allocator.close();
@@ -99,11 +92,13 @@ public void unloadBenchmark() {
   }
 
   public static void main(String[] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
+    Options opt =
+        new OptionsBuilder()
             .include(VectorUnloaderBenchmark.class.getSimpleName())
             .forks(1)
             .build();
 
     new Runner(opt).run();
   }
+  // checkstyle:on: MissingJavadocMethod
 }
diff --git a/java/performance/src/test/java/org/apache/arrow/vector/dictionary/DictionaryEncoderBenchmarks.java b/java/performance/src/main/java/org/apache/arrow/vector/dictionary/DictionaryEncoderBenchmarks.java
similarity index 91%
rename from java/performance/src/test/java/org/apache/arrow/vector/dictionary/DictionaryEncoderBenchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/vector/dictionary/DictionaryEncoderBenchmarks.java
index 6dd887a324350..c24399dbca388 100644
--- a/java/performance/src/test/java/org/apache/arrow/vector/dictionary/DictionaryEncoderBenchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/vector/dictionary/DictionaryEncoderBenchmarks.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.dictionary;
 
 import java.nio.charset.StandardCharsets;
@@ -22,7 +21,6 @@
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.ValueVector;
@@ -41,9 +39,7 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for {@link DictionaryEncoder}.
- */
+/** Benchmarks for {@link DictionaryEncoder}. */
 @State(Scope.Benchmark)
 public class DictionaryEncoderBenchmarks {
 
@@ -52,7 +48,6 @@ public class DictionaryEncoderBenchmarks {
   private static final int DATA_SIZE = 1000;
   private static final int KEY_SIZE = 100;
 
-
   private static final int KEY_LENGTH = 10;
 
   private List<String> keys = new ArrayList<>();
@@ -61,9 +56,7 @@ public class DictionaryEncoderBenchmarks {
 
   private VarCharVector dictionaryVector;
 
-  /**
-   * Setup benchmarks.
-   */
+  /** Setup benchmarks. */
   @Setup
   public void prepare() {
 
@@ -89,12 +82,9 @@ public void prepare() {
       byte[] value = keys.get(i).getBytes(StandardCharsets.UTF_8);
       dictionaryVector.setSafe(i, value, 0, value.length);
     }
-
   }
 
-  /**
-   * Tear down benchmarks.
-   */
+  /** Tear down benchmarks. */
   @TearDown
   public void tearDown() {
     vector.close();
@@ -105,13 +95,15 @@ public void tearDown() {
 
   /**
    * Test encode for {@link DictionaryEncoder}.
+   *
    * @return useless. To avoid DCE by JIT.
    */
   @Benchmark
   @BenchmarkMode(Mode.AverageTime)
   @OutputTimeUnit(TimeUnit.NANOSECONDS)
   public int testEncode() {
-    Dictionary dictionary = new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
+    Dictionary dictionary =
+        new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
     final ValueVector encoded = DictionaryEncoder.encode(vector, dictionary);
     encoded.close();
     return 0;
@@ -137,10 +129,11 @@ private String generateUniqueKey(int length) {
   }
 
   public static void main(String[] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
-        .include(DictionaryEncoderBenchmarks.class.getSimpleName())
-        .forks(1)
-        .build();
+    Options opt =
+        new OptionsBuilder()
+            .include(DictionaryEncoderBenchmarks.class.getSimpleName())
+            .forks(1)
+            .build();
 
     new Runner(opt).run();
   }
diff --git a/java/performance/src/test/java/org/apache/arrow/vector/ipc/WriteChannelBenchmark.java b/java/performance/src/main/java/org/apache/arrow/vector/ipc/WriteChannelBenchmark.java
similarity index 89%
rename from java/performance/src/test/java/org/apache/arrow/vector/ipc/WriteChannelBenchmark.java
rename to java/performance/src/main/java/org/apache/arrow/vector/ipc/WriteChannelBenchmark.java
index 7a2537cbb8820..4698d0acf0000 100644
--- a/java/performance/src/test/java/org/apache/arrow/vector/ipc/WriteChannelBenchmark.java
+++ b/java/performance/src/main/java/org/apache/arrow/vector/ipc/WriteChannelBenchmark.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.channels.Channels;
 import java.util.concurrent.TimeUnit;
-
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Level;
@@ -37,14 +35,11 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for {@link WriteChannel}.
- */
+/** Benchmarks for {@link WriteChannel}. */
 public class WriteChannelBenchmark {
+  // checkstyle:off: MissingJavadocMethod
 
-  /**
-   * State object for align benchmark.
-   */
+  /** State object for align benchmark. */
   @State(Scope.Benchmark)
   public static class AlignState {
 
@@ -77,11 +72,10 @@ public void alignBenchmark(AlignState state) throws IOException {
   }
 
   public static void main(String[] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
-        .include(WriteChannelBenchmark.class.getSimpleName())
-        .forks(1)
-        .build();
+    Options opt =
+        new OptionsBuilder().include(WriteChannelBenchmark.class.getSimpleName()).forks(1).build();
 
     new Runner(opt).run();
   }
+  // checkstyle:on: MissingJavadocMethod
 }
diff --git a/java/performance/src/test/java/org/apache/arrow/vector/ipc/message/ArrowRecordBatchBenchmarks.java b/java/performance/src/main/java/org/apache/arrow/vector/ipc/message/ArrowRecordBatchBenchmarks.java
similarity index 86%
rename from java/performance/src/test/java/org/apache/arrow/vector/ipc/message/ArrowRecordBatchBenchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/vector/ipc/message/ArrowRecordBatchBenchmarks.java
index c0882821e9cc4..9b2250ee72f17 100644
--- a/java/performance/src/test/java/org/apache/arrow/vector/ipc/message/ArrowRecordBatchBenchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/vector/ipc/message/ArrowRecordBatchBenchmarks.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc.message;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.VarCharVector;
@@ -37,11 +35,10 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for {@link ArrowRecordBatch}.
- */
+/** Benchmarks for {@link ArrowRecordBatch}. */
 @State(Scope.Benchmark)
 public class ArrowRecordBatchBenchmarks {
+  // checkstyle:off: MissingJavadocMethod
 
   private static final int VECTOR_CAPACITY = 16 * 1024;
 
@@ -55,9 +52,7 @@ public class ArrowRecordBatchBenchmarks {
 
   private List<ArrowFieldNode> nodes;
 
-  /**
-   * Setup benchmarks.
-   */
+  /** Setup benchmarks. */
   @Setup
   public void prepare() {
     allocator = new RootAllocator(ALLOCATOR_CAPACITY);
@@ -69,9 +64,7 @@ public void prepare() {
     nodes.add(new ArrowFieldNode(VECTOR_LENGTH, 0));
   }
 
-  /**
-   * Tear down benchmarks.
-   */
+  /** Tear down benchmarks. */
   @TearDown
   public void tearDown() {
     vector.close();
@@ -82,17 +75,20 @@ public void tearDown() {
   @BenchmarkMode(Mode.AverageTime)
   @OutputTimeUnit(TimeUnit.NANOSECONDS)
   public long createAndGetLength() {
-    try (ArrowRecordBatch batch = new ArrowRecordBatch(VECTOR_LENGTH, nodes, vector.getFieldBuffers())) {
+    try (ArrowRecordBatch batch =
+        new ArrowRecordBatch(VECTOR_LENGTH, nodes, vector.getFieldBuffers())) {
       return batch.computeBodyLength();
     }
   }
 
-  public static void main(String [] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
+  public static void main(String[] args) throws RunnerException {
+    Options opt =
+        new OptionsBuilder()
             .include(ArrowRecordBatchBenchmarks.class.getSimpleName())
             .forks(1)
             .build();
 
     new Runner(opt).run();
   }
+  // checkstyle:on: MissingJavadocMethod
 }
diff --git a/java/performance/src/test/java/org/apache/arrow/vector/util/TransferPairBenchmarks.java b/java/performance/src/main/java/org/apache/arrow/vector/util/TransferPairBenchmarks.java
similarity index 90%
rename from java/performance/src/test/java/org/apache/arrow/vector/util/TransferPairBenchmarks.java
rename to java/performance/src/main/java/org/apache/arrow/vector/util/TransferPairBenchmarks.java
index 5142f4bdb8d0d..bb68d1848a4e2 100644
--- a/java/performance/src/test/java/org/apache/arrow/vector/util/TransferPairBenchmarks.java
+++ b/java/performance/src/main/java/org/apache/arrow/vector/util/TransferPairBenchmarks.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
@@ -37,11 +35,10 @@
 import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
-/**
- * Benchmarks for {@link TransferPair}.
- */
+/** Benchmarks for {@link TransferPair}. */
 @State(Scope.Benchmark)
 public class TransferPairBenchmarks {
+  // checkstyle:off: MissingJavadocMethod
 
   private static final int VECTOR_LENGTH = 1024;
 
@@ -53,9 +50,7 @@ public class TransferPairBenchmarks {
 
   private VarCharVector varCharVector;
 
-  /**
-   * Setup benchmarks.
-   */
+  /** Setup benchmarks. */
   @Setup
   public void prepare() {
     allocator = new RootAllocator(ALLOCATOR_CAPACITY);
@@ -78,9 +73,7 @@ public void prepare() {
     varCharVector.setValueCount(VECTOR_LENGTH);
   }
 
-  /**
-   * Tear down benchmarks.
-   */
+  /** Tear down benchmarks. */
   @TearDown
   public void tearDown() {
     intVector.close();
@@ -112,12 +105,11 @@ public int splitAndTransferVarcharVector() {
     return 0;
   }
 
-  public static void main(String [] args) throws RunnerException {
-    Options opt = new OptionsBuilder()
-        .include(TransferPairBenchmarks.class.getSimpleName())
-        .forks(1)
-        .build();
+  public static void main(String[] args) throws RunnerException {
+    Options opt =
+        new OptionsBuilder().include(TransferPairBenchmarks.class.getSimpleName()).forks(1).build();
 
     new Runner(opt).run();
   }
+  // checkstyle:on: MissingJavadocMethod
 }
diff --git a/java/pom.xml b/java/pom.xml
index 850b4d0508539..ace7a1e1f173e 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -1,63 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>18</version>
+    <version>31</version>
   </parent>
 
   <groupId>org.apache.arrow</groupId>
   <artifactId>arrow-java-root</artifactId>
-  <version>16.0.0-SNAPSHOT</version>
+  <version>17.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Apache Arrow Java Root POM</name>
   <description>Apache Arrow is open source, in-memory columnar data structures and low-overhead messaging</description>
   <url>https://arrow.apache.org/</url>
 
-  <properties>
-    <target.gen.source.path>${project.build.directory}/generated-sources</target.gen.source.path>
-    <dep.junit.platform.version>1.9.0</dep.junit.platform.version>
-    <dep.junit.jupiter.version>5.10.2</dep.junit.jupiter.version>
-    <dep.slf4j.version>2.0.11</dep.slf4j.version>
-    <dep.guava-bom.version>33.0.0-jre</dep.guava-bom.version>
-    <dep.netty-bom.version>4.1.108.Final</dep.netty-bom.version>
-    <dep.grpc-bom.version>1.61.1</dep.grpc-bom.version>
-    <dep.protobuf-bom.version>3.23.1</dep.protobuf-bom.version>
-    <dep.jackson-bom.version>2.17.0</dep.jackson-bom.version>
-    <dep.hadoop.version>3.3.6</dep.hadoop.version>
-    <dep.fbs.version>23.5.26</dep.fbs.version>
-    <dep.avro.version>1.11.3</dep.avro.version>
-    <arrow.vector.classifier />
-    <forkCount>2</forkCount>
-    <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
-    <errorprone.javac.version>9+181-r4173-1</errorprone.javac.version>
-    <error_prone_core.version>2.24.0</error_prone_core.version>
-    <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
-    <mockito.core.version>5.5.0</mockito.core.version>
-    <mockito.inline.version>5.2.0</mockito.inline.version>
-    <checker.framework.version>3.42.0</checker.framework.version>
-  </properties>
-
-  <scm>
-    <connection>scm:git:https://github.com/apache/arrow.git</connection>
-    <developerConnection>scm:git:https://github.com/apache/arrow.git</developerConnection>
-    <url>https://github.com/apache/arrow</url>
-    <tag>apache-arrow-2.0.0</tag>
-  </scm>
-
   <mailingLists>
     <mailingList>
       <name>Developer List</name>
@@ -81,356 +58,240 @@
     </mailingList>
   </mailingLists>
 
-  <repositories>
+  <modules>
+    <module>maven</module>
+    <module>bom</module>
+    <module>format</module>
+    <module>memory</module>
+    <module>vector</module>
+    <module>tools</module>
+    <module>adapter/jdbc</module>
+    <module>flight</module>
+    <module>performance</module>
+    <module>algorithm</module>
+    <module>adapter/avro</module>
+    <module>compression</module>
+  </modules>
 
-  </repositories>
+  <scm>
+    <connection>scm:git:https://github.com/apache/arrow.git</connection>
+    <developerConnection>scm:git:https://github.com/apache/arrow.git</developerConnection>
+    <tag>apache-arrow-2.0.0</tag>
+    <url>https://github.com/apache/arrow</url>
+  </scm>
 
   <issueManagement>
     <system>Jira</system>
     <url>https://issues.apache.org/jira/browse/arrow</url>
   </issueManagement>
 
-  <build>
-    <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.7.1</version>
-      </extension>
-    </extensions>
+  <properties>
+    <target.gen.source.path>${project.build.directory}/generated-sources</target.gen.source.path>
+    <dep.junit.platform.version>1.9.0</dep.junit.platform.version>
+    <dep.junit.jupiter.version>5.10.2</dep.junit.jupiter.version>
+    <dep.slf4j.version>2.0.13</dep.slf4j.version>
+    <dep.guava-bom.version>33.2.1-jre</dep.guava-bom.version>
+    <dep.netty-bom.version>4.1.110.Final</dep.netty-bom.version>
+    <dep.grpc-bom.version>1.63.0</dep.grpc-bom.version>
+    <dep.protobuf-bom.version>3.25.1</dep.protobuf-bom.version>
+    <dep.jackson-bom.version>2.17.1</dep.jackson-bom.version>
+    <dep.hadoop.version>3.4.0</dep.hadoop.version>
+    <dep.fbs.version>24.3.25</dep.fbs.version>
+    <dep.avro.version>1.11.3</dep.avro.version>
+    <arrow.vector.classifier></arrow.vector.classifier>
+    <forkCount>2</forkCount>
+    <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
+    <errorprone.javac.version>9+181-r4173-1</errorprone.javac.version>
+    <error_prone_core.version>2.28.0</error_prone_core.version>
+    <mockito.core.version>5.11.0</mockito.core.version>
+    <mockito.inline.version>5.2.0</mockito.inline.version>
+    <checker.framework.version>3.44.0</checker.framework.version>
+    <doclint>none</doclint>
+    <additionalparam>-Xdoclint:none</additionalparam>
+    <!-- org.apache:apache overrides -->
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.plugin.tools.version>3.12.0</maven.plugin.tools.version>
+    <surefire.version>3.2.5</surefire.version>
+    <version.apache-rat-plugin>0.16.1</version.apache-rat-plugin>
+    <version.maven-assembly-plugin>3.7.1</version.maven-assembly-plugin>
+    <version.maven-compiler-plugin>3.12.1</version.maven-compiler-plugin>
+    <version.maven-dependency-plugin>3.6.1</version.maven-dependency-plugin>
+    <version.maven-gpg-plugin>3.2.4</version.maven-gpg-plugin>
+    <!--
+      Downgrade maven-jar-plugin until https://github.com/codehaus-plexus/plexus-archiver/issues/332
+      is addressed
+    -->
+    <version.maven-jar-plugin>3.2.2</version.maven-jar-plugin>
+    <version.maven-javadoc-plugin>3.6.3</version.maven-javadoc-plugin>
+    <version.maven-project-info-reports-plugin>3.5.0</version.maven-project-info-reports-plugin>
+  </properties>
 
-    <plugins>
-      <plugin>
-        <groupId>org.apache.rat</groupId>
-        <artifactId>apache-rat-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>rat-checks</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <excludeSubProjects>false</excludeSubProjects>
-          <excludes>
-            <exclude>**/dependency-reduced-pom.xml</exclude>
-            <exclude>**/*.log</exclude>
-            <exclude>**/*.css</exclude>
-            <exclude>**/*.js</exclude>
-            <exclude>**/*.md</exclude>
-            <exclude>**/*.eps</exclude>
-            <exclude>**/*.json</exclude>
-            <exclude>**/*.seq</exclude>
-            <exclude>**/*.parquet</exclude>
-            <exclude>**/*.sql</exclude>
-            <exclude>**/arrow-git.properties</exclude>
-            <exclude>**/*.csv</exclude>
-            <exclude>**/*.csvh</exclude>
-            <exclude>**/*.csvh-test</exclude>
-            <exclude>**/*.tsv</exclude>
-            <exclude>**/*.txt</exclude>
-            <exclude>**/*.ssv</exclude>
-            <exclude>**/arrow-*.conf</exclude>
-            <exclude>**/.buildpath</exclude>
-            <exclude>**/*.proto</exclude>
-            <exclude>**/*.fmpp</exclude>
-            <exclude>**/target/**</exclude>
-            <exclude>**/*.tdd</exclude>
-            <exclude>**/*.project</exclude>
-            <exclude>**/TAGS</exclude>
-            <exclude>**/*.checkstyle</exclude>
-            <exclude>**/.classpath</exclude>
-            <exclude>**/.factorypath</exclude>
-            <exclude>**/.settings/**</exclude>
-            <exclude>.*/**</exclude>
-            <exclude>**/*.patch</exclude>
-            <exclude>**/*.pb.cc</exclude>
-            <exclude>**/*.pb.h</exclude>
-            <exclude>**/*.linux</exclude>
-            <exclude>**/client/build/**</exclude>
-            <exclude>**/*.tbl</exclude>
-            <exclude>**/*.iml</exclude>
-            <exclude>**/flight.properties</exclude>
-            <exclude>**/*.idea/**</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
+  <dependencyManagement>
+    <dependencies>
+      <!-- Utilize the bill of materials in sub-modules -->
+      <dependency>
+        <groupId>org.apache.arrow</groupId>
+        <artifactId>arrow-bom</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.checkerframework</groupId>
+        <artifactId>checker-qual</artifactId>
+        <version>${checker.framework.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.google.flatbuffers</groupId>
+        <artifactId>flatbuffers-java</artifactId>
+        <version>${dep.fbs.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <version>3.0.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${dep.slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-jdk14</artifactId>
+        <version>${dep.slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+        <version>1.3.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.assertj</groupId>
+        <artifactId>assertj-core</artifactId>
+        <version>3.26.0</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.immutables</groupId>
+        <artifactId>value-annotations</artifactId>
+        <version>2.10.1</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest</artifactId>
+        <version>2.2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson</groupId>
+        <artifactId>jackson-bom</artifactId>
+        <version>${dep.jackson-bom.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava-bom</artifactId>
+        <version>${dep.guava-bom.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-bom</artifactId>
+        <version>${dep.netty-bom.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-bom</artifactId>
+        <version>${dep.grpc-bom.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-bom</artifactId>
+        <version>${dep.protobuf-bom.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/logging.properties</exclude>
-            <exclude>**/logback-test.xml</exclude>
-            <exclude>**/logback.out.xml</exclude>
-            <exclude>**/logback.xml</exclude>
-          </excludes>
-          <archive>
-            <index>true</index>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
-            <manifestEntries>
-              <Extension-Name>org.apache.arrow</Extension-Name>
-              <Built-By>${username}</Built-By>
-              <url>https://arrow.apache.org/</url>
-            </manifestEntries>
-          </archive>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-            <configuration>
-              <skipIfEmpty>true</skipIfEmpty>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
+  <dependencies>
+    <!-- Test Dependencies -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>${dep.slf4j.version}</version>
+      <scope>test</scope>
+    </dependency>
 
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>${dep.slf4j.version}</version>
+      <scope>test</scope>
+    </dependency>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <configuration>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <maxmem>2048m</maxmem>
-          <useIncrementalCompilation>false</useIncrementalCompilation>
-          <fork>true</fork>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>validate_java_and_maven_version</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <inherited>false</inherited>
-            <configuration>
-              <rules>
-                <requireMavenVersion>
-                  <version>[3.3.0,4)</version>
-                </requireMavenVersion>
-              </rules>
-            </configuration>
-          </execution>
-          <execution>
-            <id>avoid_bad_dependencies</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <bannedDependencies>
-                  <excludes>
-                    <exclude>commons-logging</exclude>
-                    <exclude>javax.servlet:servlet-api</exclude>
-                    <exclude>org.mortbay.jetty:servlet-api</exclude>
-                    <exclude>org.mortbay.jetty:servlet-api-2.5</exclude>
-                    <exclude>log4j:log4j</exclude>
-                  </excludes>
-                </bannedDependencies>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>pl.project13.maven</groupId>
-        <artifactId>git-commit-id-plugin</artifactId>
-        <version>4.0.5</version>
-        <executions>
-          <execution>
-            <id>for-jars</id>
-            <inherited>true</inherited>
-            <goals>
-              <goal>revision</goal>
-            </goals>
-            <configuration>
-              <generateGitPropertiesFilename>target/classes/arrow-git.properties</generateGitPropertiesFilename>
-            </configuration>
-          </execution>
-          <execution>
-            <id>for-source-tarball</id>
-            <goals>
-              <goal>revision</goal>
-            </goals>
-            <inherited>false</inherited>
-            <configuration>
-              <generateGitPropertiesFilename>./arrow-git.properties</generateGitPropertiesFilename>
-            </configuration>
-          </execution>
-        </executions>
-
-        <configuration>
-          <dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat>
-          <verbose>false</verbose>
-          <skipPoms>false</skipPoms>
-          <generateGitPropertiesFile>true</generateGitPropertiesFile>
-          <failOnNoGitDirectory>false</failOnNoGitDirectory>
-          <gitDescribe>
-            <skip>false</skip>
-            <always>false</always>
-            <abbrev>7</abbrev>
-            <dirty>-dirty</dirty>
-            <forceLongFormat>true</forceLongFormat>
-          </gitDescribe>
-        </configuration>
-      </plugin>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>log4j-over-slf4j</artifactId>
+      <version>${dep.slf4j.version}</version>
+      <scope>test</scope>
+    </dependency>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.1.0</version>
-        <dependencies>
-          <dependency>
-            <groupId>com.puppycrawl.tools</groupId>
-            <artifactId>checkstyle</artifactId>
-            <version>8.29</version>
-          </dependency>
-          <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>${dep.slf4j.version}</version>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <id>validate</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <excludes>**/module-info.java</excludes>
-          <configLocation>dev/checkstyle/checkstyle.xml</configLocation>
-          <headerLocation>dev/checkstyle/checkstyle.license</headerLocation>
-          <suppressionsLocation>dev/checkstyle/suppressions.xml</suppressionsLocation>
-          <includeTestSourceDirectory>true</includeTestSourceDirectory>
-          <encoding>UTF-8</encoding>
-          <consoleOutput>true</consoleOutput>
-          <failsOnError>${checkstyle.failOnViolation}</failsOnError>
-          <failOnViolation>${checkstyle.failOnViolation}</failOnViolation>
-          <violationSeverity>warning</violationSeverity>
-          <format>xml</format>
-          <format>html</format>
-          <outputFile>${project.build.directory}/test/checkstyle-errors.xml</outputFile>
-          <linkXRef>false</linkXRef>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>analyze</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>analyze-only</goal>
-            </goals>
-            <configuration>
-              <ignoreNonCompile>true</ignoreNonCompile>
-              <failOnWarning>true</failOnWarning>
-              <ignoredDependencies>
-                <!-- source annotations (not kept in compiled code) -->
-                <ignoredDependency>javax.annotation:javax.annotation-api:*</ignoredDependency>
-                <ignoredDependency>org.apache.hadoop:hadoop-client-api</ignoredDependency>
-                <ignoredDependency>org.checkerframework:checker-qual</ignoredDependency>
-              </ignoredDependencies>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.cyclonedx</groupId>
-        <artifactId>cyclonedx-maven-plugin</artifactId>
-        <version>2.7.11</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>makeBom</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.arrow.maven.plugins</groupId>
-        <artifactId>module-info-compiler-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>default-compile</id>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>default-testCompile</id>
-            <goals>
-              <goal>testCompile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>3.5.0</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>3.12.1</version>
-      </plugin>
-    </plugins>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>${dep.junit.jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${dep.junit.jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>${dep.junit.jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <version>2.25.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.3.14</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>de.huxhorn.lilith</groupId>
+      <artifactId>de.huxhorn.lilith.logback.appender.multiplex-classic</artifactId>
+      <version>8.3.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
+  <build>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <!--
-            This appears to report a false positive with versions
-            greater than 3.1.2 (tested up to 3.6.0) when compiling
-            arrow-tools about Jackson being only used for tests.
-          -->
-          <version>3.1.2</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <version>0.16.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>3.3.1</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>${maven-compiler-plugin.version}</version>
           <configuration>
+            <fork>true</fork>
             <excludes>**/module-info.java</excludes>
             <testExcludes>**/module-info.java</testExcludes>
             <useModulePath>false</useModulePath>
@@ -438,35 +299,13 @@
               <path>
                 <groupId>org.immutables</groupId>
                 <artifactId>value</artifactId>
-                <version>2.10.0</version>
+                <version>2.10.1</version>
               </path>
             </annotationProcessorPaths>
           </configuration>
         </plugin>
-        <plugin>
-          <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.4.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-shade-plugin</artifactId>
-          <version>3.5.2</version>
-        </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.2.5</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.junit.jupiter</groupId>
-              <artifactId>junit-jupiter-engine</artifactId>
-              <version>${dep.junit.jupiter.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.apache.maven.surefire</groupId>
-              <artifactId>surefire-junit-platform</artifactId>
-              <version>3.2.5</version>
-            </dependency>
-          </dependencies>
           <configuration>
             <enableAssertions>true</enableAssertions>
             <childDelegation>true</childDelegation>
@@ -484,7 +323,6 @@
         </plugin>
         <plugin>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>3.2.5</version>
           <configuration>
             <systemPropertyVariables>
               <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
@@ -496,7 +334,7 @@
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.11</version>
+          <version>0.8.12</version>
         </plugin>
 
         <!--This plugin's configuration is used to store Eclipse m2e settings
@@ -518,7 +356,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore></ignore>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -531,22 +369,20 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore></ignore>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
                   <pluginExecutionFilter>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>
-                      maven-remote-resources-plugin
-                    </artifactId>
+                    <artifactId>maven-remote-resources-plugin</artifactId>
                     <versionRange>[1.1,)</versionRange>
                     <goals>
                       <goal>process</goal>
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore></ignore>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -559,7 +395,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore></ignore>
                   </action>
                 </pluginExecution>
                 <pluginExecution>
@@ -572,7 +408,23 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore />
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>org.apache.drill.tools</groupId>
+                    <artifactId>drill-fmpp-maven-plugin</artifactId>
+                    <versionRange>[1.0,)</versionRange>
+                    <goals>
+                      <goal>generate</goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <execute>
+                      <runOnIncremental>false</runOnIncremental>
+                      <runOnConfiguration>true</runOnConfiguration>
+                    </execute>
                   </action>
                 </pluginExecution>
               </pluginExecutions>
@@ -582,9 +434,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.6.3</version>
           <configuration>
-            <source>8</source>
             <sourceFileExcludes>
               <sourceFileExclude>**/module-info.java</sourceFileExclude>
             </sourceFileExcludes>
@@ -595,21 +445,11 @@
           <artifactId>module-info-compiler-maven-plugin</artifactId>
           <version>${project.version}</version>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>3.5.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.12.1</version>
-        </plugin>
         <plugin>
           <groupId>com.gradle</groupId>
-          <artifactId>gradle-enterprise-maven-extension</artifactId>
+          <artifactId>develocity-maven-extension</artifactId>
           <configuration>
-            <gradleEnterprise>
+            <develocity>
               <normalization>
                 <runtimeClassPath>
                   <ignoredFiles>
@@ -632,9 +472,9 @@
                       </fileSet>
                     </fileSets>
                   </inputs>
-              </plugin>
-            </plugins>
-            </gradleEnterprise>
+                </plugin>
+              </plugins>
+            </develocity>
           </configuration>
         </plugin>
         <plugin>
@@ -647,241 +487,396 @@
             <pluginArtifact>io.grpc:protoc-gen-grpc-java:${dep.grpc-bom.version}:exe:${os.detected.classifier}</pluginArtifact>
           </configuration>
         </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <dependencyManagement>
-    <dependencies>
-      <!-- Utilize the bill of materials in sub-modules -->
-      <dependency>
-        <groupId>org.apache.arrow</groupId>
-        <artifactId>arrow-bom</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.checkerframework</groupId>
-        <artifactId>checker-qual</artifactId>
-        <version>${checker.framework.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.flatbuffers</groupId>
-        <artifactId>flatbuffers-java</artifactId>
-        <version>${dep.fbs.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.code.findbugs</groupId>
-        <artifactId>jsr305</artifactId>
-        <version>3.0.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${dep.slf4j.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.annotation</groupId>
-        <artifactId>javax.annotation-api</artifactId>
-        <version>1.3.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.assertj</groupId>
-        <artifactId>assertj-core</artifactId>
-        <version>3.25.3</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.immutables</groupId>
-        <artifactId>value</artifactId>
-        <version>2.10.0</version>
-        <scope>provided</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest</artifactId>
-        <version>2.2</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson</groupId>
-        <artifactId>jackson-bom</artifactId>
-        <version>${dep.jackson-bom.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava-bom</artifactId>
-        <version>${dep.guava-bom.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-bom</artifactId>
-        <version>${dep.netty-bom.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-bom</artifactId>
-        <version>${dep.grpc-bom.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.google.protobuf</groupId>
-        <artifactId>protobuf-bom</artifactId>
-        <version>${dep.protobuf-bom.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <dependencies>
-    <!-- Test Dependencies -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jul-to-slf4j</artifactId>
-      <version>${dep.slf4j.version}</version>
-      <scope>test</scope>
-    </dependency>
+        <plugin>
+          <groupId>com.diffplug.spotless</groupId>
+          <artifactId>spotless-maven-plugin</artifactId>
+          <version>2.30.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>build-helper-maven-plugin</artifactId>
+          <version>3.6.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>properties-maven-plugin</artifactId>
+          <version>1.2.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>3.3.0</version>
+        </plugin>
+        <plugin>
+          <groupId>pl.project13.maven</groupId>
+          <artifactId>git-commit-id-plugin</artifactId>
+          <version>4.9.10</version>
+        </plugin>
+        <plugin>
+          <groupId>org.cyclonedx</groupId>
+          <artifactId>cyclonedx-maven-plugin</artifactId>
+          <version>2.8.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.drill.tools</groupId>
+          <artifactId>drill-fmpp-maven-plugin</artifactId>
+          <version>1.21.2</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
 
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>jcl-over-slf4j</artifactId>
-      <version>${dep.slf4j.version}</version>
-      <scope>test</scope>
-    </dependency>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+        <configuration>
+          <excludeSubProjects>false</excludeSubProjects>
+          <excludes>
+            <exclude>**/dependency-reduced-pom.xml</exclude>
+            <exclude>**/*.log</exclude>
+            <exclude>**/*.css</exclude>
+            <exclude>**/*.js</exclude>
+            <exclude>**/*.md</exclude>
+            <exclude>**/*.eps</exclude>
+            <exclude>**/*.json</exclude>
+            <exclude>**/*.seq</exclude>
+            <exclude>**/*.parquet</exclude>
+            <exclude>**/*.sql</exclude>
+            <exclude>**/arrow-git.properties</exclude>
+            <exclude>**/*.csv</exclude>
+            <exclude>**/*.csvh</exclude>
+            <exclude>**/*.csvh-test</exclude>
+            <exclude>**/*.tsv</exclude>
+            <exclude>**/*.txt</exclude>
+            <exclude>**/*.ssv</exclude>
+            <exclude>**/arrow-*.conf</exclude>
+            <exclude>**/.buildpath</exclude>
+            <exclude>**/*.proto</exclude>
+            <exclude>**/*.fmpp</exclude>
+            <exclude>**/target/**</exclude>
+            <exclude>**/*.tdd</exclude>
+            <exclude>**/*.project</exclude>
+            <exclude>**/TAGS</exclude>
+            <exclude>**/*.checkstyle</exclude>
+            <exclude>**/.classpath</exclude>
+            <exclude>**/.factorypath</exclude>
+            <exclude>**/.settings/**</exclude>
+            <exclude>.*/**</exclude>
+            <exclude>**/*.patch</exclude>
+            <exclude>**/*.pb.cc</exclude>
+            <exclude>**/*.pb.h</exclude>
+            <exclude>**/*.linux</exclude>
+            <exclude>**/client/build/**</exclude>
+            <exclude>**/*.tbl</exclude>
+            <exclude>**/*.iml</exclude>
+            <exclude>**/flight.properties</exclude>
+            <exclude>**/*.idea/**</exclude>
+          </excludes>
+        </configuration>
+        <executions>
+          <execution>
+            <id>rat-checks</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>validate</phase>
+          </execution>
+        </executions>
+      </plugin>
 
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>log4j-over-slf4j</artifactId>
-      <version>${dep.slf4j.version}</version>
-      <scope>test</scope>
-    </dependency>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/logging.properties</exclude>
+            <exclude>**/logback-test.xml</exclude>
+            <exclude>**/logback.out.xml</exclude>
+            <exclude>**/logback.xml</exclude>
+          </excludes>
+          <archive>
+            <manifestEntries>
+              <Extension-Name>org.apache.arrow</Extension-Name>
+              <Built-By>${username}</Built-By>
+              <url>https://arrow.apache.org/</url>
+            </manifestEntries>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+            <configuration>
+              <skipIfEmpty>true</skipIfEmpty>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
 
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <version>${dep.junit.jupiter.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <version>${dep.junit.jupiter.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
-      <version>${dep.junit.jupiter.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
-      <version>${dep.junit.jupiter.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- Use to keep older tests running -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-junit-jupiter</artifactId>
-      <version>2.25.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <version>1.3.14</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>de.huxhorn.lilith</groupId>
-      <artifactId>de.huxhorn.lilith.logback.appender.multiplex-classic</artifactId>
-      <version>8.3.0</version>
-      <scope>test</scope>
-    </dependency>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <maxmem>2048m</maxmem>
+          <fork>true</fork>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>avoid_bad_dependencies</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <phase>verify</phase>
+            <configuration>
+              <rules>
+                <bannedDependencies>
+                  <excludes>
+                    <exclude>commons-logging</exclude>
+                    <exclude>javax.servlet:servlet-api</exclude>
+                    <exclude>org.mortbay.jetty:servlet-api</exclude>
+                    <exclude>org.mortbay.jetty:servlet-api-2.5</exclude>
+                    <exclude>log4j:log4j</exclude>
+                    <!-- Do not include annotation processors. Use the annotations-only artifacts -->
+                    <exclude>org.immutables:value</exclude>
+                    <exclude>org.checkerframework:checker</exclude>
+                    <!-- Exclude all JUnit 4 dependencies -->
+                    <exclude>junit:junit:4.*</exclude>
+                    <exclude>org.junit.vintage:junit-vintage-engine</exclude>
+                  </excludes>
+                </bannedDependencies>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>pl.project13.maven</groupId>
+        <artifactId>git-commit-id-plugin</artifactId>
+        <configuration>
+          <dateFormat>dd.MM.yyyy '@' HH:mm:ss z</dateFormat>
+          <verbose>false</verbose>
+          <skipPoms>false</skipPoms>
+          <generateGitPropertiesFile>true</generateGitPropertiesFile>
+          <failOnNoGitDirectory>false</failOnNoGitDirectory>
+          <gitDescribe>
+            <skip>false</skip>
+            <always>false</always>
+            <abbrev>7</abbrev>
+            <dirty>-dirty</dirty>
+            <forceLongFormat>true</forceLongFormat>
+          </gitDescribe>
+        </configuration>
+        <executions>
+          <execution>
+            <id>for-jars</id>
+            <goals>
+              <goal>revision</goal>
+            </goals>
+            <inherited>true</inherited>
+            <configuration>
+              <generateGitPropertiesFilename>target/classes/arrow-git.properties</generateGitPropertiesFilename>
+            </configuration>
+          </execution>
+          <execution>
+            <id>for-source-tarball</id>
+            <goals>
+              <goal>revision</goal>
+            </goals>
+            <inherited>false</inherited>
+            <configuration>
+              <generateGitPropertiesFilename>./arrow-git.properties</generateGitPropertiesFilename>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
 
-  </dependencies>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+          <excludes>**/module-info.java</excludes>
+          <configLocation>dev/checkstyle/checkstyle.xml</configLocation>
+          <headerLocation>dev/license/asf-java.license</headerLocation>
+          <suppressionsLocation>dev/checkstyle/suppressions.xml</suppressionsLocation>
+          <includeTestSourceDirectory>true</includeTestSourceDirectory>
+          <inputEncoding>UTF-8</inputEncoding>
+          <consoleOutput>true</consoleOutput>
+          <failsOnError>${checkstyle.failOnViolation}</failsOnError>
+          <failOnViolation>${checkstyle.failOnViolation}</failOnViolation>
+          <violationSeverity>warning</violationSeverity>
+          <outputFileFormat>xml</outputFileFormat>
+          <outputFile>${project.build.directory}/test/checkstyle-errors.xml</outputFile>
+          <linkXRef>false</linkXRef>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.puppycrawl.tools</groupId>
+            <artifactId>checkstyle</artifactId>
+            <version>8.29</version>
+          </dependency>
+          <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${dep.slf4j.version}</version>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <id>validate</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>validate</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>analyze</id>
+            <goals>
+              <goal>analyze-only</goal>
+            </goals>
+            <phase>verify</phase>
+            <configuration>
+              <ignoreNonCompile>true</ignoreNonCompile>
+              <failOnWarning>true</failOnWarning>
+              <ignoredDependencies>
+                <!-- source annotations (not kept in compiled code) -->
+                <ignoredDependency>javax.annotation:javax.annotation-api:*</ignoredDependency>
+                <ignoredDependency>org.apache.hadoop:hadoop-client-api</ignoredDependency>
+              </ignoredDependencies>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.cyclonedx</groupId>
+        <artifactId>cyclonedx-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>makeBom</goal>
+            </goals>
+            <phase>package</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.arrow.maven.plugins</groupId>
+        <artifactId>module-info-compiler-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-compile</id>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>default-testCompile</id>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <configuration>
+          <pom>
+            <licenseHeader>
+              <file>${maven.multiModuleProjectDirectory}/dev/license/asf-xml.license</file>
+              <delimiter>(&lt;configuration|&lt;project)</delimiter>
+            </licenseHeader>
+            <sortPom></sortPom>
+          </pom>
+          <java>
+            <googleJavaFormat>
+              <version>1.7</version>
+              <style>GOOGLE</style>
+            </googleJavaFormat>
+            <licenseHeader>
+              <file>${maven.multiModuleProjectDirectory}/dev/license/asf-java.license</file>
+              <delimiter>package</delimiter>
+            </licenseHeader>
+          </java>
+        </configuration>
+        <executions>
+          <execution>
+            <id>spotless-check</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <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.7.1</version>
+      </extension>
+    </extensions>
+  </build>
 
   <reporting>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.6.3</version>
+        <configuration>
+          <sourceFileExcludes>
+            <sourceFileExclude>**/module-info.java</sourceFileExclude>
+          </sourceFileExcludes>
+        </configuration>
         <reportSets>
-          <reportSet><!-- by default, id = "default" -->
-            <reports><!-- select non-aggregate reports -->
+          <reportSet>
+            <!-- by default, id = "default" -->
+            <reports>
+              <!-- select non-aggregate reports -->
               <report>javadoc</report>
             </reports>
           </reportSet>
-          <reportSet><!-- aggregate reportSet, to define in poms having modules -->
+          <reportSet>
+            <!-- aggregate reportSet, to define in poms having modules -->
             <id>aggregate</id>
-            <inherited>false</inherited><!-- don't run aggregate in child modules -->
+            <!-- don't run aggregate in child modules -->
             <reports>
               <report>aggregate</report>
             </reports>
+            <inherited>false</inherited>
           </reportSet>
         </reportSets>
-        <configuration>
-          <sourceFileExcludes>
-            <sourceFileExclude>**/module-info.java</sourceFileExclude>
-          </sourceFileExcludes>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>3.5.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.12.1</version>
       </plugin>
     </plugins>
   </reporting>
 
-  <modules>
-    <module>maven</module>
-    <module>bom</module>
-    <module>format</module>
-    <module>memory</module>
-    <module>vector</module>
-    <module>tools</module>
-    <module>adapter/jdbc</module>
-    <module>flight</module>
-    <module>performance</module>
-    <module>algorithm</module>
-    <module>adapter/avro</module>
-    <module>compression</module>
-  </modules>
-
   <profiles>
-    <profile>
-      <id>java-nodoclint</id>
-      <activation>
-        <jdk>[1.8,)</jdk>
-      </activation>
-      <properties>
-        <doclint>none</doclint>
-        <additionalparam>-Xdoclint:none</additionalparam>
-      </properties>
-    </profile>
-
     <profile>
       <!-- C data interface depends on building a native library -->
       <id>arrow-c-data</id>
@@ -916,6 +911,9 @@
            Do not activate Error Prone while running with Eclipse/M2E as it causes incompatibilities
            with other annotation processors.
            See https://github.com/jbosstools/m2e-apt/issues/62 for details
+
+           Note: Maintaining error-prone version with JDK8
+           See https://github.com/google/error-prone/blob/f8e33bc460be82ab22256a7ef8b979d7a2cacaba/docs/installation.md#jdk-8
       -->
       <activation>
         <jdk>1.8</jdk>
@@ -929,7 +927,6 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
-              <fork>true</fork>
               <compilerArgs combine.children="append">
                 <arg>-XDcompilePolicy=simple</arg>
                 <arg>-Xplugin:ErrorProne</arg>
@@ -939,6 +936,13 @@
                 <path>
                   <groupId>com.google.errorprone</groupId>
                   <artifactId>error_prone_core</artifactId>
+                  <!--
+                       Reference: https://errorprone.info/docs/installation
+                       Error Prone 2.10.0 is the latest version
+                       to support running on JDK 8.
+                       With right flags it could be upgraded,
+                       but we choose to keep this unchanged for now.
+                  -->
                   <version>2.10.0</version>
                 </path>
               </annotationProcessorPaths>
@@ -962,12 +966,9 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-compiler-plugin</artifactId>
             <configuration>
-              <source>8</source>
-              <target>8</target>
-              <encoding>UTF-8</encoding>
               <compilerArgs combine.children="append">
                 <arg>-XDcompilePolicy=simple</arg>
-                <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/(target/generated-sources)/.*</arg>
+                <arg>-Xplugin:ErrorProne -XepExcludedPaths:.*/(target/generated-source|format/src/main/java/org/apache/arrow/flatbuf)/.*</arg>
                 <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
                 <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
                 <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
@@ -988,6 +989,16 @@
               </annotationProcessorPaths>
             </configuration>
           </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>jdk11+</id>
+      <activation>
+        <jdk>[11,]</jdk>
+      </activation>
+      <build>
+        <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
@@ -995,6 +1006,13 @@
               <argLine>--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
             </configuration>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <configuration>
+              <argLine>--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
     </profile>
@@ -1035,14 +1053,14 @@
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.8.11</version>
             <reportSets>
               <reportSet>
-                <inherited>false</inherited><!-- don't run aggregate in child modules -->
+                <!-- don't run aggregate in child modules -->
                 <reports>
                   <!-- select non-aggregate reports -->
                   <report>report</report>
                 </reports>
+                <inherited>false</inherited>
               </reportSet>
             </reportSets>
           </plugin>
@@ -1080,39 +1098,34 @@
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
-            <version>3.2.0</version>
             <executions>
               <execution>
                 <id>cdata-cmake</id>
-                <phase>generate-resources</phase>
                 <goals>
                   <goal>exec</goal>
                 </goals>
+                <phase>generate-resources</phase>
                 <configuration>
                   <executable>cmake</executable>
-                  <commandlineArgs>
-                    -S java
+                  <commandlineArgs>-S java
                     -B java-jni
                     -DARROW_JAVA_JNI_ENABLE_C=ON
                     -DARROW_JAVA_JNI_ENABLE_DEFAULT=OFF
                     -DBUILD_TESTING=OFF
                     -DCMAKE_BUILD_TYPE=Release
-                    -DCMAKE_INSTALL_PREFIX=${arrow.c.jni.dist.dir}
-                  </commandlineArgs>
+                    -DCMAKE_INSTALL_PREFIX=${arrow.c.jni.dist.dir}</commandlineArgs>
                   <workingDirectory>../</workingDirectory>
                 </configuration>
               </execution>
               <execution>
                 <id>cdata-build</id>
-                <phase>generate-resources</phase>
                 <goals>
                   <goal>exec</goal>
                 </goals>
+                <phase>generate-resources</phase>
                 <configuration>
                   <executable>cmake</executable>
-                  <commandlineArgs>
-                    --build java-jni --target install --config Release
-                  </commandlineArgs>
+                  <commandlineArgs>--build java-jni --target install --config Release</commandlineArgs>
                   <workingDirectory>../</workingDirectory>
                 </configuration>
               </execution>
@@ -1141,18 +1154,16 @@
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
-            <version>3.2.0</version>
             <executions>
               <execution>
                 <id>jni-cpp-cmake</id>
-                <phase>generate-resources</phase>
                 <goals>
                   <goal>exec</goal>
                 </goals>
+                <phase>generate-resources</phase>
                 <configuration>
                   <executable>cmake</executable>
-                  <commandlineArgs>
-                    -S cpp
+                  <commandlineArgs>-S cpp
                     -B cpp-jni
                     -DARROW_BUILD_SHARED=OFF
                     -DARROW_CSV=${ARROW_DATASET}
@@ -1170,37 +1181,33 @@
                     -DARROW_USE_CCACHE=ON
                     -DCMAKE_BUILD_TYPE=Release
                     -DCMAKE_INSTALL_PREFIX=java-dist
-                    -DCMAKE_UNITY_BUILD=ON
-                  </commandlineArgs>
+                    -DCMAKE_UNITY_BUILD=ON</commandlineArgs>
                   <workingDirectory>../</workingDirectory>
                   <skip>${cpp.dependencies.builded}</skip>
                 </configuration>
               </execution>
               <execution>
                 <id>jni-cpp-build</id>
-                <phase>generate-resources</phase>
                 <goals>
                   <goal>exec</goal>
                 </goals>
+                <phase>generate-resources</phase>
                 <configuration>
                   <executable>cmake</executable>
-                  <commandlineArgs>
-                    --build cpp-jni --target install --config Release
-                  </commandlineArgs>
+                  <commandlineArgs>--build cpp-jni --target install --config Release</commandlineArgs>
                   <workingDirectory>../</workingDirectory>
                   <skip>${cpp.dependencies.builded}</skip>
                 </configuration>
               </execution>
               <execution>
                 <id>jni-cmake</id>
-                <phase>generate-resources</phase>
                 <goals>
                   <goal>exec</goal>
                 </goals>
+                <phase>generate-resources</phase>
                 <configuration>
                   <executable>cmake</executable>
-                  <commandlineArgs>
-                    -S java
+                  <commandlineArgs>-S java
                     -B java-jni
                     -DARROW_JAVA_JNI_ENABLE_C=${ARROW_JAVA_JNI_ENABLE_C}
                     -DARROW_JAVA_JNI_ENABLE_DATASET=${ARROW_JAVA_JNI_ENABLE_DATASET}
@@ -1212,22 +1219,19 @@
                     -DCMAKE_INSTALL_PREFIX=${arrow.dataset.jni.dist.dir}
                     -DCMAKE_PREFIX_PATH=${project.basedir}/../java-dist/lib/${os.detected.arch}/cmake
                     -DProtobuf_USE_STATIC_LIBS=ON
-                    -DProtobuf_ROOT=${project.basedir}/../cpp-jni/protobuf_ep-install
-                  </commandlineArgs>
+                    -DProtobuf_ROOT=${project.basedir}/../cpp-jni/protobuf_ep-install</commandlineArgs>
                   <workingDirectory>../</workingDirectory>
                 </configuration>
               </execution>
               <execution>
                 <id>jni-build</id>
-                <phase>generate-resources</phase>
                 <goals>
                   <goal>exec</goal>
                 </goals>
+                <phase>generate-resources</phase>
                 <configuration>
                   <executable>cmake</executable>
-                  <commandlineArgs>
-                    --build java-jni --target install --config Release
-                  </commandlineArgs>
+                  <commandlineArgs>--build java-jni --target install --config Release</commandlineArgs>
                   <workingDirectory>../</workingDirectory>
                 </configuration>
               </execution>
@@ -1256,18 +1260,16 @@
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
-            <version>3.2.0</version>
             <executions>
               <execution>
                 <id>jni-cpp-cmake</id>
-                <phase>generate-resources</phase>
                 <goals>
                   <goal>exec</goal>
                 </goals>
+                <phase>generate-resources</phase>
                 <configuration>
                   <executable>cmake</executable>
-                  <commandlineArgs>
-                    -S cpp
+                  <commandlineArgs>-S cpp
                     -B cpp-jni
                     -DARROW_BUILD_SHARED=OFF
                     -DARROW_CSV=${ARROW_DATASET}
@@ -1289,37 +1291,33 @@
                     -DCMAKE_BUILD_TYPE=Release
                     -DCMAKE_INSTALL_PREFIX=java-dist
                     -DCMAKE_UNITY_BUILD=ON
-                    -GNinja
-                  </commandlineArgs>
+                    -GNinja</commandlineArgs>
                   <workingDirectory>../</workingDirectory>
                   <skip>${cpp.dependencies.builded}</skip>
                 </configuration>
               </execution>
               <execution>
                 <id>jni-cpp-build</id>
-                <phase>generate-resources</phase>
                 <goals>
                   <goal>exec</goal>
                 </goals>
+                <phase>generate-resources</phase>
                 <configuration>
                   <executable>ninja</executable>
-                  <commandlineArgs>
-                    install
-                  </commandlineArgs>
+                  <commandlineArgs>install</commandlineArgs>
                   <workingDirectory>../cpp-jni</workingDirectory>
                   <skip>${cpp.dependencies.builded}</skip>
                 </configuration>
               </execution>
               <execution>
                 <id>jni-cmake</id>
-                <phase>generate-resources</phase>
                 <goals>
                   <goal>exec</goal>
                 </goals>
+                <phase>generate-resources</phase>
                 <configuration>
                   <executable>cmake</executable>
-                  <commandlineArgs>
-                    -S java
+                  <commandlineArgs>-S java
                     -B java-jni
                     -DARROW_JAVA_JNI_ENABLE_C=${ARROW_JAVA_JNI_ENABLE_C}
                     -DARROW_JAVA_JNI_ENABLE_DATASET=${ARROW_JAVA_JNI_ENABLE_DATASET}
@@ -1329,22 +1327,19 @@
                     -DBUILD_TESTING=OFF
                     -DCMAKE_BUILD_TYPE=Release
                     -DCMAKE_INSTALL_PREFIX=${arrow.dataset.jni.dist.dir}
-                    -DCMAKE_PREFIX_PATH=${project.basedir}/../java-dist/lib/${os.detected.arch}/cmake
-                  </commandlineArgs>
+                    -DCMAKE_PREFIX_PATH=${project.basedir}/../java-dist/lib/${os.detected.arch}/cmake</commandlineArgs>
                   <workingDirectory>../</workingDirectory>
                 </configuration>
               </execution>
               <execution>
                 <id>jni-build</id>
-                <phase>generate-resources</phase>
                 <goals>
                   <goal>exec</goal>
                 </goals>
+                <phase>generate-resources</phase>
                 <configuration>
                   <executable>cmake</executable>
-                  <commandlineArgs>
-                    --build java-jni --target install --config Release
-                  </commandlineArgs>
+                  <commandlineArgs>--build java-jni --target install --config Release</commandlineArgs>
                   <workingDirectory>../</workingDirectory>
                 </configuration>
               </execution>
@@ -1354,5 +1349,4 @@
       </build>
     </profile>
   </profiles>
-
 </project>
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 0688fae1ab78c..07a768e24d5e2 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -1,107 +1,133 @@
-<?xml version="1.0"?>
-<!-- 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. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.arrow</groupId>
-        <artifactId>arrow-java-root</artifactId>
-        <version>16.0.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>arrow-tools</artifactId>
-    <name>Arrow Tools</name>
-    <description>Java applications for working with Arrow ValueVectors.</description>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-memory-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-vector</artifactId>
-            <classifier>${arrow.vector.classifier}</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-compression</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.immutables</groupId>
-          <artifactId>value</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>com.google.guava</groupId>
-          <artifactId>guava</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.6.0</version>
-        </dependency>
-        <dependency>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-classic</artifactId>
-          <version>1.3.14</version>
-          <scope>runtime</scope>
-        </dependency>
-        <dependency>
-          <groupId>com.fasterxml.jackson.core</groupId>
-          <artifactId>jackson-core</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>com.fasterxml.jackson.core</groupId>
-          <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.arrow</groupId>
-          <artifactId>arrow-memory-netty</artifactId>
-          <scope>runtime</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.apache.arrow</groupId>
-          <artifactId>arrow-vector</artifactId>
-          <version>${project.version}</version>
-          <classifier>tests</classifier>
-          <type>test-jar</type>
-          <scope>test</scope>
-        </dependency>
-    </dependencies>
+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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.arrow</groupId>
+    <artifactId>arrow-java-root</artifactId>
+    <version>17.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>arrow-tools</artifactId>
+  <name>Arrow Tools</name>
+  <description>Java applications for working with Arrow ValueVectors.</description>
 
-    <build>
-      <plugins>
-        <plugin>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.0.0</version>
-          <configuration>
-            <descriptorRefs>
-              <descriptorRef>jar-with-dependencies</descriptorRef>
-            </descriptorRefs>
-          </configuration>
-          <executions>
-            <execution>
-              <id>make-assembly</id>
-              <phase>package</phase>
-              <goals>
-                <goal>single</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-memory-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-vector</artifactId>
+      <classifier>${arrow.vector.classifier}</classifier>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-compression</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.immutables</groupId>
+      <artifactId>value-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <version>1.8.0</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.3.14</version>
+      <scope>test</scope>
+    </dependency>
+    <!--
+        Adding jackson as a compile dependency although only directly used in tests.
+        Using <scope>test</scope> however would cause the final scope to be test instead of
+        compile because of MNG-4156
+    -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-memory-netty</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-vector</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>package</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>analyze</id>
+            <phase>verify</phase>
+            <configuration>
+              <ignoredNonTestScopedDependencies>
+                <ignoredNonTestScopedDependency>com.fasterxml.jackson.core:*</ignoredNonTestScopedDependency>
+              </ignoredNonTestScopedDependencies>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/java/tools/src/main/java/org/apache/arrow/tools/EchoServer.java b/java/tools/src/main/java/org/apache/arrow/tools/EchoServer.java
index 36ba24dbeecc8..13b81e7a19b6b 100644
--- a/java/tools/src/main/java/org/apache/arrow/tools/EchoServer.java
+++ b/java/tools/src/main/java/org/apache/arrow/tools/EchoServer.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.tools;
 
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.util.Preconditions;
@@ -30,26 +28,20 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * Simple server that echoes back data received.
- */
+/** Simple server that echoes back data received. */
 public class EchoServer {
   private static final Logger LOGGER = LoggerFactory.getLogger(EchoServer.class);
   private final ServerSocket serverSocket;
   private boolean closed = false;
 
-  /**
-   * Constructs a new instance that binds to the given port.
-   */
+  /** Constructs a new instance that binds to the given port. */
   public EchoServer(int port) throws IOException {
     LOGGER.debug("Starting echo server.");
     serverSocket = new ServerSocket(port);
     LOGGER.debug("Running echo server on port: " + port());
   }
 
-  /**
-   * Main method to run the server, the first argument is an optional port number.
-   */
+  /** Main method to run the server, the first argument is an optional port number. */
   public static void main(String[] args) throws Exception {
     int port;
     if (args.length > 0) {
@@ -64,9 +56,7 @@ public int port() {
     return serverSocket.getLocalPort();
   }
 
-  /**
-   * Starts the main server event loop.
-   */
+  /** Starts the main server event loop. */
   public void run() throws IOException {
     try {
       Socket clientSocket = null;
@@ -98,9 +88,7 @@ public void close() throws IOException {
     serverSocket.close();
   }
 
-  /**
-   * Handler for each client connection to the server.
-   */
+  /** Handler for each client connection to the server. */
   public static class ClientConnection implements AutoCloseable {
     public final Socket socket;
 
@@ -108,9 +96,7 @@ public ClientConnection(Socket socket) {
       this.socket = socket;
     }
 
-    /**
-     * Reads a record batch off the socket and writes it back out.
-     */
+    /** Reads a record batch off the socket and writes it back out. */
     public void run() throws IOException {
       // Read the entire input stream and write it back
       try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE)) {
diff --git a/java/tools/src/main/java/org/apache/arrow/tools/FileRoundtrip.java b/java/tools/src/main/java/org/apache/arrow/tools/FileRoundtrip.java
index 1201d0f760524..45205bab54655 100644
--- a/java/tools/src/main/java/org/apache/arrow/tools/FileRoundtrip.java
+++ b/java/tools/src/main/java/org/apache/arrow/tools/FileRoundtrip.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.tools;
 
 import java.io.File;
@@ -22,7 +21,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.VectorSchemaRoot;
@@ -37,9 +35,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * Application that verifies data can be round-tripped through a file.
- */
+/** Application that verifies data can be round-tripped through a file. */
 public class FileRoundtrip {
   private static final Logger LOGGER = LoggerFactory.getLogger(FileRoundtrip.class);
   private final Options options;
@@ -50,20 +46,29 @@ public class FileRoundtrip {
     this.options = new Options();
     this.options.addOption("i", "in", true, "input file");
     this.options.addOption("o", "out", true, "output file");
-
   }
 
   public static void main(String[] args) {
     System.exit(new FileRoundtrip(System.err).run(args));
   }
 
-  private File validateFile(String type, String fileName) {
+  private File validateFile(String type, String fileName) throws IOException {
     if (fileName == null) {
       throw new IllegalArgumentException("missing " + type + " file parameter");
     }
     File f = new File(fileName);
-    if (!f.exists() || f.isDirectory()) {
-      throw new IllegalArgumentException(type + " file not found: " + f.getAbsolutePath());
+    if (type.equals("input")) {
+      if (!f.exists() || f.isDirectory()) {
+        throw new IllegalArgumentException(type + " file not found: " + f.getAbsolutePath());
+      }
+    } else if (type.equals("output")) {
+      File parentDir = f.getParentFile();
+      if (parentDir != null && !parentDir.exists()) {
+        if (!parentDir.mkdirs()) {
+          throw new IOException(
+              "Failed to create parent directory: " + parentDir.getAbsolutePath());
+        }
+      }
     }
     return f;
   }
@@ -80,9 +85,9 @@ int run(String[] args) {
       File outFile = validateFile("output", outFileName);
 
       try (BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-           FileInputStream fileInputStream = new FileInputStream(inFile);
-           ArrowFileReader arrowReader = new ArrowFileReader(fileInputStream.getChannel(),
-               allocator)) {
+          FileInputStream fileInputStream = new FileInputStream(inFile);
+          ArrowFileReader arrowReader =
+              new ArrowFileReader(fileInputStream.getChannel(), allocator)) {
 
         VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
         Schema schema = root.getSchema();
@@ -90,8 +95,8 @@ int run(String[] args) {
         LOGGER.debug("Found schema: " + schema);
 
         try (FileOutputStream fileOutputStream = new FileOutputStream(outFile);
-             ArrowFileWriter arrowWriter = new ArrowFileWriter(root, arrowReader,
-                 fileOutputStream.getChannel())) {
+            ArrowFileWriter arrowWriter =
+                new ArrowFileWriter(root, arrowReader, fileOutputStream.getChannel())) {
           arrowWriter.start();
           while (true) {
             if (!arrowReader.loadNextBatch()) {
@@ -117,5 +122,4 @@ private int fatalError(String message, Throwable e) {
     LOGGER.error(message, e);
     return 1;
   }
-
 }
diff --git a/java/tools/src/main/java/org/apache/arrow/tools/FileToStream.java b/java/tools/src/main/java/org/apache/arrow/tools/FileToStream.java
index 3d9bca58a763c..e8c62680a6532 100644
--- a/java/tools/src/main/java/org/apache/arrow/tools/FileToStream.java
+++ b/java/tools/src/main/java/org/apache/arrow/tools/FileToStream.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.tools;
 
 import java.io.File;
@@ -22,7 +21,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.VectorSchemaRoot;
@@ -30,16 +28,13 @@
 import org.apache.arrow.vector.ipc.ArrowStreamWriter;
 
 /**
- * Converts an Arrow file to an Arrow stream. The file should be specified as the
- * first argument and the output is written to standard out.
+ * Converts an Arrow file to an Arrow stream. The file should be specified as the first argument and
+ * the output is written to standard out.
  */
 public class FileToStream {
-  private FileToStream() {
-  }
+  private FileToStream() {}
 
-  /**
-   * Reads an Arrow file from in and writes it back to out.
-   */
+  /** Reads an Arrow file from in and writes it back to out. */
   public static void convert(FileInputStream in, OutputStream out) throws IOException {
     BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
     try (ArrowFileReader reader = new ArrowFileReader(in.getChannel(), allocator)) {
@@ -61,8 +56,8 @@ public static void convert(FileInputStream in, OutputStream out) throws IOExcept
   }
 
   /**
-   * Main method.  The first arg is the file path.  The second, optional argument,
-   * is an output file location (defaults to standard out).
+   * Main method. The first arg is the file path. The second, optional argument, is an output file
+   * location (defaults to standard out).
    */
   public static void main(String[] args) throws IOException {
     if (args.length != 1 && args.length != 2) {
@@ -71,8 +66,7 @@ public static void main(String[] args) throws IOException {
     }
 
     FileInputStream in = new FileInputStream(new File(args[0]));
-    OutputStream out = args.length == 1 ?
-        System.out : new FileOutputStream(new File(args[1]));
+    OutputStream out = args.length == 1 ? System.out : new FileOutputStream(new File(args[1]));
 
     convert(in, out);
   }
diff --git a/java/tools/src/main/java/org/apache/arrow/tools/Integration.java b/java/tools/src/main/java/org/apache/arrow/tools/Integration.java
index 1db3eeb6449ee..7deeae9e8bf03 100644
--- a/java/tools/src/main/java/org/apache/arrow/tools/Integration.java
+++ b/java/tools/src/main/java/org/apache/arrow/tools/Integration.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.tools;
 
 import java.io.File;
@@ -25,7 +24,6 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
-
 import org.apache.arrow.compression.CommonsCompressionFactory;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -47,9 +45,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * Application for cross language integration testing.
- */
+/** Application for cross language integration testing. */
 public class Integration {
   private static final Logger LOGGER = LoggerFactory.getLogger(Integration.class);
   private final Options options;
@@ -58,13 +54,11 @@ public class Integration {
     this.options = new Options();
     this.options.addOption("a", "arrow", true, "arrow file");
     this.options.addOption("j", "json", true, "json file");
-    this.options.addOption("c", "command", true, "command to execute: " + Arrays.toString(Command
-        .values()));
+    this.options.addOption(
+        "c", "command", true, "command to execute: " + Arrays.toString(Command.values()));
   }
 
-  /**
-   *  Main method.
-   */
+  /** Main method. */
   public static void main(String[] args) {
     try {
       new Integration().run(args);
@@ -123,28 +117,29 @@ private Command toCommand(String commandName) {
     try {
       return Command.valueOf(commandName);
     } catch (IllegalArgumentException e) {
-      throw new IllegalArgumentException("Unknown command: " + commandName + " expected one of " +
-          Arrays.toString(Command.values()));
+      throw new IllegalArgumentException(
+          "Unknown command: "
+              + commandName
+              + " expected one of "
+              + Arrays.toString(Command.values()));
     }
   }
 
-  /**
-   * Commands (actions) the application can perform.
-   */
+  /** Commands (actions) the application can perform. */
   enum Command {
     ARROW_TO_JSON(true, false) {
       @Override
       public void execute(File arrowFile, File jsonFile) throws IOException {
         try (BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-             FileInputStream fileInputStream = new FileInputStream(arrowFile);
-             ArrowFileReader arrowReader = new ArrowFileReader(fileInputStream.getChannel(),
-                 allocator)) {
+            FileInputStream fileInputStream = new FileInputStream(arrowFile);
+            ArrowFileReader arrowReader =
+                new ArrowFileReader(fileInputStream.getChannel(), allocator)) {
           VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
           Schema schema = root.getSchema();
           LOGGER.debug("Input file size: " + arrowFile.length());
           LOGGER.debug("Found schema: " + schema);
-          try (JsonFileWriter writer = new JsonFileWriter(jsonFile, JsonFileWriter.config()
-              .pretty(true))) {
+          try (JsonFileWriter writer =
+              new JsonFileWriter(jsonFile, JsonFileWriter.config().pretty(true))) {
             writer.start(schema, arrowReader);
             for (ArrowBlock rbBlock : arrowReader.getRecordBlocks()) {
               if (!arrowReader.loadRecordBatch(rbBlock)) {
@@ -161,15 +156,15 @@ public void execute(File arrowFile, File jsonFile) throws IOException {
       @Override
       public void execute(File arrowFile, File jsonFile) throws IOException {
         try (BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-             JsonFileReader reader = new JsonFileReader(jsonFile, allocator)) {
+            JsonFileReader reader = new JsonFileReader(jsonFile, allocator)) {
           Schema schema = reader.start();
           LOGGER.debug("Input file size: " + jsonFile.length());
           LOGGER.debug("Found schema: " + schema);
           try (FileOutputStream fileOutputStream = new FileOutputStream(arrowFile);
-               VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator);
-               // TODO json dictionaries
-               ArrowFileWriter arrowWriter = new ArrowFileWriter(root, reader, fileOutputStream
-                   .getChannel())) {
+              VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator);
+              // TODO json dictionaries
+              ArrowFileWriter arrowWriter =
+                  new ArrowFileWriter(root, reader, fileOutputStream.getChannel())) {
             arrowWriter.start();
             while (reader.read(root)) {
               arrowWriter.writeBatch();
@@ -184,10 +179,11 @@ public void execute(File arrowFile, File jsonFile) throws IOException {
       @Override
       public void execute(File arrowFile, File jsonFile) throws IOException {
         try (BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-             JsonFileReader jsonReader = new JsonFileReader(jsonFile, allocator);
-             FileInputStream fileInputStream = new FileInputStream(arrowFile);
-             ArrowFileReader arrowReader = new ArrowFileReader(fileInputStream.getChannel(),
-                 allocator, CommonsCompressionFactory.INSTANCE)) {
+            JsonFileReader jsonReader = new JsonFileReader(jsonFile, allocator);
+            FileInputStream fileInputStream = new FileInputStream(arrowFile);
+            ArrowFileReader arrowReader =
+                new ArrowFileReader(
+                    fileInputStream.getChannel(), allocator, CommonsCompressionFactory.INSTANCE)) {
           Schema jsonSchema = jsonReader.start();
           VectorSchemaRoot arrowRoot = arrowReader.getVectorSchemaRoot();
           Schema arrowSchema = arrowRoot.getSchema();
@@ -221,9 +217,14 @@ public void execute(File arrowFile, File jsonFile) throws IOException {
           boolean hasMoreJSON = jsonRoot != null;
           boolean hasMoreArrow = iterator.hasNext();
           if (hasMoreJSON || hasMoreArrow) {
-            throw new IllegalArgumentException("Unexpected RecordBatches. Total: " + totalBatches +
-                " J:" + hasMoreJSON + " " +
-                "A:" + hasMoreArrow);
+            throw new IllegalArgumentException(
+                "Unexpected RecordBatches. Total: "
+                    + totalBatches
+                    + " J:"
+                    + hasMoreJSON
+                    + " "
+                    + "A:"
+                    + hasMoreArrow);
           }
         }
       }
@@ -238,7 +239,5 @@ public void execute(File arrowFile, File jsonFile) throws IOException {
     }
 
     public abstract void execute(File arrowFile, File jsonFile) throws IOException;
-
   }
-
 }
diff --git a/java/tools/src/main/java/org/apache/arrow/tools/StreamToFile.java b/java/tools/src/main/java/org/apache/arrow/tools/StreamToFile.java
index 6bd3c2fba2ff5..b004e12efd3ad 100644
--- a/java/tools/src/main/java/org/apache/arrow/tools/StreamToFile.java
+++ b/java/tools/src/main/java/org/apache/arrow/tools/StreamToFile.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.tools;
 
 import java.io.File;
@@ -24,7 +23,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.channels.Channels;
-
 import org.apache.arrow.compression.CommonsCompressionFactory;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -32,16 +30,13 @@
 import org.apache.arrow.vector.ipc.ArrowFileWriter;
 import org.apache.arrow.vector.ipc.ArrowStreamReader;
 
-/**
- * Converts an Arrow stream to an Arrow file.
- */
+/** Converts an Arrow stream to an Arrow file. */
 public class StreamToFile {
-  /**
-   *  Reads an Arrow stream from <code>in</code> and writes it to <code>out</code>.
-   */
+  /** Reads an Arrow stream from <code>in</code> and writes it to <code>out</code>. */
   public static void convert(InputStream in, OutputStream out) throws IOException {
     BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-    try (ArrowStreamReader reader = new ArrowStreamReader(in, allocator, CommonsCompressionFactory.INSTANCE)) {
+    try (ArrowStreamReader reader =
+        new ArrowStreamReader(in, allocator, CommonsCompressionFactory.INSTANCE)) {
       VectorSchemaRoot root = reader.getVectorSchemaRoot();
       // load the first batch before instantiating the writer so that we have any dictionaries.
       // Only writeBatches if we load the first one.
@@ -60,9 +55,8 @@ public static void convert(InputStream in, OutputStream out) throws IOException
   }
 
   /**
-   * Main method.  Defaults to reading from standard in and standard out.
-   * If there are two arguments the first is interpreted as the input file path,
-   * the second is the output file path.
+   * Main method. Defaults to reading from standard in and standard out. If there are two arguments
+   * the first is interpreted as the input file path, the second is the output file path.
    */
   public static void main(String[] args) throws IOException {
     InputStream in = System.in;
diff --git a/java/tools/src/test/java/org/apache/arrow/tools/ArrowFileTestFixtures.java b/java/tools/src/test/java/org/apache/arrow/tools/ArrowFileTestFixtures.java
index 1bc7ead7b73bb..d53db2bc54253 100644
--- a/java/tools/src/test/java/org/apache/arrow/tools/ArrowFileTestFixtures.java
+++ b/java/tools/src/test/java/org/apache/arrow/tools/ArrowFileTestFixtures.java
@@ -14,28 +14,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.tools;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
-
 import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.FieldVector;
+import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
+import org.apache.arrow.vector.ViewVarBinaryVector;
+import org.apache.arrow.vector.ViewVarCharVector;
 import org.apache.arrow.vector.complex.NonNullableStructVector;
 import org.apache.arrow.vector.complex.impl.ComplexWriterImpl;
 import org.apache.arrow.vector.complex.writer.BaseWriter.ComplexWriter;
 import org.apache.arrow.vector.complex.writer.BaseWriter.StructWriter;
 import org.apache.arrow.vector.complex.writer.BigIntWriter;
 import org.apache.arrow.vector.complex.writer.IntWriter;
+import org.apache.arrow.vector.complex.writer.ViewVarBinaryWriter;
+import org.apache.arrow.vector.complex.writer.ViewVarCharWriter;
 import org.apache.arrow.vector.ipc.ArrowFileReader;
 import org.apache.arrow.vector.ipc.ArrowFileWriter;
 import org.apache.arrow.vector.ipc.message.ArrowBlock;
-import org.junit.Assert;
+import org.apache.arrow.vector.util.Text;
 
 public class ArrowFileTestFixtures {
   static final int COUNT = 10;
@@ -54,13 +60,51 @@ static void writeData(int count, NonNullableStructVector parent) {
     writer.setValueCount(count);
   }
 
+  private static String generateString(int length) {
+    StringBuilder stringBuilder = new StringBuilder(length);
+
+    for (int i = 0; i < length; i++) {
+      stringBuilder.append(i);
+    }
+
+    return stringBuilder.toString();
+  }
+
+  private static byte[] generateBytes(int length) {
+    byte[] bytes = new byte[length];
+    for (int i = 0; i < length; i++) {
+      bytes[i] = (byte) i;
+    }
+    return bytes;
+  }
+
+  static void writeVariableWidthViewData(int count, NonNullableStructVector parent) {
+    ComplexWriter writer = new ComplexWriterImpl("root", parent);
+    StructWriter rootWriter = writer.rootAsStruct();
+    ViewVarCharWriter viewVarCharWriter = rootWriter.viewVarChar("viewVarChar");
+    ViewVarBinaryWriter viewVarBinaryWriter = rootWriter.viewVarBinary("viewVarBinary");
+    IntWriter intWriter = rootWriter.integer("int");
+    BigIntWriter bigIntWriter = rootWriter.bigInt("bigInt");
+    for (int i = 0; i < count; i++) {
+      viewVarCharWriter.setPosition(i);
+      viewVarCharWriter.writeViewVarChar(generateString(i));
+      viewVarBinaryWriter.setPosition(i);
+      viewVarBinaryWriter.writeViewVarBinary(generateBytes(i));
+      intWriter.setPosition(i);
+      intWriter.writeInt(i);
+      bigIntWriter.setPosition(i);
+      bigIntWriter.writeBigInt(i);
+    }
+    writer.setValueCount(count);
+  }
+
   static void validateOutput(File testOutFile, BufferAllocator allocator) throws Exception {
     // read
-    try (BufferAllocator readerAllocator = allocator.newChildAllocator("reader", 0, Integer
-        .MAX_VALUE);
-         FileInputStream fileInputStream = new FileInputStream(testOutFile);
-         ArrowFileReader arrowReader = new ArrowFileReader(fileInputStream.getChannel(),
-             readerAllocator)) {
+    try (BufferAllocator readerAllocator =
+            allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
+        FileInputStream fileInputStream = new FileInputStream(testOutFile);
+        ArrowFileReader arrowReader =
+            new ArrowFileReader(fileInputStream.getChannel(), readerAllocator)) {
       VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
       for (ArrowBlock rbBlock : arrowReader.getRecordBlocks()) {
         if (!arrowReader.loadRecordBatch(rbBlock)) {
@@ -71,32 +115,70 @@ static void validateOutput(File testOutFile, BufferAllocator allocator) throws E
     }
   }
 
+  static void validateVariadicOutput(File testOutFile, BufferAllocator allocator, int count)
+      throws Exception {
+    // read
+    try (BufferAllocator readerAllocator =
+            allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
+        FileInputStream fileInputStream = new FileInputStream(testOutFile);
+        ArrowFileReader arrowReader =
+            new ArrowFileReader(fileInputStream.getChannel(), readerAllocator)) {
+      VectorSchemaRoot root = arrowReader.getVectorSchemaRoot();
+      for (ArrowBlock rbBlock : arrowReader.getRecordBlocks()) {
+        if (!arrowReader.loadRecordBatch(rbBlock)) {
+          throw new IOException("Expected to read record batch");
+        }
+        validateVariadicContent(count, root);
+      }
+    }
+  }
+
   static void validateContent(int count, VectorSchemaRoot root) {
-    Assert.assertEquals(count, root.getRowCount());
+    assertEquals(count, root.getRowCount());
+    for (int i = 0; i < count; i++) {
+      assertEquals(i, root.getVector("int").getObject(i));
+      assertEquals(Long.valueOf(i), root.getVector("bigInt").getObject(i));
+    }
+  }
+
+  static void validateVariadicContent(int count, VectorSchemaRoot root) {
+    assertEquals(count, root.getRowCount());
+    ViewVarCharVector viewVarCharVector = (ViewVarCharVector) root.getVector("viewVarChar");
+    ViewVarBinaryVector viewVarBinaryVector = (ViewVarBinaryVector) root.getVector("viewVarBinary");
+    IntVector intVector = (IntVector) root.getVector("int");
+    BigIntVector bigIntVector = (BigIntVector) root.getVector("bigInt");
     for (int i = 0; i < count; i++) {
-      Assert.assertEquals(i, root.getVector("int").getObject(i));
-      Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getObject(i));
+      assertEquals(new Text(generateString(i)), viewVarCharVector.getObject(i));
+      assertArrayEquals(generateBytes(i), viewVarBinaryVector.get(i));
+      assertEquals(i, intVector.getObject(i));
+      assertEquals(Long.valueOf(i), bigIntVector.getObject(i));
     }
   }
 
-  static void write(FieldVector parent, File file) throws FileNotFoundException, IOException {
+  static void write(FieldVector parent, File file) throws IOException {
     VectorSchemaRoot root = new VectorSchemaRoot(parent);
     try (FileOutputStream fileOutputStream = new FileOutputStream(file);
-         ArrowFileWriter arrowWriter = new ArrowFileWriter(root, null, fileOutputStream
-             .getChannel())) {
+        ArrowFileWriter arrowWriter =
+            new ArrowFileWriter(root, null, fileOutputStream.getChannel())) {
       arrowWriter.writeBatch();
     }
   }
 
+  static void writeInput(File testInFile, BufferAllocator allocator) throws IOException {
+    try (BufferAllocator vectorAllocator =
+            allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
+        NonNullableStructVector parent = NonNullableStructVector.empty("parent", vectorAllocator)) {
+      writeData(COUNT, parent);
+      write(parent.getChild("root"), testInFile);
+    }
+  }
 
-  static void writeInput(File testInFile, BufferAllocator allocator) throws
-      FileNotFoundException, IOException {
-    int count = ArrowFileTestFixtures.COUNT;
-    try (
-        BufferAllocator vectorAllocator = allocator.newChildAllocator("original vectors", 0,
-            Integer.MAX_VALUE);
+  static void writeVariableWidthViewInput(File testInFile, BufferAllocator allocator, int count)
+      throws IOException {
+    try (BufferAllocator vectorAllocator =
+            allocator.newChildAllocator("original view vectors", 0, Integer.MAX_VALUE);
         NonNullableStructVector parent = NonNullableStructVector.empty("parent", vectorAllocator)) {
-      writeData(count, parent);
+      writeVariableWidthViewData(count, parent);
       write(parent.getChild("root"), testInFile);
     }
   }
diff --git a/java/tools/src/test/java/org/apache/arrow/tools/EchoServerTest.java b/java/tools/src/test/java/org/apache/arrow/tools/EchoServerTest.java
index 9cf893ee5c283..239913ca4ea1e 100644
--- a/java/tools/src/test/java/org/apache/arrow/tools/EchoServerTest.java
+++ b/java/tools/src/test/java/org/apache/arrow/tools/EchoServerTest.java
@@ -14,15 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.tools;
 
 import static java.util.Arrays.asList;
 import static org.apache.arrow.vector.types.Types.MinorType.TINYINT;
 import static org.apache.arrow.vector.types.Types.MinorType.VARCHAR;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.google.common.collect.ImmutableList;
 import java.io.IOException;
 import java.net.Socket;
 import java.net.UnknownHostException;
@@ -30,7 +33,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.FieldVector;
@@ -54,12 +56,9 @@
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.arrow.vector.util.Text;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.google.common.collect.ImmutableList;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 public class EchoServerTest {
 
@@ -67,39 +66,37 @@ public class EchoServerTest {
   private static int serverPort;
   private static Thread serverThread;
 
-  @BeforeClass
+  @BeforeAll
   public static void startEchoServer() throws IOException {
     server = new EchoServer(0);
     serverPort = server.port();
-    serverThread = new Thread() {
-      @Override
-      public void run() {
-        try {
-          server.run();
-        } catch (IOException e) {
-          e.printStackTrace();
-        }
-      }
-    };
+    serverThread =
+        new Thread() {
+          @Override
+          public void run() {
+            try {
+              server.run();
+            } catch (IOException e) {
+              e.printStackTrace();
+            }
+          }
+        };
     serverThread.start();
   }
 
-  @AfterClass
+  @AfterAll
   public static void stopEchoServer() throws IOException, InterruptedException {
     server.close();
     serverThread.join();
   }
 
-  private void testEchoServer(int serverPort,
-                              Field field,
-                              TinyIntVector vector,
-                              int batches)
+  private void testEchoServer(int serverPort, Field field, TinyIntVector vector, int batches)
       throws UnknownHostException, IOException {
     VectorSchemaRoot root = new VectorSchemaRoot(asList(field), asList((FieldVector) vector), 0);
     try (BufferAllocator alloc = new RootAllocator(Long.MAX_VALUE);
-         Socket socket = new Socket("localhost", serverPort);
-         ArrowStreamWriter writer = new ArrowStreamWriter(root, null, socket.getOutputStream());
-         ArrowStreamReader reader = new ArrowStreamReader(socket.getInputStream(), alloc)) {
+        Socket socket = new Socket("localhost", serverPort);
+        ArrowStreamWriter writer = new ArrowStreamWriter(root, null, socket.getOutputStream());
+        ArrowStreamReader reader = new ArrowStreamReader(socket.getInputStream(), alloc)) {
       writer.start();
       for (int i = 0; i < batches; i++) {
         vector.allocateNew(16);
@@ -115,10 +112,10 @@ private void testEchoServer(int serverPort,
 
       assertEquals(new Schema(asList(field)), reader.getVectorSchemaRoot().getSchema());
 
-      TinyIntVector readVector = (TinyIntVector) reader.getVectorSchemaRoot()
-          .getFieldVectors().get(0);
+      TinyIntVector readVector =
+          (TinyIntVector) reader.getVectorSchemaRoot().getFieldVectors().get(0);
       for (int i = 0; i < batches; i++) {
-        Assert.assertTrue(reader.loadNextBatch());
+        assertTrue(reader.loadNextBatch());
         assertEquals(16, reader.getVectorSchemaRoot().getRowCount());
         assertEquals(16, readVector.getValueCount());
         for (int j = 0; j < 8; j++) {
@@ -126,7 +123,7 @@ private void testEchoServer(int serverPort,
           assertTrue(readVector.isNull(j + 8));
         }
       }
-      Assert.assertFalse(reader.loadNextBatch());
+      assertFalse(reader.loadNextBatch());
       assertEquals(0, reader.getVectorSchemaRoot().getRowCount());
       assertEquals(reader.bytesRead(), writer.bytesWritten());
     }
@@ -136,10 +133,11 @@ private void testEchoServer(int serverPort,
   public void basicTest() throws InterruptedException, IOException {
     BufferAllocator alloc = new RootAllocator(Long.MAX_VALUE);
 
-    Field field = new Field(
-        "testField",
-        new FieldType(true, new ArrowType.Int(8, true), null, null),
-        Collections.<Field>emptyList());
+    Field field =
+        new Field(
+            "testField",
+            new FieldType(true, new ArrowType.Int(8, true), null, null),
+            Collections.<Field>emptyList());
     TinyIntVector vector =
         new TinyIntVector("testField", FieldType.nullable(TINYINT.getType()), alloc);
 
@@ -157,62 +155,62 @@ public void basicTest() throws InterruptedException, IOException {
   public void testFlatDictionary() throws IOException {
     DictionaryEncoding writeEncoding = new DictionaryEncoding(1L, false, null);
     try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         IntVector writeVector =
-             new IntVector(
-                 "varchar",
-                 new FieldType(true, MinorType.INT.getType(), writeEncoding, null),
-                 allocator);
-         VarCharVector writeDictionaryVector =
-             new VarCharVector(
-                 "dict",
-                 FieldType.nullable(VARCHAR.getType()),
-                 allocator)) {
+        IntVector writeVector =
+            new IntVector(
+                "varchar",
+                new FieldType(true, MinorType.INT.getType(), writeEncoding, null),
+                allocator);
+        VarCharVector writeDictionaryVector =
+            new VarCharVector("dict", FieldType.nullable(VARCHAR.getType()), allocator)) {
 
       ValueVectorDataPopulator.setVector(writeVector, 0, 1, null, 2, 1, 2);
-      ValueVectorDataPopulator.setVector(writeDictionaryVector, "foo".getBytes(StandardCharsets.UTF_8),
-          "bar".getBytes(StandardCharsets.UTF_8), "baz".getBytes(StandardCharsets.UTF_8));
+      ValueVectorDataPopulator.setVector(
+          writeDictionaryVector,
+          "foo".getBytes(StandardCharsets.UTF_8),
+          "bar".getBytes(StandardCharsets.UTF_8),
+          "baz".getBytes(StandardCharsets.UTF_8));
 
       List<Field> fields = ImmutableList.of(writeVector.getField());
       List<FieldVector> vectors = ImmutableList.of((FieldVector) writeVector);
       VectorSchemaRoot root = new VectorSchemaRoot(fields, vectors, 6);
 
-      DictionaryProvider writeProvider = new MapDictionaryProvider(
-          new Dictionary(writeDictionaryVector, writeEncoding));
+      DictionaryProvider writeProvider =
+          new MapDictionaryProvider(new Dictionary(writeDictionaryVector, writeEncoding));
 
       try (Socket socket = new Socket("localhost", serverPort);
-           ArrowStreamWriter writer = new ArrowStreamWriter(root, writeProvider, socket
-               .getOutputStream());
-           ArrowStreamReader reader = new ArrowStreamReader(socket.getInputStream(), allocator)) {
+          ArrowStreamWriter writer =
+              new ArrowStreamWriter(root, writeProvider, socket.getOutputStream());
+          ArrowStreamReader reader = new ArrowStreamReader(socket.getInputStream(), allocator)) {
         writer.start();
         writer.writeBatch();
         writer.end();
 
         reader.loadNextBatch();
         VectorSchemaRoot readerRoot = reader.getVectorSchemaRoot();
-        Assert.assertEquals(6, readerRoot.getRowCount());
+        assertEquals(6, readerRoot.getRowCount());
 
         FieldVector readVector = readerRoot.getFieldVectors().get(0);
-        Assert.assertNotNull(readVector);
+        assertNotNull(readVector);
 
         DictionaryEncoding readEncoding = readVector.getField().getDictionary();
-        Assert.assertNotNull(readEncoding);
-        Assert.assertEquals(1L, readEncoding.getId());
+        assertNotNull(readEncoding);
+        assertEquals(1L, readEncoding.getId());
 
-        Assert.assertEquals(6, readVector.getValueCount());
-        Assert.assertEquals(0, readVector.getObject(0));
-        Assert.assertEquals(1, readVector.getObject(1));
-        Assert.assertEquals(null, readVector.getObject(2));
-        Assert.assertEquals(2, readVector.getObject(3));
-        Assert.assertEquals(1, readVector.getObject(4));
-        Assert.assertEquals(2, readVector.getObject(5));
+        assertEquals(6, readVector.getValueCount());
+        assertEquals(0, readVector.getObject(0));
+        assertEquals(1, readVector.getObject(1));
+        assertEquals(null, readVector.getObject(2));
+        assertEquals(2, readVector.getObject(3));
+        assertEquals(1, readVector.getObject(4));
+        assertEquals(2, readVector.getObject(5));
 
         Dictionary dictionary = reader.lookup(1L);
-        Assert.assertNotNull(dictionary);
+        assertNotNull(dictionary);
         VarCharVector dictionaryVector = ((VarCharVector) dictionary.getVector());
-        Assert.assertEquals(3, dictionaryVector.getValueCount());
-        Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
-        Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
-        Assert.assertEquals(new Text("baz"), dictionaryVector.getObject(2));
+        assertEquals(3, dictionaryVector.getValueCount());
+        assertEquals(new Text("foo"), dictionaryVector.getObject(0));
+        assertEquals(new Text("bar"), dictionaryVector.getObject(1));
+        assertEquals(new Text("baz"), dictionaryVector.getObject(2));
       }
     }
   }
@@ -221,9 +219,9 @@ public void testFlatDictionary() throws IOException {
   public void testNestedDictionary() throws IOException {
     DictionaryEncoding writeEncoding = new DictionaryEncoding(2L, false, null);
     try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         VarCharVector writeDictionaryVector =
-             new VarCharVector("dictionary", FieldType.nullable(VARCHAR.getType()), allocator);
-         ListVector writeVector = ListVector.empty("list", allocator)) {
+        VarCharVector writeDictionaryVector =
+            new VarCharVector("dictionary", FieldType.nullable(VARCHAR.getType()), allocator);
+        ListVector writeVector = ListVector.empty("list", allocator)) {
 
       // data being written:
       // [['foo', 'bar'], ['foo'], ['bar']] -> [[0, 1], [0], [1]]
@@ -252,48 +250,48 @@ public void testNestedDictionary() throws IOException {
       List<FieldVector> vectors = ImmutableList.of((FieldVector) writeVector);
       VectorSchemaRoot root = new VectorSchemaRoot(fields, vectors, 3);
 
-      DictionaryProvider writeProvider = new MapDictionaryProvider(
-          new Dictionary(writeDictionaryVector, writeEncoding));
+      DictionaryProvider writeProvider =
+          new MapDictionaryProvider(new Dictionary(writeDictionaryVector, writeEncoding));
 
       try (Socket socket = new Socket("localhost", serverPort);
-           ArrowStreamWriter writer = new ArrowStreamWriter(root, writeProvider, socket
-               .getOutputStream());
-           ArrowStreamReader reader = new ArrowStreamReader(socket.getInputStream(), allocator)) {
+          ArrowStreamWriter writer =
+              new ArrowStreamWriter(root, writeProvider, socket.getOutputStream());
+          ArrowStreamReader reader = new ArrowStreamReader(socket.getInputStream(), allocator)) {
         writer.start();
         writer.writeBatch();
         writer.end();
 
         reader.loadNextBatch();
         VectorSchemaRoot readerRoot = reader.getVectorSchemaRoot();
-        Assert.assertEquals(3, readerRoot.getRowCount());
+        assertEquals(3, readerRoot.getRowCount());
 
         ListVector readVector = (ListVector) readerRoot.getFieldVectors().get(0);
-        Assert.assertNotNull(readVector);
+        assertNotNull(readVector);
 
-        Assert.assertNull(readVector.getField().getDictionary());
-        DictionaryEncoding readEncoding = readVector.getField().getChildren().get(0)
-            .getDictionary();
-        Assert.assertNotNull(readEncoding);
-        Assert.assertEquals(2L, readEncoding.getId());
+        assertNull(readVector.getField().getDictionary());
+        DictionaryEncoding readEncoding =
+            readVector.getField().getChildren().get(0).getDictionary();
+        assertNotNull(readEncoding);
+        assertEquals(2L, readEncoding.getId());
 
         Field nestedField = readVector.getField().getChildren().get(0);
 
         DictionaryEncoding encoding = nestedField.getDictionary();
-        Assert.assertNotNull(encoding);
-        Assert.assertEquals(2L, encoding.getId());
-        Assert.assertEquals(new Int(32, true), encoding.getIndexType());
+        assertNotNull(encoding);
+        assertEquals(2L, encoding.getId());
+        assertEquals(new Int(32, true), encoding.getIndexType());
 
-        Assert.assertEquals(3, readVector.getValueCount());
-        Assert.assertEquals(Arrays.asList(0, 1), readVector.getObject(0));
-        Assert.assertEquals(Arrays.asList(0), readVector.getObject(1));
-        Assert.assertEquals(Arrays.asList(1), readVector.getObject(2));
+        assertEquals(3, readVector.getValueCount());
+        assertEquals(Arrays.asList(0, 1), readVector.getObject(0));
+        assertEquals(Arrays.asList(0), readVector.getObject(1));
+        assertEquals(Arrays.asList(1), readVector.getObject(2));
 
         Dictionary readDictionary = reader.lookup(2L);
-        Assert.assertNotNull(readDictionary);
+        assertNotNull(readDictionary);
         VarCharVector dictionaryVector = ((VarCharVector) readDictionary.getVector());
-        Assert.assertEquals(2, dictionaryVector.getValueCount());
-        Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
-        Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
+        assertEquals(2, dictionaryVector.getValueCount());
+        assertEquals(new Text("foo"), dictionaryVector.getObject(0));
+        assertEquals(new Text("bar"), dictionaryVector.getObject(1));
       }
     }
   }
diff --git a/java/tools/src/test/java/org/apache/arrow/tools/TestFileRoundtrip.java b/java/tools/src/test/java/org/apache/arrow/tools/TestFileRoundtrip.java
index a5d6c9658fd4f..5839f50383213 100644
--- a/java/tools/src/test/java/org/apache/arrow/tools/TestFileRoundtrip.java
+++ b/java/tools/src/test/java/org/apache/arrow/tools/TestFileRoundtrip.java
@@ -14,44 +14,59 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.tools;
 
 import static org.apache.arrow.tools.ArrowFileTestFixtures.validateOutput;
 import static org.apache.arrow.tools.ArrowFileTestFixtures.writeInput;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
-
+import java.io.FileOutputStream;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
+import org.apache.arrow.vector.ipc.InvalidArrowFileException;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class TestFileRoundtrip {
 
-  @Rule
-  public TemporaryFolder testFolder = new TemporaryFolder();
+  @TempDir public File testFolder;
+  @TempDir public File testAnotherFolder;
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Integer.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     allocator.close();
   }
 
   @Test
   public void test() throws Exception {
-    File testInFile = testFolder.newFile("testIn.arrow");
-    File testOutFile = testFolder.newFile("testOut.arrow");
+    File testInFile = new File(testFolder, "testIn.arrow");
+    File testOutFile = new File(testFolder, "testOut.arrow");
+
+    writeInput(testInFile, allocator);
+
+    String[] args = {"-i", testInFile.getAbsolutePath(), "-o", testOutFile.getAbsolutePath()};
+    int result = new FileRoundtrip(System.err).run(args);
+    assertEquals(0, result);
+
+    validateOutput(testOutFile, allocator);
+  }
+
+  @Test
+  public void testDiffFolder() throws Exception {
+    File testInFile = new File(testFolder, "testIn.arrow");
+    File testOutFile = new File(testAnotherFolder, "testOut.arrow");
 
     writeInput(testInFile, allocator);
 
@@ -62,4 +77,38 @@ public void test() throws Exception {
     validateOutput(testOutFile, allocator);
   }
 
+  @Test
+  public void testNotFoundInput() {
+    File testInFile = new File(testFolder, "testIn.arrow");
+    File testOutFile = new File(testFolder, "testOut.arrow");
+
+    String[] args = {"-i", testInFile.getAbsolutePath(), "-o", testOutFile.getAbsolutePath()};
+    Exception exception =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              new FileRoundtrip(System.err).run(args);
+            });
+
+    assertTrue(exception.getMessage().contains("input file not found"));
+  }
+
+  @Test
+  public void testSmallSizeInput() throws Exception {
+    File testInFile = new File(testFolder, "testIn.arrow");
+    File testOutFile = new File(testFolder, "testOut.arrow");
+
+    // create an empty file
+    new FileOutputStream(testInFile).close();
+
+    String[] args = {"-i", testInFile.getAbsolutePath(), "-o", testOutFile.getAbsolutePath()};
+    Exception exception =
+        assertThrows(
+            InvalidArrowFileException.class,
+            () -> {
+              new FileRoundtrip(System.err).run(args);
+            });
+
+    assertEquals("file too small: 0", exception.getMessage());
+  }
 }
diff --git a/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java b/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java
index 1232c6c1d86ee..28f9a9010f3f1 100644
--- a/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java
+++ b/java/tools/src/test/java/org/apache/arrow/tools/TestIntegration.java
@@ -14,24 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.tools;
 
 import static org.apache.arrow.tools.ArrowFileTestFixtures.validateOutput;
+import static org.apache.arrow.tools.ArrowFileTestFixtures.validateVariadicOutput;
 import static org.apache.arrow.tools.ArrowFileTestFixtures.write;
 import static org.apache.arrow.tools.ArrowFileTestFixtures.writeData;
 import static org.apache.arrow.tools.ArrowFileTestFixtures.writeInput;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.apache.arrow.tools.ArrowFileTestFixtures.writeVariableWidthViewInput;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter.NopIndenter;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.Map;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.tools.Integration.Command;
@@ -42,21 +45,14 @@
 import org.apache.arrow.vector.complex.writer.BigIntWriter;
 import org.apache.arrow.vector.complex.writer.Float8Writer;
 import org.apache.arrow.vector.complex.writer.IntWriter;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
-import com.fasterxml.jackson.core.util.DefaultPrettyPrinter.NopIndenter;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 
 public class TestIntegration {
 
-  @Rule
-  public TemporaryFolder testFolder = new TemporaryFolder();
+  @TempDir public File testFolder;
 
   private BufferAllocator allocator;
   private ObjectMapper om = new ObjectMapper();
@@ -69,11 +65,10 @@ public class TestIntegration {
     om.enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS);
   }
 
-  static void writeInputFloat(File testInFile, BufferAllocator allocator, double... f) throws
-      FileNotFoundException, IOException {
-    try (
-        BufferAllocator vectorAllocator = allocator.newChildAllocator("original vectors", 0,
-            Integer.MAX_VALUE);
+  static void writeInputFloat(File testInFile, BufferAllocator allocator, double... f)
+      throws IOException {
+    try (BufferAllocator vectorAllocator =
+            allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
         NonNullableStructVector parent = NonNullableStructVector.empty("parent", vectorAllocator)) {
       ComplexWriter writer = new ComplexWriterImpl("root", parent);
       StructWriter rootWriter = writer.rootAsStruct();
@@ -87,12 +82,10 @@ static void writeInputFloat(File testInFile, BufferAllocator allocator, double..
     }
   }
 
-  static void writeInput2(File testInFile, BufferAllocator allocator) throws
-      FileNotFoundException, IOException {
+  static void writeInput2(File testInFile, BufferAllocator allocator) throws IOException {
     int count = ArrowFileTestFixtures.COUNT;
-    try (
-        BufferAllocator vectorAllocator = allocator.newChildAllocator("original vectors", 0,
-            Integer.MAX_VALUE);
+    try (BufferAllocator vectorAllocator =
+            allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
         NonNullableStructVector parent = NonNullableStructVector.empty("parent", vectorAllocator)) {
       writeData(count, parent);
       ComplexWriter writer = new ComplexWriterImpl("root", parent);
@@ -108,22 +101,22 @@ static void writeInput2(File testInFile, BufferAllocator allocator) throws
     }
   }
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Integer.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     allocator.close();
   }
 
   @Test
   public void testValid() throws Exception {
-    File testInFile = testFolder.newFile("testIn.arrow");
-    File testJSONFile = testFolder.newFile("testOut.json");
+    File testInFile = new File(testFolder, "testIn.arrow");
+    File testJSONFile = new File(testFolder, "testOut.json");
     testJSONFile.delete();
-    File testOutFile = testFolder.newFile("testOut.arrow");
+    File testOutFile = new File(testFolder, "testOut.arrow");
     testOutFile.delete();
 
     // generate an arrow file
@@ -132,45 +125,77 @@ public void testValid() throws Exception {
     Integration integration = new Integration();
 
     // convert it to json
-    String[] args1 = {"-arrow", testInFile.getAbsolutePath(), "-json", testJSONFile
-        .getAbsolutePath(), "-command", Command.ARROW_TO_JSON.name()};
+    String[] args1 = {
+      "-arrow",
+      testInFile.getAbsolutePath(),
+      "-json",
+      testJSONFile.getAbsolutePath(),
+      "-command",
+      Command.ARROW_TO_JSON.name()
+    };
     integration.run(args1);
 
     // convert back to arrow
-    String[] args2 = {"-arrow", testOutFile.getAbsolutePath(), "-json", testJSONFile
-        .getAbsolutePath(), "-command", Command.JSON_TO_ARROW.name()};
+    String[] args2 = {
+      "-arrow",
+      testOutFile.getAbsolutePath(),
+      "-json",
+      testJSONFile.getAbsolutePath(),
+      "-command",
+      Command.JSON_TO_ARROW.name()
+    };
     integration.run(args2);
 
     // check it is the same
     validateOutput(testOutFile, allocator);
 
     // validate arrow against json
-    String[] args3 = {"-arrow", testInFile.getAbsolutePath(), "-json", testJSONFile
-        .getAbsolutePath(), "-command", Command.VALIDATE.name()};
+    String[] args3 = {
+      "-arrow",
+      testInFile.getAbsolutePath(),
+      "-json",
+      testJSONFile.getAbsolutePath(),
+      "-command",
+      Command.VALIDATE.name()
+    };
     integration.run(args3);
   }
 
   @Test
   public void testJSONRoundTripWithVariableWidth() throws Exception {
-    File testJSONFile = new File("../../docs/source/format/integration_json_examples/simple.json").getCanonicalFile();
+    File testJSONFile =
+        new File("../../docs/source/format/integration_json_examples/simple.json")
+            .getCanonicalFile();
     if (!testJSONFile.exists()) {
       testJSONFile = new File("../docs/source/format/integration_json_examples/simple.json");
     }
-    File testOutFile = testFolder.newFile("testOut.arrow");
-    File testRoundTripJSONFile = testFolder.newFile("testOut.json");
+    File testOutFile = new File(testFolder, "testOut.arrow");
+    File testRoundTripJSONFile = new File(testFolder, "testOut.json");
     testOutFile.delete();
     testRoundTripJSONFile.delete();
 
     Integration integration = new Integration();
 
     // convert to arrow
-    String[] args1 = {"-arrow", testOutFile.getAbsolutePath(), "-json", testJSONFile
-        .getAbsolutePath(), "-command", Command.JSON_TO_ARROW.name()};
+    String[] args1 = {
+      "-arrow",
+      testOutFile.getAbsolutePath(),
+      "-json",
+      testJSONFile.getAbsolutePath(),
+      "-command",
+      Command.JSON_TO_ARROW.name()
+    };
     integration.run(args1);
 
     // convert back to json
-    String[] args2 = {"-arrow", testOutFile.getAbsolutePath(), "-json", testRoundTripJSONFile
-        .getAbsolutePath(), "-command", Command.ARROW_TO_JSON.name()};
+    String[] args2 = {
+      "-arrow",
+      testOutFile.getAbsolutePath(),
+      "-json",
+      testRoundTripJSONFile.getAbsolutePath(),
+      "-command",
+      Command.ARROW_TO_JSON.name()
+    };
     integration.run(args2);
 
     BufferedReader orig = readNormalized(testJSONFile);
@@ -179,32 +204,46 @@ public void testJSONRoundTripWithVariableWidth() throws Exception {
     String o;
     int j = 0;
     while ((i = orig.readLine()) != null && (o = rt.readLine()) != null) {
-      assertEquals("line: " + j, i, o);
+      assertEquals(i, o, "line: " + j);
       ++j;
     }
   }
 
   @Test
   public void testJSONRoundTripWithStruct() throws Exception {
-    File testJSONFile = new File("../../docs/source/format/integration_json_examples/struct.json").getCanonicalFile();
+    File testJSONFile =
+        new File("../../docs/source/format/integration_json_examples/struct.json")
+            .getCanonicalFile();
     if (!testJSONFile.exists()) {
       testJSONFile = new File("../docs/source/format/integration_json_examples/struct.json");
     }
-    File testOutFile = testFolder.newFile("testOutStruct.arrow");
-    File testRoundTripJSONFile = testFolder.newFile("testOutStruct.json");
+    File testOutFile = new File(testFolder, "testOutStruct.arrow");
+    File testRoundTripJSONFile = new File(testFolder, "testOutStruct.json");
     testOutFile.delete();
     testRoundTripJSONFile.delete();
 
     Integration integration = new Integration();
 
     // convert to arrow
-    String[] args1 = {"-arrow", testOutFile.getAbsolutePath(), "-json", testJSONFile
-        .getAbsolutePath(), "-command", Command.JSON_TO_ARROW.name()};
+    String[] args1 = {
+      "-arrow",
+      testOutFile.getAbsolutePath(),
+      "-json",
+      testJSONFile.getAbsolutePath(),
+      "-command",
+      Command.JSON_TO_ARROW.name()
+    };
     integration.run(args1);
 
     // convert back to json
-    String[] args2 = {"-arrow", testOutFile.getAbsolutePath(), "-json", testRoundTripJSONFile
-        .getAbsolutePath(), "-command", Command.ARROW_TO_JSON.name()};
+    String[] args2 = {
+      "-arrow",
+      testOutFile.getAbsolutePath(),
+      "-json",
+      testRoundTripJSONFile.getAbsolutePath(),
+      "-command",
+      Command.ARROW_TO_JSON.name()
+    };
     integration.run(args2);
 
     BufferedReader orig = readNormalized(testJSONFile);
@@ -213,7 +252,7 @@ public void testJSONRoundTripWithStruct() throws Exception {
     String o;
     int j = 0;
     while ((i = orig.readLine()) != null && (o = rt.readLine()) != null) {
-      assertEquals("line: " + j, i, o);
+      assertEquals(i, o, "line: " + j);
       ++j;
     }
   }
@@ -224,14 +263,12 @@ private BufferedReader readNormalized(File f) throws IOException {
     return new BufferedReader(new StringReader(normalized));
   }
 
-  /**
-   * The test should not be sensitive to small variations in float representation.
-   */
+  /** The test should not be sensitive to small variations in float representation. */
   @Test
   public void testFloat() throws Exception {
-    File testValidInFile = testFolder.newFile("testValidFloatIn.arrow");
-    File testInvalidInFile = testFolder.newFile("testAlsoValidFloatIn.arrow");
-    File testJSONFile = testFolder.newFile("testValidOut.json");
+    File testValidInFile = new File(testFolder, "testValidFloatIn.arrow");
+    File testInvalidInFile = new File(testFolder, "testAlsoValidFloatIn.arrow");
+    File testJSONFile = new File(testFolder, "testValidOut.json");
     testJSONFile.delete();
 
     // generate an arrow file
@@ -242,22 +279,34 @@ public void testFloat() throws Exception {
     Integration integration = new Integration();
 
     // convert the "valid" file to json
-    String[] args1 = {"-arrow", testValidInFile.getAbsolutePath(), "-json", testJSONFile
-        .getAbsolutePath(), "-command", Command.ARROW_TO_JSON.name()};
+    String[] args1 = {
+      "-arrow",
+      testValidInFile.getAbsolutePath(),
+      "-json",
+      testJSONFile.getAbsolutePath(),
+      "-command",
+      Command.ARROW_TO_JSON.name()
+    };
     integration.run(args1);
 
     // compare the "invalid" file to the "valid" json
-    String[] args3 = {"-arrow", testInvalidInFile.getAbsolutePath(), "-json", testJSONFile
-        .getAbsolutePath(), "-command", Command.VALIDATE.name()};
+    String[] args3 = {
+      "-arrow",
+      testInvalidInFile.getAbsolutePath(),
+      "-json",
+      testJSONFile.getAbsolutePath(),
+      "-command",
+      Command.VALIDATE.name()
+    };
     // this should fail
     integration.run(args3);
   }
 
   @Test
   public void testInvalid() throws Exception {
-    File testValidInFile = testFolder.newFile("testValidIn.arrow");
-    File testInvalidInFile = testFolder.newFile("testInvalidIn.arrow");
-    File testJSONFile = testFolder.newFile("testInvalidOut.json");
+    File testValidInFile = new File(testFolder, "testValidIn.arrow");
+    File testInvalidInFile = new File(testFolder, "testInvalidIn.arrow");
+    File testJSONFile = new File(testFolder, "testInvalidOut.json");
     testJSONFile.delete();
 
     // generate an arrow file
@@ -268,21 +317,88 @@ public void testInvalid() throws Exception {
     Integration integration = new Integration();
 
     // convert the "valid" file to json
-    String[] args1 = {"-arrow", testValidInFile.getAbsolutePath(), "-json", testJSONFile
-        .getAbsolutePath(), "-command", Command.ARROW_TO_JSON.name()};
+    String[] args1 = {
+      "-arrow",
+      testValidInFile.getAbsolutePath(),
+      "-json",
+      testJSONFile.getAbsolutePath(),
+      "-command",
+      Command.ARROW_TO_JSON.name()
+    };
     integration.run(args1);
 
     // compare the "invalid" file to the "valid" json
-    String[] args3 = {"-arrow", testInvalidInFile.getAbsolutePath(), "-json", testJSONFile
-        .getAbsolutePath(), "-command", Command.VALIDATE.name()};
+    String[] args3 = {
+      "-arrow",
+      testInvalidInFile.getAbsolutePath(),
+      "-json",
+      testJSONFile.getAbsolutePath(),
+      "-command",
+      Command.VALIDATE.name()
+    };
     // this should fail
-    try {
+    IllegalArgumentException e =
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> {
+              integration.run(args3);
+            });
+
+    assertTrue(e.getMessage().contains("Different values in column"), e.getMessage());
+    assertTrue(e.getMessage().contains("999"), e.getMessage());
+  }
+
+  @Test
+  public void testValidateVariableWidthView() throws Exception {
+    final int valueCount = 256;
+    final int multiplier = 6;
+
+    for (int i = 1; i < multiplier; i++) {
+      File testInFile = new File(testFolder, "testIn.arrow");
+      File testJSONFile = new File(testFolder, "testOut.json");
+      testJSONFile.delete();
+      File testOutFile = new File(testFolder, "testOut.arrow");
+      testOutFile.delete();
+
+      writeVariableWidthViewInput(testInFile, allocator, multiplier * valueCount);
+
+      Integration integration = new Integration();
+
+      // convert it to json
+      String[] args1 = {
+        "-arrow",
+        testInFile.getAbsolutePath(),
+        "-json",
+        testJSONFile.getAbsolutePath(),
+        "-command",
+        Command.ARROW_TO_JSON.name()
+      };
+      integration.run(args1);
+
+      // convert back to arrow
+      String[] args2 = {
+        "-arrow",
+        testOutFile.getAbsolutePath(),
+        "-json",
+        testJSONFile.getAbsolutePath(),
+        "-command",
+        Command.JSON_TO_ARROW.name()
+      };
+      integration.run(args2);
+
+      // check it is the same
+      validateVariadicOutput(testOutFile, allocator, multiplier * valueCount);
+
+      // validate arrow against json
+      String[] args3 = {
+        "-arrow",
+        testInFile.getAbsolutePath(),
+        "-json",
+        testJSONFile.getAbsolutePath(),
+        "-command",
+        Command.VALIDATE.name()
+      };
       integration.run(args3);
-      fail("should have failed");
-    } catch (IllegalArgumentException e) {
-      assertTrue(e.getMessage(), e.getMessage().contains("Different values in column"));
-      assertTrue(e.getMessage(), e.getMessage().contains("999"));
     }
-
   }
 }
diff --git a/java/vector/pom.xml b/java/vector/pom.xml
index 5cd6d0a00fcca..7541cfd56f5dc 100644
--- a/java/vector/pom.xml
+++ b/java/vector/pom.xml
@@ -1,27 +1,34 @@
-<?xml version="1.0"?>
-<!-- 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. -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.arrow</groupId>
     <artifactId>arrow-java-root</artifactId>
-    <version>16.0.0-SNAPSHOT</version>
+    <version>17.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>arrow-vector</artifactId>
   <name>Arrow Vectors</name>
   <description>An off-heap reference implementation for Arrow columnar data format.</description>
 
   <dependencies>
-
     <dependency>
       <groupId>org.apache.arrow</groupId>
       <artifactId>arrow-format</artifactId>
@@ -32,7 +39,7 @@
     </dependency>
     <dependency>
       <groupId>org.immutables</groupId>
-      <artifactId>value</artifactId>
+      <artifactId>value-annotations</artifactId>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
@@ -53,7 +60,7 @@
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
-      <version>1.16.1</version>
+      <version>1.17.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.arrow</groupId>
@@ -75,37 +82,13 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.collections</groupId>
-      <artifactId>eclipse-collections</artifactId>
-      <version>11.1.0</version>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache</id>
-      <name>apache</name>
-      <url>https://repo.maven.apache.org/maven2/</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-
   <build>
-
-    <resources>
-      <resource>
-        <!-- Copy freemarker template and fmpp configuration files of Vector's
-          to allow clients to leverage definitions. -->
-        <directory>${basedir}/src/main/codegen</directory>
-        <targetPath>codegen</targetPath>
-      </resource>
-    </resources>
-
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -122,10 +105,10 @@
           </execution>
           <execution>
             <id>run-unsafe</id>
-            <phase>test</phase>
             <goals>
               <goal>test</goal>
             </goals>
+            <phase>test</phase>
             <configuration>
               <classpathDependencyExcludes>
                 <classpathDependencyExclude>org.apache.arrow:arrow-memory-netty</classpathDependencyExclude>
@@ -136,41 +119,20 @@
         </executions>
       </plugin>
       <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution> <!-- copy all templates in the same location to compile them at once -->
-            <id>copy-fmpp-resources</id>
-            <phase>initialize</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/codegen</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/codegen</directory>
-                  <filtering>false</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin> <!-- generate sources from fmpp -->
+        <!-- generate sources from fmpp -->
         <groupId>org.apache.drill.tools</groupId>
         <artifactId>drill-fmpp-maven-plugin</artifactId>
-        <version>1.21.1</version>
         <executions>
           <execution>
             <id>generate-fmpp</id>
-            <phase>generate-sources</phase>
             <goals>
               <goal>generate</goal>
             </goals>
+            <phase>generate-sources</phase>
             <configuration>
               <config>src/main/codegen/config.fmpp</config>
-              <output>${project.build.directory}/generated-sources</output>
-              <templates>${project.build.directory}/codegen/templates</templates>
+              <output>${project.build.directory}/generated-sources/fmpp</output>
+              <templates>src/main/codegen/templates</templates>
             </configuration>
           </execution>
         </executions>
@@ -178,19 +140,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <!--
-          Downgrade maven-shade-plugin specifically for this module.
-          Using a newer version up to at least 3.5.1 will cause
-          issues in the arrow-tools tests looking up FlatBuffer
-          dependencies.
-         -->
-        <version>3.5.2</version>
         <executions>
           <execution>
-            <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
+            <phase>package</phase>
             <configuration>
               <artifactSet>
                 <includes>
@@ -198,10 +153,9 @@
                   <include>com.google.flatbuffers:*</include>
                 </includes>
               </artifactSet>
+              <createDependencyReducedPom>false</createDependencyReducedPom>
               <shadedArtifactAttached>true</shadedArtifactAttached>
               <shadedClassifierName>shade-format-flatbuffers</shadedClassifierName>
-              <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
-              <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
               <relocations>
                 <relocation>
                   <pattern>com.google.flatbuffers</pattern>
@@ -213,44 +167,8 @@
         </executions>
       </plugin>
     </plugins>
-    <pluginManagement>
-      <plugins>
-        <!--This plugin's configuration is used to store Eclipse m2e settings
-          only. It has no influence on the Maven build itself. -->
-        <plugin>
-          <groupId>org.eclipse.m2e</groupId>
-          <artifactId>lifecycle-mapping</artifactId>
-          <version>1.0.0</version>
-          <configuration>
-            <lifecycleMappingMetadata>
-              <pluginExecutions>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.drill.tools</groupId>
-                    <artifactId>drill-fmpp-maven-plugin</artifactId>
-                    <versionRange>[1.0,)</versionRange>
-                    <goals>
-                      <goal>generate</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <execute>
-                      <runOnIncremental>false</runOnIncremental>
-                      <runOnConfiguration>true</runOnConfiguration>
-                    </execute>
-                  </action>
-                </pluginExecution>
-              </pluginExecutions>
-            </lifecycleMappingMetadata>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-
-
   </build>
 
-
   <profiles>
     <profile>
       <!-- This profile turns on integration testing. It activates the failsafe plugin and will run any tests
@@ -281,5 +199,4 @@
       </build>
     </profile>
   </profiles>
-
 </project>
diff --git a/java/vector/src/main/codegen/data/ArrowTypes.tdd b/java/vector/src/main/codegen/data/ArrowTypes.tdd
index 3cf9a968791a4..72df4779793f0 100644
--- a/java/vector/src/main/codegen/data/ArrowTypes.tdd
+++ b/java/vector/src/main/codegen/data/ArrowTypes.tdd
@@ -65,6 +65,11 @@
       fields: [],
       complex: false
     },
+    {
+      name: "Utf8View",
+      fields: [],
+      complex: false
+    },
     {
       name: "LargeUtf8",
       fields: [],
@@ -75,6 +80,11 @@
       fields: [],
       complex: false
     },
+    {
+      name: "BinaryView",
+      fields: [],
+      complex: false
+    },
     {
       name: "LargeBinary",
       fields: [],
@@ -119,6 +129,11 @@
        name: "Duration",
        fields: [{name: "unit", type: short, valueType: TimeUnit}],
        complex: false
+    },
+    {
+       name: "ListView",
+       fields: [],
+       complex: true
     }
   ]
 }
diff --git a/java/vector/src/main/codegen/data/ValueVectorTypes.tdd b/java/vector/src/main/codegen/data/ValueVectorTypes.tdd
index 6c2a967712454..ad1f1b93bb3aa 100644
--- a/java/vector/src/main/codegen/data/ValueVectorTypes.tdd
+++ b/java/vector/src/main/codegen/data/ValueVectorTypes.tdd
@@ -189,7 +189,9 @@
       fields: [{name: "start", type: "int"}, {name: "end", type: "int"}, {name: "buffer", type: "ArrowBuf"}],
       minor: [
         { class: "VarBinary" , friendlyType: "byte[]" },
-        { class: "VarChar" , friendlyType: "Text" }
+        { class: "VarChar" , friendlyType: "Text" },
+        { class: "ViewVarBinary" , friendlyType: "byte[]" },
+        { class: "ViewVarChar" , friendlyType: "Text" }
       ]
     },
     {
diff --git a/java/vector/src/main/codegen/templates/DenseUnionVector.java b/java/vector/src/main/codegen/templates/DenseUnionVector.java
index c23caf3bb5a03..e9a9a2878b88c 100644
--- a/java/vector/src/main/codegen/templates/DenseUnionVector.java
+++ b/java/vector/src/main/codegen/templates/DenseUnionVector.java
@@ -23,6 +23,7 @@
 import org.apache.arrow.vector.BaseValueVector;
 import org.apache.arrow.vector.BitVectorHelper;
 import org.apache.arrow.vector.FieldVector;
+import org.apache.arrow.vector.ValueIterableVector;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.complex.AbstractStructVector;
 import org.apache.arrow.vector.complex.ListVector;
@@ -62,6 +63,7 @@
 import org.apache.arrow.vector.util.CallBack;
 import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
 import org.apache.arrow.vector.BaseValueVector;
+import org.apache.arrow.vector.ValueIterableVector;
 import org.apache.arrow.vector.util.OversizedAllocationException;
 import org.apache.arrow.util.Preconditions;
 
@@ -84,7 +86,7 @@
  * each time the vector is accessed.
  * Source code generated using FreeMarker template ${.template_name}
  */
-public class DenseUnionVector extends AbstractContainerVector implements FieldVector {
+public class DenseUnionVector extends AbstractContainerVector implements FieldVector, ValueIterableVector<Object> {
   int valueCount;
 
   NonNullableStructVector internalStruct;
@@ -124,7 +126,7 @@ public class DenseUnionVector extends AbstractContainerVector implements FieldVe
           ArrowType.Struct.INSTANCE, /*dictionary*/ null, /*metadata*/ null);
 
   public static DenseUnionVector empty(String name, BufferAllocator allocator) {
-    FieldType fieldType = FieldType.nullable(new ArrowType.Union(
+    FieldType fieldType = FieldType.notNullable(new ArrowType.Union(
             UnionMode.Dense, null));
     return new DenseUnionVector(name, allocator, fieldType, null);
   }
@@ -676,10 +678,12 @@ public void splitAndTransfer(int startIndex, int length) {
 
       for (int i = startIndex; i < startIndex + length; i++) {
         byte typeId = typeBuffer.getByte(i);
-        to.offsetBuffer.setInt((long) (i - startIndex) * OFFSET_WIDTH, typeCounts[typeId]);
-        typeCounts[typeId] += 1;
-        if (typeStarts[typeId] == -1) {
-          typeStarts[typeId] = offsetBuffer.getInt((long) i * OFFSET_WIDTH);
+        if (typeId >= 0) {
+          to.offsetBuffer.setInt((long) (i - startIndex) * OFFSET_WIDTH, typeCounts[typeId]);
+          typeCounts[typeId] += 1;
+          if (typeStarts[typeId] == -1) {
+            typeStarts[typeId] = offsetBuffer.getInt((long) i * OFFSET_WIDTH);
+          }
         }
       }
 
@@ -908,6 +912,14 @@ private int getTypeBufferValueCapacity() {
     return (int) typeBuffer.capacity() / TYPE_WIDTH;
   }
 
+  public void setOffset(int index, int offset) {
+    while (index >= getOffsetBufferValueCapacity()) {
+      reallocOffsetBuffer();
+    }
+
+    offsetBuffer.setInt((long) index * OFFSET_WIDTH, offset);
+  }
+
   private long getOffsetBufferValueCapacity() {
     return offsetBuffer.capacity() / OFFSET_WIDTH;
   }
diff --git a/java/vector/src/main/codegen/templates/HolderReaderImpl.java b/java/vector/src/main/codegen/templates/HolderReaderImpl.java
index 8394aaad41756..1151ea5d39dda 100644
--- a/java/vector/src/main/codegen/templates/HolderReaderImpl.java
+++ b/java/vector/src/main/codegen/templates/HolderReaderImpl.java
@@ -109,9 +109,9 @@ public void read(Nullable${name}Holder h) {
     </#if>
     byte[] value = new byte [length];
     holder.buffer.getBytes(holder.start, value, 0, length);
-    <#if minor.class == "VarBinary" || minor.class == "LargeVarBinary">
+    <#if minor.class == "VarBinary" || minor.class == "LargeVarBinary" || minor.class == "ViewVarBinary">
     return value;
-    <#elseif minor.class == "VarChar" || minor.class == "LargeVarChar">
+    <#elseif minor.class == "VarChar" || minor.class == "LargeVarChar" || minor.class == "ViewVarChar">
     Text text = new Text();
     text.set(value);
     return text;
diff --git a/java/vector/src/main/codegen/templates/StructWriters.java b/java/vector/src/main/codegen/templates/StructWriters.java
index b6dd2b75c526a..b676173ac39d9 100644
--- a/java/vector/src/main/codegen/templates/StructWriters.java
+++ b/java/vector/src/main/codegen/templates/StructWriters.java
@@ -61,6 +61,7 @@ public class ${mode}StructWriter extends AbstractFieldWriter {
     this.initialCapacity = 0;
     for (Field child : container.getField().getChildren()) {
       MinorType minorType = Types.getMinorTypeForArrowType(child.getType());
+      addVectorAsNullable = child.isNullable();
       switch (minorType) {
       case STRUCT:
         struct(child.getName());
diff --git a/java/vector/src/main/codegen/templates/UnionListWriter.java b/java/vector/src/main/codegen/templates/UnionListWriter.java
index 5c0565ee27175..eeb964c055f71 100644
--- a/java/vector/src/main/codegen/templates/UnionListWriter.java
+++ b/java/vector/src/main/codegen/templates/UnionListWriter.java
@@ -26,7 +26,7 @@
 import java.math.BigDecimal;
 
 <@pp.dropOutputFile />
-<#list ["List", "LargeList"] as listName>
+<#list ["List", "ListView", "LargeList"] as listName>
 
 <@pp.changeOutputFile name="/org/apache/arrow/vector/complex/impl/Union${listName}Writer.java" />
 
@@ -59,6 +59,10 @@ public class Union${listName}Writer extends AbstractFieldWriter {
   private static final int OFFSET_WIDTH = 4;
   </#if>
 
+  <#if listName = "ListView">
+  private static final long SIZE_WIDTH = 4;
+  </#if>
+
   public Union${listName}Writer(${listName}Vector vector) {
     this(vector, NullableStructWriterFactory.getNullableStructWriterFactoryInstance());
   }
@@ -193,6 +197,24 @@ public void endList() {
     setPosition(idx() + 1);
     listStarted = false;
   }
+  <#elseif listName == "ListView">
+  @Override
+  public void startList() {
+    vector.startNewValue(idx());
+    writer.setPosition(vector.getOffsetBuffer().getInt((idx()) * OFFSET_WIDTH));
+    listStarted = true;
+  }
+
+  @Override
+  public void endList() {
+    int sizeUptoIdx = 0;
+    for (int i = 0; i < idx(); i++) {
+      sizeUptoIdx += vector.getSizeBuffer().getInt(i * SIZE_WIDTH);
+    }
+    vector.getSizeBuffer().setInt(idx() * SIZE_WIDTH, writer.idx() - sizeUptoIdx);
+    setPosition(idx() + 1);
+    listStarted = false;
+  }
   <#else>
   @Override
   public void startList() {
diff --git a/java/vector/src/main/codegen/templates/UnionReader.java b/java/vector/src/main/codegen/templates/UnionReader.java
index 822d4822987fb..243bd832255c2 100644
--- a/java/vector/src/main/codegen/templates/UnionReader.java
+++ b/java/vector/src/main/codegen/templates/UnionReader.java
@@ -39,7 +39,7 @@
 @SuppressWarnings("unused")
 public class UnionReader extends AbstractFieldReader {
 
-  private static final int NUM_SUPPORTED_TYPES = 46;
+  private static final int NUM_SUPPORTED_TYPES = 49;
 
   private BaseReader[] readers = new BaseReader[NUM_SUPPORTED_TYPES];
   public UnionVector data;
diff --git a/java/vector/src/main/codegen/templates/ValueHolders.java b/java/vector/src/main/codegen/templates/ValueHolders.java
index 973efd870a662..2a2bbe81b2e74 100644
--- a/java/vector/src/main/codegen/templates/ValueHolders.java
+++ b/java/vector/src/main/codegen/templates/ValueHolders.java
@@ -27,7 +27,6 @@
 package org.apache.arrow.vector.holders;
 
 <#include "/@includes/vv_imports.ftl" />
-
 /**
  * Source code generated using FreeMarker template ${.template_name}
  */
@@ -40,11 +39,12 @@ public final class ${className} implements ValueHolder{
     
     /** The last index (exclusive) into the Vector. **/
     public int end;
-    
+
     /** The Vector holding the actual values. **/
     public ${minor.class}Vector vector;
-    
+
     <#else>
+
     public static final int WIDTH = ${type.width};
     
     <#if mode.name == "Optional">public int isSet;
@@ -70,10 +70,6 @@ public String toString(){
       throw new UnsupportedOperationException();
     }
     </#if>
-    
-    
-    
-    
 }
 
 </#list>
diff --git a/java/vector/src/main/java/module-info.java b/java/vector/src/main/java/module-info.java
index 20f7094715f4d..73af2d1b67efd 100644
--- a/java/vector/src/main/java/module-info.java
+++ b/java/vector/src/main/java/module-info.java
@@ -34,7 +34,8 @@
   exports org.apache.arrow.vector.util;
   exports org.apache.arrow.vector.validate;
 
-  opens org.apache.arrow.vector.types.pojo to com.fasterxml.jackson.databind;
+  opens org.apache.arrow.vector.types.pojo to
+      com.fasterxml.jackson.databind;
 
   requires com.fasterxml.jackson.annotation;
   requires com.fasterxml.jackson.core;
@@ -45,6 +46,5 @@
   requires org.apache.arrow.format;
   requires org.apache.arrow.memory.core;
   requires org.apache.commons.codec;
-  requires org.eclipse.collections.impl;
   requires org.slf4j;
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/AddOrGetResult.java b/java/vector/src/main/java/org/apache/arrow/vector/AddOrGetResult.java
index b41dbb245e8a2..0b392e14a8aa5 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/AddOrGetResult.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/AddOrGetResult.java
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import org.apache.arrow.util.Preconditions;
 
 /**
- * Tuple class containing a vector and whether is was created.
+ * Tuple class containing a vector and whether it was created.
  *
  * @param <V> The type of vector the result is for.
  */
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/AllocationHelper.java b/java/vector/src/main/java/org/apache/arrow/vector/AllocationHelper.java
index abece39475016..aae833c7addbc 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/AllocationHelper.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/AllocationHelper.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import org.apache.arrow.vector.complex.RepeatedFixedWidthVectorLike;
@@ -22,8 +21,7 @@
 
 /** Helper utility methods for allocating storage for Vectors. */
 public class AllocationHelper {
-  private AllocationHelper() {
-  }
+  private AllocationHelper() {}
 
   /**
    * Allocates the vector.
@@ -43,14 +41,12 @@ public static void allocate(ValueVector v, int valueCount, int bytesPerValue) {
    * @param v The vector the allocate.
    * @param valueCount The number of elements to allocate.
    * @param bytesPerValue The bytes per value to use for allocating underlying storage
-   * @param childValCount  If <code>v</code> is a repeated vector, this is number of child elements to allocate.
+   * @param childValCount If <code>v</code> is a repeated vector, this is number of child elements
+   *     to allocate.
    * @throws org.apache.arrow.memory.OutOfMemoryException if it can't allocate the memory.
    */
   public static void allocatePrecomputedChildCount(
-      ValueVector v,
-      int valueCount,
-      int bytesPerValue,
-      int childValCount) {
+      ValueVector v, int valueCount, int bytesPerValue, int childValCount) {
     if (v instanceof FixedWidthVector) {
       ((FixedWidthVector) v).allocateNew(valueCount);
     } else if (v instanceof VariableWidthVector) {
@@ -58,7 +54,8 @@ public static void allocatePrecomputedChildCount(
     } else if (v instanceof RepeatedFixedWidthVectorLike) {
       ((RepeatedFixedWidthVectorLike) v).allocateNew(valueCount, childValCount);
     } else if (v instanceof RepeatedVariableWidthVectorLike) {
-      ((RepeatedVariableWidthVectorLike) v).allocateNew(childValCount * bytesPerValue, valueCount, childValCount);
+      ((RepeatedVariableWidthVectorLike) v)
+          .allocateNew(childValCount * bytesPerValue, valueCount, childValCount);
     } else {
       v.allocateNew();
     }
@@ -70,17 +67,19 @@ public static void allocatePrecomputedChildCount(
    * @param v The vector the allocate.
    * @param valueCount The number of elements to allocate.
    * @param bytesPerValue The bytes per value to use for allocating underlying storage
-   * @param repeatedPerTop  If <code>v</code> is a repeated vector, this is assumed number of elements per child.
+   * @param repeatedPerTop If <code>v</code> is a repeated vector, this is assumed number of
+   *     elements per child.
    * @throws org.apache.arrow.memory.OutOfMemoryException if it can't allocate the memory
    */
-  public static void allocate(ValueVector v, int valueCount, int bytesPerValue, int repeatedPerTop) {
+  public static void allocate(
+      ValueVector v, int valueCount, int bytesPerValue, int repeatedPerTop) {
     allocatePrecomputedChildCount(v, valueCount, bytesPerValue, repeatedPerTop * valueCount);
   }
 
   /**
    * Allocates the exact amount if v is fixed width, otherwise falls back to dynamic allocation.
    *
-   * @param v          value vector we are trying to allocate
+   * @param v value vector we are trying to allocate
    * @param valueCount size we are trying to allocate
    * @throws org.apache.arrow.memory.OutOfMemoryException if it can't allocate the memory
    */
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java
index c456c625389ba..50ddf30bf7e7c 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
@@ -23,7 +22,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.util.ArrowBufPointer;
@@ -39,12 +37,11 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * BaseFixedWidthVector provides an abstract interface for
- * implementing vectors of fixed width values. The vectors are nullable
- * implying that zero or more elements in the vector could be NULL.
+ * BaseFixedWidthVector provides an abstract interface for implementing vectors of fixed width
+ * values. The vectors are nullable implying that zero or more elements in the vector could be NULL.
  */
 public abstract class BaseFixedWidthVector extends BaseValueVector
-        implements FixedWidthVector, FieldVector, VectorDefinitionSetter {
+    implements FixedWidthVector, FieldVector, VectorDefinitionSetter {
   private final int typeWidth;
 
   protected int lastValueCapacity;
@@ -75,7 +72,6 @@ public BaseFixedWidthVector(Field field, final BufferAllocator allocator, final
     refreshValueCapacity();
   }
 
-
   public int getTypeWidth() {
     return typeWidth;
   }
@@ -104,8 +100,9 @@ public String getName() {
    */
 
   /**
-   * Get the memory address of buffer that manages the validity
-   * (NULL or NON-NULL nature) of elements in the vector.
+   * Get the memory address of buffer that manages the validity (NULL or NON-NULL nature) of
+   * elements in the vector.
+   *
    * @return starting address of the buffer
    */
   @Override
@@ -114,8 +111,8 @@ public long getValidityBufferAddress() {
   }
 
   /**
-   * Get the memory address of buffer that stores the data for elements
-   * in the vector.
+   * Get the memory address of buffer that stores the data for elements in the vector.
+   *
    * @return starting address of the buffer
    */
   @Override
@@ -124,8 +121,9 @@ public long getDataBufferAddress() {
   }
 
   /**
-   * Get the memory address of buffer that stores the offsets for elements
-   * in the vector. This operation is not supported for fixed-width vectors.
+   * Get the memory address of buffer that stores the offsets for elements in the vector. This
+   * operation is not supported for fixed-width vectors.
+   *
    * @return starting address of the buffer
    * @throws UnsupportedOperationException for fixed width vectors
    */
@@ -135,9 +133,9 @@ public long getOffsetBufferAddress() {
   }
 
   /**
-   * Get buffer that manages the validity (NULL or NON-NULL nature) of
-   * elements in the vector. Consider it as a buffer for internal bit vector
-   * data structure.
+   * Get buffer that manages the validity (NULL or NON-NULL nature) of elements in the vector.
+   * Consider it as a buffer for internal bit vector data structure.
+   *
    * @return buffer
    */
   @Override
@@ -147,6 +145,7 @@ public ArrowBuf getValidityBuffer() {
 
   /**
    * Get the buffer that stores the data for elements in the vector.
+   *
    * @return buffer
    */
   @Override
@@ -155,8 +154,9 @@ public ArrowBuf getDataBuffer() {
   }
 
   /**
-   * buffer that stores the offsets for elements
-   * in the vector. This operation is not supported for fixed-width vectors.
+   * buffer that stores the offsets for elements in the vector. This operation is not supported for
+   * fixed-width vectors.
+   *
    * @return buffer
    * @throws UnsupportedOperationException for fixed width vectors
    */
@@ -166,8 +166,9 @@ public ArrowBuf getOffsetBuffer() {
   }
 
   /**
-   * Sets the desired value capacity for the vector. This function doesn't
-   * allocate any memory for the vector.
+   * Sets the desired value capacity for the vector. This function doesn't allocate any memory for
+   * the vector.
+   *
    * @param valueCount desired number of elements in the vector
    */
   @Override
@@ -186,9 +187,7 @@ public int getValueCapacity() {
     return actualValueCapacity;
   }
 
-  /**
-   * Call this if you change the capacity of valueBuffer or validityBuffer.
-   */
+  /** Call this if you change the capacity of valueBuffer or validityBuffer. */
   protected void refreshValueCapacity() {
     actualValueCapacity = Math.min(getValueBufferValueCapacity(), getValidityBufferValueCapacity());
   }
@@ -201,9 +200,7 @@ protected int getValidityBufferValueCapacity() {
     return capAtMaxInt(validityBuffer.capacity() * 8);
   }
 
-  /**
-   * zero out the vector and the data in associated buffers.
-   */
+  /** zero out the vector and the data in associated buffers. */
   @Override
   public void zeroVector() {
     initValidityBuffer();
@@ -221,8 +218,8 @@ private void initValueBuffer() {
   }
 
   /**
-   * Reset the vector to initial state. Same as {@link #zeroVector()}.
-   * Note that this method doesn't release any memory.
+   * Reset the vector to initial state. Same as {@link #zeroVector()}. Note that this method doesn't
+   * release any memory.
    */
   @Override
   public void reset() {
@@ -230,17 +227,13 @@ public void reset() {
     zeroVector();
   }
 
-  /**
-   * Close the vector and release the associated buffers.
-   */
+  /** Close the vector and release the associated buffers. */
   @Override
   public void close() {
     clear();
   }
 
-  /**
-   * Same as {@link #close()}.
-   */
+  /** Same as {@link #close()}. */
   @Override
   public void clear() {
     valueCount = 0;
@@ -265,19 +258,16 @@ protected void decrementAllocationMonitor() {
     allocationMonitor--;
   }
 
-  /**
-   * Same as {@link #allocateNewSafe()}.
-   */
+  /** Same as {@link #allocateNewSafe()}. */
   @Override
   public void allocateNew() {
     allocateNew(lastValueCapacity);
   }
 
   /**
-   * Allocate memory for the vector. We internally use a default value count
-   * of 4096 to allocate memory for at least these many elements in the
-   * vector. See {@link #allocateNew(int)} for allocating memory for specific
-   * number of elements in the vector.
+   * Allocate memory for the vector. We internally use a default value count of 4096 to allocate
+   * memory for at least these many elements in the vector. See {@link #allocateNew(int)} for
+   * allocating memory for specific number of elements in the vector.
    *
    * @return false if memory allocation fails, true otherwise.
    */
@@ -292,8 +282,8 @@ public boolean allocateNewSafe() {
   }
 
   /**
-   * Allocate memory for the vector to support storing at least the provided number of
-   * elements in the vector. This method must be called prior to using the ValueVector.
+   * Allocate memory for the vector to support storing at least the provided number of elements in
+   * the vector. This method must be called prior to using the ValueVector.
    *
    * @param valueCount the desired number of elements in the vector
    * @throws org.apache.arrow.memory.OutOfMemoryException on error
@@ -319,21 +309,23 @@ public void allocateNew(int valueCount) {
   private long computeAndCheckBufferSize(int valueCount) {
     final long size = computeCombinedBufferSize(valueCount, typeWidth);
     if (size > MAX_ALLOCATION_SIZE) {
-      throw new OversizedAllocationException("Memory required for vector capacity " +
-          valueCount +
-          " is (" + size + "), which is more than max allowed (" + MAX_ALLOCATION_SIZE + ")");
+      throw new OversizedAllocationException(
+          "Memory required for vector capacity "
+              + valueCount
+              + " is ("
+              + size
+              + "), which is more than max allowed ("
+              + MAX_ALLOCATION_SIZE
+              + ")");
     }
     return size;
   }
 
   /**
-   * Actual memory allocation is done by this function. All the calculations
-   * and knowledge about what size to allocate is upto the callers of this
-   * method.
-   * Callers appropriately handle errors if memory allocation fails here.
-   * Callers should also take care of determining that desired size is
-   * within the bounds of max allocation allowed and any other error
-   * conditions.
+   * Actual memory allocation is done by this function. All the calculations and knowledge about
+   * what size to allocate is upto the callers of this method. Callers appropriately handle errors
+   * if memory allocation fails here. Callers should also take care of determining that desired size
+   * is within the bounds of max allocation allowed and any other error conditions.
    */
   private void allocateBytes(int valueCount) {
     DataAndValidityBuffers buffers = allocFixedDataAndValidityBufs(valueCount, typeWidth);
@@ -346,10 +338,9 @@ private void allocateBytes(int valueCount) {
   }
 
   /**
-   * During splitAndTransfer, if we splitting from a random position within a byte,
-   * we can't just slice the source buffer so we have to explicitly allocate the
-   * validityBuffer of the target vector. This is unlike the databuffer which we can
-   * always slice for the target vector.
+   * During splitAndTransfer, if we splitting from a random position within a byte, we can't just
+   * slice the source buffer so we have to explicitly allocate the validityBuffer of the target
+   * vector. This is unlike the databuffer which we can always slice for the target vector.
    */
   private void allocateValidityBuffer(final int validityBufferSize) {
     validityBuffer = allocator.buffer(validityBufferSize);
@@ -359,9 +350,9 @@ private void allocateValidityBuffer(final int validityBufferSize) {
 
   /**
    * Get the potential buffer size for a particular number of records.
+   *
    * @param count desired number of elements in the vector
-   * @return estimated size of underlying buffers if the vector holds
-   *         a given number of elements
+   * @return estimated size of underlying buffers if the vector holds a given number of elements
    */
   @Override
   public int getBufferSizeFor(final int count) {
@@ -372,8 +363,8 @@ public int getBufferSizeFor(final int count) {
   }
 
   /**
-   * Get the size (number of bytes) of underlying buffers used by this
-   * vector.
+   * Get the size (number of bytes) of underlying buffers used by this vector.
+   *
    * @return size of underlying buffers.
    */
   @Override
@@ -386,6 +377,7 @@ public int getBufferSize() {
 
   /**
    * Get information about how this field is materialized.
+   *
    * @return the field corresponding to this vector
    */
   @Override
@@ -394,15 +386,14 @@ public Field getField() {
   }
 
   /**
-   * Return the underlying buffers associated with this vector. Note that this doesn't
-   * impact the reference counts for this buffer so it only should be used for in-context
-   * access. Also note that this buffer changes regularly thus
-   * external classes shouldn't hold a reference to it (unless they change it).
+   * Return the underlying buffers associated with this vector. Note that this doesn't impact the
+   * reference counts for this buffer so it only should be used for in-context access. Also note
+   * that this buffer changes regularly thus external classes shouldn't hold a reference to it
+   * (unless they change it).
    *
-   * @param clear Whether to clear vector before returning; the buffers will still be refcounted
-   *              but the returned array will be the only reference to them
-   * @return The underlying {@link ArrowBuf buffers} that is used by this
-   *         vector instance.
+   * @param clear Whether to clear vector before returning; the buffers will still be refcounted but
+   *     the returned array will be the only reference to them
+   * @return The underlying {@link ArrowBuf buffers} that is used by this vector instance.
    */
   @Override
   public ArrowBuf[] getBuffers(boolean clear) {
@@ -425,8 +416,8 @@ public ArrowBuf[] getBuffers(boolean clear) {
   }
 
   /**
-   * Resize the vector to increase the capacity. The internal behavior is to
-   * double the current value capacity.
+   * Resize the vector to increase the capacity. The internal behavior is to double the current
+   * value capacity.
    */
   @Override
   public void reAlloc() {
@@ -443,13 +434,15 @@ public void reAlloc() {
     DataAndValidityBuffers buffers = allocFixedDataAndValidityBufs(targetValueCount, typeWidth);
     final ArrowBuf newValueBuffer = buffers.getDataBuf();
     newValueBuffer.setBytes(0, valueBuffer, 0, valueBuffer.capacity());
-    newValueBuffer.setZero(valueBuffer.capacity(), newValueBuffer.capacity() - valueBuffer.capacity());
+    newValueBuffer.setZero(
+        valueBuffer.capacity(), newValueBuffer.capacity() - valueBuffer.capacity());
     valueBuffer.getReferenceManager().release();
     valueBuffer = newValueBuffer;
 
     final ArrowBuf newValidityBuffer = buffers.getValidityBuf();
     newValidityBuffer.setBytes(0, validityBuffer, 0, validityBuffer.capacity());
-    newValidityBuffer.setZero(validityBuffer.capacity(), newValidityBuffer.capacity() - validityBuffer.capacity());
+    newValidityBuffer.setZero(
+        validityBuffer.capacity(), newValidityBuffer.capacity() - validityBuffer.capacity());
     validityBuffer.getReferenceManager().release();
     validityBuffer = newValidityBuffer;
 
@@ -460,8 +453,8 @@ public void reAlloc() {
   /**
    * Get the inner vectors.
    *
-   * @deprecated This API will be removed as the current implementations no longer support inner vectors.
-   *
+   * @deprecated This API will be removed as the current implementations no longer support inner
+   *     vectors.
    * @return the inner vectors for this field as defined by the TypeLayout
    */
   @Deprecated
@@ -471,8 +464,9 @@ public List<BufferBacked> getFieldInnerVectors() {
   }
 
   /**
-   * Initialize the children in schema for this Field. This operation is a
-   * NO-OP for scalar types since they don't have any children.
+   * Initialize the children in schema for this Field. This operation is a NO-OP for scalar types
+   * since they don't have any children.
+   *
    * @param children the schema
    * @throws IllegalArgumentException if children is a non-empty list for scalar types.
    */
@@ -485,6 +479,7 @@ public void initializeChildrenFromFields(List<Field> children) {
 
   /**
    * Get the inner child vectors.
+   *
    * @return list of child vectors for complex types, empty list for scalar vector types
    */
   @Override
@@ -493,16 +488,17 @@ public List<FieldVector> getChildrenFromFields() {
   }
 
   /**
-   * Load the buffers of this vector with provided source buffers.
-   * The caller manages the source buffers and populates them before invoking
-   * this method.
-   * @param fieldNode  the fieldNode indicating the value count
+   * Load the buffers of this vector with provided source buffers. The caller manages the source
+   * buffers and populates them before invoking this method.
+   *
+   * @param fieldNode the fieldNode indicating the value count
    * @param ownBuffers the buffers for this Field (own buffers only, children not included)
    */
   @Override
   public void loadFieldBuffers(ArrowFieldNode fieldNode, List<ArrowBuf> ownBuffers) {
     if (ownBuffers.size() != 2) {
-      throw new IllegalArgumentException("Illegal buffer count, expected " + 2 + ", got: " + ownBuffers.size());
+      throw new IllegalArgumentException(
+          "Illegal buffer count, expected " + 2 + ", got: " + ownBuffers.size());
     }
 
     ArrowBuf bitBuffer = ownBuffers.get(0);
@@ -532,9 +528,7 @@ public List<ArrowBuf> getFieldBuffers() {
     return result;
   }
 
-  /**
-   * Set the reader and writer indexes for the inner buffers.
-   */
+  /** Set the reader and writer indexes for the inner buffers. */
   private void setReaderAndWriterIndex() {
     validityBuffer.readerIndex(0);
     valueBuffer.readerIndex(0);
@@ -552,15 +546,14 @@ private void setReaderAndWriterIndex() {
     }
   }
 
-  /**
-   * Validate the scalar values held by this vector.
-   */
+  /** Validate the scalar values held by this vector. */
   public void validateScalars() {
     // No validation by default.
   }
 
   /**
    * Construct a transfer pair of this vector and another vector of same type.
+   *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
    * @param callBack not used
@@ -573,6 +566,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator, CallB
 
   /**
    * Construct a transfer pair of this vector and another vector of same type.
+   *
    * @param field The field materialized by this vector.
    * @param allocator allocator for the target vector
    * @param callBack not used
@@ -585,6 +579,7 @@ public TransferPair getTransferPair(Field field, BufferAllocator allocator, Call
 
   /**
    * Construct a transfer pair of this vector and another vector of same type.
+   *
    * @param allocator allocator for the target vector
    * @return TransferPair
    */
@@ -595,6 +590,7 @@ public TransferPair getTransferPair(BufferAllocator allocator) {
 
   /**
    * Construct a transfer pair of this vector and another vector of same type.
+   *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
    * @return TransferPair
@@ -604,6 +600,7 @@ public TransferPair getTransferPair(BufferAllocator allocator) {
 
   /**
    * Construct a transfer pair of this vector and another vector of same type.
+   *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
    * @return TransferPair
@@ -612,9 +609,9 @@ public TransferPair getTransferPair(BufferAllocator allocator) {
   public abstract TransferPair getTransferPair(Field field, BufferAllocator allocator);
 
   /**
-   * Transfer this vector's data to another vector. The memory associated
-   * with this vector is transferred to the allocator of target vector
-   * for accounting and management purposes.
+   * Transfer this vector's data to another vector. The memory associated with this vector is
+   * transferred to the allocator of target vector for accounting and management purposes.
+   *
    * @param target destination vector for transfer
    */
   public void transferTo(BaseFixedWidthVector target) {
@@ -628,16 +625,20 @@ public void transferTo(BaseFixedWidthVector target) {
   }
 
   /**
-   * Slice this vector at desired index and length and transfer the
-   * corresponding data to the target vector.
+   * Slice this vector at desired index and length and transfer the corresponding data to the target
+   * vector.
+   *
    * @param startIndex start position of the split in source vector.
    * @param length length of the split.
    * @param target destination vector
    */
-  public void splitAndTransferTo(int startIndex, int length,
-                                 BaseFixedWidthVector target) {
-    Preconditions.checkArgument(startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
-        "Invalid parameters startIndex: %s, length: %s for valueCount: %s", startIndex, length, valueCount);
+  public void splitAndTransferTo(int startIndex, int length, BaseFixedWidthVector target) {
+    Preconditions.checkArgument(
+        startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
+        "Invalid parameters startIndex: %s, length: %s for valueCount: %s",
+        startIndex,
+        length,
+        valueCount);
     compareTypes(target, "splitAndTransferTo");
     target.clear();
     splitAndTransferValidityBuffer(startIndex, length, target);
@@ -645,11 +646,9 @@ public void splitAndTransferTo(int startIndex, int length,
     target.setValueCount(length);
   }
 
-  /**
-   * Data buffer can always be split and transferred using slicing.
-   */
-  private void splitAndTransferValueBuffer(int startIndex, int length,
-                                           BaseFixedWidthVector target) {
+  /** Data buffer can always be split and transferred using slicing. */
+  private void splitAndTransferValueBuffer(
+      int startIndex, int length, BaseFixedWidthVector target) {
     final int startPoint = startIndex * typeWidth;
     final int sliceLength = length * typeWidth;
     final ArrowBuf slicedBuffer = valueBuffer.slice(startPoint, sliceLength);
@@ -658,11 +657,11 @@ private void splitAndTransferValueBuffer(int startIndex, int length,
   }
 
   /**
-   * Validity buffer has multiple cases of split and transfer depending on
-   * the starting position of the source index.
+   * Validity buffer has multiple cases of split and transfer depending on the starting position of
+   * the source index.
    */
-  private void splitAndTransferValidityBuffer(int startIndex, int length,
-                                              BaseFixedWidthVector target) {
+  private void splitAndTransferValidityBuffer(
+      int startIndex, int length, BaseFixedWidthVector target) {
     int firstByteSource = BitVectorHelper.byteIndex(startIndex);
     int lastByteSource = BitVectorHelper.byteIndex(valueCount - 1);
     int byteSizeTarget = getValidityBufferSizeFromCount(length);
@@ -674,8 +673,8 @@ private void splitAndTransferValidityBuffer(int startIndex, int length,
         if (target.validityBuffer != null) {
           target.validityBuffer.getReferenceManager().release();
         }
-        target.validityBuffer = validityBuffer.slice(firstByteSource, byteSizeTarget);
-        target.validityBuffer.getReferenceManager().retain(1);
+        ArrowBuf slicedValidityBuffer = validityBuffer.slice(firstByteSource, byteSizeTarget);
+        target.validityBuffer = transferBuffer(slicedValidityBuffer, target.allocator);
         target.refreshValueCapacity();
       } else {
         /* Copy data
@@ -687,10 +686,12 @@ private void splitAndTransferValidityBuffer(int startIndex, int length,
         target.allocateValidityBuffer(byteSizeTarget);
 
         for (int i = 0; i < byteSizeTarget - 1; i++) {
-          byte b1 = BitVectorHelper.getBitsFromCurrentByte(this.validityBuffer,
-                  firstByteSource + i, offset);
-          byte b2 = BitVectorHelper.getBitsFromNextByte(this.validityBuffer,
-                  firstByteSource + i + 1, offset);
+          byte b1 =
+              BitVectorHelper.getBitsFromCurrentByte(
+                  this.validityBuffer, firstByteSource + i, offset);
+          byte b2 =
+              BitVectorHelper.getBitsFromNextByte(
+                  this.validityBuffer, firstByteSource + i + 1, offset);
 
           target.validityBuffer.setByte(i, (b1 + b2));
         }
@@ -705,28 +706,29 @@ private void splitAndTransferValidityBuffer(int startIndex, int length,
          * by shifting data from the current byte.
          */
         if ((firstByteSource + byteSizeTarget - 1) < lastByteSource) {
-          byte b1 = BitVectorHelper.getBitsFromCurrentByte(this.validityBuffer,
-                  firstByteSource + byteSizeTarget - 1, offset);
-          byte b2 = BitVectorHelper.getBitsFromNextByte(this.validityBuffer,
-                  firstByteSource + byteSizeTarget, offset);
+          byte b1 =
+              BitVectorHelper.getBitsFromCurrentByte(
+                  this.validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
+          byte b2 =
+              BitVectorHelper.getBitsFromNextByte(
+                  this.validityBuffer, firstByteSource + byteSizeTarget, offset);
 
           target.validityBuffer.setByte(byteSizeTarget - 1, b1 + b2);
         } else {
-          byte b1 = BitVectorHelper.getBitsFromCurrentByte(this.validityBuffer,
-                  firstByteSource + byteSizeTarget - 1, offset);
+          byte b1 =
+              BitVectorHelper.getBitsFromCurrentByte(
+                  this.validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
           target.validityBuffer.setByte(byteSizeTarget - 1, b1);
         }
       }
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          common getters and setters                            |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          common getters and setters                            |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the number of elements that are null in the vector.
@@ -739,8 +741,8 @@ public int getNullCount() {
   }
 
   /**
-   * Get the value count of vector. This will always be zero unless
-   * {@link #setValueCount(int)} has been called prior to calling this.
+   * Get the value count of vector. This will always be zero unless {@link #setValueCount(int)} has
+   * been called prior to calling this.
    *
    * @return valueCount for the vector
    */
@@ -752,7 +754,7 @@ public int getValueCount() {
   /**
    * Set value count for the vector.
    *
-   * @param valueCount  value count to set
+   * @param valueCount value count to set
    */
   @Override
   public void setValueCount(int valueCount) {
@@ -798,10 +800,9 @@ public void setValueCount(int valueCount) {
   }
 
   /**
-   * Check if the given index is within the current value capacity
-   * of the vector.
+   * Check if the given index is within the current value capacity of the vector.
    *
-   * @param index  position to check
+   * @param index position to check
    * @return true if index is within the current value capacity
    */
   public boolean isSafe(int index) {
@@ -811,7 +812,7 @@ public boolean isSafe(int index) {
   /**
    * Check if element at given index is null.
    *
-   * @param index  position of element
+   * @param index position of element
    * @return true if element at given index is null, false otherwise
    */
   @Override
@@ -822,7 +823,7 @@ public boolean isNull(int index) {
   /**
    * Same as {@link #isNull(int)}.
    *
-   * @param index  position of element
+   * @param index position of element
    * @return 1 if element at given index is not null, 0 otherwise
    */
   public int isSet(int index) {
@@ -859,13 +860,11 @@ public void setSafe(int index, ByteBuffer value, int start, int length) {
     throw new UnsupportedOperationException();
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                helper methods for setters                      |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                helper methods for setters                      |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   protected void handleSafe(int index) {
     while (index >= getValueCapacity()) {
@@ -875,12 +874,12 @@ protected void handleSafe(int index) {
   }
 
   /**
-   * Copy a cell value from a particular index in source vector to a particular
-   * position in this vector. The source vector should be of the same type as this one.
+   * Copy a cell value from a particular index in source vector to a particular position in this
+   * vector. The source vector should be of the same type as this one.
    *
    * @param fromIndex position to copy from in source vector
    * @param thisIndex position to copy to in this vector
-   * @param from      source vector
+   * @param from source vector
    */
   @Override
   public void copyFrom(int fromIndex, int thisIndex, ValueVector from) {
@@ -889,19 +888,20 @@ public void copyFrom(int fromIndex, int thisIndex, ValueVector from) {
       BitVectorHelper.unsetBit(this.getValidityBuffer(), thisIndex);
     } else {
       BitVectorHelper.setBit(this.getValidityBuffer(), thisIndex);
-      MemoryUtil.UNSAFE.copyMemory(from.getDataBuffer().memoryAddress() + (long) fromIndex * typeWidth,
-              this.getDataBuffer().memoryAddress() + (long) thisIndex * typeWidth, typeWidth);
+      MemoryUtil.UNSAFE.copyMemory(
+          from.getDataBuffer().memoryAddress() + (long) fromIndex * typeWidth,
+          this.getDataBuffer().memoryAddress() + (long) thisIndex * typeWidth,
+          typeWidth);
     }
   }
 
   /**
-   * Same as {@link #copyFrom(int, int, ValueVector)} except that
-   * it handles the case when the capacity of the vector needs to be expanded
-   * before copy.
+   * Same as {@link #copyFrom(int, int, ValueVector)} except that it handles the case when the
+   * capacity of the vector needs to be expanded before copy.
    *
    * @param fromIndex position to copy from in source vector
    * @param thisIndex position to copy to in this vector
-   * @param from      source vector
+   * @param from source vector
    */
   @Override
   public void copyFromSafe(int fromIndex, int thisIndex, ValueVector from) {
@@ -957,5 +957,4 @@ public int hashCode(int index, ArrowBufHasher hasher) {
   public <OUT, IN> OUT accept(VectorVisitor<OUT, IN> visitor, IN value) {
     return visitor.visit(this, value);
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseIntVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseIntVector.java
index c9048839d5fe5..0adba35437296 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BaseIntVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseIntVector.java
@@ -14,30 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-/**
- * Interface for all int type vectors.
- */
+/** Interface for all int type vectors. */
 public interface BaseIntVector extends FieldVector {
 
   /**
-   * Sets the value at index, note this value may need to be truncated.
-   * Note this is safe version (i.e. call setSafe(int, ...) method in vector)
+   * Sets the value at index, note this value may need to be truncated. Note this is safe version
+   * (i.e. call setSafe(int, ...) method in vector)
    */
   void setWithPossibleTruncate(int index, long value);
 
   /**
-   * Sets the value at index, note this value may need to be truncated.
-   * Note this is unsafe version (i.e. call set(int, ...) method in vector)
+   * Sets the value at index, note this value may need to be truncated. Note this is unsafe version
+   * (i.e. call set(int, ...) method in vector)
    */
   void setUnsafeWithPossibleTruncate(int index, long value);
 
   /**
-   * Gets the value at index.
-   * This value may have been extended to long and will throw {@link NullPointerException}
-   * if the value is null. Note null check could be turned off via {@link NullCheckingForGet}.
+   * Gets the value at index. This value may have been extended to long and will throw {@link
+   * NullPointerException} if the value is null. Note null check could be turned off via {@link
+   * NullCheckingForGet}.
    */
   long getValueAsLong(int index);
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseLargeVariableWidthVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseLargeVariableWidthVector.java
index c239edbcc3c29..3a177f84c9853 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BaseLargeVariableWidthVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseLargeVariableWidthVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
@@ -23,7 +22,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.OutOfMemoryException;
@@ -40,18 +38,20 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * BaseLargeVariableWidthVector is a base class providing functionality for large strings/large bytes types.
+ * BaseLargeVariableWidthVector is a base class providing functionality for large strings/large
+ * bytes types.
  */
 public abstract class BaseLargeVariableWidthVector extends BaseValueVector
-    implements VariableWidthVector, FieldVector, VectorDefinitionSetter {
+    implements VariableWidthFieldVector {
   private static final int DEFAULT_RECORD_BYTE_COUNT = 12;
-  private static final int INITIAL_BYTE_COUNT = INITIAL_VALUE_ALLOCATION * DEFAULT_RECORD_BYTE_COUNT;
+  private static final int INITIAL_BYTE_COUNT =
+      INITIAL_VALUE_ALLOCATION * DEFAULT_RECORD_BYTE_COUNT;
   private int lastValueCapacity;
   private long lastValueAllocationSizeInBytes;
 
   /* protected members */
   public static final int OFFSET_WIDTH = 8; /* 8 byte unsigned int to track offsets */
-  protected static final byte[] emptyByteArray = new byte[]{};
+  protected static final byte[] emptyByteArray = new byte[] {};
   protected ArrowBuf validityBuffer;
   protected ArrowBuf valueBuffer;
   protected ArrowBuf offsetBuffer;
@@ -84,9 +84,9 @@ public String getName() {
   }
 
   /**
-   * Get buffer that manages the validity (NULL or NON-NULL nature) of
-   * elements in the vector. Consider it as a buffer for internal bit vector
-   * data structure.
+   * Get buffer that manages the validity (NULL or NON-NULL nature) of elements in the vector.
+   * Consider it as a buffer for internal bit vector data structure.
+   *
    * @return buffer
    */
   @Override
@@ -96,6 +96,7 @@ public ArrowBuf getValidityBuffer() {
 
   /**
    * Get the buffer that stores the data for elements in the vector.
+   *
    * @return buffer
    */
   @Override
@@ -104,8 +105,9 @@ public ArrowBuf getDataBuffer() {
   }
 
   /**
-   * buffer that stores the offsets for elements
-   * in the vector. This operation is not supported for fixed-width vectors.
+   * buffer that stores the offsets for elements in the vector. This operation is not supported for
+   * fixed-width vectors.
+   *
    * @return buffer
    */
   @Override
@@ -114,8 +116,8 @@ public ArrowBuf getOffsetBuffer() {
   }
 
   /**
-   * Get the memory address of buffer that stores the offsets for elements
-   * in the vector.
+   * Get the memory address of buffer that stores the offsets for elements in the vector.
+   *
    * @return starting address of the buffer
    */
   @Override
@@ -124,8 +126,9 @@ public long getOffsetBufferAddress() {
   }
 
   /**
-   * Get the memory address of buffer that manages the validity
-   * (NULL or NON-NULL nature) of elements in the vector.
+   * Get the memory address of buffer that manages the validity (NULL or NON-NULL nature) of
+   * elements in the vector.
+   *
    * @return starting address of the buffer
    */
   @Override
@@ -134,8 +137,8 @@ public long getValidityBufferAddress() {
   }
 
   /**
-   * Get the memory address of buffer that stores the data for elements
-   * in the vector.
+   * Get the memory address of buffer that stores the data for elements in the vector.
+   *
    * @return starting address of the buffer
    */
   @Override
@@ -144,8 +147,9 @@ public long getDataBufferAddress() {
   }
 
   /**
-   * Sets the desired value capacity for the vector. This function doesn't
-   * allocate any memory for the vector.
+   * Sets the desired value capacity for the vector. This function doesn't allocate any memory for
+   * the vector.
+   *
    * @param valueCount desired number of elements in the vector
    */
   @Override
@@ -158,8 +162,9 @@ public void setInitialCapacity(int valueCount) {
   }
 
   /**
-   * Sets the desired value capacity for the vector. This function doesn't
-   * allocate any memory for the vector.
+   * Sets the desired value capacity for the vector. This function doesn't allocate any memory for
+   * the vector.
+   *
    * @param valueCount desired number of elements in the vector
    * @param density average number of bytes per variable width element
    */
@@ -174,6 +179,7 @@ public void setInitialCapacity(int valueCount, double density) {
 
   /**
    * Get the density of this ListVector.
+   *
    * @return density
    */
   public double getDensity() {
@@ -187,8 +193,9 @@ public double getDensity() {
   }
 
   /**
-   * Get the current capacity which does not exceed either validity buffer or offset buffer.
-   * Note: Here the `getValueCapacity` has no relationship with the value buffer.
+   * Get the current capacity which does not exceed either validity buffer or offset buffer. Note:
+   * Here the `getValueCapacity` has no relationship with the value buffer.
+   *
    * @return number of elements that vector can hold.
    */
   @Override
@@ -205,9 +212,7 @@ private long getOffsetBufferValueCapacity() {
     return offsetBuffer.capacity() / OFFSET_WIDTH;
   }
 
-  /**
-   * zero out the vector and the data in associated buffers.
-   */
+  /** zero out the vector and the data in associated buffers. */
   public void zeroVector() {
     initValidityBuffer();
     initOffsetBuffer();
@@ -225,8 +230,8 @@ private void initOffsetBuffer() {
   }
 
   /**
-   * Reset the vector to initial state. Same as {@link #zeroVector()}.
-   * Note that this method doesn't release any memory.
+   * Reset the vector to initial state. Same as {@link #zeroVector()}. Note that this method doesn't
+   * release any memory.
    */
   @Override
   public void reset() {
@@ -235,17 +240,13 @@ public void reset() {
     valueCount = 0;
   }
 
-  /**
-   * Close the vector and release the associated buffers.
-   */
+  /** Close the vector and release the associated buffers. */
   @Override
   public void close() {
     clear();
   }
 
-  /**
-   * Same as {@link #close()}.
-   */
+  /** Same as {@link #close()}. */
   @Override
   public void clear() {
     validityBuffer = releaseBuffer(validityBuffer);
@@ -258,8 +259,8 @@ public void clear() {
   /**
    * Get the inner vectors.
    *
-   * @deprecated This API will be removed as the current implementations no longer support inner vectors.
-   *
+   * @deprecated This API will be removed as the current implementations no longer support inner
+   *     vectors.
    * @return the inner vectors for this field as defined by the TypeLayout
    */
   @Override
@@ -269,8 +270,9 @@ public List<BufferBacked> getFieldInnerVectors() {
   }
 
   /**
-   * Initialize the children in schema for this Field. This operation is a
-   * NO-OP for scalar types since they don't have any children.
+   * Initialize the children in schema for this Field. This operation is a NO-OP for scalar types
+   * since they don't have any children.
+   *
    * @param children the schema
    * @throws IllegalArgumentException if children is a non-empty list for scalar types.
    */
@@ -283,6 +285,7 @@ public void initializeChildrenFromFields(List<Field> children) {
 
   /**
    * Get the inner child vectors.
+   *
    * @return list of child vectors for complex types, empty list for scalar vector types
    */
   @Override
@@ -290,12 +293,11 @@ public List<FieldVector> getChildrenFromFields() {
     return Collections.emptyList();
   }
 
-
   /**
-   * Load the buffers of this vector with provided source buffers.
-   * The caller manages the source buffers and populates them before invoking
-   * this method.
-   * @param fieldNode  the fieldNode indicating the value count
+   * Load the buffers of this vector with provided source buffers. The caller manages the source
+   * buffers and populates them before invoking this method.
+   *
+   * @param fieldNode the fieldNode indicating the value count
    * @param ownBuffers the buffers for this Field (own buffers only, children not included)
    */
   @Override
@@ -317,6 +319,7 @@ public void loadFieldBuffers(ArrowFieldNode fieldNode, List<ArrowBuf> ownBuffers
 
   /**
    * Get the buffers belonging to this vector.
+   *
    * @return the inner buffers.
    */
   @Override
@@ -337,8 +340,35 @@ public List<ArrowBuf> getFieldBuffers() {
   }
 
   /**
-   * Set the reader and writer indexes for the inner buffers.
+   * Export the buffers of the fields for C Data Interface. This method traverse the buffers and
+   * export buffer and buffer's memory address into a list of buffers and a pointer to the list of
+   * buffers.
    */
+  @Override
+  public void exportCDataBuffers(List<ArrowBuf> buffers, ArrowBuf buffersPtr, long nullValue) {
+    // before flight/IPC, we must bring the vector to a consistent state.
+    // this is because, it is possible that the offset buffers of some trailing values
+    // are not updated. this may cause some data in the data buffer being lost.
+    // for details, please see TestValueVector#testUnloadVariableWidthVector.
+    fillHoles(valueCount);
+
+    exportBuffer(validityBuffer, buffers, buffersPtr, nullValue, true);
+
+    if (offsetBuffer.capacity() == 0) {
+      // Empty offset buffer is allowed for historical reason.
+      // To export it through C Data interface, we need to allocate a buffer with one offset.
+      // We set `retain = false` to explicitly not increase the ref count for the exported buffer.
+      // The ref count of the newly created buffer (i.e., 1) already represents the usage
+      // at imported side.
+      exportBuffer(allocateOffsetBuffer(OFFSET_WIDTH), buffers, buffersPtr, nullValue, false);
+    } else {
+      exportBuffer(offsetBuffer, buffers, buffersPtr, nullValue, true);
+    }
+
+    exportBuffer(valueBuffer, buffers, buffersPtr, nullValue, true);
+  }
+
+  /** Set the reader and writer indexes for the inner buffers. */
   private void setReaderAndWriterIndex() {
     validityBuffer.readerIndex(0);
     offsetBuffer.readerIndex(0);
@@ -355,19 +385,16 @@ private void setReaderAndWriterIndex() {
     }
   }
 
-  /**
-   * Same as {@link #allocateNewSafe()}.
-   */
+  /** Same as {@link #allocateNewSafe()}. */
   @Override
   public void allocateNew() {
     allocateNew(lastValueAllocationSizeInBytes, lastValueCapacity);
   }
 
   /**
-   * Allocate memory for the vector. We internally use a default value count
-   * of 4096 to allocate memory for at least these many elements in the
-   * vector. See {@link #allocateNew(long, int)} for allocating memory for specific
-   * number of elements in the vector.
+   * Allocate memory for the vector. We internally use a default value count of 4096 to allocate
+   * memory for at least these many elements in the vector. See {@link #allocateNew(long, int)} for
+   * allocating memory for specific number of elements in the vector.
    *
    * @return false if memory allocation fails, true otherwise.
    */
@@ -382,8 +409,8 @@ public boolean allocateNewSafe() {
   }
 
   /**
-   * Allocate memory for the vector to support storing at least the provided number of
-   * elements in the vector. This method must be called prior to using the ValueVector.
+   * Allocate memory for the vector to support storing at least the provided number of elements in
+   * the vector. This method must be called prior to using the ValueVector.
    *
    * @param totalBytes desired total memory capacity
    * @param valueCount the desired number of elements in the vector
@@ -415,8 +442,13 @@ public void allocateNew(int valueCount) {
   /* Check if the data buffer size is within bounds. */
   private void checkDataBufferSize(long size) {
     if (size > MAX_ALLOCATION_SIZE || size < 0) {
-      throw new OversizedAllocationException("Memory required for vector " +
-          " is (" + size + "), which is more than max allowed (" + MAX_ALLOCATION_SIZE + ")");
+      throw new OversizedAllocationException(
+          "Memory required for vector "
+              + " is ("
+              + size
+              + "), which is more than max allowed ("
+              + MAX_ALLOCATION_SIZE
+              + ")");
     }
   }
 
@@ -430,9 +462,14 @@ private long computeAndCheckOffsetsBufferSize(int valueCount) {
      */
     final long size = computeCombinedBufferSize(valueCount + 1, OFFSET_WIDTH);
     if (size > MAX_ALLOCATION_SIZE) {
-      throw new OversizedAllocationException("Memory required for vector capacity " +
-          valueCount +
-          " is (" + size + "), which is more than max allowed (" + MAX_ALLOCATION_SIZE + ")");
+      throw new OversizedAllocationException(
+          "Memory required for vector capacity "
+              + valueCount
+              + " is ("
+              + size
+              + "), which is more than max allowed ("
+              + MAX_ALLOCATION_SIZE
+              + ")");
     }
     return size;
   }
@@ -456,10 +493,11 @@ private void allocateBytes(final long valueBufferSize, final int valueCount) {
   }
 
   /* allocate offset buffer */
-  private void allocateOffsetBuffer(final long size) {
-    offsetBuffer = allocator.buffer(size);
+  private ArrowBuf allocateOffsetBuffer(final long size) {
+    ArrowBuf offsetBuffer = allocator.buffer(size);
     offsetBuffer.readerIndex(0);
     initOffsetBuffer();
+    return offsetBuffer;
   }
 
   /* allocate validity buffer */
@@ -470,8 +508,8 @@ private void allocateValidityBuffer(final long size) {
   }
 
   /**
-   * Resize the vector to increase the capacity. The internal behavior is to
-   * double the current value capacity.
+   * Resize the vector to increase the capacity. The internal behavior is to double the current
+   * value capacity.
    */
   @Override
   public void reAlloc() {
@@ -480,11 +518,10 @@ public void reAlloc() {
   }
 
   /**
-   * Reallocate the data buffer. Data Buffer stores the actual data for
-   * LARGEVARCHAR or LARGEVARBINARY elements in the vector. The behavior is to double
-   * the size of buffer.
-   * @throws OversizedAllocationException if the desired new size is more than
-   *                                      max allowed
+   * Reallocate the data buffer. Data Buffer stores the actual data for LARGEVARCHAR or
+   * LARGEVARBINARY elements in the vector. The behavior is to double the size of buffer.
+   *
+   * @throws OversizedAllocationException if the desired new size is more than max allowed
    * @throws OutOfMemoryException if the internal memory allocation fails
    */
   public void reallocDataBuffer() {
@@ -510,26 +547,21 @@ public void reallocDataBuffer() {
   }
 
   /**
-   * Reallocate the validity and offset buffers for this vector. Validity
-   * buffer is used to track the NULL or NON-NULL nature of elements in
-   * the vector and offset buffer is used to store the lengths of variable
-   * width elements in the vector.
+   * Reallocate the validity and offset buffers for this vector. Validity buffer is used to track
+   * the NULL or NON-NULL nature of elements in the vector and offset buffer is used to store the
+   * lengths of variable width elements in the vector.
+   *
+   * <p>Note that data buffer for variable length vectors moves independent of the companion
+   * validity and offset buffers. This is in contrast to what we have for fixed width vectors.
    *
-   * <p>Note that data buffer for variable length vectors moves independent
-   * of the companion validity and offset buffers. This is in
-   * contrast to what we have for fixed width vectors.
+   * <p>So even though we may have setup an initial capacity of 1024 elements in the vector, it is
+   * quite possible that we need to reAlloc() the data buffer when we are setting the 5th element in
+   * the vector simply because previous variable length elements have exhausted the buffer capacity.
+   * However, we really don't need to reAlloc() validity and offset buffers until we try to set the
+   * 1025th element This is why we do a separate check for safe methods to determine which buffer
+   * needs reallocation.
    *
-   * <p>So even though we may have setup an initial capacity of 1024
-   * elements in the vector, it is quite possible
-   * that we need to reAlloc() the data buffer when we are setting
-   * the 5th element in the vector simply because previous
-   * variable length elements have exhausted the buffer capacity.
-   * However, we really don't need to reAlloc() validity and
-   * offset buffers until we try to set the 1025th element
-   * This is why we do a separate check for safe methods to
-   * determine which buffer needs reallocation.
-   * @throws OversizedAllocationException if the desired new size is more than
-   *                                      max allowed
+   * @throws OversizedAllocationException if the desired new size is more than max allowed
    * @throws OutOfMemoryException if the internal memory allocation fails
    */
   public void reallocValidityAndOffsetBuffers() {
@@ -546,13 +578,15 @@ public void reallocValidityAndOffsetBuffers() {
     DataAndValidityBuffers buffers = allocFixedDataAndValidityBufs(targetOffsetCount, OFFSET_WIDTH);
     final ArrowBuf newOffsetBuffer = buffers.getDataBuf();
     newOffsetBuffer.setBytes(0, offsetBuffer, 0, offsetBuffer.capacity());
-    newOffsetBuffer.setZero(offsetBuffer.capacity(), newOffsetBuffer.capacity() - offsetBuffer.capacity());
+    newOffsetBuffer.setZero(
+        offsetBuffer.capacity(), newOffsetBuffer.capacity() - offsetBuffer.capacity());
     offsetBuffer.getReferenceManager().release();
     offsetBuffer = newOffsetBuffer;
 
     final ArrowBuf newValidityBuffer = buffers.getValidityBuf();
     newValidityBuffer.setBytes(0, validityBuffer, 0, validityBuffer.capacity());
-    newValidityBuffer.setZero(validityBuffer.capacity(), newValidityBuffer.capacity() - validityBuffer.capacity());
+    newValidityBuffer.setZero(
+        validityBuffer.capacity(), newValidityBuffer.capacity() - validityBuffer.capacity());
     validityBuffer.getReferenceManager().release();
     validityBuffer = newValidityBuffer;
 
@@ -561,6 +595,7 @@ public void reallocValidityAndOffsetBuffers() {
 
   /**
    * Get the size (number of bytes) of underlying data buffer.
+   *
    * @return number of bytes in the data buffer
    */
   @Override
@@ -577,8 +612,8 @@ public int sizeOfValueBuffer() {
   }
 
   /**
-   * Get the size (number of bytes) of underlying buffers used by this
-   * vector.
+   * Get the size (number of bytes) of underlying buffers used by this vector.
+   *
    * @return size of underlying buffers.
    */
   @Override
@@ -588,9 +623,9 @@ public int getBufferSize() {
 
   /**
    * Get the potential buffer size for a particular number of records.
+   *
    * @param valueCount desired number of elements in the vector
-   * @return estimated size of underlying buffers if the vector holds
-   *         a given number of elements
+   * @return estimated size of underlying buffers if the vector holds a given number of elements
    */
   @Override
   public int getBufferSizeFor(final int valueCount) {
@@ -607,6 +642,7 @@ public int getBufferSizeFor(final int valueCount) {
 
   /**
    * Get information about how this field is materialized.
+   *
    * @return the field corresponding to this vector
    */
   @Override
@@ -615,15 +651,15 @@ public Field getField() {
   }
 
   /**
-   * Return the underlying buffers associated with this vector. Note that this doesn't
-   * impact the reference counts for this buffer so it only should be used for in-context
-   * access. Also note that this buffer changes regularly thus
-   * external classes shouldn't hold a reference to it (unless they change it).
+   * Return the underlying buffers associated with this vector. Note that this doesn't impact the
+   * reference counts for this buffer so it only should be used for in-context access. Also note
+   * that this buffer changes regularly thus external classes shouldn't hold a reference to it
+   * (unless they change it).
    *
-   * @param clear Whether to clear vector before returning; the buffers will still be refcounted
-   *              but the returned array will be the only reference to them
-   * @return The underlying {@link io.netty.buffer.ArrowBuf buffers} that is used by this
-   *         vector instance.
+   * @param clear Whether to clear vector before returning; the buffers will still be refcounted but
+   *     the returned array will be the only reference to them
+   * @return The underlying {@link io.netty.buffer.ArrowBuf buffers} that is used by this vector
+   *     instance.
    */
   @Override
   public ArrowBuf[] getBuffers(boolean clear) {
@@ -646,15 +682,14 @@ public ArrowBuf[] getBuffers(boolean clear) {
     return buffers;
   }
 
-  /**
-   * Validate the scalar values held by this vector.
-   */
+  /** Validate the scalar values held by this vector. */
   public void validateScalars() {
     // No validation by default.
   }
 
   /**
    * Construct a transfer pair of this vector and another vector of same type.
+   *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
    * @param callBack not used
@@ -667,6 +702,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator, CallB
 
   /**
    * Construct a transfer pair of this vector and another vector of same type.
+   *
    * @param field The field materialized by this vector
    * @param allocator allocator for the target vector
    * @param callBack not used
@@ -679,6 +715,7 @@ public TransferPair getTransferPair(Field field, BufferAllocator allocator, Call
 
   /**
    * Construct a transfer pair of this vector and another vector of same type.
+   *
    * @param allocator allocator for the target vector
    * @return TransferPair
    */
@@ -687,9 +724,9 @@ public TransferPair getTransferPair(BufferAllocator allocator) {
     return getTransferPair(getName(), allocator);
   }
 
-
   /**
    * Construct a transfer pair of this vector and another vector of same type.
+   *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
    * @return TransferPair
@@ -699,6 +736,7 @@ public TransferPair getTransferPair(BufferAllocator allocator) {
 
   /**
    * Construct a transfer pair of this vector and another vector of same type.
+   *
    * @param field The field materialized by this vector
    * @param allocator allocator for the target vector
    * @return TransferPair
@@ -707,9 +745,9 @@ public TransferPair getTransferPair(BufferAllocator allocator) {
   public abstract TransferPair getTransferPair(Field field, BufferAllocator allocator);
 
   /**
-   * Transfer this vector's data to another vector. The memory associated
-   * with this vector is transferred to the allocator of target vector
-   * for accounting and management purposes.
+   * Transfer this vector's data to another vector. The memory associated with this vector is
+   * transferred to the allocator of target vector for accounting and management purposes.
+   *
    * @param target destination vector for transfer
    */
   public void transferTo(BaseLargeVariableWidthVector target) {
@@ -726,41 +764,43 @@ public void transferTo(BaseLargeVariableWidthVector target) {
   }
 
   /**
-   * Slice this vector at desired index and length and transfer the
-   * corresponding data to the target vector.
+   * Slice this vector at desired index and length and transfer the corresponding data to the target
+   * vector.
+   *
    * @param startIndex start position of the split in source vector.
    * @param length length of the split.
    * @param target destination vector
    */
-  public void splitAndTransferTo(int startIndex, int length,
-                                 BaseLargeVariableWidthVector target) {
-    Preconditions.checkArgument(startIndex >= 0 && startIndex < valueCount,
-        "Invalid startIndex: %s", startIndex);
-    Preconditions.checkArgument(startIndex + length <= valueCount,
-        "Invalid length: %s", length);
+  public void splitAndTransferTo(int startIndex, int length, BaseLargeVariableWidthVector target) {
+    Preconditions.checkArgument(
+        startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
+        "Invalid parameters startIndex: %s, length: %s for valueCount: %s",
+        startIndex,
+        length,
+        valueCount);
     compareTypes(target, "splitAndTransferTo");
     target.clear();
-    splitAndTransferValidityBuffer(startIndex, length, target);
-    splitAndTransferOffsetBuffer(startIndex, length, target);
-    target.setLastSet(length - 1);
     if (length > 0) {
+      splitAndTransferValidityBuffer(startIndex, length, target);
+      splitAndTransferOffsetBuffer(startIndex, length, target);
+      target.setLastSet(length - 1);
       target.setValueCount(length);
     }
   }
 
   /**
-   * Transfer the offsets along with data. Unlike the data buffer, we cannot simply
-   * slice the offset buffer for split and transfer. The reason is that offsets
-   * in the target vector have to be adjusted and made relative to the staring
-   * offset in source vector from the start index of split. This is why, we
-   * need to explicitly allocate the offset buffer and set the adjusted offsets
-   * in the target vector.
+   * Transfer the offsets along with data. Unlike the data buffer, we cannot simply slice the offset
+   * buffer for split and transfer. The reason is that offsets in the target vector have to be
+   * adjusted and made relative to the staring offset in source vector from the start index of
+   * split. This is why, we need to explicitly allocate the offset buffer and set the adjusted
+   * offsets in the target vector.
    */
-  private void splitAndTransferOffsetBuffer(int startIndex, int length, BaseLargeVariableWidthVector target) {
+  private void splitAndTransferOffsetBuffer(
+      int startIndex, int length, BaseLargeVariableWidthVector target) {
     final long start = getStartOffset(startIndex);
     final long end = getStartOffset(startIndex + length);
     final long dataLength = end - start;
-    target.allocateOffsetBuffer((long) (length + 1) * OFFSET_WIDTH);
+    target.offsetBuffer = target.allocateOffsetBuffer((long) (length + 1) * OFFSET_WIDTH);
     for (int i = 0; i < length + 1; i++) {
       final long relativeSourceOffset = getStartOffset(startIndex + i) - start;
       target.offsetBuffer.setLong((long) i * OFFSET_WIDTH, relativeSourceOffset);
@@ -772,8 +812,8 @@ private void splitAndTransferOffsetBuffer(int startIndex, int length, BaseLargeV
   /*
    * Transfer the validity.
    */
-  private void splitAndTransferValidityBuffer(int startIndex, int length,
-                                              BaseLargeVariableWidthVector target) {
+  private void splitAndTransferValidityBuffer(
+      int startIndex, int length, BaseLargeVariableWidthVector target) {
     int firstByteSource = BitVectorHelper.byteIndex(startIndex);
     int lastByteSource = BitVectorHelper.byteIndex(valueCount - 1);
     int byteSizeTarget = getValidityBufferSizeFromCount(length);
@@ -797,8 +837,12 @@ private void splitAndTransferValidityBuffer(int startIndex, int length,
         target.allocateValidityBuffer(byteSizeTarget);
 
         for (int i = 0; i < byteSizeTarget - 1; i++) {
-          byte b1 = BitVectorHelper.getBitsFromCurrentByte(this.validityBuffer, firstByteSource + i, offset);
-          byte b2 = BitVectorHelper.getBitsFromNextByte(this.validityBuffer, firstByteSource + i + 1, offset);
+          byte b1 =
+              BitVectorHelper.getBitsFromCurrentByte(
+                  this.validityBuffer, firstByteSource + i, offset);
+          byte b2 =
+              BitVectorHelper.getBitsFromNextByte(
+                  this.validityBuffer, firstByteSource + i + 1, offset);
 
           target.validityBuffer.setByte(i, (b1 + b2));
         }
@@ -812,28 +856,29 @@ private void splitAndTransferValidityBuffer(int startIndex, int length,
          * by shifting data from the current byte.
          */
         if ((firstByteSource + byteSizeTarget - 1) < lastByteSource) {
-          byte b1 = BitVectorHelper.getBitsFromCurrentByte(this.validityBuffer,
-              firstByteSource + byteSizeTarget - 1, offset);
-          byte b2 = BitVectorHelper.getBitsFromNextByte(this.validityBuffer,
-              firstByteSource + byteSizeTarget, offset);
+          byte b1 =
+              BitVectorHelper.getBitsFromCurrentByte(
+                  this.validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
+          byte b2 =
+              BitVectorHelper.getBitsFromNextByte(
+                  this.validityBuffer, firstByteSource + byteSizeTarget, offset);
 
           target.validityBuffer.setByte(byteSizeTarget - 1, b1 + b2);
         } else {
-          byte b1 = BitVectorHelper.getBitsFromCurrentByte(this.validityBuffer,
-              firstByteSource + byteSizeTarget - 1, offset);
+          byte b1 =
+              BitVectorHelper.getBitsFromCurrentByte(
+                  this.validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
           target.validityBuffer.setByte(byteSizeTarget - 1, b1);
         }
       }
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                common getters and setters                      |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                common getters and setters                      |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the number of elements that are null in the vector.
@@ -846,10 +891,9 @@ public int getNullCount() {
   }
 
   /**
-   * Check if the given index is within the current value capacity
-   * of the vector.
+   * Check if the given index is within the current value capacity of the vector.
    *
-   * @param index  position to check
+   * @param index position to check
    * @return true if index is within the current value capacity
    */
   public boolean isSafe(int index) {
@@ -859,7 +903,7 @@ public boolean isSafe(int index) {
   /**
    * Check if element at given index is null.
    *
-   * @param index  position of element
+   * @param index position of element
    * @return true if element at given index is null
    */
   @Override
@@ -870,7 +914,7 @@ public boolean isNull(int index) {
   /**
    * Same as {@link #isNull(int)}.
    *
-   * @param index  position of element
+   * @param index position of element
    * @return 1 if element at given index is not null, 0 otherwise
    */
   public int isSet(int index) {
@@ -881,8 +925,8 @@ public int isSet(int index) {
   }
 
   /**
-   * Get the value count of vector. This will always be zero unless
-   * setValueCount(int) has been called prior to calling this.
+   * Get the value count of vector. This will always be zero unless setValueCount(int) has been
+   * called prior to calling this.
    *
    * @return valueCount for the vector
    */
@@ -894,7 +938,7 @@ public int getValueCount() {
   /**
    * Sets the value count for the vector.
    *
-   * @param valueCount   value count
+   * @param valueCount value count
    */
   @Override
   public void setValueCount(int valueCount) {
@@ -909,12 +953,12 @@ public void setValueCount(int valueCount) {
   }
 
   /**
-   * Create holes in the vector upto the given index (exclusive).
-   * Holes will be created from the current last set position in
-   * the vector.
+   * Create holes in the vector upto the given index (exclusive). Holes will be created from the
+   * current last set position in the vector.
    *
    * @param index target index
    */
+  @Override
   public void fillEmpties(int index) {
     handleSafe(index, emptyByteArray.length);
     fillHoles(index);
@@ -922,12 +966,12 @@ public void fillEmpties(int index) {
   }
 
   /**
-   * Set the index of last non-null element in the vector.
-   * It is important to call this method with appropriate value
-   * before calling {@link #setValueCount(int)}.
+   * Set the index of last non-null element in the vector. It is important to call this method with
+   * appropriate value before calling {@link #setValueCount(int)}.
    *
    * @param value desired index of last non-null element.
    */
+  @Override
   public void setLastSet(int value) {
     lastSet = value;
   }
@@ -937,6 +981,7 @@ public void setLastSet(int value) {
    *
    * @return index of the last non-null element
    */
+  @Override
   public int getLastSet() {
     return lastSet;
   }
@@ -958,8 +1003,8 @@ public void setIndexDefined(int index) {
   /**
    * Sets the value length for an element.
    *
-   * @param index   position of the element to set
-   * @param length  length of the element
+   * @param index position of the element to set
+   * @param length length of the element
    */
   public void setValueLengthSafe(int index, int length) {
     assert index >= 0;
@@ -973,9 +1018,10 @@ public void setValueLengthSafe(int index, int length) {
   /**
    * Get the variable length element at specified index as Text.
    *
-   * @param index   position of element to get
+   * @param index position of element to get
    * @return greater than 0 length for non-null element, 0 otherwise
    */
+  @Override
   public int getValueLength(int index) {
     assert index >= 0;
     if (isSet(index) == 0) {
@@ -987,13 +1033,13 @@ public int getValueLength(int index) {
   }
 
   /**
-   * Set the variable length element at the specified index to the supplied
-   * byte array. This is same as using {@link #set(int, byte[], int, int)}
-   * with start as 0 and length as value.length
+   * Set the variable length element at the specified index to the supplied byte array. This is same
+   * as using {@link #set(int, byte[], int, int)} with start as 0 and length as value.length
    *
-   * @param index   position of the element to set
-   * @param value   array of bytes to write
+   * @param index position of the element to set
+   * @param value array of bytes to write
    */
+  @Override
   public void set(int index, byte[] value) {
     assert index >= 0;
     fillHoles(index);
@@ -1003,13 +1049,13 @@ public void set(int index, byte[] value) {
   }
 
   /**
-   * Same as {@link #set(int, byte[])} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, byte[])} except that it handles the case where index and length of new
+   * element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set
-   * @param value   array of bytes to write
+   * @param index position of the element to set
+   * @param value array of bytes to write
    */
+  @Override
   public void setSafe(int index, byte[] value) {
     assert index >= 0;
     handleSafe(index, value.length);
@@ -1020,14 +1066,14 @@ public void setSafe(int index, byte[] value) {
   }
 
   /**
-   * Set the variable length element at the specified index to the supplied
-   * byte array.
+   * Set the variable length element at the specified index to the supplied byte array.
    *
-   * @param index   position of the element to set
-   * @param value   array of bytes to write
-   * @param start   start index in array of bytes
-   * @param length  length of data in array of bytes
+   * @param index position of the element to set
+   * @param value array of bytes to write
+   * @param start start index in array of bytes
+   * @param length length of data in array of bytes
    */
+  @Override
   public void set(int index, byte[] value, int start, int length) {
     assert index >= 0;
     fillHoles(index);
@@ -1037,14 +1083,13 @@ public void set(int index, byte[] value, int start, int length) {
   }
 
   /**
-   * Same as {@link #set(int, byte[], int, int)} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, byte[], int, int)} except that it handles the case where index and
+   * length of new element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set
-   * @param value   array of bytes to write
-   * @param start   start index in array of bytes
-   * @param length  length of data in array of bytes
+   * @param index position of the element to set
+   * @param value array of bytes to write
+   * @param start start index in array of bytes
+   * @param length length of data in array of bytes
    */
   public void setSafe(int index, byte[] value, int start, int length) {
     assert index >= 0;
@@ -1056,14 +1101,14 @@ public void setSafe(int index, byte[] value, int start, int length) {
   }
 
   /**
-   * Set the variable length element at the specified index to the
-   * content in supplied ByteBuffer.
+   * Set the variable length element at the specified index to the content in supplied ByteBuffer.
    *
-   * @param index   position of the element to set
-   * @param value   ByteBuffer with data
-   * @param start   start index in ByteBuffer
-   * @param length  length of data in ByteBuffer
+   * @param index position of the element to set
+   * @param value ByteBuffer with data
+   * @param start start index in ByteBuffer
+   * @param length length of data in ByteBuffer
    */
+  @Override
   public void set(int index, ByteBuffer value, int start, int length) {
     assert index >= 0;
     fillHoles(index);
@@ -1075,14 +1120,13 @@ public void set(int index, ByteBuffer value, int start, int length) {
   }
 
   /**
-   * Same as {@link #set(int, ByteBuffer, int, int)} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, ByteBuffer, int, int)} except that it handles the case where index and
+   * length of new element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set
-   * @param value   ByteBuffer with data
-   * @param start   start index in ByteBuffer
-   * @param length  length of data in ByteBuffer
+   * @param index position of the element to set
+   * @param value ByteBuffer with data
+   * @param start start index in ByteBuffer
+   * @param length length of data in ByteBuffer
    */
   public void setSafe(int index, ByteBuffer value, int start, int length) {
     assert index >= 0;
@@ -1098,7 +1142,7 @@ public void setSafe(int index, ByteBuffer value, int start, int length) {
   /**
    * Set the element at the given index to null.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   @Override
   public void setNull(int index) {
@@ -1110,14 +1154,14 @@ public void setNull(int index) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
+   *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
    * @param start start position of data in buffer
    * @param end end position of data in buffer
-   * @param buffer data buffer containing the variable width element to be stored
-   *               in the vector
+   * @param buffer data buffer containing the variable width element to be stored in the vector
    */
   public void set(int index, int isSet, long start, long end, ArrowBuf buffer) {
     assert index >= 0;
@@ -1131,15 +1175,14 @@ public void set(int index, int isSet, long start, long end, ArrowBuf buffer) {
   }
 
   /**
-   * Same as {@link #set(int, int, long, long, ArrowBuf)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, long, long, ArrowBuf)} except that it handles the case when index
+   * is greater than or equal to current value capacity of the vector.
+   *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
    * @param start start position of data in buffer
    * @param end end position of data in buffer
-   * @param buffer data buffer containing the variable width element to be stored
-   *               in the vector
+   * @param buffer data buffer containing the variable width element to be stored in the vector
    */
   public void setSafe(int index, int isSet, long start, long end, ArrowBuf buffer) {
     assert index >= 0;
@@ -1154,13 +1197,13 @@ public void setSafe(int index, int isSet, long start, long end, ArrowBuf buffer)
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
+   *
    * @param index position of the new value
    * @param start start position of data in buffer
    * @param length length of data in buffer
-   * @param buffer data buffer containing the variable width element to be stored
-   *               in the vector
+   * @param buffer data buffer containing the variable width element to be stored in the vector
    */
   public void set(int index, long start, int length, ArrowBuf buffer) {
     assert index >= 0;
@@ -1174,14 +1217,13 @@ public void set(int index, long start, int length, ArrowBuf buffer) {
   }
 
   /**
-   * Same as {@link #set(int, int, long, long, ArrowBuf)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, long, long, ArrowBuf)} except that it handles the case when index
+   * is greater than or equal to current value capacity of the vector.
+   *
    * @param index position of the new value
    * @param start start position of data in buffer
    * @param length length of data in buffer
-   * @param buffer data buffer containing the variable width element to be stored
-   *               in the vector
+   * @param buffer data buffer containing the variable width element to be stored in the vector
    */
   public void setSafe(int index, long start, int length, ArrowBuf buffer) {
     assert index >= 0;
@@ -1195,13 +1237,11 @@ public void setSafe(int index, long start, int length, ArrowBuf buffer) {
     lastSet = index;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                helper methods for setters                      |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                helper methods for setters                      |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   protected final void fillHoles(int index) {
     for (int i = lastSet + 1; i < index; i++) {
@@ -1223,6 +1263,7 @@ protected final void setBytes(int index, byte[] value, int start, int length) {
 
   /**
    * Gets the starting offset of a record, given its index.
+   *
    * @param index index of the record.
    * @return the starting offset of the record.
    */
@@ -1261,8 +1302,8 @@ protected final void handleSafe(int index, int dataLength) {
   }
 
   /**
-   * Method used by Json Writer to read a variable width element from
-   * the variable width vector and write to Json.
+   * Method used by Json Writer to read a variable width element from the variable width vector and
+   * write to Json.
    *
    * <p>This method should not be used externally.
    *
@@ -1281,9 +1322,8 @@ public static byte[] get(final ArrowBuf data, final ArrowBuf offset, int index)
   }
 
   /**
-   * Method used by Json Reader to explicitly set the offsets of the variable
-   * width vector data. The method takes care of allocating the memory for
-   * offsets if the caller hasn't done so.
+   * Method used by Json Reader to explicitly set the offsets of the variable width vector data. The
+   * method takes care of allocating the memory for offsets if the caller hasn't done so.
    *
    * <p>This method should not be used externally.
    *
@@ -1294,8 +1334,8 @@ public static byte[] get(final ArrowBuf data, final ArrowBuf offset, int index)
    * @param value offset of the element
    * @return buffer holding the offsets
    */
-  public static ArrowBuf set(ArrowBuf buffer, BufferAllocator allocator,
-                             int valueCount, int index, long value) {
+  public static ArrowBuf set(
+      ArrowBuf buffer, BufferAllocator allocator, int valueCount, int index, long value) {
     if (buffer == null) {
       buffer = allocator.buffer((long) valueCount * OFFSET_WIDTH);
     }
@@ -1308,8 +1348,8 @@ public static ArrowBuf set(ArrowBuf buffer, BufferAllocator allocator,
   }
 
   /**
-   * Copy a cell value from a particular index in source vector to a particular
-   * position in this vector.
+   * Copy a cell value from a particular index in source vector to a particular position in this
+   * vector.
    *
    * @param fromIndex position to copy from in source vector
    * @param thisIndex position to copy to in this vector
@@ -1337,9 +1377,8 @@ public void copyFrom(int fromIndex, int thisIndex, ValueVector from) {
   }
 
   /**
-   * Same as {@link #copyFrom(int, int, ValueVector)} except that
-   * it handles the case when the capacity of the vector needs to be expanded
-   * before copy.
+   * Same as {@link #copyFrom(int, int, ValueVector)} except that it handles the case when the
+   * capacity of the vector needs to be expanded before copy.
    *
    * @param fromIndex position to copy from in source vector
    * @param thisIndex position to copy to in this vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java
index 070919c356791..9befcb890f011 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import java.util.Collections;
 import java.util.Iterator;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.ReferenceManager;
@@ -30,13 +28,13 @@
 import org.apache.arrow.vector.util.ValueVectorUtility;
 
 /**
- * Base class for other Arrow Vector Types.  Provides basic functionality around
- * memory management.
+ * Base class for other Arrow Vector Types. Provides basic functionality around memory management.
  */
 public abstract class BaseValueVector implements ValueVector {
 
   public static final String MAX_ALLOCATION_SIZE_PROPERTY = "arrow.vector.max_allocation_bytes";
-  public static final long MAX_ALLOCATION_SIZE = Long.getLong(MAX_ALLOCATION_SIZE_PROPERTY, Long.MAX_VALUE);
+  public static final long MAX_ALLOCATION_SIZE =
+      Long.getLong(MAX_ALLOCATION_SIZE_PROPERTY, Long.MAX_VALUE);
   /*
    * For all fixed width vectors, the value and validity buffers are sliced from a single buffer.
    * Similarly, for variable width vectors, the offsets and validity buffers are sliced from a
@@ -57,17 +55,14 @@ protected BaseValueVector(BufferAllocator allocator) {
   @Override
   public abstract String getName();
 
-  /**
-   * Representation of vector suitable for debugging.
-   */
+  /** Representation of vector suitable for debugging. */
   @Override
   public String toString() {
     return ValueVectorUtility.getToString(this, 0, getValueCount());
   }
 
   @Override
-  public void clear() {
-  }
+  public void clear() {}
 
   @Override
   public void close() {
@@ -85,9 +80,8 @@ public Iterator<ValueVector> iterator() {
   }
 
   /**
-   * Checks to ensure that every buffer <code>vv</code> uses
-   * has a positive reference count, throws if this precondition
-   * isn't met.  Returns true otherwise.
+   * Checks to ensure that every buffer <code>vv</code> uses has a positive reference count, throws
+   * if this precondition isn't met. Returns true otherwise.
    */
   public static boolean checkBufRefs(final ValueVector vv) {
     for (final ArrowBuf buffer : vv.getBuffers(false)) {
@@ -144,8 +138,8 @@ long computeCombinedBufferSize(int valueCount, int typeWidth) {
   }
 
   /**
-   * Each vector has a different reader that implements the FieldReader interface. Overridden methods must make
-   * sure to return the correct concrete reader implementation.
+   * Each vector has a different reader that implements the FieldReader interface. Overridden
+   * methods must make sure to return the correct concrete reader implementation.
    *
    * @return Returns a lambda that initializes a reader when called.
    */
@@ -173,9 +167,7 @@ public FieldReader getReader() {
     }
   }
 
-  /**
-   * Container for primitive vectors (1 for the validity bit-mask and one to hold the values).
-   */
+  /** Container for primitive vectors (1 for the validity bit-mask and one to hold the values). */
   static class DataAndValidityBuffers {
     private ArrowBuf dataBuf;
     private ArrowBuf validityBuf;
@@ -213,11 +205,9 @@ DataAndValidityBuffers allocFixedDataAndValidityBufs(int valueCount, int typeWid
           break;
         }
         --actualCount;
-      }
-      while (true);
+      } while (true);
     }
 
-
     /* allocate combined buffer */
     ArrowBuf combinedBuffer = allocator.buffer(bufferSize);
 
@@ -243,7 +233,8 @@ DataAndValidityBuffers allocFixedDataAndValidityBufs(int valueCount, int typeWid
     return new DataAndValidityBuffers(dataBuf, validityBuf);
   }
 
-  public static ArrowBuf transferBuffer(final ArrowBuf srcBuffer, final BufferAllocator targetAllocator) {
+  public static ArrowBuf transferBuffer(
+      final ArrowBuf srcBuffer, final BufferAllocator targetAllocator) {
     final ReferenceManager referenceManager = srcBuffer.getReferenceManager();
     return referenceManager.transferOwnership(srcBuffer, targetAllocator).getTransferredBuffer();
   }
@@ -258,4 +249,3 @@ public void copyFromSafe(int fromIndex, int thisIndex, ValueVector from) {
     throw new UnsupportedOperationException();
   }
 }
-
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java
index 4cf495a349f02..5d761ffbee919 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
@@ -23,7 +22,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.OutOfMemoryException;
@@ -39,20 +37,19 @@
 import org.apache.arrow.vector.util.OversizedAllocationException;
 import org.apache.arrow.vector.util.TransferPair;
 
-/**
- * BaseVariableWidthVector is a base class providing functionality for strings/bytes types.
- */
+/** BaseVariableWidthVector is a base class providing functionality for strings/bytes types. */
 public abstract class BaseVariableWidthVector extends BaseValueVector
-        implements VariableWidthVector, FieldVector, VectorDefinitionSetter {
+    implements VariableWidthFieldVector {
   private static final int DEFAULT_RECORD_BYTE_COUNT = 8;
-  private static final int INITIAL_BYTE_COUNT = INITIAL_VALUE_ALLOCATION * DEFAULT_RECORD_BYTE_COUNT;
+  private static final int INITIAL_BYTE_COUNT =
+      INITIAL_VALUE_ALLOCATION * DEFAULT_RECORD_BYTE_COUNT;
   private static final int MAX_BUFFER_SIZE = (int) Math.min(MAX_ALLOCATION_SIZE, Integer.MAX_VALUE);
   private int lastValueCapacity;
   private long lastValueAllocationSizeInBytes;
 
   /* protected members */
   public static final int OFFSET_WIDTH = 4; /* 4 byte unsigned int to track offsets */
-  protected static final byte[] emptyByteArray = new byte[]{};
+  protected static final byte[] emptyByteArray = new byte[] {};
   protected ArrowBuf validityBuffer;
   protected ArrowBuf valueBuffer;
   protected ArrowBuf offsetBuffer;
@@ -103,9 +100,9 @@ public String getName() {
    */
 
   /**
-   * Get buffer that manages the validity (NULL or NON-NULL nature) of
-   * elements in the vector. Consider it as a buffer for internal bit vector
-   * data structure.
+   * Get buffer that manages the validity (NULL or NON-NULL nature) of elements in the vector.
+   * Consider it as a buffer for internal bit vector data structure.
+   *
    * @return buffer
    */
   @Override
@@ -115,6 +112,7 @@ public ArrowBuf getValidityBuffer() {
 
   /**
    * Get the buffer that stores the data for elements in the vector.
+   *
    * @return buffer
    */
   @Override
@@ -123,8 +121,9 @@ public ArrowBuf getDataBuffer() {
   }
 
   /**
-   * buffer that stores the offsets for elements
-   * in the vector. This operation is not supported for fixed-width vectors.
+   * buffer that stores the offsets for elements in the vector. This operation is not supported for
+   * fixed-width vectors.
+   *
    * @return buffer
    */
   @Override
@@ -133,8 +132,8 @@ public ArrowBuf getOffsetBuffer() {
   }
 
   /**
-   * Get the memory address of buffer that stores the offsets for elements
-   * in the vector.
+   * Get the memory address of buffer that stores the offsets for elements in the vector.
+   *
    * @return starting address of the buffer
    */
   @Override
@@ -143,8 +142,9 @@ public long getOffsetBufferAddress() {
   }
 
   /**
-   * Get the memory address of buffer that manages the validity
-   * (NULL or NON-NULL nature) of elements in the vector.
+   * Get the memory address of buffer that manages the validity (NULL or NON-NULL nature) of
+   * elements in the vector.
+   *
    * @return starting address of the buffer
    */
   @Override
@@ -153,8 +153,8 @@ public long getValidityBufferAddress() {
   }
 
   /**
-   * Get the memory address of buffer that stores the data for elements
-   * in the vector.
+   * Get the memory address of buffer that stores the data for elements in the vector.
+   *
    * @return starting address of the buffer
    */
   @Override
@@ -163,8 +163,9 @@ public long getDataBufferAddress() {
   }
 
   /**
-   * Sets the desired value capacity for the vector. This function doesn't
-   * allocate any memory for the vector.
+   * Sets the desired value capacity for the vector. This function doesn't allocate any memory for
+   * the vector.
+   *
    * @param valueCount desired number of elements in the vector
    */
   @Override
@@ -177,8 +178,9 @@ public void setInitialCapacity(int valueCount) {
   }
 
   /**
-   * Sets the desired value capacity for the vector. This function doesn't
-   * allocate any memory for the vector.
+   * Sets the desired value capacity for the vector. This function doesn't allocate any memory for
+   * the vector.
+   *
    * @param valueCount desired number of elements in the vector
    * @param density average number of bytes per variable width element
    */
@@ -193,6 +195,7 @@ public void setInitialCapacity(int valueCount, double density) {
 
   /**
    * Get the density of this ListVector.
+   *
    * @return density
    */
   public double getDensity() {
@@ -206,8 +209,9 @@ public double getDensity() {
   }
 
   /**
-   * Get the current capacity which does not exceed either validity buffer or offset buffer.
-   * Note: Here the `getValueCapacity` has no relationship with the value buffer.
+   * Get the current capacity which does not exceed either validity buffer or offset buffer. Note:
+   * Here the `getValueCapacity` has no relationship with the value buffer.
+   *
    * @return number of elements that vector can hold.
    */
   @Override
@@ -224,9 +228,7 @@ private int getOffsetBufferValueCapacity() {
     return capAtMaxInt(offsetBuffer.capacity() / OFFSET_WIDTH);
   }
 
-  /**
-   * zero out the vector and the data in associated buffers.
-   */
+  /** zero out the vector and the data in associated buffers. */
   public void zeroVector() {
     initValidityBuffer();
     initOffsetBuffer();
@@ -244,8 +246,8 @@ private void initOffsetBuffer() {
   }
 
   /**
-   * Reset the vector to initial state. Same as {@link #zeroVector()}.
-   * Note that this method doesn't release any memory.
+   * Reset the vector to initial state. Same as {@link #zeroVector()}. Note that this method doesn't
+   * release any memory.
    */
   @Override
   public void reset() {
@@ -254,17 +256,13 @@ public void reset() {
     valueCount = 0;
   }
 
-  /**
-   * Close the vector and release the associated buffers.
-   */
+  /** Close the vector and release the associated buffers. */
   @Override
   public void close() {
     clear();
   }
 
-  /**
-   * Same as {@link #close()}.
-   */
+  /** Same as {@link #close()}. */
   @Override
   public void clear() {
     validityBuffer = releaseBuffer(validityBuffer);
@@ -277,8 +275,8 @@ public void clear() {
   /**
    * Get the inner vectors.
    *
-   * @deprecated This API will be removed as the current implementations no longer support inner vectors.
-   *
+   * @deprecated This API will be removed as the current implementations no longer support inner
+   *     vectors.
    * @return the inner vectors for this field as defined by the TypeLayout
    */
   @Deprecated
@@ -288,8 +286,9 @@ public List<BufferBacked> getFieldInnerVectors() {
   }
 
   /**
-   * Initialize the children in schema for this Field. This operation is a
-   * NO-OP for scalar types since they don't have any children.
+   * Initialize the children in schema for this Field. This operation is a NO-OP for scalar types
+   * since they don't have any children.
+   *
    * @param children the schema
    * @throws IllegalArgumentException if children is a non-empty list for scalar types.
    */
@@ -302,6 +301,7 @@ public void initializeChildrenFromFields(List<Field> children) {
 
   /**
    * Get the inner child vectors.
+   *
    * @return list of child vectors for complex types, empty list for scalar vector types
    */
   @Override
@@ -309,12 +309,11 @@ public List<FieldVector> getChildrenFromFields() {
     return Collections.emptyList();
   }
 
-
   /**
-   * Load the buffers of this vector with provided source buffers.
-   * The caller manages the source buffers and populates them before invoking
-   * this method.
-   * @param fieldNode  the fieldNode indicating the value count
+   * Load the buffers of this vector with provided source buffers. The caller manages the source
+   * buffers and populates them before invoking this method.
+   *
+   * @param fieldNode the fieldNode indicating the value count
    * @param ownBuffers the buffers for this Field (own buffers only, children not included)
    */
   @Override
@@ -336,6 +335,7 @@ public void loadFieldBuffers(ArrowFieldNode fieldNode, List<ArrowBuf> ownBuffers
 
   /**
    * Get the buffers belonging to this vector.
+   *
    * @return the inner buffers.
    */
   @Override
@@ -356,8 +356,35 @@ public List<ArrowBuf> getFieldBuffers() {
   }
 
   /**
-   * Set the reader and writer indexes for the inner buffers.
+   * Export the buffers of the fields for C Data Interface. This method traverse the buffers and
+   * export buffer and buffer's memory address into a list of buffers and a pointer to the list of
+   * buffers.
    */
+  @Override
+  public void exportCDataBuffers(List<ArrowBuf> buffers, ArrowBuf buffersPtr, long nullValue) {
+    // before flight/IPC, we must bring the vector to a consistent state.
+    // this is because, it is possible that the offset buffers of some trailing values
+    // are not updated. this may cause some data in the data buffer being lost.
+    // for details, please see TestValueVector#testUnloadVariableWidthVector.
+    fillHoles(valueCount);
+
+    exportBuffer(validityBuffer, buffers, buffersPtr, nullValue, true);
+
+    if (offsetBuffer.capacity() == 0) {
+      // Empty offset buffer is allowed for historical reason.
+      // To export it through C Data interface, we need to allocate a buffer with one offset.
+      // We set `retain = false` to explicitly not increase the ref count for the exported buffer.
+      // The ref count of the newly created buffer (i.e., 1) already represents the usage
+      // at imported side.
+      exportBuffer(allocateOffsetBuffer(OFFSET_WIDTH), buffers, buffersPtr, nullValue, false);
+    } else {
+      exportBuffer(offsetBuffer, buffers, buffersPtr, nullValue, true);
+    }
+
+    exportBuffer(valueBuffer, buffers, buffersPtr, nullValue, true);
+  }
+
+  /** Set the reader and writer indexes for the inner buffers. */
   private void setReaderAndWriterIndex() {
     validityBuffer.readerIndex(0);
     offsetBuffer.readerIndex(0);
@@ -374,19 +401,16 @@ private void setReaderAndWriterIndex() {
     }
   }
 
-  /**
-   * Same as {@link #allocateNewSafe()}.
-   */
+  /** Same as {@link #allocateNewSafe()}. */
   @Override
   public void allocateNew() {
     allocateNew(lastValueAllocationSizeInBytes, lastValueCapacity);
   }
 
   /**
-   * Allocate memory for the vector. We internally use a default value count
-   * of 4096 to allocate memory for at least these many elements in the
-   * vector. See {@link #allocateNew(long, int)} for allocating memory for specific
-   * number of elements in the vector.
+   * Allocate memory for the vector. We internally use a default value count of 4096 to allocate
+   * memory for at least these many elements in the vector. See {@link #allocateNew(long, int)} for
+   * allocating memory for specific number of elements in the vector.
    *
    * @return false if memory allocation fails, true otherwise.
    */
@@ -401,8 +425,8 @@ public boolean allocateNewSafe() {
   }
 
   /**
-   * Allocate memory for the vector to support storing at least the provided number of
-   * elements in the vector. This method must be called prior to using the ValueVector.
+   * Allocate memory for the vector to support storing at least the provided number of elements in
+   * the vector. This method must be called prior to using the ValueVector.
    *
    * @param totalBytes desired total memory capacity
    * @param valueCount the desired number of elements in the vector
@@ -434,9 +458,14 @@ public void allocateNew(int valueCount) {
   /* Check if the data buffer size is within bounds. */
   private void checkDataBufferSize(long size) {
     if (size > MAX_BUFFER_SIZE || size < 0) {
-      throw new OversizedAllocationException("Memory required for vector " +
-          "is (" + size + "), which is overflow or more than max allowed (" + MAX_BUFFER_SIZE + "). " +
-          "You could consider using LargeVarCharVector/LargeVarBinaryVector for large strings/large bytes types");
+      throw new OversizedAllocationException(
+          "Memory required for vector "
+              + "is ("
+              + size
+              + "), which is overflow or more than max allowed ("
+              + MAX_BUFFER_SIZE
+              + "). "
+              + "You could consider using LargeVarCharVector/LargeVarBinaryVector for large strings/large bytes types");
     }
   }
 
@@ -450,9 +479,14 @@ private long computeAndCheckOffsetsBufferSize(int valueCount) {
      */
     final long size = computeCombinedBufferSize(valueCount + 1, OFFSET_WIDTH);
     if (size > MAX_BUFFER_SIZE) {
-      throw new OversizedAllocationException("Memory required for vector capacity " +
-          valueCount +
-          " is (" + size + "), which is more than max allowed (" + MAX_BUFFER_SIZE + ")");
+      throw new OversizedAllocationException(
+          "Memory required for vector capacity "
+              + valueCount
+              + " is ("
+              + size
+              + "), which is more than max allowed ("
+              + MAX_BUFFER_SIZE
+              + ")");
     }
     return size;
   }
@@ -476,11 +510,12 @@ private void allocateBytes(final long valueBufferSize, final int valueCount) {
   }
 
   /* allocate offset buffer */
-  private void allocateOffsetBuffer(final long size) {
+  private ArrowBuf allocateOffsetBuffer(final long size) {
     final int curSize = (int) size;
-    offsetBuffer = allocator.buffer(curSize);
+    ArrowBuf offsetBuffer = allocator.buffer(curSize);
     offsetBuffer.readerIndex(0);
     initOffsetBuffer();
+    return offsetBuffer;
   }
 
   /* allocate validity buffer */
@@ -492,8 +527,8 @@ private void allocateValidityBuffer(final long size) {
   }
 
   /**
-   * Resize the vector to increase the capacity. The internal behavior is to
-   * double the current value capacity.
+   * Resize the vector to increase the capacity. The internal behavior is to double the current
+   * value capacity.
    */
   @Override
   public void reAlloc() {
@@ -502,11 +537,10 @@ public void reAlloc() {
   }
 
   /**
-   * Reallocate the data buffer. Data Buffer stores the actual data for
-   * VARCHAR or VARBINARY elements in the vector. The behavior is to double
-   * the size of buffer.
-   * @throws OversizedAllocationException if the desired new size is more than
-   *                                      max allowed
+   * Reallocate the data buffer. Data Buffer stores the actual data for VARCHAR or VARBINARY
+   * elements in the vector. The behavior is to double the size of buffer.
+   *
+   * @throws OversizedAllocationException if the desired new size is more than max allowed
    * @throws OutOfMemoryException if the internal memory allocation fails
    */
   public void reallocDataBuffer() {
@@ -524,14 +558,12 @@ public void reallocDataBuffer() {
   }
 
   /**
-   * Reallocate the data buffer to given size. Data Buffer stores the actual data for
-   * VARCHAR or VARBINARY elements in the vector. The actual allocate size may be larger
-   * than the request one because it will round up the provided value to the nearest
-   * power of two.
+   * Reallocate the data buffer to given size. Data Buffer stores the actual data for VARCHAR or
+   * VARBINARY elements in the vector. The actual allocate size may be larger than the request one
+   * because it will round up the provided value to the nearest power of two.
    *
    * @param desiredAllocSize the desired new allocation size
-   * @throws OversizedAllocationException if the desired new size is more than
-   *                                      max allowed
+   * @throws OversizedAllocationException if the desired new size is more than max allowed
    * @throws OutOfMemoryException if the internal memory allocation fails
    */
   public void reallocDataBuffer(long desiredAllocSize) {
@@ -552,26 +584,21 @@ public void reallocDataBuffer(long desiredAllocSize) {
   }
 
   /**
-   * Reallocate the validity and offset buffers for this vector. Validity
-   * buffer is used to track the NULL or NON-NULL nature of elements in
-   * the vector and offset buffer is used to store the lengths of variable
-   * width elements in the vector.
+   * Reallocate the validity and offset buffers for this vector. Validity buffer is used to track
+   * the NULL or NON-NULL nature of elements in the vector and offset buffer is used to store the
+   * lengths of variable width elements in the vector.
    *
-   * <p>Note that data buffer for variable length vectors moves independent
-   * of the companion validity and offset buffers. This is in
-   * contrast to what we have for fixed width vectors.
+   * <p>Note that data buffer for variable length vectors moves independent of the companion
+   * validity and offset buffers. This is in contrast to what we have for fixed width vectors.
    *
-   * <p>So even though we may have setup an initial capacity of 1024
-   * elements in the vector, it is quite possible
-   * that we need to reAlloc() the data buffer when we are setting
-   * the 5th element in the vector simply because previous
-   * variable length elements have exhausted the buffer capacity.
-   * However, we really don't need to reAlloc() validity and
-   * offset buffers until we try to set the 1025th element
-   * This is why we do a separate check for safe methods to
-   * determine which buffer needs reallocation.
-   * @throws OversizedAllocationException if the desired new size is more than
-   *                                      max allowed
+   * <p>So even though we may have setup an initial capacity of 1024 elements in the vector, it is
+   * quite possible that we need to reAlloc() the data buffer when we are setting the 5th element in
+   * the vector simply because previous variable length elements have exhausted the buffer capacity.
+   * However, we really don't need to reAlloc() validity and offset buffers until we try to set the
+   * 1025th element This is why we do a separate check for safe methods to determine which buffer
+   * needs reallocation.
+   *
+   * @throws OversizedAllocationException if the desired new size is more than max allowed
    * @throws OutOfMemoryException if the internal memory allocation fails
    */
   public void reallocValidityAndOffsetBuffers() {
@@ -588,13 +615,15 @@ public void reallocValidityAndOffsetBuffers() {
     DataAndValidityBuffers buffers = allocFixedDataAndValidityBufs(targetOffsetCount, OFFSET_WIDTH);
     final ArrowBuf newOffsetBuffer = buffers.getDataBuf();
     newOffsetBuffer.setBytes(0, offsetBuffer, 0, offsetBuffer.capacity());
-    newOffsetBuffer.setZero(offsetBuffer.capacity(), newOffsetBuffer.capacity() - offsetBuffer.capacity());
+    newOffsetBuffer.setZero(
+        offsetBuffer.capacity(), newOffsetBuffer.capacity() - offsetBuffer.capacity());
     offsetBuffer.getReferenceManager().release();
     offsetBuffer = newOffsetBuffer;
 
     final ArrowBuf newValidityBuffer = buffers.getValidityBuf();
     newValidityBuffer.setBytes(0, validityBuffer, 0, validityBuffer.capacity());
-    newValidityBuffer.setZero(validityBuffer.capacity(), newValidityBuffer.capacity() - validityBuffer.capacity());
+    newValidityBuffer.setZero(
+        validityBuffer.capacity(), newValidityBuffer.capacity() - validityBuffer.capacity());
     validityBuffer.getReferenceManager().release();
     validityBuffer = newValidityBuffer;
 
@@ -603,6 +632,7 @@ public void reallocValidityAndOffsetBuffers() {
 
   /**
    * Get the size (number of bytes) of underlying data buffer.
+   *
    * @return number of bytes in the data buffer
    */
   @Override
@@ -619,8 +649,8 @@ public int sizeOfValueBuffer() {
   }
 
   /**
-   * Get the size (number of bytes) of underlying buffers used by this
-   * vector.
+   * Get the size (number of bytes) of underlying buffers used by this vector.
+   *
    * @return size of underlying buffers.
    */
   @Override
@@ -630,9 +660,9 @@ public int getBufferSize() {
 
   /**
    * Get the potential buffer size for a particular number of records.
+   *
    * @param valueCount desired number of elements in the vector
-   * @return estimated size of underlying buffers if the vector holds
-   *         a given number of elements
+   * @return estimated size of underlying buffers if the vector holds a given number of elements
    */
   @Override
   public int getBufferSizeFor(final int valueCount) {
@@ -649,6 +679,7 @@ public int getBufferSizeFor(final int valueCount) {
 
   /**
    * Get information about how this field is materialized.
+   *
    * @return the field corresponding to this vector
    */
   @Override
@@ -657,15 +688,14 @@ public Field getField() {
   }
 
   /**
-   * Return the underlying buffers associated with this vector. Note that this doesn't
-   * impact the reference counts for this buffer so it only should be used for in-context
-   * access. Also note that this buffer changes regularly thus
-   * external classes shouldn't hold a reference to it (unless they change it).
+   * Return the underlying buffers associated with this vector. Note that this doesn't impact the
+   * reference counts for this buffer so it only should be used for in-context access. Also note
+   * that this buffer changes regularly thus external classes shouldn't hold a reference to it
+   * (unless they change it).
    *
-   * @param clear Whether to clear vector before returning; the buffers will still be refcounted
-   *              but the returned array will be the only reference to them
-   * @return The underlying {@link ArrowBuf buffers} that is used by this
-   *         vector instance.
+   * @param clear Whether to clear vector before returning; the buffers will still be refcounted but
+   *     the returned array will be the only reference to them
+   * @return The underlying {@link ArrowBuf buffers} that is used by this vector instance.
    */
   @Override
   public ArrowBuf[] getBuffers(boolean clear) {
@@ -688,15 +718,14 @@ public ArrowBuf[] getBuffers(boolean clear) {
     return buffers;
   }
 
-  /**
-   * Validate the scalar values held by this vector.
-   */
+  /** Validate the scalar values held by this vector. */
   public void validateScalars() {
     // No validation by default.
   }
 
   /**
    * Construct a transfer pair of this vector and another vector of same type.
+   *
    * @param field The field materialized by this vector.
    * @param allocator allocator for the target vector
    * @param callBack not used
@@ -709,6 +738,7 @@ public TransferPair getTransferPair(Field field, BufferAllocator allocator, Call
 
   /**
    * Construct a transfer pair of this vector and another vector of same type.
+   *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
    * @param callBack not used
@@ -721,6 +751,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator, CallB
 
   /**
    * Construct a transfer pair of this vector and another vector of same type.
+   *
    * @param allocator allocator for the target vector
    * @return TransferPair
    */
@@ -731,6 +762,7 @@ public TransferPair getTransferPair(BufferAllocator allocator) {
 
   /**
    * Construct a transfer pair of this vector and another vector of same type.
+   *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
    * @return TransferPair
@@ -740,6 +772,7 @@ public TransferPair getTransferPair(BufferAllocator allocator) {
 
   /**
    * Construct a transfer pair of this vector and another vector of same type.
+   *
    * @param field The field materialized by this vector.
    * @param allocator allocator for the target vector
    * @return TransferPair
@@ -748,9 +781,9 @@ public TransferPair getTransferPair(BufferAllocator allocator) {
   public abstract TransferPair getTransferPair(Field field, BufferAllocator allocator);
 
   /**
-   * Transfer this vector'data to another vector. The memory associated
-   * with this vector is transferred to the allocator of target vector
-   * for accounting and management purposes.
+   * Transfer this vector'data to another vector. The memory associated with this vector is
+   * transferred to the allocator of target vector for accounting and management purposes.
+   *
    * @param target destination vector for transfer
    */
   public void transferTo(BaseVariableWidthVector target) {
@@ -767,45 +800,50 @@ public void transferTo(BaseVariableWidthVector target) {
   }
 
   /**
-   * Slice this vector at desired index and length and transfer the
-   * corresponding data to the target vector.
+   * Slice this vector at desired index and length and transfer the corresponding data to the target
+   * vector.
+   *
    * @param startIndex start position of the split in source vector.
    * @param length length of the split.
    * @param target destination vector
    */
-  public void splitAndTransferTo(int startIndex, int length,
-                                 BaseVariableWidthVector target) {
-    Preconditions.checkArgument(startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
-        "Invalid parameters startIndex: %s, length: %s for valueCount: %s", startIndex, length, valueCount);
+  public void splitAndTransferTo(int startIndex, int length, BaseVariableWidthVector target) {
+    Preconditions.checkArgument(
+        startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
+        "Invalid parameters startIndex: %s, length: %s for valueCount: %s",
+        startIndex,
+        length,
+        valueCount);
     compareTypes(target, "splitAndTransferTo");
     target.clear();
-    splitAndTransferValidityBuffer(startIndex, length, target);
-    splitAndTransferOffsetBuffer(startIndex, length, target);
-    target.setLastSet(length - 1);
     if (length > 0) {
+      splitAndTransferValidityBuffer(startIndex, length, target);
+      splitAndTransferOffsetBuffer(startIndex, length, target);
+      target.setLastSet(length - 1);
       target.setValueCount(length);
     }
   }
 
   /**
-   * Transfer the offsets along with data. Unlike the data buffer, we cannot simply
-   * slice the offset buffer for split and transfer. The reason is that offsets
-   * in the target vector have to be adjusted and made relative to the staring
-   * offset in source vector from the start index of split. This is why, we
-   * need to explicitly allocate the offset buffer and set the adjusted offsets
-   * in the target vector.
+   * Transfer the offsets along with data. Unlike the data buffer, we cannot simply slice the offset
+   * buffer for split and transfer. The reason is that offsets in the target vector have to be
+   * adjusted and made relative to the staring offset in source vector from the start index of
+   * split. This is why, we need to explicitly allocate the offset buffer and set the adjusted
+   * offsets in the target vector.
    */
-  private void splitAndTransferOffsetBuffer(int startIndex, int length, BaseVariableWidthVector target) {
+  private void splitAndTransferOffsetBuffer(
+      int startIndex, int length, BaseVariableWidthVector target) {
     final int start = getStartOffset(startIndex);
     final int end = getStartOffset(startIndex + length);
     final int dataLength = end - start;
 
     if (start == 0) {
-      final ArrowBuf slicedOffsetBuffer = offsetBuffer.slice(startIndex * ((long) OFFSET_WIDTH),
-          (1 + length) * ((long) OFFSET_WIDTH));
+      final ArrowBuf slicedOffsetBuffer =
+          offsetBuffer.slice(
+              startIndex * ((long) OFFSET_WIDTH), (1 + length) * ((long) OFFSET_WIDTH));
       target.offsetBuffer = transferBuffer(slicedOffsetBuffer, target.allocator);
     } else {
-      target.allocateOffsetBuffer((long) (length + 1) * OFFSET_WIDTH);
+      target.offsetBuffer = target.allocateOffsetBuffer((long) (length + 1) * OFFSET_WIDTH);
       for (int i = 0; i < length + 1; i++) {
         final int relativeSourceOffset = getStartOffset(startIndex + i) - start;
         target.offsetBuffer.setInt((long) i * OFFSET_WIDTH, relativeSourceOffset);
@@ -818,8 +856,8 @@ private void splitAndTransferOffsetBuffer(int startIndex, int length, BaseVariab
   /*
    * Transfer the validity.
    */
-  private void splitAndTransferValidityBuffer(int startIndex, int length,
-                                              BaseVariableWidthVector target) {
+  private void splitAndTransferValidityBuffer(
+      int startIndex, int length, BaseVariableWidthVector target) {
     if (length <= 0) {
       return;
     }
@@ -848,8 +886,10 @@ private void splitAndTransferValidityBuffer(int startIndex, int length,
     target.allocateValidityBuffer(byteSizeTarget);
 
     for (int i = 0; i < byteSizeTarget - 1; i++) {
-      byte b1 = BitVectorHelper.getBitsFromCurrentByte(this.validityBuffer, firstByteSource + i, offset);
-      byte b2 = BitVectorHelper.getBitsFromNextByte(this.validityBuffer, firstByteSource + i + 1, offset);
+      byte b1 =
+          BitVectorHelper.getBitsFromCurrentByte(this.validityBuffer, firstByteSource + i, offset);
+      byte b2 =
+          BitVectorHelper.getBitsFromNextByte(this.validityBuffer, firstByteSource + i + 1, offset);
 
       target.validityBuffer.setByte(i, (b1 + b2));
     }
@@ -863,26 +903,27 @@ private void splitAndTransferValidityBuffer(int startIndex, int length,
      * by shifting data from the current byte.
      */
     if ((firstByteSource + byteSizeTarget - 1) < lastByteSource) {
-      byte b1 = BitVectorHelper.getBitsFromCurrentByte(this.validityBuffer,
-          firstByteSource + byteSizeTarget - 1, offset);
-      byte b2 = BitVectorHelper.getBitsFromNextByte(this.validityBuffer,
-          firstByteSource + byteSizeTarget, offset);
+      byte b1 =
+          BitVectorHelper.getBitsFromCurrentByte(
+              this.validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
+      byte b2 =
+          BitVectorHelper.getBitsFromNextByte(
+              this.validityBuffer, firstByteSource + byteSizeTarget, offset);
 
       target.validityBuffer.setByte(byteSizeTarget - 1, b1 + b2);
     } else {
-      byte b1 = BitVectorHelper.getBitsFromCurrentByte(this.validityBuffer,
-          firstByteSource + byteSizeTarget - 1, offset);
+      byte b1 =
+          BitVectorHelper.getBitsFromCurrentByte(
+              this.validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
       target.validityBuffer.setByte(byteSizeTarget - 1, b1);
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                common getters and setters                      |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                common getters and setters                      |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the number of elements that are null in the vector.
@@ -895,10 +936,9 @@ public int getNullCount() {
   }
 
   /**
-   * Check if the given index is within the current value capacity
-   * of the vector.
+   * Check if the given index is within the current value capacity of the vector.
    *
-   * @param index  position to check
+   * @param index position to check
    * @return true if index is within the current value capacity
    */
   public boolean isSafe(int index) {
@@ -908,7 +948,7 @@ public boolean isSafe(int index) {
   /**
    * Check if element at given index is null.
    *
-   * @param index  position of element
+   * @param index position of element
    * @return true if element at given index is null
    */
   @Override
@@ -919,7 +959,7 @@ public boolean isNull(int index) {
   /**
    * Same as {@link #isNull(int)}.
    *
-   * @param index  position of element
+   * @param index position of element
    * @return 1 if element at given index is not null, 0 otherwise
    */
   public int isSet(int index) {
@@ -930,8 +970,8 @@ public int isSet(int index) {
   }
 
   /**
-   * Get the value count of vector. This will always be zero unless
-   * setValueCount(int) has been called prior to calling this.
+   * Get the value count of vector. This will always be zero unless setValueCount(int) has been
+   * called prior to calling this.
    *
    * @return valueCount for the vector
    */
@@ -943,7 +983,7 @@ public int getValueCount() {
   /**
    * Sets the value count for the vector.
    *
-   * @param valueCount   value count
+   * @param valueCount value count
    */
   @Override
   public void setValueCount(int valueCount) {
@@ -958,12 +998,12 @@ public void setValueCount(int valueCount) {
   }
 
   /**
-   * Create holes in the vector upto the given index (exclusive).
-   * Holes will be created from the current last set position in
-   * the vector.
+   * Create holes in the vector upto the given index (exclusive). Holes will be created from the
+   * current last set position in the vector.
    *
    * @param index target index
    */
+  @Override
   public void fillEmpties(int index) {
     handleSafe(index, emptyByteArray.length);
     fillHoles(index);
@@ -971,12 +1011,12 @@ public void fillEmpties(int index) {
   }
 
   /**
-   * Set the index of last non-null element in the vector.
-   * It is important to call this method with appropriate value
-   * before calling {@link #setValueCount(int)}.
+   * Set the index of last non-null element in the vector. It is important to call this method with
+   * appropriate value before calling {@link #setValueCount(int)}.
    *
    * @param value desired index of last non-null element.
    */
+  @Override
   public void setLastSet(int value) {
     lastSet = value;
   }
@@ -986,13 +1026,13 @@ public void setLastSet(int value) {
    *
    * @return index of the last non-null element
    */
+  @Override
   public int getLastSet() {
     return lastSet;
   }
 
   /**
-   * Get the starting position (offset) in the data stream for a given
-   * element in the vector.
+   * Get the starting position (offset) in the data stream for a given element in the vector.
    *
    * @param index position of the element in the vector
    * @return starting offset for the element
@@ -1018,9 +1058,10 @@ public void setIndexDefined(int index) {
   /**
    * Sets the value length for an element.
    *
-   * @param index   position of the element to set
-   * @param length  length of the element
+   * @param index position of the element to set
+   * @param length length of the element
    */
+  @Override
   public void setValueLengthSafe(int index, int length) {
     assert index >= 0;
     handleSafe(index, length);
@@ -1033,9 +1074,10 @@ public void setValueLengthSafe(int index, int length) {
   /**
    * Get the variable length element at specified index as Text.
    *
-   * @param index   position of element to get
+   * @param index position of element to get
    * @return greater than 0 length for non-null element, 0 otherwise
    */
+  @Override
   public int getValueLength(int index) {
     assert index >= 0;
     if (isSet(index) == 0) {
@@ -1047,13 +1089,13 @@ public int getValueLength(int index) {
   }
 
   /**
-   * Set the variable length element at the specified index to the supplied
-   * byte array. This is same as using {@link #set(int, byte[], int, int)}
-   * with start as 0 and length as value.length
+   * Set the variable length element at the specified index to the supplied byte array. This is same
+   * as using {@link #set(int, byte[], int, int)} with start as 0 and length as value.length
    *
-   * @param index   position of the element to set
-   * @param value   array of bytes to write
+   * @param index position of the element to set
+   * @param value array of bytes to write
    */
+  @Override
   public void set(int index, byte[] value) {
     assert index >= 0;
     fillHoles(index);
@@ -1063,13 +1105,13 @@ public void set(int index, byte[] value) {
   }
 
   /**
-   * Same as {@link #set(int, byte[])} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, byte[])} except that it handles the case where index and length of new
+   * element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set
-   * @param value   array of bytes to write
+   * @param index position of the element to set
+   * @param value array of bytes to write
    */
+  @Override
   public void setSafe(int index, byte[] value) {
     assert index >= 0;
     handleSafe(index, value.length);
@@ -1080,13 +1122,12 @@ public void setSafe(int index, byte[] value) {
   }
 
   /**
-   * Set the variable length element at the specified index to the supplied
-   * byte array.
+   * Set the variable length element at the specified index to the supplied byte array.
    *
-   * @param index   position of the element to set
-   * @param value   array of bytes to write
-   * @param start   start index in array of bytes
-   * @param length  length of data in array of bytes
+   * @param index position of the element to set
+   * @param value array of bytes to write
+   * @param start start index in array of bytes
+   * @param length length of data in array of bytes
    */
   public void set(int index, byte[] value, int start, int length) {
     assert index >= 0;
@@ -1097,14 +1138,13 @@ public void set(int index, byte[] value, int start, int length) {
   }
 
   /**
-   * Same as {@link #set(int, byte[], int, int)} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, byte[], int, int)} except that it handles the case where index and
+   * length of new element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set
-   * @param value   array of bytes to write
-   * @param start   start index in array of bytes
-   * @param length  length of data in array of bytes
+   * @param index position of the element to set
+   * @param value array of bytes to write
+   * @param start start index in array of bytes
+   * @param length length of data in array of bytes
    */
   public void setSafe(int index, byte[] value, int start, int length) {
     assert index >= 0;
@@ -1116,14 +1156,14 @@ public void setSafe(int index, byte[] value, int start, int length) {
   }
 
   /**
-   * Set the variable length element at the specified index to the
-   * content in supplied ByteBuffer.
+   * Set the variable length element at the specified index to the content in supplied ByteBuffer.
    *
-   * @param index   position of the element to set
-   * @param value   ByteBuffer with data
-   * @param start   start index in ByteBuffer
-   * @param length  length of data in ByteBuffer
+   * @param index position of the element to set
+   * @param value ByteBuffer with data
+   * @param start start index in ByteBuffer
+   * @param length length of data in ByteBuffer
    */
+  @Override
   public void set(int index, ByteBuffer value, int start, int length) {
     assert index >= 0;
     fillHoles(index);
@@ -1135,14 +1175,13 @@ public void set(int index, ByteBuffer value, int start, int length) {
   }
 
   /**
-   * Same as {@link #set(int, ByteBuffer, int, int)} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, ByteBuffer, int, int)} except that it handles the case where index and
+   * length of new element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set
-   * @param value   ByteBuffer with data
-   * @param start   start index in ByteBuffer
-   * @param length  length of data in ByteBuffer
+   * @param index position of the element to set
+   * @param value ByteBuffer with data
+   * @param start start index in ByteBuffer
+   * @param length length of data in ByteBuffer
    */
   public void setSafe(int index, ByteBuffer value, int start, int length) {
     assert index >= 0;
@@ -1158,7 +1197,7 @@ public void setSafe(int index, ByteBuffer value, int start, int length) {
   /**
    * Set the element at the given index to null.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   @Override
   public void setNull(int index) {
@@ -1170,14 +1209,14 @@ public void setNull(int index) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
+   *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
    * @param start start position of data in buffer
    * @param end end position of data in buffer
-   * @param buffer data buffer containing the variable width element to be stored
-   *               in the vector
+   * @param buffer data buffer containing the variable width element to be stored in the vector
    */
   public void set(int index, int isSet, int start, int end, ArrowBuf buffer) {
     assert index >= 0;
@@ -1191,15 +1230,14 @@ public void set(int index, int isSet, int start, int end, ArrowBuf buffer) {
   }
 
   /**
-   * Same as {@link #set(int, int, int, int, ArrowBuf)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, int, int, ArrowBuf)} except that it handles the case when index
+   * is greater than or equal to current value capacity of the vector.
+   *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
    * @param start start position of data in buffer
    * @param end end position of data in buffer
-   * @param buffer data buffer containing the variable width element to be stored
-   *               in the vector
+   * @param buffer data buffer containing the variable width element to be stored in the vector
    */
   public void setSafe(int index, int isSet, int start, int end, ArrowBuf buffer) {
     assert index >= 0;
@@ -1214,13 +1252,13 @@ public void setSafe(int index, int isSet, int start, int end, ArrowBuf buffer) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
+   *
    * @param index position of the new value
    * @param start start position of data in buffer
    * @param length length of data in buffer
-   * @param buffer data buffer containing the variable width element to be stored
-   *               in the vector
+   * @param buffer data buffer containing the variable width element to be stored in the vector
    */
   public void set(int index, int start, int length, ArrowBuf buffer) {
     assert index >= 0;
@@ -1234,14 +1272,13 @@ public void set(int index, int start, int length, ArrowBuf buffer) {
   }
 
   /**
-   * Same as {@link #set(int, int, int, int, ArrowBuf)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, int, int, ArrowBuf)} except that it handles the case when index
+   * is greater than or equal to current value capacity of the vector.
+   *
    * @param index position of the new value
    * @param start start position of data in buffer
    * @param length length of data in buffer
-   * @param buffer data buffer containing the variable width element to be stored
-   *               in the vector
+   * @param buffer data buffer containing the variable width element to be stored in the vector
    */
   public void setSafe(int index, int start, int length, ArrowBuf buffer) {
     assert index >= 0;
@@ -1255,13 +1292,11 @@ public void setSafe(int index, int start, int length, ArrowBuf buffer) {
     lastSet = index;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                helper methods for setters                      |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                helper methods for setters                      |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   protected final void fillHoles(int index) {
     for (int i = lastSet + 1; i < index; i++) {
@@ -1317,8 +1352,8 @@ protected final void handleSafe(int index, int dataLength) {
   }
 
   /**
-   * Method used by Json Writer to read a variable width element from
-   * the variable width vector and write to Json.
+   * Method used by Json Writer to read a variable width element from the variable width vector and
+   * write to Json.
    *
    * <p>This method should not be used externally.
    *
@@ -1329,17 +1364,15 @@ protected final void handleSafe(int index, int dataLength) {
    */
   public static byte[] get(final ArrowBuf data, final ArrowBuf offset, int index) {
     final int currentStartOffset = offset.getInt((long) index * OFFSET_WIDTH);
-    final int dataLength =
-            offset.getInt((long) (index + 1) * OFFSET_WIDTH) - currentStartOffset;
+    final int dataLength = offset.getInt((long) (index + 1) * OFFSET_WIDTH) - currentStartOffset;
     final byte[] result = new byte[dataLength];
     data.getBytes(currentStartOffset, result, 0, dataLength);
     return result;
   }
 
   /**
-   * Method used by Json Reader to explicitly set the offsets of the variable
-   * width vector data. The method takes care of allocating the memory for
-   * offsets if the caller hasn't done so.
+   * Method used by Json Reader to explicitly set the offsets of the variable width vector data. The
+   * method takes care of allocating the memory for offsets if the caller hasn't done so.
    *
    * <p>This method should not be used externally.
    *
@@ -1350,8 +1383,8 @@ public static byte[] get(final ArrowBuf data, final ArrowBuf offset, int index)
    * @param value offset of the element
    * @return buffer holding the offsets
    */
-  public static ArrowBuf set(ArrowBuf buffer, BufferAllocator allocator,
-                             int valueCount, int index, int value) {
+  public static ArrowBuf set(
+      ArrowBuf buffer, BufferAllocator allocator, int valueCount, int index, int value) {
     if (buffer == null) {
       buffer = allocator.buffer((long) valueCount * OFFSET_WIDTH);
     }
@@ -1364,8 +1397,8 @@ public static ArrowBuf set(ArrowBuf buffer, BufferAllocator allocator,
   }
 
   /**
-   * Copy a cell value from a particular index in source vector to a particular
-   * position in this vector.
+   * Copy a cell value from a particular index in source vector to a particular position in this
+   * vector.
    *
    * @param fromIndex position to copy from in source vector
    * @param thisIndex position to copy to in this vector
@@ -1393,9 +1426,8 @@ public void copyFrom(int fromIndex, int thisIndex, ValueVector from) {
   }
 
   /**
-   * Same as {@link #copyFrom(int, int, ValueVector)} except that
-   * it handles the case when the capacity of the vector needs to be expanded
-   * before copy.
+   * Same as {@link #copyFrom(int, int, ValueVector)} except that it handles the case when the
+   * capacity of the vector needs to be expanded before copy.
    *
    * @param fromIndex position to copy from in source vector
    * @param thisIndex position to copy to in this vector
@@ -1461,9 +1493,7 @@ public <OUT, IN> OUT accept(VectorVisitor<OUT, IN> visitor, IN value) {
     return visitor.visit(this, value);
   }
 
-  /**
-   * Gets the ending offset of a record, given its index.
-   */
+  /** Gets the ending offset of a record, given its index. */
   public final int getEndOffset(int index) {
     return offsetBuffer.getInt((long) (index + 1) * OFFSET_WIDTH);
   }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthViewVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthViewVector.java
new file mode 100644
index 0000000000000..f0c84bd410640
--- /dev/null
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthViewVector.java
@@ -0,0 +1,1718 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.vector;
+
+import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
+import static org.apache.arrow.vector.util.DataSizeRoundingUtil.roundUpToMultipleOf16;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.apache.arrow.memory.ArrowBuf;
+import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.memory.OutOfMemoryException;
+import org.apache.arrow.memory.ReusableBuffer;
+import org.apache.arrow.memory.util.ArrowBufPointer;
+import org.apache.arrow.memory.util.ByteFunctionHelpers;
+import org.apache.arrow.memory.util.CommonUtil;
+import org.apache.arrow.memory.util.hash.ArrowBufHasher;
+import org.apache.arrow.util.Preconditions;
+import org.apache.arrow.vector.compare.VectorVisitor;
+import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
+import org.apache.arrow.vector.types.pojo.Field;
+import org.apache.arrow.vector.util.CallBack;
+import org.apache.arrow.vector.util.OversizedAllocationException;
+import org.apache.arrow.vector.util.TransferPair;
+
+/**
+ * BaseVariableWidthViewVector is a base class providing functionality for strings/bytes types in
+ * view format.
+ */
+public abstract class BaseVariableWidthViewVector extends BaseValueVector
+    implements VariableWidthFieldVector {
+  // A single element of a view comprises 16 bytes
+  public static final int ELEMENT_SIZE = 16;
+  public static final int INITIAL_VIEW_VALUE_ALLOCATION = 4096;
+  private static final int INITIAL_BYTE_COUNT = INITIAL_VIEW_VALUE_ALLOCATION * ELEMENT_SIZE;
+  private static final int MAX_BUFFER_SIZE = (int) Math.min(MAX_ALLOCATION_SIZE, Integer.MAX_VALUE);
+  private int lastValueCapacity;
+  private long lastValueAllocationSizeInBytes;
+
+  /*
+   * Variable Width View Vector comprises the following format
+   *
+   * Short strings, length <= 12
+   * | Bytes 0-3  | Bytes 4-15                            |
+   * |------------|---------------------------------------|
+   * | length     | data (padded with 0)                  |
+   * |------------|---------------------------------------|
+   *
+   * Long strings, length > 12
+   * | Bytes 0-3  | Bytes 4-7  | Bytes 8-11 | Bytes 12-15 |
+   * |------------|------------|------------|-------------|
+   * | length     | prefix     | buf.index  | offset      |
+   * |------------|------------|------------|-------------|
+   *
+   * */
+  // 12 byte unsigned int to track inline views
+  public static final int INLINE_SIZE = 12;
+  // The first 4 bytes of view are allocated for length
+  public static final int LENGTH_WIDTH = 4;
+  // The second 4 bytes of view are allocated for prefix width
+  public static final int PREFIX_WIDTH = 4;
+  // The third 4 bytes of view are allocated for buffer index
+  public static final int BUF_INDEX_WIDTH = 4;
+  public static final byte[] EMPTY_BYTE_ARRAY = new byte[] {};
+  protected ArrowBuf validityBuffer;
+  // The view buffer is used to store the variable width view elements
+  protected ArrowBuf viewBuffer;
+  // The external buffer which stores the long strings
+  protected List<ArrowBuf> dataBuffers;
+  protected int initialDataBufferSize;
+  protected int valueCount;
+  protected int lastSet;
+  protected final Field field;
+
+  /**
+   * Constructs a new instance.
+   *
+   * @param field The field materialized by this vector
+   * @param allocator The allocator to use for creating/resizing buffers
+   */
+  public BaseVariableWidthViewVector(Field field, final BufferAllocator allocator) {
+    super(allocator);
+    this.field = field;
+    lastValueAllocationSizeInBytes = INITIAL_BYTE_COUNT;
+    lastValueCapacity = INITIAL_VIEW_VALUE_ALLOCATION;
+    valueCount = 0;
+    lastSet = -1;
+    validityBuffer = allocator.getEmpty();
+    viewBuffer = allocator.getEmpty();
+    dataBuffers = new ArrayList<>();
+  }
+
+  @Override
+  public String getName() {
+    return field.getName();
+  }
+
+  /* TODO:
+   * see if getNullCount() can be made faster -- O(1)
+   */
+
+  /* TODO:
+   * Once the entire hierarchy has been refactored, move common functions
+   * like getNullCount(), splitAndTransferValidityBuffer to top level
+   * base class BaseValueVector.
+   *
+   * Along with this, some class members (validityBuffer) can also be
+   * abstracted out to top level base class.
+   *
+   * Right now BaseValueVector is the top level base class for other
+   * vector types in ValueVector hierarchy (non-nullable) and those
+   * vectors have not yet been refactored/removed so moving things to
+   * the top class as of now is not a good idea.
+   */
+
+  /* TODO:
+   * Implement TransferPair functionality
+   * https://github.com/apache/arrow/issues/40932
+   *
+   */
+
+  /**
+   * Get buffer that manages the validity (NULL or NON-NULL nature) of elements in the vector.
+   * Consider it as a buffer for internal bit vector data structure.
+   *
+   * @return buffer
+   */
+  @Override
+  public ArrowBuf getValidityBuffer() {
+    return validityBuffer;
+  }
+
+  /**
+   * Get the buffer that stores the data for elements in the vector.
+   *
+   * @return buffer
+   */
+  @Override
+  public ArrowBuf getDataBuffer() {
+    return viewBuffer;
+  }
+
+  /**
+   * Get the buffers that store the data for views in the vector.
+   *
+   * @return list of ArrowBuf
+   */
+  public List<ArrowBuf> getDataBuffers() {
+    return dataBuffers;
+  }
+
+  /**
+   * BaseVariableWidthViewVector doesn't support offset buffer.
+   *
+   * @return throws UnsupportedOperationException
+   */
+  @Override
+  public ArrowBuf getOffsetBuffer() {
+    throw new UnsupportedOperationException(
+        "Offset buffer is not supported in BaseVariableWidthViewVector");
+  }
+
+  /**
+   * BaseVariableWidthViewVector doesn't support offset buffer.
+   *
+   * @return throws UnsupportedOperationException
+   */
+  @Override
+  public long getOffsetBufferAddress() {
+    throw new UnsupportedOperationException(
+        "Offset buffer is not supported in BaseVariableWidthViewVector");
+  }
+
+  /**
+   * Get the memory address of buffer that manages the validity (NULL or NON-NULL nature) of
+   * elements in the vector.
+   *
+   * @return starting address of the buffer
+   */
+  @Override
+  public long getValidityBufferAddress() {
+    return validityBuffer.memoryAddress();
+  }
+
+  /**
+   * Get the memory address of buffer that stores the data for elements in the vector.
+   *
+   * @return starting address of the buffer
+   */
+  @Override
+  public long getDataBufferAddress() {
+    return viewBuffer.memoryAddress();
+  }
+
+  /**
+   * Sets the desired value capacity for the vector. This function doesn't allocate any memory for
+   * the vector.
+   *
+   * @param valueCount desired number of elements in the vector
+   */
+  @Override
+  public void setInitialCapacity(int valueCount) {
+    final long size = (long) valueCount * ELEMENT_SIZE;
+    checkDataBufferSize(size);
+    lastValueAllocationSizeInBytes = (int) size;
+    lastValueCapacity = valueCount;
+  }
+
+  /**
+   * Sets the desired value capacity for the vector. This function doesn't allocate any memory for
+   * the vector.
+   *
+   * @param valueCount desired number of elements in the vector
+   * @param density average number of bytes per variable width view element
+   */
+  @Override
+  public void setInitialCapacity(int valueCount, double density) {
+    final long size = (long) valueCount * ELEMENT_SIZE;
+    initialDataBufferSize = (int) (valueCount * density);
+    checkDataBufferSize(size);
+    lastValueAllocationSizeInBytes = (int) size;
+    lastValueCapacity = valueCount;
+  }
+
+  /**
+   * Get the density of this ListVector.
+   *
+   * @return density
+   */
+  public double getDensity() {
+    if (valueCount == 0) {
+      return 0.0D;
+    }
+    final double totalListSize = getTotalValueLengthUpToIndex(valueCount);
+    return totalListSize / valueCount;
+  }
+
+  /**
+   * Get the current capacity which does not exceed either validity buffer or value buffer. Note:
+   * Here the `getValueCapacity` has a relationship with the value buffer.
+   *
+   * @return number of elements that vector can hold.
+   */
+  @Override
+  public int getValueCapacity() {
+    final int validityCapacity = getValidityBufferValueCapacity();
+    final int valueBufferCapacity = Math.max(capAtMaxInt(viewBuffer.capacity() / ELEMENT_SIZE), 0);
+    return Math.min(valueBufferCapacity, validityCapacity);
+  }
+
+  private int getValidityBufferValueCapacity() {
+    return capAtMaxInt(validityBuffer.capacity() * 8);
+  }
+
+  /** zero out the vector and the data in associated buffers. */
+  public void zeroVector() {
+    initValidityBuffer();
+    viewBuffer.setZero(0, viewBuffer.capacity());
+    clearDataBuffers();
+  }
+
+  /* zero out the validity buffer */
+  private void initValidityBuffer() {
+    validityBuffer.setZero(0, validityBuffer.capacity());
+  }
+
+  /** Reset the vector to initial state. Note that this method doesn't release any memory. */
+  @Override
+  public void reset() {
+    zeroVector();
+    lastSet = -1;
+    valueCount = 0;
+  }
+
+  /** Close the vector and release the associated buffers. */
+  @Override
+  public void close() {
+    clear();
+  }
+
+  /** Same as {@link #close()}. */
+  @Override
+  public void clear() {
+    validityBuffer = releaseBuffer(validityBuffer);
+    viewBuffer = releaseBuffer(viewBuffer);
+    clearDataBuffers();
+    lastSet = -1;
+    valueCount = 0;
+  }
+
+  /** Release the data buffers and clear the list. */
+  public void clearDataBuffers() {
+    for (ArrowBuf buffer : dataBuffers) {
+      releaseBuffer(buffer);
+    }
+    dataBuffers.clear();
+  }
+
+  /**
+   * Get the inner vectors.
+   *
+   * @deprecated This API will be removed as the current implementations no longer support inner
+   *     vectors.
+   * @return the inner vectors for this field as defined by the TypeLayout
+   */
+  @Deprecated
+  @Override
+  public List<BufferBacked> getFieldInnerVectors() {
+    throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers");
+  }
+
+  /**
+   * Initialize the children in schema for this Field. This operation is a NO-OP for scalar types
+   * since they don't have any children.
+   *
+   * @param children the schema
+   * @throws IllegalArgumentException if children is a non-empty list for scalar types.
+   */
+  @Override
+  public void initializeChildrenFromFields(List<Field> children) {
+    if (!children.isEmpty()) {
+      throw new IllegalArgumentException("primitive type vector cannot have children");
+    }
+  }
+
+  /**
+   * Get the inner child vectors.
+   *
+   * @return list of child vectors for complex types, empty list for scalar vector types
+   */
+  @Override
+  public List<FieldVector> getChildrenFromFields() {
+    return Collections.emptyList();
+  }
+
+  /**
+   * Load the buffers of this vector with provided source buffers. The caller manages the source
+   * buffers and populates them before invoking this method.
+   *
+   * @param fieldNode the fieldNode indicating the value count
+   * @param ownBuffers the buffers for this Field (own buffers only, children not included)
+   */
+  @Override
+  public void loadFieldBuffers(ArrowFieldNode fieldNode, List<ArrowBuf> ownBuffers) {
+    ArrowBuf bitBuf = ownBuffers.get(0);
+    ArrowBuf viewBuf = ownBuffers.get(1);
+    List<ArrowBuf> dataBufs = ownBuffers.subList(2, ownBuffers.size());
+
+    this.clear();
+
+    this.viewBuffer = viewBuf.getReferenceManager().retain(viewBuf, allocator);
+    this.validityBuffer = BitVectorHelper.loadValidityBuffer(fieldNode, bitBuf, allocator);
+
+    for (ArrowBuf dataBuf : dataBufs) {
+      this.dataBuffers.add(dataBuf.getReferenceManager().retain(dataBuf, allocator));
+    }
+
+    lastSet = fieldNode.getLength() - 1;
+    valueCount = fieldNode.getLength();
+  }
+
+  /**
+   * Get the buffers belonging to this vector.
+   *
+   * @return the inner buffers.
+   */
+  @Override
+  public List<ArrowBuf> getFieldBuffers() {
+    List<ArrowBuf> result = new ArrayList<>(2 + dataBuffers.size());
+    setReaderAndWriterIndex();
+    result.add(validityBuffer);
+    result.add(viewBuffer);
+    // append data buffers
+    result.addAll(dataBuffers);
+
+    return result;
+  }
+
+  /** Set the reader and writer indexes for the inner buffers. */
+  private void setReaderAndWriterIndex() {
+    validityBuffer.readerIndex(0);
+    viewBuffer.readerIndex(0);
+    if (valueCount == 0) {
+      validityBuffer.writerIndex(0);
+      viewBuffer.writerIndex(0);
+    } else {
+      validityBuffer.writerIndex(getValidityBufferSizeFromCount(valueCount));
+      viewBuffer.writerIndex(valueCount * ELEMENT_SIZE);
+    }
+  }
+
+  /** Same as {@link #allocateNewSafe()}. */
+  @Override
+  public void allocateNew() {
+    allocateNew(lastValueAllocationSizeInBytes, lastValueCapacity);
+  }
+
+  /**
+   * Allocate memory for the vector. We internally use a default value count of 4096 to allocate
+   * memory for at least these many elements in the vector. See {@link #allocateNew(long, int)} for
+   * allocating memory for specific number of elements in the vector.
+   *
+   * @return false if memory allocation fails, true otherwise.
+   */
+  @Override
+  public boolean allocateNewSafe() {
+    try {
+      allocateNew(lastValueAllocationSizeInBytes, lastValueCapacity);
+      return true;
+    } catch (Exception e) {
+      return false;
+    }
+  }
+
+  /**
+   * Allocate memory for the vector to support storing at least the provided number of elements in
+   * the vector. This method must be called prior to using the ValueVector.
+   *
+   * @param totalBytes desired total memory capacity
+   * @param valueCount the desired number of elements in the vector
+   * @throws OutOfMemoryException if memory allocation fails
+   */
+  @Override
+  public void allocateNew(long totalBytes, int valueCount) {
+    assert totalBytes >= 0;
+
+    checkDataBufferSize(totalBytes);
+
+    /* we are doing a new allocation -- release the current buffers */
+    clear();
+
+    try {
+      allocateBytes(totalBytes, valueCount);
+    } catch (Exception e) {
+      clear();
+      throw e;
+    }
+  }
+
+  @Override
+  public void allocateNew(int valueCount) {
+    allocateNew(lastValueAllocationSizeInBytes, valueCount);
+  }
+
+  /* Check if the data buffer size is within bounds. */
+  private void checkDataBufferSize(long size) {
+    if (size > MAX_BUFFER_SIZE || size < 0) {
+      throw new OversizedAllocationException(
+          "Memory required for vector "
+              + "is ("
+              + size
+              + "), which is overflow or more than max allowed ("
+              + MAX_BUFFER_SIZE
+              + "). "
+              + "You could consider using LargeVarCharVector/LargeVarBinaryVector for large strings/large bytes types");
+    }
+  }
+
+  /* allocate the inner buffers */
+  private void allocateBytes(final long valueBufferSize, final int valueCount) {
+    /* allocate data buffer */
+    viewBuffer = allocator.buffer(valueBufferSize);
+    viewBuffer.readerIndex(0);
+
+    validityBuffer = allocator.buffer((valueCount + 7) / 8);
+    initValidityBuffer();
+
+    lastValueCapacity = getValueCapacity();
+    lastValueAllocationSizeInBytes = capAtMaxInt(viewBuffer.capacity());
+  }
+
+  /**
+   * Resize the vector to increase the capacity. The internal behavior is to double the current
+   * value capacity.
+   */
+  @Override
+  public void reAlloc() {
+    reallocViewBuffer();
+    reallocViewDataBuffer();
+    reallocValidityBuffer();
+  }
+
+  /**
+   * Reallocate the view buffer. View Buffer stores the views for VIEWVARCHAR or VIEWVARBINARY
+   * elements in the vector. The behavior is to double the size of buffer.
+   *
+   * @throws OversizedAllocationException if the desired new size is more than max allowed
+   * @throws OutOfMemoryException if the internal memory allocation fails
+   */
+  public void reallocViewBuffer() {
+    long currentViewBufferCapacity = viewBuffer.capacity();
+
+    long newAllocationSize = currentViewBufferCapacity * 2;
+    if (newAllocationSize == 0) {
+      if (lastValueAllocationSizeInBytes > 0) {
+        newAllocationSize = lastValueAllocationSizeInBytes;
+      } else {
+        newAllocationSize = INITIAL_BYTE_COUNT * 2L;
+      }
+    }
+
+    reallocViewBuffer(newAllocationSize);
+  }
+
+  /** Reallocate the data buffer associated with view buffer. */
+  public void reallocViewDataBuffer() {
+    long currentDataBufferCapacity = 0;
+    if (!dataBuffers.isEmpty()) {
+      currentDataBufferCapacity = dataBuffers.get(dataBuffers.size() - 1).capacity();
+    }
+
+    long newAllocationSize = currentDataBufferCapacity * 2;
+    if (newAllocationSize == 0) {
+      if (lastValueAllocationSizeInBytes > 0) {
+        newAllocationSize = lastValueAllocationSizeInBytes;
+      } else {
+        newAllocationSize = INITIAL_BYTE_COUNT * 2L;
+      }
+    }
+
+    reallocViewDataBuffer(newAllocationSize);
+  }
+
+  /**
+   * Reallocate the view buffer to given size. View Buffer stores the views for VIEWVARCHAR or
+   * VIEWVARBINARY elements in the vector. The actual allocated size may be larger than the request
+   * one because it will round up the provided value to the nearest power of two.
+   *
+   * @param desiredAllocSize the desired new allocation size
+   * @throws OversizedAllocationException if the desired new size is more than max allowed
+   * @throws OutOfMemoryException if the internal memory allocation fails
+   */
+  public void reallocViewBuffer(long desiredAllocSize) {
+    if (desiredAllocSize == 0) {
+      return;
+    }
+    long newAllocationSize = CommonUtil.nextPowerOfTwo(desiredAllocSize);
+    assert newAllocationSize >= 1;
+
+    checkDataBufferSize(newAllocationSize);
+    // for each set operation, we have to allocate 16 bytes
+    // here we are adjusting the desired allocation-based allocation size
+    // to align with the 16bytes requirement.
+    newAllocationSize = roundUpToMultipleOf16(newAllocationSize);
+
+    final ArrowBuf newBuf = allocator.buffer(newAllocationSize);
+    newBuf.setBytes(0, viewBuffer, 0, viewBuffer.capacity());
+
+    viewBuffer.getReferenceManager().release();
+    viewBuffer = newBuf;
+    lastValueAllocationSizeInBytes = viewBuffer.capacity();
+  }
+
+  /**
+   * Reallocate the data buffer for views.
+   *
+   * @param desiredAllocSize allocation size in bytes
+   */
+  public void reallocViewDataBuffer(long desiredAllocSize) {
+    if (desiredAllocSize == 0) {
+      return;
+    }
+
+    if (dataBuffers.isEmpty()) {
+      return;
+    }
+
+    ArrowBuf currentBuf = dataBuffers.get(dataBuffers.size() - 1);
+    if (currentBuf.capacity() - currentBuf.writerIndex() >= desiredAllocSize) {
+      return;
+    }
+
+    final long newAllocationSize = CommonUtil.nextPowerOfTwo(desiredAllocSize);
+    assert newAllocationSize >= 1;
+
+    checkDataBufferSize(newAllocationSize);
+
+    final ArrowBuf newBuf = allocator.buffer(newAllocationSize);
+    dataBuffers.add(newBuf);
+  }
+
+  /** Reallocate Validity buffer. */
+  public void reallocValidityBuffer() {
+    int targetValidityCount = capAtMaxInt((validityBuffer.capacity() * 8) * 2);
+    if (targetValidityCount == 0) {
+      if (lastValueCapacity > 0) {
+        targetValidityCount = lastValueCapacity;
+      } else {
+        targetValidityCount = 2 * INITIAL_VALUE_ALLOCATION;
+      }
+    }
+
+    long validityBufferSize = computeValidityBufferSize(targetValidityCount);
+
+    final ArrowBuf newValidityBuffer = allocator.buffer(validityBufferSize);
+    newValidityBuffer.setBytes(0, validityBuffer, 0, validityBuffer.capacity());
+    newValidityBuffer.setZero(
+        validityBuffer.capacity(), newValidityBuffer.capacity() - validityBuffer.capacity());
+    validityBuffer.getReferenceManager().release();
+    validityBuffer = newValidityBuffer;
+
+    lastValueCapacity = getValueCapacity();
+  }
+
+  private long computeValidityBufferSize(int valueCount) {
+    return (valueCount + 7) / 8;
+  }
+
+  /**
+   * Get the size (number of bytes) of underlying view buffer.
+   *
+   * @return number of bytes in the view buffer
+   */
+  @Override
+  public int getByteCapacity() {
+    return capAtMaxInt(viewBuffer.capacity());
+  }
+
+  @Override
+  public int sizeOfValueBuffer() {
+    throw new UnsupportedOperationException(
+        "sizeOfValueBuffer is not supported for BaseVariableWidthViewVector");
+  }
+
+  /**
+   * Get the size (number of bytes) of underlying elements in the view buffer.
+   *
+   * @return number of bytes used by data in the view buffer
+   */
+  public int sizeOfViewBufferElements() {
+    if (valueCount == 0) {
+      return 0;
+    }
+    int totalSize = 0;
+    for (int i = 0; i < valueCount; i++) {
+      totalSize += getValueLength(i);
+    }
+    return totalSize;
+  }
+
+  /**
+   * Get the size (number of bytes) of underlying buffers used by this vector.
+   *
+   * @return size of underlying buffers.
+   */
+  @Override
+  public int getBufferSize() {
+    return getBufferSizeFor(this.valueCount);
+  }
+
+  /**
+   * Get the potential buffer size for a particular number of records.
+   *
+   * @param valueCount desired number of elements in the vector
+   * @return estimated size of underlying buffers if the vector holds a given number of elements
+   */
+  @Override
+  public int getBufferSizeFor(final int valueCount) {
+    if (valueCount == 0) {
+      return 0;
+    }
+
+    final int validityBufferSize = getValidityBufferSizeFromCount(valueCount);
+    final int viewBufferSize = valueCount * ELEMENT_SIZE;
+    final int dataBufferSize = getDataBufferSize();
+    return validityBufferSize + viewBufferSize + dataBufferSize;
+  }
+
+  private int getDataBufferSize() {
+    int dataBufferSize = 0;
+    for (ArrowBuf buf : dataBuffers) {
+      dataBufferSize += (int) buf.writerIndex();
+    }
+    return dataBufferSize;
+  }
+
+  /**
+   * Get information about how this field is materialized.
+   *
+   * @return the field corresponding to this vector
+   */
+  @Override
+  public Field getField() {
+    return field;
+  }
+
+  /**
+   * Return the underlying buffers associated with this vector. Note that this doesn't impact the
+   * reference counts for this buffer, so it only should be used for in-context access. Also note
+   * that this buffer changes regularly, thus external classes shouldn't hold a reference to it
+   * (unless they change it).
+   *
+   * @param clear Whether to clear vector before returning, the buffers will still be refcounted but
+   *     the returned array will be the only reference to them
+   * @return The underlying {@link ArrowBuf buffers} that is used by this vector instance.
+   */
+  @Override
+  public ArrowBuf[] getBuffers(boolean clear) {
+    final ArrowBuf[] buffers;
+    setReaderAndWriterIndex();
+    if (getBufferSize() == 0) {
+      buffers = new ArrowBuf[0];
+    } else {
+      final int dataBufferSize = dataBuffers.size();
+      // validity and view buffers
+      final int fixedBufferSize = 2;
+      buffers = new ArrowBuf[fixedBufferSize + dataBufferSize];
+      buffers[0] = validityBuffer;
+      buffers[1] = viewBuffer;
+      for (int i = fixedBufferSize; i < fixedBufferSize + dataBufferSize; i++) {
+        buffers[i] = dataBuffers.get(i - fixedBufferSize);
+      }
+    }
+    if (clear) {
+      for (final ArrowBuf buffer : buffers) {
+        buffer.getReferenceManager().retain();
+      }
+      clear();
+    }
+    return buffers;
+  }
+
+  /** Validate the scalar values held by this vector. */
+  public void validateScalars() {
+    // No validation by default.
+  }
+
+  /**
+   * Construct a transfer pair of this vector and another vector of the same type.
+   *
+   * @param field The field materialized by this vector.
+   * @param allocator allocator for the target vector
+   * @param callBack not used
+   * @return TransferPair
+   */
+  @Override
+  public TransferPair getTransferPair(Field field, BufferAllocator allocator, CallBack callBack) {
+    return getTransferPair(field, allocator);
+  }
+
+  /**
+   * Construct a transfer pair of this vector and another vector of the same type.
+   *
+   * @param ref name of the target vector
+   * @param allocator allocator for the target vector
+   * @param callBack not used
+   * @return TransferPair
+   */
+  @Override
+  public TransferPair getTransferPair(String ref, BufferAllocator allocator, CallBack callBack) {
+    return getTransferPair(ref, allocator);
+  }
+
+  /**
+   * Construct a transfer pair of this vector and another vector of the same type.
+   *
+   * @param allocator allocator for the target vector
+   * @return TransferPair
+   */
+  @Override
+  public TransferPair getTransferPair(BufferAllocator allocator) {
+    return getTransferPair(getName(), allocator);
+  }
+
+  /**
+   * Construct a transfer pair of this vector and another vector of the same type.
+   *
+   * @param ref name of the target vector
+   * @param allocator allocator for the target vector
+   * @return TransferPair
+   */
+  @Override
+  public abstract TransferPair getTransferPair(String ref, BufferAllocator allocator);
+
+  /**
+   * Construct a transfer pair of this vector and another vector of the same type.
+   *
+   * @param field The field materialized by this vector.
+   * @param allocator allocator for the target vector
+   * @return TransferPair
+   */
+  @Override
+  public abstract TransferPair getTransferPair(Field field, BufferAllocator allocator);
+
+  /**
+   * Transfer this vector's data to another vector. The memory associated with this vector is
+   * transferred to the allocator of target vector for accounting and management purposes.
+   *
+   * @param target destination vector for transfer
+   */
+  public void transferTo(BaseVariableWidthViewVector target) {
+    compareTypes(target, "transferTo");
+    target.clear();
+    target.validityBuffer = transferBuffer(validityBuffer, target.allocator);
+    target.viewBuffer = transferBuffer(viewBuffer, target.allocator);
+    target.dataBuffers = new ArrayList<>(dataBuffers.size());
+    for (int i = 0; i < dataBuffers.size(); i++) {
+      target.dataBuffers.add(transferBuffer(dataBuffers.get(i), target.allocator));
+    }
+
+    target.setLastSet(this.lastSet);
+    if (this.valueCount > 0) {
+      target.setValueCount(this.valueCount);
+    }
+    clear();
+  }
+
+  /**
+   * Slice this vector at desired index and length and transfer the corresponding data to the target
+   * vector.
+   *
+   * @param startIndex start position of the split in source vector.
+   * @param length length of the split.
+   * @param target destination vector
+   */
+  public void splitAndTransferTo(int startIndex, int length, BaseVariableWidthViewVector target) {
+    Preconditions.checkArgument(
+        startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
+        "Invalid parameters startIndex: %s, length: %s for valueCount: %s",
+        startIndex,
+        length,
+        valueCount);
+    compareTypes(target, "splitAndTransferTo");
+    target.clear();
+    if (length > 0) {
+      splitAndTransferValidityBuffer(startIndex, length, target);
+      splitAndTransferViewBufferAndDataBuffer(startIndex, length, target);
+      target.setLastSet(length - 1);
+      target.setValueCount(length);
+    }
+  }
+
+  /* allocate validity buffer */
+  private void allocateValidityBuffer(final long size) {
+    final int curSize = (int) size;
+    validityBuffer = allocator.buffer(curSize);
+    validityBuffer.readerIndex(0);
+    initValidityBuffer();
+  }
+
+  /*
+   * Transfer the validity.
+   */
+  private void splitAndTransferValidityBuffer(
+      int startIndex, int length, BaseVariableWidthViewVector target) {
+    if (length <= 0) {
+      return;
+    }
+
+    final int firstByteSource = BitVectorHelper.byteIndex(startIndex);
+    final int lastByteSource = BitVectorHelper.byteIndex(valueCount - 1);
+    final int byteSizeTarget = getValidityBufferSizeFromCount(length);
+    final int offset = startIndex % 8;
+
+    if (offset == 0) {
+      // slice
+      if (target.validityBuffer != null) {
+        target.validityBuffer.getReferenceManager().release();
+      }
+      final ArrowBuf slicedValidityBuffer = validityBuffer.slice(firstByteSource, byteSizeTarget);
+      target.validityBuffer = transferBuffer(slicedValidityBuffer, target.allocator);
+      return;
+    }
+
+    /* Copy data
+     * When the first bit starts from the middle of a byte (offset != 0),
+     * copy data from src BitVector.
+     * Each byte in the target is composed by a part in i-th byte,
+     * another part in (i+1)-th byte.
+     */
+    target.allocateValidityBuffer(byteSizeTarget);
+
+    for (int i = 0; i < byteSizeTarget - 1; i++) {
+      byte b1 =
+          BitVectorHelper.getBitsFromCurrentByte(this.validityBuffer, firstByteSource + i, offset);
+      byte b2 =
+          BitVectorHelper.getBitsFromNextByte(this.validityBuffer, firstByteSource + i + 1, offset);
+
+      target.validityBuffer.setByte(i, (b1 + b2));
+    }
+    /* Copying the last piece is done in the following manner:
+     * if the source vector has 1 or more bytes remaining, we copy
+     * the last piece as a byte formed by shifting data
+     * from the current byte and the next byte.
+     *
+     * if the source vector has no more bytes remaining
+     * (we are at the last byte), we copy the last piece as a byte
+     * by shifting data from the current byte.
+     */
+    if ((firstByteSource + byteSizeTarget - 1) < lastByteSource) {
+      byte b1 =
+          BitVectorHelper.getBitsFromCurrentByte(
+              this.validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
+      byte b2 =
+          BitVectorHelper.getBitsFromNextByte(
+              this.validityBuffer, firstByteSource + byteSizeTarget, offset);
+
+      target.validityBuffer.setByte(byteSizeTarget - 1, b1 + b2);
+    } else {
+      byte b1 =
+          BitVectorHelper.getBitsFromCurrentByte(
+              this.validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
+      target.validityBuffer.setByte(byteSizeTarget - 1, b1);
+    }
+  }
+
+  /**
+   * In split and transfer, the view buffer and the data buffer will be allocated. Then the values
+   * will be copied from the source vector to the target vector. Allocation and setting are
+   * preferred over transfer since the buf index and buf offset needs to be overwritten when large
+   * strings are added.
+   *
+   * @param startIndex starting index
+   * @param length number of elements to be copied
+   * @param target target vector
+   */
+  private void splitAndTransferViewBufferAndDataBuffer(
+      int startIndex, int length, BaseVariableWidthViewVector target) {
+    if (length == 0) {
+      return;
+    }
+
+    if (target.viewBuffer != null) {
+      target.viewBuffer.getReferenceManager().release();
+    }
+
+    // allocate target view buffer
+    target.viewBuffer = target.allocator.buffer(length * ELEMENT_SIZE);
+
+    for (int i = startIndex; i < startIndex + length; i++) {
+      final int stringLength = getValueLength(i);
+
+      // keeping track of writing index in the target view buffer
+      int writePosition = (i - startIndex) * ELEMENT_SIZE;
+      // keeping track of reading index in the source view buffer
+      int readPosition = i * ELEMENT_SIZE;
+
+      // set length
+      target.viewBuffer.setInt(writePosition, stringLength);
+
+      if (stringLength <= INLINE_SIZE) {
+        // handle inline buffer
+        writePosition += LENGTH_WIDTH;
+        readPosition += LENGTH_WIDTH;
+        // set data by copying the required portion from the source buffer
+        target.viewBuffer.setBytes(writePosition, viewBuffer, readPosition, stringLength);
+      } else {
+        // handle non-inline buffer
+        final int readBufIndex =
+            viewBuffer.getInt(((long) i * ELEMENT_SIZE) + LENGTH_WIDTH + PREFIX_WIDTH);
+        final int readBufOffset =
+            viewBuffer.getInt(
+                ((long) i * ELEMENT_SIZE) + LENGTH_WIDTH + PREFIX_WIDTH + BUF_INDEX_WIDTH);
+        final ArrowBuf dataBuf = dataBuffers.get(readBufIndex);
+
+        // allocate data buffer
+        ArrowBuf currentDataBuf = target.allocateOrGetLastDataBuffer(stringLength);
+        final long currentOffSet = currentDataBuf.writerIndex();
+
+        writePosition += LENGTH_WIDTH;
+        readPosition += LENGTH_WIDTH;
+        // set prefix
+        target.viewBuffer.setBytes(writePosition, viewBuffer, readPosition, PREFIX_WIDTH);
+        writePosition += PREFIX_WIDTH;
+        // set buf id
+        target.viewBuffer.setInt(writePosition, target.dataBuffers.size() - 1);
+        writePosition += BUF_INDEX_WIDTH;
+        // set offset
+        target.viewBuffer.setInt(writePosition, (int) currentOffSet);
+
+        currentDataBuf.setBytes(currentOffSet, dataBuf, readBufOffset, stringLength);
+        currentDataBuf.writerIndex(currentOffSet + stringLength);
+      }
+    }
+  }
+
+  /*----------------------------------------------------------------*
+  |                                                                |
+  |                common getters and setters                      |
+  |                                                                |
+  *----------------------------------------------------------------*/
+
+  /**
+   * Get the number of elements that are null in the vector.
+   *
+   * @return the number of null elements.
+   */
+  @Override
+  public int getNullCount() {
+    return BitVectorHelper.getNullCount(validityBuffer, valueCount);
+  }
+
+  /**
+   * Check if the given index is within the current value capacity of the vector.
+   *
+   * @param index position to check
+   * @return true if the index is within the current value capacity
+   */
+  public boolean isSafe(int index) {
+    return index < getValueCapacity();
+  }
+
+  /**
+   * Check if an element at given index is null.
+   *
+   * @param index position of an element
+   * @return true if an element at given index is null
+   */
+  @Override
+  public boolean isNull(int index) {
+    return (isSet(index) == 0);
+  }
+
+  /**
+   * Same as {@link #isNull(int)}.
+   *
+   * @param index position of an element
+   * @return 1 if element at given index is not null, 0 otherwise
+   */
+  public int isSet(int index) {
+    final int byteIndex = index >> 3;
+    final byte b = validityBuffer.getByte(byteIndex);
+    final int bitIndex = index & 7;
+    return (b >> bitIndex) & 0x01;
+  }
+
+  /**
+   * Get the value count of vector. This will always be zero unless setValueCount(int) has been
+   * called prior to calling this.
+   *
+   * @return valueCount for the vector
+   */
+  @Override
+  public int getValueCount() {
+    return valueCount;
+  }
+
+  /**
+   * Sets the value count for the vector.
+   *
+   * @param valueCount value count
+   */
+  @Override
+  public void setValueCount(int valueCount) {
+    assert valueCount >= 0;
+    this.valueCount = valueCount;
+    while (valueCount > getValueCapacity()) {
+      reallocViewBuffer();
+      reallocValidityBuffer();
+    }
+    lastSet = valueCount - 1;
+    setReaderAndWriterIndex();
+  }
+
+  /**
+   * Create holes in the vector upto the given index (exclusive). Holes will be created from the
+   * current last-set position in the vector.
+   *
+   * @param index target index
+   */
+  @Override
+  public void fillEmpties(int index) {
+    handleSafe(index, EMPTY_BYTE_ARRAY.length);
+    lastSet = index - 1;
+  }
+
+  /**
+   * Set the index of the last non-null element in the vector. It is important to call this method
+   * with appropriate value before calling {@link #setValueCount(int)}.
+   *
+   * @param value desired index of last non-null element.
+   */
+  @Override
+  public void setLastSet(int value) {
+    lastSet = value;
+  }
+
+  /**
+   * Get the index of the last non-null element in the vector.
+   *
+   * @return index of the last non-null element
+   */
+  @Override
+  public int getLastSet() {
+    return lastSet;
+  }
+
+  /**
+   * Mark the particular position in the vector as non-null.
+   *
+   * @param index position of the element.
+   */
+  @Override
+  public void setIndexDefined(int index) {
+    // We need to check and reallocate the validity buffer
+    while (index >= getValueCapacity()) {
+      reallocValidityBuffer();
+    }
+    BitVectorHelper.setBit(validityBuffer, index);
+  }
+
+  /**
+   * Sets the value length for an element.
+   *
+   * @param index position of the element to set
+   * @param length length of the element
+   */
+  @Override
+  public void setValueLengthSafe(int index, int length) {
+    assert index >= 0;
+    handleSafe(index, length);
+    lastSet = index;
+  }
+
+  /**
+   * Get the length of the element at specified index.
+   *
+   * @param index position of an element to get
+   * @return greater than length 0 for a non-null element, 0 otherwise
+   */
+  @Override
+  public int getValueLength(int index) {
+    assert index >= 0;
+    if (index < 0 || index >= viewBuffer.capacity() / ELEMENT_SIZE) {
+      throw new IndexOutOfBoundsException("Index out of bounds: " + index);
+    }
+    if (isSet(index) == 0) {
+      return 0;
+    }
+    return viewBuffer.getInt(((long) index * ELEMENT_SIZE));
+  }
+
+  /**
+   * Set the variable length element at the specified index to the supplied byte array. This is same
+   * as using {@link #set(int, byte[], int, int)} with start as Zero and length as #value.length
+   *
+   * @param index position of the element to set
+   * @param value array of bytes to write
+   */
+  public void set(int index, byte[] value) {
+    assert index >= 0;
+    BitVectorHelper.setBit(validityBuffer, index);
+    setBytes(index, value, 0, value.length);
+    lastSet = index;
+  }
+
+  /**
+   * Same as {@link #set(int, byte[])} except that it handles the case where index and length of a
+   * new element are beyond the existing capacity of the vector.
+   *
+   * @param index position of the element to set
+   * @param value array of bytes to write
+   */
+  @Override
+  public void setSafe(int index, byte[] value) {
+    assert index >= 0;
+    // check if the current index can be populated
+    handleSafe(index, value.length);
+    BitVectorHelper.setBit(validityBuffer, index);
+    setBytes(index, value, 0, value.length);
+    lastSet = index;
+  }
+
+  /**
+   * Set the variable length element at the specified index to the supplied byte array.
+   *
+   * @param index position of the element to set
+   * @param value array of bytes to write
+   * @param start start index in an array of bytes
+   * @param length length of data in an array of bytes
+   */
+  public void set(int index, byte[] value, int start, int length) {
+    assert index >= 0;
+    BitVectorHelper.setBit(validityBuffer, index);
+    setBytes(index, value, start, length);
+    lastSet = index;
+  }
+
+  /**
+   * Same as {@link #set(int, byte[], int, int)} except that it handles the case where index and
+   * length of a new element are beyond the existing capacity of the vector.
+   *
+   * @param index position of the element to set
+   * @param value array of bytes to write
+   * @param start start index in an array of bytes
+   * @param length length of data in an array of bytes
+   */
+  public void setSafe(int index, byte[] value, int start, int length) {
+    assert index >= 0;
+    handleSafe(index, length);
+    BitVectorHelper.setBit(validityBuffer, index);
+    setBytes(index, value, start, length);
+    lastSet = index;
+  }
+
+  /**
+   * Set the variable length element at the specified index to the content in supplied ByteBuffer.
+   *
+   * @param index position of the element to set
+   * @param value ByteBuffer with data
+   * @param start start index in ByteBuffer
+   * @param length length of data in ByteBuffer
+   */
+  public void set(int index, ByteBuffer value, int start, int length) {
+    assert index >= 0;
+    BitVectorHelper.setBit(validityBuffer, index);
+    setBytes(index, value.array(), start, length);
+    lastSet = index;
+  }
+
+  /**
+   * Same as {@link #set(int, ByteBuffer, int, int)} except that it handles the case where index and
+   * length of a new element are beyond the existing capacity of the vector.
+   *
+   * @param index position of the element to set
+   * @param value ByteBuffer with data
+   * @param start start index in ByteBuffer
+   * @param length length of data in ByteBuffer
+   */
+  public void setSafe(int index, ByteBuffer value, int start, int length) {
+    assert index >= 0;
+    handleSafe(index, length);
+    BitVectorHelper.setBit(validityBuffer, index);
+    setBytes(index, value.array(), start, length);
+    lastSet = index;
+  }
+
+  /**
+   * Set the element at the given index to null.
+   *
+   * @param index position of an element
+   */
+  @Override
+  public void setNull(int index) {
+    // We need to check and reallocate the validity buffer
+    while (index >= getValueCapacity()) {
+      reallocValidityBuffer();
+    }
+    BitVectorHelper.unsetBit(validityBuffer, index);
+  }
+
+  /**
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
+   *
+   * @param index position of the new value
+   * @param isSet Zero for NULL value, 1 otherwise
+   * @param start start position of data in buffer
+   * @param end end position of data in buffer
+   * @param buffer data buffer containing the variable width element to be stored in the vector
+   */
+  public void set(int index, int isSet, int start, int end, ArrowBuf buffer) {
+    assert index >= 0;
+    final int dataLength = end - start;
+    BitVectorHelper.setValidityBit(validityBuffer, index, isSet);
+    setBytes(index, buffer, start, dataLength);
+    lastSet = index;
+  }
+
+  /**
+   * Same as {@link #set(int, int, int, int, ArrowBuf)} except that it handles the case when index
+   * is greater than or equal to current value capacity of the vector.
+   *
+   * @param index position of the new value
+   * @param isSet Zero for NULL value, 1 otherwise
+   * @param start start position of data in buffer
+   * @param end end position of data in buffer
+   * @param buffer data buffer containing the variable width element to be stored in the vector
+   */
+  public void setSafe(int index, int isSet, int start, int end, ArrowBuf buffer) {
+    assert index >= 0;
+    final int dataLength = end - start;
+    handleSafe(index, dataLength);
+    BitVectorHelper.setValidityBit(validityBuffer, index, isSet);
+    setBytes(index, buffer, start, dataLength);
+    lastSet = index;
+  }
+
+  /**
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
+   *
+   * @param index position of the new value
+   * @param start start position of data in buffer
+   * @param length length of data in buffer
+   * @param buffer data buffer containing the variable width element to be stored in the vector
+   */
+  public void set(int index, int start, int length, ArrowBuf buffer) {
+    assert index >= 0;
+    BitVectorHelper.setBit(validityBuffer, index);
+    setBytes(index, buffer, start, length);
+    lastSet = index;
+  }
+
+  /**
+   * Same as {@link #set(int, int, int, int, ArrowBuf)} except that it handles the case when index
+   * is greater than or equal to current value capacity of the vector.
+   *
+   * @param index position of the new value
+   * @param start start position of data in buffer
+   * @param length length of data in buffer
+   * @param buffer data buffer containing the variable width element to be stored in the vector
+   */
+  public void setSafe(int index, int start, int length, ArrowBuf buffer) {
+    assert index >= 0;
+    handleSafe(index, length);
+    BitVectorHelper.setBit(validityBuffer, index);
+    setBytes(index, buffer, start, length);
+    lastSet = index;
+  }
+
+  /*----------------------------------------------------------------*
+  |                                                                |
+  |                helper methods for setters                      |
+  |                                                                |
+  *----------------------------------------------------------------*/
+
+  protected ArrowBuf allocateOrGetLastDataBuffer(int length) {
+    long dataBufferSize;
+    if (initialDataBufferSize > 0) {
+      dataBufferSize = Math.max(initialDataBufferSize, length);
+    } else {
+      dataBufferSize = Math.max(lastValueAllocationSizeInBytes, length);
+    }
+
+    if (dataBuffers.isEmpty()
+        || dataBuffers.get(dataBuffers.size() - 1).capacity()
+                - dataBuffers.get(dataBuffers.size() - 1).writerIndex()
+            < length) {
+      ArrowBuf newBuf = allocator.buffer(dataBufferSize);
+      dataBuffers.add(newBuf);
+    }
+
+    return dataBuffers.get(dataBuffers.size() - 1);
+  }
+
+  /**
+   * This method is used to create a view buffer for a variable width vector. It handles both inline
+   * and data buffers.
+   *
+   * <p>If the length of the value is less than or equal to {@link #INLINE_SIZE}, the value is
+   * stored in the valueBuffer directly as an inline buffer. The valueBuffer stores the length of
+   * the value followed by the value itself. If the length of the value is greater than {@link
+   * #INLINE_SIZE}, a new buffer is allocated and added to dataBuffers to hold the value. The
+   * viewBuffer in this case stores the length of the value, a prefix of the value, the index of the
+   * new buffer in dataBuffers, and the offset of the value in the new buffer.
+   *
+   * @param index The index at which the new value will be inserted.
+   * @param value The byte array that contains the data to be inserted.
+   * @param start The start index in the byte array from where the data for the new value begins.
+   * @param length The length of the data in the byte array that belongs to the new value.
+   */
+  protected final void setBytes(int index, byte[] value, int start, int length) {
+    int writePosition = index * ELEMENT_SIZE;
+
+    // to clear the memory segment of view being written to
+    // this is helpful in case of overwriting the value
+    viewBuffer.setZero(writePosition, ELEMENT_SIZE);
+
+    if (length <= INLINE_SIZE) {
+      // allocate inline buffer
+      // set length
+      viewBuffer.setInt(writePosition, length);
+      writePosition += LENGTH_WIDTH;
+      // set data
+      viewBuffer.setBytes(writePosition, value, start, length);
+    } else {
+      // allocate data buffer
+      ArrowBuf currentBuf = allocateOrGetLastDataBuffer(length);
+
+      // set length
+      viewBuffer.setInt(writePosition, length);
+      writePosition += LENGTH_WIDTH;
+      // set prefix
+      viewBuffer.setBytes(writePosition, value, start, PREFIX_WIDTH);
+      writePosition += PREFIX_WIDTH;
+      // set buf id
+      viewBuffer.setInt(writePosition, dataBuffers.size() - 1);
+      writePosition += BUF_INDEX_WIDTH;
+      // set offset
+      viewBuffer.setInt(writePosition, (int) currentBuf.writerIndex());
+
+      currentBuf.setBytes(currentBuf.writerIndex(), value, start, length);
+      currentBuf.writerIndex(currentBuf.writerIndex() + length);
+    }
+  }
+
+  /**
+   * This method is used to create a view buffer for a variable width vector. Similar to {@link
+   * #setBytes(int index, byte[] value, int start, int length)}
+   *
+   * @param index The index at which the new value will be inserted.
+   * @param valueBuf The byte array that contains the data to be inserted.
+   * @param start The start index in the byte array from where the data for the new value begins.
+   * @param length The length of the data in the byte array that belongs to the new value.
+   */
+  protected final void setBytes(int index, ArrowBuf valueBuf, int start, int length) {
+    int writePosition = index * ELEMENT_SIZE;
+
+    // to clear the memory segment of view being written to
+    // this is helpful in case of overwriting the value
+    viewBuffer.setZero(writePosition, ELEMENT_SIZE);
+
+    if (length <= INLINE_SIZE) {
+      // allocate inline buffer
+      // set length
+      viewBuffer.setInt(writePosition, length);
+      writePosition += LENGTH_WIDTH;
+      // set data
+      viewBuffer.setBytes(writePosition, valueBuf, start, length);
+    } else {
+      // allocate data buffer
+      ArrowBuf currentBuf = allocateOrGetLastDataBuffer(length);
+
+      // set length
+      viewBuffer.setInt(writePosition, length);
+      writePosition += LENGTH_WIDTH;
+      // set prefix
+      viewBuffer.setBytes(writePosition, valueBuf, start, PREFIX_WIDTH);
+      writePosition += PREFIX_WIDTH;
+      // set buf id
+      viewBuffer.setInt(writePosition, dataBuffers.size() - 1);
+      writePosition += BUF_INDEX_WIDTH;
+      // set offset
+      viewBuffer.setInt(writePosition, (int) currentBuf.writerIndex());
+
+      currentBuf.setBytes(currentBuf.writerIndex(), valueBuf, start, length);
+      currentBuf.writerIndex(currentBuf.writerIndex() + length);
+    }
+  }
+
+  /**
+   * Get the total length of the elements up to the given index.
+   *
+   * @param index The index of the element in the vector.
+   * @return The total length up to the element at the given index.
+   */
+  public final int getTotalValueLengthUpToIndex(int index) {
+    int totalLength = 0;
+    for (int i = 0; i < index - 1; i++) {
+      totalLength += getValueLength(i);
+    }
+    return totalLength;
+  }
+
+  protected final void handleSafe(int index, int dataLength) {
+    final long lastSetCapacity = lastSet < 0 ? 0 : (long) index * ELEMENT_SIZE;
+    final long targetCapacity = roundUpToMultipleOf16(lastSetCapacity + dataLength);
+    // for views, we need each buffer with 16 byte alignment, so we need to check the last written
+    // index
+    // in the viewBuffer and allocate a new buffer which has 16 byte alignment for adding new
+    // values.
+    long writePosition = (long) index * ELEMENT_SIZE;
+    if (viewBuffer.capacity() <= writePosition || viewBuffer.capacity() < targetCapacity) {
+      /*
+       * Everytime we want to increase the capacity of the viewBuffer, we need to make sure that the new capacity
+       * meets 16 byte alignment.
+       * If the targetCapacity is larger than the writePosition, we may not necessarily
+       * want to allocate the targetCapacity to viewBuffer since when it is >={@link #INLINE_SIZE} either way
+       * we are writing to the dataBuffer.
+       */
+      reallocViewBuffer(Math.max(writePosition, targetCapacity));
+    }
+
+    while (index >= getValueCapacity()) {
+      reallocValidityBuffer();
+    }
+  }
+
+  /**
+   * Copy a cell value from a particular index in source vector to a particular position in this
+   * vector.
+   *
+   * @param fromIndex position to copy from in source vector
+   * @param thisIndex position to copy to in this vector
+   * @param from source vector
+   */
+  @Override
+  public void copyFrom(int fromIndex, int thisIndex, ValueVector from) {
+    Preconditions.checkArgument(getMinorType() == from.getMinorType());
+    if (from.isNull(fromIndex)) {
+      BitVectorHelper.unsetBit(validityBuffer, thisIndex);
+    } else {
+      final int viewLength = from.getDataBuffer().getInt((long) fromIndex * ELEMENT_SIZE);
+      BitVectorHelper.setBit(validityBuffer, thisIndex);
+      final int start = thisIndex * ELEMENT_SIZE;
+      final int copyStart = fromIndex * ELEMENT_SIZE;
+      from.getDataBuffer().getBytes(start, viewBuffer, copyStart, ELEMENT_SIZE);
+      if (viewLength > INLINE_SIZE) {
+        final int bufIndex =
+            from.getDataBuffer()
+                .getInt(((long) fromIndex * ELEMENT_SIZE) + LENGTH_WIDTH + PREFIX_WIDTH);
+        final int dataOffset =
+            from.getDataBuffer()
+                .getInt(
+                    ((long) fromIndex * ELEMENT_SIZE)
+                        + LENGTH_WIDTH
+                        + PREFIX_WIDTH
+                        + BUF_INDEX_WIDTH);
+        final ArrowBuf dataBuf = ((BaseVariableWidthViewVector) from).dataBuffers.get(bufIndex);
+        final ArrowBuf thisDataBuf = allocateOrGetLastDataBuffer(viewLength);
+        thisDataBuf.setBytes(thisDataBuf.writerIndex(), dataBuf, dataOffset, viewLength);
+        thisDataBuf.writerIndex(thisDataBuf.writerIndex() + viewLength);
+      }
+    }
+    lastSet = thisIndex;
+  }
+
+  /**
+   * Same as {@link #copyFrom(int, int, ValueVector)} except that it handles the case when the
+   * capacity of the vector needs to be expanded before copy.
+   *
+   * @param fromIndex position to copy from in source vector
+   * @param thisIndex position to copy to in this vector
+   * @param from source vector
+   */
+  @Override
+  public void copyFromSafe(int fromIndex, int thisIndex, ValueVector from) {
+    Preconditions.checkArgument(getMinorType() == from.getMinorType());
+    if (from.isNull(fromIndex)) {
+      handleSafe(thisIndex, 0);
+      BitVectorHelper.unsetBit(validityBuffer, thisIndex);
+    } else {
+      final int viewLength = from.getDataBuffer().getInt((long) fromIndex * ELEMENT_SIZE);
+      handleSafe(thisIndex, viewLength);
+      BitVectorHelper.setBit(validityBuffer, thisIndex);
+      final int start = thisIndex * ELEMENT_SIZE;
+      final int copyStart = fromIndex * ELEMENT_SIZE;
+      from.getDataBuffer().getBytes(start, viewBuffer, copyStart, ELEMENT_SIZE);
+      if (viewLength > INLINE_SIZE) {
+        final int bufIndex =
+            from.getDataBuffer()
+                .getInt(((long) fromIndex * ELEMENT_SIZE) + LENGTH_WIDTH + PREFIX_WIDTH);
+        final int dataOffset =
+            from.getDataBuffer()
+                .getInt(
+                    ((long) fromIndex * ELEMENT_SIZE)
+                        + LENGTH_WIDTH
+                        + PREFIX_WIDTH
+                        + BUF_INDEX_WIDTH);
+        final ArrowBuf dataBuf = ((BaseVariableWidthViewVector) from).dataBuffers.get(bufIndex);
+        final ArrowBuf thisDataBuf = allocateOrGetLastDataBuffer(viewLength);
+        thisDataBuf.setBytes(thisDataBuf.writerIndex(), dataBuf, dataOffset, viewLength);
+        thisDataBuf.writerIndex(thisDataBuf.writerIndex() + viewLength);
+      }
+    }
+    lastSet = thisIndex;
+  }
+
+  @Override
+  public ArrowBufPointer getDataPointer(int index) {
+    return getDataPointer(index, new ArrowBufPointer());
+  }
+
+  @Override
+  public ArrowBufPointer getDataPointer(int index, ArrowBufPointer reuse) {
+    if (isNull(index)) {
+      reuse.set(null, 0, 0);
+    } else {
+      int length = getValueLength(index);
+      if (length < INLINE_SIZE) {
+        int start = index * ELEMENT_SIZE + LENGTH_WIDTH;
+        reuse.set(viewBuffer, start, length);
+      } else {
+        final int bufIndex =
+            viewBuffer.getInt(((long) index * ELEMENT_SIZE) + LENGTH_WIDTH + PREFIX_WIDTH);
+        ArrowBuf dataBuf = dataBuffers.get(bufIndex);
+        reuse.set(dataBuf, 0, length);
+      }
+    }
+    return reuse;
+  }
+
+  @Override
+  public int hashCode(int index) {
+    return hashCode(index, null);
+  }
+
+  @Override
+  public int hashCode(int index, ArrowBufHasher hasher) {
+    if (isNull(index)) {
+      return ArrowBufPointer.NULL_HASH_CODE;
+    }
+    final int length = getValueLength(index);
+    if (length < INLINE_SIZE) {
+      int start = index * ELEMENT_SIZE + LENGTH_WIDTH;
+      return ByteFunctionHelpers.hash(hasher, this.getDataBuffer(), start, start + length);
+    } else {
+      final int bufIndex =
+          viewBuffer.getInt(((long) index * ELEMENT_SIZE) + LENGTH_WIDTH + PREFIX_WIDTH);
+      final int dataOffset =
+          viewBuffer.getInt(
+              ((long) index * ELEMENT_SIZE) + LENGTH_WIDTH + PREFIX_WIDTH + BUF_INDEX_WIDTH);
+      ArrowBuf dataBuf = dataBuffers.get(bufIndex);
+      return ByteFunctionHelpers.hash(hasher, dataBuf, dataOffset, dataOffset + length);
+    }
+  }
+
+  /**
+   * Retrieves the data of a variable-width element at a given index in the vector.
+   *
+   * <p>If the length of the data is greater than {@link #INLINE_SIZE}, the data is stored in an
+   * inline buffer. The method retrieves the buffer index and data offset from the viewBuffer, and
+   * then retrieves the data from the corresponding buffer in the dataBuffers list.
+   *
+   * <p>If the length of the data is less than or equal to {@link #INLINE_SIZE}, the data is stored
+   * directly in the viewBuffer. The method retrieves the data directly from the viewBuffer.
+   *
+   * @param index position of the element in the vector
+   * @return byte array containing the data of the element
+   */
+  protected byte[] getData(int index) {
+    final int dataLength = getValueLength(index);
+    byte[] result = new byte[dataLength];
+    if (dataLength > INLINE_SIZE) {
+      // data is in the data buffer
+      // get buffer index
+      final int bufferIndex =
+          viewBuffer.getInt(((long) index * ELEMENT_SIZE) + LENGTH_WIDTH + PREFIX_WIDTH);
+      // get data offset
+      final int dataOffset =
+          viewBuffer.getInt(
+              ((long) index * ELEMENT_SIZE) + LENGTH_WIDTH + PREFIX_WIDTH + BUF_INDEX_WIDTH);
+      dataBuffers.get(bufferIndex).getBytes(dataOffset, result, 0, dataLength);
+    } else {
+      // data is in the view buffer
+      viewBuffer.getBytes((long) index * ELEMENT_SIZE + BUF_INDEX_WIDTH, result, 0, dataLength);
+    }
+    return result;
+  }
+
+  protected void getData(int index, ReusableBuffer<?> buffer) {
+    final int dataLength = getValueLength(index);
+    if (dataLength > INLINE_SIZE) {
+      // data is in the data buffer
+      // get buffer index
+      final int bufferIndex =
+          viewBuffer.getInt(((long) index * ELEMENT_SIZE) + LENGTH_WIDTH + PREFIX_WIDTH);
+      // get data offset
+      final int dataOffset =
+          viewBuffer.getInt(
+              ((long) index * ELEMENT_SIZE) + LENGTH_WIDTH + PREFIX_WIDTH + BUF_INDEX_WIDTH);
+      ArrowBuf dataBuf = dataBuffers.get(bufferIndex);
+      buffer.set(dataBuf, dataOffset, dataLength);
+    } else {
+      // data is in the value buffer
+      buffer.set(viewBuffer, ((long) index * ELEMENT_SIZE) + BUF_INDEX_WIDTH, dataLength);
+    }
+  }
+
+  @Override
+  public <OUT, IN> OUT accept(VectorVisitor<OUT, IN> visitor, IN value) {
+    return visitor.visit(this, value);
+  }
+
+  /**
+   * Retrieves the export buffer count for the C Data Interface.
+   *
+   * <p>For Variadic types, an additional buffer is kept to store the size of each variadic buffer
+   * since that information cannot be retrieved in the C Data import.
+   *
+   * <p>In the C Data Interface, the binary view import expects at least three buffers. The variadic
+   * size buffer is merely allocated to determine the number of elements per each variadic buffer,
+   * and it is not part of the imported data.
+   *
+   * <p>The count is set to 3 + dataBuffers.size(). Three is formed by validity, view, and variadic
+   * size buffer.
+   *
+   * @return the number of buffers to be exported
+   */
+  @Override
+  public int getExportedCDataBufferCount() {
+    return 3 + dataBuffers.size();
+  }
+
+  /**
+   * Get the data buffer of the vector. Note that an additional buffer is appended to store the size
+   * of each variadic buffer's size.
+   *
+   * @param buffers list of buffers to be exported
+   * @param buffersPtr buffer to store the pointers to the exported buffers
+   * @param nullValue null value
+   */
+  @Override
+  public void exportCDataBuffers(List<ArrowBuf> buffers, ArrowBuf buffersPtr, long nullValue) {
+    exportBuffer(validityBuffer, buffers, buffersPtr, nullValue, true);
+    exportBuffer(viewBuffer, buffers, buffersPtr, nullValue, true);
+
+    // allocating additional space to keep the number of variadic buffers
+    ArrowBuf variadicSizeBuffer = allocator.buffer((long) Long.BYTES * dataBuffers.size());
+    // variadicSizeBuffer.setZero(0, variadicSizeBuffer.capacity());
+    // export data buffers
+    for (int i = 0; i < dataBuffers.size(); i++) {
+      ArrowBuf dataBuf = dataBuffers.get(i);
+      // calculate sizes for variadic size buffer
+      variadicSizeBuffer.setLong((long) i * Long.BYTES, dataBuf.capacity());
+      exportBuffer(dataBuf, buffers, buffersPtr, nullValue, true);
+    }
+    // export variadic size buffer
+    exportBuffer(variadicSizeBuffer, buffers, buffersPtr, nullValue, false);
+  }
+}
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BigIntVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BigIntVector.java
index 095d98aa265fe..21fa39af8bf2a 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BigIntVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BigIntVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -31,16 +30,15 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * BigIntVector implements a fixed width vector (8 bytes) of
- * integer values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * BigIntVector implements a fixed width vector (8 bytes) of integer values which could be null. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
  */
-public final class BigIntVector extends BaseFixedWidthVector implements BaseIntVector {
+public final class BigIntVector extends BaseFixedWidthVector
+    implements BaseIntVector, ValueIterableVector<Long> {
   public static final byte TYPE_WIDTH = 8;
 
   /**
-   * Instantiate a BigIntVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a BigIntVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -50,8 +48,7 @@ public BigIntVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a BigIntVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a BigIntVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -62,8 +59,7 @@ public BigIntVector(String name, FieldType fieldType, BufferAllocator allocator)
   }
 
   /**
-   * Instantiate a BigIntVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a BigIntVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -78,8 +74,8 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
+   *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
   @Override
@@ -87,17 +83,16 @@ public MinorType getMinorType() {
     return MinorType.BIGINT;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public long get(int index) throws IllegalStateException {
@@ -108,11 +103,10 @@ public long get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableBigIntHolder holder) {
     if (isSet(index) == 0) {
@@ -126,7 +120,7 @@ public void get(int index, NullableBigIntHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -139,11 +133,10 @@ public Long getObject(int index) {
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, long value) {
     valueBuffer.setLong((long) index * TYPE_WIDTH, value);
@@ -152,8 +145,8 @@ private void setValue(int index, long value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, long value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -161,12 +154,11 @@ public void set(int index, long value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableBigIntHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -182,8 +174,8 @@ public void set(int index, NullableBigIntHolder holder) throws IllegalArgumentEx
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, BigIntHolder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -191,12 +183,11 @@ public void set(int index, BigIntHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, long)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, long)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, long value) {
     handleSafe(index);
@@ -204,12 +195,11 @@ public void setSafe(int index, long value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableBigIntHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableBigIntHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableBigIntHolder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -217,12 +207,11 @@ public void setSafe(int index, NullableBigIntHolder holder) throws IllegalArgume
   }
 
   /**
-   * Same as {@link #set(int, BigIntHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, BigIntHolder)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, BigIntHolder holder) {
     handleSafe(index);
@@ -230,8 +219,9 @@ public void setSafe(int index, BigIntHolder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
+   *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
    * @param value element value
@@ -245,9 +235,9 @@ public void set(int index, int isSet, long value) {
   }
 
   /**
-   * Same as {@link #set(int, int, long)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, long)} except that it handles the case when index is greater than
+   * or equal to current value capacity of the vector.
+   *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
    * @param value element value
@@ -258,8 +248,7 @@ public void setSafe(int index, int isSet, long value) {
   }
 
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
@@ -271,17 +260,14 @@ public static long get(final ArrowBuf buffer, final int index) {
     return buffer.getLong((long) index * TYPE_WIDTH);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -293,8 +279,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising of this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising of this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BitVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BitVector.java
index a34df8cf6f68b..f8e3342625823 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BitVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BitVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
@@ -36,21 +35,19 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * BitVector implements a fixed width (1 bit) vector of
- * boolean values which could be null. Each value in the vector corresponds
- * to a single bit in the underlying data stream backing the vector.
+ * BitVector implements a fixed width (1 bit) vector of boolean values which could be null. Each
+ * value in the vector corresponds to a single bit in the underlying data stream backing the vector.
  */
-public final class BitVector extends BaseFixedWidthVector {
+public final class BitVector extends BaseFixedWidthVector implements ValueIterableVector<Boolean> {
 
   private static final int HASH_CODE_FOR_ZERO = 17;
 
   private static final int HASH_CODE_FOR_ONE = 19;
 
   /**
-   * Instantiate a BitVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a BitVector. This doesn't allocate any memory for the data in vector.
    *
-   * @param name      name of the vector
+   * @param name name of the vector
    * @param allocator allocator for memory management.
    */
   public BitVector(String name, BufferAllocator allocator) {
@@ -58,10 +55,9 @@ public BitVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a BitVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a BitVector. This doesn't allocate any memory for the data in vector.
    *
-   * @param name      name of the vector
+   * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
    * @param allocator allocator for memory management.
    */
@@ -70,8 +66,7 @@ public BitVector(String name, FieldType fieldType, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a BitVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a BitVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field the Field materialized by this vector
    * @param allocator allocator for memory management.
@@ -86,8 +81,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -97,8 +91,8 @@ public MinorType getMinorType() {
   }
 
   /**
-   * Sets the desired value capacity for the vector. This function doesn't
-   * allocate any memory for the vector.
+   * Sets the desired value capacity for the vector. This function doesn't allocate any memory for
+   * the vector.
    *
    * @param valueCount desired number of elements in the vector
    */
@@ -120,8 +114,7 @@ protected int getValueBufferValueCapacity() {
    * Get the potential buffer size for a particular number of records.
    *
    * @param count desired number of elements in the vector
-   * @return estimated size of underlying buffers if the vector holds
-   *         a given number of elements
+   * @return estimated size of underlying buffers if the vector holds a given number of elements
    */
   @Override
   public int getBufferSizeFor(final int count) {
@@ -142,31 +135,34 @@ public int getBufferSize() {
   }
 
   /**
-   * Slice this vector at desired index and length and transfer the
-   * corresponding data to the target vector.
+   * Slice this vector at desired index and length and transfer the corresponding data to the target
+   * vector.
    *
    * @param startIndex start position of the split in source vector.
-   * @param length     length of the split.
-   * @param target     destination vector
+   * @param length length of the split.
+   * @param target destination vector
    */
   @Override
   public void splitAndTransferTo(int startIndex, int length, BaseFixedWidthVector target) {
-    Preconditions.checkArgument(startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
-        "Invalid parameters startIndex: %s, length: %s for valueCount: %s", startIndex, length, valueCount);
+    Preconditions.checkArgument(
+        startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
+        "Invalid parameters startIndex: %s, length: %s for valueCount: %s",
+        startIndex,
+        length,
+        valueCount);
     compareTypes(target, "splitAndTransferTo");
     target.clear();
-    target.validityBuffer = splitAndTransferBuffer(startIndex, length, validityBuffer, target.validityBuffer);
-    target.valueBuffer = splitAndTransferBuffer(startIndex, length, valueBuffer, target.valueBuffer);
+    target.validityBuffer =
+        splitAndTransferBuffer(startIndex, length, validityBuffer, target.validityBuffer);
+    target.valueBuffer =
+        splitAndTransferBuffer(startIndex, length, valueBuffer, target.valueBuffer);
     target.refreshValueCapacity();
 
     target.setValueCount(length);
   }
 
   private ArrowBuf splitAndTransferBuffer(
-      int startIndex,
-      int length,
-      ArrowBuf sourceBuffer,
-      ArrowBuf destBuffer) {
+      int startIndex, int length, ArrowBuf sourceBuffer, ArrowBuf destBuffer) {
     int firstByteSource = BitVectorHelper.byteIndex(startIndex);
     int lastByteSource = BitVectorHelper.byteIndex(valueCount - 1);
     int byteSizeTarget = getValidityBufferSizeFromCount(length);
@@ -192,8 +188,10 @@ private ArrowBuf splitAndTransferBuffer(
         destBuffer.setZero(0, destBuffer.capacity());
 
         for (int i = 0; i < byteSizeTarget - 1; i++) {
-          byte b1 = BitVectorHelper.getBitsFromCurrentByte(sourceBuffer, firstByteSource + i, offset);
-          byte b2 = BitVectorHelper.getBitsFromNextByte(sourceBuffer, firstByteSource + i + 1, offset);
+          byte b1 =
+              BitVectorHelper.getBitsFromCurrentByte(sourceBuffer, firstByteSource + i, offset);
+          byte b2 =
+              BitVectorHelper.getBitsFromNextByte(sourceBuffer, firstByteSource + i + 1, offset);
 
           destBuffer.setByte(i, (b1 + b2));
         }
@@ -208,15 +206,18 @@ private ArrowBuf splitAndTransferBuffer(
          * by shifting data from the current byte.
          */
         if ((firstByteSource + byteSizeTarget - 1) < lastByteSource) {
-          byte b1 = BitVectorHelper.getBitsFromCurrentByte(sourceBuffer,
-                  firstByteSource + byteSizeTarget - 1, offset);
-          byte b2 = BitVectorHelper.getBitsFromNextByte(sourceBuffer,
-                  firstByteSource + byteSizeTarget, offset);
+          byte b1 =
+              BitVectorHelper.getBitsFromCurrentByte(
+                  sourceBuffer, firstByteSource + byteSizeTarget - 1, offset);
+          byte b2 =
+              BitVectorHelper.getBitsFromNextByte(
+                  sourceBuffer, firstByteSource + byteSizeTarget, offset);
 
           destBuffer.setByte(byteSizeTarget - 1, b1 + b2);
         } else {
-          byte b1 = BitVectorHelper.getBitsFromCurrentByte(sourceBuffer,
-                  firstByteSource + byteSizeTarget - 1, offset);
+          byte b1 =
+              BitVectorHelper.getBitsFromCurrentByte(
+                  sourceBuffer, firstByteSource + byteSizeTarget - 1, offset);
           destBuffer.setByte(byteSizeTarget - 1, b1);
         }
       }
@@ -225,12 +226,11 @@ private ArrowBuf splitAndTransferBuffer(
     return destBuffer;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private int getBit(int index) {
     final int byteIndex = index >> 3;
@@ -253,9 +253,8 @@ public int get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
    * @param index position of element
    */
@@ -284,12 +283,12 @@ public Boolean getObject(int index) {
   }
 
   /**
-   * Copy a cell value from a particular index in source vector to a particular
-   * position in this vector.
+   * Copy a cell value from a particular index in source vector to a particular position in this
+   * vector.
    *
    * @param fromIndex position to copy from in source vector
    * @param thisIndex position to copy to in this vector
-   * @param from      source vector
+   * @param from source vector
    */
   @Override
   public void copyFrom(int fromIndex, int thisIndex, ValueVector from) {
@@ -304,11 +303,10 @@ public void copyFrom(int fromIndex, int thisIndex, ValueVector from) {
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Set the element at the given index to the given value.
@@ -326,11 +324,10 @@ public void set(int index, int value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index  position of element
+   * @param index position of element
    * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableBitHolder holder) throws IllegalArgumentException {
@@ -351,7 +348,7 @@ public void set(int index, NullableBitHolder holder) throws IllegalArgumentExcep
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index  position of element
+   * @param index position of element
    * @param holder data holder for value of element
    */
   public void set(int index, BitHolder holder) {
@@ -364,9 +361,8 @@ public void set(int index, BitHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, int)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, int)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
    * @param index position of element
    * @param value value of element
@@ -377,11 +373,10 @@ public void setSafe(int index, int value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableBitHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableBitHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index  position of element
+   * @param index position of element
    * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableBitHolder holder) throws IllegalArgumentException {
@@ -390,11 +385,10 @@ public void setSafe(int index, NullableBitHolder holder) throws IllegalArgumentE
   }
 
   /**
-   * Same as {@link #set(int, BitHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, BitHolder)} except that it handles the case when index is greater than
+   * or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index  position of element
+   * @param index position of element
    * @param holder data holder for value of element
    */
   public void setSafe(int index, BitHolder holder) {
@@ -403,8 +397,8 @@ public void setSafe(int index, BitHolder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -419,9 +413,8 @@ public void set(int index, int isSet, int value) {
   }
 
   /**
-   * Same as {@link #set(int, int, int)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, int)} except that it handles the case when index is greater than
+   * or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -443,8 +436,8 @@ public void setToOne(int index) {
   }
 
   /**
-   * Same as {@link #setToOne(int)} except that it handles the case when
-   * index is greater than or equal to current value capacity of the vector.
+   * Same as {@link #setToOne(int)} except that it handles the case when index is greater than or
+   * equal to current value capacity of the vector.
    *
    * @param index position of the element
    */
@@ -485,7 +478,7 @@ public int hashCode(int index, ArrowBufHasher hasher) {
    * Set count bits to 1 in data starting at firstBitIndex.
    *
    * @param firstBitIndex the index of the first bit to set
-   * @param count         the number of bits to set
+   * @param count the number of bits to set
    */
   public void setRangeToOne(int firstBitIndex, int count) {
     int startByteIndex = BitVectorHelper.byteIndex(firstBitIndex);
@@ -524,19 +517,16 @@ public void setRangeToOne(int firstBitIndex, int count) {
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
-   * @param ref       name of the target vector
+   * @param ref name of the target vector
    * @param allocator allocator for the target vector
    * @return {@link TransferPair}
    */
@@ -546,8 +536,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BitVectorHelper.java b/java/vector/src/main/java/org/apache/arrow/vector/BitVectorHelper.java
index 10f343e260ccc..cb7ef62013de5 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BitVectorHelper.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BitVectorHelper.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
@@ -26,40 +25,30 @@
 import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
 import org.apache.arrow.vector.util.DataSizeRoundingUtil;
 
-
 /**
- * Helper class for performing generic operations on a bit vector buffer.
- * External use of this class is not recommended.
+ * Helper class for performing generic operations on a bit vector buffer. External use of this class
+ * is not recommended.
  */
 public class BitVectorHelper {
 
-  private BitVectorHelper() {
-  }
+  private BitVectorHelper() {}
 
-  /**
-   * Get the index of byte corresponding to bit index in validity buffer.
-   */
+  /** Get the index of byte corresponding to bit index in validity buffer. */
   public static long byteIndex(long absoluteBitIndex) {
     return absoluteBitIndex >> 3;
   }
 
-  /**
-   * Get the relative index of bit within the byte in validity buffer.
-   */
+  /** Get the relative index of bit within the byte in validity buffer. */
   public static int bitIndex(long absoluteBitIndex) {
     return checkedCastToInt(absoluteBitIndex & 7);
   }
 
-  /**
-   * Get the index of byte corresponding to bit index in validity buffer.
-   */
+  /** Get the index of byte corresponding to bit index in validity buffer. */
   public static int byteIndex(int absoluteBitIndex) {
     return absoluteBitIndex >> 3;
   }
 
-  /**
-   * Get the relative index of bit within the byte in validity buffer.
-   */
+  /** Get the relative index of bit within the byte in validity buffer. */
   public static int bitIndex(int absoluteBitIndex) {
     return absoluteBitIndex & 7;
   }
@@ -133,8 +122,8 @@ public static void setValidityBit(ArrowBuf validityBuffer, int index, int value)
   }
 
   /**
-   * Set the bit at a given index to provided value (1 or 0). Internally
-   * takes care of allocating the buffer if the caller didn't do so.
+   * Set the bit at a given index to provided value (1 or 0). Internally takes care of allocating
+   * the buffer if the caller didn't do so.
    *
    * @param validityBuffer validity buffer of the vector
    * @param allocator allocator for the buffer
@@ -143,8 +132,8 @@ public static void setValidityBit(ArrowBuf validityBuffer, int index, int value)
    * @param value value to set
    * @return ArrowBuf
    */
-  public static ArrowBuf setValidityBit(ArrowBuf validityBuffer, BufferAllocator allocator,
-                                        int valueCount, int index, int value) {
+  public static ArrowBuf setValidityBit(
+      ArrowBuf validityBuffer, BufferAllocator allocator, int valueCount, int index, int value) {
     if (validityBuffer == null) {
       validityBuffer = allocator.buffer(getValidityBufferSize(valueCount));
     }
@@ -171,8 +160,7 @@ public static int get(final ArrowBuf buffer, int index) {
   }
 
   /**
-   * Compute the size of validity buffer required to manage a given number
-   * of elements in a vector.
+   * Compute the size of validity buffer required to manage a given number of elements in a vector.
    *
    * @param valueCount number of elements in the vector
    * @return buffer size
@@ -182,8 +170,8 @@ public static int getValidityBufferSize(int valueCount) {
   }
 
   /**
-   * Given a validity buffer, find the number of bits that are not set.
-   * This is used to compute the number of null elements in a nullable vector.
+   * Given a validity buffer, find the number of bits that are not set. This is used to compute the
+   * number of null elements in a nullable vector.
    *
    * @param validityBuffer validity buffer of the vector
    * @param valueCount number of values in the vector
@@ -233,14 +221,15 @@ public static int getNullCount(final ArrowBuf validityBuffer, final int valueCou
 
   /**
    * Tests if all bits in a validity buffer are equal 0 or 1, according to the specified parameter.
+   *
    * @param validityBuffer the validity buffer.
    * @param valueCount the bit count.
-   * @param  checkOneBits if set to true, the method checks if all bits are equal to 1;
-   *                      otherwise, it checks if all bits are equal to 0.
+   * @param checkOneBits if set to true, the method checks if all bits are equal to 1; otherwise, it
+   *     checks if all bits are equal to 0.
    * @return true if all bits are 0 or 1 according to the parameter, and false otherwise.
    */
   public static boolean checkAllBitsEqualTo(
-          final ArrowBuf validityBuffer, final int valueCount, final boolean checkOneBits) {
+      final ArrowBuf validityBuffer, final int valueCount, final boolean checkOneBits) {
     if (valueCount == 0) {
       return true;
     }
@@ -300,30 +289,31 @@ public static boolean checkAllBitsEqualTo(
   }
 
   /** Returns the byte at index from data right-shifted by offset. */
-  public static byte getBitsFromCurrentByte(final ArrowBuf data, final int index, final int offset) {
+  public static byte getBitsFromCurrentByte(
+      final ArrowBuf data, final int index, final int offset) {
     return (byte) ((data.getByte(index) & 0xFF) >>> offset);
   }
 
-  /**
-   * Returns the byte at <code>index</code> from left-shifted by (8 - <code>offset</code>).
-   */
+  /** Returns the byte at <code>index</code> from left-shifted by (8 - <code>offset</code>). */
   public static byte getBitsFromNextByte(ArrowBuf data, int index, int offset) {
     return (byte) ((data.getByte(index) << (8 - offset)));
   }
 
   /**
-   * Returns a new buffer if the source validity buffer is either all null or all
-   * not-null, otherwise returns a buffer pointing to the same memory as source.
+   * Returns a new buffer if the source validity buffer is either all null or all not-null,
+   * otherwise returns a buffer pointing to the same memory as source.
    *
    * @param fieldNode The fieldNode containing the null count
-   * @param sourceValidityBuffer The source validity buffer that will have its
-   *     position copied if there is a mix of null and non-null values
+   * @param sourceValidityBuffer The source validity buffer that will have its position copied if
+   *     there is a mix of null and non-null values
    * @param allocator The allocator to use for creating a new buffer if necessary.
-   * @return A new buffer that is either allocated or points to the same memory as sourceValidityBuffer.
+   * @return A new buffer that is either allocated or points to the same memory as
+   *     sourceValidityBuffer.
    */
-  public static ArrowBuf loadValidityBuffer(final ArrowFieldNode fieldNode,
-                                            final ArrowBuf sourceValidityBuffer,
-                                            final BufferAllocator allocator) {
+  public static ArrowBuf loadValidityBuffer(
+      final ArrowFieldNode fieldNode,
+      final ArrowBuf sourceValidityBuffer,
+      final BufferAllocator allocator) {
     final int valueCount = fieldNode.getLength();
     ArrowBuf newBuffer = null;
 
@@ -331,10 +321,10 @@ public static ArrowBuf loadValidityBuffer(final ArrowFieldNode fieldNode,
     //   - validity buffer is not present, that is, it is either null or empty (in the case of
     //     IPC for instance).
     //   - values are either all NULLs or all non-NULLs
-    boolean isValidityBufferNull = sourceValidityBuffer == null ||
-        sourceValidityBuffer.capacity() == 0;
-    if (isValidityBufferNull &&
-        (fieldNode.getNullCount() == 0 || fieldNode.getNullCount() == valueCount)) {
+    boolean isValidityBufferNull =
+        sourceValidityBuffer == null || sourceValidityBuffer.capacity() == 0;
+    if (isValidityBufferNull
+        && (fieldNode.getNullCount() == 0 || fieldNode.getNullCount() == valueCount)) {
       newBuffer = allocator.buffer(getValidityBufferSize(valueCount));
       newBuffer.setZero(0, newBuffer.capacity());
       if (fieldNode.getNullCount() != 0) {
@@ -353,15 +343,16 @@ public static ArrowBuf loadValidityBuffer(final ArrowFieldNode fieldNode,
       /* mixed byte pattern -- create another ArrowBuf associated with the
        * target allocator
        */
-      newBuffer = sourceValidityBuffer.getReferenceManager().retain(sourceValidityBuffer, allocator);
+      newBuffer =
+          sourceValidityBuffer.getReferenceManager().retain(sourceValidityBuffer, allocator);
     }
 
     return newBuffer;
   }
 
   /**
-   * Set the byte of the given index in the data buffer by applying a bit mask to
-   * the current byte at that index.
+   * Set the byte of the given index in the data buffer by applying a bit mask to the current byte
+   * at that index.
    *
    * @param data buffer to set
    * @param byteIndex byteIndex within the buffer
@@ -375,14 +366,16 @@ static void setBitMaskedByte(ArrowBuf data, int byteIndex, byte bitMask) {
 
   /**
    * Concat two validity buffers.
+   *
    * @param input1 the first validity buffer.
    * @param numBits1 the number of bits in the first validity buffer.
    * @param input2 the second validity buffer.
    * @param numBits2 the number of bits in the second validity buffer.
-   * @param output the output validity buffer. It can be the same one as the first input.
-   *     The caller must make sure the output buffer has enough capacity.
+   * @param output the output validity buffer. It can be the same one as the first input. The caller
+   *     must make sure the output buffer has enough capacity.
    */
-  public static void concatBits(ArrowBuf input1, int numBits1, ArrowBuf input2, int numBits2, ArrowBuf output) {
+  public static void concatBits(
+      ArrowBuf input1, int numBits1, ArrowBuf input2, int numBits2, ArrowBuf output) {
     int numBytes1 = DataSizeRoundingUtil.divideBy8Ceil(numBits1);
     int numBytes2 = DataSizeRoundingUtil.divideBy8Ceil(numBits2);
     int numBytesOut = DataSizeRoundingUtil.divideBy8Ceil(numBits1 + numBits2);
@@ -397,9 +390,12 @@ public static void concatBits(ArrowBuf input1, int numBits1, ArrowBuf input2, in
     }
 
     if (bitIndex(numBits1) == 0) {
-      // The number of bits for the first bit set is a multiple of 8, so the boundary is at byte boundary.
-      // For this case, we have a shortcut to copy all bytes from the second set after the byte boundary.
-      MemoryUtil.UNSAFE.copyMemory(input2.memoryAddress(), output.memoryAddress() + numBytes1, numBytes2);
+      // The number of bits for the first bit set is a multiple of 8, so the boundary is at byte
+      // boundary.
+      // For this case, we have a shortcut to copy all bytes from the second set after the byte
+      // boundary.
+      MemoryUtil.UNSAFE.copyMemory(
+          input2.memoryAddress(), output.memoryAddress() + numBytes1, numBytes2);
       return;
     }
 
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BufferBacked.java b/java/vector/src/main/java/org/apache/arrow/vector/BufferBacked.java
index ccba5b26c3aa6..9af5e5397aecc 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BufferBacked.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BufferBacked.java
@@ -14,15 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
 
-/**
- * Content is backed by a buffer and can be loaded/unloaded.
- */
+/** Content is backed by a buffer and can be loaded/unloaded. */
 public interface BufferBacked {
 
   void load(ArrowFieldNode fieldNode, ArrowBuf data);
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BufferLayout.java b/java/vector/src/main/java/org/apache/arrow/vector/BufferLayout.java
index 9725693348a48..d4248c4ef91d1 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BufferLayout.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BufferLayout.java
@@ -14,26 +14,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import org.apache.arrow.util.Preconditions;
 
 /**
- * Metadata class that captures the "type" of an Arrow buffer.
- * (e.g. data buffers, offset buffers for variable width types and validity
- * buffers).
+ * Metadata class that captures the "type" of an Arrow buffer. (e.g. data buffers, offset buffers
+ * for variable width types and validity buffers).
  */
 public class BufferLayout {
 
   /**
-   * Enumeration of the different logical types a buffer can have.
+   * Enumeration of the different logical types a buffer can have. Data buffer is common to most of
+   * the layouts. Offset buffer is used for variable width types. Validity buffer is used for
+   * nullable types. Type buffer is used for Union types. Size buffer is used for ListView and
+   * LargeListView types.
    */
   public enum BufferType {
     DATA("DATA"),
     OFFSET("OFFSET"),
     VALIDITY("VALIDITY"),
-    TYPE("TYPE_ID");
+    TYPE("TYPE_ID"),
+    SIZE("SIZE"),
+    VIEWS("VIEWS"),
+    VARIADIC_DATA_BUFFERS("VARIADIC_DATA_BUFFERS");
 
     private final String name;
 
@@ -57,6 +61,8 @@ public String getName() {
   private static final BufferLayout VALUES_32 = new BufferLayout(BufferType.DATA, 32);
   private static final BufferLayout VALUES_16 = new BufferLayout(BufferType.DATA, 16);
   private static final BufferLayout VALUES_8 = new BufferLayout(BufferType.DATA, 8);
+  private static final BufferLayout SIZE_BUFFER = new BufferLayout(BufferType.SIZE, 32);
+  private static final BufferLayout VIEW_BUFFER = new BufferLayout(BufferType.VIEWS, 16);
 
   public static BufferLayout typeBuffer() {
     return TYPE_BUFFER;
@@ -70,8 +76,12 @@ public static BufferLayout largeOffsetBuffer() {
     return LARGE_OFFSET_BUFFER;
   }
 
+  public static BufferLayout sizeBuffer() {
+    return SIZE_BUFFER;
+  }
+
   /**
-   * Returns a databuffer for the given bitwidth.  Only supports powers of two between 8 and 128
+   * Returns a databuffer for the given bitwidth. Only supports powers of two between 8 and 128
    * inclusive.
    */
   public static BufferLayout dataBuffer(int typeBitWidth) {
@@ -105,6 +115,10 @@ public static BufferLayout byteVector() {
     return dataBuffer(8);
   }
 
+  public static BufferLayout viewVector() {
+    return VIEW_BUFFER;
+  }
+
   private final short typeBitWidth;
 
   private final BufferType type;
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/DateDayVector.java b/java/vector/src/main/java/org/apache/arrow/vector/DateDayVector.java
index 13645d3b26004..68e1e79bd8383 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/DateDayVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/DateDayVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -31,17 +30,16 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * DateDayVector implements a fixed width (4 bytes) vector of
- * date values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * DateDayVector implements a fixed width (4 bytes) vector of date values which could be null. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
  */
-public final class DateDayVector extends BaseFixedWidthVector {
+public final class DateDayVector extends BaseFixedWidthVector
+    implements ValueIterableVector<Integer> {
 
   public static final byte TYPE_WIDTH = 4;
 
   /**
-   * Instantiate a DateDayVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a DateDayVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -51,8 +49,7 @@ public DateDayVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a DateDayVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a DateDayVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -63,8 +60,7 @@ public DateDayVector(String name, FieldType fieldType, BufferAllocator allocator
   }
 
   /**
-   * Instantiate a DateDayVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a DateDayVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field Field materialized by this vector
    * @param allocator allocator for memory management.
@@ -79,8 +75,8 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
+   *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
   @Override
@@ -88,18 +84,16 @@ public MinorType getMinorType() {
     return MinorType.DATEDAY;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public int get(int index) throws IllegalStateException {
@@ -110,11 +104,10 @@ public int get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableDateDayHolder holder) {
     if (isSet(index) == 0) {
@@ -128,7 +121,7 @@ public void get(int index, NullableDateDayHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -141,11 +134,10 @@ public Integer getObject(int index) {
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, int value) {
     valueBuffer.setInt((long) index * TYPE_WIDTH, value);
@@ -154,8 +146,8 @@ private void setValue(int index, int value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, int value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -163,12 +155,11 @@ public void set(int index, int value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableDateDayHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -184,8 +175,8 @@ public void set(int index, NullableDateDayHolder holder) throws IllegalArgumentE
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, DateDayHolder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -193,12 +184,11 @@ public void set(int index, DateDayHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, int)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, int)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, int value) {
     handleSafe(index);
@@ -206,12 +196,11 @@ public void setSafe(int index, int value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableDateDayHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableDateDayHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableDateDayHolder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -219,12 +208,11 @@ public void setSafe(int index, NullableDateDayHolder holder) throws IllegalArgum
   }
 
   /**
-   * Same as {@link #set(int, DateDayHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, DateDayHolder)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, DateDayHolder holder) {
     handleSafe(index);
@@ -232,8 +220,8 @@ public void setSafe(int index, DateDayHolder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -248,9 +236,8 @@ public void set(int index, int isSet, int value) {
   }
 
   /**
-   * Same as {@link #set(int, int, int)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, int)} except that it handles the case when index is greater than
+   * or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -262,8 +249,7 @@ public void setSafe(int index, int isSet, int value) {
   }
 
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
@@ -275,17 +261,14 @@ public static int get(final ArrowBuf buffer, final int index) {
     return buffer.getInt((long) index * TYPE_WIDTH);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -297,8 +280,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/DateMilliVector.java b/java/vector/src/main/java/org/apache/arrow/vector/DateMilliVector.java
index 1333fb0adcefa..70b955b8f8d2a 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/DateMilliVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/DateMilliVector.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
 
 import java.time.LocalDateTime;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.impl.DateMilliReaderImpl;
@@ -34,16 +32,15 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * DateMilliVector implements a fixed width vector (8 bytes) of
- * date values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * DateMilliVector implements a fixed width vector (8 bytes) of date values which could be null. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
  */
-public final class DateMilliVector extends BaseFixedWidthVector {
+public final class DateMilliVector extends BaseFixedWidthVector
+    implements ValueIterableVector<LocalDateTime> {
   public static final byte TYPE_WIDTH = 8;
 
   /**
-   * Instantiate a DateMilliVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a DateMilliVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -53,8 +50,7 @@ public DateMilliVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a DateMilliVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a DateMilliVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -65,8 +61,7 @@ public DateMilliVector(String name, FieldType fieldType, BufferAllocator allocat
   }
 
   /**
-   * Instantiate a DateMilliVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a DateMilliVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -81,8 +76,8 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
+   *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
   @Override
@@ -90,18 +85,16 @@ public MinorType getMinorType() {
     return MinorType.DATEMILLI;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public long get(int index) throws IllegalStateException {
@@ -112,11 +105,10 @@ public long get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableDateMilliHolder holder) {
     if (isSet(index) == 0) {
@@ -130,7 +122,7 @@ public void get(int index, NullableDateMilliHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -144,11 +136,10 @@ public LocalDateTime getObject(int index) {
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, long value) {
     valueBuffer.setLong((long) index * TYPE_WIDTH, value);
@@ -157,8 +148,8 @@ private void setValue(int index, long value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, long value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -166,12 +157,11 @@ public void set(int index, long value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableDateMilliHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -187,8 +177,8 @@ public void set(int index, NullableDateMilliHolder holder) throws IllegalArgumen
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, DateMilliHolder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -196,12 +186,11 @@ public void set(int index, DateMilliHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, long)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, long)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, long value) {
     handleSafe(index);
@@ -209,12 +198,11 @@ public void setSafe(int index, long value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableDateMilliHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableDateMilliHolder)} except that it handles the case when index
+   * is greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableDateMilliHolder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -222,12 +210,11 @@ public void setSafe(int index, NullableDateMilliHolder holder) throws IllegalArg
   }
 
   /**
-   * Same as {@link #set(int, DateMilliHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, DateMilliHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, DateMilliHolder holder) {
     handleSafe(index);
@@ -235,8 +222,8 @@ public void setSafe(int index, DateMilliHolder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -251,9 +238,8 @@ public void set(int index, int isSet, long value) {
   }
 
   /**
-   * Same as {@link #set(int, int, long)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, long)} except that it handles the case when index is greater than
+   * or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -265,8 +251,7 @@ public void setSafe(int index, int isSet, long value) {
   }
 
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
@@ -278,17 +263,14 @@ public static long get(final ArrowBuf buffer, final int index) {
     return buffer.getLong((long) index * TYPE_WIDTH);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -300,8 +282,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/Decimal256Vector.java b/java/vector/src/main/java/org/apache/arrow/vector/Decimal256Vector.java
index 931c4eea0afb1..8774956522aef 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/Decimal256Vector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/Decimal256Vector.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
 
 import java.math.BigDecimal;
 import java.nio.ByteOrder;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.util.MemoryUtil;
@@ -37,13 +35,13 @@
 import org.apache.arrow.vector.util.TransferPair;
 import org.apache.arrow.vector.validate.ValidateUtil;
 
-
 /**
- * Decimal256Vector implements a fixed width vector (32 bytes) of
- * decimal values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * Decimal256Vector implements a fixed width vector (32 bytes) of decimal values which could be
+ * null. A validity buffer (bit vector) is maintained to track which elements in the vector are
+ * null.
  */
-public final class Decimal256Vector extends BaseFixedWidthVector {
+public final class Decimal256Vector extends BaseFixedWidthVector
+    implements ValueIterableVector<BigDecimal> {
   public static final int MAX_PRECISION = 76;
   public static final byte TYPE_WIDTH = 32;
   private static final boolean LITTLE_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN;
@@ -52,20 +50,20 @@ public final class Decimal256Vector extends BaseFixedWidthVector {
   private final int scale;
 
   /**
-   * Instantiate a Decimal256Vector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a Decimal256Vector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
    */
-  public Decimal256Vector(String name, BufferAllocator allocator,
-                               int precision, int scale) {
-    this(name, FieldType.nullable(new ArrowType.Decimal(precision, scale, /*bitWidth=*/TYPE_WIDTH * 8)), allocator);
+  public Decimal256Vector(String name, BufferAllocator allocator, int precision, int scale) {
+    this(
+        name,
+        FieldType.nullable(new ArrowType.Decimal(precision, scale, /*bitWidth=*/ TYPE_WIDTH * 8)),
+        allocator);
   }
 
   /**
-   * Instantiate a Decimal256Vector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a Decimal256Vector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -76,8 +74,7 @@ public Decimal256Vector(String name, FieldType fieldType, BufferAllocator alloca
   }
 
   /**
-   * Instantiate a Decimal256Vector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a Decimal256Vector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -95,8 +92,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -105,18 +101,16 @@ public MinorType getMinorType() {
     return MinorType.DECIMAL256;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public ArrowBuf get(int index) throws IllegalStateException {
@@ -127,11 +121,10 @@ public ArrowBuf get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableDecimal256Holder holder) {
     if (isSet(index) == 0) {
@@ -148,7 +141,7 @@ public void get(int index, NullableDecimal256Holder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -163,40 +156,34 @@ public BigDecimal getObject(int index) {
   /**
    * Same as {@link #getObject(int)}, but does not check for null.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public BigDecimal getObjectNotNull(int index) {
     return DecimalUtility.getBigDecimalFromArrowBuf(valueBuffer, index, scale, TYPE_WIDTH);
   }
 
-  /**
-   * Return precision for the decimal value.
-   */
+  /** Return precision for the decimal value. */
   public int getPrecision() {
     return precision;
   }
 
-  /**
-   * Return scale for the decimal value.
-   */
+  /** Return scale for the decimal value. */
   public int getScale() {
     return scale;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index    position of element
-   * @param buffer   ArrowBuf containing decimal value.
+   * @param index position of element
+   * @param buffer ArrowBuf containing decimal value.
    */
   public void set(int index, ArrowBuf buffer) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -204,16 +191,15 @@ public void set(int index, ArrowBuf buffer) {
   }
 
   /**
-   * Set the decimal element at given index to the provided array of bytes.
-   * Decimal256 is now implemented as Native Endian. This API allows the user
-   * to pass a decimal value in the form of byte array in BE byte order.
+   * Set the decimal element at given index to the provided array of bytes. Decimal256 is now
+   * implemented as Native Endian. This API allows the user to pass a decimal value in the form of
+   * byte array in BE byte order.
    *
-   * <p>Consumers of Arrow code can use this API instead of first swapping
-   * the source bytes (doing a write and read) and then finally writing to
-   * ArrowBuf of decimal vector.
+   * <p>Consumers of Arrow code can use this API instead of first swapping the source bytes (doing a
+   * write and read) and then finally writing to ArrowBuf of decimal vector.
    *
-   * <p>This method takes care of adding the necessary padding if the length
-   * of byte array is less than 32 (length of decimal type).
+   * <p>This method takes care of adding the necessary padding if the length of byte array is less
+   * than 32 (length of decimal type).
    *
    * @param index position of element
    * @param value array of bytes containing decimal in big endian byte order.
@@ -250,11 +236,11 @@ public void setBigEndian(int index, byte[] value) {
       if (length <= TYPE_WIDTH) {
         // copy data from value to outAddress
         MemoryUtil.UNSAFE.copyMemory(
-                value,
-                MemoryUtil.BYTE_ARRAY_BASE_OFFSET,
-                null,
-                outAddress + Decimal256Vector.TYPE_WIDTH - length,
-                length);
+            value,
+            MemoryUtil.BYTE_ARRAY_BASE_OFFSET,
+            null,
+            outAddress + Decimal256Vector.TYPE_WIDTH - length,
+            length);
         // sign extend
         final byte pad = (byte) (value[0] < 0 ? 0xFF : 0x00);
         MemoryUtil.UNSAFE.setMemory(outAddress, Decimal256Vector.TYPE_WIDTH - length, pad);
@@ -268,9 +254,9 @@ public void setBigEndian(int index, byte[] value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index    position of element
-   * @param start    start index of data in the buffer
-   * @param buffer   ArrowBuf containing decimal value.
+   * @param index position of element
+   * @param start start index of data in the buffer
+   * @param buffer ArrowBuf containing decimal value.
    */
   public void set(int index, long start, ArrowBuf buffer) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -279,6 +265,7 @@ public void set(int index, long start, ArrowBuf buffer) {
 
   /**
    * Sets the element at given index using the buffer whose size maybe <= 32 bytes.
+   *
    * @param index index to write the decimal to
    * @param start start of value in the buffer
    * @param buffer contains the decimal in native endian bytes
@@ -303,7 +290,8 @@ public void setSafe(int index, long start, ArrowBuf buffer, int length) {
         MemoryUtil.UNSAFE.setMemory(outAddress + length, Decimal256Vector.TYPE_WIDTH - length, pad);
       }
     } else {
-      MemoryUtil.UNSAFE.copyMemory(inAddress, outAddress + Decimal256Vector.TYPE_WIDTH - length, length);
+      MemoryUtil.UNSAFE.copyMemory(
+          inAddress, outAddress + Decimal256Vector.TYPE_WIDTH - length, length);
       // sign extend
       if (length < TYPE_WIDTH) {
         byte msb = MemoryUtil.UNSAFE.getByte(inAddress);
@@ -313,9 +301,9 @@ public void setSafe(int index, long start, ArrowBuf buffer, int length) {
     }
   }
 
-
   /**
    * Sets the element at given index using the buffer whose size maybe <= 32 bytes.
+   *
    * @param index index to write the decimal to
    * @param start start of value in the buffer
    * @param buffer contains the decimal in big endian bytes
@@ -345,7 +333,8 @@ public void setBigEndianSafe(int index, long start, ArrowBuf buffer, int length)
         MemoryUtil.UNSAFE.setMemory(outAddress + length, Decimal256Vector.TYPE_WIDTH - length, pad);
       }
     } else {
-      MemoryUtil.UNSAFE.copyMemory(inAddress, outAddress + Decimal256Vector.TYPE_WIDTH - length, length);
+      MemoryUtil.UNSAFE.copyMemory(
+          inAddress, outAddress + Decimal256Vector.TYPE_WIDTH - length, length);
       // sign extend
       if (length < TYPE_WIDTH) {
         byte msb = MemoryUtil.UNSAFE.getByte(inAddress);
@@ -358,8 +347,8 @@ public void setBigEndianSafe(int index, long start, ArrowBuf buffer, int length)
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   BigDecimal containing decimal value.
+   * @param index position of element
+   * @param value BigDecimal containing decimal value.
    */
   public void set(int index, BigDecimal value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -370,8 +359,8 @@ public void set(int index, BigDecimal value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   long value.
+   * @param index position of element
+   * @param value long value.
    */
   public void set(int index, long value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -379,12 +368,11 @@ public void set(int index, long value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableDecimal256Holder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -400,8 +388,8 @@ public void set(int index, NullableDecimal256Holder holder) throws IllegalArgume
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, Decimal256Holder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -409,12 +397,11 @@ public void set(int index, Decimal256Holder holder) {
   }
 
   /**
-   * Same as {@link #set(int, ArrowBuf)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, ArrowBuf)} except that it handles the case when index is greater than
+   * or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param buffer  ArrowBuf containing decimal value.
+   * @param index position of element
+   * @param buffer ArrowBuf containing decimal value.
    */
   public void setSafe(int index, ArrowBuf buffer) {
     handleSafe(index);
@@ -422,9 +409,8 @@ public void setSafe(int index, ArrowBuf buffer) {
   }
 
   /**
-   * Same as {@link #setBigEndian(int, byte[])} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #setBigEndian(int, byte[])} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    */
   public void setBigEndianSafe(int index, byte[] value) {
     handleSafe(index);
@@ -432,13 +418,12 @@ public void setBigEndianSafe(int index, byte[] value) {
   }
 
   /**
-   * Same as {@link #set(int, int, ArrowBuf)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, int, ArrowBuf)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index    position of element
-   * @param start    start index of data in the buffer
-   * @param buffer   ArrowBuf containing decimal value.
+   * @param index position of element
+   * @param start start index of data in the buffer
+   * @param buffer ArrowBuf containing decimal value.
    */
   public void setSafe(int index, long start, ArrowBuf buffer) {
     handleSafe(index);
@@ -446,12 +431,11 @@ public void setSafe(int index, long start, ArrowBuf buffer) {
   }
 
   /**
-   * Same as {@link #set(int, BigDecimal)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, BigDecimal)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   BigDecimal containing decimal value.
+   * @param index position of element
+   * @param value BigDecimal containing decimal value.
    */
   public void setSafe(int index, BigDecimal value) {
     handleSafe(index);
@@ -459,12 +443,11 @@ public void setSafe(int index, BigDecimal value) {
   }
 
   /**
-   * Same as {@link #set(int, long)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, long)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   long value.
+   * @param index position of element
+   * @param value long value.
    */
   public void setSafe(int index, long value) {
     handleSafe(index);
@@ -472,12 +455,11 @@ public void setSafe(int index, long value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableDecimalHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableDecimalHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableDecimal256Holder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -485,12 +467,11 @@ public void setSafe(int index, NullableDecimal256Holder holder) throws IllegalAr
   }
 
   /**
-   * Same as {@link #set(int, Decimal256Holder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, Decimal256Holder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, Decimal256Holder holder) {
     handleSafe(index);
@@ -498,8 +479,8 @@ public void setSafe(int index, Decimal256Holder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -515,9 +496,8 @@ public void set(int index, int isSet, long start, ArrowBuf buffer) {
   }
 
   /**
-   * Same as {@link #setSafe(int, int, int, ArrowBuf)} except that it handles
-   * the case when the position of new value is beyond the current value
-   * capacity of the vector.
+   * Same as {@link #setSafe(int, int, int, ArrowBuf)} except that it handles the case when the
+   * position of new value is beyond the current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -534,23 +514,27 @@ public void validateScalars() {
     for (int i = 0; i < getValueCount(); ++i) {
       BigDecimal value = getObject(i);
       if (value != null) {
-        ValidateUtil.validateOrThrow(DecimalUtility.checkPrecisionAndScaleNoThrow(value, getPrecision(), getScale()),
-            "Invalid value for Decimal256Vector at position " + i + ". Value does not fit in precision " +
-                getPrecision() + " and scale " + getScale() + ".");
+        ValidateUtil.validateOrThrow(
+            DecimalUtility.checkPrecisionAndScaleNoThrow(value, getPrecision(), getScale()),
+            "Invalid value for Decimal256Vector at position "
+                + i
+                + ". Value does not fit in precision "
+                + getPrecision()
+                + " and scale "
+                + getScale()
+                + ".");
       }
     }
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -562,8 +546,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
@@ -589,8 +572,9 @@ private class TransferImpl implements TransferPair {
     Decimal256Vector to;
 
     public TransferImpl(String ref, BufferAllocator allocator) {
-      to = new Decimal256Vector(ref, allocator, Decimal256Vector.this.precision,
-              Decimal256Vector.this.scale);
+      to =
+          new Decimal256Vector(
+              ref, allocator, Decimal256Vector.this.precision, Decimal256Vector.this.scale);
     }
 
     public TransferImpl(Field field, BufferAllocator allocator) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/DecimalVector.java b/java/vector/src/main/java/org/apache/arrow/vector/DecimalVector.java
index eefcee837f719..c2f4a14de7cc7 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/DecimalVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/DecimalVector.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
 
 import java.math.BigDecimal;
 import java.nio.ByteOrder;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.util.MemoryUtil;
@@ -38,11 +36,11 @@
 import org.apache.arrow.vector.validate.ValidateUtil;
 
 /**
- * DecimalVector implements a fixed width vector (16 bytes) of
- * decimal values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * DecimalVector implements a fixed width vector (16 bytes) of decimal values which could be null. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
  */
-public final class DecimalVector extends BaseFixedWidthVector {
+public final class DecimalVector extends BaseFixedWidthVector
+    implements ValueIterableVector<BigDecimal> {
   public static final int MAX_PRECISION = 38;
   public static final byte TYPE_WIDTH = 16;
   private static final boolean LITTLE_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN;
@@ -51,20 +49,20 @@ public final class DecimalVector extends BaseFixedWidthVector {
   private final int scale;
 
   /**
-   * Instantiate a DecimalVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a DecimalVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
    */
-  public DecimalVector(String name, BufferAllocator allocator,
-                               int precision, int scale) {
-    this(name, FieldType.nullable(new ArrowType.Decimal(precision, scale, TYPE_WIDTH * 8)), allocator);
+  public DecimalVector(String name, BufferAllocator allocator, int precision, int scale) {
+    this(
+        name,
+        FieldType.nullable(new ArrowType.Decimal(precision, scale, TYPE_WIDTH * 8)),
+        allocator);
   }
 
   /**
-   * Instantiate a DecimalVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a DecimalVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -75,8 +73,7 @@ public DecimalVector(String name, FieldType fieldType, BufferAllocator allocator
   }
 
   /**
-   * Instantiate a DecimalVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a DecimalVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -94,8 +91,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -104,18 +100,16 @@ public MinorType getMinorType() {
     return MinorType.DECIMAL;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public ArrowBuf get(int index) throws IllegalStateException {
@@ -126,11 +120,10 @@ public ArrowBuf get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableDecimalHolder holder) {
     if (isSet(index) == 0) {
@@ -147,7 +140,7 @@ public void get(int index, NullableDecimalHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -162,40 +155,34 @@ public BigDecimal getObject(int index) {
   /**
    * Same as {@link #getObject(int)} but does not check for null.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public BigDecimal getObjectNotNull(int index) {
     return DecimalUtility.getBigDecimalFromArrowBuf(valueBuffer, index, scale, TYPE_WIDTH);
   }
 
-  /**
-   * Return precision for the decimal value.
-   */
+  /** Return precision for the decimal value. */
   public int getPrecision() {
     return precision;
   }
 
-  /**
-   * Return scale for the decimal value.
-   */
+  /** Return scale for the decimal value. */
   public int getScale() {
     return scale;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index    position of element
-   * @param buffer   ArrowBuf containing decimal value.
+   * @param index position of element
+   * @param buffer ArrowBuf containing decimal value.
    */
   public void set(int index, ArrowBuf buffer) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -203,16 +190,15 @@ public void set(int index, ArrowBuf buffer) {
   }
 
   /**
-   * Set the decimal element at given index to the provided array of bytes.
-   * Decimal is now implemented as Native Endian. This API allows the user
-   * to pass a decimal value in the form of byte array in BE byte order.
+   * Set the decimal element at given index to the provided array of bytes. Decimal is now
+   * implemented as Native Endian. This API allows the user to pass a decimal value in the form of
+   * byte array in BE byte order.
    *
-   * <p>Consumers of Arrow code can use this API instead of first swapping
-   * the source bytes (doing a write and read) and then finally writing to
-   * ArrowBuf of decimal vector.
+   * <p>Consumers of Arrow code can use this API instead of first swapping the source bytes (doing a
+   * write and read) and then finally writing to ArrowBuf of decimal vector.
    *
-   * <p>This method takes care of adding the necessary padding if the length
-   * of byte array is less than 16 (length of decimal type).
+   * <p>This method takes care of adding the necessary padding if the length of byte array is less
+   * than 16 (length of decimal type).
    *
    * @param index position of element
    * @param value array of bytes containing decimal in big endian byte order.
@@ -249,11 +235,11 @@ public void setBigEndian(int index, byte[] value) {
       if (length <= TYPE_WIDTH) {
         // copy data from value to outAddress
         MemoryUtil.UNSAFE.copyMemory(
-                value,
-                MemoryUtil.BYTE_ARRAY_BASE_OFFSET,
-                null,
-                outAddress + DecimalVector.TYPE_WIDTH - length,
-                length);
+            value,
+            MemoryUtil.BYTE_ARRAY_BASE_OFFSET,
+            null,
+            outAddress + DecimalVector.TYPE_WIDTH - length,
+            length);
         // sign extend
         final byte pad = (byte) (value[0] < 0 ? 0xFF : 0x00);
         MemoryUtil.UNSAFE.setMemory(outAddress, DecimalVector.TYPE_WIDTH - length, pad);
@@ -267,9 +253,9 @@ public void setBigEndian(int index, byte[] value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index    position of element
-   * @param start    start index of data in the buffer
-   * @param buffer   ArrowBuf containing decimal value.
+   * @param index position of element
+   * @param start start index of data in the buffer
+   * @param buffer ArrowBuf containing decimal value.
    */
   public void set(int index, long start, ArrowBuf buffer) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -278,6 +264,7 @@ public void set(int index, long start, ArrowBuf buffer) {
 
   /**
    * Sets the element at given index using the buffer whose size maybe <= 16 bytes.
+   *
    * @param index index to write the decimal to
    * @param start start of value in the buffer
    * @param buffer contains the decimal in native endian bytes
@@ -302,7 +289,8 @@ public void setSafe(int index, long start, ArrowBuf buffer, int length) {
         MemoryUtil.UNSAFE.setMemory(outAddress + length, DecimalVector.TYPE_WIDTH - length, pad);
       }
     } else {
-      MemoryUtil.UNSAFE.copyMemory(inAddress, outAddress + DecimalVector.TYPE_WIDTH - length, length);
+      MemoryUtil.UNSAFE.copyMemory(
+          inAddress, outAddress + DecimalVector.TYPE_WIDTH - length, length);
       // sign extend
       if (length < TYPE_WIDTH) {
         byte msb = MemoryUtil.UNSAFE.getByte(inAddress);
@@ -312,9 +300,9 @@ public void setSafe(int index, long start, ArrowBuf buffer, int length) {
     }
   }
 
-
   /**
    * Sets the element at given index using the buffer whose size maybe <= 16 bytes.
+   *
    * @param index index to write the decimal to
    * @param start start of value in the buffer
    * @param buffer contains the decimal in big endian bytes
@@ -344,7 +332,8 @@ public void setBigEndianSafe(int index, long start, ArrowBuf buffer, int length)
         MemoryUtil.UNSAFE.setMemory(outAddress + length, DecimalVector.TYPE_WIDTH - length, pad);
       }
     } else {
-      MemoryUtil.UNSAFE.copyMemory(inAddress, outAddress + DecimalVector.TYPE_WIDTH - length, length);
+      MemoryUtil.UNSAFE.copyMemory(
+          inAddress, outAddress + DecimalVector.TYPE_WIDTH - length, length);
       // sign extend
       if (length < TYPE_WIDTH) {
         byte msb = MemoryUtil.UNSAFE.getByte(inAddress);
@@ -357,8 +346,8 @@ public void setBigEndianSafe(int index, long start, ArrowBuf buffer, int length)
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   BigDecimal containing decimal value.
+   * @param index position of element
+   * @param value BigDecimal containing decimal value.
    */
   public void set(int index, BigDecimal value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -369,8 +358,8 @@ public void set(int index, BigDecimal value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   long value.
+   * @param index position of element
+   * @param value long value.
    */
   public void set(int index, long value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -378,12 +367,11 @@ public void set(int index, long value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableDecimalHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -399,8 +387,8 @@ public void set(int index, NullableDecimalHolder holder) throws IllegalArgumentE
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, DecimalHolder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -408,12 +396,11 @@ public void set(int index, DecimalHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, ArrowBuf)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, ArrowBuf)} except that it handles the case when index is greater than
+   * or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param buffer  ArrowBuf containing decimal value.
+   * @param index position of element
+   * @param buffer ArrowBuf containing decimal value.
    */
   public void setSafe(int index, ArrowBuf buffer) {
     handleSafe(index);
@@ -421,9 +408,8 @@ public void setSafe(int index, ArrowBuf buffer) {
   }
 
   /**
-   * Same as {@link #setBigEndian(int, byte[])} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #setBigEndian(int, byte[])} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    */
   public void setBigEndianSafe(int index, byte[] value) {
     handleSafe(index);
@@ -431,13 +417,12 @@ public void setBigEndianSafe(int index, byte[] value) {
   }
 
   /**
-   * Same as {@link #set(int, long, ArrowBuf)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, long, ArrowBuf)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index    position of element
-   * @param start    start index of data in the buffer
-   * @param buffer   ArrowBuf containing decimal value.
+   * @param index position of element
+   * @param start start index of data in the buffer
+   * @param buffer ArrowBuf containing decimal value.
    */
   public void setSafe(int index, long start, ArrowBuf buffer) {
     handleSafe(index);
@@ -445,12 +430,11 @@ public void setSafe(int index, long start, ArrowBuf buffer) {
   }
 
   /**
-   * Same as {@link #set(int, BigDecimal)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, BigDecimal)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   BigDecimal containing decimal value.
+   * @param index position of element
+   * @param value BigDecimal containing decimal value.
    */
   public void setSafe(int index, BigDecimal value) {
     handleSafe(index);
@@ -458,12 +442,11 @@ public void setSafe(int index, BigDecimal value) {
   }
 
   /**
-   * Same as {@link #set(int, long)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, long)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   long value.
+   * @param index position of element
+   * @param value long value.
    */
   public void setSafe(int index, long value) {
     handleSafe(index);
@@ -471,12 +454,11 @@ public void setSafe(int index, long value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableDecimalHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableDecimalHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableDecimalHolder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -484,12 +466,11 @@ public void setSafe(int index, NullableDecimalHolder holder) throws IllegalArgum
   }
 
   /**
-   * Same as {@link #set(int, DecimalHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, DecimalHolder)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, DecimalHolder holder) {
     handleSafe(index);
@@ -497,8 +478,8 @@ public void setSafe(int index, DecimalHolder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -514,9 +495,8 @@ public void set(int index, int isSet, long start, ArrowBuf buffer) {
   }
 
   /**
-   * Same as {@link #set(int, int, long, ArrowBuf)} except that it handles
-   * the case when the position of new value is beyond the current value
-   * capacity of the vector.
+   * Same as {@link #set(int, int, long, ArrowBuf)} except that it handles the case when the
+   * position of new value is beyond the current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -533,23 +513,27 @@ public void validateScalars() {
     for (int i = 0; i < getValueCount(); ++i) {
       BigDecimal value = getObject(i);
       if (value != null) {
-        ValidateUtil.validateOrThrow(DecimalUtility.checkPrecisionAndScaleNoThrow(value, getPrecision(), getScale()),
-            "Invalid value for DecimalVector at position " + i + ". Value does not fit in precision " +
-                getPrecision() + " and scale " + getScale() + ".");
+        ValidateUtil.validateOrThrow(
+            DecimalUtility.checkPrecisionAndScaleNoThrow(value, getPrecision(), getScale()),
+            "Invalid value for DecimalVector at position "
+                + i
+                + ". Value does not fit in precision "
+                + getPrecision()
+                + " and scale "
+                + getScale()
+                + ".");
       }
     }
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -561,8 +545,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
@@ -588,8 +571,8 @@ private class TransferImpl implements TransferPair {
     DecimalVector to;
 
     public TransferImpl(String ref, BufferAllocator allocator) {
-      to = new DecimalVector(ref, allocator, DecimalVector.this.precision,
-              DecimalVector.this.scale);
+      to =
+          new DecimalVector(ref, allocator, DecimalVector.this.precision, DecimalVector.this.scale);
     }
 
     public TransferImpl(Field field, BufferAllocator allocator) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/DensityAwareVector.java b/java/vector/src/main/java/org/apache/arrow/vector/DensityAwareVector.java
index c16db40f779e4..59b84c47c0987 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/DensityAwareVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/DensityAwareVector.java
@@ -14,36 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 /**
- * Vector that support density aware initial capacity settings.
- * We use this for ListVector and VarCharVector as of now to
- * control the memory allocated.
+ * Vector that support density aware initial capacity settings. We use this for ListVector and
+ * VarCharVector as of now to control the memory allocated.
  *
- * <p>For ListVector, we have been using a multiplier of 5
- * to compute the initial capacity of the inner data vector.
- * For deeply nested lists and lists with lots of NULL values,
- * this is over-allocation upfront. So density helps to be
- * conservative when computing the value capacity of the
- * inner vector.
+ * <p>For ListVector, we have been using a multiplier of 5 to compute the initial capacity of the
+ * inner data vector. For deeply nested lists and lists with lots of NULL values, this is
+ * over-allocation upfront. So density helps to be conservative when computing the value capacity of
+ * the inner vector.
  *
- * <p>For example, a density value of 10 implies each position in the
- * list vector has a list of 10 values. So we will provision
- * an initial capacity of (valuecount * 10) for the inner vector.
- * A density value of 0.1 implies out of 10 positions in the list vector,
- * 1 position has a list of size 1 and remaining positions are
- * null (no lists) or empty lists. This helps in tightly controlling
- * the memory we provision for inner data vector.
+ * <p>For example, a density value of 10 implies each position in the list vector has a list of 10
+ * values. So we will provision an initial capacity of (valuecount * 10) for the inner vector. A
+ * density value of 0.1 implies out of 10 positions in the list vector, 1 position has a list of
+ * size 1 and remaining positions are null (no lists) or empty lists. This helps in tightly
+ * controlling the memory we provision for inner data vector.
  *
- * <p>Similar analogy is applicable for VarCharVector where the capacity
- * of the data buffer can be controlled using density multiplier
- * instead of default multiplier of 8 (default size of average
+ * <p>Similar analogy is applicable for VarCharVector where the capacity of the data buffer can be
+ * controlled using density multiplier instead of default multiplier of 8 (default size of average
  * varchar length).
  *
- * <p>Also from container vectors, we propagate the density down
- * the inner vectors so that they can use it appropriately.
+ * <p>Also from container vectors, we propagate the density down the inner vectors so that they can
+ * use it appropriately.
  */
 public interface DensityAwareVector {
 
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/DurationVector.java b/java/vector/src/main/java/org/apache/arrow/vector/DurationVector.java
index 636afef1e9f7b..817f95d9d5397 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/DurationVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/DurationVector.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static java.util.concurrent.TimeUnit.MICROSECONDS;
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
 
 import java.time.Duration;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.impl.DurationReaderImpl;
@@ -36,19 +34,18 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * DurationVector implements a fixed width vector (8 bytes) of
- * a configurable TimeUnit granularity duration values which could be null.
- * A validity buffer (bit vector) is maintained to track which elements in the
- * vector are null.
+ * DurationVector implements a fixed width vector (8 bytes) of a configurable TimeUnit granularity
+ * duration values which could be null. A validity buffer (bit vector) is maintained to track which
+ * elements in the vector are null.
  */
-public final class DurationVector extends BaseFixedWidthVector {
+public final class DurationVector extends BaseFixedWidthVector
+    implements ValueIterableVector<Duration> {
   public static final byte TYPE_WIDTH = 8;
 
   private final TimeUnit unit;
 
   /**
-   * Instantiate a DurationVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a DurationVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -59,8 +56,7 @@ public DurationVector(String name, FieldType fieldType, BufferAllocator allocato
   }
 
   /**
-   * Instantiate a DurationVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a DurationVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -76,8 +72,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link MinorType}
    */
@@ -86,21 +81,19 @@ public MinorType getMinorType() {
     return MinorType.DURATION;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
    * @param buffer data buffer
-   * @param index  position of the element.
+   * @param index position of the element.
    * @return value stored at the index.
    */
   public static long get(final ArrowBuf buffer, final int index) {
@@ -110,7 +103,7 @@ public static long get(final ArrowBuf buffer, final int index) {
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public ArrowBuf get(int index) throws IllegalStateException {
@@ -121,11 +114,10 @@ public ArrowBuf get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableDurationHolder holder) {
     if (isSet(index) == 0) {
@@ -140,7 +132,7 @@ public void get(int index, NullableDurationHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -155,7 +147,7 @@ public Duration getObject(int index) {
   /**
    * Same as {@link #getObject(int)} but does not check for null.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public Duration getObjectNotNull(int index) {
@@ -163,9 +155,7 @@ public Duration getObjectNotNull(int index) {
     return toDuration(value, unit);
   }
 
-  /**
-   * Converts the given value and unit to the appropriate {@link Duration}.
-   */
+  /** Converts the given value and unit to the appropriate {@link Duration}. */
   public static Duration toDuration(long value, TimeUnit unit) {
     switch (unit) {
       case SECOND:
@@ -199,24 +189,22 @@ private StringBuilder getAsStringBuilderHelper(int index) {
     return new StringBuilder(getObject(index).toString());
   }
 
-  /**
-   * Gets the time unit of the duration.
-   */
+  /** Gets the time unit of the duration. */
   public TimeUnit getUnit() {
     return unit;
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, ArrowBuf value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -226,8 +214,8 @@ public void set(int index, ArrowBuf value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index          position of element
-   * @param value   The duration value (in the timeunit associated with this vector)
+   * @param index position of element
+   * @param value The duration value (in the timeunit associated with this vector)
    */
   public void set(int index, long value) {
     final long offsetIndex = (long) index * TYPE_WIDTH;
@@ -236,12 +224,11 @@ public void set(int index, long value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableDurationHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -259,8 +246,8 @@ public void set(int index, NullableDurationHolder holder) throws IllegalArgument
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, DurationHolder holder) {
     if (!this.unit.equals(holder.unit)) {
@@ -271,12 +258,11 @@ public void set(int index, DurationHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, ArrowBuf)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, ArrowBuf)} except that it handles the case when index is greater than
+   * or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, ArrowBuf value) {
     handleSafe(index);
@@ -284,12 +270,11 @@ public void setSafe(int index, ArrowBuf value) {
   }
 
   /**
-   * Same as {@link #set(int, long)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, long)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index          position of element
-   * @param value   duration in the time unit this vector was constructed with
+   * @param index position of element
+   * @param value duration in the time unit this vector was constructed with
    */
   public void setSafe(int index, long value) {
     handleSafe(index);
@@ -297,12 +282,11 @@ public void setSafe(int index, long value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableDurationHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableDurationHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableDurationHolder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -310,12 +294,11 @@ public void setSafe(int index, NullableDurationHolder holder) throws IllegalArgu
   }
 
   /**
-   * Same as {@link #set(int, DurationHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, DurationHolder)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, DurationHolder holder) {
     handleSafe(index);
@@ -323,8 +306,8 @@ public void setSafe(int index, DurationHolder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -339,9 +322,8 @@ public void set(int index, int isSet, long value) {
   }
 
   /**
-   * Same as {@link #set(int, int, long)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, long)} except that it handles the case when index is greater than
+   * or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -352,17 +334,14 @@ public void setSafe(int index, int isSet, long value) {
     set(index, isSet, value);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising of this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising of this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -374,8 +353,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ElementAddressableVector.java b/java/vector/src/main/java/org/apache/arrow/vector/ElementAddressableVector.java
index f37a50100d1c8..abfda6fe73a7d 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ElementAddressableVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ElementAddressableVector.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import org.apache.arrow.memory.util.ArrowBufPointer;
 
 /**
- * Vector for which each data element resides in a continuous memory region,
- * so it can be pointed to by an {@link org.apache.arrow.memory.util.ArrowBufPointer}.
+ * Vector for which each data element resides in a continuous memory region, so it can be pointed to
+ * by an {@link org.apache.arrow.memory.util.ArrowBufPointer}.
  */
 public interface ElementAddressableVector extends ValueVector {
 
   /**
    * Gets the pointer for the data at the given index.
+   *
    * @param index the index for the data.
    * @return the pointer to the data.
    */
@@ -34,6 +34,7 @@ public interface ElementAddressableVector extends ValueVector {
 
   /**
    * Gets the pointer for the data at the given index.
+   *
    * @param index the index for the data.
    * @param reuse the data pointer to fill, this avoids creating a new pointer object.
    * @return the pointer to the data, it should be the same one as the input parameter
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ExtensionTypeVector.java b/java/vector/src/main/java/org/apache/arrow/vector/ExtensionTypeVector.java
index 3a35a44403492..208c8b416cf91 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ExtensionTypeVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ExtensionTypeVector.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import java.util.Iterator;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.OutOfMemoryException;
@@ -34,16 +32,18 @@
 
 /**
  * A vector that wraps an underlying vector, used to help implement extension types.
+ *
  * @param <T> The wrapped vector type.
  */
-public abstract class ExtensionTypeVector<T extends ValueVector & FieldVector> extends BaseValueVector implements
-    FieldVector {
+public abstract class ExtensionTypeVector<T extends ValueVector & FieldVector>
+    extends BaseValueVector implements FieldVector {
 
   private final T underlyingVector;
   private final String name;
 
   /**
    * Instantiate an extension type vector.
+   *
    * @param name name of the vector
    * @param allocator allocator for memory management
    * @param underlyingVector underlying filed vector
@@ -57,6 +57,7 @@ public ExtensionTypeVector(String name, BufferAllocator allocator, T underlyingV
 
   /**
    * Instantiate an extension type vector.
+   *
    * @param field field materialized by this vector.
    * @param allocator allocator for memory management
    * @param underlyingVector underlying filed vector
@@ -188,8 +189,8 @@ public void setValueCount(int valueCount) {
   /**
    * Get the extension object at the specified index.
    *
-   * <p>Generally, this should access the underlying vector and construct the corresponding Java object from the raw
-   * data.
+   * <p>Generally, this should access the underlying vector and construct the corresponding Java
+   * object from the raw data.
    */
   @Override
   public abstract Object getObject(int index);
@@ -232,8 +233,8 @@ public List<ArrowBuf> getFieldBuffers() {
   /**
    * Get the inner vectors.
    *
-   * @deprecated This API will be removed as the current implementations no longer support inner vectors.
-   *
+   * @deprecated This API will be removed as the current implementations no longer support inner
+   *     vectors.
    * @return the inner vectors for this field as defined by the TypeLayout
    */
   @Deprecated
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/FieldVector.java b/java/vector/src/main/java/org/apache/arrow/vector/FieldVector.java
index 299828f6d9d08..e58f7bba84494 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/FieldVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/FieldVector.java
@@ -14,24 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
 import org.apache.arrow.vector.types.pojo.Field;
 
 /**
- * A vector corresponding to a Field in the schema.
- * It has inner vectors backed by buffers (validity, offsets, data, ...)
+ * A vector corresponding to a Field in the schema. It has inner vectors backed by buffers
+ * (validity, offsets, data, ...)
  */
 public interface FieldVector extends ValueVector {
 
   /**
-   * Initializes the child vectors
-   * to be later loaded with loadBuffers.
+   * Initializes the child vectors to be later loaded with loadBuffers.
    *
    * @param children the schema
    */
@@ -45,10 +42,9 @@ public interface FieldVector extends ValueVector {
   List<FieldVector> getChildrenFromFields();
 
   /**
-   * Loads data in the vectors.
-   * (ownBuffers must be the same size as getFieldVectors())
+   * Loads data in the vectors. (ownBuffers must be the same size as getFieldVectors())
    *
-   * @param fieldNode  the fieldNode
+   * @param fieldNode the fieldNode
    * @param ownBuffers the buffers for this Field (own buffers only, children not included)
    */
   void loadFieldBuffers(ArrowFieldNode fieldNode, List<ArrowBuf> ownBuffers);
@@ -61,10 +57,62 @@ public interface FieldVector extends ValueVector {
   List<ArrowBuf> getFieldBuffers();
 
   /**
-   * Get the inner vectors.
+   * Retrieves the export buffer count for the C Data Interface.
+   *
+   * @return the number of variadic buffers
+   */
+  default int getExportedCDataBufferCount() {
+    return getFieldBuffers().size();
+  }
+
+  /**
+   * Export a given buffer and its memory address into a list of buffers and a pointer to the list
+   * of buffers.
+   *
+   * @param buffer the buffer to export
+   * @param buffers the list of buffers
+   * @param buffersPtr the pointer to the list of buffers
+   * @param nullValue the null value to use for null buffer
+   * @param retain whether to retain the buffer when exporting
+   */
+  default void exportBuffer(
+      ArrowBuf buffer,
+      List<ArrowBuf> buffers,
+      ArrowBuf buffersPtr,
+      long nullValue,
+      boolean retain) {
+    if (buffer != null) {
+      if (retain) {
+        buffer.getReferenceManager().retain();
+      }
+      buffersPtr.writeLong(buffer.memoryAddress());
+    } else {
+      buffersPtr.writeLong(nullValue);
+    }
+    buffers.add(buffer);
+  }
+
+  /**
+   * Export the buffers of the fields for C Data Interface. This method traverse the buffers and
+   * export buffer and buffer's memory address into a list of buffers and a pointer to the list of
+   * buffers.
    *
-   * @deprecated This API will be removed as the current implementations no longer support inner vectors.
+   * <p>By default, when exporting a buffer, it will increase ref count for exported buffer that
+   * counts the usage at imported side.
+   */
+  default void exportCDataBuffers(List<ArrowBuf> buffers, ArrowBuf buffersPtr, long nullValue) {
+    List<ArrowBuf> fieldBuffers = getFieldBuffers();
+
+    for (ArrowBuf arrowBuf : fieldBuffers) {
+      exportBuffer(arrowBuf, buffers, buffersPtr, nullValue, true);
+    }
+  }
+
+  /**
+   * Get the inner vectors.
    *
+   * @deprecated This API will be removed as the current implementations no longer support inner
+   *     vectors.
    * @return the inner vectors for this field as defined by the TypeLayout
    */
   @Deprecated
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/FixedSizeBinaryVector.java b/java/vector/src/main/java/org/apache/arrow/vector/FixedSizeBinaryVector.java
index 52c57e223476d..4add7293586ca 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/FixedSizeBinaryVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/FixedSizeBinaryVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -35,18 +34,17 @@
 import org.apache.arrow.vector.validate.ValidateUtil;
 
 /**
- * FixedSizeBinaryVector implements a fixed width vector of
- * binary values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * FixedSizeBinaryVector implements a fixed width vector of binary values which could be null. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
  */
-public class FixedSizeBinaryVector extends BaseFixedWidthVector {
+public class FixedSizeBinaryVector extends BaseFixedWidthVector
+    implements ValueIterableVector<byte[]> {
   private final int byteWidth;
 
   /**
-   * Instantiate a FixedSizeBinaryVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a FixedSizeBinaryVector. This doesn't allocate any memory for the data in vector.
    *
-   * @param name      name of the vector
+   * @param name name of the vector
    * @param allocator allocator for memory management.
    * @param byteWidth byte width of the binary values
    */
@@ -55,10 +53,9 @@ public FixedSizeBinaryVector(String name, BufferAllocator allocator, int byteWid
   }
 
   /**
-   * Instantiate a FixedSizeBinaryVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a FixedSizeBinaryVector. This doesn't allocate any memory for the data in vector.
    *
-   * @param name      name of the vector
+   * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
    * @param allocator allocator for memory management.
    */
@@ -67,8 +64,7 @@ public FixedSizeBinaryVector(String name, FieldType fieldType, BufferAllocator a
   }
 
   /**
-   * Instantiate a FixedSizeBinaryVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a FixedSizeBinaryVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -84,8 +80,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -94,12 +89,11 @@ public MinorType getMinorType() {
     return MinorType.FIXEDSIZEBINARY;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the element at the given index from the vector.
@@ -118,8 +112,8 @@ public byte[] get(int index) {
   }
 
   /**
-   * Read the value at the given position to the given output buffer.
-   * The caller is responsible for checking for nullity first.
+   * Read the value at the given position to the given output buffer. The caller is responsible for
+   * checking for nullity first.
    *
    * @param index position of element.
    * @param buffer the buffer to write into.
@@ -130,9 +124,8 @@ public void read(int index, ReusableBuffer<?> buffer) {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
    * @param index position of element
    * @param holder nullable holder to carry the buffer
@@ -163,12 +156,11 @@ public int getByteWidth() {
     return byteWidth;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /** Sets the value at index to the provided one. */
   public void set(int index, byte[] value) {
@@ -180,17 +172,15 @@ public void set(int index, byte[] value) {
   }
 
   /**
-   * Same as {@link #set(int, byte[])} but reallocates if <code>index</code>
-   * is larger than capacity.
+   * Same as {@link #set(int, byte[])} but reallocates if <code>index</code> is larger than
+   * capacity.
    */
   public void setSafe(int index, byte[] value) {
     handleSafe(index);
     set(index, value);
   }
 
-  /**
-   * Sets the value if isSet is positive, otherwise sets the index to null/invalid.
-   */
+  /** Sets the value if isSet is positive, otherwise sets the index to null/invalid. */
   public void set(int index, int isSet, byte[] value) {
     if (isSet > 0) {
       set(index, value);
@@ -207,7 +197,7 @@ public void setSafe(int index, int isSet, byte[] value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index  position of element
+   * @param index position of element
    * @param buffer ArrowBuf containing binary value.
    */
   public void set(int index, ArrowBuf buffer) {
@@ -218,11 +208,10 @@ public void set(int index, ArrowBuf buffer) {
   }
 
   /**
-   * Same as {@link #set(int, ArrowBuf)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, ArrowBuf)} except that it handles the case when index is greater than
+   * or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index  position of element
+   * @param index position of element
    * @param buffer ArrowBuf containing binary value.
    */
   public void setSafe(int index, ArrowBuf buffer) {
@@ -233,7 +222,7 @@ public void setSafe(int index, ArrowBuf buffer) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index  position of element
+   * @param index position of element
    * @param buffer ArrowBuf containing binary value.
    */
   public void set(int index, int isSet, ArrowBuf buffer) {
@@ -245,11 +234,10 @@ public void set(int index, int isSet, ArrowBuf buffer) {
   }
 
   /**
-   * Same as {@link #set(int, ArrowBuf)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, ArrowBuf)} except that it handles the case when index is greater than
+   * or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index  position of element
+   * @param index position of element
    * @param buffer ArrowBuf containing binary value.
    */
   public void setSafe(int index, int isSet, ArrowBuf buffer) {
@@ -258,27 +246,28 @@ public void setSafe(int index, int isSet, ArrowBuf buffer) {
   }
 
   /**
-   * Set the variable length element at the specified index to the data
-   * buffer supplied in the holder.
+   * Set the variable length element at the specified index to the data buffer supplied in the
+   * holder.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void set(int index, FixedSizeBinaryHolder holder) {
     if (this.byteWidth != holder.byteWidth) {
       throw new IllegalArgumentException(
-          String.format("holder.byteWidth: %d not equal to vector byteWidth: %d", holder.byteWidth, this.byteWidth));
+          String.format(
+              "holder.byteWidth: %d not equal to vector byteWidth: %d",
+              holder.byteWidth, this.byteWidth));
     }
     set(index, holder.buffer);
   }
 
   /**
-   * Same as {@link #set(int, FixedSizeBinaryHolder)} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, FixedSizeBinaryHolder)} except that it handles the case where index
+   * and length of new element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void setSafe(int index, FixedSizeBinaryHolder holder) {
     handleSafe(index);
@@ -286,18 +275,20 @@ public void setSafe(int index, FixedSizeBinaryHolder holder) {
   }
 
   /**
-   * Set the variable length element at the specified index to the data
-   * buffer supplied in the holder.
+   * Set the variable length element at the specified index to the data buffer supplied in the
+   * holder.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void set(int index, NullableFixedSizeBinaryHolder holder) {
     if (holder.isSet < 0) {
       throw new IllegalArgumentException("holder has a negative isSet value");
     } else if (this.byteWidth != holder.byteWidth) {
       throw new IllegalArgumentException(
-          String.format("holder.byteWidth: %d not equal to vector byteWidth: %d", holder.byteWidth, this.byteWidth));
+          String.format(
+              "holder.byteWidth: %d not equal to vector byteWidth: %d",
+              holder.byteWidth, this.byteWidth));
     } else if (holder.isSet > 0) {
       set(index, holder.buffer);
     } else {
@@ -306,12 +297,11 @@ public void set(int index, NullableFixedSizeBinaryHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, NullableFixedSizeBinaryHolder)} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, NullableFixedSizeBinaryHolder)} except that it handles the case where
+   * index and length of new element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void setSafe(int index, NullableFixedSizeBinaryHolder holder) {
     handleSafe(index);
@@ -319,8 +309,7 @@ public void setSafe(int index, NullableFixedSizeBinaryHolder holder) {
   }
 
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
@@ -339,25 +328,29 @@ public void validateScalars() {
     for (int i = 0; i < getValueCount(); ++i) {
       byte[] value = get(i);
       if (value != null) {
-        ValidateUtil.validateOrThrow(value.length == byteWidth,
-            "Invalid value for FixedSizeBinaryVector at position " + i + ". The length was " +
-                value.length + " but the length of each element should be " + byteWidth + ".");
+        ValidateUtil.validateOrThrow(
+            value.length == byteWidth,
+            "Invalid value for FixedSizeBinaryVector at position "
+                + i
+                + ". The length was "
+                + value.length
+                + " but the length of each element should be "
+                + byteWidth
+                + ".");
       }
     }
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
-   * @param ref       name of the target vector
+   * @param ref name of the target vector
    * @param allocator allocator for the target vector
    * @return {@link TransferPair}
    */
@@ -367,8 +360,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/FixedWidthVector.java b/java/vector/src/main/java/org/apache/arrow/vector/FixedWidthVector.java
index 58effeecb5155..e22a973f3b823 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/FixedWidthVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/FixedWidthVector.java
@@ -14,23 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 /**
- * Interface for all fixed width {@link ElementAddressableVector} (e.g. integer, fixed size binary, etc).
+ * Interface for all fixed width {@link ElementAddressableVector} (e.g. integer, fixed size binary,
+ * etc).
  */
 public interface FixedWidthVector extends ElementAddressableVector {
 
   /**
-   * Allocate a new memory space for this vector.  Must be called prior to using the ValueVector.
+   * Allocate a new memory space for this vector. Must be called prior to using the ValueVector.
    *
    * @param valueCount Number of values in the vector.
    */
   void allocateNew(int valueCount);
 
-  /**
-   * Zero out the underlying buffer backing this vector.
-   */
+  /** Zero out the underlying buffer backing this vector. */
   void zeroVector();
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/Float2Vector.java b/java/vector/src/main/java/org/apache/arrow/vector/Float2Vector.java
index 9d3f25769abff..021e035d57333 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/Float2Vector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/Float2Vector.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
 
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.util.Float16;
@@ -33,16 +31,15 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * Float2Vector implements a fixed width (2 bytes) vector of
- * short values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * Float2Vector implements a fixed width (2 bytes) vector of short values which could be null. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
  */
-public final class Float2Vector extends BaseFixedWidthVector implements FloatingPointVector {
+public final class Float2Vector extends BaseFixedWidthVector
+    implements FloatingPointVector, ValueIterableVector<Short> {
   public static final byte TYPE_WIDTH = 2;
 
   /**
-   * Instantiate a Float2Vector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a Float2Vector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -52,8 +49,7 @@ public Float2Vector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a Float2Vector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a Float2Vector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -64,8 +60,7 @@ public Float2Vector(String name, FieldType fieldType, BufferAllocator allocator)
   }
 
   /**
-   * Instantiate a Float2Vector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a Float2Vector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -80,8 +75,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link MinorType}
    */
@@ -90,18 +84,16 @@ public MinorType getMinorType() {
     return MinorType.FLOAT2;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public short get(int index) throws IllegalStateException {
@@ -112,11 +104,10 @@ public short get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableFloat2Holder holder) {
     if (isSet(index) == 0) {
@@ -130,7 +121,7 @@ public void get(int index, NullableFloat2Holder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -143,8 +134,7 @@ public Short getObject(int index) {
   }
 
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
@@ -166,10 +156,10 @@ public float getValueAsFloat(int index) {
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, short value) {
     valueBuffer.setShort((long) index * TYPE_WIDTH, value);
@@ -182,8 +172,8 @@ private void setValue(int index, float value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, short value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -193,8 +183,8 @@ public void set(int index, short value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setWithPossibleTruncate(int index, float value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -202,12 +192,11 @@ public void setWithPossibleTruncate(int index, float value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableFloat2Holder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -223,8 +212,8 @@ public void set(int index, NullableFloat2Holder holder) throws IllegalArgumentEx
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, Float2Holder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -232,12 +221,11 @@ public void set(int index, Float2Holder holder) {
   }
 
   /**
-   * Same as {@link #set(int, short)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, short)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, short value) {
     handleSafe(index);
@@ -245,12 +233,11 @@ public void setSafe(int index, short value) {
   }
 
   /**
-   * Same as {@link #setWithPossibleTruncate(int, float)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #setWithPossibleTruncate(int, float)} except that it handles the case when index
+   * is greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafeWithPossibleTruncate(int index, float value) {
     handleSafe(index);
@@ -258,12 +245,11 @@ public void setSafeWithPossibleTruncate(int index, float value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableFloat2Holder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableFloat2Holder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableFloat2Holder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -271,12 +257,11 @@ public void setSafe(int index, NullableFloat2Holder holder) throws IllegalArgume
   }
 
   /**
-   * Same as {@link #set(int, Float2Holder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, Float2Holder)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, Float2Holder holder) {
     handleSafe(index);
@@ -284,8 +269,8 @@ public void setSafe(int index, Float2Holder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -300,8 +285,8 @@ public void set(int index, int isSet, short value) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -316,9 +301,8 @@ public void setWithPossibleTruncate(int index, int isSet, float value) {
   }
 
   /**
-   * Same as {@link #set(int, int, short)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, short)} except that it handles the case when index is greater
+   * than or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -330,9 +314,8 @@ public void setSafe(int index, int isSet, short value) {
   }
 
   /**
-   * Same as {@link #set(int, int, short)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, short)} except that it handles the case when index is greater
+   * than or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -345,23 +328,24 @@ public void setSafeWithPossibleTruncate(int index, int isSet, float value) {
 
   @Override
   public void setWithPossibleTruncate(int index, double value) {
-    throw new UnsupportedOperationException("The operation for double data types is not supported.");
+    throw new UnsupportedOperationException(
+        "The operation for double data types is not supported.");
   }
 
   @Override
   public void setSafeWithPossibleTruncate(int index, double value) {
-    throw new UnsupportedOperationException("The operation for double data types is not supported.");
+    throw new UnsupportedOperationException(
+        "The operation for double data types is not supported.");
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -373,8 +357,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/Float4Vector.java b/java/vector/src/main/java/org/apache/arrow/vector/Float4Vector.java
index 46f9447be2938..2b81149204be0 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/Float4Vector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/Float4Vector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -31,16 +30,15 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * Float4Vector implements a fixed width vector (4 bytes) of
- * float values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * Float4Vector implements a fixed width vector (4 bytes) of float values which could be null. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
  */
-public final class Float4Vector extends BaseFixedWidthVector implements FloatingPointVector {
+public final class Float4Vector extends BaseFixedWidthVector
+    implements FloatingPointVector, ValueIterableVector<Float> {
   public static final byte TYPE_WIDTH = 4;
 
   /**
-   * Instantiate a Float4Vector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a Float4Vector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -50,8 +48,7 @@ public Float4Vector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a Float4Vector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a Float4Vector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -62,8 +59,7 @@ public Float4Vector(String name, FieldType fieldType, BufferAllocator allocator)
   }
 
   /**
-   * Instantiate a Float4Vector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a Float4Vector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -78,8 +74,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -88,18 +83,16 @@ public MinorType getMinorType() {
     return MinorType.FLOAT4;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public float get(int index) throws IllegalStateException {
@@ -110,11 +103,10 @@ public float get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableFloat4Holder holder) {
     if (isSet(index) == 0) {
@@ -128,7 +120,7 @@ public void get(int index, NullableFloat4Holder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -141,11 +133,10 @@ public Float getObject(int index) {
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, float value) {
     valueBuffer.setFloat((long) index * TYPE_WIDTH, value);
@@ -154,8 +145,8 @@ private void setValue(int index, float value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, float value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -163,12 +154,11 @@ public void set(int index, float value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableFloat4Holder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -184,8 +174,8 @@ public void set(int index, NullableFloat4Holder holder) throws IllegalArgumentEx
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, Float4Holder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -193,12 +183,11 @@ public void set(int index, Float4Holder holder) {
   }
 
   /**
-   * Same as {@link #set(int, float)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, float)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, float value) {
     handleSafe(index);
@@ -206,12 +195,11 @@ public void setSafe(int index, float value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableFloat4Holder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableFloat4Holder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableFloat4Holder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -219,12 +207,11 @@ public void setSafe(int index, NullableFloat4Holder holder) throws IllegalArgume
   }
 
   /**
-   * Same as {@link #set(int, Float4Holder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, Float4Holder)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, Float4Holder holder) {
     handleSafe(index);
@@ -232,8 +219,8 @@ public void setSafe(int index, Float4Holder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -248,9 +235,8 @@ public void set(int index, int isSet, float value) {
   }
 
   /**
-   * Same as {@link #set(int, int, float)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, float)} except that it handles the case when index is greater
+   * than or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -262,8 +248,7 @@ public void setSafe(int index, int isSet, float value) {
   }
 
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
@@ -291,15 +276,13 @@ public double getValueAsDouble(int index) {
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -311,8 +294,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/Float8Vector.java b/java/vector/src/main/java/org/apache/arrow/vector/Float8Vector.java
index 840f9d4ba087b..6758ffde5ce7d 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/Float8Vector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/Float8Vector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -31,16 +30,15 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * Float8Vector implements a fixed width vector (8 bytes) of
- * double values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * Float8Vector implements a fixed width vector (8 bytes) of double values which could be null. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
  */
-public final class Float8Vector extends BaseFixedWidthVector implements FloatingPointVector {
+public final class Float8Vector extends BaseFixedWidthVector
+    implements FloatingPointVector, ValueIterableVector<Double> {
   public static final byte TYPE_WIDTH = 8;
 
   /**
-   * Instantiate a Float8Vector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a Float8Vector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -50,8 +48,7 @@ public Float8Vector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a Float8Vector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a Float8Vector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -62,8 +59,7 @@ public Float8Vector(String name, FieldType fieldType, BufferAllocator allocator)
   }
 
   /**
-   * Instantiate a Float8Vector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a Float8Vector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -78,8 +74,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -88,18 +83,16 @@ public MinorType getMinorType() {
     return MinorType.FLOAT8;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public double get(int index) throws IllegalStateException {
@@ -110,11 +103,10 @@ public double get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableFloat8Holder holder) {
     if (isSet(index) == 0) {
@@ -128,7 +120,7 @@ public void get(int index, NullableFloat8Holder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -140,13 +132,11 @@ public Double getObject(int index) {
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, double value) {
     valueBuffer.setDouble((long) index * TYPE_WIDTH, value);
@@ -155,8 +145,8 @@ private void setValue(int index, double value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, double value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -164,12 +154,11 @@ public void set(int index, double value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableFloat8Holder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -185,8 +174,8 @@ public void set(int index, NullableFloat8Holder holder) throws IllegalArgumentEx
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, Float8Holder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -194,12 +183,11 @@ public void set(int index, Float8Holder holder) {
   }
 
   /**
-   * Same as {@link #set(int, double)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, double)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, double value) {
     handleSafe(index);
@@ -207,12 +195,11 @@ public void setSafe(int index, double value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableFloat8Holder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableFloat8Holder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableFloat8Holder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -220,12 +207,11 @@ public void setSafe(int index, NullableFloat8Holder holder) throws IllegalArgume
   }
 
   /**
-   * Same as {@link #set(int, Float8Holder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, Float8Holder)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, Float8Holder holder) {
     handleSafe(index);
@@ -233,8 +219,8 @@ public void setSafe(int index, Float8Holder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -249,9 +235,8 @@ public void set(int index, int isSet, double value) {
   }
 
   /**
-   * Same as {@link #set(int, int, double)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, double)} except that it handles the case when index is greater
+   * than or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -263,8 +248,7 @@ public void setSafe(int index, int isSet, double value) {
   }
 
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
@@ -292,15 +276,13 @@ public double getValueAsDouble(int index) {
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -312,8 +294,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/FloatingPointVector.java b/java/vector/src/main/java/org/apache/arrow/vector/FloatingPointVector.java
index 4c5143de60a7a..343c74e9748de 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/FloatingPointVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/FloatingPointVector.java
@@ -14,24 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-/**
- * The interface for vectors with floating point values.
- */
+/** The interface for vectors with floating point values. */
 public interface FloatingPointVector extends ValueVector {
 
   /**
    * Sets the value at the given index, note this value may be truncated internally.
+   *
    * @param index the index to set.
    * @param value the value to set.
    */
   void setWithPossibleTruncate(int index, double value);
 
   /**
-   * Sets the value at the given index, note this value may be truncated internally.
-   * Any expansion/reallocation is handled automatically.
+   * Sets the value at the given index, note this value may be truncated internally. Any
+   * expansion/reallocation is handled automatically.
+   *
    * @param index the index to set.
    * @param value the value to set.
    */
@@ -39,6 +38,7 @@ public interface FloatingPointVector extends ValueVector {
 
   /**
    * Gets the value at the given index.
+   *
    * @param index the index to retrieve the value.
    * @return the value at the index.
    */
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/GenerateSampleData.java b/java/vector/src/main/java/org/apache/arrow/vector/GenerateSampleData.java
index be501ce245410..e8250f9f57f2a 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/GenerateSampleData.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/GenerateSampleData.java
@@ -14,21 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import java.math.BigDecimal;
 import java.nio.charset.Charset;
 
 /**
- * Helper class to generate test data for Nullable fixed and variable
- * width scalar vectors. Previous implementations of java vector classes
- * provided generateTestData(now deprecated) API to populate the vector
- * with sample data. This class should be used for that purpose.
+ * Helper class to generate test data for Nullable fixed and variable width scalar vectors. Previous
+ * implementations of java vector classes provided generateTestData(now deprecated) API to populate
+ * the vector with sample data. This class should be used for that purpose.
  */
 public class GenerateSampleData {
-  private GenerateSampleData() {
-  }
+  private GenerateSampleData() {}
 
   /** Populates <code>vector</code> with <code>valueCount</code> random values. */
   public static void generateTestData(final ValueVector vector, final int valueCount) {
@@ -208,7 +205,6 @@ private static void writeTimeMicroData(TimeMicroVector vector, int valueCount) {
       }
     }
     vector.setValueCount(valueCount);
-
   }
 
   private static void writeTimeNanoData(TimeNanoVector vector, int valueCount) {
@@ -395,4 +391,3 @@ private static void writeVarCharData(VarCharVector vector, int valueCount) {
     vector.setValueCount(valueCount);
   }
 }
-
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/IntVector.java b/java/vector/src/main/java/org/apache/arrow/vector/IntVector.java
index 08ead148af312..6058539a2d731 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/IntVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/IntVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -31,18 +30,17 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * IntVector implements a fixed width (4 bytes) vector of
- * integer values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * IntVector implements a fixed width (4 bytes) vector of integer values which could be null. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
  */
-public final class IntVector extends BaseFixedWidthVector implements BaseIntVector {
+public final class IntVector extends BaseFixedWidthVector
+    implements BaseIntVector, ValueIterableVector<Integer> {
   public static final byte TYPE_WIDTH = 4;
 
   /**
-   * Instantiate a IntVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a IntVector. This doesn't allocate any memory for the data in vector.
    *
-   * @param name      name of the vector
+   * @param name name of the vector
    * @param allocator allocator for memory management.
    */
   public IntVector(String name, BufferAllocator allocator) {
@@ -50,10 +48,9 @@ public IntVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a IntVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a IntVector. This doesn't allocate any memory for the data in vector.
    *
-   * @param name      name of the vector
+   * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
    * @param allocator allocator for memory management.
    */
@@ -62,8 +59,7 @@ public IntVector(String name, FieldType fieldType, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a IntVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a IntVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -78,8 +74,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -88,13 +83,11 @@ public MinorType getMinorType() {
     return MinorType.INT;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the element at the given index from the vector.
@@ -110,9 +103,8 @@ public int get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
    * @param index position of element
    */
@@ -141,11 +133,10 @@ public Integer getObject(int index) {
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, int value) {
     valueBuffer.setInt((long) index * TYPE_WIDTH, value);
@@ -163,11 +154,10 @@ public void set(int index, int value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index  position of element
+   * @param index position of element
    * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableIntHolder holder) throws IllegalArgumentException {
@@ -184,7 +174,7 @@ public void set(int index, NullableIntHolder holder) throws IllegalArgumentExcep
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index  position of element
+   * @param index position of element
    * @param holder data holder for value of element
    */
   public void set(int index, IntHolder holder) {
@@ -193,9 +183,8 @@ public void set(int index, IntHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, int)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, int)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
    * @param index position of element
    * @param value value of element
@@ -206,11 +195,10 @@ public void setSafe(int index, int value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableIntHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableIntHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index  position of element
+   * @param index position of element
    * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableIntHolder holder) throws IllegalArgumentException {
@@ -219,11 +207,10 @@ public void setSafe(int index, NullableIntHolder holder) throws IllegalArgumentE
   }
 
   /**
-   * Same as {@link #set(int, IntHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, IntHolder)} except that it handles the case when index is greater than
+   * or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index  position of element
+   * @param index position of element
    * @param holder data holder for value of element
    */
   public void setSafe(int index, IntHolder holder) {
@@ -232,8 +219,8 @@ public void setSafe(int index, IntHolder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -248,9 +235,8 @@ public void set(int index, int isSet, int value) {
   }
 
   /**
-   * Same as {@link #set(int, int, int)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, int)} except that it handles the case when index is greater than
+   * or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -262,32 +248,28 @@ public void setSafe(int index, int isSet, int value) {
   }
 
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
    * @param buffer data buffer
-   * @param index  position of the element.
+   * @param index position of the element.
    * @return value stored at the index.
    */
   public static int get(final ArrowBuf buffer, final int index) {
     return buffer.getInt((long) index * TYPE_WIDTH);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
-   * @param ref       name of the target vector
+   * @param ref name of the target vector
    * @param allocator allocator for the target vector
    * @return {@link TransferPair}
    */
@@ -297,8 +279,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/IntervalDayVector.java b/java/vector/src/main/java/org/apache/arrow/vector/IntervalDayVector.java
index f53eb37138dcb..a0ee849707b90 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/IntervalDayVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/IntervalDayVector.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
 
 import java.time.Duration;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.impl.IntervalDayReaderImpl;
@@ -33,18 +31,17 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * IntervalDayVector implements a fixed width vector (8 bytes) of
- * interval (days and milliseconds) values which could be null.
- * A validity buffer (bit vector) is maintained to track which elements in the
- * vector are null.
+ * IntervalDayVector implements a fixed width vector (8 bytes) of interval (days and milliseconds)
+ * values which could be null. A validity buffer (bit vector) is maintained to track which elements
+ * in the vector are null.
  */
-public final class IntervalDayVector extends BaseFixedWidthVector {
+public final class IntervalDayVector extends BaseFixedWidthVector
+    implements ValueIterableVector<Duration> {
   public static final byte TYPE_WIDTH = 8;
   private static final byte MILLISECOND_OFFSET = 4;
 
   /**
-   * Instantiate a IntervalDayVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a IntervalDayVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -54,8 +51,7 @@ public IntervalDayVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a IntervalDayVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a IntervalDayVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -66,8 +62,7 @@ public IntervalDayVector(String name, FieldType fieldType, BufferAllocator alloc
   }
 
   /**
-   * Instantiate a IntervalDayVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a IntervalDayVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -82,8 +77,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -92,21 +86,19 @@ public MinorType getMinorType() {
     return MinorType.INTERVALDAY;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Given a data buffer, get the number of days stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the number of days stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
    * @param buffer data buffer
-   * @param index  position of the element.
+   * @param index position of the element.
    * @return day value stored at the index.
    */
   public static int getDays(final ArrowBuf buffer, final int index) {
@@ -114,13 +106,13 @@ public static int getDays(final ArrowBuf buffer, final int index) {
   }
 
   /**
-   * Given a data buffer, get the get the number of milliseconds stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the get the number of milliseconds stored at a particular position in
+   * the vector.
    *
    * <p>This method should not be used externally.
    *
    * @param buffer data buffer
-   * @param index  position of the element.
+   * @param index position of the element.
    * @return milliseconds value stored at the index.
    */
   public static int getMilliseconds(final ArrowBuf buffer, final int index) {
@@ -130,7 +122,7 @@ public static int getMilliseconds(final ArrowBuf buffer, final int index) {
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public ArrowBuf get(int index) throws IllegalStateException {
@@ -141,11 +133,10 @@ public ArrowBuf get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableIntervalDayHolder holder) {
     if (isSet(index) == 0) {
@@ -161,7 +152,7 @@ public void get(int index, NullableIntervalDayHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -176,7 +167,7 @@ public Duration getObject(int index) {
   /**
    * Same as {@link #getObject(int)} but does not check for null.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public Duration getObjectNotNull(int index) {
@@ -190,8 +181,7 @@ public Duration getObjectNotNull(int index) {
    * Get the Interval value at a given index as a {@link StringBuilder} object.
    *
    * @param index position of the element
-   * @return String Builder object with Interval value as
-   *         [days, hours, minutes, seconds, millis]
+   * @return String Builder object with Interval value as [days, hours, minutes, seconds, millis]
    */
   public StringBuilder getAsStringBuilder(int index) {
     if (isSet(index) == 0) {
@@ -219,25 +209,28 @@ private StringBuilder getAsStringBuilderHelper(int index) {
     final String dayString = (Math.abs(days) == 1) ? " day " : " days ";
 
     return new StringBuilder()
-            .append(days).append(dayString)
-            .append(hours).append(":")
-            .append(minutes).append(":")
-            .append(seconds).append(".")
-            .append(millis);
+        .append(days)
+        .append(dayString)
+        .append(hours)
+        .append(":")
+        .append(minutes)
+        .append(":")
+        .append(seconds)
+        .append(".")
+        .append(millis);
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, ArrowBuf value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -247,9 +240,9 @@ public void set(int index, ArrowBuf value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index          position of element
-   * @param days           days for the interval
-   * @param milliseconds   milliseconds for the interval
+   * @param index position of element
+   * @param days days for the interval
+   * @param milliseconds milliseconds for the interval
    */
   public void set(int index, int days, int milliseconds) {
     final long offsetIndex = (long) index * TYPE_WIDTH;
@@ -259,12 +252,11 @@ public void set(int index, int days, int milliseconds) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableIntervalDayHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -279,20 +271,19 @@ public void set(int index, NullableIntervalDayHolder holder) throws IllegalArgum
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, IntervalDayHolder holder) {
     set(index, holder.days, holder.milliseconds);
   }
 
   /**
-   * Same as {@link #set(int, ArrowBuf)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, ArrowBuf)} except that it handles the case when index is greater than
+   * or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, ArrowBuf value) {
     handleSafe(index);
@@ -300,13 +291,12 @@ public void setSafe(int index, ArrowBuf value) {
   }
 
   /**
-   * Same as {@link #set(int, int, int)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, int, int)} except that it handles the case when index is greater than
+   * or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index          position of element
-   * @param days           days for the interval
-   * @param milliseconds   milliseconds for the interval
+   * @param index position of element
+   * @param days days for the interval
+   * @param milliseconds milliseconds for the interval
    */
   public void setSafe(int index, int days, int milliseconds) {
     handleSafe(index);
@@ -314,12 +304,11 @@ public void setSafe(int index, int days, int milliseconds) {
   }
 
   /**
-   * Same as {@link #set(int, NullableIntervalDayHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableIntervalDayHolder)} except that it handles the case when index
+   * is greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableIntervalDayHolder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -327,12 +316,11 @@ public void setSafe(int index, NullableIntervalDayHolder holder) throws IllegalA
   }
 
   /**
-   * Same as {@link #set(int, IntervalDayHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, IntervalDayHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, IntervalDayHolder holder) {
     handleSafe(index);
@@ -340,8 +328,8 @@ public void setSafe(int index, IntervalDayHolder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -357,9 +345,8 @@ public void set(int index, int isSet, int days, int milliseconds) {
   }
 
   /**
-   * Same as {@link #set(int, int, int, int)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, int, int)} except that it handles the case when index is greater
+   * than or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -371,17 +358,14 @@ public void setSafe(int index, int isSet, int days, int milliseconds) {
     set(index, isSet, days, milliseconds);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -393,8 +377,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/IntervalMonthDayNanoVector.java b/java/vector/src/main/java/org/apache/arrow/vector/IntervalMonthDayNanoVector.java
index 716af6fec9cd8..eece3b34b85ff 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/IntervalMonthDayNanoVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/IntervalMonthDayNanoVector.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
 
 import java.time.Duration;
 import java.time.Period;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.impl.IntervalMonthDayNanoReaderImpl;
@@ -34,23 +32,22 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * IntervalMonthDayNanoVector implements a fixed width vector (16 bytes) of
- * interval (month, days and nanoseconds) values which could be null.
- * A validity buffer (bit vector) is maintained to track which elements in the
- * vector are null.
+ * IntervalMonthDayNanoVector implements a fixed width vector (16 bytes) of interval (month, days
+ * and nanoseconds) values which could be null. A validity buffer (bit vector) is maintained to
+ * track which elements in the vector are null.
  *
- * Month, day and nanoseconds are independent from one another and there
- * is no specific limits imposed on their values.
+ * <p>Month, day and nanoseconds are independent from one another and there is no specific limits
+ * imposed on their values.
  */
-public final class IntervalMonthDayNanoVector extends BaseFixedWidthVector {
+public final class IntervalMonthDayNanoVector extends BaseFixedWidthVector
+    implements ValueIterableVector<PeriodDuration> {
   public static final byte TYPE_WIDTH = 16;
   private static final byte DAY_OFFSET = 4;
   private static final byte NANOSECOND_OFFSET = 8;
 
-
   /**
-   * Instantiate a IntervalMonthDayNanoVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a IntervalMonthDayNanoVector. This doesn't allocate any memory for the data in
+   * vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -60,8 +57,8 @@ public IntervalMonthDayNanoVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a IntervalMonthDayNanoVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a IntervalMonthDayNanoVector. This doesn't allocate any memory for the data in
+   * vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -72,8 +69,8 @@ public IntervalMonthDayNanoVector(String name, FieldType fieldType, BufferAlloca
   }
 
   /**
-   * Instantiate a IntervalMonthDayNanoVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a IntervalMonthDayNanoVector. This doesn't allocate any memory for the data in
+   * vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -88,8 +85,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -98,36 +94,32 @@ public MinorType getMinorType() {
     return MinorType.INTERVALMONTHDAYNANO;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Given a data buffer, get the number of months stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the number of months stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
    * @param buffer data buffer
-   * @param index  position of the element.
+   * @param index position of the element.
    * @return day value stored at the index.
    */
   public static int getMonths(final ArrowBuf buffer, final int index) {
     return buffer.getInt((long) index * TYPE_WIDTH);
   }
 
-
   /**
-   * Given a data buffer, get the number of days stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the number of days stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
    * @param buffer data buffer
-   * @param index  position of the element.
+   * @param index position of the element.
    * @return day value stored at the index.
    */
   public static int getDays(final ArrowBuf buffer, final int index) {
@@ -135,13 +127,13 @@ public static int getDays(final ArrowBuf buffer, final int index) {
   }
 
   /**
-   * Given a data buffer, get the get the number of nanoseconds stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the get the number of nanoseconds stored at a particular position in
+   * the vector.
    *
    * <p>This method should not be used externally.
    *
    * @param buffer data buffer
-   * @param index  position of the element.
+   * @param index position of the element.
    * @return nanoseconds value stored at the index.
    */
   public static long getNanoseconds(final ArrowBuf buffer, final int index) {
@@ -151,7 +143,7 @@ public static long getNanoseconds(final ArrowBuf buffer, final int index) {
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public ArrowBuf get(int index) throws IllegalStateException {
@@ -162,11 +154,10 @@ public ArrowBuf get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableIntervalMonthDayNanoHolder holder) {
     if (isSet(index) == 0) {
@@ -183,7 +174,7 @@ public void get(int index, NullableIntervalMonthDayNanoHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -196,8 +187,8 @@ public PeriodDuration getObject(int index) {
       final int days = valueBuffer.getInt(startIndex + DAY_OFFSET);
       final long nanoseconds = valueBuffer.getLong(startIndex + NANOSECOND_OFFSET);
 
-      return new PeriodDuration(Period.ofMonths(months).plusDays(days),
-            Duration.ofNanos(nanoseconds));
+      return new PeriodDuration(
+          Period.ofMonths(months).plusDays(days), Duration.ofNanos(nanoseconds));
     }
   }
 
@@ -220,17 +211,16 @@ private StringBuilder getAsStringBuilderHelper(int index) {
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, ArrowBuf value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -240,7 +230,7 @@ public void set(int index, ArrowBuf value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index          position of element
+   * @param index position of element
    * @param months months component of interval
    * @param days days component of interval
    * @param nanoseconds nanosecond component of interval
@@ -254,14 +244,14 @@ public void set(int index, int months, int days, long nanoseconds) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
-  public void set(int index, NullableIntervalMonthDayNanoHolder holder) throws IllegalArgumentException {
+  public void set(int index, NullableIntervalMonthDayNanoHolder holder)
+      throws IllegalArgumentException {
     if (holder.isSet < 0) {
       throw new IllegalArgumentException();
     } else if (holder.isSet > 0) {
@@ -274,20 +264,19 @@ public void set(int index, NullableIntervalMonthDayNanoHolder holder) throws Ill
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, IntervalMonthDayNanoHolder holder) {
     set(index, holder.months, holder.days, holder.nanoseconds);
   }
 
   /**
-   * Same as {@link #set(int, ArrowBuf)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, ArrowBuf)} except that it handles the case when index is greater than
+   * or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, ArrowBuf value) {
     handleSafe(index);
@@ -295,14 +284,13 @@ public void setSafe(int index, ArrowBuf value) {
   }
 
   /**
-   * Same as {@link #set(int, int, int, long)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, int, int, long)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index          position of element
-   * @param months         months for the interval
-   * @param days           days for the interval
-   * @param nanoseconds   nanoseconds for the interval
+   * @param index position of element
+   * @param months months for the interval
+   * @param days days for the interval
+   * @param nanoseconds nanoseconds for the interval
    */
   public void setSafe(int index, int months, int days, long nanoseconds) {
     handleSafe(index);
@@ -310,25 +298,24 @@ public void setSafe(int index, int months, int days, long nanoseconds) {
   }
 
   /**
-   * Same as {@link #set(int, NullableIntervalMonthDayNanoHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableIntervalMonthDayNanoHolder)} except that it handles the case
+   * when index is greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
-  public void setSafe(int index, NullableIntervalMonthDayNanoHolder holder) throws IllegalArgumentException {
+  public void setSafe(int index, NullableIntervalMonthDayNanoHolder holder)
+      throws IllegalArgumentException {
     handleSafe(index);
     set(index, holder);
   }
 
   /**
-   * Same as {@link #set(int, IntervalMonthDayNanoHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, IntervalMonthDayNanoHolder)} except that it handles the case when
+   * index is greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, IntervalMonthDayNanoHolder holder) {
     handleSafe(index);
@@ -336,8 +323,8 @@ public void setSafe(int index, IntervalMonthDayNanoHolder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -354,9 +341,8 @@ public void set(int index, int isSet, int months, int days, long nanoseconds) {
   }
 
   /**
-   * Same as {@link #set(int, int, int, int, long)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, int, int, long)} except that it handles the case when index is
+   * greater than or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -364,23 +350,19 @@ public void set(int index, int isSet, int months, int days, long nanoseconds) {
    * @param days days component of interval
    * @param nanoseconds nanosecond component of interval
    */
-  public void setSafe(int index, int isSet, int months, int days,
-       long nanoseconds) {
+  public void setSafe(int index, int isSet, int months, int days, long nanoseconds) {
     handleSafe(index);
     set(index, isSet, months, days, nanoseconds);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -392,8 +374,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising of this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising of this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/IntervalYearVector.java b/java/vector/src/main/java/org/apache/arrow/vector/IntervalYearVector.java
index c5f384604aa83..92b46593a3ab6 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/IntervalYearVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/IntervalYearVector.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
 
 import java.time.Period;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.impl.IntervalYearReaderImpl;
@@ -33,16 +31,16 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * IntervalYearVector implements a fixed width (4 bytes) vector of
- * interval (years and months) values which could be null. A validity buffer
- * (bit vector) is maintained to track which elements in the vector are null.
+ * IntervalYearVector implements a fixed width (4 bytes) vector of interval (years and months)
+ * values which could be null. A validity buffer (bit vector) is maintained to track which elements
+ * in the vector are null.
  */
-public final class IntervalYearVector extends BaseFixedWidthVector {
+public final class IntervalYearVector extends BaseFixedWidthVector
+    implements ValueIterableVector<Period> {
   public static final byte TYPE_WIDTH = 4;
 
   /**
-   * Instantiate a IntervalYearVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a IntervalYearVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -52,8 +50,7 @@ public IntervalYearVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a IntervalYearVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a IntervalYearVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -64,8 +61,7 @@ public IntervalYearVector(String name, FieldType fieldType, BufferAllocator allo
   }
 
   /**
-   * Instantiate a IntervalYearVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a IntervalYearVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -80,8 +76,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -90,22 +85,19 @@ public MinorType getMinorType() {
     return MinorType.INTERVALYEAR;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
    * @param buffer data buffer
-   * @param index  position of the element.
+   * @param index position of the element.
    * @return value stored at the index.
    */
   public static int getTotalMonths(final ArrowBuf buffer, final int index) {
@@ -115,7 +107,7 @@ public static int getTotalMonths(final ArrowBuf buffer, final int index) {
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public int get(int index) throws IllegalStateException {
@@ -126,11 +118,10 @@ public int get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableIntervalYearHolder holder) {
     if (isSet(index) == 0) {
@@ -144,7 +135,7 @@ public void get(int index, NullableIntervalYearHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -162,8 +153,7 @@ public Period getObject(int index) {
    * Get the Interval value at a given index as a {@link StringBuilder} object.
    *
    * @param index position of the element
-   * @return String Builder object with Interval value as
-   *         [years, months]
+   * @return String Builder object with Interval value as [years, months]
    */
   public StringBuilder getAsStringBuilder(int index) {
     if (isSet(index) == 0) {
@@ -182,19 +172,14 @@ private StringBuilder getAsStringBuilderHelper(int index) {
     final String yearString = (Math.abs(years) == 1) ? " year " : " years ";
     final String monthString = (Math.abs(months) == 1) ? " month " : " months ";
 
-    return new StringBuilder()
-        .append(years)
-        .append(yearString)
-        .append(months)
-        .append(monthString);
+    return new StringBuilder().append(years).append(yearString).append(months).append(monthString);
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, int value) {
     valueBuffer.setInt((long) index * TYPE_WIDTH, value);
@@ -203,8 +188,8 @@ private void setValue(int index, int value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, int value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -212,12 +197,11 @@ public void set(int index, int value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableIntervalYearHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -233,8 +217,8 @@ public void set(int index, NullableIntervalYearHolder holder) throws IllegalArgu
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, IntervalYearHolder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -242,12 +226,11 @@ public void set(int index, IntervalYearHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, int)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, int)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, int value) {
     handleSafe(index);
@@ -255,25 +238,24 @@ public void setSafe(int index, int value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableIntervalYearHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableIntervalYearHolder)} except that it handles the case when
+   * index is greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
-  public void setSafe(int index, NullableIntervalYearHolder holder) throws IllegalArgumentException {
+  public void setSafe(int index, NullableIntervalYearHolder holder)
+      throws IllegalArgumentException {
     handleSafe(index);
     set(index, holder);
   }
 
   /**
-   * Same as {@link #set(int, IntervalYearHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, IntervalYearHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, IntervalYearHolder holder) {
     handleSafe(index);
@@ -281,8 +263,8 @@ public void setSafe(int index, IntervalYearHolder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -297,9 +279,8 @@ public void set(int index, int isSet, int value) {
   }
 
   /**
-   * Same as {@link #set(int, int, int)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, int)} except that it handles the case when index is greater than
+   * or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -310,17 +291,14 @@ public void setSafe(int index, int isSet, int value) {
     set(index, isSet, value);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -332,8 +310,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/LargeVarBinaryVector.java b/java/vector/src/main/java/org/apache/arrow/vector/LargeVarBinaryVector.java
index 8560ba3a68b04..f38627b933b6c 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/LargeVarBinaryVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/LargeVarBinaryVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import org.apache.arrow.memory.BufferAllocator;
@@ -29,16 +28,15 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * LargeVarBinaryVector implements a large variable width vector of binary
- * values which could be NULL. A validity buffer (bit vector) is maintained
- * to track which elements in the vector are null.
- * The size of the underlying buffer can be over 2GB.
+ * LargeVarBinaryVector implements a large variable width vector of binary values which could be
+ * NULL. A validity buffer (bit vector) is maintained to track which elements in the vector are
+ * null. The size of the underlying buffer can be over 2GB.
  */
-public final class LargeVarBinaryVector extends BaseLargeVariableWidthVector {
+public final class LargeVarBinaryVector extends BaseLargeVariableWidthVector
+    implements ValueIterableVector<byte[]> {
 
   /**
-   * Instantiate a LargeVarBinaryVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a LargeVarBinaryVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -48,8 +46,7 @@ public LargeVarBinaryVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a LargeVarBinaryVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a LargeVarBinaryVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -60,8 +57,7 @@ public LargeVarBinaryVector(String name, FieldType fieldType, BufferAllocator al
   }
 
   /**
-   * Instantiate a LargeVarBinaryVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a LargeVarBinaryVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -76,8 +72,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -86,18 +81,16 @@ public MinorType getMinorType() {
     return MinorType.LARGEVARBINARY;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the variable length element at specified index as byte array.
    *
-   * @param index   position of element to get
+   * @param index position of element to get
    * @return array of bytes for non-null element, null otherwise
    */
   public byte[] get(int index) {
@@ -113,12 +106,13 @@ public byte[] get(int index) {
   }
 
   /**
-   * Read the value at the given position to the given output buffer.
-   * The caller is responsible for checking for nullity first.
+   * Read the value at the given position to the given output buffer. The caller is responsible for
+   * checking for nullity first.
    *
    * @param index position of element.
    * @param buffer the buffer to write into.
    */
+  @Override
   public void read(int index, ReusableBuffer<?> buffer) {
     final long startOffset = getStartOffset(index);
     final long dataLength = getEndOffset(index) - startOffset;
@@ -128,7 +122,7 @@ public void read(int index, ReusableBuffer<?> buffer) {
   /**
    * Get the variable length element at specified index as Text.
    *
-   * @param index   position of element to get
+   * @param index position of element to get
    * @return byte array for non-null element, null otherwise
    */
   @Override
@@ -137,11 +131,10 @@ public byte[] getObject(int index) {
   }
 
   /**
-   * Get the variable length element at specified index and sets the state
-   * in provided holder.
+   * Get the variable length element at specified index and sets the state in provided holder.
    *
-   * @param index   position of element to get
-   * @param holder  data holder to be populated by this function
+   * @param index position of element to get
+   * @param holder data holder to be populated by this function
    */
   public void get(int index, NullableLargeVarBinaryHolder holder) {
     assert index >= 0;
@@ -155,20 +148,18 @@ public void get(int index, NullableLargeVarBinaryHolder holder) {
     holder.buffer = valueBuffer;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Set the variable length element at the specified index to the data
-   * buffer supplied in the holder.
+   * Set the variable length element at the specified index to the data buffer supplied in the
+   * holder.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void set(int index, LargeVarBinaryHolder holder) {
     assert index >= 0;
@@ -182,12 +173,11 @@ public void set(int index, LargeVarBinaryHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, LargeVarBinaryHolder)} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, LargeVarBinaryHolder)} except that it handles the case where index and
+   * length of new element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void setSafe(int index, LargeVarBinaryHolder holder) {
     assert index >= 0;
@@ -202,11 +192,11 @@ public void setSafe(int index, LargeVarBinaryHolder holder) {
   }
 
   /**
-   * Set the variable length element at the specified index to the data
-   * buffer supplied in the holder.
+   * Set the variable length element at the specified index to the data buffer supplied in the
+   * holder.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void set(int index, NullableLargeVarBinaryHolder holder) {
     assert index >= 0;
@@ -224,12 +214,11 @@ public void set(int index, NullableLargeVarBinaryHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, NullableLargeVarBinaryHolder)} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, NullableLargeVarBinaryHolder)} except that it handles the case where
+   * index and length of new element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void setSafe(int index, NullableLargeVarBinaryHolder holder) {
     assert index >= 0;
@@ -247,16 +236,14 @@ public void setSafe(int index, NullableLargeVarBinaryHolder holder) {
     lastSet = index;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising of this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising of this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/LargeVarCharVector.java b/java/vector/src/main/java/org/apache/arrow/vector/LargeVarCharVector.java
index df424c87488a0..07a9a172f0b74 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/LargeVarCharVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/LargeVarCharVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -33,18 +32,17 @@
 import org.apache.arrow.vector.validate.ValidateUtil;
 
 /**
- * LargeVarCharVector implements a variable width vector of VARCHAR
- * values which could be NULL. A validity buffer (bit vector) is maintained
- * to track which elements in the vector are null.
- * <p>
- *   The offset width of this vector is 8, so the underlying buffer can be larger than 2GB.
- * </p>
+ * LargeVarCharVector implements a variable width vector of VARCHAR values which could be NULL. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
+ *
+ * <p>The offset width of this vector is 8, so the underlying buffer can be larger than 2GB.
  */
-public final class LargeVarCharVector extends BaseLargeVariableWidthVector {
+public final class LargeVarCharVector extends BaseLargeVariableWidthVector
+    implements ValueIterableVector<Text> {
 
   /**
-   * Instantiate a LargeVarCharVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a LargeVarCharVector. This doesn't allocate any memory for the data in vector.
+   *
    * @param name name of the vector
    * @param allocator allocator for memory management.
    */
@@ -53,8 +51,8 @@ public LargeVarCharVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a LargeVarCharVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a LargeVarCharVector. This doesn't allocate any memory for the data in vector.
+   *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
    * @param allocator allocator for memory management.
@@ -64,8 +62,7 @@ public LargeVarCharVector(String name, FieldType fieldType, BufferAllocator allo
   }
 
   /**
-   * Instantiate a LargeVarCharVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a LargeVarCharVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -80,8 +77,8 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
+   *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
   @Override
@@ -89,20 +86,19 @@ public Types.MinorType getMinorType() {
     return Types.MinorType.LARGEVARCHAR;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the variable length element at specified index as byte array.
    *
-   * @param index   position of element to get
+   * @param index position of element to get
    * @return array of bytes for non-null element, null otherwise
    */
+  @Override
   public byte[] get(int index) {
     assert index >= 0;
     if (isSet(index) == 0) {
@@ -118,7 +114,7 @@ public byte[] get(int index) {
   /**
    * Get the variable length element at specified index as Text.
    *
-   * @param index   position of element to get
+   * @param index position of element to get
    * @return Text object for non-null element, null otherwise
    */
   @Override
@@ -134,12 +130,13 @@ public Text getObject(int index) {
   }
 
   /**
-   * Read the value at the given position to the given output buffer.
-   * The caller is responsible for checking for nullity first.
+   * Read the value at the given position to the given output buffer. The caller is responsible for
+   * checking for nullity first.
    *
    * @param index position of element.
    * @param buffer the buffer to write into.
    */
+  @Override
   public void read(int index, ReusableBuffer<?> buffer) {
     final long startOffset = getStartOffset(index);
     final long dataLength = getEndOffset(index) - startOffset;
@@ -147,11 +144,10 @@ public void read(int index, ReusableBuffer<?> buffer) {
   }
 
   /**
-   * Get the variable length element at specified index and sets the state
-   * in provided holder.
+   * Get the variable length element at specified index and sets the state in provided holder.
    *
-   * @param index   position of element to get
-   * @param holder  data holder to be populated by this function
+   * @param index position of element to get
+   * @param holder data holder to be populated by this function
    */
   public void get(int index, NullableLargeVarCharHolder holder) {
     assert index >= 0;
@@ -165,20 +161,18 @@ public void get(int index, NullableLargeVarCharHolder holder) {
     holder.buffer = valueBuffer;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Set the variable length element at the specified index to the data
-   * buffer supplied in the holder.
+   * Set the variable length element at the specified index to the data buffer supplied in the
+   * holder.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void set(int index, LargeVarCharHolder holder) {
     assert index >= 0;
@@ -192,12 +186,11 @@ public void set(int index, LargeVarCharHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, LargeVarCharHolder)} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, LargeVarCharHolder)} except that it handles the case where index and
+   * length of new element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void setSafe(int index, LargeVarCharHolder holder) {
     assert index >= 0;
@@ -212,11 +205,11 @@ public void setSafe(int index, LargeVarCharHolder holder) {
   }
 
   /**
-   * Set the variable length element at the specified index to the data
-   * buffer supplied in the holder.
+   * Set the variable length element at the specified index to the data buffer supplied in the
+   * holder.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void set(int index, NullableLargeVarCharHolder holder) {
     assert index >= 0;
@@ -234,12 +227,11 @@ public void set(int index, NullableLargeVarCharHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, NullableLargeVarCharHolder)} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, NullableLargeVarCharHolder)} except that it handles the case where
+   * index and length of new element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void setSafe(int index, NullableLargeVarCharHolder holder) {
     assert index >= 0;
@@ -258,23 +250,21 @@ public void setSafe(int index, NullableLargeVarCharHolder holder) {
   }
 
   /**
-   * Set the variable length element at the specified index to the
-   * content in supplied Text.
+   * Set the variable length element at the specified index to the content in supplied Text.
    *
-   * @param index   position of the element to set
-   * @param text    Text object with data
+   * @param index position of the element to set
+   * @param text Text object with data
    */
   public void set(int index, Text text) {
     set(index, text.getBytes(), 0, (int) text.getLength());
   }
 
   /**
-   * Same as {@link #set(int, NullableLargeVarCharHolder)} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, NullableLargeVarCharHolder)} except that it handles the case where
+   * index and length of new element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set.
-   * @param text    Text object with data
+   * @param index position of the element to set.
+   * @param text Text object with data
    */
   public void setSafe(int index, Text text) {
     setSafe(index, text.getBytes(), 0, (int) text.getLength());
@@ -285,21 +275,21 @@ public void validateScalars() {
     for (int i = 0; i < getValueCount(); ++i) {
       byte[] value = get(i);
       if (value != null) {
-        ValidateUtil.validateOrThrow(Text.validateUTF8NoThrow(value),
+        ValidateUtil.validateOrThrow(
+            Text.validateUTF8NoThrow(value),
             "Non-UTF-8 data in VarCharVector at position " + i + ".");
       }
     }
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising of this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/NullCheckingForGet.java b/java/vector/src/main/java/org/apache/arrow/vector/NullCheckingForGet.java
index 9961c72a4b39d..92432c6c0e33f 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/NullCheckingForGet.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/NullCheckingForGet.java
@@ -14,54 +14,49 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 /**
- * Configuration class to determine if null checking should be enabled or disabled for the "get" methods.
- * For example, the get method of class org.apache.arrow.vector.Float8Vector first checks if the value
- * at the given index is null, before retrieving the value. This configuration will turn on and off such checks.
+ * Configuration class to determine if null checking should be enabled or disabled for the "get"
+ * methods. For example, the get method of class org.apache.arrow.vector.Float8Vector first checks
+ * if the value at the given index is null, before retrieving the value. This configuration will
+ * turn on and off such checks.
+ *
+ * <p>Null checking is on by default. You can disable it by setting either the system property or
+ * the environmental variable to "false". The system property is named
+ * "arrow.enable_null_check_for_get" and the environmental variable is named
+ * "ARROW_ENABLE_NULL_CHECK_FOR_GET". When both the system property and the environmental variable
+ * are set, the system property takes precedence.
+ *
+ * <p>Disabling null-checking in the "get" methods may lead to performance improvements. For
+ * example, suppose we have the following micro-benchmark:
  *
- * <p>Null checking is on by default. You can disable it by setting either the system property or the
- * environmental variable to "false". The system property is named "arrow.enable_null_check_for_get" and
- * the environmental variable is named "ARROW_ENABLE_NULL_CHECK_FOR_GET".
- * When both the system property and the environmental variable are set, the system property takes precedence.
- * </p>
- * <p>
- * Disabling null-checking in the "get" methods may lead to performance improvements.
- * For example, suppose we have the following micro-benchmark:
- * </p>
  * <p>
- * <pre>{@code
  *
- *   Float8Vector vector = ...
+ * <pre>{@code
+ * Float8Vector vector = ...
  *
- *   public void test() {
- *     sum = 0;
- *     for (int i = 0; i < 1024; i++) {
- *       vector.set(i, i + 10.0);
- *       safeSum += vector.get(i);
- *     }
+ * public void test() {
+ *   sum = 0;
+ *   for (int i = 0; i < 1024; i++) {
+ *     vector.set(i, i + 10.0);
+ *     safeSum += vector.get(i);
  *   }
+ * }
  *
  * }</pre>
- * </p>
- * <p>
- * Performance evaluations of the micro-benchmark with the JMH framework reveal that, disabling null checking
- * has the following effects:
- * 1. The amounts of byte code and assembly code generated by JIT are both smaller.
- * 2. The performance improves by about 30% (2.819 ± 0.005  us/op vs. 4.069 ± 0.004  us/op).
- * </p>
- * <p>
- * Therefore, for scenarios where the user can be sure that the null-checking is unnecessary,
- * it is beneficial to disable it with this configuration.
- * </p>
+ *
+ * <p>Performance evaluations of the micro-benchmark with the JMH framework reveal that, disabling
+ * null checking has the following effects: 1. The amounts of byte code and assembly code generated
+ * by JIT are both smaller. 2. The performance improves by about 30% (2.819 ± 0.005 us/op vs. 4.069
+ * ± 0.004 us/op).
+ *
+ * <p>Therefore, for scenarios where the user can be sure that the null-checking is unnecessary, it
+ * is beneficial to disable it with this configuration.
  */
 public class NullCheckingForGet {
 
-  /**
-   * The flag to indicate if null checking is enabled for "get" methods.
-   */
+  /** The flag to indicate if null checking is enabled for "get" methods. */
   public static final boolean NULL_CHECKING_ENABLED;
 
   static {
@@ -79,6 +74,5 @@ public class NullCheckingForGet {
     NULL_CHECKING_ENABLED = !"false".equals(flagValue);
   }
 
-  private NullCheckingForGet() {
-  }
+  private NullCheckingForGet() {}
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/NullVector.java b/java/vector/src/main/java/org/apache/arrow/vector/NullVector.java
index 3b734bbf6608b..25e5bdc6f46a3 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/NullVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/NullVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.complex.BaseRepeatedValueVector.DATA_VECTOR_NAME;
@@ -22,7 +21,6 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.OutOfMemoryException;
@@ -39,10 +37,8 @@
 import org.apache.arrow.vector.util.CallBack;
 import org.apache.arrow.vector.util.TransferPair;
 
-/**
- * A null type vector.
- */
-public class NullVector implements FieldVector {
+/** A null type vector. */
+public class NullVector implements FieldVector, ValueIterableVector<Object> {
 
   private int valueCount;
 
@@ -70,7 +66,7 @@ public NullVector(String name, int valueCount) {
   /**
    * Instantiate a NullVector.
    *
-   * @param name      name of the vector
+   * @param name name of the vector
    * @param fieldType type of Field materialized by this vector.
    */
   public NullVector(String name, FieldType fieldType) {
@@ -103,16 +99,13 @@ public NullVector() {
   }
 
   @Override
-  public void close() {
-  }
+  public void close() {}
 
   @Override
-  public void clear() {
-  }
+  public void clear() {}
 
   @Override
-  public void reset() {
-  }
+  public void reset() {}
 
   @Override
   public Field getField() {
@@ -160,8 +153,7 @@ public boolean allocateNewSafe() {
   }
 
   @Override
-  public void reAlloc() {
-  }
+  public void reAlloc() {}
 
   @Override
   public BufferAllocator getAllocator() {
@@ -169,8 +161,7 @@ public BufferAllocator getAllocator() {
   }
 
   @Override
-  public void setInitialCapacity(int numRecords) {
-  }
+  public void setInitialCapacity(int numRecords) {}
 
   @Override
   public int getValueCapacity() {
@@ -233,8 +224,8 @@ public List<ArrowBuf> getFieldBuffers() {
   /**
    * Get the inner vectors.
    *
-   * @deprecated This API will be removed as the current implementations no longer support inner vectors.
-   *
+   * @deprecated This API will be removed as the current implementations no longer support inner
+   *     vectors.
    * @return the inner vectors for this field as defined by the TypeLayout
    */
   @Deprecated
@@ -293,15 +284,13 @@ public int getNullCount() {
     return this.valueCount;
   }
 
-
   /**
    * Set the element at the given index to null. In a NullVector, this is a no-op.
    *
    * @param index position of element
    */
   @Override
-  public void setNull(int index) {
-  }
+  public void setNull(int index) {}
 
   @Override
   public boolean isNull(int index) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/PeriodDuration.java b/java/vector/src/main/java/org/apache/arrow/vector/PeriodDuration.java
index ee48fe7972251..e1c9324375f50 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/PeriodDuration.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/PeriodDuration.java
@@ -14,19 +14,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
+import static java.time.temporal.ChronoUnit.DAYS;
+import static java.time.temporal.ChronoUnit.MONTHS;
+import static java.time.temporal.ChronoUnit.NANOS;
+import static java.time.temporal.ChronoUnit.SECONDS;
+import static java.time.temporal.ChronoUnit.YEARS;
+
 import java.time.Duration;
 import java.time.Period;
-
+import java.time.temporal.ChronoUnit;
+import java.time.temporal.Temporal;
+import java.time.temporal.TemporalAmount;
+import java.time.temporal.TemporalUnit;
+import java.time.temporal.UnsupportedTemporalTypeException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import org.apache.arrow.util.Preconditions;
 
-/**
- * Combination of Period and Duration for representing this interval type
- * as a POJO.
- */
-public class PeriodDuration {
+/** Combination of Period and Duration for representing this interval type as a POJO. */
+public class PeriodDuration implements TemporalAmount {
+
+  private static final List<TemporalUnit> SUPPORTED_UNITS =
+      Collections.unmodifiableList(
+          Arrays.<TemporalUnit>asList(YEARS, MONTHS, DAYS, SECONDS, NANOS));
   private final Period period;
   private final Duration duration;
 
@@ -43,6 +56,60 @@ public Duration getDuration() {
     return duration;
   }
 
+  @Override
+  public long get(TemporalUnit unit) {
+    if (unit instanceof ChronoUnit) {
+      switch ((ChronoUnit) unit) {
+        case YEARS:
+          return period.getYears();
+        case MONTHS:
+          return period.getMonths();
+        case DAYS:
+          return period.getDays();
+        case SECONDS:
+          return duration.getSeconds();
+        case NANOS:
+          return duration.getNano();
+        default:
+          break;
+      }
+    }
+    throw new UnsupportedTemporalTypeException("Unsupported TemporalUnit: " + unit);
+  }
+
+  @Override
+  public List<TemporalUnit> getUnits() {
+    return SUPPORTED_UNITS;
+  }
+
+  @Override
+  public Temporal addTo(Temporal temporal) {
+    return temporal.plus(period).plus(duration);
+  }
+
+  @Override
+  public Temporal subtractFrom(Temporal temporal) {
+    return temporal.minus(period).minus(duration);
+  }
+
+  /**
+   * Format this PeriodDuration as an ISO-8601 interval.
+   *
+   * @return An ISO-8601 formatted string representing the interval.
+   */
+  public String toISO8601IntervalString() {
+    if (duration.isZero()) {
+      return period.toString();
+    }
+    String durationString = duration.toString();
+    if (period.isZero()) {
+      return durationString;
+    }
+
+    // Remove 'P' from duration string and concatenate to produce an ISO-8601 representation
+    return period + durationString.substring(1);
+  }
+
   @Override
   public String toString() {
     return period.toString() + " " + duration.toString();
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/SchemaChangeCallBack.java b/java/vector/src/main/java/org/apache/arrow/vector/SchemaChangeCallBack.java
index b61e4a160fc0d..bfb803af09b88 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/SchemaChangeCallBack.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/SchemaChangeCallBack.java
@@ -14,37 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import org.apache.arrow.vector.util.CallBack;
 
-
 /**
- * Callback for when the Schema for the Vector changes (generally happens when a vector is promoted to a union type
- * from a single value type).
+ * Callback for when the Schema for the Vector changes (generally happens when a vector is promoted
+ * to a union type from a single value type).
  */
 public class SchemaChangeCallBack implements CallBack {
   private boolean schemaChanged = false;
 
-  /**
-   * Constructs a schema-change callback with the schema-changed state set to
-   * {@code false}.
-   */
-  public SchemaChangeCallBack() {
-  }
+  /** Constructs a schema-change callback with the schema-changed state set to {@code false}. */
+  public SchemaChangeCallBack() {}
 
-  /**
-   * Sets the schema-changed state to {@code true}.
-   */
+  /** Sets the schema-changed state to {@code true}. */
   @Override
   public void doWork() {
     schemaChanged = true;
   }
 
   /**
-   * Returns the value of schema-changed state, <strong>resetting</strong> the
-   * schema-changed state to {@code false}.
+   * Returns the value of schema-changed state, <strong>resetting</strong> the schema-changed state
+   * to {@code false}.
    *
    * @return the previous schema-changed state
    */
@@ -54,4 +46,3 @@ public boolean getSchemaChangedAndReset() {
     return current;
   }
 }
-
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/SmallIntVector.java b/java/vector/src/main/java/org/apache/arrow/vector/SmallIntVector.java
index 37a6fe110401e..c476694797c4d 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/SmallIntVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/SmallIntVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -31,16 +30,15 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * SmallIntVector implements a fixed width (2 bytes) vector of
- * short values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * SmallIntVector implements a fixed width (2 bytes) vector of short values which could be null. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
  */
-public final class SmallIntVector extends BaseFixedWidthVector implements BaseIntVector {
+public final class SmallIntVector extends BaseFixedWidthVector
+    implements BaseIntVector, ValueIterableVector<Short> {
   public static final byte TYPE_WIDTH = 2;
 
   /**
-   * Instantiate a SmallIntVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a SmallIntVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -50,8 +48,7 @@ public SmallIntVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a SmallIntVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a SmallIntVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -62,8 +59,7 @@ public SmallIntVector(String name, FieldType fieldType, BufferAllocator allocato
   }
 
   /**
-   * Instantiate a SmallIntVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a SmallIntVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -78,8 +74,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -88,18 +83,16 @@ public MinorType getMinorType() {
     return MinorType.SMALLINT;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public short get(int index) throws IllegalStateException {
@@ -110,11 +103,10 @@ public short get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableSmallIntHolder holder) {
     if (isSet(index) == 0) {
@@ -128,7 +120,7 @@ public void get(int index, NullableSmallIntHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -141,11 +133,10 @@ public Short getObject(int index) {
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, int value) {
     valueBuffer.setShort((long) index * TYPE_WIDTH, value);
@@ -158,8 +149,8 @@ private void setValue(int index, short value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, int value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -169,8 +160,8 @@ public void set(int index, int value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, short value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -178,12 +169,11 @@ public void set(int index, short value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableSmallIntHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -199,8 +189,8 @@ public void set(int index, NullableSmallIntHolder holder) throws IllegalArgument
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, SmallIntHolder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -208,12 +198,11 @@ public void set(int index, SmallIntHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, int)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, int)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, int value) {
     handleSafe(index);
@@ -221,12 +210,11 @@ public void setSafe(int index, int value) {
   }
 
   /**
-   * Same as {@link #set(int, short)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, short)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, short value) {
     handleSafe(index);
@@ -234,12 +222,11 @@ public void setSafe(int index, short value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableSmallIntHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableSmallIntHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableSmallIntHolder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -247,12 +234,11 @@ public void setSafe(int index, NullableSmallIntHolder holder) throws IllegalArgu
   }
 
   /**
-   * Same as {@link #set(int, SmallIntHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, SmallIntHolder)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, SmallIntHolder holder) {
     handleSafe(index);
@@ -260,8 +246,8 @@ public void setSafe(int index, SmallIntHolder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -276,9 +262,8 @@ public void set(int index, int isSet, short value) {
   }
 
   /**
-   * Same as {@link #set(int, int, short)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, short)} except that it handles the case when index is greater
+   * than or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -290,8 +275,7 @@ public void setSafe(int index, int isSet, short value) {
   }
 
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
@@ -303,16 +287,14 @@ public static short get(final ArrowBuf buffer, final int index) {
     return buffer.getShort((long) index * TYPE_WIDTH);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -324,8 +306,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeMicroVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeMicroVector.java
index c463dc36336c8..175303bbafc96 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/TimeMicroVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeMicroVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -31,17 +30,16 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * TimeMicroVector implements a fixed width vector (8 bytes) of
- * time (microsecond resolution) values which could be null.
- * A validity buffer (bit vector) is maintained to track which elements in the
+ * TimeMicroVector implements a fixed width vector (8 bytes) of time (microsecond resolution) values
+ * which could be null. A validity buffer (bit vector) is maintained to track which elements in the
  * vector are null.
  */
-public final class TimeMicroVector extends BaseFixedWidthVector {
+public final class TimeMicroVector extends BaseFixedWidthVector
+    implements ValueIterableVector<Long> {
   public static final byte TYPE_WIDTH = 8;
 
   /**
-   * Instantiate a TimeMicroVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeMicroVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -51,8 +49,7 @@ public TimeMicroVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a TimeMicroVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeMicroVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -63,8 +60,7 @@ public TimeMicroVector(String name, FieldType fieldType, BufferAllocator allocat
   }
 
   /**
-   * Instantiate a TimeMicroVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeMicroVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field Field materialized by this vector
    * @param allocator allocator for memory management.
@@ -79,8 +75,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -89,17 +84,16 @@ public MinorType getMinorType() {
     return MinorType.TIMEMICRO;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public long get(int index) throws IllegalStateException {
@@ -110,11 +104,10 @@ public long get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableTimeMicroHolder holder) {
     if (isSet(index) == 0) {
@@ -128,7 +121,7 @@ public void get(int index, NullableTimeMicroHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -141,11 +134,10 @@ public Long getObject(int index) {
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, long value) {
     valueBuffer.setLong((long) index * TYPE_WIDTH, value);
@@ -154,8 +146,8 @@ private void setValue(int index, long value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, long value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -163,12 +155,11 @@ public void set(int index, long value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableTimeMicroHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -184,8 +175,8 @@ public void set(int index, NullableTimeMicroHolder holder) throws IllegalArgumen
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, TimeMicroHolder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -193,12 +184,11 @@ public void set(int index, TimeMicroHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, long)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, long)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, long value) {
     handleSafe(index);
@@ -206,12 +196,11 @@ public void setSafe(int index, long value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableTimeMicroHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableTimeMicroHolder)} except that it handles the case when index
+   * is greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableTimeMicroHolder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -219,12 +208,11 @@ public void setSafe(int index, NullableTimeMicroHolder holder) throws IllegalArg
   }
 
   /**
-   * Same as {@link #set(int, TimeMicroHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, TimeMicroHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, TimeMicroHolder holder) {
     handleSafe(index);
@@ -232,8 +220,8 @@ public void setSafe(int index, TimeMicroHolder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -248,9 +236,8 @@ public void set(int index, int isSet, long value) {
   }
 
   /**
-   * Same as {@link #set(int, int, long)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, long)} except that it handles the case when index is greater than
+   * or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -262,8 +249,7 @@ public void setSafe(int index, int isSet, long value) {
   }
 
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
@@ -275,17 +261,14 @@ public static long get(final ArrowBuf buffer, int index) {
     return buffer.getLong((long) index * TYPE_WIDTH);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -297,8 +280,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeMilliVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeMilliVector.java
index 1e745d9b9923b..c9c673cd0a5d5 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/TimeMilliVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeMilliVector.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
 
 import java.time.LocalDateTime;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.impl.TimeMilliReaderImpl;
@@ -34,16 +32,16 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * TimeMilliVector implements a fixed width (4 bytes) vector of
- * time (millisecond resolution) values which could be null. A validity buffer
- * (bit vector) is maintained to track which elements in the vector are null.
+ * TimeMilliVector implements a fixed width (4 bytes) vector of time (millisecond resolution) values
+ * which could be null. A validity buffer (bit vector) is maintained to track which elements in the
+ * vector are null.
  */
-public final class TimeMilliVector extends BaseFixedWidthVector {
+public final class TimeMilliVector extends BaseFixedWidthVector
+    implements ValueIterableVector<LocalDateTime> {
   public static final byte TYPE_WIDTH = 4;
 
   /**
-   * Instantiate a TimeMilliVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeMilliVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -53,8 +51,7 @@ public TimeMilliVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a TimeMilliVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeMilliVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -65,8 +62,7 @@ public TimeMilliVector(String name, FieldType fieldType, BufferAllocator allocat
   }
 
   /**
-   * Instantiate a TimeMilliVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeMilliVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -81,8 +77,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -91,17 +86,16 @@ public MinorType getMinorType() {
     return MinorType.TIMEMILLI;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public int get(int index) throws IllegalStateException {
@@ -112,11 +106,10 @@ public int get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableTimeMilliHolder holder) {
     if (isSet(index) == 0) {
@@ -130,7 +123,7 @@ public void get(int index, NullableTimeMilliHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -143,13 +136,11 @@ public LocalDateTime getObject(int index) {
     return DateUtility.getLocalDateTimeFromEpochMilli(millis);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, int value) {
     valueBuffer.setInt((long) index * TYPE_WIDTH, value);
@@ -158,8 +149,8 @@ private void setValue(int index, int value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, int value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -167,12 +158,11 @@ public void set(int index, int value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableTimeMilliHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -188,8 +178,8 @@ public void set(int index, NullableTimeMilliHolder holder) throws IllegalArgumen
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, TimeMilliHolder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -197,12 +187,11 @@ public void set(int index, TimeMilliHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, int)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, int)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, int value) {
     handleSafe(index);
@@ -210,12 +199,11 @@ public void setSafe(int index, int value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableTimeMilliHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableTimeMilliHolder)} except that it handles the case when index
+   * is greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableTimeMilliHolder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -223,12 +211,11 @@ public void setSafe(int index, NullableTimeMilliHolder holder) throws IllegalArg
   }
 
   /**
-   * Same as {@link #set(int, TimeMilliHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, TimeMilliHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, TimeMilliHolder holder) {
     handleSafe(index);
@@ -236,8 +223,8 @@ public void setSafe(int index, TimeMilliHolder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -252,9 +239,8 @@ public void set(int index, int isSet, int value) {
   }
 
   /**
-   * Same as {@link #set(int, int, int)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, int)} except that it handles the case when index is greater than
+   * or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -265,10 +251,8 @@ public void setSafe(int index, int isSet, int value) {
     set(index, isSet, value);
   }
 
-
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
@@ -280,16 +264,14 @@ public static int get(final ArrowBuf buffer, final int index) {
     return buffer.getInt((long) index * TYPE_WIDTH);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -301,8 +283,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeNanoVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeNanoVector.java
index 426e865a5c18b..105d53d25f051 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/TimeNanoVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeNanoVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -31,16 +30,16 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * TimeNanoVector implements a fixed width vector (8 bytes) of
- * time (nanosecond resolution) values which could be null. A validity buffer
- * (bit vector) is maintained to track which elements in the vector are null.
+ * TimeNanoVector implements a fixed width vector (8 bytes) of time (nanosecond resolution) values
+ * which could be null. A validity buffer (bit vector) is maintained to track which elements in the
+ * vector are null.
  */
-public final class TimeNanoVector extends BaseFixedWidthVector {
+public final class TimeNanoVector extends BaseFixedWidthVector
+    implements ValueIterableVector<Long> {
   public static final byte TYPE_WIDTH = 8;
 
   /**
-   * Instantiate a TimeNanoVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeNanoVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -50,8 +49,7 @@ public TimeNanoVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a TimeNanoVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeNanoVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -62,8 +60,7 @@ public TimeNanoVector(String name, FieldType fieldType, BufferAllocator allocato
   }
 
   /**
-   * Instantiate a TimeNanoVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeNanoVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field Field materialized by this vector
    * @param allocator allocator for memory management.
@@ -78,8 +75,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -88,18 +84,16 @@ public MinorType getMinorType() {
     return MinorType.TIMENANO;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public long get(int index) throws IllegalStateException {
@@ -110,11 +104,10 @@ public long get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableTimeNanoHolder holder) {
     if (isSet(index) == 0) {
@@ -128,7 +121,7 @@ public void get(int index, NullableTimeNanoHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -140,13 +133,11 @@ public Long getObject(int index) {
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, long value) {
     valueBuffer.setLong((long) index * TYPE_WIDTH, value);
@@ -155,8 +146,8 @@ private void setValue(int index, long value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, long value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -164,12 +155,11 @@ public void set(int index, long value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableTimeNanoHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -185,8 +175,8 @@ public void set(int index, NullableTimeNanoHolder holder) throws IllegalArgument
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, TimeNanoHolder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -194,12 +184,11 @@ public void set(int index, TimeNanoHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, long)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, long)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, long value) {
     handleSafe(index);
@@ -207,12 +196,11 @@ public void setSafe(int index, long value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableTimeNanoHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableTimeNanoHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableTimeNanoHolder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -220,12 +208,11 @@ public void setSafe(int index, NullableTimeNanoHolder holder) throws IllegalArgu
   }
 
   /**
-   * Same as {@link #set(int, TimeNanoHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, TimeNanoHolder)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, TimeNanoHolder holder) {
     handleSafe(index);
@@ -233,8 +220,8 @@ public void setSafe(int index, TimeNanoHolder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -249,9 +236,8 @@ public void set(int index, int isSet, long value) {
   }
 
   /**
-   * Same as {@link #set(int, int, long)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, long)} except that it handles the case when index is greater than
+   * or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -263,8 +249,7 @@ public void setSafe(int index, int isSet, long value) {
   }
 
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
@@ -276,16 +261,14 @@ public static long get(final ArrowBuf buffer, final int index) {
     return buffer.getLong((long) index * TYPE_WIDTH);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -297,8 +280,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeSecVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeSecVector.java
index c760ed29e04e6..1b9dbf9193196 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/TimeSecVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeSecVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -31,16 +30,16 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * TimeSecVector implements a fixed width (4 bytes) vector of
- * time (seconds resolution) values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * TimeSecVector implements a fixed width (4 bytes) vector of time (seconds resolution) values which
+ * could be null. A validity buffer (bit vector) is maintained to track which elements in the vector
+ * are null.
  */
-public final class TimeSecVector extends BaseFixedWidthVector {
+public final class TimeSecVector extends BaseFixedWidthVector
+    implements ValueIterableVector<Integer> {
   public static final byte TYPE_WIDTH = 4;
 
   /**
-   * Instantiate a TimeSecVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeSecVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -50,8 +49,7 @@ public TimeSecVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a TimeSecVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeSecVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -62,8 +60,7 @@ public TimeSecVector(String name, FieldType fieldType, BufferAllocator allocator
   }
 
   /**
-   * Instantiate a TimeSecVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeSecVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field Field materialized by this vector
    * @param allocator allocator for memory management.
@@ -78,8 +75,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -88,18 +84,16 @@ public MinorType getMinorType() {
     return MinorType.TIMESEC;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public int get(int index) throws IllegalStateException {
@@ -110,11 +104,10 @@ public int get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableTimeSecHolder holder) {
     if (isSet(index) == 0) {
@@ -128,7 +121,7 @@ public void get(int index, NullableTimeSecHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -140,13 +133,11 @@ public Integer getObject(int index) {
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, int value) {
     valueBuffer.setInt((long) index * TYPE_WIDTH, value);
@@ -155,8 +146,8 @@ private void setValue(int index, int value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, int value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -164,12 +155,11 @@ public void set(int index, int value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableTimeSecHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -185,8 +175,8 @@ public void set(int index, NullableTimeSecHolder holder) throws IllegalArgumentE
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, TimeSecHolder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -194,12 +184,11 @@ public void set(int index, TimeSecHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, int)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, int)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, int value) {
     handleSafe(index);
@@ -207,12 +196,11 @@ public void setSafe(int index, int value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableTimeSecHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableTimeSecHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableTimeSecHolder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -220,12 +208,11 @@ public void setSafe(int index, NullableTimeSecHolder holder) throws IllegalArgum
   }
 
   /**
-   * Same as {@link #set(int, TimeSecHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, TimeSecHolder)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, TimeSecHolder holder) {
     handleSafe(index);
@@ -233,8 +220,8 @@ public void setSafe(int index, TimeSecHolder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -249,9 +236,8 @@ public void set(int index, int isSet, int value) {
   }
 
   /**
-   * Same as {@link #set(int, int, int)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, int)} except that it handles the case when index is greater than
+   * or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -263,8 +249,7 @@ public void setSafe(int index, int isSet, int value) {
   }
 
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
@@ -276,17 +261,14 @@ public static int get(final ArrowBuf buffer, final int index) {
     return buffer.getInt((long) index * TYPE_WIDTH);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -298,8 +280,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising of this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising of this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMicroTZVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMicroTZVector.java
index b515f8e2c83c0..abaefcfc1238b 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMicroTZVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMicroTZVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -32,27 +31,29 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * TimeStampMicroTZVector implements a fixed width vector (8 bytes) of
- * timestamp (microsecond resolution) values which could be null. A validity buffer
- * (bit vector) is maintained to track which elements in the vector are null.
+ * TimeStampMicroTZVector implements a fixed width vector (8 bytes) of timestamp (microsecond
+ * resolution) values which could be null. A validity buffer (bit vector) is maintained to track
+ * which elements in the vector are null.
  */
-public final class TimeStampMicroTZVector extends TimeStampVector {
+public final class TimeStampMicroTZVector extends TimeStampVector
+    implements ValueIterableVector<Long> {
   private final String timeZone;
 
   /**
-   * Instantiate a TimeStampMicroTZVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampMicroTZVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
    */
   public TimeStampMicroTZVector(String name, BufferAllocator allocator, String timeZone) {
-    this(name, FieldType.nullable(new ArrowType.Timestamp(TimeUnit.MICROSECOND, timeZone)), allocator);
+    this(
+        name,
+        FieldType.nullable(new ArrowType.Timestamp(TimeUnit.MICROSECOND, timeZone)),
+        allocator);
   }
 
   /**
-   * Instantiate a TimeStampMicroTZVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampMicroTZVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -65,8 +66,7 @@ public TimeStampMicroTZVector(String name, FieldType fieldType, BufferAllocator
   }
 
   /**
-   * Instantiate a TimeStampMicroTZVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampMicroTZVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field Field materialized by this vector
    * @param allocator allocator for memory management.
@@ -83,8 +83,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -102,20 +101,17 @@ public String getTimeZone() {
     return this.timeZone;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableTimeStampMicroTZHolder holder) {
     if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
@@ -130,7 +126,7 @@ public void get(int index, NullableTimeStampMicroTZHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -142,28 +138,28 @@ public Long getObject(int index) {
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
-  public void set(int index, NullableTimeStampMicroTZHolder holder) throws IllegalArgumentException {
+  public void set(int index, NullableTimeStampMicroTZHolder holder)
+      throws IllegalArgumentException {
     if (holder.isSet < 0) {
       throw new IllegalArgumentException();
     } else if (!this.timeZone.equals(holder.timezone)) {
       throw new IllegalArgumentException(
-          String.format("holder.timezone: %s not equal to vector timezone: %s", holder.timezone, this.timeZone));
+          String.format(
+              "holder.timezone: %s not equal to vector timezone: %s",
+              holder.timezone, this.timeZone));
     } else if (holder.isSet > 0) {
       BitVectorHelper.setBit(validityBuffer, index);
       setValue(index, holder.value);
@@ -175,55 +171,53 @@ public void set(int index, NullableTimeStampMicroTZHolder holder) throws Illegal
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, TimeStampMicroTZHolder holder) {
     if (!this.timeZone.equals(holder.timezone)) {
       throw new IllegalArgumentException(
-          String.format("holder.timezone: %s not equal to vector timezone: %s", holder.timezone, this.timeZone));
+          String.format(
+              "holder.timezone: %s not equal to vector timezone: %s",
+              holder.timezone, this.timeZone));
     }
     BitVectorHelper.setBit(validityBuffer, index);
     setValue(index, holder.value);
   }
 
   /**
-   * Same as {@link #set(int, NullableTimeStampMicroTZHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableTimeStampMicroTZHolder)} except that it handles the case when
+   * index is greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
-  public void setSafe(int index, NullableTimeStampMicroTZHolder holder) throws IllegalArgumentException {
+  public void setSafe(int index, NullableTimeStampMicroTZHolder holder)
+      throws IllegalArgumentException {
     handleSafe(index);
     set(index, holder);
   }
 
   /**
-   * Same as {@link #set(int, TimeStampMicroTZHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, TimeStampMicroTZHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, TimeStampMicroTZHolder holder) {
     handleSafe(index);
     set(index, holder);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -231,14 +225,12 @@ public void setSafe(int index, TimeStampMicroTZHolder holder) {
    */
   @Override
   public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
-    TimeStampMicroTZVector to = new TimeStampMicroTZVector(ref,
-            field.getFieldType(), allocator);
+    TimeStampMicroTZVector to = new TimeStampMicroTZVector(ref, field.getFieldType(), allocator);
     return new TransferImpl(to);
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMicroVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMicroVector.java
index 2f65921f22b26..5f22d075cae28 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMicroVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMicroVector.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
 
 import java.time.LocalDateTime;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.impl.TimeStampMicroReaderImpl;
 import org.apache.arrow.vector.complex.reader.FieldReader;
@@ -33,15 +31,15 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * TimeStampMicroVector implements a fixed width vector (8 bytes) of
- * timestamp (microsecond resolution) values which could be null. A validity buffer
- * (bit vector) is maintained to track which elements in the vector are null.
+ * TimeStampMicroVector implements a fixed width vector (8 bytes) of timestamp (microsecond
+ * resolution) values which could be null. A validity buffer (bit vector) is maintained to track
+ * which elements in the vector are null.
  */
-public final class TimeStampMicroVector extends TimeStampVector {
+public final class TimeStampMicroVector extends TimeStampVector
+    implements ValueIterableVector<LocalDateTime> {
 
   /**
-   * Instantiate a TimeStampMicroVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampMicroVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -51,8 +49,7 @@ public TimeStampMicroVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a TimeStampMicroVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampMicroVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -63,8 +60,7 @@ public TimeStampMicroVector(String name, FieldType fieldType, BufferAllocator al
   }
 
   /**
-   * Instantiate a TimeStampMicroVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampMicroVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field Field materialized by this vector
    * @param allocator allocator for memory management.
@@ -79,8 +75,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -89,20 +84,17 @@ public MinorType getMinorType() {
     return MinorType.TIMESTAMPMICRO;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableTimeStampMicroHolder holder) {
     if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
@@ -116,7 +108,7 @@ public void get(int index, NullableTimeStampMicroHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -129,21 +121,18 @@ public LocalDateTime getObject(int index) {
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableTimeStampMicroHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -159,8 +148,8 @@ public void set(int index, NullableTimeStampMicroHolder holder) throws IllegalAr
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, TimeStampMicroHolder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -168,42 +157,38 @@ public void set(int index, TimeStampMicroHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, NullableTimeStampMicroHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableTimeStampMicroHolder)} except that it handles the case when
+   * index is greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
-  public void setSafe(int index, NullableTimeStampMicroHolder holder) throws IllegalArgumentException {
+  public void setSafe(int index, NullableTimeStampMicroHolder holder)
+      throws IllegalArgumentException {
     handleSafe(index);
     set(index, holder);
   }
 
   /**
-   * Same as {@link #set(int, TimeStampMicroHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, TimeStampMicroHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, TimeStampMicroHolder holder) {
     handleSafe(index);
     set(index, holder);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -211,14 +196,12 @@ public void setSafe(int index, TimeStampMicroHolder holder) {
    */
   @Override
   public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
-    TimeStampMicroVector to = new TimeStampMicroVector(ref,
-            field.getFieldType(), allocator);
+    TimeStampMicroVector to = new TimeStampMicroVector(ref, field.getFieldType(), allocator);
     return new TransferImpl(to);
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMilliTZVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMilliTZVector.java
index d0293099432a9..b5e5fb1be17b4 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMilliTZVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMilliTZVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -32,27 +31,29 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * TimeStampMilliTZVector implements a fixed width vector (8 bytes) of
- * timestamp (millisecond resolution) values which could be null. A validity buffer
- * (bit vector) is maintained to track which elements in the vector are null.
+ * TimeStampMilliTZVector implements a fixed width vector (8 bytes) of timestamp (millisecond
+ * resolution) values which could be null. A validity buffer (bit vector) is maintained to track
+ * which elements in the vector are null.
  */
-public final class TimeStampMilliTZVector extends TimeStampVector {
+public final class TimeStampMilliTZVector extends TimeStampVector
+    implements ValueIterableVector<Long> {
   private final String timeZone;
 
   /**
-   * Instantiate a TimeStampMilliTZVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampMilliTZVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
    */
   public TimeStampMilliTZVector(String name, BufferAllocator allocator, String timeZone) {
-    this(name, FieldType.nullable(new ArrowType.Timestamp(TimeUnit.MILLISECOND, timeZone)), allocator);
+    this(
+        name,
+        FieldType.nullable(new ArrowType.Timestamp(TimeUnit.MILLISECOND, timeZone)),
+        allocator);
   }
 
   /**
-   * Instantiate a TimeStampMilliTZVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampMilliTZVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -65,8 +66,7 @@ public TimeStampMilliTZVector(String name, FieldType fieldType, BufferAllocator
   }
 
   /**
-   * Instantiate a TimeStampMilliTZVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampMilliTZVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field Field materialized by this vector
    * @param allocator allocator for memory management.
@@ -83,8 +83,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -102,20 +101,17 @@ public String getTimeZone() {
     return this.timeZone;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableTimeStampMilliTZHolder holder) {
     if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
@@ -130,7 +126,7 @@ public void get(int index, NullableTimeStampMilliTZHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -142,28 +138,28 @@ public Long getObject(int index) {
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
-  public void set(int index, NullableTimeStampMilliTZHolder holder) throws IllegalArgumentException {
+  public void set(int index, NullableTimeStampMilliTZHolder holder)
+      throws IllegalArgumentException {
     if (holder.isSet < 0) {
       throw new IllegalArgumentException();
     } else if (!this.timeZone.equals(holder.timezone)) {
       throw new IllegalArgumentException(
-          String.format("holder.timezone: %s not equal to vector timezone: %s", holder.timezone, this.timeZone));
+          String.format(
+              "holder.timezone: %s not equal to vector timezone: %s",
+              holder.timezone, this.timeZone));
     } else if (holder.isSet > 0) {
       BitVectorHelper.setBit(validityBuffer, index);
       setValue(index, holder.value);
@@ -175,54 +171,53 @@ public void set(int index, NullableTimeStampMilliTZHolder holder) throws Illegal
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, TimeStampMilliTZHolder holder) {
     if (!this.timeZone.equals(holder.timezone)) {
       throw new IllegalArgumentException(
-          String.format("holder.timezone: %s not equal to vector timezone: %s", holder.timezone, this.timeZone));
+          String.format(
+              "holder.timezone: %s not equal to vector timezone: %s",
+              holder.timezone, this.timeZone));
     }
     BitVectorHelper.setBit(validityBuffer, index);
     setValue(index, holder.value);
   }
 
   /**
-   * Same as {@link #set(int, NullableTimeStampMilliTZHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableTimeStampMilliTZHolder)} except that it handles the case when
+   * index is greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
-  public void setSafe(int index, NullableTimeStampMilliTZHolder holder) throws IllegalArgumentException {
+  public void setSafe(int index, NullableTimeStampMilliTZHolder holder)
+      throws IllegalArgumentException {
     handleSafe(index);
     set(index, holder);
   }
 
   /**
-   * Same as {@link #set(int, TimeStampMilliTZHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, TimeStampMilliTZHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, TimeStampMilliTZHolder holder) {
     handleSafe(index);
     set(index, holder);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -230,14 +225,12 @@ public void setSafe(int index, TimeStampMilliTZHolder holder) {
    */
   @Override
   public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
-    TimeStampMilliTZVector to = new TimeStampMilliTZVector(ref,
-            field.getFieldType(), allocator);
+    TimeStampMilliTZVector to = new TimeStampMilliTZVector(ref, field.getFieldType(), allocator);
     return new TransferImpl(to);
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMilliVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMilliVector.java
index 96440fd5ac3f7..cf9a42770a6de 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMilliVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMilliVector.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
 
 import java.time.LocalDateTime;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.impl.TimeStampMilliReaderImpl;
 import org.apache.arrow.vector.complex.reader.FieldReader;
@@ -33,15 +31,15 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * TimeStampMilliVector implements a fixed width vector (8 bytes) of
- * timestamp (millisecond resolution) values which could be null. A validity buffer
- * (bit vector) is maintained to track which elements in the vector are null.
+ * TimeStampMilliVector implements a fixed width vector (8 bytes) of timestamp (millisecond
+ * resolution) values which could be null. A validity buffer (bit vector) is maintained to track
+ * which elements in the vector are null.
  */
-public final class TimeStampMilliVector extends TimeStampVector {
+public final class TimeStampMilliVector extends TimeStampVector
+    implements ValueIterableVector<LocalDateTime> {
 
   /**
-   * Instantiate a TimeStampMilliVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampMilliVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -51,8 +49,7 @@ public TimeStampMilliVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a TimeStampMilliVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampMilliVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -63,8 +60,7 @@ public TimeStampMilliVector(String name, FieldType fieldType, BufferAllocator al
   }
 
   /**
-   * Instantiate a TimeStampMilliVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampMilliVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -79,8 +75,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -89,20 +84,17 @@ public MinorType getMinorType() {
     return MinorType.TIMESTAMPMILLI;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableTimeStampMilliHolder holder) {
     if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
@@ -116,7 +108,7 @@ public void get(int index, NullableTimeStampMilliHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -129,21 +121,18 @@ public LocalDateTime getObject(int index) {
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableTimeStampMilliHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -159,8 +148,8 @@ public void set(int index, NullableTimeStampMilliHolder holder) throws IllegalAr
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, TimeStampMilliHolder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -168,42 +157,38 @@ public void set(int index, TimeStampMilliHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, NullableTimeStampMilliHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableTimeStampMilliHolder)} except that it handles the case when
+   * index is greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
-  public void setSafe(int index, NullableTimeStampMilliHolder holder) throws IllegalArgumentException {
+  public void setSafe(int index, NullableTimeStampMilliHolder holder)
+      throws IllegalArgumentException {
     handleSafe(index);
     set(index, holder);
   }
 
   /**
-   * Same as {@link #set(int, TimeStampMilliHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, TimeStampMilliHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, TimeStampMilliHolder holder) {
     handleSafe(index);
     set(index, holder);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -211,14 +196,12 @@ public void setSafe(int index, TimeStampMilliHolder holder) {
    */
   @Override
   public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
-    TimeStampMilliVector to = new TimeStampMilliVector(ref,
-            field.getFieldType(), allocator);
+    TimeStampMilliVector to = new TimeStampMilliVector(ref, field.getFieldType(), allocator);
     return new TransferImpl(to);
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampNanoTZVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampNanoTZVector.java
index f93ec9b24c43a..2386b3a8598e3 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampNanoTZVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampNanoTZVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -32,27 +31,29 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * TimeStampNanoTZVector implements a fixed width vector (8 bytes) of
- * timestamp (nanosecond resolution) values which could be null. A validity buffer
- * (bit vector) is maintained to track which elements in the vector are null.
+ * TimeStampNanoTZVector implements a fixed width vector (8 bytes) of timestamp (nanosecond
+ * resolution) values which could be null. A validity buffer (bit vector) is maintained to track
+ * which elements in the vector are null.
  */
-public final class TimeStampNanoTZVector extends TimeStampVector {
+public final class TimeStampNanoTZVector extends TimeStampVector
+    implements ValueIterableVector<Long> {
   private final String timeZone;
 
   /**
-   * Instantiate a TimeStampNanoTZVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampNanoTZVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
    */
   public TimeStampNanoTZVector(String name, BufferAllocator allocator, String timeZone) {
-    this(name, FieldType.nullable(new ArrowType.Timestamp(TimeUnit.NANOSECOND, timeZone)), allocator);
+    this(
+        name,
+        FieldType.nullable(new ArrowType.Timestamp(TimeUnit.NANOSECOND, timeZone)),
+        allocator);
   }
 
   /**
-   * Instantiate a TimeStampNanoTZVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampNanoTZVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -65,8 +66,7 @@ public TimeStampNanoTZVector(String name, FieldType fieldType, BufferAllocator a
   }
 
   /**
-   * Instantiate a TimeStampNanoTZVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampNanoTZVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field Field materialized by this vector
    * @param allocator allocator for memory management.
@@ -83,8 +83,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -102,20 +101,17 @@ public String getTimeZone() {
     return this.timeZone;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableTimeStampNanoTZHolder holder) {
     if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
@@ -130,7 +126,7 @@ public void get(int index, NullableTimeStampNanoTZHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -142,28 +138,27 @@ public Long getObject(int index) {
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableTimeStampNanoTZHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
       throw new IllegalArgumentException();
     } else if (!this.timeZone.equals(holder.timezone)) {
       throw new IllegalArgumentException(
-          String.format("holder.timezone: %s not equal to vector timezone: %s", holder.timezone, this.timeZone));
+          String.format(
+              "holder.timezone: %s not equal to vector timezone: %s",
+              holder.timezone, this.timeZone));
     } else if (holder.isSet > 0) {
       BitVectorHelper.setBit(validityBuffer, index);
       setValue(index, holder.value);
@@ -175,57 +170,53 @@ public void set(int index, NullableTimeStampNanoTZHolder holder) throws IllegalA
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, TimeStampNanoTZHolder holder) {
     if (!this.timeZone.equals(holder.timezone)) {
       throw new IllegalArgumentException(
-          String.format("holder.timezone: %s not equal to vector timezone: %s", holder.timezone, this.timeZone));
+          String.format(
+              "holder.timezone: %s not equal to vector timezone: %s",
+              holder.timezone, this.timeZone));
     }
     BitVectorHelper.setBit(validityBuffer, index);
     setValue(index, holder.value);
   }
 
   /**
-   * Same as {@link #set(int, NullableTimeStampNanoTZHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableTimeStampNanoTZHolder)} except that it handles the case when
+   * index is greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
-  public void setSafe(
-      int index,
-      NullableTimeStampNanoTZHolder holder) throws IllegalArgumentException {
+  public void setSafe(int index, NullableTimeStampNanoTZHolder holder)
+      throws IllegalArgumentException {
     handleSafe(index);
     set(index, holder);
   }
 
   /**
-   * Same as {@link #set(int, TimeStampNanoTZHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, TimeStampNanoTZHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, TimeStampNanoTZHolder holder) {
     handleSafe(index);
     set(index, holder);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -233,14 +224,12 @@ public void setSafe(int index, TimeStampNanoTZHolder holder) {
    */
   @Override
   public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
-    TimeStampNanoTZVector to = new TimeStampNanoTZVector(ref,
-            field.getFieldType(), allocator);
+    TimeStampNanoTZVector to = new TimeStampNanoTZVector(ref, field.getFieldType(), allocator);
     return new TransferImpl(to);
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampNanoVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampNanoVector.java
index 723e62f8d6e02..ee221990253ca 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampNanoVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampNanoVector.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
 
 import java.time.LocalDateTime;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.impl.TimeStampNanoReaderImpl;
 import org.apache.arrow.vector.complex.reader.FieldReader;
@@ -33,15 +31,15 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * TimeStampNanoVector implements a fixed width vector (8 bytes) of
- * timestamp (nanosecond resolution) values which could be null. A validity buffer
- * (bit vector) is maintained to track which elements in the vector are null.
+ * TimeStampNanoVector implements a fixed width vector (8 bytes) of timestamp (nanosecond
+ * resolution) values which could be null. A validity buffer (bit vector) is maintained to track
+ * which elements in the vector are null.
  */
-public final class TimeStampNanoVector extends TimeStampVector {
+public final class TimeStampNanoVector extends TimeStampVector
+    implements ValueIterableVector<LocalDateTime> {
 
   /**
-   * Instantiate a TimeStampNanoVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampNanoVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -51,8 +49,7 @@ public TimeStampNanoVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a TimeStampNanoVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampNanoVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -63,8 +60,7 @@ public TimeStampNanoVector(String name, FieldType fieldType, BufferAllocator all
   }
 
   /**
-   * Instantiate a TimeStampNanoVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampNanoVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field Field materialized by this vector
    * @param allocator allocator for memory management.
@@ -79,8 +75,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -89,20 +84,17 @@ public MinorType getMinorType() {
     return MinorType.TIMESTAMPNANO;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableTimeStampNanoHolder holder) {
     if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
@@ -116,7 +108,7 @@ public void get(int index, NullableTimeStampNanoHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -129,21 +121,18 @@ public LocalDateTime getObject(int index) {
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableTimeStampNanoHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -159,8 +148,8 @@ public void set(int index, NullableTimeStampNanoHolder holder) throws IllegalArg
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, TimeStampNanoHolder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -168,42 +157,38 @@ public void set(int index, TimeStampNanoHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, NullableTimeStampNanoHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableTimeStampNanoHolder)} except that it handles the case when
+   * index is greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
-  public void setSafe(int index, NullableTimeStampNanoHolder holder) throws IllegalArgumentException {
+  public void setSafe(int index, NullableTimeStampNanoHolder holder)
+      throws IllegalArgumentException {
     handleSafe(index);
     set(index, holder);
   }
 
   /**
-   * Same as {@link #set(int, TimeStampNanoHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, TimeStampNanoHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, TimeStampNanoHolder holder) {
     handleSafe(index);
     set(index, holder);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -211,14 +196,12 @@ public void setSafe(int index, TimeStampNanoHolder holder) {
    */
   @Override
   public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
-    TimeStampNanoVector to = new TimeStampNanoVector(ref,
-            field.getFieldType(), allocator);
+    TimeStampNanoVector to = new TimeStampNanoVector(ref, field.getFieldType(), allocator);
     return new TransferImpl(to);
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampSecTZVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampSecTZVector.java
index 5837e9d851530..f1774f27035cb 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampSecTZVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampSecTZVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -32,16 +31,16 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * TimeStampSecTZVector implements a fixed width vector (8 bytes) of
- * timestamp (seconds resolution) values which could be null. A validity buffer
- * (bit vector) is maintained to track which elements in the vector are null.
+ * TimeStampSecTZVector implements a fixed width vector (8 bytes) of timestamp (seconds resolution)
+ * values which could be null. A validity buffer (bit vector) is maintained to track which elements
+ * in the vector are null.
  */
-public final class TimeStampSecTZVector extends TimeStampVector {
+public final class TimeStampSecTZVector extends TimeStampVector
+    implements ValueIterableVector<Long> {
   private final String timeZone;
 
   /**
-   * Instantiate a TimeStampSecTZVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampSecTZVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -51,8 +50,7 @@ public TimeStampSecTZVector(String name, BufferAllocator allocator, String timeZ
   }
 
   /**
-   * Instantiate a TimeStampSecTZVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampSecTZVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -65,8 +63,7 @@ public TimeStampSecTZVector(String name, FieldType fieldType, BufferAllocator al
   }
 
   /**
-   * Instantiate a TimeStampSecTZVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampSecTZVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field Field materialized by this vector
    * @param allocator allocator for memory management.
@@ -83,8 +80,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -102,20 +98,17 @@ public String getTimeZone() {
     return this.timeZone;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableTimeStampSecTZHolder holder) {
     if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
@@ -130,7 +123,7 @@ public void get(int index, NullableTimeStampSecTZHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public Long getObject(int index) {
@@ -141,28 +134,27 @@ public Long getObject(int index) {
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableTimeStampSecTZHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
       throw new IllegalArgumentException();
     } else if (!this.timeZone.equals(holder.timezone)) {
       throw new IllegalArgumentException(
-          String.format("holder.timezone: %s not equal to vector timezone: %s", holder.timezone, this.timeZone));
+          String.format(
+              "holder.timezone: %s not equal to vector timezone: %s",
+              holder.timezone, this.timeZone));
     } else if (holder.isSet > 0) {
       BitVectorHelper.setBit(validityBuffer, index);
       setValue(index, holder.value);
@@ -174,54 +166,53 @@ public void set(int index, NullableTimeStampSecTZHolder holder) throws IllegalAr
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, TimeStampSecTZHolder holder) {
     if (!this.timeZone.equals(holder.timezone)) {
       throw new IllegalArgumentException(
-          String.format("holder.timezone: %s not equal to vector timezone: %s", holder.timezone, this.timeZone));
+          String.format(
+              "holder.timezone: %s not equal to vector timezone: %s",
+              holder.timezone, this.timeZone));
     }
     BitVectorHelper.setBit(validityBuffer, index);
     setValue(index, holder.value);
   }
 
   /**
-   * Same as {@link #set(int, NullableTimeStampSecTZHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableTimeStampSecTZHolder)} except that it handles the case when
+   * index is greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
-  public void setSafe(int index, NullableTimeStampSecTZHolder holder) throws IllegalArgumentException {
+  public void setSafe(int index, NullableTimeStampSecTZHolder holder)
+      throws IllegalArgumentException {
     handleSafe(index);
     set(index, holder);
   }
 
   /**
-   * Same as {@link #set(int, TimeStampSecTZHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, TimeStampSecTZHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, TimeStampSecTZHolder holder) {
     handleSafe(index);
     set(index, holder);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising of this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising of this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -229,14 +220,12 @@ public void setSafe(int index, TimeStampSecTZHolder holder) {
    */
   @Override
   public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
-    TimeStampSecTZVector to = new TimeStampSecTZVector(ref,
-            field.getFieldType(), allocator);
+    TimeStampSecTZVector to = new TimeStampSecTZVector(ref, field.getFieldType(), allocator);
     return new TransferImpl(to);
   }
 
   /**
-   * Construct a TransferPair comprising of this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising of this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampSecVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampSecVector.java
index 2de01fd52e457..fb79194cc0e19 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampSecVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampSecVector.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
 
 import java.time.LocalDateTime;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.impl.TimeStampSecReaderImpl;
 import org.apache.arrow.vector.complex.reader.FieldReader;
@@ -33,15 +31,15 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * TimeStampSecVector implements a fixed width vector (8 bytes) of
- * timestamp (seconds resolution) values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * TimeStampSecVector implements a fixed width vector (8 bytes) of timestamp (seconds resolution)
+ * values which could be null. A validity buffer (bit vector) is maintained to track which elements
+ * in the vector are null.
  */
-public final class TimeStampSecVector extends TimeStampVector {
+public final class TimeStampSecVector extends TimeStampVector
+    implements ValueIterableVector<LocalDateTime> {
 
   /**
-   * Instantiate a TimeStampSecVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampSecVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -51,8 +49,7 @@ public TimeStampSecVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a TimeStampSecVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampSecVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -63,8 +60,7 @@ public TimeStampSecVector(String name, FieldType fieldType, BufferAllocator allo
   }
 
   /**
-   * Instantiate a TimeStampSecVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampSecVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field Field materialized by this vector
    * @param allocator allocator for memory management.
@@ -79,8 +75,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -89,20 +84,17 @@ public MinorType getMinorType() {
     return MinorType.TIMESTAMPSEC;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableTimeStampSecHolder holder) {
     if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
@@ -116,7 +108,7 @@ public void get(int index, NullableTimeStampSecHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -130,21 +122,18 @@ public LocalDateTime getObject(int index) {
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableTimeStampSecHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -160,8 +149,8 @@ public void set(int index, NullableTimeStampSecHolder holder) throws IllegalArgu
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, TimeStampSecHolder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -169,42 +158,38 @@ public void set(int index, TimeStampSecHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, NullableTimeStampSecHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableTimeStampSecHolder)} except that it handles the case when
+   * index is greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
-  public void setSafe(int index, NullableTimeStampSecHolder holder) throws IllegalArgumentException {
+  public void setSafe(int index, NullableTimeStampSecHolder holder)
+      throws IllegalArgumentException {
     handleSafe(index);
     set(index, holder);
   }
 
   /**
-   * Same as {@link #set(int, TimeStampSecHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, TimeStampSecHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, TimeStampSecHolder holder) {
     handleSafe(index);
     set(index, holder);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -212,14 +197,12 @@ public void setSafe(int index, TimeStampSecHolder holder) {
    */
   @Override
   public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
-    TimeStampSecVector to = new TimeStampSecVector(ref,
-            field.getFieldType(), allocator);
+    TimeStampSecVector to = new TimeStampSecVector(ref, field.getFieldType(), allocator);
     return new TransferImpl(to);
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampVector.java
index d85a793fb899f..59499581c321a 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -26,16 +25,15 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * TimeStampVector is an abstract interface for fixed width vector (8 bytes)
- * of timestamp values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * TimeStampVector is an abstract interface for fixed width vector (8 bytes) of timestamp values
+ * which could be null. A validity buffer (bit vector) is maintained to track which elements in the
+ * vector are null.
  */
 public abstract class TimeStampVector extends BaseFixedWidthVector {
   public static final byte TYPE_WIDTH = 8;
 
   /**
-   * Instantiate a TimeStampVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -46,8 +44,7 @@ public TimeStampVector(String name, FieldType fieldType, BufferAllocator allocat
   }
 
   /**
-   * Instantiate a TimeStampVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TimeStampVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -56,17 +53,16 @@ public TimeStampVector(Field field, BufferAllocator allocator) {
     super(field, allocator, TYPE_WIDTH);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public long get(int index) throws IllegalStateException {
@@ -76,13 +72,11 @@ public long get(int index) throws IllegalStateException {
     return valueBuffer.getLong((long) index * TYPE_WIDTH);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   protected void setValue(int index, long value) {
     valueBuffer.setLong((long) index * TYPE_WIDTH, value);
@@ -91,8 +85,8 @@ protected void setValue(int index, long value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, long value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -100,12 +94,11 @@ public void set(int index, long value) {
   }
 
   /**
-   * Same as {@link #set(int, long)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, long)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, long value) {
     handleSafe(index);
@@ -113,8 +106,8 @@ public void setSafe(int index, long value) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -129,9 +122,8 @@ public void set(int index, int isSet, long value) {
   }
 
   /**
-   * Same as {@link #set(int, int, long)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, long)} except that it handles the case when index is greater than
+   * or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -143,8 +135,7 @@ public void setSafe(int index, int isSet, long value) {
   }
 
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
@@ -156,17 +147,13 @@ public static long get(final ArrowBuf buffer, final int index) {
     return buffer.getLong((long) index * TYPE_WIDTH);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
-  /**
-   * {@link TransferPair} for {@link TimeStampVector}.
-   */
+  /** {@link TransferPair} for {@link TimeStampVector}. */
   public class TransferImpl implements TransferPair {
     TimeStampVector to;
 
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TinyIntVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TinyIntVector.java
index e9ea59298d093..022475e5e1b05 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/TinyIntVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/TinyIntVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -31,16 +30,15 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * TinyIntVector implements a fixed width (1 bytes) vector of
- * byte values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * TinyIntVector implements a fixed width (1 bytes) vector of byte values which could be null. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
  */
-public final class TinyIntVector extends BaseFixedWidthVector implements BaseIntVector {
+public final class TinyIntVector extends BaseFixedWidthVector
+    implements BaseIntVector, ValueIterableVector<Byte> {
   public static final byte TYPE_WIDTH = 1;
 
   /**
-   * Instantiate a TinyIntVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TinyIntVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -50,8 +48,7 @@ public TinyIntVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a TinyIntVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TinyIntVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -62,8 +59,7 @@ public TinyIntVector(String name, FieldType fieldType, BufferAllocator allocator
   }
 
   /**
-   * Instantiate a TinyIntVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a TinyIntVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -78,8 +74,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -88,18 +83,16 @@ public MinorType getMinorType() {
     return MinorType.TINYINT;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public byte get(int index) throws IllegalStateException {
@@ -110,11 +103,10 @@ public byte get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableTinyIntHolder holder) {
     if (isSet(index) == 0) {
@@ -128,7 +120,7 @@ public void get(int index, NullableTinyIntHolder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -140,12 +132,11 @@ public Byte getObject(int index) {
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, int value) {
     valueBuffer.setByte(index * TYPE_WIDTH, value);
@@ -158,8 +149,8 @@ private void setValue(int index, byte value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, int value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -169,8 +160,8 @@ public void set(int index, int value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, byte value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -178,12 +169,11 @@ public void set(int index, byte value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableTinyIntHolder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -199,8 +189,8 @@ public void set(int index, NullableTinyIntHolder holder) throws IllegalArgumentE
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, TinyIntHolder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -208,12 +198,11 @@ public void set(int index, TinyIntHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, int)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, int)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, int value) {
     handleSafe(index);
@@ -221,12 +210,11 @@ public void setSafe(int index, int value) {
   }
 
   /**
-   * Same as {@link #set(int, byte)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, byte)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, byte value) {
     handleSafe(index);
@@ -234,12 +222,11 @@ public void setSafe(int index, byte value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableTinyIntHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableTinyIntHolder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableTinyIntHolder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -247,12 +234,11 @@ public void setSafe(int index, NullableTinyIntHolder holder) throws IllegalArgum
   }
 
   /**
-   * Same as {@link #set(int, TinyIntHolder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, TinyIntHolder)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, TinyIntHolder holder) {
     handleSafe(index);
@@ -260,8 +246,8 @@ public void setSafe(int index, TinyIntHolder holder) {
   }
 
   /**
-   * Store the given value at a particular position in the vector. isSet indicates
-   * whether the value is NULL or not.
+   * Store the given value at a particular position in the vector. isSet indicates whether the value
+   * is NULL or not.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -276,9 +262,8 @@ public void set(int index, int isSet, byte value) {
   }
 
   /**
-   * Same as {@link #set(int, int, byte)} except that it handles the case
-   * when index is greater than or equal to current value capacity of the
-   * vector.
+   * Same as {@link #set(int, int, byte)} except that it handles the case when index is greater than
+   * or equal to current value capacity of the vector.
    *
    * @param index position of the new value
    * @param isSet 0 for NULL value, 1 otherwise
@@ -290,8 +275,7 @@ public void setSafe(int index, int isSet, byte value) {
   }
 
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method should not be used externally.
    *
@@ -303,17 +287,14 @@ public static byte get(final ArrowBuf buffer, final int index) {
     return buffer.getByte(index * TYPE_WIDTH);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
@@ -325,8 +306,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TypeLayout.java b/java/vector/src/main/java/org/apache/arrow/vector/TypeLayout.java
index ae465418cf2fd..b8535532ea359 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/TypeLayout.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/TypeLayout.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static java.util.Arrays.asList;
@@ -22,12 +21,12 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.BufferLayout.BufferType;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.ArrowType.ArrowTypeVisitor;
 import org.apache.arrow.vector.types.pojo.ArrowType.Binary;
+import org.apache.arrow.vector.types.pojo.ArrowType.BinaryView;
 import org.apache.arrow.vector.types.pojo.ArrowType.Bool;
 import org.apache.arrow.vector.types.pojo.ArrowType.Date;
 import org.apache.arrow.vector.types.pojo.ArrowType.Decimal;
@@ -46,372 +45,428 @@
 import org.apache.arrow.vector.types.pojo.ArrowType.Timestamp;
 import org.apache.arrow.vector.types.pojo.ArrowType.Union;
 import org.apache.arrow.vector.types.pojo.ArrowType.Utf8;
+import org.apache.arrow.vector.types.pojo.ArrowType.Utf8View;
 
 /**
- * The buffer layout of vectors for a given type.
- * It defines its own buffers followed by the buffers for the children
- * if it is a nested type (Struct_, List, Union)
+ * The buffer layout of vectors for a given type. It defines its own buffers followed by the buffers
+ * for the children if it is a nested type (Struct_, List, Union)
  */
 public class TypeLayout {
 
-  /**
-   * Constructs a new {@link TypeLayout} for the given <code>arrowType</code>.
-   */
+  /** Constructs a new {@link TypeLayout} for the given <code>arrowType</code>. */
   public static TypeLayout getTypeLayout(final ArrowType arrowType) {
-    TypeLayout layout = arrowType.accept(new ArrowTypeVisitor<TypeLayout>() {
-
-      @Override
-      public TypeLayout visit(Int type) {
-        return newFixedWidthTypeLayout(BufferLayout.dataBuffer(type.getBitWidth()));
-      }
-
-      @Override
-      public TypeLayout visit(Union type) {
-        List<BufferLayout> vectors;
-        switch (type.getMode()) {
-          case Dense:
-            vectors = asList(
-                BufferLayout.typeBuffer(),
-                BufferLayout.offsetBuffer() // offset to find the vector
-            );
-            break;
-          case Sparse:
-            vectors = asList(
-                BufferLayout.typeBuffer() // type of the value at the index or 0 if null
-            );
-            break;
-          default:
-            throw new UnsupportedOperationException("Unsupported Union Mode: " + type.getMode());
-        }
-        return new TypeLayout(vectors);
-      }
-
-      @Override
-      public TypeLayout visit(Struct type) {
-        List<BufferLayout> vectors = asList(
-            BufferLayout.validityVector()
-        );
-        return new TypeLayout(vectors);
-      }
-
-      @Override
-      public TypeLayout visit(Timestamp type) {
-        return newFixedWidthTypeLayout(BufferLayout.dataBuffer(64));
-      }
-
-      @Override
-      public TypeLayout visit(org.apache.arrow.vector.types.pojo.ArrowType.List type) {
-        List<BufferLayout> vectors = asList(
-            BufferLayout.validityVector(),
-            BufferLayout.offsetBuffer()
-        );
-        return new TypeLayout(vectors);
-      }
-
-      @Override
-      public TypeLayout visit(ArrowType.LargeList type) {
-        List<BufferLayout> vectors = asList(
-            BufferLayout.validityVector(),
-            BufferLayout.largeOffsetBuffer()
-        );
-        return new TypeLayout(vectors);
-      }
-
-      @Override
-      public TypeLayout visit(FixedSizeList type) {
-        List<BufferLayout> vectors = asList(
-            BufferLayout.validityVector()
-        );
-        return new TypeLayout(vectors);
-      }
-
-      @Override
-      public TypeLayout visit(Map type) {
-        List<BufferLayout> vectors = asList(
-            BufferLayout.validityVector(),
-            BufferLayout.offsetBuffer()
-        );
-        return new TypeLayout(vectors);
-      }
-
-      @Override
-      public TypeLayout visit(FloatingPoint type) {
-        int bitWidth;
-        switch (type.getPrecision()) {
-          case HALF:
-            bitWidth = 16;
-            break;
-          case SINGLE:
-            bitWidth = 32;
-            break;
-          case DOUBLE:
-            bitWidth = 64;
-            break;
-          default:
-            throw new UnsupportedOperationException("Unsupported Precision: " + type.getPrecision());
-        }
-        return newFixedWidthTypeLayout(BufferLayout.dataBuffer(bitWidth));
-      }
-
-      @Override
-      public TypeLayout visit(Decimal type) {
-        return newFixedWidthTypeLayout(BufferLayout.dataBuffer(type.getBitWidth()));
-      }
-
-      @Override
-      public TypeLayout visit(FixedSizeBinary type) {
-        return newFixedWidthTypeLayout(new BufferLayout(BufferType.DATA, type.getByteWidth() * 8));
-      }
-
-      @Override
-      public TypeLayout visit(Bool type) {
-        return newFixedWidthTypeLayout(BufferLayout.booleanVector());
-      }
-
-      @Override
-      public TypeLayout visit(Binary type) {
-        return newVariableWidthTypeLayout();
-      }
-
-      @Override
-      public TypeLayout visit(Utf8 type) {
-        return newVariableWidthTypeLayout();
-      }
-
-      @Override
-      public TypeLayout visit(LargeUtf8 type) {
-        return newLargeVariableWidthTypeLayout();
-      }
-
-      @Override
-      public TypeLayout visit(LargeBinary type) {
-        return newLargeVariableWidthTypeLayout();
-      }
-
-      private TypeLayout newVariableWidthTypeLayout() {
-        return newPrimitiveTypeLayout(BufferLayout.validityVector(), BufferLayout.offsetBuffer(),
-          BufferLayout.byteVector());
-      }
-
-      private TypeLayout newLargeVariableWidthTypeLayout() {
-        return newPrimitiveTypeLayout(BufferLayout.validityVector(), BufferLayout.largeOffsetBuffer(),
-            BufferLayout.byteVector());
-      }
-
-      private TypeLayout newPrimitiveTypeLayout(BufferLayout... vectors) {
-        return new TypeLayout(asList(vectors));
-      }
-
-      public TypeLayout newFixedWidthTypeLayout(BufferLayout dataVector) {
-        return newPrimitiveTypeLayout(BufferLayout.validityVector(), dataVector);
-      }
-
-      @Override
-      public TypeLayout visit(Null type) {
-        return new TypeLayout(Collections.<BufferLayout>emptyList());
-      }
-
-      @Override
-      public TypeLayout visit(Date type) {
-        switch (type.getUnit()) {
-          case DAY:
-            return newFixedWidthTypeLayout(BufferLayout.dataBuffer(32));
-          case MILLISECOND:
-            return newFixedWidthTypeLayout(BufferLayout.dataBuffer(64));
-          default:
-            throw new UnsupportedOperationException("Unknown unit " + type.getUnit());
-        }
-      }
-
-      @Override
-      public TypeLayout visit(Time type) {
-        return newFixedWidthTypeLayout(BufferLayout.dataBuffer(type.getBitWidth()));
-      }
-
-      @Override
-      public TypeLayout visit(Interval type) {
-        switch (type.getUnit()) {
-          case DAY_TIME:
-            return newFixedWidthTypeLayout(BufferLayout.dataBuffer(64));
-          case YEAR_MONTH:
-            return newFixedWidthTypeLayout(BufferLayout.dataBuffer(32));
-          case MONTH_DAY_NANO:
-            return newFixedWidthTypeLayout(BufferLayout.dataBuffer(128));
-          default:
-            throw new UnsupportedOperationException("Unknown unit " + type.getUnit());
-        }
-      }
-
-      @Override
-      public TypeLayout visit(Duration type) {
-            return newFixedWidthTypeLayout(BufferLayout.dataBuffer(64));
-      }
-
-    });
+    TypeLayout layout =
+        arrowType.accept(
+            new ArrowTypeVisitor<TypeLayout>() {
+
+              @Override
+              public TypeLayout visit(Int type) {
+                return newFixedWidthTypeLayout(BufferLayout.dataBuffer(type.getBitWidth()));
+              }
+
+              @Override
+              public TypeLayout visit(Union type) {
+                List<BufferLayout> vectors;
+                switch (type.getMode()) {
+                  case Dense:
+                    vectors =
+                        asList(
+                            BufferLayout.typeBuffer(),
+                            BufferLayout.offsetBuffer() // offset to find the vector
+                            );
+                    break;
+                  case Sparse:
+                    vectors =
+                        asList(
+                            BufferLayout.typeBuffer() // type of the value at the index or 0 if null
+                            );
+                    break;
+                  default:
+                    throw new UnsupportedOperationException(
+                        "Unsupported Union Mode: " + type.getMode());
+                }
+                return new TypeLayout(vectors);
+              }
+
+              @Override
+              public TypeLayout visit(Struct type) {
+                List<BufferLayout> vectors = asList(BufferLayout.validityVector());
+                return new TypeLayout(vectors);
+              }
+
+              @Override
+              public TypeLayout visit(Timestamp type) {
+                return newFixedWidthTypeLayout(BufferLayout.dataBuffer(64));
+              }
+
+              @Override
+              public TypeLayout visit(ArrowType.List type) {
+                List<BufferLayout> vectors =
+                    asList(BufferLayout.validityVector(), BufferLayout.offsetBuffer());
+                return new TypeLayout(vectors);
+              }
+
+              @Override
+              public TypeLayout visit(ArrowType.ListView type) {
+                List<BufferLayout> vectors =
+                    asList(
+                        BufferLayout.validityVector(),
+                        BufferLayout.offsetBuffer(),
+                        BufferLayout.sizeBuffer());
+                return new TypeLayout(vectors);
+              }
+
+              @Override
+              public TypeLayout visit(ArrowType.LargeList type) {
+                List<BufferLayout> vectors =
+                    asList(BufferLayout.validityVector(), BufferLayout.largeOffsetBuffer());
+                return new TypeLayout(vectors);
+              }
+
+              @Override
+              public TypeLayout visit(FixedSizeList type) {
+                List<BufferLayout> vectors = asList(BufferLayout.validityVector());
+                return new TypeLayout(vectors);
+              }
+
+              @Override
+              public TypeLayout visit(Map type) {
+                List<BufferLayout> vectors =
+                    asList(BufferLayout.validityVector(), BufferLayout.offsetBuffer());
+                return new TypeLayout(vectors);
+              }
+
+              @Override
+              public TypeLayout visit(FloatingPoint type) {
+                int bitWidth;
+                switch (type.getPrecision()) {
+                  case HALF:
+                    bitWidth = 16;
+                    break;
+                  case SINGLE:
+                    bitWidth = 32;
+                    break;
+                  case DOUBLE:
+                    bitWidth = 64;
+                    break;
+                  default:
+                    throw new UnsupportedOperationException(
+                        "Unsupported Precision: " + type.getPrecision());
+                }
+                return newFixedWidthTypeLayout(BufferLayout.dataBuffer(bitWidth));
+              }
+
+              @Override
+              public TypeLayout visit(Decimal type) {
+                return newFixedWidthTypeLayout(BufferLayout.dataBuffer(type.getBitWidth()));
+              }
+
+              @Override
+              public TypeLayout visit(FixedSizeBinary type) {
+                return newFixedWidthTypeLayout(
+                    new BufferLayout(BufferType.DATA, type.getByteWidth() * 8));
+              }
+
+              @Override
+              public TypeLayout visit(Bool type) {
+                return newFixedWidthTypeLayout(BufferLayout.booleanVector());
+              }
+
+              @Override
+              public TypeLayout visit(Binary type) {
+                return newVariableWidthTypeLayout();
+              }
+
+              @Override
+              public TypeLayout visit(ArrowType.BinaryView type) {
+                return newVariableWidthViewTypeLayout();
+              }
+
+              @Override
+              public TypeLayout visit(Utf8 type) {
+                return newVariableWidthTypeLayout();
+              }
+
+              @Override
+              public TypeLayout visit(Utf8View type) {
+                return newVariableWidthViewTypeLayout();
+              }
+
+              @Override
+              public TypeLayout visit(LargeUtf8 type) {
+                return newLargeVariableWidthTypeLayout();
+              }
+
+              @Override
+              public TypeLayout visit(LargeBinary type) {
+                return newLargeVariableWidthTypeLayout();
+              }
+
+              private TypeLayout newVariableWidthTypeLayout() {
+                return newPrimitiveTypeLayout(
+                    BufferLayout.validityVector(),
+                    BufferLayout.offsetBuffer(),
+                    BufferLayout.byteVector());
+              }
+
+              private TypeLayout newVariableWidthViewTypeLayout() {
+                return new TypeLayout(
+                    false, BufferLayout.validityVector(), BufferLayout.viewVector());
+              }
+
+              private TypeLayout newLargeVariableWidthTypeLayout() {
+                // NOTE: only considers the non variadic buffers
+                return newPrimitiveTypeLayout(
+                    BufferLayout.validityVector(),
+                    BufferLayout.largeOffsetBuffer(),
+                    BufferLayout.byteVector());
+              }
+
+              private TypeLayout newPrimitiveTypeLayout(BufferLayout... vectors) {
+                return new TypeLayout(asList(vectors));
+              }
+
+              public TypeLayout newFixedWidthTypeLayout(BufferLayout dataVector) {
+                return newPrimitiveTypeLayout(BufferLayout.validityVector(), dataVector);
+              }
+
+              @Override
+              public TypeLayout visit(Null type) {
+                return new TypeLayout(Collections.emptyList());
+              }
+
+              @Override
+              public TypeLayout visit(Date type) {
+                switch (type.getUnit()) {
+                  case DAY:
+                    return newFixedWidthTypeLayout(BufferLayout.dataBuffer(32));
+                  case MILLISECOND:
+                    return newFixedWidthTypeLayout(BufferLayout.dataBuffer(64));
+                  default:
+                    throw new UnsupportedOperationException("Unknown unit " + type.getUnit());
+                }
+              }
+
+              @Override
+              public TypeLayout visit(Time type) {
+                return newFixedWidthTypeLayout(BufferLayout.dataBuffer(type.getBitWidth()));
+              }
+
+              @Override
+              public TypeLayout visit(Interval type) {
+                switch (type.getUnit()) {
+                  case DAY_TIME:
+                    return newFixedWidthTypeLayout(BufferLayout.dataBuffer(64));
+                  case YEAR_MONTH:
+                    return newFixedWidthTypeLayout(BufferLayout.dataBuffer(32));
+                  case MONTH_DAY_NANO:
+                    return newFixedWidthTypeLayout(BufferLayout.dataBuffer(128));
+                  default:
+                    throw new UnsupportedOperationException("Unknown unit " + type.getUnit());
+                }
+              }
+
+              @Override
+              public TypeLayout visit(Duration type) {
+                return newFixedWidthTypeLayout(BufferLayout.dataBuffer(64));
+              }
+            });
     return layout;
   }
 
-  /**
-   * Gets the number of {@link BufferLayout}s for the given <code>arrowType</code>.
-   */
+  /** Gets the number of {@link BufferLayout}s for the given <code>arrowType</code>. */
   public static int getTypeBufferCount(final ArrowType arrowType) {
-    return arrowType.accept(new ArrowTypeVisitor<Integer>() {
-
-      /**
-       * All fixed width vectors have a common number of buffers 2: one validity buffer, plus a data buffer.
-       */
-      static final int FIXED_WIDTH_BUFFER_COUNT = 2;
-
-      /**
-       * All variable width vectors have a common number of buffers 3: a validity buffer,
-       * an offset buffer, and a data buffer.
-       */
-      static final int VARIABLE_WIDTH_BUFFER_COUNT = 3;
-
-      @Override
-      public Integer visit(Int type) {
-        return FIXED_WIDTH_BUFFER_COUNT;
-      }
-
-      @Override
-      public Integer visit(Union type) {
-        switch (type.getMode()) {
-          case Dense:
-            // TODO: validate this
+    return arrowType.accept(
+        new ArrowTypeVisitor<Integer>() {
+
+          /**
+           * All fixed width vectors have a common number of buffers 2: one validity buffer, plus a
+           * data buffer.
+           */
+          static final int FIXED_WIDTH_BUFFER_COUNT = 2;
+
+          /**
+           * All variable width vectors have a common number of buffers 3: a validity buffer, an
+           * offset buffer, and a data buffer.
+           */
+          static final int VARIABLE_WIDTH_BUFFER_COUNT = 3;
+
+          @Override
+          public Integer visit(Int type) {
+            return FIXED_WIDTH_BUFFER_COUNT;
+          }
+
+          @Override
+          public Integer visit(Union type) {
+            switch (type.getMode()) {
+              case Dense:
+                // TODO: validate this
+                return 2;
+              case Sparse:
+                // type buffer
+                return 1;
+              default:
+                throw new UnsupportedOperationException(
+                    "Unsupported Union Mode: " + type.getMode());
+            }
+          }
+
+          @Override
+          public Integer visit(Struct type) {
+            // validity buffer
+            return 1;
+          }
+
+          @Override
+          public Integer visit(Timestamp type) {
+            return FIXED_WIDTH_BUFFER_COUNT;
+          }
+
+          @Override
+          public Integer visit(ArrowType.List type) {
+            // validity buffer + offset buffer
             return 2;
-          case Sparse:
-            // type buffer
+          }
+
+          @Override
+          public Integer visit(ArrowType.ListView type) {
+            // validity buffer + offset buffer + size buffer
+            return 3;
+          }
+
+          @Override
+          public Integer visit(ArrowType.LargeList type) {
+            // validity buffer + offset buffer
+            return 2;
+          }
+
+          @Override
+          public Integer visit(FixedSizeList type) {
+            // validity buffer
             return 1;
-          default:
-            throw new UnsupportedOperationException("Unsupported Union Mode: " + type.getMode());
-        }
-      }
-
-      @Override
-      public Integer visit(Struct type) {
-        // validity buffer
-        return 1;
-      }
-
-      @Override
-      public Integer visit(Timestamp type) {
-        return FIXED_WIDTH_BUFFER_COUNT;
-      }
-
-      @Override
-      public Integer visit(org.apache.arrow.vector.types.pojo.ArrowType.List type) {
-        // validity buffer + offset buffer
-        return 2;
-      }
-
-      @Override
-      public Integer visit(ArrowType.LargeList type) {
-        // validity buffer + offset buffer
-        return 2;
-      }
-
-      @Override
-      public Integer visit(FixedSizeList type) {
-        // validity buffer
-        return 1;
-      }
-
-      @Override
-      public Integer visit(Map type) {
-        // validity buffer + offset buffer
-        return 2;
-      }
-
-      @Override
-      public Integer visit(FloatingPoint type) {
-        return FIXED_WIDTH_BUFFER_COUNT;
-      }
-
-      @Override
-      public Integer visit(Decimal type) {
-        return FIXED_WIDTH_BUFFER_COUNT;
-      }
-
-      @Override
-      public Integer visit(FixedSizeBinary type) {
-        return FIXED_WIDTH_BUFFER_COUNT;
-      }
-
-      @Override
-      public Integer visit(Bool type) {
-        return FIXED_WIDTH_BUFFER_COUNT;
-      }
-
-      @Override
-      public Integer visit(Binary type) {
-        return VARIABLE_WIDTH_BUFFER_COUNT;
-      }
-
-      @Override
-      public Integer visit(Utf8 type) {
-        return VARIABLE_WIDTH_BUFFER_COUNT;
-      }
-
-      @Override
-      public Integer visit(LargeUtf8 type) {
-        return VARIABLE_WIDTH_BUFFER_COUNT;
-      }
-
-      @Override
-      public Integer visit(LargeBinary type) {
-        return VARIABLE_WIDTH_BUFFER_COUNT;
-      }
-
-      @Override
-      public Integer visit(Null type) {
-        return 0;
-      }
-
-      @Override
-      public Integer visit(Date type) {
-        return FIXED_WIDTH_BUFFER_COUNT;
-      }
-
-      @Override
-      public Integer visit(Time type) {
-        return FIXED_WIDTH_BUFFER_COUNT;
-      }
-
-      @Override
-      public Integer visit(Interval type) {
-        return FIXED_WIDTH_BUFFER_COUNT;
-      }
-
-      @Override
-      public Integer visit(Duration type) {
-        return FIXED_WIDTH_BUFFER_COUNT;
-      }
-
-    });
+          }
+
+          @Override
+          public Integer visit(Map type) {
+            // validity buffer + offset buffer
+            return 2;
+          }
+
+          @Override
+          public Integer visit(FloatingPoint type) {
+            return FIXED_WIDTH_BUFFER_COUNT;
+          }
+
+          @Override
+          public Integer visit(Decimal type) {
+            return FIXED_WIDTH_BUFFER_COUNT;
+          }
+
+          @Override
+          public Integer visit(FixedSizeBinary type) {
+            return FIXED_WIDTH_BUFFER_COUNT;
+          }
+
+          @Override
+          public Integer visit(Bool type) {
+            return FIXED_WIDTH_BUFFER_COUNT;
+          }
+
+          @Override
+          public Integer visit(Binary type) {
+            return VARIABLE_WIDTH_BUFFER_COUNT;
+          }
+
+          @Override
+          public Integer visit(BinaryView type) {
+            // NOTE: only consider the validity and view buffers
+            return 2;
+          }
+
+          @Override
+          public Integer visit(Utf8 type) {
+            return VARIABLE_WIDTH_BUFFER_COUNT;
+          }
+
+          @Override
+          public Integer visit(Utf8View type) {
+            // NOTE: only consider the validity and view buffers
+            return 2;
+          }
+
+          @Override
+          public Integer visit(LargeUtf8 type) {
+            return VARIABLE_WIDTH_BUFFER_COUNT;
+          }
+
+          @Override
+          public Integer visit(LargeBinary type) {
+            return VARIABLE_WIDTH_BUFFER_COUNT;
+          }
+
+          @Override
+          public Integer visit(Null type) {
+            return 0;
+          }
+
+          @Override
+          public Integer visit(Date type) {
+            return FIXED_WIDTH_BUFFER_COUNT;
+          }
+
+          @Override
+          public Integer visit(Time type) {
+            return FIXED_WIDTH_BUFFER_COUNT;
+          }
+
+          @Override
+          public Integer visit(Interval type) {
+            return FIXED_WIDTH_BUFFER_COUNT;
+          }
+
+          @Override
+          public Integer visit(Duration type) {
+            return FIXED_WIDTH_BUFFER_COUNT;
+          }
+        });
   }
 
   private final List<BufferLayout> bufferLayouts;
 
-  public TypeLayout(List<BufferLayout> bufferLayouts) {
+  private final boolean isFixedBufferCount;
+
+  /**
+   * Constructs a new {@link TypeLayout}.
+   *
+   * @param bufferLayouts the individual {@linkplain BufferLayout}s for the given type
+   * @param isFixedBufferCount whether the number of buffers is fixed
+   */
+  public TypeLayout(List<BufferLayout> bufferLayouts, boolean isFixedBufferCount) {
     super();
     this.bufferLayouts = Preconditions.checkNotNull(bufferLayouts);
+    this.isFixedBufferCount = isFixedBufferCount;
+  }
+
+  public TypeLayout(List<BufferLayout> bufferLayouts) {
+    this(bufferLayouts, true);
   }
 
   public TypeLayout(BufferLayout... bufferLayouts) {
-    this(asList(bufferLayouts));
+    this(asList(bufferLayouts), true);
   }
 
-  /**
-   * Returns the individual {@linkplain BufferLayout}s for the given type.
-   */
+  public TypeLayout(boolean isFixedBufferCount, BufferLayout... bufferLayouts) {
+    this(asList(bufferLayouts), isFixedBufferCount);
+  }
+
+  /** Returns the individual {@linkplain BufferLayout}s for the given type. */
   public List<BufferLayout> getBufferLayouts() {
     return bufferLayouts;
   }
 
   /**
-   * Returns the types of each buffer for this layout.  A layout can consist
-   * of multiple buffers for example a validity bitmap buffer, a value buffer or
-   * an offset buffer.
+   * Returns the types of each buffer for this layout. A layout can consist of multiple buffers for
+   * example a validity bitmap buffer, a value buffer or an offset buffer.
    */
   public List<BufferType> getBufferTypes() {
     List<BufferType> types = new ArrayList<>(bufferLayouts.size());
@@ -421,6 +476,15 @@ public List<BufferType> getBufferTypes() {
     return types;
   }
 
+  /**
+   * Determines whether the buffer count is fixed for the given type.
+   *
+   * @return true if the buffer count is fixed, false otherwise
+   */
+  public boolean isFixedBufferCount() {
+    return isFixedBufferCount;
+  }
+
   @Override
   public String toString() {
     return bufferLayouts.toString();
@@ -445,5 +509,4 @@ public boolean equals(Object obj) {
     TypeLayout other = (TypeLayout) obj;
     return bufferLayouts.equals(other.bufferLayouts);
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/UInt1Vector.java b/java/vector/src/main/java/org/apache/arrow/vector/UInt1Vector.java
index fcb04eaf08821..83f8d9eeb87d1 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/UInt1Vector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/UInt1Vector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -32,19 +31,15 @@
 import org.apache.arrow.vector.util.ValueVectorUtility;
 
 /**
- * UInt1Vector implements a fixed width (1 bytes) vector of
- * integer values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * UInt1Vector implements a fixed width (1 bytes) vector of integer values which could be null. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
  */
-public final class UInt1Vector extends BaseFixedWidthVector implements BaseIntVector {
-  /**
-   * The mask to use when promoting the unsigned byte value to an integer.
-   */
+public final class UInt1Vector extends BaseFixedWidthVector
+    implements BaseIntVector, ValueIterableVector<Byte> {
+  /** The mask to use when promoting the unsigned byte value to an integer. */
   public static final int PROMOTION_MASK = 0xFF;
 
-  /**
-   * The maximum 8-bit unsigned integer.
-   */
+  /** The maximum 8-bit unsigned integer. */
   public static final byte MAX_UINT1 = (byte) 0XFF;
 
   public static final byte TYPE_WIDTH = 1;
@@ -59,6 +54,7 @@ public UInt1Vector(String name, FieldType fieldType, BufferAllocator allocator)
 
   /**
    * Constructor for UInt1Vector.
+   *
    * @param field Field type
    * @param allocator Allocator type
    */
@@ -76,18 +72,15 @@ public MinorType getMinorType() {
     return MinorType.UINT1;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
-   * <p>To avoid overflow, the returned type is one step up from the signed
-   * type.
+   * <p>To avoid overflow, the returned type is one step up from the signed type.
    *
    * <p>This method is mainly meant for integration tests.
    *
@@ -100,11 +93,10 @@ public static short getNoOverflow(final ArrowBuf buffer, final int index) {
     return (short) (PROMOTION_MASK & b);
   }
 
-
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public byte get(int index) throws IllegalStateException {
@@ -115,11 +107,10 @@ public byte get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableUInt1Holder holder) {
     if (isSet(index) == 0) {
@@ -133,7 +124,7 @@ public void get(int index, NullableUInt1Holder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -148,7 +139,7 @@ public Byte getObject(int index) {
   /**
    * Returns the value stored at index without the potential for overflow.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public Short getObjectNoOverflow(int index) {
@@ -159,13 +150,11 @@ public Short getObjectNoOverflow(int index) {
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, int value) {
     valueBuffer.setByte(index * TYPE_WIDTH, value);
@@ -178,8 +167,8 @@ private void setValue(int index, byte value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, int value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -189,8 +178,8 @@ public void set(int index, int value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, byte value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -198,12 +187,11 @@ public void set(int index, byte value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableUInt1Holder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -219,8 +207,8 @@ public void set(int index, NullableUInt1Holder holder) throws IllegalArgumentExc
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, UInt1Holder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -228,12 +216,11 @@ public void set(int index, UInt1Holder holder) {
   }
 
   /**
-   * Same as {@link #set(int, int)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, int)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, int value) {
     handleSafe(index);
@@ -241,12 +228,11 @@ public void setSafe(int index, int value) {
   }
 
   /**
-   * Same as {@link #set(int, byte)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, byte)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, byte value) {
     handleSafe(index);
@@ -254,12 +240,11 @@ public void setSafe(int index, byte value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableUInt1Holder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableUInt1Holder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableUInt1Holder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -267,12 +252,11 @@ public void setSafe(int index, NullableUInt1Holder holder) throws IllegalArgumen
   }
 
   /**
-   * Same as {@link #set(int, UInt1Holder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, UInt1Holder)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, UInt1Holder holder) {
     handleSafe(index);
@@ -280,8 +264,7 @@ public void setSafe(int index, UInt1Holder holder) {
   }
 
   /**
-   * Sets the value at index to value isSet > 0, otherwise sets the index position
-   * to invalid/null.
+   * Sets the value at index to value isSet > 0, otherwise sets the index position to invalid/null.
    */
   public void set(int index, int isSet, byte value) {
     if (isSet > 0) {
@@ -292,21 +275,19 @@ public void set(int index, int isSet, byte value) {
   }
 
   /**
-   * Same as {@link #set(int, int, byte)} but will reallocate the buffer if index
-   * is larger than current capacity.
+   * Same as {@link #set(int, int, byte)} but will reallocate the buffer if index is larger than
+   * current capacity.
    */
   public void setSafe(int index, int isSet, byte value) {
     handleSafe(index);
     set(index, isSet, value);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   @Override
   public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
@@ -314,8 +295,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
@@ -348,7 +328,8 @@ public long getValueAsLong(int index) {
 
   @Override
   public String toString() {
-    return ValueVectorUtility.getToString(this, 0, getValueCount(), (v, i) -> v.getObjectNoOverflow(i));
+    return ValueVectorUtility.getToString(
+        this, 0, getValueCount(), (v, i) -> v.getObjectNoOverflow(i));
   }
 
   private class TransferImpl implements TransferPair {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/UInt2Vector.java b/java/vector/src/main/java/org/apache/arrow/vector/UInt2Vector.java
index a9708a4faa9a7..35330f4f91b6a 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/UInt2Vector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/UInt2Vector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -32,15 +31,13 @@
 import org.apache.arrow.vector.util.ValueVectorUtility;
 
 /**
- * UInt2Vector implements a fixed width (2 bytes) vector of
- * integer values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * UInt2Vector implements a fixed width (2 bytes) vector of integer values which could be null. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
  */
-public final class UInt2Vector extends BaseFixedWidthVector implements BaseIntVector {
+public final class UInt2Vector extends BaseFixedWidthVector
+    implements BaseIntVector, ValueIterableVector<Character> {
 
-  /**
-   * The maximum 16-bit unsigned integer.
-   */
+  /** The maximum 16-bit unsigned integer. */
   public static final char MAX_UINT2 = (char) 0XFFFF;
 
   public static final byte TYPE_WIDTH = 2;
@@ -55,6 +52,7 @@ public UInt2Vector(String name, FieldType fieldType, BufferAllocator allocator)
 
   /**
    * Constructor for UInt2Vector type.
+   *
    * @param field Field type
    * @param allocator Allocator type
    */
@@ -72,15 +70,13 @@ public MinorType getMinorType() {
     return MinorType.UINT2;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
    * <p>This method is mainly meant for integration tests.
    *
@@ -95,7 +91,7 @@ public static char get(final ArrowBuf buffer, final int index) {
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public char get(int index) throws IllegalStateException {
@@ -106,11 +102,10 @@ public char get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableUInt2Holder holder) {
     if (isSet(index) == 0) {
@@ -124,7 +119,7 @@ public void get(int index, NullableUInt2Holder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -136,13 +131,11 @@ public Character getObject(int index) {
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, int value) {
     valueBuffer.setChar((long) index * TYPE_WIDTH, value);
@@ -155,8 +148,8 @@ private void setValue(int index, char value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, int value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -166,8 +159,8 @@ public void set(int index, int value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, char value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -175,12 +168,11 @@ public void set(int index, char value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableUInt2Holder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -196,8 +188,8 @@ public void set(int index, NullableUInt2Holder holder) throws IllegalArgumentExc
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, UInt2Holder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -205,12 +197,11 @@ public void set(int index, UInt2Holder holder) {
   }
 
   /**
-   * Same as {@link #set(int, int)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, int)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, int value) {
     handleSafe(index);
@@ -218,12 +209,11 @@ public void setSafe(int index, int value) {
   }
 
   /**
-   * Same as {@link #set(int, char)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, char)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, char value) {
     handleSafe(index);
@@ -231,12 +221,11 @@ public void setSafe(int index, char value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableUInt2Holder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableUInt2Holder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableUInt2Holder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -244,12 +233,11 @@ public void setSafe(int index, NullableUInt2Holder holder) throws IllegalArgumen
   }
 
   /**
-   * Same as {@link #set(int, UInt2Holder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, UInt2Holder)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, UInt2Holder holder) {
     handleSafe(index);
@@ -257,8 +245,8 @@ public void setSafe(int index, UInt2Holder holder) {
   }
 
   /**
-   * Sets the given index to value is isSet is positive, otherwise sets
-   * the position as invalid/null.
+   * Sets the given index to value is isSet is positive, otherwise sets the position as
+   * invalid/null.
    */
   public void set(int index, int isSet, char value) {
     if (isSet > 0) {
@@ -269,21 +257,19 @@ public void set(int index, int isSet, char value) {
   }
 
   /**
-   * Same as {@link #set(int, int, char)} but will reallocate the buffer if index
-   * is larger than current capacity.
+   * Same as {@link #set(int, int, char)} but will reallocate the buffer if index is larger than
+   * current capacity.
    */
   public void setSafe(int index, int isSet, char value) {
     handleSafe(index);
     set(index, isSet, value);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   @Override
   public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
@@ -291,8 +277,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
@@ -325,8 +310,11 @@ public long getValueAsLong(int index) {
 
   @Override
   public String toString() {
-    return ValueVectorUtility.getToString(this, 0, getValueCount(), (v, i) ->
-      v.isNull(i) ? "null" : Integer.toString(v.get(i) & 0x0000ffff));
+    return ValueVectorUtility.getToString(
+        this,
+        0,
+        getValueCount(),
+        (v, i) -> v.isNull(i) ? "null" : Integer.toString(v.get(i) & 0x0000ffff));
   }
 
   private class TransferImpl implements TransferPair {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/UInt4Vector.java b/java/vector/src/main/java/org/apache/arrow/vector/UInt4Vector.java
index f9bed0c013a2a..22e023f6f22e6 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/UInt4Vector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/UInt4Vector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -32,20 +31,16 @@
 import org.apache.arrow.vector.util.ValueVectorUtility;
 
 /**
- * UInt4Vector implements a fixed width (4 bytes) vector of
- * integer values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * UInt4Vector implements a fixed width (4 bytes) vector of integer values which could be null. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
  */
-public final class UInt4Vector extends BaseFixedWidthVector implements BaseIntVector {
+public final class UInt4Vector extends BaseFixedWidthVector
+    implements BaseIntVector, ValueIterableVector<Integer> {
 
-  /**
-   * The mask to use when promoting the unsigned int value to a long int.
-   */
+  /** The mask to use when promoting the unsigned int value to a long int. */
   public static final long PROMOTION_MASK = 0x00000000FFFFFFFFL;
 
-  /**
-   * The maximum 32-bit unsigned integer.
-   */
+  /** The maximum 32-bit unsigned integer. */
   public static final int MAX_UINT4 = 0XFFFFFFFF;
 
   public static final byte TYPE_WIDTH = 4;
@@ -60,6 +55,7 @@ public UInt4Vector(String name, FieldType fieldType, BufferAllocator allocator)
 
   /**
    * Constructor for UInt4Vector.
+   *
    * @param field Field type
    * @param allocator Allocator type
    */
@@ -77,18 +73,15 @@ public MinorType getMinorType() {
     return MinorType.UINT4;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
-   * <p>To avoid overflow, the returned type is one step up from the signed
-   * type.
+   * <p>To avoid overflow, the returned type is one step up from the signed type.
    *
    * <p>This method is mainly meant for integration tests.
    *
@@ -104,7 +97,7 @@ public static long getNoOverflow(final ArrowBuf buffer, final int index) {
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public int get(int index) throws IllegalStateException {
@@ -115,11 +108,10 @@ public int get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableUInt4Holder holder) {
     if (isSet(index) == 0) {
@@ -133,7 +125,7 @@ public void get(int index, NullableUInt4Holder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -148,7 +140,7 @@ public Integer getObject(int index) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public Long getObjectNoOverflow(int index) {
@@ -159,13 +151,11 @@ public Long getObjectNoOverflow(int index) {
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, int value) {
     valueBuffer.setInt((long) index * TYPE_WIDTH, value);
@@ -174,8 +164,8 @@ private void setValue(int index, int value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, int value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -183,12 +173,11 @@ public void set(int index, int value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableUInt4Holder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -204,8 +193,8 @@ public void set(int index, NullableUInt4Holder holder) throws IllegalArgumentExc
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, UInt4Holder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -213,12 +202,11 @@ public void set(int index, UInt4Holder holder) {
   }
 
   /**
-   * Same as {@link #set(int, int)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, int)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, int value) {
     handleSafe(index);
@@ -226,12 +214,11 @@ public void setSafe(int index, int value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableUInt4Holder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableUInt4Holder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableUInt4Holder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -239,12 +226,11 @@ public void setSafe(int index, NullableUInt4Holder holder) throws IllegalArgumen
   }
 
   /**
-   * Same as {@link #set(int, UInt4Holder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, UInt4Holder)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, UInt4Holder holder) {
     handleSafe(index);
@@ -252,8 +238,7 @@ public void setSafe(int index, UInt4Holder holder) {
   }
 
   /**
-   * Sets the value at index to value isSet > 0, otherwise sets the index position
-   * to invalid/null.
+   * Sets the value at index to value isSet > 0, otherwise sets the index position to invalid/null.
    */
   public void set(int index, int isSet, int value) {
     if (isSet > 0) {
@@ -264,21 +249,19 @@ public void set(int index, int isSet, int value) {
   }
 
   /**
-   * Same as {@link #set(int, int, int)} but will reallocate if the buffer if index
-   * is larger than the current capacity.
+   * Same as {@link #set(int, int, int)} but will reallocate if the buffer if index is larger than
+   * the current capacity.
    */
   public void setSafe(int index, int isSet, int value) {
     handleSafe(index);
     set(index, isSet, value);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   @Override
   public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
@@ -286,8 +269,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
@@ -320,7 +302,8 @@ public long getValueAsLong(int index) {
 
   @Override
   public String toString() {
-    return ValueVectorUtility.getToString(this, 0, getValueCount(), (v, i) -> v.getObjectNoOverflow(i));
+    return ValueVectorUtility.getToString(
+        this, 0, getValueCount(), (v, i) -> v.getObjectNoOverflow(i));
   }
 
   private class TransferImpl implements TransferPair {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/UInt8Vector.java b/java/vector/src/main/java/org/apache/arrow/vector/UInt8Vector.java
index a3e16b5e30dde..f026702bb46e4 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/UInt8Vector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/UInt8Vector.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
 
 import java.math.BigInteger;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.impl.UInt8ReaderImpl;
@@ -34,15 +32,13 @@
 import org.apache.arrow.vector.util.ValueVectorUtility;
 
 /**
- * UInt8Vector implements a fixed width vector (8 bytes) of
- * integer values which could be null. A validity buffer (bit vector) is
- * maintained to track which elements in the vector are null.
+ * UInt8Vector implements a fixed width vector (8 bytes) of integer values which could be null. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
  */
-public final class UInt8Vector extends BaseFixedWidthVector implements BaseIntVector {
+public final class UInt8Vector extends BaseFixedWidthVector
+    implements BaseIntVector, ValueIterableVector<Long> {
 
-  /**
-   * The maximum 64-bit unsigned long integer.
-   */
+  /** The maximum 64-bit unsigned long integer. */
   public static final long MAX_UINT8 = 0XFFFFFFFFFFFFFFFFL;
 
   public static final byte TYPE_WIDTH = 8;
@@ -57,6 +53,7 @@ public UInt8Vector(String name, FieldType fieldType, BufferAllocator allocator)
 
   /**
    * Constructor for UInt8Vector.
+   *
    * @param field Field type
    * @param allocator Allocator type.
    */
@@ -74,20 +71,17 @@ public MinorType getMinorType() {
     return MinorType.UINT8;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
   private static final BigInteger SAFE_CONVERSION_MASK = new BigInteger("ffffffffffffffff", 16);
 
   /**
-   * Given a data buffer, get the value stored at a particular position
-   * in the vector.
+   * Given a data buffer, get the value stored at a particular position in the vector.
    *
-   * <p>To avoid overflow, the returned type is one step up from the signed
-   * type.
+   * <p>To avoid overflow, the returned type is one step up from the signed type.
    *
    * <p>This method is mainly meant for integration tests.
    *
@@ -100,11 +94,10 @@ public static BigInteger getNoOverflow(final ArrowBuf buffer, final int index) {
     return SAFE_CONVERSION_MASK.and(l);
   }
 
-
   /**
    * Get the element at the given index from the vector.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public long get(int index) throws IllegalStateException {
@@ -115,11 +108,10 @@ public long get(int index) throws IllegalStateException {
   }
 
   /**
-   * Get the element at the given index from the vector and
-   * sets the state in holder. If element at given index
-   * is null, holder.isSet will be zero.
+   * Get the element at the given index from the vector and sets the state in holder. If element at
+   * given index is null, holder.isSet will be zero.
    *
-   * @param index   position of element
+   * @param index position of element
    */
   public void get(int index, NullableUInt8Holder holder) {
     if (isSet(index) == 0) {
@@ -133,7 +125,7 @@ public void get(int index, NullableUInt8Holder holder) {
   /**
    * Same as {@link #get(int)}.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   @Override
@@ -148,7 +140,7 @@ public Long getObject(int index) {
   /**
    * Returns the value stored at index without the potential for overflow.
    *
-   * @param index   position of element
+   * @param index position of element
    * @return element at given index
    */
   public BigInteger getObjectNoOverflow(int index) {
@@ -159,13 +151,11 @@ public BigInteger getObjectNoOverflow(int index) {
     }
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   private void setValue(int index, long value) {
     valueBuffer.setLong((long) index * TYPE_WIDTH, value);
@@ -174,8 +164,8 @@ private void setValue(int index, long value) {
   /**
    * Set the element at the given index to the given value.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void set(int index, long value) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -183,12 +173,11 @@ public void set(int index, long value) {
   }
 
   /**
-   * Set the element at the given index to the value set in data holder.
-   * If the value in holder is not indicated as set, element in the
-   * at the given index will be null.
+   * Set the element at the given index to the value set in data holder. If the value in holder is
+   * not indicated as set, element in the at the given index will be null.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void set(int index, NullableUInt8Holder holder) throws IllegalArgumentException {
     if (holder.isSet < 0) {
@@ -204,8 +193,8 @@ public void set(int index, NullableUInt8Holder holder) throws IllegalArgumentExc
   /**
    * Set the element at the given index to the value set in data holder.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void set(int index, UInt8Holder holder) {
     BitVectorHelper.setBit(validityBuffer, index);
@@ -213,12 +202,11 @@ public void set(int index, UInt8Holder holder) {
   }
 
   /**
-   * Same as {@link #set(int, long)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, long)} except that it handles the case when index is greater than or
+   * equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param value   value of element
+   * @param index position of element
+   * @param value value of element
    */
   public void setSafe(int index, long value) {
     handleSafe(index);
@@ -226,12 +214,11 @@ public void setSafe(int index, long value) {
   }
 
   /**
-   * Same as {@link #set(int, NullableUInt8Holder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, NullableUInt8Holder)} except that it handles the case when index is
+   * greater than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  nullable data holder for value of element
+   * @param index position of element
+   * @param holder nullable data holder for value of element
    */
   public void setSafe(int index, NullableUInt8Holder holder) throws IllegalArgumentException {
     handleSafe(index);
@@ -239,12 +226,11 @@ public void setSafe(int index, NullableUInt8Holder holder) throws IllegalArgumen
   }
 
   /**
-   * Same as {@link #set(int, UInt8Holder)} except that it handles the
-   * case when index is greater than or equal to existing
-   * value capacity {@link #getValueCapacity()}.
+   * Same as {@link #set(int, UInt8Holder)} except that it handles the case when index is greater
+   * than or equal to existing value capacity {@link #getValueCapacity()}.
    *
-   * @param index   position of element
-   * @param holder  data holder for value of element
+   * @param index position of element
+   * @param holder data holder for value of element
    */
   public void setSafe(int index, UInt8Holder holder) {
     handleSafe(index);
@@ -261,20 +247,19 @@ public void set(int index, int isSet, long value) {
   }
 
   /**
-   * Same as {@link #set(int, int, long)} but will reallocate if index is greater than current capacity.
+   * Same as {@link #set(int, int, long)} but will reallocate if index is greater than current
+   * capacity.
    */
   public void setSafe(int index, int isSet, long value) {
     handleSafe(index);
     set(index, isSet, value);
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   @Override
   public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
@@ -282,8 +267,7 @@ public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
   }
 
   /**
-   * Construct a TransferPair comprising this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising this and a target vector of the same type.
    *
    * @param field Field object used by the target vector
    * @param allocator allocator for the target vector
@@ -316,7 +300,8 @@ public long getValueAsLong(int index) {
 
   @Override
   public String toString() {
-    return ValueVectorUtility.getToString(this, 0, getValueCount(), (v, i) -> v.getObjectNoOverflow(i));
+    return ValueVectorUtility.getToString(
+        this, 0, getValueCount(), (v, i) -> v.getObjectNoOverflow(i));
   }
 
   private class TransferImpl implements TransferPair {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ValueIterableVector.java b/java/vector/src/main/java/org/apache/arrow/vector/ValueIterableVector.java
new file mode 100644
index 0000000000000..8536af7eb839a
--- /dev/null
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ValueIterableVector.java
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.vector;
+
+import java.util.Iterator;
+
+public interface ValueIterableVector<T> extends ValueVector {
+  /**
+   * Get an Iterable that can be used to iterate over the values in the vector.
+   *
+   * @return an Iterable for the vector's values
+   */
+  default Iterator<T> getValueIterator() {
+    return new Iterator<T>() {
+      private int index = 0;
+
+      @Override
+      public boolean hasNext() {
+        return index < ValueIterableVector.this.getValueCount();
+      }
+
+      @Override
+      public T next() {
+        return (T) ValueIterableVector.this.getObject(index++);
+      }
+    };
+  }
+
+  /**
+   * Get an Iterator for the values in the vector.
+   *
+   * @return an Iterator for the values in the vector
+   */
+  default Iterable<T> getValueIterable() {
+    return this::getValueIterator;
+  }
+}
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ValueVector.java b/java/vector/src/main/java/org/apache/arrow/vector/ValueVector.java
index e5f743c9c7f25..724941aa2a1e8 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ValueVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ValueVector.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import java.io.Closeable;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.OutOfMemoryException;
@@ -34,27 +32,31 @@
 /**
  * An abstraction that is used to store a sequence of values in an individual column.
  *
- * <p>A {@link ValueVector value vector} stores underlying data in-memory in a columnar fashion that is compact and
- * efficient. The column whose data is stored, is referred by {@link #getField()}.
+ * <p>A {@link ValueVector value vector} stores underlying data in-memory in a columnar fashion that
+ * is compact and efficient. The column whose data is stored, is referred by {@link #getField()}.
  *
  * <p>It is important that vector is allocated before attempting to read or write.
  *
  * <p>There are a few "rules" around vectors:
  *
  * <ul>
- * <li>values need to be written in order (e.g. index 0, 1, 2, 5)</li>
- * <li>null vectors start with all values as null before writing anything</li>
- * <li>for variable width types, the offset vector should be all zeros before writing</li>
- * <li>you must call setValueCount before a vector can be read</li>
- * <li>you should never write to a vector once it has been read.</li>
+ *   <li>values need to be written in order (e.g. index 0, 1, 2, 5)
+ *   <li>null vectors start with all values as null before writing anything
+ *   <li>for variable width types, the offset vector should be all zeros before writing
+ *   <li>you must call setValueCount before a vector can be read
+ *   <li>you should never write to a vector once it has been read.
  * </ul>
  *
- * <p>Please note that the current implementation doesn't enforce those rules, hence we may find few places that
- * deviate from these rules (e.g. offset vectors in Variable Length and Repeated vector)
+ * <p>Please note that the current implementation doesn't enforce those rules, hence we may find few
+ * places that deviate from these rules (e.g. offset vectors in Variable Length and Repeated vector)
  *
  * <p>This interface "should" strive to guarantee this order of operation:
+ *
  * <blockquote>
- * allocate &gt; mutate &gt; setvaluecount &gt; access &gt; clear (or allocate to start the process over).
+ *
+ * allocate &gt; mutate &gt; setvaluecount &gt; access &gt; clear (or allocate to start the process
+ * over).
+ *
  * </blockquote>
  */
 public interface ValueVector extends Closeable, Iterable<ValueVector> {
@@ -73,8 +75,8 @@ public interface ValueVector extends Closeable, Iterable<ValueVector> {
   boolean allocateNewSafe();
 
   /**
-   * Allocate new buffer with double capacity, and copy data into the new buffer.
-   * Replace vector's buffer with new buffer, and release old one
+   * Allocate new buffer with double capacity, and copy data into the new buffer. Replace vector's
+   * buffer with new buffer, and release old one
    */
   void reAlloc();
 
@@ -94,23 +96,21 @@ public interface ValueVector extends Closeable, Iterable<ValueVector> {
    */
   int getValueCapacity();
 
-  /**
-   * Alternative to clear(). Allows use as an AutoCloseable in try-with-resources.
-   */
+  /** Alternative to clear(). Allows use as an AutoCloseable in try-with-resources. */
   @Override
   void close();
 
   /**
-   * Release any owned ArrowBuf and reset the ValueVector to the initial state. If the
-   * vector has any child vectors, they will also be cleared.
+   * Release any owned ArrowBuf and reset the ValueVector to the initial state. If the vector has
+   * any child vectors, they will also be cleared.
    */
   void clear();
 
   /**
-   * Reset the ValueVector to the initial state without releasing any owned ArrowBuf.
-   * Buffer capacities will remain unchanged and any previous data will be zeroed out.
-   * This includes buffers for data, validity, offset, etc. If the vector has any
-   * child vectors, they will also be reset.
+   * Reset the ValueVector to the initial state without releasing any owned ArrowBuf. Buffer
+   * capacities will remain unchanged and any previous data will be zeroed out. This includes
+   * buffers for data, validity, offset, etc. If the vector has any child vectors, they will also be
+   * reset.
    */
   void reset();
 
@@ -127,8 +127,8 @@ public interface ValueVector extends Closeable, Iterable<ValueVector> {
    * To transfer quota responsibility.
    *
    * @param allocator the target allocator
-   * @return a {@link org.apache.arrow.vector.util.TransferPair transfer pair}, creating a new target vector of
-   *         the same type.
+   * @return a {@link org.apache.arrow.vector.util.TransferPair transfer pair}, creating a new
+   *     target vector of the same type.
    */
   TransferPair getTransferPair(BufferAllocator allocator);
 
@@ -137,8 +137,8 @@ public interface ValueVector extends Closeable, Iterable<ValueVector> {
    *
    * @param ref the name of the vector
    * @param allocator the target allocator
-   * @return a {@link org.apache.arrow.vector.util.TransferPair transfer pair}, creating a new target vector of
-   *         the same type.
+   * @return a {@link org.apache.arrow.vector.util.TransferPair transfer pair}, creating a new
+   *     target vector of the same type.
    */
   TransferPair getTransferPair(String ref, BufferAllocator allocator);
 
@@ -147,8 +147,8 @@ public interface ValueVector extends Closeable, Iterable<ValueVector> {
    *
    * @param field the Field object used by the target vector
    * @param allocator the target allocator
-   * @return a {@link org.apache.arrow.vector.util.TransferPair transfer pair}, creating a new target vector of
-   *         the same type.
+   * @return a {@link org.apache.arrow.vector.util.TransferPair transfer pair}, creating a new
+   *     target vector of the same type.
    */
   TransferPair getTransferPair(Field field, BufferAllocator allocator);
 
@@ -158,8 +158,8 @@ public interface ValueVector extends Closeable, Iterable<ValueVector> {
    * @param ref the name of the vector
    * @param allocator the target allocator
    * @param callBack A schema change callback.
-   * @return a {@link org.apache.arrow.vector.util.TransferPair transfer pair}, creating a new target vector of
-   *         the same type.
+   * @return a {@link org.apache.arrow.vector.util.TransferPair transfer pair}, creating a new
+   *     target vector of the same type.
    */
   TransferPair getTransferPair(String ref, BufferAllocator allocator, CallBack callBack);
 
@@ -169,8 +169,8 @@ public interface ValueVector extends Closeable, Iterable<ValueVector> {
    * @param field the Field object used by the target vector
    * @param allocator the target allocator
    * @param callBack A schema change callback.
-   * @return a {@link org.apache.arrow.vector.util.TransferPair transfer pair}, creating a new target vector of
-   *         the same type.
+   * @return a {@link org.apache.arrow.vector.util.TransferPair transfer pair}, creating a new
+   *     target vector of the same type.
    */
   TransferPair getTransferPair(Field field, BufferAllocator allocator, CallBack callBack);
 
@@ -178,16 +178,16 @@ public interface ValueVector extends Closeable, Iterable<ValueVector> {
    * Makes a new transfer pair used to transfer underlying buffers.
    *
    * @param target the target for the transfer
-   * @return a new {@link org.apache.arrow.vector.util.TransferPair transfer pair} that is used to transfer underlying
-   *         buffers into the target vector.
+   * @return a new {@link org.apache.arrow.vector.util.TransferPair transfer pair} that is used to
+   *     transfer underlying buffers into the target vector.
    */
   TransferPair makeTransferPair(ValueVector target);
 
   /**
    * Get a reader for this vector.
    *
-   * @return a {@link org.apache.arrow.vector.complex.reader.FieldReader field reader} that supports reading values
-   *         from this vector.
+   * @return a {@link org.apache.arrow.vector.complex.reader.FieldReader field reader} that supports
+   *     reading values from this vector.
    */
   FieldReader getReader();
 
@@ -199,12 +199,12 @@ public interface ValueVector extends Closeable, Iterable<ValueVector> {
   int getBufferSize();
 
   /**
-   * Returns the number of bytes that is used by this vector if it holds the given number
-   * of values. The result will be the same as if setValueCount() were called, followed
-   * by calling getBufferSize(), but without any of the closing side-effects that setValueCount()
-   * implies wrt finishing off the population of a vector. Some operations might wish to use
-   * this to determine how much memory has been used by a vector so far, even though it is
-   * not finished being populated.
+   * Returns the number of bytes that is used by this vector if it holds the given number of values.
+   * The result will be the same as if setValueCount() were called, followed by calling
+   * getBufferSize(), but without any of the closing side-effects that setValueCount() implies wrt
+   * finishing off the population of a vector. Some operations might wish to use this to determine
+   * how much memory has been used by a vector so far, even though it is not finished being
+   * populated.
    *
    * @param valueCount the number of values to assume this vector contains
    * @return the buffer size if this vector is holding valueCount values
@@ -212,12 +212,13 @@ public interface ValueVector extends Closeable, Iterable<ValueVector> {
   int getBufferSizeFor(int valueCount);
 
   /**
-   * Return the underlying buffers associated with this vector. Note that this doesn't impact the reference counts for
-   * this buffer so it only should be used for in-context access. Also note that this buffer changes regularly thus
-   * external classes shouldn't hold a reference to it (unless they change it).
+   * Return the underlying buffers associated with this vector. Note that this doesn't impact the
+   * reference counts for this buffer so it only should be used for in-context access. Also note
+   * that this buffer changes regularly thus external classes shouldn't hold a reference to it
+   * (unless they change it).
    *
    * @param clear Whether to clear vector before returning; the buffers will still be refcounted;
-   *              but the returned array will be the only reference to them
+   *     but the returned array will be the only reference to them
    * @return The underlying {@link ArrowBuf buffers} that is used by this vector instance.
    */
   ArrowBuf[] getBuffers(boolean clear);
@@ -250,9 +251,7 @@ public interface ValueVector extends Closeable, Iterable<ValueVector> {
    */
   int getValueCount();
 
-  /**
-   * Set number of values in the vector.
-   */
+  /** Set number of values in the vector. */
   void setValueCount(int valueCount);
 
   /**
@@ -278,39 +277,35 @@ public interface ValueVector extends Closeable, Iterable<ValueVector> {
    */
   boolean isNull(int index);
 
-  /**
-   * Returns hashCode of element in index with the default hasher.
-   */
+  /** Returns hashCode of element in index with the default hasher. */
   int hashCode(int index);
 
-  /**
-   * Returns hashCode of element in index with the given hasher.
-   */
+  /** Returns hashCode of element in index with the given hasher. */
   int hashCode(int index, ArrowBufHasher hasher);
 
   /**
-   * Copy a cell value from a particular index in source vector to a particular
-   * position in this vector.
+   * Copy a cell value from a particular index in source vector to a particular position in this
+   * vector.
    *
    * @param fromIndex position to copy from in source vector
    * @param thisIndex position to copy to in this vector
-   * @param from      source vector
+   * @param from source vector
    */
   void copyFrom(int fromIndex, int thisIndex, ValueVector from);
 
   /**
-   * Same as {@link #copyFrom(int, int, ValueVector)} except that
-   * it handles the case when the capacity of the vector needs to be expanded
-   * before copy.
+   * Same as {@link #copyFrom(int, int, ValueVector)} except that it handles the case when the
+   * capacity of the vector needs to be expanded before copy.
    *
    * @param fromIndex position to copy from in source vector
    * @param thisIndex position to copy to in this vector
-   * @param from      source vector
+   * @param from source vector
    */
   void copyFromSafe(int fromIndex, int thisIndex, ValueVector from);
 
   /**
    * Accept a generic {@link VectorVisitor} and return the result.
+   *
    * @param <OUT> the output result type.
    * @param <IN> the input data together with visitor.
    */
@@ -318,6 +313,7 @@ public interface ValueVector extends Closeable, Iterable<ValueVector> {
 
   /**
    * Gets the name of the vector.
+   *
    * @return the name of the vector.
    */
   String getName();
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/VarBinaryVector.java b/java/vector/src/main/java/org/apache/arrow/vector/VarBinaryVector.java
index ab67ebad965aa..7196e9c910c13 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/VarBinaryVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/VarBinaryVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -31,15 +30,14 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * VarBinaryVector implements a variable width vector of binary
- * values which could be NULL. A validity buffer (bit vector) is maintained
- * to track which elements in the vector are null.
+ * VarBinaryVector implements a variable width vector of binary values which could be NULL. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
  */
-public final class VarBinaryVector extends BaseVariableWidthVector {
+public final class VarBinaryVector extends BaseVariableWidthVector
+    implements ValueIterableVector<byte[]> {
 
   /**
-   * Instantiate a VarBinaryVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a VarBinaryVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param allocator allocator for memory management.
@@ -49,8 +47,7 @@ public VarBinaryVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a VarBinaryVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a VarBinaryVector. This doesn't allocate any memory for the data in vector.
    *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
@@ -61,8 +58,7 @@ public VarBinaryVector(String name, FieldType fieldType, BufferAllocator allocat
   }
 
   /**
-   * Instantiate a VarBinaryVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a VarBinaryVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -77,8 +73,7 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
    *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
@@ -87,18 +82,16 @@ public MinorType getMinorType() {
     return MinorType.VARBINARY;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the variable length element at specified index as byte array.
    *
-   * @param index   position of element to get
+   * @param index position of element to get
    * @return array of bytes for non-null element, null otherwise
    */
   public byte[] get(int index) {
@@ -114,12 +107,13 @@ public byte[] get(int index) {
   }
 
   /**
-   * Read the value at the given position to the given output buffer.
-   * The caller is responsible for checking for nullity first.
+   * Read the value at the given position to the given output buffer. The caller is responsible for
+   * checking for nullity first.
    *
    * @param index position of element.
    * @param buffer the buffer to write into.
    */
+  @Override
   public void read(int index, ReusableBuffer<?> buffer) {
     final int startOffset = getStartOffset(index);
     final int dataLength = getEndOffset(index) - startOffset;
@@ -129,7 +123,7 @@ public void read(int index, ReusableBuffer<?> buffer) {
   /**
    * Get the variable length element at specified index as Text.
    *
-   * @param index   position of element to get
+   * @param index position of element to get
    * @return byte array for non-null element, null otherwise
    */
   @Override
@@ -138,11 +132,10 @@ public byte[] getObject(int index) {
   }
 
   /**
-   * Get the variable length element at specified index and sets the state
-   * in provided holder.
+   * Get the variable length element at specified index and sets the state in provided holder.
    *
-   * @param index   position of element to get
-   * @param holder  data holder to be populated by this function
+   * @param index position of element to get
+   * @param holder data holder to be populated by this function
    */
   public void get(int index, NullableVarBinaryHolder holder) {
     assert index >= 0;
@@ -156,20 +149,18 @@ public void get(int index, NullableVarBinaryHolder holder) {
     holder.buffer = valueBuffer;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Set the variable length element at the specified index to the data
-   * buffer supplied in the holder.
+   * Set the variable length element at the specified index to the data buffer supplied in the
+   * holder.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void set(int index, VarBinaryHolder holder) {
     assert index >= 0;
@@ -183,12 +174,11 @@ public void set(int index, VarBinaryHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, VarBinaryHolder)} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, VarBinaryHolder)} except that it handles the case where index and
+   * length of new element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void setSafe(int index, VarBinaryHolder holder) {
     assert index >= 0;
@@ -203,11 +193,11 @@ public void setSafe(int index, VarBinaryHolder holder) {
   }
 
   /**
-   * Set the variable length element at the specified index to the data
-   * buffer supplied in the holder.
+   * Set the variable length element at the specified index to the data buffer supplied in the
+   * holder.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void set(int index, NullableVarBinaryHolder holder) {
     assert index >= 0;
@@ -225,12 +215,11 @@ public void set(int index, NullableVarBinaryHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, NullableVarBinaryHolder)} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, NullableVarBinaryHolder)} except that it handles the case where index
+   * and length of new element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void setSafe(int index, NullableVarBinaryHolder holder) {
     assert index >= 0;
@@ -248,16 +237,14 @@ public void setSafe(int index, NullableVarBinaryHolder holder) {
     lastSet = index;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising of this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising of this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/VarCharVector.java b/java/vector/src/main/java/org/apache/arrow/vector/VarCharVector.java
index c6d5a7090bc6f..c81e34558c6f6 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/VarCharVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/VarCharVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
@@ -33,15 +32,15 @@
 import org.apache.arrow.vector.validate.ValidateUtil;
 
 /**
- * VarCharVector implements a variable width vector of VARCHAR
- * values which could be NULL. A validity buffer (bit vector) is maintained
- * to track which elements in the vector are null.
+ * VarCharVector implements a variable width vector of VARCHAR values which could be NULL. A
+ * validity buffer (bit vector) is maintained to track which elements in the vector are null.
  */
-public final class VarCharVector extends BaseVariableWidthVector {
+public final class VarCharVector extends BaseVariableWidthVector
+    implements ValueIterableVector<Text> {
 
   /**
-   * Instantiate a VarCharVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a VarCharVector. This doesn't allocate any memory for the data in vector.
+   *
    * @param name name of the vector
    * @param allocator allocator for memory management.
    */
@@ -50,8 +49,8 @@ public VarCharVector(String name, BufferAllocator allocator) {
   }
 
   /**
-   * Instantiate a VarCharVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a VarCharVector. This doesn't allocate any memory for the data in vector.
+   *
    * @param name name of the vector
    * @param fieldType type of Field materialized by this vector
    * @param allocator allocator for memory management.
@@ -61,8 +60,7 @@ public VarCharVector(String name, FieldType fieldType, BufferAllocator allocator
   }
 
   /**
-   * Instantiate a VarCharVector. This doesn't allocate any memory for
-   * the data in vector.
+   * Instantiate a VarCharVector. This doesn't allocate any memory for the data in vector.
    *
    * @param field field materialized by this vector
    * @param allocator allocator for memory management.
@@ -77,8 +75,8 @@ protected FieldReader getReaderImpl() {
   }
 
   /**
-   * Get minor type for this vector. The vector holds values belonging
-   * to a particular type.
+   * Get minor type for this vector. The vector holds values belonging to a particular type.
+   *
    * @return {@link org.apache.arrow.vector.types.Types.MinorType}
    */
   @Override
@@ -86,18 +84,16 @@ public MinorType getMinorType() {
     return MinorType.VARCHAR;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value retrieval methods                        |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
    * Get the variable length element at specified index as byte array.
    *
-   * @param index   position of element to get
+   * @param index position of element to get
    * @return array of bytes for non-null element, null otherwise
    */
   public byte[] get(int index) {
@@ -115,7 +111,7 @@ public byte[] get(int index) {
   /**
    * Get the variable length element at specified index as Text.
    *
-   * @param index   position of element to get
+   * @param index position of element to get
    * @return Text object for non-null element, null otherwise
    */
   @Override
@@ -131,12 +127,13 @@ public Text getObject(int index) {
   }
 
   /**
-   * Read the value at the given position to the given output buffer.
-   * The caller is responsible for checking for nullity first.
+   * Read the value at the given position to the given output buffer. The caller is responsible for
+   * checking for nullity first.
    *
    * @param index position of element.
    * @param buffer the buffer to write into.
    */
+  @Override
   public void read(int index, ReusableBuffer<?> buffer) {
     final int startOffset = getStartOffset(index);
     final int dataLength = getEndOffset(index) - startOffset;
@@ -144,11 +141,10 @@ public void read(int index, ReusableBuffer<?> buffer) {
   }
 
   /**
-   * Get the variable length element at specified index and sets the state
-   * in provided holder.
+   * Get the variable length element at specified index and sets the state in provided holder.
    *
-   * @param index   position of element to get
-   * @param holder  data holder to be populated by this function
+   * @param index position of element to get
+   * @param holder data holder to be populated by this function
    */
   public void get(int index, NullableVarCharHolder holder) {
     assert index >= 0;
@@ -162,20 +158,18 @@ public void get(int index, NullableVarCharHolder holder) {
     holder.buffer = valueBuffer;
   }
 
-
   /*----------------------------------------------------------------*
-   |                                                                |
-   |          vector value setter methods                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
-
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Set the variable length element at the specified index to the data
-   * buffer supplied in the holder.
+   * Set the variable length element at the specified index to the data buffer supplied in the
+   * holder.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void set(int index, VarCharHolder holder) {
     assert index >= 0;
@@ -189,12 +183,11 @@ public void set(int index, VarCharHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, VarCharHolder)} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, VarCharHolder)} except that it handles the case where index and length
+   * of new element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void setSafe(int index, VarCharHolder holder) {
     assert index >= 0;
@@ -210,11 +203,11 @@ public void setSafe(int index, VarCharHolder holder) {
   }
 
   /**
-   * Set the variable length element at the specified index to the data
-   * buffer supplied in the holder.
+   * Set the variable length element at the specified index to the data buffer supplied in the
+   * holder.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void set(int index, NullableVarCharHolder holder) {
     assert index >= 0;
@@ -232,12 +225,11 @@ public void set(int index, NullableVarCharHolder holder) {
   }
 
   /**
-   * Same as {@link #set(int, NullableVarCharHolder)} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, NullableVarCharHolder)} except that it handles the case where index
+   * and length of new element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set
-   * @param holder  holder that carries data buffer.
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
    */
   public void setSafe(int index, NullableVarCharHolder holder) {
     assert index >= 0;
@@ -256,23 +248,21 @@ public void setSafe(int index, NullableVarCharHolder holder) {
   }
 
   /**
-   * Set the variable length element at the specified index to the
-   * content in supplied Text.
+   * Set the variable length element at the specified index to the content in supplied Text.
    *
-   * @param index   position of the element to set
-   * @param text    Text object with data
+   * @param index position of the element to set
+   * @param text Text object with data
    */
   public void set(int index, Text text) {
     set(index, text.getBytes(), 0, (int) text.getLength());
   }
 
   /**
-   * Same as {@link #set(int, NullableVarCharHolder)} except that it handles the
-   * case where index and length of new element are beyond the existing
-   * capacity of the vector.
+   * Same as {@link #set(int, NullableVarCharHolder)} except that it handles the case where index
+   * and length of new element are beyond the existing capacity of the vector.
    *
-   * @param index   position of the element to set.
-   * @param text    Text object with data
+   * @param index position of the element to set.
+   * @param text Text object with data
    */
   public void setSafe(int index, Text text) {
     setSafe(index, text.getBytes(), 0, (int) text.getLength());
@@ -283,21 +273,21 @@ public void validateScalars() {
     for (int i = 0; i < getValueCount(); ++i) {
       byte[] value = get(i);
       if (value != null) {
-        ValidateUtil.validateOrThrow(Text.validateUTF8NoThrow(value),
+        ValidateUtil.validateOrThrow(
+            Text.validateUTF8NoThrow(value),
             "Non-UTF-8 data in VarCharVector at position " + i + ".");
       }
     }
   }
 
   /*----------------------------------------------------------------*
-   |                                                                |
-   |                      vector transfer                           |
-   |                                                                |
-   *----------------------------------------------------------------*/
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
 
   /**
-   * Construct a TransferPair comprising of this and a target vector of
-   * the same type.
+   * Construct a TransferPair comprising of this and a target vector of the same type.
    *
    * @param ref name of the target vector
    * @param allocator allocator for the target vector
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/VariableWidthFieldVector.java b/java/vector/src/main/java/org/apache/arrow/vector/VariableWidthFieldVector.java
new file mode 100644
index 0000000000000..fc3c8384610a8
--- /dev/null
+++ b/java/vector/src/main/java/org/apache/arrow/vector/VariableWidthFieldVector.java
@@ -0,0 +1,139 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.vector;
+
+import java.nio.ByteBuffer;
+import org.apache.arrow.memory.ReusableBuffer;
+
+/** A base interface for common functionalities in variable width vectors. */
+public interface VariableWidthFieldVector
+    extends VariableWidthVector, FieldVector, VectorDefinitionSetter {
+
+  /**
+   * Set the variable length element at the specified index to the supplied byte array.
+   *
+   * @param index position of the element to set
+   * @param value array of bytes with data
+   */
+  void set(int index, byte[] value);
+
+  /**
+   * Set the variable length element at the specified index to the supplied byte array.
+   *
+   * @param index position of the element to set
+   * @param value array of bytes with data
+   * @param start start position in the array
+   * @param length length of the data to write
+   */
+  void set(int index, byte[] value, int start, int length);
+
+  /**
+   * Set the variable length element at the specified index to the supplied ByteBuffer.
+   *
+   * @param index position of the element to set
+   * @param value ByteBuffer with data
+   * @param start start position in the ByteBuffer
+   * @param length length of the data to write
+   */
+  void set(int index, ByteBuffer value, int start, int length);
+
+  /**
+   * Set the variable length element at the specified index to the supplied byte array, and it
+   * handles the case where index and length of a new element are beyond the existing capacity of
+   * the vector.
+   *
+   * @param index position of the element to set
+   * @param value array of bytes to write
+   */
+  void setSafe(int index, byte[] value);
+
+  /**
+   * Set the variable length element at the specified index to the supplied byte array, and it
+   * handles the case where index and length of a new element are beyond the existing capacity.
+   *
+   * @param index position of the element to set
+   * @param value array of bytes with data
+   * @param start start position in the array
+   * @param length length of the data to write
+   */
+  void setSafe(int index, byte[] value, int start, int length);
+
+  /**
+   * Set the variable length element at the specified index to the supplied ByteBuffer, and it
+   * handles the case where index and length of a new element are beyond the existing capacity.
+   *
+   * @param index position of the element to set
+   * @param value ByteBuffer with data
+   * @param start start position in the ByteBuffer
+   * @param length length of the data to write
+   */
+  void setSafe(int index, ByteBuffer value, int start, int length);
+
+  /**
+   * Get the variable length element at the specified index.
+   *
+   * @param index position of the element to get
+   * @return byte array with the data
+   */
+  byte[] get(int index);
+
+  /**
+   * Get the variable length element at the specified index using a ReusableBuffer.
+   *
+   * @param index position of the element to get
+   * @param buffer ReusableBuffer to write the data to
+   */
+  void read(int index, ReusableBuffer<?> buffer);
+
+  /**
+   * Get the index of the last non-null element in the vector.
+   *
+   * @return index of the last non-null element
+   */
+  int getLastSet();
+
+  /**
+   * Set the index of the last non-null element in the vector.
+   *
+   * @param value desired index of last non-null element
+   */
+  void setLastSet(int value);
+
+  /**
+   * Get the variable length element at specified index as Text.
+   *
+   * @param index position of an element to get
+   * @return greater than length 0 for a non-null element, 0 otherwise
+   */
+  int getValueLength(int index);
+
+  /**
+   * Create holes in the vector upto the given index (exclusive). Holes will be created from the
+   * current last-set position in the vector.
+   *
+   * @param index target index
+   */
+  void fillEmpties(int index);
+
+  /**
+   * Sets the value length for an element.
+   *
+   * @param index position of the element to set
+   * @param length length of the element
+   */
+  void setValueLengthSafe(int index, int length);
+}
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/VariableWidthVector.java b/java/vector/src/main/java/org/apache/arrow/vector/VariableWidthVector.java
index f6b8364e31be8..f95d6de24142d 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/VariableWidthVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/VariableWidthVector.java
@@ -14,16 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-/**
- * Interface vectors that contain variable width members (e.g. Strings, Lists, etc).
- */
+/** Interface vectors that contain variable width members (e.g. Strings, Lists, etc). */
 public interface VariableWidthVector extends ElementAddressableVector, DensityAwareVector {
 
   /**
-   * Allocate a new memory space for this vector.  Must be called prior to using the ValueVector.
+   * Allocate a new memory space for this vector. Must be called prior to using the ValueVector.
    *
    * @param totalBytes Desired size of the underlying data buffer.
    * @param valueCount Number of values in the vector.
@@ -31,8 +28,8 @@ public interface VariableWidthVector extends ElementAddressableVector, DensityAw
   void allocateNew(long totalBytes, int valueCount);
 
   /**
-   * Allocate a new memory space for this vector.  Must be called prior to using the ValueVector.
-   * The initial size in bytes is either default (or) reused from previous allocation
+   * Allocate a new memory space for this vector. Must be called prior to using the ValueVector. The
+   * initial size in bytes is either default (or) reused from previous allocation
    *
    * @param valueCount Number of values in the vector.
    */
@@ -47,6 +44,7 @@ public interface VariableWidthVector extends ElementAddressableVector, DensityAw
 
   /**
    * Provide the number of bytes contained in the valueBuffer.
+   *
    * @return the number of bytes in valueBuffer.
    */
   int sizeOfValueBuffer();
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/VectorDefinitionSetter.java b/java/vector/src/main/java/org/apache/arrow/vector/VectorDefinitionSetter.java
index 39804ee417026..e8830327b2ada 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/VectorDefinitionSetter.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/VectorDefinitionSetter.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-/**
- * Interface for setting a specific index values as defined/valid on a vector.
- */
+/** Interface for setting a specific index values as defined/valid on a vector. */
 public interface VectorDefinitionSetter {
 
   void setIndexDefined(int index);
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/VectorLoader.java b/java/vector/src/main/java/org/apache/arrow/vector/VectorLoader.java
index 510cef24c7e16..c076161bc21d6 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/VectorLoader.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/VectorLoader.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.util.Preconditions.checkArgument;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.util.Collections2;
 import org.apache.arrow.vector.compression.CompressionCodec;
@@ -32,9 +31,7 @@
 import org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
 import org.apache.arrow.vector.types.pojo.Field;
 
-/**
- * Loads buffers into vectors.
- */
+/** Loads buffers into vectors. */
 public class VectorLoader {
 
   private final VectorSchemaRoot root;
@@ -42,8 +39,8 @@ public class VectorLoader {
   private final CompressionCodec.Factory factory;
 
   /**
-   * A flag indicating if decompression is needed.
-   * This will affect the behavior of releasing buffers.
+   * A flag indicating if decompression is needed. This will affect the behavior of releasing
+   * buffers.
    */
   private boolean decompressionNeeded;
 
@@ -68,8 +65,7 @@ public VectorLoader(VectorSchemaRoot root, CompressionCodec.Factory factory) {
   }
 
   /**
-   * Loads the record batch in the vectors.
-   * will not close the record batch
+   * Loads the record batch in the vectors. will not close the record batch
    *
    * @param recordBatch the batch to load
    */
@@ -79,14 +75,27 @@ public void load(ArrowRecordBatch recordBatch) {
     CompressionUtil.CodecType codecType =
         CompressionUtil.CodecType.fromCompressionType(recordBatch.getBodyCompression().getCodec());
     decompressionNeeded = codecType != CompressionUtil.CodecType.NO_COMPRESSION;
-    CompressionCodec codec = decompressionNeeded ? factory.createCodec(codecType) : NoCompressionCodec.INSTANCE;
+    CompressionCodec codec =
+        decompressionNeeded ? factory.createCodec(codecType) : NoCompressionCodec.INSTANCE;
+    Iterator<Long> variadicBufferCounts = Collections.emptyIterator();
+    ;
+    if (recordBatch.getVariadicBufferCounts() != null
+        && !recordBatch.getVariadicBufferCounts().isEmpty()) {
+      variadicBufferCounts = recordBatch.getVariadicBufferCounts().iterator();
+    }
+
     for (FieldVector fieldVector : root.getFieldVectors()) {
-      loadBuffers(fieldVector, fieldVector.getField(), buffers, nodes, codec);
+      loadBuffers(fieldVector, fieldVector.getField(), buffers, nodes, codec, variadicBufferCounts);
     }
     root.setRowCount(recordBatch.getLength());
-    if (nodes.hasNext() || buffers.hasNext()) {
-      throw new IllegalArgumentException("not all nodes and buffers were consumed. nodes: " +
-          Collections2.toString(nodes) + " buffers: " + Collections2.toString(buffers));
+    if (nodes.hasNext() || buffers.hasNext() || variadicBufferCounts.hasNext()) {
+      throw new IllegalArgumentException(
+          "not all nodes, buffers and variadicBufferCounts were consumed. nodes: "
+              + Collections2.toString(nodes)
+              + " buffers: "
+              + Collections2.toString(buffers)
+              + " variadicBufferCounts: "
+              + Collections2.toString(variadicBufferCounts));
     }
   }
 
@@ -95,15 +104,28 @@ private void loadBuffers(
       Field field,
       Iterator<ArrowBuf> buffers,
       Iterator<ArrowFieldNode> nodes,
-      CompressionCodec codec) {
+      CompressionCodec codec,
+      Iterator<Long> variadicBufferCounts) {
     checkArgument(nodes.hasNext(), "no more field nodes for field %s and vector %s", field, vector);
     ArrowFieldNode fieldNode = nodes.next();
-    int bufferLayoutCount = TypeLayout.getTypeBufferCount(field.getType());
+    // variadicBufferLayoutCount will be 0 for vectors of a type except BaseVariableWidthViewVector
+    long variadicBufferLayoutCount = 0;
+    if (vector instanceof BaseVariableWidthViewVector) {
+      if (variadicBufferCounts.hasNext()) {
+        variadicBufferLayoutCount = variadicBufferCounts.next();
+      } else {
+        throw new IllegalStateException(
+            "No variadicBufferCounts available for BaseVariableWidthViewVector");
+      }
+    }
+    int bufferLayoutCount =
+        (int) (variadicBufferLayoutCount + TypeLayout.getTypeBufferCount(field.getType()));
     List<ArrowBuf> ownBuffers = new ArrayList<>(bufferLayoutCount);
     for (int j = 0; j < bufferLayoutCount; j++) {
       ArrowBuf nextBuf = buffers.next();
       // for vectors without nulls, the buffer is empty, so there is no need to decompress it.
-      ArrowBuf bufferToAdd = nextBuf.writerIndex() > 0 ? codec.decompress(vector.getAllocator(), nextBuf) : nextBuf;
+      ArrowBuf bufferToAdd =
+          nextBuf.writerIndex() > 0 ? codec.decompress(vector.getAllocator(), nextBuf) : nextBuf;
       ownBuffers.add(bufferToAdd);
       if (decompressionNeeded) {
         // decompression performed
@@ -118,19 +140,21 @@ private void loadBuffers(
         }
       }
     } catch (RuntimeException e) {
-      throw new IllegalArgumentException("Could not load buffers for field " +
-          field + ". error message: " + e.getMessage(), e);
+      throw new IllegalArgumentException(
+          "Could not load buffers for field " + field + ". error message: " + e.getMessage(), e);
     }
     List<Field> children = field.getChildren();
     if (children.size() > 0) {
       List<FieldVector> childrenFromFields = vector.getChildrenFromFields();
-      checkArgument(children.size() == childrenFromFields.size(),
+      checkArgument(
+          children.size() == childrenFromFields.size(),
           "should have as many children as in the schema: found %s expected %s",
-          childrenFromFields.size(), children.size());
+          childrenFromFields.size(),
+          children.size());
       for (int i = 0; i < childrenFromFields.size(); i++) {
         Field child = children.get(i);
         FieldVector fieldVector = childrenFromFields.get(i);
-        loadBuffers(fieldVector, child, buffers, nodes, codec);
+        loadBuffers(fieldVector, child, buffers, nodes, codec, variadicBufferCounts);
       }
     }
   }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/VectorSchemaRoot.java b/java/vector/src/main/java/org/apache/arrow/vector/VectorSchemaRoot.java
index 8768a90c80b83..a7cb9ced72141 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/VectorSchemaRoot.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/VectorSchemaRoot.java
@@ -14,17 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.util.Preconditions;
@@ -38,16 +37,16 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * Holder for a set of vectors to be loaded/unloaded.
- * A VectorSchemaRoot is a container that can hold batches, batches flow through VectorSchemaRoot
- * as part of a pipeline. Note this is different from other implementations (i.e. in C++ and Python,
- * a RecordBatch is a collection of equal-length vector instances and was created each time for a new batch).
-
- * The recommended usage for VectorSchemaRoot is creating a single VectorSchemaRoot based on the known
- * schema and populated data over and over into the same VectorSchemaRoot in a stream of batches rather
- * than create a new VectorSchemaRoot instance each time (see Flight or ArrowFileWriter for better understanding).
- * Thus at any one point a VectorSchemaRoot may have data or may have no data (say it was transferred downstream
- * or not yet populated).
+ * Holder for a set of vectors to be loaded/unloaded. A VectorSchemaRoot is a container that can
+ * hold batches, batches flow through VectorSchemaRoot as part of a pipeline. Note this is different
+ * from other implementations (i.e. in C++ and Python, a RecordBatch is a collection of equal-length
+ * vector instances and was created each time for a new batch).
+ *
+ * <p>The recommended usage for VectorSchemaRoot is creating a single VectorSchemaRoot based on the
+ * known schema and populated data over and over into the same VectorSchemaRoot in a stream of
+ * batches rather than create a new VectorSchemaRoot instance each time (see Flight or
+ * ArrowFileWriter for better understanding). Thus at any one point a VectorSchemaRoot may have data
+ * or may have no data (say it was transferred downstream or not yet populated).
  */
 public class VectorSchemaRoot implements AutoCloseable {
 
@@ -56,20 +55,16 @@ public class VectorSchemaRoot implements AutoCloseable {
   private final List<FieldVector> fieldVectors;
   private final Map<Field, FieldVector> fieldVectorsMap = new LinkedHashMap<>();
 
-
-  /**
-   * Constructs new instance containing each of the vectors.
-   */
+  /** Constructs new instance containing each of the vectors. */
   public VectorSchemaRoot(Iterable<FieldVector> vectors) {
     this(
-        StreamSupport.stream(vectors.spliterator(), false).map(t -> t.getField()).collect(Collectors.toList()),
-        StreamSupport.stream(vectors.spliterator(), false).collect(Collectors.toList())
-    );
+        StreamSupport.stream(vectors.spliterator(), false)
+            .map(t -> t.getField())
+            .collect(Collectors.toList()),
+        StreamSupport.stream(vectors.spliterator(), false).collect(Collectors.toList()));
   }
 
-  /**
-   * Constructs a new instance containing the children of parent but not the parent itself.
-   */
+  /** Constructs a new instance containing the children of parent but not the parent itself. */
   public VectorSchemaRoot(FieldVector parent) {
     this(parent.getField().getChildren(), parent.getChildrenFromFields(), parent.getValueCount());
   }
@@ -81,7 +76,10 @@ public VectorSchemaRoot(FieldVector parent) {
    * @param fieldVectors The data vectors (must be equal in size to <code>fields</code>.
    */
   public VectorSchemaRoot(List<Field> fields, List<FieldVector> fieldVectors) {
-    this(new Schema(fields), fieldVectors, fieldVectors.size() == 0 ? 0 : fieldVectors.get(0).getValueCount());
+    this(
+        new Schema(fields),
+        fieldVectors,
+        fieldVectors.size() == 0 ? 0 : fieldVectors.get(0).getValueCount());
   }
 
   /**
@@ -100,12 +98,16 @@ public VectorSchemaRoot(List<Field> fields, List<FieldVector> fieldVectors, int
    *
    * @param schema The schema for the vectors.
    * @param fieldVectors The data vectors.
-   * @param rowCount  The number of rows
+   * @param rowCount The number of rows
    */
   public VectorSchemaRoot(Schema schema, List<FieldVector> fieldVectors, int rowCount) {
     if (schema.getFields().size() != fieldVectors.size()) {
-      throw new IllegalArgumentException("Fields must match field vectors. Found " +
-          fieldVectors.size() + " vectors and " + schema.getFields().size() + " fields");
+      throw new IllegalArgumentException(
+          "Fields must match field vectors. Found "
+              + fieldVectors.size()
+              + " vectors and "
+              + schema.getFields().size()
+              + " fields");
     }
     this.schema = schema;
     this.rowCount = rowCount;
@@ -117,18 +119,19 @@ public VectorSchemaRoot(Schema schema, List<FieldVector> fieldVectors, int rowCo
     }
   }
 
-  /**
-   * Creates a new set of empty vectors corresponding to the given schema.
-   */
+  /** Creates a new set of empty vectors corresponding to the given schema. */
   public static VectorSchemaRoot create(Schema schema, BufferAllocator allocator) {
-    List<FieldVector> fieldVectors = new ArrayList<>();
+    List<FieldVector> fieldVectors = new ArrayList<>(schema.getFields().size());
     for (Field field : schema.getFields()) {
       FieldVector vector = field.createVector(allocator);
       fieldVectors.add(vector);
     }
     if (fieldVectors.size() != schema.getFields().size()) {
-      throw new IllegalArgumentException("The root vector did not create the right number of children. found " +
-          fieldVectors.size() + " expected " + schema.getFields().size());
+      throw new IllegalArgumentException(
+          "The root vector did not create the right number of children. found "
+              + fieldVectors.size()
+              + " expected "
+              + schema.getFields().size());
     }
     return new VectorSchemaRoot(schema, fieldVectors, 0);
   }
@@ -150,7 +153,8 @@ public void allocateNew() {
   }
 
   /**
-   * Release all the memory for each vector held in this root. This DOES NOT remove vectors from the container.
+   * Release all the memory for each vector held in this root. This DOES NOT remove vectors from the
+   * container.
    */
   public void clear() {
     for (FieldVector v : fieldVectors) {
@@ -160,16 +164,16 @@ public void clear() {
   }
 
   public List<FieldVector> getFieldVectors() {
-    return fieldVectors.stream().collect(Collectors.toList());
+    return Collections.unmodifiableList(fieldVectors);
   }
 
   /**
    * gets a vector by name.
    *
-   * if name occurs multiple times this returns the first inserted entry for name
+   * <p>if name occurs multiple times this returns the first inserted entry for name
    */
   public FieldVector getVector(String name) {
-    for (Map.Entry<Field, FieldVector> entry: fieldVectorsMap.entrySet()) {
+    for (Map.Entry<Field, FieldVector> entry : fieldVectorsMap.entrySet()) {
       if (entry.getKey().getName().equals(name)) {
         return entry.getValue();
       }
@@ -188,6 +192,7 @@ public FieldVector getVector(int index) {
 
   /**
    * Add vector to the record batch, producing a new VectorSchemaRoot.
+   *
    * @param index field index
    * @param vector vector to be added.
    * @return out VectorSchemaRoot with vector added
@@ -207,6 +212,7 @@ public VectorSchemaRoot addVector(int index, FieldVector vector) {
 
   /**
    * Remove vector from the record batch, producing a new VectorSchemaRoot.
+   *
    * @param index field index
    * @return out VectorSchemaRoot with vector removed
    */
@@ -230,13 +236,14 @@ public int getRowCount() {
   }
 
   /**
-   * Set the row count of all the vectors in this container. Also sets the value
-   * count for each root level contained FieldVector.
+   * Set the row count of all the vectors in this container. Also sets the value count for each root
+   * level contained FieldVector.
+   *
    * @param rowCount Number of records.
    */
   public void setRowCount(int rowCount) {
     this.rowCount = rowCount;
-    for (FieldVector v : getFieldVectors()) {
+    for (FieldVector v : fieldVectors) {
       v.setValueCount(rowCount);
     }
   }
@@ -266,9 +273,7 @@ private void printRow(StringBuilder sb, List<Object> row) {
     sb.append("\n");
   }
 
-  /**
-   * Returns a tab separated value of vectors (based on their java object representation).
-   */
+  /** Returns a tab separated value of vectors (based on their java object representation). */
   public String contentToTSVString() {
     StringBuilder sb = new StringBuilder();
     List<Object> row = new ArrayList<>(schema.getFields().size());
@@ -287,18 +292,19 @@ public String contentToTSVString() {
   }
 
   /**
-   * Synchronizes the schema from the current vectors.
-   * In some cases, the schema and the actual vector structure may be different.
-   * This can be caused by a promoted writer (For details, please see
-   * {@link org.apache.arrow.vector.complex.impl.PromotableWriter}).
-   * For example, when writing different types of data to a {@link org.apache.arrow.vector.complex.ListVector}
-   * may lead to such a case.
-   * When this happens, this method should be called to bring the schema and vector structure in a synchronized state.
+   * Synchronizes the schema from the current vectors. In some cases, the schema and the actual
+   * vector structure may be different. This can be caused by a promoted writer (For details, please
+   * see {@link org.apache.arrow.vector.complex.impl.PromotableWriter}). For example, when writing
+   * different types of data to a {@link org.apache.arrow.vector.complex.ListVector} may lead to
+   * such a case. When this happens, this method should be called to bring the schema and vector
+   * structure in a synchronized state.
+   *
    * @return true if the schema is updated, false otherwise.
    */
   public boolean syncSchema() {
     List<Field> oldFields = this.schema.getFields();
-    List<Field> newFields = this.fieldVectors.stream().map(ValueVector::getField).collect(Collectors.toList());
+    List<Field> newFields =
+        this.fieldVectors.stream().map(ValueVector::getField).collect(Collectors.toList());
     if (!oldFields.equals(newFields)) {
       this.schema = new Schema(newFields);
       return true;
@@ -308,6 +314,7 @@ public boolean syncSchema() {
 
   /**
    * Slice this root from desired index.
+   *
    * @param index start position of the slice
    * @return the sliced root
    */
@@ -317,6 +324,7 @@ public VectorSchemaRoot slice(int index) {
 
   /**
    * Slice this root at desired index and length.
+   *
    * @param index start position of the slice
    * @param length length of the slice
    * @return the sliced root
@@ -324,21 +332,22 @@ public VectorSchemaRoot slice(int index) {
   public VectorSchemaRoot slice(int index, int length) {
     Preconditions.checkArgument(index >= 0, "expecting non-negative index");
     Preconditions.checkArgument(length >= 0, "expecting non-negative length");
-    Preconditions.checkArgument(index + length <= rowCount,
-        "index + length should <= rowCount");
-
-    List<FieldVector> sliceVectors = fieldVectors.stream().map(v -> {
-      TransferPair transferPair = v.getTransferPair(v.getAllocator());
-      transferPair.splitAndTransfer(index, length);
-      return (FieldVector) transferPair.getTo();
-    }).collect(Collectors.toList());
+    Preconditions.checkArgument(index + length <= rowCount, "index + length should <= rowCount");
+
+    List<FieldVector> sliceVectors =
+        fieldVectors.stream()
+            .map(
+                v -> {
+                  TransferPair transferPair = v.getTransferPair(v.getAllocator());
+                  transferPair.splitAndTransfer(index, length);
+                  return (FieldVector) transferPair.getTo();
+                })
+            .collect(Collectors.toList());
 
     return new VectorSchemaRoot(sliceVectors);
   }
 
-  /**
-   * Determine if two VectorSchemaRoots are exactly equal.
-   */
+  /** Determine if two VectorSchemaRoots are exactly equal. */
   public boolean equals(VectorSchemaRoot other) {
     if (other == null) {
       return false;
@@ -365,9 +374,8 @@ public boolean equals(VectorSchemaRoot other) {
 
   /**
    * Determine if two VectorSchemaRoots are approximately equal using the given functions to
-   * calculate difference between float/double values.
-   * Note that approx equals are in regards to floating point values, other values are comparing
-   * to exactly equals.
+   * calculate difference between float/double values. Note that approx equals are in regards to
+   * floating point values, other values are comparing to exactly equals.
    *
    * @param floatDiffFunction function to calculate difference between float values.
    * @param doubleDiffFunction function to calculate difference between double values.
@@ -411,15 +419,16 @@ public boolean approxEquals(
   }
 
   /**
-   * Determine if two VectorSchemaRoots are approximately equal using default functions to
-   * calculate difference between float/double values.
+   * Determine if two VectorSchemaRoots are approximately equal using default functions to calculate
+   * difference between float/double values.
    */
   public boolean approxEquals(VectorSchemaRoot other) {
     VectorValueEqualizer<Float4Vector> floatDiffFunction =
-        new ValueEpsilonEqualizers.Float4EpsilonEqualizer(ApproxEqualsVisitor.DEFAULT_FLOAT_EPSILON);
+        new ValueEpsilonEqualizers.Float4EpsilonEqualizer(
+            ApproxEqualsVisitor.DEFAULT_FLOAT_EPSILON);
     VectorValueEqualizer<Float8Vector> doubleDiffFunction =
-        new ValueEpsilonEqualizers.Float8EpsilonEqualizer(ApproxEqualsVisitor.DEFAULT_DOUBLE_EPSILON);
+        new ValueEpsilonEqualizers.Float8EpsilonEqualizer(
+            ApproxEqualsVisitor.DEFAULT_DOUBLE_EPSILON);
     return approxEquals(other, floatDiffFunction, doubleDiffFunction);
   }
 }
-
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/VectorUnloader.java b/java/vector/src/main/java/org/apache/arrow/vector/VectorUnloader.java
index 1d44e37ac71af..342f210b827df 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/VectorUnloader.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/VectorUnloader.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.vector.compression.CompressionCodec;
 import org.apache.arrow.vector.compression.CompressionUtil;
@@ -28,8 +26,7 @@
 import org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
 
 /**
- * Helper class that handles converting a {@link VectorSchemaRoot}
- * to a {@link ArrowRecordBatch}.
+ * Helper class that handles converting a {@link VectorSchemaRoot} to a {@link ArrowRecordBatch}.
  */
 public class VectorUnloader {
 
@@ -38,9 +35,7 @@ public class VectorUnloader {
   private final CompressionCodec codec;
   private final boolean alignBuffers;
 
-  /**
-   * Constructs a new instance of the given set of vectors.
-   */
+  /** Constructs a new instance of the given set of vectors. */
   public VectorUnloader(VectorSchemaRoot root) {
     this(root, true, NoCompressionCodec.INSTANCE, true);
   }
@@ -48,25 +43,27 @@ public VectorUnloader(VectorSchemaRoot root) {
   /**
    * Constructs a new instance.
    *
-   * @param root  The set of vectors to serialize to an {@link ArrowRecordBatch}.
+   * @param root The set of vectors to serialize to an {@link ArrowRecordBatch}.
    * @param includeNullCount Controls whether null count is copied to the {@link ArrowRecordBatch}
    * @param alignBuffers Controls if buffers get aligned to 8-byte boundaries.
    */
-  public VectorUnloader(
-      VectorSchemaRoot root, boolean includeNullCount, boolean alignBuffers) {
+  public VectorUnloader(VectorSchemaRoot root, boolean includeNullCount, boolean alignBuffers) {
     this(root, includeNullCount, NoCompressionCodec.INSTANCE, alignBuffers);
   }
 
   /**
    * Constructs a new instance.
    *
-   * @param root  The set of vectors to serialize to an {@link ArrowRecordBatch}.
+   * @param root The set of vectors to serialize to an {@link ArrowRecordBatch}.
    * @param includeNullCount Controls whether null count is copied to the {@link ArrowRecordBatch}
    * @param codec the codec for compressing data. If it is null, then no compression is needed.
    * @param alignBuffers Controls if buffers get aligned to 8-byte boundaries.
    */
   public VectorUnloader(
-      VectorSchemaRoot root, boolean includeNullCount, CompressionCodec codec, boolean alignBuffers) {
+      VectorSchemaRoot root,
+      boolean includeNullCount,
+      CompressionCodec codec,
+      boolean alignBuffers) {
     this.root = root;
     this.includeNullCount = includeNullCount;
     this.codec = codec == null ? NoCompressionCodec.INSTANCE : codec;
@@ -74,41 +71,67 @@ public VectorUnloader(
   }
 
   /**
-   * Performs the depth first traversal of the Vectors to create an {@link ArrowRecordBatch} suitable
-   * for serialization.
+   * Performs the depth first traversal of the Vectors to create an {@link ArrowRecordBatch}
+   * suitable for serialization.
    */
   public ArrowRecordBatch getRecordBatch() {
     List<ArrowFieldNode> nodes = new ArrayList<>();
     List<ArrowBuf> buffers = new ArrayList<>();
+    List<Long> variadicBufferCounts = new ArrayList<>();
     for (FieldVector vector : root.getFieldVectors()) {
-      appendNodes(vector, nodes, buffers);
+      appendNodes(vector, nodes, buffers, variadicBufferCounts);
     }
     // Do NOT retain buffers in ArrowRecordBatch constructor since we have already retained them.
     return new ArrowRecordBatch(
-        root.getRowCount(), nodes, buffers, CompressionUtil.createBodyCompression(codec), alignBuffers,
-        /*retainBuffers*/ false);
+        root.getRowCount(),
+        nodes,
+        buffers,
+        CompressionUtil.createBodyCompression(codec),
+        variadicBufferCounts,
+        alignBuffers, /*retainBuffers*/
+        false);
   }
 
-  private void appendNodes(FieldVector vector, List<ArrowFieldNode> nodes, List<ArrowBuf> buffers) {
-    nodes.add(new ArrowFieldNode(vector.getValueCount(), includeNullCount ? vector.getNullCount() : -1));
+  private long getVariadicBufferCount(FieldVector vector) {
+    if (vector instanceof BaseVariableWidthViewVector) {
+      return ((BaseVariableWidthViewVector) vector).getDataBuffers().size();
+    }
+    return 0L;
+  }
+
+  private void appendNodes(
+      FieldVector vector,
+      List<ArrowFieldNode> nodes,
+      List<ArrowBuf> buffers,
+      List<Long> variadicBufferCounts) {
+    nodes.add(
+        new ArrowFieldNode(vector.getValueCount(), includeNullCount ? vector.getNullCount() : -1));
     List<ArrowBuf> fieldBuffers = vector.getFieldBuffers();
-    int expectedBufferCount = TypeLayout.getTypeBufferCount(vector.getField().getType());
+    long variadicBufferCount = getVariadicBufferCount(vector);
+    int expectedBufferCount =
+        (int) (TypeLayout.getTypeBufferCount(vector.getField().getType()) + variadicBufferCount);
+    // only update variadicBufferCounts for vectors that have variadic buffers
+    if (vector instanceof BaseVariableWidthViewVector) {
+      variadicBufferCounts.add(variadicBufferCount);
+    }
     if (fieldBuffers.size() != expectedBufferCount) {
-      throw new IllegalArgumentException(String.format(
-          "wrong number of buffers for field %s in vector %s. found: %s",
-          vector.getField(), vector.getClass().getSimpleName(), fieldBuffers));
+      throw new IllegalArgumentException(
+          String.format(
+              "wrong number of buffers for field %s in vector %s. found: %s",
+              vector.getField(), vector.getClass().getSimpleName(), fieldBuffers));
     }
     for (ArrowBuf buf : fieldBuffers) {
-      // If the codec is NoCompressionCodec, then it will return the input buffer unchanged. In that case,
-      // we need to retain it for ArrowRecordBatch. Otherwise, it will return a new buffer, and also close
+      // If the codec is NoCompressionCodec, then it will return the input buffer unchanged. In that
+      // case,
+      // we need to retain it for ArrowRecordBatch. Otherwise, it will return a new buffer, and also
+      // close
       // the input buffer. In that case, we need to retain the input buffer still to avoid modifying
       // the source VectorSchemaRoot.
       buf.getReferenceManager().retain();
       buffers.add(codec.compress(vector.getAllocator(), buf));
     }
     for (FieldVector child : vector.getChildrenFromFields()) {
-      appendNodes(child, nodes, buffers);
+      appendNodes(child, nodes, buffers, variadicBufferCounts);
     }
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ViewVarBinaryVector.java b/java/vector/src/main/java/org/apache/arrow/vector/ViewVarBinaryVector.java
new file mode 100644
index 0000000000000..9481831fbd143
--- /dev/null
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ViewVarBinaryVector.java
@@ -0,0 +1,262 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.vector;
+
+import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
+
+import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.memory.ReusableBuffer;
+import org.apache.arrow.vector.complex.impl.ViewVarBinaryReaderImpl;
+import org.apache.arrow.vector.complex.reader.FieldReader;
+import org.apache.arrow.vector.holders.NullableViewVarBinaryHolder;
+import org.apache.arrow.vector.holders.ViewVarBinaryHolder;
+import org.apache.arrow.vector.types.Types.MinorType;
+import org.apache.arrow.vector.types.pojo.Field;
+import org.apache.arrow.vector.types.pojo.FieldType;
+import org.apache.arrow.vector.util.TransferPair;
+
+/**
+ * ViewVarBinaryVector implements a variable width view vector of binary values which could be NULL.
+ * A validity buffer (bit vector) is maintained to track which elements in the vector are null.
+ */
+public final class ViewVarBinaryVector extends BaseVariableWidthViewVector
+    implements ValueIterableVector<byte[]> {
+
+  /**
+   * Instantiate a ViewVarBinaryVector. This doesn't allocate any memory for the data in vector.
+   *
+   * @param name name of the vector
+   * @param allocator allocator for memory management.
+   */
+  public ViewVarBinaryVector(String name, BufferAllocator allocator) {
+    this(name, FieldType.nullable(MinorType.VIEWVARBINARY.getType()), allocator);
+  }
+
+  /**
+   * Instantiate a ViewVarBinaryVector. This doesn't allocate any memory for the data in vector.
+   *
+   * @param name name of the vector
+   * @param fieldType type of Field materialized by this vector
+   * @param allocator allocator for memory management.
+   */
+  public ViewVarBinaryVector(String name, FieldType fieldType, BufferAllocator allocator) {
+    this(new Field(name, fieldType, null), allocator);
+  }
+
+  /**
+   * Instantiate a ViewVarBinaryVector. This doesn't allocate any memory for the data in vector.
+   *
+   * @param field field materialized by this vector
+   * @param allocator allocator for memory management.
+   */
+  public ViewVarBinaryVector(Field field, BufferAllocator allocator) {
+    super(field, allocator);
+  }
+
+  @Override
+  protected FieldReader getReaderImpl() {
+    return new ViewVarBinaryReaderImpl(ViewVarBinaryVector.this);
+  }
+
+  /**
+   * Get a minor type for this vector. The vector holds values belonging to a particular type.
+   *
+   * @return {@link org.apache.arrow.vector.types.Types.MinorType}
+   */
+  @Override
+  public MinorType getMinorType() {
+    return MinorType.VIEWVARBINARY;
+  }
+
+  /*----------------------------------------------------------------*
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
+
+  /**
+   * Get the variable length element at specified index as a byte array.
+   *
+   * @param index position of an element to get
+   * @return array of bytes for a non-null element, null otherwise
+   */
+  public byte[] get(int index) {
+    assert index >= 0;
+    if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
+      return null;
+    }
+    return getData(index);
+  }
+
+  /**
+   * Read the value at the given position to the given output buffer. The caller is responsible for
+   * checking for nullity first.
+   *
+   * @param index position of an element.
+   * @param buffer the buffer to write into.
+   */
+  @Override
+  public void read(int index, ReusableBuffer<?> buffer) {
+    getData(index, buffer);
+  }
+
+  /**
+   * Get the variable length element at a specified index as a byte array.
+   *
+   * @param index position of an element to get
+   * @return byte array for a non-null element, null otherwise
+   */
+  @Override
+  public byte[] getObject(int index) {
+    return get(index);
+  }
+
+  /**
+   * Get the variable length element at specified index and sets the state in provided holder.
+   *
+   * @param index position of an element to get
+   * @param holder data holder to be populated by this function
+   */
+  public void get(int index, NullableViewVarBinaryHolder holder) {
+    // TODO: https://github.com/apache/arrow/issues/40936
+    throw new UnsupportedOperationException("Unsupported operation");
+  }
+
+  /*----------------------------------------------------------------*
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
+
+  /**
+   * Set the variable length element at the specified index to the data buffer supplied in the
+   * holder.
+   *
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
+   */
+  public void set(int index, ViewVarBinaryHolder holder) {
+    // TODO: https://github.com/apache/arrow/issues/40936
+    throw new UnsupportedOperationException("Unsupported operation");
+  }
+
+  /**
+   * Same as {@link #set(int, ViewVarBinaryHolder)} except that it handles the case where index and
+   * length of a new element are beyond the existing capacity of the vector.
+   *
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
+   */
+  public void setSafe(int index, ViewVarBinaryHolder holder) {
+    // TODO: https://github.com/apache/arrow/issues/40936
+    throw new UnsupportedOperationException("Unsupported operation");
+  }
+
+  /**
+   * Set the variable length element at the specified index to the data buffer supplied in the
+   * holder.
+   *
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
+   */
+  public void set(int index, NullableViewVarBinaryHolder holder) {
+    // TODO: https://github.com/apache/arrow/issues/40936
+    throw new UnsupportedOperationException("Unsupported operation");
+  }
+
+  /**
+   * Same as {@link #set(int, NullableViewVarBinaryHolder)} except that it handles the case where
+   * index and length of a new element are beyond the existing capacity of the vector.
+   *
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
+   */
+  public void setSafe(int index, NullableViewVarBinaryHolder holder) {
+    // TODO: https://github.com/apache/arrow/issues/40936
+    throw new UnsupportedOperationException("Unsupported operation");
+  }
+
+  /*----------------------------------------------------------------*
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
+
+  /**
+   * Construct a TransferPair comprising this and a target vector of the same type.
+   *
+   * @param ref name of the target vector
+   * @param allocator allocator for the target vector
+   * @return {@link TransferPair}
+   */
+  @Override
+  public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
+    return new TransferImpl(ref, allocator);
+  }
+
+  @Override
+  public TransferPair getTransferPair(Field field, BufferAllocator allocator) {
+    return new TransferImpl(field, allocator);
+  }
+
+  /**
+   * Construct a TransferPair with a desired target vector of the same type.
+   *
+   * @param to target vector
+   * @return {@link TransferPair}
+   */
+  @Override
+  public TransferPair makeTransferPair(ValueVector to) {
+    return new TransferImpl((ViewVarBinaryVector) to);
+  }
+
+  private class TransferImpl implements TransferPair {
+    ViewVarBinaryVector to;
+
+    public TransferImpl(String ref, BufferAllocator allocator) {
+      to = new ViewVarBinaryVector(ref, field.getFieldType(), allocator);
+    }
+
+    public TransferImpl(Field field, BufferAllocator allocator) {
+      to = new ViewVarBinaryVector(field, allocator);
+    }
+
+    public TransferImpl(ViewVarBinaryVector to) {
+      this.to = to;
+    }
+
+    @Override
+    public ViewVarBinaryVector getTo() {
+      return to;
+    }
+
+    @Override
+    public void transfer() {
+      transferTo(to);
+    }
+
+    @Override
+    public void splitAndTransfer(int startIndex, int length) {
+      splitAndTransferTo(startIndex, length, to);
+    }
+
+    @Override
+    public void copyValueSafe(int fromIndex, int toIndex) {
+      to.copyFromSafe(fromIndex, toIndex, ViewVarBinaryVector.this);
+    }
+  }
+}
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ViewVarCharVector.java b/java/vector/src/main/java/org/apache/arrow/vector/ViewVarCharVector.java
new file mode 100644
index 0000000000000..900e0493fe804
--- /dev/null
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ViewVarCharVector.java
@@ -0,0 +1,316 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.vector;
+
+import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
+
+import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.memory.ReusableBuffer;
+import org.apache.arrow.vector.complex.impl.ViewVarCharReaderImpl;
+import org.apache.arrow.vector.complex.reader.FieldReader;
+import org.apache.arrow.vector.holders.NullableViewVarCharHolder;
+import org.apache.arrow.vector.holders.ViewVarCharHolder;
+import org.apache.arrow.vector.types.Types.MinorType;
+import org.apache.arrow.vector.types.pojo.Field;
+import org.apache.arrow.vector.types.pojo.FieldType;
+import org.apache.arrow.vector.util.Text;
+import org.apache.arrow.vector.util.TransferPair;
+import org.apache.arrow.vector.validate.ValidateUtil;
+
+/**
+ * ViewVarCharVector implements a view of a variable width vector of VARCHAR values which could be
+ * NULL. A validity buffer (bit vector) is maintained to track which elements in the vector are
+ * null. A viewBuffer keeps track of all values in the vector, and an external data buffer is kept
+ * to keep longer strings (>12).
+ */
+public final class ViewVarCharVector extends BaseVariableWidthViewVector
+    implements ValueIterableVector<Text> {
+
+  /**
+   * Instantiate a ViewVarCharVector. This doesn't allocate any memory for the data in vector.
+   *
+   * @param name name of the vector
+   * @param allocator allocator for memory management.
+   */
+  public ViewVarCharVector(String name, BufferAllocator allocator) {
+    this(name, FieldType.nullable(MinorType.VIEWVARCHAR.getType()), allocator);
+  }
+
+  /**
+   * Instantiate a ViewVarCharVector. This doesn't allocate any memory for the data in vector.
+   *
+   * @param name name of the vector
+   * @param fieldType type of Field materialized by this vector
+   * @param allocator allocator for memory management.
+   */
+  public ViewVarCharVector(String name, FieldType fieldType, BufferAllocator allocator) {
+    this(new Field(name, fieldType, null), allocator);
+  }
+
+  /**
+   * Instantiate a ViewVarCharVector. This doesn't allocate any memory for the data in vector.
+   *
+   * @param field field materialized by this vector
+   * @param allocator allocator for memory management.
+   */
+  public ViewVarCharVector(Field field, BufferAllocator allocator) {
+    super(field, allocator);
+  }
+
+  @Override
+  protected FieldReader getReaderImpl() {
+    return new ViewVarCharReaderImpl(ViewVarCharVector.this);
+  }
+
+  /**
+   * Get a minor type for this vector. The vector holds values belonging to a particular type.
+   *
+   * @return {@link org.apache.arrow.vector.types.Types.MinorType}
+   */
+  @Override
+  public MinorType getMinorType() {
+    return MinorType.VIEWVARCHAR;
+  }
+
+  /*----------------------------------------------------------------*
+  |                                                                |
+  |          vector value retrieval methods                        |
+  |                                                                |
+  *----------------------------------------------------------------*/
+
+  /**
+   * Get the variable length element at specified index as a byte array.
+   *
+   * @param index position of an element to get
+   * @return array of bytes for a non-null element, null otherwise
+   */
+  public byte[] get(int index) {
+    assert index >= 0;
+    if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
+      return null;
+    }
+    return getData(index);
+  }
+
+  /**
+   * Get the variable length element at specified index as Text.
+   *
+   * @param index position of an element to get
+   * @return Text object for a non-null element, null otherwise
+   */
+  @Override
+  public Text getObject(int index) {
+    assert index >= 0;
+    if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
+      return null;
+    }
+
+    final Text result = new Text();
+    read(index, result);
+    return result;
+  }
+
+  /**
+   * Read the value at the given position to the given output buffer. The caller is responsible for
+   * checking for nullity first.
+   *
+   * @param index position of an element.
+   * @param buffer the buffer to write into.
+   */
+  @Override
+  public void read(int index, ReusableBuffer<?> buffer) {
+    getData(index, buffer);
+  }
+
+  /**
+   * Get the variable length element at specified index and sets the state in provided holder.
+   *
+   * @param index position of an element to get
+   * @param holder data holder to be populated by this function
+   */
+  public void get(int index, NullableViewVarCharHolder holder) {
+    // TODO: https://github.com/apache/arrow/issues/40937
+    throw new UnsupportedOperationException(
+        "NullableViewVarCharHolder get operation not supported");
+  }
+
+  /*----------------------------------------------------------------*
+  |                                                                |
+  |          vector value setter methods                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
+
+  /**
+   * Set the variable length element at the specified index to the data buffer supplied in the
+   * holder.
+   *
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
+   */
+  public void set(int index, ViewVarCharHolder holder) {
+    // TODO: https://github.com/apache/arrow/issues/40937
+    throw new UnsupportedOperationException("ViewVarCharHolder set operation not supported");
+  }
+
+  /**
+   * Same as {@link #set(int, ViewVarCharHolder)} except that it handles the case where index and
+   * length of a new element are beyond the existing capacity of the vector.
+   *
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
+   */
+  public void setSafe(int index, ViewVarCharHolder holder) {
+    // TODO: https://github.com/apache/arrow/issues/40937
+    throw new UnsupportedOperationException("ViewVarCharHolder setSafe operation not supported");
+  }
+
+  /**
+   * Set the variable length element at the specified index to the data buffer supplied in the
+   * holder.
+   *
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
+   */
+  public void set(int index, NullableViewVarCharHolder holder) {
+    // TODO: https://github.com/apache/arrow/issues/40937
+    throw new UnsupportedOperationException(
+        "NullableViewVarCharHolder set operation not supported");
+  }
+
+  /**
+   * Same as {@link #set(int, NullableViewVarCharHolder)} except that it handles the case where
+   * index and length of a new element are beyond the existing capacity of the vector.
+   *
+   * @param index position of the element to set
+   * @param holder holder that carries data buffer.
+   */
+  public void setSafe(int index, NullableViewVarCharHolder holder) {
+    // TODO: https://github.com/apache/arrow/issues/40937
+    throw new UnsupportedOperationException(
+        "NullableViewVarCharHolder setSafe operation not supported");
+  }
+
+  /**
+   * Set the variable length element at the specified index to the content in supplied Text.
+   *
+   * @param index position of the element to set
+   * @param text Text object with data
+   */
+  public void set(int index, Text text) {
+    set(index, text.getBytes(), 0, (int) text.getLength());
+  }
+
+  /**
+   * Same as {@link #set(int, NullableViewVarCharHolder)} except that it handles the case where
+   * index and length of a new element are beyond the existing capacity of the vector.
+   *
+   * @param index position of the element to set.
+   * @param text Text object with data
+   */
+  public void setSafe(int index, Text text) {
+    setSafe(index, text.getBytes(), 0, (int) text.getLength());
+  }
+
+  @Override
+  public void validateScalars() {
+    for (int i = 0; i < getValueCount(); ++i) {
+      byte[] value = get(i);
+      if (value != null) {
+        ValidateUtil.validateOrThrow(
+            Text.validateUTF8NoThrow(value),
+            "Non-UTF-8 data in VarCharVector at position " + i + ".");
+      }
+    }
+  }
+
+  /*----------------------------------------------------------------*
+  |                                                                |
+  |                      vector transfer                           |
+  |                                                                |
+  *----------------------------------------------------------------*/
+
+  /**
+   * Construct a TransferPair comprising this and a target vector of the same type.
+   *
+   * @param ref name of the target vector
+   * @param allocator allocator for the target vector
+   * @return {@link TransferPair} (UnsupportedOperationException)
+   */
+  @Override
+  public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
+    return new TransferImpl(ref, allocator);
+  }
+
+  /**
+   * Construct a TransferPair with a desired target vector of the same type.
+   *
+   * @param field The field materialized by this vector.
+   * @param allocator allocator for the target vector
+   * @return {@link TransferPair} (UnsupportedOperationException)
+   */
+  @Override
+  public TransferPair getTransferPair(Field field, BufferAllocator allocator) {
+    return new TransferImpl(field, allocator);
+  }
+
+  /**
+   * Construct a TransferPair with a desired target vector of the same type.
+   *
+   * @param to the target for the transfer
+   * @return {@link TransferPair} (UnsupportedOperationException)
+   */
+  @Override
+  public TransferPair makeTransferPair(ValueVector to) {
+    return new TransferImpl((ViewVarCharVector) to);
+  }
+
+  private class TransferImpl implements TransferPair {
+    ViewVarCharVector to;
+
+    public TransferImpl(String ref, BufferAllocator allocator) {
+      to = new ViewVarCharVector(ref, field.getFieldType(), allocator);
+    }
+
+    public TransferImpl(Field field, BufferAllocator allocator) {
+      to = new ViewVarCharVector(field, allocator);
+    }
+
+    public TransferImpl(ViewVarCharVector to) {
+      this.to = to;
+    }
+
+    @Override
+    public ViewVarCharVector getTo() {
+      return to;
+    }
+
+    @Override
+    public void transfer() {
+      transferTo(to);
+    }
+
+    @Override
+    public void splitAndTransfer(int startIndex, int length) {
+      splitAndTransferTo(startIndex, length, to);
+    }
+
+    @Override
+    public void copyValueSafe(int fromIndex, int toIndex) {
+      to.copyFromSafe(fromIndex, toIndex, ViewVarCharVector.this);
+    }
+  }
+}
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ZeroVector.java b/java/vector/src/main/java/org/apache/arrow/vector/ZeroVector.java
index 079b5c103aad6..c838de60d841a 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ZeroVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ZeroVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import org.apache.arrow.memory.BufferAllocator;
@@ -25,9 +24,7 @@
 import org.apache.arrow.vector.util.CallBack;
 import org.apache.arrow.vector.util.TransferPair;
 
-/**
- * A zero length vector of any type.
- */
+/** A zero length vector of any type. */
 public final class ZeroVector extends NullVector {
   public static final ZeroVector INSTANCE = new ZeroVector();
 
@@ -43,7 +40,7 @@ public ZeroVector(String name) {
   /**
    * Instantiate a ZeroVector.
    *
-   * @param name      name of the vector
+   * @param name name of the vector
    * @param fieldType type of Field materialized by this vector.
    */
   public ZeroVector(String name, FieldType fieldType) {
@@ -60,8 +57,7 @@ public ZeroVector(Field field) {
   }
 
   @Deprecated
-  public ZeroVector() {
-  }
+  public ZeroVector() {}
 
   @Override
   public int getValueCount() {
@@ -69,8 +65,7 @@ public int getValueCount() {
   }
 
   @Override
-  public void setValueCount(int valueCount) {
-  }
+  public void setValueCount(int valueCount) {}
 
   @Override
   public int getNullCount() {
@@ -117,22 +112,20 @@ public TransferPair makeTransferPair(ValueVector target) {
     return defaultPair;
   }
 
-  private final TransferPair defaultPair = new TransferPair() {
-    @Override
-    public void transfer() {
-    }
+  private final TransferPair defaultPair =
+      new TransferPair() {
+        @Override
+        public void transfer() {}
 
-    @Override
-    public void splitAndTransfer(int startIndex, int length) {
-    }
+        @Override
+        public void splitAndTransfer(int startIndex, int length) {}
 
-    @Override
-    public ValueVector getTo() {
-      return ZeroVector.this;
-    }
+        @Override
+        public ValueVector getTo() {
+          return ZeroVector.this;
+        }
 
-    @Override
-    public void copyValueSafe(int from, int to) {
-    }
-  };
+        @Override
+        public void copyValueSafe(int from, int to) {}
+      };
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/compare/ApproxEqualsVisitor.java b/java/vector/src/main/java/org/apache/arrow/vector/compare/ApproxEqualsVisitor.java
index bcf8c64e0cea5..a5adec66fd04e 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/compare/ApproxEqualsVisitor.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/compare/ApproxEqualsVisitor.java
@@ -14,41 +14,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.compare;
 
 import java.util.function.BiFunction;
-
 import org.apache.arrow.vector.BaseFixedWidthVector;
 import org.apache.arrow.vector.Float4Vector;
 import org.apache.arrow.vector.Float8Vector;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.compare.util.ValueEpsilonEqualizers;
 
-/**
- * Visitor to compare floating point vectors approximately.
- */
+/** Visitor to compare floating point vectors approximately. */
 public class ApproxEqualsVisitor extends RangeEqualsVisitor {
 
-  /**
-   * Functions to calculate difference between float/double values.
-   */
+  /** Functions to calculate difference between float/double values. */
   private final VectorValueEqualizer<Float4Vector> floatDiffFunction;
+
   private final VectorValueEqualizer<Float8Vector> doubleDiffFunction;
 
-  /**
-   * Default epsilons for diff functions.
-   */
+  /** Default epsilons for diff functions. */
   public static final float DEFAULT_FLOAT_EPSILON = 1.0E-6f;
+
   public static final double DEFAULT_DOUBLE_EPSILON = 1.0E-6;
 
   /**
    * Constructs a new instance with default tolerances.
+   *
    * @param left left vector
    * @param right right vector
    */
   public ApproxEqualsVisitor(ValueVector left, ValueVector right) {
-    this (left, right, DEFAULT_FLOAT_EPSILON, DEFAULT_DOUBLE_EPSILON);
+    this(left, right, DEFAULT_FLOAT_EPSILON, DEFAULT_DOUBLE_EPSILON);
   }
 
   /**
@@ -59,30 +54,36 @@ public ApproxEqualsVisitor(ValueVector left, ValueVector right) {
    * @param floatEpsilon difference for float values
    * @param doubleEpsilon difference for double values
    */
-  public ApproxEqualsVisitor(ValueVector left, ValueVector right, float floatEpsilon, double doubleEpsilon) {
-    this (left, right,
+  public ApproxEqualsVisitor(
+      ValueVector left, ValueVector right, float floatEpsilon, double doubleEpsilon) {
+    this(
+        left,
+        right,
         new ValueEpsilonEqualizers.Float4EpsilonEqualizer(floatEpsilon),
         new ValueEpsilonEqualizers.Float8EpsilonEqualizer(doubleEpsilon));
   }
 
-  /**
-   * Constructs a new instance.
-   */
-  public ApproxEqualsVisitor(ValueVector left, ValueVector right,
-                             VectorValueEqualizer<Float4Vector> floatDiffFunction,
-                             VectorValueEqualizer<Float8Vector> doubleDiffFunction) {
-    this (left, right, floatDiffFunction, doubleDiffFunction, DEFAULT_TYPE_COMPARATOR);
+  /** Constructs a new instance. */
+  public ApproxEqualsVisitor(
+      ValueVector left,
+      ValueVector right,
+      VectorValueEqualizer<Float4Vector> floatDiffFunction,
+      VectorValueEqualizer<Float8Vector> doubleDiffFunction) {
+    this(left, right, floatDiffFunction, doubleDiffFunction, DEFAULT_TYPE_COMPARATOR);
   }
 
   /**
    * Constructs a new instance.
+   *
    * @param left the left vector.
    * @param right the right vector.
    * @param floatDiffFunction the equalizer for float values.
    * @param doubleDiffFunction the equalizer for double values.
    * @param typeComparator type comparator to compare vector type.
    */
-  public ApproxEqualsVisitor(ValueVector left, ValueVector right,
+  public ApproxEqualsVisitor(
+      ValueVector left,
+      ValueVector right,
       VectorValueEqualizer<Float4Vector> floatDiffFunction,
       VectorValueEqualizer<Float8Vector> doubleDiffFunction,
       BiFunction<ValueVector, ValueVector, Boolean> typeComparator) {
@@ -110,9 +111,11 @@ public Boolean visit(BaseFixedWidthVector left, Range range) {
 
   @Override
   protected ApproxEqualsVisitor createInnerVisitor(
-      ValueVector left, ValueVector right,
+      ValueVector left,
+      ValueVector right,
       BiFunction<ValueVector, ValueVector, Boolean> typeComparator) {
-    return new ApproxEqualsVisitor(left, right, floatDiffFunction.clone(), doubleDiffFunction.clone(), typeComparator);
+    return new ApproxEqualsVisitor(
+        left, right, floatDiffFunction.clone(), doubleDiffFunction.clone(), typeComparator);
   }
 
   private boolean float4ApproxEquals(Range range) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/compare/Range.java b/java/vector/src/main/java/org/apache/arrow/vector/compare/Range.java
index 76db0734464ed..27bb04c8a5ea4 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/compare/Range.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/compare/Range.java
@@ -14,35 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.compare;
 
-/**
- * Wrapper for the parameters of comparing a range of values in two vectors.
- */
+/** Wrapper for the parameters of comparing a range of values in two vectors. */
 public class Range {
 
-  /**
-   * Start position in the left vector.
-   */
+  /** Start position in the left vector. */
   private int leftStart = -1;
 
-  /**
-   * Start position in the right vector.
-   */
+  /** Start position in the right vector. */
   private int rightStart = -1;
 
-  /**
-   * Length of the range.
-   */
+  /** Length of the range. */
   private int length = -1;
 
-
-  /**
-   * Constructs a new instance.
-   */
-  public Range() {
-  }
+  /** Constructs a new instance. */
+  public Range() {}
 
   /**
    * Constructs a new instance.
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/compare/RangeEqualsVisitor.java b/java/vector/src/main/java/org/apache/arrow/vector/compare/RangeEqualsVisitor.java
index 5323ddda838c8..3050649737355 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/compare/RangeEqualsVisitor.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/compare/RangeEqualsVisitor.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.compare;
 
 import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
 
 import java.util.List;
 import java.util.function.BiFunction;
-
+import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.util.ByteFunctionHelpers;
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.BaseFixedWidthVector;
 import org.apache.arrow.vector.BaseLargeVariableWidthVector;
 import org.apache.arrow.vector.BaseVariableWidthVector;
+import org.apache.arrow.vector.BaseVariableWidthViewVector;
 import org.apache.arrow.vector.BitVector;
 import org.apache.arrow.vector.ExtensionTypeVector;
 import org.apache.arrow.vector.NullVector;
@@ -39,9 +39,7 @@
 import org.apache.arrow.vector.complex.NonNullableStructVector;
 import org.apache.arrow.vector.complex.UnionVector;
 
-/**
- * Visitor to compare a range of values for vectors.
- */
+/** Visitor to compare a range of values for vectors. */
 public class RangeEqualsVisitor implements VectorVisitor<Boolean, Range> {
   private ValueVector left;
   private ValueVector right;
@@ -49,19 +47,18 @@ public class RangeEqualsVisitor implements VectorVisitor<Boolean, Range> {
   private BiFunction<ValueVector, ValueVector, Boolean> typeComparator;
   private boolean typeCompareResult;
 
-  /**
-   * Default type comparator.
-   */
+  /** Default type comparator. */
   public static final BiFunction<ValueVector, ValueVector, Boolean> DEFAULT_TYPE_COMPARATOR =
       (v1, v2) -> new TypeEqualsVisitor(v2).equals(v1);
 
   /**
    * Constructs a new instance with default type comparator.
+   *
    * @param left left vector
    * @param right right vector
    */
   public RangeEqualsVisitor(ValueVector left, ValueVector right) {
-    this (left, right, DEFAULT_TYPE_COMPARATOR);
+    this(left, right, DEFAULT_TYPE_COMPARATOR);
   }
 
   /**
@@ -79,10 +76,8 @@ public RangeEqualsVisitor(
     this.right = right;
     this.typeComparator = typeComparator;
 
-    Preconditions.checkArgument(left != null,
-        "left vector cannot be null");
-    Preconditions.checkArgument(right != null,
-        "right vector cannot be null");
+    Preconditions.checkArgument(left != null, "left vector cannot be null");
+    Preconditions.checkArgument(right != null, "right vector cannot be null");
 
     // type usually checks only once unless the left vector is changed.
     checkType();
@@ -96,9 +91,7 @@ private void checkType() {
     }
   }
 
-  /**
-   * Validate the passed left vector, if it is changed, reset and check type.
-   */
+  /** Validate the passed left vector, if it is changed, reset and check type. */
   protected boolean validate(ValueVector left) {
     if (left != this.left) {
       this.left = left;
@@ -107,25 +100,27 @@ protected boolean validate(ValueVector left) {
     return typeCompareResult;
   }
 
-  /**
-   * Check range equals.
-   */
+  /** Check range equals. */
   public boolean rangeEquals(Range range) {
     if (!typeCompareResult) {
       return false;
     }
 
-    Preconditions.checkArgument(range.getLeftStart() >= 0,
-        "leftStart %s must be non negative.", range.getLeftStart());
-    Preconditions.checkArgument(range.getRightStart() >= 0,
-        "rightStart %s must be non negative.", range.getRightStart());
+    Preconditions.checkArgument(
+        range.getLeftStart() >= 0, "leftStart %s must be non negative.", range.getLeftStart());
+    Preconditions.checkArgument(
+        range.getRightStart() >= 0, "rightStart %s must be non negative.", range.getRightStart());
 
-    Preconditions.checkArgument(range.getRightStart() + range.getLength() <= right.getValueCount(),
+    Preconditions.checkArgument(
+        range.getRightStart() + range.getLength() <= right.getValueCount(),
         "(rightStart + length) %s out of range[0, %s].",
-        range.getRightStart() + range.getLength(), right.getValueCount());
-    Preconditions.checkArgument(range.getLeftStart() + range.getLength() <= left.getValueCount(),
+        range.getRightStart() + range.getLength(),
+        right.getValueCount());
+    Preconditions.checkArgument(
+        range.getLeftStart() + range.getLength() <= left.getValueCount(),
         "(leftStart + length) %s out of range[0, %s].",
-        range.getLeftStart() + range.getLength(), left.getValueCount());
+        range.getLeftStart() + range.getLength(),
+        left.getValueCount());
 
     return left.accept(this, range);
   }
@@ -162,6 +157,14 @@ public Boolean visit(BaseLargeVariableWidthVector left, Range range) {
     return compareBaseLargeVariableWidthVectors(range);
   }
 
+  @Override
+  public Boolean visit(BaseVariableWidthViewVector left, Range range) {
+    if (!validate(left)) {
+      return false;
+    }
+    return compareBaseVariableWidthViewVectors(range);
+  }
+
   @Override
   public Boolean visit(ListVector left, Range range) {
     if (!validate(left)) {
@@ -226,13 +229,15 @@ public Boolean visit(ExtensionTypeVector<?> left, Range range) {
     ValueVector rightUnderlying = ((ExtensionTypeVector<?>) right).getUnderlyingVector();
     TypeEqualsVisitor typeVisitor = new TypeEqualsVisitor(rightUnderlying);
     RangeEqualsVisitor underlyingVisitor =
-            createInnerVisitor(left.getUnderlyingVector(), rightUnderlying, (l, r) -> typeVisitor.equals(l));
+        createInnerVisitor(
+            left.getUnderlyingVector(), rightUnderlying, (l, r) -> typeVisitor.equals(l));
     return underlyingVisitor.rangeEquals(range);
   }
 
   protected RangeEqualsVisitor createInnerVisitor(
-          ValueVector leftInner, ValueVector rightInner,
-          BiFunction<ValueVector, ValueVector, Boolean> typeComparator) {
+      ValueVector leftInner,
+      ValueVector rightInner,
+      BiFunction<ValueVector, ValueVector, Boolean> typeComparator) {
     return new RangeEqualsVisitor(leftInner, rightInner, typeComparator);
   }
 
@@ -255,7 +260,8 @@ protected boolean compareUnionVectors(Range range) {
       }
       TypeEqualsVisitor typeVisitor = new TypeEqualsVisitor(rightSubVector);
       RangeEqualsVisitor visitor =
-          createInnerVisitor(leftSubVector, rightSubVector, (left, right) -> typeVisitor.equals(left));
+          createInnerVisitor(
+              leftSubVector, rightSubVector, (left, right) -> typeVisitor.equals(left));
       if (!visitor.rangeEquals(subRange)) {
         return false;
       }
@@ -310,7 +316,8 @@ protected boolean compareDenseUnionVectors(Range range) {
       subRange.setLeftStart(leftOffset).setRightStart(rightOffset);
       TypeEqualsVisitor typeVisitor = new TypeEqualsVisitor(rightSubVector);
       RangeEqualsVisitor visitor =
-          createInnerVisitor(leftSubVector, rightSubVector, (left, right) -> typeVisitor.equals(left));
+          createInnerVisitor(
+              leftSubVector, rightSubVector, (left, right) -> typeVisitor.equals(left));
       if (!visitor.rangeEquals(subRange)) {
         return false;
       }
@@ -329,7 +336,8 @@ protected boolean compareStructVectors(Range range) {
 
     for (String name : leftChildNames) {
       RangeEqualsVisitor visitor =
-          createInnerVisitor(leftVector.getChild(name), rightVector.getChild(name), /*type comparator*/ null);
+          createInnerVisitor(
+              leftVector.getChild(name), rightVector.getChild(name), /*type comparator*/ null);
       if (!visitor.rangeEquals(range)) {
         return false;
       }
@@ -361,14 +369,21 @@ protected boolean compareBaseFixedWidthVectors(Range range) {
           int startIndexRight = typeWidth * rightIndex;
           int endIndexRight = typeWidth * (rightIndex + 1);
 
-          int ret = ByteFunctionHelpers.equal(leftVector.getDataBuffer(), startIndexLeft, endIndexLeft,
-              rightVector.getDataBuffer(), startIndexRight, endIndexRight);
+          int ret =
+              ByteFunctionHelpers.equal(
+                  leftVector.getDataBuffer(),
+                  startIndexLeft,
+                  endIndexLeft,
+                  rightVector.getDataBuffer(),
+                  startIndexRight,
+                  endIndexRight);
 
           if (ret == 0) {
             return false;
           }
         } else {
-          boolean ret = ((BitVector) leftVector).get(leftIndex) == ((BitVector) rightVector).get(rightIndex);
+          boolean ret =
+              ((BitVector) leftVector).get(leftIndex) == ((BitVector) rightVector).get(rightIndex);
           if (!ret) {
             return false;
           }
@@ -398,10 +413,17 @@ protected boolean compareBaseVariableWidthVectors(Range range) {
         final int endIndexLeft = leftVector.getOffsetBuffer().getInt((leftIndex + 1) * offsetWidth);
 
         final int startIndexRight = rightVector.getOffsetBuffer().getInt(rightIndex * offsetWidth);
-        final int endIndexRight = rightVector.getOffsetBuffer().getInt((rightIndex + 1) * offsetWidth);
-
-        int ret = ByteFunctionHelpers.equal(leftVector.getDataBuffer(), startIndexLeft, endIndexLeft,
-            rightVector.getDataBuffer(), startIndexRight, endIndexRight);
+        final int endIndexRight =
+            rightVector.getOffsetBuffer().getInt((rightIndex + 1) * offsetWidth);
+
+        int ret =
+            ByteFunctionHelpers.equal(
+                leftVector.getDataBuffer(),
+                startIndexLeft,
+                endIndexLeft,
+                rightVector.getDataBuffer(),
+                startIndexRight,
+                endIndexRight);
 
         if (ret == 0) {
           return false;
@@ -427,16 +449,117 @@ protected boolean compareBaseLargeVariableWidthVectors(Range range) {
       int offsetWidth = BaseLargeVariableWidthVector.OFFSET_WIDTH;
 
       if (!isNull) {
-        final long startIndexLeft = leftVector.getOffsetBuffer().getLong((long) leftIndex * offsetWidth);
-        final long endIndexLeft = leftVector.getOffsetBuffer().getLong((long) (leftIndex + 1) * offsetWidth);
+        final long startIndexLeft =
+            leftVector.getOffsetBuffer().getLong((long) leftIndex * offsetWidth);
+        final long endIndexLeft =
+            leftVector.getOffsetBuffer().getLong((long) (leftIndex + 1) * offsetWidth);
+
+        final long startIndexRight =
+            rightVector.getOffsetBuffer().getLong((long) rightIndex * offsetWidth);
+        final long endIndexRight =
+            rightVector.getOffsetBuffer().getLong((long) (rightIndex + 1) * offsetWidth);
+
+        int ret =
+            ByteFunctionHelpers.equal(
+                leftVector.getDataBuffer(),
+                startIndexLeft,
+                endIndexLeft,
+                rightVector.getDataBuffer(),
+                startIndexRight,
+                endIndexRight);
+
+        if (ret == 0) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
 
-        final long startIndexRight = rightVector.getOffsetBuffer().getLong((long) rightIndex * offsetWidth);
-        final long endIndexRight = rightVector.getOffsetBuffer().getLong((long) (rightIndex + 1) * offsetWidth);
+  protected boolean compareBaseVariableWidthViewVectors(Range range) {
+    BaseVariableWidthViewVector leftVector = (BaseVariableWidthViewVector) left;
+    BaseVariableWidthViewVector rightVector = (BaseVariableWidthViewVector) right;
 
-        int ret = ByteFunctionHelpers.equal(leftVector.getDataBuffer(), startIndexLeft, endIndexLeft,
-            rightVector.getDataBuffer(), startIndexRight, endIndexRight);
+    final ArrowBuf leftViewBuffer = leftVector.getDataBuffer();
+    final ArrowBuf rightViewBuffer = rightVector.getDataBuffer();
 
-        if (ret == 0) {
+    final int elementSize = BaseVariableWidthViewVector.ELEMENT_SIZE;
+    final int lengthWidth = BaseVariableWidthViewVector.LENGTH_WIDTH;
+    final int prefixWidth = BaseVariableWidthViewVector.PREFIX_WIDTH;
+    final int bufIndexWidth = BaseVariableWidthViewVector.BUF_INDEX_WIDTH;
+
+    List<ArrowBuf> leftDataBuffers = leftVector.getDataBuffers();
+    List<ArrowBuf> rightDataBuffers = rightVector.getDataBuffers();
+
+    for (int i = 0; i < range.getLength(); i++) {
+      int leftIndex = range.getLeftStart() + i;
+      int rightIndex = range.getRightStart() + i;
+
+      boolean isNull = leftVector.isNull(leftIndex);
+      if (isNull != rightVector.isNull(rightIndex)) {
+        return false;
+      }
+
+      if (isNull) {
+        continue;
+      }
+
+      int startLeftByteOffset = leftIndex * elementSize;
+
+      int startRightByteOffset = rightIndex * elementSize;
+
+      int leftDataBufferValueLength = leftVector.getValueLength(leftIndex);
+      int rightDataBufferValueLength = rightVector.getValueLength(rightIndex);
+
+      if (leftDataBufferValueLength != rightDataBufferValueLength) {
+        return false;
+      }
+
+      if (leftDataBufferValueLength > BaseVariableWidthViewVector.INLINE_SIZE) {
+        // if the value is stored in the dataBuffers
+        int leftDataBufferIndex =
+            leftViewBuffer.getInt(startLeftByteOffset + lengthWidth + prefixWidth);
+        int rightDataBufferIndex =
+            rightViewBuffer.getInt(startRightByteOffset + lengthWidth + prefixWidth);
+
+        final int leftDataOffset =
+            leftViewBuffer.getInt(startLeftByteOffset + lengthWidth + prefixWidth + bufIndexWidth);
+        final int rightDataOffset =
+            rightViewBuffer.getInt(
+                startRightByteOffset + lengthWidth + prefixWidth + bufIndexWidth);
+
+        ArrowBuf leftDataBuffer = leftDataBuffers.get(leftDataBufferIndex);
+        ArrowBuf rightDataBuffer = rightDataBuffers.get(rightDataBufferIndex);
+
+        // check equality in the considered string stored in the dataBuffers
+        int retDataBuf =
+            ByteFunctionHelpers.equal(
+                leftDataBuffer,
+                leftDataOffset,
+                leftDataOffset + leftDataBufferValueLength,
+                rightDataBuffer,
+                rightDataOffset,
+                rightDataOffset + rightDataBufferValueLength);
+
+        if (retDataBuf == 0) {
+          return false;
+        }
+      } else {
+        // if the value is stored in the view
+        final int leftDataOffset = startLeftByteOffset + lengthWidth;
+        final int rightDataOffset = startRightByteOffset + lengthWidth;
+
+        // check equality in the considered string stored in the view
+        int retDataBuf =
+            ByteFunctionHelpers.equal(
+                leftViewBuffer,
+                leftDataOffset,
+                leftDataOffset + leftDataBufferValueLength,
+                rightViewBuffer,
+                rightDataOffset,
+                rightDataOffset + rightDataBufferValueLength);
+
+        if (retDataBuf == 0) {
           return false;
         }
       }
@@ -449,7 +572,8 @@ protected boolean compareListVectors(Range range) {
     ListVector rightVector = (ListVector) right;
 
     RangeEqualsVisitor innerVisitor =
-        createInnerVisitor(leftVector.getDataVector(), rightVector.getDataVector(), /*type comparator*/ null);
+        createInnerVisitor(
+            leftVector.getDataVector(), rightVector.getDataVector(), /*type comparator*/ null);
     Range innerRange = new Range();
 
     for (int i = 0; i < range.getLength(); i++) {
@@ -468,16 +592,18 @@ protected boolean compareListVectors(Range range) {
         final int endIndexLeft = leftVector.getOffsetBuffer().getInt((leftIndex + 1) * offsetWidth);
 
         final int startIndexRight = rightVector.getOffsetBuffer().getInt(rightIndex * offsetWidth);
-        final int endIndexRight = rightVector.getOffsetBuffer().getInt((rightIndex + 1) * offsetWidth);
+        final int endIndexRight =
+            rightVector.getOffsetBuffer().getInt((rightIndex + 1) * offsetWidth);
 
         if ((endIndexLeft - startIndexLeft) != (endIndexRight - startIndexRight)) {
           return false;
         }
 
-        innerRange = innerRange
-            .setRightStart(startIndexRight)
-            .setLeftStart(startIndexLeft)
-            .setLength(endIndexLeft - startIndexLeft);
+        innerRange =
+            innerRange
+                .setRightStart(startIndexRight)
+                .setLeftStart(startIndexLeft)
+                .setLength(endIndexLeft - startIndexLeft);
         if (!innerVisitor.rangeEquals(innerRange)) {
           return false;
         }
@@ -496,7 +622,8 @@ protected boolean compareFixedSizeListVectors(Range range) {
 
     int listSize = leftVector.getListSize();
     RangeEqualsVisitor innerVisitor =
-        createInnerVisitor(leftVector.getDataVector(), rightVector.getDataVector(), /*type comparator*/ null);
+        createInnerVisitor(
+            leftVector.getDataVector(), rightVector.getDataVector(), /*type comparator*/ null);
     Range innerRange = new Range(0, 0, listSize);
 
     for (int i = 0; i < range.getLength(); i++) {
@@ -519,8 +646,7 @@ protected boolean compareFixedSizeListVectors(Range range) {
           return false;
         }
 
-        innerRange = innerRange.setLeftStart(startIndexLeft)
-            .setRightStart(startIndexRight);
+        innerRange = innerRange.setLeftStart(startIndexLeft).setRightStart(startIndexRight);
         if (!innerVisitor.rangeEquals(innerRange)) {
           return false;
         }
@@ -534,7 +660,8 @@ protected boolean compareLargeListVectors(Range range) {
     LargeListVector rightVector = (LargeListVector) right;
 
     RangeEqualsVisitor innerVisitor =
-        createInnerVisitor(leftVector.getDataVector(), rightVector.getDataVector(), /*type comparator*/ null);
+        createInnerVisitor(
+            leftVector.getDataVector(), rightVector.getDataVector(), /*type comparator*/ null);
     Range innerRange = new Range();
 
     for (int i = 0; i < range.getLength(); i++) {
@@ -549,20 +676,25 @@ protected boolean compareLargeListVectors(Range range) {
       long offsetWidth = LargeListVector.OFFSET_WIDTH;
 
       if (!isNull) {
-        final long startIndexLeft = leftVector.getOffsetBuffer().getLong((long) leftIndex * offsetWidth);
-        final long endIndexLeft = leftVector.getOffsetBuffer().getLong((long) (leftIndex + 1) * offsetWidth);
+        final long startIndexLeft =
+            leftVector.getOffsetBuffer().getLong((long) leftIndex * offsetWidth);
+        final long endIndexLeft =
+            leftVector.getOffsetBuffer().getLong((long) (leftIndex + 1) * offsetWidth);
 
-        final long startIndexRight = rightVector.getOffsetBuffer().getLong((long) rightIndex * offsetWidth);
-        final long endIndexRight = rightVector.getOffsetBuffer().getLong((long) (rightIndex + 1) * offsetWidth);
+        final long startIndexRight =
+            rightVector.getOffsetBuffer().getLong((long) rightIndex * offsetWidth);
+        final long endIndexRight =
+            rightVector.getOffsetBuffer().getLong((long) (rightIndex + 1) * offsetWidth);
 
         if ((endIndexLeft - startIndexLeft) != (endIndexRight - startIndexRight)) {
           return false;
         }
 
-        innerRange = innerRange // TODO revisit these casts when long indexing is finished
-            .setRightStart(checkedCastToInt(startIndexRight))
-            .setLeftStart(checkedCastToInt(startIndexLeft))
-            .setLength(checkedCastToInt(endIndexLeft - startIndexLeft));
+        innerRange =
+            innerRange // TODO revisit these casts when long indexing is finished
+                .setRightStart(checkedCastToInt(startIndexRight))
+                .setLeftStart(checkedCastToInt(startIndexLeft))
+                .setLength(checkedCastToInt(endIndexLeft - startIndexLeft));
         if (!innerVisitor.rangeEquals(innerRange)) {
           return false;
         }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/compare/TypeEqualsVisitor.java b/java/vector/src/main/java/org/apache/arrow/vector/compare/TypeEqualsVisitor.java
index 443ee1f96e273..15cc2c31b8b98 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/compare/TypeEqualsVisitor.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/compare/TypeEqualsVisitor.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.compare;
 
 import java.util.List;
 import java.util.Objects;
-
 import org.apache.arrow.vector.BaseFixedWidthVector;
 import org.apache.arrow.vector.BaseLargeVariableWidthVector;
 import org.apache.arrow.vector.BaseVariableWidthVector;
+import org.apache.arrow.vector.BaseVariableWidthViewVector;
 import org.apache.arrow.vector.ExtensionTypeVector;
 import org.apache.arrow.vector.NullVector;
 import org.apache.arrow.vector.ValueVector;
@@ -34,9 +33,7 @@
 import org.apache.arrow.vector.complex.UnionVector;
 import org.apache.arrow.vector.types.pojo.Field;
 
-/**
- * Visitor to compare type equals for vectors.
- */
+/** Visitor to compare type equals for vectors. */
 public class TypeEqualsVisitor implements VectorVisitor<Boolean, Void> {
 
   private final ValueVector right;
@@ -44,15 +41,14 @@ public class TypeEqualsVisitor implements VectorVisitor<Boolean, Void> {
   private final boolean checkName;
   private final boolean checkMetadata;
 
-  /**
-   * Construct an instance.
-   */
+  /** Construct an instance. */
   public TypeEqualsVisitor(ValueVector right) {
-    this (right, true, true);
+    this(right, true, true);
   }
 
   /**
    * Construct an instance.
+   *
    * @param right right vector
    * @param checkName whether checks names
    * @param checkMetadata whether checks metadata
@@ -63,9 +59,7 @@ public TypeEqualsVisitor(ValueVector right, boolean checkName, boolean checkMeta
     this.checkMetadata = checkMetadata;
   }
 
-  /**
-   * Check type equals without passing IN param in VectorVisitor.
-   */
+  /** Check type equals without passing IN param in VectorVisitor. */
   public boolean equals(ValueVector left) {
     return left.accept(this, null);
   }
@@ -85,6 +79,11 @@ public Boolean visit(BaseLargeVariableWidthVector left, Void value) {
     return compareField(left.getField(), right.getField());
   }
 
+  @Override
+  public Boolean visit(BaseVariableWidthViewVector left, Void value) {
+    return compareField(left.getField(), right.getField());
+  }
+
   @Override
   public Boolean visit(ListVector left, Void value) {
     return compareField(left.getField(), right.getField());
@@ -131,12 +130,12 @@ private boolean compareField(Field leftField, Field rightField) {
       return true;
     }
 
-    return (!checkName || Objects.equals(leftField.getName(), rightField.getName())) &&
-        Objects.equals(leftField.isNullable(), rightField.isNullable()) &&
-        Objects.equals(leftField.getType(), rightField.getType()) &&
-        Objects.equals(leftField.getDictionary(), rightField.getDictionary()) &&
-        (!checkMetadata || Objects.equals(leftField.getMetadata(), rightField.getMetadata())) &&
-        compareChildren(leftField.getChildren(), rightField.getChildren());
+    return (!checkName || Objects.equals(leftField.getName(), rightField.getName()))
+        && Objects.equals(leftField.isNullable(), rightField.isNullable())
+        && Objects.equals(leftField.getType(), rightField.getType())
+        && Objects.equals(leftField.getDictionary(), rightField.getDictionary())
+        && (!checkMetadata || Objects.equals(leftField.getMetadata(), rightField.getMetadata()))
+        && compareChildren(leftField.getChildren(), rightField.getChildren());
   }
 
   private boolean compareChildren(List<Field> leftChildren, List<Field> rightChildren) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/compare/VectorEqualsVisitor.java b/java/vector/src/main/java/org/apache/arrow/vector/compare/VectorEqualsVisitor.java
index 390d138543506..966ba4c4fbcf0 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/compare/VectorEqualsVisitor.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/compare/VectorEqualsVisitor.java
@@ -14,22 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.compare;
 
 import static org.apache.arrow.vector.compare.RangeEqualsVisitor.DEFAULT_TYPE_COMPARATOR;
 
 import java.util.function.BiFunction;
-
 import org.apache.arrow.vector.ValueVector;
 
-/**
- * Visitor to compare vectors equal.
- */
+/** Visitor to compare vectors equal. */
 public class VectorEqualsVisitor {
 
   /**
    * Checks if two vectors are equals with default type comparator.
+   *
    * @param left the left vector to compare.
    * @param right the right vector to compare.
    * @return true if the vectors are equal, and false otherwise.
@@ -40,6 +37,7 @@ public static boolean vectorEquals(ValueVector left, ValueVector right) {
 
   /**
    * Checks if two vectors are equals.
+   *
    * @param left the left vector to compare.
    * @param right the right vector to compare.
    * @param typeComparator type comparator to compare vector type.
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/compare/VectorValueEqualizer.java b/java/vector/src/main/java/org/apache/arrow/vector/compare/VectorValueEqualizer.java
index 4f9c1a95ee236..ad90c29a5326f 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/compare/VectorValueEqualizer.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/compare/VectorValueEqualizer.java
@@ -14,20 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.compare;
 
 import org.apache.arrow.vector.ValueVector;
 
 /**
  * A function to determine if two vectors are equal at specified positions.
+ *
  * @param <V> the vector type.
  */
 public interface VectorValueEqualizer<V extends ValueVector> extends Cloneable {
 
   /**
-   * Checks if the vectors are equal at the given positions, given that the values
-   * at both positions are non-null.
+   * Checks if the vectors are equal at the given positions, given that the values at both positions
+   * are non-null.
+   *
    * @param vector1 the first vector.
    * @param index1 index in the first vector.
    * @param vector2 the second vector.
@@ -38,6 +39,7 @@ public interface VectorValueEqualizer<V extends ValueVector> extends Cloneable {
 
   /**
    * Creates a equalizer of the same type.
+   *
    * @return the newly created equalizer.
    */
   VectorValueEqualizer<V> clone();
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/compare/VectorVisitor.java b/java/vector/src/main/java/org/apache/arrow/vector/compare/VectorVisitor.java
index aee090706b3c8..870f015862764 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/compare/VectorVisitor.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/compare/VectorVisitor.java
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.compare;
 
 import org.apache.arrow.vector.BaseFixedWidthVector;
 import org.apache.arrow.vector.BaseLargeVariableWidthVector;
 import org.apache.arrow.vector.BaseVariableWidthVector;
+import org.apache.arrow.vector.BaseVariableWidthViewVector;
 import org.apache.arrow.vector.ExtensionTypeVector;
 import org.apache.arrow.vector.NullVector;
 import org.apache.arrow.vector.complex.DenseUnionVector;
@@ -31,6 +31,7 @@
 
 /**
  * Generic visitor to visit a {@link org.apache.arrow.vector.ValueVector}.
+ *
  * @param <OUT> the output result type.
  * @param <IN> the input data together with visitor.
  */
@@ -42,6 +43,8 @@ public interface VectorVisitor<OUT, IN> {
 
   OUT visit(BaseLargeVariableWidthVector left, IN value);
 
+  OUT visit(BaseVariableWidthViewVector left, IN value);
+
   OUT visit(ListVector left, IN value);
 
   OUT visit(FixedSizeListVector left, IN value);
@@ -58,4 +61,3 @@ public interface VectorVisitor<OUT, IN> {
 
   OUT visit(ExtensionTypeVector<?> left, IN value);
 }
-
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/compare/util/ValueEpsilonEqualizers.java b/java/vector/src/main/java/org/apache/arrow/vector/compare/util/ValueEpsilonEqualizers.java
index a7b6a8ca4aa64..c962d9ae5f0be 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/compare/util/ValueEpsilonEqualizers.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/compare/util/ValueEpsilonEqualizers.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.compare.util;
 
 import org.apache.arrow.vector.Float4Vector;
@@ -23,19 +22,16 @@
 import org.apache.arrow.vector.compare.VectorValueEqualizer;
 
 /**
- * Vector value equalizers that regard values as equal if their difference
- * is within a small threshold (epsilon).
+ * Vector value equalizers that regard values as equal if their difference is within a small
+ * threshold (epsilon).
  */
 public class ValueEpsilonEqualizers {
 
-  private ValueEpsilonEqualizers() {
-
-  }
+  private ValueEpsilonEqualizers() {}
 
-  /**
-   * Difference function for floating point values.
-   */
-  public static class FloatingPointEpsilonEqualizer implements VectorValueEqualizer<FloatingPointVector> {
+  /** Difference function for floating point values. */
+  public static class FloatingPointEpsilonEqualizer
+      implements VectorValueEqualizer<FloatingPointVector> {
     private final double epsilon;
 
     public FloatingPointEpsilonEqualizer(double epsilon) {
@@ -44,7 +40,7 @@ public FloatingPointEpsilonEqualizer(double epsilon) {
 
     @Override
     public final boolean valuesEqual(
-            FloatingPointVector vector1, int index1, FloatingPointVector vector2, int index2) {
+        FloatingPointVector vector1, int index1, FloatingPointVector vector2, int index2) {
       boolean isNull1 = vector1.isNull(index1);
       boolean isNull2 = vector2.isNull(index2);
 
@@ -71,9 +67,7 @@ public VectorValueEqualizer<FloatingPointVector> clone() {
     }
   }
 
-  /**
-   * Difference function for float values.
-   */
+  /** Difference function for float values. */
   public static class Float4EpsilonEqualizer implements VectorValueEqualizer<Float4Vector> {
     private final float epsilon;
 
@@ -82,7 +76,8 @@ public Float4EpsilonEqualizer(float epsilon) {
     }
 
     @Override
-    public final boolean valuesEqual(Float4Vector vector1, int index1, Float4Vector vector2, int index2) {
+    public final boolean valuesEqual(
+        Float4Vector vector1, int index1, Float4Vector vector2, int index2) {
       boolean isNull1 = vector1.isNull(index1);
       boolean isNull2 = vector2.isNull(index2);
 
@@ -109,9 +104,7 @@ public VectorValueEqualizer<Float4Vector> clone() {
     }
   }
 
-  /**
-   * Difference function for double values.
-   */
+  /** Difference function for double values. */
   public static class Float8EpsilonEqualizer implements VectorValueEqualizer<Float8Vector> {
     private final double epsilon;
 
@@ -120,7 +113,8 @@ public Float8EpsilonEqualizer(double epsilon) {
     }
 
     @Override
-    public final boolean valuesEqual(Float8Vector vector1, int index1, Float8Vector vector2, int index2) {
+    public final boolean valuesEqual(
+        Float8Vector vector1, int index1, Float8Vector vector2, int index2) {
       boolean isNull1 = vector1.isNull(index1);
       boolean isNull2 = vector2.isNull(index2);
 
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/AbstractContainerVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/AbstractContainerVector.java
index 12a3c209d716b..0cefbe4004b82 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/AbstractContainerVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/AbstractContainerVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
 import org.apache.arrow.memory.BufferAllocator;
@@ -37,7 +36,8 @@
  * <p>This class implements common functionality of composite vectors.
  */
 public abstract class AbstractContainerVector implements ValueVector, DensityAwareVector {
-  static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractContainerVector.class);
+  static final org.slf4j.Logger logger =
+      org.slf4j.LoggerFactory.getLogger(AbstractContainerVector.class);
 
   protected final String name;
   protected final BufferAllocator allocator;
@@ -49,9 +49,7 @@ protected AbstractContainerVector(String name, BufferAllocator allocator, CallBa
     this.callBack = callBack;
   }
 
-  /**
-   * Representation of vector suitable for debugging.
-   */
+  /** Representation of vector suitable for debugging. */
   @Override
   public String toString() {
     return ValueVectorUtility.getToString(this, 0, getValueCount());
@@ -70,7 +68,8 @@ public BufferAllocator getAllocator() {
   }
 
   /**
-   * Returns a {@link org.apache.arrow.vector.ValueVector} corresponding to the given field name if exists or null.
+   * Returns a {@link org.apache.arrow.vector.ValueVector} corresponding to the given field name if
+   * exists or null.
    *
    * @param name the name of the child to return
    * @return the corresponding FieldVector
@@ -79,9 +78,7 @@ public FieldVector getChild(String name) {
     return getChild(name, FieldVector.class);
   }
 
-  /**
-   * Clears out all underlying child vectors.
-   */
+  /** Clears out all underlying child vectors. */
   @Override
   public void close() {
     for (ValueVector vector : (Iterable<ValueVector>) this) {
@@ -93,8 +90,11 @@ protected <T extends ValueVector> T typeify(ValueVector v, Class<T> clazz) {
     if (clazz.isAssignableFrom(v.getClass())) {
       return clazz.cast(v);
     }
-    throw new IllegalStateException(String.format("Vector requested [%s] was different than type stored [%s]. Arrow " +
-      "doesn't yet support heterogeneous types.", clazz.getSimpleName(), v.getClass().getSimpleName()));
+    throw new IllegalStateException(
+        String.format(
+            "Vector requested [%s] was different than type stored [%s]. Arrow "
+                + "doesn't yet support heterogeneous types.",
+            clazz.getSimpleName(), v.getClass().getSimpleName()));
   }
 
   protected boolean supportsDirectRead() {
@@ -104,8 +104,10 @@ protected boolean supportsDirectRead() {
   // return the number of child vectors
   public abstract int size();
 
-  // add a new vector with the input FieldType or return the existing vector if we already added one with the same name
-  public abstract <T extends FieldVector> T addOrGet(String name, FieldType fieldType, Class<T> clazz);
+  // add a new vector with the input FieldType or return the existing vector if we already added one
+  // with the same name
+  public abstract <T extends FieldVector> T addOrGet(
+      String name, FieldType fieldType, Class<T> clazz);
 
   // return the child vector with the input name
   public abstract <T extends FieldVector> T getChild(String name, Class<T> clazz);
@@ -126,7 +128,8 @@ public UnionVector addOrGetUnion(String name) {
   }
 
   public FixedSizeListVector addOrGetFixedSizeList(String name, int listSize) {
-    return addOrGet(name, FieldType.nullable(new FixedSizeList(listSize)), FixedSizeListVector.class);
+    return addOrGet(
+        name, FieldType.nullable(new FixedSizeList(listSize)), FixedSizeListVector.class);
   }
 
   public MapVector addOrGetMap(String name, boolean keysSorted) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/AbstractStructVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/AbstractStructVector.java
index 80efea6cbe39e..feb7edfec9495 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/AbstractStructVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/AbstractStructVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
 import java.util.ArrayList;
@@ -23,7 +22,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.Preconditions;
@@ -35,11 +33,10 @@
 import org.apache.arrow.vector.util.PromotableMultiMapWithOrdinal;
 import org.apache.arrow.vector.util.ValueVectorUtility;
 
-/**
- * Base class for StructVectors. Currently used by NonNullableStructVector
- */
+/** Base class for StructVectors. Currently used by NonNullableStructVector */
 public abstract class AbstractStructVector extends AbstractContainerVector {
-  private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractContainerVector.class);
+  private static final org.slf4j.Logger logger =
+      org.slf4j.LoggerFactory.getLogger(AbstractContainerVector.class);
   private static final String STRUCT_CONFLICT_POLICY_ENV = "ARROW_STRUCT_CONFLICT_POLICY";
   private static final String STRUCT_CONFLICT_POLICY_JVM = "arrow.struct.conflict.policy";
   private static final ConflictPolicy DEFAULT_CONFLICT_POLICY;
@@ -48,10 +45,9 @@ public abstract class AbstractStructVector extends AbstractContainerVector {
   protected final boolean allowConflictPolicyChanges;
   private ConflictPolicy conflictPolicy;
 
-
   static {
-    String conflictPolicyStr = System.getProperty(STRUCT_CONFLICT_POLICY_JVM,
-        ConflictPolicy.CONFLICT_REPLACE.toString());
+    String conflictPolicyStr =
+        System.getProperty(STRUCT_CONFLICT_POLICY_JVM, ConflictPolicy.CONFLICT_REPLACE.toString());
     if (conflictPolicyStr == null) {
       conflictPolicyStr = System.getenv(STRUCT_CONFLICT_POLICY_ENV);
     }
@@ -64,9 +60,7 @@ public abstract class AbstractStructVector extends AbstractContainerVector {
     DEFAULT_CONFLICT_POLICY = conflictPolicy;
   }
 
-  /**
-   * Policy to determine how to react when duplicate columns are encountered.
-   */
+  /** Policy to determine how to react when duplicate columns are encountered. */
   public enum ConflictPolicy {
     // Ignore the conflict and append the field. This is the default behaviour
     CONFLICT_APPEND,
@@ -78,23 +72,21 @@ public enum ConflictPolicy {
     CONFLICT_ERROR
   }
 
-  /**
-   *  Base constructor that sets default conflict policy to APPEND.
-   */
-  protected AbstractStructVector(String name,
-                                 BufferAllocator allocator,
-                                 CallBack callBack,
-                                 ConflictPolicy conflictPolicy,
-                                 boolean allowConflictPolicyChanges) {
+  /** Base constructor that sets default conflict policy to APPEND. */
+  protected AbstractStructVector(
+      String name,
+      BufferAllocator allocator,
+      CallBack callBack,
+      ConflictPolicy conflictPolicy,
+      boolean allowConflictPolicyChanges) {
     super(name, allocator, callBack);
     this.conflictPolicy = conflictPolicy == null ? DEFAULT_CONFLICT_POLICY : conflictPolicy;
-    this.vectors = new PromotableMultiMapWithOrdinal<>(allowConflictPolicyChanges, this.conflictPolicy);
+    this.vectors =
+        new PromotableMultiMapWithOrdinal<>(allowConflictPolicyChanges, this.conflictPolicy);
     this.allowConflictPolicyChanges = allowConflictPolicyChanges;
   }
 
-  /**
-   * Set conflict policy and return last conflict policy state.
-   */
+  /** Set conflict policy and return last conflict policy state. */
   public ConflictPolicy setConflictPolicy(ConflictPolicy conflictPolicy) {
     ConflictPolicy tmp = this.conflictPolicy;
     this.conflictPolicy = conflictPolicy;
@@ -147,29 +139,23 @@ public void reAlloc() {
   }
 
   /**
-   * Adds a new field with the given parameters or replaces the existing one and consequently returns the resultant
-   * {@link org.apache.arrow.vector.ValueVector}.
+   * Adds a new field with the given parameters or replaces the existing one and consequently
+   * returns the resultant {@link org.apache.arrow.vector.ValueVector}.
    *
    * <p>Execution takes place in the following order:
+   *
    * <ul>
-   * <li>
-   * if field is new, create and insert a new vector of desired type.
-   * </li>
-   * <li>
-   * if field exists and existing vector is of desired vector type, return the vector.
-   * </li>
-   * <li>
-   * if field exists and null filled, clear the existing vector; create and insert a new vector of desired type.
-   * </li>
-   * <li>
-   * otherwise, throw an {@link java.lang.IllegalStateException}
-   * </li>
+   *   <li>if field is new, create and insert a new vector of desired type.
+   *   <li>if field exists and existing vector is of desired vector type, return the vector.
+   *   <li>if field exists and null filled, clear the existing vector; create and insert a new
+   *       vector of desired type.
+   *   <li>otherwise, throw an {@link java.lang.IllegalStateException}
    * </ul>
    *
    * @param childName the name of the field
    * @param fieldType the type for the vector
-   * @param clazz     class of expected vector type
-   * @param <T>       class type of expected vector type
+   * @param clazz class of expected vector type
+   * @param <T> class type of expected vector type
    * @return resultant {@link org.apache.arrow.vector.ValueVector}
    * @throws java.lang.IllegalStateException raised if there is a hard schema change
    */
@@ -193,17 +179,21 @@ public <T extends FieldVector> T addOrGet(String childName, FieldType fieldType,
       }
       return vector;
     }
-    final String message = "Arrow does not support schema change yet. Existing[%s] and desired[%s] vector types " +
-        "mismatch";
-    throw new IllegalStateException(String.format(message, existing.getClass().getSimpleName(), clazz.getSimpleName()));
+    final String message =
+        "Arrow does not support schema change yet. Existing[%s] and desired[%s] vector types "
+            + "mismatch";
+    throw new IllegalStateException(
+        String.format(message, existing.getClass().getSimpleName(), clazz.getSimpleName()));
   }
 
   private boolean nullFilled(ValueVector vector) {
-    return BitVectorHelper.checkAllBitsEqualTo(vector.getValidityBuffer(), vector.getValueCount(), false);
+    return BitVectorHelper.checkAllBitsEqualTo(
+        vector.getValidityBuffer(), vector.getValueCount(), false);
   }
 
   /**
-   * Returns a {@link org.apache.arrow.vector.ValueVector} corresponding to the given ordinal identifier.
+   * Returns a {@link org.apache.arrow.vector.ValueVector} corresponding to the given ordinal
+   * identifier.
    *
    * @param id the ordinal of the child to return
    * @return the corresponding child
@@ -213,12 +203,12 @@ public ValueVector getChildByOrdinal(int id) {
   }
 
   /**
-   * Returns a {@link org.apache.arrow.vector.ValueVector} instance of subtype of T corresponding to the given
-   * field name if exists or null.
+   * Returns a {@link org.apache.arrow.vector.ValueVector} instance of subtype of T corresponding to
+   * the given field name if exists or null.
    *
-   * If there is more than one element for name this will return the first inserted.
+   * <p>If there is more than one element for name this will return the first inserted.
    *
-   * @param name  the name of the child to return
+   * @param name the name of the child to return
    * @param clazz the expected type of the child
    * @return the child corresponding to this name
    */
@@ -241,11 +231,13 @@ protected ValueVector add(String childName, FieldType fieldType) {
   }
 
   /**
-   * Inserts the vector with the given name if it does not exist else replaces it with the new value.
+   * Inserts the vector with the given name if it does not exist else replaces it with the new
+   * value.
    *
-   * <p>Note that this method does not enforce any vector type check nor throws a schema change exception.
+   * <p>Note that this method does not enforce any vector type check nor throws a schema change
+   * exception.
    *
-   * @param name   the name of the child to add
+   * @param name the name of the child to add
    * @param vector the vector to add as a child
    */
   protected void putChild(String name, FieldVector vector) {
@@ -253,25 +245,23 @@ protected void putChild(String name, FieldVector vector) {
   }
 
   private void put(String name, FieldVector vector, boolean overwrite) {
-    final boolean old = vectors.put(
-        Preconditions.checkNotNull(name, "field name cannot be null"),
-        Preconditions.checkNotNull(vector, "vector cannot be null"),
-        overwrite
-    );
+    final boolean old =
+        vectors.put(
+            Preconditions.checkNotNull(name, "field name cannot be null"),
+            Preconditions.checkNotNull(vector, "vector cannot be null"),
+            overwrite);
     if (old) {
-      logger.debug("Field [{}] mutated to [{}] ", name,
-          vector.getClass().getSimpleName());
+      logger.debug("Field [{}] mutated to [{}] ", name, vector.getClass().getSimpleName());
     }
   }
 
   /**
    * Inserts the input vector into the map if it does not exist.
    *
-   * <p>
-   * If the field name already exists the conflict is handled according to the currently set ConflictPolicy
-   * </p>
+   * <p>If the field name already exists the conflict is handled according to the currently set
+   * ConflictPolicy
    *
-   * @param name   field name
+   * @param name field name
    * @param vector vector to be inserted
    */
   protected void putVector(String name, FieldVector vector) {
@@ -292,19 +282,22 @@ protected void putVector(String name, FieldVector vector) {
         break;
       case CONFLICT_ERROR:
         if (vectors.containsKey(name)) {
-          throw new IllegalStateException(String.format("Vector already exists: Existing[%s], Requested[%s] ",
-            vector.getClass().getSimpleName(), vector.getField().getFieldType()));
+          throw new IllegalStateException(
+              String.format(
+                  "Vector already exists: Existing[%s], Requested[%s] ",
+                  vector.getClass().getSimpleName(), vector.getField().getFieldType()));
         }
         put(name, vector, false);
         break;
       default:
-        throw new IllegalStateException(String.format("%s type not a valid conflict state", conflictPolicy));
+        throw new IllegalStateException(
+            String.format("%s type not a valid conflict state", conflictPolicy));
     }
-
   }
 
   /**
    * Get child vectors.
+   *
    * @return a sequence of underlying child vectors.
    */
   protected List<FieldVector> getChildren() {
@@ -316,9 +309,7 @@ protected List<FieldVector> getChildren() {
     return children;
   }
 
-  /**
-   * Get child field names.
-   */
+  /** Get child field names. */
   public List<String> getChildFieldNames() {
     return getChildren().stream()
         .map(child -> child.getField().getName())
@@ -327,6 +318,7 @@ public List<String> getChildFieldNames() {
 
   /**
    * Get the number of child vectors.
+   *
    * @return the number of underlying child vectors.
    */
   @Override
@@ -341,6 +333,7 @@ public Iterator<ValueVector> iterator() {
 
   /**
    * Get primitive child vectors.
+   *
    * @return a list of scalar child vectors recursing the entire vector hierarchy.
    */
   public List<ValueVector> getPrimitiveVectors() {
@@ -375,6 +368,7 @@ private List<ValueVector> getPrimitiveVectors(FieldVector v) {
 
   /**
    * Get a child vector by name. If duplicate names this returns the first inserted.
+   *
    * @param name the name of the child to return
    * @return a vector with its corresponding ordinal mapping if field exists or null.
    */
@@ -421,7 +415,6 @@ public int getBufferSize() {
 
   @Override
   public String toString() {
-    return ValueVectorUtility.getToString(this, 0 , getValueCount());
+    return ValueVectorUtility.getToString(this, 0, getValueCount());
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseListVector.java
index 5f547b90176f4..389670b878a76 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseListVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseListVector.java
@@ -14,23 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
 import org.apache.arrow.vector.FieldVector;
 
-/**
- * Abstraction for all list type vectors.
- */
+/** Abstraction for all list type vectors. */
 public interface BaseListVector extends FieldVector {
 
-  /**
-   * Get data vector start index with the given list index.
-   */
+  /** Get data vector start index with the given list index. */
   int getElementStartIndex(int index);
 
-  /**
-   * Get data vector end index with the given list index.
-   */
+  /** Get data vector end index with the given list index. */
   int getElementEndIndex(int index);
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java
index 8ba2e48dc2fa3..10637304df057 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
 import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
@@ -24,7 +23,6 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.util.CommonUtil;
@@ -46,7 +44,8 @@
 import org.apache.arrow.vector.util.SchemaChangeRuntimeException;
 
 /** Base class for Vectors that contain repeated values. */
-public abstract class BaseRepeatedValueVector extends BaseValueVector implements RepeatedValueVector, BaseListVector {
+public abstract class BaseRepeatedValueVector extends BaseValueVector
+    implements RepeatedValueVector, BaseListVector {
 
   public static final FieldVector DEFAULT_DATA_VECTOR = ZeroVector.INSTANCE;
   public static final String DATA_VECTOR_NAME = "$data$";
@@ -65,7 +64,8 @@ protected BaseRepeatedValueVector(String name, BufferAllocator allocator, CallBa
     this(name, allocator, DEFAULT_DATA_VECTOR, callBack);
   }
 
-  protected BaseRepeatedValueVector(String name, BufferAllocator allocator, FieldVector vector, CallBack callBack) {
+  protected BaseRepeatedValueVector(
+      String name, BufferAllocator allocator, FieldVector vector, CallBack callBack) {
     super(allocator);
     this.name = name;
     this.offsetBuffer = allocator.getEmpty();
@@ -83,7 +83,7 @@ public String getName() {
   public boolean allocateNewSafe() {
     boolean dataAlloc = false;
     try {
-      allocateOffsetBuffer(offsetAllocationSizeInBytes);
+      offsetBuffer = allocateOffsetBuffer(offsetAllocationSizeInBytes);
       dataAlloc = vector.allocateNewSafe();
     } catch (Exception e) {
       e.printStackTrace();
@@ -97,12 +97,13 @@ public boolean allocateNewSafe() {
     return dataAlloc;
   }
 
-  protected void allocateOffsetBuffer(final long size) {
+  protected ArrowBuf allocateOffsetBuffer(final long size) {
     final int curSize = (int) size;
-    offsetBuffer = allocator.buffer(curSize);
+    ArrowBuf offsetBuffer = allocator.buffer(curSize);
     offsetBuffer.readerIndex(0);
     offsetAllocationSizeInBytes = curSize;
     offsetBuffer.setZero(0, offsetBuffer.capacity());
+    return offsetBuffer;
   }
 
   @Override
@@ -140,8 +141,9 @@ protected void reallocOffsetBuffer() {
 
   /**
    * Get the offset vector.
-   * @deprecated This API will be removed, as the current implementations no longer hold inner offset vectors.
    *
+   * @deprecated This API will be removed, as the current implementations no longer hold inner
+   *     offset vectors.
    * @return the underlying offset vector or null if none exists.
    */
   @Override
@@ -166,27 +168,21 @@ public void setInitialCapacity(int numRecords) {
   }
 
   /**
-   * Specialized version of setInitialCapacity() for ListVector. This is
-   * used by some callers when they want to explicitly control and be
-   * conservative about memory allocated for inner data vector. This is
-   * very useful when we are working with memory constraints for a query
-   * and have a fixed amount of memory reserved for the record batch. In
-   * such cases, we are likely to face OOM or related problems when
-   * we reserve memory for a record batch with value count x and
-   * do setInitialCapacity(x) such that each vector allocates only
-   * what is necessary and not the default amount but the multiplier
-   * forces the memory requirement to go beyond what was needed.
+   * Specialized version of setInitialCapacity() for ListVector. This is used by some callers when
+   * they want to explicitly control and be conservative about memory allocated for inner data
+   * vector. This is very useful when we are working with memory constraints for a query and have a
+   * fixed amount of memory reserved for the record batch. In such cases, we are likely to face OOM
+   * or related problems when we reserve memory for a record batch with value count x and do
+   * setInitialCapacity(x) such that each vector allocates only what is necessary and not the
+   * default amount but the multiplier forces the memory requirement to go beyond what was needed.
    *
    * @param numRecords value count
-   * @param density density of ListVector. Density is the average size of
-   *                list per position in the List vector. For example, a
-   *                density value of 10 implies each position in the list
-   *                vector has a list of 10 values.
-   *                A density value of 0.1 implies out of 10 positions in
-   *                the list vector, 1 position has a list of size 1 and
-   *                remaining positions are null (no lists) or empty lists.
-   *                This helps in tightly controlling the memory we provision
-   *                for inner data vector.
+   * @param density density of ListVector. Density is the average size of list per position in the
+   *     List vector. For example, a density value of 10 implies each position in the list vector
+   *     has a list of 10 values. A density value of 0.1 implies out of 10 positions in the list
+   *     vector, 1 position has a list of size 1 and remaining positions are null (no lists) or
+   *     empty lists. This helps in tightly controlling the memory we provision for inner data
+   *     vector.
    */
   @Override
   public void setInitialCapacity(int numRecords, double density) {
@@ -206,20 +202,17 @@ public void setInitialCapacity(int numRecords, double density) {
   }
 
   /**
-   * Specialized version of setInitialTotalCapacity() for ListVector. This is
-   * used by some callers when they want to explicitly control and be
-   * conservative about memory allocated for inner data vector. This is
-   * very useful when we are working with memory constraints for a query
-   * and have a fixed amount of memory reserved for the record batch. In
-   * such cases, we are likely to face OOM or related problems when
-   * we reserve memory for a record batch with value count x and
-   * do setInitialCapacity(x) such that each vector allocates only
-   * what is necessary and not the default amount but the multiplier
-   * forces the memory requirement to go beyond what was needed.
+   * Specialized version of setInitialTotalCapacity() for ListVector. This is used by some callers
+   * when they want to explicitly control and be conservative about memory allocated for inner data
+   * vector. This is very useful when we are working with memory constraints for a query and have a
+   * fixed amount of memory reserved for the record batch. In such cases, we are likely to face OOM
+   * or related problems when we reserve memory for a record batch with value count x and do
+   * setInitialCapacity(x) such that each vector allocates only what is necessary and not the
+   * default amount but the multiplier forces the memory requirement to go beyond what was needed.
    *
    * @param numRecords value count
-   * @param totalNumberOfElements the total number of elements to to allow
-   *                              for in this vector across all records.
+   * @param totalNumberOfElements the total number of elements to to allow for in this vector across
+   *     all records.
    */
   public void setInitialTotalCapacity(int numRecords, int totalNumberOfElements) {
     offsetAllocationSizeInBytes = (numRecords + 1L) * OFFSET_WIDTH;
@@ -300,6 +293,7 @@ public ArrowBuf[] getBuffers(boolean clear) {
 
   /**
    * Get value indicating if inner vector is set.
+   *
    * @return 1 if inner vector is explicitly set via #addOrGetVector else 0
    */
   public int size() {
@@ -307,8 +301,8 @@ public int size() {
   }
 
   /**
-   * Initialize the data vector (and execute callback) if it hasn't already been done,
-   * returns the data vector.
+   * Initialize the data vector (and execute callback) if it hasn't already been done, returns the
+   * data vector.
    */
   public <T extends ValueVector> AddOrGetResult<T> addOrGetVector(FieldType fieldType) {
     boolean created = false;
@@ -316,15 +310,18 @@ public <T extends ValueVector> AddOrGetResult<T> addOrGetVector(FieldType fieldT
       vector = fieldType.createNewSingleVector(defaultDataVectorName, allocator, repeatedCallBack);
       // returned vector must have the same field
       created = true;
-      if (repeatedCallBack != null &&
-              // not a schema change if changing from ZeroVector to ZeroVector
-              (fieldType.getType().getTypeID() != ArrowTypeID.Null)) {
+      if (repeatedCallBack != null
+          &&
+          // not a schema change if changing from ZeroVector to ZeroVector
+          (fieldType.getType().getTypeID() != ArrowTypeID.Null)) {
         repeatedCallBack.doWork();
       }
     }
 
     if (vector.getField().getType().getTypeID() != fieldType.getType().getTypeID()) {
-      final String msg = String.format("Inner vector type mismatch. Requested type: [%s], actual type: [%s]",
+      final String msg =
+          String.format(
+              "Inner vector type mismatch. Requested type: [%s], actual type: [%s]",
               fieldType.getType().getTypeID(), vector.getField().getType().getTypeID());
       throw new SchemaChangeRuntimeException(msg);
     }
@@ -347,23 +344,14 @@ public int getInnerValueCount() {
     return vector.getValueCount();
   }
 
-
   /** Returns the value count for inner data vector at a particular index. */
   public int getInnerValueCountAt(int index) {
-    return offsetBuffer.getInt((index + 1) * OFFSET_WIDTH) -
-            offsetBuffer.getInt(index * OFFSET_WIDTH);
+    return offsetBuffer.getInt((index + 1) * OFFSET_WIDTH)
+        - offsetBuffer.getInt(index * OFFSET_WIDTH);
   }
 
-  /** Return if value at index is null (this implementation is always false). */
-  @Override
-  public boolean isNull(int index) {
-    return false;
-  }
-
-  /** Return if value at index is empty (this implementation is always false). */
-  public boolean isEmpty(int index) {
-    return false;
-  }
+  /** Return if value at index is empty. */
+  public abstract boolean isEmpty(int index);
 
   /** Starts a new repeated value. */
   public int startNewValue(int index) {
@@ -383,8 +371,8 @@ public void setValueCount(int valueCount) {
     while (valueCount > getOffsetBufferValueCapacity()) {
       reallocOffsetBuffer();
     }
-    final int childValueCount = valueCount == 0 ? 0 :
-            offsetBuffer.getInt(valueCount * OFFSET_WIDTH);
+    final int childValueCount =
+        valueCount == 0 ? 0 : offsetBuffer.getInt(valueCount * OFFSET_WIDTH);
     vector.setValueCount(childValueCount);
   }
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueViewVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueViewVector.java
new file mode 100644
index 0000000000000..0040d12811258
--- /dev/null
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueViewVector.java
@@ -0,0 +1,405 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.vector.complex;
+
+import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
+
+import java.util.Collections;
+import java.util.Iterator;
+import org.apache.arrow.memory.ArrowBuf;
+import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.memory.util.CommonUtil;
+import org.apache.arrow.util.Preconditions;
+import org.apache.arrow.vector.AddOrGetResult;
+import org.apache.arrow.vector.BaseFixedWidthVector;
+import org.apache.arrow.vector.BaseValueVector;
+import org.apache.arrow.vector.BaseVariableWidthVector;
+import org.apache.arrow.vector.DensityAwareVector;
+import org.apache.arrow.vector.FieldVector;
+import org.apache.arrow.vector.NullVector;
+import org.apache.arrow.vector.UInt4Vector;
+import org.apache.arrow.vector.ValueVector;
+import org.apache.arrow.vector.ZeroVector;
+import org.apache.arrow.vector.types.pojo.ArrowType;
+import org.apache.arrow.vector.types.pojo.FieldType;
+import org.apache.arrow.vector.util.CallBack;
+import org.apache.arrow.vector.util.OversizedAllocationException;
+import org.apache.arrow.vector.util.SchemaChangeRuntimeException;
+
+public abstract class BaseRepeatedValueViewVector extends BaseValueVector
+    implements RepeatedValueVector, BaseListVector {
+
+  public static final FieldVector DEFAULT_DATA_VECTOR = ZeroVector.INSTANCE;
+  public static final String DATA_VECTOR_NAME = "$data$";
+
+  public static final byte OFFSET_WIDTH = 4;
+  public static final byte SIZE_WIDTH = 4;
+  protected ArrowBuf offsetBuffer;
+  protected ArrowBuf sizeBuffer;
+  protected FieldVector vector;
+  protected final CallBack repeatedCallBack;
+  protected int valueCount;
+  protected long offsetAllocationSizeInBytes = INITIAL_VALUE_ALLOCATION * OFFSET_WIDTH;
+  protected long sizeAllocationSizeInBytes = INITIAL_VALUE_ALLOCATION * SIZE_WIDTH;
+  private final String name;
+
+  protected String defaultDataVectorName = DATA_VECTOR_NAME;
+
+  protected BaseRepeatedValueViewVector(String name, BufferAllocator allocator, CallBack callBack) {
+    this(name, allocator, DEFAULT_DATA_VECTOR, callBack);
+  }
+
+  protected BaseRepeatedValueViewVector(
+      String name, BufferAllocator allocator, FieldVector vector, CallBack callBack) {
+    super(allocator);
+    this.name = name;
+    this.offsetBuffer = allocator.getEmpty();
+    this.sizeBuffer = allocator.getEmpty();
+    this.vector = Preconditions.checkNotNull(vector, "data vector cannot be null");
+    this.repeatedCallBack = callBack;
+    this.valueCount = 0;
+  }
+
+  @Override
+  public String getName() {
+    return name;
+  }
+
+  @Override
+  public boolean allocateNewSafe() {
+    boolean dataAlloc = false;
+    try {
+      allocateBuffers();
+      dataAlloc = vector.allocateNewSafe();
+    } catch (Exception e) {
+      clear();
+      return false;
+    } finally {
+      if (!dataAlloc) {
+        clear();
+      }
+    }
+    return dataAlloc;
+  }
+
+  private void allocateBuffers() {
+    offsetBuffer = allocateBuffers(offsetAllocationSizeInBytes);
+    sizeBuffer = allocateBuffers(sizeAllocationSizeInBytes);
+  }
+
+  private ArrowBuf allocateBuffers(final long size) {
+    final int curSize = (int) size;
+    ArrowBuf buffer = allocator.buffer(curSize);
+    buffer.readerIndex(0);
+    buffer.setZero(0, buffer.capacity());
+    return buffer;
+  }
+
+  @Override
+  public void reAlloc() {
+    reallocateBuffers();
+    vector.reAlloc();
+  }
+
+  protected void reallocateBuffers() {
+    reallocOffsetBuffer();
+    reallocSizeBuffer();
+  }
+
+  private void reallocOffsetBuffer() {
+    final long currentBufferCapacity = offsetBuffer.capacity();
+    long newAllocationSize = currentBufferCapacity * 2;
+    if (newAllocationSize == 0) {
+      if (offsetAllocationSizeInBytes > 0) {
+        newAllocationSize = offsetAllocationSizeInBytes;
+      } else {
+        newAllocationSize = INITIAL_VALUE_ALLOCATION * OFFSET_WIDTH * 2;
+      }
+    }
+
+    newAllocationSize = CommonUtil.nextPowerOfTwo(newAllocationSize);
+    newAllocationSize = Math.min(newAllocationSize, (long) OFFSET_WIDTH * Integer.MAX_VALUE);
+    assert newAllocationSize >= 1;
+
+    if (newAllocationSize > MAX_ALLOCATION_SIZE || newAllocationSize <= offsetBuffer.capacity()) {
+      throw new OversizedAllocationException("Unable to expand the buffer");
+    }
+
+    final ArrowBuf newBuf = allocator.buffer(newAllocationSize);
+    newBuf.setBytes(0, offsetBuffer, 0, currentBufferCapacity);
+    newBuf.setZero(currentBufferCapacity, newBuf.capacity() - currentBufferCapacity);
+    offsetBuffer.getReferenceManager().release(1);
+    offsetBuffer = newBuf;
+    offsetAllocationSizeInBytes = newAllocationSize;
+  }
+
+  private void reallocSizeBuffer() {
+    final long currentBufferCapacity = sizeBuffer.capacity();
+    long newAllocationSize = currentBufferCapacity * 2;
+    if (newAllocationSize == 0) {
+      if (sizeAllocationSizeInBytes > 0) {
+        newAllocationSize = sizeAllocationSizeInBytes;
+      } else {
+        newAllocationSize = INITIAL_VALUE_ALLOCATION * SIZE_WIDTH * 2;
+      }
+    }
+
+    newAllocationSize = CommonUtil.nextPowerOfTwo(newAllocationSize);
+    newAllocationSize = Math.min(newAllocationSize, (long) SIZE_WIDTH * Integer.MAX_VALUE);
+    assert newAllocationSize >= 1;
+
+    if (newAllocationSize > MAX_ALLOCATION_SIZE || newAllocationSize <= sizeBuffer.capacity()) {
+      throw new OversizedAllocationException("Unable to expand the buffer");
+    }
+
+    final ArrowBuf newBuf = allocator.buffer(newAllocationSize);
+    newBuf.setBytes(0, sizeBuffer, 0, currentBufferCapacity);
+    newBuf.setZero(currentBufferCapacity, newBuf.capacity() - currentBufferCapacity);
+    sizeBuffer.getReferenceManager().release(1);
+    sizeBuffer = newBuf;
+    sizeAllocationSizeInBytes = newAllocationSize;
+  }
+
+  @Override
+  public FieldVector getDataVector() {
+    return vector;
+  }
+
+  @Override
+  public void setInitialCapacity(int numRecords) {
+    offsetAllocationSizeInBytes = (numRecords) * OFFSET_WIDTH;
+    sizeAllocationSizeInBytes = (numRecords) * SIZE_WIDTH;
+    if (vector instanceof BaseFixedWidthVector || vector instanceof BaseVariableWidthVector) {
+      vector.setInitialCapacity(numRecords * RepeatedValueVector.DEFAULT_REPEAT_PER_RECORD);
+    } else {
+      vector.setInitialCapacity(numRecords);
+    }
+  }
+
+  @Override
+  public void setInitialCapacity(int numRecords, double density) {
+    if ((numRecords * density) >= Integer.MAX_VALUE) {
+      throw new OversizedAllocationException("Requested amount of memory is more than max allowed");
+    }
+
+    offsetAllocationSizeInBytes = numRecords * OFFSET_WIDTH;
+    sizeAllocationSizeInBytes = numRecords * SIZE_WIDTH;
+
+    int innerValueCapacity = Math.max((int) (numRecords * density), 1);
+
+    if (vector instanceof DensityAwareVector) {
+      ((DensityAwareVector) vector).setInitialCapacity(innerValueCapacity, density);
+    } else {
+      vector.setInitialCapacity(innerValueCapacity);
+    }
+  }
+
+  /**
+   * Specialized version of setInitialTotalCapacity() for ListViewVector. This is used by some
+   * callers when they want to explicitly control and be conservative about memory allocated for
+   * inner data vector. This is very useful when we are working with memory constraints for a query
+   * and have a fixed amount of memory reserved for the record batch. In such cases, we are likely
+   * to face OOM or related problems when we reserve memory for a record batch with value count x
+   * and do setInitialCapacity(x) such that each vector allocates only what is necessary and not the
+   * default amount, but the multiplier forces the memory requirement to go beyond what was needed.
+   *
+   * @param numRecords value count
+   * @param totalNumberOfElements the total number of elements to allow for in this vector across
+   *     all records.
+   */
+  public void setInitialTotalCapacity(int numRecords, int totalNumberOfElements) {
+    offsetAllocationSizeInBytes = numRecords * OFFSET_WIDTH;
+    sizeAllocationSizeInBytes = numRecords * SIZE_WIDTH;
+    vector.setInitialCapacity(totalNumberOfElements);
+  }
+
+  @Override
+  public int getValueCapacity() {
+    throw new UnsupportedOperationException(
+        "Get value capacity is not supported in RepeatedValueVector");
+  }
+
+  protected int getOffsetBufferValueCapacity() {
+    return capAtMaxInt(offsetBuffer.capacity() / OFFSET_WIDTH);
+  }
+
+  protected int getSizeBufferValueCapacity() {
+    return capAtMaxInt(sizeBuffer.capacity() / SIZE_WIDTH);
+  }
+
+  @Override
+  public int getBufferSize() {
+    if (valueCount == 0) {
+      return 0;
+    }
+    return (valueCount * OFFSET_WIDTH) + (valueCount * SIZE_WIDTH) + vector.getBufferSize();
+  }
+
+  @Override
+  public int getBufferSizeFor(int valueCount) {
+    if (valueCount == 0) {
+      return 0;
+    }
+
+    int innerVectorValueCount = 0;
+
+    for (int i = 0; i < valueCount; i++) {
+      innerVectorValueCount += sizeBuffer.getInt(i * SIZE_WIDTH);
+    }
+
+    return (valueCount * OFFSET_WIDTH)
+        + (valueCount * SIZE_WIDTH)
+        + vector.getBufferSizeFor(innerVectorValueCount);
+  }
+
+  @Override
+  public Iterator<ValueVector> iterator() {
+    return Collections.<ValueVector>singleton(getDataVector()).iterator();
+  }
+
+  @Override
+  public void clear() {
+    offsetBuffer = releaseBuffer(offsetBuffer);
+    sizeBuffer = releaseBuffer(sizeBuffer);
+    vector.clear();
+    valueCount = 0;
+    super.clear();
+  }
+
+  @Override
+  public void reset() {
+    offsetBuffer.setZero(0, offsetBuffer.capacity());
+    sizeBuffer.setZero(0, sizeBuffer.capacity());
+    vector.reset();
+    valueCount = 0;
+  }
+
+  @Override
+  public ArrowBuf[] getBuffers(boolean clear) {
+    return new ArrowBuf[0];
+  }
+
+  @Override
+  public int getValueCount() {
+    return valueCount;
+  }
+
+  @Override
+  public void setValueCount(int valueCount) {
+    this.valueCount = valueCount;
+    while (valueCount > getOffsetBufferValueCapacity()) {
+      reallocateBuffers();
+    }
+    final int childValueCount = valueCount == 0 ? 0 : getLengthOfChildVector();
+    vector.setValueCount(childValueCount);
+  }
+
+  protected int getLengthOfChildVector() {
+    int maxOffsetSizeSum = offsetBuffer.getInt(0) + sizeBuffer.getInt(0);
+    int minOffset = offsetBuffer.getInt(0);
+    for (int i = 0; i < valueCount; i++) {
+      int currentOffset = offsetBuffer.getInt(i * OFFSET_WIDTH);
+      int currentSize = sizeBuffer.getInt(i * SIZE_WIDTH);
+      int currentSum = currentOffset + currentSize;
+
+      maxOffsetSizeSum = Math.max(maxOffsetSizeSum, currentSum);
+      minOffset = Math.min(minOffset, currentOffset);
+    }
+
+    return maxOffsetSizeSum - minOffset;
+  }
+
+  protected int getLengthOfChildVectorByIndex(int index) {
+    int maxOffsetSizeSum = offsetBuffer.getInt(0) + sizeBuffer.getInt(0);
+    int minOffset = offsetBuffer.getInt(0);
+    for (int i = 0; i < index; i++) {
+      int currentOffset = offsetBuffer.getInt(i * OFFSET_WIDTH);
+      int currentSize = sizeBuffer.getInt(i * SIZE_WIDTH);
+      int currentSum = currentOffset + currentSize;
+
+      maxOffsetSizeSum = Math.max(maxOffsetSizeSum, currentSum);
+      minOffset = Math.min(minOffset, currentOffset);
+    }
+
+    return maxOffsetSizeSum - minOffset;
+  }
+
+  /**
+   * Initialize the data vector (and execute callback) if it hasn't already been done, returns the
+   * data vector.
+   */
+  public <T extends ValueVector> AddOrGetResult<T> addOrGetVector(FieldType fieldType) {
+    boolean created = false;
+    if (vector instanceof NullVector) {
+      vector = fieldType.createNewSingleVector(defaultDataVectorName, allocator, repeatedCallBack);
+      // returned vector must have the same field
+      created = true;
+      if (repeatedCallBack != null
+          &&
+          // not a schema change if changing from ZeroVector to ZeroVector
+          (fieldType.getType().getTypeID() != ArrowType.ArrowTypeID.Null)) {
+        repeatedCallBack.doWork();
+      }
+    }
+
+    if (vector.getField().getType().getTypeID() != fieldType.getType().getTypeID()) {
+      final String msg =
+          String.format(
+              "Inner vector type mismatch. Requested type: [%s], actual type: [%s]",
+              fieldType.getType().getTypeID(), vector.getField().getType().getTypeID());
+      throw new SchemaChangeRuntimeException(msg);
+    }
+
+    return new AddOrGetResult<>((T) vector, created);
+  }
+
+  protected void replaceDataVector(FieldVector v) {
+    vector.clear();
+    vector = v;
+  }
+
+  public abstract boolean isEmpty(int index);
+
+  /**
+   * Start a new value at the given index.
+   *
+   * @param index the index to start the new value at
+   * @return the offset in the data vector where the new value starts
+   */
+  public int startNewValue(int index) {
+    while (index >= getOffsetBufferValueCapacity()) {
+      reallocOffsetBuffer();
+    }
+    while (index >= getSizeBufferValueCapacity()) {
+      reallocSizeBuffer();
+    }
+
+    if (index > 0) {
+      final int prevOffset = getLengthOfChildVectorByIndex(index);
+      offsetBuffer.setInt(index * OFFSET_WIDTH, prevOffset);
+    }
+
+    setValueCount(index + 1);
+    return offsetBuffer.getInt(index * OFFSET_WIDTH);
+  }
+
+  @Override
+  @Deprecated
+  public UInt4Vector getOffsetVector() {
+    throw new UnsupportedOperationException("There is no inner offset vector");
+  }
+}
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/EmptyValuePopulator.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/EmptyValuePopulator.java
index b32dce367120d..4477ebc94df2d 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/EmptyValuePopulator.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/EmptyValuePopulator.java
@@ -14,15 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.UInt4Vector;
 
-/**
- * A helper class that is used to track and populate empty values in repeated value vectors.
- */
+/** A helper class that is used to track and populate empty values in repeated value vectors. */
 public class EmptyValuePopulator {
   private final UInt4Vector offsets;
 
@@ -31,21 +28,23 @@ public EmptyValuePopulator(UInt4Vector offsets) {
   }
 
   /**
-   * Marks all values since the last set as empty. The last set value is obtained from underlying offsets vector.
+   * Marks all values since the last set as empty. The last set value is obtained from underlying
+   * offsets vector.
    *
-   * @param lastIndex the last index (inclusive) in the offsets vector until which empty population takes place
-   * @throws java.lang.IndexOutOfBoundsException if lastIndex is negative or greater than offsets capacity.
+   * @param lastIndex the last index (inclusive) in the offsets vector until which empty population
+   *     takes place
+   * @throws java.lang.IndexOutOfBoundsException if lastIndex is negative or greater than offsets
+   *     capacity.
    */
   public void populate(int lastIndex) {
     if (lastIndex < 0) {
       throw new IndexOutOfBoundsException("index cannot be negative");
     }
     final int lastSet = Math.max(offsets.getValueCount() - 1, 0);
-    final int previousEnd = offsets.get(lastSet); //0 ? 0 : accessor.get(lastSet);
+    final int previousEnd = offsets.get(lastSet); // 0 ? 0 : accessor.get(lastSet);
     for (int i = lastSet; i < lastIndex; i++) {
       offsets.setSafe(i + 1, previousEnd);
     }
     offsets.setValueCount(lastIndex + 1);
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java
index 48b53d7de2e3f..7a88eaf162314 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
 import static java.util.Collections.singletonList;
@@ -29,7 +28,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.OutOfMemoryException;
@@ -43,6 +41,7 @@
 import org.apache.arrow.vector.BitVectorHelper;
 import org.apache.arrow.vector.BufferBacked;
 import org.apache.arrow.vector.FieldVector;
+import org.apache.arrow.vector.ValueIterableVector;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.ZeroVector;
 import org.apache.arrow.vector.compare.VectorVisitor;
@@ -61,7 +60,8 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /** A ListVector where every list value is of the same size. */
-public class FixedSizeListVector extends BaseValueVector implements BaseListVector, PromotableVector {
+public class FixedSizeListVector extends BaseValueVector
+    implements BaseListVector, PromotableVector, ValueIterableVector<List<?>> {
 
   public static FixedSizeListVector empty(String name, int size, BufferAllocator allocator) {
     FieldType fieldType = FieldType.nullable(new ArrowType.FixedSizeList(size));
@@ -85,10 +85,11 @@ public static FixedSizeListVector empty(String name, int size, BufferAllocator a
    * @param fieldType The underlying data type of the vector.
    * @param unusedSchemaChangeCallback Currently unused.
    */
-  public FixedSizeListVector(String name,
-                             BufferAllocator allocator,
-                             FieldType fieldType,
-                             CallBack unusedSchemaChangeCallback) {
+  public FixedSizeListVector(
+      String name,
+      BufferAllocator allocator,
+      FieldType fieldType,
+      CallBack unusedSchemaChangeCallback) {
     this(new Field(name, fieldType, null), allocator, unusedSchemaChangeCallback);
   }
 
@@ -99,9 +100,8 @@ public FixedSizeListVector(String name,
    * @param allocator The allocator to use for creating/reallocating buffers for the vector.
    * @param unusedSchemaChangeCallback Currently unused.
    */
-  public FixedSizeListVector(Field field,
-                             BufferAllocator allocator,
-                             CallBack unusedSchemaChangeCallback) {
+  public FixedSizeListVector(
+      Field field, BufferAllocator allocator, CallBack unusedSchemaChangeCallback) {
     super(allocator);
 
     this.field = field;
@@ -118,7 +118,11 @@ public Field getField() {
     if (field.getChildren().contains(getDataVector().getField())) {
       return field;
     }
-    field = new Field(field.getName(), field.getFieldType(), Collections.singletonList(getDataVector().getField()));
+    field =
+        new Field(
+            field.getName(),
+            field.getFieldType(),
+            Collections.singletonList(getDataVector().getField()));
     return field;
   }
 
@@ -139,12 +143,15 @@ public int getListSize() {
 
   @Override
   public void initializeChildrenFromFields(List<Field> children) {
-    checkArgument(children.size() == 1,
-            "Lists have one child Field. Found: %s", children.isEmpty() ? "none" : children);
+    checkArgument(
+        children.size() == 1,
+        "Lists have one child Field. Found: %s",
+        children.isEmpty() ? "none" : children);
 
     Field field = children.get(0);
     AddOrGetResult<FieldVector> addOrGetVector = addOrGetVector(field.getFieldType());
-    checkArgument(addOrGetVector.isCreated(), "Child vector already existed: %s", addOrGetVector.getVector());
+    checkArgument(
+        addOrGetVector.isCreated(), "Child vector already existed: %s", addOrGetVector.getVector());
 
     addOrGetVector.getVector().initializeChildrenFromFields(field.getChildren());
     this.field = new Field(this.field.getName(), this.field.getFieldType(), children);
@@ -158,7 +165,8 @@ public List<FieldVector> getChildrenFromFields() {
   @Override
   public void loadFieldBuffers(ArrowFieldNode fieldNode, List<ArrowBuf> ownBuffers) {
     if (ownBuffers.size() != 1) {
-      throw new IllegalArgumentException("Illegal buffer count, expected " + 1 + ", got: " + ownBuffers.size());
+      throw new IllegalArgumentException(
+          "Illegal buffer count, expected " + 1 + ", got: " + ownBuffers.size());
     }
 
     ArrowBuf bitBuffer = ownBuffers.get(0);
@@ -328,8 +336,8 @@ public int getBufferSizeFor(int valueCount) {
     if (valueCount == 0) {
       return 0;
     }
-    return getValidityBufferSizeFromCount(valueCount) +
-            vector.getBufferSizeFor(valueCount * listSize);
+    return getValidityBufferSizeFromCount(valueCount)
+        + vector.getBufferSizeFor(valueCount * listSize);
   }
 
   @Override
@@ -375,6 +383,7 @@ public ArrowBuf[] getBuffers(boolean clear) {
 
   /**
    * Get value indicating if inner vector is set.
+   *
    * @return 1 if inner vector is explicitly set via #addOrGetVector else 0
    */
   public int size() {
@@ -392,7 +401,9 @@ public <T extends ValueVector> AddOrGetResult<T> addOrGetVector(FieldType type)
     }
     // returned vector must have the same field
     if (!Objects.equals(vector.getField().getType(), type.getType())) {
-      final String msg = String.format("Inner vector type mismatch. Requested type: [%s], actual type: [%s]",
+      final String msg =
+          String.format(
+              "Inner vector type mismatch. Requested type: [%s], actual type: [%s]",
               type.getType(), vector.getField().getType());
       throw new SchemaChangeRuntimeException(msg);
     }
@@ -414,7 +425,8 @@ public void copyFrom(int fromIndex, int thisIndex, ValueVector from) {
 
   @Override
   public UnionVector promoteToUnion() {
-    UnionVector vector = new UnionVector(getName(), allocator, /* field type */ null, /* call-back */ null);
+    UnionVector vector =
+        new UnionVector(getName(), allocator, /* field type */ null, /* call-back */ null);
     this.vector.clear();
     this.vector = vector;
     invalidateReader();
@@ -463,17 +475,13 @@ public List<?> getObject(int index) {
     return vals;
   }
 
-  /**
-   * Returns whether the value at index null.
-   */
+  /** Returns whether the value at index null. */
   @Override
   public boolean isNull(int index) {
     return (isSet(index) == 0);
   }
 
-  /**
-   * Returns non-zero when the value at index is non-null.
-   */
+  /** Returns non-zero when the value at index is non-null. */
   public int isSet(int index) {
     final int byteIndex = index >> 3;
     final byte b = validityBuffer.getByte(byteIndex);
@@ -491,17 +499,12 @@ public int getValueCount() {
     return valueCount;
   }
 
-  /**
-   * Returns the number of elements the validity buffer can represent with its
-   * current capacity.
-   */
+  /** Returns the number of elements the validity buffer can represent with its current capacity. */
   private int getValidityBufferValueCapacity() {
     return capAtMaxInt(validityBuffer.capacity() * 8);
   }
 
-  /**
-   * Sets the value at index to null.  Reallocates if index is larger than capacity.
-   */
+  /** Sets the value at index to null. Reallocates if index is larger than capacity. */
   @Override
   public void setNull(int index) {
     while (index >= getValidityBufferValueCapacity()) {
@@ -614,8 +617,12 @@ public void transfer() {
 
     @Override
     public void splitAndTransfer(int startIndex, int length) {
-      Preconditions.checkArgument(startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
-          "Invalid parameters startIndex: %s, length: %s for valueCount: %s", startIndex, length, valueCount);
+      Preconditions.checkArgument(
+          startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
+          "Invalid parameters startIndex: %s, length: %s for valueCount: %s",
+          startIndex,
+          length,
+          valueCount);
       final int startPoint = listSize * startIndex;
       final int sliceLength = listSize * length;
       to.clear();
@@ -630,7 +637,8 @@ public void splitAndTransfer(int startIndex, int length) {
     /*
      * transfer the validity.
      */
-    private void splitAndTransferValidityBuffer(int startIndex, int length, FixedSizeListVector target) {
+    private void splitAndTransferValidityBuffer(
+        int startIndex, int length, FixedSizeListVector target) {
       int firstByteSource = BitVectorHelper.byteIndex(startIndex);
       int lastByteSource = BitVectorHelper.byteIndex(valueCount - 1);
       int byteSizeTarget = getValidityBufferSizeFromCount(length);
@@ -654,8 +662,11 @@ private void splitAndTransferValidityBuffer(int startIndex, int length, FixedSiz
           target.allocateValidityBuffer(byteSizeTarget);
 
           for (int i = 0; i < byteSizeTarget - 1; i++) {
-            byte b1 = BitVectorHelper.getBitsFromCurrentByte(validityBuffer, firstByteSource + i, offset);
-            byte b2 = BitVectorHelper.getBitsFromNextByte(validityBuffer, firstByteSource + i + 1, offset);
+            byte b1 =
+                BitVectorHelper.getBitsFromCurrentByte(validityBuffer, firstByteSource + i, offset);
+            byte b2 =
+                BitVectorHelper.getBitsFromNextByte(
+                    validityBuffer, firstByteSource + i + 1, offset);
 
             target.validityBuffer.setByte(i, (b1 + b2));
           }
@@ -670,15 +681,18 @@ private void splitAndTransferValidityBuffer(int startIndex, int length, FixedSiz
            * by shifting data from the current byte.
            */
           if ((firstByteSource + byteSizeTarget - 1) < lastByteSource) {
-            byte b1 = BitVectorHelper.getBitsFromCurrentByte(validityBuffer,
-                firstByteSource + byteSizeTarget - 1, offset);
-            byte b2 = BitVectorHelper.getBitsFromNextByte(validityBuffer,
-                firstByteSource + byteSizeTarget, offset);
+            byte b1 =
+                BitVectorHelper.getBitsFromCurrentByte(
+                    validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
+            byte b2 =
+                BitVectorHelper.getBitsFromNextByte(
+                    validityBuffer, firstByteSource + byteSizeTarget, offset);
 
             target.validityBuffer.setByte(byteSizeTarget - 1, b1 + b2);
           } else {
-            byte b1 = BitVectorHelper.getBitsFromCurrentByte(validityBuffer,
-                firstByteSource + byteSizeTarget - 1, offset);
+            byte b1 =
+                BitVectorHelper.getBitsFromCurrentByte(
+                    validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
             target.validityBuffer.setByte(byteSizeTarget - 1, b1);
           }
         }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java
index b934cbd81db16..ef2e7383a9105 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
 import static java.util.Collections.singletonList;
@@ -26,7 +25,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.OutOfMemoryException;
@@ -45,6 +43,7 @@
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.NullVector;
 import org.apache.arrow.vector.UInt4Vector;
+import org.apache.arrow.vector.ValueIterableVector;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.ZeroVector;
 import org.apache.arrow.vector.compare.VectorVisitor;
@@ -64,28 +63,28 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * A list vector contains lists of a specific type of elements.  Its structure contains 3 elements.
+ * A list vector contains lists of a specific type of elements. Its structure contains 3 elements.
+ *
  * <ol>
- * <li>A validity buffer.</li>
- * <li> An offset buffer, that denotes lists boundaries. </li>
- * <li> A child data vector that contains the elements of lists. </li>
+ *   <li>A validity buffer.
+ *   <li>An offset buffer, that denotes lists boundaries.
+ *   <li>A child data vector that contains the elements of lists.
  * </ol>
  *
  * This is the LargeList variant of list, it has a 64-bit wide offset
  *
- * <p>
- *   WARNING: Currently Arrow in Java doesn't support 64-bit vectors. This class
- *   follows the expected behaviour of a LargeList but doesn't actually support allocating
- *   a 64-bit vector. It has little use until 64-bit vectors are supported and should be used
- *   with caution.
- *   todo review checkedCastToInt usage in this class.
- *   Once int64 indexed vectors are supported these checks aren't needed.
- * </p>
+ * <p>WARNING: Currently Arrow in Java doesn't support 64-bit vectors. This class follows the
+ * expected behaviour of a LargeList but doesn't actually support allocating a 64-bit vector. It has
+ * little use until 64-bit vectors are supported and should be used with caution. todo review
+ * checkedCastToInt usage in this class. Once int64 indexed vectors are supported these checks
+ * aren't needed.
  */
-public class LargeListVector extends BaseValueVector implements RepeatedValueVector, FieldVector, PromotableVector {
+public class LargeListVector extends BaseValueVector
+    implements RepeatedValueVector, FieldVector, PromotableVector, ValueIterableVector<List<?>> {
 
   public static LargeListVector empty(String name, BufferAllocator allocator) {
-    return new LargeListVector(name, allocator, FieldType.nullable(ArrowType.LargeList.INSTANCE), null);
+    return new LargeListVector(
+        name, allocator, FieldType.nullable(ArrowType.LargeList.INSTANCE), null);
   }
 
   public static final FieldVector DEFAULT_DATA_VECTOR = ZeroVector.INSTANCE;
@@ -104,9 +103,7 @@ public static LargeListVector empty(String name, BufferAllocator allocator) {
   private Field field;
   private int validityAllocationSizeInBytes;
 
-  /**
-   * The maximum index that is actually set.
-   */
+  /** The maximum index that is actually set. */
   private int lastSet;
 
   /**
@@ -117,7 +114,8 @@ public static LargeListVector empty(String name, BufferAllocator allocator) {
    * @param fieldType The type of this list.
    * @param callBack A schema change callback.
    */
-  public LargeListVector(String name, BufferAllocator allocator, FieldType fieldType, CallBack callBack) {
+  public LargeListVector(
+      String name, BufferAllocator allocator, FieldType fieldType, CallBack callBack) {
     this(new Field(name, fieldType, null), allocator, callBack);
   }
 
@@ -142,12 +140,15 @@ public LargeListVector(Field field, BufferAllocator allocator, CallBack callBack
 
   @Override
   public void initializeChildrenFromFields(List<Field> children) {
-    checkArgument(children.size() == 1,
-            "Lists have one child Field. Found: %s", children.isEmpty() ? "none" : children);
+    checkArgument(
+        children.size() == 1,
+        "Lists have one child Field. Found: %s",
+        children.isEmpty() ? "none" : children);
 
     Field field = children.get(0);
     AddOrGetResult<FieldVector> addOrGetVector = addOrGetVector(field.getFieldType());
-    checkArgument(addOrGetVector.isCreated(), "Child vector already existed: %s", addOrGetVector.getVector());
+    checkArgument(
+        addOrGetVector.isCreated(), "Child vector already existed: %s", addOrGetVector.getVector());
 
     addOrGetVector.getVector().initializeChildrenFromFields(field.getChildren());
     this.field = new Field(this.field.getName(), this.field.getFieldType(), children);
@@ -165,27 +166,21 @@ public void setInitialCapacity(int numRecords) {
   }
 
   /**
-   * Specialized version of setInitialCapacity() for ListVector. This is
-   * used by some callers when they want to explicitly control and be
-   * conservative about memory allocated for inner data vector. This is
-   * very useful when we are working with memory constraints for a query
-   * and have a fixed amount of memory reserved for the record batch. In
-   * such cases, we are likely to face OOM or related problems when
-   * we reserve memory for a record batch with value count x and
-   * do setInitialCapacity(x) such that each vector allocates only
-   * what is necessary and not the default amount but the multiplier
-   * forces the memory requirement to go beyond what was needed.
+   * Specialized version of setInitialCapacity() for ListVector. This is used by some callers when
+   * they want to explicitly control and be conservative about memory allocated for inner data
+   * vector. This is very useful when we are working with memory constraints for a query and have a
+   * fixed amount of memory reserved for the record batch. In such cases, we are likely to face OOM
+   * or related problems when we reserve memory for a record batch with value count x and do
+   * setInitialCapacity(x) such that each vector allocates only what is necessary and not the
+   * default amount but the multiplier forces the memory requirement to go beyond what was needed.
    *
    * @param numRecords value count
-   * @param density density of ListVector. Density is the average size of
-   *                list per position in the List vector. For example, a
-   *                density value of 10 implies each position in the list
-   *                vector has a list of 10 values.
-   *                A density value of 0.1 implies out of 10 positions in
-   *                the list vector, 1 position has a list of size 1 and
-   *                remaining positions are null (no lists) or empty lists.
-   *                This helps in tightly controlling the memory we provision
-   *                for inner data vector.
+   * @param density density of ListVector. Density is the average size of list per position in the
+   *     List vector. For example, a density value of 10 implies each position in the list vector
+   *     has a list of 10 values. A density value of 0.1 implies out of 10 positions in the list
+   *     vector, 1 position has a list of size 1 and remaining positions are null (no lists) or
+   *     empty lists. This helps in tightly controlling the memory we provision for inner data
+   *     vector.
    */
   @Override
   public void setInitialCapacity(int numRecords, double density) {
@@ -206,20 +201,17 @@ public void setInitialCapacity(int numRecords, double density) {
   }
 
   /**
-   * Specialized version of setInitialTotalCapacity() for ListVector. This is
-   * used by some callers when they want to explicitly control and be
-   * conservative about memory allocated for inner data vector. This is
-   * very useful when we are working with memory constraints for a query
-   * and have a fixed amount of memory reserved for the record batch. In
-   * such cases, we are likely to face OOM or related problems when
-   * we reserve memory for a record batch with value count x and
-   * do setInitialCapacity(x) such that each vector allocates only
-   * what is necessary and not the default amount but the multiplier
-   * forces the memory requirement to go beyond what was needed.
+   * Specialized version of setInitialTotalCapacity() for ListVector. This is used by some callers
+   * when they want to explicitly control and be conservative about memory allocated for inner data
+   * vector. This is very useful when we are working with memory constraints for a query and have a
+   * fixed amount of memory reserved for the record batch. In such cases, we are likely to face OOM
+   * or related problems when we reserve memory for a record batch with value count x and do
+   * setInitialCapacity(x) such that each vector allocates only what is necessary and not the
+   * default amount but the multiplier forces the memory requirement to go beyond what was needed.
    *
    * @param numRecords value count
-   * @param totalNumberOfElements the total number of elements to to allow
-   *                              for in this vector across all records.
+   * @param totalNumberOfElements the total number of elements to to allow for in this vector across
+   *     all records.
    */
   public void setInitialTotalCapacity(int numRecords, int totalNumberOfElements) {
     offsetAllocationSizeInBytes = (numRecords + 1L) * OFFSET_WIDTH;
@@ -228,6 +220,7 @@ public void setInitialTotalCapacity(int numRecords, int totalNumberOfElements) {
 
   /**
    * Get the density of this ListVector.
+   *
    * @return density
    */
   public double getDensity() {
@@ -246,16 +239,17 @@ public List<FieldVector> getChildrenFromFields() {
   }
 
   /**
-   * Load the buffers of this vector with provided source buffers.
-   * The caller manages the source buffers and populates them before invoking
-   * this method.
-   * @param fieldNode  the fieldNode indicating the value count
+   * Load the buffers of this vector with provided source buffers. The caller manages the source
+   * buffers and populates them before invoking this method.
+   *
+   * @param fieldNode the fieldNode indicating the value count
    * @param ownBuffers the buffers for this Field (own buffers only, children not included)
    */
   @Override
   public void loadFieldBuffers(ArrowFieldNode fieldNode, List<ArrowBuf> ownBuffers) {
     if (ownBuffers.size() != 2) {
-      throw new IllegalArgumentException("Illegal buffer count, expected " + 2 + ", got: " + ownBuffers.size());
+      throw new IllegalArgumentException(
+          "Illegal buffer count, expected " + 2 + ", got: " + ownBuffers.size());
     }
 
     ArrowBuf bitBuffer = ownBuffers.get(0);
@@ -275,6 +269,7 @@ public void loadFieldBuffers(ArrowFieldNode fieldNode, List<ArrowBuf> ownBuffers
 
   /**
    * Get the buffers belonging to this vector.
+   *
    * @return the inner buffers.
    */
   @Override
@@ -288,8 +283,27 @@ public List<ArrowBuf> getFieldBuffers() {
   }
 
   /**
-   * Set the reader and writer indexes for the inner buffers.
+   * Export the buffers of the fields for C Data Interface. This method traverse the buffers and
+   * export buffer and buffer's memory address into a list of buffers and a pointer to the list of
+   * buffers.
    */
+  @Override
+  public void exportCDataBuffers(List<ArrowBuf> buffers, ArrowBuf buffersPtr, long nullValue) {
+    exportBuffer(validityBuffer, buffers, buffersPtr, nullValue, true);
+
+    if (offsetBuffer.capacity() == 0) {
+      // Empty offset buffer is allowed for historical reason.
+      // To export it through C Data interface, we need to allocate a buffer with one offset.
+      // We set `retain = false` to explicitly not increase the ref count for the exported buffer.
+      // The ref count of the newly created buffer (i.e., 1) already represents the usage
+      // at imported side.
+      exportBuffer(allocateOffsetBuffer(OFFSET_WIDTH), buffers, buffersPtr, nullValue, false);
+    } else {
+      exportBuffer(offsetBuffer, buffers, buffersPtr, nullValue, true);
+    }
+  }
+
+  /** Set the reader and writer indexes for the inner buffers. */
   private void setReaderAndWriterIndex() {
     validityBuffer.readerIndex(0);
     offsetBuffer.readerIndex(0);
@@ -305,8 +319,8 @@ private void setReaderAndWriterIndex() {
   /**
    * Get the inner vectors.
    *
-   * @deprecated This API will be removed as the current implementations no longer support inner vectors.
-   *
+   * @deprecated This API will be removed as the current implementations no longer support inner
+   *     vectors.
    * @return the inner vectors for this field as defined by the TypeLayout
    */
   @Deprecated
@@ -315,9 +329,7 @@ public List<BufferBacked> getFieldInnerVectors() {
     throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers");
   }
 
-  /**
-   * Same as {@link #allocateNewSafe()}.
-   */
+  /** Same as {@link #allocateNewSafe()}. */
   @Override
   public void allocateNew() throws OutOfMemoryException {
     if (!allocateNewSafe()) {
@@ -326,9 +338,8 @@ public void allocateNew() throws OutOfMemoryException {
   }
 
   /**
-   * Allocate memory for the vector. We internally use a default value count
-   * of 4096 to allocate memory for at least these many elements in the
-   * vector.
+   * Allocate memory for the vector. We internally use a default value count of 4096 to allocate
+   * memory for at least these many elements in the vector.
    *
    * @return false if memory allocation fails, true otherwise.
    */
@@ -343,7 +354,7 @@ public boolean allocateNewSafe() {
       /* allocate offset and data buffer */
       boolean dataAlloc = false;
       try {
-        allocateOffsetBuffer(offsetAllocationSizeInBytes);
+        offsetBuffer = allocateOffsetBuffer(offsetAllocationSizeInBytes);
         dataAlloc = vector.allocateNewSafe();
       } catch (Exception e) {
         e.printStackTrace();
@@ -371,16 +382,17 @@ private void allocateValidityBuffer(final long size) {
     validityBuffer.setZero(0, validityBuffer.capacity());
   }
 
-  protected void allocateOffsetBuffer(final long size) {
-    offsetBuffer = allocator.buffer(size);
+  protected ArrowBuf allocateOffsetBuffer(final long size) {
+    ArrowBuf offsetBuffer = allocator.buffer(size);
     offsetBuffer.readerIndex(0);
     offsetAllocationSizeInBytes = size;
     offsetBuffer.setZero(0, offsetBuffer.capacity());
+    return offsetBuffer;
   }
 
   /**
-   * Resize the vector to increase the capacity. The internal behavior is to
-   * double the current value capacity.
+   * Resize the vector to increase the capacity. The internal behavior is to double the current
+   * value capacity.
    */
   @Override
   public void reAlloc() {
@@ -449,9 +461,9 @@ private void reallocValidityBuffer() {
   }
 
   /**
-   * Same as {@link #copyFrom(int, int, ValueVector)} except that
-   * it handles the case when the capacity of the vector needs to be expanded
-   * before copy.
+   * Same as {@link #copyFrom(int, int, ValueVector)} except that it handles the case when the
+   * capacity of the vector needs to be expanded before copy.
+   *
    * @param inIndex position to copy from in source vector
    * @param outIndex position to copy to in this vector
    * @param from source vector
@@ -462,8 +474,9 @@ public void copyFromSafe(int inIndex, int outIndex, ValueVector from) {
   }
 
   /**
-   * Copy a cell value from a particular index in source vector to a particular
-   * position in this vector.
+   * Copy a cell value from a particular index in source vector to a particular position in this
+   * vector.
+   *
    * @param inIndex position to copy from in source vector
    * @param outIndex position to copy to in this vector
    * @param from source vector
@@ -480,8 +493,9 @@ public void copyFrom(int inIndex, int outIndex, ValueVector from) {
 
   /**
    * Get the offset vector.
-   * @deprecated This API will be removed, as the current implementations no longer hold inner offset vectors.
    *
+   * @deprecated This API will be removed, as the current implementations no longer hold inner
+   *     offset vectors.
    * @return the underlying offset vector or null if none exists.
    */
   @Override
@@ -492,6 +506,7 @@ public UInt4Vector getOffsetVector() {
 
   /**
    * Get the inner data vector for this list vector.
+   *
    * @return data vector
    */
   @Override
@@ -626,9 +641,8 @@ public TransferImpl(LargeListVector to) {
     }
 
     /**
-     * Transfer this vector'data to another vector. The memory associated
-     * with this vector is transferred to the allocator of target vector
-     * for accounting and management purposes.
+     * Transfer this vector'data to another vector. The memory associated with this vector is
+     * transferred to the allocator of target vector for accounting and management purposes.
      */
     @Override
     public void transfer() {
@@ -644,28 +658,36 @@ public void transfer() {
     }
 
     /**
-     * Slice this vector at desired index and length and transfer the
-     * corresponding data to the target vector.
+     * Slice this vector at desired index and length and transfer the corresponding data to the
+     * target vector.
+     *
      * @param startIndex start position of the split in source vector.
      * @param length length of the split.
      */
     @Override
     public void splitAndTransfer(int startIndex, int length) {
-      Preconditions.checkArgument(startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
-          "Invalid parameters startIndex: %s, length: %s for valueCount: %s", startIndex, length, valueCount);
+      Preconditions.checkArgument(
+          startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
+          "Invalid parameters startIndex: %s, length: %s for valueCount: %s",
+          startIndex,
+          length,
+          valueCount);
       final long startPoint = offsetBuffer.getLong((long) startIndex * OFFSET_WIDTH);
-      final long sliceLength = offsetBuffer.getLong((long) (startIndex + length) * OFFSET_WIDTH) - startPoint;
+      final long sliceLength =
+          offsetBuffer.getLong((long) (startIndex + length) * OFFSET_WIDTH) - startPoint;
       to.clear();
-      to.allocateOffsetBuffer((length + 1) * OFFSET_WIDTH);
+      to.offsetBuffer = to.allocateOffsetBuffer((length + 1) * OFFSET_WIDTH);
       /* splitAndTransfer offset buffer */
       for (int i = 0; i < length + 1; i++) {
-        final long relativeOffset = offsetBuffer.getLong((long) (startIndex + i) * OFFSET_WIDTH) - startPoint;
+        final long relativeOffset =
+            offsetBuffer.getLong((long) (startIndex + i) * OFFSET_WIDTH) - startPoint;
         to.offsetBuffer.setLong((long) i * OFFSET_WIDTH, relativeOffset);
       }
       /* splitAndTransfer validity buffer */
       splitAndTransferValidityBuffer(startIndex, length, to);
       /* splitAndTransfer data buffer */
-      dataTransferPair.splitAndTransfer(checkedCastToInt(startPoint), checkedCastToInt(sliceLength));
+      dataTransferPair.splitAndTransfer(
+          checkedCastToInt(startPoint), checkedCastToInt(sliceLength));
       to.lastSet = length - 1;
       to.setValueCount(length);
     }
@@ -673,7 +695,8 @@ public void splitAndTransfer(int startIndex, int length) {
     /*
      * transfer the validity.
      */
-    private void splitAndTransferValidityBuffer(int startIndex, int length, LargeListVector target) {
+    private void splitAndTransferValidityBuffer(
+        int startIndex, int length, LargeListVector target) {
       int firstByteSource = BitVectorHelper.byteIndex(startIndex);
       int lastByteSource = BitVectorHelper.byteIndex(valueCount - 1);
       int byteSizeTarget = getValidityBufferSizeFromCount(length);
@@ -697,8 +720,11 @@ private void splitAndTransferValidityBuffer(int startIndex, int length, LargeLis
           target.allocateValidityBuffer(byteSizeTarget);
 
           for (int i = 0; i < byteSizeTarget - 1; i++) {
-            byte b1 = BitVectorHelper.getBitsFromCurrentByte(validityBuffer, firstByteSource + i, offset);
-            byte b2 = BitVectorHelper.getBitsFromNextByte(validityBuffer, firstByteSource + i + 1, offset);
+            byte b1 =
+                BitVectorHelper.getBitsFromCurrentByte(validityBuffer, firstByteSource + i, offset);
+            byte b2 =
+                BitVectorHelper.getBitsFromNextByte(
+                    validityBuffer, firstByteSource + i + 1, offset);
 
             target.validityBuffer.setByte(i, (b1 + b2));
           }
@@ -713,15 +739,18 @@ private void splitAndTransferValidityBuffer(int startIndex, int length, LargeLis
            * by shifting data from the current byte.
            */
           if ((firstByteSource + byteSizeTarget - 1) < lastByteSource) {
-            byte b1 = BitVectorHelper.getBitsFromCurrentByte(validityBuffer,
-                    firstByteSource + byteSizeTarget - 1, offset);
-            byte b2 = BitVectorHelper.getBitsFromNextByte(validityBuffer,
-                    firstByteSource + byteSizeTarget, offset);
+            byte b1 =
+                BitVectorHelper.getBitsFromCurrentByte(
+                    validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
+            byte b2 =
+                BitVectorHelper.getBitsFromNextByte(
+                    validityBuffer, firstByteSource + byteSizeTarget, offset);
 
             target.validityBuffer.setByte(byteSizeTarget - 1, b1 + b2);
           } else {
-            byte b1 = BitVectorHelper.getBitsFromCurrentByte(validityBuffer,
-                    firstByteSource + byteSizeTarget - 1, offset);
+            byte b1 =
+                BitVectorHelper.getBitsFromCurrentByte(
+                    validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
             target.validityBuffer.setByte(byteSizeTarget - 1, b1);
           }
         }
@@ -751,8 +780,8 @@ public UnionLargeListReader getReader() {
   }
 
   /**
-   * Initialize the data vector (and execute callback) if it hasn't already been done,
-   * returns the data vector.
+   * Initialize the data vector (and execute callback) if it hasn't already been done, returns the
+   * data vector.
    */
   @Override
   public <T extends ValueVector> AddOrGetResult<T> addOrGetVector(FieldType fieldType) {
@@ -761,7 +790,8 @@ public <T extends ValueVector> AddOrGetResult<T> addOrGetVector(FieldType fieldT
       vector = fieldType.createNewSingleVector(defaultDataVectorName, allocator, callBack);
       // returned vector must have the same field
       created = true;
-      if (callBack != null &&
+      if (callBack != null
+          &&
           // not a schema change if changing from ZeroVector to ZeroVector
           (fieldType.getType().getTypeID() != ArrowType.ArrowTypeID.Null)) {
         callBack.doWork();
@@ -769,8 +799,10 @@ public <T extends ValueVector> AddOrGetResult<T> addOrGetVector(FieldType fieldT
     }
 
     if (vector.getField().getType().getTypeID() != fieldType.getType().getTypeID()) {
-      final String msg = String.format("Inner vector type mismatch. Requested type: [%s], actual type: [%s]",
-          fieldType.getType().getTypeID(), vector.getField().getType().getTypeID());
+      final String msg =
+          String.format(
+              "Inner vector type mismatch. Requested type: [%s], actual type: [%s]",
+              fieldType.getType().getTypeID(), vector.getField().getType().getTypeID());
       throw new SchemaChangeRuntimeException(msg);
     }
 
@@ -779,8 +811,8 @@ public <T extends ValueVector> AddOrGetResult<T> addOrGetVector(FieldType fieldT
   }
 
   /**
-   * Get the size (number of bytes) of underlying buffers used by this
-   * vector.
+   * Get the size (number of bytes) of underlying buffers used by this vector.
+   *
    * @return size of underlying buffers.
    */
   @Override
@@ -801,9 +833,9 @@ public int getBufferSizeFor(int valueCount) {
     final int validityBufferSize = getValidityBufferSizeFromCount(valueCount);
     long innerVectorValueCount = offsetBuffer.getLong((long) valueCount * OFFSET_WIDTH);
 
-    return ((valueCount + 1) * OFFSET_WIDTH) +
-        vector.getBufferSizeFor(checkedCastToInt(innerVectorValueCount)) +
-        validityBufferSize;
+    return ((valueCount + 1) * OFFSET_WIDTH)
+        + vector.getBufferSizeFor(checkedCastToInt(innerVectorValueCount))
+        + validityBufferSize;
   }
 
   @Override
@@ -811,7 +843,11 @@ public Field getField() {
     if (field.getChildren().contains(getDataVector().getField())) {
       return field;
     }
-    field = new Field(field.getName(), field.getFieldType(), Collections.singletonList(getDataVector().getField()));
+    field =
+        new Field(
+            field.getName(),
+            field.getFieldType(),
+            Collections.singletonList(getDataVector().getField()));
     return field;
   }
 
@@ -845,15 +881,14 @@ public void reset() {
   }
 
   /**
-   * Return the underlying buffers associated with this vector. Note that this doesn't
-   * impact the reference counts for this buffer so it only should be used for in-context
-   * access. Also note that this buffer changes regularly thus
-   * external classes shouldn't hold a reference to it (unless they change it).
+   * Return the underlying buffers associated with this vector. Note that this doesn't impact the
+   * reference counts for this buffer so it only should be used for in-context access. Also note
+   * that this buffer changes regularly thus external classes shouldn't hold a reference to it
+   * (unless they change it).
    *
-   * @param clear Whether to clear vector before returning; the buffers will still be refcounted
-   *              but the returned array will be the only reference to them
-   * @return The underlying {@link ArrowBuf buffers} that is used by this
-   *         vector instance.
+   * @param clear Whether to clear vector before returning; the buffers will still be refcounted but
+   *     the returned array will be the only reference to them
+   * @return The underlying {@link ArrowBuf buffers} that is used by this vector instance.
    */
   @Override
   public ArrowBuf[] getBuffers(boolean clear) {
@@ -883,6 +918,7 @@ protected void invalidateReader() {
 
   /**
    * Get the element in the list vector at a particular index.
+   *
    * @param index position of the element
    * @return Object at given position
    */
@@ -915,6 +951,7 @@ public boolean isNull(int index) {
 
   /**
    * Check if element at given index is empty list.
+   *
    * @param index position of element
    * @return true if element at given index is empty list or NULL, false otherwise
    */
@@ -931,7 +968,7 @@ public boolean isEmpty(int index) {
   /**
    * Same as {@link #isNull(int)}.
    *
-   * @param index  position of element
+   * @param index position of element
    * @return 1 if element at given index is not null, 0 otherwise
    */
   public int isSet(int index) {
@@ -953,6 +990,7 @@ public int getNullCount() {
 
   /**
    * Get the current value capacity for the vector.
+   *
    * @return number of elements that vector can hold.
    */
   @Override
@@ -974,8 +1012,8 @@ private int getValidityBufferValueCapacity() {
   }
 
   /**
-   * Sets the list at index to be not-null.  Reallocates validity buffer if index
-   * is larger than current capacity.
+   * Sets the list at index to be not-null. Reallocates validity buffer if index is larger than
+   * current capacity.
    */
   public void setNotNull(int index) {
     while (index >= getValidityAndOffsetValueCapacity()) {
@@ -987,6 +1025,7 @@ public void setNotNull(int index) {
 
   /**
    * Sets list at index to be null.
+   *
    * @param index position in vector
    */
   @Override
@@ -1026,7 +1065,7 @@ public long startNewValue(long index) {
    * End the current value.
    *
    * @param index index of the value to end
-   * @param size  number of elements in the list that was written
+   * @param size number of elements in the list that was written
    */
   public void endValue(int index, long size) {
     final long currentOffset = offsetBuffer.getLong(((long) index + 1L) * OFFSET_WIDTH);
@@ -1036,13 +1075,10 @@ public void endValue(int index, long size) {
   /**
    * Sets the value count for the vector.
    *
-   * <p>
-   *  Important note: The underlying vector does not support 64-bit
-   *  allocations yet. This may throw if attempting to hold larger
-   *  than what a 32-bit vector can store.
-   * </p>
+   * <p>Important note: The underlying vector does not support 64-bit allocations yet. This may
+   * throw if attempting to hold larger than what a 32-bit vector can store.
    *
-   * @param valueCount   value count
+   * @param valueCount value count
    */
   @Override
   public void setValueCount(int valueCount) {
@@ -1059,14 +1095,16 @@ public void setValueCount(int valueCount) {
       }
     }
     /* valueCount for the data vector is the current end offset */
-    final long childValueCount = (valueCount == 0) ? 0 :
-            offsetBuffer.getLong(((long) lastSet + 1L) * OFFSET_WIDTH);
+    final long childValueCount =
+        (valueCount == 0) ? 0 : offsetBuffer.getLong(((long) lastSet + 1L) * OFFSET_WIDTH);
     /* set the value count of data vector and this will take care of
      * checking whether data buffer needs to be reallocated.
      * TODO: revisit when 64-bit vectors are supported
      */
-    Preconditions.checkArgument(childValueCount <= Integer.MAX_VALUE || childValueCount >= Integer.MIN_VALUE,
-        "LargeListVector doesn't yet support 64-bit allocations: %s", childValueCount);
+    Preconditions.checkArgument(
+        childValueCount <= Integer.MAX_VALUE || childValueCount >= Integer.MIN_VALUE,
+        "LargeListVector doesn't yet support 64-bit allocations: %s",
+        childValueCount);
     vector.setValueCount((int) childValueCount);
   }
 
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java
index 7df659e4cc9da..17708167ff4b3 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
 import static java.util.Collections.singletonList;
@@ -26,7 +25,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.OutOfMemoryException;
@@ -39,6 +37,7 @@
 import org.apache.arrow.vector.BitVectorHelper;
 import org.apache.arrow.vector.BufferBacked;
 import org.apache.arrow.vector.FieldVector;
+import org.apache.arrow.vector.ValueIterableVector;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.ZeroVector;
 import org.apache.arrow.vector.compare.VectorVisitor;
@@ -58,15 +57,18 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * A list vector contains lists of a specific type of elements.  Its structure contains 3 elements.
+ * A list vector contains lists of a specific type of elements. Its structure contains 3 elements.
+ *
  * <ol>
- * <li>A validity buffer.</li>
- * <li> An offset buffer, that denotes lists boundaries. </li>
- * <li> A child data vector that contains the elements of lists. </li>
+ *   <li>A validity buffer.
+ *   <li>An offset buffer, that denotes lists boundaries.
+ *   <li>A child data vector that contains the elements of lists.
  * </ol>
+ *
  * The latter two are managed by its superclass.
  */
-public class ListVector extends BaseRepeatedValueVector implements PromotableVector {
+public class ListVector extends BaseRepeatedValueVector
+    implements PromotableVector, ValueIterableVector<List<?>> {
 
   public static ListVector empty(String name, BufferAllocator allocator) {
     return new ListVector(name, allocator, FieldType.nullable(ArrowType.List.INSTANCE), null);
@@ -78,9 +80,7 @@ public static ListVector empty(String name, BufferAllocator allocator) {
   protected Field field;
   protected int validityAllocationSizeInBytes;
 
-  /**
-   * The maximum index that is actually set.
-   */
+  /** The maximum index that is actually set. */
   protected int lastSet;
 
   /**
@@ -91,7 +91,8 @@ public static ListVector empty(String name, BufferAllocator allocator) {
    * @param fieldType The type of this list.
    * @param callBack A schema change callback.
    */
-  public ListVector(String name, BufferAllocator allocator, FieldType fieldType, CallBack callBack) {
+  public ListVector(
+      String name, BufferAllocator allocator, FieldType fieldType, CallBack callBack) {
     this(new Field(name, fieldType, null), allocator, callBack);
   }
 
@@ -113,12 +114,15 @@ public ListVector(Field field, BufferAllocator allocator, CallBack callBack) {
 
   @Override
   public void initializeChildrenFromFields(List<Field> children) {
-    checkArgument(children.size() == 1,
-            "Lists have one child Field. Found: %s", children.isEmpty() ? "none" : children);
+    checkArgument(
+        children.size() == 1,
+        "Lists have one child Field. Found: %s",
+        children.isEmpty() ? "none" : children);
 
     Field field = children.get(0);
     AddOrGetResult<FieldVector> addOrGetVector = addOrGetVector(field.getFieldType());
-    checkArgument(addOrGetVector.isCreated(), "Child vector already existed: %s", addOrGetVector.getVector());
+    checkArgument(
+        addOrGetVector.isCreated(), "Child vector already existed: %s", addOrGetVector.getVector());
 
     addOrGetVector.getVector().initializeChildrenFromFields(field.getChildren());
     this.field = new Field(this.field.getName(), this.field.getFieldType(), children);
@@ -131,27 +135,21 @@ public void setInitialCapacity(int numRecords) {
   }
 
   /**
-   * Specialized version of setInitialCapacity() for ListVector. This is
-   * used by some callers when they want to explicitly control and be
-   * conservative about memory allocated for inner data vector. This is
-   * very useful when we are working with memory constraints for a query
-   * and have a fixed amount of memory reserved for the record batch. In
-   * such cases, we are likely to face OOM or related problems when
-   * we reserve memory for a record batch with value count x and
-   * do setInitialCapacity(x) such that each vector allocates only
-   * what is necessary and not the default amount but the multiplier
-   * forces the memory requirement to go beyond what was needed.
+   * Specialized version of setInitialCapacity() for ListVector. This is used by some callers when
+   * they want to explicitly control and be conservative about memory allocated for inner data
+   * vector. This is very useful when we are working with memory constraints for a query and have a
+   * fixed amount of memory reserved for the record batch. In such cases, we are likely to face OOM
+   * or related problems when we reserve memory for a record batch with value count x and do
+   * setInitialCapacity(x) such that each vector allocates only what is necessary and not the
+   * default amount but the multiplier forces the memory requirement to go beyond what was needed.
    *
    * @param numRecords value count
-   * @param density density of ListVector. Density is the average size of
-   *                list per position in the List vector. For example, a
-   *                density value of 10 implies each position in the list
-   *                vector has a list of 10 values.
-   *                A density value of 0.1 implies out of 10 positions in
-   *                the list vector, 1 position has a list of size 1 and
-   *                remaining positions are null (no lists) or empty lists.
-   *                This helps in tightly controlling the memory we provision
-   *                for inner data vector.
+   * @param density density of ListVector. Density is the average size of list per position in the
+   *     List vector. For example, a density value of 10 implies each position in the list vector
+   *     has a list of 10 values. A density value of 0.1 implies out of 10 positions in the list
+   *     vector, 1 position has a list of size 1 and remaining positions are null (no lists) or
+   *     empty lists. This helps in tightly controlling the memory we provision for inner data
+   *     vector.
    */
   @Override
   public void setInitialCapacity(int numRecords, double density) {
@@ -160,20 +158,17 @@ public void setInitialCapacity(int numRecords, double density) {
   }
 
   /**
-   * Specialized version of setInitialTotalCapacity() for ListVector. This is
-   * used by some callers when they want to explicitly control and be
-   * conservative about memory allocated for inner data vector. This is
-   * very useful when we are working with memory constraints for a query
-   * and have a fixed amount of memory reserved for the record batch. In
-   * such cases, we are likely to face OOM or related problems when
-   * we reserve memory for a record batch with value count x and
-   * do setInitialCapacity(x) such that each vector allocates only
-   * what is necessary and not the default amount but the multiplier
-   * forces the memory requirement to go beyond what was needed.
+   * Specialized version of setInitialTotalCapacity() for ListVector. This is used by some callers
+   * when they want to explicitly control and be conservative about memory allocated for inner data
+   * vector. This is very useful when we are working with memory constraints for a query and have a
+   * fixed amount of memory reserved for the record batch. In such cases, we are likely to face OOM
+   * or related problems when we reserve memory for a record batch with value count x and do
+   * setInitialCapacity(x) such that each vector allocates only what is necessary and not the
+   * default amount but the multiplier forces the memory requirement to go beyond what was needed.
    *
    * @param numRecords value count
-   * @param totalNumberOfElements the total number of elements to to allow
-   *                              for in this vector across all records.
+   * @param totalNumberOfElements the total number of elements to to allow for in this vector across
+   *     all records.
    */
   @Override
   public void setInitialTotalCapacity(int numRecords, int totalNumberOfElements) {
@@ -183,6 +178,7 @@ public void setInitialTotalCapacity(int numRecords, int totalNumberOfElements) {
 
   /**
    * Get the density of this ListVector.
+   *
    * @return density
    */
   public double getDensity() {
@@ -201,16 +197,17 @@ public List<FieldVector> getChildrenFromFields() {
   }
 
   /**
-   * Load the buffers of this vector with provided source buffers.
-   * The caller manages the source buffers and populates them before invoking
-   * this method.
-   * @param fieldNode  the fieldNode indicating the value count
+   * Load the buffers of this vector with provided source buffers. The caller manages the source
+   * buffers and populates them before invoking this method.
+   *
+   * @param fieldNode the fieldNode indicating the value count
    * @param ownBuffers the buffers for this Field (own buffers only, children not included)
    */
   @Override
   public void loadFieldBuffers(ArrowFieldNode fieldNode, List<ArrowBuf> ownBuffers) {
     if (ownBuffers.size() != 2) {
-      throw new IllegalArgumentException("Illegal buffer count, expected " + 2 + ", got: " + ownBuffers.size());
+      throw new IllegalArgumentException(
+          "Illegal buffer count, expected " + 2 + ", got: " + ownBuffers.size());
     }
 
     ArrowBuf bitBuffer = ownBuffers.get(0);
@@ -230,6 +227,7 @@ public void loadFieldBuffers(ArrowFieldNode fieldNode, List<ArrowBuf> ownBuffers
 
   /**
    * Get the buffers belonging to this vector.
+   *
    * @return the inner buffers.
    */
   @Override
@@ -243,8 +241,27 @@ public List<ArrowBuf> getFieldBuffers() {
   }
 
   /**
-   * Set the reader and writer indexes for the inner buffers.
+   * Export the buffers of the fields for C Data Interface. This method traverse the buffers and
+   * export buffer and buffer's memory address into a list of buffers and a pointer to the list of
+   * buffers.
    */
+  @Override
+  public void exportCDataBuffers(List<ArrowBuf> buffers, ArrowBuf buffersPtr, long nullValue) {
+    exportBuffer(validityBuffer, buffers, buffersPtr, nullValue, true);
+
+    if (offsetBuffer.capacity() == 0) {
+      // Empty offset buffer is allowed for historical reason.
+      // To export it through C Data interface, we need to allocate a buffer with one offset.
+      // We set `retain = false` to explicitly not increase the ref count for the exported buffer.
+      // The ref count of the newly created buffer (i.e., 1) already represents the usage
+      // at imported side.
+      exportBuffer(allocateOffsetBuffer(OFFSET_WIDTH), buffers, buffersPtr, nullValue, false);
+    } else {
+      exportBuffer(offsetBuffer, buffers, buffersPtr, nullValue, true);
+    }
+  }
+
+  /** Set the reader and writer indexes for the inner buffers. */
   private void setReaderAndWriterIndex() {
     validityBuffer.readerIndex(0);
     offsetBuffer.readerIndex(0);
@@ -260,8 +277,8 @@ private void setReaderAndWriterIndex() {
   /**
    * Get the inner vectors.
    *
-   * @deprecated This API will be removed as the current implementations no longer support inner vectors.
-   *
+   * @deprecated This API will be removed as the current implementations no longer support inner
+   *     vectors.
    * @return the inner vectors for this field as defined by the TypeLayout
    */
   @Deprecated
@@ -274,9 +291,7 @@ public UnionListWriter getWriter() {
     return new UnionListWriter(this);
   }
 
-  /**
-   * Same as {@link #allocateNewSafe()}.
-   */
+  /** Same as {@link #allocateNewSafe()}. */
   @Override
   public void allocateNew() throws OutOfMemoryException {
     if (!allocateNewSafe()) {
@@ -285,9 +300,8 @@ public void allocateNew() throws OutOfMemoryException {
   }
 
   /**
-   * Allocate memory for the vector. We internally use a default value count
-   * of 4096 to allocate memory for at least these many elements in the
-   * vector.
+   * Allocate memory for the vector. We internally use a default value count of 4096 to allocate
+   * memory for at least these many elements in the vector.
    *
    * @return false if memory allocation fails, true otherwise.
    */
@@ -318,8 +332,8 @@ protected void allocateValidityBuffer(final long size) {
   }
 
   /**
-   * Resize the vector to increase the capacity. The internal behavior is to
-   * double the current value capacity.
+   * Resize the vector to increase the capacity. The internal behavior is to double the current
+   * value capacity.
    */
   @Override
   public void reAlloc() {
@@ -365,9 +379,9 @@ private long getNewAllocationSize(int currentBufferCapacity) {
   }
 
   /**
-   * Same as {@link #copyFrom(int, int, ValueVector)} except that
-   * it handles the case when the capacity of the vector needs to be expanded
-   * before copy.
+   * Same as {@link #copyFrom(int, int, ValueVector)} except that it handles the case when the
+   * capacity of the vector needs to be expanded before copy.
+   *
    * @param inIndex position to copy from in source vector
    * @param outIndex position to copy to in this vector
    * @param from source vector
@@ -378,8 +392,9 @@ public void copyFromSafe(int inIndex, int outIndex, ValueVector from) {
   }
 
   /**
-   * Copy a cell value from a particular index in source vector to a particular
-   * position in this vector.
+   * Copy a cell value from a particular index in source vector to a particular position in this
+   * vector.
+   *
    * @param inIndex position to copy from in source vector
    * @param outIndex position to copy to in this vector
    * @param from source vector
@@ -396,6 +411,7 @@ public void copyFrom(int inIndex, int outIndex, ValueVector from) {
 
   /**
    * Get the inner data vector for this list vector.
+   *
    * @return data vector
    */
   @Override
@@ -505,9 +521,8 @@ public TransferImpl(ListVector to) {
     }
 
     /**
-     * Transfer this vector'data to another vector. The memory associated
-     * with this vector is transferred to the allocator of target vector
-     * for accounting and management purposes.
+     * Transfer this vector'data to another vector. The memory associated with this vector is
+     * transferred to the allocator of target vector for accounting and management purposes.
      */
     @Override
     public void transfer() {
@@ -523,30 +538,39 @@ public void transfer() {
     }
 
     /**
-     * Slice this vector at desired index and length and transfer the
-     * corresponding data to the target vector.
+     * Slice this vector at desired index and length and transfer the corresponding data to the
+     * target vector.
+     *
      * @param startIndex start position of the split in source vector.
      * @param length length of the split.
      */
     @Override
     public void splitAndTransfer(int startIndex, int length) {
-      Preconditions.checkArgument(startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
-          "Invalid parameters startIndex: %s, length: %s for valueCount: %s", startIndex, length, valueCount);
-      final int startPoint = offsetBuffer.getInt(startIndex * OFFSET_WIDTH);
-      final int sliceLength = offsetBuffer.getInt((startIndex + length) * OFFSET_WIDTH) - startPoint;
+      Preconditions.checkArgument(
+          startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
+          "Invalid parameters startIndex: %s, length: %s for valueCount: %s",
+          startIndex,
+          length,
+          valueCount);
       to.clear();
-      to.allocateOffsetBuffer((length + 1) * OFFSET_WIDTH);
-      /* splitAndTransfer offset buffer */
-      for (int i = 0; i < length + 1; i++) {
-        final int relativeOffset = offsetBuffer.getInt((startIndex + i) * OFFSET_WIDTH) - startPoint;
-        to.offsetBuffer.setInt(i * OFFSET_WIDTH, relativeOffset);
+      if (length > 0) {
+        final int startPoint = offsetBuffer.getInt(startIndex * OFFSET_WIDTH);
+        final int sliceLength =
+            offsetBuffer.getInt((startIndex + length) * OFFSET_WIDTH) - startPoint;
+        to.offsetBuffer = to.allocateOffsetBuffer((length + 1) * OFFSET_WIDTH);
+        /* splitAndTransfer offset buffer */
+        for (int i = 0; i < length + 1; i++) {
+          final int relativeOffset =
+              offsetBuffer.getInt((startIndex + i) * OFFSET_WIDTH) - startPoint;
+          to.offsetBuffer.setInt(i * OFFSET_WIDTH, relativeOffset);
+        }
+        /* splitAndTransfer validity buffer */
+        splitAndTransferValidityBuffer(startIndex, length, to);
+        /* splitAndTransfer data buffer */
+        dataTransferPair.splitAndTransfer(startPoint, sliceLength);
+        to.lastSet = length - 1;
+        to.setValueCount(length);
       }
-      /* splitAndTransfer validity buffer */
-      splitAndTransferValidityBuffer(startIndex, length, to);
-      /* splitAndTransfer data buffer */
-      dataTransferPair.splitAndTransfer(startPoint, sliceLength);
-      to.lastSet = length - 1;
-      to.setValueCount(length);
     }
 
     /*
@@ -576,8 +600,11 @@ private void splitAndTransferValidityBuffer(int startIndex, int length, ListVect
           target.allocateValidityBuffer(byteSizeTarget);
 
           for (int i = 0; i < byteSizeTarget - 1; i++) {
-            byte b1 = BitVectorHelper.getBitsFromCurrentByte(validityBuffer, firstByteSource + i, offset);
-            byte b2 = BitVectorHelper.getBitsFromNextByte(validityBuffer, firstByteSource + i + 1, offset);
+            byte b1 =
+                BitVectorHelper.getBitsFromCurrentByte(validityBuffer, firstByteSource + i, offset);
+            byte b2 =
+                BitVectorHelper.getBitsFromNextByte(
+                    validityBuffer, firstByteSource + i + 1, offset);
 
             target.validityBuffer.setByte(i, (b1 + b2));
           }
@@ -592,15 +619,18 @@ private void splitAndTransferValidityBuffer(int startIndex, int length, ListVect
            * by shifting data from the current byte.
            */
           if ((firstByteSource + byteSizeTarget - 1) < lastByteSource) {
-            byte b1 = BitVectorHelper.getBitsFromCurrentByte(validityBuffer,
-                    firstByteSource + byteSizeTarget - 1, offset);
-            byte b2 = BitVectorHelper.getBitsFromNextByte(validityBuffer,
-                    firstByteSource + byteSizeTarget, offset);
+            byte b1 =
+                BitVectorHelper.getBitsFromCurrentByte(
+                    validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
+            byte b2 =
+                BitVectorHelper.getBitsFromNextByte(
+                    validityBuffer, firstByteSource + byteSizeTarget, offset);
 
             target.validityBuffer.setByte(byteSizeTarget - 1, b1 + b2);
           } else {
-            byte b1 = BitVectorHelper.getBitsFromCurrentByte(validityBuffer,
-                    firstByteSource + byteSizeTarget - 1, offset);
+            byte b1 =
+                BitVectorHelper.getBitsFromCurrentByte(
+                    validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
             target.validityBuffer.setByte(byteSizeTarget - 1, b1);
           }
         }
@@ -629,7 +659,7 @@ public UnionListReader getReader() {
     return reader;
   }
 
-  /** Initialize the child data vector to field type.  */
+  /** Initialize the child data vector to field type. */
   @Override
   public <T extends ValueVector> AddOrGetResult<T> addOrGetVector(FieldType fieldType) {
     AddOrGetResult<T> result = super.addOrGetVector(fieldType);
@@ -638,8 +668,8 @@ public <T extends ValueVector> AddOrGetResult<T> addOrGetVector(FieldType fieldT
   }
 
   /**
-   * Get the size (number of bytes) of underlying buffers used by this
-   * vector.
+   * Get the size (number of bytes) of underlying buffers used by this vector.
+   *
    * @return size of underlying buffers.
    */
   @Override
@@ -667,7 +697,11 @@ public Field getField() {
     if (field.getChildren().contains(getDataVector().getField())) {
       return field;
     }
-    field = new Field(field.getName(), field.getFieldType(), Collections.singletonList(getDataVector().getField()));
+    field =
+        new Field(
+            field.getName(),
+            field.getFieldType(),
+            Collections.singletonList(getDataVector().getField()));
     return field;
   }
 
@@ -691,15 +725,14 @@ public void reset() {
   }
 
   /**
-   * Return the underlying buffers associated with this vector. Note that this doesn't
-   * impact the reference counts for this buffer so it only should be used for in-context
-   * access. Also note that this buffer changes regularly thus
-   * external classes shouldn't hold a reference to it (unless they change it).
+   * Return the underlying buffers associated with this vector. Note that this doesn't impact the
+   * reference counts for this buffer so it only should be used for in-context access. Also note
+   * that this buffer changes regularly thus external classes shouldn't hold a reference to it
+   * (unless they change it).
    *
-   * @param clear Whether to clear vector before returning; the buffers will still be refcounted
-   *              but the returned array will be the only reference to them
-   * @return The underlying {@link ArrowBuf buffers} that is used by this
-   *         vector instance.
+   * @param clear Whether to clear vector before returning; the buffers will still be refcounted but
+   *     the returned array will be the only reference to them
+   * @return The underlying {@link ArrowBuf buffers} that is used by this vector instance.
    */
   @Override
   public ArrowBuf[] getBuffers(boolean clear) {
@@ -740,6 +773,7 @@ protected void invalidateReader() {
 
   /**
    * Get the element in the list vector at a particular index.
+   *
    * @param index position of the element
    * @return Object at given position
    */
@@ -772,6 +806,7 @@ public boolean isNull(int index) {
 
   /**
    * Check if element at given index is empty list.
+   *
    * @param index position of element
    * @return true if element at given index is empty list or NULL, false otherwise
    */
@@ -789,7 +824,7 @@ public boolean isEmpty(int index) {
   /**
    * Same as {@link #isNull(int)}.
    *
-   * @param index  position of element
+   * @param index position of element
    * @return 1 if element at given index is not null, 0 otherwise
    */
   public int isSet(int index) {
@@ -811,6 +846,7 @@ public int getNullCount() {
 
   /**
    * Get the current value capacity for the vector.
+   *
    * @return number of elements that vector can hold.
    */
   @Override
@@ -828,8 +864,8 @@ private int getValidityBufferValueCapacity() {
   }
 
   /**
-   * Sets the list at index to be not-null.  Reallocates validity buffer if index
-   * is larger than current capacity.
+   * Sets the list at index to be not-null. Reallocates validity buffer if index is larger than
+   * current capacity.
    */
   public void setNotNull(int index) {
     while (index >= getValidityAndOffsetValueCapacity()) {
@@ -841,6 +877,7 @@ public void setNotNull(int index) {
 
   /**
    * Sets list at index to be null.
+   *
    * @param index position in vector
    */
   @Override
@@ -885,7 +922,7 @@ public int startNewValue(int index) {
    * End the current value.
    *
    * @param index index of the value to end
-   * @param size  number of elements in the list that was written
+   * @param size number of elements in the list that was written
    */
   public void endValue(int index, int size) {
     final int currentOffset = offsetBuffer.getInt((index + 1) * OFFSET_WIDTH);
@@ -895,7 +932,7 @@ public void endValue(int index, int size) {
   /**
    * Sets the value count for the vector.
    *
-   * @param valueCount   value count
+   * @param valueCount value count
    */
   @Override
   public void setValueCount(int valueCount) {
@@ -912,8 +949,8 @@ public void setValueCount(int valueCount) {
       }
     }
     /* valueCount for the data vector is the current end offset */
-    final int childValueCount = (valueCount == 0) ? 0 :
-            offsetBuffer.getInt((lastSet + 1) * OFFSET_WIDTH);
+    final int childValueCount =
+        (valueCount == 0) ? 0 : offsetBuffer.getInt((lastSet + 1) * OFFSET_WIDTH);
     /* set the value count of data vector and this will take care of
      * checking whether data buffer needs to be reallocated.
      */
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/ListViewVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/ListViewVector.java
new file mode 100644
index 0000000000000..864d08a661cd2
--- /dev/null
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/ListViewVector.java
@@ -0,0 +1,875 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.vector.complex;
+
+import static java.util.Collections.singletonList;
+import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt;
+import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
+import static org.apache.arrow.util.Preconditions.checkArgument;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.apache.arrow.memory.ArrowBuf;
+import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.memory.OutOfMemoryException;
+import org.apache.arrow.memory.util.ArrowBufPointer;
+import org.apache.arrow.memory.util.ByteFunctionHelpers;
+import org.apache.arrow.memory.util.CommonUtil;
+import org.apache.arrow.memory.util.hash.ArrowBufHasher;
+import org.apache.arrow.vector.AddOrGetResult;
+import org.apache.arrow.vector.BitVectorHelper;
+import org.apache.arrow.vector.BufferBacked;
+import org.apache.arrow.vector.FieldVector;
+import org.apache.arrow.vector.ValueIterableVector;
+import org.apache.arrow.vector.ValueVector;
+import org.apache.arrow.vector.compare.VectorVisitor;
+import org.apache.arrow.vector.complex.impl.UnionListReader;
+import org.apache.arrow.vector.complex.impl.UnionListViewWriter;
+import org.apache.arrow.vector.complex.reader.FieldReader;
+import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
+import org.apache.arrow.vector.types.Types.MinorType;
+import org.apache.arrow.vector.types.pojo.ArrowType;
+import org.apache.arrow.vector.types.pojo.Field;
+import org.apache.arrow.vector.types.pojo.FieldType;
+import org.apache.arrow.vector.util.CallBack;
+import org.apache.arrow.vector.util.JsonStringArrayList;
+import org.apache.arrow.vector.util.OversizedAllocationException;
+import org.apache.arrow.vector.util.TransferPair;
+
+/**
+ * A list view vector contains lists of a specific type of elements. Its structure contains four
+ * elements.
+ *
+ * <ol>
+ *   <li>A validity buffer.
+ *   <li>An offset buffer, that denotes lists starts.
+ *   <li>A size buffer, that denotes lists ends.
+ *   <li>A child data vector that contains the elements of lists.
+ * </ol>
+ *
+ * The latter three are managed by its superclass.
+ */
+
+/*
+ * TODO: consider merging the functionality in `BaseRepeatedValueVector` into this class.
+ */
+public class ListViewVector extends BaseRepeatedValueViewVector
+    implements PromotableVector, ValueIterableVector<List<?>> {
+
+  protected ArrowBuf validityBuffer;
+  protected UnionListReader reader;
+  private CallBack callBack;
+  protected Field field;
+  protected int validityAllocationSizeInBytes;
+
+  public static ListViewVector empty(String name, BufferAllocator allocator) {
+    return new ListViewVector(
+        name, allocator, FieldType.nullable(ArrowType.ListView.INSTANCE), null);
+  }
+
+  /**
+   * Constructs a new instance.
+   *
+   * @param name The name of the instance.
+   * @param allocator The allocator to use for allocating/reallocating buffers.
+   * @param fieldType The type of this list.
+   * @param callBack A schema change callback.
+   */
+  public ListViewVector(
+      String name, BufferAllocator allocator, FieldType fieldType, CallBack callBack) {
+    this(new Field(name, fieldType, null), allocator, callBack);
+  }
+
+  /**
+   * Constructs a new instance.
+   *
+   * @param field The field materialized by this vector.
+   * @param allocator The allocator to use for allocating/reallocating buffers.
+   * @param callBack A schema change callback.
+   */
+  public ListViewVector(Field field, BufferAllocator allocator, CallBack callBack) {
+    super(field.getName(), allocator, callBack);
+    this.validityBuffer = allocator.getEmpty();
+    this.field = field;
+    this.callBack = callBack;
+    this.validityAllocationSizeInBytes = getValidityBufferSizeFromCount(INITIAL_VALUE_ALLOCATION);
+  }
+
+  @Override
+  public void initializeChildrenFromFields(List<Field> children) {
+    checkArgument(
+        children.size() == 1,
+        "ListViews have one child Field. Found: %s",
+        children.isEmpty() ? "none" : children);
+
+    Field field = children.get(0);
+    AddOrGetResult<FieldVector> addOrGetVector = addOrGetVector(field.getFieldType());
+    checkArgument(
+        addOrGetVector.isCreated(), "Child vector already existed: %s", addOrGetVector.getVector());
+
+    addOrGetVector.getVector().initializeChildrenFromFields(field.getChildren());
+    this.field = new Field(this.field.getName(), this.field.getFieldType(), children);
+  }
+
+  @Override
+  public void setInitialCapacity(int numRecords) {
+    validityAllocationSizeInBytes = getValidityBufferSizeFromCount(numRecords);
+    super.setInitialCapacity(numRecords);
+  }
+
+  /**
+   * Specialized version of setInitialCapacity() for ListViewVector. This is used by some callers
+   * when they want to explicitly control and be conservative about memory allocated for inner data
+   * vector. This is very useful when we are working with memory constraints for a query and have a
+   * fixed amount of memory reserved for the record batch. In such cases, we are likely to face OOM
+   * or related problems when we reserve memory for a record batch with value count x and do
+   * setInitialCapacity(x) such that each vector allocates only what is necessary and not the
+   * default amount, but the multiplier forces the memory requirement to go beyond what was needed.
+   *
+   * @param numRecords value count
+   * @param density density of ListViewVector. Density is the average size of a list per position in
+   *     the ListViewVector. For example, a density value of 10 implies each position in the list
+   *     vector has a list of 10 values. A density value of 0.1 implies out of 10 positions in the
+   *     list vector, 1 position has a list of size 1, and the remaining positions are null (no
+   *     lists) or empty lists. This helps in tightly controlling the memory we provision for inner
+   *     data vector.
+   */
+  @Override
+  public void setInitialCapacity(int numRecords, double density) {
+    validityAllocationSizeInBytes = getValidityBufferSizeFromCount(numRecords);
+    super.setInitialCapacity(numRecords, density);
+  }
+
+  /**
+   * Specialized version of setInitialTotalCapacity() for ListViewVector. This is used by some
+   * callers when they want to explicitly control and be conservative about memory allocated for
+   * inner data vector. This is very useful when we are working with memory constraints for a query
+   * and have a fixed amount of memory reserved for the record batch. In such cases, we are likely
+   * to face OOM or related problems when we reserve memory for a record batch with value count x
+   * and do setInitialCapacity(x) such that each vector allocates only what is necessary and not the
+   * default amount, but the multiplier forces the memory requirement to go beyond what was needed.
+   *
+   * @param numRecords value count
+   * @param totalNumberOfElements the total number of elements to allow for in this vector across
+   *     all records.
+   */
+  @Override
+  public void setInitialTotalCapacity(int numRecords, int totalNumberOfElements) {
+    validityAllocationSizeInBytes = getValidityBufferSizeFromCount(numRecords);
+    super.setInitialTotalCapacity(numRecords, totalNumberOfElements);
+  }
+
+  @Override
+  public List<FieldVector> getChildrenFromFields() {
+    return singletonList(getDataVector());
+  }
+
+  /**
+   * Load the buffers associated with this Field.
+   *
+   * @param fieldNode the fieldNode
+   * @param ownBuffers the buffers for this Field (own buffers only, children not included)
+   */
+  @Override
+  public void loadFieldBuffers(ArrowFieldNode fieldNode, List<ArrowBuf> ownBuffers) {
+    if (ownBuffers.size() != 3) {
+      throw new IllegalArgumentException(
+          "Illegal buffer count, expected " + 3 + ", got: " + ownBuffers.size());
+    }
+
+    ArrowBuf bitBuffer = ownBuffers.get(0);
+    ArrowBuf offBuffer = ownBuffers.get(1);
+    ArrowBuf szBuffer = ownBuffers.get(2);
+
+    validityBuffer.getReferenceManager().release();
+    validityBuffer = BitVectorHelper.loadValidityBuffer(fieldNode, bitBuffer, allocator);
+    offsetBuffer.getReferenceManager().release();
+    offsetBuffer = offBuffer.getReferenceManager().retain(offBuffer, allocator);
+    sizeBuffer.getReferenceManager().release();
+    sizeBuffer = szBuffer.getReferenceManager().retain(szBuffer, allocator);
+
+    validityAllocationSizeInBytes = checkedCastToInt(validityBuffer.capacity());
+    offsetAllocationSizeInBytes = offsetBuffer.capacity();
+    sizeAllocationSizeInBytes = sizeBuffer.capacity();
+
+    valueCount = fieldNode.getLength();
+  }
+
+  /** Set the reader and writer indexes for the inner buffers. */
+  private void setReaderAndWriterIndex() {
+    validityBuffer.readerIndex(0);
+    offsetBuffer.readerIndex(0);
+    sizeBuffer.readerIndex(0);
+    if (valueCount == 0) {
+      validityBuffer.writerIndex(0);
+      offsetBuffer.writerIndex(0);
+      sizeBuffer.writerIndex(0);
+    } else {
+      validityBuffer.writerIndex(getValidityBufferSizeFromCount(valueCount));
+      offsetBuffer.writerIndex(valueCount * OFFSET_WIDTH);
+      sizeBuffer.writerIndex(valueCount * SIZE_WIDTH);
+    }
+  }
+
+  @Override
+  public List<ArrowBuf> getFieldBuffers() {
+    List<ArrowBuf> result = new ArrayList<>(2);
+    setReaderAndWriterIndex();
+    result.add(validityBuffer);
+    result.add(offsetBuffer);
+    result.add(sizeBuffer);
+
+    return result;
+  }
+
+  /**
+   * Export the buffers of the fields for C Data Interface. This method traverses the buffers and
+   * export buffer and buffer's memory address into a list of buffers and a pointer to the list of
+   * buffers.
+   */
+  @Override
+  public void exportCDataBuffers(List<ArrowBuf> buffers, ArrowBuf buffersPtr, long nullValue) {
+    throw new UnsupportedOperationException("exportCDataBuffers Not implemented yet");
+  }
+
+  @Override
+  public void allocateNew() throws OutOfMemoryException {
+    if (!allocateNewSafe()) {
+      throw new OutOfMemoryException("Failure while allocating memory");
+    }
+  }
+
+  @Override
+  public boolean allocateNewSafe() {
+    boolean success = false;
+    try {
+      /* release the current buffers, hence this is a new allocation
+       * Note that, the `clear` method call below is releasing validityBuffer
+       * calling the superclass clear method which is releasing the associated buffers
+       * (sizeBuffer and offsetBuffer).
+       */
+      clear();
+      /* allocate validity buffer */
+      allocateValidityBuffer(validityAllocationSizeInBytes);
+      /* allocate offset, data and sizes buffer */
+      success = super.allocateNewSafe();
+    } finally {
+      if (!success) {
+        clear();
+      }
+    }
+    return success;
+  }
+
+  protected void allocateValidityBuffer(final long size) {
+    final int curSize = (int) size;
+    validityBuffer = allocator.buffer(curSize);
+    validityBuffer.readerIndex(0);
+    validityAllocationSizeInBytes = curSize;
+    validityBuffer.setZero(0, validityBuffer.capacity());
+  }
+
+  @Override
+  public void reAlloc() {
+    /* reallocate the validity buffer */
+    reallocValidityBuffer();
+    /* reallocate the offset, size, and data */
+    super.reAlloc();
+  }
+
+  protected void reallocValidityAndSizeAndOffsetBuffers() {
+    reallocateBuffers();
+    reallocValidityBuffer();
+  }
+
+  private void reallocValidityBuffer() {
+    final int currentBufferCapacity = checkedCastToInt(validityBuffer.capacity());
+    long newAllocationSize = getNewAllocationSize(currentBufferCapacity);
+
+    final ArrowBuf newBuf = allocator.buffer(newAllocationSize);
+    newBuf.setBytes(0, validityBuffer, 0, currentBufferCapacity);
+    newBuf.setZero(currentBufferCapacity, newBuf.capacity() - currentBufferCapacity);
+    validityBuffer.getReferenceManager().release(1);
+    validityBuffer = newBuf;
+    validityAllocationSizeInBytes = (int) newAllocationSize;
+  }
+
+  private long getNewAllocationSize(int currentBufferCapacity) {
+    long newAllocationSize = currentBufferCapacity * 2L;
+    if (newAllocationSize == 0) {
+      if (validityAllocationSizeInBytes > 0) {
+        newAllocationSize = validityAllocationSizeInBytes;
+      } else {
+        newAllocationSize = getValidityBufferSizeFromCount(INITIAL_VALUE_ALLOCATION) * 2L;
+      }
+    }
+    newAllocationSize = CommonUtil.nextPowerOfTwo(newAllocationSize);
+    assert newAllocationSize >= 1;
+
+    if (newAllocationSize > MAX_ALLOCATION_SIZE) {
+      throw new OversizedAllocationException("Unable to expand the buffer");
+    }
+    return newAllocationSize;
+  }
+
+  @Override
+  public void copyFromSafe(int inIndex, int outIndex, ValueVector from) {
+    // TODO: https://github.com/apache/arrow/issues/41270
+    throw new UnsupportedOperationException(
+        "ListViewVector does not support copyFromSafe operation yet.");
+  }
+
+  @Override
+  public void copyFrom(int inIndex, int outIndex, ValueVector from) {
+    // TODO: https://github.com/apache/arrow/issues/41270
+    throw new UnsupportedOperationException(
+        "ListViewVector does not support copyFrom operation yet.");
+  }
+
+  @Override
+  public FieldVector getDataVector() {
+    return vector;
+  }
+
+  @Override
+  public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
+    return getTransferPair(ref, allocator, null);
+  }
+
+  @Override
+  public TransferPair getTransferPair(Field field, BufferAllocator allocator) {
+    return getTransferPair(field, allocator, null);
+  }
+
+  @Override
+  public TransferPair getTransferPair(String ref, BufferAllocator allocator, CallBack callBack) {
+    // TODO: https://github.com/apache/arrow/issues/41269
+    throw new UnsupportedOperationException(
+        "ListVector does not support getTransferPair(String, BufferAllocator, CallBack) yet");
+  }
+
+  @Override
+  public TransferPair getTransferPair(Field field, BufferAllocator allocator, CallBack callBack) {
+    // TODO: https://github.com/apache/arrow/issues/41269
+    throw new UnsupportedOperationException(
+        "ListVector does not support getTransferPair(Field, BufferAllocator, CallBack) yet");
+  }
+
+  @Override
+  public TransferPair makeTransferPair(ValueVector target) {
+    // TODO: https://github.com/apache/arrow/issues/41269
+    throw new UnsupportedOperationException(
+        "ListVector does not support makeTransferPair(ValueVector) yet");
+  }
+
+  @Override
+  public long getValidityBufferAddress() {
+    return validityBuffer.memoryAddress();
+  }
+
+  @Override
+  public long getDataBufferAddress() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public long getOffsetBufferAddress() {
+    return offsetBuffer.memoryAddress();
+  }
+
+  @Override
+  public ArrowBuf getValidityBuffer() {
+    return validityBuffer;
+  }
+
+  @Override
+  public ArrowBuf getDataBuffer() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public ArrowBuf getOffsetBuffer() {
+    return offsetBuffer;
+  }
+
+  public ArrowBuf getSizeBuffer() {
+    return sizeBuffer;
+  }
+
+  public long getSizeBufferAddress() {
+    return sizeBuffer.memoryAddress();
+  }
+
+  /**
+   * Get the hash code for the element at the given index.
+   *
+   * @param index position of the element
+   * @return hash code for the element at the given index
+   */
+  @Override
+  public int hashCode(int index) {
+    return hashCode(index, null);
+  }
+
+  /**
+   * Get the hash code for the element at the given index.
+   *
+   * @param index position of the element
+   * @param hasher hasher to use
+   * @return hash code for the element at the given index
+   */
+  @Override
+  public int hashCode(int index, ArrowBufHasher hasher) {
+    if (isSet(index) == 0) {
+      return ArrowBufPointer.NULL_HASH_CODE;
+    }
+    int hash = 0;
+    final int start = offsetBuffer.getInt(index * OFFSET_WIDTH);
+    final int end = sizeBuffer.getInt(index * OFFSET_WIDTH);
+    for (int i = start; i < end; i++) {
+      hash = ByteFunctionHelpers.combineHash(hash, vector.hashCode(i, hasher));
+    }
+    return hash;
+  }
+
+  @Override
+  public <OUT, IN> OUT accept(VectorVisitor<OUT, IN> visitor, IN value) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  protected FieldReader getReaderImpl() {
+    // TODO: https://github.com/apache/arrow/issues/41569
+    throw new UnsupportedOperationException(
+        "ListViewVector does not support getReaderImpl operation yet.");
+  }
+
+  @Override
+  public UnionListReader getReader() {
+    // TODO: https://github.com/apache/arrow/issues/41569
+    throw new UnsupportedOperationException(
+        "ListViewVector does not support getReader operation yet.");
+  }
+
+  /**
+   * Get the size (number of bytes) of underlying buffers used by this vector.
+   *
+   * @return size of underlying buffers.
+   */
+  @Override
+  public int getBufferSize() {
+    if (valueCount == 0) {
+      return 0;
+    }
+    final int offsetBufferSize = valueCount * OFFSET_WIDTH;
+    final int sizeBufferSize = valueCount * SIZE_WIDTH;
+    final int validityBufferSize = getValidityBufferSizeFromCount(valueCount);
+    return offsetBufferSize + sizeBufferSize + validityBufferSize + vector.getBufferSize();
+  }
+
+  /**
+   * Get the size (number of bytes) of underlying buffers used by this.
+   *
+   * @param valueCount the number of values to assume this vector contains
+   * @return size of underlying buffers.
+   */
+  @Override
+  public int getBufferSizeFor(int valueCount) {
+    if (valueCount == 0) {
+      return 0;
+    }
+    final int validityBufferSize = getValidityBufferSizeFromCount(valueCount);
+
+    return super.getBufferSizeFor(valueCount) + validityBufferSize;
+  }
+
+  /**
+   * Get the field associated with the list view vector.
+   *
+   * @return the field
+   */
+  @Override
+  public Field getField() {
+    if (field.getChildren().contains(getDataVector().getField())) {
+      return field;
+    }
+    field =
+        new Field(
+            field.getName(),
+            field.getFieldType(),
+            Collections.singletonList(getDataVector().getField()));
+    return field;
+  }
+
+  /**
+   * Get the minor type for the vector.
+   *
+   * @return the minor type
+   */
+  @Override
+  public MinorType getMinorType() {
+    return MinorType.LISTVIEW;
+  }
+
+  /** Clear the vector data. */
+  @Override
+  public void clear() {
+    // calling superclass clear method which is releasing the sizeBufer and offsetBuffer
+    super.clear();
+    validityBuffer = releaseBuffer(validityBuffer);
+  }
+
+  /** Release the buffers associated with this vector. */
+  @Override
+  public void reset() {
+    super.reset();
+    validityBuffer.setZero(0, validityBuffer.capacity());
+  }
+
+  /**
+   * Return the underlying buffers associated with this vector. Note that this doesn't impact the
+   * reference counts for this buffer, so it only should be used for in-context access. Also note
+   * that this buffer changes regularly, thus external classes shouldn't hold a reference to it
+   * (unless they change it).
+   *
+   * @param clear Whether to clear vector before returning, the buffers will still be refcounted but
+   *     the returned array will be the only reference to them
+   * @return The underlying {@link ArrowBuf buffers} that is used by this vector instance.
+   */
+  @Override
+  public ArrowBuf[] getBuffers(boolean clear) {
+    setReaderAndWriterIndex();
+    final ArrowBuf[] buffers;
+    if (getBufferSize() == 0) {
+      buffers = new ArrowBuf[0];
+    } else {
+      List<ArrowBuf> list = new ArrayList<>();
+      // the order must be validity, offset and size buffers
+      list.add(validityBuffer);
+      list.add(offsetBuffer);
+      list.add(sizeBuffer);
+      list.addAll(Arrays.asList(vector.getBuffers(false)));
+      buffers = list.toArray(new ArrowBuf[list.size()]);
+    }
+    if (clear) {
+      for (ArrowBuf buffer : buffers) {
+        buffer.getReferenceManager().retain();
+      }
+      clear();
+    }
+    return buffers;
+  }
+
+  /**
+   * Get the element in the list view vector at a particular index.
+   *
+   * @param index position of the element
+   * @return Object at given position
+   */
+  @Override
+  public List<?> getObject(int index) {
+    if (isSet(index) == 0) {
+      return null;
+    }
+    final List<Object> vals = new JsonStringArrayList<>();
+    final int start = offsetBuffer.getInt(index * OFFSET_WIDTH);
+    final int end = start + sizeBuffer.getInt((index) * SIZE_WIDTH);
+    final ValueVector vv = getDataVector();
+    for (int i = start; i < end; i++) {
+      vals.add(vv.getObject(i));
+    }
+
+    return vals;
+  }
+
+  /**
+   * Check if an element at given index is null.
+   *
+   * @param index position of an element
+   * @return true if an element at given index is null, false otherwise
+   */
+  @Override
+  public boolean isNull(int index) {
+    return (isSet(index) == 0);
+  }
+
+  /**
+   * Check if an element at given index is an empty list.
+   *
+   * @param index position of an element
+   * @return true if an element at given index is an empty list or NULL, false otherwise
+   */
+  @Override
+  public boolean isEmpty(int index) {
+    if (isNull(index)) {
+      return true;
+    } else {
+      return sizeBuffer.getInt(index * SIZE_WIDTH) == 0;
+    }
+  }
+
+  /**
+   * Same as {@link #isNull(int)}.
+   *
+   * @param index position of the element
+   * @return 1 if element at given index is not null, 0 otherwise
+   */
+  public int isSet(int index) {
+    final int byteIndex = index >> 3;
+    final byte b = validityBuffer.getByte(byteIndex);
+    final int bitIndex = index & 7;
+    return (b >> bitIndex) & 0x01;
+  }
+
+  /**
+   * Get the number of elements that are null in the vector.
+   *
+   * @return the number of null elements.
+   */
+  @Override
+  public int getNullCount() {
+    return BitVectorHelper.getNullCount(validityBuffer, valueCount);
+  }
+
+  /**
+   * Get the value capacity by considering validity and offset capacity. Note that the size buffer
+   * capacity is not considered here since it has the same capacity as the offset buffer.
+   *
+   * @return the value capacity
+   */
+  @Override
+  public int getValueCapacity() {
+    return getValidityAndOffsetValueCapacity();
+  }
+
+  private int getValidityAndSizeValueCapacity() {
+    final int offsetValueCapacity = Math.max(getOffsetBufferValueCapacity(), 0);
+    final int sizeValueCapacity = Math.max(getSizeBufferValueCapacity(), 0);
+    return Math.min(offsetValueCapacity, sizeValueCapacity);
+  }
+
+  private int getValidityAndOffsetValueCapacity() {
+    final int offsetValueCapacity = Math.max(getOffsetBufferValueCapacity(), 0);
+    return Math.min(offsetValueCapacity, getValidityBufferValueCapacity());
+  }
+
+  private int getValidityBufferValueCapacity() {
+    return capAtMaxInt(validityBuffer.capacity() * 8);
+  }
+
+  /**
+   * Set the element at the given index to null.
+   *
+   * @param index the value to change
+   */
+  @Override
+  public void setNull(int index) {
+    while (index >= getValidityAndSizeValueCapacity()) {
+      reallocValidityAndSizeAndOffsetBuffers();
+    }
+
+    offsetBuffer.setInt(index * OFFSET_WIDTH, 0);
+    sizeBuffer.setInt(index * SIZE_WIDTH, 0);
+    BitVectorHelper.unsetBit(validityBuffer, index);
+  }
+
+  /**
+   * Start new value in the ListView vector.
+   *
+   * @param index index of the value to start
+   * @return offset of the new value
+   */
+  @Override
+  public int startNewValue(int index) {
+    while (index >= getValidityAndSizeValueCapacity()) {
+      reallocValidityAndSizeAndOffsetBuffers();
+    }
+
+    if (index > 0) {
+      final int prevOffset = getLengthOfChildVectorByIndex(index);
+      offsetBuffer.setInt(index * OFFSET_WIDTH, prevOffset);
+    }
+
+    BitVectorHelper.setBit(validityBuffer, index);
+    return offsetBuffer.getInt(index * OFFSET_WIDTH);
+  }
+
+  /**
+   * Validate the invariants of the offset and size buffers. 0 <= offsets[i] <= length of the child
+   * array 0 <= offsets[i] + size[i] <= length of the child array
+   *
+   * @param offset the offset at a given index
+   * @param size the size at a given index
+   */
+  private void validateInvariants(int offset, int size) {
+    if (offset < 0) {
+      throw new IllegalArgumentException("Offset cannot be negative");
+    }
+
+    if (size < 0) {
+      throw new IllegalArgumentException("Size cannot be negative");
+    }
+
+    // 0 <= offsets[i] <= length of the child array
+    if (offset > this.vector.getValueCount()) {
+      throw new IllegalArgumentException("Offset is out of bounds.");
+    }
+
+    // 0 <= offsets[i] + size[i] <= length of the child array
+    if (offset + size > this.vector.getValueCount()) {
+      throw new IllegalArgumentException("Offset + size <= length of the child array.");
+    }
+  }
+
+  /**
+   * Set the offset at the given index. Make sure to use this function after updating `field` vector
+   * and using `setValidity`
+   *
+   * @param index index of the value to set
+   * @param value value to set
+   */
+  public void setOffset(int index, int value) {
+    validateInvariants(value, sizeBuffer.getInt(index * SIZE_WIDTH));
+
+    offsetBuffer.setInt(index * OFFSET_WIDTH, value);
+  }
+
+  /**
+   * Set the size at the given index. Make sure to use this function after using `setOffset`.
+   *
+   * @param index index of the value to set
+   * @param value value to set
+   */
+  public void setSize(int index, int value) {
+    validateInvariants(offsetBuffer.getInt(index * SIZE_WIDTH), value);
+
+    sizeBuffer.setInt(index * SIZE_WIDTH, value);
+  }
+
+  /**
+   * Set the validity at the given index.
+   *
+   * @param index index of the value to set
+   * @param value value to set (0 for unset and 1 for a set)
+   */
+  public void setValidity(int index, int value) {
+    if (value == 0) {
+      BitVectorHelper.unsetBit(validityBuffer, index);
+    } else {
+      BitVectorHelper.setBit(validityBuffer, index);
+    }
+  }
+
+  @Override
+  public void setValueCount(int valueCount) {
+    this.valueCount = valueCount;
+    if (valueCount > 0) {
+      while (valueCount > getValidityAndSizeValueCapacity()) {
+        /* check if validity and offset buffers need to be re-allocated */
+        reallocValidityAndSizeAndOffsetBuffers();
+      }
+    }
+    /* valueCount for the data vector is the current end offset */
+    final int childValueCount = (valueCount == 0) ? 0 : getLengthOfChildVector();
+    /* set the value count of data vector and this will take care of
+     * checking whether data buffer needs to be reallocated.
+     */
+    vector.setValueCount(childValueCount);
+  }
+
+  @Override
+  public int getElementStartIndex(int index) {
+    return offsetBuffer.getInt(index * OFFSET_WIDTH);
+  }
+
+  @Override
+  public int getElementEndIndex(int index) {
+    return sizeBuffer.getInt(index * OFFSET_WIDTH);
+  }
+
+  @Override
+  public <T extends ValueVector> AddOrGetResult<T> addOrGetVector(FieldType fieldType) {
+    AddOrGetResult<T> result = super.addOrGetVector(fieldType);
+    invalidateReader();
+    return result;
+  }
+
+  @Override
+  public UnionVector promoteToUnion() {
+    UnionVector vector = new UnionVector("$data$", allocator, /* field type*/ null, callBack);
+    replaceDataVector(vector);
+    invalidateReader();
+    if (callBack != null) {
+      callBack.doWork();
+    }
+    return vector;
+  }
+
+  private void invalidateReader() {
+    reader = null;
+  }
+
+  @Deprecated
+  @Override
+  public List<BufferBacked> getFieldInnerVectors() {
+    throw new UnsupportedOperationException("There are no inner vectors. Use getFieldBuffers");
+  }
+
+  public UnionListViewWriter getWriter() {
+    return new UnionListViewWriter(this);
+  }
+
+  @Override
+  public int getValueCount() {
+    return valueCount;
+  }
+
+  /**
+   * Get the density of this ListVector.
+   *
+   * @return density
+   */
+  public double getDensity() {
+    if (valueCount == 0) {
+      return 0.0D;
+    }
+    final double totalListSize = getLengthOfChildVector();
+    return totalListSize / valueCount;
+  }
+
+  /** Validating ListViewVector creation based on the specification guideline. */
+  @Override
+  public void validate() {
+    for (int i = 0; i < valueCount; i++) {
+      final int offset = offsetBuffer.getInt(i * OFFSET_WIDTH);
+      final int size = sizeBuffer.getInt(i * SIZE_WIDTH);
+      validateInvariants(offset, size);
+    }
+  }
+
+  /**
+   * End the current value.
+   *
+   * @param index index of the value to end
+   * @param size number of elements in the list that was written
+   */
+  public void endValue(int index, int size) {
+    sizeBuffer.setInt(index * SIZE_WIDTH, size);
+  }
+}
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/MapVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/MapVector.java
index e082b2f43be64..5c6b9b225569f 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/MapVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/MapVector.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
 import static org.apache.arrow.util.Preconditions.checkArgument;
 
 import java.util.List;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.AddOrGetResult;
@@ -40,10 +38,10 @@
 
 /**
  * A MapVector is used to store entries of key/value pairs. It is a container vector that is
- * composed of a list of struct values with "key" and "value" fields. The MapVector is nullable,
- * but if a map is set at a given index, there must be an entry. In other words, the StructVector
- * data is non-nullable. Also for a given entry, the "key" is non-nullable, however the "value" can
- * be null.
+ * composed of a list of struct values with "key" and "value" fields. The MapVector is nullable, but
+ * if a map is set at a given index, there must be an entry. In other words, the StructVector data
+ * is non-nullable. Also for a given entry, the "key" is non-nullable, however the "value" can be
+ * null.
  */
 public class MapVector extends ListVector {
 
@@ -88,36 +86,39 @@ public MapVector(Field field, BufferAllocator allocator, CallBack callBack) {
    */
   @Override
   public void initializeChildrenFromFields(List<Field> children) {
-    checkArgument(children.size() == 1, "Maps have one List child. Found: %s", children.isEmpty() ? "none" : children);
+    checkArgument(
+        children.size() == 1,
+        "Maps have one List child. Found: %s",
+        children.isEmpty() ? "none" : children);
 
     Field structField = children.get(0);
     MinorType minorType = Types.getMinorTypeForArrowType(structField.getType());
-    checkArgument(minorType == MinorType.STRUCT && !structField.isNullable(),
+    checkArgument(
+        minorType == MinorType.STRUCT && !structField.isNullable(),
         "Map data should be a non-nullable struct type");
-    checkArgument(structField.getChildren().size() == 2,
-        "Map data should be a struct with 2 children. Found: %s", children);
+    checkArgument(
+        structField.getChildren().size() == 2,
+        "Map data should be a struct with 2 children. Found: %s",
+        children);
 
     Field keyField = structField.getChildren().get(0);
     checkArgument(!keyField.isNullable(), "Map data key type should be a non-nullable");
 
     AddOrGetResult<FieldVector> addOrGetVector = addOrGetVector(structField.getFieldType());
-    checkArgument(addOrGetVector.isCreated(), "Child vector already existed: %s", addOrGetVector.getVector());
+    checkArgument(
+        addOrGetVector.isCreated(), "Child vector already existed: %s", addOrGetVector.getVector());
 
     addOrGetVector.getVector().initializeChildrenFromFields(structField.getChildren());
     this.field = new Field(this.field.getName(), this.field.getFieldType(), children);
   }
 
-  /**
-   * Get the writer for this MapVector instance.
-   */
+  /** Get the writer for this MapVector instance. */
   @Override
   public UnionMapWriter getWriter() {
     return new UnionMapWriter(this);
   }
 
-  /**
-   * Get the reader for this MapVector instance.
-   */
+  /** Get the reader for this MapVector instance. */
   @Override
   public UnionMapReader getReader() {
     if (reader == null) {
@@ -179,9 +180,8 @@ public TransferImpl(MapVector to) {
     }
 
     /**
-     * Transfer this vector'data to another vector. The memory associated
-     * with this vector is transferred to the allocator of target vector
-     * for accounting and management purposes.
+     * Transfer this vector'data to another vector. The memory associated with this vector is
+     * transferred to the allocator of target vector for accounting and management purposes.
      */
     @Override
     public void transfer() {
@@ -197,22 +197,29 @@ public void transfer() {
     }
 
     /**
-     * Slice this vector at desired index and length and transfer the
-     * corresponding data to the target vector.
+     * Slice this vector at desired index and length and transfer the corresponding data to the
+     * target vector.
+     *
      * @param startIndex start position of the split in source vector.
      * @param length length of the split.
      */
     @Override
     public void splitAndTransfer(int startIndex, int length) {
-      Preconditions.checkArgument(startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
-              "Invalid parameters startIndex: %s, length: %s for valueCount: %s", startIndex, length, valueCount);
+      Preconditions.checkArgument(
+          startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
+          "Invalid parameters startIndex: %s, length: %s for valueCount: %s",
+          startIndex,
+          length,
+          valueCount);
       final int startPoint = offsetBuffer.getInt(startIndex * OFFSET_WIDTH);
-      final int sliceLength = offsetBuffer.getInt((startIndex + length) * OFFSET_WIDTH) - startPoint;
+      final int sliceLength =
+          offsetBuffer.getInt((startIndex + length) * OFFSET_WIDTH) - startPoint;
       to.clear();
-      to.allocateOffsetBuffer((length + 1) * OFFSET_WIDTH);
+      to.offsetBuffer = to.allocateOffsetBuffer((length + 1) * OFFSET_WIDTH);
       /* splitAndTransfer offset buffer */
       for (int i = 0; i < length + 1; i++) {
-        final int relativeOffset = offsetBuffer.getInt((startIndex + i) * OFFSET_WIDTH) - startPoint;
+        final int relativeOffset =
+            offsetBuffer.getInt((startIndex + i) * OFFSET_WIDTH) - startPoint;
         to.offsetBuffer.setInt(i * OFFSET_WIDTH, relativeOffset);
       }
       /* splitAndTransfer validity buffer */
@@ -250,8 +257,11 @@ private void splitAndTransferValidityBuffer(int startIndex, int length, MapVecto
           target.allocateValidityBuffer(byteSizeTarget);
 
           for (int i = 0; i < byteSizeTarget - 1; i++) {
-            byte b1 = BitVectorHelper.getBitsFromCurrentByte(validityBuffer, firstByteSource + i, offset);
-            byte b2 = BitVectorHelper.getBitsFromNextByte(validityBuffer, firstByteSource + i + 1, offset);
+            byte b1 =
+                BitVectorHelper.getBitsFromCurrentByte(validityBuffer, firstByteSource + i, offset);
+            byte b2 =
+                BitVectorHelper.getBitsFromNextByte(
+                    validityBuffer, firstByteSource + i + 1, offset);
 
             target.validityBuffer.setByte(i, (b1 + b2));
           }
@@ -266,15 +276,18 @@ private void splitAndTransferValidityBuffer(int startIndex, int length, MapVecto
            * by shifting data from the current byte.
            */
           if ((firstByteSource + byteSizeTarget - 1) < lastByteSource) {
-            byte b1 = BitVectorHelper.getBitsFromCurrentByte(validityBuffer,
-                    firstByteSource + byteSizeTarget - 1, offset);
-            byte b2 = BitVectorHelper.getBitsFromNextByte(validityBuffer,
-                    firstByteSource + byteSizeTarget, offset);
+            byte b1 =
+                BitVectorHelper.getBitsFromCurrentByte(
+                    validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
+            byte b2 =
+                BitVectorHelper.getBitsFromNextByte(
+                    validityBuffer, firstByteSource + byteSizeTarget, offset);
 
             target.validityBuffer.setByte(byteSizeTarget - 1, b1 + b2);
           } else {
-            byte b1 = BitVectorHelper.getBitsFromCurrentByte(validityBuffer,
-                    firstByteSource + byteSizeTarget - 1, offset);
+            byte b1 =
+                BitVectorHelper.getBitsFromCurrentByte(
+                    validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
             target.validityBuffer.setByte(byteSizeTarget - 1, b1);
           }
         }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/NonNullableStructVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/NonNullableStructVector.java
index e642c547a1612..5a215608ef64b 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/NonNullableStructVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/NonNullableStructVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
 import java.util.ArrayList;
@@ -22,7 +21,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.util.ByteFunctionHelpers;
@@ -30,6 +28,7 @@
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.DensityAwareVector;
 import org.apache.arrow.vector.FieldVector;
+import org.apache.arrow.vector.ValueIterableVector;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.compare.VectorVisitor;
 import org.apache.arrow.vector.complex.impl.SingleStructReaderImpl;
@@ -44,19 +43,28 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * A struct vector that has no null values (and no validity buffer).
- * Child Vectors are handled in {@link AbstractStructVector}.
+ * A struct vector that has no null values (and no validity buffer). Child Vectors are handled in
+ * {@link AbstractStructVector}.
  */
-public class NonNullableStructVector extends AbstractStructVector {
+public class NonNullableStructVector extends AbstractStructVector
+    implements ValueIterableVector<Map<String, ?>> {
 
+  /**
+   * Construct a new empty instance which replaces an existing field with the new one in case of
+   * name conflict.
+   */
   public static NonNullableStructVector empty(String name, BufferAllocator allocator) {
     FieldType fieldType = new FieldType(false, ArrowType.Struct.INSTANCE, null, null);
-    return new NonNullableStructVector(name, allocator, fieldType, null, ConflictPolicy.CONFLICT_REPLACE, false);
+    return new NonNullableStructVector(
+        name, allocator, fieldType, null, ConflictPolicy.CONFLICT_REPLACE, false);
   }
 
-  public static NonNullableStructVector emptyWithDuplicates(String name, BufferAllocator allocator) {
+  /** Construct a new empty instance which preserve fields with identical names. */
+  public static NonNullableStructVector emptyWithDuplicates(
+      String name, BufferAllocator allocator) {
     FieldType fieldType = new FieldType(false, ArrowType.Struct.INSTANCE, null, null);
-    return new NonNullableStructVector(name, allocator, fieldType, null, ConflictPolicy.CONFLICT_APPEND, true);
+    return new NonNullableStructVector(
+        name, allocator, fieldType, null, ConflictPolicy.CONFLICT_APPEND, true);
   }
 
   private final SingleStructReaderImpl reader = new SingleStructReaderImpl(this);
@@ -70,10 +78,8 @@ public static NonNullableStructVector emptyWithDuplicates(String name, BufferAll
    * @param allocator The allocator to use to allocating/reallocating buffers.
    * @param fieldType The type of this list.
    */
-  public NonNullableStructVector(String name,
-                                 BufferAllocator allocator,
-                                 FieldType fieldType,
-                                 CallBack callBack) {
+  public NonNullableStructVector(
+      String name, BufferAllocator allocator, FieldType fieldType, CallBack callBack) {
     this(new Field(name, fieldType, null), allocator, callBack);
   }
 
@@ -84,9 +90,7 @@ public NonNullableStructVector(String name,
    * @param allocator The allocator to use to allocating/reallocating buffers.
    * @param callBack A schema change callback.
    */
-  public NonNullableStructVector(Field field,
-                                 BufferAllocator allocator,
-                                 CallBack callBack) {
+  public NonNullableStructVector(Field field, BufferAllocator allocator, CallBack callBack) {
     this(field, allocator, callBack, null, true);
   }
 
@@ -99,13 +103,19 @@ public NonNullableStructVector(Field field,
    * @param callBack A schema change callback.
    * @param conflictPolicy How to handle duplicate field names in the struct.
    */
-  public NonNullableStructVector(String name,
-                                 BufferAllocator allocator,
-                                 FieldType fieldType,
-                                 CallBack callBack,
-                                 ConflictPolicy conflictPolicy,
-                                 boolean allowConflictPolicyChanges) {
-    this(new Field(name, fieldType, null), allocator, callBack, conflictPolicy, allowConflictPolicyChanges);
+  public NonNullableStructVector(
+      String name,
+      BufferAllocator allocator,
+      FieldType fieldType,
+      CallBack callBack,
+      ConflictPolicy conflictPolicy,
+      boolean allowConflictPolicyChanges) {
+    this(
+        new Field(name, fieldType, null),
+        allocator,
+        callBack,
+        conflictPolicy,
+        allowConflictPolicyChanges);
   }
 
   /**
@@ -116,11 +126,12 @@ public NonNullableStructVector(String name,
    * @param callBack A schema change callback.
    * @param conflictPolicy How to handle duplicate field names in the struct.
    */
-  public NonNullableStructVector(Field field,
-                                 BufferAllocator allocator,
-                                 CallBack callBack,
-                                 ConflictPolicy conflictPolicy,
-                                 boolean allowConflictPolicyChanges) {
+  public NonNullableStructVector(
+      Field field,
+      BufferAllocator allocator,
+      CallBack callBack,
+      ConflictPolicy conflictPolicy,
+      boolean allowConflictPolicyChanges) {
     super(field.getName(), allocator, callBack, conflictPolicy, allowConflictPolicyChanges);
     this.field = field;
     this.valueCount = 0;
@@ -134,8 +145,8 @@ public FieldReader getReader() {
   private transient StructTransferPair ephPair;
 
   /**
-   * Copies the element at fromIndex in the provided vector to thisIndex.  Reallocates buffers
-   * if thisIndex is larger then current capacity.
+   * Copies the element at fromIndex in the provided vector to thisIndex. Reallocates buffers if
+   * thisIndex is larger then current capacity.
    */
   @Override
   public void copyFrom(int fromIndex, int thisIndex, ValueVector from) {
@@ -227,12 +238,16 @@ public TransferPair getTransferPair(BufferAllocator allocator) {
 
   @Override
   public TransferPair getTransferPair(String ref, BufferAllocator allocator, CallBack callBack) {
-    return new StructTransferPair(this, new NonNullableStructVector(name,
-        allocator,
-        field.getFieldType(),
-        callBack,
-        getConflictPolicy(),
-        allowConflictPolicyChanges), false);
+    return new StructTransferPair(
+        this,
+        new NonNullableStructVector(
+            name,
+            allocator,
+            field.getFieldType(),
+            callBack,
+            getConflictPolicy(),
+            allowConflictPolicyChanges),
+        false);
   }
 
   @Override
@@ -242,35 +257,37 @@ public TransferPair makeTransferPair(ValueVector to) {
 
   @Override
   public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
-    return new StructTransferPair(this, new NonNullableStructVector(ref,
-        allocator,
-        field.getFieldType(),
-        callBack,
-        getConflictPolicy(),
-        allowConflictPolicyChanges), false);
+    return new StructTransferPair(
+        this,
+        new NonNullableStructVector(
+            ref,
+            allocator,
+            field.getFieldType(),
+            callBack,
+            getConflictPolicy(),
+            allowConflictPolicyChanges),
+        false);
   }
 
   @Override
   public TransferPair getTransferPair(Field field, BufferAllocator allocator) {
-    return new StructTransferPair(this, new NonNullableStructVector(field,
-        allocator,
-        callBack,
-        getConflictPolicy(),
-        allowConflictPolicyChanges), false);
+    return new StructTransferPair(
+        this,
+        new NonNullableStructVector(
+            field, allocator, callBack, getConflictPolicy(), allowConflictPolicyChanges),
+        false);
   }
 
   @Override
   public TransferPair getTransferPair(Field field, BufferAllocator allocator, CallBack callBack) {
-    return new StructTransferPair(this, new NonNullableStructVector(field,
-        allocator,
-        callBack,
-        getConflictPolicy(),
-        allowConflictPolicyChanges), false);
+    return new StructTransferPair(
+        this,
+        new NonNullableStructVector(
+            field, allocator, callBack, getConflictPolicy(), allowConflictPolicyChanges),
+        false);
   }
 
-  /**
-   * {@link TransferPair} for this this class.
-   */
+  /** {@link TransferPair} for this this class. */
   protected static class StructTransferPair implements TransferPair {
     private final TransferPair[] pairs;
     private final NonNullableStructVector from;
@@ -280,7 +297,8 @@ public StructTransferPair(NonNullableStructVector from, NonNullableStructVector
       this(from, to, true);
     }
 
-    protected StructTransferPair(NonNullableStructVector from, NonNullableStructVector to, boolean allocate) {
+    protected StructTransferPair(
+        NonNullableStructVector from, NonNullableStructVector to, boolean allocate) {
       this.from = from;
       this.to = to;
       this.pairs = new TransferPair[from.size()];
@@ -294,16 +312,24 @@ protected StructTransferPair(NonNullableStructVector from, NonNullableStructVect
         if (vector == null) {
           continue;
         }
-        //DRILL-1872: we add the child fields for the vector, looking up the field by name. For a map vector,
-        // the child fields may be nested fields of the top level child. For example if the structure
+        // DRILL-1872: we add the child fields for the vector, looking up the field by name. For a
+        // map vector,
+        // the child fields may be nested fields of the top level child. For example if the
+        // structure
         // of a child field is oa.oab.oabc then we add oa, then add oab to oa then oabc to oab.
-        // But the children member of a Materialized field is a HashSet. If the fields are added in the
-        // children HashSet, and the hashCode of the Materialized field includes the hash code of the
-        // children, the hashCode value of oa changes *after* the field has been added to the HashSet.
-        // (This is similar to what happens in ScanBatch where the children cannot be added till they are
-        // read). To take care of this, we ensure that the hashCode of the MaterializedField does not
+        // But the children member of a Materialized field is a HashSet. If the fields are added in
+        // the
+        // children HashSet, and the hashCode of the Materialized field includes the hash code of
+        // the
+        // children, the hashCode value of oa changes *after* the field has been added to the
+        // HashSet.
+        // (This is similar to what happens in ScanBatch where the children cannot be added till
+        // they are
+        // read). To take care of this, we ensure that the hashCode of the MaterializedField does
+        // not
         // include the hashCode of the children but is based only on MaterializedField$key.
-        final FieldVector newVector = to.addOrGet(child, vector.getField().getFieldType(), vector.getClass());
+        final FieldVector newVector =
+            to.addOrGet(child, vector.getField().getFieldType(), vector.getClass());
         if (allocate && to.size() != preSize) {
           newVector.allocateNew();
         }
@@ -347,10 +373,7 @@ public int getValueCapacity() {
       return 0;
     }
 
-    return getChildren().stream()
-        .mapToInt(child -> child.getValueCapacity())
-        .min()
-        .getAsInt();
+    return getChildren().stream().mapToInt(child -> child.getValueCapacity()).min().getAsInt();
   }
 
   @Override
@@ -413,16 +436,19 @@ public ValueVector getVectorById(int id) {
     return getChildByOrdinal(id);
   }
 
-  /**
-   * Gets a child vector by ordinal position and casts to the specified class.
-   */
+  /** Gets a child vector by ordinal position and casts to the specified class. */
   public <V extends ValueVector> V getVectorById(int id, Class<V> clazz) {
     ValueVector untyped = getVectorById(id);
     if (clazz.isInstance(untyped)) {
       return clazz.cast(untyped);
     }
-    throw new ClassCastException("Id " + id + " had the wrong type. Expected " + clazz.getCanonicalName() +
-        " but was " + untyped.getClass().getCanonicalName());
+    throw new ClassCastException(
+        "Id "
+            + id
+            + " had the wrong type. Expected "
+            + clazz.getCanonicalName()
+            + " but was "
+            + untyped.getClass().getCanonicalName());
   }
 
   @Override
@@ -491,5 +517,4 @@ public void initializeChildrenFromFields(List<Field> children) {
   public List<FieldVector> getChildrenFromFields() {
     return getChildren();
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/Positionable.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/Positionable.java
index dda4954081624..03c9e3a591197 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/Positionable.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/Positionable.java
@@ -14,13 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
-/**
- * Get and set position in a particular data structure.
- *
- */
+/** Get and set position in a particular data structure. */
 @SuppressWarnings("unused") // Used in when instantiating freemarker templates.
 public interface Positionable {
   int getPosition();
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/PromotableVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/PromotableVector.java
index d4dd94acb529b..d5c8670d267bd 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/PromotableVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/PromotableVector.java
@@ -14,16 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
 import org.apache.arrow.vector.AddOrGetResult;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.types.pojo.FieldType;
 
-/**
- * Vector that can store multiple {@linkplain FieldType} vectors as children.
- */
+/** Vector that can store multiple {@linkplain FieldType} vectors as children. */
 public interface PromotableVector {
 
   <T extends ValueVector> AddOrGetResult<T> addOrGetVector(FieldType type);
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/RepeatedFixedWidthVectorLike.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/RepeatedFixedWidthVectorLike.java
index e754f6913ed37..16c7541ef7d27 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/RepeatedFixedWidthVectorLike.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/RepeatedFixedWidthVectorLike.java
@@ -14,18 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
 /**
- * A {@link org.apache.arrow.vector.ValueVector} mix-in that can be used in conjunction with
- * {@link RepeatedValueVector} subtypes.
+ * A {@link org.apache.arrow.vector.ValueVector} mix-in that can be used in conjunction with {@link
+ * RepeatedValueVector} subtypes.
  */
 public interface RepeatedFixedWidthVectorLike {
   /**
-   * Allocate a new memory space for this vector.  Must be called prior to using the ValueVector.
+   * Allocate a new memory space for this vector. Must be called prior to using the ValueVector.
    *
-   * @param valueCount      Number of separate repeating groupings.
+   * @param valueCount Number of separate repeating groupings.
    * @param innerValueCount Number of supported values in the vector.
    */
   void allocateNew(int valueCount, int innerValueCount);
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/RepeatedValueVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/RepeatedValueVector.java
index 1cae881dde583..16492aec7477a 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/RepeatedValueVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/RepeatedValueVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
 import org.apache.arrow.vector.DensityAwareVector;
@@ -24,9 +23,10 @@
 /**
  * An abstraction representing repeated value vectors.
  *
- * <p>A repeated vector contains values that may either be flat or nested. A value consists of zero or more
- * cells(inner values). Current design maintains data and offsets vectors. Each cell is stored in the data vector.
- * Repeated vector uses the offset vector to determine the sequence of cells pertaining to an individual value.
+ * <p>A repeated vector contains values that may either be flat or nested. A value consists of zero
+ * or more cells(inner values). Current design maintains data and offsets vectors. Each cell is
+ * stored in the data vector. Repeated vector uses the offset vector to determine the sequence of
+ * cells pertaining to an individual value.
  */
 public interface RepeatedValueVector extends ValueVector, DensityAwareVector {
 
@@ -34,8 +34,9 @@ public interface RepeatedValueVector extends ValueVector, DensityAwareVector {
 
   /**
    * Get the offset vector.
-   * @deprecated This API will be removed, as the current implementations no longer hold inner offset vectors.
    *
+   * @deprecated This API will be removed, as the current implementations no longer hold inner
+   *     offset vectors.
    * @return the underlying offset vector or null if none exists.
    */
   @Deprecated
@@ -43,6 +44,7 @@ public interface RepeatedValueVector extends ValueVector, DensityAwareVector {
 
   /**
    * Get the data vector.
+   *
    * @return the underlying data vector or null if none exists.
    */
   ValueVector getDataVector();
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/RepeatedVariableWidthVectorLike.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/RepeatedVariableWidthVectorLike.java
index 5f5324138c508..98473591e37ec 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/RepeatedVariableWidthVectorLike.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/RepeatedVariableWidthVectorLike.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
 /**
@@ -23,11 +22,11 @@
  */
 public interface RepeatedVariableWidthVectorLike {
   /**
-   * Allocate a new memory space for this vector.  Must be called prior to using the ValueVector.
+   * Allocate a new memory space for this vector. Must be called prior to using the ValueVector.
    *
-   * @param totalBytes       Desired size of the underlying data buffer.
+   * @param totalBytes Desired size of the underlying data buffer.
    * @param parentValueCount Number of separate repeating groupings.
-   * @param childValueCount  Number of supported values in the vector.
+   * @param childValueCount Number of supported values in the vector.
    */
   void allocateNew(int totalBytes, int parentValueCount, int childValueCount);
 
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/StateTool.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/StateTool.java
index 2cd64c4fc6766..14eb8186c4cad 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/StateTool.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/StateTool.java
@@ -14,23 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
 import java.util.Arrays;
 
-/**
- * Utility methods for state machines based on enums.
- */
+/** Utility methods for state machines based on enums. */
 public class StateTool {
-  private StateTool() {
-  }
+  private StateTool() {}
 
   static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(StateTool.class);
 
   /**
-   * Verifies <code>currentState</code> is in one of <code>expectedStates</code>,
-   * throws an IllegalArgumentException if it isn't.
+   * Verifies <code>currentState</code> is in one of <code>expectedStates</code>, throws an
+   * IllegalArgumentException if it isn't.
    */
   public static <T extends Enum<?>> void check(T currentState, T... expectedStates) {
     for (T s : expectedStates) {
@@ -38,8 +34,9 @@ public static <T extends Enum<?>> void check(T currentState, T... expectedStates
         return;
       }
     }
-    throw new IllegalArgumentException(String.format("Expected to be in one of these states %s but was actually in " +
-      "state %s", Arrays.toString(expectedStates), currentState));
+    throw new IllegalArgumentException(
+        String.format(
+            "Expected to be in one of these states %s but was actually in " + "state %s",
+            Arrays.toString(expectedStates), currentState));
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java
index 9d0dc5ca3fd15..53f83fdfa7cbe 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
 import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
@@ -24,7 +23,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.util.ArrowBufPointer;
@@ -35,6 +33,7 @@
 import org.apache.arrow.vector.BitVectorHelper;
 import org.apache.arrow.vector.BufferBacked;
 import org.apache.arrow.vector.FieldVector;
+import org.apache.arrow.vector.ValueIterableVector;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.complex.impl.NullableStructReaderImpl;
 import org.apache.arrow.vector.complex.impl.NullableStructWriter;
@@ -49,17 +48,23 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * A Struct vector consists of nullability/validity buffer and children vectors
- * that make up the struct's fields.  The children vectors are handled by the
- * parent class.
+ * A Struct vector consists of nullability/validity buffer and children vectors that make up the
+ * struct's fields. The children vectors are handled by the parent class.
  */
-public class StructVector extends NonNullableStructVector implements FieldVector {
+public class StructVector extends NonNullableStructVector
+    implements FieldVector, ValueIterableVector<Map<String, ?>> {
 
+  /**
+   * Construct a new empty instance which replaces an existing field with the new one in case of
+   * name conflict.
+   */
   public static StructVector empty(String name, BufferAllocator allocator) {
     FieldType fieldType = FieldType.nullable(Struct.INSTANCE);
-    return new StructVector(name, allocator, fieldType, null, ConflictPolicy.CONFLICT_REPLACE, false);
+    return new StructVector(
+        name, allocator, fieldType, null, ConflictPolicy.CONFLICT_REPLACE, false);
   }
 
+  /** Construct a new empty instance which preserve fields with identical names. */
   public static StructVector emptyWithDuplicates(String name, BufferAllocator allocator) {
     FieldType fieldType = new FieldType(false, ArrowType.Struct.INSTANCE, null, null);
     return new StructVector(name, allocator, fieldType, null, ConflictPolicy.CONFLICT_APPEND, true);
@@ -79,14 +84,9 @@ public static StructVector emptyWithDuplicates(String name, BufferAllocator allo
    * @param fieldType The type of this list.
    * @param callBack A schema change callback.
    */
-  public StructVector(String name,
-                      BufferAllocator allocator,
-                      FieldType fieldType,
-                      CallBack callBack) {
-    super(name,
-        checkNotNull(allocator),
-        fieldType,
-        callBack);
+  public StructVector(
+      String name, BufferAllocator allocator, FieldType fieldType, CallBack callBack) {
+    super(name, checkNotNull(allocator), fieldType, callBack);
     this.validityBuffer = allocator.getEmpty();
     this.validityAllocationSizeInBytes =
         BitVectorHelper.getValidityBufferSize(BaseValueVector.INITIAL_VALUE_ALLOCATION);
@@ -102,16 +102,23 @@ public StructVector(String name,
    * @param conflictPolicy policy to determine how duplicate names are handled.
    * @param allowConflictPolicyChanges whether duplicate names are allowed at all.
    */
-  public StructVector(String name,
-                      BufferAllocator allocator,
-                      FieldType fieldType,
-                      CallBack callBack,
-                      ConflictPolicy conflictPolicy,
-                      boolean allowConflictPolicyChanges) {
-    super(name, checkNotNull(allocator), fieldType, callBack, conflictPolicy, allowConflictPolicyChanges);
+  public StructVector(
+      String name,
+      BufferAllocator allocator,
+      FieldType fieldType,
+      CallBack callBack,
+      ConflictPolicy conflictPolicy,
+      boolean allowConflictPolicyChanges) {
+    super(
+        name,
+        checkNotNull(allocator),
+        fieldType,
+        callBack,
+        conflictPolicy,
+        allowConflictPolicyChanges);
     this.validityBuffer = allocator.getEmpty();
     this.validityAllocationSizeInBytes =
-      BitVectorHelper.getValidityBufferSize(BaseValueVector.INITIAL_VALUE_ALLOCATION);
+        BitVectorHelper.getValidityBufferSize(BaseValueVector.INITIAL_VALUE_ALLOCATION);
   }
 
   /**
@@ -121,12 +128,8 @@ public StructVector(String name,
    * @param allocator The allocator to use to allocating/reallocating buffers.
    * @param callBack A schema change callback.
    */
-  public StructVector(Field field,
-                      BufferAllocator allocator,
-                      CallBack callBack) {
-    super(field,
-        checkNotNull(allocator),
-        callBack);
+  public StructVector(Field field, BufferAllocator allocator, CallBack callBack) {
+    super(field, checkNotNull(allocator), callBack);
     this.validityBuffer = allocator.getEmpty();
     this.validityAllocationSizeInBytes =
         BitVectorHelper.getValidityBufferSize(BaseValueVector.INITIAL_VALUE_ALLOCATION);
@@ -141,11 +144,12 @@ public StructVector(Field field,
    * @param conflictPolicy policy to determine how duplicate names are handled.
    * @param allowConflictPolicyChanges whether duplicate names are allowed at all.
    */
-  public StructVector(Field field,
-                      BufferAllocator allocator,
-                      CallBack callBack,
-                      ConflictPolicy conflictPolicy,
-                      boolean allowConflictPolicyChanges) {
+  public StructVector(
+      Field field,
+      BufferAllocator allocator,
+      CallBack callBack,
+      ConflictPolicy conflictPolicy,
+      boolean allowConflictPolicyChanges) {
     super(field, checkNotNull(allocator), callBack, conflictPolicy, allowConflictPolicyChanges);
     this.validityBuffer = allocator.getEmpty();
     this.validityAllocationSizeInBytes =
@@ -155,7 +159,8 @@ public StructVector(Field field,
   @Override
   public void loadFieldBuffers(ArrowFieldNode fieldNode, List<ArrowBuf> ownBuffers) {
     if (ownBuffers.size() != 1) {
-      throw new IllegalArgumentException("Illegal buffer count, expected " + 1 + ", got: " + ownBuffers.size());
+      throw new IllegalArgumentException(
+          "Illegal buffer count, expected " + 1 + ", got: " + ownBuffers.size());
     }
 
     ArrowBuf bitBuffer = ownBuffers.get(0);
@@ -183,8 +188,8 @@ private void setReaderAndWriterIndex() {
   /**
    * Get the inner vectors.
    *
-   * @deprecated This API will be removed as the current implementations no longer support inner vectors.
-   *
+   * @deprecated This API will be removed as the current implementations no longer support inner
+   *     vectors.
    * @return the inner vectors for this field as defined by the TypeLayout
    */
   @Deprecated
@@ -204,12 +209,16 @@ public NullableStructWriter getWriter() {
 
   @Override
   public TransferPair getTransferPair(BufferAllocator allocator) {
-    return new NullableStructTransferPair(this, new StructVector(name,
-        allocator,
-        field.getFieldType(),
-        null,
-        getConflictPolicy(),
-        allowConflictPolicyChanges), false);
+    return new NullableStructTransferPair(
+        this,
+        new StructVector(
+            name,
+            allocator,
+            field.getFieldType(),
+            null,
+            getConflictPolicy(),
+            allowConflictPolicyChanges),
+        false);
   }
 
   @Override
@@ -219,45 +228,50 @@ public TransferPair makeTransferPair(ValueVector to) {
 
   @Override
   public TransferPair getTransferPair(String ref, BufferAllocator allocator) {
-    return new NullableStructTransferPair(this, new StructVector(ref,
-        allocator,
-        field.getFieldType(),
-        null,
-        getConflictPolicy(),
-        allowConflictPolicyChanges), false);
+    return new NullableStructTransferPair(
+        this,
+        new StructVector(
+            ref,
+            allocator,
+            field.getFieldType(),
+            null,
+            getConflictPolicy(),
+            allowConflictPolicyChanges),
+        false);
   }
 
   @Override
   public TransferPair getTransferPair(String ref, BufferAllocator allocator, CallBack callBack) {
-    return new NullableStructTransferPair(this, new StructVector(ref,
-        allocator,
-        field.getFieldType(),
-        callBack,
-        getConflictPolicy(),
-        allowConflictPolicyChanges), false);
+    return new NullableStructTransferPair(
+        this,
+        new StructVector(
+            ref,
+            allocator,
+            field.getFieldType(),
+            callBack,
+            getConflictPolicy(),
+            allowConflictPolicyChanges),
+        false);
   }
 
   @Override
   public TransferPair getTransferPair(Field field, BufferAllocator allocator) {
-    return new NullableStructTransferPair(this, new StructVector(field,
-        allocator,
-        null,
-        getConflictPolicy(),
-        allowConflictPolicyChanges), false);
+    return new NullableStructTransferPair(
+        this,
+        new StructVector(field, allocator, null, getConflictPolicy(), allowConflictPolicyChanges),
+        false);
   }
 
   @Override
   public TransferPair getTransferPair(Field field, BufferAllocator allocator, CallBack callBack) {
-    return new NullableStructTransferPair(this, new StructVector(field,
-        allocator,
-        callBack,
-        getConflictPolicy(),
-        allowConflictPolicyChanges), false);
+    return new NullableStructTransferPair(
+        this,
+        new StructVector(
+            field, allocator, callBack, getConflictPolicy(), allowConflictPolicyChanges),
+        false);
   }
 
-  /**
-   * {@link TransferPair} for this (nullable) {@link StructVector}.
-   */
+  /** {@link TransferPair} for this (nullable) {@link StructVector}. */
   protected class NullableStructTransferPair extends StructTransferPair {
 
     private StructVector target;
@@ -286,8 +300,12 @@ public void copyValueSafe(int fromIndex, int toIndex) {
 
     @Override
     public void splitAndTransfer(int startIndex, int length) {
-      Preconditions.checkArgument(startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
-          "Invalid parameters startIndex: %s, length: %s for valueCount: %s", startIndex, length, valueCount);
+      Preconditions.checkArgument(
+          startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
+          "Invalid parameters startIndex: %s, length: %s for valueCount: %s",
+          startIndex,
+          length,
+          valueCount);
       target.clear();
       splitAndTransferValidityBuffer(startIndex, length, target);
       super.splitAndTransfer(startIndex, length);
@@ -321,8 +339,10 @@ private void splitAndTransferValidityBuffer(int startIndex, int length, StructVe
         target.allocateValidityBuffer(byteSizeTarget);
 
         for (int i = 0; i < byteSizeTarget - 1; i++) {
-          byte b1 = BitVectorHelper.getBitsFromCurrentByte(validityBuffer, firstByteSource + i, offset);
-          byte b2 = BitVectorHelper.getBitsFromNextByte(validityBuffer, firstByteSource + i + 1, offset);
+          byte b1 =
+              BitVectorHelper.getBitsFromCurrentByte(validityBuffer, firstByteSource + i, offset);
+          byte b2 =
+              BitVectorHelper.getBitsFromNextByte(validityBuffer, firstByteSource + i + 1, offset);
 
           target.validityBuffer.setByte(i, (b1 + b2));
         }
@@ -337,15 +357,18 @@ private void splitAndTransferValidityBuffer(int startIndex, int length, StructVe
          * by shifting data from the current byte.
          */
         if ((firstByteSource + byteSizeTarget - 1) < lastByteSource) {
-          byte b1 = BitVectorHelper.getBitsFromCurrentByte(validityBuffer,
-                  firstByteSource + byteSizeTarget - 1, offset);
-          byte b2 = BitVectorHelper.getBitsFromNextByte(validityBuffer,
-                  firstByteSource + byteSizeTarget, offset);
+          byte b1 =
+              BitVectorHelper.getBitsFromCurrentByte(
+                  validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
+          byte b2 =
+              BitVectorHelper.getBitsFromNextByte(
+                  validityBuffer, firstByteSource + byteSizeTarget, offset);
 
           target.validityBuffer.setByte(byteSizeTarget - 1, b1 + b2);
         } else {
-          byte b1 = BitVectorHelper.getBitsFromCurrentByte(validityBuffer,
-                  firstByteSource + byteSizeTarget - 1, offset);
+          byte b1 =
+              BitVectorHelper.getBitsFromCurrentByte(
+                  validityBuffer, firstByteSource + byteSizeTarget - 1, offset);
           target.validityBuffer.setByte(byteSizeTarget - 1, b1);
         }
       }
@@ -354,6 +377,7 @@ private void splitAndTransferValidityBuffer(int startIndex, int length, StructVe
 
   /**
    * Get the value capacity of the internal validity buffer.
+   *
    * @return number of elements that validity buffer can hold
    */
   private int getValidityBufferValueCapacity() {
@@ -362,24 +386,23 @@ private int getValidityBufferValueCapacity() {
 
   /**
    * Get the current value capacity for the vector.
+   *
    * @return number of elements that vector can hold.
    */
   @Override
   public int getValueCapacity() {
-    return Math.min(getValidityBufferValueCapacity(),
-            super.getValueCapacity());
+    return Math.min(getValidityBufferValueCapacity(), super.getValueCapacity());
   }
 
   /**
-   * Return the underlying buffers associated with this vector. Note that this doesn't
-   * impact the reference counts for this buffer so it only should be used for in-context
-   * access. Also note that this buffer changes regularly thus
-   * external classes shouldn't hold a reference to it (unless they change it).
+   * Return the underlying buffers associated with this vector. Note that this doesn't impact the
+   * reference counts for this buffer so it only should be used for in-context access. Also note
+   * that this buffer changes regularly thus external classes shouldn't hold a reference to it
+   * (unless they change it).
    *
-   * @param clear Whether to clear vector before returning; the buffers will still be refcounted
-   *              but the returned array will be the only reference to them
-   * @return The underlying {@link ArrowBuf buffers} that is used by this
-   *         vector instance.
+   * @param clear Whether to clear vector before returning; the buffers will still be refcounted but
+   *     the returned array will be the only reference to them
+   * @return The underlying {@link ArrowBuf buffers} that is used by this vector instance.
    */
   @Override
   public ArrowBuf[] getBuffers(boolean clear) {
@@ -403,36 +426,28 @@ public ArrowBuf[] getBuffers(boolean clear) {
     return buffers;
   }
 
-  /**
-   * Close the vector and release the associated buffers.
-   */
+  /** Close the vector and release the associated buffers. */
   @Override
   public void close() {
     clearValidityBuffer();
     super.close();
   }
 
-  /**
-   * Same as {@link #close()}.
-   */
+  /** Same as {@link #close()}. */
   @Override
   public void clear() {
     clearValidityBuffer();
     super.clear();
   }
 
-  /**
-   * Reset this vector to empty, does not release buffers.
-   */
+  /** Reset this vector to empty, does not release buffers. */
   @Override
   public void reset() {
     super.reset();
     validityBuffer.setZero(0, validityBuffer.capacity());
   }
 
-  /**
-   * Release the validity buffer.
-   */
+  /** Release the validity buffer. */
   private void clearValidityBuffer() {
     validityBuffer.getReferenceManager().release();
     validityBuffer = allocator.getEmpty();
@@ -448,24 +463,21 @@ public int getBufferSize() {
     if (valueCount == 0) {
       return 0;
     }
-    return super.getBufferSize() +
-            BitVectorHelper.getValidityBufferSize(valueCount);
+    return super.getBufferSize() + BitVectorHelper.getValidityBufferSize(valueCount);
   }
 
   /**
    * Get the potential buffer size for a particular number of records.
    *
    * @param valueCount desired number of elements in the vector
-   * @return estimated size of underlying buffers if the vector holds
-   *         a given number of elements
+   * @return estimated size of underlying buffers if the vector holds a given number of elements
    */
   @Override
   public int getBufferSizeFor(final int valueCount) {
     if (valueCount == 0) {
       return 0;
     }
-    return super.getBufferSizeFor(valueCount) +
-            BitVectorHelper.getValidityBufferSize(valueCount);
+    return super.getBufferSizeFor(valueCount) + BitVectorHelper.getValidityBufferSize(valueCount);
   }
 
   @Override
@@ -533,7 +545,8 @@ private long getNewAllocationSize(int currentBufferCapacity) {
       if (validityAllocationSizeInBytes > 0) {
         newAllocationSize = validityAllocationSizeInBytes;
       } else {
-        newAllocationSize = BitVectorHelper.getValidityBufferSize(BaseValueVector.INITIAL_VALUE_ALLOCATION) * 2L;
+        newAllocationSize =
+            BitVectorHelper.getValidityBufferSize(BaseValueVector.INITIAL_VALUE_ALLOCATION) * 2L;
       }
     }
     newAllocationSize = CommonUtil.nextPowerOfTwo(newAllocationSize);
@@ -608,25 +621,19 @@ public void get(int index, ComplexHolder holder) {
     super.get(index, holder);
   }
 
-  /**
-   * Return the number of null values in the vector.
-   */
+  /** Return the number of null values in the vector. */
   @Override
   public int getNullCount() {
     return BitVectorHelper.getNullCount(validityBuffer, valueCount);
   }
 
-  /**
-   * Returns true if the value at the provided index is null.
-   */
+  /** Returns true if the value at the provided index is null. */
   @Override
   public boolean isNull(int index) {
     return isSet(index) == 0;
   }
 
-  /**
-   * Returns true the value at the given index is set (i.e. not null).
-   */
+  /** Returns true the value at the given index is set (i.e. not null). */
   public int isSet(int index) {
     final int byteIndex = index >> 3;
     final byte b = validityBuffer.getByte(byteIndex);
@@ -635,8 +642,8 @@ public int isSet(int index) {
   }
 
   /**
-   * Marks the value at index as being set.  Reallocates the validity buffer
-   * if index is larger than current capacity.
+   * Marks the value at index as being set. Reallocates the validity buffer if index is larger than
+   * current capacity.
    */
   public void setIndexDefined(int index) {
     while (index >= getValidityBufferValueCapacity()) {
@@ -646,9 +653,7 @@ public void setIndexDefined(int index) {
     BitVectorHelper.setBit(validityBuffer, index);
   }
 
-  /**
-   * Marks the value at index as null/not set.
-   */
+  /** Marks the value at index as null/not set. */
   @Override
   public void setNull(int index) {
     while (index >= getValidityBufferValueCapacity()) {
@@ -668,5 +673,4 @@ public void setValueCount(int valueCount) {
     super.setValueCount(valueCount);
     this.valueCount = valueCount;
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/VectorWithOrdinal.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/VectorWithOrdinal.java
index fa00f4b630fcb..eb81e6739ffc3 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/VectorWithOrdinal.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/VectorWithOrdinal.java
@@ -14,14 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
 import org.apache.arrow.vector.ValueVector;
 
 /**
- * Tuple of a {@link ValueVector} and an index into a data structure containing the {@link ValueVector}.
- * Useful for composite types to determine the index of a child.
+ * Tuple of a {@link ValueVector} and an index into a data structure containing the {@link
+ * ValueVector}. Useful for composite types to determine the index of a child.
  */
 public class VectorWithOrdinal {
   public final ValueVector vector;
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/AbstractBaseReader.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/AbstractBaseReader.java
index 028901ee847da..b2e95663f7357 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/AbstractBaseReader.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/AbstractBaseReader.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.impl;
 
 import java.util.Iterator;
-
 import org.apache.arrow.vector.complex.reader.FieldReader;
 import org.apache.arrow.vector.complex.writer.BaseWriter.ListWriter;
 import org.apache.arrow.vector.complex.writer.BaseWriter.MapWriter;
@@ -33,7 +31,8 @@
  */
 abstract class AbstractBaseReader implements FieldReader {
 
-  static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractBaseReader.class);
+  static final org.slf4j.Logger logger =
+      org.slf4j.LoggerFactory.getLogger(AbstractBaseReader.class);
 
   private int index;
 
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/AbstractBaseWriter.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/AbstractBaseWriter.java
index cc3c5deed5054..67f53d55bad3a 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/AbstractBaseWriter.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/AbstractBaseWriter.java
@@ -14,19 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.impl;
 
 import org.apache.arrow.vector.complex.writer.FieldWriter;
 
-
 /**
  * Base class providing common functionality for {@link FieldWriter} implementations.
  *
  * <p>Currently this only includes index tracking.
  */
 abstract class AbstractBaseWriter implements FieldWriter {
-  //private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractBaseWriter.class);
+  // private static final org.slf4j.Logger logger =
+  // org.slf4j.LoggerFactory.getLogger(AbstractBaseWriter.class);
 
   private int index;
 
@@ -50,6 +49,5 @@ public void setPosition(int index) {
   }
 
   @Override
-  public void end() {
-  }
+  public void end() {}
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/ComplexWriterImpl.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/ComplexWriterImpl.java
index 8dd5763990fa8..453f3ebb0c6e9 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/ComplexWriterImpl.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/ComplexWriterImpl.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.impl;
 
 import org.apache.arrow.util.Preconditions;
@@ -26,9 +25,7 @@
 import org.apache.arrow.vector.complex.writer.BaseWriter.ComplexWriter;
 import org.apache.arrow.vector.types.pojo.Field;
 
-/**
- * Concrete implementation of {@link ComplexWriter}.
- */
+/** Concrete implementation of {@link ComplexWriter}. */
 public class ComplexWriterImpl extends AbstractFieldWriter implements ComplexWriter {
 
   private NullableStructWriter structRoot;
@@ -41,7 +38,12 @@ public class ComplexWriterImpl extends AbstractFieldWriter implements ComplexWri
   private final boolean unionEnabled;
   private final NullableStructWriterFactory nullableStructWriterFactory;
 
-  private enum Mode { INIT, STRUCT, LIST, MAP }
+  private enum Mode {
+    INIT,
+    STRUCT,
+    LIST,
+    MAP
+  }
 
   /**
    * Constructs a new instance.
@@ -49,19 +51,18 @@ private enum Mode { INIT, STRUCT, LIST, MAP }
    * @param name The name of the writer (for tracking).
    * @param container A container for the data field to be written.
    * @param unionEnabled Unused.
-   * @param caseSensitive Whether field names are case-sensitive (if false field names will be lowercase.
+   * @param caseSensitive Whether field names are case-sensitive (if false field names will be
+   *     lowercase.
    */
   public ComplexWriterImpl(
-      String name,
-      NonNullableStructVector container,
-      boolean unionEnabled,
-      boolean caseSensitive) {
+      String name, NonNullableStructVector container, boolean unionEnabled, boolean caseSensitive) {
     this.name = name;
     this.container = container;
     this.unionEnabled = unionEnabled;
-    nullableStructWriterFactory = caseSensitive ?
-      NullableStructWriterFactory.getNullableCaseSensitiveStructWriterFactoryInstance() :
-      NullableStructWriterFactory.getNullableStructWriterFactoryInstance();
+    nullableStructWriterFactory =
+        caseSensitive
+            ? NullableStructWriterFactory.getNullableCaseSensitiveStructWriterFactoryInstance()
+            : NullableStructWriterFactory.getNullableStructWriterFactoryInstance();
   }
 
   public ComplexWriterImpl(String name, NonNullableStructVector container, boolean unionEnabled) {
@@ -153,14 +154,13 @@ public void setPosition(int index) {
   }
 
   /**
-   * Returns a StructWriter, initializing it necessary from the constructor this instance
-   * was constructed with.
+   * Returns a StructWriter, initializing it necessary from the constructor this instance was
+   * constructed with.
    */
   public StructWriter directStruct() {
     Preconditions.checkArgument(name == null);
 
     switch (mode) {
-
       case INIT:
         structRoot = nullableStructWriterFactory.build((StructVector) container);
         structRoot.setPosition(idx());
@@ -180,7 +180,6 @@ public StructWriter directStruct() {
   @Override
   public StructWriter rootAsStruct() {
     switch (mode) {
-
       case INIT:
         // TODO allow dictionaries in complex types
         StructVector struct = container.addOrGetStruct(name);
@@ -211,7 +210,6 @@ public void allocate() {
   @Override
   public ListWriter rootAsList() {
     switch (mode) {
-
       case INIT:
         int vectorCount = container.size();
         // TODO allow dictionaries in complex types
@@ -237,7 +235,6 @@ public ListWriter rootAsList() {
   @Override
   public MapWriter rootAsMap(boolean keysSorted) {
     switch (mode) {
-
       case INIT:
         int vectorCount = container.size();
         // TODO allow dictionaries in complex types
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/NullableStructReaderImpl.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/NullableStructReaderImpl.java
index 5c098f627a157..10dcadc4f9eac 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/NullableStructReaderImpl.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/NullableStructReaderImpl.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.impl;
 
 import org.apache.arrow.vector.complex.NonNullableStructVector;
@@ -23,8 +22,8 @@
 import org.apache.arrow.vector.types.pojo.Field;
 
 /**
- * An {@link org.apache.arrow.vector.complex.reader.FieldReader} for
- * reading nullable struct vectors.
+ * An {@link org.apache.arrow.vector.complex.reader.FieldReader} for reading nullable struct
+ * vectors.
  */
 public class NullableStructReaderImpl extends SingleStructReaderImpl {
 
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/NullableStructWriterFactory.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/NullableStructWriterFactory.java
index a305529b71fa8..cc945bd779546 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/NullableStructWriterFactory.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/NullableStructWriterFactory.java
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.impl;
 
 import org.apache.arrow.vector.complex.StructVector;
 
 /**
- * A factory for {@link NullableStructWriter} instances.  The factory allows for configuring if field
+ * A factory for {@link NullableStructWriter} instances. The factory allows for configuring if field
  * names should be considered case-sensitive.
  */
 public class NullableStructWriterFactory {
@@ -34,8 +33,11 @@ public NullableStructWriterFactory(boolean caseSensitive) {
     this.caseSensitive = caseSensitive;
   }
 
+  /** Creates a new instance. */
   public NullableStructWriter build(StructVector container) {
-    return this.caseSensitive ? new NullableCaseSensitiveStructWriter(container) : new NullableStructWriter(container);
+    return this.caseSensitive
+        ? new NullableCaseSensitiveStructWriter(container)
+        : new NullableStructWriter(container);
   }
 
   public static NullableStructWriterFactory getNullableStructWriterFactoryInstance() {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/PromotableWriter.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/PromotableWriter.java
index 7f724829ef1eb..7fd0def967388 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/PromotableWriter.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/PromotableWriter.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.impl;
 
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
 import java.util.Locale;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.NullVector;
@@ -29,6 +27,7 @@
 import org.apache.arrow.vector.complex.FixedSizeListVector;
 import org.apache.arrow.vector.complex.LargeListVector;
 import org.apache.arrow.vector.complex.ListVector;
+import org.apache.arrow.vector.complex.ListViewVector;
 import org.apache.arrow.vector.complex.MapVector;
 import org.apache.arrow.vector.complex.StructVector;
 import org.apache.arrow.vector.complex.UnionVector;
@@ -43,17 +42,19 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * This FieldWriter implementation delegates all FieldWriter API calls to an inner FieldWriter. This inner field writer
- * can start as a specific type, and this class will promote the writer to a UnionWriter if a call is made that the
- * specifically typed writer cannot handle. A new UnionVector is created, wrapping the original vector, and replaces the
- * original vector in the parent vector, which can be either an AbstractStructVector or a ListVector.
+ * This FieldWriter implementation delegates all FieldWriter API calls to an inner FieldWriter. This
+ * inner field writer can start as a specific type, and this class will promote the writer to a
+ * UnionWriter if a call is made that the specifically typed writer cannot handle. A new UnionVector
+ * is created, wrapping the original vector, and replaces the original vector in the parent vector,
+ * which can be either an AbstractStructVector or a ListVector.
  *
- * <p>The writer used can either be for single elements (struct) or lists.</p>
+ * <p>The writer used can either be for single elements (struct) or lists.
  */
 public class PromotableWriter extends AbstractPromotableFieldWriter {
 
   private final AbstractStructVector parentContainer;
   private final ListVector listVector;
+  private final ListViewVector listViewVector;
   private final FixedSizeListVector fixedListVector;
   private final LargeListVector largeListVector;
   private final NullableStructWriterFactory nullableStructWriterFactory;
@@ -62,7 +63,9 @@ public class PromotableWriter extends AbstractPromotableFieldWriter {
   private static final int MAX_DECIMAL256_PRECISION = 76;
 
   private enum State {
-    UNTYPED, SINGLE, UNION
+    UNTYPED,
+    SINGLE,
+    UNION
   }
 
   private MinorType type;
@@ -94,6 +97,7 @@ public PromotableWriter(
       NullableStructWriterFactory nullableStructWriterFactory) {
     this.parentContainer = parentContainer;
     this.listVector = null;
+    this.listViewVector = null;
     this.fixedListVector = null;
     this.largeListVector = null;
     this.nullableStructWriterFactory = nullableStructWriterFactory;
@@ -142,6 +146,27 @@ public PromotableWriter(
       ListVector listVector,
       NullableStructWriterFactory nullableStructWriterFactory) {
     this.listVector = listVector;
+    this.listViewVector = null;
+    this.parentContainer = null;
+    this.fixedListVector = null;
+    this.largeListVector = null;
+    this.nullableStructWriterFactory = nullableStructWriterFactory;
+    init(v);
+  }
+
+  /**
+   * Constructs a new instance.
+   *
+   * @param v The vector to initialize the writer with.
+   * @param listViewVector The vector that serves as a parent of v.
+   * @param nullableStructWriterFactory The factory to create the delegate writer.
+   */
+  public PromotableWriter(
+      ValueVector v,
+      ListViewVector listViewVector,
+      NullableStructWriterFactory nullableStructWriterFactory) {
+    this.listViewVector = listViewVector;
+    this.listVector = null;
     this.parentContainer = null;
     this.fixedListVector = null;
     this.largeListVector = null;
@@ -163,6 +188,7 @@ public PromotableWriter(
     this.fixedListVector = fixedListVector;
     this.parentContainer = null;
     this.listVector = null;
+    this.listViewVector = null;
     this.largeListVector = null;
     this.nullableStructWriterFactory = nullableStructWriterFactory;
     init(v);
@@ -183,6 +209,7 @@ public PromotableWriter(
     this.fixedListVector = null;
     this.parentContainer = null;
     this.listVector = null;
+    this.listViewVector = null;
     this.nullableStructWriterFactory = nullableStructWriterFactory;
     init(v);
   }
@@ -251,11 +278,11 @@ public void setPosition(int index) {
   }
 
   private boolean requiresArrowType(MinorType type) {
-    return type == MinorType.DECIMAL ||
-        type == MinorType.MAP ||
-        type == MinorType.DURATION ||
-        type == MinorType.FIXEDSIZEBINARY ||
-        (type.name().startsWith("TIMESTAMP") && type.name().endsWith("TZ"));
+    return type == MinorType.DECIMAL
+        || type == MinorType.MAP
+        || type == MinorType.DURATION
+        || type == MinorType.FIXEDSIZEBINARY
+        || (type.name().startsWith("TIMESTAMP") && type.name().endsWith("TZ"));
   }
 
   @Override
@@ -280,6 +307,8 @@ protected FieldWriter getWriter(MinorType type, ArrowType arrowType) {
         v = listVector.addOrGetVector(fieldType).getVector();
       } else if (fixedListVector != null) {
         v = fixedListVector.addOrGetVector(fieldType).getVector();
+      } else if (listViewVector != null) {
+        v = listViewVector.addOrGetVector(fieldType).getVector();
       } else {
         v = largeListVector.addOrGetVector(fieldType).getVector();
       }
@@ -309,8 +338,9 @@ protected FieldWriter getWriter() {
 
   private FieldWriter promoteToUnion() {
     String name = vector.getField().getName();
-    TransferPair tp = vector.getTransferPair(vector.getMinorType().name().toLowerCase(Locale.ROOT),
-        vector.getAllocator());
+    TransferPair tp =
+        vector.getTransferPair(
+            vector.getMinorType().name().toLowerCase(Locale.ROOT), vector.getAllocator());
     tp.transfer();
     if (parentContainer != null) {
       // TODO allow dictionaries in complex types
@@ -322,6 +352,8 @@ private FieldWriter promoteToUnion() {
       unionVector = fixedListVector.promoteToUnion();
     } else if (largeListVector != null) {
       unionVector = largeListVector.promoteToUnion();
+    } else if (listViewVector != null) {
+      unionVector = listViewVector.promoteToUnion();
     }
     unionVector.addVector((FieldVector) tp.getTo());
     writer = new UnionWriter(unionVector, nullableStructWriterFactory);
@@ -336,51 +368,78 @@ private FieldWriter promoteToUnion() {
 
   @Override
   public void write(DecimalHolder holder) {
-    getWriter(MinorType.DECIMAL,
-              new ArrowType.Decimal(MAX_DECIMAL_PRECISION, holder.scale, /*bitWidth=*/128)).write(holder);
+    getWriter(
+            MinorType.DECIMAL,
+            new ArrowType.Decimal(MAX_DECIMAL_PRECISION, holder.scale, /*bitWidth=*/ 128))
+        .write(holder);
   }
 
   @Override
   public void writeDecimal(long start, ArrowBuf buffer, ArrowType arrowType) {
-    getWriter(MinorType.DECIMAL, new ArrowType.Decimal(MAX_DECIMAL_PRECISION,
-        ((ArrowType.Decimal) arrowType).getScale(), /*bitWidth=*/128)).writeDecimal(start, buffer, arrowType);
+    getWriter(
+            MinorType.DECIMAL,
+            new ArrowType.Decimal(
+                MAX_DECIMAL_PRECISION,
+                ((ArrowType.Decimal) arrowType).getScale(),
+                /*bitWidth=*/ 128))
+        .writeDecimal(start, buffer, arrowType);
   }
 
   @Override
   public void writeDecimal(BigDecimal value) {
-    getWriter(MinorType.DECIMAL,
-      new ArrowType.Decimal(MAX_DECIMAL_PRECISION, value.scale(), /*bitWidth=*/128)).writeDecimal(value);
+    getWriter(
+            MinorType.DECIMAL,
+            new ArrowType.Decimal(MAX_DECIMAL_PRECISION, value.scale(), /*bitWidth=*/ 128))
+        .writeDecimal(value);
   }
 
   @Override
   public void writeBigEndianBytesToDecimal(byte[] value, ArrowType arrowType) {
-    getWriter(MinorType.DECIMAL, new ArrowType.Decimal(MAX_DECIMAL_PRECISION,
-        ((ArrowType.Decimal) arrowType).getScale(), /*bitWidth=*/128)).writeBigEndianBytesToDecimal(value, arrowType);
+    getWriter(
+            MinorType.DECIMAL,
+            new ArrowType.Decimal(
+                MAX_DECIMAL_PRECISION,
+                ((ArrowType.Decimal) arrowType).getScale(),
+                /*bitWidth=*/ 128))
+        .writeBigEndianBytesToDecimal(value, arrowType);
   }
 
   @Override
   public void write(Decimal256Holder holder) {
-    getWriter(MinorType.DECIMAL256,
-              new ArrowType.Decimal(MAX_DECIMAL256_PRECISION, holder.scale, /*bitWidth=*/256)).write(holder);
+    getWriter(
+            MinorType.DECIMAL256,
+            new ArrowType.Decimal(MAX_DECIMAL256_PRECISION, holder.scale, /*bitWidth=*/ 256))
+        .write(holder);
   }
 
   @Override
   public void writeDecimal256(long start, ArrowBuf buffer, ArrowType arrowType) {
-    getWriter(MinorType.DECIMAL256, new ArrowType.Decimal(MAX_DECIMAL256_PRECISION,
-        ((ArrowType.Decimal) arrowType).getScale(), /*bitWidth=*/256)).writeDecimal256(start, buffer, arrowType);
+    getWriter(
+            MinorType.DECIMAL256,
+            new ArrowType.Decimal(
+                MAX_DECIMAL256_PRECISION,
+                ((ArrowType.Decimal) arrowType).getScale(),
+                /*bitWidth=*/ 256))
+        .writeDecimal256(start, buffer, arrowType);
   }
 
   @Override
   public void writeDecimal256(BigDecimal value) {
-    getWriter(MinorType.DECIMAL256,
-        new ArrowType.Decimal(MAX_DECIMAL256_PRECISION, value.scale(), /*bitWidth=*/256)).writeDecimal256(value);
+    getWriter(
+            MinorType.DECIMAL256,
+            new ArrowType.Decimal(MAX_DECIMAL256_PRECISION, value.scale(), /*bitWidth=*/ 256))
+        .writeDecimal256(value);
   }
 
   @Override
   public void writeBigEndianBytesToDecimal256(byte[] value, ArrowType arrowType) {
-    getWriter(MinorType.DECIMAL256, new ArrowType.Decimal(MAX_DECIMAL256_PRECISION,
-        ((ArrowType.Decimal) arrowType).getScale(),
-          /*bitWidth=*/256)).writeBigEndianBytesToDecimal256(value, arrowType);
+    getWriter(
+            MinorType.DECIMAL256,
+            new ArrowType.Decimal(
+                MAX_DECIMAL256_PRECISION,
+                ((ArrowType.Decimal) arrowType).getScale(),
+                /*bitWidth=*/ 256))
+        .writeBigEndianBytesToDecimal256(value, arrowType);
   }
 
   @Override
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/SingleListReaderImpl.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/SingleListReaderImpl.java
index 9bbe60421ecd3..9442afde34303 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/SingleListReaderImpl.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/SingleListReaderImpl.java
@@ -14,19 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.impl;
 
-
 import org.apache.arrow.vector.complex.AbstractContainerVector;
 import org.apache.arrow.vector.complex.reader.FieldReader;
 import org.apache.arrow.vector.complex.writer.BaseWriter.ListWriter;
 import org.apache.arrow.vector.complex.writer.BaseWriter.StructWriter;
 import org.apache.arrow.vector.types.Types.MinorType;
 
-/**
- * An implementation of {@link AbstractFieldReader} for lists vectors.
- */
+/** An implementation of {@link AbstractFieldReader} for lists vectors. */
 @SuppressWarnings("unused")
 public class SingleListReaderImpl extends AbstractFieldReader {
 
@@ -80,12 +76,13 @@ public boolean isSet() {
 
   @Override
   public void copyAsValue(ListWriter writer) {
-    throw new UnsupportedOperationException("Generic list copying not yet supported.  Please resolve to typed list.");
+    throw new UnsupportedOperationException(
+        "Generic list copying not yet supported.  Please resolve to typed list.");
   }
 
   @Override
   public void copyAsField(String name, StructWriter writer) {
-    throw new UnsupportedOperationException("Generic list copying not yet supported.  Please resolve to typed list.");
+    throw new UnsupportedOperationException(
+        "Generic list copying not yet supported.  Please resolve to typed list.");
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/SingleStructReaderImpl.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/SingleStructReaderImpl.java
index 3590e40cef744..65e80fcfac06e 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/SingleStructReaderImpl.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/SingleStructReaderImpl.java
@@ -14,13 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.impl;
 
-
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.complex.NonNullableStructVector;
 import org.apache.arrow.vector.complex.reader.FieldReader;
@@ -107,7 +104,4 @@ public void copyAsField(String name, StructWriter writer) {
     SingleStructWriter impl = (SingleStructWriter) writer.struct(name);
     impl.container.copyFromSafe(idx(), impl.idx(), vector);
   }
-
-
 }
-
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/StructOrListWriterImpl.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/StructOrListWriterImpl.java
index 6a217bbc8b547..7dbcbf8babe00 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/StructOrListWriterImpl.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/StructOrListWriterImpl.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.impl;
 
 import org.apache.arrow.vector.complex.writer.BaseWriter;
@@ -27,17 +26,15 @@
 import org.apache.arrow.vector.complex.writer.VarBinaryWriter;
 import org.apache.arrow.vector.complex.writer.VarCharWriter;
 
-/**
- * Concrete implementation of {@link StructOrListWriter}.
- */
+/** Concrete implementation of {@link StructOrListWriter}. */
 public class StructOrListWriterImpl implements StructOrListWriter {
 
   public final BaseWriter.StructWriter struct;
   public final BaseWriter.ListWriter list;
 
   /**
-   * Constructs a new instance using a {@link BaseWriter.StructWriter}
-   * (instead of an {@link BaseWriter.ListWriter}).
+   * Constructs a new instance using a {@link BaseWriter.StructWriter} (instead of an {@link
+   * BaseWriter.ListWriter}).
    */
   public StructOrListWriterImpl(final BaseWriter.StructWriter writer) {
     this.struct = writer;
@@ -45,17 +42,15 @@ public StructOrListWriterImpl(final BaseWriter.StructWriter writer) {
   }
 
   /**
-   * Constructs a new instance using a {@link BaseWriter.ListWriter}
-   * (instead of a {@link BaseWriter.StructWriter}).
+   * Constructs a new instance using a {@link BaseWriter.ListWriter} (instead of a {@link
+   * BaseWriter.StructWriter}).
    */
   public StructOrListWriterImpl(final BaseWriter.ListWriter writer) {
     this.struct = null;
     this.list = writer;
   }
 
-  /**
-   * Start writing to either the list or the struct.
-   */
+  /** Start writing to either the list or the struct. */
   public void start() {
     if (struct != null) {
       struct.start();
@@ -64,9 +59,7 @@ public void start() {
     }
   }
 
-  /**
-   * Finish writing to the list or struct.
-   */
+  /** Finish writing to the list or struct. */
   public void end() {
     if (struct != null) {
       struct.end();
@@ -75,9 +68,7 @@ public void end() {
     }
   }
 
-  /**
-   * Creates a new writer for a struct with the given name.
-   */
+  /** Creates a new writer for a struct with the given name. */
   public StructOrListWriter struct(final String name) {
     assert struct != null;
     return new StructOrListWriterImpl(struct.struct(name));
@@ -87,7 +78,6 @@ public StructOrListWriter struct(final String name) {
    * Creates a new writer for a list of structs.
    *
    * @param name Unused.
-   *
    * @deprecated use {@link #listOfStruct(String)} instead.
    */
   @Deprecated
@@ -145,5 +135,4 @@ public BitWriter bit(final String name) {
   public VarBinaryWriter binary(final String name) {
     return (struct != null) ? struct.varBinary(name) : list.varBinary();
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionFixedSizeListReader.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionFixedSizeListReader.java
index f69fea3bd5779..a2bad12183d69 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionFixedSizeListReader.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionFixedSizeListReader.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.impl;
 
 import org.apache.arrow.vector.ValueVector;
@@ -25,9 +24,7 @@
 import org.apache.arrow.vector.holders.UnionHolder;
 import org.apache.arrow.vector.types.Types.MinorType;
 
-/**
- * Reader for fixed size list vectors.
- */
+/** Reader for fixed size list vectors. */
 public class UnionFixedSizeListReader extends AbstractFieldReader {
 
   private final FixedSizeListVector vector;
@@ -36,9 +33,7 @@ public class UnionFixedSizeListReader extends AbstractFieldReader {
 
   private int currentOffset;
 
-  /**
-   * Constructs a new instance that reads data in <code>vector</code>.
-   */
+  /** Constructs a new instance that reads data in <code>vector</code>. */
   public UnionFixedSizeListReader(FixedSizeListVector vector) {
     this.vector = vector;
     this.data = vector.getDataVector();
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionLargeListReader.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionLargeListReader.java
index 0f3ba50f2b3a1..be236c31662bb 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionLargeListReader.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionLargeListReader.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.impl;
 
 import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
@@ -27,9 +26,7 @@
 import org.apache.arrow.vector.types.Types.MinorType;
 import org.apache.arrow.vector.types.pojo.Field;
 
-/**
- * {@link FieldReader} for list of union types.
- */
+/** {@link FieldReader} for list of union types. */
 public class UnionLargeListReader extends AbstractFieldReader {
 
   private LargeListVector vector;
@@ -88,14 +85,17 @@ public void read(int index, UnionHolder holder) {
 
   @Override
   public int size() {
-    int size = checkedCastToInt(maxOffset - currentOffset - 1); //todo revisit when int64 vectors are done
+    int size =
+        checkedCastToInt(maxOffset - currentOffset - 1); // todo revisit when int64 vectors are done
     return size < 0 ? 0 : size;
   }
 
   @Override
   public boolean next() {
     if (currentOffset + 1 < maxOffset) {
-      data.getReader().setPosition(checkedCastToInt(++currentOffset)); // todo revisit when int64 vectors are done
+      data.getReader()
+          .setPosition(
+              checkedCastToInt(++currentOffset)); // todo revisit when int64 vectors are done
       return true;
     } else {
       return false;
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionListReader.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionListReader.java
index 7dadcabdcee88..014608afeeb35 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionListReader.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionListReader.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.impl;
 
 import org.apache.arrow.vector.ValueVector;
@@ -26,9 +25,7 @@
 import org.apache.arrow.vector.types.Types.MinorType;
 import org.apache.arrow.vector.types.pojo.Field;
 
-/**
- * {@link FieldReader} for list of union types.
- */
+/** {@link FieldReader} for list of union types. */
 public class UnionListReader extends AbstractFieldReader {
 
   private ListVector vector;
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionMapReader.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionMapReader.java
index 7a1bdce9b9a3c..b3ee62e17ae78 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionMapReader.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionMapReader.java
@@ -14,16 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.impl;
 
 import org.apache.arrow.vector.complex.MapVector;
 import org.apache.arrow.vector.complex.reader.FieldReader;
 import org.apache.arrow.vector.types.Types.MinorType;
 
-/**
- * Reader for a MapVector.
- */
+/** Reader for a MapVector. */
 public class UnionMapReader extends UnionListReader {
 
   private String keyName = MapVector.KEY_NAME;
@@ -67,9 +64,7 @@ public FieldReader value() {
     return reader().reader(valueName);
   }
 
-  /**
-   * Return the MinorType of the reader as MAP.
-   */
+  /** Return the MinorType of the reader as MAP. */
   @Override
   public MinorType getMinorType() {
     return MinorType.MAP;
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/reader/FieldReader.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/reader/FieldReader.java
index a888abbaa7d50..a42d9404f4b61 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/reader/FieldReader.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/reader/FieldReader.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.reader;
 
 import org.apache.arrow.vector.complex.reader.BaseReader.ListReader;
@@ -25,11 +24,15 @@
 import org.apache.arrow.vector.complex.reader.BaseReader.ScalarReader;
 import org.apache.arrow.vector.complex.reader.BaseReader.StructReader;
 
-
 /**
- * Composite of all Reader types (e.g. {@link StructReader}, {@link ScalarReader}, etc).  Each reader type
- * is in essence a way of iterating over a {@link org.apache.arrow.vector.ValueVector}.
+ * Composite of all Reader types (e.g. {@link StructReader}, {@link ScalarReader}, etc). Each reader
+ * type is in essence a way of iterating over a {@link org.apache.arrow.vector.ValueVector}.
  */
-public interface FieldReader extends StructReader, ListReader, MapReader, ScalarReader,
-    RepeatedStructReader, RepeatedListReader, RepeatedMapReader {
-}
+public interface FieldReader
+    extends StructReader,
+        ListReader,
+        MapReader,
+        ScalarReader,
+        RepeatedStructReader,
+        RepeatedListReader,
+        RepeatedMapReader {}
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/writer/FieldWriter.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/writer/FieldWriter.java
index a3cb7108a1179..949eb35d8eb0b 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/writer/FieldWriter.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/writer/FieldWriter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.writer;
 
 import org.apache.arrow.vector.complex.writer.BaseWriter.ListWriter;
@@ -23,8 +22,8 @@
 import org.apache.arrow.vector.complex.writer.BaseWriter.StructWriter;
 
 /**
- * Composite of all writer types.  Writers are convenience classes for incrementally
- * adding values to {@linkplain org.apache.arrow.vector.ValueVector}s.
+ * Composite of all writer types. Writers are convenience classes for incrementally adding values to
+ * {@linkplain org.apache.arrow.vector.ValueVector}s.
  */
 public interface FieldWriter extends StructWriter, ListWriter, MapWriter, ScalarWriter {
   void allocate();
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/compression/AbstractCompressionCodec.java b/java/vector/src/main/java/org/apache/arrow/vector/compression/AbstractCompressionCodec.java
index f45e51b8d498c..58d9e4db9bb9d 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/compression/AbstractCompressionCodec.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/compression/AbstractCompressionCodec.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.compression;
 
 import org.apache.arrow.memory.ArrowBuf;
@@ -23,8 +22,8 @@
 import org.apache.arrow.util.Preconditions;
 
 /**
- * The base class for concrete compression codecs, providing
- * common logic for all compression codecs.
+ * The base class for concrete compression codecs, providing common logic for all compression
+ * codecs.
  */
 public abstract class AbstractCompressionCodec implements CompressionCodec {
 
@@ -40,7 +39,8 @@ public ArrowBuf compress(BufferAllocator allocator, ArrowBuf uncompressedBuffer)
     }
 
     ArrowBuf compressedBuffer = doCompress(allocator, uncompressedBuffer);
-    long compressedLength = compressedBuffer.writerIndex() - CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH;
+    long compressedLength =
+        compressedBuffer.writerIndex() - CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH;
     long uncompressedLength = uncompressedBuffer.writerIndex();
 
     if (compressedLength > uncompressedLength) {
@@ -58,7 +58,8 @@ public ArrowBuf compress(BufferAllocator allocator, ArrowBuf uncompressedBuffer)
 
   @Override
   public ArrowBuf decompress(BufferAllocator allocator, ArrowBuf compressedBuffer) {
-    Preconditions.checkArgument(compressedBuffer.writerIndex() >= CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH,
+    Preconditions.checkArgument(
+        compressedBuffer.writerIndex() >= CompressionUtil.SIZE_OF_UNCOMPRESSED_LENGTH,
         "Not enough data to decompress.");
 
     long decompressedLength = readUncompressedLength(compressedBuffer);
@@ -96,22 +97,20 @@ protected long readUncompressedLength(ArrowBuf compressedBuffer) {
   }
 
   /**
-   * The method that actually performs the data compression.
-   * The layout of the returned compressed buffer is the compressed data,
-   * plus 8 bytes reserved at the beginning of the buffer for the uncompressed data size.
-   * <p>
-   *   Please note that this method is not responsible for releasing the uncompressed buffer.
-   * </p>
+   * The method that actually performs the data compression. The layout of the returned compressed
+   * buffer is the compressed data, plus 8 bytes reserved at the beginning of the buffer for the
+   * uncompressed data size.
+   *
+   * <p>Please note that this method is not responsible for releasing the uncompressed buffer.
    */
   protected abstract ArrowBuf doCompress(BufferAllocator allocator, ArrowBuf uncompressedBuffer);
 
   /**
-   * The method that actually performs the data decompression.
-   * The layout of the compressed buffer is the compressed data,
-   * plus 8 bytes at the beginning of the buffer storing the uncompressed data size.
-   * <p>
-   *   Please note that this method is not responsible for releasing the compressed buffer.
-   * </p>
+   * The method that actually performs the data decompression. The layout of the compressed buffer
+   * is the compressed data, plus 8 bytes at the beginning of the buffer storing the uncompressed
+   * data size.
+   *
+   * <p>Please note that this method is not responsible for releasing the compressed buffer.
    */
   protected abstract ArrowBuf doDecompress(BufferAllocator allocator, ArrowBuf compressedBuffer);
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/compression/CompressionCodec.java b/java/vector/src/main/java/org/apache/arrow/vector/compression/CompressionCodec.java
index 8d235f713a8fa..2de8ff246591b 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/compression/CompressionCodec.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/compression/CompressionCodec.java
@@ -14,54 +14,48 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.compression;
 
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 
-/**
- * The codec for compression/decompression.
- */
+/** The codec for compression/decompression. */
 public interface CompressionCodec {
 
   /**
    * Compress a buffer.
+   *
    * @param allocator the allocator for allocating memory for compressed buffer.
-   * @param uncompressedBuffer the buffer to compress.
-   *                           Implementation of this method should take care of releasing this buffer.
+   * @param uncompressedBuffer the buffer to compress. Implementation of this method should take
+   *     care of releasing this buffer.
    * @return the compressed buffer
    */
   ArrowBuf compress(BufferAllocator allocator, ArrowBuf uncompressedBuffer);
 
   /**
    * Decompress a buffer.
+   *
    * @param allocator the allocator for allocating memory for decompressed buffer.
-   * @param compressedBuffer the buffer to be decompressed.
-   *                         Implementation of this method should take care of releasing this buffer.
+   * @param compressedBuffer the buffer to be decompressed. Implementation of this method should
+   *     take care of releasing this buffer.
    * @return the decompressed buffer.
    */
   ArrowBuf decompress(BufferAllocator allocator, ArrowBuf compressedBuffer);
 
   /**
    * Gets the type of the codec.
+   *
    * @return the type of the codec.
    */
   CompressionUtil.CodecType getCodecType();
 
-  /**
-   * Factory to create compression codec.
-   */
+  /** Factory to create compression codec. */
   interface Factory {
 
-    /**
-     * Creates the codec based on the codec type.
-     */
+    /** Creates the codec based on the codec type. */
     CompressionCodec createCodec(CompressionUtil.CodecType codecType);
 
-    /**
-     * Creates the codec based on the codec type and compression level.
-     */
+    /** Creates the codec based on the codec type and compression level. */
     CompressionCodec createCodec(CompressionUtil.CodecType codecType, int compressionLevel);
   }
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/compression/CompressionUtil.java b/java/vector/src/main/java/org/apache/arrow/vector/compression/CompressionUtil.java
index 1deb38c84da05..03763611e0729 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/compression/CompressionUtil.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/compression/CompressionUtil.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.compression;
 
 import org.apache.arrow.flatbuf.BodyCompressionMethod;
@@ -23,16 +22,13 @@
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.ipc.message.ArrowBodyCompression;
 
-/**
- * Utilities for data compression/decompression.
- */
+/** Utilities for data compression/decompression. */
 public class CompressionUtil {
 
   /**
    * Compression codec types corresponding to flat buffer implementation in {@link CompressionType}.
    */
   public enum CodecType {
-
     NO_COMPRESSION(NoCompressionCodec.COMPRESSION_TYPE),
 
     LZ4_FRAME(org.apache.arrow.flatbuf.CompressionType.LZ4_FRAME),
@@ -49,9 +45,7 @@ public byte getType() {
       return type;
     }
 
-    /**
-     * Gets the codec type from the compression type defined in {@link CompressionType}.
-     */
+    /** Gets the codec type from the compression type defined in {@link CompressionType}. */
     public static CodecType fromCompressionType(byte type) {
       for (CodecType codecType : values()) {
         if (codecType.type == type) {
@@ -65,39 +59,35 @@ public static CodecType fromCompressionType(byte type) {
   public static final long SIZE_OF_UNCOMPRESSED_LENGTH = 8L;
 
   /**
-   * Special flag to indicate no compression.
-   * (e.g. when the compressed buffer has a larger size.)
+   * Special flag to indicate no compression. (e.g. when the compressed buffer has a larger size.)
    */
   public static final long NO_COMPRESSION_LENGTH = -1L;
 
-  private CompressionUtil() {
-  }
+  private CompressionUtil() {}
 
   /**
-   * Creates the {@link ArrowBodyCompression} object, given the {@link CompressionCodec}.
-   * The implementation of this method should depend on the values of
-   * {@link org.apache.arrow.flatbuf.CompressionType#names}.
+   * Creates the {@link ArrowBodyCompression} object, given the {@link CompressionCodec}. The
+   * implementation of this method should depend on the values of {@link
+   * org.apache.arrow.flatbuf.CompressionType#names}.
    */
   public static ArrowBodyCompression createBodyCompression(CompressionCodec codec) {
     return new ArrowBodyCompression(codec.getCodecType().getType(), BodyCompressionMethod.BUFFER);
   }
 
-  /**
-   * Process compression by compressing the buffer as is.
-   */
+  /** Process compression by compressing the buffer as is. */
   public static ArrowBuf packageRawBuffer(BufferAllocator allocator, ArrowBuf inputBuffer) {
-    ArrowBuf compressedBuffer = allocator.buffer(SIZE_OF_UNCOMPRESSED_LENGTH + inputBuffer.writerIndex());
+    ArrowBuf compressedBuffer =
+        allocator.buffer(SIZE_OF_UNCOMPRESSED_LENGTH + inputBuffer.writerIndex());
     compressedBuffer.setLong(0, NO_COMPRESSION_LENGTH);
-    compressedBuffer.setBytes(SIZE_OF_UNCOMPRESSED_LENGTH, inputBuffer, 0, inputBuffer.writerIndex());
+    compressedBuffer.setBytes(
+        SIZE_OF_UNCOMPRESSED_LENGTH, inputBuffer, 0, inputBuffer.writerIndex());
     compressedBuffer.writerIndex(SIZE_OF_UNCOMPRESSED_LENGTH + inputBuffer.writerIndex());
     return compressedBuffer;
   }
 
-  /**
-   * Process decompression by slicing the buffer that contains the uncompressed bytes.
-   */
+  /** Process decompression by slicing the buffer that contains the uncompressed bytes. */
   public static ArrowBuf extractUncompressedBuffer(ArrowBuf inputBuffer) {
-    return inputBuffer.slice(SIZE_OF_UNCOMPRESSED_LENGTH,
-        inputBuffer.writerIndex() - SIZE_OF_UNCOMPRESSED_LENGTH);
+    return inputBuffer.slice(
+        SIZE_OF_UNCOMPRESSED_LENGTH, inputBuffer.writerIndex() - SIZE_OF_UNCOMPRESSED_LENGTH);
   }
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/compression/NoCompressionCodec.java b/java/vector/src/main/java/org/apache/arrow/vector/compression/NoCompressionCodec.java
index f0e969508e0e0..4debce335aa6f 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/compression/NoCompressionCodec.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/compression/NoCompressionCodec.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.compression;
 
 import org.apache.arrow.flatbuf.BodyCompressionMethod;
@@ -22,9 +21,7 @@
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.ipc.message.ArrowBodyCompression;
 
-/**
- * The default compression codec that does no compression.
- */
+/** The default compression codec that does no compression. */
 public class NoCompressionCodec implements CompressionCodec {
 
   public static final NoCompressionCodec INSTANCE = new NoCompressionCodec();
@@ -34,8 +31,7 @@ public class NoCompressionCodec implements CompressionCodec {
   public static final ArrowBodyCompression DEFAULT_BODY_COMPRESSION =
       new ArrowBodyCompression(COMPRESSION_TYPE, BodyCompressionMethod.BUFFER);
 
-  private NoCompressionCodec() {
-  }
+  private NoCompressionCodec() {}
 
   @Override
   public ArrowBuf compress(BufferAllocator allocator, ArrowBuf uncompressedBuffer) {
@@ -52,9 +48,7 @@ public CompressionUtil.CodecType getCodecType() {
     return CompressionUtil.CodecType.NO_COMPRESSION;
   }
 
-  /**
-   * The default factory that creates a {@link NoCompressionCodec}.
-   */
+  /** The default factory that creates a {@link NoCompressionCodec}. */
   public static class Factory implements CompressionCodec.Factory {
 
     public static final NoCompressionCodec.Factory INSTANCE = new NoCompressionCodec.Factory();
@@ -67,7 +61,8 @@ public CompressionCodec createCodec(CompressionUtil.CodecType codecType) {
         case LZ4_FRAME:
         case ZSTD:
           throw new IllegalArgumentException(
-            "Please add arrow-compression module to use CommonsCompressionFactory for " + codecType);
+              "Please add arrow-compression module to use CommonsCompressionFactory for "
+                  + codecType);
         default:
           throw new IllegalArgumentException("Unsupported codec type: " + codecType);
       }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/dictionary/Dictionary.java b/java/vector/src/main/java/org/apache/arrow/vector/dictionary/Dictionary.java
index 5687e4025acee..4a6ea9613ba1b 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/dictionary/Dictionary.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/dictionary/Dictionary.java
@@ -14,19 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.dictionary;
 
 import java.util.Objects;
-
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.compare.VectorEqualsVisitor;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
 
 /**
- * A dictionary (integer to Value mapping) that is used to facilitate
- * dictionary encoding compression.
+ * A dictionary (integer to Value mapping) that is used to facilitate dictionary encoding
+ * compression.
  */
 public class Dictionary {
 
@@ -64,8 +62,8 @@ public boolean equals(Object o) {
       return false;
     }
     Dictionary that = (Dictionary) o;
-    return Objects.equals(encoding, that.encoding) &&
-        new VectorEqualsVisitor().vectorEquals(that.dictionary, dictionary);
+    return Objects.equals(encoding, that.encoding)
+        && new VectorEqualsVisitor().vectorEquals(that.dictionary, dictionary);
   }
 
   @Override
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryEncoder.java b/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryEncoder.java
index 4368501ffc7b5..4af1a8693f9ec 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryEncoder.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryEncoder.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.dictionary;
 
 import org.apache.arrow.memory.BufferAllocator;
@@ -41,24 +40,22 @@ public class DictionaryEncoder {
   private final Dictionary dictionary;
   private final BufferAllocator allocator;
 
-  /**
-   * Construct an instance.
-   */
+  /** Construct an instance. */
   public DictionaryEncoder(Dictionary dictionary, BufferAllocator allocator) {
-    this (dictionary, allocator, SimpleHasher.INSTANCE);
+    this(dictionary, allocator, SimpleHasher.INSTANCE);
   }
 
-  /**
-   * Construct an instance.
-   */
-  public DictionaryEncoder(Dictionary dictionary, BufferAllocator allocator, ArrowBufHasher hasher) {
+  /** Construct an instance. */
+  public DictionaryEncoder(
+      Dictionary dictionary, BufferAllocator allocator, ArrowBufHasher hasher) {
     this.dictionary = dictionary;
     this.allocator = allocator;
     hashTable = new DictionaryHashTable(dictionary.getVector(), hasher);
   }
 
   /**
-   * Dictionary encodes a vector with a provided dictionary. The dictionary must contain all values in the vector.
+   * Dictionary encodes a vector with a provided dictionary. The dictionary must contain all values
+   * in the vector.
    *
    * @param vector vector to encode
    * @param dictionary dictionary used for encoding
@@ -88,7 +85,8 @@ public static ValueVector decode(ValueVector indices, Dictionary dictionary) {
    * @param allocator allocator the decoded values use
    * @return vector with values restored from dictionary
    */
-  public static ValueVector decode(ValueVector indices, Dictionary dictionary, BufferAllocator allocator) {
+  public static ValueVector decode(
+      ValueVector indices, Dictionary dictionary, BufferAllocator allocator) {
     int count = indices.getValueCount();
     ValueVector dictionaryVector = dictionary.getVector();
     int dictionaryCount = dictionaryVector.getValueCount();
@@ -109,6 +107,7 @@ public static ValueVector decode(ValueVector indices, Dictionary dictionary, Buf
 
   /**
    * Get the indexType according to the dictionary vector valueCount.
+   *
    * @param valueCount dictionary vector valueCount.
    * @return index type.
    */
@@ -119,7 +118,7 @@ public static ArrowType.Int getIndexType(int valueCount) {
       return new ArrowType.Int(8, true);
     } else if (valueCount <= Character.MAX_VALUE) {
       return new ArrowType.Int(16, true);
-    } else if (valueCount <= Integer.MAX_VALUE) { //this comparison will always evaluate to true
+    } else if (valueCount <= Integer.MAX_VALUE) { // this comparison will always evaluate to true
       return new ArrowType.Int(32, true);
     } else {
       return new ArrowType.Int(64, true);
@@ -128,6 +127,7 @@ public static ArrowType.Int getIndexType(int valueCount) {
 
   /**
    * Populates indices between start and end with the encoded values of vector.
+   *
    * @param vector the vector to encode
    * @param indices the index vector
    * @param encoding the hash table for encoding
@@ -135,11 +135,7 @@ public static ArrowType.Int getIndexType(int valueCount) {
    * @param end the end index
    */
   static void buildIndexVector(
-      ValueVector vector,
-      BaseIntVector indices,
-      DictionaryHashTable encoding,
-      int start,
-      int end) {
+      ValueVector vector, BaseIntVector indices, DictionaryHashTable encoding, int start, int end) {
 
     for (int i = start; i < end; i++) {
       if (!vector.isNull(i)) {
@@ -147,7 +143,8 @@ static void buildIndexVector(
         // note: this may fail if value was not included in the dictionary
         int encoded = encoding.getIndex(i, vector);
         if (encoded == -1) {
-          throw new IllegalArgumentException("Dictionary encoding not defined for value:" + vector.getObject(i));
+          throw new IllegalArgumentException(
+              "Dictionary encoding not defined for value:" + vector.getObject(i));
         }
         indices.setWithPossibleTruncate(i, encoded);
       }
@@ -156,6 +153,7 @@ static void buildIndexVector(
 
   /**
    * Retrieve values to target vector from index vector.
+   *
    * @param indices the index vector
    * @param transfer the {@link TransferPair} to copy dictionary data into target vector.
    * @param dictionaryCount the value count of dictionary vector.
@@ -163,37 +161,36 @@ static void buildIndexVector(
    * @param end the end index
    */
   static void retrieveIndexVector(
-      BaseIntVector indices,
-      TransferPair transfer,
-      int dictionaryCount,
-      int start,
-      int end) {
+      BaseIntVector indices, TransferPair transfer, int dictionaryCount, int start, int end) {
     for (int i = start; i < end; i++) {
       if (!indices.isNull(i)) {
         int indexAsInt = (int) indices.getValueAsLong(i);
         if (indexAsInt > dictionaryCount) {
-          throw new IllegalArgumentException("Provided dictionary does not contain value for index " + indexAsInt);
+          throw new IllegalArgumentException(
+              "Provided dictionary does not contain value for index " + indexAsInt);
         }
         transfer.copyValueSafe(indexAsInt, i);
       }
     }
   }
 
-  /**
-   * Encodes a vector with the built hash table in this encoder.
-   */
+  /** Encodes a vector with the built hash table in this encoder. */
   public ValueVector encode(ValueVector vector) {
 
     Field valueField = vector.getField();
-    FieldType indexFieldType = new FieldType(valueField.isNullable(), dictionary.getEncoding().getIndexType(),
-        dictionary.getEncoding(), valueField.getMetadata());
+    FieldType indexFieldType =
+        new FieldType(
+            valueField.isNullable(),
+            dictionary.getEncoding().getIndexType(),
+            dictionary.getEncoding(),
+            valueField.getMetadata());
     Field indexField = new Field(valueField.getName(), indexFieldType, null);
 
     // vector to hold our indices (dictionary encoded values)
     FieldVector createdVector = indexField.createVector(allocator);
-    if (! (createdVector instanceof BaseIntVector)) {
-      throw new IllegalArgumentException("Dictionary encoding does not have a valid int type:" +
-          createdVector.getClass());
+    if (!(createdVector instanceof BaseIntVector)) {
+      throw new IllegalArgumentException(
+          "Dictionary encoding does not have a valid int type:" + createdVector.getClass());
     }
 
     BaseIntVector indices = (BaseIntVector) createdVector;
@@ -211,8 +208,9 @@ public ValueVector encode(ValueVector vector) {
   /**
    * Decodes a vector with the dictionary in this encoder.
    *
-   * {@link DictionaryEncoder#decode(ValueVector, Dictionary, BufferAllocator)} should be used instead if only decoding
-   * is required as it can avoid building the {@link DictionaryHashTable} which only makes sense when encoding.
+   * <p>{@link DictionaryEncoder#decode(ValueVector, Dictionary, BufferAllocator)} should be used
+   * instead if only decoding is required as it can avoid building the {@link DictionaryHashTable}
+   * which only makes sense when encoding.
    */
   public ValueVector decode(ValueVector indices) {
     return decode(indices, dictionary, allocator);
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryHashTable.java b/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryHashTable.java
index 9926a8e2a637f..57faf51845c4e 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryHashTable.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryHashTable.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.dictionary;
 
 import org.apache.arrow.memory.util.hash.ArrowBufHasher;
@@ -24,67 +23,52 @@
 import org.apache.arrow.vector.compare.RangeEqualsVisitor;
 
 /**
- * HashTable used for Dictionary encoding. It holds two vectors (the vector to encode and dictionary vector)
- * It stores the index in dictionary vector and for a given index in encode vector,
- * it could return dictionary index.
+ * HashTable used for Dictionary encoding. It holds two vectors (the vector to encode and dictionary
+ * vector) It stores the index in dictionary vector and for a given index in encode vector, it could
+ * return dictionary index.
  */
 public class DictionaryHashTable {
 
-  /**
-   * Represents a null value in map.
-   */
+  /** Represents a null value in map. */
   static final int NULL_VALUE = -1;
 
-  /**
-   * The default initial capacity - MUST be a power of two.
-   */
+  /** The default initial capacity - MUST be a power of two. */
   static final int DEFAULT_INITIAL_CAPACITY = 1 << 4;
 
   /**
-   * The maximum capacity, used if a higher value is implicitly specified
-   * by either of the constructors with arguments.
+   * The maximum capacity, used if a higher value is implicitly specified by either of the
+   * constructors with arguments.
    */
   static final int MAXIMUM_CAPACITY = 1 << 30;
 
-  /**
-   * The load factor used when none specified in constructor.
-   */
+  /** The load factor used when none specified in constructor. */
   static final float DEFAULT_LOAD_FACTOR = 0.75f;
 
   static final DictionaryHashTable.Entry[] EMPTY_TABLE = {};
 
   /**
-   * The table, initialized on first use, and resized as
-   * necessary. When allocated, length is always a power of two.
+   * The table, initialized on first use, and resized as necessary. When allocated, length is always
+   * a power of two.
    */
   transient DictionaryHashTable.Entry[] table = EMPTY_TABLE;
 
-  /**
-   * The number of key-value mappings contained in this map.
-   */
+  /** The number of key-value mappings contained in this map. */
   transient int size;
 
-  /**
-   * The next size value at which to resize (capacity * load factor).
-   */
+  /** The next size value at which to resize (capacity * load factor). */
   int threshold;
 
-  /**
-   * The load factor for the hash table.
-   */
+  /** The load factor for the hash table. */
   final float loadFactor;
 
   private final ValueVector dictionary;
 
   private final ArrowBufHasher hasher;
 
-  /**
-   * Constructs an empty map with the specified initial capacity and load factor.
-   */
+  /** Constructs an empty map with the specified initial capacity and load factor. */
   public DictionaryHashTable(int initialCapacity, ValueVector dictionary, ArrowBufHasher hasher) {
     if (initialCapacity < 0) {
-      throw new IllegalArgumentException("Illegal initial capacity: " +
-          initialCapacity);
+      throw new IllegalArgumentException("Illegal initial capacity: " + initialCapacity);
     }
     if (initialCapacity > MAXIMUM_CAPACITY) {
       initialCapacity = MAXIMUM_CAPACITY;
@@ -110,25 +94,19 @@ public DictionaryHashTable(ValueVector dictionary) {
     this(dictionary, SimpleHasher.INSTANCE);
   }
 
-  /**
-   * Compute the capacity with given threshold and create init table.
-   */
+  /** Compute the capacity with given threshold and create init table. */
   private void inflateTable(int threshold) {
     int capacity = roundUpToPowerOf2(threshold);
     this.threshold = (int) Math.min(capacity * loadFactor, MAXIMUM_CAPACITY + 1);
     table = new DictionaryHashTable.Entry[capacity];
   }
 
-  /**
-   * Computes the storage location in an array for the given hashCode.
-   */
+  /** Computes the storage location in an array for the given hashCode. */
   static int indexFor(int h, int length) {
     return h & (length - 1);
   }
 
-  /**
-   * Returns a power of two size for the given size.
-   */
+  /** Returns a power of two size for the given size. */
   static final int roundUpToPowerOf2(int size) {
     int n = size - 1;
     n |= n >>> 1;
@@ -141,6 +119,7 @@ static final int roundUpToPowerOf2(int size) {
 
   /**
    * get the corresponding dictionary index with the given index in vector which to encode.
+   *
    * @param indexInArray index in vector.
    * @return dictionary vector index or -1 if no value equals.
    */
@@ -151,12 +130,11 @@ public int getIndex(int indexInArray, ValueVector toEncode) {
     RangeEqualsVisitor equalVisitor = new RangeEqualsVisitor(dictionary, toEncode, null);
     Range range = new Range(0, 0, 1);
 
-    for (DictionaryHashTable.Entry e = table[index]; e != null ; e = e.next) {
+    for (DictionaryHashTable.Entry e = table[index]; e != null; e = e.next) {
       if (e.hash == hash) {
         int dictIndex = e.index;
 
-        range = range.setRightStart(indexInArray)
-            .setLeftStart(dictIndex);
+        range = range.setRightStart(indexInArray).setLeftStart(dictIndex);
         if (equalVisitor.rangeEquals(range)) {
           return dictIndex;
         }
@@ -165,9 +143,7 @@ public int getIndex(int indexInArray, ValueVector toEncode) {
     return NULL_VALUE;
   }
 
-  /**
-   * put the index of dictionary vector to build hash table.
-   */
+  /** put the index of dictionary vector to build hash table. */
   private void put(int indexInDictionary) {
     if (table == EMPTY_TABLE) {
       inflateTable(threshold);
@@ -177,7 +153,7 @@ private void put(int indexInDictionary) {
     int i = indexFor(hash, table.length);
     for (DictionaryHashTable.Entry e = table[i]; e != null; e = e.next) {
       if (e.hash == hash && e.index == indexInDictionary) {
-        //already has this index, return
+        // already has this index, return
         return;
       }
     }
@@ -185,18 +161,14 @@ private void put(int indexInDictionary) {
     addEntry(hash, indexInDictionary, i);
   }
 
-  /**
-   * Create a new Entry at the specific position of table.
-   */
+  /** Create a new Entry at the specific position of table. */
   void createEntry(int hash, int index, int bucketIndex) {
     DictionaryHashTable.Entry e = table[bucketIndex];
     table[bucketIndex] = new DictionaryHashTable.Entry(hash, index, e);
     size++;
   }
 
-  /**
-   * Add Entry at the specified location of the table.
-   */
+  /** Add Entry at the specified location of the table. */
   void addEntry(int hash, int index, int bucketIndex) {
     if ((size >= threshold) && (null != table[bucketIndex])) {
       resize(2 * table.length);
@@ -206,9 +178,7 @@ void addEntry(int hash, int index, int bucketIndex) {
     createEntry(hash, index, bucketIndex);
   }
 
-  /**
-   * Resize table with given new capacity.
-   */
+  /** Resize table with given new capacity. */
   void resize(int newCapacity) {
     DictionaryHashTable.Entry[] oldTable = table;
     int oldCapacity = oldTable.length;
@@ -225,6 +195,7 @@ void resize(int newCapacity) {
 
   /**
    * Transfer entries into new table from old table.
+   *
    * @param newTable new table
    */
   void transfer(DictionaryHashTable.Entry[] newTable) {
@@ -240,16 +211,12 @@ void transfer(DictionaryHashTable.Entry[] newTable) {
     }
   }
 
-  /**
-   * Returns the number of mappings in this Map.
-   */
+  /** Returns the number of mappings in this Map. */
   public int size() {
     return size;
   }
 
-  /**
-   * Removes all elements from this map, leaving it empty.
-   */
+  /** Removes all elements from this map, leaving it empty. */
   public void clear() {
     size = 0;
     for (int i = 0; i < table.length; i++) {
@@ -257,11 +224,9 @@ public void clear() {
     }
   }
 
-  /**
-   * Class to keep dictionary index data within hash table.
-   */
+  /** Class to keep dictionary index data within hash table. */
   static class Entry {
-    //dictionary index
+    // dictionary index
     int index;
     DictionaryHashTable.Entry next;
     int hash;
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryProvider.java b/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryProvider.java
index f64c32be0f3e9..85ad9b4583e1b 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryProvider.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryProvider.java
@@ -14,19 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.dictionary;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.VisibleForTesting;
 
-/**
- * A manager for association of dictionary IDs to their corresponding {@link Dictionary}.
- */
+/** A manager for association of dictionary IDs to their corresponding {@link Dictionary}. */
 public interface DictionaryProvider {
 
   /** Return the dictionary for the given ID. */
@@ -35,16 +31,12 @@ public interface DictionaryProvider {
   /** Get all dictionary IDs. */
   Set<Long> getDictionaryIds();
 
-  /**
-   * Implementation of {@link DictionaryProvider} that is backed by a hash-map.
-   */
+  /** Implementation of {@link DictionaryProvider} that is backed by a hash-map. */
   class MapDictionaryProvider implements AutoCloseable, DictionaryProvider {
 
     private final Map<Long, Dictionary> map;
 
-    /**
-     * Constructs a new instance from the given dictionaries.
-     */
+    /** Constructs a new instance from the given dictionaries. */
     public MapDictionaryProvider(Dictionary... dictionaries) {
       this.map = new HashMap<>();
       for (Dictionary dictionary : dictionaries) {
@@ -63,8 +55,9 @@ public MapDictionaryProvider(Dictionary... dictionaries) {
     public void copyStructureFrom(DictionaryProvider other, BufferAllocator allocator) {
       for (Long id : other.getDictionaryIds()) {
         Dictionary otherDict = other.lookup(id);
-        Dictionary newDict = new Dictionary(otherDict.getVector().getField().createVector(allocator),
-                otherDict.getEncoding());
+        Dictionary newDict =
+            new Dictionary(
+                otherDict.getVector().getField().createVector(allocator), otherDict.getEncoding());
         put(newDict);
       }
     }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/dictionary/ListSubfieldEncoder.java b/java/vector/src/main/java/org/apache/arrow/vector/dictionary/ListSubfieldEncoder.java
index 7f3514798d9b0..62b9628967251 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/dictionary/ListSubfieldEncoder.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/dictionary/ListSubfieldEncoder.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.dictionary;
 
 import java.util.Collections;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.util.hash.ArrowBufHasher;
 import org.apache.arrow.memory.util.hash.SimpleHasher;
@@ -32,9 +30,7 @@
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.util.TransferPair;
 
-/**
- * Sub fields encoder/decoder for Dictionary encoded {@link BaseListVector}.
- */
+/** Sub fields encoder/decoder for Dictionary encoded {@link BaseListVector}. */
 public class ListSubfieldEncoder {
 
   private final DictionaryHashTable hashTable;
@@ -42,13 +38,12 @@ public class ListSubfieldEncoder {
   private final BufferAllocator allocator;
 
   public ListSubfieldEncoder(Dictionary dictionary, BufferAllocator allocator) {
-    this (dictionary, allocator, SimpleHasher.INSTANCE);
+    this(dictionary, allocator, SimpleHasher.INSTANCE);
   }
 
-  /**
-   * Construct an instance.
-   */
-  public ListSubfieldEncoder(Dictionary dictionary, BufferAllocator allocator, ArrowBufHasher hasher) {
+  /** Construct an instance. */
+  public ListSubfieldEncoder(
+      Dictionary dictionary, BufferAllocator allocator, ArrowBufHasher hasher) {
     this.dictionary = dictionary;
     this.allocator = allocator;
     BaseListVector dictVector = (BaseListVector) dictionary.getVector();
@@ -62,26 +57,34 @@ private static FieldVector getDataVector(BaseListVector vector) {
   private static BaseListVector cloneVector(BaseListVector vector, BufferAllocator allocator) {
 
     final FieldType fieldType = vector.getField().getFieldType();
-    BaseListVector cloned = (BaseListVector) fieldType.createNewSingleVector(vector.getField().getName(),
-        allocator, /*schemaCallBack=*/null);
+    BaseListVector cloned =
+        (BaseListVector)
+            fieldType.createNewSingleVector(
+                vector.getField().getName(), allocator, /*schemaCallBack=*/ null);
 
-    final ArrowFieldNode fieldNode = new ArrowFieldNode(vector.getValueCount(), vector.getNullCount());
+    final ArrowFieldNode fieldNode =
+        new ArrowFieldNode(vector.getValueCount(), vector.getNullCount());
     cloned.loadFieldBuffers(fieldNode, vector.getFieldBuffers());
 
     return cloned;
   }
 
   /**
-   * Dictionary encodes subfields for complex vector with a provided dictionary.
-   * The dictionary must contain all values in the sub fields vector.
+   * Dictionary encodes subfields for complex vector with a provided dictionary. The dictionary must
+   * contain all values in the sub fields vector.
+   *
    * @param vector vector to encode
    * @return dictionary encoded vector
    */
   public BaseListVector encodeListSubField(BaseListVector vector) {
     final int valueCount = vector.getValueCount();
 
-    FieldType indexFieldType = new FieldType(vector.getField().isNullable(),
-        dictionary.getEncoding().getIndexType(), dictionary.getEncoding(), vector.getField().getMetadata());
+    FieldType indexFieldType =
+        new FieldType(
+            vector.getField().isNullable(),
+            dictionary.getEncoding().getIndexType(),
+            dictionary.getEncoding(),
+            vector.getField().getMetadata());
     Field valueField = new Field(vector.getField().getName(), indexFieldType, null);
 
     // clone list vector and initialize data vector
@@ -110,9 +113,9 @@ public BaseListVector encodeListSubField(BaseListVector vector) {
   /**
    * Decodes a dictionary subfields encoded vector using the provided dictionary.
    *
-   * {@link ListSubfieldEncoder#decodeListSubField(BaseListVector, Dictionary, BufferAllocator)} should be used instead
-   * if only decoding is required as it can avoid building the {@link DictionaryHashTable} which only makes sense when
-   * encoding.
+   * <p>{@link ListSubfieldEncoder#decodeListSubField(BaseListVector, Dictionary, BufferAllocator)}
+   * should be used instead if only decoding is required as it can avoid building the {@link
+   * DictionaryHashTable} which only makes sense when encoding.
    *
    * @param vector dictionary encoded vector, its data vector must be int type
    * @return vector with values restored from dictionary
@@ -129,9 +132,8 @@ public BaseListVector decodeListSubField(BaseListVector vector) {
    * @param allocator allocator the decoded values use
    * @return vector with values restored from dictionary
    */
-  public static BaseListVector decodeListSubField(BaseListVector vector,
-                                                  Dictionary dictionary,
-                                                  BufferAllocator allocator) {
+  public static BaseListVector decodeListSubField(
+      BaseListVector vector, Dictionary dictionary, BufferAllocator allocator) {
     int valueCount = vector.getValueCount();
     BaseListVector dictionaryVector = (BaseListVector) dictionary.getVector();
     int dictionaryValueCount = getDataVector(dictionaryVector).getValueCount();
@@ -154,7 +156,8 @@ public static BaseListVector decodeListSubField(BaseListVector vector,
           int start = vector.getElementStartIndex(i);
           int end = vector.getElementEndIndex(i);
 
-          DictionaryEncoder.retrieveIndexVector(indices, transfer, dictionaryValueCount, start, end);
+          DictionaryEncoder.retrieveIndexVector(
+              indices, transfer, dictionaryValueCount, start, end);
         }
       }
       return decoded;
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/dictionary/StructSubfieldEncoder.java b/java/vector/src/main/java/org/apache/arrow/vector/dictionary/StructSubfieldEncoder.java
index 8500528a62b60..dc25bc32685dd 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/dictionary/StructSubfieldEncoder.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/dictionary/StructSubfieldEncoder.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.dictionary;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.util.hash.ArrowBufHasher;
 import org.apache.arrow.memory.util.hash.SimpleHasher;
@@ -37,8 +35,8 @@
 import org.apache.arrow.vector.util.TransferPair;
 
 /**
- * Sub fields encoder/decoder for Dictionary encoded {@link StructVector}.
- * Notes that child vectors within struct vector can either be dictionary encodable or not.
+ * Sub fields encoder/decoder for Dictionary encoded {@link StructVector}. Notes that child vectors
+ * within struct vector can either be dictionary encodable or not.
  */
 public class StructSubfieldEncoder {
 
@@ -47,16 +45,13 @@ public class StructSubfieldEncoder {
   private final DictionaryProvider.MapDictionaryProvider provider;
   private final Map<Long, DictionaryHashTable> dictionaryIdToHashTable;
 
-  /**
-   * Construct an instance.
-   */
-  public StructSubfieldEncoder(BufferAllocator allocator, DictionaryProvider.MapDictionaryProvider provider) {
-    this (allocator, provider, SimpleHasher.INSTANCE);
+  /** Construct an instance. */
+  public StructSubfieldEncoder(
+      BufferAllocator allocator, DictionaryProvider.MapDictionaryProvider provider) {
+    this(allocator, provider, SimpleHasher.INSTANCE);
   }
 
-  /**
-   * Construct an instance.
-   */
+  /** Construct an instance. */
   public StructSubfieldEncoder(
       BufferAllocator allocator,
       DictionaryProvider.MapDictionaryProvider provider,
@@ -67,8 +62,12 @@ public StructSubfieldEncoder(
 
     this.dictionaryIdToHashTable = new HashMap<>();
 
-    provider.getDictionaryIds().forEach(id ->
-        dictionaryIdToHashTable.put(id, new DictionaryHashTable(provider.lookup(id).getVector(), hasher)));
+    provider
+        .getDictionaryIds()
+        .forEach(
+            id ->
+                dictionaryIdToHashTable.put(
+                    id, new DictionaryHashTable(provider.lookup(id).getVector(), hasher)));
   }
 
   private static FieldVector getChildVector(StructVector vector, int index) {
@@ -78,21 +77,25 @@ private static FieldVector getChildVector(StructVector vector, int index) {
   private static StructVector cloneVector(StructVector vector, BufferAllocator allocator) {
 
     final FieldType fieldType = vector.getField().getFieldType();
-    StructVector cloned = (StructVector) fieldType.createNewSingleVector(
-        vector.getField().getName(), allocator, /*schemaCallback=*/null);
+    StructVector cloned =
+        (StructVector)
+            fieldType.createNewSingleVector(
+                vector.getField().getName(), allocator, /*schemaCallback=*/ null);
 
-    final ArrowFieldNode fieldNode = new ArrowFieldNode(vector.getValueCount(), vector.getNullCount());
+    final ArrowFieldNode fieldNode =
+        new ArrowFieldNode(vector.getValueCount(), vector.getNullCount());
     cloned.loadFieldBuffers(fieldNode, vector.getFieldBuffers());
 
     return cloned;
   }
 
   /**
-   * Dictionary encodes subfields for complex vector with a provided dictionary.
-   * The dictionary must contain all values in the sub fields vector.
+   * Dictionary encodes subfields for complex vector with a provided dictionary. The dictionary must
+   * contain all values in the sub fields vector.
+   *
    * @param vector vector to encode
-   * @param columnToDictionaryId the mappings between child vector index and dictionary id. A null dictionary
-   *        id indicates the child vector is not encodable.
+   * @param columnToDictionaryId the mappings between child vector index and dictionary id. A null
+   *     dictionary id indicates the child vector is not encodable.
    * @return dictionary encoded vector
    */
   public StructVector encode(StructVector vector, Map<Integer, Long> columnToDictionaryId) {
@@ -111,9 +114,13 @@ public StructVector encode(StructVector vector, Map<Integer, Long> columnToDicti
       } else {
         Dictionary dictionary = provider.lookup(dictionaryId);
         Preconditions.checkNotNull(dictionary, "Dictionary not found with id:" + dictionaryId);
-        FieldType indexFieldType = new FieldType(childVector.getField().isNullable(),
-            dictionary.getEncoding().getIndexType(), dictionary.getEncoding());
-        childrenFields.add(new Field(childVector.getField().getName(), indexFieldType, /*children=*/null));
+        FieldType indexFieldType =
+            new FieldType(
+                childVector.getField().isNullable(),
+                dictionary.getEncoding().getIndexType(),
+                dictionary.getEncoding());
+        childrenFields.add(
+            new Field(childVector.getField().getName(), indexFieldType, /*children=*/ null));
       }
     }
 
@@ -129,8 +136,8 @@ public StructVector encode(StructVector vector, Map<Integer, Long> columnToDicti
         Long dictionaryId = columnToDictionaryId.get(index);
         if (dictionaryId != null) {
           BaseIntVector indices = (BaseIntVector) encodedChildVector;
-          DictionaryEncoder.buildIndexVector(childVector, indices, dictionaryIdToHashTable.get(dictionaryId),
-                  0, valueCount);
+          DictionaryEncoder.buildIndexVector(
+              childVector, indices, dictionaryIdToHashTable.get(dictionaryId), 0, valueCount);
         } else {
           childVector.makeTransferPair(encodedChildVector).splitAndTransfer(0, valueCount);
         }
@@ -146,9 +153,9 @@ public StructVector encode(StructVector vector, Map<Integer, Long> columnToDicti
   /**
    * Decodes a dictionary subfields encoded vector using the provided dictionary.
    *
-   * {@link StructSubfieldEncoder#decode(StructVector, DictionaryProvider.MapDictionaryProvider, BufferAllocator)}
-   * should be used instead if only decoding is required as it can avoid building the {@link DictionaryHashTable}
-   * which only makes sense when encoding.
+   * <p>{@link StructSubfieldEncoder#decode(StructVector, DictionaryProvider.MapDictionaryProvider,
+   * BufferAllocator)} should be used instead if only decoding is required as it can avoid building
+   * the {@link DictionaryHashTable} which only makes sense when encoding.
    *
    * @param vector dictionary encoded vector, its child vector must be int type
    * @return vector with values restored from dictionary
@@ -161,13 +168,14 @@ public StructVector decode(StructVector vector) {
    * Decodes a dictionary subfields encoded vector using the provided dictionary.
    *
    * @param vector dictionary encoded vector, its data vector must be int type
-   * @param provider  dictionary provider used to decode the values
+   * @param provider dictionary provider used to decode the values
    * @param allocator allocator the decoded values use
    * @return vector with values restored from dictionary
    */
-  public static StructVector decode(StructVector vector,
-                                    DictionaryProvider.MapDictionaryProvider provider,
-                                    BufferAllocator allocator) {
+  public static StructVector decode(
+      StructVector vector,
+      DictionaryProvider.MapDictionaryProvider provider,
+      BufferAllocator allocator) {
     final int valueCount = vector.getValueCount();
     final int childCount = vector.getChildrenFromFields().size();
 
@@ -210,11 +218,9 @@ public static StructVector decode(StructVector vector,
     }
   }
 
-  /**
-   * Get the child vector dictionary, return null if not dictionary encoded.
-   */
-  private static Dictionary getChildVectorDictionary(FieldVector childVector,
-                                                     DictionaryProvider.MapDictionaryProvider provider) {
+  /** Get the child vector dictionary, return null if not dictionary encoded. */
+  private static Dictionary getChildVectorDictionary(
+      FieldVector childVector, DictionaryProvider.MapDictionaryProvider provider) {
     DictionaryEncoding dictionaryEncoding = childVector.getField().getDictionary();
     if (dictionaryEncoding != null) {
       Dictionary dictionary = provider.lookup(dictionaryEncoding.getId());
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/holders/ComplexHolder.java b/java/vector/src/main/java/org/apache/arrow/vector/holders/ComplexHolder.java
index b4cb4882f39b4..8c4ecd862819a 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/holders/ComplexHolder.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/holders/ComplexHolder.java
@@ -14,14 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.holders;
 
 import org.apache.arrow.vector.complex.reader.FieldReader;
 
-/**
- * Represents a single value of a complex type (e.g. Union, Struct).
- */
+/** Represents a single value of a complex type (e.g. Union, Struct). */
 public class ComplexHolder implements ValueHolder {
   public FieldReader reader;
   public int isSet;
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/holders/DenseUnionHolder.java b/java/vector/src/main/java/org/apache/arrow/vector/holders/DenseUnionHolder.java
index c3052711e770c..9de7053b980b3 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/holders/DenseUnionHolder.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/holders/DenseUnionHolder.java
@@ -14,15 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.holders;
 
 import org.apache.arrow.vector.complex.reader.FieldReader;
 import org.apache.arrow.vector.types.Types;
 
-/**
- * {@link ValueHolder} for Dense Union Vectors.
- */
+/** {@link ValueHolder} for Dense Union Vectors. */
 public class DenseUnionHolder implements ValueHolder {
   public FieldReader reader;
   public int isSet;
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/holders/RepeatedListHolder.java b/java/vector/src/main/java/org/apache/arrow/vector/holders/RepeatedListHolder.java
index fc17704f01d83..e96b86ce60e47 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/holders/RepeatedListHolder.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/holders/RepeatedListHolder.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.holders;
 
-/**
- * {@link ValueHolder} for a nested {@link org.apache.arrow.vector.complex.ListVector}.
- */
+/** {@link ValueHolder} for a nested {@link org.apache.arrow.vector.complex.ListVector}. */
 public final class RepeatedListHolder implements ValueHolder {
   public int start;
   public int end;
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/holders/RepeatedStructHolder.java b/java/vector/src/main/java/org/apache/arrow/vector/holders/RepeatedStructHolder.java
index 32c590a8af297..e2cca96f54b79 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/holders/RepeatedStructHolder.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/holders/RepeatedStructHolder.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.holders;
 
-/**
- * {@link ValueHolder} for a list of structs.
- */
+/** {@link ValueHolder} for a list of structs. */
 public final class RepeatedStructHolder implements ValueHolder {
   public int start;
   public int end;
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/holders/UnionHolder.java b/java/vector/src/main/java/org/apache/arrow/vector/holders/UnionHolder.java
index e67a0e941da9e..af0b472c1be4a 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/holders/UnionHolder.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/holders/UnionHolder.java
@@ -14,15 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.holders;
 
 import org.apache.arrow.vector.complex.reader.FieldReader;
 import org.apache.arrow.vector.types.Types.MinorType;
 
-/**
- * {@link ValueHolder} for Union Vectors.
- */
+/** {@link ValueHolder} for Union Vectors. */
 public class UnionHolder implements ValueHolder {
   public FieldReader reader;
   public int isSet;
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/holders/ValueHolder.java b/java/vector/src/main/java/org/apache/arrow/vector/holders/ValueHolder.java
index a809e6bb8c419..c9cbbb5b439d6 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/holders/ValueHolder.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/holders/ValueHolder.java
@@ -14,18 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.holders;
 
 /**
  * Wrapper object for an individual value in Arrow.
  *
- * <p>ValueHolders are designed to be mutable wrapper objects for defining clean
- * APIs that access data in Arrow. For performance, object creation is avoided
- * at all costs throughout execution. For this reason, ValueHolders are
- * disallowed from implementing any methods, this allows for them to be
- * replaced by their java primitive inner members during optimization of
- * run-time generated code.
+ * <p>ValueHolders are designed to be mutable wrapper objects for defining clean APIs that access
+ * data in Arrow. For performance, object creation is avoided at all costs throughout execution. For
+ * this reason, ValueHolders are disallowed from implementing any methods, this allows for them to
+ * be replaced by their java primitive inner members during optimization of run-time generated code.
  */
-public interface ValueHolder {
-}
+public interface ValueHolder {}
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowFileReader.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowFileReader.java
index 8629cf93470b8..982651b2ff3de 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowFileReader.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowFileReader.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import java.io.IOException;
@@ -24,7 +23,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.arrow.flatbuf.Footer;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.VisibleForTesting;
@@ -40,10 +38,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * An implementation of {@link ArrowReader} that reads the standard arrow binary
- * file format.
- */
+/** An implementation of {@link ArrowReader} that reads the standard arrow binary file format. */
 public class ArrowFileReader extends ArrowReader {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(ArrowFileReader.class);
@@ -54,13 +49,17 @@ public class ArrowFileReader extends ArrowReader {
   private int currentRecordBatch = 0;
 
   public ArrowFileReader(
-      SeekableReadChannel in, BufferAllocator allocator, CompressionCodec.Factory compressionFactory) {
+      SeekableReadChannel in,
+      BufferAllocator allocator,
+      CompressionCodec.Factory compressionFactory) {
     super(allocator, compressionFactory);
     this.in = in;
   }
 
   public ArrowFileReader(
-      SeekableByteChannel in, BufferAllocator allocator, CompressionCodec.Factory compressionFactory) {
+      SeekableByteChannel in,
+      BufferAllocator allocator,
+      CompressionCodec.Factory compressionFactory) {
     this(new SeekableReadChannel(in), allocator, compressionFactory);
   }
 
@@ -95,11 +94,13 @@ protected Schema readSchema() throws IOException {
       buffer.flip();
       byte[] array = buffer.array();
       if (!ArrowMagic.validateMagic(Arrays.copyOfRange(array, 4, array.length))) {
-        throw new InvalidArrowFileException("missing Magic number " + Arrays.toString(buffer.array()));
+        throw new InvalidArrowFileException(
+            "missing Magic number " + Arrays.toString(buffer.array()));
       }
       int footerLength = MessageSerializer.bytesToInt(array);
-      if (footerLength <= 0 || footerLength + ArrowMagic.MAGIC_LENGTH * 2 + 4 > in.size() ||
-              footerLength > footerLengthOffset) {
+      if (footerLength <= 0
+          || footerLength + ArrowMagic.MAGIC_LENGTH * 2 + 4 > in.size()
+          || footerLength > footerLengthOffset) {
         throw new InvalidArrowFileException("invalid footer length: " + footerLength);
       }
       long footerOffset = footerLengthOffset - footerLength;
@@ -130,9 +131,7 @@ public void initialize() throws IOException {
     }
   }
 
-  /**
-   * Get custom metadata.
-   */
+  /** Get custom metadata. */
   public Map<String, String> getMetaData() {
     if (footer != null) {
       return footer.getMetaData();
@@ -149,7 +148,8 @@ public Map<String, String> getMetaData() {
    */
   public ArrowDictionaryBatch readDictionary() throws IOException {
     if (currentDictionaryBatch >= footer.getDictionaries().size()) {
-      throw new IOException("Requested more dictionaries than defined in footer: " + currentDictionaryBatch);
+      throw new IOException(
+          "Requested more dictionaries than defined in footer: " + currentDictionaryBatch);
     }
     ArrowBlock block = footer.getDictionaries().get(currentDictionaryBatch++);
     return readDictionaryBatch(in, block, allocator);
@@ -170,23 +170,18 @@ public boolean loadNextBatch() throws IOException {
     }
   }
 
-
   public List<ArrowBlock> getDictionaryBlocks() throws IOException {
     ensureInitialized();
     return footer.getDictionaries();
   }
 
-  /**
-   * Returns the {@link ArrowBlock} metadata from the file.
-   */
+  /** Returns the {@link ArrowBlock} metadata from the file. */
   public List<ArrowBlock> getRecordBlocks() throws IOException {
     ensureInitialized();
     return footer.getRecordBatches();
   }
 
-  /**
-   * Loads record batch for the given block.
-   */
+  /** Loads record batch for the given block. */
   public boolean loadRecordBatch(ArrowBlock block) throws IOException {
     ensureInitialized();
     int blockIndex = footer.getRecordBatches().indexOf(block);
@@ -202,11 +197,13 @@ ArrowFooter getFooter() {
     return footer;
   }
 
-  private ArrowDictionaryBatch readDictionaryBatch(SeekableReadChannel in,
-                                                   ArrowBlock block,
-                                                   BufferAllocator allocator) throws IOException {
-    LOGGER.debug("DictionaryRecordBatch at {}, metadata: {}, body: {}",
-        block.getOffset(), block.getMetadataLength(), block.getBodyLength());
+  private ArrowDictionaryBatch readDictionaryBatch(
+      SeekableReadChannel in, ArrowBlock block, BufferAllocator allocator) throws IOException {
+    LOGGER.debug(
+        "DictionaryRecordBatch at {}, metadata: {}, body: {}",
+        block.getOffset(),
+        block.getMetadataLength(),
+        block.getBodyLength());
     in.setPosition(block.getOffset());
     ArrowDictionaryBatch batch = MessageSerializer.deserializeDictionaryBatch(in, block, allocator);
     if (batch == null) {
@@ -215,11 +212,12 @@ private ArrowDictionaryBatch readDictionaryBatch(SeekableReadChannel in,
     return batch;
   }
 
-  private ArrowRecordBatch readRecordBatch(SeekableReadChannel in,
-                                           ArrowBlock block,
-                                           BufferAllocator allocator) throws IOException {
-    LOGGER.debug("RecordBatch at {}, metadata: {}, body: {}",
-        block.getOffset(), block.getMetadataLength(),
+  private ArrowRecordBatch readRecordBatch(
+      SeekableReadChannel in, ArrowBlock block, BufferAllocator allocator) throws IOException {
+    LOGGER.debug(
+        "RecordBatch at {}, metadata: {}, body: {}",
+        block.getOffset(),
+        block.getMetadataLength(),
         block.getBodyLength());
     in.setPosition(block.getOffset());
     ArrowRecordBatch batch = MessageSerializer.deserializeRecordBatch(in, block, allocator);
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowFileWriter.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowFileWriter.java
index 71db79087a3e4..a873aaa860b26 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowFileWriter.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowFileWriter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import java.io.IOException;
@@ -24,7 +23,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-
 import org.apache.arrow.util.VisibleForTesting;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.compression.CompressionCodec;
@@ -41,7 +39,8 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * {@link ArrowWriter} that writes out a Arrow files (https://arrow.apache.org/docs/format/IPC.html#file-format).
+ * {@link ArrowWriter} that writes out a Arrow files
+ * (https://arrow.apache.org/docs/format/IPC.html#file-format).
  */
 public class ArrowFileWriter extends ArrowWriter {
 
@@ -54,36 +53,58 @@ public class ArrowFileWriter extends ArrowWriter {
   private Map<String, String> metaData;
   private boolean dictionariesWritten = false;
 
-  public ArrowFileWriter(VectorSchemaRoot root, DictionaryProvider provider, WritableByteChannel out) {
+  public ArrowFileWriter(
+      VectorSchemaRoot root, DictionaryProvider provider, WritableByteChannel out) {
     super(root, provider, out);
   }
 
-  public ArrowFileWriter(VectorSchemaRoot root, DictionaryProvider provider, WritableByteChannel out,
+  public ArrowFileWriter(
+      VectorSchemaRoot root,
+      DictionaryProvider provider,
+      WritableByteChannel out,
       Map<String, String> metaData) {
     super(root, provider, out);
     this.metaData = metaData;
   }
 
-  public ArrowFileWriter(VectorSchemaRoot root, DictionaryProvider provider, WritableByteChannel out,
+  public ArrowFileWriter(
+      VectorSchemaRoot root,
+      DictionaryProvider provider,
+      WritableByteChannel out,
       IpcOption option) {
     super(root, provider, out, option);
   }
 
-  public ArrowFileWriter(VectorSchemaRoot root, DictionaryProvider provider, WritableByteChannel out,
-                         Map<String, String> metaData, IpcOption option) {
+  public ArrowFileWriter(
+      VectorSchemaRoot root,
+      DictionaryProvider provider,
+      WritableByteChannel out,
+      Map<String, String> metaData,
+      IpcOption option) {
     super(root, provider, out, option);
     this.metaData = metaData;
   }
 
-  public ArrowFileWriter(VectorSchemaRoot root, DictionaryProvider provider, WritableByteChannel out,
-                         Map<String, String> metaData, IpcOption option, CompressionCodec.Factory compressionFactory,
-                         CompressionUtil.CodecType codecType) {
+  public ArrowFileWriter(
+      VectorSchemaRoot root,
+      DictionaryProvider provider,
+      WritableByteChannel out,
+      Map<String, String> metaData,
+      IpcOption option,
+      CompressionCodec.Factory compressionFactory,
+      CompressionUtil.CodecType codecType) {
     this(root, provider, out, metaData, option, compressionFactory, codecType, Optional.empty());
   }
 
-  public ArrowFileWriter(VectorSchemaRoot root, DictionaryProvider provider, WritableByteChannel out,
-                         Map<String, String> metaData, IpcOption option, CompressionCodec.Factory compressionFactory,
-                         CompressionUtil.CodecType codecType, Optional<Integer> compressionLevel) {
+  public ArrowFileWriter(
+      VectorSchemaRoot root,
+      DictionaryProvider provider,
+      WritableByteChannel out,
+      Map<String, String> metaData,
+      IpcOption option,
+      CompressionCodec.Factory compressionFactory,
+      CompressionUtil.CodecType codecType,
+      Optional<Integer> compressionLevel) {
     super(root, provider, out, option, compressionFactory, codecType, compressionLevel);
     this.metaData = metaData;
   }
@@ -115,7 +136,9 @@ protected void endInternal(WriteChannel out) throws IOException {
     out.writeIntLittleEndian(0);
 
     long footerStart = out.getCurrentPosition();
-    out.write(new ArrowFooter(schema, dictionaryBlocks, recordBlocks, metaData, option.metadataVersion), false);
+    out.write(
+        new ArrowFooter(schema, dictionaryBlocks, recordBlocks, metaData, option.metadataVersion),
+        false);
     int footerLength = (int) (out.getCurrentPosition() - footerStart);
     if (footerLength <= 0) {
       throw new InvalidArrowFileException("invalid footer");
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowMagic.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowMagic.java
index b16315caa9f51..e6a9aa5177f86 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowMagic.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowMagic.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import java.io.IOException;
@@ -22,11 +21,11 @@
 import java.util.Arrays;
 
 /**
- * Magic header/footer helpers for {@link ArrowFileWriter} and {@link ArrowFileReader} formatted files.
+ * Magic header/footer helpers for {@link ArrowFileWriter} and {@link ArrowFileReader} formatted
+ * files.
  */
 class ArrowMagic {
-  private ArrowMagic(){
-  }
+  private ArrowMagic() {}
 
   private static final byte[] MAGIC = "ARROW1".getBytes(StandardCharsets.UTF_8);
 
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowReader.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowReader.java
index 01f4e925c69b3..15ade38cd3d62 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowReader.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowReader.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import java.io.IOException;
@@ -24,7 +23,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.VectorLoader;
@@ -40,10 +38,7 @@
 import org.apache.arrow.vector.util.DictionaryUtility;
 import org.apache.arrow.vector.util.VectorBatchAppender;
 
-/**
- * Abstract class to read Schema and ArrowRecordBatches.
- *
- */
+/** Abstract class to read Schema and ArrowRecordBatches. */
 public abstract class ArrowReader implements DictionaryProvider, AutoCloseable {
 
   protected final BufferAllocator allocator;
@@ -64,7 +59,8 @@ protected ArrowReader(BufferAllocator allocator, CompressionCodec.Factory compre
   }
 
   /**
-   * Returns the vector schema root. This will be loaded with new values on every call to loadNextBatch.
+   * Returns the vector schema root. This will be loaded with new values on every call to
+   * loadNextBatch.
    *
    * @return the vector schema root
    * @throws IOException if reading of schema fails
@@ -121,8 +117,8 @@ public Set<Long> getDictionaryIds() {
   public abstract long bytesRead();
 
   /**
-   * Close resources, including vector schema root and dictionary vectors, and the
-   * underlying read source.
+   * Close resources, including vector schema root and dictionary vectors, and the underlying read
+   * source.
    *
    * @throws IOException on error
    */
@@ -178,9 +174,7 @@ protected void ensureInitialized() throws IOException {
     }
   }
 
-  /**
-   * Reads the schema and initializes the vectors.
-   */
+  /** Reads the schema and initializes the vectors. */
   protected void initialize() throws IOException {
     Schema originalSchema = readSchema();
     List<Field> fields = new ArrayList<>(originalSchema.getFields().size());
@@ -248,9 +242,9 @@ protected void loadDictionary(ArrowDictionaryBatch dictionaryBatch) {
   }
 
   private void load(ArrowDictionaryBatch dictionaryBatch, FieldVector vector) {
-    VectorSchemaRoot root = new VectorSchemaRoot(
-        Collections.singletonList(vector.getField()),
-        Collections.singletonList(vector), 0);
+    VectorSchemaRoot root =
+        new VectorSchemaRoot(
+            Collections.singletonList(vector.getField()), Collections.singletonList(vector), 0);
     VectorLoader loader = new VectorLoader(root, this.compressionFactory);
     try {
       loader.load(dictionaryBatch.getDictionary());
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowStreamReader.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowStreamReader.java
index a0096aaf3ee56..660c6a5f8986a 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowStreamReader.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowStreamReader.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
-
 import org.apache.arrow.flatbuf.MessageHeader;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
@@ -38,9 +36,7 @@
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.arrow.vector.validate.MetadataV4UnionChecker;
 
-/**
- * This class reads from an input stream and produces ArrowRecordBatches.
- */
+/** This class reads from an input stream and produces ArrowRecordBatches. */
 public class ArrowStreamReader extends ArrowReader {
 
   private MessageChannelReader messageReader;
@@ -55,7 +51,9 @@ public class ArrowStreamReader extends ArrowReader {
    * @param compressionFactory the factory to create compression codec.
    */
   public ArrowStreamReader(
-      MessageChannelReader messageReader, BufferAllocator allocator, CompressionCodec.Factory compressionFactory) {
+      MessageChannelReader messageReader,
+      BufferAllocator allocator,
+      CompressionCodec.Factory compressionFactory) {
     super(allocator, compressionFactory);
     this.messageReader = messageReader;
   }
@@ -78,7 +76,9 @@ public ArrowStreamReader(MessageChannelReader messageReader, BufferAllocator all
    * @param compressionFactory the factory to create compression codec.
    */
   public ArrowStreamReader(
-      ReadableByteChannel in, BufferAllocator allocator, CompressionCodec.Factory compressionFactory) {
+      ReadableByteChannel in,
+      BufferAllocator allocator,
+      CompressionCodec.Factory compressionFactory) {
     this(new MessageChannelReader(new ReadChannel(in), allocator), allocator, compressionFactory);
   }
 
@@ -157,25 +157,26 @@ public boolean loadNextBatch() throws IOException {
         bodyBuffer = allocator.getEmpty();
       }
 
-      ArrowRecordBatch batch = MessageSerializer.deserializeRecordBatch(result.getMessage(), bodyBuffer);
+      ArrowRecordBatch batch =
+          MessageSerializer.deserializeRecordBatch(result.getMessage(), bodyBuffer);
       loadRecordBatch(batch);
       checkDictionaries();
       return true;
     } else if (result.getMessage().headerType() == MessageHeader.DictionaryBatch) {
-      // if it's dictionary message, read dictionary message out and continue to read unless get a batch or eos.
+      // if it's dictionary message, read dictionary message out and continue to read unless get a
+      // batch or eos.
       ArrowDictionaryBatch dictionaryBatch = readDictionary(result);
       loadDictionary(dictionaryBatch);
       loadedDictionaryCount++;
       return loadNextBatch();
     } else {
-      throw new IOException("Expected RecordBatch or DictionaryBatch but header was " +
-          result.getMessage().headerType());
+      throw new IOException(
+          "Expected RecordBatch or DictionaryBatch but header was "
+              + result.getMessage().headerType());
     }
   }
 
-  /**
-   * When read a record batch, check whether its dictionaries are available.
-   */
+  /** When read a record batch, check whether its dictionaries are available. */
   private void checkDictionaries() throws IOException {
     // if all dictionaries are loaded, return.
     if (loadedDictionaryCount == dictionaries.size()) {
@@ -184,8 +185,10 @@ private void checkDictionaries() throws IOException {
     for (FieldVector vector : getVectorSchemaRoot().getFieldVectors()) {
       DictionaryEncoding encoding = vector.getField().getDictionary();
       if (encoding != null) {
-        // if the dictionaries it needs is not available and the vector is not all null, something was wrong.
-        if (!dictionaries.containsKey(encoding.getId()) && vector.getNullCount() < vector.getValueCount()) {
+        // if the dictionaries it needs is not available and the vector is not all null, something
+        // was wrong.
+        if (!dictionaries.containsKey(encoding.getId())
+            && vector.getNullCount() < vector.getValueCount()) {
           throw new IOException("The dictionary was not available, id was:" + encoding.getId());
         }
       }
@@ -210,11 +213,11 @@ protected Schema readSchema() throws IOException {
     }
 
     final Schema schema = MessageSerializer.deserializeSchema(result.getMessage());
-    MetadataV4UnionChecker.checkRead(schema, MetadataVersion.fromFlatbufID(result.getMessage().version()));
+    MetadataV4UnionChecker.checkRead(
+        schema, MetadataVersion.fromFlatbufID(result.getMessage().version()));
     return schema;
   }
 
-
   private ArrowDictionaryBatch readDictionary(MessageResult result) throws IOException {
 
     ArrowBuf bodyBuffer = result.getBodyBuffer();
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowStreamWriter.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowStreamWriter.java
index 928e1de4c5f6b..5e1a708653957 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowStreamWriter.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowStreamWriter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import java.io.IOException;
@@ -25,7 +24,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
@@ -37,9 +35,7 @@
 import org.apache.arrow.vector.ipc.message.IpcOption;
 import org.apache.arrow.vector.ipc.message.MessageSerializer;
 
-/**
- * Writer for the Arrow stream format to send ArrowRecordBatches over a WriteChannel.
- */
+/** Writer for the Arrow stream format to send ArrowRecordBatches over a WriteChannel. */
 public class ArrowStreamWriter extends ArrowWriter {
   private final Map<Long, FieldVector> previousDictionaries = new HashMap<>();
 
@@ -47,8 +43,8 @@ public class ArrowStreamWriter extends ArrowWriter {
    * Construct an ArrowStreamWriter with an optional DictionaryProvider for the OutputStream.
    *
    * @param root Existing VectorSchemaRoot with vectors to be written.
-   * @param provider DictionaryProvider for any vectors that are dictionary encoded.
-   *                 (Optional, can be null)
+   * @param provider DictionaryProvider for any vectors that are dictionary encoded. (Optional, can
+   *     be null)
    * @param out OutputStream for writing.
    */
   public ArrowStreamWriter(VectorSchemaRoot root, DictionaryProvider provider, OutputStream out) {
@@ -58,7 +54,8 @@ public ArrowStreamWriter(VectorSchemaRoot root, DictionaryProvider provider, Out
   /**
    * Construct an ArrowStreamWriter with an optional DictionaryProvider for the WritableByteChannel.
    */
-  public ArrowStreamWriter(VectorSchemaRoot root, DictionaryProvider provider, WritableByteChannel out) {
+  public ArrowStreamWriter(
+      VectorSchemaRoot root, DictionaryProvider provider, WritableByteChannel out) {
     this(root, provider, out, IpcOption.DEFAULT);
   }
 
@@ -66,12 +63,15 @@ public ArrowStreamWriter(VectorSchemaRoot root, DictionaryProvider provider, Wri
    * Construct an ArrowStreamWriter with an optional DictionaryProvider for the WritableByteChannel.
    *
    * @param root Existing VectorSchemaRoot with vectors to be written.
-   * @param provider DictionaryProvider for any vectors that are dictionary encoded.
-   *                 (Optional, can be null)
+   * @param provider DictionaryProvider for any vectors that are dictionary encoded. (Optional, can
+   *     be null)
    * @param option IPC write options
    * @param out WritableByteChannel for writing.
    */
-  public ArrowStreamWriter(VectorSchemaRoot root, DictionaryProvider provider, WritableByteChannel out,
+  public ArrowStreamWriter(
+      VectorSchemaRoot root,
+      DictionaryProvider provider,
+      WritableByteChannel out,
       IpcOption option) {
     super(root, provider, out, option);
   }
@@ -80,16 +80,20 @@ public ArrowStreamWriter(VectorSchemaRoot root, DictionaryProvider provider, Wri
    * Construct an ArrowStreamWriter with compression enabled.
    *
    * @param root Existing VectorSchemaRoot with vectors to be written.
-   * @param provider DictionaryProvider for any vectors that are dictionary encoded.
-   *                 (Optional, can be null)
+   * @param provider DictionaryProvider for any vectors that are dictionary encoded. (Optional, can
+   *     be null)
    * @param option IPC write options
    * @param compressionFactory Compression codec factory
    * @param codecType Codec type
    * @param out WritableByteChannel for writing.
    */
-  public ArrowStreamWriter(VectorSchemaRoot root, DictionaryProvider provider, WritableByteChannel out,
-                           IpcOption option, CompressionCodec.Factory compressionFactory,
-                           CompressionUtil.CodecType codecType) {
+  public ArrowStreamWriter(
+      VectorSchemaRoot root,
+      DictionaryProvider provider,
+      WritableByteChannel out,
+      IpcOption option,
+      CompressionCodec.Factory compressionFactory,
+      CompressionUtil.CodecType codecType) {
     this(root, provider, out, option, compressionFactory, codecType, Optional.empty());
   }
 
@@ -97,17 +101,22 @@ public ArrowStreamWriter(VectorSchemaRoot root, DictionaryProvider provider, Wri
    * Construct an ArrowStreamWriter with compression enabled.
    *
    * @param root Existing VectorSchemaRoot with vectors to be written.
-   * @param provider DictionaryProvider for any vectors that are dictionary encoded.
-   *                 (Optional, can be null)
+   * @param provider DictionaryProvider for any vectors that are dictionary encoded. (Optional, can
+   *     be null)
    * @param option IPC write options
    * @param compressionFactory Compression codec factory
    * @param codecType Codec type
    * @param compressionLevel Compression level
    * @param out WritableByteChannel for writing.
    */
-  public ArrowStreamWriter(VectorSchemaRoot root, DictionaryProvider provider, WritableByteChannel out,
-                           IpcOption option, CompressionCodec.Factory compressionFactory,
-                           CompressionUtil.CodecType codecType, Optional<Integer> compressionLevel) {
+  public ArrowStreamWriter(
+      VectorSchemaRoot root,
+      DictionaryProvider provider,
+      WritableByteChannel out,
+      IpcOption option,
+      CompressionCodec.Factory compressionFactory,
+      CompressionUtil.CodecType codecType,
+      Optional<Integer> compressionLevel) {
     super(root, provider, out, option, compressionFactory, codecType, compressionLevel);
   }
 
@@ -137,8 +146,8 @@ protected void ensureDictionariesWritten(DictionaryProvider provider, Set<Long>
     for (long id : dictionaryIdsUsed) {
       Dictionary dictionary = provider.lookup(id);
       FieldVector vector = dictionary.getVector();
-      if (previousDictionaries.containsKey(id) &&
-          VectorEqualsVisitor.vectorEquals(vector, previousDictionaries.get(id))) {
+      if (previousDictionaries.containsKey(id)
+          && VectorEqualsVisitor.vectorEquals(vector, previousDictionaries.get(id))) {
         // Dictionary was previously written and hasn't changed
         continue;
       }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowWriter.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowWriter.java
index 1cc201ae56f4b..c0f2b113bcb54 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowWriter.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowWriter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import java.io.IOException;
@@ -25,7 +24,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.VectorUnloader;
@@ -46,9 +44,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * Abstract base class for implementing Arrow writers for IPC over a WriteChannel.
- */
+/** Abstract base class for implementing Arrow writers for IPC over a WriteChannel. */
 public abstract class ArrowWriter implements AutoCloseable {
 
   protected static final Logger LOGGER = LoggerFactory.getLogger(ArrowWriter.class);
@@ -71,29 +67,45 @@ public abstract class ArrowWriter implements AutoCloseable {
 
   protected IpcOption option;
 
-  protected ArrowWriter(VectorSchemaRoot root, DictionaryProvider provider, WritableByteChannel out) {
+  protected ArrowWriter(
+      VectorSchemaRoot root, DictionaryProvider provider, WritableByteChannel out) {
     this(root, provider, out, IpcOption.DEFAULT);
   }
 
-  protected ArrowWriter(VectorSchemaRoot root, DictionaryProvider provider, WritableByteChannel out, IpcOption option) {
-    this(root, provider, out, option, NoCompressionCodec.Factory.INSTANCE, CompressionUtil.CodecType.NO_COMPRESSION,
-            Optional.empty());
+  protected ArrowWriter(
+      VectorSchemaRoot root,
+      DictionaryProvider provider,
+      WritableByteChannel out,
+      IpcOption option) {
+    this(
+        root,
+        provider,
+        out,
+        option,
+        NoCompressionCodec.Factory.INSTANCE,
+        CompressionUtil.CodecType.NO_COMPRESSION,
+        Optional.empty());
   }
 
   /**
    * Note: fields are not closed when the writer is closed.
    *
-   * @param root               the vectors to write to the output
-   * @param provider           where to find the dictionaries
-   * @param out                the output where to write
-   * @param option             IPC write options
+   * @param root the vectors to write to the output
+   * @param provider where to find the dictionaries
+   * @param out the output where to write
+   * @param option IPC write options
    * @param compressionFactory Compression codec factory
-   * @param codecType          Compression codec
-   * @param compressionLevel   Compression level
+   * @param codecType Compression codec
+   * @param compressionLevel Compression level
    */
-  protected ArrowWriter(VectorSchemaRoot root, DictionaryProvider provider, WritableByteChannel out, IpcOption option,
-                        CompressionCodec.Factory compressionFactory, CompressionUtil.CodecType codecType,
-                        Optional<Integer> compressionLevel) {
+  protected ArrowWriter(
+      VectorSchemaRoot root,
+      DictionaryProvider provider,
+      WritableByteChannel out,
+      IpcOption option,
+      CompressionCodec.Factory compressionFactory,
+      CompressionUtil.CodecType codecType,
+      Optional<Integer> compressionLevel) {
     this.out = new WriteChannel(out);
     this.option = option;
     this.dictionaryProvider = provider;
@@ -101,15 +113,17 @@ protected ArrowWriter(VectorSchemaRoot root, DictionaryProvider provider, Writab
     this.compressionFactory = compressionFactory;
     this.codecType = codecType;
     this.compressionLevel = compressionLevel;
-    this.codec = this.compressionLevel.isPresent() ?
-            this.compressionFactory.createCodec(this.codecType, this.compressionLevel.get()) :
-            this.compressionFactory.createCodec(this.codecType);
-    this.unloader = new VectorUnloader(root, /*includeNullCount*/ true, codec,
-        /*alignBuffers*/ true);
+    this.codec =
+        this.compressionLevel.isPresent()
+            ? this.compressionFactory.createCodec(this.codecType, this.compressionLevel.get())
+            : this.compressionFactory.createCodec(this.codecType);
+    this.unloader =
+        new VectorUnloader(root, /*includeNullCount*/ true, codec, /*alignBuffers*/ true);
 
     List<Field> fields = new ArrayList<>(root.getSchema().getFields().size());
 
-    MetadataV4UnionChecker.checkForUnion(root.getSchema().getFields().iterator(), option.metadataVersion);
+    MetadataV4UnionChecker.checkForUnion(
+        root.getSchema().getFields().iterator(), option.metadataVersion);
     // Convert fields with dictionaries to have dictionary type
     for (Field field : root.getSchema().getFields()) {
       fields.add(DictionaryUtility.toMessageFormat(field, provider, dictionaryIdsUsed));
@@ -122,9 +136,7 @@ public void start() throws IOException {
     ensureStarted();
   }
 
-  /**
-   * Writes the record batch currently loaded in this instance's VectorSchemaRoot.
-   */
+  /** Writes the record batch currently loaded in this instance's VectorSchemaRoot. */
   public void writeBatch() throws IOException {
     ensureStarted();
     ensureDictionariesWritten(dictionaryProvider, dictionaryIdsUsed);
@@ -137,12 +149,11 @@ protected void writeDictionaryBatch(Dictionary dictionary) throws IOException {
     FieldVector vector = dictionary.getVector();
     long id = dictionary.getEncoding().getId();
     int count = vector.getValueCount();
-    VectorSchemaRoot dictRoot = new VectorSchemaRoot(
-        Collections.singletonList(vector.getField()),
-        Collections.singletonList(vector),
-        count);
-    VectorUnloader unloader = new VectorUnloader(dictRoot, /*includeNullCount*/ true, this.codec,
-        /*alignBuffers*/ true);
+    VectorSchemaRoot dictRoot =
+        new VectorSchemaRoot(
+            Collections.singletonList(vector.getField()), Collections.singletonList(vector), count);
+    VectorUnloader unloader =
+        new VectorUnloader(dictRoot, /*includeNullCount*/ true, this.codec, /*alignBuffers*/ true);
     ArrowRecordBatch batch = unloader.getRecordBatch();
     ArrowDictionaryBatch dictionaryBatch = new ArrowDictionaryBatch(id, batch, false);
     try {
@@ -159,8 +170,11 @@ protected void writeDictionaryBatch(Dictionary dictionary) throws IOException {
   protected ArrowBlock writeDictionaryBatch(ArrowDictionaryBatch batch) throws IOException {
     ArrowBlock block = MessageSerializer.serialize(out, batch, option);
     if (LOGGER.isDebugEnabled()) {
-      LOGGER.debug("DictionaryRecordBatch at {}, metadata: {}, body: {}",
-          block.getOffset(), block.getMetadataLength(), block.getBodyLength());
+      LOGGER.debug(
+          "DictionaryRecordBatch at {}, metadata: {}, body: {}",
+          block.getOffset(),
+          block.getMetadataLength(),
+          block.getBodyLength());
     }
     return block;
   }
@@ -168,8 +182,11 @@ protected ArrowBlock writeDictionaryBatch(ArrowDictionaryBatch batch) throws IOE
   protected ArrowBlock writeRecordBatch(ArrowRecordBatch batch) throws IOException {
     ArrowBlock block = MessageSerializer.serialize(out, batch, option);
     if (LOGGER.isDebugEnabled()) {
-      LOGGER.debug("RecordBatch at {}, metadata: {}, body: {}",
-          block.getOffset(), block.getMetadataLength(), block.getBodyLength());
+      LOGGER.debug(
+          "RecordBatch at {}, metadata: {}, body: {}",
+          block.getOffset(),
+          block.getMetadataLength(),
+          block.getBodyLength());
     }
     return block;
   }
@@ -194,11 +211,11 @@ private void ensureStarted() throws IOException {
   }
 
   /**
-   * Write dictionaries after schema and before recordBatches, dictionaries won't be
-   * written if empty stream (only has schema data in IPC).
+   * Write dictionaries after schema and before recordBatches, dictionaries won't be written if
+   * empty stream (only has schema data in IPC).
    */
-  protected abstract void ensureDictionariesWritten(DictionaryProvider provider, Set<Long> dictionaryIdsUsed)
-      throws IOException;
+  protected abstract void ensureDictionariesWritten(
+      DictionaryProvider provider, Set<Long> dictionaryIdsUsed) throws IOException;
 
   private void ensureEnded() throws IOException {
     if (!ended) {
@@ -207,11 +224,9 @@ private void ensureEnded() throws IOException {
     }
   }
 
-  protected void startInternal(WriteChannel out) throws IOException {
-  }
+  protected void startInternal(WriteChannel out) throws IOException {}
 
-  protected void endInternal(WriteChannel out) throws IOException {
-  }
+  protected void endInternal(WriteChannel out) throws IOException {}
 
   @Override
   public void close() {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/InvalidArrowFileException.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/InvalidArrowFileException.java
index e234058e68515..5e2531610c632 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/InvalidArrowFileException.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/InvalidArrowFileException.java
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 /**
- * Exception indicating a problem with an Arrow File (https://arrow.apache.org/docs/format/IPC.html#file-format).
+ * Exception indicating a problem with an Arrow File
+ * (https://arrow.apache.org/docs/format/IPC.html#file-format).
  */
 public class InvalidArrowFileException extends RuntimeException {
   private static final long serialVersionUID = 1L;
@@ -26,5 +26,4 @@ public class InvalidArrowFileException extends RuntimeException {
   public InvalidArrowFileException(String message) {
     super(message);
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileReader.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileReader.java
index e927acd4816ad..604f18b56b5c7 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileReader.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileReader.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import static com.fasterxml.jackson.core.JsonToken.END_ARRAY;
@@ -25,24 +24,34 @@
 import static org.apache.arrow.vector.BufferLayout.BufferType.OFFSET;
 import static org.apache.arrow.vector.BufferLayout.BufferType.TYPE;
 import static org.apache.arrow.vector.BufferLayout.BufferType.VALIDITY;
+import static org.apache.arrow.vector.BufferLayout.BufferType.VARIADIC_DATA_BUFFERS;
+import static org.apache.arrow.vector.BufferLayout.BufferType.VIEWS;
 
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonParser.Feature;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.databind.MappingJsonFactory;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.Preconditions;
+import org.apache.arrow.vector.BaseVariableWidthViewVector;
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.BitVectorHelper;
 import org.apache.arrow.vector.BufferLayout.BufferType;
@@ -61,8 +70,9 @@
 import org.apache.arrow.vector.dictionary.Dictionary;
 import org.apache.arrow.vector.dictionary.DictionaryProvider;
 import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
-import org.apache.arrow.vector.types.Types;
+import org.apache.arrow.vector.types.Types.MinorType;
 import org.apache.arrow.vector.types.pojo.ArrowType;
+import org.apache.arrow.vector.types.pojo.ArrowType.Union;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.arrow.vector.util.DecimalUtility;
@@ -70,15 +80,9 @@
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.binary.Hex;
 
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.MappingJsonFactory;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 /**
- * A reader for JSON files that translates them into vectors. This reader is used for integration tests.
+ * A reader for JSON files that translates them into vectors. This reader is used for integration
+ * tests.
  *
  * <p>This class uses a streaming parser API, method naming tends to reflect this implementation
  * detail.
@@ -92,19 +96,22 @@ public class JsonFileReader implements AutoCloseable, DictionaryProvider {
 
   /**
    * Constructs a new instance.
+   *
    * @param inputFile The file to read.
    * @param allocator The allocator to use for allocating buffers.
    */
-  public JsonFileReader(File inputFile, BufferAllocator allocator) throws JsonParseException, IOException {
+  public JsonFileReader(File inputFile, BufferAllocator allocator)
+      throws JsonParseException, IOException {
     super();
     this.allocator = allocator;
-    MappingJsonFactory jsonFactory = new MappingJsonFactory(new ObjectMapper()
-        //ignore case for enums
-        .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS, true)
-    );
+    MappingJsonFactory jsonFactory =
+        new MappingJsonFactory(
+            new ObjectMapper()
+                // ignore case for enums
+                .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS, true));
     this.parser = jsonFactory.createParser(inputFile);
     // Allow reading NaN for floating point values
-    this.parser.configure(JsonParser.Feature.ALLOW_NON_NUMERIC_NUMBERS, true);
+    this.parser.configure(Feature.ALLOW_NON_NUMERIC_NUMBERS, true);
   }
 
   @Override
@@ -157,7 +164,8 @@ private void readDictionaryBatches() throws JsonParseException, IOException {
       long id = readNextField("id", Long.class);
       Dictionary dict = dictionaries.get(id);
       if (dict == null) {
-        throw new IllegalArgumentException("Dictionary with id: " + id + " missing encoding from schema Field");
+        throw new IllegalArgumentException(
+            "Dictionary with id: " + id + " missing encoding from schema Field");
       }
 
       // Read the dictionary record batch
@@ -174,14 +182,12 @@ private void readDictionaryBatches() throws JsonParseException, IOException {
     }
 
     if (token != END_ARRAY) {
-      throw new IllegalArgumentException("Invalid token: " + token + " expected end of array at " +
-        parser.getTokenLocation());
+      throw new IllegalArgumentException(
+          "Invalid token: " + token + " expected end of array at " + parser.getTokenLocation());
     }
   }
 
-  /**
-   * Reads the next record batch from the file into <code>root</code>.
-   */
+  /** Reads the next record batch from the file into <code>root</code>. */
   public boolean read(VectorSchemaRoot root) throws IOException {
     JsonToken t = parser.nextToken();
     if (t == START_OBJECT) {
@@ -208,9 +214,7 @@ public boolean read(VectorSchemaRoot root) throws IOException {
     }
   }
 
-  /**
-   * Returns the next record batch from the file.
-   */
+  /** Returns the next record batch from the file. */
   public VectorSchemaRoot read() throws IOException {
     JsonToken t = parser.nextToken();
     if (t == START_OBJECT) {
@@ -270,250 +274,364 @@ ArrowBuf readBuffer(BufferAllocator allocator, int count) throws IOException {
     }
   }
 
-  private class BufferHelper {
-    BufferReader BIT = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        final int bufferSize = BitVectorHelper.getValidityBufferSize(count);
-        ArrowBuf buf = allocator.buffer(bufferSize);
-
-        // C++ integration test fails without this.
-        buf.setZero(0, bufferSize);
-
-        for (int i = 0; i < count; i++) {
-          parser.nextToken();
-          BitVectorHelper.setValidityBit(buf, i, parser.readValueAs(Boolean.class) ? 1 : 0);
-        }
-
-        buf.writerIndex(bufferSize);
-        return buf;
+  /**
+   * Read all the variadic data buffers from the parser.
+   *
+   * @param allocator BufferAllocator
+   * @param variadicBuffersCount Number of variadic buffers
+   * @return List of ArrowBuf
+   * @throws IOException throws IOException in a failure
+   */
+  List<ArrowBuf> readVariadicBuffers(BufferAllocator allocator, int variadicBuffersCount)
+      throws IOException {
+    readToken(START_ARRAY);
+    ArrayList<ArrowBuf> dataBuffers = new ArrayList<>(variadicBuffersCount);
+    for (int i = 0; i < variadicBuffersCount; i++) {
+      parser.nextToken();
+      final byte[] value;
+
+      String variadicStr = parser.readValueAs(String.class);
+      if (variadicStr == null) {
+        value = new byte[0];
+      } else {
+        value = decodeHexSafe(variadicStr);
       }
-    };
-
-    BufferReader DAY_MILLIS = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        final long size = (long) count * IntervalDayVector.TYPE_WIDTH;
-        ArrowBuf buf = allocator.buffer(size);
-
-        for (int i = 0; i < count; i++) {
-          readToken(START_OBJECT);
-          buf.writeInt(readNextField("days", Integer.class));
-          buf.writeInt(readNextField("milliseconds", Integer.class));
-          readToken(END_OBJECT);
-        }
 
-        return buf;
-      }
-    };
-
-    BufferReader MONTH_DAY_NANOS = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        final long size = (long) count * IntervalMonthDayNanoVector.TYPE_WIDTH;
-        ArrowBuf buf = allocator.buffer(size);
-
-        for (int i = 0; i < count; i++) {
-          readToken(START_OBJECT);
-          buf.writeInt(readNextField("months", Integer.class));
-          buf.writeInt(readNextField("days", Integer.class));
-          buf.writeLong(readNextField("nanoseconds", Long.class));
-          readToken(END_OBJECT);
+      ArrowBuf buf = allocator.buffer(value.length);
+      buf.writeBytes(value);
+      dataBuffers.add(buf);
+    }
+    readToken(END_ARRAY);
+    return dataBuffers;
+  }
+
+  private ArrowBuf readViewBuffers(
+      BufferAllocator allocator, int count, List<Integer> variadicBufferIndices, MinorType type)
+      throws IOException {
+    readToken(START_ARRAY);
+    ArrayList<byte[]> values = new ArrayList<>(count);
+    long bufferSize = 0L;
+    for (int i = 0; i < count; i++) {
+      readToken(START_OBJECT);
+      final int length = readNextField("SIZE", Integer.class);
+      byte[] value;
+      if (length > BaseVariableWidthViewVector.INLINE_SIZE) {
+        // PREFIX_HEX
+        final byte[] prefix = decodeHexSafe(readNextField("PREFIX_HEX", String.class));
+        // BUFFER_INDEX
+        final int bufferIndex = readNextField("BUFFER_INDEX", Integer.class);
+        if (variadicBufferIndices.isEmpty()) {
+          variadicBufferIndices.add(bufferIndex);
+        } else {
+          int lastBufferIndex = variadicBufferIndices.get(variadicBufferIndices.size() - 1);
+          if (lastBufferIndex != bufferIndex) {
+            variadicBufferIndices.add(bufferIndex);
+          }
         }
 
-        return buf;
+        // OFFSET
+        final int offset = readNextField("OFFSET", Integer.class);
+        ByteBuffer buffer =
+            ByteBuffer.allocate(BaseVariableWidthViewVector.ELEMENT_SIZE)
+                .order(ByteOrder.LITTLE_ENDIAN); // Allocate a ByteBuffer of size 16 bytes
+        buffer.putInt(length); // Write 'length' to bytes 0-3
+        buffer.put(prefix); // Write 'prefix' to bytes 4-7
+        buffer.putInt(bufferIndex); // Write 'bufferIndex' to bytes 8-11
+        buffer.putInt(offset); // Write 'offset' to bytes 12-15
+        value = buffer.array(); // Convert the ByteBuffer to a byte array
+      } else {
+        // in-line
+        ByteBuffer buffer =
+            ByteBuffer.allocate(BaseVariableWidthViewVector.ELEMENT_SIZE)
+                .order(ByteOrder.LITTLE_ENDIAN); // Allocate a ByteBuffer of size 16 bytes
+        buffer.putInt(length); // Write 'length' to bytes 0-3
+        // INLINE
+        if (type == MinorType.VIEWVARCHAR) {
+          buffer.put(readNextField("INLINED", String.class).getBytes(StandardCharsets.UTF_8));
+        } else {
+          String inlined = readNextField("INLINED", String.class);
+          if (inlined == null) {
+            buffer.put(new byte[length]);
+          } else {
+            buffer.put(decodeHexSafe(inlined));
+          }
+        }
+        value = buffer.array(); // Convert the ByteBuffer to a byte array
       }
-    };
+      values.add(value);
+      bufferSize += value.length;
+      readToken(END_OBJECT);
+    }
 
+    ArrowBuf buf = allocator.buffer(bufferSize);
 
-    BufferReader INT1 = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        final long size = (long) count * TinyIntVector.TYPE_WIDTH;
-        ArrowBuf buf = allocator.buffer(size);
+    for (byte[] value : values) {
+      buf.writeBytes(value);
+    }
+    readToken(END_ARRAY);
+    return buf;
+  }
 
-        for (int i = 0; i < count; i++) {
-          parser.nextToken();
-          buf.writeByte(parser.getByteValue());
-        }
+  private class BufferHelper {
 
-        return buf;
-      }
-    };
+    BufferReader BIT =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            final int bufferSize = BitVectorHelper.getValidityBufferSize(count);
+            ArrowBuf buf = allocator.buffer(bufferSize);
 
-    BufferReader INT2 = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        final long size = (long) count * SmallIntVector.TYPE_WIDTH;
-        ArrowBuf buf = allocator.buffer(size);
+            // C++ integration test fails without this.
+            buf.setZero(0, bufferSize);
 
-        for (int i = 0; i < count; i++) {
-          parser.nextToken();
-          buf.writeShort(parser.getShortValue());
-        }
+            for (int i = 0; i < count; i++) {
+              parser.nextToken();
+              BitVectorHelper.setValidityBit(buf, i, parser.readValueAs(Boolean.class) ? 1 : 0);
+            }
 
-        return buf;
-      }
-    };
+            buf.writerIndex(bufferSize);
+            return buf;
+          }
+        };
+
+    BufferReader DAY_MILLIS =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            final long size = (long) count * IntervalDayVector.TYPE_WIDTH;
+            ArrowBuf buf = allocator.buffer(size);
+
+            for (int i = 0; i < count; i++) {
+              readToken(START_OBJECT);
+              buf.writeInt(readNextField("days", Integer.class));
+              buf.writeInt(readNextField("milliseconds", Integer.class));
+              readToken(END_OBJECT);
+            }
+
+            return buf;
+          }
+        };
+
+    BufferReader MONTH_DAY_NANOS =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            final long size = (long) count * IntervalMonthDayNanoVector.TYPE_WIDTH;
+            ArrowBuf buf = allocator.buffer(size);
+
+            for (int i = 0; i < count; i++) {
+              readToken(START_OBJECT);
+              buf.writeInt(readNextField("months", Integer.class));
+              buf.writeInt(readNextField("days", Integer.class));
+              buf.writeLong(readNextField("nanoseconds", Long.class));
+              readToken(END_OBJECT);
+            }
+
+            return buf;
+          }
+        };
 
-    BufferReader INT4 = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        final long size = (long) count * IntVector.TYPE_WIDTH;
-        ArrowBuf buf = allocator.buffer(size);
+    BufferReader INT1 =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            final long size = (long) count * TinyIntVector.TYPE_WIDTH;
+            ArrowBuf buf = allocator.buffer(size);
 
-        for (int i = 0; i < count; i++) {
-          parser.nextToken();
-          buf.writeInt(parser.getIntValue());
-        }
+            for (int i = 0; i < count; i++) {
+              parser.nextToken();
+              buf.writeByte(parser.getByteValue());
+            }
 
-        return buf;
-      }
-    };
-
-    BufferReader INT8 = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        final long size = (long) count * BigIntVector.TYPE_WIDTH;
-        ArrowBuf buf = allocator.buffer(size);
-
-        for (int i = 0; i < count; i++) {
-          parser.nextToken();
-          String value = parser.getValueAsString();
-          buf.writeLong(Long.valueOf(value));
-        }
+            return buf;
+          }
+        };
 
-        return buf;
-      }
-    };
+    BufferReader INT2 =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            final long size = (long) count * SmallIntVector.TYPE_WIDTH;
+            ArrowBuf buf = allocator.buffer(size);
 
-    BufferReader UINT1 = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        final long size = (long) count * TinyIntVector.TYPE_WIDTH;
-        ArrowBuf buf = allocator.buffer(size);
+            for (int i = 0; i < count; i++) {
+              parser.nextToken();
+              buf.writeShort(parser.getShortValue());
+            }
 
-        for (int i = 0; i < count; i++) {
-          parser.nextToken();
-          buf.writeByte(parser.getShortValue() & 0xFF);
-        }
+            return buf;
+          }
+        };
 
-        return buf;
-      }
-    };
+    BufferReader INT4 =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            final long size = (long) count * IntVector.TYPE_WIDTH;
+            ArrowBuf buf = allocator.buffer(size);
 
-    BufferReader UINT2 = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        final long size = (long) count * SmallIntVector.TYPE_WIDTH;
-        ArrowBuf buf = allocator.buffer(size);
+            for (int i = 0; i < count; i++) {
+              parser.nextToken();
+              buf.writeInt(parser.getIntValue());
+            }
 
-        for (int i = 0; i < count; i++) {
-          parser.nextToken();
-          buf.writeShort(parser.getIntValue() & 0xFFFF);
-        }
+            return buf;
+          }
+        };
+
+    BufferReader INT8 =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            final long size = (long) count * BigIntVector.TYPE_WIDTH;
+            ArrowBuf buf = allocator.buffer(size);
+
+            for (int i = 0; i < count; i++) {
+              parser.nextToken();
+              String value = parser.getValueAsString();
+              buf.writeLong(Long.valueOf(value));
+            }
+
+            return buf;
+          }
+        };
 
-        return buf;
-      }
-    };
+    BufferReader UINT1 =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            final long size = (long) count * TinyIntVector.TYPE_WIDTH;
+            ArrowBuf buf = allocator.buffer(size);
 
-    BufferReader UINT4 = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        final long size = (long) count * IntVector.TYPE_WIDTH;
-        ArrowBuf buf = allocator.buffer(size);
+            for (int i = 0; i < count; i++) {
+              parser.nextToken();
+              buf.writeByte(parser.getShortValue() & 0xFF);
+            }
 
-        for (int i = 0; i < count; i++) {
-          parser.nextToken();
-          buf.writeInt((int) parser.getLongValue());
-        }
+            return buf;
+          }
+        };
 
-        return buf;
-      }
-    };
-
-    BufferReader UINT8 = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        final long size = (long) count * BigIntVector.TYPE_WIDTH;
-        ArrowBuf buf = allocator.buffer(size);
-
-        for (int i = 0; i < count; i++) {
-          parser.nextToken();
-          BigInteger value = new BigInteger(parser.getValueAsString());
-          buf.writeLong(value.longValue());
-        }
+    BufferReader UINT2 =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            final long size = (long) count * SmallIntVector.TYPE_WIDTH;
+            ArrowBuf buf = allocator.buffer(size);
 
-        return buf;
-      }
-    };
+            for (int i = 0; i < count; i++) {
+              parser.nextToken();
+              buf.writeShort(parser.getIntValue() & 0xFFFF);
+            }
 
-    BufferReader FLOAT4 = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        final long size = (long) count * Float4Vector.TYPE_WIDTH;
-        ArrowBuf buf = allocator.buffer(size);
+            return buf;
+          }
+        };
 
-        for (int i = 0; i < count; i++) {
-          parser.nextToken();
-          buf.writeFloat(parser.getFloatValue());
-        }
+    BufferReader UINT4 =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            final long size = (long) count * IntVector.TYPE_WIDTH;
+            ArrowBuf buf = allocator.buffer(size);
 
-        return buf;
-      }
-    };
+            for (int i = 0; i < count; i++) {
+              parser.nextToken();
+              buf.writeInt((int) parser.getLongValue());
+            }
 
-    BufferReader FLOAT8 = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        final long size = (long) count * Float8Vector.TYPE_WIDTH;
-        ArrowBuf buf = allocator.buffer(size);
+            return buf;
+          }
+        };
+
+    BufferReader UINT8 =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            final long size = (long) count * BigIntVector.TYPE_WIDTH;
+            ArrowBuf buf = allocator.buffer(size);
+
+            for (int i = 0; i < count; i++) {
+              parser.nextToken();
+              BigInteger value = new BigInteger(parser.getValueAsString());
+              buf.writeLong(value.longValue());
+            }
+
+            return buf;
+          }
+        };
 
-        for (int i = 0; i < count; i++) {
-          parser.nextToken();
-          buf.writeDouble(parser.getDoubleValue());
-        }
+    BufferReader FLOAT4 =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            final long size = (long) count * Float4Vector.TYPE_WIDTH;
+            ArrowBuf buf = allocator.buffer(size);
 
-        return buf;
-      }
-    };
-
-    BufferReader DECIMAL = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        final long size = (long) count * DecimalVector.TYPE_WIDTH;
-        ArrowBuf buf = allocator.buffer(size);
-
-        for (int i = 0; i < count; i++) {
-          parser.nextToken();
-          BigDecimal decimalValue = new BigDecimal(parser.readValueAs(String.class));
-          DecimalUtility.writeBigDecimalToArrowBuf(decimalValue, buf, i, DecimalVector.TYPE_WIDTH);
-        }
+            for (int i = 0; i < count; i++) {
+              parser.nextToken();
+              buf.writeFloat(parser.getFloatValue());
+            }
 
-        buf.writerIndex(size);
-        return buf;
-      }
-    };
-
-    BufferReader DECIMAL256 = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        final long size = (long) count * Decimal256Vector.TYPE_WIDTH;
-        ArrowBuf buf = allocator.buffer(size);
-
-        for (int i = 0; i < count; i++) {
-          parser.nextToken();
-          BigDecimal decimalValue = new BigDecimal(parser.readValueAs(String.class));
-          DecimalUtility.writeBigDecimalToArrowBuf(decimalValue, buf, i, Decimal256Vector.TYPE_WIDTH);
-        }
+            return buf;
+          }
+        };
 
-        buf.writerIndex(size);
-        return buf;
-      }
-    };
+    BufferReader FLOAT8 =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            final long size = (long) count * Float8Vector.TYPE_WIDTH;
+            ArrowBuf buf = allocator.buffer(size);
+
+            for (int i = 0; i < count; i++) {
+              parser.nextToken();
+              buf.writeDouble(parser.getDoubleValue());
+            }
+
+            return buf;
+          }
+        };
+
+    BufferReader DECIMAL =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            final long size = (long) count * DecimalVector.TYPE_WIDTH;
+            ArrowBuf buf = allocator.buffer(size);
+
+            for (int i = 0; i < count; i++) {
+              parser.nextToken();
+              BigDecimal decimalValue = new BigDecimal(parser.readValueAs(String.class));
+              DecimalUtility.writeBigDecimalToArrowBuf(
+                  decimalValue, buf, i, DecimalVector.TYPE_WIDTH);
+            }
+
+            buf.writerIndex(size);
+            return buf;
+          }
+        };
+
+    BufferReader DECIMAL256 =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            final long size = (long) count * Decimal256Vector.TYPE_WIDTH;
+            ArrowBuf buf = allocator.buffer(size);
+
+            for (int i = 0; i < count; i++) {
+              parser.nextToken();
+              BigDecimal decimalValue = new BigDecimal(parser.readValueAs(String.class));
+              DecimalUtility.writeBigDecimalToArrowBuf(
+                  decimalValue, buf, i, Decimal256Vector.TYPE_WIDTH);
+            }
+
+            buf.writerIndex(size);
+            return buf;
+          }
+        };
 
-    ArrowBuf readBinaryValues(
-        BufferAllocator allocator, int count) throws IOException {
+    ArrowBuf readBinaryValues(BufferAllocator allocator, int count) throws IOException {
       ArrayList<byte[]> values = new ArrayList<>(count);
       long bufferSize = 0L;
       for (int i = 0; i < count; i++) {
@@ -532,8 +650,7 @@ ArrowBuf readBinaryValues(
       return buf;
     }
 
-    ArrowBuf readStringValues(
-        BufferAllocator allocator, int count) throws IOException {
+    ArrowBuf readStringValues(BufferAllocator allocator, int count) throws IOException {
       ArrayList<byte[]> values = new ArrayList<>(count);
       long bufferSize = 0L;
       for (int i = 0; i < count; i++) {
@@ -552,56 +669,65 @@ ArrowBuf readStringValues(
       return buf;
     }
 
-    BufferReader FIXEDSIZEBINARY = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        return readBinaryValues(allocator, count);
-      }
-    };
+    BufferReader FIXEDSIZEBINARY =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            return readBinaryValues(allocator, count);
+          }
+        };
 
-    BufferReader VARCHAR = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        return readStringValues(allocator, count);
-      }
-    };
+    BufferReader VARCHAR =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            return readStringValues(allocator, count);
+          }
+        };
 
-    BufferReader LARGEVARCHAR = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        return readStringValues(allocator, count);
-      }
-    };
+    BufferReader LARGEVARCHAR =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            return readStringValues(allocator, count);
+          }
+        };
 
-    BufferReader VARBINARY = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        return readBinaryValues(allocator, count);
-      }
-    };
+    BufferReader VARBINARY =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            return readBinaryValues(allocator, count);
+          }
+        };
 
-    BufferReader LARGEVARBINARY = new BufferReader() {
-      @Override
-      protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
-        return readBinaryValues(allocator, count);
-      }
-    };
+    BufferReader LARGEVARBINARY =
+        new BufferReader() {
+          @Override
+          protected ArrowBuf read(BufferAllocator allocator, int count) throws IOException {
+            return readBinaryValues(allocator, count);
+          }
+        };
   }
 
-  private ArrowBuf readIntoBuffer(BufferAllocator allocator, BufferType bufferType,
-                                  Types.MinorType type, int count) throws IOException {
+  private List<ArrowBuf> readIntoBuffer(
+      BufferAllocator allocator,
+      BufferType bufferType,
+      MinorType type,
+      int count,
+      List<Integer> variadicBufferIndices)
+      throws IOException {
     ArrowBuf buf;
 
     BufferHelper helper = new BufferHelper();
-
-    BufferReader reader = null;
+    BufferReader reader;
 
     if (bufferType.equals(VALIDITY)) {
       reader = helper.BIT;
     } else if (bufferType.equals(OFFSET)) {
-      if (type == Types.MinorType.LARGELIST ||
-          type == Types.MinorType.LARGEVARCHAR ||
-          type == Types.MinorType.LARGEVARBINARY) {
+      if (type == MinorType.LARGELIST
+          || type == MinorType.LARGEVARCHAR
+          || type == MinorType.LARGEVARBINARY) {
         reader = helper.INT8;
       } else {
         reader = helper.INT4;
@@ -703,23 +829,32 @@ private ArrowBuf readIntoBuffer(BufferAllocator allocator, BufferType bufferType
         default:
           throw new UnsupportedOperationException("Cannot read array of type " + type);
       }
+    } else if (bufferType.equals(VIEWS)) {
+      return Collections.singletonList(
+          readViewBuffers(allocator, count, variadicBufferIndices, type));
+    } else if (bufferType.equals(VARIADIC_DATA_BUFFERS)) {
+      return readVariadicBuffers(allocator, variadicBufferIndices.size());
     } else {
       throw new InvalidArrowFileException("Unrecognized buffer type " + bufferType);
     }
 
     buf = reader.readBuffer(allocator, count);
-
     Preconditions.checkNotNull(buf);
-    return buf;
+    return Collections.singletonList(buf);
   }
 
-  private void readFromJsonIntoVector(Field field, FieldVector vector) throws JsonParseException, IOException {
+  private void readFromJsonIntoVector(Field field, FieldVector vector) throws IOException {
     ArrowType type = field.getType();
     TypeLayout typeLayout = TypeLayout.getTypeLayout(type);
     List<BufferType> vectorTypes = typeLayout.getBufferTypes();
-    ArrowBuf[] vectorBuffers = new ArrowBuf[vectorTypes.size()];
+    List<ArrowBuf> vectorBuffers = new ArrayList<>(vectorTypes.size());
+    List<Integer> variadicBufferIndices = new ArrayList<>();
+
+    if (!typeLayout.isFixedBufferCount()) {
+      vectorTypes.add(VARIADIC_DATA_BUFFERS);
+    }
     /*
-     * The order of inner buffers is :
+     * The order of inner buffers is:
      * Fixed width vector:
      *    -- validity buffer
      *    -- data buffer
@@ -738,35 +873,43 @@ private void readFromJsonIntoVector(Field field, FieldVector vector) throws Json
       // If currently reading dictionaries, field name is not important so don't check
       String name = readNextField("name", String.class);
       if (started && !Objects.equals(field.getName(), name)) {
-        throw new IllegalArgumentException("Expected field " + field.getName() + " but got " + name);
+        throw new IllegalArgumentException(
+            "Expected field " + field.getName() + " but got " + name);
       }
 
       /* Initialize the vector with required capacity but don't allocateNew since we would
        * be doing loadFieldBuffers.
        */
       int valueCount = readNextField("count", Integer.class);
+
       vector.setInitialCapacity(valueCount);
 
       for (int v = 0; v < vectorTypes.size(); v++) {
         BufferType bufferType = vectorTypes.get(v);
         nextFieldIs(bufferType.getName());
         int innerBufferValueCount = valueCount;
-        if (bufferType.equals(OFFSET) && !(type instanceof ArrowType.Union)) {
+        if (bufferType.equals(OFFSET) && !(type instanceof Union)) {
           /* offset buffer has 1 additional value capacity except for dense unions */
           innerBufferValueCount = valueCount + 1;
         }
 
-        vectorBuffers[v] = readIntoBuffer(allocator, bufferType, vector.getMinorType(), innerBufferValueCount);
+        vectorBuffers.addAll(
+            readIntoBuffer(
+                allocator,
+                bufferType,
+                vector.getMinorType(),
+                innerBufferValueCount,
+                variadicBufferIndices));
       }
 
       int nullCount = 0;
       if (type instanceof ArrowType.Null) {
         nullCount = valueCount;
-      } else if (!(type instanceof ArrowType.Union)) {
-        nullCount = BitVectorHelper.getNullCount(vectorBuffers[0], valueCount);
+      } else if (!(type instanceof Union)) {
+        nullCount = BitVectorHelper.getNullCount(vectorBuffers.get(0), valueCount);
       }
       final ArrowFieldNode fieldNode = new ArrowFieldNode(valueCount, nullCount);
-      vector.loadFieldBuffers(fieldNode, Arrays.asList(vectorBuffers));
+      vector.loadFieldBuffers(fieldNode, vectorBuffers);
 
       /* read child vectors (if any) */
       List<Field> fields = field.getChildren();
@@ -774,7 +917,10 @@ private void readFromJsonIntoVector(Field field, FieldVector vector) throws Json
         List<FieldVector> vectorChildren = vector.getChildrenFromFields();
         if (fields.size() != vectorChildren.size()) {
           throw new IllegalArgumentException(
-                  "fields and children are not the same size: " + fields.size() + " != " + vectorChildren.size());
+              "fields and children are not the same size: "
+                  + fields.size()
+                  + " != "
+                  + vectorChildren.size());
         }
         nextFieldIs("children");
         readToken(START_ARRAY);
@@ -786,9 +932,10 @@ private void readFromJsonIntoVector(Field field, FieldVector vector) throws Json
         readToken(END_ARRAY);
       }
     }
+
     readToken(END_OBJECT);
 
-    for (ArrowBuf buffer: vectorBuffers) {
+    for (ArrowBuf buffer : vectorBuffers) {
       buffer.getReferenceManager().release();
     }
   }
@@ -811,7 +958,8 @@ public void close() throws IOException {
     }
   }
 
-  private <T> T readNextField(String expectedFieldName, Class<T> c) throws IOException, JsonParseException {
+  private <T> T readNextField(String expectedFieldName, Class<T> c)
+      throws IOException, JsonParseException {
     nextFieldIs(expectedFieldName);
     parser.nextToken();
     return parser.readValueAs(c);
@@ -830,5 +978,4 @@ private void readToken(JsonToken expected) throws JsonParseException, IOExceptio
       throw new IllegalStateException("Expected " + expected + " but got " + t);
     }
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileWriter.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileWriter.java
index f5e267e81256c..d1ee890f5c596 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileWriter.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileWriter.java
@@ -14,24 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import static org.apache.arrow.vector.BufferLayout.BufferType.*;
 
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter.NopIndenter;
+import com.fasterxml.jackson.databind.MappingJsonFactory;
 import java.io.File;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.BaseLargeVariableWidthVector;
 import org.apache.arrow.vector.BaseVariableWidthVector;
+import org.apache.arrow.vector.BaseVariableWidthViewVector;
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.BitVectorHelper;
 import org.apache.arrow.vector.BufferLayout.BufferType;
@@ -77,23 +82,15 @@
 import org.apache.arrow.vector.util.DictionaryUtility;
 import org.apache.commons.codec.binary.Hex;
 
-import com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
-import com.fasterxml.jackson.core.util.DefaultPrettyPrinter.NopIndenter;
-import com.fasterxml.jackson.databind.MappingJsonFactory;
-
 /**
  * A writer that converts binary Vectors into an <em>internal, unstable</em> JSON format suitable
  * for integration testing.
  *
- * This writer does NOT implement a JSON dataset format like JSONL.
+ * <p>This writer does NOT implement a JSON dataset format like JSONL.
  */
 public class JsonFileWriter implements AutoCloseable {
 
-  /**
-   * Configuration POJO for writing JSON files.
-   */
+  /** Configuration POJO for writing JSON files. */
   public static final class JSONWriteConfig {
     private final boolean pretty;
 
@@ -117,16 +114,12 @@ public static JSONWriteConfig config() {
   private final JsonGenerator generator;
   private Schema schema;
 
-  /**
-   * Constructs a new writer that will output to  <code>outputFile</code>.
-   */
+  /** Constructs a new writer that will output to <code>outputFile</code>. */
   public JsonFileWriter(File outputFile) throws IOException {
     this(outputFile, config());
   }
 
-  /**
-   * Constructs a new writer that will output to  <code>outputFile</code> with the given options.
-   */
+  /** Constructs a new writer that will output to <code>outputFile</code> with the given options. */
   public JsonFileWriter(File outputFile, JSONWriteConfig config) throws IOException {
     MappingJsonFactory jsonFactory = new MappingJsonFactory();
     this.generator = jsonFactory.createGenerator(outputFile, JsonEncoding.UTF8);
@@ -139,9 +132,7 @@ public JsonFileWriter(File outputFile, JSONWriteConfig config) throws IOExceptio
     this.generator.configure(JsonGenerator.Feature.QUOTE_NON_NUMERIC_NUMBERS, false);
   }
 
-  /**
-   * Writes out the "header" of the file including the schema and any dictionaries required.
-   */
+  /** Writes out the "header" of the file including the schema and any dictionaries required. */
   public void start(Schema schema, DictionaryProvider provider) throws IOException {
     List<Field> fields = new ArrayList<>(schema.getFields().size());
     Set<Long> dictionaryIdsUsed = new HashSet<>();
@@ -165,7 +156,8 @@ public void start(Schema schema, DictionaryProvider provider) throws IOException
     generator.writeArrayFieldStart("batches");
   }
 
-  private void writeDictionaryBatches(JsonGenerator generator, Set<Long> dictionaryIdsUsed, DictionaryProvider provider)
+  private void writeDictionaryBatches(
+      JsonGenerator generator, Set<Long> dictionaryIdsUsed, DictionaryProvider provider)
       throws IOException {
     generator.writeArrayFieldStart("dictionaries");
     for (Long id : dictionaryIdsUsed) {
@@ -208,12 +200,22 @@ private void writeBatch(VectorSchemaRoot recordBatch) throws IOException {
   }
 
   private void writeFromVectorIntoJson(Field field, FieldVector vector) throws IOException {
-    List<BufferType> vectorTypes = TypeLayout.getTypeLayout(field.getType()).getBufferTypes();
+    TypeLayout typeLayout = TypeLayout.getTypeLayout(field.getType());
+    List<BufferType> vectorTypes = typeLayout.getBufferTypes();
     List<ArrowBuf> vectorBuffers = vector.getFieldBuffers();
-    if (vectorTypes.size() != vectorBuffers.size()) {
-      throw new IllegalArgumentException("vector types and inner vector buffers are not the same size: " +
-        vectorTypes.size() + " != " + vectorBuffers.size());
+
+    if (typeLayout.isFixedBufferCount()) {
+      if (vectorTypes.size() != vectorBuffers.size()) {
+        throw new IllegalArgumentException(
+            "vector types and inner vector buffers are not the same size: "
+                + vectorTypes.size()
+                + " != "
+                + vectorBuffers.size());
+      }
+    } else {
+      vectorTypes.add(VARIADIC_DATA_BUFFERS);
     }
+
     generator.writeStartObject();
     {
       generator.writeObjectField("name", field.getName());
@@ -223,24 +225,53 @@ private void writeFromVectorIntoJson(Field field, FieldVector vector) throws IOE
       for (int v = 0; v < vectorTypes.size(); v++) {
         BufferType bufferType = vectorTypes.get(v);
         ArrowBuf vectorBuffer = vectorBuffers.get(v);
+        // Note that in JSON format we cannot have VARIADIC_DATA_BUFFERS repeated,
+        // thus the values are only written to a single entity.
         generator.writeArrayFieldStart(bufferType.getName());
-        final int bufferValueCount = (bufferType.equals(OFFSET) && vector.getMinorType() != MinorType.DENSEUNION) ?
-            valueCount + 1 : valueCount;
+        final int bufferValueCount =
+            (bufferType.equals(OFFSET) && vector.getMinorType() != MinorType.DENSEUNION)
+                ? valueCount + 1
+                : valueCount;
         for (int i = 0; i < bufferValueCount; i++) {
-          if (bufferType.equals(DATA) && (vector.getMinorType() == MinorType.VARCHAR ||
-                  vector.getMinorType() == MinorType.VARBINARY)) {
+          if (bufferType.equals(DATA)
+              && (vector.getMinorType() == MinorType.VARCHAR
+                  || vector.getMinorType() == MinorType.VARBINARY)) {
             writeValueToGenerator(bufferType, vectorBuffer, vectorBuffers.get(v - 1), vector, i);
-          } else if (bufferType.equals(OFFSET) && vector.getValueCount() == 0 &&
-              (vector.getMinorType() == MinorType.LIST || vector.getMinorType() == MinorType.MAP ||
-                  vector.getMinorType() == MinorType.VARBINARY || vector.getMinorType() == MinorType.VARCHAR)) {
+          } else if (bufferType.equals(VIEWS)
+              && (vector.getMinorType() == MinorType.VIEWVARCHAR
+                  || vector.getMinorType() == MinorType.VIEWVARBINARY)) {
+            // writing views
+            ArrowBuf viewBuffer = vectorBuffers.get(1);
+            List<ArrowBuf> dataBuffers = vectorBuffers.subList(v + 1, vectorBuffers.size());
+            writeValueToViewGenerator(bufferType, viewBuffer, dataBuffers, vector, i);
+          } else if (bufferType.equals(VARIADIC_DATA_BUFFERS)
+              && (vector.getMinorType() == MinorType.VIEWVARCHAR
+                  || vector.getMinorType() == MinorType.VIEWVARBINARY)) {
+            ArrowBuf viewBuffer = vectorBuffers.get(1); // check if this is v-1
+            List<ArrowBuf> dataBuffers = vectorBuffers.subList(v, vectorBuffers.size());
+            if (!dataBuffers.isEmpty()) {
+              writeValueToDataBufferGenerator(bufferType, viewBuffer, dataBuffers, vector);
+              // The variadic buffers are written at once and doesn't require iterating for
+              // each index.
+              // So, break the loop.
+              break;
+            }
+          } else if (bufferType.equals(OFFSET)
+              && vector.getValueCount() == 0
+              && (vector.getMinorType() == MinorType.LIST
+                  || vector.getMinorType() == MinorType.MAP
+                  || vector.getMinorType() == MinorType.VARBINARY
+                  || vector.getMinorType() == MinorType.VARCHAR)) {
             // Empty vectors may not have allocated an offsets buffer
             try (ArrowBuf vectorBufferTmp = vector.getAllocator().buffer(4)) {
               vectorBufferTmp.setInt(0, 0);
               writeValueToGenerator(bufferType, vectorBufferTmp, null, vector, i);
             }
-          } else if (bufferType.equals(OFFSET) && vector.getValueCount() == 0 &&
-              (vector.getMinorType() == MinorType.LARGELIST || vector.getMinorType() == MinorType.LARGEVARBINARY ||
-                vector.getMinorType() == MinorType.LARGEVARCHAR)) {
+          } else if (bufferType.equals(OFFSET)
+              && vector.getValueCount() == 0
+              && (vector.getMinorType() == MinorType.LARGELIST
+                  || vector.getMinorType() == MinorType.LARGEVARBINARY
+                  || vector.getMinorType() == MinorType.LARGEVARCHAR)) {
             // Empty vectors may not have allocated an offsets buffer
             try (ArrowBuf vectorBufferTmp = vector.getAllocator().buffer(8)) {
               vectorBufferTmp.setLong(0, 0);
@@ -252,11 +283,15 @@ private void writeFromVectorIntoJson(Field field, FieldVector vector) throws IOE
         }
         generator.writeEndArray();
       }
+
       List<Field> fields = field.getChildren();
       List<FieldVector> children = vector.getChildrenFromFields();
       if (fields.size() != children.size()) {
-        throw new IllegalArgumentException("fields and children are not the same size: " + fields.size() + " != " +
-          children.size());
+        throw new IllegalArgumentException(
+            "fields and children are not the same size: "
+                + fields.size()
+                + " != "
+                + children.size());
       }
       if (fields.size() > 0) {
         generator.writeArrayFieldStart("children");
@@ -271,12 +306,109 @@ private void writeFromVectorIntoJson(Field field, FieldVector vector) throws IOE
     generator.writeEndObject();
   }
 
+  /**
+   * Get data of a view by index.
+   *
+   * @param viewBuffer view buffer
+   * @param dataBuffers data buffers
+   * @param index index of the view
+   * @return byte array of the view
+   */
+  private byte[] getView(final ArrowBuf viewBuffer, final List<ArrowBuf> dataBuffers, int index) {
+    final int dataLength =
+        viewBuffer.getInt((long) index * BaseVariableWidthViewVector.ELEMENT_SIZE);
+    byte[] result = new byte[dataLength];
+
+    final int inlineSize = BaseVariableWidthViewVector.INLINE_SIZE;
+    final int elementSize = BaseVariableWidthViewVector.ELEMENT_SIZE;
+    final int lengthWidth = BaseVariableWidthViewVector.LENGTH_WIDTH;
+    final int prefixWidth = BaseVariableWidthViewVector.PREFIX_WIDTH;
+    final int bufIndexWidth = BaseVariableWidthViewVector.BUF_INDEX_WIDTH;
+
+    if (dataLength > inlineSize) {
+      // data is in the data buffer
+      // get buffer index
+      final int bufferIndex =
+          viewBuffer.getInt(((long) index * elementSize) + lengthWidth + prefixWidth);
+      // get data offset
+      final int dataOffset =
+          viewBuffer.getInt(
+              ((long) index * elementSize) + lengthWidth + prefixWidth + bufIndexWidth);
+      dataBuffers.get(bufferIndex).getBytes(dataOffset, result, 0, dataLength);
+    } else {
+      // data is in the view buffer
+      viewBuffer.getBytes((long) index * elementSize + lengthWidth, result, 0, dataLength);
+    }
+    return result;
+  }
+
+  private void writeValueToViewGenerator(
+      BufferType bufferType,
+      ArrowBuf viewBuffer,
+      List<ArrowBuf> dataBuffers,
+      FieldVector vector,
+      final int index)
+      throws IOException {
+    Preconditions.checkNotNull(viewBuffer);
+    byte[] b = getView(viewBuffer, dataBuffers, index);
+    final int elementSize = BaseVariableWidthViewVector.ELEMENT_SIZE;
+    final int lengthWidth = BaseVariableWidthViewVector.LENGTH_WIDTH;
+    final int prefixWidth = BaseVariableWidthViewVector.PREFIX_WIDTH;
+    final int bufIndexWidth = BaseVariableWidthViewVector.BUF_INDEX_WIDTH;
+    final int length = viewBuffer.getInt((long) index * elementSize);
+    generator.writeStartObject();
+    generator.writeFieldName("SIZE");
+    generator.writeObject(length);
+    if (length > 12) {
+      byte[] prefix = Arrays.copyOfRange(b, 0, prefixWidth);
+      final int bufferIndex =
+          viewBuffer.getInt(((long) index * elementSize) + lengthWidth + prefixWidth);
+      // get data offset
+      final int dataOffset =
+          viewBuffer.getInt(
+              ((long) index * elementSize) + lengthWidth + prefixWidth + bufIndexWidth);
+      generator.writeFieldName("PREFIX_HEX");
+      generator.writeString(Hex.encodeHexString(prefix));
+      generator.writeFieldName("BUFFER_INDEX");
+      generator.writeObject(bufferIndex);
+      generator.writeFieldName("OFFSET");
+      generator.writeObject(dataOffset);
+    } else {
+      generator.writeFieldName("INLINED");
+      if (vector.getMinorType() == MinorType.VIEWVARCHAR) {
+        generator.writeString(new String(b, "UTF-8"));
+      } else {
+        generator.writeString(Hex.encodeHexString(b));
+      }
+    }
+    generator.writeEndObject();
+  }
+
+  private void writeValueToDataBufferGenerator(
+      BufferType bufferType, ArrowBuf viewBuffer, List<ArrowBuf> dataBuffers, FieldVector vector)
+      throws IOException {
+    if (bufferType.equals(VARIADIC_DATA_BUFFERS)) {
+      Preconditions.checkNotNull(viewBuffer);
+      Preconditions.checkArgument(!dataBuffers.isEmpty());
+
+      for (int i = 0; i < dataBuffers.size(); i++) {
+        ArrowBuf dataBuf = dataBuffers.get(i);
+        byte[] result = new byte[(int) dataBuf.writerIndex()];
+        dataBuf.getBytes(0, result);
+        if (result != null) {
+          generator.writeString(Hex.encodeHexString(result));
+        }
+      }
+    }
+  }
+
   private void writeValueToGenerator(
       BufferType bufferType,
       ArrowBuf buffer,
       ArrowBuf offsetBuffer,
       FieldVector vector,
-      final int index) throws IOException {
+      final int index)
+      throws IOException {
     if (bufferType.equals(TYPE)) {
       generator.writeNumber(buffer.getByte(index * TinyIntVector.TYPE_WIDTH));
     } else if (bufferType.equals(OFFSET)) {
@@ -290,7 +422,8 @@ private void writeValueToGenerator(
         case LARGELIST:
         case LARGEVARBINARY:
         case LARGEVARCHAR:
-          generator.writeNumber(buffer.getLong((long) index * BaseLargeVariableWidthVector.OFFSET_WIDTH));
+          generator.writeNumber(
+              buffer.getLong((long) index * BaseLargeVariableWidthVector.OFFSET_WIDTH));
           break;
         default:
           throw new IllegalArgumentException("Type has no offset buffer: " + vector.getField());
@@ -380,53 +513,62 @@ private void writeValueToGenerator(
         case INTERVALDAY:
           generator.writeStartObject();
           generator.writeObjectField("days", IntervalDayVector.getDays(buffer, index));
-          generator.writeObjectField("milliseconds", IntervalDayVector.getMilliseconds(buffer, index));
+          generator.writeObjectField(
+              "milliseconds", IntervalDayVector.getMilliseconds(buffer, index));
           generator.writeEndObject();
           break;
         case INTERVALMONTHDAYNANO:
           generator.writeStartObject();
           generator.writeObjectField("months", IntervalMonthDayNanoVector.getMonths(buffer, index));
           generator.writeObjectField("days", IntervalMonthDayNanoVector.getDays(buffer, index));
-          generator.writeObjectField("nanoseconds", IntervalMonthDayNanoVector.getNanoseconds(buffer, index));
+          generator.writeObjectField(
+              "nanoseconds", IntervalMonthDayNanoVector.getNanoseconds(buffer, index));
           generator.writeEndObject();
           break;
         case BIT:
           generator.writeNumber(BitVectorHelper.get(buffer, index));
           break;
-        case VARBINARY: {
-          Preconditions.checkNotNull(offsetBuffer);
-          String hexString = Hex.encodeHexString(BaseVariableWidthVector.get(buffer,
-              offsetBuffer, index));
-          generator.writeObject(hexString);
-          break;
-        }
+        case VARBINARY:
+          {
+            Preconditions.checkNotNull(offsetBuffer);
+            String hexString =
+                Hex.encodeHexString(BaseVariableWidthVector.get(buffer, offsetBuffer, index));
+            generator.writeObject(hexString);
+            break;
+          }
         case FIXEDSIZEBINARY:
           int byteWidth = ((FixedSizeBinaryVector) vector).getByteWidth();
-          String fixedSizeHexString = Hex.encodeHexString(FixedSizeBinaryVector.get(buffer, index, byteWidth));
+          String fixedSizeHexString =
+              Hex.encodeHexString(FixedSizeBinaryVector.get(buffer, index, byteWidth));
           generator.writeObject(fixedSizeHexString);
           break;
-        case VARCHAR: {
-          Preconditions.checkNotNull(offsetBuffer);
-          byte[] b = (BaseVariableWidthVector.get(buffer, offsetBuffer, index));
-          generator.writeString(new String(b, "UTF-8"));
-          break;
-        }
-        case DECIMAL: {
-          int scale = ((DecimalVector) vector).getScale();
-          BigDecimal decimalValue = DecimalUtility.getBigDecimalFromArrowBuf(buffer, index, scale, 
-                                                                             DecimalVector.TYPE_WIDTH);
-          // We write the unscaled value, because the scale is stored in the type metadata.
-          generator.writeString(decimalValue.unscaledValue().toString());
-          break;
-        }
-        case DECIMAL256: {
-          int scale = ((Decimal256Vector) vector).getScale();
-          BigDecimal decimalValue = DecimalUtility.getBigDecimalFromArrowBuf(buffer, index, scale, 
-                                                                             Decimal256Vector.TYPE_WIDTH);
-          // We write the unscaled value, because the scale is stored in the type metadata.
-          generator.writeString(decimalValue.unscaledValue().toString());
-          break;
-        }
+        case VARCHAR:
+          {
+            Preconditions.checkNotNull(offsetBuffer);
+            byte[] b = (BaseVariableWidthVector.get(buffer, offsetBuffer, index));
+            generator.writeString(new String(b, "UTF-8"));
+            break;
+          }
+        case DECIMAL:
+          {
+            int scale = ((DecimalVector) vector).getScale();
+            BigDecimal decimalValue =
+                DecimalUtility.getBigDecimalFromArrowBuf(
+                    buffer, index, scale, DecimalVector.TYPE_WIDTH);
+            // We write the unscaled value, because the scale is stored in the type metadata.
+            generator.writeString(decimalValue.unscaledValue().toString());
+            break;
+          }
+        case DECIMAL256:
+          {
+            int scale = ((Decimal256Vector) vector).getScale();
+            BigDecimal decimalValue =
+                DecimalUtility.getBigDecimalFromArrowBuf(
+                    buffer, index, scale, Decimal256Vector.TYPE_WIDTH);
+            // We write the unscaled value, because the scale is stored in the type metadata.
+            generator.writeString(decimalValue.unscaledValue().toString());
+            break;
+          }
 
         default:
           throw new UnsupportedOperationException("minor type: " + vector.getMinorType());
@@ -440,5 +582,4 @@ public void close() throws IOException {
     generator.writeEndObject();
     generator.close();
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ReadChannel.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ReadChannel.java
index db79661a8d463..d2b5e70c4e64c 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ReadChannel.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ReadChannel.java
@@ -14,20 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * Adapter around {@link ReadableByteChannel} that reads into {@linkplain ArrowBuf}s.
- */
+/** Adapter around {@link ReadableByteChannel} that reads into {@linkplain ArrowBuf}s. */
 public class ReadChannel implements AutoCloseable {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(ReadChannel.class);
@@ -44,8 +40,8 @@ public long bytesRead() {
   }
 
   /**
-   * Reads bytes into buffer until it is full (buffer.remaining() == 0). Returns the
-   * number of bytes read which can be less than full if there are no more.
+   * Reads bytes into buffer until it is full (buffer.remaining() == 0). Returns the number of bytes
+   * read which can be less than full if there are no more.
    *
    * @param buffer The buffer to read to
    * @return the number of byte read
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/SeekableReadChannel.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/SeekableReadChannel.java
index 4b6e0ed76e521..f127d2cf262e1 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/SeekableReadChannel.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/SeekableReadChannel.java
@@ -14,16 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import java.io.IOException;
 import java.nio.channels.SeekableByteChannel;
 
-/**
- * An {@link ReadChannel} that supports seeking to a
- * random position.
- */
+/** An {@link ReadChannel} that supports seeking to a random position. */
 public class SeekableReadChannel extends ReadChannel {
 
   private final SeekableByteChannel in;
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/WriteChannel.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/WriteChannel.java
index 9ad71f6fe8847..eeb2eaf566d6e 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/WriteChannel.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/WriteChannel.java
@@ -14,32 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
+import com.google.flatbuffers.FlatBufferBuilder;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.vector.ipc.message.FBSerializable;
 import org.apache.arrow.vector.ipc.message.MessageSerializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.flatbuffers.FlatBufferBuilder;
-
 /**
- * Wrapper around a WritableByteChannel that maintains the position as well adding
- * some common serialization utilities.
+ * Wrapper around a WritableByteChannel that maintains the position as well adding some common
+ * serialization utilities.
  *
- * <p>All write methods in this class follow full write semantics, i.e., write calls
- * only return after requested data has been fully written. Note this is different
- * from java WritableByteChannel interface where partial write is allowed
- * </p>
- * <p>
- *   Please note that objects of this class are not thread-safe.
- * </p>
+ * <p>All write methods in this class follow full write semantics, i.e., write calls only return
+ * after requested data has been fully written. Note this is different from java WritableByteChannel
+ * interface where partial write is allowed
+ *
+ * <p>Please note that objects of this class are not thread-safe.
  */
 public class WriteChannel implements AutoCloseable {
   private static final Logger LOGGER = LoggerFactory.getLogger(WriteChannel.class);
@@ -73,9 +68,7 @@ long write(byte[] buffer, int offset, int length) throws IOException {
     return write(ByteBuffer.wrap(buffer, offset, length));
   }
 
-  /**
-   * Writes <zeroCount>zeroCount</zeroCount> zeros the underlying channel.
-   */
+  /** Writes <zeroCount>zeroCount</zeroCount> zeros the underlying channel. */
   public long writeZeros(long zeroCount) throws IOException {
     long bytesWritten = 0;
     long wholeWordsEnd = zeroCount - 8;
@@ -89,9 +82,7 @@ public long writeZeros(long zeroCount) throws IOException {
     return bytesWritten;
   }
 
-  /**
-   * Writes enough bytes to align the channel to an 8-byte boundary.
-   */
+  /** Writes enough bytes to align the channel to an 8-byte boundary. */
   public long align() throws IOException {
     int trailingByteSize = (int) (currentPosition % 8);
     if (trailingByteSize != 0) { // align on 8 byte boundaries
@@ -100,14 +91,9 @@ public long align() throws IOException {
     return 0;
   }
 
-  /**
-   * Writes all data from <code>buffer</code> to the underlying channel.
-   */
+  /** Writes all data from <code>buffer</code> to the underlying channel. */
   public long write(ByteBuffer buffer) throws IOException {
     long length = buffer.remaining();
-    if (LOGGER.isDebugEnabled()) {
-      LOGGER.debug("Writing buffer with size: {}", length);
-    }
     while (buffer.hasRemaining()) {
       out.write(buffer);
     }
@@ -115,32 +101,26 @@ public long write(ByteBuffer buffer) throws IOException {
     return length;
   }
 
-  /**
-   * Writes <code>v</code> in little-endian format to the underlying channel.
-   */
+  /** Writes <code>v</code> in little-endian format to the underlying channel. */
   public long writeIntLittleEndian(int v) throws IOException {
     MessageSerializer.intToBytes(v, intBuf);
     return write(intBuf);
   }
 
-  /**
-   * Writes the buffer to the underlying channel.
-   */
+  /** Writes the buffer to the underlying channel. */
   public void write(ArrowBuf buffer) throws IOException {
     long bytesWritten = 0;
     while (bytesWritten < buffer.readableBytes()) {
       int bytesToWrite = (int) Math.min(Integer.MAX_VALUE, buffer.readableBytes() - bytesWritten);
-      ByteBuffer nioBuffer = buffer.nioBuffer(buffer.readerIndex() + bytesWritten,
-           bytesToWrite);
+      ByteBuffer nioBuffer = buffer.nioBuffer(buffer.readerIndex() + bytesWritten, bytesToWrite);
       write(nioBuffer);
       bytesWritten += bytesToWrite;
     }
-
   }
 
   /**
-   * Writes the serialized flatbuffer to the underlying channel.  If withSizePrefix
-   * is true then the length in bytes of the buffer will first be written in little endian format.
+   * Writes the serialized flatbuffer to the underlying channel. If withSizePrefix is true then the
+   * length in bytes of the buffer will first be written in little endian format.
    */
   public long write(FBSerializable writer, boolean withSizePrefix) throws IOException {
     ByteBuffer buffer = serialize(writer);
@@ -150,9 +130,7 @@ public long write(FBSerializable writer, boolean withSizePrefix) throws IOExcept
     return write(buffer);
   }
 
-  /**
-   * Serializes writer to a ByteBuffer.
-   */
+  /** Serializes writer to a ByteBuffer. */
   public static ByteBuffer serialize(FBSerializable writer) {
     FlatBufferBuilder builder = new FlatBufferBuilder();
     int root = writer.writeTo(builder);
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowBlock.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowBlock.java
index a235102ce48bb..455229cc6dda5 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowBlock.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowBlock.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc.message;
 
-import org.apache.arrow.flatbuf.Block;
-
 import com.google.flatbuffers.FlatBufferBuilder;
+import org.apache.arrow.flatbuf.Block;
 
 /** Metadata for an arrow message in a channel. */
 public class ArrowBlock implements FBSerializable {
@@ -32,7 +30,7 @@ public class ArrowBlock implements FBSerializable {
    * Constructs a new instance.
    *
    * @param offset The offset into the channel file where the block was written.
-   * @param metadataLength  The length of the flatbuffer metadata in the block.
+   * @param metadataLength The length of the flatbuffer metadata in the block.
    * @param bodyLength The length of data in the block.
    */
   public ArrowBlock(long offset, int metadataLength, long bodyLength) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowBodyCompression.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowBodyCompression.java
index 5370ddfa09d12..b076b38fa755e 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowBodyCompression.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowBodyCompression.java
@@ -14,16 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc.message;
 
-import org.apache.arrow.flatbuf.BodyCompression;
-
 import com.google.flatbuffers.FlatBufferBuilder;
+import org.apache.arrow.flatbuf.BodyCompression;
 
-/**
- * Compression information about data written to a channel.
- */
+/** Compression information about data written to a channel. */
 public class ArrowBodyCompression implements FBSerializable {
 
   private final byte codec;
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowBuffer.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowBuffer.java
index d3aec6fb7260d..cebddeb660e25 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowBuffer.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowBuffer.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc.message;
 
-import org.apache.arrow.flatbuf.Buffer;
-
 import com.google.flatbuffers.FlatBufferBuilder;
+import org.apache.arrow.flatbuf.Buffer;
 
 /** Metadata for a buffer written to a channel. */
 public class ArrowBuffer implements FBSerializable {
@@ -86,5 +84,4 @@ public int writeTo(FlatBufferBuilder builder) {
   public String toString() {
     return "ArrowBuffer [offset=" + offset + ", size=" + size + "]";
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowDictionaryBatch.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowDictionaryBatch.java
index cac2a1cb89284..a704dbdd74eaa 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowDictionaryBatch.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowDictionaryBatch.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc.message;
 
+import com.google.flatbuffers.FlatBufferBuilder;
 import org.apache.arrow.flatbuf.DictionaryBatch;
 import org.apache.arrow.flatbuf.MessageHeader;
 
-import com.google.flatbuffers.FlatBufferBuilder;
-
 /**
  * POJO wrapper around a Dictionary Batch IPC messages
  * (https://arrow.apache.org/docs/format/IPC.html#dictionary-batches)
@@ -34,12 +32,10 @@ public class ArrowDictionaryBatch implements ArrowMessage {
 
   @Deprecated
   public ArrowDictionaryBatch(long dictionaryId, ArrowRecordBatch dictionary) {
-    this (dictionaryId, dictionary, false);
+    this(dictionaryId, dictionary, false);
   }
 
-  /**
-   * Constructs new instance.
-   */
+  /** Constructs new instance. */
   public ArrowDictionaryBatch(long dictionaryId, ArrowRecordBatch dictionary, boolean isDelta) {
     this.dictionaryId = dictionaryId;
     this.dictionary = dictionary;
@@ -84,7 +80,11 @@ public <T> T accepts(ArrowMessageVisitor<T> visitor) {
 
   @Override
   public String toString() {
-    return "ArrowDictionaryBatch [dictionaryId=" + dictionaryId + ", dictionary=" + dictionary + "]";
+    return "ArrowDictionaryBatch [dictionaryId="
+        + dictionaryId
+        + ", dictionary="
+        + dictionary
+        + "]";
   }
 
   @Override
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowFieldNode.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowFieldNode.java
index 9ce5e2e4d8b3f..ad3f434e12a1d 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowFieldNode.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowFieldNode.java
@@ -14,18 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc.message;
 
 import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
 
-import org.apache.arrow.flatbuf.FieldNode;
-
 import com.google.flatbuffers.FlatBufferBuilder;
+import org.apache.arrow.flatbuf.FieldNode;
 
-/**
- * Metadata about Vectors/Arrays that is written to a channel.
- */
+/** Metadata about Vectors/Arrays that is written to a channel. */
 public class ArrowFieldNode implements FBSerializable {
 
   private final int length;
@@ -60,5 +56,4 @@ public int getLength() {
   public String toString() {
     return "ArrowFieldNode [length=" + length + ", nullCount=" + nullCount + "]";
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowFooter.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowFooter.java
index 567fabc1d4348..bb2b87113faca 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowFooter.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowFooter.java
@@ -14,25 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc.message;
 
 import static org.apache.arrow.vector.ipc.message.FBSerializables.writeAllStructsToVector;
 import static org.apache.arrow.vector.ipc.message.FBSerializables.writeKeyValues;
 
+import com.google.flatbuffers.FlatBufferBuilder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.arrow.flatbuf.Block;
 import org.apache.arrow.flatbuf.Footer;
 import org.apache.arrow.flatbuf.KeyValue;
 import org.apache.arrow.vector.types.MetadataVersion;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-import com.google.flatbuffers.FlatBufferBuilder;
-
 /** Footer metadata for the arrow file format. */
 public class ArrowFooter implements FBSerializable {
 
@@ -54,8 +51,8 @@ public ArrowFooter(Schema schema, List<ArrowBlock> dictionaries, List<ArrowBlock
    * Constructs a new instance.
    *
    * @param schema The schema for record batches in the file.
-   * @param dictionaries  The dictionaries relevant to the file.
-   * @param recordBatches  The recordBatches written to the file.
+   * @param dictionaries The dictionaries relevant to the file.
+   * @param recordBatches The recordBatches written to the file.
    * @param metaData user-defined k-v meta data.
    */
   public ArrowFooter(
@@ -70,8 +67,8 @@ public ArrowFooter(
    * Constructs a new instance.
    *
    * @param schema The schema for record batches in the file.
-   * @param dictionaries  The dictionaries relevant to the file.
-   * @param recordBatches  The recordBatches written to the file.
+   * @param dictionaries The dictionaries relevant to the file.
+   * @param recordBatches The recordBatches written to the file.
    * @param metaData user-defined k-v meta data.
    * @param metadataVersion The Arrow metadata version.
    */
@@ -88,17 +85,14 @@ public ArrowFooter(
     this.metadataVersion = metadataVersion;
   }
 
-  /**
-   * Constructs from the corresponding Flatbuffer message.
-   */
+  /** Constructs from the corresponding Flatbuffer message. */
   public ArrowFooter(Footer footer) {
     this(
         Schema.convertSchema(footer.schema()),
         dictionaries(footer),
         recordBatches(footer),
         metaData(footer),
-        MetadataVersion.fromFlatbufID(footer.version())
-    );
+        MetadataVersion.fromFlatbufID(footer.version()));
   }
 
   private static List<ArrowBlock> recordBatches(Footer footer) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowMessage.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowMessage.java
index 4cbc87b4e4833..6f8e893405f15 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowMessage.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowMessage.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc.message;
 
-/**
- * Interface for Arrow IPC messages (https://arrow.apache.org/docs/format/IPC.html).
- */
+/** Interface for Arrow IPC messages (https://arrow.apache.org/docs/format/IPC.html). */
 public interface ArrowMessage extends FBSerializable, AutoCloseable {
 
   long computeBodyLength();
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowRecordBatch.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowRecordBatch.java
index f81d049a9257f..bc6bfa8c868f7 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowRecordBatch.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowRecordBatch.java
@@ -14,14 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc.message;
 
+import com.google.flatbuffers.FlatBufferBuilder;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.flatbuf.RecordBatch;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
@@ -31,23 +30,18 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.flatbuffers.FlatBufferBuilder;
-
 /**
- * POJO representation of a RecordBatch IPC message (https://arrow.apache.org/docs/format/Columnar.html#recordbatch-message).
+ * POJO representation of a RecordBatch IPC message
+ * (https://arrow.apache.org/docs/format/Columnar.html#recordbatch-message).
  */
 public class ArrowRecordBatch implements ArrowMessage {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(ArrowRecordBatch.class);
 
-  /**
-   * Number of records.
-   */
+  /** Number of records. */
   private final int length;
 
-  /**
-   * Nodes correspond to the pre-ordered flattened logical schema.
-   */
+  /** Nodes correspond to the pre-ordered flattened logical schema. */
   private final List<ArrowFieldNode> nodes;
 
   private final List<ArrowBuf> buffers;
@@ -56,54 +50,115 @@ public class ArrowRecordBatch implements ArrowMessage {
 
   private final List<ArrowBuffer> buffersLayout;
 
+  private final List<Long> variadicBufferCounts;
+
   private boolean closed = false;
 
-  public ArrowRecordBatch(
-      int length, List<ArrowFieldNode> nodes, List<ArrowBuf> buffers) {
-    this(length, nodes, buffers, NoCompressionCodec.DEFAULT_BODY_COMPRESSION, true);
+  public ArrowRecordBatch(int length, List<ArrowFieldNode> nodes, List<ArrowBuf> buffers) {
+    this(length, nodes, buffers, NoCompressionCodec.DEFAULT_BODY_COMPRESSION, null, true);
   }
 
   public ArrowRecordBatch(
-      int length, List<ArrowFieldNode> nodes, List<ArrowBuf> buffers,
+      int length,
+      List<ArrowFieldNode> nodes,
+      List<ArrowBuf> buffers,
       ArrowBodyCompression bodyCompression) {
-    this(length, nodes, buffers, bodyCompression, true);
+    this(length, nodes, buffers, bodyCompression, null, true);
+  }
+
+  /**
+   * Construct a record batch from nodes.
+   *
+   * @param length how many rows in this batch
+   * @param nodes field level info
+   * @param buffers will be retained until this recordBatch is closed
+   * @param bodyCompression compression info.
+   * @param alignBuffers Whether to align buffers to an 8 byte boundary.
+   */
+  public ArrowRecordBatch(
+      int length,
+      List<ArrowFieldNode> nodes,
+      List<ArrowBuf> buffers,
+      ArrowBodyCompression bodyCompression,
+      boolean alignBuffers) {
+    this(length, nodes, buffers, bodyCompression, null, alignBuffers, /*retainBuffers*/ true);
+  }
+
+  /**
+   * Construct a record batch from nodes.
+   *
+   * @param length how many rows in this batch
+   * @param nodes field level info
+   * @param buffers will be retained until this recordBatch is closed
+   * @param bodyCompression compression info.
+   * @param alignBuffers Whether to align buffers to an 8 byte boundary.
+   * @param retainBuffers Whether to retain() each source buffer in the constructor. If false, the
+   *     caller is responsible for retaining the buffers beforehand.
+   */
+  public ArrowRecordBatch(
+      int length,
+      List<ArrowFieldNode> nodes,
+      List<ArrowBuf> buffers,
+      ArrowBodyCompression bodyCompression,
+      boolean alignBuffers,
+      boolean retainBuffers) {
+    this(length, nodes, buffers, bodyCompression, null, alignBuffers, retainBuffers);
   }
 
   /**
    * Construct a record batch from nodes.
    *
-   * @param length  how many rows in this batch
-   * @param nodes   field level info
+   * @param length how many rows in this batch
+   * @param nodes field level info
    * @param buffers will be retained until this recordBatch is closed
    * @param bodyCompression compression info.
+   * @param variadicBufferCounts the number of buffers in each variadic section.
    * @param alignBuffers Whether to align buffers to an 8 byte boundary.
    */
   public ArrowRecordBatch(
-      int length, List<ArrowFieldNode> nodes, List<ArrowBuf> buffers,
-      ArrowBodyCompression bodyCompression, boolean alignBuffers) {
-    this(length, nodes, buffers, bodyCompression, alignBuffers, /*retainBuffers*/ true);
+      int length,
+      List<ArrowFieldNode> nodes,
+      List<ArrowBuf> buffers,
+      ArrowBodyCompression bodyCompression,
+      List<Long> variadicBufferCounts,
+      boolean alignBuffers) {
+    this(
+        length,
+        nodes,
+        buffers,
+        bodyCompression,
+        variadicBufferCounts,
+        alignBuffers, /*retainBuffers*/
+        true);
   }
 
   /**
    * Construct a record batch from nodes.
    *
-   * @param length  how many rows in this batch
-   * @param nodes   field level info
+   * @param length how many rows in this batch
+   * @param nodes field level info
    * @param buffers will be retained until this recordBatch is closed
    * @param bodyCompression compression info.
+   * @param variadicBufferCounts the number of buffers in each variadic section.
    * @param alignBuffers Whether to align buffers to an 8 byte boundary.
-   * @param retainBuffers Whether to retain() each source buffer in the constructor. If false, the caller is
-   *                      responsible for retaining the buffers beforehand.
+   * @param retainBuffers Whether to retain() each source buffer in the constructor. If false, the
+   *     caller is responsible for retaining the buffers beforehand.
    */
   public ArrowRecordBatch(
-      int length, List<ArrowFieldNode> nodes, List<ArrowBuf> buffers,
-      ArrowBodyCompression bodyCompression, boolean alignBuffers, boolean retainBuffers) {
+      int length,
+      List<ArrowFieldNode> nodes,
+      List<ArrowBuf> buffers,
+      ArrowBodyCompression bodyCompression,
+      List<Long> variadicBufferCounts,
+      boolean alignBuffers,
+      boolean retainBuffers) {
     super();
     this.length = length;
     this.nodes = nodes;
     this.buffers = buffers;
     Preconditions.checkArgument(bodyCompression != null, "body compression cannot be null");
     this.bodyCompression = bodyCompression;
+    this.variadicBufferCounts = variadicBufferCounts;
     List<ArrowBuffer> arrowBuffers = new ArrayList<>(buffers.size());
     long offset = 0;
     for (ArrowBuf arrowBuf : buffers) {
@@ -128,13 +183,18 @@ public ArrowRecordBatch(
   // <code>retain</code> method is not called, so the first <code>dummy</code> parameter is used
   // to distinguish this from the public constructor.
   private ArrowRecordBatch(
-      boolean dummy, int length, List<ArrowFieldNode> nodes,
-      List<ArrowBuf> buffers, ArrowBodyCompression bodyCompression) {
+      boolean dummy,
+      int length,
+      List<ArrowFieldNode> nodes,
+      List<ArrowBuf> buffers,
+      ArrowBodyCompression bodyCompression,
+      List<Long> variadicBufferCounts) {
     this.length = length;
     this.nodes = nodes;
     this.buffers = buffers;
     Preconditions.checkArgument(bodyCompression != null, "body compression cannot be null");
     this.bodyCompression = bodyCompression;
+    this.variadicBufferCounts = variadicBufferCounts;
     this.closed = false;
     List<ArrowBuffer> arrowBuffers = new ArrayList<>();
     long offset = 0;
@@ -179,6 +239,15 @@ public List<ArrowBuf> getBuffers() {
     return buffers;
   }
 
+  /**
+   * Get the record batch variadic buffer counts.
+   *
+   * @return the variadic buffer counts
+   */
+  public List<Long> getVariadicBufferCounts() {
+    return variadicBufferCounts;
+  }
+
   /**
    * Create a new ArrowRecordBatch which has the same information as this batch but whose buffers
    * are owned by that Allocator.
@@ -188,14 +257,18 @@ public List<ArrowBuf> getBuffers() {
    * @return A cloned ArrowRecordBatch
    */
   public ArrowRecordBatch cloneWithTransfer(final BufferAllocator allocator) {
-    final List<ArrowBuf> newBufs = buffers.stream()
-        .map(buf ->
-          (buf.getReferenceManager().transferOwnership(buf, allocator)
-            .getTransferredBuffer())
-            .writerIndex(buf.writerIndex()))
-        .collect(Collectors.toList());
+    final List<ArrowBuf> newBufs =
+        buffers.stream()
+            .map(
+                buf ->
+                    (buf.getReferenceManager()
+                            .transferOwnership(buf, allocator)
+                            .getTransferredBuffer())
+                        .writerIndex(buf.writerIndex()))
+            .collect(Collectors.toList());
     close();
-    return new ArrowRecordBatch(false, length, nodes, newBufs, bodyCompression);
+    return new ArrowRecordBatch(
+        false, length, nodes, newBufs, bodyCompression, variadicBufferCounts);
   }
 
   /**
@@ -217,6 +290,24 @@ public int writeTo(FlatBufferBuilder builder) {
     if (bodyCompression.getCodec() != NoCompressionCodec.COMPRESSION_TYPE) {
       compressOffset = bodyCompression.writeTo(builder);
     }
+
+    // Start the variadicBufferCounts vector.
+    int variadicBufferCountsOffset = 0;
+    if (variadicBufferCounts != null && !variadicBufferCounts.isEmpty()) {
+      variadicBufferCountsOffset = variadicBufferCounts.size();
+      int elementSizeInBytes = 8; // Size of long in bytes
+      builder.startVector(elementSizeInBytes, variadicBufferCountsOffset, elementSizeInBytes);
+
+      // Add each long to the builder. Note that elements should be added in reverse order.
+      for (int i = variadicBufferCounts.size() - 1; i >= 0; i--) {
+        long value = variadicBufferCounts.get(i);
+        builder.addLong(value);
+      }
+
+      // End the vector. This returns an offset that you can use to refer to the vector.
+      variadicBufferCountsOffset = builder.endVector();
+    }
+
     RecordBatch.startRecordBatch(builder);
     RecordBatch.addLength(builder, length);
     RecordBatch.addNodes(builder, nodesOffset);
@@ -224,6 +315,12 @@ public int writeTo(FlatBufferBuilder builder) {
     if (bodyCompression.getCodec() != NoCompressionCodec.COMPRESSION_TYPE) {
       RecordBatch.addCompression(builder, compressOffset);
     }
+
+    // Add the variadicBufferCounts to the RecordBatch
+    if (variadicBufferCounts != null && !variadicBufferCounts.isEmpty()) {
+      RecordBatch.addVariadicBufferCounts(builder, variadicBufferCountsOffset);
+    }
+
     return RecordBatch.endRecordBatch(builder);
   }
 
@@ -232,9 +329,7 @@ public <T> T accepts(ArrowMessageVisitor<T> visitor) {
     return visitor.visit(this);
   }
 
-  /**
-   * Releases the buffers.
-   */
+  /** Releases the buffers. */
   @Override
   public void close() {
     if (!closed) {
@@ -247,13 +342,26 @@ public void close() {
 
   @Override
   public String toString() {
-    return "ArrowRecordBatch [length=" + length + ", nodes=" + nodes + ", #buffers=" + buffers.size() +
-      ", buffersLayout=" + buffersLayout + ", closed=" + closed + "]";
+    int variadicBufCount = 0;
+    if (variadicBufferCounts != null && !variadicBufferCounts.isEmpty()) {
+      variadicBufCount = variadicBufferCounts.size();
+    }
+    return "ArrowRecordBatch [length="
+        + length
+        + ", nodes="
+        + nodes
+        + ", #buffers="
+        + buffers.size()
+        + ", #variadicBufferCounts="
+        + variadicBufCount
+        + ", buffersLayout="
+        + buffersLayout
+        + ", closed="
+        + closed
+        + "]";
   }
 
-  /**
-   * Computes the size of the serialized body for this recordBatch.
-   */
+  /** Computes the size of the serialized body for this recordBatch. */
   @Override
   public long computeBodyLength() {
     long size = 0;
@@ -261,8 +369,8 @@ public long computeBodyLength() {
     List<ArrowBuf> buffers = getBuffers();
     List<ArrowBuffer> buffersLayout = getBuffersLayout();
     if (buffers.size() != buffersLayout.size()) {
-      throw new IllegalStateException("the layout does not match: " +
-          buffers.size() + " != " + buffersLayout.size());
+      throw new IllegalStateException(
+          "the layout does not match: " + buffers.size() + " != " + buffersLayout.size());
     }
 
     for (int i = 0; i < buffers.size(); i++) {
@@ -275,5 +383,4 @@ public long computeBodyLength() {
     }
     return size;
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/FBSerializable.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/FBSerializable.java
index 6b406b594e1a7..1b3f4f0ede39e 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/FBSerializable.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/FBSerializable.java
@@ -14,17 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc.message;
 
 import com.google.flatbuffers.FlatBufferBuilder;
 
-/**
- * Interface for serializing to FlatBuffers.
- */
+/** Interface for serializing to FlatBuffers. */
 public interface FBSerializable {
-  /**
-   * Returns the number of bytes taken to serialize the data in builder after writing to it.
-   */
+  /** Returns the number of bytes taken to serialize the data in builder after writing to it. */
   int writeTo(FlatBufferBuilder builder);
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/FBSerializables.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/FBSerializables.java
index 59b3bb07bcf16..755efc692d26d 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/FBSerializables.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/FBSerializables.java
@@ -14,31 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc.message;
 
+import com.google.flatbuffers.FlatBufferBuilder;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.arrow.flatbuf.KeyValue;
 
-import com.google.flatbuffers.FlatBufferBuilder;
-
-/**
- * Utility methods for {@linkplain org.apache.arrow.vector.ipc.message.FBSerializable}s.
- */
+/** Utility methods for {@linkplain org.apache.arrow.vector.ipc.message.FBSerializable}s. */
 public class FBSerializables {
-  private FBSerializables() {
-  }
+  private FBSerializables() {}
 
   /**
-   * Writes every element of all to builder and calls {@link FlatBufferBuilder#endVector()} afterwards.
-   * Returns the number of result of calling endVector.
+   * Writes every element of all to builder and calls {@link FlatBufferBuilder#endVector()}
+   * afterwards. Returns the number of result of calling endVector.
    */
-  public static int writeAllStructsToVector(FlatBufferBuilder builder, List<? extends FBSerializable> all) {
+  public static int writeAllStructsToVector(
+      FlatBufferBuilder builder, List<? extends FBSerializable> all) {
     // struct vectors have to be created in reverse order
     List<? extends FBSerializable> reversed = new ArrayList<>(all);
     Collections.reverse(reversed);
@@ -48,9 +43,7 @@ public static int writeAllStructsToVector(FlatBufferBuilder builder, List<? exte
     return builder.endVector();
   }
 
-  /**
-   * Writes map data with string type.
-   */
+  /** Writes map data with string type. */
   public static int writeKeyValues(FlatBufferBuilder builder, Map<String, String> metaData) {
     int[] metadataOffsets = new int[metaData.size()];
     Iterator<Map.Entry<String, String>> metadataIterator = metaData.entrySet().iterator();
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/IpcOption.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/IpcOption.java
index 51207584fc18c..5b93faa47f000 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/IpcOption.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/IpcOption.java
@@ -14,14 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc.message;
 
 import org.apache.arrow.vector.types.MetadataVersion;
 
-/**
- * IPC options, now only use for write.
- */
+/** IPC options, now only use for write. */
 public class IpcOption {
 
   // Write the pre-0.15.0 encapsulated IPC message format
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageChannelReader.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageChannelReader.java
index 1c7968d7fa7cf..2b8bf57005548 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageChannelReader.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageChannelReader.java
@@ -14,19 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc.message;
 
 import java.io.IOException;
-
 import org.apache.arrow.flatbuf.Message;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.ipc.ReadChannel;
 
-/**
- * Reads a sequence of messages using a ReadChannel.
- */
+/** Reads a sequence of messages using a ReadChannel. */
 public class MessageChannelReader implements AutoCloseable {
   protected ReadChannel in;
   protected BufferAllocator allocator;
@@ -43,10 +39,9 @@ public MessageChannelReader(ReadChannel in, BufferAllocator allocator) {
   }
 
   /**
-   * Read a message from the ReadChannel and return a MessageResult containing the Message
-   * metadata and optional message body data. Once the end-of-stream has been reached, a null
-   * value will be returned. If the message has no body, then MessageResult.getBodyBuffer()
-   * returns null.
+   * Read a message from the ReadChannel and return a MessageResult containing the Message metadata
+   * and optional message body data. Once the end-of-stream has been reached, a null value will be
+   * returned. If the message has no body, then MessageResult.getBodyBuffer() returns null.
    *
    * @return MessageResult or null if reached end-of-stream
    * @throws IOException on error
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageMetadataResult.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageMetadataResult.java
index e4728822db253..bfde5eba1b78c 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageMetadataResult.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageMetadataResult.java
@@ -14,23 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc.message;
 
 import java.nio.ByteBuffer;
-
 import org.apache.arrow.flatbuf.Message;
 
 /**
- * Class to hold resulting Message metadata and buffer containing the serialized Flatbuffer
- * message when reading messages from a ReadChannel. This handles Message metadata only and
- * does not include the message body data, which should be subsequently read into an ArrowBuf.
+ * Class to hold resulting Message metadata and buffer containing the serialized Flatbuffer message
+ * when reading messages from a ReadChannel. This handles Message metadata only and does not include
+ * the message body data, which should be subsequently read into an ArrowBuf.
  */
 public class MessageMetadataResult {
 
   /**
-   * Construct a container to hold a deserialized Message metadata, and buffer
-   * with the serialized Message as read from a ReadChannel.
+   * Construct a container to hold a deserialized Message metadata, and buffer with the serialized
+   * Message as read from a ReadChannel.
    *
    * @param messageLength the length of the serialized Flatbuffer message in bytes
    * @param messageBuffer contains the serialized Flatbuffer Message metadata
@@ -45,8 +43,8 @@ public class MessageMetadataResult {
   /**
    * Creates a new {@link MessageMetadataResult} by parsing it from the beginning of the buffer.
    *
-   * @param messageLength The length of the serialized flatbuffer message in bytes (might not be equal to the buffer
-   *     size).
+   * @param messageLength The length of the serialized flatbuffer message in bytes (might not be
+   *     equal to the buffer size).
    */
   public static MessageMetadataResult create(ByteBuffer buffer, int messageLength) {
     return new MessageMetadataResult(messageLength, buffer, Message.getRootAsMessage(buffer));
@@ -70,9 +68,7 @@ public ByteBuffer getMessageBuffer() {
     return messageBuffer;
   }
 
-  /**
-   * Returns the bytes remaining in the buffer after parsing the message from it.
-   */
+  /** Returns the bytes remaining in the buffer after parsing the message from it. */
   public int bytesAfterMessage() {
     return message.getByteBuffer().remaining();
   }
@@ -82,8 +78,8 @@ public byte headerType() {
   }
 
   /**
-   * Check if the message is followed by a body. This will be true if the message has a body
-   * length > 0, which indicates that a message body needs to be read from the input source.
+   * Check if the message is followed by a body. This will be true if the message has a body length
+   * > 0, which indicates that a message body needs to be read from the input source.
    *
    * @return true if message has a defined body
    */
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageResult.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageResult.java
index 591fbf1063d64..20f7508dc0394 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageResult.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageResult.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc.message;
 
 import org.apache.arrow.flatbuf.Message;
@@ -27,8 +26,8 @@
 public class MessageResult {
 
   /**
-   * Construct with a valid Message metadata and optional ArrowBuf containing message body
-   * data, if any.
+   * Construct with a valid Message metadata and optional ArrowBuf containing message body data, if
+   * any.
    *
    * @param message Deserialized Flatbuffer Message metadata description
    * @param bodyBuffer Optional ArrowBuf containing message body data, null if message has no body
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageSerializer.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageSerializer.java
index 9deb42c498cbb..36f6ea449b03c 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageSerializer.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageSerializer.java
@@ -14,16 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc.message;
 
 import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
 
+import com.google.flatbuffers.FlatBufferBuilder;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.arrow.flatbuf.Buffer;
 import org.apache.arrow.flatbuf.DictionaryBatch;
 import org.apache.arrow.flatbuf.FieldNode;
@@ -39,22 +38,15 @@
 import org.apache.arrow.vector.ipc.WriteChannel;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-import com.google.flatbuffers.FlatBufferBuilder;
-
 /**
- * Utility class for serializing Messages. Messages are all serialized a similar way.
- * 1. 4 byte little endian message header prefix
- * 2. FB serialized Message: This includes it the body length, which is the serialized
- * body and the type of the message.
- * 3. Serialized message.
+ * Utility class for serializing Messages. Messages are all serialized a similar way. 1. 4 byte
+ * little endian message header prefix 2. FB serialized Message: This includes it the body length,
+ * which is the serialized body and the type of the message. 3. Serialized message.
  *
  * <p>For schema messages, the serialization is simply the FB serialized Schema.
  *
- * <p>For RecordBatch messages the serialization is:
- * 1. 4 byte little endian batch metadata header
- * 2. FB serialized RowBatch
- * 3. Padding to align to 8 byte boundary.
- * 4. serialized RowBatch buffers.
+ * <p>For RecordBatch messages the serialization is: 1. 4 byte little endian batch metadata header
+ * 2. FB serialized RowBatch 3. Padding to align to 8 byte boundary. 4. serialized RowBatch buffers.
  */
 public class MessageSerializer {
 
@@ -68,10 +60,10 @@ public class MessageSerializer {
    * @return converted an native-endian 32-bit integer
    */
   public static int bytesToInt(byte[] bytes) {
-    return ((bytes[3] & 255) << 24) +
-           ((bytes[2] & 255) << 16) +
-           ((bytes[1] & 255) << 8) +
-           ((bytes[0] & 255));
+    return ((bytes[3] & 255) << 24)
+        + ((bytes[2] & 255) << 16)
+        + ((bytes[1] & 255) << 8)
+        + ((bytes[0] & 255));
   }
 
   /**
@@ -104,32 +96,34 @@ public static void longToBytes(long value, byte[] bytes) {
     bytes[0] = (byte) (value);
   }
 
-  public static int writeMessageBuffer(WriteChannel out, int messageLength, ByteBuffer messageBuffer)
-      throws IOException {
+  public static int writeMessageBuffer(
+      WriteChannel out, int messageLength, ByteBuffer messageBuffer) throws IOException {
     return writeMessageBuffer(out, messageLength, messageBuffer, IpcOption.DEFAULT);
   }
 
   /**
    * Write the serialized Message metadata, prefixed by the length, to the output Channel. This
-   * ensures that it aligns to an 8 byte boundary and will adjust the message length to include
-   * any padding used for alignment.
+   * ensures that it aligns to an 8 byte boundary and will adjust the message length to include any
+   * padding used for alignment.
    *
    * @param out Output Channel
    * @param messageLength Number of bytes in the message buffer, written as little Endian prefix
-   * @param messageBuffer Message metadata buffer to be written, this does not include any
-   *                      message body data which should be subsequently written to the Channel
+   * @param messageBuffer Message metadata buffer to be written, this does not include any message
+   *     body data which should be subsequently written to the Channel
    * @param option IPC write options
    * @return Number of bytes written
    * @throws IOException on error
    */
-  public static int writeMessageBuffer(WriteChannel out, int messageLength, ByteBuffer messageBuffer, IpcOption option)
+  public static int writeMessageBuffer(
+      WriteChannel out, int messageLength, ByteBuffer messageBuffer, IpcOption option)
       throws IOException {
 
-    // if write the pre-0.15.0 encapsulated IPC message format consisting of a 4-byte prefix instead of 8 byte
+    // if write the pre-0.15.0 encapsulated IPC message format consisting of a 4-byte prefix instead
+    // of 8 byte
     int prefixSize = option.write_legacy_ipc_format ? 4 : 8;
 
     // ensure that message aligns to 8 byte padding - prefix_size bytes, then message body
-    if ((messageLength + prefixSize ) % 8 != 0) {
+    if ((messageLength + prefixSize) % 8 != 0) {
       messageLength += 8 - (messageLength + prefixSize) % 8;
     }
     if (!option.write_legacy_ipc_format) {
@@ -143,9 +137,7 @@ public static int writeMessageBuffer(WriteChannel out, int messageLength, ByteBu
     return messageLength + prefixSize;
   }
 
-  /**
-   * Serialize a schema object.
-   */
+  /** Serialize a schema object. */
   public static long serialize(WriteChannel out, Schema schema) throws IOException {
     return serialize(out, schema, IpcOption.DEFAULT);
   }
@@ -153,12 +145,13 @@ public static long serialize(WriteChannel out, Schema schema) throws IOException
   /**
    * Serialize a schema object.
    *
-   * @param out    where to write the schema
+   * @param out where to write the schema
    * @param schema the object to serialize to out
    * @return the number of bytes written
    * @throws IOException if something went wrong
    */
-  public static long serialize(WriteChannel out, Schema schema, IpcOption option) throws IOException {
+  public static long serialize(WriteChannel out, Schema schema, IpcOption option)
+      throws IOException {
     long start = out.getCurrentPosition();
     Preconditions.checkArgument(start % 8 == 0, "out is not aligned");
 
@@ -171,22 +164,18 @@ public static long serialize(WriteChannel out, Schema schema, IpcOption option)
     return bytesWritten;
   }
 
-  /**
-   * Returns the serialized flatbuffer bytes of the schema wrapped in a message table.
-   */
+  /** Returns the serialized flatbuffer bytes of the schema wrapped in a message table. */
   @Deprecated
   public static ByteBuffer serializeMetadata(Schema schema) {
     return serializeMetadata(schema, IpcOption.DEFAULT);
   }
 
-  /**
-   * Returns the serialized flatbuffer bytes of the schema wrapped in a message table.
-   */
+  /** Returns the serialized flatbuffer bytes of the schema wrapped in a message table. */
   public static ByteBuffer serializeMetadata(Schema schema, IpcOption writeOption) {
     FlatBufferBuilder builder = new FlatBufferBuilder();
     int schemaOffset = schema.getSchema(builder);
-    return MessageSerializer.serializeMessage(builder, org.apache.arrow.flatbuf.MessageHeader.Schema, schemaOffset, 0,
-        writeOption);
+    return MessageSerializer.serializeMessage(
+        builder, org.apache.arrow.flatbuf.MessageHeader.Schema, schemaOffset, 0, writeOption);
   }
 
   /**
@@ -196,10 +185,13 @@ public static ByteBuffer serializeMetadata(Schema schema, IpcOption writeOption)
    * @return the deserialized Arrow Schema
    */
   public static Schema deserializeSchema(Message schemaMessage) {
-    Preconditions.checkArgument(schemaMessage.headerType() == MessageHeader.Schema,
-        "Expected schema but result was:  %s", schemaMessage.headerType());
-    return Schema.convertSchema((org.apache.arrow.flatbuf.Schema)
-        schemaMessage.header(new org.apache.arrow.flatbuf.Schema()));
+    Preconditions.checkArgument(
+        schemaMessage.headerType() == MessageHeader.Schema,
+        "Expected schema but result was:  %s",
+        schemaMessage.headerType());
+    return Schema.convertSchema(
+        (org.apache.arrow.flatbuf.Schema)
+            schemaMessage.header(new org.apache.arrow.flatbuf.Schema()));
   }
 
   /**
@@ -221,7 +213,8 @@ public static Schema deserializeSchema(ReadChannel in) throws IOException {
   }
 
   /**
-   * Deserializes an Arrow Schema object from a {@link MessageMetadataResult}. Format is from serialize().
+   * Deserializes an Arrow Schema object from a {@link MessageMetadataResult}. Format is from
+   * serialize().
    *
    * @param message a Message of type MessageHeader.Schema
    * @return the deserialized Arrow Schema
@@ -230,9 +223,7 @@ public static Schema deserializeSchema(MessageMetadataResult message) {
     return deserializeSchema(message.getMessage());
   }
 
-  /**
-   * Serializes an ArrowRecordBatch. Returns the offset and length of the written batch.
-   */
+  /** Serializes an ArrowRecordBatch. Returns the offset and length of the written batch. */
   public static ArrowBlock serialize(WriteChannel out, ArrowRecordBatch batch) throws IOException {
     return serialize(out, batch, IpcOption.DEFAULT);
   }
@@ -240,12 +231,13 @@ public static ArrowBlock serialize(WriteChannel out, ArrowRecordBatch batch) thr
   /**
    * Serializes an ArrowRecordBatch. Returns the offset and length of the written batch.
    *
-   * @param out   where to write the batch
+   * @param out where to write the batch
    * @param batch the object to serialize to out
    * @return the serialized block metadata
    * @throws IOException if something went wrong
    */
-  public static ArrowBlock serialize(WriteChannel out, ArrowRecordBatch batch, IpcOption option) throws IOException {
+  public static ArrowBlock serialize(WriteChannel out, ArrowRecordBatch batch, IpcOption option)
+      throws IOException {
 
     long start = out.getCurrentPosition();
     long bodyLength = batch.computeBodyLength();
@@ -261,7 +253,8 @@ public static ArrowBlock serialize(WriteChannel out, ArrowRecordBatch batch, Ipc
       prefixSize = 8;
     }
 
-    // calculate alignment bytes so that metadata length points to the correct location after alignment
+    // calculate alignment bytes so that metadata length points to the correct location after
+    // alignment
     int padding = (int) ((start + metadataLength + prefixSize) % 8);
     if (padding != 0) {
       metadataLength += (8 - padding);
@@ -288,7 +281,8 @@ public static ArrowBlock serialize(WriteChannel out, ArrowRecordBatch batch, Ipc
    * @return the number of bytes written
    * @throws IOException on error
    */
-  public static long writeBatchBuffers(WriteChannel out, ArrowRecordBatch batch) throws IOException {
+  public static long writeBatchBuffers(WriteChannel out, ArrowRecordBatch batch)
+      throws IOException {
     long bufferStart = out.getCurrentPosition();
     List<ArrowBuf> buffers = batch.getBuffers();
     List<ArrowBuffer> buffersLayout = batch.getBuffersLayout();
@@ -302,16 +296,22 @@ public static long writeBatchBuffers(WriteChannel out, ArrowRecordBatch batch) t
       }
       out.write(buffer);
       if (out.getCurrentPosition() != startPosition + layout.getSize()) {
-        throw new IllegalStateException("wrong buffer size: " + out.getCurrentPosition() +
-                                        " != " + startPosition + layout.getSize());
+        throw new IllegalStateException(
+            "wrong buffer size: "
+                + out.getCurrentPosition()
+                + " != "
+                + startPosition
+                + layout.getSize());
       }
     }
+
     out.align();
     return out.getCurrentPosition() - bufferStart;
   }
 
   /**
-   * Returns the serialized form of {@link RecordBatch} wrapped in a {@link org.apache.arrow.flatbuf.Message}.
+   * Returns the serialized form of {@link RecordBatch} wrapped in a {@link
+   * org.apache.arrow.flatbuf.Message}.
    */
   @Deprecated
   public static ByteBuffer serializeMetadata(ArrowMessage message) {
@@ -319,13 +319,14 @@ public static ByteBuffer serializeMetadata(ArrowMessage message) {
   }
 
   /**
-   * Returns the serialized form of {@link RecordBatch} wrapped in a {@link org.apache.arrow.flatbuf.Message}.
+   * Returns the serialized form of {@link RecordBatch} wrapped in a {@link
+   * org.apache.arrow.flatbuf.Message}.
    */
   public static ByteBuffer serializeMetadata(ArrowMessage message, IpcOption writeOption) {
     FlatBufferBuilder builder = new FlatBufferBuilder();
     int batchOffset = message.writeTo(builder);
-    return serializeMessage(builder, message.getMessageType(), batchOffset,
-        message.computeBodyLength(), writeOption);
+    return serializeMessage(
+        builder, message.getMessageType(), batchOffset, message.computeBodyLength(), writeOption);
   }
 
   /**
@@ -336,28 +337,30 @@ public static ByteBuffer serializeMetadata(ArrowMessage message, IpcOption write
    * @return the deserialized ArrowRecordBatch
    * @throws IOException if something went wrong
    */
-  public static ArrowRecordBatch deserializeRecordBatch(Message recordBatchMessage, ArrowBuf bodyBuffer)
-      throws IOException {
+  public static ArrowRecordBatch deserializeRecordBatch(
+      Message recordBatchMessage, ArrowBuf bodyBuffer) throws IOException {
     RecordBatch recordBatchFB = (RecordBatch) recordBatchMessage.header(new RecordBatch());
     return deserializeRecordBatch(recordBatchFB, bodyBuffer);
   }
 
   /**
-   * Deserializes an ArrowRecordBatch read from the input channel. This uses the given allocator
-   * to create an ArrowBuf for the batch body data.
+   * Deserializes an ArrowRecordBatch read from the input channel. This uses the given allocator to
+   * create an ArrowBuf for the batch body data.
    *
    * @param in Channel to read a RecordBatch message and data from
    * @param allocator BufferAllocator to allocate an Arrow buffer to read message body data
    * @return the deserialized ArrowRecordBatch
    * @throws IOException on error
    */
-  public static ArrowRecordBatch deserializeRecordBatch(ReadChannel in, BufferAllocator allocator) throws IOException {
+  public static ArrowRecordBatch deserializeRecordBatch(ReadChannel in, BufferAllocator allocator)
+      throws IOException {
     MessageMetadataResult result = readMessage(in);
     if (result == null) {
       throw new IOException("Unexpected end of input when reading a RecordBatch");
     }
     if (result.getMessage().headerType() != MessageHeader.RecordBatch) {
-      throw new IOException("Expected RecordBatch but header was " + result.getMessage().headerType());
+      throw new IOException(
+          "Expected RecordBatch but header was " + result.getMessage().headerType());
     }
     long bodyLength = result.getMessageBodyLength();
     ArrowBuf bodyBuffer = readMessageBody(in, bodyLength, allocator);
@@ -368,14 +371,14 @@ public static ArrowRecordBatch deserializeRecordBatch(ReadChannel in, BufferAllo
    * Deserializes an ArrowRecordBatch knowing the size of the entire message up front. This
    * minimizes the number of reads to the underlying stream.
    *
-   * @param in    the channel to deserialize from
+   * @param in the channel to deserialize from
    * @param block the object to deserialize to
    * @param alloc to allocate buffers
    * @return the deserialized ArrowRecordBatch
    * @throws IOException if something went wrong
    */
-  public static ArrowRecordBatch deserializeRecordBatch(ReadChannel in, ArrowBlock block, BufferAllocator alloc)
-      throws IOException {
+  public static ArrowRecordBatch deserializeRecordBatch(
+      ReadChannel in, ArrowBlock block, BufferAllocator alloc) throws IOException {
     // Metadata length contains prefix_size bytes plus byte padding
     long totalLen = block.getMetadataLength() + block.getBodyLength();
 
@@ -388,14 +391,13 @@ public static ArrowRecordBatch deserializeRecordBatch(ReadChannel in, ArrowBlock
 
     ArrowBuf metadataBuffer = buffer.slice(prefixSize, block.getMetadataLength() - prefixSize);
 
-    Message messageFB =
-        Message.getRootAsMessage(metadataBuffer.nioBuffer().asReadOnlyBuffer());
+    Message messageFB = Message.getRootAsMessage(metadataBuffer.nioBuffer().asReadOnlyBuffer());
 
     RecordBatch recordBatchFB = (RecordBatch) messageFB.header(new RecordBatch());
 
     // Now read the body
-    final ArrowBuf body = buffer.slice(block.getMetadataLength(),
-         totalLen - block.getMetadataLength());
+    final ArrowBuf body =
+        buffer.slice(block.getMetadataLength(), totalLen - block.getMetadataLength());
     return deserializeRecordBatch(recordBatchFB, body);
   }
 
@@ -407,16 +409,17 @@ public static ArrowRecordBatch deserializeRecordBatch(ReadChannel in, ArrowBlock
    * @return ArrowRecordBatch from metadata and in-memory body
    * @throws IOException on error
    */
-  public static ArrowRecordBatch deserializeRecordBatch(RecordBatch recordBatchFB, ArrowBuf body) throws IOException {
+  public static ArrowRecordBatch deserializeRecordBatch(RecordBatch recordBatchFB, ArrowBuf body)
+      throws IOException {
     // Now read the body
     int nodesLength = recordBatchFB.nodesLength();
     List<ArrowFieldNode> nodes = new ArrayList<>();
     for (int i = 0; i < nodesLength; ++i) {
       FieldNode node = recordBatchFB.nodes(i);
-      if ((int) node.length() != node.length() ||
-          (int) node.nullCount() != node.nullCount()) {
-        throw new IOException("Cannot currently deserialize record batches with " +
-                              "node length larger than INT_MAX records.");
+      if ((int) node.length() != node.length() || (int) node.nullCount() != node.nullCount()) {
+        throw new IOException(
+            "Cannot currently deserialize record batches with "
+                + "node length larger than INT_MAX records.");
       }
       nodes.add(new ArrowFieldNode(node.length(), node.nullCount()));
     }
@@ -427,15 +430,29 @@ public static ArrowRecordBatch deserializeRecordBatch(RecordBatch recordBatchFB,
       buffers.add(vectorBuffer);
     }
 
-    ArrowBodyCompression bodyCompression = recordBatchFB.compression() == null ?
-        NoCompressionCodec.DEFAULT_BODY_COMPRESSION
-        : new ArrowBodyCompression(recordBatchFB.compression().codec(), recordBatchFB.compression().method());
+    ArrowBodyCompression bodyCompression =
+        recordBatchFB.compression() == null
+            ? NoCompressionCodec.DEFAULT_BODY_COMPRESSION
+            : new ArrowBodyCompression(
+                recordBatchFB.compression().codec(), recordBatchFB.compression().method());
+
+    List<Long> variadicBufferCounts = new ArrayList<>();
+    for (int i = 0; i < recordBatchFB.variadicBufferCountsLength(); i++) {
+      variadicBufferCounts.add(recordBatchFB.variadicBufferCounts(i));
+    }
 
     if ((int) recordBatchFB.length() != recordBatchFB.length()) {
-      throw new IOException("Cannot currently deserialize record batches with more than INT_MAX records.");
+      throw new IOException(
+          "Cannot currently deserialize record batches with more than INT_MAX records.");
     }
     ArrowRecordBatch arrowRecordBatch =
-        new ArrowRecordBatch(checkedCastToInt(recordBatchFB.length()), nodes, buffers, bodyCompression);
+        new ArrowRecordBatch(
+            checkedCastToInt(recordBatchFB.length()),
+            nodes,
+            buffers,
+            bodyCompression,
+            variadicBufferCounts,
+            /*alignBuffers*/ true);
     body.getReferenceManager().release();
     return arrowRecordBatch;
   }
@@ -443,20 +460,20 @@ public static ArrowRecordBatch deserializeRecordBatch(RecordBatch recordBatchFB,
   /**
    * Reads a record batch based on the metadata in serializedMessage and the underlying data buffer.
    */
-  public static ArrowRecordBatch deserializeRecordBatch(MessageMetadataResult serializedMessage,
-      ArrowBuf underlying) throws
-      IOException {
+  public static ArrowRecordBatch deserializeRecordBatch(
+      MessageMetadataResult serializedMessage, ArrowBuf underlying) throws IOException {
     return deserializeRecordBatch(serializedMessage.getMessage(), underlying);
   }
 
-  public static ArrowBlock serialize(WriteChannel out, ArrowDictionaryBatch batch) throws IOException {
+  public static ArrowBlock serialize(WriteChannel out, ArrowDictionaryBatch batch)
+      throws IOException {
     return serialize(out, batch, IpcOption.DEFAULT);
   }
 
   /**
    * Serializes a dictionary ArrowRecordBatch. Returns the offset and length of the written batch.
    *
-   * @param out   where to serialize
+   * @param out where to serialize
    * @param batch the batch to serialize
    * @param option options for IPC
    * @return the metadata of the serialized block
@@ -479,7 +496,8 @@ public static ArrowBlock serialize(WriteChannel out, ArrowDictionaryBatch batch,
       prefixSize = 8;
     }
 
-    // calculate alignment bytes so that metadata length points to the correct location after alignment
+    // calculate alignment bytes so that metadata length points to the correct location after
+    // alignment
     int padding = (int) ((start + metadataLength + prefixSize) % 8);
     if (padding != 0) {
       metadataLength += (8 - padding);
@@ -503,29 +521,30 @@ public static ArrowBlock serialize(WriteChannel out, ArrowDictionaryBatch batch,
    * Deserializes an ArrowDictionaryBatch from a dictionary batch Message and data in an ArrowBuf.
    *
    * @param message a message of type MessageHeader.DictionaryBatch
-   * @param bodyBuffer Arrow buffer containing the DictionaryBatch data
-   *                   of type MessageHeader.DictionaryBatch
+   * @param bodyBuffer Arrow buffer containing the DictionaryBatch data of type
+   *     MessageHeader.DictionaryBatch
    * @return the deserialized ArrowDictionaryBatch
    * @throws IOException if something went wrong
    */
-  public static ArrowDictionaryBatch deserializeDictionaryBatch(Message message, ArrowBuf bodyBuffer)
-      throws IOException {
+  public static ArrowDictionaryBatch deserializeDictionaryBatch(
+      Message message, ArrowBuf bodyBuffer) throws IOException {
     DictionaryBatch dictionaryBatchFB = (DictionaryBatch) message.header(new DictionaryBatch());
     ArrowRecordBatch recordBatch = deserializeRecordBatch(dictionaryBatchFB.data(), bodyBuffer);
-    return new ArrowDictionaryBatch(dictionaryBatchFB.id(), recordBatch, dictionaryBatchFB.isDelta());
+    return new ArrowDictionaryBatch(
+        dictionaryBatchFB.id(), recordBatch, dictionaryBatchFB.isDelta());
   }
 
   /**
    * Deserializes an ArrowDictionaryBatch from a dictionary batch Message and data in an ArrowBuf.
    *
    * @param message a message of type MessageHeader.DictionaryBatch
-   * @param bodyBuffer Arrow buffer containing the DictionaryBatch data
-   *                   of type MessageHeader.DictionaryBatch
+   * @param bodyBuffer Arrow buffer containing the DictionaryBatch data of type
+   *     MessageHeader.DictionaryBatch
    * @return the deserialized ArrowDictionaryBatch
    * @throws IOException if something went wrong
    */
-  public static ArrowDictionaryBatch deserializeDictionaryBatch(MessageMetadataResult message, ArrowBuf bodyBuffer)
-      throws IOException {
+  public static ArrowDictionaryBatch deserializeDictionaryBatch(
+      MessageMetadataResult message, ArrowBuf bodyBuffer) throws IOException {
     return deserializeDictionaryBatch(message.getMessage(), bodyBuffer);
   }
 
@@ -538,14 +557,15 @@ public static ArrowDictionaryBatch deserializeDictionaryBatch(MessageMetadataRes
    * @return the deserialized ArrowDictionaryBatch
    * @throws IOException on error
    */
-  public static ArrowDictionaryBatch deserializeDictionaryBatch(ReadChannel in, BufferAllocator allocator)
-      throws IOException {
+  public static ArrowDictionaryBatch deserializeDictionaryBatch(
+      ReadChannel in, BufferAllocator allocator) throws IOException {
     MessageMetadataResult result = readMessage(in);
     if (result == null) {
       throw new IOException("Unexpected end of input when reading a DictionaryBatch");
     }
     if (result.getMessage().headerType() != MessageHeader.DictionaryBatch) {
-      throw new IOException("Expected DictionaryBatch but header was " + result.getMessage().headerType());
+      throw new IOException(
+          "Expected DictionaryBatch but header was " + result.getMessage().headerType());
     }
     long bodyLength = result.getMessageBodyLength();
     ArrowBuf bodyBuffer = readMessageBody(in, bodyLength, allocator);
@@ -553,19 +573,17 @@ public static ArrowDictionaryBatch deserializeDictionaryBatch(ReadChannel in, Bu
   }
 
   /**
-   * Deserializes a DictionaryBatch knowing the size of the entire message up front. This
-   * minimizes the number of reads to the underlying stream.
+   * Deserializes a DictionaryBatch knowing the size of the entire message up front. This minimizes
+   * the number of reads to the underlying stream.
    *
-   * @param in    where to read from
+   * @param in where to read from
    * @param block block metadata for deserializing
    * @param alloc to allocate new buffers
    * @return the deserialized ArrowDictionaryBatch
    * @throws IOException if something went wrong
    */
   public static ArrowDictionaryBatch deserializeDictionaryBatch(
-      ReadChannel in,
-      ArrowBlock block,
-      BufferAllocator alloc) throws IOException {
+      ReadChannel in, ArrowBlock block, BufferAllocator alloc) throws IOException {
     // Metadata length contains integer prefix plus byte padding
     long totalLen = block.getMetadataLength() + block.getBodyLength();
 
@@ -578,16 +596,16 @@ public static ArrowDictionaryBatch deserializeDictionaryBatch(
 
     ArrowBuf metadataBuffer = buffer.slice(prefixSize, block.getMetadataLength() - prefixSize);
 
-    Message messageFB =
-        Message.getRootAsMessage(metadataBuffer.nioBuffer().asReadOnlyBuffer());
+    Message messageFB = Message.getRootAsMessage(metadataBuffer.nioBuffer().asReadOnlyBuffer());
 
     DictionaryBatch dictionaryBatchFB = (DictionaryBatch) messageFB.header(new DictionaryBatch());
 
     // Now read the body
-    final ArrowBuf body = buffer.slice(block.getMetadataLength(),
-         totalLen - block.getMetadataLength());
+    final ArrowBuf body =
+        buffer.slice(block.getMetadataLength(), totalLen - block.getMetadataLength());
     ArrowRecordBatch recordBatch = deserializeRecordBatch(dictionaryBatchFB.data(), body);
-    return new ArrowDictionaryBatch(dictionaryBatchFB.id(), recordBatch, dictionaryBatchFB.isDelta());
+    return new ArrowDictionaryBatch(
+        dictionaryBatchFB.id(), recordBatch, dictionaryBatchFB.isDelta());
   }
 
   /**
@@ -597,7 +615,8 @@ public static ArrowDictionaryBatch deserializeDictionaryBatch(
    * @return The deserialized record batch
    * @throws IOException if the message is not an ArrowDictionaryBatch or ArrowRecordBatch
    */
-  public static ArrowMessage deserializeMessageBatch(MessageChannelReader reader) throws IOException {
+  public static ArrowMessage deserializeMessageBatch(MessageChannelReader reader)
+      throws IOException {
     MessageResult result = reader.readNext();
     if (result == null) {
       return null;
@@ -605,9 +624,11 @@ public static ArrowMessage deserializeMessageBatch(MessageChannelReader reader)
       throw new IOException("Cannot currently deserialize record batches over 2GB");
     }
 
-    if (result.getMessage().version() != MetadataVersion.V4 &&
-        result.getMessage().version() != MetadataVersion.V5) {
-      throw new IOException("Received metadata with an incompatible version number: " + result.getMessage().version());
+    if (result.getMessage().version() != MetadataVersion.V4
+        && result.getMessage().version() != MetadataVersion.V5) {
+      throw new IOException(
+          "Received metadata with an incompatible version number: "
+              + result.getMessage().version());
     }
 
     switch (result.getMessage().headerType()) {
@@ -628,27 +649,25 @@ public static ArrowMessage deserializeMessageBatch(MessageChannelReader reader)
    * @return The deserialized record batch
    * @throws IOException if the message is not an ArrowDictionaryBatch or ArrowRecordBatch
    */
-  public static ArrowMessage deserializeMessageBatch(ReadChannel in, BufferAllocator alloc) throws IOException {
+  public static ArrowMessage deserializeMessageBatch(ReadChannel in, BufferAllocator alloc)
+      throws IOException {
     return deserializeMessageBatch(new MessageChannelReader(in, alloc));
   }
 
   @Deprecated
   public static ByteBuffer serializeMessage(
-      FlatBufferBuilder builder,
-      byte headerType,
-      int headerOffset,
-      long bodyLength) {
+      FlatBufferBuilder builder, byte headerType, int headerOffset, long bodyLength) {
     return serializeMessage(builder, headerType, headerOffset, bodyLength, IpcOption.DEFAULT);
   }
 
   /**
    * Serializes a message header.
    *
-   * @param builder      to write the flatbuf to
-   * @param headerType   headerType field
+   * @param builder to write the flatbuf to
+   * @param headerType headerType field
    * @param headerOffset header offset field
-   * @param bodyLength   body length field
-   * @param writeOption  IPC write options
+   * @param bodyLength body length field
+   * @param writeOption IPC write options
    * @return the corresponding ByteBuffer
    */
   public static ByteBuffer serializeMessage(
@@ -672,8 +691,8 @@ public static ByteBuffer serializeMessage(
    * Message in bytes. Returns null if the end-of-stream has been reached.
    *
    * @param in ReadChannel to read messages from
-   * @return MessageMetadataResult with deserialized Message metadata and message information if
-   *         a valid Message was read, or null if end-of-stream
+   * @return MessageMetadataResult with deserialized Message metadata and message information if a
+   *     valid Message was read, or null if end-of-stream
    * @throws IOException on error
    */
   public static MessageMetadataResult readMessage(ReadChannel in) throws IOException {
@@ -698,10 +717,11 @@ public static MessageMetadataResult readMessage(ReadChannel in) throws IOExcepti
         // Read the message into the buffer.
         ByteBuffer messageBuffer = ByteBuffer.allocate(messageLength);
         if (in.readFully(messageBuffer) != messageLength) {
-          throw new IOException(
-              "Unexpected end of stream trying to read message.");
+          throw new IOException("Unexpected end of stream trying to read message.");
         }
-        messageBuffer.rewind();
+        // see https://github.com/apache/arrow/issues/41717 for reason why we cast to
+        // java.nio.Buffer
+        ByteBuffer rewindBuffer = (ByteBuffer) ((java.nio.Buffer) messageBuffer).rewind();
 
         // Load the message.
         Message message = Message.getRootAsMessage(messageBuffer);
@@ -721,8 +741,8 @@ public static MessageMetadataResult readMessage(ReadChannel in) throws IOExcepti
    * @return an ArrowBuf containing the message body data
    * @throws IOException on error
    */
-  public static ArrowBuf readMessageBody(ReadChannel in, long bodyLength,
-      BufferAllocator allocator) throws IOException {
+  public static ArrowBuf readMessageBody(ReadChannel in, long bodyLength, BufferAllocator allocator)
+      throws IOException {
     ArrowBuf bodyBuffer = allocator.buffer(bodyLength);
     try {
       if (in.readFully(bodyBuffer, bodyLength) != bodyLength) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/table/BaseTable.java b/java/vector/src/main/java/org/apache/arrow/vector/table/BaseTable.java
index 9f645b64bc5f6..86f3b5dca918b 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/table/BaseTable.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/table/BaseTable.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.table;
 
 import java.util.ArrayList;
@@ -22,7 +21,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.FieldVector;
@@ -38,8 +36,8 @@
 
 /**
  * Abstract base class for Table.
- * <p>
- * This API is EXPERIMENTAL.
+ *
+ * <p>This API is EXPERIMENTAL.
  */
 public abstract class BaseTable implements AutoCloseable {
 
@@ -58,7 +56,9 @@ public abstract class BaseTable implements AutoCloseable {
   /** The schema for the table. */
   protected Schema schema;
 
-  /** The number of rows of data in the table; not necessarily the same as the table row capacity. */
+  /**
+   * The number of rows of data in the table; not necessarily the same as the table row capacity.
+   */
   protected int rowCount;
 
   /**
@@ -123,16 +123,14 @@ public FieldReader getReader(Field field) {
    * Returns a FieldReader for the field at the given vector index.
    *
    * @param index The 0-based index of the field desired.
-   * @return  A FieldReader for the requested field
+   * @return A FieldReader for the requested field
    */
   public FieldReader getReader(int index) {
     Preconditions.checkArgument(index >= 0 && index < fieldVectors.size());
     return fieldVectors.get(index).getReader();
   }
 
-  /**
-   * Returns the schema for this Table.
-   */
+  /** Returns the schema for this Table. */
   public Schema getSchema() {
     return schema;
   }
@@ -245,8 +243,8 @@ public VectorSchemaRoot toVectorSchemaRoot() {
   }
 
   /**
-   * Returns the vector with the given name, or throws IllegalArgumentException if the name is not found. Names are
-   * case-sensitive.
+   * Returns the vector with the given name, or throws IllegalArgumentException if the name is not
+   * found. Names are case-sensitive.
    *
    * @param columnName The name of the vector
    * @return the Vector with the given name, or null
@@ -258,7 +256,8 @@ FieldVector getVector(String columnName) {
         return entry.getValue();
       }
     }
-    throw new IllegalArgumentException(String.format("No vector named '%s' is present in the table", columnName));
+    throw new IllegalArgumentException(
+        String.format("No vector named '%s' is present in the table", columnName));
   }
 
   /**
@@ -270,10 +269,9 @@ FieldVector getVector(int columnIndex) {
     return fieldVectors.get(columnIndex);
   }
 
-
   /**
-   * Returns a copy of the vector with the given name, or throws IllegalArgumentException if the name is not found.
-   * Names are case-sensitive.
+   * Returns a copy of the vector with the given name, or throws IllegalArgumentException if the
+   * name is not found. Names are case-sensitive.
    *
    * @param columnName The name of the vector to copy
    * @return A copy of the Vector with the given name
@@ -293,7 +291,8 @@ public FieldVector getVectorCopy(String columnName) {
         return copy;
       }
     }
-    throw new IllegalStateException(String.format("No vector named '%s' is present in the table", columnName));
+    throw new IllegalStateException(
+        String.format("No vector named '%s' is present in the table", columnName));
   }
 
   /**
@@ -314,16 +313,14 @@ public FieldVector getVectorCopy(int columnIndex) {
 
   /**
    * Returns an immutable Row object holding a reference to this table. The default character
-   * encoding used by the cursor to decode Strings will be StandardCharsets.UTF_8 as this is the only charset
-   * supported in Arrow format.
+   * encoding used by the cursor to decode Strings will be StandardCharsets.UTF_8 as this is the
+   * only charset supported in Arrow format.
    */
   public Row immutableRow() {
     return new Row(this);
   }
 
-  /**
-   * Returns a tab separated value of vectors (based on their java object representation).
-   */
+  /** Returns a tab separated value of vectors (based on their java object representation). */
   public String contentToTSVString() {
     StringBuilder sb = new StringBuilder();
     List<Object> row = new ArrayList<>(schema.getFields().size());
@@ -379,10 +376,11 @@ public DictionaryProvider getDictionaryProvider() {
 
   /**
    * Returns a ValueVector containing the decoded version of the vector with the given name.
-   * @param vectorName    The name of the vector to decode
-   * @param dictionaryId  The identifier for the dictionary to use when decoding. Must match the id returned by the
-   *                      dictionary's getId() method.
-   * @return  A ValueVector
+   *
+   * @param vectorName The name of the vector to decode
+   * @param dictionaryId The identifier for the dictionary to use when decoding. Must match the id
+   *     returned by the dictionary's getId() method.
+   * @return A ValueVector
    */
   public ValueVector decode(String vectorName, long dictionaryId) {
     Dictionary dictionary = getDictionary(dictionaryId);
@@ -399,10 +397,11 @@ public ValueVector decode(String vectorName, long dictionaryId) {
 
   /**
    * Returns a ValueVector containing the encoded version of the vector with the given name.
-   * @param vectorName    The name of the vector to encode
-   * @param dictionaryId  The identifier for the dictionary to use when encoding. Must match the id returned by the
-   *                      dictionary's getId() method.
-   * @return  A ValueVector
+   *
+   * @param vectorName The name of the vector to encode
+   * @param dictionaryId The identifier for the dictionary to use when encoding. Must match the id
+   *     returned by the dictionary's getId() method.
+   * @return A ValueVector
    */
   public ValueVector encode(String vectorName, long dictionaryId) {
     Dictionary dictionary = getDictionary(dictionaryId);
@@ -417,7 +416,8 @@ public ValueVector encode(String vectorName, long dictionaryId) {
 
   /**
    * Returns the dictionary with given id.
-   * @param dictionaryId  A long integer that is the id returned by the dictionary's getId() method
+   *
+   * @param dictionaryId A long integer that is the id returned by the dictionary's getId() method
    */
   private Dictionary getDictionary(long dictionaryId) {
     if (dictionaryProvider == null) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/table/Row.java b/java/vector/src/main/java/org/apache/arrow/vector/table/Row.java
index dcc5a4dd5cc8d..b89159b5ee754 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/table/Row.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/table/Row.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.table;
 
 import java.math.BigDecimal;
@@ -26,7 +25,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.BitVector;
@@ -104,17 +102,17 @@
 /**
  * Row is a positionable, immutable cursor backed by a {@link Table}.
  *
- * <p>Getters are provided for most vector types. The exceptions being {@link org.apache.arrow.vector.NullVector},
- * which only contains null values and has no getter, and {@link org.apache.arrow.vector.ZeroVector},
- * which is a zero-length vector of any type
+ * <p>Getters are provided for most vector types. The exceptions being {@link
+ * org.apache.arrow.vector.NullVector}, which only contains null values and has no getter, and
+ * {@link org.apache.arrow.vector.ZeroVector}, which is a zero-length vector of any type
  *
- * <p>
- * This API is EXPERIMENTAL.
+ * <p>This API is EXPERIMENTAL.
  */
 public class Row implements Iterator<Row> {
 
   /**
-   * Returns the standard character set to use for decoding strings. The Arrow format only supports UTF-8.
+   * Returns the standard character set to use for decoding strings. The Arrow format only supports
+   * UTF-8.
    */
   private static final Charset DEFAULT_CHARACTER_SET = StandardCharsets.UTF_8;
 
@@ -140,9 +138,7 @@ public Row(BaseTable table) {
     this.table = table;
   }
 
-  /**
-   * Resets the current row to -1 and returns this object.
-   */
+  /** Resets the current row to -1 and returns this object. */
   public Row resetPosition() {
     rowNumber = -1;
     return this;
@@ -182,9 +178,9 @@ public boolean isNull(int columnIndex) {
   }
 
   /**
-   * Returns an object representing the value in the ExtensionTypeVector at the currentRow and vectorIndex. An
-   * IllegalArgumentException is thrown if the column is not present in the Row and a
-   * ClassCastException is thrown if the type is incorrect.
+   * Returns an object representing the value in the ExtensionTypeVector at the currentRow and
+   * vectorIndex. An IllegalArgumentException is thrown if the column is not present in the Row and
+   * a ClassCastException is thrown if the type is incorrect.
    */
   public Object getExtensionType(int vectorIndex) {
     FieldVector vector = table.getVector(vectorIndex);
@@ -205,9 +201,9 @@ public Object getExtensionType(String columnName) {
   }
 
   /**
-   * Returns a Map from the column of the given vectorIndex at the current row. An IllegalArgumentException is
-   * thrown if the column is not present in the Row and a ClassCastException is thrown if
-   * it has a different type.
+   * Returns a Map from the column of the given vectorIndex at the current row. An
+   * IllegalArgumentException is thrown if the column is not present in the Row and a
+   * ClassCastException is thrown if it has a different type.
    */
   public List<?> getMap(int vectorIndex) {
     ListVector vector = (ListVector) table.getVector(vectorIndex);
@@ -215,9 +211,9 @@ public List<?> getMap(int vectorIndex) {
   }
 
   /**
-   * Returns a Map from the column of the given name at the current row. An IllegalArgumentException is
-   * thrown if the column is not present in the Row and a ClassCastException is thrown if
-   * it has a different type
+   * Returns a Map from the column of the given name at the current row. An IllegalArgumentException
+   * is thrown if the column is not present in the Row and a ClassCastException is thrown if it has
+   * a different type
    */
   public List<?> getMap(String columnName) {
     ListVector vector = (ListVector) table.getVector(columnName);
@@ -285,9 +281,9 @@ public Object getDenseUnion(int vectorIndex) {
   }
 
   /**
-   * Returns a List from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present in the Row and a ClassCastException is thrown
-   * if it has a different type
+   * Returns a List from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present in the Row and a
+   * ClassCastException is thrown if it has a different type
    */
   public List<?> getList(String columnName) {
     ListVector vector = (ListVector) table.getVector(columnName);
@@ -305,9 +301,9 @@ public List<?> getList(int columnIndex) {
   }
 
   /**
-   * Returns an int from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present in the Row and a ClassCastException is thrown
-   * if it has a different type
+   * Returns an int from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present in the Row and a
+   * ClassCastException is thrown if it has a different type
    */
   public int getInt(String columnName) {
     IntVector vector = (IntVector) table.getVector(columnName);
@@ -345,9 +341,9 @@ public void getInt(int columnIndex, NullableIntHolder holder) {
   }
 
   /**
-   * Returns an int from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present in the Row and a ClassCastException is thrown
-   * if it has a different type
+   * Returns an int from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present in the Row and a
+   * ClassCastException is thrown if it has a different type
    */
   public int getUInt4(String columnName) {
     UInt4Vector vector = (UInt4Vector) table.getVector(columnName);
@@ -385,9 +381,9 @@ public void getUInt4(int columnIndex, NullableUInt4Holder holder) {
   }
 
   /**
-   * Returns a short from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a short from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public short getSmallInt(String columnName) {
     SmallIntVector vector = (SmallIntVector) table.getVector(columnName);
@@ -396,8 +392,8 @@ public short getSmallInt(String columnName) {
 
   /**
    * Returns a short from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public short getSmallInt(int columnIndex) {
     SmallIntVector vector = (SmallIntVector) table.getVector(columnIndex);
@@ -406,8 +402,8 @@ public short getSmallInt(int columnIndex) {
 
   /**
    * Updates the holder with the value in the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getSmallInt(String columnName, NullableSmallIntHolder holder) {
     SmallIntVector vector = (SmallIntVector) table.getVector(columnName);
@@ -416,8 +412,8 @@ public void getSmallInt(String columnName, NullableSmallIntHolder holder) {
 
   /**
    * Updates the holder with the value in the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getSmallInt(int columnIndex, NullableSmallIntHolder holder) {
     SmallIntVector vector = (SmallIntVector) table.getVector(columnIndex);
@@ -425,9 +421,9 @@ public void getSmallInt(int columnIndex, NullableSmallIntHolder holder) {
   }
 
   /**
-   * Returns a char from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a char from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public char getUInt2(String columnName) {
     UInt2Vector vector = (UInt2Vector) table.getVector(columnName);
@@ -436,8 +432,8 @@ public char getUInt2(String columnName) {
 
   /**
    * Returns a char from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public char getUInt2(int columnIndex) {
     UInt2Vector vector = (UInt2Vector) table.getVector(columnIndex);
@@ -446,8 +442,8 @@ public char getUInt2(int columnIndex) {
 
   /**
    * Updates the holder with the value in the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getUInt2(String columnName, NullableUInt2Holder holder) {
     UInt2Vector vector = (UInt2Vector) table.getVector(columnName);
@@ -456,8 +452,8 @@ public void getUInt2(String columnName, NullableUInt2Holder holder) {
 
   /**
    * Updates the holder with the value in the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getUInt2(int columnIndex, NullableUInt2Holder holder) {
     UInt2Vector vector = (UInt2Vector) table.getVector(columnIndex);
@@ -465,9 +461,9 @@ public void getUInt2(int columnIndex, NullableUInt2Holder holder) {
   }
 
   /**
-   * Returns a byte from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a byte from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public byte getTinyInt(String columnName) {
     TinyIntVector vector = (TinyIntVector) table.getVector(columnName);
@@ -476,8 +472,8 @@ public byte getTinyInt(String columnName) {
 
   /**
    * Returns a byte from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public byte getTinyInt(int columnIndex) {
     TinyIntVector vector = (TinyIntVector) table.getVector(columnIndex);
@@ -486,8 +482,8 @@ public byte getTinyInt(int columnIndex) {
 
   /**
    * Updates the holder with the value in the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTinyInt(String columnName, NullableTinyIntHolder holder) {
     TinyIntVector vector = (TinyIntVector) table.getVector(columnName);
@@ -496,8 +492,8 @@ public void getTinyInt(String columnName, NullableTinyIntHolder holder) {
 
   /**
    * Updates the holder with the value in the column at the given index and current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTinyInt(int columnIndex, NullableTinyIntHolder holder) {
     TinyIntVector vector = (TinyIntVector) table.getVector(columnIndex);
@@ -505,9 +501,9 @@ public void getTinyInt(int columnIndex, NullableTinyIntHolder holder) {
   }
 
   /**
-   * Returns a byte from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a byte from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public byte getUInt1(String columnName) {
     UInt1Vector vector = (UInt1Vector) table.getVector(columnName);
@@ -516,8 +512,8 @@ public byte getUInt1(String columnName) {
 
   /**
    * Returns a byte from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public byte getUInt1(int columnIndex) {
     UInt1Vector vector = (UInt1Vector) table.getVector(columnIndex);
@@ -526,8 +522,8 @@ public byte getUInt1(int columnIndex) {
 
   /**
    * Updates the holder with the value in the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getUInt1(String columnName, NullableUInt1Holder holder) {
     UInt1Vector vector = (UInt1Vector) table.getVector(columnName);
@@ -536,8 +532,8 @@ public void getUInt1(String columnName, NullableUInt1Holder holder) {
 
   /**
    * Updates the holder with the value in the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getUInt1(int columnIndex, NullableUInt1Holder holder) {
     UInt1Vector vector = (UInt1Vector) table.getVector(columnIndex);
@@ -545,9 +541,9 @@ public void getUInt1(int columnIndex, NullableUInt1Holder holder) {
   }
 
   /**
-   * Returns a long from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a long from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getBigInt(String columnName) {
     BigIntVector vector = (BigIntVector) table.getVector(columnName);
@@ -556,8 +552,8 @@ public long getBigInt(String columnName) {
 
   /**
    * Returns a long from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getBigInt(int columnIndex) {
     BigIntVector vector = (BigIntVector) table.getVector(columnIndex);
@@ -566,8 +562,8 @@ public long getBigInt(int columnIndex) {
 
   /**
    * Updates the holder with the value in the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getBigInt(String columnName, NullableBigIntHolder holder) {
     BigIntVector vector = (BigIntVector) table.getVector(columnName);
@@ -576,8 +572,8 @@ public void getBigInt(String columnName, NullableBigIntHolder holder) {
 
   /**
    * Updates the holder with the value in the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getBigInt(int columnIndex, NullableBigIntHolder holder) {
     BigIntVector vector = (BigIntVector) table.getVector(columnIndex);
@@ -585,9 +581,9 @@ public void getBigInt(int columnIndex, NullableBigIntHolder holder) {
   }
 
   /**
-   * Returns a long from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a long from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getUInt8(String columnName) {
     UInt8Vector vector = (UInt8Vector) table.getVector(columnName);
@@ -596,8 +592,8 @@ public long getUInt8(String columnName) {
 
   /**
    * Returns a long from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getUInt8(int columnIndex) {
     UInt8Vector vector = (UInt8Vector) table.getVector(columnIndex);
@@ -606,8 +602,8 @@ public long getUInt8(int columnIndex) {
 
   /**
    * Updates the holder with the value in the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getUInt8(String columnName, NullableUInt8Holder holder) {
     UInt8Vector vector = (UInt8Vector) table.getVector(columnName);
@@ -616,8 +612,8 @@ public void getUInt8(String columnName, NullableUInt8Holder holder) {
 
   /**
    * Updates the holder with the value in the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getUInt8(int columnIndex, NullableUInt8Holder holder) {
     UInt8Vector vector = (UInt8Vector) table.getVector(columnIndex);
@@ -625,9 +621,9 @@ public void getUInt8(int columnIndex, NullableUInt8Holder holder) {
   }
 
   /**
-   * Returns a float from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a float from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public float getFloat4(String columnName) {
     Float4Vector vector = (Float4Vector) table.getVector(columnName);
@@ -636,8 +632,8 @@ public float getFloat4(String columnName) {
 
   /**
    * Returns a float from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public float getFloat4(int columnIndex) {
     Float4Vector vector = (Float4Vector) table.getVector(columnIndex);
@@ -646,8 +642,8 @@ public float getFloat4(int columnIndex) {
 
   /**
    * Updates the holder with the value in the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getFloat4(String columnName, NullableFloat4Holder holder) {
     Float4Vector vector = (Float4Vector) table.getVector(columnName);
@@ -656,8 +652,8 @@ public void getFloat4(String columnName, NullableFloat4Holder holder) {
 
   /**
    * Updates the holder with the value in the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getFloat4(int columnIndex, NullableFloat4Holder holder) {
     Float4Vector vector = (Float4Vector) table.getVector(columnIndex);
@@ -665,9 +661,9 @@ public void getFloat4(int columnIndex, NullableFloat4Holder holder) {
   }
 
   /**
-   * Returns a double from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a double from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public double getFloat8(String columnName) {
     Float8Vector vector = (Float8Vector) table.getVector(columnName);
@@ -676,8 +672,8 @@ public double getFloat8(String columnName) {
 
   /**
    * Returns a double from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public double getFloat8(int columnIndex) {
     Float8Vector vector = (Float8Vector) table.getVector(columnIndex);
@@ -685,9 +681,9 @@ public double getFloat8(int columnIndex) {
   }
 
   /**
-   * Updates the holder with the value in the column with the given index at the current row.
-   * An IllegalArgumentException is thrown if the column is not present, and a ClassCastException is thrown
-   * if it is present but has a different type
+   * Updates the holder with the value in the column with the given index at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getFloat8(String columnName, NullableFloat8Holder holder) {
     Float8Vector vector = (Float8Vector) table.getVector(columnName);
@@ -696,8 +692,8 @@ public void getFloat8(String columnName, NullableFloat8Holder holder) {
 
   /**
    * Updates the holder with the value in the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getFloat8(int columnIndex, NullableFloat8Holder holder) {
     Float8Vector vector = (Float8Vector) table.getVector(columnIndex);
@@ -706,8 +702,8 @@ public void getFloat8(int columnIndex, NullableFloat8Holder holder) {
 
   /**
    * Returns an int from the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public int getBit(String columnName) {
     BitVector vector = (BitVector) table.getVector(columnName);
@@ -716,8 +712,8 @@ public int getBit(String columnName) {
 
   /**
    * Returns an int from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public int getBit(int columnIndex) {
     BitVector vector = (BitVector) table.getVector(columnIndex);
@@ -726,8 +722,8 @@ public int getBit(int columnIndex) {
 
   /**
    * Updates the holder with the value in the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getBit(String columnName, NullableBitHolder holder) {
     BitVector vector = (BitVector) table.getVector(columnName);
@@ -736,8 +732,8 @@ public void getBit(String columnName, NullableBitHolder holder) {
 
   /**
    * Updates the holder with the value in the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getBit(int columnIndex, NullableBitHolder holder) {
     BitVector vector = (BitVector) table.getVector(columnIndex);
@@ -745,9 +741,9 @@ public void getBit(int columnIndex, NullableBitHolder holder) {
   }
 
   /**
-   * Returns a long from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type.
+   * Returns a long from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public long getDateMilli(String columnName) {
     DateMilliVector vector = (DateMilliVector) table.getVector(columnName);
@@ -756,8 +752,8 @@ public long getDateMilli(String columnName) {
 
   /**
    * Returns a long from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type.
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public long getDateMilli(int columnIndex) {
     DateMilliVector vector = (DateMilliVector) table.getVector(columnIndex);
@@ -766,8 +762,8 @@ public long getDateMilli(int columnIndex) {
 
   /**
    * Updates the holder with the value in the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getDateMilli(String columnName, NullableDateMilliHolder holder) {
     DateMilliVector vector = (DateMilliVector) table.getVector(columnName);
@@ -776,8 +772,8 @@ public void getDateMilli(String columnName, NullableDateMilliHolder holder) {
 
   /**
    * Updates the holder with the value in the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getDateMilli(int columnIndex, NullableDateMilliHolder holder) {
     DateMilliVector vector = (DateMilliVector) table.getVector(columnIndex);
@@ -785,9 +781,9 @@ public void getDateMilli(int columnIndex, NullableDateMilliHolder holder) {
   }
 
   /**
-   * Returns an int from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type.
+   * Returns an int from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public int getDateDay(String columnName) {
     DateDayVector vector = (DateDayVector) table.getVector(columnName);
@@ -796,19 +792,18 @@ public int getDateDay(String columnName) {
 
   /**
    * Returns an int from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type.
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public int getDateDay(int columnIndex) {
     DateDayVector vector = (DateDayVector) table.getVector(columnIndex);
     return vector.get(rowNumber);
   }
 
-
   /**
    * Updates the holder with the value in the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getDateDay(String columnName, NullableDateDayHolder holder) {
     DateDayVector vector = (DateDayVector) table.getVector(columnName);
@@ -817,8 +812,8 @@ public void getDateDay(String columnName, NullableDateDayHolder holder) {
 
   /**
    * Updates the holder with the value in the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getDateDay(int columnIndex, NullableDateDayHolder holder) {
     DateDayVector vector = (DateDayVector) table.getVector(columnIndex);
@@ -826,9 +821,9 @@ public void getDateDay(int columnIndex, NullableDateDayHolder holder) {
   }
 
   /**
-   * Returns a long from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a long from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getTimeNano(String columnName) {
     TimeNanoVector vector = (TimeNanoVector) table.getVector(columnName);
@@ -837,8 +832,8 @@ public long getTimeNano(String columnName) {
 
   /**
    * Returns a long from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getTimeNano(int columnIndex) {
     TimeNanoVector vector = (TimeNanoVector) table.getVector(columnIndex);
@@ -846,9 +841,9 @@ public long getTimeNano(int columnIndex) {
   }
 
   /**
-   * Updates the holder with the value in the column with the given name at the current row.
-   * An IllegalArgumentException is thrown if the column is not present, and a ClassCastException is thrown
-   * if it is present but has a different type
+   * Updates the holder with the value in the column with the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTimeNano(String columnName, NullableTimeNanoHolder holder) {
     TimeNanoVector vector = (TimeNanoVector) table.getVector(columnName);
@@ -857,8 +852,8 @@ public void getTimeNano(String columnName, NullableTimeNanoHolder holder) {
 
   /**
    * Updates the holder with the value in the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type.
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public void getTimeNano(int columnIndex, NullableTimeNanoHolder holder) {
     TimeNanoVector vector = (TimeNanoVector) table.getVector(columnIndex);
@@ -866,9 +861,9 @@ public void getTimeNano(int columnIndex, NullableTimeNanoHolder holder) {
   }
 
   /**
-   * Returns a long from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type.
+   * Returns a long from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public long getTimeMicro(String columnName) {
     TimeMicroVector vector = (TimeMicroVector) table.getVector(columnName);
@@ -877,8 +872,8 @@ public long getTimeMicro(String columnName) {
 
   /**
    * Returns a long from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type.
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public long getTimeMicro(int columnIndex) {
     TimeMicroVector vector = (TimeMicroVector) table.getVector(columnIndex);
@@ -886,9 +881,9 @@ public long getTimeMicro(int columnIndex) {
   }
 
   /**
-   * Updates the holder with the value from the column of the given name at the current row.
-   * An IllegalArgumentException is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type.
+   * Updates the holder with the value from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public void getTimeMicro(String columnName, NullableTimeMicroHolder holder) {
     TimeMicroVector vector = (TimeMicroVector) table.getVector(columnName);
@@ -897,8 +892,8 @@ public void getTimeMicro(String columnName, NullableTimeMicroHolder holder) {
 
   /**
    * Updates the holder with the value from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type.
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public void getTimeMicro(int columnIndex, NullableTimeMicroHolder holder) {
     TimeMicroVector vector = (TimeMicroVector) table.getVector(columnIndex);
@@ -906,9 +901,9 @@ public void getTimeMicro(int columnIndex, NullableTimeMicroHolder holder) {
   }
 
   /**
-   * Returns an int from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type.
+   * Returns an int from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public int getTimeMilli(String columnName) {
     TimeMilliVector vector = (TimeMilliVector) table.getVector(columnName);
@@ -917,8 +912,8 @@ public int getTimeMilli(String columnName) {
 
   /**
    * Returns an int from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type.
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public int getTimeMilli(int columnIndex) {
     TimeMilliVector vector = (TimeMilliVector) table.getVector(columnIndex);
@@ -926,9 +921,9 @@ public int getTimeMilli(int columnIndex) {
   }
 
   /**
-   * Updates the holder with the value from the column of the given name at the current row.
-   * An IllegalArgumentException is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type.
+   * Updates the holder with the value from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public void getTimeMilli(String columnName, NullableTimeMilliHolder holder) {
     TimeMilliVector vector = (TimeMilliVector) table.getVector(columnName);
@@ -937,8 +932,8 @@ public void getTimeMilli(String columnName, NullableTimeMilliHolder holder) {
 
   /**
    * Updates the holder with the value from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type.
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public void getTimeMilli(int columnIndex, NullableTimeMilliHolder holder) {
     TimeMilliVector vector = (TimeMilliVector) table.getVector(columnIndex);
@@ -946,9 +941,9 @@ public void getTimeMilli(int columnIndex, NullableTimeMilliHolder holder) {
   }
 
   /**
-   * Returns a LocalDateTime from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type.
+   * Returns a LocalDateTime from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public LocalDateTime getTimeMilliObj(String columnName) {
     TimeMilliVector vector = (TimeMilliVector) table.getVector(columnName);
@@ -957,8 +952,8 @@ public LocalDateTime getTimeMilliObj(String columnName) {
 
   /**
    * Returns a LocalDateTime from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type.
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public LocalDateTime getTimeMilliObj(int columnIndex) {
     TimeMilliVector vector = (TimeMilliVector) table.getVector(columnIndex);
@@ -966,9 +961,9 @@ public LocalDateTime getTimeMilliObj(int columnIndex) {
   }
 
   /**
-   * Returns an int from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type.
+   * Returns an int from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public int getTimeSec(String columnName) {
     TimeSecVector vector = (TimeSecVector) table.getVector(columnName);
@@ -977,8 +972,8 @@ public int getTimeSec(String columnName) {
 
   /**
    * Returns an int from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type.
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public int getTimeSec(int columnIndex) {
     TimeSecVector vector = (TimeSecVector) table.getVector(columnIndex);
@@ -986,9 +981,9 @@ public int getTimeSec(int columnIndex) {
   }
 
   /**
-   * Updates the holder with the value from the column of the given name at the current row.
-   * An IllegalArgumentException is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type.
+   * Updates the holder with the value from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public void getTimeSec(String columnName, NullableTimeSecHolder holder) {
     TimeSecVector vector = (TimeSecVector) table.getVector(columnName);
@@ -997,8 +992,8 @@ public void getTimeSec(String columnName, NullableTimeSecHolder holder) {
 
   /**
    * Updates the holder with the value from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type.
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public void getTimeSec(int columnIndex, NullableTimeSecHolder holder) {
     TimeSecVector vector = (TimeSecVector) table.getVector(columnIndex);
@@ -1006,9 +1001,9 @@ public void getTimeSec(int columnIndex, NullableTimeSecHolder holder) {
   }
 
   /**
-   * Returns a long from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type.
+   * Returns a long from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type.
    */
   public long getTimeStampSec(String columnName) {
     TimeStampSecVector vector = (TimeStampSecVector) table.getVector(columnName);
@@ -1017,8 +1012,8 @@ public long getTimeStampSec(String columnName) {
 
   /**
    * Returns a long from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getTimeStampSec(int columnIndex) {
     TimeStampSecVector vector = (TimeStampSecVector) table.getVector(columnIndex);
@@ -1026,9 +1021,9 @@ public long getTimeStampSec(int columnIndex) {
   }
 
   /**
-   * Updates the holder with the value from the column of the given name at the current row.
-   * An IllegalArgumentException is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Updates the holder with the value from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTimeStampSec(String columnName, NullableTimeStampSecHolder holder) {
     TimeStampSecVector vector = (TimeStampSecVector) table.getVector(columnName);
@@ -1037,8 +1032,8 @@ public void getTimeStampSec(String columnName, NullableTimeStampSecHolder holder
 
   /**
    * Updates the holder with the value from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTimeStampSec(int columnIndex, NullableTimeStampSecHolder holder) {
     TimeStampSecVector vector = (TimeStampSecVector) table.getVector(columnIndex);
@@ -1046,9 +1041,9 @@ public void getTimeStampSec(int columnIndex, NullableTimeStampSecHolder holder)
   }
 
   /**
-   * Returns a LocalDateTime from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a LocalDateTime from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public LocalDateTime getTimeStampSecObj(String columnName) {
     TimeStampSecVector vector = (TimeStampSecVector) table.getVector(columnName);
@@ -1057,8 +1052,8 @@ public LocalDateTime getTimeStampSecObj(String columnName) {
 
   /**
    * Returns a LocalDateTime from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public LocalDateTime getTimeStampSecObj(int columnIndex) {
     TimeStampSecVector vector = (TimeStampSecVector) table.getVector(columnIndex);
@@ -1066,9 +1061,9 @@ public LocalDateTime getTimeStampSecObj(int columnIndex) {
   }
 
   /**
-   * Updates the holder with the value from the column of the given name at the current row.
-   * An IllegalArgumentException is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Updates the holder with the value from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getTimeStampSecTZ(String columnName) {
     TimeStampSecTZVector vector = (TimeStampSecTZVector) table.getVector(columnName);
@@ -1077,8 +1072,8 @@ public long getTimeStampSecTZ(String columnName) {
 
   /**
    * Returns a long from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getTimeStampSecTZ(int columnIndex) {
     TimeStampSecTZVector vector = (TimeStampSecTZVector) table.getVector(columnIndex);
@@ -1086,9 +1081,9 @@ public long getTimeStampSecTZ(int columnIndex) {
   }
 
   /**
-   * Updates the holder with the value from the column of the given name at the current row.
-   * An IllegalArgumentException is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Updates the holder with the value from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTimeStampSecTZ(String columnName, NullableTimeStampSecTZHolder holder) {
     TimeStampSecTZVector vector = (TimeStampSecTZVector) table.getVector(columnName);
@@ -1096,9 +1091,9 @@ public void getTimeStampSecTZ(String columnName, NullableTimeStampSecTZHolder ho
   }
 
   /**
-   * Updates the holder with the value from the column with the given index at the current row.
-   * An IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * Updates the holder with the value from the column with the given index at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTimeStampSecTZ(int columnIndex, NullableTimeStampSecTZHolder holder) {
     TimeStampSecTZVector vector = (TimeStampSecTZVector) table.getVector(columnIndex);
@@ -1106,9 +1101,9 @@ public void getTimeStampSecTZ(int columnIndex, NullableTimeStampSecTZHolder hold
   }
 
   /**
-   * Returns a long from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a long from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getTimeStampNano(String columnName) {
     TimeStampNanoVector vector = (TimeStampNanoVector) table.getVector(columnName);
@@ -1117,8 +1112,8 @@ public long getTimeStampNano(String columnName) {
 
   /**
    * Returns a long from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getTimeStampNano(int columnIndex) {
     TimeStampNanoVector vector = (TimeStampNanoVector) table.getVector(columnIndex);
@@ -1126,9 +1121,9 @@ public long getTimeStampNano(int columnIndex) {
   }
 
   /**
-   * Updates the holder with the value from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Updates the holder with the value from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTimeStampNano(String columnName, NullableTimeStampNanoHolder holder) {
     TimeStampNanoVector vector = (TimeStampNanoVector) table.getVector(columnName);
@@ -1137,8 +1132,8 @@ public void getTimeStampNano(String columnName, NullableTimeStampNanoHolder hold
 
   /**
    * Updates the holder with the value from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTimeStampNano(int columnIndex, NullableTimeStampNanoHolder holder) {
     TimeStampNanoVector vector = (TimeStampNanoVector) table.getVector(columnIndex);
@@ -1147,8 +1142,8 @@ public void getTimeStampNano(int columnIndex, NullableTimeStampNanoHolder holder
 
   /**
    * Returns a LocalDateTime from the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public LocalDateTime getTimeStampNanoObj(String columnName) {
     TimeStampNanoVector vector = (TimeStampNanoVector) table.getVector(columnName);
@@ -1157,8 +1152,8 @@ public LocalDateTime getTimeStampNanoObj(String columnName) {
 
   /**
    * Returns a LocalDateTime from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public LocalDateTime getTimeStampNanoObj(int columnIndex) {
     TimeStampNanoVector vector = (TimeStampNanoVector) table.getVector(columnIndex);
@@ -1166,9 +1161,9 @@ public LocalDateTime getTimeStampNanoObj(int columnIndex) {
   }
 
   /**
-   * Returns a long from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a long from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getTimeStampNanoTZ(String columnName) {
     TimeStampNanoTZVector vector = (TimeStampNanoTZVector) table.getVector(columnName);
@@ -1177,8 +1172,8 @@ public long getTimeStampNanoTZ(String columnName) {
 
   /**
    * Returns a long from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getTimeStampNanoTZ(int columnIndex) {
     TimeStampNanoTZVector vector = (TimeStampNanoTZVector) table.getVector(columnIndex);
@@ -1186,9 +1181,9 @@ public long getTimeStampNanoTZ(int columnIndex) {
   }
 
   /**
-   * Updates the holder with the value from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Updates the holder with the value from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTimeStampNanoTZ(String columnName, NullableTimeStampNanoTZHolder holder) {
     TimeStampNanoTZVector vector = (TimeStampNanoTZVector) table.getVector(columnName);
@@ -1197,8 +1192,8 @@ public void getTimeStampNanoTZ(String columnName, NullableTimeStampNanoTZHolder
 
   /**
    * Updates the holder with the value from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTimeStampNanoTZ(int columnIndex, NullableTimeStampNanoTZHolder holder) {
     TimeStampNanoTZVector vector = (TimeStampNanoTZVector) table.getVector(columnIndex);
@@ -1206,9 +1201,9 @@ public void getTimeStampNanoTZ(int columnIndex, NullableTimeStampNanoTZHolder ho
   }
 
   /**
-   * Returns a long from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a long from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getTimeStampMilli(String columnName) {
     TimeStampMilliVector vector = (TimeStampMilliVector) table.getVector(columnName);
@@ -1217,8 +1212,8 @@ public long getTimeStampMilli(String columnName) {
 
   /**
    * Returns a long from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getTimeStampMilli(int columnIndex) {
     TimeStampMilliVector vector = (TimeStampMilliVector) table.getVector(columnIndex);
@@ -1226,9 +1221,9 @@ public long getTimeStampMilli(int columnIndex) {
   }
 
   /**
-   * Updates the holder with the value from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Updates the holder with the value from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTimeStampMilli(String columnName, NullableTimeStampMilliHolder holder) {
     TimeStampMilliVector vector = (TimeStampMilliVector) table.getVector(columnName);
@@ -1237,8 +1232,8 @@ public void getTimeStampMilli(String columnName, NullableTimeStampMilliHolder ho
 
   /**
    * Updates the holder with the value from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTimeStampMilli(int columnIndex, NullableTimeStampMilliHolder holder) {
     TimeStampMilliVector vector = (TimeStampMilliVector) table.getVector(columnIndex);
@@ -1247,8 +1242,8 @@ public void getTimeStampMilli(int columnIndex, NullableTimeStampMilliHolder hold
 
   /**
    * Returns a LocalDateTime from the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public LocalDateTime getTimeStampMilliObj(String columnName) {
     TimeStampMilliVector vector = (TimeStampMilliVector) table.getVector(columnName);
@@ -1257,8 +1252,8 @@ public LocalDateTime getTimeStampMilliObj(String columnName) {
 
   /**
    * Returns a LocalDateTime from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public LocalDateTime getTimeStampMilliObj(int columnIndex) {
     TimeStampMilliVector vector = (TimeStampMilliVector) table.getVector(columnIndex);
@@ -1266,9 +1261,9 @@ public LocalDateTime getTimeStampMilliObj(int columnIndex) {
   }
 
   /**
-   * Returns a long from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a long from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getTimeStampMilliTZ(String columnName) {
     TimeStampMilliTZVector vector = (TimeStampMilliTZVector) table.getVector(columnName);
@@ -1277,8 +1272,8 @@ public long getTimeStampMilliTZ(String columnName) {
 
   /**
    * Returns a long from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getTimeStampMilliTZ(int columnIndex) {
     TimeStampMilliTZVector vector = (TimeStampMilliTZVector) table.getVector(columnIndex);
@@ -1286,9 +1281,9 @@ public long getTimeStampMilliTZ(int columnIndex) {
   }
 
   /**
-   * Updates the holder with the value from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different types
+   * Updates the holder with the value from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different types
    */
   public void getTimeStampMilliTZ(String columnName, NullableTimeStampMilliTZHolder holder) {
     TimeStampMilliTZVector vector = (TimeStampMilliTZVector) table.getVector(columnName);
@@ -1297,8 +1292,8 @@ public void getTimeStampMilliTZ(String columnName, NullableTimeStampMilliTZHolde
 
   /**
    * Updates the holder with the value from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTimeStampMilliTZ(int columnIndex, NullableTimeStampMilliTZHolder holder) {
     TimeStampMilliTZVector vector = (TimeStampMilliTZVector) table.getVector(columnIndex);
@@ -1306,9 +1301,9 @@ public void getTimeStampMilliTZ(int columnIndex, NullableTimeStampMilliTZHolder
   }
 
   /**
-   * Returns a long from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a long from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getTimeStampMicro(String columnName) {
     TimeStampMicroVector vector = (TimeStampMicroVector) table.getVector(columnName);
@@ -1317,8 +1312,8 @@ public long getTimeStampMicro(String columnName) {
 
   /**
    * Returns a long from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getTimeStampMicro(int columnIndex) {
     TimeStampMicroVector vector = (TimeStampMicroVector) table.getVector(columnIndex);
@@ -1326,9 +1321,9 @@ public long getTimeStampMicro(int columnIndex) {
   }
 
   /**
-   * Updates the holder with the value from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Updates the holder with the value from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTimeStampMicro(String columnName, NullableTimeStampMicroHolder holder) {
     TimeStampMicroVector vector = (TimeStampMicroVector) table.getVector(columnName);
@@ -1337,8 +1332,8 @@ public void getTimeStampMicro(String columnName, NullableTimeStampMicroHolder ho
 
   /**
    * Updates the holder with the value from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTimeStampMicro(int columnIndex, NullableTimeStampMicroHolder holder) {
     TimeStampMicroVector vector = (TimeStampMicroVector) table.getVector(columnIndex);
@@ -1347,8 +1342,8 @@ public void getTimeStampMicro(int columnIndex, NullableTimeStampMicroHolder hold
 
   /**
    * Returns a LocalDateTime from the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public LocalDateTime getTimeStampMicroObj(String columnName) {
     TimeStampMicroVector vector = (TimeStampMicroVector) table.getVector(columnName);
@@ -1357,8 +1352,8 @@ public LocalDateTime getTimeStampMicroObj(String columnName) {
 
   /**
    * Returns a LocalDateTime from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public LocalDateTime getTimeStampMicroObj(int columnIndex) {
     TimeStampMicroVector vector = (TimeStampMicroVector) table.getVector(columnIndex);
@@ -1366,9 +1361,9 @@ public LocalDateTime getTimeStampMicroObj(int columnIndex) {
   }
 
   /**
-   * Returns a long from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a long from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getTimeStampMicroTZ(String columnName) {
     TimeStampMicroTZVector vector = (TimeStampMicroTZVector) table.getVector(columnName);
@@ -1377,8 +1372,8 @@ public long getTimeStampMicroTZ(String columnName) {
 
   /**
    * Returns a long from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public long getTimeStampMicroTZ(int columnIndex) {
     TimeStampMicroTZVector vector = (TimeStampMicroTZVector) table.getVector(columnIndex);
@@ -1386,9 +1381,9 @@ public long getTimeStampMicroTZ(int columnIndex) {
   }
 
   /**
-   * Updates the holder with the value from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Updates the holder with the value from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTimeStampMicroTZ(String columnName, NullableTimeStampMicroTZHolder holder) {
     TimeStampMicroTZVector vector = (TimeStampMicroTZVector) table.getVector(columnName);
@@ -1397,8 +1392,8 @@ public void getTimeStampMicroTZ(String columnName, NullableTimeStampMicroTZHolde
 
   /**
    * Updates the holder with the value from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getTimeStampMicroTZ(int columnIndex, NullableTimeStampMicroTZHolder holder) {
     TimeStampMicroTZVector vector = (TimeStampMicroTZVector) table.getVector(columnIndex);
@@ -1407,8 +1402,8 @@ public void getTimeStampMicroTZ(int columnIndex, NullableTimeStampMicroTZHolder
 
   /**
    * Returns a Duration from the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public Duration getDurationObj(String columnName) {
     DurationVector vector = (DurationVector) table.getVector(columnName);
@@ -1417,8 +1412,8 @@ public Duration getDurationObj(String columnName) {
 
   /**
    * Returns a Duration from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public Duration getDurationObj(int columnIndex) {
     DurationVector vector = (DurationVector) table.getVector(columnIndex);
@@ -1427,8 +1422,8 @@ public Duration getDurationObj(int columnIndex) {
 
   /**
    * Returns an ArrowBuf from the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public ArrowBuf getDuration(String columnName) {
     DurationVector vector = (DurationVector) table.getVector(columnName);
@@ -1437,8 +1432,8 @@ public ArrowBuf getDuration(String columnName) {
 
   /**
    * Returns an ArrowBuf from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public ArrowBuf getDuration(int columnIndex) {
     DurationVector vector = (DurationVector) table.getVector(columnIndex);
@@ -1447,8 +1442,8 @@ public ArrowBuf getDuration(int columnIndex) {
 
   /**
    * Updates the holder with the value from the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getDuration(String columnName, NullableDurationHolder holder) {
     DurationVector vector = (DurationVector) table.getVector(columnName);
@@ -1457,8 +1452,8 @@ public void getDuration(String columnName, NullableDurationHolder holder) {
 
   /**
    * Updates the holder with the value from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getDuration(int columnIndex, NullableDurationHolder holder) {
     DurationVector vector = (DurationVector) table.getVector(columnIndex);
@@ -1467,8 +1462,8 @@ public void getDuration(int columnIndex, NullableDurationHolder holder) {
 
   /**
    * Returns a PeriodDuration from the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public PeriodDuration getIntervalMonthDayNanoObj(String columnName) {
     IntervalMonthDayNanoVector vector = (IntervalMonthDayNanoVector) table.getVector(columnName);
@@ -1477,8 +1472,8 @@ public PeriodDuration getIntervalMonthDayNanoObj(String columnName) {
 
   /**
    * Returns a PeriodDuration from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public PeriodDuration getIntervalMonthDayNanoObj(int columnIndex) {
     IntervalMonthDayNanoVector vector = (IntervalMonthDayNanoVector) table.getVector(columnIndex);
@@ -1487,8 +1482,8 @@ public PeriodDuration getIntervalMonthDayNanoObj(int columnIndex) {
 
   /**
    * Returns an ArrowBuf from the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public ArrowBuf getIntervalMonthDayNano(String columnName) {
     IntervalMonthDayNanoVector vector = (IntervalMonthDayNanoVector) table.getVector(columnName);
@@ -1497,8 +1492,8 @@ public ArrowBuf getIntervalMonthDayNano(String columnName) {
 
   /**
    * Returns an ArrowBuf from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public ArrowBuf getIntervalMonthDayNano(int columnIndex) {
     IntervalMonthDayNanoVector vector = (IntervalMonthDayNanoVector) table.getVector(columnIndex);
@@ -1507,8 +1502,8 @@ public ArrowBuf getIntervalMonthDayNano(int columnIndex) {
 
   /**
    * Updates the holder with the value from the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getIntervalMonthDayNano(
       String columnName, NullableIntervalMonthDayNanoHolder holder) {
@@ -1518,8 +1513,8 @@ public void getIntervalMonthDayNano(
 
   /**
    * Updates the holder with the value from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getIntervalMonthDayNano(int columnIndex, NullableIntervalMonthDayNanoHolder holder) {
     IntervalMonthDayNanoVector vector = (IntervalMonthDayNanoVector) table.getVector(columnIndex);
@@ -1528,8 +1523,8 @@ public void getIntervalMonthDayNano(int columnIndex, NullableIntervalMonthDayNan
 
   /**
    * Returns an ArrowBuf from the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public ArrowBuf getIntervalDay(String columnName) {
     IntervalDayVector vector = (IntervalDayVector) table.getVector(columnName);
@@ -1538,8 +1533,8 @@ public ArrowBuf getIntervalDay(String columnName) {
 
   /**
    * Returns an ArrowBuf from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public ArrowBuf getIntervalDay(int columnIndex) {
     IntervalDayVector vector = (IntervalDayVector) table.getVector(columnIndex);
@@ -1548,8 +1543,8 @@ public ArrowBuf getIntervalDay(int columnIndex) {
 
   /**
    * Updates the holder with the value from the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getIntervalDay(String columnName, NullableIntervalDayHolder holder) {
     IntervalDayVector vector = (IntervalDayVector) table.getVector(columnName);
@@ -1558,8 +1553,8 @@ public void getIntervalDay(String columnName, NullableIntervalDayHolder holder)
 
   /**
    * Updates the holder with the value from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getIntervalDay(int columnIndex, NullableIntervalDayHolder holder) {
     IntervalDayVector vector = (IntervalDayVector) table.getVector(columnIndex);
@@ -1568,8 +1563,8 @@ public void getIntervalDay(int columnIndex, NullableIntervalDayHolder holder) {
 
   /**
    * Returns a Duration from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public Duration getIntervalDayObj(int columnIndex) {
     IntervalDayVector vector = (IntervalDayVector) table.getVector(columnIndex);
@@ -1578,8 +1573,8 @@ public Duration getIntervalDayObj(int columnIndex) {
 
   /**
    * Returns a Duration from the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public Duration getIntervalDayObj(String columnName) {
     IntervalDayVector vector = (IntervalDayVector) table.getVector(columnName);
@@ -1587,9 +1582,9 @@ public Duration getIntervalDayObj(String columnName) {
   }
 
   /**
-   * Returns a Period from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a Period from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    *
    * @return a Period of n MONTHS, not YEARS
    */
@@ -1600,8 +1595,8 @@ public Period getIntervalYearObj(String columnName) {
 
   /**
    * Returns a Period from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    *
    * @return a Period of n MONTHS, not YEARS
    */
@@ -1611,9 +1606,9 @@ public Period getIntervalYearObj(int columnIndex) {
   }
 
   /**
-   * Returns an int from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns an int from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    *
    * @return the number of MONTHS in the interval (not YEARS)
    */
@@ -1624,8 +1619,8 @@ public int getIntervalYear(String columnName) {
 
   /**
    * Returns an int from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    *
    * @return the number of MONTHS in the interval (not YEARS)
    */
@@ -1636,10 +1631,11 @@ public int getIntervalYear(int columnIndex) {
 
   /**
    * Updates the holder with the value from the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    *
-   * @param holder  a holder to store the interval. Note that the value of the holder represents MONTHS not years
+   * @param holder a holder to store the interval. Note that the value of the holder represents
+   *     MONTHS not years
    */
   public void getIntervalYear(String columnName, NullableIntervalYearHolder holder) {
     IntervalYearVector vector = (IntervalYearVector) table.getVector(columnName);
@@ -1648,10 +1644,11 @@ public void getIntervalYear(String columnName, NullableIntervalYearHolder holder
 
   /**
    * Updates the holder with the value from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    *
-   * @param holder  a holder to store the interval. Note that the value of the holder represents MONTHS not years
+   * @param holder a holder to store the interval. Note that the value of the holder represents
+   *     MONTHS not years
    */
   public void getIntervalYear(int columnIndex, NullableIntervalYearHolder holder) {
     IntervalYearVector vector = (IntervalYearVector) table.getVector(columnIndex);
@@ -1660,8 +1657,8 @@ public void getIntervalYear(int columnIndex, NullableIntervalYearHolder holder)
 
   /**
    * Updates the value of the holder with data from vector at the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getDecimal(int columnIndex, NullableDecimalHolder holder) {
     DecimalVector vector = (DecimalVector) table.getVector(columnIndex);
@@ -1669,9 +1666,9 @@ public void getDecimal(int columnIndex, NullableDecimalHolder holder) {
   }
 
   /**
-   * Updates the value of the holder with data from the vector with given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * Updates the value of the holder with data from the vector with given name at the current row.
+   * An IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public void getDecimal(String columnName, NullableDecimalHolder holder) {
     DecimalVector vector = (DecimalVector) table.getVector(columnName);
@@ -1680,8 +1677,8 @@ public void getDecimal(String columnName, NullableDecimalHolder holder) {
 
   /**
    * Returns a BigDecimal from the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public BigDecimal getDecimalObj(String columnName) {
     DecimalVector vector = (DecimalVector) table.getVector(columnName);
@@ -1690,8 +1687,8 @@ public BigDecimal getDecimalObj(String columnName) {
 
   /**
    * Returns a BigDecimal from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public BigDecimal getDecimalObj(int columnIndex) {
     DecimalVector vector = (DecimalVector) table.getVector(columnIndex);
@@ -1700,8 +1697,8 @@ public BigDecimal getDecimalObj(int columnIndex) {
 
   /**
    * Returns an ArrowBuf from the column of the given name at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public ArrowBuf getDecimal(String columnName) {
     DecimalVector vector = (DecimalVector) table.getVector(columnName);
@@ -1710,8 +1707,8 @@ public ArrowBuf getDecimal(String columnName) {
 
   /**
    * Returns an ArrowBuf from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public ArrowBuf getDecimal(int columnIndex) {
     DecimalVector vector = (DecimalVector) table.getVector(columnIndex);
@@ -1719,9 +1716,9 @@ public ArrowBuf getDecimal(int columnIndex) {
   }
 
   /**
-   * Returns a byte[] from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a byte[] from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public byte[] getVarBinary(String columnName) {
     VarBinaryVector vector = (VarBinaryVector) table.getVector(columnName);
@@ -1730,8 +1727,8 @@ public byte[] getVarBinary(String columnName) {
 
   /**
    * Returns a byte[] from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public byte[] getVarBinary(int columnIndex) {
     VarBinaryVector vector = (VarBinaryVector) table.getVector(columnIndex);
@@ -1739,9 +1736,9 @@ public byte[] getVarBinary(int columnIndex) {
   }
 
   /**
-   * Returns a byte[] from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a byte[] from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public byte[] getFixedSizeBinary(String columnName) {
     FixedSizeBinaryVector vector = (FixedSizeBinaryVector) table.getVector(columnName);
@@ -1750,8 +1747,8 @@ public byte[] getFixedSizeBinary(String columnName) {
 
   /**
    * Returns a byte[] from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public byte[] getFixedSizeBinary(int columnIndex) {
     FixedSizeBinaryVector vector = (FixedSizeBinaryVector) table.getVector(columnIndex);
@@ -1759,9 +1756,9 @@ public byte[] getFixedSizeBinary(int columnIndex) {
   }
 
   /**
-   * Returns a byte[] from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present, and a ClassCastException is thrown if it is
-   * present but has a different type
+   * Returns a byte[] from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public byte[] getLargeVarBinary(String columnName) {
     LargeVarBinaryVector vector = (LargeVarBinaryVector) table.getVector(columnName);
@@ -1770,8 +1767,8 @@ public byte[] getLargeVarBinary(String columnName) {
 
   /**
    * Returns a byte[] from the column with the given index at the current row. An
-   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException
-   * is thrown if it is present but has a different type
+   * IllegalArgumentException is thrown if the column is not present, and a ClassCastException is
+   * thrown if it is present but has a different type
    */
   public byte[] getLargeVarBinary(int columnIndex) {
     LargeVarBinaryVector vector = (LargeVarBinaryVector) table.getVector(columnIndex);
@@ -1779,9 +1776,9 @@ public byte[] getLargeVarBinary(int columnIndex) {
   }
 
   /**
-   * Returns a String from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present in the Row and a ClassCastException is thrown
-   * if it has a different type
+   * Returns a String from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present in the Row and a
+   * ClassCastException is thrown if it has a different type
    *
    * <p>StandardCharsets.UTF_8 is used as the charset
    */
@@ -1803,9 +1800,9 @@ public String getVarCharObj(int columnIndex) {
   }
 
   /**
-   * Returns a byte[] from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present in the Row and a ClassCastException is thrown
-   * if it has a different type
+   * Returns a byte[] from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present in the Row and a
+   * ClassCastException is thrown if it has a different type
    *
    * <p>StandardCharsets.UTF_8 is used as the charset
    */
@@ -1827,9 +1824,9 @@ public byte[] getVarChar(int columnIndex) {
   }
 
   /**
-   * Returns a String from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present in the Row and a ClassCastException is thrown
-   * if it has a different type
+   * Returns a String from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present in the Row and a
+   * ClassCastException is thrown if it has a different type
    *
    * <p>StandardCharsets.UTF_8 is used as the charset, unless this cursor was created with a default
    * Charset
@@ -1850,9 +1847,9 @@ public String getLargeVarCharObj(int columnIndex) {
   }
 
   /**
-   * Returns a byte[] from the column of the given name at the current row. An IllegalArgumentException
-   * is thrown if the column is not present in the Row and a ClassCastException is thrown
-   * if it has a different type
+   * Returns a byte[] from the column of the given name at the current row. An
+   * IllegalArgumentException is thrown if the column is not present in the Row and a
+   * ClassCastException is thrown if it has a different type
    *
    * <p>StandardCharsets.UTF_8 is used as the charset, unless this cursor was created with a default
    * Charset
@@ -1912,9 +1909,9 @@ private boolean setNextObject() {
   }
 
   /**
-   * Returns new internal iterator that processes every row, deleted or not. Use the
-   * wrapping next() and hasNext() methods rather than using this iterator directly, unless you want
-   * to see any deleted rows.
+   * Returns new internal iterator that processes every row, deleted or not. Use the wrapping next()
+   * and hasNext() methods rather than using this iterator directly, unless you want to see any
+   * deleted rows.
    */
   private Iterator<Integer> intIterator() {
     return new Iterator<Integer>() {
@@ -1940,9 +1937,7 @@ private boolean rowIsDeleted(int rowNumber) {
     return table.isRowDeleted(rowNumber);
   }
 
-  /**
-   * Returns the default character set for use with character vectors.
-   */
+  /** Returns the default character set for use with character vectors. */
   public Charset getDefaultCharacterSet() {
     return DEFAULT_CHARACTER_SET;
   }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/table/Table.java b/java/vector/src/main/java/org/apache/arrow/vector/table/Table.java
index 5768bb0ec75ec..fa269a70995fc 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/table/Table.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/table/Table.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.table;
 
 import java.util.ArrayList;
@@ -24,7 +23,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
-
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
@@ -38,8 +36,7 @@
  *
  * <p>See {@link VectorSchemaRoot} for batch processing use cases
  *
- * <p>
- * This API is EXPERIMENTAL.
+ * <p>This API is EXPERIMENTAL.
  */
 public class Table extends BaseTable implements Iterable<Row> {
 
@@ -99,9 +96,7 @@ public Table(VectorSchemaRoot vsr) {
     vsr.clear();
   }
 
-  /**
-   * Returns a deep copy of this table.
-   */
+  /** Returns a deep copy of this table. */
   public Table copy() {
     List<FieldVector> vectorCopies = new ArrayList<>();
     for (int i = 0; i < getVectorCount(); i++) {
@@ -116,10 +111,14 @@ public Table copy() {
         Dictionary src = dictionaryProvider.lookup(id);
         FieldVector srcVector = src.getVector();
         FieldVector destVector = srcVector.getField().createVector(srcVector.getAllocator());
-        destVector.copyFromSafe(0, srcVector.getValueCount(), srcVector); // TODO: Remove safe copy for perf
+        destVector.copyFromSafe(
+            0, srcVector.getValueCount(), srcVector); // TODO: Remove safe copy for perf
         DictionaryEncoding srcEncoding = src.getEncoding();
-        Dictionary dest = new Dictionary(destVector,
-            new DictionaryEncoding(srcEncoding.getId(), srcEncoding.isOrdered(), srcEncoding.getIndexType()));
+        Dictionary dest =
+            new Dictionary(
+                destVector,
+                new DictionaryEncoding(
+                    srcEncoding.getId(), srcEncoding.isOrdered(), srcEncoding.getIndexType()));
         dictionaryCopies[i] = dest;
         i++;
       }
@@ -127,7 +126,7 @@ public Table copy() {
     }
     return new Table(vectorCopies, (int) getRowCount(), providerCopy);
   }
-  
+
   /**
    * Returns a new Table created by adding the given vector to the vectors in this Table.
    *
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/types/DateUnit.java b/java/vector/src/main/java/org/apache/arrow/vector/types/DateUnit.java
index 8fce12e83aa53..a11034bfa1cc3 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/types/DateUnit.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/types/DateUnit.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.types;
 
-/**
- * Resolutions that dates can be stored at.
- */
+/** Resolutions that dates can be stored at. */
 public enum DateUnit {
   /** Days since epoch. */
   DAY(org.apache.arrow.flatbuf.DateUnit.DAY),
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/types/FloatingPointPrecision.java b/java/vector/src/main/java/org/apache/arrow/vector/types/FloatingPointPrecision.java
index 85c2532236866..ddce41e8b3497 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/types/FloatingPointPrecision.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/types/FloatingPointPrecision.java
@@ -14,14 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.types;
 
 import org.apache.arrow.flatbuf.Precision;
 
-/**
- * Precisions of primitive floating point numbers.
- */
+/** Precisions of primitive floating point numbers. */
 public enum FloatingPointPrecision {
   /** 16-bit (not a standard java type). */
   HALF(Precision.HALF),
@@ -31,7 +28,7 @@ public enum FloatingPointPrecision {
   DOUBLE(Precision.DOUBLE);
 
   private static final FloatingPointPrecision[] valuesByFlatbufId =
-    new FloatingPointPrecision[FloatingPointPrecision.values().length];
+      new FloatingPointPrecision[FloatingPointPrecision.values().length];
 
   static {
     for (FloatingPointPrecision v : FloatingPointPrecision.values()) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/types/IntervalUnit.java b/java/vector/src/main/java/org/apache/arrow/vector/types/IntervalUnit.java
index d2314ea7cce3c..22d8a047032a6 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/types/IntervalUnit.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/types/IntervalUnit.java
@@ -14,21 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.types;
 
-/**
- * Resolutions for Interval Vectors.
- */
+/** Resolutions for Interval Vectors. */
 public enum IntervalUnit {
-  /** Values are stored as number of months (which can be converted into years and months via division). */
+  /**
+   * Values are stored as number of months (which can be converted into years and months via
+   * division).
+   */
   YEAR_MONTH(org.apache.arrow.flatbuf.IntervalUnit.YEAR_MONTH),
   /** Values are stored as some number of days and some number of milliseconds within that day. */
   DAY_TIME(org.apache.arrow.flatbuf.IntervalUnit.DAY_TIME),
   /** Values are stored as number of months, days and nanoseconds. */
   MONTH_DAY_NANO(org.apache.arrow.flatbuf.IntervalUnit.MONTH_DAY_NANO);
 
-  private static final IntervalUnit[] valuesByFlatbufId = new IntervalUnit[IntervalUnit.values().length];
+  private static final IntervalUnit[] valuesByFlatbufId =
+      new IntervalUnit[IntervalUnit.values().length];
 
   static {
     for (IntervalUnit v : IntervalUnit.values()) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/types/MetadataVersion.java b/java/vector/src/main/java/org/apache/arrow/vector/types/MetadataVersion.java
index a0e281960f1bb..f8418afaa4fb3 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/types/MetadataVersion.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/types/MetadataVersion.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.types;
 
-/**
- * Metadata version for Arrow metadata.
- */
+/** Metadata version for Arrow metadata. */
 public enum MetadataVersion {
   /// 0.1.0
   V1(org.apache.arrow.flatbuf.MetadataVersion.V1),
@@ -35,7 +32,6 @@ public enum MetadataVersion {
 
   /// >= 1.0.0
   V5(org.apache.arrow.flatbuf.MetadataVersion.V5),
-
   ;
 
   public static final MetadataVersion DEFAULT = V5;
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/types/TimeUnit.java b/java/vector/src/main/java/org/apache/arrow/vector/types/TimeUnit.java
index dcaebba488862..b0eacb56b43dc 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/types/TimeUnit.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/types/TimeUnit.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.types;
 
-/**
- * Resolutions that times can be stored with.
- */
+/** Resolutions that times can be stored with. */
 public enum TimeUnit {
   SECOND(org.apache.arrow.flatbuf.TimeUnit.SECOND),
   MILLISECOND(org.apache.arrow.flatbuf.TimeUnit.MILLISECOND),
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/types/Types.java b/java/vector/src/main/java/org/apache/arrow/vector/types/Types.java
index 0b0e0d66a98f0..ed099890e1b08 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/types/Types.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/types/Types.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.types;
 
 import static org.apache.arrow.vector.types.FloatingPointPrecision.DOUBLE;
@@ -65,10 +64,13 @@
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.VarBinaryVector;
 import org.apache.arrow.vector.VarCharVector;
+import org.apache.arrow.vector.ViewVarBinaryVector;
+import org.apache.arrow.vector.ViewVarCharVector;
 import org.apache.arrow.vector.complex.DenseUnionVector;
 import org.apache.arrow.vector.complex.FixedSizeListVector;
 import org.apache.arrow.vector.complex.LargeListVector;
 import org.apache.arrow.vector.complex.ListVector;
+import org.apache.arrow.vector.complex.ListViewVector;
 import org.apache.arrow.vector.complex.MapVector;
 import org.apache.arrow.vector.complex.StructVector;
 import org.apache.arrow.vector.complex.UnionVector;
@@ -114,10 +116,13 @@
 import org.apache.arrow.vector.complex.impl.UnionWriter;
 import org.apache.arrow.vector.complex.impl.VarBinaryWriterImpl;
 import org.apache.arrow.vector.complex.impl.VarCharWriterImpl;
+import org.apache.arrow.vector.complex.impl.ViewVarBinaryWriterImpl;
+import org.apache.arrow.vector.complex.impl.ViewVarCharWriterImpl;
 import org.apache.arrow.vector.complex.writer.FieldWriter;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.ArrowType.ArrowTypeVisitor;
 import org.apache.arrow.vector.types.pojo.ArrowType.Binary;
+import org.apache.arrow.vector.types.pojo.ArrowType.BinaryView;
 import org.apache.arrow.vector.types.pojo.ArrowType.Bool;
 import org.apache.arrow.vector.types.pojo.ArrowType.Date;
 import org.apache.arrow.vector.types.pojo.ArrowType.Decimal;
@@ -131,6 +136,7 @@
 import org.apache.arrow.vector.types.pojo.ArrowType.LargeBinary;
 import org.apache.arrow.vector.types.pojo.ArrowType.LargeUtf8;
 import org.apache.arrow.vector.types.pojo.ArrowType.List;
+import org.apache.arrow.vector.types.pojo.ArrowType.ListView;
 import org.apache.arrow.vector.types.pojo.ArrowType.Map;
 import org.apache.arrow.vector.types.pojo.ArrowType.Null;
 import org.apache.arrow.vector.types.pojo.ArrowType.Struct;
@@ -138,6 +144,7 @@
 import org.apache.arrow.vector.types.pojo.ArrowType.Timestamp;
 import org.apache.arrow.vector.types.pojo.ArrowType.Union;
 import org.apache.arrow.vector.types.pojo.ArrowType.Utf8;
+import org.apache.arrow.vector.types.pojo.ArrowType.Utf8View;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.util.CallBack;
@@ -145,16 +152,12 @@
 /** An enumeration of all logical types supported by this library. */
 public class Types {
 
-  /**
-   * The actual enumeration of types.
-   */
+  /** The actual enumeration of types. */
   public enum MinorType {
     NULL(Null.INSTANCE) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new NullVector(field.getName());
       }
 
@@ -166,10 +169,9 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     STRUCT(Struct.INSTANCE) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
-        return new StructVector(field.getName(), allocator, field.getFieldType(), schemaChangeCallback);
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
+        return new StructVector(
+            field.getName(), allocator, field.getFieldType(), schemaChangeCallback);
       }
 
       @Override
@@ -180,9 +182,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     TINYINT(new Int(8, true)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new TinyIntVector(field, allocator);
       }
 
@@ -194,9 +194,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     SMALLINT(new Int(16, true)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new SmallIntVector(field, allocator);
       }
 
@@ -208,9 +206,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     INT(new Int(32, true)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new IntVector(field, allocator);
       }
 
@@ -222,9 +218,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     BIGINT(new Int(64, true)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new BigIntVector(field, allocator);
       }
 
@@ -236,9 +230,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     DATEDAY(new Date(DateUnit.DAY)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new DateDayVector(field, allocator);
       }
 
@@ -250,9 +242,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     DATEMILLI(new Date(DateUnit.MILLISECOND)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new DateMilliVector(field, allocator);
       }
 
@@ -264,9 +254,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     TIMESEC(new Time(TimeUnit.SECOND, 32)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new TimeSecVector(field, allocator);
       }
 
@@ -278,9 +266,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     TIMEMILLI(new Time(TimeUnit.MILLISECOND, 32)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new TimeMilliVector(field, allocator);
       }
 
@@ -292,9 +278,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     TIMEMICRO(new Time(TimeUnit.MICROSECOND, 64)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new TimeMicroVector(field, allocator);
       }
 
@@ -306,9 +290,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     TIMENANO(new Time(TimeUnit.NANOSECOND, 64)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new TimeNanoVector(field, allocator);
       }
 
@@ -321,9 +303,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     TIMESTAMPSEC(new Timestamp(org.apache.arrow.vector.types.TimeUnit.SECOND, null)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new TimeStampSecVector(field, allocator);
       }
 
@@ -336,9 +316,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     TIMESTAMPMILLI(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MILLISECOND, null)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new TimeStampMilliVector(field, allocator);
       }
 
@@ -351,9 +329,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     TIMESTAMPMICRO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.MICROSECOND, null)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new TimeStampMicroVector(field, allocator);
       }
 
@@ -366,9 +342,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     TIMESTAMPNANO(new Timestamp(org.apache.arrow.vector.types.TimeUnit.NANOSECOND, null)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new TimeStampNanoVector(field, allocator);
       }
 
@@ -380,9 +354,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     INTERVALDAY(new Interval(IntervalUnit.DAY_TIME)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new IntervalDayVector(field, allocator);
       }
 
@@ -394,9 +366,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     INTERVALMONTHDAYNANO(new Interval(IntervalUnit.MONTH_DAY_NANO)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new IntervalMonthDayNanoVector(field, allocator);
       }
 
@@ -408,9 +378,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     DURATION(null) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new DurationVector(field, allocator);
       }
 
@@ -420,13 +388,10 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
       }
     },
 
-
     INTERVALYEAR(new Interval(IntervalUnit.YEAR_MONTH)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new IntervalYearVector(field, allocator);
       }
 
@@ -437,7 +402,8 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     },
     FLOAT2(new FloatingPoint(HALF)) {
       @Override
-      public FieldVector getNewVector(Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
+      public FieldVector getNewVector(
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new Float2Vector(field, allocator);
       }
 
@@ -450,9 +416,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     FLOAT4(new FloatingPoint(SINGLE)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new Float4Vector(field, allocator);
       }
 
@@ -465,9 +429,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     FLOAT8(new FloatingPoint(DOUBLE)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new Float8Vector(field, allocator);
       }
 
@@ -479,9 +441,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     BIT(Bool.INSTANCE) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new BitVector(field, allocator);
       }
 
@@ -493,9 +453,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     VARCHAR(Utf8.INSTANCE) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new VarCharVector(field, allocator);
       }
 
@@ -504,12 +462,22 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
         return new VarCharWriterImpl((VarCharVector) vector);
       }
     },
+    VIEWVARCHAR(Utf8View.INSTANCE) {
+      @Override
+      public FieldVector getNewVector(
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
+        return new ViewVarCharVector(field, allocator);
+      }
+
+      @Override
+      public FieldWriter getNewFieldWriter(ValueVector vector) {
+        return new ViewVarCharWriterImpl((ViewVarCharVector) vector);
+      }
+    },
     LARGEVARCHAR(LargeUtf8.INSTANCE) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new LargeVarCharVector(field, allocator);
       }
 
@@ -521,9 +489,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     LARGEVARBINARY(LargeBinary.INSTANCE) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new LargeVarBinaryVector(field, allocator);
       }
 
@@ -535,9 +501,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     VARBINARY(Binary.INSTANCE) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new VarBinaryVector(field, allocator);
       }
 
@@ -546,12 +510,22 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
         return new VarBinaryWriterImpl((VarBinaryVector) vector);
       }
     },
+    VIEWVARBINARY(BinaryView.INSTANCE) {
+      @Override
+      public FieldVector getNewVector(
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
+        return new ViewVarBinaryVector(field, allocator);
+      }
+
+      @Override
+      public FieldWriter getNewFieldWriter(ValueVector vector) {
+        return new ViewVarBinaryWriterImpl((ViewVarBinaryVector) vector);
+      }
+    },
     DECIMAL(null) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new DecimalVector(field, allocator);
       }
 
@@ -563,9 +537,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     DECIMAL256(null) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new Decimal256Vector(field, allocator);
       }
 
@@ -577,9 +549,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     FIXEDSIZEBINARY(null) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new FixedSizeBinaryVector(field, allocator);
       }
 
@@ -591,9 +561,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     UINT1(new Int(8, false)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new UInt1Vector(field, allocator);
       }
 
@@ -605,9 +573,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     UINT2(new Int(16, false)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new UInt2Vector(field, allocator);
       }
 
@@ -619,9 +585,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     UINT4(new Int(32, false)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new UInt4Vector(field, allocator);
       }
 
@@ -633,9 +597,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     UINT8(new Int(64, false)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new UInt8Vector(field, allocator);
       }
 
@@ -647,10 +609,22 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     LIST(List.INSTANCE) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
-        return new ListVector(field.getName(), allocator, field.getFieldType(), schemaChangeCallback);
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
+        return new ListVector(
+            field.getName(), allocator, field.getFieldType(), schemaChangeCallback);
+      }
+
+      @Override
+      public FieldWriter getNewFieldWriter(ValueVector vector) {
+        return new UnionListWriter((ListVector) vector);
+      }
+    },
+    LISTVIEW(ListView.INSTANCE) {
+      @Override
+      public FieldVector getNewVector(
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
+        return new ListViewVector(
+            field.getName(), allocator, field.getFieldType(), schemaChangeCallback);
       }
 
       @Override
@@ -660,8 +634,10 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     },
     LARGELIST(ArrowType.LargeList.INSTANCE) {
       @Override
-      public FieldVector getNewVector(Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
-        return new LargeListVector(field.getName(), allocator, field.getFieldType(), schemaChangeCallback);
+      public FieldVector getNewVector(
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
+        return new LargeListVector(
+            field.getName(), allocator, field.getFieldType(), schemaChangeCallback);
       }
 
       @Override
@@ -672,29 +648,27 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     FIXED_SIZE_LIST(null) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
-        return new FixedSizeListVector(field.getName(), allocator, field.getFieldType(), schemaChangeCallback);
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
+        return new FixedSizeListVector(
+            field.getName(), allocator, field.getFieldType(), schemaChangeCallback);
       }
 
       @Override
       public FieldWriter getNewFieldWriter(ValueVector vector) {
-        throw new UnsupportedOperationException("FieldWriter not implemented for FixedSizeList " +
-          "type");
+        throw new UnsupportedOperationException(
+            "FieldWriter not implemented for FixedSizeList " + "type");
       }
     },
     UNION(new Union(Sparse, null)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         if (field.getFieldType().getDictionary() != null) {
-          throw new UnsupportedOperationException("Dictionary encoding not supported for complex " +
-              "types");
+          throw new UnsupportedOperationException(
+              "Dictionary encoding not supported for complex " + "types");
         }
-        return new UnionVector(field.getName(), allocator, field.getFieldType(), schemaChangeCallback);
+        return new UnionVector(
+            field.getName(), allocator, field.getFieldType(), schemaChangeCallback);
       }
 
       @Override
@@ -705,14 +679,13 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     DENSEUNION(new Union(Dense, null)) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         if (field.getFieldType().getDictionary() != null) {
-          throw new UnsupportedOperationException("Dictionary encoding not supported for complex " +
-              "types");
+          throw new UnsupportedOperationException(
+              "Dictionary encoding not supported for complex " + "types");
         }
-        return new DenseUnionVector(field.getName(), allocator, field.getFieldType(), schemaChangeCallback);
+        return new DenseUnionVector(
+            field.getName(), allocator, field.getFieldType(), schemaChangeCallback);
       }
 
       @Override
@@ -723,10 +696,9 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     MAP(null) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
-        return new MapVector(field.getName(), allocator, field.getFieldType(), schemaChangeCallback);
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
+        return new MapVector(
+            field.getName(), allocator, field.getFieldType(), schemaChangeCallback);
       }
 
       @Override
@@ -737,9 +709,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     TIMESTAMPSECTZ(null) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new TimeStampSecTZVector(field, allocator);
       }
 
@@ -751,9 +721,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     TIMESTAMPMILLITZ(null) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new TimeStampMilliTZVector(field, allocator);
       }
 
@@ -765,9 +733,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     TIMESTAMPMICROTZ(null) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new TimeStampMicroTZVector(field, allocator);
       }
 
@@ -779,9 +745,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     TIMESTAMPNANOTZ(null) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
         return new TimeStampNanoTZVector(field, allocator);
       }
 
@@ -793,16 +757,17 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
     EXTENSIONTYPE(null) {
       @Override
       public FieldVector getNewVector(
-          Field field,
-          BufferAllocator allocator,
-          CallBack schemaChangeCallback) {
-        return ((ExtensionType) field.getFieldType().getType()).getNewVector(field.getName(),
-            field.getFieldType(), allocator);
+          Field field, BufferAllocator allocator, CallBack schemaChangeCallback) {
+        return ((ExtensionType) field.getFieldType().getType())
+            .getNewVector(field.getName(), field.getFieldType(), allocator);
       }
 
       @Override
       public FieldWriter getNewFieldWriter(ValueVector vector) {
-        return ((ExtensionTypeVector) vector).getUnderlyingVector().getMinorType().getNewFieldWriter(vector);
+        return ((ExtensionTypeVector) vector)
+            .getUnderlyingVector()
+            .getMinorType()
+            .getNewFieldWriter(vector);
       }
     },
     ;
@@ -813,9 +778,7 @@ public FieldWriter getNewFieldWriter(ValueVector vector) {
       this.type = type;
     }
 
-    /**
-     * Returns the {@link ArrowType} equivalent of this type.
-     */
+    /** Returns the {@link ArrowType} equivalent of this type. */
     public final ArrowType getType() {
       if (type == null) {
         throw new UnsupportedOperationException("Cannot get simple type for type " + name());
@@ -834,197 +797,209 @@ public final FieldVector getNewVector(
 
     /** Constructs a new vector for the given type. */
     public abstract FieldVector getNewVector(
-        Field field,
-        BufferAllocator allocator,
-        CallBack schemaChangeCallback);
+        Field field, BufferAllocator allocator, CallBack schemaChangeCallback);
 
     public abstract FieldWriter getNewFieldWriter(ValueVector vector);
   }
 
-  /**
-   * Maps the ArrowType to the java implementations MinorType.
-   */
+  /** Maps the ArrowType to the java implementations MinorType. */
   public static MinorType getMinorTypeForArrowType(ArrowType arrowType) {
-    return arrowType.accept(new ArrowTypeVisitor<MinorType>() {
-      @Override
-      public MinorType visit(Null type) {
-        return MinorType.NULL;
-      }
-
-      @Override
-      public MinorType visit(Struct type) {
-        return MinorType.STRUCT;
-      }
-
-      @Override
-      public MinorType visit(List type) {
-        return MinorType.LIST;
-      }
-
-      @Override
-      public MinorType visit(FixedSizeList type) {
-        return MinorType.FIXED_SIZE_LIST;
-      }
-
-      @Override
-      public MinorType visit(Union type) {
-        switch (type.getMode()) {
-          case Sparse:
-            return MinorType.UNION;
-          case Dense:
-            return MinorType.DENSEUNION;
-          default:
-            throw new IllegalArgumentException("only Dense or Sparse unions supported: " + type);
-        }
-      }
-
-      @Override
-      public MinorType visit(Map type) {
-        return MinorType.MAP;
-      }
-
-      @Override
-      public MinorType visit(ArrowType.LargeList type) {
-        return MinorType.LARGELIST;
-      }
-
-      @Override
-      public MinorType visit(Int type) {
-        switch (type.getBitWidth()) {
-          case 8:
-            return type.getIsSigned() ? MinorType.TINYINT : MinorType.UINT1;
-          case 16:
-            return type.getIsSigned() ? MinorType.SMALLINT : MinorType.UINT2;
-          case 32:
-            return type.getIsSigned() ? MinorType.INT : MinorType.UINT4;
-          case 64:
-            return type.getIsSigned() ? MinorType.BIGINT : MinorType.UINT8;
-          default:
-            throw new IllegalArgumentException("only 8, 16, 32, 64 supported: " + type);
-        }
-      }
-
-      @Override
-      public MinorType visit(FloatingPoint type) {
-        switch (type.getPrecision()) {
-          case HALF:
-            return MinorType.FLOAT2;
-          case SINGLE:
-            return MinorType.FLOAT4;
-          case DOUBLE:
-            return MinorType.FLOAT8;
-          default:
-            throw new IllegalArgumentException("unknown precision: " + type);
-        }
-      }
-
-      @Override
-      public MinorType visit(Utf8 type) {
-        return MinorType.VARCHAR;
-      }
-
-      @Override
-      public Types.MinorType visit(LargeUtf8 type) {
-        return MinorType.LARGEVARCHAR;
-      }
-
-      @Override
-      public MinorType visit(Binary type) {
-        return MinorType.VARBINARY;
-      }
-
-      @Override
-      public MinorType visit(LargeBinary type) {
-        return MinorType.LARGEVARBINARY;
-      }
-
-      @Override
-      public MinorType visit(Bool type) {
-        return MinorType.BIT;
-      }
-
-      @Override
-      public MinorType visit(Decimal type) {
-        if (type.getBitWidth() == 256) {
-          return MinorType.DECIMAL256;
-        }
-        return MinorType.DECIMAL;
-      }
-
-      @Override
-      public MinorType visit(FixedSizeBinary type) {
-        return MinorType.FIXEDSIZEBINARY;
-      }
-
-      @Override
-      public MinorType visit(Date type) {
-        switch (type.getUnit()) {
-          case DAY:
-            return MinorType.DATEDAY;
-          case MILLISECOND:
-            return MinorType.DATEMILLI;
-          default:
-            throw new IllegalArgumentException("unknown unit: " + type);
-        }
-      }
-
-      @Override
-      public MinorType visit(Time type) {
-        switch (type.getUnit()) {
-          case SECOND:
-            return MinorType.TIMESEC;
-          case MILLISECOND:
-            return MinorType.TIMEMILLI;
-          case MICROSECOND:
-            return MinorType.TIMEMICRO;
-          case NANOSECOND:
-            return MinorType.TIMENANO;
-          default:
-            throw new IllegalArgumentException("unknown unit: " + type);
-        }
-      }
-
-      @Override
-      public MinorType visit(Timestamp type) {
-        String tz = type.getTimezone();
-        switch (type.getUnit()) {
-          case SECOND:
-            return tz == null ? MinorType.TIMESTAMPSEC : MinorType.TIMESTAMPSECTZ;
-          case MILLISECOND:
-            return tz == null ? MinorType.TIMESTAMPMILLI : MinorType.TIMESTAMPMILLITZ;
-          case MICROSECOND:
-            return tz == null ? MinorType.TIMESTAMPMICRO : MinorType.TIMESTAMPMICROTZ;
-          case NANOSECOND:
-            return tz == null ? MinorType.TIMESTAMPNANO : MinorType.TIMESTAMPNANOTZ;
-          default:
-            throw new IllegalArgumentException("unknown unit: " + type);
-        }
-      }
-
-      @Override
-      public MinorType visit(Interval type) {
-        switch (type.getUnit()) {
-          case DAY_TIME:
-            return MinorType.INTERVALDAY;
-          case YEAR_MONTH:
-            return MinorType.INTERVALYEAR;
-          case MONTH_DAY_NANO:
-            return MinorType.INTERVALMONTHDAYNANO;
-          default:
-            throw new IllegalArgumentException("unknown unit: " + type);
-        }
-      }
-
-      @Override
-      public MinorType visit(Duration type) {
-        return MinorType.DURATION;
-      }
-
-      @Override
-      public MinorType visit(ExtensionType type) {
-        return MinorType.EXTENSIONTYPE;
-      }
-    });
+    return arrowType.accept(
+        new ArrowTypeVisitor<MinorType>() {
+          @Override
+          public MinorType visit(Null type) {
+            return MinorType.NULL;
+          }
+
+          @Override
+          public MinorType visit(Struct type) {
+            return MinorType.STRUCT;
+          }
+
+          @Override
+          public MinorType visit(List type) {
+            return MinorType.LIST;
+          }
+
+          @Override
+          public MinorType visit(FixedSizeList type) {
+            return MinorType.FIXED_SIZE_LIST;
+          }
+
+          @Override
+          public MinorType visit(Union type) {
+            switch (type.getMode()) {
+              case Sparse:
+                return MinorType.UNION;
+              case Dense:
+                return MinorType.DENSEUNION;
+              default:
+                throw new IllegalArgumentException(
+                    "only Dense or Sparse unions supported: " + type);
+            }
+          }
+
+          @Override
+          public MinorType visit(Map type) {
+            return MinorType.MAP;
+          }
+
+          @Override
+          public MinorType visit(ArrowType.LargeList type) {
+            return MinorType.LARGELIST;
+          }
+
+          @Override
+          public MinorType visit(Int type) {
+            switch (type.getBitWidth()) {
+              case 8:
+                return type.getIsSigned() ? MinorType.TINYINT : MinorType.UINT1;
+              case 16:
+                return type.getIsSigned() ? MinorType.SMALLINT : MinorType.UINT2;
+              case 32:
+                return type.getIsSigned() ? MinorType.INT : MinorType.UINT4;
+              case 64:
+                return type.getIsSigned() ? MinorType.BIGINT : MinorType.UINT8;
+              default:
+                throw new IllegalArgumentException("only 8, 16, 32, 64 supported: " + type);
+            }
+          }
+
+          @Override
+          public MinorType visit(FloatingPoint type) {
+            switch (type.getPrecision()) {
+              case HALF:
+                return MinorType.FLOAT2;
+              case SINGLE:
+                return MinorType.FLOAT4;
+              case DOUBLE:
+                return MinorType.FLOAT8;
+              default:
+                throw new IllegalArgumentException("unknown precision: " + type);
+            }
+          }
+
+          @Override
+          public MinorType visit(Utf8 type) {
+            return MinorType.VARCHAR;
+          }
+
+          @Override
+          public MinorType visit(Utf8View type) {
+            return MinorType.VIEWVARCHAR;
+          }
+
+          @Override
+          public Types.MinorType visit(LargeUtf8 type) {
+            return MinorType.LARGEVARCHAR;
+          }
+
+          @Override
+          public MinorType visit(Binary type) {
+            return MinorType.VARBINARY;
+          }
+
+          @Override
+          public MinorType visit(BinaryView type) {
+            return MinorType.VIEWVARBINARY;
+          }
+
+          @Override
+          public MinorType visit(LargeBinary type) {
+            return MinorType.LARGEVARBINARY;
+          }
+
+          @Override
+          public MinorType visit(Bool type) {
+            return MinorType.BIT;
+          }
+
+          @Override
+          public MinorType visit(Decimal type) {
+            if (type.getBitWidth() == 256) {
+              return MinorType.DECIMAL256;
+            }
+            return MinorType.DECIMAL;
+          }
+
+          @Override
+          public MinorType visit(FixedSizeBinary type) {
+            return MinorType.FIXEDSIZEBINARY;
+          }
+
+          @Override
+          public MinorType visit(Date type) {
+            switch (type.getUnit()) {
+              case DAY:
+                return MinorType.DATEDAY;
+              case MILLISECOND:
+                return MinorType.DATEMILLI;
+              default:
+                throw new IllegalArgumentException("unknown unit: " + type);
+            }
+          }
+
+          @Override
+          public MinorType visit(Time type) {
+            switch (type.getUnit()) {
+              case SECOND:
+                return MinorType.TIMESEC;
+              case MILLISECOND:
+                return MinorType.TIMEMILLI;
+              case MICROSECOND:
+                return MinorType.TIMEMICRO;
+              case NANOSECOND:
+                return MinorType.TIMENANO;
+              default:
+                throw new IllegalArgumentException("unknown unit: " + type);
+            }
+          }
+
+          @Override
+          public MinorType visit(Timestamp type) {
+            String tz = type.getTimezone();
+            switch (type.getUnit()) {
+              case SECOND:
+                return tz == null ? MinorType.TIMESTAMPSEC : MinorType.TIMESTAMPSECTZ;
+              case MILLISECOND:
+                return tz == null ? MinorType.TIMESTAMPMILLI : MinorType.TIMESTAMPMILLITZ;
+              case MICROSECOND:
+                return tz == null ? MinorType.TIMESTAMPMICRO : MinorType.TIMESTAMPMICROTZ;
+              case NANOSECOND:
+                return tz == null ? MinorType.TIMESTAMPNANO : MinorType.TIMESTAMPNANOTZ;
+              default:
+                throw new IllegalArgumentException("unknown unit: " + type);
+            }
+          }
+
+          @Override
+          public MinorType visit(Interval type) {
+            switch (type.getUnit()) {
+              case DAY_TIME:
+                return MinorType.INTERVALDAY;
+              case YEAR_MONTH:
+                return MinorType.INTERVALYEAR;
+              case MONTH_DAY_NANO:
+                return MinorType.INTERVALMONTHDAYNANO;
+              default:
+                throw new IllegalArgumentException("unknown unit: " + type);
+            }
+          }
+
+          @Override
+          public MinorType visit(Duration type) {
+            return MinorType.DURATION;
+          }
+
+          @Override
+          public MinorType visit(ListView type) {
+            return MinorType.LISTVIEW;
+          }
+
+          @Override
+          public MinorType visit(ExtensionType type) {
+            return MinorType.EXTENSIONTYPE;
+          }
+        });
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/types/UnionMode.java b/java/vector/src/main/java/org/apache/arrow/vector/types/UnionMode.java
index 19956ac6a5b51..f1fc35a8ed49e 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/types/UnionMode.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/types/UnionMode.java
@@ -14,22 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.types;
 
-/**
- * Different memory layouts for Union Vectors.
- */
+/** Different memory layouts for Union Vectors. */
 public enum UnionMode {
   /**
-   * Each child vector is the same length as the overall vector, and there is one 8-bit integer buffer to indicate
-   * the index of a child vector to use at any given position.
+   * Each child vector is the same length as the overall vector, and there is one 8-bit integer
+   * buffer to indicate the index of a child vector to use at any given position.
    */
   Sparse(org.apache.arrow.flatbuf.UnionMode.Sparse),
   /**
-   * Each child vector is of variable width.  The parent vector contains both a child index vector (like in
-   * {@link #Sparse}) and in addition a slot index buffer to determine the offset into the child vector indicated
-   * by the index vector.
+   * Each child vector is of variable width. The parent vector contains both a child index vector
+   * (like in {@link #Sparse}) and in addition a slot index buffer to determine the offset into the
+   * child vector indicated by the index vector.
    */
   Dense(org.apache.arrow.flatbuf.UnionMode.Dense);
 
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/DictionaryEncoding.java b/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/DictionaryEncoding.java
index 592e18826f09c..b5e5d8c3aeef3 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/DictionaryEncoding.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/DictionaryEncoding.java
@@ -14,20 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.types.pojo;
 
-import java.util.Objects;
-
-import org.apache.arrow.vector.types.pojo.ArrowType.Int;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Objects;
+import org.apache.arrow.vector.types.pojo.ArrowType.Int;
 
-/**
- * A POJO representation of Arrow Dictionary metadata.
- */
+/** A POJO representation of Arrow Dictionary metadata. */
 public class DictionaryEncoding {
 
   private final long id;
@@ -39,8 +34,8 @@ public class DictionaryEncoding {
    *
    * @param id The ID of the dictionary to use for encoding.
    * @param ordered Whether the keys in values in the dictionary are ordered.
-   * @param indexType (nullable). The integer type to use for indexing in the dictionary. Defaults to a signed
-   *     32 bit integer.
+   * @param indexType (nullable). The integer type to use for indexing in the dictionary. Defaults
+   *     to a signed 32 bit integer.
    */
   @JsonCreator
   public DictionaryEncoding(
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/ExtensionTypeRegistry.java b/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/ExtensionTypeRegistry.java
index f347008b42627..e323bf67d914c 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/ExtensionTypeRegistry.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/ExtensionTypeRegistry.java
@@ -14,17 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.types.pojo;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-
 import org.apache.arrow.vector.types.pojo.ArrowType.ExtensionType;
 
-/**
- * A registry of recognized extension types.
- */
+/** A registry of recognized extension types. */
 public final class ExtensionTypeRegistry {
   private static final ConcurrentMap<String, ExtensionType> registry = new ConcurrentHashMap<>();
 
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Field.java b/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Field.java
index d3623618e7a55..d65ef1bee75fa 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Field.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Field.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.types.pojo;
 
 import static org.apache.arrow.util.Preconditions.checkNotNull;
@@ -22,6 +21,12 @@
 import static org.apache.arrow.vector.types.pojo.ArrowType.getTypeForField;
 import static org.apache.arrow.vector.types.pojo.Schema.convertMetadata;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.flatbuffers.FlatBufferBuilder;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -31,7 +36,6 @@
 import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.flatbuf.KeyValue;
 import org.apache.arrow.flatbuf.Type;
 import org.apache.arrow.memory.BufferAllocator;
@@ -41,16 +45,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.flatbuffers.FlatBufferBuilder;
-
-/**
- * A POJO abstraction for the Flatbuffer description of Vector Type.
- */
+/** A POJO abstraction for the Flatbuffer description of Vector Type. */
 public class Field {
 
   private static final Logger logger = LoggerFactory.getLogger(Field.class);
@@ -102,21 +97,18 @@ private Field(
   public Field(String name, FieldType fieldType, List<Field> children) {
     this.name = name;
     this.fieldType = checkNotNull(fieldType);
-    this.children = children == null ? Collections.emptyList() : Collections2.toImmutableList(children);
+    this.children =
+        children == null ? Collections.emptyList() : Collections2.toImmutableList(children);
   }
 
-  /**
-   * Construct a new vector of this type using the given allocator.
-   */
+  /** Construct a new vector of this type using the given allocator. */
   public FieldVector createVector(BufferAllocator allocator) {
     FieldVector vector = fieldType.createNewSingleVector(this, allocator, null);
     vector.initializeChildrenFromFields(children);
     return vector;
   }
 
-  /**
-   * Constructs a new instance from a flatbuffer representation of the field.
-   */
+  /** Constructs a new instance from a flatbuffer representation of the field. */
   public static Field convertField(org.apache.arrow.flatbuf.Field field) {
     Map<String, String> metadata = new HashMap<>();
     for (int i = 0; i < field.customMetadataLength(); i++) {
@@ -133,7 +125,8 @@ public static Field convertField(org.apache.arrow.flatbuf.Field field) {
 
     if (metadata.containsKey(ExtensionType.EXTENSION_METADATA_KEY_NAME)) {
       final String extensionName = metadata.get(ExtensionType.EXTENSION_METADATA_KEY_NAME);
-      final String extensionMetadata = metadata.getOrDefault(ExtensionType.EXTENSION_METADATA_KEY_METADATA, "");
+      final String extensionMetadata =
+          metadata.getOrDefault(ExtensionType.EXTENSION_METADATA_KEY_METADATA, "");
       ExtensionType extensionType = ExtensionTypeRegistry.lookup(extensionName);
       if (extensionType != null) {
         type = extensionType.deserialize(type, extensionMetadata);
@@ -164,17 +157,19 @@ public static Field convertField(org.apache.arrow.flatbuf.Field field) {
   }
 
   /**
-   * Helper method to ensure backward compatibility with schemas generated prior to ARROW-1347, ARROW-1663.
+   * Helper method to ensure backward compatibility with schemas generated prior to ARROW-1347,
+   * ARROW-1663.
    *
    * @param field the field to check
    * @param originalChildField original field which name might be mutated
    * @return original or mutated field
    */
-  private static Field mutateOriginalNameIfNeeded(org.apache.arrow.flatbuf.Field field, Field originalChildField) {
-    if ((field.typeType() == Type.List || field.typeType() == Type.FixedSizeList) &&
-        originalChildField.getName().equals("[DEFAULT]")) {
-      return
-        new Field(DATA_VECTOR_NAME,
+  private static Field mutateOriginalNameIfNeeded(
+      org.apache.arrow.flatbuf.Field field, Field originalChildField) {
+    if ((field.typeType() == Type.List || field.typeType() == Type.FixedSizeList)
+        && originalChildField.getName().equals("[DEFAULT]")) {
+      return new Field(
+          DATA_VECTOR_NAME,
           originalChildField.isNullable(),
           originalChildField.getType(),
           originalChildField.getDictionary(),
@@ -216,7 +211,8 @@ public int getField(FlatBufferBuilder builder) {
       KeyValue.addValue(builder, valueOffset);
       metadataOffsets[i] = KeyValue.endKeyValue(builder);
     }
-    int metadataOffset = org.apache.arrow.flatbuf.Field.createCustomMetadataVector(builder, metadataOffsets);
+    int metadataOffset =
+        org.apache.arrow.flatbuf.Field.createCustomMetadataVector(builder, metadataOffsets);
     org.apache.arrow.flatbuf.Field.startField(builder);
     if (name != null) {
       org.apache.arrow.flatbuf.Field.addName(builder, nameOffset);
@@ -280,12 +276,12 @@ public boolean equals(Object obj) {
       return false;
     }
     Field that = (Field) obj;
-    return Objects.equals(this.name, that.name) &&
-        this.isNullable() == that.isNullable() &&
-        Objects.equals(this.getType(), that.getType()) &&
-        Objects.equals(this.getDictionary(), that.getDictionary()) &&
-        Objects.equals(this.getMetadata(), that.getMetadata()) &&
-        Objects.equals(this.children, that.children);
+    return Objects.equals(this.name, that.name)
+        && this.isNullable() == that.isNullable()
+        && Objects.equals(this.getType(), that.getType())
+        && Objects.equals(this.getDictionary(), that.getDictionary())
+        && Objects.equals(this.getMetadata(), that.getMetadata())
+        && Objects.equals(this.children, that.children);
   }
 
   @Override
@@ -299,9 +295,8 @@ public String toString() {
       sb.append("[dictionary: ").append(getDictionary().getId()).append("]");
     }
     if (!children.isEmpty()) {
-      sb.append("<").append(children.stream()
-          .map(t -> t.toString())
-          .collect(Collectors.joining(", ")))
+      sb.append("<")
+          .append(children.stream().map(t -> t.toString()).collect(Collectors.joining(", ")))
           .append(">");
     }
     if (!isNullable()) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/FieldType.java b/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/FieldType.java
index 8988993920d79..1d598f4f9111b 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/FieldType.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/FieldType.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.types.pojo;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.Collections2;
 import org.apache.arrow.util.Preconditions;
@@ -32,8 +30,8 @@
 import org.apache.arrow.vector.util.CallBack;
 
 /**
- * POJO representation of an Arrow field type.  It consists of a logical type, nullability and whether the field
- * (column) is dictionary encoded.
+ * POJO representation of an Arrow field type. It consists of a logical type, nullability and
+ * whether the field (column) is dictionary encoded.
  */
 public class FieldType {
 
@@ -62,7 +60,11 @@ public FieldType(boolean nullable, ArrowType type, DictionaryEncoding dictionary
    * @param dictionary The dictionary encoding of the field.
    * @param metadata Custom metadata for the field.
    */
-  public FieldType(boolean nullable, ArrowType type, DictionaryEncoding dictionary, Map<String, String> metadata) {
+  public FieldType(
+      boolean nullable,
+      ArrowType type,
+      DictionaryEncoding dictionary,
+      Map<String, String> metadata) {
     super();
     this.nullable = nullable;
     this.type = Preconditions.checkNotNull(type);
@@ -70,14 +72,19 @@ public FieldType(boolean nullable, ArrowType type, DictionaryEncoding dictionary
     if (type instanceof ExtensionType) {
       // Save the extension type name/metadata
       final Map<String, String> extensionMetadata = new HashMap<>();
-      extensionMetadata.put(ExtensionType.EXTENSION_METADATA_KEY_NAME, ((ExtensionType) type).extensionName());
-      extensionMetadata.put(ExtensionType.EXTENSION_METADATA_KEY_METADATA, ((ExtensionType) type).serialize());
+      extensionMetadata.put(
+          ExtensionType.EXTENSION_METADATA_KEY_NAME, ((ExtensionType) type).extensionName());
+      extensionMetadata.put(
+          ExtensionType.EXTENSION_METADATA_KEY_METADATA, ((ExtensionType) type).serialize());
       if (metadata != null) {
         extensionMetadata.putAll(metadata);
       }
       this.metadata = Collections.unmodifiableMap(extensionMetadata);
     } else {
-      this.metadata = metadata == null ? java.util.Collections.emptyMap() : Collections2.immutableMapCopy(metadata);
+      this.metadata =
+          metadata == null
+              ? java.util.Collections.emptyMap()
+              : Collections2.immutableMapCopy(metadata);
     }
   }
 
@@ -97,12 +104,14 @@ public Map<String, String> getMetadata() {
     return metadata;
   }
 
-  public FieldVector createNewSingleVector(String name, BufferAllocator allocator, CallBack schemaCallBack) {
+  public FieldVector createNewSingleVector(
+      String name, BufferAllocator allocator, CallBack schemaCallBack) {
     MinorType minorType = Types.getMinorTypeForArrowType(type);
     return minorType.getNewVector(name, this, allocator, schemaCallBack);
   }
 
-  public FieldVector createNewSingleVector(Field field, BufferAllocator allocator, CallBack schemaCallBack) {
+  public FieldVector createNewSingleVector(
+      Field field, BufferAllocator allocator, CallBack schemaCallBack) {
     MinorType minorType = Types.getMinorTypeForArrowType(type);
     return minorType.getNewVector(field, allocator, schemaCallBack);
   }
@@ -118,10 +127,9 @@ public boolean equals(Object obj) {
       return false;
     }
     FieldType that = (FieldType) obj;
-    return this.isNullable() == that.isNullable() &&
-        Objects.equals(this.getType(), that.getType()) &&
-        Objects.equals(this.getDictionary(), that.getDictionary()) &&
-        Objects.equals(this.getMetadata(), that.getMetadata());
+    return this.isNullable() == that.isNullable()
+        && Objects.equals(this.getType(), that.getType())
+        && Objects.equals(this.getDictionary(), that.getDictionary())
+        && Objects.equals(this.getMetadata(), that.getMetadata());
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Schema.java b/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Schema.java
index 392b3c2e2ec73..293f1499df218 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Schema.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Schema.java
@@ -14,12 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.types.pojo;
 
-
 import static org.apache.arrow.vector.types.pojo.Field.convertField;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectReader;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.util.ByteBufferBackedInputStream;
+import com.google.flatbuffers.FlatBufferBuilder;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -33,7 +42,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.flatbuf.Endianness;
 import org.apache.arrow.flatbuf.KeyValue;
 import org.apache.arrow.util.Collections2;
@@ -43,28 +51,14 @@
 import org.apache.arrow.vector.ipc.message.FBSerializables;
 import org.apache.arrow.vector.ipc.message.MessageSerializer;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectReader;
-import com.fasterxml.jackson.databind.ObjectWriter;
-import com.fasterxml.jackson.databind.util.ByteBufferBackedInputStream;
-import com.google.flatbuffers.FlatBufferBuilder;
-
-/**
- * An Arrow Schema.
- */
+/** An Arrow Schema. */
 public class Schema {
 
   /**
    * Search for a field by name in given the list of fields.
    *
    * @param fields the list of the fields
-   * @param name   the name of the field to return
+   * @param name the name of the field to return
    * @return the corresponding field
    * @throws IllegalArgumentException if the field was not found
    */
@@ -91,6 +85,7 @@ public static Schema fromJSON(String json) throws IOException {
 
   /**
    * Deserialize a schema that has been serialized using {@link #toByteArray()}.
+   *
    * @param buffer the bytes to deserialize.
    * @return The deserialized schema.
    */
@@ -101,6 +96,7 @@ public static Schema deserialize(ByteBuffer buffer) {
 
   /**
    * Deserialize a schema that has been serialized as a message using {@link #serializeAsMessage()}.
+   *
    * @param buffer the bytes to deserialize.
    * @return The deserialized schema.
    */
@@ -126,7 +122,8 @@ public static Schema convertSchema(org.apache.arrow.flatbuf.Schema schema) {
       String value = kv.value();
       metadata.put(key == null ? "" : key, value == null ? "" : value);
     }
-    return new Schema(true, Collections.unmodifiableList(fields), Collections.unmodifiableMap(metadata));
+    return new Schema(
+        true, Collections.unmodifiableList(fields), Collections.unmodifiableMap(metadata));
   }
 
   private final List<Field> fields;
@@ -136,31 +133,27 @@ public Schema(Iterable<Field> fields) {
     this(fields, (Map<String, String>) null);
   }
 
-  /**
-   * Constructor with metadata.
-   */
-  public Schema(Iterable<Field> fields,
-                Map<String, String> metadata) {
-    this(true,
+  /** Constructor with metadata. */
+  public Schema(Iterable<Field> fields, Map<String, String> metadata) {
+    this(
+        true,
         Collections2.toImmutableList(fields),
         metadata == null ? Collections.emptyMap() : Collections2.immutableMapCopy(metadata));
   }
 
-
-  /**
-   * Constructor used for JSON deserialization.
-   */
+  /** Constructor used for JSON deserialization. */
   @JsonCreator
-  private Schema(@JsonProperty("fields") Iterable<Field> fields,
-                @JsonProperty("metadata") List<Map<String, String>> metadata) {
+  private Schema(
+      @JsonProperty("fields") Iterable<Field> fields,
+      @JsonProperty("metadata") List<Map<String, String>> metadata) {
     this(fields, convertMetadata(metadata));
   }
 
-
   /**
    * Private constructor to bypass automatic collection copy.
-   * @param ignored an ignored argument. Its only purpose is to prevent using the constructor
-   *     by accident because of type collisions (List vs Iterable).
+   *
+   * @param ignored an ignored argument. Its only purpose is to prevent using the constructor by
+   *     accident because of type collisions (List vs Iterable).
    */
   private Schema(boolean ignored, List<Field> fields, Map<String, String> metadata) {
     this.fields = fields;
@@ -168,16 +161,22 @@ private Schema(boolean ignored, List<Field> fields, Map<String, String> metadata
   }
 
   static Map<String, String> convertMetadata(List<Map<String, String>> metadata) {
-    return (metadata == null) ? null : metadata.stream()
-        .map(e -> new AbstractMap.SimpleImmutableEntry<>(e.get(METADATA_KEY), e.get(METADATA_VALUE)))
-        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+    return (metadata == null)
+        ? null
+        : metadata.stream()
+            .map(
+                e ->
+                    new AbstractMap.SimpleImmutableEntry<>(
+                        e.get(METADATA_KEY), e.get(METADATA_VALUE)))
+            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
   }
 
   static List<Map<String, String>> convertMetadata(Map<String, String> metadata) {
-    return (metadata == null) ? null : metadata.entrySet()
-        .stream()
-        .map(Schema::convertEntryToKeyValueMap)
-        .collect(Collectors.toList());
+    return (metadata == null)
+        ? null
+        : metadata.entrySet().stream()
+            .map(Schema::convertEntryToKeyValueMap)
+            .collect(Collectors.toList());
   }
 
   private static Map<String, String> convertEntryToKeyValueMap(Map.Entry<String, String> entry) {
@@ -213,9 +212,7 @@ public Field findField(String name) {
     return findField(getFields(), name);
   }
 
-  /**
-   * Returns the JSON string representation of this schema.
-   */
+  /** Returns the JSON string representation of this schema. */
   public String toJson() {
     try {
       return writer.writeValueAsString(this);
@@ -225,9 +222,7 @@ public String toJson() {
     }
   }
 
-  /**
-   *  Adds this schema to the builder returning the size of the builder after adding.
-   */
+  /** Adds this schema to the builder returning the size of the builder after adding. */
   public int getSchema(FlatBufferBuilder builder) {
     int[] fieldOffsets = new int[fields.size()];
     for (int i = 0; i < fields.size(); i++) {
@@ -236,16 +231,16 @@ public int getSchema(FlatBufferBuilder builder) {
     int fieldsOffset = org.apache.arrow.flatbuf.Schema.createFieldsVector(builder, fieldOffsets);
     int metadataOffset = FBSerializables.writeKeyValues(builder, metadata);
     org.apache.arrow.flatbuf.Schema.startSchema(builder);
-    org.apache.arrow.flatbuf.Schema.addEndianness(builder,
-        (LITTLE_ENDIAN ? Endianness.Little : Endianness.Big));
+    org.apache.arrow.flatbuf.Schema.addEndianness(
+        builder, (LITTLE_ENDIAN ? Endianness.Little : Endianness.Big));
     org.apache.arrow.flatbuf.Schema.addFields(builder, fieldsOffset);
     org.apache.arrow.flatbuf.Schema.addCustomMetadata(builder, metadataOffset);
     return org.apache.arrow.flatbuf.Schema.endSchema(builder);
   }
 
   /**
-   * Returns the serialized flatbuffer bytes of the schema wrapped in a message table.
-   * Use {@link #deserializeMessage(ByteBuffer)} to rebuild the Schema.
+   * Returns the serialized flatbuffer bytes of the schema wrapped in a message table. Use {@link
+   * #deserializeMessage(ByteBuffer)} to rebuild the Schema.
    */
   public byte[] serializeAsMessage() {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -259,8 +254,9 @@ public byte[] serializeAsMessage() {
 
   /**
    * Returns the serialized flatbuffer representation of this schema.
-   * @deprecated This method does not encapsulate the schema in a Message payload which is incompatible with other
-   *     languages. Use {@link #serializeAsMessage()} instead.
+   *
+   * @deprecated This method does not encapsulate the schema in a Message payload which is
+   *     incompatible with other languages. Use {@link #serializeAsMessage()} instead.
    */
   @Deprecated
   public byte[] toByteArray() {
@@ -283,13 +279,16 @@ public boolean equals(Object obj) {
     if (!(obj instanceof Schema)) {
       return false;
     }
-    return Objects.equals(this.fields, ((Schema) obj).fields) &&
-        Objects.equals(this.metadata, ((Schema) obj).metadata);
+    return Objects.equals(this.fields, ((Schema) obj).fields)
+        && Objects.equals(this.metadata, ((Schema) obj).metadata);
   }
 
   @Override
   public String toString() {
     String meta = metadata.isEmpty() ? "" : "(metadata: " + metadata.toString() + ")";
-    return "Schema<" + fields.stream().map(t -> t.toString()).collect(Collectors.joining(", ")) + ">" + meta;
+    return "Schema<"
+        + fields.stream().map(t -> t.toString()).collect(Collectors.joining(", "))
+        + ">"
+        + meta;
   }
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/ByteArrayReadableSeekableByteChannel.java b/java/vector/src/main/java/org/apache/arrow/vector/util/ByteArrayReadableSeekableByteChannel.java
index b8ce9bde49650..eaba29c3281e3 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/ByteArrayReadableSeekableByteChannel.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/ByteArrayReadableSeekableByteChannel.java
@@ -14,23 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.SeekableByteChannel;
 
-/**
- * A {@link SeekableByteChannel} backed by a byte array.
- */
+/** A {@link SeekableByteChannel} backed by a byte array. */
 public class ByteArrayReadableSeekableByteChannel implements SeekableByteChannel {
   private byte[] byteArray;
   private int position = 0;
 
-  /**
-   * Construct a new object using the given byteArray as a backing store.
-   */
+  /** Construct a new object using the given byteArray as a backing store. */
   public ByteArrayReadableSeekableByteChannel(byte[] byteArray) {
     if (byteArray == null) {
       throw new NullPointerException();
@@ -82,5 +77,4 @@ public int write(final ByteBuffer src) throws IOException {
   public SeekableByteChannel truncate(final long size) throws IOException {
     throw new UnsupportedOperationException("Read only");
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/CallBack.java b/java/vector/src/main/java/org/apache/arrow/vector/util/CallBack.java
index ddeca59b06f35..635afb92e30ce 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/CallBack.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/CallBack.java
@@ -14,12 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
-/**
- * Generic callback interface to be notified of events on value vectors.
- */
+/** Generic callback interface to be notified of events on value vectors. */
 public interface CallBack {
   void doWork();
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/DataSizeRoundingUtil.java b/java/vector/src/main/java/org/apache/arrow/vector/util/DataSizeRoundingUtil.java
index 3af2c98374070..d62d67890e334 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/DataSizeRoundingUtil.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/DataSizeRoundingUtil.java
@@ -14,33 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
-/**
- * Utilities for rounding data size.
- */
+/** Utilities for rounding data size. */
 public final class DataSizeRoundingUtil {
 
-  /**
-   * The mask for rounding an integer to a multiple of 8.
-   * (i.e. clear the lowest 3 bits)
-   */
+  /** The mask for rounding an integer to a multiple of 8. (i.e. clear the lowest 3 bits) */
   public static int ROUND_8_MASK_INT = 0xFFFFFFF8;
 
-  /**
-   * The mask for rounding a long integer to a multiple of 8.
-   * (i.e. clear the lowest 3 bits)
-   */
+  /** The mask for rounding a long integer to a multiple of 8. (i.e. clear the lowest 3 bits) */
   public static long ROUND_8_MASK_LONG = 0xFFFFFFFFFFFFFFF8L;
 
-  /**
-   * The number of bits to shift for dividing by 8.
-   */
+  /** The number of bits to shift for dividing by 8. */
   public static int DIVIDE_BY_8_SHIFT_BITS = 3;
 
   /**
    * Round up the number to the nearest multiple of 8.
+   *
    * @param input the number to round.
    * @return the rounded number.
    */
@@ -50,6 +40,7 @@ public static int roundUpTo8Multiple(int input) {
 
   /**
    * Round up the number to the nearest multiple of 8.
+   *
    * @param input the number to round.
    * @return the rounded number
    */
@@ -59,6 +50,7 @@ public static long roundUpTo8Multiple(long input) {
 
   /**
    * Round down the number to the nearest multiple of 8.
+   *
    * @param input the number to round.
    * @return the rounded number.
    */
@@ -68,6 +60,7 @@ public static int roundDownTo8Multiple(int input) {
 
   /**
    * Round down the number to the nearest multiple of 8.
+   *
    * @param input the number to round.
    * @return the rounded number
    */
@@ -77,6 +70,7 @@ public static long roundDownTo8Multiple(long input) {
 
   /**
    * A fast way to compute Math.ceil(input / 8.0).
+   *
    * @param input the input number.
    * @return the computed number.
    */
@@ -86,6 +80,7 @@ public static int divideBy8Ceil(int input) {
 
   /**
    * A fast way to compute Math.ceil(input / 8.0).
+   *
    * @param input the input number.
    * @return the computed number.
    */
@@ -93,7 +88,9 @@ public static long divideBy8Ceil(long input) {
     return (input + 7) >>> (long) DIVIDE_BY_8_SHIFT_BITS;
   }
 
-  private DataSizeRoundingUtil() {
-
+  public static long roundUpToMultipleOf16(long num) {
+    return (num + 15) & 0xFFFFFFFFFFFFFFF0L;
   }
+
+  private DataSizeRoundingUtil() {}
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/DateUtility.java b/java/vector/src/main/java/org/apache/arrow/vector/util/DateUtility.java
index f7f975a0d0e7b..6f9ccd1cfa1cf 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/DateUtility.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/DateUtility.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import java.time.Instant;
@@ -26,14 +25,15 @@
 
 /** Utility class for Date, DateTime, TimeStamp, Interval data types. */
 public class DateUtility {
-  private DateUtility() {
-  }
+  private DateUtility() {}
 
   private static final String UTC = "UTC";
 
   public static final DateTimeFormatter formatDate = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-  public static final DateTimeFormatter formatTimeStampMilli = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
-  public static final DateTimeFormatter formatTimeStampTZ = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS ZZZ");
+  public static final DateTimeFormatter formatTimeStampMilli =
+      DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
+  public static final DateTimeFormatter formatTimeStampTZ =
+      DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS ZZZ");
   public static final DateTimeFormatter formatTime = DateTimeFormatter.ofPattern("HH:mm:ss.SSS");
 
   public static DateTimeFormatter dateTimeTZFormat = null;
@@ -56,8 +56,13 @@ public static DateTimeFormatter getDateTimeFormatter() {
       DateTimeFormatter optionalSec = DateTimeFormatter.ofPattern(".SSS");
       DateTimeFormatter optionalZone = DateTimeFormatter.ofPattern(" ZZZ");
 
-      dateTimeTZFormat = new DateTimeFormatterBuilder().append(dateFormatter).appendOptional(optionalTime)
-        .appendOptional(optionalSec).appendOptional(optionalZone).toFormatter();
+      dateTimeTZFormat =
+          new DateTimeFormatterBuilder()
+              .append(dateFormatter)
+              .appendOptional(optionalTime)
+              .appendOptional(optionalSec)
+              .appendOptional(optionalZone)
+              .toFormatter();
     }
 
     return dateTimeTZFormat;
@@ -68,7 +73,11 @@ public static DateTimeFormatter getTimeFormatter() {
     if (timeFormat == null) {
       DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss");
       DateTimeFormatter optionalSec = DateTimeFormatter.ofPattern(".SSS");
-      timeFormat = new DateTimeFormatterBuilder().append(timeFormatter).appendOptional(optionalSec).toFormatter();
+      timeFormat =
+          new DateTimeFormatterBuilder()
+              .append(timeFormatter)
+              .appendOptional(optionalSec)
+              .toFormatter();
     }
     return timeFormat;
   }
@@ -81,14 +90,13 @@ public static DateTimeFormatter getTimeFormatter() {
    * @return LocalDateTime object with timeZone offset
    */
   public static LocalDateTime getLocalDateTimeFromEpochMilli(long epochMillis, String timeZone) {
-    final LocalDateTime localDateTime = LocalDateTime.ofInstant(
-         Instant.ofEpochMilli(epochMillis), TimeZone.getTimeZone(timeZone).toZoneId());
+    final LocalDateTime localDateTime =
+        LocalDateTime.ofInstant(
+            Instant.ofEpochMilli(epochMillis), TimeZone.getTimeZone(timeZone).toZoneId());
     return localDateTime;
   }
 
-  /**
-   * Convert milliseconds from epoch to a LocalDateTime with UTC offset.
-   */
+  /** Convert milliseconds from epoch to a LocalDateTime with UTC offset. */
   public static LocalDateTime getLocalDateTimeFromEpochMilli(long epochMillis) {
     return getLocalDateTimeFromEpochMilli(epochMillis, UTC);
   }
@@ -103,12 +111,11 @@ public static LocalDateTime getLocalDateTimeFromEpochMilli(long epochMillis) {
   public static LocalDateTime getLocalDateTimeFromEpochMicro(long epochMicros, String timeZone) {
     final long millis = java.util.concurrent.TimeUnit.MICROSECONDS.toMillis(epochMicros);
     final long addl_micros = epochMicros - (millis * 1000);
-    return DateUtility.getLocalDateTimeFromEpochMilli(millis, timeZone).plus(addl_micros, ChronoUnit.MICROS);
+    return DateUtility.getLocalDateTimeFromEpochMilli(millis, timeZone)
+        .plus(addl_micros, ChronoUnit.MICROS);
   }
 
-  /**
-   * Convert microseconds from epoch to a LocalDateTime with UTC offset.
-   */
+  /** Convert microseconds from epoch to a LocalDateTime with UTC offset. */
   public static LocalDateTime getLocalDateTimeFromEpochMicro(long epochMicros) {
     return getLocalDateTimeFromEpochMicro(epochMicros, UTC);
   }
@@ -126,9 +133,7 @@ public static LocalDateTime getLocalDateTimeFromEpochNano(long epochNanos, Strin
     return DateUtility.getLocalDateTimeFromEpochMilli(millis, timeZone).plusNanos(addl_nanos);
   }
 
-  /**
-   * Convert nanoseconds from epoch to a LocalDateTime with UTC offset.
-   */
+  /** Convert nanoseconds from epoch to a LocalDateTime with UTC offset. */
   public static LocalDateTime getLocalDateTimeFromEpochNano(long epochNanos) {
     return getLocalDateTimeFromEpochNano(epochNanos, UTC);
   }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/DecimalUtility.java b/java/vector/src/main/java/org/apache/arrow/vector/util/DecimalUtility.java
index 4635822e5141b..dd86b58b267fb 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/DecimalUtility.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/DecimalUtility.java
@@ -14,42 +14,45 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.util.MemoryUtil;
 
-/**
- * Utility methods for configurable precision Decimal values (e.g. {@link BigDecimal}).
- */
+/** Utility methods for configurable precision Decimal values (e.g. {@link BigDecimal}). */
 public class DecimalUtility {
-  private DecimalUtility() {
-  }
-
-  public static final byte [] zeroes = new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                                                   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-  public static final byte [] minus_one = new byte[] {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-                                                      -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+  private DecimalUtility() {}
+
+  public static final byte[] zeroes =
+      new byte[] {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+      };
+  public static final byte[] minus_one =
+      new byte[] {
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+      };
   private static final boolean LITTLE_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN;
 
   /**
    * Read an ArrowType.Decimal at the given value index in the ArrowBuf and convert to a BigDecimal
    * with the given scale.
    */
-  public static BigDecimal getBigDecimalFromArrowBuf(ArrowBuf bytebuf, int index, int scale, int byteWidth) {
+  public static BigDecimal getBigDecimalFromArrowBuf(
+      ArrowBuf bytebuf, int index, int scale, int byteWidth) {
     byte[] value = new byte[byteWidth];
     byte temp;
     final long startIndex = (long) index * byteWidth;
 
     bytebuf.getBytes(startIndex, value, 0, byteWidth);
     if (LITTLE_ENDIAN) {
-      // Decimal stored as native endian, need to swap bytes to make BigDecimal if native endian is LE
+      // Decimal stored as native endian, need to swap bytes to make BigDecimal if native endian is
+      // LE
       int stop = byteWidth / 2;
       for (int i = 0, j; i < stop; i++) {
         temp = value[i];
@@ -63,10 +66,10 @@ public static BigDecimal getBigDecimalFromArrowBuf(ArrowBuf bytebuf, int index,
   }
 
   /**
-   * Read an ArrowType.Decimal from the ByteBuffer and convert to a BigDecimal with the given
-   * scale.
+   * Read an ArrowType.Decimal from the ByteBuffer and convert to a BigDecimal with the given scale.
    */
-  public static BigDecimal getBigDecimalFromByteBuffer(ByteBuffer bytebuf, int scale, int byteWidth) {
+  public static BigDecimal getBigDecimalFromByteBuffer(
+      ByteBuffer bytebuf, int scale, int byteWidth) {
     byte[] value = new byte[byteWidth];
     bytebuf.get(value);
     BigInteger unscaledValue = new BigInteger(value);
@@ -89,14 +92,22 @@ public static byte[] getByteArrayFromArrowBuf(ArrowBuf bytebuf, int index, int b
    * less than or equal to the vectorPrecision. If not, then an UnsupportedOperationException is
    * thrown, otherwise returns true.
    */
-  public static boolean checkPrecisionAndScale(BigDecimal value, int vectorPrecision, int vectorScale) {
+  public static boolean checkPrecisionAndScale(
+      BigDecimal value, int vectorPrecision, int vectorScale) {
     if (value.scale() != vectorScale) {
-      throw new UnsupportedOperationException("BigDecimal scale must equal that in the Arrow vector: " +
-          value.scale() + " != " + vectorScale);
+      throw new UnsupportedOperationException(
+          "BigDecimal scale must equal that in the Arrow vector: "
+              + value.scale()
+              + " != "
+              + vectorScale);
     }
     if (value.precision() > vectorPrecision) {
-      throw new UnsupportedOperationException("BigDecimal precision cannot be greater than that in the Arrow " +
-          "vector: " + value.precision() + " > " + vectorPrecision);
+      throw new UnsupportedOperationException(
+          "BigDecimal precision cannot be greater than that in the Arrow "
+              + "vector: "
+              + value.precision()
+              + " > "
+              + vectorPrecision);
     }
     return true;
   }
@@ -105,24 +116,32 @@ public static boolean checkPrecisionAndScale(BigDecimal value, int vectorPrecisi
    * Check that the BigDecimal scale equals the vectorScale and that the BigDecimal precision is
    * less than or equal to the vectorPrecision. Return true if so, otherwise return false.
    */
-  public static boolean checkPrecisionAndScaleNoThrow(BigDecimal value, int vectorPrecision, int vectorScale) {
+  public static boolean checkPrecisionAndScaleNoThrow(
+      BigDecimal value, int vectorPrecision, int vectorScale) {
     return value.scale() == vectorScale && value.precision() < vectorPrecision;
   }
 
   /**
-   * Check that the decimal scale equals the vectorScale and that the decimal precision is
-   * less than or equal to the vectorPrecision. If not, then an UnsupportedOperationException is
-   * thrown, otherwise returns true.
+   * Check that the decimal scale equals the vectorScale and that the decimal precision is less than
+   * or equal to the vectorPrecision. If not, then an UnsupportedOperationException is thrown,
+   * otherwise returns true.
    */
-  public static boolean checkPrecisionAndScale(int decimalPrecision, int decimalScale, int vectorPrecision,
-                                               int vectorScale) {
+  public static boolean checkPrecisionAndScale(
+      int decimalPrecision, int decimalScale, int vectorPrecision, int vectorScale) {
     if (decimalScale != vectorScale) {
-      throw new UnsupportedOperationException("BigDecimal scale must equal that in the Arrow vector: " +
-          decimalScale + " != " + vectorScale);
+      throw new UnsupportedOperationException(
+          "BigDecimal scale must equal that in the Arrow vector: "
+              + decimalScale
+              + " != "
+              + vectorScale);
     }
     if (decimalPrecision > vectorPrecision) {
-      throw new UnsupportedOperationException("BigDecimal precision cannot be greater than that in the Arrow " +
-          "vector: " + decimalPrecision + " > " + vectorPrecision);
+      throw new UnsupportedOperationException(
+          "BigDecimal precision cannot be greater than that in the Arrow "
+              + "vector: "
+              + decimalPrecision
+              + " > "
+              + vectorPrecision);
     }
     return true;
   }
@@ -132,19 +151,21 @@ public static boolean checkPrecisionAndScale(int decimalPrecision, int decimalSc
    * UnsupportedOperationException if the decimal size is greater than the Decimal vector byte
    * width.
    */
-  public static void writeBigDecimalToArrowBuf(BigDecimal value, ArrowBuf bytebuf, int index, int byteWidth) {
+  public static void writeBigDecimalToArrowBuf(
+      BigDecimal value, ArrowBuf bytebuf, int index, int byteWidth) {
     final byte[] bytes = value.unscaledValue().toByteArray();
     writeByteArrayToArrowBufHelper(bytes, bytebuf, index, byteWidth);
   }
 
   /**
-   * Write the given long to the ArrowBuf at the given value index.
-   * This routine extends the original sign bit to a new upper area in 128-bit or 256-bit.
+   * Write the given long to the ArrowBuf at the given value index. This routine extends the
+   * original sign bit to a new upper area in 128-bit or 256-bit.
    */
   public static void writeLongToArrowBuf(long value, ArrowBuf bytebuf, int index, int byteWidth) {
     if (byteWidth != 16 && byteWidth != 32) {
-      throw new UnsupportedOperationException("DecimalUtility.writeLongToArrowBuf() currently supports " +
-          "128-bit or 256-bit width data");
+      throw new UnsupportedOperationException(
+          "DecimalUtility.writeLongToArrowBuf() currently supports "
+              + "128-bit or 256-bit width data");
     }
     final long addressOfValue = bytebuf.memoryAddress() + (long) index * byteWidth;
     final long padValue = Long.signum(value) == -1 ? -1L : 0L;
@@ -166,17 +187,20 @@ public static void writeLongToArrowBuf(long value, ArrowBuf bytebuf, int index,
    * UnsupportedOperationException if the decimal size is greater than the Decimal vector byte
    * width.
    */
-  public static void writeByteArrayToArrowBuf(byte[] bytes, ArrowBuf bytebuf, int index, int byteWidth) {
+  public static void writeByteArrayToArrowBuf(
+      byte[] bytes, ArrowBuf bytebuf, int index, int byteWidth) {
     writeByteArrayToArrowBufHelper(bytes, bytebuf, index, byteWidth);
   }
 
-  private static void writeByteArrayToArrowBufHelper(byte[] bytes, ArrowBuf bytebuf, int index, int byteWidth) {
+  private static void writeByteArrayToArrowBufHelper(
+      byte[] bytes, ArrowBuf bytebuf, int index, int byteWidth) {
     final long startIndex = (long) index * byteWidth;
     if (bytes.length > byteWidth) {
-      throw new UnsupportedOperationException("Decimal size greater than " + byteWidth + " bytes: " + bytes.length);
+      throw new UnsupportedOperationException(
+          "Decimal size greater than " + byteWidth + " bytes: " + bytes.length);
     }
 
-    byte [] padBytes = bytes[0] < 0 ? minus_one : zeroes;
+    byte[] padBytes = bytes[0] < 0 ? minus_one : zeroes;
     if (LITTLE_ENDIAN) {
       // Decimal stored as native-endian, need to swap data bytes before writing to ArrowBuf if LE
       byte[] bytesLE = new byte[bytes.length];
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/DictionaryUtility.java b/java/vector/src/main/java/org/apache/arrow/vector/util/DictionaryUtility.java
index 76fb585e6bd3a..d4182af904f83 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/DictionaryUtility.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/DictionaryUtility.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.dictionary.Dictionary;
@@ -31,28 +29,25 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 
-/**
- * Utility methods for working with Dictionaries used in Dictionary encodings.
- */
+/** Utility methods for working with Dictionaries used in Dictionary encodings. */
 public class DictionaryUtility {
-  private DictionaryUtility() {
-  }
+  private DictionaryUtility() {}
 
   /**
    * Convert field and child fields that have a dictionary encoding to message format, so fields
    * have the dictionary type.
    *
-   * <p>NOTE: in the message format, fields have the dictionary type
-   * in the memory format, they have the index type
+   * <p>NOTE: in the message format, fields have the dictionary type in the memory format, they have
+   * the index type
    */
-  public static Field toMessageFormat(Field field, DictionaryProvider provider, Set<Long> dictionaryIdsUsed) {
+  public static Field toMessageFormat(
+      Field field, DictionaryProvider provider, Set<Long> dictionaryIdsUsed) {
     if (!needConvertToMessageFormat(field)) {
       return field;
     }
     DictionaryEncoding encoding = field.getDictionary();
     List<Field> children;
 
-
     ArrowType type;
     if (encoding == null) {
       type = field.getType();
@@ -74,12 +69,15 @@ public static Field toMessageFormat(Field field, DictionaryProvider provider, Se
       updatedChildren.add(toMessageFormat(child, provider, dictionaryIdsUsed));
     }
 
-    return new Field(field.getName(), new FieldType(field.isNullable(), type, encoding, field.getMetadata()),
-      updatedChildren);
+    return new Field(
+        field.getName(),
+        new FieldType(field.isNullable(), type, encoding, field.getMetadata()),
+        updatedChildren);
   }
 
   /**
    * Checks if it is required to convert the field to message format.
+   *
    * @param field the field to check.
    * @return true if a conversion is required, and false otherwise.
    */
@@ -102,10 +100,11 @@ public static boolean needConvertToMessageFormat(Field field) {
   }
 
   /**
-   * Convert field and child fields that have a dictionary encoding to memory format, so fields
-   * have the index type.
+   * Convert field and child fields that have a dictionary encoding to memory format, so fields have
+   * the index type.
    */
-  public static Field toMemoryFormat(Field field, BufferAllocator allocator, Map<Long, Dictionary> dictionaries) {
+  public static Field toMemoryFormat(
+      Field field, BufferAllocator allocator, Map<Long, Dictionary> dictionaries) {
     DictionaryEncoding encoding = field.getDictionary();
     List<Field> children = field.getChildren();
 
@@ -133,14 +132,19 @@ public static Field toMemoryFormat(Field field, BufferAllocator allocator, Map<L
       if (!dictionaries.containsKey(encoding.getId())) {
         // create a new dictionary vector for the values
         String dictName = "DICT" + encoding.getId();
-        Field dictionaryField = new Field(dictName,
-            new FieldType(field.isNullable(), field.getType(), null, null), updatedChildren);
+        Field dictionaryField =
+            new Field(
+                dictName,
+                new FieldType(field.isNullable(), field.getType(), null, null),
+                updatedChildren);
         FieldVector dictionaryVector = dictionaryField.createVector(allocator);
         dictionaries.put(encoding.getId(), new Dictionary(dictionaryVector, encoding));
       }
     }
 
-    return new Field(field.getName(), new FieldType(field.isNullable(), type, encoding, field.getMetadata()),
-      fieldChildren);
+    return new Field(
+        field.getName(),
+        new FieldType(field.isNullable(), type, encoding, field.getMetadata()),
+        fieldChildren);
   }
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/ElementAddressableVectorIterator.java b/java/vector/src/main/java/org/apache/arrow/vector/util/ElementAddressableVectorIterator.java
index 89c10077970af..6d8ab9cafb487 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/ElementAddressableVectorIterator.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/ElementAddressableVectorIterator.java
@@ -14,11 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import java.util.Iterator;
-
 import org.apache.arrow.memory.util.ArrowBufPointer;
 import org.apache.arrow.memory.util.hash.ArrowBufHasher;
 import org.apache.arrow.memory.util.hash.SimpleHasher;
@@ -26,22 +24,22 @@
 
 /**
  * Iterator for traversing elements of a {@link ElementAddressableVector}.
+ *
  * @param <T> vector type.
  */
 public class ElementAddressableVectorIterator<T extends ElementAddressableVector>
-        implements Iterator<ArrowBufPointer> {
+    implements Iterator<ArrowBufPointer> {
 
   private final T vector;
 
-  /**
-   * Index of the next element to access.
-   */
+  /** Index of the next element to access. */
   private int index = 0;
 
   private final ArrowBufPointer reusablePointer;
 
   /**
    * Constructs an iterator for the {@link ElementAddressableVector}.
+   *
    * @param vector the vector to iterate.
    */
   public ElementAddressableVectorIterator(T vector) {
@@ -50,6 +48,7 @@ public ElementAddressableVectorIterator(T vector) {
 
   /**
    * Constructs an iterator for the {@link ElementAddressableVector}.
+   *
    * @param vector the vector to iterate.
    * @param hasher the hasher to calculate the hash code.
    */
@@ -65,8 +64,9 @@ public boolean hasNext() {
 
   /**
    * Retrieves the next pointer from the vector.
-   * @return the pointer pointing to the next element in the vector.
-   *     Note that the returned pointer is only valid before the next call to this method.
+   *
+   * @return the pointer pointing to the next element in the vector. Note that the returned pointer
+   *     is only valid before the next call to this method.
    */
   @Override
   public ArrowBufPointer next() {
@@ -77,6 +77,7 @@ public ArrowBufPointer next() {
 
   /**
    * Retrieves the next pointer from the vector.
+   *
    * @param outPointer the pointer to populate.
    */
   public void next(ArrowBufPointer outPointer) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/IntObjectHashMap.java b/java/vector/src/main/java/org/apache/arrow/vector/util/IntObjectHashMap.java
new file mode 100644
index 0000000000000..b625f602caa9c
--- /dev/null
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/IntObjectHashMap.java
@@ -0,0 +1,717 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.vector.util;
+
+import java.util.AbstractCollection;
+import java.util.AbstractSet;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
+/**
+ * A vendored specialized copy of Netty's IntObjectHashMap for use within Arrow. Avoids requiring
+ * Netty in the Arrow core just for this one class.
+ *
+ * @param <V> The value type stored in the map.
+ */
+class IntObjectHashMap<V> implements IntObjectMap<V> {
+
+  /** Default initial capacity. Used if not specified in the constructor */
+  public static final int DEFAULT_CAPACITY = 8;
+
+  /** Default load factor. Used if not specified in the constructor */
+  public static final float DEFAULT_LOAD_FACTOR = 0.5f;
+
+  /**
+   * Placeholder for null values, so we can use the actual null to mean available. (Better than
+   * using a placeholder for available: less references for GC processing.)
+   */
+  private static final Object NULL_VALUE = new Object();
+
+  /** The maximum number of elements allowed without allocating more space. */
+  private int maxSize;
+
+  /** The load factor for the map. Used to calculate {@link #maxSize}. */
+  private final float loadFactor;
+
+  private int[] keys;
+  private V[] values;
+  private int size;
+  private int mask;
+
+  private final Set<Integer> keySet = new KeySet();
+  private final Set<Entry<Integer, V>> entrySet = new EntrySet();
+  private final Iterable<PrimitiveEntry<V>> entries =
+      new Iterable<PrimitiveEntry<V>>() {
+        @Override
+        public Iterator<PrimitiveEntry<V>> iterator() {
+          return new PrimitiveIterator();
+        }
+      };
+
+  public IntObjectHashMap() {
+    this(DEFAULT_CAPACITY, DEFAULT_LOAD_FACTOR);
+  }
+
+  public IntObjectHashMap(int initialCapacity) {
+    this(initialCapacity, DEFAULT_LOAD_FACTOR);
+  }
+
+  public IntObjectHashMap(int initialCapacity, float loadFactor) {
+    if (loadFactor <= 0.0f || loadFactor > 1.0f) {
+      // Cannot exceed 1 because we can never store more than capacity elements;
+      // using a bigger loadFactor would trigger rehashing before the desired load is reached.
+      throw new IllegalArgumentException("loadFactor must be > 0 and <= 1");
+    }
+
+    this.loadFactor = loadFactor;
+
+    // Adjust the initial capacity if necessary.
+    int capacity = safeFindNextPositivePowerOfTwo(initialCapacity);
+    mask = capacity - 1;
+
+    // Allocate the arrays.
+    keys = new int[capacity];
+    @SuppressWarnings({"unchecked", "SuspiciousArrayCast"})
+    V[] temp = (V[]) new Object[capacity];
+    values = temp;
+
+    // Initialize the maximum size value.
+    maxSize = calcMaxSize(capacity);
+  }
+
+  private static <T> T toExternal(T value) {
+    assert value != null : "null is not a legitimate internal value. Concurrent Modification?";
+    return value == NULL_VALUE ? null : value;
+  }
+
+  @SuppressWarnings("unchecked")
+  private static <T> T toInternal(T value) {
+    return value == null ? (T) NULL_VALUE : value;
+  }
+
+  @Override
+  public V get(int key) {
+    int index = indexOf(key);
+    return index == -1 ? null : toExternal(values[index]);
+  }
+
+  @Override
+  public V put(int key, V value) {
+    int startIndex = hashIndex(key);
+    int index = startIndex;
+
+    for (; ; ) {
+      if (values[index] == null) {
+        // Found empty slot, use it.
+        keys[index] = key;
+        values[index] = toInternal(value);
+        growSize();
+        return null;
+      }
+      if (keys[index] == key) {
+        // Found existing entry with this key, just replace the value.
+        V previousValue = values[index];
+        values[index] = toInternal(value);
+        return toExternal(previousValue);
+      }
+
+      // Conflict, keep probing ...
+      if ((index = probeNext(index)) == startIndex) {
+        // Can only happen if the map was full at MAX_ARRAY_SIZE and couldn't grow.
+        throw new IllegalStateException("Unable to insert");
+      }
+    }
+  }
+
+  @Override
+  public void putAll(Map<? extends Integer, ? extends V> sourceMap) {
+    if (sourceMap instanceof IntObjectHashMap) {
+      // Optimization - iterate through the arrays.
+      @SuppressWarnings("unchecked")
+      IntObjectHashMap<V> source = (IntObjectHashMap<V>) sourceMap;
+      for (int i = 0; i < source.values.length; ++i) {
+        V sourceValue = source.values[i];
+        if (sourceValue != null) {
+          put(source.keys[i], sourceValue);
+        }
+      }
+      return;
+    }
+
+    // Otherwise, just add each entry.
+    for (Entry<? extends Integer, ? extends V> entry : sourceMap.entrySet()) {
+      put(entry.getKey(), entry.getValue());
+    }
+  }
+
+  @Override
+  public V remove(int key) {
+    int index = indexOf(key);
+    if (index == -1) {
+      return null;
+    }
+
+    V prev = values[index];
+    removeAt(index);
+    return toExternal(prev);
+  }
+
+  @Override
+  public int size() {
+    return size;
+  }
+
+  @Override
+  public boolean isEmpty() {
+    return size == 0;
+  }
+
+  @Override
+  public void clear() {
+    Arrays.fill(keys, (int) 0);
+    Arrays.fill(values, null);
+    size = 0;
+  }
+
+  @Override
+  public boolean containsKey(int key) {
+    return indexOf(key) >= 0;
+  }
+
+  @Override
+  public boolean containsValue(Object value) {
+    @SuppressWarnings("unchecked")
+    V v1 = toInternal((V) value);
+    for (V v2 : values) {
+      // The map supports null values; this will be matched as NULL_VALUE.equals(NULL_VALUE).
+      if (v2 != null && v2.equals(v1)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  @Override
+  public Iterable<PrimitiveEntry<V>> entries() {
+    return entries;
+  }
+
+  @Override
+  public Collection<V> values() {
+    return new AbstractCollection<V>() {
+      @Override
+      public Iterator<V> iterator() {
+        return new Iterator<V>() {
+          final PrimitiveIterator iter = new PrimitiveIterator();
+
+          @Override
+          public boolean hasNext() {
+            return iter.hasNext();
+          }
+
+          @Override
+          public V next() {
+            return iter.next().value();
+          }
+
+          @Override
+          public void remove() {
+            iter.remove();
+          }
+        };
+      }
+
+      @Override
+      public int size() {
+        return size;
+      }
+    };
+  }
+
+  @Override
+  public int hashCode() {
+    // Hashcode is based on all non-zero, valid keys. We have to scan the whole keys
+    // array, which may have different lengths for two maps of same size(), so the
+    // capacity cannot be used as input for hashing but the size can.
+    int hash = size;
+    for (int key : keys) {
+      // 0 can be a valid key or unused slot, but won't impact the hashcode in either case.
+      // This way we can use a cheap loop without conditionals, or hard-to-unroll operations,
+      // or the devastatingly bad memory locality of visiting value objects.
+      // Also, it's important to use a hash function that does not depend on the ordering
+      // of terms, only their values; since the map is an unordered collection and
+      // entries can end up in different positions in different maps that have the same
+      // elements, but with different history of puts/removes, due to conflicts.
+      hash ^= hashCode(key);
+    }
+    return hash;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (!(obj instanceof IntObjectMap)) {
+      return false;
+    }
+    @SuppressWarnings("rawtypes")
+    IntObjectMap other = (IntObjectMap) obj;
+    if (size != other.size()) {
+      return false;
+    }
+    for (int i = 0; i < values.length; ++i) {
+      V value = values[i];
+      if (value != null) {
+        int key = keys[i];
+        Object otherValue = other.get(key);
+        if (value == NULL_VALUE) {
+          if (otherValue != null) {
+            return false;
+          }
+        } else if (!value.equals(otherValue)) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+
+  @Override
+  public boolean containsKey(Object key) {
+    return containsKey(objectToKey(key));
+  }
+
+  @Override
+  public V get(Object key) {
+    return get(objectToKey(key));
+  }
+
+  @Override
+  public V put(Integer key, V value) {
+    return put(objectToKey(key), value);
+  }
+
+  @Override
+  public V remove(Object key) {
+    return remove(objectToKey(key));
+  }
+
+  @Override
+  public Set<Integer> keySet() {
+    return keySet;
+  }
+
+  @Override
+  public Set<Entry<Integer, V>> entrySet() {
+    return entrySet;
+  }
+
+  private int objectToKey(Object key) {
+    return (int) (Integer) key;
+  }
+
+  /**
+   * Locates the index for the given key. This method probes using double hashing.
+   *
+   * @param key the key for an entry in the map.
+   * @return the index where the key was found, or {@code -1} if no entry is found for that key.
+   */
+  private int indexOf(int key) {
+    int startIndex = hashIndex(key);
+    int index = startIndex;
+
+    for (; ; ) {
+      if (values[index] == null) {
+        // It's available, so no chance that this value exists anywhere in the map.
+        return -1;
+      }
+      if (key == keys[index]) {
+        return index;
+      }
+
+      // Conflict, keep probing ...
+      if ((index = probeNext(index)) == startIndex) {
+        return -1;
+      }
+    }
+  }
+
+  /** Returns the hashed index for the given key. */
+  private int hashIndex(int key) {
+    // The array lengths are always a power of two, so we can use a bitmask to stay inside the array
+    // bounds.
+    return hashCode(key) & mask;
+  }
+
+  /** Returns the hash code for the key. */
+  private static int hashCode(int key) {
+    return key;
+  }
+
+  /** Get the next sequential index after {@code index} and wraps if necessary. */
+  private int probeNext(int index) {
+    // The array lengths are always a power of two, so we can use a bitmask to stay inside the array
+    // bounds.
+    return (index + 1) & mask;
+  }
+
+  /** Grows the map size after an insertion. If necessary, performs a rehash of the map. */
+  private void growSize() {
+    size++;
+
+    if (size > maxSize) {
+      if (keys.length == Integer.MAX_VALUE) {
+        throw new IllegalStateException("Max capacity reached at size=" + size);
+      }
+
+      // Double the capacity.
+      rehash(keys.length << 1);
+    }
+  }
+
+  /**
+   * Removes entry at the given index position. Also performs opportunistic, incremental rehashing
+   * if necessary to not break conflict chains.
+   *
+   * @param index the index position of the element to remove.
+   * @return {@code true} if the next item was moved back. {@code false} otherwise.
+   */
+  private boolean removeAt(final int index) {
+    --size;
+    // Clearing the key is not strictly necessary (for GC like in a regular collection),
+    // but recommended for security. The memory location is still fresh in the cache anyway.
+    keys[index] = 0;
+    values[index] = null;
+
+    // In the interval from index to the next available entry, the arrays may have entries
+    // that are displaced from their base position due to prior conflicts. Iterate these
+    // entries and move them back if possible, optimizing future lookups.
+    // Knuth Section 6.4 Algorithm R, also used by the JDK's IdentityHashMap.
+
+    int nextFree = index;
+    int i = probeNext(index);
+    for (V value = values[i]; value != null; value = values[i = probeNext(i)]) {
+      int key = keys[i];
+      int bucket = hashIndex(key);
+      if (i < bucket && (bucket <= nextFree || nextFree <= i)
+          || bucket <= nextFree && nextFree <= i) {
+        // Move the displaced entry "back" to the first available position.
+        keys[nextFree] = key;
+        values[nextFree] = value;
+        // Put the first entry after the displaced entry
+        keys[i] = 0;
+        values[i] = null;
+        nextFree = i;
+      }
+    }
+    return nextFree != index;
+  }
+
+  /** Calculates the maximum size allowed before rehashing. */
+  private int calcMaxSize(int capacity) {
+    // Clip the upper bound so that there will always be at least one available slot.
+    int upperBound = capacity - 1;
+    return Math.min(upperBound, (int) (capacity * loadFactor));
+  }
+
+  /**
+   * Rehashes the map for the given capacity.
+   *
+   * @param newCapacity the new capacity for the map.
+   */
+  private void rehash(int newCapacity) {
+    int[] oldKeys = keys;
+    V[] oldVals = values;
+
+    keys = new int[newCapacity];
+    @SuppressWarnings({"unchecked", "SuspiciousArrayCast"})
+    V[] temp = (V[]) new Object[newCapacity];
+    values = temp;
+
+    maxSize = calcMaxSize(newCapacity);
+    mask = newCapacity - 1;
+
+    // Insert to the new arrays.
+    for (int i = 0; i < oldVals.length; ++i) {
+      V oldVal = oldVals[i];
+      if (oldVal != null) {
+        // Inlined put(), but much simpler: we don't need to worry about
+        // duplicated keys, growing/rehashing, or failing to insert.
+        int oldKey = oldKeys[i];
+        int index = hashIndex(oldKey);
+
+        for (; ; ) {
+          if (values[index] == null) {
+            keys[index] = oldKey;
+            values[index] = oldVal;
+            break;
+          }
+
+          // Conflict, keep probing. Can wrap around, but never reaches startIndex again.
+          index = probeNext(index);
+        }
+      }
+    }
+  }
+
+  @Override
+  public String toString() {
+    if (isEmpty()) {
+      return "{}";
+    }
+    StringBuilder sb = new StringBuilder(4 * size);
+    sb.append('{');
+    boolean first = true;
+    for (int i = 0; i < values.length; ++i) {
+      V value = values[i];
+      if (value != null) {
+        if (!first) {
+          sb.append(", ");
+        }
+        sb.append(keyToString(keys[i]))
+            .append('=')
+            .append(value == this ? "(this Map)" : toExternal(value));
+        first = false;
+      }
+    }
+    return sb.append('}').toString();
+  }
+
+  /**
+   * Helper method called by {@link #toString()} in order to convert a single map key into a string.
+   * This is protected to allow subclasses to override the appearance of a given key.
+   */
+  protected String keyToString(int key) {
+    return Integer.toString(key);
+  }
+
+  /** Set implementation for iterating over the entries of the map. */
+  private final class EntrySet extends AbstractSet<Entry<Integer, V>> {
+    @Override
+    public Iterator<Entry<Integer, V>> iterator() {
+      return new MapIterator();
+    }
+
+    @Override
+    public int size() {
+      return IntObjectHashMap.this.size();
+    }
+  }
+
+  /** Set implementation for iterating over the keys. */
+  private final class KeySet extends AbstractSet<Integer> {
+    @Override
+    public int size() {
+      return IntObjectHashMap.this.size();
+    }
+
+    @Override
+    public boolean contains(Object o) {
+      return IntObjectHashMap.this.containsKey(o);
+    }
+
+    @Override
+    public boolean remove(Object o) {
+      return IntObjectHashMap.this.remove(o) != null;
+    }
+
+    @Override
+    public boolean retainAll(Collection<?> retainedKeys) {
+      boolean changed = false;
+      for (Iterator<PrimitiveEntry<V>> iter = entries().iterator(); iter.hasNext(); ) {
+        PrimitiveEntry<V> entry = iter.next();
+        if (!retainedKeys.contains(entry.key())) {
+          changed = true;
+          iter.remove();
+        }
+      }
+      return changed;
+    }
+
+    @Override
+    public void clear() {
+      IntObjectHashMap.this.clear();
+    }
+
+    @Override
+    public Iterator<Integer> iterator() {
+      return new Iterator<Integer>() {
+        private final Iterator<Entry<Integer, V>> iter = entrySet.iterator();
+
+        @Override
+        public boolean hasNext() {
+          return iter.hasNext();
+        }
+
+        @Override
+        public Integer next() {
+          return iter.next().getKey();
+        }
+
+        @Override
+        public void remove() {
+          iter.remove();
+        }
+      };
+    }
+  }
+
+  /**
+   * Iterator over primitive entries. Entry key/values are overwritten by each call to {@link
+   * #next()}.
+   */
+  private final class PrimitiveIterator implements Iterator<PrimitiveEntry<V>>, PrimitiveEntry<V> {
+    private int prevIndex = -1;
+    private int nextIndex = -1;
+    private int entryIndex = -1;
+
+    private void scanNext() {
+      while (++nextIndex != values.length && values[nextIndex] == null) {}
+    }
+
+    @Override
+    public boolean hasNext() {
+      if (nextIndex == -1) {
+        scanNext();
+      }
+      return nextIndex != values.length;
+    }
+
+    @Override
+    public PrimitiveEntry<V> next() {
+      if (!hasNext()) {
+        throw new NoSuchElementException();
+      }
+
+      prevIndex = nextIndex;
+      scanNext();
+
+      // Always return the same Entry object, just change its index each time.
+      entryIndex = prevIndex;
+      return this;
+    }
+
+    @Override
+    public void remove() {
+      if (prevIndex == -1) {
+        throw new IllegalStateException("next must be called before each remove.");
+      }
+      if (removeAt(prevIndex)) {
+        // removeAt may move elements "back" in the array if they have been displaced because their
+        // spot in the
+        // array was occupied when they were inserted. If this occurs then the nextIndex is now
+        // invalid and
+        // should instead point to the prevIndex which now holds an element which was "moved back".
+        nextIndex = prevIndex;
+      }
+      prevIndex = -1;
+    }
+
+    // Entry implementation. Since this implementation uses a single Entry, we coalesce that
+    // into the Iterator object (potentially making loop optimization much easier).
+
+    @Override
+    public int key() {
+      return keys[entryIndex];
+    }
+
+    @Override
+    public V value() {
+      return toExternal(values[entryIndex]);
+    }
+
+    @Override
+    public void setValue(V value) {
+      values[entryIndex] = toInternal(value);
+    }
+  }
+
+  /** Iterator used by the {@link Map} interface. */
+  private final class MapIterator implements Iterator<Entry<Integer, V>> {
+    private final PrimitiveIterator iter = new PrimitiveIterator();
+
+    @Override
+    public boolean hasNext() {
+      return iter.hasNext();
+    }
+
+    @Override
+    public Entry<Integer, V> next() {
+      if (!hasNext()) {
+        throw new NoSuchElementException();
+      }
+
+      iter.next();
+
+      return new MapEntry(iter.entryIndex);
+    }
+
+    @Override
+    public void remove() {
+      iter.remove();
+    }
+  }
+
+  /** A single entry in the map. */
+  final class MapEntry implements Entry<Integer, V> {
+    private final int entryIndex;
+
+    MapEntry(int entryIndex) {
+      this.entryIndex = entryIndex;
+    }
+
+    @Override
+    public Integer getKey() {
+      verifyExists();
+      return keys[entryIndex];
+    }
+
+    @Override
+    public V getValue() {
+      verifyExists();
+      return toExternal(values[entryIndex]);
+    }
+
+    @Override
+    public V setValue(V value) {
+      verifyExists();
+      V prevValue = toExternal(values[entryIndex]);
+      values[entryIndex] = toInternal(value);
+      return prevValue;
+    }
+
+    private void verifyExists() {
+      if (values[entryIndex] == null) {
+        throw new IllegalStateException("The map entry has been removed");
+      }
+    }
+  }
+
+  static int safeFindNextPositivePowerOfTwo(final int value) {
+    return value <= 0 ? 1 : value >= 0x40000000 ? 0x40000000 : findNextPositivePowerOfTwo(value);
+  }
+
+  static int findNextPositivePowerOfTwo(final int value) {
+    assert value > Integer.MIN_VALUE && value < 0x40000000;
+    return 1 << (32 - Integer.numberOfLeadingZeros(value - 1));
+  }
+}
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/IntObjectMap.java b/java/vector/src/main/java/org/apache/arrow/vector/util/IntObjectMap.java
new file mode 100644
index 0000000000000..0de31b56dfa63
--- /dev/null
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/IntObjectMap.java
@@ -0,0 +1,81 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.vector.util;
+
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * A vendored specialized copy of Netty's IntObjectMap for use within Arrow. Avoids requiring Netty
+ * in the Arrow core just for this one class.
+ *
+ * @param <V> the value type stored in the map.
+ */
+interface IntObjectMap<V> extends Map<Integer, V> {
+
+  /**
+   * A primitive entry in the map, provided by the iterator from {@link #entries()}.
+   *
+   * @param <V> the value type stored in the map.
+   */
+  interface PrimitiveEntry<V> {
+    /** Gets the key for this entry. */
+    int key();
+
+    /** Gets the value for this entry. */
+    V value();
+
+    /** Sets the value for this entry. */
+    void setValue(V value);
+  }
+
+  /**
+   * Gets the value in the map with the specified key.
+   *
+   * @param key the key whose associated value is to be returned.
+   * @return the value or {@code null} if the key was not found in the map.
+   */
+  V get(int key);
+
+  /**
+   * Puts the given entry into the map.
+   *
+   * @param key the key of the entry.
+   * @param value the value of the entry.
+   * @return the previous value for this key or {@code null} if there was no previous mapping.
+   */
+  V put(int key, V value);
+
+  /**
+   * Removes the entry with the specified key.
+   *
+   * @param key the key for the entry to be removed from this map.
+   * @return the previous value for the key, or {@code null} if there was no mapping.
+   */
+  V remove(int key);
+
+  /**
+   * Gets an iterable to traverse over the primitive entries contained in this map. As an
+   * optimization, the {@link PrimitiveEntry}s returned by the {@link Iterator} may change as the
+   * {@link Iterator} progresses. The caller should not rely on {@link PrimitiveEntry} key/value
+   * stability.
+   */
+  Iterable<PrimitiveEntry<V>> entries();
+
+  /** Indicates whether or not this map contains a value for the specified key. */
+  boolean containsKey(int key);
+}
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/JsonStringArrayList.java b/java/vector/src/main/java/org/apache/arrow/vector/util/JsonStringArrayList.java
index cd08e3264072b..119d1dfc2357a 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/JsonStringArrayList.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/JsonStringArrayList.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
-import java.util.ArrayList;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.ArrayList;
 
 /**
  * Extension of {@link ArrayList} that {@link #toString()} method returns the serialized JSON
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/JsonStringHashMap.java b/java/vector/src/main/java/org/apache/arrow/vector/util/JsonStringHashMap.java
index d6972c4f22f80..109df55153565 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/JsonStringHashMap.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/JsonStringHashMap.java
@@ -14,17 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
-import java.util.LinkedHashMap;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.LinkedHashMap;
 
 /**
- * Simple class that extends the regular java.util.HashMap but overrides the
- * toString() method of the HashMap class to produce a JSON string instead
+ * Simple class that extends the regular java.util.HashMap but overrides the toString() method of
+ * the HashMap class to produce a JSON string instead
  *
  * @param <K> The type of the key for the map.
  * @param <V> The type of the value for the map.
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/MapWithOrdinal.java b/java/vector/src/main/java/org/apache/arrow/vector/util/MapWithOrdinal.java
index cf157031b841f..72977db091949 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/MapWithOrdinal.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/MapWithOrdinal.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import java.util.Collection;
@@ -24,16 +23,16 @@
 /**
  * An implementation of a map that supports constant time look-up by a generic key or an ordinal.
  *
- * <p>This class extends the functionality a regular {@link Map} with ordinal lookup support.
- * Upon insertion an unused ordinal is assigned to the inserted (key, value) tuple.
- * Upon update the same ordinal id is re-used while value is replaced.
- * Upon deletion of an existing item, its corresponding ordinal is recycled and could be used by another item.
+ * <p>This class extends the functionality a regular {@link Map} with ordinal lookup support. Upon
+ * insertion an unused ordinal is assigned to the inserted (key, value) tuple. Upon update the same
+ * ordinal id is re-used while value is replaced. Upon deletion of an existing item, its
+ * corresponding ordinal is recycled and could be used by another item.
  *
- * <p>For any instance with N items, this implementation guarantees that ordinals are in the range of [0, N). However,
- * the ordinal assignment is dynamic and may change after an insertion or deletion. Consumers of this class are
- * responsible for explicitly checking the ordinal corresponding to a key via
- * {@link MultiMapWithOrdinal#getOrdinal(Object)} before attempting to execute a lookup
- * with an ordinal.
+ * <p>For any instance with N items, this implementation guarantees that ordinals are in the range
+ * of [0, N). However, the ordinal assignment is dynamic and may change after an insertion or
+ * deletion. Consumers of this class are responsible for explicitly checking the ordinal
+ * corresponding to a key via {@link MultiMapWithOrdinal#getOrdinal(Object)} before attempting to
+ * execute a lookup with an ordinal.
  *
  * @param <K> key type
  * @param <V> value type
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/MapWithOrdinalImpl.java b/java/vector/src/main/java/org/apache/arrow/vector/util/MapWithOrdinalImpl.java
index 1f18587afdfd1..15b6bc5a63c54 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/MapWithOrdinalImpl.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/MapWithOrdinalImpl.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import java.util.AbstractMap;
@@ -26,21 +25,19 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap;
-
 /**
  * An implementation of map that supports constant time look-up by a generic key or an ordinal.
  *
- * <p>This class extends the functionality a regular {@link Map} with ordinal lookup support.
- * Upon insertion an unused ordinal is assigned to the inserted (key, value) tuple.
- * Upon update the same ordinal id is re-used while value is replaced.
- * Upon deletion of an existing item, its corresponding ordinal is recycled and could be used by another item.
+ * <p>This class extends the functionality a regular {@link Map} with ordinal lookup support. Upon
+ * insertion an unused ordinal is assigned to the inserted (key, value) tuple. Upon update the same
+ * ordinal id is re-used while value is replaced. Upon deletion of an existing item, its
+ * corresponding ordinal is recycled and could be used by another item.
  *
- * <p>For any instance with N items, this implementation guarantees that ordinals are in the range of [0, N). However,
- * the ordinal assignment is dynamic and may change after an insertion or deletion. Consumers of this class are
- * responsible for explicitly checking the ordinal corresponding to a key via
- * {@link MapWithOrdinalImpl#getOrdinal(Object)} before attempting to execute a lookup
- * with an ordinal.
+ * <p>For any instance with N items, this implementation guarantees that ordinals are in the range
+ * of [0, N). However, the ordinal assignment is dynamic and may change after an insertion or
+ * deletion. Consumers of this class are responsible for explicitly checking the ordinal
+ * corresponding to a key via {@link MapWithOrdinalImpl#getOrdinal(Object)} before attempting to
+ * execute a lookup with an ordinal.
  *
  * @param <K> key type
  * @param <V> value type
@@ -50,88 +47,92 @@ public class MapWithOrdinalImpl<K, V> implements MapWithOrdinal<K, V> {
   private final Map<K, Map.Entry<Integer, V>> primary = new LinkedHashMap<>();
   private final IntObjectHashMap<V> secondary = new IntObjectHashMap<>();
 
-  private final Map<K, V> delegate = new Map<K, V>() {
-    @Override
-    public boolean isEmpty() {
-      return size() == 0;
-    }
-
-    @Override
-    public int size() {
-      return primary.size();
-    }
-
-    @Override
-    public boolean containsKey(Object key) {
-      return primary.containsKey(key);
-    }
-
-    @Override
-    public boolean containsValue(Object value) {
-      return primary.containsValue(value);
-    }
-
-    @Override
-    public V get(Object key) {
-      Entry<Integer, V> pair = primary.get(key);
-      if (pair != null) {
-        return pair.getValue();
-      }
-      return null;
-    }
-
-    @Override
-    public V put(K key, V value) {
-      final Entry<Integer, V> oldPair = primary.get(key);
-      // if key exists try replacing otherwise, assign a new ordinal identifier
-      final int ordinal = oldPair == null ? primary.size() : oldPair.getKey();
-      primary.put(key, new AbstractMap.SimpleImmutableEntry<>(ordinal, value));
-      secondary.put(ordinal, value);
-      return oldPair == null ? null : oldPair.getValue();
-    }
-
-    @Override
-    public V remove(Object key) {
-      final Entry<Integer, V> oldPair = primary.remove(key);
-      if (oldPair != null) {
-        final int lastOrdinal = secondary.size();
-        final V last = secondary.get(lastOrdinal);
-        // normalize mappings so that all numbers until primary.size() is assigned
-        // swap the last element with the deleted one
-        secondary.put(oldPair.getKey(), last);
-        primary.put((K) key, new AbstractMap.SimpleImmutableEntry<>(oldPair.getKey(), last));
-      }
-      return oldPair == null ? null : oldPair.getValue();
-    }
-
-    @Override
-    public void putAll(Map<? extends K, ? extends V> m) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void clear() {
-      primary.clear();
-      secondary.clear();
-    }
-
-    @Override
-    public Set<K> keySet() {
-      return primary.keySet();
-    }
-
-    @Override
-    public Collection<V> values() {
-      return secondary.values();
-    }
-
-    @Override
-    public Set<Entry<K, V>> entrySet() {
-      return primary.entrySet().stream()
-          .map(entry -> new AbstractMap.SimpleImmutableEntry<>(entry.getKey(), entry.getValue().getValue()))
-          .collect(Collectors.toSet());
-    }
-  };
+  private final Map<K, V> delegate =
+      new Map<K, V>() {
+        @Override
+        public boolean isEmpty() {
+          return size() == 0;
+        }
+
+        @Override
+        public int size() {
+          return primary.size();
+        }
+
+        @Override
+        public boolean containsKey(Object key) {
+          return primary.containsKey(key);
+        }
+
+        @Override
+        public boolean containsValue(Object value) {
+          return primary.containsValue(value);
+        }
+
+        @Override
+        public V get(Object key) {
+          Entry<Integer, V> pair = primary.get(key);
+          if (pair != null) {
+            return pair.getValue();
+          }
+          return null;
+        }
+
+        @Override
+        public V put(K key, V value) {
+          final Entry<Integer, V> oldPair = primary.get(key);
+          // if key exists try replacing otherwise, assign a new ordinal identifier
+          final int ordinal = oldPair == null ? primary.size() : oldPair.getKey();
+          primary.put(key, new AbstractMap.SimpleImmutableEntry<>(ordinal, value));
+          secondary.put(ordinal, value);
+          return oldPair == null ? null : oldPair.getValue();
+        }
+
+        @Override
+        public V remove(Object key) {
+          final Entry<Integer, V> oldPair = primary.remove(key);
+          if (oldPair != null) {
+            final int lastOrdinal = secondary.size();
+            final V last = secondary.get(lastOrdinal);
+            // normalize mappings so that all numbers until primary.size() is assigned
+            // swap the last element with the deleted one
+            secondary.put(oldPair.getKey(), last);
+            primary.put((K) key, new AbstractMap.SimpleImmutableEntry<>(oldPair.getKey(), last));
+          }
+          return oldPair == null ? null : oldPair.getValue();
+        }
+
+        @Override
+        public void putAll(Map<? extends K, ? extends V> m) {
+          throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void clear() {
+          primary.clear();
+          secondary.clear();
+        }
+
+        @Override
+        public Set<K> keySet() {
+          return primary.keySet();
+        }
+
+        @Override
+        public Collection<V> values() {
+          return secondary.values();
+        }
+
+        @Override
+        public Set<Entry<K, V>> entrySet() {
+          return primary.entrySet().stream()
+              .map(
+                  entry ->
+                      new AbstractMap.SimpleImmutableEntry<>(
+                          entry.getKey(), entry.getValue().getValue()))
+              .collect(Collectors.toSet());
+        }
+      };
 
   /**
    * Returns the value corresponding to the given ordinal.
@@ -185,9 +186,9 @@ public V get(K key) {
   }
 
   /**
-   * Inserts the tuple (key, value) into the map extending the semantics of {@link Map#put} with automatic ordinal
-   * assignment. A new ordinal is assigned if key does not exists. Otherwise the same ordinal is re-used but the value
-   * is replaced.
+   * Inserts the tuple (key, value) into the map extending the semantics of {@link Map#put} with
+   * automatic ordinal assignment. A new ordinal is assigned if key does not exists. Otherwise the
+   * same ordinal is re-used but the value is replaced.
    *
    * @see java.util.Map#put
    */
@@ -212,9 +213,9 @@ public boolean containsKey(Object key) {
   }
 
   /**
-   * Removes the element corresponding to the key if exists extending the semantics of {@link java.util.Map#remove}
-   * with ordinal re-cycling. The ordinal corresponding to the given key may be re-assigned to another tuple. It is
-   * important that consumer checks the ordinal value via
+   * Removes the element corresponding to the key if exists extending the semantics of {@link
+   * java.util.Map#remove} with ordinal re-cycling. The ordinal corresponding to the given key may
+   * be re-assigned to another tuple. It is important that consumer checks the ordinal value via
    * {@link MapWithOrdinalImpl#getOrdinal(Object)} before attempting to look-up by ordinal.
    *
    * @see java.util.Map#remove
@@ -233,5 +234,4 @@ public void clear() {
   public Set<K> keys() {
     return delegate.keySet();
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/MultiMapWithOrdinal.java b/java/vector/src/main/java/org/apache/arrow/vector/util/MultiMapWithOrdinal.java
index f722a8a86772c..7b9ad62bea68f 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/MultiMapWithOrdinal.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/MultiMapWithOrdinal.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import java.util.Collection;
@@ -25,21 +24,20 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap;
-
 /**
- * An implementation of a multimap that supports constant time look-up by a generic key or an ordinal.
+ * An implementation of a multimap that supports constant time look-up by a generic key or an
+ * ordinal.
  *
- * <p>This class extends the functionality a regular {@link Map} with ordinal lookup support.
- * Upon insertion an unused ordinal is assigned to the inserted (key, value) tuple.
- * Upon update the same ordinal id is re-used while value is replaced.
- * Upon deletion of an existing item, its corresponding ordinal is recycled and could be used by another item.
+ * <p>This class extends the functionality a regular {@link Map} with ordinal lookup support. Upon
+ * insertion an unused ordinal is assigned to the inserted (key, value) tuple. Upon update the same
+ * ordinal id is re-used while value is replaced. Upon deletion of an existing item, its
+ * corresponding ordinal is recycled and could be used by another item.
  *
- * <p>For any instance with N items, this implementation guarantees that ordinals are in the range of [0, N). However,
- * the ordinal assignment is dynamic and may change after an insertion or deletion. Consumers of this class are
- * responsible for explicitly checking the ordinal corresponding to a key via
- * {@link MultiMapWithOrdinal#getOrdinal(Object)} before attempting to execute a lookup
- * with an ordinal.
+ * <p>For any instance with N items, this implementation guarantees that ordinals are in the range
+ * of [0, N). However, the ordinal assignment is dynamic and may change after an insertion or
+ * deletion. Consumers of this class are responsible for explicitly checking the ordinal
+ * corresponding to a key via {@link MultiMapWithOrdinal#getOrdinal(Object)} before attempting to
+ * execute a lookup with an ordinal.
  *
  * @param <K> key type
  * @param <V> value type
@@ -89,9 +87,7 @@ public boolean isEmpty() {
     return ordinalToValue.isEmpty();
   }
 
-  /**
-   * get set of values for key.
-   */
+  /** get set of values for key. */
   @Override
   public V get(K key) {
     Set<Integer> ordinals = keyToOrdinal.get(key);
@@ -101,9 +97,7 @@ public V get(K key) {
     return ordinals.stream().map(ordinalToValue::get).collect(Collectors.toList()).get(0);
   }
 
-  /**
-   * get set of values for key.
-   */
+  /** get set of values for key. */
   @Override
   public Collection<V> getAll(K key) {
     Set<Integer> ordinals = keyToOrdinal.get(key);
@@ -116,9 +110,10 @@ public Collection<V> getAll(K key) {
   /**
    * Inserts the tuple (key, value) into the multimap with automatic ordinal assignment.
    *
-   * A new ordinal is assigned if key/value pair does not exists.
+   * <p>A new ordinal is assigned if key/value pair does not exists.
    *
-   * If overwrite is true the existing key will be overwritten with value else value will be appended to the multimap.
+   * <p>If overwrite is true the existing key will be overwritten with value else value will be
+   * appended to the multimap.
    */
   @Override
   public boolean put(K key, V value, boolean overwrite) {
@@ -146,11 +141,11 @@ public boolean containsKey(K key) {
   /**
    * Removes the element corresponding to the key/value if exists with ordinal re-cycling.
    *
-   * The ordinal corresponding to the given key may be re-assigned to another tuple. It is
-   * important that consumer checks the ordinal value via
-   * {@link MultiMapWithOrdinal#getOrdinal(Object)} before attempting to look-up by ordinal.
+   * <p>The ordinal corresponding to the given key may be re-assigned to another tuple. It is
+   * important that consumer checks the ordinal value via {@link
+   * MultiMapWithOrdinal#getOrdinal(Object)} before attempting to look-up by ordinal.
    *
-   * If the multimap is changed return true.
+   * <p>If the multimap is changed return true.
    */
   @Override
   public synchronized boolean remove(K key, V value) {
@@ -158,13 +153,14 @@ public synchronized boolean remove(K key, V value) {
     if (removalSet.isEmpty()) {
       return false;
     }
-    Optional<V> removeValue = removalSet.stream().map(ordinalToValue::get).filter(value::equals).findFirst();
+    Optional<V> removeValue =
+        removalSet.stream().map(ordinalToValue::get).filter(value::equals).findFirst();
     if (!removeValue.isPresent()) {
       return false;
     }
     int removalOrdinal = removeKv(removalSet, key, value);
     int lastOrdinal = ordinalToValue.size();
-    if (lastOrdinal != removalOrdinal) { //we didn't remove the last ordinal
+    if (lastOrdinal != removalOrdinal) { // we didn't remove the last ordinal
       swapOrdinal(lastOrdinal, removalOrdinal);
     }
     return true;
@@ -173,12 +169,12 @@ public synchronized boolean remove(K key, V value) {
   private void swapOrdinal(int lastOrdinal, int removalOrdinal) {
     V swapOrdinalValue = ordinalToValue.remove(lastOrdinal);
     ordinalToValue.put(removalOrdinal, swapOrdinalValue);
-    K swapOrdinalKey = keyToOrdinal.entrySet()
-        .stream()
-        .filter(kv -> kv.getValue().stream().anyMatch(o -> o == lastOrdinal))
-        .map(Map.Entry::getKey)
-        .findFirst()
-        .orElseThrow(() -> new IllegalStateException("MultimapWithOrdinal in bad state"));
+    K swapOrdinalKey =
+        keyToOrdinal.entrySet().stream()
+            .filter(kv -> kv.getValue().stream().anyMatch(o -> o == lastOrdinal))
+            .map(Map.Entry::getKey)
+            .findFirst()
+            .orElseThrow(() -> new IllegalStateException("MultimapWithOrdinal in bad state"));
     ordinalToValue.put(removalOrdinal, swapOrdinalValue);
     Set<Integer> swapSet = getOrdinals(swapOrdinalKey);
     swapSet.remove(lastOrdinal);
@@ -187,10 +183,11 @@ private void swapOrdinal(int lastOrdinal, int removalOrdinal) {
   }
 
   private int removeKv(Set<Integer> removalSet, K key, V value) {
-    Integer removalOrdinal = removalSet.stream()
-        .filter(i -> ordinalToValue.get(i).equals(value))
-        .findFirst()
-        .orElseThrow(() -> new IllegalStateException("MultimapWithOrdinal in bad state"));
+    Integer removalOrdinal =
+        removalSet.stream()
+            .filter(i -> ordinalToValue.get(i).equals(value))
+            .findFirst()
+            .orElseThrow(() -> new IllegalStateException("MultimapWithOrdinal in bad state"));
     ordinalToValue.remove(removalOrdinal);
     removalSet.remove(removalOrdinal);
     if (removalSet.isEmpty()) {
@@ -201,16 +198,14 @@ private int removeKv(Set<Integer> removalSet, K key, V value) {
     return removalOrdinal;
   }
 
-  /**
-   * remove all entries of key.
-   */
+  /** remove all entries of key. */
   @Override
   public synchronized boolean removeAll(K key) {
     Collection<V> values = this.getAll(key);
     if (values == null) {
       return false;
     }
-    for (V v: values) {
+    for (V v : values) {
       this.remove(key, v);
     }
     return true;
@@ -226,5 +221,4 @@ public void clear() {
   public Set<K> keys() {
     return keyToOrdinal.keySet();
   }
-
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/ObjectMapperFactory.java b/java/vector/src/main/java/org/apache/arrow/vector/util/ObjectMapperFactory.java
index 5fa4c1b2260e3..5d004ef36b332 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/ObjectMapperFactory.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/ObjectMapperFactory.java
@@ -14,28 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
-/**
- * A {@link ObjectMapper} factory to read/write JSON.
- */
+/** A {@link ObjectMapper} factory to read/write JSON. */
 public final class ObjectMapperFactory {
 
-  private ObjectMapperFactory() {
-  }
+  private ObjectMapperFactory() {}
 
-  /**
-   * Creates a new {@link ObjectMapper} instance.
-   */
+  /** Creates a new {@link ObjectMapper} instance. */
   public static ObjectMapper newObjectMapper() {
-    return JsonMapper.builder()
-       .addModule(new JavaTimeModule())
-       .build();
+    return JsonMapper.builder().addModule(new JavaTimeModule()).build();
   }
 }
-
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/OversizedAllocationException.java b/java/vector/src/main/java/org/apache/arrow/vector/util/OversizedAllocationException.java
index a47d3ade0bfe3..11964595709d4 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/OversizedAllocationException.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/OversizedAllocationException.java
@@ -14,16 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
-
 /**
- * An exception that is used to signal that allocation request in bytes is greater than the maximum allowed by
- * {@link org.apache.arrow.memory.BufferAllocator#buffer(int) allocator}.
+ * An exception that is used to signal that allocation request in bytes is greater than the maximum
+ * allowed by {@link org.apache.arrow.memory.BufferAllocator#buffer(int) allocator}.
  *
- * <p>Operators should handle this exception to split the batch and later resume the execution on the next
- * iteration.</p>
+ * <p>Operators should handle this exception to split the batch and later resume the execution on
+ * the next iteration.
  */
 public class OversizedAllocationException extends RuntimeException {
   public OversizedAllocationException() {
@@ -31,10 +29,7 @@ public OversizedAllocationException() {
   }
 
   public OversizedAllocationException(
-      String message,
-      Throwable cause,
-      boolean enableSuppression,
-      boolean writableStackTrace) {
+      String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
     super(message, cause, enableSuppression, writableStackTrace);
   }
 
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/PromotableMultiMapWithOrdinal.java b/java/vector/src/main/java/org/apache/arrow/vector/util/PromotableMultiMapWithOrdinal.java
index f2f838af90455..acc49ab34fde0 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/PromotableMultiMapWithOrdinal.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/PromotableMultiMapWithOrdinal.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import java.util.Collection;
 import java.util.Set;
-
 import org.apache.arrow.vector.complex.AbstractStructVector;
 
 /**
- * Implementation of MapWithOrdinal that allows for promotion to multimap when duplicate fields exist.
+ * Implementation of MapWithOrdinal that allows for promotion to multimap when duplicate fields
+ * exist.
+ *
  * @param <K> key type
  * @param <V> value type
  */
@@ -36,19 +36,21 @@ public class PromotableMultiMapWithOrdinal<K, V> implements MapWithOrdinal<K, V>
 
   /**
    * Create promotable map.
+   *
    * @param promotable if promotion is allowed, otherwise delegate to MapWithOrdinal.
    * @param conflictPolicy how to handle name conflicts.
    */
-  public PromotableMultiMapWithOrdinal(boolean promotable, AbstractStructVector.ConflictPolicy conflictPolicy) {
+  public PromotableMultiMapWithOrdinal(
+      boolean promotable, AbstractStructVector.ConflictPolicy conflictPolicy) {
     this.promotable = promotable;
     this.conflictPolicy = conflictPolicy;
     delegate = mapWithOrdinal;
   }
 
   private void promote() {
-    if (delegate == multiMapWithOrdinal ||
-        !promotable ||
-        conflictPolicy.equals(AbstractStructVector.ConflictPolicy.CONFLICT_REPLACE)) {
+    if (delegate == multiMapWithOrdinal
+        || !promotable
+        || conflictPolicy.equals(AbstractStructVector.ConflictPolicy.CONFLICT_REPLACE)) {
       return;
     }
     for (K key : mapWithOrdinal.keys()) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/ReusableByteArray.java b/java/vector/src/main/java/org/apache/arrow/vector/util/ReusableByteArray.java
index d938cd833a41a..df7be1f0296a0 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/ReusableByteArray.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/ReusableByteArray.java
@@ -14,18 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import java.util.Arrays;
 import java.util.Base64;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.ReusableBuffer;
 
-/**
- * A wrapper around byte arrays for repeated writing.
- */
+/** A wrapper around byte arrays for repeated writing. */
 public class ReusableByteArray implements ReusableBuffer<byte[]> {
 
   protected static final byte[] EMPTY_BYTES = new byte[0];
@@ -64,6 +60,13 @@ public void set(ArrowBuf srcBytes, long start, long len) {
     length = (int) len;
   }
 
+  @Override
+  public void set(byte[] srcBytes, long start, long len) {
+    setCapacity((int) len, false);
+    System.arraycopy(srcBytes, (int) start, bytes, 0, (int) len);
+    length = (int) len;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (o == this) {
@@ -109,12 +112,12 @@ public String toString() {
   }
 
   /**
-   * Sets the capacity of this object to <em>at least</em> <code>len</code> bytes. If the
-   * current buffer is longer, then the capacity and existing content of the buffer are unchanged.
-   * If <code>len</code> is larger than the current capacity, the Text object's capacity is
-   * increased to match.
+   * Sets the capacity of this object to <em>at least</em> <code>len</code> bytes. If the current
+   * buffer is longer, then the capacity and existing content of the buffer are unchanged. If <code>
+   * len</code> is larger than the current capacity, the Text object's capacity is increased to
+   * match.
    *
-   * @param len      the number of bytes we need
+   * @param len the number of bytes we need
    * @param keepData should the old data be kept
    */
   protected void setCapacity(int len, boolean keepData) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/SchemaChangeRuntimeException.java b/java/vector/src/main/java/org/apache/arrow/vector/util/SchemaChangeRuntimeException.java
index c29eb6ad37315..18a158b921c4a 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/SchemaChangeRuntimeException.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/SchemaChangeRuntimeException.java
@@ -14,23 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
-
-/**
- * Thrown when child vectors (e.g. in lists) don't match the expected type.
- */
+/** Thrown when child vectors (e.g. in lists) don't match the expected type. */
 public class SchemaChangeRuntimeException extends RuntimeException {
   public SchemaChangeRuntimeException() {
     super();
   }
 
   public SchemaChangeRuntimeException(
-      String message,
-      Throwable cause,
-      boolean enableSuppression,
-      boolean writableStackTrace) {
+      String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
     super(message, cause, enableSuppression, writableStackTrace);
   }
 
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/SchemaUtility.java b/java/vector/src/main/java/org/apache/arrow/vector/util/SchemaUtility.java
index 5b3d00f6b7362..83d2f328d34f1 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/SchemaUtility.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/SchemaUtility.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.channels.Channels;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.ipc.ReadChannel;
 import org.apache.arrow.vector.ipc.WriteChannel;
@@ -29,21 +27,15 @@
 import org.apache.arrow.vector.ipc.message.MessageSerializer;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-/**
- * Schema utility class including serialization and deserialization.
- */
+/** Schema utility class including serialization and deserialization. */
 public class SchemaUtility {
-  private SchemaUtility() {
-  }
+  private SchemaUtility() {}
 
-  /**
-   * Deserialize Arrow schema from byte array.
-   */
+  /** Deserialize Arrow schema from byte array. */
   public static Schema deserialize(byte[] bytes, BufferAllocator allocator) throws IOException {
     try (MessageChannelReader schemaReader =
-             new MessageChannelReader(
-                 new ReadChannel(
-                     new ByteArrayReadableSeekableByteChannel(bytes)), allocator)) {
+        new MessageChannelReader(
+            new ReadChannel(new ByteArrayReadableSeekableByteChannel(bytes)), allocator)) {
 
       MessageResult result = schemaReader.readNext();
       if (result == null) {
@@ -53,9 +45,7 @@ public static Schema deserialize(byte[] bytes, BufferAllocator allocator) throws
     }
   }
 
-  /**
-   * Serialize Arrow schema into byte array.
-   */
+  /** Serialize Arrow schema into byte array. */
   public static byte[] serialize(Schema schema) throws IOException {
     final ByteArrayOutputStream out = new ByteArrayOutputStream();
     MessageSerializer.serialize(new WriteChannel(Channels.newChannel(out)), schema);
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/Text.java b/java/vector/src/main/java/org/apache/arrow/vector/util/Text.java
index 95e35ce6938c3..35d810abbb633 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/Text.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/Text.java
@@ -14,9 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
+import com.fasterxml.jackson.core.JsonGenerationException;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import java.io.DataInput;
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -31,15 +35,9 @@
 import java.text.StringCharacterIterator;
 import java.util.Optional;
 
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-
 /**
- * A simplified byte wrapper similar to Hadoop's Text class without all the dependencies.
- * Lifted from Hadoop 2.7.1
+ * A simplified byte wrapper similar to Hadoop's Text class without all the dependencies. Lifted
+ * from Hadoop 2.7.1
  */
 @JsonSerialize(using = Text.TextSerializer.class)
 public class Text extends ReusableByteArray {
@@ -48,7 +46,8 @@ public class Text extends ReusableByteArray {
       new ThreadLocal<CharsetEncoder>() {
         @Override
         protected CharsetEncoder initialValue() {
-          return Charset.forName("UTF-8").newEncoder()
+          return Charset.forName("UTF-8")
+              .newEncoder()
               .onMalformedInput(CodingErrorAction.REPORT)
               .onUnmappableCharacter(CodingErrorAction.REPORT);
         }
@@ -58,13 +57,13 @@ protected CharsetEncoder initialValue() {
       new ThreadLocal<CharsetDecoder>() {
         @Override
         protected CharsetDecoder initialValue() {
-          return Charset.forName("UTF-8").newDecoder()
+          return Charset.forName("UTF-8")
+              .newDecoder()
               .onMalformedInput(CodingErrorAction.REPORT)
               .onUnmappableCharacter(CodingErrorAction.REPORT);
         }
       };
 
-
   public Text() {
     super();
   }
@@ -119,13 +118,12 @@ public byte[] getBytes() {
   }
 
   /**
-   * Returns the Unicode Scalar Value (32-bit integer value) for the character at
-   * <code>position</code>. Note that this method avoids using the converter or doing String
-   * instantiation.
+   * Returns the Unicode Scalar Value (32-bit integer value) for the character at <code>position
+   * </code>. Note that this method avoids using the converter or doing String instantiation.
    *
    * @param position the index of the char we want to retrieve
    * @return the Unicode scalar value at position or -1 if the position is invalid or points to a
-   *         trailing byte
+   *     trailing byte
    */
   public int charAt(int position) {
     if (position > this.length) {
@@ -144,15 +142,15 @@ public int find(String what) {
   }
 
   /**
-   * Finds any occurrence of <code>what</code> in the backing buffer, starting as position
-   * <code>start</code>. The starting position is measured in bytes and the return value is in terms
-   * of byte position in the buffer. The backing buffer is not converted to a string for this
+   * Finds any occurrence of <code>what</code> in the backing buffer, starting as position <code>
+   * start</code>. The starting position is measured in bytes and the return value is in terms of
+   * byte position in the buffer. The backing buffer is not converted to a string for this
    * operation.
    *
-   * @param what  the string to search for
+   * @param what the string to search for
    * @param start where to start from
-   * @return byte position of the first occurrence of the search string in the UTF-8 buffer or -1
-   *         if not found
+   * @return byte position of the first occurrence of the search string in the UTF-8 buffer or -1 if
+   *     not found
    */
   public int find(String what, int start) {
     try {
@@ -230,22 +228,20 @@ public void set(Text other) {
   /**
    * Set the Text to range of bytes.
    *
-   * @param utf8  the data to copy from
+   * @param utf8 the data to copy from
    * @param start the first position of the new string
-   * @param len   the number of bytes of the new string
+   * @param len the number of bytes of the new string
    */
   public void set(byte[] utf8, int start, int len) {
-    setCapacity(len, false);
-    System.arraycopy(utf8, start, bytes, 0, len);
-    this.length = len;
+    super.set(utf8, start, len);
   }
 
   /**
    * Append a range of bytes to the end of the given text.
    *
-   * @param utf8  the data to copy from
+   * @param utf8 the data to copy from
    * @param start the first position to append from utf8
-   * @param len   the number of bytes to append
+   * @param len the number of bytes to append
    */
   public void append(byte[] utf8, int start, int len) {
     setCapacity(length + len, true);
@@ -256,8 +252,8 @@ public void append(byte[] utf8, int start, int len) {
   /**
    * Clear the string to empty.
    *
-   * <em>Note</em>: For performance reasons, this call does not clear the underlying byte array that
-   * is retrievable via {@link #getBytes()}. In order to free the byte-array memory, call
+   * <p><em>Note</em>: For performance reasons, this call does not clear the underlying byte array
+   * that is retrievable via {@link #getBytes()}. In order to free the byte-array memory, call
    * {@link #set(byte[])} with an empty byte array (For example, <code>new byte[0]</code>).
    */
   public void clear() {
@@ -277,7 +273,7 @@ public String toString() {
    * Read a Text object whose length is already known. This allows creating Text from a stream which
    * uses a different serialization format.
    *
-   * @param in  the input to initialize from
+   * @param in the input to initialize from
    * @param len how many bytes to read from in
    * @throws IOException if something bad happens
    */
@@ -309,8 +305,7 @@ public static String decode(byte[] utf8) throws CharacterCodingException {
     return decode(ByteBuffer.wrap(utf8), true);
   }
 
-  public static String decode(byte[] utf8, int start, int length)
-      throws CharacterCodingException {
+  public static String decode(byte[] utf8, int start, int length) throws CharacterCodingException {
     return decode(ByteBuffer.wrap(utf8, start, length), true);
   }
 
@@ -319,9 +314,9 @@ public static String decode(byte[] utf8, int start, int length)
    * is true, then malformed input is replaced with the substitution character, which is U+FFFD.
    * Otherwise the method throws a MalformedInputException.
    *
-   * @param utf8    the bytes to decode
-   * @param start   where to start from
-   * @param length  length of the bytes to decode
+   * @param utf8 the bytes to decode
+   * @param start where to start from
+   * @param length length of the bytes to decode
    * @param replace whether to replace malformed characters with U+FFFD
    * @return the decoded string
    * @throws CharacterCodingException if the input could not be decoded
@@ -331,12 +326,10 @@ public static String decode(byte[] utf8, int start, int length, boolean replace)
     return decode(ByteBuffer.wrap(utf8, start, length), replace);
   }
 
-  private static String decode(ByteBuffer utf8, boolean replace)
-      throws CharacterCodingException {
+  private static String decode(ByteBuffer utf8, boolean replace) throws CharacterCodingException {
     CharsetDecoder decoder = DECODER_FACTORY.get();
     if (replace) {
-      decoder.onMalformedInput(
-          java.nio.charset.CodingErrorAction.REPLACE);
+      decoder.onMalformedInput(java.nio.charset.CodingErrorAction.REPLACE);
       decoder.onUnmappableCharacter(CodingErrorAction.REPLACE);
     }
     String str = decoder.decode(utf8).toString();
@@ -356,8 +349,7 @@ private static String decode(ByteBuffer utf8, boolean replace)
    * @return ByteBuffer: bytes stores at ByteBuffer.array() and length is ByteBuffer.limit()
    * @throws CharacterCodingException if the string could not be encoded
    */
-  public static ByteBuffer encode(String string)
-      throws CharacterCodingException {
+  public static ByteBuffer encode(String string) throws CharacterCodingException {
     return encode(string, true);
   }
 
@@ -366,20 +358,18 @@ public static ByteBuffer encode(String string)
    * true, then malformed input is replaced with the substitution character, which is U+FFFD.
    * Otherwise the method throws a MalformedInputException.
    *
-   * @param string  the string to encode
+   * @param string the string to encode
    * @param replace whether to replace malformed characters with U+FFFD
    * @return ByteBuffer: bytes stores at ByteBuffer.array() and length is ByteBuffer.limit()
    * @throws CharacterCodingException if the string could not be encoded
    */
-  public static ByteBuffer encode(String string, boolean replace)
-      throws CharacterCodingException {
+  public static ByteBuffer encode(String string, boolean replace) throws CharacterCodingException {
     CharsetEncoder encoder = ENCODER_FACTORY.get();
     if (replace) {
       encoder.onMalformedInput(CodingErrorAction.REPLACE);
       encoder.onUnmappableCharacter(CodingErrorAction.REPLACE);
     }
-    ByteBuffer bytes =
-        encoder.encode(CharBuffer.wrap(string.toCharArray()));
+    ByteBuffer bytes = encoder.encode(CharBuffer.wrap(string.toCharArray()));
     if (replace) {
       encoder.onMalformedInput(CodingErrorAction.REPORT);
       encoder.onUnmappableCharacter(CodingErrorAction.REPORT);
@@ -420,9 +410,9 @@ public static void validateUTF8(byte[] utf8) throws MalformedInputException {
   /**
    * Check to see if a byte array is valid utf-8.
    *
-   * @param utf8  the array of bytes
+   * @param utf8 the array of bytes
    * @param start the offset of the first byte in the array
-   * @param len   the length of the byte sequence
+   * @param len the length of the byte sequence
    * @throws MalformedInputException if the byte array contains invalid bytes
    */
   public static void validateUTF8(byte[] utf8, int start, int len) throws MalformedInputException {
@@ -435,10 +425,11 @@ public static void validateUTF8(byte[] utf8, int start, int len) throws Malforme
   /**
    * Check to see if a byte array is valid utf-8.
    *
-   * @param utf8  the array of bytes
+   * @param utf8 the array of bytes
    * @param start the offset of the first byte in the array
-   * @param len   the length of the byte sequence
-   * @return the position where a malformed byte occurred or Optional.empty() if the byte array was valid UTF-8.
+   * @param len the length of the byte sequence
+   * @return the position where a malformed byte occurred or Optional.empty() if the byte array was
+   *     valid UTF-8.
    */
   private static Optional<Integer> validateUTF8Internal(byte[] utf8, int start, int len) {
     int count = start;
@@ -521,22 +512,265 @@ private static Optional<Integer> validateUTF8Internal(byte[] utf8, int start, in
    * Trailing bytes have the value -1. The values 4 and 5 are presented in this table, even though
    * valid UTF-8 cannot include the five and six byte sequences.
    */
-  static final int[] bytesFromUTF8 =
-      {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-          0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-          0, 0, 0, 0, 0, 0, 0,
-          // trail bytes
-          -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-          -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-          -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-          -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, 1, 1, 1, 1,
-          1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-          1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3,
-          3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5};
+  static final int[] bytesFromUTF8 = {
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    // trail bytes
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    -1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    1,
+    2,
+    2,
+    2,
+    2,
+    2,
+    2,
+    2,
+    2,
+    2,
+    2,
+    2,
+    2,
+    2,
+    2,
+    2,
+    2,
+    3,
+    3,
+    3,
+    3,
+    3,
+    3,
+    3,
+    3,
+    4,
+    4,
+    4,
+    4,
+    5,
+    5,
+    5,
+    5
+  };
 
   /**
    * Returns the next code point at the current position in the buffer. The buffer's position will
@@ -586,8 +820,9 @@ public static int bytesToCodePoint(ByteBuffer bytes) {
     return ch;
   }
 
-  static final int[] offsetsFromUTF8 =
-      {0x00000000, 0x00003080, 0x000E2080, 0x03C82080, 0xFA082080, 0x82082080};
+  static final int[] offsetsFromUTF8 = {
+    0x00000000, 0x00003080, 0x000E2080, 0x03C82080, 0xFA082080, 0x82082080
+  };
 
   /**
    * For the given string, returns the number of UTF-8 bytes required to encode the string.
@@ -624,9 +859,7 @@ public static int utf8Length(String string) {
     return size;
   }
 
-  /**
-   * JSON serializer for {@link Text}.
-   */
+  /** JSON serializer for {@link Text}. */
   public static class TextSerializer extends StdSerializer<Text> {
 
     public TextSerializer() {
@@ -635,9 +868,8 @@ public TextSerializer() {
 
     @Override
     public void serialize(
-        Text text,
-        JsonGenerator jsonGenerator,
-        SerializerProvider serializerProvider) throws IOException, JsonGenerationException {
+        Text text, JsonGenerator jsonGenerator, SerializerProvider serializerProvider)
+        throws IOException, JsonGenerationException {
       jsonGenerator.writeString(text.toString());
     }
   }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/TransferPair.java b/java/vector/src/main/java/org/apache/arrow/vector/util/TransferPair.java
index ca3876c7b86d8..aca685baccbfb 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/TransferPair.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/TransferPair.java
@@ -14,14 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import org.apache.arrow.vector.ValueVector;
 
-/**
- * Interface for copying values between a pair of two vectors of the same type.
- */
+/** Interface for copying values between a pair of two vectors of the same type. */
 public interface TransferPair {
   void transfer();
 
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/Validator.java b/java/vector/src/main/java/org/apache/arrow/vector/util/Validator.java
index 0c9ad1e2753f1..e1b4c93e6eeb6 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/Validator.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/Validator.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.dictionary.Dictionary;
@@ -31,9 +29,7 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.Schema;
 
-/**
- * Utility class for validating arrow data structures.
- */
+/** Utility class for validating arrow data structures. */
 public class Validator {
 
   /**
@@ -49,9 +45,7 @@ public static void compareSchemas(Schema schema1, Schema schema2) {
     }
   }
 
-  /**
-   * Validate two Dictionary encodings and dictionaries with id's from the encodings.
-   */
+  /** Validate two Dictionary encodings and dictionaries with id's from the encodings. */
   public static void compareDictionaries(
       List<DictionaryEncoding> encodings1,
       List<DictionaryEncoding> encodings2,
@@ -59,14 +53,14 @@ public static void compareDictionaries(
       DictionaryProvider provider2) {
 
     if (encodings1.size() != encodings2.size()) {
-      throw new IllegalArgumentException("Different dictionary encoding count:\n" +
-        encodings1.size() + "\n" + encodings2.size());
+      throw new IllegalArgumentException(
+          "Different dictionary encoding count:\n" + encodings1.size() + "\n" + encodings2.size());
     }
 
     for (int i = 0; i < encodings1.size(); i++) {
       if (!encodings1.get(i).equals(encodings2.get(i))) {
-        throw new IllegalArgumentException("Different dictionary encodings:\n" + encodings1.get(i) +
-          "\n" + encodings2.get(i));
+        throw new IllegalArgumentException(
+            "Different dictionary encodings:\n" + encodings1.get(i) + "\n" + encodings2.get(i));
       }
 
       long id = encodings1.get(i).getId();
@@ -74,8 +68,14 @@ public static void compareDictionaries(
       Dictionary dict2 = provider2.lookup(id);
 
       if (dict1 == null || dict2 == null) {
-        throw new IllegalArgumentException("The DictionaryProvider did not contain the required " +
-          "dictionary with id: " + id + "\n" + dict1 + "\n" + dict2);
+        throw new IllegalArgumentException(
+            "The DictionaryProvider did not contain the required "
+                + "dictionary with id: "
+                + id
+                + "\n"
+                + dict1
+                + "\n"
+                + dict2);
       }
 
       try {
@@ -86,19 +86,16 @@ public static void compareDictionaries(
     }
   }
 
-  /**
-   * Validate two dictionary providers are equal in structure and contents.
-   */
+  /** Validate two dictionary providers are equal in structure and contents. */
   public static void compareDictionaryProviders(
-          DictionaryProvider provider1,
-          DictionaryProvider provider2) {
+      DictionaryProvider provider1, DictionaryProvider provider2) {
     List<Long> ids1 = new ArrayList(provider1.getDictionaryIds());
     List<Long> ids2 = new ArrayList(provider2.getDictionaryIds());
     java.util.Collections.sort(ids1);
     java.util.Collections.sort(ids2);
     if (!ids1.equals(ids2)) {
-      throw new IllegalArgumentException("Different ids in dictionary providers:\n" +
-              ids1 + "\n" + ids2);
+      throw new IllegalArgumentException(
+          "Different ids in dictionary providers:\n" + ids1 + "\n" + ids2);
     }
     for (long id : ids1) {
       Dictionary dict1 = provider1.lookup(id);
@@ -121,13 +118,14 @@ public static void compareDictionaryProviders(
   public static void compareVectorSchemaRoot(VectorSchemaRoot root1, VectorSchemaRoot root2) {
     compareSchemas(root2.getSchema(), root1.getSchema());
     if (root1.getRowCount() != root2.getRowCount()) {
-      throw new IllegalArgumentException("Different row count:\n" + root1.getRowCount() + " != " + root2.getRowCount());
+      throw new IllegalArgumentException(
+          "Different row count:\n" + root1.getRowCount() + " != " + root2.getRowCount());
     }
     List<FieldVector> vectors1 = root1.getFieldVectors();
     List<FieldVector> vectors2 = root2.getFieldVectors();
     if (vectors1.size() != vectors2.size()) {
-      throw new IllegalArgumentException("Different column count:\n" + vectors1.toString() +
-        "\n!=\n" + vectors2.toString());
+      throw new IllegalArgumentException(
+          "Different column count:\n" + vectors1.toString() + "\n!=\n" + vectors2.toString());
     }
     for (int i = 0; i < vectors1.size(); i++) {
       compareFieldVectors(vectors1.get(i), vectors2.get(i));
@@ -144,20 +142,32 @@ public static void compareVectorSchemaRoot(VectorSchemaRoot root1, VectorSchemaR
   public static void compareFieldVectors(FieldVector vector1, FieldVector vector2) {
     Field field1 = vector1.getField();
     if (!field1.equals(vector2.getField())) {
-      throw new IllegalArgumentException("Different Fields:\n" + field1 + "\n!=\n" +
-        vector2.getField());
+      throw new IllegalArgumentException(
+          "Different Fields:\n" + field1 + "\n!=\n" + vector2.getField());
     }
     int valueCount = vector1.getValueCount();
     if (valueCount != vector2.getValueCount()) {
-      throw new IllegalArgumentException("Different value count for field " + field1 + " : " +
-        valueCount + " != " + vector2.getValueCount());
+      throw new IllegalArgumentException(
+          "Different value count for field "
+              + field1
+              + " : "
+              + valueCount
+              + " != "
+              + vector2.getValueCount());
     }
     for (int j = 0; j < valueCount; j++) {
       Object obj1 = vector1.getObject(j);
       Object obj2 = vector2.getObject(j);
       if (!equals(field1.getType(), obj1, obj2)) {
         throw new IllegalArgumentException(
-            "Different values in column:\n" + field1 + " at index " + j + ": " + obj1 + " != " + obj2);
+            "Different values in column:\n"
+                + field1
+                + " at index "
+                + j
+                + ": "
+                + obj1
+                + " != "
+                + obj2);
       }
     }
   }
@@ -174,8 +184,9 @@ static boolean equals(ArrowType type, final Object o1, final Object o2) {
         default:
           throw new UnsupportedOperationException("unsupported precision: " + fpType);
       }
-    } else if (type instanceof ArrowType.Binary || type instanceof ArrowType.LargeBinary ||
-        type instanceof ArrowType.FixedSizeBinary) {
+    } else if (type instanceof ArrowType.Binary
+        || type instanceof ArrowType.LargeBinary
+        || type instanceof ArrowType.FixedSizeBinary) {
       return Arrays.equals((byte[]) o1, (byte[]) o2);
     } else if (o1 instanceof byte[] && o2 instanceof byte[]) {
       return Arrays.equals((byte[]) o1, (byte[]) o2);
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/ValueVectorUtility.java b/java/vector/src/main/java/org/apache/arrow/vector/util/ValueVectorUtility.java
index ceb7081e1ea3d..d40afed2aaa81 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/ValueVectorUtility.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/ValueVectorUtility.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import static org.apache.arrow.vector.validate.ValidateUtil.validateOrThrow;
 
 import java.util.function.BiFunction;
-
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.BaseFixedWidthVector;
 import org.apache.arrow.vector.ValueVector;
@@ -29,38 +27,28 @@
 import org.apache.arrow.vector.validate.ValidateVectorDataVisitor;
 import org.apache.arrow.vector.validate.ValidateVectorTypeVisitor;
 
-/**
- * Utility methods for {@link ValueVector}.
- */
+/** Utility methods for {@link ValueVector}. */
 public class ValueVectorUtility {
 
-  private ValueVectorUtility() {
-  }
+  private ValueVectorUtility() {}
 
   /**
-   * Get the toString() representation of vector suitable for debugging.
-   * Note since vectors may have millions of values, this method only shows max 20 values.
-   * Examples as below (v represents value):
-   * <li>
-   *   vector with 0 value:
-   *   []
-   * </li>
-   * <li>
-   *   vector with 5 values (no more than 20 values):
-   *   [v0, v1, v2, v3, v4]
-   * </li>
-   * <li>
-   *  vector with 100 values (more than 20 values):
-   *  [v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, ..., v90, v91, v92, v93, v94, v95, v96, v97, v98, v99]
-   * </li>
+   * Get the toString() representation of vector suitable for debugging. Note since vectors may have
+   * millions of values, this method only shows max 20 values. Examples as below (v represents
+   * value):
+   * <li>vector with 0 value: []
+   * <li>vector with 5 values (no more than 20 values): [v0, v1, v2, v3, v4]
+   * <li>vector with 100 values (more than 20 values): [v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, ...,
+   *     v90, v91, v92, v93, v94, v95, v96, v97, v98, v99]
    */
   public static <V extends ValueVector> String getToString(V vector, int start, int end) {
     return getToString(vector, start, end, (v, i) -> v.getObject(i));
   }
 
   /**
-   * Get the toString() representation of vector suitable for debugging.
-   * Note since vectors may have millions of values, this method only shows at most 20 values.
+   * Get the toString() representation of vector suitable for debugging. Note since vectors may have
+   * millions of values, this method only shows at most 20 values.
+   *
    * @param vector the vector for which to get toString representation.
    * @param start the starting index, inclusive.
    * @param end the end index, exclusive.
@@ -108,9 +96,7 @@ public static <V extends ValueVector> String getToString(
     return sb.toString();
   }
 
-  /**
-   * Utility to validate vector in O(1) time.
-   */
+  /** Utility to validate vector in O(1) time. */
   public static void validate(ValueVector vector) {
     Preconditions.checkNotNull(vector);
 
@@ -121,9 +107,7 @@ public static void validate(ValueVector vector) {
     vector.accept(bufferVisitor, null);
   }
 
-  /**
-   * Utility to validate vector in O(n) time, where n is the value count.
-   */
+  /** Utility to validate vector in O(n) time, where n is the value count. */
   public static void validateFull(ValueVector vector) {
     validate(vector);
 
@@ -131,39 +115,41 @@ public static void validateFull(ValueVector vector) {
     vector.accept(dataVisitor, null);
   }
 
-  /**
-   * Utility to validate vector schema root in O(1) time.
-   */
+  /** Utility to validate vector schema root in O(1) time. */
   public static void validate(VectorSchemaRoot root) {
     Preconditions.checkNotNull(root);
     int valueCount = root.getRowCount();
-    validateOrThrow(valueCount >= 0, "The row count of vector schema root %s is negative.", valueCount);
+    validateOrThrow(
+        valueCount >= 0, "The row count of vector schema root %s is negative.", valueCount);
     for (ValueVector childVec : root.getFieldVectors()) {
-      validateOrThrow(valueCount == childVec.getValueCount(),
-          "Child vector and vector schema root have different value counts. " +
-              "Child vector value count %s, vector schema root value count %s", childVec.getValueCount(), valueCount);
+      validateOrThrow(
+          valueCount == childVec.getValueCount(),
+          "Child vector and vector schema root have different value counts. "
+              + "Child vector value count %s, vector schema root value count %s",
+          childVec.getValueCount(),
+          valueCount);
       validate(childVec);
     }
   }
 
-  /**
-   * Utility to validate vector in O(n) time, where n is the value count.
-   */
+  /** Utility to validate vector in O(n) time, where n is the value count. */
   public static void validateFull(VectorSchemaRoot root) {
     Preconditions.checkNotNull(root);
     int valueCount = root.getRowCount();
-    validateOrThrow(valueCount >= 0, "The row count of vector schema root %s is negative.", valueCount);
+    validateOrThrow(
+        valueCount >= 0, "The row count of vector schema root %s is negative.", valueCount);
     for (ValueVector childVec : root.getFieldVectors()) {
-      validateOrThrow(valueCount == childVec.getValueCount(),
-          "Child vector and vector schema root have different value counts. " +
-              "Child vector value count %s, vector schema root value count %s", childVec.getValueCount(), valueCount);
+      validateOrThrow(
+          valueCount == childVec.getValueCount(),
+          "Child vector and vector schema root have different value counts. "
+              + "Child vector value count %s, vector schema root value count %s",
+          childVec.getValueCount(),
+          valueCount);
       validateFull(childVec);
     }
   }
 
-  /**
-   * Pre allocate memory for BaseFixedWidthVector.
-   */
+  /** Pre allocate memory for BaseFixedWidthVector. */
   public static void preAllocate(VectorSchemaRoot root, int targetSize) {
     for (ValueVector vector : root.getFieldVectors()) {
       if (vector instanceof BaseFixedWidthVector) {
@@ -172,9 +158,7 @@ public static void preAllocate(VectorSchemaRoot root, int targetSize) {
     }
   }
 
-  /**
-   * Ensure capacity for BaseFixedWidthVector.
-   */
+  /** Ensure capacity for BaseFixedWidthVector. */
   public static void ensureCapacity(VectorSchemaRoot root, int targetCapacity) {
     for (ValueVector vector : root.getFieldVectors()) {
       if (vector instanceof BaseFixedWidthVector) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/VectorAppender.java b/java/vector/src/main/java/org/apache/arrow/vector/util/VectorAppender.java
index 068717c7acbc7..4f81cba55f1b3 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/VectorAppender.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/VectorAppender.java
@@ -14,18 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
 
 import java.util.HashSet;
-
 import org.apache.arrow.memory.util.MemoryUtil;
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.BaseFixedWidthVector;
 import org.apache.arrow.vector.BaseLargeVariableWidthVector;
 import org.apache.arrow.vector.BaseVariableWidthVector;
+import org.apache.arrow.vector.BaseVariableWidthViewVector;
 import org.apache.arrow.vector.BitVector;
 import org.apache.arrow.vector.BitVectorHelper;
 import org.apache.arrow.vector.ExtensionTypeVector;
@@ -40,20 +39,17 @@
 import org.apache.arrow.vector.complex.NonNullableStructVector;
 import org.apache.arrow.vector.complex.UnionVector;
 
-/**
- * Utility to append two vectors together.
- */
+/** Utility to append two vectors together. */
 public class VectorAppender implements VectorVisitor<ValueVector, Void> {
 
-  /**
-   * The targetVector to be appended.
-   */
+  /** The targetVector to be appended. */
   private final ValueVector targetVector;
 
   private final TypeEqualsVisitor typeVisitor;
 
   /**
    * Constructs a new targetVector appender, with the given targetVector.
+   *
    * @param targetVector the targetVector to be appended.
    */
   public VectorAppender(ValueVector targetVector) {
@@ -63,8 +59,9 @@ public VectorAppender(ValueVector targetVector) {
 
   @Override
   public ValueVector visit(BaseFixedWidthVector deltaVector, Void value) {
-    Preconditions.checkArgument(targetVector.getField().getType().equals(deltaVector.getField().getType()),
-            "The targetVector to append must have the same type as the targetVector being appended");
+    Preconditions.checkArgument(
+        targetVector.getField().getType().equals(deltaVector.getField().getType()),
+        "The targetVector to append must have the same type as the targetVector being appended");
 
     if (deltaVector.getValueCount() == 0) {
       return targetVector; // optimization, nothing to append, return
@@ -79,19 +76,28 @@ public ValueVector visit(BaseFixedWidthVector deltaVector, Void value) {
 
     // append validity buffer
     BitVectorHelper.concatBits(
-            targetVector.getValidityBuffer(), targetVector.getValueCount(),
-            deltaVector.getValidityBuffer(), deltaVector.getValueCount(), targetVector.getValidityBuffer());
+        targetVector.getValidityBuffer(),
+        targetVector.getValueCount(),
+        deltaVector.getValidityBuffer(),
+        deltaVector.getValueCount(),
+        targetVector.getValidityBuffer());
 
     // append data buffer
     if (targetVector instanceof BitVector) {
       // special processing for bit vector, as its type width is 0
-      BitVectorHelper.concatBits(targetVector.getDataBuffer(), targetVector.getValueCount(),
-              deltaVector.getDataBuffer(), deltaVector.getValueCount(), targetVector.getDataBuffer());
+      BitVectorHelper.concatBits(
+          targetVector.getDataBuffer(),
+          targetVector.getValueCount(),
+          deltaVector.getDataBuffer(),
+          deltaVector.getValueCount(),
+          targetVector.getDataBuffer());
 
     } else {
-      MemoryUtil.UNSAFE.copyMemory(deltaVector.getDataBuffer().memoryAddress(),
-              targetVector.getDataBuffer().memoryAddress() + deltaVector.getTypeWidth() * targetVector.getValueCount(),
-              deltaVector.getTypeWidth() * deltaVector.getValueCount());
+      MemoryUtil.UNSAFE.copyMemory(
+          deltaVector.getDataBuffer().memoryAddress(),
+          targetVector.getDataBuffer().memoryAddress()
+              + deltaVector.getTypeWidth() * targetVector.getValueCount(),
+          deltaVector.getTypeWidth() * deltaVector.getValueCount());
     }
     targetVector.setValueCount(newValueCount);
     return targetVector;
@@ -99,8 +105,9 @@ public ValueVector visit(BaseFixedWidthVector deltaVector, Void value) {
 
   @Override
   public ValueVector visit(BaseVariableWidthVector deltaVector, Void value) {
-    Preconditions.checkArgument(targetVector.getField().getType().equals(deltaVector.getField().getType()),
-            "The targetVector to append must have the same type as the targetVector being appended");
+    Preconditions.checkArgument(
+        targetVector.getField().getType().equals(deltaVector.getField().getType()),
+        "The targetVector to append must have the same type as the targetVector being appended");
 
     if (deltaVector.getValueCount() == 0) {
       return targetVector; // nothing to append, return
@@ -108,10 +115,14 @@ public ValueVector visit(BaseVariableWidthVector deltaVector, Void value) {
 
     int newValueCount = targetVector.getValueCount() + deltaVector.getValueCount();
 
-    int targetDataSize = targetVector.getOffsetBuffer().getInt(
-            (long) targetVector.getValueCount() * BaseVariableWidthVector.OFFSET_WIDTH);
-    int deltaDataSize = deltaVector.getOffsetBuffer().getInt(
-            (long) deltaVector.getValueCount() * BaseVariableWidthVector.OFFSET_WIDTH);
+    int targetDataSize =
+        targetVector
+            .getOffsetBuffer()
+            .getInt((long) targetVector.getValueCount() * BaseVariableWidthVector.OFFSET_WIDTH);
+    int deltaDataSize =
+        deltaVector
+            .getOffsetBuffer()
+            .getInt((long) deltaVector.getValueCount() * BaseVariableWidthVector.OFFSET_WIDTH);
     int newValueCapacity = targetDataSize + deltaDataSize;
 
     // make sure there is enough capacity
@@ -124,27 +135,38 @@ public ValueVector visit(BaseVariableWidthVector deltaVector, Void value) {
 
     // append validity buffer
     BitVectorHelper.concatBits(
-            targetVector.getValidityBuffer(), targetVector.getValueCount(),
-            deltaVector.getValidityBuffer(), deltaVector.getValueCount(), targetVector.getValidityBuffer());
+        targetVector.getValidityBuffer(),
+        targetVector.getValueCount(),
+        deltaVector.getValidityBuffer(),
+        deltaVector.getValueCount(),
+        targetVector.getValidityBuffer());
 
     // append data buffer
-    MemoryUtil.UNSAFE.copyMemory(deltaVector.getDataBuffer().memoryAddress(),
-            targetVector.getDataBuffer().memoryAddress() + targetDataSize, deltaDataSize);
+    MemoryUtil.UNSAFE.copyMemory(
+        deltaVector.getDataBuffer().memoryAddress(),
+        targetVector.getDataBuffer().memoryAddress() + targetDataSize,
+        deltaDataSize);
 
     // copy offset buffer
     MemoryUtil.UNSAFE.copyMemory(
-            deltaVector.getOffsetBuffer().memoryAddress() + BaseVariableWidthVector.OFFSET_WIDTH,
-            targetVector.getOffsetBuffer().memoryAddress() + (targetVector.getValueCount() + 1) *
-                    BaseVariableWidthVector.OFFSET_WIDTH,
-            deltaVector.getValueCount() * BaseVariableWidthVector.OFFSET_WIDTH);
+        deltaVector.getOffsetBuffer().memoryAddress() + BaseVariableWidthVector.OFFSET_WIDTH,
+        targetVector.getOffsetBuffer().memoryAddress()
+            + (targetVector.getValueCount() + 1) * BaseVariableWidthVector.OFFSET_WIDTH,
+        deltaVector.getValueCount() * BaseVariableWidthVector.OFFSET_WIDTH);
 
     // increase each offset from the second buffer
     for (int i = 0; i < deltaVector.getValueCount(); i++) {
-      int oldOffset = targetVector.getOffsetBuffer().getInt((long) (targetVector.getValueCount() + 1 + i) *
-              BaseVariableWidthVector.OFFSET_WIDTH);
-      targetVector.getOffsetBuffer().setInt(
-              (long) (targetVector.getValueCount() + 1 + i) *
-                      BaseVariableWidthVector.OFFSET_WIDTH, oldOffset + targetDataSize);
+      int oldOffset =
+          targetVector
+              .getOffsetBuffer()
+              .getInt(
+                  (long) (targetVector.getValueCount() + 1 + i)
+                      * BaseVariableWidthVector.OFFSET_WIDTH);
+      targetVector
+          .getOffsetBuffer()
+          .setInt(
+              (long) (targetVector.getValueCount() + 1 + i) * BaseVariableWidthVector.OFFSET_WIDTH,
+              oldOffset + targetDataSize);
     }
     ((BaseVariableWidthVector) targetVector).setLastSet(newValueCount - 1);
     targetVector.setValueCount(newValueCount);
@@ -153,8 +175,9 @@ public ValueVector visit(BaseVariableWidthVector deltaVector, Void value) {
 
   @Override
   public ValueVector visit(BaseLargeVariableWidthVector deltaVector, Void value) {
-    Preconditions.checkArgument(targetVector.getField().getType().equals(deltaVector.getField().getType()),
-            "The targetVector to append must have the same type as the targetVector being appended");
+    Preconditions.checkArgument(
+        targetVector.getField().getType().equals(deltaVector.getField().getType()),
+        "The targetVector to append must have the same type as the targetVector being appended");
 
     if (deltaVector.getValueCount() == 0) {
       return targetVector; // nothing to append, return
@@ -162,10 +185,16 @@ public ValueVector visit(BaseLargeVariableWidthVector deltaVector, Void value) {
 
     int newValueCount = targetVector.getValueCount() + deltaVector.getValueCount();
 
-    long targetDataSize = targetVector.getOffsetBuffer().getLong(
-            (long) targetVector.getValueCount() * BaseLargeVariableWidthVector.OFFSET_WIDTH);
-    long deltaDataSize = deltaVector.getOffsetBuffer().getLong(
-            (long) deltaVector.getValueCount() * BaseLargeVariableWidthVector.OFFSET_WIDTH);
+    long targetDataSize =
+        targetVector
+            .getOffsetBuffer()
+            .getLong(
+                (long) targetVector.getValueCount() * BaseLargeVariableWidthVector.OFFSET_WIDTH);
+    long deltaDataSize =
+        deltaVector
+            .getOffsetBuffer()
+            .getLong(
+                (long) deltaVector.getValueCount() * BaseLargeVariableWidthVector.OFFSET_WIDTH);
     long newValueCapacity = targetDataSize + deltaDataSize;
 
     // make sure there is enough capacity
@@ -178,37 +207,55 @@ public ValueVector visit(BaseLargeVariableWidthVector deltaVector, Void value) {
 
     // append validity buffer
     BitVectorHelper.concatBits(
-            targetVector.getValidityBuffer(), targetVector.getValueCount(),
-            deltaVector.getValidityBuffer(), deltaVector.getValueCount(), targetVector.getValidityBuffer());
+        targetVector.getValidityBuffer(),
+        targetVector.getValueCount(),
+        deltaVector.getValidityBuffer(),
+        deltaVector.getValueCount(),
+        targetVector.getValidityBuffer());
 
     // append data buffer
-    MemoryUtil.UNSAFE.copyMemory(deltaVector.getDataBuffer().memoryAddress(),
-            targetVector.getDataBuffer().memoryAddress() + targetDataSize, deltaDataSize);
+    MemoryUtil.UNSAFE.copyMemory(
+        deltaVector.getDataBuffer().memoryAddress(),
+        targetVector.getDataBuffer().memoryAddress() + targetDataSize,
+        deltaDataSize);
 
     // copy offset buffer
     MemoryUtil.UNSAFE.copyMemory(
-            deltaVector.getOffsetBuffer().memoryAddress() + BaseLargeVariableWidthVector.OFFSET_WIDTH,
-            targetVector.getOffsetBuffer().memoryAddress() + (targetVector.getValueCount() + 1) *
-                    BaseLargeVariableWidthVector.OFFSET_WIDTH,
-            deltaVector.getValueCount() * BaseLargeVariableWidthVector.OFFSET_WIDTH);
+        deltaVector.getOffsetBuffer().memoryAddress() + BaseLargeVariableWidthVector.OFFSET_WIDTH,
+        targetVector.getOffsetBuffer().memoryAddress()
+            + (targetVector.getValueCount() + 1) * BaseLargeVariableWidthVector.OFFSET_WIDTH,
+        deltaVector.getValueCount() * BaseLargeVariableWidthVector.OFFSET_WIDTH);
 
     // increase each offset from the second buffer
     for (int i = 0; i < deltaVector.getValueCount(); i++) {
-      long oldOffset = targetVector.getOffsetBuffer().getLong((long) (targetVector.getValueCount() + 1 + i) *
-              BaseLargeVariableWidthVector.OFFSET_WIDTH);
-      targetVector.getOffsetBuffer().setLong(
-              (long) (targetVector.getValueCount() + 1 + i) *
-                      BaseLargeVariableWidthVector.OFFSET_WIDTH, oldOffset + targetDataSize);
+      long oldOffset =
+          targetVector
+              .getOffsetBuffer()
+              .getLong(
+                  (long) (targetVector.getValueCount() + 1 + i)
+                      * BaseLargeVariableWidthVector.OFFSET_WIDTH);
+      targetVector
+          .getOffsetBuffer()
+          .setLong(
+              (long) (targetVector.getValueCount() + 1 + i)
+                  * BaseLargeVariableWidthVector.OFFSET_WIDTH,
+              oldOffset + targetDataSize);
     }
     ((BaseLargeVariableWidthVector) targetVector).setLastSet(newValueCount - 1);
     targetVector.setValueCount(newValueCount);
     return targetVector;
   }
 
+  @Override
+  public ValueVector visit(BaseVariableWidthViewVector left, Void value) {
+    throw new UnsupportedOperationException("View vectors are not supported.");
+  }
+
   @Override
   public ValueVector visit(ListVector deltaVector, Void value) {
-    Preconditions.checkArgument(typeVisitor.equals(deltaVector),
-          "The targetVector to append must have the same type as the targetVector being appended");
+    Preconditions.checkArgument(
+        typeVisitor.equals(deltaVector),
+        "The targetVector to append must have the same type as the targetVector being appended");
 
     if (deltaVector.getValueCount() == 0) {
       return targetVector; // nothing to append, return
@@ -216,10 +263,14 @@ public ValueVector visit(ListVector deltaVector, Void value) {
 
     int newValueCount = targetVector.getValueCount() + deltaVector.getValueCount();
 
-    int targetListSize = targetVector.getOffsetBuffer().getInt(
-          (long) targetVector.getValueCount() * ListVector.OFFSET_WIDTH);
-    int deltaListSize = deltaVector.getOffsetBuffer().getInt(
-          (long) deltaVector.getValueCount() * ListVector.OFFSET_WIDTH);
+    int targetListSize =
+        targetVector
+            .getOffsetBuffer()
+            .getInt((long) targetVector.getValueCount() * ListVector.OFFSET_WIDTH);
+    int deltaListSize =
+        deltaVector
+            .getOffsetBuffer()
+            .getInt((long) deltaVector.getValueCount() * ListVector.OFFSET_WIDTH);
 
     ListVector targetListVector = (ListVector) targetVector;
 
@@ -234,21 +285,30 @@ public ValueVector visit(ListVector deltaVector, Void value) {
 
     // append validity buffer
     BitVectorHelper.concatBits(
-          targetVector.getValidityBuffer(), targetVector.getValueCount(),
-          deltaVector.getValidityBuffer(), deltaVector.getValueCount(), targetVector.getValidityBuffer());
+        targetVector.getValidityBuffer(),
+        targetVector.getValueCount(),
+        deltaVector.getValidityBuffer(),
+        deltaVector.getValueCount(),
+        targetVector.getValidityBuffer());
 
     // append offset buffer
-    MemoryUtil.UNSAFE.copyMemory(deltaVector.getOffsetBuffer().memoryAddress() + ListVector.OFFSET_WIDTH,
-          targetVector.getOffsetBuffer().memoryAddress() + (targetVector.getValueCount() + 1) *
-              ListVector.OFFSET_WIDTH,
-          (long) deltaVector.getValueCount() * ListVector.OFFSET_WIDTH);
+    MemoryUtil.UNSAFE.copyMemory(
+        deltaVector.getOffsetBuffer().memoryAddress() + ListVector.OFFSET_WIDTH,
+        targetVector.getOffsetBuffer().memoryAddress()
+            + (targetVector.getValueCount() + 1) * ListVector.OFFSET_WIDTH,
+        (long) deltaVector.getValueCount() * ListVector.OFFSET_WIDTH);
 
     // increase each offset from the second buffer
     for (int i = 0; i < deltaVector.getValueCount(); i++) {
-      int oldOffset = targetVector.getOffsetBuffer().getInt(
-          (long) (targetVector.getValueCount() + 1 + i) * ListVector.OFFSET_WIDTH);
-      targetVector.getOffsetBuffer().setInt((long) (targetVector.getValueCount() + 1 + i) * ListVector.OFFSET_WIDTH,
-            oldOffset + targetListSize);
+      int oldOffset =
+          targetVector
+              .getOffsetBuffer()
+              .getInt((long) (targetVector.getValueCount() + 1 + i) * ListVector.OFFSET_WIDTH);
+      targetVector
+          .getOffsetBuffer()
+          .setInt(
+              (long) (targetVector.getValueCount() + 1 + i) * ListVector.OFFSET_WIDTH,
+              oldOffset + targetListSize);
     }
     targetListVector.setLastSet(newValueCount - 1);
 
@@ -262,8 +322,9 @@ public ValueVector visit(ListVector deltaVector, Void value) {
 
   @Override
   public ValueVector visit(LargeListVector deltaVector, Void value) {
-    Preconditions.checkArgument(typeVisitor.equals(deltaVector),
-            "The targetVector to append must have the same type as the targetVector being appended");
+    Preconditions.checkArgument(
+        typeVisitor.equals(deltaVector),
+        "The targetVector to append must have the same type as the targetVector being appended");
 
     if (deltaVector.getValueCount() == 0) {
       return targetVector; // nothing to append, return
@@ -271,10 +332,14 @@ public ValueVector visit(LargeListVector deltaVector, Void value) {
 
     int newValueCount = targetVector.getValueCount() + deltaVector.getValueCount();
 
-    long targetListSize = targetVector.getOffsetBuffer().getLong(
-            (long) targetVector.getValueCount() * LargeListVector.OFFSET_WIDTH);
-    long deltaListSize = deltaVector.getOffsetBuffer().getLong(
-            (long) deltaVector.getValueCount() * LargeListVector.OFFSET_WIDTH);
+    long targetListSize =
+        targetVector
+            .getOffsetBuffer()
+            .getLong((long) targetVector.getValueCount() * LargeListVector.OFFSET_WIDTH);
+    long deltaListSize =
+        deltaVector
+            .getOffsetBuffer()
+            .getLong((long) deltaVector.getValueCount() * LargeListVector.OFFSET_WIDTH);
 
     ListVector targetListVector = (ListVector) targetVector;
 
@@ -290,21 +355,31 @@ public ValueVector visit(LargeListVector deltaVector, Void value) {
 
     // append validity buffer
     BitVectorHelper.concatBits(
-            targetVector.getValidityBuffer(), targetVector.getValueCount(),
-            deltaVector.getValidityBuffer(), deltaVector.getValueCount(), targetVector.getValidityBuffer());
+        targetVector.getValidityBuffer(),
+        targetVector.getValueCount(),
+        deltaVector.getValidityBuffer(),
+        deltaVector.getValueCount(),
+        targetVector.getValidityBuffer());
 
     // append offset buffer
-    MemoryUtil.UNSAFE.copyMemory(deltaVector.getOffsetBuffer().memoryAddress() + ListVector.OFFSET_WIDTH,
-            targetVector.getOffsetBuffer().memoryAddress() + (targetVector.getValueCount() + 1) *
-                    LargeListVector.OFFSET_WIDTH,
-            (long) deltaVector.getValueCount() * ListVector.OFFSET_WIDTH);
+    MemoryUtil.UNSAFE.copyMemory(
+        deltaVector.getOffsetBuffer().memoryAddress() + ListVector.OFFSET_WIDTH,
+        targetVector.getOffsetBuffer().memoryAddress()
+            + (targetVector.getValueCount() + 1) * LargeListVector.OFFSET_WIDTH,
+        (long) deltaVector.getValueCount() * ListVector.OFFSET_WIDTH);
 
     // increase each offset from the second buffer
     for (int i = 0; i < deltaVector.getValueCount(); i++) {
-      long oldOffset = targetVector.getOffsetBuffer().getLong(
-          (long) (targetVector.getValueCount() + 1 + i) * LargeListVector.OFFSET_WIDTH);
-      targetVector.getOffsetBuffer().setLong((long) (targetVector.getValueCount() + 1 + i) *
-          LargeListVector.OFFSET_WIDTH, oldOffset + targetListSize);
+      long oldOffset =
+          targetVector
+              .getOffsetBuffer()
+              .getLong(
+                  (long) (targetVector.getValueCount() + 1 + i) * LargeListVector.OFFSET_WIDTH);
+      targetVector
+          .getOffsetBuffer()
+          .setLong(
+              (long) (targetVector.getValueCount() + 1 + i) * LargeListVector.OFFSET_WIDTH,
+              oldOffset + targetListSize);
     }
     targetListVector.setLastSet(newValueCount - 1);
 
@@ -318,8 +393,9 @@ public ValueVector visit(LargeListVector deltaVector, Void value) {
 
   @Override
   public ValueVector visit(FixedSizeListVector deltaVector, Void value) {
-    Preconditions.checkArgument(typeVisitor.equals(deltaVector),
-            "The vector to append must have the same type as the targetVector being appended");
+    Preconditions.checkArgument(
+        typeVisitor.equals(deltaVector),
+        "The vector to append must have the same type as the targetVector being appended");
 
     if (deltaVector.getValueCount() == 0) {
       return targetVector; // optimization, nothing to append, return
@@ -327,8 +403,9 @@ public ValueVector visit(FixedSizeListVector deltaVector, Void value) {
 
     FixedSizeListVector targetListVector = (FixedSizeListVector) targetVector;
 
-    Preconditions.checkArgument(targetListVector.getListSize() == deltaVector.getListSize(),
-            "FixedSizeListVector must have the same list size to append");
+    Preconditions.checkArgument(
+        targetListVector.getListSize() == deltaVector.getListSize(),
+        "FixedSizeListVector must have the same list size to append");
 
     int newValueCount = targetVector.getValueCount() + deltaVector.getValueCount();
 
@@ -346,8 +423,11 @@ public ValueVector visit(FixedSizeListVector deltaVector, Void value) {
 
     // append validity buffer
     BitVectorHelper.concatBits(
-            targetVector.getValidityBuffer(), targetVector.getValueCount(),
-            deltaVector.getValidityBuffer(), deltaVector.getValueCount(), targetVector.getValidityBuffer());
+        targetVector.getValidityBuffer(),
+        targetVector.getValueCount(),
+        deltaVector.getValidityBuffer(),
+        deltaVector.getValueCount(),
+        targetVector.getValidityBuffer());
 
     // append underlying vectors
     VectorAppender innerAppender = new VectorAppender(targetListVector.getDataVector());
@@ -359,8 +439,9 @@ public ValueVector visit(FixedSizeListVector deltaVector, Void value) {
 
   @Override
   public ValueVector visit(NonNullableStructVector deltaVector, Void value) {
-    Preconditions.checkArgument(typeVisitor.equals(deltaVector),
-            "The vector to append must have the same type as the targetVector being appended");
+    Preconditions.checkArgument(
+        typeVisitor.equals(deltaVector),
+        "The vector to append must have the same type as the targetVector being appended");
 
     if (deltaVector.getValueCount() == 0) {
       return targetVector; // optimization, nothing to append, return
@@ -376,8 +457,11 @@ public ValueVector visit(NonNullableStructVector deltaVector, Void value) {
 
     // append validity buffer
     BitVectorHelper.concatBits(
-            targetVector.getValidityBuffer(), targetVector.getValueCount(),
-            deltaVector.getValidityBuffer(), deltaVector.getValueCount(), targetVector.getValidityBuffer());
+        targetVector.getValidityBuffer(),
+        targetVector.getValueCount(),
+        deltaVector.getValidityBuffer(),
+        deltaVector.getValueCount(),
+        targetVector.getValidityBuffer());
 
     // append child vectors
     for (int i = 0; i < targetStructVector.getChildrenFromFields().size(); i++) {
@@ -398,8 +482,9 @@ public ValueVector visit(NonNullableStructVector deltaVector, Void value) {
   @Override
   public ValueVector visit(UnionVector deltaVector, Void value) {
     // we only make sure that both vectors are union vectors.
-    Preconditions.checkArgument(targetVector.getMinorType() == deltaVector.getMinorType(),
-            "The vector to append must have the same type as the targetVector being appended");
+    Preconditions.checkArgument(
+        targetVector.getMinorType() == deltaVector.getMinorType(),
+        "The vector to append must have the same type as the targetVector being appended");
 
     if (deltaVector.getValueCount() == 0) {
       return targetVector; // optimization, nothing to append, return
@@ -414,9 +499,10 @@ public ValueVector visit(UnionVector deltaVector, Void value) {
     }
 
     // append type buffers
-    MemoryUtil.UNSAFE.copyMemory(deltaVector.getTypeBufferAddress(),
-            targetUnionVector.getTypeBufferAddress() + targetVector.getValueCount(),
-            deltaVector.getValueCount());
+    MemoryUtil.UNSAFE.copyMemory(
+        deltaVector.getTypeBufferAddress(),
+        targetUnionVector.getTypeBufferAddress() + targetVector.getValueCount(),
+        deltaVector.getValueCount());
 
     // build the hash set for all types
     HashSet<Integer> targetTypes = new HashSet<>();
@@ -461,7 +547,8 @@ public ValueVector visit(UnionVector deltaVector, Void value) {
   @Override
   public ValueVector visit(DenseUnionVector deltaVector, Void value) {
     // we only make sure that both vectors are union vectors.
-    Preconditions.checkArgument(targetVector.getMinorType() == deltaVector.getMinorType(),
+    Preconditions.checkArgument(
+        targetVector.getMinorType() == deltaVector.getMinorType(),
         "The vector to append must have the same type as the targetVector being appended");
 
     if (deltaVector.getValueCount() == 0) {
@@ -477,8 +564,9 @@ public ValueVector visit(DenseUnionVector deltaVector, Void value) {
     }
 
     // append type buffers
-    MemoryUtil.UNSAFE.copyMemory(deltaVector.getTypeBuffer().memoryAddress(),
-        targetDenseUnionVector.getTypeBuffer() .memoryAddress() + targetVector.getValueCount(),
+    MemoryUtil.UNSAFE.copyMemory(
+        deltaVector.getTypeBuffer().memoryAddress(),
+        targetDenseUnionVector.getTypeBuffer().memoryAddress() + targetVector.getValueCount(),
         deltaVector.getValueCount());
 
     // append offset buffers
@@ -503,8 +591,10 @@ public ValueVector visit(DenseUnionVector deltaVector, Void value) {
       } else if (targetChildVector == null && deltaChildVector != null) {
         // first register a new child in the target vector
         targetDenseUnionVector.registerNewTypeId(deltaChildVector.getField());
-        targetChildVector = targetDenseUnionVector.addVector(
-            (byte) i, deltaChildVector.getField().createVector(targetDenseUnionVector.getAllocator()));
+        targetChildVector =
+            targetDenseUnionVector.addVector(
+                (byte) i,
+                deltaChildVector.getField().createVector(targetDenseUnionVector.getAllocator()));
 
         // now we have both child vectors not null, we can append them.
         VectorAppender childAppender = new VectorAppender(targetChildVector);
@@ -517,9 +607,11 @@ public ValueVector visit(DenseUnionVector deltaVector, Void value) {
 
         // first check vector types
         TypeEqualsVisitor childTypeVisitor =
-            new TypeEqualsVisitor(targetChildVector, /* check name */ false, /* check meta data*/ false);
+            new TypeEqualsVisitor(
+                targetChildVector, /* check name */ false, /* check meta data*/ false);
         if (!childTypeVisitor.equals(deltaChildVector)) {
-          throw new IllegalArgumentException("dense union vectors have different child vector types with type id " + i);
+          throw new IllegalArgumentException(
+              "dense union vectors have different child vector types with type id " + i);
         }
 
         // append child vectors
@@ -534,8 +626,9 @@ public ValueVector visit(DenseUnionVector deltaVector, Void value) {
 
   @Override
   public ValueVector visit(NullVector deltaVector, Void value) {
-    Preconditions.checkArgument(targetVector.getField().getType().equals(deltaVector.getField().getType()),
-            "The targetVector to append must have the same type as the targetVector being appended");
+    Preconditions.checkArgument(
+        targetVector.getField().getType().equals(deltaVector.getField().getType()),
+        "The targetVector to append must have the same type as the targetVector being appended");
     return targetVector;
   }
 
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/VectorBatchAppender.java b/java/vector/src/main/java/org/apache/arrow/vector/util/VectorBatchAppender.java
index 570783d107041..a5d289ffc7774 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/VectorBatchAppender.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/VectorBatchAppender.java
@@ -14,19 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import org.apache.arrow.vector.ValueVector;
 
-/**
- * Utility to add vector values in batch.
- */
+/** Utility to add vector values in batch. */
 public class VectorBatchAppender {
 
   /**
    * Add value vectors in batch.
-   * @param targetVector the  target vector.
+   *
+   * @param targetVector the target vector.
    * @param vectorsToAppend the vectors to append.
    * @param <V> the vector type.
    */
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/VectorSchemaRootAppender.java b/java/vector/src/main/java/org/apache/arrow/vector/util/VectorSchemaRootAppender.java
index 3c6044ec53131..96674b4002c95 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/util/VectorSchemaRootAppender.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/util/VectorSchemaRootAppender.java
@@ -14,25 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.compare.TypeEqualsVisitor;
 
-/**
- * Utility to append {@link org.apache.arrow.vector.VectorSchemaRoot}s with the same schema.
- */
+/** Utility to append {@link org.apache.arrow.vector.VectorSchemaRoot}s with the same schema. */
 public class VectorSchemaRootAppender {
 
   /**
    * Appends a number of {@link VectorSchemaRoot}s.
+   *
    * @param checkSchema if we need to check schema for the vector schema roots.
    * @param targetRoot the vector schema root to be appended.
    * @param rootsToAppend the vector schema roots to append.
    * @throws IllegalArgumentException throws if we need to check schema, and checking schema fails.
    */
-  public static void append(boolean checkSchema, VectorSchemaRoot targetRoot, VectorSchemaRoot... rootsToAppend) {
+  public static void append(
+      boolean checkSchema, VectorSchemaRoot targetRoot, VectorSchemaRoot... rootsToAppend) {
     // create appenders
     VectorAppender[] appenders = new VectorAppender[targetRoot.getFieldVectors().size()];
     for (int i = 0; i < appenders.length; i++) {
@@ -44,8 +43,9 @@ public static void append(boolean checkSchema, VectorSchemaRoot targetRoot, Vect
     if (checkSchema) {
       typeCheckers = new TypeEqualsVisitor[targetRoot.getFieldVectors().size()];
       for (int i = 0; i < typeCheckers.length; i++) {
-        typeCheckers[i] = new TypeEqualsVisitor(targetRoot.getVector(i),
-            /* check name */ false, /* check meta data */ false);
+        typeCheckers[i] =
+            new TypeEqualsVisitor(
+                targetRoot.getVector(i), /* check name */ false, /* check meta data */ false);
       }
     }
 
@@ -53,7 +53,8 @@ public static void append(boolean checkSchema, VectorSchemaRoot targetRoot, Vect
       // check schema, if necessary
       if (checkSchema) {
         if (delta.getFieldVectors().size() != targetRoot.getFieldVectors().size()) {
-          throw new IllegalArgumentException("Vector schema roots have different numbers of child vectors.");
+          throw new IllegalArgumentException(
+              "Vector schema roots have different numbers of child vectors.");
         }
         for (int i = 0; i < typeCheckers.length; i++) {
           if (!typeCheckers[i].equals(delta.getVector(i))) {
@@ -71,8 +72,9 @@ public static void append(boolean checkSchema, VectorSchemaRoot targetRoot, Vect
   }
 
   /**
-   * Appends a number of {@link VectorSchemaRoot}s.
-   * This method performs schema checking before appending data.
+   * Appends a number of {@link VectorSchemaRoot}s. This method performs schema checking before
+   * appending data.
+   *
    * @param targetRoot the vector schema root to be appended.
    * @param rootsToAppend the vector schema roots to append.
    * @throws IllegalArgumentException throws if we need to check schema, and checking schema fails.
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/validate/MetadataV4UnionChecker.java b/java/vector/src/main/java/org/apache/arrow/vector/validate/MetadataV4UnionChecker.java
index 2a7068365678a..f127fd6a5805f 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/validate/MetadataV4UnionChecker.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/validate/MetadataV4UnionChecker.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.validate;
 
 import java.io.IOException;
 import java.util.Iterator;
-
 import org.apache.arrow.vector.types.MetadataVersion;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
@@ -28,7 +26,7 @@
 /**
  * Given a field, checks that no Union fields are present.
  *
- * This is intended to be used to prevent unions from being read/written with V4 metadata.
+ * <p>This is intended to be used to prevent unions from being read/written with V4 metadata.
  */
 public final class MetadataV4UnionChecker {
   static boolean isUnion(Field field) {
@@ -50,7 +48,8 @@ static Field check(Field field) {
   }
 
   /**
-   * Check the schema, raising an error if an unsupported feature is used (e.g. unions with < V5 metadata).
+   * Check the schema, raising an error if an unsupported feature is used (e.g. unions with < V5
+   * metadata).
    */
   public static void checkForUnion(Iterator<Field> fields, MetadataVersion metadataVersion) {
     if (metadataVersion.toFlatbufID() >= MetadataVersion.V5.toFlatbufID()) {
@@ -66,7 +65,8 @@ public static void checkForUnion(Iterator<Field> fields, MetadataVersion metadat
   }
 
   /**
-   * Check the schema, raising an error if an unsupported feature is used (e.g. unions with < V5 metadata).
+   * Check the schema, raising an error if an unsupported feature is used (e.g. unions with < V5
+   * metadata).
    */
   public static void checkRead(Schema schema, MetadataVersion metadataVersion) throws IOException {
     if (metadataVersion.toFlatbufID() >= MetadataVersion.V5.toFlatbufID()) {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateUtil.java b/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateUtil.java
index e1b60e92616cb..015ee265d1423 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateUtil.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateUtil.java
@@ -14,19 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.validate;
 
-/**
- * Utilities for vector validation.
- */
+/** Utilities for vector validation. */
 public class ValidateUtil {
 
-  private ValidateUtil() {
-  }
+  private ValidateUtil() {}
 
   /**
    * Validate the expression.
+   *
    * @param expression the expression to validate.
    * @param errorMessage the error message.
    * @throws ValidateException if the expression evaluates to false.
@@ -39,6 +36,7 @@ public static void validateOrThrow(boolean expression, String errorMessage) {
 
   /**
    * Validate the expression.
+   *
    * @param expression the expression to validate.
    * @param errorMessage the error message template.
    * @param args the error message arguments.
@@ -50,9 +48,7 @@ public static void validateOrThrow(boolean expression, String errorMessage, Obje
     }
   }
 
-  /**
-   * A exception that is thrown when the vector validation fails.
-   */
+  /** A exception that is thrown when the vector validation fails. */
   public static class ValidateException extends RuntimeException {
     public ValidateException(String message) {
       super(message);
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorBufferVisitor.java b/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorBufferVisitor.java
index d4abaa1945b94..0c9140c360d15 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorBufferVisitor.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorBufferVisitor.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.validate;
 
 import static org.apache.arrow.vector.validate.ValidateUtil.validateOrThrow;
@@ -23,6 +22,7 @@
 import org.apache.arrow.vector.BaseFixedWidthVector;
 import org.apache.arrow.vector.BaseLargeVariableWidthVector;
 import org.apache.arrow.vector.BaseVariableWidthVector;
+import org.apache.arrow.vector.BaseVariableWidthViewVector;
 import org.apache.arrow.vector.BitVector;
 import org.apache.arrow.vector.ExtensionTypeVector;
 import org.apache.arrow.vector.FieldVector;
@@ -38,62 +38,76 @@
 import org.apache.arrow.vector.complex.UnionVector;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 
-/**
- * Visitor to validate vector buffers.
- */
+/** Visitor to validate vector buffers. */
 public class ValidateVectorBufferVisitor implements VectorVisitor<Void, Void> {
 
   private void validateVectorCommon(ValueVector vector) {
     ArrowType arrowType = vector.getField().getType();
-    validateOrThrow(vector.getValueCount() >= 0,
-        "Vector valueCount %s is negative.", vector.getValueCapacity());
+    validateOrThrow(
+        vector.getValueCount() >= 0,
+        "Vector valueCount %s is negative.",
+        vector.getValueCapacity());
 
     if (vector instanceof FieldVector) {
       FieldVector fieldVector = (FieldVector) vector;
+      // TODO: https://github.com/apache/arrow/issues/41734
       int typeBufferCount = TypeLayout.getTypeBufferCount(arrowType);
-      validateOrThrow(fieldVector.getFieldBuffers().size() == typeBufferCount,
+      validateOrThrow(
+          fieldVector.getFieldBuffers().size() == typeBufferCount,
           "Expected %s buffers in vector of type %s, got %s.",
-              typeBufferCount, vector.getField().getType().toString(), fieldVector.getFieldBuffers().size());
+          typeBufferCount,
+          vector.getField().getType().toString(),
+          fieldVector.getFieldBuffers().size());
     }
   }
 
   private void validateValidityBuffer(ValueVector vector, int valueCount) {
     ArrowBuf validityBuffer = vector.getValidityBuffer();
     validateOrThrow(validityBuffer != null, "The validity buffer is null.");
-    validateOrThrow(validityBuffer.capacity() * 8 >= valueCount,
+    validateOrThrow(
+        validityBuffer.capacity() * 8 >= valueCount,
         "Not enough capacity for the validity buffer. Minimum capacity %s, actual capacity %s.",
-        (valueCount + 7) / 8, validityBuffer.capacity());
+        (valueCount + 7) / 8,
+        validityBuffer.capacity());
   }
 
   private void validateOffsetBuffer(ValueVector vector, long minCapacity) {
     ArrowBuf offsetBuffer = vector.getOffsetBuffer();
     validateOrThrow(offsetBuffer != null, "The offset buffer is null.");
-    validateOrThrow(offsetBuffer.capacity() >= minCapacity,
+    validateOrThrow(
+        offsetBuffer.capacity() >= minCapacity,
         "Not enough capacity for the offset buffer. Minimum capacity %s, actual capacity %s.",
-        minCapacity, offsetBuffer.capacity());
+        minCapacity,
+        offsetBuffer.capacity());
   }
 
   private void validateFixedWidthDataBuffer(ValueVector vector, int valueCount, int bitWidth) {
     ArrowBuf dataBuffer = vector.getDataBuffer();
     validateOrThrow(dataBuffer != null, "The fixed width data buffer is null.");
-    validateOrThrow((long) bitWidth * valueCount <= dataBuffer.capacity() * 8L,
+    validateOrThrow(
+        (long) bitWidth * valueCount <= dataBuffer.capacity() * 8L,
         "Not enough capacity for fixed width data buffer. Minimum capacity %s, actual capacity %s.",
-        ((long) bitWidth * valueCount + 7L) / 8L, dataBuffer.capacity());
+        ((long) bitWidth * valueCount + 7L) / 8L,
+        dataBuffer.capacity());
   }
 
   private void validateDataBuffer(ValueVector vector, long minCapacity) {
     ArrowBuf dataBuffer = vector.getDataBuffer();
     validateOrThrow(dataBuffer != null, "The data buffer is null.");
-    validateOrThrow(dataBuffer.capacity() >= minCapacity,
+    validateOrThrow(
+        dataBuffer.capacity() >= minCapacity,
         "Not enough capacity for data buffer. Minimum capacity %s, actual capacity %s.",
-        minCapacity, dataBuffer.capacity());
+        minCapacity,
+        dataBuffer.capacity());
   }
 
   private void validateTypeBuffer(ArrowBuf typeBuf, long minCapacity) {
     validateOrThrow(typeBuf != null, "The type buffer is null.");
-    validateOrThrow(typeBuf.capacity() >= minCapacity,
+    validateOrThrow(
+        typeBuf.capacity() >= minCapacity,
         "Not enough capacity for type buffer. Minimum capacity %s, actual capacity %s.",
-        minCapacity, typeBuf.capacity());
+        minCapacity,
+        typeBuf.capacity());
   }
 
   @Override
@@ -111,10 +125,13 @@ public Void visit(BaseVariableWidthVector vector, Void value) {
     int valueCount = vector.getValueCount();
     validateVectorCommon(vector);
     validateValidityBuffer(vector, valueCount);
-    long minOffsetCapacity = valueCount == 0 ? 0L : (long) (valueCount + 1) * BaseVariableWidthVector.OFFSET_WIDTH;
+    long minOffsetCapacity =
+        valueCount == 0 ? 0L : (long) (valueCount + 1) * BaseVariableWidthVector.OFFSET_WIDTH;
     validateOffsetBuffer(vector, minOffsetCapacity);
-    int lastOffset = valueCount == 0 ? 0 :
-        vector.getOffsetBuffer().getInt(valueCount * BaseVariableWidthVector.OFFSET_WIDTH);
+    int lastOffset =
+        valueCount == 0
+            ? 0
+            : vector.getOffsetBuffer().getInt(valueCount * BaseVariableWidthVector.OFFSET_WIDTH);
     validateDataBuffer(vector, lastOffset);
     return null;
   }
@@ -124,30 +141,44 @@ public Void visit(BaseLargeVariableWidthVector vector, Void value) {
     int valueCount = vector.getValueCount();
     validateVectorCommon(vector);
     validateValidityBuffer(vector, valueCount);
-    long minOffsetCapacity = valueCount == 0 ? 0L
-        : (long) (valueCount + 1) * BaseLargeVariableWidthVector.OFFSET_WIDTH;
+    long minOffsetCapacity =
+        valueCount == 0 ? 0L : (long) (valueCount + 1) * BaseLargeVariableWidthVector.OFFSET_WIDTH;
     validateOffsetBuffer(vector, minOffsetCapacity);
-    long lastOffset = valueCount == 0 ? 0L :
-        vector.getOffsetBuffer().getLong((long) valueCount * BaseLargeVariableWidthVector.OFFSET_WIDTH);
+    long lastOffset =
+        valueCount == 0
+            ? 0L
+            : vector
+                .getOffsetBuffer()
+                .getLong((long) valueCount * BaseLargeVariableWidthVector.OFFSET_WIDTH);
     validateDataBuffer(vector, lastOffset);
     return null;
   }
 
+  @Override
+  public Void visit(BaseVariableWidthViewVector vector, Void value) {
+    throw new UnsupportedOperationException("View vectors are not supported.");
+  }
+
   @Override
   public Void visit(ListVector vector, Void value) {
     int valueCount = vector.getValueCount();
     validateVectorCommon(vector);
     validateValidityBuffer(vector, valueCount);
-    long minOffsetCapacity = valueCount == 0 ? 0L : (long) (valueCount + 1) * ListVector.OFFSET_WIDTH;
+    long minOffsetCapacity =
+        valueCount == 0 ? 0L : (long) (valueCount + 1) * ListVector.OFFSET_WIDTH;
     validateOffsetBuffer(vector, minOffsetCapacity);
 
     FieldVector dataVector = vector.getDataVector();
-    int lastOffset = valueCount == 0 ? 0 :
-        vector.getOffsetBuffer().getInt(valueCount * BaseVariableWidthVector.OFFSET_WIDTH);
+    int lastOffset =
+        valueCount == 0
+            ? 0
+            : vector.getOffsetBuffer().getInt(valueCount * BaseVariableWidthVector.OFFSET_WIDTH);
     int dataVectorLength = dataVector == null ? 0 : dataVector.getValueCount();
-    validateOrThrow(dataVectorLength >= lastOffset,
+    validateOrThrow(
+        dataVectorLength >= lastOffset,
         "Inner vector does not contain enough elements. Minimum element count %s, actual element count %s",
-        lastOffset + 1, dataVectorLength);
+        lastOffset + 1,
+        dataVectorLength);
 
     if (dataVector != null) {
       dataVector.accept(this, null);
@@ -162,9 +193,11 @@ public Void visit(FixedSizeListVector vector, Void value) {
     validateValidityBuffer(vector, valueCount);
     FieldVector dataVector = vector.getDataVector();
     int dataVectorLength = dataVector == null ? 0 : dataVector.getValueCount();
-    validateOrThrow(dataVectorLength >= valueCount * vector.getListSize(),
+    validateOrThrow(
+        dataVectorLength >= valueCount * vector.getListSize(),
         "Inner vector does not contain enough elements. Minimum element count %s, actual element count %s.",
-        valueCount * vector.getListSize(), dataVectorLength);
+        valueCount * vector.getListSize(),
+        dataVectorLength);
     if (dataVector != null) {
       dataVector.accept(this, null);
     }
@@ -176,16 +209,23 @@ public Void visit(LargeListVector vector, Void value) {
     int valueCount = vector.getValueCount();
     validateVectorCommon(vector);
     validateValidityBuffer(vector, valueCount);
-    long minOffsetCapacity = valueCount == 0 ? 0L : (long) (valueCount + 1) * LargeListVector.OFFSET_WIDTH;
+    long minOffsetCapacity =
+        valueCount == 0 ? 0L : (long) (valueCount + 1) * LargeListVector.OFFSET_WIDTH;
     validateOffsetBuffer(vector, minOffsetCapacity);
 
     FieldVector dataVector = vector.getDataVector();
-    long lastOffset = valueCount == 0 ? 0 :
-        vector.getOffsetBuffer().getLong(valueCount * BaseLargeVariableWidthVector.OFFSET_WIDTH);
+    long lastOffset =
+        valueCount == 0
+            ? 0
+            : vector
+                .getOffsetBuffer()
+                .getLong(valueCount * BaseLargeVariableWidthVector.OFFSET_WIDTH);
     int dataVectorLength = dataVector == null ? 0 : dataVector.getValueCount();
-    validateOrThrow(dataVectorLength >= lastOffset,
+    validateOrThrow(
+        dataVectorLength >= lastOffset,
         "Inner vector does not contain enough elements. Minimum element count %s, actual element count %s",
-        lastOffset + 1, dataVectorLength);
+        lastOffset + 1,
+        dataVectorLength);
 
     if (dataVector != null) {
       dataVector.accept(this, null);
@@ -199,9 +239,11 @@ public Void visit(NonNullableStructVector vector, Void value) {
     validateVectorCommon(vector);
     validateValidityBuffer(vector, valueCount);
     for (ValueVector subVector : vector.getChildrenFromFields()) {
-      validateOrThrow(valueCount == subVector.getValueCount(),
+      validateOrThrow(
+          valueCount == subVector.getValueCount(),
           "Struct vector length not equal to child vector length. Struct vector length %s, child vector length %s",
-          valueCount, subVector.getValueCount());
+          valueCount,
+          subVector.getValueCount());
       subVector.accept(this, null);
     }
     return null;
@@ -213,9 +255,11 @@ public Void visit(UnionVector vector, Void value) {
     validateVectorCommon(vector);
     validateTypeBuffer(vector.getTypeBuffer(), valueCount * UnionVector.TYPE_WIDTH);
     for (ValueVector subVector : vector.getChildrenFromFields()) {
-      validateOrThrow(valueCount == subVector.getValueCount(),
+      validateOrThrow(
+          valueCount == subVector.getValueCount(),
           "Union vector length not equal to child vector length. Union vector length %s, child vector length %s",
-          valueCount, subVector.getValueCount());
+          valueCount,
+          subVector.getValueCount());
       subVector.accept(this, null);
     }
     return null;
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorDataVisitor.java b/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorDataVisitor.java
index 6d33be7a0dbac..c62bff79f7710 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorDataVisitor.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorDataVisitor.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.validate;
 
 import static org.apache.arrow.vector.validate.ValidateUtil.validateOrThrow;
@@ -23,6 +22,7 @@
 import org.apache.arrow.vector.BaseFixedWidthVector;
 import org.apache.arrow.vector.BaseLargeVariableWidthVector;
 import org.apache.arrow.vector.BaseVariableWidthVector;
+import org.apache.arrow.vector.BaseVariableWidthViewVector;
 import org.apache.arrow.vector.ExtensionTypeVector;
 import org.apache.arrow.vector.NullVector;
 import org.apache.arrow.vector.ValueVector;
@@ -34,9 +34,7 @@
 import org.apache.arrow.vector.complex.NonNullableStructVector;
 import org.apache.arrow.vector.complex.UnionVector;
 
-/**
- * Utility for validating vector data.
- */
+/** Utility for validating vector data. */
 public class ValidateVectorDataVisitor implements VectorVisitor<Void, Void> {
 
   private void validateOffsetBuffer(ValueVector vector, int valueCount) {
@@ -49,10 +47,18 @@ private void validateOffsetBuffer(ValueVector vector, int valueCount) {
     int prevValue = offsetBuffer.getInt(0);
     for (int i = 1; i <= valueCount; i++) {
       int curValue = offsetBuffer.getInt(i * 4);
-      validateOrThrow(curValue >= 0, "The value at position %s of the offset buffer is negative: %s.", i, curValue);
-      validateOrThrow(curValue >= prevValue,
+      validateOrThrow(
+          curValue >= 0,
+          "The value at position %s of the offset buffer is negative: %s.",
+          i,
+          curValue);
+      validateOrThrow(
+          curValue >= prevValue,
           "The values in positions %s and %s of the offset buffer are decreasing: %s, %s.",
-          i - 1, i, prevValue, curValue);
+          i - 1,
+          i,
+          prevValue,
+          curValue);
       prevValue = curValue;
     }
   }
@@ -67,19 +73,29 @@ private void validateLargeOffsetBuffer(ValueVector vector, int valueCount) {
     long prevValue = offsetBuffer.getLong(0);
     for (int i = 1; i <= valueCount; i++) {
       long curValue = offsetBuffer.getLong((long) i * 8);
-      validateOrThrow(curValue >= 0L, "The value at position %s of the large offset buffer is negative: %s.",
-          i, curValue);
-      validateOrThrow(curValue >= prevValue,
+      validateOrThrow(
+          curValue >= 0L,
+          "The value at position %s of the large offset buffer is negative: %s.",
+          i,
+          curValue);
+      validateOrThrow(
+          curValue >= prevValue,
           "The values in positions %s and %s of the large offset buffer are decreasing: %s, %s.",
-          i - 1, i, prevValue, curValue);
+          i - 1,
+          i,
+          prevValue,
+          curValue);
       prevValue = curValue;
     }
   }
 
   private void validateTypeBuffer(ArrowBuf typeBuf, int valueCount) {
     for (int i = 0; i < valueCount; i++) {
-      validateOrThrow(typeBuf.getByte(i) >= 0, "The type id at position %s is negative: %s.",
-          i, typeBuf.getByte(i));
+      validateOrThrow(
+          typeBuf.getByte(i) >= 0,
+          "The type id at position %s is negative: %s.",
+          i,
+          typeBuf.getByte(i));
     }
   }
 
@@ -103,6 +119,11 @@ public Void visit(BaseLargeVariableWidthVector vector, Void value) {
     return null;
   }
 
+  @Override
+  public Void visit(BaseVariableWidthViewVector vector, Void value) {
+    throw new UnsupportedOperationException("View vectors are not supported.");
+  }
+
   @Override
   public Void visit(ListVector vector, Void value) {
     validateOffsetBuffer(vector, vector.getValueCount());
@@ -159,9 +180,11 @@ public Void visit(DenseUnionVector vector, Void value) {
       int offset = vector.getOffset(i);
       byte typeId = vector.getTypeId(i);
       ValueVector subVector = vector.getVectorByType(typeId);
-      validateOrThrow(offset < subVector.getValueCount(),
+      validateOrThrow(
+          offset < subVector.getValueCount(),
           "Dense union vector offset exceeds sub-vector boundary. Vector offset %s, sub vector size %s",
-          offset, subVector.getValueCount());
+          offset,
+          subVector.getValueCount());
     }
 
     for (ValueVector subVector : vector.getChildrenFromFields()) {
@@ -172,7 +195,8 @@ public Void visit(DenseUnionVector vector, Void value) {
 
   @Override
   public Void visit(NullVector vector, Void value) {
-    ValidateUtil.validateOrThrow(vector.getNullCount() == vector.getValueCount(),
+    ValidateUtil.validateOrThrow(
+        vector.getNullCount() == vector.getValueCount(),
         "NullVector should have only null entries.");
     return null;
   }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorTypeVisitor.java b/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorTypeVisitor.java
index 3d1c5a4f27f7c..f947dcf41342f 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorTypeVisitor.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorTypeVisitor.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.validate;
 
 import static org.apache.arrow.vector.validate.ValidateUtil.validateOrThrow;
@@ -22,6 +21,7 @@
 import org.apache.arrow.vector.BaseFixedWidthVector;
 import org.apache.arrow.vector.BaseLargeVariableWidthVector;
 import org.apache.arrow.vector.BaseVariableWidthVector;
+import org.apache.arrow.vector.BaseVariableWidthViewVector;
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.BitVector;
 import org.apache.arrow.vector.DateDayVector;
@@ -76,92 +76,148 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.FieldType;
 
-/**
- * Utility to validate vector type information.
- */
+/** Utility to validate vector type information. */
 public class ValidateVectorTypeVisitor implements VectorVisitor<Void, Void> {
 
-  private void validateVectorCommon(ValueVector vector, Class<? extends ArrowType> expectedArrowType) {
+  private void validateVectorCommon(
+      ValueVector vector, Class<? extends ArrowType> expectedArrowType) {
     validateOrThrow(vector.getField() != null, "Vector field is empty.");
     validateOrThrow(vector.getField().getFieldType() != null, "Vector field type is empty.");
     ArrowType arrowType = vector.getField().getFieldType().getType();
     validateOrThrow(arrowType != null, "Vector arrow type is empty.");
-    validateOrThrow(expectedArrowType == arrowType.getClass(),
+    validateOrThrow(
+        expectedArrowType == arrowType.getClass(),
         "Incorrect arrow type for " + vector.getClass() + " : " + arrowType.toString());
   }
 
   private void validateIntVector(ValueVector vector, int expectedWidth, boolean expectedSigned) {
-    validateOrThrow(vector.getField().getFieldType().getType() instanceof ArrowType.Int,
-        "Vector %s is not an integer vector.", vector.getClass());
+    validateOrThrow(
+        vector.getField().getFieldType().getType() instanceof ArrowType.Int,
+        "Vector %s is not an integer vector.",
+        vector.getClass());
     ArrowType.Int intType = (ArrowType.Int) vector.getField().getFieldType().getType();
-    validateOrThrow(intType.getIsSigned() == expectedSigned,
-        "Expecting bit width %s, actual width %s.", expectedWidth, intType.getBitWidth());
-    validateOrThrow(intType.getBitWidth() == expectedWidth, "Expecting bit width %s, actual bit width %s.",
-        expectedWidth, intType.getBitWidth());
+    validateOrThrow(
+        intType.getIsSigned() == expectedSigned,
+        "Expecting bit width %s, actual width %s.",
+        expectedWidth,
+        intType.getBitWidth());
+    validateOrThrow(
+        intType.getBitWidth() == expectedWidth,
+        "Expecting bit width %s, actual bit width %s.",
+        expectedWidth,
+        intType.getBitWidth());
   }
 
-  private void validateFloatingPointVector(ValueVector vector, FloatingPointPrecision expectedPrecision) {
-    validateOrThrow(vector.getField().getFieldType().getType() instanceof ArrowType.FloatingPoint,
-        "Vector %s is not a floating point vector.", vector.getClass());
-    ArrowType.FloatingPoint floatType = (ArrowType.FloatingPoint) vector.getField().getFieldType().getType();
-    validateOrThrow(floatType.getPrecision() == expectedPrecision, "Expecting precision %s, actual precision %s.",
-        expectedPrecision, floatType.getPrecision());
+  private void validateFloatingPointVector(
+      ValueVector vector, FloatingPointPrecision expectedPrecision) {
+    validateOrThrow(
+        vector.getField().getFieldType().getType() instanceof ArrowType.FloatingPoint,
+        "Vector %s is not a floating point vector.",
+        vector.getClass());
+    ArrowType.FloatingPoint floatType =
+        (ArrowType.FloatingPoint) vector.getField().getFieldType().getType();
+    validateOrThrow(
+        floatType.getPrecision() == expectedPrecision,
+        "Expecting precision %s, actual precision %s.",
+        expectedPrecision,
+        floatType.getPrecision());
   }
 
   private void validateDateVector(ValueVector vector, DateUnit expectedDateUnit) {
-    validateOrThrow(vector.getField().getFieldType().getType() instanceof ArrowType.Date,
-        "Vector %s is not a date vector", vector.getClass());
+    validateOrThrow(
+        vector.getField().getFieldType().getType() instanceof ArrowType.Date,
+        "Vector %s is not a date vector",
+        vector.getClass());
     ArrowType.Date dateType = (ArrowType.Date) vector.getField().getFieldType().getType();
-    validateOrThrow(dateType.getUnit() == expectedDateUnit,
-        "Expecting date unit %s, actual date unit %s.", expectedDateUnit, dateType.getUnit());
+    validateOrThrow(
+        dateType.getUnit() == expectedDateUnit,
+        "Expecting date unit %s, actual date unit %s.",
+        expectedDateUnit,
+        dateType.getUnit());
   }
 
   private void validateDecimalVector(ValueVector vector) {
-    validateOrThrow(vector.getField().getFieldType().getType() instanceof ArrowType.Decimal,
-            "Vector %s is not a decimal vector", vector.getClass());
+    validateOrThrow(
+        vector.getField().getFieldType().getType() instanceof ArrowType.Decimal,
+        "Vector %s is not a decimal vector",
+        vector.getClass());
     ArrowType.Decimal decimalType = (ArrowType.Decimal) vector.getField().getFieldType().getType();
-    validateOrThrow(decimalType.getScale() >= 0, "The scale of decimal %s is negative.", decimalType.getScale());
-    validateOrThrow(decimalType.getScale() <= decimalType.getPrecision(),
-            "The scale of decimal %s is greater than the precision %s.",
-            decimalType.getScale(), decimalType.getPrecision());
+    validateOrThrow(
+        decimalType.getScale() >= 0,
+        "The scale of decimal %s is negative.",
+        decimalType.getScale());
+    validateOrThrow(
+        decimalType.getScale() <= decimalType.getPrecision(),
+        "The scale of decimal %s is greater than the precision %s.",
+        decimalType.getScale(),
+        decimalType.getPrecision());
     switch (decimalType.getBitWidth()) {
       case DecimalVector.TYPE_WIDTH * 8:
-        validateOrThrow(decimalType.getPrecision() >= 1 && decimalType.getPrecision() <= DecimalVector.MAX_PRECISION,
-                "Invalid precision %s for decimal 128.", decimalType.getPrecision());
+        validateOrThrow(
+            decimalType.getPrecision() >= 1
+                && decimalType.getPrecision() <= DecimalVector.MAX_PRECISION,
+            "Invalid precision %s for decimal 128.",
+            decimalType.getPrecision());
         break;
       case Decimal256Vector.TYPE_WIDTH * 8:
-        validateOrThrow(decimalType.getPrecision() >= 1 && decimalType.getPrecision() <= Decimal256Vector.MAX_PRECISION,
-                "Invalid precision %s for decimal 256.", decimalType.getPrecision());
+        validateOrThrow(
+            decimalType.getPrecision() >= 1
+                && decimalType.getPrecision() <= Decimal256Vector.MAX_PRECISION,
+            "Invalid precision %s for decimal 256.",
+            decimalType.getPrecision());
         break;
       default:
-        throw new ValidateUtil.ValidateException("Only decimal 128 or decimal 256 are supported for decimal types");
+        throw new ValidateUtil.ValidateException(
+            "Only decimal 128 or decimal 256 are supported for decimal types");
     }
   }
 
-  private void validateTimeVector(ValueVector vector, TimeUnit expectedTimeUnit, int expectedBitWidth) {
-    validateOrThrow(vector.getField().getFieldType().getType() instanceof ArrowType.Time,
-        "Vector %s is not a time vector.", vector.getClass());
+  private void validateTimeVector(
+      ValueVector vector, TimeUnit expectedTimeUnit, int expectedBitWidth) {
+    validateOrThrow(
+        vector.getField().getFieldType().getType() instanceof ArrowType.Time,
+        "Vector %s is not a time vector.",
+        vector.getClass());
     ArrowType.Time timeType = (ArrowType.Time) vector.getField().getFieldType().getType();
-    validateOrThrow(timeType.getUnit() == expectedTimeUnit,
-        "Expecting time unit %s, actual time unit %s.", expectedTimeUnit, timeType.getUnit());
-    validateOrThrow(timeType.getBitWidth() == expectedBitWidth,
-        "Expecting bit width %s, actual bit width %s.", expectedBitWidth, timeType.getBitWidth());
+    validateOrThrow(
+        timeType.getUnit() == expectedTimeUnit,
+        "Expecting time unit %s, actual time unit %s.",
+        expectedTimeUnit,
+        timeType.getUnit());
+    validateOrThrow(
+        timeType.getBitWidth() == expectedBitWidth,
+        "Expecting bit width %s, actual bit width %s.",
+        expectedBitWidth,
+        timeType.getBitWidth());
   }
 
   private void validateIntervalVector(ValueVector vector, IntervalUnit expectedIntervalUnit) {
-    validateOrThrow(vector.getField().getFieldType().getType() instanceof ArrowType.Interval,
-        "Vector %s is not an interval vector.", vector.getClass());
-    ArrowType.Interval intervalType = (ArrowType.Interval) vector.getField().getFieldType().getType();
-    validateOrThrow(intervalType.getUnit() == expectedIntervalUnit,
-        "Expecting interval unit %s, actual date unit %s.", expectedIntervalUnit, intervalType.getUnit());
+    validateOrThrow(
+        vector.getField().getFieldType().getType() instanceof ArrowType.Interval,
+        "Vector %s is not an interval vector.",
+        vector.getClass());
+    ArrowType.Interval intervalType =
+        (ArrowType.Interval) vector.getField().getFieldType().getType();
+    validateOrThrow(
+        intervalType.getUnit() == expectedIntervalUnit,
+        "Expecting interval unit %s, actual date unit %s.",
+        expectedIntervalUnit,
+        intervalType.getUnit());
   }
 
-  private void validateTimeStampVector(ValueVector vector, TimeUnit expectedTimeUnit, boolean expectTZ) {
-    validateOrThrow(vector.getField().getFieldType().getType() instanceof ArrowType.Timestamp,
-        "Vector %s is not a time stamp vector.", vector.getClass());
-    ArrowType.Timestamp timestampType = (ArrowType.Timestamp) vector.getField().getFieldType().getType();
-    validateOrThrow(timestampType.getUnit() == expectedTimeUnit,
-        "Expecting time stamp unit %s, actual time stamp unit %s.", expectedTimeUnit, timestampType.getUnit());
+  private void validateTimeStampVector(
+      ValueVector vector, TimeUnit expectedTimeUnit, boolean expectTZ) {
+    validateOrThrow(
+        vector.getField().getFieldType().getType() instanceof ArrowType.Timestamp,
+        "Vector %s is not a time stamp vector.",
+        vector.getClass());
+    ArrowType.Timestamp timestampType =
+        (ArrowType.Timestamp) vector.getField().getFieldType().getType();
+    validateOrThrow(
+        timestampType.getUnit() == expectedTimeUnit,
+        "Expecting time stamp unit %s, actual time stamp unit %s.",
+        expectedTimeUnit,
+        timestampType.getUnit());
     if (expectTZ) {
       validateOrThrow(timestampType.getTimezone() != null, "The time zone should not be null");
     } else {
@@ -170,12 +226,18 @@ private void validateTimeStampVector(ValueVector vector, TimeUnit expectedTimeUn
   }
 
   private void validateExtensionTypeVector(ExtensionTypeVector<?> vector) {
-    validateOrThrow(vector.getField().getFieldType().getType() instanceof ArrowType.ExtensionType,
-        "Vector %s is not an extension type vector.", vector.getClass());
-    validateOrThrow(vector.getField().getMetadata().containsKey(ArrowType.ExtensionType.EXTENSION_METADATA_KEY_NAME),
-            "Field %s does not have proper extension type metadata: %s",
-            vector.getField().getName(),
-            vector.getField().getMetadata());
+    validateOrThrow(
+        vector.getField().getFieldType().getType() instanceof ArrowType.ExtensionType,
+        "Vector %s is not an extension type vector.",
+        vector.getClass());
+    validateOrThrow(
+        vector
+            .getField()
+            .getMetadata()
+            .containsKey(ArrowType.ExtensionType.EXTENSION_METADATA_KEY_NAME),
+        "Field %s does not have proper extension type metadata: %s",
+        vector.getField().getName(),
+        vector.getField().getMetadata());
     // Validate the storage vector type
     vector.getUnderlyingVector().accept(this, null);
   }
@@ -220,9 +282,11 @@ public Void visit(BaseFixedWidthVector vector, Void value) {
     } else if (vector instanceof DurationVector) {
       validateVectorCommon(vector, ArrowType.Duration.class);
       ArrowType.Duration arrowType = (ArrowType.Duration) vector.getField().getType();
-      validateOrThrow(((DurationVector) vector).getUnit() == arrowType.getUnit(),
+      validateOrThrow(
+          ((DurationVector) vector).getUnit() == arrowType.getUnit(),
           "Different duration time unit for vector and arrow type. Vector time unit %s, type time unit %s.",
-          ((DurationVector) vector).getUnit(), arrowType.getUnit());
+          ((DurationVector) vector).getUnit(),
+          arrowType.getUnit());
     } else if (vector instanceof Float4Vector) {
       validateVectorCommon(vector, ArrowType.FloatingPoint.class);
       validateFloatingPointVector(vector, FloatingPointPrecision.SINGLE);
@@ -277,13 +341,18 @@ public Void visit(BaseFixedWidthVector vector, Void value) {
     } else if (vector instanceof FixedSizeBinaryVector) {
       validateVectorCommon(vector, ArrowType.FixedSizeBinary.class);
       ArrowType.FixedSizeBinary arrowType = (ArrowType.FixedSizeBinary) vector.getField().getType();
-      validateOrThrow(arrowType.getByteWidth() > 0, "The byte width of a FixedSizeBinaryVector %s is not positive.",
+      validateOrThrow(
+          arrowType.getByteWidth() > 0,
+          "The byte width of a FixedSizeBinaryVector %s is not positive.",
           arrowType.getByteWidth());
-      validateOrThrow(arrowType.getByteWidth() == vector.getTypeWidth(),
+      validateOrThrow(
+          arrowType.getByteWidth() == vector.getTypeWidth(),
           "Type width mismatch for FixedSizeBinaryVector. Vector type width %s, arrow type width %s.",
-          vector.getTypeWidth(), arrowType.getByteWidth());
+          vector.getTypeWidth(),
+          arrowType.getByteWidth());
     } else {
-      throw new IllegalArgumentException("Unknown type for fixed width vector " + vector.getClass());
+      throw new IllegalArgumentException(
+          "Unknown type for fixed width vector " + vector.getClass());
     }
     return null;
   }
@@ -308,6 +377,11 @@ public Void visit(BaseLargeVariableWidthVector vector, Void value) {
     return null;
   }
 
+  @Override
+  public Void visit(BaseVariableWidthViewVector vector, Void value) {
+    throw new UnsupportedOperationException("View vectors are not supported.");
+  }
+
   @Override
   public Void visit(ListVector vector, Void value) {
     validateVectorCommon(vector, ArrowType.List.class);
@@ -322,10 +396,13 @@ public Void visit(ListVector vector, Void value) {
   public Void visit(FixedSizeListVector vector, Void value) {
     validateVectorCommon(vector, ArrowType.FixedSizeList.class);
     ArrowType.FixedSizeList arrowType = (ArrowType.FixedSizeList) vector.getField().getType();
-    validateOrThrow(arrowType.getListSize() == vector.getListSize(),
+    validateOrThrow(
+        arrowType.getListSize() == vector.getListSize(),
         "Inconsistent list size for FixedSizeListVector. Vector list size %s, arrow type list size %s.",
-        vector.getListSize(), arrowType.getListSize());
-    validateOrThrow(arrowType.getListSize() > 0, "The list size %s is not positive.", arrowType.getListSize());
+        vector.getListSize(),
+        arrowType.getListSize());
+    validateOrThrow(
+        arrowType.getListSize() > 0, "The list size %s is not positive.", arrowType.getListSize());
     ValueVector innerVector = vector.getDataVector();
     if (innerVector != null) {
       innerVector.accept(this, null);
@@ -346,16 +423,21 @@ public Void visit(LargeListVector vector, Void value) {
   @Override
   public Void visit(NonNullableStructVector vector, Void value) {
     validateVectorCommon(vector, ArrowType.Struct.class);
-    validateOrThrow(vector.getField().getChildren().size() == vector.getChildrenFromFields().size(),
+    validateOrThrow(
+        vector.getField().getChildren().size() == vector.getChildrenFromFields().size(),
         "Child field count and child vector count mismatch. Vector child count %s, field child count %s",
-        vector.getChildrenFromFields().size(), vector.getField().getChildren().size());
+        vector.getChildrenFromFields().size(),
+        vector.getField().getChildren().size());
     for (int i = 0; i < vector.getChildrenFromFields().size(); i++) {
       ValueVector subVector = vector.getChildByOrdinal(i);
       FieldType subType = vector.getField().getChildren().get(i).getFieldType();
 
-      validateOrThrow(subType.equals(subVector.getField().getFieldType()),
-          "Struct vector's field type not equal to the child vector's field type. " +
-              "Struct field type %s, sub-vector field type %s", subType, subVector.getField().getFieldType());
+      validateOrThrow(
+          subType.equals(subVector.getField().getFieldType()),
+          "Struct vector's field type not equal to the child vector's field type. "
+              + "Struct field type %s, sub-vector field type %s",
+          subType,
+          subVector.getField().getFieldType());
       subVector.accept(this, null);
     }
     return null;
@@ -365,7 +447,8 @@ public Void visit(NonNullableStructVector vector, Void value) {
   public Void visit(UnionVector vector, Void value) {
     validateVectorCommon(vector, ArrowType.Union.class);
     ArrowType.Union arrowType = (ArrowType.Union) vector.getField().getType();
-    validateOrThrow(arrowType.getMode() == UnionMode.Sparse, "The union mode of UnionVector must be sparse");
+    validateOrThrow(
+        arrowType.getMode() == UnionMode.Sparse, "The union mode of UnionVector must be sparse");
     for (ValueVector subVector : vector.getChildrenFromFields()) {
       subVector.accept(this, null);
     }
@@ -376,7 +459,8 @@ public Void visit(UnionVector vector, Void value) {
   public Void visit(DenseUnionVector vector, Void value) {
     validateVectorCommon(vector, ArrowType.Union.class);
     ArrowType.Union arrowType = (ArrowType.Union) vector.getField().getType();
-    validateOrThrow(arrowType.getMode() == UnionMode.Dense, "The union mode of DenseUnionVector must be dense");
+    validateOrThrow(
+        arrowType.getMode() == UnionMode.Dense, "The union mode of DenseUnionVector must be dense");
     for (ValueVector subVector : vector.getChildrenFromFields()) {
       subVector.accept(this, null);
     }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorVisitor.java b/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorVisitor.java
index 7e99b1f90fb61..5004ba488cacd 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorVisitor.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/validate/ValidateVectorVisitor.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.validate;
 
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.vector.BaseFixedWidthVector;
 import org.apache.arrow.vector.BaseLargeVariableWidthVector;
 import org.apache.arrow.vector.BaseVariableWidthVector;
+import org.apache.arrow.vector.BaseVariableWidthViewVector;
 import org.apache.arrow.vector.ExtensionTypeVector;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.NullVector;
@@ -38,9 +37,9 @@
 import org.apache.arrow.vector.util.ValueVectorUtility;
 
 /**
- * Visitor to validate vector (without validating data).
- * This visitor could be used for {@link ValueVector#accept(VectorVisitor, Object)} API,
- * and also users could simply use {@link ValueVectorUtility#validate(ValueVector)}.
+ * Visitor to validate vector (without validating data). This visitor could be used for {@link
+ * ValueVector#accept(VectorVisitor, Object)} API, and also users could simply use {@link
+ * ValueVectorUtility#validate(ValueVector)}.
  */
 public class ValidateVectorVisitor implements VectorVisitor<Void, Void> {
 
@@ -66,14 +65,21 @@ public Void visit(BaseVariableWidthVector vector, Void value) {
       int minBufferSize = (vector.getValueCount() + 1) * BaseVariableWidthVector.OFFSET_WIDTH;
 
       if (offsetBuf.capacity() < minBufferSize) {
-        throw new IllegalArgumentException(String.format("offsetBuffer too small in vector of type %s" +
-                " and valueCount %s : expected at least %s byte(s), got %s",
-            vector.getField().getType().toString(),
-            vector.getValueCount(), minBufferSize, offsetBuf.capacity()));
+        throw new IllegalArgumentException(
+            String.format(
+                "offsetBuffer too small in vector of type %s"
+                    + " and valueCount %s : expected at least %s byte(s), got %s",
+                vector.getField().getType().toString(),
+                vector.getValueCount(),
+                minBufferSize,
+                offsetBuf.capacity()));
       }
 
       int firstOffset = vector.getOffsetBuffer().getInt(0);
-      int lastOffset = vector.getOffsetBuffer().getInt(vector.getValueCount() * BaseVariableWidthVector.OFFSET_WIDTH);
+      int lastOffset =
+          vector
+              .getOffsetBuffer()
+              .getInt(vector.getValueCount() * BaseVariableWidthVector.OFFSET_WIDTH);
 
       if (firstOffset < 0 || lastOffset < 0) {
         throw new IllegalArgumentException("Negative offsets in vector");
@@ -86,8 +92,10 @@ public Void visit(BaseVariableWidthVector vector, Void value) {
       }
 
       if (dataExtent > vector.getDataBuffer().capacity()) {
-        throw new IllegalArgumentException(String.format("Length spanned by offsets %s larger than" +
-            " dataBuffer capacity %s", dataExtent, vector.getValueCount()));
+        throw new IllegalArgumentException(
+            String.format(
+                "Length spanned by offsets %s larger than" + " dataBuffer capacity %s",
+                dataExtent, vector.getValueCount()));
       }
     }
     return null;
@@ -98,6 +106,11 @@ public Void visit(BaseLargeVariableWidthVector left, Void value) {
     return null;
   }
 
+  @Override
+  public Void visit(BaseVariableWidthViewVector left, Void value) {
+    throw new UnsupportedOperationException("View vectors are not supported.");
+  }
+
   @Override
   public Void visit(ListVector vector, Void value) {
 
@@ -109,14 +122,21 @@ public Void visit(ListVector vector, Void value) {
       int minBufferSize = (vector.getValueCount() + 1) * BaseVariableWidthVector.OFFSET_WIDTH;
 
       if (offsetBuf.capacity() < minBufferSize) {
-        throw new IllegalArgumentException(String.format("offsetBuffer too small in vector of type %s" +
-                " and valueCount %s : expected at least %s byte(s), got %s",
-            vector.getField().getType().toString(),
-            vector.getValueCount(), minBufferSize, offsetBuf.capacity()));
+        throw new IllegalArgumentException(
+            String.format(
+                "offsetBuffer too small in vector of type %s"
+                    + " and valueCount %s : expected at least %s byte(s), got %s",
+                vector.getField().getType().toString(),
+                vector.getValueCount(),
+                minBufferSize,
+                offsetBuf.capacity()));
       }
 
       int firstOffset = vector.getOffsetBuffer().getInt(0);
-      int lastOffset = vector.getOffsetBuffer().getInt(vector.getValueCount() * BaseVariableWidthVector.OFFSET_WIDTH);
+      int lastOffset =
+          vector
+              .getOffsetBuffer()
+              .getInt(vector.getValueCount() * BaseVariableWidthVector.OFFSET_WIDTH);
 
       if (firstOffset < 0 || lastOffset < 0) {
         throw new IllegalArgumentException("Negative offsets in list vector");
@@ -124,13 +144,17 @@ public Void visit(ListVector vector, Void value) {
 
       int dataExtent = lastOffset - firstOffset;
 
-      if (dataExtent > 0 && (dataVector.getDataBuffer() == null || dataVector.getDataBuffer().capacity() == 0)) {
+      if (dataExtent > 0
+          && (dataVector.getDataBuffer() == null || dataVector.getDataBuffer().capacity() == 0)) {
         throw new IllegalArgumentException("valueBuffer is null or capacity is 0");
       }
 
       if (dataExtent > dataVector.getValueCount()) {
-        throw new IllegalArgumentException(String.format("Length spanned by list offsets (%s) larger than" +
-            " data vector valueCount (length %s)", dataExtent, dataVector.getValueCount()));
+        throw new IllegalArgumentException(
+            String.format(
+                "Length spanned by list offsets (%s) larger than"
+                    + " data vector valueCount (length %s)",
+                dataExtent, dataVector.getValueCount()));
       }
     }
 
@@ -148,14 +172,19 @@ public Void visit(LargeListVector vector, Void value) {
       long minBufferSize = (vector.getValueCount() + 1) * LargeListVector.OFFSET_WIDTH;
 
       if (offsetBuf.capacity() < minBufferSize) {
-        throw new IllegalArgumentException(String.format("offsetBuffer too small in vector of type %s" +
-                " and valueCount %s : expected at least %s byte(s), got %s",
-            vector.getField().getType().toString(),
-            vector.getValueCount(), minBufferSize, offsetBuf.capacity()));
+        throw new IllegalArgumentException(
+            String.format(
+                "offsetBuffer too small in vector of type %s"
+                    + " and valueCount %s : expected at least %s byte(s), got %s",
+                vector.getField().getType().toString(),
+                vector.getValueCount(),
+                minBufferSize,
+                offsetBuf.capacity()));
       }
 
       long firstOffset = vector.getOffsetBuffer().getLong(0);
-      long lastOffset = vector.getOffsetBuffer().getLong(vector.getValueCount() * LargeListVector.OFFSET_WIDTH);
+      long lastOffset =
+          vector.getOffsetBuffer().getLong(vector.getValueCount() * LargeListVector.OFFSET_WIDTH);
 
       if (firstOffset < 0 || lastOffset < 0) {
         throw new IllegalArgumentException("Negative offsets in list vector");
@@ -163,13 +192,17 @@ public Void visit(LargeListVector vector, Void value) {
 
       long dataExtent = lastOffset - firstOffset;
 
-      if (dataExtent > 0 && (dataVector.getDataBuffer() == null || dataVector.getDataBuffer().capacity() == 0)) {
+      if (dataExtent > 0
+          && (dataVector.getDataBuffer() == null || dataVector.getDataBuffer().capacity() == 0)) {
         throw new IllegalArgumentException("valueBuffer is null or capacity is 0");
       }
 
       if (dataExtent > dataVector.getValueCount()) {
-        throw new IllegalArgumentException(String.format("Length spanned by list offsets (%s) larger than" +
-            " data vector valueCount (length %s)", dataExtent, dataVector.getValueCount()));
+        throw new IllegalArgumentException(
+            String.format(
+                "Length spanned by list offsets (%s) larger than"
+                    + " data vector valueCount (length %s)",
+                dataExtent, dataVector.getValueCount()));
       }
     }
 
@@ -183,13 +216,16 @@ public Void visit(FixedSizeListVector vector, Void value) {
     int valueCount = vector.getValueCount();
     int listSize = vector.getListSize();
 
-    if (valueCount > 0 && (dataVector.getDataBuffer() == null || dataVector.getDataBuffer().capacity() == 0)) {
+    if (valueCount > 0
+        && (dataVector.getDataBuffer() == null || dataVector.getDataBuffer().capacity() == 0)) {
       throw new IllegalArgumentException("valueBuffer is null or capacity is 0");
     }
 
     if (valueCount * listSize != dataVector.getValueCount()) {
-      throw new IllegalArgumentException(String.format("data vector valueCount invalid, expect %s, " +
-          "actual is: %s", valueCount * listSize, dataVector.getValueCount()));
+      throw new IllegalArgumentException(
+          String.format(
+              "data vector valueCount invalid, expect %s, " + "actual is: %s",
+              valueCount * listSize, dataVector.getValueCount()));
     }
 
     return null;
@@ -205,13 +241,18 @@ public Void visit(NonNullableStructVector vector, Void value) {
       FieldVector child = vector.getChildrenFromFields().get(i);
 
       if (child.getValueCount() != valueCount) {
-        throw new IllegalArgumentException(String.format("struct child vector #%s valueCount is not equals with " +
-            "struct vector, expect %s, actual %s", i, vector.getValueCount(), child.getValueCount()));
+        throw new IllegalArgumentException(
+            String.format(
+                "struct child vector #%s valueCount is not equals with "
+                    + "struct vector, expect %s, actual %s",
+                i, vector.getValueCount(), child.getValueCount()));
       }
 
       if (!childFields.get(i).getType().equals(child.getField().getType())) {
-        throw new IllegalArgumentException(String.format("struct child vector #%s does not match type: %s vs %s",
-            i, childFields.get(i).getType().toString(), child.getField().getType().toString()));
+        throw new IllegalArgumentException(
+            String.format(
+                "struct child vector #%s does not match type: %s vs %s",
+                i, childFields.get(i).getType().toString(), child.getField().getType().toString()));
       }
 
       child.accept(this, null);
@@ -229,13 +270,18 @@ public Void visit(UnionVector vector, Void value) {
       FieldVector child = vector.getChildrenFromFields().get(i);
 
       if (child.getValueCount() != valueCount) {
-        throw new IllegalArgumentException(String.format("union child vector #%s valueCount is not equals with union" +
-            " vector, expect %s, actual %s", i, vector.getValueCount(), child.getValueCount()));
+        throw new IllegalArgumentException(
+            String.format(
+                "union child vector #%s valueCount is not equals with union"
+                    + " vector, expect %s, actual %s",
+                i, vector.getValueCount(), child.getValueCount()));
       }
 
       if (!childFields.get(i).getType().equals(child.getField().getType())) {
-        throw new IllegalArgumentException(String.format("union child vector #%s does not match type: %s vs %s",
-            i, childFields.get(i).getType().toString(), child.getField().getType().toString()));
+        throw new IllegalArgumentException(
+            String.format(
+                "union child vector #%s does not match type: %s vs %s",
+                i, childFields.get(i).getType().toString(), child.getField().getType().toString()));
       }
 
       child.accept(this, null);
@@ -251,8 +297,10 @@ public Void visit(DenseUnionVector vector, Void value) {
       FieldVector child = vector.getChildrenFromFields().get(i);
 
       if (!childFields.get(i).getType().equals(child.getField().getType())) {
-        throw new IllegalArgumentException(String.format("union child vector #%s does not match type: %s vs %s",
-            i, childFields.get(i).getType().toString(), child.getField().getType().toString()));
+        throw new IllegalArgumentException(
+            String.format(
+                "union child vector #%s does not match type: %s vs %s",
+                i, childFields.get(i).getType().toString(), child.getField().getType().toString()));
       }
 
       child.accept(this, null);
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/DirtyRootAllocator.java b/java/vector/src/test/java/org/apache/arrow/vector/DirtyRootAllocator.java
index 27b8ac75263e2..e650d01bcc53f 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/DirtyRootAllocator.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/DirtyRootAllocator.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import org.apache.arrow.memory.ArrowBuf;
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ITTestLargeVector.java b/java/vector/src/test/java/org/apache/arrow/vector/ITTestLargeVector.java
index 8596399e7e08c..00e7368d40440 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/ITTestLargeVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/ITTestLargeVector.java
@@ -14,28 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.holders.NullableDecimalHolder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Integration test for a vector with a large (more than 2GB) {@link org.apache.arrow.memory.ArrowBuf} as
- * the data buffer.
- * To run this test, please make sure there is at least 4GB free memory in the system.
+ * Integration test for a vector with a large (more than 2GB) {@link
+ * org.apache.arrow.memory.ArrowBuf} as the data buffer. To run this test, please make sure there is
+ * at least 4GB free memory in the system.
  */
 public class ITTestLargeVector {
   private static final Logger logger = LoggerFactory.getLogger(ITTestLargeVector.class);
@@ -83,7 +81,7 @@ public void testLargeIntVector() {
     final int vecLength = (int) (bufSize / IntVector.TYPE_WIDTH);
 
     try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         IntVector largeVec = new IntVector("vec", allocator)) {
+        IntVector largeVec = new IntVector("vec", allocator)) {
       largeVec.allocateNew(vecLength);
 
       logger.trace("Successfully allocated a vector with capacity {}", vecLength);
@@ -118,7 +116,7 @@ public void testLargeDecimalVector() {
     final int vecLength = (int) (bufSize / DecimalVector.TYPE_WIDTH);
 
     try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         DecimalVector largeVec = new DecimalVector("vec", allocator, 38, 0)) {
+        DecimalVector largeVec = new DecimalVector("vec", allocator, 38, 0)) {
       largeVec.allocateNew(vecLength);
 
       logger.trace("Successfully allocated a vector with capacity {}", vecLength);
@@ -172,7 +170,7 @@ public void testLargeFixedSizeBinaryVector() {
     final int vecLength = (int) (bufSize / typeWidth);
 
     try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         FixedSizeBinaryVector largeVec = new FixedSizeBinaryVector("vec", allocator, typeWidth)) {
+        FixedSizeBinaryVector largeVec = new FixedSizeBinaryVector("vec", allocator, typeWidth)) {
       largeVec.allocateNew(vecLength);
 
       logger.trace("Successfully allocated a vector with capacity {}", vecLength);
@@ -210,7 +208,7 @@ public void testLargeVarCharVector() {
     final String strElement = "a";
 
     try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         VarCharVector largeVec = new VarCharVector("vec", allocator)) {
+        VarCharVector largeVec = new VarCharVector("vec", allocator)) {
       largeVec.allocateNew(vecLength);
 
       logger.trace("Successfully allocated a vector with capacity " + vecLength);
@@ -249,7 +247,7 @@ public void testLargeLargeVarCharVector() {
     final String strElement = "9876543210";
 
     try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         LargeVarCharVector largeVec = new LargeVarCharVector("vec", allocator)) {
+        LargeVarCharVector largeVec = new LargeVarCharVector("vec", allocator)) {
       largeVec.allocateNew(vecLength);
 
       logger.trace("Successfully allocated a vector with capacity " + vecLength);
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestBitVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestBitVector.java
index 075a05c04b641..b5a993db5f21d 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestBitVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestBitVector.java
@@ -14,37 +14,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.stream.IntStream;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.memory.util.hash.MurmurHasher;
 import org.apache.arrow.vector.testing.ValueVectorDataPopulator;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestBitVector {
   private static final String EMPTY_SCHEMA_PATH = "";
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -53,7 +50,7 @@ public void terminate() throws Exception {
   public void testBitVectorCopyFromSafe() {
     final int size = 20;
     try (final BitVector src = new BitVector(EMPTY_SCHEMA_PATH, allocator);
-         final BitVector dst = new BitVector(EMPTY_SCHEMA_PATH, allocator)) {
+        final BitVector dst = new BitVector(EMPTY_SCHEMA_PATH, allocator)) {
       src.allocateNew(size);
       dst.allocateNew(10);
 
@@ -124,8 +121,13 @@ public void testSplitAndTransfer() throws Exception {
           for (int i = 0; i < length; i++) {
             int actual = toVector.get(i);
             int expected = sourceVector.get(start + i);
-            assertEquals("different data values not expected --> sourceVector index: " + (start + i) +
-                " toVector index: " + i, expected, actual);
+            assertEquals(
+                expected,
+                actual,
+                "different data values not expected --> sourceVector index: "
+                    + (start + i)
+                    + " toVector index: "
+                    + i);
           }
         }
       }
@@ -167,8 +169,13 @@ public void testSplitAndTransfer1() throws Exception {
           for (int i = 0; i < length; i++) {
             int actual = toVector.get(i);
             int expected = sourceVector.get(start + i);
-            assertEquals("different data values not expected --> sourceVector index: " + (start + i) +
-                " toVector index: " + i, expected, actual);
+            assertEquals(
+                expected,
+                actual,
+                "different data values not expected --> sourceVector index: "
+                    + (start + i)
+                    + " toVector index: "
+                    + i);
           }
         }
       }
@@ -206,7 +213,9 @@ public void testSplitAndTransfer2() throws Exception {
       try (final BitVector toVector = new BitVector("toVector", allocator)) {
         final TransferPair transferPair = sourceVector.makeTransferPair(toVector);
 
-        final int[][] transferLengths = {{5, 22}, {5, 24}, {5, 25}, {5, 27}, {0, 31}, {5, 7}, {2, 3}};
+        final int[][] transferLengths = {
+          {5, 22}, {5, 24}, {5, 25}, {5, 27}, {0, 31}, {5, 7}, {2, 3}
+        };
 
         for (final int[] transferLength : transferLengths) {
           final int start = transferLength[0];
@@ -218,8 +227,13 @@ public void testSplitAndTransfer2() throws Exception {
           for (int i = 0; i < length; i++) {
             int actual = toVector.get(i);
             int expected = sourceVector.get(start + i);
-            assertEquals("different data values not expected --> sourceVector index: " + (start + i) +
-                " toVector index: " + i, expected, actual);
+            assertEquals(
+                expected,
+                actual,
+                "different data values not expected --> sourceVector index: "
+                    + (start + i)
+                    + " toVector index: "
+                    + i);
           }
         }
       }
@@ -241,9 +255,9 @@ public void testReallocAfterVectorTransfer1() {
 
       for (int i = 0; i < valueCapacity; i++) {
         if ((i & 1) == 1) {
-          assertEquals("unexpected cleared bit at index: " + i, 1, vector.get(i));
+          assertEquals(1, vector.get(i), "unexpected cleared bit at index: " + i);
         } else {
-          assertTrue("unexpected set bit at index: " + i, vector.isNull(i));
+          assertTrue(vector.isNull(i), "unexpected set bit at index: " + i);
         }
       }
 
@@ -259,9 +273,9 @@ public void testReallocAfterVectorTransfer1() {
 
       for (int i = 0; i < valueCapacity * 2; i++) {
         if (((i & 1) == 1) || (i == valueCapacity)) {
-          assertEquals("unexpected cleared bit at index: " + i, 1, vector.get(i));
+          assertEquals(1, vector.get(i), "unexpected cleared bit at index: " + i);
         } else {
-          assertTrue("unexpected set bit at index: " + i, vector.isNull(i));
+          assertTrue(vector.isNull(i), "unexpected set bit at index: " + i);
         }
       }
 
@@ -277,9 +291,9 @@ public void testReallocAfterVectorTransfer1() {
 
       for (int i = 0; i < valueCapacity * 4; i++) {
         if (((i & 1) == 1) || (i == valueCapacity) || (i == valueCapacity * 2)) {
-          assertEquals("unexpected cleared bit at index: " + i, 1, vector.get(i));
+          assertEquals(1, vector.get(i), "unexpected cleared bit at index: " + i);
         } else {
-          assertTrue("unexpected set bit at index: " + i, vector.isNull(i));
+          assertTrue(vector.isNull(i), "unexpected set bit at index: " + i);
         }
       }
 
@@ -295,14 +309,16 @@ public void testReallocAfterVectorTransfer1() {
 
       for (int i = 0; i < toVector.getValueCapacity(); i++) {
         if (i <= valueCapacity * 4) {
-          if (((i & 1) == 1) || (i == valueCapacity) ||
-                  (i == valueCapacity * 2) || (i == valueCapacity * 4)) {
-            assertEquals("unexpected cleared bit at index: " + i, 1, toVector.get(i));
+          if (((i & 1) == 1)
+              || (i == valueCapacity)
+              || (i == valueCapacity * 2)
+              || (i == valueCapacity * 4)) {
+            assertEquals(1, toVector.get(i), "unexpected cleared bit at index: " + i);
           } else {
-            assertTrue("unexpected set bit at index: " + i, toVector.isNull(i));
+            assertTrue(toVector.isNull(i), "unexpected set bit at index: " + i);
           }
         } else {
-          assertTrue("unexpected set bit at index: " + i, toVector.isNull(i));
+          assertTrue(toVector.isNull(i), "unexpected set bit at index: " + i);
         }
       }
 
@@ -325,9 +341,9 @@ public void testReallocAfterVectorTransfer2() {
 
       for (int i = 0; i < valueCapacity; i++) {
         if ((i & 1) == 1) {
-          assertFalse("unexpected cleared bit at index: " + i, vector.isNull(i));
+          assertFalse(vector.isNull(i), "unexpected cleared bit at index: " + i);
         } else {
-          assertTrue("unexpected set bit at index: " + i, vector.isNull(i));
+          assertTrue(vector.isNull(i), "unexpected set bit at index: " + i);
         }
       }
 
@@ -343,9 +359,9 @@ public void testReallocAfterVectorTransfer2() {
 
       for (int i = 0; i < valueCapacity * 2; i++) {
         if (((i & 1) == 1) || (i == valueCapacity)) {
-          assertFalse("unexpected cleared bit at index: " + i, vector.isNull(i));
+          assertFalse(vector.isNull(i), "unexpected cleared bit at index: " + i);
         } else {
-          assertTrue("unexpected set bit at index: " + i, vector.isNull(i));
+          assertTrue(vector.isNull(i), "unexpected set bit at index: " + i);
         }
       }
 
@@ -361,9 +377,9 @@ public void testReallocAfterVectorTransfer2() {
 
       for (int i = 0; i < valueCapacity * 4; i++) {
         if (((i & 1) == 1) || (i == valueCapacity) || (i == valueCapacity * 2)) {
-          assertFalse("unexpected cleared bit at index: " + i, vector.isNull(i));
+          assertFalse(vector.isNull(i), "unexpected cleared bit at index: " + i);
         } else {
-          assertTrue("unexpected set bit at index: " + i, vector.isNull(i));
+          assertTrue(vector.isNull(i), "unexpected set bit at index: " + i);
         }
       }
 
@@ -379,14 +395,16 @@ public void testReallocAfterVectorTransfer2() {
 
       for (int i = 0; i < toVector.getValueCapacity(); i++) {
         if (i <= valueCapacity * 4) {
-          if (((i & 1) == 1) || (i == valueCapacity) ||
-                  (i == valueCapacity * 2) || (i == valueCapacity * 4)) {
-            assertFalse("unexpected cleared bit at index: " + i, toVector.isNull(i));
+          if (((i & 1) == 1)
+              || (i == valueCapacity)
+              || (i == valueCapacity * 2)
+              || (i == valueCapacity * 4)) {
+            assertFalse(toVector.isNull(i), "unexpected cleared bit at index: " + i);
           } else {
-            assertTrue("unexpected set bit at index: " + i, toVector.isNull(i));
+            assertTrue(toVector.isNull(i), "unexpected set bit at index: " + i);
           }
         } else {
-          assertTrue("unexpected set bit at index: " + i, toVector.isNull(i));
+          assertTrue(toVector.isNull(i), "unexpected set bit at index: " + i);
         }
       }
 
@@ -500,13 +518,13 @@ private void validateRange(int length, int start, int count) {
       bitVector.allocateNew(length);
       bitVector.setRangeToOne(start, count);
       for (int i = 0; i < start; i++) {
-        Assert.assertTrue(desc + i, bitVector.isNull(i));
+        assertTrue(bitVector.isNull(i), desc + i);
       }
       for (int i = start; i < start + count; i++) {
-        Assert.assertEquals(desc + i, 1, bitVector.get(i));
+        assertEquals(1, bitVector.get(i), desc + i);
       }
       for (int i = start + count; i < length; i++) {
-        Assert.assertTrue(desc + i, bitVector.isNull(i));
+        assertTrue(bitVector.isNull(i), desc + i);
       }
     }
   }
@@ -547,7 +565,8 @@ public void testGetTransferPairWithField() {
     final BitVector fromVector = new BitVector(EMPTY_SCHEMA_PATH, allocator);
     final TransferPair transferPair = fromVector.getTransferPair(fromVector.getField(), allocator);
     final BitVector toVector = (BitVector) transferPair.getTo();
-    // Field inside a new vector created by reusing a field should be the same in memory as the original field.
+    // Field inside a new vector created by reusing a field should be the same in memory as the
+    // original field.
     assertSame(fromVector.getField(), toVector.getField());
   }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestBitVectorHelper.java b/java/vector/src/test/java/org/apache/arrow/vector/TestBitVectorHelper.java
index 1da4a4c4914b9..f17c065d4e2df 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestBitVectorHelper.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestBitVectorHelper.java
@@ -14,19 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.memory.util.MemoryUtil;
 import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestBitVectorHelper {
   @Test
@@ -114,7 +113,7 @@ public void testAllBitsNull() {
   public void testAllBitsSet() {
     final int bufferLength = 32 * 1024;
     try (RootAllocator allocator = new RootAllocator(bufferLength);
-         ArrowBuf validityBuffer = allocator.buffer(bufferLength)) {
+        ArrowBuf validityBuffer = allocator.buffer(bufferLength)) {
 
       MemoryUtil.UNSAFE.setMemory(validityBuffer.memoryAddress(), bufferLength, (byte) -1);
       int bitLength = 1024;
@@ -155,8 +154,8 @@ public void testAllBitsSet() {
   public void testConcatBits() {
     try (RootAllocator allocator = new RootAllocator(1024 * 1024)) {
       try (ArrowBuf buf1 = allocator.buffer(1024);
-           ArrowBuf buf2 = allocator.buffer(1024);
-           ArrowBuf output = allocator.buffer(1024)) {
+          ArrowBuf buf2 = allocator.buffer(1024);
+          ArrowBuf output = allocator.buffer(1024)) {
 
         buf1.setZero(0, buf1.capacity());
         buf2.setZero(0, buf2.capacity());
@@ -191,7 +190,7 @@ public void testConcatBits() {
   public void testConcatBitsInPlace() {
     try (RootAllocator allocator = new RootAllocator(1024 * 1024)) {
       try (ArrowBuf buf1 = allocator.buffer(1024);
-           ArrowBuf buf2 = allocator.buffer(1024)) {
+          ArrowBuf buf2 = allocator.buffer(1024)) {
 
         buf1.setZero(0, buf1.capacity());
         buf2.setZero(0, buf2.capacity());
@@ -247,14 +246,14 @@ public void testLoadValidityBuffer() {
       // null
       fieldNode = new ArrowFieldNode(1024, 1024);
       try (ArrowBuf src = allocator.buffer(128);
-           ArrowBuf dst = BitVectorHelper.loadValidityBuffer(fieldNode, src, allocator)) {
+          ArrowBuf dst = BitVectorHelper.loadValidityBuffer(fieldNode, src, allocator)) {
         assertEquals(128, allocator.getAllocatedMemory());
       }
 
       // ... similarly if all values are not null
       fieldNode = new ArrowFieldNode(1024, 0);
       try (ArrowBuf src = allocator.buffer(128);
-           ArrowBuf dst = BitVectorHelper.loadValidityBuffer(fieldNode, src, allocator)) {
+          ArrowBuf dst = BitVectorHelper.loadValidityBuffer(fieldNode, src, allocator)) {
         assertEquals(128, allocator.getAllocatedMemory());
       }
 
@@ -277,7 +276,8 @@ public void testLoadValidityBuffer() {
     }
   }
 
-  private void concatAndVerify(ArrowBuf buf1, int count1, ArrowBuf buf2, int count2, ArrowBuf output) {
+  private void concatAndVerify(
+      ArrowBuf buf1, int count1, ArrowBuf buf2, int count2, ArrowBuf output) {
     BitVectorHelper.concatBits(buf1, count1, buf2, count2, output);
     int outputIdx = 0;
     for (int i = 0; i < count1; i++, outputIdx++) {
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestBufferOwnershipTransfer.java b/java/vector/src/test/java/org/apache/arrow/vector/TestBufferOwnershipTransfer.java
index 056b6bdd2b787..3a0bd1c18646a 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestBufferOwnershipTransfer.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestBufferOwnershipTransfer.java
@@ -14,15 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.ReferenceManager;
 import org.apache.arrow.memory.RootAllocator;
@@ -30,7 +28,7 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.util.CallBack;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestBufferOwnershipTransfer {
 
@@ -105,12 +103,18 @@ public void emptyListTransferShouldNotTriggerSchemaChange() {
 
     final Pointer<Boolean> trigger1 = new Pointer<>();
     final Pointer<Boolean> trigger2 = new Pointer<>();
-    final ListVector v1 = new ListVector("v1", allocator,
-        FieldType.nullable(ArrowType.Null.INSTANCE),
-        newTriggerCallback(trigger1));
-    final ListVector v2 = new ListVector("v2", allocator,
-        FieldType.nullable(ArrowType.Null.INSTANCE),
-        newTriggerCallback(trigger2));
+    final ListVector v1 =
+        new ListVector(
+            "v1",
+            allocator,
+            FieldType.nullable(ArrowType.Null.INSTANCE),
+            newTriggerCallback(trigger1));
+    final ListVector v2 =
+        new ListVector(
+            "v2",
+            allocator,
+            FieldType.nullable(ArrowType.Null.INSTANCE),
+            newTriggerCallback(trigger2));
 
     try {
       // since we are working with empty vectors, their internal
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestCopyFrom.java b/java/vector/src/test/java/org/apache/arrow/vector/TestCopyFrom.java
index 97de27bec8237..bd0b44a14452a 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestCopyFrom.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestCopyFrom.java
@@ -14,26 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.TestUtils.newVector;
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.Period;
 import java.util.Objects;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.types.Types.MinorType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /*
  * Tested field types:
@@ -60,12 +59,12 @@ public class TestCopyFrom {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -100,9 +99,9 @@ public void testCopyFromWithNulls() {
           assertNull(vector.getObject(i));
         } else {
           assertEquals(
-              "unexpected value at index: " + i,
               Integer.toString(i),
-              vector.getObject(i).toString());
+              vector.getObject(i).toString(),
+              "unexpected value at index: " + i);
         }
       }
 
@@ -117,9 +116,9 @@ public void testCopyFromWithNulls() {
           assertNull(vector2.getObject(i));
         } else {
           assertEquals(
-              "unexpected value at index: " + i,
               Integer.toString(i),
-              vector2.getObject(i).toString());
+              vector2.getObject(i).toString(),
+              "unexpected value at index: " + i);
         }
       }
 
@@ -134,9 +133,9 @@ public void testCopyFromWithNulls() {
           assertNull(vector2.getObject(i));
         } else {
           assertEquals(
-              "unexpected value at index: " + i,
               Integer.toString(i),
-              vector2.getObject(i).toString());
+              vector2.getObject(i).toString(),
+              "unexpected value at index: " + i);
         }
       }
     }
@@ -172,9 +171,9 @@ public void testCopyFromWithNulls1() {
           assertNull(vector.getObject(i));
         } else {
           assertEquals(
-              "unexpected value at index: " + i,
               Integer.toString(i),
-              vector.getObject(i).toString());
+              vector.getObject(i).toString(),
+              "unexpected value at index: " + i);
         }
       }
 
@@ -193,9 +192,9 @@ public void testCopyFromWithNulls1() {
           assertNull(vector2.getObject(i));
         } else {
           assertEquals(
-              "unexpected value at index: " + i,
               Integer.toString(i),
-              vector2.getObject(i).toString());
+              vector2.getObject(i).toString(),
+              "unexpected value at index: " + i);
         }
       }
 
@@ -210,9 +209,9 @@ public void testCopyFromWithNulls1() {
           assertNull(vector2.getObject(i));
         } else {
           assertEquals(
-              "unexpected value at index: " + i,
               Integer.toString(i),
-              vector2.getObject(i).toString());
+              vector2.getObject(i).toString(),
+              "unexpected value at index: " + i);
         }
       }
     }
@@ -247,7 +246,7 @@ public void testCopyFromWithNulls2() {
         if ((i & 1) == 0) {
           assertNull(vector1.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, 1000 + i, vector1.get(i));
+          assertEquals(1000 + i, vector1.get(i), "unexpected value at index: " + i);
         }
       }
 
@@ -274,7 +273,7 @@ public void testCopyFromWithNulls2() {
         if (((i & 1) == 0) || (i >= initialCapacity)) {
           assertNull(vector2.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, 1000 + i, vector2.get(i));
+          assertEquals(1000 + i, vector2.get(i), "unexpected value at index: " + i);
         }
       }
     }
@@ -309,7 +308,7 @@ public void testCopyFromWithNulls3() {
         if ((i & 1) == 0) {
           assertNull(vector1.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, 10000000000L + (long) i, vector1.get(i));
+          assertEquals(10000000000L + (long) i, vector1.get(i), "unexpected value at index: " + i);
         }
       }
 
@@ -336,7 +335,7 @@ public void testCopyFromWithNulls3() {
         if (((i & 1) == 0) || (i >= initialCapacity)) {
           assertNull(vector2.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, 10000000000L + (long) i, vector2.get(i));
+          assertEquals(10000000000L + (long) i, vector2.get(i), "unexpected value at index: " + i);
         }
       }
     }
@@ -450,7 +449,7 @@ public void testCopyFromWithNulls5() {
         if ((i & 1) == 0) {
           assertNull(vector1.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, 100.25f + (float) i, vector1.get(i), 0);
+          assertEquals(100.25f + (float) i, vector1.get(i), 0, "unexpected value at index: " + i);
         }
       }
 
@@ -477,7 +476,7 @@ public void testCopyFromWithNulls5() {
         if (((i & 1) == 0) || (i >= initialCapacity)) {
           assertNull(vector2.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, 100.25f + i * 1.0f, vector2.get(i), 0);
+          assertEquals(100.25f + i * 1.0f, vector2.get(i), 0, "unexpected value at index: " + i);
         }
       }
     }
@@ -513,7 +512,7 @@ public void testCopyFromWithNulls6() {
           assertNull(vector1.getObject(i));
         } else {
           assertEquals(
-              "unexpected value at index: " + i, 123456.7865 + (double) i, vector1.get(i), 0);
+              123456.7865 + (double) i, vector1.get(i), 0, "unexpected value at index: " + i);
         }
       }
 
@@ -541,7 +540,7 @@ public void testCopyFromWithNulls6() {
           assertNull(vector2.getObject(i));
         } else {
           assertEquals(
-              "unexpected value at index: " + i, 123456.7865 + (double) i, vector2.get(i), 0);
+              123456.7865 + (double) i, vector2.get(i), 0, "unexpected value at index: " + i);
         }
       }
     }
@@ -715,7 +714,7 @@ public void testCopyFromWithNulls9() {
         if ((i & 1) == 0) {
           assertNull(vector1.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, val + (short) i, vector1.get(i));
+          assertEquals(val + (short) i, vector1.get(i), "unexpected value at index: " + i);
         }
       }
 
@@ -742,7 +741,7 @@ public void testCopyFromWithNulls9() {
         if (((i & 1) == 0) || (i >= initialCapacity)) {
           assertNull(vector2.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, val + (short) i, vector2.get(i));
+          assertEquals(val + (short) i, vector2.get(i), "unexpected value at index: " + i);
         }
       }
     }
@@ -778,7 +777,7 @@ public void testCopyFromWithNulls10() {
         if ((i & 1) == 0) {
           assertNull(vector1.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, val + (long) i, vector1.get(i));
+          assertEquals(val + (long) i, vector1.get(i), "unexpected value at index: " + i);
         }
       }
 
@@ -805,7 +804,7 @@ public void testCopyFromWithNulls10() {
         if (((i & 1) == 0) || (i >= initialCapacity)) {
           assertNull(vector2.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, val + (long) i, vector2.get(i));
+          assertEquals(val + (long) i, vector2.get(i), "unexpected value at index: " + i);
         }
       }
     }
@@ -841,7 +840,7 @@ public void testCopyFromWithNulls11() {
         if ((i & 1) == 0) {
           assertNull(vector1.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, val + i, vector1.get(i));
+          assertEquals(val + i, vector1.get(i), "unexpected value at index: " + i);
         }
       }
 
@@ -868,7 +867,7 @@ public void testCopyFromWithNulls11() {
         if (((i & 1) == 0) || (i >= initialCapacity)) {
           assertNull(vector2.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, val + i, vector2.get(i));
+          assertEquals(val + i, vector2.get(i), "unexpected value at index: " + i);
         }
       }
     }
@@ -906,7 +905,7 @@ public void testCopyFromWithNulls12() {
         if ((i & 1) == 0) {
           assertNull(vector1.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, val, vector1.get(i));
+          assertEquals(val, vector1.get(i), "unexpected value at index: " + i);
           val++;
         }
       }
@@ -934,7 +933,7 @@ public void testCopyFromWithNulls12() {
         if (((i & 1) == 0) || (i >= initialCapacity)) {
           assertNull(vector2.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, val, vector2.get(i));
+          assertEquals(val, vector2.get(i), "unexpected value at index: " + i);
           val++;
         }
       }
@@ -1039,7 +1038,7 @@ public void testCopyFromWithNulls14() {
         if ((i & 1) == 0) {
           assertNull(vector1.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, val + (long) i, vector1.get(i));
+          assertEquals(val + (long) i, vector1.get(i), "unexpected value at index: " + i);
         }
       }
 
@@ -1066,22 +1065,21 @@ public void testCopyFromWithNulls14() {
         if (((i & 1) == 0) || (i >= initialCapacity)) {
           assertNull(vector2.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, val + (long) i, vector2.get(i));
+          assertEquals(val + (long) i, vector2.get(i), "unexpected value at index: " + i);
         }
       }
     }
   }
 
-  @Test //https://issues.apache.org/jira/browse/ARROW-7837
+  @Test // https://issues.apache.org/jira/browse/ARROW-7837
   public void testCopySafeArrow7837() {
     // this test exposes a bug in `handleSafe` where
     // it reads a stale index and as a result missed a required resize of the value vector.
     try (VarCharVector vc1 = new VarCharVector("vc1", allocator);
-         VarCharVector vc2 = new VarCharVector("vc2", allocator);
-    ) {
-      //initial size is carefully set in order to force the second 'copyFromSafe' operation
+        VarCharVector vc2 = new VarCharVector("vc2", allocator); ) {
+      // initial size is carefully set in order to force the second 'copyFromSafe' operation
       // to trigger a reallocation of the vector.
-      vc2.setInitialCapacity(/*valueCount*/20, /*density*/0.5);
+      vc2.setInitialCapacity(/*valueCount*/ 20, /*density*/ 0.5);
 
       vc1.setSafe(0, "1234567890".getBytes(StandardCharsets.UTF_8));
       assertFalse(vc1.isNull(0));
@@ -1100,6 +1098,4 @@ public void testCopySafeArrow7837() {
       assertEquals("1234567890", Objects.requireNonNull(vc2.getObject(5)).toString());
     }
   }
-
-
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestDecimal256Vector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestDecimal256Vector.java
index fc5dfc38587a4..c155ab98fa2e9 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestDecimal256Vector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestDecimal256Vector.java
@@ -14,24 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestDecimal256Vector {
 
@@ -49,22 +47,27 @@ public class TestDecimal256Vector {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
 
   @Test
   public void testValuesWriteRead() {
-    try (Decimal256Vector decimalVector = TestUtils.newVector(Decimal256Vector.class, "decimal",
-        new ArrowType.Decimal(10, scale, 256), allocator);) {
-
-      try (Decimal256Vector oldConstructor = new Decimal256Vector("decimal", allocator, 10, scale);) {
+    try (Decimal256Vector decimalVector =
+        TestUtils.newVector(
+            Decimal256Vector.class,
+            "decimal",
+            new ArrowType.Decimal(10, scale, 256),
+            allocator); ) {
+
+      try (Decimal256Vector oldConstructor =
+          new Decimal256Vector("decimal", allocator, 10, scale); ) {
         assertEquals(decimalVector.getField().getType(), oldConstructor.getField().getType());
       }
 
@@ -80,39 +83,46 @@ public void testValuesWriteRead() {
 
       for (int i = 0; i < intValues.length; i++) {
         BigDecimal value = decimalVector.getObject(i);
-        assertEquals("unexpected data at index: " + i, values[i], value);
+        assertEquals(values[i], value, "unexpected data at index: " + i);
       }
     }
   }
 
   @Test
   public void testDecimal256DifferentScaleAndPrecision() {
-    try (Decimal256Vector decimalVector = TestUtils.newVector(Decimal256Vector.class, "decimal",
-        new ArrowType.Decimal(4, 2, 256), allocator)) {
+    try (Decimal256Vector decimalVector =
+        TestUtils.newVector(
+            Decimal256Vector.class, "decimal", new ArrowType.Decimal(4, 2, 256), allocator)) {
       decimalVector.allocateNew();
 
       // test Decimal256 with different scale
       {
         BigDecimal decimal = new BigDecimal(BigInteger.valueOf(0), 3);
         UnsupportedOperationException ue =
-            assertThrows(UnsupportedOperationException.class, () -> decimalVector.setSafe(0, decimal));
-        assertEquals("BigDecimal scale must equal that in the Arrow vector: 3 != 2", ue.getMessage());
+            assertThrows(
+                UnsupportedOperationException.class, () -> decimalVector.setSafe(0, decimal));
+        assertEquals(
+            "BigDecimal scale must equal that in the Arrow vector: 3 != 2", ue.getMessage());
       }
 
       // test BigDecimal with larger precision than initialized
       {
         BigDecimal decimal = new BigDecimal(BigInteger.valueOf(12345), 2);
         UnsupportedOperationException ue =
-            assertThrows(UnsupportedOperationException.class, () -> decimalVector.setSafe(0, decimal));
-        assertEquals("BigDecimal precision cannot be greater than that in the Arrow vector: 5 > 4", ue.getMessage());
+            assertThrows(
+                UnsupportedOperationException.class, () -> decimalVector.setSafe(0, decimal));
+        assertEquals(
+            "BigDecimal precision cannot be greater than that in the Arrow vector: 5 > 4",
+            ue.getMessage());
       }
     }
   }
 
   @Test
   public void testWriteBigEndian() {
-    try (Decimal256Vector decimalVector = TestUtils.newVector(Decimal256Vector.class, "decimal",
-        new ArrowType.Decimal(38, 18, 256), allocator);) {
+    try (Decimal256Vector decimalVector =
+        TestUtils.newVector(
+            Decimal256Vector.class, "decimal", new ArrowType.Decimal(38, 18, 256), allocator); ) {
       decimalVector.allocateNew();
       BigDecimal decimal1 = new BigDecimal("123456789.000000000000000000");
       BigDecimal decimal2 = new BigDecimal("11.123456789123456789");
@@ -156,8 +166,9 @@ public void testWriteBigEndian() {
 
   @Test
   public void testLongReadWrite() {
-    try (Decimal256Vector decimalVector = TestUtils.newVector(Decimal256Vector.class, "decimal",
-            new ArrowType.Decimal(38, 0, 256), allocator)) {
+    try (Decimal256Vector decimalVector =
+        TestUtils.newVector(
+            Decimal256Vector.class, "decimal", new ArrowType.Decimal(38, 0, 256), allocator)) {
       decimalVector.allocateNew();
 
       long[] longValues = {0L, -2L, Long.MAX_VALUE, Long.MIN_VALUE, 187L};
@@ -174,11 +185,11 @@ public void testLongReadWrite() {
     }
   }
 
-
   @Test
   public void testBigDecimalReadWrite() {
-    try (Decimal256Vector decimalVector = TestUtils.newVector(Decimal256Vector.class, "decimal",
-        new ArrowType.Decimal(38, 9, 256), allocator);) {
+    try (Decimal256Vector decimalVector =
+        TestUtils.newVector(
+            Decimal256Vector.class, "decimal", new ArrowType.Decimal(38, 9, 256), allocator); ) {
       decimalVector.allocateNew();
       BigDecimal decimal1 = new BigDecimal("123456789.000000000");
       BigDecimal decimal2 = new BigDecimal("11.123456789");
@@ -212,29 +223,33 @@ public void testBigDecimalReadWrite() {
   }
 
   /**
-   * Test {@link Decimal256Vector#setBigEndian(int, byte[])} which takes BE layout input and stores in native-endian
-   * (NE) layout.
-   * Cases to cover: input byte array in different lengths in range [1-16] and negative values.
+   * Test {@link Decimal256Vector#setBigEndian(int, byte[])} which takes BE layout input and stores
+   * in native-endian (NE) layout. Cases to cover: input byte array in different lengths in range
+   * [1-16] and negative values.
    */
   @Test
   public void decimalBE2NE() {
-    try (Decimal256Vector decimalVector = TestUtils.newVector(Decimal256Vector.class, "decimal",
-        new ArrowType.Decimal(23, 2, 256), allocator)) {
+    try (Decimal256Vector decimalVector =
+        TestUtils.newVector(
+            Decimal256Vector.class, "decimal", new ArrowType.Decimal(23, 2, 256), allocator)) {
       decimalVector.allocateNew();
 
-      BigInteger[] testBigInts = new BigInteger[] {
-          new BigInteger("0"),
-          new BigInteger("-1"),
-          new BigInteger("23"),
-          new BigInteger("234234"),
-          new BigInteger("-234234234"),
-          new BigInteger("234234234234"),
-          new BigInteger("-56345345345345"),
-          new BigInteger("2982346298346289346293467923465345634500"), // converts to 16+ byte array
-          new BigInteger("-389457298347598237459832459823434653600"), // converts to 16+ byte array
-          new BigInteger("-345345"),
-          new BigInteger("754533")
-      };
+      BigInteger[] testBigInts =
+          new BigInteger[] {
+            new BigInteger("0"),
+            new BigInteger("-1"),
+            new BigInteger("23"),
+            new BigInteger("234234"),
+            new BigInteger("-234234234"),
+            new BigInteger("234234234234"),
+            new BigInteger("-56345345345345"),
+            new BigInteger(
+                "2982346298346289346293467923465345634500"), // converts to 16+ byte array
+            new BigInteger(
+                "-389457298347598237459832459823434653600"), // converts to 16+ byte array
+            new BigInteger("-345345"),
+            new BigInteger("754533")
+          };
 
       int insertionIdx = 0;
       insertionIdx++; // insert a null
@@ -247,9 +262,12 @@ public void decimalBE2NE() {
 
       // Try inserting a buffer larger than 33 bytes and expect a failure
       final int insertionIdxCapture = insertionIdx;
-      IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
-          () -> decimalVector.setBigEndian(insertionIdxCapture, new byte[33]));
-      assertTrue(ex.getMessage().equals("Invalid decimal value length. Valid length in [1 - 32], got 33"));
+      IllegalArgumentException ex =
+          assertThrows(
+              IllegalArgumentException.class,
+              () -> decimalVector.setBigEndian(insertionIdxCapture, new byte[33]));
+      assertTrue(
+          ex.getMessage().equals("Invalid decimal value length. Valid length in [1 - 32], got 33"));
       decimalVector.setValueCount(insertionIdx);
 
       // retrieve values and check if they are correct
@@ -266,9 +284,10 @@ public void decimalBE2NE() {
 
   @Test
   public void setUsingArrowBufOfLEInts() {
-    try (Decimal256Vector decimalVector = TestUtils.newVector(Decimal256Vector.class, "decimal",
-            new ArrowType.Decimal(5, 2, 256), allocator);
-         ArrowBuf buf = allocator.buffer(8);) {
+    try (Decimal256Vector decimalVector =
+            TestUtils.newVector(
+                Decimal256Vector.class, "decimal", new ArrowType.Decimal(5, 2, 256), allocator);
+        ArrowBuf buf = allocator.buffer(8); ) {
       decimalVector.allocateNew();
 
       // add a positive value equivalent to 705.32
@@ -283,21 +302,21 @@ public void setUsingArrowBufOfLEInts() {
 
       decimalVector.setValueCount(2);
 
-      BigDecimal [] expectedValues = new BigDecimal[] {BigDecimal.valueOf(705.32), BigDecimal
-              .valueOf(-705.32)};
-      for (int i = 0; i < 2; i ++) {
+      BigDecimal[] expectedValues =
+          new BigDecimal[] {BigDecimal.valueOf(705.32), BigDecimal.valueOf(-705.32)};
+      for (int i = 0; i < 2; i++) {
         BigDecimal value = decimalVector.getObject(i);
         assertEquals(expectedValues[i], value);
       }
     }
-
   }
 
   @Test
   public void setUsingArrowLongLEBytes() {
-    try (Decimal256Vector decimalVector = TestUtils.newVector(Decimal256Vector.class, "decimal",
-            new ArrowType.Decimal(18, 0, 256), allocator);
-         ArrowBuf buf = allocator.buffer(16);) {
+    try (Decimal256Vector decimalVector =
+            TestUtils.newVector(
+                Decimal256Vector.class, "decimal", new ArrowType.Decimal(18, 0, 256), allocator);
+        ArrowBuf buf = allocator.buffer(16); ) {
       decimalVector.allocateNew();
 
       long val = Long.MAX_VALUE;
@@ -310,9 +329,9 @@ public void setUsingArrowLongLEBytes() {
 
       decimalVector.setValueCount(2);
 
-      BigDecimal [] expectedValues = new BigDecimal[] {BigDecimal.valueOf(Long.MAX_VALUE), BigDecimal
-              .valueOf(Long.MIN_VALUE)};
-      for (int i = 0; i < 2; i ++) {
+      BigDecimal[] expectedValues =
+          new BigDecimal[] {BigDecimal.valueOf(Long.MAX_VALUE), BigDecimal.valueOf(Long.MIN_VALUE)};
+      for (int i = 0; i < 2; i++) {
         BigDecimal value = decimalVector.getObject(i);
         assertEquals(expectedValues[i], value);
       }
@@ -321,20 +340,27 @@ public void setUsingArrowLongLEBytes() {
 
   @Test
   public void setUsingArrowBufOfBEBytes() {
-    try (Decimal256Vector decimalVector = TestUtils.newVector(Decimal256Vector.class, "decimal",
-            new ArrowType.Decimal(5, 2, 256), allocator);
-         ArrowBuf buf = allocator.buffer(9);) {
-      BigDecimal [] expectedValues = new BigDecimal[] {BigDecimal.valueOf(705.32), BigDecimal
-              .valueOf(-705.32), BigDecimal.valueOf(705.32)};
+    try (Decimal256Vector decimalVector =
+            TestUtils.newVector(
+                Decimal256Vector.class, "decimal", new ArrowType.Decimal(5, 2, 256), allocator);
+        ArrowBuf buf = allocator.buffer(9); ) {
+      BigDecimal[] expectedValues =
+          new BigDecimal[] {
+            BigDecimal.valueOf(705.32), BigDecimal.valueOf(-705.32), BigDecimal.valueOf(705.32)
+          };
       verifyWritingArrowBufWithBigEndianBytes(decimalVector, buf, expectedValues, 3);
     }
 
-    try (Decimal256Vector decimalVector = TestUtils.newVector(Decimal256Vector.class, "decimal",
-            new ArrowType.Decimal(43, 2, 256), allocator);
-         ArrowBuf buf = allocator.buffer(45);) {
-      BigDecimal[] expectedValues = new BigDecimal[] {new BigDecimal("29823462983462893462934679234653450000000.63"),
-                                                      new BigDecimal("-2982346298346289346293467923465345.63"),
-                                                      new BigDecimal("2982346298346289346293467923465345.63")};
+    try (Decimal256Vector decimalVector =
+            TestUtils.newVector(
+                Decimal256Vector.class, "decimal", new ArrowType.Decimal(43, 2, 256), allocator);
+        ArrowBuf buf = allocator.buffer(45); ) {
+      BigDecimal[] expectedValues =
+          new BigDecimal[] {
+            new BigDecimal("29823462983462893462934679234653450000000.63"),
+            new BigDecimal("-2982346298346289346293467923465345.63"),
+            new BigDecimal("2982346298346289346293467923465345.63")
+          };
       verifyWritingArrowBufWithBigEndianBytes(decimalVector, buf, expectedValues, 15);
     }
   }
@@ -344,23 +370,23 @@ public void testGetTransferPairWithField() {
     final Decimal256Vector fromVector = new Decimal256Vector("decimal", allocator, 10, scale);
     final TransferPair transferPair = fromVector.getTransferPair(fromVector.getField(), allocator);
     final Decimal256Vector toVector = (Decimal256Vector) transferPair.getTo();
-    // Field inside a new vector created by reusing a field should be the same in memory as the original field.
+    // Field inside a new vector created by reusing a field should be the same in memory as the
+    // original field.
     assertSame(fromVector.getField(), toVector.getField());
   }
 
-  private void verifyWritingArrowBufWithBigEndianBytes(Decimal256Vector decimalVector,
-                                                       ArrowBuf buf, BigDecimal[] expectedValues,
-                                                       int length) {
+  private void verifyWritingArrowBufWithBigEndianBytes(
+      Decimal256Vector decimalVector, ArrowBuf buf, BigDecimal[] expectedValues, int length) {
     decimalVector.allocateNew();
     for (int i = 0; i < expectedValues.length; i++) {
       byte[] bigEndianBytes = expectedValues[i].unscaledValue().toByteArray();
-      buf.setBytes(length * i , bigEndianBytes, 0 , bigEndianBytes.length);
+      buf.setBytes(length * i, bigEndianBytes, 0, bigEndianBytes.length);
       decimalVector.setBigEndianSafe(i, length * i, buf, bigEndianBytes.length);
     }
 
     decimalVector.setValueCount(3);
 
-    for (int i = 0; i < expectedValues.length; i ++) {
+    for (int i = 0; i < expectedValues.length; i++) {
       BigDecimal value = decimalVector.getObject(i);
       assertEquals(expectedValues[i], value);
     }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestDecimalVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestDecimalVector.java
index 572f13fea1ed1..d5310bad0ea0e 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestDecimalVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestDecimalVector.java
@@ -14,24 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestDecimalVector {
 
@@ -49,22 +47,23 @@ public class TestDecimalVector {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
 
   @Test
   public void testValuesWriteRead() {
-    try (DecimalVector decimalVector = TestUtils.newVector(DecimalVector.class, "decimal",
-        new ArrowType.Decimal(10, scale, 128), allocator);) {
+    try (DecimalVector decimalVector =
+        TestUtils.newVector(
+            DecimalVector.class, "decimal", new ArrowType.Decimal(10, scale, 128), allocator); ) {
 
-      try (DecimalVector oldConstructor = new DecimalVector("decimal", allocator, 10, scale);) {
+      try (DecimalVector oldConstructor = new DecimalVector("decimal", allocator, 10, scale); ) {
         assertEquals(decimalVector.getField().getType(), oldConstructor.getField().getType());
       }
 
@@ -80,15 +79,16 @@ public void testValuesWriteRead() {
 
       for (int i = 0; i < intValues.length; i++) {
         BigDecimal value = decimalVector.getObject(i);
-        assertEquals("unexpected data at index: " + i, values[i], value);
+        assertEquals(values[i], value, "unexpected data at index: " + i);
       }
     }
   }
 
   @Test
   public void testBigDecimalDifferentScaleAndPrecision() {
-    try (DecimalVector decimalVector = TestUtils.newVector(DecimalVector.class, "decimal",
-        new ArrowType.Decimal(4, 2, 128), allocator);) {
+    try (DecimalVector decimalVector =
+        TestUtils.newVector(
+            DecimalVector.class, "decimal", new ArrowType.Decimal(4, 2, 128), allocator); ) {
       decimalVector.allocateNew();
 
       // test BigDecimal with different scale
@@ -117,8 +117,9 @@ public void testBigDecimalDifferentScaleAndPrecision() {
 
   @Test
   public void testWriteBigEndian() {
-    try (DecimalVector decimalVector = TestUtils.newVector(DecimalVector.class, "decimal",
-        new ArrowType.Decimal(38, 9, 128), allocator);) {
+    try (DecimalVector decimalVector =
+        TestUtils.newVector(
+            DecimalVector.class, "decimal", new ArrowType.Decimal(38, 9, 128), allocator); ) {
       decimalVector.allocateNew();
       BigDecimal decimal1 = new BigDecimal("123456789.000000000");
       BigDecimal decimal2 = new BigDecimal("11.123456789");
@@ -162,8 +163,9 @@ public void testWriteBigEndian() {
 
   @Test
   public void testLongReadWrite() {
-    try (DecimalVector decimalVector = TestUtils.newVector(DecimalVector.class, "decimal",
-            new ArrowType.Decimal(38, 0, 128), allocator)) {
+    try (DecimalVector decimalVector =
+        TestUtils.newVector(
+            DecimalVector.class, "decimal", new ArrowType.Decimal(38, 0, 128), allocator)) {
       decimalVector.allocateNew();
 
       long[] longValues = {0L, -2L, Long.MAX_VALUE, Long.MIN_VALUE, 187L};
@@ -180,11 +182,11 @@ public void testLongReadWrite() {
     }
   }
 
-
   @Test
   public void testBigDecimalReadWrite() {
-    try (DecimalVector decimalVector = TestUtils.newVector(DecimalVector.class, "decimal",
-        new ArrowType.Decimal(38, 9, 128), allocator);) {
+    try (DecimalVector decimalVector =
+        TestUtils.newVector(
+            DecimalVector.class, "decimal", new ArrowType.Decimal(38, 9, 128), allocator); ) {
       decimalVector.allocateNew();
       BigDecimal decimal1 = new BigDecimal("123456789.000000000");
       BigDecimal decimal2 = new BigDecimal("11.123456789");
@@ -218,29 +220,31 @@ public void testBigDecimalReadWrite() {
   }
 
   /**
-   * Test {@link DecimalVector#setBigEndian(int, byte[])} which takes BE layout input and stores in native-endian (NE)
-   * layout.
-   * Cases to cover: input byte array in different lengths in range [1-16] and negative values.
+   * Test {@link DecimalVector#setBigEndian(int, byte[])} which takes BE layout input and stores in
+   * native-endian (NE) layout. Cases to cover: input byte array in different lengths in range
+   * [1-16] and negative values.
    */
   @Test
   public void decimalBE2NE() {
-    try (DecimalVector decimalVector = TestUtils.newVector(DecimalVector.class, "decimal",
-        new ArrowType.Decimal(21, 2, 128), allocator)) {
+    try (DecimalVector decimalVector =
+        TestUtils.newVector(
+            DecimalVector.class, "decimal", new ArrowType.Decimal(21, 2, 128), allocator)) {
       decimalVector.allocateNew();
 
-      BigInteger[] testBigInts = new BigInteger[] {
-          new BigInteger("0"),
-          new BigInteger("-1"),
-          new BigInteger("23"),
-          new BigInteger("234234"),
-          new BigInteger("-234234234"),
-          new BigInteger("234234234234"),
-          new BigInteger("-56345345345345"),
-          new BigInteger("29823462983462893462934679234653456345"), // converts to 16 byte array
-          new BigInteger("-3894572983475982374598324598234346536"), // converts to 16 byte array
-          new BigInteger("-345345"),
-          new BigInteger("754533")
-      };
+      BigInteger[] testBigInts =
+          new BigInteger[] {
+            new BigInteger("0"),
+            new BigInteger("-1"),
+            new BigInteger("23"),
+            new BigInteger("234234"),
+            new BigInteger("-234234234"),
+            new BigInteger("234234234234"),
+            new BigInteger("-56345345345345"),
+            new BigInteger("29823462983462893462934679234653456345"), // converts to 16 byte array
+            new BigInteger("-3894572983475982374598324598234346536"), // converts to 16 byte array
+            new BigInteger("-345345"),
+            new BigInteger("754533")
+          };
 
       int insertionIdx = 0;
       insertionIdx++; // insert a null
@@ -256,7 +260,9 @@ public void decimalBE2NE() {
         decimalVector.setBigEndian(insertionIdx, new byte[17]);
         fail("above statement should have failed");
       } catch (IllegalArgumentException ex) {
-        assertTrue(ex.getMessage().equals("Invalid decimal value length. Valid length in [1 - 16], got 17"));
+        assertTrue(
+            ex.getMessage()
+                .equals("Invalid decimal value length. Valid length in [1 - 16], got 17"));
       }
       decimalVector.setValueCount(insertionIdx);
 
@@ -274,9 +280,10 @@ public void decimalBE2NE() {
 
   @Test
   public void setUsingArrowBufOfInts() {
-    try (DecimalVector decimalVector = TestUtils.newVector(DecimalVector.class, "decimal",
-            new ArrowType.Decimal(5, 2, 128), allocator);
-         ArrowBuf buf = allocator.buffer(8);) {
+    try (DecimalVector decimalVector =
+            TestUtils.newVector(
+                DecimalVector.class, "decimal", new ArrowType.Decimal(5, 2, 128), allocator);
+        ArrowBuf buf = allocator.buffer(8); ) {
       decimalVector.allocateNew();
 
       // add a positive value equivalent to 705.32
@@ -291,21 +298,21 @@ public void setUsingArrowBufOfInts() {
 
       decimalVector.setValueCount(2);
 
-      BigDecimal [] expectedValues = new BigDecimal[] {BigDecimal.valueOf(705.32), BigDecimal
-              .valueOf(-705.32)};
-      for (int i = 0; i < 2; i ++) {
+      BigDecimal[] expectedValues =
+          new BigDecimal[] {BigDecimal.valueOf(705.32), BigDecimal.valueOf(-705.32)};
+      for (int i = 0; i < 2; i++) {
         BigDecimal value = decimalVector.getObject(i);
         assertEquals(expectedValues[i], value);
       }
     }
-
   }
 
   @Test
   public void setUsingArrowLongBytes() {
-    try (DecimalVector decimalVector = TestUtils.newVector(DecimalVector.class, "decimal",
-            new ArrowType.Decimal(18, 0, 128), allocator);
-         ArrowBuf buf = allocator.buffer(16);) {
+    try (DecimalVector decimalVector =
+            TestUtils.newVector(
+                DecimalVector.class, "decimal", new ArrowType.Decimal(18, 0, 128), allocator);
+        ArrowBuf buf = allocator.buffer(16); ) {
       decimalVector.allocateNew();
 
       long val = Long.MAX_VALUE;
@@ -318,9 +325,9 @@ public void setUsingArrowLongBytes() {
 
       decimalVector.setValueCount(2);
 
-      BigDecimal [] expectedValues = new BigDecimal[] {BigDecimal.valueOf(Long.MAX_VALUE), BigDecimal
-              .valueOf(Long.MIN_VALUE)};
-      for (int i = 0; i < 2; i ++) {
+      BigDecimal[] expectedValues =
+          new BigDecimal[] {BigDecimal.valueOf(Long.MAX_VALUE), BigDecimal.valueOf(Long.MIN_VALUE)};
+      for (int i = 0; i < 2; i++) {
         BigDecimal value = decimalVector.getObject(i);
         assertEquals(expectedValues[i], value);
       }
@@ -329,20 +336,27 @@ public void setUsingArrowLongBytes() {
 
   @Test
   public void setUsingArrowBufOfBEBytes() {
-    try (DecimalVector decimalVector = TestUtils.newVector(DecimalVector.class, "decimal",
-            new ArrowType.Decimal(5, 2, 128), allocator);
-         ArrowBuf buf = allocator.buffer(9);) {
-      BigDecimal [] expectedValues = new BigDecimal[] {BigDecimal.valueOf(705.32), BigDecimal
-              .valueOf(-705.32), BigDecimal.valueOf(705.32)};
+    try (DecimalVector decimalVector =
+            TestUtils.newVector(
+                DecimalVector.class, "decimal", new ArrowType.Decimal(5, 2, 128), allocator);
+        ArrowBuf buf = allocator.buffer(9); ) {
+      BigDecimal[] expectedValues =
+          new BigDecimal[] {
+            BigDecimal.valueOf(705.32), BigDecimal.valueOf(-705.32), BigDecimal.valueOf(705.32)
+          };
       verifyWritingArrowBufWithBigEndianBytes(decimalVector, buf, expectedValues, 3);
     }
 
-    try (DecimalVector decimalVector = TestUtils.newVector(DecimalVector.class, "decimal",
-            new ArrowType.Decimal(36, 2, 128), allocator);
-         ArrowBuf buf = allocator.buffer(45);) {
-      BigDecimal[] expectedValues = new BigDecimal[] {new BigDecimal("2982346298346289346293467923465345.63"),
-                                                      new BigDecimal("-2982346298346289346293467923465345.63"),
-                                                      new BigDecimal("2982346298346289346293467923465345.63")};
+    try (DecimalVector decimalVector =
+            TestUtils.newVector(
+                DecimalVector.class, "decimal", new ArrowType.Decimal(36, 2, 128), allocator);
+        ArrowBuf buf = allocator.buffer(45); ) {
+      BigDecimal[] expectedValues =
+          new BigDecimal[] {
+            new BigDecimal("2982346298346289346293467923465345.63"),
+            new BigDecimal("-2982346298346289346293467923465345.63"),
+            new BigDecimal("2982346298346289346293467923465345.63")
+          };
       verifyWritingArrowBufWithBigEndianBytes(decimalVector, buf, expectedValues, 15);
     }
   }
@@ -352,23 +366,23 @@ public void testGetTransferPairWithField() {
     final DecimalVector fromVector = new DecimalVector("decimal", allocator, 10, scale);
     final TransferPair transferPair = fromVector.getTransferPair(fromVector.getField(), allocator);
     final DecimalVector toVector = (DecimalVector) transferPair.getTo();
-    // Field inside a new vector created by reusing a field should be the same in memory as the original field.
+    // Field inside a new vector created by reusing a field should be the same in memory as the
+    // original field.
     assertSame(fromVector.getField(), toVector.getField());
   }
 
-  private void verifyWritingArrowBufWithBigEndianBytes(DecimalVector decimalVector,
-                                                       ArrowBuf buf, BigDecimal[] expectedValues,
-                                                       int length) {
+  private void verifyWritingArrowBufWithBigEndianBytes(
+      DecimalVector decimalVector, ArrowBuf buf, BigDecimal[] expectedValues, int length) {
     decimalVector.allocateNew();
     for (int i = 0; i < expectedValues.length; i++) {
-      byte []bigEndianBytes = expectedValues[i].unscaledValue().toByteArray();
-      buf.setBytes(length * i , bigEndianBytes, 0 , bigEndianBytes.length);
+      byte[] bigEndianBytes = expectedValues[i].unscaledValue().toByteArray();
+      buf.setBytes(length * i, bigEndianBytes, 0, bigEndianBytes.length);
       decimalVector.setBigEndianSafe(i, length * i, buf, bigEndianBytes.length);
     }
 
     decimalVector.setValueCount(3);
 
-    for (int i = 0; i < expectedValues.length; i ++) {
+    for (int i = 0; i < expectedValues.length; i++) {
       BigDecimal value = decimalVector.getObject(i);
       assertEquals(expectedValues[i], value);
     }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestDenseUnionVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestDenseUnionVector.java
index 8fd33eb5a8432..9cd89d57ff074 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestDenseUnionVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestDenseUnionVector.java
@@ -14,19 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.DenseUnionVector;
@@ -47,21 +45,21 @@
 import org.apache.arrow.vector.util.JsonStringHashMap;
 import org.apache.arrow.vector.util.Text;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestDenseUnionVector {
   private static final String EMPTY_SCHEMA_PATH = "";
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -73,11 +71,13 @@ public void testDenseUnionVector() throws Exception {
     uInt4Holder.value = 100;
     uInt4Holder.isSet = 1;
 
-    try (DenseUnionVector unionVector = new DenseUnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) {
+    try (DenseUnionVector unionVector =
+        new DenseUnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) {
       unionVector.allocateNew();
 
       // write some data
-      byte uint4TypeId = unionVector.registerNewTypeId(Field.nullable("", MinorType.UINT4.getType()));
+      byte uint4TypeId =
+          unionVector.registerNewTypeId(Field.nullable("", MinorType.UINT4.getType()));
       unionVector.setTypeId(0, uint4TypeId);
       unionVector.setSafe(0, uInt4Holder);
       unionVector.setTypeId(2, uint4TypeId);
@@ -99,9 +99,49 @@ public void testDenseUnionVector() throws Exception {
     }
   }
 
+  @Test
+  public void testSetOffset() {
+    try (DenseUnionVector duv = DenseUnionVector.empty("foo", allocator)) {
+      duv.allocateNew();
+      byte i32TypeId = duv.registerNewTypeId(Field.notNullable("i32", MinorType.INT.getType()));
+      byte f64TypeId = duv.registerNewTypeId(Field.notNullable("f64", MinorType.FLOAT8.getType()));
+
+      IntVector i32Vector = ((IntVector) duv.addVector(i32TypeId, new IntVector("i32", allocator)));
+      Float8Vector f64Vector =
+          ((Float8Vector) duv.addVector(f64TypeId, new Float8Vector("f64", allocator)));
+
+      i32Vector.allocateNew(3);
+      f64Vector.allocateNew(1);
+
+      duv.setTypeId(0, i32TypeId);
+      duv.setOffset(0, 0);
+      i32Vector.set(0, 42);
+
+      duv.setTypeId(1, i32TypeId);
+      duv.setOffset(1, 1);
+      i32Vector.set(1, 43);
+
+      duv.setTypeId(2, f64TypeId);
+      duv.setOffset(2, 0);
+      f64Vector.set(0, 3.14);
+
+      duv.setTypeId(3, i32TypeId);
+      duv.setOffset(3, 2);
+      i32Vector.set(2, 44);
+
+      duv.setValueCount(4);
+
+      assertEquals(42, duv.getObject(0));
+      assertEquals(43, duv.getObject(1));
+      assertEquals(3.14, duv.getObject(2));
+      assertEquals(44, duv.getObject(3));
+    }
+  }
+
   @Test
   public void testTransfer() throws Exception {
-    try (DenseUnionVector srcVector = new DenseUnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) {
+    try (DenseUnionVector srcVector =
+        new DenseUnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) {
       srcVector.allocateNew();
 
       // write some data
@@ -117,7 +157,8 @@ public void testTransfer() throws Exception {
       srcVector.setSafe(5, newBitHolder(false));
       srcVector.setValueCount(6);
 
-      try (DenseUnionVector destVector = new DenseUnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) {
+      try (DenseUnionVector destVector =
+          new DenseUnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) {
         TransferPair pair = srcVector.makeTransferPair(destVector);
 
         // Creating the transfer should transfer the type of the field at least.
@@ -152,7 +193,8 @@ public void testTransfer() throws Exception {
 
   @Test
   public void testSplitAndTransfer() throws Exception {
-    try (DenseUnionVector sourceVector = new DenseUnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) {
+    try (DenseUnionVector sourceVector =
+        new DenseUnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) {
 
       sourceVector.allocateNew();
 
@@ -203,18 +245,13 @@ public void testSplitAndTransfer() throws Exception {
       assertEquals(false, sourceVector.isNull(9));
       assertEquals(50, sourceVector.getObject(9));
 
-      try (DenseUnionVector toVector = new DenseUnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) {
+      try (DenseUnionVector toVector =
+          new DenseUnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) {
         toVector.registerNewTypeId(Field.nullable("", MinorType.INT.getType()));
 
         final TransferPair transferPair = sourceVector.makeTransferPair(toVector);
 
-        final int[][] transferLengths = {{0, 3},
-          {3, 1},
-          {4, 2},
-          {6, 1},
-          {7, 1},
-          {8, 2}
-        };
+        final int[][] transferLengths = {{0, 3}, {3, 1}, {4, 2}, {6, 1}, {7, 1}, {8, 2}};
 
         for (final int[] transferLength : transferLengths) {
           final int start = transferLength[0];
@@ -224,8 +261,10 @@ public void testSplitAndTransfer() throws Exception {
 
           /* check the toVector output after doing the splitAndTransfer */
           for (int i = 0; i < length; i++) {
-            assertEquals("Different data at indexes: " + (start + i) + "and " + i, sourceVector.getObject(start + i),
-                    toVector.getObject(i));
+            assertEquals(
+                sourceVector.getObject(start + i),
+                toVector.getObject(i),
+                "Different data at indexes: " + (start + i) + "and " + i);
           }
         }
       }
@@ -234,7 +273,8 @@ public void testSplitAndTransfer() throws Exception {
 
   @Test
   public void testSplitAndTransferWithMixedVectors() throws Exception {
-    try (DenseUnionVector sourceVector = new DenseUnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) {
+    try (DenseUnionVector sourceVector =
+        new DenseUnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) {
 
       sourceVector.allocateNew();
 
@@ -244,7 +284,8 @@ public void testSplitAndTransferWithMixedVectors() throws Exception {
       sourceVector.setTypeId(0, intTypeId);
       sourceVector.setSafe(0, newIntHolder(5));
 
-      byte float4TypeId = sourceVector.registerNewTypeId(Field.nullable("", MinorType.FLOAT4.getType()));
+      byte float4TypeId =
+          sourceVector.registerNewTypeId(Field.nullable("", MinorType.FLOAT4.getType()));
 
       sourceVector.setTypeId(1, float4TypeId);
       sourceVector.setSafe(1, newFloat4Holder(5.5f));
@@ -297,18 +338,14 @@ public void testSplitAndTransferWithMixedVectors() throws Exception {
       assertEquals(false, sourceVector.isNull(9));
       assertEquals(30.5f, sourceVector.getObject(9));
 
-      try (DenseUnionVector toVector = new DenseUnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) {
+      try (DenseUnionVector toVector =
+          new DenseUnionVector(EMPTY_SCHEMA_PATH, allocator, null, null)) {
         toVector.registerNewTypeId(Field.nullable("", MinorType.INT.getType()));
         toVector.registerNewTypeId(Field.nullable("", MinorType.FLOAT4.getType()));
 
         final TransferPair transferPair = sourceVector.makeTransferPair(toVector);
 
-        final int[][] transferLengths = {{0, 2},
-            {2, 1},
-            {3, 2},
-            {5, 3},
-            {8, 2}
-        };
+        final int[][] transferLengths = {{0, 2}, {2, 1}, {3, 2}, {5, 3}, {8, 2}};
 
         for (final int[] transferLength : transferLengths) {
           final int start = transferLength[0];
@@ -318,13 +355,44 @@ public void testSplitAndTransferWithMixedVectors() throws Exception {
 
           /* check the toVector output after doing the splitAndTransfer */
           for (int i = 0; i < length; i++) {
-            assertEquals("Different values at index: " + i, sourceVector.getObject(start + i), toVector.getObject(i));
+            assertEquals(
+                sourceVector.getObject(start + i),
+                toVector.getObject(i),
+                "Different values at index: " + i);
           }
         }
       }
     }
   }
 
+  @Test
+  public void testSplitAndTransferDuvInStruct() {
+    try (StructVector struct = StructVector.empty("struct", allocator)) {
+      DenseUnionVector duv =
+          struct.addOrGet(
+              "duv", FieldType.notNullable(MinorType.DENSEUNION.getType()), DenseUnionVector.class);
+      byte i32TypeId = duv.registerNewTypeId(Field.notNullable("i32", MinorType.INT.getType()));
+      duv.addVector(i32TypeId, new IntVector("i32", allocator));
+
+      struct.setIndexDefined(0);
+      duv.setTypeId(0, i32TypeId);
+      duv.setSafe(0, newIntHolder(42));
+
+      struct.setNull(1);
+      struct.setValueCount(2);
+
+      try (StructVector dest = StructVector.empty("dest", allocator)) {
+        TransferPair pair = struct.makeTransferPair(dest);
+        pair.splitAndTransfer(0, 2);
+
+        assertEquals(2, dest.getValueCount());
+        assertFalse(dest.isNull(0));
+        assertEquals(42, dest.getObject(0).get("duv"));
+        assertTrue(dest.isNull(1));
+      }
+    }
+  }
+
   @Test
   public void testGetFieldTypeInfo() throws Exception {
     Map<String, String> metadata = new HashMap<>();
@@ -338,8 +406,9 @@ public void testGetFieldTypeInfo() throws Exception {
     children.add(new Field("int", FieldType.nullable(MinorType.INT.getType()), null));
     children.add(new Field("varchar", FieldType.nullable(MinorType.VARCHAR.getType()), null));
 
-    final FieldType fieldType = new FieldType(false, new ArrowType.Union(UnionMode.Dense, typeIds),
-            /*dictionary=*/null, metadata);
+    final FieldType fieldType =
+        new FieldType(
+            false, new ArrowType.Union(UnionMode.Dense, typeIds), /*dictionary=*/ null, metadata);
     final Field field = new Field("union", fieldType, children);
 
     MinorType minorType = MinorType.DENSEUNION;
@@ -414,26 +483,26 @@ public void testGetBufferAddress() throws Exception {
     }
   }
 
-  /**
-   * Test adding two struct vectors to the dense union vector.
-   */
+  /** Test adding two struct vectors to the dense union vector. */
   @Test
   public void testMultipleStructs() {
     FieldType type = new FieldType(true, ArrowType.Struct.INSTANCE, null, null);
     try (StructVector structVector1 = new StructVector("struct1", allocator, type, null);
-         StructVector structVector2 = new StructVector("struct2", allocator, type, null);
-         DenseUnionVector unionVector = DenseUnionVector.empty("union", allocator)) {
+        StructVector structVector2 = new StructVector("struct2", allocator, type, null);
+        DenseUnionVector unionVector = DenseUnionVector.empty("union", allocator)) {
 
       // prepare sub vectors
 
       // first struct vector: (int, int)
-      IntVector subVector11 = structVector1
-              .addOrGet("sub11", FieldType.nullable(MinorType.INT.getType()), IntVector.class);
+      IntVector subVector11 =
+          structVector1.addOrGet(
+              "sub11", FieldType.nullable(MinorType.INT.getType()), IntVector.class);
       subVector11.allocateNew();
       ValueVectorDataPopulator.setVector(subVector11, 0, 1);
 
-      IntVector subVector12 = structVector1
-              .addOrGet("sub12", FieldType.nullable(MinorType.INT.getType()), IntVector.class);
+      IntVector subVector12 =
+          structVector1.addOrGet(
+              "sub12", FieldType.nullable(MinorType.INT.getType()), IntVector.class);
       subVector12.allocateNew();
       ValueVectorDataPopulator.setVector(subVector12, 0, 10);
 
@@ -442,13 +511,15 @@ public void testMultipleStructs() {
       structVector1.setValueCount(2);
 
       // second struct vector: (string, string)
-      VarCharVector subVector21 = structVector2
-              .addOrGet("sub21", FieldType.nullable(MinorType.VARCHAR.getType()), VarCharVector.class);
+      VarCharVector subVector21 =
+          structVector2.addOrGet(
+              "sub21", FieldType.nullable(MinorType.VARCHAR.getType()), VarCharVector.class);
       subVector21.allocateNew();
       ValueVectorDataPopulator.setVector(subVector21, "a0");
 
-      VarCharVector subVector22 = structVector2
-              .addOrGet("sub22", FieldType.nullable(MinorType.VARCHAR.getType()), VarCharVector.class);
+      VarCharVector subVector22 =
+          structVector2.addOrGet(
+              "sub22", FieldType.nullable(MinorType.VARCHAR.getType()), VarCharVector.class);
       subVector22.allocateNew();
       ValueVectorDataPopulator.setVector(subVector22, "b0");
 
@@ -502,14 +573,12 @@ public void testMultipleStructs() {
     }
   }
 
-  /**
-   * Test adding two varchar vectors to the dense union vector.
-   */
+  /** Test adding two varchar vectors to the dense union vector. */
   @Test
   public void testMultipleVarChars() {
     try (VarCharVector childVector1 = new VarCharVector("child1", allocator);
-         VarCharVector childVector2 = new VarCharVector("child2", allocator);
-         DenseUnionVector unionVector = DenseUnionVector.empty("union", allocator)) {
+        VarCharVector childVector2 = new VarCharVector("child2", allocator);
+        DenseUnionVector unionVector = DenseUnionVector.empty("union", allocator)) {
 
       // prepare sub vectors
       ValueVectorDataPopulator.setVector(childVector1, "a0", "a4");
@@ -544,7 +613,6 @@ public void testMultipleVarChars() {
       unionVector.setTypeId(2, typeId2);
       offsetBuf.setInt(DenseUnionVector.OFFSET_WIDTH * 2, 1);
 
-
       // slot 4 points to child1
       unionVector.setTypeId(4, typeId1);
       offsetBuf.setInt(DenseUnionVector.OFFSET_WIDTH * 4, 1);
@@ -581,11 +649,13 @@ public void testChildVectorValueCounts() {
       vector.setTypeId(0, intTypeId);
       intHolder.value = 7;
       vector.setSafe(0, intHolder);
-      byte longTypeId = vector.registerNewTypeId(Field.nullable("", Types.MinorType.BIGINT.getType()));
+      byte longTypeId =
+          vector.registerNewTypeId(Field.nullable("", Types.MinorType.BIGINT.getType()));
       vector.setTypeId(2, longTypeId);
       longHolder.value = 8L;
       vector.setSafe(2, longHolder);
-      byte floatTypeId = vector.registerNewTypeId(Field.nullable("", Types.MinorType.FLOAT4.getType()));
+      byte floatTypeId =
+          vector.registerNewTypeId(Field.nullable("", Types.MinorType.FLOAT4.getType()));
       vector.setTypeId(3, floatTypeId);
       floatHolder.value = 9.0f;
       vector.setSafe(3, floatHolder);
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestDictionaryVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestDictionaryVector.java
index 9ffa79470eeb8..d65047efb192b 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestDictionaryVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestDictionaryVector.java
@@ -14,12 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.TestUtils.*;
 import static org.apache.arrow.vector.testing.ValueVectorDataPopulator.setVector;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
@@ -28,7 +31,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.ToIntBiFunction;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.FixedSizeListVector;
@@ -49,9 +51,9 @@
 import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.util.Text;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestDictionaryVector {
 
@@ -63,12 +65,12 @@ public class TestDictionaryVector {
 
   byte[][] data = new byte[][] {zero, one, two};
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -77,7 +79,7 @@ public void terminate() throws Exception {
   public void testEncodeStrings() {
     // Create a new value vector
     try (final VarCharVector vector = newVarCharVector("foo", allocator);
-         final VarCharVector dictionaryVector = newVarCharVector("dict", allocator);) {
+        final VarCharVector dictionaryVector = newVarCharVector("dict", allocator); ) {
 
       setVector(vector, zero, one, one, two, zero);
       setVector(dictionaryVector, zero, one, two);
@@ -113,7 +115,7 @@ public void testEncodeStrings() {
   public void testEncodeLargeVector() {
     // Create a new value vector
     try (final VarCharVector vector = newVarCharVector("foo", allocator);
-         final VarCharVector dictionaryVector = newVarCharVector("dict", allocator);) {
+        final VarCharVector dictionaryVector = newVarCharVector("dict", allocator); ) {
       vector.allocateNew();
 
       int count = 10000;
@@ -154,30 +156,31 @@ public void testEncodeLargeVector() {
   public void testEncodeList() {
     // Create a new value vector
     try (final ListVector vector = ListVector.empty("vector", allocator);
-         final ListVector dictionaryVector = ListVector.empty("dict", allocator);) {
+        final ListVector dictionaryVector = ListVector.empty("dict", allocator); ) {
 
       UnionListWriter writer = vector.getWriter();
       writer.allocate();
 
-      //set some values
-      writeListVector(writer, new int[]{10, 20});
-      writeListVector(writer, new int[]{10, 20});
-      writeListVector(writer, new int[]{10, 20});
-      writeListVector(writer, new int[]{30, 40, 50});
-      writeListVector(writer, new int[]{30, 40, 50});
-      writeListVector(writer, new int[]{10, 20});
+      // set some values
+      writeListVector(writer, new int[] {10, 20});
+      writeListVector(writer, new int[] {10, 20});
+      writeListVector(writer, new int[] {10, 20});
+      writeListVector(writer, new int[] {30, 40, 50});
+      writeListVector(writer, new int[] {30, 40, 50});
+      writeListVector(writer, new int[] {10, 20});
 
       writer.setValueCount(6);
 
       UnionListWriter dictWriter = dictionaryVector.getWriter();
       dictWriter.allocate();
 
-      writeListVector(dictWriter, new int[]{10, 20});
-      writeListVector(dictWriter, new int[]{30, 40, 50});
+      writeListVector(dictWriter, new int[] {10, 20});
+      writeListVector(dictWriter, new int[] {30, 40, 50});
 
       dictWriter.setValueCount(2);
 
-      Dictionary dictionary = new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
+      Dictionary dictionary =
+          new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
 
       try (final ValueVector encoded = DictionaryEncoder.encode(vector, dictionary)) {
         // verify indices
@@ -208,11 +211,13 @@ public void testEncodeList() {
   public void testEncodeStruct() {
     // Create a new value vector
     try (final StructVector vector = StructVector.empty("vector", allocator);
-        final StructVector dictionaryVector = StructVector.empty("dict", allocator);) {
+        final StructVector dictionaryVector = StructVector.empty("dict", allocator); ) {
       vector.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
       vector.addOrGet("f1", FieldType.nullable(new ArrowType.Int(64, true)), BigIntVector.class);
-      dictionaryVector.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
-      dictionaryVector.addOrGet("f1", FieldType.nullable(new ArrowType.Int(64, true)), BigIntVector.class);
+      dictionaryVector.addOrGet(
+          "f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
+      dictionaryVector.addOrGet(
+          "f1", FieldType.nullable(new ArrowType.Int(64, true)), BigIntVector.class);
 
       NullableStructWriter writer = vector.getWriter();
       writer.allocate();
@@ -233,10 +238,10 @@ public void testEncodeStruct() {
       writeStructVector(dictWriter, 1, 10L);
       writeStructVector(dictWriter, 2, 20L);
 
-
       dictionaryVector.setValueCount(2);
 
-      Dictionary dictionary = new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
+      Dictionary dictionary =
+          new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
 
       try (final ValueVector encoded = DictionaryEncoder.encode(vector, dictionary)) {
         // verify indices
@@ -268,12 +273,13 @@ public void testEncodeStruct() {
   public void testEncodeBinaryVector() {
     // Create a new value vector
     try (final VarBinaryVector vector = newVarBinaryVector("foo", allocator);
-         final VarBinaryVector dictionaryVector = newVarBinaryVector("dict", allocator)) {
+        final VarBinaryVector dictionaryVector = newVarBinaryVector("dict", allocator)) {
 
       setVector(vector, zero, one, one, two, zero);
       setVector(dictionaryVector, zero, one, two);
 
-      Dictionary dictionary = new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
+      Dictionary dictionary =
+          new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
 
       try (final ValueVector encoded = DictionaryEncoder.encode(vector, dictionary)) {
         // verify indices
@@ -288,7 +294,8 @@ public void testEncodeBinaryVector() {
         assertEquals(0, index.get(4));
 
         // now run through the decoder and verify we get the original back
-        try (VarBinaryVector decoded = (VarBinaryVector) DictionaryEncoder.decode(encoded, dictionary)) {
+        try (VarBinaryVector decoded =
+            (VarBinaryVector) DictionaryEncoder.decode(encoded, dictionary)) {
           assertEquals(vector.getClass(), decoded.getClass());
           assertEquals(vector.getValueCount(), decoded.getValueCount());
           for (int i = 0; i < 5; i++) {
@@ -302,9 +309,10 @@ public void testEncodeBinaryVector() {
   @Test
   public void testEncodeUnion() {
     // Create a new value vector
-    try (final UnionVector vector = new UnionVector("vector", allocator, /* field type */ null, /* call-back */ null);
-         final UnionVector dictionaryVector =
-             new UnionVector("dict", allocator, /* field type */ null, /* call-back */ null);) {
+    try (final UnionVector vector =
+            new UnionVector("vector", allocator, /* field type */ null, /* call-back */ null);
+        final UnionVector dictionaryVector =
+            new UnionVector("dict", allocator, /* field type */ null, /* call-back */ null); ) {
 
       final NullableUInt4Holder uintHolder1 = new NullableUInt4Holder();
       uintHolder1.value = 10;
@@ -318,7 +326,7 @@ public void testEncodeUnion() {
       intHolder2.value = 20;
       intHolder2.isSet = 1;
 
-      //write data
+      // write data
       vector.setType(0, Types.MinorType.UINT4);
       vector.setSafe(0, uintHolder1);
 
@@ -336,7 +344,7 @@ public void testEncodeUnion() {
 
       vector.setValueCount(5);
 
-      //write dictionary
+      // write dictionary
       dictionaryVector.setType(0, Types.MinorType.UINT4);
       dictionaryVector.setSafe(0, uintHolder1);
 
@@ -348,7 +356,8 @@ public void testEncodeUnion() {
 
       dictionaryVector.setValueCount(3);
 
-      Dictionary dictionary = new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
+      Dictionary dictionary =
+          new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
 
       try (final ValueVector encoded = DictionaryEncoder.encode(vector, dictionary)) {
         // verify indices
@@ -376,9 +385,9 @@ public void testEncodeUnion() {
 
   @Test
   public void testIntEquals() {
-    //test Int
+    // test Int
     try (final IntVector vector1 = new IntVector("int", allocator);
-         final IntVector vector2 = new IntVector("int", allocator)) {
+        final IntVector vector2 = new IntVector("int", allocator)) {
 
       Dictionary dict1 = new Dictionary(vector1, new DictionaryEncoding(1L, false, null));
       Dictionary dict2 = new Dictionary(vector2, new DictionaryEncoding(1L, false, null));
@@ -396,7 +405,7 @@ public void testIntEquals() {
   @Test
   public void testVarcharEquals() {
     try (final VarCharVector vector1 = new VarCharVector("varchar", allocator);
-         final VarCharVector vector2 = new VarCharVector("varchar", allocator)) {
+        final VarCharVector vector2 = new VarCharVector("varchar", allocator)) {
 
       Dictionary dict1 = new Dictionary(vector1, new DictionaryEncoding(1L, false, null));
       Dictionary dict2 = new Dictionary(vector2, new DictionaryEncoding(1L, false, null));
@@ -414,7 +423,7 @@ public void testVarcharEquals() {
   @Test
   public void testVarBinaryEquals() {
     try (final VarBinaryVector vector1 = new VarBinaryVector("binary", allocator);
-         final VarBinaryVector vector2 = new VarBinaryVector("binary", allocator)) {
+        final VarBinaryVector vector2 = new VarBinaryVector("binary", allocator)) {
 
       Dictionary dict1 = new Dictionary(vector1, new DictionaryEncoding(1L, false, null));
       Dictionary dict2 = new Dictionary(vector2, new DictionaryEncoding(1L, false, null));
@@ -432,7 +441,7 @@ public void testVarBinaryEquals() {
   @Test
   public void testListEquals() {
     try (final ListVector vector1 = ListVector.empty("list", allocator);
-         final ListVector vector2 = ListVector.empty("list", allocator);) {
+        final ListVector vector2 = ListVector.empty("list", allocator); ) {
 
       Dictionary dict1 = new Dictionary(vector1, new DictionaryEncoding(1L, false, null));
       Dictionary dict2 = new Dictionary(vector2, new DictionaryEncoding(1L, false, null));
@@ -440,7 +449,7 @@ public void testListEquals() {
       UnionListWriter writer1 = vector1.getWriter();
       writer1.allocate();
 
-      //set some values
+      // set some values
       writeListVector(writer1, new int[] {1, 2});
       writeListVector(writer1, new int[] {3, 4});
       writeListVector(writer1, new int[] {5, 6});
@@ -449,7 +458,7 @@ public void testListEquals() {
       UnionListWriter writer2 = vector2.getWriter();
       writer2.allocate();
 
-      //set some values
+      // set some values
       writeListVector(writer2, new int[] {1, 2});
       writeListVector(writer2, new int[] {3, 4});
       writeListVector(writer2, new int[] {5, 6});
@@ -462,7 +471,7 @@ public void testListEquals() {
   @Test
   public void testStructEquals() {
     try (final StructVector vector1 = StructVector.empty("struct", allocator);
-         final StructVector vector2 = StructVector.empty("struct", allocator);) {
+        final StructVector vector2 = StructVector.empty("struct", allocator); ) {
       vector1.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
       vector1.addOrGet("f1", FieldType.nullable(new ArrowType.Int(64, true)), BigIntVector.class);
       vector2.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
@@ -491,9 +500,10 @@ public void testStructEquals() {
 
   @Test
   public void testUnionEquals() {
-    try (final UnionVector vector1 = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);
-         final UnionVector vector2 =
-             new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);) {
+    try (final UnionVector vector1 =
+            new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);
+        final UnionVector vector2 =
+            new UnionVector("union", allocator, /* field type */ null, /* call-back */ null); ) {
 
       final NullableUInt4Holder uInt4Holder = new NullableUInt4Holder();
       uInt4Holder.value = 10;
@@ -528,7 +538,7 @@ public void testUnionEquals() {
   public void testEncodeWithEncoderInstance() {
     // Create a new value vector
     try (final VarCharVector vector = newVarCharVector("vector", allocator);
-         final VarCharVector dictionaryVector = newVarCharVector("dict", allocator);) {
+        final VarCharVector dictionaryVector = newVarCharVector("dict", allocator); ) {
 
       setVector(vector, zero, one, one, two, zero);
       setVector(dictionaryVector, zero, one, two);
@@ -565,8 +575,8 @@ public void testEncodeWithEncoderInstance() {
   public void testEncodeMultiVectors() {
     // Create a new value vector
     try (final VarCharVector vector1 = newVarCharVector("vector1", allocator);
-         final VarCharVector vector2 = newVarCharVector("vector2", allocator);
-         final VarCharVector dictionaryVector = newVarCharVector("dict", allocator);) {
+        final VarCharVector vector2 = newVarCharVector("vector2", allocator);
+        final VarCharVector dictionaryVector = newVarCharVector("dict", allocator); ) {
 
       setVector(vector1, zero, one, one, two, zero);
       setVector(vector2, zero, one, one);
@@ -624,26 +634,27 @@ public void testEncodeMultiVectors() {
   public void testEncodeListSubField() {
     // Create a new value vector
     try (final ListVector vector = ListVector.empty("vector", allocator);
-         final ListVector dictionaryVector = ListVector.empty("dict", allocator);) {
+        final ListVector dictionaryVector = ListVector.empty("dict", allocator); ) {
 
       UnionListWriter writer = vector.getWriter();
       writer.allocate();
 
-      //set some values
-      writeListVector(writer, new int[]{10, 20});
-      writeListVector(writer, new int[]{10, 20});
-      writeListVector(writer, new int[]{10, 20});
-      writeListVector(writer, new int[]{30, 40, 50});
-      writeListVector(writer, new int[]{30, 40, 50});
-      writeListVector(writer, new int[]{10, 20});
+      // set some values
+      writeListVector(writer, new int[] {10, 20});
+      writeListVector(writer, new int[] {10, 20});
+      writeListVector(writer, new int[] {10, 20});
+      writeListVector(writer, new int[] {30, 40, 50});
+      writeListVector(writer, new int[] {30, 40, 50});
+      writeListVector(writer, new int[] {10, 20});
       writer.setValueCount(6);
 
       UnionListWriter dictWriter = dictionaryVector.getWriter();
       dictWriter.allocate();
-      writeListVector(dictWriter, new int[]{10, 20, 30, 40, 50});
+      writeListVector(dictWriter, new int[] {10, 20, 30, 40, 50});
       dictionaryVector.setValueCount(1);
 
-      Dictionary dictionary = new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
+      Dictionary dictionary =
+          new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
       ListSubfieldEncoder encoder = new ListSubfieldEncoder(dictionary, allocator);
 
       try (final ListVector encoded = (ListVector) encoder.encodeListSubField(vector)) {
@@ -680,13 +691,15 @@ public void testEncodeListSubField() {
   public void testEncodeFixedSizeListSubField() {
     // Create a new value vector
     try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", 2, allocator);
-        final FixedSizeListVector dictionaryVector = FixedSizeListVector.empty("dict", 2, allocator)) {
+        final FixedSizeListVector dictionaryVector =
+            FixedSizeListVector.empty("dict", 2, allocator)) {
 
       vector.allocateNew();
       vector.setValueCount(4);
 
       IntVector dataVector =
-          (IntVector) vector.addOrGetVector(FieldType.nullable(Types.MinorType.INT.getType())).getVector();
+          (IntVector)
+              vector.addOrGetVector(FieldType.nullable(Types.MinorType.INT.getType())).getVector();
       dataVector.allocateNew(8);
       dataVector.setValueCount(8);
       // set value at index 0
@@ -709,7 +722,10 @@ public void testEncodeFixedSizeListSubField() {
       dictionaryVector.allocateNew();
       dictionaryVector.setValueCount(2);
       IntVector dictDataVector =
-          (IntVector) dictionaryVector.addOrGetVector(FieldType.nullable(Types.MinorType.INT.getType())).getVector();
+          (IntVector)
+              dictionaryVector
+                  .addOrGetVector(FieldType.nullable(Types.MinorType.INT.getType()))
+                  .getVector();
       dictDataVector.allocateNew(4);
       dictDataVector.setValueCount(4);
 
@@ -720,7 +736,8 @@ public void testEncodeFixedSizeListSubField() {
       dictDataVector.set(2, 30);
       dictDataVector.set(3, 40);
 
-      Dictionary dictionary = new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
+      Dictionary dictionary =
+          new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
       ListSubfieldEncoder encoder = new ListSubfieldEncoder(dictionary, allocator);
 
       try (final FixedSizeListVector encoded =
@@ -753,15 +770,15 @@ public void testEncodeFixedSizeListSubField() {
   @Test
   public void testEncodeStructSubField() {
     try (final StructVector vector = StructVector.empty("vector", allocator);
-         final VarCharVector dictVector1 = new VarCharVector("f0", allocator);
-         final VarCharVector dictVector2 = new VarCharVector("f1", allocator)) {
+        final VarCharVector dictVector1 = new VarCharVector("f0", allocator);
+        final VarCharVector dictVector2 = new VarCharVector("f1", allocator)) {
 
       vector.addOrGet("f0", FieldType.nullable(ArrowType.Utf8.INSTANCE), VarCharVector.class);
       vector.addOrGet("f1", FieldType.nullable(ArrowType.Utf8.INSTANCE), VarCharVector.class);
 
       NullableStructWriter writer = vector.getWriter();
       writer.allocate();
-      //set some values
+      // set some values
       writeStructVector(writer, "aa", "baz");
       writeStructVector(writer, "bb", "bar");
       writeStructVector(writer, "cc", "foo");
@@ -770,15 +787,17 @@ public void testEncodeStructSubField() {
       writer.setValueCount(5);
 
       // initialize dictionaries
-      DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();
-
+      DictionaryProvider.MapDictionaryProvider provider =
+          new DictionaryProvider.MapDictionaryProvider();
 
-      setVector(dictVector1,
+      setVector(
+          dictVector1,
           "aa".getBytes(StandardCharsets.UTF_8),
           "bb".getBytes(StandardCharsets.UTF_8),
           "cc".getBytes(StandardCharsets.UTF_8),
           "dd".getBytes(StandardCharsets.UTF_8));
-      setVector(dictVector2,
+      setVector(
+          dictVector2,
           "foo".getBytes(StandardCharsets.UTF_8),
           "baz".getBytes(StandardCharsets.UTF_8),
           "bar".getBytes(StandardCharsets.UTF_8));
@@ -791,7 +810,8 @@ public void testEncodeStructSubField() {
       columnToDictionaryId.put(0, 1L);
       columnToDictionaryId.put(1, 2L);
 
-      try (final StructVector encoded = (StructVector) encoder.encode(vector, columnToDictionaryId)) {
+      try (final StructVector encoded =
+          (StructVector) encoder.encode(vector, columnToDictionaryId)) {
         // verify indices
         assertEquals(StructVector.class, encoded.getClass());
 
@@ -823,14 +843,14 @@ public void testEncodeStructSubField() {
   public void testEncodeStructSubFieldWithCertainColumns() {
     // in this case, some child vector is encoded and others are not
     try (final StructVector vector = StructVector.empty("vector", allocator);
-         final VarCharVector dictVector1 = new VarCharVector("f0", allocator)) {
+        final VarCharVector dictVector1 = new VarCharVector("f0", allocator)) {
 
       vector.addOrGet("f0", FieldType.nullable(ArrowType.Utf8.INSTANCE), VarCharVector.class);
       vector.addOrGet("f1", FieldType.nullable(ArrowType.Utf8.INSTANCE), VarCharVector.class);
 
       NullableStructWriter writer = vector.getWriter();
       writer.allocate();
-      //set some values
+      // set some values
       writeStructVector(writer, "aa", "baz");
       writeStructVector(writer, "bb", "bar");
       writeStructVector(writer, "cc", "foo");
@@ -839,17 +859,23 @@ public void testEncodeStructSubFieldWithCertainColumns() {
       writer.setValueCount(5);
 
       // initialize dictionaries
-      DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();
+      DictionaryProvider.MapDictionaryProvider provider =
+          new DictionaryProvider.MapDictionaryProvider();
 
-      setVector(dictVector1, "aa".getBytes(StandardCharsets.UTF_8), "bb".getBytes(StandardCharsets.UTF_8),
-          "cc".getBytes(StandardCharsets.UTF_8), "dd".getBytes(StandardCharsets.UTF_8));
+      setVector(
+          dictVector1,
+          "aa".getBytes(StandardCharsets.UTF_8),
+          "bb".getBytes(StandardCharsets.UTF_8),
+          "cc".getBytes(StandardCharsets.UTF_8),
+          "dd".getBytes(StandardCharsets.UTF_8));
 
       provider.put(new Dictionary(dictVector1, new DictionaryEncoding(1L, false, null)));
       StructSubfieldEncoder encoder = new StructSubfieldEncoder(allocator, provider);
       Map<Integer, Long> columnToDictionaryId = new HashMap<>();
       columnToDictionaryId.put(0, 1L);
 
-      try (final StructVector encoded = (StructVector) encoder.encode(vector, columnToDictionaryId)) {
+      try (final StructVector encoded =
+          (StructVector) encoder.encode(vector, columnToDictionaryId)) {
         // verify indices
         assertEquals(StructVector.class, encoded.getClass());
 
@@ -874,7 +900,6 @@ public void testEncodeStructSubFieldWithCertainColumns() {
           }
         }
       }
-
     }
   }
 
@@ -882,13 +907,13 @@ public void testEncodeStructSubFieldWithCertainColumns() {
   public void testNoMemoryLeak() {
     // test no memory leak when encode
     try (final VarCharVector vector = newVarCharVector("foo", allocator);
-         final VarCharVector dictionaryVector = newVarCharVector("dict", allocator)) {
+        final VarCharVector dictionaryVector = newVarCharVector("dict", allocator)) {
 
       setVector(vector, zero, one, two);
       setVector(dictionaryVector, zero, one);
 
       Dictionary dictionary =
-              new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
+          new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
 
       try (final ValueVector encoded = DictionaryEncoder.encode(vector, dictionary)) {
         fail("There should be an exception when encoding");
@@ -896,17 +921,17 @@ public void testNoMemoryLeak() {
         assertEquals("Dictionary encoding not defined for value:" + new Text(two), e.getMessage());
       }
     }
-    assertEquals("encode memory leak", 0, allocator.getAllocatedMemory());
+    assertEquals(0, allocator.getAllocatedMemory(), "encode memory leak");
 
     // test no memory leak when decode
     try (final IntVector indices = newVector(IntVector.class, "", Types.MinorType.INT, allocator);
-         final VarCharVector dictionaryVector = newVarCharVector("dict", allocator)) {
+        final VarCharVector dictionaryVector = newVarCharVector("dict", allocator)) {
 
       setVector(indices, 3);
       setVector(dictionaryVector, zero, one);
 
       Dictionary dictionary =
-              new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
+          new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
 
       try (final ValueVector decoded = DictionaryEncoder.decode(indices, dictionary, allocator)) {
         fail("There should be an exception when decoding");
@@ -914,26 +939,27 @@ public void testNoMemoryLeak() {
         assertEquals("Provided dictionary does not contain value for index 3", e.getMessage());
       }
     }
-    assertEquals("decode memory leak", 0, allocator.getAllocatedMemory());
+    assertEquals(0, allocator.getAllocatedMemory(), "decode memory leak");
   }
 
   @Test
   public void testListNoMemoryLeak() {
     // Create a new value vector
     try (final ListVector vector = ListVector.empty("vector", allocator);
-         final ListVector dictionaryVector = ListVector.empty("dict", allocator)) {
+        final ListVector dictionaryVector = ListVector.empty("dict", allocator)) {
 
       UnionListWriter writer = vector.getWriter();
       writer.allocate();
-      writeListVector(writer, new int[]{10, 20});
+      writeListVector(writer, new int[] {10, 20});
       writer.setValueCount(1);
 
       UnionListWriter dictWriter = dictionaryVector.getWriter();
       dictWriter.allocate();
-      writeListVector(dictWriter, new int[]{10});
+      writeListVector(dictWriter, new int[] {10});
       dictionaryVector.setValueCount(1);
 
-      Dictionary dictionary = new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
+      Dictionary dictionary =
+          new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
       ListSubfieldEncoder encoder = new ListSubfieldEncoder(dictionary, allocator);
 
       try (final ListVector encoded = (ListVector) encoder.encodeListSubField(vector)) {
@@ -942,38 +968,39 @@ public void testListNoMemoryLeak() {
         assertEquals("Dictionary encoding not defined for value:20", e.getMessage());
       }
     }
-    assertEquals("list encode memory leak", 0, allocator.getAllocatedMemory());
+    assertEquals(0, allocator.getAllocatedMemory(), "list encode memory leak");
 
     try (final ListVector indices = ListVector.empty("indices", allocator);
-         final ListVector dictionaryVector = ListVector.empty("dict", allocator)) {
+        final ListVector dictionaryVector = ListVector.empty("dict", allocator)) {
 
       UnionListWriter writer = indices.getWriter();
       writer.allocate();
-      writeListVector(writer, new int[]{3});
+      writeListVector(writer, new int[] {3});
       writer.setValueCount(1);
 
       UnionListWriter dictWriter = dictionaryVector.getWriter();
       dictWriter.allocate();
-      writeListVector(dictWriter, new int[]{10, 20});
+      writeListVector(dictWriter, new int[] {10, 20});
       dictionaryVector.setValueCount(1);
 
       Dictionary dictionary =
-              new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
+          new Dictionary(dictionaryVector, new DictionaryEncoding(1L, false, null));
 
-      try (final ValueVector decoded = ListSubfieldEncoder.decodeListSubField(indices, dictionary, allocator)) {
+      try (final ValueVector decoded =
+          ListSubfieldEncoder.decodeListSubField(indices, dictionary, allocator)) {
         fail("There should be an exception when decoding");
       } catch (Exception e) {
         assertEquals("Provided dictionary does not contain value for index 3", e.getMessage());
       }
     }
-    assertEquals("list decode memory leak", 0, allocator.getAllocatedMemory());
+    assertEquals(0, allocator.getAllocatedMemory(), "list decode memory leak");
   }
 
   @Test
   public void testStructNoMemoryLeak() {
     try (final StructVector vector = StructVector.empty("vector", allocator);
-         final VarCharVector dictVector1 = new VarCharVector("f0", allocator);
-         final VarCharVector dictVector2 = new VarCharVector("f1", allocator)) {
+        final VarCharVector dictVector1 = new VarCharVector("f0", allocator);
+        final VarCharVector dictVector2 = new VarCharVector("f1", allocator)) {
 
       vector.addOrGet("f0", FieldType.nullable(ArrowType.Utf8.INSTANCE), VarCharVector.class);
       vector.addOrGet("f1", FieldType.nullable(ArrowType.Utf8.INSTANCE), VarCharVector.class);
@@ -983,11 +1010,10 @@ public void testStructNoMemoryLeak() {
       writeStructVector(writer, "aa", "baz");
       writer.setValueCount(1);
 
-      DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();
-      setVector(dictVector1,
-              "aa".getBytes(StandardCharsets.UTF_8));
-      setVector(dictVector2,
-              "foo".getBytes(StandardCharsets.UTF_8));
+      DictionaryProvider.MapDictionaryProvider provider =
+          new DictionaryProvider.MapDictionaryProvider();
+      setVector(dictVector1, "aa".getBytes(StandardCharsets.UTF_8));
+      setVector(dictVector2, "foo".getBytes(StandardCharsets.UTF_8));
 
       provider.put(new Dictionary(dictVector1, new DictionaryEncoding(1L, false, null)));
       provider.put(new Dictionary(dictVector2, new DictionaryEncoding(2L, false, null)));
@@ -997,34 +1023,32 @@ public void testStructNoMemoryLeak() {
       columnToDictionaryId.put(0, 1L);
       columnToDictionaryId.put(1, 2L);
 
-      try (final StructVector encoded = (StructVector) encoder.encode(vector, columnToDictionaryId)) {
+      try (final StructVector encoded =
+          (StructVector) encoder.encode(vector, columnToDictionaryId)) {
         fail("There should be an exception when encoding");
       } catch (Exception e) {
         assertEquals("Dictionary encoding not defined for value:baz", e.getMessage());
       }
     }
-    assertEquals("struct encode memory leak", 0, allocator.getAllocatedMemory());
+    assertEquals(0, allocator.getAllocatedMemory(), "struct encode memory leak");
 
     try (final StructVector indices = StructVector.empty("indices", allocator);
-         final VarCharVector dictVector1 = new VarCharVector("f0", allocator);
-         final VarCharVector dictVector2 = new VarCharVector("f1", allocator)) {
+        final VarCharVector dictVector1 = new VarCharVector("f0", allocator);
+        final VarCharVector dictVector2 = new VarCharVector("f1", allocator)) {
 
-      DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();
-      setVector(dictVector1,
-              "aa".getBytes(StandardCharsets.UTF_8));
-      setVector(dictVector2,
-              "foo".getBytes(StandardCharsets.UTF_8));
+      DictionaryProvider.MapDictionaryProvider provider =
+          new DictionaryProvider.MapDictionaryProvider();
+      setVector(dictVector1, "aa".getBytes(StandardCharsets.UTF_8));
+      setVector(dictVector2, "foo".getBytes(StandardCharsets.UTF_8));
 
       provider.put(new Dictionary(dictVector1, new DictionaryEncoding(1L, false, null)));
       provider.put(new Dictionary(dictVector2, new DictionaryEncoding(2L, false, null)));
 
       ArrowType int32 = new ArrowType.Int(32, true);
-      indices.addOrGet("f0",
-              new FieldType(true, int32, provider.lookup(1L).getEncoding()),
-              IntVector.class);
-      indices.addOrGet("f1",
-              new FieldType(true, int32, provider.lookup(2L).getEncoding()),
-              IntVector.class);
+      indices.addOrGet(
+          "f0", new FieldType(true, int32, provider.lookup(1L).getEncoding()), IntVector.class);
+      indices.addOrGet(
+          "f1", new FieldType(true, int32, provider.lookup(2L).getEncoding()), IntVector.class);
 
       NullableStructWriter writer = indices.getWriter();
       writer.allocate();
@@ -1040,10 +1064,11 @@ public void testStructNoMemoryLeak() {
         assertEquals("Provided dictionary does not contain value for index 3", e.getMessage());
       }
     }
-    assertEquals("struct decode memory leak", 0, allocator.getAllocatedMemory());
+    assertEquals(0, allocator.getAllocatedMemory(), "struct decode memory leak");
   }
 
-  private void testDictionary(Dictionary dictionary, ToIntBiFunction<ValueVector, Integer> valGetter) {
+  private void testDictionary(
+      Dictionary dictionary, ToIntBiFunction<ValueVector, Integer> valGetter) {
     try (VarCharVector vector = new VarCharVector("vector", allocator)) {
       setVector(vector, "1", "3", "5", "7", "9");
       try (ValueVector encodedVector = DictionaryEncoder.encode(vector, dictionary)) {
@@ -1059,11 +1084,16 @@ private void testDictionary(Dictionary dictionary, ToIntBiFunction<ValueVector,
         try (ValueVector decodedVector = DictionaryEncoder.decode(encodedVector, dictionary)) {
           assertTrue(decodedVector instanceof VarCharVector);
           assertEquals(vector.getValueCount(), decodedVector.getValueCount());
-          assertArrayEquals("1".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decodedVector).get(0));
-          assertArrayEquals("3".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decodedVector).get(1));
-          assertArrayEquals("5".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decodedVector).get(2));
-          assertArrayEquals("7".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decodedVector).get(3));
-          assertArrayEquals("9".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decodedVector).get(4));
+          assertArrayEquals(
+              "1".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decodedVector).get(0));
+          assertArrayEquals(
+              "3".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decodedVector).get(1));
+          assertArrayEquals(
+              "5".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decodedVector).get(2));
+          assertArrayEquals(
+              "7".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decodedVector).get(3));
+          assertArrayEquals(
+              "9".getBytes(StandardCharsets.UTF_8), ((VarCharVector) decodedVector).get(4));
         }
       }
     }
@@ -1073,9 +1103,13 @@ private void testDictionary(Dictionary dictionary, ToIntBiFunction<ValueVector,
   public void testDictionaryUInt1() {
     try (VarCharVector dictionaryVector = new VarCharVector("dict vector", allocator)) {
       setVector(dictionaryVector, "0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
-      Dictionary dictionary1 = new Dictionary(dictionaryVector,
-          new DictionaryEncoding(/*id=*/10L, /*ordered=*/false,
-              /*indexType=*/new ArrowType.Int(/*bitWidth*/8, /*isSigned*/false)));
+      Dictionary dictionary1 =
+          new Dictionary(
+              dictionaryVector,
+              new DictionaryEncoding(
+                  /*id=*/ 10L,
+                  /*ordered=*/ false,
+                  /*indexType=*/ new ArrowType.Int(/*bitWidth*/ 8, /*isSigned*/ false)));
       testDictionary(dictionary1, (vector, index) -> ((UInt1Vector) vector).get(index));
     }
   }
@@ -1084,9 +1118,13 @@ public void testDictionaryUInt1() {
   public void testDictionaryUInt2() {
     try (VarCharVector dictionaryVector = new VarCharVector("dict vector", allocator)) {
       setVector(dictionaryVector, "0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
-      Dictionary dictionary2 = new Dictionary(dictionaryVector,
-          new DictionaryEncoding(/*id=*/20L, /*ordered=*/false,
-              /*indexType=*/new ArrowType.Int(/*bitWidth=*/16, /*isSigned*/false)));
+      Dictionary dictionary2 =
+          new Dictionary(
+              dictionaryVector,
+              new DictionaryEncoding(
+                  /*id=*/ 20L,
+                  /*ordered=*/ false,
+                  /*indexType=*/ new ArrowType.Int(/*bitWidth=*/ 16, /*isSigned*/ false)));
       testDictionary(dictionary2, (vector, index) -> ((UInt2Vector) vector).get(index));
     }
   }
@@ -1095,9 +1133,13 @@ public void testDictionaryUInt2() {
   public void testDictionaryUInt4() {
     try (VarCharVector dictionaryVector = new VarCharVector("dict vector", allocator)) {
       setVector(dictionaryVector, "0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
-      Dictionary dictionary4 = new Dictionary(dictionaryVector,
-          new DictionaryEncoding(/*id=*/30L, /*ordered=*/false,
-              /*indexType=*/new ArrowType.Int(/*bitWidth=*/32, /*isSigned*/false)));
+      Dictionary dictionary4 =
+          new Dictionary(
+              dictionaryVector,
+              new DictionaryEncoding(
+                  /*id=*/ 30L,
+                  /*ordered=*/ false,
+                  /*indexType=*/ new ArrowType.Int(/*bitWidth=*/ 32, /*isSigned*/ false)));
       testDictionary(dictionary4, (vector, index) -> ((UInt4Vector) vector).get(index));
     }
   }
@@ -1106,9 +1148,13 @@ public void testDictionaryUInt4() {
   public void testDictionaryUInt8() {
     try (VarCharVector dictionaryVector = new VarCharVector("dict vector", allocator)) {
       setVector(dictionaryVector, "0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
-      Dictionary dictionary8 = new Dictionary(dictionaryVector,
-              new DictionaryEncoding(/*id=*/40L, /*ordered=*/false,
-                  /*indexType=*/new ArrowType.Int(/*bitWidth=*/64, /*isSigned*/false)));
+      Dictionary dictionary8 =
+          new Dictionary(
+              dictionaryVector,
+              new DictionaryEncoding(
+                  /*id=*/ 40L,
+                  /*ordered=*/ false,
+                  /*indexType=*/ new ArrowType.Int(/*bitWidth=*/ 64, /*isSigned*/ false)));
       testDictionary(dictionary8, (vector, index) -> (int) ((UInt8Vector) vector).get(index));
     }
   }
@@ -1124,19 +1170,25 @@ public void testDictionaryUIntOverflow() {
       }
       dictionaryVector.setValueCount(vecLength);
 
-      Dictionary dictionary = new Dictionary(dictionaryVector,
-          new DictionaryEncoding(/*id=*/10L, /*ordered=*/false,
-              /*indexType=*/new ArrowType.Int(/*bitWidth=*/8, /*isSigned*/false)));
+      Dictionary dictionary =
+          new Dictionary(
+              dictionaryVector,
+              new DictionaryEncoding(
+                  /*id=*/ 10L,
+                  /*ordered=*/ false,
+                  /*indexType=*/ new ArrowType.Int(/*bitWidth=*/ 8, /*isSigned*/ false)));
 
       try (VarCharVector vector = new VarCharVector("vector", allocator)) {
         setVector(vector, "255");
-        try (UInt1Vector encodedVector = (UInt1Vector) DictionaryEncoder.encode(vector, dictionary)) {
+        try (UInt1Vector encodedVector =
+            (UInt1Vector) DictionaryEncoder.encode(vector, dictionary)) {
 
           // verify encoded result
           assertEquals(1, encodedVector.getValueCount());
           assertEquals(255, encodedVector.getValueAsLong(0));
 
-          try (VarCharVector decodedVector = (VarCharVector) DictionaryEncoder.decode(encodedVector, dictionary)) {
+          try (VarCharVector decodedVector =
+              (VarCharVector) DictionaryEncoder.decode(encodedVector, dictionary)) {
             assertEquals(1, decodedVector.getValueCount());
             assertArrayEquals("255".getBytes(StandardCharsets.UTF_8), decodedVector.get(0));
           }
@@ -1186,7 +1238,7 @@ private void writeStructVector(NullableStructWriter writer, int value1, long val
 
   private void writeListVector(UnionListWriter writer, int[] values) {
     writer.startList();
-    for (int v: values) {
+    for (int v : values) {
       writer.integer().writeInt(v);
     }
     writer.endList();
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestDurationVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestDurationVector.java
index c5d4d296cc024..5879a3f104608 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestDurationVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestDurationVector.java
@@ -14,41 +14,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.time.Duration;
-
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.holders.NullableDurationHolder;
 import org.apache.arrow.vector.types.TimeUnit;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestDurationVector {
   RootAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
   }
 
-  @After
+  @AfterEach
   public void terminate() {
     allocator.close();
   }
 
   @Test
   public void testSecBasics() {
-    try (DurationVector secVector = TestUtils.newVector(DurationVector.class, "second",
-        new ArrowType.Duration(TimeUnit.SECOND), allocator)) {
+    try (DurationVector secVector =
+        TestUtils.newVector(
+            DurationVector.class, "second", new ArrowType.Duration(TimeUnit.SECOND), allocator)) {
 
       secVector.allocateNew();
       secVector.setNull(0);
@@ -63,15 +62,19 @@ public void testSecBasics() {
       secVector.get(0, holder);
       assertEquals(0, holder.isSet);
       secVector.get(1, holder);
-      assertEquals(1 , holder.isSet);
-      assertEquals(1000 , holder.value);
+      assertEquals(1, holder.isSet);
+      assertEquals(1000, holder.value);
     }
   }
 
   @Test
   public void testMilliBasics() {
-    try (DurationVector milliVector = TestUtils.newVector(DurationVector.class, "nanos",
-        new ArrowType.Duration(TimeUnit.MILLISECOND), allocator)) {
+    try (DurationVector milliVector =
+        TestUtils.newVector(
+            DurationVector.class,
+            "nanos",
+            new ArrowType.Duration(TimeUnit.MILLISECOND),
+            allocator)) {
 
       milliVector.allocateNew();
       milliVector.setNull(0);
@@ -86,15 +89,19 @@ public void testMilliBasics() {
       milliVector.get(0, holder);
       assertEquals(0, holder.isSet);
       milliVector.get(1, holder);
-      assertEquals(1 , holder.isSet);
-      assertEquals(1000 , holder.value);
+      assertEquals(1, holder.isSet);
+      assertEquals(1000, holder.value);
     }
   }
 
   @Test
   public void testMicroBasics() {
-    try (DurationVector microVector = TestUtils.newVector(DurationVector.class, "micro",
-        new ArrowType.Duration(TimeUnit.MICROSECOND), allocator)) {
+    try (DurationVector microVector =
+        TestUtils.newVector(
+            DurationVector.class,
+            "micro",
+            new ArrowType.Duration(TimeUnit.MICROSECOND),
+            allocator)) {
 
       microVector.allocateNew();
       microVector.setNull(0);
@@ -109,15 +116,19 @@ public void testMicroBasics() {
       microVector.get(0, holder);
       assertEquals(0, holder.isSet);
       microVector.get(1, holder);
-      assertEquals(1 , holder.isSet);
-      assertEquals(1000 , holder.value);
+      assertEquals(1, holder.isSet);
+      assertEquals(1000, holder.value);
     }
   }
 
   @Test
   public void testNanosBasics() {
-    try (DurationVector nanoVector = TestUtils.newVector(DurationVector.class, "nanos",
-        new ArrowType.Duration(TimeUnit.NANOSECOND), allocator)) {
+    try (DurationVector nanoVector =
+        TestUtils.newVector(
+            DurationVector.class,
+            "nanos",
+            new ArrowType.Duration(TimeUnit.NANOSECOND),
+            allocator)) {
 
       nanoVector.allocateNew();
       nanoVector.setNull(0);
@@ -132,18 +143,20 @@ public void testNanosBasics() {
       nanoVector.get(0, holder);
       assertEquals(0, holder.isSet);
       nanoVector.get(1, holder);
-      assertEquals(1 , holder.isSet);
-      assertEquals(1000000 , holder.value);
+      assertEquals(1, holder.isSet);
+      assertEquals(1000000, holder.value);
     }
   }
 
   @Test
   public void testGetTransferPairWithField() {
-    final DurationVector fromVector = TestUtils.newVector(DurationVector.class, "nanos",
-        new ArrowType.Duration(TimeUnit.NANOSECOND), allocator);
+    final DurationVector fromVector =
+        TestUtils.newVector(
+            DurationVector.class, "nanos", new ArrowType.Duration(TimeUnit.NANOSECOND), allocator);
     final TransferPair transferPair = fromVector.getTransferPair(fromVector.getField(), allocator);
     final DurationVector toVector = (DurationVector) transferPair.getTo();
-    // Field inside a new vector created by reusing a field should be the same in memory as the original field.
+    // Field inside a new vector created by reusing a field should be the same in memory as the
+    // original field.
     assertSame(fromVector.getField(), toVector.getField());
   }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeBinaryVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeBinaryVector.java
index b9cd89e4ad731..040bd9f7dc791 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeBinaryVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeBinaryVector.java
@@ -14,11 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
@@ -26,9 +29,9 @@
 import org.apache.arrow.vector.holders.NullableFixedSizeBinaryHolder;
 import org.apache.arrow.vector.util.ReusableByteArray;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestFixedSizeBinaryVector {
   private static final int numValues = 123;
@@ -49,7 +52,8 @@ public class TestFixedSizeBinaryVector {
 
   private ArrowBuf[] bufs = new ArrowBuf[numValues];
   private FixedSizeBinaryHolder[] holders = new FixedSizeBinaryHolder[numValues];
-  private NullableFixedSizeBinaryHolder[] nullableHolders = new NullableFixedSizeBinaryHolder[numValues];
+  private NullableFixedSizeBinaryHolder[] nullableHolders =
+      new NullableFixedSizeBinaryHolder[numValues];
 
   private static byte[] smallValue;
 
@@ -84,8 +88,7 @@ private static void failWithException(String message) throws Exception {
     throw new Exception(message);
   }
 
-
-  @Before
+  @BeforeEach
   public void init() throws Exception {
     allocator = new DirtyRootAllocator(Integer.MAX_VALUE, (byte) 100);
     vector = new FixedSizeBinaryVector("fixedSizeBinary", allocator, typeWidth);
@@ -128,7 +131,7 @@ public void init() throws Exception {
     largeNullableHolder.buffer = largeBuf;
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     for (int i = 0; i < numValues; i++) {
       bufs[i].close();
@@ -156,9 +159,12 @@ public void testSetUsingNull() {
     final byte[] value = null;
     for (int i = 0; i < numValues; i++) {
       final int index = i;
-      Exception e = assertThrows(NullPointerException.class, () -> {
-        vector.set(index, value);
-      });
+      Exception e =
+          assertThrows(
+              NullPointerException.class,
+              () -> {
+                vector.set(index, value);
+              });
       assertEquals("expecting a valid byte array", e.getMessage());
     }
   }
@@ -281,10 +287,12 @@ public void testGetNull() {
 
   @Test
   public void testGetTransferPairWithField() {
-    final FixedSizeBinaryVector fromVector = new FixedSizeBinaryVector("fixedSizeBinary", allocator, typeWidth);
+    final FixedSizeBinaryVector fromVector =
+        new FixedSizeBinaryVector("fixedSizeBinary", allocator, typeWidth);
     final TransferPair transferPair = fromVector.getTransferPair(fromVector.getField(), allocator);
     final FixedSizeBinaryVector toVector = (FixedSizeBinaryVector) transferPair.getTo();
-    // Field inside a new vector created by reusing a field should be the same in memory as the original field.
+    // Field inside a new vector created by reusing a field should be the same in memory as the
+    // original field.
     assertSame(fromVector.getField(), toVector.getField());
   }
 
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeListVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeListVector.java
index bde6dd491dd71..fc220e0f05a14 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeListVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeListVector.java
@@ -14,21 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.FixedSizeListVector;
 import org.apache.arrow.vector.complex.ListVector;
@@ -41,29 +40,30 @@
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.util.Text;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestFixedSizeListVector {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
 
   @Test
   public void testIntType() {
-    try (FixedSizeListVector vector = FixedSizeListVector.empty("list", /*size=*/2, allocator)) {
-      IntVector nested = (IntVector) vector.addOrGetVector(FieldType.nullable(MinorType.INT.getType())).getVector();
+    try (FixedSizeListVector vector = FixedSizeListVector.empty("list", /*size=*/ 2, allocator)) {
+      IntVector nested =
+          (IntVector)
+              vector.addOrGetVector(FieldType.nullable(MinorType.INT.getType())).getVector();
       vector.allocateNew();
 
       for (int i = 0; i < 10; i++) {
@@ -76,12 +76,12 @@ public void testIntType() {
       UnionFixedSizeListReader reader = vector.getReader();
       for (int i = 0; i < 10; i++) {
         reader.setPosition(i);
-        Assert.assertTrue(reader.isSet());
-        Assert.assertTrue(reader.next());
+        assertTrue(reader.isSet());
+        assertTrue(reader.next());
         assertEquals(i, reader.reader().readInteger().intValue());
-        Assert.assertTrue(reader.next());
+        assertTrue(reader.next());
         assertEquals(i + 10, reader.reader().readInteger().intValue());
-        Assert.assertFalse(reader.next());
+        assertFalse(reader.next());
         assertEquals(Arrays.asList(i, i + 10), reader.readObject());
       }
     }
@@ -89,9 +89,10 @@ public void testIntType() {
 
   @Test
   public void testFloatTypeNullable() {
-    try (FixedSizeListVector vector = FixedSizeListVector.empty("list", /*size=*/2, allocator)) {
-      Float4Vector nested = (Float4Vector) vector.addOrGetVector(FieldType.nullable(MinorType.FLOAT4.getType()))
-          .getVector();
+    try (FixedSizeListVector vector = FixedSizeListVector.empty("list", /*size=*/ 2, allocator)) {
+      Float4Vector nested =
+          (Float4Vector)
+              vector.addOrGetVector(FieldType.nullable(MinorType.FLOAT4.getType())).getVector();
       vector.allocateNew();
 
       for (int i = 0; i < 10; i++) {
@@ -107,16 +108,16 @@ public void testFloatTypeNullable() {
       for (int i = 0; i < 10; i++) {
         reader.setPosition(i);
         if (i % 2 == 0) {
-          Assert.assertTrue(reader.isSet());
-          Assert.assertTrue(reader.next());
+          assertTrue(reader.isSet());
+          assertTrue(reader.next());
           assertEquals(i + 0.1f, reader.reader().readFloat(), 0.00001);
-          Assert.assertTrue(reader.next());
+          assertTrue(reader.next());
           assertEquals(i + 10.1f, reader.reader().readFloat(), 0.00001);
-          Assert.assertFalse(reader.next());
+          assertFalse(reader.next());
           assertEquals(Arrays.asList(i + 0.1f, i + 10.1f), reader.readObject());
         } else {
-          Assert.assertFalse(reader.isSet());
-          Assert.assertNull(reader.readObject());
+          assertFalse(reader.isSet());
+          assertNull(reader.readObject());
         }
       }
     }
@@ -125,10 +126,12 @@ public void testFloatTypeNullable() {
   @Test
   public void testNestedInList() {
     try (ListVector vector = ListVector.empty("list", allocator)) {
-      FixedSizeListVector tuples = (FixedSizeListVector) vector.addOrGetVector(
-          FieldType.nullable(new ArrowType.FixedSizeList(2))).getVector();
-      IntVector innerVector = (IntVector) tuples.addOrGetVector(FieldType.nullable(MinorType.INT.getType()))
-          .getVector();
+      FixedSizeListVector tuples =
+          (FixedSizeListVector)
+              vector.addOrGetVector(FieldType.nullable(new ArrowType.FixedSizeList(2))).getVector();
+      IntVector innerVector =
+          (IntVector)
+              tuples.addOrGetVector(FieldType.nullable(MinorType.INT.getType())).getVector();
       vector.allocateNew();
 
       for (int i = 0; i < 10; i++) {
@@ -149,18 +152,18 @@ public void testNestedInList() {
         reader.setPosition(i);
         if (i % 2 == 0) {
           for (int j = 0; j < i % 7; j++) {
-            Assert.assertTrue(reader.next());
+            assertTrue(reader.next());
             FieldReader innerListReader = reader.reader();
             for (int k = 0; k < 2; k++) {
-              Assert.assertTrue(innerListReader.next());
+              assertTrue(innerListReader.next());
               assertEquals(k + j, innerListReader.reader().readInteger().intValue());
             }
-            Assert.assertFalse(innerListReader.next());
+            assertFalse(innerListReader.next());
           }
-          Assert.assertFalse(reader.next());
+          assertFalse(reader.next());
         } else {
-          Assert.assertFalse(reader.isSet());
-          Assert.assertNull(reader.readObject());
+          assertFalse(reader.isSet());
+          assertNull(reader.readObject());
         }
       }
     }
@@ -168,12 +171,18 @@ public void testNestedInList() {
 
   @Test
   public void testTransferPair() {
-    try (FixedSizeListVector from = new FixedSizeListVector(
-        "from", allocator, new FieldType(true, new ArrowType.FixedSizeList(2), null), null);
-         FixedSizeListVector to = new FixedSizeListVector(
-             "to", allocator, new FieldType(true, new ArrowType.FixedSizeList(2), null), null)) {
-      Float4Vector nested = (Float4Vector) from.addOrGetVector(FieldType.nullable(MinorType.FLOAT4.getType()))
-          .getVector();
+    try (FixedSizeListVector from =
+            new FixedSizeListVector(
+                "from",
+                allocator,
+                new FieldType(true, new ArrowType.FixedSizeList(2), null),
+                null);
+        FixedSizeListVector to =
+            new FixedSizeListVector(
+                "to", allocator, new FieldType(true, new ArrowType.FixedSizeList(2), null), null)) {
+      Float4Vector nested =
+          (Float4Vector)
+              from.addOrGetVector(FieldType.nullable(MinorType.FLOAT4.getType())).getVector();
       from.allocateNew();
 
       for (int i = 0; i < 10; i++) {
@@ -196,53 +205,54 @@ public void testTransferPair() {
       UnionFixedSizeListReader reader = to.getReader();
 
       reader.setPosition(0);
-      Assert.assertFalse(reader.isSet());
-      Assert.assertNull(reader.readObject());
+      assertFalse(reader.isSet());
+      assertNull(reader.readObject());
 
       reader.setPosition(1);
-      Assert.assertTrue(reader.isSet());
-      Assert.assertTrue(reader.next());
+      assertTrue(reader.isSet());
+      assertTrue(reader.next());
       assertEquals(0.1f, reader.reader().readFloat(), 0.00001);
-      Assert.assertTrue(reader.next());
+      assertTrue(reader.next());
       assertEquals(10.1f, reader.reader().readFloat(), 0.00001);
-      Assert.assertFalse(reader.next());
+      assertFalse(reader.next());
       assertEquals(Arrays.asList(0.1f, 10.1f), reader.readObject());
 
       reader.setPosition(2);
-      Assert.assertTrue(reader.isSet());
-      Assert.assertTrue(reader.next());
+      assertTrue(reader.isSet());
+      assertTrue(reader.next());
       assertEquals(2.1f, reader.reader().readFloat(), 0.00001);
-      Assert.assertTrue(reader.next());
+      assertTrue(reader.next());
       assertEquals(12.1f, reader.reader().readFloat(), 0.00001);
-      Assert.assertFalse(reader.next());
+      assertFalse(reader.next());
       assertEquals(Arrays.asList(2.1f, 12.1f), reader.readObject());
 
       reader.setPosition(3);
-      Assert.assertTrue(reader.isSet());
-      Assert.assertTrue(reader.next());
+      assertTrue(reader.isSet());
+      assertTrue(reader.next());
       assertEquals(4.1f, reader.reader().readFloat(), 0.00001);
-      Assert.assertTrue(reader.next());
+      assertTrue(reader.next());
       assertEquals(14.1f, reader.reader().readFloat(), 0.00001);
-      Assert.assertFalse(reader.next());
+      assertFalse(reader.next());
       assertEquals(Arrays.asList(4.1f, 14.1f), reader.readObject());
 
       for (int i = 4; i < 10; i++) {
         reader.setPosition(i);
-        Assert.assertFalse(reader.isSet());
-        Assert.assertNull(reader.readObject());
+        assertFalse(reader.isSet());
+        assertNull(reader.readObject());
       }
     }
   }
 
   @Test
   public void testConsistentChildName() throws Exception {
-    try (FixedSizeListVector listVector = FixedSizeListVector.empty("sourceVector", /*size=*/2, allocator)) {
+    try (FixedSizeListVector listVector =
+        FixedSizeListVector.empty("sourceVector", /*size=*/ 2, allocator)) {
       String emptyListStr = listVector.getField().toString();
-      Assert.assertTrue(emptyListStr.contains(ListVector.DATA_VECTOR_NAME));
+      assertTrue(emptyListStr.contains(ListVector.DATA_VECTOR_NAME));
 
       listVector.addOrGetVector(FieldType.nullable(MinorType.INT.getType()));
       String emptyVectorStr = listVector.getField().toString();
-      Assert.assertTrue(emptyVectorStr.contains(ListVector.DATA_VECTOR_NAME));
+      assertTrue(emptyVectorStr.contains(ListVector.DATA_VECTOR_NAME));
     }
   }
 
@@ -252,7 +262,8 @@ public void testUnionFixedSizeListWriterWithNulls() throws Exception {
      * each list of size 3 and having its data values alternating between null and a non-null.
      * Read and verify
      */
-    try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*size=*/3, allocator)) {
+    try (final FixedSizeListVector vector =
+        FixedSizeListVector.empty("vector", /*size=*/ 3, allocator)) {
 
       UnionFixedSizeListWriter writer = vector.getWriter();
       writer.allocate();
@@ -280,7 +291,8 @@ public void testUnionFixedSizeListWriterWithNulls() throws Exception {
 
   @Test
   public void testUnionFixedSizeListWriter() throws Exception {
-    try (final FixedSizeListVector vector1 = FixedSizeListVector.empty("vector", /*size=*/3, allocator)) {
+    try (final FixedSizeListVector vector1 =
+        FixedSizeListVector.empty("vector", /*size=*/ 3, allocator)) {
 
       UnionFixedSizeListWriter writer1 = vector1.getWriter();
       writer1.allocate();
@@ -289,7 +301,7 @@ public void testUnionFixedSizeListWriter() throws Exception {
       int[] values2 = new int[] {4, 5, 6};
       int[] values3 = new int[] {7, 8, 9};
 
-      //set some values
+      // set some values
       writeListVector(vector1, writer1, values1);
       writeListVector(vector1, writer1, values2);
       writeListVector(vector1, writer1, values3);
@@ -308,7 +320,8 @@ public void testUnionFixedSizeListWriter() throws Exception {
 
   @Test
   public void testWriteDecimal() throws Exception {
-    try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*size=*/3, allocator)) {
+    try (final FixedSizeListVector vector =
+        FixedSizeListVector.empty("vector", /*size=*/ 3, allocator)) {
 
       UnionFixedSizeListWriter writer = vector.getWriter();
       writer.allocate();
@@ -336,50 +349,59 @@ public void testWriteDecimal() throws Exception {
 
   @Test
   public void testDecimalIndexCheck() throws Exception {
-    try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*size=*/3, allocator)) {
+    try (final FixedSizeListVector vector =
+        FixedSizeListVector.empty("vector", /*size=*/ 3, allocator)) {
 
       UnionFixedSizeListWriter writer = vector.getWriter();
       writer.allocate();
 
-      IllegalStateException e = assertThrows(IllegalStateException.class, () -> {
-        writer.startList();
-        writer.decimal().writeDecimal(new BigDecimal(1));
-        writer.decimal().writeDecimal(new BigDecimal(2));
-        writer.decimal().writeDecimal(new BigDecimal(3));
-        writer.decimal().writeDecimal(new BigDecimal(4));
-        writer.endList();
-      });
+      IllegalStateException e =
+          assertThrows(
+              IllegalStateException.class,
+              () -> {
+                writer.startList();
+                writer.decimal().writeDecimal(new BigDecimal(1));
+                writer.decimal().writeDecimal(new BigDecimal(2));
+                writer.decimal().writeDecimal(new BigDecimal(3));
+                writer.decimal().writeDecimal(new BigDecimal(4));
+                writer.endList();
+              });
       assertEquals("values at index 0 is greater than listSize 3", e.getMessage());
     }
   }
 
-
-  @Test(expected = IllegalStateException.class)
+  @Test
   public void testWriteIllegalData() throws Exception {
-    try (final FixedSizeListVector vector1 = FixedSizeListVector.empty("vector", /*size=*/3, allocator)) {
-
-      UnionFixedSizeListWriter writer1 = vector1.getWriter();
-      writer1.allocate();
-
-      int[] values1 = new int[] {1, 2, 3};
-      int[] values2 = new int[] {4, 5, 6, 7, 8};
-
-      //set some values
-      writeListVector(vector1, writer1, values1);
-      writeListVector(vector1, writer1, values2);
-      writer1.setValueCount(3);
-
-      assertEquals(3, vector1.getValueCount());
-      int[] realValue1 = convertListToIntArray(vector1.getObject(0));
-      assertTrue(Arrays.equals(values1, realValue1));
-      int[] realValue2 = convertListToIntArray(vector1.getObject(1));
-      assertTrue(Arrays.equals(values2, realValue2));
-    }
+    assertThrows(
+        IllegalStateException.class,
+        () -> {
+          try (final FixedSizeListVector vector1 =
+              FixedSizeListVector.empty("vector", /*size=*/ 3, allocator)) {
+
+            UnionFixedSizeListWriter writer1 = vector1.getWriter();
+            writer1.allocate();
+
+            int[] values1 = new int[] {1, 2, 3};
+            int[] values2 = new int[] {4, 5, 6, 7, 8};
+
+            // set some values
+            writeListVector(vector1, writer1, values1);
+            writeListVector(vector1, writer1, values2);
+            writer1.setValueCount(3);
+
+            assertEquals(3, vector1.getValueCount());
+            int[] realValue1 = convertListToIntArray(vector1.getObject(0));
+            assertTrue(Arrays.equals(values1, realValue1));
+            int[] realValue2 = convertListToIntArray(vector1.getObject(1));
+            assertTrue(Arrays.equals(values2, realValue2));
+          }
+        });
   }
 
   @Test
   public void testSplitAndTransfer() throws Exception {
-    try (final FixedSizeListVector vector1 = FixedSizeListVector.empty("vector", /*size=*/3, allocator)) {
+    try (final FixedSizeListVector vector1 =
+        FixedSizeListVector.empty("vector", /*size=*/ 3, allocator)) {
 
       UnionFixedSizeListWriter writer1 = vector1.getWriter();
       writer1.allocate();
@@ -388,7 +410,7 @@ public void testSplitAndTransfer() throws Exception {
       int[] values2 = new int[] {4, 5, 6};
       int[] values3 = new int[] {7, 8, 9};
 
-      //set some values
+      // set some values
       writeListVector(vector1, writer1, values1);
       writeListVector(vector1, writer1, values2);
       writeListVector(vector1, writer1, values3);
@@ -410,7 +432,8 @@ public void testSplitAndTransfer() throws Exception {
 
   @Test
   public void testZeroWidthVector() {
-    try (final FixedSizeListVector vector1 = FixedSizeListVector.empty("vector", /*size=*/0, allocator)) {
+    try (final FixedSizeListVector vector1 =
+        FixedSizeListVector.empty("vector", /*size=*/ 0, allocator)) {
 
       UnionFixedSizeListWriter writer1 = vector1.getWriter();
       writer1.allocate();
@@ -420,7 +443,7 @@ public void testZeroWidthVector() {
       int[] values3 = null;
       int[] values4 = new int[] {};
 
-      //set some values
+      // set some values
       writeListVector(vector1, writer1, values1);
       writeListVector(vector1, writer1, values2);
       writeListVector(vector1, writer1, values3);
@@ -441,7 +464,8 @@ public void testZeroWidthVector() {
 
   @Test
   public void testVectorWithNulls() {
-    try (final FixedSizeListVector vector1 = FixedSizeListVector.empty("vector", /*size=*/4, allocator)) {
+    try (final FixedSizeListVector vector1 =
+        FixedSizeListVector.empty("vector", /*size=*/ 4, allocator)) {
 
       UnionFixedSizeListWriter writer1 = vector1.getWriter();
       writer1.allocate();
@@ -451,7 +475,7 @@ public void testVectorWithNulls() {
       List<Integer> values3 = null;
       List<Integer> values4 = Arrays.asList(7, 8, null, 9);
 
-      //set some values
+      // set some values
       writeListVector(vector1, writer1, values1);
       writeListVector(vector1, writer1, values2);
       writeListVector(vector1, writer1, values3);
@@ -473,7 +497,8 @@ public void testVectorWithNulls() {
 
   @Test
   public void testWriteVarCharHelpers() throws Exception {
-    try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*size=*/4, allocator)) {
+    try (final FixedSizeListVector vector =
+        FixedSizeListVector.empty("vector", /*size=*/ 4, allocator)) {
 
       UnionFixedSizeListWriter writer = vector.getWriter();
       writer.allocate();
@@ -492,7 +517,8 @@ public void testWriteVarCharHelpers() throws Exception {
 
   @Test
   public void testWriteLargeVarCharHelpers() throws Exception {
-    try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*size=*/4, allocator)) {
+    try (final FixedSizeListVector vector =
+        FixedSizeListVector.empty("vector", /*size=*/ 4, allocator)) {
 
       UnionFixedSizeListWriter writer = vector.getWriter();
       writer.allocate();
@@ -511,47 +537,65 @@ public void testWriteLargeVarCharHelpers() throws Exception {
 
   @Test
   public void testWriteVarBinaryHelpers() throws Exception {
-    try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*size=*/4, allocator)) {
+    try (final FixedSizeListVector vector =
+        FixedSizeListVector.empty("vector", /*size=*/ 4, allocator)) {
 
       UnionFixedSizeListWriter writer = vector.getWriter();
       writer.allocate();
 
       writer.startList();
       writer.writeVarBinary("row1,1".getBytes(StandardCharsets.UTF_8));
-      writer.writeVarBinary("row1,2".getBytes(StandardCharsets.UTF_8), 0,
+      writer.writeVarBinary(
+          "row1,2".getBytes(StandardCharsets.UTF_8),
+          0,
           "row1,2".getBytes(StandardCharsets.UTF_8).length);
       writer.writeVarBinary(ByteBuffer.wrap("row1,3".getBytes(StandardCharsets.UTF_8)));
-      writer.writeVarBinary(ByteBuffer.wrap("row1,4".getBytes(StandardCharsets.UTF_8)), 0,
+      writer.writeVarBinary(
+          ByteBuffer.wrap("row1,4".getBytes(StandardCharsets.UTF_8)),
+          0,
           "row1,4".getBytes(StandardCharsets.UTF_8).length);
       writer.endList();
 
-      assertEquals("row1,1", new String((byte[]) vector.getObject(0).get(0), StandardCharsets.UTF_8));
-      assertEquals("row1,2", new String((byte[]) vector.getObject(0).get(1), StandardCharsets.UTF_8));
-      assertEquals("row1,3", new String((byte[]) vector.getObject(0).get(2), StandardCharsets.UTF_8));
-      assertEquals("row1,4", new String((byte[]) vector.getObject(0).get(3), StandardCharsets.UTF_8));
+      assertEquals(
+          "row1,1", new String((byte[]) vector.getObject(0).get(0), StandardCharsets.UTF_8));
+      assertEquals(
+          "row1,2", new String((byte[]) vector.getObject(0).get(1), StandardCharsets.UTF_8));
+      assertEquals(
+          "row1,3", new String((byte[]) vector.getObject(0).get(2), StandardCharsets.UTF_8));
+      assertEquals(
+          "row1,4", new String((byte[]) vector.getObject(0).get(3), StandardCharsets.UTF_8));
     }
   }
 
   @Test
   public void testWriteLargeVarBinaryHelpers() throws Exception {
-    try (final FixedSizeListVector vector = FixedSizeListVector.empty("vector", /*size=*/4, allocator)) {
+    try (final FixedSizeListVector vector =
+        FixedSizeListVector.empty("vector", /*size=*/ 4, allocator)) {
 
       UnionFixedSizeListWriter writer = vector.getWriter();
       writer.allocate();
 
       writer.startList();
       writer.writeLargeVarBinary("row1,1".getBytes(StandardCharsets.UTF_8));
-      writer.writeLargeVarBinary("row1,2".getBytes(StandardCharsets.UTF_8), 0,
+      writer.writeLargeVarBinary(
+          "row1,2".getBytes(StandardCharsets.UTF_8),
+          0,
           "row1,2".getBytes(StandardCharsets.UTF_8).length);
       writer.writeLargeVarBinary(ByteBuffer.wrap("row1,3".getBytes(StandardCharsets.UTF_8)));
-      writer.writeLargeVarBinary(ByteBuffer.wrap("row1,4".getBytes(StandardCharsets.UTF_8)), 0,
+      writer.writeLargeVarBinary(
+          ByteBuffer.wrap("row1,4".getBytes(StandardCharsets.UTF_8)),
+          0,
           "row1,4".getBytes(StandardCharsets.UTF_8).length);
       writer.endList();
 
-      assertEquals("row1,1", new String((byte[]) vector.getObject(0).get(0), StandardCharsets.UTF_8));
-      assertEquals("row1,2", new String((byte[]) vector.getObject(0).get(1), StandardCharsets.UTF_8));
-      assertEquals("row1,3", new String((byte[]) vector.getObject(0).get(2), StandardCharsets.UTF_8));
-      assertEquals("row1,4", new String((byte[]) vector.getObject(0).get(3), StandardCharsets.UTF_8));
+      assertEquals(
+          "row1,1", new String((byte[]) vector.getObject(0).get(0), StandardCharsets.UTF_8));
+      assertEquals(
+          "row1,2", new String((byte[]) vector.getObject(0).get(1), StandardCharsets.UTF_8));
+      assertEquals(
+          "row1,3", new String((byte[]) vector.getObject(0).get(2), StandardCharsets.UTF_8));
+      assertEquals(
+          "row1,4", new String((byte[]) vector.getObject(0).get(3), StandardCharsets.UTF_8));
     }
   }
 
@@ -563,7 +607,8 @@ private int[] convertListToIntArray(List<?> list) {
     return values;
   }
 
-  private void writeListVector(FixedSizeListVector vector, UnionFixedSizeListWriter writer, int[] values) {
+  private void writeListVector(
+      FixedSizeListVector vector, UnionFixedSizeListWriter writer, int[] values) {
     writer.startList();
     if (values != null) {
       for (int v : values) {
@@ -575,7 +620,8 @@ private void writeListVector(FixedSizeListVector vector, UnionFixedSizeListWrite
     writer.endList();
   }
 
-  private void writeListVector(FixedSizeListVector vector, UnionFixedSizeListWriter writer, List<Integer> values) {
+  private void writeListVector(
+      FixedSizeListVector vector, UnionFixedSizeListWriter writer, List<Integer> values) {
     writer.startList();
     if (values != null) {
       for (Integer v : values) {
@@ -590,5 +636,4 @@ private void writeListVector(FixedSizeListVector vector, UnionFixedSizeListWrite
     }
     writer.endList();
   }
-
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestIntervalMonthDayNanoVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestIntervalMonthDayNanoVector.java
index 681897b93c12c..2b39db3cd4d68 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestIntervalMonthDayNanoVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestIntervalMonthDayNanoVector.java
@@ -14,42 +14,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertEquals;
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.Duration;
 import java.time.Period;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.holders.IntervalMonthDayNanoHolder;
 import org.apache.arrow.vector.holders.NullableIntervalMonthDayNanoHolder;
 import org.apache.arrow.vector.types.IntervalUnit;
 import org.apache.arrow.vector.types.Types;
 import org.apache.arrow.vector.types.pojo.ArrowType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestIntervalMonthDayNanoVector {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
 
   @Test
   public void testBasics() {
-    try (final IntervalMonthDayNanoVector vector = new IntervalMonthDayNanoVector(/*name=*/"", allocator)) {
+    try (final IntervalMonthDayNanoVector vector =
+        new IntervalMonthDayNanoVector(/*name=*/ "", allocator)) {
       int valueCount = 100;
       vector.setInitialCapacity(valueCount);
       vector.allocateNew();
@@ -63,20 +61,21 @@ public void testBasics() {
       holder.days = Integer.MIN_VALUE;
       holder.nanoseconds = Long.MIN_VALUE;
 
-
-      vector.set(0, /*months=*/1, /*days=*/2, /*nanoseconds=*/-2);
-      vector.setSafe(2, /*months=*/1, /*days=*/2, /*nanoseconds=*/-3);
-      vector.setSafe(/*index=*/4, nullableHolder);
+      vector.set(0, /*months=*/ 1, /*days=*/ 2, /*nanoseconds=*/ -2);
+      vector.setSafe(2, /*months=*/ 1, /*days=*/ 2, /*nanoseconds=*/ -3);
+      vector.setSafe(/*index=*/ 4, nullableHolder);
       vector.set(3, holder);
       nullableHolder.isSet = 0;
-      vector.setSafe(/*index=*/5, nullableHolder);
+      vector.setSafe(/*index=*/ 5, nullableHolder);
       vector.setValueCount(5);
 
       assertEquals("P1M2D PT-0.000000002S ", vector.getAsStringBuilder(0).toString());
       assertEquals(null, vector.getAsStringBuilder(1));
       assertEquals("P1M2D PT-0.000000003S ", vector.getAsStringBuilder(2).toString());
-      assertEquals(new PeriodDuration(Period.of(0, Integer.MIN_VALUE, Integer.MIN_VALUE),
-          Duration.ofNanos(Long.MIN_VALUE)), vector.getObject(3));
+      assertEquals(
+          new PeriodDuration(
+              Period.of(0, Integer.MIN_VALUE, Integer.MIN_VALUE), Duration.ofNanos(Long.MIN_VALUE)),
+          vector.getObject(3));
       assertEquals("P2M20D PT0.000000123S ", vector.getAsStringBuilder(4).toString());
 
       assertEquals(null, vector.getObject(5));
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestIntervalYearVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestIntervalYearVector.java
index 4b2ae2eb3d49b..0ba2bf9f406e9 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestIntervalYearVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestIntervalYearVector.java
@@ -14,31 +14,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.types.IntervalUnit;
 import org.apache.arrow.vector.types.Types;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestIntervalYearVector {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -71,7 +70,8 @@ public void testGetTransferPairWithField() {
     final IntervalYearVector fromVector = new IntervalYearVector("", allocator);
     final TransferPair transferPair = fromVector.getTransferPair(fromVector.getField(), allocator);
     final IntervalYearVector toVector = (IntervalYearVector) transferPair.getTo();
-    // Field inside a new vector created by reusing a field should be the same in memory as the original field.
+    // Field inside a new vector created by reusing a field should be the same in memory as the
+    // original field.
     assertSame(fromVector.getField(), toVector.getField());
   }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestLargeListVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestLargeListVector.java
index ffd87c99d508d..101d942d2a4c5 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestLargeListVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestLargeListVector.java
@@ -14,19 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.BaseRepeatedValueVector;
@@ -39,21 +37,20 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestLargeListVector {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -61,7 +58,7 @@ public void terminate() throws Exception {
   @Test
   public void testCopyFrom() throws Exception {
     try (LargeListVector inVector = LargeListVector.empty("input", allocator);
-         LargeListVector outVector = LargeListVector.empty("output", allocator)) {
+        LargeListVector outVector = LargeListVector.empty("output", allocator)) {
       UnionLargeListWriter writer = inVector.getWriter();
       writer.allocate();
 
@@ -91,12 +88,11 @@ public void testCopyFrom() throws Exception {
 
       // assert the output vector is correct
       FieldReader reader = outVector.getReader();
-      Assert.assertTrue("shouldn't be null", reader.isSet());
+      assertTrue(reader.isSet(), "shouldn't be null");
       reader.setPosition(1);
-      Assert.assertFalse("should be null", reader.isSet());
+      assertFalse(reader.isSet(), "should be null");
       reader.setPosition(2);
-      Assert.assertTrue("shouldn't be null", reader.isSet());
-
+      assertTrue(reader.isSet(), "shouldn't be null");
 
       /* index 0 */
       Object result = outVector.getObject(0);
@@ -428,20 +424,26 @@ public void testSplitAndTransfer() throws Exception {
           BigIntVector dataVector1 = (BigIntVector) toVector.getDataVector();
 
           for (int i = 0; i < splitLength; i++) {
-            dataLength1 = (int) offsetBuffer.getLong((start + i + 1) * LargeListVector.OFFSET_WIDTH) -
-                    (int) offsetBuffer.getLong((start + i) * LargeListVector.OFFSET_WIDTH);
-            dataLength2 = (int) toOffsetBuffer.getLong((i + 1) * LargeListVector.OFFSET_WIDTH) -
-                    (int) toOffsetBuffer.getLong(i * LargeListVector.OFFSET_WIDTH);
-
-            assertEquals("Different data lengths at index: " + i + " and start: " + start,
-                    dataLength1, dataLength2);
+            dataLength1 =
+                (int) offsetBuffer.getLong((start + i + 1) * LargeListVector.OFFSET_WIDTH)
+                    - (int) offsetBuffer.getLong((start + i) * LargeListVector.OFFSET_WIDTH);
+            dataLength2 =
+                (int) toOffsetBuffer.getLong((i + 1) * LargeListVector.OFFSET_WIDTH)
+                    - (int) toOffsetBuffer.getLong(i * LargeListVector.OFFSET_WIDTH);
+
+            assertEquals(
+                dataLength1,
+                dataLength2,
+                "Different data lengths at index: " + i + " and start: " + start);
 
             offset1 = (int) offsetBuffer.getLong((start + i) * LargeListVector.OFFSET_WIDTH);
             offset2 = (int) toOffsetBuffer.getLong(i * LargeListVector.OFFSET_WIDTH);
 
             for (int j = 0; j < dataLength1; j++) {
-              assertEquals("Different data at indexes: " + offset1 + " and " + offset2,
-                      dataVector.getObject(offset1), dataVector1.getObject(offset2));
+              assertEquals(
+                  dataVector.getObject(offset1),
+                  dataVector1.getObject(offset2),
+                  "Different data at indexes: " + offset1 + " and " + offset2);
 
               offset1++;
               offset2++;
@@ -772,8 +774,8 @@ public void testSetInitialCapacity() {
       vector.addOrGetVector(FieldType.nullable(MinorType.INT.getType()));
 
       /**
-       * use the default multiplier of 5,
-       * 512 * 5 => 2560 * 4 => 10240 bytes => 16KB => 4096 value capacity.
+       * use the default multiplier of 5, 512 * 5 => 2560 * 4 => 10240 bytes => 16KB => 4096 value
+       * capacity.
        */
       vector.setInitialCapacity(512);
       vector.allocateNew();
@@ -787,12 +789,10 @@ public void testSetInitialCapacity() {
       assertTrue(vector.getDataVector().getValueCapacity() >= 512 * 4);
 
       /**
-       * inner value capacity we pass to data vector is 512 * 0.1 => 51
-       * For an int vector this is 204 bytes of memory for data buffer
-       * and 7 bytes for validity buffer.
-       * and with power of 2 allocation, we allocate 256 bytes and 8 bytes
-       * for the data buffer and validity buffer of the inner vector. Thus
-       * value capacity of inner vector is 64
+       * inner value capacity we pass to data vector is 512 * 0.1 => 51 For an int vector this is
+       * 204 bytes of memory for data buffer and 7 bytes for validity buffer. and with power of 2
+       * allocation, we allocate 256 bytes and 8 bytes for the data buffer and validity buffer of
+       * the inner vector. Thus value capacity of inner vector is 64
        */
       vector.setInitialCapacity(512, 0.1);
       vector.allocateNew();
@@ -800,12 +800,10 @@ public void testSetInitialCapacity() {
       assertTrue(vector.getDataVector().getValueCapacity() >= 51);
 
       /**
-       * inner value capacity we pass to data vector is 512 * 0.01 => 5
-       * For an int vector this is 20 bytes of memory for data buffer
-       * and 1 byte for validity buffer.
-       * and with power of 2 allocation, we allocate 32 bytes and 1 bytes
-       * for the data buffer and validity buffer of the inner vector. Thus
-       * value capacity of inner vector is 8
+       * inner value capacity we pass to data vector is 512 * 0.01 => 5 For an int vector this is 20
+       * bytes of memory for data buffer and 1 byte for validity buffer. and with power of 2
+       * allocation, we allocate 32 bytes and 1 bytes for the data buffer and validity buffer of the
+       * inner vector. Thus value capacity of inner vector is 8
        */
       vector.setInitialCapacity(512, 0.01);
       vector.allocateNew();
@@ -813,14 +811,11 @@ public void testSetInitialCapacity() {
       assertTrue(vector.getDataVector().getValueCapacity() >= 5);
 
       /**
-       * inner value capacity we pass to data vector is 5 * 0.1 => 0
-       * which is then rounded off to 1. So we pass value count as 1
-       * to the inner int vector.
-       * the offset buffer of the list vector is allocated for 6 values
-       * which is 24 bytes and then rounded off to 32 bytes (8 values)
-       * the validity buffer of the list vector is allocated for 5
-       * values which is 1 byte. This is why value capacity of the list
-       * vector is 7 as we take the min of validity buffer value capacity
+       * inner value capacity we pass to data vector is 5 * 0.1 => 0 which is then rounded off to 1.
+       * So we pass value count as 1 to the inner int vector. the offset buffer of the list vector
+       * is allocated for 6 values which is 24 bytes and then rounded off to 32 bytes (8 values) the
+       * validity buffer of the list vector is allocated for 5 values which is 1 byte. This is why
+       * value capacity of the list vector is 7 as we take the min of validity buffer value capacity
        * and offset buffer value capacity.
        */
       vector.setInitialCapacity(5, 0.1);
@@ -834,7 +829,8 @@ public void testSetInitialCapacity() {
   public void testClearAndReuse() {
     try (final LargeListVector vector = LargeListVector.empty("list", allocator)) {
       BigIntVector bigIntVector =
-          (BigIntVector) vector.addOrGetVector(FieldType.nullable(MinorType.BIGINT.getType())).getVector();
+          (BigIntVector)
+              vector.addOrGetVector(FieldType.nullable(MinorType.BIGINT.getType())).getVector();
       vector.setInitialCapacity(10);
       vector.allocateNew();
 
@@ -883,17 +879,23 @@ public void testWriterGetField() {
       UnionLargeListWriter writer = vector.getWriter();
       writer.allocate();
 
-      //set some values
+      // set some values
       writer.startList();
       writer.integer().writeInt(1);
       writer.integer().writeInt(2);
       writer.endList();
       vector.setValueCount(2);
 
-      Field expectedDataField = new Field(BaseRepeatedValueVector.DATA_VECTOR_NAME,
-          FieldType.nullable(new ArrowType.Int(32, true)), null);
-      Field expectedField = new Field(vector.getName(), FieldType.nullable(ArrowType.LargeList.INSTANCE),
-          Arrays.asList(expectedDataField));
+      Field expectedDataField =
+          new Field(
+              BaseRepeatedValueVector.DATA_VECTOR_NAME,
+              FieldType.nullable(new ArrowType.Int(32, true)),
+              null);
+      Field expectedField =
+          new Field(
+              vector.getName(),
+              FieldType.nullable(ArrowType.LargeList.INSTANCE),
+              Arrays.asList(expectedDataField));
 
       assertEquals(expectedField, writer.getField());
     }
@@ -906,7 +908,7 @@ public void testClose() throws Exception {
       UnionLargeListWriter writer = vector.getWriter();
       writer.allocate();
 
-      //set some values
+      // set some values
       writer.startList();
       writer.integer().writeInt(1);
       writer.integer().writeInt(2);
@@ -929,7 +931,7 @@ public void testGetBufferSizeFor() {
       UnionLargeListWriter writer = vector.getWriter();
       writer.allocate();
 
-      //set some values
+      // set some values
       writeIntValues(writer, new int[] {1, 2});
       writeIntValues(writer, new int[] {3, 4});
       writeIntValues(writer, new int[] {5, 6});
@@ -944,7 +946,10 @@ public void testGetBufferSizeFor() {
         int validityBufferSize = BitVectorHelper.getValidityBufferSize(valueCount);
         int offsetBufferSize = (valueCount + 1) * LargeListVector.OFFSET_WIDTH;
 
-        int expectedSize = validityBufferSize + offsetBufferSize + dataVector.getBufferSizeFor(indices[valueCount]);
+        int expectedSize =
+            validityBufferSize
+                + offsetBufferSize
+                + dataVector.getBufferSizeFor(indices[valueCount]);
         assertEquals(expectedSize, vector.getBufferSizeFor(valueCount));
       }
     }
@@ -999,24 +1004,25 @@ public void testGetTransferPairWithField() throws Exception {
       UnionLargeListWriter writer = fromVector.getWriter();
       writer.allocate();
 
-      //set some values
+      // set some values
       writer.startList();
       writer.integer().writeInt(1);
       writer.integer().writeInt(2);
       writer.endList();
       fromVector.setValueCount(2);
 
-      final TransferPair transferPair = fromVector.getTransferPair(fromVector.getField(),
-          allocator);
+      final TransferPair transferPair =
+          fromVector.getTransferPair(fromVector.getField(), allocator);
       final LargeListVector toVector = (LargeListVector) transferPair.getTo();
-      // Field inside a new vector created by reusing a field should be the same in memory as the original field.
+      // Field inside a new vector created by reusing a field should be the same in memory as the
+      // original field.
       assertSame(toVector.getField(), fromVector.getField());
     }
   }
 
   private void writeIntValues(UnionLargeListWriter writer, int[] values) {
     writer.startList();
-    for (int v: values) {
+    for (int v : values) {
       writer.integer().writeInt(v);
     }
     writer.endList();
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestLargeVarBinaryVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestLargeVarBinaryVector.java
index 36607903b01a2..bfe1859bf5681 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestLargeVarBinaryVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestLargeVarBinaryVector.java
@@ -14,38 +14,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Objects;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.holders.NullableLargeVarBinaryHolder;
 import org.apache.arrow.vector.util.ReusableByteArray;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestLargeVarBinaryVector {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(Integer.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -74,7 +72,8 @@ public void testSetNullableLargeVarBinaryHolder() {
 
         // verify results
         assertTrue(vector.isNull(0));
-        assertEquals(str, new String(Objects.requireNonNull(vector.get(1)), StandardCharsets.UTF_8));
+        assertEquals(
+            str, new String(Objects.requireNonNull(vector.get(1)), StandardCharsets.UTF_8));
       }
     }
   }
@@ -102,7 +101,8 @@ public void testSetNullableLargeVarBinaryHolderSafe() {
         vector.setSafe(1, nullHolder);
 
         // verify results
-        assertEquals(str, new String(Objects.requireNonNull(vector.get(0)), StandardCharsets.UTF_8));
+        assertEquals(
+            str, new String(Objects.requireNonNull(vector.get(0)), StandardCharsets.UTF_8));
         assertTrue(vector.isNull(1));
       }
     }
@@ -122,12 +122,16 @@ public void testGetBytesRepeatedly() {
       ReusableByteArray reusableByteArray = new ReusableByteArray();
       vector.read(0, reusableByteArray);
       byte[] oldBuffer = reusableByteArray.getBuffer();
-      assertArrayEquals(str.getBytes(StandardCharsets.UTF_8), Arrays.copyOfRange(reusableByteArray.getBuffer(),
-          0, (int) reusableByteArray.getLength()));
+      assertArrayEquals(
+          str.getBytes(StandardCharsets.UTF_8),
+          Arrays.copyOfRange(
+              reusableByteArray.getBuffer(), 0, (int) reusableByteArray.getLength()));
 
       vector.read(1, reusableByteArray);
-      assertArrayEquals(str2.getBytes(StandardCharsets.UTF_8), Arrays.copyOfRange(reusableByteArray.getBuffer(),
-          0, (int) reusableByteArray.getLength()));
+      assertArrayEquals(
+          str2.getBytes(StandardCharsets.UTF_8),
+          Arrays.copyOfRange(
+              reusableByteArray.getBuffer(), 0, (int) reusableByteArray.getLength()));
 
       // There should not have been any reallocation since the newer value is smaller in length.
       assertSame(oldBuffer, reusableByteArray.getBuffer());
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestLargeVarCharVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestLargeVarCharVector.java
index 62d09da86d652..7ea39c194c179 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestLargeVarCharVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestLargeVarCharVector.java
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.OutOfMemoryException;
@@ -41,11 +41,9 @@
 import org.apache.arrow.vector.util.OversizedAllocationException;
 import org.apache.arrow.vector.util.Text;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestLargeVarCharVector {
 
@@ -58,12 +56,12 @@ public class TestLargeVarCharVector {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(Integer.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -71,9 +69,9 @@ public void shutdown() {
   @Test
   public void testTransfer() {
     try (BufferAllocator childAllocator1 = allocator.newChildAllocator("child1", 1000000, 1000000);
-         BufferAllocator childAllocator2 = allocator.newChildAllocator("child2", 1000000, 1000000);
-         LargeVarCharVector v1 = new LargeVarCharVector("v1", childAllocator1);
-         LargeVarCharVector v2 = new LargeVarCharVector("v2", childAllocator2);) {
+        BufferAllocator childAllocator2 = allocator.newChildAllocator("child2", 1000000, 1000000);
+        LargeVarCharVector v1 = new LargeVarCharVector("v1", childAllocator1);
+        LargeVarCharVector v2 = new LargeVarCharVector("v2", childAllocator2); ) {
       v1.allocateNew();
       v1.setSafe(4094, "hello world".getBytes(StandardCharsets.UTF_8), 0, 11);
       v1.setValueCount(4001);
@@ -89,8 +87,10 @@ public void testTransfer() {
 
   @Test
   public void testCopyValueSafe() {
-    try (final LargeVarCharVector largeVarCharVector = new LargeVarCharVector("myvector", allocator);
-         final LargeVarCharVector newLargeVarCharVector = new LargeVarCharVector("newvector", allocator)) {
+    try (final LargeVarCharVector largeVarCharVector =
+            new LargeVarCharVector("myvector", allocator);
+        final LargeVarCharVector newLargeVarCharVector =
+            new LargeVarCharVector("newvector", allocator)) {
       largeVarCharVector.allocateNew(10000, 1000);
 
       final int valueCount = 500;
@@ -119,7 +119,8 @@ public void testCopyValueSafe() {
 
   @Test
   public void testSplitAndTransferNon() {
-    try (final LargeVarCharVector largeVarCharVector = new LargeVarCharVector("myvector", allocator)) {
+    try (final LargeVarCharVector largeVarCharVector =
+        new LargeVarCharVector("myvector", allocator)) {
 
       largeVarCharVector.allocateNew(10000, 1000);
       final int valueCount = 500;
@@ -136,7 +137,8 @@ public void testSplitAndTransferNon() {
 
   @Test
   public void testSplitAndTransferAll() {
-    try (final LargeVarCharVector largeVarCharVector = new LargeVarCharVector("myvector", allocator)) {
+    try (final LargeVarCharVector largeVarCharVector =
+        new LargeVarCharVector("myvector", allocator)) {
 
       largeVarCharVector.allocateNew(10000, 1000);
       final int valueCount = 500;
@@ -153,8 +155,10 @@ public void testSplitAndTransferAll() {
 
   @Test
   public void testInvalidStartIndex() {
-    try (final LargeVarCharVector largeVarCharVector = new LargeVarCharVector("myvector", allocator);
-         final LargeVarCharVector newLargeVarCharVector = new LargeVarCharVector("newvector", allocator)) {
+    try (final LargeVarCharVector largeVarCharVector =
+            new LargeVarCharVector("myvector", allocator);
+        final LargeVarCharVector newLargeVarCharVector =
+            new LargeVarCharVector("newvector", allocator)) {
 
       largeVarCharVector.allocateNew(10000, 1000);
       final int valueCount = 500;
@@ -162,18 +166,20 @@ public void testInvalidStartIndex() {
 
       final TransferPair tp = largeVarCharVector.makeTransferPair(newLargeVarCharVector);
 
-      IllegalArgumentException e = Assertions.assertThrows(
-          IllegalArgumentException.class,
-          () -> tp.splitAndTransfer(valueCount, 10));
+      IllegalArgumentException e =
+          assertThrows(IllegalArgumentException.class, () -> tp.splitAndTransfer(valueCount, 10));
 
-      assertEquals("Invalid startIndex: 500", e.getMessage());
+      assertEquals(
+          "Invalid parameters startIndex: 500, length: 10 for valueCount: 500", e.getMessage());
     }
   }
 
   @Test
   public void testInvalidLength() {
-    try (final LargeVarCharVector largeVarCharVector = new LargeVarCharVector("myvector", allocator);
-         final LargeVarCharVector newLargeVarCharVector = new LargeVarCharVector("newvector", allocator)) {
+    try (final LargeVarCharVector largeVarCharVector =
+            new LargeVarCharVector("myvector", allocator);
+        final LargeVarCharVector newLargeVarCharVector =
+            new LargeVarCharVector("newvector", allocator)) {
 
       largeVarCharVector.allocateNew(10000, 1000);
       final int valueCount = 500;
@@ -181,11 +187,12 @@ public void testInvalidLength() {
 
       final TransferPair tp = largeVarCharVector.makeTransferPair(newLargeVarCharVector);
 
-      IllegalArgumentException e = Assertions.assertThrows(
-          IllegalArgumentException.class,
-          () -> tp.splitAndTransfer(0, valueCount * 2));
+      IllegalArgumentException e =
+          assertThrows(
+              IllegalArgumentException.class, () -> tp.splitAndTransfer(0, valueCount * 2));
 
-      assertEquals("Invalid length: 1000", e.getMessage());
+      assertEquals(
+          "Invalid parameters startIndex: 0, length: 1000 for valueCount: 500", e.getMessage());
     }
   }
 
@@ -290,7 +297,7 @@ public void testSetLastSetUsage() {
       assertEquals(40, vector.offsetBuffer.getLong(17 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
       assertEquals(40, vector.offsetBuffer.getLong(18 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
       assertEquals(40, vector.offsetBuffer.getLong(19 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
-      
+
       vector.set(19, STR6);
       assertArrayEquals(STR6, vector.get(19));
       assertEquals(40, vector.offsetBuffer.getLong(19 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
@@ -298,44 +305,53 @@ public void testSetLastSetUsage() {
     }
   }
 
-  @Test(expected = OutOfMemoryException.class)
+  @Test
   public void testVectorAllocateNew() {
-    try (RootAllocator smallAllocator = new RootAllocator(200);
-        LargeVarCharVector vector = new LargeVarCharVector("vec", smallAllocator)) {
-      vector.allocateNew();
-    }
+    assertThrows(
+        OutOfMemoryException.class,
+        () -> {
+          try (RootAllocator smallAllocator = new RootAllocator(200);
+              LargeVarCharVector vector = new LargeVarCharVector("vec", smallAllocator)) {
+            vector.allocateNew();
+          }
+        });
   }
 
-  @Test(expected = OversizedAllocationException.class)
+  @Test
   public void testLargeVariableVectorReallocation() {
-    final LargeVarCharVector vector = new LargeVarCharVector("vector", allocator);
-    // edge case 1: value count = MAX_VALUE_ALLOCATION
-    final long expectedAllocationInBytes = BaseValueVector.MAX_ALLOCATION_SIZE;
-    final int expectedOffsetSize = 10;
-    try {
-      vector.allocateNew(expectedAllocationInBytes, 10);
-      assertTrue(expectedOffsetSize <= vector.getValueCapacity());
-      assertTrue(expectedAllocationInBytes <= vector.getDataBuffer().capacity());
-      vector.reAlloc();
-      assertTrue(expectedOffsetSize * 2 <= vector.getValueCapacity());
-      assertTrue(expectedAllocationInBytes * 2 <= vector.getDataBuffer().capacity());
-    } finally {
-      vector.close();
-    }
+    assertThrows(
+        OversizedAllocationException.class,
+        () -> {
+          final LargeVarCharVector vector = new LargeVarCharVector("vector", allocator);
+          // edge case 1: value count = MAX_VALUE_ALLOCATION
+          final long expectedAllocationInBytes = BaseValueVector.MAX_ALLOCATION_SIZE;
+          final int expectedOffsetSize = 10;
+          try {
+            vector.allocateNew(expectedAllocationInBytes, 10);
+            assertTrue(expectedOffsetSize <= vector.getValueCapacity());
+            assertTrue(expectedAllocationInBytes <= vector.getDataBuffer().capacity());
+            vector.reAlloc();
+            assertTrue(expectedOffsetSize * 2 <= vector.getValueCapacity());
+            assertTrue(expectedAllocationInBytes * 2 <= vector.getDataBuffer().capacity());
+          } finally {
+            vector.close();
+          }
 
-    // common: value count < MAX_VALUE_ALLOCATION
-    try {
-      vector.allocateNew(BaseValueVector.MAX_ALLOCATION_SIZE / 2, 0);
-      vector.reAlloc(); // value allocation reaches to MAX_VALUE_ALLOCATION
-      vector.reAlloc(); // this tests if it overflows
-    } finally {
-      vector.close();
-    }
+          // common: value count < MAX_VALUE_ALLOCATION
+          try {
+            vector.allocateNew(BaseValueVector.MAX_ALLOCATION_SIZE / 2, 0);
+            vector.reAlloc(); // value allocation reaches to MAX_VALUE_ALLOCATION
+            vector.reAlloc(); // this tests if it overflows
+          } finally {
+            vector.close();
+          }
+        });
   }
 
   @Test
   public void testSplitAndTransfer() {
-    try (final LargeVarCharVector largeVarCharVector = new LargeVarCharVector("myvector", allocator)) {
+    try (final LargeVarCharVector largeVarCharVector =
+        new LargeVarCharVector("myvector", allocator)) {
       largeVarCharVector.allocateNew(10000, 1000);
 
       final int valueCount = 500;
@@ -496,13 +512,12 @@ public void testVectorLoadUnload() {
 
       Schema schema = new Schema(fields);
 
-      VectorSchemaRoot schemaRoot1 = new VectorSchemaRoot(schema, fieldVectors, vector1.getValueCount());
+      VectorSchemaRoot schemaRoot1 =
+          new VectorSchemaRoot(schema, fieldVectors, vector1.getValueCount());
       VectorUnloader vectorUnloader = new VectorUnloader(schemaRoot1);
 
-      try (
-          ArrowRecordBatch recordBatch = vectorUnloader.getRecordBatch();
-          VectorSchemaRoot schemaRoot2 = VectorSchemaRoot.create(schema, allocator);
-      ) {
+      try (ArrowRecordBatch recordBatch = vectorUnloader.getRecordBatch();
+          VectorSchemaRoot schemaRoot2 = VectorSchemaRoot.create(schema, allocator); ) {
 
         VectorLoader vectorLoader = new VectorLoader(schemaRoot2);
         vectorLoader.load(recordBatch);
@@ -598,41 +613,25 @@ public void testFillEmptiesUsage() {
       assertEquals(0, vector.getValueLength(14));
 
       /* Check offsets */
-      assertEquals(0,
-          vector.offsetBuffer.getLong(0 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(6,
-          vector.offsetBuffer.getLong(1 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(16,
-          vector.offsetBuffer.getLong(2 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(21,
-          vector.offsetBuffer.getLong(3 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(30,
-          vector.offsetBuffer.getLong(4 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(34,
-          vector.offsetBuffer.getLong(5 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
-
-      assertEquals(40,
-          vector.offsetBuffer.getLong(6 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(40,
-          vector.offsetBuffer.getLong(7 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(40,
-          vector.offsetBuffer.getLong(8 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(40,
-          vector.offsetBuffer.getLong(9 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(40,
-          vector.offsetBuffer.getLong(10 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
-
-      assertEquals(46,
-          vector.offsetBuffer.getLong(11 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(56,
-          vector.offsetBuffer.getLong(12 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
-
-      assertEquals(56,
-          vector.offsetBuffer.getLong(13 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(56,
-          vector.offsetBuffer.getLong(14 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(56,
-          vector.offsetBuffer.getLong(15 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(0, vector.offsetBuffer.getLong(0 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(6, vector.offsetBuffer.getLong(1 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(16, vector.offsetBuffer.getLong(2 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(21, vector.offsetBuffer.getLong(3 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(30, vector.offsetBuffer.getLong(4 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(34, vector.offsetBuffer.getLong(5 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
+
+      assertEquals(40, vector.offsetBuffer.getLong(6 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(40, vector.offsetBuffer.getLong(7 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(40, vector.offsetBuffer.getLong(8 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(40, vector.offsetBuffer.getLong(9 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(40, vector.offsetBuffer.getLong(10 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
+
+      assertEquals(46, vector.offsetBuffer.getLong(11 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(56, vector.offsetBuffer.getLong(12 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
+
+      assertEquals(56, vector.offsetBuffer.getLong(13 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(56, vector.offsetBuffer.getLong(14 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(56, vector.offsetBuffer.getLong(15 * BaseLargeVariableWidthVector.OFFSET_WIDTH));
     }
   }
 
@@ -725,8 +724,10 @@ public void testSetNullableLargeVarCharHolderSafe() {
 
   @Test
   public void testGetNullFromLargeVariableWidthVector() {
-    try (final LargeVarCharVector largeVarCharVector = new LargeVarCharVector("largevarcharvec", allocator);
-         final LargeVarBinaryVector largeVarBinaryVector = new LargeVarBinaryVector("largevarbinary", allocator)) {
+    try (final LargeVarCharVector largeVarCharVector =
+            new LargeVarCharVector("largevarcharvec", allocator);
+        final LargeVarBinaryVector largeVarBinaryVector =
+            new LargeVarBinaryVector("largevarbinary", allocator)) {
       largeVarCharVector.allocateNew(10, 1);
       largeVarBinaryVector.allocateNew(10, 1);
 
@@ -737,10 +738,11 @@ public void testGetNullFromLargeVariableWidthVector() {
       assertNull(largeVarBinaryVector.get(0));
     }
   }
-  
+
   @Test
   public void testLargeVariableWidthVectorNullHashCode() {
-    try (LargeVarCharVector largeVarChVec = new LargeVarCharVector("large var char vector", allocator)) {
+    try (LargeVarCharVector largeVarChVec =
+        new LargeVarCharVector("large var char vector", allocator)) {
       largeVarChVec.allocateNew(100, 1);
       largeVarChVec.setValueCount(1);
 
@@ -753,7 +755,8 @@ public void testLargeVariableWidthVectorNullHashCode() {
 
   @Test
   public void testUnloadLargeVariableWidthVector() {
-    try (final LargeVarCharVector largeVarCharVector = new LargeVarCharVector("var char", allocator)) {
+    try (final LargeVarCharVector largeVarCharVector =
+        new LargeVarCharVector("var char", allocator)) {
       largeVarCharVector.allocateNew(5, 2);
       largeVarCharVector.setValueCount(2);
 
@@ -784,7 +787,7 @@ public void testNullableType() {
 
       try {
         vector.set(initialCapacity, "foo".getBytes(StandardCharsets.UTF_8));
-        Assert.fail("Expected out of bounds exception");
+        fail("Expected out of bounds exception");
       } catch (Exception e) {
         // ok
       }
@@ -833,7 +836,8 @@ public void testGetTransferPairWithField() {
     }
   }
 
-  private void populateLargeVarcharVector(final LargeVarCharVector vector, int valueCount, String[] values) {
+  private void populateLargeVarcharVector(
+      final LargeVarCharVector vector, int valueCount, String[] values) {
     for (int i = 0; i < valueCount; i += 3) {
       final String s = String.format("%010d", i);
       vector.set(i, s.getBytes(StandardCharsets.UTF_8));
@@ -845,11 +849,13 @@ private void populateLargeVarcharVector(final LargeVarCharVector vector, int val
   }
 
   public static void setBytes(int index, byte[] bytes, LargeVarCharVector vector) {
-    final long currentOffset = vector.offsetBuffer.getLong((long) index * BaseLargeVariableWidthVector.OFFSET_WIDTH);
+    final long currentOffset =
+        vector.offsetBuffer.getLong((long) index * BaseLargeVariableWidthVector.OFFSET_WIDTH);
 
     BitVectorHelper.setBit(vector.validityBuffer, index);
     vector.offsetBuffer.setLong(
-        (long) (index + 1) * BaseLargeVariableWidthVector.OFFSET_WIDTH, currentOffset + bytes.length);
+        (long) (index + 1) * BaseLargeVariableWidthVector.OFFSET_WIDTH,
+        currentOffset + bytes.length);
     vector.valueBuffer.setBytes(currentOffset, bytes, 0, bytes.length);
   }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java
index 97f2d9fd6def1..1d6fa39f9ea4f 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java
@@ -14,20 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.AutoCloseables;
@@ -44,21 +42,20 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestListVector {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -66,7 +63,7 @@ public void terminate() throws Exception {
   @Test
   public void testCopyFrom() throws Exception {
     try (ListVector inVector = ListVector.empty("input", allocator);
-         ListVector outVector = ListVector.empty("output", allocator)) {
+        ListVector outVector = ListVector.empty("output", allocator)) {
       UnionListWriter writer = inVector.getWriter();
       writer.allocate();
 
@@ -96,12 +93,11 @@ public void testCopyFrom() throws Exception {
 
       // assert the output vector is correct
       FieldReader reader = outVector.getReader();
-      Assert.assertTrue("shouldn't be null", reader.isSet());
+      assertTrue(reader.isSet(), "shouldn't be null");
       reader.setPosition(1);
-      Assert.assertFalse("should be null", reader.isSet());
+      assertFalse(reader.isSet(), "should be null");
       reader.setPosition(2);
-      Assert.assertTrue("shouldn't be null", reader.isSet());
-
+      assertTrue(reader.isSet(), "shouldn't be null");
 
       /* index 0 */
       Object result = outVector.getObject(0);
@@ -434,20 +430,26 @@ public void testSplitAndTransfer() throws Exception {
           BigIntVector dataVector1 = (BigIntVector) toVector.getDataVector();
 
           for (int i = 0; i < splitLength; i++) {
-            dataLength1 = offsetBuffer.getInt((start + i + 1) * ListVector.OFFSET_WIDTH) -
-                    offsetBuffer.getInt((start + i) * ListVector.OFFSET_WIDTH);
-            dataLength2 = toOffsetBuffer.getInt((i + 1) * ListVector.OFFSET_WIDTH) -
-                    toOffsetBuffer.getInt(i * ListVector.OFFSET_WIDTH);
-
-            assertEquals("Different data lengths at index: " + i + " and start: " + start,
-                    dataLength1, dataLength2);
+            dataLength1 =
+                offsetBuffer.getInt((start + i + 1) * ListVector.OFFSET_WIDTH)
+                    - offsetBuffer.getInt((start + i) * ListVector.OFFSET_WIDTH);
+            dataLength2 =
+                toOffsetBuffer.getInt((i + 1) * ListVector.OFFSET_WIDTH)
+                    - toOffsetBuffer.getInt(i * ListVector.OFFSET_WIDTH);
+
+            assertEquals(
+                dataLength1,
+                dataLength2,
+                "Different data lengths at index: " + i + " and start: " + start);
 
             offset1 = offsetBuffer.getInt((start + i) * ListVector.OFFSET_WIDTH);
             offset2 = toOffsetBuffer.getInt(i * ListVector.OFFSET_WIDTH);
 
             for (int j = 0; j < dataLength1; j++) {
-              assertEquals("Different data at indexes: " + offset1 + " and " + offset2,
-                      dataVector.getObject(offset1), dataVector1.getObject(offset2));
+              assertEquals(
+                  dataVector.getObject(offset1),
+                  dataVector1.getObject(offset2),
+                  "Different data at indexes: " + offset1 + " and " + offset2);
 
               offset1++;
               offset2++;
@@ -840,7 +842,8 @@ public void testSetInitialCapacity() {
   public void testClearAndReuse() {
     try (final ListVector vector = ListVector.empty("list", allocator)) {
       BigIntVector bigIntVector =
-          (BigIntVector) vector.addOrGetVector(FieldType.nullable(MinorType.BIGINT.getType())).getVector();
+          (BigIntVector)
+              vector.addOrGetVector(FieldType.nullable(MinorType.BIGINT.getType())).getVector();
       vector.setInitialCapacity(10);
       vector.allocateNew();
 
@@ -889,17 +892,23 @@ public void testWriterGetField() {
       UnionListWriter writer = vector.getWriter();
       writer.allocate();
 
-      //set some values
+      // set some values
       writer.startList();
       writer.integer().writeInt(1);
       writer.integer().writeInt(2);
       writer.endList();
       vector.setValueCount(2);
 
-      Field expectedDataField = new Field(BaseRepeatedValueVector.DATA_VECTOR_NAME,
-          FieldType.nullable(new ArrowType.Int(32, true)), null);
-      Field expectedField = new Field(vector.getName(), FieldType.nullable(ArrowType.List.INSTANCE),
-          Arrays.asList(expectedDataField));
+      Field expectedDataField =
+          new Field(
+              BaseRepeatedValueVector.DATA_VECTOR_NAME,
+              FieldType.nullable(new ArrowType.Int(32, true)),
+              null);
+      Field expectedField =
+          new Field(
+              vector.getName(),
+              FieldType.nullable(ArrowType.List.INSTANCE),
+              Arrays.asList(expectedDataField));
 
       assertEquals(expectedField, writer.getField());
     }
@@ -917,10 +926,16 @@ public void testWriterGetTimestampMilliTZField() {
       writer.endList();
       vector.setValueCount(1);
 
-      Field expectedDataField = new Field(BaseRepeatedValueVector.DATA_VECTOR_NAME,
-          FieldType.nullable(new ArrowType.Timestamp(TimeUnit.MILLISECOND, "UTC")), null);
-      Field expectedField = new Field(vector.getName(), FieldType.nullable(ArrowType.List.INSTANCE),
-          Arrays.asList(expectedDataField));
+      Field expectedDataField =
+          new Field(
+              BaseRepeatedValueVector.DATA_VECTOR_NAME,
+              FieldType.nullable(new ArrowType.Timestamp(TimeUnit.MILLISECOND, "UTC")),
+              null);
+      Field expectedField =
+          new Field(
+              vector.getName(),
+              FieldType.nullable(ArrowType.List.INSTANCE),
+              Arrays.asList(expectedDataField));
 
       assertEquals(expectedField, writer.getField());
     }
@@ -943,17 +958,26 @@ public void testWriterUsingHolderGetTimestampMilliTZField() {
       // Writing with a different timezone should throw
       holder.timezone = "AsdfTimeZone";
       holder.value = 77777;
-      IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
-          () -> writer.timeStampMilliTZ().write(holder));
-      assertEquals("holder.timezone: AsdfTimeZone not equal to vector timezone: SomeFakeTimeZone", ex.getMessage());
+      IllegalArgumentException ex =
+          assertThrows(
+              IllegalArgumentException.class, () -> writer.timeStampMilliTZ().write(holder));
+      assertEquals(
+          "holder.timezone: AsdfTimeZone not equal to vector timezone: SomeFakeTimeZone",
+          ex.getMessage());
 
       writer.endList();
       vector.setValueCount(1);
 
-      Field expectedDataField = new Field(BaseRepeatedValueVector.DATA_VECTOR_NAME,
-          FieldType.nullable(new ArrowType.Timestamp(TimeUnit.MILLISECOND, "SomeFakeTimeZone")), null);
-      Field expectedField = new Field(vector.getName(), FieldType.nullable(ArrowType.List.INSTANCE),
-          Arrays.asList(expectedDataField));
+      Field expectedDataField =
+          new Field(
+              BaseRepeatedValueVector.DATA_VECTOR_NAME,
+              FieldType.nullable(new ArrowType.Timestamp(TimeUnit.MILLISECOND, "SomeFakeTimeZone")),
+              null);
+      Field expectedField =
+          new Field(
+              vector.getName(),
+              FieldType.nullable(ArrowType.List.INSTANCE),
+              Arrays.asList(expectedDataField));
 
       assertEquals(expectedField, writer.getField());
     }
@@ -977,17 +1001,24 @@ public void testWriterGetDurationField() {
       // Writing with a different unit should throw
       durationHolder.unit = TimeUnit.SECOND;
       durationHolder.value = 8888888;
-      IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
-          () -> writer.duration().write(durationHolder));
+      IllegalArgumentException ex =
+          assertThrows(
+              IllegalArgumentException.class, () -> writer.duration().write(durationHolder));
       assertEquals("holder.unit: SECOND not equal to vector unit: MILLISECOND", ex.getMessage());
 
       writer.endList();
       vector.setValueCount(1);
 
-      Field expectedDataField = new Field(BaseRepeatedValueVector.DATA_VECTOR_NAME,
-          FieldType.nullable(new ArrowType.Duration(TimeUnit.MILLISECOND)), null);
-      Field expectedField = new Field(vector.getName(), FieldType.nullable(ArrowType.List.INSTANCE),
-          Arrays.asList(expectedDataField));
+      Field expectedDataField =
+          new Field(
+              BaseRepeatedValueVector.DATA_VECTOR_NAME,
+              FieldType.nullable(new ArrowType.Duration(TimeUnit.MILLISECOND)),
+              null);
+      Field expectedField =
+          new Field(
+              vector.getName(),
+              FieldType.nullable(ArrowType.List.INSTANCE),
+              Arrays.asList(expectedDataField));
 
       assertEquals(expectedField, writer.getField());
     }
@@ -1026,17 +1057,24 @@ public void testWriterGetFixedSizeBinaryField() throws Exception {
       // Writing with a different byteWidth should throw
       // Note just reusing the last buffer value since that won't matter here anyway
       binHolder.byteWidth = 3;
-      IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
-          () -> writer.fixedSizeBinary().write(binHolder));
+      IllegalArgumentException ex =
+          assertThrows(
+              IllegalArgumentException.class, () -> writer.fixedSizeBinary().write(binHolder));
       assertEquals("holder.byteWidth: 3 not equal to vector byteWidth: 9", ex.getMessage());
 
       writer.endList();
       vector.setValueCount(1);
 
-      Field expectedDataField = new Field(BaseRepeatedValueVector.DATA_VECTOR_NAME,
-          FieldType.nullable(new ArrowType.FixedSizeBinary(byteWidth)), null);
-      Field expectedField = new Field(vector.getName(), FieldType.nullable(ArrowType.List.INSTANCE),
-          Arrays.asList(expectedDataField));
+      Field expectedDataField =
+          new Field(
+              BaseRepeatedValueVector.DATA_VECTOR_NAME,
+              FieldType.nullable(new ArrowType.FixedSizeBinary(byteWidth)),
+              null);
+      Field expectedField =
+          new Field(
+              vector.getName(),
+              FieldType.nullable(ArrowType.List.INSTANCE),
+              Arrays.asList(expectedDataField));
 
       assertEquals(expectedField, writer.getField());
     }
@@ -1050,7 +1088,7 @@ public void testClose() throws Exception {
       UnionListWriter writer = vector.getWriter();
       writer.allocate();
 
-      //set some values
+      // set some values
       writer.startList();
       writer.integer().writeInt(1);
       writer.integer().writeInt(2);
@@ -1073,7 +1111,7 @@ public void testGetBufferSizeFor() {
       UnionListWriter writer = vector.getWriter();
       writer.allocate();
 
-      //set some values
+      // set some values
       writeIntValues(writer, new int[] {1, 2});
       writeIntValues(writer, new int[] {3, 4});
       writeIntValues(writer, new int[] {5, 6});
@@ -1088,7 +1126,10 @@ public void testGetBufferSizeFor() {
         int validityBufferSize = BitVectorHelper.getValidityBufferSize(valueCount);
         int offsetBufferSize = (valueCount + 1) * BaseRepeatedValueVector.OFFSET_WIDTH;
 
-        int expectedSize = validityBufferSize + offsetBufferSize + dataVector.getBufferSizeFor(indices[valueCount]);
+        int expectedSize =
+            validityBufferSize
+                + offsetBufferSize
+                + dataVector.getBufferSizeFor(indices[valueCount]);
         assertEquals(expectedSize, vector.getBufferSizeFor(valueCount));
       }
     }
@@ -1148,17 +1189,18 @@ public void testGetTransferPairWithField() {
       writer.bigInt().writeBigInt(3);
       writer.endList();
       writer.setValueCount(1);
-      final TransferPair transferPair = fromVector.getTransferPair(fromVector.getField(),
-          allocator);
+      final TransferPair transferPair =
+          fromVector.getTransferPair(fromVector.getField(), allocator);
       final ListVector toVector = (ListVector) transferPair.getTo();
-      // Field inside a new vector created by reusing a field should be the same in memory as the original field.
+      // Field inside a new vector created by reusing a field should be the same in memory as the
+      // original field.
       assertSame(toVector.getField(), fromVector.getField());
     }
   }
 
   private void writeIntValues(UnionListWriter writer, int[] values) {
     writer.startList();
-    for (int v: values) {
+    for (int v : values) {
       writer.integer().writeInt(v);
     }
     writer.endList();
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestListViewVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestListViewVector.java
new file mode 100644
index 0000000000000..1a58b65e3be4a
--- /dev/null
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestListViewVector.java
@@ -0,0 +1,1665 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.vector;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.apache.arrow.memory.ArrowBuf;
+import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.vector.complex.BaseRepeatedValueVector;
+import org.apache.arrow.vector.complex.BaseRepeatedValueViewVector;
+import org.apache.arrow.vector.complex.ListVector;
+import org.apache.arrow.vector.complex.ListViewVector;
+import org.apache.arrow.vector.complex.impl.UnionListViewWriter;
+import org.apache.arrow.vector.complex.impl.UnionListWriter;
+import org.apache.arrow.vector.holders.DurationHolder;
+import org.apache.arrow.vector.holders.TimeStampMilliTZHolder;
+import org.apache.arrow.vector.types.TimeUnit;
+import org.apache.arrow.vector.types.Types.MinorType;
+import org.apache.arrow.vector.types.pojo.ArrowType;
+import org.apache.arrow.vector.types.pojo.Field;
+import org.apache.arrow.vector.types.pojo.FieldType;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class TestListViewVector {
+
+  private BufferAllocator allocator;
+
+  @BeforeEach
+  public void init() {
+    allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
+  }
+
+  @AfterEach
+  public void terminate() throws Exception {
+    allocator.close();
+  }
+
+  @Test
+  public void testBasicListViewVector() {
+    try (ListViewVector listViewVector = ListViewVector.empty("sourceVector", allocator)) {
+      UnionListViewWriter listViewWriter = listViewVector.getWriter();
+
+      /* allocate memory */
+      listViewWriter.allocate();
+
+      /* write the first list at index 0 */
+      listViewWriter.setPosition(0);
+      listViewWriter.startList();
+
+      listViewWriter.bigInt().writeBigInt(12);
+      listViewWriter.bigInt().writeBigInt(-7);
+      listViewWriter.bigInt().writeBigInt(25);
+      listViewWriter.endList();
+
+      /* the second list at index 1 is null (we are not setting any)*/
+
+      /* write the third list at index 2 */
+      listViewWriter.setPosition(2);
+      listViewWriter.startList();
+
+      listViewWriter.bigInt().writeBigInt(0);
+      listViewWriter.bigInt().writeBigInt(-127);
+      listViewWriter.bigInt().writeBigInt(127);
+      listViewWriter.bigInt().writeBigInt(50);
+      listViewWriter.endList();
+
+      /* write the fourth list at index 3 (empty list) */
+      listViewWriter.setPosition(3);
+      listViewWriter.startList();
+      listViewWriter.endList();
+
+      /* write the fifth list at index 4 */
+      listViewWriter.setPosition(4);
+      listViewWriter.startList();
+      listViewWriter.bigInt().writeBigInt(1);
+      listViewWriter.bigInt().writeBigInt(2);
+      listViewWriter.bigInt().writeBigInt(3);
+      listViewWriter.bigInt().writeBigInt(4);
+      listViewWriter.endList();
+
+      listViewVector.setValueCount(5);
+      // check value count
+      assertEquals(5, listViewVector.getValueCount());
+
+      /* get vector at index 0 -- the value is a BigIntVector*/
+      final ArrowBuf offSetBuffer = listViewVector.getOffsetBuffer();
+      final ArrowBuf sizeBuffer = listViewVector.getSizeBuffer();
+      final FieldVector dataVec = listViewVector.getDataVector();
+
+      // check offset buffer
+      assertEquals(0, offSetBuffer.getInt(0 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(0, offSetBuffer.getInt(1 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(3, offSetBuffer.getInt(2 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(7, offSetBuffer.getInt(3 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(7, offSetBuffer.getInt(4 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+
+      // check size buffer
+      assertEquals(3, sizeBuffer.getInt(0 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(1 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(4, sizeBuffer.getInt(2 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(3 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(4, sizeBuffer.getInt(4 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+
+      // check data vector
+      assertEquals(12, ((BigIntVector) dataVec).get(0));
+      assertEquals(-7, ((BigIntVector) dataVec).get(1));
+      assertEquals(25, ((BigIntVector) dataVec).get(2));
+      assertEquals(0, ((BigIntVector) dataVec).get(3));
+      assertEquals(-127, ((BigIntVector) dataVec).get(4));
+      assertEquals(127, ((BigIntVector) dataVec).get(5));
+      assertEquals(50, ((BigIntVector) dataVec).get(6));
+      assertEquals(1, ((BigIntVector) dataVec).get(7));
+      assertEquals(2, ((BigIntVector) dataVec).get(8));
+      assertEquals(3, ((BigIntVector) dataVec).get(9));
+      assertEquals(4, ((BigIntVector) dataVec).get(10));
+
+      listViewVector.validate();
+    }
+  }
+
+  @Test
+  public void testImplicitNullVectors() {
+    try (ListViewVector listViewVector = ListViewVector.empty("sourceVector", allocator)) {
+      UnionListViewWriter listViewWriter = listViewVector.getWriter();
+      /* allocate memory */
+      listViewWriter.allocate();
+
+      final ArrowBuf offSetBuffer = listViewVector.getOffsetBuffer();
+      final ArrowBuf sizeBuffer = listViewVector.getSizeBuffer();
+
+      /* write the first list at index 0 */
+      listViewWriter.setPosition(0);
+      listViewWriter.startList();
+
+      listViewWriter.bigInt().writeBigInt(12);
+      listViewWriter.bigInt().writeBigInt(-7);
+      listViewWriter.bigInt().writeBigInt(25);
+      listViewWriter.endList();
+
+      int offSet0 = offSetBuffer.getInt(0 * BaseRepeatedValueViewVector.OFFSET_WIDTH);
+      int size0 = sizeBuffer.getInt(0 * BaseRepeatedValueViewVector.SIZE_WIDTH);
+
+      // after the first list is written,
+      // the initial offset must be 0,
+      // the size must be 3 (as there are 3 elements in the array),
+      // the lastSet must be 0 since, the first list is written at index 0.
+
+      assertEquals(0, offSet0);
+      assertEquals(3, size0);
+
+      listViewWriter.setPosition(5);
+      listViewWriter.startList();
+
+      // writing the 6th list at index 5,
+      // and the list items from index 1 through 4 are not populated.
+      // but since there is a gap between the 0th and 5th list, in terms
+      // of buffer allocation, the offset and size buffers must be updated
+      // to reflect the implicit null vectors.
+
+      for (int i = 1; i < 5; i++) {
+        int offSet = offSetBuffer.getInt(i * BaseRepeatedValueViewVector.OFFSET_WIDTH);
+        int size = sizeBuffer.getInt(i * BaseRepeatedValueViewVector.SIZE_WIDTH);
+        // Since the list is not written, the offset and size must equal to child vector's size
+        // i.e., 3, and size should be 0 as the list is not written.
+        // And the last set value is the value currently being written, which is 5.
+        assertEquals(0, offSet);
+        assertEquals(0, size);
+      }
+
+      listViewWriter.bigInt().writeBigInt(12);
+      listViewWriter.bigInt().writeBigInt(25);
+      listViewWriter.endList();
+
+      int offSet5 = offSetBuffer.getInt(5 * BaseRepeatedValueViewVector.OFFSET_WIDTH);
+      int size5 = sizeBuffer.getInt(5 * BaseRepeatedValueViewVector.SIZE_WIDTH);
+
+      assertEquals(3, offSet5);
+      assertEquals(2, size5);
+
+      listViewWriter.setPosition(10);
+      listViewWriter.startList();
+
+      // writing the 11th list at index 10,
+      // and the list items from index 6 through 10 are not populated.
+      // but since there is a gap between the 5th and 11th list, in terms
+      // of buffer allocation, the offset and size buffers must be updated
+      // to reflect the implicit null vectors.
+      for (int i = 6; i < 10; i++) {
+        int offSet = offSetBuffer.getInt(i * BaseRepeatedValueViewVector.OFFSET_WIDTH);
+        int size = sizeBuffer.getInt(i * BaseRepeatedValueViewVector.SIZE_WIDTH);
+        // Since the list is not written, the offset and size must equal to 0
+        // and size should be 0 as the list is not written.
+        // And the last set value is the value currently being written, which is 10.
+        assertEquals(0, offSet);
+        assertEquals(0, size);
+      }
+
+      listViewWriter.bigInt().writeBigInt(12);
+      listViewWriter.endList();
+
+      int offSet11 = offSetBuffer.getInt(10 * BaseRepeatedValueViewVector.OFFSET_WIDTH);
+      int size11 = sizeBuffer.getInt(10 * BaseRepeatedValueViewVector.SIZE_WIDTH);
+
+      assertEquals(5, offSet11);
+      assertEquals(1, size11);
+
+      listViewVector.setValueCount(11);
+
+      listViewVector.validate();
+    }
+  }
+
+  @Test
+  public void testNestedListViewVector() {
+    try (ListViewVector listViewVector = ListViewVector.empty("sourceVector", allocator)) {
+      UnionListViewWriter listViewWriter = listViewVector.getWriter();
+
+      /* allocate memory */
+      listViewWriter.allocate();
+
+      /* the dataVector that backs a listVector will also be a
+       * listVector for this test.
+       */
+
+      /* write one or more inner lists at index 0 */
+      listViewWriter.setPosition(0);
+      listViewWriter.startList();
+
+      listViewWriter.list().startList();
+      listViewWriter.list().bigInt().writeBigInt(50);
+      listViewWriter.list().bigInt().writeBigInt(100);
+      listViewWriter.list().bigInt().writeBigInt(200);
+      listViewWriter.list().endList();
+
+      listViewWriter.list().startList();
+      listViewWriter.list().bigInt().writeBigInt(75);
+      listViewWriter.list().bigInt().writeBigInt(125);
+      listViewWriter.list().bigInt().writeBigInt(150);
+      listViewWriter.list().bigInt().writeBigInt(175);
+      listViewWriter.list().endList();
+
+      listViewWriter.endList();
+
+      /* write one or more inner lists at index 1 */
+      listViewWriter.setPosition(1);
+      listViewWriter.startList();
+
+      listViewWriter.list().startList();
+      listViewWriter.list().bigInt().writeBigInt(10);
+      listViewWriter.list().endList();
+
+      listViewWriter.list().startList();
+      listViewWriter.list().bigInt().writeBigInt(15);
+      listViewWriter.list().bigInt().writeBigInt(20);
+      listViewWriter.list().endList();
+
+      listViewWriter.list().startList();
+      listViewWriter.list().bigInt().writeBigInt(25);
+      listViewWriter.list().bigInt().writeBigInt(30);
+      listViewWriter.list().bigInt().writeBigInt(35);
+      listViewWriter.list().endList();
+
+      listViewWriter.endList();
+
+      listViewVector.setValueCount(2);
+
+      // [[[50,100,200],[75,125,150,175]], [[10],[15,20],[25,30,35]]]
+
+      assertEquals(2, listViewVector.getValueCount());
+
+      /* get listViewVector value at index 0 -- the value itself is a listViewVector */
+      Object result = listViewVector.getObject(0);
+      ArrayList<ArrayList<Long>> resultSet = (ArrayList<ArrayList<Long>>) result;
+      ArrayList<Long> list;
+
+      assertEquals(2, resultSet.size()); /* 2 inner lists at index 0 */
+      assertEquals(3, resultSet.get(0).size()); /* size of the first inner list */
+      assertEquals(4, resultSet.get(1).size()); /* size of the second inner list */
+
+      list = resultSet.get(0);
+      assertEquals(Long.valueOf(50), list.get(0));
+      assertEquals(Long.valueOf(100), list.get(1));
+      assertEquals(Long.valueOf(200), list.get(2));
+
+      list = resultSet.get(1);
+      assertEquals(Long.valueOf(75), list.get(0));
+      assertEquals(Long.valueOf(125), list.get(1));
+      assertEquals(Long.valueOf(150), list.get(2));
+      assertEquals(Long.valueOf(175), list.get(3));
+
+      /* get listViewVector value at index 1 -- the value itself is a listViewVector */
+      result = listViewVector.getObject(1);
+      resultSet = (ArrayList<ArrayList<Long>>) result;
+
+      assertEquals(3, resultSet.size()); /* 3 inner lists at index 1 */
+      assertEquals(1, resultSet.get(0).size()); /* size of the first inner list */
+      assertEquals(2, resultSet.get(1).size()); /* size of the second inner list */
+      assertEquals(3, resultSet.get(2).size()); /* size of the third inner list */
+
+      list = resultSet.get(0);
+      assertEquals(Long.valueOf(10), list.get(0));
+
+      list = resultSet.get(1);
+      assertEquals(Long.valueOf(15), list.get(0));
+      assertEquals(Long.valueOf(20), list.get(1));
+
+      list = resultSet.get(2);
+      assertEquals(Long.valueOf(25), list.get(0));
+      assertEquals(Long.valueOf(30), list.get(1));
+      assertEquals(Long.valueOf(35), list.get(2));
+
+      /* check underlying bitVector */
+      assertFalse(listViewVector.isNull(0));
+      assertFalse(listViewVector.isNull(1));
+
+      final ArrowBuf offSetBuffer = listViewVector.getOffsetBuffer();
+      final ArrowBuf sizeBuffer = listViewVector.getSizeBuffer();
+
+      // check offset buffer
+      assertEquals(0, offSetBuffer.getInt(0 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(2, offSetBuffer.getInt(1 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+
+      // check size buffer
+      assertEquals(2, sizeBuffer.getInt(0 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(3, sizeBuffer.getInt(1 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+
+      listViewVector.validate();
+    }
+  }
+
+  @Test
+  public void testNestedListVector() throws Exception {
+    try (ListViewVector listViewVector = ListViewVector.empty("sourceVector", allocator)) {
+
+      MinorType listType = MinorType.LISTVIEW;
+      MinorType scalarType = MinorType.BIGINT;
+
+      listViewVector.addOrGetVector(FieldType.nullable(listType.getType()));
+
+      ListViewVector innerList1 = (ListViewVector) listViewVector.getDataVector();
+      innerList1.addOrGetVector(FieldType.nullable(listType.getType()));
+
+      ListViewVector innerList2 = (ListViewVector) innerList1.getDataVector();
+      innerList2.addOrGetVector(FieldType.nullable(listType.getType()));
+
+      ListViewVector innerList3 = (ListViewVector) innerList2.getDataVector();
+      innerList3.addOrGetVector(FieldType.nullable(listType.getType()));
+
+      ListViewVector innerList4 = (ListViewVector) innerList3.getDataVector();
+      innerList4.addOrGetVector(FieldType.nullable(listType.getType()));
+
+      ListViewVector innerList5 = (ListViewVector) innerList4.getDataVector();
+      innerList5.addOrGetVector(FieldType.nullable(listType.getType()));
+
+      ListViewVector innerList6 = (ListViewVector) innerList5.getDataVector();
+      innerList6.addOrGetVector(FieldType.nullable(scalarType.getType()));
+
+      listViewVector.setInitialCapacity(128);
+
+      listViewVector.validate();
+    }
+  }
+
+  private void setValuesInBuffer(int[] bufValues, ArrowBuf buffer, long bufWidth) {
+    for (int i = 0; i < bufValues.length; i++) {
+      buffer.setInt(i * bufWidth, bufValues[i]);
+    }
+  }
+
+  /*
+   * Setting up the buffers directly needs to be validated with the base method used in
+   * the ListVector class where we use the approach of startList(),
+   * write to the child vector and endList().
+   * <p>
+   * To support this, we have to consider the following scenarios;
+   * <p>
+   * 1. Only using directly buffer-based inserts.
+   * 2. Default list insertion followed by buffer-based inserts.
+   * 3. Buffer-based inserts followed by default list insertion.
+   */
+
+  /* Setting up buffers directly would require the following steps to be taken
+   * 0. Allocate buffers in listViewVector by calling `allocateNew` method.
+   * 1. Initialize the child vector using `initializeChildrenFromFields` method.
+   * 2. Set values in the child vector.
+   * 3. Set validity, offset and size buffers using `setValidity`,
+   * `setOffset` and `setSize` methods.
+   * 4. Set value count using `setValueCount` method.
+   */
+  @Test
+  public void testBasicListViewSet() {
+
+    try (ListViewVector listViewVector = ListViewVector.empty("sourceVector", allocator)) {
+      // Allocate buffers in listViewVector by calling `allocateNew` method.
+      listViewVector.allocateNew();
+
+      // Initialize the child vector using `initializeChildrenFromFields` method.
+      FieldType fieldType = new FieldType(true, new ArrowType.Int(64, true), null, null);
+      Field field = new Field("child-vector", fieldType, null);
+      listViewVector.initializeChildrenFromFields(Collections.singletonList(field));
+
+      // Set values in the child vector.
+      FieldVector fieldVector = listViewVector.getDataVector();
+      fieldVector.clear();
+
+      BigIntVector childVector = (BigIntVector) fieldVector;
+      childVector.allocateNew(7);
+
+      childVector.set(0, 12);
+      childVector.set(1, -7);
+      childVector.set(2, 25);
+      childVector.set(3, 0);
+      childVector.set(4, -127);
+      childVector.set(5, 127);
+      childVector.set(6, 50);
+
+      childVector.setValueCount(7);
+
+      // Set validity, offset and size buffers using `setValidity`,
+      // `setOffset` and `setSize` methods.
+      listViewVector.setOffset(0, 0);
+      listViewVector.setOffset(1, 3);
+      listViewVector.setOffset(2, 3);
+      listViewVector.setOffset(3, 7);
+
+      listViewVector.setSize(0, 3);
+      listViewVector.setSize(1, 0);
+      listViewVector.setSize(2, 4);
+      listViewVector.setSize(3, 0);
+
+      listViewVector.setValidity(0, 1);
+      listViewVector.setValidity(1, 0);
+      listViewVector.setValidity(2, 1);
+      listViewVector.setValidity(3, 1);
+
+      // Set value count using `setValueCount` method.
+      listViewVector.setValueCount(4);
+
+      final ArrowBuf offSetBuffer = listViewVector.getOffsetBuffer();
+      final ArrowBuf sizeBuffer = listViewVector.getSizeBuffer();
+
+      // check offset buffer
+      assertEquals(0, offSetBuffer.getInt(0 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(3, offSetBuffer.getInt(1 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(3, offSetBuffer.getInt(2 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(7, offSetBuffer.getInt(3 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+
+      // check size buffer
+      assertEquals(3, sizeBuffer.getInt(0 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(1 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(4, sizeBuffer.getInt(2 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(3 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+
+      // check values
+      assertEquals(12, ((BigIntVector) listViewVector.getDataVector()).get(0));
+      assertEquals(-7, ((BigIntVector) listViewVector.getDataVector()).get(1));
+      assertEquals(25, ((BigIntVector) listViewVector.getDataVector()).get(2));
+      assertEquals(0, ((BigIntVector) listViewVector.getDataVector()).get(3));
+      assertEquals(-127, ((BigIntVector) listViewVector.getDataVector()).get(4));
+      assertEquals(127, ((BigIntVector) listViewVector.getDataVector()).get(5));
+      assertEquals(50, ((BigIntVector) listViewVector.getDataVector()).get(6));
+
+      listViewVector.validate();
+    }
+  }
+
+  @Test
+  public void testBasicListViewSetNested() {
+    // Expected listview
+    // [[[50,100,200],[75,125,150,175]],[[10],[15,20],[25,30,35]]]
+
+    // Setting child vector
+    // [[50,100,200],[75,125,150,175],[10],[15,20],[25,30,35]]
+    try (ListViewVector listViewVector = ListViewVector.empty("sourceVector", allocator)) {
+      // Allocate buffers in listViewVector by calling `allocateNew` method.
+      listViewVector.allocateNew();
+
+      // Initialize the child vector using `initializeChildrenFromFields` method.
+      FieldType fieldType = new FieldType(true, new ArrowType.List(), null, null);
+      FieldType childFieldType = new FieldType(true, new ArrowType.Int(64, true), null, null);
+      Field childField = new Field("child-vector", childFieldType, null);
+      List<Field> children = new ArrayList<>();
+      children.add(childField);
+      Field field = new Field("child-vector", fieldType, children);
+      listViewVector.initializeChildrenFromFields(Collections.singletonList(field));
+
+      // Set values in the child vector.
+      FieldVector fieldVector = listViewVector.getDataVector();
+      fieldVector.clear();
+
+      ListVector childVector = (ListVector) fieldVector;
+      UnionListWriter listWriter = childVector.getWriter();
+      listWriter.allocate();
+
+      listWriter.setPosition(0);
+      listWriter.startList();
+
+      listWriter.bigInt().writeBigInt(50);
+      listWriter.bigInt().writeBigInt(100);
+      listWriter.bigInt().writeBigInt(200);
+
+      listWriter.endList();
+
+      listWriter.setPosition(1);
+      listWriter.startList();
+
+      listWriter.bigInt().writeBigInt(75);
+      listWriter.bigInt().writeBigInt(125);
+      listWriter.bigInt().writeBigInt(150);
+      listWriter.bigInt().writeBigInt(175);
+
+      listWriter.endList();
+
+      listWriter.setPosition(2);
+      listWriter.startList();
+
+      listWriter.bigInt().writeBigInt(10);
+
+      listWriter.endList();
+
+      listWriter.startList();
+      listWriter.setPosition(3);
+
+      listWriter.bigInt().writeBigInt(15);
+      listWriter.bigInt().writeBigInt(20);
+
+      listWriter.endList();
+
+      listWriter.startList();
+      listWriter.setPosition(4);
+
+      listWriter.bigInt().writeBigInt(25);
+      listWriter.bigInt().writeBigInt(30);
+      listWriter.bigInt().writeBigInt(35);
+
+      listWriter.endList();
+
+      childVector.setValueCount(5);
+
+      // Set validity, offset and size buffers using `setValidity`,
+      //  `setOffset` and `setSize` methods.
+
+      listViewVector.setValidity(0, 1);
+      listViewVector.setValidity(1, 1);
+
+      listViewVector.setOffset(0, 0);
+      listViewVector.setOffset(1, 2);
+
+      listViewVector.setSize(0, 2);
+      listViewVector.setSize(1, 3);
+
+      // Set value count using `setValueCount` method.
+      listViewVector.setValueCount(2);
+
+      assertEquals(2, listViewVector.getValueCount());
+
+      /* get listViewVector value at index 0 -- the value itself is a listViewVector */
+      Object result = listViewVector.getObject(0);
+      ArrayList<ArrayList<Long>> resultSet = (ArrayList<ArrayList<Long>>) result;
+      ArrayList<Long> list;
+
+      assertEquals(2, resultSet.size()); /* 2 inner lists at index 0 */
+      assertEquals(3, resultSet.get(0).size()); /* size of the first inner list */
+      assertEquals(4, resultSet.get(1).size()); /* size of the second inner list */
+
+      list = resultSet.get(0);
+      assertEquals(Long.valueOf(50), list.get(0));
+      assertEquals(Long.valueOf(100), list.get(1));
+      assertEquals(Long.valueOf(200), list.get(2));
+
+      list = resultSet.get(1);
+      assertEquals(Long.valueOf(75), list.get(0));
+      assertEquals(Long.valueOf(125), list.get(1));
+      assertEquals(Long.valueOf(150), list.get(2));
+      assertEquals(Long.valueOf(175), list.get(3));
+
+      /* get listViewVector value at index 1 -- the value itself is a listViewVector */
+      result = listViewVector.getObject(1);
+      resultSet = (ArrayList<ArrayList<Long>>) result;
+
+      assertEquals(3, resultSet.size()); /* 3 inner lists at index 1 */
+      assertEquals(1, resultSet.get(0).size()); /* size of the first inner list */
+      assertEquals(2, resultSet.get(1).size()); /* size of the second inner list */
+      assertEquals(3, resultSet.get(2).size()); /* size of the third inner list */
+
+      list = resultSet.get(0);
+      assertEquals(Long.valueOf(10), list.get(0));
+
+      list = resultSet.get(1);
+      assertEquals(Long.valueOf(15), list.get(0));
+      assertEquals(Long.valueOf(20), list.get(1));
+
+      list = resultSet.get(2);
+      assertEquals(Long.valueOf(25), list.get(0));
+      assertEquals(Long.valueOf(30), list.get(1));
+      assertEquals(Long.valueOf(35), list.get(2));
+
+      /* check underlying bitVector */
+      assertFalse(listViewVector.isNull(0));
+      assertFalse(listViewVector.isNull(1));
+
+      final ArrowBuf offSetBuffer = listViewVector.getOffsetBuffer();
+      final ArrowBuf sizeBuffer = listViewVector.getSizeBuffer();
+
+      // check offset buffer
+      assertEquals(0, offSetBuffer.getInt(0 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(2, offSetBuffer.getInt(1 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+
+      // check size buffer
+      assertEquals(2, sizeBuffer.getInt(0 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(3, sizeBuffer.getInt(1 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+
+      listViewVector.validate();
+    }
+  }
+
+  @Test
+  public void testBasicListViewSetWithListViewWriter() {
+    try (ListViewVector listViewVector = ListViewVector.empty("sourceVector", allocator)) {
+      // Allocate buffers in listViewVector by calling `allocateNew` method.
+      listViewVector.allocateNew();
+
+      // Initialize the child vector using `initializeChildrenFromFields` method.
+      FieldType fieldType = new FieldType(true, new ArrowType.Int(64, true), null, null);
+      Field field = new Field("child-vector", fieldType, null);
+      listViewVector.initializeChildrenFromFields(Collections.singletonList(field));
+
+      // Set values in the child vector.
+      FieldVector fieldVector = listViewVector.getDataVector();
+      fieldVector.clear();
+
+      BigIntVector childVector = (BigIntVector) fieldVector;
+      childVector.allocateNew(7);
+
+      childVector.set(0, 12);
+      childVector.set(1, -7);
+      childVector.set(2, 25);
+      childVector.set(3, 0);
+      childVector.set(4, -127);
+      childVector.set(5, 127);
+      childVector.set(6, 50);
+
+      childVector.setValueCount(7);
+
+      // Set validity, offset and size buffers using `setValidity`,
+      //  `setOffset` and `setSize` methods.
+
+      listViewVector.setValidity(0, 1);
+      listViewVector.setValidity(1, 0);
+      listViewVector.setValidity(2, 1);
+      listViewVector.setValidity(3, 1);
+
+      listViewVector.setOffset(0, 0);
+      listViewVector.setOffset(1, 3);
+      listViewVector.setOffset(2, 3);
+      listViewVector.setOffset(3, 7);
+
+      listViewVector.setSize(0, 3);
+      listViewVector.setSize(1, 0);
+      listViewVector.setSize(2, 4);
+      listViewVector.setSize(3, 0);
+
+      // Set value count using `setValueCount` method.
+      listViewVector.setValueCount(4);
+
+      final ArrowBuf offSetBuffer = listViewVector.getOffsetBuffer();
+      final ArrowBuf sizeBuffer = listViewVector.getSizeBuffer();
+
+      // check offset buffer
+      assertEquals(0, offSetBuffer.getInt(0 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(3, offSetBuffer.getInt(1 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(3, offSetBuffer.getInt(2 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(7, offSetBuffer.getInt(3 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+
+      // check size buffer
+      assertEquals(3, sizeBuffer.getInt(0 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(1 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(4, sizeBuffer.getInt(2 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(3 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+
+      // check values
+      assertEquals(12, ((BigIntVector) listViewVector.getDataVector()).get(0));
+      assertEquals(-7, ((BigIntVector) listViewVector.getDataVector()).get(1));
+      assertEquals(25, ((BigIntVector) listViewVector.getDataVector()).get(2));
+      assertEquals(0, ((BigIntVector) listViewVector.getDataVector()).get(3));
+      assertEquals(-127, ((BigIntVector) listViewVector.getDataVector()).get(4));
+      assertEquals(127, ((BigIntVector) listViewVector.getDataVector()).get(5));
+      assertEquals(50, ((BigIntVector) listViewVector.getDataVector()).get(6));
+
+      UnionListViewWriter listViewWriter = listViewVector.getWriter();
+
+      listViewWriter.setPosition(4);
+      listViewWriter.startList();
+
+      listViewWriter.bigInt().writeBigInt(121);
+      listViewWriter.bigInt().writeBigInt(-71);
+      listViewWriter.bigInt().writeBigInt(251);
+      listViewWriter.endList();
+
+      listViewVector.setValueCount(5);
+
+      // check offset buffer
+      assertEquals(0, offSetBuffer.getInt(0 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(3, offSetBuffer.getInt(1 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(3, offSetBuffer.getInt(2 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(7, offSetBuffer.getInt(3 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(7, offSetBuffer.getInt(4 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+
+      // check size buffer
+      assertEquals(3, sizeBuffer.getInt(0 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(1 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(4, sizeBuffer.getInt(2 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(3 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(3, sizeBuffer.getInt(4 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+
+      // check values
+      assertEquals(12, ((BigIntVector) listViewVector.getDataVector()).get(0));
+      assertEquals(-7, ((BigIntVector) listViewVector.getDataVector()).get(1));
+      assertEquals(25, ((BigIntVector) listViewVector.getDataVector()).get(2));
+      assertEquals(0, ((BigIntVector) listViewVector.getDataVector()).get(3));
+      assertEquals(-127, ((BigIntVector) listViewVector.getDataVector()).get(4));
+      assertEquals(127, ((BigIntVector) listViewVector.getDataVector()).get(5));
+      assertEquals(50, ((BigIntVector) listViewVector.getDataVector()).get(6));
+      assertEquals(121, ((BigIntVector) listViewVector.getDataVector()).get(7));
+      assertEquals(-71, ((BigIntVector) listViewVector.getDataVector()).get(8));
+      assertEquals(251, ((BigIntVector) listViewVector.getDataVector()).get(9));
+
+      listViewVector.validate();
+    }
+  }
+
+  @Test
+  public void testGetBufferAddress() throws Exception {
+    try (ListViewVector listViewVector = ListViewVector.empty("vector", allocator)) {
+
+      UnionListViewWriter listViewWriter = listViewVector.getWriter();
+      boolean error = false;
+
+      listViewWriter.allocate();
+
+      listViewWriter.setPosition(0);
+      listViewWriter.startList();
+      listViewWriter.bigInt().writeBigInt(50);
+      listViewWriter.bigInt().writeBigInt(100);
+      listViewWriter.bigInt().writeBigInt(200);
+      listViewWriter.endList();
+
+      listViewWriter.setPosition(1);
+      listViewWriter.startList();
+      listViewWriter.bigInt().writeBigInt(250);
+      listViewWriter.bigInt().writeBigInt(300);
+      listViewWriter.endList();
+
+      listViewVector.setValueCount(2);
+
+      /* check listVector contents */
+      Object result = listViewVector.getObject(0);
+      ArrayList<Long> resultSet = (ArrayList<Long>) result;
+      assertEquals(3, resultSet.size());
+      assertEquals(Long.valueOf(50), resultSet.get(0));
+      assertEquals(Long.valueOf(100), resultSet.get(1));
+      assertEquals(Long.valueOf(200), resultSet.get(2));
+
+      result = listViewVector.getObject(1);
+      resultSet = (ArrayList<Long>) result;
+      assertEquals(2, resultSet.size());
+      assertEquals(Long.valueOf(250), resultSet.get(0));
+      assertEquals(Long.valueOf(300), resultSet.get(1));
+
+      List<ArrowBuf> buffers = listViewVector.getFieldBuffers();
+
+      long bitAddress = listViewVector.getValidityBufferAddress();
+      long offsetAddress = listViewVector.getOffsetBufferAddress();
+      long sizeAddress = listViewVector.getSizeBufferAddress();
+
+      try {
+        listViewVector.getDataBufferAddress();
+      } catch (UnsupportedOperationException ue) {
+        error = true;
+      } finally {
+        assertTrue(error);
+      }
+
+      assertEquals(3, buffers.size());
+      assertEquals(bitAddress, buffers.get(0).memoryAddress());
+      assertEquals(offsetAddress, buffers.get(1).memoryAddress());
+      assertEquals(sizeAddress, buffers.get(2).memoryAddress());
+
+      /* (3+2)/2 */
+      assertEquals(2.5, listViewVector.getDensity(), 0);
+      listViewVector.validate();
+    }
+  }
+
+  @Test
+  public void testConsistentChildName() throws Exception {
+    try (ListViewVector listViewVector = ListViewVector.empty("sourceVector", allocator)) {
+      String emptyListStr = listViewVector.getField().toString();
+      assertTrue(emptyListStr.contains(ListVector.DATA_VECTOR_NAME));
+
+      listViewVector.addOrGetVector(FieldType.nullable(MinorType.INT.getType()));
+      String emptyVectorStr = listViewVector.getField().toString();
+      assertTrue(emptyVectorStr.contains(ListVector.DATA_VECTOR_NAME));
+    }
+  }
+
+  @Test
+  public void testSetInitialCapacity() {
+    try (final ListViewVector vector = ListViewVector.empty("", allocator)) {
+      vector.addOrGetVector(FieldType.nullable(MinorType.INT.getType()));
+
+      vector.setInitialCapacity(512);
+      vector.allocateNew();
+      assertEquals(512, vector.getValueCapacity());
+      assertTrue(vector.getDataVector().getValueCapacity() >= 512);
+
+      vector.setInitialCapacity(512, 4);
+      vector.allocateNew();
+      assertEquals(512, vector.getValueCapacity());
+      assertTrue(vector.getDataVector().getValueCapacity() >= 512 * 4);
+
+      vector.setInitialCapacity(512, 0.1);
+      vector.allocateNew();
+      assertEquals(512, vector.getValueCapacity());
+      assertTrue(vector.getDataVector().getValueCapacity() >= 51);
+
+      vector.setInitialCapacity(512, 0.01);
+      vector.allocateNew();
+      assertEquals(512, vector.getValueCapacity());
+      assertTrue(vector.getDataVector().getValueCapacity() >= 5);
+
+      vector.setInitialCapacity(5, 0.1);
+      vector.allocateNew();
+      assertEquals(8, vector.getValueCapacity());
+      assertTrue(vector.getDataVector().getValueCapacity() >= 1);
+
+      vector.validate();
+    }
+  }
+
+  @Test
+  public void testClearAndReuse() {
+    try (final ListViewVector vector = ListViewVector.empty("listview", allocator)) {
+      BigIntVector bigIntVector =
+          (BigIntVector)
+              vector.addOrGetVector(FieldType.nullable(MinorType.BIGINT.getType())).getVector();
+      vector.setInitialCapacity(10);
+      vector.allocateNew();
+
+      vector.startNewValue(0);
+      bigIntVector.setSafe(0, 7);
+      vector.endValue(0, 1);
+      vector.startNewValue(1);
+      bigIntVector.setSafe(1, 8);
+      vector.endValue(1, 1);
+      vector.setValueCount(2);
+
+      Object result = vector.getObject(0);
+      ArrayList<Long> resultSet = (ArrayList<Long>) result;
+      assertEquals(Long.valueOf(7), resultSet.get(0));
+
+      result = vector.getObject(1);
+      resultSet = (ArrayList<Long>) result;
+      assertEquals(Long.valueOf(8), resultSet.get(0));
+
+      // Clear and release the buffers to trigger a realloc when adding next value
+      vector.clear();
+
+      // The list vector should reuse a buffer when reallocating the offset buffer
+      vector.startNewValue(0);
+      bigIntVector.setSafe(0, 7);
+      vector.endValue(0, 1);
+      vector.startNewValue(1);
+      bigIntVector.setSafe(1, 8);
+      vector.endValue(1, 1);
+      vector.setValueCount(2);
+
+      result = vector.getObject(0);
+      resultSet = (ArrayList<Long>) result;
+      assertEquals(Long.valueOf(7), resultSet.get(0));
+
+      result = vector.getObject(1);
+      resultSet = (ArrayList<Long>) result;
+      assertEquals(Long.valueOf(8), resultSet.get(0));
+
+      vector.validate();
+    }
+  }
+
+  @Test
+  public void testWriterGetField() {
+    // adopted from ListVector test cases
+    try (final ListViewVector vector = ListViewVector.empty("listview", allocator)) {
+
+      UnionListViewWriter writer = vector.getWriter();
+      writer.allocate();
+
+      // set some values
+      writer.startList();
+      writer.integer().writeInt(1);
+      writer.integer().writeInt(2);
+      writer.endList();
+      vector.setValueCount(2);
+
+      Field expectedDataField =
+          new Field(
+              BaseRepeatedValueVector.DATA_VECTOR_NAME,
+              FieldType.nullable(new ArrowType.Int(32, true)),
+              null);
+      Field expectedField =
+          new Field(
+              vector.getName(),
+              FieldType.nullable(ArrowType.ListView.INSTANCE),
+              Arrays.asList(expectedDataField));
+
+      assertEquals(expectedField, writer.getField());
+
+      vector.validate();
+    }
+  }
+
+  @Test
+  public void testWriterUsingHolderGetTimestampMilliTZField() {
+    // adopted from ListVector test cases
+    try (final ListViewVector vector = ListViewVector.empty("listview", allocator)) {
+      org.apache.arrow.vector.complex.writer.FieldWriter writer = vector.getWriter();
+      writer.allocate();
+
+      TimeStampMilliTZHolder holder = new TimeStampMilliTZHolder();
+      holder.timezone = "SomeFakeTimeZone";
+      writer.startList();
+      holder.value = 12341234L;
+      writer.timeStampMilliTZ().write(holder);
+      holder.value = 55555L;
+      writer.timeStampMilliTZ().write(holder);
+
+      // Writing with a different timezone should throw
+      holder.timezone = "AsdfTimeZone";
+      holder.value = 77777;
+      IllegalArgumentException ex =
+          assertThrows(
+              IllegalArgumentException.class, () -> writer.timeStampMilliTZ().write(holder));
+      assertEquals(
+          "holder.timezone: AsdfTimeZone not equal to vector timezone: SomeFakeTimeZone",
+          ex.getMessage());
+
+      writer.endList();
+      vector.setValueCount(1);
+
+      Field expectedDataField =
+          new Field(
+              BaseRepeatedValueVector.DATA_VECTOR_NAME,
+              FieldType.nullable(new ArrowType.Timestamp(TimeUnit.MILLISECOND, "SomeFakeTimeZone")),
+              null);
+      Field expectedField =
+          new Field(
+              vector.getName(),
+              FieldType.nullable(ArrowType.ListView.INSTANCE),
+              Arrays.asList(expectedDataField));
+
+      assertEquals(expectedField, writer.getField());
+
+      vector.validate();
+    }
+  }
+
+  @Test
+  public void testWriterGetDurationField() {
+    // adopted from ListVector test cases
+    try (final ListViewVector vector = ListViewVector.empty("listview", allocator)) {
+      org.apache.arrow.vector.complex.writer.FieldWriter writer = vector.getWriter();
+      writer.allocate();
+
+      DurationHolder durationHolder = new DurationHolder();
+      durationHolder.unit = TimeUnit.MILLISECOND;
+
+      writer.startList();
+      durationHolder.value = 812374L;
+      writer.duration().write(durationHolder);
+      durationHolder.value = 143451L;
+      writer.duration().write(durationHolder);
+
+      // Writing with a different unit should throw
+      durationHolder.unit = TimeUnit.SECOND;
+      durationHolder.value = 8888888;
+      IllegalArgumentException ex =
+          assertThrows(
+              IllegalArgumentException.class, () -> writer.duration().write(durationHolder));
+      assertEquals("holder.unit: SECOND not equal to vector unit: MILLISECOND", ex.getMessage());
+
+      writer.endList();
+      vector.setValueCount(1);
+
+      Field expectedDataField =
+          new Field(
+              BaseRepeatedValueVector.DATA_VECTOR_NAME,
+              FieldType.nullable(new ArrowType.Duration(TimeUnit.MILLISECOND)),
+              null);
+      Field expectedField =
+          new Field(
+              vector.getName(),
+              FieldType.nullable(ArrowType.ListView.INSTANCE),
+              Arrays.asList(expectedDataField));
+
+      assertEquals(expectedField, writer.getField());
+
+      vector.validate();
+    }
+  }
+
+  @Test
+  public void testClose() throws Exception {
+    try (final ListViewVector vector = ListViewVector.empty("listview", allocator)) {
+
+      UnionListViewWriter writer = vector.getWriter();
+      writer.allocate();
+
+      // set some values
+      writer.startList();
+      writer.integer().writeInt(1);
+      writer.integer().writeInt(2);
+      writer.endList();
+      vector.setValueCount(2);
+
+      assertTrue(vector.getBufferSize() > 0);
+      assertTrue(vector.getDataVector().getBufferSize() > 0);
+
+      writer.close();
+      assertEquals(0, vector.getBufferSize());
+      assertEquals(0, vector.getDataVector().getBufferSize());
+
+      vector.validate();
+    }
+  }
+
+  @Test
+  public void testGetBufferSizeFor() {
+    try (final ListViewVector vector = ListViewVector.empty("listview", allocator)) {
+
+      UnionListViewWriter writer = vector.getWriter();
+      writer.allocate();
+
+      // set some values
+      writeIntValues(writer, new int[] {1, 2});
+      writeIntValues(writer, new int[] {3, 4});
+      writeIntValues(writer, new int[] {5, 6});
+      writeIntValues(writer, new int[] {7, 8, 9, 10});
+      writeIntValues(writer, new int[] {11, 12, 13, 14});
+      writer.setValueCount(5);
+
+      IntVector dataVector = (IntVector) vector.getDataVector();
+      int[] indices = new int[] {0, 2, 4, 6, 10, 14};
+
+      for (int valueCount = 1; valueCount <= 5; valueCount++) {
+        int validityBufferSize = BitVectorHelper.getValidityBufferSize(valueCount);
+        int offsetBufferSize = valueCount * BaseRepeatedValueViewVector.OFFSET_WIDTH;
+        int sizeBufferSize = valueCount * BaseRepeatedValueViewVector.SIZE_WIDTH;
+
+        int expectedSize =
+            validityBufferSize
+                + offsetBufferSize
+                + sizeBufferSize
+                + dataVector.getBufferSizeFor(indices[valueCount]);
+        assertEquals(expectedSize, vector.getBufferSizeFor(valueCount));
+      }
+      vector.validate();
+    }
+  }
+
+  @Test
+  public void testIsEmpty() {
+    try (final ListViewVector vector = ListViewVector.empty("listview", allocator)) {
+      UnionListViewWriter writer = vector.getWriter();
+      writer.allocate();
+
+      // set values [1,2], null, [], [5,6]
+      writeIntValues(writer, new int[] {1, 2});
+      writer.setPosition(2);
+      writeIntValues(writer, new int[] {});
+      writeIntValues(writer, new int[] {5, 6});
+      writer.setValueCount(4);
+
+      assertFalse(vector.isEmpty(0));
+      assertTrue(vector.isNull(1));
+      assertTrue(vector.isEmpty(1));
+      assertFalse(vector.isNull(2));
+      assertTrue(vector.isEmpty(2));
+      assertFalse(vector.isEmpty(3));
+
+      vector.validate();
+    }
+  }
+
+  @Test
+  public void testTotalCapacity() {
+    // adopted from ListVector test cases
+    final FieldType type = FieldType.nullable(MinorType.INT.getType());
+    try (final ListViewVector vector = new ListViewVector("listview", allocator, type, null)) {
+      // Force the child vector to be allocated based on the type
+      // (this is a bad API: we have to track and repeat the type twice)
+      vector.addOrGetVector(type);
+
+      // Specify the allocation size but do not allocate
+      vector.setInitialTotalCapacity(10, 100);
+
+      // Finally, actually do the allocation
+      vector.allocateNewSafe();
+
+      // Note: allocator rounds up and can be greater than the requested allocation.
+      assertTrue(vector.getValueCapacity() >= 10);
+      assertTrue(vector.getDataVector().getValueCapacity() >= 100);
+
+      vector.validate();
+    }
+  }
+
+  @Test
+  public void testSetNull1() {
+    try (ListViewVector vector = ListViewVector.empty("listview", allocator)) {
+      UnionListViewWriter writer = vector.getWriter();
+      writer.allocate();
+
+      writer.setPosition(0);
+      writer.startList();
+      writer.bigInt().writeBigInt(10);
+      writer.bigInt().writeBigInt(20);
+      writer.endList();
+
+      vector.setNull(1);
+
+      writer.setPosition(2);
+      writer.startList();
+      writer.bigInt().writeBigInt(30);
+      writer.bigInt().writeBigInt(40);
+      writer.endList();
+
+      vector.setNull(3);
+      vector.setNull(4);
+
+      writer.setPosition(5);
+      writer.startList();
+      writer.bigInt().writeBigInt(50);
+      writer.bigInt().writeBigInt(60);
+      writer.endList();
+
+      vector.setValueCount(6);
+
+      assertFalse(vector.isNull(0));
+      assertTrue(vector.isNull(1));
+      assertFalse(vector.isNull(2));
+      assertTrue(vector.isNull(3));
+      assertTrue(vector.isNull(4));
+      assertFalse(vector.isNull(5));
+
+      // validate buffers
+
+      final ArrowBuf validityBuffer = vector.getValidityBuffer();
+      final ArrowBuf offsetBuffer = vector.getOffsetBuffer();
+      final ArrowBuf sizeBuffer = vector.getSizeBuffer();
+
+      assertEquals(1, BitVectorHelper.get(validityBuffer, 0));
+      assertEquals(0, BitVectorHelper.get(validityBuffer, 1));
+      assertEquals(1, BitVectorHelper.get(validityBuffer, 2));
+      assertEquals(0, BitVectorHelper.get(validityBuffer, 3));
+      assertEquals(0, BitVectorHelper.get(validityBuffer, 4));
+      assertEquals(1, BitVectorHelper.get(validityBuffer, 5));
+
+      assertEquals(0, offsetBuffer.getInt(0 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(0, offsetBuffer.getInt(1 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(2, offsetBuffer.getInt(2 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(0, offsetBuffer.getInt(3 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(0, offsetBuffer.getInt(4 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(4, offsetBuffer.getInt(5 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+
+      assertEquals(2, sizeBuffer.getInt(0 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(1 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(2, sizeBuffer.getInt(2 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(3 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(4 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(2, sizeBuffer.getInt(5 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+
+      // validate values
+
+      Object result = vector.getObject(0);
+      ArrayList<Long> resultSet = (ArrayList<Long>) result;
+      assertEquals(2, resultSet.size());
+      assertEquals(Long.valueOf(10), resultSet.get(0));
+      assertEquals(Long.valueOf(20), resultSet.get(1));
+
+      result = vector.getObject(2);
+      resultSet = (ArrayList<Long>) result;
+      assertEquals(2, resultSet.size());
+      assertEquals(Long.valueOf(30), resultSet.get(0));
+      assertEquals(Long.valueOf(40), resultSet.get(1));
+
+      result = vector.getObject(5);
+      resultSet = (ArrayList<Long>) result;
+      assertEquals(2, resultSet.size());
+      assertEquals(Long.valueOf(50), resultSet.get(0));
+      assertEquals(Long.valueOf(60), resultSet.get(1));
+
+      vector.validate();
+    }
+  }
+
+  @Test
+  public void testSetNull2() {
+    try (ListViewVector vector = ListViewVector.empty("listview", allocator)) {
+      // validate setting nulls first and then writing values
+      UnionListViewWriter writer = vector.getWriter();
+      writer.allocate();
+
+      vector.setNull(0);
+      vector.setNull(2);
+      vector.setNull(4);
+
+      writer.setPosition(1);
+      writer.startList();
+      writer.bigInt().writeBigInt(10);
+      writer.bigInt().writeBigInt(20);
+      writer.bigInt().writeBigInt(30);
+      writer.endList();
+
+      writer.setPosition(3);
+      writer.startList();
+      writer.bigInt().writeBigInt(40);
+      writer.bigInt().writeBigInt(50);
+      writer.endList();
+
+      writer.setPosition(5);
+      writer.startList();
+      writer.bigInt().writeBigInt(60);
+      writer.bigInt().writeBigInt(70);
+      writer.bigInt().writeBigInt(80);
+      writer.endList();
+
+      vector.setValueCount(6);
+
+      assertTrue(vector.isNull(0));
+      assertFalse(vector.isNull(1));
+      assertTrue(vector.isNull(2));
+      assertFalse(vector.isNull(3));
+      assertTrue(vector.isNull(4));
+      assertFalse(vector.isNull(5));
+
+      // validate buffers
+
+      final ArrowBuf validityBuffer = vector.getValidityBuffer();
+      final ArrowBuf offsetBuffer = vector.getOffsetBuffer();
+      final ArrowBuf sizeBuffer = vector.getSizeBuffer();
+
+      assertEquals(0, BitVectorHelper.get(validityBuffer, 0));
+      assertEquals(1, BitVectorHelper.get(validityBuffer, 1));
+      assertEquals(0, BitVectorHelper.get(validityBuffer, 2));
+      assertEquals(1, BitVectorHelper.get(validityBuffer, 3));
+      assertEquals(0, BitVectorHelper.get(validityBuffer, 4));
+      assertEquals(1, BitVectorHelper.get(validityBuffer, 5));
+
+      assertEquals(0, offsetBuffer.getInt(0 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(0, offsetBuffer.getInt(1 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(0, offsetBuffer.getInt(2 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(3, offsetBuffer.getInt(3 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(0, offsetBuffer.getInt(4 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(5, offsetBuffer.getInt(5 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+
+      assertEquals(0, sizeBuffer.getInt(0 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(3, sizeBuffer.getInt(1 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(2 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(2, sizeBuffer.getInt(3 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(4 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(3, sizeBuffer.getInt(5 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+
+      // validate values
+
+      Object result = vector.getObject(1);
+      ArrayList<Long> resultSet = (ArrayList<Long>) result;
+      assertEquals(3, resultSet.size());
+      assertEquals(Long.valueOf(10), resultSet.get(0));
+      assertEquals(Long.valueOf(20), resultSet.get(1));
+      assertEquals(Long.valueOf(30), resultSet.get(2));
+
+      result = vector.getObject(3);
+      resultSet = (ArrayList<Long>) result;
+      assertEquals(2, resultSet.size());
+      assertEquals(Long.valueOf(40), resultSet.get(0));
+      assertEquals(Long.valueOf(50), resultSet.get(1));
+
+      result = vector.getObject(5);
+      resultSet = (ArrayList<Long>) result;
+      assertEquals(3, resultSet.size());
+      assertEquals(Long.valueOf(60), resultSet.get(0));
+      assertEquals(Long.valueOf(70), resultSet.get(1));
+      assertEquals(Long.valueOf(80), resultSet.get(2));
+
+      vector.validate();
+    }
+  }
+
+  @Test
+  public void testSetNull3() {
+    try (ListViewVector vector = ListViewVector.empty("listview", allocator)) {
+      // validate setting values first and then writing nulls
+      UnionListViewWriter writer = vector.getWriter();
+      writer.allocate();
+
+      writer.setPosition(1);
+      writer.startList();
+      writer.bigInt().writeBigInt(10);
+      writer.bigInt().writeBigInt(20);
+      writer.bigInt().writeBigInt(30);
+      writer.endList();
+
+      writer.setPosition(3);
+      writer.startList();
+      writer.bigInt().writeBigInt(40);
+      writer.bigInt().writeBigInt(50);
+      writer.endList();
+
+      writer.setPosition(5);
+      writer.startList();
+      writer.bigInt().writeBigInt(60);
+      writer.bigInt().writeBigInt(70);
+      writer.bigInt().writeBigInt(80);
+      writer.endList();
+
+      vector.setNull(0);
+      vector.setNull(2);
+      vector.setNull(4);
+
+      vector.setValueCount(6);
+
+      assertTrue(vector.isNull(0));
+      assertFalse(vector.isNull(1));
+      assertTrue(vector.isNull(2));
+      assertFalse(vector.isNull(3));
+      assertTrue(vector.isNull(4));
+      assertFalse(vector.isNull(5));
+
+      // validate buffers
+
+      final ArrowBuf validityBuffer = vector.getValidityBuffer();
+      final ArrowBuf offsetBuffer = vector.getOffsetBuffer();
+      final ArrowBuf sizeBuffer = vector.getSizeBuffer();
+
+      assertEquals(0, BitVectorHelper.get(validityBuffer, 0));
+      assertEquals(1, BitVectorHelper.get(validityBuffer, 1));
+      assertEquals(0, BitVectorHelper.get(validityBuffer, 2));
+      assertEquals(1, BitVectorHelper.get(validityBuffer, 3));
+      assertEquals(0, BitVectorHelper.get(validityBuffer, 4));
+      assertEquals(1, BitVectorHelper.get(validityBuffer, 5));
+
+      assertEquals(0, offsetBuffer.getInt(0 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(0, offsetBuffer.getInt(1 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(0, offsetBuffer.getInt(2 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(3, offsetBuffer.getInt(3 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(0, offsetBuffer.getInt(4 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(5, offsetBuffer.getInt(5 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+
+      assertEquals(0, sizeBuffer.getInt(0 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(3, sizeBuffer.getInt(1 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(2 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(2, sizeBuffer.getInt(3 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(4 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(3, sizeBuffer.getInt(5 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+
+      // validate values
+
+      Object result = vector.getObject(1);
+      ArrayList<Long> resultSet = (ArrayList<Long>) result;
+      assertEquals(3, resultSet.size());
+      assertEquals(Long.valueOf(10), resultSet.get(0));
+      assertEquals(Long.valueOf(20), resultSet.get(1));
+      assertEquals(Long.valueOf(30), resultSet.get(2));
+
+      result = vector.getObject(3);
+      resultSet = (ArrayList<Long>) result;
+      assertEquals(2, resultSet.size());
+      assertEquals(Long.valueOf(40), resultSet.get(0));
+      assertEquals(Long.valueOf(50), resultSet.get(1));
+
+      result = vector.getObject(5);
+      resultSet = (ArrayList<Long>) result;
+      assertEquals(3, resultSet.size());
+      assertEquals(Long.valueOf(60), resultSet.get(0));
+      assertEquals(Long.valueOf(70), resultSet.get(1));
+      assertEquals(Long.valueOf(80), resultSet.get(2));
+
+      vector.validate();
+    }
+  }
+
+  @Test
+  public void testOverWrite1() {
+    try (ListViewVector vector = ListViewVector.empty("listview", allocator)) {
+      UnionListViewWriter writer = vector.getWriter();
+      writer.allocate();
+
+      writer.setPosition(0);
+      writer.startList();
+      writer.bigInt().writeBigInt(10);
+      writer.bigInt().writeBigInt(20);
+      writer.bigInt().writeBigInt(30);
+      writer.endList();
+
+      writer.setPosition(1);
+      writer.startList();
+      writer.bigInt().writeBigInt(40);
+      writer.bigInt().writeBigInt(50);
+      writer.endList();
+
+      vector.setValueCount(2);
+
+      writer.setPosition(0);
+      writer.startList();
+      writer.bigInt().writeBigInt(60);
+      writer.bigInt().writeBigInt(70);
+      writer.endList();
+
+      writer.setPosition(1);
+      writer.startList();
+      writer.bigInt().writeBigInt(80);
+      writer.bigInt().writeBigInt(90);
+      writer.endList();
+
+      vector.setValueCount(2);
+
+      Object result = vector.getObject(0);
+      ArrayList<Long> resultSet = (ArrayList<Long>) result;
+      assertEquals(2, resultSet.size());
+      assertEquals(Long.valueOf(60), resultSet.get(0));
+      assertEquals(Long.valueOf(70), resultSet.get(1));
+
+      result = vector.getObject(1);
+      resultSet = (ArrayList<Long>) result;
+      assertEquals(2, resultSet.size());
+      assertEquals(Long.valueOf(80), resultSet.get(0));
+      assertEquals(Long.valueOf(90), resultSet.get(1));
+
+      vector.validate();
+    }
+  }
+
+  @Test
+  public void testOverwriteWithNull() {
+    try (ListViewVector vector = ListViewVector.empty("listview", allocator)) {
+      UnionListViewWriter writer = vector.getWriter();
+      writer.allocate();
+
+      ArrowBuf offsetBuffer = vector.getOffsetBuffer();
+      ArrowBuf sizeBuffer = vector.getSizeBuffer();
+
+      writer.setPosition(0);
+      writer.startList();
+      writer.bigInt().writeBigInt(10);
+      writer.bigInt().writeBigInt(20);
+      writer.bigInt().writeBigInt(30);
+      writer.endList();
+
+      writer.setPosition(1);
+      writer.startList();
+      writer.bigInt().writeBigInt(40);
+      writer.bigInt().writeBigInt(50);
+      writer.endList();
+
+      vector.setValueCount(2);
+
+      assertEquals(0, offsetBuffer.getInt(0 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(3, offsetBuffer.getInt(1 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+
+      assertEquals(3, sizeBuffer.getInt(0 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(2, sizeBuffer.getInt(1 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+
+      vector.setNull(0);
+
+      assertEquals(0, offsetBuffer.getInt(0 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(0 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+
+      vector.setNull(1);
+
+      assertEquals(0, offsetBuffer.getInt(0 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(0 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+
+      assertTrue(vector.isNull(0));
+      assertTrue(vector.isNull(1));
+
+      writer.setPosition(0);
+      writer.startList();
+      writer.bigInt().writeBigInt(60);
+      writer.bigInt().writeBigInt(70);
+      writer.endList();
+
+      assertEquals(0, offsetBuffer.getInt(0 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(2, sizeBuffer.getInt(0 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+
+      writer.setPosition(1);
+      writer.startList();
+      writer.bigInt().writeBigInt(80);
+      writer.bigInt().writeBigInt(90);
+      writer.endList();
+
+      assertEquals(2, offsetBuffer.getInt(1 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(2, sizeBuffer.getInt(1 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+
+      vector.setValueCount(2);
+
+      assertFalse(vector.isNull(0));
+      assertFalse(vector.isNull(1));
+
+      Object result = vector.getObject(0);
+      ArrayList<Long> resultSet = (ArrayList<Long>) result;
+      assertEquals(2, resultSet.size());
+      assertEquals(Long.valueOf(60), resultSet.get(0));
+      assertEquals(Long.valueOf(70), resultSet.get(1));
+
+      result = vector.getObject(1);
+      resultSet = (ArrayList<Long>) result;
+      assertEquals(2, resultSet.size());
+      assertEquals(Long.valueOf(80), resultSet.get(0));
+      assertEquals(Long.valueOf(90), resultSet.get(1));
+
+      vector.validate();
+    }
+  }
+
+  @Test
+  public void testOutOfOrderOffset1() {
+    // [[12, -7, 25], null, [0, -127, 127, 50], [], [50, 12]]
+    try (ListViewVector listViewVector = ListViewVector.empty("listview", allocator)) {
+      // Allocate buffers in listViewVector by calling `allocateNew` method.
+      listViewVector.allocateNew();
+
+      // Initialize the child vector using `initializeChildrenFromFields` method.
+
+      FieldType fieldType = new FieldType(true, new ArrowType.Int(16, true), null, null);
+      Field field = new Field("child-vector", fieldType, null);
+      listViewVector.initializeChildrenFromFields(Collections.singletonList(field));
+
+      // Set values in the child vector.
+      FieldVector fieldVector = listViewVector.getDataVector();
+      fieldVector.clear();
+
+      SmallIntVector childVector = (SmallIntVector) fieldVector;
+
+      childVector.allocateNew(7);
+
+      childVector.set(0, 0);
+      childVector.set(1, -127);
+      childVector.set(2, 127);
+      childVector.set(3, 50);
+      childVector.set(4, 12);
+      childVector.set(5, -7);
+      childVector.set(6, 25);
+
+      childVector.setValueCount(7);
+
+      // Set validity, offset and size buffers using `setValidity`,
+      //  `setOffset` and `setSize` methods.
+      listViewVector.setValidity(0, 1);
+      listViewVector.setValidity(1, 0);
+      listViewVector.setValidity(2, 1);
+      listViewVector.setValidity(3, 1);
+      listViewVector.setValidity(4, 1);
+
+      listViewVector.setOffset(0, 4);
+      listViewVector.setOffset(1, 7);
+      listViewVector.setOffset(2, 0);
+      listViewVector.setOffset(3, 0);
+      listViewVector.setOffset(4, 3);
+
+      listViewVector.setSize(0, 3);
+      listViewVector.setSize(1, 0);
+      listViewVector.setSize(2, 4);
+      listViewVector.setSize(3, 0);
+      listViewVector.setSize(4, 2);
+
+      // Set value count using `setValueCount` method.
+      listViewVector.setValueCount(5);
+
+      final ArrowBuf offSetBuffer = listViewVector.getOffsetBuffer();
+      final ArrowBuf sizeBuffer = listViewVector.getSizeBuffer();
+
+      // check offset buffer
+      assertEquals(4, offSetBuffer.getInt(0 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(7, offSetBuffer.getInt(1 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(0, offSetBuffer.getInt(2 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(0, offSetBuffer.getInt(3 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+      assertEquals(3, offSetBuffer.getInt(4 * BaseRepeatedValueViewVector.OFFSET_WIDTH));
+
+      // check size buffer
+      assertEquals(3, sizeBuffer.getInt(0 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(1 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(4, sizeBuffer.getInt(2 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(0, sizeBuffer.getInt(3 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+      assertEquals(2, sizeBuffer.getInt(4 * BaseRepeatedValueViewVector.SIZE_WIDTH));
+
+      // check child vector
+      assertEquals(0, ((SmallIntVector) listViewVector.getDataVector()).get(0));
+      assertEquals(-127, ((SmallIntVector) listViewVector.getDataVector()).get(1));
+      assertEquals(127, ((SmallIntVector) listViewVector.getDataVector()).get(2));
+      assertEquals(50, ((SmallIntVector) listViewVector.getDataVector()).get(3));
+      assertEquals(12, ((SmallIntVector) listViewVector.getDataVector()).get(4));
+      assertEquals(-7, ((SmallIntVector) listViewVector.getDataVector()).get(5));
+      assertEquals(25, ((SmallIntVector) listViewVector.getDataVector()).get(6));
+
+      // check values
+      Object result = listViewVector.getObject(0);
+      ArrayList<Integer> resultSet = (ArrayList<Integer>) result;
+      assertEquals(3, resultSet.size());
+      assertEquals(Short.valueOf("12"), resultSet.get(0));
+      assertEquals(Short.valueOf("-7"), resultSet.get(1));
+      assertEquals(Short.valueOf("25"), resultSet.get(2));
+
+      assertTrue(listViewVector.isNull(1));
+
+      result = listViewVector.getObject(2);
+      resultSet = (ArrayList<Integer>) result;
+      assertEquals(4, resultSet.size());
+      assertEquals(Short.valueOf("0"), resultSet.get(0));
+      assertEquals(Short.valueOf("-127"), resultSet.get(1));
+      assertEquals(Short.valueOf("127"), resultSet.get(2));
+      assertEquals(Short.valueOf("50"), resultSet.get(3));
+
+      assertTrue(listViewVector.isEmpty(3));
+
+      result = listViewVector.getObject(4);
+      resultSet = (ArrayList<Integer>) result;
+      assertEquals(2, resultSet.size());
+      assertEquals(Short.valueOf("50"), resultSet.get(0));
+      assertEquals(Short.valueOf("12"), resultSet.get(1));
+
+      listViewVector.validate();
+    }
+  }
+
+  private void writeIntValues(UnionListViewWriter writer, int[] values) {
+    writer.startList();
+    for (int v : values) {
+      writer.integer().writeInt(v);
+    }
+    writer.endList();
+  }
+}
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestMapVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestMapVector.java
index 43f4c3b536fdc..213ffced273a0 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestMapVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestMapVector.java
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.MapVector;
@@ -37,23 +37,24 @@
 import org.apache.arrow.vector.complex.writer.BaseWriter.MapWriter;
 import org.apache.arrow.vector.types.Types.MinorType;
 import org.apache.arrow.vector.types.pojo.ArrowType;
+import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.util.JsonStringArrayList;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestMapVector {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -90,7 +91,7 @@ public void testBasicOperation() {
         mapReader.setPosition(i);
         for (int j = 0; j < i + 1; j++) {
           mapReader.next();
-          assertEquals("record: " + i, j, mapReader.key().readLong().longValue());
+          assertEquals(j, mapReader.key().readLong().longValue(), "record: " + i);
           assertEquals(j, mapReader.value().readInteger().intValue());
         }
       }
@@ -136,7 +137,7 @@ public void testBasicOperationNulls() {
           } else {
             for (int j = 0; j < i + 1; j++) {
               mapReader.next();
-              assertEquals("record: " + i, j, mapReader.key().readLong().longValue());
+              assertEquals(j, mapReader.key().readLong().longValue(), "record: " + i);
               if (i == 5) {
                 assertFalse(mapReader.value().isSet());
               } else {
@@ -152,7 +153,7 @@ public void testBasicOperationNulls() {
   @Test
   public void testCopyFrom() throws Exception {
     try (MapVector inVector = MapVector.empty("input", allocator, false);
-         MapVector outVector = MapVector.empty("output", allocator, false)) {
+        MapVector outVector = MapVector.empty("output", allocator, false)) {
       UnionMapWriter writer = inVector.getWriter();
       writer.allocate();
 
@@ -194,12 +195,11 @@ public void testCopyFrom() throws Exception {
 
       // assert the output vector is correct
       FieldReader reader = outVector.getReader();
-      assertTrue("shouldn't be null", reader.isSet());
+      assertTrue(reader.isSet(), "shouldn't be null");
       reader.setPosition(1);
-      assertFalse("should be null", reader.isSet());
+      assertFalse(reader.isSet(), "should be null");
       reader.setPosition(2);
-      assertTrue("shouldn't be null", reader.isSet());
-
+      assertTrue(reader.isSet(), "shouldn't be null");
 
       /* index 0 */
       Object result = outVector.getObject(0);
@@ -455,20 +455,26 @@ public void testSplitAndTransfer() throws Exception {
           StructVector dataVector1 = (StructVector) toVector.getDataVector();
 
           for (int i = 0; i < splitLength; i++) {
-            dataLength1 = offsetBuffer.getInt((start + i + 1) * MapVector.OFFSET_WIDTH) -
-                    offsetBuffer.getInt((start + i) * MapVector.OFFSET_WIDTH);
-            dataLength2 = toOffsetBuffer.getInt((i + 1) * MapVector.OFFSET_WIDTH) -
-                    toOffsetBuffer.getInt(i * MapVector.OFFSET_WIDTH);
-
-            assertEquals("Different data lengths at index: " + i + " and start: " + start,
-                    dataLength1, dataLength2);
+            dataLength1 =
+                offsetBuffer.getInt((start + i + 1) * MapVector.OFFSET_WIDTH)
+                    - offsetBuffer.getInt((start + i) * MapVector.OFFSET_WIDTH);
+            dataLength2 =
+                toOffsetBuffer.getInt((i + 1) * MapVector.OFFSET_WIDTH)
+                    - toOffsetBuffer.getInt(i * MapVector.OFFSET_WIDTH);
+
+            assertEquals(
+                dataLength1,
+                dataLength2,
+                "Different data lengths at index: " + i + " and start: " + start);
 
             offset1 = offsetBuffer.getInt((start + i) * MapVector.OFFSET_WIDTH);
             offset2 = toOffsetBuffer.getInt(i * MapVector.OFFSET_WIDTH);
 
             for (int j = 0; j < dataLength1; j++) {
-              assertEquals("Different data at indexes: " + offset1 + " and " + offset2,
-                      dataVector.getObject(offset1), dataVector1.getObject(offset2));
+              assertEquals(
+                  dataVector.getObject(offset1),
+                  dataVector1.getObject(offset2),
+                  "Different data at indexes: " + offset1 + " and " + offset2);
 
               offset1++;
               offset2++;
@@ -806,7 +812,8 @@ public void testMapWithMapKeyAndMapValue() throws Exception {
       // populate map vector with the following two records
       // [
       //    [[5: 10, 20: 40]:[50: 100, 200: 400], [50: 100]:[75: 175, 150: 250]],
-      //    [[1: 2]:[10: 20], [30: 40]:[15: 20], [50: 60, 70: null]:[25: 30, 35: null], [5: null]: null]
+      //    [[1: 2]:[10: 20], [30: 40]:[15: 20], [50: 60, 70: null]:[25: 30, 35: null], [5: null]:
+      // null]
       // ]
 
       mapWriter.setPosition(0);
@@ -1178,4 +1185,23 @@ public void testGetTransferPairWithFieldAndCallBack() {
       toVector.clear();
     }
   }
+
+  @Test
+  public void testMakeTransferPairPreserveNullability() {
+    Field intField = new Field("int", FieldType.notNullable(MinorType.INT.getType()), null);
+    List<Field> fields = Collections.singletonList(intField);
+    Field structField =
+        new Field("struct", FieldType.notNullable(ArrowType.Struct.INSTANCE), fields);
+    Field structField2 =
+        new Field("struct", FieldType.notNullable(ArrowType.Struct.INSTANCE), fields);
+    FieldVector vec = structField.createVector(allocator);
+
+    TransferPair tp = vec.getTransferPair(structField2, allocator);
+    tp.transfer();
+
+    FieldVector res = (FieldVector) tp.getTo();
+
+    assertEquals(intField, vec.getField().getChildren().get(0));
+    assertEquals(intField, res.getField().getChildren().get(0));
+  }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestNullCheckingForGet.java b/java/vector/src/test/java/org/apache/arrow/vector/TestNullCheckingForGet.java
index f1345e88ab8b9..1715aa4344ceb 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestNullCheckingForGet.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestNullCheckingForGet.java
@@ -14,22 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.lang.reflect.Field;
 import java.net.URLClassLoader;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Test cases for {@link NullCheckingForGet}.
- */
+/** Test cases for {@link NullCheckingForGet}. */
 public class TestNullCheckingForGet {
 
   /**
    * Get a copy of the current class loader.
+   *
    * @return the newly created class loader.
    */
   private ClassLoader copyClassLoader() {
@@ -44,7 +43,8 @@ private ClassLoader copyClassLoader() {
   }
 
   /**
-   * Get the value of flag  {@link NullCheckingForGet#NULL_CHECKING_ENABLED}.
+   * Get the value of flag {@link NullCheckingForGet#NULL_CHECKING_ENABLED}.
+   *
    * @param classLoader the class loader from which to get the flag value.
    * @return value of the flag.
    */
@@ -55,20 +55,21 @@ private boolean getFlagValue(ClassLoader classLoader) throws Exception {
   }
 
   /**
-   * Ensure the flag for null checking is enabled by default.
-   * This will protect users from JVM crashes.
+   * Ensure the flag for null checking is enabled by default. This will protect users from JVM
+   * crashes.
    */
   @Test
   public void testDefaultValue() throws Exception {
     ClassLoader classLoader = copyClassLoader();
     if (classLoader != null) {
       boolean nullCheckingEnabled = getFlagValue(classLoader);
-      Assert.assertTrue(nullCheckingEnabled);
+      assertTrue(nullCheckingEnabled);
     }
   }
 
   /**
    * Test setting the null checking flag by the system property.
+   *
    * @throws Exception if loading class {@link NullCheckingForGet#NULL_CHECKING_ENABLED} fails.
    */
   @Test
@@ -79,7 +80,7 @@ public void testEnableSysProperty() throws Exception {
     ClassLoader classLoader = copyClassLoader();
     if (classLoader != null) {
       boolean nullCheckingEnabled = getFlagValue(classLoader);
-      Assert.assertFalse(nullCheckingEnabled);
+      assertFalse(nullCheckingEnabled);
     }
 
     // restore system property
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestOutOfMemoryForValueVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestOutOfMemoryForValueVector.java
index 7f26b5c1b79f6..19d6535e97158 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestOutOfMemoryForValueVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestOutOfMemoryForValueVector.java
@@ -14,59 +14,74 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.OutOfMemoryException;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * This class tests cases where we expect to receive {@link OutOfMemoryException}.
- */
+/** This class tests cases where we expect to receive {@link OutOfMemoryException}. */
 public class TestOutOfMemoryForValueVector {
 
   private static final String EMPTY_SCHEMA_PATH = "";
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(200); // Start with low memory limit
   }
 
-  @Test(expected = OutOfMemoryException.class)
+  @Test
   public void variableWidthVectorAllocateNew() {
-    try (VarCharVector vector = new VarCharVector(EMPTY_SCHEMA_PATH, allocator)) {
-      vector.allocateNew();
-    }
+    assertThrows(
+        OutOfMemoryException.class,
+        () -> {
+          try (VarCharVector vector = new VarCharVector(EMPTY_SCHEMA_PATH, allocator)) {
+            vector.allocateNew();
+          }
+        });
   }
 
-  @Test(expected = OutOfMemoryException.class)
+  @Test
   public void variableWidthVectorAllocateNewCustom() {
-    try (VarCharVector vector = new VarCharVector(EMPTY_SCHEMA_PATH, allocator)) {
-      vector.allocateNew(2342, 234);
-    }
+    assertThrows(
+        OutOfMemoryException.class,
+        () -> {
+          try (VarCharVector vector = new VarCharVector(EMPTY_SCHEMA_PATH, allocator)) {
+            vector.allocateNew(2342, 234);
+          }
+        });
   }
 
-  @Test(expected = OutOfMemoryException.class)
+  @Test
   public void fixedWidthVectorAllocateNew() {
-    try (IntVector vector = new IntVector(EMPTY_SCHEMA_PATH, allocator)) {
-      vector.allocateNew();
-    }
+    assertThrows(
+        OutOfMemoryException.class,
+        () -> {
+          try (IntVector vector = new IntVector(EMPTY_SCHEMA_PATH, allocator)) {
+            vector.allocateNew();
+          }
+        });
   }
 
-  @Test(expected = OutOfMemoryException.class)
+  @Test
   public void fixedWidthVectorAllocateNewCustom() {
-    try (IntVector vector = new IntVector(EMPTY_SCHEMA_PATH, allocator)) {
-      vector.allocateNew(2342);
-    }
+    assertThrows(
+        OutOfMemoryException.class,
+        () -> {
+          try (IntVector vector = new IntVector(EMPTY_SCHEMA_PATH, allocator)) {
+            vector.allocateNew(2342);
+          }
+        });
   }
 
-  @After
+  @AfterEach
   public void terminate() {
     allocator.close();
   }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestOversizedAllocationForValueVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestOversizedAllocationForValueVector.java
index 23414e9f5df1c..13f3a4a15fe97 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestOversizedAllocationForValueVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestOversizedAllocationForValueVector.java
@@ -14,24 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.util.OversizedAllocationException;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
- * This class tests that OversizedAllocationException occurs when a large memory is allocated for a vector.
- * Typically, arrow allows the allocation of the size of at most Integer.MAX_VALUE, but this might cause OOM in tests.
- * Thus, the max allocation size is limited to 1 KB in this class. Please see the surefire option in pom.xml.
+ * This class tests that OversizedAllocationException occurs when a large memory is allocated for a
+ * vector. Typically, arrow allows the allocation of the size of at most Integer.MAX_VALUE, but this
+ * might cause OOM in tests. Thus, the max allocation size is limited to 1 KB in this class. Please
+ * see the surefire option in pom.xml.
  */
 public class TestOversizedAllocationForValueVector {
 
@@ -39,94 +40,106 @@ public class TestOversizedAllocationForValueVector {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
 
-  @Test(expected = OversizedAllocationException.class)
+  @Test
   public void testFixedVectorReallocation() {
-    final UInt4Vector vector = new UInt4Vector(EMPTY_SCHEMA_PATH, allocator);
-    // edge case 1: buffer size = max value capacity
-    final int expectedValueCapacity = checkedCastToInt(BaseValueVector.MAX_ALLOCATION_SIZE / 4);
-    try {
-      vector.allocateNew(expectedValueCapacity);
-      assertEquals(expectedValueCapacity, vector.getValueCapacity());
-      vector.reAlloc();
-      assertEquals(expectedValueCapacity * 2, vector.getValueCapacity());
-    } finally {
-      vector.close();
-    }
+    assertThrows(
+        OversizedAllocationException.class,
+        () -> {
+          final UInt4Vector vector = new UInt4Vector(EMPTY_SCHEMA_PATH, allocator);
+          // edge case 1: buffer size = max value capacity
+          final int expectedValueCapacity =
+              checkedCastToInt(BaseValueVector.MAX_ALLOCATION_SIZE / 4);
+          try {
+            vector.allocateNew(expectedValueCapacity);
+            assertEquals(expectedValueCapacity, vector.getValueCapacity());
+            vector.reAlloc();
+            assertEquals(expectedValueCapacity * 2, vector.getValueCapacity());
+          } finally {
+            vector.close();
+          }
 
-    // common case: value count < max value capacity
-    try {
-      vector.allocateNew(checkedCastToInt(BaseValueVector.MAX_ALLOCATION_SIZE / 8));
-      vector.reAlloc(); // value allocation reaches to MAX_VALUE_ALLOCATION
-      vector.reAlloc(); // this should throw an IOOB
-    } finally {
-      vector.close();
-    }
+          // common case: value count < max value capacity
+          try {
+            vector.allocateNew(checkedCastToInt(BaseValueVector.MAX_ALLOCATION_SIZE / 8));
+            vector.reAlloc(); // value allocation reaches to MAX_VALUE_ALLOCATION
+            vector.reAlloc(); // this should throw an IOOB
+          } finally {
+            vector.close();
+          }
+        });
   }
 
-  @Test(expected = OversizedAllocationException.class)
+  @Test
   public void testBitVectorReallocation() {
-    final BitVector vector = new BitVector(EMPTY_SCHEMA_PATH, allocator);
-    // edge case 1: buffer size ~ max value capacity
-    final int expectedValueCapacity = 1 << 29;
-    try {
-      vector.allocateNew(expectedValueCapacity);
-      assertEquals(expectedValueCapacity, vector.getValueCapacity());
-      vector.reAlloc();
-      assertEquals(expectedValueCapacity * 2, vector.getValueCapacity());
-    } finally {
-      vector.close();
-    }
+    assertThrows(
+        OversizedAllocationException.class,
+        () -> {
+          final BitVector vector = new BitVector(EMPTY_SCHEMA_PATH, allocator);
+          // edge case 1: buffer size ~ max value capacity
+          final int expectedValueCapacity = 1 << 29;
+          try {
+            vector.allocateNew(expectedValueCapacity);
+            assertEquals(expectedValueCapacity, vector.getValueCapacity());
+            vector.reAlloc();
+            assertEquals(expectedValueCapacity * 2, vector.getValueCapacity());
+          } finally {
+            vector.close();
+          }
 
-    // common: value count < MAX_VALUE_ALLOCATION
-    try {
-      vector.allocateNew(expectedValueCapacity);
-      for (int i = 0; i < 3; i++) {
-        vector.reAlloc(); // expand buffer size
-      }
-      assertEquals(Integer.MAX_VALUE, vector.getValueCapacity());
-      vector.reAlloc(); // buffer size ~ max allocation
-      assertEquals(Integer.MAX_VALUE, vector.getValueCapacity());
-      vector.reAlloc(); // overflow
-    } finally {
-      vector.close();
-    }
+          // common: value count < MAX_VALUE_ALLOCATION
+          try {
+            vector.allocateNew(expectedValueCapacity);
+            for (int i = 0; i < 3; i++) {
+              vector.reAlloc(); // expand buffer size
+            }
+            assertEquals(Integer.MAX_VALUE, vector.getValueCapacity());
+            vector.reAlloc(); // buffer size ~ max allocation
+            assertEquals(Integer.MAX_VALUE, vector.getValueCapacity());
+            vector.reAlloc(); // overflow
+          } finally {
+            vector.close();
+          }
+        });
   }
 
-
-  @Test(expected = OversizedAllocationException.class)
+  @Test
   public void testVariableVectorReallocation() {
-    final VarCharVector vector = new VarCharVector(EMPTY_SCHEMA_PATH, allocator);
-    // edge case 1: value count = MAX_VALUE_ALLOCATION
-    final long expectedAllocationInBytes = BaseValueVector.MAX_ALLOCATION_SIZE;
-    final int expectedOffsetSize = 10;
-    try {
-      vector.allocateNew(expectedAllocationInBytes, 10);
-      assertTrue(expectedOffsetSize <= vector.getValueCapacity());
-      assertTrue(expectedAllocationInBytes <= vector.getDataBuffer().capacity());
-      vector.reAlloc();
-      assertTrue(expectedOffsetSize * 2 <= vector.getValueCapacity());
-      assertTrue(expectedAllocationInBytes * 2 <= vector.getDataBuffer().capacity());
-    } finally {
-      vector.close();
-    }
+    assertThrows(
+        OversizedAllocationException.class,
+        () -> {
+          final VarCharVector vector = new VarCharVector(EMPTY_SCHEMA_PATH, allocator);
+          // edge case 1: value count = MAX_VALUE_ALLOCATION
+          final long expectedAllocationInBytes = BaseValueVector.MAX_ALLOCATION_SIZE;
+          final int expectedOffsetSize = 10;
+          try {
+            vector.allocateNew(expectedAllocationInBytes, 10);
+            assertTrue(expectedOffsetSize <= vector.getValueCapacity());
+            assertTrue(expectedAllocationInBytes <= vector.getDataBuffer().capacity());
+            vector.reAlloc();
+            assertTrue(expectedOffsetSize * 2 <= vector.getValueCapacity());
+            assertTrue(expectedAllocationInBytes * 2 <= vector.getDataBuffer().capacity());
+          } finally {
+            vector.close();
+          }
 
-    // common: value count < MAX_VALUE_ALLOCATION
-    try {
-      vector.allocateNew(BaseValueVector.MAX_ALLOCATION_SIZE / 2, 0);
-      vector.reAlloc(); // value allocation reaches to MAX_VALUE_ALLOCATION
-      vector.reAlloc(); // this tests if it overflows
-    } finally {
-      vector.close();
-    }
+          // common: value count < MAX_VALUE_ALLOCATION
+          try {
+            vector.allocateNew(BaseValueVector.MAX_ALLOCATION_SIZE / 2, 0);
+            vector.reAlloc(); // value allocation reaches to MAX_VALUE_ALLOCATION
+            vector.reAlloc(); // this tests if it overflows
+          } finally {
+            vector.close();
+          }
+        });
   }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestPeriodDuration.java b/java/vector/src/test/java/org/apache/arrow/vector/TestPeriodDuration.java
index c8965dec3b83b..37f59f82cbd2f 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestPeriodDuration.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestPeriodDuration.java
@@ -14,16 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.Period;
-
-import org.junit.Test;
+import java.time.temporal.ChronoUnit;
+import org.junit.jupiter.api.Test;
 
 public class TestPeriodDuration {
 
@@ -43,4 +44,63 @@ public void testBasics() {
     assertNotEquals(pd1.hashCode(), pd3.hashCode());
   }
 
+  @Test
+  public void testToISO8601IntervalString() {
+    assertEquals("P0D", new PeriodDuration(Period.ZERO, Duration.ZERO).toISO8601IntervalString());
+    assertEquals(
+        "P1Y2M3D", new PeriodDuration(Period.of(1, 2, 3), Duration.ZERO).toISO8601IntervalString());
+    assertEquals(
+        "PT0.000000123S",
+        new PeriodDuration(Period.ZERO, Duration.ofNanos(123)).toISO8601IntervalString());
+    assertEquals(
+        "PT1.000000123S",
+        new PeriodDuration(Period.ZERO, Duration.ofSeconds(1).withNanos(123))
+            .toISO8601IntervalString());
+    assertEquals(
+        "PT1H1.000000123S",
+        new PeriodDuration(Period.ZERO, Duration.ofSeconds(3601).withNanos(123))
+            .toISO8601IntervalString());
+    assertEquals(
+        "PT24H1M1.000000123S",
+        new PeriodDuration(Period.ZERO, Duration.ofSeconds(86461).withNanos(123))
+            .toISO8601IntervalString());
+    assertEquals(
+        "P1Y2M3DT24H1M1.000000123S",
+        new PeriodDuration(Period.of(1, 2, 3), Duration.ofSeconds(86461).withNanos(123))
+            .toISO8601IntervalString());
+
+    assertEquals(
+        "P-1Y-2M-3D",
+        new PeriodDuration(Period.of(-1, -2, -3), Duration.ZERO).toISO8601IntervalString());
+    assertEquals(
+        "PT-0.000000123S",
+        new PeriodDuration(Period.ZERO, Duration.ofNanos(-123)).toISO8601IntervalString());
+    assertEquals(
+        "PT-24H-1M-0.999999877S",
+        new PeriodDuration(Period.ZERO, Duration.ofSeconds(-86461).withNanos(123))
+            .toISO8601IntervalString());
+    assertEquals(
+        "P-1Y-2M-3DT-0.999999877S",
+        new PeriodDuration(Period.of(-1, -2, -3), Duration.ofSeconds(-1).withNanos(123))
+            .toISO8601IntervalString());
+  }
+
+  @Test
+  public void testTemporalAccessor() {
+    LocalDate date = LocalDate.of(2024, 1, 2);
+    PeriodDuration pd1 = new PeriodDuration(Period.ofYears(1), Duration.ZERO);
+    assertEquals(LocalDate.of(2025, 1, 2), pd1.addTo(date));
+
+    LocalDateTime dateTime = LocalDateTime.of(2024, 1, 2, 3, 4);
+    PeriodDuration pd2 = new PeriodDuration(Period.ZERO, Duration.ofMinutes(1));
+    assertEquals(LocalDateTime.of(2024, 1, 2, 3, 3), pd2.subtractFrom(dateTime));
+
+    PeriodDuration pd3 =
+        new PeriodDuration(Period.of(1, 2, 3), Duration.ofSeconds(86461).withNanos(123));
+    assertEquals(pd3.get(ChronoUnit.YEARS), 1);
+    assertEquals(pd3.get(ChronoUnit.MONTHS), 2);
+    assertEquals(pd3.get(ChronoUnit.DAYS), 3);
+    assertEquals(pd3.get(ChronoUnit.SECONDS), 86461);
+    assertEquals(pd3.get(ChronoUnit.NANOS), 123);
+  }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestSplitAndTransfer.java b/java/vector/src/test/java/org/apache/arrow/vector/TestSplitAndTransfer.java
index 3580a321f01c9..d20dc3348b1c9 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestSplitAndTransfer.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestSplitAndTransfer.java
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
+import org.apache.arrow.vector.complex.DenseUnionVector;
 import org.apache.arrow.vector.complex.FixedSizeListVector;
 import org.apache.arrow.vector.complex.ListVector;
 import org.apache.arrow.vector.complex.MapVector;
@@ -37,25 +37,25 @@
 import org.apache.arrow.vector.types.pojo.ArrowType.Struct;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestSplitAndTransfer {
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
-  
-  @After
+
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
 
-  private void populateVarcharVector(final VarCharVector vector, int valueCount, String[] compareArray) {
+  private void populateVarcharVector(
+      final VarCharVector vector, int valueCount, String[] compareArray) {
     for (int i = 0; i < valueCount; i += 3) {
       final String s = String.format("%010d", i);
       vector.set(i, s.getBytes(StandardCharsets.UTF_8));
@@ -65,21 +65,152 @@ private void populateVarcharVector(final VarCharVector vector, int valueCount, S
     }
     vector.setValueCount(valueCount);
   }
-  
+
+  private void populateBaseVariableWidthViewVector(
+      final BaseVariableWidthViewVector vector, int valueCount, String[] compareArray) {
+    for (int i = 0; i < valueCount; i += 3) {
+      final String s = String.format("%010d", i);
+      vector.set(i, s.getBytes(StandardCharsets.UTF_8));
+      if (compareArray != null) {
+        compareArray[i] = s;
+      }
+    }
+    vector.setValueCount(valueCount);
+  }
+
+  private void populateIntVector(final IntVector vector, int valueCount) {
+    for (int i = 0; i < valueCount; i++) {
+      vector.set(i, i);
+    }
+    vector.setValueCount(valueCount);
+  }
+
+  private void populateDenseUnionVector(final DenseUnionVector vector, int valueCount) {
+    VarCharVector varCharVector =
+        vector.addOrGet("varchar", FieldType.nullable(new ArrowType.Utf8()), VarCharVector.class);
+    BigIntVector intVector =
+        vector.addOrGet("int", FieldType.nullable(new ArrowType.Int(64, true)), BigIntVector.class);
+
+    for (int i = 0; i < valueCount; i++) {
+      vector.setTypeId(i, (byte) (i % 2));
+      if (i % 2 == 0) {
+        final String s = String.format("%010d", i);
+        varCharVector.setSafe(i / 2, s.getBytes(StandardCharsets.UTF_8));
+      } else {
+        intVector.setSafe(i / 2, i);
+      }
+    }
+    vector.setValueCount(valueCount);
+  }
+
+  @Test
+  public void testWithEmptyVector() {
+    // MapVector use TransferImpl from ListVector
+    ListVector listVector = ListVector.empty("", allocator);
+    TransferPair transferPair = listVector.getTransferPair(allocator);
+    transferPair.splitAndTransfer(0, 0);
+    assertEquals(0, transferPair.getTo().getValueCount());
+    // BaseFixedWidthVector
+    IntVector intVector = new IntVector("", allocator);
+    transferPair = intVector.getTransferPair(allocator);
+    transferPair.splitAndTransfer(0, 0);
+    assertEquals(0, transferPair.getTo().getValueCount());
+    // BaseVariableWidthVector
+    VarCharVector varCharVector = new VarCharVector("", allocator);
+    transferPair = varCharVector.getTransferPair(allocator);
+    transferPair.splitAndTransfer(0, 0);
+    assertEquals(0, transferPair.getTo().getValueCount());
+    // BaseVariableWidthViewVector: ViewVarCharVector
+    ViewVarCharVector viewVarCharVector = new ViewVarCharVector("", allocator);
+    transferPair = viewVarCharVector.getTransferPair(allocator);
+    transferPair.splitAndTransfer(0, 0);
+    assertEquals(0, transferPair.getTo().getValueCount());
+    // BaseVariableWidthVector: ViewVarBinaryVector
+    ViewVarBinaryVector viewVarBinaryVector = new ViewVarBinaryVector("", allocator);
+    transferPair = viewVarBinaryVector.getTransferPair(allocator);
+    transferPair.splitAndTransfer(0, 0);
+    assertEquals(0, transferPair.getTo().getValueCount());
+    // BaseLargeVariableWidthVector
+    LargeVarCharVector largeVarCharVector = new LargeVarCharVector("", allocator);
+    transferPair = largeVarCharVector.getTransferPair(allocator);
+    transferPair.splitAndTransfer(0, 0);
+    assertEquals(0, transferPair.getTo().getValueCount());
+    // StructVector
+    StructVector structVector = StructVector.empty("", allocator);
+    transferPair = structVector.getTransferPair(allocator);
+    transferPair.splitAndTransfer(0, 0);
+    assertEquals(0, transferPair.getTo().getValueCount());
+    // FixedSizeListVector
+    FixedSizeListVector fixedSizeListVector = FixedSizeListVector.empty("", 0, allocator);
+    transferPair = fixedSizeListVector.getTransferPair(allocator);
+    transferPair.splitAndTransfer(0, 0);
+    assertEquals(0, transferPair.getTo().getValueCount());
+    // FixedSizeBinaryVector
+    FixedSizeBinaryVector fixedSizeBinaryVector = new FixedSizeBinaryVector("", allocator, 4);
+    transferPair = fixedSizeBinaryVector.getTransferPair(allocator);
+    transferPair.splitAndTransfer(0, 0);
+    assertEquals(0, transferPair.getTo().getValueCount());
+    // UnionVector
+    UnionVector unionVector = UnionVector.empty("", allocator);
+    transferPair = unionVector.getTransferPair(allocator);
+    transferPair.splitAndTransfer(0, 0);
+    assertEquals(0, transferPair.getTo().getValueCount());
+    // DenseUnionVector
+    DenseUnionVector duv = DenseUnionVector.empty("", allocator);
+    transferPair = duv.getTransferPair(allocator);
+    transferPair.splitAndTransfer(0, 0);
+    assertEquals(0, transferPair.getTo().getValueCount());
+
+    // non empty from vector
+
+    // BaseFixedWidthVector
+    IntVector fromIntVector = new IntVector("", allocator);
+    fromIntVector.allocateNew(100);
+    populateIntVector(fromIntVector, 100);
+    transferPair = fromIntVector.getTransferPair(allocator);
+    IntVector toIntVector = (IntVector) transferPair.getTo();
+    transferPair.splitAndTransfer(0, 0);
+    assertEquals(0, toIntVector.getValueCount());
+
+    transferPair.splitAndTransfer(50, 0);
+    assertEquals(0, toIntVector.getValueCount());
+
+    transferPair.splitAndTransfer(100, 0);
+    assertEquals(0, toIntVector.getValueCount());
+    fromIntVector.clear();
+    toIntVector.clear();
+
+    // DenseUnionVector
+    DenseUnionVector fromDuv = DenseUnionVector.empty("", allocator);
+    populateDenseUnionVector(fromDuv, 100);
+    transferPair = fromDuv.getTransferPair(allocator);
+    DenseUnionVector toDUV = (DenseUnionVector) transferPair.getTo();
+    transferPair.splitAndTransfer(0, 0);
+    assertEquals(0, toDUV.getValueCount());
+
+    transferPair.splitAndTransfer(50, 0);
+    assertEquals(0, toDUV.getValueCount());
+
+    transferPair.splitAndTransfer(100, 0);
+    assertEquals(0, toDUV.getValueCount());
+    fromDuv.clear();
+    toDUV.clear();
+  }
+
   @Test /* VarCharVector */
   public void test() throws Exception {
     try (final VarCharVector varCharVector = new VarCharVector("myvector", allocator)) {
       varCharVector.allocateNew(10000, 1000);
-  
+
       final int valueCount = 500;
       final String[] compareArray = new String[valueCount];
-  
+
       populateVarcharVector(varCharVector, valueCount, compareArray);
-  
+
       final TransferPair tp = varCharVector.getTransferPair(allocator);
       final VarCharVector newVarCharVector = (VarCharVector) tp.getTo();
       final int[][] startLengths = {{0, 201}, {201, 0}, {201, 200}, {401, 99}};
-  
+
       for (final int[] startLength : startLengths) {
         final int start = startLength[0];
         final int length = startLength[1];
@@ -99,6 +230,51 @@ public void test() throws Exception {
     }
   }
 
+  private void testView(BaseVariableWidthViewVector vector) {
+    vector.allocateNew(10000, 1000);
+    final int valueCount = 500;
+    final String[] compareArray = new String[valueCount];
+
+    populateBaseVariableWidthViewVector(vector, valueCount, compareArray);
+
+    final TransferPair tp = vector.getTransferPair(allocator);
+    final BaseVariableWidthViewVector newVector = (BaseVariableWidthViewVector) tp.getTo();
+    ;
+    final int[][] startLengths = {{0, 201}, {201, 0}, {201, 200}, {401, 99}};
+
+    for (final int[] startLength : startLengths) {
+      final int start = startLength[0];
+      final int length = startLength[1];
+      tp.splitAndTransfer(start, length);
+      for (int i = 0; i < length; i++) {
+        final boolean expectedSet = ((start + i) % 3) == 0;
+        if (expectedSet) {
+          final byte[] expectedValue = compareArray[start + i].getBytes(StandardCharsets.UTF_8);
+          assertFalse(newVector.isNull(i));
+          assertArrayEquals(expectedValue, newVector.get(i));
+        } else {
+          assertTrue(newVector.isNull(i));
+        }
+      }
+      newVector.clear();
+    }
+  }
+
+  @Test
+  public void testUtf8View() {
+    try (final ViewVarCharVector viewVarCharVector = new ViewVarCharVector("myvector", allocator)) {
+      testView(viewVarCharVector);
+    }
+  }
+
+  @Test
+  public void testBinaryView() throws Exception {
+    try (final ViewVarBinaryVector viewVarBinaryVector =
+        new ViewVarBinaryVector("myvector", allocator)) {
+      testView(viewVarBinaryVector);
+    }
+  }
+
   @Test
   public void testMemoryConstrainedTransfer() {
     try (final VarCharVector varCharVector = new VarCharVector("myvector", allocator)) {
@@ -123,6 +299,53 @@ public void testMemoryConstrainedTransfer() {
     }
   }
 
+  private void testMemoryConstrainedTransferInViews(BaseVariableWidthViewVector vector) {
+    // Here we have the target vector being transferred with a long string
+    // hence, the data buffer will be allocated.
+    // The default data buffer allocation takes
+    // BaseVariableWidthViewVector.INITIAL_VIEW_VALUE_ALLOCATION *
+    // BaseVariableWidthViewVector.ELEMENT_SIZE
+    // set limit = BaseVariableWidthViewVector.INITIAL_VIEW_VALUE_ALLOCATION *
+    // BaseVariableWidthViewVector.ELEMENT_SIZE
+    final int setLimit =
+        BaseVariableWidthViewVector.INITIAL_VIEW_VALUE_ALLOCATION
+            * BaseVariableWidthViewVector.ELEMENT_SIZE;
+    allocator.setLimit(setLimit);
+
+    vector.allocateNew(16000, 1000);
+
+    final int valueCount = 1000;
+
+    populateBaseVariableWidthViewVector(vector, valueCount, null);
+
+    final TransferPair tp = vector.getTransferPair(allocator);
+    final BaseVariableWidthViewVector newVector = (BaseVariableWidthViewVector) tp.getTo();
+
+    final int[][] startLengths = {{0, 700}, {700, 299}};
+
+    for (final int[] startLength : startLengths) {
+      final int start = startLength[0];
+      final int length = startLength[1];
+      tp.splitAndTransfer(start, length);
+      newVector.clear();
+    }
+  }
+
+  @Test
+  public void testMemoryConstrainedTransferInUtf8Views() {
+    try (final ViewVarCharVector viewVarCharVector = new ViewVarCharVector("myvector", allocator)) {
+      testMemoryConstrainedTransferInViews(viewVarCharVector);
+    }
+  }
+
+  @Test
+  public void testMemoryConstrainedTransferInBinaryViews() {
+    try (final ViewVarBinaryVector viewVarBinaryVector =
+        new ViewVarBinaryVector("myvector", allocator)) {
+      testMemoryConstrainedTransferInViews(viewVarBinaryVector);
+    }
+  }
+
   @Test
   public void testTransfer() {
     try (final VarCharVector varCharVector = new VarCharVector("myvector", allocator)) {
@@ -154,10 +377,53 @@ public void testTransfer() {
     }
   }
 
+  private void testTransferInViews(BaseVariableWidthViewVector vector) {
+    vector.allocateNew(16000, 1000);
+
+    final int valueCount = 500;
+    final String[] compareArray = new String[valueCount];
+    populateBaseVariableWidthViewVector(vector, valueCount, compareArray);
+
+    final TransferPair tp = vector.getTransferPair(allocator);
+    final BaseVariableWidthViewVector newVector = (BaseVariableWidthViewVector) tp.getTo();
+    tp.transfer();
+
+    assertEquals(0, vector.valueCount);
+    assertEquals(valueCount, newVector.valueCount);
+
+    for (int i = 0; i < valueCount; i++) {
+      final boolean expectedSet = (i % 3) == 0;
+      if (expectedSet) {
+        final byte[] expectedValue = compareArray[i].getBytes(StandardCharsets.UTF_8);
+        assertFalse(newVector.isNull(i));
+        assertArrayEquals(expectedValue, newVector.get(i));
+      } else {
+        assertTrue(newVector.isNull(i));
+      }
+    }
+
+    newVector.clear();
+  }
+
+  @Test
+  public void testTransferInUtf8Views() {
+    try (final ViewVarCharVector viewVarCharVector = new ViewVarCharVector("myvector", allocator)) {
+      testTransferInViews(viewVarCharVector);
+    }
+  }
+
+  @Test
+  public void testTransferInBinaryViews() {
+    try (final ViewVarBinaryVector viewVarBinaryVector =
+        new ViewVarBinaryVector("myvector", allocator)) {
+      testTransferInViews(viewVarBinaryVector);
+    }
+  }
+
   @Test
   public void testCopyValueSafe() {
     try (final VarCharVector varCharVector = new VarCharVector("myvector", allocator);
-         final VarCharVector newVarCharVector = new VarCharVector("newvector", allocator)) {
+        final VarCharVector newVarCharVector = new VarCharVector("newvector", allocator)) {
       varCharVector.allocateNew(10000, 1000);
 
       final int valueCount = 500;
@@ -202,6 +468,35 @@ public void testSplitAndTransferNon() {
     }
   }
 
+  private void testSplitAndTransferNonInViews(BaseVariableWidthViewVector vector) {
+    vector.allocateNew(16000, 1000);
+    final int valueCount = 500;
+    populateBaseVariableWidthViewVector(vector, valueCount, null);
+
+    final TransferPair tp = vector.getTransferPair(allocator);
+    BaseVariableWidthViewVector newVector = (BaseVariableWidthViewVector) tp.getTo();
+
+    tp.splitAndTransfer(0, 0);
+    assertEquals(0, newVector.getValueCount());
+
+    newVector.clear();
+  }
+
+  @Test
+  public void testSplitAndTransferNonInUtf8Views() {
+    try (final ViewVarCharVector viewVarCharVector = new ViewVarCharVector("myvector", allocator)) {
+      testSplitAndTransferNonInViews(viewVarCharVector);
+    }
+  }
+
+  @Test
+  public void testSplitAndTransferNonInBinaryViews() {
+    try (final ViewVarBinaryVector viewVarBinaryVector =
+        new ViewVarBinaryVector("myvector", allocator)) {
+      testSplitAndTransferNonInViews(viewVarBinaryVector);
+    }
+  }
+
   @Test
   public void testSplitAndTransferAll() {
     try (final VarCharVector varCharVector = new VarCharVector("myvector", allocator)) {
@@ -220,6 +515,35 @@ public void testSplitAndTransferAll() {
     }
   }
 
+  private void testSplitAndTransferAllInViews(BaseVariableWidthViewVector vector) {
+    vector.allocateNew(16000, 1000);
+    final int valueCount = 500;
+    populateBaseVariableWidthViewVector(vector, valueCount, null);
+
+    final TransferPair tp = vector.getTransferPair(allocator);
+    BaseVariableWidthViewVector newViewVarCharVector = (BaseVariableWidthViewVector) tp.getTo();
+
+    tp.splitAndTransfer(0, valueCount);
+    assertEquals(valueCount, newViewVarCharVector.getValueCount());
+
+    newViewVarCharVector.clear();
+  }
+
+  @Test
+  public void testSplitAndTransferAllInUtf8Views() {
+    try (final ViewVarCharVector viewVarCharVector = new ViewVarCharVector("myvector", allocator)) {
+      testSplitAndTransferAllInViews(viewVarCharVector);
+    }
+  }
+
+  @Test
+  public void testSplitAndTransferAllInBinaryViews() {
+    try (final ViewVarBinaryVector viewVarBinaryVector =
+        new ViewVarBinaryVector("myvector", allocator)) {
+      testSplitAndTransferAllInViews(viewVarBinaryVector);
+    }
+  }
+
   @Test
   public void testInvalidStartIndex() {
     try (final VarCharVector varCharVector = new VarCharVector("myvector", allocator);
@@ -231,16 +555,52 @@ public void testInvalidStartIndex() {
 
       final TransferPair tp = varCharVector.makeTransferPair(newVarCharVector);
 
-      IllegalArgumentException e = Assertions.assertThrows(
-          IllegalArgumentException.class,
-          () -> tp.splitAndTransfer(valueCount, 10));
+      IllegalArgumentException e =
+          assertThrows(IllegalArgumentException.class, () -> tp.splitAndTransfer(valueCount, 10));
 
-      assertEquals("Invalid parameters startIndex: 500, length: 10 for valueCount: 500", e.getMessage());
+      assertEquals(
+          "Invalid parameters startIndex: 500, length: 10 for valueCount: 500", e.getMessage());
 
       newVarCharVector.clear();
     }
   }
 
+  private void testInvalidStartIndexInViews(
+      BaseVariableWidthViewVector vector, BaseVariableWidthViewVector newVector) {
+    vector.allocateNew(16000, 1000);
+    final int valueCount = 500;
+    populateBaseVariableWidthViewVector(vector, valueCount, null);
+
+    final TransferPair tp = vector.makeTransferPair(newVector);
+
+    IllegalArgumentException e =
+        assertThrows(IllegalArgumentException.class, () -> tp.splitAndTransfer(valueCount, 10));
+
+    assertEquals(
+        "Invalid parameters startIndex: 500, length: 10 for valueCount: 500", e.getMessage());
+
+    newVector.clear();
+  }
+
+  @Test
+  public void testInvalidStartIndexInUtf8Views() {
+    try (final ViewVarCharVector viewVarCharVector = new ViewVarCharVector("myvector", allocator);
+        final ViewVarCharVector newViewVarCharVector =
+            new ViewVarCharVector("newvector", allocator)) {
+      testInvalidStartIndexInViews(viewVarCharVector, newViewVarCharVector);
+    }
+  }
+
+  @Test
+  public void testInvalidStartIndexInBinaryViews() {
+    try (final ViewVarBinaryVector viewVarBinaryVector =
+            new ViewVarBinaryVector("myvector", allocator);
+        final ViewVarBinaryVector newViewVarBinaryVector =
+            new ViewVarBinaryVector("newvector", allocator)) {
+      testInvalidStartIndexInViews(viewVarBinaryVector, newViewVarBinaryVector);
+    }
+  }
+
   @Test
   public void testInvalidLength() {
     try (final VarCharVector varCharVector = new VarCharVector("myvector", allocator);
@@ -252,20 +612,57 @@ public void testInvalidLength() {
 
       final TransferPair tp = varCharVector.makeTransferPair(newVarCharVector);
 
-      IllegalArgumentException e = Assertions.assertThrows(
-          IllegalArgumentException.class,
-          () -> tp.splitAndTransfer(0, valueCount * 2));
+      IllegalArgumentException e =
+          assertThrows(
+              IllegalArgumentException.class, () -> tp.splitAndTransfer(0, valueCount * 2));
 
-      assertEquals("Invalid parameters startIndex: 0, length: 1000 for valueCount: 500", e.getMessage());
+      assertEquals(
+          "Invalid parameters startIndex: 0, length: 1000 for valueCount: 500", e.getMessage());
 
       newVarCharVector.clear();
     }
   }
 
+  private void testInvalidLengthInViews(
+      BaseVariableWidthViewVector vector, BaseVariableWidthViewVector newVector) {
+    vector.allocateNew(16000, 1000);
+    final int valueCount = 500;
+    populateBaseVariableWidthViewVector(vector, valueCount, null);
+
+    final TransferPair tp = vector.makeTransferPair(newVector);
+
+    IllegalArgumentException e =
+        assertThrows(IllegalArgumentException.class, () -> tp.splitAndTransfer(0, valueCount * 2));
+
+    assertEquals(
+        "Invalid parameters startIndex: 0, length: 1000 for valueCount: 500", e.getMessage());
+
+    newVector.clear();
+  }
+
+  @Test
+  public void testInvalidLengthInUtf8Views() {
+    try (final ViewVarCharVector viewVarCharVector = new ViewVarCharVector("myvector", allocator);
+        final ViewVarCharVector newViewVarCharVector =
+            new ViewVarCharVector("newvector", allocator)) {
+      testInvalidLengthInViews(viewVarCharVector, newViewVarCharVector);
+    }
+  }
+
+  @Test
+  public void testInvalidLengthInBinaryViews() {
+    try (final ViewVarBinaryVector viewVarBinaryVector =
+            new ViewVarBinaryVector("myvector", allocator);
+        final ViewVarBinaryVector newViewVarBinaryVector =
+            new ViewVarBinaryVector("newvector", allocator)) {
+      testInvalidLengthInViews(viewVarBinaryVector, newViewVarBinaryVector);
+    }
+  }
+
   @Test
   public void testZeroStartIndexAndLength() {
     try (final VarCharVector varCharVector = new VarCharVector("myvector", allocator);
-         final VarCharVector newVarCharVector = new VarCharVector("newvector", allocator)) {
+        final VarCharVector newVarCharVector = new VarCharVector("newvector", allocator)) {
 
       varCharVector.allocateNew(0, 0);
       final int valueCount = 0;
@@ -280,10 +677,43 @@ public void testZeroStartIndexAndLength() {
     }
   }
 
+  private void testZeroStartIndexAndLengthInViews(
+      BaseVariableWidthViewVector vector, BaseVariableWidthViewVector newVector) {
+    vector.allocateNew(0, 0);
+    final int valueCount = 0;
+    populateBaseVariableWidthViewVector(vector, valueCount, null);
+
+    final TransferPair tp = vector.makeTransferPair(newVector);
+
+    tp.splitAndTransfer(0, 0);
+    assertEquals(valueCount, newVector.getValueCount());
+
+    newVector.clear();
+  }
+
+  @Test
+  public void testZeroStartIndexAndLengthInUtf8Views() {
+    try (final ViewVarCharVector viewVarCharVector = new ViewVarCharVector("myvector", allocator);
+        final ViewVarCharVector newViewVarCharVector =
+            new ViewVarCharVector("newvector", allocator)) {
+      testZeroStartIndexAndLengthInViews(viewVarCharVector, newViewVarCharVector);
+    }
+  }
+
+  @Test
+  public void testZeroStartIndexAndLengthInBinaryViews() {
+    try (final ViewVarBinaryVector viewVarBinaryVector =
+            new ViewVarBinaryVector("myvector", allocator);
+        final ViewVarBinaryVector newViewVarBinaryVector =
+            new ViewVarBinaryVector("newvector", allocator)) {
+      testZeroStartIndexAndLengthInViews(viewVarBinaryVector, newViewVarBinaryVector);
+    }
+  }
+
   @Test
   public void testZeroLength() {
     try (final VarCharVector varCharVector = new VarCharVector("myvector", allocator);
-         final VarCharVector newVarCharVector = new VarCharVector("newvector", allocator)) {
+        final VarCharVector newVarCharVector = new VarCharVector("newvector", allocator)) {
 
       varCharVector.allocateNew(10000, 1000);
       final int valueCount = 500;
@@ -298,10 +728,43 @@ public void testZeroLength() {
     }
   }
 
+  private void testZeroLengthInViews(
+      BaseVariableWidthViewVector vector, BaseVariableWidthViewVector newVector) {
+    vector.allocateNew(16000, 1000);
+    final int valueCount = 500;
+    populateBaseVariableWidthViewVector(vector, valueCount, null);
+
+    final TransferPair tp = vector.makeTransferPair(newVector);
+
+    tp.splitAndTransfer(500, 0);
+    assertEquals(0, newVector.getValueCount());
+
+    newVector.clear();
+  }
+
+  @Test
+  public void testZeroLengthInUtf8Views() {
+    try (final ViewVarCharVector viewVarCharVector = new ViewVarCharVector("myvector", allocator);
+        final ViewVarCharVector newViewVarCharVector =
+            new ViewVarCharVector("newvector", allocator)) {
+      testZeroLengthInViews(viewVarCharVector, newViewVarCharVector);
+    }
+  }
+
+  @Test
+  public void testZeroLengthInBinaryViews() {
+    try (final ViewVarBinaryVector viewVarBinaryVector =
+            new ViewVarBinaryVector("myvector", allocator);
+        final ViewVarBinaryVector newViewVarBinaryVector =
+            new ViewVarBinaryVector("newvector", allocator)) {
+      testZeroLengthInViews(viewVarBinaryVector, newViewVarBinaryVector);
+    }
+  }
+
   @Test
   public void testUnionVectorZeroStartIndexAndLength() {
     try (final UnionVector unionVector = UnionVector.empty("myvector", allocator);
-         final UnionVector newUnionVector = UnionVector.empty("newvector", allocator)) {
+        final UnionVector newUnionVector = UnionVector.empty("newvector", allocator)) {
 
       unionVector.allocateNew();
       final int valueCount = 0;
@@ -319,7 +782,7 @@ public void testUnionVectorZeroStartIndexAndLength() {
   @Test
   public void testFixedWidthVectorZeroStartIndexAndLength() {
     try (final IntVector intVector = new IntVector("myvector", allocator);
-         final IntVector newIntVector = new IntVector("newvector", allocator)) {
+        final IntVector newIntVector = new IntVector("newvector", allocator)) {
 
       intVector.allocateNew(0);
       final int valueCount = 0;
@@ -337,7 +800,7 @@ public void testFixedWidthVectorZeroStartIndexAndLength() {
   @Test
   public void testBitVectorZeroStartIndexAndLength() {
     try (final BitVector bitVector = new BitVector("myvector", allocator);
-         final BitVector newBitVector = new BitVector("newvector", allocator)) {
+        final BitVector newBitVector = new BitVector("newvector", allocator)) {
 
       bitVector.allocateNew(0);
       final int valueCount = 0;
@@ -355,7 +818,8 @@ public void testBitVectorZeroStartIndexAndLength() {
   @Test
   public void testFixedSizeListVectorZeroStartIndexAndLength() {
     try (final FixedSizeListVector listVector = FixedSizeListVector.empty("list", 4, allocator);
-         final FixedSizeListVector newListVector = FixedSizeListVector.empty("newList", 4, allocator)) {
+        final FixedSizeListVector newListVector =
+            FixedSizeListVector.empty("newList", 4, allocator)) {
 
       listVector.allocateNew();
       final int valueCount = 0;
@@ -373,7 +837,7 @@ public void testFixedSizeListVectorZeroStartIndexAndLength() {
   @Test
   public void testListVectorZeroStartIndexAndLength() {
     try (final ListVector listVector = ListVector.empty("list", allocator);
-         final ListVector newListVector = ListVector.empty("newList", allocator)) {
+        final ListVector newListVector = ListVector.empty("newList", allocator)) {
 
       listVector.allocateNew();
       final int valueCount = 0;
@@ -394,7 +858,8 @@ public void testStructVectorZeroStartIndexAndLength() {
     metadata.put("k1", "v1");
     FieldType type = new FieldType(true, Struct.INSTANCE, null, metadata);
     try (final StructVector structVector = new StructVector("structvec", allocator, type, null);
-         final StructVector newStructVector = new StructVector("newStructvec", allocator, type, null)) {
+        final StructVector newStructVector =
+            new StructVector("newStructvec", allocator, type, null)) {
 
       structVector.allocateNew();
       final int valueCount = 0;
@@ -415,7 +880,7 @@ public void testMapVectorZeroStartIndexAndLength() {
     metadata.put("k1", "v1");
     FieldType type = new FieldType(true, new ArrowType.Map(false), null, metadata);
     try (final MapVector mapVector = new MapVector("mapVec", allocator, type, null);
-         final MapVector newMapVector = new MapVector("newMapVec", allocator, type, null)) {
+        final MapVector newMapVector = new MapVector("newMapVec", allocator, type, null)) {
 
       mapVector.allocateNew();
       final int valueCount = 0;
@@ -429,5 +894,4 @@ public void testMapVectorZeroStartIndexAndLength() {
       newMapVector.clear();
     }
   }
-
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestStructVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestStructVector.java
index 68f5e14dabb9b..4ef0fbe2d9932 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestStructVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestStructVector.java
@@ -14,16 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.AbstractStructVector;
 import org.apache.arrow.vector.complex.ListVector;
@@ -39,21 +41,20 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestStructVector {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -64,18 +65,19 @@ public void testFieldMetadata() throws Exception {
     metadata.put("k1", "v1");
     FieldType type = new FieldType(true, Struct.INSTANCE, null, metadata);
     try (StructVector vector = new StructVector("struct", allocator, type, null)) {
-      Assert.assertEquals(vector.getField().getMetadata(), type.getMetadata());
+      assertEquals(vector.getField().getMetadata(), type.getMetadata());
     }
   }
 
   @Test
   public void testMakeTransferPair() {
     try (final StructVector s1 = StructVector.empty("s1", allocator);
-         final StructVector s2 = StructVector.empty("s2", allocator)) {
+        final StructVector s2 = StructVector.empty("s2", allocator)) {
       s1.addOrGet("struct_child", FieldType.nullable(MinorType.INT.getType()), IntVector.class);
       s1.makeTransferPair(s2);
       final FieldVector child = s1.getChild("struct_child");
-      final FieldVector toChild = s2.addOrGet("struct_child", child.getField().getFieldType(), child.getClass());
+      final FieldVector toChild =
+          s2.addOrGet("struct_child", child.getField().getFieldType(), child.getClass());
       assertEquals(0, toChild.getValueCapacity());
       assertEquals(0, toChild.getDataBuffer().capacity());
       assertEquals(0, toChild.getValidityBuffer().capacity());
@@ -108,8 +110,8 @@ public void testAllocateAfterReAlloc() throws Exception {
       /*
        * Verify that the buffer sizes haven't changed.
        */
-      Assert.assertEquals(vector.getValidityBuffer().capacity(), savedValidityBufferCapacity);
-      Assert.assertEquals(vector.getValueCapacity(), savedValueCapacity);
+      assertEquals(vector.getValidityBuffer().capacity(), savedValidityBufferCapacity);
+      assertEquals(vector.getValueCapacity(), savedValueCapacity);
     }
   }
 
@@ -157,7 +159,8 @@ public void testGetPrimitiveVectors() {
       unionVector.addVector(new SmallIntVector("smallInt", allocator));
 
       // add varchar vector
-      vector.addOrGet("varchar", FieldType.nullable(MinorType.VARCHAR.getType()), VarCharVector.class);
+      vector.addOrGet(
+          "varchar", FieldType.nullable(MinorType.VARCHAR.getType()), VarCharVector.class);
 
       List<ValueVector> primitiveVectors = vector.getPrimitiveVectors();
       assertEquals(4, primitiveVectors.size());
@@ -192,8 +195,14 @@ public void testAddOrGetComplexChildVectors() {
   @Test
   public void testAddChildVectorsWithDuplicatedFieldNamesForConflictPolicyAppend() {
     final FieldType type = new FieldType(true, Struct.INSTANCE, null, null);
-    try (StructVector vector = new StructVector("struct", allocator, type, null,
-        AbstractStructVector.ConflictPolicy.CONFLICT_APPEND, true)) {
+    try (StructVector vector =
+        new StructVector(
+            "struct",
+            allocator,
+            type,
+            null,
+            AbstractStructVector.ConflictPolicy.CONFLICT_APPEND,
+            true)) {
       final List<Field> initFields = new ArrayList<>();
 
       // Add a bit more fields to test against stability of the internal field
@@ -245,8 +254,14 @@ public void testAddChildVectorsWithDuplicatedFieldNamesForConflictPolicyAppend()
   @Test
   public void testAddChildVectorsWithDuplicatedFieldNamesForConflictPolicyReplace() {
     final FieldType type = new FieldType(true, Struct.INSTANCE, null, null);
-    try (StructVector vector = new StructVector("struct", allocator, type, null,
-        AbstractStructVector.ConflictPolicy.CONFLICT_REPLACE, true)) {
+    try (StructVector vector =
+        new StructVector(
+            "struct",
+            allocator,
+            type,
+            null,
+            AbstractStructVector.ConflictPolicy.CONFLICT_REPLACE,
+            true)) {
       final List<Field> initFields = new ArrayList<>();
 
       // Add a bit more fields to test against stability of the internal field
@@ -301,7 +316,8 @@ public void testGetTransferPair() {
     try (final StructVector fromVector = simpleStructVector("s1", allocator)) {
       TransferPair tp = fromVector.getTransferPair(fromVector.getField(), allocator);
       final StructVector toVector = (StructVector) tp.getTo();
-      // Field inside a new vector created by reusing a field should be the same in memory as the original field.
+      // Field inside a new vector created by reusing a field should be the same in memory as the
+      // original field.
       assertSame(toVector.getField(), fromVector.getField());
       toVector.clear();
     }
@@ -313,7 +329,8 @@ public void testGetTransferPairWithFieldAndCallBack() {
     try (final StructVector fromVector = simpleStructVector("s1", allocator)) {
       TransferPair tp = fromVector.getTransferPair(fromVector.getField(), allocator, callBack);
       final StructVector toVector = (StructVector) tp.getTo();
-      // Field inside a new vector created by reusing a field should be the same in memory as the original field.
+      // Field inside a new vector created by reusing a field should be the same in memory as the
+      // original field.
       assertSame(toVector.getField(), fromVector.getField());
       toVector.clear();
     }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestTypeLayout.java b/java/vector/src/test/java/org/apache/arrow/vector/TestTypeLayout.java
index 97930f433d301..75c6df1d6a496 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestTypeLayout.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestTypeLayout.java
@@ -14,85 +14,180 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Random;
+import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.types.DateUnit;
 import org.apache.arrow.vector.types.FloatingPointPrecision;
 import org.apache.arrow.vector.types.IntervalUnit;
 import org.apache.arrow.vector.types.TimeUnit;
 import org.apache.arrow.vector.types.UnionMode;
 import org.apache.arrow.vector.types.pojo.ArrowType;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestTypeLayout {
 
+  private BufferAllocator allocator;
+
+  @BeforeEach
+  public void prepare() {
+    allocator = new RootAllocator(Integer.MAX_VALUE);
+  }
+
+  @AfterEach
+  public void shutdown() {
+    allocator.close();
+  }
+
   @Test
   public void testTypeBufferCount() {
     ArrowType type = new ArrowType.Int(8, true);
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.Union(UnionMode.Sparse, new int[2]);
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.Union(UnionMode.Dense, new int[1]);
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.Struct();
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.Timestamp(TimeUnit.MILLISECOND, null);
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.List();
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.FixedSizeList(5);
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.Map(false);
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE);
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE);
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.Decimal(10, 10, 128);
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.Decimal(10, 10, 256);
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
-
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.FixedSizeBinary(5);
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.Bool();
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.Binary();
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.Utf8();
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.Null();
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.Date(DateUnit.DAY);
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.Time(TimeUnit.MILLISECOND, 32);
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.Interval(IntervalUnit.DAY_TIME);
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
 
     type = new ArrowType.Duration(TimeUnit.MILLISECOND);
-    assertEquals(TypeLayout.getTypeBufferCount(type), TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    assertEquals(
+        TypeLayout.getTypeBufferCount(type),
+        TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+  }
+
+  private String generateRandomString(int length) {
+    Random random = new Random();
+    StringBuilder sb = new StringBuilder(length);
+    for (int i = 0; i < length; i++) {
+      sb.append(random.nextInt(10)); // 0-9
+    }
+    return sb.toString();
+  }
+
+  @Test
+  public void testTypeBufferCountInVectorsWithVariadicBuffers() {
+    // empty vector
+    try (ViewVarCharVector viewVarCharVector = new ViewVarCharVector("myvector", allocator)) {
+      ArrowType type = viewVarCharVector.getMinorType().getType();
+      assertEquals(
+          TypeLayout.getTypeBufferCount(type),
+          TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    }
+    // vector with long strings
+    try (ViewVarCharVector viewVarCharVector = new ViewVarCharVector("myvector", allocator)) {
+      viewVarCharVector.allocateNew(32, 6);
+
+      viewVarCharVector.setSafe(0, generateRandomString(8).getBytes());
+      viewVarCharVector.setSafe(1, generateRandomString(12).getBytes());
+      viewVarCharVector.setSafe(2, generateRandomString(14).getBytes());
+      viewVarCharVector.setSafe(3, generateRandomString(18).getBytes());
+      viewVarCharVector.setSafe(4, generateRandomString(22).getBytes());
+      viewVarCharVector.setSafe(5, generateRandomString(24).getBytes());
+
+      viewVarCharVector.setValueCount(6);
+
+      ArrowType type = viewVarCharVector.getMinorType().getType();
+      assertEquals(
+          TypeLayout.getTypeBufferCount(type),
+          TypeLayout.getTypeLayout(type).getBufferLayouts().size());
+    }
   }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestUnionVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestUnionVector.java
index 1b0387feb73ff..6c05073c16844 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestUnionVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestUnionVector.java
@@ -14,20 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.MapVector;
@@ -44,21 +42,21 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestUnionVector {
   private static final String EMPTY_SCHEMA_PATH = "";
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -71,7 +69,8 @@ public void testUnionVector() throws Exception {
     uInt4Holder.isSet = 1;
 
     try (UnionVector unionVector =
-             new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
+        new UnionVector(
+            EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
       unionVector.allocateNew();
 
       // write some data
@@ -99,7 +98,8 @@ public void testUnionVector() throws Exception {
   @Test
   public void testUnionVectorMapValue() throws Exception {
     try (UnionVector unionVector =
-             new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
+        new UnionVector(
+            EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
       unionVector.allocateNew();
 
       UnionWriter writer = (UnionWriter) unionVector.getWriter();
@@ -161,7 +161,8 @@ public void testUnionVectorMapValue() throws Exception {
   @Test
   public void testTransfer() throws Exception {
     try (UnionVector srcVector =
-             new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
+        new UnionVector(
+            EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
       srcVector.allocateNew();
 
       // write some data
@@ -176,7 +177,8 @@ public void testTransfer() throws Exception {
       srcVector.setValueCount(6);
 
       try (UnionVector destVector =
-               new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
+          new UnionVector(
+              EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
         TransferPair pair = srcVector.makeTransferPair(destVector);
 
         // Creating the transfer should transfer the type of the field at least.
@@ -212,7 +214,8 @@ public void testTransfer() throws Exception {
   @Test
   public void testSplitAndTransfer() throws Exception {
     try (UnionVector sourceVector =
-             new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
+        new UnionVector(
+            EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
 
       sourceVector.allocateNew();
 
@@ -263,17 +266,12 @@ public void testSplitAndTransfer() throws Exception {
       assertEquals(50, sourceVector.getObject(9));
 
       try (UnionVector toVector =
-               new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
+          new UnionVector(
+              EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
 
         final TransferPair transferPair = sourceVector.makeTransferPair(toVector);
 
-        final int[][] transferLengths = {{0, 3},
-            {3, 1},
-            {4, 2},
-            {6, 1},
-            {7, 1},
-            {8, 2}
-        };
+        final int[][] transferLengths = {{0, 3}, {3, 1}, {4, 2}, {6, 1}, {7, 1}, {8, 2}};
 
         for (final int[] transferLength : transferLengths) {
           final int start = transferLength[0];
@@ -283,8 +281,10 @@ public void testSplitAndTransfer() throws Exception {
 
           /* check the toVector output after doing the splitAndTransfer */
           for (int i = 0; i < length; i++) {
-            assertEquals("Different data at indexes: " + (start + i) + "and " + i, sourceVector.getObject(start + i),
-                toVector.getObject(i));
+            assertEquals(
+                sourceVector.getObject(start + i),
+                toVector.getObject(i),
+                "Different data at indexes: " + (start + i) + "and " + i);
           }
         }
       }
@@ -294,7 +294,8 @@ public void testSplitAndTransfer() throws Exception {
   @Test
   public void testSplitAndTransferWithMixedVectors() throws Exception {
     try (UnionVector sourceVector =
-             new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
+        new UnionVector(
+            EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
 
       sourceVector.allocateNew();
 
@@ -354,16 +355,12 @@ public void testSplitAndTransferWithMixedVectors() throws Exception {
       assertEquals(30.5f, sourceVector.getObject(9));
 
       try (UnionVector toVector =
-               new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
+          new UnionVector(
+              EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
 
         final TransferPair transferPair = sourceVector.makeTransferPair(toVector);
 
-        final int[][] transferLengths = {{0, 2},
-            {2, 1},
-            {3, 2},
-            {5, 3},
-            {8, 2}
-        };
+        final int[][] transferLengths = {{0, 2}, {2, 1}, {3, 2}, {5, 3}, {8, 2}};
 
         for (final int[] transferLength : transferLengths) {
           final int start = transferLength[0];
@@ -373,7 +370,10 @@ public void testSplitAndTransferWithMixedVectors() throws Exception {
 
           /* check the toVector output after doing the splitAndTransfer */
           for (int i = 0; i < length; i++) {
-            assertEquals("Different values at index: " + i, sourceVector.getObject(start + i), toVector.getObject(i));
+            assertEquals(
+                sourceVector.getObject(start + i),
+                toVector.getObject(i),
+                "Different values at index: " + i);
           }
         }
       }
@@ -393,8 +393,9 @@ public void testGetFieldTypeInfo() throws Exception {
     children.add(new Field("int", FieldType.nullable(MinorType.INT.getType()), null));
     children.add(new Field("varchar", FieldType.nullable(MinorType.VARCHAR.getType()), null));
 
-    final FieldType fieldType = new FieldType(false, new ArrowType.Union(UnionMode.Sparse, typeIds),
-        /*dictionary=*/null, metadata);
+    final FieldType fieldType =
+        new FieldType(
+            false, new ArrowType.Union(UnionMode.Sparse, typeIds), /*dictionary=*/ null, metadata);
     final Field field = new Field("union", fieldType, children);
 
     MinorType minorType = MinorType.UNION;
@@ -420,7 +421,8 @@ public void testGetFieldTypeInfo() throws Exception {
   @Test
   public void testGetBufferAddress() throws Exception {
     try (UnionVector vector =
-             new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
+        new UnionVector(
+            EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
       boolean error = false;
 
       vector.allocateNew();
@@ -453,7 +455,6 @@ public void testGetBufferAddress() throws Exception {
 
       List<ArrowBuf> buffers = vector.getFieldBuffers();
 
-
       try {
         vector.getOffsetBufferAddress();
       } catch (UnsupportedOperationException ue) {
@@ -478,7 +479,8 @@ public void testGetBufferAddress() throws Exception {
   @Test
   public void testSetGetNull() {
     try (UnionVector srcVector =
-             new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
+        new UnionVector(
+            EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
       srcVector.allocateNew();
 
       final NullableIntHolder holder = new NullableIntHolder();
@@ -501,22 +503,30 @@ public void testSetGetNull() {
   @Test
   public void testCreateNewVectorWithoutTypeExceptionThrown() {
     try (UnionVector vector =
-        new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
-      IllegalArgumentException e1 = assertThrows(IllegalArgumentException.class,
-          () -> vector.getTimeStampMilliTZVector());
-      assertEquals("No TimeStampMilliTZ present. Provide ArrowType argument to create a new vector", e1.getMessage());
-
-      IllegalArgumentException e2 = assertThrows(IllegalArgumentException.class,
-          () -> vector.getDurationVector());
-      assertEquals("No Duration present. Provide ArrowType argument to create a new vector", e2.getMessage());
-
-      IllegalArgumentException e3 = assertThrows(IllegalArgumentException.class,
-          () -> vector.getFixedSizeBinaryVector());
-      assertEquals("No FixedSizeBinary present. Provide ArrowType argument to create a new vector", e3.getMessage());
-
-      IllegalArgumentException e4 = assertThrows(IllegalArgumentException.class,
-          () -> vector.getDecimalVector());
-      assertEquals("No Decimal present. Provide ArrowType argument to create a new vector", e4.getMessage());
+        new UnionVector(
+            EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
+      IllegalArgumentException e1 =
+          assertThrows(IllegalArgumentException.class, () -> vector.getTimeStampMilliTZVector());
+      assertEquals(
+          "No TimeStampMilliTZ present. Provide ArrowType argument to create a new vector",
+          e1.getMessage());
+
+      IllegalArgumentException e2 =
+          assertThrows(IllegalArgumentException.class, () -> vector.getDurationVector());
+      assertEquals(
+          "No Duration present. Provide ArrowType argument to create a new vector",
+          e2.getMessage());
+
+      IllegalArgumentException e3 =
+          assertThrows(IllegalArgumentException.class, () -> vector.getFixedSizeBinaryVector());
+      assertEquals(
+          "No FixedSizeBinary present. Provide ArrowType argument to create a new vector",
+          e3.getMessage());
+
+      IllegalArgumentException e4 =
+          assertThrows(IllegalArgumentException.class, () -> vector.getDecimalVector());
+      assertEquals(
+          "No Decimal present. Provide ArrowType argument to create a new vector", e4.getMessage());
     }
   }
 
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestUtils.java b/java/vector/src/test/java/org/apache/arrow/vector/TestUtils.java
index 7e64dd3864636..3845652ad0280 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestUtils.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestUtils.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import org.apache.arrow.memory.BufferAllocator;
@@ -29,17 +28,28 @@ public static VarCharVector newVarCharVector(String name, BufferAllocator alloca
         FieldType.nullable(new ArrowType.Utf8()).createNewSingleVector(name, allocator, null);
   }
 
+  public static ViewVarCharVector newViewVarCharVector(String name, BufferAllocator allocator) {
+    return (ViewVarCharVector)
+        FieldType.nullable(new ArrowType.Utf8View()).createNewSingleVector(name, allocator, null);
+  }
+
   public static VarBinaryVector newVarBinaryVector(String name, BufferAllocator allocator) {
     return (VarBinaryVector)
         FieldType.nullable(new ArrowType.Binary()).createNewSingleVector(name, allocator, null);
   }
 
-  public static <T> T newVector(Class<T> c, String name, ArrowType type, BufferAllocator allocator) {
+  public static ViewVarBinaryVector newViewVarBinaryVector(String name, BufferAllocator allocator) {
+    return (ViewVarBinaryVector)
+        FieldType.nullable(new ArrowType.BinaryView()).createNewSingleVector(name, allocator, null);
+  }
+
+  public static <T> T newVector(
+      Class<T> c, String name, ArrowType type, BufferAllocator allocator) {
     return c.cast(FieldType.nullable(type).createNewSingleVector(name, allocator, null));
   }
 
-  public static <T> T newVector(Class<T> c, String name, MinorType type, BufferAllocator allocator) {
+  public static <T> T newVector(
+      Class<T> c, String name, MinorType type, BufferAllocator allocator) {
     return c.cast(FieldType.nullable(type.getType()).createNewSingleVector(name, allocator, null));
   }
-
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java
index 3e53512f7338f..40e55fce9bfa2 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java
@@ -14,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static org.apache.arrow.vector.TestUtils.newVarBinaryVector;
 import static org.apache.arrow.vector.TestUtils.newVarCharVector;
 import static org.apache.arrow.vector.TestUtils.newVector;
 import static org.apache.arrow.vector.testing.ValueVectorDataPopulator.setVector;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
@@ -35,7 +35,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -69,9 +68,9 @@
 import org.apache.arrow.vector.util.ReusableByteArray;
 import org.apache.arrow.vector.util.Text;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestValueVector {
 
@@ -79,7 +78,7 @@ public class TestValueVector {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
@@ -95,7 +94,7 @@ public void init() {
       (int) (Integer.getInteger("arrow.vector.max_allocation_bytes", Integer.MAX_VALUE) / 7);
   private static final int MAX_VALUE_COUNT_8BYTE = (int) (MAX_VALUE_COUNT / 2);
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -188,7 +187,7 @@ public void testFixedType1() {
       /* vector data should have been zeroed out */
       for (int i = 0; i < capacityBeforeReset; i++) {
         // TODO: test vector.get(i) is 0 after unsafe get added
-        assertEquals("non-zero data not expected at index: " + i, true, vector.isNull(i));
+        assertTrue(vector.isNull(i), "non-zero data not expected at index: " + i);
       }
     }
   }
@@ -196,10 +195,10 @@ public void testFixedType1() {
   @Test
   public void testNoOverFlowWithUINT() {
     try (final UInt8Vector uInt8Vector = new UInt8Vector("uint8", allocator);
-         final UInt4Vector uInt4Vector = new UInt4Vector("uint4", allocator);
-         final UInt1Vector uInt1Vector = new UInt1Vector("uint1", allocator)) {
+        final UInt4Vector uInt4Vector = new UInt4Vector("uint4", allocator);
+        final UInt1Vector uInt1Vector = new UInt1Vector("uint1", allocator)) {
 
-      long[] longValues = new long[]{Long.MIN_VALUE, Long.MAX_VALUE, -1L};
+      long[] longValues = new long[] {Long.MIN_VALUE, Long.MAX_VALUE, -1L};
       uInt8Vector.allocateNew(3);
       uInt8Vector.setValueCount(3);
       for (int i = 0; i < longValues.length; i++) {
@@ -208,7 +207,7 @@ public void testNoOverFlowWithUINT() {
         assertEquals(readValue, longValues[i]);
       }
 
-      int[] intValues = new int[]{Integer.MIN_VALUE, Integer.MAX_VALUE, -1};
+      int[] intValues = new int[] {Integer.MIN_VALUE, Integer.MAX_VALUE, -1};
       uInt4Vector.allocateNew(3);
       uInt4Vector.setValueCount(3);
       for (int i = 0; i < intValues.length; i++) {
@@ -217,7 +216,7 @@ public void testNoOverFlowWithUINT() {
         assertEquals(intValues[i], actualValue);
       }
 
-      byte[] byteValues = new byte[]{Byte.MIN_VALUE, Byte.MAX_VALUE, -1};
+      byte[] byteValues = new byte[] {Byte.MIN_VALUE, Byte.MAX_VALUE, -1};
       uInt1Vector.allocateNew(3);
       uInt1Vector.setValueCount(3);
       for (int i = 0; i < byteValues.length; i++) {
@@ -276,7 +275,7 @@ public void testFixedType2() {
       /* check vector contents */
       j = 1;
       for (int i = 0; i < initialCapacity; i += 2) {
-        assertEquals("unexpected value at index: " + i, j, intVector.get(i));
+        assertEquals(j, intVector.get(i), "unexpected value at index: " + i);
         j++;
       }
 
@@ -298,7 +297,7 @@ public void testFixedType2() {
       /* vector data should still be intact after realloc */
       j = 1;
       for (int i = 0; i <= initialCapacity; i += 2) {
-        assertEquals("unexpected value at index: " + i, j, intVector.get(i));
+        assertEquals(j, intVector.get(i), "unexpected value at index: " + i);
         j++;
       }
 
@@ -311,7 +310,7 @@ public void testFixedType2() {
 
       /* vector data should have been zeroed out */
       for (int i = 0; i < capacityBeforeRealloc; i++) {
-        assertEquals("non-zero data not expected at index: " + i, true, intVector.isNull(i));
+        assertTrue(intVector.isNull(i), "non-zero data not expected at index: " + i);
       }
     }
   }
@@ -427,7 +426,7 @@ public void testFixedFloat2() {
 
       /* vector data should be zeroed out */
       for (int i = 0; i < capacityBeforeReset; i++) {
-        assertTrue("non-zero data not expected at index: " + i, floatVector.isNull(i));
+        assertTrue(floatVector.isNull(i), "non-zero data not expected at index: " + i);
       }
     }
   }
@@ -474,7 +473,8 @@ public void testFixedFloat2WithPossibleTruncate() {
       floatVector.setWithPossibleTruncate(14, 32784.0f); // in f32=32784.000000, out f16=32768
 
       try {
-        floatVector.setWithPossibleTruncate(initialCapacity, 1.618034f); // in f32=1.618034, out f16=1.6181641
+        floatVector.setWithPossibleTruncate(
+            initialCapacity, 1.618034f); // in f32=1.618034, out f16=1.6181641
       } catch (IndexOutOfBoundsException ie) {
         error = true;
       } finally {
@@ -501,7 +501,8 @@ public void testFixedFloat2WithPossibleTruncate() {
       }
 
       /* this should trigger a realloc() */
-      floatVector.setSafeWithPossibleTruncate(initialCapacity, 1.618034f); // in f32=1.618034, out f16=1.6181641
+      floatVector.setSafeWithPossibleTruncate(
+          initialCapacity, 1.618034f); // in f32=1.618034, out f16=1.6181641
 
       /* underlying buffer should now be able to store double the number of values */
       assertTrue(floatVector.getValueCapacity() >= initialCapacity * 2);
@@ -526,7 +527,7 @@ public void testFixedFloat2WithPossibleTruncate() {
 
       /* vector data should be zeroed out */
       for (int i = 0; i < capacityBeforeReset; i++) {
-        assertTrue("non-zero data not expected at index: " + i, floatVector.isNull(i));
+        assertTrue(floatVector.isNull(i), "non-zero data not expected at index: " + i);
       }
     }
   }
@@ -626,7 +627,7 @@ public void testFixedType3() {
 
       /* vector data should be zeroed out */
       for (int i = 0; i < capacityBeforeReset; i++) {
-        assertEquals("non-zero data not expected at index: " + i, true, floatVector.isNull(i));
+        assertTrue(floatVector.isNull(i), "non-zero data not expected at index: " + i);
       }
     }
   }
@@ -724,7 +725,7 @@ public void testFixedType4() {
 
       /* vector data should be zeroed out */
       for (int i = 0; i < capacityBeforeReset; i++) {
-        assertEquals("non-zero data not expected at index: " + i, true, floatVector.isNull(i));
+        assertTrue(floatVector.isNull(i), "non-zero data not expected at index: " + i);
       }
     }
   }
@@ -733,8 +734,9 @@ public void testFixedType4() {
   public void testNullableFixedType1() {
 
     // Create a new value vector for 1024 integers.
-    try (final UInt4Vector vector = newVector(UInt4Vector.class, EMPTY_SCHEMA_PATH, new ArrowType.Int(32, false),
-        allocator);) {
+    try (final UInt4Vector vector =
+        newVector(
+            UInt4Vector.class, EMPTY_SCHEMA_PATH, new ArrowType.Int(32, false), allocator); ) {
       boolean error = false;
       int initialCapacity = 1024;
 
@@ -821,7 +823,7 @@ public void testNullableFixedType1() {
 
       /* vector data should be zeroed out */
       for (int i = 0; i < capacityBeforeReset; i++) {
-        assertTrue("non-null data not expected at index: " + i, vector.isNull(i));
+        assertTrue(vector.isNull(i), "non-null data not expected at index: " + i);
       }
     }
   }
@@ -829,7 +831,8 @@ public void testNullableFixedType1() {
   @Test /* Float4Vector */
   public void testNullableFixedType2() {
     // Create a new value vector for 1024 integers
-    try (final Float4Vector vector = newVector(Float4Vector.class, EMPTY_SCHEMA_PATH, MinorType.FLOAT4, allocator);) {
+    try (final Float4Vector vector =
+        newVector(Float4Vector.class, EMPTY_SCHEMA_PATH, MinorType.FLOAT4, allocator); ) {
       boolean error = false;
       int initialCapacity = 16;
 
@@ -920,7 +923,7 @@ public void testNullableFixedType2() {
 
       /* vector data should be zeroed out */
       for (int i = 0; i < capacityBeforeReset; i++) {
-        assertTrue("non-null data not expected at index: " + i, vector.isNull(i));
+        assertTrue(vector.isNull(i), "non-null data not expected at index: " + i);
       }
     }
   }
@@ -928,7 +931,8 @@ public void testNullableFixedType2() {
   @Test /* IntVector */
   public void testNullableFixedType3() {
     // Create a new value vector for 1024 integers
-    try (final IntVector vector = newVector(IntVector.class, EMPTY_SCHEMA_PATH, MinorType.INT, allocator)) {
+    try (final IntVector vector =
+        newVector(IntVector.class, EMPTY_SCHEMA_PATH, MinorType.INT, allocator)) {
       int initialCapacity = 1024;
 
       /* no memory allocation has happened yet so capacity of underlying buffer should be 0 */
@@ -949,10 +953,10 @@ public void testNullableFixedType3() {
       int j = 1;
       for (int i = 0; i <= 1023; i++) {
         if ((i >= 2 && i <= 99) || (i >= 101 && i <= 1021)) {
-          assertTrue("non-null data not expected at index: " + i, vector.isNull(i));
+          assertTrue(vector.isNull(i), "non-null data not expected at index: " + i);
         } else {
-          assertFalse("null data not expected at index: " + i, vector.isNull(i));
-          assertEquals("unexpected value at index: " + i, j, vector.get(i));
+          assertFalse(vector.isNull(i), "null data not expected at index: " + i);
+          assertEquals(j, vector.get(i), "unexpected value at index: " + i);
           j++;
         }
       }
@@ -987,10 +991,10 @@ public void testNullableFixedType3() {
       j = 1;
       for (int i = 0; i < (initialCapacity * 2); i++) {
         if ((i > 1023 && i != initialCapacity) || (i >= 2 && i <= 99) || (i >= 101 && i <= 1021)) {
-          assertTrue("non-null data not expected at index: " + i, vector.isNull(i));
+          assertTrue(vector.isNull(i), "non-null data not expected at index: " + i);
         } else {
-          assertFalse("null data not expected at index: " + i, vector.isNull(i));
-          assertEquals("unexpected value at index: " + i, j, vector.get(i));
+          assertFalse(vector.isNull(i), "null data not expected at index: " + i);
+          assertEquals(j, vector.get(i), "unexpected value at index: " + i);
           j++;
         }
       }
@@ -1004,20 +1008,21 @@ public void testNullableFixedType3() {
 
       /* vector data should have been zeroed out */
       for (int i = 0; i < capacityBeforeReset; i++) {
-        assertTrue("non-null data not expected at index: " + i, vector.isNull(i));
+        assertTrue(vector.isNull(i), "non-null data not expected at index: " + i);
       }
 
       vector.allocateNew(initialCapacity * 4);
       // vector has been erased
       for (int i = 0; i < initialCapacity * 4; i++) {
-        assertTrue("non-null data not expected at index: " + i, vector.isNull(i));
+        assertTrue(vector.isNull(i), "non-null data not expected at index: " + i);
       }
     }
   }
 
   @Test /* IntVector */
   public void testNullableFixedType4() {
-    try (final IntVector vector = newVector(IntVector.class, EMPTY_SCHEMA_PATH, MinorType.INT, allocator)) {
+    try (final IntVector vector =
+        newVector(IntVector.class, EMPTY_SCHEMA_PATH, MinorType.INT, allocator)) {
 
       /* no memory allocation has happened yet */
       assertEquals(0, vector.getValueCapacity());
@@ -1036,10 +1041,10 @@ public void testNullableFixedType4() {
 
       for (int i = 0; i < valueCapacity; i++) {
         if ((i & 1) == 1) {
-          assertFalse("unexpected null value at index: " + i, vector.isNull(i));
-          assertEquals("unexpected value at index: " + i, (baseValue + i), vector.get(i));
+          assertFalse(vector.isNull(i), "unexpected null value at index: " + i);
+          assertEquals((baseValue + i), vector.get(i), "unexpected value at index: " + i);
         } else {
-          assertTrue("unexpected non-null value at index: " + i, vector.isNull(i));
+          assertTrue(vector.isNull(i), "unexpected non-null value at index: " + i);
         }
       }
 
@@ -1048,15 +1053,15 @@ public void testNullableFixedType4() {
 
       for (int i = 0; i < vector.getValueCapacity(); i++) {
         if (i == valueCapacity) {
-          assertFalse("unexpected null value at index: " + i, vector.isNull(i));
-          assertEquals("unexpected value at index: " + i, 20000000, vector.get(i));
+          assertFalse(vector.isNull(i), "unexpected null value at index: " + i);
+          assertEquals(20000000, vector.get(i), "unexpected value at index: " + i);
         } else if (i < valueCapacity) {
           if ((i & 1) == 1) {
-            assertFalse("unexpected null value at index: " + i, vector.isNull(i));
-            assertEquals("unexpected value at index: " + i, (baseValue + i), vector.get(i));
+            assertFalse(vector.isNull(i), "unexpected null value at index: " + i);
+            assertEquals((baseValue + i), vector.get(i), "unexpected value at index: " + i);
           }
         } else {
-          assertTrue("unexpected non-null value at index: " + i, vector.isNull(i));
+          assertTrue(vector.isNull(i), "unexpected non-null value at index: " + i);
         }
       }
 
@@ -1068,10 +1073,10 @@ public void testNullableFixedType4() {
 
       for (int i = 0; i < vector.getValueCapacity(); i++) {
         if (i % 2 == 0) {
-          assertFalse("unexpected null value at index: " + i, vector.isNull(i));
-          assertEquals("unexpected value at index: " + i, (baseValue + i), vector.get(i));
+          assertFalse(vector.isNull(i), "unexpected null value at index: " + i);
+          assertEquals((baseValue + i), vector.get(i), "unexpected value at index: " + i);
         } else {
-          assertTrue("unexpected non-null value at index: " + i, vector.isNull(i));
+          assertTrue(vector.isNull(i), "unexpected non-null value at index: " + i);
         }
       }
 
@@ -1081,13 +1086,13 @@ public void testNullableFixedType4() {
 
       for (int i = 0; i < vector.getValueCapacity(); i++) {
         if (i == (valueCapacityBeforeRealloc + 1000)) {
-          assertFalse("unexpected null value at index: " + i, vector.isNull(i));
-          assertEquals("unexpected value at index: " + i, 400000000, vector.get(i));
+          assertFalse(vector.isNull(i), "unexpected null value at index: " + i);
+          assertEquals(400000000, vector.get(i), "unexpected value at index: " + i);
         } else if (i < valueCapacityBeforeRealloc && (i % 2) == 0) {
-          assertFalse("unexpected null value at index: " + i, vector.isNull(i));
-          assertEquals("unexpected value at index: " + i, baseValue + i, vector.get(i));
+          assertFalse(vector.isNull(i), "unexpected null value at index: " + i);
+          assertEquals(baseValue + i, vector.get(i), "unexpected value at index: " + i);
         } else {
-          assertTrue("unexpected non-null value at index: " + i, vector.isNull(i));
+          assertTrue(vector.isNull(i), "unexpected non-null value at index: " + i);
         }
       }
 
@@ -1100,7 +1105,7 @@ public void testNullableFixedType4() {
 
       /* vector data should be zeroed out */
       for (int i = 0; i < valueCapacityBeforeReset; i++) {
-        assertTrue("non-null data not expected at index: " + i, vector.isNull(i));
+        assertTrue(vector.isNull(i), "non-null data not expected at index: " + i);
       }
     }
   }
@@ -1120,7 +1125,8 @@ public void testNullableFixedType4() {
    */
 
   /**
-   * ARROW-7831: this checks that a slice taken off a buffer is still readable after that buffer's allocator is closed.
+   * ARROW-7831: this checks that a slice taken off a buffer is still readable after that buffer's
+   * allocator is closed.
    */
   @Test /* VarCharVector */
   public void testSplitAndTransfer1() {
@@ -1138,11 +1144,14 @@ public void testSplitAndTransfer1() {
         final int offsetRefCnt = sourceVector.getOffsetBuffer().refCnt();
         final int dataRefCnt = sourceVector.getDataBuffer().refCnt();
 
-        // split and transfer with slice starting at the beginning: this should not allocate anything new
+        // split and transfer with slice starting at the beginning: this should not allocate
+        // anything new
         sourceVector.splitAndTransferTo(0, 2, targetVector);
         assertEquals(allocatedMem, allocator.getAllocatedMemory());
-        // The validity and offset buffers are sliced from a same buffer.See BaseFixedWidthVector#allocateBytes.
-        // Therefore, the refcnt of the validity buffer is increased once since the startIndex is 0. The refcnt of the
+        // The validity and offset buffers are sliced from a same buffer.See
+        // BaseFixedWidthVector#allocateBytes.
+        // Therefore, the refcnt of the validity buffer is increased once since the startIndex is 0.
+        // The refcnt of the
         // offset buffer is increased as well for the same reason. This amounts to a total of 2.
         assertEquals(validityRefCnt + 2, sourceVector.getValidityBuffer().refCnt());
         assertEquals(offsetRefCnt + 2, sourceVector.getOffsetBuffer().refCnt());
@@ -1154,7 +1163,8 @@ public void testSplitAndTransfer1() {
   }
 
   /**
-   * ARROW-7831: this checks that a vector that got sliced is still readable after the slice's allocator got closed.
+   * ARROW-7831: this checks that a vector that got sliced is still readable after the slice's
+   * allocator got closed.
    */
   @Test /* VarCharVector */
   public void testSplitAndTransfer2() {
@@ -1172,11 +1182,14 @@ public void testSplitAndTransfer2() {
         final int offsetRefCnt = sourceVector.getOffsetBuffer().refCnt();
         final int dataRefCnt = sourceVector.getDataBuffer().refCnt();
 
-        // split and transfer with slice starting at the beginning: this should not allocate anything new
+        // split and transfer with slice starting at the beginning: this should not allocate
+        // anything new
         sourceVector.splitAndTransferTo(0, 2, targetVector);
         assertEquals(allocatedMem, allocator.getAllocatedMemory());
-        // The validity and offset buffers are sliced from a same buffer.See BaseFixedWidthVector#allocateBytes.
-        // Therefore, the refcnt of the validity buffer is increased once since the startIndex is 0. The refcnt of the
+        // The validity and offset buffers are sliced from a same buffer.See
+        // BaseFixedWidthVector#allocateBytes.
+        // Therefore, the refcnt of the validity buffer is increased once since the startIndex is 0.
+        // The refcnt of the
         // offset buffer is increased as well for the same reason. This amounts to a total of 2.
         assertEquals(validityRefCnt + 2, sourceVector.getValidityBuffer().refCnt());
         assertEquals(offsetRefCnt + 2, sourceVector.getOffsetBuffer().refCnt());
@@ -1189,13 +1202,13 @@ public void testSplitAndTransfer2() {
   }
 
   /**
-   * ARROW-7831: this checks an offset splitting optimization, in the case where all the values up to the start of the
-   * slice are null/empty, which avoids allocation for the offset buffer.
+   * ARROW-7831: this checks an offset splitting optimization, in the case where all the values up
+   * to the start of the slice are null/empty, which avoids allocation for the offset buffer.
    */
   @Test /* VarCharVector */
   public void testSplitAndTransfer3() {
     try (final VarCharVector targetVector = newVarCharVector("split-target", allocator);
-         final VarCharVector sourceVector = newVarCharVector(EMPTY_SCHEMA_PATH, allocator)) {
+        final VarCharVector sourceVector = newVarCharVector(EMPTY_SCHEMA_PATH, allocator)) {
       sourceVector.allocateNew(1024 * 10, 1024);
 
       sourceVector.set(0, new byte[0]);
@@ -1211,14 +1224,17 @@ public void testSplitAndTransfer3() {
       final int dataRefCnt = sourceVector.getDataBuffer().refCnt();
 
       sourceVector.splitAndTransferTo(2, 2, targetVector);
-      // because the offset starts at 0 since the first 2 values are empty/null, the allocation only consists in
+      // because the offset starts at 0 since the first 2 values are empty/null, the allocation only
+      // consists in
       // the size needed for the validity buffer
       final long validitySize =
           DefaultRoundingPolicy.DEFAULT_ROUNDING_POLICY.getRoundedSize(
               BaseValueVector.getValidityBufferSizeFromCount(2));
       assertEquals(allocatedMem + validitySize, allocator.getAllocatedMemory());
-      // The validity and offset buffers are sliced from a same buffer.See BaseFixedWidthVector#allocateBytes.
-      // Since values up to the startIndex are empty/null, the offset buffer doesn't need to be reallocated and
+      // The validity and offset buffers are sliced from a same buffer.See
+      // BaseFixedWidthVector#allocateBytes.
+      // Since values up to the startIndex are empty/null, the offset buffer doesn't need to be
+      // reallocated and
       // therefore its refcnt is increased by 1.
       assertEquals(validityRefCnt + 1, sourceVector.getValidityBuffer().refCnt());
       assertEquals(offsetRefCnt + 1, sourceVector.getOffsetBuffer().refCnt());
@@ -1230,14 +1246,17 @@ public void testSplitAndTransfer3() {
   }
 
   /**
-   * ARROW-7831: ensures that data is transferred from one allocator to another in case of 0-index start special cases.
+   * ARROW-7831: ensures that data is transferred from one allocator to another in case of 0-index
+   * start special cases.
    */
   @Test /* VarCharVector */
   public void testSplitAndTransfer4() {
-    try (final BufferAllocator targetAllocator = allocator.newChildAllocator("target-alloc", 256, 256);
-         final VarCharVector targetVector = newVarCharVector("split-target", targetAllocator)) {
-      try (final BufferAllocator sourceAllocator = allocator.newChildAllocator("source-alloc", 256, 256);
-           final VarCharVector sourceVector = newVarCharVector(EMPTY_SCHEMA_PATH, sourceAllocator)) {
+    try (final BufferAllocator targetAllocator =
+            allocator.newChildAllocator("target-alloc", 256, 256);
+        final VarCharVector targetVector = newVarCharVector("split-target", targetAllocator)) {
+      try (final BufferAllocator sourceAllocator =
+              allocator.newChildAllocator("source-alloc", 256, 256);
+          final VarCharVector sourceVector = newVarCharVector(EMPTY_SCHEMA_PATH, sourceAllocator)) {
         sourceVector.allocateNew(50, 3);
 
         sourceVector.set(0, STR1);
@@ -1250,10 +1269,12 @@ public void testSplitAndTransfer4() {
         final int offsetRefCnt = sourceVector.getOffsetBuffer().refCnt();
         final int dataRefCnt = sourceVector.getDataBuffer().refCnt();
 
-        // split and transfer with slice starting at the beginning: this should not allocate anything new
+        // split and transfer with slice starting at the beginning: this should not allocate
+        // anything new
         sourceVector.splitAndTransferTo(0, 2, targetVector);
         assertEquals(allocatedMem, allocator.getAllocatedMemory());
-        // Unlike testSplitAndTransfer1 where the buffers originated from the same allocator, the refcnts of each
+        // Unlike testSplitAndTransfer1 where the buffers originated from the same allocator, the
+        // refcnts of each
         // buffers for this test should be the same as what the source allocator ended up with.
         assertEquals(validityRefCnt, sourceVector.getValidityBuffer().refCnt());
         assertEquals(offsetRefCnt, sourceVector.getOffsetBuffer().refCnt());
@@ -1347,23 +1368,26 @@ public void testNullableVarType2() {
     }
   }
 
-  @Test(expected = OversizedAllocationException.class)
+  @Test
   public void testReallocateCheckSuccess() {
-
-    // Create a new value vector for 1024 integers.
-    try (final VarBinaryVector vector = newVarBinaryVector(EMPTY_SCHEMA_PATH, allocator)) {
-      vector.allocateNew(1024 * 10, 1024);
-
-      vector.set(0, STR1);
-      // Check the sample strings.
-      assertArrayEquals(STR1, vector.get(0));
-
-      // update the index offset to a larger one
-      ArrowBuf offsetBuf = vector.getOffsetBuffer();
-      offsetBuf.setInt(VarBinaryVector.OFFSET_WIDTH, Integer.MAX_VALUE - 5);
-
-      vector.setValueLengthSafe(1, 6);
-    }
+    assertThrows(
+        OversizedAllocationException.class,
+        () -> {
+          // Create a new value vector for 1024 integers.
+          try (final VarBinaryVector vector = newVarBinaryVector(EMPTY_SCHEMA_PATH, allocator)) {
+            vector.allocateNew(1024 * 10, 1024);
+
+            vector.set(0, STR1);
+            // Check the sample strings.
+            assertArrayEquals(STR1, vector.get(0));
+
+            // update the index offset to a larger one
+            ArrowBuf offsetBuf = vector.getOffsetBuffer();
+            offsetBuf.setInt(VarBinaryVector.OFFSET_WIDTH, Integer.MAX_VALUE - 5);
+
+            vector.setValueLengthSafe(1, 6);
+          }
+        });
   }
 
   @Test
@@ -1379,13 +1403,17 @@ public void testGetBytesRepeatedly() {
       // verify results
       ReusableByteArray reusableByteArray = new ReusableByteArray();
       vector.read(0, reusableByteArray);
-      assertArrayEquals(str.getBytes(StandardCharsets.UTF_8), Arrays.copyOfRange(reusableByteArray.getBuffer(),
-          0, (int) reusableByteArray.getLength()));
+      assertArrayEquals(
+          str.getBytes(StandardCharsets.UTF_8),
+          Arrays.copyOfRange(
+              reusableByteArray.getBuffer(), 0, (int) reusableByteArray.getLength()));
       byte[] oldBuffer = reusableByteArray.getBuffer();
 
       vector.read(1, reusableByteArray);
-      assertArrayEquals(str2.getBytes(StandardCharsets.UTF_8), Arrays.copyOfRange(reusableByteArray.getBuffer(),
-          0, (int) reusableByteArray.getLength()));
+      assertArrayEquals(
+          str2.getBytes(StandardCharsets.UTF_8),
+          Arrays.copyOfRange(
+              reusableByteArray.getBuffer(), 0, (int) reusableByteArray.getLength()));
 
       // There should not have been any reallocation since the newer value is smaller in length.
       assertSame(oldBuffer, reusableByteArray.getBuffer());
@@ -1551,9 +1579,9 @@ public void testReallocAfterVectorTransfer2() {
 
       /* check toVector contents before realloc */
       for (int i = 0; i < toVector.getValueCapacity(); i++) {
-        assertFalse("unexpected null value at index: " + i, toVector.isNull(i));
+        assertFalse(toVector.isNull(i), "unexpected null value at index: " + i);
         double value = toVector.get(i);
-        assertEquals("unexpected value at index: " + i, baseValue + (double) i, value, 0);
+        assertEquals(baseValue + (double) i, value, 0, "unexpected value at index: " + i);
       }
 
       /* now let's realloc the toVector and check contents again */
@@ -1562,11 +1590,11 @@ public void testReallocAfterVectorTransfer2() {
 
       for (int i = 0; i < toVector.getValueCapacity(); i++) {
         if (i < capacityAfterRealloc2) {
-          assertFalse("unexpected null value at index: " + i, toVector.isNull(i));
+          assertFalse(toVector.isNull(i), "unexpected null value at index: " + i);
           double value = toVector.get(i);
-          assertEquals("unexpected value at index: " + i, baseValue + (double) i, value, 0);
+          assertEquals(baseValue + (double) i, value, 0, "unexpected value at index: " + i);
         } else {
-          assertTrue("unexpected non-null value at index: " + i, toVector.isNull(i));
+          assertTrue(toVector.isNull(i), "unexpected non-null value at index: " + i);
         }
       }
 
@@ -1767,7 +1795,8 @@ public void testReallocAfterVectorTransfer4() {
   @Test
   public void testReAllocFixedWidthVector() {
     // Create a new value vector for 1024 integers
-    try (final Float4Vector vector = newVector(Float4Vector.class, EMPTY_SCHEMA_PATH, MinorType.FLOAT4, allocator)) {
+    try (final Float4Vector vector =
+        newVector(Float4Vector.class, EMPTY_SCHEMA_PATH, MinorType.FLOAT4, allocator)) {
       vector.allocateNew(1024);
 
       assertTrue(vector.getValueCapacity() >= 1024);
@@ -1789,8 +1818,10 @@ public void testReAllocFixedWidthVector() {
       assertEquals(104.5f, vector.get(1023), 0);
       assertEquals(105.5f, vector.get(2000), 0);
 
-      // Set the valueCount to be more than valueCapacity of current allocation. This is possible for ValueVectors
-      // as we don't call setSafe for null values, but we do call setValueCount when all values are inserted into the
+      // Set the valueCount to be more than valueCapacity of current allocation. This is possible
+      // for ValueVectors
+      // as we don't call setSafe for null values, but we do call setValueCount when all values are
+      // inserted into the
       // vector
       vector.setValueCount(vector.getValueCapacity() + 200);
     }
@@ -1798,7 +1829,8 @@ public void testReAllocFixedWidthVector() {
 
   @Test
   public void testReAllocVariableWidthVector() {
-    try (final VarCharVector vector = newVector(VarCharVector.class, EMPTY_SCHEMA_PATH, MinorType.VARCHAR, allocator)) {
+    try (final VarCharVector vector =
+        newVector(VarCharVector.class, EMPTY_SCHEMA_PATH, MinorType.VARCHAR, allocator)) {
       vector.setInitialCapacity(4095);
       vector.allocateNew();
 
@@ -1822,15 +1854,18 @@ public void testReAllocVariableWidthVector() {
       assertArrayEquals(STR2, vector.get(initialCapacity - 1));
       assertArrayEquals(STR3, vector.get(initialCapacity + 200));
 
-      // Set the valueCount to be more than valueCapacity of current allocation. This is possible for ValueVectors
-      // as we don't call setSafe for null values, but we do call setValueCount when the current batch is processed.
+      // Set the valueCount to be more than valueCapacity of current allocation. This is possible
+      // for ValueVectors
+      // as we don't call setSafe for null values, but we do call setValueCount when the current
+      // batch is processed.
       vector.setValueCount(vector.getValueCapacity() + 200);
     }
   }
 
   @Test
   public void testFillEmptiesNotOverfill() {
-    try (final VarCharVector vector = newVector(VarCharVector.class, EMPTY_SCHEMA_PATH, MinorType.VARCHAR, allocator)) {
+    try (final VarCharVector vector =
+        newVector(VarCharVector.class, EMPTY_SCHEMA_PATH, MinorType.VARCHAR, allocator)) {
       vector.setInitialCapacity(4095);
       vector.allocateNew();
 
@@ -1855,11 +1890,10 @@ public void testSetSafeWithArrowBufNoExcessAllocs() {
     final int valueBytesLength = valueBytes.length;
     final int isSet = 1;
 
-    try (
-        final VarCharVector fromVector = newVector(VarCharVector.class, EMPTY_SCHEMA_PATH,
-            MinorType.VARCHAR, allocator);
-        final VarCharVector toVector = newVector(VarCharVector.class, EMPTY_SCHEMA_PATH,
-            MinorType.VARCHAR, allocator)) {
+    try (final VarCharVector fromVector =
+            newVector(VarCharVector.class, EMPTY_SCHEMA_PATH, MinorType.VARCHAR, allocator);
+        final VarCharVector toVector =
+            newVector(VarCharVector.class, EMPTY_SCHEMA_PATH, MinorType.VARCHAR, allocator)) {
       /*
        * Populate the from vector with 'numValues' with byte-arrays, each of size 'valueBytesLength'.
        */
@@ -1895,9 +1929,10 @@ public void testSetSafeWithArrowBufNoExcessAllocs() {
 
   @Test
   public void testCopyFromWithNulls() {
-    try (final VarCharVector vector = newVector(VarCharVector.class, EMPTY_SCHEMA_PATH, MinorType.VARCHAR, allocator);
-         final VarCharVector vector2 =
-             newVector(VarCharVector.class, EMPTY_SCHEMA_PATH, MinorType.VARCHAR, allocator)) {
+    try (final VarCharVector vector =
+            newVector(VarCharVector.class, EMPTY_SCHEMA_PATH, MinorType.VARCHAR, allocator);
+        final VarCharVector vector2 =
+            newVector(VarCharVector.class, EMPTY_SCHEMA_PATH, MinorType.VARCHAR, allocator)) {
 
       vector.setInitialCapacity(4095);
       vector.allocateNew();
@@ -1921,7 +1956,10 @@ public void testCopyFromWithNulls() {
         if (i % 3 == 0) {
           assertNull(vector.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, Integer.toString(i), vector.getObject(i).toString());
+          assertEquals(
+              Integer.toString(i),
+              vector.getObject(i).toString(),
+              "unexpected value at index: " + i);
         }
       }
 
@@ -1935,7 +1973,10 @@ public void testCopyFromWithNulls() {
         if (i % 3 == 0) {
           assertNull(vector2.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, Integer.toString(i), vector2.getObject(i).toString());
+          assertEquals(
+              Integer.toString(i),
+              vector2.getObject(i).toString(),
+              "unexpected value at index: " + i);
         }
       }
 
@@ -1948,7 +1989,10 @@ public void testCopyFromWithNulls() {
         if (i % 3 == 0) {
           assertNull(vector2.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, Integer.toString(i), vector2.getObject(i).toString());
+          assertEquals(
+              Integer.toString(i),
+              vector2.getObject(i).toString(),
+              "unexpected value at index: " + i);
         }
       }
     }
@@ -1956,9 +2000,10 @@ public void testCopyFromWithNulls() {
 
   @Test
   public void testCopyFromWithNulls1() {
-    try (final VarCharVector vector = newVector(VarCharVector.class, EMPTY_SCHEMA_PATH, MinorType.VARCHAR, allocator);
-         final VarCharVector vector2 =
-             newVector(VarCharVector.class, EMPTY_SCHEMA_PATH, MinorType.VARCHAR, allocator)) {
+    try (final VarCharVector vector =
+            newVector(VarCharVector.class, EMPTY_SCHEMA_PATH, MinorType.VARCHAR, allocator);
+        final VarCharVector vector2 =
+            newVector(VarCharVector.class, EMPTY_SCHEMA_PATH, MinorType.VARCHAR, allocator)) {
 
       vector.setInitialCapacity(4095);
       vector.allocateNew();
@@ -1982,7 +2027,10 @@ public void testCopyFromWithNulls1() {
         if (i % 3 == 0) {
           assertNull(vector.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, Integer.toString(i), vector.getObject(i).toString());
+          assertEquals(
+              Integer.toString(i),
+              vector.getObject(i).toString(),
+              "unexpected value at index: " + i);
         }
       }
 
@@ -2000,7 +2048,10 @@ public void testCopyFromWithNulls1() {
         if (i % 3 == 0) {
           assertNull(vector2.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, Integer.toString(i), vector2.getObject(i).toString());
+          assertEquals(
+              Integer.toString(i),
+              vector2.getObject(i).toString(),
+              "unexpected value at index: " + i);
         }
       }
 
@@ -2013,7 +2064,10 @@ public void testCopyFromWithNulls1() {
         if (i % 3 == 0) {
           assertNull(vector2.getObject(i));
         } else {
-          assertEquals("unexpected value at index: " + i, Integer.toString(i), vector2.getObject(i).toString());
+          assertEquals(
+              Integer.toString(i),
+              vector2.getObject(i).toString(),
+              "unexpected value at index: " + i);
         }
       }
     }
@@ -2097,7 +2151,7 @@ public void testSetLastSetUsage() {
       assertEquals(40, vector.offsetBuffer.getInt(17 * BaseVariableWidthVector.OFFSET_WIDTH));
       assertEquals(40, vector.offsetBuffer.getInt(18 * BaseVariableWidthVector.OFFSET_WIDTH));
       assertEquals(40, vector.offsetBuffer.getInt(19 * BaseVariableWidthVector.OFFSET_WIDTH));
-      
+
       vector.set(19, STR6);
       assertArrayEquals(STR6, vector.get(19));
       assertEquals(40, vector.offsetBuffer.getInt(19 * BaseVariableWidthVector.OFFSET_WIDTH));
@@ -2135,14 +2189,14 @@ public void testVectorLoadUnload() {
 
       Schema schema = new Schema(fields);
 
-      VectorSchemaRoot schemaRoot1 = new VectorSchemaRoot(schema, fieldVectors, vector1.getValueCount());
+      VectorSchemaRoot schemaRoot1 =
+          new VectorSchemaRoot(schema, fieldVectors, vector1.getValueCount());
       VectorUnloader vectorUnloader = new VectorUnloader(schemaRoot1);
 
-      try (
-          ArrowRecordBatch recordBatch = vectorUnloader.getRecordBatch();
-          BufferAllocator finalVectorsAllocator = allocator.newChildAllocator("new vector", 0, Long.MAX_VALUE);
-          VectorSchemaRoot schemaRoot2 = VectorSchemaRoot.create(schema, finalVectorsAllocator);
-      ) {
+      try (ArrowRecordBatch recordBatch = vectorUnloader.getRecordBatch();
+          BufferAllocator finalVectorsAllocator =
+              allocator.newChildAllocator("new vector", 0, Long.MAX_VALUE);
+          VectorSchemaRoot schemaRoot2 = VectorSchemaRoot.create(schema, finalVectorsAllocator); ) {
 
         VectorLoader vectorLoader = new VectorLoader(schemaRoot2);
         vectorLoader.load(recordBatch);
@@ -2238,41 +2292,25 @@ public void testFillEmptiesUsage() {
       assertEquals(0, vector.getValueLength(14));
 
       /* Check offsets */
-      assertEquals(0,
-              vector.offsetBuffer.getInt(0 * BaseVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(6,
-              vector.offsetBuffer.getInt(1 * BaseVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(16,
-              vector.offsetBuffer.getInt(2 * BaseVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(21,
-              vector.offsetBuffer.getInt(3 * BaseVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(30,
-              vector.offsetBuffer.getInt(4 * BaseVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(34,
-              vector.offsetBuffer.getInt(5 * BaseVariableWidthVector.OFFSET_WIDTH));
-
-      assertEquals(40,
-              vector.offsetBuffer.getInt(6 * BaseVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(40,
-              vector.offsetBuffer.getInt(7 * BaseVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(40,
-              vector.offsetBuffer.getInt(8 * BaseVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(40,
-              vector.offsetBuffer.getInt(9 * BaseVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(40,
-              vector.offsetBuffer.getInt(10 * BaseVariableWidthVector.OFFSET_WIDTH));
-
-      assertEquals(46,
-              vector.offsetBuffer.getInt(11 * BaseVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(56,
-              vector.offsetBuffer.getInt(12 * BaseVariableWidthVector.OFFSET_WIDTH));
-
-      assertEquals(56,
-              vector.offsetBuffer.getInt(13 * BaseVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(56,
-              vector.offsetBuffer.getInt(14 * BaseVariableWidthVector.OFFSET_WIDTH));
-      assertEquals(56,
-              vector.offsetBuffer.getInt(15 * BaseVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(0, vector.offsetBuffer.getInt(0 * BaseVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(6, vector.offsetBuffer.getInt(1 * BaseVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(16, vector.offsetBuffer.getInt(2 * BaseVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(21, vector.offsetBuffer.getInt(3 * BaseVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(30, vector.offsetBuffer.getInt(4 * BaseVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(34, vector.offsetBuffer.getInt(5 * BaseVariableWidthVector.OFFSET_WIDTH));
+
+      assertEquals(40, vector.offsetBuffer.getInt(6 * BaseVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(40, vector.offsetBuffer.getInt(7 * BaseVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(40, vector.offsetBuffer.getInt(8 * BaseVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(40, vector.offsetBuffer.getInt(9 * BaseVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(40, vector.offsetBuffer.getInt(10 * BaseVariableWidthVector.OFFSET_WIDTH));
+
+      assertEquals(46, vector.offsetBuffer.getInt(11 * BaseVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(56, vector.offsetBuffer.getInt(12 * BaseVariableWidthVector.OFFSET_WIDTH));
+
+      assertEquals(56, vector.offsetBuffer.getInt(13 * BaseVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(56, vector.offsetBuffer.getInt(14 * BaseVariableWidthVector.OFFSET_WIDTH));
+      assertEquals(56, vector.offsetBuffer.getInt(15 * BaseVariableWidthVector.OFFSET_WIDTH));
     }
   }
 
@@ -2340,8 +2378,10 @@ public void testGetBufferAddress2() {
 
   @Test
   public void testMultipleClose() {
-    BufferAllocator vectorAllocator = allocator.newChildAllocator("vector_allocator", 0, Long.MAX_VALUE);
-    IntVector vector = newVector(IntVector.class, EMPTY_SCHEMA_PATH, MinorType.INT, vectorAllocator);
+    BufferAllocator vectorAllocator =
+        allocator.newChildAllocator("vector_allocator", 0, Long.MAX_VALUE);
+    IntVector vector =
+        newVector(IntVector.class, EMPTY_SCHEMA_PATH, MinorType.INT, vectorAllocator);
     vector.close();
     vectorAllocator.close();
     vector.close();
@@ -2353,10 +2393,12 @@ public void testMultipleClose() {
    * in a way that lastSet is not set automatically.
    */
   public static void setBytes(int index, byte[] bytes, VarCharVector vector) {
-    final int currentOffset = vector.offsetBuffer.getInt(index * BaseVariableWidthVector.OFFSET_WIDTH);
+    final int currentOffset =
+        vector.offsetBuffer.getInt(index * BaseVariableWidthVector.OFFSET_WIDTH);
 
     BitVectorHelper.setBit(vector.validityBuffer, index);
-    vector.offsetBuffer.setInt((index + 1) * BaseVariableWidthVector.OFFSET_WIDTH, currentOffset + bytes.length);
+    vector.offsetBuffer.setInt(
+        (index + 1) * BaseVariableWidthVector.OFFSET_WIDTH, currentOffset + bytes.length);
     vector.valueBuffer.setBytes(currentOffset, bytes, 0, bytes.length);
   }
 
@@ -2369,7 +2411,8 @@ public void testSetInitialCapacity() {
       vector.setInitialCapacity(defaultCapacity);
       vector.allocateNew();
       assertEquals(defaultCapacity, vector.getValueCapacity());
-      assertEquals(CommonUtil.nextPowerOfTwo(defaultCapacity * 8), vector.getDataBuffer().capacity());
+      assertEquals(
+          CommonUtil.nextPowerOfTwo(defaultCapacity * 8), vector.getDataBuffer().capacity());
 
       vector.setInitialCapacity(defaultCapacity, 1);
       vector.allocateNew();
@@ -2379,12 +2422,16 @@ public void testSetInitialCapacity() {
       vector.setInitialCapacity(defaultCapacity, 0.1);
       vector.allocateNew();
       assertEquals(defaultCapacity, vector.getValueCapacity());
-      assertEquals(CommonUtil.nextPowerOfTwo((int) (defaultCapacity * 0.1)), vector.getDataBuffer().capacity());
+      assertEquals(
+          CommonUtil.nextPowerOfTwo((int) (defaultCapacity * 0.1)),
+          vector.getDataBuffer().capacity());
 
       vector.setInitialCapacity(defaultCapacity, 0.01);
       vector.allocateNew();
       assertEquals(defaultCapacity, vector.getValueCapacity());
-      assertEquals(CommonUtil.nextPowerOfTwo((int) (defaultCapacity * 0.01)), vector.getDataBuffer().capacity());
+      assertEquals(
+          CommonUtil.nextPowerOfTwo((int) (defaultCapacity * 0.01)),
+          vector.getDataBuffer().capacity());
 
       vector.setInitialCapacity(5, 0.01);
       vector.allocateNew();
@@ -2398,35 +2445,40 @@ public void testDefaultAllocNewAll() {
     int defaultCapacity = BaseValueVector.INITIAL_VALUE_ALLOCATION;
     int expectedSize;
     long beforeSize;
-    try (BufferAllocator childAllocator = allocator.newChildAllocator("defaultAllocs", 0, Long.MAX_VALUE);
+    try (BufferAllocator childAllocator =
+            allocator.newChildAllocator("defaultAllocs", 0, Long.MAX_VALUE);
         final IntVector intVector = new IntVector(EMPTY_SCHEMA_PATH, childAllocator);
         final BigIntVector bigIntVector = new BigIntVector(EMPTY_SCHEMA_PATH, childAllocator);
         final BitVector bitVector = new BitVector(EMPTY_SCHEMA_PATH, childAllocator);
-        final DecimalVector decimalVector = new DecimalVector(EMPTY_SCHEMA_PATH, childAllocator, 38, 6);
+        final DecimalVector decimalVector =
+            new DecimalVector(EMPTY_SCHEMA_PATH, childAllocator, 38, 6);
         final VarCharVector varCharVector = new VarCharVector(EMPTY_SCHEMA_PATH, childAllocator)) {
 
       // verify that the wastage is within bounds for IntVector.
       beforeSize = childAllocator.getAllocatedMemory();
       intVector.allocateNew();
       assertTrue(intVector.getValueCapacity() >= defaultCapacity);
-      expectedSize = (defaultCapacity * IntVector.TYPE_WIDTH) +
-          BaseFixedWidthVector.getValidityBufferSizeFromCount(defaultCapacity);
+      expectedSize =
+          (defaultCapacity * IntVector.TYPE_WIDTH)
+              + BaseFixedWidthVector.getValidityBufferSizeFromCount(defaultCapacity);
       assertTrue(childAllocator.getAllocatedMemory() - beforeSize <= expectedSize * 1.05);
 
       // verify that the wastage is within bounds for BigIntVector.
       beforeSize = childAllocator.getAllocatedMemory();
       bigIntVector.allocateNew();
       assertTrue(bigIntVector.getValueCapacity() >= defaultCapacity);
-      expectedSize = (defaultCapacity * bigIntVector.TYPE_WIDTH) +
-          BaseFixedWidthVector.getValidityBufferSizeFromCount(defaultCapacity);
+      expectedSize =
+          (defaultCapacity * bigIntVector.TYPE_WIDTH)
+              + BaseFixedWidthVector.getValidityBufferSizeFromCount(defaultCapacity);
       assertTrue(childAllocator.getAllocatedMemory() - beforeSize <= expectedSize * 1.05);
 
       // verify that the wastage is within bounds for DecimalVector.
       beforeSize = childAllocator.getAllocatedMemory();
       decimalVector.allocateNew();
       assertTrue(decimalVector.getValueCapacity() >= defaultCapacity);
-      expectedSize = (defaultCapacity * decimalVector.TYPE_WIDTH) +
-          BaseFixedWidthVector.getValidityBufferSizeFromCount(defaultCapacity);
+      expectedSize =
+          (defaultCapacity * decimalVector.TYPE_WIDTH)
+              + BaseFixedWidthVector.getValidityBufferSizeFromCount(defaultCapacity);
       assertTrue(childAllocator.getAllocatedMemory() - beforeSize <= expectedSize * 1.05);
 
       // verify that the wastage is within bounds for VarCharVector.
@@ -2434,9 +2486,10 @@ public void testDefaultAllocNewAll() {
       beforeSize = childAllocator.getAllocatedMemory();
       varCharVector.allocateNew();
       assertTrue(varCharVector.getValueCapacity() >= defaultCapacity - 1);
-      expectedSize = (defaultCapacity * VarCharVector.OFFSET_WIDTH) +
-          BaseFixedWidthVector.getValidityBufferSizeFromCount(defaultCapacity) +
-          defaultCapacity * 8;
+      expectedSize =
+          (defaultCapacity * VarCharVector.OFFSET_WIDTH)
+              + BaseFixedWidthVector.getValidityBufferSizeFromCount(defaultCapacity)
+              + defaultCapacity * 8;
       // wastage should be less than 5%.
       assertTrue(childAllocator.getAllocatedMemory() - beforeSize <= expectedSize * 1.05);
 
@@ -2446,7 +2499,6 @@ public void testDefaultAllocNewAll() {
       assertTrue(bitVector.getValueCapacity() >= defaultCapacity);
       expectedSize = BaseFixedWidthVector.getValidityBufferSizeFromCount(defaultCapacity) * 2;
       assertTrue(childAllocator.getAllocatedMemory() - beforeSize <= expectedSize * 1.05);
-
     }
   }
 
@@ -2574,7 +2626,7 @@ public void testSetNullableVarBinaryHolderSafe() {
   public void testGetPointerFixedWidth() {
     final int vectorLength = 100;
     try (IntVector vec1 = new IntVector("vec1", allocator);
-         IntVector vec2 = new IntVector("vec2", allocator)) {
+        IntVector vec2 = new IntVector("vec2", allocator)) {
       vec1.allocateNew(vectorLength);
       vec2.allocateNew(vectorLength);
 
@@ -2608,11 +2660,11 @@ public void testGetPointerFixedWidth() {
 
   @Test
   public void testGetPointerVariableWidth() {
-    final String[] sampleData = new String[]{
-      "abc", "123", "def", null, "hello", "aaaaa", "world", "2019", null, "0717"};
+    final String[] sampleData =
+        new String[] {"abc", "123", "def", null, "hello", "aaaaa", "world", "2019", null, "0717"};
 
     try (VarCharVector vec1 = new VarCharVector("vec1", allocator);
-         VarCharVector vec2 = new VarCharVector("vec2", allocator)) {
+        VarCharVector vec2 = new VarCharVector("vec2", allocator)) {
       vec1.allocateNew(sampleData.length * 10, sampleData.length);
       vec2.allocateNew(sampleData.length * 10, sampleData.length);
 
@@ -2643,7 +2695,7 @@ public void testGetPointerVariableWidth() {
   @Test
   public void testGetNullFromVariableWidthVector() {
     try (final VarCharVector varCharVector = new VarCharVector("varcharvec", allocator);
-         final VarBinaryVector varBinaryVector = new VarBinaryVector("varbinary", allocator)) {
+        final VarBinaryVector varBinaryVector = new VarBinaryVector("varbinary", allocator)) {
       varCharVector.allocateNew(10, 1);
       varBinaryVector.allocateNew(10, 1);
 
@@ -2703,7 +2755,7 @@ public void testBitVectorEquals() {
   @Test
   public void testIntVectorEqualsWithNull() {
     try (final IntVector vector1 = new IntVector("int", allocator);
-         final IntVector vector2 = new IntVector("int", allocator)) {
+        final IntVector vector2 = new IntVector("int", allocator)) {
 
       setVector(vector1, 1, 2);
       setVector(vector2, 1, null);
@@ -2717,7 +2769,7 @@ public void testIntVectorEqualsWithNull() {
   @Test
   public void testIntVectorEquals() {
     try (final IntVector vector1 = new IntVector("int", allocator);
-         final IntVector vector2 = new IntVector("int", allocator)) {
+        final IntVector vector2 = new IntVector("int", allocator)) {
 
       setVector(vector1, 1, 2, 3);
       setVector(vector2, 1, 2, null);
@@ -2738,8 +2790,8 @@ public void testIntVectorEquals() {
   @Test
   public void testDecimalVectorEquals() {
     try (final DecimalVector vector1 = new DecimalVector("decimal", allocator, 3, 3);
-         final DecimalVector vector2 = new DecimalVector("decimal", allocator, 3, 3);
-         final DecimalVector vector3 = new DecimalVector("decimal", allocator, 3, 2)) {
+        final DecimalVector vector2 = new DecimalVector("decimal", allocator, 3, 3);
+        final DecimalVector vector3 = new DecimalVector("decimal", allocator, 3, 2)) {
 
       setVector(vector1, 100L, 200L);
       setVector(vector2, 100L, 200L);
@@ -2756,7 +2808,7 @@ public void testDecimalVectorEquals() {
   @Test
   public void testVarcharVectorEqualsWithNull() {
     try (final VarCharVector vector1 = new VarCharVector("varchar", allocator);
-         final VarCharVector vector2 = new VarCharVector("varchar", allocator)) {
+        final VarCharVector vector2 = new VarCharVector("varchar", allocator)) {
 
       setVector(vector1, STR1, STR2);
       setVector(vector2, STR1, null);
@@ -2769,7 +2821,7 @@ public void testVarcharVectorEqualsWithNull() {
   @Test
   public void testVarcharVectorEquals() {
     try (final VarCharVector vector1 = new VarCharVector("varchar", allocator);
-         final VarCharVector vector2 = new VarCharVector("varchar", allocator)) {
+        final VarCharVector vector2 = new VarCharVector("varchar", allocator)) {
 
       setVector(vector1, STR1, STR2, STR3);
       setVector(vector2, STR1, STR2);
@@ -2786,7 +2838,7 @@ public void testVarcharVectorEquals() {
   @Test
   public void testVarBinaryVectorEquals() {
     try (final VarBinaryVector vector1 = new VarBinaryVector("binary", allocator);
-         final VarBinaryVector vector2 = new VarBinaryVector("binary", allocator)) {
+        final VarBinaryVector vector2 = new VarBinaryVector("binary", allocator)) {
 
       setVector(vector1, STR1, STR2, STR3);
       setVector(vector2, STR1, STR2);
@@ -2803,12 +2855,12 @@ public void testVarBinaryVectorEquals() {
   @Test
   public void testListVectorEqualsWithNull() {
     try (final ListVector vector1 = ListVector.empty("list", allocator);
-        final ListVector vector2 = ListVector.empty("list", allocator);) {
+        final ListVector vector2 = ListVector.empty("list", allocator); ) {
 
       UnionListWriter writer1 = vector1.getWriter();
       writer1.allocate();
 
-      //set some values
+      // set some values
       writeListVector(writer1, new int[] {1, 2});
       writeListVector(writer1, new int[] {3, 4});
       writeListVector(writer1, new int[] {});
@@ -2817,7 +2869,7 @@ public void testListVectorEqualsWithNull() {
       UnionListWriter writer2 = vector2.getWriter();
       writer2.allocate();
 
-      //set some values
+      // set some values
       writeListVector(writer2, new int[] {1, 2});
       writeListVector(writer2, new int[] {3, 4});
       writer2.setValueCount(3);
@@ -2831,12 +2883,12 @@ public void testListVectorEqualsWithNull() {
   @Test
   public void testListVectorEquals() {
     try (final ListVector vector1 = ListVector.empty("list", allocator);
-        final ListVector vector2 = ListVector.empty("list", allocator);) {
+        final ListVector vector2 = ListVector.empty("list", allocator); ) {
 
       UnionListWriter writer1 = vector1.getWriter();
       writer1.allocate();
 
-      //set some values
+      // set some values
       writeListVector(writer1, new int[] {1, 2});
       writeListVector(writer1, new int[] {3, 4});
       writeListVector(writer1, new int[] {5, 6});
@@ -2845,7 +2897,7 @@ public void testListVectorEquals() {
       UnionListWriter writer2 = vector2.getWriter();
       writer2.allocate();
 
-      //set some values
+      // set some values
       writeListVector(writer2, new int[] {1, 2});
       writeListVector(writer2, new int[] {3, 4});
       writer2.setValueCount(2);
@@ -2887,7 +2939,7 @@ public void testListVectorSetNull() {
   public void testStructVectorEqualsWithNull() {
 
     try (final StructVector vector1 = StructVector.empty("struct", allocator);
-        final StructVector vector2 = StructVector.empty("struct", allocator);) {
+        final StructVector vector2 = StructVector.empty("struct", allocator); ) {
       vector1.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
       vector1.addOrGet("f1", FieldType.nullable(new ArrowType.Int(64, true)), BigIntVector.class);
       vector2.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
@@ -2916,7 +2968,7 @@ public void testStructVectorEqualsWithNull() {
   @Test
   public void testStructVectorEquals() {
     try (final StructVector vector1 = StructVector.empty("struct", allocator);
-        final StructVector vector2 = StructVector.empty("struct", allocator);) {
+        final StructVector vector2 = StructVector.empty("struct", allocator); ) {
       vector1.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
       vector1.addOrGet("f1", FieldType.nullable(new ArrowType.Int(64, true)), BigIntVector.class);
       vector2.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
@@ -2950,7 +3002,7 @@ public void testStructVectorEquals() {
   @Test
   public void testStructVectorEqualsWithDiffChild() {
     try (final StructVector vector1 = StructVector.empty("struct", allocator);
-        final StructVector vector2 = StructVector.empty("struct", allocator);) {
+        final StructVector vector2 = StructVector.empty("struct", allocator); ) {
       vector1.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
       vector1.addOrGet("f1", FieldType.nullable(new ArrowType.Int(64, true)), BigIntVector.class);
       vector2.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
@@ -2977,12 +3029,16 @@ public void testStructVectorEqualsWithDiffChild() {
 
   @Test
   public void testStructVectorAcceptsDenseUnionChild() {
-    Field childField = new Field("child",
-             FieldType.notNullable(new ArrowType.Union(UnionMode.Dense, new int[] {})),
-             Collections.emptyList());
-    Field structField = new Field("struct",
-             FieldType.notNullable(ArrowType.Struct.INSTANCE),
-             Collections.singletonList(childField));
+    Field childField =
+        new Field(
+            "child",
+            FieldType.notNullable(new ArrowType.Union(UnionMode.Dense, new int[] {})),
+            Collections.emptyList());
+    Field structField =
+        new Field(
+            "struct",
+            FieldType.notNullable(ArrowType.Struct.INSTANCE),
+            Collections.singletonList(childField));
 
     try (FieldVector structVec = structField.createVector(allocator)) {
       assertEquals(structField, structVec.getField());
@@ -2991,8 +3047,10 @@ public void testStructVectorAcceptsDenseUnionChild() {
 
   @Test
   public void testUnionVectorEquals() {
-    try (final UnionVector vector1 = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);
-        final UnionVector vector2 = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);) {
+    try (final UnionVector vector1 =
+            new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);
+        final UnionVector vector2 =
+            new UnionVector("union", allocator, /* field type */ null, /* call-back */ null); ) {
 
       final NullableUInt4Holder uInt4Holder = new NullableUInt4Holder();
       uInt4Holder.value = 10;
@@ -3021,16 +3079,20 @@ public void testUnionVectorEquals() {
     }
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testEqualsWithIndexOutOfRange() {
-    try (final IntVector vector1 = new IntVector("int", allocator);
-         final IntVector vector2 = new IntVector("int", allocator)) {
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          try (final IntVector vector1 = new IntVector("int", allocator);
+              final IntVector vector2 = new IntVector("int", allocator)) {
 
-      setVector(vector1, 1, 2);
-      setVector(vector2, 1, 2);
+            setVector(vector1, 1, 2);
+            setVector(vector2, 1, 2);
 
-      assertTrue(new RangeEqualsVisitor(vector1, vector2).rangeEquals(new Range(2, 3, 1)));
-    }
+            assertTrue(new RangeEqualsVisitor(vector1, vector2).rangeEquals(new Range(2, 3, 1)));
+          }
+        });
   }
 
   @Test
@@ -3062,7 +3124,8 @@ public void testVariableWidthVectorNullHashCode() {
   @Test
   public void testUnionNullHashCode() {
     try (UnionVector srcVector =
-             new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
+        new UnionVector(
+            EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) {
       srcVector.allocateNew();
 
       final NullableIntHolder holder = new NullableIntHolder();
@@ -3079,8 +3142,8 @@ public void testUnionNullHashCode() {
   @Test
   public void testToString() {
     try (final IntVector intVector = new IntVector("intVector", allocator);
-         final ListVector listVector = ListVector.empty("listVector", allocator);
-         final StructVector structVector = StructVector.empty("structVector", allocator)) {
+        final ListVector listVector = ListVector.empty("listVector", allocator);
+        final StructVector structVector = StructVector.empty("structVector", allocator)) {
 
       // validate intVector toString
       assertEquals("[]", intVector.toString());
@@ -3095,7 +3158,8 @@ public void testToString() {
       for (int i = 0; i < 100; i++) {
         intVector.setSafe(i, i);
       }
-      assertEquals("[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ... 90, 91, 92, 93, 94, 95, 96, 97, 98, 99]",
+      assertEquals(
+          "[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, ... 90, 91, 92, 93, 94, 95, 96, 97, 98, 99]",
           intVector.toString());
 
       // validate listVector toString
@@ -3119,7 +3183,8 @@ public void testToString() {
 
       // validate structVector toString
       structVector.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
-      structVector.addOrGet("f1", FieldType.nullable(new ArrowType.Int(64, true)), BigIntVector.class);
+      structVector.addOrGet(
+          "f1", FieldType.nullable(new ArrowType.Int(64, true)), BigIntVector.class);
 
       NullableStructWriter structWriter = structVector.getWriter();
       structWriter.allocate();
@@ -3195,7 +3260,7 @@ private void writeStructVector(NullableStructWriter writer, int value1, long val
 
   private void writeListVector(UnionListWriter writer, int[] values) {
     writer.startList();
-    for (int v: values) {
+    for (int v : values) {
       writer.integer().writeInt(v);
     }
     writer.endList();
@@ -3204,7 +3269,7 @@ private void writeListVector(UnionListWriter writer, int[] values) {
   @Test
   public void testVariableVectorGetEndOffset() {
     try (final VarCharVector vector1 = new VarCharVector("v1", allocator);
-         final VarBinaryVector vector2 = new VarBinaryVector("v2", allocator)) {
+        final VarBinaryVector vector2 = new VarBinaryVector("v2", allocator)) {
 
       setVector(vector1, STR1, null, STR2);
       setVector(vector2, STR1, STR2, STR3);
@@ -3398,4 +3463,99 @@ public void testSetGetUInt4() {
       assertEquals(expected, vector.getValueAsLong(1));
     }
   }
+
+  @Test
+  public void testSplitAndTransferFixedWithVector1() {
+    RootAllocator allocator = new RootAllocator(Long.MAX_VALUE);
+    try (BufferAllocator child = allocator.newChildAllocator("child", 0, Long.MAX_VALUE)) {
+      try (IntVector vector = new IntVector("vector", child)) {
+        vector.setSafe(0, 1);
+        vector.setSafe(1, 2);
+        vector.setSafe(2, 3);
+        vector.setValueCount(3);
+
+        TransferPair transferPair = vector.getTransferPair(allocator);
+        transferPair.splitAndTransfer(0, 1);
+        try (IntVector target = (IntVector) transferPair.getTo()) {
+          // no-op try-with-resource
+          assertEquals(1, target.get(0));
+        }
+      }
+    }
+  }
+
+  @Test
+  public void testSplitAndTransferFixedWithVector2() {
+    IntVector target;
+    try (BufferAllocator child = allocator.newChildAllocator("child", 0, Long.MAX_VALUE)) {
+      try (IntVector vector = new IntVector("source", child)) {
+        vector.setSafe(0, 1);
+        vector.setSafe(1, 2);
+        vector.setSafe(2, 3);
+        vector.setValueCount(3);
+
+        TransferPair transferPair = vector.getTransferPair(allocator);
+        transferPair.splitAndTransfer(0, 1);
+        target = (IntVector) transferPair.getTo();
+        assertEquals(1, target.get(0));
+      }
+    }
+    target.close();
+  }
+
+  @Test
+  public void testVectorLoadUnloadOnNonVariadicVectors() {
+
+    try (final IntVector vector1 = new IntVector("myvector", allocator)) {
+
+      setVector(vector1, 1, 2, 3, 4, 5, 6);
+      vector1.setValueCount(15);
+
+      /* Check the vector output */
+      assertEquals(1, vector1.get(0));
+      assertEquals(2, vector1.get(1));
+      assertEquals(3, vector1.get(2));
+      assertEquals(4, vector1.get(3));
+      assertEquals(5, vector1.get(4));
+      assertEquals(6, vector1.get(5));
+
+      Field field = vector1.getField();
+      String fieldName = field.getName();
+
+      List<Field> fields = new ArrayList<>();
+      List<FieldVector> fieldVectors = new ArrayList<>();
+
+      fields.add(field);
+      fieldVectors.add(vector1);
+
+      Schema schema = new Schema(fields);
+
+      VectorSchemaRoot schemaRoot1 =
+          new VectorSchemaRoot(schema, fieldVectors, vector1.getValueCount());
+      VectorUnloader vectorUnloader = new VectorUnloader(schemaRoot1);
+
+      try (ArrowRecordBatch recordBatch = vectorUnloader.getRecordBatch();
+          BufferAllocator finalVectorsAllocator =
+              allocator.newChildAllocator("new vector", 0, Long.MAX_VALUE);
+          VectorSchemaRoot schemaRoot2 = VectorSchemaRoot.create(schema, finalVectorsAllocator); ) {
+
+        // validating recordBatch doesn't contain an output for variadicBufferCounts
+        assertTrue(recordBatch.getVariadicBufferCounts().isEmpty());
+
+        VectorLoader vectorLoader = new VectorLoader(schemaRoot2);
+        vectorLoader.load(recordBatch);
+
+        IntVector vector2 = (IntVector) schemaRoot2.getVector(fieldName);
+        vector2.setValueCount(25);
+
+        /* Check the vector output */
+        assertEquals(1, vector2.get(0));
+        assertEquals(2, vector2.get(1));
+        assertEquals(3, vector2.get(2));
+        assertEquals(4, vector2.get(3));
+        assertEquals(5, vector2.get(4));
+        assertEquals(6, vector2.get(5));
+      }
+    }
+  }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestValueVectorIterable.java b/java/vector/src/test/java/org/apache/arrow/vector/TestValueVectorIterable.java
new file mode 100644
index 0000000000000..e6b79e89b9942
--- /dev/null
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestValueVectorIterable.java
@@ -0,0 +1,909 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.vector;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.Period;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.vector.complex.FixedSizeListVector;
+import org.apache.arrow.vector.complex.LargeListVector;
+import org.apache.arrow.vector.complex.ListVector;
+import org.apache.arrow.vector.complex.ListViewVector;
+import org.apache.arrow.vector.complex.NonNullableStructVector;
+import org.apache.arrow.vector.complex.StructVector;
+import org.apache.arrow.vector.complex.impl.NullableStructWriter;
+import org.apache.arrow.vector.complex.impl.UnionLargeListWriter;
+import org.apache.arrow.vector.complex.impl.UnionListViewWriter;
+import org.apache.arrow.vector.complex.impl.UnionListWriter;
+import org.apache.arrow.vector.types.TimeUnit;
+import org.apache.arrow.vector.types.Types;
+import org.apache.arrow.vector.types.pojo.ArrowType;
+import org.apache.arrow.vector.types.pojo.Field;
+import org.apache.arrow.vector.types.pojo.FieldType;
+import org.apache.arrow.vector.util.Text;
+import org.hamcrest.collection.IsIterableContainingInOrder;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class TestValueVectorIterable {
+  private BufferAllocator allocator;
+
+  @BeforeEach
+  public void init() {
+    allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
+  }
+
+  @AfterEach
+  public void terminate() throws Exception {
+    allocator.close();
+  }
+
+  @Test
+  public void testBigIntVectorIterable() {
+    try (final BigIntVector bigIntVector = new BigIntVector("bigInt", allocator)) {
+      bigIntVector.allocateNew(3);
+      bigIntVector.setSafe(0, 6);
+      bigIntVector.setSafe(1, 2);
+      bigIntVector.setSafe(2, 19);
+      bigIntVector.setValueCount(3);
+
+      assertThat(
+          bigIntVector.getValueIterable(), IsIterableContainingInOrder.contains(6L, 2L, 19L));
+    }
+  }
+
+  @Test
+  public void testBitVectorIterable() {
+    try (final BitVector bitVector = new BitVector("bit", allocator)) {
+      bitVector.allocateNew(3);
+      bitVector.setSafe(0, 0);
+      bitVector.setNull(1);
+      bitVector.setSafe(2, 1);
+      bitVector.setValueCount(3);
+
+      assertThat(
+          bitVector.getValueIterable(), IsIterableContainingInOrder.contains(false, null, true));
+    }
+  }
+
+  @Test
+  public void testDateDayVectorIterable() {
+    try (final DateDayVector dateDayVector = new DateDayVector("dateDay", allocator)) {
+      dateDayVector.allocateNew(3);
+      dateDayVector.setSafe(0, 30000);
+      dateDayVector.setNull(1);
+      dateDayVector.setSafe(2, 555);
+      dateDayVector.setValueCount(3);
+
+      assertThat(
+          dateDayVector.getValueIterable(), IsIterableContainingInOrder.contains(30000, null, 555));
+    }
+  }
+
+  @Test
+  public void testDateMilliVectorIterable() {
+    try (final DateMilliVector dateMilliVector = new DateMilliVector("dateMilli", allocator)) {
+      dateMilliVector.allocateNew(3);
+      dateMilliVector.setSafe(0, 30000L);
+      dateMilliVector.setNull(1);
+      dateMilliVector.setSafe(2, 555L);
+      dateMilliVector.setValueCount(3);
+
+      final LocalDateTime value1 = LocalDateTime.ofEpochSecond(30L, 0, ZoneOffset.ofHours(0));
+      final LocalDateTime value3 =
+          LocalDateTime.ofEpochSecond(0L, 555000000, ZoneOffset.ofHours(0));
+      assertThat(
+          dateMilliVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testDecimal256VectorIterable() {
+    try (final Decimal256Vector decimal256Vector =
+        new Decimal256Vector("decimal256", allocator, 8, 2)) {
+      decimal256Vector.allocateNew(3);
+      decimal256Vector.setSafe(0, 30000L);
+      decimal256Vector.setNull(1);
+      decimal256Vector.setSafe(2, 555L);
+      decimal256Vector.setValueCount(3);
+
+      final BigDecimal value1 = new BigDecimal(300L).setScale(2, RoundingMode.HALF_UP);
+      final BigDecimal value3 =
+          new BigDecimal(555L).scaleByPowerOfTen(-2).setScale(2, RoundingMode.HALF_UP);
+      assertThat(
+          decimal256Vector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testDecimalVectorIterable() {
+    try (final DecimalVector decimalVector = new DecimalVector("decimalDay", allocator, 8, 2)) {
+      decimalVector.allocateNew(3);
+      decimalVector.setSafe(0, 30000);
+      decimalVector.setNull(1);
+      decimalVector.setSafe(2, 555);
+      decimalVector.setValueCount(3);
+
+      final BigDecimal value1 = new BigDecimal(300L).setScale(2, RoundingMode.HALF_UP);
+      final BigDecimal value3 =
+          new BigDecimal(555L).scaleByPowerOfTen(-2).setScale(2, RoundingMode.HALF_UP);
+      assertThat(
+          decimalVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testDurationVectorIterable() {
+    try (final DurationVector durationVector =
+        new DurationVector(
+            Field.nullablePrimitive("duration", new ArrowType.Duration(TimeUnit.MILLISECOND)),
+            allocator)) {
+      durationVector.allocateNew(3);
+      durationVector.setSafe(0, 30000);
+      durationVector.setNull(1);
+      durationVector.setSafe(2, 555);
+      durationVector.setValueCount(3);
+
+      final Duration value1 = Duration.ofMillis(30000);
+      final Duration value3 = Duration.ofMillis(555);
+      assertThat(
+          durationVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testFixedSizeBinaryVectorIterable() {
+    try (final FixedSizeBinaryVector fixedSizeBinaryVector =
+        new FixedSizeBinaryVector("binary", allocator, 4)) {
+      final byte[] value1 = new byte[] {0, 0, 0, 1};
+      final byte[] value3 = new byte[] {1, 0, 0, 0};
+
+      fixedSizeBinaryVector.allocateNew(3);
+      fixedSizeBinaryVector.setSafe(0, value1);
+      fixedSizeBinaryVector.setNull(1);
+      fixedSizeBinaryVector.setSafe(2, value3);
+      fixedSizeBinaryVector.setValueCount(3);
+
+      assertThat(
+          fixedSizeBinaryVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testFloat2VectorIterable() {
+    try (final Float2Vector float2Vector = new Float2Vector("float2", allocator)) {
+      float2Vector.allocateNew(3);
+      float2Vector.setSafe(0, (short) 7777);
+      float2Vector.setNull(1);
+      float2Vector.setSafe(2, (short) 5);
+      float2Vector.setValueCount(3);
+
+      assertThat(
+          float2Vector.getValueIterable(),
+          IsIterableContainingInOrder.contains((short) 7777, null, (short) 5));
+    }
+  }
+
+  @Test
+  public void testFloat4VectorIterable() {
+    try (final Float4Vector float4Vector = new Float4Vector("float4", allocator)) {
+      float4Vector.allocateNew(3);
+      float4Vector.setSafe(0, 16.32f);
+      float4Vector.setNull(1);
+      float4Vector.setSafe(2, -10.75f);
+      float4Vector.setValueCount(3);
+
+      assertThat(
+          float4Vector.getValueIterable(),
+          IsIterableContainingInOrder.contains(16.32f, null, -10.75f));
+    }
+  }
+
+  @Test
+  public void testFloat8VectorIterable() {
+    try (final Float8Vector float8Vector = new Float8Vector("float8", allocator)) {
+      float8Vector.allocateNew(3);
+      float8Vector.setSafe(0, 16.32);
+      float8Vector.setNull(1);
+      float8Vector.setSafe(2, -10.75);
+      float8Vector.setValueCount(3);
+
+      assertThat(
+          float8Vector.getValueIterable(),
+          IsIterableContainingInOrder.contains(16.32, null, -10.75));
+    }
+  }
+
+  @Test
+  public void testIntVectorIterable() {
+    try (final IntVector intVector = new IntVector("int", allocator)) {
+      intVector.allocateNew(3);
+      intVector.setSafe(0, 78);
+      intVector.setNull(1);
+      intVector.setSafe(2, -93);
+      intVector.setValueCount(3);
+
+      assertThat(intVector.getValueIterable(), IsIterableContainingInOrder.contains(78, null, -93));
+    }
+  }
+
+  @Test
+  public void testIntervalDayVectorIterable() {
+    try (final IntervalDayVector intervalDayVector =
+        new IntervalDayVector("intervalDay", allocator)) {
+      intervalDayVector.allocateNew(3);
+      intervalDayVector.setSafe(0, 63, 0);
+      intervalDayVector.setNull(1);
+      intervalDayVector.setSafe(2, 555, 0);
+      intervalDayVector.setValueCount(3);
+
+      final Duration value1 = Duration.ofDays(63);
+      final Duration value3 = Duration.ofDays(555);
+      assertThat(
+          intervalDayVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testIntervalMonthDayNanoVectorIterable() {
+    try (final IntervalMonthDayNanoVector intervalMonthDayNanoVector =
+        new IntervalMonthDayNanoVector("intervalMonthDayNano", allocator)) {
+      intervalMonthDayNanoVector.allocateNew(3);
+      intervalMonthDayNanoVector.setSafe(0, 3, 4, 0);
+      intervalMonthDayNanoVector.setNull(1);
+      intervalMonthDayNanoVector.setSafe(2, 7, 18, 0);
+      intervalMonthDayNanoVector.setValueCount(3);
+
+      final PeriodDuration value1 = new PeriodDuration(Period.of(0, 3, 4), Duration.ofSeconds(0));
+      final PeriodDuration value3 = new PeriodDuration(Period.of(0, 7, 18), Duration.ofSeconds(0));
+      assertThat(
+          intervalMonthDayNanoVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testIntervalYearVectorIterable() {
+    try (final IntervalYearVector intervalYearVector =
+        new IntervalYearVector("intervalYear", allocator)) {
+      intervalYearVector.allocateNew(3);
+      intervalYearVector.setSafe(0, 3);
+      intervalYearVector.setNull(1);
+      intervalYearVector.setSafe(2, 17);
+      intervalYearVector.setValueCount(3);
+
+      final Period value1 = Period.ofMonths(3);
+      final Period value3 = Period.ofMonths(17);
+      assertThat(
+          intervalYearVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testLargeVarBinaryVectorIterable() {
+    try (final LargeVarBinaryVector largeVarBinaryVector =
+        new LargeVarBinaryVector("largeVarBinary", allocator)) {
+      final byte[] value1 = new byte[] {0, 0, 0, 1};
+      final byte[] value3 = new byte[] {1, 0, 0};
+
+      largeVarBinaryVector.allocateNew(3);
+      largeVarBinaryVector.setSafe(0, value1);
+      largeVarBinaryVector.setNull(1);
+      largeVarBinaryVector.setSafe(2, value3);
+      largeVarBinaryVector.setValueCount(3);
+
+      assertThat(
+          largeVarBinaryVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testLargeVarCharVectorIterable() {
+    try (final LargeVarCharVector largeVarCharVector =
+        new LargeVarCharVector("largeVarChar", allocator)) {
+      final Text value1 = new Text("hello");
+      final Text value3 = new Text("worlds");
+
+      largeVarCharVector.allocateNew(3);
+      largeVarCharVector.setSafe(0, value1);
+      largeVarCharVector.setNull(1);
+      largeVarCharVector.setSafe(2, value3);
+      largeVarCharVector.setValueCount(3);
+
+      assertThat(
+          largeVarCharVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testNullVectorIterable() {
+    try (final NullVector nullVector = new NullVector("null", 3)) {
+      assertThat(
+          nullVector.getValueIterable(), IsIterableContainingInOrder.contains(null, null, null));
+    }
+  }
+
+  @Test
+  public void testSmallIntVectorIterable() {
+    try (final SmallIntVector smallIntVector = new SmallIntVector("smallInt", allocator)) {
+      smallIntVector.allocateNew(3);
+      smallIntVector.setSafe(0, 78);
+      smallIntVector.setNull(1);
+      smallIntVector.setSafe(2, -93);
+      smallIntVector.setValueCount(3);
+
+      assertThat(
+          smallIntVector.getValueIterable(),
+          IsIterableContainingInOrder.contains((short) 78, null, (short) -93));
+    }
+  }
+
+  @Test
+  public void testTimeMicroVectorIterable() {
+    try (final TimeMicroVector timeMicroVector = new TimeMicroVector("timeMicro", allocator)) {
+      timeMicroVector.allocateNew(3);
+      timeMicroVector.setSafe(0, 70000);
+      timeMicroVector.setNull(1);
+      timeMicroVector.setSafe(2, 555);
+      timeMicroVector.setValueCount(3);
+
+      assertThat(
+          timeMicroVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(70000L, null, 555L));
+    }
+  }
+
+  @Test
+  public void testTimeMilliVectorIterable() {
+    try (final TimeMilliVector timeMilliVector = new TimeMilliVector("timeMilli", allocator)) {
+      timeMilliVector.allocateNew(3);
+      timeMilliVector.setSafe(0, 70000);
+      timeMilliVector.setNull(1);
+      timeMilliVector.setSafe(2, 555);
+      timeMilliVector.setValueCount(3);
+
+      final LocalDateTime value1 = LocalDateTime.ofEpochSecond(70L, 0, ZoneOffset.ofHours(0));
+      final LocalDateTime value3 =
+          LocalDateTime.ofEpochSecond(0L, 555000000, ZoneOffset.ofHours(0));
+      assertThat(
+          timeMilliVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testTimeNanoVectorIterable() {
+    try (final TimeNanoVector timeNanoVector = new TimeNanoVector("timeNano", allocator)) {
+      timeNanoVector.allocateNew(3);
+      timeNanoVector.setSafe(0, 70000);
+      timeNanoVector.setNull(1);
+      timeNanoVector.setSafe(2, 555);
+      timeNanoVector.setValueCount(3);
+
+      assertThat(
+          timeNanoVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(70000L, null, 555L));
+    }
+  }
+
+  @Test
+  public void testTimeSecVectorIterable() {
+    try (final TimeSecVector timeSecVector = new TimeSecVector("timeSec", allocator)) {
+      timeSecVector.allocateNew(3);
+      timeSecVector.setSafe(0, 70000);
+      timeSecVector.setNull(1);
+      timeSecVector.setSafe(2, 555);
+      timeSecVector.setValueCount(3);
+
+      assertThat(
+          timeSecVector.getValueIterable(), IsIterableContainingInOrder.contains(70000, null, 555));
+    }
+  }
+
+  @Test
+  public void testTimeStampMicroTZVectorIterable() {
+    try (final TimeStampMicroTZVector timeStampMicroTzVector =
+        new TimeStampMicroTZVector("timeStampMicroTZ", allocator, "UTC")) {
+      timeStampMicroTzVector.allocateNew(3);
+      timeStampMicroTzVector.setSafe(0, 70000);
+      timeStampMicroTzVector.setNull(1);
+      timeStampMicroTzVector.setSafe(2, 555);
+      timeStampMicroTzVector.setValueCount(3);
+
+      assertThat(
+          timeStampMicroTzVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(70000L, null, 555L));
+    }
+  }
+
+  @Test
+  public void testTimeStampMicroVectorIterable() {
+    try (final TimeStampMicroVector timeStampMicroVector =
+        new TimeStampMicroVector("timeStampMicro", allocator)) {
+      timeStampMicroVector.allocateNew(3);
+      timeStampMicroVector.setSafe(0, 70000);
+      timeStampMicroVector.setNull(1);
+      timeStampMicroVector.setSafe(2, 555);
+      timeStampMicroVector.setValueCount(3);
+
+      final LocalDateTime value1 = LocalDateTime.ofEpochSecond(0L, 70000000, ZoneOffset.ofHours(0));
+      final LocalDateTime value3 = LocalDateTime.ofEpochSecond(0L, 555000, ZoneOffset.ofHours(0));
+      assertThat(
+          timeStampMicroVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testTimeStampMilliTZVectorIterable() {
+    try (final TimeStampMilliTZVector timeStampMilliTzVector =
+        new TimeStampMilliTZVector("timeStampMilliTZ", allocator, "UTC")) {
+      timeStampMilliTzVector.allocateNew(3);
+      timeStampMilliTzVector.setSafe(0, 70000);
+      timeStampMilliTzVector.setNull(1);
+      timeStampMilliTzVector.setSafe(2, 555);
+      timeStampMilliTzVector.setValueCount(3);
+
+      assertThat(
+          timeStampMilliTzVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(70000L, null, 555L));
+    }
+  }
+
+  @Test
+  public void testTimeStampMilliVectorIterable() {
+    try (final TimeStampMilliVector timeStampMilliVector =
+        new TimeStampMilliVector("timeStampMilli", allocator)) {
+      timeStampMilliVector.allocateNew(3);
+      timeStampMilliVector.setSafe(0, 70000);
+      timeStampMilliVector.setNull(1);
+      timeStampMilliVector.setSafe(2, 555);
+      timeStampMilliVector.setValueCount(3);
+
+      final LocalDateTime value1 = LocalDateTime.ofEpochSecond(70L, 0, ZoneOffset.ofHours(0));
+      final LocalDateTime value3 =
+          LocalDateTime.ofEpochSecond(0L, 555000000, ZoneOffset.ofHours(0));
+      assertThat(
+          timeStampMilliVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testTimeStampNanoTZVectorIterable() {
+    try (final TimeStampNanoTZVector timeStampNanoTzVector =
+        new TimeStampNanoTZVector("timeStampNanoTZ", allocator, "UTC")) {
+      timeStampNanoTzVector.allocateNew(3);
+      timeStampNanoTzVector.setSafe(0, 70000);
+      timeStampNanoTzVector.setNull(1);
+      timeStampNanoTzVector.setSafe(2, 555);
+      timeStampNanoTzVector.setValueCount(3);
+
+      assertThat(
+          timeStampNanoTzVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(70000L, null, 555L));
+    }
+  }
+
+  @Test
+  public void testTimeStampNanoVectorIterable() {
+    try (final TimeStampNanoVector timeStampNanoVector =
+        new TimeStampNanoVector("timeStampNano", allocator)) {
+      timeStampNanoVector.allocateNew(3);
+      timeStampNanoVector.setSafe(0, 70000);
+      timeStampNanoVector.setNull(1);
+      timeStampNanoVector.setSafe(2, 555);
+      timeStampNanoVector.setValueCount(3);
+
+      final LocalDateTime value1 = LocalDateTime.ofEpochSecond(0L, 70000, ZoneOffset.ofHours(0));
+      final LocalDateTime value3 = LocalDateTime.ofEpochSecond(0L, 555, ZoneOffset.ofHours(0));
+      assertThat(
+          timeStampNanoVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testTimeStampSecTZVectorIterable() {
+    try (final TimeStampSecTZVector timeStampSecTzVector =
+        new TimeStampSecTZVector("timeStampSecTZ", allocator, "UTC")) {
+      timeStampSecTzVector.allocateNew(3);
+      timeStampSecTzVector.setSafe(0, 70000);
+      timeStampSecTzVector.setNull(1);
+      timeStampSecTzVector.setSafe(2, 555);
+      timeStampSecTzVector.setValueCount(3);
+
+      assertThat(
+          timeStampSecTzVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(70000L, null, 555L));
+    }
+  }
+
+  @Test
+  public void testTimeStampSecVectorIterable() {
+    try (final TimeStampSecVector timeStampSecVector =
+        new TimeStampSecVector("timeStampSec", allocator)) {
+      timeStampSecVector.allocateNew(3);
+      timeStampSecVector.setSafe(0, 70000);
+      timeStampSecVector.setNull(1);
+      timeStampSecVector.setSafe(2, 555);
+      timeStampSecVector.setValueCount(3);
+
+      final LocalDateTime value1 = LocalDateTime.ofEpochSecond(70000L, 0, ZoneOffset.ofHours(0));
+      final LocalDateTime value3 = LocalDateTime.ofEpochSecond(555L, 0, ZoneOffset.ofHours(0));
+      assertThat(
+          timeStampSecVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testTinyIntVectorIterable() {
+    try (final TinyIntVector tinyIntVector = new TinyIntVector("tinyInt", allocator)) {
+      tinyIntVector.allocateNew(3);
+      tinyIntVector.setSafe(0, 8);
+      tinyIntVector.setNull(1);
+      tinyIntVector.setSafe(2, -17);
+      tinyIntVector.setValueCount(3);
+
+      assertThat(
+          tinyIntVector.getValueIterable(),
+          IsIterableContainingInOrder.contains((byte) 8, null, (byte) -17));
+    }
+  }
+
+  @Test
+  public void testUInt1VectorIterable() {
+    try (final UInt1Vector uint1Vector = new UInt1Vector("uint1", allocator)) {
+      uint1Vector.allocateNew(3);
+      uint1Vector.setSafe(0, 8);
+      uint1Vector.setNull(1);
+      uint1Vector.setSafe(2, 101);
+      uint1Vector.setValueCount(3);
+
+      assertThat(
+          uint1Vector.getValueIterable(),
+          IsIterableContainingInOrder.contains((byte) 8, null, (byte) 101));
+    }
+  }
+
+  @Test
+  public void testUInt2VectorIterable() {
+    try (final UInt2Vector uint2Vector = new UInt2Vector("uint2", allocator)) {
+      uint2Vector.allocateNew(3);
+      uint2Vector.setSafe(0, 78);
+      uint2Vector.setNull(1);
+      uint2Vector.setSafe(2, 3456);
+      uint2Vector.setValueCount(3);
+
+      assertThat(
+          uint2Vector.getValueIterable(),
+          IsIterableContainingInOrder.contains((char) 78, null, (char) 3456));
+    }
+  }
+
+  @Test
+  public void testUInt4VectorIterable() {
+    try (final UInt4Vector uint4Vector = new UInt4Vector("uint4", allocator)) {
+      uint4Vector.allocateNew(3);
+      uint4Vector.setSafe(0, 78);
+      uint4Vector.setNull(1);
+      uint4Vector.setSafe(2, 3456);
+      uint4Vector.setValueCount(3);
+
+      assertThat(
+          uint4Vector.getValueIterable(), IsIterableContainingInOrder.contains(78, null, 3456));
+    }
+  }
+
+  @Test
+  public void testUInt8VectorIterable() {
+    try (final UInt8Vector uint8Vector = new UInt8Vector("uint8", allocator)) {
+      uint8Vector.allocateNew(3);
+      uint8Vector.setSafe(0, 6);
+      uint8Vector.setSafe(1, 2);
+      uint8Vector.setSafe(2, 19);
+      uint8Vector.setValueCount(3);
+
+      assertThat(uint8Vector.getValueIterable(), IsIterableContainingInOrder.contains(6L, 2L, 19L));
+    }
+  }
+
+  @Test
+  public void testVarBinaryVectorIterable() {
+    try (final VarBinaryVector varBinaryVector = new VarBinaryVector("varBinary", allocator)) {
+      final byte[] value1 = new byte[] {0, 0, 0, 1};
+      final byte[] value3 = new byte[] {1, 0, 0};
+
+      varBinaryVector.allocateNew(3);
+      varBinaryVector.setSafe(0, value1);
+      varBinaryVector.setNull(1);
+      varBinaryVector.setSafe(2, value3);
+      varBinaryVector.setValueCount(3);
+
+      assertThat(
+          varBinaryVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testVarCharVectorIterable() {
+    try (final VarCharVector varCharVector = new VarCharVector("varChar", allocator)) {
+      final Text value1 = new Text("hello");
+      final Text value3 = new Text("worlds");
+
+      varCharVector.allocateNew(3);
+      varCharVector.setSafe(0, value1);
+      varCharVector.setNull(1);
+      varCharVector.setSafe(2, value3);
+      varCharVector.setValueCount(3);
+
+      assertThat(
+          varCharVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testViewVarBinaryVectorIterable() {
+    try (final ViewVarBinaryVector viewVarBinaryVector =
+        new ViewVarBinaryVector("viewVarBinary", allocator)) {
+      final byte[] value1 = new byte[] {0, 0, 0, 1};
+      final byte[] value3 = new byte[] {1, 0, 0};
+
+      viewVarBinaryVector.allocateNew(3);
+      viewVarBinaryVector.setSafe(0, value1);
+      viewVarBinaryVector.setNull(1);
+      viewVarBinaryVector.setSafe(2, value3);
+      viewVarBinaryVector.setValueCount(3);
+
+      assertThat(
+          viewVarBinaryVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testViewVarCharVectorIterable() {
+    try (final ViewVarCharVector viewVarCharVector =
+        new ViewVarCharVector("viewVarChar", allocator)) {
+      final Text value1 = new Text("hello");
+      final Text value3 = new Text("worlds");
+
+      viewVarCharVector.allocateNew(3);
+      viewVarCharVector.setSafe(0, value1);
+      viewVarCharVector.setNull(1);
+      viewVarCharVector.setSafe(2, value3);
+      viewVarCharVector.setValueCount(3);
+
+      assertThat(
+          viewVarCharVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+
+  @Test
+  public void testFIxedSizeListVectorIterable() {
+    try (final FixedSizeListVector fixedSizeListVector =
+        new FixedSizeListVector(
+            "fixedSizeList", allocator, FieldType.nullable(new ArrowType.FixedSizeList(3)), null)) {
+      final IntVector listVector =
+          (IntVector)
+              fixedSizeListVector
+                  .addOrGetVector(FieldType.nullable(Types.MinorType.INT.getType()))
+                  .getVector();
+      listVector.setSafe(0, 1);
+      listVector.setSafe(1, 2);
+      listVector.setSafe(2, 3);
+      listVector.setSafe(3, 4);
+      listVector.setSafe(4, 5);
+      listVector.setSafe(5, 6);
+      listVector.setValueCount(6);
+      fixedSizeListVector.setValueCount(2);
+      fixedSizeListVector.setNotNull(0);
+      fixedSizeListVector.setNotNull(1);
+
+      final List<Integer> list1 = new ArrayList<>();
+      list1.add(1);
+      list1.add(2);
+      list1.add(3);
+      final List<Integer> list2 = new ArrayList<>();
+      list2.add(4);
+      list2.add(5);
+      list2.add(6);
+
+      assertThat(
+          fixedSizeListVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(list1, list2));
+    }
+  }
+
+  @Test
+  public void testLargeListVectorIterable() {
+    try (final LargeListVector largeListVector = LargeListVector.empty("largeList", allocator)) {
+      UnionLargeListWriter writer = largeListVector.getWriter();
+      writer.allocate();
+
+      writer.startList();
+      writer.integer().writeInt(1);
+      writer.integer().writeInt(2);
+      writer.integer().writeInt(3);
+      writer.endList();
+      writer.startList();
+      writer.integer().writeInt(4);
+      writer.integer().writeInt(5);
+      writer.endList();
+
+      largeListVector.setValueCount(2);
+
+      final List<Integer> list1 = new ArrayList<>();
+      list1.add(1);
+      list1.add(2);
+      list1.add(3);
+      final List<Integer> list2 = new ArrayList<>();
+      list2.add(4);
+      list2.add(5);
+
+      assertThat(
+          largeListVector.getValueIterable(), IsIterableContainingInOrder.contains(list1, list2));
+    }
+  }
+
+  @Test
+  public void testListVectorIterable() {
+    try (final ListVector listVector = ListVector.empty("largeList", allocator)) {
+      UnionListWriter writer = listVector.getWriter();
+      writer.allocate();
+
+      writer.startList();
+      writer.integer().writeInt(1);
+      writer.integer().writeInt(2);
+      writer.integer().writeInt(3);
+      writer.endList();
+      writer.startList();
+      writer.integer().writeInt(4);
+      writer.integer().writeInt(5);
+      writer.endList();
+
+      listVector.setValueCount(2);
+
+      final List<Integer> list1 = new ArrayList<>();
+      list1.add(1);
+      list1.add(2);
+      list1.add(3);
+      final List<Integer> list2 = new ArrayList<>();
+      list2.add(4);
+      list2.add(5);
+
+      assertThat(listVector.getValueIterable(), IsIterableContainingInOrder.contains(list1, list2));
+    }
+  }
+
+  @Test
+  public void testListViewVectorIterable() {
+    try (final ListViewVector listViewVector = ListViewVector.empty("largeList", allocator)) {
+      UnionListViewWriter writer = listViewVector.getWriter();
+      writer.allocate();
+
+      writer.startList();
+      writer.integer().writeInt(1);
+      writer.integer().writeInt(2);
+      writer.integer().writeInt(3);
+      writer.endList();
+      writer.startList();
+      writer.integer().writeInt(4);
+      writer.integer().writeInt(5);
+      writer.endList();
+
+      listViewVector.setValueCount(2);
+
+      final List<Integer> list1 = new ArrayList<>();
+      list1.add(1);
+      list1.add(2);
+      list1.add(3);
+      final List<Integer> list2 = new ArrayList<>();
+      list2.add(4);
+      list2.add(5);
+
+      assertThat(
+          listViewVector.getValueIterable(), IsIterableContainingInOrder.contains(list1, list2));
+    }
+  }
+
+  @Test
+  public void testNonNullableStructVectorIterable() {
+    try (final NonNullableStructVector nonNullableStructVector =
+        NonNullableStructVector.empty("nonNullableStruct", allocator)) {
+      nonNullableStructVector.setValueCount(2);
+
+      IntVector key1Vector =
+          nonNullableStructVector.addOrGet(
+              "key1", FieldType.notNullable(new ArrowType.Int(32, true)), IntVector.class);
+      IntVector key2Vector =
+          nonNullableStructVector.addOrGet(
+              "key2", FieldType.notNullable(new ArrowType.Int(32, true)), IntVector.class);
+      key1Vector.setSafe(0, 1);
+      key1Vector.setSafe(1, 3);
+      key2Vector.setSafe(0, 2);
+      key2Vector.setSafe(1, 4);
+      key1Vector.setValueCount(2);
+      key2Vector.setValueCount(2);
+
+      final Map<String, Integer> value1 = new HashMap<>();
+      value1.put("key1", 1);
+      value1.put("key2", 2);
+      final Map<String, Integer> value2 = new HashMap<>();
+      value2.put("key1", 3);
+      value2.put("key2", 4);
+
+      assertThat(
+          nonNullableStructVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, value2));
+    }
+  }
+
+  @Test
+  public void testStructVectorIterable() {
+    try (final StructVector structVector = StructVector.empty("struct", allocator)) {
+      structVector.addOrGetList("struct");
+      NullableStructWriter structWriter = structVector.getWriter();
+      structWriter.setPosition(0);
+      structWriter.start();
+      structWriter.integer("key1").writeInt(1);
+      structWriter.integer("key2").writeInt(2);
+      structWriter.end();
+      structWriter.setPosition(2);
+      structWriter.start();
+      structWriter.integer("key1").writeInt(3);
+      structWriter.integer("key2").writeInt(4);
+      structWriter.end();
+      structWriter.setValueCount(3);
+
+      final Map<String, Integer> value1 = new HashMap<>();
+      value1.put("key1", 1);
+      value1.put("key2", 2);
+      final Map<String, Integer> value3 = new HashMap<>();
+      value3.put("key1", 3);
+      value3.put("key2", 4);
+
+      assertThat(
+          structVector.getValueIterable(),
+          IsIterableContainingInOrder.contains(value1, null, value3));
+    }
+  }
+}
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharListVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharListVector.java
index bfe489fa5af4e..0ad3e14ac4973 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharListVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharListVector.java
@@ -14,32 +14,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import java.nio.charset.StandardCharsets;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.nio.charset.StandardCharsets;
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.complex.ListVector;
 import org.apache.arrow.vector.complex.impl.UnionListWriter;
 import org.apache.arrow.vector.types.Types;
 import org.apache.arrow.vector.types.pojo.FieldType;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestVarCharListVector {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -47,9 +46,10 @@ public void terminate() throws Exception {
   @Test
   public void testVarCharListWithNulls() {
     byte[] bytes = "a".getBytes(StandardCharsets.UTF_8);
-    try (ListVector vector = new ListVector("VarList", allocator, FieldType.nullable(Types
-            .MinorType.VARCHAR.getType()), null);
-         ArrowBuf tempBuf = allocator.buffer(bytes.length)) {
+    try (ListVector vector =
+            new ListVector(
+                "VarList", allocator, FieldType.nullable(Types.MinorType.VARCHAR.getType()), null);
+        ArrowBuf tempBuf = allocator.buffer(bytes.length)) {
       UnionListWriter writer = vector.getWriter();
       writer.allocate();
 
@@ -72,8 +72,8 @@ public void testVarCharListWithNulls() {
 
       writer.setValueCount(2);
 
-      Assert.assertEquals(2, vector.getValueCount());
-      Assert.assertEquals(2, vector.getDataVector().getValueCount());
+      assertEquals(2, vector.getValueCount());
+      assertEquals(2, vector.getDataVector().getValueCount());
     }
   }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharViewVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharViewVector.java
new file mode 100644
index 0000000000000..308431fdeb9cf
--- /dev/null
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharViewVector.java
@@ -0,0 +1,2626 @@
+/*
+ * 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.
+ */
+package org.apache.arrow.vector;
+
+import static org.apache.arrow.vector.TestUtils.newVector;
+import static org.apache.arrow.vector.TestUtils.newViewVarBinaryVector;
+import static org.apache.arrow.vector.TestUtils.newViewVarCharVector;
+import static org.apache.arrow.vector.testing.ValueVectorDataPopulator.setVector;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.Random;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+import org.apache.arrow.memory.ArrowBuf;
+import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.memory.RootAllocator;
+import org.apache.arrow.memory.rounding.DefaultRoundingPolicy;
+import org.apache.arrow.memory.util.ArrowBufPointer;
+import org.apache.arrow.memory.util.CommonUtil;
+import org.apache.arrow.vector.ipc.message.ArrowRecordBatch;
+import org.apache.arrow.vector.testing.ValueVectorDataPopulator;
+import org.apache.arrow.vector.types.Types;
+import org.apache.arrow.vector.types.pojo.Field;
+import org.apache.arrow.vector.types.pojo.Schema;
+import org.apache.arrow.vector.util.ReusableByteArray;
+import org.apache.arrow.vector.util.Text;
+import org.apache.arrow.vector.util.TransferPair;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class TestVarCharViewVector {
+
+  // short string (length <= 12)
+  private static final byte[] STR0 = "0123456".getBytes(StandardCharsets.UTF_8);
+  // short string (length <= 12)
+  private static final byte[] STR1 = "012345678912".getBytes(StandardCharsets.UTF_8);
+  // long string (length > 12)
+  private static final byte[] STR2 = "0123456789123".getBytes(StandardCharsets.UTF_8);
+  // long string (length > 12)
+  private static final byte[] STR3 = "01234567891234567".getBytes(StandardCharsets.UTF_8);
+  // short string (length <= 12)
+  private static final byte[] STR4 = "01234567".getBytes(StandardCharsets.UTF_8);
+  // short string (length <= 12)
+  private static final byte[] STR5 = "A1234A".getBytes(StandardCharsets.UTF_8);
+  // short string (length <= 12)
+  private static final byte[] STR6 = "B1234567B".getBytes(StandardCharsets.UTF_8);
+  // long string (length > 12)
+  private static final byte[] STR7 = "K01234567891234567K".getBytes(StandardCharsets.UTF_8);
+  // long string (length > 12)
+  private static final byte[] STR8 = "M012345678912345678M".getBytes(StandardCharsets.UTF_8);
+  private static final String EMPTY_SCHEMA_PATH = "";
+
+  private BufferAllocator allocator;
+
+  private Random random;
+
+  @BeforeEach
+  public void prepare() {
+    allocator = new RootAllocator(Integer.MAX_VALUE);
+    random = new Random();
+  }
+
+  @AfterEach
+  public void shutdown() {
+    allocator.close();
+  }
+
+  public static void setBytes(int index, byte[] bytes, ViewVarCharVector vector) {
+    BitVectorHelper.setBit(vector.validityBuffer, index);
+    vector.setBytes(index, bytes, 0, bytes.length);
+  }
+
+  @Test
+  public void testInlineAllocation() {
+    try (final ViewVarCharVector viewVarCharVector = new ViewVarCharVector("myvector", allocator)) {
+      viewVarCharVector.allocateNew(48, 3);
+      final int valueCount = 3;
+      viewVarCharVector.set(0, STR0);
+      viewVarCharVector.set(1, STR1);
+      viewVarCharVector.set(2, STR4);
+      viewVarCharVector.setValueCount(valueCount);
+
+      byte[] view1 = viewVarCharVector.get(0);
+      byte[] view2 = viewVarCharVector.get(1);
+      byte[] view3 = viewVarCharVector.get(2);
+
+      assertNotNull(view1);
+      assertNotNull(view2);
+      assertNotNull(view3);
+
+      String str1 = new String(STR0, StandardCharsets.UTF_8);
+      String str2 = new String(STR1, StandardCharsets.UTF_8);
+      String str3 = new String(STR4, StandardCharsets.UTF_8);
+
+      assertEquals(new String(view1, StandardCharsets.UTF_8), str1);
+      assertEquals(new String(view2, StandardCharsets.UTF_8), str2);
+      assertEquals(new String(view3, StandardCharsets.UTF_8), str3);
+
+      assertTrue(viewVarCharVector.dataBuffers.isEmpty());
+
+      assertEquals(
+          new String(
+              Objects.requireNonNull(viewVarCharVector.getObject(0)).getBuffer(),
+              StandardCharsets.UTF_8),
+          str1);
+      assertEquals(
+          new String(
+              Objects.requireNonNull(viewVarCharVector.getObject(1)).getBuffer(),
+              StandardCharsets.UTF_8),
+          str2);
+      assertEquals(
+          new String(
+              Objects.requireNonNull(viewVarCharVector.getObject(2)).getBuffer(),
+              StandardCharsets.UTF_8),
+          str3);
+    }
+  }
+
+  @Test
+  public void testDataBufferBasedAllocationInSameBuffer() {
+    try (final ViewVarCharVector viewVarCharVector = new ViewVarCharVector("myvector", allocator)) {
+      viewVarCharVector.allocateNew(48, 4);
+      final int valueCount = 4;
+      String str4 = generateRandomString(34);
+      viewVarCharVector.set(0, STR1);
+      viewVarCharVector.set(1, STR2);
+      viewVarCharVector.set(2, STR3);
+      viewVarCharVector.set(3, str4.getBytes(StandardCharsets.UTF_8));
+      viewVarCharVector.setValueCount(valueCount);
+
+      byte[] view1 = viewVarCharVector.get(0);
+      byte[] view2 = viewVarCharVector.get(1);
+      byte[] view3 = viewVarCharVector.get(2);
+      byte[] view4 = viewVarCharVector.get(3);
+
+      assertNotNull(view1);
+      assertNotNull(view2);
+      assertNotNull(view3);
+      assertNotNull(view4);
+
+      String str1 = new String(STR1, StandardCharsets.UTF_8);
+      String str2 = new String(STR2, StandardCharsets.UTF_8);
+      String str3 = new String(STR3, StandardCharsets.UTF_8);
+
+      assertEquals(new String(view1, StandardCharsets.UTF_8), str1);
+      assertEquals(new String(view2, StandardCharsets.UTF_8), str2);
+      assertEquals(new String(view3, StandardCharsets.UTF_8), str3);
+      assertEquals(new String(view4, StandardCharsets.UTF_8), str4);
+
+      assertEquals(1, viewVarCharVector.dataBuffers.size());
+
+      assertEquals(
+          new String(
+              Objects.requireNonNull(viewVarCharVector.getObject(0)).getBuffer(),
+              StandardCharsets.UTF_8),
+          str1);
+      assertEquals(
+          new String(
+              Objects.requireNonNull(viewVarCharVector.getObject(1)).getBuffer(),
+              StandardCharsets.UTF_8),
+          str2);
+      assertEquals(
+          new String(
+              Objects.requireNonNull(viewVarCharVector.getObject(2)).getBuffer(),
+              StandardCharsets.UTF_8),
+          str3);
+      assertEquals(
+          new String(
+              Objects.requireNonNull(viewVarCharVector.getObject(3)).getBuffer(),
+              StandardCharsets.UTF_8),
+          str4);
+    }
+  }
+
+  @Test
+  public void testDataBufferBasedAllocationInOtherBuffer() {
+    try (final ViewVarCharVector viewVarCharVector = new ViewVarCharVector("myvector", allocator)) {
+      viewVarCharVector.allocateNew(48, 4);
+      final int valueCount = 4;
+      String str4 = generateRandomString(35);
+      viewVarCharVector.set(0, STR1);
+      viewVarCharVector.set(1, STR2);
+      viewVarCharVector.set(2, STR3);
+      viewVarCharVector.set(3, str4.getBytes(StandardCharsets.UTF_8));
+      viewVarCharVector.setValueCount(valueCount);
+
+      byte[] view1 = viewVarCharVector.get(0);
+      byte[] view2 = viewVarCharVector.get(1);
+      byte[] view3 = viewVarCharVector.get(2);
+      byte[] view4 = viewVarCharVector.get(3);
+
+      assertNotNull(view1);
+      assertNotNull(view2);
+      assertNotNull(view3);
+      assertNotNull(view4);
+
+      String str1 = new String(STR1, StandardCharsets.UTF_8);
+      String str2 = new String(STR2, StandardCharsets.UTF_8);
+      String str3 = new String(STR3, StandardCharsets.UTF_8);
+
+      assertEquals(new String(view1, StandardCharsets.UTF_8), str1);
+      assertEquals(new String(view2, StandardCharsets.UTF_8), str2);
+      assertEquals(new String(view3, StandardCharsets.UTF_8), str3);
+      assertEquals(new String(view4, StandardCharsets.UTF_8), str4);
+
+      assertEquals(2, viewVarCharVector.dataBuffers.size());
+
+      assertEquals(
+          new String(
+              Objects.requireNonNull(viewVarCharVector.getObject(0)).getBuffer(),
+              StandardCharsets.UTF_8),
+          str1);
+      assertEquals(
+          new String(
+              Objects.requireNonNull(viewVarCharVector.getObject(1)).getBuffer(),
+              StandardCharsets.UTF_8),
+          str2);
+      assertEquals(
+          new String(
+              Objects.requireNonNull(viewVarCharVector.getObject(2)).getBuffer(),
+              StandardCharsets.UTF_8),
+          str3);
+      assertEquals(
+          new String(
+              Objects.requireNonNull(viewVarCharVector.getObject(3)).getBuffer(),
+              StandardCharsets.UTF_8),
+          str4);
+    }
+  }
+
+  @Test
+  public void testMixedAllocation() {
+    try (final ViewVarCharVector viewVarCharVector = new ViewVarCharVector("myvector", allocator)) {
+      viewVarCharVector.allocateNew(128, 6);
+      final int valueCount = 6;
+      String str4 = generateRandomString(35);
+      String str6 = generateRandomString(40);
+      viewVarCharVector.set(0, STR1);
+      viewVarCharVector.set(1, STR2);
+      viewVarCharVector.set(2, STR3);
+      viewVarCharVector.set(3, str4.getBytes(StandardCharsets.UTF_8));
+      viewVarCharVector.set(4, STR1);
+      viewVarCharVector.set(5, str6.getBytes(StandardCharsets.UTF_8));
+      viewVarCharVector.setValueCount(valueCount);
+
+      byte[] view1 = viewVarCharVector.get(0);
+      byte[] view2 = viewVarCharVector.get(1);
+      byte[] view3 = viewVarCharVector.get(2);
+      byte[] view4 = viewVarCharVector.get(3);
+      byte[] view5 = viewVarCharVector.get(4);
+      byte[] view6 = viewVarCharVector.get(5);
+
+      assertNotNull(view1);
+      assertNotNull(view2);
+      assertNotNull(view3);
+      assertNotNull(view4);
+      assertNotNull(view5);
+      assertNotNull(view6);
+
+      String str1 = new String(STR1, StandardCharsets.UTF_8);
+      String str2 = new String(STR2, StandardCharsets.UTF_8);
+      String str3 = new String(STR3, StandardCharsets.UTF_8);
+
+      assertEquals(new String(view1, StandardCharsets.UTF_8), str1);
+      assertEquals(new String(view2, StandardCharsets.UTF_8), str2);
+      assertEquals(new String(view3, StandardCharsets.UTF_8), str3);
+      assertEquals(new String(view4, StandardCharsets.UTF_8), str4);
+      assertEquals(new String(view5, StandardCharsets.UTF_8), str1);
+      assertEquals(new String(view6, StandardCharsets.UTF_8), str6);
+
+      assertEquals(1, viewVarCharVector.dataBuffers.size());
+
+      assertEquals(
+          new String(
+              Objects.requireNonNull(viewVarCharVector.getObject(0)).getBuffer(),
+              StandardCharsets.UTF_8),
+          str1);
+      assertEquals(
+          new String(
+              Objects.requireNonNull(viewVarCharVector.getObject(1)).getBuffer(),
+              StandardCharsets.UTF_8),
+          str2);
+      assertEquals(
+          new String(
+              Objects.requireNonNull(viewVarCharVector.getObject(2)).getBuffer(),
+              StandardCharsets.UTF_8),
+          str3);
+      assertEquals(
+          new String(
+              Objects.requireNonNull(viewVarCharVector.getObject(3)).getBuffer(),
+              StandardCharsets.UTF_8),
+          str4);
+      assertEquals(
+          new String(
+              Objects.requireNonNull(viewVarCharVector.getObject(4)).getBuffer(),
+              StandardCharsets.UTF_8),
+          str1);
+      assertEquals(
+          new String(
+              Objects.requireNonNull(viewVarCharVector.getObject(5)).getBuffer(),
+              StandardCharsets.UTF_8),
+          str6);
+    }
+  }
+
+  @Test
+  public void testAllocationIndexOutOfBounds() {
+    assertThrows(
+        IndexOutOfBoundsException.class,
+        () -> {
+          try (final ViewVarCharVector viewVarCharVector =
+              new ViewVarCharVector("myvector", allocator)) {
+            viewVarCharVector.allocateNew(32, 3);
+            final int valueCount = 3;
+            viewVarCharVector.set(0, STR1);
+            viewVarCharVector.set(1, STR2);
+            viewVarCharVector.set(2, STR2);
+            viewVarCharVector.setValueCount(valueCount);
+          }
+        });
+  }
+
+  @Test
+  public void testSizeOfViewBufferElements() {
+    try (final ViewVarCharVector vector = new ViewVarCharVector(EMPTY_SCHEMA_PATH, allocator)) {
+      int valueCount = 100;
+      int currentSize = 0;
+      vector.setInitialCapacity(valueCount);
+      vector.allocateNew();
+      vector.setValueCount(valueCount);
+      for (int i = 0; i < valueCount; i++) {
+        currentSize += i;
+        vector.setSafe(i, new byte[i]);
+      }
+      assertEquals(currentSize, vector.sizeOfViewBufferElements());
+    }
+  }
+
+  @Test
+  public void testNullableVarType1() {
+
+    // Create a new value vector for 1024 integers.
+    try (final ViewVarCharVector vector = newViewVarCharVector(EMPTY_SCHEMA_PATH, allocator)) {
+      vector.allocateNew(1024 * 10, 1024);
+
+      vector.set(0, STR1);
+      vector.set(1, STR2);
+      vector.set(2, STR3);
+      vector.setSafe(3, STR3, 1, STR3.length - 1);
+      vector.setSafe(4, STR3, 2, STR3.length - 2);
+      ByteBuffer str3ByteBuffer = ByteBuffer.wrap(STR3);
+      vector.setSafe(5, str3ByteBuffer, 1, STR3.length - 1);
+      vector.setSafe(6, str3ByteBuffer, 2, STR3.length - 2);
+
+      // Set with convenience function
+      Text txt = new Text("foo");
+      vector.setSafe(7, txt.getBytes(), 0, (int) txt.getLength());
+
+      // Check the sample strings.
+      assertArrayEquals(STR1, vector.get(0));
+      assertArrayEquals(STR2, vector.get(1));
+      assertArrayEquals(STR3, vector.get(2));
+      assertArrayEquals(Arrays.copyOfRange(STR3, 1, STR3.length), vector.get(3));
+      assertArrayEquals(Arrays.copyOfRange(STR3, 2, STR3.length), vector.get(4));
+      assertArrayEquals(Arrays.copyOfRange(STR3, 1, STR3.length), vector.get(5));
+      assertArrayEquals(Arrays.copyOfRange(STR3, 2, STR3.length), vector.get(6));
+
+      // Check returning a Text object
+      assertEquals(txt, vector.getObject(7));
+
+      // Ensure null value throws.
+      assertNull(vector.get(8));
+    }
+  }
+
+  @Test
+  public void testGetTextRepeatedly() {
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      ValueVectorDataPopulator.setVector(vector, STR1, STR2);
+      vector.setValueCount(2);
+
+      /* check the vector output */
+      Text text = new Text();
+      vector.read(0, text);
+      assertArrayEquals(STR1, text.getBytes());
+      vector.read(1, text);
+      assertArrayEquals(STR2, text.getBytes());
+    }
+  }
+
+  @Test
+  public void testNullableVarType2() {
+    try (final ViewVarBinaryVector vector = newViewVarBinaryVector(EMPTY_SCHEMA_PATH, allocator)) {
+      vector.allocateNew(1024 * 10, 1024);
+      vector.set(0, STR1);
+      vector.set(1, STR2);
+      vector.set(2, STR3);
+      vector.setSafe(3, STR3, 1, STR3.length - 1);
+      vector.setSafe(4, STR3, 2, STR3.length - 2);
+      ByteBuffer str3ByteBuffer = ByteBuffer.wrap(STR3);
+      vector.setSafe(5, str3ByteBuffer, 1, STR3.length - 1);
+      vector.setSafe(6, str3ByteBuffer, 2, STR3.length - 2);
+
+      // Check the sample strings.
+      assertArrayEquals(STR1, vector.get(0));
+      assertArrayEquals(STR2, vector.get(1));
+      assertArrayEquals(STR3, vector.get(2));
+      assertArrayEquals(Arrays.copyOfRange(STR3, 1, STR3.length), vector.get(3));
+      assertArrayEquals(Arrays.copyOfRange(STR3, 2, STR3.length), vector.get(4));
+      assertArrayEquals(Arrays.copyOfRange(STR3, 1, STR3.length), vector.get(5));
+      assertArrayEquals(Arrays.copyOfRange(STR3, 2, STR3.length), vector.get(6));
+
+      // Ensure null value throws.
+      assertNull(vector.get(7));
+    }
+  }
+
+  @Test
+  public void testGetBytesRepeatedly() {
+    try (ViewVarBinaryVector vector = new ViewVarBinaryVector("", allocator)) {
+      vector.allocateNew(5, 1);
+
+      final String str = "hello world!!!";
+      final String str2 = "foo";
+      vector.setSafe(0, str.getBytes(StandardCharsets.UTF_8));
+      vector.setSafe(1, str2.getBytes(StandardCharsets.UTF_8));
+
+      // verify results
+      ReusableByteArray reusableByteArray = new ReusableByteArray();
+      vector.read(0, reusableByteArray);
+      assertArrayEquals(
+          str.getBytes(StandardCharsets.UTF_8),
+          Arrays.copyOfRange(
+              reusableByteArray.getBuffer(), 0, (int) reusableByteArray.getLength()));
+      byte[] oldBuffer = reusableByteArray.getBuffer();
+
+      vector.read(1, reusableByteArray);
+      assertArrayEquals(
+          str2.getBytes(StandardCharsets.UTF_8),
+          Arrays.copyOfRange(
+              reusableByteArray.getBuffer(), 0, (int) reusableByteArray.getLength()));
+
+      // There should not have been any reallocation since the newer value is smaller in length.
+      assertSame(oldBuffer, reusableByteArray.getBuffer());
+    }
+  }
+
+  @Test
+  public void testReAllocVariableWidthViewVector() {
+    try (final ViewVarCharVector vector =
+        newVector(
+            ViewVarCharVector.class, EMPTY_SCHEMA_PATH, Types.MinorType.VIEWVARCHAR, allocator)) {
+      final int capacityLimit = 4095;
+      final int overLimitIndex = 200;
+      vector.setInitialCapacity(capacityLimit);
+      vector.allocateNew();
+
+      int initialCapacity = vector.getValueCapacity();
+      assertTrue(initialCapacity >= capacityLimit);
+
+      /* Put values in indexes that fall within the initial allocation */
+      vector.setSafe(0, STR1, 0, STR1.length);
+      vector.setSafe(initialCapacity - 1, STR2, 0, STR2.length);
+
+      /* the set calls above should NOT have triggered a realloc */
+      assertEquals(initialCapacity, vector.getValueCapacity());
+
+      /* Now try to put values in space that falls beyond the initial allocation */
+      vector.setSafe(initialCapacity + overLimitIndex, STR3, 0, STR3.length);
+
+      /* Check valueCapacity is more than initial allocation */
+      assertTrue(initialCapacity * 2 <= vector.getValueCapacity());
+
+      assertArrayEquals(STR1, vector.get(0));
+      assertArrayEquals(STR2, vector.get(initialCapacity - 1));
+      assertArrayEquals(STR3, vector.get(initialCapacity + overLimitIndex));
+
+      // Set the valueCount to be more than valueCapacity of current allocation. This is possible
+      // for ValueVectors
+      // as we don't call setSafe for null values, but we do call setValueCount when the current
+      // batch is processed.
+      vector.setValueCount(vector.getValueCapacity() + overLimitIndex);
+    }
+  }
+
+  @Test
+  public void testSetSafeWithArrowBufNoExcessAllocs() {
+    final int numValues = BaseVariableWidthViewVector.INITIAL_VALUE_ALLOCATION * 2;
+    final byte[] valueBytes = "hello world!!!".getBytes(StandardCharsets.UTF_8);
+    final int valueBytesLength = valueBytes.length;
+    final int isSet = 1;
+    try (final ViewVarCharVector fromVector =
+            newVector(
+                ViewVarCharVector.class,
+                EMPTY_SCHEMA_PATH,
+                Types.MinorType.VIEWVARCHAR,
+                allocator);
+        final ViewVarCharVector toVector =
+            newVector(
+                ViewVarCharVector.class,
+                EMPTY_SCHEMA_PATH,
+                Types.MinorType.VIEWVARCHAR,
+                allocator)) {
+      /*
+       * Populate the `fromVector` with `numValues` with byte-arrays, each of size `valueBytesLength`.
+       */
+      fromVector.setInitialCapacity(numValues);
+      fromVector.allocateNew();
+      for (int i = 0; i < numValues; ++i) {
+        fromVector.setSafe(i, valueBytes, 0 /*start*/, valueBytesLength);
+      }
+      fromVector.setValueCount(numValues);
+      ArrowBuf fromDataBuffer = fromVector.getDataBuffer();
+      assertTrue(numValues * valueBytesLength <= fromDataBuffer.capacity());
+
+      /*
+       * Copy the entries one-by-one from 'fromVector' to 'toVector', but use the setSafe with
+       * ArrowBuf API (instead of setSafe with byte-array).
+       */
+      toVector.setInitialCapacity(numValues);
+      toVector.allocateNew();
+      for (int i = 0; i < numValues; i++) {
+        int start = fromVector.getTotalValueLengthUpToIndex(i);
+        // across variable
+        // width implementations
+        int end = fromVector.getTotalValueLengthUpToIndex(i + 1);
+        toVector.setSafe(i, isSet, start, end, fromDataBuffer);
+      }
+
+      /*
+       * Since the 'fromVector' and 'toVector' have the same initial capacity, and were populated
+       * with the same varchar elements, the allocations and hence, the final capacity should be
+       * the same.
+       */
+      assertEquals(fromDataBuffer.capacity(), toVector.getDataBuffer().capacity());
+    }
+  }
+
+  @Test
+  public void testSetLastSetUsage() {
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myvector", allocator)) {
+      vector.allocateNew(1024 * 10, 1024);
+
+      setBytes(0, STR1, vector);
+      setBytes(1, STR2, vector);
+      setBytes(2, STR3, vector);
+      setBytes(3, STR4, vector);
+
+      /* Check current lastSet */
+      assertEquals(-1, vector.getLastSet());
+
+      /* Check the vector output */
+      assertArrayEquals(STR1, vector.get(0));
+      assertArrayEquals(STR2, vector.get(1));
+      assertArrayEquals(STR3, vector.get(2));
+      assertArrayEquals(STR4, vector.get(3));
+
+      /*
+       * If we don't do setLastSe(3) before setValueCount(), then the latter will corrupt
+       * the value vector by filling in all positions [0,valuecount-1] will empty byte arrays.
+       * Run the test by commenting on the next line, and we should see incorrect vector output.
+       */
+      vector.setLastSet(3);
+      vector.setValueCount(20);
+
+      /* Check current lastSet */
+      assertEquals(19, vector.getLastSet());
+
+      /* Check the vector output again */
+      assertArrayEquals(STR1, vector.get(0));
+      assertArrayEquals(STR2, vector.get(1));
+      assertArrayEquals(STR3, vector.get(2));
+      assertArrayEquals(STR4, vector.get(3));
+
+      assertEquals(0, vector.getValueLength(4));
+      assertEquals(0, vector.getValueLength(5));
+      assertEquals(0, vector.getValueLength(6));
+      assertEquals(0, vector.getValueLength(7));
+      assertEquals(0, vector.getValueLength(8));
+      assertEquals(0, vector.getValueLength(9));
+      assertEquals(0, vector.getValueLength(10));
+      assertEquals(0, vector.getValueLength(11));
+      assertEquals(0, vector.getValueLength(12));
+      assertEquals(0, vector.getValueLength(13));
+      assertEquals(0, vector.getValueLength(14));
+      assertEquals(0, vector.getValueLength(15));
+      assertEquals(0, vector.getValueLength(16));
+      assertEquals(0, vector.getValueLength(17));
+      assertEquals(0, vector.getValueLength(18));
+      assertEquals(0, vector.getValueLength(19));
+    }
+  }
+
+  @Test
+  public void testFillEmptiesUsage() {
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myvector", allocator)) {
+      vector.allocateNew(1024 * 10, 1024);
+
+      setBytes(0, STR1, vector);
+      setBytes(1, STR2, vector);
+      setBytes(2, STR3, vector);
+      setBytes(3, STR4, vector);
+
+      /* Check current lastSet */
+      assertEquals(-1, vector.getLastSet());
+
+      /* Check the vector output */
+      assertArrayEquals(STR1, vector.get(0));
+      assertArrayEquals(STR2, vector.get(1));
+      assertArrayEquals(STR3, vector.get(2));
+      assertArrayEquals(STR4, vector.get(3));
+
+      vector.setLastSet(3);
+      /* fill empty byte arrays from index [4, 9] */
+      vector.fillEmpties(10);
+
+      /* Check current lastSet */
+      assertEquals(9, vector.getLastSet());
+
+      /* Check the vector output */
+      assertArrayEquals(STR1, vector.get(0));
+      assertArrayEquals(STR2, vector.get(1));
+      assertArrayEquals(STR3, vector.get(2));
+      assertArrayEquals(STR4, vector.get(3));
+      assertEquals(0, vector.getValueLength(4));
+      assertEquals(0, vector.getValueLength(5));
+      assertEquals(0, vector.getValueLength(6));
+      assertEquals(0, vector.getValueLength(7));
+      assertEquals(0, vector.getValueLength(8));
+      assertEquals(0, vector.getValueLength(9));
+
+      setBytes(10, STR1, vector);
+      setBytes(11, STR2, vector);
+
+      vector.setLastSet(11);
+      /* fill empty byte arrays from index [12, 14] */
+      vector.setValueCount(15);
+
+      /* Check current lastSet */
+      assertEquals(14, vector.getLastSet());
+
+      /* Check the vector output */
+      assertArrayEquals(STR1, vector.get(0));
+      assertArrayEquals(STR2, vector.get(1));
+      assertArrayEquals(STR3, vector.get(2));
+      assertArrayEquals(STR4, vector.get(3));
+      assertEquals(0, vector.getValueLength(4));
+      assertEquals(0, vector.getValueLength(5));
+      assertEquals(0, vector.getValueLength(6));
+      assertEquals(0, vector.getValueLength(7));
+      assertEquals(0, vector.getValueLength(8));
+      assertEquals(0, vector.getValueLength(9));
+      assertArrayEquals(STR1, vector.get(10));
+      assertArrayEquals(STR2, vector.get(11));
+      assertEquals(0, vector.getValueLength(12));
+      assertEquals(0, vector.getValueLength(13));
+      assertEquals(0, vector.getValueLength(14));
+    }
+  }
+
+  @Test
+  public void testGetBufferAddress1() {
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+
+      setVector(vector, STR1, STR2, STR3, STR4);
+      vector.setValueCount(15);
+
+      /* check the vector output */
+      assertArrayEquals(STR1, vector.get(0));
+      assertArrayEquals(STR2, vector.get(1));
+      assertArrayEquals(STR3, vector.get(2));
+      assertArrayEquals(STR4, vector.get(3));
+
+      List<ArrowBuf> buffers = vector.getFieldBuffers();
+      long bitAddress = vector.getValidityBufferAddress();
+      long dataAddress = vector.getDataBufferAddress();
+
+      assertEquals(3, buffers.size());
+      assertEquals(bitAddress, buffers.get(0).memoryAddress());
+      assertEquals(dataAddress, buffers.get(1).memoryAddress());
+    }
+  }
+
+  @Test
+  public void testSetInitialCapacityInViews() {
+    try (final ViewVarCharVector vector = new ViewVarCharVector(EMPTY_SCHEMA_PATH, allocator)) {
+
+      /* use the default 16 data bytes on average per element */
+      final int viewSize = BaseVariableWidthViewVector.ELEMENT_SIZE;
+      int defaultCapacity = BaseVariableWidthViewVector.INITIAL_VIEW_VALUE_ALLOCATION / viewSize;
+      vector.setInitialCapacity(defaultCapacity);
+      vector.allocateNew();
+      assertEquals(defaultCapacity, vector.getValueCapacity());
+      assertEquals(
+          CommonUtil.nextPowerOfTwo(defaultCapacity * viewSize), vector.getDataBuffer().capacity());
+
+      double density = 4.0;
+      final int valueCount = 5;
+      vector.setInitialCapacity(valueCount, density);
+      vector.allocateNew();
+      assertEquals(8, vector.getValueCapacity());
+      assertEquals(128, vector.getDataBuffer().capacity());
+      int initialDataBufferSize = (int) (valueCount * density);
+      // making sure a databuffer is allocated
+      vector.set(4, "01234567890123456".getBytes(StandardCharsets.UTF_8));
+      assertEquals(vector.dataBuffers.size(), 1);
+      ArrowBuf dataBuf = vector.dataBuffers.get(0);
+      try (ArrowBuf tempBuf = vector.allocator.buffer(initialDataBufferSize)) {
+        // replicating a new buffer allocation process when a new buffer is added to the
+        // data buffer when inserting an element with length > 12
+        assertEquals(tempBuf.capacity(), dataBuf.capacity());
+      }
+    }
+  }
+
+  @Test
+  public void testGetPointerVariableWidthViews() {
+    final String[] sampleData =
+        new String[] {
+          "abc",
+          "1234567890123",
+          "def",
+          null,
+          "hello world java",
+          "aaaaa",
+          "world",
+          "2019",
+          null,
+          "0717"
+        };
+
+    try (ViewVarCharVector vec1 = new ViewVarCharVector("vec1", allocator);
+        ViewVarCharVector vec2 = new ViewVarCharVector("vec2", allocator)) {
+
+      vec1.allocateNew((long) sampleData.length * 16, sampleData.length);
+      vec2.allocateNew((long) sampleData.length * 16, sampleData.length);
+
+      for (int i = 0; i < sampleData.length; i++) {
+        String str = sampleData[i];
+        if (str != null) {
+          vec1.set(i, sampleData[i].getBytes(StandardCharsets.UTF_8));
+          vec2.set(i, sampleData[i].getBytes(StandardCharsets.UTF_8));
+        } else {
+          vec1.setNull(i);
+
+          vec2.setNull(i);
+        }
+      }
+
+      ArrowBufPointer ptr1 = new ArrowBufPointer();
+      ArrowBufPointer ptr2 = new ArrowBufPointer();
+
+      for (int i = 0; i < sampleData.length; i++) {
+        vec1.getDataPointer(i, ptr1);
+        vec2.getDataPointer(i, ptr2);
+
+        assertTrue(ptr1.equals(ptr2));
+        assertTrue(ptr2.equals(ptr2));
+      }
+    }
+  }
+
+  @Test
+  public void testGetNullFromVariableWidthViewVector() {
+    try (final ViewVarCharVector varCharViewVector =
+            new ViewVarCharVector("viewvarcharvec", allocator);
+        final ViewVarBinaryVector varBinaryViewVector =
+            new ViewVarBinaryVector("viewvarbinary", allocator)) {
+      varCharViewVector.allocateNew(16, 1);
+      varBinaryViewVector.allocateNew(16, 1);
+
+      varCharViewVector.setNull(0);
+      varBinaryViewVector.setNull(0);
+
+      assertNull(varCharViewVector.get(0));
+      assertNull(varBinaryViewVector.get(0));
+    }
+  }
+
+  @Test
+  public void testVariableWidthViewVectorNullHashCode() {
+    try (ViewVarCharVector viewVarChar = new ViewVarCharVector("view var char vector", allocator)) {
+      viewVarChar.allocateNew(100, 1);
+      viewVarChar.setValueCount(1);
+
+      viewVarChar.set(0, "abc".getBytes(StandardCharsets.UTF_8));
+      viewVarChar.setNull(0);
+
+      assertEquals(0, viewVarChar.hashCode(0));
+    }
+  }
+
+  @Test
+  public void testUnloadVariableWidthViewVector() {
+    try (final ViewVarCharVector viewVarCharVector =
+        new ViewVarCharVector("view var char", allocator)) {
+      viewVarCharVector.allocateNew(16, 2);
+      viewVarCharVector.setValueCount(2);
+      viewVarCharVector.set(0, "abcd".getBytes(StandardCharsets.UTF_8));
+
+      List<ArrowBuf> bufs = viewVarCharVector.getFieldBuffers();
+      assertEquals(2, bufs.size());
+
+      ArrowBuf viewBuf = bufs.get(1);
+
+      assertEquals(32, viewBuf.writerIndex());
+      final String longString = "012345678901234";
+      viewVarCharVector.set(1, longString.getBytes(StandardCharsets.UTF_8));
+
+      bufs = viewVarCharVector.getFieldBuffers();
+      assertEquals(3, bufs.size());
+
+      ArrowBuf referenceBuf = bufs.get(2);
+      assertEquals(longString.length(), referenceBuf.writerIndex());
+    }
+  }
+
+  @Test
+  public void testUnSupportedOffSet() {
+    // offset is not a feature required in ViewVarCharVector
+    assertThrows(
+        UnsupportedOperationException.class,
+        () -> {
+          try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+
+            setVector(vector, STR1, STR2);
+            vector.setValueCount(2);
+
+            /* check the vector output */
+            assertArrayEquals(STR1, vector.get(0));
+            assertArrayEquals(STR2, vector.get(1));
+
+            vector.getOffsetBuffer();
+          }
+        });
+  }
+
+  private void validateViewBuffer(
+      int index,
+      ViewVarCharVector vector,
+      byte[] expectedData,
+      int expectedBufId,
+      int expectedOffSet) {
+    final ArrowBuf viewBuffer = vector.viewBuffer;
+    int writePosition = index * BaseVariableWidthViewVector.ELEMENT_SIZE;
+    final int prefixBufWidth = BaseVariableWidthViewVector.PREFIX_WIDTH;
+    final int lengthBufWidth = BaseVariableWidthViewVector.LENGTH_WIDTH;
+    int length = viewBuffer.getInt(writePosition);
+
+    // validate length of the view
+    assertEquals(expectedData.length, length);
+
+    byte[] prefixBytes = new byte[prefixBufWidth];
+    viewBuffer.getBytes(writePosition + lengthBufWidth, prefixBytes);
+
+    // validate the prefix
+    byte[] expectedPrefixBytes = new byte[prefixBufWidth];
+    System.arraycopy(expectedData, 0, expectedPrefixBytes, 0, prefixBufWidth);
+    assertArrayEquals(expectedPrefixBytes, prefixBytes);
+
+    if (length > 12) {
+      /// validate bufId
+      int bufId = viewBuffer.getInt(writePosition + lengthBufWidth + prefixBufWidth);
+      assertEquals(expectedBufId, bufId);
+      // validate offset
+      int offset =
+          viewBuffer.getInt(
+              writePosition
+                  + lengthBufWidth
+                  + prefixBufWidth
+                  + BaseVariableWidthViewVector.BUF_INDEX_WIDTH);
+      assertEquals(expectedOffSet, offset);
+    }
+    // validate retrieved data
+    assertArrayEquals(expectedData, vector.get(index));
+  }
+
+  @Test
+  public void testOverwriteShortFromLongString() {
+    /*NA: not applicable */
+    // Overwriting at the beginning of the buffer.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(16, 1);
+      // set short string
+      vector.set(0, STR0);
+      vector.setValueCount(1);
+      assertEquals(0, vector.dataBuffers.size());
+      assertArrayEquals(STR0, vector.get(0));
+
+      validateViewBuffer(0, vector, STR0, /*NA*/ -1, /*NA*/ -1);
+
+      // set long string
+      vector.set(0, STR3);
+      vector.setValueCount(1);
+      assertEquals(1, vector.dataBuffers.size());
+      assertArrayEquals(STR3, vector.get(0));
+
+      validateViewBuffer(0, vector, STR3, 0, 0);
+    }
+
+    // Overwriting in the middle of the buffer when existing buffers are all shorts.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(48, 3);
+      // set short string 1
+      vector.set(0, STR0);
+      // set short string 2
+      vector.set(1, STR5);
+      // set short string 3
+      vector.set(2, STR6);
+      vector.setValueCount(3);
+
+      // overwrite index 1 with a long string
+      vector.set(1, STR7);
+      vector.setValueCount(3);
+
+      validateViewBuffer(0, vector, STR0, /*NA*/ -1, /*NA*/ -1);
+      validateViewBuffer(1, vector, STR7, 0, 0);
+      validateViewBuffer(2, vector, STR6, /*NA*/ -1, /*NA*/ -1);
+    }
+
+    // Overwriting in the middle of the buffer with a mix of short and long strings.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(80, 5);
+      // set short string 1
+      vector.set(0, STR0);
+      // set long string 1
+      vector.set(1, STR3);
+      // set short string 2
+      vector.set(2, STR5);
+      // set short string 3
+      vector.set(3, STR6);
+      // set long string 2
+      vector.set(4, STR7);
+      vector.setValueCount(5);
+
+      // overwrite index 2 with a long string
+      vector.set(2, STR8);
+      vector.setValueCount(5);
+
+      validateViewBuffer(0, vector, STR0, /*NA*/ -1, /*NA*/ -1);
+      validateViewBuffer(1, vector, STR3, 0, 0);
+      // Since we did overwrite index 2 with STR8, and as we are using append-only approach,
+      // it will be appended to the data buffer.
+      // Thus, it will be stored in the dataBuffer in order i.e. [STR3, STR7, STR8].
+      validateViewBuffer(2, vector, STR8, 0, STR3.length + STR7.length);
+      validateViewBuffer(3, vector, STR6, /*NA*/ -1, /*NA*/ -1);
+      validateViewBuffer(4, vector, STR7, 0, STR3.length);
+    }
+
+    // Overwriting in the middle of the buffer with a mix of short and long strings.
+    // Here the short string is overwritten with a long string, and its length is larger than
+    // the remaining capacity of the existing data buffer.
+    // This would allocate a new buffer in the data buffers.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(80, 5);
+      // set short string 1
+      vector.set(0, STR0);
+      // set long string 1
+      vector.set(1, STR3);
+      // set short string 2
+      vector.set(2, STR5);
+      // set short string 3
+      vector.set(3, STR6);
+      // set long string 2
+      vector.set(4, STR7);
+
+      vector.setValueCount(5);
+
+      // overwrite index 2 with a long string
+      String longString = generateRandomString(128);
+      byte[] longStringBytes = longString.getBytes(StandardCharsets.UTF_8);
+      // since the append-only approach is used and the remaining capacity
+      // is not enough to store the new string; a new buffer will be allocated.
+      final ArrowBuf currentDataBuf = vector.dataBuffers.get(0);
+      final long remainingCapacity = currentDataBuf.capacity() - currentDataBuf.writerIndex();
+      assertTrue(remainingCapacity < longStringBytes.length);
+      vector.set(2, longStringBytes);
+      vector.setValueCount(5);
+
+      validateViewBuffer(0, vector, STR0, /*NA*/ -1, /*NA*/ -1);
+      validateViewBuffer(1, vector, STR3, 0, 0);
+      // overwritten long string will be stored in the new data buffer.
+      validateViewBuffer(2, vector, longStringBytes, 1, 0);
+      validateViewBuffer(3, vector, STR6, /*NA*/ -1, /*NA*/ -1);
+      validateViewBuffer(4, vector, STR7, 0, STR3.length);
+    }
+  }
+
+  @Test
+  public void testOverwriteLongFromShortString() {
+    // Overwriting at the beginning of the buffer.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(16, 1);
+      // set short string
+      vector.set(0, STR3);
+      vector.setValueCount(1);
+      // set long string
+      vector.set(0, STR0);
+      vector.setValueCount(1);
+
+      validateViewBuffer(0, vector, STR0, /*NA*/ -1, /*NA*/ -1);
+    }
+
+    // Overwriting in the middle of the buffer when existing buffers are all longs.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(48, 3);
+      // set long string 1
+      vector.set(0, STR3);
+      // set long string 2
+      vector.set(1, STR8);
+      // set long string 3
+      vector.set(2, STR7);
+      vector.setValueCount(3);
+
+      // overwrite index 1 with a short string
+      vector.set(1, STR6);
+      vector.setValueCount(3);
+
+      validateViewBuffer(0, vector, STR3, 0, 0);
+      validateViewBuffer(1, vector, STR6, /*NA*/ -1, /*NA*/ -1);
+      // since the append-only approach is used,
+      // STR8 will still be in the first data buffer in dataBuffers.
+      validateViewBuffer(2, vector, STR7, 0, STR3.length + STR8.length);
+    }
+
+    // Overwriting in the middle of the buffer with a mix of short and long strings.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(80, 5);
+      // set long string 1
+      vector.set(0, STR3);
+      // set short string 1
+      vector.set(1, STR5);
+      // set long string 2
+      vector.set(2, STR7);
+      // set long string 3
+      vector.set(3, STR8);
+      // set short string 2
+      vector.set(4, STR6);
+      vector.setValueCount(5);
+
+      // overwrite index 2 with a short string
+      vector.set(2, STR0);
+      vector.setValueCount(5);
+
+      validateViewBuffer(0, vector, STR3, 0, 0);
+      validateViewBuffer(1, vector, STR5, /*NA*/ -1, /*NA*/ -1);
+      validateViewBuffer(2, vector, STR0, /*NA*/ -1, /*NA*/ -1);
+      // since the append-only approach is used,
+      // STR7 will still be in the first data buffer in dataBuffers.
+      validateViewBuffer(3, vector, STR8, 0, STR3.length + STR7.length);
+      validateViewBuffer(4, vector, STR6, /*NA*/ -1, /*NA*/ -1);
+    }
+  }
+
+  @Test
+  public void testOverwriteLongFromAShorterLongString() {
+    // Overwriting at the beginning of the buffer.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(16, 1);
+      // set long string
+      vector.set(0, STR7);
+      vector.setValueCount(1);
+      // set shorter long string, since append-only approach is used and the remaining capacity
+      // is not enough to store the new string; a new buffer will be allocated.
+      final ArrowBuf currentDataBuf = vector.dataBuffers.get(0);
+      final long remainingCapacity = currentDataBuf.capacity() - currentDataBuf.writerIndex();
+      assertTrue(remainingCapacity < STR3.length);
+      // set shorter long string
+      vector.set(0, STR3);
+      vector.setValueCount(1);
+
+      validateViewBuffer(0, vector, STR3, 1, 0);
+    }
+
+    // Overwriting in the middle of the buffer when existing buffers are all longs.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      // extra memory is allocated
+      vector.allocateNew(128, 3);
+      // set long string 1
+      vector.set(0, STR3);
+      // set long string 2
+      vector.set(1, STR8);
+      // set long string 3
+      vector.set(2, STR7);
+      vector.setValueCount(3);
+
+      // overwrite index 1 with a shorter long string
+      // Since append-only approach is used
+      // and the remaining capacity is enough to store in the same data buffer.;
+      final ArrowBuf currentDataBuf = vector.dataBuffers.get(0);
+      final long remainingCapacity = currentDataBuf.capacity() - currentDataBuf.writerIndex();
+      assertTrue(remainingCapacity > STR2.length);
+      vector.set(1, STR2);
+      vector.setValueCount(3);
+
+      validateViewBuffer(0, vector, STR3, 0, 0);
+      // since the append-only approach is used,
+      // STR8 will still be in the first data buffer in dataBuffers.
+      validateViewBuffer(1, vector, STR2, 0, STR3.length + STR8.length + STR7.length);
+      validateViewBuffer(2, vector, STR7, 0, STR3.length + STR8.length);
+    }
+
+    // Overwriting in the middle of the buffer with a mix of short and long strings.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(128, 5);
+      // set long string 1
+      vector.set(0, STR3);
+      // set short string 1
+      vector.set(1, STR5);
+      // set long string 2
+      vector.set(2, STR7);
+      // set long string 3
+      vector.set(3, STR8);
+      // set short string 2
+      vector.set(4, STR6);
+      vector.setValueCount(5);
+
+      // overwrite index 2 with a shorter long string
+      // Since append-only approach is used
+      // and the remaining capacity is enough to store in the same data buffer.;
+      final ArrowBuf currentDataBuf = vector.dataBuffers.get(0);
+      final long remainingCapacity = currentDataBuf.capacity() - currentDataBuf.writerIndex();
+      assertTrue(remainingCapacity > STR2.length);
+      vector.set(2, STR2);
+      vector.setValueCount(5);
+
+      validateViewBuffer(0, vector, STR3, 0, 0);
+      validateViewBuffer(1, vector, STR5, /*NA*/ -1, /*NA*/ -1);
+      // since the append-only approach is used,
+      // STR7 will still be in the first data buffer in dataBuffers.
+      validateViewBuffer(2, vector, STR2, 0, STR3.length + STR7.length + STR8.length);
+      validateViewBuffer(3, vector, STR8, 0, STR3.length + STR7.length);
+      validateViewBuffer(4, vector, STR6, /*NA*/ -1, /*NA*/ -1);
+    }
+  }
+
+  @Test
+  public void testOverwriteLongFromALongerLongString() {
+    // Overwriting at the beginning of the buffer.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(16, 1);
+      // set long string
+      vector.set(0, STR3);
+      vector.setValueCount(1);
+      // set longer long string, since append-only approach is used and the remaining capacity
+      // is not enough to store the new string; a new buffer will be allocated.
+      final ArrowBuf currentDataBuf = vector.dataBuffers.get(0);
+      final long remainingCapacity = currentDataBuf.capacity() - currentDataBuf.writerIndex();
+      assertTrue(remainingCapacity < STR7.length);
+      // set longer long string
+      vector.set(0, STR7);
+      vector.setValueCount(1);
+
+      validateViewBuffer(0, vector, STR7, 1, 0);
+    }
+
+    // Overwriting in the middle of the buffer when existing buffers are all longs.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      // extra memory is allocated
+      vector.allocateNew(48, 3);
+      // set long string 1
+      vector.set(0, STR3);
+      // set long string 2
+      vector.set(1, STR8);
+      // set long string 3
+      vector.set(2, STR7);
+      vector.setValueCount(3);
+
+      // overwrite index 1 with a longer long string
+      // the remaining capacity is not enough to store in the same data buffer
+      // since a new buffer is added to the dataBuffers
+      final ArrowBuf currentDataBuf = vector.dataBuffers.get(0);
+      final long remainingCapacity = currentDataBuf.capacity() - currentDataBuf.writerIndex();
+      String longerString = generateRandomString(35);
+      byte[] longerStringBytes = longerString.getBytes(StandardCharsets.UTF_8);
+      assertTrue(remainingCapacity < longerStringBytes.length);
+
+      vector.set(1, longerStringBytes);
+      vector.setValueCount(3);
+
+      validateViewBuffer(0, vector, STR3, 0, 0);
+      validateViewBuffer(1, vector, longerStringBytes, 1, 0);
+      // since the append-only approach is used,
+      // STR8 will still be in the first data buffer in dataBuffers.
+      validateViewBuffer(2, vector, STR7, 0, STR3.length + STR8.length);
+    }
+
+    // Overwriting in the middle of the buffer with a mix of short and long strings.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(128, 5);
+      // set long string 1
+      vector.set(0, STR3);
+      // set short string 1
+      vector.set(1, STR5);
+      // set long string 2
+      vector.set(2, STR7);
+      // set long string 3
+      vector.set(3, STR2);
+      // set short string 2
+      vector.set(4, STR6);
+      vector.setValueCount(5);
+
+      // overwrite index 2 with a longer long string
+      // the remaining capacity is enough to store in the same data buffer
+      final ArrowBuf currentDataBuf = vector.dataBuffers.get(0);
+      final long remainingCapacity = currentDataBuf.capacity() - currentDataBuf.writerIndex();
+      String longerString = generateRandomString(24);
+      byte[] longerStringBytes = longerString.getBytes(StandardCharsets.UTF_8);
+      assertTrue(remainingCapacity > longerStringBytes.length);
+
+      vector.set(2, longerStringBytes);
+      vector.setValueCount(5);
+
+      validateViewBuffer(0, vector, STR3, 0, 0);
+      validateViewBuffer(1, vector, STR5, /*NA*/ -1, /*NA*/ -1);
+      // since the append-only approach is used,
+      // STR7 will still be in the first data buffer in dataBuffers.
+      validateViewBuffer(2, vector, longerStringBytes, 0, STR3.length + STR7.length + STR2.length);
+      validateViewBuffer(3, vector, STR2, 0, STR3.length + STR7.length);
+      validateViewBuffer(4, vector, STR6, /*NA*/ -1, /*NA*/ -1);
+    }
+  }
+
+  @Test
+  public void testSafeOverwriteShortFromLongString() {
+    /*NA: not applicable */
+    // Overwriting at the beginning of the buffer.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(16, 1);
+      // set short string
+      vector.setSafe(0, STR0);
+      vector.setValueCount(1);
+      assertEquals(0, vector.dataBuffers.size());
+      assertArrayEquals(STR0, vector.get(0));
+
+      // set long string
+      vector.setSafe(0, STR3);
+      vector.setValueCount(1);
+      assertEquals(1, vector.dataBuffers.size());
+      assertArrayEquals(STR3, vector.get(0));
+    }
+
+    // Overwriting in the middle of the buffer when existing buffers are all shorts.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(16, 3);
+      // set short string 1
+      vector.setSafe(0, STR0);
+      // set short string 2
+      vector.setSafe(1, STR5);
+      // set short string 3
+      vector.setSafe(2, STR6);
+      vector.setValueCount(3);
+
+      // overwrite index 1 with a long string
+      vector.setSafe(1, STR7);
+      vector.setValueCount(3);
+
+      assertArrayEquals(STR0, vector.get(0));
+      assertArrayEquals(STR7, vector.get(1));
+      assertArrayEquals(STR6, vector.get(2));
+    }
+
+    // Overwriting in the middle of the buffer with a mix of short and long strings.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(16, 5);
+      // set short string 1
+      vector.setSafe(0, STR0);
+      // set long string 1
+      vector.setSafe(1, STR3);
+      // set short string 2
+      vector.setSafe(2, STR5);
+      // set short string 3
+      vector.setSafe(3, STR6);
+      // set long string 2
+      vector.setSafe(4, STR7);
+      vector.setValueCount(5);
+
+      // overwrite index 2 with a long string
+      vector.setSafe(2, STR8);
+      vector.setValueCount(5);
+
+      assertArrayEquals(STR0, vector.get(0));
+      assertArrayEquals(STR3, vector.get(1));
+      assertArrayEquals(STR8, vector.get(2));
+      assertArrayEquals(STR6, vector.get(3));
+      assertArrayEquals(STR7, vector.get(4));
+    }
+
+    // Overwriting in the middle of the buffer with a mix of short and long strings.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(16, 5);
+      // set short string 1
+      vector.setSafe(0, STR0);
+      // set long string 1
+      vector.setSafe(1, STR3);
+      // set short string 2
+      vector.setSafe(2, STR5);
+      // set short string 3
+      vector.setSafe(3, STR6);
+      // set long string 2
+      vector.setSafe(4, STR7);
+
+      vector.setValueCount(5);
+
+      // overwrite index 2 with a long string
+      String longString = generateRandomString(128);
+      byte[] longStringBytes = longString.getBytes(StandardCharsets.UTF_8);
+
+      vector.setSafe(2, longStringBytes);
+      vector.setValueCount(5);
+
+      assertArrayEquals(STR0, vector.get(0));
+      assertArrayEquals(STR3, vector.get(1));
+      assertArrayEquals(longStringBytes, vector.get(2));
+      assertArrayEquals(STR6, vector.get(3));
+      assertArrayEquals(STR7, vector.get(4));
+    }
+  }
+
+  @Test
+  public void testSafeOverwriteLongFromShortString() {
+    // Overwriting at the beginning of the buffer.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(16, 1);
+      // set short string
+      vector.setSafe(0, STR3);
+      vector.setValueCount(1);
+      // set long string
+      vector.setSafe(0, STR0);
+      vector.setValueCount(1);
+
+      assertArrayEquals(STR0, vector.get(0));
+    }
+
+    // Overwriting in the middle of the buffer when existing buffers are all longs.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(16, 3);
+      // set long string 1
+      vector.setSafe(0, STR3);
+      // set long string 2
+      vector.setSafe(1, STR8);
+      // set long string 3
+      vector.setSafe(2, STR7);
+      vector.setValueCount(3);
+
+      // overwrite index 1 with a short string
+      vector.setSafe(1, STR6);
+      vector.setValueCount(3);
+
+      assertArrayEquals(STR3, vector.get(0));
+      assertArrayEquals(STR6, vector.get(1));
+      assertArrayEquals(STR7, vector.get(2));
+    }
+
+    // Overwriting in the middle of the buffer with a mix of short and long strings.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(16, 5);
+      // set long string 1
+      vector.setSafe(0, STR3);
+      // set short string 1
+      vector.setSafe(1, STR5);
+      // set long string 2
+      vector.setSafe(2, STR7);
+      // set long string 3
+      vector.setSafe(3, STR8);
+      // set short string 2
+      vector.setSafe(4, STR6);
+      vector.setValueCount(5);
+
+      // overwrite index 2 with a short string
+      vector.setSafe(2, STR0);
+      vector.setValueCount(5);
+
+      assertArrayEquals(STR3, vector.get(0));
+      assertArrayEquals(STR5, vector.get(1));
+      assertArrayEquals(STR0, vector.get(2));
+      assertArrayEquals(STR8, vector.get(3));
+      assertArrayEquals(STR6, vector.get(4));
+    }
+  }
+
+  @Test
+  public void testSafeOverwriteLongFromAShorterLongString() {
+    // Overwriting at the beginning of the buffer.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(16, 1);
+      // set long string
+      vector.setSafe(0, STR7);
+      vector.setValueCount(1);
+      // set shorter long string
+      vector.setSafe(0, STR3);
+      vector.setValueCount(1);
+
+      assertArrayEquals(STR3, vector.get(0));
+    }
+
+    // Overwriting in the middle of the buffer when existing buffers are all longs.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      // extra memory is allocated
+      vector.allocateNew(16, 3);
+      // set long string 1
+      vector.setSafe(0, STR3);
+      // set long string 2
+      vector.setSafe(1, STR8);
+      // set long string 3
+      vector.setSafe(2, STR7);
+      vector.setValueCount(3);
+
+      // overwrite index 1 with a shorter long string
+      vector.setSafe(1, STR2);
+      vector.setValueCount(3);
+
+      assertArrayEquals(STR3, vector.get(0));
+      assertArrayEquals(STR2, vector.get(1));
+      assertArrayEquals(STR7, vector.get(2));
+    }
+
+    // Overwriting in the middle of the buffer with a mix of short and long strings.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(16, 5);
+      // set long string 1
+      vector.setSafe(0, STR3);
+      // set short string 1
+      vector.setSafe(1, STR5);
+      // set long string 2
+      vector.setSafe(2, STR7);
+      // set long string 3
+      vector.setSafe(3, STR8);
+      // set short string 2
+      vector.setSafe(4, STR6);
+      vector.setValueCount(5);
+
+      // overwrite index 2 with a shorter long string
+      vector.setSafe(2, STR2);
+      vector.setValueCount(5);
+
+      assertArrayEquals(STR3, vector.get(0));
+      assertArrayEquals(STR5, vector.get(1));
+      assertArrayEquals(STR2, vector.get(2));
+      assertArrayEquals(STR8, vector.get(3));
+      assertArrayEquals(STR6, vector.get(4));
+    }
+  }
+
+  @Test
+  public void testSafeOverwriteLongFromALongerLongString() {
+    // Overwriting at the beginning of the buffer.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(16, 1);
+      // set long string
+      vector.setSafe(0, STR3);
+      vector.setValueCount(1);
+      // set longer long string
+      vector.setSafe(0, STR7);
+      vector.setValueCount(1);
+
+      assertArrayEquals(STR7, vector.get(0));
+    }
+
+    // Overwriting in the middle of the buffer when existing buffers are all longs.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      // extra memory is allocated
+      vector.allocateNew(16, 3);
+      // set long string 1
+      vector.setSafe(0, STR3);
+      // set long string 2
+      vector.setSafe(1, STR8);
+      // set long string 3
+      vector.setSafe(2, STR7);
+      vector.setValueCount(3);
+
+      String longerString = generateRandomString(35);
+      byte[] longerStringBytes = longerString.getBytes(StandardCharsets.UTF_8);
+
+      vector.setSafe(1, longerStringBytes);
+      vector.setValueCount(3);
+
+      assertArrayEquals(STR3, vector.get(0));
+      assertArrayEquals(longerStringBytes, vector.get(1));
+      assertArrayEquals(STR7, vector.get(2));
+    }
+
+    // Overwriting in the middle of the buffer with a mix of short and long strings.
+    try (final ViewVarCharVector vector = new ViewVarCharVector("myviewvector", allocator)) {
+      vector.allocateNew(16, 5);
+      // set long string 1
+      vector.setSafe(0, STR3);
+      // set short string 1
+      vector.setSafe(1, STR5);
+      // set long string 2
+      vector.setSafe(2, STR7);
+      // set long string 3
+      vector.setSafe(3, STR2);
+      // set short string 2
+      vector.setSafe(4, STR6);
+      vector.setValueCount(5);
+
+      String longerString = generateRandomString(24);
+      byte[] longerStringBytes = longerString.getBytes(StandardCharsets.UTF_8);
+
+      vector.setSafe(2, longerStringBytes);
+      vector.setValueCount(5);
+
+      assertArrayEquals(STR3, vector.get(0));
+      assertArrayEquals(STR5, vector.get(1));
+      assertArrayEquals(longerStringBytes, vector.get(2));
+      assertArrayEquals(STR2, vector.get(3));
+      assertArrayEquals(STR6, vector.get(4));
+    }
+  }
+
+  @Test
+  public void testVectorLoadUnloadInLine() {
+
+    try (final ViewVarCharVector vector1 = new ViewVarCharVector("myvector", allocator)) {
+
+      setVector(vector1, STR0, STR1, STR4, STR5, STR6);
+
+      assertEquals(4, vector1.getLastSet());
+      vector1.setValueCount(15);
+      assertEquals(14, vector1.getLastSet());
+
+      /* Check the vector output */
+      assertArrayEquals(STR0, vector1.get(0));
+      assertArrayEquals(STR1, vector1.get(1));
+      assertArrayEquals(STR4, vector1.get(2));
+      assertArrayEquals(STR5, vector1.get(3));
+      assertArrayEquals(STR6, vector1.get(4));
+
+      Field field = vector1.getField();
+      String fieldName = field.getName();
+
+      List<Field> fields = new ArrayList<>();
+      List<FieldVector> fieldVectors = new ArrayList<>();
+
+      fields.add(field);
+      fieldVectors.add(vector1);
+
+      Schema schema = new Schema(fields);
+
+      VectorSchemaRoot schemaRoot1 =
+          new VectorSchemaRoot(schema, fieldVectors, vector1.getValueCount());
+      VectorUnloader vectorUnloader = new VectorUnloader(schemaRoot1);
+
+      try (ArrowRecordBatch recordBatch = vectorUnloader.getRecordBatch();
+          BufferAllocator finalVectorsAllocator =
+              allocator.newChildAllocator("new vector", 0, Long.MAX_VALUE);
+          VectorSchemaRoot schemaRoot2 = VectorSchemaRoot.create(schema, finalVectorsAllocator); ) {
+
+        VectorLoader vectorLoader = new VectorLoader(schemaRoot2);
+        vectorLoader.load(recordBatch);
+
+        ViewVarCharVector vector2 = (ViewVarCharVector) schemaRoot2.getVector(fieldName);
+        /*
+         * lastSet would have internally been set by VectorLoader.load() when it invokes
+         * loadFieldBuffers.
+         */
+        assertEquals(14, vector2.getLastSet());
+        vector2.setValueCount(25);
+        assertEquals(24, vector2.getLastSet());
+
+        /* Check the vector output */
+        assertArrayEquals(STR0, vector2.get(0));
+        assertArrayEquals(STR1, vector2.get(1));
+        assertArrayEquals(STR4, vector2.get(2));
+        assertArrayEquals(STR5, vector2.get(3));
+        assertArrayEquals(STR6, vector2.get(4));
+      }
+    }
+  }
+
+  @Test
+  public void testVectorLoadUnload() {
+
+    try (final ViewVarCharVector vector1 = new ViewVarCharVector("myvector", allocator)) {
+
+      setVector(vector1, STR1, STR2, STR3, STR4, STR5, STR6);
+
+      assertEquals(5, vector1.getLastSet());
+      vector1.setValueCount(15);
+      assertEquals(14, vector1.getLastSet());
+
+      /* Check the vector output */
+      assertArrayEquals(STR1, vector1.get(0));
+      assertArrayEquals(STR2, vector1.get(1));
+      assertArrayEquals(STR3, vector1.get(2));
+      assertArrayEquals(STR4, vector1.get(3));
+      assertArrayEquals(STR5, vector1.get(4));
+      assertArrayEquals(STR6, vector1.get(5));
+
+      Field field = vector1.getField();
+      String fieldName = field.getName();
+
+      List<Field> fields = new ArrayList<>();
+      List<FieldVector> fieldVectors = new ArrayList<>();
+
+      fields.add(field);
+      fieldVectors.add(vector1);
+
+      Schema schema = new Schema(fields);
+
+      VectorSchemaRoot schemaRoot1 =
+          new VectorSchemaRoot(schema, fieldVectors, vector1.getValueCount());
+      VectorUnloader vectorUnloader = new VectorUnloader(schemaRoot1);
+
+      try (ArrowRecordBatch recordBatch = vectorUnloader.getRecordBatch();
+          BufferAllocator finalVectorsAllocator =
+              allocator.newChildAllocator("new vector", 0, Long.MAX_VALUE);
+          VectorSchemaRoot schemaRoot2 = VectorSchemaRoot.create(schema, finalVectorsAllocator); ) {
+
+        VectorLoader vectorLoader = new VectorLoader(schemaRoot2);
+        vectorLoader.load(recordBatch);
+
+        ViewVarCharVector vector2 = (ViewVarCharVector) schemaRoot2.getVector(fieldName);
+        /*
+         * lastSet would have internally been set by VectorLoader.load() when it invokes
+         * loadFieldBuffers.
+         */
+        assertEquals(14, vector2.getLastSet());
+        vector2.setValueCount(25);
+        assertEquals(24, vector2.getLastSet());
+
+        /* Check the vector output */
+        assertArrayEquals(STR1, vector2.get(0));
+        assertArrayEquals(STR2, vector2.get(1));
+        assertArrayEquals(STR3, vector2.get(2));
+        assertArrayEquals(STR4, vector2.get(3));
+        assertArrayEquals(STR5, vector2.get(4));
+        assertArrayEquals(STR6, vector2.get(5));
+      }
+    }
+  }
+
+  static Stream<Arguments> vectorCreatorProvider() {
+    return Stream.of(
+        Arguments.of(
+            (Function<BufferAllocator, BaseVariableWidthViewVector>)
+                (allocator ->
+                    newVector(
+                        ViewVarBinaryVector.class,
+                        EMPTY_SCHEMA_PATH,
+                        Types.MinorType.VIEWVARBINARY,
+                        allocator))),
+        Arguments.of(
+            (Function<BufferAllocator, BaseVariableWidthViewVector>)
+                (allocator ->
+                    newVector(
+                        ViewVarCharVector.class,
+                        EMPTY_SCHEMA_PATH,
+                        Types.MinorType.VIEWVARCHAR,
+                        allocator))));
+  }
+
+  @ParameterizedTest
+  @MethodSource({"vectorCreatorProvider"})
+  public void testCopyFromWithNulls(
+      Function<BufferAllocator, BaseVariableWidthViewVector> vectorCreator) {
+    try (final BaseVariableWidthViewVector vector = vectorCreator.apply(allocator);
+        final BaseVariableWidthViewVector vector2 = vectorCreator.apply(allocator)) {
+      final int initialCapacity = 1024;
+      vector.setInitialCapacity(initialCapacity);
+      vector.allocateNew();
+      int capacity = vector.getValueCapacity();
+      assertTrue(capacity >= initialCapacity);
+
+      // setting number of values such that we have enough space in the initial allocation
+      // to avoid re-allocation. This is to test copyFrom() without re-allocation.
+      final int numberOfValues = initialCapacity / 2 / ViewVarCharVector.ELEMENT_SIZE;
+
+      final String prefixString = generateRandomString(12);
+
+      for (int i = 0; i < numberOfValues; i++) {
+        if (i % 3 == 0) {
+          // null values
+          vector.setNull(i);
+        } else if (i % 3 == 1) {
+          // short strings
+          byte[] b = Integer.toString(i).getBytes(StandardCharsets.UTF_8);
+          vector.set(i, b, 0, b.length);
+        } else {
+          // long strings
+          byte[] b = (i + prefixString).getBytes(StandardCharsets.UTF_8);
+          vector.set(i, b, 0, b.length);
+        }
+      }
+
+      assertEquals(capacity, vector.getValueCapacity());
+
+      vector.setValueCount(numberOfValues);
+
+      for (int i = 0; i < numberOfValues; i++) {
+        if (i % 3 == 0) {
+          assertNull(vector.getObject(i));
+        } else if (i % 3 == 1) {
+          assertArrayEquals(
+              Integer.toString(i).getBytes(StandardCharsets.UTF_8),
+              vector.get(i),
+              "unexpected value at index: " + i);
+        } else {
+          assertArrayEquals(
+              (i + prefixString).getBytes(StandardCharsets.UTF_8),
+              vector.get(i),
+              "unexpected value at index: " + i);
+        }
+      }
+
+      vector2.setInitialCapacity(initialCapacity);
+      vector2.allocateNew();
+      int capacity2 = vector2.getValueCapacity();
+      assertEquals(capacity2, capacity);
+
+      for (int i = 0; i < numberOfValues; i++) {
+        vector2.copyFrom(i, i, vector);
+        if (i % 3 == 0) {
+          assertNull(vector2.getObject(i));
+        } else if (i % 3 == 1) {
+          assertArrayEquals(
+              Integer.toString(i).getBytes(StandardCharsets.UTF_8),
+              vector.get(i),
+              "unexpected value at index: " + i);
+        } else {
+          assertArrayEquals(
+              (i + prefixString).getBytes(StandardCharsets.UTF_8),
+              vector.get(i),
+              "unexpected value at index: " + i);
+        }
+      }
+
+      assertEquals(capacity, vector2.getValueCapacity());
+
+      vector2.setValueCount(numberOfValues);
+
+      for (int i = 0; i < numberOfValues; i++) {
+        if (i % 3 == 0) {
+          assertNull(vector2.getObject(i));
+        } else if (i % 3 == 1) {
+          assertArrayEquals(
+              Integer.toString(i).getBytes(StandardCharsets.UTF_8),
+              vector.get(i),
+              "unexpected value at index: " + i);
+        } else {
+          assertArrayEquals(
+              (i + prefixString).getBytes(StandardCharsets.UTF_8),
+              vector.get(i),
+              "unexpected value at index: " + i);
+        }
+      }
+    }
+  }
+
+  @ParameterizedTest
+  @MethodSource("vectorCreatorProvider")
+  public void testCopyFromSafeWithNulls(
+      Function<BufferAllocator, BaseVariableWidthViewVector> vectorCreator) {
+    try (final BaseVariableWidthViewVector vector = vectorCreator.apply(allocator);
+        final BaseVariableWidthViewVector vector2 = vectorCreator.apply(allocator)) {
+
+      final int initialCapacity = 4096;
+      vector.setInitialCapacity(initialCapacity);
+      vector.allocateNew();
+      int capacity = vector.getValueCapacity();
+      assertTrue(capacity >= initialCapacity);
+
+      final int numberOfValues = initialCapacity / ViewVarCharVector.ELEMENT_SIZE;
+
+      final String prefixString = generateRandomString(12);
+
+      for (int i = 0; i < numberOfValues; i++) {
+        if (i % 3 == 0) {
+          // null values
+          vector.setNull(i);
+        } else if (i % 3 == 1) {
+          // short strings
+          byte[] b = Integer.toString(i).getBytes(StandardCharsets.UTF_8);
+          vector.setSafe(i, b, 0, b.length);
+        } else {
+          // long strings
+          byte[] b = (i + prefixString).getBytes(StandardCharsets.UTF_8);
+          vector.setSafe(i, b, 0, b.length);
+        }
+      }
+
+      /* NO reAlloc() should have happened in setSafe() */
+      assertEquals(capacity, vector.getValueCapacity());
+
+      vector.setValueCount(numberOfValues);
+
+      for (int i = 0; i < numberOfValues; i++) {
+        if (i % 3 == 0) {
+          assertNull(vector.getObject(i));
+        } else if (i % 3 == 1) {
+          assertArrayEquals(
+              Integer.toString(i).getBytes(StandardCharsets.UTF_8),
+              vector.get(i),
+              "unexpected value at index: " + i);
+        } else {
+          assertArrayEquals(
+              (i + prefixString).getBytes(StandardCharsets.UTF_8),
+              vector.get(i),
+              "unexpected value at index: " + i);
+        }
+      }
+
+      vector2.setInitialCapacity(initialCapacity);
+      vector2.allocateNew();
+      int capacity2 = vector2.getValueCapacity();
+      assertEquals(capacity2, capacity);
+
+      for (int i = 0; i < numberOfValues; i++) {
+        vector2.copyFromSafe(i, i, vector);
+        if (i % 3 == 0) {
+          assertNull(vector2.getObject(i));
+        } else if (i % 3 == 1) {
+          assertArrayEquals(
+              Integer.toString(i).getBytes(StandardCharsets.UTF_8),
+              vector.get(i),
+              "unexpected value at index: " + i);
+        } else {
+          assertArrayEquals(
+              (i + prefixString).getBytes(StandardCharsets.UTF_8),
+              vector.get(i),
+              "unexpected value at index: " + i);
+        }
+      }
+
+      /* NO reAlloc() should have happened in setSafe() */
+      assertEquals(capacity, vector2.getValueCapacity());
+
+      vector2.setValueCount(numberOfValues);
+
+      for (int i = 0; i < numberOfValues; i++) {
+        if (i % 3 == 0) {
+          assertNull(vector2.getObject(i));
+        } else if (i % 3 == 1) {
+          assertArrayEquals(
+              Integer.toString(i).getBytes(StandardCharsets.UTF_8),
+              vector.get(i),
+              "unexpected value at index: " + i);
+        } else {
+          assertArrayEquals(
+              (i + prefixString).getBytes(StandardCharsets.UTF_8),
+              vector.get(i),
+              "unexpected value at index: " + i);
+        }
+      }
+    }
+  }
+
+  public byte[] generateRandomBinaryData(int size) {
+    byte[] binaryData = new byte[size];
+    random.nextBytes(binaryData);
+    return binaryData;
+  }
+
+  private byte[][] generateBinaryDataArray(int size, int length) {
+    byte[][] binaryDataArray = new byte[size][];
+    for (int i = 0; i < size; i++) {
+      binaryDataArray[i] = generateRandomBinaryData(length);
+    }
+    return binaryDataArray;
+  }
+
+  private void testSplitAndTransferOnSlicedBufferHelper(
+      BaseVariableWidthViewVector targetVector,
+      BaseVariableWidthViewVector sourceVector,
+      int startIndex,
+      int length,
+      byte[][] data) {
+    sourceVector.allocateNew(1024 * 10, 1024);
+
+    for (int i = 0; i < data.length; i++) {
+      sourceVector.set(i, data[i]);
+    }
+    sourceVector.setValueCount(data.length);
+
+    final long allocatedMem = allocator.getAllocatedMemory();
+    final int validityRefCnt = sourceVector.getValidityBuffer().refCnt();
+    final int dataRefCnt = sourceVector.getDataBuffer().refCnt();
+
+    sourceVector.splitAndTransferTo(startIndex, length, targetVector);
+    // we allocate view and data buffers for the target vector
+    assertTrue(allocatedMem < allocator.getAllocatedMemory());
+
+    // The validity buffer is sliced from the same buffer.See
+    // BaseFixedWidthViewVector#allocateBytes.
+    // Therefore, the refcnt of the validity buffer is increased once since the startIndex is 0.
+    assertEquals(validityRefCnt + 1, sourceVector.getValidityBuffer().refCnt());
+    // since the new view buffer is allocated, the refcnt is the same as the source vector.
+    assertEquals(dataRefCnt, sourceVector.getDataBuffer().refCnt());
+  }
+
+  /**
+   * ARROW-7831: this checks a slice taken off a buffer is still readable after that buffer's
+   * allocator is closed. With short strings.
+   */
+  @Test
+  public void testSplitAndTransferWithShortStringOnSlicedBuffer() {
+    final byte[][] data = new byte[][] {STR4, STR5, STR6};
+    final int startIndex = 0;
+    final int length = 2;
+
+    BiConsumer<BaseVariableWidthViewVector, byte[][]> validateVector =
+        (targetVector, expectedData) -> {
+          IntStream.range(startIndex, length)
+              .forEach(i -> assertArrayEquals(expectedData[i], targetVector.get(i - startIndex)));
+        };
+
+    try (final ViewVarCharVector targetVector = newViewVarCharVector("split-target", allocator)) {
+      try (final ViewVarCharVector sourceVector =
+          newViewVarCharVector(EMPTY_SCHEMA_PATH, allocator)) {
+        testSplitAndTransferOnSlicedBufferHelper(
+            targetVector, sourceVector, startIndex, length, data);
+      }
+      validateVector.accept(targetVector, data);
+    }
+
+    final byte[][] binaryData = generateBinaryDataArray(3, 10);
+
+    try (final ViewVarBinaryVector targetVector =
+        newViewVarBinaryVector("split-target", allocator)) {
+      try (final ViewVarBinaryVector sourceVector =
+          newViewVarBinaryVector(EMPTY_SCHEMA_PATH, allocator)) {
+        testSplitAndTransferOnSlicedBufferHelper(
+            targetVector, sourceVector, startIndex, length, binaryData);
+      }
+      validateVector.accept(targetVector, binaryData);
+    }
+  }
+
+  /**
+   * ARROW-7831: this checks a slice taken off a buffer is still readable after that buffer's
+   * allocator is closed. With a long string included.
+   */
+  @Test
+  public void testSplitAndTransferWithLongStringsOnSlicedBuffer() {
+    final byte[][] data = new byte[][] {STR2, STR5, STR6};
+    final int startIndex = 0;
+    final int length = 2;
+
+    BiConsumer<BaseVariableWidthViewVector, byte[][]> validateVector =
+        (targetVector, expectedData) -> {
+          IntStream.range(startIndex, length)
+              .forEach(i -> assertArrayEquals(expectedData[i], targetVector.get(i - startIndex)));
+        };
+
+    try (final ViewVarCharVector targetVector = newViewVarCharVector("split-target", allocator)) {
+      try (final ViewVarCharVector sourceVector =
+          newViewVarCharVector(EMPTY_SCHEMA_PATH, allocator)) {
+        testSplitAndTransferOnSlicedBufferHelper(
+            targetVector, sourceVector, startIndex, length, data);
+      }
+      validateVector.accept(targetVector, data);
+    }
+
+    final byte[][] binaryData = generateBinaryDataArray(3, 18);
+    try (final ViewVarBinaryVector targetVector =
+        newViewVarBinaryVector("split-target", allocator)) {
+      try (final ViewVarBinaryVector sourceVector =
+          newViewVarBinaryVector(EMPTY_SCHEMA_PATH, allocator)) {
+        testSplitAndTransferOnSlicedBufferHelper(
+            targetVector, sourceVector, startIndex, length, binaryData);
+      }
+      validateVector.accept(targetVector, binaryData);
+    }
+  }
+
+  private void testSplitAndTransferOnSlicedVectorHelper(
+      BaseVariableWidthViewVector sourceVector,
+      BaseVariableWidthViewVector targetVector,
+      int startIndex,
+      int length,
+      byte[][] data) {
+    sourceVector.allocateNew(1024 * 10, 1024);
+
+    for (int i = 0; i < data.length; i++) {
+      sourceVector.set(i, data[i]);
+    }
+    sourceVector.setValueCount(data.length);
+
+    final long allocatedMem = allocator.getAllocatedMemory();
+    final int validityRefCnt = sourceVector.getValidityBuffer().refCnt();
+    final int dataRefCnt = sourceVector.getDataBuffer().refCnt();
+
+    sourceVector.splitAndTransferTo(startIndex, length, targetVector);
+    // we allocate view and data buffers for the target vector
+    assertTrue(allocatedMem < allocator.getAllocatedMemory());
+    // The validity buffer is sliced from the same buffer.See
+    // BaseFixedWidthViewVector#allocateBytes.
+    // Therefore, the refcnt of the validity buffer is increased once since the startIndex is 0.
+    assertEquals(validityRefCnt + 1, sourceVector.getValidityBuffer().refCnt());
+    // since the new view buffer is allocated, the refcnt is the same as the source vector.
+    assertEquals(dataRefCnt, sourceVector.getDataBuffer().refCnt());
+
+    for (int i = startIndex; i < length; i++) {
+      assertArrayEquals(data[i], targetVector.get(i - startIndex));
+    }
+  }
+
+  /**
+   * ARROW-7831: this checks a vector that got sliced is still readable after the slice's allocator
+   * got closed. With short strings.
+   */
+  @Test
+  public void testSplitAndTransferWithShortStringsOnSlicedVector() {
+    byte[][] data = new byte[][] {STR4, STR5, STR6};
+    final int startIndex = 0;
+    final int length = 2;
+
+    BiConsumer<BaseVariableWidthViewVector, byte[][]> validateVector =
+        (sourceVector, expectedData) -> {
+          IntStream.range(startIndex, length)
+              .forEach(i -> assertArrayEquals(expectedData[i], sourceVector.get(i)));
+        };
+
+    try (final ViewVarCharVector sourceVector =
+        newViewVarCharVector(EMPTY_SCHEMA_PATH, allocator)) {
+      try (final ViewVarCharVector targetVector = newViewVarCharVector("split-target", allocator)) {
+        testSplitAndTransferOnSlicedVectorHelper(
+            sourceVector, targetVector, startIndex, length, data);
+      }
+      validateVector.accept(sourceVector, data);
+    }
+
+    byte[][] binaryData = generateBinaryDataArray(3, 10);
+    try (final ViewVarBinaryVector sourceVector =
+        newViewVarBinaryVector(EMPTY_SCHEMA_PATH, allocator)) {
+      try (final ViewVarBinaryVector targetVector =
+          newViewVarBinaryVector("split-target", allocator)) {
+        testSplitAndTransferOnSlicedVectorHelper(
+            sourceVector, targetVector, startIndex, length, binaryData);
+      }
+      validateVector.accept(sourceVector, binaryData);
+    }
+  }
+
+  /**
+   * ARROW-7831: this checks a vector that got sliced is still readable after the slice's allocator
+   * got closed. With a long string included.
+   */
+  @Test
+  public void testSplitAndTransferWithLongStringsOnSlicedVector() {
+    final byte[][] data = new byte[][] {STR2, STR5, STR6};
+    final int startIndex = 0;
+    final int length = 2;
+
+    BiConsumer<BaseVariableWidthViewVector, byte[][]> validateVector =
+        (sourceVector, expectedData) -> {
+          IntStream.range(startIndex, length)
+              .forEach(i -> assertArrayEquals(expectedData[i], sourceVector.get(i)));
+        };
+
+    try (final ViewVarCharVector sourceVector =
+        newViewVarCharVector(EMPTY_SCHEMA_PATH, allocator)) {
+      try (final ViewVarCharVector targetVector = newViewVarCharVector("split-target", allocator)) {
+        testSplitAndTransferOnSlicedVectorHelper(
+            sourceVector, targetVector, startIndex, length, data);
+      }
+      validateVector.accept(sourceVector, data);
+    }
+
+    final byte[][] binaryData = generateBinaryDataArray(3, 20);
+    try (final ViewVarBinaryVector sourceVector =
+        newViewVarBinaryVector(EMPTY_SCHEMA_PATH, allocator)) {
+      try (final ViewVarBinaryVector targetVector =
+          newViewVarBinaryVector("split-target", allocator)) {
+        testSplitAndTransferOnSlicedVectorHelper(
+            sourceVector, targetVector, startIndex, length, binaryData);
+      }
+      validateVector.accept(sourceVector, binaryData);
+    }
+  }
+
+  private void testSplitAndTransferOnValiditySplitHelper(
+      BaseVariableWidthViewVector targetVector,
+      BaseVariableWidthViewVector sourceVector,
+      int startIndex,
+      int length,
+      byte[][] data) {
+    sourceVector.allocateNew(1024 * 10, 1024);
+
+    sourceVector.set(0, new byte[0]);
+    sourceVector.setNull(1);
+    for (int i = 0; i < data.length; i++) {
+      if (data[i] == null) {
+        sourceVector.setNull(i);
+      } else {
+        sourceVector.set(i, data[i]);
+      }
+    }
+    sourceVector.setValueCount(data.length);
+
+    final long allocatedMem = allocator.getAllocatedMemory();
+    final int validityRefCnt = sourceVector.getValidityBuffer().refCnt();
+    final int dataRefCnt = sourceVector.getDataBuffer().refCnt();
+
+    sourceVector.splitAndTransferTo(startIndex, length, targetVector);
+    // the allocation only consists in the size needed for the validity buffer
+    final long validitySize =
+        DefaultRoundingPolicy.DEFAULT_ROUNDING_POLICY.getRoundedSize(
+            BaseValueVector.getValidityBufferSizeFromCount(2));
+    // we allocate view and data buffers for the target vector
+    assertTrue(allocatedMem + validitySize < allocator.getAllocatedMemory());
+    // The validity is sliced from the same buffer.See BaseFixedWidthViewVector#allocateBytes.
+    // Since values up to the startIndex are empty/null validity refcnt should not change.
+    assertEquals(validityRefCnt, sourceVector.getValidityBuffer().refCnt());
+    // since the new view buffer is allocated, the refcnt is the same as the source vector.
+    assertEquals(dataRefCnt, sourceVector.getDataBuffer().refCnt());
+
+    for (int i = startIndex; i < startIndex + length; i++) {
+      assertArrayEquals(data[i], targetVector.get(i - startIndex));
+    }
+
+    for (int i = 0; i < data.length; i++) {
+      if (data[i] == null) {
+        assertTrue(sourceVector.isNull(i));
+      } else {
+        assertArrayEquals(data[i], sourceVector.get(i));
+      }
+    }
+  }
+
+  /**
+   * ARROW-7831: this checks a validity splitting where the validity buffer is sliced from the same
+   * buffer. In the case where all the values up to the start of the slice are null/empty. With
+   * short strings.
+   */
+  @Test
+  public void testSplitAndTransferWithShortStringsOnValiditySplit() {
+    final byte[][] data = new byte[][] {new byte[0], null, STR4, STR5, STR6};
+    final int startIndex = 2;
+    final int length = 2;
+
+    try (final ViewVarCharVector targetVector = newViewVarCharVector("split-target", allocator);
+        final ViewVarCharVector sourceVector = newViewVarCharVector(EMPTY_SCHEMA_PATH, allocator)) {
+      testSplitAndTransferOnValiditySplitHelper(
+          targetVector, sourceVector, startIndex, length, data);
+    }
+
+    final byte[][] binaryData = generateBinaryDataArray(5, 10);
+    binaryData[0] = new byte[0];
+    binaryData[1] = null;
+    try (final ViewVarBinaryVector targetVector =
+            newViewVarBinaryVector("split-target", allocator);
+        final ViewVarBinaryVector sourceVector =
+            newViewVarBinaryVector(EMPTY_SCHEMA_PATH, allocator)) {
+      testSplitAndTransferOnValiditySplitHelper(
+          targetVector, sourceVector, startIndex, length, binaryData);
+    }
+  }
+
+  /**
+   * ARROW-7831: this checks a validity splitting where the validity buffer is sliced from the same
+   * buffer. In the case where all the values up to the start of the slice are null/empty. With long
+   * strings.
+   */
+  @Test
+  public void testSplitAndTransferWithLongStringsOnValiditySplit() {
+    final byte[][] data = new byte[][] {new byte[0], null, STR1, STR2, STR3};
+    final int startIndex = 2;
+    final int length = 2;
+
+    try (final ViewVarCharVector targetVector = newViewVarCharVector("split-target", allocator);
+        final ViewVarCharVector sourceVector = newViewVarCharVector(EMPTY_SCHEMA_PATH, allocator)) {
+      testSplitAndTransferOnValiditySplitHelper(
+          targetVector, sourceVector, startIndex, length, data);
+    }
+
+    final byte[][] binaryData = generateBinaryDataArray(5, 18);
+    binaryData[0] = new byte[0];
+    binaryData[1] = null;
+
+    try (final ViewVarBinaryVector targetVector =
+            newViewVarBinaryVector("split-target", allocator);
+        final ViewVarBinaryVector sourceVector =
+            newViewVarBinaryVector(EMPTY_SCHEMA_PATH, allocator)) {
+      testSplitAndTransferOnValiditySplitHelper(
+          targetVector, sourceVector, startIndex, length, data);
+    }
+  }
+
+  private void testSplitAndTransferOnAllocatorToAllocator(
+      BaseVariableWidthViewVector targetVector,
+      BaseVariableWidthViewVector sourceVector,
+      int startIndex,
+      int length,
+      byte[][] data) {
+    sourceVector.allocateNew(50, data.length);
+
+    for (int i = 0; i < data.length; i++) {
+      sourceVector.set(i, data[i]);
+    }
+    sourceVector.setValueCount(data.length);
+
+    final long allocatedMem = allocator.getAllocatedMemory();
+    final int validityRefCnt = sourceVector.getValidityBuffer().refCnt();
+    final int dataRefCnt = sourceVector.getDataBuffer().refCnt();
+
+    sourceVector.splitAndTransferTo(startIndex, length, targetVector);
+
+    if (sourceVector.getDataBuffers().isEmpty()) {
+      // no extra allocation as strings are all inline
+      assertEquals(allocatedMem, allocator.getAllocatedMemory());
+    } else {
+      // extra allocation as some strings are not inline
+      assertTrue(allocatedMem < allocator.getAllocatedMemory());
+    }
+
+    // the refcnts of each buffer for this test should be the same as what
+    // the source allocator ended up with.
+    assertEquals(validityRefCnt, sourceVector.getValidityBuffer().refCnt());
+    // since the new view buffer is allocated, the refcnt is the same as the source vector.
+    assertEquals(dataRefCnt, sourceVector.getDataBuffer().refCnt());
+
+    for (int i = 0; i < data.length; i++) {
+      assertArrayEquals(data[i], sourceVector.get(i));
+    }
+  }
+
+  /**
+   * ARROW-7831: ensures that data is transferred from one allocator to another in case of 0-index
+   * start special cases. With short strings.
+   */
+  @Test
+  public void testSplitAndTransferWithShortStringsOnAllocatorToAllocator() {
+    final int maxAllocation = 512;
+    final byte[][] data = new byte[][] {STR4, STR5, STR6};
+    final int startIndex = 0;
+    final int length = 2;
+
+    BiConsumer<BaseVariableWidthViewVector, byte[][]> validateVector =
+        (targetVector, expectedData) -> {
+          IntStream.range(startIndex, length)
+              .forEach(i -> assertArrayEquals(expectedData[i], targetVector.get(i - startIndex)));
+        };
+
+    try (final BufferAllocator targetAllocator =
+            allocator.newChildAllocator("target-alloc", 256, maxAllocation);
+        final ViewVarCharVector targetVector =
+            newViewVarCharVector("split-target", targetAllocator)) {
+      try (final BufferAllocator sourceAllocator =
+              allocator.newChildAllocator("source-alloc", 256, maxAllocation);
+          final ViewVarCharVector sourceVector =
+              newViewVarCharVector(EMPTY_SCHEMA_PATH, sourceAllocator)) {
+        testSplitAndTransferOnAllocatorToAllocator(
+            targetVector, sourceVector, startIndex, length, data);
+      }
+      validateVector.accept(targetVector, data);
+    }
+
+    final byte[][] binaryData = generateBinaryDataArray(3, 10);
+    try (final BufferAllocator targetAllocator =
+            allocator.newChildAllocator("target-alloc", 256, maxAllocation);
+        final ViewVarBinaryVector targetVector =
+            newViewVarBinaryVector("split-target", targetAllocator)) {
+      try (final BufferAllocator sourceAllocator =
+              allocator.newChildAllocator("source-alloc", 256, maxAllocation);
+          final ViewVarBinaryVector sourceVector =
+              newViewVarBinaryVector(EMPTY_SCHEMA_PATH, sourceAllocator)) {
+        testSplitAndTransferOnAllocatorToAllocator(
+            targetVector, sourceVector, startIndex, length, binaryData);
+      }
+      validateVector.accept(targetVector, binaryData);
+    }
+  }
+
+  /**
+   * ARROW-7831: ensures that data is transferred from one allocator to another in case of 0-index
+   * start special cases. With long strings.
+   */
+  @Test
+  public void testSplitAndTransferWithLongStringsOnAllocatorToAllocator() {
+    final int initialReservation = 1024;
+    // Here we have the target vector being transferred with a long string
+    // hence, the data buffer will be allocated.
+    // The default data buffer allocation takes
+    // BaseVariableWidthViewVector.INITIAL_VIEW_VALUE_ALLOCATION *
+    // BaseVariableWidthViewVector.ELEMENT_SIZE
+    final byte[][] data = new byte[][] {STR1, STR2, STR3};
+    final int startIndex = 0;
+    final int length = 2;
+
+    BiConsumer<BaseVariableWidthViewVector, byte[][]> validateVector =
+        (targetVector, expectedData) -> {
+          IntStream.range(startIndex, length)
+              .forEach(i -> assertArrayEquals(expectedData[i], targetVector.get(i - startIndex)));
+        };
+
+    final int maxAllocation =
+        initialReservation
+            + BaseVariableWidthViewVector.INITIAL_VIEW_VALUE_ALLOCATION
+                * BaseVariableWidthViewVector.ELEMENT_SIZE;
+    try (final BufferAllocator targetAllocator =
+            allocator.newChildAllocator("target-alloc", initialReservation, maxAllocation);
+        final ViewVarCharVector targetVector =
+            newViewVarCharVector("split-target", targetAllocator)) {
+      try (final BufferAllocator sourceAllocator =
+              allocator.newChildAllocator("source-alloc", initialReservation, maxAllocation);
+          final ViewVarCharVector sourceVector =
+              newViewVarCharVector(EMPTY_SCHEMA_PATH, sourceAllocator)) {
+        testSplitAndTransferOnAllocatorToAllocator(
+            targetVector, sourceVector, startIndex, length, data);
+      }
+      validateVector.accept(targetVector, data);
+    }
+
+    final byte[][] binaryData = generateBinaryDataArray(3, 18);
+
+    try (final BufferAllocator targetAllocator =
+            allocator.newChildAllocator("target-alloc", initialReservation, maxAllocation);
+        final ViewVarBinaryVector targetVector =
+            newViewVarBinaryVector("split-target", targetAllocator)) {
+      try (final BufferAllocator sourceAllocator =
+              allocator.newChildAllocator("source-alloc", initialReservation, maxAllocation);
+          final ViewVarBinaryVector sourceVector =
+              newViewVarBinaryVector(EMPTY_SCHEMA_PATH, sourceAllocator)) {
+        testSplitAndTransferOnAllocatorToAllocator(
+            targetVector, sourceVector, startIndex, length, binaryData);
+      }
+      validateVector.accept(targetVector, binaryData);
+    }
+  }
+
+  private void testReallocAfterVectorTransferHelper(
+      BaseVariableWidthViewVector vector, byte[] str1, byte[] str2) {
+    /* 4096 values with 16 bytes per record */
+    final int bytesPerRecord = 32;
+    vector.allocateNew(4096 * bytesPerRecord, 4096);
+    int valueCapacity = vector.getValueCapacity();
+    assertTrue(valueCapacity >= 4096);
+
+    /* populate the vector */
+    for (int i = 0; i < valueCapacity; i++) {
+      if ((i & 1) == 1) {
+        vector.set(i, str1);
+      } else {
+        vector.set(i, str2);
+      }
+    }
+
+    /* Check the vector output */
+    for (int i = 0; i < valueCapacity; i++) {
+      if ((i & 1) == 1) {
+        assertArrayEquals(str1, vector.get(i));
+      } else {
+        assertArrayEquals(str2, vector.get(i));
+      }
+    }
+
+    /* trigger first realloc */
+    vector.setSafe(valueCapacity, str2, 0, str2.length);
+    assertTrue(vector.getValueCapacity() >= 2 * valueCapacity);
+    while (vector.getByteCapacity() < bytesPerRecord * vector.getValueCapacity()) {
+      vector.reallocViewBuffer();
+      vector.reallocViewDataBuffer();
+    }
+
+    /* populate the remaining vector */
+    for (int i = valueCapacity; i < vector.getValueCapacity(); i++) {
+      if ((i & 1) == 1) {
+        vector.set(i, str1);
+      } else {
+        vector.set(i, str2);
+      }
+    }
+
+    /* Check the vector output */
+    valueCapacity = vector.getValueCapacity();
+    for (int i = 0; i < valueCapacity; i++) {
+      if ((i & 1) == 1) {
+        assertArrayEquals(str1, vector.get(i));
+      } else {
+        assertArrayEquals(str2, vector.get(i));
+      }
+    }
+
+    /* trigger second realloc */
+    vector.setSafe(valueCapacity + bytesPerRecord, str2, 0, str2.length);
+    assertTrue(vector.getValueCapacity() >= 2 * valueCapacity);
+    while (vector.getByteCapacity() < bytesPerRecord * vector.getValueCapacity()) {
+      vector.reallocViewBuffer();
+      vector.reallocViewDataBuffer();
+    }
+
+    /* populate the remaining vector */
+    for (int i = valueCapacity; i < vector.getValueCapacity(); i++) {
+      if ((i & 1) == 1) {
+        vector.set(i, str1);
+      } else {
+        vector.set(i, str2);
+      }
+    }
+
+    /* Check the vector output */
+    valueCapacity = vector.getValueCapacity();
+    for (int i = 0; i < valueCapacity; i++) {
+      if ((i & 1) == 1) {
+        assertArrayEquals(str1, vector.get(i));
+      } else {
+        assertArrayEquals(str2, vector.get(i));
+      }
+    }
+
+    /* We are potentially working with 4x the size of vector buffer
+     * that we initially started with.
+     * Now let's transfer the vector.
+     */
+
+    TransferPair transferPair = vector.getTransferPair(allocator);
+    transferPair.transfer();
+    BaseVariableWidthViewVector toVector = (BaseVariableWidthViewVector) transferPair.getTo();
+    valueCapacity = toVector.getValueCapacity();
+
+    for (int i = 0; i < valueCapacity; i++) {
+      if ((i & 1) == 1) {
+        assertArrayEquals(str1, toVector.get(i));
+      } else {
+        assertArrayEquals(str2, toVector.get(i));
+      }
+    }
+    toVector.close();
+  }
+
+  @Test
+  public void testReallocAfterVectorTransfer() {
+    try (final ViewVarCharVector vector = new ViewVarCharVector(EMPTY_SCHEMA_PATH, allocator)) {
+      testReallocAfterVectorTransferHelper(vector, STR1, STR2);
+    }
+
+    try (final ViewVarBinaryVector vector = new ViewVarBinaryVector(EMPTY_SCHEMA_PATH, allocator)) {
+      testReallocAfterVectorTransferHelper(
+          vector, generateRandomBinaryData(12), generateRandomBinaryData(13));
+    }
+  }
+
+  private void testSplitAndTransferWithMultipleDataBuffersHelper(
+      BaseVariableWidthViewVector sourceVector,
+      BaseVariableWidthViewVector targetVector,
+      int startIndex,
+      int length,
+      byte[][] data) {
+    sourceVector.allocateNew(48, 4);
+
+    for (int i = 0; i < data.length; i++) {
+      sourceVector.set(i, data[i]);
+    }
+    sourceVector.setValueCount(data.length);
+
+    // we should have multiple data buffers
+    assertTrue(sourceVector.getDataBuffers().size() > 1);
+
+    final long allocatedMem = allocator.getAllocatedMemory();
+    final int validityRefCnt = sourceVector.getValidityBuffer().refCnt();
+    final int dataRefCnt = sourceVector.getDataBuffer().refCnt();
+
+    // split and transfer with slice starting at the beginning:
+    // this should not allocate anything new
+    sourceVector.splitAndTransferTo(startIndex, length, targetVector);
+    // we allocate view and data buffers for the target vector
+    assertTrue(allocatedMem < allocator.getAllocatedMemory());
+
+    // the refcnts of each buffer for this test should be the same as what
+    // the source allocator ended up with.
+    assertEquals(validityRefCnt, sourceVector.getValidityBuffer().refCnt());
+    // since the new view buffer is allocated, the refcnt is the same as the source vector.
+    assertEquals(dataRefCnt, sourceVector.getDataBuffer().refCnt());
+
+    for (int i = 0; i < data.length; i++) {
+      assertArrayEquals(data[i], sourceVector.get(i));
+    }
+  }
+
+  /**
+   * ARROW-7831: ensures that data is transferred from one allocator to another in case of 0-index
+   * start special cases. With long strings and multiple data buffers. Check multi-data buffer
+   * source copying
+   */
+  @Test
+  public void testSplitAndTransferWithMultipleDataBuffers() {
+    final String str4 = generateRandomString(35);
+    final byte[][] data = new byte[][] {STR1, STR2, STR3, str4.getBytes(StandardCharsets.UTF_8)};
+    final int startIndex = 1;
+    final int length = 3;
+
+    BiConsumer<BaseVariableWidthViewVector, byte[][]> validateVector =
+        (targetVector, expectedData) -> {
+          IntStream.range(startIndex, length)
+              .forEach(i -> assertArrayEquals(expectedData[i], targetVector.get(i - startIndex)));
+        };
+
+    try (final ViewVarCharVector targetVector = new ViewVarCharVector("target", allocator)) {
+      try (final ViewVarCharVector sourceVector = new ViewVarCharVector("source", allocator)) {
+        testSplitAndTransferWithMultipleDataBuffersHelper(
+            sourceVector, targetVector, startIndex, length, data);
+      }
+      validateVector.accept(targetVector, data);
+    }
+
+    try (final ViewVarBinaryVector targetVector = new ViewVarBinaryVector("target", allocator)) {
+      try (final ViewVarBinaryVector sourceVector = new ViewVarBinaryVector("source", allocator)) {
+        testSplitAndTransferWithMultipleDataBuffersHelper(
+            sourceVector, targetVector, startIndex, length, data);
+      }
+      validateVector.accept(targetVector, data);
+    }
+  }
+
+  @Test
+  public void testVectorLoadUnloadOnMixedTypes() {
+
+    try (final IntVector vector1 = new IntVector("myvector", allocator);
+        final ViewVarCharVector vector2 = new ViewVarCharVector("myviewvector", allocator)) {
+
+      final int valueCount = 15;
+
+      setVector(vector1, 1, 2, 3, 4, 5, 6);
+      vector1.setValueCount(valueCount);
+
+      setVector(vector2, STR1, STR2, STR3, STR4, STR5, STR6);
+      vector1.setValueCount(valueCount);
+
+      /* Check the vector output */
+      assertEquals(1, vector1.get(0));
+      assertEquals(2, vector1.get(1));
+      assertEquals(3, vector1.get(2));
+      assertEquals(4, vector1.get(3));
+      assertEquals(5, vector1.get(4));
+      assertEquals(6, vector1.get(5));
+
+      Field field1 = vector1.getField();
+      String fieldName1 = field1.getName();
+
+      Field field2 = vector2.getField();
+      String fieldName2 = field2.getName();
+
+      List<Field> fields = new ArrayList<>(2);
+      List<FieldVector> fieldVectors = new ArrayList<>(2);
+
+      fields.add(field1);
+      fields.add(field2);
+      fieldVectors.add(vector1);
+      fieldVectors.add(vector2);
+
+      Schema schema = new Schema(fields);
+
+      VectorSchemaRoot schemaRoot1 = new VectorSchemaRoot(schema, fieldVectors, valueCount);
+      VectorUnloader vectorUnloader = new VectorUnloader(schemaRoot1);
+
+      try (ArrowRecordBatch recordBatch = vectorUnloader.getRecordBatch();
+          BufferAllocator finalVectorsAllocator =
+              allocator.newChildAllocator("new vector", 0, Long.MAX_VALUE);
+          VectorSchemaRoot schemaRoot2 = VectorSchemaRoot.create(schema, finalVectorsAllocator); ) {
+
+        // validating recordBatch contains an output for variadicBufferCounts
+        assertFalse(recordBatch.getVariadicBufferCounts().isEmpty());
+        assertEquals(1, recordBatch.getVariadicBufferCounts().size());
+
+        VectorLoader vectorLoader = new VectorLoader(schemaRoot2);
+        vectorLoader.load(recordBatch);
+
+        IntVector vector3 = (IntVector) schemaRoot2.getVector(fieldName1);
+        vector3.setValueCount(25);
+
+        /* Check the vector output */
+        assertEquals(1, vector3.get(0));
+        assertEquals(2, vector3.get(1));
+        assertEquals(3, vector3.get(2));
+        assertEquals(4, vector3.get(3));
+        assertEquals(5, vector3.get(4));
+        assertEquals(6, vector3.get(5));
+
+        ViewVarCharVector vector4 = (ViewVarCharVector) schemaRoot2.getVector(fieldName2);
+        vector4.setValueCount(25);
+
+        /* Check the vector output */
+        assertArrayEquals(STR1, vector4.get(0));
+        assertArrayEquals(STR2, vector4.get(1));
+        assertArrayEquals(STR3, vector4.get(2));
+        assertArrayEquals(STR4, vector4.get(3));
+        assertArrayEquals(STR5, vector4.get(4));
+        assertArrayEquals(STR6, vector4.get(5));
+      }
+    }
+  }
+
+  private String generateRandomString(int length) {
+    Random random = new Random();
+    StringBuilder sb = new StringBuilder(length);
+    for (int i = 0; i < length; i++) {
+      sb.append(random.nextInt(10)); // 0-9
+    }
+    return sb.toString();
+  }
+}
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorAlloc.java b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorAlloc.java
index b96f6ab6afedd..75ac1be463172 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorAlloc.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorAlloc.java
@@ -14,15 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
 import java.util.Collections;
-
 import org.apache.arrow.memory.AllocationListener;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -39,23 +37,23 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestVectorAlloc {
   private BufferAllocator rootAllocator;
 
   private BufferAllocator policyAllocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     rootAllocator = new RootAllocator(Long.MAX_VALUE);
     policyAllocator =
         new RootAllocator(AllocationListener.NOOP, Integer.MAX_VALUE, new CustomPolicy());
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     rootAllocator.close();
     policyAllocator.close();
@@ -67,45 +65,47 @@ private static Field field(String name, ArrowType type) {
 
   @Test
   public void testVectorAllocWithField() {
-    Schema schema = new Schema(Arrays.asList(
-        field("TINYINT", MinorType.TINYINT.getType()),
-        field("SMALLINT", MinorType.SMALLINT.getType()),
-        field("INT", MinorType.INT.getType()),
-        field("BIGINT", MinorType.BIGINT.getType()),
-        field("UINT1", MinorType.UINT1.getType()),
-        field("UINT2", MinorType.UINT2.getType()),
-        field("UINT4", MinorType.UINT4.getType()),
-        field("UINT8", MinorType.UINT8.getType()),
-        field("FLOAT4", MinorType.FLOAT4.getType()),
-        field("FLOAT8", MinorType.FLOAT8.getType()),
-        field("UTF8", MinorType.VARCHAR.getType()),
-        field("VARBINARY", MinorType.VARBINARY.getType()),
-        field("BIT", MinorType.BIT.getType()),
-        field("DECIMAL", new Decimal(38, 5, 128)),
-        field("FIXEDSIZEBINARY", new FixedSizeBinary(50)),
-        field("DATEDAY", MinorType.DATEDAY.getType()),
-        field("DATEMILLI", MinorType.DATEMILLI.getType()),
-        field("TIMESEC", MinorType.TIMESEC.getType()),
-        field("TIMEMILLI", MinorType.TIMEMILLI.getType()),
-        field("TIMEMICRO", MinorType.TIMEMICRO.getType()),
-        field("TIMENANO", MinorType.TIMENANO.getType()),
-        field("TIMESTAMPSEC", MinorType.TIMESTAMPSEC.getType()),
-        field("TIMESTAMPMILLI", MinorType.TIMESTAMPMILLI.getType()),
-        field("TIMESTAMPMICRO", MinorType.TIMESTAMPMICRO.getType()),
-        field("TIMESTAMPNANO", MinorType.TIMESTAMPNANO.getType()),
-        field("TIMESTAMPSECTZ", new Timestamp(TimeUnit.SECOND, "PST")),
-        field("TIMESTAMPMILLITZ", new Timestamp(TimeUnit.MILLISECOND, "PST")),
-        field("TIMESTAMPMICROTZ", new Timestamp(TimeUnit.MICROSECOND, "PST")),
-        field("TIMESTAMPNANOTZ", new Timestamp(TimeUnit.NANOSECOND, "PST")),
-        field("INTERVALDAY", MinorType.INTERVALDAY.getType()),
-        field("INTERVALYEAR", MinorType.INTERVALYEAR.getType()),
-        field("DURATION", new Duration(TimeUnit.MILLISECOND))
-    ));
+    Schema schema =
+        new Schema(
+            Arrays.asList(
+                field("TINYINT", MinorType.TINYINT.getType()),
+                field("SMALLINT", MinorType.SMALLINT.getType()),
+                field("INT", MinorType.INT.getType()),
+                field("BIGINT", MinorType.BIGINT.getType()),
+                field("UINT1", MinorType.UINT1.getType()),
+                field("UINT2", MinorType.UINT2.getType()),
+                field("UINT4", MinorType.UINT4.getType()),
+                field("UINT8", MinorType.UINT8.getType()),
+                field("FLOAT4", MinorType.FLOAT4.getType()),
+                field("FLOAT8", MinorType.FLOAT8.getType()),
+                field("UTF8", MinorType.VARCHAR.getType()),
+                field("VARBINARY", MinorType.VARBINARY.getType()),
+                field("BIT", MinorType.BIT.getType()),
+                field("DECIMAL", new Decimal(38, 5, 128)),
+                field("FIXEDSIZEBINARY", new FixedSizeBinary(50)),
+                field("DATEDAY", MinorType.DATEDAY.getType()),
+                field("DATEMILLI", MinorType.DATEMILLI.getType()),
+                field("TIMESEC", MinorType.TIMESEC.getType()),
+                field("TIMEMILLI", MinorType.TIMEMILLI.getType()),
+                field("TIMEMICRO", MinorType.TIMEMICRO.getType()),
+                field("TIMENANO", MinorType.TIMENANO.getType()),
+                field("TIMESTAMPSEC", MinorType.TIMESTAMPSEC.getType()),
+                field("TIMESTAMPMILLI", MinorType.TIMESTAMPMILLI.getType()),
+                field("TIMESTAMPMICRO", MinorType.TIMESTAMPMICRO.getType()),
+                field("TIMESTAMPNANO", MinorType.TIMESTAMPNANO.getType()),
+                field("TIMESTAMPSECTZ", new Timestamp(TimeUnit.SECOND, "PST")),
+                field("TIMESTAMPMILLITZ", new Timestamp(TimeUnit.MILLISECOND, "PST")),
+                field("TIMESTAMPMICROTZ", new Timestamp(TimeUnit.MICROSECOND, "PST")),
+                field("TIMESTAMPNANOTZ", new Timestamp(TimeUnit.NANOSECOND, "PST")),
+                field("INTERVALDAY", MinorType.INTERVALDAY.getType()),
+                field("INTERVALYEAR", MinorType.INTERVALYEAR.getType()),
+                field("DURATION", new Duration(TimeUnit.MILLISECOND))));
 
     try (BufferAllocator allocator = rootAllocator.newChildAllocator("child", 0, Long.MAX_VALUE)) {
       for (Field field : schema.getFields()) {
         try (FieldVector vector = field.createVector(allocator)) {
-          assertEquals(vector.getMinorType(),
+          assertEquals(
+              vector.getMinorType(),
               Types.getMinorTypeForArrowType(field.getFieldType().getType()));
           vector.allocateNew();
         }
@@ -115,10 +115,7 @@ public void testVectorAllocWithField() {
 
   private static final int CUSTOM_SEGMENT_SIZE = 200;
 
-  /**
-   * A custom rounding policy that rounds the size to
-   * the next multiple of 200.
-   */
+  /** A custom rounding policy that rounds the size to the next multiple of 200. */
   private static class CustomPolicy implements RoundingPolicy {
 
     @Override
@@ -150,7 +147,7 @@ public void testFixedWidthVectorAllocation() {
   @Test
   public void testVariableWidthVectorAllocation() {
     try (VarCharVector vec1 = new VarCharVector("vec", policyAllocator);
-         VarCharVector vec2 = new VarCharVector("vec", rootAllocator)) {
+        VarCharVector vec2 = new VarCharVector("vec", rootAllocator)) {
       assertTrue(vec1.getAllocator().getRoundingPolicy() instanceof CustomPolicy);
       vec1.allocateNew(50);
       long totalCapacity = vec1.getValidityBuffer().capacity() + vec1.getOffsetBuffer().capacity();
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java
index 9043bd4f8f2d4..f5ec42c71c209 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.nio.charset.StandardCharsets;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.complex.DenseUnionVector;
@@ -37,22 +38,20 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.util.DataSizeRoundingUtil;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestVectorReAlloc {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -68,7 +67,7 @@ public void testFixedType() {
 
       try {
         vector.set(initialCapacity, 0);
-        Assert.fail("Expected out of bounds exception");
+        fail("Expected out of bounds exception");
       } catch (Exception e) {
         // ok
       }
@@ -92,7 +91,7 @@ public void testNullableType() {
 
       try {
         vector.set(initialCapacity, "foo".getBytes(StandardCharsets.UTF_8));
-        Assert.fail("Expected out of bounds exception");
+        fail("Expected out of bounds exception");
       } catch (Exception e) {
         // ok
       }
@@ -101,7 +100,7 @@ public void testNullableType() {
       assertTrue(vector.getValueCapacity() >= 2 * initialCapacity);
 
       vector.set(initialCapacity, "foo".getBytes(StandardCharsets.UTF_8));
-      assertEquals("foo", new String(vector.get(initialCapacity), StandardCharsets.UTF_8));
+      assertEquals(new String(vector.get(initialCapacity), StandardCharsets.UTF_8), "foo");
     }
   }
 
@@ -117,7 +116,7 @@ public void testListType() {
 
       try {
         vector.getInnerValueCountAt(2014);
-        Assert.fail("Expected out of bounds exception");
+        fail("Expected out of bounds exception");
       } catch (Exception e) {
         // ok
       }
@@ -140,7 +139,7 @@ public void testStructType() {
 
       try {
         vector.getObject(513);
-        Assert.fail("Expected out of bounds exception");
+        fail("Expected out of bounds exception");
       } catch (Exception e) {
         // ok
       }
@@ -161,7 +160,7 @@ public void testVariableWidthTypeSetNullValues() {
       for (int i = 0; i < numNullValues1; i++) {
         v1.setNull(i);
       }
-      Assert.assertTrue(v1.getBufferSizeFor(numNullValues1) > 0);
+      assertTrue(v1.getBufferSizeFor(numNullValues1) > 0);
     }
 
     try (final BaseLargeVariableWidthVector v2 = new LargeVarCharVector("var2", allocator)) {
@@ -171,7 +170,7 @@ public void testVariableWidthTypeSetNullValues() {
       for (int i = 0; i < numNullValues2; i++) {
         v2.setNull(i);
       }
-      Assert.assertTrue(v2.getBufferSizeFor(numNullValues2) > 0);
+      assertTrue(v2.getBufferSizeFor(numNullValues2) > 0);
     }
   }
 
@@ -194,7 +193,7 @@ public void testFixedAllocateAfterReAlloc() throws Exception {
       /*
        * Verify that the buffer sizes haven't changed.
        */
-      Assert.assertEquals(vector.getValueCapacity(), savedValueCapacity);
+      assertEquals(vector.getValueCapacity(), savedValueCapacity);
     }
   }
 
@@ -218,8 +217,8 @@ public void testVariableAllocateAfterReAlloc() throws Exception {
       /*
        * Verify that the buffer sizes haven't changed.
        */
-      Assert.assertEquals(vector.getValueCapacity(), savedValueCapacity);
-      Assert.assertEquals(vector.valueBuffer.capacity(), savedValueBufferSize);
+      assertEquals(vector.getValueCapacity(), savedValueCapacity);
+      assertEquals(vector.valueBuffer.capacity(), savedValueBufferSize);
     }
   }
 
@@ -243,8 +242,8 @@ public void testLargeVariableAllocateAfterReAlloc() throws Exception {
       /*
        * Verify that the buffer sizes haven't changed.
        */
-      Assert.assertEquals(vector.getValueCapacity(), savedValueCapacity);
-      Assert.assertEquals(vector.valueBuffer.capacity(), savedValueBufferSize);
+      assertEquals(vector.getValueCapacity(), savedValueCapacity);
+      assertEquals(vector.valueBuffer.capacity(), savedValueBufferSize);
     }
   }
 
@@ -254,10 +253,14 @@ public void testVarCharAllocateNew() throws Exception {
 
     try (final VarCharVector vector = new VarCharVector("", allocator)) {
       vector.allocateNew(count);
-      
-      // verify that the validity buffer and value buffer have capacity for at least 'count' elements.
-      Assert.assertTrue(vector.getValidityBuffer().capacity() >= DataSizeRoundingUtil.divideBy8Ceil(count));
-      Assert.assertTrue(vector.getOffsetBuffer().capacity() >= (count + 1) * BaseVariableWidthVector.OFFSET_WIDTH);
+
+      // verify that the validity buffer and value buffer have capacity for at least 'count'
+      // elements.
+      assertTrue(
+          vector.getValidityBuffer().capacity() >= DataSizeRoundingUtil.divideBy8Ceil(count));
+      assertTrue(
+          vector.getOffsetBuffer().capacity()
+              >= (count + 1) * BaseVariableWidthVector.OFFSET_WIDTH);
     }
   }
 
@@ -267,10 +270,14 @@ public void testLargeVarCharAllocateNew() throws Exception {
 
     try (final LargeVarCharVector vector = new LargeVarCharVector("", allocator)) {
       vector.allocateNew(count);
-      
-      // verify that the validity buffer and value buffer have capacity for at least 'count' elements.
-      Assert.assertTrue(vector.getValidityBuffer().capacity() >= DataSizeRoundingUtil.divideBy8Ceil(count));
-      Assert.assertTrue(vector.getOffsetBuffer().capacity() >= (count + 1) * BaseLargeVariableWidthVector.OFFSET_WIDTH);
+
+      // verify that the validity buffer and value buffer have capacity for at least 'count'
+      // elements.
+      assertTrue(
+          vector.getValidityBuffer().capacity() >= DataSizeRoundingUtil.divideBy8Ceil(count));
+      assertTrue(
+          vector.getOffsetBuffer().capacity()
+              >= (count + 1) * BaseLargeVariableWidthVector.OFFSET_WIDTH);
     }
   }
 
@@ -281,9 +288,13 @@ public void testVarCharAllocateNewUsingHelper() throws Exception {
     try (final VarCharVector vector = new VarCharVector("", allocator)) {
       AllocationHelper.allocateNew(vector, count);
 
-      // verify that the validity buffer and value buffer have capacity for at least 'count' elements.
-      Assert.assertTrue(vector.getValidityBuffer().capacity() >= DataSizeRoundingUtil.divideBy8Ceil(count));
-      Assert.assertTrue(vector.getOffsetBuffer().capacity() >= (count + 1) * BaseVariableWidthVector.OFFSET_WIDTH);
+      // verify that the validity buffer and value buffer have capacity for at least 'count'
+      // elements.
+      assertTrue(
+          vector.getValidityBuffer().capacity() >= DataSizeRoundingUtil.divideBy8Ceil(count));
+      assertTrue(
+          vector.getOffsetBuffer().capacity()
+              >= (count + 1) * BaseVariableWidthVector.OFFSET_WIDTH);
     }
   }
 
@@ -294,9 +305,13 @@ public void testLargeVarCharAllocateNewUsingHelper() throws Exception {
     try (final LargeVarCharVector vector = new LargeVarCharVector("", allocator)) {
       AllocationHelper.allocateNew(vector, count);
 
-      // verify that the validity buffer and value buffer have capacity for at least 'count' elements.
-      Assert.assertTrue(vector.getValidityBuffer().capacity() >= DataSizeRoundingUtil.divideBy8Ceil(count));
-      Assert.assertTrue(vector.getOffsetBuffer().capacity() >= (count + 1) * BaseLargeVariableWidthVector.OFFSET_WIDTH);
+      // verify that the validity buffer and value buffer have capacity for at least 'count'
+      // elements.
+      assertTrue(
+          vector.getValidityBuffer().capacity() >= DataSizeRoundingUtil.divideBy8Ceil(count));
+      assertTrue(
+          vector.getOffsetBuffer().capacity()
+              >= (count + 1) * BaseLargeVariableWidthVector.OFFSET_WIDTH);
     }
   }
 
@@ -314,7 +329,7 @@ public void testFixedRepeatedClearAndSet() throws Exception {
       }
 
       // should be deterministic, and not cause a run-away increase in capacity.
-      Assert.assertEquals(vector.getValueCapacity(), savedValueCapacity);
+      assertEquals(vector.getValueCapacity(), savedValueCapacity);
     }
   }
 
@@ -333,13 +348,14 @@ public void testVariableRepeatedClearAndSet() throws Exception {
       }
 
       // should be deterministic, and not cause a run-away increase in capacity.
-      Assert.assertEquals(vector.getValueCapacity(), savedValueCapacity);
+      assertEquals(vector.getValueCapacity(), savedValueCapacity);
     }
   }
 
   @Test
   public void testRepeatedValueVectorClearAndSet() throws Exception {
-    try (final ListVector vector = new ListVector("", allocator, FieldType.nullable(MinorType.INT.getType()), null)) {
+    try (final ListVector vector =
+        new ListVector("", allocator, FieldType.nullable(MinorType.INT.getType()), null)) {
       vector.allocateNewSafe(); // Initial allocation
       UnionListWriter writer = vector.getWriter();
 
@@ -359,7 +375,7 @@ public void testRepeatedValueVectorClearAndSet() throws Exception {
       }
 
       // should be deterministic, and not cause a run-away increase in capacity.
-      Assert.assertEquals(vector.getValueCapacity(), savedValueCapacity);
+      assertEquals(vector.getValueCapacity(), savedValueCapacity);
     }
   }
 
@@ -386,14 +402,15 @@ public void testStructVectorClearAndSet() throws Exception {
       }
 
       // should be deterministic, and not cause a run-away increase in capacity.
-      Assert.assertEquals(vector.getValueCapacity(), savedValueCapacity);
+      assertEquals(vector.getValueCapacity(), savedValueCapacity);
     }
   }
 
   @Test
   public void testFixedSizeListVectorClearAndSet() {
-    try (final FixedSizeListVector vector = new FixedSizeListVector("", allocator,
-        FieldType.nullable(new ArrowType.FixedSizeList(2)), null)) {
+    try (final FixedSizeListVector vector =
+        new FixedSizeListVector(
+            "", allocator, FieldType.nullable(new ArrowType.FixedSizeList(2)), null)) {
       vector.allocateNewSafe(); // Initial allocation
       UnionFixedSizeListWriter writer = vector.getWriter();
 
@@ -415,13 +432,14 @@ public void testFixedSizeListVectorClearAndSet() {
       }
 
       // should be deterministic, and not cause a run-away increase in capacity.
-      Assert.assertEquals(vector.getValueCapacity(), savedValueCapacity);
+      assertEquals(vector.getValueCapacity(), savedValueCapacity);
     }
   }
 
   @Test
   public void testUnionVectorClearAndSet() {
-    try (final UnionVector vector = new UnionVector("", allocator, /* field type */ null, /* call-back */ null)) {
+    try (final UnionVector vector =
+        new UnionVector("", allocator, /* field type */ null, /* call-back */ null)) {
       vector.allocateNewSafe(); // Initial allocation
 
       NullableIntHolder holder = new NullableIntHolder();
@@ -440,7 +458,7 @@ public void testUnionVectorClearAndSet() {
       }
 
       // should be deterministic, and not cause a run-away increase in capacity.
-      Assert.assertEquals(vector.getValueCapacity(), savedValueCapacity);
+      assertEquals(vector.getValueCapacity(), savedValueCapacity);
     }
   }
 
@@ -468,7 +486,7 @@ public void testDenseUnionVectorClearAndSet() {
       }
 
       // should be deterministic, and not cause a run-away increase in capacity.
-      Assert.assertEquals(vector.getValueCapacity(), savedValueCapacity);
+      assertEquals(vector.getValueCapacity(), savedValueCapacity);
     }
   }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReset.java b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReset.java
index 71009a3337510..48cf78a4c2e4a 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReset.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReset.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -34,20 +32,20 @@
 import org.apache.arrow.vector.types.pojo.ArrowType.FixedSizeList;
 import org.apache.arrow.vector.types.pojo.ArrowType.Int;
 import org.apache.arrow.vector.types.pojo.FieldType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestVectorReset {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -93,6 +91,18 @@ public void testVariableTypeReset() {
     }
   }
 
+  @Test
+  public void testVariableViewTypeReset() {
+    try (final ViewVarCharVector vector = new ViewVarCharVector("ViewVarChar", allocator)) {
+      vector.allocateNewSafe();
+      vector.set(0, "a".getBytes(StandardCharsets.UTF_8));
+      vector.setLastSet(0);
+      vector.setValueCount(1);
+      resetVectorAndVerify(vector, vector.getBuffers(false));
+      assertEquals(-1, vector.getLastSet());
+    }
+  }
+
   @Test
   public void testLargeVariableTypeReset() {
     try (final LargeVarCharVector vector = new LargeVarCharVector("LargeVarChar", allocator)) {
@@ -108,10 +118,11 @@ public void testLargeVariableTypeReset() {
   @Test
   public void testListTypeReset() {
     try (final ListVector variableList =
-           new ListVector("VarList", allocator, FieldType.nullable(MinorType.INT.getType()), null);
-         final FixedSizeListVector fixedList =
-            new FixedSizeListVector("FixedList", allocator, FieldType.nullable(new FixedSizeList(2)), null)
-    ) {
+            new ListVector(
+                "VarList", allocator, FieldType.nullable(MinorType.INT.getType()), null);
+        final FixedSizeListVector fixedList =
+            new FixedSizeListVector(
+                "FixedList", allocator, FieldType.nullable(new FixedSizeList(2)), null)) {
       // ListVector
       variableList.allocateNewSafe();
       variableList.startNewValue(0);
@@ -131,14 +142,16 @@ public void testListTypeReset() {
   @Test
   public void testStructTypeReset() {
     try (final NonNullableStructVector nonNullableStructVector =
-           new NonNullableStructVector("Struct", allocator, FieldType.nullable(MinorType.INT.getType()), null);
-         final StructVector structVector =
-            new StructVector("NullableStruct", allocator, FieldType.nullable(MinorType.INT.getType()), null)
-    ) {
+            new NonNullableStructVector(
+                "Struct", allocator, FieldType.nullable(MinorType.INT.getType()), null);
+        final StructVector structVector =
+            new StructVector(
+                "NullableStruct", allocator, FieldType.nullable(MinorType.INT.getType()), null)) {
       // NonNullableStructVector
       nonNullableStructVector.allocateNewSafe();
-      IntVector structChild = nonNullableStructVector
-          .addOrGet("child", FieldType.nullable(new Int(32, true)), IntVector.class);
+      IntVector structChild =
+          nonNullableStructVector.addOrGet(
+              "child", FieldType.nullable(new Int(32, true)), IntVector.class);
       structChild.setNull(0);
       nonNullableStructVector.setValueCount(1);
       resetVectorAndVerify(nonNullableStructVector, nonNullableStructVector.getBuffers(false));
@@ -153,9 +166,9 @@ public void testStructTypeReset() {
 
   @Test
   public void testUnionTypeReset() {
-    try (final UnionVector vector = new UnionVector("Union", allocator, /* field type */ null, /* call-back */ null);
-         final IntVector dataVector = new IntVector("Int", allocator)
-    ) {
+    try (final UnionVector vector =
+            new UnionVector("Union", allocator, /* field type */ null, /* call-back */ null);
+        final IntVector dataVector = new IntVector("Int", allocator)) {
       vector.getBufferSize();
       vector.allocateNewSafe();
       dataVector.allocateNewSafe();
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorSchemaRoot.java b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorSchemaRoot.java
index 207962eb45b85..50f61d311e60e 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorSchemaRoot.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorSchemaRoot.java
@@ -14,19 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
-import static junit.framework.TestCase.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.complex.ListVector;
@@ -35,20 +34,20 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestVectorSchemaRoot {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void terminate() {
     allocator.close();
   }
@@ -57,7 +56,7 @@ public void terminate() {
   public void testResetRowCount() {
     final int size = 20;
     try (final BitVector vec1 = new BitVector("bit", allocator);
-         final IntVector vec2 = new IntVector("int", allocator)) {
+        final IntVector vec2 = new IntVector("int", allocator)) {
       VectorSchemaRoot vsr = VectorSchemaRoot.of(vec1, vec2);
 
       vsr.allocateNew();
@@ -92,8 +91,8 @@ private void checkCount(BitVector vec1, IntVector vec2, VectorSchemaRoot vsr, in
   }
 
   private VectorSchemaRoot createBatch() {
-    FieldType varCharType = new FieldType(true, new ArrowType.Utf8(), /*dictionary=*/null);
-    FieldType listType = new FieldType(true, new ArrowType.List(), /*dictionary=*/null);
+    FieldType varCharType = new FieldType(true, new ArrowType.Utf8(), /*dictionary=*/ null);
+    FieldType listType = new FieldType(true, new ArrowType.List(), /*dictionary=*/ null);
 
     // create the schema
     List<Field> schemaFields = new ArrayList<>();
@@ -157,8 +156,8 @@ private VectorSchemaRoot createBatch() {
   @Test
   public void testAddVector() {
     try (final IntVector intVector1 = new IntVector("intVector1", allocator);
-         final IntVector intVector2 = new IntVector("intVector2", allocator);
-         final IntVector intVector3 = new IntVector("intVector3", allocator);) {
+        final IntVector intVector2 = new IntVector("intVector2", allocator);
+        final IntVector intVector3 = new IntVector("intVector3", allocator); ) {
 
       VectorSchemaRoot original = new VectorSchemaRoot(Arrays.asList(intVector1, intVector2));
       assertEquals(2, original.getFieldVectors().size());
@@ -176,7 +175,7 @@ public void testAddVector() {
   public void testRemoveVector() {
     try (final IntVector intVector1 = new IntVector("intVector1", allocator);
         final IntVector intVector2 = new IntVector("intVector2", allocator);
-        final IntVector intVector3 = new IntVector("intVector3", allocator);) {
+        final IntVector intVector3 = new IntVector("intVector3", allocator); ) {
 
       VectorSchemaRoot original =
           new VectorSchemaRoot(Arrays.asList(intVector1, intVector2, intVector3));
@@ -195,7 +194,7 @@ public void testRemoveVector() {
   @Test
   public void testSlice() {
     try (final IntVector intVector = new IntVector("intVector", allocator);
-         final Float4Vector float4Vector = new Float4Vector("float4Vector", allocator)) {
+        final Float4Vector float4Vector = new Float4Vector("float4Vector", allocator)) {
       final int numRows = 10;
       intVector.setValueCount(numRows);
       float4Vector.setValueCount(numRows);
@@ -204,7 +203,8 @@ public void testSlice() {
         float4Vector.setSafe(i, i + 0.1f);
       }
 
-      final VectorSchemaRoot original = new VectorSchemaRoot(Arrays.asList(intVector, float4Vector));
+      final VectorSchemaRoot original =
+          new VectorSchemaRoot(Arrays.asList(intVector, float4Vector));
 
       for (int sliceIndex = 0; sliceIndex < numRows; sliceIndex++) {
         for (int sliceLength = 0; sliceIndex + sliceLength <= numRows; sliceLength++) {
@@ -226,27 +226,32 @@ public void testSlice() {
     }
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testSliceWithInvalidParam() {
-    try (final IntVector intVector = new IntVector("intVector", allocator);
-         final Float4Vector float4Vector = new Float4Vector("float4Vector", allocator)) {
-      intVector.setValueCount(10);
-      float4Vector.setValueCount(10);
-      for (int i = 0; i < 10; i++) {
-        intVector.setSafe(i, i);
-        float4Vector.setSafe(i, i + 0.1f);
-      }
-      final VectorSchemaRoot original = new VectorSchemaRoot(Arrays.asList(intVector, float4Vector));
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> {
+          try (final IntVector intVector = new IntVector("intVector", allocator);
+              final Float4Vector float4Vector = new Float4Vector("float4Vector", allocator)) {
+            intVector.setValueCount(10);
+            float4Vector.setValueCount(10);
+            for (int i = 0; i < 10; i++) {
+              intVector.setSafe(i, i);
+              float4Vector.setSafe(i, i + 0.1f);
+            }
+            final VectorSchemaRoot original =
+                new VectorSchemaRoot(Arrays.asList(intVector, float4Vector));
 
-      original.slice(0, 20);
-    }
+            original.slice(0, 20);
+          }
+        });
   }
 
   @Test
   public void testEquals() {
     try (final IntVector intVector1 = new IntVector("intVector1", allocator);
-         final IntVector intVector2 = new IntVector("intVector2", allocator);
-         final IntVector intVector3 = new IntVector("intVector3", allocator);) {
+        final IntVector intVector2 = new IntVector("intVector2", allocator);
+        final IntVector intVector3 = new IntVector("intVector3", allocator); ) {
 
       intVector1.setValueCount(5);
       for (int i = 0; i < 5; i++) {
@@ -256,8 +261,7 @@ public void testEquals() {
       VectorSchemaRoot root1 =
           new VectorSchemaRoot(Arrays.asList(intVector1, intVector2, intVector3));
 
-      VectorSchemaRoot root2 =
-          new VectorSchemaRoot(Arrays.asList(intVector1, intVector2));
+      VectorSchemaRoot root2 = new VectorSchemaRoot(Arrays.asList(intVector1, intVector2));
 
       VectorSchemaRoot root3 =
           new VectorSchemaRoot(Arrays.asList(intVector1, intVector2, intVector3));
@@ -274,8 +278,8 @@ public void testEquals() {
   @Test
   public void testApproxEquals() {
     try (final Float4Vector float4Vector1 = new Float4Vector("floatVector", allocator);
-         final Float4Vector float4Vector2 = new Float4Vector("floatVector", allocator);
-         final Float4Vector float4Vector3 = new Float4Vector("floatVector", allocator);) {
+        final Float4Vector float4Vector2 = new Float4Vector("floatVector", allocator);
+        final Float4Vector float4Vector3 = new Float4Vector("floatVector", allocator); ) {
 
       float4Vector1.setValueCount(5);
       float4Vector2.setValueCount(5);
@@ -287,14 +291,11 @@ public void testApproxEquals() {
         float4Vector3.set(i, i + epsilon / 2);
       }
 
-      VectorSchemaRoot root1 =
-          new VectorSchemaRoot(Arrays.asList(float4Vector1));
+      VectorSchemaRoot root1 = new VectorSchemaRoot(Arrays.asList(float4Vector1));
 
-      VectorSchemaRoot root2 =
-          new VectorSchemaRoot(Arrays.asList(float4Vector2));
+      VectorSchemaRoot root2 = new VectorSchemaRoot(Arrays.asList(float4Vector2));
 
-      VectorSchemaRoot root3 =
-          new VectorSchemaRoot(Arrays.asList(float4Vector3));
+      VectorSchemaRoot root3 = new VectorSchemaRoot(Arrays.asList(float4Vector3));
 
       assertFalse(root1.approxEquals(root2));
       assertTrue(root1.approxEquals(root3));
@@ -307,10 +308,13 @@ public void testApproxEquals() {
 
   @Test
   public void testSchemaSync() {
-    //create vector schema root
+    // create vector schema root
     try (VectorSchemaRoot schemaRoot = createBatch()) {
-      Schema newSchema = new Schema(
-              schemaRoot.getFieldVectors().stream().map(vec -> vec.getField()).collect(Collectors.toList()));
+      Schema newSchema =
+          new Schema(
+              schemaRoot.getFieldVectors().stream()
+                  .map(vec -> vec.getField())
+                  .collect(Collectors.toList()));
 
       assertNotEquals(newSchema, schemaRoot.getSchema());
       assertTrue(schemaRoot.syncSchema());
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorUnloadLoad.java b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorUnloadLoad.java
index eac72f4b2c893..6121fb67fefb7 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorUnloadLoad.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorUnloadLoad.java
@@ -14,19 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector;
 
 import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -44,21 +42,20 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestVectorUnloadLoad {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -68,8 +65,8 @@ public void testNullCodec() {
     final Schema schema = new Schema(Collections.emptyList());
     try (final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       root.setRowCount(1);
-      final VectorUnloader unloader = new VectorUnloader(
-          root, /*includeNulls*/ true, /*codec*/ null, /*alignBuffers*/ true);
+      final VectorUnloader unloader =
+          new VectorUnloader(root, /*includeNulls*/ true, /*codec*/ null, /*alignBuffers*/ true);
       unloader.getRecordBatch().close();
     }
   }
@@ -79,10 +76,10 @@ public void testUnloadLoad() throws IOException {
     int count = 10000;
     Schema schema;
 
-    try (
-        BufferAllocator originalVectorsAllocator =
+    try (BufferAllocator originalVectorsAllocator =
             allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
-        NonNullableStructVector parent = NonNullableStructVector.empty("parent", originalVectorsAllocator)) {
+        NonNullableStructVector parent =
+            NonNullableStructVector.empty("parent", originalVectorsAllocator)) {
 
       // write some data
       ComplexWriter writer = new ComplexWriterImpl("root", parent);
@@ -101,11 +98,10 @@ public void testUnloadLoad() throws IOException {
       FieldVector root = parent.getChild("root");
       schema = new Schema(root.getField().getChildren());
       VectorUnloader vectorUnloader = newVectorUnloader(root);
-      try (
-          ArrowRecordBatch recordBatch = vectorUnloader.getRecordBatch();
-          BufferAllocator finalVectorsAllocator = allocator.newChildAllocator("final vectors", 0, Integer.MAX_VALUE);
-          VectorSchemaRoot newRoot = VectorSchemaRoot.create(schema, finalVectorsAllocator);
-      ) {
+      try (ArrowRecordBatch recordBatch = vectorUnloader.getRecordBatch();
+          BufferAllocator finalVectorsAllocator =
+              allocator.newChildAllocator("final vectors", 0, Integer.MAX_VALUE);
+          VectorSchemaRoot newRoot = VectorSchemaRoot.create(schema, finalVectorsAllocator); ) {
 
         // load it
         VectorLoader vectorLoader = new VectorLoader(newRoot);
@@ -116,9 +112,9 @@ public void testUnloadLoad() throws IOException {
         FieldReader bigIntReader = newRoot.getVector("bigInt").getReader();
         for (int i = 0; i < count; i++) {
           intReader.setPosition(i);
-          Assert.assertEquals(i, intReader.readInteger().intValue());
+          assertEquals(i, intReader.readInteger().intValue());
           bigIntReader.setPosition(i);
-          Assert.assertEquals(i, bigIntReader.readLong().longValue());
+          assertEquals(i, bigIntReader.readLong().longValue());
         }
       }
     }
@@ -128,10 +124,10 @@ public void testUnloadLoad() throws IOException {
   public void testUnloadLoadAddPadding() throws IOException {
     int count = 10000;
     Schema schema;
-    try (
-        BufferAllocator originalVectorsAllocator =
+    try (BufferAllocator originalVectorsAllocator =
             allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
-        NonNullableStructVector parent = NonNullableStructVector.empty("parent", originalVectorsAllocator)) {
+        NonNullableStructVector parent =
+            NonNullableStructVector.empty("parent", originalVectorsAllocator)) {
 
       // write some data
       ComplexWriter writer = new ComplexWriterImpl("root", parent);
@@ -152,11 +148,10 @@ public void testUnloadLoadAddPadding() throws IOException {
       FieldVector root = parent.getChild("root");
       schema = new Schema(root.getField().getChildren());
       VectorUnloader vectorUnloader = newVectorUnloader(root);
-      try (
-          ArrowRecordBatch recordBatch = vectorUnloader.getRecordBatch();
-          BufferAllocator finalVectorsAllocator = allocator.newChildAllocator("final vectors", 0, Integer.MAX_VALUE);
-          VectorSchemaRoot newRoot = VectorSchemaRoot.create(schema, finalVectorsAllocator);
-      ) {
+      try (ArrowRecordBatch recordBatch = vectorUnloader.getRecordBatch();
+          BufferAllocator finalVectorsAllocator =
+              allocator.newChildAllocator("final vectors", 0, Integer.MAX_VALUE);
+          VectorSchemaRoot newRoot = VectorSchemaRoot.create(schema, finalVectorsAllocator); ) {
         List<ArrowBuf> oldBuffers = recordBatch.getBuffers();
         List<ArrowBuf> newBuffers = new ArrayList<>();
         for (ArrowBuf oldBuffer : oldBuffers) {
@@ -175,7 +170,7 @@ public void testUnloadLoadAddPadding() throws IOException {
         }
 
         try (ArrowRecordBatch newBatch =
-               new ArrowRecordBatch(recordBatch.getLength(), recordBatch.getNodes(), newBuffers);) {
+            new ArrowRecordBatch(recordBatch.getLength(), recordBatch.getNodes(), newBuffers); ) {
           // load it
           VectorLoader vectorLoader = new VectorLoader(newRoot);
 
@@ -188,7 +183,7 @@ public void testUnloadLoadAddPadding() throws IOException {
             for (int j = 0; j < i % 4 + 1; j++) {
               expected.add(i);
             }
-            Assert.assertEquals(expected, reader.readObject());
+            assertEquals(expected, reader.readObject());
           }
         }
 
@@ -200,18 +195,23 @@ public void testUnloadLoadAddPadding() throws IOException {
   }
 
   /**
-   * The validity buffer can be empty if:
-   * - all values are defined.
-   * - all values are null.
+   * The validity buffer can be empty if: - all values are defined. - all values are null.
    *
    * @throws IOException on error
    */
   @Test
   public void testLoadValidityBuffer() throws IOException {
-    Schema schema = new Schema(asList(
-        new Field("intDefined", FieldType.nullable(new ArrowType.Int(32, true)), Collections.<Field>emptyList()),
-        new Field("intNull", FieldType.nullable(new ArrowType.Int(32, true)), Collections.<Field>emptyList())
-    ));
+    Schema schema =
+        new Schema(
+            asList(
+                new Field(
+                    "intDefined",
+                    FieldType.nullable(new ArrowType.Int(32, true)),
+                    Collections.<Field>emptyList()),
+                new Field(
+                    "intNull",
+                    FieldType.nullable(new ArrowType.Int(32, true)),
+                    Collections.<Field>emptyList())));
     int count = 10;
     ArrowBuf[] values = new ArrowBuf[4];
     for (int i = 0; i < 4; i += 2) {
@@ -241,12 +241,14 @@ public void testLoadValidityBuffer() throws IOException {
      * values[3] - data buffer for second vector
      */
 
-    try (
-        ArrowRecordBatch recordBatch = new ArrowRecordBatch(count, asList(new ArrowFieldNode(count, 0),
-            new ArrowFieldNode(count, count)), asList(values[0], values[1], values[2], values[3]));
-        BufferAllocator finalVectorsAllocator = allocator.newChildAllocator("final vectors", 0, Integer.MAX_VALUE);
-        VectorSchemaRoot newRoot = VectorSchemaRoot.create(schema, finalVectorsAllocator);
-    ) {
+    try (ArrowRecordBatch recordBatch =
+            new ArrowRecordBatch(
+                count,
+                asList(new ArrowFieldNode(count, 0), new ArrowFieldNode(count, count)),
+                asList(values[0], values[1], values[2], values[3]));
+        BufferAllocator finalVectorsAllocator =
+            allocator.newChildAllocator("final vectors", 0, Integer.MAX_VALUE);
+        VectorSchemaRoot newRoot = VectorSchemaRoot.create(schema, finalVectorsAllocator); ) {
 
       // load it
       VectorLoader vectorLoader = new VectorLoader(newRoot);
@@ -256,9 +258,9 @@ public void testLoadValidityBuffer() throws IOException {
       IntVector intDefinedVector = (IntVector) newRoot.getVector("intDefined");
       IntVector intNullVector = (IntVector) newRoot.getVector("intNull");
       for (int i = 0; i < count; i++) {
-        assertFalse("#" + i, intDefinedVector.isNull(i));
-        assertEquals("#" + i, i, intDefinedVector.get(i));
-        assertTrue("#" + i, intNullVector.isNull(i));
+        assertFalse(intDefinedVector.isNull(i), "#" + i);
+        assertEquals(i, intDefinedVector.get(i), "#" + i);
+        assertTrue(intNullVector.isNull(i), "#" + i);
       }
       intDefinedVector.setSafe(count + 10, 1234);
       assertTrue(intDefinedVector.isNull(count + 1));
@@ -287,15 +289,20 @@ public void testLoadValidityBuffer() throws IOException {
   @Test
   public void testUnloadLoadDuplicates() throws IOException {
     int count = 10;
-    Schema schema = new Schema(asList(
-        new Field("duplicate", FieldType.nullable(new ArrowType.Int(32, true)), Collections.<Field>emptyList()),
-        new Field("duplicate", FieldType.nullable(new ArrowType.Int(32, true)), Collections.<Field>emptyList())
-    ));
-
-    try (
-        BufferAllocator originalVectorsAllocator =
-            allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
-    ) {
+    Schema schema =
+        new Schema(
+            asList(
+                new Field(
+                    "duplicate",
+                    FieldType.nullable(new ArrowType.Int(32, true)),
+                    Collections.<Field>emptyList()),
+                new Field(
+                    "duplicate",
+                    FieldType.nullable(new ArrowType.Int(32, true)),
+                    Collections.<Field>emptyList())));
+
+    try (BufferAllocator originalVectorsAllocator =
+        allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE); ) {
       List<FieldVector> sources = new ArrayList<>();
       for (Field field : schema.getFields()) {
         FieldVector vector = field.createVector(originalVectorsAllocator);
@@ -311,21 +318,21 @@ public void testUnloadLoadDuplicates() throws IOException {
       try (VectorSchemaRoot root = new VectorSchemaRoot(schema.getFields(), sources, count)) {
         VectorUnloader vectorUnloader = new VectorUnloader(root);
         try (ArrowRecordBatch recordBatch = vectorUnloader.getRecordBatch();
-             BufferAllocator finalVectorsAllocator =
+            BufferAllocator finalVectorsAllocator =
                 allocator.newChildAllocator("final vectors", 0, Integer.MAX_VALUE);
-             VectorSchemaRoot newRoot = VectorSchemaRoot.create(schema, finalVectorsAllocator);) {
+            VectorSchemaRoot newRoot = VectorSchemaRoot.create(schema, finalVectorsAllocator); ) {
           // load it
           VectorLoader vectorLoader = new VectorLoader(newRoot);
           vectorLoader.load(recordBatch);
 
           List<FieldVector> targets = newRoot.getFieldVectors();
-          Assert.assertEquals(sources.size(), targets.size());
+          assertEquals(sources.size(), targets.size());
           for (int k = 0; k < sources.size(); k++) {
             IntVector src = (IntVector) sources.get(k);
             IntVector tgt = (IntVector) targets.get(k);
-            Assert.assertEquals(src.getValueCount(), tgt.getValueCount());
+            assertEquals(src.getValueCount(), tgt.getValueCount());
             for (int i = 0; i < count; i++) {
-              Assert.assertEquals(src.get(i), tgt.get(i));
+              assertEquals(src.get(i), tgt.get(i));
             }
           }
         }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/compare/TestRangeEqualsVisitor.java b/java/vector/src/test/java/org/apache/arrow/vector/compare/TestRangeEqualsVisitor.java
index ab8c6c634891e..bab8c737f6a7d 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/compare/TestRangeEqualsVisitor.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/compare/TestRangeEqualsVisitor.java
@@ -14,16 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.compare;
 
 import static org.apache.arrow.vector.testing.ValueVectorDataPopulator.setVector;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.Charset;
 import java.util.Arrays;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.BigIntVector;
@@ -33,6 +31,7 @@
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.LargeVarCharVector;
 import org.apache.arrow.vector.VarCharVector;
+import org.apache.arrow.vector.ViewVarCharVector;
 import org.apache.arrow.vector.ZeroVector;
 import org.apache.arrow.vector.compare.util.ValueEpsilonEqualizers;
 import org.apache.arrow.vector.complex.DenseUnionVector;
@@ -53,16 +52,16 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 public class TestRangeEqualsVisitor {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
@@ -71,8 +70,11 @@ public void init() {
   private static final byte[] STR1 = "AAAAA1".getBytes(utf8Charset);
   private static final byte[] STR2 = "BBBBBBBBB2".getBytes(utf8Charset);
   private static final byte[] STR3 = "CCCC3".getBytes(utf8Charset);
+  private static final byte[] STR4 = "12345678901234A".getBytes(utf8Charset);
+  private static final byte[] STR5 = "A2345678901234ABC".getBytes(utf8Charset);
+  private static final byte[] STR6 = "AB45678901234ABCD".getBytes(utf8Charset);
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -80,7 +82,7 @@ public void terminate() throws Exception {
   @Test
   public void testIntVectorEqualsWithNull() {
     try (final IntVector vector1 = new IntVector("int", allocator);
-         final IntVector vector2 = new IntVector("int", allocator)) {
+        final IntVector vector2 = new IntVector("int", allocator)) {
 
       setVector(vector1, 1, 2);
       setVector(vector2, 1, null);
@@ -92,8 +94,8 @@ public void testIntVectorEqualsWithNull() {
   @Test
   public void testEqualsWithTypeChange() {
     try (final IntVector vector1 = new IntVector("vector", allocator);
-         final IntVector vector2 = new IntVector("vector", allocator);
-         final BigIntVector vector3 = new BigIntVector("vector", allocator)) {
+        final IntVector vector2 = new IntVector("vector", allocator);
+        final BigIntVector vector3 = new BigIntVector("vector", allocator)) {
 
       setVector(vector1, 1, 2);
       setVector(vector2, 1, 2);
@@ -109,7 +111,7 @@ public void testEqualsWithTypeChange() {
   @Test
   public void testBaseFixedWidthVectorRangeEqual() {
     try (final IntVector vector1 = new IntVector("int", allocator);
-         final IntVector vector2 = new IntVector("int", allocator)) {
+        final IntVector vector2 = new IntVector("int", allocator)) {
 
       setVector(vector1, 1, 2, 3, 4, 5);
       setVector(vector2, 11, 2, 3, 4, 55);
@@ -122,7 +124,7 @@ public void testBaseFixedWidthVectorRangeEqual() {
   @Test
   public void testBaseVariableVectorRangeEquals() {
     try (final VarCharVector vector1 = new VarCharVector("varchar", allocator);
-         final VarCharVector vector2 = new VarCharVector("varchar", allocator)) {
+        final VarCharVector vector2 = new VarCharVector("varchar", allocator)) {
 
       setVector(vector1, STR1, STR2, STR3, STR2, STR1);
       setVector(vector2, STR1, STR2, STR3, STR2, STR1);
@@ -132,10 +134,59 @@ public void testBaseVariableVectorRangeEquals() {
     }
   }
 
+  @Test
+  public void testBaseVariableViewVectorRangeEquals() {
+    try (final ViewVarCharVector vector1 = new ViewVarCharVector("varchar", allocator);
+        final ViewVarCharVector vector2 = new ViewVarCharVector("varchar", allocator)) {
+
+      setVector(vector1, STR1, STR2, STR4, STR3, STR2, STR5, STR1, STR6, STR1, STR2, STR4);
+      setVector(vector2, STR1, STR2, STR4, STR3, STR2, STR5, STR1, STR6, STR1, STR2, STR4);
+
+      RangeEqualsVisitor visitor = new RangeEqualsVisitor(vector1, vector2);
+      // inclusion of long string in the middle
+      assertTrue(visitor.rangeEquals(new Range(1, 1, 3)));
+      assertFalse(visitor.rangeEquals(new Range(0, 1, 4)));
+      // inclusion of long string at the start
+      assertTrue(visitor.rangeEquals(new Range(2, 2, 4)));
+      assertFalse(visitor.rangeEquals(new Range(2, 5, 4)));
+      // inclusion of long string at the end
+      assertTrue(visitor.rangeEquals(new Range(4, 4, 4)));
+      // unequal range
+      assertTrue(visitor.rangeEquals(new Range(8, 0, 3)));
+      assertFalse(visitor.rangeEquals(new Range(4, 5, 3)));
+
+      // checking the same ranges when nulls are set
+
+      vector1.setNull(1);
+      vector2.setNull(1);
+
+      vector1.setNull(3);
+      vector2.setNull(3);
+
+      vector1.setNull(5);
+      vector2.setNull(5);
+
+      vector1.setNull(9);
+      vector2.setNull(9);
+
+      // inclusion of long string in the middle
+      assertTrue(visitor.rangeEquals(new Range(1, 1, 3)));
+      assertFalse(visitor.rangeEquals(new Range(0, 1, 4)));
+      // inclusion of long string at the start
+      assertTrue(visitor.rangeEquals(new Range(2, 2, 4)));
+      assertFalse(visitor.rangeEquals(new Range(2, 5, 4)));
+      // inclusion of long string at the end
+      assertTrue(visitor.rangeEquals(new Range(4, 4, 4)));
+      // unequal range
+      assertTrue(visitor.rangeEquals(new Range(8, 0, 3)));
+      assertFalse(visitor.rangeEquals(new Range(4, 5, 3)));
+    }
+  }
+
   @Test
   public void testListVectorWithDifferentChild() {
     try (final ListVector vector1 = ListVector.empty("list", allocator);
-         final ListVector vector2 = ListVector.empty("list", allocator);) {
+        final ListVector vector2 = ListVector.empty("list", allocator); ) {
 
       vector1.allocateNew();
       vector1.initializeChildrenFromFields(
@@ -153,12 +204,12 @@ public void testListVectorWithDifferentChild() {
   @Test
   public void testListVectorRangeEquals() {
     try (final ListVector vector1 = ListVector.empty("list", allocator);
-         final ListVector vector2 = ListVector.empty("list", allocator);) {
+        final ListVector vector2 = ListVector.empty("list", allocator); ) {
 
       UnionListWriter writer1 = vector1.getWriter();
       writer1.allocate();
 
-      //set some values
+      // set some values
       writeListVector(writer1, new int[] {1, 2});
       writeListVector(writer1, new int[] {3, 4});
       writeListVector(writer1, new int[] {5, 6});
@@ -169,7 +220,7 @@ public void testListVectorRangeEquals() {
       UnionListWriter writer2 = vector2.getWriter();
       writer2.allocate();
 
-      //set some values
+      // set some values
       writeListVector(writer2, new int[] {0, 0});
       writeListVector(writer2, new int[] {3, 4});
       writeListVector(writer2, new int[] {5, 6});
@@ -185,16 +236,16 @@ public void testListVectorRangeEquals() {
   @Test
   public void testBitVectorRangeEquals() {
     try (final BitVector vector1 = new BitVector("v1", allocator);
-         final BitVector vector2 = new BitVector("v2", allocator);) {
+        final BitVector vector2 = new BitVector("v2", allocator); ) {
 
-      boolean[] v1 = new boolean[]{true, false, true, true, true};
-      boolean[] v2 = new boolean[]{false, true, true, true, false};
+      boolean[] v1 = new boolean[] {true, false, true, true, true};
+      boolean[] v2 = new boolean[] {false, true, true, true, false};
       vector1.setValueCount(5);
-      for (int i = 0; i < 5; i ++) {
+      for (int i = 0; i < 5; i++) {
         vector1.set(i, v1[i] ? 1 : 0);
       }
       vector2.setValueCount(5);
-      for (int i = 0; i < 5; i ++) {
+      for (int i = 0; i < 5; i++) {
         vector2.set(i, v2[i] ? 1 : 0);
       }
 
@@ -207,12 +258,12 @@ public void testBitVectorRangeEquals() {
   @Test
   public void testFixedSizeListVectorRangeEquals() {
     try (final FixedSizeListVector vector1 = FixedSizeListVector.empty("list", 2, allocator);
-         final FixedSizeListVector vector2 = FixedSizeListVector.empty("list", 2, allocator);) {
+        final FixedSizeListVector vector2 = FixedSizeListVector.empty("list", 2, allocator); ) {
 
       UnionFixedSizeListWriter writer1 = vector1.getWriter();
       writer1.allocate();
 
-      //set some values
+      // set some values
       writeFixedSizeListVector(writer1, new int[] {1, 2});
       writeFixedSizeListVector(writer1, new int[] {3, 4});
       writeFixedSizeListVector(writer1, new int[] {5, 6});
@@ -223,7 +274,7 @@ public void testFixedSizeListVectorRangeEquals() {
       UnionFixedSizeListWriter writer2 = vector2.getWriter();
       writer2.allocate();
 
-      //set some values
+      // set some values
       writeFixedSizeListVector(writer2, new int[] {0, 0});
       writeFixedSizeListVector(writer2, new int[] {3, 4});
       writeFixedSizeListVector(writer2, new int[] {5, 6});
@@ -240,27 +291,35 @@ public void testFixedSizeListVectorRangeEquals() {
   @Test
   public void testLargeVariableWidthVectorRangeEquals() {
     try (final LargeVarCharVector vector1 = new LargeVarCharVector("vector1", allocator);
-         final LargeVarCharVector vector2 = new LargeVarCharVector("vector2", allocator)) {
+        final LargeVarCharVector vector2 = new LargeVarCharVector("vector2", allocator)) {
       setVector(vector1, "aaa", "bbb", "ccc", null, "ddd");
       setVector(vector2, "ccc", "aaa", "bbb", null, "ddd");
 
-      RangeEqualsVisitor visitor = new RangeEqualsVisitor(vector1, vector2,
-          (v1, v2) -> new TypeEqualsVisitor(v2, /*check name*/ false, /*check metadata*/ false).equals(v1));
+      RangeEqualsVisitor visitor =
+          new RangeEqualsVisitor(
+              vector1,
+              vector2,
+              (v1, v2) ->
+                  new TypeEqualsVisitor(v2, /*check name*/ false, /*check metadata*/ false)
+                      .equals(v1));
 
-      assertFalse(visitor.rangeEquals(new Range(/*left start*/ 0, /*right start*/ 0, /*length*/ 1)));
+      assertFalse(
+          visitor.rangeEquals(new Range(/*left start*/ 0, /*right start*/ 0, /*length*/ 1)));
       assertTrue(visitor.rangeEquals(new Range(/*left start*/ 0, /*right start*/ 1, /*length*/ 1)));
-      assertFalse(visitor.rangeEquals(new Range(/*left start*/ 0, /*right start*/ 0, /*length*/ 3)));
+      assertFalse(
+          visitor.rangeEquals(new Range(/*left start*/ 0, /*right start*/ 0, /*length*/ 3)));
       assertTrue(visitor.rangeEquals(new Range(/*left start*/ 0, /*right start*/ 1, /*length*/ 2)));
       assertTrue(visitor.rangeEquals(new Range(/*left start*/ 3, /*right start*/ 3, /*length*/ 1)));
       assertTrue(visitor.rangeEquals(new Range(/*left start*/ 3, /*right start*/ 3, /*length*/ 2)));
-      assertFalse(visitor.rangeEquals(new Range(/*left start*/ 2, /*right start*/ 2, /*length*/ 2)));
+      assertFalse(
+          visitor.rangeEquals(new Range(/*left start*/ 2, /*right start*/ 2, /*length*/ 2)));
     }
   }
 
   @Test
   public void testStructVectorRangeEquals() {
     try (final StructVector vector1 = StructVector.empty("struct", allocator);
-         final StructVector vector2 = StructVector.empty("struct", allocator);) {
+        final StructVector vector2 = StructVector.empty("struct", allocator); ) {
       vector1.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
       vector1.addOrGet("f1", FieldType.nullable(new ArrowType.Int(64, true)), BigIntVector.class);
       vector2.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
@@ -293,9 +352,10 @@ public void testStructVectorRangeEquals() {
 
   @Test
   public void testUnionVectorRangeEquals() {
-    try (final UnionVector vector1 = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);
-         final UnionVector vector2 =
-             new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);) {
+    try (final UnionVector vector1 =
+            new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);
+        final UnionVector vector2 =
+            new UnionVector("union", allocator, /* field type */ null, /* call-back */ null); ) {
 
       final NullableUInt4Holder uInt4Holder = new NullableUInt4Holder();
       uInt4Holder.value = 10;
@@ -331,13 +391,13 @@ public void testUnionVectorRangeEquals() {
   }
 
   /**
-   * Test comparing two union vectors.
-   * The two vectors are different in total, but have a range with equal values.
+   * Test comparing two union vectors. The two vectors are different in total, but have a range with
+   * equal values.
    */
   @Test
   public void testUnionVectorSubRangeEquals() {
     try (final UnionVector vector1 = new UnionVector("union", allocator, null, null);
-         final UnionVector vector2 = new UnionVector("union", allocator, null, null);) {
+        final UnionVector vector2 = new UnionVector("union", allocator, null, null); ) {
 
       final NullableUInt4Holder uInt4Holder = new NullableUInt4Holder();
       uInt4Holder.value = 10;
@@ -400,15 +460,19 @@ public void testDenseUnionVectorEquals() {
     float8Holder.value = 800D;
 
     try (DenseUnionVector vector1 = new DenseUnionVector("vector1", allocator, null, null);
-         DenseUnionVector vector2 = new DenseUnionVector("vector2", allocator, null, null)) {
+        DenseUnionVector vector2 = new DenseUnionVector("vector2", allocator, null, null)) {
       vector1.allocateNew();
       vector2.allocateNew();
 
       // populate vector1: {100, 200L, null, 400F, 800D}
-      byte intTypeId = vector1.registerNewTypeId(Field.nullable("int", Types.MinorType.INT.getType()));
-      byte longTypeId = vector1.registerNewTypeId(Field.nullable("long", Types.MinorType.BIGINT.getType()));
-      byte floatTypeId = vector1.registerNewTypeId(Field.nullable("float", Types.MinorType.FLOAT4.getType()));
-      byte doubleTypeId = vector1.registerNewTypeId(Field.nullable("double", Types.MinorType.FLOAT8.getType()));
+      byte intTypeId =
+          vector1.registerNewTypeId(Field.nullable("int", Types.MinorType.INT.getType()));
+      byte longTypeId =
+          vector1.registerNewTypeId(Field.nullable("long", Types.MinorType.BIGINT.getType()));
+      byte floatTypeId =
+          vector1.registerNewTypeId(Field.nullable("float", Types.MinorType.FLOAT4.getType()));
+      byte doubleTypeId =
+          vector1.registerNewTypeId(Field.nullable("double", Types.MinorType.FLOAT8.getType()));
 
       vector1.setTypeId(0, intTypeId);
       vector1.setSafe(0, intHolder);
@@ -426,9 +490,12 @@ public void testDenseUnionVectorEquals() {
 
       // populate vector2: {400F, null, 200L, null, 400F, 800D, 100}
       intTypeId = vector2.registerNewTypeId(Field.nullable("int", Types.MinorType.INT.getType()));
-      longTypeId = vector2.registerNewTypeId(Field.nullable("long", Types.MinorType.BIGINT.getType()));
-      floatTypeId = vector2.registerNewTypeId(Field.nullable("float", Types.MinorType.FLOAT4.getType()));
-      doubleTypeId = vector2.registerNewTypeId(Field.nullable("double", Types.MinorType.FLOAT8.getType()));
+      longTypeId =
+          vector2.registerNewTypeId(Field.nullable("long", Types.MinorType.BIGINT.getType()));
+      floatTypeId =
+          vector2.registerNewTypeId(Field.nullable("float", Types.MinorType.FLOAT4.getType()));
+      doubleTypeId =
+          vector2.registerNewTypeId(Field.nullable("double", Types.MinorType.FLOAT8.getType()));
 
       vector2.setTypeId(0, floatTypeId);
       vector2.setSafe(0, float4Holder);
@@ -476,11 +543,11 @@ public void testDenseUnionVectorEquals() {
     }
   }
 
-  @Ignore
+  @Disabled
   @Test
   public void testEqualsWithOutTypeCheck() {
     try (final IntVector intVector = new IntVector("int", allocator);
-         final ZeroVector zeroVector = new ZeroVector("zero")) {
+        final ZeroVector zeroVector = new ZeroVector("zero")) {
 
       assertTrue(VectorEqualsVisitor.vectorEquals(intVector, zeroVector, null));
       assertTrue(VectorEqualsVisitor.vectorEquals(zeroVector, intVector, null));
@@ -490,8 +557,8 @@ public void testEqualsWithOutTypeCheck() {
   @Test
   public void testFloat4ApproxEquals() {
     try (final Float4Vector vector1 = new Float4Vector("float", allocator);
-         final Float4Vector vector2 = new Float4Vector("float", allocator);
-         final Float4Vector vector3 = new Float4Vector("float", allocator)) {
+        final Float4Vector vector2 = new Float4Vector("float", allocator);
+        final Float4Vector vector3 = new Float4Vector("float", allocator)) {
 
       final float epsilon = 1.0E-6f;
       setVector(vector1, 1.1f, 2.2f);
@@ -511,8 +578,8 @@ public void testFloat4ApproxEquals() {
   @Test
   public void testFloat8ApproxEquals() {
     try (final Float8Vector vector1 = new Float8Vector("float", allocator);
-         final Float8Vector vector2 = new Float8Vector("float", allocator);
-         final Float8Vector vector3 = new Float8Vector("float", allocator)) {
+        final Float8Vector vector2 = new Float8Vector("float", allocator);
+        final Float8Vector vector3 = new Float8Vector("float", allocator)) {
 
       final float epsilon = 1.0E-6f;
       setVector(vector1, 1.1, 2.2);
@@ -530,18 +597,30 @@ public void testStructVectorApproxEquals() {
     try (final StructVector right = StructVector.empty("struct", allocator);
         final StructVector left1 = StructVector.empty("struct", allocator);
         final StructVector left2 = StructVector.empty("struct", allocator)) {
-      right.addOrGet("f0",
-          FieldType.nullable(new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)), Float4Vector.class);
-      right.addOrGet("f1",
-          FieldType.nullable(new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)), Float8Vector.class);
-      left1.addOrGet("f0",
-          FieldType.nullable(new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)), Float4Vector.class);
-      left1.addOrGet("f1",
-          FieldType.nullable(new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)), Float8Vector.class);
-      left2.addOrGet("f0",
-          FieldType.nullable(new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)), Float4Vector.class);
-      left2.addOrGet("f1",
-          FieldType.nullable(new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)), Float8Vector.class);
+      right.addOrGet(
+          "f0",
+          FieldType.nullable(new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
+          Float4Vector.class);
+      right.addOrGet(
+          "f1",
+          FieldType.nullable(new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
+          Float8Vector.class);
+      left1.addOrGet(
+          "f0",
+          FieldType.nullable(new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
+          Float4Vector.class);
+      left1.addOrGet(
+          "f1",
+          FieldType.nullable(new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
+          Float8Vector.class);
+      left2.addOrGet(
+          "f0",
+          FieldType.nullable(new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
+          Float4Vector.class);
+      left2.addOrGet(
+          "f1",
+          FieldType.nullable(new ArrowType.FloatingPoint(FloatingPointPrecision.DOUBLE)),
+          Float8Vector.class);
 
       final float epsilon = 1.0E-6f;
 
@@ -571,9 +650,12 @@ public void testStructVectorApproxEquals() {
 
   @Test
   public void testUnionVectorApproxEquals() {
-    try (final UnionVector right = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);
-         final UnionVector left1 = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);
-         final UnionVector left2 = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);) {
+    try (final UnionVector right =
+            new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);
+        final UnionVector left1 =
+            new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);
+        final UnionVector left2 =
+            new UnionVector("union", allocator, /* field type */ null, /* call-back */ null); ) {
 
       final NullableFloat4Holder float4Holder = new NullableFloat4Holder();
       float4Holder.value = 1.01f;
@@ -627,16 +709,18 @@ public void testDenseUnionVectorApproxEquals() {
     final double doubleEpsilon = 0.02;
 
     try (final DenseUnionVector vector1 = new DenseUnionVector("vector1", allocator, null, null);
-         final DenseUnionVector vector2 = new DenseUnionVector("vector2", allocator, null, null);
-         final DenseUnionVector vector3 = new DenseUnionVector("vector2", allocator, null, null)) {
+        final DenseUnionVector vector2 = new DenseUnionVector("vector2", allocator, null, null);
+        final DenseUnionVector vector3 = new DenseUnionVector("vector2", allocator, null, null)) {
 
       vector1.allocateNew();
       vector2.allocateNew();
       vector3.allocateNew();
 
       // populate vector1: {1.0f, 2.0D}
-      byte floatTypeId = vector1.registerNewTypeId(Field.nullable("float", Types.MinorType.FLOAT4.getType()));
-      byte doubleTypeId = vector1.registerNewTypeId(Field.nullable("double", Types.MinorType.FLOAT8.getType()));
+      byte floatTypeId =
+          vector1.registerNewTypeId(Field.nullable("float", Types.MinorType.FLOAT4.getType()));
+      byte doubleTypeId =
+          vector1.registerNewTypeId(Field.nullable("double", Types.MinorType.FLOAT8.getType()));
 
       float4Holder.value = 1.0f;
       vector1.setTypeId(0, floatTypeId);
@@ -647,8 +731,10 @@ public void testDenseUnionVectorApproxEquals() {
       vector1.setValueCount(2);
 
       // populate vector2: {1.01f, 2.01D}
-      floatTypeId = vector2.registerNewTypeId(Field.nullable("float", Types.MinorType.FLOAT4.getType()));
-      doubleTypeId = vector2.registerNewTypeId(Field.nullable("double", Types.MinorType.FLOAT8.getType()));
+      floatTypeId =
+          vector2.registerNewTypeId(Field.nullable("float", Types.MinorType.FLOAT4.getType()));
+      doubleTypeId =
+          vector2.registerNewTypeId(Field.nullable("double", Types.MinorType.FLOAT8.getType()));
 
       float4Holder.value = 1.01f;
       vector2.setTypeId(0, floatTypeId);
@@ -659,8 +745,10 @@ public void testDenseUnionVectorApproxEquals() {
       vector2.setValueCount(2);
 
       // populate vector3: {1.05f, 2.05D}
-      floatTypeId = vector3.registerNewTypeId(Field.nullable("float", Types.MinorType.FLOAT4.getType()));
-      doubleTypeId = vector3.registerNewTypeId(Field.nullable("double", Types.MinorType.FLOAT8.getType()));
+      floatTypeId =
+          vector3.registerNewTypeId(Field.nullable("float", Types.MinorType.FLOAT4.getType()));
+      doubleTypeId =
+          vector3.registerNewTypeId(Field.nullable("double", Types.MinorType.FLOAT8.getType()));
 
       float4Holder.value = 1.05f;
       vector3.setTypeId(0, floatTypeId);
@@ -674,19 +762,27 @@ public void testDenseUnionVectorApproxEquals() {
       Range range = new Range(0, 0, 2);
 
       // compare vector1 and vector2
-      ApproxEqualsVisitor approxEqualsVisitor = new ApproxEqualsVisitor(
-          vector1, vector2,
-          new ValueEpsilonEqualizers.Float4EpsilonEqualizer(floatEpsilon),
-          new ValueEpsilonEqualizers.Float8EpsilonEqualizer(doubleEpsilon),
-          (v1, v2) -> new TypeEqualsVisitor(v2, /* check name */ false, /* check meta */ true).equals(v1));
+      ApproxEqualsVisitor approxEqualsVisitor =
+          new ApproxEqualsVisitor(
+              vector1,
+              vector2,
+              new ValueEpsilonEqualizers.Float4EpsilonEqualizer(floatEpsilon),
+              new ValueEpsilonEqualizers.Float8EpsilonEqualizer(doubleEpsilon),
+              (v1, v2) ->
+                  new TypeEqualsVisitor(v2, /* check name */ false, /* check meta */ true)
+                      .equals(v1));
       assertTrue(approxEqualsVisitor.rangeEquals(range));
 
       // compare vector1 and vector3
-      approxEqualsVisitor = new ApproxEqualsVisitor(
-          vector1, vector3,
-          new ValueEpsilonEqualizers.Float4EpsilonEqualizer(floatEpsilon),
-          new ValueEpsilonEqualizers.Float8EpsilonEqualizer(doubleEpsilon),
-          (v1, v2) -> new TypeEqualsVisitor(v2, /* check name */ false, /* check meta */ true).equals(v1));
+      approxEqualsVisitor =
+          new ApproxEqualsVisitor(
+              vector1,
+              vector3,
+              new ValueEpsilonEqualizers.Float4EpsilonEqualizer(floatEpsilon),
+              new ValueEpsilonEqualizers.Float8EpsilonEqualizer(doubleEpsilon),
+              (v1, v2) ->
+                  new TypeEqualsVisitor(v2, /* check name */ false, /* check meta */ true)
+                      .equals(v1));
       assertFalse(approxEqualsVisitor.rangeEquals(range));
     }
   }
@@ -694,8 +790,8 @@ public void testDenseUnionVectorApproxEquals() {
   @Test
   public void testListVectorApproxEquals() {
     try (final ListVector right = ListVector.empty("list", allocator);
-         final ListVector left1 = ListVector.empty("list", allocator);
-         final ListVector left2 = ListVector.empty("list", allocator);) {
+        final ListVector left1 = ListVector.empty("list", allocator);
+        final ListVector left2 = ListVector.empty("list", allocator); ) {
 
       final float epsilon = 1.0E-6f;
 
@@ -739,7 +835,7 @@ private void writeStructVector(NullableStructWriter writer, float value1, double
 
   private void writeListVector(UnionListWriter writer, int[] values) {
     writer.startList();
-    for (int v: values) {
+    for (int v : values) {
       writer.integer().writeInt(v);
     }
     writer.endList();
@@ -747,7 +843,7 @@ private void writeListVector(UnionListWriter writer, int[] values) {
 
   private void writeFixedSizeListVector(UnionFixedSizeListWriter writer, int[] values) {
     writer.startList();
-    for (int v: values) {
+    for (int v : values) {
       writer.integer().writeInt(v);
     }
     writer.endList();
@@ -755,7 +851,7 @@ private void writeFixedSizeListVector(UnionFixedSizeListWriter writer, int[] val
 
   private void writeListVector(UnionListWriter writer, double[] values) {
     writer.startList();
-    for (double v: values) {
+    for (double v : values) {
       writer.float8().writeFloat8(v);
     }
     writer.endList();
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/compare/TestTypeEqualsVisitor.java b/java/vector/src/test/java/org/apache/arrow/vector/compare/TestTypeEqualsVisitor.java
index 62fa0336ea925..4cd3603e2071f 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/compare/TestTypeEqualsVisitor.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/compare/TestTypeEqualsVisitor.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.compare;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.BigIntVector;
@@ -30,6 +29,8 @@
 import org.apache.arrow.vector.Float8Vector;
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.VarCharVector;
+import org.apache.arrow.vector.ViewVarBinaryVector;
+import org.apache.arrow.vector.ViewVarCharVector;
 import org.apache.arrow.vector.complex.DenseUnionVector;
 import org.apache.arrow.vector.complex.ListVector;
 import org.apache.arrow.vector.complex.StructVector;
@@ -38,20 +39,20 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestTypeEqualsVisitor {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -59,7 +60,7 @@ public void terminate() throws Exception {
   @Test
   public void testTypeEqualsWithName() {
     try (final IntVector right = new IntVector("int", allocator);
-         final IntVector left1 = new IntVector("int", allocator);
+        final IntVector left1 = new IntVector("int", allocator);
         final IntVector left2 = new IntVector("int2", allocator)) {
 
       TypeEqualsVisitor visitor = new TypeEqualsVisitor(right);
@@ -72,14 +73,14 @@ public void testTypeEqualsWithName() {
   public void testTypeEqualsWithMetadata() {
     Map<String, String> metadata = new HashMap<>();
     metadata.put("key1", "value1");
-    FieldType typeWithoutMeta = new FieldType(true, new ArrowType.Int(32, true),
-        null, null);
-    FieldType typeWithMeta = new FieldType(true, new ArrowType.Int(32, true),
-        null, metadata);
+    FieldType typeWithoutMeta = new FieldType(true, new ArrowType.Int(32, true), null, null);
+    FieldType typeWithMeta = new FieldType(true, new ArrowType.Int(32, true), null, metadata);
 
-    try (IntVector right = (IntVector) typeWithoutMeta.createNewSingleVector("int", allocator, null);
-         IntVector left1 = (IntVector) typeWithoutMeta.createNewSingleVector("int", allocator, null);
-         IntVector left2 = (IntVector) typeWithMeta.createNewSingleVector("int", allocator, null)) {
+    try (IntVector right =
+            (IntVector) typeWithoutMeta.createNewSingleVector("int", allocator, null);
+        IntVector left1 =
+            (IntVector) typeWithoutMeta.createNewSingleVector("int", allocator, null);
+        IntVector left2 = (IntVector) typeWithMeta.createNewSingleVector("int", allocator, null)) {
 
       TypeEqualsVisitor visitor = new TypeEqualsVisitor(right);
       assertTrue(visitor.equals(left1));
@@ -90,8 +91,8 @@ public void testTypeEqualsWithMetadata() {
   @Test
   public void testListTypeEquals() {
     try (final ListVector right = ListVector.empty("list", allocator);
-         final ListVector left1 = ListVector.empty("list", allocator);
-         final ListVector left2 = ListVector.empty("list", allocator)) {
+        final ListVector left1 = ListVector.empty("list", allocator);
+        final ListVector left2 = ListVector.empty("list", allocator)) {
 
       right.addOrGetVector(FieldType.nullable(new ArrowType.Utf8()));
       left1.addOrGetVector(FieldType.nullable(new ArrowType.Utf8()));
@@ -106,8 +107,8 @@ public void testListTypeEquals() {
   @Test
   public void testStructTypeEquals() {
     try (final StructVector right = StructVector.empty("struct", allocator);
-         final StructVector left1 = StructVector.empty("struct", allocator);
-         final StructVector left2 = StructVector.empty("struct", allocator)) {
+        final StructVector left1 = StructVector.empty("struct", allocator);
+        final StructVector left2 = StructVector.empty("struct", allocator)) {
 
       right.addOrGet("child", FieldType.nullable(new ArrowType.Utf8()), VarCharVector.class);
       left1.addOrGet("child", FieldType.nullable(new ArrowType.Utf8()), VarCharVector.class);
@@ -121,9 +122,12 @@ public void testStructTypeEquals() {
 
   @Test
   public void testUnionTypeEquals() {
-    try (final UnionVector right = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);
-         final UnionVector left1 = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);
-         final UnionVector left2 = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null)) {
+    try (final UnionVector right =
+            new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);
+        final UnionVector left1 =
+            new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);
+        final UnionVector left2 =
+            new UnionVector("union", allocator, /* field type */ null, /* call-back */ null)) {
 
       right.addVector(new IntVector("int", allocator));
       left1.addVector(new IntVector("int", allocator));
@@ -138,15 +142,19 @@ public void testUnionTypeEquals() {
   @Test
   public void testDenseUnionTypeEquals() {
     try (DenseUnionVector vector1 = new DenseUnionVector("vector1", allocator, null, null);
-         DenseUnionVector vector2 = new DenseUnionVector("vector2", allocator, null, null)) {
+        DenseUnionVector vector2 = new DenseUnionVector("vector2", allocator, null, null)) {
       vector1.allocateNew();
       vector2.allocateNew();
 
       // set children for vector1
-      byte intTypeId = vector1.registerNewTypeId(Field.nullable("int", Types.MinorType.INT.getType()));
-      byte longTypeId = vector1.registerNewTypeId(Field.nullable("long", Types.MinorType.BIGINT.getType()));
-      byte floatTypeId = vector1.registerNewTypeId(Field.nullable("float", Types.MinorType.FLOAT4.getType()));
-      byte doubleTypeId = vector1.registerNewTypeId(Field.nullable("double", Types.MinorType.FLOAT8.getType()));
+      byte intTypeId =
+          vector1.registerNewTypeId(Field.nullable("int", Types.MinorType.INT.getType()));
+      byte longTypeId =
+          vector1.registerNewTypeId(Field.nullable("long", Types.MinorType.BIGINT.getType()));
+      byte floatTypeId =
+          vector1.registerNewTypeId(Field.nullable("float", Types.MinorType.FLOAT4.getType()));
+      byte doubleTypeId =
+          vector1.registerNewTypeId(Field.nullable("double", Types.MinorType.FLOAT8.getType()));
 
       vector1.addVector(floatTypeId, new Float4Vector("", allocator));
       vector1.addVector(longTypeId, new BigIntVector("", allocator));
@@ -155,9 +163,12 @@ public void testDenseUnionTypeEquals() {
 
       // set children for vector2
       intTypeId = vector2.registerNewTypeId(Field.nullable("int", Types.MinorType.INT.getType()));
-      longTypeId = vector2.registerNewTypeId(Field.nullable("long", Types.MinorType.BIGINT.getType()));
-      floatTypeId = vector2.registerNewTypeId(Field.nullable("float", Types.MinorType.FLOAT4.getType()));
-      doubleTypeId = vector2.registerNewTypeId(Field.nullable("double", Types.MinorType.FLOAT8.getType()));
+      longTypeId =
+          vector2.registerNewTypeId(Field.nullable("long", Types.MinorType.BIGINT.getType()));
+      floatTypeId =
+          vector2.registerNewTypeId(Field.nullable("float", Types.MinorType.FLOAT4.getType()));
+      doubleTypeId =
+          vector2.registerNewTypeId(Field.nullable("double", Types.MinorType.FLOAT8.getType()));
 
       // add vectors in a different order
       vector2.addVector(intTypeId, new IntVector("", allocator));
@@ -176,4 +187,43 @@ public void testDenseUnionTypeEquals() {
       assertFalse(typeVisitor.equals(vector1));
     }
   }
+
+  @Test
+  public void testStringViewTypeEquals() {
+    try (final ViewVarCharVector varchar1 = new ViewVarCharVector("varchar1", allocator);
+        final ViewVarCharVector varchar2 = new ViewVarCharVector("varchar2", allocator);
+        final ViewVarBinaryVector binary = new ViewVarBinaryVector("binary", allocator)) {
+      final int valueCount = 2;
+      final byte[] str0 = "apache".getBytes(StandardCharsets.UTF_8);
+      final byte[] str1 = "arrow".getBytes(StandardCharsets.UTF_8);
+
+      // add elements for varchar1
+      varchar1.allocateNew(48, valueCount);
+      varchar1.set(0, str0);
+      varchar1.set(1, str1);
+      varchar1.setValueCount(valueCount);
+
+      // add elements for varchar2 in a difference order
+      varchar2.allocateNew(48, valueCount);
+      varchar2.set(0, str1);
+      varchar2.set(1, str0);
+      varchar2.setValueCount(valueCount);
+
+      // add elements for binary
+      binary.allocateNew(48, valueCount);
+      binary.set(0, str0);
+      binary.set(1, str1);
+      binary.setValueCount(valueCount);
+
+      // compare ignore check name
+      TypeEqualsVisitor visitor =
+          new TypeEqualsVisitor(varchar1, /* check name */ false, /* check meta data */ true);
+      assertTrue(visitor.equals(varchar2));
+      assertFalse(visitor.equals(binary));
+
+      // if we check names, the types should be different
+      visitor = new TypeEqualsVisitor(varchar1, /* check name */ true, /* check meta data */ true);
+      assertFalse(visitor.equals(varchar2));
+    }
+  }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/complex/TestDenseUnionBufferSize.java b/java/vector/src/test/java/org/apache/arrow/vector/complex/TestDenseUnionBufferSize.java
index 82ef7a479d05c..b692a205fc12f 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/complex/TestDenseUnionBufferSize.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/complex/TestDenseUnionBufferSize.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -35,14 +35,22 @@ public class TestDenseUnionBufferSize {
   @Test
   public void testBufferSize() {
     try (BufferAllocator allocator = new RootAllocator();
-         DenseUnionVector duv = new DenseUnionVector("duv", allocator,
-                 FieldType.nullable(new ArrowType.Union(UnionMode.Dense, null)), null)) {
+        DenseUnionVector duv =
+            new DenseUnionVector(
+                "duv",
+                allocator,
+                FieldType.nullable(new ArrowType.Union(UnionMode.Dense, null)),
+                null)) {
 
       byte aTypeId = 42;
       byte bTypeId = 7;
 
-      duv.addVector(aTypeId, new IntVector("a", FieldType.notNullable(new ArrowType.Int(32, true)), allocator));
-      duv.addVector(bTypeId, new VarBinaryVector("b", FieldType.notNullable(new ArrowType.Binary()), allocator));
+      duv.addVector(
+          aTypeId,
+          new IntVector("a", FieldType.notNullable(new ArrowType.Int(32, true)), allocator));
+      duv.addVector(
+          bTypeId,
+          new VarBinaryVector("b", FieldType.notNullable(new ArrowType.Binary()), allocator));
 
       NullableIntHolder intHolder = new NullableIntHolder();
       NullableVarBinaryHolder varBinaryHolder = new NullableVarBinaryHolder();
@@ -70,12 +78,15 @@ public void testBufferSize() {
 
       long overhead = DenseUnionVector.TYPE_WIDTH + DenseUnionVector.OFFSET_WIDTH;
 
-      assertEquals(overhead * count + intVector.getBufferSize() + varBinaryVector.getBufferSize(),
-              duv.getBufferSize());
-
-      assertEquals(overhead * (aCount + 1) + intVector.getBufferSizeFor(aCount) + varBinaryVector.getBufferSizeFor(1),
-              duv.getBufferSizeFor(aCount + 1));
+      assertEquals(
+          overhead * count + intVector.getBufferSize() + varBinaryVector.getBufferSize(),
+          duv.getBufferSize());
 
+      assertEquals(
+          overhead * (aCount + 1)
+              + intVector.getBufferSizeFor(aCount)
+              + varBinaryVector.getBufferSizeFor(1),
+          duv.getBufferSizeFor(aCount + 1));
     }
   }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/complex/impl/TestComplexCopier.java b/java/vector/src/test/java/org/apache/arrow/vector/complex/impl/TestComplexCopier.java
index 29f25170332a2..3bc02c602983b 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/complex/impl/TestComplexCopier.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/complex/impl/TestComplexCopier.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.impl;
 
-import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.math.BigDecimal;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.DecimalVector;
@@ -39,9 +37,9 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.util.DecimalUtility;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestComplexCopier {
 
@@ -49,12 +47,12 @@ public class TestComplexCopier {
 
   private static final int COUNT = 100;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -62,7 +60,7 @@ public void terminate() throws Exception {
   @Test
   public void testCopyFixedSizeListVector() {
     try (FixedSizeListVector from = FixedSizeListVector.empty("v", 3, allocator);
-         FixedSizeListVector to = FixedSizeListVector.empty("v", 3, allocator)) {
+        FixedSizeListVector to = FixedSizeListVector.empty("v", 3, allocator)) {
 
       from.addOrGetVector(FieldType.nullable(Types.MinorType.INT.getType()));
       to.addOrGetVector(FieldType.nullable(Types.MinorType.INT.getType()));
@@ -90,14 +88,13 @@ public void testCopyFixedSizeListVector() {
 
       // validate equals
       assertTrue(VectorEqualsVisitor.vectorEquals(from, to));
-
     }
   }
 
   @Test
   public void testInvalidCopyFixedSizeListVector() {
     try (FixedSizeListVector from = FixedSizeListVector.empty("v", 3, allocator);
-         FixedSizeListVector to = FixedSizeListVector.empty("v", 2, allocator)) {
+        FixedSizeListVector to = FixedSizeListVector.empty("v", 2, allocator)) {
 
       from.addOrGetVector(FieldType.nullable(Types.MinorType.INT.getType()));
       to.addOrGetVector(FieldType.nullable(Types.MinorType.INT.getType()));
@@ -117,8 +114,8 @@ public void testInvalidCopyFixedSizeListVector() {
       // copy values
       FieldReader in = from.getReader();
       FieldWriter out = to.getWriter();
-      IllegalStateException e = assertThrows(IllegalStateException.class,
-          () -> ComplexCopier.copy(in, out));
+      IllegalStateException e =
+          assertThrows(IllegalStateException.class, () -> ComplexCopier.copy(in, out));
       assertTrue(e.getMessage().contains("greater than listSize"));
     }
   }
@@ -126,7 +123,7 @@ public void testInvalidCopyFixedSizeListVector() {
   @Test
   public void testCopyMapVector() {
     try (final MapVector from = MapVector.empty("v", allocator, false);
-         final MapVector to = MapVector.empty("v", allocator, false)) {
+        final MapVector to = MapVector.empty("v", allocator, false)) {
 
       from.allocateNew();
 
@@ -165,7 +162,7 @@ public void testCopyMapVector() {
   @Test
   public void testCopyListVector() {
     try (ListVector from = ListVector.empty("v", allocator);
-         ListVector to = ListVector.empty("v", allocator)) {
+        ListVector to = ListVector.empty("v", allocator)) {
 
       UnionListWriter listWriter = from.getWriter();
       listWriter.allocate();
@@ -204,14 +201,13 @@ public void testCopyListVector() {
 
       // validate equals
       assertTrue(VectorEqualsVisitor.vectorEquals(from, to));
-
     }
   }
 
   @Test
   public void testCopyListVectorToANonEmptyList() {
     try (ListVector from = ListVector.empty("v", allocator);
-         ListVector to = ListVector.empty("v", allocator)) {
+        ListVector to = ListVector.empty("v", allocator)) {
 
       UnionListWriter listWriter = from.getWriter();
       listWriter.allocate();
@@ -262,7 +258,7 @@ public void testCopyListVectorToANonEmptyList() {
   @Test
   public void testCopyListVectorWithNulls() {
     try (ListVector from = ListVector.empty("v", allocator);
-         ListVector to = ListVector.empty("v", allocator)) {
+        ListVector to = ListVector.empty("v", allocator)) {
 
       UnionListWriter listWriter = from.getWriter();
       listWriter.allocate();
@@ -303,7 +299,7 @@ public void testCopyListVectorWithNulls() {
   @Test
   public void testCopyListOfListVectorWithNulls() {
     try (ListVector from = ListVector.empty("v", allocator);
-         ListVector to = ListVector.empty("v", allocator);) {
+        ListVector to = ListVector.empty("v", allocator); ) {
 
       UnionListWriter listWriter = from.getWriter();
       listWriter.allocate();
@@ -358,7 +354,7 @@ public void testCopyListOfListVectorWithNulls() {
   @Test
   public void testCopyListOStructVectorWithNulls() {
     try (ListVector from = ListVector.empty("v", allocator);
-         ListVector to = ListVector.empty("v", allocator);) {
+        ListVector to = ListVector.empty("v", allocator); ) {
 
       UnionListWriter listWriter = from.getWriter();
       listWriter.allocate();
@@ -408,7 +404,7 @@ public void testCopyListOStructVectorWithNulls() {
   @Test
   public void testCopyListOfListOfStructVectorWithNulls() {
     try (ListVector from = ListVector.empty("v", allocator);
-         ListVector to = ListVector.empty("v", allocator);) {
+        ListVector to = ListVector.empty("v", allocator); ) {
 
       UnionListWriter listWriter = from.getWriter();
       listWriter.allocate();
@@ -485,7 +481,7 @@ public void testCopyListOfListOfStructVectorWithNulls() {
   @Test
   public void testMapWithListValue() throws Exception {
     try (MapVector from = MapVector.empty("map", allocator, false);
-         MapVector to = MapVector.empty("map", allocator, false)) {
+        MapVector to = MapVector.empty("map", allocator, false)) {
 
       UnionMapWriter mapWriter = from.getWriter();
       BaseWriter.ListWriter valueWriter;
@@ -573,7 +569,7 @@ public void testMapWithListValue() throws Exception {
   @Test
   public void testCopyFixedSizedListOfDecimalsVector() {
     try (FixedSizeListVector from = FixedSizeListVector.empty("v", 4, allocator);
-         FixedSizeListVector to = FixedSizeListVector.empty("v", 4, allocator)) {
+        FixedSizeListVector to = FixedSizeListVector.empty("v", 4, allocator)) {
       from.addOrGetVector(FieldType.nullable(new ArrowType.Decimal(3, 0, 128)));
       to.addOrGetVector(FieldType.nullable(new ArrowType.Decimal(3, 0, 128)));
 
@@ -587,17 +583,21 @@ public void testCopyFixedSizedListOfDecimalsVector() {
         writer.startList();
         writer.decimal().writeDecimal(BigDecimal.valueOf(i));
 
-        DecimalUtility.writeBigDecimalToArrowBuf(new BigDecimal(i * 2), holder.buffer, 0, DecimalVector.TYPE_WIDTH);
+        DecimalUtility.writeBigDecimalToArrowBuf(
+            new BigDecimal(i * 2), holder.buffer, 0, DecimalVector.TYPE_WIDTH);
         holder.start = 0;
         holder.scale = 0;
         holder.precision = 3;
         writer.decimal().write(holder);
 
-        DecimalUtility.writeBigDecimalToArrowBuf(new BigDecimal(i * 3), holder.buffer, 0, DecimalVector.TYPE_WIDTH);
+        DecimalUtility.writeBigDecimalToArrowBuf(
+            new BigDecimal(i * 3), holder.buffer, 0, DecimalVector.TYPE_WIDTH);
         writer.decimal().writeDecimal(0, holder.buffer, arrowType);
 
-        writer.decimal().writeBigEndianBytesToDecimal(BigDecimal.valueOf(i * 4).unscaledValue().toByteArray(),
-            arrowType);
+        writer
+            .decimal()
+            .writeBigEndianBytesToDecimal(
+                BigDecimal.valueOf(i * 4).unscaledValue().toByteArray(), arrowType);
 
         writer.endList();
       }
@@ -622,7 +622,7 @@ public void testCopyFixedSizedListOfDecimalsVector() {
   @Test
   public void testCopyUnionListWithDecimal() {
     try (ListVector from = ListVector.empty("v", allocator);
-         ListVector to = ListVector.empty("v", allocator)) {
+        ListVector to = ListVector.empty("v", allocator)) {
 
       UnionListWriter listWriter = from.getWriter();
       listWriter.allocate();
@@ -633,8 +633,11 @@ public void testCopyUnionListWithDecimal() {
 
         listWriter.decimal().writeDecimal(BigDecimal.valueOf(i * 2));
         listWriter.integer().writeInt(i);
-        listWriter.decimal().writeBigEndianBytesToDecimal(BigDecimal.valueOf(i * 3).unscaledValue().toByteArray(),
-            new ArrowType.Decimal(3, 0, 128));
+        listWriter
+            .decimal()
+            .writeBigEndianBytesToDecimal(
+                BigDecimal.valueOf(i * 3).unscaledValue().toByteArray(),
+                new ArrowType.Decimal(3, 0, 128));
 
         listWriter.endList();
       }
@@ -653,14 +656,13 @@ public void testCopyUnionListWithDecimal() {
 
       // validate equals
       assertTrue(VectorEqualsVisitor.vectorEquals(from, to));
-
     }
   }
 
   @Test
   public void testCopyStructVector() {
     try (final StructVector from = StructVector.empty("v", allocator);
-         final StructVector to = StructVector.empty("v", allocator)) {
+        final StructVector to = StructVector.empty("v", allocator)) {
 
       from.allocateNewSafe();
 
@@ -674,8 +676,11 @@ public void testCopyStructVector() {
         innerStructWriter.start();
         innerStructWriter.integer("innerint").writeInt(i * 3);
         innerStructWriter.decimal("innerdec", 0, 38).writeDecimal(BigDecimal.valueOf(i * 4));
-        innerStructWriter.decimal("innerdec", 0, 38).writeBigEndianBytesToDecimal(BigDecimal.valueOf(i * 4)
-            .unscaledValue().toByteArray(), new ArrowType.Decimal(3, 0, 128));
+        innerStructWriter
+            .decimal("innerdec", 0, 38)
+            .writeBigEndianBytesToDecimal(
+                BigDecimal.valueOf(i * 4).unscaledValue().toByteArray(),
+                new ArrowType.Decimal(3, 0, 128));
         innerStructWriter.end();
         structWriter.end();
       }
@@ -700,7 +705,7 @@ public void testCopyStructVector() {
   @Test
   public void testCopyDecimalVectorWrongScale() {
     try (FixedSizeListVector from = FixedSizeListVector.empty("v", 3, allocator);
-         FixedSizeListVector to = FixedSizeListVector.empty("v", 3, allocator)) {
+        FixedSizeListVector to = FixedSizeListVector.empty("v", 3, allocator)) {
       from.addOrGetVector(FieldType.nullable(new ArrowType.Decimal(3, 2, 128)));
       to.addOrGetVector(FieldType.nullable(new ArrowType.Decimal(3, 1, 128)));
 
@@ -718,16 +723,17 @@ public void testCopyDecimalVectorWrongScale() {
       // copy values
       FieldReader in = from.getReader();
       FieldWriter out = to.getWriter();
-      UnsupportedOperationException e = assertThrows(UnsupportedOperationException.class,
-          () -> ComplexCopier.copy(in, out));
-      assertTrue(e.getMessage().contains("BigDecimal scale must equal that in the Arrow vector: 2 != 1"));
+      UnsupportedOperationException e =
+          assertThrows(UnsupportedOperationException.class, () -> ComplexCopier.copy(in, out));
+      assertTrue(
+          e.getMessage().contains("BigDecimal scale must equal that in the Arrow vector: 2 != 1"));
     }
   }
 
   @Test
   public void testCopyStructVectorWithNulls() {
     try (StructVector from = StructVector.empty("v", allocator);
-         StructVector to = StructVector.empty("v", allocator)) {
+        StructVector to = StructVector.empty("v", allocator)) {
 
       NullableStructWriter writer = from.getWriter();
 
@@ -764,7 +770,7 @@ public void testCopyStructVectorWithNulls() {
   @Test
   public void testCopyStructOfMap() {
     try (final StructVector from = StructVector.empty("v", allocator);
-         final StructVector to = StructVector.empty("v", allocator);) {
+        final StructVector to = StructVector.empty("v", allocator); ) {
 
       from.allocateNew();
 
@@ -802,7 +808,7 @@ public void testCopyStructOfMap() {
   @Test
   public void testCopyMapVectorWithMapValue() {
     try (final MapVector from = MapVector.empty("v", allocator, false);
-         final MapVector to = MapVector.empty("v", allocator, false)) {
+        final MapVector to = MapVector.empty("v", allocator, false)) {
 
       from.allocateNew();
 
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/complex/impl/TestPromotableWriter.java b/java/vector/src/test/java/org/apache/arrow/vector/complex/impl/TestPromotableWriter.java
index b7fc681c16118..19b26b6d0ed07 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/complex/impl/TestPromotableWriter.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/complex/impl/TestPromotableWriter.java
@@ -14,19 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.impl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.DirtyRootAllocator;
@@ -50,21 +48,21 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.util.Text;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestPromotableWriter {
   private static final String EMPTY_SCHEMA_PATH = "";
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new DirtyRootAllocator(Long.MAX_VALUE, (byte) 100);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -72,9 +70,10 @@ public void terminate() throws Exception {
   @Test
   public void testPromoteToUnion() throws Exception {
 
-    try (final NonNullableStructVector container = NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
-         final StructVector v = container.addOrGetStruct("test");
-         final PromotableWriter writer = new PromotableWriter(v, container)) {
+    try (final NonNullableStructVector container =
+            NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
+        final StructVector v = container.addOrGetStruct("test");
+        final PromotableWriter writer = new PromotableWriter(v, container)) {
 
       container.allocateNew();
 
@@ -128,35 +127,38 @@ public void testPromoteToUnion() throws Exception {
 
       final UnionVector uv = v.getChild("A", UnionVector.class);
 
-      assertFalse("0 shouldn't be null", uv.isNull(0));
+      assertFalse(uv.isNull(0), "0 shouldn't be null");
       assertEquals(false, uv.getObject(0));
 
-      assertFalse("1 shouldn't be null", uv.isNull(1));
+      assertFalse(uv.isNull(1), "1 shouldn't be null");
       assertEquals(true, uv.getObject(1));
 
-      assertFalse("2 shouldn't be null", uv.isNull(2));
+      assertFalse(uv.isNull(2), "2 shouldn't be null");
       assertEquals(10, uv.getObject(2));
 
-      assertNull("3 should be null", uv.getObject(3));
+      assertNull(uv.getObject(3), "3 should be null");
 
-      assertFalse("4 shouldn't be null", uv.isNull(4));
+      assertFalse(uv.isNull(4), "4 shouldn't be null");
       assertEquals(100, uv.getObject(4));
 
-      assertFalse("5 shouldn't be null", uv.isNull(5));
+      assertFalse(uv.isNull(5), "5 shouldn't be null");
       assertEquals(123123L, uv.getObject(5));
 
-      assertFalse("6 shouldn't be null", uv.isNull(6));
+      assertFalse(uv.isNull(6), "6 shouldn't be null");
       NullableTimeStampMilliTZHolder readBackHolder = new NullableTimeStampMilliTZHolder();
       uv.getTimeStampMilliTZVector().get(6, readBackHolder);
       assertEquals(12345L, readBackHolder.value);
       assertEquals("UTC", readBackHolder.timezone);
 
-      assertFalse("7 shouldn't be null", uv.isNull(7));
+      assertFalse(uv.isNull(7), "7 shouldn't be null");
       assertEquals(444413L, ((java.time.Duration) uv.getObject(7)).getSeconds());
 
-      assertFalse("8 shouldn't be null", uv.isNull(8));
-      assertEquals(18978,
-          ByteBuffer.wrap(uv.getFixedSizeBinaryVector().get(8)).order(ByteOrder.nativeOrder()).getInt());
+      assertFalse(uv.isNull(8), "8 shouldn't be null");
+      assertEquals(
+          18978,
+          ByteBuffer.wrap(uv.getFixedSizeBinaryVector().get(8))
+              .order(ByteOrder.nativeOrder())
+              .getInt());
 
       container.clear();
       container.allocateNew();
@@ -172,10 +174,14 @@ public void testPromoteToUnion() throws Exception {
 
       Field childField1 = container.getField().getChildren().get(0).getChildren().get(0);
       Field childField2 = container.getField().getChildren().get(0).getChildren().get(1);
-      assertEquals("Child field should be union type: " +
-          childField1.getName(), ArrowTypeID.Union, childField1.getType().getTypeID());
-      assertEquals("Child field should be decimal type: " +
-          childField2.getName(), ArrowTypeID.Decimal, childField2.getType().getTypeID());
+      assertEquals(
+          ArrowTypeID.Union,
+          childField1.getType().getTypeID(),
+          "Child field should be union type: " + childField1.getName());
+      assertEquals(
+          ArrowTypeID.Decimal,
+          childField2.getType().getTypeID(),
+          "Child field should be decimal type: " + childField2.getName());
 
       buf.close();
     }
@@ -184,9 +190,10 @@ public void testPromoteToUnion() throws Exception {
   @Test
   public void testNoPromoteFloat4ToUnionWithNull() throws Exception {
 
-    try (final NonNullableStructVector container = NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
-         final StructVector v = container.addOrGetStruct("test");
-         final PromotableWriter writer = new PromotableWriter(v, container)) {
+    try (final NonNullableStructVector container =
+            NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
+        final StructVector v = container.addOrGetStruct("test");
+        final PromotableWriter writer = new PromotableWriter(v, container)) {
 
       container.allocateNew();
 
@@ -195,15 +202,25 @@ public void testNoPromoteFloat4ToUnionWithNull() throws Exception {
       writer.list("list").endList();
       writer.end();
 
-      FieldType childTypeOfListInContainer = container.getField().getChildren().get(0).getChildren().get(0)
-              .getChildren().get(0).getFieldType();
+      FieldType childTypeOfListInContainer =
+          container
+              .getField()
+              .getChildren()
+              .get(0)
+              .getChildren()
+              .get(0)
+              .getChildren()
+              .get(0)
+              .getFieldType();
 
       // create a listvector with same type as list in container to, say, hold a copy
       // this will be a nullvector
       ListVector lv = ListVector.empty("name", allocator);
       lv.addOrGetVector(childTypeOfListInContainer);
       assertEquals(childTypeOfListInContainer.getType(), Types.MinorType.NULL.getType());
-      assertEquals(lv.getChildrenFromFields().get(0).getMinorType().getType(), Types.MinorType.NULL.getType());
+      assertEquals(
+          lv.getChildrenFromFields().get(0).getMinorType().getType(),
+          Types.MinorType.NULL.getType());
 
       writer.start();
       writer.list("list").startList();
@@ -213,14 +230,24 @@ public void testNoPromoteFloat4ToUnionWithNull() throws Exception {
 
       container.setValueCount(2);
 
-      childTypeOfListInContainer = container.getField().getChildren().get(0).getChildren().get(0)
-              .getChildren().get(0).getFieldType();
+      childTypeOfListInContainer =
+          container
+              .getField()
+              .getChildren()
+              .get(0)
+              .getChildren()
+              .get(0)
+              .getChildren()
+              .get(0)
+              .getFieldType();
 
       // repeat but now the type in container has been changed from null to float
       // we expect same behaviour from listvector
       lv.addOrGetVector(childTypeOfListInContainer);
       assertEquals(childTypeOfListInContainer.getType(), Types.MinorType.FLOAT4.getType());
-      assertEquals(lv.getChildrenFromFields().get(0).getMinorType().getType(), Types.MinorType.FLOAT4.getType());
+      assertEquals(
+          lv.getChildrenFromFields().get(0).getMinorType().getType(),
+          Types.MinorType.FLOAT4.getType());
 
       lv.close();
     }
@@ -229,9 +256,10 @@ public void testNoPromoteFloat4ToUnionWithNull() throws Exception {
   @Test
   public void testNoPromoteTimeStampMilliTZToUnionWithNull() throws Exception {
 
-    try (final NonNullableStructVector container = NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
-         final StructVector v = container.addOrGetStruct("test");
-         final PromotableWriter writer = new PromotableWriter(v, container)) {
+    try (final NonNullableStructVector container =
+            NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
+        final StructVector v = container.addOrGetStruct("test");
+        final PromotableWriter writer = new PromotableWriter(v, container)) {
 
       container.allocateNew();
 
@@ -240,15 +268,25 @@ public void testNoPromoteTimeStampMilliTZToUnionWithNull() throws Exception {
       writer.list("list").endList();
       writer.end();
 
-      FieldType childTypeOfListInContainer = container.getField().getChildren().get(0).getChildren().get(0)
-              .getChildren().get(0).getFieldType();
+      FieldType childTypeOfListInContainer =
+          container
+              .getField()
+              .getChildren()
+              .get(0)
+              .getChildren()
+              .get(0)
+              .getChildren()
+              .get(0)
+              .getFieldType();
 
       // create a listvector with same type as list in container to, say, hold a copy
       // this will be a nullvector
       ListVector lv = ListVector.empty("name", allocator);
       lv.addOrGetVector(childTypeOfListInContainer);
       assertEquals(childTypeOfListInContainer.getType(), Types.MinorType.NULL.getType());
-      assertEquals(lv.getChildrenFromFields().get(0).getMinorType().getType(), Types.MinorType.NULL.getType());
+      assertEquals(
+          lv.getChildrenFromFields().get(0).getMinorType().getType(),
+          Types.MinorType.NULL.getType());
 
       writer.start();
       writer.list("list").startList();
@@ -259,24 +297,38 @@ public void testNoPromoteTimeStampMilliTZToUnionWithNull() throws Exception {
 
       // Test that we get an exception when the timezone doesn't match
       holder.timezone = "SomeTimeZone";
-      IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
-          () -> writer.list("list").timeStampMilliTZ().write(holder));
-      assertEquals("holder.timezone: SomeTimeZone not equal to vector timezone: FakeTimeZone", ex.getMessage());
+      IllegalArgumentException ex =
+          assertThrows(
+              IllegalArgumentException.class,
+              () -> writer.list("list").timeStampMilliTZ().write(holder));
+      assertEquals(
+          "holder.timezone: SomeTimeZone not equal to vector timezone: FakeTimeZone",
+          ex.getMessage());
 
       writer.list("list").endList();
       writer.end();
 
       container.setValueCount(2);
 
-      childTypeOfListInContainer = container.getField().getChildren().get(0).getChildren().get(0)
-              .getChildren().get(0).getFieldType();
+      childTypeOfListInContainer =
+          container
+              .getField()
+              .getChildren()
+              .get(0)
+              .getChildren()
+              .get(0)
+              .getChildren()
+              .get(0)
+              .getFieldType();
 
       // repeat but now the type in container has been changed from null to float
       // we expect same behaviour from listvector
       lv.addOrGetVector(childTypeOfListInContainer);
-      assertEquals(childTypeOfListInContainer.getType(),
+      assertEquals(
+          childTypeOfListInContainer.getType(),
           new ArrowType.Timestamp(TimeUnit.MILLISECOND, "FakeTimeZone"));
-      assertEquals(lv.getChildrenFromFields().get(0).getField().getType(),
+      assertEquals(
+          lv.getChildrenFromFields().get(0).getField().getType(),
           new ArrowType.Timestamp(TimeUnit.MILLISECOND, "FakeTimeZone"));
 
       lv.close();
@@ -286,9 +338,10 @@ public void testNoPromoteTimeStampMilliTZToUnionWithNull() throws Exception {
   @Test
   public void testNoPromoteDurationToUnionWithNull() throws Exception {
 
-    try (final NonNullableStructVector container = NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
-         final StructVector v = container.addOrGetStruct("test");
-         final PromotableWriter writer = new PromotableWriter(v, container)) {
+    try (final NonNullableStructVector container =
+            NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
+        final StructVector v = container.addOrGetStruct("test");
+        final PromotableWriter writer = new PromotableWriter(v, container)) {
 
       container.allocateNew();
 
@@ -297,15 +350,25 @@ public void testNoPromoteDurationToUnionWithNull() throws Exception {
       writer.list("list").endList();
       writer.end();
 
-      FieldType childTypeOfListInContainer = container.getField().getChildren().get(0).getChildren().get(0)
-              .getChildren().get(0).getFieldType();
+      FieldType childTypeOfListInContainer =
+          container
+              .getField()
+              .getChildren()
+              .get(0)
+              .getChildren()
+              .get(0)
+              .getChildren()
+              .get(0)
+              .getFieldType();
 
       // create a listvector with same type as list in container to, say, hold a copy
       // this will be a nullvector
       ListVector lv = ListVector.empty("name", allocator);
       lv.addOrGetVector(childTypeOfListInContainer);
       assertEquals(childTypeOfListInContainer.getType(), Types.MinorType.NULL.getType());
-      assertEquals(lv.getChildrenFromFields().get(0).getMinorType().getType(), Types.MinorType.NULL.getType());
+      assertEquals(
+          lv.getChildrenFromFields().get(0).getMinorType().getType(),
+          Types.MinorType.NULL.getType());
 
       writer.start();
       writer.list("list").startList();
@@ -316,24 +379,35 @@ public void testNoPromoteDurationToUnionWithNull() throws Exception {
 
       // Test that we get an exception when the unit doesn't match
       holder.unit = TimeUnit.MICROSECOND;
-      IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
-          () -> writer.list("list").duration().write(holder));
-      assertEquals("holder.unit: MICROSECOND not equal to vector unit: NANOSECOND", ex.getMessage());
+      IllegalArgumentException ex =
+          assertThrows(
+              IllegalArgumentException.class, () -> writer.list("list").duration().write(holder));
+      assertEquals(
+          "holder.unit: MICROSECOND not equal to vector unit: NANOSECOND", ex.getMessage());
 
       writer.list("list").endList();
       writer.end();
 
       container.setValueCount(2);
 
-      childTypeOfListInContainer = container.getField().getChildren().get(0).getChildren().get(0)
-              .getChildren().get(0).getFieldType();
+      childTypeOfListInContainer =
+          container
+              .getField()
+              .getChildren()
+              .get(0)
+              .getChildren()
+              .get(0)
+              .getChildren()
+              .get(0)
+              .getFieldType();
 
       // repeat but now the type in container has been changed from null to float
       // we expect same behaviour from listvector
       lv.addOrGetVector(childTypeOfListInContainer);
-      assertEquals(childTypeOfListInContainer.getType(),
-          new ArrowType.Duration(TimeUnit.NANOSECOND));
-      assertEquals(lv.getChildrenFromFields().get(0).getField().getType(),
+      assertEquals(
+          childTypeOfListInContainer.getType(), new ArrowType.Duration(TimeUnit.NANOSECOND));
+      assertEquals(
+          lv.getChildrenFromFields().get(0).getField().getType(),
           new ArrowType.Duration(TimeUnit.NANOSECOND));
 
       lv.close();
@@ -343,9 +417,10 @@ public void testNoPromoteDurationToUnionWithNull() throws Exception {
   @Test
   public void testNoPromoteFixedSizeBinaryToUnionWithNull() throws Exception {
 
-    try (final NonNullableStructVector container = NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
-         final StructVector v = container.addOrGetStruct("test");
-         final PromotableWriter writer = new PromotableWriter(v, container)) {
+    try (final NonNullableStructVector container =
+            NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
+        final StructVector v = container.addOrGetStruct("test");
+        final PromotableWriter writer = new PromotableWriter(v, container)) {
 
       container.allocateNew();
 
@@ -354,15 +429,25 @@ public void testNoPromoteFixedSizeBinaryToUnionWithNull() throws Exception {
       writer.list("list").endList();
       writer.end();
 
-      FieldType childTypeOfListInContainer = container.getField().getChildren().get(0).getChildren().get(0)
-              .getChildren().get(0).getFieldType();
+      FieldType childTypeOfListInContainer =
+          container
+              .getField()
+              .getChildren()
+              .get(0)
+              .getChildren()
+              .get(0)
+              .getChildren()
+              .get(0)
+              .getFieldType();
 
       // create a listvector with same type as list in container to, say, hold a copy
       // this will be a nullvector
       ListVector lv = ListVector.empty("name", allocator);
       lv.addOrGetVector(childTypeOfListInContainer);
       assertEquals(childTypeOfListInContainer.getType(), Types.MinorType.NULL.getType());
-      assertEquals(lv.getChildrenFromFields().get(0).getMinorType().getType(), Types.MinorType.NULL.getType());
+      assertEquals(
+          lv.getChildrenFromFields().get(0).getMinorType().getType(),
+          Types.MinorType.NULL.getType());
 
       writer.start();
       writer.list("list").startList();
@@ -375,8 +460,10 @@ public void testNoPromoteFixedSizeBinaryToUnionWithNull() throws Exception {
 
       // Test that we get an exception when the unit doesn't match
       holder.byteWidth = 7;
-      IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
-          () -> writer.list("list").fixedSizeBinary().write(holder));
+      IllegalArgumentException ex =
+          assertThrows(
+              IllegalArgumentException.class,
+              () -> writer.list("list").fixedSizeBinary().write(holder));
       assertEquals("holder.byteWidth: 7 not equal to vector byteWidth: 4", ex.getMessage());
 
       writer.list("list").endList();
@@ -384,16 +471,23 @@ public void testNoPromoteFixedSizeBinaryToUnionWithNull() throws Exception {
 
       container.setValueCount(2);
 
-      childTypeOfListInContainer = container.getField().getChildren().get(0).getChildren().get(0)
-              .getChildren().get(0).getFieldType();
+      childTypeOfListInContainer =
+          container
+              .getField()
+              .getChildren()
+              .get(0)
+              .getChildren()
+              .get(0)
+              .getChildren()
+              .get(0)
+              .getFieldType();
 
       // repeat but now the type in container has been changed from null to float
       // we expect same behaviour from listvector
       lv.addOrGetVector(childTypeOfListInContainer);
-      assertEquals(childTypeOfListInContainer.getType(),
-          new ArrowType.FixedSizeBinary(4));
-      assertEquals(lv.getChildrenFromFields().get(0).getField().getType(),
-          new ArrowType.FixedSizeBinary(4));
+      assertEquals(childTypeOfListInContainer.getType(), new ArrowType.FixedSizeBinary(4));
+      assertEquals(
+          lv.getChildrenFromFields().get(0).getField().getType(), new ArrowType.FixedSizeBinary(4));
 
       lv.close();
       buf.close();
@@ -402,9 +496,10 @@ public void testNoPromoteFixedSizeBinaryToUnionWithNull() throws Exception {
 
   @Test
   public void testPromoteLargeVarCharHelpersOnStruct() throws Exception {
-    try (final NonNullableStructVector container = NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
-         final StructVector v = container.addOrGetStruct("test");
-         final PromotableWriter writer = new PromotableWriter(v, container)) {
+    try (final NonNullableStructVector container =
+            NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
+        final StructVector v = container.addOrGetStruct("test");
+        final PromotableWriter writer = new PromotableWriter(v, container)) {
       container.allocateNew();
 
       writer.start();
@@ -422,9 +517,10 @@ public void testPromoteLargeVarCharHelpersOnStruct() throws Exception {
 
   @Test
   public void testPromoteVarCharHelpersOnStruct() throws Exception {
-    try (final NonNullableStructVector container = NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
-         final StructVector v = container.addOrGetStruct("test");
-         final PromotableWriter writer = new PromotableWriter(v, container)) {
+    try (final NonNullableStructVector container =
+            NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
+        final StructVector v = container.addOrGetStruct("test");
+        final PromotableWriter writer = new PromotableWriter(v, container)) {
       container.allocateNew();
 
       writer.start();
@@ -442,9 +538,10 @@ public void testPromoteVarCharHelpersOnStruct() throws Exception {
 
   @Test
   public void testPromoteVarCharHelpersDirect() throws Exception {
-    try (final NonNullableStructVector container = NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
-         final StructVector v = container.addOrGetStruct("test");
-         final PromotableWriter writer = new PromotableWriter(v, container)) {
+    try (final NonNullableStructVector container =
+            NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
+        final StructVector v = container.addOrGetStruct("test");
+        final PromotableWriter writer = new PromotableWriter(v, container)) {
       container.allocateNew();
 
       writer.start();
@@ -464,9 +561,10 @@ public void testPromoteVarCharHelpersDirect() throws Exception {
 
   @Test
   public void testPromoteLargeVarCharHelpersDirect() throws Exception {
-    try (final NonNullableStructVector container = NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
-         final StructVector v = container.addOrGetStruct("test");
-         final PromotableWriter writer = new PromotableWriter(v, container)) {
+    try (final NonNullableStructVector container =
+            NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
+        final StructVector v = container.addOrGetStruct("test");
+        final PromotableWriter writer = new PromotableWriter(v, container)) {
       container.allocateNew();
 
       writer.start();
@@ -486,22 +584,33 @@ public void testPromoteLargeVarCharHelpersDirect() throws Exception {
 
   @Test
   public void testPromoteVarBinaryHelpersOnStruct() throws Exception {
-    try (final NonNullableStructVector container = NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
-         final StructVector v = container.addOrGetStruct("test");
-         final PromotableWriter writer = new PromotableWriter(v, container)) {
+    try (final NonNullableStructVector container =
+            NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
+        final StructVector v = container.addOrGetStruct("test");
+        final PromotableWriter writer = new PromotableWriter(v, container)) {
       container.allocateNew();
 
       writer.start();
       writer.setPosition(0);
       writer.varBinary("c").writeVarBinary("row1".getBytes(StandardCharsets.UTF_8));
       writer.setPosition(1);
-      writer.varBinary("c").writeVarBinary("row2".getBytes(StandardCharsets.UTF_8), 0,
-          "row2".getBytes(StandardCharsets.UTF_8).length);
+      writer
+          .varBinary("c")
+          .writeVarBinary(
+              "row2".getBytes(StandardCharsets.UTF_8),
+              0,
+              "row2".getBytes(StandardCharsets.UTF_8).length);
       writer.setPosition(2);
-      writer.varBinary("c").writeVarBinary(ByteBuffer.wrap("row3".getBytes(StandardCharsets.UTF_8)));
+      writer
+          .varBinary("c")
+          .writeVarBinary(ByteBuffer.wrap("row3".getBytes(StandardCharsets.UTF_8)));
       writer.setPosition(3);
-      writer.varBinary("c").writeVarBinary(ByteBuffer.wrap("row4".getBytes(StandardCharsets.UTF_8)), 0,
-          "row4".getBytes(StandardCharsets.UTF_8).length);
+      writer
+          .varBinary("c")
+          .writeVarBinary(
+              ByteBuffer.wrap("row4".getBytes(StandardCharsets.UTF_8)),
+              0,
+              "row4".getBytes(StandardCharsets.UTF_8).length);
       writer.end();
 
       final VarBinaryVector uv = v.getChild("c", VarBinaryVector.class);
@@ -514,21 +623,26 @@ public void testPromoteVarBinaryHelpersOnStruct() throws Exception {
 
   @Test
   public void testPromoteVarBinaryHelpersDirect() throws Exception {
-    try (final NonNullableStructVector container = NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
-         final StructVector v = container.addOrGetStruct("test");
-         final PromotableWriter writer = new PromotableWriter(v, container)) {
+    try (final NonNullableStructVector container =
+            NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
+        final StructVector v = container.addOrGetStruct("test");
+        final PromotableWriter writer = new PromotableWriter(v, container)) {
       container.allocateNew();
 
       writer.start();
       writer.setPosition(0);
       writer.writeVarBinary("row1".getBytes(StandardCharsets.UTF_8));
       writer.setPosition(1);
-      writer.writeVarBinary("row2".getBytes(StandardCharsets.UTF_8), 0,
+      writer.writeVarBinary(
+          "row2".getBytes(StandardCharsets.UTF_8),
+          0,
           "row2".getBytes(StandardCharsets.UTF_8).length);
       writer.setPosition(2);
       writer.writeVarBinary(ByteBuffer.wrap("row3".getBytes(StandardCharsets.UTF_8)));
       writer.setPosition(3);
-      writer.writeVarBinary(ByteBuffer.wrap("row4".getBytes(StandardCharsets.UTF_8)), 0,
+      writer.writeVarBinary(
+          ByteBuffer.wrap("row4".getBytes(StandardCharsets.UTF_8)),
+          0,
           "row4".getBytes(StandardCharsets.UTF_8).length);
       writer.end();
 
@@ -544,22 +658,33 @@ public void testPromoteVarBinaryHelpersDirect() throws Exception {
 
   @Test
   public void testPromoteLargeVarBinaryHelpersOnStruct() throws Exception {
-    try (final NonNullableStructVector container = NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
-         final StructVector v = container.addOrGetStruct("test");
-         final PromotableWriter writer = new PromotableWriter(v, container)) {
+    try (final NonNullableStructVector container =
+            NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
+        final StructVector v = container.addOrGetStruct("test");
+        final PromotableWriter writer = new PromotableWriter(v, container)) {
       container.allocateNew();
 
       writer.start();
       writer.setPosition(0);
       writer.largeVarBinary("c").writeLargeVarBinary("row1".getBytes(StandardCharsets.UTF_8));
       writer.setPosition(1);
-      writer.largeVarBinary("c").writeLargeVarBinary("row2".getBytes(StandardCharsets.UTF_8), 0,
-          "row2".getBytes(StandardCharsets.UTF_8).length);
+      writer
+          .largeVarBinary("c")
+          .writeLargeVarBinary(
+              "row2".getBytes(StandardCharsets.UTF_8),
+              0,
+              "row2".getBytes(StandardCharsets.UTF_8).length);
       writer.setPosition(2);
-      writer.largeVarBinary("c").writeLargeVarBinary(ByteBuffer.wrap("row3".getBytes(StandardCharsets.UTF_8)));
+      writer
+          .largeVarBinary("c")
+          .writeLargeVarBinary(ByteBuffer.wrap("row3".getBytes(StandardCharsets.UTF_8)));
       writer.setPosition(3);
-      writer.largeVarBinary("c").writeLargeVarBinary(ByteBuffer.wrap("row4".getBytes(StandardCharsets.UTF_8)), 0,
-          "row4".getBytes(StandardCharsets.UTF_8).length);
+      writer
+          .largeVarBinary("c")
+          .writeLargeVarBinary(
+              ByteBuffer.wrap("row4".getBytes(StandardCharsets.UTF_8)),
+              0,
+              "row4".getBytes(StandardCharsets.UTF_8).length);
       writer.end();
 
       final LargeVarBinaryVector uv = v.getChild("c", LargeVarBinaryVector.class);
@@ -572,21 +697,26 @@ public void testPromoteLargeVarBinaryHelpersOnStruct() throws Exception {
 
   @Test
   public void testPromoteLargeVarBinaryHelpersDirect() throws Exception {
-    try (final NonNullableStructVector container = NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
-         final StructVector v = container.addOrGetStruct("test");
-         final PromotableWriter writer = new PromotableWriter(v, container)) {
+    try (final NonNullableStructVector container =
+            NonNullableStructVector.empty(EMPTY_SCHEMA_PATH, allocator);
+        final StructVector v = container.addOrGetStruct("test");
+        final PromotableWriter writer = new PromotableWriter(v, container)) {
       container.allocateNew();
 
       writer.start();
       writer.setPosition(0);
       writer.writeLargeVarBinary("row1".getBytes(StandardCharsets.UTF_8));
       writer.setPosition(1);
-      writer.writeLargeVarBinary("row2".getBytes(StandardCharsets.UTF_8), 0,
+      writer.writeLargeVarBinary(
+          "row2".getBytes(StandardCharsets.UTF_8),
+          0,
           "row2".getBytes(StandardCharsets.UTF_8).length);
       writer.setPosition(2);
       writer.writeLargeVarBinary(ByteBuffer.wrap("row3".getBytes(StandardCharsets.UTF_8)));
       writer.setPosition(3);
-      writer.writeLargeVarBinary(ByteBuffer.wrap("row4".getBytes(StandardCharsets.UTF_8)), 0,
+      writer.writeLargeVarBinary(
+          ByteBuffer.wrap("row4".getBytes(StandardCharsets.UTF_8)),
+          0,
           "row4".getBytes(StandardCharsets.UTF_8).length);
       writer.end();
 
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java b/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java
index 19f0ea9d4e392..654940908bf38 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java
@@ -14,10 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.writer;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;
@@ -27,7 +31,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -42,6 +45,7 @@
 import org.apache.arrow.vector.SchemaChangeCallBack;
 import org.apache.arrow.vector.VarBinaryVector;
 import org.apache.arrow.vector.VarCharVector;
+import org.apache.arrow.vector.ViewVarCharVector;
 import org.apache.arrow.vector.complex.ListVector;
 import org.apache.arrow.vector.complex.MapVector;
 import org.apache.arrow.vector.complex.NonNullableStructVector;
@@ -92,10 +96,9 @@
 import org.apache.arrow.vector.util.JsonStringHashMap;
 import org.apache.arrow.vector.util.Text;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestComplexWriter {
 
@@ -103,12 +106,12 @@ public class TestComplexWriter {
 
   private static final int COUNT = 100;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Integer.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -119,8 +122,8 @@ public void simpleNestedTypes() {
     StructReader rootReader = new SingleStructReaderImpl(parent).reader("root");
     for (int i = 0; i < COUNT; i++) {
       rootReader.setPosition(i);
-      Assert.assertEquals(i, rootReader.reader("int").readInteger().intValue());
-      Assert.assertEquals(i, rootReader.reader("bigInt").readLong().longValue());
+      assertEquals(i, rootReader.reader("int").readInteger().intValue());
+      assertEquals(i, rootReader.reader("bigInt").readLong().longValue());
     }
 
     parent.close();
@@ -145,7 +148,8 @@ public void transferPairSchemaChange() {
 
   private NonNullableStructVector populateStructVector(CallBack callBack) {
     NonNullableStructVector parent =
-        new NonNullableStructVector("parent", allocator, new FieldType(false, Struct.INSTANCE, null, null), callBack);
+        new NonNullableStructVector(
+            "parent", allocator, new FieldType(false, Struct.INSTANCE, null, null), callBack);
     ComplexWriter writer = new ComplexWriterImpl("root", parent);
     StructWriter rootWriter = writer.rootAsStruct();
     IntWriter intWriter = rootWriter.integer("int");
@@ -162,7 +166,8 @@ private NonNullableStructVector populateStructVector(CallBack callBack) {
 
   @Test
   public void nullableStruct() {
-    try (NonNullableStructVector structVector = NonNullableStructVector.empty("parent", allocator)) {
+    try (NonNullableStructVector structVector =
+        NonNullableStructVector.empty("parent", allocator)) {
       ComplexWriter writer = new ComplexWriterImpl("root", structVector);
       StructWriter rootWriter = writer.rootAsStruct();
       for (int i = 0; i < COUNT; i++) {
@@ -182,11 +187,13 @@ public void nullableStruct() {
   }
 
   /**
-   * This test is similar to {@link #nullableStruct()} ()} but we get the inner struct writer once at the beginning.
+   * This test is similar to {@link #nullableStruct()} ()} but we get the inner struct writer once
+   * at the beginning.
    */
   @Test
   public void nullableStruct2() {
-    try (NonNullableStructVector structVector = NonNullableStructVector.empty("parent", allocator)) {
+    try (NonNullableStructVector structVector =
+        NonNullableStructVector.empty("parent", allocator)) {
       ComplexWriter writer = new ComplexWriterImpl("root", structVector);
       StructWriter rootWriter = writer.rootAsStruct();
       StructWriter structWriter = rootWriter.struct("struct");
@@ -210,15 +217,15 @@ private void checkNullableStruct(NonNullableStructVector structVector) {
     StructReader rootReader = new SingleStructReaderImpl(structVector).reader("root");
     for (int i = 0; i < COUNT; i++) {
       rootReader.setPosition(i);
-      assertTrue("index is set: " + i, rootReader.isSet());
+      assertTrue(rootReader.isSet(), "index is set: " + i);
       FieldReader struct = rootReader.reader("struct");
       if (i % 2 == 0) {
-        assertTrue("index is set: " + i, struct.isSet());
-        assertNotNull("index is set: " + i, struct.readObject());
+        assertTrue(struct.isSet(), "index is set: " + i);
+        assertNotNull(struct.readObject(), "index is set: " + i);
         assertEquals(i, struct.reader("nested").readLong().longValue());
       } else {
-        assertFalse("index is not set: " + i, struct.isSet());
-        assertNull("index is not set: " + i, struct.readObject());
+        assertFalse(struct.isSet(), "index is not set: " + i);
+        assertNull(struct.readObject(), "index is not set: " + i);
       }
     }
   }
@@ -245,11 +252,11 @@ public void testList() {
       StructReader rootReader = new SingleStructReaderImpl(parent).reader("root");
 
       rootReader.setPosition(0);
-      assertTrue("row 0 list is not set", rootReader.reader("list").isSet());
+      assertTrue(rootReader.reader("list").isSet(), "row 0 list is not set");
       assertEquals(Long.valueOf(0), rootReader.reader("list").reader().readLong());
 
       rootReader.setPosition(1);
-      assertFalse("row 1 list is set", rootReader.reader("list").isSet());
+      assertFalse(rootReader.reader("list").isSet(), "row 1 list is set");
     }
   }
 
@@ -312,9 +319,9 @@ public void testListScalarNull() {
         for (int j = 0; j < i % 7; j++) {
           listReader.next();
           if (j % 2 == 0) {
-            assertFalse("index is set: " + j, listReader.reader().isSet());
+            assertFalse(listReader.reader().isSet(), "index is set: " + j);
           } else {
-            assertTrue("index is not set: " + j, listReader.reader().isSet());
+            assertTrue(listReader.reader().isSet(), "index is not set: " + j);
             assertEquals(j, listReader.reader().readInteger().intValue());
           }
         }
@@ -336,13 +343,15 @@ public void listDecimalType() {
           if (j % 4 == 0) {
             listWriter.writeDecimal(new BigDecimal(j));
           } else if (j % 4 == 1) {
-            DecimalUtility.writeBigDecimalToArrowBuf(new BigDecimal(j), holder.buffer, 0, DecimalVector.TYPE_WIDTH);
+            DecimalUtility.writeBigDecimalToArrowBuf(
+                new BigDecimal(j), holder.buffer, 0, DecimalVector.TYPE_WIDTH);
             holder.start = 0;
             holder.scale = 0;
             holder.precision = 10;
             listWriter.write(holder);
           } else if (j % 4 == 2) {
-            DecimalUtility.writeBigDecimalToArrowBuf(new BigDecimal(j), holder.buffer, 0, DecimalVector.TYPE_WIDTH);
+            DecimalUtility.writeBigDecimalToArrowBuf(
+                new BigDecimal(j), holder.buffer, 0, DecimalVector.TYPE_WIDTH);
             listWriter.writeDecimal(0, holder.buffer, arrowType);
           } else {
             byte[] value = BigDecimal.valueOf(j).unscaledValue().toByteArray();
@@ -392,7 +401,7 @@ public void listTimeStampMilliTZType() {
         for (int j = 0; j < i % 7; j++) {
           listReader.next();
           if (j % 2 == 0) {
-            assertFalse("index is set: " + j, listReader.reader().isSet());
+            assertFalse(listReader.reader().isSet(), "index is set: " + j);
           } else {
             NullableTimeStampMilliTZHolder actual = new NullableTimeStampMilliTZHolder();
             listReader.reader().read(actual);
@@ -430,7 +439,7 @@ public void listDurationType() {
         for (int j = 0; j < i % 7; j++) {
           listReader.next();
           if (j % 2 == 0) {
-            assertFalse("index is set: " + j, listReader.reader().isSet());
+            assertFalse(listReader.reader().isSet(), "index is set: " + j);
           } else {
             NullableDurationHolder actual = new NullableDurationHolder();
             listReader.reader().read(actual);
@@ -472,7 +481,7 @@ public void listFixedSizeBinaryType() throws Exception {
         for (int j = 0; j < i % 7; j++) {
           listReader.next();
           if (j % 2 == 0) {
-            assertFalse("index is set: " + j, listReader.reader().isSet());
+            assertFalse(listReader.reader().isSet(), "index is set: " + j);
           } else {
             NullableFixedSizeBinaryHolder actual = new NullableFixedSizeBinaryHolder();
             listReader.reader().read(actual);
@@ -505,11 +514,12 @@ public void listScalarTypeNullable() {
       for (int i = 0; i < COUNT; i++) {
         listReader.setPosition(i);
         if (i % 2 == 0) {
-          assertTrue("index is set: " + i, listReader.isSet());
-          assertEquals("correct length at: " + i, i % 7, ((List<?>) listReader.readObject()).size());
+          assertTrue(listReader.isSet(), "index is set: " + i);
+          assertEquals(
+              i % 7, ((List<?>) listReader.readObject()).size(), "correct length at: " + i);
         } else {
-          assertFalse("index is not set: " + i, listReader.isSet());
-          assertNull("index is not set: " + i, listReader.readObject());
+          assertFalse(listReader.isSet(), "index is not set: " + i);
+          assertNull(listReader.readObject(), "index is not set: " + i);
         }
       }
     }
@@ -537,8 +547,9 @@ public void listStructType() {
         listReader.setPosition(i);
         for (int j = 0; j < i % 7; j++) {
           listReader.next();
-          Assert.assertEquals("record: " + i, j, listReader.reader().reader("int").readInteger().intValue());
-          Assert.assertEquals(j, listReader.reader().reader("bigInt").readLong().longValue());
+          assertEquals(
+              j, listReader.reader().reader("int").readInteger().intValue(), "record: " + i);
+          assertEquals(j, listReader.reader().reader("bigInt").readLong().longValue());
         }
       }
     }
@@ -567,7 +578,8 @@ public void listListType() {
   }
 
   /**
-   * This test is similar to {@link #listListType()} but we get the inner list writer once at the beginning.
+   * This test is similar to {@link #listListType()} but we get the inner list writer once at the
+   * beginning.
    */
   @Test
   public void listListType2() {
@@ -601,7 +613,7 @@ private void checkListOfLists(final ListVector listVector) {
         FieldReader innerListReader = listReader.reader();
         for (int k = 0; k < i % 13; k++) {
           innerListReader.next();
-          Assert.assertEquals("record: " + i, k, innerListReader.reader().readInteger().intValue());
+          assertEquals(k, innerListReader.reader().readInteger().intValue(), "record: " + i);
         }
       }
     }
@@ -634,7 +646,8 @@ public void unionListListType() {
   }
 
   /**
-   * This test is similar to {@link #unionListListType()} but we get the inner list writer once at the beginning.
+   * This test is similar to {@link #unionListListType()} but we get the inner list writer once at
+   * the beginning.
    */
   @Test
   public void unionListListType2() {
@@ -673,9 +686,9 @@ private void checkUnionList(ListVector listVector) {
         for (int k = 0; k < i % 13; k++) {
           innerListReader.next();
           if (k % 2 == 0) {
-            Assert.assertEquals("record: " + i, k, innerListReader.reader().readInteger().intValue());
+            assertEquals(k, innerListReader.reader().readInteger().intValue(), "record: " + i);
           } else {
-            Assert.assertEquals("record: " + i, k, innerListReader.reader().readLong().longValue());
+            assertEquals(k, innerListReader.reader().readLong().longValue(), "record: " + i);
           }
         }
       }
@@ -724,11 +737,11 @@ private void checkListMap(ListVector listVector) {
         UnionMapReader mapReader = (UnionMapReader) listReader.reader();
         for (int k = 0; k < i % 13; k++) {
           mapReader.next();
-          Assert.assertEquals("record key: " + i, k, mapReader.key().readInteger().intValue());
+          assertEquals(k, mapReader.key().readInteger().intValue(), "record key: " + i);
           if (k % 2 == 0) {
-            Assert.assertEquals("record value: " + i, k, mapReader.value().readLong().longValue());
+            assertEquals(k, mapReader.value().readLong().longValue(), "record value: " + i);
           } else {
-            Assert.assertNull("record value: " + i, mapReader.value().readLong());
+            assertNull(mapReader.value().readLong(), "record value: " + i);
           }
         }
       }
@@ -738,7 +751,8 @@ private void checkListMap(ListVector listVector) {
   @Test
   public void simpleUnion() throws Exception {
     List<ArrowBuf> bufs = new ArrayList<ArrowBuf>();
-    UnionVector vector = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);
+    UnionVector vector =
+        new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);
     UnionWriter unionWriter = new UnionWriter(vector);
     unionWriter.allocate();
     for (int i = 0; i < COUNT; i++) {
@@ -772,24 +786,24 @@ public void simpleUnion() throws Exception {
     for (int i = 0; i < COUNT; i++) {
       unionReader.setPosition(i);
       if (i % 5 == 0) {
-        Assert.assertEquals(i, unionReader.readInteger().intValue());
+        assertEquals(i, unionReader.readInteger().intValue());
       } else if (i % 5 == 1) {
         NullableTimeStampMilliTZHolder holder = new NullableTimeStampMilliTZHolder();
         unionReader.read(holder);
-        Assert.assertEquals(i, holder.value);
-        Assert.assertEquals("AsdfTimeZone", holder.timezone);
+        assertEquals(i, holder.value);
+        assertEquals("AsdfTimeZone", holder.timezone);
       } else if (i % 5 == 2) {
         NullableDurationHolder holder = new NullableDurationHolder();
         unionReader.read(holder);
-        Assert.assertEquals(i, holder.value);
-        Assert.assertEquals(TimeUnit.NANOSECOND, holder.unit);
+        assertEquals(i, holder.value);
+        assertEquals(TimeUnit.NANOSECOND, holder.unit);
       } else if (i % 5 == 3) {
         NullableFixedSizeBinaryHolder holder = new NullableFixedSizeBinaryHolder();
         unionReader.read(holder);
         assertEquals(i, holder.buffer.getInt(0));
         assertEquals(4, holder.byteWidth);
       } else {
-        Assert.assertEquals((float) i, unionReader.readFloat(), 1e-12);
+        assertEquals((float) i, unionReader.readFloat(), 1e-12);
       }
     }
     vector.close();
@@ -808,12 +822,12 @@ public void promotableWriter() {
         bigIntWriter.writeBigInt(i);
       }
       Field field = parent.getField().getChildren().get(0).getChildren().get(0);
-      Assert.assertEquals("a", field.getName());
-      Assert.assertEquals(Int.TYPE_TYPE, field.getType().getTypeID());
+      assertEquals("a", field.getName());
+      assertEquals(Int.TYPE_TYPE, field.getType().getTypeID());
       Int intType = (Int) field.getType();
 
-      Assert.assertEquals(64, intType.getBitWidth());
-      Assert.assertTrue(intType.getIsSigned());
+      assertEquals(64, intType.getBitWidth());
+      assertTrue(intType.getIsSigned());
       for (int i = 100; i < 200; i++) {
         VarCharWriter varCharWriter = rootWriter.varChar("a");
         varCharWriter.setPosition(i);
@@ -824,30 +838,28 @@ public void promotableWriter() {
         tempBuf.close();
       }
       field = parent.getField().getChildren().get(0).getChildren().get(0);
-      Assert.assertEquals("a", field.getName());
-      Assert.assertEquals(Union.TYPE_TYPE, field.getType().getTypeID());
-      Assert.assertEquals(Int.TYPE_TYPE, field.getChildren().get(0).getType().getTypeID());
-      Assert.assertEquals(Utf8.TYPE_TYPE, field.getChildren().get(1).getType().getTypeID());
+      assertEquals("a", field.getName());
+      assertEquals(Union.TYPE_TYPE, field.getType().getTypeID());
+      assertEquals(Int.TYPE_TYPE, field.getChildren().get(0).getType().getTypeID());
+      assertEquals(Utf8.TYPE_TYPE, field.getChildren().get(1).getType().getTypeID());
       StructReader rootReader = new SingleStructReaderImpl(parent).reader("root");
       for (int i = 0; i < 100; i++) {
         rootReader.setPosition(i);
         FieldReader reader = rootReader.reader("a");
         Long value = reader.readLong();
-        Assert.assertNotNull("index: " + i, value);
-        Assert.assertEquals(i, value.intValue());
+        assertNotNull(value, "index: " + i);
+        assertEquals(i, value.intValue());
       }
       for (int i = 100; i < 200; i++) {
         rootReader.setPosition(i);
         FieldReader reader = rootReader.reader("a");
         Text value = reader.readText();
-        Assert.assertEquals(Integer.toString(i), value.toString());
+        assertEquals(Integer.toString(i), value.toString());
       }
     }
   }
 
-  /**
-   * Even without writing to the writer, the union schema is created correctly.
-   */
+  /** Even without writing to the writer, the union schema is created correctly. */
   @Test
   public void promotableWriterSchema() {
     try (NonNullableStructVector parent = NonNullableStructVector.empty("parent", allocator)) {
@@ -857,14 +869,14 @@ public void promotableWriterSchema() {
       rootWriter.varChar("a");
 
       Field field = parent.getField().getChildren().get(0).getChildren().get(0);
-      Assert.assertEquals("a", field.getName());
-      Assert.assertEquals(ArrowTypeID.Union, field.getType().getTypeID());
+      assertEquals("a", field.getName());
+      assertEquals(ArrowTypeID.Union, field.getType().getTypeID());
 
-      Assert.assertEquals(ArrowTypeID.Int, field.getChildren().get(0).getType().getTypeID());
+      assertEquals(ArrowTypeID.Int, field.getChildren().get(0).getType().getTypeID());
       Int intType = (Int) field.getChildren().get(0).getType();
-      Assert.assertEquals(64, intType.getBitWidth());
-      Assert.assertTrue(intType.getIsSigned());
-      Assert.assertEquals(ArrowTypeID.Utf8, field.getChildren().get(1).getType().getTypeID());
+      assertEquals(64, intType.getBitWidth());
+      assertTrue(intType.getIsSigned());
+      assertEquals(ArrowTypeID.Utf8, field.getChildren().get(1).getType().getTypeID());
     }
   }
 
@@ -901,28 +913,30 @@ public void structWriterMixedCaseFieldNames() {
 
       List<Field> fieldsCaseSensitive = parent.getField().getChildren().get(0).getChildren();
       Set<String> fieldNamesCaseSensitive = getFieldNames(fieldsCaseSensitive);
-      Assert.assertEquals(11, fieldNamesCaseSensitive.size());
-      Assert.assertTrue(fieldNamesCaseSensitive.contains("int_field"));
-      Assert.assertTrue(fieldNamesCaseSensitive.contains("Int_Field"));
-      Assert.assertTrue(fieldNamesCaseSensitive.contains("float_field"));
-      Assert.assertTrue(fieldNamesCaseSensitive.contains("Float_Field"));
-      Assert.assertTrue(fieldNamesCaseSensitive.contains("struct_field"));
-      Assert.assertTrue(fieldNamesCaseSensitive.contains("struct_field::char_field"));
-      Assert.assertTrue(fieldNamesCaseSensitive.contains("struct_field::Char_Field"));
-      Assert.assertTrue(fieldNamesCaseSensitive.contains("list_field"));
-      Assert.assertTrue(fieldNamesCaseSensitive.contains("list_field::$data$"));
-      Assert.assertTrue(fieldNamesCaseSensitive.contains("list_field::$data$::bit_field"));
-      Assert.assertTrue(fieldNamesCaseSensitive.contains("list_field::$data$::Bit_Field"));
+      assertEquals(11, fieldNamesCaseSensitive.size());
+      assertTrue(fieldNamesCaseSensitive.contains("int_field"));
+      assertTrue(fieldNamesCaseSensitive.contains("Int_Field"));
+      assertTrue(fieldNamesCaseSensitive.contains("float_field"));
+      assertTrue(fieldNamesCaseSensitive.contains("Float_Field"));
+      assertTrue(fieldNamesCaseSensitive.contains("struct_field"));
+      assertTrue(fieldNamesCaseSensitive.contains("struct_field::char_field"));
+      assertTrue(fieldNamesCaseSensitive.contains("struct_field::Char_Field"));
+      assertTrue(fieldNamesCaseSensitive.contains("list_field"));
+      assertTrue(fieldNamesCaseSensitive.contains("list_field::$data$"));
+      assertTrue(fieldNamesCaseSensitive.contains("list_field::$data$::bit_field"));
+      assertTrue(fieldNamesCaseSensitive.contains("list_field::$data$::Bit_Field"));
 
       // test case-insensitive StructWriter
-      ComplexWriter writerCaseInsensitive = new ComplexWriterImpl("rootCaseInsensitive", parent, false, false);
+      ComplexWriter writerCaseInsensitive =
+          new ComplexWriterImpl("rootCaseInsensitive", parent, false, false);
       StructWriter rootWriterCaseInsensitive = writerCaseInsensitive.rootAsStruct();
 
       rootWriterCaseInsensitive.bigInt("int_field");
       rootWriterCaseInsensitive.bigInt("Int_Field");
       rootWriterCaseInsensitive.float4("float_field");
       rootWriterCaseInsensitive.float4("Float_Field");
-      StructWriter structFieldWriterCaseInsensitive = rootWriterCaseInsensitive.struct("struct_field");
+      StructWriter structFieldWriterCaseInsensitive =
+          rootWriterCaseInsensitive.struct("struct_field");
       structFieldWriterCaseInsensitive.varChar("char_field");
       structFieldWriterCaseInsensitive.varChar("Char_Field");
       ListWriter listFieldWriterCaseInsensitive = rootWriterCaseInsensitive.list("list_field");
@@ -932,14 +946,14 @@ public void structWriterMixedCaseFieldNames() {
 
       List<Field> fieldsCaseInsensitive = parent.getField().getChildren().get(1).getChildren();
       Set<String> fieldNamesCaseInsensitive = getFieldNames(fieldsCaseInsensitive);
-      Assert.assertEquals(7, fieldNamesCaseInsensitive.size());
-      Assert.assertTrue(fieldNamesCaseInsensitive.contains("int_field"));
-      Assert.assertTrue(fieldNamesCaseInsensitive.contains("float_field"));
-      Assert.assertTrue(fieldNamesCaseInsensitive.contains("struct_field"));
-      Assert.assertTrue(fieldNamesCaseInsensitive.contains("struct_field::char_field"));
-      Assert.assertTrue(fieldNamesCaseSensitive.contains("list_field"));
-      Assert.assertTrue(fieldNamesCaseSensitive.contains("list_field::$data$"));
-      Assert.assertTrue(fieldNamesCaseSensitive.contains("list_field::$data$::bit_field"));
+      assertEquals(7, fieldNamesCaseInsensitive.size());
+      assertTrue(fieldNamesCaseInsensitive.contains("int_field"));
+      assertTrue(fieldNamesCaseInsensitive.contains("float_field"));
+      assertTrue(fieldNamesCaseInsensitive.contains("struct_field"));
+      assertTrue(fieldNamesCaseInsensitive.contains("struct_field::char_field"));
+      assertTrue(fieldNamesCaseSensitive.contains("list_field"));
+      assertTrue(fieldNamesCaseSensitive.contains("list_field::$data$"));
+      assertTrue(fieldNamesCaseSensitive.contains("list_field::$data$::bit_field"));
     }
   }
 
@@ -976,15 +990,15 @@ public void timeStampSecWriter() throws Exception {
         FieldReader secReader = rootReader.reader("sec");
         secReader.setPosition(0);
         LocalDateTime secDateTime = secReader.readLocalDateTime();
-        Assert.assertEquals(expectedSecDateTime, secDateTime);
+        assertEquals(expectedSecDateTime, secDateTime);
         long secLong = secReader.readLong();
-        Assert.assertEquals(expectedSecs, secLong);
+        assertEquals(expectedSecs, secLong);
       }
       {
         FieldReader secTZReader = rootReader.reader("secTZ");
         secTZReader.setPosition(1);
         long secTZLong = secTZReader.readLong();
-        Assert.assertEquals(expectedSecs, secTZLong);
+        assertEquals(expectedSecs, secTZLong);
       }
     }
   }
@@ -993,9 +1007,10 @@ public void timeStampSecWriter() throws Exception {
   public void timeStampMilliWriters() throws Exception {
     // test values
     final long expectedMillis = 981173106123L;
-    final LocalDateTime expectedMilliDateTime = LocalDateTime.of(2001, 2, 3, 4, 5, 6, 123 * 1_000_000);
+    final LocalDateTime expectedMilliDateTime =
+        LocalDateTime.of(2001, 2, 3, 4, 5, 6, 123 * 1_000_000);
 
-    try (NonNullableStructVector parent = NonNullableStructVector.empty("parent", allocator);) {
+    try (NonNullableStructVector parent = NonNullableStructVector.empty("parent", allocator); ) {
       // write
       ComplexWriter writer = new ComplexWriterImpl("root", parent);
       StructWriter rootWriter = writer.rootAsStruct();
@@ -1022,34 +1037,35 @@ public void timeStampMilliWriters() throws Exception {
         FieldReader milliReader = rootReader.reader("milli");
         milliReader.setPosition(0);
         LocalDateTime milliDateTime = milliReader.readLocalDateTime();
-        Assert.assertEquals(expectedMilliDateTime, milliDateTime);
+        assertEquals(expectedMilliDateTime, milliDateTime);
         long milliLong = milliReader.readLong();
-        Assert.assertEquals(expectedMillis, milliLong);
+        assertEquals(expectedMillis, milliLong);
       }
       {
         FieldReader milliTZReader = rootReader.reader("milliTZ");
         milliTZReader.setPosition(0);
         long milliTZLong = milliTZReader.readLong();
-        Assert.assertEquals(expectedMillis, milliTZLong);
+        assertEquals(expectedMillis, milliTZLong);
       }
     }
   }
 
   private void checkTimestampField(Field field, String name) {
-    Assert.assertEquals(name, field.getName());
-    Assert.assertEquals(ArrowType.Timestamp.TYPE_TYPE, field.getType().getTypeID());
+    assertEquals(name, field.getName());
+    assertEquals(ArrowType.Timestamp.TYPE_TYPE, field.getType().getTypeID());
   }
 
   private void checkTimestampTZField(Field field, String name, String tz) {
     checkTimestampField(field, name);
-    Assert.assertEquals(tz, ((Timestamp) field.getType()).getTimezone());
+    assertEquals(tz, ((Timestamp) field.getType()).getTimezone());
   }
 
   @Test
   public void timeStampMicroWriters() throws Exception {
     // test values
     final long expectedMicros = 981173106123456L;
-    final LocalDateTime expectedMicroDateTime = LocalDateTime.of(2001, 2, 3, 4, 5, 6, 123456 * 1000);
+    final LocalDateTime expectedMicroDateTime =
+        LocalDateTime.of(2001, 2, 3, 4, 5, 6, 123456 * 1000);
 
     try (NonNullableStructVector parent = NonNullableStructVector.empty("parent", allocator)) {
       // write
@@ -1079,15 +1095,15 @@ public void timeStampMicroWriters() throws Exception {
         FieldReader microReader = rootReader.reader("micro");
         microReader.setPosition(0);
         LocalDateTime microDateTime = microReader.readLocalDateTime();
-        Assert.assertEquals(expectedMicroDateTime, microDateTime);
+        assertEquals(expectedMicroDateTime, microDateTime);
         long microLong = microReader.readLong();
-        Assert.assertEquals(expectedMicros, microLong);
+        assertEquals(expectedMicros, microLong);
       }
       {
         FieldReader microReader = rootReader.reader("microTZ");
         microReader.setPosition(1);
         long microLong = microReader.readLong();
-        Assert.assertEquals(expectedMicros, microLong);
+        assertEquals(expectedMicros, microLong);
       }
     }
   }
@@ -1125,21 +1141,20 @@ public void timeStampNanoWriters() throws Exception {
         FieldReader nanoReader = rootReader.reader("nano");
         nanoReader.setPosition(0);
         LocalDateTime nanoDateTime = nanoReader.readLocalDateTime();
-        Assert.assertEquals(expectedNanoDateTime, nanoDateTime);
+        assertEquals(expectedNanoDateTime, nanoDateTime);
         long nanoLong = nanoReader.readLong();
-        Assert.assertEquals(expectedNanos, nanoLong);
+        assertEquals(expectedNanos, nanoLong);
       }
       {
         FieldReader nanoReader = rootReader.reader("nanoTZ");
         nanoReader.setPosition(0);
         long nanoLong = nanoReader.readLong();
-        Assert.assertEquals(expectedNanos, nanoLong);
+        assertEquals(expectedNanos, nanoLong);
         NullableTimeStampNanoTZHolder h = new NullableTimeStampNanoTZHolder();
         nanoReader.read(h);
-        Assert.assertEquals(expectedNanos, h.value);
+        assertEquals(expectedNanos, h.value);
       }
     }
-
   }
 
   @Test
@@ -1165,7 +1180,8 @@ public void fixedSizeBinaryWriters() throws Exception {
       StructWriter rootWriter = writer.rootAsStruct();
 
       String fieldName = "fixedSizeBinary";
-      FixedSizeBinaryWriter fixedSizeBinaryWriter = rootWriter.fixedSizeBinary(fieldName, byteWidth);
+      FixedSizeBinaryWriter fixedSizeBinaryWriter =
+          rootWriter.fixedSizeBinary(fieldName, byteWidth);
       for (int i = 0; i < numValues; i++) {
         fixedSizeBinaryWriter.setPosition(i);
         fixedSizeBinaryWriter.writeFixedSizeBinary(bufs[i]);
@@ -1173,8 +1189,8 @@ public void fixedSizeBinaryWriters() throws Exception {
 
       // schema
       List<Field> children = parent.getField().getChildren().get(0).getChildren();
-      Assert.assertEquals(fieldName, children.get(0).getName());
-      Assert.assertEquals(ArrowType.FixedSizeBinary.TYPE_TYPE, children.get(0).getType().getTypeID());
+      assertEquals(fieldName, children.get(0).getName());
+      assertEquals(ArrowType.FixedSizeBinary.TYPE_TYPE, children.get(0).getType().getTypeID());
 
       // read
       StructReader rootReader = new SingleStructReaderImpl(parent).reader("root");
@@ -1183,7 +1199,7 @@ public void fixedSizeBinaryWriters() throws Exception {
       for (int i = 0; i < numValues; i++) {
         fixedSizeBinaryReader.setPosition(i);
         byte[] readValues = fixedSizeBinaryReader.readByteArray();
-        Assert.assertArrayEquals(values[i], readValues);
+        assertArrayEquals(values[i], readValues);
       }
     }
 
@@ -1334,8 +1350,6 @@ public void testSingleStructWriter1() {
         }
       }
     }
-
-
   }
 
   @Test
@@ -1369,17 +1383,17 @@ public void testListWriterWithNulls() {
       for (int i = 0; i < COUNT; i++) {
         listReader.setPosition(i);
         if (i % 2 == 0) {
-          Assert.assertTrue(listReader.isSet());
+          assertTrue(listReader.isSet());
           listReader.next();
           if (i % 4 == 0) {
-            Assert.assertNull(listReader.reader().readInteger());
+            assertNull(listReader.reader().readInteger());
           } else {
-            Assert.assertEquals(i, listReader.reader().readInteger().intValue());
+            assertEquals(i, listReader.reader().readInteger().intValue());
             listReader.next();
-            Assert.assertEquals(i * 2, listReader.reader().readInteger().intValue());
+            assertEquals(i * 2, listReader.reader().readInteger().intValue());
           }
         } else {
-          Assert.assertFalse(listReader.isSet());
+          assertFalse(listReader.isSet());
         }
       }
     }
@@ -1419,20 +1433,20 @@ public void testListOfListWriterWithNulls() {
       for (int i = 0; i < COUNT; i++) {
         listReader.setPosition(i);
         if (i % 2 == 0) {
-          Assert.assertTrue(listReader.isSet());
+          assertTrue(listReader.isSet());
           listReader.next();
           if (i % 4 == 0) {
-            Assert.assertFalse(listReader.reader().isSet());
+            assertFalse(listReader.reader().isSet());
           } else {
             listReader.reader().next();
-            Assert.assertFalse(listReader.reader().reader().isSet());
+            assertFalse(listReader.reader().reader().isSet());
             listReader.reader().next();
-            Assert.assertEquals(i, listReader.reader().reader().readInteger().intValue());
+            assertEquals(i, listReader.reader().reader().readInteger().intValue());
             listReader.reader().next();
-            Assert.assertEquals(i * 2, listReader.reader().reader().readInteger().intValue());
+            assertEquals(i * 2, listReader.reader().reader().readInteger().intValue());
           }
         } else {
-          Assert.assertFalse(listReader.isSet());
+          assertFalse(listReader.isSet());
         }
       }
     }
@@ -1478,23 +1492,23 @@ public void testListOfListOfListWriterWithNulls() {
       for (int i = 0; i < COUNT; i++) {
         listReader.setPosition(i);
         if (i % 4 == 0) {
-          Assert.assertFalse(listReader.isSet());
+          assertFalse(listReader.isSet());
         } else {
-          Assert.assertTrue(listReader.isSet());
+          assertTrue(listReader.isSet());
           listReader.next();
           if (i % 4 == 1) {
-            Assert.assertFalse(listReader.reader().isSet());
+            assertFalse(listReader.reader().isSet());
           } else if (i % 4 == 2) {
             listReader.reader().next();
-            Assert.assertFalse(listReader.reader().reader().isSet());
+            assertFalse(listReader.reader().reader().isSet());
           } else {
             listReader.reader().next();
             listReader.reader().reader().next();
-            Assert.assertFalse(listReader.reader().reader().reader().isSet());
+            assertFalse(listReader.reader().reader().reader().isSet());
             listReader.reader().reader().next();
-            Assert.assertEquals(i, listReader.reader().reader().reader().readInteger().intValue());
+            assertEquals(i, listReader.reader().reader().reader().readInteger().intValue());
             listReader.reader().reader().next();
-            Assert.assertEquals(i * 2, listReader.reader().reader().reader().readInteger().intValue());
+            assertEquals(i * 2, listReader.reader().reader().reader().readInteger().intValue());
           }
         }
       }
@@ -1507,7 +1521,7 @@ public void testStructOfList() {
       structVector.addOrGetList("childList1");
       NullableStructReaderImpl structReader = structVector.getReader();
       FieldReader childListReader = structReader.reader("childList1");
-      Assert.assertNotNull(childListReader);
+      assertNotNull(childListReader);
     }
 
     try (StructVector structVector = StructVector.empty("struct2", allocator)) {
@@ -1523,9 +1537,9 @@ public void testStructOfList() {
       NullableStructReaderImpl structReader = structVector.getReader();
       FieldReader childListReader = structReader.reader("childList2");
       int size = childListReader.size();
-      Assert.assertEquals(1, size);
+      assertEquals(1, size);
       int data = childListReader.reader().readInteger();
-      Assert.assertEquals(10, data);
+      assertEquals(10, data);
     }
 
     try (StructVector structVector = StructVector.empty("struct3", allocator)) {
@@ -1545,9 +1559,9 @@ public void testStructOfList() {
       structReader.setPosition(3);
       FieldReader childListReader = structReader.reader("childList3");
       int size = childListReader.size();
-      Assert.assertEquals(1, size);
+      assertEquals(1, size);
       int data = ((List<Integer>) childListReader.readObject()).get(0);
-      Assert.assertEquals(3, data);
+      assertEquals(3, data);
     }
 
     try (StructVector structVector = StructVector.empty("struct4", allocator)) {
@@ -1564,7 +1578,7 @@ public void testStructOfList() {
       structReader.setPosition(3);
       FieldReader childListReader = structReader.reader("childList4");
       int size = childListReader.size();
-      Assert.assertEquals(0, size);
+      assertEquals(0, size);
     }
   }
 
@@ -1618,7 +1632,7 @@ public void testMapWithNulls() {
       mapWriter.endMap();
       writer.setValueCount(1);
       UnionMapReader mapReader = (UnionMapReader) new SingleStructReaderImpl(parent).reader("root");
-      Assert.assertNull(mapReader.key().readInteger());
+      assertNull(mapReader.key().readInteger());
       assertEquals(1, mapReader.value().readInteger().intValue());
     }
   }
@@ -1684,7 +1698,28 @@ public void structWriterVarCharHelpers() {
       rootWriter.varChar("c").writeVarChar("row2");
       rootWriter.end();
 
-      VarCharVector vector = parent.getChild("root", StructVector.class).getChild("c", VarCharVector.class);
+      VarCharVector vector =
+          parent.getChild("root", StructVector.class).getChild("c", VarCharVector.class);
+
+      assertEquals("row1", vector.getObject(0).toString());
+      assertEquals("row2", vector.getObject(1).toString());
+    }
+  }
+
+  @Test
+  public void structWriterVarCharViewHelpers() {
+    try (NonNullableStructVector parent = NonNullableStructVector.empty("parent", allocator)) {
+      ComplexWriter writer = new ComplexWriterImpl("root", parent, false, true);
+      StructWriter rootWriter = writer.rootAsStruct();
+      rootWriter.start();
+      rootWriter.setPosition(0);
+      rootWriter.viewVarChar("c").writeViewVarChar(new Text("row1"));
+      rootWriter.setPosition(1);
+      rootWriter.viewVarChar("c").writeViewVarChar("row2");
+      rootWriter.end();
+
+      ViewVarCharVector vector =
+          parent.getChild("root", StructVector.class).getChild("c", ViewVarCharVector.class);
 
       assertEquals("row1", vector.getObject(0).toString());
       assertEquals("row2", vector.getObject(1).toString());
@@ -1703,8 +1738,8 @@ public void structWriterLargeVarCharHelpers() {
       rootWriter.largeVarChar("c").writeLargeVarChar("row2");
       rootWriter.end();
 
-      LargeVarCharVector vector = parent.getChild("root", StructVector.class).getChild("c",
-          LargeVarCharVector.class);
+      LargeVarCharVector vector =
+          parent.getChild("root", StructVector.class).getChild("c", LargeVarCharVector.class);
 
       assertEquals("row1", vector.getObject(0).toString());
       assertEquals("row2", vector.getObject(1).toString());
@@ -1720,16 +1755,27 @@ public void structWriterVarBinaryHelpers() {
       rootWriter.setPosition(0);
       rootWriter.varBinary("c").writeVarBinary("row1".getBytes(StandardCharsets.UTF_8));
       rootWriter.setPosition(1);
-      rootWriter.varBinary("c").writeVarBinary("row2".getBytes(StandardCharsets.UTF_8), 0,
-          "row2".getBytes(StandardCharsets.UTF_8).length);
+      rootWriter
+          .varBinary("c")
+          .writeVarBinary(
+              "row2".getBytes(StandardCharsets.UTF_8),
+              0,
+              "row2".getBytes(StandardCharsets.UTF_8).length);
       rootWriter.setPosition(2);
-      rootWriter.varBinary("c").writeVarBinary(ByteBuffer.wrap("row3".getBytes(StandardCharsets.UTF_8)));
+      rootWriter
+          .varBinary("c")
+          .writeVarBinary(ByteBuffer.wrap("row3".getBytes(StandardCharsets.UTF_8)));
       rootWriter.setPosition(3);
-      rootWriter.varBinary("c").writeVarBinary(ByteBuffer.wrap(
-          "row4".getBytes(StandardCharsets.UTF_8)), 0, "row4".getBytes(StandardCharsets.UTF_8).length);
+      rootWriter
+          .varBinary("c")
+          .writeVarBinary(
+              ByteBuffer.wrap("row4".getBytes(StandardCharsets.UTF_8)),
+              0,
+              "row4".getBytes(StandardCharsets.UTF_8).length);
       rootWriter.end();
 
-      VarBinaryVector uv = parent.getChild("root", StructVector.class).getChild("c", VarBinaryVector.class);
+      VarBinaryVector uv =
+          parent.getChild("root", StructVector.class).getChild("c", VarBinaryVector.class);
 
       assertEquals("row1", new String(uv.get(0), StandardCharsets.UTF_8));
       assertEquals("row2", new String(uv.get(1), StandardCharsets.UTF_8));
@@ -1747,17 +1793,27 @@ public void structWriterLargeVarBinaryHelpers() {
       rootWriter.setPosition(0);
       rootWriter.largeVarBinary("c").writeLargeVarBinary("row1".getBytes(StandardCharsets.UTF_8));
       rootWriter.setPosition(1);
-      rootWriter.largeVarBinary("c").writeLargeVarBinary("row2".getBytes(StandardCharsets.UTF_8), 0,
-          "row2".getBytes(StandardCharsets.UTF_8).length);
+      rootWriter
+          .largeVarBinary("c")
+          .writeLargeVarBinary(
+              "row2".getBytes(StandardCharsets.UTF_8),
+              0,
+              "row2".getBytes(StandardCharsets.UTF_8).length);
       rootWriter.setPosition(2);
-      rootWriter.largeVarBinary("c").writeLargeVarBinary(ByteBuffer.wrap("row3".getBytes(StandardCharsets.UTF_8)));
+      rootWriter
+          .largeVarBinary("c")
+          .writeLargeVarBinary(ByteBuffer.wrap("row3".getBytes(StandardCharsets.UTF_8)));
       rootWriter.setPosition(3);
-      rootWriter.largeVarBinary("c").writeLargeVarBinary(ByteBuffer.wrap(
-          "row4".getBytes(StandardCharsets.UTF_8)), 0, "row4".getBytes(StandardCharsets.UTF_8).length);
+      rootWriter
+          .largeVarBinary("c")
+          .writeLargeVarBinary(
+              ByteBuffer.wrap("row4".getBytes(StandardCharsets.UTF_8)),
+              0,
+              "row4".getBytes(StandardCharsets.UTF_8).length);
       rootWriter.end();
 
-      LargeVarBinaryVector uv = parent.getChild("root", StructVector.class).getChild("c",
-          LargeVarBinaryVector.class);
+      LargeVarBinaryVector uv =
+          parent.getChild("root", StructVector.class).getChild("c", LargeVarBinaryVector.class);
 
       assertEquals("row1", new String(uv.get(0), StandardCharsets.UTF_8));
       assertEquals("row2", new String(uv.get(1), StandardCharsets.UTF_8));
@@ -1803,17 +1859,25 @@ public void listVarBinaryHelpers() {
       UnionListWriter listWriter = new UnionListWriter(listVector);
       listWriter.startList();
       listWriter.writeVarBinary("row1".getBytes(StandardCharsets.UTF_8));
-      listWriter.writeVarBinary("row2".getBytes(StandardCharsets.UTF_8), 0,
+      listWriter.writeVarBinary(
+          "row2".getBytes(StandardCharsets.UTF_8),
+          0,
           "row2".getBytes(StandardCharsets.UTF_8).length);
       listWriter.writeVarBinary(ByteBuffer.wrap("row3".getBytes(StandardCharsets.UTF_8)));
-      listWriter.writeVarBinary(ByteBuffer.wrap(
-          "row4".getBytes(StandardCharsets.UTF_8)), 0, "row4".getBytes(StandardCharsets.UTF_8).length);
+      listWriter.writeVarBinary(
+          ByteBuffer.wrap("row4".getBytes(StandardCharsets.UTF_8)),
+          0,
+          "row4".getBytes(StandardCharsets.UTF_8).length);
       listWriter.endList();
       listWriter.setValueCount(1);
-      assertEquals("row1", new String((byte[]) listVector.getObject(0).get(0), StandardCharsets.UTF_8));
-      assertEquals("row2", new String((byte[]) listVector.getObject(0).get(1), StandardCharsets.UTF_8));
-      assertEquals("row3", new String((byte[]) listVector.getObject(0).get(2), StandardCharsets.UTF_8));
-      assertEquals("row4", new String((byte[]) listVector.getObject(0).get(3), StandardCharsets.UTF_8));
+      assertEquals(
+          "row1", new String((byte[]) listVector.getObject(0).get(0), StandardCharsets.UTF_8));
+      assertEquals(
+          "row2", new String((byte[]) listVector.getObject(0).get(1), StandardCharsets.UTF_8));
+      assertEquals(
+          "row3", new String((byte[]) listVector.getObject(0).get(2), StandardCharsets.UTF_8));
+      assertEquals(
+          "row4", new String((byte[]) listVector.getObject(0).get(3), StandardCharsets.UTF_8));
     }
   }
 
@@ -1824,23 +1888,32 @@ public void listLargeVarBinaryHelpers() {
       UnionListWriter listWriter = new UnionListWriter(listVector);
       listWriter.startList();
       listWriter.writeLargeVarBinary("row1".getBytes(StandardCharsets.UTF_8));
-      listWriter.writeLargeVarBinary("row2".getBytes(StandardCharsets.UTF_8), 0,
+      listWriter.writeLargeVarBinary(
+          "row2".getBytes(StandardCharsets.UTF_8),
+          0,
           "row2".getBytes(StandardCharsets.UTF_8).length);
       listWriter.writeLargeVarBinary(ByteBuffer.wrap("row3".getBytes(StandardCharsets.UTF_8)));
-      listWriter.writeLargeVarBinary(ByteBuffer.wrap(
-          "row4".getBytes(StandardCharsets.UTF_8)), 0, "row4".getBytes(StandardCharsets.UTF_8).length);
+      listWriter.writeLargeVarBinary(
+          ByteBuffer.wrap("row4".getBytes(StandardCharsets.UTF_8)),
+          0,
+          "row4".getBytes(StandardCharsets.UTF_8).length);
       listWriter.endList();
       listWriter.setValueCount(1);
-      assertEquals("row1", new String((byte[]) listVector.getObject(0).get(0), StandardCharsets.UTF_8));
-      assertEquals("row2", new String((byte[]) listVector.getObject(0).get(1), StandardCharsets.UTF_8));
-      assertEquals("row3", new String((byte[]) listVector.getObject(0).get(2), StandardCharsets.UTF_8));
-      assertEquals("row4", new String((byte[]) listVector.getObject(0).get(3), StandardCharsets.UTF_8));
+      assertEquals(
+          "row1", new String((byte[]) listVector.getObject(0).get(0), StandardCharsets.UTF_8));
+      assertEquals(
+          "row2", new String((byte[]) listVector.getObject(0).get(1), StandardCharsets.UTF_8));
+      assertEquals(
+          "row3", new String((byte[]) listVector.getObject(0).get(2), StandardCharsets.UTF_8));
+      assertEquals(
+          "row4", new String((byte[]) listVector.getObject(0).get(3), StandardCharsets.UTF_8));
     }
   }
 
   @Test
   public void unionWithVarCharAndBinaryHelpers() throws Exception {
-    try (UnionVector vector = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null)) {
+    try (UnionVector vector =
+        new UnionVector("union", allocator, /* field type */ null, /* call-back */ null)) {
       UnionWriter unionWriter = new UnionWriter(vector);
       unionWriter.allocate();
       unionWriter.start();
@@ -1855,37 +1928,51 @@ public void unionWithVarCharAndBinaryHelpers() throws Exception {
       unionWriter.setPosition(4);
       unionWriter.writeVarBinary("row5".getBytes(StandardCharsets.UTF_8));
       unionWriter.setPosition(5);
-      unionWriter.writeVarBinary("row6".getBytes(StandardCharsets.UTF_8), 0,
+      unionWriter.writeVarBinary(
+          "row6".getBytes(StandardCharsets.UTF_8),
+          0,
           "row6".getBytes(StandardCharsets.UTF_8).length);
       unionWriter.setPosition(6);
       unionWriter.writeVarBinary(ByteBuffer.wrap("row7".getBytes(StandardCharsets.UTF_8)));
       unionWriter.setPosition(7);
-      unionWriter.writeVarBinary(ByteBuffer.wrap("row8".getBytes(StandardCharsets.UTF_8)), 0,
+      unionWriter.writeVarBinary(
+          ByteBuffer.wrap("row8".getBytes(StandardCharsets.UTF_8)),
+          0,
           "row8".getBytes(StandardCharsets.UTF_8).length);
       unionWriter.setPosition(8);
       unionWriter.writeLargeVarBinary("row9".getBytes(StandardCharsets.UTF_8));
       unionWriter.setPosition(9);
-      unionWriter.writeLargeVarBinary("row10".getBytes(StandardCharsets.UTF_8), 0,
+      unionWriter.writeLargeVarBinary(
+          "row10".getBytes(StandardCharsets.UTF_8),
+          0,
           "row10".getBytes(StandardCharsets.UTF_8).length);
       unionWriter.setPosition(10);
       unionWriter.writeLargeVarBinary(ByteBuffer.wrap("row11".getBytes(StandardCharsets.UTF_8)));
       unionWriter.setPosition(11);
-      unionWriter.writeLargeVarBinary(ByteBuffer.wrap(
-          "row12".getBytes(StandardCharsets.UTF_8)), 0, "row12".getBytes(StandardCharsets.UTF_8).length);
+      unionWriter.writeLargeVarBinary(
+          ByteBuffer.wrap("row12".getBytes(StandardCharsets.UTF_8)),
+          0,
+          "row12".getBytes(StandardCharsets.UTF_8).length);
       unionWriter.end();
 
       assertEquals("row1", new String(vector.getVarCharVector().get(0), StandardCharsets.UTF_8));
       assertEquals("row2", new String(vector.getVarCharVector().get(1), StandardCharsets.UTF_8));
-      assertEquals("row3", new String(vector.getLargeVarCharVector().get(2), StandardCharsets.UTF_8));
-      assertEquals("row4", new String(vector.getLargeVarCharVector().get(3), StandardCharsets.UTF_8));
+      assertEquals(
+          "row3", new String(vector.getLargeVarCharVector().get(2), StandardCharsets.UTF_8));
+      assertEquals(
+          "row4", new String(vector.getLargeVarCharVector().get(3), StandardCharsets.UTF_8));
       assertEquals("row5", new String(vector.getVarBinaryVector().get(4), StandardCharsets.UTF_8));
       assertEquals("row6", new String(vector.getVarBinaryVector().get(5), StandardCharsets.UTF_8));
       assertEquals("row7", new String(vector.getVarBinaryVector().get(6), StandardCharsets.UTF_8));
       assertEquals("row8", new String(vector.getVarBinaryVector().get(7), StandardCharsets.UTF_8));
-      assertEquals("row9", new String(vector.getLargeVarBinaryVector().get(8), StandardCharsets.UTF_8));
-      assertEquals("row10", new String(vector.getLargeVarBinaryVector().get(9), StandardCharsets.UTF_8));
-      assertEquals("row11", new String(vector.getLargeVarBinaryVector().get(10), StandardCharsets.UTF_8));
-      assertEquals("row12", new String(vector.getLargeVarBinaryVector().get(11), StandardCharsets.UTF_8));
+      assertEquals(
+          "row9", new String(vector.getLargeVarBinaryVector().get(8), StandardCharsets.UTF_8));
+      assertEquals(
+          "row10", new String(vector.getLargeVarBinaryVector().get(9), StandardCharsets.UTF_8));
+      assertEquals(
+          "row11", new String(vector.getLargeVarBinaryVector().get(10), StandardCharsets.UTF_8));
+      assertEquals(
+          "row12", new String(vector.getLargeVarBinaryVector().get(11), StandardCharsets.UTF_8));
     }
   }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestSimpleWriter.java b/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestSimpleWriter.java
index 27b8f1796ee31..5bb596270417c 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestSimpleWriter.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestSimpleWriter.java
@@ -14,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.complex.writer;
 
-import java.nio.ByteBuffer;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.nio.ByteBuffer;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.LargeVarBinaryVector;
@@ -30,21 +31,20 @@
 import org.apache.arrow.vector.complex.impl.VarBinaryWriterImpl;
 import org.apache.arrow.vector.complex.impl.VarCharWriterImpl;
 import org.apache.arrow.vector.util.Text;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestSimpleWriter {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Integer.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -52,136 +52,136 @@ public void terminate() throws Exception {
   @Test
   public void testWriteByteArrayToVarBinary() throws Exception {
     try (VarBinaryVector vector = new VarBinaryVector("test", allocator);
-         VarBinaryWriter writer = new VarBinaryWriterImpl(vector)) {
-      byte[] input = new byte[] { 0x01, 0x02 };
+        VarBinaryWriter writer = new VarBinaryWriterImpl(vector)) {
+      byte[] input = new byte[] {0x01, 0x02};
       writer.writeVarBinary(input);
       byte[] result = vector.get(0);
-      Assert.assertArrayEquals(input, result);
+      assertArrayEquals(input, result);
     }
   }
 
   @Test
   public void testWriteByteArrayWithOffsetToVarBinary() throws Exception {
     try (VarBinaryVector vector = new VarBinaryVector("test", allocator);
-         VarBinaryWriter writer = new VarBinaryWriterImpl(vector)) {
-      byte[] input = new byte[] { 0x01, 0x02 };
+        VarBinaryWriter writer = new VarBinaryWriterImpl(vector)) {
+      byte[] input = new byte[] {0x01, 0x02};
       writer.writeVarBinary(input, 1, 1);
       byte[] result = vector.get(0);
-      Assert.assertArrayEquals(new byte[] { 0x02 }, result);
+      assertArrayEquals(new byte[] {0x02}, result);
     }
   }
 
   @Test
   public void testWriteByteBufferToVarBinary() throws Exception {
     try (VarBinaryVector vector = new VarBinaryVector("test", allocator);
-         VarBinaryWriter writer = new VarBinaryWriterImpl(vector)) {
-      byte[] input = new byte[] { 0x01, 0x02 };
+        VarBinaryWriter writer = new VarBinaryWriterImpl(vector)) {
+      byte[] input = new byte[] {0x01, 0x02};
       ByteBuffer buffer = ByteBuffer.wrap(input);
       writer.writeVarBinary(buffer);
       byte[] result = vector.get(0);
-      Assert.assertArrayEquals(input, result);
+      assertArrayEquals(input, result);
     }
   }
 
   @Test
   public void testWriteByteBufferWithOffsetToVarBinary() throws Exception {
     try (VarBinaryVector vector = new VarBinaryVector("test", allocator);
-         VarBinaryWriter writer = new VarBinaryWriterImpl(vector)) {
-      byte[] input = new byte[] { 0x01, 0x02 };
+        VarBinaryWriter writer = new VarBinaryWriterImpl(vector)) {
+      byte[] input = new byte[] {0x01, 0x02};
       ByteBuffer buffer = ByteBuffer.wrap(input);
       writer.writeVarBinary(buffer, 1, 1);
       byte[] result = vector.get(0);
-      Assert.assertArrayEquals(new byte[] { 0x02 }, result);
+      assertArrayEquals(new byte[] {0x02}, result);
     }
   }
 
   @Test
   public void testWriteByteArrayToLargeVarBinary() throws Exception {
     try (LargeVarBinaryVector vector = new LargeVarBinaryVector("test", allocator);
-         LargeVarBinaryWriter writer = new LargeVarBinaryWriterImpl(vector)) {
-      byte[] input = new byte[] { 0x01, 0x02 };
+        LargeVarBinaryWriter writer = new LargeVarBinaryWriterImpl(vector)) {
+      byte[] input = new byte[] {0x01, 0x02};
       writer.writeLargeVarBinary(input);
       byte[] result = vector.get(0);
-      Assert.assertArrayEquals(input, result);
+      assertArrayEquals(input, result);
     }
   }
 
   @Test
   public void testWriteByteArrayWithOffsetToLargeVarBinary() throws Exception {
     try (LargeVarBinaryVector vector = new LargeVarBinaryVector("test", allocator);
-         LargeVarBinaryWriter writer = new LargeVarBinaryWriterImpl(vector)) {
-      byte[] input = new byte[] { 0x01, 0x02 };
+        LargeVarBinaryWriter writer = new LargeVarBinaryWriterImpl(vector)) {
+      byte[] input = new byte[] {0x01, 0x02};
       writer.writeLargeVarBinary(input, 1, 1);
       byte[] result = vector.get(0);
-      Assert.assertArrayEquals(new byte[] { 0x02 }, result);
+      assertArrayEquals(new byte[] {0x02}, result);
     }
   }
 
   @Test
   public void testWriteByteBufferToLargeVarBinary() throws Exception {
     try (LargeVarBinaryVector vector = new LargeVarBinaryVector("test", allocator);
-         LargeVarBinaryWriter writer = new LargeVarBinaryWriterImpl(vector)) {
-      byte[] input = new byte[] { 0x01, 0x02 };
+        LargeVarBinaryWriter writer = new LargeVarBinaryWriterImpl(vector)) {
+      byte[] input = new byte[] {0x01, 0x02};
       ByteBuffer buffer = ByteBuffer.wrap(input);
       writer.writeLargeVarBinary(buffer);
       byte[] result = vector.get(0);
-      Assert.assertArrayEquals(input, result);
+      assertArrayEquals(input, result);
     }
   }
 
   @Test
   public void testWriteByteBufferWithOffsetToLargeVarBinary() throws Exception {
     try (LargeVarBinaryVector vector = new LargeVarBinaryVector("test", allocator);
-         LargeVarBinaryWriter writer = new LargeVarBinaryWriterImpl(vector)) {
-      byte[] input = new byte[] { 0x01, 0x02 };
+        LargeVarBinaryWriter writer = new LargeVarBinaryWriterImpl(vector)) {
+      byte[] input = new byte[] {0x01, 0x02};
       ByteBuffer buffer = ByteBuffer.wrap(input);
       writer.writeLargeVarBinary(buffer, 1, 1);
       byte[] result = vector.get(0);
-      Assert.assertArrayEquals(new byte[] { 0x02 }, result);
+      assertArrayEquals(new byte[] {0x02}, result);
     }
   }
 
   @Test
   public void testWriteStringToVarChar() throws Exception {
     try (VarCharVector vector = new VarCharVector("test", allocator);
-         VarCharWriter writer = new VarCharWriterImpl(vector)) {
+        VarCharWriter writer = new VarCharWriterImpl(vector)) {
       String input = "testInput";
       writer.writeVarChar(input);
       String result = vector.getObject(0).toString();
-      Assert.assertEquals(input, result);
+      assertEquals(input, result);
     }
   }
 
   @Test
   public void testWriteTextToVarChar() throws Exception {
     try (VarCharVector vector = new VarCharVector("test", allocator);
-         VarCharWriter writer = new VarCharWriterImpl(vector)) {
+        VarCharWriter writer = new VarCharWriterImpl(vector)) {
       String input = "testInput";
       writer.writeVarChar(new Text(input));
       String result = vector.getObject(0).toString();
-      Assert.assertEquals(input, result);
+      assertEquals(input, result);
     }
   }
 
   @Test
   public void testWriteStringToLargeVarChar() throws Exception {
     try (LargeVarCharVector vector = new LargeVarCharVector("test", allocator);
-         LargeVarCharWriter writer = new LargeVarCharWriterImpl(vector)) {
+        LargeVarCharWriter writer = new LargeVarCharWriterImpl(vector)) {
       String input = "testInput";
       writer.writeLargeVarChar(input);
       String result = vector.getObject(0).toString();
-      Assert.assertEquals(input, result);
+      assertEquals(input, result);
     }
   }
 
   @Test
   public void testWriteTextToLargeVarChar() throws Exception {
     try (LargeVarCharVector vector = new LargeVarCharVector("test", allocator);
-         LargeVarCharWriter writer = new LargeVarCharWriterImpl(vector)) {
+        LargeVarCharWriter writer = new LargeVarCharWriterImpl(vector)) {
       String input = "testInput";
       writer.writeLargeVarChar(new Text(input));
       String result = vector.getObject(0).toString();
-      Assert.assertEquals(input, result);
+      assertEquals(input, result);
     }
   }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/BaseFileTest.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/BaseFileTest.java
index de9187edb667e..c18f6faeb548f 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/BaseFileTest.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/BaseFileTest.java
@@ -14,13 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import static org.apache.arrow.vector.TestUtils.newVarCharVector;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -32,7 +34,6 @@
 import java.time.ZoneOffset;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -84,37 +85,40 @@
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.util.JsonStringArrayList;
 import org.apache.arrow.vector.util.Text;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * Helps testing the file formats.
- */
+/** Helps testing the file formats. */
 public class BaseFileTest {
   private static final Logger LOGGER = LoggerFactory.getLogger(BaseFileTest.class);
   protected static final int COUNT = 10;
   protected BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Integer.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void tearDown() {
     allocator.close();
   }
 
-
-  private static short [] uint1Values = new short[]{0, 255, 1, 128, 2};
-  private static char [] uint2Values = new char[]{0, Character.MAX_VALUE, 1, Short.MAX_VALUE * 2, 2};
-  private static long [] uint4Values = new long[]{0, Integer.MAX_VALUE + 1L, 1, Integer.MAX_VALUE * 2L, 2};
-  private static BigInteger[] uint8Values = new BigInteger[]{BigInteger.valueOf(0),
-      BigInteger.valueOf(Long.MAX_VALUE).multiply(BigInteger.valueOf(2)), BigInteger.valueOf(2),
-      BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.valueOf(1)), BigInteger.valueOf(2)};
+  private static short[] uint1Values = new short[] {0, 255, 1, 128, 2};
+  private static char[] uint2Values =
+      new char[] {0, Character.MAX_VALUE, 1, Short.MAX_VALUE * 2, 2};
+  private static long[] uint4Values =
+      new long[] {0, Integer.MAX_VALUE + 1L, 1, Integer.MAX_VALUE * 2L, 2};
+  private static BigInteger[] uint8Values =
+      new BigInteger[] {
+        BigInteger.valueOf(0),
+        BigInteger.valueOf(Long.MAX_VALUE).multiply(BigInteger.valueOf(2)),
+        BigInteger.valueOf(2),
+        BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.valueOf(1)),
+        BigInteger.valueOf(2)
+      };
 
   protected void writeData(int count, StructVector parent) {
     ComplexWriter writer = new ComplexWriterImpl("root", parent);
@@ -132,11 +136,11 @@ protected void writeData(int count, StructVector parent) {
       uint1Writer.setPosition(i);
       // TODO: Fix add safe write methods on uint methods.
       uint1Writer.setPosition(i);
-      uint1Writer.writeUInt1((byte) uint1Values[i % uint1Values.length] );
+      uint1Writer.writeUInt1((byte) uint1Values[i % uint1Values.length]);
       uint2Writer.setPosition(i);
-      uint2Writer.writeUInt2((char) uint2Values[i % uint2Values.length] );
+      uint2Writer.writeUInt2((char) uint2Values[i % uint2Values.length]);
       uint4Writer.setPosition(i);
-      uint4Writer.writeUInt4((int) uint4Values[i % uint4Values.length] );
+      uint4Writer.writeUInt4((int) uint4Values[i % uint4Values.length]);
       uint8Writer.setPosition(i);
       uint8Writer.writeUInt8(uint8Values[i % uint8Values.length].longValue());
       bigIntWriter.setPosition(i);
@@ -147,20 +151,26 @@ protected void writeData(int count, StructVector parent) {
     writer.setValueCount(count);
   }
 
-
   protected void validateContent(int count, VectorSchemaRoot root) {
     for (int i = 0; i < count; i++) {
-      Assert.assertEquals(i, root.getVector("int").getObject(i));
-      Assert.assertEquals((Short) uint1Values[i % uint1Values.length],
+      assertEquals(i, root.getVector("int").getObject(i));
+      assertEquals(
+          (Short) uint1Values[i % uint1Values.length],
           ((UInt1Vector) root.getVector("uint1")).getObjectNoOverflow(i));
-      Assert.assertEquals("Failed for index: " + i, (Character) uint2Values[i % uint2Values.length],
-          (Character) ((UInt2Vector) root.getVector("uint2")).get(i));
-      Assert.assertEquals("Failed for index: " + i, (Long) uint4Values[i % uint4Values.length],
-          ((UInt4Vector) root.getVector("uint4")).getObjectNoOverflow(i));
-      Assert.assertEquals("Failed for index: " + i, uint8Values[i % uint8Values.length],
-          ((UInt8Vector) root.getVector("uint8")).getObjectNoOverflow(i));
-      Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getObject(i));
-      Assert.assertEquals(i == 0 ? Float.NaN : i, root.getVector("float").getObject(i));
+      assertEquals(
+          (Character) uint2Values[i % uint2Values.length],
+          (Character) ((UInt2Vector) root.getVector("uint2")).get(i),
+          "Failed for index: " + i);
+      assertEquals(
+          (Long) uint4Values[i % uint4Values.length],
+          ((UInt4Vector) root.getVector("uint4")).getObjectNoOverflow(i),
+          "Failed for index: " + i);
+      assertEquals(
+          uint8Values[i % uint8Values.length],
+          ((UInt8Vector) root.getVector("uint8")).getObjectNoOverflow(i),
+          "Failed for index: " + i);
+      assertEquals(Long.valueOf(i), root.getVector("bigInt").getObject(i));
+      assertEquals(i == 0 ? Float.NaN : i, root.getVector("float").getObject(i));
     }
   }
 
@@ -210,23 +220,23 @@ public void printVectors(List<FieldVector> vectors) {
   }
 
   protected void validateComplexContent(int count, VectorSchemaRoot root) {
-    Assert.assertEquals(count, root.getRowCount());
+    assertEquals(count, root.getRowCount());
     printVectors(root.getFieldVectors());
     for (int i = 0; i < count; i++) {
 
       Object intVal = root.getVector("int").getObject(i);
       if (i % 5 != 3) {
-        Assert.assertEquals(i, intVal);
+        assertEquals(i, intVal);
       } else {
-        Assert.assertNull(intVal);
+        assertNull(intVal);
       }
-      Assert.assertEquals(Long.valueOf(i), root.getVector("bigInt").getObject(i));
-      Assert.assertEquals(i % 3, ((List<?>) root.getVector("list").getObject(i)).size());
+      assertEquals(Long.valueOf(i), root.getVector("bigInt").getObject(i));
+      assertEquals(i % 3, ((List<?>) root.getVector("list").getObject(i)).size());
       NullableTimeStampMilliHolder h = new NullableTimeStampMilliHolder();
       FieldReader structReader = root.getVector("struct").getReader();
       structReader.setPosition(i);
       structReader.reader("timestamp").read(h);
-      Assert.assertEquals(i, h.value);
+      assertEquals(i, h.value);
     }
   }
 
@@ -235,61 +245,67 @@ private LocalDateTime makeDateTimeFromCount(int i) {
   }
 
   protected void writeDateTimeData(int count, StructVector parent) {
-    Assert.assertTrue(count < 100);
+    assertTrue(count < 100);
     ComplexWriter writer = new ComplexWriterImpl("root", parent);
     StructWriter rootWriter = writer.rootAsStruct();
     DateMilliWriter dateWriter = rootWriter.dateMilli("date");
     TimeMilliWriter timeWriter = rootWriter.timeMilli("time");
     TimeStampMilliWriter timeStampMilliWriter = rootWriter.timeStampMilli("timestamp-milli");
-    TimeStampMilliTZWriter timeStampMilliTZWriter = rootWriter.timeStampMilliTZ("timestamp-milliTZ", "Europe/Paris");
+    TimeStampMilliTZWriter timeStampMilliTZWriter =
+        rootWriter.timeStampMilliTZ("timestamp-milliTZ", "Europe/Paris");
     TimeStampNanoWriter timeStampNanoWriter = rootWriter.timeStampNano("timestamp-nano");
     for (int i = 0; i < count; i++) {
       LocalDateTime dt = makeDateTimeFromCount(i);
-      // Number of days in milliseconds since epoch, stored as 64-bit integer, only date part is used
+      // Number of days in milliseconds since epoch, stored as 64-bit integer, only date part is
+      // used
       dateWriter.setPosition(i);
       long dateLong = dt.toLocalDate().atStartOfDay().toInstant(ZoneOffset.UTC).toEpochMilli();
       dateWriter.writeDateMilli(dateLong);
       // Time is a value in milliseconds since midnight, stored as 32-bit integer
       timeWriter.setPosition(i);
-      int milliOfDay = (int) java.util.concurrent.TimeUnit.NANOSECONDS.toMillis(dt.toLocalTime().toNanoOfDay());
+      int milliOfDay =
+          (int) java.util.concurrent.TimeUnit.NANOSECONDS.toMillis(dt.toLocalTime().toNanoOfDay());
       timeWriter.writeTimeMilli(milliOfDay);
       // Timestamp as milliseconds since the epoch, stored as 64-bit integer
       timeStampMilliWriter.setPosition(i);
       timeStampMilliWriter.writeTimeStampMilli(dt.toInstant(ZoneOffset.UTC).toEpochMilli());
       // Timestamp as milliseconds since epoch with timezone
       timeStampMilliTZWriter.setPosition(i);
-      timeStampMilliTZWriter.writeTimeStampMilliTZ(dt.atZone(ZoneId.of("Europe/Paris")).toInstant().toEpochMilli());
+      timeStampMilliTZWriter.writeTimeStampMilliTZ(
+          dt.atZone(ZoneId.of("Europe/Paris")).toInstant().toEpochMilli());
       // Timestamp as nanoseconds since epoch
       timeStampNanoWriter.setPosition(i);
-      long tsNanos = dt.toInstant(ZoneOffset.UTC).toEpochMilli() * 1_000_000 + i; // need to add back in nano val
+      long tsNanos =
+          dt.toInstant(ZoneOffset.UTC).toEpochMilli() * 1_000_000
+              + i; // need to add back in nano val
       timeStampNanoWriter.writeTimeStampNano(tsNanos);
     }
     writer.setValueCount(count);
   }
 
   protected void validateDateTimeContent(int count, VectorSchemaRoot root) {
-    Assert.assertEquals(count, root.getRowCount());
+    assertEquals(count, root.getRowCount());
     printVectors(root.getFieldVectors());
     for (int i = 0; i < count; i++) {
       LocalDateTime dt = makeDateTimeFromCount(i);
       LocalDateTime dtMilli = dt.minusNanos(i);
       LocalDateTime dateVal = ((DateMilliVector) root.getVector("date")).getObject(i);
       LocalDateTime dateExpected = dt.toLocalDate().atStartOfDay();
-      Assert.assertEquals(dateExpected, dateVal);
+      assertEquals(dateExpected, dateVal);
       LocalTime timeVal = ((TimeMilliVector) root.getVector("time")).getObject(i).toLocalTime();
-      Assert.assertEquals(dtMilli.toLocalTime(), timeVal);
+      assertEquals(dtMilli.toLocalTime(), timeVal);
       Object timestampMilliVal = root.getVector("timestamp-milli").getObject(i);
-      Assert.assertEquals(dtMilli, timestampMilliVal);
+      assertEquals(dtMilli, timestampMilliVal);
       Object timestampMilliTZVal = root.getVector("timestamp-milliTZ").getObject(i);
-      Assert.assertEquals(dt.atZone(ZoneId.of("Europe/Paris")).toInstant().toEpochMilli(), timestampMilliTZVal);
+      assertEquals(
+          dt.atZone(ZoneId.of("Europe/Paris")).toInstant().toEpochMilli(), timestampMilliTZVal);
       Object timestampNanoVal = root.getVector("timestamp-nano").getObject(i);
-      Assert.assertEquals(dt, timestampNanoVal);
+      assertEquals(dt, timestampNanoVal);
     }
   }
 
   protected VectorSchemaRoot writeFlatDictionaryData(
-      BufferAllocator bufferAllocator,
-      DictionaryProvider.MapDictionaryProvider provider) {
+      BufferAllocator bufferAllocator, DictionaryProvider.MapDictionaryProvider provider) {
 
     // Define dictionaries and add to provider
     VarCharVector dictionary1Vector = newVarCharVector("D1", bufferAllocator);
@@ -299,7 +315,8 @@ protected VectorSchemaRoot writeFlatDictionaryData(
     dictionary1Vector.set(2, "baz".getBytes(StandardCharsets.UTF_8));
     dictionary1Vector.setValueCount(3);
 
-    Dictionary dictionary1 = new Dictionary(dictionary1Vector, new DictionaryEncoding(1L, false, null));
+    Dictionary dictionary1 =
+        new Dictionary(dictionary1Vector, new DictionaryEncoding(1L, false, null));
     provider.put(dictionary1);
 
     VarCharVector dictionary2Vector = newVarCharVector("D2", bufferAllocator);
@@ -309,7 +326,8 @@ protected VectorSchemaRoot writeFlatDictionaryData(
     dictionary2Vector.set(2, "large".getBytes(StandardCharsets.UTF_8));
     dictionary2Vector.setValueCount(3);
 
-    Dictionary dictionary2 = new Dictionary(dictionary2Vector, new DictionaryEncoding(2L, false, null));
+    Dictionary dictionary2 =
+        new Dictionary(dictionary2Vector, new DictionaryEncoding(2L, false, null));
     provider.put(dictionary2);
 
     // Populate the vectors
@@ -346,80 +364,81 @@ protected VectorSchemaRoot writeFlatDictionaryData(
     FieldVector encodedVector2 = (FieldVector) DictionaryEncoder.encode(vector2, dictionary2);
     vector2.close(); // Done with this vector after encoding
 
-    List<Field> fields = Arrays.asList(encodedVector1A.getField(), encodedVector1B.getField(),
-        encodedVector2.getField());
-    List<FieldVector> vectors = Collections2.asImmutableList(encodedVector1A, encodedVector1B, encodedVector2);
+    List<Field> fields =
+        Arrays.asList(
+            encodedVector1A.getField(), encodedVector1B.getField(), encodedVector2.getField());
+    List<FieldVector> vectors =
+        Collections2.asImmutableList(encodedVector1A, encodedVector1B, encodedVector2);
 
     return new VectorSchemaRoot(fields, vectors, encodedVector1A.getValueCount());
   }
 
   protected void validateFlatDictionary(VectorSchemaRoot root, DictionaryProvider provider) {
     FieldVector vector1A = root.getVector("varcharA");
-    Assert.assertNotNull(vector1A);
+    assertNotNull(vector1A);
 
     DictionaryEncoding encoding1A = vector1A.getField().getDictionary();
-    Assert.assertNotNull(encoding1A);
-    Assert.assertEquals(1L, encoding1A.getId());
+    assertNotNull(encoding1A);
+    assertEquals(1L, encoding1A.getId());
 
-    Assert.assertEquals(6, vector1A.getValueCount());
-    Assert.assertEquals(0, vector1A.getObject(0));
-    Assert.assertEquals(1, vector1A.getObject(1));
-    Assert.assertEquals(null, vector1A.getObject(2));
-    Assert.assertEquals(2, vector1A.getObject(3));
-    Assert.assertEquals(1, vector1A.getObject(4));
-    Assert.assertEquals(2, vector1A.getObject(5));
+    assertEquals(6, vector1A.getValueCount());
+    assertEquals(0, vector1A.getObject(0));
+    assertEquals(1, vector1A.getObject(1));
+    assertEquals(null, vector1A.getObject(2));
+    assertEquals(2, vector1A.getObject(3));
+    assertEquals(1, vector1A.getObject(4));
+    assertEquals(2, vector1A.getObject(5));
 
     FieldVector vector1B = root.getVector("varcharB");
-    Assert.assertNotNull(vector1B);
+    assertNotNull(vector1B);
 
     DictionaryEncoding encoding1B = vector1A.getField().getDictionary();
-    Assert.assertNotNull(encoding1B);
-    Assert.assertTrue(encoding1A.equals(encoding1B));
-    Assert.assertEquals(1L, encoding1B.getId());
-
-    Assert.assertEquals(6, vector1B.getValueCount());
-    Assert.assertEquals(2, vector1B.getObject(0));
-    Assert.assertEquals(1, vector1B.getObject(1));
-    Assert.assertEquals(2, vector1B.getObject(2));
-    Assert.assertEquals(null, vector1B.getObject(3));
-    Assert.assertEquals(1, vector1B.getObject(4));
-    Assert.assertEquals(0, vector1B.getObject(5));
+    assertNotNull(encoding1B);
+    assertTrue(encoding1A.equals(encoding1B));
+    assertEquals(1L, encoding1B.getId());
+
+    assertEquals(6, vector1B.getValueCount());
+    assertEquals(2, vector1B.getObject(0));
+    assertEquals(1, vector1B.getObject(1));
+    assertEquals(2, vector1B.getObject(2));
+    assertEquals(null, vector1B.getObject(3));
+    assertEquals(1, vector1B.getObject(4));
+    assertEquals(0, vector1B.getObject(5));
 
     FieldVector vector2 = root.getVector("sizes");
-    Assert.assertNotNull(vector2);
+    assertNotNull(vector2);
 
     DictionaryEncoding encoding2 = vector2.getField().getDictionary();
-    Assert.assertNotNull(encoding2);
-    Assert.assertEquals(2L, encoding2.getId());
+    assertNotNull(encoding2);
+    assertEquals(2L, encoding2.getId());
 
-    Assert.assertEquals(6, vector2.getValueCount());
-    Assert.assertEquals(null, vector2.getObject(0));
-    Assert.assertEquals(2, vector2.getObject(1));
-    Assert.assertEquals(1, vector2.getObject(2));
-    Assert.assertEquals(1, vector2.getObject(3));
-    Assert.assertEquals(2, vector2.getObject(4));
-    Assert.assertEquals(null, vector2.getObject(5));
+    assertEquals(6, vector2.getValueCount());
+    assertEquals(null, vector2.getObject(0));
+    assertEquals(2, vector2.getObject(1));
+    assertEquals(1, vector2.getObject(2));
+    assertEquals(1, vector2.getObject(3));
+    assertEquals(2, vector2.getObject(4));
+    assertEquals(null, vector2.getObject(5));
 
     Dictionary dictionary1 = provider.lookup(1L);
-    Assert.assertNotNull(dictionary1);
+    assertNotNull(dictionary1);
     VarCharVector dictionaryVector = ((VarCharVector) dictionary1.getVector());
-    Assert.assertEquals(3, dictionaryVector.getValueCount());
-    Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
-    Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
-    Assert.assertEquals(new Text("baz"), dictionaryVector.getObject(2));
+    assertEquals(3, dictionaryVector.getValueCount());
+    assertEquals(new Text("foo"), dictionaryVector.getObject(0));
+    assertEquals(new Text("bar"), dictionaryVector.getObject(1));
+    assertEquals(new Text("baz"), dictionaryVector.getObject(2));
 
     Dictionary dictionary2 = provider.lookup(2L);
-    Assert.assertNotNull(dictionary2);
+    assertNotNull(dictionary2);
     dictionaryVector = ((VarCharVector) dictionary2.getVector());
-    Assert.assertEquals(3, dictionaryVector.getValueCount());
-    Assert.assertEquals(new Text("micro"), dictionaryVector.getObject(0));
-    Assert.assertEquals(new Text("small"), dictionaryVector.getObject(1));
-    Assert.assertEquals(new Text("large"), dictionaryVector.getObject(2));
+    assertEquals(3, dictionaryVector.getValueCount());
+    assertEquals(new Text("micro"), dictionaryVector.getObject(0));
+    assertEquals(new Text("small"), dictionaryVector.getObject(1));
+    assertEquals(new Text("large"), dictionaryVector.getObject(2));
   }
 
   protected VectorSchemaRoot writeNestedDictionaryData(
-      BufferAllocator bufferAllocator,
-      DictionaryProvider.MapDictionaryProvider provider) {
+      BufferAllocator bufferAllocator, DictionaryProvider.MapDictionaryProvider provider) {
 
     // Define the dictionary and add to the provider
     VarCharVector dictionaryVector = newVarCharVector("D2", bufferAllocator);
@@ -428,7 +447,8 @@ protected VectorSchemaRoot writeNestedDictionaryData(
     dictionaryVector.set(1, "bar".getBytes(StandardCharsets.UTF_8));
     dictionaryVector.setValueCount(2);
 
-    Dictionary dictionary = new Dictionary(dictionaryVector, new DictionaryEncoding(2L, false, null));
+    Dictionary dictionary =
+        new Dictionary(dictionaryVector, new DictionaryEncoding(2L, false, null));
     provider.put(dictionary);
 
     // Write the vector data using dictionary indices
@@ -456,26 +476,26 @@ protected VectorSchemaRoot writeNestedDictionaryData(
 
   protected void validateNestedDictionary(VectorSchemaRoot root, DictionaryProvider provider) {
     FieldVector vector = root.getFieldVectors().get(0);
-    Assert.assertNotNull(vector);
-    Assert.assertNull(vector.getField().getDictionary());
+    assertNotNull(vector);
+    assertNull(vector.getField().getDictionary());
     Field nestedField = vector.getField().getChildren().get(0);
 
     DictionaryEncoding encoding = nestedField.getDictionary();
-    Assert.assertNotNull(encoding);
-    Assert.assertEquals(2L, encoding.getId());
-    Assert.assertEquals(new ArrowType.Int(32, true), encoding.getIndexType());
+    assertNotNull(encoding);
+    assertEquals(2L, encoding.getId());
+    assertEquals(new ArrowType.Int(32, true), encoding.getIndexType());
 
-    Assert.assertEquals(3, vector.getValueCount());
-    Assert.assertEquals(Arrays.asList(0, 1), vector.getObject(0));
-    Assert.assertEquals(Arrays.asList(0), vector.getObject(1));
-    Assert.assertEquals(Arrays.asList(1), vector.getObject(2));
+    assertEquals(3, vector.getValueCount());
+    assertEquals(Arrays.asList(0, 1), vector.getObject(0));
+    assertEquals(Arrays.asList(0), vector.getObject(1));
+    assertEquals(Arrays.asList(1), vector.getObject(2));
 
     Dictionary dictionary = provider.lookup(2L);
-    Assert.assertNotNull(dictionary);
+    assertNotNull(dictionary);
     VarCharVector dictionaryVector = ((VarCharVector) dictionary.getVector());
-    Assert.assertEquals(2, dictionaryVector.getValueCount());
-    Assert.assertEquals(new Text("foo"), dictionaryVector.getObject(0));
-    Assert.assertEquals(new Text("bar"), dictionaryVector.getObject(1));
+    assertEquals(2, dictionaryVector.getValueCount());
+    assertEquals(new Text("foo"), dictionaryVector.getObject(0));
+    assertEquals(new Text("bar"), dictionaryVector.getObject(1));
   }
 
   protected VectorSchemaRoot writeDecimalData(BufferAllocator bufferAllocator) {
@@ -498,9 +518,11 @@ protected VectorSchemaRoot writeDecimalData(BufferAllocator bufferAllocator) {
     decimalVector2.setValueCount(count);
     decimalVector3.setValueCount(count);
 
-    List<Field> fields = Collections2.asImmutableList(decimalVector1.getField(), decimalVector2.getField(),
-        decimalVector3.getField());
-    List<FieldVector> vectors = Collections2.asImmutableList(decimalVector1, decimalVector2, decimalVector3);
+    List<Field> fields =
+        Collections2.asImmutableList(
+            decimalVector1.getField(), decimalVector2.getField(), decimalVector3.getField());
+    List<FieldVector> vectors =
+        Collections2.asImmutableList(decimalVector1, decimalVector2, decimalVector3);
     return new VectorSchemaRoot(fields, vectors, count);
   }
 
@@ -509,26 +531,26 @@ protected void validateDecimalData(VectorSchemaRoot root) {
     DecimalVector decimalVector2 = (DecimalVector) root.getVector("decimal2");
     DecimalVector decimalVector3 = (DecimalVector) root.getVector("decimal3");
     int count = 10;
-    Assert.assertEquals(count, root.getRowCount());
+    assertEquals(count, root.getRowCount());
 
     for (int i = 0; i < count; i++) {
       // Verify decimal 1 vector
       BigDecimal readValue = decimalVector1.getObject(i);
       ArrowType.Decimal type = (ArrowType.Decimal) decimalVector1.getField().getType();
       BigDecimal genValue = new BigDecimal(BigInteger.valueOf(i), type.getScale());
-      Assert.assertEquals(genValue, readValue);
+      assertEquals(genValue, readValue);
 
       // Verify decimal 2 vector
       readValue = decimalVector2.getObject(i);
       type = (ArrowType.Decimal) decimalVector2.getField().getType();
       genValue = new BigDecimal(BigInteger.valueOf(i * (1 << 10)), type.getScale());
-      Assert.assertEquals(genValue, readValue);
+      assertEquals(genValue, readValue);
 
       // Verify decimal 3 vector
       readValue = decimalVector3.getObject(i);
       type = (ArrowType.Decimal) decimalVector3.getField().getType();
       genValue = new BigDecimal(BigInteger.valueOf(i * 1111111111111111L), type.getScale());
-      Assert.assertEquals(genValue, readValue);
+      assertEquals(genValue, readValue);
     }
   }
 
@@ -538,7 +560,8 @@ protected VectorSchemaRoot writeNullData(int valueCount) {
     nullVector1.setValueCount(valueCount);
     nullVector2.setValueCount(valueCount);
 
-    List<Field> fields = Collections2.asImmutableList(nullVector1.getField(), nullVector2.getField());
+    List<Field> fields =
+        Collections2.asImmutableList(nullVector1.getField(), nullVector2.getField());
     List<FieldVector> vectors = Collections2.asImmutableList(nullVector1, nullVector2);
     return new VectorSchemaRoot(fields, vectors, valueCount);
   }
@@ -558,18 +581,18 @@ public void validateUnionData(int count, VectorSchemaRoot root) {
       unionReader.setPosition(i);
       switch (i % 4) {
         case 0:
-          Assert.assertEquals(i, unionReader.readInteger().intValue());
+          assertEquals(i, unionReader.readInteger().intValue());
           break;
         case 1:
-          Assert.assertEquals(i, unionReader.readLong().longValue());
+          assertEquals(i, unionReader.readLong().longValue());
           break;
         case 2:
-          Assert.assertEquals(i % 3, unionReader.size());
+          assertEquals(i % 3, unionReader.size());
           break;
         case 3:
           NullableTimeStampMilliHolder h = new NullableTimeStampMilliHolder();
           unionReader.reader("timestamp").read(h);
-          Assert.assertEquals(i, h.value);
+          assertEquals(i, h.value);
           break;
         default:
           assert false : "Unexpected value in switch statement: " + i;
@@ -623,7 +646,7 @@ public void writeUnionData(int count, StructVector parent) {
   }
 
   protected void writeVarBinaryData(int count, StructVector parent) {
-    Assert.assertTrue(count < 100);
+    assertTrue(count < 100);
     ComplexWriter writer = new ComplexWriterImpl("root", parent);
     StructWriter rootWriter = writer.rootAsStruct();
     ListWriter listWriter = rootWriter.list("list");
@@ -642,7 +665,7 @@ protected void writeVarBinaryData(int count, StructVector parent) {
   }
 
   protected void validateVarBinary(int count, VectorSchemaRoot root) {
-    Assert.assertEquals(count, root.getRowCount());
+    assertEquals(count, root.getRowCount());
     ListVector listVector = (ListVector) root.getVector("list");
     byte[] expectedArray = new byte[count];
     int numVarBinaryValues = 0;
@@ -650,26 +673,27 @@ protected void validateVarBinary(int count, VectorSchemaRoot root) {
       expectedArray[i] = (byte) i;
       List<?> objList = listVector.getObject(i);
       if (i % 3 == 0) {
-        Assert.assertTrue(objList.isEmpty());
+        assertTrue(objList.isEmpty());
       } else {
         byte[] expected = Arrays.copyOfRange(expectedArray, 0, i + 1);
         for (int j = 0; j < i % 3; j++) {
           byte[] result = (byte[]) objList.get(j);
-          Assert.assertArrayEquals(result, expected);
+          assertArrayEquals(result, expected);
           numVarBinaryValues++;
         }
       }
     }
 
     // ListVector lastSet should be the index of last value + 1
-    Assert.assertEquals(listVector.getLastSet(), count - 1);
+    assertEquals(listVector.getLastSet(), count - 1);
 
     // VarBinaryVector lastSet should be the index of last value
     VarBinaryVector binaryVector = (VarBinaryVector) listVector.getChildrenFromFields().get(0);
-    Assert.assertEquals(binaryVector.getLastSet(), numVarBinaryValues - 1);
+    assertEquals(binaryVector.getLastSet(), numVarBinaryValues - 1);
   }
 
-  protected void writeBatchData(ArrowWriter writer, IntVector vector, VectorSchemaRoot root) throws IOException {
+  protected void writeBatchData(ArrowWriter writer, IntVector vector, VectorSchemaRoot root)
+      throws IOException {
     writer.start();
 
     vector.setNull(0);
@@ -752,7 +776,8 @@ protected VectorSchemaRoot writeMapData(BufferAllocator bufferAllocator) {
     mapWriter.setValueCount(COUNT);
     sortedMapWriter.setValueCount(COUNT);
 
-    List<Field> fields = Collections2.asImmutableList(mapVector.getField(), sortedMapVector.getField());
+    List<Field> fields =
+        Collections2.asImmutableList(mapVector.getField(), sortedMapVector.getField());
     List<FieldVector> vectors = Collections2.asImmutableList(mapVector, sortedMapVector);
     return new VectorSchemaRoot(fields, vectors, count);
   }
@@ -762,7 +787,7 @@ protected void validateMapData(VectorSchemaRoot root) {
     MapVector sortedMapVector = (MapVector) root.getVector("mapSorted");
 
     final int count = 10;
-    Assert.assertEquals(count, root.getRowCount());
+    assertEquals(count, root.getRowCount());
 
     UnionMapReader mapReader = new UnionMapReader(mapVector);
     UnionMapReader sortedMapReader = new UnionMapReader(sortedMapVector);
@@ -801,9 +826,12 @@ protected VectorSchemaRoot writeListAsMapData(BufferAllocator bufferAllocator) {
     ListVector mapEntryList = ListVector.empty("entryList", bufferAllocator);
     FieldType mapEntryType = new FieldType(false, ArrowType.Struct.INSTANCE, null, null);
     StructVector mapEntryData = new StructVector("entryData", bufferAllocator, mapEntryType, null);
-    mapEntryData.addOrGet("myKey", new FieldType(false, new ArrowType.Int(64, true), null), BigIntVector.class);
-    mapEntryData.addOrGet("myValue", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
-    mapEntryList.initializeChildrenFromFields(Collections2.asImmutableList(mapEntryData.getField()));
+    mapEntryData.addOrGet(
+        "myKey", new FieldType(false, new ArrowType.Int(64, true), null), BigIntVector.class);
+    mapEntryData.addOrGet(
+        "myValue", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
+    mapEntryList.initializeChildrenFromFields(
+        Collections2.asImmutableList(mapEntryData.getField()));
     UnionListWriter entryWriter = mapEntryList.getWriter();
     entryWriter.allocate();
 
@@ -833,7 +861,7 @@ protected void validateListAsMapData(VectorSchemaRoot root) {
     MapVector sortedMapVector = (MapVector) root.getVector("map");
 
     final int count = 10;
-    Assert.assertEquals(count, root.getRowCount());
+    assertEquals(count, root.getRowCount());
 
     UnionMapReader sortedMapReader = new UnionMapReader(sortedMapVector);
     sortedMapReader.setKeyValueNames("myKey", "myValue");
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/ITTestIPCWithLargeArrowBuffers.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/ITTestIPCWithLargeArrowBuffers.java
index d3c91fd144356..04ea16a73c888 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/ITTestIPCWithLargeArrowBuffers.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/ITTestIPCWithLargeArrowBuffers.java
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -28,7 +27,6 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Map;
-
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.IntVector;
@@ -40,19 +38,19 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Integration test for reading/writing {@link org.apache.arrow.vector.VectorSchemaRoot} with
- * large (more than 2GB) buffers by {@link ArrowReader} and {@link ArrowWriter}..
- * To run this test, please make sure there is at least 8GB free memory, and 8GB
- * free.disk space in the system.
+ * Integration test for reading/writing {@link org.apache.arrow.vector.VectorSchemaRoot} with large
+ * (more than 2GB) buffers by {@link ArrowReader} and {@link ArrowWriter}.. To run this test, please
+ * make sure there is at least 8GB free memory, and 8GB free.disk space in the system.
  */
 public class ITTestIPCWithLargeArrowBuffers {
 
-  private static final Logger logger = LoggerFactory.getLogger(ITTestIPCWithLargeArrowBuffers.class);
+  private static final Logger logger =
+      LoggerFactory.getLogger(ITTestIPCWithLargeArrowBuffers.class);
 
   // 4GB buffer size
   static final long BUFFER_SIZE = 4 * 1024 * 1024 * 1024L;
@@ -78,12 +76,13 @@ public class ITTestIPCWithLargeArrowBuffers {
   private void testWriteLargeArrowData(boolean streamMode) throws IOException {
     // simulate encoding big int as int
     try (RootAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         BigIntVector dictVector = new BigIntVector("dic vector", allocator);
-         FileOutputStream out = new FileOutputStream(FILE_NAME);
-         IntVector encodedVector = (IntVector) ENCODED_VECTOR_FIELD.createVector(allocator)) {
+        BigIntVector dictVector = new BigIntVector("dic vector", allocator);
+        FileOutputStream out = new FileOutputStream(FILE_NAME);
+        IntVector encodedVector = (IntVector) ENCODED_VECTOR_FIELD.createVector(allocator)) {
 
       // prepare dictionary provider.
-      DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();
+      DictionaryProvider.MapDictionaryProvider provider =
+          new DictionaryProvider.MapDictionaryProvider();
       Dictionary dictionary = new Dictionary(dictVector, DICTIONARY_ENCODING);
       provider.put(dictionary);
 
@@ -107,11 +106,14 @@ private void testWriteLargeArrowData(boolean streamMode) throws IOException {
 
       // build vector schema root and write data.
       try (VectorSchemaRoot root =
-               new VectorSchemaRoot(
-                   Arrays.asList(ENCODED_VECTOR_FIELD), Arrays.asList(encodedVector), ENCODED_VECTOR_SIZE);
-           ArrowWriter writer = streamMode ?
-               new ArrowStreamWriter(root, provider, out) :
-               new ArrowFileWriter(root, provider, out.getChannel())) {
+              new VectorSchemaRoot(
+                  Arrays.asList(ENCODED_VECTOR_FIELD),
+                  Arrays.asList(encodedVector),
+                  ENCODED_VECTOR_SIZE);
+          ArrowWriter writer =
+              streamMode
+                  ? new ArrowStreamWriter(root, provider, out)
+                  : new ArrowFileWriter(root, provider, out.getChannel())) {
         writer.start();
         writer.writeBatch();
         writer.end();
@@ -124,10 +126,11 @@ private void testWriteLargeArrowData(boolean streamMode) throws IOException {
 
   private void testReadLargeArrowData(boolean streamMode) throws IOException {
     try (RootAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         FileInputStream in = new FileInputStream(FILE_NAME);
-         ArrowReader reader = streamMode ?
-             new ArrowStreamReader(in, allocator) :
-             new ArrowFileReader(in.getChannel(), allocator)) {
+        FileInputStream in = new FileInputStream(FILE_NAME);
+        ArrowReader reader =
+            streamMode
+                ? new ArrowStreamReader(in, allocator)
+                : new ArrowFileReader(in.getChannel(), allocator)) {
 
       // verify schema
       Schema readSchema = reader.getVectorSchemaRoot().getSchema();
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/MessageSerializerTest.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/MessageSerializerTest.java
index 79a4b249a8a89..0a41b6c599029 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/MessageSerializerTest.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/MessageSerializerTest.java
@@ -14,15 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import static java.util.Arrays.asList;
 import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -33,7 +32,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -48,9 +46,7 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
 
 public class MessageSerializerTest {
 
@@ -74,7 +70,7 @@ private int intToByteRoundtrip(int v, byte[] bytes) {
   @Test
   public void testIntToBytes() {
     byte[] bytes = new byte[4];
-    int[] values = new int[]{1, 15, 1 << 8, 1 << 16, Integer.MAX_VALUE};
+    int[] values = new int[] {1, 15, 1 << 8, 1 << 16, Integer.MAX_VALUE};
     for (int v : values) {
       assertEquals(intToByteRoundtrip(v, bytes), v);
     }
@@ -129,13 +125,12 @@ public void testWriteMessageBufferAligned() throws IOException {
   public void testSchemaMessageSerialization() throws IOException {
     Schema schema = testSchema();
     ByteArrayOutputStream out = new ByteArrayOutputStream();
-    long size = MessageSerializer.serialize(
-        new WriteChannel(Channels.newChannel(out)), schema);
+    long size = MessageSerializer.serialize(new WriteChannel(Channels.newChannel(out)), schema);
     assertEquals(size, out.toByteArray().length);
 
     ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-    Schema deserialized = MessageSerializer.deserializeSchema(
-        new ReadChannel(Channels.newChannel(in)));
+    Schema deserialized =
+        MessageSerializer.deserializeSchema(new ReadChannel(Channels.newChannel(in)));
     assertEquals(schema, deserialized);
     assertEquals(1, deserialized.getFields().size());
   }
@@ -143,32 +138,31 @@ public void testSchemaMessageSerialization() throws IOException {
   @Test
   public void testSchemaDictionaryMessageSerialization() throws IOException {
     DictionaryEncoding dictionary = new DictionaryEncoding(9L, false, new ArrowType.Int(8, true));
-    Field field = new Field("test", new FieldType(true, ArrowType.Utf8.INSTANCE, dictionary, null), null);
+    Field field =
+        new Field("test", new FieldType(true, ArrowType.Utf8.INSTANCE, dictionary, null), null);
     Schema schema = new Schema(Collections.singletonList(field));
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     long size = MessageSerializer.serialize(new WriteChannel(Channels.newChannel(out)), schema);
     assertEquals(size, out.toByteArray().length);
 
     ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-    Schema deserialized = MessageSerializer.deserializeSchema(new ReadChannel(Channels.newChannel(in)));
+    Schema deserialized =
+        MessageSerializer.deserializeSchema(new ReadChannel(Channels.newChannel(in)));
     assertEquals(schema, deserialized);
   }
 
-  @Rule
-  public ExpectedException expectedEx = ExpectedException.none();
-
   @Test
   public void testSerializeRecordBatchV4() throws IOException {
-    byte[] validity = new byte[]{(byte) 255, 0};
+    byte[] validity = new byte[] {(byte) 255, 0};
     // second half is "undefined"
-    byte[] values = new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
+    byte[] values = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
 
     BufferAllocator alloc = new RootAllocator(Long.MAX_VALUE);
     ArrowBuf validityb = buf(alloc, validity);
     ArrowBuf valuesb = buf(alloc, values);
 
-    ArrowRecordBatch batch = new ArrowRecordBatch(
-        16, asList(new ArrowFieldNode(16, 8)), asList(validityb, valuesb));
+    ArrowRecordBatch batch =
+        new ArrowRecordBatch(16, asList(new ArrowFieldNode(16, 8)), asList(validityb, valuesb));
 
     // avoid writing legacy ipc format by default
     IpcOption option = new IpcOption(false, MetadataVersion.V4);
@@ -184,16 +178,16 @@ public void testSerializeRecordBatchV4() throws IOException {
 
   @Test
   public void testSerializeRecordBatchV5() throws Exception {
-    byte[] validity = new byte[]{(byte) 255, 0};
+    byte[] validity = new byte[] {(byte) 255, 0};
     // second half is "undefined"
-    byte[] values = new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
+    byte[] values = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
 
     BufferAllocator alloc = new RootAllocator(Long.MAX_VALUE);
     ArrowBuf validityb = buf(alloc, validity);
     ArrowBuf valuesb = buf(alloc, values);
 
-    ArrowRecordBatch batch = new ArrowRecordBatch(
-        16, asList(new ArrowFieldNode(16, 8)), asList(validityb, valuesb));
+    ArrowRecordBatch batch =
+        new ArrowRecordBatch(16, asList(new ArrowFieldNode(16, 8)), asList(validityb, valuesb));
 
     // avoid writing legacy ipc format by default
     IpcOption option = new IpcOption(false, MetadataVersion.V5);
@@ -214,20 +208,25 @@ public void testSerializeRecordBatchV5() throws Exception {
 
     {
       byte[] validBytes = out.toByteArray();
-      byte[] missingBytes = Arrays.copyOfRange(validBytes, /*from=*/0, validBytes.length - 1);
+      byte[] missingBytes = Arrays.copyOfRange(validBytes, /*from=*/ 0, validBytes.length - 1);
 
       ByteArrayInputStream in = new ByteArrayInputStream(missingBytes);
       ReadChannel channel = new ReadChannel(Channels.newChannel(in));
 
-      assertThrows(IOException.class, () -> MessageSerializer.deserializeMessageBatch(channel, alloc));
+      assertThrows(
+          IOException.class, () -> MessageSerializer.deserializeMessageBatch(channel, alloc));
     }
 
     alloc.close();
   }
 
   public static Schema testSchema() {
-    return new Schema(asList(new Field(
-        "testField", FieldType.nullable(new ArrowType.Int(8, true)), Collections.<Field>emptyList())));
+    return new Schema(
+        asList(
+            new Field(
+                "testField",
+                FieldType.nullable(new ArrowType.Int(8, true)),
+                Collections.<Field>emptyList())));
   }
 
   // Verifies batch contents matching test schema.
@@ -243,5 +242,4 @@ public static void verifyBatch(ArrowRecordBatch batch, byte[] validity, byte[] v
     assertArrayEquals(validity, MessageSerializerTest.array(buffers.get(0)));
     assertArrayEquals(values, MessageSerializerTest.array(buffers.get(1)));
   }
-
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowFile.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowFile.java
index 4fb5822786083..c8185623d680a 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowFile.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowFile.java
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import static java.nio.channels.Channels.newChannel;
 import static org.apache.arrow.vector.TestUtils.newVarCharVector;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -31,7 +30,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.util.Collections2;
 import org.apache.arrow.vector.FieldVector;
@@ -39,7 +37,7 @@
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.complex.StructVector;
 import org.apache.arrow.vector.types.pojo.Field;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -50,8 +48,8 @@ public class TestArrowFile extends BaseFileTest {
   public void testWrite() throws IOException {
     File file = new File("target/mytest_write.arrow");
     int count = COUNT;
-    try (
-        BufferAllocator vectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
+    try (BufferAllocator vectorAllocator =
+            allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
         StructVector parent = StructVector.empty("parent", vectorAllocator)) {
       writeData(count, parent);
       write(parent.getChild("root"), file, new ByteArrayOutputStream());
@@ -62,8 +60,8 @@ public void testWrite() throws IOException {
   public void testWriteComplex() throws IOException {
     File file = new File("target/mytest_write_complex.arrow");
     int count = COUNT;
-    try (
-        BufferAllocator vectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
+    try (BufferAllocator vectorAllocator =
+            allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
         StructVector parent = StructVector.empty("parent", vectorAllocator)) {
       writeComplexData(count, parent);
       FieldVector root = parent.getChild("root");
@@ -73,14 +71,15 @@ public void testWriteComplex() throws IOException {
   }
 
   /**
-   * Writes the contents of parents to file. If outStream is non-null, also writes it
-   * to outStream in the streaming serialized format.
+   * Writes the contents of parents to file. If outStream is non-null, also writes it to outStream
+   * in the streaming serialized format.
    */
   private void write(FieldVector parent, File file, OutputStream outStream) throws IOException {
     VectorSchemaRoot root = new VectorSchemaRoot(parent);
 
     try (FileOutputStream fileOutputStream = new FileOutputStream(file);
-         ArrowFileWriter arrowWriter = new ArrowFileWriter(root, null, fileOutputStream.getChannel());) {
+        ArrowFileWriter arrowWriter =
+            new ArrowFileWriter(root, null, fileOutputStream.getChannel()); ) {
       LOGGER.debug("writing schema: " + root.getSchema());
       arrowWriter.start();
       arrowWriter.writeBatch();
@@ -124,7 +123,8 @@ public void testFileStreamHasEos() throws IOException {
       byte[] bytesWithoutMagic = new byte[bytes.length - 8];
       System.arraycopy(bytes, 8, bytesWithoutMagic, 0, bytesWithoutMagic.length);
 
-      try (ArrowStreamReader reader = new ArrowStreamReader(new ByteArrayInputStream(bytesWithoutMagic), allocator)) {
+      try (ArrowStreamReader reader =
+          new ArrowStreamReader(new ByteArrayInputStream(bytesWithoutMagic), allocator)) {
         assertTrue(reader.loadNextBatch());
         // here will throw exception if read footer instead of eos.
         assertFalse(reader.loadNextBatch());
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowFooter.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowFooter.java
index 38c65bddeddea..c439510370e5e 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowFooter.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowFooter.java
@@ -14,17 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import com.google.flatbuffers.FlatBufferBuilder;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.flatbuf.Footer;
 import org.apache.arrow.vector.ipc.message.ArrowBlock;
 import org.apache.arrow.vector.ipc.message.ArrowFooter;
@@ -32,19 +31,22 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Test;
-
-import com.google.flatbuffers.FlatBufferBuilder;
+import org.junit.jupiter.api.Test;
 
 public class TestArrowFooter {
 
   @Test
   public void test() {
-    Schema schema = new Schema(asList(
-        new Field("a", FieldType.nullable(new ArrowType.Int(8, true)), Collections.<Field>emptyList())
-    ));
+    Schema schema =
+        new Schema(
+            asList(
+                new Field(
+                    "a",
+                    FieldType.nullable(new ArrowType.Int(8, true)),
+                    Collections.<Field>emptyList())));
     ArrowFooter footer =
-        new ArrowFooter(schema, Collections.<ArrowBlock>emptyList(), Collections.<ArrowBlock>emptyList());
+        new ArrowFooter(
+            schema, Collections.<ArrowBlock>emptyList(), Collections.<ArrowBlock>emptyList());
     ArrowFooter newFooter = roundTrip(footer);
     assertEquals(footer, newFooter);
 
@@ -55,7 +57,6 @@ public void test() {
     assertEquals(footer, roundTrip(footer));
   }
 
-
   private ArrowFooter roundTrip(ArrowFooter footer) {
     FlatBufferBuilder builder = new FlatBufferBuilder();
     int i = footer.writeTo(builder);
@@ -64,5 +65,4 @@ private ArrowFooter roundTrip(ArrowFooter footer) {
     ArrowFooter newFooter = new ArrowFooter(Footer.getRootAsFooter(dataBuffer));
     return newFooter;
   }
-
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowReaderWriter.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowReaderWriter.java
index 07875b25029ea..74ff95d41d69c 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowReaderWriter.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowReaderWriter.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import static java.nio.channels.Channels.newChannel;
@@ -23,11 +22,12 @@
 import static org.apache.arrow.vector.TestUtils.newVarCharVector;
 import static org.apache.arrow.vector.TestUtils.newVector;
 import static org.apache.arrow.vector.testing.ValueVectorDataPopulator.setVector;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -45,7 +45,6 @@
 import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
-
 import org.apache.arrow.flatbuf.FieldNode;
 import org.apache.arrow.flatbuf.Message;
 import org.apache.arrow.flatbuf.RecordBatch;
@@ -87,10 +86,9 @@
 import org.apache.arrow.vector.util.ByteArrayReadableSeekableByteChannel;
 import org.apache.arrow.vector.util.DictionaryUtility;
 import org.apache.arrow.vector.util.TransferPair;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestArrowReaderWriter {
 
@@ -109,48 +107,59 @@ public class TestArrowReaderWriter {
   private Schema schema;
   private Schema encodedSchema;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
 
     dictionaryVector1 = newVarCharVector("D1", allocator);
-    setVector(dictionaryVector1,
+    setVector(
+        dictionaryVector1,
         "foo".getBytes(StandardCharsets.UTF_8),
         "bar".getBytes(StandardCharsets.UTF_8),
         "baz".getBytes(StandardCharsets.UTF_8));
 
     dictionaryVector2 = newVarCharVector("D2", allocator);
-    setVector(dictionaryVector2,
+    setVector(
+        dictionaryVector2,
         "aa".getBytes(StandardCharsets.UTF_8),
         "bb".getBytes(StandardCharsets.UTF_8),
         "cc".getBytes(StandardCharsets.UTF_8));
 
     dictionaryVector3 = newVarCharVector("D3", allocator);
-    setVector(dictionaryVector3,
+    setVector(
+        dictionaryVector3,
         "foo".getBytes(StandardCharsets.UTF_8),
         "bar".getBytes(StandardCharsets.UTF_8),
         "baz".getBytes(StandardCharsets.UTF_8),
         "aa".getBytes(StandardCharsets.UTF_8),
         "bb".getBytes(StandardCharsets.UTF_8),
         "cc".getBytes(StandardCharsets.UTF_8));
-    
+
     dictionaryVector4 = newVector(StructVector.class, "D4", MinorType.STRUCT, allocator);
     final Map<String, List<Integer>> dictionaryValues4 = new HashMap<>();
     dictionaryValues4.put("a", Arrays.asList(1, 2, 3));
     dictionaryValues4.put("b", Arrays.asList(4, 5, 6));
     setVector(dictionaryVector4, dictionaryValues4);
 
-    dictionary1 = new Dictionary(dictionaryVector1,
-        new DictionaryEncoding(/*id=*/1L, /*ordered=*/false, /*indexType=*/null));
-    dictionary2 = new Dictionary(dictionaryVector2,
-        new DictionaryEncoding(/*id=*/2L, /*ordered=*/false, /*indexType=*/null));
-    dictionary3 = new Dictionary(dictionaryVector3,
-        new DictionaryEncoding(/*id=*/1L, /*ordered=*/false, /*indexType=*/null));
-    dictionary4 = new Dictionary(dictionaryVector4,
-        new DictionaryEncoding(/*id=*/3L, /*ordered=*/false, /*indexType=*/null));
+    dictionary1 =
+        new Dictionary(
+            dictionaryVector1,
+            new DictionaryEncoding(/*id=*/ 1L, /*ordered=*/ false, /*indexType=*/ null));
+    dictionary2 =
+        new Dictionary(
+            dictionaryVector2,
+            new DictionaryEncoding(/*id=*/ 2L, /*ordered=*/ false, /*indexType=*/ null));
+    dictionary3 =
+        new Dictionary(
+            dictionaryVector3,
+            new DictionaryEncoding(/*id=*/ 1L, /*ordered=*/ false, /*indexType=*/ null));
+    dictionary4 =
+        new Dictionary(
+            dictionaryVector4,
+            new DictionaryEncoding(/*id=*/ 3L, /*ordered=*/ false, /*indexType=*/ null));
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     dictionaryVector1.close();
     dictionaryVector2.close();
@@ -173,8 +182,13 @@ byte[] array(ArrowBuf buf) {
 
   @Test
   public void test() throws IOException {
-    Schema schema = new Schema(asList(new Field("testField", FieldType.nullable(new ArrowType.Int(8, true)),
-        Collections.<Field>emptyList())));
+    Schema schema =
+        new Schema(
+            asList(
+                new Field(
+                    "testField",
+                    FieldType.nullable(new ArrowType.Int(8, true)),
+                    Collections.<Field>emptyList())));
     ArrowType type = schema.getFields().get(0).getType();
     FieldVector vector = TestUtils.newVector(FieldVector.class, "testField", type, allocator);
     vector.initializeChildrenFromFields(schema.getFields().get(0).getChildren());
@@ -185,10 +199,11 @@ public void test() throws IOException {
 
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     try (VectorSchemaRoot root = new VectorSchemaRoot(schema.getFields(), asList(vector), 16);
-         ArrowFileWriter writer = new ArrowFileWriter(root, null, newChannel(out))) {
+        ArrowFileWriter writer = new ArrowFileWriter(root, null, newChannel(out))) {
       ArrowBuf validityb = buf(validity);
       ArrowBuf valuesb = buf(values);
-      ArrowRecordBatch batch = new ArrowRecordBatch(16, asList(new ArrowFieldNode(16, 8)), asList(validityb, valuesb));
+      ArrowRecordBatch batch =
+          new ArrowRecordBatch(16, asList(new ArrowFieldNode(16, 8)), asList(validityb, valuesb));
       VectorLoader loader = new VectorLoader(root);
       loader.load(batch);
       writer.writeBatch();
@@ -200,8 +215,9 @@ public void test() throws IOException {
 
     byte[] byteArray = out.toByteArray();
 
-    try (SeekableReadChannel channel = new SeekableReadChannel(new ByteArrayReadableSeekableByteChannel(byteArray));
-         ArrowFileReader reader = new ArrowFileReader(channel, allocator)) {
+    try (SeekableReadChannel channel =
+            new SeekableReadChannel(new ByteArrayReadableSeekableByteChannel(byteArray));
+        ArrowFileReader reader = new ArrowFileReader(channel, allocator)) {
       Schema readSchema = reader.getVectorSchemaRoot().getSchema();
       assertEquals(schema, readSchema);
       // TODO: dictionaries
@@ -249,11 +265,12 @@ public void testWriteReadNullVector() throws IOException {
     Schema schema = new Schema(asList(nullVector.getField()));
 
     ByteArrayOutputStream out = new ByteArrayOutputStream();
-    try (VectorSchemaRoot root = new VectorSchemaRoot(schema.getFields(), asList(nullVector), valueCount);
+    try (VectorSchemaRoot root =
+            new VectorSchemaRoot(schema.getFields(), asList(nullVector), valueCount);
         ArrowFileWriter writer = new ArrowFileWriter(root, null, newChannel(out))) {
-      ArrowRecordBatch batch = new ArrowRecordBatch(valueCount,
-          asList(new ArrowFieldNode(valueCount, 0)),
-          Collections.emptyList());
+      ArrowRecordBatch batch =
+          new ArrowRecordBatch(
+              valueCount, asList(new ArrowFieldNode(valueCount, 0)), Collections.emptyList());
       VectorLoader loader = new VectorLoader(root);
       loader.load(batch);
       writer.writeBatch();
@@ -261,7 +278,8 @@ public void testWriteReadNullVector() throws IOException {
 
     byte[] byteArray = out.toByteArray();
 
-    try (SeekableReadChannel channel = new SeekableReadChannel(new ByteArrayReadableSeekableByteChannel(byteArray));
+    try (SeekableReadChannel channel =
+            new SeekableReadChannel(new ByteArrayReadableSeekableByteChannel(byteArray));
         ArrowFileReader reader = new ArrowFileReader(channel, allocator)) {
       Schema readSchema = reader.getVectorSchemaRoot().getSchema();
       assertEquals(schema, readSchema);
@@ -271,14 +289,16 @@ public void testWriteReadNullVector() throws IOException {
       assertTrue(reader.loadNextBatch());
       assertEquals(1, reader.getVectorSchemaRoot().getFieldVectors().size());
 
-      NullVector readNullVector = (NullVector) reader.getVectorSchemaRoot().getFieldVectors().get(0);
+      NullVector readNullVector =
+          (NullVector) reader.getVectorSchemaRoot().getFieldVectors().get(0);
       assertEquals(valueCount, readNullVector.getValueCount());
     }
   }
 
   @Test
   public void testWriteReadWithDictionaries() throws IOException {
-    DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();
+    DictionaryProvider.MapDictionaryProvider provider =
+        new DictionaryProvider.MapDictionaryProvider();
     provider.put(dictionary1);
 
     VarCharVector vector1 = newVarCharVector("varchar1", allocator);
@@ -306,16 +326,17 @@ public void testWriteReadWithDictionaries() throws IOException {
 
     List<Field> fields = Arrays.asList(encodedVector1.getField(), encodedVector2.getField());
     List<FieldVector> vectors = Collections2.asImmutableList(encodedVector1, encodedVector2);
-    try (VectorSchemaRoot root = new VectorSchemaRoot(fields, vectors, encodedVector1.getValueCount());
-         ByteArrayOutputStream out = new ByteArrayOutputStream();
-         ArrowFileWriter writer = new ArrowFileWriter(root, provider, newChannel(out));) {
+    try (VectorSchemaRoot root =
+            new VectorSchemaRoot(fields, vectors, encodedVector1.getValueCount());
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        ArrowFileWriter writer = new ArrowFileWriter(root, provider, newChannel(out)); ) {
 
       writer.start();
       writer.writeBatch();
       writer.end();
 
-      try (SeekableReadChannel channel = new SeekableReadChannel(
-          new ByteArrayReadableSeekableByteChannel(out.toByteArray()));
+      try (SeekableReadChannel channel =
+              new SeekableReadChannel(new ByteArrayReadableSeekableByteChannel(out.toByteArray()));
           ArrowFileReader reader = new ArrowFileReader(channel, allocator)) {
         Schema readSchema = reader.getVectorSchemaRoot().getSchema();
         assertEquals(root.getSchema(), readSchema);
@@ -345,19 +366,18 @@ public void testWriteReadWithStructDictionaries() throws IOException {
 
       List<Field> fields = Arrays.asList(encodedVector.getField());
       List<FieldVector> vectors = Collections2.asImmutableList(encodedVector);
-      try (
-          VectorSchemaRoot root =
+      try (VectorSchemaRoot root =
               new VectorSchemaRoot(fields, vectors, encodedVector.getValueCount());
           ByteArrayOutputStream out = new ByteArrayOutputStream();
-          ArrowFileWriter writer = new ArrowFileWriter(root, provider, newChannel(out));) {
+          ArrowFileWriter writer = new ArrowFileWriter(root, provider, newChannel(out)); ) {
 
         writer.start();
         writer.writeBatch();
         writer.end();
 
-        try (
-            SeekableReadChannel channel = new SeekableReadChannel(
-                new ByteArrayReadableSeekableByteChannel(out.toByteArray()));
+        try (SeekableReadChannel channel =
+                new SeekableReadChannel(
+                    new ByteArrayReadableSeekableByteChannel(out.toByteArray()));
             ArrowFileReader reader = new ArrowFileReader(channel, allocator)) {
           final VectorSchemaRoot readRoot = reader.getVectorSchemaRoot();
           final Schema readSchema = readRoot.getSchema();
@@ -372,8 +392,9 @@ public void testWriteReadWithStructDictionaries() throws IOException {
           // Read the encoded vector and check it
           final FieldVector readEncoded = readRoot.getVector(0);
           assertEquals(encodedVector.getValueCount(), readEncoded.getValueCount());
-          assertTrue(new RangeEqualsVisitor(encodedVector, readEncoded)
-              .rangeEquals(new Range(0, 0, encodedVector.getValueCount())));
+          assertTrue(
+              new RangeEqualsVisitor(encodedVector, readEncoded)
+                  .rangeEquals(new Range(0, 0, encodedVector.getValueCount())));
 
           // Read the dictionary
           final Map<Long, Dictionary> readDictionaryMap = reader.getDictionaryVectors();
@@ -386,18 +407,20 @@ public void testWriteReadWithStructDictionaries() throws IOException {
           assertEquals(dictionaryVector4.getValueCount(), readDictionaryVector.getValueCount());
           final BiFunction<ValueVector, ValueVector, Boolean> typeComparatorIgnoreName =
               (v1, v2) -> new TypeEqualsVisitor(v1, false, true).equals(v2);
-          assertTrue("Dictionary vectors are not equal",
-              new RangeEqualsVisitor(dictionaryVector4, readDictionaryVector,
-                  typeComparatorIgnoreName)
-                      .rangeEquals(new Range(0, 0, dictionaryVector4.getValueCount())));
+          assertTrue(
+              new RangeEqualsVisitor(
+                      dictionaryVector4, readDictionaryVector, typeComparatorIgnoreName)
+                  .rangeEquals(new Range(0, 0, dictionaryVector4.getValueCount())),
+              "Dictionary vectors are not equal");
 
           // Assert the decoded vector is correct
           try (final ValueVector readVector =
               DictionaryEncoder.decode(readEncoded, readDictionary)) {
             assertEquals(vector.getValueCount(), readVector.getValueCount());
-            assertTrue("Decoded vectors are not equal",
+            assertTrue(
                 new RangeEqualsVisitor(vector, readVector, typeComparatorIgnoreName)
-                    .rangeEquals(new Range(0, 0, vector.getValueCount())));
+                    .rangeEquals(new Range(0, 0, vector.getValueCount())),
+                "Decoded vectors are not equal");
           }
         }
       }
@@ -407,7 +430,8 @@ public void testWriteReadWithStructDictionaries() throws IOException {
   @Test
   public void testEmptyStreamInFileIPC() throws IOException {
 
-    DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();
+    DictionaryProvider.MapDictionaryProvider provider =
+        new DictionaryProvider.MapDictionaryProvider();
     provider.put(dictionary1);
 
     VarCharVector vector = newVarCharVector("varchar", allocator);
@@ -425,16 +449,17 @@ public void testEmptyStreamInFileIPC() throws IOException {
     List<Field> fields = Arrays.asList(encodedVector1A.getField());
     List<FieldVector> vectors = Collections2.asImmutableList(encodedVector1A);
 
-    try (VectorSchemaRoot root = new VectorSchemaRoot(fields, vectors, encodedVector1A.getValueCount());
-         ByteArrayOutputStream out = new ByteArrayOutputStream();
-         ArrowFileWriter writer = new ArrowFileWriter(root, provider, newChannel(out))) {
+    try (VectorSchemaRoot root =
+            new VectorSchemaRoot(fields, vectors, encodedVector1A.getValueCount());
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        ArrowFileWriter writer = new ArrowFileWriter(root, provider, newChannel(out))) {
 
       writer.start();
       writer.end();
 
-      try (SeekableReadChannel channel = new SeekableReadChannel(
-           new ByteArrayReadableSeekableByteChannel(out.toByteArray()));
-           ArrowFileReader reader = new ArrowFileReader(channel, allocator)) {
+      try (SeekableReadChannel channel =
+              new SeekableReadChannel(new ByteArrayReadableSeekableByteChannel(out.toByteArray()));
+          ArrowFileReader reader = new ArrowFileReader(channel, allocator)) {
         Schema readSchema = reader.getVectorSchemaRoot().getSchema();
         assertEquals(root.getSchema(), readSchema);
         assertEquals(1, reader.getDictionaryVectors().size());
@@ -442,13 +467,13 @@ public void testEmptyStreamInFileIPC() throws IOException {
         assertEquals(0, reader.getRecordBlocks().size());
       }
     }
-
   }
 
   @Test
   public void testEmptyStreamInStreamingIPC() throws IOException {
 
-    DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();
+    DictionaryProvider.MapDictionaryProvider provider =
+        new DictionaryProvider.MapDictionaryProvider();
     provider.put(dictionary1);
 
     VarCharVector vector = newVarCharVector("varchar", allocator);
@@ -465,29 +490,30 @@ public void testEmptyStreamInStreamingIPC() throws IOException {
 
     List<Field> fields = Arrays.asList(encodedVector.getField());
     try (VectorSchemaRoot root =
-        new VectorSchemaRoot(fields, Arrays.asList(encodedVector), encodedVector.getValueCount());
+            new VectorSchemaRoot(
+                fields, Arrays.asList(encodedVector), encodedVector.getValueCount());
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         ArrowStreamWriter writer = new ArrowStreamWriter(root, provider, newChannel(out))) {
 
       writer.start();
       writer.end();
 
-
-      try (ArrowStreamReader reader = new ArrowStreamReader(
-          new ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator)) {
+      try (ArrowStreamReader reader =
+          new ArrowStreamReader(
+              new ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator)) {
         Schema readSchema = reader.getVectorSchemaRoot().getSchema();
         assertEquals(root.getSchema(), readSchema);
         assertEquals(1, reader.getDictionaryVectors().size());
         assertFalse(reader.loadNextBatch());
       }
     }
-
   }
 
   @Test
   public void testDictionaryReplacement() throws Exception {
     VarCharVector vector1 = newVarCharVector("varchar1", allocator);
-    setVector(vector1,
+    setVector(
+        vector1,
         "foo".getBytes(StandardCharsets.UTF_8),
         "bar".getBytes(StandardCharsets.UTF_8),
         "baz".getBytes(StandardCharsets.UTF_8),
@@ -496,7 +522,8 @@ public void testDictionaryReplacement() throws Exception {
     FieldVector encodedVector1 = (FieldVector) DictionaryEncoder.encode(vector1, dictionary1);
 
     VarCharVector vector2 = newVarCharVector("varchar2", allocator);
-    setVector(vector2,
+    setVector(
+        vector2,
         "foo".getBytes(StandardCharsets.UTF_8),
         "foo".getBytes(StandardCharsets.UTF_8),
         "foo".getBytes(StandardCharsets.UTF_8),
@@ -504,11 +531,14 @@ public void testDictionaryReplacement() throws Exception {
 
     FieldVector encodedVector2 = (FieldVector) DictionaryEncoder.encode(vector2, dictionary1);
 
-    DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();
+    DictionaryProvider.MapDictionaryProvider provider =
+        new DictionaryProvider.MapDictionaryProvider();
     provider.put(dictionary1);
     List<Field> schemaFields = new ArrayList<>();
-    schemaFields.add(DictionaryUtility.toMessageFormat(encodedVector1.getField(), provider, new HashSet<>()));
-    schemaFields.add(DictionaryUtility.toMessageFormat(encodedVector2.getField(), provider, new HashSet<>()));
+    schemaFields.add(
+        DictionaryUtility.toMessageFormat(encodedVector1.getField(), provider, new HashSet<>()));
+    schemaFields.add(
+        DictionaryUtility.toMessageFormat(encodedVector2.getField(), provider, new HashSet<>()));
     Schema schema = new Schema(schemaFields);
 
     ByteArrayOutputStream outStream = new ByteArrayOutputStream();
@@ -531,8 +561,9 @@ public void testDictionaryReplacement() throws Exception {
     // write eos
     out.writeIntLittleEndian(0);
 
-    try (ArrowStreamReader reader = new ArrowStreamReader(
-        new ByteArrayReadableSeekableByteChannel(outStream.toByteArray()), allocator)) {
+    try (ArrowStreamReader reader =
+        new ArrowStreamReader(
+            new ByteArrayReadableSeekableByteChannel(outStream.toByteArray()), allocator)) {
       assertEquals(1, reader.getDictionaryVectors().size());
       assertTrue(reader.loadNextBatch());
       FieldVector dictionaryVector = reader.getDictionaryVectors().get(1L).getVector();
@@ -549,7 +580,8 @@ public void testDictionaryReplacement() throws Exception {
   @Test
   public void testDeltaDictionary() throws Exception {
     VarCharVector vector1 = newVarCharVector("varchar1", allocator);
-    setVector(vector1,
+    setVector(
+        vector1,
         "foo".getBytes(StandardCharsets.UTF_8),
         "bar".getBytes(StandardCharsets.UTF_8),
         "baz".getBytes(StandardCharsets.UTF_8),
@@ -558,7 +590,8 @@ public void testDeltaDictionary() throws Exception {
     FieldVector encodedVector1 = (FieldVector) DictionaryEncoder.encode(vector1, dictionary1);
 
     VarCharVector vector2 = newVarCharVector("varchar2", allocator);
-    setVector(vector2,
+    setVector(
+        vector2,
         "foo".getBytes(StandardCharsets.UTF_8),
         "aa".getBytes(StandardCharsets.UTF_8),
         "bb".getBytes(StandardCharsets.UTF_8),
@@ -566,12 +599,15 @@ public void testDeltaDictionary() throws Exception {
 
     FieldVector encodedVector2 = (FieldVector) DictionaryEncoder.encode(vector2, dictionary3);
 
-    DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();
+    DictionaryProvider.MapDictionaryProvider provider =
+        new DictionaryProvider.MapDictionaryProvider();
     provider.put(dictionary1);
     provider.put(dictionary3);
     List<Field> schemaFields = new ArrayList<>();
-    schemaFields.add(DictionaryUtility.toMessageFormat(encodedVector1.getField(), provider, new HashSet<>()));
-    schemaFields.add(DictionaryUtility.toMessageFormat(encodedVector2.getField(), provider, new HashSet<>()));
+    schemaFields.add(
+        DictionaryUtility.toMessageFormat(encodedVector1.getField(), provider, new HashSet<>()));
+    schemaFields.add(
+        DictionaryUtility.toMessageFormat(encodedVector2.getField(), provider, new HashSet<>()));
     Schema schema = new Schema(schemaFields);
 
     ByteArrayOutputStream outStream = new ByteArrayOutputStream();
@@ -597,8 +633,9 @@ public void testDeltaDictionary() throws Exception {
     // write eos
     out.writeIntLittleEndian(0);
 
-    try (ArrowStreamReader reader = new ArrowStreamReader(
-        new ByteArrayReadableSeekableByteChannel(outStream.toByteArray()), allocator)) {
+    try (ArrowStreamReader reader =
+        new ArrowStreamReader(
+            new ByteArrayReadableSeekableByteChannel(outStream.toByteArray()), allocator)) {
       assertEquals(1, reader.getDictionaryVectors().size());
       assertTrue(reader.loadNextBatch());
       FieldVector dictionaryVector = reader.getDictionaryVectors().get(1L).getVector();
@@ -610,13 +647,13 @@ public void testDeltaDictionary() throws Exception {
     vector1.close();
     vector2.close();
     AutoCloseables.close(closeableList);
-
   }
 
   // Tests that the ArrowStreamWriter re-emits dictionaries when they change
   @Test
   public void testWriteReadStreamWithDictionaryReplacement() throws Exception {
-    DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();
+    DictionaryProvider.MapDictionaryProvider provider =
+        new DictionaryProvider.MapDictionaryProvider();
     provider.put(dictionary1);
 
     String[] batch0 = {"foo", "bar", "baz", "bar", "baz"};
@@ -633,8 +670,9 @@ public void testWriteReadStreamWithDictionaryReplacement() throws Exception {
     List<Field> fields = Arrays.asList(encodedVector1.getField());
     try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
       try (VectorSchemaRoot root =
-               new VectorSchemaRoot(fields, Arrays.asList(encodedVector1), encodedVector1.getValueCount());
-           ArrowStreamWriter writer = new ArrowStreamWriter(root, provider, newChannel(out))) {
+              new VectorSchemaRoot(
+                  fields, Arrays.asList(encodedVector1), encodedVector1.getValueCount());
+          ArrowStreamWriter writer = new ArrowStreamWriter(root, provider, newChannel(out))) {
         writer.start();
 
         // Write batch with initial data and dictionary
@@ -660,8 +698,9 @@ public void testWriteReadStreamWithDictionaryReplacement() throws Exception {
         writer.end();
       }
 
-      try (ArrowStreamReader reader = new ArrowStreamReader(
-          new ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator)) {
+      try (ArrowStreamReader reader =
+          new ArrowStreamReader(
+              new ByteArrayReadableSeekableByteChannel(out.toByteArray()), allocator)) {
         VectorSchemaRoot root = reader.getVectorSchemaRoot();
 
         // Read and verify first batch
@@ -670,7 +709,7 @@ public void testWriteReadStreamWithDictionaryReplacement() throws Exception {
         FieldVector readEncoded1 = root.getVector(0);
         long dictionaryId = readEncoded1.getField().getDictionary().getId();
         try (VarCharVector decodedValues =
-                 (VarCharVector) DictionaryEncoder.decode(readEncoded1, reader.lookup(dictionaryId))) {
+            (VarCharVector) DictionaryEncoder.decode(readEncoded1, reader.lookup(dictionaryId))) {
           for (int i = 0; i < batch0.length; ++i) {
             assertEquals(batch0[i], new String(decodedValues.get(i), StandardCharsets.UTF_8));
           }
@@ -682,7 +721,7 @@ public void testWriteReadStreamWithDictionaryReplacement() throws Exception {
         FieldVector readEncoded2 = root.getVector(0);
         dictionaryId = readEncoded2.getField().getDictionary().getId();
         try (VarCharVector decodedValues =
-                 (VarCharVector) DictionaryEncoder.decode(readEncoded2, reader.lookup(dictionaryId))) {
+            (VarCharVector) DictionaryEncoder.decode(readEncoded2, reader.lookup(dictionaryId))) {
           for (int i = 0; i < batch1.length; ++i) {
             assertEquals(batch1[i], new String(decodedValues.get(i), StandardCharsets.UTF_8));
           }
@@ -696,33 +735,29 @@ public void testWriteReadStreamWithDictionaryReplacement() throws Exception {
   }
 
   private void serializeDictionaryBatch(
-      WriteChannel out,
-      Dictionary dictionary,
-      boolean isDelta,
-      List<AutoCloseable> closeables) throws IOException {
+      WriteChannel out, Dictionary dictionary, boolean isDelta, List<AutoCloseable> closeables)
+      throws IOException {
 
     FieldVector dictVector = dictionary.getVector();
-    VectorSchemaRoot root = new VectorSchemaRoot(
-        Collections.singletonList(dictVector.getField()),
-        Collections.singletonList(dictVector),
-        dictVector.getValueCount());
+    VectorSchemaRoot root =
+        new VectorSchemaRoot(
+            Collections.singletonList(dictVector.getField()),
+            Collections.singletonList(dictVector),
+            dictVector.getValueCount());
     ArrowDictionaryBatch batch =
-        new ArrowDictionaryBatch(dictionary.getEncoding().getId(), new VectorUnloader(root).getRecordBatch(), isDelta);
+        new ArrowDictionaryBatch(
+            dictionary.getEncoding().getId(), new VectorUnloader(root).getRecordBatch(), isDelta);
     MessageSerializer.serialize(out, batch);
     closeables.add(batch);
     closeables.add(root);
   }
 
   private void serializeRecordBatch(
-      WriteChannel out,
-      List<FieldVector> vectors,
-      List<AutoCloseable> closeables) throws IOException {
+      WriteChannel out, List<FieldVector> vectors, List<AutoCloseable> closeables)
+      throws IOException {
 
     List<Field> fields = vectors.stream().map(v -> v.getField()).collect(Collectors.toList());
-    VectorSchemaRoot root = new VectorSchemaRoot(
-        fields,
-        vectors,
-        vectors.get(0).getValueCount());
+    VectorSchemaRoot root = new VectorSchemaRoot(fields, vectors, vectors.get(0).getValueCount());
     VectorUnloader unloader = new VectorUnloader(root);
     ArrowRecordBatch batch = unloader.getRecordBatch();
     MessageSerializer.serialize(out, batch);
@@ -742,10 +777,11 @@ public void testReadInterleavedData() throws IOException {
 
     // write dictionary1
     FieldVector dictVector1 = dictionary1.getVector();
-    VectorSchemaRoot dictRoot1 = new VectorSchemaRoot(
-        Collections.singletonList(dictVector1.getField()),
-        Collections.singletonList(dictVector1),
-        dictVector1.getValueCount());
+    VectorSchemaRoot dictRoot1 =
+        new VectorSchemaRoot(
+            Collections.singletonList(dictVector1.getField()),
+            Collections.singletonList(dictVector1),
+            dictVector1.getValueCount());
     ArrowDictionaryBatch dictionaryBatch1 =
         new ArrowDictionaryBatch(1, new VectorUnloader(dictRoot1).getRecordBatch());
     MessageSerializer.serialize(out, dictionaryBatch1);
@@ -757,10 +793,11 @@ public void testReadInterleavedData() throws IOException {
 
     // write dictionary2
     FieldVector dictVector2 = dictionary2.getVector();
-    VectorSchemaRoot dictRoot2 = new VectorSchemaRoot(
-        Collections.singletonList(dictVector2.getField()),
-        Collections.singletonList(dictVector2),
-        dictVector2.getValueCount());
+    VectorSchemaRoot dictRoot2 =
+        new VectorSchemaRoot(
+            Collections.singletonList(dictVector2.getField()),
+            Collections.singletonList(dictVector2),
+            dictVector2.getValueCount());
     ArrowDictionaryBatch dictionaryBatch2 =
         new ArrowDictionaryBatch(2, new VectorUnloader(dictRoot2).getRecordBatch());
     MessageSerializer.serialize(out, dictionaryBatch2);
@@ -773,8 +810,9 @@ public void testReadInterleavedData() throws IOException {
     // write eos
     out.writeIntLittleEndian(0);
 
-    try (ArrowStreamReader reader = new ArrowStreamReader(
-        new ByteArrayReadableSeekableByteChannel(outStream.toByteArray()), allocator)) {
+    try (ArrowStreamReader reader =
+        new ArrowStreamReader(
+            new ByteArrayReadableSeekableByteChannel(outStream.toByteArray()), allocator)) {
       Schema readSchema = reader.getVectorSchemaRoot().getSchema();
       assertEquals(encodedSchema, readSchema);
       assertEquals(2, reader.getDictionaryVectors().size());
@@ -789,7 +827,8 @@ public void testReadInterleavedData() throws IOException {
   private List<ArrowRecordBatch> createRecordBatches() {
     List<ArrowRecordBatch> batches = new ArrayList<>();
 
-    DictionaryProvider.MapDictionaryProvider provider = new DictionaryProvider.MapDictionaryProvider();
+    DictionaryProvider.MapDictionaryProvider provider =
+        new DictionaryProvider.MapDictionaryProvider();
     provider.put(dictionary1);
     provider.put(dictionary2);
 
@@ -841,11 +880,14 @@ private List<ArrowRecordBatch> createRecordBatches() {
     rootB.close();
 
     List<Field> schemaFields = new ArrayList<>();
-    schemaFields.add(DictionaryUtility.toMessageFormat(encodedVectorA1.getField(), provider, new HashSet<>()));
-    schemaFields.add(DictionaryUtility.toMessageFormat(encodedVectorA2.getField(), provider, new HashSet<>()));
+    schemaFields.add(
+        DictionaryUtility.toMessageFormat(encodedVectorA1.getField(), provider, new HashSet<>()));
+    schemaFields.add(
+        DictionaryUtility.toMessageFormat(encodedVectorA2.getField(), provider, new HashSet<>()));
     schema = new Schema(schemaFields);
 
-    encodedSchema = new Schema(Arrays.asList(encodedVectorA1.getField(), encodedVectorA2.getField()));
+    encodedSchema =
+        new Schema(Arrays.asList(encodedVectorA1.getField(), encodedVectorA2.getField()));
 
     return batches;
   }
@@ -858,8 +900,11 @@ public void testLegacyIpcBackwardsCompatibility() throws Exception {
     vector.setValueCount(valueCount);
     vector.setSafe(0, 1);
     vector.setSafe(1, 2);
-    ArrowRecordBatch batch = new ArrowRecordBatch(valueCount, asList(new ArrowFieldNode(valueCount, 0)),
-        asList(vector.getValidityBuffer(), vector.getDataBuffer()));
+    ArrowRecordBatch batch =
+        new ArrowRecordBatch(
+            valueCount,
+            asList(new ArrowFieldNode(valueCount, 0)),
+            asList(vector.getValidityBuffer(), vector.getDataBuffer()));
 
     ByteArrayOutputStream outStream = new ByteArrayOutputStream();
     WriteChannel out = new WriteChannel(newChannel(outStream));
@@ -882,7 +927,8 @@ public void testLegacyIpcBackwardsCompatibility() throws Exception {
     MessageSerializer.serialize(out, schema, option);
     MessageSerializer.serialize(out, batch);
 
-    ReadChannel in2 = new ReadChannel(newChannel(new ByteArrayInputStream(outStream.toByteArray())));
+    ReadChannel in2 =
+        new ReadChannel(newChannel(new ByteArrayInputStream(outStream.toByteArray())));
     Schema readSchema2 = MessageSerializer.deserializeSchema(in2);
     assertEquals(schema, readSchema2);
     ArrowRecordBatch readBatch2 = MessageSerializer.deserializeRecordBatch(in2, allocator);
@@ -900,8 +946,9 @@ public void testChannelReadFully() throws IOException {
     buf.putInt(200);
     buf.rewind();
 
-    try (ReadChannel channel = new ReadChannel(Channels.newChannel(new ByteArrayInputStream(buf.array())));
-         ArrowBuf arrBuf = allocator.buffer(8)) {
+    try (ReadChannel channel =
+            new ReadChannel(Channels.newChannel(new ByteArrayInputStream(buf.array())));
+        ArrowBuf arrBuf = allocator.buffer(8)) {
       arrBuf.setInt(0, 100);
       arrBuf.writerIndex(4);
       assertEquals(4, arrBuf.writerIndex());
@@ -921,8 +968,9 @@ public void testChannelReadFullyEos() throws IOException {
     buf.putInt(10);
     buf.rewind();
 
-    try (ReadChannel channel = new ReadChannel(Channels.newChannel(new ByteArrayInputStream(buf.array())));
-         ArrowBuf arrBuf = allocator.buffer(8)) {
+    try (ReadChannel channel =
+            new ReadChannel(Channels.newChannel(new ByteArrayInputStream(buf.array())));
+        ArrowBuf arrBuf = allocator.buffer(8)) {
       int n = channel.readFully(arrBuf.nioBuffer(0, 8));
       assertEquals(4, n);
 
@@ -946,13 +994,13 @@ public void testCustomMetaData() throws IOException {
     metadata.put("key2", "value2");
     try (VectorSchemaRoot root = new VectorSchemaRoot(fields, vectors, vector.getValueCount());
         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ArrowFileWriter writer = new ArrowFileWriter(root, null, newChannel(out), metadata);) {
+        ArrowFileWriter writer = new ArrowFileWriter(root, null, newChannel(out), metadata); ) {
 
       writer.start();
       writer.end();
 
-      try (SeekableReadChannel channel = new SeekableReadChannel(
-          new ByteArrayReadableSeekableByteChannel(out.toByteArray()));
+      try (SeekableReadChannel channel =
+              new SeekableReadChannel(new ByteArrayReadableSeekableByteChannel(out.toByteArray()));
           ArrowFileReader reader = new ArrowFileReader(channel, allocator)) {
         reader.getVectorSchemaRoot();
 
@@ -965,9 +1013,8 @@ public void testCustomMetaData() throws IOException {
   }
 
   /**
-   * This test case covers the case for which the footer size is extremely large
-   * (much larger than the file size).
-   * Due to integer overflow, our implementation fails detect the problem, which
+   * This test case covers the case for which the footer size is extremely large (much larger than
+   * the file size). Due to integer overflow, our implementation fails detect the problem, which
    * leads to extremely large memory allocation and eventually causing an OutOfMemoryError.
    */
   @Test
@@ -980,18 +1027,22 @@ public void testFileFooterSizeOverflow() {
     System.arraycopy(magicBytes, 0, data, 0, ArrowMagic.MAGIC_LENGTH);
     int footerLength = Integer.MAX_VALUE;
     byte[] footerLengthBytes =
-            ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN).putInt(footerLength).array();
+        ByteBuffer.allocate(4).order(ByteOrder.LITTLE_ENDIAN).putInt(footerLength).array();
     int footerOffset = data.length - ArrowMagic.MAGIC_LENGTH - 4;
     System.arraycopy(footerLengthBytes, 0, data, footerOffset, 4);
     System.arraycopy(magicBytes, 0, data, footerOffset + 4, ArrowMagic.MAGIC_LENGTH);
 
     // test file reader
-    InvalidArrowFileException e = Assertions.assertThrows(InvalidArrowFileException.class, () -> {
-      try (SeekableReadChannel channel = new SeekableReadChannel(new ByteArrayReadableSeekableByteChannel(data));
-           ArrowFileReader reader = new ArrowFileReader(channel, allocator)) {
-        reader.getVectorSchemaRoot().getSchema();
-      }
-    });
+    InvalidArrowFileException e =
+        assertThrows(
+            InvalidArrowFileException.class,
+            () -> {
+              try (SeekableReadChannel channel =
+                      new SeekableReadChannel(new ByteArrayReadableSeekableByteChannel(data));
+                  ArrowFileReader reader = new ArrowFileReader(channel, allocator)) {
+                reader.getVectorSchemaRoot().getSchema();
+              }
+            });
 
     assertEquals("invalid footer length: " + footerLength, e.getMessage());
   }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowStream.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowStream.java
index 145bdd588e945..aa6ceffa0605e 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowStream.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowStream.java
@@ -14,25 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.channels.Channels;
 import java.util.Collections;
-
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.TinyIntVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestArrowStream extends BaseFileTest {
   @Test
@@ -44,15 +41,15 @@ public void testEmptyStream() throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     ArrowStreamWriter writer = new ArrowStreamWriter(root, null, out);
     writer.close();
-    Assert.assertTrue(out.size() > 0);
+    assertTrue(out.size() > 0);
 
     ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
     try (ArrowStreamReader reader = new ArrowStreamReader(in, allocator)) {
       assertEquals(schema, reader.getVectorSchemaRoot().getSchema());
       // Empty should return false
-      Assert.assertFalse(reader.loadNextBatch());
+      assertFalse(reader.loadNextBatch());
       assertEquals(0, reader.getVectorSchemaRoot().getRowCount());
-      Assert.assertFalse(reader.loadNextBatch());
+      assertFalse(reader.loadNextBatch());
       assertEquals(0, reader.getVectorSchemaRoot().getRowCount());
     }
   }
@@ -61,11 +58,12 @@ public void testEmptyStream() throws IOException {
   public void testStreamZeroLengthBatch() throws IOException {
     ByteArrayOutputStream os = new ByteArrayOutputStream();
 
-    try (IntVector vector = new IntVector("foo", allocator);) {
+    try (IntVector vector = new IntVector("foo", allocator); ) {
       Schema schema = new Schema(Collections.singletonList(vector.getField()));
       try (VectorSchemaRoot root =
-             new VectorSchemaRoot(schema, Collections.singletonList(vector), vector.getValueCount());
-           ArrowStreamWriter writer = new ArrowStreamWriter(root, null, Channels.newChannel(os));) {
+              new VectorSchemaRoot(
+                  schema, Collections.singletonList(vector), vector.getValueCount());
+          ArrowStreamWriter writer = new ArrowStreamWriter(root, null, Channels.newChannel(os)); ) {
         vector.setValueCount(0);
         root.setRowCount(0);
         writer.writeBatch();
@@ -75,7 +73,7 @@ public void testStreamZeroLengthBatch() throws IOException {
 
     ByteArrayInputStream in = new ByteArrayInputStream(os.toByteArray());
 
-    try (ArrowStreamReader reader = new ArrowStreamReader(in, allocator);) {
+    try (ArrowStreamReader reader = new ArrowStreamReader(in, allocator); ) {
       VectorSchemaRoot root = reader.getVectorSchemaRoot();
       IntVector vector = (IntVector) root.getFieldVectors().get(0);
       reader.loadNextBatch();
@@ -128,18 +126,19 @@ public void testReadWrite() throws IOException {
   public void testReadWriteMultipleBatches() throws IOException {
     ByteArrayOutputStream os = new ByteArrayOutputStream();
 
-    try (IntVector vector = new IntVector("foo", allocator);) {
+    try (IntVector vector = new IntVector("foo", allocator); ) {
       Schema schema = new Schema(Collections.singletonList(vector.getField()));
       try (VectorSchemaRoot root =
-             new VectorSchemaRoot(schema, Collections.singletonList(vector), vector.getValueCount());
-           ArrowStreamWriter writer = new ArrowStreamWriter(root, null, Channels.newChannel(os));) {
+              new VectorSchemaRoot(
+                  schema, Collections.singletonList(vector), vector.getValueCount());
+          ArrowStreamWriter writer = new ArrowStreamWriter(root, null, Channels.newChannel(os)); ) {
         writeBatchData(writer, vector, root);
       }
     }
 
     ByteArrayInputStream in = new ByteArrayInputStream(os.toByteArray());
 
-    try (ArrowStreamReader reader = new ArrowStreamReader(in, allocator);) {
+    try (ArrowStreamReader reader = new ArrowStreamReader(in, allocator); ) {
       IntVector vector = (IntVector) reader.getVectorSchemaRoot().getFieldVectors().get(0);
       validateBatchData(reader, vector);
     }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowStreamPipe.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowStreamPipe.java
index 422a63f57f7d8..c771d728423d1 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowStreamPipe.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowStreamPipe.java
@@ -14,27 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.nio.channels.Pipe;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.TinyIntVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
-import org.apache.arrow.vector.ipc.ArrowStreamReader;
-import org.apache.arrow.vector.ipc.ArrowStreamWriter;
-import org.apache.arrow.vector.ipc.MessageSerializerTest;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestArrowStreamPipe {
   Schema schema = MessageSerializerTest.testSchema();
@@ -46,8 +41,7 @@ private final class WriterThread extends Thread {
     private final ArrowStreamWriter writer;
     private final VectorSchemaRoot root;
 
-    public WriterThread(int numBatches, WritableByteChannel sinkChannel)
-        throws IOException {
+    public WriterThread(int numBatches, WritableByteChannel sinkChannel) throws IOException {
       this.numBatches = numBatches;
       BufferAllocator allocator = alloc.newChildAllocator("writer thread", 0, Integer.MAX_VALUE);
       root = VectorSchemaRoot.create(schema, allocator);
@@ -75,7 +69,7 @@ public void run() {
         root.close();
       } catch (IOException e) {
         e.printStackTrace();
-        Assert.fail(e.toString()); // have to explicitly fail since we're in a separate thread
+        fail(e.toString()); // have to explicitly fail since we're in a separate thread
       }
     }
 
@@ -90,33 +84,33 @@ private final class ReaderThread extends Thread {
     private final BufferAllocator alloc = new RootAllocator(Long.MAX_VALUE);
     private boolean done = false;
 
-    public ReaderThread(ReadableByteChannel sourceChannel)
-        throws IOException {
-      reader = new ArrowStreamReader(sourceChannel, alloc) {
-
-        @Override
-        public boolean loadNextBatch() throws IOException {
-          if (super.loadNextBatch()) {
-            batchesRead++;
-          } else {
-            done = true;
-            return false;
-          }
-          VectorSchemaRoot root = getVectorSchemaRoot();
-          Assert.assertEquals(16, root.getRowCount());
-          TinyIntVector vector = (TinyIntVector) root.getFieldVectors().get(0);
-          Assert.assertEquals((byte) (batchesRead - 1), vector.get(0));
-          for (int i = 1; i < 16; i++) {
-            if (i < 8) {
-              Assert.assertEquals((byte) (i + 1), vector.get(i));
-            } else {
-              Assert.assertTrue(vector.isNull(i));
+    public ReaderThread(ReadableByteChannel sourceChannel) throws IOException {
+      reader =
+          new ArrowStreamReader(sourceChannel, alloc) {
+
+            @Override
+            public boolean loadNextBatch() throws IOException {
+              if (super.loadNextBatch()) {
+                batchesRead++;
+              } else {
+                done = true;
+                return false;
+              }
+              VectorSchemaRoot root = getVectorSchemaRoot();
+              assertEquals(16, root.getRowCount());
+              TinyIntVector vector = (TinyIntVector) root.getFieldVectors().get(0);
+              assertEquals((byte) (batchesRead - 1), vector.get(0));
+              for (int i = 1; i < 16; i++) {
+                if (i < 8) {
+                  assertEquals((byte) (i + 1), vector.get(i));
+                } else {
+                  assertTrue(vector.isNull(i));
+                }
+              }
+
+              return true;
             }
-          }
-
-          return true;
-        }
-      };
+          };
     }
 
     @Override
@@ -129,7 +123,7 @@ public void run() {
         reader.close();
       } catch (IOException e) {
         e.printStackTrace();
-        Assert.fail(e.toString()); // have to explicitly fail since we're in a separate thread
+        fail(e.toString()); // have to explicitly fail since we're in a separate thread
       }
     }
 
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestJSONFile.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestJSONFile.java
index bd5bd4feabbd4..c69a3bfbc1ee2 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestJSONFile.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestJSONFile.java
@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.io.File;
 import java.io.IOException;
@@ -28,7 +27,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
@@ -43,8 +41,7 @@
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.arrow.vector.util.Validator;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -56,8 +53,8 @@ public void testNoBatches() throws IOException {
     File file = new File("target/no_batches.json");
 
     try (BufferAllocator originalVectorAllocator =
-             allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
-         StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
+            allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
+        StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
       BaseWriter.ComplexWriter writer = new ComplexWriterImpl("root", parent);
       BaseWriter.StructWriter rootWriter = writer.rootAsStruct();
       rootWriter.integer("int");
@@ -70,10 +67,9 @@ public void testNoBatches() throws IOException {
     }
 
     // read
-    try (
-        BufferAllocator readerAllocator = allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
-        JsonFileReader reader = new JsonFileReader(file, readerAllocator)
-    ) {
+    try (BufferAllocator readerAllocator =
+            allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
+        JsonFileReader reader = new JsonFileReader(file, readerAllocator)) {
       Schema schema = reader.start();
       LOGGER.debug("reading schema: " + schema);
     }
@@ -86,22 +82,21 @@ public void testWriteRead() throws IOException {
 
     // write
     try (BufferAllocator originalVectorAllocator =
-           allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
-         StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
+            allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
+        StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
       writeData(count, parent);
       writeJSON(file, new VectorSchemaRoot(parent.getChild("root")), null);
     }
 
     // read
-    try (
-        BufferAllocator readerAllocator = allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
-        JsonFileReader reader = new JsonFileReader(file, readerAllocator)
-    ) {
+    try (BufferAllocator readerAllocator =
+            allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
+        JsonFileReader reader = new JsonFileReader(file, readerAllocator)) {
       Schema schema = reader.start();
       LOGGER.debug("reading schema: " + schema);
 
       // initialize vectors
-      try (VectorSchemaRoot root = reader.read();) {
+      try (VectorSchemaRoot root = reader.read(); ) {
         validateContent(count, root);
       }
     }
@@ -113,23 +108,22 @@ public void testWriteReadComplexJSON() throws IOException {
     int count = COUNT;
 
     // write
-    try (
-        BufferAllocator originalVectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
+    try (BufferAllocator originalVectorAllocator =
+            allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
         StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
       writeComplexData(count, parent);
       writeJSON(file, new VectorSchemaRoot(parent.getChild("root")), null);
     }
 
     // read
-    try (
-        BufferAllocator readerAllocator = allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
-        JsonFileReader reader = new JsonFileReader(file, readerAllocator);
-    ) {
+    try (BufferAllocator readerAllocator =
+            allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
+        JsonFileReader reader = new JsonFileReader(file, readerAllocator); ) {
       Schema schema = reader.start();
       LOGGER.debug("reading schema: " + schema);
 
       // initialize vectors
-      try (VectorSchemaRoot root = reader.read();) {
+      try (VectorSchemaRoot root = reader.read(); ) {
         validateComplexContent(count, root);
       }
     }
@@ -139,8 +133,8 @@ public void testWriteReadComplexJSON() throws IOException {
   public void testWriteComplexJSON() throws IOException {
     File file = new File("target/mytest_write_complex.json");
     int count = COUNT;
-    try (
-        BufferAllocator vectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
+    try (BufferAllocator vectorAllocator =
+            allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
         StructVector parent = StructVector.empty("parent", vectorAllocator)) {
       writeComplexData(count, parent);
       VectorSchemaRoot root = new VectorSchemaRoot(parent.getChild("root"));
@@ -149,20 +143,20 @@ public void testWriteComplexJSON() throws IOException {
     }
   }
 
-  public void writeJSON(File file, VectorSchemaRoot root, DictionaryProvider provider) throws IOException {
+  public void writeJSON(File file, VectorSchemaRoot root, DictionaryProvider provider)
+      throws IOException {
     JsonFileWriter writer = new JsonFileWriter(file, JsonFileWriter.config().pretty(true));
     writer.start(root.getSchema(), provider);
     writer.write(root);
     writer.close();
   }
 
-
   @Test
   public void testWriteReadUnionJSON() throws IOException {
     File file = new File("target/mytest_write_union.json");
     int count = COUNT;
-    try (
-        BufferAllocator vectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
+    try (BufferAllocator vectorAllocator =
+            allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
         StructVector parent = StructVector.empty("parent", vectorAllocator)) {
       writeUnionData(count, parent);
       printVectors(parent.getChildrenFromFields());
@@ -172,13 +166,14 @@ public void testWriteReadUnionJSON() throws IOException {
         writeJSON(file, root, null);
 
         // read
-        try (BufferAllocator readerAllocator = allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE)) {
+        try (BufferAllocator readerAllocator =
+            allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE)) {
           JsonFileReader reader = new JsonFileReader(file, readerAllocator);
 
           Schema schema = reader.start();
           LOGGER.debug("reading schema: " + schema);
 
-          try (VectorSchemaRoot rootFromJson = reader.read();) {
+          try (VectorSchemaRoot rootFromJson = reader.read(); ) {
             validateUnionData(count, rootFromJson);
             Validator.compareVectorSchemaRoot(root, rootFromJson);
           }
@@ -193,8 +188,8 @@ public void testWriteReadDateTimeJSON() throws IOException {
     int count = COUNT;
 
     // write
-    try (
-        BufferAllocator vectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
+    try (BufferAllocator vectorAllocator =
+            allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
         StructVector parent = StructVector.empty("parent", vectorAllocator)) {
 
       writeDateTimeData(count, parent);
@@ -208,15 +203,14 @@ public void testWriteReadDateTimeJSON() throws IOException {
     }
 
     // read
-    try (
-        BufferAllocator readerAllocator = allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
-        JsonFileReader reader = new JsonFileReader(file, readerAllocator)
-    ) {
+    try (BufferAllocator readerAllocator =
+            allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
+        JsonFileReader reader = new JsonFileReader(file, readerAllocator)) {
       Schema schema = reader.start();
       LOGGER.debug("reading schema: " + schema);
 
       // initialize vectors
-      try (VectorSchemaRoot root = reader.read();) {
+      try (VectorSchemaRoot root = reader.read(); ) {
         validateDateTimeContent(count, root);
       }
     }
@@ -227,9 +221,8 @@ public void testWriteReadDictionaryJSON() throws IOException {
     File file = new File("target/mytest_dictionary.json");
 
     // write
-    try (
-        BufferAllocator vectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE)
-    ) {
+    try (BufferAllocator vectorAllocator =
+        allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE)) {
       MapDictionaryProvider provider = new MapDictionaryProvider();
 
       try (VectorSchemaRoot root = writeFlatDictionaryData(vectorAllocator, provider)) {
@@ -245,15 +238,14 @@ public void testWriteReadDictionaryJSON() throws IOException {
     }
 
     // read
-    try (
-        BufferAllocator readerAllocator = allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
-        JsonFileReader reader = new JsonFileReader(file, readerAllocator)
-    ) {
+    try (BufferAllocator readerAllocator =
+            allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
+        JsonFileReader reader = new JsonFileReader(file, readerAllocator)) {
       Schema schema = reader.start();
       LOGGER.debug("reading schema: " + schema);
 
       // initialize vectors
-      try (VectorSchemaRoot root = reader.read();) {
+      try (VectorSchemaRoot root = reader.read(); ) {
         validateFlatDictionary(root, reader);
       }
     }
@@ -267,9 +259,8 @@ public void testWriteReadNestedDictionaryJSON() throws IOException {
     // [['foo', 'bar'], ['foo'], ['bar']] -> [[0, 1], [0], [1]]
 
     // write
-    try (
-        BufferAllocator vectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE)
-    ) {
+    try (BufferAllocator vectorAllocator =
+        allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE)) {
       MapDictionaryProvider provider = new MapDictionaryProvider();
 
       try (VectorSchemaRoot root = writeNestedDictionaryData(vectorAllocator, provider)) {
@@ -285,15 +276,14 @@ public void testWriteReadNestedDictionaryJSON() throws IOException {
     }
 
     // read
-    try (
-        BufferAllocator readerAllocator = allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
-        JsonFileReader reader = new JsonFileReader(file, readerAllocator)
-    ) {
+    try (BufferAllocator readerAllocator =
+            allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
+        JsonFileReader reader = new JsonFileReader(file, readerAllocator)) {
       Schema schema = reader.start();
       LOGGER.debug("reading schema: " + schema);
 
       // initialize vectors
-      try (VectorSchemaRoot root = reader.read();) {
+      try (VectorSchemaRoot root = reader.read(); ) {
         validateNestedDictionary(root, reader);
       }
     }
@@ -304,7 +294,8 @@ public void testWriteReadDecimalJSON() throws IOException {
     File file = new File("target/mytest_decimal.json");
 
     // write
-    try (BufferAllocator vectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
+    try (BufferAllocator vectorAllocator =
+            allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
         VectorSchemaRoot root = writeDecimalData(vectorAllocator)) {
       printVectors(root.getFieldVectors());
       validateDecimalData(root);
@@ -312,15 +303,14 @@ public void testWriteReadDecimalJSON() throws IOException {
     }
 
     // read
-    try (
-        BufferAllocator readerAllocator = allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
-        JsonFileReader reader = new JsonFileReader(file, readerAllocator)
-    ) {
+    try (BufferAllocator readerAllocator =
+            allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
+        JsonFileReader reader = new JsonFileReader(file, readerAllocator)) {
       Schema schema = reader.start();
       LOGGER.debug("reading schema: " + schema);
 
       // initialize vectors
-      try (VectorSchemaRoot root = reader.read();) {
+      try (VectorSchemaRoot root = reader.read(); ) {
         validateDecimalData(root);
       }
     }
@@ -332,17 +322,16 @@ public void testSetStructLength() throws IOException {
     if (!file.exists()) {
       file = new File("../docs/source/format/integration_json_examples/struct.json");
     }
-    try (
-        BufferAllocator readerAllocator = allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
-        JsonFileReader reader = new JsonFileReader(file, readerAllocator)
-    ) {
+    try (BufferAllocator readerAllocator =
+            allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
+        JsonFileReader reader = new JsonFileReader(file, readerAllocator)) {
       Schema schema = reader.start();
       LOGGER.debug("reading schema: " + schema);
 
       // initialize vectors
-      try (VectorSchemaRoot root = reader.read();) {
+      try (VectorSchemaRoot root = reader.read(); ) {
         FieldVector vector = root.getVector("struct_nullable");
-        Assert.assertEquals(7, vector.getValueCount());
+        assertEquals(7, vector.getValueCount());
       }
     }
   }
@@ -353,8 +342,8 @@ public void testWriteReadVarBinJSON() throws IOException {
     int count = COUNT;
 
     // write
-    try (
-        BufferAllocator vectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
+    try (BufferAllocator vectorAllocator =
+            allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
         StructVector parent = StructVector.empty("parent", vectorAllocator)) {
       writeVarBinaryData(count, parent);
       VectorSchemaRoot root = new VectorSchemaRoot(parent.getChild("root"));
@@ -363,13 +352,14 @@ public void testWriteReadVarBinJSON() throws IOException {
     }
 
     // read
-    try (BufferAllocator readerAllocator = allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
+    try (BufferAllocator readerAllocator =
+            allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
         JsonFileReader reader = new JsonFileReader(file, readerAllocator)) {
       Schema schema = reader.start();
       LOGGER.debug("reading schema: " + schema);
 
       // initialize vectors
-      try (VectorSchemaRoot root = reader.read();) {
+      try (VectorSchemaRoot root = reader.read(); ) {
         validateVarBinary(count, root);
       }
     }
@@ -380,7 +370,8 @@ public void testWriteReadMapJSON() throws IOException {
     File file = new File("target/mytest_map.json");
 
     // write
-    try (BufferAllocator vectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
+    try (BufferAllocator vectorAllocator =
+            allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
         VectorSchemaRoot root = writeMapData(vectorAllocator)) {
       printVectors(root.getFieldVectors());
       validateMapData(root);
@@ -388,13 +379,14 @@ public void testWriteReadMapJSON() throws IOException {
     }
 
     // read
-    try (BufferAllocator readerAllocator = allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
+    try (BufferAllocator readerAllocator =
+            allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
         JsonFileReader reader = new JsonFileReader(file, readerAllocator)) {
       Schema schema = reader.start();
       LOGGER.debug("reading schema: " + schema);
 
       // initialize vectors
-      try (VectorSchemaRoot root = reader.read();) {
+      try (VectorSchemaRoot root = reader.read(); ) {
         validateMapData(root);
       }
     }
@@ -406,7 +398,8 @@ public void testWriteReadNullJSON() throws IOException {
     int valueCount = 10;
 
     // write
-    try (BufferAllocator vectorAllocator = allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
+    try (BufferAllocator vectorAllocator =
+            allocator.newChildAllocator("original vectors", 0, Integer.MAX_VALUE);
         VectorSchemaRoot root = writeNullData(valueCount)) {
       printVectors(root.getFieldVectors());
       validateNullData(root, valueCount);
@@ -414,16 +407,15 @@ public void testWriteReadNullJSON() throws IOException {
     }
 
     // read
-    try (
-        BufferAllocator readerAllocator = allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
-        JsonFileReader reader = new JsonFileReader(file, readerAllocator)
-    ) {
+    try (BufferAllocator readerAllocator =
+            allocator.newChildAllocator("reader", 0, Integer.MAX_VALUE);
+        JsonFileReader reader = new JsonFileReader(file, readerAllocator)) {
 
       Schema schema = reader.start();
       LOGGER.debug("reading schema: " + schema);
 
       // initialize vectors
-      try (VectorSchemaRoot root = reader.read();) {
+      try (VectorSchemaRoot root = reader.read(); ) {
         validateNullData(root, valueCount);
       }
     }
@@ -432,29 +424,45 @@ public void testWriteReadNullJSON() throws IOException {
   /** Regression test for ARROW-17107. */
   @Test
   public void testRoundtripEmptyVector() throws Exception {
-    final List<Field> fields = Arrays.asList(
-        Field.nullable("utf8", ArrowType.Utf8.INSTANCE),
-        Field.nullable("largeutf8", ArrowType.LargeUtf8.INSTANCE),
-        Field.nullable("binary", ArrowType.Binary.INSTANCE),
-        Field.nullable("largebinary", ArrowType.LargeBinary.INSTANCE),
-        Field.nullable("fixedsizebinary", new ArrowType.FixedSizeBinary(2)),
-        Field.nullable("decimal128", new ArrowType.Decimal(3, 2, 128)),
-        Field.nullable("decimal128", new ArrowType.Decimal(3, 2, 256)),
-        new Field("list", FieldType.nullable(ArrowType.List.INSTANCE),
-            Collections.singletonList(Field.nullable("items", new ArrowType.Int(32, true)))),
-        new Field("largelist", FieldType.nullable(ArrowType.LargeList.INSTANCE),
-            Collections.singletonList(Field.nullable("items", new ArrowType.Int(32, true)))),
-        new Field("map", FieldType.nullable(new ArrowType.Map(/*keyssorted*/ false)),
-            Collections.singletonList(new Field("items", FieldType.notNullable(ArrowType.Struct.INSTANCE),
-                Arrays.asList(Field.notNullable("keys", new ArrowType.Int(32, true)),
-                    Field.nullable("values", new ArrowType.Int(32, true)))))),
-        new Field("fixedsizelist", FieldType.nullable(new ArrowType.FixedSizeList(2)),
-            Collections.singletonList(Field.nullable("items", new ArrowType.Int(32, true)))),
-        new Field("denseunion", FieldType.nullable(new ArrowType.Union(UnionMode.Dense, new int[] {0})),
-            Collections.singletonList(Field.nullable("items", new ArrowType.Int(32, true)))),
-        new Field("sparseunion", FieldType.nullable(new ArrowType.Union(UnionMode.Sparse, new int[] {0})),
-            Collections.singletonList(Field.nullable("items", new ArrowType.Int(32, true))))
-    );
+    final List<Field> fields =
+        Arrays.asList(
+            Field.nullable("utf8", ArrowType.Utf8.INSTANCE),
+            Field.nullable("largeutf8", ArrowType.LargeUtf8.INSTANCE),
+            Field.nullable("binary", ArrowType.Binary.INSTANCE),
+            Field.nullable("largebinary", ArrowType.LargeBinary.INSTANCE),
+            Field.nullable("fixedsizebinary", new ArrowType.FixedSizeBinary(2)),
+            Field.nullable("decimal128", new ArrowType.Decimal(3, 2, 128)),
+            Field.nullable("decimal128", new ArrowType.Decimal(3, 2, 256)),
+            new Field(
+                "list",
+                FieldType.nullable(ArrowType.List.INSTANCE),
+                Collections.singletonList(Field.nullable("items", new ArrowType.Int(32, true)))),
+            new Field(
+                "largelist",
+                FieldType.nullable(ArrowType.LargeList.INSTANCE),
+                Collections.singletonList(Field.nullable("items", new ArrowType.Int(32, true)))),
+            new Field(
+                "map",
+                FieldType.nullable(new ArrowType.Map(/*keyssorted*/ false)),
+                Collections.singletonList(
+                    new Field(
+                        "items",
+                        FieldType.notNullable(ArrowType.Struct.INSTANCE),
+                        Arrays.asList(
+                            Field.notNullable("keys", new ArrowType.Int(32, true)),
+                            Field.nullable("values", new ArrowType.Int(32, true)))))),
+            new Field(
+                "fixedsizelist",
+                FieldType.nullable(new ArrowType.FixedSizeList(2)),
+                Collections.singletonList(Field.nullable("items", new ArrowType.Int(32, true)))),
+            new Field(
+                "denseunion",
+                FieldType.nullable(new ArrowType.Union(UnionMode.Dense, new int[] {0})),
+                Collections.singletonList(Field.nullable("items", new ArrowType.Int(32, true)))),
+            new Field(
+                "sparseunion",
+                FieldType.nullable(new ArrowType.Union(UnionMode.Sparse, new int[] {0})),
+                Collections.singletonList(Field.nullable("items", new ArrowType.Int(32, true)))));
 
     for (final Field field : fields) {
       final Schema schema = new Schema(Collections.singletonList(field));
@@ -464,7 +472,8 @@ public void testRoundtripEmptyVector() throws Exception {
         outputFile.deleteOnExit();
 
         // Try with no allocation
-        try (final JsonFileWriter jsonWriter = new JsonFileWriter(outputFile, JsonFileWriter.config().pretty(true))) {
+        try (final JsonFileWriter jsonWriter =
+            new JsonFileWriter(outputFile, JsonFileWriter.config().pretty(true))) {
           jsonWriter.start(schema, null);
           jsonWriter.write(root);
         } catch (Exception e) {
@@ -484,7 +493,8 @@ public void testRoundtripEmptyVector() throws Exception {
         // Try with an explicit allocation
         root.allocateNew();
         root.setRowCount(0);
-        try (final JsonFileWriter jsonWriter = new JsonFileWriter(outputFile, JsonFileWriter.config().pretty(true))) {
+        try (final JsonFileWriter jsonWriter =
+            new JsonFileWriter(outputFile, JsonFileWriter.config().pretty(true))) {
           jsonWriter.start(schema, null);
           jsonWriter.write(root);
         } catch (Exception e) {
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestRoundTrip.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestRoundTrip.java
index 5f57e90f6ba19..65a3791dd4ab1 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestRoundTrip.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestRoundTrip.java
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import static org.apache.arrow.vector.dictionary.DictionaryProvider.MapDictionaryProvider;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -33,15 +33,13 @@
 import java.io.IOException;
 import java.nio.channels.Channels;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;
-
+import java.util.stream.Stream;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.util.Collections2;
@@ -68,88 +66,85 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.AfterClass;
-import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@RunWith(Parameterized.class)
 public class TestRoundTrip extends BaseFileTest {
   private static final Logger LOGGER = LoggerFactory.getLogger(TestRoundTrip.class);
   private static BufferAllocator allocator;
-  private final String name;
-  private final IpcOption writeOption;
 
-  public TestRoundTrip(String name, IpcOption writeOption) {
-    this.name = name;
-    this.writeOption = writeOption;
-  }
-
-  @Parameterized.Parameters(name = "options = {0}")
-  public static Collection<Object[]> getWriteOption() {
+  static Stream<Object[]> getWriteOption() {
     final IpcOption legacy = new IpcOption(true, MetadataVersion.V4);
     final IpcOption version4 = new IpcOption(false, MetadataVersion.V4);
-    return Arrays.asList(
+    return Stream.of(
         new Object[] {"V4Legacy", legacy},
         new Object[] {"V4", version4},
-        new Object[] {"V5", IpcOption.DEFAULT}
-    );
+        new Object[] {"V5", IpcOption.DEFAULT});
   }
 
-  @BeforeClass
+  @BeforeAll
   public static void setUpClass() {
     allocator = new RootAllocator(Integer.MAX_VALUE);
   }
 
-  @AfterClass
+  @AfterAll
   public static void tearDownClass() {
     allocator.close();
   }
 
-  @Test
-  public void testStruct() throws Exception {
+  @ParameterizedTest(name = "options = {0}")
+  @MethodSource("getWriteOption")
+  public void testStruct(String name, IpcOption writeOption) throws Exception {
     try (final BufferAllocator originalVectorAllocator =
-             allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
-         final StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
+            allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
+        final StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
       writeData(COUNT, parent);
       roundTrip(
+          name,
+          writeOption,
           new VectorSchemaRoot(parent.getChild("root")),
-          /* dictionaryProvider */null,
+          /* dictionaryProvider */ null,
           TestRoundTrip::writeSingleBatch,
           validateFileBatches(new int[] {COUNT}, this::validateContent),
           validateStreamBatches(new int[] {COUNT}, this::validateContent));
     }
   }
 
-  @Test
-  public void testComplex() throws Exception {
+  @ParameterizedTest(name = "options = {0}")
+  @MethodSource("getWriteOption")
+  public void testComplex(String name, IpcOption writeOption) throws Exception {
     try (final BufferAllocator originalVectorAllocator =
-             allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
-         final StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
+            allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
+        final StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
       writeComplexData(COUNT, parent);
       roundTrip(
+          name,
+          writeOption,
           new VectorSchemaRoot(parent.getChild("root")),
-          /* dictionaryProvider */null,
+          /* dictionaryProvider */ null,
           TestRoundTrip::writeSingleBatch,
           validateFileBatches(new int[] {COUNT}, this::validateComplexContent),
           validateStreamBatches(new int[] {COUNT}, this::validateComplexContent));
     }
   }
 
-  @Test
-  public void testMultipleRecordBatches() throws Exception {
+  @ParameterizedTest(name = "options = {0}")
+  @MethodSource("getWriteOption")
+  public void testMultipleRecordBatches(String name, IpcOption writeOption) throws Exception {
     int[] counts = {10, 5};
     try (final BufferAllocator originalVectorAllocator =
-             allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
-         final StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
+            allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
+        final StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
       writeData(counts[0], parent);
       roundTrip(
+          name,
+          writeOption,
           new VectorSchemaRoot(parent.getChild("root")),
-          /* dictionaryProvider */null,
+          /* dictionaryProvider */ null,
           (root, writer) -> {
             writer.start();
             parent.allocateNew();
@@ -158,7 +153,8 @@ public void testMultipleRecordBatches() throws Exception {
             writer.writeBatch();
 
             parent.allocateNew();
-            // if we write the same data we don't catch that the metadata is stored in the wrong order.
+            // if we write the same data we don't catch that the metadata is stored in the wrong
+            // order.
             writeData(counts[1], parent);
             root.setRowCount(counts[1]);
             writer.writeBatch();
@@ -170,53 +166,65 @@ public void testMultipleRecordBatches() throws Exception {
     }
   }
 
-  @Test
-  public void testUnionV4() throws Exception {
-    Assume.assumeTrue(writeOption.metadataVersion == MetadataVersion.V4);
+  @ParameterizedTest(name = "options = {0}")
+  @MethodSource("getWriteOption")
+  public void testUnionV4(String name, IpcOption writeOption) throws Exception {
+    assumeTrue(writeOption.metadataVersion == MetadataVersion.V4);
     final File temp = File.createTempFile("arrow-test-" + name + "-", ".arrow");
     temp.deleteOnExit();
     final ByteArrayOutputStream memoryStream = new ByteArrayOutputStream();
 
     try (final BufferAllocator originalVectorAllocator =
-             allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
-         final StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
+            allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
+        final StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
       writeUnionData(COUNT, parent);
       final VectorSchemaRoot root = new VectorSchemaRoot(parent.getChild("root"));
-      IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> {
-        try (final FileOutputStream fileStream = new FileOutputStream(temp)) {
-          new ArrowFileWriter(root, null, fileStream.getChannel(), writeOption);
-          new ArrowStreamWriter(root, null, Channels.newChannel(memoryStream), writeOption);
-        }
-      });
-      assertTrue(e.getMessage(), e.getMessage().contains("Cannot write union with V4 metadata"));
-      e = assertThrows(IllegalArgumentException.class, () -> {
-        new ArrowStreamWriter(root, null, Channels.newChannel(memoryStream), writeOption);
-      });
-      assertTrue(e.getMessage(), e.getMessage().contains("Cannot write union with V4 metadata"));
+      IllegalArgumentException e =
+          assertThrows(
+              IllegalArgumentException.class,
+              () -> {
+                try (final FileOutputStream fileStream = new FileOutputStream(temp)) {
+                  new ArrowFileWriter(root, null, fileStream.getChannel(), writeOption);
+                  new ArrowStreamWriter(root, null, Channels.newChannel(memoryStream), writeOption);
+                }
+              });
+      assertTrue(e.getMessage().contains("Cannot write union with V4 metadata"), e.getMessage());
+      e =
+          assertThrows(
+              IllegalArgumentException.class,
+              () -> {
+                new ArrowStreamWriter(root, null, Channels.newChannel(memoryStream), writeOption);
+              });
+      assertTrue(e.getMessage().contains("Cannot write union with V4 metadata"), e.getMessage());
     }
   }
 
-  @Test
-  public void testUnionV5() throws Exception {
-    Assume.assumeTrue(writeOption.metadataVersion == MetadataVersion.V5);
+  @ParameterizedTest(name = "options = {0}")
+  @MethodSource("getWriteOption")
+  public void testUnionV5(String name, IpcOption writeOption) throws Exception {
+    assumeTrue(writeOption.metadataVersion == MetadataVersion.V5);
     try (final BufferAllocator originalVectorAllocator =
-             allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
-         final StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
+            allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
+        final StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
       writeUnionData(COUNT, parent);
       VectorSchemaRoot root = new VectorSchemaRoot(parent.getChild("root"));
       validateUnionData(COUNT, root);
       roundTrip(
+          name,
+          writeOption,
           root,
-          /* dictionaryProvider */null,
+          /* dictionaryProvider */ null,
           TestRoundTrip::writeSingleBatch,
           validateFileBatches(new int[] {COUNT}, this::validateUnionData),
           validateStreamBatches(new int[] {COUNT}, this::validateUnionData));
     }
   }
 
-  @Test
-  public void testTiny() throws Exception {
-    try (final VectorSchemaRoot root = VectorSchemaRoot.create(MessageSerializerTest.testSchema(), allocator)) {
+  @ParameterizedTest(name = "options = {0}")
+  @MethodSource("getWriteOption")
+  public void testTiny(String name, IpcOption writeOption) throws Exception {
+    try (final VectorSchemaRoot root =
+        VectorSchemaRoot.create(MessageSerializerTest.testSchema(), allocator)) {
       root.getFieldVectors().get(0).allocateNew();
       int count = 16;
       TinyIntVector vector = (TinyIntVector) root.getFieldVectors().get(0);
@@ -227,8 +235,10 @@ public void testTiny() throws Exception {
       root.setRowCount(count);
 
       roundTrip(
+          name,
+          writeOption,
           root,
-          /* dictionaryProvider */null,
+          /* dictionaryProvider */ null,
           TestRoundTrip::writeSingleBatch,
           validateFileBatches(new int[] {count}, this::validateTinyData),
           validateStreamBatches(new int[] {count}, this::validateTinyData));
@@ -247,16 +257,38 @@ private void validateTinyData(int count, VectorSchemaRoot root) {
     }
   }
 
-  @Test
-  public void testMetadata() throws Exception {
+  @ParameterizedTest(name = "options = {0}")
+  @MethodSource("getWriteOption")
+  public void testMetadata(String name, IpcOption writeOption) throws Exception {
     List<Field> childFields = new ArrayList<>();
-    childFields.add(new Field("varchar-child", new FieldType(true, ArrowType.Utf8.INSTANCE, null, metadata(1)), null));
-    childFields.add(new Field("float-child",
-        new FieldType(true, new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE), null, metadata(2)), null));
-    childFields.add(new Field("int-child", new FieldType(false, new ArrowType.Int(32, true), null, metadata(3)), null));
-    childFields.add(new Field("list-child", new FieldType(true, ArrowType.List.INSTANCE, null, metadata(4)),
-        Collections2.asImmutableList(new Field("l1", FieldType.nullable(new ArrowType.Int(16, true)), null))));
-    Field field = new Field("meta", new FieldType(true, ArrowType.Struct.INSTANCE, null, metadata(0)), childFields);
+    childFields.add(
+        new Field(
+            "varchar-child",
+            new FieldType(true, ArrowType.Utf8.INSTANCE, null, metadata(1)),
+            null));
+    childFields.add(
+        new Field(
+            "float-child",
+            new FieldType(
+                true,
+                new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE),
+                null,
+                metadata(2)),
+            null));
+    childFields.add(
+        new Field(
+            "int-child",
+            new FieldType(false, new ArrowType.Int(32, true), null, metadata(3)),
+            null));
+    childFields.add(
+        new Field(
+            "list-child",
+            new FieldType(true, ArrowType.List.INSTANCE, null, metadata(4)),
+            Collections2.asImmutableList(
+                new Field("l1", FieldType.nullable(new ArrowType.Int(16, true)), null))));
+    Field field =
+        new Field(
+            "meta", new FieldType(true, ArrowType.Struct.INSTANCE, null, metadata(0)), childFields);
     Map<String, String> metadata = new HashMap<>();
     metadata.put("s1", "v1");
     metadata.put("s2", "v2");
@@ -264,27 +296,30 @@ public void testMetadata() throws Exception {
     assertEquals(metadata, originalSchema.getCustomMetadata());
 
     try (final BufferAllocator originalVectorAllocator =
-             allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
-         final StructVector vector = (StructVector) field.createVector(originalVectorAllocator)) {
+            allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
+        final StructVector vector = (StructVector) field.createVector(originalVectorAllocator)) {
       vector.allocateNewSafe();
       vector.setValueCount(0);
 
       List<FieldVector> vectors = Collections2.asImmutableList(vector);
       VectorSchemaRoot root = new VectorSchemaRoot(originalSchema, vectors, 0);
 
-      BiConsumer<Integer, VectorSchemaRoot> validate = (count, readRoot) -> {
-        Schema schema = readRoot.getSchema();
-        assertEquals(originalSchema, schema);
-        assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
-        Field top = schema.getFields().get(0);
-        assertEquals(metadata(0), top.getMetadata());
-        for (int i = 0; i < 4; i++) {
-          assertEquals(metadata(i + 1), top.getChildren().get(i).getMetadata());
-        }
-      };
+      BiConsumer<Integer, VectorSchemaRoot> validate =
+          (count, readRoot) -> {
+            Schema schema = readRoot.getSchema();
+            assertEquals(originalSchema, schema);
+            assertEquals(originalSchema.getCustomMetadata(), schema.getCustomMetadata());
+            Field top = schema.getFields().get(0);
+            assertEquals(metadata(0), top.getMetadata());
+            for (int i = 0; i < 4; i++) {
+              assertEquals(metadata(i + 1), top.getChildren().get(i).getMetadata());
+            }
+          };
       roundTrip(
+          name,
+          writeOption,
           root,
-          /* dictionaryProvider */null,
+          /* dictionaryProvider */ null,
           TestRoundTrip::writeSingleBatch,
           validateFileBatches(new int[] {0}, validate),
           validateStreamBatches(new int[] {0}, validate));
@@ -298,14 +333,17 @@ private Map<String, String> metadata(int i) {
     return Collections.unmodifiableMap(map);
   }
 
-  @Test
-  public void testFlatDictionary() throws Exception {
+  @ParameterizedTest(name = "options = {0}")
+  @MethodSource("getWriteOption")
+  public void testFlatDictionary(String name, IpcOption writeOption) throws Exception {
     AtomicInteger numDictionaryBlocksWritten = new AtomicInteger();
     MapDictionaryProvider provider = new MapDictionaryProvider();
     try (final BufferAllocator originalVectorAllocator =
-             allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
-         final VectorSchemaRoot root = writeFlatDictionaryData(originalVectorAllocator, provider)) {
+            allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
+        final VectorSchemaRoot root = writeFlatDictionaryData(originalVectorAllocator, provider)) {
       roundTrip(
+          name,
+          writeOption,
           root,
           provider,
           (ignored, writer) -> {
@@ -313,7 +351,8 @@ public void testFlatDictionary() throws Exception {
             writer.writeBatch();
             writer.end();
             if (writer instanceof ArrowFileWriter) {
-              numDictionaryBlocksWritten.set(((ArrowFileWriter) writer).getDictionaryBlocks().size());
+              numDictionaryBlocksWritten.set(
+                  ((ArrowFileWriter) writer).getDictionaryBlocks().size());
             }
           },
           (fileReader) -> {
@@ -339,23 +378,28 @@ public void testFlatDictionary() throws Exception {
     }
   }
 
-  @Test
-  public void testNestedDictionary() throws Exception {
+  @ParameterizedTest(name = "options = {0}")
+  @MethodSource("getWriteOption")
+  public void testNestedDictionary(String name, IpcOption writeOption) throws Exception {
     AtomicInteger numDictionaryBlocksWritten = new AtomicInteger();
     MapDictionaryProvider provider = new MapDictionaryProvider();
     // data being written:
     // [['foo', 'bar'], ['foo'], ['bar']] -> [[0, 1], [0], [1]]
     try (final BufferAllocator originalVectorAllocator =
-             allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
-         final VectorSchemaRoot root = writeNestedDictionaryData(originalVectorAllocator, provider)) {
-      CheckedConsumer<ArrowReader> validateDictionary = (streamReader) -> {
-        VectorSchemaRoot readRoot = streamReader.getVectorSchemaRoot();
-        Schema schema = readRoot.getSchema();
-        LOGGER.debug("reading schema: " + schema);
-        assertTrue(streamReader.loadNextBatch());
-        validateNestedDictionary(readRoot, streamReader);
-      };
+            allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
+        final VectorSchemaRoot root =
+            writeNestedDictionaryData(originalVectorAllocator, provider)) {
+      CheckedConsumer<ArrowReader> validateDictionary =
+          (streamReader) -> {
+            VectorSchemaRoot readRoot = streamReader.getVectorSchemaRoot();
+            Schema schema = readRoot.getSchema();
+            LOGGER.debug("reading schema: " + schema);
+            assertTrue(streamReader.loadNextBatch());
+            validateNestedDictionary(readRoot, streamReader);
+          };
       roundTrip(
+          name,
+          writeOption,
           root,
           provider,
           (ignored, writer) -> {
@@ -363,7 +407,8 @@ public void testNestedDictionary() throws Exception {
             writer.writeBatch();
             writer.end();
             if (writer instanceof ArrowFileWriter) {
-              numDictionaryBlocksWritten.set(((ArrowFileWriter) writer).getDictionaryBlocks().size());
+              numDictionaryBlocksWritten.set(
+                  ((ArrowFileWriter) writer).getDictionaryBlocks().size());
             }
           },
           validateDictionary,
@@ -376,8 +421,9 @@ public void testNestedDictionary() throws Exception {
     }
   }
 
-  @Test
-  public void testFixedSizeBinary() throws Exception {
+  @ParameterizedTest(name = "options = {0}")
+  @MethodSource("getWriteOption")
+  public void testFixedSizeBinary(String name, IpcOption writeOption) throws Exception {
     final int count = 10;
     final int typeWidth = 11;
     byte[][] byteValues = new byte[count][typeWidth];
@@ -387,17 +433,22 @@ public void testFixedSizeBinary() throws Exception {
       }
     }
 
-    BiConsumer<Integer, VectorSchemaRoot> validator = (expectedCount, root) -> {
-      for (int i = 0; i < expectedCount; i++) {
-        assertArrayEquals(byteValues[i], ((byte[]) root.getVector("fixed-binary").getObject(i)));
-      }
-    };
+    BiConsumer<Integer, VectorSchemaRoot> validator =
+        (expectedCount, root) -> {
+          for (int i = 0; i < expectedCount; i++) {
+            assertArrayEquals(
+                byteValues[i], ((byte[]) root.getVector("fixed-binary").getObject(i)));
+          }
+        };
 
     try (final BufferAllocator originalVectorAllocator =
-             allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
-         final StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
-      FixedSizeBinaryVector fixedSizeBinaryVector = parent.addOrGet("fixed-binary",
-          FieldType.nullable(new ArrowType.FixedSizeBinary(typeWidth)), FixedSizeBinaryVector.class);
+            allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
+        final StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
+      FixedSizeBinaryVector fixedSizeBinaryVector =
+          parent.addOrGet(
+              "fixed-binary",
+              FieldType.nullable(new ArrowType.FixedSizeBinary(typeWidth)),
+              FixedSizeBinaryVector.class);
       parent.allocateNew();
       for (int i = 0; i < count; i++) {
         fixedSizeBinaryVector.set(i, byteValues[i]);
@@ -405,32 +456,44 @@ public void testFixedSizeBinary() throws Exception {
       parent.setValueCount(count);
 
       roundTrip(
+          name,
+          writeOption,
           new VectorSchemaRoot(parent),
-          /* dictionaryProvider */null,
+          /* dictionaryProvider */ null,
           TestRoundTrip::writeSingleBatch,
           validateFileBatches(new int[] {count}, validator),
           validateStreamBatches(new int[] {count}, validator));
     }
   }
 
-  @Test
-  public void testFixedSizeList() throws Exception {
-    BiConsumer<Integer, VectorSchemaRoot> validator = (expectedCount, root) -> {
-      for (int i = 0; i < expectedCount; i++) {
-        assertEquals(Collections2.asImmutableList(i + 0.1f, i + 10.1f), root.getVector("float-pairs")
-            .getObject(i));
-        assertEquals(i, root.getVector("ints").getObject(i));
-      }
-    };
+  @ParameterizedTest(name = "options = {0}")
+  @MethodSource("getWriteOption")
+  public void testFixedSizeList(String name, IpcOption writeOption) throws Exception {
+    BiConsumer<Integer, VectorSchemaRoot> validator =
+        (expectedCount, root) -> {
+          for (int i = 0; i < expectedCount; i++) {
+            assertEquals(
+                Collections2.asImmutableList(i + 0.1f, i + 10.1f),
+                root.getVector("float-pairs").getObject(i));
+            assertEquals(i, root.getVector("ints").getObject(i));
+          }
+        };
 
     try (final BufferAllocator originalVectorAllocator =
-             allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
-         final StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
-      FixedSizeListVector tuples = parent.addOrGet("float-pairs",
-          FieldType.nullable(new ArrowType.FixedSizeList(2)), FixedSizeListVector.class);
-      Float4Vector floats = (Float4Vector) tuples.addOrGetVector(FieldType.nullable(Types.MinorType.FLOAT4.getType()))
-          .getVector();
-      IntVector ints = parent.addOrGet("ints", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
+            allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
+        final StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
+      FixedSizeListVector tuples =
+          parent.addOrGet(
+              "float-pairs",
+              FieldType.nullable(new ArrowType.FixedSizeList(2)),
+              FixedSizeListVector.class);
+      Float4Vector floats =
+          (Float4Vector)
+              tuples
+                  .addOrGetVector(FieldType.nullable(Types.MinorType.FLOAT4.getType()))
+                  .getVector();
+      IntVector ints =
+          parent.addOrGet("ints", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
       parent.allocateNew();
       for (int i = 0; i < COUNT; i++) {
         tuples.setNotNull(i);
@@ -441,87 +504,107 @@ public void testFixedSizeList() throws Exception {
       parent.setValueCount(COUNT);
 
       roundTrip(
+          name,
+          writeOption,
           new VectorSchemaRoot(parent),
-          /* dictionaryProvider */null,
+          /* dictionaryProvider */ null,
           TestRoundTrip::writeSingleBatch,
           validateFileBatches(new int[] {COUNT}, validator),
           validateStreamBatches(new int[] {COUNT}, validator));
     }
   }
 
-  @Test
-  public void testVarBinary() throws Exception {
+  @ParameterizedTest(name = "options = {0}")
+  @MethodSource("getWriteOption")
+  public void testVarBinary(String name, IpcOption writeOption) throws Exception {
     try (final BufferAllocator originalVectorAllocator =
-             allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
-         final StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
+            allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
+        final StructVector parent = StructVector.empty("parent", originalVectorAllocator)) {
       writeVarBinaryData(COUNT, parent);
       VectorSchemaRoot root = new VectorSchemaRoot(parent.getChild("root"));
       validateVarBinary(COUNT, root);
 
       roundTrip(
+          name,
+          writeOption,
           root,
-          /* dictionaryProvider */null,
+          /* dictionaryProvider */ null,
           TestRoundTrip::writeSingleBatch,
-          validateFileBatches(new int[]{COUNT}, this::validateVarBinary),
-          validateStreamBatches(new int[]{COUNT}, this::validateVarBinary));
+          validateFileBatches(new int[] {COUNT}, this::validateVarBinary),
+          validateStreamBatches(new int[] {COUNT}, this::validateVarBinary));
     }
   }
 
-  @Test
-  public void testReadWriteMultipleBatches() throws IOException {
+  @ParameterizedTest(name = "options = {0}")
+  @MethodSource("getWriteOption")
+  public void testReadWriteMultipleBatches(String name, IpcOption writeOption) throws IOException {
     File file = new File("target/mytest_nulls_multibatch.arrow");
     int numBlocksWritten = 0;
 
-    try (IntVector vector = new IntVector("foo", allocator);) {
+    try (IntVector vector = new IntVector("foo", allocator); ) {
       Schema schema = new Schema(Collections.singletonList(vector.getField()));
       try (FileOutputStream fileOutputStream = new FileOutputStream(file);
-           VectorSchemaRoot root =
-               new VectorSchemaRoot(schema, Collections.singletonList((FieldVector) vector), vector.getValueCount());
-           ArrowFileWriter writer = new ArrowFileWriter(root, null, fileOutputStream.getChannel(), writeOption)) {
+          VectorSchemaRoot root =
+              new VectorSchemaRoot(
+                  schema, Collections.singletonList((FieldVector) vector), vector.getValueCount());
+          ArrowFileWriter writer =
+              new ArrowFileWriter(root, null, fileOutputStream.getChannel(), writeOption)) {
         writeBatchData(writer, vector, root);
         numBlocksWritten = writer.getRecordBlocks().size();
       }
     }
 
     try (FileInputStream fileInputStream = new FileInputStream(file);
-         ArrowFileReader reader = new ArrowFileReader(fileInputStream.getChannel(), allocator);) {
+        ArrowFileReader reader = new ArrowFileReader(fileInputStream.getChannel(), allocator); ) {
       IntVector vector = (IntVector) reader.getVectorSchemaRoot().getFieldVectors().get(0);
       validateBatchData(reader, vector);
       assertEquals(numBlocksWritten, reader.getRecordBlocks().size());
     }
   }
 
-  @Test
-  public void testMap() throws Exception {
+  @ParameterizedTest(name = "options = {0}")
+  @MethodSource("getWriteOption")
+  public void testMap(String name, IpcOption writeOption) throws Exception {
     try (final BufferAllocator originalVectorAllocator =
-             allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
-         final VectorSchemaRoot root = writeMapData(originalVectorAllocator)) {
+            allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
+        final VectorSchemaRoot root = writeMapData(originalVectorAllocator)) {
       roundTrip(
+          name,
+          writeOption,
           root,
-          /* dictionaryProvider */null,
+          /* dictionaryProvider */ null,
           TestRoundTrip::writeSingleBatch,
-          validateFileBatches(new int[]{root.getRowCount()}, (count, readRoot) -> validateMapData(readRoot)),
-          validateStreamBatches(new int[]{root.getRowCount()}, (count, readRoot) -> validateMapData(readRoot)));
+          validateFileBatches(
+              new int[] {root.getRowCount()}, (count, readRoot) -> validateMapData(readRoot)),
+          validateStreamBatches(
+              new int[] {root.getRowCount()}, (count, readRoot) -> validateMapData(readRoot)));
     }
   }
 
-  @Test
-  public void testListAsMap() throws Exception {
+  @ParameterizedTest(name = "options = {0}")
+  @MethodSource("getWriteOption")
+  public void testListAsMap(String name, IpcOption writeOption) throws Exception {
     try (final BufferAllocator originalVectorAllocator =
-             allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
-         final VectorSchemaRoot root = writeListAsMapData(originalVectorAllocator)) {
+            allocator.newChildAllocator("original vectors", 0, allocator.getLimit());
+        final VectorSchemaRoot root = writeListAsMapData(originalVectorAllocator)) {
       roundTrip(
+          name,
+          writeOption,
           root,
-          /* dictionaryProvider */null,
+          /* dictionaryProvider */ null,
           TestRoundTrip::writeSingleBatch,
-          validateFileBatches(new int[]{root.getRowCount()}, (count, readRoot) -> validateListAsMapData(readRoot)),
-          validateStreamBatches(new int[]{root.getRowCount()}, (count, readRoot) -> validateListAsMapData(readRoot)));
+          validateFileBatches(
+              new int[] {root.getRowCount()}, (count, readRoot) -> validateListAsMapData(readRoot)),
+          validateStreamBatches(
+              new int[] {root.getRowCount()},
+              (count, readRoot) -> validateListAsMapData(readRoot)));
     }
   }
 
   // Generic test helpers
 
-  private static void writeSingleBatch(VectorSchemaRoot root, ArrowWriter writer) throws IOException {
+  private static void writeSingleBatch(VectorSchemaRoot root, ArrowWriter writer)
+      throws IOException {
     writer.start();
     writer.writeBatch();
     writer.end();
@@ -539,10 +622,11 @@ private CheckedConsumer<ArrowFileReader> validateFileBatches(
       assertEquals(counts.length, recordBatches.size());
       long previousOffset = 0;
       for (ArrowBlock rbBlock : recordBatches) {
-        assertTrue(rbBlock.getOffset() + " > " + previousOffset, rbBlock.getOffset() > previousOffset);
+        assertTrue(
+            rbBlock.getOffset() > previousOffset, rbBlock.getOffset() + " > " + previousOffset);
         previousOffset = rbBlock.getOffset();
         arrowReader.loadRecordBatch(rbBlock);
-        assertEquals("RB #" + i, counts[i], root.getRowCount());
+        assertEquals(counts[i], root.getRowCount(), "RB #" + i);
         validator.accept(counts[i], root);
         try (final ArrowRecordBatch batch = unloader.getRecordBatch()) {
           List<ArrowBuffer> buffersLayout = batch.getBuffersLayout();
@@ -566,7 +650,7 @@ private CheckedConsumer<ArrowStreamReader> validateStreamBatches(
 
       for (int n = 0; n < counts.length; n++) {
         assertTrue(arrowReader.loadNextBatch());
-        assertEquals("RB #" + i, counts[i], root.getRowCount());
+        assertEquals(counts[i], root.getRowCount(), "RB #" + i);
         validator.accept(counts[i], root);
         try (final ArrowRecordBatch batch = unloader.getRecordBatch()) {
           final List<ArrowBuffer> buffersLayout = batch.getBuffersLayout();
@@ -590,34 +674,42 @@ interface CheckedBiConsumer<T, U> {
     void accept(T t, U u) throws Exception;
   }
 
-  private void roundTrip(VectorSchemaRoot root, DictionaryProvider provider,
-                         CheckedBiConsumer<VectorSchemaRoot, ArrowWriter> writer,
-                         CheckedConsumer<? super ArrowFileReader> fileValidator,
-                         CheckedConsumer<? super ArrowStreamReader> streamValidator) throws Exception {
+  private void roundTrip(
+      String name,
+      IpcOption writeOption,
+      VectorSchemaRoot root,
+      DictionaryProvider provider,
+      CheckedBiConsumer<VectorSchemaRoot, ArrowWriter> writer,
+      CheckedConsumer<? super ArrowFileReader> fileValidator,
+      CheckedConsumer<? super ArrowStreamReader> streamValidator)
+      throws Exception {
     final File temp = File.createTempFile("arrow-test-" + name + "-", ".arrow");
     temp.deleteOnExit();
     final ByteArrayOutputStream memoryStream = new ByteArrayOutputStream();
     final Map<String, String> metadata = new HashMap<>();
     metadata.put("foo", "bar");
     try (final FileOutputStream fileStream = new FileOutputStream(temp);
-         final ArrowFileWriter fileWriter =
-             new ArrowFileWriter(root, provider, fileStream.getChannel(), metadata, writeOption);
-         final ArrowStreamWriter streamWriter =
-             new ArrowStreamWriter(root, provider, Channels.newChannel(memoryStream), writeOption)) {
+        final ArrowFileWriter fileWriter =
+            new ArrowFileWriter(root, provider, fileStream.getChannel(), metadata, writeOption);
+        final ArrowStreamWriter streamWriter =
+            new ArrowStreamWriter(root, provider, Channels.newChannel(memoryStream), writeOption)) {
       writer.accept(root, fileWriter);
       writer.accept(root, streamWriter);
     }
 
-    MessageMetadataResult metadataResult = MessageSerializer.readMessage(
-        new ReadChannel(Channels.newChannel(new ByteArrayInputStream(memoryStream.toByteArray()))));
+    MessageMetadataResult metadataResult =
+        MessageSerializer.readMessage(
+            new ReadChannel(
+                Channels.newChannel(new ByteArrayInputStream(memoryStream.toByteArray()))));
     assertNotNull(metadataResult);
     assertEquals(writeOption.metadataVersion.toFlatbufID(), metadataResult.getMessage().version());
 
-    try (
-        BufferAllocator readerAllocator = allocator.newChildAllocator("reader", 0, allocator.getLimit());
+    try (BufferAllocator readerAllocator =
+            allocator.newChildAllocator("reader", 0, allocator.getLimit());
         FileInputStream fileInputStream = new FileInputStream(temp);
         ByteArrayInputStream inputStream = new ByteArrayInputStream(memoryStream.toByteArray());
-        ArrowFileReader fileReader = new ArrowFileReader(fileInputStream.getChannel(), readerAllocator);
+        ArrowFileReader fileReader =
+            new ArrowFileReader(fileInputStream.getChannel(), readerAllocator);
         ArrowStreamReader streamReader = new ArrowStreamReader(inputStream, readerAllocator)) {
       fileValidator.accept(fileReader);
       streamValidator.accept(streamReader);
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestUIntDictionaryRoundTrip.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestUIntDictionaryRoundTrip.java
index ac95121eb73f2..a47d4bd43887e 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestUIntDictionaryRoundTrip.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestUIntDictionaryRoundTrip.java
@@ -14,14 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc;
 
 import static org.apache.arrow.vector.testing.ValueVectorDataPopulator.setVector;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -29,10 +28,9 @@
 import java.nio.channels.Channels;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Map;
 import java.util.function.ToIntBiFunction;
-
+import java.util.stream.Stream;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.FieldVector;
@@ -51,48 +49,41 @@
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.arrow.vector.util.ByteArrayReadableSeekableByteChannel;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-/**
- * Test the round-trip of dictionary encoding,
- * with unsigned integer as indices.
- */
-@RunWith(Parameterized.class)
-public class TestUIntDictionaryRoundTrip {
-
-  private final boolean streamMode;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
-  public TestUIntDictionaryRoundTrip(boolean streamMode) {
-    this.streamMode = streamMode;
-  }
+/** Test the round-trip of dictionary encoding, with unsigned integer as indices. */
+public class TestUIntDictionaryRoundTrip {
 
   private BufferAllocator allocator;
 
   private DictionaryProvider.MapDictionaryProvider dictionaryProvider;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
     dictionaryProvider = new DictionaryProvider.MapDictionaryProvider();
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
 
-  private byte[] writeData(FieldVector encodedVector) throws IOException {
+  private byte[] writeData(boolean streamMode, FieldVector encodedVector) throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     VectorSchemaRoot root =
         new VectorSchemaRoot(
-            Arrays.asList(encodedVector.getField()), Arrays.asList(encodedVector), encodedVector.getValueCount());
-    try (ArrowWriter writer = streamMode ?
-        new ArrowStreamWriter(root, dictionaryProvider, out) :
-        new ArrowFileWriter(root, dictionaryProvider, Channels.newChannel(out))) {
+            Arrays.asList(encodedVector.getField()),
+            Arrays.asList(encodedVector),
+            encodedVector.getValueCount());
+    try (ArrowWriter writer =
+        streamMode
+            ? new ArrowStreamWriter(root, dictionaryProvider, out)
+            : new ArrowFileWriter(root, dictionaryProvider, Channels.newChannel(out))) {
       writer.start();
       writer.writeBatch();
       writer.end();
@@ -102,15 +93,20 @@ private byte[] writeData(FieldVector encodedVector) throws IOException {
   }
 
   private void readData(
+      boolean streamMode,
       byte[] data,
       Field expectedField,
       ToIntBiFunction<ValueVector, Integer> valGetter,
       long dictionaryID,
       int[] expectedIndices,
-      String[] expectedDictItems) throws IOException {
-    try (ArrowReader reader = streamMode ?
-             new ArrowStreamReader(new ByteArrayInputStream(data), allocator) :
-             new ArrowFileReader(new SeekableReadChannel(new ByteArrayReadableSeekableByteChannel(data)), allocator)) {
+      String[] expectedDictItems)
+      throws IOException {
+    try (ArrowReader reader =
+        streamMode
+            ? new ArrowStreamReader(new ByteArrayInputStream(data), allocator)
+            : new ArrowFileReader(
+                new SeekableReadChannel(new ByteArrayReadableSeekableByteChannel(data)),
+                allocator)) {
 
       // verify schema
       Schema readSchema = reader.getVectorSchemaRoot().getSchema();
@@ -156,11 +152,12 @@ private ValueVector createEncodedVector(int bitWidth, VarCharVector dictionaryVe
     return field.createVector(allocator);
   }
 
-  @Test
-  public void testUInt1RoundTrip() throws IOException {
+  @ParameterizedTest(name = "stream mode = {0}")
+  @MethodSource("getRepeat")
+  public void testUInt1RoundTrip(boolean streamMode) throws IOException {
     final int vectorLength = UInt1Vector.MAX_UINT1 & UInt1Vector.PROMOTION_MASK;
     try (VarCharVector dictionaryVector = new VarCharVector("dictionary", allocator);
-         UInt1Vector encodedVector1 = (UInt1Vector) createEncodedVector(8, dictionaryVector)) {
+        UInt1Vector encodedVector1 = (UInt1Vector) createEncodedVector(8, dictionaryVector)) {
       int[] indices = new int[vectorLength];
       String[] dictionaryItems = new String[vectorLength];
       for (int i = 0; i < vectorLength; i++) {
@@ -170,38 +167,52 @@ public void testUInt1RoundTrip() throws IOException {
       }
       encodedVector1.setValueCount(vectorLength);
       setVector(dictionaryVector, dictionaryItems);
-      byte[] data = writeData(encodedVector1);
+      byte[] data = writeData(streamMode, encodedVector1);
       readData(
-          data, encodedVector1.getField(), (vector, index) -> (int) ((UInt1Vector) vector).getValueAsLong(index),
-          8L, indices, dictionaryItems);
+          streamMode,
+          data,
+          encodedVector1.getField(),
+          (vector, index) -> (int) ((UInt1Vector) vector).getValueAsLong(index),
+          8L,
+          indices,
+          dictionaryItems);
     }
   }
 
-  @Test
-  public void testUInt2RoundTrip() throws IOException {
+  @ParameterizedTest(name = "stream mode = {0}")
+  @MethodSource("getRepeat")
+  public void testUInt2RoundTrip(boolean streamMode) throws IOException {
     try (VarCharVector dictionaryVector = new VarCharVector("dictionary", allocator);
         UInt2Vector encodedVector2 = (UInt2Vector) createEncodedVector(16, dictionaryVector)) {
-      int[] indices = new int[]{1, 3, 5, 7, 9, UInt2Vector.MAX_UINT2};
+      int[] indices = new int[] {1, 3, 5, 7, 9, UInt2Vector.MAX_UINT2};
       String[] dictItems = new String[UInt2Vector.MAX_UINT2];
       for (int i = 0; i < UInt2Vector.MAX_UINT2; i++) {
         dictItems[i] = String.valueOf(i);
       }
 
-      setVector(encodedVector2, (char) 1, (char) 3, (char) 5, (char) 7, (char) 9, UInt2Vector.MAX_UINT2);
+      setVector(
+          encodedVector2, (char) 1, (char) 3, (char) 5, (char) 7, (char) 9, UInt2Vector.MAX_UINT2);
       setVector(dictionaryVector, dictItems);
 
-      byte[] data = writeData(encodedVector2);
-      readData(data, encodedVector2.getField(), (vector, index) -> (int) ((UInt2Vector) vector).getValueAsLong(index),
-          16L, indices, dictItems);
+      byte[] data = writeData(streamMode, encodedVector2);
+      readData(
+          streamMode,
+          data,
+          encodedVector2.getField(),
+          (vector, index) -> (int) ((UInt2Vector) vector).getValueAsLong(index),
+          16L,
+          indices,
+          dictItems);
     }
   }
 
-  @Test
-  public void testUInt4RoundTrip() throws IOException {
+  @ParameterizedTest(name = "stream mode = {0}")
+  @MethodSource("getRepeat")
+  public void testUInt4RoundTrip(boolean streamMode) throws IOException {
     final int dictLength = 10;
     try (VarCharVector dictionaryVector = new VarCharVector("dictionary", allocator);
         UInt4Vector encodedVector4 = (UInt4Vector) createEncodedVector(32, dictionaryVector)) {
-      int[] indices = new int[]{1, 3, 5, 7, 9};
+      int[] indices = new int[] {1, 3, 5, 7, 9};
       String[] dictItems = new String[dictLength];
       for (int i = 0; i < dictLength; i++) {
         dictItems[i] = String.valueOf(i);
@@ -211,18 +222,25 @@ public void testUInt4RoundTrip() throws IOException {
       setVector(dictionaryVector, dictItems);
 
       setVector(encodedVector4, 1, 3, 5, 7, 9);
-      byte[] data = writeData(encodedVector4);
-      readData(data, encodedVector4.getField(), (vector, index) -> (int) ((UInt4Vector) vector).getValueAsLong(index),
-          32L, indices, dictItems);
+      byte[] data = writeData(streamMode, encodedVector4);
+      readData(
+          streamMode,
+          data,
+          encodedVector4.getField(),
+          (vector, index) -> (int) ((UInt4Vector) vector).getValueAsLong(index),
+          32L,
+          indices,
+          dictItems);
     }
   }
 
-  @Test
-  public void testUInt8RoundTrip() throws IOException {
+  @ParameterizedTest(name = "stream mode = {0}")
+  @MethodSource("getRepeat")
+  public void testUInt8RoundTrip(boolean streamMode) throws IOException {
     final int dictLength = 10;
     try (VarCharVector dictionaryVector = new VarCharVector("dictionary", allocator);
         UInt8Vector encodedVector8 = (UInt8Vector) createEncodedVector(64, dictionaryVector)) {
-      int[] indices = new int[]{1, 3, 5, 7, 9};
+      int[] indices = new int[] {1, 3, 5, 7, 9};
       String[] dictItems = new String[dictLength];
       for (int i = 0; i < dictLength; i++) {
         dictItems[i] = String.valueOf(i);
@@ -231,17 +249,19 @@ public void testUInt8RoundTrip() throws IOException {
       setVector(encodedVector8, 1L, 3L, 5L, 7L, 9L);
       setVector(dictionaryVector, dictItems);
 
-      byte[] data = writeData(encodedVector8);
-      readData(data, encodedVector8.getField(), (vector, index) -> (int) ((UInt8Vector) vector).getValueAsLong(index),
-          64L, indices, dictItems);
+      byte[] data = writeData(streamMode, encodedVector8);
+      readData(
+          streamMode,
+          data,
+          encodedVector8.getField(),
+          (vector, index) -> (int) ((UInt8Vector) vector).getValueAsLong(index),
+          64L,
+          indices,
+          dictItems);
     }
   }
 
-  @Parameterized.Parameters(name = "stream mode = {0}")
-  public static Collection<Object[]> getRepeat() {
-    return Arrays.asList(
-        new Object[]{true},
-        new Object[]{false}
-    );
+  static Stream<Arguments> getRepeat() {
+    return Stream.of(Arguments.of(true), Arguments.of(false));
   }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/message/TestMessageMetadataResult.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/message/TestMessageMetadataResult.java
index 0505a18484b54..cd5f89b745243 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/message/TestMessageMetadataResult.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/message/TestMessageMetadataResult.java
@@ -14,23 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.ipc.message;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.nio.ByteBuffer;
-
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestMessageMetadataResult {
 
   @Test
   public void getMessageLength_returnsConstructValue() {
     // This API is used by spark.
-    MessageMetadataResult result = new MessageMetadataResult(1, ByteBuffer.allocate(0),
-        new org.apache.arrow.flatbuf.Message());
+    MessageMetadataResult result =
+        new MessageMetadataResult(
+            1, ByteBuffer.allocate(0), new org.apache.arrow.flatbuf.Message());
     assertEquals(1, result.getMessageLength());
   }
-
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java b/java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java
index 5cc0d080053af..62e5355d05c8b 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java
@@ -14,20 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.pojo;
 
 import static org.apache.arrow.vector.types.FloatingPointPrecision.DOUBLE;
 import static org.apache.arrow.vector.types.FloatingPointPrecision.SINGLE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
+import com.google.flatbuffers.FlatBufferBuilder;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.util.Collections2;
@@ -46,13 +45,9 @@
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import com.google.flatbuffers.FlatBufferBuilder;
-
-/**
- * Test conversion between Flatbuf and Pojo field representations.
- */
+/** Test conversion between Flatbuf and Pojo field representations. */
 public class TestConvert {
 
   @Test
@@ -65,7 +60,9 @@ public void simple() {
   public void complex() {
     java.util.List<Field> children = new ArrayList<>();
     children.add(new Field("child1", FieldType.nullable(Utf8.INSTANCE), null));
-    children.add(new Field("child2", FieldType.nullable(new FloatingPoint(SINGLE)), Collections.emptyList()));
+    children.add(
+        new Field(
+            "child2", FieldType.nullable(new FloatingPoint(SINGLE)), Collections.emptyList()));
 
     Field initialField = new Field("a", FieldType.nullable(Struct.INSTANCE), children);
     run(initialField);
@@ -75,8 +72,9 @@ public void complex() {
   public void list() throws Exception {
     java.util.List<Field> children = new ArrayList<>();
     try (BufferAllocator allocator = new RootAllocator(Long.MAX_VALUE);
-         ListVector writeVector = ListVector.empty("list", allocator);
-         FixedSizeListVector writeFixedVector = FixedSizeListVector.empty("fixedlist", 5, allocator)) {
+        ListVector writeVector = ListVector.empty("list", allocator);
+        FixedSizeListVector writeFixedVector =
+            FixedSizeListVector.empty("fixedlist", 5, allocator)) {
       Field listVectorField = writeVector.getField();
       children.add(listVectorField);
       Field listFixedVectorField = writeFixedVector.getField();
@@ -88,7 +86,8 @@ public void list() throws Exception {
     parent.add(initialField);
     FlatBufferBuilder builder = new FlatBufferBuilder();
     builder.finish(initialField.getField(builder));
-    org.apache.arrow.flatbuf.Field flatBufField = org.apache.arrow.flatbuf.Field.getRootAsField(builder.dataBuffer());
+    org.apache.arrow.flatbuf.Field flatBufField =
+        org.apache.arrow.flatbuf.Field.getRootAsField(builder.dataBuffer());
     Field finalField = Field.convertField(flatBufField);
     assertEquals(initialField, finalField);
     assertFalse(finalField.toString().contains("[DEFAULT]"));
@@ -110,7 +109,9 @@ public void list() throws Exception {
   public void schema() {
     java.util.List<Field> children = new ArrayList<>();
     children.add(new Field("child1", FieldType.nullable(Utf8.INSTANCE), null));
-    children.add(new Field("child2", FieldType.nullable(new FloatingPoint(SINGLE)), Collections.emptyList()));
+    children.add(
+        new Field(
+            "child2", FieldType.nullable(new FloatingPoint(SINGLE)), Collections.emptyList()));
     Schema initialSchema = new Schema(children);
     run(initialSchema);
   }
@@ -119,7 +120,9 @@ public void schema() {
   public void schemaMetadata() {
     java.util.List<Field> children = new ArrayList<>();
     children.add(new Field("child1", FieldType.nullable(Utf8.INSTANCE), null));
-    children.add(new Field("child2", FieldType.nullable(new FloatingPoint(SINGLE)), Collections.emptyList()));
+    children.add(
+        new Field(
+            "child2", FieldType.nullable(new FloatingPoint(SINGLE)), Collections.emptyList()));
     Map<String, String> metadata = new HashMap<>();
     metadata.put("key1", "value1");
     metadata.put("key2", "value2");
@@ -131,21 +134,45 @@ public void schemaMetadata() {
   public void nestedSchema() {
     java.util.List<Field> children = new ArrayList<>();
     children.add(new Field("child1", FieldType.nullable(Utf8.INSTANCE), null));
-    children.add(new Field("child2", FieldType.nullable(new FloatingPoint(SINGLE)), Collections.emptyList()));
-    children.add(new Field("child3", FieldType.nullable(new Struct()), Collections2.asImmutableList(
-        new Field("child3.1", FieldType.nullable(Utf8.INSTANCE), null),
-        new Field("child3.2", FieldType.nullable(new FloatingPoint(DOUBLE)), Collections.emptyList())
-    )));
-    children.add(new Field("child4", FieldType.nullable(new List()), Collections2.asImmutableList(
-        new Field("child4.1", FieldType.nullable(Utf8.INSTANCE), null)
-    )));
-    children.add(new Field("child5", FieldType.nullable(
-        new Union(UnionMode.Sparse, new int[] {MinorType.TIMESTAMPMILLI.ordinal(), MinorType.FLOAT8.ordinal()})),
-          Collections2.asImmutableList(
-            new Field("child5.1", FieldType.nullable(new Timestamp(TimeUnit.MILLISECOND, null)), null),
-            new Field("child5.2", FieldType.nullable(new FloatingPoint(DOUBLE)), Collections.emptyList()),
-            new Field("child5.3", FieldType.nullable(new Timestamp(TimeUnit.MILLISECOND, "UTC")), null)
-          )));
+    children.add(
+        new Field(
+            "child2", FieldType.nullable(new FloatingPoint(SINGLE)), Collections.emptyList()));
+    children.add(
+        new Field(
+            "child3",
+            FieldType.nullable(new Struct()),
+            Collections2.asImmutableList(
+                new Field("child3.1", FieldType.nullable(Utf8.INSTANCE), null),
+                new Field(
+                    "child3.2",
+                    FieldType.nullable(new FloatingPoint(DOUBLE)),
+                    Collections.emptyList()))));
+    children.add(
+        new Field(
+            "child4",
+            FieldType.nullable(new List()),
+            Collections2.asImmutableList(
+                new Field("child4.1", FieldType.nullable(Utf8.INSTANCE), null))));
+    children.add(
+        new Field(
+            "child5",
+            FieldType.nullable(
+                new Union(
+                    UnionMode.Sparse,
+                    new int[] {MinorType.TIMESTAMPMILLI.ordinal(), MinorType.FLOAT8.ordinal()})),
+            Collections2.asImmutableList(
+                new Field(
+                    "child5.1",
+                    FieldType.nullable(new Timestamp(TimeUnit.MILLISECOND, null)),
+                    null),
+                new Field(
+                    "child5.2",
+                    FieldType.nullable(new FloatingPoint(DOUBLE)),
+                    Collections.emptyList()),
+                new Field(
+                    "child5.3",
+                    FieldType.nullable(new Timestamp(TimeUnit.MILLISECOND, "UTC")),
+                    null))));
     Schema initialSchema = new Schema(children);
     run(initialSchema);
   }
@@ -153,7 +180,8 @@ public void nestedSchema() {
   private void run(Field initialField) {
     FlatBufferBuilder builder = new FlatBufferBuilder();
     builder.finish(initialField.getField(builder));
-    org.apache.arrow.flatbuf.Field flatBufField = org.apache.arrow.flatbuf.Field.getRootAsField(builder.dataBuffer());
+    org.apache.arrow.flatbuf.Field flatBufField =
+        org.apache.arrow.flatbuf.Field.getRootAsField(builder.dataBuffer());
     Field finalField = Field.convertField(flatBufField);
     assertEquals(initialField, finalField);
   }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/table/BaseTableTest.java b/java/vector/src/test/java/org/apache/arrow/vector/table/BaseTableTest.java
index 1b7f984992ada..a07e9fc0352d7 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/table/BaseTableTest.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/table/BaseTableTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.table;
 
 import static org.apache.arrow.vector.table.TestUtils.INT_VECTOR_NAME;
@@ -32,7 +31,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.FieldVector;
@@ -176,8 +174,7 @@ void testGetVector() {
     List<FieldVector> vectorList = twoIntColumns(allocator);
     try (Table t = new Table(vectorList)) {
       assertNotNull(t.getVector(INT_VECTOR_NAME_1));
-      assertThrows(IllegalArgumentException.class,
-          () -> t.getVector("wrong name"));
+      assertThrows(IllegalArgumentException.class, () -> t.getVector("wrong name"));
     }
   }
 
@@ -197,8 +194,7 @@ void getVectorCopyByIndex() {
           assertEquals(original.getObject(i), copy.getObject(i));
         }
       }
-      assertThrows(IllegalArgumentException.class,
-          () -> t.getVector("wrong name"));
+      assertThrows(IllegalArgumentException.class, () -> t.getVector("wrong name"));
     }
   }
 
@@ -217,8 +213,7 @@ void getVectorCopyByName() {
           assertEquals(original.getObject(i), copy.getObject(i));
         }
       }
-      assertThrows(IllegalArgumentException.class,
-          () -> t.getVector("wrong name"));
+      assertThrows(IllegalArgumentException.class, () -> t.getVector("wrong name"));
     }
   }
 
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/table/RowTest.java b/java/vector/src/test/java/org/apache/arrow/vector/table/RowTest.java
index 3e6a096104d44..c1125d407e145 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/table/RowTest.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/table/RowTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.table;
 
 import static org.apache.arrow.vector.table.TestUtils.BIGINT_INT_MAP_VECTOR_NAME;
@@ -53,7 +52,6 @@
 import java.time.Period;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -169,8 +167,7 @@ void testNameNotFound() {
     try (Table t = new Table(vectorList)) {
       Row c = t.immutableRow();
       c.setPosition(1);
-      assertThrows(IllegalArgumentException.class,
-          () -> c.getVarCharObj("wrong name"));
+      assertThrows(IllegalArgumentException.class, () -> c.getVarCharObj("wrong name"));
     }
   }
 
@@ -180,8 +177,7 @@ void testWrongType() {
     try (Table t = new Table(vectorList)) {
       Row c = t.immutableRow();
       c.setPosition(1);
-      assertThrows(ClassCastException.class,
-          () -> c.getVarCharObj(INT_VECTOR_NAME_1));
+      assertThrows(ClassCastException.class, () -> c.getVarCharObj(INT_VECTOR_NAME_1));
     }
   }
 
@@ -252,7 +248,8 @@ void getIntervalDay() {
     IntervalUnit unit = IntervalUnit.DAY_TIME;
     final FieldType fieldType = FieldType.nullable(new ArrowType.Interval(unit));
 
-    IntervalDayVector intervalDayVector = new IntervalDayVector("intervalDay_vector", fieldType, allocator);
+    IntervalDayVector intervalDayVector =
+        new IntervalDayVector("intervalDay_vector", fieldType, allocator);
     NullableIntervalDayHolder holder1 = new NullableIntervalDayHolder();
     NullableIntervalDayHolder holder2 = new NullableIntervalDayHolder();
 
@@ -329,7 +326,8 @@ void getIntervalYear() {
     IntervalUnit unit = IntervalUnit.YEAR_MONTH;
     final FieldType fieldType = FieldType.nullable(new ArrowType.Interval(unit));
 
-    IntervalYearVector intervalYearVector = new IntervalYearVector("intervalYear_vector", fieldType, allocator);
+    IntervalYearVector intervalYearVector =
+        new IntervalYearVector("intervalYear_vector", fieldType, allocator);
     NullableIntervalYearHolder holder1 = new NullableIntervalYearHolder();
     NullableIntervalYearHolder holder2 = new NullableIntervalYearHolder();
 
@@ -650,7 +648,8 @@ void getVarChar() {
       c.setPosition(1);
       assertEquals(c.getVarCharObj(1), "two");
       assertEquals(c.getVarCharObj(1), c.getVarCharObj(VARCHAR_VECTOR_NAME_1));
-      assertArrayEquals("two".getBytes(StandardCharsets.UTF_8), c.getVarChar(VARCHAR_VECTOR_NAME_1));
+      assertArrayEquals(
+          "two".getBytes(StandardCharsets.UTF_8), c.getVarChar(VARCHAR_VECTOR_NAME_1));
       assertArrayEquals("two".getBytes(StandardCharsets.UTF_8), c.getVarChar(1));
     }
   }
@@ -685,7 +684,8 @@ void getLargeVarChar() {
       c.setPosition(1);
       assertEquals(c.getLargeVarCharObj(1), "two");
       assertEquals(c.getLargeVarCharObj(1), c.getLargeVarCharObj(VARCHAR_VECTOR_NAME_1));
-      assertArrayEquals("two".getBytes(StandardCharsets.UTF_8), c.getLargeVarChar(VARCHAR_VECTOR_NAME_1));
+      assertArrayEquals(
+          "two".getBytes(StandardCharsets.UTF_8), c.getLargeVarChar(VARCHAR_VECTOR_NAME_1));
       assertArrayEquals("two".getBytes(StandardCharsets.UTF_8), c.getLargeVarChar(1));
     }
   }
@@ -737,8 +737,7 @@ void testSimpleStructVector1() {
         JsonStringHashMap<String, ?> struct =
             (JsonStringHashMap<String, ?>) c.getStruct(STRUCT_VECTOR_NAME);
         @SuppressWarnings("unchecked")
-        JsonStringHashMap<String, ?> struct1 =
-            (JsonStringHashMap<String, ?>) c.getStruct(0);
+        JsonStringHashMap<String, ?> struct1 = (JsonStringHashMap<String, ?>) c.getStruct(0);
         int a = (int) struct.get("struct_int_child");
         double b = (double) struct.get("struct_flt_child");
         int a1 = (int) struct1.get("struct_int_child");
@@ -792,21 +791,21 @@ void testSimpleDenseUnionVector() {
 
   @Test
   void testExtensionTypeVector() {
-    TestExtensionType.LocationVector vector = new TestExtensionType.LocationVector("location", allocator);
+    TestExtensionType.LocationVector vector =
+        new TestExtensionType.LocationVector("location", allocator);
     vector.allocateNew();
     vector.set(0, 34.073814f, -118.240784f);
     vector.setValueCount(1);
 
     try (VectorSchemaRoot vsr = VectorSchemaRoot.of(vector);
-         Table table = new Table(vsr)) {
+        Table table = new Table(vsr)) {
       Row c = table.immutableRow();
       c.setPosition(0);
       Object object0 = c.getExtensionType("location");
       Object object1 = c.getExtensionType(0);
       assertEquals(object0, object1);
       @SuppressWarnings("unchecked")
-     JsonStringHashMap<String, ?> struct0 =
-          (JsonStringHashMap<String, ?>) object0;
+      JsonStringHashMap<String, ?> struct0 = (JsonStringHashMap<String, ?>) object0;
       assertEquals(34.073814f, struct0.get("Latitude"));
     }
   }
@@ -822,8 +821,7 @@ void testSimpleMapVector1() {
         List<JsonStringHashMap<String, ?>> list =
             (List<JsonStringHashMap<String, ?>>) c.getMap(BIGINT_INT_MAP_VECTOR_NAME);
         @SuppressWarnings("unchecked")
-        List<JsonStringHashMap<String, ?>> list1 =
-            (List<JsonStringHashMap<String, ?>>) c.getMap(0);
+        List<JsonStringHashMap<String, ?>> list1 = (List<JsonStringHashMap<String, ?>>) c.getMap(0);
         for (int j = 0; j < list1.size(); j++) {
           assertEquals(list.get(j), list1.get(j));
         }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/table/TableTest.java b/java/vector/src/test/java/org/apache/arrow/vector/table/TableTest.java
index 539482e510a9f..0be2bf9a17ee5 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/table/TableTest.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/table/TableTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.table;
 
 import static org.apache.arrow.vector.table.TestUtils.INT_VECTOR_NAME_1;
@@ -26,7 +25,6 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.FieldVector;
@@ -100,7 +98,8 @@ void constructor() {
   }
 
   /**
-   * Tests construction with an iterable that's not a list (there is a specialty constructor for Lists).
+   * Tests construction with an iterable that's not a list (there is a specialty constructor for
+   * Lists).
    */
   @Test
   void constructor2() {
@@ -133,7 +132,7 @@ void copy() {
     try (Table t = new Table(vectorList)) {
       assertEquals(2, t.getVectorCount());
       try (Table copy = t.copy()) {
-        for (FieldVector v: t.fieldVectors) {
+        for (FieldVector v : t.fieldVectors) {
           FieldVector vCopy = copy.getVector(v.getName());
           assertNotNull(vCopy);
           assertEquals(v.getValueCount(), vCopy.getValueCount());
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/table/TestUtils.java b/java/vector/src/test/java/org/apache/arrow/vector/table/TestUtils.java
index c0b3bfdf73220..d39f92e19880b 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/table/TestUtils.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/table/TestUtils.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.table;
 
 import static org.apache.arrow.vector.complex.BaseRepeatedValueVector.OFFSET_WIDTH;
@@ -23,7 +22,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.BitVector;
@@ -145,8 +143,8 @@ static List<FieldVector> intPlusLargeVarcharColumns(BufferAllocator allocator) {
 
   /**
    * Returns a list of two FieldVectors to be used to instantiate Tables for testing. The first
-   * vector is an IntVector and the second is a VarBinaryVector. Each vector has two values set.
-   * The large binary vectors values are "one" and "two" encoded with UTF-8
+   * vector is an IntVector and the second is a VarBinaryVector. Each vector has two values set. The
+   * large binary vectors values are "one" and "two" encoded with UTF-8
    */
   static List<FieldVector> intPlusVarBinaryColumns(BufferAllocator allocator) {
     List<FieldVector> vectorList = new ArrayList<>();
@@ -163,8 +161,8 @@ static List<FieldVector> intPlusVarBinaryColumns(BufferAllocator allocator) {
 
   /**
    * Returns a list of two FieldVectors to be used to instantiate Tables for testing. The first
-   * vector is an IntVector and the second is a VarBinaryVector. Each vector has two values set.
-   * The large binary vectors values are "one" and "two" encoded with UTF-8
+   * vector is an IntVector and the second is a VarBinaryVector. Each vector has two values set. The
+   * large binary vectors values are "one" and "two" encoded with UTF-8
    */
   static List<FieldVector> intPlusLargeVarBinaryColumns(BufferAllocator allocator) {
     List<FieldVector> vectorList = new ArrayList<>();
@@ -181,8 +179,8 @@ static List<FieldVector> intPlusLargeVarBinaryColumns(BufferAllocator allocator)
 
   /**
    * Returns a list of two FieldVectors to be used to instantiate Tables for testing. The first
-   * vector is an IntVector and the second is a FixedSizeBinary vector. Each vector has two values set.
-   * The large binary vectors values are "one" and "two" encoded with UTF-8
+   * vector is an IntVector and the second is a FixedSizeBinary vector. Each vector has two values
+   * set. The large binary vectors values are "one" and "two" encoded with UTF-8
    */
   static List<FieldVector> intPlusFixedBinaryColumns(BufferAllocator allocator) {
     List<FieldVector> vectorList = new ArrayList<>();
@@ -208,9 +206,10 @@ private static IntVector getSimpleIntVector(BufferAllocator allocator) {
 
   /**
    * Returns a list of fixed-width vectors for testing. It includes
+   *
    * <ol>
-   *   <li>all integral and floating point types</li>
-   *   <li>all basic times and timestamps (second, milli, micro, nano</li>
+   *   <li>all integral and floating point types
+   *   <li>all basic times and timestamps (second, milli, micro, nano
    * </ol>
    *
    * The vector names are based on their type name (e.g. BigIntVector is called "bigInt_vector"
@@ -223,8 +222,8 @@ static List<FieldVector> fixedWidthVectors(BufferAllocator allocator, int rowCou
   }
 
   /**
-   * Returns a list of all integral and floating point vectors.
-   * The vector names are based on their type name (e.g. BigIntVector is called "bigInt_vector"
+   * Returns a list of all integral and floating point vectors. The vector names are based on their
+   * type name (e.g. BigIntVector is called "bigInt_vector"
    */
   static List<FieldVector> numericVectors(
       List<FieldVector> vectors, BufferAllocator allocator, int rowCount) {
@@ -286,8 +285,11 @@ static List<FieldVector> intervalVectors(BufferAllocator allocator, int rowCount
     vectors.add(new IntervalDayVector("intervalDay_vector", allocator));
     vectors.add(new IntervalYearVector("intervalYear_vector", allocator));
     vectors.add(new IntervalMonthDayNanoVector("intervalMonthDayNano_vector", allocator));
-    vectors.add(new DurationVector("duration_vector",
-        new FieldType(true, new ArrowType.Duration(TimeUnit.SECOND), null), allocator));
+    vectors.add(
+        new DurationVector(
+            "duration_vector",
+            new FieldType(true, new ArrowType.Duration(TimeUnit.SECOND), null),
+            allocator));
     vectors.forEach(vec -> GenerateSampleData.generateTestData(vec, rowCount));
     return vectors;
   }
@@ -370,9 +372,11 @@ static MapVector simpleMapVector(BufferAllocator allocator) {
 
   static List<FieldVector> decimalVector(BufferAllocator allocator, int rowCount) {
     List<FieldVector> vectors = new ArrayList<>();
-    vectors.add(new DecimalVector("decimal_vector",
-        new FieldType(true, new ArrowType.Decimal(38, 10, 128), null),
-        allocator));
+    vectors.add(
+        new DecimalVector(
+            "decimal_vector",
+            new FieldType(true, new ArrowType.Decimal(38, 10, 128), null),
+            allocator));
     vectors.forEach(vec -> generateDecimalData((DecimalVector) vec, rowCount));
     return vectors;
   }
@@ -434,5 +438,4 @@ private static void generateDecimalData(DecimalVector vector, int valueCount) {
     }
     vector.setValueCount(valueCount);
   }
-
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/test/util/ArrowTestDataUtil.java b/java/vector/src/test/java/org/apache/arrow/vector/test/util/ArrowTestDataUtil.java
index 901a09e313f59..2b0f7af608a95 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/test/util/ArrowTestDataUtil.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/test/util/ArrowTestDataUtil.java
@@ -14,16 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.test.util;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Objects;
 
-/**
- * Utility methods and constants for working with the arrow-testing repo.
- */
+/** Utility methods and constants for working with the arrow-testing repo. */
 public final class ArrowTestDataUtil {
   public static final String TEST_DATA_ENV_VAR = "ARROW_TEST_DATA";
   public static final String TEST_DATA_PROPERTY = "arrow.test.dataRoot";
@@ -33,11 +30,13 @@ public static Path getTestDataRoot() {
     if (path == null) {
       path = System.getProperty(TEST_DATA_PROPERTY);
     }
-    return Paths.get(Objects.requireNonNull(path,
-        String.format("Could not find test data path. Set the environment variable %s or the JVM property %s.",
-            TEST_DATA_ENV_VAR, TEST_DATA_PROPERTY)));
+    return Paths.get(
+        Objects.requireNonNull(
+            path,
+            String.format(
+                "Could not find test data path. Set the environment variable %s or the JVM property %s.",
+                TEST_DATA_ENV_VAR, TEST_DATA_PROPERTY)));
   }
 
-  private ArrowTestDataUtil() {
-  }
+  private ArrowTestDataUtil() {}
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/testing/RandomDataGenerator.java b/java/vector/src/test/java/org/apache/arrow/vector/testing/RandomDataGenerator.java
index 4b1094d288bf2..d0ef176cb3c47 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/testing/RandomDataGenerator.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/testing/RandomDataGenerator.java
@@ -14,15 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.testing;
 
 import java.util.Random;
 import java.util.function.Supplier;
 
-/**
- * Utility for generating random data.
- */
+/** Utility for generating random data. */
 public class RandomDataGenerator {
 
   static final Random random = new Random(0);
@@ -39,6 +36,5 @@ public class RandomDataGenerator {
 
   public static final Supplier<Double> DOUBLE_GENERATOR = () -> random.nextDouble();
 
-  private RandomDataGenerator() {
-  }
+  private RandomDataGenerator() {}
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/testing/TestValueVectorPopulator.java b/java/vector/src/test/java/org/apache/arrow/vector/testing/TestValueVectorPopulator.java
index 3c075c9293079..c0e2ae252e02c 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/testing/TestValueVectorPopulator.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/testing/TestValueVectorPopulator.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.testing;
 
-import static junit.framework.TestCase.assertTrue;
 import static org.apache.arrow.vector.testing.ValueVectorDataPopulator.setVector;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.BigIntVector;
@@ -52,24 +50,23 @@
 import org.apache.arrow.vector.VarBinaryVector;
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.arrow.vector.compare.VectorEqualsVisitor;
-import org.apache.arrow.vector.testing.ValueVectorDataPopulator;
 import org.apache.arrow.vector.types.TimeUnit;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.FieldType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestValueVectorPopulator {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -77,7 +74,7 @@ public void terminate() throws Exception {
   @Test
   public void testPopulateBigIntVector() {
     try (final BigIntVector vector1 = new BigIntVector("vector", allocator);
-         final BigIntVector vector2 = new BigIntVector("vector", allocator)) {
+        final BigIntVector vector2 = new BigIntVector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -97,7 +94,7 @@ public void testPopulateBigIntVector() {
   @Test
   public void testPopulateBitVector() {
     try (final BitVector vector1 = new BitVector("vector", allocator);
-         final BitVector vector2 = new BitVector("vector", allocator)) {
+        final BitVector vector2 = new BitVector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -117,7 +114,7 @@ public void testPopulateBitVector() {
   @Test
   public void testPopulateDateDayVector() {
     try (final DateDayVector vector1 = new DateDayVector("vector", allocator);
-         final DateDayVector vector2 = new DateDayVector("vector", allocator)) {
+        final DateDayVector vector2 = new DateDayVector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -137,7 +134,7 @@ public void testPopulateDateDayVector() {
   @Test
   public void testPopulateDateMilliVector() {
     try (final DateMilliVector vector1 = new DateMilliVector("vector", allocator);
-         final DateMilliVector vector2 = new DateMilliVector("vector", allocator)) {
+        final DateMilliVector vector2 = new DateMilliVector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -157,7 +154,7 @@ public void testPopulateDateMilliVector() {
   @Test
   public void testPopulateDecimalVector() {
     try (final DecimalVector vector1 = new DecimalVector("vector", allocator, 10, 3);
-         final DecimalVector vector2 = new DecimalVector("vector", allocator, 10, 3)) {
+        final DecimalVector vector2 = new DecimalVector("vector", allocator, 10, 3)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -178,7 +175,7 @@ public void testPopulateDecimalVector() {
   public void testPopulateDurationVector() {
     final FieldType fieldType = FieldType.nullable(new ArrowType.Duration(TimeUnit.SECOND));
     try (final DurationVector vector1 = new DurationVector("vector", fieldType, allocator);
-         final DurationVector vector2 = new DurationVector("vector", fieldType, allocator)) {
+        final DurationVector vector2 = new DurationVector("vector", fieldType, allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -199,7 +196,7 @@ public void testPopulateDurationVector() {
   @Test
   public void testPopulateFixedSizeBinaryVector() {
     try (final FixedSizeBinaryVector vector1 = new FixedSizeBinaryVector("vector", allocator, 5);
-         final FixedSizeBinaryVector vector2 = new FixedSizeBinaryVector("vector", allocator, 5)) {
+        final FixedSizeBinaryVector vector2 = new FixedSizeBinaryVector("vector", allocator, 5)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -211,9 +208,18 @@ public void testPopulateFixedSizeBinaryVector() {
       }
       vector1.setValueCount(10);
 
-      setVector(vector2, null, "test1".getBytes(StandardCharsets.UTF_8), null,
-          "test3".getBytes(StandardCharsets.UTF_8), null, "test5".getBytes(StandardCharsets.UTF_8), null,
-          "test7".getBytes(StandardCharsets.UTF_8), null, "test9".getBytes(StandardCharsets.UTF_8));
+      setVector(
+          vector2,
+          null,
+          "test1".getBytes(StandardCharsets.UTF_8),
+          null,
+          "test3".getBytes(StandardCharsets.UTF_8),
+          null,
+          "test5".getBytes(StandardCharsets.UTF_8),
+          null,
+          "test7".getBytes(StandardCharsets.UTF_8),
+          null,
+          "test9".getBytes(StandardCharsets.UTF_8));
       assertTrue(VectorEqualsVisitor.vectorEquals(vector1, vector2));
     }
   }
@@ -221,7 +227,7 @@ public void testPopulateFixedSizeBinaryVector() {
   @Test
   public void testPopulateFloat4Vector() {
     try (final Float4Vector vector1 = new Float4Vector("vector", allocator);
-         final Float4Vector vector2 = new Float4Vector("vector", allocator)) {
+        final Float4Vector vector2 = new Float4Vector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -240,7 +246,7 @@ public void testPopulateFloat4Vector() {
   @Test
   public void testPopulateFloat8Vector() {
     try (final Float8Vector vector1 = new Float8Vector("vector", allocator);
-         final Float8Vector vector2 = new Float8Vector("vector", allocator)) {
+        final Float8Vector vector2 = new Float8Vector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -259,7 +265,7 @@ public void testPopulateFloat8Vector() {
   @Test
   public void testPopulateIntVector() {
     try (final IntVector vector1 = new IntVector("vector", allocator);
-         final IntVector vector2 = new IntVector("vector", allocator)) {
+        final IntVector vector2 = new IntVector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -279,7 +285,7 @@ public void testPopulateIntVector() {
   @Test
   public void testPopulateSmallIntVector() {
     try (final SmallIntVector vector1 = new SmallIntVector("vector", allocator);
-         final SmallIntVector vector2 = new SmallIntVector("vector", allocator)) {
+        final SmallIntVector vector2 = new SmallIntVector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -291,8 +297,9 @@ public void testPopulateSmallIntVector() {
       }
       vector1.setValueCount(10);
 
-      ValueVectorDataPopulator.setVector(vector2, null, (short) 1, null, (short) 3, null, (short) 5,
-          null, (short) 7, null, (short) 9);
+      ValueVectorDataPopulator.setVector(
+          vector2, null, (short) 1, null, (short) 3, null, (short) 5, null, (short) 7, null,
+          (short) 9);
       assertTrue(VectorEqualsVisitor.vectorEquals(vector1, vector2));
     }
   }
@@ -300,7 +307,7 @@ public void testPopulateSmallIntVector() {
   @Test
   public void testPopulateIntervalDayVector() {
     try (final IntervalYearVector vector1 = new IntervalYearVector("vector", allocator);
-         final IntervalYearVector vector2 = new IntervalYearVector("vector", allocator)) {
+        final IntervalYearVector vector2 = new IntervalYearVector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -320,7 +327,7 @@ public void testPopulateIntervalDayVector() {
   @Test
   public void testPopulateTimeMicroVector() {
     try (final TimeMicroVector vector1 = new TimeMicroVector("vector", allocator);
-         final TimeMicroVector vector2 = new TimeMicroVector("vector", allocator)) {
+        final TimeMicroVector vector2 = new TimeMicroVector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -358,7 +365,7 @@ public void testPopulateTimeMilliVector() {
   @Test
   public void testPopulateTimeNanoVector() {
     try (final TimeNanoVector vector1 = new TimeNanoVector("vector", allocator);
-         final TimeNanoVector vector2 = new TimeNanoVector("vector", allocator)) {
+        final TimeNanoVector vector2 = new TimeNanoVector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -377,7 +384,7 @@ public void testPopulateTimeNanoVector() {
   @Test
   public void testPopulateTimeSecVector() {
     try (final TimeSecVector vector1 = new TimeSecVector("vector", allocator);
-         final TimeSecVector vector2 = new TimeSecVector("vector", allocator)) {
+        final TimeSecVector vector2 = new TimeSecVector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -415,7 +422,7 @@ public void testPopulateTimeStampMicroVector() {
   @Test
   public void testPopulateTimeStampMilliVector() {
     try (final TimeStampMilliVector vector1 = new TimeStampMilliVector("vector", allocator);
-         final TimeStampMilliVector vector2 = new TimeStampMilliVector("vector", allocator)) {
+        final TimeStampMilliVector vector2 = new TimeStampMilliVector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -453,7 +460,7 @@ public void testPopulateTimeStampNanoVector() {
   @Test
   public void testPopulateTimeStampSecVector() {
     try (final TimeStampSecVector vector1 = new TimeStampSecVector("vector", allocator);
-         final TimeStampSecVector vector2 = new TimeStampSecVector("vector", allocator)) {
+        final TimeStampSecVector vector2 = new TimeStampSecVector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -472,7 +479,7 @@ public void testPopulateTimeStampSecVector() {
   @Test
   public void testPopulateTinyIntVector() {
     try (final TinyIntVector vector1 = new TinyIntVector("vector", allocator);
-         final TinyIntVector vector2 = new TinyIntVector("vector", allocator)) {
+        final TinyIntVector vector2 = new TinyIntVector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -483,7 +490,8 @@ public void testPopulateTinyIntVector() {
         }
       }
       vector1.setValueCount(10);
-      setVector(vector2, null, (byte) 1, null, (byte) 3, null, (byte) 5, null, (byte) 7, null, (byte) 9);
+      setVector(
+          vector2, null, (byte) 1, null, (byte) 3, null, (byte) 5, null, (byte) 7, null, (byte) 9);
       assertTrue(VectorEqualsVisitor.vectorEquals(vector1, vector2));
     }
   }
@@ -491,7 +499,7 @@ public void testPopulateTinyIntVector() {
   @Test
   public void testPopulateUInt1Vector() {
     try (final UInt1Vector vector1 = new UInt1Vector("vector", allocator);
-         final UInt1Vector vector2 = new UInt1Vector("vector", allocator)) {
+        final UInt1Vector vector2 = new UInt1Vector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -502,7 +510,8 @@ public void testPopulateUInt1Vector() {
         }
       }
       vector1.setValueCount(10);
-      setVector(vector2, null, (byte) 1, null, (byte) 3, null, (byte) 5, null, (byte) 7, null, (byte) 9);
+      setVector(
+          vector2, null, (byte) 1, null, (byte) 3, null, (byte) 5, null, (byte) 7, null, (byte) 9);
       assertTrue(VectorEqualsVisitor.vectorEquals(vector1, vector2));
     }
   }
@@ -510,7 +519,7 @@ public void testPopulateUInt1Vector() {
   @Test
   public void testPopulateUInt2Vector() {
     try (final UInt2Vector vector1 = new UInt2Vector("vector", allocator);
-         final UInt2Vector vector2 = new UInt2Vector("vector", allocator)) {
+        final UInt2Vector vector2 = new UInt2Vector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -521,7 +530,8 @@ public void testPopulateUInt2Vector() {
         }
       }
       vector1.setValueCount(10);
-      setVector(vector2, null, (char) 1, null, (char) 3, null, (char) 5, null, (char) 7, null, (char) 9);
+      setVector(
+          vector2, null, (char) 1, null, (char) 3, null, (char) 5, null, (char) 7, null, (char) 9);
       assertTrue(VectorEqualsVisitor.vectorEquals(vector1, vector2));
     }
   }
@@ -529,7 +539,7 @@ public void testPopulateUInt2Vector() {
   @Test
   public void testPopulateUInt4Vector() {
     try (final UInt4Vector vector1 = new UInt4Vector("vector", allocator);
-         final UInt4Vector vector2 = new UInt4Vector("vector", allocator)) {
+        final UInt4Vector vector2 = new UInt4Vector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -567,7 +577,7 @@ public void testPopulateUInt8Vector() {
   @Test
   public void testPopulateVarBinaryVector() {
     try (final VarBinaryVector vector1 = new VarBinaryVector("vector", allocator);
-         final VarBinaryVector vector2 = new VarBinaryVector("vector", allocator)) {
+        final VarBinaryVector vector2 = new VarBinaryVector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
@@ -579,9 +589,18 @@ public void testPopulateVarBinaryVector() {
       }
       vector1.setValueCount(10);
 
-      setVector(vector2, null, "test1".getBytes(StandardCharsets.UTF_8), null,
-          "test3".getBytes(StandardCharsets.UTF_8), null, "test5".getBytes(StandardCharsets.UTF_8), null,
-          "test7".getBytes(StandardCharsets.UTF_8), null, "test9".getBytes(StandardCharsets.UTF_8));
+      setVector(
+          vector2,
+          null,
+          "test1".getBytes(StandardCharsets.UTF_8),
+          null,
+          "test3".getBytes(StandardCharsets.UTF_8),
+          null,
+          "test5".getBytes(StandardCharsets.UTF_8),
+          null,
+          "test7".getBytes(StandardCharsets.UTF_8),
+          null,
+          "test9".getBytes(StandardCharsets.UTF_8));
       assertTrue(VectorEqualsVisitor.vectorEquals(vector1, vector2));
     }
   }
@@ -589,7 +608,7 @@ public void testPopulateVarBinaryVector() {
   @Test
   public void testPopulateVarCharVector() {
     try (final VarCharVector vector1 = new VarCharVector("vector", allocator);
-         final VarCharVector vector2 = new VarCharVector("vector", allocator)) {
+        final VarCharVector vector2 = new VarCharVector("vector", allocator)) {
 
       vector1.allocateNew(10);
       for (int i = 0; i < 10; i++) {
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/testing/ValueVectorDataPopulator.java b/java/vector/src/test/java/org/apache/arrow/vector/testing/ValueVectorDataPopulator.java
index 9bfcb3c635d86..9b2c80ef181d1 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/testing/ValueVectorDataPopulator.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/testing/ValueVectorDataPopulator.java
@@ -14,17 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.testing;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import org.apache.arrow.vector.BigIntVector;
 import org.apache.arrow.vector.BitVector;
 import org.apache.arrow.vector.BitVectorHelper;
@@ -61,6 +59,7 @@
 import org.apache.arrow.vector.UInt8Vector;
 import org.apache.arrow.vector.VarBinaryVector;
 import org.apache.arrow.vector.VarCharVector;
+import org.apache.arrow.vector.VariableWidthFieldVector;
 import org.apache.arrow.vector.complex.BaseRepeatedValueVector;
 import org.apache.arrow.vector.complex.FixedSizeListVector;
 import org.apache.arrow.vector.complex.LargeListVector;
@@ -71,17 +70,12 @@
 import org.apache.arrow.vector.types.Types.MinorType;
 import org.apache.arrow.vector.types.pojo.FieldType;
 
-/**
- * Utility for populating {@link org.apache.arrow.vector.ValueVector}.
- */
+/** Utility for populating {@link org.apache.arrow.vector.ValueVector}. */
 public class ValueVectorDataPopulator {
 
-  private ValueVectorDataPopulator() {
-  }
+  private ValueVectorDataPopulator() {}
 
-  /**
-   * Populate values for BigIntVector.
-   */
+  /** Populate values for BigIntVector. */
   public static void setVector(BigIntVector vector, Long... values) {
     final int length = values.length;
     vector.allocateNew(length);
@@ -93,9 +87,7 @@ public static void setVector(BigIntVector vector, Long... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for BitVector.
-   */
+  /** Populate values for BitVector. */
   public static void setVector(BitVector vector, Integer... values) {
     final int length = values.length;
     vector.allocateNew(length);
@@ -109,6 +101,7 @@ public static void setVector(BitVector vector, Integer... values) {
 
   /**
    * Populate values for DateDayVector.
+   *
    * @param values numbers of days since UNIX epoch
    */
   public static void setVector(DateDayVector vector, Integer... values) {
@@ -124,6 +117,7 @@ public static void setVector(DateDayVector vector, Integer... values) {
 
   /**
    * Populate values for DateMilliVector.
+   *
    * @param values numbers of milliseconds since UNIX epoch
    */
   public static void setVector(DateMilliVector vector, Long... values) {
@@ -137,9 +131,7 @@ public static void setVector(DateMilliVector vector, Long... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for DecimalVector.
-   */
+  /** Populate values for DecimalVector. */
   public static void setVector(DecimalVector vector, Long... values) {
     final int length = values.length;
     vector.allocateNew(length);
@@ -151,9 +143,7 @@ public static void setVector(DecimalVector vector, Long... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for Decimal256Vector.
-   */
+  /** Populate values for Decimal256Vector. */
   public static void setVector(Decimal256Vector vector, Long... values) {
     final int length = values.length;
     vector.allocateNew(length);
@@ -165,9 +155,7 @@ public static void setVector(Decimal256Vector vector, Long... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for Decimal256Vector.
-   */
+  /** Populate values for Decimal256Vector. */
   public static void setVector(Decimal256Vector vector, BigDecimal... values) {
     final int length = values.length;
     vector.allocateNew(length);
@@ -181,7 +169,9 @@ public static void setVector(Decimal256Vector vector, BigDecimal... values) {
 
   /**
    * Populate values for DurationVector.
-   * @param values values of elapsed time in either seconds, milliseconds, microseconds or nanoseconds.
+   *
+   * @param values values of elapsed time in either seconds, milliseconds, microseconds or
+   *     nanoseconds.
    */
   public static void setVector(DurationVector vector, Long... values) {
     final int length = values.length;
@@ -194,9 +184,7 @@ public static void setVector(DurationVector vector, Long... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for FixedSizeBinaryVector.
-   */
+  /** Populate values for FixedSizeBinaryVector. */
   public static void setVector(FixedSizeBinaryVector vector, byte[]... values) {
     final int length = values.length;
     vector.allocateNewSafe();
@@ -208,9 +196,7 @@ public static void setVector(FixedSizeBinaryVector vector, byte[]... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for Float2Vector.
-   */
+  /** Populate values for Float2Vector. */
   public static void setVector(Float2Vector vector, Float... values) {
     final int length = values.length;
     vector.allocateNew(length);
@@ -222,9 +208,7 @@ public static void setVector(Float2Vector vector, Float... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for Float4Vector.
-   */
+  /** Populate values for Float4Vector. */
   public static void setVector(Float4Vector vector, Float... values) {
     final int length = values.length;
     vector.allocateNew(length);
@@ -236,9 +220,7 @@ public static void setVector(Float4Vector vector, Float... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for Float8Vector.
-   */
+  /** Populate values for Float8Vector. */
   public static void setVector(Float8Vector vector, Double... values) {
     final int length = values.length;
     vector.allocateNew(length);
@@ -250,9 +232,7 @@ public static void setVector(Float8Vector vector, Double... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for IntVector.
-   */
+  /** Populate values for IntVector. */
   public static void setVector(IntVector vector, Integer... values) {
     final int length = values.length;
     vector.allocateNew(length);
@@ -266,7 +246,9 @@ public static void setVector(IntVector vector, Integer... values) {
 
   /**
    * Populate values for IntervalDayVector.
-   * @param values holders witch holds days and milliseconds values which represents interval in SQL style.
+   *
+   * @param values holders witch holds days and milliseconds values which represents interval in SQL
+   *     style.
    */
   public static void setVector(IntervalDayVector vector, IntervalDayHolder... values) {
     final int length = values.length;
@@ -281,6 +263,7 @@ public static void setVector(IntervalDayVector vector, IntervalDayHolder... valu
 
   /**
    * Populate values for IntervalYearVector.
+   *
    * @param values total month intervals in SQL style.
    */
   public static void setVector(IntervalYearVector vector, Integer... values) {
@@ -294,9 +277,7 @@ public static void setVector(IntervalYearVector vector, Integer... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for SmallIntVector.
-   */
+  /** Populate values for SmallIntVector. */
   public static void setVector(SmallIntVector vector, Short... values) {
     final int length = values.length;
     vector.allocateNew(length);
@@ -310,6 +291,7 @@ public static void setVector(SmallIntVector vector, Short... values) {
 
   /**
    * Populate values for TimeMicroVector.
+   *
    * @param values numbers of microseconds since UNIX epoch
    */
   public static void setVector(TimeMicroVector vector, Long... values) {
@@ -325,6 +307,7 @@ public static void setVector(TimeMicroVector vector, Long... values) {
 
   /**
    * Populate values for TimeMicroVector.
+   *
    * @param values numbers of milliseconds since UNIX epoch
    */
   public static void setVector(TimeMilliVector vector, Integer... values) {
@@ -340,6 +323,7 @@ public static void setVector(TimeMilliVector vector, Integer... values) {
 
   /**
    * Populate values for TimeNanoVector.
+   *
    * @param values numbers of nanoseconds since UNIX epoch
    */
   public static void setVector(TimeNanoVector vector, Long... values) {
@@ -355,6 +339,7 @@ public static void setVector(TimeNanoVector vector, Long... values) {
 
   /**
    * Populate values for TimeSecVector.
+   *
    * @param values numbers of seconds since UNIX epoch
    */
   public static void setVector(TimeSecVector vector, Integer... values) {
@@ -370,6 +355,7 @@ public static void setVector(TimeSecVector vector, Integer... values) {
 
   /**
    * Populate values for TimeStampMicroTZVector.
+   *
    * @param values numbers of microseconds since UNIX epoch
    */
   public static void setVector(TimeStampMicroTZVector vector, Long... values) {
@@ -385,6 +371,7 @@ public static void setVector(TimeStampMicroTZVector vector, Long... values) {
 
   /**
    * Populate values for TimeStampMicroVector.
+   *
    * @param values numbers of microseconds since UNIX epoch
    */
   public static void setVector(TimeStampMicroVector vector, Long... values) {
@@ -400,6 +387,7 @@ public static void setVector(TimeStampMicroVector vector, Long... values) {
 
   /**
    * Populate values for TimeStampMilliTZVector.
+   *
    * @param values numbers of milliseconds since UNIX epoch
    */
   public static void setVector(TimeStampMilliTZVector vector, Long... values) {
@@ -415,6 +403,7 @@ public static void setVector(TimeStampMilliTZVector vector, Long... values) {
 
   /**
    * Populate values for TimeStampMilliVector.
+   *
    * @param values numbers of milliseconds since UNIX epoch
    */
   public static void setVector(TimeStampMilliVector vector, Long... values) {
@@ -430,6 +419,7 @@ public static void setVector(TimeStampMilliVector vector, Long... values) {
 
   /**
    * Populate values for TimeStampNanoTZVector.
+   *
    * @param values numbers of nanoseconds since UNIX epoch
    */
   public static void setVector(TimeStampNanoTZVector vector, Long... values) {
@@ -445,6 +435,7 @@ public static void setVector(TimeStampNanoTZVector vector, Long... values) {
 
   /**
    * Populate values for TimeStampNanoVector.
+   *
    * @param values numbers of nanoseconds since UNIX epoch
    */
   public static void setVector(TimeStampNanoVector vector, Long... values) {
@@ -460,6 +451,7 @@ public static void setVector(TimeStampNanoVector vector, Long... values) {
 
   /**
    * Populate values for TimeStampSecTZVector.
+   *
    * @param values numbers of seconds since UNIX epoch
    */
   public static void setVector(TimeStampSecTZVector vector, Long... values) {
@@ -475,6 +467,7 @@ public static void setVector(TimeStampSecTZVector vector, Long... values) {
 
   /**
    * Populate values for TimeStampSecVector.
+   *
    * @param values numbers of seconds since UNIX epoch
    */
   public static void setVector(TimeStampSecVector vector, Long... values) {
@@ -488,9 +481,7 @@ public static void setVector(TimeStampSecVector vector, Long... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for TinyIntVector.
-   */
+  /** Populate values for TinyIntVector. */
   public static void setVector(TinyIntVector vector, Byte... values) {
     final int length = values.length;
     vector.allocateNew(length);
@@ -502,9 +493,7 @@ public static void setVector(TinyIntVector vector, Byte... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for UInt1Vector.
-   */
+  /** Populate values for UInt1Vector. */
   public static void setVector(UInt1Vector vector, Byte... values) {
     final int length = values.length;
     vector.allocateNew(length);
@@ -516,9 +505,7 @@ public static void setVector(UInt1Vector vector, Byte... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for UInt2Vector.
-   */
+  /** Populate values for UInt2Vector. */
   public static void setVector(UInt2Vector vector, Character... values) {
     final int length = values.length;
     vector.allocateNew(length);
@@ -530,9 +517,7 @@ public static void setVector(UInt2Vector vector, Character... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for UInt4Vector.
-   */
+  /** Populate values for UInt4Vector. */
   public static void setVector(UInt4Vector vector, Integer... values) {
     final int length = values.length;
     vector.allocateNew(length);
@@ -544,9 +529,7 @@ public static void setVector(UInt4Vector vector, Integer... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for UInt8Vector.
-   */
+  /** Populate values for UInt8Vector. */
   public static void setVector(UInt8Vector vector, Long... values) {
     final int length = values.length;
     vector.allocateNew(length);
@@ -558,9 +541,7 @@ public static void setVector(UInt8Vector vector, Long... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for VarBinaryVector.
-   */
+  /** Populate values for VarBinaryVector. */
   public static void setVector(VarBinaryVector vector, byte[]... values) {
     final int length = values.length;
     vector.allocateNewSafe();
@@ -572,9 +553,7 @@ public static void setVector(VarBinaryVector vector, byte[]... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for VarCharVector.
-   */
+  /** Populate values for VarCharVector. */
   public static void setVector(VarCharVector vector, byte[]... values) {
     final int length = values.length;
     vector.allocateNewSafe();
@@ -586,9 +565,18 @@ public static void setVector(VarCharVector vector, byte[]... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for LargeVarCharVector.
-   */
+  public static void setVector(VariableWidthFieldVector vector, byte[]... values) {
+    final int length = values.length;
+    vector.allocateNewSafe();
+    for (int i = 0; i < length; i++) {
+      if (values[i] != null) {
+        vector.set(i, values[i]);
+      }
+    }
+    vector.setValueCount(length);
+  }
+
+  /** Populate values for LargeVarCharVector. */
   public static void setVector(LargeVarCharVector vector, byte[]... values) {
     final int length = values.length;
     vector.allocateNewSafe();
@@ -600,9 +588,7 @@ public static void setVector(LargeVarCharVector vector, byte[]... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for VarCharVector.
-   */
+  /** Populate values for VarCharVector. */
   public static void setVector(VarCharVector vector, String... values) {
     final int length = values.length;
     vector.allocateNewSafe();
@@ -614,9 +600,7 @@ public static void setVector(VarCharVector vector, String... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for LargeVarCharVector.
-   */
+  /** Populate values for LargeVarCharVector. */
   public static void setVector(LargeVarCharVector vector, String... values) {
     final int length = values.length;
     vector.allocateNewSafe();
@@ -628,9 +612,7 @@ public static void setVector(LargeVarCharVector vector, String... values) {
     vector.setValueCount(length);
   }
 
-  /**
-   * Populate values for {@link ListVector}.
-   */
+  /** Populate values for {@link ListVector}. */
   public static void setVector(ListVector vector, List<Integer>... values) {
     vector.allocateNewSafe();
     Types.MinorType type = Types.MinorType.INT;
@@ -659,9 +641,7 @@ public static void setVector(ListVector vector, List<Integer>... values) {
     vector.setValueCount(values.length);
   }
 
-  /**
-   * Populate values for {@link LargeListVector}.
-   */
+  /** Populate values for {@link LargeListVector}. */
   public static void setVector(LargeListVector vector, List<Integer>... values) {
     vector.allocateNewSafe();
     Types.MinorType type = Types.MinorType.INT;
@@ -690,9 +670,7 @@ public static void setVector(LargeListVector vector, List<Integer>... values) {
     vector.setValueCount(values.length);
   }
 
-  /**
-   * Populate values for {@link FixedSizeListVector}.
-   */
+  /** Populate values for {@link FixedSizeListVector}. */
   public static void setVector(FixedSizeListVector vector, List<Integer>... values) {
     vector.allocateNewSafe();
     for (int i = 0; i < values.length; i++) {
@@ -724,17 +702,16 @@ public static void setVector(FixedSizeListVector vector, List<Integer>... values
     vector.setValueCount(values.length);
   }
 
-  /**
-   * Populate values for {@link StructVector}.
-   */
+  /** Populate values for {@link StructVector}. */
   public static void setVector(StructVector vector, Map<String, List<Integer>> values) {
     vector.allocateNewSafe();
 
     int valueCount = 0;
     for (final Entry<String, List<Integer>> entry : values.entrySet()) {
       // Add the child
-      final IntVector child = vector.addOrGet(entry.getKey(),
-          FieldType.nullable(MinorType.INT.getType()), IntVector.class);
+      final IntVector child =
+          vector.addOrGet(
+              entry.getKey(), FieldType.nullable(MinorType.INT.getType()), IntVector.class);
 
       // Write the values to the child
       child.allocateNew();
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestExtensionType.java b/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestExtensionType.java
index 872b2f3934b07..8f54a6e5d741f 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestExtensionType.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestExtensionType.java
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.types.pojo;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,7 +34,6 @@
 import java.nio.file.StandardOpenOption;
 import java.util.Collections;
 import java.util.UUID;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.memory.util.hash.ArrowBufHasher;
@@ -41,6 +41,7 @@
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.FixedSizeBinaryVector;
 import org.apache.arrow.vector.Float4Vector;
+import org.apache.arrow.vector.ValueIterableVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.compare.Range;
 import org.apache.arrow.vector.compare.RangeEqualsVisitor;
@@ -51,17 +52,15 @@
 import org.apache.arrow.vector.types.pojo.ArrowType.ExtensionType;
 import org.apache.arrow.vector.util.VectorBatchAppender;
 import org.apache.arrow.vector.validate.ValidateVectorVisitor;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestExtensionType {
-  /**
-   * Test that a custom UUID type can be round-tripped through a temporary file.
-   */
+  /** Test that a custom UUID type can be round-tripped through a temporary file. */
   @Test
   public void roundtripUuid() throws IOException {
     ExtensionTypeRegistry.register(new UuidType());
-    final Schema schema = new Schema(Collections.singletonList(Field.nullable("a", new UuidType())));
+    final Schema schema =
+        new Schema(Collections.singletonList(Field.nullable("a", new UuidType())));
     try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       UUID u1 = UUID.randomUUID();
@@ -73,46 +72,49 @@ public void roundtripUuid() throws IOException {
       root.setRowCount(2);
 
       final File file = File.createTempFile("uuidtest", ".arrow");
-      try (final WritableByteChannel channel = FileChannel
-          .open(Paths.get(file.getAbsolutePath()), StandardOpenOption.WRITE);
+      try (final WritableByteChannel channel =
+              FileChannel.open(Paths.get(file.getAbsolutePath()), StandardOpenOption.WRITE);
           final ArrowFileWriter writer = new ArrowFileWriter(root, null, channel)) {
         writer.start();
         writer.writeBatch();
         writer.end();
       }
 
-      try (final SeekableByteChannel channel = Files.newByteChannel(Paths.get(file.getAbsolutePath()));
+      try (final SeekableByteChannel channel =
+              Files.newByteChannel(Paths.get(file.getAbsolutePath()));
           final ArrowFileReader reader = new ArrowFileReader(channel, allocator)) {
         reader.loadNextBatch();
         final VectorSchemaRoot readerRoot = reader.getVectorSchemaRoot();
-        Assert.assertEquals(root.getSchema(), readerRoot.getSchema());
+        assertEquals(root.getSchema(), readerRoot.getSchema());
 
         final Field field = readerRoot.getSchema().getFields().get(0);
         final UuidType expectedType = new UuidType();
-        Assert.assertEquals(field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_NAME),
+        assertEquals(
+            field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_NAME),
             expectedType.extensionName());
-        Assert.assertEquals(field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_METADATA),
+        assertEquals(
+            field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_METADATA),
             expectedType.serialize());
 
-        final ExtensionTypeVector deserialized = (ExtensionTypeVector) readerRoot.getFieldVectors().get(0);
-        Assert.assertEquals(vector.getValueCount(), deserialized.getValueCount());
+        final ExtensionTypeVector deserialized =
+            (ExtensionTypeVector) readerRoot.getFieldVectors().get(0);
+        assertEquals(vector.getValueCount(), deserialized.getValueCount());
         for (int i = 0; i < vector.getValueCount(); i++) {
-          Assert.assertEquals(vector.isNull(i), deserialized.isNull(i));
+          assertEquals(vector.isNull(i), deserialized.isNull(i));
           if (!vector.isNull(i)) {
-            Assert.assertEquals(vector.getObject(i), deserialized.getObject(i));
+            assertEquals(vector.getObject(i), deserialized.getObject(i));
           }
         }
       }
     }
   }
 
-  /**
-   * Test that a custom UUID type can be read as its underlying type.
-   */
+  /** Test that a custom UUID type can be read as its underlying type. */
   @Test
   public void readUnderlyingType() throws IOException {
     ExtensionTypeRegistry.register(new UuidType());
-    final Schema schema = new Schema(Collections.singletonList(Field.nullable("a", new UuidType())));
+    final Schema schema =
+        new Schema(Collections.singletonList(Field.nullable("a", new UuidType())));
     try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       UUID u1 = UUID.randomUUID();
@@ -124,8 +126,8 @@ public void readUnderlyingType() throws IOException {
       root.setRowCount(2);
 
       final File file = File.createTempFile("uuidtest", ".arrow");
-      try (final WritableByteChannel channel = FileChannel
-          .open(Paths.get(file.getAbsolutePath()), StandardOpenOption.WRITE);
+      try (final WritableByteChannel channel =
+              FileChannel.open(Paths.get(file.getAbsolutePath()), StandardOpenOption.WRITE);
           final ArrowFileWriter writer = new ArrowFileWriter(root, null, channel)) {
         writer.start();
         writer.writeBatch();
@@ -134,33 +136,41 @@ public void readUnderlyingType() throws IOException {
 
       ExtensionTypeRegistry.unregister(new UuidType());
 
-      try (final SeekableByteChannel channel = Files.newByteChannel(Paths.get(file.getAbsolutePath()));
+      try (final SeekableByteChannel channel =
+              Files.newByteChannel(Paths.get(file.getAbsolutePath()));
           final ArrowFileReader reader = new ArrowFileReader(channel, allocator)) {
         reader.loadNextBatch();
         final VectorSchemaRoot readerRoot = reader.getVectorSchemaRoot();
-        Assert.assertEquals(1, readerRoot.getSchema().getFields().size());
-        Assert.assertEquals("a", readerRoot.getSchema().getFields().get(0).getName());
-        Assert.assertTrue(readerRoot.getSchema().getFields().get(0).getType() instanceof ArrowType.FixedSizeBinary);
-        Assert.assertEquals(16,
-            ((ArrowType.FixedSizeBinary) readerRoot.getSchema().getFields().get(0).getType()).getByteWidth());
+        assertEquals(1, readerRoot.getSchema().getFields().size());
+        assertEquals("a", readerRoot.getSchema().getFields().get(0).getName());
+        assertTrue(
+            readerRoot.getSchema().getFields().get(0).getType()
+                instanceof ArrowType.FixedSizeBinary);
+        assertEquals(
+            16,
+            ((ArrowType.FixedSizeBinary) readerRoot.getSchema().getFields().get(0).getType())
+                .getByteWidth());
 
         final Field field = readerRoot.getSchema().getFields().get(0);
         final UuidType expectedType = new UuidType();
-        Assert.assertEquals(field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_NAME),
+        assertEquals(
+            field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_NAME),
             expectedType.extensionName());
-        Assert.assertEquals(field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_METADATA),
+        assertEquals(
+            field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_METADATA),
             expectedType.serialize());
 
-        final FixedSizeBinaryVector deserialized = (FixedSizeBinaryVector) readerRoot.getFieldVectors().get(0);
-        Assert.assertEquals(vector.getValueCount(), deserialized.getValueCount());
+        final FixedSizeBinaryVector deserialized =
+            (FixedSizeBinaryVector) readerRoot.getFieldVectors().get(0);
+        assertEquals(vector.getValueCount(), deserialized.getValueCount());
         for (int i = 0; i < vector.getValueCount(); i++) {
-          Assert.assertEquals(vector.isNull(i), deserialized.isNull(i));
+          assertEquals(vector.isNull(i), deserialized.isNull(i));
           if (!vector.isNull(i)) {
             final UUID uuid = vector.getObject(i);
             final ByteBuffer bb = ByteBuffer.allocate(16);
             bb.putLong(uuid.getMostSignificantBits());
             bb.putLong(uuid.getLeastSignificantBits());
-            Assert.assertArrayEquals(bb.array(), deserialized.get(i));
+            assertArrayEquals(bb.array(), deserialized.get(i));
           }
         }
       }
@@ -169,26 +179,27 @@ public void readUnderlyingType() throws IOException {
 
   @Test
   public void testNullCheck() {
-    NullPointerException e = assertThrows(NullPointerException.class,
-        () -> {
-          try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-               final ExtensionTypeVector vector = new UuidVector("uuid", allocator, null)) {
-            vector.getField();
-            vector.allocateNewSafe();
-          }
-        });
+    NullPointerException e =
+        assertThrows(
+            NullPointerException.class,
+            () -> {
+              try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
+                  final ExtensionTypeVector vector = new UuidVector("uuid", allocator, null)) {
+                vector.getField();
+                vector.allocateNewSafe();
+              }
+            });
     assertTrue(e.getMessage().contains("underlyingVector cannot be null."));
   }
 
-  /**
-   * Test that a custom Location type can be round-tripped through a temporary file.
-   */
+  /** Test that a custom Location type can be round-tripped through a temporary file. */
   @Test
   public void roundtripLocation() throws IOException {
     ExtensionTypeRegistry.register(new LocationType());
-    final Schema schema = new Schema(Collections.singletonList(Field.nullable("location", new LocationType())));
+    final Schema schema =
+        new Schema(Collections.singletonList(Field.nullable("location", new LocationType())));
     try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-         final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+        final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
       LocationVector vector = (LocationVector) root.getVector("location");
       vector.allocateNew();
       vector.set(0, 34.073814f, -118.240784f);
@@ -198,38 +209,42 @@ public void roundtripLocation() throws IOException {
       root.setRowCount(4);
 
       final File file = File.createTempFile("locationtest", ".arrow");
-      try (final WritableByteChannel channel = FileChannel
-              .open(Paths.get(file.getAbsolutePath()), StandardOpenOption.WRITE);
-           final ArrowFileWriter writer = new ArrowFileWriter(root, null, channel)) {
+      try (final WritableByteChannel channel =
+              FileChannel.open(Paths.get(file.getAbsolutePath()), StandardOpenOption.WRITE);
+          final ArrowFileWriter writer = new ArrowFileWriter(root, null, channel)) {
         writer.start();
         writer.writeBatch();
         writer.end();
       }
 
-      try (final SeekableByteChannel channel = Files.newByteChannel(Paths.get(file.getAbsolutePath()));
-           final ArrowFileReader reader = new ArrowFileReader(channel, allocator)) {
+      try (final SeekableByteChannel channel =
+              Files.newByteChannel(Paths.get(file.getAbsolutePath()));
+          final ArrowFileReader reader = new ArrowFileReader(channel, allocator)) {
         reader.loadNextBatch();
         final VectorSchemaRoot readerRoot = reader.getVectorSchemaRoot();
-        Assert.assertEquals(root.getSchema(), readerRoot.getSchema());
+        assertEquals(root.getSchema(), readerRoot.getSchema());
 
         final Field field = readerRoot.getSchema().getFields().get(0);
         final LocationType expectedType = new LocationType();
-        Assert.assertEquals(field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_NAME),
-                expectedType.extensionName());
-        Assert.assertEquals(field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_METADATA),
-                expectedType.serialize());
-
-        final ExtensionTypeVector deserialized = (ExtensionTypeVector) readerRoot.getFieldVectors().get(0);
-        Assert.assertTrue(deserialized instanceof LocationVector);
-        Assert.assertEquals("location", deserialized.getName());
+        assertEquals(
+            field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_NAME),
+            expectedType.extensionName());
+        assertEquals(
+            field.getMetadata().get(ExtensionType.EXTENSION_METADATA_KEY_METADATA),
+            expectedType.serialize());
+
+        final ExtensionTypeVector deserialized =
+            (ExtensionTypeVector) readerRoot.getFieldVectors().get(0);
+        assertTrue(deserialized instanceof LocationVector);
+        assertEquals("location", deserialized.getName());
         StructVector deserStruct = (StructVector) deserialized.getUnderlyingVector();
-        Assert.assertNotNull(deserStruct.getChild("Latitude"));
-        Assert.assertNotNull(deserStruct.getChild("Longitude"));
-        Assert.assertEquals(vector.getValueCount(), deserialized.getValueCount());
+        assertNotNull(deserStruct.getChild("Latitude"));
+        assertNotNull(deserStruct.getChild("Longitude"));
+        assertEquals(vector.getValueCount(), deserialized.getValueCount());
         for (int i = 0; i < vector.getValueCount(); i++) {
-          Assert.assertEquals(vector.isNull(i), deserialized.isNull(i));
+          assertEquals(vector.isNull(i), deserialized.isNull(i));
           if (!vector.isNull(i)) {
-            Assert.assertEquals(vector.getObject(i), deserialized.getObject(i));
+            assertEquals(vector.getObject(i), deserialized.getObject(i));
           }
         }
       }
@@ -241,10 +256,12 @@ public void testVectorCompare() {
     UuidType uuidType = new UuidType();
     ExtensionTypeRegistry.register(uuidType);
     try (final BufferAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-         UuidVector a1 = (UuidVector) uuidType.getNewVector("a", FieldType.nullable(uuidType), allocator);
-         UuidVector a2 = (UuidVector) uuidType.getNewVector("a", FieldType.nullable(uuidType), allocator);
-         UuidVector bb = (UuidVector) uuidType.getNewVector("a", FieldType.nullable(uuidType), allocator)
-         ) {
+        UuidVector a1 =
+            (UuidVector) uuidType.getNewVector("a", FieldType.nullable(uuidType), allocator);
+        UuidVector a2 =
+            (UuidVector) uuidType.getNewVector("a", FieldType.nullable(uuidType), allocator);
+        UuidVector bb =
+            (UuidVector) uuidType.getNewVector("a", FieldType.nullable(uuidType), allocator)) {
       UUID u1 = UUID.randomUUID();
       UUID u2 = UUID.randomUUID();
 
@@ -298,7 +315,8 @@ public boolean extensionEquals(ExtensionType other) {
     @Override
     public ArrowType deserialize(ArrowType storageType, String serializedData) {
       if (!storageType.equals(storageType())) {
-        throw new UnsupportedOperationException("Cannot construct UuidType from underlying type " + storageType);
+        throw new UnsupportedOperationException(
+            "Cannot construct UuidType from underlying type " + storageType);
       }
       return new UuidType();
     }
@@ -314,9 +332,11 @@ public FieldVector getNewVector(String name, FieldType fieldType, BufferAllocato
     }
   }
 
-  static class UuidVector extends ExtensionTypeVector<FixedSizeBinaryVector> {
+  static class UuidVector extends ExtensionTypeVector<FixedSizeBinaryVector>
+      implements ValueIterableVector<UUID> {
 
-    public UuidVector(String name, BufferAllocator allocator, FixedSizeBinaryVector underlyingVector) {
+    public UuidVector(
+        String name, BufferAllocator allocator, FixedSizeBinaryVector underlyingVector) {
       super(name, allocator, underlyingVector);
     }
 
@@ -364,7 +384,8 @@ public boolean extensionEquals(ExtensionType other) {
     @Override
     public ArrowType deserialize(ArrowType storageType, String serializedData) {
       if (!storageType.equals(storageType())) {
-        throw new UnsupportedOperationException("Cannot construct LocationType from underlying type " + storageType);
+        throw new UnsupportedOperationException(
+            "Cannot construct LocationType from underlying type " + storageType);
       }
       return new LocationType();
     }
@@ -380,15 +401,20 @@ public FieldVector getNewVector(String name, FieldType fieldType, BufferAllocato
     }
   }
 
-  public static class LocationVector extends ExtensionTypeVector<StructVector> {
+  public static class LocationVector extends ExtensionTypeVector<StructVector>
+      implements ValueIterableVector<java.util.Map<String, ?>> {
 
     private static StructVector buildUnderlyingVector(String name, BufferAllocator allocator) {
       final StructVector underlyingVector =
-              new StructVector(name, allocator, FieldType.nullable(ArrowType.Struct.INSTANCE), null);
-      underlyingVector.addOrGet("Latitude",
-              FieldType.nullable(new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)), Float4Vector.class);
-      underlyingVector.addOrGet("Longitude",
-              FieldType.nullable(new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)), Float4Vector.class);
+          new StructVector(name, allocator, FieldType.nullable(ArrowType.Struct.INSTANCE), null);
+      underlyingVector.addOrGet(
+          "Latitude",
+          FieldType.nullable(new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
+          Float4Vector.class);
+      underlyingVector.addOrGet(
+          "Longitude",
+          FieldType.nullable(new ArrowType.FloatingPoint(FloatingPointPrecision.SINGLE)),
+          Float4Vector.class);
       return underlyingVector;
     }
 
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestField.java b/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestField.java
index bc984fa642d52..88dedf8837763 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestField.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestField.java
@@ -14,25 +14,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.types.pojo;
 
 import static org.apache.arrow.vector.types.pojo.Schema.METADATA_KEY;
 import static org.apache.arrow.vector.types.pojo.Schema.METADATA_VALUE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.arrow.vector.types.pojo.ArrowType.Int;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestField {
 
-  private static Field field(String name, boolean nullable, ArrowType type, Map<String, String> metadata) {
+  private static Field field(
+      String name, boolean nullable, ArrowType type, Map<String, String> metadata) {
     return new Field(name, new FieldType(nullable, type, null, metadata), Collections.emptyList());
   }
 
@@ -41,14 +40,16 @@ public void testMetadata() throws IOException {
     Map<String, String> metadata = new HashMap<>(1);
     metadata.put("testKey", "testValue");
 
-    Schema schema = new Schema(Collections.singletonList(
-        field("a", false, new Int(8, true), metadata)
-    ));
+    Schema schema =
+        new Schema(Collections.singletonList(field("a", false, new Int(8, true), metadata)));
 
     String json = schema.toJson();
     Schema actual = Schema.fromJSON(json);
 
-    jsonContains(json, "\"" + METADATA_KEY + "\" : \"testKey\"", "\"" + METADATA_VALUE + "\" : \"testValue\"");
+    jsonContains(
+        json,
+        "\"" + METADATA_KEY + "\" : \"testKey\"",
+        "\"" + METADATA_VALUE + "\" : \"testValue\"");
 
     Map<String, String> actualMetadata = actual.getFields().get(0).getMetadata();
     assertEquals(1, actualMetadata.size());
@@ -57,7 +58,7 @@ public void testMetadata() throws IOException {
 
   private void jsonContains(String json, String... strings) {
     for (String string : strings) {
-      assertTrue(json + " contains " + string, json.contains(string));
+      assertTrue(json.contains(string), json + " contains " + string);
     }
   }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestSchema.java b/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestSchema.java
index 7b62247c6e12d..33685c048e1d5 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestSchema.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/types/pojo/TestSchema.java
@@ -14,20 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.types.pojo;
 
 import static java.util.Arrays.asList;
 import static org.apache.arrow.vector.types.pojo.Schema.METADATA_KEY;
 import static org.apache.arrow.vector.types.pojo.Schema.METADATA_VALUE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.apache.arrow.vector.types.DateUnit;
 import org.apache.arrow.vector.types.FloatingPointPrecision;
 import org.apache.arrow.vector.types.IntervalUnit;
@@ -49,7 +47,7 @@
 import org.apache.arrow.vector.types.pojo.ArrowType.Timestamp;
 import org.apache.arrow.vector.types.pojo.ArrowType.Union;
 import org.apache.arrow.vector.types.pojo.ArrowType.Utf8;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestSchema {
 
@@ -63,84 +61,87 @@ private static Field field(String name, ArrowType type, Field... children) {
 
   @Test
   public void testComplex() throws IOException {
-    Schema schema = new Schema(asList(
-        field("a", false, new Int(8, true)),
-        field("b", new Struct(),
-            field("c", new Int(16, true)),
-            field("d", new Utf8())),
-        field("e", new List(), field(null, new Date(DateUnit.MILLISECOND))),
-        field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
-        field("g", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
-        field("h", new Timestamp(TimeUnit.MICROSECOND, null)),
-        field("i", new Interval(IntervalUnit.DAY_TIME)),
-        field("j", new ArrowType.Duration(TimeUnit.SECOND))
-    ));
+    Schema schema =
+        new Schema(
+            asList(
+                field("a", false, new Int(8, true)),
+                field("b", new Struct(), field("c", new Int(16, true)), field("d", new Utf8())),
+                field("e", new List(), field(null, new Date(DateUnit.MILLISECOND))),
+                field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
+                field("g", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
+                field("h", new Timestamp(TimeUnit.MICROSECOND, null)),
+                field("i", new Interval(IntervalUnit.DAY_TIME)),
+                field("j", new ArrowType.Duration(TimeUnit.SECOND))));
     roundTrip(schema);
     assertEquals(
-        "Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date(MILLISECOND)>, " +
-          "f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND, UTC), h: Timestamp(MICROSECOND, null), " +
-          "i: Interval(DAY_TIME), j: Duration(SECOND)>",
+        "Schema<a: Int(8, true) not null, b: Struct<c: Int(16, true), d: Utf8>, e: List<Date(MILLISECOND)>, "
+            + "f: FloatingPoint(SINGLE), g: Timestamp(MILLISECOND, UTC), h: Timestamp(MICROSECOND, null), "
+            + "i: Interval(DAY_TIME), j: Duration(SECOND)>",
         schema.toString());
   }
 
   @Test
   public void testAll() throws IOException {
-    Schema schema = new Schema(asList(
-        field("a", false, new Null()),
-        field("b", new Struct(), field("ba", new Null())),
-        field("c", new List(), field("ca", new Null())),
-        field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null())),
-        field("e", new Int(8, true)),
-        field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
-        field("g", new Utf8()),
-        field("h", new Binary()),
-        field("i", new Bool()),
-        field("j", new Decimal(5, 5, 128)),
-        field("k", new Date(DateUnit.DAY)),
-        field("l", new Date(DateUnit.MILLISECOND)),
-        field("m", new Time(TimeUnit.SECOND, 32)),
-        field("n", new Time(TimeUnit.MILLISECOND, 32)),
-        field("o", new Time(TimeUnit.MICROSECOND, 64)),
-        field("p", new Time(TimeUnit.NANOSECOND, 64)),
-        field("q", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
-        field("r", new Timestamp(TimeUnit.MICROSECOND, null)),
-        field("s", new Interval(IntervalUnit.DAY_TIME)),
-        field("t", new FixedSizeBinary(100)),
-        field("u", new Duration(TimeUnit.SECOND)),
-        field("v", new Duration(TimeUnit.MICROSECOND))
-    ));
+    Schema schema =
+        new Schema(
+            asList(
+                field("a", false, new Null()),
+                field("b", new Struct(), field("ba", new Null())),
+                field("c", new List(), field("ca", new Null())),
+                field(
+                    "d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null())),
+                field("e", new Int(8, true)),
+                field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
+                field("g", new Utf8()),
+                field("h", new Binary()),
+                field("i", new Bool()),
+                field("j", new Decimal(5, 5, 128)),
+                field("k", new Date(DateUnit.DAY)),
+                field("l", new Date(DateUnit.MILLISECOND)),
+                field("m", new Time(TimeUnit.SECOND, 32)),
+                field("n", new Time(TimeUnit.MILLISECOND, 32)),
+                field("o", new Time(TimeUnit.MICROSECOND, 64)),
+                field("p", new Time(TimeUnit.NANOSECOND, 64)),
+                field("q", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
+                field("r", new Timestamp(TimeUnit.MICROSECOND, null)),
+                field("s", new Interval(IntervalUnit.DAY_TIME)),
+                field("t", new FixedSizeBinary(100)),
+                field("u", new Duration(TimeUnit.SECOND)),
+                field("v", new Duration(TimeUnit.MICROSECOND))));
     roundTrip(schema);
   }
 
   @Test
   public void testUnion() throws IOException {
-    Schema schema = new Schema(asList(
-        field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null()))
-    ));
+    Schema schema =
+        new Schema(
+            asList(
+                field(
+                    "d",
+                    new Union(UnionMode.Sparse, new int[] {1, 2, 3}),
+                    field("da", new Null()))));
     roundTrip(schema);
     contains(schema, "Sparse");
   }
 
   @Test
   public void testDate() throws IOException {
-    Schema schema = new Schema(asList(
-        field("a", new Date(DateUnit.DAY)),
-        field("b", new Date(DateUnit.MILLISECOND))
-    ));
+    Schema schema =
+        new Schema(
+            asList(field("a", new Date(DateUnit.DAY)), field("b", new Date(DateUnit.MILLISECOND))));
     roundTrip(schema);
-    assertEquals(
-        "Schema<a: Date(DAY), b: Date(MILLISECOND)>",
-        schema.toString());
+    assertEquals("Schema<a: Date(DAY), b: Date(MILLISECOND)>", schema.toString());
   }
 
   @Test
   public void testTime() throws IOException {
-    Schema schema = new Schema(asList(
-        field("a", new Time(TimeUnit.SECOND, 32)),
-        field("b", new Time(TimeUnit.MILLISECOND, 32)),
-        field("c", new Time(TimeUnit.MICROSECOND, 64)),
-        field("d", new Time(TimeUnit.NANOSECOND, 64))
-    ));
+    Schema schema =
+        new Schema(
+            asList(
+                field("a", new Time(TimeUnit.SECOND, 32)),
+                field("b", new Time(TimeUnit.MILLISECOND, 32)),
+                field("c", new Time(TimeUnit.MICROSECOND, 64)),
+                field("d", new Time(TimeUnit.NANOSECOND, 64))));
     roundTrip(schema);
     assertEquals(
         "Schema<a: Time(SECOND, 32), b: Time(MILLISECOND, 32), c: Time(MICROSECOND, 64), d: Time(NANOSECOND, 64)>",
@@ -149,53 +150,57 @@ public void testTime() throws IOException {
 
   @Test
   public void testTS() throws IOException {
-    Schema schema = new Schema(asList(
-        field("a", new Timestamp(TimeUnit.SECOND, "UTC")),
-        field("b", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
-        field("c", new Timestamp(TimeUnit.MICROSECOND, "UTC")),
-        field("d", new Timestamp(TimeUnit.NANOSECOND, "UTC")),
-        field("e", new Timestamp(TimeUnit.SECOND, null)),
-        field("f", new Timestamp(TimeUnit.MILLISECOND, null)),
-        field("g", new Timestamp(TimeUnit.MICROSECOND, null)),
-        field("h", new Timestamp(TimeUnit.NANOSECOND, null))
-    ));
+    Schema schema =
+        new Schema(
+            asList(
+                field("a", new Timestamp(TimeUnit.SECOND, "UTC")),
+                field("b", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
+                field("c", new Timestamp(TimeUnit.MICROSECOND, "UTC")),
+                field("d", new Timestamp(TimeUnit.NANOSECOND, "UTC")),
+                field("e", new Timestamp(TimeUnit.SECOND, null)),
+                field("f", new Timestamp(TimeUnit.MILLISECOND, null)),
+                field("g", new Timestamp(TimeUnit.MICROSECOND, null)),
+                field("h", new Timestamp(TimeUnit.NANOSECOND, null))));
     roundTrip(schema);
     assertEquals(
-        "Schema<a: Timestamp(SECOND, UTC), b: Timestamp(MILLISECOND, UTC), c: Timestamp(MICROSECOND, UTC), " +
-          "d: Timestamp(NANOSECOND, UTC), e: Timestamp(SECOND, null), f: Timestamp(MILLISECOND, null), " +
-          "g: Timestamp(MICROSECOND, null), h: Timestamp(NANOSECOND, null)>",
+        "Schema<a: Timestamp(SECOND, UTC), b: Timestamp(MILLISECOND, UTC), c: Timestamp(MICROSECOND, UTC), "
+            + "d: Timestamp(NANOSECOND, UTC), e: Timestamp(SECOND, null), f: Timestamp(MILLISECOND, null), "
+            + "g: Timestamp(MICROSECOND, null), h: Timestamp(NANOSECOND, null)>",
         schema.toString());
   }
 
   @Test
   public void testInterval() throws IOException {
-    Schema schema = new Schema(asList(
-        field("a", new Interval(IntervalUnit.YEAR_MONTH)),
-        field("b", new Interval(IntervalUnit.DAY_TIME))
-    ));
+    Schema schema =
+        new Schema(
+            asList(
+                field("a", new Interval(IntervalUnit.YEAR_MONTH)),
+                field("b", new Interval(IntervalUnit.DAY_TIME))));
     roundTrip(schema);
     contains(schema, "YEAR_MONTH", "DAY_TIME");
   }
 
   @Test
   public void testRoundTripDurationInterval() throws IOException {
-    Schema schema = new Schema(asList(
-        field("a", new Duration(TimeUnit.SECOND)),
-        field("b", new Duration(TimeUnit.MILLISECOND)),
-        field("c", new Duration(TimeUnit.MICROSECOND)),
-        field("d", new Duration(TimeUnit.NANOSECOND))
-    ));
+    Schema schema =
+        new Schema(
+            asList(
+                field("a", new Duration(TimeUnit.SECOND)),
+                field("b", new Duration(TimeUnit.MILLISECOND)),
+                field("c", new Duration(TimeUnit.MICROSECOND)),
+                field("d", new Duration(TimeUnit.NANOSECOND))));
     roundTrip(schema);
     contains(schema, "SECOND", "MILLI", "MICRO", "NANO");
   }
 
   @Test
   public void testFP() throws IOException {
-    Schema schema = new Schema(asList(
-        field("a", new FloatingPoint(FloatingPointPrecision.HALF)),
-        field("b", new FloatingPoint(FloatingPointPrecision.SINGLE)),
-        field("c", new FloatingPoint(FloatingPointPrecision.DOUBLE))
-    ));
+    Schema schema =
+        new Schema(
+            asList(
+                field("a", new FloatingPoint(FloatingPointPrecision.HALF)),
+                field("b", new FloatingPoint(FloatingPointPrecision.SINGLE)),
+                field("c", new FloatingPoint(FloatingPointPrecision.DOUBLE))));
     roundTrip(schema);
     contains(schema, "HALF", "SINGLE", "DOUBLE");
   }
@@ -205,44 +210,47 @@ public void testMetadata() throws IOException {
     Map<String, String> metadata = new HashMap<>(1);
     metadata.put("testKey", "testValue");
 
-    java.util.List<Field> fields = asList(
-        field("a", false, new Int(8, true)),
-        field("b", new Struct(),
-            field("c", new Int(16, true)),
-            field("d", new Utf8())),
-        field("e", new List(), field(null, new Date(DateUnit.MILLISECOND)))
-    );
+    java.util.List<Field> fields =
+        asList(
+            field("a", false, new Int(8, true)),
+            field("b", new Struct(), field("c", new Int(16, true)), field("d", new Utf8())),
+            field("e", new List(), field(null, new Date(DateUnit.MILLISECOND))));
     Schema schema = new Schema(fields, metadata);
     roundTrip(schema);
-    contains(schema, "\"" + METADATA_KEY + "\" : \"testKey\"", "\"" + METADATA_VALUE + "\" : \"testValue\"");
+    contains(
+        schema,
+        "\"" + METADATA_KEY + "\" : \"testKey\"",
+        "\"" + METADATA_VALUE + "\" : \"testValue\"");
   }
 
   @Test
   public void testMessageSerialization() {
-    Schema schema = new Schema(asList(
-        field("a", false, new Null()),
-        field("b", new Struct(), field("ba", new Null())),
-        field("c", new List(), field("ca", new Null())),
-        field("d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null())),
-        field("e", new Int(8, true)),
-        field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
-        field("g", new Utf8()),
-        field("h", new Binary()),
-        field("i", new Bool()),
-        field("j", new Decimal(5, 5, 128)),
-        field("k", new Date(DateUnit.DAY)),
-        field("l", new Date(DateUnit.MILLISECOND)),
-        field("m", new Time(TimeUnit.SECOND, 32)),
-        field("n", new Time(TimeUnit.MILLISECOND, 32)),
-        field("o", new Time(TimeUnit.MICROSECOND, 64)),
-        field("p", new Time(TimeUnit.NANOSECOND, 64)),
-        field("q", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
-        field("r", new Timestamp(TimeUnit.MICROSECOND, null)),
-        field("s", new Interval(IntervalUnit.DAY_TIME)),
-        field("t", new FixedSizeBinary(100)),
-        field("u", new Duration(TimeUnit.SECOND)),
-        field("v", new Duration(TimeUnit.MICROSECOND))
-    ));
+    Schema schema =
+        new Schema(
+            asList(
+                field("a", false, new Null()),
+                field("b", new Struct(), field("ba", new Null())),
+                field("c", new List(), field("ca", new Null())),
+                field(
+                    "d", new Union(UnionMode.Sparse, new int[] {1, 2, 3}), field("da", new Null())),
+                field("e", new Int(8, true)),
+                field("f", new FloatingPoint(FloatingPointPrecision.SINGLE)),
+                field("g", new Utf8()),
+                field("h", new Binary()),
+                field("i", new Bool()),
+                field("j", new Decimal(5, 5, 128)),
+                field("k", new Date(DateUnit.DAY)),
+                field("l", new Date(DateUnit.MILLISECOND)),
+                field("m", new Time(TimeUnit.SECOND, 32)),
+                field("n", new Time(TimeUnit.MILLISECOND, 32)),
+                field("o", new Time(TimeUnit.MICROSECOND, 64)),
+                field("p", new Time(TimeUnit.NANOSECOND, 64)),
+                field("q", new Timestamp(TimeUnit.MILLISECOND, "UTC")),
+                field("r", new Timestamp(TimeUnit.MICROSECOND, null)),
+                field("s", new Interval(IntervalUnit.DAY_TIME)),
+                field("t", new FixedSizeBinary(100)),
+                field("u", new Duration(TimeUnit.SECOND)),
+                field("v", new Duration(TimeUnit.MICROSECOND))));
     roundTripMessage(schema);
   }
 
@@ -264,7 +272,8 @@ private void roundTripMessage(Schema schema) {
     assertEquals(schema.hashCode(), actual.hashCode());
   }
 
-  private void validateFieldsHashcode(java.util.List<Field> schemaFields, java.util.List<Field> actualFields) {
+  private void validateFieldsHashcode(
+      java.util.List<Field> schemaFields, java.util.List<Field> actualFields) {
     assertEquals(schemaFields.size(), actualFields.size());
     if (schemaFields.size() == 0) {
       return;
@@ -280,14 +289,13 @@ private void validateFieldsHashcode(java.util.List<Field> schemaFields, java.uti
 
   private void validateHashCode(Object o1, Object o2) {
     assertEquals(o1, o2);
-    assertEquals(o1 + " == " + o2, o1.hashCode(), o2.hashCode());
+    assertEquals(o1.hashCode(), o2.hashCode(), o1 + " == " + o2);
   }
 
   private void contains(Schema schema, String... s) {
     String json = schema.toJson();
     for (String string : s) {
-      assertTrue(json + " contains " + string, json.contains(string));
+      assertTrue(json.contains(string), json + " contains " + string);
     }
   }
-
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/util/DecimalUtilityTest.java b/java/vector/src/test/java/org/apache/arrow/vector/util/DecimalUtilityTest.java
index 804092ed94ac7..37c38e9a64261 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/util/DecimalUtilityTest.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/util/DecimalUtilityTest.java
@@ -14,38 +14,42 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.math.BigDecimal;
 import java.math.BigInteger;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DecimalUtilityTest {
-  private static final BigInteger[] MAX_BIG_INT = new BigInteger[]{BigInteger.valueOf(10).pow(38)
-          .subtract(java.math.BigInteger.ONE), java.math.BigInteger.valueOf(10).pow(76)};
-  private static final BigInteger[] MIN_BIG_INT = new BigInteger[]{MAX_BIG_INT[0].multiply(BigInteger.valueOf(-1)),
-     MAX_BIG_INT[1].multiply(BigInteger.valueOf(-1))};
+  private static final BigInteger[] MAX_BIG_INT =
+      new BigInteger[] {
+        BigInteger.valueOf(10).pow(38).subtract(java.math.BigInteger.ONE),
+        java.math.BigInteger.valueOf(10).pow(76)
+      };
+  private static final BigInteger[] MIN_BIG_INT =
+      new BigInteger[] {
+        MAX_BIG_INT[0].multiply(BigInteger.valueOf(-1)),
+        MAX_BIG_INT[1].multiply(BigInteger.valueOf(-1))
+      };
 
   @Test
   public void testSetLongInDecimalArrowBuf() {
-    int[] byteLengths = new int[]{16, 32};
+    int[] byteLengths = new int[] {16, 32};
     for (int x = 0; x < 2; x++) {
       try (BufferAllocator allocator = new RootAllocator(128);
-           ArrowBuf buf = allocator.buffer(byteLengths[x]);
-      ) {
-        int [] intValues = new int [] {Integer.MAX_VALUE, Integer.MIN_VALUE, 0};
+          ArrowBuf buf = allocator.buffer(byteLengths[x]); ) {
+        int[] intValues = new int[] {Integer.MAX_VALUE, Integer.MIN_VALUE, 0};
         for (int val : intValues) {
           buf.clear();
           DecimalUtility.writeLongToArrowBuf((long) val, buf, 0, byteLengths[x]);
           BigDecimal actual = DecimalUtility.getBigDecimalFromArrowBuf(buf, 0, 0, byteLengths[x]);
           BigDecimal expected = BigDecimal.valueOf(val);
-          Assert.assertEquals(expected, actual);
+          assertEquals(expected, actual);
         }
       }
     }
@@ -53,36 +57,38 @@ public void testSetLongInDecimalArrowBuf() {
 
   @Test
   public void testSetByteArrayInDecimalArrowBuf() {
-    int[] byteLengths = new int[]{16, 32};
+    int[] byteLengths = new int[] {16, 32};
     for (int x = 0; x < 2; x++) {
       try (BufferAllocator allocator = new RootAllocator(128);
-           ArrowBuf buf = allocator.buffer(byteLengths[x]);
-      ) {
-        int [] intValues = new int [] {Integer.MAX_VALUE, Integer.MIN_VALUE, 0};
+          ArrowBuf buf = allocator.buffer(byteLengths[x]); ) {
+        int[] intValues = new int[] {Integer.MAX_VALUE, Integer.MIN_VALUE, 0};
         for (int val : intValues) {
           buf.clear();
-          DecimalUtility.writeByteArrayToArrowBuf(BigInteger.valueOf(val).toByteArray(), buf, 0, byteLengths[x]);
+          DecimalUtility.writeByteArrayToArrowBuf(
+              BigInteger.valueOf(val).toByteArray(), buf, 0, byteLengths[x]);
           BigDecimal actual = DecimalUtility.getBigDecimalFromArrowBuf(buf, 0, 0, byteLengths[x]);
           BigDecimal expected = BigDecimal.valueOf(val);
-          Assert.assertEquals(expected, actual);
+          assertEquals(expected, actual);
         }
 
-        long [] longValues = new long[] {Long.MIN_VALUE, 0 , Long.MAX_VALUE};
+        long[] longValues = new long[] {Long.MIN_VALUE, 0, Long.MAX_VALUE};
         for (long val : longValues) {
           buf.clear();
-          DecimalUtility.writeByteArrayToArrowBuf(BigInteger.valueOf(val).toByteArray(), buf, 0, byteLengths[x]);
+          DecimalUtility.writeByteArrayToArrowBuf(
+              BigInteger.valueOf(val).toByteArray(), buf, 0, byteLengths[x]);
           BigDecimal actual = DecimalUtility.getBigDecimalFromArrowBuf(buf, 0, 0, byteLengths[x]);
           BigDecimal expected = BigDecimal.valueOf(val);
-          Assert.assertEquals(expected, actual);
+          assertEquals(expected, actual);
         }
 
-        BigInteger [] decimals = new BigInteger[] {MAX_BIG_INT[x], new BigInteger("0"), MIN_BIG_INT[x]};
+        BigInteger[] decimals =
+            new BigInteger[] {MAX_BIG_INT[x], new BigInteger("0"), MIN_BIG_INT[x]};
         for (BigInteger val : decimals) {
           buf.clear();
           DecimalUtility.writeByteArrayToArrowBuf(val.toByteArray(), buf, 0, byteLengths[x]);
           BigDecimal actual = DecimalUtility.getBigDecimalFromArrowBuf(buf, 0, 0, byteLengths[x]);
           BigDecimal expected = new BigDecimal(val);
-          Assert.assertEquals(expected, actual);
+          assertEquals(expected, actual);
         }
       }
     }
@@ -90,36 +96,36 @@ public void testSetByteArrayInDecimalArrowBuf() {
 
   @Test
   public void testSetBigDecimalInDecimalArrowBuf() {
-    int[] byteLengths = new int[]{16, 32};
+    int[] byteLengths = new int[] {16, 32};
     for (int x = 0; x < 2; x++) {
       try (BufferAllocator allocator = new RootAllocator(128);
-           ArrowBuf buf = allocator.buffer(byteLengths[x]);
-      ) {
-        int [] intValues = new int [] {Integer.MAX_VALUE, Integer.MIN_VALUE, 0};
+          ArrowBuf buf = allocator.buffer(byteLengths[x]); ) {
+        int[] intValues = new int[] {Integer.MAX_VALUE, Integer.MIN_VALUE, 0};
         for (int val : intValues) {
           buf.clear();
           DecimalUtility.writeBigDecimalToArrowBuf(BigDecimal.valueOf(val), buf, 0, byteLengths[x]);
           BigDecimal actual = DecimalUtility.getBigDecimalFromArrowBuf(buf, 0, 0, byteLengths[x]);
           BigDecimal expected = BigDecimal.valueOf(val);
-          Assert.assertEquals(expected, actual);
+          assertEquals(expected, actual);
         }
 
-        long [] longValues = new long[] {Long.MIN_VALUE, 0 , Long.MAX_VALUE};
+        long[] longValues = new long[] {Long.MIN_VALUE, 0, Long.MAX_VALUE};
         for (long val : longValues) {
           buf.clear();
           DecimalUtility.writeBigDecimalToArrowBuf(BigDecimal.valueOf(val), buf, 0, byteLengths[x]);
           BigDecimal actual = DecimalUtility.getBigDecimalFromArrowBuf(buf, 0, 0, byteLengths[x]);
           BigDecimal expected = BigDecimal.valueOf(val);
-          Assert.assertEquals(expected, actual);
+          assertEquals(expected, actual);
         }
 
-        BigInteger [] decimals = new BigInteger[] {MAX_BIG_INT[x], new BigInteger("0"), MIN_BIG_INT[x]};
+        BigInteger[] decimals =
+            new BigInteger[] {MAX_BIG_INT[x], new BigInteger("0"), MIN_BIG_INT[x]};
         for (BigInteger val : decimals) {
           buf.clear();
           DecimalUtility.writeBigDecimalToArrowBuf(new BigDecimal(val), buf, 0, byteLengths[x]);
           BigDecimal actual = DecimalUtility.getBigDecimalFromArrowBuf(buf, 0, 0, byteLengths[x]);
           BigDecimal expected = new BigDecimal(val);
-          Assert.assertEquals(expected, actual);
+          assertEquals(expected, actual);
         }
       }
     }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/util/TestDataSizeRoundingUtil.java b/java/vector/src/test/java/org/apache/arrow/vector/util/TestDataSizeRoundingUtil.java
index 4138ea9d7a181..7726c146ae0db 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/util/TestDataSizeRoundingUtil.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/util/TestDataSizeRoundingUtil.java
@@ -14,16 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link DataSizeRoundingUtil}.
- */
+/** Test cases for {@link DataSizeRoundingUtil}. */
 public class TestDataSizeRoundingUtil {
 
   @Test
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/util/TestElementAddressableVectorIterator.java b/java/vector/src/test/java/org/apache/arrow/vector/util/TestElementAddressableVectorIterator.java
index 1c8281c85981b..657254d10822d 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/util/TestElementAddressableVectorIterator.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/util/TestElementAddressableVectorIterator.java
@@ -14,38 +14,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
-import static junit.framework.TestCase.assertNull;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 import java.nio.charset.StandardCharsets;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.memory.util.ArrowBufPointer;
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.VarCharVector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link ElementAddressableVectorIterator}.
- */
+/** Test cases for {@link ElementAddressableVectorIterator}. */
 public class TestElementAddressableVectorIterator {
 
   private final int VECTOR_LENGTH = 100;
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -66,7 +62,8 @@ public void testIterateIntVector() {
       }
 
       // iterate
-      ElementAddressableVectorIterator<IntVector> it = new ElementAddressableVectorIterator<>(intVector);
+      ElementAddressableVectorIterator<IntVector> it =
+          new ElementAddressableVectorIterator<>(intVector);
       int index = 0;
       while (it.hasNext()) {
         ArrowBufPointer pt;
@@ -105,7 +102,8 @@ public void testIterateVarCharVector() {
       }
 
       // iterate
-      ElementAddressableVectorIterator<VarCharVector> it = new ElementAddressableVectorIterator<>(strVector);
+      ElementAddressableVectorIterator<VarCharVector> it =
+          new ElementAddressableVectorIterator<>(strVector);
       int index = 0;
       while (it.hasNext()) {
         ArrowBufPointer pt;
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/util/TestMapWithOrdinal.java b/java/vector/src/test/java/org/apache/arrow/vector/util/TestMapWithOrdinal.java
index edd5221faf268..f21dc70e6d7a8 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/util/TestMapWithOrdinal.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/util/TestMapWithOrdinal.java
@@ -14,24 +14,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
-import static junit.framework.TestCase.assertNull;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collection;
-
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestMapWithOrdinal {
 
   private MapWithOrdinal<String, String> map;
 
-  @Before
+  @BeforeEach
   public void setUp() {
     map = new MapWithOrdinalImpl<>();
   }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/util/TestMultiMapWithOrdinal.java b/java/vector/src/test/java/org/apache/arrow/vector/util/TestMultiMapWithOrdinal.java
index ea829060d1c04..cdaa5f3fa84d8 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/util/TestMultiMapWithOrdinal.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/util/TestMultiMapWithOrdinal.java
@@ -14,11 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
-import org.junit.Assert;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
 
 public class TestMultiMapWithOrdinal {
 
@@ -27,34 +29,32 @@ public void test() {
     MultiMapWithOrdinal<String, String> map = new MultiMapWithOrdinal<>();
 
     map.put("x", "1", false);
-    Assert.assertEquals(1, map.size());
+    assertEquals(1, map.size());
     map.remove("x", "1");
-    Assert.assertTrue(map.isEmpty());
+    assertTrue(map.isEmpty());
     map.put("x", "1", false);
     map.put("x", "2", false);
     map.put("y", "0", false);
-    Assert.assertEquals(3, map.size());
-    Assert.assertEquals(2, map.getAll("x").size());
-    Assert.assertEquals("1", map.getAll("x").stream().findFirst().get());
-    Assert.assertEquals("1", map.getByOrdinal(0));
-    Assert.assertEquals("2", map.getByOrdinal(1));
-    Assert.assertEquals("0", map.getByOrdinal(2));
-    Assert.assertTrue(map.remove("x", "1"));
-    Assert.assertFalse(map.remove("x", "1"));
-    Assert.assertEquals("0", map.getByOrdinal(0));
-    Assert.assertEquals(2, map.size());
+    assertEquals(3, map.size());
+    assertEquals(2, map.getAll("x").size());
+    assertEquals("1", map.getAll("x").stream().findFirst().get());
+    assertEquals("1", map.getByOrdinal(0));
+    assertEquals("2", map.getByOrdinal(1));
+    assertEquals("0", map.getByOrdinal(2));
+    assertTrue(map.remove("x", "1"));
+    assertFalse(map.remove("x", "1"));
+    assertEquals("0", map.getByOrdinal(0));
+    assertEquals(2, map.size());
     map.put("x", "3", true);
-    Assert.assertEquals(1, map.getAll("x").size());
-    Assert.assertEquals("3", map.getAll("x").stream().findFirst().get());
+    assertEquals(1, map.getAll("x").size());
+    assertEquals("3", map.getAll("x").stream().findFirst().get());
     map.put("z", "4", false);
-    Assert.assertEquals(3, map.size());
+    assertEquals(3, map.size());
     map.put("z", "5", false);
     map.put("z", "6", false);
-    Assert.assertEquals(5, map.size());
+    assertEquals(5, map.size());
     map.removeAll("z");
-    Assert.assertEquals(2, map.size());
-    Assert.assertFalse(map.containsKey("z"));
-
-
+    assertEquals(2, map.size());
+    assertFalse(map.containsKey("z"));
   }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/util/TestReusableByteArray.java b/java/vector/src/test/java/org/apache/arrow/vector/util/TestReusableByteArray.java
index f562e63b4bf8d..50d9504fcc8f6 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/util/TestReusableByteArray.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/util/TestReusableByteArray.java
@@ -14,38 +14,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Base64;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.BaseValueVector;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestReusableByteArray {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     // Permit allocating 4 vectors of max size.
     allocator = new RootAllocator(4 * BaseValueVector.MAX_ALLOCATION_SIZE);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -58,11 +56,16 @@ public void testSetByteArrayRepeatedly() {
       workingBuf.setBytes(0, str.getBytes(StandardCharsets.UTF_8));
       byteArray.set(workingBuf, 0, str.getBytes(StandardCharsets.UTF_8).length);
       assertEquals(str.getBytes(StandardCharsets.UTF_8).length, byteArray.getLength());
-      assertArrayEquals(str.getBytes(StandardCharsets.UTF_8), Arrays.copyOfRange(byteArray.getBuffer(), 0,
-          (int) byteArray.getLength()));
-      assertEquals(Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8)), byteArray.toString());
+      assertArrayEquals(
+          str.getBytes(StandardCharsets.UTF_8),
+          Arrays.copyOfRange(byteArray.getBuffer(), 0, (int) byteArray.getLength()));
+      assertEquals(
+          Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8)),
+          byteArray.toString());
       assertEquals(new ReusableByteArray(str.getBytes(StandardCharsets.UTF_8)), byteArray);
-      assertEquals(new ReusableByteArray(str.getBytes(StandardCharsets.UTF_8)).hashCode(), byteArray.hashCode());
+      assertEquals(
+          new ReusableByteArray(str.getBytes(StandardCharsets.UTF_8)).hashCode(),
+          byteArray.hashCode());
 
       // Test a longer string. Should require reallocation.
       final String str2 = "test_longer";
@@ -71,11 +74,16 @@ public void testSetByteArrayRepeatedly() {
       workingBuf.setBytes(0, str2.getBytes(StandardCharsets.UTF_8));
       byteArray.set(workingBuf, 0, str2.getBytes(StandardCharsets.UTF_8).length);
       assertEquals(str2.getBytes(StandardCharsets.UTF_8).length, byteArray.getLength());
-      assertArrayEquals(str2.getBytes(StandardCharsets.UTF_8), Arrays.copyOfRange(byteArray.getBuffer(), 0,
-          (int) byteArray.getLength()));
-      assertEquals(Base64.getEncoder().encodeToString(str2.getBytes(StandardCharsets.UTF_8)), byteArray.toString());
+      assertArrayEquals(
+          str2.getBytes(StandardCharsets.UTF_8),
+          Arrays.copyOfRange(byteArray.getBuffer(), 0, (int) byteArray.getLength()));
+      assertEquals(
+          Base64.getEncoder().encodeToString(str2.getBytes(StandardCharsets.UTF_8)),
+          byteArray.toString());
       assertEquals(new ReusableByteArray(str2.getBytes(StandardCharsets.UTF_8)), byteArray);
-      assertEquals(new ReusableByteArray(str2.getBytes(StandardCharsets.UTF_8)).hashCode(), byteArray.hashCode());
+      assertEquals(
+          new ReusableByteArray(str2.getBytes(StandardCharsets.UTF_8)).hashCode(),
+          byteArray.hashCode());
 
       // Verify reallocation needed.
       assertNotSame(oldBuffer, byteArray.getBuffer());
@@ -88,11 +96,16 @@ public void testSetByteArrayRepeatedly() {
       workingBuf.setBytes(0, str3.getBytes(StandardCharsets.UTF_8));
       byteArray.set(workingBuf, 0, str3.getBytes(StandardCharsets.UTF_8).length);
       assertEquals(str3.getBytes(StandardCharsets.UTF_8).length, byteArray.getLength());
-      assertArrayEquals(str3.getBytes(StandardCharsets.UTF_8), Arrays.copyOfRange(byteArray.getBuffer(), 0,
-          (int) byteArray.getLength()));
-      assertEquals(Base64.getEncoder().encodeToString(str3.getBytes(StandardCharsets.UTF_8)), byteArray.toString());
+      assertArrayEquals(
+          str3.getBytes(StandardCharsets.UTF_8),
+          Arrays.copyOfRange(byteArray.getBuffer(), 0, (int) byteArray.getLength()));
+      assertEquals(
+          Base64.getEncoder().encodeToString(str3.getBytes(StandardCharsets.UTF_8)),
+          byteArray.toString());
       assertEquals(new ReusableByteArray(str3.getBytes(StandardCharsets.UTF_8)), byteArray);
-      assertEquals(new ReusableByteArray(str3.getBytes(StandardCharsets.UTF_8)).hashCode(), byteArray.hashCode());
+      assertEquals(
+          new ReusableByteArray(str3.getBytes(StandardCharsets.UTF_8)).hashCode(),
+          byteArray.hashCode());
 
       // Verify reallocation was not needed.
       assertSame(oldBuffer, byteArray.getBuffer());
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/util/TestSchemaUtil.java b/java/vector/src/test/java/org/apache/arrow/vector/util/TestSchemaUtil.java
index 52b6584086832..5d3de5d73a26f 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/util/TestSchemaUtil.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/util/TestSchemaUtil.java
@@ -14,21 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
-
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
-import org.apache.arrow.vector.util.SchemaUtility;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestSchemaUtil {
 
@@ -38,11 +35,12 @@ private static Field field(String name, boolean nullable, ArrowType type, Field.
 
   @Test
   public void testSerializationAndDeserialization() throws IOException {
-    Schema schema = new Schema(asList(
-        field("a", false, new ArrowType.Null()),
-        field("b", true, new ArrowType.Utf8()),
-        field("c", true, new ArrowType.Binary()))
-    );
+    Schema schema =
+        new Schema(
+            asList(
+                field("a", false, new ArrowType.Null()),
+                field("b", true, new ArrowType.Utf8()),
+                field("c", true, new ArrowType.Binary())));
 
     byte[] serialized = SchemaUtility.serialize(schema);
     Schema deserialized = SchemaUtility.deserialize(serialized, new RootAllocator(Long.MAX_VALUE));
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/util/TestValidator.java b/java/vector/src/test/java/org/apache/arrow/vector/util/TestValidator.java
index 2db70ca5d5b8d..a7a4035550c21 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/util/TestValidator.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/util/TestValidator.java
@@ -14,14 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
 import static org.apache.arrow.vector.util.Validator.equalEnough;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class TestValidator {
 
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/util/TestVectorAppender.java b/java/vector/src/test/java/org/apache/arrow/vector/util/TestVectorAppender.java
index 93e7535947536..19eafd1b20197 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/util/TestVectorAppender.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/util/TestVectorAppender.java
@@ -14,18 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.BaseValueVector;
@@ -53,24 +51,22 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link VectorAppender}.
- */
+/** Test cases for {@link VectorAppender}. */
 public class TestVectorAppender {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     // Permit allocating 4 vectors of max size.
     allocator = new RootAllocator(4 * BaseValueVector.MAX_ALLOCATION_SIZE);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -80,7 +76,7 @@ public void testAppendFixedWidthVector() {
     final int length1 = 10;
     final int length2 = 5;
     try (IntVector target = new IntVector("", allocator);
-         IntVector delta = new IntVector("", allocator)) {
+        IntVector delta = new IntVector("", allocator)) {
 
       target.allocateNew(length1);
       delta.allocateNew(length2);
@@ -95,7 +91,8 @@ public void testAppendFixedWidthVector() {
 
       try (IntVector expected = new IntVector("expected", allocator)) {
         expected.allocateNew();
-        ValueVectorDataPopulator.setVector(expected, 0, 1, 2, 3, 4, 5, 6, null, 8, 9, null, 11, 12, 13, 14);
+        ValueVectorDataPopulator.setVector(
+            expected, 0, 1, 2, 3, 4, 5, 6, null, 8, 9, null, 11, 12, 13, 14);
         assertVectorsEqual(expected, target);
       }
     }
@@ -106,7 +103,7 @@ public void testAppendBitVector() {
     final int length1 = 10;
     final int length2 = 5;
     try (BitVector target = new BitVector("", allocator);
-         BitVector delta = new BitVector("", allocator)) {
+        BitVector delta = new BitVector("", allocator)) {
 
       target.allocateNew(length1);
       delta.allocateNew(length2);
@@ -121,7 +118,8 @@ public void testAppendBitVector() {
 
       try (BitVector expected = new BitVector("expected", allocator)) {
         expected.allocateNew();
-        ValueVectorDataPopulator.setVector(expected, 0, 1, 0, 1, 0, 1, 0, null, 0, 1, null, 1, 1, 0, 0);
+        ValueVectorDataPopulator.setVector(
+            expected, 0, 1, 0, 1, 0, 1, 0, null, 0, 1, null, 1, 1, 0, 0);
         assertVectorsEqual(expected, target);
       }
     }
@@ -130,7 +128,7 @@ public void testAppendBitVector() {
   @Test
   public void testAppendEmptyFixedWidthVector() {
     try (IntVector target = new IntVector("", allocator);
-         IntVector delta = new IntVector("", allocator)) {
+        IntVector delta = new IntVector("", allocator)) {
 
       ValueVectorDataPopulator.setVector(target, 0, 1, 2, 3, 4, 5, 6, null, 8, 9);
 
@@ -151,12 +149,13 @@ public void testAppendVariableWidthVector() {
     final int length1 = 10;
     final int length2 = 5;
     try (VarCharVector target = new VarCharVector("", allocator);
-         VarCharVector delta = new VarCharVector("", allocator)) {
+        VarCharVector delta = new VarCharVector("", allocator)) {
 
       target.allocateNew(5, length1);
       delta.allocateNew(5, length2);
 
-      ValueVectorDataPopulator.setVector(target, "a0", "a1", "a2", "a3", null, "a5", "a6", "a7", "a8", "a9");
+      ValueVectorDataPopulator.setVector(
+          target, "a0", "a1", "a2", "a3", null, "a5", "a6", "a7", "a8", "a9");
       ValueVectorDataPopulator.setVector(delta, "a10", "a11", "a12", "a13", null);
 
       VectorAppender appender = new VectorAppender(target);
@@ -164,8 +163,9 @@ public void testAppendVariableWidthVector() {
 
       try (VarCharVector expected = new VarCharVector("expected", allocator)) {
         expected.allocateNew();
-        ValueVectorDataPopulator.setVector(expected,
-            "a0", "a1", "a2", "a3", null, "a5", "a6", "a7", "a8", "a9", "a10", "a11", "a12", "a13", null);
+        ValueVectorDataPopulator.setVector(
+            expected, "a0", "a1", "a2", "a3", null, "a5", "a6", "a7", "a8", "a9", "a10", "a11",
+            "a12", "a13", null);
         assertVectorsEqual(expected, target);
       }
     }
@@ -174,16 +174,17 @@ public void testAppendVariableWidthVector() {
   @Test
   public void testAppendEmptyVariableWidthVector() {
     try (VarCharVector target = new VarCharVector("", allocator);
-         VarCharVector delta = new VarCharVector("", allocator)) {
+        VarCharVector delta = new VarCharVector("", allocator)) {
 
-      ValueVectorDataPopulator.setVector(target, "a0", "a1", "a2", "a3", null, "a5", "a6", "a7", "a8", "a9");
+      ValueVectorDataPopulator.setVector(
+          target, "a0", "a1", "a2", "a3", null, "a5", "a6", "a7", "a8", "a9");
 
       VectorAppender appender = new VectorAppender(target);
       delta.accept(appender, null);
 
       try (VarCharVector expected = new VarCharVector("expected", allocator)) {
-        ValueVectorDataPopulator.setVector(expected,
-            "a0", "a1", "a2", "a3", null, "a5", "a6", "a7", "a8", "a9");
+        ValueVectorDataPopulator.setVector(
+            expected, "a0", "a1", "a2", "a3", null, "a5", "a6", "a7", "a8", "a9");
         assertVectorsEqual(expected, target);
       }
     }
@@ -215,21 +216,23 @@ public void testAppendLargeVariableWidthVector() {
     final int length1 = 5;
     final int length2 = 10;
     try (LargeVarCharVector target = new LargeVarCharVector("", allocator);
-         LargeVarCharVector delta = new LargeVarCharVector("", allocator)) {
+        LargeVarCharVector delta = new LargeVarCharVector("", allocator)) {
 
       target.allocateNew(5, length1);
       delta.allocateNew(5, length2);
 
       ValueVectorDataPopulator.setVector(target, "a0", null, "a2", "a3", null);
-      ValueVectorDataPopulator.setVector(delta, "a5", "a6", "a7", null, null, "a10", "a11", "a12", "a13", null);
+      ValueVectorDataPopulator.setVector(
+          delta, "a5", "a6", "a7", null, null, "a10", "a11", "a12", "a13", null);
 
       VectorAppender appender = new VectorAppender(target);
       delta.accept(appender, null);
 
       try (LargeVarCharVector expected = new LargeVarCharVector("expected", allocator)) {
         expected.allocateNew();
-        ValueVectorDataPopulator.setVector(expected,
-                "a0", null, "a2", "a3", null, "a5", "a6", "a7", null, null, "a10", "a11", "a12", "a13", null);
+        ValueVectorDataPopulator.setVector(
+            expected, "a0", null, "a2", "a3", null, "a5", "a6", "a7", null, null, "a10", "a11",
+            "a12", "a13", null);
         assertVectorsEqual(expected, target);
       }
     }
@@ -238,7 +241,7 @@ public void testAppendLargeVariableWidthVector() {
   @Test
   public void testAppendEmptyLargeVariableWidthVector() {
     try (LargeVarCharVector target = new LargeVarCharVector("", allocator);
-         LargeVarCharVector delta = new LargeVarCharVector("", allocator)) {
+        LargeVarCharVector delta = new LargeVarCharVector("", allocator)) {
 
       ValueVectorDataPopulator.setVector(target, "a0", null, "a2", "a3", null);
 
@@ -257,10 +260,11 @@ public void testAppendListVector() {
     final int length1 = 5;
     final int length2 = 2;
     try (ListVector target = ListVector.empty("target", allocator);
-         ListVector delta = ListVector.empty("delta", allocator)) {
+        ListVector delta = ListVector.empty("delta", allocator)) {
 
       target.allocateNew();
-      ValueVectorDataPopulator.setVector(target,
+      ValueVectorDataPopulator.setVector(
+          target,
           Arrays.asList(0, 1),
           Arrays.asList(2, 3),
           null,
@@ -269,9 +273,8 @@ public void testAppendListVector() {
       assertEquals(length1, target.getValueCount());
 
       delta.allocateNew();
-      ValueVectorDataPopulator.setVector(delta,
-          Arrays.asList(10, 11, 12, 13, 14),
-          Arrays.asList(15, 16, 17, 18, 19));
+      ValueVectorDataPopulator.setVector(
+          delta, Arrays.asList(10, 11, 12, 13, 14), Arrays.asList(15, 16, 17, 18, 19));
       assertEquals(length2, delta.getValueCount());
 
       VectorAppender appender = new VectorAppender(target);
@@ -304,13 +307,10 @@ public void testAppendListVector() {
   @Test
   public void testAppendEmptyListVector() {
     try (ListVector target = ListVector.empty("target", allocator);
-         ListVector delta = ListVector.empty("delta", allocator)) {
+        ListVector delta = ListVector.empty("delta", allocator)) {
       // populate target with data
-      ValueVectorDataPopulator.setVector(target,
-          Arrays.asList(0, 1),
-          Arrays.asList(2, 3),
-          null,
-          Arrays.asList(6, 7));
+      ValueVectorDataPopulator.setVector(
+          target, Arrays.asList(0, 1), Arrays.asList(2, 3), null, Arrays.asList(6, 7));
       assertEquals(4, target.getValueCount());
 
       // leave delta vector empty and unallocated
@@ -338,18 +338,15 @@ public void testAppendEmptyListVector() {
   @Test
   public void testAppendFixedSizeListVector() {
     try (FixedSizeListVector target = FixedSizeListVector.empty("target", 5, allocator);
-         FixedSizeListVector delta = FixedSizeListVector.empty("delta", 5, allocator)) {
+        FixedSizeListVector delta = FixedSizeListVector.empty("delta", 5, allocator)) {
 
       target.allocateNew();
-      ValueVectorDataPopulator.setVector(target,
-          Arrays.asList(0, 1, 2, 3, 4),
-          null);
+      ValueVectorDataPopulator.setVector(target, Arrays.asList(0, 1, 2, 3, 4), null);
       assertEquals(2, target.getValueCount());
 
       delta.allocateNew();
-      ValueVectorDataPopulator.setVector(delta,
-          Arrays.asList(10, 11, 12, 13, 14),
-          Arrays.asList(15, 16, 17, 18, 19));
+      ValueVectorDataPopulator.setVector(
+          delta, Arrays.asList(10, 11, 12, 13, 14), Arrays.asList(15, 16, 17, 18, 19));
       assertEquals(2, delta.getValueCount());
 
       VectorAppender appender = new VectorAppender(target);
@@ -367,11 +364,9 @@ public void testAppendFixedSizeListVector() {
   @Test
   public void testAppendEmptyFixedSizeListVector() {
     try (FixedSizeListVector target = FixedSizeListVector.empty("target", 5, allocator);
-         FixedSizeListVector delta = FixedSizeListVector.empty("delta", 5, allocator)) {
+        FixedSizeListVector delta = FixedSizeListVector.empty("delta", 5, allocator)) {
 
-      ValueVectorDataPopulator.setVector(target,
-          Arrays.asList(0, 1, 2, 3, 4),
-          null);
+      ValueVectorDataPopulator.setVector(target, Arrays.asList(0, 1, 2, 3, 4), null);
       assertEquals(2, target.getValueCount());
 
       // leave delta vector empty and unallocated
@@ -390,11 +385,9 @@ public void testAppendEmptyFixedSizeListVector() {
   @Test
   public void testAppendEmptyLargeListVector() {
     try (LargeListVector target = LargeListVector.empty("target", allocator);
-         LargeListVector delta = LargeListVector.empty("delta", allocator)) {
+        LargeListVector delta = LargeListVector.empty("delta", allocator)) {
 
-      ValueVectorDataPopulator.setVector(target,
-          Arrays.asList(0, 1, 2, 3, 4),
-          null);
+      ValueVectorDataPopulator.setVector(target, Arrays.asList(0, 1, 2, 3, 4), null);
       assertEquals(2, target.getValueCount());
 
       // leave delta vector empty and unallocated
@@ -415,18 +408,23 @@ public void testAppendStructVector() {
     final int length1 = 10;
     final int length2 = 5;
     try (final StructVector target = StructVector.empty("target", allocator);
-         final StructVector delta = StructVector.empty("delta", allocator)) {
+        final StructVector delta = StructVector.empty("delta", allocator)) {
 
-      IntVector targetChild1 = target.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
-      VarCharVector targetChild2 = target.addOrGet("f1", FieldType.nullable(new ArrowType.Utf8()), VarCharVector.class);
+      IntVector targetChild1 =
+          target.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
+      VarCharVector targetChild2 =
+          target.addOrGet("f1", FieldType.nullable(new ArrowType.Utf8()), VarCharVector.class);
       targetChild1.allocateNew();
       targetChild2.allocateNew();
       ValueVectorDataPopulator.setVector(targetChild1, 0, 1, 2, 3, 4, null, 6, 7, 8, 9);
-      ValueVectorDataPopulator.setVector(targetChild2, "a0", "a1", "a2", "a3", "a4", "a5", "a6", null, "a8", "a9");
+      ValueVectorDataPopulator.setVector(
+          targetChild2, "a0", "a1", "a2", "a3", "a4", "a5", "a6", null, "a8", "a9");
       target.setValueCount(length1);
 
-      IntVector deltaChild1 = delta.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
-      VarCharVector deltaChild2 = delta.addOrGet("f1", FieldType.nullable(new ArrowType.Utf8()), VarCharVector.class);
+      IntVector deltaChild1 =
+          delta.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
+      VarCharVector deltaChild2 =
+          delta.addOrGet("f1", FieldType.nullable(new ArrowType.Utf8()), VarCharVector.class);
       deltaChild1.allocateNew();
       deltaChild2.allocateNew();
       ValueVectorDataPopulator.setVector(deltaChild1, 10, 11, 12, null, 14);
@@ -439,13 +437,15 @@ public void testAppendStructVector() {
       assertEquals(length1 + length2, target.getValueCount());
 
       try (IntVector expected1 = new IntVector("expected1", allocator);
-           VarCharVector expected2 = new VarCharVector("expected2", allocator)) {
+          VarCharVector expected2 = new VarCharVector("expected2", allocator)) {
         expected1.allocateNew();
         expected2.allocateNew();
 
-        ValueVectorDataPopulator.setVector(expected1, 0, 1, 2, 3, 4, null, 6, 7, 8, 9, 10, 11, 12, null, 14);
-        ValueVectorDataPopulator.setVector(expected2,
-            "a0", "a1", "a2", "a3", "a4", "a5", "a6", null, "a8", "a9", "a10", "a11", "a12", "a13", "a14");
+        ValueVectorDataPopulator.setVector(
+            expected1, 0, 1, 2, 3, 4, null, 6, 7, 8, 9, 10, 11, 12, null, 14);
+        ValueVectorDataPopulator.setVector(
+            expected2, "a0", "a1", "a2", "a3", "a4", "a5", "a6", null, "a8", "a9", "a10", "a11",
+            "a12", "a13", "a14");
 
         assertVectorsEqual(expected1, target.getChild("f0"));
         assertVectorsEqual(expected2, target.getChild("f1"));
@@ -456,12 +456,15 @@ public void testAppendStructVector() {
   @Test
   public void testAppendEmptyStructVector() {
     try (final StructVector target = StructVector.empty("target", allocator);
-         final StructVector delta = StructVector.empty("delta", allocator)) {
+        final StructVector delta = StructVector.empty("delta", allocator)) {
 
-      IntVector targetChild1 = target.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
-      VarCharVector targetChild2 = target.addOrGet("f1", FieldType.nullable(new ArrowType.Utf8()), VarCharVector.class);
+      IntVector targetChild1 =
+          target.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
+      VarCharVector targetChild2 =
+          target.addOrGet("f1", FieldType.nullable(new ArrowType.Utf8()), VarCharVector.class);
       ValueVectorDataPopulator.setVector(targetChild1, 0, 1, 2, 3, 4, null, 6, 7, 8, 9);
-      ValueVectorDataPopulator.setVector(targetChild2, "a0", "a1", "a2", "a3", "a4", "a5", "a6", null, "a8", "a9");
+      ValueVectorDataPopulator.setVector(
+          targetChild2, "a0", "a1", "a2", "a3", "a4", "a5", "a6", null, "a8", "a9");
       target.setValueCount(10);
 
       // leave delta vector fields empty and unallocated
@@ -474,10 +477,10 @@ public void testAppendEmptyStructVector() {
       assertEquals(10, target.getValueCount());
 
       try (IntVector expected1 = new IntVector("expected1", allocator);
-           VarCharVector expected2 = new VarCharVector("expected2", allocator)) {
+          VarCharVector expected2 = new VarCharVector("expected2", allocator)) {
         ValueVectorDataPopulator.setVector(expected1, 0, 1, 2, 3, 4, null, 6, 7, 8, 9);
-        ValueVectorDataPopulator.setVector(expected2,
-            "a0", "a1", "a2", "a3", "a4", "a5", "a6", null, "a8", "a9");
+        ValueVectorDataPopulator.setVector(
+            expected2, "a0", "a1", "a2", "a3", "a4", "a5", "a6", null, "a8", "a9");
 
         assertVectorsEqual(expected1, target.getChild("f0"));
         assertVectorsEqual(expected2, target.getChild("f1"));
@@ -491,7 +494,7 @@ public void testAppendUnionVector() {
     final int length2 = 5;
 
     try (final UnionVector target = UnionVector.empty("target", allocator);
-         final UnionVector delta = UnionVector.empty("delta", allocator)) {
+        final UnionVector delta = UnionVector.empty("delta", allocator)) {
 
       // alternating ints and big ints
       target.setType(0, Types.MinorType.INT);
@@ -519,14 +522,52 @@ public void testAppendUnionVector() {
       targetIntVec.allocateNew();
       ValueVectorDataPopulator.setVector(
           targetIntVec,
-          0, null, 1, null, 2, null, 3, null, 4, null, 5, null, 6, null, 7, null, 8, null, 9, null);
+          0,
+          null,
+          1,
+          null,
+          2,
+          null,
+          3,
+          null,
+          4,
+          null,
+          5,
+          null,
+          6,
+          null,
+          7,
+          null,
+          8,
+          null,
+          9,
+          null);
       assertEquals(length1 * 2, targetIntVec.getValueCount());
 
       BigIntVector targetBigIntVec = target.getBigIntVector();
       targetBigIntVec.allocateNew();
       ValueVectorDataPopulator.setVector(
           targetBigIntVec,
-          null, 0L, null, 1L, null, 2L, null, 3L, null, 4L, null, 5L, null, 6L, null, 7L, null, 8L, null, 9L);
+          null,
+          0L,
+          null,
+          1L,
+          null,
+          2L,
+          null,
+          3L,
+          null,
+          4L,
+          null,
+          5L,
+          null,
+          6L,
+          null,
+          7L,
+          null,
+          8L,
+          null,
+          9L);
       assertEquals(length1 * 2, targetBigIntVec.getValueCount());
 
       target.setValueCount(length1 * 2);
@@ -572,7 +613,7 @@ public void testAppendEmptyUnionVector() {
     final int length1 = 10;
 
     try (final UnionVector target = UnionVector.empty("target", allocator);
-         final UnionVector delta = UnionVector.empty("delta", allocator)) {
+        final UnionVector delta = UnionVector.empty("delta", allocator)) {
 
       // alternating ints and big ints
       target.setType(0, Types.MinorType.INT);
@@ -599,13 +640,51 @@ public void testAppendEmptyUnionVector() {
       IntVector targetIntVec = target.getIntVector();
       ValueVectorDataPopulator.setVector(
           targetIntVec,
-          0, null, 1, null, 2, null, 3, null, 4, null, 5, null, 6, null, 7, null, 8, null, 9, null);
+          0,
+          null,
+          1,
+          null,
+          2,
+          null,
+          3,
+          null,
+          4,
+          null,
+          5,
+          null,
+          6,
+          null,
+          7,
+          null,
+          8,
+          null,
+          9,
+          null);
       assertEquals(length1 * 2, targetIntVec.getValueCount());
 
       BigIntVector targetBigIntVec = target.getBigIntVector();
       ValueVectorDataPopulator.setVector(
           targetBigIntVec,
-          null, 0L, null, 1L, null, 2L, null, 3L, null, 4L, null, 5L, null, 6L, null, 7L, null, 8L, null, 9L);
+          null,
+          0L,
+          null,
+          1L,
+          null,
+          2L,
+          null,
+          3L,
+          null,
+          4L,
+          null,
+          5L,
+          null,
+          6L,
+          null,
+          7L,
+          null,
+          8L,
+          null,
+          9L);
       assertEquals(length1 * 2, targetBigIntVec.getValueCount());
 
       target.setValueCount(length1 * 2);
@@ -651,20 +730,22 @@ private DenseUnionVector getTargetVector() {
       targetVector.reAlloc();
     }
 
-    byte intTypeId = targetVector.registerNewTypeId(Field.nullable("", Types.MinorType.INT.getType()));
+    byte intTypeId =
+        targetVector.registerNewTypeId(Field.nullable("", Types.MinorType.INT.getType()));
     targetVector.setTypeId(0, intTypeId);
     intHolder.value = 1;
     targetVector.setSafe(0, intHolder);
     targetVector.setTypeId(1, intTypeId);
     intHolder.value = 2;
     targetVector.setSafe(1, intHolder);
-    byte longTypeId = targetVector.registerNewTypeId(Field.nullable("", Types.MinorType.BIGINT.getType()));
+    byte longTypeId =
+        targetVector.registerNewTypeId(Field.nullable("", Types.MinorType.BIGINT.getType()));
     targetVector.setTypeId(3, longTypeId);
     longHolder.value = 10L;
     targetVector.setSafe(3, longHolder);
     targetVector.setValueCount(4);
 
-    assertVectorValuesEqual(targetVector, new Object[]{1, 2, null, 10L});
+    assertVectorValuesEqual(targetVector, new Object[] {1, 2, null, 10L});
     return targetVector;
   }
 
@@ -683,29 +764,32 @@ private DenseUnionVector getDeltaVector() {
     while (deltaVector.getValueCapacity() < 4) {
       deltaVector.reAlloc();
     }
-    byte intTypeId = deltaVector.registerNewTypeId(Field.nullable("", Types.MinorType.INT.getType()));
+    byte intTypeId =
+        deltaVector.registerNewTypeId(Field.nullable("", Types.MinorType.INT.getType()));
     deltaVector.setTypeId(0, intTypeId);
     intHolder.value = 7;
     deltaVector.setSafe(0, intHolder);
-    byte longTypeId = deltaVector.registerNewTypeId(Field.nullable("", Types.MinorType.BIGINT.getType()));
+    byte longTypeId =
+        deltaVector.registerNewTypeId(Field.nullable("", Types.MinorType.BIGINT.getType()));
     deltaVector.setTypeId(2, longTypeId);
     longHolder.value = 8L;
     deltaVector.setSafe(2, longHolder);
-    byte floatTypeId = deltaVector.registerNewTypeId(Field.nullable("", Types.MinorType.FLOAT4.getType()));
+    byte floatTypeId =
+        deltaVector.registerNewTypeId(Field.nullable("", Types.MinorType.FLOAT4.getType()));
     deltaVector.setTypeId(3, floatTypeId);
     floatHolder.value = 9.0f;
     deltaVector.setSafe(3, floatHolder);
 
     deltaVector.setValueCount(4);
 
-    assertVectorValuesEqual(deltaVector, new Object[]{7, null, 8L, 9.0f});
+    assertVectorValuesEqual(deltaVector, new Object[] {7, null, 8L, 9.0f});
     return deltaVector;
   }
 
   @Test
   public void testAppendDenseUnionVector() {
     try (DenseUnionVector targetVector = getTargetVector();
-         DenseUnionVector deltaVector = getDeltaVector()) {
+        DenseUnionVector deltaVector = getDeltaVector()) {
 
       // append
       VectorAppender appender = new VectorAppender(targetVector);
@@ -715,7 +799,7 @@ public void testAppendDenseUnionVector() {
 
     // test reverse append
     try (DenseUnionVector targetVector = getTargetVector();
-         DenseUnionVector deltaVector = getDeltaVector()) {
+        DenseUnionVector deltaVector = getDeltaVector()) {
 
       // append
       VectorAppender appender = new VectorAppender(deltaVector);
@@ -728,13 +812,16 @@ private DenseUnionVector getEmptyDeltaVector() {
     // create a vector, but leave it empty and uninitialized
     DenseUnionVector deltaVector = new DenseUnionVector("target vector", allocator, null, null);
 
-    byte intTypeId = deltaVector.registerNewTypeId(Field.nullable("", Types.MinorType.INT.getType()));
+    byte intTypeId =
+        deltaVector.registerNewTypeId(Field.nullable("", Types.MinorType.INT.getType()));
     deltaVector.setTypeId(0, intTypeId);
 
-    byte longTypeId = deltaVector.registerNewTypeId(Field.nullable("", Types.MinorType.BIGINT.getType()));
+    byte longTypeId =
+        deltaVector.registerNewTypeId(Field.nullable("", Types.MinorType.BIGINT.getType()));
     deltaVector.setTypeId(2, longTypeId);
 
-    byte floatTypeId = deltaVector.registerNewTypeId(Field.nullable("", Types.MinorType.FLOAT4.getType()));
+    byte floatTypeId =
+        deltaVector.registerNewTypeId(Field.nullable("", Types.MinorType.FLOAT4.getType()));
     deltaVector.setTypeId(3, floatTypeId);
 
     return deltaVector;
@@ -743,7 +830,7 @@ private DenseUnionVector getEmptyDeltaVector() {
   @Test
   public void testAppendEmptyDenseUnionVector() {
     try (DenseUnionVector targetVector = getTargetVector();
-         DenseUnionVector deltaVector = getEmptyDeltaVector()) {
+        DenseUnionVector deltaVector = getEmptyDeltaVector()) {
 
       // append
       VectorAppender appender = new VectorAppender(targetVector);
@@ -752,9 +839,7 @@ public void testAppendEmptyDenseUnionVector() {
     }
   }
 
-  /**
-   * Test appending dense union vectors where the child vectors do not match.
-   */
+  /** Test appending dense union vectors where the child vectors do not match. */
   @Test
   public void testAppendDenseUnionVectorMismatch() {
     final NullableIntHolder intHolder = new NullableIntHolder();
@@ -766,8 +851,10 @@ public void testAppendDenseUnionVectorMismatch() {
     final NullableFloat4Holder floatHolder = new NullableFloat4Holder();
     floatHolder.isSet = 1;
 
-    try (DenseUnionVector targetVector = new DenseUnionVector("target vector" , allocator, null, null);
-         DenseUnionVector deltaVector = new DenseUnionVector("target vector" , allocator, null, null)) {
+    try (DenseUnionVector targetVector =
+            new DenseUnionVector("target vector", allocator, null, null);
+        DenseUnionVector deltaVector =
+            new DenseUnionVector("target vector", allocator, null, null)) {
       targetVector.allocateNew();
       deltaVector.allocateNew();
 
@@ -775,11 +862,13 @@ public void testAppendDenseUnionVectorMismatch() {
       while (targetVector.getValueCapacity() < 2) {
         targetVector.reAlloc();
       }
-      byte intTypeId = targetVector.registerNewTypeId(Field.nullable("", Types.MinorType.INT.getType()));
+      byte intTypeId =
+          targetVector.registerNewTypeId(Field.nullable("", Types.MinorType.INT.getType()));
       targetVector.setTypeId(0, intTypeId);
       intHolder.value = 1;
       targetVector.setSafe(0, intHolder);
-      byte longTypeId = targetVector.registerNewTypeId(Field.nullable("", Types.MinorType.BIGINT.getType()));
+      byte longTypeId =
+          targetVector.registerNewTypeId(Field.nullable("", Types.MinorType.BIGINT.getType()));
       targetVector.setTypeId(1, longTypeId);
       longHolder.value = 2L;
       targetVector.setSafe(1, longHolder);
@@ -795,7 +884,8 @@ public void testAppendDenseUnionVectorMismatch() {
       deltaVector.setTypeId(0, intTypeId);
       intHolder.value = 3;
       deltaVector.setSafe(0, intHolder);
-      byte floatTypeId = deltaVector.registerNewTypeId(Field.nullable("", Types.MinorType.FLOAT4.getType()));
+      byte floatTypeId =
+          deltaVector.registerNewTypeId(Field.nullable("", Types.MinorType.FLOAT4.getType()));
       deltaVector.setTypeId(1, floatTypeId);
       floatHolder.value = 5.0f;
       deltaVector.setSafe(1, floatHolder);
@@ -805,8 +895,7 @@ public void testAppendDenseUnionVectorMismatch() {
 
       // append
       VectorAppender appender = new VectorAppender(targetVector);
-      assertThrows(IllegalArgumentException.class,
-          () -> deltaVector.accept(appender, null));
+      assertThrows(IllegalArgumentException.class, () -> deltaVector.accept(appender, null));
     }
   }
 
@@ -814,15 +903,14 @@ public void testAppendDenseUnionVectorMismatch() {
   public void testAppendVectorNegative() {
     final int vectorLength = 10;
     try (IntVector target = new IntVector("", allocator);
-         VarCharVector delta = new VarCharVector("", allocator)) {
+        VarCharVector delta = new VarCharVector("", allocator)) {
 
       target.allocateNew(vectorLength);
       delta.allocateNew(vectorLength);
 
       VectorAppender appender = new VectorAppender(target);
 
-      assertThrows(IllegalArgumentException.class,
-          () -> delta.accept(appender, null));
+      assertThrows(IllegalArgumentException.class, () -> delta.accept(appender, null));
     }
   }
 
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/util/TestVectorBatchAppender.java b/java/vector/src/test/java/org/apache/arrow/vector/util/TestVectorBatchAppender.java
index 799c25c0ad71c..d5355bd6cb0cc 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/util/TestVectorBatchAppender.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/util/TestVectorBatchAppender.java
@@ -14,32 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.IntVector;
 import org.apache.arrow.vector.testing.ValueVectorDataPopulator;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link VectorBatchAppender}.
- */
+/** Test cases for {@link VectorBatchAppender}. */
 public class TestVectorBatchAppender {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -50,8 +47,8 @@ public void testBatchAppendIntVector() {
     final int length2 = 5;
     final int length3 = 7;
     try (IntVector target = new IntVector("", allocator);
-         IntVector delta1 = new IntVector("", allocator);
-         IntVector delta2 = new IntVector("", allocator)) {
+        IntVector delta1 = new IntVector("", allocator);
+        IntVector delta2 = new IntVector("", allocator)) {
 
       target.allocateNew(length1);
       delta1.allocateNew(length2);
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/util/TestVectorSchemaRootAppender.java b/java/vector/src/test/java/org/apache/arrow/vector/util/TestVectorSchemaRootAppender.java
index 6309d385870c9..cfc70c2227a41 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/util/TestVectorSchemaRootAppender.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/util/TestVectorSchemaRootAppender.java
@@ -14,11 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.util;
 
-import static junit.framework.TestCase.assertEquals;
 import static org.apache.arrow.vector.util.TestVectorAppender.assertVectorsEqual;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.apache.arrow.memory.BufferAllocator;
@@ -28,23 +27,21 @@
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.testing.ValueVectorDataPopulator;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link VectorSchemaRootAppender}.
- */
+/** Test cases for {@link VectorSchemaRootAppender}. */
 public class TestVectorSchemaRootAppender {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void prepare() {
     allocator = new RootAllocator(1024 * 1024);
   }
 
-  @After
+  @AfterEach
   public void shutdown() {
     allocator.close();
   }
@@ -56,16 +53,14 @@ public void testVectorSchemaRootAppend() {
     final int length3 = 2;
 
     try (IntVector targetChild1 = new IntVector("t1", allocator);
-         VarCharVector targetChild2 = new VarCharVector("t2", allocator);
-         BigIntVector targetChild3 = new BigIntVector("t3", allocator);
-
-         IntVector deltaChildOne1 = new IntVector("do1", allocator);
-         VarCharVector deltaChildOne2 = new VarCharVector("do2", allocator);
-         BigIntVector deltaChildOne3 = new BigIntVector("do3", allocator);
-
-         IntVector deltaChildTwo1 = new IntVector("dt1", allocator);
-         VarCharVector deltaChildTwo2 = new VarCharVector("dt2", allocator);
-         BigIntVector deltaChildTwo3 = new BigIntVector("dt3", allocator)) {
+        VarCharVector targetChild2 = new VarCharVector("t2", allocator);
+        BigIntVector targetChild3 = new BigIntVector("t3", allocator);
+        IntVector deltaChildOne1 = new IntVector("do1", allocator);
+        VarCharVector deltaChildOne2 = new VarCharVector("do2", allocator);
+        BigIntVector deltaChildOne3 = new BigIntVector("do3", allocator);
+        IntVector deltaChildTwo1 = new IntVector("dt1", allocator);
+        VarCharVector deltaChildTwo2 = new VarCharVector("dt2", allocator);
+        BigIntVector deltaChildTwo3 = new BigIntVector("dt3", allocator)) {
 
       ValueVectorDataPopulator.setVector(targetChild1, 0, 1, null, 3, 4);
       ValueVectorDataPopulator.setVector(targetChild2, "zero", "one", null, "three", "four");
@@ -90,13 +85,14 @@ public void testVectorSchemaRootAppend() {
       assertEquals(3, root1.getFieldVectors().size());
 
       try (IntVector expected1 = new IntVector("", allocator);
-           VarCharVector expected2 = new VarCharVector("", allocator);
-           BigIntVector expected3 = new BigIntVector("", allocator)) {
+          VarCharVector expected2 = new VarCharVector("", allocator);
+          BigIntVector expected3 = new BigIntVector("", allocator)) {
 
         ValueVectorDataPopulator.setVector(expected1, 0, 1, null, 3, 4, 5, 6, 7, null, 9);
         ValueVectorDataPopulator.setVector(
             expected2, "zero", "one", null, "three", "four", "five", "six", "seven", null, "nine");
-        ValueVectorDataPopulator.setVector(expected3, 0L, 10L, null, 30L, 40L, 50L, 60L, 70L, null, 90L);
+        ValueVectorDataPopulator.setVector(
+            expected3, 0L, 10L, null, 30L, 40L, 50L, 60L, 70L, null, 90L);
 
         assertVectorsEqual(expected1, root1.getVector(0));
         assertVectorsEqual(expected2, root1.getVector(1));
@@ -108,11 +104,10 @@ public void testVectorSchemaRootAppend() {
   @Test
   public void testRootWithDifferentChildCounts() {
     try (IntVector targetChild1 = new IntVector("t1", allocator);
-         VarCharVector targetChild2 = new VarCharVector("t2", allocator);
-         BigIntVector targetChild3 = new BigIntVector("t3", allocator);
-
-         IntVector deltaChild1 = new IntVector("d1", allocator);
-         VarCharVector deltaChild2 = new VarCharVector("d2", allocator)) {
+        VarCharVector targetChild2 = new VarCharVector("t2", allocator);
+        BigIntVector targetChild3 = new BigIntVector("t3", allocator);
+        IntVector deltaChild1 = new IntVector("d1", allocator);
+        VarCharVector deltaChild2 = new VarCharVector("d2", allocator)) {
 
       ValueVectorDataPopulator.setVector(targetChild1, 0, 1, null, 3, 4);
       ValueVectorDataPopulator.setVector(targetChild2, "zero", "one", null, "three", "four");
@@ -125,20 +120,21 @@ public void testRootWithDifferentChildCounts() {
       VectorSchemaRoot root2 = VectorSchemaRoot.of(deltaChild1, deltaChild2);
       root2.setRowCount(3);
 
-      IllegalArgumentException exp = assertThrows(IllegalArgumentException.class,
-          () -> VectorSchemaRootAppender.append(root1, root2));
+      IllegalArgumentException exp =
+          assertThrows(
+              IllegalArgumentException.class, () -> VectorSchemaRootAppender.append(root1, root2));
 
-      assertEquals("Vector schema roots have different numbers of child vectors.", exp.getMessage());
+      assertEquals(
+          "Vector schema roots have different numbers of child vectors.", exp.getMessage());
     }
   }
 
   @Test
   public void testRootWithDifferentChildTypes() {
     try (IntVector targetChild1 = new IntVector("t1", allocator);
-         VarCharVector targetChild2 = new VarCharVector("t2", allocator);
-
-         IntVector deltaChild1 = new IntVector("d1", allocator);
-         VarCharVector deltaChild2 = new VarCharVector("d2", allocator)) {
+        VarCharVector targetChild2 = new VarCharVector("t2", allocator);
+        IntVector deltaChild1 = new IntVector("d1", allocator);
+        VarCharVector deltaChild2 = new VarCharVector("d2", allocator)) {
 
       ValueVectorDataPopulator.setVector(targetChild1, 0, 1, null, 3, 4);
       ValueVectorDataPopulator.setVector(targetChild2, "zero", "one", null, "three", "four");
@@ -152,8 +148,9 @@ public void testRootWithDifferentChildTypes() {
       VectorSchemaRoot root2 = VectorSchemaRoot.of(deltaChild2, deltaChild1);
       root2.setRowCount(3);
 
-      IllegalArgumentException exp = assertThrows(IllegalArgumentException.class,
-          () -> VectorSchemaRootAppender.append(root1, root2));
+      IllegalArgumentException exp =
+          assertThrows(
+              IllegalArgumentException.class, () -> VectorSchemaRootAppender.append(root1, root2));
 
       assertEquals("Vector schema roots have different schemas.", exp.getMessage());
     }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVector.java b/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVector.java
index 20492036dab99..60c4c3a9bc6d2 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVector.java
@@ -14,17 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.validate;
 
 import static org.apache.arrow.vector.testing.ValueVectorDataPopulator.setVector;
 import static org.apache.arrow.vector.util.ValueVectorUtility.validate;
-import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.Charset;
 import java.util.Arrays;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.BigIntVector;
@@ -44,15 +42,15 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestValidateVector {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
@@ -62,7 +60,7 @@ public void init() {
   private static final byte[] STR2 = "BBBBBBBBB2".getBytes(utf8Charset);
   private static final byte[] STR3 = "CCCC3".getBytes(utf8Charset);
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -75,8 +73,8 @@ public void testBaseFixedWidthVector() {
       validate(vector);
 
       vector.getDataBuffer().capacity(0);
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validate(vector));
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validate(vector));
       assertTrue(e.getMessage().contains("Not enough capacity for fixed width data buffer"));
     }
   }
@@ -89,8 +87,8 @@ public void testBaseVariableWidthVector() {
       validate(vector);
 
       vector.getDataBuffer().capacity(0);
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validate(vector));
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validate(vector));
       assertTrue(e.getMessage().contains("Not enough capacity for data buffer"));
     }
   }
@@ -103,8 +101,8 @@ public void testBaseLargeVariableWidthVector() {
       validate(vector);
 
       vector.getDataBuffer().capacity(0);
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validate(vector));
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validate(vector));
       assertTrue(e.getMessage().contains("Not enough capacity for data buffer"));
     }
   }
@@ -117,8 +115,8 @@ public void testListVector() {
       validate(vector);
 
       vector.getDataVector().setValueCount(3);
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validate(vector));
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validate(vector));
       assertTrue(e.getMessage().contains("Inner vector does not contain enough elements."));
     }
   }
@@ -131,8 +129,8 @@ public void testLargeListVector() {
       validate(vector);
 
       vector.getDataVector().setValueCount(4);
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validate(vector));
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validate(vector));
       assertTrue(e.getMessage().contains("Inner vector does not contain enough elements."));
     }
   }
@@ -145,8 +143,8 @@ public void testFixedSizeListVector() {
       validate(vector);
 
       vector.getDataVector().setValueCount(3);
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validate(vector));
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validate(vector));
       assertTrue(e.getMessage().contains("Inner vector does not contain enough elements."));
     }
   }
@@ -170,16 +168,16 @@ public void testStructVectorRangeEquals() {
       writer.setValueCount(5);
 
       vector.getChild("f0").setValueCount(2);
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validate(vector));
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validate(vector));
       assertTrue(e.getMessage().contains("Struct vector length not equal to child vector length"));
 
       vector.getChild("f0").setValueCount(5);
       validate(vector);
 
       vector.getChild("f0").getDataBuffer().capacity(0);
-      ValidateUtil.ValidateException e2 = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validate(vector));
+      ValidateUtil.ValidateException e2 =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validate(vector));
       assertTrue(e2.getMessage().contains("Not enough capacity for fixed width data buffer"));
     }
   }
@@ -206,16 +204,16 @@ public void testUnionVector() {
       validate(vector);
 
       vector.getChildrenFromFields().get(0).setValueCount(1);
-      ValidateUtil.ValidateException e1 = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validate(vector));
+      ValidateUtil.ValidateException e1 =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validate(vector));
       assertTrue(e1.getMessage().contains("Union vector length not equal to child vector length"));
 
       vector.getChildrenFromFields().get(0).setValueCount(2);
       validate(vector);
 
       vector.getChildrenFromFields().get(0).getDataBuffer().capacity(0);
-      ValidateUtil.ValidateException e2 = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validate(vector));
+      ValidateUtil.ValidateException e2 =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validate(vector));
       assertTrue(e2.getMessage().contains("Not enough capacity for fixed width data buffer"));
     }
   }
@@ -233,8 +231,10 @@ public void testDenseUnionVector() {
       float8Holder.value = 2.02f;
       float8Holder.isSet = 1;
 
-      byte float4TypeId = vector.registerNewTypeId(Field.nullable("", Types.MinorType.FLOAT4.getType()));
-      byte float8TypeId = vector.registerNewTypeId(Field.nullable("", Types.MinorType.FLOAT8.getType()));
+      byte float4TypeId =
+          vector.registerNewTypeId(Field.nullable("", Types.MinorType.FLOAT4.getType()));
+      byte float8TypeId =
+          vector.registerNewTypeId(Field.nullable("", Types.MinorType.FLOAT8.getType()));
 
       vector.setTypeId(0, float4TypeId);
       vector.setSafe(0, float4Holder);
@@ -245,8 +245,8 @@ public void testDenseUnionVector() {
       validate(vector);
 
       vector.getChildrenFromFields().get(0).getDataBuffer().capacity(0);
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validate(vector));
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validate(vector));
       assertTrue(e.getMessage().contains("Not enough capacity for fixed width data buffer"));
     }
   }
@@ -259,8 +259,8 @@ public void testBaseFixedWidthVectorInstanceMethod() {
       vector.validate();
 
       vector.getDataBuffer().capacity(0);
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> vector.validate());
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, () -> vector.validate());
       assertTrue(e.getMessage().contains("Not enough capacity for fixed width data buffer"));
     }
   }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorFull.java b/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorFull.java
index ca71a622bb8ea..6993fde8fa509 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorFull.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorFull.java
@@ -14,18 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.validate;
 
 import static org.apache.arrow.vector.testing.ValueVectorDataPopulator.setVector;
 import static org.apache.arrow.vector.util.ValueVectorUtility.validateFull;
-import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
@@ -48,20 +46,20 @@
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
 import org.apache.arrow.vector.types.pojo.FieldType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestValidateVectorFull {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -77,9 +75,11 @@ public void testBaseVariableWidthVector() {
       offsetBuf.setInt(0, 100);
       offsetBuf.setInt(4, 50);
 
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validateFull(vector));
-      assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the offset buffer are decreasing"));
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validateFull(vector));
+      assertTrue(
+          e.getMessage()
+              .contains("The values in positions 0 and 1 of the offset buffer are decreasing"));
     }
   }
 
@@ -94,9 +94,12 @@ public void testBaseLargeVariableWidthVector() {
       offsetBuf.setLong(0, 100);
       offsetBuf.setLong(8, 50);
 
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validateFull(vector));
-      assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the large offset buffer are decreasing"));
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validateFull(vector));
+      assertTrue(
+          e.getMessage()
+              .contains(
+                  "The values in positions 0 and 1 of the large offset buffer are decreasing"));
     }
   }
 
@@ -111,9 +114,11 @@ public void testListVector() {
       offsetBuf.setInt(0, 100);
       offsetBuf.setInt(8, 50);
 
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validateFull(vector));
-      assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the offset buffer are decreasing"));
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validateFull(vector));
+      assertTrue(
+          e.getMessage()
+              .contains("The values in positions 0 and 1 of the offset buffer are decreasing"));
     }
   }
 
@@ -128,9 +133,12 @@ public void testLargeListVector() {
       offsetBuf.setLong(0, 100);
       offsetBuf.setLong(16, 50);
 
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validateFull(vector));
-      assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the large offset buffer are decreasing"));
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validateFull(vector));
+      assertTrue(
+          e.getMessage()
+              .contains(
+                  "The values in positions 0 and 1 of the large offset buffer are decreasing"));
     }
   }
 
@@ -158,13 +166,16 @@ public void testStructVectorRangeEquals() {
       offsetBuf.setInt(0, 100);
       offsetBuf.setInt(8, 50);
 
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validateFull(strVector));
-      assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the offset buffer are decreasing"));
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validateFull(strVector));
+      assertTrue(
+          e.getMessage()
+              .contains("The values in positions 0 and 1 of the offset buffer are decreasing"));
 
-      e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validateFull(vector));
-      assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the offset buffer are decreasing"));
+      e = assertThrows(ValidateUtil.ValidateException.class, () -> validateFull(vector));
+      assertTrue(
+          e.getMessage()
+              .contains("The values in positions 0 and 1 of the offset buffer are decreasing"));
     }
   }
 
@@ -192,8 +203,8 @@ public void testUnionVector() {
       // negative type id
       vector.getTypeBuffer().setByte(0, -1);
 
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validateFull(vector));
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validateFull(vector));
       assertTrue(e.getMessage().contains("The type id at position 0 is negative"));
     }
   }
@@ -211,8 +222,10 @@ public void testDenseUnionVector() {
       float8Holder.value = 2.02f;
       float8Holder.isSet = 1;
 
-      byte float4TypeId = vector.registerNewTypeId(Field.nullable("", Types.MinorType.FLOAT4.getType()));
-      byte float8TypeId = vector.registerNewTypeId(Field.nullable("", Types.MinorType.FLOAT8.getType()));
+      byte float4TypeId =
+          vector.registerNewTypeId(Field.nullable("", Types.MinorType.FLOAT4.getType()));
+      byte float8TypeId =
+          vector.registerNewTypeId(Field.nullable("", Types.MinorType.FLOAT8.getType()));
 
       vector.setTypeId(0, float4TypeId);
       vector.setSafe(0, float4Holder);
@@ -229,8 +242,8 @@ public void testDenseUnionVector() {
       // shrink sub-vector
       subVector.setValueCount(0);
 
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validateFull(vector));
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validateFull(vector));
       assertTrue(e.getMessage().contains("Dense union vector offset exceeds sub-vector boundary"));
     }
   }
@@ -246,9 +259,11 @@ public void testBaseVariableWidthVectorInstanceMethod() {
       offsetBuf.setInt(0, 100);
       offsetBuf.setInt(4, 50);
 
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          vector::validateFull);
-      assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the offset buffer are decreasing"));
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, vector::validateFull);
+      assertTrue(
+          e.getMessage()
+              .contains("The values in positions 0 and 1 of the offset buffer are decreasing"));
     }
   }
 
@@ -256,10 +271,13 @@ public void testBaseVariableWidthVectorInstanceMethod() {
   public void testValidateVarCharUTF8() {
     try (final VarCharVector vector = new VarCharVector("v", allocator)) {
       vector.validateFull();
-      setVector(vector, "aaa".getBytes(StandardCharsets.UTF_8), "bbb".getBytes(StandardCharsets.UTF_8),
+      setVector(
+          vector,
+          "aaa".getBytes(StandardCharsets.UTF_8),
+          "bbb".getBytes(StandardCharsets.UTF_8),
           new byte[] {(byte) 0xFF, (byte) 0xFE});
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          vector::validateFull);
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, vector::validateFull);
       assertTrue(e.getMessage().contains("UTF"));
     }
   }
@@ -268,40 +286,47 @@ public void testValidateVarCharUTF8() {
   public void testValidateLargeVarCharUTF8() {
     try (final LargeVarCharVector vector = new LargeVarCharVector("v", allocator)) {
       vector.validateFull();
-      setVector(vector, "aaa".getBytes(StandardCharsets.UTF_8), "bbb".getBytes(StandardCharsets.UTF_8),
+      setVector(
+          vector,
+          "aaa".getBytes(StandardCharsets.UTF_8),
+          "bbb".getBytes(StandardCharsets.UTF_8),
           new byte[] {(byte) 0xFF, (byte) 0xFE});
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          vector::validateFull);
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, vector::validateFull);
       assertTrue(e.getMessage().contains("UTF"));
     }
   }
 
   @Test
   public void testValidateDecimal() {
-    try (final DecimalVector vector = new DecimalVector(Field.nullable("v",
-        new ArrowType.Decimal(2, 0, DecimalVector.TYPE_WIDTH * 8)), allocator)) {
+    try (final DecimalVector vector =
+        new DecimalVector(
+            Field.nullable("v", new ArrowType.Decimal(2, 0, DecimalVector.TYPE_WIDTH * 8)),
+            allocator)) {
       vector.validateFull();
       setVector(vector, 1L);
       vector.validateFull();
       vector.clear();
       setVector(vector, Long.MAX_VALUE);
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          vector::validateFull);
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, vector::validateFull);
       assertTrue(e.getMessage().contains("Decimal"));
     }
   }
 
   @Test
   public void testValidateDecimal256() {
-    try (final Decimal256Vector vector = new Decimal256Vector(Field.nullable("v",
-        new ArrowType.Decimal(2, 0, DecimalVector.TYPE_WIDTH * 8)), allocator)) {
+    try (final Decimal256Vector vector =
+        new Decimal256Vector(
+            Field.nullable("v", new ArrowType.Decimal(2, 0, DecimalVector.TYPE_WIDTH * 8)),
+            allocator)) {
       vector.validateFull();
       setVector(vector, 1L);
       vector.validateFull();
       vector.clear();
       setVector(vector, Long.MAX_VALUE);
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          vector::validateFull);
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, vector::validateFull);
       assertTrue(e.getMessage().contains("Decimal"));
     }
   }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorSchemaRoot.java b/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorSchemaRoot.java
index 1885fb21f17b6..384045bf02c6e 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorSchemaRoot.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorSchemaRoot.java
@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.validate;
 
 import static org.apache.arrow.vector.util.ValueVectorUtility.validate;
 import static org.apache.arrow.vector.util.ValueVectorUtility.validateFull;
-import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.memory.BufferAllocator;
@@ -29,20 +28,20 @@
 import org.apache.arrow.vector.VarCharVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
 import org.apache.arrow.vector.testing.ValueVectorDataPopulator;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class TestValidateVectorSchemaRoot {
 
   private BufferAllocator allocator;
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
@@ -50,7 +49,7 @@ public void terminate() throws Exception {
   @Test
   public void testValidatePositive() {
     try (IntVector intVector = new IntVector("int vector", allocator);
-         VarCharVector strVector = new VarCharVector("var char vector", allocator)) {
+        VarCharVector strVector = new VarCharVector("var char vector", allocator)) {
 
       VectorSchemaRoot root = VectorSchemaRoot.of(intVector, strVector);
 
@@ -69,7 +68,7 @@ public void testValidatePositive() {
   @Test
   public void testValidateNegative() {
     try (IntVector intVector = new IntVector("int vector", allocator);
-         VarCharVector strVector = new VarCharVector("var char vector", allocator)) {
+        VarCharVector strVector = new VarCharVector("var char vector", allocator)) {
 
       VectorSchemaRoot root = VectorSchemaRoot.of(intVector, strVector);
 
@@ -80,12 +79,15 @@ public void testValidateNegative() {
       root.setRowCount(4);
       intVector.setValueCount(5);
       strVector.setValueCount(5);
-      ValidateUtil.ValidateException e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validate(root));
-      assertTrue(e.getMessage().contains("Child vector and vector schema root have different value counts"));
-      e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validateFull(root));
-      assertTrue(e.getMessage().contains("Child vector and vector schema root have different value counts"));
+      ValidateUtil.ValidateException e =
+          assertThrows(ValidateUtil.ValidateException.class, () -> validate(root));
+      assertTrue(
+          e.getMessage()
+              .contains("Child vector and vector schema root have different value counts"));
+      e = assertThrows(ValidateUtil.ValidateException.class, () -> validateFull(root));
+      assertTrue(
+          e.getMessage()
+              .contains("Child vector and vector schema root have different value counts"));
 
       // valid problems with the child vector
       root.setRowCount(5);
@@ -93,9 +95,10 @@ public void testValidateNegative() {
       offsetBuf.setInt(0, 100);
       offsetBuf.setInt(8, 50);
       validate(root);
-      e = assertThrows(ValidateUtil.ValidateException.class,
-          () -> validateFull(root));
-      assertTrue(e.getMessage().contains("The values in positions 0 and 1 of the offset buffer are decreasing"));
+      e = assertThrows(ValidateUtil.ValidateException.class, () -> validateFull(root));
+      assertTrue(
+          e.getMessage()
+              .contains("The values in positions 0 and 1 of the offset buffer are decreasing"));
     }
   }
 }
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorTypeVisitor.java b/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorTypeVisitor.java
index 0ddd790d6ffab..5454008364797 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorTypeVisitor.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/validate/TestValidateVectorTypeVisitor.java
@@ -14,13 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.arrow.vector.validate;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.function.Supplier;
-
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.BigIntVector;
@@ -70,40 +68,40 @@
 import org.apache.arrow.vector.types.Types;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.FieldType;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Test cases for {@link ValidateVectorTypeVisitor}.
- */
+/** Test cases for {@link ValidateVectorTypeVisitor}. */
 public class TestValidateVectorTypeVisitor {
 
   private BufferAllocator allocator;
 
   private ValidateVectorTypeVisitor visitor = new ValidateVectorTypeVisitor();
 
-  @Before
+  @BeforeEach
   public void init() {
     allocator = new RootAllocator(Long.MAX_VALUE);
   }
 
-  @After
+  @AfterEach
   public void terminate() throws Exception {
     allocator.close();
   }
 
   private void testPositiveCase(Supplier<ValueVector> vectorGenerator) {
-    try (ValueVector vector = vectorGenerator.get();) {
+    try (ValueVector vector = vectorGenerator.get(); ) {
       vector.accept(visitor, null);
     }
   }
 
   private void testNegativeCase(Supplier<ValueVector> vectorGenerator) {
     try (ValueVector vector = vectorGenerator.get()) {
-      assertThrows(ValidateUtil.ValidateException.class, () -> {
-        vector.accept(visitor, null);
-      });
+      assertThrows(
+          ValidateUtil.ValidateException.class,
+          () -> {
+            vector.accept(visitor, null);
+          });
     }
   }
 
@@ -126,8 +124,10 @@ public void testFixedWidthVectorsPositive() {
     testPositiveCase(() -> new DateDayVector("vector", allocator));
     testPositiveCase(() -> new DateMilliVector("vector", allocator));
 
-    testPositiveCase(() -> new DurationVector(
-        "vector", FieldType.nullable(new ArrowType.Duration(TimeUnit.SECOND)), allocator));
+    testPositiveCase(
+        () ->
+            new DurationVector(
+                "vector", FieldType.nullable(new ArrowType.Duration(TimeUnit.SECOND)), allocator));
 
     // float vectors
     testPositiveCase(() -> new Float4Vector("vector", allocator));
@@ -160,96 +160,173 @@ public void testFixedWidthVectorsPositive() {
   public void testFixedWidthVectorsNegative() {
     // integer vectors
     testNegativeCase(
-        () -> new TinyIntVector("vector", FieldType.nullable(Types.MinorType.INT.getType()), allocator));
+        () ->
+            new TinyIntVector(
+                "vector", FieldType.nullable(Types.MinorType.INT.getType()), allocator));
     testNegativeCase(
-        () -> new SmallIntVector("vector", FieldType.nullable(Types.MinorType.INT.getType()), allocator));
+        () ->
+            new SmallIntVector(
+                "vector", FieldType.nullable(Types.MinorType.INT.getType()), allocator));
     testNegativeCase(
-        () -> new BigIntVector("vector", FieldType.nullable(Types.MinorType.SMALLINT.getType()), allocator));
+        () ->
+            new BigIntVector(
+                "vector", FieldType.nullable(Types.MinorType.SMALLINT.getType()), allocator));
     testNegativeCase(
-        () -> new BigIntVector("vector", FieldType.nullable(Types.MinorType.SMALLINT.getType()), allocator));
+        () ->
+            new BigIntVector(
+                "vector", FieldType.nullable(Types.MinorType.SMALLINT.getType()), allocator));
     testNegativeCase(
-        () -> new UInt1Vector("vector", FieldType.nullable(Types.MinorType.SMALLINT.getType()), allocator));
+        () ->
+            new UInt1Vector(
+                "vector", FieldType.nullable(Types.MinorType.SMALLINT.getType()), allocator));
     testNegativeCase(
-        () -> new UInt2Vector("vector", FieldType.nullable(Types.MinorType.SMALLINT.getType()), allocator));
+        () ->
+            new UInt2Vector(
+                "vector", FieldType.nullable(Types.MinorType.SMALLINT.getType()), allocator));
     testNegativeCase(
-        () -> new UInt4Vector("vector", FieldType.nullable(Types.MinorType.SMALLINT.getType()), allocator));
+        () ->
+            new UInt4Vector(
+                "vector", FieldType.nullable(Types.MinorType.SMALLINT.getType()), allocator));
     testNegativeCase(
-        () -> new UInt8Vector("vector", FieldType.nullable(Types.MinorType.SMALLINT.getType()), allocator));
+        () ->
+            new UInt8Vector(
+                "vector", FieldType.nullable(Types.MinorType.SMALLINT.getType()), allocator));
 
     testNegativeCase(
-        () -> new BitVector("vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
-    testNegativeCase(
-        () -> new DecimalVector("vector", allocator, 30, -16));
+        () ->
+            new BitVector(
+                "vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
+    testNegativeCase(() -> new DecimalVector("vector", allocator, 30, -16));
 
     // date vectors
     testNegativeCase(
-        () -> new DateDayVector("vector", FieldType.nullable(Types.MinorType.FLOAT4.getType()), allocator));
+        () ->
+            new DateDayVector(
+                "vector", FieldType.nullable(Types.MinorType.FLOAT4.getType()), allocator));
     testNegativeCase(
-        () -> new DateMilliVector("vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
+        () ->
+            new DateMilliVector(
+                "vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
 
     // float pont vectors
     testNegativeCase(
-        () -> new Float4Vector("vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
+        () ->
+            new Float4Vector(
+                "vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
     testNegativeCase(
-        () -> new Float8Vector("vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
+        () ->
+            new Float8Vector(
+                "vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
 
     // interval vectors
     testNegativeCase(
-        () -> new IntervalDayVector("vector", FieldType.nullable(Types.MinorType.INT.getType()), allocator));
+        () ->
+            new IntervalDayVector(
+                "vector", FieldType.nullable(Types.MinorType.INT.getType()), allocator));
     testNegativeCase(
-        () -> new IntervalYearVector("vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
+        () ->
+            new IntervalYearVector(
+                "vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
 
     // time vectors
     testNegativeCase(
-        () -> new TimeMilliVector("vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
+        () ->
+            new TimeMilliVector(
+                "vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
     testNegativeCase(
-        () -> new TimeMicroVector("vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
+        () ->
+            new TimeMicroVector(
+                "vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
     testNegativeCase(
-        () -> new TimeNanoVector("vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
+        () ->
+            new TimeNanoVector(
+                "vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
     testNegativeCase(
-        () -> new TimeSecVector("vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
+        () ->
+            new TimeSecVector(
+                "vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
 
     // time stamp vectors
-    testNegativeCase(
-        () -> new TimeStampMicroTZVector("vector", allocator, null));
-    testNegativeCase(
-        () -> new TimeStampMicroVector("vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
-    testNegativeCase(
-        () -> new TimeStampMilliTZVector("vector", allocator, null));
-    testNegativeCase(
-        () -> new TimeStampMilliVector("vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
-    testNegativeCase(
-        () -> new TimeStampNanoTZVector("vector", allocator, null));
-    testNegativeCase(
-        () -> new TimeStampNanoVector("vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
-    testNegativeCase(
-        () -> new TimeStampSecTZVector("vector", allocator, null));
-    testNegativeCase(
-        () -> new TimeStampSecVector("vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
+    testNegativeCase(() -> new TimeStampMicroTZVector("vector", allocator, null));
+    testNegativeCase(
+        () ->
+            new TimeStampMicroVector(
+                "vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
+    testNegativeCase(() -> new TimeStampMilliTZVector("vector", allocator, null));
+    testNegativeCase(
+        () ->
+            new TimeStampMilliVector(
+                "vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
+    testNegativeCase(() -> new TimeStampNanoTZVector("vector", allocator, null));
+    testNegativeCase(
+        () ->
+            new TimeStampNanoVector(
+                "vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
+    testNegativeCase(() -> new TimeStampSecTZVector("vector", allocator, null));
+    testNegativeCase(
+        () ->
+            new TimeStampSecVector(
+                "vector", FieldType.nullable(Types.MinorType.BIGINT.getType()), allocator));
   }
 
   @Test
   public void testDecimalVector() {
-    testPositiveCase(() ->
-            new DecimalVector("dec", FieldType.nullable(ArrowType.Decimal.createDecimal(10, 10, 128)), allocator));
-    testPositiveCase(() ->
-            new DecimalVector("dec", FieldType.nullable(ArrowType.Decimal.createDecimal(38, 10, 128)), allocator));
-    testPositiveCase(() ->
-            new Decimal256Vector("dec", FieldType.nullable(ArrowType.Decimal.createDecimal(50, 10, 256)), allocator));
-    testPositiveCase(() ->
-            new Decimal256Vector("dec", FieldType.nullable(ArrowType.Decimal.createDecimal(76, 10, 256)), allocator));
-    testNegativeCase(() ->
-            new DecimalVector("dec", FieldType.nullable(ArrowType.Decimal.createDecimal(50, 10, 128)), allocator));
-    testNegativeCase(() ->
-            new Decimal256Vector("dec", FieldType.nullable(ArrowType.Decimal.createDecimal(100, 10, 256)), allocator));
-    testNegativeCase(() ->
-            new DecimalVector("dec", FieldType.nullable(ArrowType.Decimal.createDecimal(0, 10, 128)), allocator));
-    testNegativeCase(() ->
-            new Decimal256Vector("dec", FieldType.nullable(ArrowType.Decimal.createDecimal(-1, 10, 256)), allocator));
-    testNegativeCase(() ->
-            new Decimal256Vector("dec", FieldType.nullable(ArrowType.Decimal.createDecimal(30, 10, 64)), allocator));
-    testNegativeCase(() ->
-            new Decimal256Vector("dec", FieldType.nullable(ArrowType.Decimal.createDecimal(10, 20, 256)), allocator));
+    testPositiveCase(
+        () ->
+            new DecimalVector(
+                "dec",
+                FieldType.nullable(ArrowType.Decimal.createDecimal(10, 10, 128)),
+                allocator));
+    testPositiveCase(
+        () ->
+            new DecimalVector(
+                "dec",
+                FieldType.nullable(ArrowType.Decimal.createDecimal(38, 10, 128)),
+                allocator));
+    testPositiveCase(
+        () ->
+            new Decimal256Vector(
+                "dec",
+                FieldType.nullable(ArrowType.Decimal.createDecimal(50, 10, 256)),
+                allocator));
+    testPositiveCase(
+        () ->
+            new Decimal256Vector(
+                "dec",
+                FieldType.nullable(ArrowType.Decimal.createDecimal(76, 10, 256)),
+                allocator));
+    testNegativeCase(
+        () ->
+            new DecimalVector(
+                "dec",
+                FieldType.nullable(ArrowType.Decimal.createDecimal(50, 10, 128)),
+                allocator));
+    testNegativeCase(
+        () ->
+            new Decimal256Vector(
+                "dec",
+                FieldType.nullable(ArrowType.Decimal.createDecimal(100, 10, 256)),
+                allocator));
+    testNegativeCase(
+        () ->
+            new DecimalVector(
+                "dec", FieldType.nullable(ArrowType.Decimal.createDecimal(0, 10, 128)), allocator));
+    testNegativeCase(
+        () ->
+            new Decimal256Vector(
+                "dec",
+                FieldType.nullable(ArrowType.Decimal.createDecimal(-1, 10, 256)),
+                allocator));
+    testNegativeCase(
+        () ->
+            new Decimal256Vector(
+                "dec", FieldType.nullable(ArrowType.Decimal.createDecimal(30, 10, 64)), allocator));
+    testNegativeCase(
+        () ->
+            new Decimal256Vector(
+                "dec",
+                FieldType.nullable(ArrowType.Decimal.createDecimal(10, 20, 256)),
+                allocator));
   }
 
   @Test
@@ -261,9 +338,13 @@ public void testVariableWidthVectorsPositive() {
   @Test
   public void testVariableWidthVectorsNegative() {
     testNegativeCase(
-        () -> new VarCharVector("vector", FieldType.nullable(Types.MinorType.INT.getType()), allocator));
+        () ->
+            new VarCharVector(
+                "vector", FieldType.nullable(Types.MinorType.INT.getType()), allocator));
     testNegativeCase(
-        () -> new VarBinaryVector("vector", FieldType.nullable(Types.MinorType.INT.getType()), allocator));
+        () ->
+            new VarBinaryVector(
+                "vector", FieldType.nullable(Types.MinorType.INT.getType()), allocator));
   }
 
   @Test
@@ -275,9 +356,13 @@ public void testLargeVariableWidthVectorsPositive() {
   @Test
   public void testLargeVariableWidthVectorsNegative() {
     testNegativeCase(
-        () -> new LargeVarCharVector("vector", FieldType.nullable(Types.MinorType.INT.getType()), allocator));
+        () ->
+            new LargeVarCharVector(
+                "vector", FieldType.nullable(Types.MinorType.INT.getType()), allocator));
     testNegativeCase(
-        () -> new LargeVarBinaryVector("vector", FieldType.nullable(Types.MinorType.INT.getType()), allocator));
+        () ->
+            new LargeVarBinaryVector(
+                "vector", FieldType.nullable(Types.MinorType.INT.getType()), allocator));
   }
 
   @Test
@@ -285,7 +370,9 @@ public void testListVector() {
     testPositiveCase(() -> ListVector.empty("vector", allocator));
 
     testNegativeCase(
-        () -> new ListVector("vector", allocator, FieldType.nullable(Types.MinorType.INT.getType()), null));
+        () ->
+            new ListVector(
+                "vector", allocator, FieldType.nullable(Types.MinorType.INT.getType()), null));
   }
 
   @Test
@@ -293,7 +380,9 @@ public void testLargeListVector() {
     testPositiveCase(() -> LargeListVector.empty("vector", allocator));
 
     testNegativeCase(
-        () -> new LargeListVector("vector", allocator, FieldType.nullable(Types.MinorType.INT.getType()), null));
+        () ->
+            new LargeListVector(
+                "vector", allocator, FieldType.nullable(Types.MinorType.INT.getType()), null));
   }
 
   @Test
@@ -306,7 +395,9 @@ public void testStructVector() {
     testPositiveCase(() -> StructVector.empty("vector", allocator));
 
     testNegativeCase(
-        () -> new StructVector("vector", allocator, FieldType.nullable(Types.MinorType.INT.getType()), null));
+        () ->
+            new StructVector(
+                "vector", allocator, FieldType.nullable(Types.MinorType.INT.getType()), null));
   }
 
   @Test
diff --git a/js/.eslintrc.cjs b/js/.eslintrc.cjs
index 8a36516eec1c0..153742dfcf65e 100644
--- a/js/.eslintrc.cjs
+++ b/js/.eslintrc.cjs
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+/** @type {import('eslint').Linter.Config} */
 module.exports = {
     env: {
         browser: true,
@@ -25,7 +26,7 @@ module.exports = {
     parserOptions: {
         project: ["tsconfig.json", "tsconfig/tsconfig.bin.cjs.json"],
         sourceType: "module",
-        ecmaVersion: 2020,
+        ecmaVersion: "latest",
     },
     plugins: ["@typescript-eslint", "jest", "unicorn"],
     extends: [
@@ -71,6 +72,7 @@ module.exports = {
         "@typescript-eslint/no-misused-new": "off",
         "@typescript-eslint/ban-ts-comment": "off",
         "@typescript-eslint/no-non-null-assertion": "off",
+        "@typescript-eslint/no-unsafe-declaration-merging": "off",
         "@typescript-eslint/no-unused-vars": "off",  // ts already takes care of this
 
         "prefer-const": ["error", {
@@ -92,16 +94,13 @@ module.exports = {
         "unicorn/empty-brace-spaces": "off",
         "unicorn/no-zero-fractions": "off",
         "unicorn/prevent-abbreviations": "off",
-        "unicorn/prefer-module": "off",
         "unicorn/numeric-separators-style": "off",
         "unicorn/prefer-spread": "off",
         "unicorn/filename-case": "off",
         "unicorn/prefer-export-from": "off",
         "unicorn/prefer-switch": "off",
-        "unicorn/prefer-node-protocol": "off",
         "unicorn/text-encoding-identifier-case": "off",
         "unicorn/prefer-top-level-await": "off",
-
         "unicorn/consistent-destructuring": "off",
         "unicorn/no-array-reduce": "off",
         "unicorn/no-await-expression-member": "off",
diff --git a/js/.vscode/launch.json b/js/.vscode/launch.json
index 21255b61c39a5..189b9d1f33c27 100644
--- a/js/.vscode/launch.json
+++ b/js/.vscode/launch.json
@@ -5,24 +5,14 @@
   "version": "0.2.0",
   "inputs": [
     {
-      "type": "pickString",
-      "default": "src",
+      "type": "command",
       "id": "TEST_TARGET",
-      "options": [
-        "src",
-        "apache-arrow",
-        "ts",
-        "es5.cjs",
-        "es5.esm",
-        "es5.umd",
-        "es2015.cjs",
-        "es2015.esm",
-        "es2015.umd",
-        "esnext.cjs",
-        "esnext.esm",
-        "esnext.umd",
-      ],
-      "description": "The JS version + Module format combination to test (or src to test source files)",
+      "command": "shellCommand.execute",
+      "args": {
+        "cwd": "${workspaceFolder}",
+        "description": "The JS version + Module format combination to test (or src to test source files)",
+        "command": "echo \"src\napache-arrow\nts\nes5.cjs\nes5.esm\nes5.umd\nes2015.cjs\nes2015.esm\nes2015.umd\nesnext.cjs\nesnext.esm\nesnext.umd\""
+      }
     },
     {
       "type": "command",
@@ -50,7 +40,7 @@
       "command": "shellCommand.execute",
       "args": {
         "useSingleResult": "true",
-        "command": "case \"${input:TEST_TARGET}\" in *cjs | *umd | apache-arrow) echo '';; *) echo '--experimental-vm-modules';; esac"
+        "command": "case \"${input:TEST_TARGET}\" in *cjs | *umd) echo '--no-warnings';; *) echo '--experimental-vm-modules';; esac"
       }
     },
   ],
diff --git a/js/.vscode/settings.json b/js/.vscode/settings.json
index e52da54e544ec..a2bac7f08a69f 100644
--- a/js/.vscode/settings.json
+++ b/js/.vscode/settings.json
@@ -17,6 +17,6 @@
     "editor.defaultFormatter": "vscode.typescript-language-features"
   },
   "jest.jestCommandLine": "node --experimental-vm-modules node_modules/jest/bin/jest.js --config jest.config.js",
-  "jest.autoRun": {"watch": false, "onSave": "test-src-file"},
+  "jest.runMode": { "type": "on-save", "testFileOnly": true },
   "typescript.preferences.importModuleSpecifierEnding": "js"
 }
diff --git a/js/bin/file-to-stream.ts b/js/bin/file-to-stream.ts
index 9dad4951f96e1..b7341faf2c0e0 100755
--- a/js/bin/file-to-stream.ts
+++ b/js/bin/file-to-stream.ts
@@ -17,9 +17,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import * as fs from 'fs';
-import * as Path from 'path';
-import { finished as eos } from 'stream/promises';
+import * as fs from 'node:fs';
+import * as Path from 'node:path';
+import { finished as eos } from 'node:stream/promises';
 import { RecordBatchReader, RecordBatchStreamWriter } from '../index.ts';
 
 (async () => {
diff --git a/js/bin/integration.ts b/js/bin/integration.ts
index f9aad3422ae72..d41ce08aa16b6 100755
--- a/js/bin/integration.ts
+++ b/js/bin/integration.ts
@@ -17,10 +17,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import * as fs from 'fs';
-import * as Path from 'path';
+import * as fs from 'node:fs';
+import * as Path from 'node:path';
 import { glob } from 'glob';
-import { zip } from 'ix/iterable/zip.js';
+import { zip } from 'ix/iterable/zip';
 import commandLineArgs from 'command-line-args';
 // @ts-ignore
 import { parse as bignumJSONParse } from 'json-bignum';
@@ -41,8 +41,8 @@ const argv = commandLineArgs(cliOpts(), { partial: true });
 const exists = async (p: string) => {
     try {
         return !!(await fs.promises.stat(p));
-    } catch (e) { return false; }
-}
+    } catch { return false; }
+};
 
 (async () => {
 
@@ -52,17 +52,17 @@ const exists = async (p: string) => {
     let jsonPaths = [...(argv.json || [])];
     let arrowPaths = [...(argv.arrow || [])];
 
-    if (mode === 'VALIDATE' && !jsonPaths.length) {
+    if (mode === 'VALIDATE' && jsonPaths.length === 0) {
         [jsonPaths, arrowPaths] = await loadLocalJSONAndArrowPathsForDebugging(jsonPaths, arrowPaths);
     }
 
-    if (!jsonPaths.length) { return print_usage(); }
+    if (jsonPaths.length === 0) { return print_usage(); }
 
     let threw = false;
 
     switch (mode) {
         case 'VALIDATE':
-            for (let [jsonPath, arrowPath] of zip(jsonPaths, arrowPaths)) {
+            for (const [jsonPath, arrowPath] of zip(jsonPaths, arrowPaths)) {
                 try {
                     await validate(jsonPath, arrowPath);
                 } catch (e: any) {
@@ -232,7 +232,7 @@ function compareVectors(actual: Vector, expected: Vector) {
 
     (() => {
         let i = -1;
-        for (let [x1, x2] of zip(actual, expected)) {
+        for (const [x1, x2] of zip(actual, expected)) {
             ++i;
             if (!createElementComparator(x2)(x1)) {
                 throw new Error(`${i}: ${x1} !== ${x2}`);
@@ -245,14 +245,14 @@ async function loadLocalJSONAndArrowPathsForDebugging(jsonPaths: string[], arrow
 
     const sourceJSONPaths = await glob(Path.resolve(__dirname, `../test/data/json/`, `*.json`));
 
-    if (!arrowPaths.length) {
+    if (arrowPaths.length === 0) {
         await loadJSONAndArrowPaths(sourceJSONPaths, jsonPaths, arrowPaths, 'cpp', 'file');
         await loadJSONAndArrowPaths(sourceJSONPaths, jsonPaths, arrowPaths, 'java', 'file');
         await loadJSONAndArrowPaths(sourceJSONPaths, jsonPaths, arrowPaths, 'cpp', 'stream');
         await loadJSONAndArrowPaths(sourceJSONPaths, jsonPaths, arrowPaths, 'java', 'stream');
     }
 
-    for (let [jsonPath, arrowPath] of zip(jsonPaths, arrowPaths)) {
+    for (const [jsonPath, arrowPath] of zip(jsonPaths, arrowPaths)) {
         console.log(`jsonPath: ${jsonPath}`);
         console.log(`arrowPath: ${arrowPath}`);
     }
diff --git a/js/bin/json-to-arrow.ts b/js/bin/json-to-arrow.ts
index 49726706a1be6..168db00a54f26 100755
--- a/js/bin/json-to-arrow.ts
+++ b/js/bin/json-to-arrow.ts
@@ -17,10 +17,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import * as fs from 'fs';
-import * as Path from 'path';
+import * as fs from 'node:fs';
+import * as Path from 'node:path';
 import commandLineArgs from 'command-line-args';
-import { finished as eos } from 'stream/promises';
+import { finished as eos } from 'node:stream/promises';
 // @ts-ignore
 import { parse as bignumJSONParse } from 'json-bignum';
 import { RecordBatchReader, RecordBatchFileWriter, RecordBatchStreamWriter } from '../index.ts';
@@ -31,7 +31,7 @@ const arrowPaths = [...(argv.arrow || [])];
 
 (async () => {
 
-    if (!jsonPaths.length || !arrowPaths.length || (jsonPaths.length !== arrowPaths.length)) {
+    if (jsonPaths.length === 0 || arrowPaths.length === 0 || (jsonPaths.length !== arrowPaths.length)) {
         return print_usage();
     }
 
@@ -51,7 +51,7 @@ const arrowPaths = [...(argv.arrow || [])];
         await eos(jsonToArrow);
     }));
 
-    return undefined;
+    return;
 })()
     .then((x) => x ?? 0, (e) => {
         e && process.stderr.write(`${e}`);
diff --git a/js/bin/print-buffer-alignment.ts b/js/bin/print-buffer-alignment.ts
index 07563af5a87e8..dabe3c5f9ab48 100755
--- a/js/bin/print-buffer-alignment.ts
+++ b/js/bin/print-buffer-alignment.ts
@@ -17,8 +17,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import * as fs from 'fs';
-import * as Path from 'path';
+import * as fs from 'node:fs';
+import * as Path from 'node:path';
 import { VectorLoader } from '../src/visitor/vectorloader.ts';
 import { RecordBatch, AsyncMessageReader, makeData, Struct, Schema, Field } from '../index.ts';
 
diff --git a/js/bin/stream-to-file.ts b/js/bin/stream-to-file.ts
index 6e09ead2fde19..c1317abc975db 100755
--- a/js/bin/stream-to-file.ts
+++ b/js/bin/stream-to-file.ts
@@ -17,9 +17,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import * as fs from 'fs';
-import * as path from 'path';
-import { finished as eos } from 'stream/promises';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { finished as eos } from 'node:stream/promises';
 import { RecordBatchReader, RecordBatchFileWriter } from '../index.ts';
 
 (async () => {
diff --git a/js/gulp/argv.js b/js/gulp/argv.js
index 5c49fc5155a80..967644eabc736 100644
--- a/js/gulp/argv.js
+++ b/js/gulp/argv.js
@@ -22,6 +22,7 @@ export const argv = args([
     { name: `target`, type: String, defaultValue: `` },
     { name: `module`, type: String, defaultValue: `` },
     { name: `coverage`, type: Boolean, defaultValue: false },
+    { name: `tests`, type: String, multiple: true, defaultValue: [`test/unit/`] },
     { name: `targets`, alias: `t`, type: String, multiple: true, defaultValue: [] },
     { name: `modules`, alias: `m`, type: String, multiple: true, defaultValue: [] },
 ], { partial: true });
diff --git a/js/gulp/arrow-task.js b/js/gulp/arrow-task.js
index f8a18fe122a93..2ec2043985074 100644
--- a/js/gulp/arrow-task.js
+++ b/js/gulp/arrow-task.js
@@ -18,9 +18,9 @@
 import { mainExport, targetDir, observableFromStreams } from './util.js';
 
 import gulp from 'gulp';
-import path from 'path';
+import path from 'node:path';
 import { mkdirp } from 'mkdirp';
-import * as fs from 'fs/promises';
+import * as fs from 'node:fs/promises';
 import gulpRename from 'gulp-rename';
 import gulpReplace from 'gulp-replace';
 import { memoizeTask } from './memoize-task.js';
@@ -30,24 +30,23 @@ import { pipeline } from 'stream/promises';
 
 export const arrowTask = ((cache) => memoizeTask(cache, function copyMain(target) {
     const out = targetDir(target);
-    const dtsGlob = `${targetDir(`es2015`, `cjs`)}/**/*.ts`;
+    const dtsGlob = `${targetDir(`es2015`, `esm`)}/**/*.ts`;
     const cjsGlob = `${targetDir(`es2015`, `cjs`)}/**/*.js`;
     const esmGlob = `${targetDir(`es2015`, `esm`)}/**/*.js`;
     const es2015UmdGlob = `${targetDir(`es2015`, `umd`)}/*.js`;
     const esnextUmdGlob = `${targetDir(`esnext`, `umd`)}/*.js`;
-    const cjsSourceMapsGlob = `${targetDir(`es2015`, `cjs`)}/**/*.map`;
+    const cjsSourceMapsGlob = `${targetDir(`es2015`, `cjs`)}/**/*.js.map`;
     const esmSourceMapsGlob = `${targetDir(`es2015`, `esm`)}/**/*.map`;
     const es2015UmdSourceMapsGlob = `${targetDir(`es2015`, `umd`)}/*.map`;
     const esnextUmdSourceMapsGlob = `${targetDir(`esnext`, `umd`)}/*.map`;
     return ObservableForkJoin([
         observableFromStreams(gulp.src(dtsGlob), gulp.dest(out)), // copy d.ts files
-        observableFromStreams(gulp.src(dtsGlob), gulpRename((p) => { p.extname = '.mts'; }), gulp.dest(out)), // copy d.ts files as esm
         observableFromStreams(gulp.src(cjsGlob), gulp.dest(out)), // copy es2015 cjs files
         observableFromStreams(gulp.src(cjsSourceMapsGlob), gulp.dest(out)), // copy es2015 cjs sourcemaps
-        observableFromStreams(gulp.src(esmSourceMapsGlob), gulp.dest(out)), // copy es2015 esm sourcemaps
+        observableFromStreams(gulp.src(esmSourceMapsGlob), gulpRename((p) => { p.basename = p.basename.replace('.js', '.mjs'); }), gulpReplace(`.js"`, `.mjs"`), gulp.dest(out)), // copy es2015 esm sourcemaps
         observableFromStreams(gulp.src(es2015UmdSourceMapsGlob), gulp.dest(out)), // copy es2015 umd sourcemap files, but don't rename
         observableFromStreams(gulp.src(esnextUmdSourceMapsGlob), gulp.dest(out)), // copy esnext umd sourcemap files, but don't rename
-        observableFromStreams(gulp.src(esmGlob), gulpRename((p) => { p.extname = '.mjs'; }), gulpReplace(`.js'`, `.mjs'`), gulp.dest(out)), // copy es2015 esm files and rename to `.mjs`
+        observableFromStreams(gulp.src(esmGlob), gulpRename((p) => { p.extname = '.mjs'; }), gulpReplace(`.js'`, `.mjs'`), gulpReplace(`.js.map`, `.mjs.map`), gulp.dest(out)), // copy es2015 esm files and rename to `.mjs`
         observableFromStreams(gulp.src(es2015UmdGlob), gulpRename((p) => { p.basename += `.es2015.min`; }), gulp.dest(out)), // copy es2015 umd files and add `.es2015.min`
         observableFromStreams(gulp.src(esnextUmdGlob), gulpRename((p) => { p.basename += `.esnext.min`; }), gulp.dest(out)), // copy esnext umd files and add `.esnext.min`
     ]).pipe(share({ connector: () => new ReplaySubject(), resetOnError: false, resetOnComplete: false, resetOnRefCountZero: false }));
diff --git a/js/gulp/bundle-task.js b/js/gulp/bundle-task.js
index 41a0895b082f3..b0aab6c468eac 100644
--- a/js/gulp/bundle-task.js
+++ b/js/gulp/bundle-task.js
@@ -23,9 +23,9 @@ import source from 'vinyl-source-stream';
 import buffer from 'vinyl-buffer';
 import { observableFromStreams } from './util.js';
 import { forkJoin as ObservableForkJoin } from 'rxjs';
-import { resolve, join } from 'path';
-import { readdirSync } from 'fs';
-import { execSync } from 'child_process';
+import { resolve, join } from 'node:path';
+import { readdirSync } from 'node:fs';
+import { execSync } from 'node:child_process';
 
 import gulpEsbuild from 'gulp-esbuild';
 import esbuildAlias from 'esbuild-plugin-alias';
@@ -38,8 +38,8 @@ import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 import webpack from 'webpack-stream';
 import named from 'vinyl-named';
 
-import { fileURLToPath } from 'url';
-import { dirname } from 'path';
+import { fileURLToPath } from 'node:url';
+import { dirname } from 'node:path';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
diff --git a/js/gulp/closure-task.js b/js/gulp/closure-task.js
index 7c0ae1c1b6cd5..80f841bf729f1 100644
--- a/js/gulp/closure-task.js
+++ b/js/gulp/closure-task.js
@@ -17,10 +17,12 @@
 
 import { targetDir, mainExport, esmRequire, gCCLanguageNames, publicModulePaths, observableFromStreams, shouldRunInChildProcess, spawnGulpCommandInChildProcess } from "./util.js";
 
-import fs from 'fs';
+import fs from 'node:fs';
 import gulp from 'gulp';
-import path from 'path';
+import Path from 'node:path';
+import https from 'node:https';
 import { mkdirp } from 'mkdirp';
+import { PassThrough } from 'node:stream';
 import sourcemaps from 'gulp-sourcemaps';
 import { memoizeTask } from './memoize-task.js';
 import { compileBinFiles } from './typescript-task.js';
@@ -28,6 +30,12 @@ import { compileBinFiles } from './typescript-task.js';
 import closureCompiler from 'google-closure-compiler';
 const compiler = closureCompiler.gulp();
 
+import { fileURLToPath } from 'url';
+import { dirname } from 'path';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const closureCompilerVer = JSON.parse(fs.readFileSync(Path.join(__dirname, '..', 'package.json'))).devDependencies['google-closure-compiler'].split('.')[0];
+
 export const closureTask = ((cache) => memoizeTask(cache, async function closure(target, format) {
 
     if (shouldRunInChildProcess(target, format)) {
@@ -35,10 +43,10 @@ export const closureTask = ((cache) => memoizeTask(cache, async function closure
     }
 
     const src = targetDir(target, `cls`);
-    const srcAbsolute = path.resolve(src);
+    const srcAbsolute = Path.resolve(src);
     const out = targetDir(target, format);
-    const externs = path.join(`${out}/${mainExport}.externs.js`);
-    const entry_point = path.join(`${src}/${mainExport}.dom.cls.js`);
+    const externs = Path.join(`${out}/${mainExport}.externs.js`);
+    const entry_point = Path.join(`${src}/${mainExport}.dom.cls.js`);
 
     const exportedImports = publicModulePaths(srcAbsolute).reduce((entries, publicModulePath) => [
         ...entries, {
@@ -54,12 +62,42 @@ export const closureTask = ((cache) => memoizeTask(cache, async function closure
         fs.promises.writeFile(entry_point, generateUMDExportAssignment(srcAbsolute, exportedImports))
     ]);
 
-    return await Promise.all([
+    const closeCompilerPolyfills = [];
+
+    await Promise.all([
         runClosureCompileAsObservable().toPromise(),
-        compileBinFiles(target, format).toPromise(),
-        observableFromStreams(gulp.src(`${src}/**/*.d.ts`), gulp.dest(out)), // copy .d.ts files
+        compileBinFiles(target, format).toPromise().then(() => Promise.all([
+            observableFromStreams(gulp.src(`${src}/**/*.d.ts`), gulp.dest(out)).toPromise(), // copy .d.ts files,
+            observableFromStreams(gulp.src(`${src}/**/*.d.ts.map`), gulp.dest(out)).toPromise(), // copy .d.ts.map files,
+            observableFromStreams(gulp.src(`${src}/src/**/*`), gulp.dest(`${out}/src`)).toPromise(), // copy TS source files,
+        ]))
     ]);
 
+    // Download the closure compiler polyfill sources for sourcemaps
+    await Promise.all(closeCompilerPolyfills.map(async (path) => {
+
+        await fs.promises.mkdir(
+            Path.join(out, Path.parse(path).dir),
+            { recursive: true, mode: 0o755 }
+        );
+
+        const res = new PassThrough();
+        const req = https.request(
+            new URL(`https://raw.githubusercontent.com/google/closure-compiler/v${closureCompilerVer}/${path}`),
+            (res_) => {
+                if (res_.statusCode === 200) {
+                    res_.pipe(res);
+                } else {
+                    res.end();
+                }
+            }
+        );
+
+        req.on('error', (e) => res.emit('error', e)).end();
+
+        return observableFromStreams(res, fs.createWriteStream(Path.join(out, path))).toPromise();
+    }));
+
     function runClosureCompileAsObservable() {
         return observableFromStreams(
             gulp.src([
@@ -72,8 +110,22 @@ export const closureTask = ((cache) => memoizeTask(cache, async function closure
             compiler(createClosureArgs(entry_point, externs, target), {
                 platform: ['native', 'java', 'javascript']
             }),
+            sourcemaps.mapSources((path) => {
+                if (path.indexOf(`${src}/`) === 0) {
+                    return path.slice(`${src}/`.length);
+                }
+                if (path.includes('com/google')) {
+                    closeCompilerPolyfills.push(path);
+                    return path.slice(`src/`.length);
+                }
+                return path;
+            }),
             // rename the sourcemaps from *.js.map files to *.min.js.map
-            sourcemaps.write(`.`, { mapFile: (mapPath) => mapPath.replace(`.js.map`, `.${target}.min.js.map`) }),
+            sourcemaps.write(`./`, {
+                sourceRoot: './src',
+                includeContent: false,
+                mapFile: (mapPath) => mapPath.replace(`.js.map`, `.${target}.min.js.map`),
+            }),
             gulp.dest(out)
         );
     }
diff --git a/js/gulp/package-task.js b/js/gulp/package-task.js
index 9bc002e664885..0b0f4cfa20b8b 100644
--- a/js/gulp/package-task.js
+++ b/js/gulp/package-task.js
@@ -56,7 +56,7 @@ const createMainPackageJson = (target, format) => (orig) => ({
         '.': {
             node: {
                 import: {
-                    types: `./${mainExport}.node.d.mts`,
+                    types: `./${mainExport}.node.d.ts`,
                     default: `./${mainExport}.node.mjs`,
                 },
                 require: {
@@ -65,7 +65,7 @@ const createMainPackageJson = (target, format) => (orig) => ({
                 },
             },
             import: {
-                types: `./${mainExport}.dom.d.mts`,
+                types: `./${mainExport}.dom.d.ts`,
                 default: `./${mainExport}.dom.mjs`,
             },
             require: {
@@ -75,7 +75,7 @@ const createMainPackageJson = (target, format) => (orig) => ({
         },
         './*': {
             import: {
-                types: `./*.d.mts`,
+                types: `./*.d.ts`,
                 default: `./*.mjs`,
             },
             require: {
@@ -127,8 +127,8 @@ const createScopedPackageJSON = (target, format) => (({ name, ...orig }) =>
             sideEffects: format === 'esm' ? false : undefined,
             // include "esm" settings for https://www.npmjs.com/package/esm if building scoped ESM target
             esm:      format === `esm` ? { mode: `auto`, sourceMap: true } : undefined,
-            // set "types" (for TypeScript/VSCode)
-            types:    format === 'umd' ? undefined : `${mainExport}.node.d.ts`,
+            // set "types" to "Arrow.dom" if building scoped UMD target, otherwise "Arrow.node"
+            types:    format === 'umd' ? `${mainExport}.dom.d.ts`: `${mainExport}.node.d.ts`,
         }
     )
 );
diff --git a/js/gulp/test-task.js b/js/gulp/test-task.js
index 5d190be22d5a0..f5126ffb8d4c4 100644
--- a/js/gulp/test-task.js
+++ b/js/gulp/test-task.js
@@ -16,14 +16,14 @@
 // under the License.
 
 import { deleteAsync as del } from 'del';
-import path from 'path';
+import path from 'node:path';
 import { mkdirp } from 'mkdirp';
 import { argv } from './argv.js';
-import { promisify } from 'util';
+import { promisify } from 'node:util';
 import { glob } from 'glob';
-import child_process from 'child_process';
+import child_process from 'node:child_process';
 import { memoizeTask } from './memoize-task.js';
-import fs from 'fs';
+import fs from 'node:fs';
 const readFile = promisify(fs.readFile);
 import asyncDoneSync from 'async-done';
 const asyncDone = promisify(asyncDoneSync);
@@ -31,24 +31,11 @@ const exec = promisify(child_process.exec);
 import xml2js from 'xml2js';
 const parseXML = promisify(xml2js.parseString);
 import { targetAndModuleCombinations, npmPkgName } from './util.js';
-import { createRequire } from 'module';
+import { createRequire } from 'node:module';
 
 const require = createRequire(import.meta.url);
 
 const jestArgv = [];
-const testFiles = [
-    `test/unit/`,
-    // `test/unit/bit-tests.ts`,
-    // `test/unit/int-tests.ts`,
-    // `test/unit/bn-tests.ts`,
-    // `test/unit/math-tests.ts`,
-    // `test/unit/table-tests.ts`,
-    // `test/unit/generated-data-tests.ts`,
-    // `test/unit/builders/`,
-    // `test/unit/recordbatch/`,
-    // `test/unit/table/`,
-    // `test/unit/ipc/`,
-];
 
 if (argv.verbose) {
     jestArgv.push(`--verbose`);
@@ -80,8 +67,10 @@ export const testTask = ((cache, execArgv, testOptions) => memoizeTask(cache, fu
         args.push(`-c`, `jestconfigs/jest.coverage.config.js`);
     } else {
         const cfgname = [target, format].filter(Boolean).join('.');
-        args.push(`-c`, `jestconfigs/jest.${cfgname}.config.js`, ...testFiles);
+        args.push(`-c`, `jestconfigs/jest.${cfgname}.config.js`);
     }
+    args.push(...(argv._unknown || []).filter((x) => x !== 'test'));
+    args.push(...argv.tests);
     opts.env = {
         ...opts.env,
         TEST_TARGET: target,
diff --git a/js/gulp/typescript-task.js b/js/gulp/typescript-task.js
index 31769e3b1b236..ae5b389f7f8d4 100644
--- a/js/gulp/typescript-task.js
+++ b/js/gulp/typescript-task.js
@@ -18,10 +18,10 @@
 import { targetDir, tsconfigName, observableFromStreams, shouldRunInChildProcess, spawnGulpCommandInChildProcess } from './util.js';
 
 import gulp from 'gulp';
-import path from 'path';
+import path from 'node:path';
 import tsc from 'typescript';
 import ts from 'gulp-typescript';
-import * as fs from 'fs/promises';
+import * as fs from 'node:fs/promises';
 import sourcemaps from 'gulp-sourcemaps';
 import { memoizeTask } from './memoize-task.js';
 import { ReplaySubject, forkJoin as ObservableForkJoin, defer as ObservableDefer } from 'rxjs';
@@ -61,10 +61,9 @@ function compileTypescript(out, tsconfigPath, tsconfigOverrides, writeSourcemaps
     );
     const writeSources = observableFromStreams(tsProject.src(), gulp.dest(path.join(out, 'src')));
     const writeDTypes = observableFromStreams(dts, sourcemaps.write('./', { includeContent: false, sourceRoot: './src' }), gulp.dest(out));
-    const mapFile = tsProject.options.module === tsc.ModuleKind.ES2015 ? esmMapFile : cjsMapFile;
     const writeJSArgs = writeSourcemaps ? [
         js,
-        sourcemaps.write('./', { mapFile, includeContent: false, sourceRoot: './src' }),
+        sourcemaps.write('./', { includeContent: false, sourceRoot: './src' }),
         gulp.dest(out)
       ] : [
         js,
@@ -73,6 +72,3 @@ function compileTypescript(out, tsconfigPath, tsconfigOverrides, writeSourcemaps
     const writeJS = observableFromStreams(...writeJSArgs);
     return ObservableForkJoin([writeSources, writeDTypes, writeJS]);
 }
-
-const cjsMapFile = (mapFilePath) => mapFilePath;
-const esmMapFile = (mapFilePath) => mapFilePath.replace('.js.map', '.mjs.map');
diff --git a/js/gulp/util.js b/js/gulp/util.js
index d86011008ad3e..2ce756f4acafa 100644
--- a/js/gulp/util.js
+++ b/js/gulp/util.js
@@ -15,18 +15,18 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import fs from 'fs';
-import path from 'path';
-import child_process from 'child_process';
-import stream from 'stream';
-import util from 'util';
+import fs from 'node:fs';
+import path from 'node:path';
+import child_process from 'node:child_process';
+import stream from 'node:stream';
+import util from 'node:util';
 import asyncDoneSync from 'async-done';
 const pump = stream.pipeline;
 import { targets, modules } from './argv.js';
 import { ReplaySubject, empty as ObservableEmpty, throwError as ObservableThrow, fromEvent as ObservableFromEvent } from 'rxjs';
 import { share, flatMap, takeUntil, defaultIfEmpty, mergeWith } from 'rxjs/operators';
 const asyncDone = util.promisify(asyncDoneSync);
-import { createRequire } from 'module';
+import { createRequire } from 'node:module';
 import esmRequire from './esm-require.cjs'
 
 const require = createRequire(import.meta.url);
diff --git a/js/package.json b/js/package.json
index bb70fd0a395b0..4f7c8f27cf3f8 100644
--- a/js/package.json
+++ b/js/package.json
@@ -11,7 +11,7 @@
     "build": "cross-env NODE_NO_WARNINGS=1 gulp build",
     "clean": "cross-env NODE_NO_WARNINGS=1 gulp clean",
     "debug": "cross-env NODE_NO_WARNINGS=1 gulp debug",
-    "perf": "perf/index.ts",
+    "perf": "node --no-warnings --loader ts-node/esm/transpile-only perf/index.ts",
     "test:integration": "bin/integration.ts --mode validate",
     "release": "./npm-release.sh",
     "clean:all": "yarn clean && yarn clean:testdata",
@@ -52,74 +52,74 @@
     "jest.config.js"
   ],
   "dependencies": {
-    "@swc/helpers": "^0.5.2",
-    "@types/command-line-args": "^5.2.1",
-    "@types/command-line-usage": "^5.0.2",
-    "@types/node": "^20.6.0",
+    "@swc/helpers": "^0.5.11",
+    "@types/command-line-args": "^5.2.3",
+    "@types/command-line-usage": "^5.0.4",
+    "@types/node": "^20.13.0",
     "command-line-args": "^5.2.1",
     "command-line-usage": "^7.0.1",
-    "flatbuffers": "^23.5.26",
+    "flatbuffers": "^24.3.25",
     "json-bignum": "^0.0.3",
     "tslib": "^2.6.2"
   },
   "devDependencies": {
     "@openpgp/web-stream-tools": "0.0.13",
-    "@rollup/plugin-alias": "5.0.0",
-    "@rollup/plugin-node-resolve": "15.1.0",
+    "@rollup/plugin-alias": "5.1.0",
+    "@rollup/plugin-node-resolve": "15.2.3",
     "@rollup/stream": "3.0.1",
-    "@swc/core": "1.3.82",
-    "@types/benchmark": "2.1.4",
+    "@swc/core": "1.6.6",
+    "@types/benchmark": "2.1.5",
     "@types/glob": "8.1.0",
-    "@types/jest": "29.5.3",
+    "@types/jest": "29.5.12",
     "@types/multistream": "4.1.3",
-    "@typescript-eslint/eslint-plugin": "5.62.0",
-    "@typescript-eslint/parser": "5.62.0",
+    "@typescript-eslint/eslint-plugin": "7.12.0",
+    "@typescript-eslint/parser": "7.14.1",
     "async-done": "2.0.0",
     "benny": "3.7.1",
     "cross-env": "7.0.3",
     "del": "7.1.0",
     "del-cli": "5.1.0",
-    "esbuild": "0.20.0",
+    "esbuild": "0.22.0",
     "esbuild-plugin-alias": "0.2.1",
-    "eslint": "8.52.0",
-    "eslint-plugin-jest": "27.4.2",
-    "eslint-plugin-unicorn": "49.0.0",
+    "eslint": "8.57.0",
+    "eslint-plugin-jest": "28.5.0",
+    "eslint-plugin-unicorn": "53.0.0",
     "esm": "https://github.com/jsg2021/esm/releases/download/v3.x.x-pr883/esm-3.x.x-pr883.tgz",
-    "glob": "10.3.10",
-    "google-closure-compiler": "20230802.0.0",
     "gulp": "4.0.2",
-    "gulp-esbuild": "0.11.1",
-    "gulp-json-transform": "0.4.8",
+    "glob": "10.4.1",
+    "google-closure-compiler": "20240317.0.0",
+    "gulp-esbuild": "0.12.1",
+    "gulp-json-transform": "0.5.0",
     "gulp-rename": "2.0.0",
     "gulp-replace": "1.1.4",
     "gulp-sourcemaps": "3.0.0",
     "gulp-terser": "2.1.0",
     "gulp-typescript": "5.0.1",
     "gulp-vinyl-size": "1.1.4",
-    "ix": "5.0.0",
-    "jest": "29.6.2",
-    "jest-silent-reporter": "0.5.0",
-    "memfs": "4.5.0",
+    "ix": "6.0.0",
+    "jest": "29.7.0",
+    "jest-silent-reporter": "0.6.0",
+    "memfs": "4.9.2",
     "mkdirp": "3.0.1",
     "multistream": "4.1.0",
     "regenerator-runtime": "0.14.1",
-    "rollup": "4.3.0",
+    "rollup": "4.18.0",
     "rxjs": "7.8.1",
-    "ts-jest": "29.1.1",
-    "ts-node": "10.9.1",
-    "typedoc": "0.24.8",
-    "typescript": "5.1.6",
+    "ts-jest": "29.1.4",
+    "ts-node": "10.9.2",
+    "typedoc": "0.26.3",
+    "typescript": "5.4.5",
     "vinyl-buffer": "1.0.1",
     "vinyl-named": "1.1.0",
     "vinyl-source-stream": "2.0.0",
     "web-streams-polyfill": "3.2.1",
-    "webpack": "5.86.0",
-    "webpack-bundle-analyzer": "4.10.1",
+    "webpack": "5.91.0",
+    "webpack-bundle-analyzer": "4.10.2",
     "webpack-stream": "7.0.0",
     "xml2js": "0.6.2"
   },
   "engines": {
     "node": ">=12.0"
   },
-  "version": "16.0.0-SNAPSHOT"
+  "version": "17.0.0-SNAPSHOT"
 }
diff --git a/js/src/bin/arrow2csv.ts b/js/src/bin/arrow2csv.ts
index 4115f30099f03..569e419faabe4 100755
--- a/js/src/bin/arrow2csv.ts
+++ b/js/src/bin/arrow2csv.ts
@@ -19,8 +19,8 @@
 
 /* eslint-disable unicorn/no-array-for-each */
 
-import * as fs from 'fs';
-import * as stream from 'stream';
+import * as fs from 'node:fs';
+import * as stream from 'node:stream';
 import { Schema, RecordBatch, RecordBatchReader, AsyncByteQueue, util } from '../Arrow.js';
 
 import * as commandLineUsage from 'command-line-usage';
diff --git a/js/src/builder.ts b/js/src/builder.ts
index 1880db3818ca5..5ae43a8836746 100644
--- a/js/src/builder.ts
+++ b/js/src/builder.ts
@@ -27,6 +27,11 @@ import {
 import { createIsValidFunction } from './builder/valid.js';
 import { BufferBuilder, BitmapBufferBuilder, DataBufferBuilder, OffsetsBufferBuilder } from './builder/buffer.js';
 
+import type { BuilderDuplexOptions } from './io/node/builder.js';
+import type { BuilderTransform, BuilderTransformOptions } from './io/whatwg/builder.js';
+
+import type { Duplex } from 'node:stream';
+
 /**
  * A set of options required to create a `Builder` instance for a given `DataType`.
  * @see {@link Builder}
@@ -98,12 +103,12 @@ export abstract class Builder<T extends DataType = any, TNull = any> {
 
     /** @nocollapse */
     // @ts-ignore
-    public static throughNode<T extends DataType = any, TNull = any>(options: import('./io/node/builder').BuilderDuplexOptions<T, TNull>): import('stream').Duplex {
+    public static throughNode<T extends DataType = any, TNull = any>(options: BuilderDuplexOptions<T, TNull>): Duplex {
         throw new Error(`"throughNode" not available in this environment`);
     }
     /** @nocollapse */
     // @ts-ignore
-    public static throughDOM<T extends DataType = any, TNull = any>(options: import('./io/whatwg/builder').BuilderTransformOptions<T, TNull>): import('./io/whatwg/builder').BuilderTransform<T, TNull> {
+    public static throughDOM<T extends DataType = any, TNull = any>(options: BuilderTransformOptions<T, TNull>): BuilderTransform<T, TNull> {
         throw new Error(`"throughDOM" not available in this environment`);
     }
 
diff --git a/js/src/data.ts b/js/src/data.ts
index 6f8792508858b..45fcc35d37676 100644
--- a/js/src/data.ts
+++ b/js/src/data.ts
@@ -109,7 +109,10 @@ export class Data<T extends DataType = DataType> {
         let nullCount = this._nullCount;
         let nullBitmap: Uint8Array | undefined;
         if (nullCount <= kUnknownNullCount && (nullBitmap = this.nullBitmap)) {
-            this._nullCount = nullCount = this.length - popcnt_bit_range(nullBitmap, this.offset, this.offset + this.length);
+            this._nullCount = nullCount = nullBitmap.length === 0 ?
+                // no null bitmap, so all values are valid
+                0 :
+                this.length - popcnt_bit_range(nullBitmap, this.offset, this.offset + this.length);
         }
         return nullCount;
     }
@@ -177,16 +180,16 @@ export class Data<T extends DataType = DataType> {
                 // if we have a nullBitmap, truncate + slice and set it over the pre-filled 1s
                 if (this.nullCount > 0) {
                     nullBitmap.set(truncateBitmap(offset, length, this.nullBitmap), 0);
+                    Object.assign(this, { nullBitmap });
+                } else {
+                    Object.assign(this, { nullBitmap, _nullCount: 0 });
                 }
-                Object.assign(this, { nullBitmap, _nullCount: -1 });
             }
 
             const byte = nullBitmap[byteOffset];
 
             prev = (byte & mask) !== 0;
-            value ?
-                (nullBitmap[byteOffset] = byte | mask) :
-                (nullBitmap[byteOffset] = byte & ~mask);
+            nullBitmap[byteOffset] = value ? (byte | mask) : (byte & ~mask);
         }
 
         if (prev !== !!value) {
diff --git a/js/src/factories.ts b/js/src/factories.ts
index aa54498c50bc0..657ae1b95ab92 100644
--- a/js/src/factories.ts
+++ b/js/src/factories.ts
@@ -65,7 +65,7 @@ export function makeBuilder<T extends dtypes.DataType = any, TNull = any>(option
 export function vectorFromArray(values: readonly (null | undefined)[], type?: dtypes.Null): Vector<dtypes.Null>;
 export function vectorFromArray(values: readonly (null | undefined | boolean)[], type?: dtypes.Bool): Vector<dtypes.Bool>;
 export function vectorFromArray<T extends dtypes.Utf8 | dtypes.Dictionary<dtypes.Utf8> = dtypes.Dictionary<dtypes.Utf8, dtypes.Int32>>(values: readonly (null | undefined | string)[], type?: T): Vector<T>;
-export function vectorFromArray<T extends dtypes.Date_>(values: readonly (null | undefined | Date)[], type?: T): Vector<T>;
+export function vectorFromArray<T extends dtypes.TimestampMillisecond>(values: readonly (null | undefined | Date)[], type?: T): Vector<T>;
 export function vectorFromArray<T extends dtypes.Int>(values: readonly (null | undefined | number)[], type: T): Vector<T>;
 export function vectorFromArray<T extends dtypes.Int64 | dtypes.Uint64 = dtypes.Int64>(values: readonly (null | undefined | bigint)[], type?: T): Vector<T>;
 export function vectorFromArray<T extends dtypes.Float = dtypes.Float64>(values: readonly (null | undefined | number)[], type?: T): Vector<T>;
@@ -145,7 +145,7 @@ function inferType(value: readonly unknown[]): dtypes.DataType {
     } else if (booleansCount + nullsCount === value.length) {
         return new dtypes.Bool;
     } else if (datesCount + nullsCount === value.length) {
-        return new dtypes.DateMillisecond;
+        return new dtypes.TimestampMillisecond;
     } else if (arraysCount + nullsCount === value.length) {
         const array = value as Array<unknown>[];
         const childType = inferType(array[array.findIndex((ary) => ary != null)]);
diff --git a/js/src/fb/.eslintrc.cjs b/js/src/fb/.eslintrc.cjs
index eb0fc1c7cdccb..b7fc1c0290903 100644
--- a/js/src/fb/.eslintrc.cjs
+++ b/js/src/fb/.eslintrc.cjs
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+/** @type {import('eslint').Linter.Config} */
 module.exports = {
     rules: {
         "@typescript-eslint/type-annotation-spacing": "off",
diff --git a/js/src/io/adapters.ts b/js/src/io/adapters.ts
index 05020314aa6b9..3118cba049dc5 100644
--- a/js/src/io/adapters.ts
+++ b/js/src/io/adapters.ts
@@ -25,6 +25,8 @@ import {
 
 import { ReadableDOMStreamOptions } from './interfaces.js';
 
+import type { ReadableOptions, Readable } from 'node:stream';
+
 type Uint8ArrayGenerator = Generator<Uint8Array, null, { cmd: 'peek' | 'read'; size: number }>;
 type AsyncUint8ArrayGenerator = AsyncGenerator<Uint8Array, null, { cmd: 'peek' | 'read'; size: number }>;
 
@@ -47,7 +49,7 @@ export default {
         throw new Error(`"toDOMStream" not available in this environment`);
     },
     // @ts-ignore
-    toNodeStream<T>(source: Iterable<T> | AsyncIterable<T>, options?: import('stream').ReadableOptions): import('stream').Readable {
+    toNodeStream<T>(source: Iterable<T> | AsyncIterable<T>, options?: ReadableOptions): Readable {
         throw new Error(`"toNodeStream" not available in this environment`);
     },
 };
@@ -71,7 +73,7 @@ function* fromIterable<T extends ArrayBufferViewInput>(source: Iterable<T> | T):
     }
 
     // Yield so the caller can inject the read command before creating the source Iterator
-    ({ cmd, size } = (yield (() => <any>null)()) || {cmd: 'read', size: 0});
+    ({ cmd, size } = (yield (() => <any>null)()) || { cmd: 'read', size: 0 });
 
     // initialize the iterator
     const it = toUint8ArrayIterator(source)[Symbol.iterator]();
@@ -117,7 +119,7 @@ async function* fromAsyncIterable<T extends ArrayBufferViewInput>(source: AsyncI
     }
 
     // Yield so the caller can inject the read command before creating the source AsyncIterator
-    ({ cmd, size } = (yield (() => <any>null)()) || {cmd: 'read', size: 0});
+    ({ cmd, size } = (yield (() => <any>null)()) || { cmd: 'read', size: 0 });
 
     // initialize the iterator
     const it = toUint8ArrayAsyncIterator(source)[Symbol.asyncIterator]();
@@ -167,7 +169,7 @@ async function* fromDOMStream<T extends ArrayBufferViewInput>(source: ReadableSt
     }
 
     // Yield so the caller can inject the read command before we establish the ReadableStream lock
-    ({ cmd, size } = (yield (() => <any>null)()) || {cmd: 'read', size: 0});
+    ({ cmd, size } = (yield (() => <any>null)()) || { cmd: 'read', size: 0 });
 
     // initialize the reader and lock the stream
     const it = new AdaptiveByteReader(source);
@@ -273,7 +275,7 @@ async function* fromNodeStream(stream: NodeJS.ReadableStream): AsyncUint8ArrayGe
 
     // Yield so the caller can inject the read command before we
     // add the listener for the source stream's 'readable' event.
-    ({ cmd, size } = (yield (() => <any>null)()) || {cmd: 'read', size: 0});
+    ({ cmd, size } = (yield (() => <any>null)()) || { cmd: 'read', size: 0 });
 
     // ignore stdin if it's a TTY
     if ((stream as any)['isTTY']) {
diff --git a/js/src/io/interfaces.ts b/js/src/io/interfaces.ts
index d69841bcbbb91..6775c3240b64c 100644
--- a/js/src/io/interfaces.ts
+++ b/js/src/io/interfaces.ts
@@ -17,11 +17,12 @@
 
 import streamAdapters from './adapters.js';
 
+export type { FileHandle } from 'node:fs/promises';
+import type { ReadableOptions, Readable as StreamReadable } from 'node:stream';
+
 /** @ignore */
 export const ITERATOR_DONE: any = Object.freeze({ done: true, value: void (0) });
 
-/** @ignore */
-export type FileHandle = import('fs').promises.FileHandle;
 /** @ignore */
 export type ArrowJSONLike = { schema: any; batches?: any[]; dictionaries?: any[] };
 /** @ignore */
@@ -60,14 +61,14 @@ export interface Writable<T> {
 export interface ReadableWritable<TReadable, TWritable> extends Readable<TReadable>, Writable<TWritable> {
     [Symbol.asyncIterator](): AsyncIterableIterator<TReadable>;
     toDOMStream(options?: ReadableDOMStreamOptions): ReadableStream<TReadable>;
-    toNodeStream(options?: import('stream').ReadableOptions): import('stream').Readable;
+    toNodeStream(options?: ReadableOptions): StreamReadable;
 }
 
 /** @ignore */
 export abstract class ReadableInterop<T> {
 
     public abstract toDOMStream(options?: ReadableDOMStreamOptions): ReadableStream<T>;
-    public abstract toNodeStream(options?: import('stream').ReadableOptions): import('stream').Readable;
+    public abstract toNodeStream(options?: ReadableOptions): StreamReadable;
 
     public tee(): [ReadableStream<T>, ReadableStream<T>] {
         return this._getDOMStream().tee();
@@ -85,7 +86,7 @@ export abstract class ReadableInterop<T> {
         return this._DOMStream || (this._DOMStream = this.toDOMStream());
     }
 
-    protected _nodeStream?: import('stream').Readable;
+    protected _nodeStream?: StreamReadable;
     private _getNodeStream() {
         return this._nodeStream || (this._nodeStream = this.toNodeStream());
     }
@@ -144,7 +145,7 @@ export class AsyncQueue<TReadable = Uint8Array, TWritable = TReadable> extends R
                 : (this._values as any) as Iterable<TReadable>,
             options);
     }
-    public toNodeStream(options?: import('stream').ReadableOptions) {
+    public toNodeStream(options?: ReadableOptions) {
         return streamAdapters.toNodeStream(
             (this._closedPromiseResolve || this._error)
                 ? (this as AsyncIterable<TReadable>)
diff --git a/js/src/io/node/builder.ts b/js/src/io/node/builder.ts
index be289f447f5da..1d02febac7ba9 100644
--- a/js/src/io/node/builder.ts
+++ b/js/src/io/node/builder.ts
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { Duplex } from 'stream';
+import { Duplex } from 'node:stream';
 import { DataType } from '../../type.js';
 import { Builder, BuilderOptions } from '../../builder.js';
 import { makeBuilder } from '../../factories.js';
diff --git a/js/src/io/node/iterable.ts b/js/src/io/node/iterable.ts
index 6698e7fa92915..67b2143ea2453 100644
--- a/js/src/io/node/iterable.ts
+++ b/js/src/io/node/iterable.ts
@@ -15,11 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { Readable } from 'stream';
+import { Readable, ReadableOptions as ReadableOptions_ } from 'node:stream';
 import { isIterable, isAsyncIterable } from '../../util/compat.js';
 
 /** @ignore */
-type ReadableOptions = import('stream').ReadableOptions;
+type ReadableOptions = ReadableOptions_;
 /** @ignore */
 type SourceIterator<T> = Generator<T, void, number | null>;
 /** @ignore */
diff --git a/js/src/io/node/reader.ts b/js/src/io/node/reader.ts
index e8bbf736aa651..87391b96d6878 100644
--- a/js/src/io/node/reader.ts
+++ b/js/src/io/node/reader.ts
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { Duplex, DuplexOptions } from 'stream';
+import { Duplex, DuplexOptions } from 'node:stream';
 import { AsyncByteQueue } from '../../io/stream.js';
 import { RecordBatchReader } from '../../ipc/reader.js';
 import { RecordBatch } from '../../recordbatch.js';
@@ -75,7 +75,7 @@ class RecordBatchReaderDuplex<T extends TypeMap = any> extends Duplex {
     async _pull(size: number, reader: RecordBatchReader<T>) {
         let r: IteratorResult<RecordBatch<T>> | null = null;
         while (this.readable && !(r = await reader.next()).done) {
-            if (!this.push(r.value) || (size != null && --size <= 0)) { break; }
+            if (!this.push(r!.value) || (size != null && --size <= 0)) { break; }
         }
         if (!this.readable || (r?.done && (reader.autoDestroy || (await reader.reset().open()).closed))) {
             this.push(null);
diff --git a/js/src/io/node/writer.ts b/js/src/io/node/writer.ts
index 5725ef7a5d726..fb426a968118d 100644
--- a/js/src/io/node/writer.ts
+++ b/js/src/io/node/writer.ts
@@ -15,7 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { Duplex, DuplexOptions } from 'stream';
+import { Duplex } from 'node:stream';
+import type { DuplexOptions } from 'node:stream';
 import { AsyncByteStream } from '../../io/stream.js';
 import { RecordBatchWriter } from '../../ipc/writer.js';
 import { TypeMap } from '../../type.js';
diff --git a/js/src/io/whatwg/reader.ts b/js/src/io/whatwg/reader.ts
index 7c4b2ec3974bb..6e63a1e35eecf 100644
--- a/js/src/io/whatwg/reader.ts
+++ b/js/src/io/whatwg/reader.ts
@@ -42,7 +42,7 @@ export function recordBatchReaderThroughDOMStream<T extends TypeMap = any>(writa
         let size = controller.desiredSize;
         let r: IteratorResult<RecordBatch<T>> | null = null;
         while (!(r = await reader.next()).done) {
-            controller.enqueue(r.value);
+            controller.enqueue(r!.value);
             if (size != null && --size <= 0) {
                 return;
             }
diff --git a/js/src/ipc/reader.ts b/js/src/ipc/reader.ts
index e4dac0606aa47..f84fe83db08d4 100644
--- a/js/src/ipc/reader.ts
+++ b/js/src/ipc/reader.ts
@@ -47,6 +47,8 @@ import {
     isReadableDOMStream, isReadableNodeStream
 } from '../util/compat.js';
 
+import type { DuplexOptions, Duplex } from 'node:stream';
+
 /** @ignore */ export type FromArg0 = ArrowJSONLike;
 /** @ignore */ export type FromArg1 = PromiseLike<ArrowJSONLike>;
 /** @ignore */ export type FromArg2 = Iterable<ArrayBufferViewInput> | ArrayBufferViewInput;
@@ -113,13 +115,13 @@ export class RecordBatchReader<T extends TypeMap = any> extends ReadableInterop<
     public [Symbol.asyncIterator](): AsyncIterableIterator<RecordBatch<T>> {
         return (<AsyncIterableIterator<RecordBatch<T>>>this._impl)[Symbol.asyncIterator]();
     }
-    public toDOMStream() {
+    public toDOMStream(): ReadableStream<RecordBatch<T>> {
         return streamAdapters.toDOMStream<RecordBatch<T>>(
             (this.isSync()
                 ? { [Symbol.iterator]: () => this } as Iterable<RecordBatch<T>>
                 : { [Symbol.asyncIterator]: () => this } as AsyncIterable<RecordBatch<T>>));
     }
-    public toNodeStream() {
+    public toNodeStream(): import('stream').Readable {
         return streamAdapters.toNodeStream<RecordBatch<T>>(
             (this.isSync()
                 ? { [Symbol.iterator]: () => this } as Iterable<RecordBatch<T>>
@@ -129,7 +131,7 @@ export class RecordBatchReader<T extends TypeMap = any> extends ReadableInterop<
 
     /** @nocollapse */
     // @ts-ignore
-    public static throughNode(options?: import('stream').DuplexOptions & { autoDestroy: boolean }): import('stream').Duplex {
+    public static throughNode(options?: DuplexOptions & { autoDestroy: boolean }): Duplex {
         throw new Error(`"throughNode" not available in this environment`);
     }
     /** @nocollapse */
@@ -361,14 +363,11 @@ abstract class RecordBatchReaderImpl<T extends TypeMap = any> implements RecordB
         const { id, isDelta } = header;
         const { dictionaries, schema } = this;
         const dictionary = dictionaries.get(id);
-        if (isDelta || !dictionary) {
-            const type = schema.dictionaries.get(id)!;
-            const data = this._loadVectors(header.data, body, [type]);
-            return (dictionary && isDelta ? dictionary.concat(
-                new Vector(data)) :
-                new Vector(data)).memoize() as Vector;
-        }
-        return dictionary.memoize();
+        const type = schema.dictionaries.get(id)!;
+        const data = this._loadVectors(header.data, body, [type]);
+        return (dictionary && isDelta ? dictionary.concat(
+            new Vector(data)) :
+            new Vector(data)).memoize() as Vector;
     }
     protected _loadVectors(header: metadata.RecordBatch, body: any, types: (Field | DataType)[]) {
         return new VectorLoader(body, header.nodes, header.buffers, this.dictionaries, this.schema.metadataVersion).visitMany(types);
diff --git a/js/src/ipc/writer.ts b/js/src/ipc/writer.ts
index 565b0825bd9be..cb74fe6fb6705 100644
--- a/js/src/ipc/writer.ts
+++ b/js/src/ipc/writer.ts
@@ -35,6 +35,8 @@ import { RecordBatch, _InternalEmptyPlaceholderRecordBatch } from '../recordbatc
 import { Writable, ReadableInterop, ReadableDOMStreamOptions } from '../io/interfaces.js';
 import { isPromise, isAsyncIterable, isWritableDOMStream, isWritableNodeStream, isIterable, isObject } from '../util/compat.js';
 
+import type { DuplexOptions, Duplex, ReadableOptions } from 'node:stream';
+
 export interface RecordBatchStreamWriterOptions {
     /**
      *
@@ -53,7 +55,7 @@ export class RecordBatchWriter<T extends TypeMap = any> extends ReadableInterop<
 
     /** @nocollapse */
     // @ts-ignore
-    public static throughNode(options?: import('stream').DuplexOptions & { autoDestroy: boolean }): import('stream').Duplex {
+    public static throughNode(options?: DuplexOptions & { autoDestroy: boolean }): Duplex {
         throw new Error(`"throughNode" not available in this environment`);
     }
     /** @nocollapse */
@@ -82,6 +84,7 @@ export class RecordBatchWriter<T extends TypeMap = any> extends ReadableInterop<
     protected _schema: Schema | null = null;
     protected _dictionaryBlocks: FileBlock[] = [];
     protected _recordBatchBlocks: FileBlock[] = [];
+    protected _seenDictionaries = new Map<number, Vector>();
     protected _dictionaryDeltaOffsets = new Map<number, number>();
 
     public toString(sync: true): string;
@@ -111,7 +114,7 @@ export class RecordBatchWriter<T extends TypeMap = any> extends ReadableInterop<
     public get closed() { return this._sink.closed; }
     public [Symbol.asyncIterator]() { return this._sink[Symbol.asyncIterator](); }
     public toDOMStream(options?: ReadableDOMStreamOptions) { return this._sink.toDOMStream(options); }
-    public toNodeStream(options?: import('stream').ReadableOptions) { return this._sink.toNodeStream(options); }
+    public toNodeStream(options?: ReadableOptions) { return this._sink.toNodeStream(options); }
 
     public close() {
         return this.reset()._sink.close();
@@ -142,6 +145,7 @@ export class RecordBatchWriter<T extends TypeMap = any> extends ReadableInterop<
         this._started = false;
         this._dictionaryBlocks = [];
         this._recordBatchBlocks = [];
+        this._seenDictionaries = new Map();
         this._dictionaryDeltaOffsets = new Map();
 
         if (!schema || !(compareSchemas(schema, this._schema))) {
@@ -257,7 +261,6 @@ export class RecordBatchWriter<T extends TypeMap = any> extends ReadableInterop<
     }
 
     protected _writeDictionaryBatch(dictionary: Data, id: number, isDelta = false) {
-        this._dictionaryDeltaOffsets.set(id, dictionary.length + (this._dictionaryDeltaOffsets.get(id) || 0));
         const { byteLength, nodes, bufferRegions, buffers } = VectorAssembler.assemble(new Vector([dictionary]));
         const recordBatch = new metadata.RecordBatch(dictionary.length, nodes, bufferRegions);
         const dictionaryBatch = new metadata.DictionaryBatch(recordBatch, id, isDelta);
@@ -282,14 +285,21 @@ export class RecordBatchWriter<T extends TypeMap = any> extends ReadableInterop<
     }
 
     protected _writeDictionaries(batch: RecordBatch<T>) {
-        for (let [id, dictionary] of batch.dictionaries) {
-            let offset = this._dictionaryDeltaOffsets.get(id) || 0;
-            if (offset === 0 || (dictionary = dictionary?.slice(offset)).length > 0) {
-                for (const data of dictionary.data) {
-                    this._writeDictionaryBatch(data, id, offset > 0);
-                    offset += data.length;
-                }
+        for (const [id, dictionary] of batch.dictionaries) {
+            const chunks = dictionary?.data ?? [];
+            const prevDictionary = this._seenDictionaries.get(id);
+            const offset = this._dictionaryDeltaOffsets.get(id) ?? 0;
+            // * If no previous dictionary was written, write an initial DictionaryMessage.
+            // * If the current dictionary does not share chunks with the previous dictionary, write a replacement DictionaryMessage.
+            if (!prevDictionary || prevDictionary.data[0] !== chunks[0]) {
+                // * If `index > 0`, then `isDelta` is true.
+                // * If `index = 0`, then `isDelta` is false, because this is either the initial or a replacement DictionaryMessage.
+                for (const [index, chunk] of chunks.entries()) this._writeDictionaryBatch(chunk, id, index > 0);
+            } else if (offset < chunks.length) {
+                for (const chunk of chunks.slice(offset)) this._writeDictionaryBatch(chunk, id, true);
             }
+            this._seenDictionaries.set(id, dictionary);
+            this._dictionaryDeltaOffsets.set(id, chunks.length);
         }
         return this;
     }
@@ -340,6 +350,13 @@ export class RecordBatchFileWriter<T extends TypeMap = any> extends RecordBatchW
         return this._writeMagic()._writePadding(2);
     }
 
+    protected _writeDictionaryBatch(dictionary: Data, id: number, isDelta = false) {
+        if (!isDelta && this._seenDictionaries.has(id)) {
+            throw new Error('The Arrow File format does not support replacement dictionaries. ');
+        }
+        return super._writeDictionaryBatch(dictionary, id, isDelta);
+    }
+
     protected _writeFooter(schema: Schema<T>) {
         const buffer = Footer.encode(new Footer(
             schema, MetadataVersion.V5,
@@ -367,13 +384,13 @@ export class RecordBatchJSONWriter<T extends TypeMap = any> extends RecordBatchW
     }
 
     private _recordBatches: RecordBatch[];
-    private _dictionaries: RecordBatch[];
+    private _recordBatchesWithDictionaries: RecordBatch[];
 
     constructor() {
         super();
         this._autoDestroy = true;
         this._recordBatches = [];
-        this._dictionaries = [];
+        this._recordBatchesWithDictionaries = [];
     }
 
     protected _writeMessage() { return this; }
@@ -384,12 +401,11 @@ export class RecordBatchJSONWriter<T extends TypeMap = any> extends RecordBatchW
     }
     protected _writeDictionaries(batch: RecordBatch<T>) {
         if (batch.dictionaries.size > 0) {
-            this._dictionaries.push(batch);
+            this._recordBatchesWithDictionaries.push(batch);
         }
         return this;
     }
     protected _writeDictionaryBatch(dictionary: Data, id: number, isDelta = false) {
-        this._dictionaryDeltaOffsets.set(id, dictionary.length + (this._dictionaryDeltaOffsets.get(id) || 0));
         this._write(this._dictionaryBlocks.length === 0 ? `    ` : `,\n    `);
         this._write(dictionaryBatchToJSON(dictionary, id, isDelta));
         this._dictionaryBlocks.push(new FileBlock(0, 0, 0));
@@ -401,9 +417,9 @@ export class RecordBatchJSONWriter<T extends TypeMap = any> extends RecordBatchW
         return this;
     }
     public close() {
-        if (this._dictionaries.length > 0) {
+        if (this._recordBatchesWithDictionaries.length > 0) {
             this._write(`,\n  "dictionaries": [\n`);
-            for (const batch of this._dictionaries) {
+            for (const batch of this._recordBatchesWithDictionaries) {
                 super._writeDictionaries(batch);
             }
             this._write(`\n  ]`);
@@ -422,7 +438,7 @@ export class RecordBatchJSONWriter<T extends TypeMap = any> extends RecordBatchW
             this._write(`\n}`);
         }
 
-        this._dictionaries = [];
+        this._recordBatchesWithDictionaries = [];
         this._recordBatches = [];
 
         return super.close();
diff --git a/js/src/recordbatch.ts b/js/src/recordbatch.ts
index b9061c8b9bb04..33dbe9e59cb14 100644
--- a/js/src/recordbatch.ts
+++ b/js/src/recordbatch.ts
@@ -20,6 +20,7 @@ import { Table } from './table.js';
 import { Vector } from './vector.js';
 import { Schema, Field } from './schema.js';
 import { DataType, Struct, Null, TypeMap } from './type.js';
+import { wrapIndex } from './util/vector.js';
 
 import { instance as getVisitor } from './visitor/get.js';
 import { instance as setVisitor } from './visitor/set.js';
@@ -116,7 +117,7 @@ export class RecordBatch<T extends TypeMap = any> {
     }
 
     /**
-     * Check whether an element is null.
+     * Check whether an row is null.
      * @param index The index at which to read the validity bitmap.
      */
     public isValid(index: number) {
@@ -125,15 +126,23 @@ export class RecordBatch<T extends TypeMap = any> {
 
     /**
      * Get a row by position.
-     * @param index The index of the element to read.
+     * @param index The index of the row to read.
      */
     public get(index: number) {
         return getVisitor.visit(this.data, index);
     }
 
+    /**
+      * Get a row value by position.
+      * @param index The index of the row to read. A negative index will count back from the last row.
+      */
+    public at(index: number) {
+        return this.get(wrapIndex(index, this.numRows));
+    }
+
     /**
      * Set a row by position.
-     * @param index The index of the element to write.
+     * @param index The index of the row to write.
      * @param value The value to set.
      */
     public set(index: number, value: Struct<T>['TValue']) {
@@ -175,7 +184,7 @@ export class RecordBatch<T extends TypeMap = any> {
     /**
      * Return a zero-copy sub-section of this RecordBatch.
      * @param start The beginning of the specified portion of the RecordBatch.
-     * @param end The end of the specified portion of the RecordBatch. This is exclusive of the element at the index 'end'.
+     * @param end The end of the specified portion of the RecordBatch. This is exclusive of the row at the index 'end'.
      */
     public slice(begin?: number, end?: number): RecordBatch<T> {
         const [slice] = new Vector([this.data]).slice(begin, end).data;
diff --git a/js/src/row/map.ts b/js/src/row/map.ts
index d0ccb872ec33c..9f826f083b355 100644
--- a/js/src/row/map.ts
+++ b/js/src/row/map.ts
@@ -24,6 +24,8 @@ import { instance as setVisitor } from '../visitor/set.js';
 
 /** @ignore */ export const kKeys = Symbol.for('keys');
 /** @ignore */ export const kVals = Symbol.for('vals');
+/** @ignore */ export const kKeysAsStrings = Symbol.for('kKeysAsStrings');
+/** @ignore */ export const _kKeysAsStrings = Symbol.for('_kKeysAsStrings');
 
 export class MapRow<K extends DataType = any, V extends DataType = any> {
 
@@ -31,6 +33,7 @@ export class MapRow<K extends DataType = any, V extends DataType = any> {
 
     declare private [kKeys]: Vector<K>;
     declare private [kVals]: Data<V>;
+    declare private [_kKeysAsStrings]: string[];
 
     constructor(slice: Data<Struct<{ key: K; value: V }>>) {
         this[kKeys] = new Vector([slice.children[0]]).memoize() as Vector<K>;
@@ -38,6 +41,11 @@ export class MapRow<K extends DataType = any, V extends DataType = any> {
         return new Proxy(this, new MapRowProxyHandler<K, V>());
     }
 
+    /** @ignore */
+    get [kKeysAsStrings]() {
+        return this[_kKeysAsStrings] || (this[_kKeysAsStrings] = Array.from(this[kKeys].toArray(), String));
+    }
+
     [Symbol.iterator]() {
         return new MapRowIterator(this[kKeys], this[kVals]);
     }
@@ -107,13 +115,13 @@ class MapRowProxyHandler<K extends DataType = any, V extends DataType = any> imp
     deleteProperty() { return false; }
     preventExtensions() { return true; }
     ownKeys(row: MapRow<K, V>) {
-        return row[kKeys].toArray().map(String);
+        return row[kKeysAsStrings];
     }
     has(row: MapRow<K, V>, key: string | symbol) {
-        return row[kKeys].includes(key);
+        return row[kKeysAsStrings].includes(key as string);
     }
     getOwnPropertyDescriptor(row: MapRow<K, V>, key: string | symbol) {
-        const idx = row[kKeys].indexOf(key);
+        const idx = row[kKeysAsStrings].indexOf(key as string);
         if (idx !== -1) {
             return { writable: true, enumerable: true, configurable: true };
         }
@@ -124,7 +132,7 @@ class MapRowProxyHandler<K extends DataType = any, V extends DataType = any> imp
         if (Reflect.has(row, key)) {
             return (row as any)[key];
         }
-        const idx = row[kKeys].indexOf(key);
+        const idx = row[kKeysAsStrings].indexOf(key as string);
         if (idx !== -1) {
             const val = getVisitor.visit(Reflect.get(row, kVals), idx);
             // Cache key/val lookups
@@ -133,7 +141,7 @@ class MapRowProxyHandler<K extends DataType = any, V extends DataType = any> imp
         }
     }
     set(row: MapRow<K, V>, key: string | symbol, val: V) {
-        const idx = row[kKeys].indexOf(key);
+        const idx = row[kKeysAsStrings].indexOf(key as string);
         if (idx !== -1) {
             setVisitor.visit(Reflect.get(row, kVals), idx, val);
             // Cache key/val lookups
@@ -149,4 +157,5 @@ Object.defineProperties(MapRow.prototype, {
     [Symbol.toStringTag]: { enumerable: false, configurable: false, value: 'Row' },
     [kKeys]: { writable: true, enumerable: false, configurable: false, value: null },
     [kVals]: { writable: true, enumerable: false, configurable: false, value: null },
+    [_kKeysAsStrings]: { writable: true, enumerable: false, configurable: false, value: null },
 });
diff --git a/js/src/schema.ts b/js/src/schema.ts
index a5b1dcb56665c..2eb33b7853a97 100644
--- a/js/src/schema.ts
+++ b/js/src/schema.ts
@@ -33,7 +33,7 @@ export class Schema<T extends TypeMap = any> {
         this.fields = (fields || []) as Field<T[keyof T]>[];
         this.metadata = metadata || new Map();
         if (!dictionaries) {
-            dictionaries = generateDictionaryMap(fields);
+            dictionaries = generateDictionaryMap(this.fields);
         }
         this.dictionaries = dictionaries;
         this.metadataVersion = metadataVersion;
diff --git a/js/src/table.ts b/js/src/table.ts
index d7a6617530a8e..2aab2b7ec2e76 100644
--- a/js/src/table.ts
+++ b/js/src/table.ts
@@ -40,7 +40,7 @@ import { instance as indexOfVisitor } from './visitor/indexof.js';
 import { instance as iteratorVisitor } from './visitor/iterator.js';
 
 import { DataProps } from './data.js';
-import { clampRange } from './util/vector.js';
+import { clampRange, wrapIndex } from './util/vector.js';
 import { ArrayDataType, BigIntArray, TypedArray, TypedArrayDataType } from './interfaces.js';
 import { RecordBatch, _InternalEmptyPlaceholderRecordBatch } from './recordbatch.js';
 
@@ -196,6 +196,15 @@ export class Table<T extends TypeMap = any> {
     // @ts-ignore
     public get(index: number): Struct<T>['TValue'] | null { return null; }
 
+    /**
+      * Get an element value by position.
+      * @param index The index of the element to read. A negative index will count back from the last element.
+      */
+    // @ts-ignore
+    public at(index: number): Struct<T>['TValue'] | null {
+        return this.get(wrapIndex(index, this.numRows));
+    }
+
     /**
      * Set an element value by position.
      *
diff --git a/js/src/type.ts b/js/src/type.ts
index ae3aefa025999..88aadb864ec1d 100644
--- a/js/src/type.ts
+++ b/js/src/type.ts
@@ -333,23 +333,47 @@ export class Decimal extends DataType<Type.Decimal> {
 /** @ignore */
 export type Dates = Type.Date | Type.DateDay | Type.DateMillisecond;
 /** @ignore */
-export interface Date_<T extends Dates = Dates> extends DataType<T> { TArray: Int32Array; TValue: Date; ArrayType: TypedArrayConstructor<Int32Array> }
+type DateType = {
+    [Type.Date]: { TArray: Int32Array | BigInt64Array };
+    [Type.DateDay]: { TArray: Int32Array };
+    [Type.DateMillisecond]: { TArray: BigInt64Array };
+};
+/** @ignore */
+export interface Date_<T extends Dates = Dates> extends DataType<T> {
+    TArray: DateType[T]['TArray'];
+    TValue: number;
+}
 /** @ignore */
 export class Date_<T extends Dates = Dates> extends DataType<T> {
     constructor(public readonly unit: DateUnit) {
         super(Type.Date as T);
     }
     public toString() { return `Date${(this.unit + 1) * 32}<${DateUnit[this.unit]}>`; }
+
+    public get ArrayType() {
+        return this.unit === DateUnit.DAY ? Int32Array : BigInt64Array;
+    }
     protected static [Symbol.toStringTag] = ((proto: Date_) => {
         (<any>proto).unit = null;
-        (<any>proto).ArrayType = Int32Array;
         return proto[Symbol.toStringTag] = 'Date';
     })(Date_.prototype);
 }
 
 /** @ignore */
 export class DateDay extends Date_<Type.DateDay> { constructor() { super(DateUnit.DAY); } }
-/** @ignore */
+/**
+ * A signed 64-bit date representing the elapsed time since UNIX epoch (1970-01-01) in milliseconds.
+ * According to the specification, this should be treated as the number of days, in milliseconds,  since the UNIX epoch.
+ * Therefore, values must be evenly divisible by `86_400_000` (the number of milliseconds in a standard day).
+ *
+ * Practically, validation that values of this type are evenly divisible by `86_400_000` is not enforced by this library
+ * for performance and usability reasons.
+ *
+ * Users should prefer to use {@link DateDay} to cleanly represent the number of days. For JS dates,
+ * {@link TimestampMillisecond} is the preferred type.
+ *
+ * @ignore
+ */
 export class DateMillisecond extends Date_<Type.DateMillisecond> { constructor() { super(DateUnit.MILLISECOND); } }
 
 /** @ignore */
@@ -405,9 +429,9 @@ export class TimeNanosecond extends Time_<Type.TimeNanosecond> { constructor() {
 type Timestamps = Type.Timestamp | Type.TimestampSecond | Type.TimestampMillisecond | Type.TimestampMicrosecond | Type.TimestampNanosecond;
 /** @ignore */
 interface Timestamp_<T extends Timestamps = Timestamps> extends DataType<T> {
-    TArray: Int32Array;
+    TArray: BigInt64Array;
     TValue: number;
-    ArrayType: TypedArrayConstructor<Int32Array>;
+    ArrayType: BigIntArrayConstructor<BigInt64Array>;
 }
 
 /** @ignore */
@@ -420,7 +444,7 @@ class Timestamp_<T extends Timestamps = Timestamps> extends DataType<T> {
     protected static [Symbol.toStringTag] = ((proto: Timestamp_) => {
         (<any>proto).unit = null;
         (<any>proto).timezone = null;
-        (<any>proto).ArrayType = Int32Array;
+        (<any>proto).ArrayType = BigInt64Array;
         return proto[Symbol.toStringTag] = 'Timestamp';
     })(Timestamp_.prototype);
 }
@@ -471,7 +495,7 @@ type Durations = Type.Duration | Type.DurationSecond | Type.DurationMillisecond
 export interface Duration<T extends Durations = Durations> extends DataType<T> {
     TArray: BigInt64Array;
     TValue: bigint;
-    ArrayType: BigInt64Array;
+    ArrayType: BigIntArrayConstructor<BigInt64Array>;
 }
 
 /** @ignore */
@@ -725,8 +749,6 @@ export function strideForType(type: DataType) {
     const t: any = type;
     switch (type.typeId) {
         case Type.Decimal: return (type as Decimal).bitWidth / 32;
-        case Type.Timestamp: return 2;
-        case Type.Date: return 1 + (t as Date_).unit;
         case Type.Interval: return 1 + (t as Interval_).unit;
         // case Type.Int: return 1 + +((t as Int_).bitWidth > 32);
         // case Type.Time: return 1 + +((t as Time_).bitWidth > 32);
diff --git a/js/src/util/bigint.ts b/js/src/util/bigint.ts
index 5af2f7f052386..470b83f5fba55 100644
--- a/js/src/util/bigint.ts
+++ b/js/src/util/bigint.ts
@@ -24,3 +24,16 @@ export function bigIntToNumber(number: bigint | number): number {
     }
     return Number(number);
 }
+
+/**
+ * Duivides the bigint number by the divisor and returns the result as a number.
+ * Dividing bigints always results in bigints so we don't get the remainder.
+ * This function gives us the remainder but assumes that the result fits into a number.
+ *
+ * @param number The number to divide.
+ * @param divisor The divisor.
+ * @returns The result of the division as a number.
+ */
+export function divideBigInts(number: bigint, divisor: bigint): number {
+    return bigIntToNumber(number / divisor) + bigIntToNumber(number % divisor) / bigIntToNumber(divisor);
+}
diff --git a/js/src/util/compat.ts b/js/src/util/compat.ts
index 0948e8bea2f1d..73af3087eae65 100644
--- a/js/src/util/compat.ts
+++ b/js/src/util/compat.ts
@@ -17,12 +17,14 @@
 
 import { ReadableInterop, ArrowJSONLike } from '../io/interfaces.js';
 
-/* eslint-disable unicorn/throw-new-error */
+import type { ByteBuffer } from 'flatbuffers';
+import type { ReadStream } from 'node:fs';
+import type { FileHandle as FileHandle_ } from 'node:fs/promises';
 
 /** @ignore */
-type FSReadStream = import('fs').ReadStream;
+type FSReadStream = ReadStream;
 /** @ignore */
-type FileHandle = import('fs').promises.FileHandle;
+type FileHandle = FileHandle_;
 
 /** @ignore */
 export interface Subscription {
@@ -145,7 +147,7 @@ export const isReadableNodeStream = (x: any): x is NodeJS.ReadableStream => {
 };
 
 /** @ignore */
-export const isFlatbuffersByteBuffer = (x: any): x is import('flatbuffers').ByteBuffer => {
+export const isFlatbuffersByteBuffer = (x: any): x is ByteBuffer => {
     return isObject(x) &&
         isFunction(x['clear']) &&
         isFunction(x['bytes']) &&
diff --git a/js/src/util/vector.ts b/js/src/util/vector.ts
index 179b17a39f3f3..9414aef68ca42 100644
--- a/js/src/util/vector.ts
+++ b/js/src/util/vector.ts
@@ -23,19 +23,8 @@ import { compareArrayLike } from '../util/buffer.js';
 /** @ignore */
 type RangeLike = { length: number; stride?: number };
 /** @ignore */
-type ClampThen<T extends RangeLike> = (source: T, index: number) => any;
-/** @ignore */
 type ClampRangeThen<T extends RangeLike> = (source: T, offset: number, length: number) => any;
 
-export function clampIndex<T extends RangeLike>(source: T, index: number): number;
-export function clampIndex<T extends RangeLike, N extends ClampThen<T> = ClampThen<T>>(source: T, index: number, then: N): ReturnType<N>;
-/** @ignore */
-export function clampIndex<T extends RangeLike, N extends ClampThen<T> = ClampThen<T>>(source: T, index: number, then?: N) {
-    const length = source.length;
-    const adjust = index > -1 ? index : (length + (index % length));
-    return then ? then(source, adjust) : adjust;
-}
-
 /** @ignore */
 let tmp: number;
 export function clampRange<T extends RangeLike>(source: T, begin: number | undefined, end: number | undefined): [number, number];
@@ -60,6 +49,9 @@ export function clampRange<T extends RangeLike, N extends ClampRangeThen<T> = Cl
     return then ? then(source, lhs, rhs) : [lhs, rhs];
 }
 
+/** @ignore */
+export const wrapIndex = (index: number, len: number) => index < 0 ? (len + index) : index;
+
 const isNaNFast = (value: any) => value !== value;
 
 /** @ignore */
diff --git a/js/src/vector.ts b/js/src/vector.ts
index a7c103bc326ee..aeaa1c134241f 100644
--- a/js/src/vector.ts
+++ b/js/src/vector.ts
@@ -16,7 +16,7 @@
 // under the License.
 
 import { Type } from './enum.js';
-import { clampRange } from './util/vector.js';
+import { clampRange, wrapIndex } from './util/vector.js';
 import { DataType, strideForType } from './type.js';
 import { Data, makeData, DataProps } from './data.js';
 import { BigIntArray, TypedArray, TypedArrayDataType } from './interfaces.js';
@@ -177,6 +177,14 @@ export class Vector<T extends DataType = any> {
     // @ts-ignore
     public get(index: number): T['TValue'] | null { return null; }
 
+    /**
+     * Get an element value by position.
+     * @param index The index of the element to read. A negative index will count back from the last element.
+     */
+    public at(index: number): T['TValue'] | null {
+        return this.get(wrapIndex(index, this.length));
+    }
+
     /**
      * Set an element value by position.
      * @param index The index of the element to write.
@@ -445,7 +453,7 @@ export function makeVector(init: any) {
             if (init instanceof DataView) {
                 init = new Uint8Array(init.buffer);
             }
-            const props = { offset: 0, length: init.length, nullCount: 0, data: init };
+            const props = { offset: 0, length: init.length, nullCount: -1, data: init };
             if (init instanceof Int8Array) { return new Vector([makeData({ ...props, type: new dtypes.Int8 })]); }
             if (init instanceof Int16Array) { return new Vector([makeData({ ...props, type: new dtypes.Int16 })]); }
             if (init instanceof Int32Array) { return new Vector([makeData({ ...props, type: new dtypes.Int32 })]); }
diff --git a/js/src/visitor/get.ts b/js/src/visitor/get.ts
index 3ab3bcb68c386..ddfc04884f8a6 100644
--- a/js/src/visitor/get.ts
+++ b/js/src/visitor/get.ts
@@ -21,7 +21,7 @@ import { Vector } from '../vector.js';
 import { Visitor } from '../visitor.js';
 import { MapRow } from '../row/map.js';
 import { StructRow, StructRowProxy } from '../row/struct.js';
-import { bigIntToNumber } from '../util/bigint.js';
+import { bigIntToNumber, divideBigInts } from '../util/bigint.js';
 import { decodeUtf8 } from '../util/utf8.js';
 import { TypeToDataType } from '../interfaces.js';
 import { uint16ToFloat64 } from '../util/math.js';
@@ -106,13 +106,6 @@ function wrapGet<T extends DataType>(fn: (data: Data<T>, _1: any) => any) {
 }
 
 /** @ignore */const epochDaysToMs = (data: Int32Array, index: number) => 86400000 * data[index];
-/** @ignore */const epochMillisecondsLongToMs = (data: Int32Array, index: number) => 4294967296 * (data[index + 1]) + (data[index] >>> 0);
-/** @ignore */const epochMicrosecondsLongToMs = (data: Int32Array, index: number) => 4294967296 * (data[index + 1] / 1000) + ((data[index] >>> 0) / 1000);
-/** @ignore */const epochNanosecondsLongToMs = (data: Int32Array, index: number) => 4294967296 * (data[index + 1] / 1000000) + ((data[index] >>> 0) / 1000000);
-
-/** @ignore */const epochMillisecondsToDate = (epochMs: number) => new Date(epochMs);
-/** @ignore */const epochDaysToDate = (data: Int32Array, index: number) => epochMillisecondsToDate(epochDaysToMs(data, index));
-/** @ignore */const epochMillisecondsLongToDate = (data: Int32Array, index: number) => epochMillisecondsToDate(epochMillisecondsLongToMs(data, index));
 
 /** @ignore */
 const getNull = <T extends Null>(_data: Data<T>, _index: number): T['TValue'] => null;
@@ -139,9 +132,9 @@ type Numeric1X = Int8 | Int16 | Int32 | Uint8 | Uint16 | Uint32 | Float32 | Floa
 type Numeric2X = Int64 | Uint64;
 
 /** @ignore */
-const getDateDay = <T extends DateDay>({ values }: Data<T>, index: number): T['TValue'] => epochDaysToDate(values, index);
+const getDateDay = <T extends DateDay>({ values }: Data<T>, index: number): T['TValue'] => epochDaysToMs(values, index);
 /** @ignore */
-const getDateMillisecond = <T extends DateMillisecond>({ values }: Data<T>, index: number): T['TValue'] => epochMillisecondsLongToDate(values, index * 2);
+const getDateMillisecond = <T extends DateMillisecond>({ values }: Data<T>, index: number): T['TValue'] => bigIntToNumber(values[index]);
 /** @ignore */
 const getNumeric = <T extends Numeric1X>({ stride, values }: Data<T>, index: number): T['TValue'] => values[stride * index];
 /** @ignore */
@@ -178,13 +171,13 @@ const getDate = <T extends Date_>(data: Data<T>, index: number): T['TValue'] =>
 );
 
 /** @ignore */
-const getTimestampSecond = <T extends TimestampSecond>({ values }: Data<T>, index: number): T['TValue'] => 1000 * epochMillisecondsLongToMs(values, index * 2);
+const getTimestampSecond = <T extends TimestampSecond>({ values }: Data<T>, index: number): T['TValue'] => 1000 * bigIntToNumber(values[index]);
 /** @ignore */
-const getTimestampMillisecond = <T extends TimestampMillisecond>({ values }: Data<T>, index: number): T['TValue'] => epochMillisecondsLongToMs(values, index * 2);
+const getTimestampMillisecond = <T extends TimestampMillisecond>({ values }: Data<T>, index: number): T['TValue'] => bigIntToNumber(values[index]);
 /** @ignore */
-const getTimestampMicrosecond = <T extends TimestampMicrosecond>({ values }: Data<T>, index: number): T['TValue'] => epochMicrosecondsLongToMs(values, index * 2);
+const getTimestampMicrosecond = <T extends TimestampMicrosecond>({ values }: Data<T>, index: number): T['TValue'] => divideBigInts(values[index], BigInt(1000));
 /** @ignore */
-const getTimestampNanosecond = <T extends TimestampNanosecond>({ values }: Data<T>, index: number): T['TValue'] => epochNanosecondsLongToMs(values, index * 2);
+const getTimestampNanosecond = <T extends TimestampNanosecond>({ values }: Data<T>, index: number): T['TValue'] => divideBigInts(values[index], BigInt(1000000));
 /* istanbul ignore next */
 /** @ignore */
 const getTimestamp = <T extends Timestamp>(data: Data<T>, index: number): T['TValue'] => {
diff --git a/js/src/visitor/iterator.ts b/js/src/visitor/iterator.ts
index bf7e9d1591b40..2a55f743679b6 100644
--- a/js/src/visitor/iterator.ts
+++ b/js/src/visitor/iterator.ts
@@ -101,10 +101,11 @@ function vectorIterator<T extends DataType>(vector: Vector<T>): IterableIterator
 
     // Fast case, defer to native iterators if possible
     if (vector.nullCount === 0 && vector.stride === 1 && (
-        (type.typeId === Type.Timestamp) ||
-        (type instanceof Int && (type as Int).bitWidth !== 64) ||
-        (type instanceof Time && (type as Time).bitWidth !== 64) ||
-        (type instanceof Float && (type as Float).precision !== Precision.HALF)
+        // Don't defer to native iterator for timestamps since Numbers are expected
+        // (DataType.isTimestamp(type)) && type.unit === TimeUnit.MILLISECOND ||
+        (DataType.isInt(type) && type.bitWidth !== 64) ||
+        (DataType.isTime(type) && type.bitWidth !== 64) ||
+        (DataType.isFloat(type) && type.precision !== Precision.HALF)
     )) {
         return new ChunkedIterator(vector.data.length, (chunkIndex) => {
             const data = vector.data[chunkIndex];
diff --git a/js/src/visitor/set.ts b/js/src/visitor/set.ts
index 5dc42283c36f0..5f2a3af4df1dc 100644
--- a/js/src/visitor/set.ts
+++ b/js/src/visitor/set.ts
@@ -109,21 +109,6 @@ function wrapSet<T extends DataType>(fn: (data: Data<T>, _1: any, _2: any) => vo
 
 /** @ignore */
 export const setEpochMsToDays = (data: Int32Array, index: number, epochMs: number) => { data[index] = Math.floor(epochMs / 86400000); };
-/** @ignore */
-export const setEpochMsToMillisecondsLong = (data: Int32Array, index: number, epochMs: number) => {
-    data[index] = Math.floor(epochMs % 4294967296);
-    data[index + 1] = Math.floor(epochMs / 4294967296);
-};
-/** @ignore */
-export const setEpochMsToMicrosecondsLong = (data: Int32Array, index: number, epochMs: number) => {
-    data[index] = Math.floor((epochMs * 1000) % 4294967296);
-    data[index + 1] = Math.floor((epochMs * 1000) / 4294967296);
-};
-/** @ignore */
-export const setEpochMsToNanosecondsLong = (data: Int32Array, index: number, epochMs: number) => {
-    data[index] = Math.floor((epochMs * 1000000) % 4294967296);
-    data[index + 1] = Math.floor((epochMs * 1000000) / 4294967296);
-};
 
 /** @ignore */
 export const setVariableWidthBytes = <T extends Int32Array | BigInt64Array>(values: Uint8Array, valueOffsets: T, index: number, value: Uint8Array) => {
@@ -161,7 +146,7 @@ export const setAnyFloat = <T extends Float>(data: Data<T>, index: number, value
 /** @ignore */
 export const setDateDay = <T extends DateDay>({ values }: Data<T>, index: number, value: T['TValue']): void => { setEpochMsToDays(values, index, value.valueOf()); };
 /** @ignore */
-export const setDateMillisecond = <T extends DateMillisecond>({ values }: Data<T>, index: number, value: T['TValue']): void => { setEpochMsToMillisecondsLong(values, index * 2, value.valueOf()); };
+export const setDateMillisecond = <T extends DateMillisecond>({ values }: Data<T>, index: number, value: T['TValue']): void => { values[index] = BigInt(value); };
 /** @ignore */
 export const setFixedSizeBinary = <T extends FixedSizeBinary>({ stride, values }: Data<T>, index: number, value: T['TValue']): void => { values.set(value.subarray(0, stride), stride * index); };
 
@@ -178,13 +163,13 @@ export const setDate = <T extends Date_>(data: Data<T>, index: number, value: T[
 };
 
 /** @ignore */
-export const setTimestampSecond = <T extends TimestampSecond>({ values }: Data<T>, index: number, value: T['TValue']): void => setEpochMsToMillisecondsLong(values, index * 2, value / 1000);
+export const setTimestampSecond = <T extends TimestampSecond>({ values }: Data<T>, index: number, value: T['TValue']): void => { values[index] = BigInt(value / 1000); };
 /** @ignore */
-export const setTimestampMillisecond = <T extends TimestampMillisecond>({ values }: Data<T>, index: number, value: T['TValue']): void => setEpochMsToMillisecondsLong(values, index * 2, value);
+export const setTimestampMillisecond = <T extends TimestampMillisecond>({ values }: Data<T>, index: number, value: T['TValue']): void => { values[index] = BigInt(value); };
 /** @ignore */
-export const setTimestampMicrosecond = <T extends TimestampMicrosecond>({ values }: Data<T>, index: number, value: T['TValue']): void => setEpochMsToMicrosecondsLong(values, index * 2, value);
+export const setTimestampMicrosecond = <T extends TimestampMicrosecond>({ values }: Data<T>, index: number, value: T['TValue']): void => { values[index] = BigInt(value * 1000); };
 /** @ignore */
-export const setTimestampNanosecond = <T extends TimestampNanosecond>({ values }: Data<T>, index: number, value: T['TValue']): void => setEpochMsToNanosecondsLong(values, index * 2, value);
+export const setTimestampNanosecond = <T extends TimestampNanosecond>({ values }: Data<T>, index: number, value: T['TValue']): void => { values[index] = BigInt(value * 1000000); };
 /* istanbul ignore next */
 /** @ignore */
 export const setTimestamp = <T extends Timestamp>(data: Data<T>, index: number, value: T['TValue']): void => {
diff --git a/js/test/.eslintrc.cjs b/js/test/.eslintrc.cjs
index bb388f463af1b..41197c6edb8bf 100644
--- a/js/test/.eslintrc.cjs
+++ b/js/test/.eslintrc.cjs
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+/** @type {import('eslint').Linter.Config} */
 module.exports = {
     rules: {
         "@typescript-eslint/no-require-imports": "off",
diff --git a/js/test/generate-test-data.ts b/js/test/generate-test-data.ts
index 8e6e47de836eb..65719f875c360 100644
--- a/js/test/generate-test-data.ts
+++ b/js/test/generate-test-data.ts
@@ -402,10 +402,7 @@ function generateDate<T extends Date_>(this: TestDataVectorGenerator, type: T, l
     const data = type.unit === DateUnit.DAY
         ? createDate32(length, nullBitmap, values)
         : createDate64(length, nullBitmap, values);
-    return {
-        values: () => values.map((x) => x == null ? null : new Date(x)),
-        vector: new Vector([makeData({ type, length, nullCount, nullBitmap, data })])
-    };
+    return { values: () => values, vector: new Vector([makeData({ type, length, nullCount, nullBitmap, data })]) };
 }
 
 function generateTimestamp<T extends Timestamp>(this: TestDataVectorGenerator, type: T, length = 100, nullCount = Math.trunc(length * 0.2)): GeneratedVector<T> {
@@ -649,6 +646,7 @@ type TypedArrayConstructor =
 
 
 const rand = Math.random.bind(Math);
+const randSign = () => rand() > 0.5 ? -1 : 1;
 const randomBytes = (length: number) => fillRandom(Uint8Array, length);
 
 const memoize = (fn: () => any) => ((x?: any) => () => x || (x = fn()))();
@@ -661,7 +659,7 @@ function fillRandom<T extends TypedArrayConstructor>(ArrayType: T, length: numbe
     const BPE = ArrayType.BYTES_PER_ELEMENT;
     const array = new ArrayType(length);
     const max = (2 ** (8 * BPE)) - 1;
-    for (let i = -1; ++i < length; array[i] = rand() * max * (rand() > 0.5 ? -1 : 1));
+    for (let i = -1; ++i < length; array[i] = rand() * max * randSign());
     return array as InstanceType<T>;
 }
 
@@ -669,7 +667,7 @@ function fillRandomBigInt<T extends (typeof BigInt64Array) | (typeof BigUint64Ar
     const BPE = ArrayType.BYTES_PER_ELEMENT;
     const array = new ArrayType(length);
     const max = (2 ** (8 * BPE)) - 1;
-    for (let i = -1; ++i < length; array[i] = BigInt(rand() * max * (rand() > 0.5 ? -1 : 1)));
+    for (let i = -1; ++i < length; array[i] = BigInt(rand() * max * randSign()));
     return array as InstanceType<T>;
 }
 
@@ -735,6 +733,9 @@ function createVariableWidthBytes(length: number, nullBitmap: Uint8Array, offset
     return bytes;
 }
 
+/**
+ * Creates timestamps with the accuracy of days (86400000 millisecond).
+ */
 function createDate32(length: number, nullBitmap: Uint8Array, values: (number | null)[] = []) {
     const data = new Int32Array(length).fill(Math.trunc(Date.now() / 86400000));
     iterateBitmap(length, nullBitmap, (i, valid) => {
@@ -742,7 +743,7 @@ function createDate32(length: number, nullBitmap: Uint8Array, values: (number |
             data[i] = 0;
             values[i] = null;
         } else {
-            data[i] = Math.trunc(data[i] + (rand() * 10000 * (rand() > 0.5 ? -1 : 1)));
+            data[i] = Math.trunc(data[i] + (rand() * 10000 * randSign()));
             values[i] = data[i] * 86400000;
         }
     });
@@ -750,32 +751,26 @@ function createDate32(length: number, nullBitmap: Uint8Array, values: (number |
 }
 
 function createDate64(length: number, nullBitmap: Uint8Array, values: (number | null)[] = []) {
-    const data = new Int32Array(length * 2).fill(0);
     const data32 = createDate32(length, nullBitmap, values);
-    iterateBitmap(length, nullBitmap, (i, valid) => {
-        if (valid) {
-            const value = data32[i] * 86400000;
-            const hi = Math.trunc(value / 4294967296);
-            const lo = Math.trunc(value - 4294967296 * hi);
-            values[i] = value;
-            data[i * 2 + 0] = lo;
-            data[i * 2 + 1] = hi;
-        }
-    });
-    return data;
+    return BigInt64Array.from(data32, x => BigInt(x * 86400000));
+}
+
+function divideBigInts(number: bigint, divisor: bigint): number {
+    return Number(number / divisor) + Number(number % divisor) / Number(divisor);
 }
 
 function createTimestamp(length: number, nullBitmap: Uint8Array, multiple: number, values: (number | null)[] = []) {
-    const mult = 86400 * multiple;
-    const data = new Int32Array(length * 2).fill(0);
-    const data32 = createDate32(length, nullBitmap, values);
+    const data = new BigInt64Array(length).fill(0n);
+    const tenYears = 10 * 365 * 24 * 60 * 60 * multiple;
+    const now = Math.trunc(Date.now() / 1000 * multiple);
     iterateBitmap(length, nullBitmap, (i, valid) => {
-        if (valid) {
-            const value = data32[i] * mult;
-            const hi = Math.trunc(value / 4294967296);
-            const lo = Math.trunc(value - 4294967296 * hi);
-            data[i * 2 + 0] = lo;
-            data[i * 2 + 1] = hi;
+        if (!valid) {
+            data[i] = 0n;
+            values[i] = null;
+        } else {
+            const value = BigInt(now + Math.trunc(rand() * randSign() * tenYears));
+            data[i] = value;
+            values[i] = divideBigInts(value * 1000n, BigInt(multiple));
         }
     });
     return data;
@@ -788,7 +783,7 @@ function createTime32(length: number, nullBitmap: Uint8Array, multiple: number,
             data[i] = 0;
             values[i] = null;
         } else {
-            values[i] = data[i] = ((1000 * rand()) | 0 * multiple) * (rand() > 0.5 ? -1 : 1);
+            values[i] = data[i] = ((1000 * rand()) | 0 * multiple) * randSign();
         }
     });
     return data;
diff --git a/js/test/unit/builders/builder-tests.ts b/js/test/unit/builders/builder-tests.ts
index 4d1be9b225b08..c9174023f6dae 100644
--- a/js/test/unit/builders/builder-tests.ts
+++ b/js/test/unit/builders/builder-tests.ts
@@ -18,7 +18,7 @@
 import 'web-streams-polyfill';
 
 import '../../jest-extensions.js';
-import { from, fromDOMStream, toArray } from 'ix/asynciterable';
+import { from, fromDOMStream, toArray } from 'ix/Ix.asynciterable';
 import { fromNodeStream } from 'ix/asynciterable/fromnodestream';
 
 import { validateVector } from './utils.js';
diff --git a/js/test/unit/builders/date-tests.ts b/js/test/unit/builders/date-tests.ts
index 318bb7dfc4f07..3fd3f7832f3f3 100644
--- a/js/test/unit/builders/date-tests.ts
+++ b/js/test/unit/builders/date-tests.ts
@@ -17,10 +17,8 @@
 
 import 'web-streams-polyfill';
 import {
-    date32sNoNulls,
-    date32sWithNulls,
-    date64sNoNulls,
-    date64sWithNulls,
+    dateNoNulls,
+    dateWithNulls,
     encodeAll,
     encodeEach,
     encodeEachDOM,
@@ -41,14 +39,14 @@ describe('DateDayBuilder', () => {
     testDOMStreams && runTestsWithEncoder('encodeEachDOM: 25', encodeEachDOM(() => new DateDay(), 25));
     testNodeStreams && runTestsWithEncoder('encodeEachNode: 25', encodeEachNode(() => new DateDay(), 25));
 
-    function runTestsWithEncoder(name: string, encode: (vals: (Date | null)[], nullVals?: any[]) => Promise<Vector<DateDay>>) {
+    function runTestsWithEncoder(name: string, encode: (vals: (number | null)[], nullVals?: any[]) => Promise<Vector<DateDay>>) {
         describe(`${encode.name} ${name}`, () => {
             it(`encodes dates no nulls`, async () => {
-                const vals = date32sNoNulls(20);
+                const vals = dateNoNulls(20);
                 validateVector(vals, await encode(vals, []), []);
             });
             it(`encodes dates with nulls`, async () => {
-                const vals = date32sWithNulls(20);
+                const vals = dateWithNulls(20);
                 validateVector(vals, await encode(vals, [null]), [null]);
             });
         });
@@ -63,14 +61,14 @@ describe('DateMillisecondBuilder', () => {
     testDOMStreams && runTestsWithEncoder('encodeEachDOM: 25', encodeEachDOM(() => new DateMillisecond(), 25));
     testNodeStreams && runTestsWithEncoder('encodeEachNode: 25', encodeEachNode(() => new DateMillisecond(), 25));
 
-    function runTestsWithEncoder(name: string, encode: (vals: (Date | null)[], nullVals?: any[]) => Promise<Vector<DateMillisecond>>) {
+    function runTestsWithEncoder(name: string, encode: (vals: (number | null)[], nullVals?: any[]) => Promise<Vector<DateMillisecond>>) {
         describe(`${encode.name} ${name}`, () => {
             it(`encodes dates no nulls`, async () => {
-                const vals = date64sNoNulls(20);
+                const vals = dateNoNulls(20);
                 validateVector(vals, await encode(vals, []), []);
             });
             it(`encodes dates with nulls`, async () => {
-                const vals = date64sWithNulls(20);
+                const vals = dateWithNulls(20);
                 validateVector(vals, await encode(vals, [null]), [null]);
             });
         });
@@ -100,7 +98,7 @@ describe('DateMillisecondBuilder with nulls', () => {
         '2019-03-10T21:15:32.237Z',
         '2019-03-21T07:25:34.864Z',
         null
-    ].map((x) => x === null ? x : new Date(x));
+    ].map((x) => x === null ? x : new Date(x).getTime());
     it(`encodes dates with nulls`, async () => {
         const vals = dates.slice();
         validateVector(vals, await encode(vals, [null]), [null]);
diff --git a/js/test/unit/builders/utils.ts b/js/test/unit/builders/utils.ts
index db4e80d002778..7cc0a075d84d4 100644
--- a/js/test/unit/builders/utils.ts
+++ b/js/test/unit/builders/utils.ts
@@ -17,7 +17,7 @@
 
 import 'web-streams-polyfill';
 
-import { from, fromDOMStream, toArray } from 'ix/asynciterable';
+import { from, fromDOMStream, toArray } from 'ix/Ix.asynciterable';
 import { fromNodeStream } from 'ix/asynciterable/fromnodestream';
 import 'ix/Ix.node';
 
@@ -32,22 +32,11 @@ const randnulls = <T, TNull = null>(values: T[], n: TNull = <any>null) => values
 export const randomBytes = (length: number) => fillRandom(Uint8Array, length);
 
 export const stringsNoNulls = (length = 20) => Array.from({ length }, (_) => randomString(1 + (Math.trunc(Math.random() * 19))));
-export const timestamp32sNoNulls = (length = 20, now = Math.trunc(Date.now() / 86400000)) =>
-    Array.from({ length }, (_) => (Math.trunc(now + (rand() * 10000 * (rand() > 0.5 ? -1 : 1)))) * 86400000);
-
-export const timestamp64sNoNulls = (length = 20, now = Date.now()) => Array.from({ length }, (_) => {
-    const ms = now + (Math.trunc(rand() * 31557600000 * (rand() > 0.5 ? -1 : 1)));
-    return new Int32Array([Math.trunc(ms % 4294967296), Math.trunc(ms / 4294967296)]);
-});
-
-export const timestamp32sWithNulls = (length = 20) => randnulls(timestamp32sNoNulls(length), null);
-export const timestamp64sWithNulls = (length = 20) => randnulls(timestamp64sNoNulls(length), null);
-export const timestamp32sWithMaxInts = (length = 20) => randnulls(timestamp32sNoNulls(length), 0x7FFFFFFF);
-export const timestamp64sWithMaxInts = (length = 20) => randnulls(timestamp64sNoNulls(length), 9223372034707292159n);
 
 export const boolsNoNulls = (length = 20) => Array.from({ length }, () => rand() > 0.5);
-export const date32sNoNulls = (length = 20) => timestamp32sNoNulls(length).map((x) => new Date(x));
-export const date64sNoNulls = (length = 20) => timestamp64sNoNulls(length).map((x) => new Date(4294967296 * x[1] + (x[0] >>> 0)));
+
+export const dateNoNulls = (length = 20, now = Math.trunc(Date.now() / 86400000)) =>
+    Array.from({ length }, (_) => (Math.trunc(now + (rand() * 100000 * (rand() > 0.5 ? -1 : 1)))) * 86400000);
 export const int8sNoNulls = (length = 20) => Array.from(new Int8Array(randomBytes(length * Int8Array.BYTES_PER_ELEMENT).buffer));
 export const int16sNoNulls = (length = 20) => Array.from(new Int16Array(randomBytes(length * Int16Array.BYTES_PER_ELEMENT).buffer));
 export const int32sNoNulls = (length = 20) => Array.from(new Int32Array(randomBytes(length * Int32Array.BYTES_PER_ELEMENT).buffer));
@@ -66,8 +55,7 @@ export const stringsWithNulls = (length = 20) => randnulls(stringsNoNulls(length
 export const stringsWithEmpties = (length = 20) => randnulls(stringsNoNulls(length), '\0');
 
 export const boolsWithNulls = (length = 20) => randnulls(boolsNoNulls(length), null);
-export const date32sWithNulls = (length = 20) => randnulls(date32sNoNulls(length), null);
-export const date64sWithNulls = (length = 20) => randnulls(date64sNoNulls(length), null);
+export const dateWithNulls = (length = 20) => randnulls(dateNoNulls(length), null);
 export const int8sWithNulls = (length = 20) => randnulls(int8sNoNulls(length), null);
 export const int16sWithNulls = (length = 20) => randnulls(int16sNoNulls(length), null);
 export const int32sWithNulls = (length = 20) => randnulls(int32sNoNulls(length), null);
diff --git a/js/test/unit/ipc/helpers.ts b/js/test/unit/ipc/helpers.ts
index 2a228aa7abf18..02f45b57428a3 100644
--- a/js/test/unit/ipc/helpers.ts
+++ b/js/test/unit/ipc/helpers.ts
@@ -15,9 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import * as fs from 'fs';
+import * as fs from 'node:fs';
 import { fs as memfs } from 'memfs';
-import { PassThrough, Readable } from 'stream';
+import { PassThrough, Readable } from 'node:stream';
 
 import {
     RecordBatchFileWriter,
diff --git a/js/test/unit/ipc/message-reader-tests.ts b/js/test/unit/ipc/message-reader-tests.ts
index 741f4e7aa9009..6b770674d122c 100644
--- a/js/test/unit/ipc/message-reader-tests.ts
+++ b/js/test/unit/ipc/message-reader-tests.ts
@@ -24,11 +24,16 @@ for (const table of generateRandomTables([10, 20, 30])) {
 
     const io = ArrowIOTestHelper.stream(table);
     const name = `[\n ${table.schema.fields.join(',\n ')}\n]`;
-    const numMessages = table.batches.reduce((numMessages, batch) => {
-        return numMessages +
-            /* recordBatch message */ 1 +
-            /* dictionary messages */ batch.dictionaries.size;
-    }, /* schema message */ 1);
+
+    const numDictionaries = table.batches.reduce((dictionaries, batch) => {
+        return [...batch.dictionaries.values()]
+            .flatMap((dictionary) => dictionary.data)
+            .reduce((dictionaries, data) => dictionaries.add(data), dictionaries);
+    }, new Set()).size;
+
+    const numMessages = /* schema message */ 1 +
+                        /* recordBatch messages */ table.batches.length +
+                        /* dictionary messages */ numDictionaries;
 
     const validate = validateMessageReader.bind(0, numMessages);
     const validateAsync = validateAsyncMessageReader.bind(0, numMessages);
diff --git a/js/test/unit/ipc/reader/streams-node-tests.ts b/js/test/unit/ipc/reader/streams-node-tests.ts
index 2e3f08c4e7837..bde685cb952a2 100644
--- a/js/test/unit/ipc/reader/streams-node-tests.ts
+++ b/js/test/unit/ipc/reader/streams-node-tests.ts
@@ -101,7 +101,7 @@ import {
 
     it('readAll() should pipe to separate NodeJS WritableStreams', async () => {
         const { default: MultiStream } = await import('multistream');
-        const { PassThrough } = await import('stream');
+        const { PassThrough } = await import('node:stream');
 
         expect.hasAssertions();
 
diff --git a/js/test/unit/ipc/writer/file-writer-tests.ts b/js/test/unit/ipc/writer/file-writer-tests.ts
index 7b75dd8d4fab3..2b99d0f725f2f 100644
--- a/js/test/unit/ipc/writer/file-writer-tests.ts
+++ b/js/test/unit/ipc/writer/file-writer-tests.ts
@@ -18,9 +18,20 @@
 import {
     generateDictionaryTables, generateRandomTables
 } from '../../../data/tables.js';
+import * as generate from '../../../generate-test-data.js';
 import { validateRecordBatchIterator } from '../validate.js';
 
-import { RecordBatchFileWriter, RecordBatchReader, Table } from 'apache-arrow';
+import {
+    builderThroughIterable,
+    Dictionary,
+    Int32,
+    RecordBatch,
+    RecordBatchFileWriter,
+    RecordBatchReader,
+    Table,
+    Uint32,
+    Vector
+} from 'apache-arrow';
 
 describe('RecordBatchFileWriter', () => {
     for (const table of generateRandomTables([10, 20, 30])) {
@@ -29,6 +40,55 @@ describe('RecordBatchFileWriter', () => {
     for (const table of generateDictionaryTables([10, 20, 30])) {
         testFileWriter(table, `${table.schema.fields[0]}`);
     }
+
+    it('should throw if attempting to write replacement dictionary batches', async () => {
+        const type = new Dictionary<Uint32, Int32>(new Uint32, new Int32, 0);
+        const writer = new RecordBatchFileWriter();
+        writer.write(new RecordBatch({
+            // Clone the data with the original Dictionary type so the cloned chunk has id 0
+            dictionary_encoded_uint32: generate.dictionary(50, 20, new Uint32, new Int32).vector.data[0].clone(type)
+        }));
+        expect(() => {
+            writer.write(new RecordBatch({
+                // Clone the data with the original Dictionary type so the cloned chunk has id 0
+                dictionary_encoded_uint32: generate.dictionary(50, 20, new Uint32, new Int32).vector.data[0].clone(type)
+            }));
+        }).toThrow();
+    });
+
+    it('should write delta dictionary batches', async () => {
+
+        const name = 'dictionary_encoded_uint32';
+        const resultChunks: Vector<Dictionary<Uint32, Int32>>[] = [];
+        const {
+            vector: sourceVector, values: sourceValues,
+        } = generate.dictionary(1000, 20, new Uint32(), new Int32());
+
+        const writer = RecordBatchFileWriter.writeAll((function* () {
+            const transform = builderThroughIterable({
+                type: sourceVector.type, nullValues: [null],
+                queueingStrategy: 'count', highWaterMark: 50,
+            });
+            for (const chunk of transform(sourceValues())) {
+                resultChunks.push(chunk);
+                yield new RecordBatch({ [name]: chunk.data[0] });
+            }
+        })());
+
+        expect(new Vector(resultChunks)).toEqualVector(sourceVector);
+
+        type T = { [name]: Dictionary<Uint32, Int32> };
+        const sourceTable = new Table({ [name]: sourceVector });
+        const resultTable = new Table(RecordBatchReader.from<T>(await writer.toUint8Array()));
+
+        const child = resultTable.getChild(name)!;
+        const dicts = child.data.map(({ dictionary }) => dictionary!);
+        const dictionary = dicts[child.data.length - 1];
+
+        expect(resultTable).toEqualTable(sourceTable);
+        expect(dictionary).toBeInstanceOf(Vector);
+        expect(dictionary.data).toHaveLength(20);
+    });
 });
 
 function testFileWriter(table: Table, name: string) {
diff --git a/js/test/unit/ipc/writer/stream-writer-tests.ts b/js/test/unit/ipc/writer/stream-writer-tests.ts
index 8425395393bf2..11bbe7362d88e 100644
--- a/js/test/unit/ipc/writer/stream-writer-tests.ts
+++ b/js/test/unit/ipc/writer/stream-writer-tests.ts
@@ -25,6 +25,7 @@ import { validateRecordBatchIterator } from '../validate.js';
 import type { RecordBatchStreamWriterOptions } from 'apache-arrow/ipc/writer';
 import {
     builderThroughIterable,
+    Data,
     Dictionary,
     Field,
     Int32,
@@ -81,10 +82,46 @@ describe('RecordBatchStreamWriter', () => {
         await validate;
     });
 
+    it('should write replacement dictionary batches', async () => {
+
+        const name = 'dictionary_encoded_uint32';
+        const type = new Dictionary<Uint32, Int32>(new Uint32, new Int32, 0);
+        const sourceChunks: Data<Dictionary<Uint32, Int32>>[] = [];
+        const resultChunks: Data<Dictionary<Uint32, Int32>>[] = [];
+
+        const writer = RecordBatchStreamWriter.writeAll((function* () {
+            for (let i = 0; i < 1000; i += 50) {
+                const { vector: { data: [chunk] } } = generate.dictionary(50, 20, type.dictionary, type.indices);
+                sourceChunks.push(chunk);
+                // Clone the data with the original Dictionary type so the cloned chunk has id 0
+                resultChunks.push(chunk.clone(type));
+                yield new RecordBatch({ [name]: resultChunks.at(-1)! });
+            }
+        })());
+
+        expect(new Vector(resultChunks)).toEqualVector(new Vector(sourceChunks));
+
+        type T = { [name]: Dictionary<Uint32, Int32> };
+        const sourceTable = new Table({ [name]: new Vector(sourceChunks) });
+        const resultTable = new Table(RecordBatchReader.from<T>(await writer.toUint8Array()));
+
+        // 1000 / 50 = 20
+        expect(sourceTable.batches).toHaveLength(20);
+        expect(resultTable.batches).toHaveLength(20);
+        expect(resultTable).toEqualTable(sourceTable);
+
+        for (const batch of resultTable.batches) {
+            for (const [_, dictionary] of batch.dictionaries) {
+                expect(dictionary).toBeInstanceOf(Vector);
+                expect(dictionary.data).toHaveLength(1);
+            }
+        }
+    });
+
     it('should write delta dictionary batches', async () => {
 
         const name = 'dictionary_encoded_uint32';
-        const chunks: Vector<Dictionary<Uint32, Int32>>[] = [];
+        const resultChunks: Vector<Dictionary<Uint32, Int32>>[] = [];
         const {
             vector: sourceVector, values: sourceValues,
         } = generate.dictionary(1000, 20, new Uint32(), new Int32());
@@ -95,12 +132,12 @@ describe('RecordBatchStreamWriter', () => {
                 queueingStrategy: 'count', highWaterMark: 50,
             });
             for (const chunk of transform(sourceValues())) {
-                chunks.push(chunk);
+                resultChunks.push(chunk);
                 yield new RecordBatch({ [name]: chunk.data[0] });
             }
         })());
 
-        expect(new Vector(chunks)).toEqualVector(sourceVector);
+        expect(new Vector(resultChunks)).toEqualVector(sourceVector);
 
         type T = { [name]: Dictionary<Uint32, Int32> };
         const sourceTable = new Table({ [name]: sourceVector });
diff --git a/js/test/unit/ipc/writer/streams-dom-tests.ts b/js/test/unit/ipc/writer/streams-dom-tests.ts
index dc792c9cf82be..2040e89a48802 100644
--- a/js/test/unit/ipc/writer/streams-dom-tests.ts
+++ b/js/test/unit/ipc/writer/streams-dom-tests.ts
@@ -15,8 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { as, from } from 'ix/asynciterable';
-import { flatMap, tap } from 'ix/asynciterable/operators';
+import { as, from } from 'ix/Ix.asynciterable';
+import { flatMap, tap } from 'ix/Ix.asynciterable.operators';
 
 import { generateRandomTables } from '../../../data/tables.js';
 import {
diff --git a/js/test/unit/ipc/writer/streams-node-tests.ts b/js/test/unit/ipc/writer/streams-node-tests.ts
index 1f4c9c7a02cfb..afcb6deb1e053 100644
--- a/js/test/unit/ipc/writer/streams-node-tests.ts
+++ b/js/test/unit/ipc/writer/streams-node-tests.ts
@@ -15,8 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { as, from } from 'ix/asynciterable';
-import { flatMap, tap } from 'ix/asynciterable/operators';
+import { as, from } from 'ix/Ix.asynciterable';
+import { flatMap, tap } from 'ix/Ix.asynciterable.operators';
 import 'ix/Ix.node';
 
 import { generateRandomTables } from '../../../data/tables.js';
diff --git a/js/test/unit/table/assign-tests.ts b/js/test/unit/table/assign-tests.ts
index f2a5ff4f37cac..8e1cdfec41cbf 100644
--- a/js/test/unit/table/assign-tests.ts
+++ b/js/test/unit/table/assign-tests.ts
@@ -17,7 +17,7 @@
 
 /* eslint-disable jest/no-standalone-expect */
 
-import { zip } from 'ix/iterable';
+import { zip } from 'ix/Ix.iterable';
 
 import '../../jest-extensions.js';
 import * as generate from '../../generate-test-data.js';
diff --git a/js/test/unit/vector/bool-vector-tests.ts b/js/test/unit/vector/bool-vector-tests.ts
index afbaef01a1a45..7b6ed3e589b2d 100644
--- a/js/test/unit/vector/bool-vector-tests.ts
+++ b/js/test/unit/vector/bool-vector-tests.ts
@@ -25,9 +25,10 @@ describe(`BoolVector`, () => {
     const n = values.length;
     const vector = newBoolVector(n, new Uint8Array([27, 0, 0, 0, 0, 0, 0, 0]));
     test(`gets expected values`, () => {
-        let i = -1;
-        while (++i < n) {
+        for (let i = 0; i < values.length; i++) {
             expect(vector.get(i)).toEqual(values[i]);
+            expect(vector.at(i)).toEqual(values.at(i));
+            expect(vector.at(-i)).toEqual(values.at(-i));
         }
     });
     test(`iterates expected values`, () => {
@@ -53,7 +54,7 @@ describe(`BoolVector`, () => {
         const expected2 = [true, true, true, true, true, false, false, false];
         const expected3 = [true, true, false, false, false, false, true, true];
         function validate(expected: boolean[]) {
-            for (let i = -1; ++i < n;) {
+            for (let i = 0; i < n; i++) {
                 expect(v.get(i)).toEqual(expected[i]);
             }
         }
diff --git a/js/test/unit/vector/date-vector-tests.ts b/js/test/unit/vector/date-vector-tests.ts
index f8b4c1c7976d2..4a6ffc1a82538 100644
--- a/js/test/unit/vector/date-vector-tests.ts
+++ b/js/test/unit/vector/date-vector-tests.ts
@@ -15,34 +15,69 @@
 // specific language governing permissions and limitations
 // under the License.
 
-import { DateDay, DateMillisecond, RecordBatchReader, Table, vectorFromArray } from 'apache-arrow';
+import {
+    DateDay, TimestampSecond, DateMillisecond, TimestampMillisecond, TimestampMicrosecond, TimestampNanosecond, RecordBatchReader,
+    Table, vectorFromArray
+} from 'apache-arrow';
+
+describe(`TimestampVector`, () => {
+    test(`Dates are stored in TimestampMillisecond`, () => {
+        const date = new Date('2023-02-01T12:34:56Z');
+        const vec = vectorFromArray([date]);
+        expect(vec.type).toBeInstanceOf(TimestampMillisecond);
+        expect(vec.get(0)).toBe(date.getTime());
+    });
+
+    test(`Correctly get back TimestampSecond from Date`, () => {
+        const date = new Date('2023-02-01T12:34:56Z');
+        const vec = vectorFromArray([date], new TimestampSecond);
+        expect(vec.type).toBeInstanceOf(TimestampSecond);
+        expect(vec.get(0)).toBe(date.getTime());
+    });
+
+    test(`Correctly get back TimestampMicrosecond from Date`, () => {
+        const date = new Date('2023-02-01T12:34:56Z');
+        const vec = vectorFromArray([date, 0.5], new TimestampMicrosecond);
+        expect(vec.type).toBeInstanceOf(TimestampMicrosecond);
+        expect(vec.get(0)).toBe(date.getTime());
+        expect(vec.get(1)).toBe(0.5);
+    });
+
+    test(`Correctly get back TimestampNanosecond from Date`, () => {
+        const date = new Date('2023-02-01T12:34:56Z');
+        const vec = vectorFromArray([date, 0.5], new TimestampNanosecond);
+        expect(vec.type).toBeInstanceOf(TimestampNanosecond);
+        expect(vec.get(0)).toBe(date.getTime());
+        expect(vec.get(1)).toBe(0.5);
+    });
+});
 
 describe(`DateVector`, () => {
-    it('returns days since the epoch as correct JS Dates', () => {
+    test(`returns days since the epoch as correct JS Dates`, () => {
         const table = new Table(RecordBatchReader.from(test_data));
         const expectedMillis = expectedMillis32();
         const date32 = table.getChildAt<DateDay>(0)!;
         for (const date of date32) {
             const millis = expectedMillis.shift();
-            expect(date).toEqual(millis === null ? null : new Date(millis!));
+            expect(date).toEqual(millis);
         }
     });
 
-    it('returns millisecond longs since the epoch as correct JS Dates', () => {
+    test(`returns millisecond longs since the epoch as correct JS Dates`, () => {
         const table = new Table(RecordBatchReader.from(test_data));
         const expectedMillis = expectedMillis64();
         const date64 = table.getChildAt<DateMillisecond>(1)!;
         for (const date of date64) {
             const millis = expectedMillis.shift();
-            expect(date).toEqual(millis === null ? null : new Date(millis!));
+            expect(date).toEqual(millis);
         }
     });
 
-    it('returns the same date that was in the vector', () => {
+    test(`returns the same date that was in the vector`, () => {
         const dates = [new Date(1950, 1, 0)];
-        const vec = vectorFromArray(dates);
+        const vec = vectorFromArray(dates, new DateMillisecond());
         for (const date of vec) {
-            expect(date).toEqual(dates.shift());
+            expect(date).toEqual(dates.shift()?.getTime());
         }
     });
 });
diff --git a/js/test/unit/vector/numeric-vector-tests.ts b/js/test/unit/vector/numeric-vector-tests.ts
index 032af796de138..e5c1789068b23 100644
--- a/js/test/unit/vector/numeric-vector-tests.ts
+++ b/js/test/unit/vector/numeric-vector-tests.ts
@@ -337,10 +337,12 @@ function testAndValidateVector<T extends Int | Float>(vector: Vector<T>, typed:
 function gets_expected_values<T extends Int | Float>(vector: Vector<T>, typed: T['TArray'], values: any[] = [...typed]) {
     test(`gets expected values`, () => {
         expect.hasAssertions();
-        let i = -1, n = vector.length;
+        let i = -1;
         try {
-            while (++i < n) {
+            while (++i < vector.length) {
                 expect(vector.get(i)).toEqual(values[i]);
+                expect(vector.at(i)).toEqual(values.at(i));
+                expect(vector.at(-i)).toEqual(values.at(-i));
             }
         } catch (e) { throw new Error(`${i}: ${e}`); }
     });
diff --git a/js/test/unit/vector/vector-tests.ts b/js/test/unit/vector/vector-tests.ts
index bfcf0d8547861..c05838d7a9ec9 100644
--- a/js/test/unit/vector/vector-tests.ts
+++ b/js/test/unit/vector/vector-tests.ts
@@ -16,7 +16,7 @@
 // under the License.
 
 import {
-    Bool, DateDay, DateMillisecond, Dictionary, Float64, Int32, List, makeVector, Struct, Timestamp, TimeUnit, Utf8, LargeUtf8, util, Vector, vectorFromArray
+    Bool, DateDay, DateMillisecond, Dictionary, Float64, Int32, List, makeVector, Struct, Utf8, LargeUtf8, util, Vector, vectorFromArray, makeData
 } from 'apache-arrow';
 
 describe(`makeVectorFromArray`, () => {
@@ -33,6 +33,47 @@ describe(`makeVectorFromArray`, () => {
     });
 });
 
+describe(`basic vector methods`, () => {
+    test(`not nullable`, () => {
+        const vector = makeVector([makeData({ data: new Int32Array([1, 2, 3]), nullCount: -1, type: new Int32() })]);
+        expect(vector.nullable).toBe(false);
+        expect(vector.nullCount).toBe(0);
+    });
+
+    test(`nullable`, () => {
+        const vector = makeVector([makeData({ data: new Int32Array([1, 2, 3]), nullCount: 0, type: new Int32() })]);
+        expect(vector.nullable).toBe(true);
+        expect(vector.nullCount).toBe(0);
+        expect(vector.isValid(0)).toBe(true);
+
+        // set a value to null
+        vector.set(0, null);
+        expect(vector.nullable).toBe(true);
+        expect(vector.nullCount).toBe(1);
+        expect(vector.isValid(0)).toBe(false);
+
+        // set the same value to null which should not change anything
+        vector.set(0, null);
+        expect(vector.nullable).toBe(true);
+        expect(vector.nullCount).toBe(1);
+
+        // set a different value to null
+        vector.set(1, null);
+        expect(vector.nullable).toBe(true);
+        expect(vector.nullCount).toBe(2);
+
+        // set first value to non-null
+        vector.set(0, 1);
+        expect(vector.nullable).toBe(true);
+        expect(vector.nullCount).toBe(1);
+
+        // set last null to non-null
+        vector.set(1, 2);
+        expect(vector.nullable).toBe(true);
+        expect(vector.nullCount).toBe(0);
+    });
+});
+
 describe(`StructVector`, () => {
     test(`makeVectorFromArray`, () => {
         const values: { a?: number; b?: string | null; c?: boolean | null }[] = [
@@ -89,7 +130,7 @@ describe(`DateVector`, () => {
             new Date(1988, 3, 25, 4, 5, 6),
             new Date(1987, 2, 24, 7, 8, 9),
             new Date(2018, 4, 12, 17, 30, 0)
-        ];
+        ].map(v => v.getTime());
         const vector = vectorFromArray(values, new DateMillisecond);
         basicVectorTests(vector, values, extras);
     });
@@ -100,7 +141,7 @@ describe(`DateVector`, () => {
             new Date(Date.UTC(1988, 3, 25)),
             new Date(Date.UTC(1987, 2, 24)),
             new Date(Date.UTC(2018, 4, 12))
-        ];
+        ].map(v => v.getTime());
         const vector = vectorFromArray(values, new DateDay);
 
         basicVectorTests(vector, values, extras);
@@ -108,7 +149,6 @@ describe(`DateVector`, () => {
 });
 
 describe(`DictionaryVector`, () => {
-
     const dictionary = ['foo', 'bar', 'baz'];
     const extras = ['abc', '123']; // values to search for that should NOT be found
     const dictionary_vec = vectorFromArray(dictionary, new Utf8).memoize();
@@ -117,7 +157,6 @@ describe(`DictionaryVector`, () => {
     const validity = Array.from({ length: indices.length }, () => Math.random() > 0.2);
 
     describe(`index with nullCount == 0`, () => {
-
         const values = indices.map((d) => dictionary[d]);
         const vector = makeVector({
             data: indices,
@@ -133,7 +172,6 @@ describe(`DictionaryVector`, () => {
     });
 
     describe(`index with nullCount > 0`, () => {
-
         const nullBitmap = util.packBools(validity);
         const nullCount = validity.reduce((acc, d) => acc + (d ? 0 : 1), 0);
         const values = indices.map((d, i) => validity[i] ? dictionary[d] : null);
@@ -227,8 +265,10 @@ describe(`ListVector`, () => {
     });
 
     test(`get value`, () => {
-        for (const [i, value] of values.entries()) {
-            expect(vector.get(i)!.toJSON()).toEqual(value);
+        for (let i = 0; i < values.length; i++) {
+            expect(vector.get(i)!.toJSON()).toEqual(values[i]);
+            expect(vector.at(i)!.toJSON()).toEqual(values.at(i));
+            expect(vector.at(-i)!.toJSON()).toEqual(values.at(-i));
         }
     });
 });
@@ -248,17 +288,6 @@ describe(`toArray()`, () => {
         const array = vector.toArray();
         expect(array).toHaveLength(26);
     });
-
-    test(`when stride is 2`, () => {
-        let d1 = vectorFromArray([0, 1, 2], new Timestamp(TimeUnit.MILLISECOND)).data[0];
-        let d2 = vectorFromArray([3, 4, 5], new Timestamp(TimeUnit.MILLISECOND)).data[0];
-
-        const vector = new Vector([d1, d2]);
-
-        let array = Array.from(vector.toArray());
-        expect(array).toHaveLength(6 * 2);
-        expect(Array.from(array)).toMatchObject([0, 0, 1, 0, 2, 0, 3, 0, 4, 0, 5, 0]);
-    });
 });
 
 // Creates some basic tests for the given vector.
@@ -270,9 +299,10 @@ function basicVectorTests(vector: Vector, values: any[], extras: any[]) {
     const n = values.length;
 
     test(`gets expected values`, () => {
-        let i = -1;
-        while (++i < n) {
+        for (let i = 0; i < values.length; i++) {
             expect(vector.get(i)).toEqual(values[i]);
+            expect(vector.at(i)).toEqual(values.at(i));
+            expect(vector.at(-i)).toEqual(values.at(-i));
         }
     });
     test(`iterates expected values`, () => {
diff --git a/js/yarn.lock b/js/yarn.lock
index 7b3180740d3da..f8dcd3e5b9eb2 100644
--- a/js/yarn.lock
+++ b/js/yarn.lock
@@ -4,7 +4,7 @@
 
 "@75lb/deep-merge@^1.1.1":
   version "1.1.1"
-  resolved "https://registry.npmjs.org/@75lb/deep-merge/-/deep-merge-1.1.1.tgz#3b06155b90d34f5f8cc2107d796f1853ba02fd6d"
+  resolved "https://registry.yarnpkg.com/@75lb/deep-merge/-/deep-merge-1.1.1.tgz#3b06155b90d34f5f8cc2107d796f1853ba02fd6d"
   integrity sha512-xvgv6pkMGBA6GwdyJbNAnDmfAIR/DfWhrj9jgWh3TY7gRm3KO46x/GPjRg6wJ0nOepwqrNxFfojebh0Df4h4Tw==
   dependencies:
     lodash.assignwith "^4.2.0"
@@ -12,44 +12,44 @@
 
 "@aashutoshrathi/word-wrap@^1.2.3":
   version "1.2.6"
-  resolved "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
   integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
 
 "@ampproject/remapping@^2.2.0":
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
-  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
+  integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.3.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.24"
 
 "@arrows/array@^1.4.1":
   version "1.4.1"
-  resolved "https://registry.npmjs.org/@arrows/array/-/array-1.4.1.tgz#a6580a08cee219755ca9a8eb14e956d3c29a5508"
+  resolved "https://registry.yarnpkg.com/@arrows/array/-/array-1.4.1.tgz#a6580a08cee219755ca9a8eb14e956d3c29a5508"
   integrity sha512-MGYS8xi3c4tTy1ivhrVntFvufoNzje0PchjEz6G/SsWRgUKxL4tKwS6iPdO8vsaJYldagAeWMd5KRD0aX3Q39g==
   dependencies:
     "@arrows/composition" "^1.2.2"
 
 "@arrows/composition@^1.0.0", "@arrows/composition@^1.2.2":
   version "1.2.2"
-  resolved "https://registry.npmjs.org/@arrows/composition/-/composition-1.2.2.tgz#d0a213cac8f8c36c1c75856a1e6ed940c27e9169"
+  resolved "https://registry.yarnpkg.com/@arrows/composition/-/composition-1.2.2.tgz#d0a213cac8f8c36c1c75856a1e6ed940c27e9169"
   integrity sha512-9fh1yHwrx32lundiB3SlZ/VwuStPB4QakPsSLrGJFH6rCXvdrd060ivAZ7/2vlqPnEjBkPRRXOcG1YOu19p2GQ==
 
 "@arrows/dispatch@^1.0.2":
   version "1.0.3"
-  resolved "https://registry.npmjs.org/@arrows/dispatch/-/dispatch-1.0.3.tgz#c4c06260f89e9dd4ce280df3712980aa2f3de976"
+  resolved "https://registry.yarnpkg.com/@arrows/dispatch/-/dispatch-1.0.3.tgz#c4c06260f89e9dd4ce280df3712980aa2f3de976"
   integrity sha512-v/HwvrFonitYZM2PmBlAlCqVqxrkIIoiEuy5bQgn0BdfvlL0ooSBzcPzTMrtzY8eYktPyYcHg8fLbSgyybXEqw==
   dependencies:
     "@arrows/composition" "^1.2.2"
 
 "@arrows/error@^1.0.2":
   version "1.0.2"
-  resolved "https://registry.npmjs.org/@arrows/error/-/error-1.0.2.tgz#4e68036f901118ba6f1de88656ef6be49e650414"
+  resolved "https://registry.yarnpkg.com/@arrows/error/-/error-1.0.2.tgz#4e68036f901118ba6f1de88656ef6be49e650414"
   integrity sha512-yvkiv1ay4Z3+Z6oQsUkedsQm5aFdyPpkBUQs8vejazU/RmANABx6bMMcBPPHI4aW43VPQmXFfBzr/4FExwWTEA==
 
 "@arrows/multimethod@^1.1.6":
   version "1.4.1"
-  resolved "https://registry.npmjs.org/@arrows/multimethod/-/multimethod-1.4.1.tgz#319d0b6f84d22522dd2f4b24f04137b6219f0300"
+  resolved "https://registry.yarnpkg.com/@arrows/multimethod/-/multimethod-1.4.1.tgz#319d0b6f84d22522dd2f4b24f04137b6219f0300"
   integrity sha512-AZnAay0dgPnCJxn3We5uKiB88VL+1ZIF2SjZohLj6vqY2UyvB/sKdDnFP+LZNVsTC5lcnGPmLlRRkAh4sXkXsQ==
   dependencies:
     "@arrows/array" "^1.4.1"
@@ -57,76 +57,58 @@
     "@arrows/error" "^1.0.2"
     fast-deep-equal "^3.1.3"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.13":
-  version "7.22.13"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
-  integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
-  dependencies:
-    "@babel/highlight" "^7.22.13"
-    chalk "^2.4.2"
-
-"@babel/code-frame@^7.22.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
-  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.1", "@babel/code-frame@^7.24.2":
+  version "7.24.2"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae"
+  integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==
   dependencies:
-    "@babel/highlight" "^7.23.4"
-    chalk "^2.4.2"
+    "@babel/highlight" "^7.24.2"
+    picocolors "^1.0.0"
 
-"@babel/compat-data@^7.22.9":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.2.tgz#6a12ced93455827037bfb5ed8492820d60fc32cc"
-  integrity sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==
+"@babel/compat-data@^7.23.5":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.4.tgz#6f102372e9094f25d908ca0d34fc74c74606059a"
+  integrity sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==
 
-"@babel/core@^7.11.6", "@babel/core@^7.12.3":
-  version "7.22.19"
-  resolved "https://registry.npmjs.org/@babel/core/-/core-7.22.19.tgz#b38162460a6f3baf2a424bda720b24a8aafea241"
-  integrity sha512-Q8Yj5X4LHVYTbLCKVz0//2D2aDmHF4xzCdEttYvKOnWvErGsa6geHXD6w46x64n5tP69VfeH+IfSrdyH3MLhwA==
+"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.23.9":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.4.tgz#1f758428e88e0d8c563874741bc4ffc4f71a4717"
+  integrity sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.22.15"
-    "@babel/helper-compilation-targets" "^7.22.15"
-    "@babel/helper-module-transforms" "^7.22.19"
-    "@babel/helpers" "^7.22.15"
-    "@babel/parser" "^7.22.16"
-    "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.22.19"
-    "@babel/types" "^7.22.19"
-    convert-source-map "^1.7.0"
+    "@babel/code-frame" "^7.24.2"
+    "@babel/generator" "^7.24.4"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helpers" "^7.24.4"
+    "@babel/parser" "^7.24.4"
+    "@babel/template" "^7.24.0"
+    "@babel/traverse" "^7.24.1"
+    "@babel/types" "^7.24.0"
+    convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.22.15", "@babel/generator@^7.7.2":
-  version "7.22.15"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz#1564189c7ec94cb8f77b5e8a90c4d200d21b2339"
-  integrity sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==
+"@babel/generator@^7.24.1", "@babel/generator@^7.24.4", "@babel/generator@^7.7.2":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.24.4.tgz#1fc55532b88adf952025d5d2d1e71f946cb1c498"
+  integrity sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==
   dependencies:
-    "@babel/types" "^7.22.15"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
+    "@babel/types" "^7.24.0"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
-  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
-  dependencies:
-    "@babel/types" "^7.23.0"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
-
-"@babel/helper-compilation-targets@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52"
-  integrity sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==
+"@babel/helper-compilation-targets@^7.23.6":
+  version "7.23.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
+  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
   dependencies:
-    "@babel/compat-data" "^7.22.9"
-    "@babel/helper-validator-option" "^7.22.15"
-    browserslist "^4.21.9"
+    "@babel/compat-data" "^7.23.5"
+    "@babel/helper-validator-option" "^7.23.5"
+    browserslist "^4.22.2"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
@@ -135,11 +117,6 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
   integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
 
-"@babel/helper-environment-visitor@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
-  integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
-
 "@babel/helper-function-name@^7.23.0":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
@@ -150,37 +127,37 @@
 
 "@babel/helper-hoist-variables@^7.22.5":
   version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
   integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
   dependencies:
     "@babel/types" "^7.22.5"
 
 "@babel/helper-module-imports@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0"
-  integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==
+  version "7.24.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz#6ac476e6d168c7c23ff3ba3cf4f7841d46ac8128"
+  integrity sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==
   dependencies:
-    "@babel/types" "^7.22.15"
+    "@babel/types" "^7.24.0"
 
-"@babel/helper-module-transforms@^7.22.19":
-  version "7.22.19"
-  resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.19.tgz#94b1f281caa6518f02ec0f5ea2b5348e298ce266"
-  integrity sha512-m6h1cJvn+OJ+R3jOHp30faq5xKJ7VbjwDj5RGgHuRlU9hrMeKsGC+JpihkR5w1g7IfseCPPtZ0r7/hB4UKaYlA==
+"@babel/helper-module-transforms@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
+  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-module-imports" "^7.22.15"
     "@babel/helper-simple-access" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.19"
+    "@babel/helper-validator-identifier" "^7.22.20"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
-  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.24.0", "@babel/helper-plugin-utils@^7.8.0":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a"
+  integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==
 
 "@babel/helper-simple-access@^7.22.5":
   version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
   integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
   dependencies:
     "@babel/types" "^7.22.5"
@@ -192,471 +169,445 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-string-parser@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
-  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
+"@babel/helper-string-parser@^7.23.4":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e"
+  integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==
 
-"@babel/helper-validator-identifier@^7.22.19", "@babel/helper-validator-identifier@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
-  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+"@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.24.5":
+  version "7.24.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz#08bb6612b11bdec78f3feed3db196da682454a5e"
+  integrity sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==
 
-"@babel/helper-validator-option@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040"
-  integrity sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==
+"@babel/helper-validator-option@^7.23.5":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
+  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
 
-"@babel/helpers@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz#f09c3df31e86e3ea0b7ff7556d85cdebd47ea6f1"
-  integrity sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==
+"@babel/helpers@^7.24.4":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.4.tgz#dc00907fd0d95da74563c142ef4cd21f2cb856b6"
+  integrity sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==
   dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/traverse" "^7.22.15"
-    "@babel/types" "^7.22.15"
+    "@babel/template" "^7.24.0"
+    "@babel/traverse" "^7.24.1"
+    "@babel/types" "^7.24.0"
 
-"@babel/highlight@^7.22.13":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54"
-  integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
+"@babel/highlight@^7.24.2":
+  version "7.24.2"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.2.tgz#3f539503efc83d3c59080a10e6634306e0370d26"
+  integrity sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==
   dependencies:
     "@babel/helper-validator-identifier" "^7.22.20"
     chalk "^2.4.2"
     js-tokens "^4.0.0"
+    picocolors "^1.0.0"
 
-"@babel/highlight@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
-  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
-    chalk "^2.4.2"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.16":
-  version "7.22.16"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz#180aead7f247305cce6551bea2720934e2fa2c95"
-  integrity sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==
-
-"@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
-  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
-
-"@babel/parser@^7.22.5":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b"
-  integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.23.9", "@babel/parser@^7.24.0", "@babel/parser@^7.24.1", "@babel/parser@^7.24.4":
+  version "7.24.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88"
+  integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-bigint@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
   integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-class-properties@^7.8.3":
   version "7.12.13"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
   integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
   integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-jsx@^7.7.2":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918"
-  integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz#3f6ca04b8c841811dbc3c5c5f837934e0d626c10"
+  integrity sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
   integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-numeric-separator@^7.8.3":
   version "7.10.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
   integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-top-level-await@^7.8.3":
   version "7.14.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
   integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-typescript@^7.7.2":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272"
-  integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz#b3bcc51f396d15f3591683f90239de143c076844"
+  integrity sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/template@^7.22.15":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
-  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
+"@babel/template@^7.22.15", "@babel/template@^7.24.0", "@babel/template@^7.3.3":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.0.tgz#c6a524aa93a4a05d66aaf31654258fae69d87d50"
+  integrity sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==
   dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/parser" "^7.22.15"
-    "@babel/types" "^7.22.15"
+    "@babel/code-frame" "^7.23.5"
+    "@babel/parser" "^7.24.0"
+    "@babel/types" "^7.24.0"
 
-"@babel/template@^7.3.3":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
-  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
+"@babel/traverse@^7.24.1":
+  version "7.24.1"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c"
+  integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==
   dependencies:
-    "@babel/code-frame" "^7.22.5"
-    "@babel/parser" "^7.22.5"
-    "@babel/types" "^7.22.5"
-
-"@babel/traverse@^7.22.15", "@babel/traverse@^7.22.19":
-  version "7.23.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
-  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
-  dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.23.0"
+    "@babel/code-frame" "^7.24.1"
+    "@babel/generator" "^7.24.1"
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.0"
-    "@babel/types" "^7.23.0"
-    debug "^4.1.0"
+    "@babel/parser" "^7.24.1"
+    "@babel/types" "^7.24.0"
+    debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.19", "@babel/types@^7.22.5", "@babel/types@^7.3.3":
-  version "7.22.19"
-  resolved "https://registry.npmjs.org/@babel/types/-/types-7.22.19.tgz#7425343253556916e440e662bb221a93ddb75684"
-  integrity sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==
-  dependencies:
-    "@babel/helper-string-parser" "^7.22.5"
-    "@babel/helper-validator-identifier" "^7.22.19"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.22.15", "@babel/types@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
-  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.24.0", "@babel/types@^7.3.3":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
+  integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==
   dependencies:
-    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-string-parser" "^7.23.4"
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
-  resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
+  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
-  resolved "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
   integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
 "@discoveryjs/json-ext@0.5.7":
   version "0.5.7"
-  resolved "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
+  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
-"@esbuild/aix-ppc64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.0.tgz#509621cca4e67caf0d18561a0c56f8b70237472f"
-  integrity sha512-fGFDEctNh0CcSwsiRPxiaqX0P5rq+AqE0SRhYGZ4PX46Lg1FNR6oCxJghf8YgY0WQEgQuh3lErUFE4KxLeRmmw==
-
-"@esbuild/android-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz#bafb75234a5d3d1b690e7c2956a599345e84a2fd"
-  integrity sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==
-
-"@esbuild/android-arm64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.0.tgz#109a6fdc4a2783fc26193d2687827045d8fef5ab"
-  integrity sha512-aVpnM4lURNkp0D3qPoAzSG92VXStYmoVPOgXveAUoQBWRSuQzt51yvSju29J6AHPmwY1BjH49uR29oyfH1ra8Q==
-
-"@esbuild/android-arm@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz#5898f7832c2298bc7d0ab53701c57beb74d78b4d"
-  integrity sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==
-
-"@esbuild/android-arm@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.0.tgz#1397a2c54c476c4799f9b9073550ede496c94ba5"
-  integrity sha512-3bMAfInvByLHfJwYPJRlpTeaQA75n8C/QKpEaiS4HrFWFiJlNI0vzq/zCjBrhAYcPyVPG7Eo9dMrcQXuqmNk5g==
-
-"@esbuild/android-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz#658368ef92067866d95fb268719f98f363d13ae1"
-  integrity sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==
-
-"@esbuild/android-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.0.tgz#2b615abefb50dc0a70ac313971102f4ce2fdb3ca"
-  integrity sha512-uK7wAnlRvjkCPzh8jJ+QejFyrP8ObKuR5cBIsQZ+qbMunwR8sbd8krmMbxTLSrDhiPZaJYKQAU5Y3iMDcZPhyQ==
-
-"@esbuild/darwin-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz#584c34c5991b95d4d48d333300b1a4e2ff7be276"
-  integrity sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==
-
-"@esbuild/darwin-arm64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.0.tgz#5c122ed799eb0c35b9d571097f77254964c276a2"
-  integrity sha512-AjEcivGAlPs3UAcJedMa9qYg9eSfU6FnGHJjT8s346HSKkrcWlYezGE8VaO2xKfvvlZkgAhyvl06OJOxiMgOYQ==
-
-"@esbuild/darwin-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz#7751d236dfe6ce136cce343dce69f52d76b7f6cb"
-  integrity sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==
-
-"@esbuild/darwin-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.0.tgz#9561d277002ba8caf1524f209de2b22e93d170c1"
-  integrity sha512-bsgTPoyYDnPv8ER0HqnJggXK6RyFy4PH4rtsId0V7Efa90u2+EifxytE9pZnsDgExgkARy24WUQGv9irVbTvIw==
-
-"@esbuild/freebsd-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz#cacd171665dd1d500f45c167d50c6b7e539d5fd2"
-  integrity sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==
-
-"@esbuild/freebsd-arm64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.0.tgz#84178986a3138e8500d17cc380044868176dd821"
-  integrity sha512-kQ7jYdlKS335mpGbMW5tEe3IrQFIok9r84EM3PXB8qBFJPSc6dpWfrtsC/y1pyrz82xfUIn5ZrnSHQQsd6jebQ==
-
-"@esbuild/freebsd-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz#0769456eee2a08b8d925d7c00b79e861cb3162e4"
-  integrity sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==
-
-"@esbuild/freebsd-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.0.tgz#3f9ce53344af2f08d178551cd475629147324a83"
-  integrity sha512-uG8B0WSepMRsBNVXAQcHf9+Ko/Tr+XqmK7Ptel9HVmnykupXdS4J7ovSQUIi0tQGIndhbqWLaIL/qO/cWhXKyQ==
-
-"@esbuild/linux-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz#38e162ecb723862c6be1c27d6389f48960b68edb"
-  integrity sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==
-
-"@esbuild/linux-arm64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.0.tgz#24efa685515689df4ecbc13031fa0a9dda910a11"
-  integrity sha512-uTtyYAP5veqi2z9b6Gr0NUoNv9F/rOzI8tOD5jKcCvRUn7T60Bb+42NDBCWNhMjkQzI0qqwXkQGo1SY41G52nw==
-
-"@esbuild/linux-arm@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz#1a2cd399c50040184a805174a6d89097d9d1559a"
-  integrity sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==
-
-"@esbuild/linux-arm@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.0.tgz#6b586a488e02e9b073a75a957f2952b3b6e87b4c"
-  integrity sha512-2ezuhdiZw8vuHf1HKSf4TIk80naTbP9At7sOqZmdVwvvMyuoDiZB49YZKLsLOfKIr77+I40dWpHVeY5JHpIEIg==
-
-"@esbuild/linux-ia32@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz#e28c25266b036ce1cabca3c30155222841dc035a"
-  integrity sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==
-
-"@esbuild/linux-ia32@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.0.tgz#84ce7864f762708dcebc1b123898a397dea13624"
-  integrity sha512-c88wwtfs8tTffPaoJ+SQn3y+lKtgTzyjkD8NgsyCtCmtoIC8RDL7PrJU05an/e9VuAke6eJqGkoMhJK1RY6z4w==
-
-"@esbuild/linux-loong64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz#0f887b8bb3f90658d1a0117283e55dbd4c9dcf72"
-  integrity sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==
-
-"@esbuild/linux-loong64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.0.tgz#1922f571f4cae1958e3ad29439c563f7d4fd9037"
-  integrity sha512-lR2rr/128/6svngnVta6JN4gxSXle/yZEZL3o4XZ6esOqhyR4wsKyfu6qXAL04S4S5CgGfG+GYZnjFd4YiG3Aw==
-
-"@esbuild/linux-mips64el@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz#f5d2a0b8047ea9a5d9f592a178ea054053a70289"
-  integrity sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==
-
-"@esbuild/linux-mips64el@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.0.tgz#7ca1bd9df3f874d18dbf46af009aebdb881188fe"
-  integrity sha512-9Sycc+1uUsDnJCelDf6ZNqgZQoK1mJvFtqf2MUz4ujTxGhvCWw+4chYfDLPepMEvVL9PDwn6HrXad5yOrNzIsQ==
-
-"@esbuild/linux-ppc64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz#876590e3acbd9fa7f57a2c7d86f83717dbbac8c7"
-  integrity sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==
-
-"@esbuild/linux-ppc64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.0.tgz#8f95baf05f9486343bceeb683703875d698708a4"
-  integrity sha512-CoWSaaAXOZd+CjbUTdXIJE/t7Oz+4g90A3VBCHLbfuc5yUQU/nFDLOzQsN0cdxgXd97lYW/psIIBdjzQIwTBGw==
-
-"@esbuild/linux-riscv64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz#7f49373df463cd9f41dc34f9b2262d771688bf09"
-  integrity sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==
-
-"@esbuild/linux-riscv64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.0.tgz#ca63b921d5fe315e28610deb0c195e79b1a262ca"
-  integrity sha512-mlb1hg/eYRJUpv8h/x+4ShgoNLL8wgZ64SUr26KwglTYnwAWjkhR2GpoKftDbPOCnodA9t4Y/b68H4J9XmmPzA==
-
-"@esbuild/linux-s390x@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz#e2afd1afcaf63afe2c7d9ceacd28ec57c77f8829"
-  integrity sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==
-
-"@esbuild/linux-s390x@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.0.tgz#cb3d069f47dc202f785c997175f2307531371ef8"
-  integrity sha512-fgf9ubb53xSnOBqyvWEY6ukBNRl1mVX1srPNu06B6mNsNK20JfH6xV6jECzrQ69/VMiTLvHMicQR/PgTOgqJUQ==
-
-"@esbuild/linux-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz#8a0e9738b1635f0c53389e515ae83826dec22aa4"
-  integrity sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==
-
-"@esbuild/linux-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.0.tgz#ac617e0dc14e9758d3d7efd70288c14122557dc7"
-  integrity sha512-H9Eu6MGse++204XZcYsse1yFHmRXEWgadk2N58O/xd50P9EvFMLJTQLg+lB4E1cF2xhLZU5luSWtGTb0l9UeSg==
-
-"@esbuild/netbsd-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz#c29fb2453c6b7ddef9a35e2c18b37bda1ae5c462"
-  integrity sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==
-
-"@esbuild/netbsd-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.0.tgz#6cc778567f1513da6e08060e0aeb41f82eb0f53c"
-  integrity sha512-lCT675rTN1v8Fo+RGrE5KjSnfY0x9Og4RN7t7lVrN3vMSjy34/+3na0q7RIfWDAj0e0rCh0OL+P88lu3Rt21MQ==
-
-"@esbuild/openbsd-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz#95e75a391403cb10297280d524d66ce04c920691"
-  integrity sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==
-
-"@esbuild/openbsd-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.0.tgz#76848bcf76b4372574fb4d06cd0ed1fb29ec0fbe"
-  integrity sha512-HKoUGXz/TOVXKQ+67NhxyHv+aDSZf44QpWLa3I1lLvAwGq8x1k0T+e2HHSRvxWhfJrFxaaqre1+YyzQ99KixoA==
-
-"@esbuild/sunos-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz#722eaf057b83c2575937d3ffe5aeb16540da7273"
-  integrity sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==
-
-"@esbuild/sunos-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.0.tgz#ea4cd0639bf294ad51bc08ffbb2dac297e9b4706"
-  integrity sha512-GDwAqgHQm1mVoPppGsoq4WJwT3vhnz/2N62CzhvApFD1eJyTroob30FPpOZabN+FgCjhG+AgcZyOPIkR8dfD7g==
-
-"@esbuild/win32-arm64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz#9aa9dc074399288bdcdd283443e9aeb6b9552b6f"
-  integrity sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==
-
-"@esbuild/win32-arm64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.0.tgz#a5c171e4a7f7e4e8be0e9947a65812c1535a7cf0"
-  integrity sha512-0vYsP8aC4TvMlOQYozoksiaxjlvUcQrac+muDqj1Fxy6jh9l9CZJzj7zmh8JGfiV49cYLTorFLxg7593pGldwQ==
-
-"@esbuild/win32-ia32@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz#95ad43c62ad62485e210f6299c7b2571e48d2b03"
-  integrity sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==
-
-"@esbuild/win32-ia32@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.0.tgz#f8ac5650c412d33ea62d7551e0caf82da52b7f85"
-  integrity sha512-p98u4rIgfh4gdpV00IqknBD5pC84LCub+4a3MO+zjqvU5MVXOc3hqR2UgT2jI2nh3h8s9EQxmOsVI3tyzv1iFg==
-
-"@esbuild/win32-x64@0.17.19":
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz#8cfaf2ff603e9aabb910e9c0558c26cf32744061"
-  integrity sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==
-
-"@esbuild/win32-x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.0.tgz#2efddf82828aac85e64cef62482af61c29561bee"
-  integrity sha512-NgJnesu1RtWihtTtXGFMU5YSE6JyyHPMxCwBZK7a6/8d31GuSo9l0Ss7w1Jw5QnKUawG6UEehs883kcXf5fYwg==
+"@esbuild/aix-ppc64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f"
+  integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==
+
+"@esbuild/aix-ppc64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.22.0.tgz#6ff1ec509335ffbaee3fc4a5a11373d6f029b2c4"
+  integrity sha512-uvQR2crZ/zgzSHDvdygHyNI+ze9zwS8mqz0YtGXotSqvEE0UkYE9s+FZKQNTt1VtT719mfP3vHrUdCpxBNQZhQ==
+
+"@esbuild/android-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052"
+  integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==
+
+"@esbuild/android-arm64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.22.0.tgz#a02ef8650fe5ce17807c9f3229a36d326d2b07ea"
+  integrity sha512-UKhPb3o2gAB/bfXcl58ZXTn1q2oVu1rEu/bKrCtmm+Nj5MKUbrOwR5WAixE2v+lk0amWuwPvhnPpBRLIGiq7ig==
+
+"@esbuild/android-arm@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28"
+  integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==
+
+"@esbuild/android-arm@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.22.0.tgz#dd26ec407db736eee0eb060195a43aa13f618013"
+  integrity sha512-PBnyP+r8vJE4ifxsWys9l+Mc2UY/yYZOpX82eoyGISXXb3dRr0M21v+s4fgRKWMFPMSf/iyowqPW/u7ScSUkjQ==
+
+"@esbuild/android-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e"
+  integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==
+
+"@esbuild/android-x64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.22.0.tgz#f02771a20be264ccc22478dcc7de8f2bde858af8"
+  integrity sha512-IjTYtvIrjhR41Ijy2dDPgYjQHWG/x/A4KXYbs1fiU3efpRdoxMChK3oEZV6GPzVEzJqxFgcuBaiX1kwEvWUxSw==
+
+"@esbuild/darwin-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a"
+  integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==
+
+"@esbuild/darwin-arm64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.22.0.tgz#d905f2b951aeba328dd02e3a09f86b5d4e5e6741"
+  integrity sha512-mqt+Go4y9wRvEz81bhKd9RpHsQR1LwU8Xm6jZRUV/xpM7cIQFbFH6wBCLPTNsdELBvfoHeumud7X78jQQJv2TA==
+
+"@esbuild/darwin-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22"
+  integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==
+
+"@esbuild/darwin-x64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.22.0.tgz#d07b4fe501fe9985590285b2790039ed4743f86e"
+  integrity sha512-vTaTQ9OgYc3VTaWtOE5pSuDT6H3d/qSRFRfSBbnxFfzAvYoB3pqKXA0LEbi/oT8GUOEAutspfRMqPj2ezdFaMw==
+
+"@esbuild/freebsd-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e"
+  integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==
+
+"@esbuild/freebsd-arm64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.22.0.tgz#4251e0a14716116f4fa7e22d908f47408b6c2fb5"
+  integrity sha512-0e1ZgoobJzaGnR4reD7I9rYZ7ttqdh1KPvJWnquUoDJhL0rYwdneeLailBzd2/4g/U5p4e5TIHEWa68NF2hFpQ==
+
+"@esbuild/freebsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261"
+  integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==
+
+"@esbuild/freebsd-x64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.22.0.tgz#7dbd35616a71f8a9b61a9435c5a79d87fc0b2f1a"
+  integrity sha512-BFgyYwlCwRWyPQJtkzqq2p6pJbiiWgp0P9PNf7a5FQ1itKY4czPuOMAlFVItirSmEpRPCeImuwePNScZS0pL5Q==
+
+"@esbuild/linux-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b"
+  integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==
+
+"@esbuild/linux-arm64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.22.0.tgz#77cded446dd0c3b723d272e0243b3d9ddb3cb46e"
+  integrity sha512-V/K2rctCUgC0PCXpN7AqT4hoazXKgIYugFGu/myk2+pfe6jTW2guz/TBwq4cZ7ESqusR/IzkcQaBkcjquuBWsw==
+
+"@esbuild/linux-arm@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9"
+  integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==
+
+"@esbuild/linux-arm@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.22.0.tgz#6587d3e423e09766ea997229827e292e7c4acd6f"
+  integrity sha512-KEMWiA9aGuPUD4BH5yjlhElLgaRXe+Eri6gKBoDazoPBTo1BXc/e6IW5FcJO9DoL19FBeCxgONyh95hLDNepIg==
+
+"@esbuild/linux-ia32@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2"
+  integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==
+
+"@esbuild/linux-ia32@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.22.0.tgz#2d06d7b4abc443e05a820ff50d4c2d98cc04c22f"
+  integrity sha512-r2ZZqkOMOrpUhzNwxI7uLAHIDwkfeqmTnrv1cjpL/rjllPWszgqmprd/om9oviKXUBpMqHbXmppvjAYgISb26Q==
+
+"@esbuild/linux-loong64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df"
+  integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==
+
+"@esbuild/linux-loong64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.22.0.tgz#a3e7faabe9a046ac4557bc515ce0981cfe5a6e0f"
+  integrity sha512-qaowLrV/YOMAL2RfKQ4C/VaDzAuLDuylM2sd/LH+4OFirMl6CuDpRlCq4u49ZBaVV8pkI/Y+hTdiibvQRhojCA==
+
+"@esbuild/linux-mips64el@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe"
+  integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==
+
+"@esbuild/linux-mips64el@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.22.0.tgz#3a2877a78f6719e5eed4cfdded5121c5ab9305a4"
+  integrity sha512-hgrezzjQTRxjkQ5k08J6rtZN5PNnkWx/Rz6Kmj9gnsdCAX1I4Dn4ZPqvFRkXo55Q3pnVQJBwbdtrTO7tMGtyVA==
+
+"@esbuild/linux-ppc64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4"
+  integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==
+
+"@esbuild/linux-ppc64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.22.0.tgz#6609478066083e05cc1854a8b272daf62a7e944b"
+  integrity sha512-ewxg6FLLUio883XgSjfULEmDl3VPv/TYNnRprVAS3QeGFLdCYdx1tIudBcd7n9jIdk82v1Ajov4jx87qW7h9+g==
+
+"@esbuild/linux-riscv64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc"
+  integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==
+
+"@esbuild/linux-riscv64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.22.0.tgz#d786a89903cf98e8d34befe6a71c69562bb4ceac"
+  integrity sha512-Az5XbgSJC2lE8XK8pdcutsf9RgdafWdTpUK/+6uaDdfkviw/B4JCwAfh1qVeRWwOohwdsl4ywZrWBNWxwrPLFg==
+
+"@esbuild/linux-s390x@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de"
+  integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==
+
+"@esbuild/linux-s390x@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.22.0.tgz#a7ab13ae163307ac615dac5ce7f60a6b0a067d59"
+  integrity sha512-8j4a2ChT9+V34NNNY9c/gMldutaJFmfMacTPq4KfNKwv2fitBCLYjee7c+Vxaha2nUhPK7cXcZpJtJ3+Y7ZdVQ==
+
+"@esbuild/linux-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0"
+  integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==
+
+"@esbuild/linux-x64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.22.0.tgz#24949de431013354da1d8c29e53299798f8c27ef"
+  integrity sha512-JUQyOnpbAkkRFOk/AhsEemz5TfWN4FJZxVObUlnlNCbe7QBl61ZNfM4cwBXayQA6laMJMUcqLHaYQHAB6YQ95Q==
+
+"@esbuild/netbsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047"
+  integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==
+
+"@esbuild/netbsd-x64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.22.0.tgz#bc3f51c41eaab89cf5fdb09d0c633affb39cb1a1"
+  integrity sha512-11PoCoHXo4HFNbLsXuMB6bpMPWGDiw7xETji6COdJss4SQZLvcgNoeSqWtATRm10Jj1uEHiaIk4N0PiN6x4Fcg==
+
+"@esbuild/openbsd-arm64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.22.0.tgz#7cb42e3a0d3da039d1a4b7ccbd0c19b0f71ae453"
+  integrity sha512-Ezlhu/YyITmXwKSB+Zu/QqD7cxrjrpiw85cc0Rbd3AWr2wsgp+dWbWOE8MqHaLW9NKMZvuL0DhbJbvzR7F6Zvg==
+
+"@esbuild/openbsd-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70"
+  integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==
+
+"@esbuild/openbsd-x64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.22.0.tgz#194aa9915323962e9ea66c5a13ff3e1db272a683"
+  integrity sha512-ufjdW5tFJGUjlH9j/5cCE9lrwRffyZh+T4vYvoDKoYsC6IXbwaFeV/ENxeNXcxotF0P8CDzoICXVSbJaGBhkrw==
+
+"@esbuild/sunos-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b"
+  integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==
+
+"@esbuild/sunos-x64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.22.0.tgz#2be9d2459ae181ebedb6470e4469349a27c4f060"
+  integrity sha512-zY6ly/AoSmKnmNTowDJsK5ehra153/5ZhqxNLfq9NRsTTltetr+yHHcQ4RW7QDqw4JC8A1uC1YmeSfK9NRcK1w==
+
+"@esbuild/win32-arm64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d"
+  integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==
+
+"@esbuild/win32-arm64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.22.0.tgz#6b4224f2d049c26f37026904210a4293e34c2747"
+  integrity sha512-Kml5F7tv/1Maam0pbbCrvkk9vj046dPej30kFzlhXnhuCtYYBP6FGy/cLbc5yUT1lkZznGLf2OvuvmLjscO5rw==
+
+"@esbuild/win32-ia32@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b"
+  integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==
+
+"@esbuild/win32-ia32@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.22.0.tgz#4a1184f6fd4a7594c4f1e68b1e649248534f7832"
+  integrity sha512-IOgwn+mYTM3RrcydP4Og5IpXh+ftN8oF+HELTXSmbWBlujuci4Qa3DTeO+LEErceisI7KUSfEIiX+WOUlpELkw==
+
+"@esbuild/win32-x64@0.21.5":
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c"
+  integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==
+
+"@esbuild/win32-x64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.22.0.tgz#4b83e9449a205e7d94d5368035450fc1680fe525"
+  integrity sha512-4bDHJrk2WHBXJPhy1y80X7/5b5iZTZP3LGcKIlAP1J+KqZ4zQAPMLEzftGyjjfcKbA4JDlPt/+2R/F1ZTeRgrw==
 
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
-  resolved "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
   integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1":
+"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
   version "4.10.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63"
   integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==
 
-"@eslint/eslintrc@^2.1.2":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.2.tgz#c6936b4b328c64496692f76944e755738be62396"
-  integrity sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -668,14 +619,29 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.52.0":
-  version "8.52.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.52.0.tgz#78fe5f117840f69dc4a353adf9b9cd926353378c"
-  integrity sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==
+"@eslint/eslintrc@^3.0.2":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.1.0.tgz#dbd3482bfd91efa663cbe7aa1f506839868207b6"
+  integrity sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.3.2"
+    espree "^10.0.1"
+    globals "^14.0.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
+    strip-json-comments "^3.1.1"
+
+"@eslint/js@8.57.0":
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
+  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
 
 "@gulp-sourcemaps/identity-map@^2.0.1":
   version "2.0.1"
-  resolved "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz#a6e8b1abec8f790ec6be2b8c500e6e68037c0019"
+  resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/identity-map/-/identity-map-2.0.1.tgz#a6e8b1abec8f790ec6be2b8c500e6e68037c0019"
   integrity sha512-Tb+nSISZku+eQ4X1lAkevcQa+jknn/OVUgZ3XCxEKIsLsqYuPoJwJOPQeaOk75X3WPftb29GWY1eqE7GLsXb1Q==
   dependencies:
     acorn "^6.4.1"
@@ -686,34 +652,34 @@
 
 "@gulp-sourcemaps/map-sources@^1.0.0":
   version "1.0.0"
-  resolved "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz#890ae7c5d8c877f6d384860215ace9d7ec945bda"
+  resolved "https://registry.yarnpkg.com/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz#890ae7c5d8c877f6d384860215ace9d7ec945bda"
   integrity sha512-o/EatdaGt8+x2qpb0vFLC/2Gug/xYPRXb6a+ET1wGYKozKN3krDWC/zZFZAtrzxJHuDL12mwdfEFKcKMNvc55A==
   dependencies:
     normalize-path "^2.0.1"
     through2 "^2.0.3"
 
-"@humanwhocodes/config-array@^0.11.13":
-  version "0.11.13"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297"
-  integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==
+"@humanwhocodes/config-array@^0.11.14":
+  version "0.11.14"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
+  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
   dependencies:
-    "@humanwhocodes/object-schema" "^2.0.1"
-    debug "^4.1.1"
+    "@humanwhocodes/object-schema" "^2.0.2"
+    debug "^4.3.1"
     minimatch "^3.0.5"
 
 "@humanwhocodes/module-importer@^1.0.1":
   version "1.0.1"
-  resolved "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044"
-  integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==
+"@humanwhocodes/object-schema@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
-  resolved "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
   integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
   dependencies:
     string-width "^5.1.2"
@@ -725,7 +691,7 @@
 
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
-  resolved "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
   integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
   dependencies:
     camelcase "^5.3.1"
@@ -734,14 +700,14 @@
     js-yaml "^3.13.1"
     resolve-from "^5.0.0"
 
-"@istanbuljs/schema@^0.1.2":
+"@istanbuljs/schema@^0.1.2", "@istanbuljs/schema@^0.1.3":
   version "0.1.3"
-  resolved "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
 "@jest/console@^29.7.0":
   version "29.7.0"
-  resolved "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz#cd4822dbdb84529265c5a2bdb529a3c9cc950ffc"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.7.0.tgz#cd4822dbdb84529265c5a2bdb529a3c9cc950ffc"
   integrity sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==
   dependencies:
     "@jest/types" "^29.6.3"
@@ -751,9 +717,9 @@
     jest-util "^29.7.0"
     slash "^3.0.0"
 
-"@jest/core@^29.6.2", "@jest/core@^29.7.0":
+"@jest/core@^29.7.0":
   version "29.7.0"
-  resolved "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz#b6cccc239f30ff36609658c5a5e2291757ce448f"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.7.0.tgz#b6cccc239f30ff36609658c5a5e2291757ce448f"
   integrity sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==
   dependencies:
     "@jest/console" "^29.7.0"
@@ -787,7 +753,7 @@
 
 "@jest/environment@^29.7.0":
   version "29.7.0"
-  resolved "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz#24d61f54ff1f786f3cd4073b4b94416383baf2a7"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.7.0.tgz#24d61f54ff1f786f3cd4073b4b94416383baf2a7"
   integrity sha512-aQIfHDq33ExsN4jP1NWGXhxgQ/wixs60gDiKO+XVMd8Mn0NWPWgc34ZQDTb2jKaUWQ7MuwoitXAsN2XVXNMpAw==
   dependencies:
     "@jest/fake-timers" "^29.7.0"
@@ -797,14 +763,14 @@
 
 "@jest/expect-utils@^29.7.0":
   version "29.7.0"
-  resolved "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz#023efe5d26a8a70f21677d0a1afc0f0a44e3a1c6"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.7.0.tgz#023efe5d26a8a70f21677d0a1afc0f0a44e3a1c6"
   integrity sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==
   dependencies:
     jest-get-type "^29.6.3"
 
 "@jest/expect@^29.7.0":
   version "29.7.0"
-  resolved "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz#76a3edb0cb753b70dfbfe23283510d3d45432bf2"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.7.0.tgz#76a3edb0cb753b70dfbfe23283510d3d45432bf2"
   integrity sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==
   dependencies:
     expect "^29.7.0"
@@ -812,7 +778,7 @@
 
 "@jest/fake-timers@^29.7.0":
   version "29.7.0"
-  resolved "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-29.7.0.tgz#fd91bf1fffb16d7d0d24a426ab1a47a49881a565"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.7.0.tgz#fd91bf1fffb16d7d0d24a426ab1a47a49881a565"
   integrity sha512-q4DH1Ha4TTFPdxLsqDXK1d3+ioSL7yL5oCMJZgDYm6i+6CygW5E5xVr/D1HdsGxjt1ZWSfUAs9OxSB/BNelWrQ==
   dependencies:
     "@jest/types" "^29.6.3"
@@ -824,7 +790,7 @@
 
 "@jest/globals@^29.7.0":
   version "29.7.0"
-  resolved "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz#8d9290f9ec47ff772607fa864ca1d5a2efae1d4d"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.7.0.tgz#8d9290f9ec47ff772607fa864ca1d5a2efae1d4d"
   integrity sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==
   dependencies:
     "@jest/environment" "^29.7.0"
@@ -834,7 +800,7 @@
 
 "@jest/reporters@^29.7.0":
   version "29.7.0"
-  resolved "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz#04b262ecb3b8faa83b0b3d321623972393e8f4c7"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.7.0.tgz#04b262ecb3b8faa83b0b3d321623972393e8f4c7"
   integrity sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
@@ -864,14 +830,14 @@
 
 "@jest/schemas@^29.6.3":
   version "29.6.3"
-  resolved "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
   integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
   dependencies:
     "@sinclair/typebox" "^0.27.8"
 
 "@jest/source-map@^29.6.3":
   version "29.6.3"
-  resolved "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz#d90ba772095cf37a34a5eb9413f1b562a08554c4"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.6.3.tgz#d90ba772095cf37a34a5eb9413f1b562a08554c4"
   integrity sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.18"
@@ -880,7 +846,7 @@
 
 "@jest/test-result@^29.7.0":
   version "29.7.0"
-  resolved "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz#8db9a80aa1a097bb2262572686734baed9b1657c"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.7.0.tgz#8db9a80aa1a097bb2262572686734baed9b1657c"
   integrity sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==
   dependencies:
     "@jest/console" "^29.7.0"
@@ -890,7 +856,7 @@
 
 "@jest/test-sequencer@^29.7.0":
   version "29.7.0"
-  resolved "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz#6cef977ce1d39834a3aea887a1726628a6f072ce"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz#6cef977ce1d39834a3aea887a1726628a6f072ce"
   integrity sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==
   dependencies:
     "@jest/test-result" "^29.7.0"
@@ -900,7 +866,7 @@
 
 "@jest/transform@^29.7.0":
   version "29.7.0"
-  resolved "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz#df2dd9c346c7d7768b8a06639994640c642e284c"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.7.0.tgz#df2dd9c346c7d7768b8a06639994640c642e284c"
   integrity sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==
   dependencies:
     "@babel/core" "^7.11.6"
@@ -921,7 +887,7 @@
 
 "@jest/types@^26.6.2":
   version "26.6.2"
-  resolved "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e"
   integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
@@ -930,9 +896,9 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@jest/types@^29.6.1", "@jest/types@^29.6.3":
+"@jest/types@^29.6.3":
   version "29.6.3"
-  resolved "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
   integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
   dependencies:
     "@jest/schemas" "^29.6.3"
@@ -942,57 +908,77 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
-"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.3"
-  resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
-  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
+"@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
+  integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
   dependencies:
-    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/set-array" "^1.2.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
-    "@jridgewell/trace-mapping" "^0.3.9"
+    "@jridgewell/trace-mapping" "^0.3.24"
 
 "@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0":
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
-  integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
 
-"@jridgewell/set-array@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
-  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+"@jridgewell/set-array@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
+  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
 
 "@jridgewell/source-map@^0.3.3":
-  version "0.3.5"
-  resolved "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91"
-  integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.6.tgz#9d71ca886e32502eb9362c9a74a46787c36df81a"
+  integrity sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.3.0"
-    "@jridgewell/trace-mapping" "^0.3.9"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
 
 "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
   version "1.4.15"
-  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
 "@jridgewell/trace-mapping@0.3.9":
   version "0.3.9"
-  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
   integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
   dependencies:
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.19"
-  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811"
-  integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+  version "0.3.25"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
+  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
   dependencies:
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
+"@jsonjoy.com/base64@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/base64/-/base64-1.1.1.tgz#a717fd8840f7bad49c7fe66cc65db8bcfc4c4dc5"
+  integrity sha512-LnFjVChaGY8cZVMwAIMjvA1XwQjZ/zIXHyh28IyJkyNkzof4Dkm1+KN9UIm3lHhREH4vs7XwZ0NpkZKnwOtEfg==
+
+"@jsonjoy.com/json-pack@^1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/json-pack/-/json-pack-1.0.3.tgz#a68cbe3ccfd85d26cd763e4175fe90c9ee383d33"
+  integrity sha512-Q0SPAdmK6s5Fe3e1kcNvwNyk6e2+CxM8XZdGbf4abZG7nUO05KSie3/iX29loTBuY+75uVP6RixDSPVpotfzmQ==
+  dependencies:
+    "@jsonjoy.com/base64" "^1.1.1"
+    "@jsonjoy.com/util" "^1.1.2"
+    hyperdyperid "^1.2.0"
+    thingies "^1.20.0"
+
+"@jsonjoy.com/util@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@jsonjoy.com/util/-/util-1.1.2.tgz#5072c27ecdb16d1ed7a2d125a1d0ed8aba01d652"
+  integrity sha512-HOGa9wtE6LEz2I5mMQ2pMSjth85PmD71kPbsecs02nEUq3/Kw0wRK3gmZn5BCEB8mFLXByqPxjHgApoMwIPMKQ==
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
-  resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
   integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
   dependencies:
     "@nodelib/fs.stat" "2.0.5"
@@ -1000,12 +986,12 @@
 
 "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
   version "2.0.5"
-  resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
 "@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
-  resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
   dependencies:
     "@nodelib/fs.scandir" "2.1.5"
@@ -1013,30 +999,30 @@
 
 "@openpgp/web-stream-tools@0.0.13":
   version "0.0.13"
-  resolved "https://registry.npmjs.org/@openpgp/web-stream-tools/-/web-stream-tools-0.0.13.tgz#f0be50120c152efb11b65df29ab482dc192dbbd7"
+  resolved "https://registry.yarnpkg.com/@openpgp/web-stream-tools/-/web-stream-tools-0.0.13.tgz#f0be50120c152efb11b65df29ab482dc192dbbd7"
   integrity sha512-VQ0O0lUcD9ilLcMLQMJMgPhp8fDgMd4copd+UhSBGjud0vbI1ONQ3ffAhixEMml/AApLJtqCpd7PJcccPliFSA==
 
 "@pkgjs/parseargs@^0.11.0":
   version "0.11.0"
-  resolved "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@polka/url@^1.0.0-next.20":
-  version "1.0.0-next.23"
-  resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.23.tgz#498e41218ab3b6a1419c735e5c6ae2c5ed609b6c"
-  integrity sha512-C16M+IYz0rgRhWZdCmK+h58JMv8vijAA61gmz2rspCSwKwzBebpdcsiUmwrtJRdphuY30i6BSLEOP8ppbNLyLg==
+"@polka/url@^1.0.0-next.24":
+  version "1.0.0-next.25"
+  resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.25.tgz#f077fdc0b5d0078d30893396ff4827a13f99e817"
+  integrity sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==
 
-"@rollup/plugin-alias@5.0.0":
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-5.0.0.tgz#70f3d504bd17d8922e35c6b61c08b40a6ec25af2"
-  integrity sha512-l9hY5chSCjuFRPsnRm16twWBiSApl2uYFLsepQYwtBuAxNMQ/1dJqADld40P0Jkqm65GRTLy/AC6hnpVebtLsA==
+"@rollup/plugin-alias@5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-5.1.0.tgz#99a94accc4ff9a3483be5baeedd5d7da3b597e93"
+  integrity sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==
   dependencies:
     slash "^4.0.0"
 
-"@rollup/plugin-node-resolve@15.1.0":
-  version "15.1.0"
-  resolved "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.1.0.tgz#9ffcd8e8c457080dba89bb9fcb583a6778dc757e"
-  integrity sha512-xeZHCgsiZ9pzYVgAo9580eCGqwh/XCEUM9q6iQfGNocjgkufHAqC3exA+45URvhiYV8sBF9RlBai650eNs7AsA==
+"@rollup/plugin-node-resolve@15.2.3":
+  version "15.2.3"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz#e5e0b059bd85ca57489492f295ce88c2d4b0daf9"
+  integrity sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==
   dependencies:
     "@rollup/pluginutils" "^5.0.1"
     "@types/resolve" "1.20.2"
@@ -1046,202 +1032,235 @@
     resolve "^1.22.1"
 
 "@rollup/pluginutils@^5.0.1":
-  version "5.0.4"
-  resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.4.tgz#74f808f9053d33bafec0cc98e7b835c9667d32ba"
-  integrity sha512-0KJnIoRI8A+a1dqOYLxH8vBf8bphDmty5QvIm2hqm7oFCFYKCAZWWd2hXgMibaPsNDhI0AtpYfQZJG47pt/k4g==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.1.0.tgz#7e53eddc8c7f483a4ad0b94afb1f7f5fd3c771e0"
+  integrity sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==
   dependencies:
     "@types/estree" "^1.0.0"
     estree-walker "^2.0.2"
     picomatch "^2.3.1"
 
-"@rollup/rollup-android-arm-eabi@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.3.0.tgz#8ad8a660b18f1a24ad4a272738a65ac4788a8811"
-  integrity sha512-/4pns6BYi8MXdwnXM44yoGAcFYVHL/BYlB2q1HXZ6AzH++LaiEVWFpBWQ/glXhbMbv3E3o09igrHFbP/snhAvA==
-
-"@rollup/rollup-android-arm64@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.3.0.tgz#17b0f412034d14668c8acc8b7cbd8b1c76279599"
-  integrity sha512-nLO/JsL9idr416vzi3lHm3Xm+QZh4qHij8k3Er13kZr5YhL7/+kBAx84kDmPc7HMexLmwisjDCeDIKNFp8mDlQ==
-
-"@rollup/rollup-darwin-arm64@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.3.0.tgz#80c4a4dd7b120906d4e655808fb9005784a8bf35"
-  integrity sha512-dGhVBlllt4iHwTGy21IEoMOTN5wZoid19zEIxsdY29xcEiOEHqzDa7Sqrkh5OE7LKCowL61eFJXxYe/+pYa7ZQ==
-
-"@rollup/rollup-darwin-x64@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.3.0.tgz#52ad0db40d9b5ae047dfc08e54e4b3f42feaef82"
-  integrity sha512-h8wRfHeLEbU3NzaP1Oku7BYXCJQiTRr+8U0lklyOQXxXiEpHLL8tk1hFl+tezoRKLcPJD7joKaK74ASsqt3Ekg==
-
-"@rollup/rollup-linux-arm-gnueabihf@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.3.0.tgz#2ad3d190af01d7fc8704e8e782c4a24006a9f21a"
-  integrity sha512-wP4VgR/gfV18sylTuym3sxRTkAgUR2vh6YLeX/GEznk5jCYcYSlx585XlcUcl0c8UffIZlRJ09raWSX3JDb4GA==
-
-"@rollup/rollup-linux-arm64-gnu@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.3.0.tgz#4f7ba42f779f06e93876755b7393c61676e2958a"
-  integrity sha512-v/14JCYVkqRSJeQbxFx4oUkwVQQw6lFMN7bd4vuARBc3X2lmomkxBsc+BFiIDL/BK+CTx5AOh/k9XmqDnKWRVg==
-
-"@rollup/rollup-linux-arm64-musl@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.3.0.tgz#64795a09dac02b4d779819509a793b93ba7e4c0d"
-  integrity sha512-tNhfYqFH5OxtRzfkTOKdgFYlPSZnlDLNW4+leNEvQZhwTJxoTwsZAAhR97l3qVry/kkLyJPBK+Q8EAJLPinDIg==
-
-"@rollup/rollup-linux-x64-gnu@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.3.0.tgz#00c1ff131ba16881eb1a0ad46b0aa10dcacb010e"
-  integrity sha512-pw77m8QywdsoFdFOgmc8roF1inBI0rciqzO8ffRUgLoq7+ee9o5eFqtEcS6hHOOplgifAUUisP8cAnwl9nUYPw==
-
-"@rollup/rollup-linux-x64-musl@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.3.0.tgz#89479dce5e5bf6850fbca92fa7f1637ddd70c9ef"
-  integrity sha512-tJs7v2MnV2F8w6X1UpPHl/43OfxjUy9SuJ2ZPoxn79v9vYteChVYO/ueLHCpRMmyTUIVML3N9z4azl9ENH8Xxg==
-
-"@rollup/rollup-win32-arm64-msvc@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.3.0.tgz#1a36aba17c7efe6d61e98b8049e70b40e33b1f45"
-  integrity sha512-OKGxp6kATQdTyI2DF+e9s+hB3/QZB45b6e+dzcfW1SUqiF6CviWyevhmT4USsMEdP3mlpC9zxLz3Oh+WaTMOSw==
-
-"@rollup/rollup-win32-ia32-msvc@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.3.0.tgz#a0b1f79afde51e390a7725b7c15ab4e0df780aea"
-  integrity sha512-DDZ5AH68JJ2ClQFEA1aNnfA7Ybqyeh0644rGbrLOdNehTmzfICHiWSn0OprzYi9HAshTPQvlwrM+bi2kuaIOjQ==
-
-"@rollup/rollup-win32-x64-msvc@4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.3.0.tgz#0b9bcc159b93c911efb5a2c39ec5d70dd0a589dc"
-  integrity sha512-dMvGV8p92GQ8jhNlGIKpyhVZPzJlT258pPrM5q2F8lKcc9Iv9BbfdnhX1OfinYWnb9ms5zLw6MlaMnqLfUkKnQ==
+"@rollup/rollup-android-arm-eabi@4.18.0":
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz#bbd0e616b2078cd2d68afc9824d1fadb2f2ffd27"
+  integrity sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==
+
+"@rollup/rollup-android-arm64@4.18.0":
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.0.tgz#97255ef6384c5f73f4800c0de91f5f6518e21203"
+  integrity sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==
+
+"@rollup/rollup-darwin-arm64@4.18.0":
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.0.tgz#b6dd74e117510dfe94541646067b0545b42ff096"
+  integrity sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==
+
+"@rollup/rollup-darwin-x64@4.18.0":
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz#e07d76de1cec987673e7f3d48ccb8e106d42c05c"
+  integrity sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.18.0":
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.0.tgz#9f1a6d218b560c9d75185af4b8bb42f9f24736b8"
+  integrity sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==
+
+"@rollup/rollup-linux-arm-musleabihf@4.18.0":
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.0.tgz#53618b92e6ffb642c7b620e6e528446511330549"
+  integrity sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==
+
+"@rollup/rollup-linux-arm64-gnu@4.18.0":
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.0.tgz#99a7ba5e719d4f053761a698f7b52291cefba577"
+  integrity sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==
+
+"@rollup/rollup-linux-arm64-musl@4.18.0":
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.0.tgz#f53db99a45d9bc00ce94db8a35efa7c3c144a58c"
+  integrity sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==
+
+"@rollup/rollup-linux-powerpc64le-gnu@4.18.0":
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.0.tgz#cbb0837408fe081ce3435cf3730e090febafc9bf"
+  integrity sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==
+
+"@rollup/rollup-linux-riscv64-gnu@4.18.0":
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.0.tgz#8ed09c1d1262ada4c38d791a28ae0fea28b80cc9"
+  integrity sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==
+
+"@rollup/rollup-linux-s390x-gnu@4.18.0":
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.0.tgz#938138d3c8e0c96f022252a28441dcfb17afd7ec"
+  integrity sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==
+
+"@rollup/rollup-linux-x64-gnu@4.18.0":
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz#1a7481137a54740bee1ded4ae5752450f155d942"
+  integrity sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==
+
+"@rollup/rollup-linux-x64-musl@4.18.0":
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz#f1186afc601ac4f4fc25fac4ca15ecbee3a1874d"
+  integrity sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==
+
+"@rollup/rollup-win32-arm64-msvc@4.18.0":
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.0.tgz#ed6603e93636a96203c6915be4117245c1bd2daf"
+  integrity sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==
+
+"@rollup/rollup-win32-ia32-msvc@4.18.0":
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.0.tgz#14e0b404b1c25ebe6157a15edb9c46959ba74c54"
+  integrity sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==
+
+"@rollup/rollup-win32-x64-msvc@4.18.0":
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz#5d694d345ce36b6ecf657349e03eb87297e68da4"
+  integrity sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==
 
 "@rollup/stream@3.0.1":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@rollup/stream/-/stream-3.0.1.tgz#485452d6f1016ac1b0513060f90ff02aaca3e1c0"
   integrity sha512-wdzoakLc9UiPOFa1k17ukfEtvQ0p7JuNFvOZT1DhO5Z5CrTf71An01U9+v+aebYcaLCwy3tLwpCSUF7K7xVN0A==
 
+"@shikijs/core@1.10.0":
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/@shikijs/core/-/core-1.10.0.tgz#ec3356ace7cb8b41f6baee0116f036fca85054cc"
+  integrity sha512-BZcr6FCmPfP6TXaekvujZcnkFmJHZ/Yglu97r/9VjzVndQA56/F4WjUKtJRQUnK59Wi7p/UTAOekMfCJv7jnYg==
+
 "@sinclair/typebox@^0.27.8":
   version "0.27.8"
-  resolved "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
   integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
 
 "@sinonjs/commons@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.0.tgz#beb434fe875d965265e04722ccfc21df7f755d72"
-  integrity sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.1.tgz#1029357e44ca901a615585f6d27738dbc89084cd"
+  integrity sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==
   dependencies:
     type-detect "4.0.8"
 
 "@sinonjs/fake-timers@^10.0.2":
   version "10.3.0"
-  resolved "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz#55fdff1ecab9f354019129daf4df0dd4d923ea66"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz#55fdff1ecab9f354019129daf4df0dd4d923ea66"
   integrity sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==
   dependencies:
     "@sinonjs/commons" "^3.0.0"
 
-"@swc/core-darwin-arm64@1.3.82":
-  version "1.3.82"
-  resolved "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.82.tgz#bbf9874747b51053d8a59ea26c3e235c326f24a3"
-  integrity sha512-JfsyDW34gVKD3uE0OUpUqYvAD3yseEaicnFP6pB292THtLJb0IKBBnK50vV/RzEJtc1bR3g1kNfxo2PeurZTrA==
-
-"@swc/core-darwin-x64@1.3.82":
-  version "1.3.82"
-  resolved "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.82.tgz#145cdde16678e0d793620035783e5b413a16ac43"
-  integrity sha512-ogQWgNMq7qTpITjcP3dnzkFNj7bh6SwMr859GvtOTrE75H7L7jDWxESfH4f8foB/LGxBKiDNmxKhitCuAsZK4A==
-
-"@swc/core-linux-arm-gnueabihf@1.3.82":
-  version "1.3.82"
-  resolved "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.82.tgz#0c2f32c5793f2ac8e8ccf416aec84d016c30ef7b"
-  integrity sha512-7TMXG1lXlNhD0kUiEqs+YlGV4irAdBa2quuy+XI3oJf2fBK6dQfEq4xBy65B3khrorzQS3O0oDGQ+cmdpHExHA==
-
-"@swc/core-linux-arm64-gnu@1.3.82":
-  version "1.3.82"
-  resolved "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.82.tgz#2313d4901fa0ebdd2a0f189909073e1e8a07f1d6"
-  integrity sha512-26JkOujbzcItPAmIbD5vHJxQVy5ihcSu3YHTKwope1h28sApZdtE7S3e2G3gsZRTIdsCQkXUtAQeqHxGWWR3pw==
-
-"@swc/core-linux-arm64-musl@1.3.82":
-  version "1.3.82"
-  resolved "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.82.tgz#6e96cf6e52e647fecf27511d766bea90e96f8a2f"
-  integrity sha512-8Izj9tuuMpoc3cqiPBRtwqpO1BZ/+sfZVsEhLxrbOFlcSb8LnKyMle1g3JMMUwI4EU75RGVIzZMn8A6GOKdJbA==
-
-"@swc/core-linux-x64-gnu@1.3.82":
-  version "1.3.82"
-  resolved "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.82.tgz#6275c10d7c8c0768550bc7934c9dd8cde4881d92"
-  integrity sha512-0GSrIBScQwTaPv46T2qB7XnDYxndRCpwH4HMjh6FN+I+lfPUhTSJKW8AonqrqT1TbpFIgvzQs7EnTsD7AnSCow==
-
-"@swc/core-linux-x64-musl@1.3.82":
-  version "1.3.82"
-  resolved "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.82.tgz#edb98c30bd0de42bf1a63469937630d942c71988"
-  integrity sha512-KJUnaaepDKNzrEbwz4jv0iC3/t9x0NSoe06fnkAlhh2+NFKWKKJhVCOBTrpds8n7eylBDIXUlK34XQafjVMUdg==
-
-"@swc/core-win32-arm64-msvc@1.3.82":
-  version "1.3.82"
-  resolved "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.82.tgz#0a8e9b361aac37d01f684c8a3d3e94e5f8c3b14f"
-  integrity sha512-TR3MHKhDYIyGyFcyl2d/p1ftceXcubAhX5wRSOdtOyr5+K/v3jbyCCqN7bbqO5o43wQVCwwR/drHleYyDZvg8Q==
-
-"@swc/core-win32-ia32-msvc@1.3.82":
-  version "1.3.82"
-  resolved "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.82.tgz#096854ff764282766271f1354ee1214358a8bf01"
-  integrity sha512-ZX4HzVVt6hs84YUg70UvyBJnBOIspmQQM0iXSzBvOikk3zRoN7BnDwQH4GScvevCEBuou60+i4I6d5kHLOfh8Q==
-
-"@swc/core-win32-x64-msvc@1.3.82":
-  version "1.3.82"
-  resolved "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.82.tgz#1181070bff4a13a7fcc7f1020eef1571f8c1257a"
-  integrity sha512-4mJMnex21kbQoaHeAmHnVwQN9/XAfPszJ6n9HI7SVH+aAHnbBIR0M59/b50/CJMjTj5niUGk7EwQ3nhVNOG32g==
-
-"@swc/core@1.3.82":
-  version "1.3.82"
-  resolved "https://registry.npmjs.org/@swc/core/-/core-1.3.82.tgz#8f6c53db3c23a1769b6c5085fbcb3b1df9548a40"
-  integrity sha512-jpC1a18HMH67018Ij2jh+hT7JBFu7ZKcQVfrZ8K6JuEY+kjXmbea07P9MbQUZbAe0FB+xi3CqEVCP73MebodJQ==
-  dependencies:
-    "@swc/types" "^0.1.4"
+"@swc/core-darwin-arm64@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.6.6.tgz#9488d50394cb08713c4321a940b48599c1c5e153"
+  integrity sha512-5DA8NUGECcbcK1YLKJwNDKqdtTYDVnkfDU1WvQSXq/rU+bjYCLtn5gCe8/yzL7ISXA6rwqPU1RDejhbNt4ARLQ==
+
+"@swc/core-darwin-x64@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.6.6.tgz#0b13ae43e1821fd447acfb789979c59bec2d0081"
+  integrity sha512-2nbh/RHpweNRsJiYDFk1KcX7UtaKgzzTNUjwtvK5cp0wWrpbXmPvdlWOx3yzwoiSASDFx78242JHHXCIOlEdsw==
+
+"@swc/core-linux-arm-gnueabihf@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.6.6.tgz#8dd3e76b887478cedd38d34f1de3c0b8f853d1b8"
+  integrity sha512-YgytuyUfR7b0z0SRHKV+ylr83HmgnROgeT7xryEkth6JGpAEHooCspQ4RrWTU8+WKJ7aXiZlGXPgybQ4TiS+TA==
+
+"@swc/core-linux-arm64-gnu@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.6.6.tgz#4d6369975d8a077f01cf9f6cee60402529ef67a6"
+  integrity sha512-yGwx9fddzEE0iURqRVwKBQ4IwRHE6hNhl15WliHpi/PcYhzmYkUIpcbRXjr0dssubXAVPVnx6+jZVDSbutvnfg==
+
+"@swc/core-linux-arm64-musl@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.6.6.tgz#5f0ec779e465242796277d07a3100bd5ccaec6ef"
+  integrity sha512-a6fMbqzSAsS5KCxFJyg1mD5kwN3ZFO8qQLyJ75R/htZP/eCt05jrhmOI7h2n+1HjiG332jLnZ9S8lkVE5O8Nqw==
+
+"@swc/core-linux-x64-gnu@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.6.6.tgz#30a92064e016f29b8fe85500fa4e71050c60ae74"
+  integrity sha512-hRGsUKNzzZle28YF0dYIpN0bt9PceR9LaVBq7x8+l9TAaDLFbgksSxcnU/ubTtsy+WsYSYGn+A83w3xWC0O8CQ==
+
+"@swc/core-linux-x64-musl@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.6.6.tgz#59a14e4a90644142b8c90972f5d29cfdde88de78"
+  integrity sha512-NokIUtFxJDVv3LzGeEtYMTV3j2dnGKLac59luTeq36DQLZdJQawQIdTbzzWl2jE7lxxTZme+dhsVOH9LxE3ceg==
+
+"@swc/core-win32-arm64-msvc@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.6.6.tgz#c81f6e9be1df76273100a422ceec887781244b5d"
+  integrity sha512-lzYdI4qb4k1dFG26yv+9Jaq/bUMAhgs/2JsrLncGjLof86+uj74wKYCQnbzKAsq2hDtS5DqnHnl+//J+miZfGA==
+
+"@swc/core-win32-ia32-msvc@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.6.6.tgz#0381e95282fdcf5f5f9731b56dad5c5e4da870ce"
+  integrity sha512-bvl7FMaXIJQ76WZU0ER4+RyfKIMGb6S2MgRkBhJOOp0i7VFx4WLOnrmMzaeoPJaJSkityVKAftfNh7NBzTIydQ==
+
+"@swc/core-win32-x64-msvc@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.6.6.tgz#e511013aa3f71125d6385123469cdd30db141070"
+  integrity sha512-WAP0JoCTfgeYKgOeYJoJV4ZS0sQUmU3OwvXa2dYYtMLF7zsNqOiW4niU7QlThBHgUv/qNZm2p6ITEgh3w1cltw==
+
+"@swc/core@1.6.6":
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.6.6.tgz#fefaa3a6bdd1c6991a9ed67648bc058a0d29d4b8"
+  integrity sha512-sHfmIUPUXNrQTwFMVCY5V5Ena2GTOeaWjS2GFUpjLhAgVfP90OP67DWow7+cYrfFtqBdILHuWnjkTcd0+uPKlg==
+  dependencies:
+    "@swc/counter" "^0.1.3"
+    "@swc/types" "^0.1.9"
   optionalDependencies:
-    "@swc/core-darwin-arm64" "1.3.82"
-    "@swc/core-darwin-x64" "1.3.82"
-    "@swc/core-linux-arm-gnueabihf" "1.3.82"
-    "@swc/core-linux-arm64-gnu" "1.3.82"
-    "@swc/core-linux-arm64-musl" "1.3.82"
-    "@swc/core-linux-x64-gnu" "1.3.82"
-    "@swc/core-linux-x64-musl" "1.3.82"
-    "@swc/core-win32-arm64-msvc" "1.3.82"
-    "@swc/core-win32-ia32-msvc" "1.3.82"
-    "@swc/core-win32-x64-msvc" "1.3.82"
-
-"@swc/helpers@^0.5.2":
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.3.tgz#98c6da1e196f5f08f977658b80d6bd941b5f294f"
-  integrity sha512-FaruWX6KdudYloq1AHD/4nU+UsMTdNE8CKyrseXWEcgjDAbvkwJg2QGPAnfIJLIWsjZOSPLOAykK6fuYp4vp4A==
+    "@swc/core-darwin-arm64" "1.6.6"
+    "@swc/core-darwin-x64" "1.6.6"
+    "@swc/core-linux-arm-gnueabihf" "1.6.6"
+    "@swc/core-linux-arm64-gnu" "1.6.6"
+    "@swc/core-linux-arm64-musl" "1.6.6"
+    "@swc/core-linux-x64-gnu" "1.6.6"
+    "@swc/core-linux-x64-musl" "1.6.6"
+    "@swc/core-win32-arm64-msvc" "1.6.6"
+    "@swc/core-win32-ia32-msvc" "1.6.6"
+    "@swc/core-win32-x64-msvc" "1.6.6"
+
+"@swc/counter@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.3.tgz#cc7463bd02949611c6329596fccd2b0ec782b0e9"
+  integrity sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==
+
+"@swc/helpers@^0.5.11":
+  version "0.5.11"
+  resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.11.tgz#5bab8c660a6e23c13b2d23fcd1ee44a2db1b0cb7"
+  integrity sha512-YNlnKRWF2sVojTpIyzwou9XoTNbzbzONwRhOoniEioF1AtaitTvVZblaQRrAzChWQ1bLYyYSWzM18y4WwgzJ+A==
   dependencies:
     tslib "^2.4.0"
 
-"@swc/types@^0.1.4":
-  version "0.1.4"
-  resolved "https://registry.npmjs.org/@swc/types/-/types-0.1.4.tgz#8d647e111dc97a8e2881bf71c2ee2d011698ff10"
-  integrity sha512-z/G02d+59gyyUb7KYhKi9jOhicek6QD2oMaotUyG+lUkybpXoV49dY9bj7Ah5Q+y7knK2jU67UTX9FyfGzaxQg==
+"@swc/types@^0.1.9":
+  version "0.1.9"
+  resolved "https://registry.yarnpkg.com/@swc/types/-/types-0.1.9.tgz#e67cdcc2e4dd74a3cef4474b465eb398e7ae83e2"
+  integrity sha512-qKnCno++jzcJ4lM4NTfYifm1EFSCeIfKiAHAfkENZAV5Kl9PjJIyd2yeeVv6c/2CckuLyv2NmRC5pv6pm2WQBg==
+  dependencies:
+    "@swc/counter" "^0.1.3"
 
 "@tsconfig/node10@^1.0.7":
-  version "1.0.9"
-  resolved "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
-  integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.11.tgz#6ee46400685f130e278128c7b38b7e031ff5b2f2"
+  integrity sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==
 
 "@tsconfig/node12@^1.0.7":
   version "1.0.11"
-  resolved "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d"
   integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
 
 "@tsconfig/node14@^1.0.0":
   version "1.0.3"
-  resolved "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1"
   integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
 
 "@tsconfig/node16@^1.0.2":
   version "1.0.4"
-  resolved "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9"
   integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==
 
 "@types/babel__core@^7.1.14":
-  version "7.20.1"
-  resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz#916ecea274b0c776fec721e333e55762d3a9614b"
-  integrity sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017"
+  integrity sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==
   dependencies:
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
@@ -1250,124 +1269,124 @@
     "@types/babel__traverse" "*"
 
 "@types/babel__generator@*":
-  version "7.6.4"
-  resolved "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7"
-  integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==
+  version "7.6.8"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.8.tgz#f836c61f48b1346e7d2b0d93c6dacc5b9535d3ab"
+  integrity sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@types/babel__template@*":
-  version "7.4.1"
-  resolved "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"
-  integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
+  version "7.4.4"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.4.tgz#5672513701c1b2199bc6dad636a9d7491586766f"
+  integrity sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.20.1"
-  resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz#dd6f1d2411ae677dcb2db008c962598be31d6acf"
-  integrity sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.5.tgz#7b7502be0aa80cc4ef22978846b983edaafcd4dd"
+  integrity sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==
   dependencies:
     "@babel/types" "^7.20.7"
 
-"@types/benchmark@2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@types/benchmark/-/benchmark-2.1.4.tgz#74f331a07ca5a07a14409ccae7e8072775974361"
-  integrity sha512-rVCCileCU5NhP9Ix1e03sIn4gd0mpjh7VNULVQAxzF+9vddk6A5QAHzp2h5kXH8pkv1Ow45fUf3QP3wOEiISvA==
+"@types/benchmark@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@types/benchmark/-/benchmark-2.1.5.tgz#940c1850c18fdfdaee3fd6ed29cd92ae0d445b45"
+  integrity sha512-cKio2eFB3v7qmKcvIHLUMw/dIx/8bhWPuzpzRT4unCPRTD8VdA9Zb0afxpcxOqR4PixRS7yT42FqGS8BYL8g1w==
 
-"@types/command-line-args@^5.2.1":
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/@types/command-line-args/-/command-line-args-5.2.2.tgz#ca93ae7045305a2b7c60936bfcb1ebc897b42270"
-  integrity sha512-9aZ7KzLDOBYyqH5J2bvB9edvsMXusX+H/aS8idAJOpWNmscZG5RqO1CVJPFa4Q0/1xKgvxcweXunFVx2l/dYFA==
+"@types/command-line-args@^5.2.3":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/@types/command-line-args/-/command-line-args-5.2.3.tgz#553ce2fd5acf160b448d307649b38ffc60d39639"
+  integrity sha512-uv0aG6R0Y8WHZLTamZwtfsDLVRnOa+n+n5rEvFWL5Na5gZ8V2Teab/duDPFzIIIhs9qizDpcavCusCLJZu62Kw==
 
-"@types/command-line-usage@^5.0.2":
-  version "5.0.2"
-  resolved "https://registry.npmjs.org/@types/command-line-usage/-/command-line-usage-5.0.2.tgz#ba5e3f6ae5a2009d466679cc431b50635bf1a064"
-  integrity sha512-n7RlEEJ+4x4TS7ZQddTmNSxP+zziEG0TNsMfiRIxcIVXt71ENJ9ojeXmGO3wPoTdn7pJcU2xc3CJYMktNT6DPg==
+"@types/command-line-usage@^5.0.4":
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/@types/command-line-usage/-/command-line-usage-5.0.4.tgz#374e4c62d78fbc5a670a0f36da10235af879a0d5"
+  integrity sha512-BwR5KP3Es/CSht0xqBcUXS3qCAUVXwpRKsV2+arxeb65atasuXG9LykC9Ab10Cw3s2raH92ZqOeILaQbsB2ACg==
 
 "@types/eslint-scope@^3.7.3":
-  version "3.7.4"
-  resolved "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
-  integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
+  version "3.7.7"
+  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
+  integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
   dependencies:
     "@types/eslint" "*"
     "@types/estree" "*"
 
 "@types/eslint@*":
-  version "8.44.2"
-  resolved "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.2.tgz#0d21c505f98a89b8dd4d37fa162b09da6089199a"
-  integrity sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==
+  version "8.56.7"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.7.tgz#c33b5b5a9cfb66881beb7b5be6c34aa3e81d3366"
+  integrity sha512-SjDvI/x3zsZnOkYZ3lCt9lOZWZLB2jIlNKz+LBgCtDurK0JZcwucxYHn1w2BJkD34dgX9Tjnak0txtq4WTggEA==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*", "@types/estree@^1.0.0":
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
-  integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
+"@types/estree@*", "@types/estree@1.0.5", "@types/estree@^1.0.0", "@types/estree@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
 
 "@types/expect@^1.20.4":
   version "1.20.4"
-  resolved "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz#8288e51737bf7e3ab5d7c77bfa695883745264e5"
+  resolved "https://registry.yarnpkg.com/@types/expect/-/expect-1.20.4.tgz#8288e51737bf7e3ab5d7c77bfa695883745264e5"
   integrity sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==
 
 "@types/glob@8.1.0":
   version "8.1.0"
-  resolved "https://registry.npmjs.org/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.1.0.tgz#b63e70155391b0584dce44e7ea25190bbc38f2fc"
   integrity sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==
   dependencies:
     "@types/minimatch" "^5.1.2"
     "@types/node" "*"
 
 "@types/graceful-fs@^4.1.3":
-  version "4.1.6"
-  resolved "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz#e14b2576a1c25026b7f02ede1de3b84c3a1efeae"
-  integrity sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==
+  version "4.1.9"
+  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.9.tgz#2a06bc0f68a20ab37b3e36aa238be6abdf49e8b4"
+  integrity sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==
   dependencies:
     "@types/node" "*"
 
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44"
-  integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7"
+  integrity sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==
 
 "@types/istanbul-lib-report@*":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
-  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz#53047614ae72e19fc0401d872de3ae2b4ce350bf"
+  integrity sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==
   dependencies:
     "@types/istanbul-lib-coverage" "*"
 
 "@types/istanbul-reports@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
-  integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54"
+  integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/jest@29.5.3":
-  version "29.5.3"
-  resolved "https://registry.npmjs.org/@types/jest/-/jest-29.5.3.tgz#7a35dc0044ffb8b56325c6802a4781a626b05777"
-  integrity sha512-1Nq7YrO/vJE/FYnqYyw0FS8LdrjExSgIiHyKg7xPpn+yi8Q4huZryKnkJatN1ZRH89Kw2v33/8ZMB7DuZeSLlA==
+"@types/jest@29.5.12":
+  version "29.5.12"
+  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.5.12.tgz#7f7dc6eb4cf246d2474ed78744b05d06ce025544"
+  integrity sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==
   dependencies:
     expect "^29.0.0"
     pretty-format "^29.0.0"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
-  version "7.0.12"
-  resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
-  integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
+"@types/json-schema@*", "@types/json-schema@^7.0.8":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
 "@types/minimatch@^5.1.2":
   version "5.1.2"
-  resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca"
   integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
 "@types/minimist@^1.2.2":
-  version "1.2.2"
-  resolved "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
-  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.5.tgz#ec10755e871497bcd83efe927e43ec46e8c0747e"
+  integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==
 
 "@types/multistream@4.1.3":
   version "4.1.3"
@@ -1376,180 +1395,202 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*", "@types/node@^20.6.0":
-  version "20.8.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.10.tgz#a5448b895c753ae929c26ce85cab557c6d4a365e"
-  integrity sha512-TlgT8JntpcbmKUFzjhsyhGfP2fsiz1Mv56im6enJ905xG1DAYesxJaeSbGqQmAw8OWPdhyJGhGSQGKRNJ45u9w==
+"@types/node@*", "@types/node@>=13.7.4", "@types/node@^20.13.0":
+  version "20.14.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.9.tgz#12e8e765ab27f8c421a1820c99f5f313a933b420"
+  integrity sha512-06OCtnTXtWOZBJlRApleWndH4JsRVs1pDCc8dLSQp+7PpUpX3ePdHyeNSFTeSe7FtKyQkrlPvHwJOW3SLd8Oyg==
   dependencies:
     undici-types "~5.26.4"
 
-"@types/node@^13.7.4":
-  version "13.13.52"
-  resolved "https://registry.npmjs.org/@types/node/-/node-13.13.52.tgz#03c13be70b9031baaed79481c0c0cfb0045e53f7"
-  integrity sha512-s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ==
-
 "@types/normalize-package-data@^2.4.0":
-  version "2.4.1"
-  resolved "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
-  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
+  version "2.4.4"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
+  integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==
 
 "@types/resolve@1.20.2":
   version "1.20.2"
-  resolved "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz#97d26e00cd4a0423b4af620abecf3e6f442b7975"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.2.tgz#97d26e00cd4a0423b4af620abecf3e6f442b7975"
   integrity sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==
 
-"@types/semver@^7.3.12":
-  version "7.5.2"
-  resolved "https://registry.npmjs.org/@types/semver/-/semver-7.5.2.tgz#31f6eec1ed7ec23f4f05608d3a2d381df041f564"
-  integrity sha512-7aqorHYgdNO4DM36stTiGO3DvKoex9TQRwsJU6vMaFGyqpBA1MNZkz+PG3gaNUPpTAOYhT1WR7M1JyA3fbS9Cw==
-
 "@types/stack-utils@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
-  integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8"
+  integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==
 
 "@types/vinyl@^2.0.4":
-  version "2.0.7"
-  resolved "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.7.tgz#9739a9a2afaf9af32761c54a0e82c735279f726c"
-  integrity sha512-4UqPv+2567NhMQuMLdKAyK4yzrfCqwaTt6bLhHEs8PFcxbHILsrxaY63n4wgE/BRLDWDQeI+WcTmkXKExh9hQg==
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.11.tgz#b95a5bb007e7a0a61dad5a8971dc9922abbc2629"
+  integrity sha512-vPXzCLmRp74e9LsP8oltnWKTH+jBwt86WgRUb4Pc9Lf3pkMVGyvIo2gm9bODeGfCay2DBB/hAWDuvf07JcK4rw==
   dependencies:
     "@types/expect" "^1.20.4"
     "@types/node" "*"
 
 "@types/yargs-parser@*":
-  version "21.0.0"
-  resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
-  integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
+  version "21.0.3"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15"
+  integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==
 
 "@types/yargs@^15.0.0":
-  version "15.0.15"
-  resolved "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.15.tgz#e609a2b1ef9e05d90489c2f5f45bbfb2be092158"
-  integrity sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==
+  version "15.0.19"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.19.tgz#328fb89e46109ecbdb70c295d96ff2f46dfd01b9"
+  integrity sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==
   dependencies:
     "@types/yargs-parser" "*"
 
 "@types/yargs@^17.0.8":
-  version "17.0.24"
-  resolved "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902"
-  integrity sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==
+  version "17.0.32"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.32.tgz#030774723a2f7faafebf645f4e5a48371dca6229"
+  integrity sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db"
-  integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==
+"@typescript-eslint/eslint-plugin@7.12.0":
+  version "7.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.12.0.tgz#f87a32e8972b8a60024f2f8f12205e7c8108bc41"
+  integrity sha512-7F91fcbuDf/d3S8o21+r3ZncGIke/+eWk0EpO21LXhDfLahriZF9CGj4fbAetEjlaBdjdSm9a6VeXbpbT6Z40Q==
   dependencies:
-    "@eslint-community/regexpp" "^4.4.0"
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/type-utils" "5.62.0"
-    "@typescript-eslint/utils" "5.62.0"
-    debug "^4.3.4"
+    "@eslint-community/regexpp" "^4.10.0"
+    "@typescript-eslint/scope-manager" "7.12.0"
+    "@typescript-eslint/type-utils" "7.12.0"
+    "@typescript-eslint/utils" "7.12.0"
+    "@typescript-eslint/visitor-keys" "7.12.0"
     graphemer "^1.4.0"
-    ignore "^5.2.0"
-    natural-compare-lite "^1.4.0"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/parser@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7"
-  integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/typescript-estree" "5.62.0"
+    ignore "^5.3.1"
+    natural-compare "^1.4.0"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/parser@7.14.1":
+  version "7.14.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.14.1.tgz#13d97f357aed3c5719f259a6cc3d1a1f065d3692"
+  integrity sha512-8lKUOebNLcR0D7RvlcloOacTOWzOqemWEWkKSVpMZVF/XVcwjPR+3MD08QzbW9TCGJ+DwIc6zUSGZ9vd8cO1IA==
+  dependencies:
+    "@typescript-eslint/scope-manager" "7.14.1"
+    "@typescript-eslint/types" "7.14.1"
+    "@typescript-eslint/typescript-estree" "7.14.1"
+    "@typescript-eslint/visitor-keys" "7.14.1"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
-  integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==
+"@typescript-eslint/scope-manager@7.12.0":
+  version "7.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.12.0.tgz#259c014362de72dd34f995efe6bd8dda486adf58"
+  integrity sha512-itF1pTnN6F3unPak+kutH9raIkL3lhH1YRPGgt7QQOh43DQKVJXmWkpb+vpc/TiDHs6RSd9CTbDsc/Y+Ygq7kg==
+  dependencies:
+    "@typescript-eslint/types" "7.12.0"
+    "@typescript-eslint/visitor-keys" "7.12.0"
+
+"@typescript-eslint/scope-manager@7.14.1":
+  version "7.14.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.14.1.tgz#63de7a577bc6fe8ee6e412a5b85499f654b93ee5"
+  integrity sha512-gPrFSsoYcsffYXTOZ+hT7fyJr95rdVe4kGVX1ps/dJ+DfmlnjFN/GcMxXcVkeHDKqsq6uAcVaQaIi3cFffmAbA==
   dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
+    "@typescript-eslint/types" "7.14.1"
+    "@typescript-eslint/visitor-keys" "7.14.1"
 
-"@typescript-eslint/type-utils@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a"
-  integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==
+"@typescript-eslint/type-utils@7.12.0":
+  version "7.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.12.0.tgz#9dfaaa1972952f395ec5be4f5bbfc4d3cdc63908"
+  integrity sha512-lib96tyRtMhLxwauDWUp/uW3FMhLA6D0rJ8T7HmH7x23Gk1Gwwu8UZ94NMXBvOELn6flSPiBrCKlehkiXyaqwA==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.62.0"
-    "@typescript-eslint/utils" "5.62.0"
+    "@typescript-eslint/typescript-estree" "7.12.0"
+    "@typescript-eslint/utils" "7.12.0"
     debug "^4.3.4"
-    tsutils "^3.21.0"
+    ts-api-utils "^1.3.0"
 
-"@typescript-eslint/types@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
-  integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
+"@typescript-eslint/types@7.12.0":
+  version "7.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.12.0.tgz#bf208f971a8da1e7524a5d9ae2b5f15192a37981"
+  integrity sha512-o+0Te6eWp2ppKY3mLCU+YA9pVJxhUJE15FV7kxuD9jgwIAa+w/ycGJBMrYDTpVGUM/tgpa9SeMOugSabWFq7bg==
 
-"@typescript-eslint/typescript-estree@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
-  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
+"@typescript-eslint/types@7.14.1":
+  version "7.14.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.14.1.tgz#a43a540dbe5df7f2a11269683d777fc50b4350aa"
+  integrity sha512-mL7zNEOQybo5R3AavY+Am7KLv8BorIv7HCYS5rKoNZKQD9tsfGUpO4KdAn3sSUvTiS4PQkr2+K0KJbxj8H9NDg==
+
+"@typescript-eslint/typescript-estree@7.12.0":
+  version "7.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.12.0.tgz#e6c1074f248b3db6573ab6a7c47a39c4cd498ff9"
+  integrity sha512-5bwqLsWBULv1h6pn7cMW5dXX/Y2amRqLaKqsASVwbBHMZSnHqE/HN4vT4fE0aFsiwxYvr98kqOWh1a8ZKXalCQ==
   dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
+    "@typescript-eslint/types" "7.12.0"
+    "@typescript-eslint/visitor-keys" "7.12.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
 
-"@typescript-eslint/utils@5.62.0", "@typescript-eslint/utils@^5.10.0":
-  version "5.62.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
-  integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
+"@typescript-eslint/typescript-estree@7.14.1":
+  version "7.14.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.14.1.tgz#ba7c9bac8744487749d19569e254d057754a1575"
+  integrity sha512-k5d0VuxViE2ulIO6FbxxSZaxqDVUyMbXcidC8rHvii0I56XZPv8cq+EhMns+d/EVIL41sMXqRbK3D10Oza1bbA==
   dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
-    "@types/json-schema" "^7.0.9"
-    "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/typescript-estree" "5.62.0"
-    eslint-scope "^5.1.1"
-    semver "^7.3.7"
-
-"@typescript-eslint/visitor-keys@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
-  integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==
-  dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    eslint-visitor-keys "^3.3.0"
+    "@typescript-eslint/types" "7.14.1"
+    "@typescript-eslint/visitor-keys" "7.14.1"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
+
+"@typescript-eslint/utils@7.12.0", "@typescript-eslint/utils@^6.0.0 || ^7.0.0":
+  version "7.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.12.0.tgz#c6e58fd7f724cdccc848f71e388ad80cbdb95dd0"
+  integrity sha512-Y6hhwxwDx41HNpjuYswYp6gDbkiZ8Hin9Bf5aJQn1bpTs3afYY4GX+MPYxma8jtoIV2GRwTM/UJm/2uGCVv+DQ==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@typescript-eslint/scope-manager" "7.12.0"
+    "@typescript-eslint/types" "7.12.0"
+    "@typescript-eslint/typescript-estree" "7.12.0"
+
+"@typescript-eslint/visitor-keys@7.12.0":
+  version "7.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.12.0.tgz#c053b55a996679528beeedd8e565710ce1ae1ad3"
+  integrity sha512-uZk7DevrQLL3vSnfFl5bj4sL75qC9D6EdjemIdbtkuUmIheWpuiiylSY01JxJE7+zGrOWDZrp1WxOuDntvKrHQ==
+  dependencies:
+    "@typescript-eslint/types" "7.12.0"
+    eslint-visitor-keys "^3.4.3"
+
+"@typescript-eslint/visitor-keys@7.14.1":
+  version "7.14.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.14.1.tgz#cc79b5ea154aea734b2a13b983670749f5742274"
+  integrity sha512-Crb+F75U1JAEtBeQGxSKwI60hZmmzaqA3z9sYsVm8X7W5cwLEm5bRe0/uXS6+MR/y8CVpKSR/ontIAIEPFcEkA==
+  dependencies:
+    "@typescript-eslint/types" "7.14.1"
+    eslint-visitor-keys "^3.4.3"
 
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
-"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
-  integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==
+"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
+  integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==
   dependencies:
     "@webassemblyjs/helper-numbers" "1.11.6"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
 
 "@webassemblyjs/floating-point-hex-parser@1.11.6":
   version "1.11.6"
-  resolved "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
   integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
 
 "@webassemblyjs/helper-api-error@1.11.6":
   version "1.11.6"
-  resolved "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
   integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
 
-"@webassemblyjs/helper-buffer@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093"
-  integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==
+"@webassemblyjs/helper-buffer@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6"
+  integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==
 
 "@webassemblyjs/helper-numbers@1.11.6":
   version "1.11.6"
-  resolved "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
   integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
   dependencies:
     "@webassemblyjs/floating-point-hex-parser" "1.11.6"
@@ -1558,131 +1599,131 @@
 
 "@webassemblyjs/helper-wasm-bytecode@1.11.6":
   version "1.11.6"
-  resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
   integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
 
-"@webassemblyjs/helper-wasm-section@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577"
-  integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==
+"@webassemblyjs/helper-wasm-section@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf"
+  integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.12.1"
 
 "@webassemblyjs/ieee754@1.11.6":
   version "1.11.6"
-  resolved "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
   integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
 "@webassemblyjs/leb128@1.11.6":
   version "1.11.6"
-  resolved "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
   integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
   dependencies:
     "@xtuc/long" "4.2.2"
 
 "@webassemblyjs/utf8@1.11.6":
   version "1.11.6"
-  resolved "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
   integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
 
-"@webassemblyjs/wasm-edit@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab"
-  integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==
+"@webassemblyjs/wasm-edit@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b"
+  integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
-    "@webassemblyjs/helper-wasm-section" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
-    "@webassemblyjs/wasm-opt" "1.11.6"
-    "@webassemblyjs/wasm-parser" "1.11.6"
-    "@webassemblyjs/wast-printer" "1.11.6"
-
-"@webassemblyjs/wasm-gen@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268"
-  integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-wasm-section" "1.12.1"
+    "@webassemblyjs/wasm-gen" "1.12.1"
+    "@webassemblyjs/wasm-opt" "1.12.1"
+    "@webassemblyjs/wasm-parser" "1.12.1"
+    "@webassemblyjs/wast-printer" "1.12.1"
+
+"@webassemblyjs/wasm-gen@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547"
+  integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==
+  dependencies:
+    "@webassemblyjs/ast" "1.12.1"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
     "@webassemblyjs/ieee754" "1.11.6"
     "@webassemblyjs/leb128" "1.11.6"
     "@webassemblyjs/utf8" "1.11.6"
 
-"@webassemblyjs/wasm-opt@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2"
-  integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==
+"@webassemblyjs/wasm-opt@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5"
+  integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
-    "@webassemblyjs/helper-buffer" "1.11.6"
-    "@webassemblyjs/wasm-gen" "1.11.6"
-    "@webassemblyjs/wasm-parser" "1.11.6"
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/wasm-gen" "1.12.1"
+    "@webassemblyjs/wasm-parser" "1.12.1"
 
-"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5":
-  version "1.11.6"
-  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1"
-  integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==
+"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937"
+  integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/ast" "1.12.1"
     "@webassemblyjs/helper-api-error" "1.11.6"
     "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
     "@webassemblyjs/ieee754" "1.11.6"
     "@webassemblyjs/leb128" "1.11.6"
     "@webassemblyjs/utf8" "1.11.6"
 
-"@webassemblyjs/wast-printer@1.11.6":
-  version "1.11.6"
-  resolved "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20"
-  integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==
+"@webassemblyjs/wast-printer@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac"
+  integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==
   dependencies:
-    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/ast" "1.12.1"
     "@xtuc/long" "4.2.2"
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
-  resolved "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
   integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
 "@xtuc/long@4.2.2":
   version "4.2.2"
-  resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
 acorn-import-assertions@^1.9.0:
   version "1.9.0"
-  resolved "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
   integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
-  resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn-walk@^8.0.0, acorn-walk@^8.1.1:
-  version "8.2.0"
-  resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
-  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.2.tgz#7703af9415f1b6db9315d6895503862e231d34aa"
+  integrity sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==
 
 acorn@^6.4.1:
   version "6.4.2"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
   integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
-acorn@^8.0.4, acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
-  version "8.10.0"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
-  integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
+acorn@^8.0.4, acorn@^8.11.3, acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.2, acorn@^8.9.0:
+  version "8.11.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
+  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
 
 aggregate-error@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-4.0.1.tgz#25091fe1573b9e0be892aeda15c7c66a545f758e"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-4.0.1.tgz#25091fe1573b9e0be892aeda15c7c66a545f758e"
   integrity sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w==
   dependencies:
     clean-stack "^4.0.0"
@@ -1690,12 +1731,12 @@ aggregate-error@^4.0.0:
 
 ajv-keywords@^3.5.2:
   version "3.5.2"
-  resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
 ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
     fast-deep-equal "^3.1.1"
@@ -1705,82 +1746,77 @@ ajv@^6.12.4, ajv@^6.12.5:
 
 ansi-colors@^1.0.1:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
   integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
   dependencies:
     ansi-wrap "^0.1.0"
 
 ansi-colors@^3.0.5:
   version "3.2.4"
-  resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
   integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
 ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
   version "4.3.2"
-  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
   dependencies:
     type-fest "^0.21.3"
 
 ansi-gray@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
+  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
   integrity sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==
   dependencies:
     ansi-wrap "0.1.0"
 
 ansi-regex@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
   integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
 
 ansi-regex@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-regex@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
   integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
 
-ansi-sequence-parser@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/ansi-sequence-parser/-/ansi-sequence-parser-1.1.1.tgz#e0aa1cdcbc8f8bb0b5bca625aac41f5f056973cf"
-  integrity sha512-vJXt3yiaUL4UU546s3rPXlsry/RnM730G1+HkpKE012AN0sx1eOrxSu95oKDIonskeLTijMgqWZ3uDEe3NFvyg==
-
 ansi-styles@^3.2.1:
   version "3.2.1"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
     color-convert "^2.0.1"
 
 ansi-styles@^5.0.0:
   version "5.2.0"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
 ansi-styles@^6.1.0:
   version "6.2.1"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
   integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
 
 ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
+  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
   integrity sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==
 
 anymatch@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
   integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
     micromatch "^3.1.4"
@@ -1788,7 +1824,7 @@ anymatch@^2.0.0:
 
 anymatch@^3.0.3:
   version "3.1.3"
-  resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
   integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
   dependencies:
     normalize-path "^3.0.0"
@@ -1796,85 +1832,80 @@ anymatch@^3.0.3:
 
 append-buffer@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1"
+  resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1"
   integrity sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA==
   dependencies:
     buffer-equal "^1.0.0"
 
 archy@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
+  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
   integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
 
 arg@^4.1.0:
   version "4.1.3"
-  resolved "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
-arg@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c"
-  integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==
-
 argparse@^1.0.7:
   version "1.0.10"
-  resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 argparse@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
 arr-diff@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
   integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==
 
 arr-filter@^1.1.1:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz#43fdddd091e8ef11aa4c45d9cdc18e2dff1711ee"
+  resolved "https://registry.yarnpkg.com/arr-filter/-/arr-filter-1.1.2.tgz#43fdddd091e8ef11aa4c45d9cdc18e2dff1711ee"
   integrity sha512-A2BETWCqhsecSvCkWAeVBFLH6sXEUGASuzkpjL3GR1SlL/PWL6M3J8EAAld2Uubmh39tvkJTqC9LeLHCUKmFXA==
   dependencies:
     make-iterator "^1.0.0"
 
 arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
   integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-map@^2.0.0, arr-map@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz#3a77345ffc1cf35e2a91825601f9e58f2e24cac4"
+  resolved "https://registry.yarnpkg.com/arr-map/-/arr-map-2.0.2.tgz#3a77345ffc1cf35e2a91825601f9e58f2e24cac4"
   integrity sha512-tVqVTHt+Q5Xb09qRkbu+DidW1yYzz5izWS2Xm2yFm7qJnmUfz4HPzNxbHkdRJbz2lrqI7S+z17xNYdFcBBO8Hw==
   dependencies:
     make-iterator "^1.0.0"
 
 arr-union@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==
 
 array-back@^3.0.1, array-back@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0"
+  resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0"
   integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==
 
 array-back@^6.2.2:
   version "6.2.2"
-  resolved "https://registry.npmjs.org/array-back/-/array-back-6.2.2.tgz#f567d99e9af88a6d3d2f9dfcc21db6f9ba9fd157"
+  resolved "https://registry.yarnpkg.com/array-back/-/array-back-6.2.2.tgz#f567d99e9af88a6d3d2f9dfcc21db6f9ba9fd157"
   integrity sha512-gUAZ7HPyb4SJczXAMUXMGAvI976JoK3qEx9v1FTmeYuJj0IBiaKttG1ydtGKdkfqWkIkouke7nG8ufGy77+Cvw==
 
 array-each@^1.0.0, array-each@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
+  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
   integrity sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==
 
 array-initial@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz#2fa74b26739371c3947bd7a7adc73be334b3d795"
+  resolved "https://registry.yarnpkg.com/array-initial/-/array-initial-1.1.0.tgz#2fa74b26739371c3947bd7a7adc73be334b3d795"
   integrity sha512-BC4Yl89vneCYfpLrs5JU2aAu9/a+xWbeKhvISg9PT7eWFB9UlRvI+rKEtk6mgxWr3dSkk9gQ8hCrdqt06NXPdw==
   dependencies:
     array-slice "^1.0.0"
@@ -1882,19 +1913,19 @@ array-initial@^1.0.0:
 
 array-last@^1.1.1:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz#7aa77073fec565ddab2493f5f88185f404a9d336"
+  resolved "https://registry.yarnpkg.com/array-last/-/array-last-1.3.0.tgz#7aa77073fec565ddab2493f5f88185f404a9d336"
   integrity sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==
   dependencies:
     is-number "^4.0.0"
 
 array-slice@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
+  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
   integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
 
 array-sort@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a"
+  resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a"
   integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==
   dependencies:
     default-compare "^1.0.0"
@@ -1903,37 +1934,32 @@ array-sort@^1.0.0:
 
 array-union@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
 array-unique@^0.3.2:
   version "0.3.2"
-  resolved "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==
 
 arrify@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
 
-asap@~2.0.6:
-  version "2.0.6"
-  resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
-  integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==
-
 assign-symbols@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==
 
 astral-regex@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
 async-done@2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/async-done/-/async-done-2.0.0.tgz#f1ec5df738c6383a52b0a30d0902fd897329c15a"
+  resolved "https://registry.yarnpkg.com/async-done/-/async-done-2.0.0.tgz#f1ec5df738c6383a52b0a30d0902fd897329c15a"
   integrity sha512-j0s3bzYq9yKIVLKGE/tWlCpa3PfFLcrDZLTSVdnnCTGagXuXBJO4SsY9Xdk/fQBirCkH4evW5xOeJXqlAQFdsw==
   dependencies:
     end-of-stream "^1.4.4"
@@ -1942,7 +1968,7 @@ async-done@2.0.0:
 
 async-done@^1.2.0, async-done@^1.2.2:
   version "1.3.2"
-  resolved "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz#5e15aa729962a4b07414f528a88cdf18e0b290a2"
+  resolved "https://registry.yarnpkg.com/async-done/-/async-done-1.3.2.tgz#5e15aa729962a4b07414f528a88cdf18e0b290a2"
   integrity sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==
   dependencies:
     end-of-stream "^1.1.0"
@@ -1952,24 +1978,24 @@ async-done@^1.2.0, async-done@^1.2.2:
 
 async-each@^1.0.1:
   version "1.0.6"
-  resolved "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz#52f1d9403818c179b7561e11a5d1b77eb2160e77"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.6.tgz#52f1d9403818c179b7561e11a5d1b77eb2160e77"
   integrity sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==
 
 async-settle@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz#1d0a914bb02575bec8a8f3a74e5080f72b2c0c6b"
+  resolved "https://registry.yarnpkg.com/async-settle/-/async-settle-1.0.0.tgz#1d0a914bb02575bec8a8f3a74e5080f72b2c0c6b"
   integrity sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==
   dependencies:
     async-done "^1.2.2"
 
 atob@^2.1.2:
   version "2.1.2"
-  resolved "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 babel-jest@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.7.0.tgz#f4369919225b684c56085998ac63dbd05be020d5"
   integrity sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==
   dependencies:
     "@jest/transform" "^29.7.0"
@@ -1982,7 +2008,7 @@ babel-jest@^29.7.0:
 
 babel-plugin-istanbul@^6.1.1:
   version "6.1.1"
-  resolved "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
   integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -1993,7 +2019,7 @@ babel-plugin-istanbul@^6.1.1:
 
 babel-plugin-jest-hoist@^29.6.3:
   version "29.6.3"
-  resolved "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz#aadbe943464182a8922c3c927c3067ff40d24626"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz#aadbe943464182a8922c3c927c3067ff40d24626"
   integrity sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==
   dependencies:
     "@babel/template" "^7.3.3"
@@ -2003,7 +2029,7 @@ babel-plugin-jest-hoist@^29.6.3:
 
 babel-preset-current-node-syntax@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
   integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
   dependencies:
     "@babel/plugin-syntax-async-generators" "^7.8.4"
@@ -2021,7 +2047,7 @@ babel-preset-current-node-syntax@^1.0.0:
 
 babel-preset-jest@^29.6.3:
   version "29.6.3"
-  resolved "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz#fa05fa510e7d493896d7b0dd2033601c840f171c"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz#fa05fa510e7d493896d7b0dd2033601c840f171c"
   integrity sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==
   dependencies:
     babel-plugin-jest-hoist "^29.6.3"
@@ -2029,7 +2055,7 @@ babel-preset-jest@^29.6.3:
 
 bach@^1.0.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz#4b3ce96bf27134f79a1b414a51c14e34c3bd9880"
+  resolved "https://registry.yarnpkg.com/bach/-/bach-1.2.0.tgz#4b3ce96bf27134f79a1b414a51c14e34c3bd9880"
   integrity sha512-bZOOfCb3gXBXbTFXq3OZtGR88LwGeJvzu6szttaIzymOTS4ZttBNOWSv7aLZja2EMycKtRYV0Oa8SNKH/zkxvg==
   dependencies:
     arr-filter "^1.1.1"
@@ -2044,12 +2070,17 @@ bach@^1.0.0:
 
 balanced-match@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+bare-events@^2.2.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.2.2.tgz#a98a41841f98b2efe7ecc5c5468814469b018078"
+  integrity sha512-h7z00dWdG0PYOQEvChhOSWvOfkIKsdZGkWr083FgN/HyoQuebSew/cgirYqh9SCuy/hRvxc5Vy6Fw8xAmYHLkQ==
+
 base@^0.11.1:
   version "0.11.2"
-  resolved "https://registry.npmjs.org/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
   integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
@@ -2062,7 +2093,7 @@ base@^0.11.1:
 
 benchmark@^2.1.4:
   version "2.1.4"
-  resolved "https://registry.npmjs.org/benchmark/-/benchmark-2.1.4.tgz#09f3de31c916425d498cc2ee565a0ebf3c2a5629"
+  resolved "https://registry.yarnpkg.com/benchmark/-/benchmark-2.1.4.tgz#09f3de31c916425d498cc2ee565a0ebf3c2a5629"
   integrity sha512-l9MlfN4M1K/H2fbhfMy3B7vJd6AGKJVQn2h6Sg/Yx+KckoUA7ewS5Vv6TjSq18ooE1kS9hhAlQRH3AkXIh/aOQ==
   dependencies:
     lodash "^4.17.4"
@@ -2070,7 +2101,7 @@ benchmark@^2.1.4:
 
 benny@3.7.1:
   version "3.7.1"
-  resolved "https://registry.npmjs.org/benny/-/benny-3.7.1.tgz#964aaaf877e3ab658f79705422277b8471868e37"
+  resolved "https://registry.yarnpkg.com/benny/-/benny-3.7.1.tgz#964aaaf877e3ab658f79705422277b8471868e37"
   integrity sha512-USzYxODdVfOS7JuQq/L0naxB788dWCiUgUTxvN+WLPt/JfcDURNNj8kN/N+uK6PDvuR67/9/55cVKGPleFQINA==
   dependencies:
     "@arrows/composition" "^1.0.0"
@@ -2085,24 +2116,24 @@ benny@3.7.1:
 
 binary-extensions@^1.0.0:
   version "1.13.1"
-  resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
 binaryextensions@^2.2.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.3.0.tgz#1d269cbf7e6243ea886aa41453c3651ccbe13c22"
+  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.3.0.tgz#1d269cbf7e6243ea886aa41453c3651ccbe13c22"
   integrity sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==
 
 bindings@^1.5.0:
   version "1.5.0"
-  resolved "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
   integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
   dependencies:
     file-uri-to-path "1.0.0"
 
 bl@^1.2.1:
   version "1.2.3"
-  resolved "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7"
   integrity sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==
   dependencies:
     readable-stream "^2.3.5"
@@ -2110,7 +2141,7 @@ bl@^1.2.1:
 
 brace-expansion@^1.1.7:
   version "1.1.11"
-  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
@@ -2118,14 +2149,14 @@ brace-expansion@^1.1.7:
 
 brace-expansion@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
   integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
   dependencies:
     balanced-match "^1.0.0"
 
 braces@^2.3.1, braces@^2.3.2:
   version "2.3.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
   integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
@@ -2141,53 +2172,53 @@ braces@^2.3.1, braces@^2.3.2:
 
 braces@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
   dependencies:
     fill-range "^7.0.1"
 
-browserslist@^4.14.5, browserslist@^4.21.9:
-  version "4.21.10"
-  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0"
-  integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==
+browserslist@^4.21.10, browserslist@^4.22.2, browserslist@^4.23.0:
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
+  integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
   dependencies:
-    caniuse-lite "^1.0.30001517"
-    electron-to-chromium "^1.4.477"
-    node-releases "^2.0.13"
-    update-browserslist-db "^1.0.11"
+    caniuse-lite "^1.0.30001587"
+    electron-to-chromium "^1.4.668"
+    node-releases "^2.0.14"
+    update-browserslist-db "^1.0.13"
 
 bs-logger@0.x:
   version "0.2.6"
-  resolved "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
+  resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
   integrity sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==
   dependencies:
     fast-json-stable-stringify "2.x"
 
 bser@2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
   integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
   dependencies:
     node-int64 "^0.4.0"
 
 buffer-equal@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90"
+  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90"
   integrity sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==
 
 buffer-from@^1.0.0:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
 builtin-modules@^3.3.0:
   version "3.3.0"
-  resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
   integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
 
 cache-base@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
   integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
@@ -2200,22 +2231,25 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
-call-bind@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+call-bind@^1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
+  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
   dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    set-function-length "^1.2.1"
 
 callsites@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 camelcase-keys@^7.0.0:
   version "7.0.2"
-  resolved "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz#d048d8c69448745bb0de6fc4c1c52a30dfbe7252"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-7.0.2.tgz#d048d8c69448745bb0de6fc4c1c52a30dfbe7252"
   integrity sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==
   dependencies:
     camelcase "^6.3.0"
@@ -2225,34 +2259,34 @@ camelcase-keys@^7.0.0:
 
 camelcase@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
   integrity sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==
 
 camelcase@^5.3.1:
   version "5.3.1"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 camelcase@^6.2.0, camelcase@^6.3.0:
   version "6.3.0"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30001517:
-  version "1.0.30001534"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001534.tgz#f24a9b2a6d39630bac5c132b5dff89b39a12e7dd"
-  integrity sha512-vlPVrhsCS7XaSh2VvWluIQEzVhefrUQcEsQWSS5A5V+dM07uv1qHeQzAOTGIMy9i3e9bH15+muvI/UHojVgS/Q==
+caniuse-lite@^1.0.30001587:
+  version "1.0.30001605"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001605.tgz#ca12d7330dd8bcb784557eb9aa64f0037870d9d6"
+  integrity sha512-nXwGlFWo34uliI9z3n6Qc0wZaf7zaZWA1CPZ169La5mV3I/gem7bst0vr5XQH5TJXZIMfDeZyOrZnSlVzKxxHQ==
 
 chalk-template@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.npmjs.org/chalk-template/-/chalk-template-0.4.0.tgz#692c034d0ed62436b9062c1707fadcd0f753204b"
+  resolved "https://registry.yarnpkg.com/chalk-template/-/chalk-template-0.4.0.tgz#692c034d0ed62436b9062c1707fadcd0f753204b"
   integrity sha512-/ghrgmhfY8RaSdeo43hNXxpoHAtxdbskUHjPpfqUWGttFgycUhYPGx3YZBCnUCvOa7Doivn1IZec3DEGFoMgLg==
   dependencies:
     chalk "^4.1.2"
 
 chalk@4.x, chalk@^4.0.0, chalk@^4.1.2:
   version "4.1.2"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
   dependencies:
     ansi-styles "^4.1.0"
@@ -2260,7 +2294,7 @@ chalk@4.x, chalk@^4.0.0, chalk@^4.1.2:
 
 chalk@^2.4.2:
   version "2.4.2"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
     ansi-styles "^3.2.1"
@@ -2269,12 +2303,12 @@ chalk@^2.4.2:
 
 char-regex@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
+  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
 chokidar@^2.0.0:
   version "2.1.8"
-  resolved "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
   integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
   dependencies:
     anymatch "^2.0.0"
@@ -2293,27 +2327,32 @@ chokidar@^2.0.0:
 
 chrome-trace-event@^1.0.2:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
   integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
 ci-info@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
-ci-info@^3.2.0, ci-info@^3.8.0:
-  version "3.8.0"
-  resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
-  integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
+ci-info@^3.2.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
+  integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
+
+ci-info@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.0.0.tgz#65466f8b280fc019b9f50a5388115d17a63a44f2"
+  integrity sha512-TdHqgGf9odd8SXNuxtUBVx8Nv+qZOejE6qyqiy5NtbYYQOeFa6zmHkxlPzmaLxWWHsU6nJmB7AETdVPi+2NBUg==
 
 cjs-module-lexer@^1.0.0:
   version "1.2.3"
-  resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
+  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
   integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==
 
 class-utils@^0.3.5:
   version "0.3.6"
-  resolved "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
   integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
@@ -2323,28 +2362,28 @@ class-utils@^0.3.5:
 
 clean-regexp@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz#8df7c7aae51fd36874e8f8d05b9180bc11a3fed7"
+  resolved "https://registry.yarnpkg.com/clean-regexp/-/clean-regexp-1.0.0.tgz#8df7c7aae51fd36874e8f8d05b9180bc11a3fed7"
   integrity sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==
   dependencies:
     escape-string-regexp "^1.0.5"
 
 clean-stack@^4.0.0:
   version "4.2.0"
-  resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-4.2.0.tgz#c464e4cde4ac789f4e0735c5d75beb49d7b30b31"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-4.2.0.tgz#c464e4cde4ac789f4e0735c5d75beb49d7b30b31"
   integrity sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg==
   dependencies:
     escape-string-regexp "5.0.0"
 
 cli-cursor@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
   integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
   dependencies:
     restore-cursor "^3.1.0"
 
 cliui@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
   integrity sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==
   dependencies:
     string-width "^1.0.1"
@@ -2353,7 +2392,7 @@ cliui@^3.2.0:
 
 cliui@^8.0.1:
   version "8.0.1"
-  resolved "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
   integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
   dependencies:
     string-width "^4.2.0"
@@ -2362,22 +2401,22 @@ cliui@^8.0.1:
 
 clone-buffer@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
+  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
   integrity sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==
 
 clone-stats@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
+  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
   integrity sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==
 
 clone@^2.1.1, clone@^2.1.2:
   version "2.1.2"
-  resolved "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
   integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==
 
 cloneable-readable@^1.0.0:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
+  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
   integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
   dependencies:
     inherits "^2.0.1"
@@ -2386,22 +2425,22 @@ cloneable-readable@^1.0.0:
 
 co@^4.6.0:
   version "4.6.0"
-  resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
 code-point-at@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
 
 collect-v8-coverage@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
+  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
   integrity sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==
 
 collection-map@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz#aea0f06f8d26c780c2b75494385544b2255af18c"
+  resolved "https://registry.yarnpkg.com/collection-map/-/collection-map-1.0.0.tgz#aea0f06f8d26c780c2b75494385544b2255af18c"
   integrity sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA==
   dependencies:
     arr-map "^2.0.2"
@@ -2410,7 +2449,7 @@ collection-map@^1.0.0:
 
 collection-visit@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
   integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==
   dependencies:
     map-visit "^1.0.0"
@@ -2418,36 +2457,36 @@ collection-visit@^1.0.0:
 
 color-convert@^1.9.0:
   version "1.9.3"
-  resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-convert@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
   integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
   dependencies:
     color-name "~1.1.4"
 
 color-name@1.1.3:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 color-name@~1.1.4:
   version "1.1.4"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 color-support@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
 command-line-args@^5.2.1:
   version "5.2.1"
-  resolved "https://registry.npmjs.org/command-line-args/-/command-line-args-5.2.1.tgz#c44c32e437a57d7c51157696893c5909e9cec42e"
+  resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.2.1.tgz#c44c32e437a57d7c51157696893c5909e9cec42e"
   integrity sha512-H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg==
   dependencies:
     array-back "^3.1.0"
@@ -2457,7 +2496,7 @@ command-line-args@^5.2.1:
 
 command-line-usage@^7.0.0, command-line-usage@^7.0.1:
   version "7.0.1"
-  resolved "https://registry.npmjs.org/command-line-usage/-/command-line-usage-7.0.1.tgz#e540afef4a4f3bc501b124ffde33956309100655"
+  resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-7.0.1.tgz#e540afef4a4f3bc501b124ffde33956309100655"
   integrity sha512-NCyznE//MuTjwi3y84QVUGEOT+P5oto1e1Pk/jFPVdPPfsG03qpTIl3yw6etR+v73d0lXsoojRpvbru2sqePxQ==
   dependencies:
     array-back "^6.2.2"
@@ -2467,37 +2506,37 @@ command-line-usage@^7.0.0, command-line-usage@^7.0.1:
 
 commander@^2.20.0:
   version "2.20.3"
-  resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
 commander@^6.1.0:
   version "6.2.1"
-  resolved "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
   integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
 commander@^7.2.0:
   version "7.2.0"
-  resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
 common-tags@^1.8.0:
   version "1.8.2"
-  resolved "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
   integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
 
 component-emitter@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
-  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.1.tgz#ef1d5796f7d93f135ee6fb684340b26403c97d17"
+  integrity sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==
 
 concat-map@0.0.1:
   version "0.0.1"
-  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 concat-stream@^1.6.0:
   version "1.6.2"
-  resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
   dependencies:
     buffer-from "^1.0.0"
@@ -2505,37 +2544,44 @@ concat-stream@^1.6.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
-convert-source-map@^1.0.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@^1.0.0, convert-source-map@^1.5.0:
   version "1.9.0"
-  resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
 convert-source-map@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
 copy-descriptor@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
 
 copy-props@^2.0.1:
   version "2.0.5"
-  resolved "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz#03cf9ae328d4ebb36f8f1d804448a6af9ee3f2d2"
+  resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-2.0.5.tgz#03cf9ae328d4ebb36f8f1d804448a6af9ee3f2d2"
   integrity sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==
   dependencies:
     each-props "^1.3.2"
     is-plain-object "^5.0.0"
 
+core-js-compat@^3.37.0:
+  version "3.37.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.37.1.tgz#c844310c7852f4bdf49b8d339730b97e17ff09ee"
+  integrity sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==
+  dependencies:
+    browserslist "^4.23.0"
+
 core-util-is@~1.0.0:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
 create-jest@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz#a355c5b3cb1e1af02ba177fe7afd7feee49a5320"
+  resolved "https://registry.yarnpkg.com/create-jest/-/create-jest-29.7.0.tgz#a355c5b3cb1e1af02ba177fe7afd7feee49a5320"
   integrity sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==
   dependencies:
     "@jest/types" "^29.6.3"
@@ -2548,19 +2594,19 @@ create-jest@^29.7.0:
 
 create-require@^1.1.0:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
 cross-env@7.0.3:
   version "7.0.3"
-  resolved "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
   integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
   dependencies:
     cross-spawn "^7.0.1"
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
   dependencies:
     path-key "^3.1.0"
@@ -2569,20 +2615,20 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
 
 css@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d"
+  resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d"
   integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==
   dependencies:
     inherits "^2.0.4"
     source-map "^0.6.1"
     source-map-resolve "^0.6.0"
 
-d@1, d@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
-  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
+d@1, d@^1.0.1, d@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.2.tgz#2aefd554b81981e7dccf72d6842ae725cb17e5de"
+  integrity sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==
   dependencies:
-    es5-ext "^0.10.50"
-    type "^1.0.1"
+    es5-ext "^0.10.64"
+    type "^2.7.2"
 
 debounce@^1.2.1:
   version "1.2.1"
@@ -2591,7 +2637,7 @@ debounce@^1.2.1:
 
 debug-fabulous@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz#af8a08632465224ef4174a9f06308c3c2a1ebc8e"
+  resolved "https://registry.yarnpkg.com/debug-fabulous/-/debug-fabulous-1.1.0.tgz#af8a08632465224ef4174a9f06308c3c2a1ebc8e"
   integrity sha512-GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg==
   dependencies:
     debug "3.X"
@@ -2600,28 +2646,28 @@ debug-fabulous@^1.0.0:
 
 debug@3.X:
   version "3.2.7"
-  resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
 debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
-  resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.4"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
 decamelize-keys@^1.1.0:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
+  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
   integrity sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==
   dependencies:
     decamelize "^1.1.0"
@@ -2629,58 +2675,58 @@ decamelize-keys@^1.1.0:
 
 decamelize@^1.1.0, decamelize@^1.1.1:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
 decamelize@^5.0.0:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9"
   integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==
 
 decode-uri-component@^0.2.0:
   version "0.2.2"
-  resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
   integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 dedent@^1.0.0:
   version "1.5.1"
-  resolved "https://registry.npmjs.org/dedent/-/dedent-1.5.1.tgz#4f3fc94c8b711e9bb2800d185cd6ad20f2a90aff"
+  resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.1.tgz#4f3fc94c8b711e9bb2800d185cd6ad20f2a90aff"
   integrity sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==
 
 deep-is@^0.1.3:
   version "0.1.4"
-  resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
 deepmerge@^4.2.2:
   version "4.3.1"
-  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
   integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
 
 default-compare@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f"
+  resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f"
   integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==
   dependencies:
     kind-of "^5.0.2"
 
 default-resolution@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz#bcb82baa72ad79b426a76732f1a81ad6df26d684"
+  resolved "https://registry.yarnpkg.com/default-resolution/-/default-resolution-2.0.0.tgz#bcb82baa72ad79b426a76732f1a81ad6df26d684"
   integrity sha512-2xaP6GiwVwOEbXCGoJ4ufgC76m8cj805jrghScewJC2ZDsb9U0b4BIrba+xt/Uytyd0HvQ6+WymSRTfnYj59GQ==
 
-define-data-property@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz#0db13540704e1d8d479a0656cf781267531b9451"
-  integrity sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==
+define-data-property@^1.0.1, define-data-property@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
+  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
   dependencies:
-    get-intrinsic "^1.2.1"
+    es-define-property "^1.0.0"
+    es-errors "^1.3.0"
     gopd "^1.0.1"
-    has-property-descriptors "^1.0.0"
 
-define-properties@^1.1.4:
+define-properties@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
   integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
   dependencies:
     define-data-property "^1.0.1"
@@ -2689,21 +2735,21 @@ define-properties@^1.1.4:
 
 define-property@^0.2.5:
   version "0.2.5"
-  resolved "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
   integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
   integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
   integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
@@ -2711,7 +2757,7 @@ define-property@^2.0.2:
 
 del-cli@5.1.0:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/del-cli/-/del-cli-5.1.0.tgz#740eca1c7a9eb13043e68d8a361cf0ff9a18d5c8"
+  resolved "https://registry.yarnpkg.com/del-cli/-/del-cli-5.1.0.tgz#740eca1c7a9eb13043e68d8a361cf0ff9a18d5c8"
   integrity sha512-xwMeh2acluWeccsfzE7VLsG3yTr7nWikbfw+xhMnpRrF15pGSkw+3/vJZWlGoE4I86UiLRNHicmKt4tkIX9Jtg==
   dependencies:
     del "^7.1.0"
@@ -2719,7 +2765,7 @@ del-cli@5.1.0:
 
 del@7.1.0, del@^7.1.0:
   version "7.1.0"
-  resolved "https://registry.npmjs.org/del/-/del-7.1.0.tgz#0de0044d556b649ff05387f1fa7c885e155fd1b6"
+  resolved "https://registry.yarnpkg.com/del/-/del-7.1.0.tgz#0de0044d556b649ff05387f1fa7c885e155fd1b6"
   integrity sha512-v2KyNk7efxhlyHpjEvfyxaAihKKK0nWCuf6ZtqZcFFpQRG0bJ12Qsr0RpvsICMjAAZ8DOVCxrlqpxISlMHC4Kg==
   dependencies:
     globby "^13.1.2"
@@ -2733,51 +2779,51 @@ del@7.1.0, del@^7.1.0:
 
 detect-file@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
   integrity sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==
 
 detect-newline@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
   integrity sha512-CwffZFvlJffUg9zZA0uqrjQayUTC8ob94pnr5sFwaVv3IOmkfUHcWH+jXaQK3askE51Cqe8/9Ql/0uXNwqZ8Zg==
 
 detect-newline@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
+  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
 diff-sequences@^29.6.3:
   version "29.6.3"
-  resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.6.3.tgz#4deaf894d11407c51efc8418012f9e70b84ea921"
   integrity sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==
 
 diff@^4.0.1:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
 dir-glob@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
   integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
   dependencies:
     path-type "^4.0.0"
 
 doctrine@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
   integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
   dependencies:
     esutils "^2.0.2"
 
 duplexer@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
 duplexify@^3.6.0:
   version "3.7.1"
-  resolved "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
   integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
   dependencies:
     end-of-stream "^1.0.0"
@@ -2787,7 +2833,7 @@ duplexify@^3.6.0:
 
 each-props@^1.3.2:
   version "1.3.2"
-  resolved "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz#ea45a414d16dd5cfa419b1a81720d5ca06892333"
+  resolved "https://registry.yarnpkg.com/each-props/-/each-props-1.3.2.tgz#ea45a414d16dd5cfa419b1a81720d5ca06892333"
   integrity sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==
   dependencies:
     is-plain-object "^2.0.1"
@@ -2795,75 +2841,93 @@ each-props@^1.3.2:
 
 eastasianwidth@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
-electron-to-chromium@^1.4.477:
-  version "1.4.520"
-  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.520.tgz#c19c25a10d87bd88a9aae2b76cae9235a50c2994"
-  integrity sha512-Frfus2VpYADsrh1lB3v/ft/WVFlVzOIm+Q0p7U7VqHI6qr7NWHYKe+Wif3W50n7JAFoBsWVsoU0+qDks6WQ60g==
+electron-to-chromium@^1.4.668:
+  version "1.4.724"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.724.tgz#e0a86fe4d3d0e05a4d7b032549d79608078f830d"
+  integrity sha512-RTRvkmRkGhNBPPpdrgtDKvmOEYTrPlXDfc0J/Nfq5s29tEahAwhiX4mmhNzj6febWMleulxVYPh7QwCSL/EldA==
 
 emittery@^0.13.1:
   version "0.13.1"
-  resolved "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
   integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
-  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 emoji-regex@^9.2.2:
   version "9.2.2"
-  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.4:
   version "1.4.4"
-  resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
 
-enhanced-resolve@^5.14.1:
-  version "5.15.0"
-  resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35"
-  integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==
+enhanced-resolve@^5.16.0:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz#65ec88778083056cb32487faa9aef82ed0864787"
+  integrity sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
+entities@^4.4.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
+
 errno@^0.1.3:
   version "0.1.8"
-  resolved "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
   integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
   dependencies:
     prr "~1.0.1"
 
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
-  resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
+es-define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
+  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
+  dependencies:
+    get-intrinsic "^1.2.4"
+
+es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
+
 es-module-lexer@^1.2.1:
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz#c1b0dd5ada807a3b3155315911f364dc4e909db1"
-  integrity sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.0.tgz#4878fee3789ad99e065f975fdd3c645529ff0236"
+  integrity sha512-pqrTKmwEIgafsYZAGw9kszYzmagcE/n4dbgwGWLEXg7J4QFJVQRBld8j3Q3GNez79jzxZshq0bcT962QHOghjw==
 
-es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
-  version "0.10.62"
-  resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5"
-  integrity sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==
+es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.53, es5-ext@^0.10.62, es5-ext@^0.10.64, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46:
+  version "0.10.64"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.64.tgz#12e4ffb48f1ba2ea777f1fcdd1918ef73ea21714"
+  integrity sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==
   dependencies:
     es6-iterator "^2.0.3"
     es6-symbol "^3.1.3"
+    esniff "^2.0.1"
     next-tick "^1.1.0"
 
 es6-iterator@^2.0.1, es6-iterator@^2.0.3:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
   integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==
   dependencies:
     d "1"
@@ -2871,16 +2935,16 @@ es6-iterator@^2.0.1, es6-iterator@^2.0.3:
     es6-symbol "^3.1.1"
 
 es6-symbol@^3.1.1, es6-symbol@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
-  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.4.tgz#f4e7d28013770b4208ecbf3e0bf14d3bcb557b8c"
+  integrity sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==
   dependencies:
-    d "^1.0.1"
-    ext "^1.1.2"
+    d "^1.0.2"
+    ext "^1.7.0"
 
 es6-weak-map@^2.0.1, es6-weak-map@^2.0.3:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"
   integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==
   dependencies:
     d "1"
@@ -2890,107 +2954,111 @@ es6-weak-map@^2.0.1, es6-weak-map@^2.0.3:
 
 esbuild-plugin-alias@0.2.1:
   version "0.2.1"
-  resolved "https://registry.npmjs.org/esbuild-plugin-alias/-/esbuild-plugin-alias-0.2.1.tgz#45a86cb941e20e7c2bc68a2bea53562172494fcb"
+  resolved "https://registry.yarnpkg.com/esbuild-plugin-alias/-/esbuild-plugin-alias-0.2.1.tgz#45a86cb941e20e7c2bc68a2bea53562172494fcb"
   integrity sha512-jyfL/pwPqaFXyKnj8lP8iLk6Z0m099uXR45aSN8Av1XD4vhvQutxxPzgA2bTcAwQpa1zCXDcWOlhFgyP3GKqhQ==
 
-esbuild@0.20.0:
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.0.tgz#a7170b63447286cd2ff1f01579f09970e6965da4"
-  integrity sha512-6iwE3Y2RVYCME1jLpBqq7LQWK3MW6vjV2bZy6gt/WrqkY+WE74Spyc0ThAOYpMtITvnjX09CrC6ym7A/m9mebA==
+esbuild@0.22.0:
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.22.0.tgz#9742e664aac9f61e2898f4c27bd4dd4272e6f661"
+  integrity sha512-zNYA6bFZsVnsU481FnGAQjLDW0Pl/8BGG7EvAp15RzUvGC+ME7hf1q7LvIfStEQBz/iEHuBJCYcOwPmNCf1Tlw==
   optionalDependencies:
-    "@esbuild/aix-ppc64" "0.20.0"
-    "@esbuild/android-arm" "0.20.0"
-    "@esbuild/android-arm64" "0.20.0"
-    "@esbuild/android-x64" "0.20.0"
-    "@esbuild/darwin-arm64" "0.20.0"
-    "@esbuild/darwin-x64" "0.20.0"
-    "@esbuild/freebsd-arm64" "0.20.0"
-    "@esbuild/freebsd-x64" "0.20.0"
-    "@esbuild/linux-arm" "0.20.0"
-    "@esbuild/linux-arm64" "0.20.0"
-    "@esbuild/linux-ia32" "0.20.0"
-    "@esbuild/linux-loong64" "0.20.0"
-    "@esbuild/linux-mips64el" "0.20.0"
-    "@esbuild/linux-ppc64" "0.20.0"
-    "@esbuild/linux-riscv64" "0.20.0"
-    "@esbuild/linux-s390x" "0.20.0"
-    "@esbuild/linux-x64" "0.20.0"
-    "@esbuild/netbsd-x64" "0.20.0"
-    "@esbuild/openbsd-x64" "0.20.0"
-    "@esbuild/sunos-x64" "0.20.0"
-    "@esbuild/win32-arm64" "0.20.0"
-    "@esbuild/win32-ia32" "0.20.0"
-    "@esbuild/win32-x64" "0.20.0"
-
-esbuild@^0.17.11:
-  version "0.17.19"
-  resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz#087a727e98299f0462a3d0bcdd9cd7ff100bd955"
-  integrity sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==
+    "@esbuild/aix-ppc64" "0.22.0"
+    "@esbuild/android-arm" "0.22.0"
+    "@esbuild/android-arm64" "0.22.0"
+    "@esbuild/android-x64" "0.22.0"
+    "@esbuild/darwin-arm64" "0.22.0"
+    "@esbuild/darwin-x64" "0.22.0"
+    "@esbuild/freebsd-arm64" "0.22.0"
+    "@esbuild/freebsd-x64" "0.22.0"
+    "@esbuild/linux-arm" "0.22.0"
+    "@esbuild/linux-arm64" "0.22.0"
+    "@esbuild/linux-ia32" "0.22.0"
+    "@esbuild/linux-loong64" "0.22.0"
+    "@esbuild/linux-mips64el" "0.22.0"
+    "@esbuild/linux-ppc64" "0.22.0"
+    "@esbuild/linux-riscv64" "0.22.0"
+    "@esbuild/linux-s390x" "0.22.0"
+    "@esbuild/linux-x64" "0.22.0"
+    "@esbuild/netbsd-x64" "0.22.0"
+    "@esbuild/openbsd-arm64" "0.22.0"
+    "@esbuild/openbsd-x64" "0.22.0"
+    "@esbuild/sunos-x64" "0.22.0"
+    "@esbuild/win32-arm64" "0.22.0"
+    "@esbuild/win32-ia32" "0.22.0"
+    "@esbuild/win32-x64" "0.22.0"
+
+esbuild@^0.21.5:
+  version "0.21.5"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d"
+  integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==
   optionalDependencies:
-    "@esbuild/android-arm" "0.17.19"
-    "@esbuild/android-arm64" "0.17.19"
-    "@esbuild/android-x64" "0.17.19"
-    "@esbuild/darwin-arm64" "0.17.19"
-    "@esbuild/darwin-x64" "0.17.19"
-    "@esbuild/freebsd-arm64" "0.17.19"
-    "@esbuild/freebsd-x64" "0.17.19"
-    "@esbuild/linux-arm" "0.17.19"
-    "@esbuild/linux-arm64" "0.17.19"
-    "@esbuild/linux-ia32" "0.17.19"
-    "@esbuild/linux-loong64" "0.17.19"
-    "@esbuild/linux-mips64el" "0.17.19"
-    "@esbuild/linux-ppc64" "0.17.19"
-    "@esbuild/linux-riscv64" "0.17.19"
-    "@esbuild/linux-s390x" "0.17.19"
-    "@esbuild/linux-x64" "0.17.19"
-    "@esbuild/netbsd-x64" "0.17.19"
-    "@esbuild/openbsd-x64" "0.17.19"
-    "@esbuild/sunos-x64" "0.17.19"
-    "@esbuild/win32-arm64" "0.17.19"
-    "@esbuild/win32-ia32" "0.17.19"
-    "@esbuild/win32-x64" "0.17.19"
+    "@esbuild/aix-ppc64" "0.21.5"
+    "@esbuild/android-arm" "0.21.5"
+    "@esbuild/android-arm64" "0.21.5"
+    "@esbuild/android-x64" "0.21.5"
+    "@esbuild/darwin-arm64" "0.21.5"
+    "@esbuild/darwin-x64" "0.21.5"
+    "@esbuild/freebsd-arm64" "0.21.5"
+    "@esbuild/freebsd-x64" "0.21.5"
+    "@esbuild/linux-arm" "0.21.5"
+    "@esbuild/linux-arm64" "0.21.5"
+    "@esbuild/linux-ia32" "0.21.5"
+    "@esbuild/linux-loong64" "0.21.5"
+    "@esbuild/linux-mips64el" "0.21.5"
+    "@esbuild/linux-ppc64" "0.21.5"
+    "@esbuild/linux-riscv64" "0.21.5"
+    "@esbuild/linux-s390x" "0.21.5"
+    "@esbuild/linux-x64" "0.21.5"
+    "@esbuild/netbsd-x64" "0.21.5"
+    "@esbuild/openbsd-x64" "0.21.5"
+    "@esbuild/sunos-x64" "0.21.5"
+    "@esbuild/win32-arm64" "0.21.5"
+    "@esbuild/win32-ia32" "0.21.5"
+    "@esbuild/win32-x64" "0.21.5"
 
 escalade@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
-  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
+  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
 
 escape-string-regexp@5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"
   integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
 
 escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 escape-string-regexp@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
 escape-string-regexp@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-eslint-plugin-jest@27.4.2:
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.4.2.tgz#181d999ac67a9b6040db1d27935887cf5a2882ed"
-  integrity sha512-3Nfvv3wbq2+PZlRTf2oaAWXWwbdBejFRBR2O8tAO67o+P8zno+QGbcDYaAXODlreXVg+9gvWhKKmG2rgfb8GEg==
+eslint-plugin-jest@28.5.0:
+  version "28.5.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-28.5.0.tgz#b497b795de37f671eaccd38bd83030186ff5dc8d"
+  integrity sha512-6np6DGdmNq/eBbA7HOUNV8fkfL86PYwBfwyb8n23FXgJNTR8+ot3smRHjza9LGsBBZRypK3qyF79vMjohIL8eQ==
   dependencies:
-    "@typescript-eslint/utils" "^5.10.0"
+    "@typescript-eslint/utils" "^6.0.0 || ^7.0.0"
 
-eslint-plugin-unicorn@49.0.0:
-  version "49.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-49.0.0.tgz#4449ea954d7e1455eec8518f9417d7021b245fa8"
-  integrity sha512-0fHEa/8Pih5cmzFW5L7xMEfUTvI9WKeQtjmKpTUmY+BiFCDxkxrTdnURJOHKykhtwIeyYsxnecbGvDCml++z4Q==
+eslint-plugin-unicorn@53.0.0:
+  version "53.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-53.0.0.tgz#df3a5c9ecabeb759e6fd867b2d84198466ac8c4d"
+  integrity sha512-kuTcNo9IwwUCfyHGwQFOK/HjJAYzbODHN3wP0PgqbW+jbXqpNWxNVpVhj2tO9SixBwuAdmal8rVcWKBxwFnGuw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-validator-identifier" "^7.24.5"
     "@eslint-community/eslint-utils" "^4.4.0"
-    ci-info "^3.8.0"
+    "@eslint/eslintrc" "^3.0.2"
+    ci-info "^4.0.0"
     clean-regexp "^1.0.0"
+    core-js-compat "^3.37.0"
     esquery "^1.5.0"
     indent-string "^4.0.0"
     is-builtin-module "^3.2.1"
@@ -2999,12 +3067,12 @@ eslint-plugin-unicorn@49.0.0:
     read-pkg-up "^7.0.1"
     regexp-tree "^0.1.27"
     regjsparser "^0.10.0"
-    semver "^7.5.4"
+    semver "^7.6.1"
     strip-indent "^3.0.0"
 
-eslint-scope@5.1.1, eslint-scope@^5.1.1:
+eslint-scope@5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
   dependencies:
     esrecurse "^4.3.0"
@@ -3020,19 +3088,24 @@ eslint-scope@^7.2.2:
 
 eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
-  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@8.52.0:
-  version "8.52.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.52.0.tgz#d0cd4a1fac06427a61ef9242b9353f36ea7062fc"
-  integrity sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==
+eslint-visitor-keys@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb"
+  integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==
+
+eslint@8.57.0:
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
+  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
-    "@eslint/eslintrc" "^2.1.2"
-    "@eslint/js" "8.52.0"
-    "@humanwhocodes/config-array" "^0.11.13"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.57.0"
+    "@humanwhocodes/config-array" "^0.11.14"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
     "@ungap/structured-clone" "^1.2.0"
@@ -3071,6 +3144,25 @@ eslint@8.52.0:
   version "3.2.25"
   resolved "https://github.com/jsg2021/esm/releases/download/v3.x.x-pr883/esm-3.x.x-pr883.tgz#c463cfa4e14aceea6b7cd7e669ef90de072ea60a"
 
+esniff@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/esniff/-/esniff-2.0.1.tgz#a4d4b43a5c71c7ec51c51098c1d8a29081f9b308"
+  integrity sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==
+  dependencies:
+    d "^1.0.1"
+    es5-ext "^0.10.62"
+    event-emitter "^0.3.5"
+    type "^2.7.2"
+
+espree@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.0.1.tgz#600e60404157412751ba4a6f3a2ee1a42433139f"
+  integrity sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==
+  dependencies:
+    acorn "^8.11.3"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^4.0.0"
+
 espree@^9.6.0, espree@^9.6.1:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
@@ -3082,46 +3174,46 @@ espree@^9.6.0, espree@^9.6.1:
 
 esprima@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.4.2, esquery@^1.5.0:
   version "1.5.0"
-  resolved "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
   integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
   dependencies:
     estraverse "^5.1.0"
 
 esrecurse@^4.3.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
   integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
     estraverse "^5.2.0"
 
 estraverse@^4.1.1:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 estraverse@^5.1.0, estraverse@^5.2.0:
   version "5.3.0"
-  resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
 estree-walker@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
   integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
 
 esutils@^2.0.2:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
 event-emitter@^0.3.5:
   version "0.3.5"
-  resolved "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
   integrity sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==
   dependencies:
     d "1"
@@ -3129,12 +3221,12 @@ event-emitter@^0.3.5:
 
 events@^3.2.0:
   version "3.3.0"
-  resolved "https://registry.npmjs.org/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
 execa@^5.0.0:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
   integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
   dependencies:
     cross-spawn "^7.0.3"
@@ -3149,12 +3241,12 @@ execa@^5.0.0:
 
 exit@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
 
 expand-brackets@^2.1.4:
   version "2.1.4"
-  resolved "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
   integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==
   dependencies:
     debug "^2.3.3"
@@ -3167,14 +3259,14 @@ expand-brackets@^2.1.4:
 
 expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
   integrity sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==
   dependencies:
     homedir-polyfill "^1.0.1"
 
 expect@^29.0.0, expect@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz#578874590dcb3214514084c08115d8aee61e11bc"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.7.0.tgz#578874590dcb3214514084c08115d8aee61e11bc"
   integrity sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==
   dependencies:
     "@jest/expect-utils" "^29.7.0"
@@ -3183,23 +3275,23 @@ expect@^29.0.0, expect@^29.7.0:
     jest-message-util "^29.7.0"
     jest-util "^29.7.0"
 
-ext@^1.1.2:
+ext@^1.7.0:
   version "1.7.0"
-  resolved "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f"
+  resolved "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f"
   integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==
   dependencies:
     type "^2.7.2"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
   integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
   integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==
   dependencies:
     assign-symbols "^1.0.0"
@@ -3207,12 +3299,12 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
 
 extend@^3.0.0:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 extglob@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
   integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
@@ -3226,7 +3318,7 @@ extglob@^2.0.4:
 
 fancy-log@^1.3.2, fancy-log@^1.3.3:
   version "1.3.3"
-  resolved "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
   integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
   dependencies:
     ansi-gray "^0.1.1"
@@ -3236,25 +3328,25 @@ fancy-log@^1.3.2, fancy-log@^1.3.3:
 
 fancy-log@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/fancy-log/-/fancy-log-2.0.0.tgz#cad207b8396d69ae4796d74d17dff5f68b2f7343"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-2.0.0.tgz#cad207b8396d69ae4796d74d17dff5f68b2f7343"
   integrity sha512-9CzxZbACXMUXW13tS0tI8XsGGmxWzO2DmYrGuBJOJ8k8q2K7hwfJA5qHjuPPe8wtsco33YR9wc+Rlr5wYFvhSA==
   dependencies:
     color-support "^1.1.3"
 
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
-  resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-fifo@^1.1.0:
   version "1.3.2"
-  resolved "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
+  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
   integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
 
 fast-glob@^3.2.9, fast-glob@^3.3.0:
-  version "3.3.1"
-  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
-  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
+  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -3264,53 +3356,53 @@ fast-glob@^3.2.9, fast-glob@^3.3.0:
 
 fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
 fast-levenshtein@^1.0.0:
   version "1.1.4"
-  resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz#e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz#e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9"
   integrity sha512-Ia0sQNrMPXXkqVFt6w6M1n1oKo3NfKs+mvaV811Jwir7vAk9a6PVV9VPYf6X3BU97QiLEmuW3uXH9u87zDFfdw==
 
 fast-levenshtein@^2.0.6:
   version "2.0.6"
-  resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fastq@^1.6.0:
-  version "1.15.0"
-  resolved "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
-  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47"
+  integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==
   dependencies:
     reusify "^1.0.4"
 
 fb-watchman@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c"
   integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==
   dependencies:
     bser "2.1.1"
 
 file-entry-cache@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
   integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
   dependencies:
     flat-cache "^3.0.4"
 
 file-uri-to-path@1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
 filesize@^9.0.11:
   version "9.0.11"
-  resolved "https://registry.npmjs.org/filesize/-/filesize-9.0.11.tgz#4ac3a42c084232dd9b2a1da0107f32d42fcfa5e4"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-9.0.11.tgz#4ac3a42c084232dd9b2a1da0107f32d42fcfa5e4"
   integrity sha512-gTAiTtI0STpKa5xesyTA9hA3LX4ga8sm2nWRcffEa1L/5vQwb4mj2MdzMkoHoGv4QzfDshQZuYscQSf8c4TKOA==
 
 fill-range@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
   integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==
   dependencies:
     extend-shallow "^2.0.1"
@@ -3320,21 +3412,21 @@ fill-range@^4.0.0:
 
 fill-range@^7.0.1:
   version "7.0.1"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
   integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
   dependencies:
     to-regex-range "^5.0.1"
 
 find-replace@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38"
+  resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38"
   integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==
   dependencies:
     array-back "^3.0.1"
 
 find-up@^1.0.0:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
   integrity sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==
   dependencies:
     path-exists "^2.0.0"
@@ -3342,7 +3434,7 @@ find-up@^1.0.0:
 
 find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
   dependencies:
     locate-path "^5.0.0"
@@ -3350,7 +3442,7 @@ find-up@^4.0.0, find-up@^4.1.0:
 
 find-up@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
   integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
   dependencies:
     locate-path "^6.0.0"
@@ -3358,7 +3450,7 @@ find-up@^5.0.0:
 
 findup-sync@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
   integrity sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g==
   dependencies:
     detect-file "^1.0.0"
@@ -3368,7 +3460,7 @@ findup-sync@^2.0.0:
 
 findup-sync@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
   integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
   dependencies:
     detect-file "^1.0.0"
@@ -3378,7 +3470,7 @@ findup-sync@^3.0.0:
 
 fined@^1.0.1:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b"
+  resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b"
   integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==
   dependencies:
     expand-tilde "^2.0.2"
@@ -3389,31 +3481,31 @@ fined@^1.0.1:
 
 flagged-respawn@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
+  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
   integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
 
 flat-cache@^3.0.4:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz#0e54ab4a1a60fe87e2946b6b00657f1c99e1af3f"
-  integrity sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
+  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
   dependencies:
-    flatted "^3.2.7"
+    flatted "^3.2.9"
     keyv "^4.5.3"
     rimraf "^3.0.2"
 
-flatbuffers@^23.5.26:
-  version "23.5.26"
-  resolved "https://registry.npmjs.org/flatbuffers/-/flatbuffers-23.5.26.tgz#01358e272a61239f0faf3bfbe4e014f3ace9d746"
-  integrity sha512-vE+SI9vrJDwi1oETtTIFldC/o9GsVKRM+s6EL0nQgxXlYV1Vc4Tk30hj4xGICftInKQKj1F3up2n8UbIVobISQ==
+flatbuffers@^24.3.25:
+  version "24.3.25"
+  resolved "https://registry.yarnpkg.com/flatbuffers/-/flatbuffers-24.3.25.tgz#e2f92259ba8aa53acd0af7844afb7c7eb95e7089"
+  integrity sha512-3HDgPbgiwWMI9zVB7VYBHaMrbOO7Gm0v+yD2FV/sCKj+9NDeVL7BOBYUuhWAQGKWOzBo8S9WdMvV0eixO233XQ==
 
-flatted@^3.2.7:
-  version "3.2.7"
-  resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
-  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
+flatted@^3.2.9:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
+  integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
 flush-write-stream@^1.0.2:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
   integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
   dependencies:
     inherits "^2.0.3"
@@ -3421,19 +3513,19 @@ flush-write-stream@^1.0.2:
 
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
 
 for-own@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
   integrity sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==
   dependencies:
     for-in "^1.0.1"
 
 foreground-child@^3.1.0:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
   integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
   dependencies:
     cross-spawn "^7.0.0"
@@ -3441,14 +3533,14 @@ foreground-child@^3.1.0:
 
 fragment-cache@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
   integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==
   dependencies:
     map-cache "^0.2.2"
 
 fs-extra@^10.0.0:
   version "10.1.0"
-  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
   integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
   dependencies:
     graceful-fs "^4.2.0"
@@ -3457,7 +3549,7 @@ fs-extra@^10.0.0:
 
 fs-mkdirp-stream@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb"
+  resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb"
   integrity sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==
   dependencies:
     graceful-fs "^4.1.11"
@@ -3465,12 +3557,12 @@ fs-mkdirp-stream@^1.0.0:
 
 fs.realpath@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@^1.2.7:
   version "1.2.13"
-  resolved "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
   integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
   dependencies:
     bindings "^1.5.0"
@@ -3478,57 +3570,58 @@ fsevents@^1.2.7:
 
 fsevents@^2.3.2, fsevents@~2.3.2:
   version "2.3.3"
-  resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
-  resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
 get-caller-file@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-caller-file@^2.0.5:
   version "2.0.5"
-  resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
-  integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
+get-intrinsic@^1.1.3, get-intrinsic@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
+  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
   dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
     has-proto "^1.0.1"
     has-symbols "^1.0.3"
+    hasown "^2.0.0"
 
 get-package-type@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
+  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
 get-stream@^6.0.0:
   version "6.0.1"
-  resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
-  resolved "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
   integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
 glob-parent@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
   integrity sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==
   dependencies:
     is-glob "^3.1.0"
@@ -3536,21 +3629,21 @@ glob-parent@^3.1.0:
 
 glob-parent@^5.1.2:
   version "5.1.2"
-  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
 glob-parent@^6.0.2:
   version "6.0.2"
-  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
   dependencies:
     is-glob "^4.0.3"
 
 glob-stream@^6.1.0:
   version "6.1.0"
-  resolved "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
+  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
   integrity sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==
   dependencies:
     extend "^3.0.0"
@@ -3566,12 +3659,12 @@ glob-stream@^6.1.0:
 
 glob-to-regexp@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
 glob-watcher@^5.0.3:
   version "5.0.5"
-  resolved "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz#aa6bce648332924d9a8489be41e3e5c52d4186dc"
+  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-5.0.5.tgz#aa6bce648332924d9a8489be41e3e5c52d4186dc"
   integrity sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==
   dependencies:
     anymatch "^2.0.0"
@@ -3582,20 +3675,20 @@ glob-watcher@^5.0.3:
     normalize-path "^3.0.0"
     object.defaults "^1.1.0"
 
-glob@10.3.10:
-  version "10.3.10"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
-  integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
+glob@10.4.1:
+  version "10.4.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.1.tgz#0cfb01ab6a6b438177bfe6a58e2576f6efe909c2"
+  integrity sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==
   dependencies:
     foreground-child "^3.1.0"
-    jackspeak "^2.3.5"
-    minimatch "^9.0.1"
-    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-    path-scurry "^1.10.1"
+    jackspeak "^3.1.2"
+    minimatch "^9.0.4"
+    minipass "^7.1.2"
+    path-scurry "^1.11.1"
 
 glob@^7.1.1, glob@^7.1.3, glob@^7.1.4:
   version "7.2.3"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
   dependencies:
     fs.realpath "^1.0.0"
@@ -3607,7 +3700,7 @@ glob@^7.1.1, glob@^7.1.3, glob@^7.1.4:
 
 global-modules@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
   integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
   dependencies:
     global-prefix "^1.0.1"
@@ -3616,7 +3709,7 @@ global-modules@^1.0.0:
 
 global-prefix@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
   integrity sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==
   dependencies:
     expand-tilde "^2.0.2"
@@ -3627,19 +3720,24 @@ global-prefix@^1.0.1:
 
 globals@^11.1.0:
   version "11.12.0"
-  resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^13.19.0:
-  version "13.21.0"
-  resolved "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz#163aae12f34ef502f5153cfbdd3600f36c63c571"
-  integrity sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==
+  version "13.24.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
+  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
   dependencies:
     type-fest "^0.20.2"
 
+globals@^14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
+  integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
+
 globby@^11.1.0:
   version "11.1.0"
-  resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
   dependencies:
     array-union "^2.1.0"
@@ -3651,7 +3749,7 @@ globby@^11.1.0:
 
 globby@^13.1.2:
   version "13.2.2"
-  resolved "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592"
   integrity sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==
   dependencies:
     dir-glob "^3.0.1"
@@ -3662,66 +3760,66 @@ globby@^13.1.2:
 
 glogg@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f"
+  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f"
   integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==
   dependencies:
     sparkles "^1.0.0"
 
-google-closure-compiler-java@^20230802.0.0:
-  version "20230802.0.0"
-  resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20230802.0.0.tgz#5de4679f3d014b6b66471a48fb82c2772db4c872"
-  integrity sha512-PWKLMLwj7pR/U0yYbiy649LLqAscu+F1gyY4Y/jK6CmSLb8cIJbL8BTJd00828TzTNfWnYwxbkcQw0y9C2YsGw==
+google-closure-compiler-java@^20240317.0.0:
+  version "20240317.0.0"
+  resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20240317.0.0.tgz#8c8842ce9064b2d0b79cb41d75c4eb5eb461edaa"
+  integrity sha512-oWURPChjcCrVfiQOuVtpSoUJVvtOYo41JGEQ2qtArsTGmk/DpWh40vS6hitwKRM/0YzJX/jYUuyt9ibuXXJKmg==
 
-google-closure-compiler-linux@^20230802.0.0:
-  version "20230802.0.0"
-  resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20230802.0.0.tgz#1acaf12ef386e5c1dcb5ff5796d4ae9f48ebce46"
-  integrity sha512-F13U4iSXiWeGtHOFS25LVem1s6zI+pJvXVPVR7zSib5ppoUJ0JXnABJQezUR3FnpxmnkALG4oIGW0syH9zPLZA==
+google-closure-compiler-linux@^20240317.0.0:
+  version "20240317.0.0"
+  resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20240317.0.0.tgz#8e6b708bf5f231d6bb48cf1a9ee707c3142de771"
+  integrity sha512-dYLtcbbJdbbBS0lTy9SzySdVv/aGkpyTekQiW4ADhT/i1p1b4r0wQTKj6kpVVmFvbZ6t9tW/jbXc9EXXNUahZw==
 
-google-closure-compiler-osx@^20230802.0.0:
-  version "20230802.0.0"
-  resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20230802.0.0.tgz#10746ecfa81ad6eecc4d42d4ce9d0ed3ca8071e7"
-  integrity sha512-ANAi/ux92Tt+Na7vFDLeK2hRzotjC5j+nxoPtE0OcuNcbjji5dREKoJxkq7r0YwRTCzAFZszK5ip/NPdTOdCEg==
+google-closure-compiler-osx@^20240317.0.0:
+  version "20240317.0.0"
+  resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20240317.0.0.tgz#c170b709a7a9591967bc7f213fea2096c2199ff6"
+  integrity sha512-0mABwjD4HP11rikFd8JRIb9OgPqn9h3o3wS0otufMfmbwS7zRpnnoJkunifhORl3VoR1gFm6vcTC9YziTEFdOw==
 
-google-closure-compiler-windows@^20230802.0.0:
-  version "20230802.0.0"
-  resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20230802.0.0.tgz#d57968dc24d5e0d538840b4313e1bec7c71b18d6"
-  integrity sha512-ZQPujoNiiUyTGl8zEGR/0yAygWnbMtX/NQ/S/EHVgq5nmYkvDEVuiVbgpPAmO9lzBTq0hvUTRRATZbTU2ISxgA==
+google-closure-compiler-windows@^20240317.0.0:
+  version "20240317.0.0"
+  resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20240317.0.0.tgz#76489c3d2c8d081e261e89e9f5ffabffa8a6e961"
+  integrity sha512-fTueVFzNOWURFlXZmrFkAB7yA+jzpA2TeDOYeBEFwVlVGHwi8PV3Q9vCIWlbkE8wLpukKEg5wfRHYrLwVPINCA==
 
-google-closure-compiler@20230802.0.0:
-  version "20230802.0.0"
-  resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20230802.0.0.tgz#849181359823f8c9130faec9a1597377680823d6"
-  integrity sha512-o2fYoc8lqOBdhm95Ick0vWrtwH2Icd5yLZhbTcQ0T7NfGiBepYvx1BB63hR8ebgzEZemz9Fh+O6Kg/3Mjm28ww==
+google-closure-compiler@20240317.0.0:
+  version "20240317.0.0"
+  resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20240317.0.0.tgz#2b35b296047d6824c1876777c88c2e5ac6050fb9"
+  integrity sha512-PlC5aU2vwsypKbxyFNXOW4psDZfhDoOr2dCwuo8VcgQji+HVIgRi2lviO66x2SfTi0ilm3kI6rq/RSdOMFczcQ==
   dependencies:
     chalk "4.x"
-    google-closure-compiler-java "^20230802.0.0"
+    google-closure-compiler-java "^20240317.0.0"
     minimist "1.x"
     vinyl "2.x"
     vinyl-sourcemaps-apply "^0.2.0"
   optionalDependencies:
-    google-closure-compiler-linux "^20230802.0.0"
-    google-closure-compiler-osx "^20230802.0.0"
-    google-closure-compiler-windows "^20230802.0.0"
+    google-closure-compiler-linux "^20240317.0.0"
+    google-closure-compiler-osx "^20240317.0.0"
+    google-closure-compiler-windows "^20240317.0.0"
 
 gopd@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
   integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
   dependencies:
     get-intrinsic "^1.1.3"
 
-graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   version "4.2.11"
-  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
 graphemer@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
   integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
 gulp-cli@^2.2.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz#ec0d380e29e52aa45e47977f0d32e18fd161122f"
+  resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.3.0.tgz#ec0d380e29e52aa45e47977f0d32e18fd161122f"
   integrity sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==
   dependencies:
     ansi-colors "^1.0.1"
@@ -3743,35 +3841,34 @@ gulp-cli@^2.2.0:
     v8flags "^3.2.0"
     yargs "^7.1.0"
 
-gulp-esbuild@0.11.1:
-  version "0.11.1"
-  resolved "https://registry.npmjs.org/gulp-esbuild/-/gulp-esbuild-0.11.1.tgz#85d0ebbacae844dbbae02bb6f9d4216e9b45cee7"
-  integrity sha512-+Lbc4NXBcSXtvvz9wIZNrxGfgF70NgBfSNhHi3o4jKD36KQxFVKRECU72ZsSqyy08qXojK6Cur5/S0Ds+2xpSg==
+gulp-esbuild@0.12.1:
+  version "0.12.1"
+  resolved "https://registry.yarnpkg.com/gulp-esbuild/-/gulp-esbuild-0.12.1.tgz#f91093f0f68e739f455530804aa533577ec6dfc6"
+  integrity sha512-dkcN2AHtXTVu+KNw0Zw8SWysziNwpYg6kw41E8frUkil5ZtwktIsot/OCLEpRT6clFpVQ7Hw3+YZQvoNdyTF1A==
   dependencies:
-    esbuild "^0.17.11"
+    esbuild "^0.21.5"
     plugin-error "^2.0.1"
     vinyl "^3.0.0"
 
-gulp-json-transform@0.4.8:
-  version "0.4.8"
-  resolved "https://registry.npmjs.org/gulp-json-transform/-/gulp-json-transform-0.4.8.tgz#fdbd19fd5327661ccdfc5977621f739ea86d557d"
-  integrity sha512-FBVn1HqNf0hqsgrspA7Xz2i/HxRZPKnccMapKPfIE+PANuCmtmgMD2OfRLbqRGBb0Xwl1pE76sSct5gyF1zsfw==
+gulp-json-transform@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/gulp-json-transform/-/gulp-json-transform-0.5.0.tgz#2f15abe808afcf8435036d1f6cc460f7695f0b3d"
+  integrity sha512-f54tk9T5dTGCNPBp1q80rMP3xScfDAJDprjyuc9nDLwIbB65xC4nerljGiRrCNjy7YjEfZpDowIqEAietkjtxg==
   dependencies:
     ansi-colors "^1.0.1"
     fancy-log "^1.3.2"
     plugin-error "^1.0.1"
-    promise "^8.0.1"
     through2 "^2.0.3"
     vinyl "^2.1.0"
 
 gulp-rename@2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz#9bbc3962b0c0f52fc67cd5eaff6c223ec5b9cf6c"
+  resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-2.0.0.tgz#9bbc3962b0c0f52fc67cd5eaff6c223ec5b9cf6c"
   integrity sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==
 
 gulp-replace@1.1.4:
   version "1.1.4"
-  resolved "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.4.tgz#06a0e9ee36f30e343c1e0a2dd760ec32c8a3d3b2"
+  resolved "https://registry.yarnpkg.com/gulp-replace/-/gulp-replace-1.1.4.tgz#06a0e9ee36f30e343c1e0a2dd760ec32c8a3d3b2"
   integrity sha512-SVSF7ikuWKhpAW4l4wapAqPPSToJoiNKsbDoUnRrSgwZHH7lH8pbPeQj1aOVYQrbZKhfSVBxVW+Py7vtulRktw==
   dependencies:
     "@types/node" "*"
@@ -3782,7 +3879,7 @@ gulp-replace@1.1.4:
 
 gulp-sourcemaps@3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz#2e154e1a2efed033c0e48013969e6f30337b2743"
+  resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-3.0.0.tgz#2e154e1a2efed033c0e48013969e6f30337b2743"
   integrity sha512-RqvUckJkuYqy4VaIH60RMal4ZtG0IbQ6PXMNkNsshEGJ9cldUPRb/YCgboYae+CLAs1HQNb4ADTKCx65HInquQ==
   dependencies:
     "@gulp-sourcemaps/identity-map" "^2.0.1"
@@ -3799,7 +3896,7 @@ gulp-sourcemaps@3.0.0:
 
 gulp-terser@2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/gulp-terser/-/gulp-terser-2.1.0.tgz#149b693a1adbde922807b60b844bb7351dafbde1"
+  resolved "https://registry.yarnpkg.com/gulp-terser/-/gulp-terser-2.1.0.tgz#149b693a1adbde922807b60b844bb7351dafbde1"
   integrity sha512-lQ3+JUdHDVISAlUIUSZ/G9Dz/rBQHxOiYDQ70IVWFQeh4b33TC1MCIU+K18w07PS3rq/CVc34aQO4SUbdaNMPQ==
   dependencies:
     plugin-error "^1.0.1"
@@ -3809,7 +3906,7 @@ gulp-terser@2.1.0:
 
 gulp-typescript@5.0.1:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-5.0.1.tgz#96c6565a6eb31e08c2aae1c857b1a079e6226d94"
+  resolved "https://registry.yarnpkg.com/gulp-typescript/-/gulp-typescript-5.0.1.tgz#96c6565a6eb31e08c2aae1c857b1a079e6226d94"
   integrity sha512-YuMMlylyJtUSHG1/wuSVTrZp60k1dMEFKYOvDf7OvbAJWrDtxxD4oZon4ancdWwzjj30ztiidhe4VXJniF0pIQ==
   dependencies:
     ansi-colors "^3.0.5"
@@ -3821,7 +3918,7 @@ gulp-typescript@5.0.1:
 
 gulp-vinyl-size@1.1.4:
   version "1.1.4"
-  resolved "https://registry.npmjs.org/gulp-vinyl-size/-/gulp-vinyl-size-1.1.4.tgz#06b98a8aa9f91f420ea3068798800aa21f8ccdc1"
+  resolved "https://registry.yarnpkg.com/gulp-vinyl-size/-/gulp-vinyl-size-1.1.4.tgz#06b98a8aa9f91f420ea3068798800aa21f8ccdc1"
   integrity sha512-k8QTnUD69CnQnbpbXExFRtMDtQ9jIc5nZXYyVNB5Z+7xrZIO3hVS0zotoWwZawgtBLNLvAnm6JZ3zL+O1ysQ3A==
   dependencies:
     fancy-log "^2.0.0"
@@ -3830,7 +3927,7 @@ gulp-vinyl-size@1.1.4:
 
 gulp@4.0.2:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz#543651070fd0f6ab0a0650c6a3e6ff5a7cb09caa"
+  resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.2.tgz#543651070fd0f6ab0a0650c6a3e6ff5a7cb09caa"
   integrity sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==
   dependencies:
     glob-watcher "^5.0.3"
@@ -3840,53 +3937,53 @@ gulp@4.0.2:
 
 gulplog@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
+  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
   integrity sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==
   dependencies:
     glogg "^1.0.0"
 
 gzip-size@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
+  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
   integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
   dependencies:
     duplexer "^0.1.2"
 
 hard-rejection@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
+  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
   integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
 
 has-flag@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-property-descriptors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
-  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
+  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
   dependencies:
-    get-intrinsic "^1.1.1"
+    es-define-property "^1.0.0"
 
 has-proto@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
-  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
+  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
 
 has-symbols@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
 has-value@^0.3.1:
   version "0.3.1"
-  resolved "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
   integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==
   dependencies:
     get-value "^2.0.3"
@@ -3895,7 +3992,7 @@ has-value@^0.3.1:
 
 has-value@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
   integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==
   dependencies:
     get-value "^2.0.6"
@@ -3904,66 +4001,66 @@ has-value@^1.0.0:
 
 has-values@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
   integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==
 
 has-values@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
   integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==
   dependencies:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+hasown@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
   dependencies:
-    function-bind "^1.1.1"
+    function-bind "^1.1.2"
 
 homedir-polyfill@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
   integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
   dependencies:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
   version "2.8.9"
-  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 hosted-git-info@^4.0.1:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
   integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
   dependencies:
     lru-cache "^6.0.0"
 
 html-escaper@^2.0.0, html-escaper@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
 human-signals@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
 hyperdyperid@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz#59668d323ada92228d2a869d3e474d5a33b69e6b"
+  resolved "https://registry.yarnpkg.com/hyperdyperid/-/hyperdyperid-1.2.0.tgz#59668d323ada92228d2a869d3e474d5a33b69e6b"
   integrity sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==
 
-ignore@^5.2.0, ignore@^5.2.4:
-  version "5.2.4"
-  resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
-  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
+ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
+  integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
 
 import-fresh@^3.2.1:
   version "3.3.0"
-  resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
   dependencies:
     parent-module "^1.0.0"
@@ -3971,7 +4068,7 @@ import-fresh@^3.2.1:
 
 import-local@^3.0.2:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
   integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
   dependencies:
     pkg-dir "^4.2.0"
@@ -3979,22 +4076,22 @@ import-local@^3.0.2:
 
 imurmurhash@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 indent-string@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
 indent-string@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz#4fd2980fccaf8622d14c64d694f4cf33c81951a5"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-5.0.0.tgz#4fd2980fccaf8622d14c64d694f4cf33c81951a5"
   integrity sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==
 
 inflight@^1.0.4:
   version "1.0.6"
-  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
   integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
@@ -4002,292 +4099,276 @@ inflight@^1.0.4:
 
 inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
   version "2.0.4"
-  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 ini@^1.3.4:
   version "1.3.8"
-  resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 interpret@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
   integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
 invert-kv@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
   integrity sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==
 
 is-absolute@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
+  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
   integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
   dependencies:
     is-relative "^1.0.0"
     is-windows "^1.0.1"
 
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==
-  dependencies:
-    kind-of "^3.0.2"
-
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+is-accessor-descriptor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz#3223b10628354644b86260db29b3e693f5ceedd4"
+  integrity sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==
   dependencies:
-    kind-of "^6.0.0"
+    hasown "^2.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
 is-binary-path@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
   integrity sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==
   dependencies:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.1.5:
   version "1.1.6"
-  resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-builtin-module@^3.2.1:
   version "3.2.1"
-  resolved "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169"
   integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==
   dependencies:
     builtin-modules "^3.3.0"
 
 is-ci@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
   integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
   dependencies:
     ci-info "^2.0.0"
 
 is-core-module@^2.13.0, is-core-module@^2.5.0:
-  version "2.13.0"
-  resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
-  integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
   dependencies:
-    has "^1.0.3"
+    hasown "^2.0.0"
 
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==
-  dependencies:
-    kind-of "^3.0.2"
-
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+is-data-descriptor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz#2109164426166d32ea38c405c1e0945d9e6a4eeb"
+  integrity sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==
   dependencies:
-    kind-of "^6.0.0"
+    hasown "^2.0.0"
 
 is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.7.tgz#2727eb61fd789dcd5bdf0ed4569f551d2fe3be33"
+  integrity sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==
   dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
+    is-accessor-descriptor "^1.0.1"
+    is-data-descriptor "^1.0.1"
 
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.3.tgz#92d27cb3cd311c4977a4db47df457234a13cb306"
+  integrity sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==
   dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
+    is-accessor-descriptor "^1.0.1"
+    is-data-descriptor "^1.0.1"
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
   integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
 
 is-extendable@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
   integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
   integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
 is-generator-fn@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
+  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
 is-glob@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
   integrity sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3:
   version "4.0.3"
-  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
     is-extglob "^2.1.1"
 
 is-module@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
   integrity sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==
 
 is-negated-glob@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
+  resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
   integrity sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==
 
 is-number@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
   integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
   integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
 is-number@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
 is-path-cwd@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-3.0.0.tgz#889b41e55c8588b1eb2a96a61d05740a674521c7"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-3.0.0.tgz#889b41e55c8588b1eb2a96a61d05740a674521c7"
   integrity sha512-kyiNFFLU0Ampr6SDZitD/DwUo4Zs1nSdnygUBqsu3LooL00Qvb5j+UnvApUn/TTj1J3OuE6BTdQ5rudKmU2ZaA==
 
 is-path-inside@^3.0.3:
   version "3.0.3"
-  resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
 is-path-inside@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz#805aeb62c47c1b12fc3fd13bfb3ed1e7430071db"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-4.0.0.tgz#805aeb62c47c1b12fc3fd13bfb3ed1e7430071db"
   integrity sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==
 
 is-plain-obj@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
 
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-plain-object@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
   integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
 
 is-promise@^2.2.2:
   version "2.2.2"
-  resolved "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
   integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
 
 is-relative@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
+  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
   integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
   dependencies:
     is-unc-path "^1.0.0"
 
 is-stream@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
 is-unc-path@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
+  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
   integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
   dependencies:
     unc-path-regex "^0.1.2"
 
 is-utf8@^0.2.0, is-utf8@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
   integrity sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==
 
 is-valid-glob@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
+  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
   integrity sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==
 
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
 isexe@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 isobject@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
   integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
-  integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756"
+  integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==
 
 istanbul-lib-instrument@^5.0.4:
   version "5.2.1"
-  resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d"
   integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
   dependencies:
     "@babel/core" "^7.12.3"
@@ -4297,19 +4378,19 @@ istanbul-lib-instrument@^5.0.4:
     semver "^6.3.0"
 
 istanbul-lib-instrument@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.0.tgz#7a8af094cbfff1d5bb280f62ce043695ae8dd5b8"
-  integrity sha512-x58orMzEVfzPUKqlbLd1hXCnySCxKdDKa6Rjg97CwuLLRI4g3FHTdnExu1OqffVFay6zeMW+T6/DowFLndWnIw==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.2.tgz#91655936cf7380e4e473383081e38478b69993b1"
+  integrity sha512-1WUsZ9R1lA0HtBSohTkm39WTPlNKSJ5iFk7UwqXkBLoHQT+hfqPsfsTDVuZdKGaBwn7din9bS7SsnoAr943hvw==
   dependencies:
-    "@babel/core" "^7.12.3"
-    "@babel/parser" "^7.14.7"
-    "@istanbuljs/schema" "^0.1.2"
+    "@babel/core" "^7.23.9"
+    "@babel/parser" "^7.23.9"
+    "@istanbuljs/schema" "^0.1.3"
     istanbul-lib-coverage "^3.2.0"
     semver "^7.5.4"
 
 istanbul-lib-report@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
   integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
   dependencies:
     istanbul-lib-coverage "^3.0.0"
@@ -4318,7 +4399,7 @@ istanbul-lib-report@^3.0.0:
 
 istanbul-lib-source-maps@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
   integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
   dependencies:
     debug "^4.1.1"
@@ -4326,33 +4407,33 @@ istanbul-lib-source-maps@^4.0.0:
     source-map "^0.6.1"
 
 istanbul-reports@^3.1.3:
-  version "3.1.6"
-  resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz#2544bcab4768154281a2f0870471902704ccaa1a"
-  integrity sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz#daed12b9e1dca518e15c056e1e537e741280fa0b"
+  integrity sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
 istextorbinary@^3.0.0:
   version "3.3.0"
-  resolved "https://registry.npmjs.org/istextorbinary/-/istextorbinary-3.3.0.tgz#06b1c57d948da11461bd237c00ce09e9902964f2"
+  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-3.3.0.tgz#06b1c57d948da11461bd237c00ce09e9902964f2"
   integrity sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==
   dependencies:
     binaryextensions "^2.2.0"
     textextensions "^3.2.0"
 
-ix@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/ix/-/ix-5.0.0.tgz#b9e292f79b1876bbf696809fe86e42930bdbfcd4"
-  integrity sha512-6LyyrHnvNrSy5pKtW/KA+KKusHrB223aBJCJlIGPN7QBfDkEEtNrAkAz9lLLShIcdJntq6BiPCHuKaCM/9wwXw==
+ix@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/ix/-/ix-6.0.0.tgz#c1875523f8090c7146dc3ac3412a763663887f27"
+  integrity sha512-B/KeYkHtOWbr3ttckqWT9uha2ixw9fGVDxX+DwVXhO+P5eOhyCadt+aC30hRBvG+do+tbI3xbYDMYN6dp1C4Vw==
   dependencies:
-    "@types/node" "^13.7.4"
-    tslib "^2.3.0"
+    "@types/node" ">=13.7.4"
+    tslib "^2.6.2"
 
-jackspeak@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
-  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
+jackspeak@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-3.1.2.tgz#eada67ea949c6b71de50f1b09c92a961897b90ab"
+  integrity sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==
   dependencies:
     "@isaacs/cliui" "^8.0.2"
   optionalDependencies:
@@ -4360,7 +4441,7 @@ jackspeak@^2.3.5:
 
 jest-changed-files@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz#1c06d07e77c78e1585d020424dedc10d6e17ac3a"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.7.0.tgz#1c06d07e77c78e1585d020424dedc10d6e17ac3a"
   integrity sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==
   dependencies:
     execa "^5.0.0"
@@ -4369,7 +4450,7 @@ jest-changed-files@^29.7.0:
 
 jest-circus@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz#b6817a45fcc835d8b16d5962d0c026473ee3668a"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.7.0.tgz#b6817a45fcc835d8b16d5962d0c026473ee3668a"
   integrity sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==
   dependencies:
     "@jest/environment" "^29.7.0"
@@ -4393,9 +4474,9 @@ jest-circus@^29.7.0:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-cli@^29.6.2:
+jest-cli@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz#5592c940798e0cae677eec169264f2d839a37995"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.7.0.tgz#5592c940798e0cae677eec169264f2d839a37995"
   integrity sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==
   dependencies:
     "@jest/core" "^29.7.0"
@@ -4412,7 +4493,7 @@ jest-cli@^29.6.2:
 
 jest-config@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz#bcbda8806dbcc01b1e316a46bb74085a84b0245f"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.7.0.tgz#bcbda8806dbcc01b1e316a46bb74085a84b0245f"
   integrity sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==
   dependencies:
     "@babel/core" "^7.11.6"
@@ -4440,7 +4521,7 @@ jest-config@^29.7.0:
 
 jest-diff@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.7.0.tgz#017934a66ebb7ecf6f205e84699be10afd70458a"
   integrity sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==
   dependencies:
     chalk "^4.0.0"
@@ -4450,14 +4531,14 @@ jest-diff@^29.7.0:
 
 jest-docblock@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz#8fddb6adc3cdc955c93e2a87f61cfd350d5d119a"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.7.0.tgz#8fddb6adc3cdc955c93e2a87f61cfd350d5d119a"
   integrity sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==
   dependencies:
     detect-newline "^3.0.0"
 
 jest-each@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz#162a9b3f2328bdd991beaabffbb74745e56577d1"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.7.0.tgz#162a9b3f2328bdd991beaabffbb74745e56577d1"
   integrity sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==
   dependencies:
     "@jest/types" "^29.6.3"
@@ -4468,7 +4549,7 @@ jest-each@^29.7.0:
 
 jest-environment-node@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz#0b93e111dda8ec120bc8300e6d1fb9576e164376"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.7.0.tgz#0b93e111dda8ec120bc8300e6d1fb9576e164376"
   integrity sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==
   dependencies:
     "@jest/environment" "^29.7.0"
@@ -4480,12 +4561,12 @@ jest-environment-node@^29.7.0:
 
 jest-get-type@^29.6.3:
   version "29.6.3"
-  resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.6.3.tgz#36f499fdcea197c1045a127319c0481723908fd1"
   integrity sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==
 
 jest-haste-map@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz#3c2396524482f5a0506376e6c858c3bbcc17b104"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.7.0.tgz#3c2396524482f5a0506376e6c858c3bbcc17b104"
   integrity sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==
   dependencies:
     "@jest/types" "^29.6.3"
@@ -4504,7 +4585,7 @@ jest-haste-map@^29.7.0:
 
 jest-leak-detector@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz#5b7ec0dadfdfec0ca383dc9aa016d36b5ea4c728"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz#5b7ec0dadfdfec0ca383dc9aa016d36b5ea4c728"
   integrity sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==
   dependencies:
     jest-get-type "^29.6.3"
@@ -4512,7 +4593,7 @@ jest-leak-detector@^29.7.0:
 
 jest-matcher-utils@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz#ae8fec79ff249fd592ce80e3ee474e83a6c44f12"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz#ae8fec79ff249fd592ce80e3ee474e83a6c44f12"
   integrity sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==
   dependencies:
     chalk "^4.0.0"
@@ -4522,7 +4603,7 @@ jest-matcher-utils@^29.7.0:
 
 jest-message-util@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz#8bc392e204e95dfe7564abbe72a404e28e51f7f3"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.7.0.tgz#8bc392e204e95dfe7564abbe72a404e28e51f7f3"
   integrity sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==
   dependencies:
     "@babel/code-frame" "^7.12.13"
@@ -4537,7 +4618,7 @@ jest-message-util@^29.7.0:
 
 jest-mock@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz#4e836cf60e99c6fcfabe9f99d017f3fdd50a6347"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.7.0.tgz#4e836cf60e99c6fcfabe9f99d017f3fdd50a6347"
   integrity sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==
   dependencies:
     "@jest/types" "^29.6.3"
@@ -4546,17 +4627,17 @@ jest-mock@^29.7.0:
 
 jest-pnp-resolver@^1.2.2:
   version "1.2.3"
-  resolved "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
+  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e"
   integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==
 
 jest-regex-util@^29.6.3:
   version "29.6.3"
-  resolved "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz#4a556d9c776af68e1c5f48194f4d0327d24e8a52"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.6.3.tgz#4a556d9c776af68e1c5f48194f4d0327d24e8a52"
   integrity sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==
 
 jest-resolve-dependencies@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz#1b04f2c095f37fc776ff40803dc92921b1e88428"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz#1b04f2c095f37fc776ff40803dc92921b1e88428"
   integrity sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==
   dependencies:
     jest-regex-util "^29.6.3"
@@ -4564,7 +4645,7 @@ jest-resolve-dependencies@^29.7.0:
 
 jest-resolve@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz#64d6a8992dd26f635ab0c01e5eef4399c6bcbc30"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.7.0.tgz#64d6a8992dd26f635ab0c01e5eef4399c6bcbc30"
   integrity sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==
   dependencies:
     chalk "^4.0.0"
@@ -4579,7 +4660,7 @@ jest-resolve@^29.7.0:
 
 jest-runner@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz#809af072d408a53dcfd2e849a4c976d3132f718e"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.7.0.tgz#809af072d408a53dcfd2e849a4c976d3132f718e"
   integrity sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==
   dependencies:
     "@jest/console" "^29.7.0"
@@ -4606,7 +4687,7 @@ jest-runner@^29.7.0:
 
 jest-runtime@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz#efecb3141cf7d3767a3a0cc8f7c9990587d3d817"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.7.0.tgz#efecb3141cf7d3767a3a0cc8f7c9990587d3d817"
   integrity sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==
   dependencies:
     "@jest/environment" "^29.7.0"
@@ -4632,17 +4713,17 @@ jest-runtime@^29.7.0:
     slash "^3.0.0"
     strip-bom "^4.0.0"
 
-jest-silent-reporter@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.npmjs.org/jest-silent-reporter/-/jest-silent-reporter-0.5.0.tgz#5fd8ccd61665227e3bf19d908b7350719d06ff38"
-  integrity sha512-epdLt8Oj0a1AyRiR6F8zx/1SVT1Mi7VU3y4wB2uOBHs/ohIquC7v2eeja7UN54uRPyHInIKWdL+RdG228n5pJQ==
+jest-silent-reporter@0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/jest-silent-reporter/-/jest-silent-reporter-0.6.0.tgz#e9c63a3b1e3c80571d690d998faf842f576b6a60"
+  integrity sha512-4nmS+5o7ycVlvbQOTx7CnGdbBtP2646hnDgQpQLaVhjHcQNHD+gqBAetyjRDlgpZ8+8N82MWI59K+EX2LsVk7g==
   dependencies:
     chalk "^4.0.0"
     jest-util "^26.0.0"
 
 jest-snapshot@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz#c2c574c3f51865da1bb329036778a69bf88a6be5"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.7.0.tgz#c2c574c3f51865da1bb329036778a69bf88a6be5"
   integrity sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==
   dependencies:
     "@babel/core" "^7.11.6"
@@ -4668,7 +4749,7 @@ jest-snapshot@^29.7.0:
 
 jest-util@^26.0.0:
   version "26.6.2"
-  resolved "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
   integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==
   dependencies:
     "@jest/types" "^26.6.2"
@@ -4680,7 +4761,7 @@ jest-util@^26.0.0:
 
 jest-util@^29.0.0, jest-util@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
   integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
   dependencies:
     "@jest/types" "^29.6.3"
@@ -4692,7 +4773,7 @@ jest-util@^29.0.0, jest-util@^29.7.0:
 
 jest-validate@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz#7bf705511c64da591d46b15fce41400d52147d9c"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.7.0.tgz#7bf705511c64da591d46b15fce41400d52147d9c"
   integrity sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==
   dependencies:
     "@jest/types" "^29.6.3"
@@ -4704,7 +4785,7 @@ jest-validate@^29.7.0:
 
 jest-watcher@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz#7810d30d619c3a62093223ce6bb359ca1b28a2f2"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.7.0.tgz#7810d30d619c3a62093223ce6bb359ca1b28a2f2"
   integrity sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==
   dependencies:
     "@jest/test-result" "^29.7.0"
@@ -4718,7 +4799,7 @@ jest-watcher@^29.7.0:
 
 jest-worker@^27.4.5:
   version "27.5.1"
-  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
   integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
   dependencies:
     "@types/node" "*"
@@ -4727,7 +4808,7 @@ jest-worker@^27.4.5:
 
 jest-worker@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz#acad073acbbaeb7262bd5389e1bcf43e10058d4a"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.7.0.tgz#acad073acbbaeb7262bd5389e1bcf43e10058d4a"
   integrity sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==
   dependencies:
     "@types/node" "*"
@@ -4735,24 +4816,24 @@ jest-worker@^29.7.0:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest@29.6.2:
-  version "29.6.2"
-  resolved "https://registry.npmjs.org/jest/-/jest-29.6.2.tgz#3bd55b9fd46a161b2edbdf5f1d1bd0d1eab76c42"
-  integrity sha512-8eQg2mqFbaP7CwfsTpCxQ+sHzw1WuNWL5UUvjnWP4hx2riGz9fPSzYOaU5q8/GqWn1TfgZIVTqYJygbGbWAANg==
+jest@29.7.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-29.7.0.tgz#994676fc24177f088f1c5e3737f5697204ff2613"
+  integrity sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==
   dependencies:
-    "@jest/core" "^29.6.2"
-    "@jest/types" "^29.6.1"
+    "@jest/core" "^29.7.0"
+    "@jest/types" "^29.6.3"
     import-local "^3.0.2"
-    jest-cli "^29.6.2"
+    jest-cli "^29.7.0"
 
 js-tokens@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-yaml@^3.13.1:
   version "3.14.1"
-  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
@@ -4760,62 +4841,54 @@ js-yaml@^3.13.1:
 
 js-yaml@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
   integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
   dependencies:
     argparse "^2.0.1"
 
 jsesc@^2.5.1:
   version "2.5.2"
-  resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
 jsesc@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e"
   integrity sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==
 
 jsesc@~0.5.0:
   version "0.5.0"
-  resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
 json-bignum@^0.0.3:
   version "0.0.3"
-  resolved "https://registry.npmjs.org/json-bignum/-/json-bignum-0.0.3.tgz#41163b50436c773d82424dbc20ed70db7604b8d7"
+  resolved "https://registry.yarnpkg.com/json-bignum/-/json-bignum-0.0.3.tgz#41163b50436c773d82424dbc20ed70db7604b8d7"
   integrity sha512-2WHyXj3OfHSgNyuzDbSxI1w2jgw5gkWSWhS7Qg4bWXx1nLk3jnbwfUeS0PSba3IzpTUWdHxBieELUzXRjQB2zg==
 
 json-buffer@3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
   integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
-json-joy@^9.2.0:
-  version "9.6.0"
-  resolved "https://registry.npmjs.org/json-joy/-/json-joy-9.6.0.tgz#b691310024205b2d082737ca3c7e72cac0e364ac"
-  integrity sha512-vJtJD89T0OOZFMaENe95xKCOdibMev/lELkclTdhZxLplwbBPxneWNuctUPizk2nLqtGfBxwCXVO42G9LBoFBA==
-  dependencies:
-    arg "^5.0.2"
-    hyperdyperid "^1.2.0"
-
 json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
-  resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
 json2csv@^5.0.6:
   version "5.0.7"
-  resolved "https://registry.npmjs.org/json2csv/-/json2csv-5.0.7.tgz#f3a583c25abd9804be873e495d1e65ad8d1b54ae"
+  resolved "https://registry.yarnpkg.com/json2csv/-/json2csv-5.0.7.tgz#f3a583c25abd9804be873e495d1e65ad8d1b54ae"
   integrity sha512-YRZbUnyaJZLZUJSRi2G/MqahCyRv9n/ds+4oIetjDF3jWQA7AG7iSeKTiZiCNqtMZM7HDyt0e/W6lEnoGEmMGA==
   dependencies:
     commander "^6.1.0"
@@ -4824,17 +4897,12 @@ json2csv@^5.0.6:
 
 json5@^2.2.3:
   version "2.2.3"
-  resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-jsonc-parser@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
-  integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
-
 jsonfile@^6.0.1:
   version "6.1.0"
-  resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
   integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
   dependencies:
     universalify "^2.0.0"
@@ -4843,58 +4911,58 @@ jsonfile@^6.0.1:
 
 jsonparse@^1.3.1:
   version "1.3.1"
-  resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
 just-debounce@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz#2f81a3ad4121a76bc7cb45dbf704c0d76a8e5ddf"
+  resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.1.0.tgz#2f81a3ad4121a76bc7cb45dbf704c0d76a8e5ddf"
   integrity sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==
 
 keyv@^4.5.3:
-  version "4.5.3"
-  resolved "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz#00873d2b046df737963157bd04f294ca818c9c25"
-  integrity sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
   dependencies:
     json-buffer "3.0.1"
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
   integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==
   dependencies:
     is-buffer "^1.1.5"
 
-kind-of@^5.0.0, kind-of@^5.0.2:
+kind-of@^5.0.2:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
-kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3:
+kind-of@^6.0.2, kind-of@^6.0.3:
   version "6.0.3"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 kleur@^3.0.3:
   version "3.0.3"
-  resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
 kleur@^4.1.4:
   version "4.1.5"
-  resolved "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780"
+  resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780"
   integrity sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==
 
 last-run@^1.1.0:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz#45b96942c17b1c79c772198259ba943bebf8ca5b"
+  resolved "https://registry.yarnpkg.com/last-run/-/last-run-1.1.1.tgz#45b96942c17b1c79c772198259ba943bebf8ca5b"
   integrity sha512-U/VxvpX4N/rFvPzr3qG5EtLKEnNI0emvIQB3/ecEwv+8GHaUKbIB8vxv1Oai5FAF0d0r7LXHhLLe5K/yChm5GQ==
   dependencies:
     default-resolution "^2.0.0"
@@ -4902,33 +4970,33 @@ last-run@^1.1.0:
 
 lazystream@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638"
+  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638"
   integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==
   dependencies:
     readable-stream "^2.0.5"
 
 lcid@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
   integrity sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==
   dependencies:
     invert-kv "^1.0.0"
 
 lead@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42"
+  resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42"
   integrity sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow==
   dependencies:
     flush-write-stream "^1.0.2"
 
 leven@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
 levn@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
   integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
   dependencies:
     prelude-ls "^1.2.1"
@@ -4936,7 +5004,7 @@ levn@^0.4.1:
 
 liftoff@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz#c9ba6081f908670607ee79062d700df062c52ed3"
+  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-3.1.0.tgz#c9ba6081f908670607ee79062d700df062c52ed3"
   integrity sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==
   dependencies:
     extend "^3.0.0"
@@ -4950,12 +5018,19 @@ liftoff@^3.1.0:
 
 lines-and-columns@^1.1.6:
   version "1.2.4"
-  resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
+linkify-it@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-5.0.0.tgz#9ef238bfa6dc70bd8e7f9572b52d369af569b421"
+  integrity sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==
+  dependencies:
+    uc.micro "^2.0.0"
+
 load-json-file@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
   integrity sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==
   dependencies:
     graceful-fs "^4.1.2"
@@ -4966,66 +5041,66 @@ load-json-file@^1.0.0:
 
 loader-runner@^4.2.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
   integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
 locate-path@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
   integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
   dependencies:
     p-locate "^4.1.0"
 
 locate-path@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
   integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
   dependencies:
     p-locate "^5.0.0"
 
 lodash.assignwith@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz#127a97f02adc41751a954d24b0de17e100e038eb"
+  resolved "https://registry.yarnpkg.com/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz#127a97f02adc41751a954d24b0de17e100e038eb"
   integrity sha512-ZznplvbvtjK2gMvnQ1BR/zqPFZmS6jbK4p+6Up4xcRYA7yMIwxHCfbTcrYxXKzzqLsQ05eJPVznEW3tuwV7k1g==
 
 lodash.camelcase@^4.3.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
   integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==
 
 lodash.clone@^4.3.2:
   version "4.5.0"
-  resolved "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
+  resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
   integrity sha512-GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg==
 
 lodash.get@^4.4.2:
   version "4.4.2"
-  resolved "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
 
 lodash.memoize@4.x:
   version "4.1.2"
-  resolved "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
 
 lodash.merge@^4.6.2:
   version "4.6.2"
-  resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
 lodash.some@^4.2.2:
   version "4.6.0"
-  resolved "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
+  resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
   integrity sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==
 
 lodash@^4.17.4:
   version "4.17.21"
-  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 log-update@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
+  resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
   integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==
   dependencies:
     ansi-escapes "^4.3.0"
@@ -5033,93 +5108,100 @@ log-update@^4.0.0:
     slice-ansi "^4.0.0"
     wrap-ansi "^6.2.0"
 
+lru-cache@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3"
+  integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==
+
 lru-cache@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
   integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
   dependencies:
     yallist "^3.0.2"
 
 lru-cache@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
   integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
   dependencies:
     yallist "^4.0.0"
 
-"lru-cache@^9.1.1 || ^10.0.0":
-  version "10.0.1"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a"
-  integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==
-
 lru-queue@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
+  resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
   integrity sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==
   dependencies:
     es5-ext "~0.10.2"
 
 lunr@^2.3.9:
   version "2.3.9"
-  resolved "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1"
+  resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1"
   integrity sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==
 
 make-dir@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
   integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
   dependencies:
     semver "^7.5.3"
 
 make-error@1.x, make-error@^1.1.1:
   version "1.3.6"
-  resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
 make-iterator@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
+  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
   integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==
   dependencies:
     kind-of "^6.0.2"
 
 makeerror@1.0.12:
   version "1.0.12"
-  resolved "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
   integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
   dependencies:
     tmpl "1.0.5"
 
 map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
-  resolved "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
   integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
 
 map-obj@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
   integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==
 
 map-obj@^4.1.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a"
   integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
 map-visit@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
   integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==
   dependencies:
     object-visit "^1.0.0"
 
-marked@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3"
-  integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==
+markdown-it@^14.1.0:
+  version "14.1.0"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-14.1.0.tgz#3c3c5992883c633db4714ccb4d7b5935d98b7d45"
+  integrity sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==
+  dependencies:
+    argparse "^2.0.1"
+    entities "^4.4.0"
+    linkify-it "^5.0.0"
+    mdurl "^2.0.0"
+    punycode.js "^2.3.1"
+    uc.micro "^2.1.0"
 
 matchdep@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz#c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"
+  resolved "https://registry.yarnpkg.com/matchdep/-/matchdep-2.0.0.tgz#c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"
   integrity sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA==
   dependencies:
     findup-sync "^2.0.0"
@@ -5127,17 +5209,24 @@ matchdep@^2.0.0:
     resolve "^1.4.0"
     stack-trace "0.0.10"
 
-memfs@4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-4.5.0.tgz#03082709987760022275e0d3bc0f24545b7fe279"
-  integrity sha512-8QePW5iXi/ZCySFTo39h3ujKGT0rYVnZywuSo5AzR7POAuy4uBEFZKziYkkrlGdWuxACUxKAJ0L/sry3DSG+TA==
+mdurl@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-2.0.0.tgz#80676ec0433025dd3e17ee983d0fe8de5a2237e0"
+  integrity sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==
+
+memfs@4.9.2:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-4.9.2.tgz#42e7b48207268dad8c9c48ea5d4952c5d3840433"
+  integrity sha512-f16coDZlTG1jskq3mxarwB+fGRrd0uXWt+o1WIhRfOwbXQZqUDsTVxQBFK9JjRQHblg8eAG2JSbprDXKjc7ijQ==
   dependencies:
-    json-joy "^9.2.0"
-    thingies "^1.11.1"
+    "@jsonjoy.com/json-pack" "^1.0.3"
+    "@jsonjoy.com/util" "^1.1.2"
+    sonic-forest "^1.0.0"
+    tslib "^2.0.0"
 
 memoizee@0.4.X:
   version "0.4.15"
-  resolved "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz#e6f3d2da863f318d02225391829a6c5956555b72"
+  resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz#e6f3d2da863f318d02225391829a6c5956555b72"
   integrity sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ==
   dependencies:
     d "^1.0.1"
@@ -5151,7 +5240,7 @@ memoizee@0.4.X:
 
 memory-fs@^0.5.0:
   version "0.5.0"
-  resolved "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
   integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
   dependencies:
     errno "^0.1.3"
@@ -5159,7 +5248,7 @@ memory-fs@^0.5.0:
 
 meow@^10.1.3:
   version "10.1.5"
-  resolved "https://registry.npmjs.org/meow/-/meow-10.1.5.tgz#be52a1d87b5f5698602b0f32875ee5940904aa7f"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-10.1.5.tgz#be52a1d87b5f5698602b0f32875ee5940904aa7f"
   integrity sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==
   dependencies:
     "@types/minimist" "^1.2.2"
@@ -5177,17 +5266,17 @@ meow@^10.1.3:
 
 merge-stream@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
 merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
-  resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
-  resolved "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
@@ -5206,7 +5295,7 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
 
 micromatch@^4.0.2, micromatch@^4.0.4:
   version "4.0.5"
-  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
   dependencies:
     braces "^3.0.2"
@@ -5214,43 +5303,43 @@ micromatch@^4.0.2, micromatch@^4.0.4:
 
 mime-db@1.52.0:
   version "1.52.0"
-  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
 mime-types@^2.1.27:
   version "2.1.35"
-  resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
     mime-db "1.52.0"
 
 mimic-fn@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
 min-indent@^1.0.0, min-indent@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
+  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
 minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^9.0.0, minimatch@^9.0.1:
-  version "9.0.3"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
-  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
+minimatch@^9.0.4, minimatch@^9.0.5:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
+  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
   dependencies:
     brace-expansion "^2.0.1"
 
 minimist-options@4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
   integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
   dependencies:
     arrify "^1.0.1"
@@ -5259,17 +5348,22 @@ minimist-options@4.1.0:
 
 minimist@1.x:
   version "1.2.8"
-  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 "minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
-  version "7.0.3"
-  resolved "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz#05ea638da44e475037ed94d1c7efcc76a25e1974"
-  integrity sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg==
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
+  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
+
+minipass@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
+  integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
 mixin-deep@^1.2.0:
   version "1.3.2"
-  resolved "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
   integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
   dependencies:
     for-in "^1.0.2"
@@ -5277,32 +5371,32 @@ mixin-deep@^1.2.0:
 
 mkdirp@3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50"
   integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==
 
-mrmime@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27"
-  integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==
+mrmime@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-2.0.0.tgz#151082a6e06e59a9a39b46b3e14d5cfe92b3abb4"
+  integrity sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==
 
 ms@2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
 ms@2.1.2:
   version "2.1.2"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
 ms@^2.1.1:
   version "2.1.3"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 multistream@4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/multistream/-/multistream-4.1.0.tgz#7bf00dfd119556fbc153cff3de4c6d477909f5a8"
+  resolved "https://registry.yarnpkg.com/multistream/-/multistream-4.1.0.tgz#7bf00dfd119556fbc153cff3de4c6d477909f5a8"
   integrity sha512-J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw==
   dependencies:
     once "^1.4.0"
@@ -5310,17 +5404,17 @@ multistream@4.1.0:
 
 mute-stdout@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331"
+  resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331"
   integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==
 
 nan@^2.12.1:
-  version "2.18.0"
-  resolved "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554"
-  integrity sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.19.0.tgz#bb58122ad55a6c5bc973303908d5b16cfdd5a8c0"
+  integrity sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
-  resolved "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
   integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
@@ -5335,39 +5429,34 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-natural-compare-lite@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
-  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
-
 natural-compare@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 neo-async@^2.6.2:
   version "2.6.2"
-  resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
 next-tick@1, next-tick@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
+  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
   integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
 
 node-int64@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
-node-releases@^2.0.13:
-  version "2.0.13"
-  resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
-  integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
+node-releases@^2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
+  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
   version "2.5.0"
-  resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
   dependencies:
     hosted-git-info "^2.1.4"
@@ -5377,7 +5466,7 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0:
 
 normalize-package-data@^3.0.2:
   version "3.0.3"
-  resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
   integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
   dependencies:
     hosted-git-info "^4.0.1"
@@ -5387,43 +5476,43 @@ normalize-package-data@^3.0.2:
 
 normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==
   dependencies:
     remove-trailing-separator "^1.0.1"
 
 normalize-path@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
 now-and-later@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c"
+  resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c"
   integrity sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==
   dependencies:
     once "^1.3.2"
 
 npm-run-path@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
   integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
   dependencies:
     path-key "^3.0.0"
 
 number-is-nan@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
 
 object-assign@4.X, object-assign@^4.0.1:
   version "4.1.1"
-  resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 object-copy@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
   integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==
   dependencies:
     copy-descriptor "^0.1.0"
@@ -5432,29 +5521,29 @@ object-copy@^0.1.0:
 
 object-keys@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-visit@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
   integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==
   dependencies:
     isobject "^3.0.0"
 
 object.assign@^4.0.4, object.assign@^4.1.0:
-  version "4.1.4"
-  resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
-  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0"
+  integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
+    call-bind "^1.0.5"
+    define-properties "^1.2.1"
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
 object.defaults@^1.0.0, object.defaults@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
+  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
   integrity sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==
   dependencies:
     array-each "^1.0.1"
@@ -5464,7 +5553,7 @@ object.defaults@^1.0.0, object.defaults@^1.1.0:
 
 object.map@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
+  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
   integrity sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==
   dependencies:
     for-own "^1.0.0"
@@ -5472,14 +5561,14 @@ object.map@^1.0.0:
 
 object.pick@^1.2.0, object.pick@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
   integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==
   dependencies:
     isobject "^3.0.1"
 
 object.reduce@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz#6fe348f2ac7fa0f95ca621226599096825bb03ad"
+  resolved "https://registry.yarnpkg.com/object.reduce/-/object.reduce-1.0.1.tgz#6fe348f2ac7fa0f95ca621226599096825bb03ad"
   integrity sha512-naLhxxpUESbNkRqc35oQ2scZSJueHGQNUfMW/0U37IgN6tE2dgDWg3whf+NEliy3F/QysrO48XKUz/nGPe+AQw==
   dependencies:
     for-own "^1.0.0"
@@ -5487,21 +5576,21 @@ object.reduce@^1.0.0:
 
 once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
 onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
-  resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
 opener@^1.5.2:
   version "1.5.2"
-  resolved "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
+  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
   integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
 
 optionator@^0.9.3:
@@ -5518,68 +5607,68 @@ optionator@^0.9.3:
 
 ordered-read-streams@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e"
+  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e"
   integrity sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==
   dependencies:
     readable-stream "^2.0.1"
 
 os-locale@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
   integrity sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==
   dependencies:
     lcid "^1.0.0"
 
 p-limit@^2.2.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
 p-limit@^3.0.2, p-limit@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
   dependencies:
     yocto-queue "^0.1.0"
 
 p-locate@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
   integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
   dependencies:
     p-limit "^2.2.0"
 
 p-locate@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
   integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
   dependencies:
     p-limit "^3.0.2"
 
 p-map@^5.5.0:
   version "5.5.0"
-  resolved "https://registry.npmjs.org/p-map/-/p-map-5.5.0.tgz#054ca8ca778dfa4cf3f8db6638ccb5b937266715"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-5.5.0.tgz#054ca8ca778dfa4cf3f8db6638ccb5b937266715"
   integrity sha512-VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg==
   dependencies:
     aggregate-error "^4.0.0"
 
 p-try@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 parent-module@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
   integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
   dependencies:
     callsites "^3.0.0"
 
 parse-filepath@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
+  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
   integrity sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==
   dependencies:
     is-absolute "^1.0.0"
@@ -5588,14 +5677,14 @@ parse-filepath@^1.0.1:
 
 parse-json@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
   integrity sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==
   dependencies:
     error-ex "^1.2.0"
 
 parse-json@^5.0.0, parse-json@^5.2.0:
   version "5.2.0"
-  resolved "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
@@ -5605,74 +5694,74 @@ parse-json@^5.0.0, parse-json@^5.2.0:
 
 parse-node-version@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
+  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
   integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
 
 parse-passwd@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
 
 pascalcase@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
   integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==
 
 path-dirname@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
   integrity sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==
 
 path-exists@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
   integrity sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.7:
   version "1.0.7"
-  resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-root-regex@^0.1.0:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
   integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==
 
 path-root@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
   integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==
   dependencies:
     path-root-regex "^0.1.0"
 
-path-scurry@^1.10.1:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698"
-  integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==
+path-scurry@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
+  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
   dependencies:
-    lru-cache "^9.1.1 || ^10.0.0"
+    lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
 
 path-type@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
   integrity sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==
   dependencies:
     graceful-fs "^4.1.2"
@@ -5681,61 +5770,61 @@ path-type@^1.0.0:
 
 path-type@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
 picocolors@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
   integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
 
 picocolors@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
 picomatch@^2.0.4, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
-  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
 pify@^2.0.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
   integrity sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
-  resolved "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==
 
 pirates@^4.0.4:
   version "4.0.6"
-  resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
   integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
 
 pkg-dir@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
   dependencies:
     find-up "^4.0.0"
 
 platform@^1.3.3:
   version "1.3.6"
-  resolved "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7"
+  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7"
   integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==
 
 plugin-error@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
+  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
   integrity sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==
   dependencies:
     ansi-colors "^1.0.1"
@@ -5745,24 +5834,24 @@ plugin-error@^1.0.1:
 
 plugin-error@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/plugin-error/-/plugin-error-2.0.1.tgz#f2ac92bac8c85e3e23492d76d0c3ca12f30eb00b"
+  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-2.0.1.tgz#f2ac92bac8c85e3e23492d76d0c3ca12f30eb00b"
   integrity sha512-zMakqvIDyY40xHOvzXka0kUvf40nYIuwRE8dWhti2WtjQZ31xAgBZBhxsK7vK3QbRXS1Xms/LO7B5cuAsfB2Gg==
   dependencies:
     ansi-colors "^1.0.1"
 
 pluralize@^8.0.0:
   version "8.0.0"
-  resolved "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"
   integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
 
 postcss@^7.0.16:
   version "7.0.39"
-  resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
   integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
   dependencies:
     picocolors "^0.2.1"
@@ -5770,12 +5859,12 @@ postcss@^7.0.16:
 
 prelude-ls@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
 pretty-format@^29.0.0, pretty-format@^29.7.0:
   version "29.7.0"
-  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.7.0.tgz#ca42c758310f365bfa71a0bda0a807160b776812"
   integrity sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==
   dependencies:
     "@jest/schemas" "^29.6.3"
@@ -5784,24 +5873,17 @@ pretty-format@^29.0.0, pretty-format@^29.7.0:
 
 pretty-hrtime@^1.0.0:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
+  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
   integrity sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==
 
 process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
-promise@^8.0.1:
-  version "8.3.0"
-  resolved "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz#8cb333d1edeb61ef23869fbb8a4ea0279ab60e0a"
-  integrity sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==
-  dependencies:
-    asap "~2.0.6"
-
 prompts@^2.0.1:
   version "2.4.2"
-  resolved "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
+  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
   integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
   dependencies:
     kleur "^3.0.3"
@@ -5809,12 +5891,12 @@ prompts@^2.0.1:
 
 prr@~1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
   integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
 
 pump@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
   integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
   dependencies:
     end-of-stream "^1.1.0"
@@ -5822,53 +5904,58 @@ pump@^2.0.0:
 
 pumpify@^1.3.5:
   version "1.5.1"
-  resolved "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
   integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
   dependencies:
     duplexify "^3.6.0"
     inherits "^2.0.3"
     pump "^2.0.0"
 
+punycode.js@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode.js/-/punycode.js-2.3.1.tgz#6b53e56ad75588234e79f4affa90972c7dd8cdb7"
+  integrity sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==
+
 punycode@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
-  integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
 pure-rand@^6.0.0:
-  version "6.0.3"
-  resolved "https://registry.npmjs.org/pure-rand/-/pure-rand-6.0.3.tgz#3c9e6b53c09e52ac3cedffc85ab7c1c7094b38cb"
-  integrity sha512-KddyFewCsO0j3+np81IQ+SweXLDnDQTs5s67BOnrYmYe/yNmUhttQyGsYzy8yUnoljGAQ9sl38YB4vH8ur7Y+w==
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.1.0.tgz#d173cf23258231976ccbdb05247c9787957604f2"
+  integrity sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==
 
 queue-microtask@^1.2.2:
   version "1.2.3"
-  resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
 queue-tick@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz#f6f07ac82c1fd60f82e098b417a80e52f1f4c142"
+  resolved "https://registry.yarnpkg.com/queue-tick/-/queue-tick-1.0.1.tgz#f6f07ac82c1fd60f82e098b417a80e52f1f4c142"
   integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==
 
 quick-lru@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
   integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
 
 randombytes@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
   integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
   dependencies:
     safe-buffer "^5.1.0"
 
 react-is@^18.0.0:
   version "18.2.0"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
   integrity sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==
   dependencies:
     find-up "^1.0.0"
@@ -5876,7 +5963,7 @@ read-pkg-up@^1.0.1:
 
 read-pkg-up@^7.0.1:
   version "7.0.1"
-  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
   integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
   dependencies:
     find-up "^4.1.0"
@@ -5885,7 +5972,7 @@ read-pkg-up@^7.0.1:
 
 read-pkg-up@^8.0.0:
   version "8.0.0"
-  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-8.0.0.tgz#72f595b65e66110f43b052dd9af4de6b10534670"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-8.0.0.tgz#72f595b65e66110f43b052dd9af4de6b10534670"
   integrity sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==
   dependencies:
     find-up "^5.0.0"
@@ -5894,7 +5981,7 @@ read-pkg-up@^8.0.0:
 
 read-pkg@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
   integrity sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==
   dependencies:
     load-json-file "^1.0.0"
@@ -5903,7 +5990,7 @@ read-pkg@^1.0.0:
 
 read-pkg@^5.2.0:
   version "5.2.0"
-  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
   integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
   dependencies:
     "@types/normalize-package-data" "^2.4.0"
@@ -5913,7 +6000,7 @@ read-pkg@^5.2.0:
 
 read-pkg@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-6.0.0.tgz#a67a7d6a1c2b0c3cd6aa2ea521f40c458a4a504c"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-6.0.0.tgz#a67a7d6a1c2b0c3cd6aa2ea521f40c458a4a504c"
   integrity sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==
   dependencies:
     "@types/normalize-package-data" "^2.4.0"
@@ -5923,7 +6010,7 @@ read-pkg@^6.0.0:
 
 "readable-stream@2 || 3", readable-stream@3, readable-stream@^3.6.0:
   version "3.6.2"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
   integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
   dependencies:
     inherits "^2.0.3"
@@ -5932,7 +6019,7 @@ read-pkg@^6.0.0:
 
 readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.8"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
   integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
   dependencies:
     core-util-is "~1.0.0"
@@ -5945,7 +6032,7 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable
 
 readdirp@^2.2.1:
   version "2.2.1"
-  resolved "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
   integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
   dependencies:
     graceful-fs "^4.1.11"
@@ -5954,14 +6041,14 @@ readdirp@^2.2.1:
 
 rechoir@^0.6.2:
   version "0.6.2"
-  resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
   integrity sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==
   dependencies:
     resolve "^1.1.6"
 
 redent@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/redent/-/redent-4.0.0.tgz#0c0ba7caabb24257ab3bb7a4fd95dd1d5c5681f9"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-4.0.0.tgz#0c0ba7caabb24257ab3bb7a4fd95dd1d5c5681f9"
   integrity sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==
   dependencies:
     indent-string "^5.0.0"
@@ -5974,7 +6061,7 @@ regenerator-runtime@0.14.1:
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
   integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
@@ -5987,14 +6074,14 @@ regexp-tree@^0.1.27:
 
 regjsparser@^0.10.0:
   version "0.10.0"
-  resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.10.0.tgz#b1ed26051736b436f22fdec1c8f72635f9f44892"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.10.0.tgz#b1ed26051736b436f22fdec1c8f72635f9f44892"
   integrity sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==
   dependencies:
     jsesc "~0.5.0"
 
 remove-bom-buffer@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53"
+  resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53"
   integrity sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==
   dependencies:
     is-buffer "^1.1.5"
@@ -6002,7 +6089,7 @@ remove-bom-buffer@^3.0.0:
 
 remove-bom-stream@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523"
+  resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523"
   integrity sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA==
   dependencies:
     remove-bom-buffer "^3.0.0"
@@ -6011,32 +6098,32 @@ remove-bom-stream@^1.2.0:
 
 remove-trailing-separator@^1.0.1, remove-trailing-separator@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
   integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
 
 repeat-element@^1.1.2:
   version "1.1.4"
-  resolved "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
   integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
 
 repeat-string@^1.6.1:
   version "1.6.1"
-  resolved "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
 replace-ext@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
   integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
 
 replace-ext@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz#9471c213d22e1bcc26717cd6e50881d88f812b06"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-2.0.0.tgz#9471c213d22e1bcc26717cd6e50881d88f812b06"
   integrity sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==
 
 replace-homedir@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz#e87f6d513b928dde808260c12be7fec6ff6e798c"
+  resolved "https://registry.yarnpkg.com/replace-homedir/-/replace-homedir-1.0.0.tgz#e87f6d513b928dde808260c12be7fec6ff6e798c"
   integrity sha512-CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg==
   dependencies:
     homedir-polyfill "^1.0.1"
@@ -6045,7 +6132,7 @@ replace-homedir@^1.0.0:
 
 replacestream@^4.0.3:
   version "4.0.3"
-  resolved "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz#3ee5798092be364b1cdb1484308492cb3dff2f36"
+  resolved "https://registry.yarnpkg.com/replacestream/-/replacestream-4.0.3.tgz#3ee5798092be364b1cdb1484308492cb3dff2f36"
   integrity sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==
   dependencies:
     escape-string-regexp "^1.0.3"
@@ -6054,24 +6141,24 @@ replacestream@^4.0.3:
 
 require-directory@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
 require-main-filename@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
   integrity sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==
 
 resolve-cwd@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
   integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
   dependencies:
     resolve-from "^5.0.0"
 
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
   integrity sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==
   dependencies:
     expand-tilde "^2.0.0"
@@ -6079,35 +6166,35 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
 
 resolve-from@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
 resolve-from@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
 resolve-options@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131"
+  resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131"
   integrity sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A==
   dependencies:
     value-or-function "^3.0.0"
 
 resolve-url@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
 
 resolve.exports@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
+  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
   integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==
 
 resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.4.0:
-  version "1.22.4"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34"
-  integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
   dependencies:
     is-core-module "^2.13.0"
     path-parse "^1.0.7"
@@ -6115,7 +6202,7 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.
 
 restore-cursor@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
   integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
   dependencies:
     onetime "^5.1.0"
@@ -6123,79 +6210,85 @@ restore-cursor@^3.1.0:
 
 ret@~0.1.10:
   version "0.1.15"
-  resolved "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 reusify@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
 rimraf@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   dependencies:
     glob "^7.1.3"
 
-rollup@4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.3.0.tgz#198e6ae4355899db630d75bc0e17b53f5d0fc20e"
-  integrity sha512-scIi1NrKLDIYSPK66jjECtII7vIgdAMFmFo8h6qm++I6nN9qDSV35Ku6erzGVqYjx+lj+j5wkusRMr++8SyDZg==
+rollup@4.18.0:
+  version "4.18.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.18.0.tgz#497f60f0c5308e4602cf41136339fbf87d5f5dda"
+  integrity sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==
+  dependencies:
+    "@types/estree" "1.0.5"
   optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.3.0"
-    "@rollup/rollup-android-arm64" "4.3.0"
-    "@rollup/rollup-darwin-arm64" "4.3.0"
-    "@rollup/rollup-darwin-x64" "4.3.0"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.3.0"
-    "@rollup/rollup-linux-arm64-gnu" "4.3.0"
-    "@rollup/rollup-linux-arm64-musl" "4.3.0"
-    "@rollup/rollup-linux-x64-gnu" "4.3.0"
-    "@rollup/rollup-linux-x64-musl" "4.3.0"
-    "@rollup/rollup-win32-arm64-msvc" "4.3.0"
-    "@rollup/rollup-win32-ia32-msvc" "4.3.0"
-    "@rollup/rollup-win32-x64-msvc" "4.3.0"
+    "@rollup/rollup-android-arm-eabi" "4.18.0"
+    "@rollup/rollup-android-arm64" "4.18.0"
+    "@rollup/rollup-darwin-arm64" "4.18.0"
+    "@rollup/rollup-darwin-x64" "4.18.0"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.18.0"
+    "@rollup/rollup-linux-arm-musleabihf" "4.18.0"
+    "@rollup/rollup-linux-arm64-gnu" "4.18.0"
+    "@rollup/rollup-linux-arm64-musl" "4.18.0"
+    "@rollup/rollup-linux-powerpc64le-gnu" "4.18.0"
+    "@rollup/rollup-linux-riscv64-gnu" "4.18.0"
+    "@rollup/rollup-linux-s390x-gnu" "4.18.0"
+    "@rollup/rollup-linux-x64-gnu" "4.18.0"
+    "@rollup/rollup-linux-x64-musl" "4.18.0"
+    "@rollup/rollup-win32-arm64-msvc" "4.18.0"
+    "@rollup/rollup-win32-ia32-msvc" "4.18.0"
+    "@rollup/rollup-win32-x64-msvc" "4.18.0"
     fsevents "~2.3.2"
 
 run-parallel@^1.1.9:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
   integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
   dependencies:
     queue-microtask "^1.2.2"
 
 rxjs@7.8.1:
   version "7.8.1"
-  resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
   integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
   dependencies:
     tslib "^2.1.0"
 
 safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.2.0:
   version "5.2.1"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-regex@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
   integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==
   dependencies:
     ret "~0.1.10"
 
 sax@>=0.6.0:
-  version "1.2.4"
-  resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0"
+  integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==
 
-schema-utils@^3.1.1, schema-utils@^3.1.2:
+schema-utils@^3.1.1, schema-utils@^3.2.0:
   version "3.3.0"
-  resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
   integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
   dependencies:
     "@types/json-schema" "^7.0.8"
@@ -6204,43 +6297,53 @@ schema-utils@^3.1.1, schema-utils@^3.1.2:
 
 semver-greatest-satisfied-range@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz#13e8c2658ab9691cb0cd71093240280d36f77a5b"
+  resolved "https://registry.yarnpkg.com/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz#13e8c2658ab9691cb0cd71093240280d36f77a5b"
   integrity sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ==
   dependencies:
     sver-compat "^1.5.0"
 
 "semver@2 || 3 || 4 || 5":
   version "5.7.2"
-  resolved "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
 semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.4, semver@^7.3.7, semver@^7.5.3, semver@^7.5.4:
-  version "7.5.4"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
-  dependencies:
-    lru-cache "^6.0.0"
+semver@^7.3.4, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.1:
+  version "7.6.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
+  integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
 
 serialize-javascript@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c"
-  integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
+  integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
   dependencies:
     randombytes "^2.1.0"
 
 set-blocking@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
+set-function-length@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
+  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
+  dependencies:
+    define-data-property "^1.1.4"
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.4"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.2"
+
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
   integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
   dependencies:
     extend-shallow "^2.0.1"
@@ -6250,63 +6353,60 @@ set-value@^2.0.0, set-value@^2.0.1:
 
 shebang-command@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
   integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
   dependencies:
     shebang-regex "^3.0.0"
 
 shebang-regex@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shiki@^0.14.1:
-  version "0.14.4"
-  resolved "https://registry.npmjs.org/shiki/-/shiki-0.14.4.tgz#2454969b466a5f75067d0f2fa0d7426d32881b20"
-  integrity sha512-IXCRip2IQzKwxArNNq1S+On4KPML3Yyn8Zzs/xRgcgOWIr8ntIK3IKzjFPfjy/7kt9ZMjc+FItfqHRBg8b6tNQ==
+shiki@^1.9.1:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/shiki/-/shiki-1.10.0.tgz#304ab080a12458abc78eb0cb83eb0f7ace546215"
+  integrity sha512-YD2sXQ+TMD/F9BimV9Jn0wj35pqOvywvOG/3PB6hGHyGKlM7TJ9tyJ02jOb2kF8F0HfJwKNYrh3sW7jEcuRlXA==
   dependencies:
-    ansi-sequence-parser "^1.1.0"
-    jsonc-parser "^3.2.0"
-    vscode-oniguruma "^1.7.0"
-    vscode-textmate "^8.0.0"
+    "@shikijs/core" "1.10.0"
 
 signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
-  resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
 signal-exit@^4.0.1:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
   integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
 sirv@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/sirv/-/sirv-2.0.3.tgz#ca5868b87205a74bef62a469ed0296abceccd446"
-  integrity sha512-O9jm9BsID1P+0HOi81VpXPoDxYP374pkOLzACAoyUQ/3OUVndNpsz6wMnY2z+yOxzbllCKZrM+9QrWsv4THnyA==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/sirv/-/sirv-2.0.4.tgz#5dd9a725c578e34e449f332703eb2a74e46a29b0"
+  integrity sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==
   dependencies:
-    "@polka/url" "^1.0.0-next.20"
-    mrmime "^1.0.0"
+    "@polka/url" "^1.0.0-next.24"
+    mrmime "^2.0.0"
     totalist "^3.0.0"
 
 sisteransi@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
+  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
   integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
 
 slash@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
 slash@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
   integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
 
 slice-ansi@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
   integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
   dependencies:
     ansi-styles "^4.0.0"
@@ -6315,7 +6415,7 @@ slice-ansi@^4.0.0:
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
   integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
@@ -6324,14 +6424,14 @@ snapdragon-node@^2.0.1:
 
 snapdragon-util@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
   integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
-  resolved "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
   integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
@@ -6343,9 +6443,16 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
+sonic-forest@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/sonic-forest/-/sonic-forest-1.0.2.tgz#d80aa621d1cffe75a606ca44789ccff30f5b9ce6"
+  integrity sha512-2rICdwIJi5kVlehMUVtJeHn3ohh5YZV4pDv0P0c1M11cRz/gXNViItpM94HQwfvnXuzybpqK0LZJgTa3lEwtAw==
+  dependencies:
+    tree-dump "^1.0.0"
+
 source-map-resolve@^0.5.0:
   version "0.5.3"
-  resolved "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
   integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
   dependencies:
     atob "^2.1.2"
@@ -6356,7 +6463,7 @@ source-map-resolve@^0.5.0:
 
 source-map-resolve@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
   integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==
   dependencies:
     atob "^2.1.2"
@@ -6364,7 +6471,7 @@ source-map-resolve@^0.6.0:
 
 source-map-support@0.5.13:
   version "0.5.13"
-  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
   integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
   dependencies:
     buffer-from "^1.0.0"
@@ -6372,7 +6479,7 @@ source-map-support@0.5.13:
 
 source-map-support@~0.5.20:
   version "0.5.21"
-  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
   dependencies:
     buffer-from "^1.0.0"
@@ -6380,82 +6487,82 @@ source-map-support@~0.5.20:
 
 source-map-url@^0.4.0:
   version "0.4.1"
-  resolved "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
   integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
 source-map@^0.5.1, source-map@^0.5.6:
   version "0.5.7"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
 source-map@^0.6.0, source-map@^0.6.1:
   version "0.6.1"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 source-map@^0.7.3:
   version "0.7.4"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
   integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
 
 sparkles@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
+  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
   integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
 
 spdx-correct@^3.0.0:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c"
   integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz#5d607d27fc806f66d7b64a766650fa890f04ed66"
+  integrity sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
   integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.13"
-  resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz#7189a474c46f8d47c7b0da4b987bb45e908bd2d5"
-  integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz#887da8aa73218e51a1d917502d79863161a93f9c"
+  integrity sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
   integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
 sprintf-js@~1.0.2:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
 stack-trace@0.0.10:
   version "0.0.10"
-  resolved "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
+  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
   integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==
 
 stack-utils@^2.0.3:
   version "2.0.6"
-  resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
   integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
   dependencies:
     escape-string-regexp "^2.0.0"
 
 static-extend@^0.1.1:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
   integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==
   dependencies:
     define-property "^0.2.5"
@@ -6463,38 +6570,40 @@ static-extend@^0.1.1:
 
 stream-exhaust@^1.0.1, stream-exhaust@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d"
+  resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d"
   integrity sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==
 
 stream-read-all@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/stream-read-all/-/stream-read-all-3.0.1.tgz#60762ae45e61d93ba0978cda7f3913790052ad96"
+  resolved "https://registry.yarnpkg.com/stream-read-all/-/stream-read-all-3.0.1.tgz#60762ae45e61d93ba0978cda7f3913790052ad96"
   integrity sha512-EWZT9XOceBPlVJRrYcykW8jyRSZYbkb/0ZK36uLEmoWVO5gxBOnntNTseNzfREsqxqdfEGQrD8SXQ3QWbBmq8A==
 
 stream-shift@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
-  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.3.tgz#85b8fab4d71010fc3ba8772e8046cc49b8a3864b"
+  integrity sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==
 
 streamx@^2.12.5:
-  version "2.15.1"
-  resolved "https://registry.npmjs.org/streamx/-/streamx-2.15.1.tgz#396ad286d8bc3eeef8f5cea3f029e81237c024c6"
-  integrity sha512-fQMzy2O/Q47rgwErk/eGeLu/roaFWV0jVsogDmrszM9uIw8L5OA+t+V93MgYlufNptfjmYR1tOMWhei/Eh7TQA==
+  version "2.16.1"
+  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.16.1.tgz#2b311bd34832f08aa6bb4d6a80297c9caef89614"
+  integrity sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ==
   dependencies:
     fast-fifo "^1.1.0"
     queue-tick "^1.0.1"
+  optionalDependencies:
+    bare-events "^2.2.0"
 
 string-length@^4.0.1:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
+  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
   integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
   dependencies:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
@@ -6503,16 +6612,25 @@ string-length@^4.0.1:
 
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
   integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^5.0.1, string-width@^5.1.2:
   version "5.1.2"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
   integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
   dependencies:
     eastasianwidth "^0.2.0"
@@ -6521,109 +6639,116 @@ string-width@^5.0.1, string-width@^5.1.2:
 
 string_decoder@^1.1.1:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
   integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
   dependencies:
     safe-buffer "~5.2.0"
 
 string_decoder@~1.1.1:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
   integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
     ansi-regex "^5.0.1"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
   integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
   dependencies:
     ansi-regex "^2.0.0"
 
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1:
   version "7.1.0"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
   integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
   dependencies:
     ansi-regex "^6.0.1"
 
 strip-bom-string@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92"
+  resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92"
   integrity sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==
 
 strip-bom@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
   integrity sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==
   dependencies:
     is-utf8 "^0.2.0"
 
 strip-bom@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
   integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
 
 strip-final-newline@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
 strip-indent@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
   integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
   dependencies:
     min-indent "^1.0.0"
 
 strip-indent@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-4.0.0.tgz#b41379433dd06f5eae805e21d631e07ee670d853"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-4.0.0.tgz#b41379433dd06f5eae805e21d631e07ee670d853"
   integrity sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==
   dependencies:
     min-indent "^1.0.1"
 
 strip-json-comments@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
 supports-color@^5.3.0:
   version "5.5.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
 supports-color@^7.1.0:
   version "7.2.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
 supports-color@^8.0.0, supports-color@^8.1.1:
   version "8.1.1"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
   dependencies:
     has-flag "^4.0.0"
 
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
 sver-compat@^1.5.0:
   version "1.5.0"
-  resolved "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz#3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"
+  resolved "https://registry.yarnpkg.com/sver-compat/-/sver-compat-1.5.0.tgz#3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"
   integrity sha512-aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg==
   dependencies:
     es6-iterator "^2.0.1"
@@ -6631,7 +6756,7 @@ sver-compat@^1.5.0:
 
 table-layout@^3.0.0:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/table-layout/-/table-layout-3.0.2.tgz#69c2be44388a5139b48c59cf21e73b488021769a"
+  resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-3.0.2.tgz#69c2be44388a5139b48c59cf21e73b488021769a"
   integrity sha512-rpyNZYRw+/C+dYkcQ3Pr+rLxW4CfHpXjPDnG7lYhdRoUcZTUt+KEsX+94RGp/aVp/MQU35JCITv2T/beY4m+hw==
   dependencies:
     "@75lb/deep-merge" "^1.1.1"
@@ -6644,31 +6769,31 @@ table-layout@^3.0.0:
 
 tapable@^2.1.1, tapable@^2.2.0:
   version "2.2.1"
-  resolved "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
 teex@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz#b8fa7245ef8e8effa8078281946c85ab780a0b12"
+  resolved "https://registry.yarnpkg.com/teex/-/teex-1.0.1.tgz#b8fa7245ef8e8effa8078281946c85ab780a0b12"
   integrity sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==
   dependencies:
     streamx "^2.12.5"
 
-terser-webpack-plugin@^5.3.7:
-  version "5.3.9"
-  resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1"
-  integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==
+terser-webpack-plugin@^5.3.10:
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199"
+  integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.17"
+    "@jridgewell/trace-mapping" "^0.3.20"
     jest-worker "^27.4.5"
     schema-utils "^3.1.1"
     serialize-javascript "^6.0.1"
-    terser "^5.16.8"
+    terser "^5.26.0"
 
-terser@^5.16.8, terser@^5.9.0:
-  version "5.19.4"
-  resolved "https://registry.npmjs.org/terser/-/terser-5.19.4.tgz#941426fa482bf9b40a0308ab2b3cd0cf7c775ebd"
-  integrity sha512-6p1DjHeuluwxDXcuT9VR8p64klWJKo1ILiy19s6C9+0Bh2+NWTX6nD9EPppiER4ICkHDVB1RkVpin/YW2nQn/g==
+terser@^5.26.0, terser@^5.9.0:
+  version "5.30.3"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.30.3.tgz#f1bb68ded42408c316b548e3ec2526d7dd03f4d2"
+  integrity sha512-STdUgOUx8rLbMGO9IOwHLpCqolkDITFFQSMYYwKE1N2lY6MVSaeoi10z/EhWxRc6ybqoVmKSkhKYH/XUpl7vSA==
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
     acorn "^8.8.2"
@@ -6677,7 +6802,7 @@ terser@^5.16.8, terser@^5.9.0:
 
 test-exclude@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
   integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
   dependencies:
     "@istanbuljs/schema" "^0.1.2"
@@ -6686,22 +6811,22 @@ test-exclude@^6.0.0:
 
 text-table@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
 textextensions@^3.2.0:
   version "3.3.0"
-  resolved "https://registry.npmjs.org/textextensions/-/textextensions-3.3.0.tgz#03530d5287b86773c08b77458589148870cc71d3"
+  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-3.3.0.tgz#03530d5287b86773c08b77458589148870cc71d3"
   integrity sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==
 
-thingies@^1.11.1:
-  version "1.12.0"
-  resolved "https://registry.npmjs.org/thingies/-/thingies-1.12.0.tgz#a815c224482d607aa70f563d3cbb351a338e4710"
-  integrity sha512-AiGqfYC1jLmJagbzQGuoZRM48JPsr9yB734a7K6wzr34NMhjUPrWSQrkF7ZBybf3yCerCL2Gcr02kMv4NmaZfA==
+thingies@^1.20.0:
+  version "1.21.0"
+  resolved "https://registry.yarnpkg.com/thingies/-/thingies-1.21.0.tgz#e80fbe58fd6fdaaab8fad9b67bd0a5c943c445c1"
+  integrity sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g==
 
 through2-filter@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
+  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
   integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
   dependencies:
     through2 "~2.0.0"
@@ -6709,7 +6834,7 @@ through2-filter@^3.0.0:
 
 through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
   version "2.0.5"
-  resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
   dependencies:
     readable-stream "~2.3.6"
@@ -6717,7 +6842,7 @@ through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
 
 through2@^3.0.0, through2@^3.0.1:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
   integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==
   dependencies:
     inherits "^2.0.4"
@@ -6725,24 +6850,24 @@ through2@^3.0.0, through2@^3.0.1:
 
 through2@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
   integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==
   dependencies:
     readable-stream "3"
 
 through@^2.3.6, through@^2.3.8:
   version "2.3.8"
-  resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
 time-stamp@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
+  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
   integrity sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==
 
 timers-ext@^0.1.7:
   version "0.1.7"
-  resolved "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
+  resolved "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz#6f57ad8578e07a3fb9f91d9387d65647555e25c6"
   integrity sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==
   dependencies:
     es5-ext "~0.10.46"
@@ -6750,12 +6875,12 @@ timers-ext@^0.1.7:
 
 tmpl@1.0.5:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
   integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
 to-absolute-glob@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b"
+  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b"
   integrity sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==
   dependencies:
     is-absolute "^1.0.0"
@@ -6763,19 +6888,19 @@ to-absolute-glob@^2.0.0:
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
 to-object-path@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
   integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
   integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==
   dependencies:
     is-number "^3.0.0"
@@ -6783,14 +6908,14 @@ to-regex-range@^2.1.0:
 
 to-regex-range@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
   integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
   dependencies:
     is-number "^7.0.0"
 
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
   integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
@@ -6800,25 +6925,35 @@ to-regex@^3.0.1, to-regex@^3.0.2:
 
 to-through@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6"
+  resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6"
   integrity sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q==
   dependencies:
     through2 "^2.0.3"
 
 totalist@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
+  resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
   integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
 
+tree-dump@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tree-dump/-/tree-dump-1.0.1.tgz#b448758da7495580e6b7830d6b7834fca4c45b96"
+  integrity sha512-WCkcRBVPSlHHq1dc/px9iOfqklvzCbdRwvlNfxGZsrHqf6aZttfPrd7DJTt6oR10dwUfpFFQeVTkPbBIZxX/YA==
+
 trim-newlines@^4.0.2:
   version "4.1.1"
-  resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.1.1.tgz#28c88deb50ed10c7ba6dc2474421904a00139125"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.1.1.tgz#28c88deb50ed10c7ba6dc2474421904a00139125"
   integrity sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==
 
-ts-jest@29.1.1:
-  version "29.1.1"
-  resolved "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.1.tgz#f58fe62c63caf7bfcc5cc6472082f79180f0815b"
-  integrity sha512-D6xjnnbP17cC85nliwGiL+tpoKN0StpgE0TeOjXQTU6MVCfsB4v7aW05CgQ/1OywGb0x/oy9hHFnN+sczTiRaA==
+ts-api-utils@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
+  integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
+
+ts-jest@29.1.4:
+  version "29.1.4"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.4.tgz#26f8a55ce31e4d2ef7a1fd47dc7fa127e92793ef"
+  integrity sha512-YiHwDhSvCiItoAgsKtoLFCuakDzDsJ1DLDnSouTaTmdOcOwIkSzbLXduaQ6M5DRVhuZC/NYaaZ/mtHbWMv/S6Q==
   dependencies:
     bs-logger "0.x"
     fast-json-stable-stringify "2.x"
@@ -6829,10 +6964,10 @@ ts-jest@29.1.1:
     semver "^7.5.3"
     yargs-parser "^21.0.1"
 
-ts-node@10.9.1:
-  version "10.9.1"
-  resolved "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
-  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
+ts-node@10.9.2:
+  version "10.9.2"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
+  integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
   dependencies:
     "@cspotcode/source-map-support" "^0.8.0"
     "@tsconfig/node10" "^1.0.7"
@@ -6848,113 +6983,102 @@ ts-node@10.9.1:
     v8-compile-cache-lib "^3.0.1"
     yn "3.1.1"
 
-tslib@^1.8.1:
-  version "1.14.1"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
-tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0, tslib@^2.6.2:
-  version "2.6.2"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
-  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
-
-tsutils@^3.21.0:
-  version "3.21.0"
-  resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
-  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
-  dependencies:
-    tslib "^1.8.1"
+tslib@^2.0.0, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.6.2:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
+  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
 
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
-  resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
   integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
   dependencies:
     prelude-ls "^1.2.1"
 
 type-detect@4.0.8:
   version "4.0.8"
-  resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
 type-fest@^0.20.2:
   version "0.20.2"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
 type-fest@^0.21.3:
   version "0.21.3"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
 type-fest@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
   integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
 
 type-fest@^0.8.1:
   version "0.8.1"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
 type-fest@^1.0.1, type-fest@^1.2.1, type-fest@^1.2.2:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
   integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
 
-type@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
-  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
-
 type@^2.7.2:
   version "2.7.2"
-  resolved "https://registry.npmjs.org/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
   integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
 
 typedarray@^0.0.6:
   version "0.0.6"
-  resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-typedoc@0.24.8:
-  version "0.24.8"
-  resolved "https://registry.npmjs.org/typedoc/-/typedoc-0.24.8.tgz#cce9f47ba6a8d52389f5e583716a2b3b4335b63e"
-  integrity sha512-ahJ6Cpcvxwaxfu4KtjA8qZNqS43wYt6JL27wYiIgl1vd38WW/KWX11YuAeZhuz9v+ttrutSsgK+XO1CjL1kA3w==
+typedoc@0.26.3:
+  version "0.26.3"
+  resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.26.3.tgz#723b2c4ca5dd1d9baf43d6a5a1f4d640ba4207a8"
+  integrity sha512-6d2Sw9disvvpdk4K7VNjKr5/3hzijtfQVHRthhDqJgnhMHy1wQz4yPMJVKXElvnZhFr0nkzo+GzjXDTRV5yLpg==
   dependencies:
     lunr "^2.3.9"
-    marked "^4.3.0"
-    minimatch "^9.0.0"
-    shiki "^0.14.1"
+    markdown-it "^14.1.0"
+    minimatch "^9.0.5"
+    shiki "^1.9.1"
+    yaml "^2.4.5"
 
-typescript@5.1.6:
-  version "5.1.6"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.6.tgz#02f8ac202b6dad2c0dd5e0913745b47a37998274"
-  integrity sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==
+typescript@5.4.5:
+  version "5.4.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.4.5.tgz#42ccef2c571fdbd0f6718b1d1f5e6e5ef006f611"
+  integrity sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==
 
 typical@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"
+  resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4"
   integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==
 
 typical@^7.1.1:
   version "7.1.1"
-  resolved "https://registry.npmjs.org/typical/-/typical-7.1.1.tgz#ba177ab7ab103b78534463ffa4c0c9754523ac1f"
+  resolved "https://registry.yarnpkg.com/typical/-/typical-7.1.1.tgz#ba177ab7ab103b78534463ffa4c0c9754523ac1f"
   integrity sha512-T+tKVNs6Wu7IWiAce5BgMd7OZfNYUndHwc5MknN+UHOudi7sGZzuHdCadllRuqJ3fPtgFtIH9+lt9qRv6lmpfA==
 
+uc.micro@^2.0.0, uc.micro@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-2.1.0.tgz#f8d3f7d0ec4c3dea35a7e3c8efa4cb8b45c9e7ee"
+  integrity sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==
+
 unc-path-regex@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
   integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==
 
 undertaker-registry@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50"
+  resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50"
   integrity sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw==
 
 undertaker@^1.2.1:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz#363a6e541f27954d5791d6fa3c1d321666f86d18"
+  resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-1.3.0.tgz#363a6e541f27954d5791d6fa3c1d321666f86d18"
   integrity sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==
   dependencies:
     arr-flatten "^1.0.1"
@@ -6975,7 +7099,7 @@ undici-types@~5.26.4:
 
 union-value@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
   integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
   dependencies:
     arr-union "^3.1.0"
@@ -6985,20 +7109,20 @@ union-value@^1.0.0:
 
 unique-stream@^2.0.2:
   version "2.3.1"
-  resolved "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
+  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
   integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
   dependencies:
     json-stable-stringify-without-jsonify "^1.0.1"
     through2-filter "^3.0.0"
 
 universalify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
-  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
+  integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
 
 unset-value@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
   integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==
   dependencies:
     has-value "^0.3.1"
@@ -7006,63 +7130,63 @@ unset-value@^1.0.0:
 
 upath@^1.1.1:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
 
-update-browserslist-db@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
-  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
+update-browserslist-db@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
 uri-js@^4.2.2:
   version "4.4.1"
-  resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
   integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
 urix@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
   integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==
 
 use@^3.1.0:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 v8-compile-cache-lib@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
   integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
 
 v8-to-istanbul@^9.0.1:
-  version "9.1.0"
-  resolved "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz#1b83ed4e397f58c85c266a570fc2558b5feb9265"
-  integrity sha512-6z3GW9x8G1gd+JIIgQQQxXuiJtCXeAjp6RaPEPLv62mH3iPHPxV6W3robxtCzNErRo6ZwTmzWhsbNvjyEBKzKA==
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz#2ed7644a245cddd83d4e087b9b33b3e62dfd10ad"
+  integrity sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.12"
     "@types/istanbul-lib-coverage" "^2.0.1"
-    convert-source-map "^1.6.0"
+    convert-source-map "^2.0.0"
 
 v8flags@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656"
+  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656"
   integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==
   dependencies:
     homedir-polyfill "^1.0.1"
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
-  resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
@@ -7070,12 +7194,12 @@ validate-npm-package-license@^3.0.1:
 
 value-or-function@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813"
+  resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813"
   integrity sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==
 
 vinyl-buffer@1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/vinyl-buffer/-/vinyl-buffer-1.0.1.tgz#96c1a3479b8c5392542c612029013b5b27f88bbf"
+  resolved "https://registry.yarnpkg.com/vinyl-buffer/-/vinyl-buffer-1.0.1.tgz#96c1a3479b8c5392542c612029013b5b27f88bbf"
   integrity sha512-LRBE2/g3C1hSHL2k/FynSZcVTRhEw8sb08oKGt/0hukZXwrh2m8nfy+r5yLhGEk7eFFuclhyIuPct/Bxlxk6rg==
   dependencies:
     bl "^1.2.1"
@@ -7083,7 +7207,7 @@ vinyl-buffer@1.0.1:
 
 vinyl-fs@^3.0.0, vinyl-fs@^3.0.3:
   version "3.0.3"
-  resolved "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7"
+  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7"
   integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==
   dependencies:
     fs-mkdirp-stream "^1.0.0"
@@ -7106,14 +7230,14 @@ vinyl-fs@^3.0.0, vinyl-fs@^3.0.3:
 
 vinyl-named@1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/vinyl-named/-/vinyl-named-1.1.0.tgz#94e4fe741e38db0ec303e5b3d868b297a2deab66"
+  resolved "https://registry.yarnpkg.com/vinyl-named/-/vinyl-named-1.1.0.tgz#94e4fe741e38db0ec303e5b3d868b297a2deab66"
   integrity sha512-ElYBnsSw8Y1Hz11WPw0DFmi+TBNTEBhZ9zXaHluDSIZZnkFIGCjGRBpsW5QmbMMLwv+lRpUD3VbKdJCbNpct7Q==
   dependencies:
     through "^2.3.6"
 
 vinyl-source-stream@2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/vinyl-source-stream/-/vinyl-source-stream-2.0.0.tgz#f38a5afb9dd1e93b65d550469ac6182ac4f54b8e"
+  resolved "https://registry.yarnpkg.com/vinyl-source-stream/-/vinyl-source-stream-2.0.0.tgz#f38a5afb9dd1e93b65d550469ac6182ac4f54b8e"
   integrity sha512-Y5f1wRGajOfYukhv8biIGA7iZiY8UOIc3zJ6zcUNIbRG1BVuXzBsfSfe7MUJTttVkuy64k/pGQtJdd/aIt+hbw==
   dependencies:
     through2 "^2.0.3"
@@ -7121,7 +7245,7 @@ vinyl-source-stream@2.0.0:
 
 vinyl-sourcemap@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16"
+  resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16"
   integrity sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA==
   dependencies:
     append-buffer "^1.0.2"
@@ -7134,14 +7258,14 @@ vinyl-sourcemap@^1.1.0:
 
 vinyl-sourcemaps-apply@^0.2.0, vinyl-sourcemaps-apply@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
+  resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
   integrity sha512-+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw==
   dependencies:
     source-map "^0.5.1"
 
 vinyl@2.x, vinyl@^2.0.0, vinyl@^2.1.0, vinyl@^2.2.1:
   version "2.2.1"
-  resolved "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
   integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
   dependencies:
     clone "^2.1.1"
@@ -7153,7 +7277,7 @@ vinyl@2.x, vinyl@^2.0.0, vinyl@^2.1.0, vinyl@^2.2.1:
 
 vinyl@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz#11e14732bf56e2faa98ffde5157fe6c13259ff30"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-3.0.0.tgz#11e14732bf56e2faa98ffde5157fe6c13259ff30"
   integrity sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==
   dependencies:
     clone "^2.1.2"
@@ -7162,40 +7286,30 @@ vinyl@^3.0.0:
     replace-ext "^2.0.0"
     teex "^1.0.1"
 
-vscode-oniguruma@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz#439bfad8fe71abd7798338d1cd3dc53a8beea94b"
-  integrity sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==
-
-vscode-textmate@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-8.0.0.tgz#2c7a3b1163ef0441097e0b5d6389cd5504b59e5d"
-  integrity sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==
-
 walker@^1.0.8:
   version "1.0.8"
-  resolved "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
   integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
   dependencies:
     makeerror "1.0.12"
 
-watchpack@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
-  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
+watchpack@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.1.tgz#29308f2cac150fa8e4c92f90e0ec954a9fed7fff"
+  integrity sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
 
 web-streams-polyfill@3.2.1:
   version "3.2.1"
-  resolved "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6"
+  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6"
   integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==
 
-webpack-bundle-analyzer@4.10.1:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.1.tgz#84b7473b630a7b8c21c741f81d8fe4593208b454"
-  integrity sha512-s3P7pgexgT/HTUSYgxJyn28A+99mmLq4HsJepMPzu0R8ImJc52QNqaFYW1Z2z2uIb1/J3eYgaAWVpaC+v/1aAQ==
+webpack-bundle-analyzer@4.10.2:
+  version "4.10.2"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz#633af2862c213730be3dbdf40456db171b60d5bd"
+  integrity sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==
   dependencies:
     "@discoveryjs/json-ext" "0.5.7"
     acorn "^8.0.4"
@@ -7205,7 +7319,6 @@ webpack-bundle-analyzer@4.10.1:
     escape-string-regexp "^4.0.0"
     gzip-size "^6.0.0"
     html-escaper "^2.0.2"
-    is-plain-object "^5.0.0"
     opener "^1.5.2"
     picocolors "^1.0.0"
     sirv "^2.0.3"
@@ -7213,12 +7326,12 @@ webpack-bundle-analyzer@4.10.1:
 
 webpack-sources@^3.2.3:
   version "3.2.3"
-  resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
 webpack-stream@7.0.0:
   version "7.0.0"
-  resolved "https://registry.npmjs.org/webpack-stream/-/webpack-stream-7.0.0.tgz#e6a1edb9568198499af872678e95031752d72f00"
+  resolved "https://registry.yarnpkg.com/webpack-stream/-/webpack-stream-7.0.0.tgz#e6a1edb9568198499af872678e95031752d72f00"
   integrity sha512-XoAQTHyCaYMo6TS7Atv1HYhtmBgKiVLONJbzLBl2V3eibXQ2IT/MCRM841RW/r3vToKD5ivrTJFWgd/ghoxoRg==
   dependencies:
     fancy-log "^1.3.3"
@@ -7230,64 +7343,63 @@ webpack-stream@7.0.0:
     through "^2.3.8"
     vinyl "^2.2.1"
 
-webpack@5.86.0:
-  version "5.86.0"
-  resolved "https://registry.npmjs.org/webpack/-/webpack-5.86.0.tgz#b0eb81794b62aee0b7e7eb8c5073495217d9fc6d"
-  integrity sha512-3BOvworZ8SO/D4GVP+GoRC3fVeg5MO4vzmq8TJJEkdmopxyazGDxN8ClqN12uzrZW9Tv8EED8v5VSb6Sqyi0pg==
+webpack@5.91.0:
+  version "5.91.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.91.0.tgz#ffa92c1c618d18c878f06892bbdc3373c71a01d9"
+  integrity sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
-    "@types/estree" "^1.0.0"
-    "@webassemblyjs/ast" "^1.11.5"
-    "@webassemblyjs/wasm-edit" "^1.11.5"
-    "@webassemblyjs/wasm-parser" "^1.11.5"
+    "@types/estree" "^1.0.5"
+    "@webassemblyjs/ast" "^1.12.1"
+    "@webassemblyjs/wasm-edit" "^1.12.1"
+    "@webassemblyjs/wasm-parser" "^1.12.1"
     acorn "^8.7.1"
     acorn-import-assertions "^1.9.0"
-    browserslist "^4.14.5"
+    browserslist "^4.21.10"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.14.1"
+    enhanced-resolve "^5.16.0"
     es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.9"
+    graceful-fs "^4.2.11"
     json-parse-even-better-errors "^2.3.1"
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^3.1.2"
+    schema-utils "^3.2.0"
     tapable "^2.1.1"
-    terser-webpack-plugin "^5.3.7"
-    watchpack "^2.4.0"
+    terser-webpack-plugin "^5.3.10"
+    watchpack "^2.4.1"
     webpack-sources "^3.2.3"
 
 which-module@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
   integrity sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==
 
 which@^1.2.14:
   version "1.3.1"
-  resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 which@^2.0.1:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
 wordwrapjs@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-5.1.0.tgz#4c4d20446dcc670b14fa115ef4f8fd9947af2b3a"
+  resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-5.1.0.tgz#4c4d20446dcc670b14fa115ef4f8fd9947af2b3a"
   integrity sha512-JNjcULU2e4KJwUNv6CHgI46UvDGitb6dGryHajXTDiLgg1/RiGoPSDw4kZfYnwGtEXf2ZMeIewDQgFGzkCB2Sg==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
-  name wrap-ansi-cjs
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
   dependencies:
     ansi-styles "^4.0.0"
@@ -7296,7 +7408,7 @@ wordwrapjs@^5.1.0:
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
   integrity sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==
   dependencies:
     string-width "^1.0.1"
@@ -7304,16 +7416,25 @@ wrap-ansi@^2.0.0:
 
 wrap-ansi@^6.2.0:
   version "6.2.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
   integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
   dependencies:
     ansi-styles "^4.0.0"
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
   integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
   dependencies:
     ansi-styles "^6.1.0"
@@ -7322,25 +7443,25 @@ wrap-ansi@^8.1.0:
 
 wrappy@1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 write-file-atomic@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
   integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
   dependencies:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.7"
 
 ws@^7.3.1:
-  version "7.5.9"
-  resolved "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
-  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+  version "7.5.10"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
+  integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
 xml2js@0.6.2:
   version "0.6.2"
-  resolved "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz#dd0b630083aa09c161e25a4d0901e2b2a929b499"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.6.2.tgz#dd0b630083aa09c161e25a4d0901e2b2a929b499"
   integrity sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==
   dependencies:
     sax ">=0.6.0"
@@ -7348,47 +7469,52 @@ xml2js@0.6.2:
 
 xmlbuilder@~11.0.0:
   version "11.0.1"
-  resolved "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
   integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
 
 xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^3.2.1:
   version "3.2.2"
-  resolved "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
   integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
 
 y18n@^5.0.5:
   version "5.0.8"
-  resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
 yallist@^3.0.2:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
 yallist@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
+yaml@^2.4.5:
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.4.5.tgz#60630b206dd6d84df97003d33fc1ddf6296cca5e"
+  integrity sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==
+
 yargs-parser@>=5.0.0-security.0, yargs-parser@^21.0.1, yargs-parser@^21.1.1:
   version "21.1.1"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
 yargs-parser@^20.2.9:
   version "20.2.9"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
 yargs-parser@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz#7ede329c1d8cdbbe209bd25cdb990e9b1ebbb394"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.1.tgz#7ede329c1d8cdbbe209bd25cdb990e9b1ebbb394"
   integrity sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==
   dependencies:
     camelcase "^3.0.0"
@@ -7396,7 +7522,7 @@ yargs-parser@^5.0.1:
 
 yargs@^17.3.1:
   version "17.7.2"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
   dependencies:
     cliui "^8.0.1"
@@ -7409,7 +7535,7 @@ yargs@^17.3.1:
 
 yargs@^7.1.0:
   version "7.1.2"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz#63a0a5d42143879fdbb30370741374e0641d55db"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.2.tgz#63a0a5d42143879fdbb30370741374e0641d55db"
   integrity sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==
   dependencies:
     camelcase "^3.0.0"
@@ -7428,10 +7554,10 @@ yargs@^7.1.0:
 
 yn@3.1.1:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
   integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
 
 yocto-queue@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
diff --git a/matlab/CMakeLists.txt b/matlab/CMakeLists.txt
index 206ecb318b3cc..4daca3a5bca8f 100644
--- a/matlab/CMakeLists.txt
+++ b/matlab/CMakeLists.txt
@@ -34,9 +34,15 @@ function(build_arrow)
 
   set(ARROW_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/arrow_ep-prefix")
   set(ARROW_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/arrow_ep-build")
+
+  # Supply -DARROW_CXXFLAGS=-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR to fix
+  # a segfault on windows. See https://github.com/apache/arrow/issues/42015.
   set(ARROW_CMAKE_ARGS
-      "-DCMAKE_INSTALL_PREFIX=${ARROW_PREFIX}" "-DCMAKE_INSTALL_LIBDIR=lib"
-      "-DARROW_BUILD_STATIC=OFF" "-DARROW_CSV=ON")
+      "-DCMAKE_INSTALL_PREFIX=${ARROW_PREFIX}"
+      "-DCMAKE_INSTALL_LIBDIR=lib"
+      "-DARROW_BUILD_STATIC=OFF"
+      "-DARROW_CSV=ON"
+      "-DARROW_CXXFLAGS=-D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR")
 
   add_library(arrow_shared SHARED IMPORTED)
   set(ARROW_LIBRARY_TARGET arrow_shared)
@@ -94,7 +100,7 @@ endfunction()
 
 set(CMAKE_CXX_STANDARD 17)
 
-set(MLARROW_VERSION "16.0.0-SNAPSHOT")
+set(MLARROW_VERSION "17.0.0-SNAPSHOT")
 string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" MLARROW_BASE_VERSION "${MLARROW_VERSION}")
 
 project(mlarrow VERSION "${MLARROW_BASE_VERSION}")
@@ -201,9 +207,6 @@ get_filename_component(ARROW_SHARED_LIB_DIR ${ARROW_SHARED_LIB} DIRECTORY)
 get_filename_component(ARROW_SHARED_LIB_FILENAME ${ARROW_SHARED_LIB} NAME_WE)
 
 if(NOT Arrow_FOUND)
-  # If Arrow_FOUND is false, Arrow is built by the arrow_shared target and needs
-  # to be copied to CMAKE_PACKAGED_INSTALL_DIR.
-
   if(APPLE)
     # Install libarrow.dylib (symlink) and the real files it points to.
     # on macOS, we need to match these files: libarrow.dylib
@@ -226,20 +229,6 @@ if(NOT Arrow_FOUND)
     set(SHARED_LIBRARY_VERSION_REGEX
         ${ARROW_SHARED_LIB_FILENAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
   endif()
-
-  # The subfolders cmake and pkgconfig are excluded as they will be empty.
-  # Note: The following CMake Issue suggests enabling an option to exclude all
-  # folders that would be empty after installation:
-  # https://gitlab.kitware.com/cmake/cmake/-/issues/17122
-
-  set(CMAKE_PACKAGED_INSTALL_DIR "${CMAKE_INSTALL_DIR}/+arrow")
-
-  install(DIRECTORY "${ARROW_SHARED_LIB_DIR}/"
-          DESTINATION ${CMAKE_PACKAGED_INSTALL_DIR}
-          FILES_MATCHING
-          REGEX ${SHARED_LIBRARY_VERSION_REGEX}
-          PATTERN "cmake" EXCLUDE
-          PATTERN "pkgconfig" EXCLUDE)
 endif()
 
 # MATLAB_ADD_INSTALL_DIR_TO_STARTUP_FILE toggles whether an addpath command to add the install
diff --git a/matlab/src/cpp/arrow/matlab/array/proxy/array.cc b/matlab/src/cpp/arrow/matlab/array/proxy/array.cc
index b8f85b08632a3..1eb6de74fec65 100644
--- a/matlab/src/cpp/arrow/matlab/array/proxy/array.cc
+++ b/matlab/src/cpp/arrow/matlab/array/proxy/array.cc
@@ -15,6 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
+#include "arrow/c/bridge.h"
 #include "arrow/util/utf8.h"
 
 #include "arrow/matlab/array/proxy/array.h"
@@ -40,6 +41,7 @@ Array::Array(std::shared_ptr<arrow::Array> array) : array{std::move(array)} {
   REGISTER_METHOD(Array, getType);
   REGISTER_METHOD(Array, isEqual);
   REGISTER_METHOD(Array, slice);
+  REGISTER_METHOD(Array, exportToC);
 }
 
 std::shared_ptr<arrow::Array> Array::unwrap() { return array; }
@@ -178,4 +180,20 @@ void Array::slice(libmexclass::proxy::method::Context& context) {
   output[0]["TypeID"] = factory.createScalar(type_id);
   context.outputs[0] = output;
 }
+
+void Array::exportToC(libmexclass::proxy::method::Context& context) {
+  namespace mda = ::matlab::data;
+  mda::StructArray opts = context.inputs[0];
+  const mda::TypedArray<uint64_t> array_address_mda = opts[0]["ArrowArrayAddress"];
+  const mda::TypedArray<uint64_t> schema_address_mda = opts[0]["ArrowSchemaAddress"];
+
+  auto arrow_array = reinterpret_cast<struct ArrowArray*>(uint64_t(array_address_mda[0]));
+  auto arrow_schema =
+      reinterpret_cast<struct ArrowSchema*>(uint64_t(schema_address_mda[0]));
+
+  MATLAB_ERROR_IF_NOT_OK_WITH_CONTEXT(
+      arrow::ExportArray(*array, arrow_array, arrow_schema), context,
+      error::C_EXPORT_FAILED);
+}
+
 }  // namespace arrow::matlab::array::proxy
diff --git a/matlab/src/cpp/arrow/matlab/array/proxy/array.h b/matlab/src/cpp/arrow/matlab/array/proxy/array.h
index 61ba06a503bc4..c249693ac2797 100644
--- a/matlab/src/cpp/arrow/matlab/array/proxy/array.h
+++ b/matlab/src/cpp/arrow/matlab/array/proxy/array.h
@@ -45,6 +45,8 @@ class Array : public libmexclass::proxy::Proxy {
 
   void slice(libmexclass::proxy::method::Context& context);
 
+  void exportToC(libmexclass::proxy::method::Context& context);
+
   std::shared_ptr<arrow::Array> array;
 };
 
diff --git a/matlab/src/cpp/arrow/matlab/c/proxy/array.cc b/matlab/src/cpp/arrow/matlab/c/proxy/array.cc
new file mode 100644
index 0000000000000..a5f3418f1bcfa
--- /dev/null
+++ b/matlab/src/cpp/arrow/matlab/c/proxy/array.cc
@@ -0,0 +1,49 @@
+// 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.
+
+#include <cstddef>
+#include "arrow/c/abi.h"
+
+#include "arrow/matlab/c/proxy/array.h"
+
+#include "libmexclass/proxy/Proxy.h"
+
+namespace arrow::matlab::c::proxy {
+
+Array::Array() : arrowArray{} { REGISTER_METHOD(Array, getAddress); }
+
+Array::~Array() {
+  if (arrowArray.release != NULL) {
+    arrowArray.release(&arrowArray);
+    arrowArray.release = NULL;
+  }
+}
+
+libmexclass::proxy::MakeResult Array::make(
+    const libmexclass::proxy::FunctionArguments& constructor_arguments) {
+  return std::make_shared<Array>();
+}
+
+void Array::getAddress(libmexclass::proxy::method::Context& context) {
+  namespace mda = ::matlab::data;
+
+  mda::ArrayFactory factory;
+  auto address = reinterpret_cast<uint64_t>(&arrowArray);
+  context.outputs[0] = factory.createScalar(address);
+}
+
+}  // namespace arrow::matlab::c::proxy
\ No newline at end of file
diff --git a/matlab/src/cpp/arrow/matlab/c/proxy/array.h b/matlab/src/cpp/arrow/matlab/c/proxy/array.h
new file mode 100644
index 0000000000000..bb35807fcd015
--- /dev/null
+++ b/matlab/src/cpp/arrow/matlab/c/proxy/array.h
@@ -0,0 +1,39 @@
+// 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.
+
+#include "arrow/c/abi.h"
+
+#include "libmexclass/proxy/Proxy.h"
+
+namespace arrow::matlab::c::proxy {
+
+class Array : public libmexclass::proxy::Proxy {
+ public:
+  Array();
+
+  ~Array();
+
+  static libmexclass::proxy::MakeResult make(
+      const libmexclass::proxy::FunctionArguments& constructor_arguments);
+
+ protected:
+  void getAddress(libmexclass::proxy::method::Context& context);
+
+  struct ArrowArray arrowArray;
+};
+
+}  // namespace arrow::matlab::c::proxy
diff --git a/matlab/src/cpp/arrow/matlab/c/proxy/array_importer.cc b/matlab/src/cpp/arrow/matlab/c/proxy/array_importer.cc
new file mode 100644
index 0000000000000..b6f68332d1757
--- /dev/null
+++ b/matlab/src/cpp/arrow/matlab/c/proxy/array_importer.cc
@@ -0,0 +1,69 @@
+// 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.
+
+#include "arrow/array.h"
+#include "arrow/c/bridge.h"
+
+#include "arrow/matlab/array/proxy/wrap.h"
+#include "arrow/matlab/c/proxy/array_importer.h"
+#include "arrow/matlab/error/error.h"
+
+#include "libmexclass/proxy/ProxyManager.h"
+
+namespace arrow::matlab::c::proxy {
+
+ArrayImporter::ArrayImporter() { REGISTER_METHOD(ArrayImporter, import); }
+
+libmexclass::proxy::MakeResult ArrayImporter::make(
+    const libmexclass::proxy::FunctionArguments& constructor_arguments) {
+  return std::make_shared<ArrayImporter>();
+}
+
+void ArrayImporter::import(libmexclass::proxy::method::Context& context) {
+  namespace mda = ::matlab::data;
+  using namespace libmexclass::proxy;
+
+  mda::StructArray args = context.inputs[0];
+  const mda::TypedArray<uint64_t> arrow_array_address_mda = args[0]["ArrowArrayAddress"];
+  const mda::TypedArray<uint64_t> arrow_schema_address_mda =
+      args[0]["ArrowSchemaAddress"];
+
+  const auto arrow_array_address = uint64_t(arrow_array_address_mda[0]);
+  const auto arrow_schema_address = uint64_t(arrow_schema_address_mda[0]);
+
+  auto arrow_array = reinterpret_cast<struct ArrowArray*>(arrow_array_address);
+  auto arrow_schema = reinterpret_cast<struct ArrowSchema*>(arrow_schema_address);
+
+  MATLAB_ASSIGN_OR_ERROR_WITH_CONTEXT(auto array,
+                                      arrow::ImportArray(arrow_array, arrow_schema),
+                                      context, error::C_IMPORT_FAILED);
+
+  MATLAB_ASSIGN_OR_ERROR_WITH_CONTEXT(auto array_proxy,
+                                      arrow::matlab::array::proxy::wrap(array), context,
+                                      error::UNKNOWN_PROXY_FOR_ARRAY_TYPE);
+
+  mda::ArrayFactory factory;
+  const auto array_proxy_id = ProxyManager::manageProxy(array_proxy);
+  const auto array_proxy_id_mda = factory.createScalar(array_proxy_id);
+  const auto array_type_id_mda =
+      factory.createScalar(static_cast<int32_t>(array->type_id()));
+
+  context.outputs[0] = array_proxy_id_mda;
+  context.outputs[1] = array_type_id_mda;
+}
+
+}  // namespace arrow::matlab::c::proxy
diff --git a/matlab/src/cpp/arrow/matlab/c/proxy/array_importer.h b/matlab/src/cpp/arrow/matlab/c/proxy/array_importer.h
new file mode 100644
index 0000000000000..6459393058737
--- /dev/null
+++ b/matlab/src/cpp/arrow/matlab/c/proxy/array_importer.h
@@ -0,0 +1,37 @@
+// 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.
+
+#pragma once
+
+#include "libmexclass/proxy/Proxy.h"
+
+namespace arrow::matlab::c::proxy {
+
+class ArrayImporter : public libmexclass::proxy::Proxy {
+ public:
+  ArrayImporter();
+
+  ~ArrayImporter() = default;
+
+  static libmexclass::proxy::MakeResult make(
+      const libmexclass::proxy::FunctionArguments& constructor_arguments);
+
+ protected:
+  void import(libmexclass::proxy::method::Context& context);
+};
+
+}  // namespace arrow::matlab::c::proxy
diff --git a/matlab/src/cpp/arrow/matlab/c/proxy/record_batch_importer.cc b/matlab/src/cpp/arrow/matlab/c/proxy/record_batch_importer.cc
new file mode 100644
index 0000000000000..ed9ba14cfbe01
--- /dev/null
+++ b/matlab/src/cpp/arrow/matlab/c/proxy/record_batch_importer.cc
@@ -0,0 +1,66 @@
+// 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.
+
+#include "arrow/c/bridge.h"
+
+#include "arrow/matlab/c/proxy/record_batch_importer.h"
+#include "arrow/matlab/error/error.h"
+#include "arrow/matlab/tabular/proxy/record_batch.h"
+
+#include "libmexclass/proxy/ProxyManager.h"
+
+namespace arrow::matlab::c::proxy {
+
+RecordBatchImporter::RecordBatchImporter() {
+  REGISTER_METHOD(RecordBatchImporter, import);
+}
+
+libmexclass::proxy::MakeResult RecordBatchImporter::make(
+    const libmexclass::proxy::FunctionArguments& constructor_arguments) {
+  return std::make_shared<RecordBatchImporter>();
+}
+
+void RecordBatchImporter::import(libmexclass::proxy::method::Context& context) {
+  namespace mda = ::matlab::data;
+  using namespace libmexclass::proxy;
+  using RecordBatchProxy = arrow::matlab::tabular::proxy::RecordBatch;
+
+  mda::StructArray args = context.inputs[0];
+  const mda::TypedArray<uint64_t> arrow_array_address_mda = args[0]["ArrowArrayAddress"];
+  const mda::TypedArray<uint64_t> arrow_schema_address_mda =
+      args[0]["ArrowSchemaAddress"];
+
+  const auto arrow_array_address = uint64_t(arrow_array_address_mda[0]);
+  const auto arrow_schema_address = uint64_t(arrow_schema_address_mda[0]);
+
+  auto arrow_array = reinterpret_cast<struct ArrowArray*>(arrow_array_address);
+  auto arrow_schema = reinterpret_cast<struct ArrowSchema*>(arrow_schema_address);
+
+  MATLAB_ASSIGN_OR_ERROR_WITH_CONTEXT(auto record_batch,
+                                      arrow::ImportRecordBatch(arrow_array, arrow_schema),
+                                      context, error::C_IMPORT_FAILED);
+
+  auto record_batch_proxy = std::make_shared<RecordBatchProxy>(std::move(record_batch));
+
+  mda::ArrayFactory factory;
+  const auto record_batch_proxy_id = ProxyManager::manageProxy(record_batch_proxy);
+  const auto record_batch_proxy_id_mda = factory.createScalar(record_batch_proxy_id);
+
+  context.outputs[0] = record_batch_proxy_id_mda;
+}
+
+}  // namespace arrow::matlab::c::proxy
diff --git a/matlab/src/cpp/arrow/matlab/c/proxy/record_batch_importer.h b/matlab/src/cpp/arrow/matlab/c/proxy/record_batch_importer.h
new file mode 100644
index 0000000000000..0f697db0d25b0
--- /dev/null
+++ b/matlab/src/cpp/arrow/matlab/c/proxy/record_batch_importer.h
@@ -0,0 +1,37 @@
+// 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.
+
+#pragma once
+
+#include "libmexclass/proxy/Proxy.h"
+
+namespace arrow::matlab::c::proxy {
+
+class RecordBatchImporter : public libmexclass::proxy::Proxy {
+ public:
+  RecordBatchImporter();
+
+  ~RecordBatchImporter() = default;
+
+  static libmexclass::proxy::MakeResult make(
+      const libmexclass::proxy::FunctionArguments& constructor_arguments);
+
+ protected:
+  void import(libmexclass::proxy::method::Context& context);
+};
+
+}  // namespace arrow::matlab::c::proxy
diff --git a/matlab/src/cpp/arrow/matlab/c/proxy/schema.cc b/matlab/src/cpp/arrow/matlab/c/proxy/schema.cc
new file mode 100644
index 0000000000000..7f239f5628720
--- /dev/null
+++ b/matlab/src/cpp/arrow/matlab/c/proxy/schema.cc
@@ -0,0 +1,49 @@
+// 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.
+
+#include <cstddef>
+#include "arrow/c/abi.h"
+
+#include "arrow/matlab/c/proxy/schema.h"
+
+#include "libmexclass/proxy/Proxy.h"
+
+namespace arrow::matlab::c::proxy {
+
+Schema::Schema() : arrowSchema{} { REGISTER_METHOD(Schema, getAddress); }
+
+Schema::~Schema() {
+  if (arrowSchema.release != NULL) {
+    arrowSchema.release(&arrowSchema);
+    arrowSchema.release = NULL;
+  }
+}
+
+libmexclass::proxy::MakeResult Schema::make(
+    const libmexclass::proxy::FunctionArguments& constructor_arguments) {
+  return std::make_shared<Schema>();
+}
+
+void Schema::getAddress(libmexclass::proxy::method::Context& context) {
+  namespace mda = ::matlab::data;
+
+  mda::ArrayFactory factory;
+  auto address = reinterpret_cast<uint64_t>(&arrowSchema);
+  context.outputs[0] = factory.createScalar(address);
+}
+
+}  // namespace arrow::matlab::c::proxy
diff --git a/matlab/src/cpp/arrow/matlab/c/proxy/schema.h b/matlab/src/cpp/arrow/matlab/c/proxy/schema.h
new file mode 100644
index 0000000000000..8f781ea9c7341
--- /dev/null
+++ b/matlab/src/cpp/arrow/matlab/c/proxy/schema.h
@@ -0,0 +1,39 @@
+// 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.
+
+#include "arrow/c/abi.h"
+
+#include "libmexclass/proxy/Proxy.h"
+
+namespace arrow::matlab::c::proxy {
+
+class Schema : public libmexclass::proxy::Proxy {
+ public:
+  Schema();
+
+  ~Schema();
+
+  static libmexclass::proxy::MakeResult make(
+      const libmexclass::proxy::FunctionArguments& constructor_arguments);
+
+ protected:
+  void getAddress(libmexclass::proxy::method::Context& context);
+
+  struct ArrowSchema arrowSchema;
+};
+
+}  // namespace arrow::matlab::c::proxy
diff --git a/matlab/src/cpp/arrow/matlab/error/error.h b/matlab/src/cpp/arrow/matlab/error/error.h
index db8b715141ee8..e5a5df6f4bcb6 100644
--- a/matlab/src/cpp/arrow/matlab/error/error.h
+++ b/matlab/src/cpp/arrow/matlab/error/error.h
@@ -240,5 +240,14 @@ static const char* ARRAY_SLICE_NON_POSITIVE_OFFSET =
 static const char* ARRAY_SLICE_NEGATIVE_LENGTH = "arrow:array:slice:NegativeLength";
 static const char* ARRAY_SLICE_FAILED_TO_CREATE_ARRAY_PROXY =
     "arrow:array:slice:FailedToCreateArrayProxy";
+static const char* C_EXPORT_FAILED = "arrow:c:export:ExportFailed";
+static const char* C_IMPORT_FAILED = "arrow:c:import:ImportFailed";
+static const char* IPC_RECORD_BATCH_WRITE_FAILED =
+    "arrow:io:ipc:FailedToWriteRecordBatch";
+static const char* IPC_RECORD_BATCH_WRITE_CLOSE_FAILED = "arrow:io:ipc:CloseFailed";
+static const char* IPC_RECORD_BATCH_READER_OPEN_FAILED =
+    "arrow:io:ipc:FailedToOpenRecordBatchReader";
+static const char* IPC_RECORD_BATCH_READ_INVALID_INDEX = "arrow:io:ipc:InvalidIndex";
+static const char* IPC_RECORD_BATCH_READ_FAILED = "arrow:io:ipc:ReadFailed";
 
 }  // namespace arrow::matlab::error
diff --git a/matlab/src/cpp/arrow/matlab/io/ipc/proxy/record_batch_file_reader.cc b/matlab/src/cpp/arrow/matlab/io/ipc/proxy/record_batch_file_reader.cc
new file mode 100644
index 0000000000000..9db5d6a9baf4b
--- /dev/null
+++ b/matlab/src/cpp/arrow/matlab/io/ipc/proxy/record_batch_file_reader.cc
@@ -0,0 +1,128 @@
+// 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.
+
+#include "arrow/matlab/io/ipc/proxy/record_batch_file_reader.h"
+#include "arrow/io/file.h"
+#include "arrow/matlab/error/error.h"
+#include "arrow/matlab/tabular/proxy/record_batch.h"
+#include "arrow/matlab/tabular/proxy/schema.h"
+#include "arrow/util/utf8.h"
+
+#include "libmexclass/proxy/ProxyManager.h"
+
+namespace arrow::matlab::io::ipc::proxy {
+
+namespace {
+libmexclass::error::Error makeInvalidNumericIndexError(const int32_t matlab_index,
+                                                       const int32_t num_batches) {
+  std::stringstream error_message_stream;
+  error_message_stream << "Invalid record batch index: ";
+  error_message_stream << matlab_index;
+  error_message_stream
+      << ". Record batch index must be between 1 and the number of record batches (";
+  error_message_stream << num_batches;
+  error_message_stream << ").";
+  return libmexclass::error::Error{error::IPC_RECORD_BATCH_READ_INVALID_INDEX,
+                                   error_message_stream.str()};
+}
+}  // namespace
+
+RecordBatchFileReader::RecordBatchFileReader(
+    const std::shared_ptr<arrow::ipc::RecordBatchFileReader> reader)
+    : reader{std::move(reader)} {
+  REGISTER_METHOD(RecordBatchFileReader, getNumRecordBatches);
+  REGISTER_METHOD(RecordBatchFileReader, getSchema);
+  REGISTER_METHOD(RecordBatchFileReader, readRecordBatchAtIndex);
+}
+
+libmexclass::proxy::MakeResult RecordBatchFileReader::make(
+    const libmexclass::proxy::FunctionArguments& constructor_arguments) {
+  namespace mda = ::matlab::data;
+  using RecordBatchFileReaderProxy = arrow::matlab::io::ipc::proxy::RecordBatchFileReader;
+
+  const mda::StructArray opts = constructor_arguments[0];
+
+  const mda::StringArray filename_mda = opts[0]["Filename"];
+  const auto filename_utf16 = std::u16string(filename_mda[0]);
+  MATLAB_ASSIGN_OR_ERROR(const auto filename_utf8,
+                         arrow::util::UTF16StringToUTF8(filename_utf16),
+                         error::UNICODE_CONVERSION_ERROR_ID);
+
+  MATLAB_ASSIGN_OR_ERROR(auto input_stream, arrow::io::ReadableFile::Open(filename_utf8),
+                         error::FAILED_TO_OPEN_FILE_FOR_WRITE);
+
+  MATLAB_ASSIGN_OR_ERROR(auto reader,
+                         arrow::ipc::RecordBatchFileReader::Open(input_stream),
+                         error::IPC_RECORD_BATCH_READER_OPEN_FAILED);
+
+  return std::make_shared<RecordBatchFileReaderProxy>(std::move(reader));
+}
+
+void RecordBatchFileReader::getNumRecordBatches(
+    libmexclass::proxy::method::Context& context) {
+  namespace mda = ::matlab::data;
+
+  mda::ArrayFactory factory;
+  const auto num_batches = reader->num_record_batches();
+  context.outputs[0] = factory.createScalar(num_batches);
+}
+
+void RecordBatchFileReader::getSchema(libmexclass::proxy::method::Context& context) {
+  namespace mda = ::matlab::data;
+  using SchemaProxy = arrow::matlab::tabular::proxy::Schema;
+
+  auto schema = reader->schema();
+
+  auto schema_proxy = std::make_shared<SchemaProxy>(std::move(schema));
+  const auto schema_proxy_id =
+      libmexclass::proxy::ProxyManager::manageProxy(schema_proxy);
+
+  mda::ArrayFactory factory;
+  const auto schema_proxy_id_mda = factory.createScalar(schema_proxy_id);
+  context.outputs[0] = schema_proxy_id_mda;
+}
+
+void RecordBatchFileReader::readRecordBatchAtIndex(
+    libmexclass::proxy::method::Context& context) {
+  namespace mda = ::matlab::data;
+  using RecordBatchProxy = arrow::matlab::tabular::proxy::RecordBatch;
+
+  mda::StructArray opts = context.inputs[0];
+  const mda::TypedArray<int32_t> matlab_index_mda = opts[0]["Index"];
+
+  const auto matlab_index = matlab_index_mda[0];
+  const auto num_record_batches = reader->num_record_batches();
+  if (matlab_index < 1 || matlab_index > num_record_batches) {
+    context.error = makeInvalidNumericIndexError(matlab_index, num_record_batches);
+    return;
+  }
+  const auto arrow_index = matlab_index - 1;
+
+  MATLAB_ASSIGN_OR_ERROR_WITH_CONTEXT(const auto record_batch,
+                                      reader->ReadRecordBatch(arrow_index), context,
+                                      error::IPC_RECORD_BATCH_READ_FAILED);
+
+  auto record_batch_proxy = std::make_shared<RecordBatchProxy>(std::move(record_batch));
+  const auto record_batch_proxy_id =
+      libmexclass::proxy::ProxyManager::manageProxy(record_batch_proxy);
+
+  mda::ArrayFactory factory;
+  const auto record_batch_proxyy_id_mda = factory.createScalar(record_batch_proxy_id);
+  context.outputs[0] = record_batch_proxyy_id_mda;
+}
+
+}  // namespace arrow::matlab::io::ipc::proxy
\ No newline at end of file
diff --git a/matlab/src/cpp/arrow/matlab/io/ipc/proxy/record_batch_file_reader.h b/matlab/src/cpp/arrow/matlab/io/ipc/proxy/record_batch_file_reader.h
new file mode 100644
index 0000000000000..41d5c9a158813
--- /dev/null
+++ b/matlab/src/cpp/arrow/matlab/io/ipc/proxy/record_batch_file_reader.h
@@ -0,0 +1,44 @@
+// 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.
+
+#pragma once
+
+#include "arrow/ipc/reader.h"
+#include "libmexclass/proxy/Proxy.h"
+
+namespace arrow::matlab::io::ipc::proxy {
+
+class RecordBatchFileReader : public libmexclass::proxy::Proxy {
+ public:
+  RecordBatchFileReader(std::shared_ptr<arrow::ipc::RecordBatchFileReader> reader);
+
+  ~RecordBatchFileReader() = default;
+
+  static libmexclass::proxy::MakeResult make(
+      const libmexclass::proxy::FunctionArguments& constructor_arguments);
+
+ protected:
+  std::shared_ptr<arrow::ipc::RecordBatchFileReader> reader;
+
+  void getNumRecordBatches(libmexclass::proxy::method::Context& context);
+
+  void getSchema(libmexclass::proxy::method::Context& context);
+
+  void readRecordBatchAtIndex(libmexclass::proxy::method::Context& context);
+};
+
+}  // namespace arrow::matlab::io::ipc::proxy
\ No newline at end of file
diff --git a/matlab/src/cpp/arrow/matlab/io/ipc/proxy/record_batch_file_writer.cc b/matlab/src/cpp/arrow/matlab/io/ipc/proxy/record_batch_file_writer.cc
new file mode 100644
index 0000000000000..ed1052e0a8076
--- /dev/null
+++ b/matlab/src/cpp/arrow/matlab/io/ipc/proxy/record_batch_file_writer.cc
@@ -0,0 +1,107 @@
+// 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.
+
+#include "arrow/matlab/io/ipc/proxy/record_batch_file_writer.h"
+#include "arrow/io/file.h"
+#include "arrow/matlab/error/error.h"
+#include "arrow/matlab/tabular/proxy/record_batch.h"
+#include "arrow/matlab/tabular/proxy/schema.h"
+#include "arrow/matlab/tabular/proxy/table.h"
+#include "arrow/util/utf8.h"
+
+#include "libmexclass/proxy/ProxyManager.h"
+
+namespace arrow::matlab::io::ipc::proxy {
+
+RecordBatchFileWriter::RecordBatchFileWriter(
+    const std::shared_ptr<arrow::ipc::RecordBatchWriter> writer)
+    : writer{std::move(writer)} {
+  REGISTER_METHOD(RecordBatchFileWriter, close);
+  REGISTER_METHOD(RecordBatchFileWriter, writeRecordBatch);
+  REGISTER_METHOD(RecordBatchFileWriter, writeTable);
+}
+
+libmexclass::proxy::MakeResult RecordBatchFileWriter::make(
+    const libmexclass::proxy::FunctionArguments& constructor_arguments) {
+  namespace mda = ::matlab::data;
+  using RecordBatchFileWriterProxy = arrow::matlab::io::ipc::proxy::RecordBatchFileWriter;
+  using SchemaProxy = arrow::matlab::tabular::proxy::Schema;
+
+  const mda::StructArray opts = constructor_arguments[0];
+
+  const mda::StringArray filename_mda = opts[0]["Filename"];
+  const auto filename_utf16 = std::u16string(filename_mda[0]);
+  MATLAB_ASSIGN_OR_ERROR(const auto filename_utf8,
+                         arrow::util::UTF16StringToUTF8(filename_utf16),
+                         error::UNICODE_CONVERSION_ERROR_ID);
+
+  const mda::TypedArray<uint64_t> arrow_schema_proxy_id_mda = opts[0]["SchemaProxyID"];
+  auto proxy = libmexclass::proxy::ProxyManager::getProxy(arrow_schema_proxy_id_mda[0]);
+  auto arrow_schema_proxy = std::static_pointer_cast<SchemaProxy>(proxy);
+  auto arrow_schema = arrow_schema_proxy->unwrap();
+
+  MATLAB_ASSIGN_OR_ERROR(auto output_stream,
+                         arrow::io::FileOutputStream::Open(filename_utf8),
+                         error::FAILED_TO_OPEN_FILE_FOR_WRITE);
+
+  MATLAB_ASSIGN_OR_ERROR(auto writer,
+                         arrow::ipc::MakeFileWriter(output_stream, arrow_schema),
+                         "arrow:matlab:MakeFailed");
+
+  return std::make_shared<RecordBatchFileWriterProxy>(std::move(writer));
+}
+
+void RecordBatchFileWriter::writeRecordBatch(
+    libmexclass::proxy::method::Context& context) {
+  namespace mda = ::matlab::data;
+  using RecordBatchProxy = ::arrow::matlab::tabular::proxy::RecordBatch;
+
+  mda::StructArray opts = context.inputs[0];
+  const mda::TypedArray<uint64_t> record_batch_proxy_id_mda =
+      opts[0]["RecordBatchProxyID"];
+  const uint64_t record_batch_proxy_id = record_batch_proxy_id_mda[0];
+
+  auto proxy = libmexclass::proxy::ProxyManager::getProxy(record_batch_proxy_id);
+  auto record_batch_proxy = std::static_pointer_cast<RecordBatchProxy>(proxy);
+  auto record_batch = record_batch_proxy->unwrap();
+
+  MATLAB_ERROR_IF_NOT_OK_WITH_CONTEXT(writer->WriteRecordBatch(*record_batch), context,
+                                      error::IPC_RECORD_BATCH_WRITE_FAILED);
+}
+
+void RecordBatchFileWriter::writeTable(libmexclass::proxy::method::Context& context) {
+  namespace mda = ::matlab::data;
+  using TableProxy = ::arrow::matlab::tabular::proxy::Table;
+
+  mda::StructArray opts = context.inputs[0];
+  const mda::TypedArray<uint64_t> table_proxy_id_mda = opts[0]["TableProxyID"];
+  const uint64_t table_proxy_id = table_proxy_id_mda[0];
+
+  auto proxy = libmexclass::proxy::ProxyManager::getProxy(table_proxy_id);
+  auto table_proxy = std::static_pointer_cast<TableProxy>(proxy);
+  auto table = table_proxy->unwrap();
+
+  MATLAB_ERROR_IF_NOT_OK_WITH_CONTEXT(writer->WriteTable(*table), context,
+                                      error::IPC_RECORD_BATCH_WRITE_FAILED);
+}
+
+void RecordBatchFileWriter::close(libmexclass::proxy::method::Context& context) {
+  MATLAB_ERROR_IF_NOT_OK_WITH_CONTEXT(writer->Close(), context,
+                                      error::IPC_RECORD_BATCH_WRITE_CLOSE_FAILED);
+}
+
+}  // namespace arrow::matlab::io::ipc::proxy
\ No newline at end of file
diff --git a/matlab/src/cpp/arrow/matlab/io/ipc/proxy/record_batch_file_writer.h b/matlab/src/cpp/arrow/matlab/io/ipc/proxy/record_batch_file_writer.h
new file mode 100644
index 0000000000000..bfd83504f190a
--- /dev/null
+++ b/matlab/src/cpp/arrow/matlab/io/ipc/proxy/record_batch_file_writer.h
@@ -0,0 +1,42 @@
+// 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.
+
+#include "arrow/ipc/writer.h"
+#include "libmexclass/proxy/Proxy.h"
+
+namespace arrow::matlab::io::ipc::proxy {
+
+class RecordBatchFileWriter : public libmexclass::proxy::Proxy {
+ public:
+  RecordBatchFileWriter(std::shared_ptr<arrow::ipc::RecordBatchWriter> writer);
+
+  ~RecordBatchFileWriter() = default;
+
+  static libmexclass::proxy::MakeResult make(
+      const libmexclass::proxy::FunctionArguments& constructor_arguments);
+
+ protected:
+  std::shared_ptr<arrow::ipc::RecordBatchWriter> writer;
+
+  void writeRecordBatch(libmexclass::proxy::method::Context& context);
+
+  void writeTable(libmexclass::proxy::method::Context& context);
+
+  void close(libmexclass::proxy::method::Context& context);
+};
+
+}  // namespace arrow::matlab::io::ipc::proxy
\ No newline at end of file
diff --git a/matlab/src/cpp/arrow/matlab/proxy/factory.cc b/matlab/src/cpp/arrow/matlab/proxy/factory.cc
index 23492f75deacc..8326b4371917a 100644
--- a/matlab/src/cpp/arrow/matlab/proxy/factory.cc
+++ b/matlab/src/cpp/arrow/matlab/proxy/factory.cc
@@ -25,11 +25,17 @@
 #include "arrow/matlab/array/proxy/time64_array.h"
 #include "arrow/matlab/array/proxy/timestamp_array.h"
 #include "arrow/matlab/buffer/proxy/buffer.h"
+#include "arrow/matlab/c/proxy/array.h"
+#include "arrow/matlab/c/proxy/array_importer.h"
+#include "arrow/matlab/c/proxy/record_batch_importer.h"
+#include "arrow/matlab/c/proxy/schema.h"
 #include "arrow/matlab/error/error.h"
 #include "arrow/matlab/io/csv/proxy/table_reader.h"
 #include "arrow/matlab/io/csv/proxy/table_writer.h"
 #include "arrow/matlab/io/feather/proxy/reader.h"
 #include "arrow/matlab/io/feather/proxy/writer.h"
+#include "arrow/matlab/io/ipc/proxy/record_batch_file_reader.h"
+#include "arrow/matlab/io/ipc/proxy/record_batch_file_writer.h"
 #include "arrow/matlab/tabular/proxy/record_batch.h"
 #include "arrow/matlab/tabular/proxy/schema.h"
 #include "arrow/matlab/tabular/proxy/table.h"
@@ -51,54 +57,60 @@ namespace arrow::matlab::proxy {
 libmexclass::proxy::MakeResult Factory::make_proxy(
     const ClassName& class_name, const FunctionArguments& constructor_arguments) {
   // clang-format off
-  REGISTER_PROXY(arrow.array.proxy.Float32Array  , arrow::matlab::array::proxy::NumericArray<arrow::FloatType>);
-  REGISTER_PROXY(arrow.array.proxy.Float64Array  , arrow::matlab::array::proxy::NumericArray<arrow::DoubleType>);
-  REGISTER_PROXY(arrow.array.proxy.UInt8Array    , arrow::matlab::array::proxy::NumericArray<arrow::UInt8Type>);
-  REGISTER_PROXY(arrow.array.proxy.UInt16Array   , arrow::matlab::array::proxy::NumericArray<arrow::UInt16Type>);
-  REGISTER_PROXY(arrow.array.proxy.UInt32Array   , arrow::matlab::array::proxy::NumericArray<arrow::UInt32Type>);
-  REGISTER_PROXY(arrow.array.proxy.UInt64Array   , arrow::matlab::array::proxy::NumericArray<arrow::UInt64Type>);
-  REGISTER_PROXY(arrow.array.proxy.Int8Array     , arrow::matlab::array::proxy::NumericArray<arrow::Int8Type>);
-  REGISTER_PROXY(arrow.array.proxy.Int16Array    , arrow::matlab::array::proxy::NumericArray<arrow::Int16Type>);
-  REGISTER_PROXY(arrow.array.proxy.Int32Array    , arrow::matlab::array::proxy::NumericArray<arrow::Int32Type>);
-  REGISTER_PROXY(arrow.array.proxy.Int64Array    , arrow::matlab::array::proxy::NumericArray<arrow::Int64Type>);
-  REGISTER_PROXY(arrow.array.proxy.BooleanArray  , arrow::matlab::array::proxy::BooleanArray);
-  REGISTER_PROXY(arrow.array.proxy.StringArray   , arrow::matlab::array::proxy::StringArray);
-  REGISTER_PROXY(arrow.array.proxy.StructArray   , arrow::matlab::array::proxy::StructArray);
-  REGISTER_PROXY(arrow.array.proxy.ListArray     , arrow::matlab::array::proxy::ListArray);
-  REGISTER_PROXY(arrow.array.proxy.TimestampArray, arrow::matlab::array::proxy::NumericArray<arrow::TimestampType>);
-  REGISTER_PROXY(arrow.array.proxy.Time32Array   , arrow::matlab::array::proxy::NumericArray<arrow::Time32Type>);
-  REGISTER_PROXY(arrow.array.proxy.Time64Array   , arrow::matlab::array::proxy::NumericArray<arrow::Time64Type>);
-  REGISTER_PROXY(arrow.array.proxy.Date32Array   , arrow::matlab::array::proxy::NumericArray<arrow::Date32Type>);
-  REGISTER_PROXY(arrow.array.proxy.Date64Array   , arrow::matlab::array::proxy::NumericArray<arrow::Date64Type>);
-  REGISTER_PROXY(arrow.array.proxy.ChunkedArray  , arrow::matlab::array::proxy::ChunkedArray);
-  REGISTER_PROXY(arrow.buffer.proxy.Buffer       , arrow::matlab::buffer::proxy::Buffer);
-  REGISTER_PROXY(arrow.tabular.proxy.RecordBatch , arrow::matlab::tabular::proxy::RecordBatch);
-  REGISTER_PROXY(arrow.tabular.proxy.Table       , arrow::matlab::tabular::proxy::Table);
-  REGISTER_PROXY(arrow.tabular.proxy.Schema      , arrow::matlab::tabular::proxy::Schema);
-  REGISTER_PROXY(arrow.type.proxy.Field          , arrow::matlab::type::proxy::Field);
-  REGISTER_PROXY(arrow.type.proxy.Float32Type    , arrow::matlab::type::proxy::PrimitiveCType<float>);
-  REGISTER_PROXY(arrow.type.proxy.Float64Type    , arrow::matlab::type::proxy::PrimitiveCType<double>);
-  REGISTER_PROXY(arrow.type.proxy.UInt8Type      , arrow::matlab::type::proxy::PrimitiveCType<uint8_t>);
-  REGISTER_PROXY(arrow.type.proxy.UInt16Type     , arrow::matlab::type::proxy::PrimitiveCType<uint16_t>);
-  REGISTER_PROXY(arrow.type.proxy.UInt32Type     , arrow::matlab::type::proxy::PrimitiveCType<uint32_t>);
-  REGISTER_PROXY(arrow.type.proxy.UInt64Type     , arrow::matlab::type::proxy::PrimitiveCType<uint64_t>);
-  REGISTER_PROXY(arrow.type.proxy.Int8Type       , arrow::matlab::type::proxy::PrimitiveCType<int8_t>);
-  REGISTER_PROXY(arrow.type.proxy.Int16Type      , arrow::matlab::type::proxy::PrimitiveCType<int16_t>);
-  REGISTER_PROXY(arrow.type.proxy.Int32Type      , arrow::matlab::type::proxy::PrimitiveCType<int32_t>);
-  REGISTER_PROXY(arrow.type.proxy.Int64Type      , arrow::matlab::type::proxy::PrimitiveCType<int64_t>);
-  REGISTER_PROXY(arrow.type.proxy.BooleanType    , arrow::matlab::type::proxy::PrimitiveCType<bool>);
-  REGISTER_PROXY(arrow.type.proxy.StringType     , arrow::matlab::type::proxy::StringType);
-  REGISTER_PROXY(arrow.type.proxy.TimestampType  , arrow::matlab::type::proxy::TimestampType);
-  REGISTER_PROXY(arrow.type.proxy.Time32Type     , arrow::matlab::type::proxy::Time32Type);
-  REGISTER_PROXY(arrow.type.proxy.Time64Type     , arrow::matlab::type::proxy::Time64Type);
-  REGISTER_PROXY(arrow.type.proxy.Date32Type     , arrow::matlab::type::proxy::Date32Type);
-  REGISTER_PROXY(arrow.type.proxy.Date64Type     , arrow::matlab::type::proxy::Date64Type);
-  REGISTER_PROXY(arrow.type.proxy.StructType     , arrow::matlab::type::proxy::StructType);
-  REGISTER_PROXY(arrow.type.proxy.ListType       , arrow::matlab::type::proxy::ListType);
-  REGISTER_PROXY(arrow.io.feather.proxy.Writer   , arrow::matlab::io::feather::proxy::Writer);
-  REGISTER_PROXY(arrow.io.feather.proxy.Reader   , arrow::matlab::io::feather::proxy::Reader);
-  REGISTER_PROXY(arrow.io.csv.proxy.TableWriter  , arrow::matlab::io::csv::proxy::TableWriter);
-  REGISTER_PROXY(arrow.io.csv.proxy.TableReader  , arrow::matlab::io::csv::proxy::TableReader);
+  REGISTER_PROXY(arrow.array.proxy.Float32Array    , arrow::matlab::array::proxy::NumericArray<arrow::FloatType>);
+  REGISTER_PROXY(arrow.array.proxy.Float64Array    , arrow::matlab::array::proxy::NumericArray<arrow::DoubleType>);
+  REGISTER_PROXY(arrow.array.proxy.UInt8Array      , arrow::matlab::array::proxy::NumericArray<arrow::UInt8Type>);
+  REGISTER_PROXY(arrow.array.proxy.UInt16Array     , arrow::matlab::array::proxy::NumericArray<arrow::UInt16Type>);
+  REGISTER_PROXY(arrow.array.proxy.UInt32Array     , arrow::matlab::array::proxy::NumericArray<arrow::UInt32Type>);
+  REGISTER_PROXY(arrow.array.proxy.UInt64Array     , arrow::matlab::array::proxy::NumericArray<arrow::UInt64Type>);
+  REGISTER_PROXY(arrow.array.proxy.Int8Array       , arrow::matlab::array::proxy::NumericArray<arrow::Int8Type>);
+  REGISTER_PROXY(arrow.array.proxy.Int16Array      , arrow::matlab::array::proxy::NumericArray<arrow::Int16Type>);
+  REGISTER_PROXY(arrow.array.proxy.Int32Array      , arrow::matlab::array::proxy::NumericArray<arrow::Int32Type>);
+  REGISTER_PROXY(arrow.array.proxy.Int64Array      , arrow::matlab::array::proxy::NumericArray<arrow::Int64Type>);
+  REGISTER_PROXY(arrow.array.proxy.BooleanArray    , arrow::matlab::array::proxy::BooleanArray);
+  REGISTER_PROXY(arrow.array.proxy.StringArray     , arrow::matlab::array::proxy::StringArray);
+  REGISTER_PROXY(arrow.array.proxy.StructArray     , arrow::matlab::array::proxy::StructArray);
+  REGISTER_PROXY(arrow.array.proxy.ListArray       , arrow::matlab::array::proxy::ListArray);
+  REGISTER_PROXY(arrow.array.proxy.TimestampArray  , arrow::matlab::array::proxy::NumericArray<arrow::TimestampType>);
+  REGISTER_PROXY(arrow.array.proxy.Time32Array     , arrow::matlab::array::proxy::NumericArray<arrow::Time32Type>);
+  REGISTER_PROXY(arrow.array.proxy.Time64Array     , arrow::matlab::array::proxy::NumericArray<arrow::Time64Type>);
+  REGISTER_PROXY(arrow.array.proxy.Date32Array     , arrow::matlab::array::proxy::NumericArray<arrow::Date32Type>);
+  REGISTER_PROXY(arrow.array.proxy.Date64Array     , arrow::matlab::array::proxy::NumericArray<arrow::Date64Type>);
+  REGISTER_PROXY(arrow.array.proxy.ChunkedArray    , arrow::matlab::array::proxy::ChunkedArray);
+  REGISTER_PROXY(arrow.buffer.proxy.Buffer         , arrow::matlab::buffer::proxy::Buffer);
+  REGISTER_PROXY(arrow.tabular.proxy.RecordBatch   , arrow::matlab::tabular::proxy::RecordBatch);
+  REGISTER_PROXY(arrow.tabular.proxy.Table         , arrow::matlab::tabular::proxy::Table);
+  REGISTER_PROXY(arrow.tabular.proxy.Schema        , arrow::matlab::tabular::proxy::Schema);
+  REGISTER_PROXY(arrow.type.proxy.Field            , arrow::matlab::type::proxy::Field);
+  REGISTER_PROXY(arrow.type.proxy.Float32Type      , arrow::matlab::type::proxy::PrimitiveCType<float>);
+  REGISTER_PROXY(arrow.type.proxy.Float64Type      , arrow::matlab::type::proxy::PrimitiveCType<double>);
+  REGISTER_PROXY(arrow.type.proxy.UInt8Type        , arrow::matlab::type::proxy::PrimitiveCType<uint8_t>);
+  REGISTER_PROXY(arrow.type.proxy.UInt16Type       , arrow::matlab::type::proxy::PrimitiveCType<uint16_t>);
+  REGISTER_PROXY(arrow.type.proxy.UInt32Type       , arrow::matlab::type::proxy::PrimitiveCType<uint32_t>);
+  REGISTER_PROXY(arrow.type.proxy.UInt64Type       , arrow::matlab::type::proxy::PrimitiveCType<uint64_t>);
+  REGISTER_PROXY(arrow.type.proxy.Int8Type         , arrow::matlab::type::proxy::PrimitiveCType<int8_t>);
+  REGISTER_PROXY(arrow.type.proxy.Int16Type        , arrow::matlab::type::proxy::PrimitiveCType<int16_t>);
+  REGISTER_PROXY(arrow.type.proxy.Int32Type        , arrow::matlab::type::proxy::PrimitiveCType<int32_t>);
+  REGISTER_PROXY(arrow.type.proxy.Int64Type        , arrow::matlab::type::proxy::PrimitiveCType<int64_t>);
+  REGISTER_PROXY(arrow.type.proxy.BooleanType      , arrow::matlab::type::proxy::PrimitiveCType<bool>);
+  REGISTER_PROXY(arrow.type.proxy.StringType       , arrow::matlab::type::proxy::StringType);
+  REGISTER_PROXY(arrow.type.proxy.TimestampType    , arrow::matlab::type::proxy::TimestampType);
+  REGISTER_PROXY(arrow.type.proxy.Time32Type       , arrow::matlab::type::proxy::Time32Type);
+  REGISTER_PROXY(arrow.type.proxy.Time64Type       , arrow::matlab::type::proxy::Time64Type);
+  REGISTER_PROXY(arrow.type.proxy.Date32Type       , arrow::matlab::type::proxy::Date32Type);
+  REGISTER_PROXY(arrow.type.proxy.Date64Type       , arrow::matlab::type::proxy::Date64Type);
+  REGISTER_PROXY(arrow.type.proxy.StructType       , arrow::matlab::type::proxy::StructType);
+  REGISTER_PROXY(arrow.type.proxy.ListType         , arrow::matlab::type::proxy::ListType);
+  REGISTER_PROXY(arrow.io.feather.proxy.Writer     , arrow::matlab::io::feather::proxy::Writer);
+  REGISTER_PROXY(arrow.io.feather.proxy.Reader     , arrow::matlab::io::feather::proxy::Reader);
+  REGISTER_PROXY(arrow.io.csv.proxy.TableWriter    , arrow::matlab::io::csv::proxy::TableWriter);
+  REGISTER_PROXY(arrow.io.csv.proxy.TableReader    , arrow::matlab::io::csv::proxy::TableReader);
+  REGISTER_PROXY(arrow.c.proxy.Array               , arrow::matlab::c::proxy::Array);
+  REGISTER_PROXY(arrow.c.proxy.ArrayImporter       , arrow::matlab::c::proxy::ArrayImporter);
+  REGISTER_PROXY(arrow.c.proxy.Schema              , arrow::matlab::c::proxy::Schema);
+  REGISTER_PROXY(arrow.c.proxy.RecordBatchImporter , arrow::matlab::c::proxy::RecordBatchImporter);
+  REGISTER_PROXY(arrow.io.ipc.proxy.RecordBatchFileReader , arrow::matlab::io::ipc::proxy::RecordBatchFileReader);
+  REGISTER_PROXY(arrow.io.ipc.proxy.RecordBatchFileWriter , arrow::matlab::io::ipc::proxy::RecordBatchFileWriter);
   // clang-format on
 
   return libmexclass::error::Error{error::UNKNOWN_PROXY_ERROR_ID,
diff --git a/matlab/src/cpp/arrow/matlab/tabular/proxy/record_batch.cc b/matlab/src/cpp/arrow/matlab/tabular/proxy/record_batch.cc
index 298ac4b595139..f3cee25a3a8ee 100644
--- a/matlab/src/cpp/arrow/matlab/tabular/proxy/record_batch.cc
+++ b/matlab/src/cpp/arrow/matlab/tabular/proxy/record_batch.cc
@@ -15,8 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "libmexclass/proxy/ProxyManager.h"
-
+#include "arrow/c/bridge.h"
 #include "arrow/matlab/array/proxy/array.h"
 #include "arrow/matlab/array/proxy/wrap.h"
 
@@ -66,6 +65,7 @@ RecordBatch::RecordBatch(std::shared_ptr<arrow::RecordBatch> record_batch)
   REGISTER_METHOD(RecordBatch, getColumnByName);
   REGISTER_METHOD(RecordBatch, getSchema);
   REGISTER_METHOD(RecordBatch, getRowAsString);
+  REGISTER_METHOD(RecordBatch, exportToC);
 }
 
 std::shared_ptr<arrow::RecordBatch> RecordBatch::unwrap() { return record_batch; }
@@ -259,4 +259,19 @@ void RecordBatch::getRowAsString(libmexclass::proxy::method::Context& context) {
   context.outputs[0] = factory.createScalar(row_str_utf16);
 }
 
+void RecordBatch::exportToC(libmexclass::proxy::method::Context& context) {
+  namespace mda = ::matlab::data;
+  mda::StructArray opts = context.inputs[0];
+  const mda::TypedArray<uint64_t> array_address_mda = opts[0]["ArrowArrayAddress"];
+  const mda::TypedArray<uint64_t> schema_address_mda = opts[0]["ArrowSchemaAddress"];
+
+  auto arrow_array = reinterpret_cast<struct ArrowArray*>(uint64_t(array_address_mda[0]));
+  auto arrow_schema =
+      reinterpret_cast<struct ArrowSchema*>(uint64_t(schema_address_mda[0]));
+
+  MATLAB_ERROR_IF_NOT_OK_WITH_CONTEXT(
+      arrow::ExportRecordBatch(*record_batch, arrow_array, arrow_schema), context,
+      error::C_EXPORT_FAILED);
+}
+
 }  // namespace arrow::matlab::tabular::proxy
diff --git a/matlab/src/cpp/arrow/matlab/tabular/proxy/record_batch.h b/matlab/src/cpp/arrow/matlab/tabular/proxy/record_batch.h
index c8285c9b095d5..4a1675a8a438a 100644
--- a/matlab/src/cpp/arrow/matlab/tabular/proxy/record_batch.h
+++ b/matlab/src/cpp/arrow/matlab/tabular/proxy/record_batch.h
@@ -43,6 +43,7 @@ class RecordBatch : public libmexclass::proxy::Proxy {
   void getColumnByName(libmexclass::proxy::method::Context& context);
   void getSchema(libmexclass::proxy::method::Context& context);
   void getRowAsString(libmexclass::proxy::method::Context& context);
+  void exportToC(libmexclass::proxy::method::Context& context);
 
   std::shared_ptr<arrow::RecordBatch> record_batch;
 };
diff --git a/matlab/src/matlab/+arrow/+array/Array.m b/matlab/src/matlab/+arrow/+array/Array.m
index 4402055932b60..01bacdf5755dc 100644
--- a/matlab/src/matlab/+arrow/+array/Array.m
+++ b/matlab/src/matlab/+arrow/+array/Array.m
@@ -97,6 +97,19 @@ function displayScalarObject(obj)
             % Invoke isEqual proxy object method
             tf = obj.Proxy.isEqual(proxyIDs);
         end
+
+        function export(obj, cArrowArrayAddress, cArrowSchemaAddress)
+            arguments
+                obj(1, 1) arrow.array.Array
+                cArrowArrayAddress(1, 1) uint64
+                cArrowSchemaAddress(1, 1) uint64
+            end
+            args = struct(...
+                ArrowArrayAddress=cArrowArrayAddress,...
+                ArrowSchemaAddress=cArrowSchemaAddress...
+            );
+            obj.Proxy.exportToC(args);
+        end
     end
 
     methods (Hidden)
@@ -108,4 +121,15 @@ function displayScalarObject(obj)
             array = traits.ArrayConstructor(proxy);
         end
     end
+
+    methods (Static)
+        function array = import(cArray, cSchema)
+            arguments
+                cArray(1, 1) arrow.c.Array
+                cSchema(1, 1) arrow.c.Schema
+            end
+            importer = arrow.c.internal.ArrayImporter();
+            array = importer.import(cArray, cSchema);
+        end
+    end
 end
diff --git a/matlab/src/matlab/+arrow/+c/+internal/ArrayImporter.m b/matlab/src/matlab/+arrow/+c/+internal/ArrayImporter.m
new file mode 100644
index 0000000000000..3f2f7445b3d6d
--- /dev/null
+++ b/matlab/src/matlab/+arrow/+c/+internal/ArrayImporter.m
@@ -0,0 +1,50 @@
+%ARRAYIMPORTER Imports Arrow Array using the C Data Interface Format.
+
+% 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.
+classdef ArrayImporter < matlab.mixin.Scalar
+
+    properties (Hidden, SetAccess=private, GetAccess=public)
+        Proxy
+    end
+
+    methods
+
+        function obj = ArrayImporter()
+            proxyName = "arrow.c.proxy.ArrayImporter";
+            proxy = arrow.internal.proxy.create(proxyName, struct());
+            obj.Proxy = proxy;
+        end
+
+        function array = import(obj, cArray, cSchema)
+            arguments
+                obj(1, 1) arrow.c.internal.ArrayImporter
+                cArray(1, 1) arrow.c.Array
+                cSchema(1, 1) arrow.c.Schema
+            end
+            args = struct(...
+                ArrowArrayAddress=cArray.Address,...
+                ArrowSchemaAddress=cSchema.Address...
+            );
+            [proxyID, typeID] = obj.Proxy.import(args);
+            traits = arrow.type.traits.traits(arrow.type.ID(typeID));
+            proxy = libmexclass.proxy.Proxy(Name=traits.ArrayProxyClassName, ID=proxyID);
+            array = traits.ArrayConstructor(proxy);
+        end
+
+    end
+
+end
+
diff --git a/matlab/src/matlab/+arrow/+c/+internal/RecordBatchImporter.m b/matlab/src/matlab/+arrow/+c/+internal/RecordBatchImporter.m
new file mode 100644
index 0000000000000..120763bb46e7b
--- /dev/null
+++ b/matlab/src/matlab/+arrow/+c/+internal/RecordBatchImporter.m
@@ -0,0 +1,52 @@
+%RECORDBATCHIMPORTER Imports Arrow RecordBatch using the C Data Interface
+% Format.
+
+% 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.
+
+classdef RecordBatchImporter
+
+    properties (Hidden, SetAccess=private, GetAccess=public)
+        Proxy
+    end
+
+    methods
+
+        function obj = RecordBatchImporter()
+            proxyName = "arrow.c.proxy.RecordBatchImporter";
+            proxy = arrow.internal.proxy.create(proxyName, struct());
+            obj.Proxy = proxy;
+        end
+
+        function recordBatch = import(obj, cArray, cSchema)
+            arguments
+                obj(1, 1) arrow.c.internal.RecordBatchImporter
+                cArray(1, 1) arrow.c.Array
+                cSchema(1, 1) arrow.c.Schema
+            end
+            args = struct(...
+                ArrowArrayAddress=cArray.Address,...
+                ArrowSchemaAddress=cSchema.Address...
+            );
+            proxyID = obj.Proxy.import(args);
+            proxyName = "arrow.tabular.proxy.RecordBatch";
+            proxy = libmexclass.proxy.Proxy(Name=proxyName, ID=proxyID);
+            recordBatch = arrow.tabular.RecordBatch(proxy);
+        end
+
+    end
+
+end
+
diff --git a/matlab/src/matlab/+arrow/+c/Array.m b/matlab/src/matlab/+arrow/+c/Array.m
new file mode 100644
index 0000000000000..574fca9afebd8
--- /dev/null
+++ b/matlab/src/matlab/+arrow/+c/Array.m
@@ -0,0 +1,37 @@
+%ARRAY Wrapper for an Arrow C Data Interface format ArrowArray C struct pointer.
+
+% 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.
+classdef Array < matlab.mixin.Scalar
+
+    properties (Hidden, SetAccess=private, GetAccess=public)
+        Proxy
+    end
+
+    properties(Dependent, GetAccess=public, SetAccess=private)
+        Address(1, 1) uint64
+    end
+
+    methods
+        function obj = Array()
+            proxyName = "arrow.c.proxy.Array";
+            obj.Proxy = arrow.internal.proxy.create(proxyName);
+        end
+
+        function address = get.Address(obj)
+            address = obj.Proxy.getAddress();
+        end
+    end
+end
\ No newline at end of file
diff --git a/matlab/src/matlab/+arrow/+c/Schema.m b/matlab/src/matlab/+arrow/+c/Schema.m
new file mode 100644
index 0000000000000..29eba59016044
--- /dev/null
+++ b/matlab/src/matlab/+arrow/+c/Schema.m
@@ -0,0 +1,37 @@
+%SCHEMA Wrapper for an Arrow C Data Interface format ArrowSchema C struct pointer.
+
+% 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.
+classdef Schema < matlab.mixin.Scalar
+
+    properties (Hidden, SetAccess=private, GetAccess=public)
+        Proxy
+    end
+
+    properties(Dependent, GetAccess=public, SetAccess=private)
+        Address(1, 1) uint64
+    end
+
+    methods
+        function obj = Schema()
+            proxyName = "arrow.c.proxy.Schema";
+            obj.Proxy = arrow.internal.proxy.create(proxyName);
+        end
+
+        function address = get.Address(obj)
+            address = obj.Proxy.getAddress();
+        end
+    end
+end
\ No newline at end of file
diff --git a/matlab/src/matlab/+arrow/+internal/+test/+display/makeLinkString.m b/matlab/src/matlab/+arrow/+internal/+test/+display/makeLinkString.m
index 79065ba1c8cfd..e99dd7d78488d 100644
--- a/matlab/src/matlab/+arrow/+internal/+test/+display/makeLinkString.m
+++ b/matlab/src/matlab/+arrow/+internal/+test/+display/makeLinkString.m
@@ -26,11 +26,11 @@
     end
         
     if opts.BoldFont
-        link = compose("<a href=""matlab:helpPopup %s""" + ...
+        link = compose("<a href=""matlab:helpPopup('%s')""" + ...
             " style=""font-weight:bold"">%s</a>", ...
             opts.FullClassName, opts.ClassName);
     else
-        link = compose("<a href=""matlab:helpPopup %s"">%s</a>", ...
+        link = compose("<a href=""matlab:helpPopup('%s')"">%s</a>", ...
             opts.FullClassName, opts.ClassName);
     end
 end
\ No newline at end of file
diff --git a/matlab/src/matlab/+arrow/+io/+ipc/RecordBatchFileReader.m b/matlab/src/matlab/+arrow/+io/+ipc/RecordBatchFileReader.m
new file mode 100644
index 0000000000000..fc15863603f9c
--- /dev/null
+++ b/matlab/src/matlab/+arrow/+io/+ipc/RecordBatchFileReader.m
@@ -0,0 +1,64 @@
+%RECORDBATCHFILEREADER Class for reading Arrow RecordBatches from the 
+% Arrow binary (IPC) format.
+
+% 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.
+
+classdef RecordBatchFileReader < matlab.mixin.Scalar
+
+    properties(SetAccess=private, GetAccess=public, Hidden)
+        Proxy
+    end
+
+    properties (Dependent, SetAccess=private, GetAccess=public)
+        NumRecordBatches
+        Schema
+    end
+
+    methods
+        function obj = RecordBatchFileReader(filename)
+            arguments
+                filename(1, 1) string {mustBeNonzeroLengthText} 
+            end
+            args = struct(Filename=filename);
+            proxyName = "arrow.io.ipc.proxy.RecordBatchFileReader";
+            obj.Proxy = arrow.internal.proxy.create(proxyName, args);
+        end
+
+        function numRecordBatches = get.NumRecordBatches(obj)
+            numRecordBatches = obj.Proxy.getNumRecordBatches();
+        end
+
+        function schema = get.Schema(obj)
+            proxyID = obj.Proxy.getSchema();
+            proxyName = "arrow.tabular.proxy.Schema";
+            proxy = libmexclass.proxy.Proxy(ID=proxyID, Name=proxyName);
+            schema = arrow.tabular.Schema(proxy);
+        end
+
+        function rb = read(obj, index)
+            arguments
+                obj(1, 1) arrow.io.ipc.RecordBatchFileReader
+                index(1, 1)
+            end
+            index = arrow.internal.validate.index.numeric(index, "int32");
+            args = struct(Index=index);
+            proxyID = obj.Proxy.readRecordBatchAtIndex(args);
+            proxyName = "arrow.tabular.proxy.RecordBatch";
+            proxy = libmexclass.proxy.Proxy(ID=proxyID, Name=proxyName);
+            rb = arrow.tabular.RecordBatch(proxy);
+        end
+    end
+end
\ No newline at end of file
diff --git a/matlab/src/matlab/+arrow/+io/+ipc/RecordBatchFileWriter.m b/matlab/src/matlab/+arrow/+io/+ipc/RecordBatchFileWriter.m
new file mode 100644
index 0000000000000..aee4acf5c16e6
--- /dev/null
+++ b/matlab/src/matlab/+arrow/+io/+ipc/RecordBatchFileWriter.m
@@ -0,0 +1,77 @@
+%RECORDBATCHFILEWRITER Class for serializing record batches to a file using
+% the IPC format.
+
+% 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.
+
+classdef RecordBatchFileWriter < matlab.mixin.Scalar
+
+    properties(SetAccess=private, GetAccess=public, Hidden)
+        Proxy
+    end
+
+    methods
+        function obj = RecordBatchFileWriter(filename, schema)
+            arguments
+                filename(1, 1) string {mustBeNonzeroLengthText} 
+                schema(1, 1) arrow.tabular.Schema
+            end
+            args = struct(Filename=filename, SchemaProxyID=schema.Proxy.ID);
+            proxyName = "arrow.io.ipc.proxy.RecordBatchFileWriter";
+            obj.Proxy = arrow.internal.proxy.create(proxyName, args);
+        end
+
+        function writeRecordBatch(obj, recordBatch)
+            arguments
+                obj(1, 1) arrow.io.ipc.RecordBatchFileWriter
+                recordBatch(1, 1) arrow.tabular.RecordBatch
+            end
+
+            args = struct(RecordBatchProxyID=recordBatch.Proxy.ID);
+            obj.Proxy.writeRecordBatch(args);
+        end
+
+        function writeTable(obj, arrowTable)
+            arguments
+                obj(1, 1) arrow.io.ipc.RecordBatchFileWriter
+                arrowTable(1, 1) arrow.tabular.Table
+            end
+
+            args = struct(TableProxyID=arrowTable.Proxy.ID);
+            obj.Proxy.writeTable(args);
+        end
+
+        function write(obj, tabularObj)
+            arguments
+                obj(1, 1) arrow.io.ipc.RecordBatchFileWriter
+                tabularObj(1, 1)
+            end
+            if isa(tabularObj, "arrow.tabular.RecordBatch")
+                obj.writeRecordBatch(tabularObj);
+            elseif isa(tabularObj, "arrow.tabular.Table")
+                obj.writeTable(tabularObj);
+            else
+                id = "arrow:matlab:ipc:write:InvalidType";
+                msg = "tabularObj input argument must be an instance of " + ...
+                    "either arrow.tabular.RecordBatch or arrow.tabular.Table.";
+                error(id, msg);
+            end
+        end
+
+        function close(obj)
+            obj.Proxy.close();
+        end
+    end
+end
diff --git a/matlab/src/matlab/+arrow/+tabular/+internal/+display/getSchemaString.m b/matlab/src/matlab/+arrow/+tabular/+internal/+display/getSchemaString.m
index 7da945ca993ef..724b4873c92e1 100644
--- a/matlab/src/matlab/+arrow/+tabular/+internal/+display/getSchemaString.m
+++ b/matlab/src/matlab/+arrow/+tabular/+internal/+display/getSchemaString.m
@@ -43,7 +43,7 @@
         classNameAndIDs = strings([1 numel(typeIDs) * 2]);
         classNameAndIDs(1:2:end-1) = classNames;
         classNameAndIDs(2:2:end) = typeIDs;
-        typeIDs = compose("<a href=""matlab:helpPopup %s"" style=""font-weight:bold"">%s</a>", classNameAndIDs);
+        typeIDs = compose("<a href=""matlab:helpPopup('%s')"" style=""font-weight:bold"">%s</a>", classNameAndIDs);
     end
 
     text = names + ": " + typeIDs;
diff --git a/matlab/src/matlab/+arrow/+tabular/RecordBatch.m b/matlab/src/matlab/+arrow/+tabular/RecordBatch.m
index 0225f3d771181..da5c1fc1c3764 100644
--- a/matlab/src/matlab/+arrow/+tabular/RecordBatch.m
+++ b/matlab/src/matlab/+arrow/+tabular/RecordBatch.m
@@ -102,6 +102,19 @@
         function tf = isequal(obj, varargin)
             tf = arrow.tabular.internal.isequal(obj, varargin{:});
         end
+
+        function export(obj, cArrowArrayAddress, cArrowSchemaAddress)
+            arguments
+                obj(1, 1) arrow.tabular.RecordBatch
+                cArrowArrayAddress(1, 1) uint64
+                cArrowSchemaAddress(1, 1) uint64
+            end
+            args = struct(...
+                ArrowArrayAddress=cArrowArrayAddress,...
+                ArrowSchemaAddress=cArrowSchemaAddress...
+            );
+            obj.Proxy.exportToC(args);
+        end
     end
 
     methods (Access = private)
@@ -141,5 +154,14 @@ function displayScalarObject(obj)
             proxy = arrow.internal.proxy.create(proxyName, args);
             recordBatch = arrow.tabular.RecordBatch(proxy);
         end
+
+        function recordBatch = import(cArray, cSchema)
+            arguments
+                cArray(1, 1) arrow.c.Array
+                cSchema(1, 1) arrow.c.Schema
+            end
+            importer = arrow.c.internal.RecordBatchImporter();
+            recordBatch = importer.import(cArray, cSchema);
+        end
     end
 end
diff --git a/matlab/test/arrow/c/tArray.m b/matlab/test/arrow/c/tArray.m
new file mode 100644
index 0000000000000..f8caf48065114
--- /dev/null
+++ b/matlab/test/arrow/c/tArray.m
@@ -0,0 +1,48 @@
+%TARRAY Defines unit tests for arrow.c.Array.
+
+% 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.
+classdef tArray < matlab.unittest.TestCase
+
+    methods (Test)
+        function TestClassStructure(testCase)
+            array = arrow.c.Array();
+            
+            % Verify array is an instance of arrow.c.Array.
+            testCase.verifyInstanceOf(array, "arrow.c.Array");
+            
+            % Verify array has one public property named Address.
+            props = properties(array);
+            testCase.verifyEqual(props, {'Address'});
+        end
+
+        function TestAddressProperty(testCase)
+            array = arrow.c.Array();
+
+            % It's impossible to know what the value of Address will be.
+            % Just verify Address is a scalar uint64.
+            address = array.Address;
+            testCase.verifyInstanceOf(address, "uint64");
+            testCase.verifyTrue(isscalar(address));
+        end
+
+        function TestAddressNoSetter(testCase)
+            % Verify the Address property is read-only.
+            array = arrow.c.Array();
+            fcn = @() setfield(array, "Address", uint64(10));
+            testCase.verifyError(fcn, "MATLAB:class:SetProhibited");
+        end
+    end
+end
\ No newline at end of file
diff --git a/matlab/test/arrow/c/tRoundTrip.m b/matlab/test/arrow/c/tRoundTrip.m
new file mode 100644
index 0000000000000..a72dbe2679a2d
--- /dev/null
+++ b/matlab/test/arrow/c/tRoundTrip.m
@@ -0,0 +1,182 @@
+%TROUNDTRIP Tests for roundtripping using the C Data Interface format.
+
+% 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.
+classdef tRoundTrip < matlab.unittest.TestCase
+
+    methods (Test)
+
+        function EmptyArray(testCase)
+            expected = arrow.array(double.empty(0, 1));
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+
+            expected.export(cArray.Address, cSchema.Address);
+            actual = arrow.array.Array.import(cArray, cSchema);
+
+            testCase.verifyEqual(actual, expected);
+        end
+
+        function ArrayWithNulls(testCase)
+            % Scalar null
+            expected = arrow.array(double(NaN));
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+
+            expected.export(cArray.Address, cSchema.Address);
+            actual = arrow.array.Array.import(cArray, cSchema);
+
+            testCase.verifyEqual(actual, expected);
+
+            % Vector with nulls
+            expected = arrow.array([1, NaN, 3, NaN, 5]);
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+
+            expected.export(cArray.Address, cSchema.Address);
+            actual = arrow.array.Array.import(cArray, cSchema);
+
+            testCase.verifyEqual(actual, expected);
+
+            % Vector all nulls
+            expected = arrow.array([NaN, NaN, NaN]);
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+
+            expected.export(cArray.Address, cSchema.Address);
+            actual = arrow.array.Array.import(cArray, cSchema);
+
+            testCase.verifyEqual(actual, expected);
+        end
+
+        function Float64Array(testCase)
+            % Scalar
+            expected = arrow.array(double(1));
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+
+            expected.export(cArray.Address, cSchema.Address);
+            actual = arrow.array.Array.import(cArray, cSchema);
+
+            testCase.verifyEqual(actual, expected);
+
+            % Vector
+            expected = arrow.array([1, 2, 3]);
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+
+            expected.export(cArray.Address, cSchema.Address);
+            actual = arrow.array.Array.import(cArray, cSchema);
+
+            testCase.verifyEqual(actual, expected);
+        end
+
+        function StringArray(testCase)
+            % Scalar
+            expected = arrow.array("A");
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+
+            expected.export(cArray.Address, cSchema.Address);
+            actual = arrow.array.Array.import(cArray, cSchema);
+
+            testCase.verifyEqual(actual, expected);
+
+            % Vector
+            expected = arrow.array(["A", "B", "C"]);
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+
+            expected.export(cArray.Address, cSchema.Address);
+            actual = arrow.array.Array.import(cArray, cSchema);
+
+            testCase.verifyEqual(actual, expected);
+        end
+
+        function TimestampArray(testCase)
+            % Scalar
+            expected = arrow.array(datetime(2024, 1, 1));
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+
+            expected.export(cArray.Address, cSchema.Address);
+            actual = arrow.array.Array.import(cArray, cSchema);
+
+            testCase.verifyEqual(actual, expected);
+
+            % Vector
+            expected = arrow.array([...
+                datetime(2024, 1, 1),...
+                datetime(2024, 1, 2),...
+                datetime(2024, 1, 3)...
+            ]);
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+
+            expected.export(cArray.Address, cSchema.Address);
+            actual = arrow.array.Array.import(cArray, cSchema);
+
+            testCase.verifyEqual(actual, expected);
+        end
+
+        function ExportErrorWrongInputTypes(testCase)
+            A = arrow.array([1, 2, 3]);
+            fcn = @() A.export("cArray.Address", "cSchema.Address");
+            testCase.verifyError(fcn, "MATLAB:validation:UnableToConvert");
+        end
+
+        function ExportTooFewInputs(testCase)
+            A = arrow.array([1, 2, 3]);
+            fcn = @() A.export();
+            testCase.verifyError(fcn, "MATLAB:minrhs");
+        end
+
+        function ExportTooManyInputs(testCase)
+            A = arrow.array([1, 2, 3]);
+            fcn = @() A.export("A", "B", "C");
+            testCase.verifyError(fcn, "MATLAB:TooManyInputs");
+        end
+
+        function ImportErrorWrongInputTypes(testCase)
+            cArray = "arrow.c.Array";
+            cSchema = "arrow.c.Schema";
+            fcn = @() arrow.array.Array.import(cArray, cSchema);
+            testCase.verifyError(fcn, "MATLAB:validation:UnableToConvert");
+        end
+
+        function ImportTooFewInputs(testCase)
+            fcn = @() arrow.array.Array.import();
+            testCase.verifyError(fcn, "MATLAB:minrhs");
+        end
+
+        function ImportTooManyInputs(testCase)
+            A = arrow.array([1, 2, 3]);
+            fcn = @() arrow.array.Array.import("A", "B", "C");
+            testCase.verifyError(fcn, "MATLAB:TooManyInputs");
+        end
+
+        function ImportErrorImportFailed(testCase)
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+            % An arrow:c:import:ImportFailed error should be thrown
+            % if the supplied arrow.c.Array and arrow.c.Schema were
+            % never populated previously from an exported Array.
+            fcn = @() arrow.array.Array.import(cArray, cSchema);
+            testCase.verifyError(fcn, "arrow:c:import:ImportFailed");
+        end
+
+    end
+
+end
diff --git a/matlab/test/arrow/c/tRoundTripRecordBatch.m b/matlab/test/arrow/c/tRoundTripRecordBatch.m
new file mode 100644
index 0000000000000..5d95aecbe1603
--- /dev/null
+++ b/matlab/test/arrow/c/tRoundTripRecordBatch.m
@@ -0,0 +1,170 @@
+%TROUNDTRIPRECORDBATCH Tests for roundtripping RecordBatches using 
+% the C Data Interface format.
+
+% 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.
+classdef tRoundTripRecordBatch < matlab.unittest.TestCase
+
+    methods (Test)
+        function ZeroColumnRecordBatch(testCase)
+            expected = arrow.recordBatch(table());
+           
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+            expected.export(cArray.Address, cSchema.Address);
+            actual = arrow.tabular.RecordBatch.import(cArray, cSchema);
+
+            testCase.verifyEqual(actual, expected);
+        end
+
+        function ZeroRowRecordBatch(testCase)
+            doubleArray = arrow.array([]);
+            stringArray = arrow.array(string.empty(0, 0));
+            expected = arrow.tabular.RecordBatch.fromArrays(doubleArray, stringArray);
+            
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+            expected.export(cArray.Address, cSchema.Address);
+            actual = arrow.tabular.RecordBatch.import(cArray, cSchema);
+
+            testCase.verifyEqual(actual, expected);
+        end
+
+        function OneRowRecordBatch(testCase)
+            varNames = ["Col1" "Col2" "Col3"];
+            t = table(1, "A", false, VariableNames=varNames);
+            expected = arrow.recordBatch(t);
+
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+            expected.export(cArray.Address, cSchema.Address);
+            actual = arrow.tabular.RecordBatch.import(cArray, cSchema);
+
+            testCase.verifyEqual(actual, expected);
+        end
+
+        function MultiRowRecordBatch(testCase)
+            varNames = ["Col1" "Col2" "Col3"];
+            t = table((1:3)', ["A"; "B"; "C"], [false; true; false],...
+                VariableNames=varNames);
+            expected = arrow.recordBatch(t);
+
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+            expected.export(cArray.Address, cSchema.Address);
+            actual = arrow.tabular.RecordBatch.import(cArray, cSchema);
+
+            testCase.verifyEqual(actual, expected);
+        end
+
+         function ExportErrorWrongInputTypes(testCase)
+            rb = arrow.recordBatch(table([1; 2; 3]));
+            fcn = @() rb.export("cArray.Address", "cSchema.Address");
+            testCase.verifyError(fcn, "MATLAB:validation:UnableToConvert");
+        end
+
+        function ExportTooFewInputs(testCase)
+            rb = arrow.recordBatch(table([1; 2; 3]));
+            fcn = @() rb.export();
+            testCase.verifyError(fcn, "MATLAB:minrhs");
+        end
+
+        function ExportTooManyInputs(testCase)
+            rb = arrow.recordBatch(table([1; 2; 3]));
+            fcn = @() rb.export("A", "B", "C");
+            testCase.verifyError(fcn, "MATLAB:TooManyInputs");
+        end
+
+        function ImportErrorWrongInputTypes(testCase)
+            cArray = "arrow.c.Array";
+            cSchema = "arrow.c.Schema";
+            fcn = @() arrow.tabular.RecordBatch.import(cArray, cSchema);
+            testCase.verifyError(fcn, "MATLAB:validation:UnableToConvert");
+        end
+
+        function ImportTooFewInputs(testCase)
+            fcn = @() arrow.tabular.RecordBatch.import();
+            testCase.verifyError(fcn, "MATLAB:minrhs");
+        end
+
+        function ImportTooManyInputs(testCase)
+            fcn = @() arrow.tabular.RecordBatch.import("A", "B", "C");
+            testCase.verifyError(fcn, "MATLAB:TooManyInputs");
+        end
+
+        function ImportErrorImportFailed(testCase)
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+            % An arrow:c:import:ImportFailed error should be thrown
+            % if the supplied arrow.c.Array and arrow.c.Schema were
+            % never populated previously from an exported Array.
+            fcn = @() arrow.tabular.RecordBatch.import(cArray, cSchema);
+            testCase.verifyError(fcn, "arrow:c:import:ImportFailed");
+        end
+
+        function ImportErrorInvalidSchema(testCase)
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+            % An arrow:c:import:ImportFailed error should be thrown
+            % if the supplied arrow.c.Schema was not populated from a 
+            % struct-like type (i.e. StructArray or RecordBatch).
+            a = arrow.array(1:3);
+            a.export(cArray.Address, cSchema.Address);
+            fcn = @() arrow.tabular.RecordBatch.import(cArray, cSchema);
+            testCase.verifyError(fcn, "arrow:c:import:ImportFailed");
+        end
+
+        function ImportFromStructArray(testCase)
+            % Verify a StructArray exported via the C Data Interface format
+            % can be imported as a RecordBatch.
+            field1 = arrow.array(1:3);
+
+            field2 = arrow.array(["A" "B" "C"]);
+            structArray = arrow.array.StructArray.fromArrays(field1, field2, ...
+                FieldNames=["Number" "Text"]);
+            
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+            structArray.export(cArray.Address, cSchema.Address)
+            rb = arrow.tabular.RecordBatch.import(cArray, cSchema);
+
+            expected = arrow.tabular.RecordBatch.fromArrays(field1, field2, ...
+                ColumnNames=["Number" "Text"]);
+
+            testCase.verifyEqual(rb, expected);
+        end
+
+        function ExportToStructArray(testCase)
+            % Verify a RecordBatch exported via the C Data Interface
+            % format can be imported as a StructArray.
+            column1 = arrow.array(1:3);
+            column2 = arrow.array(["A" "B" "C"]);
+            rb = arrow.tabular.RecordBatch.fromArrays(column1, column2, ...
+                ColumnNames=["Number" "Text"]);
+            
+            cArray = arrow.c.Array();
+            cSchema = arrow.c.Schema();
+            rb.export(cArray.Address, cSchema.Address)
+            structArray = arrow.array.Array.import(cArray, cSchema);
+
+            expected = arrow.array.StructArray.fromArrays(column1, column2, ...
+                FieldNames=["Number" "Text"]);
+
+            testCase.verifyEqual(structArray, expected);
+        end
+
+    end
+
+end
\ No newline at end of file
diff --git a/matlab/test/arrow/c/tSchema.m b/matlab/test/arrow/c/tSchema.m
new file mode 100644
index 0000000000000..16dcf1965b463
--- /dev/null
+++ b/matlab/test/arrow/c/tSchema.m
@@ -0,0 +1,48 @@
+%TSCHEMA Defines unit tests for arrow.c.Schema.
+
+% 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.
+classdef tSchema < matlab.unittest.TestCase
+
+    methods (Test)
+        function TestClassStructure(testCase)
+            schema = arrow.c.Schema();
+            
+            % Verify schema is an instance of arrow.c.Schema.
+            testCase.verifyInstanceOf(schema, "arrow.c.Schema");
+            
+            % Verify schema has one public property named Address.
+            props = properties(schema);
+            testCase.verifyEqual(props, {'Address'});
+        end
+
+        function TestAddressProperty(testCase)
+            schema = arrow.c.Schema();
+
+            % It's impossible to know what the value of Address will be.
+            % Just verify Address is a scalar uint64.
+            address = schema.Address;
+            testCase.verifyInstanceOf(address, "uint64");
+            testCase.verifyTrue(isscalar(address));
+        end
+
+        function TestAddressNoSetter(testCase)
+            % Verify the Address property is read-only.
+            schema = arrow.c.Schema();
+            fcn = @() setfield(schema, "Address", uint64(10));
+            testCase.verifyError(fcn, "MATLAB:class:SetProhibited");
+        end
+    end
+end
\ No newline at end of file
diff --git a/matlab/test/arrow/io/ipc/tRecordBatchFileReader.m b/matlab/test/arrow/io/ipc/tRecordBatchFileReader.m
new file mode 100644
index 0000000000000..eb0069d307779
--- /dev/null
+++ b/matlab/test/arrow/io/ipc/tRecordBatchFileReader.m
@@ -0,0 +1,184 @@
+%TRECORDBATCHFILEREADER Unit tests for arrow.io.ipc.RecordBatchFileReader.
+
+% 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.
+classdef tRecordBatchFileReader < matlab.unittest.TestCase
+
+    properties
+        DataFolder
+        ZeroBatchFile
+        OneBatchFile
+        MultipleBatchFile
+    end
+
+    methods(TestClassSetup)
+        function setupDataFolder(testCase)
+            import matlab.unittest.fixtures.TemporaryFolderFixture
+            fixture = testCase.applyFixture(TemporaryFolderFixture);
+            testCase.DataFolder = string(fixture.Folder);
+        end
+
+        function setupZeroBatchFile(testCase)
+            fieldA = arrow.field("A", arrow.string());
+            fieldB = arrow.field("B", arrow.float32());
+            schema = arrow.schema([fieldA, fieldB]);
+            fname = fullfile(testCase.DataFolder, "ZeroBatchFile.arrow");
+            writer = arrow.io.ipc.RecordBatchFileWriter(fname, schema);
+            writer.close();
+            testCase.ZeroBatchFile = fname;
+        end
+
+        function setupOneBatchFile(testCase)
+            t = table(["Row1"; "Row2"], single([1; 2]), VariableNames=["A", "B"]);
+            recordBatch = arrow.recordBatch(t);
+            fname = fullfile(testCase.DataFolder, "OneBatchFile.arrow");
+            writer = arrow.io.ipc.RecordBatchFileWriter(fname, recordBatch.Schema);
+            writer.writeRecordBatch(recordBatch);
+            writer.close();
+            testCase.OneBatchFile = fname;
+        end
+
+        function setupMultipleBatchFile(testCase)
+            t1 = table(["Row1"; "Row2"], single([1; 2]), VariableNames=["A", "B"]);
+            t2 = table(["Row3"; "Row4"], single([3; 4]), VariableNames=["A", "B"]);
+            recordBatch1 = arrow.recordBatch(t1);
+            recordBatch2 = arrow.recordBatch(t2);
+            fname = fullfile(testCase.DataFolder, "MultipleBatchFile.arrow");
+            writer = arrow.io.ipc.RecordBatchFileWriter(fname, recordBatch1.Schema);
+            writer.writeRecordBatch(recordBatch1);
+            writer.writeRecordBatch(recordBatch2);
+            writer.close();
+            testCase.MultipleBatchFile = fname;
+        end
+    end
+
+    methods (Test)
+        function ZeroLengthFilenameError(testCase)
+            % Verify RecordBatchFileReader throws an exception with the
+            % identifier MATLAB:validators:mustBeNonzeroLengthText if the
+            % filename input argument given is a zero length string.
+            fcn = @() arrow.io.ipc.RecordBatchFileReader("");
+            testCase.verifyError(fcn, "MATLAB:validators:mustBeNonzeroLengthText");
+        end
+
+        function MissingStringFilenameError(testCase)
+            % Verify RecordBatchFileReader throws an exception with the
+            % identifier MATLAB:validators:mustBeNonzeroLengthText if the
+            % filename input argument given is a missing string.
+            fcn = @() arrow.io.ipc.RecordBatchFileReader(string(missing));
+            testCase.verifyError(fcn, "MATLAB:validators:mustBeNonzeroLengthText");
+        end
+
+        function FilenameInvalidTypeError(testCase)
+            % Verify RecordBatchFileReader throws an exception with the
+            % identifier MATLAB:validators:UnableToConvert if the filename
+            % input argument is neither a scalar string nor a char vector.
+            fcn = @() arrow.io.ipc.RecordBatchFileReader(table);
+            testCase.verifyError(fcn, "MATLAB:validation:UnableToConvert");
+        end
+
+        function NumRecordBatches(testCase)
+            % Verify the getter method for NumRecordBatches returns the
+            % expected value.
+            reader = arrow.io.ipc.RecordBatchFileReader(testCase.ZeroBatchFile);
+            testCase.verifyEqual(reader.NumRecordBatches, int32(0));
+
+            reader = arrow.io.ipc.RecordBatchFileReader(testCase.OneBatchFile);
+            testCase.verifyEqual(reader.NumRecordBatches, int32(1));
+
+             reader = arrow.io.ipc.RecordBatchFileReader(testCase.MultipleBatchFile);
+            testCase.verifyEqual(reader.NumRecordBatches, int32(2));
+        end
+
+        function NumRecordNoSetter(testCase)
+            % Verify the NumRecordBatches property is not settable.
+            reader = arrow.io.ipc.RecordBatchFileReader(testCase.ZeroBatchFile);
+            testCase.verifyError(@() setfield(reader, "NumRecordBatches", int32(10)), "MATLAB:class:SetProhibited");
+        end
+
+        function Schema(testCase)
+            % Verify the getter method for Schema returns the
+            % expected value.
+            fieldA = arrow.field("A", arrow.string());
+            fieldB = arrow.field("B", arrow.float32());
+            expectedSchema = arrow.schema([fieldA fieldB]);
+            
+            reader = arrow.io.ipc.RecordBatchFileReader(testCase.ZeroBatchFile);
+            testCase.verifyEqual(reader.Schema, expectedSchema);
+
+            reader = arrow.io.ipc.RecordBatchFileReader(testCase.OneBatchFile);
+            testCase.verifyEqual(reader.Schema, expectedSchema);
+
+            reader = arrow.io.ipc.RecordBatchFileReader(testCase.MultipleBatchFile);
+            testCase.verifyEqual(reader.Schema, expectedSchema);
+        end
+
+        function SchemaNoSetter(testCase)
+            % Verify the Schema property is not settable.
+            fieldC = arrow.field("C", arrow.date32());
+            schema = arrow.schema(fieldC);
+            reader = arrow.io.ipc.RecordBatchFileReader(testCase.ZeroBatchFile);
+            testCase.verifyError(@() setfield(reader, "Schema", schema), "MATLAB:class:SetProhibited");
+        end
+
+        function readInvalidIndexType(testCase)
+            % Verify read throws an exception with the identifier
+            % arrow:badsubscript:NonNumeric if the index argument given is
+            % not numeric.
+            reader = arrow.io.ipc.RecordBatchFileReader(testCase.MultipleBatchFile);
+
+            fcn = @() reader.read("index");
+            testCase.verifyError(fcn, "arrow:badsubscript:NonNumeric");
+        end
+
+        function readInvalidNumericIndex(testCase)
+            % Verify read throws an exception if the index argument given
+            % is nonpositive or noninteger number.
+            reader = arrow.io.ipc.RecordBatchFileReader(testCase.MultipleBatchFile);
+            fcn = @() reader.read(-1);
+            testCase.verifyError(fcn, "arrow:badsubscript:NonPositive");
+            fcn = @() reader.read(0);
+            testCase.verifyError(fcn, "arrow:badsubscript:NonPositive");
+            fcn = @() reader.read(1.1);
+            testCase.verifyError(fcn, "arrow:badsubscript:NonInteger");
+        end
+
+        function readInvalidNumericIndexValue(testCase)
+            % Verify read throws an exception with the identifier 
+            % arrow:io:ipc:InvalidIndex if the index given is greater
+            % than the NumRecordBatches in the file.
+            reader = arrow.io.ipc.RecordBatchFileReader(testCase.MultipleBatchFile);
+            fcn = @() reader.read(3);
+            testCase.verifyError(fcn, "arrow:io:ipc:InvalidIndex");
+        end
+
+        function readAtIndex(testCase)
+            % Verify read returns the expected RecordBatch for the given
+            % index.
+            t1 = table(["Row1"; "Row2"], single([1; 2]), VariableNames=["A", "B"]);
+            t2 = table(["Row3"; "Row4"], single([3; 4]), VariableNames=["A", "B"]);
+
+            reader = arrow.io.ipc.RecordBatchFileReader(testCase.MultipleBatchFile);
+            
+            actual1 = reader.read(1);
+            expected1 = arrow.recordBatch(t1);
+            testCase.verifyEqual(actual1, expected1);
+
+            actual2 = reader.read(2);
+            expected2 = arrow.recordBatch(t2);
+            testCase.verifyEqual(actual2, expected2);
+        end
+    end
+end
\ No newline at end of file
diff --git a/matlab/test/arrow/io/ipc/tRecordBatchFileWriter.m b/matlab/test/arrow/io/ipc/tRecordBatchFileWriter.m
new file mode 100644
index 0000000000000..25bbf4474edd4
--- /dev/null
+++ b/matlab/test/arrow/io/ipc/tRecordBatchFileWriter.m
@@ -0,0 +1,211 @@
+%TRECORDBATCHFILEWRITER Unit tests for arrow.io.ipc.RecordBatchFileWriter.
+
+% 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.
+
+classdef tRecordBatchFileWriter < matlab.unittest.TestCase
+
+    methods
+        function folder = setupTemporaryFolder(testCase)
+            import matlab.unittest.fixtures.TemporaryFolderFixture
+            fixture = testCase.applyFixture(TemporaryFolderFixture);
+            folder = string(fixture.Folder);
+        end
+    end
+
+    methods (Test)
+        function ZeroLengthFilenameError(testCase)
+            % Verify RecordBatchFileWriter throws an exception with the
+            % identifier MATLAB:validators:mustBeNonzeroLengthText if the
+            % filename input argument given is a zero length string.
+            schema = arrow.schema(arrow.field("A", arrow.float64()));
+            fcn = @() arrow.io.ipc.RecordBatchFileWriter("", schema);
+            testCase.verifyError(fcn, "MATLAB:validators:mustBeNonzeroLengthText");
+        end
+
+        function MissingStringFilenameError(testCase)
+            % Verify RecordBatchFileWriter throws an exception with the
+            % identifier MATLAB:validators:mustBeNonzeroLengthText if the
+            % filename input argument given is  a missing string.
+            schema = arrow.schema(arrow.field("A", arrow.float64()));
+            fcn = @() arrow.io.ipc.RecordBatchFileWriter(string(missing), schema);
+            testCase.verifyError(fcn, "MATLAB:validators:mustBeNonzeroLengthText");
+        end
+
+        function FilenameInvalidTypeError(testCase)
+            % Verify RecordBatchFileWriter throws an exception with the
+            % identifier MATLAB:validators:UnableToConvert if the filename
+            % input argument is neither a scalar string nor a char vector.
+            schema = arrow.schema(arrow.field("A", arrow.float64()));
+            fcn = @() arrow.io.ipc.RecordBatchFileWriter(table, schema);
+            testCase.verifyError(fcn, "MATLAB:validation:UnableToConvert");
+        end
+
+        function InvalidSchemaType(testCase)
+            % Verify RecordBatchFileWriter throws an exception with the
+            % identifier MATLAB:validators:UnableToConvert if the schema
+            % input argument is not an arrow.tabular.Schema instance.
+            folder = testCase.setupTemporaryFolder();
+            fname = fullfile(folder, "data.arrow");
+            schema = arrow.field("A", arrow.float64());
+            fcn = @() arrow.io.ipc.RecordBatchFileWriter(fname, schema);
+            testCase.verifyError(fcn, "MATLAB:validation:UnableToConvert");
+        end
+
+        function writeRecordBatchInvalidType(testCase)
+            % Verify writeRecordBatch throws an exception with the
+            % identifier MATLAB:validators:UnableToConvert if the
+            % recordBatch input argument given is not an
+            % arrow.tabular.RecordBatch instance.
+            folder = testCase.setupTemporaryFolder();
+            fname = fullfile(folder, "data.arrow");
+            schema = arrow.schema(arrow.field("A", arrow.float64()));
+            writer = arrow.io.ipc.RecordBatchFileWriter(fname, schema);
+            arrowTable = arrow.table(table([1 2 3 4]', VariableNames="A"));
+            fcn = @() writer.writeRecordBatch(arrowTable);
+            testCase.verifyError(fcn, "MATLAB:validation:UnableToConvert");
+        end
+
+        function writeTableInvalidType(testCase)
+            % Verify writeTable throws an exception with the
+            % identifier MATLAB:validators:UnableToConvert if the table 
+            % input argument given is not an arrow.tabular.Table instance.
+            folder = testCase.setupTemporaryFolder();
+            fname = fullfile(folder, "data.arrow");
+            schema = arrow.schema(arrow.field("A", arrow.float64()));
+            writer = arrow.io.ipc.RecordBatchFileWriter(fname, schema);
+            arrowRecordBatch = arrow.recordBatch(table([1 2 3 4]', VariableNames="A"));
+            fcn = @() writer.writeTable(arrowRecordBatch);
+            testCase.verifyError(fcn, "MATLAB:validation:UnableToConvert");
+        end
+
+        function writeInvalidType(testCase)
+            % Verify writeTable throws an exception with the
+            % identifier arrow:matlab:ipc:write:InvalidType if the 
+            % tabularObj input argument given is neither an
+            % arrow.tabular.Table or an arrow.tabular.RecordBatch.
+            folder = testCase.setupTemporaryFolder();
+            fname = fullfile(folder, "data.arrow");
+            schema = arrow.schema(arrow.field("A", arrow.float64()));
+            writer = arrow.io.ipc.RecordBatchFileWriter(fname, schema);
+            fcn = @() writer.write(schema);
+            testCase.verifyError(fcn, "arrow:matlab:ipc:write:InvalidType");
+        end
+
+        function writeRecordBatchInvalidSchema(testCase)
+            % Verify writeRecordBatch throws an exception with the
+            % identifier arrow:io:ipc:FailedToWriteRecordBatch if the
+            % schema of the given record batch does match the expected 
+            % schema.
+            folder = testCase.setupTemporaryFolder();
+            fname = fullfile(folder, "data.arrow");
+            schema = arrow.schema(arrow.field("A", arrow.float64()));
+            writer = arrow.io.ipc.RecordBatchFileWriter(fname, schema);
+
+            arrowRecordBatch = arrow.recordBatch(table([1 2 3 4]', VariableNames="B"));
+            fcn = @() writer.writeRecordBatch(arrowRecordBatch);
+            testCase.verifyError(fcn, "arrow:io:ipc:FailedToWriteRecordBatch");
+        end
+
+         function writeTableInvalidSchema(testCase)
+            % Verify writeTable throws an exception with the
+            % identifier arrow:io:ipc:FailedToWriteRecordBatch if the
+            % schema of the given table does match the expected schema.
+            folder = testCase.setupTemporaryFolder();
+            fname = fullfile(folder, "data.arrow");
+            schema = arrow.schema(arrow.field("A", arrow.float64()));
+            writer = arrow.io.ipc.RecordBatchFileWriter(fname, schema);
+
+            arrowTable = arrow.table(table([1 2 3 4]', VariableNames="B"));
+            fcn = @() writer.writeTable(arrowTable);
+            testCase.verifyError(fcn, "arrow:io:ipc:FailedToWriteRecordBatch");
+         end
+
+         function writeInvalidSchema(testCase)
+            % Verify write throws an exception with the
+            % identifier arrow:io:ipc:FailedToWriteRecordBatch if the
+            % schema of the given record batch or table does match the 
+            % expected schema.
+            folder = testCase.setupTemporaryFolder();
+            fname = fullfile(folder, "data.arrow");
+            schema = arrow.schema(arrow.field("A", arrow.float64()));
+            writer = arrow.io.ipc.RecordBatchFileWriter(fname, schema);
+
+            arrowTable = arrow.table(table([1 2 3 4]', VariableNames="B"));
+            fcn = @() writer.write(arrowTable);
+            testCase.verifyError(fcn, "arrow:io:ipc:FailedToWriteRecordBatch");
+
+            arrowRecordBatch = arrow.recordBatch(table([1 2 3 4]', VariableNames="B"));
+            fcn = @() writer.write(arrowRecordBatch);
+            testCase.verifyError(fcn, "arrow:io:ipc:FailedToWriteRecordBatch");
+         end
+
+         function writeRecordBatchSmoke(testCase)
+            % Verify writeRecordBatch does not error or issue a warning
+            % if it successfully writes the record batch to the file.
+            folder = testCase.setupTemporaryFolder();
+            fname = fullfile(folder, "data.arrow");
+            schema = arrow.schema(arrow.field("A", arrow.float64()));
+            writer = arrow.io.ipc.RecordBatchFileWriter(fname, schema);
+            arrowRecordBatch = arrow.recordBatch(table([1 2 3 4]', VariableNames="A"));
+
+            fcn = @() writer.writeRecordBatch(arrowRecordBatch);
+            testCase.verifyWarningFree(fcn);
+         end
+
+        function writeTableBatchSmoke(testCase)
+            % Verify writeTable does not error or issue a warning
+            % if it successfully writes the table to the file.
+            folder = testCase.setupTemporaryFolder();
+            fname = fullfile(folder, "data.arrow");
+            schema = arrow.schema(arrow.field("A", arrow.float64()));
+            writer = arrow.io.ipc.RecordBatchFileWriter(fname, schema);
+            arrowTable = arrow.table(table([1 2 3 4]', VariableNames="A"));
+
+            fcn = @() writer.writeTable(arrowTable);
+            testCase.verifyWarningFree(fcn);
+        end
+
+        function writeSmoke(testCase)
+            % Verify write does not error or issue a warning if it
+            % successfully writes the record batch or table to the file.
+            folder = testCase.setupTemporaryFolder();
+            fname = fullfile(folder, "data.arrow");
+            schema = arrow.schema(arrow.field("A", arrow.float64()));
+            writer = arrow.io.ipc.RecordBatchFileWriter(fname, schema);
+            arrowRecordBatch = arrow.recordBatch(table([1 2 3 4]', VariableNames="A"));
+
+            fcn = @() writer.write(arrowRecordBatch);
+            testCase.verifyWarningFree(fcn);
+
+            arrowTable = arrow.table(table([1 2 3 4]', VariableNames="A"));
+            fcn = @() writer.write(arrowTable);
+            testCase.verifyWarningFree(fcn);
+        end
+
+        function closeSmoke(testCase)
+            % Verify close does not error or issue a warning if it was
+            % successful.
+            folder = testCase.setupTemporaryFolder();
+            fname = fullfile(folder, "data.arrow");
+            schema = arrow.schema(arrow.field("A", arrow.float64()));
+            writer = arrow.io.ipc.RecordBatchFileWriter(fname, schema);
+            arrowTable = arrow.table(table([1 2 3 4]', VariableNames="A"));
+            writer.write(arrowTable);
+            fcn = @() writer.close();
+            testCase.verifyWarningFree(fcn);
+        end
+    end
+end
\ No newline at end of file
diff --git a/matlab/tools/cmake/BuildMatlabArrowInterface.cmake b/matlab/tools/cmake/BuildMatlabArrowInterface.cmake
index cb746e08b1f8e..5ed68ec246ee5 100644
--- a/matlab/tools/cmake/BuildMatlabArrowInterface.cmake
+++ b/matlab/tools/cmake/BuildMatlabArrowInterface.cmake
@@ -24,8 +24,7 @@ set(MATLAB_ARROW_LIBMEXCLASS_CLIENT_FETCH_CONTENT_NAME libmexclass)
 # libmexclass is accessible for CI without permission issues.
 set(MATLAB_ARROW_LIBMEXCLASS_CLIENT_FETCH_CONTENT_GIT_REPOSITORY "https://github.com/mathworks/libmexclass.git")
 # Use a specific Git commit hash to avoid libmexclass version changing unexpectedly.
-set(MATLAB_ARROW_LIBMEXCLASS_CLIENT_FETCH_CONTENT_GIT_TAG "d04f88d")
-                                                           
+set(MATLAB_ARROW_LIBMEXCLASS_CLIENT_FETCH_CONTENT_GIT_TAG "ca3cea6")
 set(MATLAB_ARROW_LIBMEXCLASS_CLIENT_FETCH_CONTENT_SOURCE_SUBDIR "libmexclass/cpp")
 
 # ------------------------------------------
@@ -76,7 +75,13 @@ set(MATLAB_ARROW_LIBMEXCLASS_CLIENT_PROXY_SOURCES "${CMAKE_SOURCE_DIR}/src/cpp/a
                                                   "${CMAKE_SOURCE_DIR}/src/cpp/arrow/matlab/io/csv/proxy/table_writer.cc"
                                                   "${CMAKE_SOURCE_DIR}/src/cpp/arrow/matlab/io/csv/proxy/table_reader.cc"
                                                   "${CMAKE_SOURCE_DIR}/src/cpp/arrow/matlab/index/validate.cc"
-                                                  "${CMAKE_SOURCE_DIR}/src/cpp/arrow/matlab/buffer/proxy/buffer.cc")
+                                                  "${CMAKE_SOURCE_DIR}/src/cpp/arrow/matlab/buffer/proxy/buffer.cc"
+                                                  "${CMAKE_SOURCE_DIR}/src/cpp/arrow/matlab/c/proxy/array.cc"
+                                                  "${CMAKE_SOURCE_DIR}/src/cpp/arrow/matlab/c/proxy/array_importer.cc"
+                                                  "${CMAKE_SOURCE_DIR}/src/cpp/arrow/matlab/c/proxy/schema.cc"
+                                                  "${CMAKE_SOURCE_DIR}/src/cpp/arrow/matlab/c/proxy/record_batch_importer.cc"
+                                                  "${CMAKE_SOURCE_DIR}/src/cpp/arrow/matlab/io/ipc/proxy/record_batch_file_reader.cc"
+                                                  "${CMAKE_SOURCE_DIR}/src/cpp/arrow/matlab/io/ipc/proxy/record_batch_file_writer.cc")
 
 
 set(MATLAB_ARROW_LIBMEXCLASS_CLIENT_PROXY_FACTORY_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/src/cpp/arrow/matlab/proxy")
diff --git a/matlab/tools/packageMatlabInterface.m b/matlab/tools/packageMatlabInterface.m
new file mode 100644
index 0000000000000..5c82763b25f8a
--- /dev/null
+++ b/matlab/tools/packageMatlabInterface.m
@@ -0,0 +1,88 @@
+% 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.
+
+toolboxFolder = string(getenv("ARROW_MATLAB_TOOLBOX_FOLDER"));
+outputFolder = string(getenv("ARROW_MATLAB_TOOLBOX_OUTPUT_FOLDER"));
+toolboxVersionRaw = string(getenv("ARROW_MATLAB_TOOLBOX_VERSION"));
+
+appendLicenseText(fullfile(toolboxFolder, "LICENSE.txt"));
+appendNoticeText(fullfile(toolboxFolder, "NOTICE.txt"));
+
+% Output folder must exist.
+mkdir(outputFolder);
+
+disp("Toolbox Folder: " + toolboxFolder);
+disp("Output Folder: " + outputFolder);
+disp("Toolbox Version Raw: " + toolboxVersionRaw);
+
+versionPattern = regexpPattern("^[0-9]+\.[0-9]+\.[0-9]+");
+toolboxVersion = extract(toolboxVersionRaw, versionPattern);
+if isempty(toolboxVersion)
+    error("Unable to extract MAJOR.MINOR.PATCH version string from " + toolboxVersionRaw);
+end
+
+disp("Toolbox Version:" + toolboxVersion);
+
+identifier = "ad1d0fe6-22d1-4969-9e6f-0ab5d0f12ce3";
+opts = matlab.addons.toolbox.ToolboxOptions(toolboxFolder, identifier);
+opts.ToolboxName = "MATLAB Arrow Interface";
+opts.ToolboxVersion = toolboxVersion;
+opts.AuthorName = "The Apache Software Foundation";
+opts.AuthorEmail = "dev@arrow.apache.org";
+
+% Set the SupportedPlatforms
+opts.SupportedPlatforms.Win64 = true;
+opts.SupportedPlatforms.Maci64 = true;
+opts.SupportedPlatforms.Glnxa64 = true;
+opts.SupportedPlatforms.MatlabOnline = true;
+
+% MEX files use run-time libraries shipped with MATLAB (e.g. libmx, libmex,
+% etc.). MEX files linked against earlier versions of MALTAB run-time libraries
+% will most likely work on newer versions of MATLAB. However, this may not
+% always be the case.
+% 
+% For now, set the earliest and latest compatible releases of MATLAB to 
+% the release of MATLAB used to build and package the MATLAB Arrow Interface.
+% 
+% See: https://www.mathworks.com/help/matlab/matlab_external/version-compatibility.html
+currentRelease = matlabRelease.Release;
+opts.MinimumMatlabRelease = currentRelease;
+opts.MaximumMatlabRelease = currentRelease;
+
+opts.OutputFile = fullfile(outputFolder, compose("matlab-arrow-%s.mltbx", toolboxVersion));
+disp("Output File: " + opts.OutputFile);
+matlab.addons.toolbox.packageToolbox(opts);
+
+function appendLicenseText(filename)
+    licenseText = [ ...
+        newline + "--------------------------------------------------------------------------------" + newline
+        "3rdparty dependency mathworks/libmexclass is redistributed as a dynamically"
+        "linked shared library in certain binary distributions, like the MATLAB"
+        "distribution." + newline
+        "Copyright: 2022-2024 The MathWorks, Inc. All rights reserved."
+        "Homepage: https://github.com/mathworks/libmexclass"
+        "License: 3-clause BSD" ];
+    writelines(licenseText, filename, WriteMode="append");
+end
+
+function appendNoticeText(filename)
+    noticeText = [ ...
+        newline + "---------------------------------------------------------------------------------" + newline 
+        "This product includes software from The MathWorks, Inc. (Apache 2.0)"
+        "  * Copyright (C) 2024 The MathWorks, Inc."];
+    writelines(noticeText, filename, WriteMode="append");
+end
\ No newline at end of file
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index af65ea7d61483..a8bbed117163d 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -21,7 +21,7 @@
 cmake_minimum_required(VERSION 3.16)
 project(pyarrow)
 
-set(PYARROW_VERSION "16.0.0-SNAPSHOT")
+set(PYARROW_VERSION "17.0.0-SNAPSHOT")
 string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" PYARROW_BASE_VERSION "${PYARROW_VERSION}")
 
 # Running from a Python sdist tarball
@@ -108,25 +108,6 @@ if(UNIX)
   endif()
 endif()
 
-# Top level cmake dir
-if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
-  option(PYARROW_BUILD_ACERO "Build the PyArrow Acero integration" OFF)
-  option(PYARROW_BUILD_CUDA "Build the PyArrow CUDA support" OFF)
-  option(PYARROW_BUILD_DATASET "Build the PyArrow Dataset integration" OFF)
-  option(PYARROW_BUILD_FLIGHT "Build the PyArrow Flight integration" OFF)
-  option(PYARROW_BUILD_GANDIVA "Build the PyArrow Gandiva integration" OFF)
-  option(PYARROW_BUILD_ORC "Build the PyArrow ORC integration" OFF)
-  option(PYARROW_BUILD_PARQUET "Build the PyArrow Parquet integration" OFF)
-  option(PYARROW_BUILD_PARQUET_ENCRYPTION
-         "Build the PyArrow Parquet encryption integration" OFF)
-  option(PYARROW_BUNDLE_ARROW_CPP "Bundle the Arrow C++ libraries" OFF)
-  option(PYARROW_BUNDLE_CYTHON_CPP "Bundle the C++ files generated by Cython" OFF)
-  option(PYARROW_GENERATE_COVERAGE "Build with Cython code coverage enabled" OFF)
-  set(PYARROW_CXXFLAGS
-      ""
-      CACHE STRING "Compiler flags to append when compiling Arrow")
-endif()
-
 find_program(CCACHE_FOUND ccache)
 if(CCACHE_FOUND
    AND NOT CMAKE_C_COMPILER_LAUNCHER
@@ -265,11 +246,70 @@ message(STATUS "NumPy include dir: ${NUMPY_INCLUDE_DIRS}")
 
 include(UseCython)
 
-# PyArrow C++
+# Arrow C++ and set default PyArrow build options
 include(GNUInstallDirs)
-
 find_package(Arrow REQUIRED)
 
+macro(define_option name description arrow_option)
+  set("PYARROW_${name}"
+      "AUTO"
+      CACHE STRING ${description})
+
+  if("${PYARROW_${name}}" STREQUAL "AUTO")
+    # by default, first check if env variable exists, otherwise use Arrow C++ config
+    set(env_variable "PYARROW_WITH_${name}")
+    if(DEFINED ENV{${env_variable}})
+      if($ENV{${env_variable}})
+        set("PYARROW_BUILD_${name}" ON)
+      else()
+        set("PYARROW_BUILD_${name}" OFF)
+      endif()
+    else()
+      if(${arrow_option})
+        set("PYARROW_BUILD_${name}" ON)
+      else()
+        set("PYARROW_BUILD_${name}" OFF)
+      endif()
+    endif()
+  else()
+    if("${PYARROW_${name}}")
+      set("PYARROW_BUILD_${name}" ON)
+    else()
+      set("PYARROW_BUILD_${name}" OFF)
+    endif()
+  endif()
+endmacro()
+
+define_option(ACERO "Build the PyArrow Acero integration" ARROW_ACERO)
+define_option(CUDA "Build the PyArrow CUDA support" ARROW_CUDA)
+define_option(DATASET "Build the PyArrow Dataset integration" ARROW_DATASET)
+define_option(FLIGHT "Build the PyArrow Flight integration" ARROW_FLIGHT)
+define_option(GANDIVA "Build the PyArrow Gandiva integration" ARROW_GANDIVA)
+define_option(ORC "Build the PyArrow ORC integration" ARROW_ORC)
+define_option(PARQUET "Build the PyArrow Parquet integration" ARROW_PARQUET)
+define_option(PARQUET_ENCRYPTION "Build the PyArrow Parquet encryption integration"
+              PARQUET_REQUIRE_ENCRYPTION)
+define_option(SUBSTRAIT "Build the PyArrow Substrait integration" ARROW_SUBSTRAIT)
+define_option(AZURE "Build the PyArrow Azure integration" ARROW_AZURE)
+define_option(GCS "Build the PyArrow GCS integration" ARROW_GCS)
+define_option(S3 "Build the PyArrow S3 integration" ARROW_S3)
+define_option(HDFS "Build the PyArrow HDFS integration" ARROW_HDFS)
+option(PYARROW_BUNDLE_ARROW_CPP "Bundle the Arrow C++ libraries" OFF)
+option(PYARROW_BUNDLE_CYTHON_CPP "Bundle the C++ files generated by Cython" OFF)
+option(PYARROW_GENERATE_COVERAGE "Build with Cython code coverage enabled" OFF)
+set(PYARROW_CXXFLAGS
+    ""
+    CACHE STRING "Compiler flags to append when compiling PyArrow C++")
+
+# enforce module dependencies
+if(PYARROW_BUILD_SUBSTRAIT)
+  set(PYARROW_BUILD_DATASET ON)
+endif()
+if(PYARROW_BUILD_DATASET)
+  set(PYARROW_BUILD_ACERO ON)
+endif()
+
+# PyArrow C++
 set(PYARROW_CPP_ROOT_DIR pyarrow/src)
 set(PYARROW_CPP_SOURCE_DIR ${PYARROW_CPP_ROOT_DIR}/arrow/python)
 set(PYARROW_CPP_SRCS
@@ -305,6 +345,7 @@ set(PYARROW_CPP_LINK_LIBS "")
 
 # Check all the options from Arrow and PyArrow C++ to be in line
 if(PYARROW_BUILD_DATASET)
+  message(STATUS "Building PyArrow with Dataset")
   if(NOT ARROW_DATASET)
     message(FATAL_ERROR "You must build Arrow C++ with ARROW_DATASET=ON")
   endif()
@@ -317,6 +358,7 @@ if(PYARROW_BUILD_DATASET)
 endif()
 
 if(PYARROW_BUILD_ACERO)
+  message(STATUS "Building PyArrow with Acero")
   if(NOT ARROW_ACERO)
     message(FATAL_ERROR "You must build Arrow C++ with ARROW_ACERO=ON")
   endif()
@@ -328,16 +370,17 @@ if(PYARROW_BUILD_ACERO)
   endif()
 endif()
 
-if(PYARROW_BUILD_PARQUET OR PYARROW_BUILD_PARQUET_ENCRYPTION)
+if(PYARROW_BUILD_PARQUET)
+  message(STATUS "Building PyArrow with Parquet")
   if(NOT ARROW_PARQUET)
     message(FATAL_ERROR "You must build Arrow C++ with ARROW_PARQUET=ON")
   endif()
   find_package(Parquet REQUIRED)
-endif()
-
-if(PYARROW_BUILD_HDFS)
-  if(NOT ARROW_HDFS)
-    message(FATAL_ERROR "You must build Arrow C++ with ARROW_HDFS=ON")
+else()
+  if(PYARROW_BUILD_PARQUET_ENCRYPTION)
+    message(WARNING "Building PyArrow with Parquet Encryption is requested, but Parquet itself is not enabled. Ignoring the Parquet Encryption setting."
+    )
+    set(PYARROW_BUILD_PARQUET_ENCRYPTION OFF)
   endif()
 endif()
 
@@ -400,6 +443,7 @@ endif()
 
 set(PYARROW_CPP_FLIGHT_SRCS ${PYARROW_CPP_SOURCE_DIR}/flight.cc)
 if(PYARROW_BUILD_FLIGHT)
+  message(STATUS "Building PyArrow with Flight")
   if(NOT ARROW_FLIGHT)
     message(FATAL_ERROR "You must build Arrow C++ with ARROW_FLIGHT=ON")
   endif()
@@ -555,23 +599,39 @@ set_source_files_properties(pyarrow/lib.pyx PROPERTIES CYTHON_API TRUE)
 set(LINK_LIBS arrow_python)
 
 if(PYARROW_BUILD_AZURE)
+  message(STATUS "Building PyArrow with Azure")
+  if(NOT ARROW_AZURE)
+    message(FATAL_ERROR "You must build Arrow C++ with ARROW_AZURE=ON")
+  endif()
   list(APPEND CYTHON_EXTENSIONS _azurefs)
 endif()
 
 if(PYARROW_BUILD_GCS)
+  message(STATUS "Building PyArrow with GCS")
+  if(NOT ARROW_GCS)
+    message(FATAL_ERROR "You must build Arrow C++ with ARROW_GCS=ON")
+  endif()
   list(APPEND CYTHON_EXTENSIONS _gcsfs)
 endif()
 
 if(PYARROW_BUILD_S3)
+  message(STATUS "Building PyArrow with S3")
+  if(NOT ARROW_S3)
+    message(FATAL_ERROR "You must build Arrow C++ with ARROW_S3=ON")
+  endif()
   list(APPEND CYTHON_EXTENSIONS _s3fs)
 endif()
 
 if(PYARROW_BUILD_HDFS)
+  message(STATUS "Building PyArrow with HDFS")
+  if(NOT ARROW_HDFS)
+    message(FATAL_ERROR "You must build Arrow C++ with ARROW_HDFS=ON")
+  endif()
   list(APPEND CYTHON_EXTENSIONS _hdfs)
 endif()
 
 if(PYARROW_BUILD_CUDA)
-  # Arrow CUDA
+  message(STATUS "Building PyArrow with CUDA")
   if(NOT ARROW_CUDA)
     message(FATAL_ERROR "You must build Arrow C++ with ARROW_CUDA=ON")
   endif()
@@ -646,8 +706,9 @@ if(PYARROW_BUILD_PARQUET)
   endif()
 endif()
 
+# ORC
 if(PYARROW_BUILD_ORC)
-  # ORC
+  message(STATUS "Building PyArrow with ORC")
   if(NOT ARROW_ORC)
     message(FATAL_ERROR "You must build Arrow C++ with ARROW_ORC=ON")
   endif()
@@ -679,6 +740,7 @@ endif()
 
 # Substrait
 if(PYARROW_BUILD_SUBSTRAIT)
+  message(STATUS "Building PyArrow with Substrait")
   if(NOT ARROW_SUBSTRAIT)
     message(FATAL_ERROR "You must build Arrow C++ with ARROW_SUBSTRAIT=ON")
   endif()
@@ -696,6 +758,7 @@ endif()
 
 # Gandiva
 if(PYARROW_BUILD_GANDIVA)
+  message(STATUS "Building PyArrow with Gandiva")
   if(NOT ARROW_GANDIVA)
     message(FATAL_ERROR "You must build Arrow C++ with ARROW_GANDIVA=ON")
   endif()
diff --git a/python/benchmarks/common.py b/python/benchmarks/common.py
index 48526a4054e96..8317ff3171bb9 100644
--- a/python/benchmarks/common.py
+++ b/python/benchmarks/common.py
@@ -26,7 +26,6 @@
 
 import pyarrow as pa
 
-
 KILOBYTE = 1 << 10
 MEGABYTE = KILOBYTE * KILOBYTE
 
diff --git a/python/benchmarks/convert_pandas.py b/python/benchmarks/convert_pandas.py
index 184fd4a66b1dc..378c17c8b8f59 100644
--- a/python/benchmarks/convert_pandas.py
+++ b/python/benchmarks/convert_pandas.py
@@ -17,9 +17,9 @@
 
 import numpy as np
 import pandas as pd
-import pandas.util.testing as tm
 
 import pyarrow as pa
+from pyarrow.tests.util import rands
 
 
 class PandasConversionsBase(object):
@@ -60,7 +60,7 @@ class ToPandasStrings(object):
 
     def setup(self, uniqueness, total):
         nunique = int(total * uniqueness)
-        unique_values = [tm.rands(self.string_length) for i in range(nunique)]
+        unique_values = [rands(self.string_length) for i in range(nunique)]
         values = unique_values * (total // nunique)
         self.arr = pa.array(values, type=pa.string())
         self.table = pa.Table.from_arrays([self.arr], ['f0'])
diff --git a/python/benchmarks/parquet.py b/python/benchmarks/parquet.py
index ca39919b4b9b7..1ad2602752799 100644
--- a/python/benchmarks/parquet.py
+++ b/python/benchmarks/parquet.py
@@ -15,7 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from pandas.util.testing import rands
 import numpy as np
 
 import pyarrow as pa
@@ -23,6 +22,7 @@
     import pyarrow.parquet as pq
 except ImportError:
     pq = None
+from pyarrow.tests.util import rands
 
 
 class ParquetWriteBinary(object):
diff --git a/python/examples/minimal_build/Dockerfile.ubuntu b/python/examples/minimal_build/Dockerfile.ubuntu
index ebea4b045e592..07cd69c082461 100644
--- a/python/examples/minimal_build/Dockerfile.ubuntu
+++ b/python/examples/minimal_build/Dockerfile.ubuntu
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-FROM ubuntu:focal
+FROM ubuntu:jammy
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -32,6 +32,7 @@ RUN apt-get update -y -q && \
       python3-dev \
       python3-pip \
       python3-venv \
+      tzdata \
       && \
       apt-get clean && rm -rf /var/lib/apt/lists*
 
diff --git a/python/examples/minimal_build/build_conda.sh b/python/examples/minimal_build/build_conda.sh
index 72c3a5f9ea2cd..e90c800ae2eb1 100755
--- a/python/examples/minimal_build/build_conda.sh
+++ b/python/examples/minimal_build/build_conda.sh
@@ -97,9 +97,8 @@ export CMAKE_PREFIX_PATH=${ARROW_HOME}${CMAKE_PREFIX_PATH:+:${CMAKE_PREFIX_PATH}
 export PYARROW_BUILD_TYPE=Debug
 export PYARROW_CMAKE_GENERATOR=Ninja
 
-# You can run either "develop" or "build_ext --inplace". Your pick
-
-# python setup.py build_ext --inplace
-python setup.py develop
+# Use the same command that we use on python_build.sh
+python -m pip install --no-deps --no-build-isolation -vv .
+popd
 
-py.test pyarrow
+pytest -vv -r s ${PYTEST_ARGS} --pyargs pyarrow
diff --git a/python/examples/minimal_build/build_venv.sh b/python/examples/minimal_build/build_venv.sh
index 3bd641d0e72c9..f462c4e9b9d0a 100755
--- a/python/examples/minimal_build/build_venv.sh
+++ b/python/examples/minimal_build/build_venv.sh
@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-set -e
+set -ex
 
 #----------------------------------------------------------------------
 # Change this to whatever makes sense for your system
@@ -35,6 +35,7 @@ source $WORKDIR/venv/bin/activate
 git config --global --add safe.directory $ARROW_ROOT
 
 pip install -r $ARROW_ROOT/python/requirements-build.txt
+pip install wheel
 
 #----------------------------------------------------------------------
 # Build C++ library
@@ -68,11 +69,11 @@ export CMAKE_PREFIX_PATH=${ARROW_HOME}${CMAKE_PREFIX_PATH:+:${CMAKE_PREFIX_PATH}
 export PYARROW_BUILD_TYPE=Debug
 export PYARROW_CMAKE_GENERATOR=Ninja
 
-# You can run either "develop" or "build_ext --inplace". Your pick
+# Use the same command that we use on python_build.sh
+python -m pip install --no-deps --no-build-isolation -vv .
 
-# python setup.py build_ext --inplace
-python setup.py develop
+popd
 
 pip install -r $ARROW_ROOT/python/requirements-test.txt
 
-py.test pyarrow
+pytest -vv -r s ${PYTEST_ARGS} --pyargs pyarrow
diff --git a/python/pyarrow/__init__.py b/python/pyarrow/__init__.py
index 936f4736977c8..e52e0d242bee5 100644
--- a/python/pyarrow/__init__.py
+++ b/python/pyarrow/__init__.py
@@ -236,6 +236,9 @@ def print_entry(label, value):
                          RunEndEncodedScalar, ExtensionScalar)
 
 # Buffers, allocation
+from pyarrow.lib import (DeviceAllocationType, Device, MemoryManager,
+                         default_cpu_memory_manager)
+
 from pyarrow.lib import (Buffer, ResizableBuffer, foreign_buffer, py_buffer,
                          Codec, compress, decompress, allocate_buffer)
 
diff --git a/python/pyarrow/_compute.pyx b/python/pyarrow/_compute.pyx
index a267d53599436..0e860eaf4c6b8 100644
--- a/python/pyarrow/_compute.pyx
+++ b/python/pyarrow/_compute.pyx
@@ -1108,8 +1108,8 @@ class MatchSubstringOptions(_MatchSubstringOptions):
 
 
 cdef class _PadOptions(FunctionOptions):
-    def _set_options(self, width, padding):
-        self.wrapped.reset(new CPadOptions(width, tobytes(padding)))
+    def _set_options(self, width, padding, lean_left_on_odd_padding):
+        self.wrapped.reset(new CPadOptions(width, tobytes(padding), lean_left_on_odd_padding))
 
 
 class PadOptions(_PadOptions):
@@ -1122,10 +1122,14 @@ class PadOptions(_PadOptions):
         Desired string length.
     padding : str, default " "
         What to pad the string with. Should be one byte or codepoint.
+    lean_left_on_odd_padding : bool, default True
+        What to do if there is an odd number of padding characters (in case
+        of centered padding). Defaults to aligning on the left (i.e. adding
+        the extra padding character on the right).
     """
 
-    def __init__(self, width, padding=' '):
-        self._set_options(width, padding)
+    def __init__(self, width, padding=' ', lean_left_on_odd_padding=True):
+        self._set_options(width, padding, lean_left_on_odd_padding)
 
 
 cdef class _TrimOptions(FunctionOptions):
@@ -2035,6 +2039,26 @@ class PairwiseOptions(_PairwiseOptions):
         self._set_options(period)
 
 
+cdef class _ListFlattenOptions(FunctionOptions):
+    def _set_options(self, recursive):
+        self.wrapped.reset(new CListFlattenOptions(recursive))
+
+
+class ListFlattenOptions(_ListFlattenOptions):
+    """
+    Options for `list_flatten` function
+
+    Parameters
+    ----------
+    recursive : bool, default False
+        When True, the list array is flattened recursively until an array
+        of non-list values is formed.
+    """
+
+    def __init__(self, recursive=False):
+        self._set_options(recursive)
+
+
 cdef class _ArraySortOptions(FunctionOptions):
     def _set_options(self, order, null_placement):
         self.wrapped.reset(new CArraySortOptions(
diff --git a/python/pyarrow/_dataset_parquet.pxd b/python/pyarrow/_dataset_parquet.pxd
index d5bc172d324d5..0a3a2ff526ea4 100644
--- a/python/pyarrow/_dataset_parquet.pxd
+++ b/python/pyarrow/_dataset_parquet.pxd
@@ -29,6 +29,7 @@ cdef class ParquetFragmentScanOptions(FragmentScanOptions):
     cdef:
         CParquetFragmentScanOptions* parquet_options
         object _parquet_decryption_config
+        object _decryption_properties
 
     cdef void init(self, const shared_ptr[CFragmentScanOptions]& sp)
     cdef CReaderProperties* reader_properties(self)
diff --git a/python/pyarrow/_dataset_parquet.pyx b/python/pyarrow/_dataset_parquet.pyx
index 58ef6145cf7d1..a7afd065b592e 100644
--- a/python/pyarrow/_dataset_parquet.pyx
+++ b/python/pyarrow/_dataset_parquet.pyx
@@ -56,7 +56,7 @@ from pyarrow._parquet cimport (
 
 try:
     from pyarrow._dataset_parquet_encryption import (
-        set_encryption_config, set_decryption_config
+        set_encryption_config, set_decryption_config, set_decryption_properties
     )
     parquet_encryption_enabled = True
 except ImportError:
@@ -127,8 +127,7 @@ cdef class ParquetFileFormat(FileFormat):
                             'instance of ParquetReadOptions')
 
         if default_fragment_scan_options is None:
-            default_fragment_scan_options = ParquetFragmentScanOptions(
-                **scan_args)
+            default_fragment_scan_options = ParquetFragmentScanOptions(**scan_args)
         elif isinstance(default_fragment_scan_options, dict):
             default_fragment_scan_options = ParquetFragmentScanOptions(
                 **default_fragment_scan_options)
@@ -198,6 +197,10 @@ cdef class ParquetFileFormat(FileFormat):
         -------
         pyarrow.dataset.FileWriteOptions
         """
+        # Safeguard from calling make_write_options as a static class method
+        if not isinstance(self, ParquetFileFormat):
+            raise TypeError("make_write_options() should be called on "
+                            "an instance of ParquetFileFormat")
         opts = FileFormat.make_write_options(self)
         (<ParquetFileWriteOptions> opts).update(**kwargs)
         return opts
@@ -610,6 +613,7 @@ cdef class ParquetFileWriteOptions(FileWriteOptions):
             write_page_index=self._properties["write_page_index"],
             write_page_checksum=self._properties["write_page_checksum"],
             sorting_columns=self._properties["sorting_columns"],
+            store_decimal_as_integer=self._properties["store_decimal_as_integer"],
         )
 
     def _set_arrow_properties(self):
@@ -661,6 +665,7 @@ cdef class ParquetFileWriteOptions(FileWriteOptions):
             encryption_config=None,
             write_page_checksum=False,
             sorting_columns=None,
+            store_decimal_as_integer=False,
         )
 
         self._set_properties()
@@ -711,6 +716,9 @@ cdef class ParquetFragmentScanOptions(FragmentScanOptions):
     decryption_config : pyarrow.dataset.ParquetDecryptionConfig, default None
         If not None, use the provided ParquetDecryptionConfig to decrypt the
         Parquet file.
+    decryption_properties : pyarrow.parquet.FileDecryptionProperties, default None
+        If not None, use the provided FileDecryptionProperties to decrypt encrypted
+        Parquet file.
     page_checksum_verification : bool, default False
         If True, verify the page checksum for each page read from the file.
     """
@@ -725,6 +733,7 @@ cdef class ParquetFragmentScanOptions(FragmentScanOptions):
                  thrift_string_size_limit=None,
                  thrift_container_size_limit=None,
                  decryption_config=None,
+                 decryption_properties=None,
                  bint page_checksum_verification=False):
         self.init(shared_ptr[CFragmentScanOptions](
             new CParquetFragmentScanOptions()))
@@ -739,6 +748,8 @@ cdef class ParquetFragmentScanOptions(FragmentScanOptions):
             self.thrift_container_size_limit = thrift_container_size_limit
         if decryption_config is not None:
             self.parquet_decryption_config = decryption_config
+        if decryption_properties is not None:
+            self.decryption_properties = decryption_properties
         self.page_checksum_verification = page_checksum_verification
 
     cdef void init(self, const shared_ptr[CFragmentScanOptions]& sp):
@@ -808,6 +819,25 @@ cdef class ParquetFragmentScanOptions(FragmentScanOptions):
             raise ValueError("size must be larger than zero")
         self.reader_properties().set_thrift_container_size_limit(size)
 
+    @property
+    def decryption_properties(self):
+        if not parquet_encryption_enabled:
+            raise NotImplementedError(
+                "Unable to access encryption features. "
+                "Encryption is not enabled in your installation of pyarrow."
+            )
+        return self._decryption_properties
+
+    @decryption_properties.setter
+    def decryption_properties(self, config):
+        if not parquet_encryption_enabled:
+            raise NotImplementedError(
+                "Encryption is not enabled in your installation of pyarrow, but "
+                "decryption_properties were provided."
+            )
+        set_decryption_properties(self, config)
+        self._decryption_properties = config
+
     @property
     def parquet_decryption_config(self):
         if not parquet_encryption_enabled:
diff --git a/python/pyarrow/_dataset_parquet_encryption.pyx b/python/pyarrow/_dataset_parquet_encryption.pyx
index 11a7174eb3c9d..c8f5e5b01bf81 100644
--- a/python/pyarrow/_dataset_parquet_encryption.pyx
+++ b/python/pyarrow/_dataset_parquet_encryption.pyx
@@ -162,6 +162,14 @@ def set_encryption_config(
     opts.parquet_options.parquet_encryption_config = c_config
 
 
+def set_decryption_properties(
+    ParquetFragmentScanOptions opts not None,
+    FileDecryptionProperties config not None
+):
+    cdef CReaderProperties* reader_props = opts.reader_properties()
+    reader_props.file_decryption_properties(config.unwrap())
+
+
 def set_decryption_config(
     ParquetFragmentScanOptions opts not None,
     ParquetDecryptionConfig config not None
diff --git a/python/pyarrow/_fs.pxd b/python/pyarrow/_fs.pxd
index 4504b78b837ea..0df75530bbd6e 100644
--- a/python/pyarrow/_fs.pxd
+++ b/python/pyarrow/_fs.pxd
@@ -67,9 +67,6 @@ cdef class FileSystem(_Weakrefable):
 
 
 cdef class LocalFileSystem(FileSystem):
-    cdef:
-        CLocalFileSystem* localfs
-
     cdef init(self, const shared_ptr[CFileSystem]& wrapped)
 
 
diff --git a/python/pyarrow/_fs.pyx b/python/pyarrow/_fs.pyx
index 86cf39e993c1b..dbfb6ed114553 100644
--- a/python/pyarrow/_fs.pyx
+++ b/python/pyarrow/_fs.pyx
@@ -421,6 +421,12 @@ cdef class FileSystem(_Weakrefable):
                         "the subclasses instead: LocalFileSystem or "
                         "SubTreeFileSystem")
 
+    @staticmethod
+    @binding(True)  # Required for cython < 3
+    def _from_uri(uri):
+        fs, _path = FileSystem.from_uri(uri)
+        return fs
+
     @staticmethod
     def from_uri(uri):
         """
@@ -1097,30 +1103,18 @@ cdef class LocalFileSystem(FileSystem):
 
     def __init__(self, *, use_mmap=False):
         cdef:
-            CLocalFileSystemOptions opts
-            shared_ptr[CLocalFileSystem] fs
-
-        opts = CLocalFileSystemOptions.Defaults()
-        opts.use_mmap = use_mmap
+            shared_ptr[CFileSystem] fs
+            c_string c_uri
 
-        fs = make_shared[CLocalFileSystem](opts)
+        # from_uri needs a non-empty path, so just use a placeholder of /_
+        c_uri = tobytes(f"file:///_?use_mmap={int(use_mmap)}")
+        with nogil:
+            fs = GetResultValue(CFileSystemFromUri(c_uri))
         self.init(<shared_ptr[CFileSystem]> fs)
 
-    cdef init(self, const shared_ptr[CFileSystem]& c_fs):
-        FileSystem.init(self, c_fs)
-        self.localfs = <CLocalFileSystem*> c_fs.get()
-
-    @staticmethod
-    @binding(True)  # Required for cython < 3
-    def _reconstruct(kwargs):
-        # __reduce__ doesn't allow passing named arguments directly to the
-        # reconstructor, hence this wrapper.
-        return LocalFileSystem(**kwargs)
-
     def __reduce__(self):
-        cdef CLocalFileSystemOptions opts = self.localfs.options()
-        return LocalFileSystem._reconstruct, (dict(
-            use_mmap=opts.use_mmap),)
+        uri = frombytes(GetResultValue(self.fs.MakeUri(b"/_")))
+        return FileSystem._from_uri, (uri,)
 
 
 cdef class SubTreeFileSystem(FileSystem):
diff --git a/python/pyarrow/_parquet.pxd b/python/pyarrow/_parquet.pxd
index ae4094d8b4b5f..35d15227ee5dc 100644
--- a/python/pyarrow/_parquet.pxd
+++ b/python/pyarrow/_parquet.pxd
@@ -64,6 +64,7 @@ cdef extern from "parquet/api/schema.h" namespace "parquet" nogil:
         ParquetLogicalType_TIME" parquet::LogicalType::Type::TIME"
         ParquetLogicalType_TIMESTAMP" parquet::LogicalType::Type::TIMESTAMP"
         ParquetLogicalType_INT" parquet::LogicalType::Type::INT"
+        ParquetLogicalType_FLOAT16" parquet::LogicalType::Type::FLOAT16"
         ParquetLogicalType_JSON" parquet::LogicalType::Type::JSON"
         ParquetLogicalType_BSON" parquet::LogicalType::Type::BSON"
         ParquetLogicalType_UUID" parquet::LogicalType::Type::UUID"
@@ -431,6 +432,8 @@ cdef extern from "parquet/api/writer.h" namespace "parquet" nogil:
             Builder* disable_statistics()
             Builder* enable_statistics()
             Builder* enable_statistics(const c_string& path)
+            Builder* enable_store_decimal_as_integer()
+            Builder* disable_store_decimal_as_integer()
             Builder* data_pagesize(int64_t size)
             Builder* encoding(ParquetEncoding encoding)
             Builder* encoding(const c_string& path,
@@ -554,6 +557,7 @@ cdef extern from "parquet/arrow/writer.h" namespace "parquet::arrow" nogil:
         CStatus WriteTable(const CTable& table, int64_t chunk_size)
         CStatus NewRowGroup(int64_t chunk_size)
         CStatus Close()
+        CStatus AddKeyValueMetadata(const shared_ptr[const CKeyValueMetadata]& key_value_metadata)
 
         const shared_ptr[CFileMetaData] metadata() const
 
@@ -593,6 +597,7 @@ cdef shared_ptr[WriterProperties] _create_writer_properties(
     write_page_index=*,
     write_page_checksum=*,
     sorting_columns=*,
+    store_decimal_as_integer=*,
 ) except *
 
 
diff --git a/python/pyarrow/_parquet.pyx b/python/pyarrow/_parquet.pyx
index 7bc68a288aa78..6c5b0af826b4e 100644
--- a/python/pyarrow/_parquet.pyx
+++ b/python/pyarrow/_parquet.pyx
@@ -29,9 +29,10 @@ from pyarrow.includes.libarrow_python cimport *
 from pyarrow.lib cimport (_Weakrefable, Buffer, Schema,
                           check_status,
                           MemoryPool, maybe_unbox_memory_pool,
-                          Table, NativeFile,
+                          Table, KeyValueMetadata,
                           pyarrow_wrap_chunked_array,
                           pyarrow_wrap_schema,
+                          pyarrow_unwrap_metadata,
                           pyarrow_unwrap_schema,
                           pyarrow_wrap_table,
                           pyarrow_wrap_batch,
@@ -705,6 +706,22 @@ cdef class SortingColumn:
         """Whether null values appear before valid values (bool)."""
         return self.nulls_first
 
+    def to_dict(self):
+        """
+        Get dictionary representation of the SortingColumn.
+
+        Returns
+        -------
+        dict
+            Dictionary with a key for each attribute of this class.
+        """
+        d = dict(
+            column_index=self.column_index,
+            descending=self.descending,
+            nulls_first=self.nulls_first
+        )
+        return d
+
 
 cdef class RowGroupMetaData(_Weakrefable):
     """Metadata for a single row group."""
@@ -1282,6 +1299,7 @@ cdef logical_type_name_from_enum(ParquetLogicalTypeId type_):
         ParquetLogicalType_TIME: 'TIME',
         ParquetLogicalType_TIMESTAMP: 'TIMESTAMP',
         ParquetLogicalType_INT: 'INT',
+        ParquetLogicalType_FLOAT16: 'FLOAT16',
         ParquetLogicalType_JSON: 'JSON',
         ParquetLogicalType_BSON: 'BSON',
         ParquetLogicalType_UUID: 'UUID',
@@ -1813,7 +1831,9 @@ cdef shared_ptr[WriterProperties] _create_writer_properties(
         dictionary_pagesize_limit=None,
         write_page_index=False,
         write_page_checksum=False,
-        sorting_columns=None) except *:
+        sorting_columns=None,
+        store_decimal_as_integer=False) except *:
+
     """General writer properties"""
     cdef:
         shared_ptr[WriterProperties] properties
@@ -1924,6 +1944,16 @@ cdef shared_ptr[WriterProperties] _create_writer_properties(
                     "'use_byte_stream_split' cannot be passed"
                     "together with 'column_encoding'")
 
+    # store_decimal_as_integer
+
+    if isinstance(store_decimal_as_integer, bool):
+        if store_decimal_as_integer:
+            props.enable_store_decimal_as_integer()
+        else:
+            props.disable_store_decimal_as_integer()
+    else:
+        raise TypeError("'store_decimal_as_integer' must be a boolean")
+
     # column_encoding
     # encoding map - encode individual columns
 
@@ -2097,6 +2127,7 @@ cdef class ParquetWriter(_Weakrefable):
         int64_t write_batch_size
         int64_t dictionary_pagesize_limit
         object store_schema
+        object store_decimal_as_integer
 
     def __cinit__(self, where, Schema schema not None, use_dictionary=None,
                   compression=None, version=None,
@@ -2118,7 +2149,8 @@ cdef class ParquetWriter(_Weakrefable):
                   store_schema=True,
                   write_page_index=False,
                   write_page_checksum=False,
-                  sorting_columns=None):
+                  sorting_columns=None,
+                  store_decimal_as_integer=False):
         cdef:
             shared_ptr[WriterProperties] properties
             shared_ptr[ArrowWriterProperties] arrow_properties
@@ -2152,6 +2184,7 @@ cdef class ParquetWriter(_Weakrefable):
             write_page_index=write_page_index,
             write_page_checksum=write_page_checksum,
             sorting_columns=sorting_columns,
+            store_decimal_as_integer=store_decimal_as_integer,
         )
         arrow_properties = _create_arrow_writer_properties(
             use_deprecated_int96_timestamps=use_deprecated_int96_timestamps,
@@ -2190,6 +2223,15 @@ cdef class ParquetWriter(_Weakrefable):
             check_status(self.writer.get()
                          .WriteTable(deref(ctable), c_row_group_size))
 
+    def add_key_value_metadata(self, key_value_metadata):
+        cdef:
+            shared_ptr[const CKeyValueMetadata] c_metadata
+
+        c_metadata = pyarrow_unwrap_metadata(KeyValueMetadata(key_value_metadata))
+        with nogil:
+            check_status(self.writer.get()
+                         .AddKeyValueMetadata(c_metadata))
+
     @property
     def metadata(self):
         cdef:
diff --git a/python/pyarrow/_s3fs.pyx b/python/pyarrow/_s3fs.pyx
index f5bab99a49f7a..ba6603322838d 100644
--- a/python/pyarrow/_s3fs.pyx
+++ b/python/pyarrow/_s3fs.pyx
@@ -185,7 +185,7 @@ cdef class S3FileSystem(FileSystem):
     session_token : str, default None
         AWS Session Token.  An optional session token, required if access_key
         and secret_key are temporary credentials from STS.
-    anonymous : boolean, default False
+    anonymous : bool, default False
         Whether to connect anonymously if access_key and secret_key are None.
         If true, will not attempt to look up credentials using standard AWS
         configuration methods.
@@ -217,7 +217,7 @@ cdef class S3FileSystem(FileSystem):
         S3 connection transport scheme.
     endpoint_override : str, default None
         Override region with a connect string such as "localhost:9000"
-    background_writes : boolean, default True
+    background_writes : bool, default True
         Whether file writes will be issued in the background, without
         blocking.
     default_metadata : mapping or pyarrow.KeyValueMetadata, default None
@@ -237,11 +237,20 @@ cdef class S3FileSystem(FileSystem):
                                         'port': 8020, 'username': 'username',
                                         'password': 'password'})
     allow_bucket_creation : bool, default False
-        Whether to allow CreateDir at the bucket-level. This option may also be
+        Whether to allow directory creation at the bucket-level. This option may also be
         passed in a URI query parameter.
     allow_bucket_deletion : bool, default False
-        Whether to allow DeleteDir at the bucket-level. This option may also be
+        Whether to allow directory deletion at the bucket-level. This option may also be
         passed in a URI query parameter.
+    check_directory_existence_before_creation : bool, default false
+        Whether to check the directory existence before creating it.
+        If false, when creating a directory the code will not check if it already
+        exists or not. It's an optimization to try directory creation and catch the error,
+        rather than issue two dependent I/O calls.
+        If true, when creating a directory the code will only create the directory when necessary
+        at the cost of extra I/O calls. This can be used for key/value cloud storage which has
+        a hard rate limit to number of object mutation operations or scenerios such as
+        the directories already exist and you do not have creation access.
     retry_strategy : S3RetryStrategy, default AwsStandardS3RetryStrategy(max_attempts=3)
         The retry strategy to use with S3; fail after max_attempts. Available
         strategies are AwsStandardS3RetryStrategy, AwsDefaultS3RetryStrategy.
@@ -273,6 +282,7 @@ cdef class S3FileSystem(FileSystem):
                  role_arn=None, session_name=None, external_id=None,
                  load_frequency=900, proxy_options=None,
                  allow_bucket_creation=False, allow_bucket_deletion=False,
+                 check_directory_existence_before_creation=False,
                  retry_strategy: S3RetryStrategy = AwsStandardS3RetryStrategy(
                      max_attempts=3),
                  force_virtual_addressing=False):
@@ -387,6 +397,7 @@ cdef class S3FileSystem(FileSystem):
 
         options.value().allow_bucket_creation = allow_bucket_creation
         options.value().allow_bucket_deletion = allow_bucket_deletion
+        options.value().check_directory_existence_before_creation = check_directory_existence_before_creation
         options.value().force_virtual_addressing = force_virtual_addressing
 
         if isinstance(retry_strategy, AwsStandardS3RetryStrategy):
@@ -447,6 +458,7 @@ cdef class S3FileSystem(FileSystem):
                 background_writes=opts.background_writes,
                 allow_bucket_creation=opts.allow_bucket_creation,
                 allow_bucket_deletion=opts.allow_bucket_deletion,
+                check_directory_existence_before_creation=opts.check_directory_existence_before_creation,
                 default_metadata=pyarrow_wrap_metadata(opts.default_metadata),
                 proxy_options={'scheme': frombytes(opts.proxy_options.scheme),
                                'host': frombytes(opts.proxy_options.host),
diff --git a/python/pyarrow/acero.py b/python/pyarrow/acero.py
index 619e1fce393ae..77ba3ab1ce85d 100644
--- a/python/pyarrow/acero.py
+++ b/python/pyarrow/acero.py
@@ -22,7 +22,7 @@
 # distutils: language = c++
 # cython: language_level = 3
 
-from pyarrow.lib import Table
+from pyarrow.lib import Table, RecordBatch
 from pyarrow.compute import Expression, field
 
 try:
@@ -348,8 +348,8 @@ def _filter_table(table, expression):
 
     Parameters
     ----------
-    table : Table or Dataset
-        Table or Dataset that should be filtered.
+    table : Table or RecordBatch
+        Table that should be filtered.
     expression : Expression
         The expression on which rows should be filtered.
 
@@ -357,11 +357,19 @@ def _filter_table(table, expression):
     -------
     Table
     """
+    is_batch = False
+    if isinstance(table, RecordBatch):
+        table = Table.from_batches([table])
+        is_batch = True
+
     decl = Declaration.from_sequence([
         Declaration("table_source", options=TableSourceNodeOptions(table)),
         Declaration("filter", options=FilterNodeOptions(expression))
     ])
-    return decl.to_table(use_threads=True)
+    result = decl.to_table(use_threads=True)
+    if is_batch:
+        result = result.combine_chunks().to_batches()[0]
+    return result
 
 
 def _sort_source(table_or_dataset, sort_keys, output_type=Table, **kwargs):
diff --git a/python/pyarrow/array.pxi b/python/pyarrow/array.pxi
index 59d2e91ef6c70..b1f90cd16537b 100644
--- a/python/pyarrow/array.pxi
+++ b/python/pyarrow/array.pxi
@@ -129,7 +129,8 @@ def array(object obj, type=None, mask=None, size=None, from_pandas=None,
         If both type and size are specified may be a single use iterable. If
         not strongly-typed, Arrow type will be inferred for resulting array.
         Any Arrow-compatible array that implements the Arrow PyCapsule Protocol
-        (has an ``__arrow_c_array__`` method) can be passed as well.
+        (has an ``__arrow_c_array__`` or ``__arrow_c_device_array__`` method)
+        can be passed as well.
     type : pyarrow.DataType
         Explicit type to attempt to coerce to, otherwise will be inferred from
         the data.
@@ -245,6 +246,18 @@ def array(object obj, type=None, mask=None, size=None, from_pandas=None,
 
     if hasattr(obj, '__arrow_array__'):
         return _handle_arrow_array_protocol(obj, type, mask, size)
+    elif hasattr(obj, '__arrow_c_device_array__'):
+        if type is not None:
+            requested_type = type.__arrow_c_schema__()
+        else:
+            requested_type = None
+        schema_capsule, array_capsule = obj.__arrow_c_device_array__(requested_type)
+        out_array = Array._import_from_c_device_capsule(schema_capsule, array_capsule)
+        if type is not None and out_array.type != type:
+            # PyCapsule interface type coercion is best effort, so we need to
+            # check the type of the returned array and cast if necessary
+            out_array = array.cast(type, safe=safe, memory_pool=memory_pool)
+        return out_array
     elif hasattr(obj, '__arrow_c_array__'):
         if type is not None:
             requested_type = type.__arrow_c_schema__()
@@ -561,34 +574,7 @@ def _normalize_slice(object arrow_obj, slice key):
         Py_ssize_t start, stop, step
         Py_ssize_t n = len(arrow_obj)
 
-    step = key.step or 1
-
-    if key.start is None:
-        if step < 0:
-            start = n - 1
-        else:
-            start = 0
-    elif key.start < 0:
-        start = key.start + n
-        if start < 0:
-            start = 0
-    elif key.start >= n:
-        start = n
-    else:
-        start = key.start
-
-    if step < 0 and (key.stop is None or key.stop < -n):
-        stop = -1
-    elif key.stop is None:
-        stop = n
-    elif key.stop < 0:
-        stop = key.stop + n
-        if stop < 0:  # step > 0 in this case.
-            stop = 0
-    elif key.stop >= n:
-        stop = n
-    else:
-        stop = key.stop
+    start, stop, step = key.indices(n)
 
     if step != 1:
         indices = np.arange(start, stop, step)
@@ -983,6 +969,7 @@ cdef class Array(_PandasConvertible):
         +"two-and-a-half"
 
         """
+        self._assert_cpu()
         cdef c_string result
         with nogil:
             result = self.ap.Diff(deref(other.ap))
@@ -1009,6 +996,7 @@ cdef class Array(_PandasConvertible):
         -------
         cast : Array
         """
+        self._assert_cpu()
         return _pc().cast(self, target_type, safe=safe,
                           options=options, memory_pool=memory_pool)
 
@@ -1027,6 +1015,7 @@ cdef class Array(_PandasConvertible):
         -------
         view : Array
         """
+        self._assert_cpu()
         cdef DataType type = ensure_type(target_type)
         cdef shared_ptr[CArray] result
         with nogil:
@@ -1049,6 +1038,7 @@ cdef class Array(_PandasConvertible):
         sum : Scalar
             A scalar containing the sum value.
         """
+        self._assert_cpu()
         options = _pc().ScalarAggregateOptions(**kwargs)
         return _pc().call_function('sum', [self], options)
 
@@ -1061,6 +1051,7 @@ cdef class Array(_PandasConvertible):
         unique : Array
             An array of the same data type, with deduplicated elements.
         """
+        self._assert_cpu()
         return _pc().call_function('unique', [self])
 
     def dictionary_encode(self, null_encoding='mask'):
@@ -1079,6 +1070,7 @@ cdef class Array(_PandasConvertible):
         encoded : DictionaryArray
             A dictionary-encoded version of this array.
         """
+        self._assert_cpu()
         options = _pc().DictionaryEncodeOptions(null_encoding)
         return _pc().call_function('dictionary_encode', [self], options)
 
@@ -1091,6 +1083,7 @@ cdef class Array(_PandasConvertible):
         StructArray
             An array of  <input type "Values", int64 "Counts"> structs
         """
+        self._assert_cpu()
         return _pc().call_function('value_counts', [self])
 
     @staticmethod
@@ -1132,6 +1125,7 @@ cdef class Array(_PandasConvertible):
                      memory_pool=memory_pool)
 
     def __reduce__(self):
+        self._assert_cpu()
         return _restore_array, \
             (_reduce_array_data(self.sp_array.get().data().get()),)
 
@@ -1199,6 +1193,7 @@ cdef class Array(_PandasConvertible):
 
     @property
     def null_count(self):
+        self._assert_cpu()
         return self.sp_array.get().null_count()
 
     @property
@@ -1218,9 +1213,8 @@ cdef class Array(_PandasConvertible):
         The dictionary of dictionary arrays will always be counted in their
         entirety even if the array only references a portion of the dictionary.
         """
-        cdef:
-            CResult[int64_t] c_size_res
-
+        self._assert_cpu()
+        cdef CResult[int64_t] c_size_res
         with nogil:
             c_size_res = ReferencedBufferSize(deref(self.ap))
             size = GetResultValue(c_size_res)
@@ -1237,16 +1231,17 @@ cdef class Array(_PandasConvertible):
         If a buffer is referenced multiple times then it will
         only be counted once.
         """
-        cdef:
-            int64_t total_buffer_size
-
+        self._assert_cpu()
+        cdef int64_t total_buffer_size
         total_buffer_size = TotalBufferSize(deref(self.ap))
         return total_buffer_size
 
     def __sizeof__(self):
+        self._assert_cpu()
         return super(Array, self).__sizeof__() + self.nbytes
 
     def __iter__(self):
+        self._assert_cpu()
         for i in range(len(self)):
             yield self.getitem(i)
 
@@ -1259,6 +1254,9 @@ cdef class Array(_PandasConvertible):
         """
         Render a "pretty-printed" string representation of the Array.
 
+        Note: for data on a non-CPU device, the full array is copied to CPU
+        memory.
+
         Parameters
         ----------
         indent : int, default 2
@@ -1334,6 +1332,8 @@ cdef class Array(_PandasConvertible):
         -------
         bool
         """
+        self._assert_cpu()
+        other._assert_cpu()
         return self.ap.Equals(deref(other.ap))
 
     def __len__(self):
@@ -1358,6 +1358,7 @@ cdef class Array(_PandasConvertible):
         -------
         array : boolean Array
         """
+        self._assert_cpu()
         options = _pc().NullOptions(nan_is_null=nan_is_null)
         return _pc().call_function('is_null', [self], options)
 
@@ -1369,12 +1370,14 @@ cdef class Array(_PandasConvertible):
         -------
         array : boolean Array
         """
+        self._assert_cpu()
         return _pc().call_function('is_nan', [self])
 
     def is_valid(self):
         """
         Return BooleanArray indicating the non-null values.
         """
+        self._assert_cpu()
         return _pc().is_valid(self)
 
     def fill_null(self, fill_value):
@@ -1391,6 +1394,7 @@ cdef class Array(_PandasConvertible):
         result : Array
             A new array with nulls replaced by the given value.
         """
+        self._assert_cpu()
         return _pc().fill_null(self, fill_value)
 
     def __getitem__(self, key):
@@ -1407,12 +1411,14 @@ cdef class Array(_PandasConvertible):
         -------
         value : Scalar (index) or Array (slice)
         """
+        self._assert_cpu()
         if isinstance(key, slice):
             return _normalize_slice(self, key)
 
         return self.getitem(_normalize_index(key, self.length()))
 
     cdef getitem(self, int64_t i):
+        self._assert_cpu()
         return Scalar.wrap(GetResultValue(self.ap.GetScalar(i)))
 
     def slice(self, offset=0, length=None):
@@ -1431,8 +1437,7 @@ cdef class Array(_PandasConvertible):
         -------
         sliced : RecordBatch
         """
-        cdef:
-            shared_ptr[CArray] result
+        cdef shared_ptr[CArray] result
 
         if offset < 0:
             raise IndexError('Offset must be non-negative')
@@ -1463,15 +1468,17 @@ cdef class Array(_PandasConvertible):
         taken : Array
             An array with the same datatype, containing the taken values.
         """
+        self._assert_cpu()
         return _pc().take(self, indices)
 
     def drop_null(self):
         """
         Remove missing values from an array.
         """
+        self._assert_cpu()
         return _pc().drop_null(self)
 
-    def filter(self, Array mask, *, null_selection_behavior='drop'):
+    def filter(self, object mask, *, null_selection_behavior='drop'):
         """
         Select values from an array.
 
@@ -1490,6 +1497,7 @@ cdef class Array(_PandasConvertible):
             An array of the same type, with only the elements selected by
             the boolean mask.
         """
+        self._assert_cpu()
         return _pc().filter(self, mask,
                             null_selection_behavior=null_selection_behavior)
 
@@ -1515,6 +1523,7 @@ cdef class Array(_PandasConvertible):
         index : Int64Scalar
             The index of the value in the array (-1 if not found).
         """
+        self._assert_cpu()
         return _pc().index(self, value, start, end, memory_pool=memory_pool)
 
     def sort(self, order="ascending", **kwargs):
@@ -1534,6 +1543,7 @@ cdef class Array(_PandasConvertible):
         -------
         result : Array
         """
+        self._assert_cpu()
         indices = _pc().sort_indices(
             self,
             options=_pc().SortOptions(sort_keys=[("", order)], **kwargs)
@@ -1541,13 +1551,33 @@ cdef class Array(_PandasConvertible):
         return self.take(indices)
 
     def _to_pandas(self, options, types_mapper=None, **kwargs):
+        self._assert_cpu()
         return _array_like_to_pandas(self, options, types_mapper=types_mapper)
 
-    def __array__(self, dtype=None):
+    def __array__(self, dtype=None, copy=None):
+        self._assert_cpu()
+
+        if copy is False:
+            try:
+                values = self.to_numpy(zero_copy_only=True)
+            except ArrowInvalid:
+                raise ValueError(
+                    "Unable to avoid a copy while creating a numpy array as requested.\n"
+                    "If using `np.array(obj, copy=False)` replace it with "
+                    "`np.asarray(obj)` to allow a copy when needed"
+                )
+            # values is already a numpy array at this point, but calling np.array(..)
+            # again to handle the `dtype` keyword with a no-copy guarantee
+            return np.array(values, dtype=dtype, copy=False)
+
         values = self.to_numpy(zero_copy_only=False)
+        if copy is True and is_numeric(self.type.id) and self.null_count == 0:
+            # to_numpy did not yet make a copy (is_numeric = integer/floats, no decimal)
+            return np.array(values, dtype=dtype, copy=True)
+
         if dtype is None:
             return values
-        return values.astype(dtype)
+        return np.asarray(values, dtype=dtype)
 
     def to_numpy(self, zero_copy_only=True, writable=False):
         """
@@ -1576,6 +1606,8 @@ cdef class Array(_PandasConvertible):
         -------
         array : numpy.ndarray
         """
+        self._assert_cpu()
+
         cdef:
             PyObject* out
             PandasOptions c_options
@@ -1614,6 +1646,7 @@ cdef class Array(_PandasConvertible):
         -------
         lst : list
         """
+        self._assert_cpu()
         return [x.as_py() for x in self]
 
     def tolist(self):
@@ -1639,6 +1672,7 @@ cdef class Array(_PandasConvertible):
         ArrowInvalid
         """
         if full:
+            self._assert_cpu()
             with nogil:
                 check_status(self.ap.ValidateFull())
         else:
@@ -1747,6 +1781,8 @@ cdef class Array(_PandasConvertible):
             A pair of PyCapsules containing a C ArrowSchema and ArrowArray,
             respectively.
         """
+        self._assert_cpu()
+
         cdef:
             ArrowArray* c_array
             ArrowSchema* c_schema
@@ -1835,26 +1871,111 @@ cdef class Array(_PandasConvertible):
         This is a low-level function intended for expert users.
         """
         cdef:
-            void* c_ptr = _as_c_pointer(in_ptr)
+            ArrowDeviceArray* c_device_array = <ArrowDeviceArray*>_as_c_pointer(in_ptr)
             void* c_type_ptr
             shared_ptr[CArray] c_array
 
+        if c_device_array.device_type == ARROW_DEVICE_CUDA:
+            _ensure_cuda_loaded()
+
         c_type = pyarrow_unwrap_data_type(type)
         if c_type == nullptr:
             # Not a DataType object, perhaps a raw ArrowSchema pointer
             c_type_ptr = _as_c_pointer(type)
             with nogil:
                 c_array = GetResultValue(
-                    ImportDeviceArray(<ArrowDeviceArray*> c_ptr,
-                                      <ArrowSchema*> c_type_ptr)
+                    ImportDeviceArray(c_device_array, <ArrowSchema*> c_type_ptr)
                 )
         else:
             with nogil:
                 c_array = GetResultValue(
-                    ImportDeviceArray(<ArrowDeviceArray*> c_ptr, c_type)
+                    ImportDeviceArray(c_device_array, c_type)
                 )
         return pyarrow_wrap_array(c_array)
 
+    def __arrow_c_device_array__(self, requested_schema=None, **kwargs):
+        """
+        Get a pair of PyCapsules containing a C ArrowDeviceArray representation
+        of the object.
+
+        Parameters
+        ----------
+        requested_schema : PyCapsule | None
+            A PyCapsule containing a C ArrowSchema representation of a requested
+            schema. PyArrow will attempt to cast the array to this data type.
+            If None, the array will be returned as-is, with a type matching the
+            one returned by :meth:`__arrow_c_schema__()`.
+        kwargs
+            Currently no additional keyword arguments are supported, but
+            this method will accept any keyword with a value of ``None``
+            for compatibility with future keywords.
+
+        Returns
+        -------
+        Tuple[PyCapsule, PyCapsule]
+            A pair of PyCapsules containing a C ArrowSchema and ArrowDeviceArray,
+            respectively.
+        """
+        cdef:
+            ArrowDeviceArray* c_array
+            ArrowSchema* c_schema
+            shared_ptr[CArray] inner_array
+
+        non_default_kwargs = [
+            name for name, value in kwargs.items() if value is not None
+        ]
+        if non_default_kwargs:
+            raise NotImplementedError(
+                f"Received unsupported keyword argument(s): {non_default_kwargs}"
+            )
+
+        if requested_schema is not None:
+            target_type = DataType._import_from_c_capsule(requested_schema)
+
+            if target_type != self.type:
+                if not self.is_cpu:
+                    raise NotImplementedError(
+                        "Casting to a requested schema is only supported for CPU data"
+                    )
+                try:
+                    casted_array = _pc().cast(self, target_type, safe=True)
+                    inner_array = pyarrow_unwrap_array(casted_array)
+                except ArrowInvalid as e:
+                    raise ValueError(
+                        f"Could not cast {self.type} to requested type {target_type}: {e}"
+                    )
+            else:
+                inner_array = self.sp_array
+        else:
+            inner_array = self.sp_array
+
+        schema_capsule = alloc_c_schema(&c_schema)
+        array_capsule = alloc_c_device_array(&c_array)
+
+        with nogil:
+            check_status(ExportDeviceArray(
+                deref(inner_array), <shared_ptr[CSyncEvent]>NULL,
+                c_array, c_schema))
+
+        return schema_capsule, array_capsule
+
+    @staticmethod
+    def _import_from_c_device_capsule(schema_capsule, array_capsule):
+        cdef:
+            ArrowSchema* c_schema
+            ArrowDeviceArray* c_array
+            shared_ptr[CArray] array
+
+        c_schema = <ArrowSchema*> PyCapsule_GetPointer(schema_capsule, 'arrow_schema')
+        c_array = <ArrowDeviceArray*> PyCapsule_GetPointer(
+            array_capsule, 'arrow_device_array'
+        )
+
+        with nogil:
+            array = GetResultValue(ImportDeviceArray(c_array, c_schema))
+
+        return pyarrow_wrap_array(array)
+
     def __dlpack__(self, stream=None):
         """Export a primitive array as a DLPack capsule.
 
@@ -1893,6 +2014,28 @@ cdef class Array(_PandasConvertible):
         device = GetResultValue(ExportDevice(self.sp_array))
         return device.device_type, device.device_id
 
+    @property
+    def device_type(self):
+        """
+        The device type where the array resides.
+
+        Returns
+        -------
+        DeviceAllocationType
+        """
+        return _wrap_device_allocation_type(self.sp_array.get().device_type())
+
+    @property
+    def is_cpu(self):
+        """
+        Whether the array is CPU-accessible.
+        """
+        return self.device_type == DeviceAllocationType.CPU
+
+    cdef void _assert_cpu(self) except *:
+        if self.sp_array.get().device_type() != CDeviceAllocationType_kCPU:
+            raise NotImplementedError("Implemented only for data on CPU device")
+
 
 cdef _array_like_to_pandas(obj, options, types_mapper):
     cdef:
@@ -2151,22 +2294,99 @@ cdef class Decimal256Array(FixedSizeBinaryArray):
 
 cdef class BaseListArray(Array):
 
-    def flatten(self):
+    def flatten(self, recursive=False):
         """
-        Unnest this ListArray/LargeListArray by one level.
-
-        The returned Array is logically a concatenation of all the sub-lists
-        in this Array.
+        Unnest this [Large]ListArray/[Large]ListViewArray/FixedSizeListArray
+        according to 'recursive'.
 
         Note that this method is different from ``self.values`` in that
         it takes care of the slicing offset as well as null elements backed
         by non-empty sub-lists.
 
+        Parameters
+        ----------
+        recursive : bool, default False, optional
+            When True, flatten this logical list-array recursively until an
+            array of non-list values is formed.
+
+            When False, flatten only the top level.
+
         Returns
         -------
         result : Array
+
+        Examples
+        --------
+
+        Basic logical list-array's flatten
+        >>> import pyarrow as pa
+        >>> values = [1, 2, 3, 4]
+        >>> offsets = [2, 1, 0]
+        >>> sizes = [2, 2, 2]
+        >>> array = pa.ListViewArray.from_arrays(offsets, sizes, values)
+        >>> array
+        <pyarrow.lib.ListViewArray object at ...>
+        [
+          [
+            3,
+            4
+          ],
+          [
+            2,
+            3
+          ],
+          [
+            1,
+            2
+          ]
+        ]
+        >>> array.flatten()
+        <pyarrow.lib.Int64Array object at ...>
+        [
+          3,
+          4,
+          2,
+          3,
+          1,
+          2
+        ]
+
+        When recursive=True, nested list arrays are flattened recursively
+        until an array of non-list values is formed.
+
+        >>> array = pa.array([
+        ...    None,
+        ...    [
+        ...        [1, None, 2],
+        ...        None,
+        ...        [3, 4]
+        ...    ],
+        ...    [],
+        ...    [
+        ...        [],
+        ...        [5, 6],
+        ...        None
+        ...    ],
+        ...    [
+        ...        [7, 8]
+        ...    ]
+        ... ], type=pa.list_(pa.list_(pa.int64())))
+        >>> array.flatten(True)
+        <pyarrow.lib.Int64Array object at ...>
+        [
+          1,
+          null,
+          2,
+          3,
+          4,
+          5,
+          6,
+          7,
+          8
+        ]
         """
-        return _pc().list_flatten(self)
+        options = _pc().ListFlattenOptions(recursive)
+        return _pc().list_flatten(self, options=options)
 
     def value_parent_indices(self):
         """
@@ -2537,7 +2757,7 @@ cdef class LargeListArray(BaseListArray):
         return pyarrow_wrap_array((<CLargeListArray*> self.ap).offsets())
 
 
-cdef class ListViewArray(Array):
+cdef class ListViewArray(BaseListArray):
     """
     Concrete class for Arrow arrays of a list view data type.
     """
@@ -2757,69 +2977,8 @@ cdef class ListViewArray(Array):
         """
         return pyarrow_wrap_array((<CListViewArray*> self.ap).sizes())
 
-    def flatten(self, memory_pool=None):
-        """
-        Unnest this ListViewArray by one level.
-
-        The returned Array is logically a concatenation of all the sub-lists
-        in this Array.
-
-        Note that this method is different from ``self.values`` in that
-        it takes care of the slicing offset as well as null elements backed
-        by non-empty sub-lists.
-
-        Parameters
-        ----------
-        memory_pool : MemoryPool, optional
-
-        Returns
-        -------
-        result : Array
-
-        Examples
-        --------
 
-        >>> import pyarrow as pa
-        >>> values = [1, 2, 3, 4]
-        >>> offsets = [2, 1, 0]
-        >>> sizes = [2, 2, 2]
-        >>> array = pa.ListViewArray.from_arrays(offsets, sizes, values)
-        >>> array
-        <pyarrow.lib.ListViewArray object at ...>
-        [
-          [
-            3,
-            4
-          ],
-          [
-            2,
-            3
-          ],
-          [
-            1,
-            2
-          ]
-        ]
-        >>> array.flatten()
-        <pyarrow.lib.Int64Array object at ...>
-        [
-          3,
-          4,
-          2,
-          3,
-          1,
-          2
-        ]
-        """
-        cdef CMemoryPool* cpool = maybe_unbox_memory_pool(memory_pool)
-        with nogil:
-            out = GetResultValue((<CListViewArray*> self.ap).Flatten(cpool))
-        cdef Array result = pyarrow_wrap_array(out)
-        result.validate()
-        return result
-
-
-cdef class LargeListViewArray(Array):
+cdef class LargeListViewArray(BaseListArray):
     """
     Concrete class for Arrow arrays of a large list view data type.
 
@@ -3047,67 +3206,6 @@ cdef class LargeListViewArray(Array):
         """
         return pyarrow_wrap_array((<CLargeListViewArray*> self.ap).sizes())
 
-    def flatten(self, memory_pool=None):
-        """
-        Unnest this LargeListViewArray by one level.
-
-        The returned Array is logically a concatenation of all the sub-lists
-        in this Array.
-
-        Note that this method is different from ``self.values`` in that
-        it takes care of the slicing offset as well as null elements backed
-        by non-empty sub-lists.
-
-        Parameters
-        ----------
-        memory_pool : MemoryPool, optional
-
-        Returns
-        -------
-        result : Array
-
-        Examples
-        --------
-
-        >>> import pyarrow as pa
-        >>> values = [1, 2, 3, 4]
-        >>> offsets = [2, 1, 0]
-        >>> sizes = [2, 2, 2]
-        >>> array = pa.LargeListViewArray.from_arrays(offsets, sizes, values)
-        >>> array
-        <pyarrow.lib.LargeListViewArray object at ...>
-        [
-          [
-            3,
-            4
-          ],
-          [
-            2,
-            3
-          ],
-          [
-            1,
-            2
-          ]
-        ]
-        >>> array.flatten()
-        <pyarrow.lib.Int64Array object at ...>
-        [
-          3,
-          4,
-          2,
-          3,
-          1,
-          2
-        ]
-        """
-        cdef CMemoryPool* cpool = maybe_unbox_memory_pool(memory_pool)
-        with nogil:
-            out = GetResultValue((<CLargeListViewArray*> self.ap).Flatten(cpool))
-        cdef Array result = pyarrow_wrap_array(out)
-        result.validate()
-        return result
-
 
 cdef class MapArray(ListArray):
     """
@@ -3115,7 +3213,7 @@ cdef class MapArray(ListArray):
     """
 
     @staticmethod
-    def from_arrays(offsets, keys, items, DataType type=None, MemoryPool pool=None):
+    def from_arrays(offsets, keys, items, DataType type=None, MemoryPool pool=None, mask=None):
         """
         Construct MapArray from arrays of int32 offsets and key, item arrays.
 
@@ -3127,6 +3225,8 @@ cdef class MapArray(ListArray):
         type : DataType, optional
             If not specified, a default MapArray with the keys' and items' type is used.
         pool : MemoryPool
+        mask : Array (boolean type), optional
+            Indicate which values are null (True) or not null (False).
 
         Returns
         -------
@@ -3208,24 +3308,27 @@ cdef class MapArray(ListArray):
         cdef:
             Array _offsets, _keys, _items
             shared_ptr[CArray] out
+            shared_ptr[CBuffer] c_mask
         cdef CMemoryPool* cpool = maybe_unbox_memory_pool(pool)
 
         _offsets = asarray(offsets, type='int32')
         _keys = asarray(keys)
         _items = asarray(items)
 
+        c_mask = c_mask_inverted_from_obj(mask, pool)
+
         if type is not None:
             with nogil:
                 out = GetResultValue(
                     CMapArray.FromArraysAndType(
                         type.sp_type, _offsets.sp_array,
-                        _keys.sp_array, _items.sp_array, cpool))
+                        _keys.sp_array, _items.sp_array, cpool, c_mask))
         else:
             with nogil:
                 out = GetResultValue(
                     CMapArray.FromArrays(_offsets.sp_array,
                                          _keys.sp_array,
-                                         _items.sp_array, cpool))
+                                         _items.sp_array, cpool, c_mask))
         cdef Array result = pyarrow_wrap_array(out)
         result.validate()
         return result
@@ -3975,12 +4078,11 @@ cdef class StructArray(Array):
         result : StructArray
         """
         if by is not None:
-            tosort = self._flattened_field(by)
+            tosort, sort_keys = self._flattened_field(by), [("", order)]
         else:
-            tosort = self
+            tosort, sort_keys = self, [(field.name, order) for field in self.type]
         indices = _pc().sort_indices(
-            tosort,
-            options=_pc().SortOptions(sort_keys=[("", order)], **kwargs)
+            tosort, options=_pc().SortOptions(sort_keys=sort_keys, **kwargs)
         )
         return self.take(indices)
 
@@ -4039,7 +4141,7 @@ cdef class RunEndEncodedArray(Array):
         -------
         RunEndEncodedArray
         """
-        logical_length = run_ends[-1] if len(run_ends) > 0 else 0
+        logical_length = scalar(run_ends[-1]).as_py() if len(run_ends) > 0 else 0
         return RunEndEncodedArray._from_arrays(type, True, logical_length,
                                                run_ends, values, 0)
 
diff --git a/python/pyarrow/compute.py b/python/pyarrow/compute.py
index 205ab393b8b09..83612f66d21e2 100644
--- a/python/pyarrow/compute.py
+++ b/python/pyarrow/compute.py
@@ -44,6 +44,7 @@
     IndexOptions,
     JoinOptions,
     ListSliceOptions,
+    ListFlattenOptions,
     MakeStructOptions,
     MapLookupOptions,
     MatchSubstringOptions,
diff --git a/python/pyarrow/device.pxi b/python/pyarrow/device.pxi
new file mode 100644
index 0000000000000..6e6034752085a
--- /dev/null
+++ b/python/pyarrow/device.pxi
@@ -0,0 +1,162 @@
+# 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.
+
+# cython: profile=False
+# distutils: language = c++
+# cython: embedsignature = True
+
+
+cpdef enum DeviceAllocationType:
+    CPU = <char> CDeviceAllocationType_kCPU
+    CUDA = <char> CDeviceAllocationType_kCUDA
+    CUDA_HOST = <char> CDeviceAllocationType_kCUDA_HOST
+    OPENCL = <char> CDeviceAllocationType_kOPENCL
+    VULKAN = <char> CDeviceAllocationType_kVULKAN
+    METAL = <char> CDeviceAllocationType_kMETAL
+    VPI = <char> CDeviceAllocationType_kVPI
+    ROCM = <char> CDeviceAllocationType_kROCM
+    ROCM_HOST = <char> CDeviceAllocationType_kROCM_HOST
+    EXT_DEV = <char> CDeviceAllocationType_kEXT_DEV
+    CUDA_MANAGED = <char> CDeviceAllocationType_kCUDA_MANAGED
+    ONEAPI = <char> CDeviceAllocationType_kONEAPI
+    WEBGPU = <char> CDeviceAllocationType_kWEBGPU
+    HEXAGON = <char> CDeviceAllocationType_kHEXAGON
+
+
+cdef object _wrap_device_allocation_type(CDeviceAllocationType device_type):
+    return DeviceAllocationType(<char> device_type)
+
+
+cdef class Device(_Weakrefable):
+    """
+    Abstract interface for hardware devices
+
+    This object represents a device with access to some memory spaces.
+    When handling a Buffer or raw memory address, it allows deciding in which
+    context the raw memory address should be interpreted
+    (e.g. CPU-accessible memory, or embedded memory on some particular GPU).
+    """
+
+    def __init__(self):
+        raise TypeError("Do not call Device's constructor directly, "
+                        "use the device attribute of the MemoryManager instead.")
+
+    cdef void init(self, const shared_ptr[CDevice]& device):
+        self.device = device
+
+    @staticmethod
+    cdef wrap(const shared_ptr[CDevice]& device):
+        cdef Device self = Device.__new__(Device)
+        self.init(device)
+        return self
+
+    def __eq__(self, other):
+        if not isinstance(other, Device):
+            return False
+        return self.device.get().Equals(deref((<Device>other).device.get()))
+
+    def __repr__(self):
+        return "<pyarrow.Device: {}>".format(frombytes(self.device.get().ToString()))
+
+    @property
+    def type_name(self):
+        """
+        A shorthand for this device's type.
+        """
+        return frombytes(self.device.get().type_name())
+
+    @property
+    def device_id(self):
+        """
+        A device ID to identify this device if there are multiple of this type.
+
+        If there is no "device_id" equivalent (such as for the main CPU device on
+        non-numa systems) returns -1.
+        """
+        return self.device.get().device_id()
+
+    @property
+    def is_cpu(self):
+        """
+        Whether this device is the main CPU device.
+
+        This shorthand method is very useful when deciding whether a memory address
+        is CPU-accessible.
+        """
+        return self.device.get().is_cpu()
+
+    @property
+    def device_type(self):
+        """
+        Return the DeviceAllocationType of this device.
+        """
+        return _wrap_device_allocation_type(self.device.get().device_type())
+
+
+cdef class MemoryManager(_Weakrefable):
+    """
+    An object that provides memory management primitives.
+
+    A MemoryManager is always tied to a particular Device instance.
+    It can also have additional parameters (such as a MemoryPool to
+    allocate CPU memory).
+
+    """
+
+    def __init__(self):
+        raise TypeError("Do not call MemoryManager's constructor directly, "
+                        "use pyarrow.default_cpu_memory_manager() instead.")
+
+    cdef void init(self, const shared_ptr[CMemoryManager]& mm):
+        self.memory_manager = mm
+
+    @staticmethod
+    cdef wrap(const shared_ptr[CMemoryManager]& mm):
+        cdef MemoryManager self = MemoryManager.__new__(MemoryManager)
+        self.init(mm)
+        return self
+
+    def __repr__(self):
+        return "<pyarrow.MemoryManager device: {}>".format(
+            frombytes(self.memory_manager.get().device().get().ToString())
+        )
+
+    @property
+    def device(self):
+        """
+        The device this MemoryManager is tied to.
+        """
+        return Device.wrap(self.memory_manager.get().device())
+
+    @property
+    def is_cpu(self):
+        """
+        Whether this MemoryManager is tied to the main CPU device.
+
+        This shorthand method is very useful when deciding whether a memory
+        address is CPU-accessible.
+        """
+        return self.memory_manager.get().is_cpu()
+
+
+def default_cpu_memory_manager():
+    """
+    Return the default CPU MemoryManager instance.
+
+    The returned singleton instance uses the default MemoryPool.
+    """
+    return MemoryManager.wrap(c_default_cpu_memory_manager())
diff --git a/python/pyarrow/includes/libarrow.pxd b/python/pyarrow/includes/libarrow.pxd
index aa50dd189a82d..0d871f411b11b 100644
--- a/python/pyarrow/includes/libarrow.pxd
+++ b/python/pyarrow/includes/libarrow.pxd
@@ -173,6 +173,7 @@ cdef extern from "arrow/api.h" namespace "arrow" nogil:
         c_string ToString()
 
     c_bool is_primitive(Type type)
+    c_bool is_numeric(Type type)
 
     cdef cppclass CArrayData" arrow::ArrayData":
         shared_ptr[CDataType] type
@@ -233,6 +234,7 @@ cdef extern from "arrow/api.h" namespace "arrow" nogil:
         CStatus Validate() const
         CStatus ValidateFull() const
         CResult[shared_ptr[CArray]] View(const shared_ptr[CDataType]& type)
+        CDeviceAllocationType device_type()
 
     shared_ptr[CArray] MakeArray(const shared_ptr[CArrayData]& data)
     CResult[shared_ptr[CArray]] MakeArrayOfNull(
@@ -315,6 +317,38 @@ cdef extern from "arrow/api.h" namespace "arrow" nogil:
     cdef cppclass CProxyMemoryPool" arrow::ProxyMemoryPool"(CMemoryPool):
         CProxyMemoryPool(CMemoryPool*)
 
+    ctypedef enum CDeviceAllocationType "arrow::DeviceAllocationType":
+        CDeviceAllocationType_kCPU "arrow::DeviceAllocationType::kCPU"
+        CDeviceAllocationType_kCUDA "arrow::DeviceAllocationType::kCUDA"
+        CDeviceAllocationType_kCUDA_HOST "arrow::DeviceAllocationType::kCUDA_HOST"
+        CDeviceAllocationType_kOPENCL "arrow::DeviceAllocationType::kOPENCL"
+        CDeviceAllocationType_kVULKAN "arrow::DeviceAllocationType::kVULKAN"
+        CDeviceAllocationType_kMETAL "arrow::DeviceAllocationType::kMETAL"
+        CDeviceAllocationType_kVPI "arrow::DeviceAllocationType::kVPI"
+        CDeviceAllocationType_kROCM "arrow::DeviceAllocationType::kROCM"
+        CDeviceAllocationType_kROCM_HOST "arrow::DeviceAllocationType::kROCM_HOST"
+        CDeviceAllocationType_kEXT_DEV "arrow::DeviceAllocationType::kEXT_DEV"
+        CDeviceAllocationType_kCUDA_MANAGED "arrow::DeviceAllocationType::kCUDA_MANAGED"
+        CDeviceAllocationType_kONEAPI "arrow::DeviceAllocationType::kONEAPI"
+        CDeviceAllocationType_kWEBGPU "arrow::DeviceAllocationType::kWEBGPU"
+        CDeviceAllocationType_kHEXAGON "arrow::DeviceAllocationType::kHEXAGON"
+
+    cdef cppclass CDevice" arrow::Device":
+        const char* type_name()
+        c_string ToString()
+        c_bool Equals(const CDevice& other)
+        int64_t device_id()
+        c_bool is_cpu() const
+        shared_ptr[CMemoryManager] default_memory_manager()
+        CDeviceAllocationType device_type()
+
+    cdef cppclass CMemoryManager" arrow::MemoryManager":
+        const shared_ptr[CDevice] device()
+        c_bool is_cpu() const
+
+    shared_ptr[CMemoryManager] c_default_cpu_memory_manager \
+        " arrow::default_cpu_memory_manager"()
+
     cdef cppclass CBuffer" arrow::Buffer":
         CBuffer(const uint8_t* data, int64_t size)
         const uint8_t* data()
@@ -327,6 +361,9 @@ cdef extern from "arrow/api.h" namespace "arrow" nogil:
         c_bool is_mutable() const
         c_string ToHexString()
         c_bool Equals(const CBuffer& other)
+        shared_ptr[CDevice] device()
+        const shared_ptr[CMemoryManager] memory_manager()
+        CDeviceAllocationType device_type()
 
     CResult[shared_ptr[CBuffer]] SliceBufferSafe(
         const shared_ptr[CBuffer]& buffer, int64_t offset)
@@ -787,7 +824,9 @@ cdef extern from "arrow/api.h" namespace "arrow" nogil:
             const shared_ptr[CArray]& offsets,
             const shared_ptr[CArray]& keys,
             const shared_ptr[CArray]& items,
-            CMemoryPool* pool)
+            CMemoryPool* pool,
+            const shared_ptr[CBuffer] null_bitmap,
+        )
 
         @staticmethod
         CResult[shared_ptr[CArray]] FromArraysAndType" FromArrays"(
@@ -795,7 +834,9 @@ cdef extern from "arrow/api.h" namespace "arrow" nogil:
             const shared_ptr[CArray]& offsets,
             const shared_ptr[CArray]& keys,
             const shared_ptr[CArray]& items,
-            CMemoryPool* pool)
+            CMemoryPool* pool,
+            const shared_ptr[CBuffer] null_bitmap,
+        )
 
         shared_ptr[CArray] keys()
         shared_ptr[CArray] items()
@@ -975,6 +1016,8 @@ cdef extern from "arrow/api.h" namespace "arrow" nogil:
         int num_columns()
         int64_t num_rows()
 
+        CDeviceAllocationType device_type()
+
         CStatus Validate() const
         CStatus ValidateFull() const
 
@@ -984,7 +1027,8 @@ cdef extern from "arrow/api.h" namespace "arrow" nogil:
         shared_ptr[CRecordBatch] Slice(int64_t offset)
         shared_ptr[CRecordBatch] Slice(int64_t offset, int64_t length)
 
-        CResult[shared_ptr[CTensor]] ToTensor(c_bool null_to_nan, CMemoryPool* pool) const
+        CResult[shared_ptr[CTensor]] ToTensor(c_bool null_to_nan, c_bool row_major,
+                                              CMemoryPool* pool) const
 
     cdef cppclass CRecordBatchWithMetadata" arrow::RecordBatchWithMetadata":
         shared_ptr[CRecordBatch] batch
@@ -2317,9 +2361,10 @@ cdef extern from "arrow/compute/api.h" namespace "arrow::compute" nogil:
 
     cdef cppclass CPadOptions \
             "arrow::compute::PadOptions"(CFunctionOptions):
-        CPadOptions(int64_t width, c_string padding)
+        CPadOptions(int64_t width, c_string padding, c_bool lean_left_on_odd_padding)
         int64_t width
         c_string padding
+        c_bool lean_left_on_odd_padding
 
     cdef cppclass CSliceOptions \
             "arrow::compute::SliceOptions"(CFunctionOptions):
@@ -2587,6 +2632,11 @@ cdef extern from "arrow/compute/api.h" namespace "arrow::compute" nogil:
         CPairwiseOptions(int64_t period)
         int64_t period
 
+    cdef cppclass CListFlattenOptions\
+            "arrow::compute::ListFlattenOptions"(CFunctionOptions):
+        CListFlattenOptions(c_bool recursive)
+        c_bool recursive
+
     cdef cppclass CArraySortOptions \
             "arrow::compute::ArraySortOptions"(CFunctionOptions):
         CArraySortOptions(CSortOrder, CNullPlacement)
@@ -2794,6 +2844,8 @@ cdef extern from "arrow/extension_type.h" namespace "arrow":
     cdef cppclass CExtensionType" arrow::ExtensionType"(CDataType):
         c_string extension_name()
         shared_ptr[CDataType] storage_type()
+        int byte_width()
+        int bit_width()
 
         @staticmethod
         shared_ptr[CArray] WrapArray(shared_ptr[CDataType] ext_type,
@@ -2916,8 +2968,13 @@ cdef extern from "arrow/c/abi.h":
     cdef struct ArrowArrayStream:
         void (*release)(ArrowArrayStream*) noexcept nogil
 
+    ctypedef int32_t ArrowDeviceType
+    cdef ArrowDeviceType ARROW_DEVICE_CUDA
+
     cdef struct ArrowDeviceArray:
-        pass
+        ArrowArray array
+        int64_t device_id
+        int32_t device_type
 
 cdef extern from "arrow/c/bridge.h" namespace "arrow" nogil:
     CStatus ExportType(CDataType&, ArrowSchema* out)
diff --git a/python/pyarrow/includes/libarrow_fs.pxd b/python/pyarrow/includes/libarrow_fs.pxd
index 328b426a498db..cc260b80c7779 100644
--- a/python/pyarrow/includes/libarrow_fs.pxd
+++ b/python/pyarrow/includes/libarrow_fs.pxd
@@ -61,6 +61,7 @@ cdef extern from "arrow/filesystem/api.h" namespace "arrow::fs" nogil:
         shared_ptr[CFileSystem] shared_from_this()
         c_string type_name() const
         CResult[c_string] NormalizePath(c_string path)
+        CResult[c_string] MakeUri(c_string path)
         CResult[CFileInfo] GetFileInfo(const c_string& path)
         CResult[vector[CFileInfo]] GetFileInfo(
             const vector[c_string]& paths)
@@ -84,6 +85,8 @@ cdef extern from "arrow/filesystem/api.h" namespace "arrow::fs" nogil:
         c_bool Equals(const CFileSystem& other)
         c_bool Equals(shared_ptr[CFileSystem] other)
 
+    CResult[shared_ptr[CFileSystem]] CFileSystemFromUri \
+        "arrow::fs::FileSystemFromUri"(const c_string& uri)
     CResult[shared_ptr[CFileSystem]] CFileSystemFromUri \
         "arrow::fs::FileSystemFromUri"(const c_string& uri, c_string* out_path)
     CResult[shared_ptr[CFileSystem]] CFileSystemFromUriOrPath \
@@ -98,19 +101,6 @@ cdef extern from "arrow/filesystem/api.h" namespace "arrow::fs" nogil:
     CStatus CFileSystemsInitialize "arrow::fs::Initialize" \
         (const CFileSystemGlobalOptions& options)
 
-    cdef cppclass CLocalFileSystemOptions "arrow::fs::LocalFileSystemOptions":
-        c_bool use_mmap
-
-        @staticmethod
-        CLocalFileSystemOptions Defaults()
-
-        c_bool Equals(const CLocalFileSystemOptions& other)
-
-    cdef cppclass CLocalFileSystem "arrow::fs::LocalFileSystem"(CFileSystem):
-        CLocalFileSystem()
-        CLocalFileSystem(CLocalFileSystemOptions)
-        CLocalFileSystemOptions options()
-
     cdef cppclass CSubTreeFileSystem \
             "arrow::fs::SubTreeFileSystem"(CFileSystem):
         CSubTreeFileSystem(const c_string& base_path,
@@ -167,6 +157,7 @@ cdef extern from "arrow/filesystem/api.h" namespace "arrow::fs" nogil:
         c_bool background_writes
         c_bool allow_bucket_creation
         c_bool allow_bucket_deletion
+        c_bool check_directory_existence_before_creation
         c_bool force_virtual_addressing
         shared_ptr[const CKeyValueMetadata] default_metadata
         c_string role_arn
diff --git a/python/pyarrow/io.pxi b/python/pyarrow/io.pxi
index 7890bf4b2dd76..3a0125e957244 100644
--- a/python/pyarrow/io.pxi
+++ b/python/pyarrow/io.pxi
@@ -1286,6 +1286,10 @@ cdef class Buffer(_Weakrefable):
                 f"is_cpu={self.is_cpu} "
                 f"is_mutable={self.is_mutable}>")
 
+    def _assert_cpu(self):
+        if not self.is_cpu:
+            raise NotImplementedError("Implemented only for data on CPU device")
+
     @property
     def size(self):
         """
@@ -1311,6 +1315,7 @@ cdef class Buffer(_Weakrefable):
         -------
         : bytes
         """
+        self._assert_cpu()
         return self.buffer.get().ToHexString()
 
     @property
@@ -1327,6 +1332,39 @@ cdef class Buffer(_Weakrefable):
         """
         return self.buffer.get().is_cpu()
 
+    @property
+    def device(self):
+        """
+        The device where the buffer resides.
+
+        Returns
+        -------
+        Device
+        """
+        return Device.wrap(self.buffer.get().device())
+
+    @property
+    def memory_manager(self):
+        """
+        The memory manager associated with the buffer.
+
+        Returns
+        -------
+        MemoryManager
+        """
+        return MemoryManager.wrap(self.buffer.get().memory_manager())
+
+    @property
+    def device_type(self):
+        """
+        The device type where the buffer resides.
+
+        Returns
+        -------
+        DeviceAllocationType
+        """
+        return _wrap_device_allocation_type(self.buffer.get().device_type())
+
     @property
     def parent(self):
         cdef shared_ptr[CBuffer] parent_buf = self.buffer.get().parent()
@@ -1345,6 +1383,7 @@ cdef class Buffer(_Weakrefable):
         return self.getitem(_normalize_index(key, self.size))
 
     cdef getitem(self, int64_t i):
+        self._assert_cpu()
         return self.buffer.get().data()[i]
 
     def slice(self, offset=0, length=None):
@@ -1391,6 +1430,18 @@ cdef class Buffer(_Weakrefable):
         are_equal : bool
             True if buffer contents and size are equal
         """
+        if self.device != other.device:
+            raise ValueError(
+                "Device on which the data resides differs between buffers: "
+                f"{self.device.type_name} and {other.device.type_name}."
+            )
+        if not self.is_cpu:
+            if self.address != other.address:
+                raise NotImplementedError(
+                    "Implemented only for data on CPU device or data with equal "
+                    "addresses"
+                )
+
         cdef c_bool result = False
         with nogil:
             result = self.buffer.get().Equals(deref(other.buffer.get()))
@@ -1403,6 +1454,8 @@ cdef class Buffer(_Weakrefable):
             return self.equals(py_buffer(other))
 
     def __reduce_ex__(self, protocol):
+        self._assert_cpu()
+
         if protocol >= 5:
             bufobj = pickle.PickleBuffer(self)
         elif self.buffer.get().is_mutable():
@@ -1419,11 +1472,15 @@ cdef class Buffer(_Weakrefable):
         """
         Return this buffer as a Python bytes object. Memory is copied.
         """
+        self._assert_cpu()
+
         return cp.PyBytes_FromStringAndSize(
             <const char*>self.buffer.get().data(),
             self.buffer.get().size())
 
     def __getbuffer__(self, cp.Py_buffer* buffer, int flags):
+        self._assert_cpu()
+
         if self.buffer.get().is_mutable():
             buffer.readonly = 0
         else:
@@ -1446,27 +1503,6 @@ cdef class Buffer(_Weakrefable):
         buffer.strides = self.strides
         buffer.suboffsets = NULL
 
-    def __getsegcount__(self, Py_ssize_t *len_out):
-        if len_out != NULL:
-            len_out[0] = <Py_ssize_t>self.size
-        return 1
-
-    def __getreadbuffer__(self, Py_ssize_t idx, void **p):
-        if idx != 0:
-            raise SystemError("accessing nonexistent buffer segment")
-        if p != NULL:
-            p[0] = <void*> self.buffer.get().data()
-        return self.size
-
-    def __getwritebuffer__(self, Py_ssize_t idx, void **p):
-        if not self.buffer.get().is_mutable():
-            raise SystemError("trying to write an immutable buffer")
-        if idx != 0:
-            raise SystemError("accessing nonexistent buffer segment")
-        if p != NULL:
-            p[0] = <void*> self.buffer.get().data()
-        return self.size
-
 
 cdef class ResizableBuffer(Buffer):
     """
@@ -2142,21 +2178,21 @@ cdef class CacheOptions(_Weakrefable):
     Parameters
     ----------
     hole_size_limit : int, default 8KiB
-        The maximum distance in bytes between two consecutive ranges; beyond 
+        The maximum distance in bytes between two consecutive ranges; beyond
         this value, ranges are not combined.
     range_size_limit : int, default 32MiB
-        The maximum size in bytes of a combined range; if combining two 
-        consecutive ranges would produce a range of a size greater than this, 
+        The maximum size in bytes of a combined range; if combining two
+        consecutive ranges would produce a range of a size greater than this,
         they are not combined
     lazy : bool, default True
         lazy = false: request all byte ranges when PreBuffer or WillNeed is called.
-        lazy = True, prefetch_limit = 0: request merged byte ranges only after the reader 
-        needs them. 
-        lazy = True, prefetch_limit = k: prefetch up to k merged byte ranges ahead of the 
+        lazy = True, prefetch_limit = 0: request merged byte ranges only after the reader
+        needs them.
+        lazy = True, prefetch_limit = k: prefetch up to k merged byte ranges ahead of the
         range that is currently being read.
     prefetch_limit : int, default 0
-        The maximum number of ranges to be prefetched. This is only used for 
-        lazy cache to asynchronously read some ranges after reading the target 
+        The maximum number of ranges to be prefetched. This is only used for
+        lazy cache to asynchronously read some ranges after reading the target
         range.
     """
 
@@ -2227,19 +2263,19 @@ cdef class CacheOptions(_Weakrefable):
         """
         Create suiteable CacheOptions based on provided network metrics.
 
-        Typically this will be used with object storage solutions like Amazon S3, 
+        Typically this will be used with object storage solutions like Amazon S3,
         Google Cloud Storage and Azure Blob Storage.
 
         Parameters
         ----------
         time_to_first_byte_millis : int
-            Seek-time or Time-To-First-Byte (TTFB) in milliseconds, also called call 
-            setup latency of a new read request. The value is a positive integer. 
+            Seek-time or Time-To-First-Byte (TTFB) in milliseconds, also called call
+            setup latency of a new read request. The value is a positive integer.
         transfer_bandwidth_mib_per_sec : int
-            Data transfer Bandwidth (BW) in MiB/sec (per connection). The value is a positive 
+            Data transfer Bandwidth (BW) in MiB/sec (per connection). The value is a positive
             integer.
         ideal_bandwidth_utilization_frac : int, default 0.9
-            Transfer bandwidth utilization fraction (per connection) to maximize the net 
+            Transfer bandwidth utilization fraction (per connection) to maximize the net
             data load. The value is a positive float less than 1.
         max_ideal_request_size_mib : int, default 64
             The maximum single data request size (in MiB) to maximize the net data load.
diff --git a/python/pyarrow/ipc.pxi b/python/pyarrow/ipc.pxi
index 617e25a14235d..e15b0ea40ed2e 100644
--- a/python/pyarrow/ipc.pxi
+++ b/python/pyarrow/ipc.pxi
@@ -659,6 +659,11 @@ cdef class RecordBatchReader(_Weakrefable):
 
     # cdef block is in lib.pxd
 
+    def __init__(self):
+        raise TypeError("Do not call {}'s constructor directly, "
+                        "use one of the RecordBatchReader.from_* functions instead."
+                        .format(self.__class__.__name__))
+
     def __iter__(self):
         return self
 
diff --git a/python/pyarrow/lib.pxd b/python/pyarrow/lib.pxd
index b1187a77c2a6e..082d8470cdbb0 100644
--- a/python/pyarrow/lib.pxd
+++ b/python/pyarrow/lib.pxd
@@ -286,6 +286,7 @@ cdef class Array(_PandasConvertible):
     cdef void init(self, const shared_ptr[CArray]& sp_array) except *
     cdef getitem(self, int64_t i)
     cdef int64_t length(self)
+    cdef void _assert_cpu(self) except *
 
 
 cdef class Tensor(_Weakrefable):
@@ -437,11 +438,11 @@ cdef class LargeListArray(BaseListArray):
     pass
 
 
-cdef class ListViewArray(Array):
+cdef class ListViewArray(BaseListArray):
     pass
 
 
-cdef class LargeListViewArray(Array):
+cdef class LargeListViewArray(BaseListArray):
     pass
 
 
@@ -524,6 +525,26 @@ cdef class RecordBatch(_Tabular):
     cdef void init(self, const shared_ptr[CRecordBatch]& table)
 
 
+cdef class Device(_Weakrefable):
+    cdef:
+        shared_ptr[CDevice] device
+
+    cdef void init(self, const shared_ptr[CDevice]& device)
+
+    @staticmethod
+    cdef wrap(const shared_ptr[CDevice]& device)
+
+
+cdef class MemoryManager(_Weakrefable):
+    cdef:
+        shared_ptr[CMemoryManager] memory_manager
+
+    cdef void init(self, const shared_ptr[CMemoryManager]& memory_manager)
+
+    @staticmethod
+    cdef wrap(const shared_ptr[CMemoryManager]& mm)
+
+
 cdef class Buffer(_Weakrefable):
     cdef:
         shared_ptr[CBuffer] buffer
diff --git a/python/pyarrow/lib.pyx b/python/pyarrow/lib.pyx
index 3245e50f0fe69..e08021c62b5ae 100644
--- a/python/pyarrow/lib.pyx
+++ b/python/pyarrow/lib.pyx
@@ -125,6 +125,7 @@ UnionMode_DENSE = _UnionMode_DENSE
 
 __pc = None
 __pac = None
+__cuda_loaded = None
 
 
 def _pc():
@@ -143,6 +144,24 @@ def _pac():
     return __pac
 
 
+def _ensure_cuda_loaded():
+    # Try importing the cuda module to ensure libarrow_cuda gets loaded
+    # to register the CUDA device for the C Data Interface import
+    global __cuda_loaded
+    if __cuda_loaded is None:
+        try:
+            import pyarrow.cuda  # no-cython-lint
+            __cuda_loaded = True
+        except ImportError as exc:
+            __cuda_loaded = str(exc)
+
+    if __cuda_loaded is not True:
+        raise ImportError(
+            "Trying to import data on a CUDA device, but PyArrow is not built with "
+            f"CUDA support.\n(importing 'pyarrow.cuda' resulted in \"{__cuda_loaded}\")."
+        )
+
+
 def _gdb_test_session():
     GdbTestSession()
 
@@ -162,6 +181,9 @@ include "pandas-shim.pxi"
 # Memory pools and allocation
 include "memory.pxi"
 
+# Device type and memory manager
+include "device.pxi"
+
 # DataType, Field, Schema
 include "types.pxi"
 
diff --git a/python/pyarrow/pandas-shim.pxi b/python/pyarrow/pandas-shim.pxi
index 0409e133ada5d..74f0d981b52f4 100644
--- a/python/pyarrow/pandas-shim.pxi
+++ b/python/pyarrow/pandas-shim.pxi
@@ -38,7 +38,7 @@ cdef class _PandasAPIShim(object):
         object _array_like_types, _is_extension_array_dtype, _lock
         bint has_sparse
         bint _pd024
-        bint _is_v1, _is_ge_v21
+        bint _is_v1, _is_ge_v21, _is_ge_v3
 
     def __init__(self):
         self._lock = Lock()
@@ -79,6 +79,7 @@ cdef class _PandasAPIShim(object):
 
         self._is_v1 = self._loose_version < Version('2.0.0')
         self._is_ge_v21 = self._loose_version >= Version('2.1.0')
+        self._is_ge_v3 = self._loose_version >= Version('3.0.0.dev0')
 
         self._compat_module = pdcompat
         self._data_frame = pd.DataFrame
@@ -169,6 +170,10 @@ cdef class _PandasAPIShim(object):
         self._check_import()
         return self._is_ge_v21
 
+    def is_ge_v3(self):
+        self._check_import()
+        return self._is_ge_v3
+
     @property
     def categorical_type(self):
         self._check_import()
diff --git a/python/pyarrow/pandas_compat.py b/python/pyarrow/pandas_compat.py
index 5bd0dfcf6b94a..c23c64d532b66 100644
--- a/python/pyarrow/pandas_compat.py
+++ b/python/pyarrow/pandas_compat.py
@@ -23,6 +23,7 @@
 # module bug (ARROW-11983)
 import concurrent.futures.thread  # noqa
 from copy import deepcopy
+import decimal
 from itertools import zip_longest
 import json
 import operator
@@ -108,9 +109,10 @@ def get_logical_type_from_numpy(pandas_collection):
     except KeyError:
         if hasattr(pandas_collection.dtype, 'tz'):
             return 'datetimetz'
-        # See https://github.com/pandas-dev/pandas/issues/24739
-        if str(pandas_collection.dtype) == 'datetime64[ns]':
-            return 'datetime64[ns]'
+        # See https://github.com/pandas-dev/pandas/issues/24739 (infer_dtype will
+        # result in "datetime64" without unit, while pandas astype requires a unit)
+        if str(pandas_collection.dtype).startswith('datetime64'):
+            return str(pandas_collection.dtype)
         result = _pandas_api.infer_dtype(pandas_collection)
         if result == 'string':
             return 'unicode'
@@ -676,7 +678,7 @@ def get_datetimetz_type(values, dtype, type_):
 # Converting pyarrow.Table efficiently to pandas.DataFrame
 
 
-def _reconstruct_block(item, columns=None, extension_columns=None):
+def _reconstruct_block(item, columns=None, extension_columns=None, return_block=True):
     """
     Construct a pandas Block from the `item` dictionary coming from pyarrow's
     serialization or returned by arrow::python::ConvertTableToPandas.
@@ -709,22 +711,23 @@ def _reconstruct_block(item, columns=None, extension_columns=None):
     block_arr = item.get('block', None)
     placement = item['placement']
     if 'dictionary' in item:
-        cat = _pandas_api.categorical_type.from_codes(
+        arr = _pandas_api.categorical_type.from_codes(
             block_arr, categories=item['dictionary'],
             ordered=item['ordered'])
-        block = _int.make_block(cat, placement=placement)
     elif 'timezone' in item:
         unit, _ = np.datetime_data(block_arr.dtype)
         dtype = make_datetimetz(unit, item['timezone'])
         if _pandas_api.is_ge_v21():
-            pd_arr = _pandas_api.pd.array(
+            arr = _pandas_api.pd.array(
                 block_arr.view("int64"), dtype=dtype, copy=False
             )
-            block = _int.make_block(pd_arr, placement=placement)
         else:
-            block = _int.make_block(block_arr, placement=placement,
-                                    klass=_int.DatetimeTZBlock,
-                                    dtype=dtype)
+            arr = block_arr
+            if return_block:
+                block = _int.make_block(block_arr, placement=placement,
+                                        klass=_int.DatetimeTZBlock,
+                                        dtype=dtype)
+                return block
     elif 'py_array' in item:
         # create ExtensionBlock
         arr = item['py_array']
@@ -734,12 +737,14 @@ def _reconstruct_block(item, columns=None, extension_columns=None):
         if not hasattr(pandas_dtype, '__from_arrow__'):
             raise ValueError("This column does not support to be converted "
                              "to a pandas ExtensionArray")
-        pd_ext_arr = pandas_dtype.__from_arrow__(arr)
-        block = _int.make_block(pd_ext_arr, placement=placement)
+        arr = pandas_dtype.__from_arrow__(arr)
     else:
-        block = _int.make_block(block_arr, placement=placement)
+        arr = block_arr
 
-    return block
+    if return_block:
+        return _int.make_block(arr, placement=placement)
+    else:
+        return arr, placement
 
 
 def make_datetimetz(unit, tz):
@@ -752,9 +757,6 @@ def make_datetimetz(unit, tz):
 def table_to_dataframe(
     options, table, categories=None, ignore_metadata=False, types_mapper=None
 ):
-    from pandas.core.internals import BlockManager
-    from pandas import DataFrame
-
     all_columns = []
     column_indexes = []
     pandas_metadata = table.schema.pandas_metadata
@@ -774,15 +776,35 @@ def table_to_dataframe(
 
     _check_data_column_metadata_consistency(all_columns)
     columns = _deserialize_column_index(table, all_columns, column_indexes)
-    blocks = _table_to_blocks(options, table, categories, ext_columns_dtypes)
 
-    axes = [columns, index]
-    mgr = BlockManager(blocks, axes)
-    if _pandas_api.is_ge_v21():
-        df = DataFrame._from_mgr(mgr, mgr.axes)
+    column_names = table.column_names
+    result = pa.lib.table_to_blocks(options, table, categories,
+                                    list(ext_columns_dtypes.keys()))
+    if _pandas_api.is_ge_v3():
+        from pandas.api.internals import create_dataframe_from_blocks
+
+        blocks = [
+            _reconstruct_block(
+                item, column_names, ext_columns_dtypes, return_block=False)
+            for item in result
+        ]
+        df = create_dataframe_from_blocks(blocks, index=index, columns=columns)
+        return df
     else:
-        df = DataFrame(mgr)
-    return df
+        from pandas.core.internals import BlockManager
+        from pandas import DataFrame
+
+        blocks = [
+            _reconstruct_block(item, column_names, ext_columns_dtypes)
+            for item in result
+        ]
+        axes = [columns, index]
+        mgr = BlockManager(blocks, axes)
+        if _pandas_api.is_ge_v21():
+            df = DataFrame._from_mgr(mgr, mgr.axes)
+        else:
+            df = DataFrame(mgr)
+        return df
 
 
 # Set of the string repr of all numpy dtypes that can be stored in a pandas
@@ -1007,6 +1029,7 @@ def _is_generated_index_name(name):
     'string': np.str_,
     'integer': np.int64,
     'floating': np.float64,
+    'decimal': np.object_,
     'empty': np.object_,
 }
 
@@ -1085,6 +1108,13 @@ def _reconstruct_columns_from_metadata(columns, column_indexes):
             tz = pa.lib.string_to_tzinfo(
                 column_indexes[0]['metadata']['timezone'])
             level = pd.to_datetime(level, utc=True).tz_convert(tz)
+            if _pandas_api.is_ge_v3():
+                # with pandas 3+, to_datetime returns a unit depending on the string
+                # data, so we restore it to the original unit from the metadata
+                level = level.as_unit(np.datetime_data(dtype)[0])
+        # GH-41503: if the column index was decimal, restore to decimal
+        elif pandas_dtype == "decimal":
+            level = _pandas_api.pd.Index([decimal.Decimal(i) for i in level])
         elif level.dtype != dtype:
             level = level.astype(dtype)
         # ARROW-9096: if original DataFrame was upcast we keep that
@@ -1099,17 +1129,6 @@ def _reconstruct_columns_from_metadata(columns, column_indexes):
         return pd.Index(new_levels[0], dtype=new_levels[0].dtype, name=columns.name)
 
 
-def _table_to_blocks(options, block_table, categories, extension_columns):
-    # Part of table_to_blockmanager
-
-    # Convert an arrow table to Block from the internal pandas API
-    columns = block_table.column_names
-    result = pa.lib.table_to_blocks(options, block_table, categories,
-                                    list(extension_columns.keys()))
-    return [_reconstruct_block(item, columns, extension_columns)
-            for item in result]
-
-
 def _add_any_metadata(table, pandas_metadata):
     modified_columns = {}
     modified_fields = {}
diff --git a/python/pyarrow/parquet/core.py b/python/pyarrow/parquet/core.py
index 69a1c9d19aae2..6ca6f7089e75c 100644
--- a/python/pyarrow/parquet/core.py
+++ b/python/pyarrow/parquet/core.py
@@ -761,9 +761,9 @@ def _sanitize_table(table, new_schema, flavor):
     by flavor argument. This take priority over the coerce_timestamps option.
 coerce_timestamps : str, default None
     Cast timestamps to a particular resolution. If omitted, defaults are chosen
-    depending on `version`. By default, for ``version='1.0'`` (the default)
-    and ``version='2.4'``, nanoseconds are cast to microseconds ('us'), while
-    for other `version` values, they are written natively without loss
+    depending on `version`. For ``version='1.0'`` and ``version='2.4'``,
+    nanoseconds are cast to microseconds ('us'), while for
+    ``version='2.6'`` (the default), they are written natively without loss
     of resolution.  Seconds are always cast to milliseconds ('ms') by default,
     as Parquet does not have any temporal type with seconds resolution.
     If the casting results in loss of data, it will raise an exception
@@ -797,8 +797,9 @@ def _sanitize_table(table, new_schema, flavor):
     Specify if the byte_stream_split encoding should be used in general or
     only for some columns. If both dictionary and byte_stream_stream are
     enabled, then dictionary is preferred.
-    The byte_stream_split encoding is valid only for floating-point data types
-    and should be combined with a compression codec.
+    The byte_stream_split encoding is valid for integer, floating-point
+    and fixed-size binary data types (including decimals); it should be
+    combined with a compression codec so as to achieve size reduction.
 column_encoding : string or dict, default None
     Specify the encoding scheme on a per column basis.
     Can only be used when ``use_dictionary`` is set to False, and
@@ -872,6 +873,23 @@ def _sanitize_table(table, new_schema, flavor):
     Specify the sort order of the data being written. The writer does not sort
     the data nor does it verify that the data is sorted. The sort order is
     written to the row group metadata, which can then be used by readers.
+store_decimal_as_integer : bool, default False
+    Allow decimals with 1 <= precision <= 18 to be stored as integers.
+    In Parquet, DECIMAL can be stored in any of the following physical types:
+    - int32: for 1 <= precision <= 9.
+    - int64: for 10 <= precision <= 18.
+    - fixed_len_byte_array: precision is limited by the array size.
+      Length n can store <= floor(log_10(2^(8*n - 1) - 1)) base-10 digits.
+    - binary: precision is unlimited. The minimum number of bytes to store the
+      unscaled value is used.
+
+    By default, this is DISABLED and all decimal types annotate fixed_len_byte_array.
+    When enabled, the writer will use the following physical types to store decimals:
+    - int32: for 1 <= precision <= 9.
+    - int64: for 10 <= precision <= 18.
+    - fixed_len_byte_array: for precision > 18.
+
+    As a consequence, decimal columns stored in integer types are more compact.
 """
 
 _parquet_writer_example_doc = """\
@@ -967,6 +985,7 @@ def __init__(self, where, schema, filesystem=None,
                  write_page_index=False,
                  write_page_checksum=False,
                  sorting_columns=None,
+                 store_decimal_as_integer=False,
                  **options):
         if use_deprecated_int96_timestamps is None:
             # Use int96 timestamps for Spark
@@ -1019,6 +1038,7 @@ def __init__(self, where, schema, filesystem=None,
             write_page_index=write_page_index,
             write_page_checksum=write_page_checksum,
             sorting_columns=sorting_columns,
+            store_decimal_as_integer=store_decimal_as_integer,
             **options)
         self.is_open = True
 
@@ -1107,6 +1127,19 @@ def close(self):
         if self.file_handle is not None:
             self.file_handle.close()
 
+    def add_key_value_metadata(self, key_value_metadata):
+        """
+        Add key-value metadata to the file.
+        This will overwrite any existing metadata with the same key.
+
+        Parameters
+        ----------
+        key_value_metadata : dict
+            Keys and values must be string-like / coercible to bytes.
+        """
+        assert self.is_open
+        self.writer.add_key_value_metadata(key_value_metadata)
+
 
 def _get_pandas_index_columns(keyvalues):
     return (json.loads(keyvalues[b'pandas'].decode('utf8'))
@@ -1299,7 +1332,7 @@ def __init__(self, path_or_paths, filesystem=None, schema=None, *, filters=None,
                 f"local file systems, not {type(filesystem)}"
             )
 
-        # check for single fragment dataset
+        # check for single fragment dataset or dataset directory
         single_file = None
         self._base_dir = None
         if not isinstance(path_or_paths, list):
@@ -1313,8 +1346,6 @@ def __init__(self, path_or_paths, filesystem=None, schema=None, *, filters=None,
                     except ValueError:
                         filesystem = LocalFileSystem(use_mmap=memory_map)
                 finfo = filesystem.get_file_info(path_or_paths)
-                if finfo.is_file:
-                    single_file = path_or_paths
                 if finfo.type == FileType.Directory:
                     self._base_dir = path_or_paths
             else:
@@ -1771,6 +1802,7 @@ def read_table(source, *, columns=None, use_threads=True,
             ignore_prefixes=ignore_prefixes,
             pre_buffer=pre_buffer,
             coerce_int96_timestamp_unit=coerce_int96_timestamp_unit,
+            decryption_properties=decryption_properties,
             thrift_string_size_limit=thrift_string_size_limit,
             thrift_container_size_limit=thrift_container_size_limit,
             page_checksum_verification=page_checksum_verification,
@@ -1860,6 +1892,7 @@ def write_table(table, where, row_group_size=None, version='2.6',
                 write_page_index=False,
                 write_page_checksum=False,
                 sorting_columns=None,
+                store_decimal_as_integer=False,
                 **kwargs):
     # Implementor's note: when adding keywords here / updating defaults, also
     # update it in write_to_dataset and _dataset_parquet.pyx ParquetFileWriteOptions
@@ -1890,6 +1923,7 @@ def write_table(table, where, row_group_size=None, version='2.6',
                 write_page_index=write_page_index,
                 write_page_checksum=write_page_checksum,
                 sorting_columns=sorting_columns,
+                store_decimal_as_integer=store_decimal_as_integer,
                 **kwargs) as writer:
             writer.write_table(table, row_group_size=row_group_size)
     except Exception:
diff --git a/python/pyarrow/src/arrow/python/ipc.cc b/python/pyarrow/src/arrow/python/ipc.cc
index 0ed152242425d..e18c13e06c050 100644
--- a/python/pyarrow/src/arrow/python/ipc.cc
+++ b/python/pyarrow/src/arrow/python/ipc.cc
@@ -79,7 +79,9 @@ Status CastingRecordBatchReader::Init(std::shared_ptr<RecordBatchReader> parent,
 
   // Ensure all columns can be cast before succeeding
   for (int i = 0; i < num_fields; i++) {
-    if (!compute::CanCast(*src->field(i)->type(), *schema->field(i)->type())) {
+    auto& src_type = src->field(i)->type();
+    auto& schema_type = schema->field(i)->type();
+    if (!src_type->Equals(schema_type) && !compute::CanCast(*src_type, *schema_type)) {
       return Status::TypeError("Field ", i, " cannot be cast from ",
                                src->field(i)->type()->ToString(), " to ",
                                schema->field(i)->type()->ToString());
diff --git a/python/pyarrow/src/arrow/python/python_to_arrow.cc b/python/pyarrow/src/arrow/python/python_to_arrow.cc
index 902814a4e91f1..a2a325fde8dbd 100644
--- a/python/pyarrow/src/arrow/python/python_to_arrow.cc
+++ b/python/pyarrow/src/arrow/python/python_to_arrow.cc
@@ -405,7 +405,7 @@ class PyValue {
     RETURN_NOT_OK(PopulateMonthDayNano<MonthDayNanoField::kMonths>::Field(
         obj, &output.months, &found_attrs));
     // on relativeoffset weeks is a property calculated from days.  On
-    // DateOffset is is a field on its own. timedelta doesn't have a weeks
+    // DateOffset is a field on its own. timedelta doesn't have a weeks
     // attribute.
     PyObject* pandas_date_offset_type = internal::BorrowPandasDataOffsetType();
     bool is_date_offset = pandas_date_offset_type == (PyObject*)Py_TYPE(obj);
@@ -874,6 +874,10 @@ class PyListConverter : public ListConverter<T, PyConverter, PyConverterTrait> {
     if (PyArray_NDIM(ndarray) != 1) {
       return Status::Invalid("Can only convert 1-dimensional array values");
     }
+    if (PyArray_ISBYTESWAPPED(ndarray)) {
+      // TODO
+      return Status::NotImplemented("Byte-swapped arrays not supported");
+    }
     const int64_t size = PyArray_SIZE(ndarray);
     RETURN_NOT_OK(AppendTo(this->list_type_, size));
     RETURN_NOT_OK(this->list_builder_->ValidateOverflow(size));
diff --git a/python/pyarrow/src/arrow/python/udf.cc b/python/pyarrow/src/arrow/python/udf.cc
index e9b72a2592738..b6a862af8ca07 100644
--- a/python/pyarrow/src/arrow/python/udf.cc
+++ b/python/pyarrow/src/arrow/python/udf.cc
@@ -28,6 +28,10 @@
 #include "arrow/util/checked_cast.h"
 #include "arrow/util/logging.h"
 
+// Py_IsFinalizing added in Python 3.13.0a4
+#if PY_VERSION_HEX < 0x030D00A4
+#define Py_IsFinalizing() _Py_IsFinalizing()
+#endif
 namespace arrow {
 using compute::ExecSpan;
 using compute::Grouper;
@@ -47,7 +51,7 @@ struct PythonUdfKernelState : public compute::KernelState {
   // function needs to be destroyed at process exit
   // and Python may no longer be initialized.
   ~PythonUdfKernelState() {
-    if (_Py_IsFinalizing()) {
+    if (Py_IsFinalizing()) {
       function->detach();
     }
   }
@@ -64,7 +68,7 @@ struct PythonUdfKernelInit {
   // function needs to be destroyed at process exit
   // and Python may no longer be initialized.
   ~PythonUdfKernelInit() {
-    if (_Py_IsFinalizing()) {
+    if (Py_IsFinalizing()) {
       function->detach();
     }
   }
@@ -132,7 +136,7 @@ struct PythonTableUdfKernelInit {
   // function needs to be destroyed at process exit
   // and Python may no longer be initialized.
   ~PythonTableUdfKernelInit() {
-    if (_Py_IsFinalizing()) {
+    if (Py_IsFinalizing()) {
       function_maker->detach();
     }
   }
@@ -173,7 +177,7 @@ struct PythonUdfScalarAggregatorImpl : public ScalarUdfAggregator {
   };
 
   ~PythonUdfScalarAggregatorImpl() override {
-    if (_Py_IsFinalizing()) {
+    if (Py_IsFinalizing()) {
       function->detach();
     }
   }
@@ -270,7 +274,7 @@ struct PythonUdfHashAggregatorImpl : public HashUdfAggregator {
   };
 
   ~PythonUdfHashAggregatorImpl() override {
-    if (_Py_IsFinalizing()) {
+    if (Py_IsFinalizing()) {
       function->detach();
     }
   }
diff --git a/python/pyarrow/table.pxi b/python/pyarrow/table.pxi
index 54fda1da7dcaf..eb9ba650dbf60 100644
--- a/python/pyarrow/table.pxi
+++ b/python/pyarrow/table.pxi
@@ -525,11 +525,19 @@ cdef class ChunkedArray(_PandasConvertible):
 
         return values
 
-    def __array__(self, dtype=None):
+    def __array__(self, dtype=None, copy=None):
+        if copy is False:
+            raise ValueError(
+                "Unable to avoid a copy while creating a numpy array as requested "
+                "(converting a pyarrow.ChunkedArray always results in a copy).\n"
+                "If using `np.array(obj, copy=False)` replace it with "
+                "`np.asarray(obj)` to allow a copy when needed"
+            )
+        # 'copy' can further be ignored because to_numpy() already returns a copy
         values = self.to_numpy()
         if dtype is None:
             return values
-        return values.astype(dtype)
+        return values.astype(dtype, copy=False)
 
     def cast(self, object target_type=None, safe=None, options=None):
         """
@@ -1344,17 +1352,28 @@ cdef class ChunkedArray(_PandasConvertible):
             A capsule containing a C ArrowArrayStream struct.
         """
         cdef:
+            ChunkedArray chunked
             ArrowArrayStream* c_stream = NULL
 
         if requested_schema is not None:
-            out_type = DataType._import_from_c_capsule(requested_schema)
-            if self.type != out_type:
-                raise NotImplementedError("Casting to requested_schema")
+            target_type = DataType._import_from_c_capsule(requested_schema)
+
+            if target_type != self.type:
+                try:
+                    chunked = self.cast(target_type, safe=True)
+                except ArrowInvalid as e:
+                    raise ValueError(
+                        f"Could not cast {self.type} to requested type {target_type}: {e}"
+                    )
+            else:
+                chunked = self
+        else:
+            chunked = self
 
         stream_capsule = alloc_c_stream(&c_stream)
 
         with nogil:
-            check_status(ExportChunkedArray(self.sp_chunked_array, c_stream))
+            check_status(ExportChunkedArray(chunked.sp_chunked_array, c_stream))
 
         return stream_capsule
 
@@ -1397,6 +1416,9 @@ def chunked_array(arrays, type=None):
     ----------
     arrays : Array, list of Array, or array-like
         Must all be the same data type. Can be empty only if type also passed.
+        Any Arrow-compatible array that implements the Arrow PyCapsule Protocol
+        (has an ``__arrow_c_array__`` or ``__arrow_c_stream__`` method) can be
+        passed as well.
     type : DataType or string coercible to DataType
 
     Returns
@@ -1437,6 +1459,21 @@ def chunked_array(arrays, type=None):
 
     if isinstance(arrays, Array):
         arrays = [arrays]
+    elif hasattr(arrays, "__arrow_c_stream__"):
+        if type is not None:
+            requested_type = type.__arrow_c_schema__()
+        else:
+            requested_type = None
+        capsule = arrays.__arrow_c_stream__(requested_type)
+        result = ChunkedArray._import_from_c_capsule(capsule)
+        if type is not None and result.type != type:
+            # __arrow_c_stream__ coerces schema with best effort, so we might
+            # need to cast it if the producer wasn't able to cast to exact schema.
+            result = result.cast(type)
+        return result
+    elif hasattr(arrays, "__arrow_c_array__"):
+        arr = array(arrays, type=type)
+        arrays = [arr]
 
     for x in arrays:
         arr = x if isinstance(x, Array) else array(x, type=type)
@@ -1533,7 +1570,16 @@ cdef class _Tabular(_PandasConvertible):
         raise TypeError(f"Do not call {self.__class__.__name__}'s constructor directly, use "
                         f"one of the `{self.__class__.__name__}.from_*` functions instead.")
 
-    def __array__(self, dtype=None):
+    def __array__(self, dtype=None, copy=None):
+        if copy is False:
+            raise ValueError(
+                "Unable to avoid a copy while creating a numpy array as requested "
+                f"(converting a pyarrow.{self.__class__.__name__} always results "
+                "in a copy).\n"
+                "If using `np.array(obj, copy=False)` replace it with "
+                "`np.asarray(obj)` to allow a copy when needed"
+            )
+        # 'copy' can further be ignored because stacking will result in a copy
         column_arrays = [
             np.asarray(self.column(i), dtype=dtype) for i in range(self.num_columns)
         ]
@@ -2086,6 +2132,78 @@ cdef class _Tabular(_PandasConvertible):
         """
         return _pc().take(self, indices)
 
+    def filter(self, mask, object null_selection_behavior="drop"):
+        """
+        Select rows from the table or record batch based on a boolean mask.
+
+        The Table can be filtered based on a mask, which will be passed to
+        :func:`pyarrow.compute.filter` to perform the filtering, or it can
+        be filtered through a boolean :class:`.Expression`
+
+        Parameters
+        ----------
+        mask : Array or array-like or .Expression
+            The boolean mask or the :class:`.Expression` to filter the table with.
+        null_selection_behavior : str, default "drop"
+            How nulls in the mask should be handled, does nothing if
+            an :class:`.Expression` is used.
+
+        Returns
+        -------
+        filtered : Table or RecordBatch
+            A tabular object of the same schema, with only the rows selected
+            by applied filtering
+
+        Examples
+        --------
+        Using a Table (works similarly for RecordBatch):
+
+        >>> import pyarrow as pa
+        >>> table = pa.table({'year': [2020, 2022, 2019, 2021],
+        ...                   'n_legs': [2, 4, 5, 100],
+        ...                   'animals': ["Flamingo", "Horse", "Brittle stars", "Centipede"]})
+
+        Define an expression and select rows:
+
+        >>> import pyarrow.compute as pc
+        >>> expr = pc.field("year") <= 2020
+        >>> table.filter(expr)
+        pyarrow.Table
+        year: int64
+        n_legs: int64
+        animals: string
+        ----
+        year: [[2020,2019]]
+        n_legs: [[2,5]]
+        animals: [["Flamingo","Brittle stars"]]
+
+        Define a mask and select rows:
+
+        >>> mask=[True, True, False, None]
+        >>> table.filter(mask)
+        pyarrow.Table
+        year: int64
+        n_legs: int64
+        animals: string
+        ----
+        year: [[2020,2022]]
+        n_legs: [[2,4]]
+        animals: [["Flamingo","Horse"]]
+        >>> table.filter(mask, null_selection_behavior='emit_null')
+        pyarrow.Table
+        year: int64
+        n_legs: int64
+        animals: string
+        ----
+        year: [[2020,2022,null]]
+        n_legs: [[2,4,null]]
+        animals: [["Flamingo","Horse",null]]
+        """
+        if isinstance(mask, _pc().Expression):
+            return _pac()._filter_table(self, mask)
+        else:
+            return _pc().filter(self, mask, null_selection_behavior)
+
     def to_pydict(self):
         """
         Convert the Table or RecordBatch to a dict or OrderedDict.
@@ -2787,8 +2905,17 @@ cdef class RecordBatch(_Tabular):
 
         Parameters
         ----------
-        names : list of str
-            List of new column names.
+        names : list[str] or dict[str, str]
+            List of new column names or mapping of old column names to new column names.
+
+            If a mapping of old to new column names is passed, then all columns which are
+            found to match a provided old column name will be renamed to the new column name.
+            If any column names are not found in the mapping, a KeyError will be raised.
+
+        Raises
+        ------
+        KeyError
+            If any of the column names passed in the names mapping do not exist.
 
         Returns
         -------
@@ -2809,13 +2936,38 @@ cdef class RecordBatch(_Tabular):
         ----
         n: [2,4,5,100]
         name: ["Flamingo","Horse","Brittle stars","Centipede"]
+        >>> new_names = {"n_legs": "n", "animals": "name"}
+        >>> batch.rename_columns(new_names)
+        pyarrow.RecordBatch
+        n: int64
+        name: string
+        ----
+        n: [2,4,5,100]
+        name: ["Flamingo","Horse","Brittle stars","Centipede"]
         """
         cdef:
             shared_ptr[CRecordBatch] c_batch
             vector[c_string] c_names
 
-        for name in names:
-            c_names.push_back(tobytes(name))
+        if isinstance(names, list):
+            for name in names:
+                c_names.push_back(tobytes(name))
+        elif isinstance(names, dict):
+            idx_to_new_name = {}
+            for name, new_name in names.items():
+                indices = self.schema.get_all_field_indices(name)
+
+                if not indices:
+                    raise KeyError("Column {!r} not found".format(name))
+
+                for index in indices:
+                    idx_to_new_name[index] = new_name
+
+            for i in range(self.num_columns):
+                new_name = idx_to_new_name.get(i, self.column_names[i])
+                c_names.push_back(tobytes(new_name))
+        else:
+            raise TypeError(f"names must be a list or dict not {type(names)!r}")
 
         with nogil:
             c_batch = GetResultValue(self.batch.RenameColumns(move(c_names)))
@@ -2927,58 +3079,6 @@ cdef class RecordBatch(_Tabular):
 
         return pyarrow_wrap_batch(result)
 
-    def filter(self, mask, object null_selection_behavior="drop"):
-        """
-        Select rows from the record batch.
-
-        See :func:`pyarrow.compute.filter` for full usage.
-
-        Parameters
-        ----------
-        mask : Array or array-like
-            The boolean mask to filter the record batch with.
-        null_selection_behavior : str, default "drop"
-            How nulls in the mask should be handled.
-
-        Returns
-        -------
-        filtered : RecordBatch
-            A record batch of the same schema, with only the rows selected
-            by the boolean mask.
-
-        Examples
-        --------
-        >>> import pyarrow as pa
-        >>> n_legs = pa.array([2, 2, 4, 4, 5, 100])
-        >>> animals = pa.array(["Flamingo", "Parrot", "Dog", "Horse", "Brittle stars", "Centipede"])
-        >>> batch = pa.RecordBatch.from_arrays([n_legs, animals],
-        ...                                     names=["n_legs", "animals"])
-        >>> batch.to_pandas()
-           n_legs        animals
-        0       2       Flamingo
-        1       2         Parrot
-        2       4            Dog
-        3       4          Horse
-        4       5  Brittle stars
-        5     100      Centipede
-
-        Define a mask and select rows:
-
-        >>> mask=[True, True, False, True, False, None]
-        >>> batch.filter(mask).to_pandas()
-           n_legs   animals
-        0       2  Flamingo
-        1       2    Parrot
-        2       4     Horse
-        >>> batch.filter(mask, null_selection_behavior='emit_null').to_pandas()
-           n_legs   animals
-        0     2.0  Flamingo
-        1     2.0    Parrot
-        2     4.0     Horse
-        3     NaN      None
-        """
-        return _pc().filter(self, mask, null_selection_behavior)
-
     def equals(self, object other, bint check_metadata=False):
         """
         Check if contents of two record batches are equal.
@@ -3389,20 +3489,24 @@ cdef class RecordBatch(_Tabular):
                 <CResult[shared_ptr[CArray]]>deref(c_record_batch).ToStructArray())
         return pyarrow_wrap_array(c_array)
 
-    def to_tensor(self, c_bool null_to_nan=False, MemoryPool memory_pool=None):
+    def to_tensor(self, c_bool null_to_nan=False, c_bool row_major=True, MemoryPool memory_pool=None):
         """
         Convert to a :class:`~pyarrow.Tensor`.
 
         RecordBatches that can be converted have fields of type signed or unsigned
-        integer or float, including all bit-widths. RecordBatches with validity bitmask
-        for any of the arrays can be converted with ``null_to_nan``turned to ``True``.
-        In this case null values are converted to NaN and signed or unsigned integer
-        type arrays are promoted to appropriate float type.
+        integer or float, including all bit-widths.
+
+        ``null_to_nan`` is ``False`` by default and this method will raise an error in case
+        any nulls are present. RecordBatches with nulls can be converted with ``null_to_nan``
+        set to ``True``. In this case null values are converted to ``NaN`` and integer type
+        arrays are promoted to the appropriate float type.
 
         Parameters
         ----------
         null_to_nan : bool, default False
             Whether to write null values in the result as ``NaN``.
+        row_major : bool, default True
+            Whether resulting Tensor is row-major or column-major
         memory_pool : MemoryPool, default None
             For memory allocations, if required, otherwise use default pool
 
@@ -3424,13 +3528,29 @@ cdef class RecordBatch(_Tabular):
         a: [1,2,3,4,null]
         b: [10,20,30,40,null]
 
+        Convert a RecordBatch to row-major Tensor with null values
+        written as ``NaN``s
+
         >>> batch.to_tensor(null_to_nan=True)
         <pyarrow.Tensor>
         type: double
         shape: (5, 2)
-        strides: (8, 40)
-
+        strides: (16, 8)
         >>> batch.to_tensor(null_to_nan=True).to_numpy()
+        array([[ 1., 10.],
+               [ 2., 20.],
+               [ 3., 30.],
+               [ 4., 40.],
+               [nan, nan]])
+
+        Convert a RecordBatch to column-major Tensor
+
+        >>> batch.to_tensor(null_to_nan=True, row_major=False)
+        <pyarrow.Tensor>
+        type: double
+        shape: (5, 2)
+        strides: (8, 40)
+        >>> batch.to_tensor(null_to_nan=True, row_major=False).to_numpy()
         array([[ 1., 10.],
                [ 2., 20.],
                [ 3., 30.],
@@ -3446,7 +3566,7 @@ cdef class RecordBatch(_Tabular):
         with nogil:
             c_tensor = GetResultValue(
                 <CResult[shared_ptr[CTensor]]>deref(c_record_batch).ToTensor(null_to_nan,
-                                                                             pool))
+                                                                             row_major, pool))
         return pyarrow_wrap_tensor(c_tensor)
 
     def _export_to_c(self, out_ptr, out_schema_ptr=0):
@@ -3519,7 +3639,7 @@ cdef class RecordBatch(_Tabular):
         requested_schema : PyCapsule | None
             A PyCapsule containing a C ArrowSchema representation of a requested
             schema. PyArrow will attempt to cast the batch to this schema.
-            If None, the schema will be returned as-is, with a schema matching the
+            If None, the batch will be returned as-is, with a schema matching the
             one returned by :meth:`__arrow_c_schema__()`.
 
         Returns
@@ -3537,9 +3657,7 @@ cdef class RecordBatch(_Tabular):
 
             if target_schema != self.schema:
                 try:
-                    # We don't expose .cast() on RecordBatch, only on Table.
-                    casted_batch = Table.from_batches([self]).cast(
-                        target_schema, safe=True).to_batches()[0]
+                    casted_batch = self.cast(target_schema, safe=True)
                     inner_batch = pyarrow_unwrap_batch(casted_batch)
                 except ArrowInvalid as e:
                     raise ValueError(
@@ -3580,8 +3698,8 @@ cdef class RecordBatch(_Tabular):
     @staticmethod
     def _import_from_c_capsule(schema_capsule, array_capsule):
         """
-        Import RecordBatch from a pair of PyCapsules containing a C ArrowArray
-        and ArrowSchema, respectively.
+        Import RecordBatch from a pair of PyCapsules containing a C ArrowSchema
+        and ArrowArray, respectively.
 
         Parameters
         ----------
@@ -3652,23 +3770,141 @@ cdef class RecordBatch(_Tabular):
         This is a low-level function intended for expert users.
         """
         cdef:
-            void* c_ptr = _as_c_pointer(in_ptr)
+            ArrowDeviceArray* c_device_array = <ArrowDeviceArray*>_as_c_pointer(in_ptr)
             void* c_schema_ptr
             shared_ptr[CRecordBatch] c_batch
 
+        if c_device_array.device_type == ARROW_DEVICE_CUDA:
+            _ensure_cuda_loaded()
+
         c_schema = pyarrow_unwrap_schema(schema)
         if c_schema == nullptr:
             # Not a Schema object, perhaps a raw ArrowSchema pointer
             c_schema_ptr = _as_c_pointer(schema, allow_null=True)
             with nogil:
                 c_batch = GetResultValue(ImportDeviceRecordBatch(
-                    <ArrowDeviceArray*> c_ptr, <ArrowSchema*> c_schema_ptr))
+                    c_device_array, <ArrowSchema*> c_schema_ptr))
         else:
             with nogil:
                 c_batch = GetResultValue(ImportDeviceRecordBatch(
-                    <ArrowDeviceArray*> c_ptr, c_schema))
+                    c_device_array, c_schema))
         return pyarrow_wrap_batch(c_batch)
 
+    def __arrow_c_device_array__(self, requested_schema=None, **kwargs):
+        """
+        Get a pair of PyCapsules containing a C ArrowDeviceArray representation
+        of the object.
+
+        Parameters
+        ----------
+        requested_schema : PyCapsule | None
+            A PyCapsule containing a C ArrowSchema representation of a requested
+            schema. PyArrow will attempt to cast the batch to this data type.
+            If None, the batch will be returned as-is, with a type matching the
+            one returned by :meth:`__arrow_c_schema__()`.
+        kwargs
+            Currently no additional keyword arguments are supported, but
+            this method will accept any keyword with a value of ``None``
+            for compatibility with future keywords.
+
+        Returns
+        -------
+        Tuple[PyCapsule, PyCapsule]
+            A pair of PyCapsules containing a C ArrowSchema and ArrowDeviceArray,
+            respectively.
+        """
+        cdef:
+            ArrowDeviceArray* c_array
+            ArrowSchema* c_schema
+            shared_ptr[CRecordBatch] inner_batch
+
+        non_default_kwargs = [
+            name for name, value in kwargs.items() if value is not None
+        ]
+        if non_default_kwargs:
+            raise NotImplementedError(
+                f"Received unsupported keyword argument(s): {non_default_kwargs}"
+            )
+
+        if requested_schema is not None:
+            target_schema = Schema._import_from_c_capsule(requested_schema)
+
+            if target_schema != self.schema:
+                if not self.is_cpu:
+                    raise NotImplementedError(
+                        "Casting to a requested schema is only supported for CPU data"
+                    )
+                try:
+                    casted_batch = self.cast(target_schema, safe=True)
+                    inner_batch = pyarrow_unwrap_batch(casted_batch)
+                except ArrowInvalid as e:
+                    raise ValueError(
+                        f"Could not cast {self.schema} to requested schema {target_schema}: {e}"
+                    )
+            else:
+                inner_batch = self.sp_batch
+        else:
+            inner_batch = self.sp_batch
+
+        schema_capsule = alloc_c_schema(&c_schema)
+        array_capsule = alloc_c_device_array(&c_array)
+
+        with nogil:
+            check_status(ExportDeviceRecordBatch(
+                deref(inner_batch), <shared_ptr[CSyncEvent]>NULL, c_array, c_schema))
+
+        return schema_capsule, array_capsule
+
+    @staticmethod
+    def _import_from_c_device_capsule(schema_capsule, array_capsule):
+        """
+        Import RecordBatch from a pair of PyCapsules containing a
+        C ArrowSchema and ArrowDeviceArray, respectively.
+
+        Parameters
+        ----------
+        schema_capsule : PyCapsule
+            A PyCapsule containing a C ArrowSchema representation of the schema.
+        array_capsule : PyCapsule
+            A PyCapsule containing a C ArrowDeviceArray representation of the array.
+
+        Returns
+        -------
+        pyarrow.RecordBatch
+        """
+        cdef:
+            ArrowSchema* c_schema
+            ArrowDeviceArray* c_array
+            shared_ptr[CRecordBatch] batch
+
+        c_schema = <ArrowSchema*> PyCapsule_GetPointer(schema_capsule, 'arrow_schema')
+        c_array = <ArrowDeviceArray*> PyCapsule_GetPointer(
+            array_capsule, 'arrow_device_array'
+        )
+
+        with nogil:
+            batch = GetResultValue(ImportDeviceRecordBatch(c_array, c_schema))
+
+        return pyarrow_wrap_batch(batch)
+
+    @property
+    def device_type(self):
+        """
+        The device type where the arrays in the RecordBatch reside.
+
+        Returns
+        -------
+        DeviceAllocationType
+        """
+        return _wrap_device_allocation_type(self.sp_batch.get().device_type())
+
+    @property
+    def is_cpu(self):
+        """
+        Whether the RecordBatch's arrays are CPU-accessible.
+        """
+        return self.device_type == DeviceAllocationType.CPU
+
 
 def _reconstruct_record_batch(columns, schema):
     """
@@ -3926,78 +4162,6 @@ cdef class Table(_Tabular):
 
         return pyarrow_wrap_table(result)
 
-    def filter(self, mask, object null_selection_behavior="drop"):
-        """
-        Select rows from the table.
-
-        The Table can be filtered based on a mask, which will be passed to
-        :func:`pyarrow.compute.filter` to perform the filtering, or it can
-        be filtered through a boolean :class:`.Expression`
-
-        Parameters
-        ----------
-        mask : Array or array-like or .Expression
-            The boolean mask or the :class:`.Expression` to filter the table with.
-        null_selection_behavior : str, default "drop"
-            How nulls in the mask should be handled, does nothing if
-            an :class:`.Expression` is used.
-
-        Returns
-        -------
-        filtered : Table
-            A table of the same schema, with only the rows selected
-            by applied filtering
-
-        Examples
-        --------
-        >>> import pyarrow as pa
-        >>> import pandas as pd
-        >>> df = pd.DataFrame({'year': [2020, 2022, 2019, 2021],
-        ...                    'n_legs': [2, 4, 5, 100],
-        ...                    'animals': ["Flamingo", "Horse", "Brittle stars", "Centipede"]})
-        >>> table = pa.Table.from_pandas(df)
-
-        Define an expression and select rows:
-
-        >>> import pyarrow.compute as pc
-        >>> expr = pc.field("year") <= 2020
-        >>> table.filter(expr)
-        pyarrow.Table
-        year: int64
-        n_legs: int64
-        animals: string
-        ----
-        year: [[2020,2019]]
-        n_legs: [[2,5]]
-        animals: [["Flamingo","Brittle stars"]]
-
-        Define a mask and select rows:
-
-        >>> mask=[True, True, False, None]
-        >>> table.filter(mask)
-        pyarrow.Table
-        year: int64
-        n_legs: int64
-        animals: string
-        ----
-        year: [[2020,2022]]
-        n_legs: [[2,4]]
-        animals: [["Flamingo","Horse"]]
-        >>> table.filter(mask, null_selection_behavior='emit_null')
-        pyarrow.Table
-        year: int64
-        n_legs: int64
-        animals: string
-        ----
-        year: [[2020,2022,null]]
-        n_legs: [[2,4,null]]
-        animals: [["Flamingo","Horse",null]]
-        """
-        if isinstance(mask, _pc().Expression):
-            return _pac()._filter_table(self, mask)
-        else:
-            return _pc().filter(self, mask, null_selection_behavior)
-
     def select(self, object columns):
         """
         Select columns of the Table.
@@ -5166,8 +5330,17 @@ cdef class Table(_Tabular):
 
         Parameters
         ----------
-        names : list of str
-            List of new column names.
+        names : list[str] or dict[str, str]
+            List of new column names or mapping of old column names to new column names.
+
+            If a mapping of old to new column names is passed, then all columns which are
+            found to match a provided old column name will be renamed to the new column name.
+            If any column names are not found in the mapping, a KeyError will be raised.
+
+        Raises
+        ------
+        KeyError
+            If any of the column names passed in the names mapping do not exist.
 
         Returns
         -------
@@ -5188,13 +5361,37 @@ cdef class Table(_Tabular):
         ----
         n: [[2,4,5,100]]
         name: [["Flamingo","Horse","Brittle stars","Centipede"]]
+        >>> new_names = {"n_legs": "n", "animals": "name"}
+        >>> table.rename_columns(new_names)
+        pyarrow.Table
+        n: int64
+        name: string
+        ----
+        n: [[2,4,5,100]]
+        name: [["Flamingo","Horse","Brittle stars","Centipede"]]
         """
         cdef:
             shared_ptr[CTable] c_table
             vector[c_string] c_names
 
-        for name in names:
-            c_names.push_back(tobytes(name))
+        if isinstance(names, list):
+            for name in names:
+                c_names.push_back(tobytes(name))
+        elif isinstance(names, dict):
+            idx_to_new_name = {}
+            for name, new_name in names.items():
+                indices = self.schema.get_all_field_indices(name)
+
+                if not indices:
+                    raise KeyError("Column {!r} not found".format(name))
+
+                for index in indices:
+                    idx_to_new_name[index] = new_name
+
+            for i in range(self.num_columns):
+                c_names.push_back(tobytes(idx_to_new_name.get(i, self.schema[i].name)))
+        else:
+            raise TypeError(f"names must be a list or dict not {type(names)!r}")
 
         with nogil:
             c_table = GetResultValue(self.table.RenameColumns(move(c_names)))
@@ -5500,7 +5697,8 @@ def record_batch(data, names=None, schema=None, metadata=None):
     data : dict, list, pandas.DataFrame, Arrow-compatible table
         A mapping of strings to Arrays or Python lists, a list of Arrays,
         a pandas DataFame, or any tabular object implementing the
-        Arrow PyCapsule Protocol (has an ``__arrow_c_array__`` method).
+        Arrow PyCapsule Protocol (has an ``__arrow_c_array__`` or
+        ``__arrow_c_device_array__`` method).
     names : list, default None
         Column names if list of arrays passed as data. Mutually exclusive with
         'schema' argument.
@@ -5634,6 +5832,18 @@ def record_batch(data, names=None, schema=None, metadata=None):
             raise ValueError(
                 "The 'names' argument is not valid when passing a dictionary")
         return RecordBatch.from_pydict(data, schema=schema, metadata=metadata)
+    elif hasattr(data, "__arrow_c_device_array__"):
+        if schema is not None:
+            requested_schema = schema.__arrow_c_schema__()
+        else:
+            requested_schema = None
+        schema_capsule, array_capsule = data.__arrow_c_device_array__(requested_schema)
+        batch = RecordBatch._import_from_c_device_capsule(schema_capsule, array_capsule)
+        if schema is not None and batch.schema != schema:
+            # __arrow_c_device_array__ coerces schema with best effort, so we might
+            # need to cast it if the producer wasn't able to cast to exact schema.
+            batch = batch.cast(schema)
+        return batch
     elif hasattr(data, "__arrow_c_array__"):
         if schema is not None:
             requested_schema = schema.__arrow_c_schema__()
@@ -5663,8 +5873,8 @@ def table(data, names=None, schema=None, metadata=None, nthreads=None):
     data : dict, list, pandas.DataFrame, Arrow-compatible table
         A mapping of strings to Arrays or Python lists, a list of arrays or
         chunked arrays, a pandas DataFame, or any tabular object implementing
-        the Arrow PyCapsule Protocol (has an ``__arrow_c_array__`` or
-        ``__arrow_c_stream__`` method).
+        the Arrow PyCapsule Protocol (has an ``__arrow_c_array__``,
+        ``__arrow_c_device_array__`` or ``__arrow_c_stream__`` method).
     names : list, default None
         Column names if list of arrays passed as data. Mutually exclusive with
         'schema' argument.
@@ -5804,7 +6014,7 @@ def table(data, names=None, schema=None, metadata=None, nthreads=None):
             # need to cast it if the producer wasn't able to cast to exact schema.
             table = table.cast(schema)
         return table
-    elif hasattr(data, "__arrow_c_array__"):
+    elif hasattr(data, "__arrow_c_array__") or hasattr(data, "__arrow_c_device_array__"):
         if names is not None or metadata is not None:
             raise ValueError(
                 "The 'names' and 'metadata' arguments are not valid when "
diff --git a/python/pyarrow/tests/conftest.py b/python/pyarrow/tests/conftest.py
index 57bc3c8fc6616..343b602995db6 100644
--- a/python/pyarrow/tests/conftest.py
+++ b/python/pyarrow/tests/conftest.py
@@ -192,7 +192,7 @@ def wrapper(*args, **kwargs):
 
 @pytest.fixture(scope='session')
 def s3_server(s3_connection, tmpdir_factory):
-    @retry(attempts=5, delay=0.1, backoff=2)
+    @retry(attempts=5, delay=1, backoff=2)
     def minio_server_health_check(address):
         resp = urllib.request.urlopen(f"http://{address}/minio/health/cluster")
         assert resp.getcode() == 200
diff --git a/python/pyarrow/tests/interchange/test_conversion.py b/python/pyarrow/tests/interchange/test_conversion.py
index b1e0fa0d1c651..6d91bad57cef4 100644
--- a/python/pyarrow/tests/interchange/test_conversion.py
+++ b/python/pyarrow/tests/interchange/test_conversion.py
@@ -335,8 +335,10 @@ def test_pandas_to_pyarrow_with_missing(np_float):
     np_array = np.array([0, np.nan, 2], dtype=np_float)
     datetime_array = [None, dt(2007, 7, 14), dt(2007, 7, 15)]
     df = pd.DataFrame({
-        "a": np_array,   # float, ColumnNullType.USE_NAN
-        "dt": datetime_array  # ColumnNullType.USE_SENTINEL
+        # float, ColumnNullType.USE_NAN
+        "a": np_array,
+        # ColumnNullType.USE_SENTINEL
+        "dt": np.array(datetime_array, dtype="datetime64[ns]")
     })
     expected = pa.table({
         "a": pa.array(np_array, from_pandas=True),
diff --git a/python/pyarrow/tests/parquet/common.py b/python/pyarrow/tests/parquet/common.py
index 8365ed5b28543..b4a57ba0b1556 100644
--- a/python/pyarrow/tests/parquet/common.py
+++ b/python/pyarrow/tests/parquet/common.py
@@ -83,7 +83,7 @@ def _random_integers(size, dtype):
     iinfo = np.iinfo(dtype)
     return np.random.randint(max(iinfo.min, platform_int_info.min),
                              min(iinfo.max, platform_int_info.max),
-                             size=size).astype(dtype)
+                             size=size, dtype=dtype)
 
 
 def _range_integers(size, dtype):
@@ -144,6 +144,7 @@ def alltypes_sample(size=10000, seed=0, categorical=False):
         'int16': np.arange(size, dtype=np.int16),
         'int32': np.arange(size, dtype=np.int32),
         'int64': np.arange(size, dtype=np.int64),
+        'float16': np.arange(size, dtype=np.float16),
         'float32': np.arange(size, dtype=np.float32),
         'float64': np.arange(size, dtype=np.float64),
         'bool': np.random.randn(size) > 0,
diff --git a/python/pyarrow/tests/parquet/test_basic.py b/python/pyarrow/tests/parquet/test_basic.py
index 56b967a0595b8..194af7415e863 100644
--- a/python/pyarrow/tests/parquet/test_basic.py
+++ b/python/pyarrow/tests/parquet/test_basic.py
@@ -15,10 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
+import os
 from collections import OrderedDict
 import io
 import warnings
 from shutil import copytree
+from decimal import Decimal
 
 import numpy as np
 import pytest
@@ -357,6 +359,60 @@ def test_byte_stream_split():
                          use_dictionary=False)
 
 
+def test_store_decimal_as_integer(tempdir):
+    arr_decimal_1_9 = pa.array(list(map(Decimal, range(100))),
+                               type=pa.decimal128(5, 2))
+    arr_decimal_10_18 = pa.array(list(map(Decimal, range(100))),
+                                 type=pa.decimal128(16, 9))
+    arr_decimal_gt18 = pa.array(list(map(Decimal, range(100))),
+                                type=pa.decimal128(22, 2))
+    arr_bool = pa.array([True, False] * 50)
+    data_decimal = [arr_decimal_1_9, arr_decimal_10_18, arr_decimal_gt18]
+    table = pa.Table.from_arrays(data_decimal, names=['a', 'b', 'c'])
+
+    # Check with store_decimal_as_integer.
+    _check_roundtrip(table,
+                     expected=table,
+                     compression="gzip",
+                     use_dictionary=False,
+                     store_decimal_as_integer=True)
+
+    # Check physical type in parquet schema
+    pqtestfile_path = os.path.join(tempdir, 'test.parquet')
+    pq.write_table(table, pqtestfile_path,
+                   compression="gzip",
+                   use_dictionary=False,
+                   store_decimal_as_integer=True)
+
+    pqtestfile = pq.ParquetFile(pqtestfile_path)
+    pqcol_decimal_1_9 = pqtestfile.schema.column(0)
+    pqcol_decimal_10_18 = pqtestfile.schema.column(1)
+
+    assert pqcol_decimal_1_9.physical_type == 'INT32'
+    assert pqcol_decimal_10_18.physical_type == 'INT64'
+
+    # Check with store_decimal_as_integer and delta-int encoding.
+    # DELTA_BINARY_PACKED requires parquet physical type to be INT64 or INT32
+    _check_roundtrip(table,
+                     expected=table,
+                     compression="gzip",
+                     use_dictionary=False,
+                     store_decimal_as_integer=True,
+                     column_encoding={
+                         'a': 'DELTA_BINARY_PACKED',
+                         'b': 'DELTA_BINARY_PACKED'
+                     })
+
+    # Check with mixed column types.
+    mixed_table = pa.Table.from_arrays(
+        [arr_decimal_1_9, arr_decimal_10_18, arr_decimal_gt18, arr_bool],
+        names=['a', 'b', 'c', 'd'])
+    _check_roundtrip(mixed_table,
+                     expected=mixed_table,
+                     use_dictionary=False,
+                     store_decimal_as_integer=True)
+
+
 def test_column_encoding():
     arr_float = pa.array(list(map(float, range(100))))
     arr_int = pa.array(list(map(int, range(100))))
diff --git a/python/pyarrow/tests/parquet/test_datetime.py b/python/pyarrow/tests/parquet/test_datetime.py
index 0896eb37e6473..08fb1098322be 100644
--- a/python/pyarrow/tests/parquet/test_datetime.py
+++ b/python/pyarrow/tests/parquet/test_datetime.py
@@ -331,6 +331,7 @@ def get_table(pq_reader_method, filename, **kwargs):
         pq_reader_method, filename, coerce_int96_timestamp_unit="s"
     )
     df_correct = tab_correct.to_pandas(timestamp_as_object=True)
+    df["a"] = df["a"].astype(object)
     tm.assert_frame_equal(df, df_correct)
 
 
diff --git a/python/pyarrow/tests/parquet/test_encryption.py b/python/pyarrow/tests/parquet/test_encryption.py
index edb6410d2fa0d..ff388ef506997 100644
--- a/python/pyarrow/tests/parquet/test_encryption.py
+++ b/python/pyarrow/tests/parquet/test_encryption.py
@@ -65,6 +65,44 @@ def basic_encryption_config():
     return basic_encryption_config
 
 
+def setup_encryption_environment(custom_kms_conf):
+    """
+    Sets up and returns the KMS connection configuration and crypto factory
+    based on provided KMS configuration parameters.
+    """
+    kms_connection_config = pe.KmsConnectionConfig(custom_kms_conf=custom_kms_conf)
+
+    def kms_factory(kms_connection_configuration):
+        return InMemoryKmsClient(kms_connection_configuration)
+
+    # Create our CryptoFactory
+    crypto_factory = pe.CryptoFactory(kms_factory)
+
+    return kms_connection_config, crypto_factory
+
+
+def write_encrypted_file(path, data_table, footer_key_name, col_key_name,
+                         footer_key, col_key, encryption_config):
+    """
+    Writes an encrypted parquet file based on the provided parameters.
+    """
+    # Setup the custom KMS configuration with provided keys
+    custom_kms_conf = {
+        footer_key_name: footer_key.decode("UTF-8"),
+        col_key_name: col_key.decode("UTF-8"),
+    }
+
+    # Setup encryption environment
+    kms_connection_config, crypto_factory = setup_encryption_environment(
+        custom_kms_conf)
+
+    # Write the encrypted parquet file
+    write_encrypted_parquet(path, data_table, encryption_config,
+                            kms_connection_config, crypto_factory)
+
+    return kms_connection_config, crypto_factory
+
+
 def test_encrypted_parquet_write_read(tempdir, data_table):
     """Write an encrypted parquet, verify it's encrypted, and then read it."""
     path = tempdir / PARQUET_NAME
@@ -81,20 +119,10 @@ def test_encrypted_parquet_write_read(tempdir, data_table):
         cache_lifetime=timedelta(minutes=5.0),
         data_key_length_bits=256)
 
-    kms_connection_config = pe.KmsConnectionConfig(
-        custom_kms_conf={
-            FOOTER_KEY_NAME: FOOTER_KEY.decode("UTF-8"),
-            COL_KEY_NAME: COL_KEY.decode("UTF-8"),
-        }
-    )
-
-    def kms_factory(kms_connection_configuration):
-        return InMemoryKmsClient(kms_connection_configuration)
+    kms_connection_config, crypto_factory = write_encrypted_file(
+        path, data_table, FOOTER_KEY_NAME, COL_KEY_NAME, FOOTER_KEY, COL_KEY,
+        encryption_config)
 
-    crypto_factory = pe.CryptoFactory(kms_factory)
-    # Write with encryption properties
-    write_encrypted_parquet(path, data_table, encryption_config,
-                            kms_connection_config, crypto_factory)
     verify_file_encrypted(path)
 
     # Read with decryption properties
@@ -150,36 +178,22 @@ def test_encrypted_parquet_write_read_wrong_key(tempdir, data_table):
         cache_lifetime=timedelta(minutes=5.0),
         data_key_length_bits=256)
 
-    kms_connection_config = pe.KmsConnectionConfig(
-        custom_kms_conf={
-            FOOTER_KEY_NAME: FOOTER_KEY.decode("UTF-8"),
-            COL_KEY_NAME: COL_KEY.decode("UTF-8"),
-        }
-    )
-
-    def kms_factory(kms_connection_configuration):
-        return InMemoryKmsClient(kms_connection_configuration)
+    write_encrypted_file(path, data_table, FOOTER_KEY_NAME, COL_KEY_NAME,
+                         FOOTER_KEY, COL_KEY, encryption_config)
 
-    crypto_factory = pe.CryptoFactory(kms_factory)
-    # Write with encryption properties
-    write_encrypted_parquet(path, data_table, encryption_config,
-                            kms_connection_config, crypto_factory)
     verify_file_encrypted(path)
 
-    # Read with decryption properties
-    wrong_kms_connection_config = pe.KmsConnectionConfig(
-        custom_kms_conf={
-            # Wrong keys - mixup in names
-            FOOTER_KEY_NAME: COL_KEY.decode("UTF-8"),
-            COL_KEY_NAME: FOOTER_KEY.decode("UTF-8"),
-        }
-    )
+    wrong_kms_connection_config, wrong_crypto_factory = setup_encryption_environment({
+        FOOTER_KEY_NAME: COL_KEY.decode("UTF-8"),  # Intentionally wrong
+        COL_KEY_NAME: FOOTER_KEY.decode("UTF-8"),  # Intentionally wrong
+    })
+
     decryption_config = pe.DecryptionConfiguration(
         cache_lifetime=timedelta(minutes=5.0))
     with pytest.raises(ValueError, match=r"Incorrect master key used"):
         read_encrypted_parquet(
             path, decryption_config, wrong_kms_connection_config,
-            crypto_factory)
+            wrong_crypto_factory)
 
 
 def test_encrypted_parquet_read_no_decryption_config(tempdir, data_table):
@@ -219,23 +233,12 @@ def test_encrypted_parquet_write_no_col_key(tempdir, data_table):
     encryption_config = pe.EncryptionConfiguration(
         footer_key=FOOTER_KEY_NAME)
 
-    kms_connection_config = pe.KmsConnectionConfig(
-        custom_kms_conf={
-            FOOTER_KEY_NAME: FOOTER_KEY.decode("UTF-8"),
-            COL_KEY_NAME: COL_KEY.decode("UTF-8"),
-        }
-    )
-
-    def kms_factory(kms_connection_configuration):
-        return InMemoryKmsClient(kms_connection_configuration)
-
-    crypto_factory = pe.CryptoFactory(kms_factory)
     with pytest.raises(OSError,
                        match="Either column_keys or uniform_encryption "
                        "must be set"):
         # Write with encryption properties
-        write_encrypted_parquet(path, data_table, encryption_config,
-                                kms_connection_config, crypto_factory)
+        write_encrypted_file(path, data_table, FOOTER_KEY_NAME, COL_KEY_NAME,
+                             FOOTER_KEY, b"", encryption_config)
 
 
 def test_encrypted_parquet_write_kms_error(tempdir, data_table,
@@ -497,24 +500,11 @@ def test_encrypted_parquet_loop(tempdir, data_table, basic_encryption_config):
 
     # Encrypt the footer with the footer key,
     # encrypt column `a` and column `b` with another key,
-    # keep `c` plaintext
-    encryption_config = basic_encryption_config
+    # keep `c` plaintext, defined in basic_encryption_config
+    kms_connection_config, crypto_factory = write_encrypted_file(
+        path, data_table, FOOTER_KEY_NAME, COL_KEY_NAME, FOOTER_KEY, COL_KEY,
+        basic_encryption_config)
 
-    kms_connection_config = pe.KmsConnectionConfig(
-        custom_kms_conf={
-            FOOTER_KEY_NAME: FOOTER_KEY.decode("UTF-8"),
-            COL_KEY_NAME: COL_KEY.decode("UTF-8"),
-        }
-    )
-
-    def kms_factory(kms_connection_configuration):
-        return InMemoryKmsClient(kms_connection_configuration)
-
-    crypto_factory = pe.CryptoFactory(kms_factory)
-
-    # Write with encryption properties
-    write_encrypted_parquet(path, data_table, encryption_config,
-                            kms_connection_config, crypto_factory)
     verify_file_encrypted(path)
 
     decryption_config = pe.DecryptionConfiguration(
@@ -537,32 +527,46 @@ def test_read_with_deleted_crypto_factory(tempdir, data_table, basic_encryption_
     Test that decryption properties can be used if the crypto factory is no longer alive
     """
     path = tempdir / PARQUET_NAME
-    encryption_config = basic_encryption_config
-    kms_connection_config = pe.KmsConnectionConfig(
-        custom_kms_conf={
-            FOOTER_KEY_NAME: FOOTER_KEY.decode("UTF-8"),
-            COL_KEY_NAME: COL_KEY.decode("UTF-8"),
-        }
-    )
-
-    def kms_factory(kms_connection_configuration):
-        return InMemoryKmsClient(kms_connection_configuration)
-
-    encryption_crypto_factory = pe.CryptoFactory(kms_factory)
-    write_encrypted_parquet(path, data_table, encryption_config,
-                            kms_connection_config, encryption_crypto_factory)
+    kms_connection_config, crypto_factory = write_encrypted_file(
+        path, data_table, FOOTER_KEY_NAME, COL_KEY_NAME, FOOTER_KEY, COL_KEY,
+        basic_encryption_config)
     verify_file_encrypted(path)
 
-    # Use a local function to get decryption properties, so the crypto factory that
-    # creates the properties will be deleted after it returns.
-    def get_decryption_properties():
-        decryption_crypto_factory = pe.CryptoFactory(kms_factory)
-        decryption_config = pe.DecryptionConfiguration(
-            cache_lifetime=timedelta(minutes=5.0))
-        return decryption_crypto_factory.file_decryption_properties(
-            kms_connection_config, decryption_config)
+    # Create decryption properties and delete the crypto factory that created
+    # the properties afterwards.
+    decryption_config = pe.DecryptionConfiguration(
+        cache_lifetime=timedelta(minutes=5.0))
+    file_decryption_properties = crypto_factory.file_decryption_properties(
+        kms_connection_config, decryption_config)
+    del crypto_factory
 
     result = pq.ParquetFile(
-        path, decryption_properties=get_decryption_properties())
+        path, decryption_properties=file_decryption_properties)
     result_table = result.read(use_threads=True)
     assert data_table.equals(result_table)
+
+
+def test_encrypted_parquet_read_table(tempdir, data_table, basic_encryption_config):
+    """Write an encrypted parquet then read it back using read_table."""
+    path = tempdir / PARQUET_NAME
+
+    # Write the encrypted parquet file using the utility function
+    kms_connection_config, crypto_factory = write_encrypted_file(
+        path, data_table, FOOTER_KEY_NAME, COL_KEY_NAME, FOOTER_KEY, COL_KEY,
+        basic_encryption_config)
+
+    decryption_config = pe.DecryptionConfiguration(
+        cache_lifetime=timedelta(minutes=5.0))
+    file_decryption_properties = crypto_factory.file_decryption_properties(
+        kms_connection_config, decryption_config)
+
+    # Read the encrypted parquet file using read_table
+    result_table = pq.read_table(path, decryption_properties=file_decryption_properties)
+
+    # Assert that the read table matches the original data
+    assert data_table.equals(result_table)
+
+    # Read the encrypted parquet folder using read_table
+    result_table = pq.read_table(
+        tempdir, decryption_properties=file_decryption_properties)
+    assert data_table.equals(result_table)
diff --git a/python/pyarrow/tests/parquet/test_metadata.py b/python/pyarrow/tests/parquet/test_metadata.py
index bf186bd923c4f..52ab59a961b3e 100644
--- a/python/pyarrow/tests/parquet/test_metadata.py
+++ b/python/pyarrow/tests/parquet/test_metadata.py
@@ -81,10 +81,12 @@ def test_parquet_metadata_api():
     assert col.max_definition_level == 1
     assert col.max_repetition_level == 0
     assert col.max_repetition_level == 0
-
     assert col.physical_type == 'BOOLEAN'
     assert col.converted_type == 'NONE'
 
+    col_float16 = schema[5]
+    assert col_float16.logical_type.type == 'FLOAT16'
+
     with pytest.raises(IndexError):
         schema[ncols + 1]  # +1 for index
 
@@ -303,14 +305,18 @@ def test_parquet_write_disable_statistics(tempdir):
 
 def test_parquet_sorting_column():
     sorting_col = pq.SortingColumn(10)
-    assert sorting_col.column_index == 10
-    assert sorting_col.descending is False
-    assert sorting_col.nulls_first is False
+    assert sorting_col.to_dict() == {
+        'column_index': 10,
+        'descending': False,
+        'nulls_first': False
+    }
 
     sorting_col = pq.SortingColumn(0, descending=True, nulls_first=True)
-    assert sorting_col.column_index == 0
-    assert sorting_col.descending is True
-    assert sorting_col.nulls_first is True
+    assert sorting_col.to_dict() == {
+        'column_index': 0,
+        'descending': True,
+        'nulls_first': True
+    }
 
     schema = pa.schema([('a', pa.int64()), ('b', pa.int64())])
     sorting_cols = (
@@ -381,9 +387,13 @@ def test_parquet_file_sorting_columns():
 
     # Can retrieve sorting columns from metadata
     metadata = pq.read_metadata(reader)
-    assert metadata.num_row_groups == 1
     assert sorting_columns == metadata.row_group(0).sorting_columns
 
+    metadata_dict = metadata.to_dict()
+    assert metadata_dict.get('num_columns') == 2
+    assert metadata_dict.get('num_rows') == 3
+    assert metadata_dict.get('num_row_groups') == 1
+
 
 def test_field_id_metadata():
     # ARROW-7080
diff --git a/python/pyarrow/tests/parquet/test_parquet_writer.py b/python/pyarrow/tests/parquet/test_parquet_writer.py
index f4ee7529ae87d..bc3714a6232b1 100644
--- a/python/pyarrow/tests/parquet/test_parquet_writer.py
+++ b/python/pyarrow/tests/parquet/test_parquet_writer.py
@@ -346,3 +346,18 @@ def test_parquet_writer_store_schema(tempdir):
 
     meta = pq.read_metadata(path2)
     assert meta.metadata is None
+
+
+def test_parquet_writer_append_key_value_metadata(tempdir):
+    table = pa.Table.from_arrays([pa.array([], type='int32')], ['f0'])
+    path = tempdir / 'metadata.parquet'
+
+    with pq.ParquetWriter(path, table.schema) as writer:
+        writer.write_table(table)
+        writer.add_key_value_metadata({'key1': '1', 'key2': 'x'})
+        writer.add_key_value_metadata({'key2': '2', 'key3': '3'})
+    reader = pq.ParquetFile(path)
+    metadata = reader.metadata.metadata
+    assert metadata[b'key1'] == b'1'
+    assert metadata[b'key2'] == b'2'
+    assert metadata[b'key3'] == b'3'
diff --git a/python/pyarrow/tests/test_array.py b/python/pyarrow/tests/test_array.py
index 60794ebef3281..78d06b26e3622 100644
--- a/python/pyarrow/tests/test_array.py
+++ b/python/pyarrow/tests/test_array.py
@@ -31,6 +31,7 @@
 
 import pyarrow as pa
 import pyarrow.tests.strategies as past
+from pyarrow.vendored.version import Version
 
 
 def test_total_bytes_allocated():
@@ -486,6 +487,7 @@ def test_array_slice_negative_step():
         slice(None, None, 2),
         slice(0, 10, 2),
         slice(15, -25, -1),  # GH-38768
+        slice(-22, -22, -1),  # GH-40642
     ]
 
     for case in cases:
@@ -1011,6 +1013,18 @@ def test_list_array_types_from_arrays_fail(list_array_type, list_type_factory):
             arr_slice.offsets, arr_slice.values, mask=arr_slice.is_null())
 
 
+def test_map_cast():
+    # GH-38553
+    t = pa.map_(pa.int64(), pa.int64())
+    arr = pa.array([{1: 2}], type=t)
+    result = arr.cast(pa.map_(pa.int32(), pa.int64()))
+
+    t_expected = pa.map_(pa.int32(), pa.int64())
+    expected = pa.array([{1: 2}], type=t_expected)
+
+    assert result.equals(expected)
+
+
 def test_map_labelled():
     #  ARROW-13735
     t = pa.map_(pa.field("name", "string", nullable=False), "int64")
@@ -1077,6 +1091,54 @@ def test_map_from_arrays():
             pa.int64()
         ))
 
+    # pass in null bitmap with type
+    result = pa.MapArray.from_arrays([0, 2, 2, 6], keys, items, pa.map_(
+        keys.type,
+        items.type),
+        mask=pa.array([False, True, False], type=pa.bool_())
+    )
+    assert result.null_count == 1
+    assert result.equals(expected)
+
+    # pass in null bitmap without the type
+    result = pa.MapArray.from_arrays([0, 2, 2, 6], keys, items,
+                                     mask=pa.array([False, True, False],
+                                                   type=pa.bool_())
+                                     )
+    assert result.equals(expected)
+
+    # pass in null bitmap with two nulls
+    offsets = [0, None, None, 6]
+    pyentries = [None, None, pypairs[2:]]
+
+    result = pa.MapArray.from_arrays([0, 2, 2, 6], keys, items, pa.map_(
+        keys.type,
+        items.type),
+        mask=pa.array([True, True, False], type=pa.bool_())
+    )
+    expected = pa.array(pyentries, type=pa.map_(pa.binary(), pa.int32()))
+    assert result.null_count == 2
+    assert result.equals(expected)
+
+    # error if null bitmap and offsets with nulls passed
+    msg1 = 'Ambiguous to specify both validity map and offsets with nulls'
+    with pytest.raises(pa.ArrowInvalid, match=msg1):
+        pa.MapArray.from_arrays(offsets, keys, items, pa.map_(
+            keys.type,
+            items.type),
+            mask=pa.array([False, True, False], type=pa.bool_())
+        )
+
+    # error if null bitmap passed to sliced offset
+    msg2 = 'Null bitmap with offsets slice not supported.'
+    offsets = pa.array([0, 2, 2, 6], pa.int32())
+    with pytest.raises(pa.ArrowNotImplementedError, match=msg2):
+        pa.MapArray.from_arrays(offsets.slice(2), keys, items, pa.map_(
+            keys.type,
+            items.type),
+            mask=pa.array([False, True, False], type=pa.bool_())
+        )
+
     # check invalid usage
     offsets = [0, 1, 3, 5]
     keys = np.arange(5)
@@ -1097,6 +1159,30 @@ def test_map_from_arrays():
     with pytest.raises(ValueError):
         pa.MapArray.from_arrays(offsets, keys_with_null, items)
 
+    # Check if offset in offsets > 0
+    offsets = pa.array(offsets, pa.int32())
+    result = pa.MapArray.from_arrays(offsets.slice(1), keys, items)
+    expected = pa.MapArray.from_arrays([1, 3, 5], keys, items)
+
+    assert result.equals(expected)
+    assert result.offset == 1
+    assert expected.offset == 0
+
+    offsets = pa.array([0, 0, 0, 0, 0, 0], pa.int32())
+    result = pa.MapArray.from_arrays(
+        offsets.slice(1),
+        pa.array([], pa.string()),
+        pa.array([], pa.string()),
+    )
+    expected = pa.MapArray.from_arrays(
+        [0, 0, 0, 0, 0],
+        pa.array([], pa.string()),
+        pa.array([], pa.string()),
+    )
+    assert result.equals(expected)
+    assert result.offset == 1
+    assert expected.offset == 0
+
 
 def test_fixed_size_list_from_arrays():
     values = pa.array(range(12), pa.int64())
@@ -2755,6 +2841,7 @@ def test_list_array_flatten(offset_type, list_type_factory):
     assert arr1.values.equals(arr0)
     assert arr2.flatten().flatten().equals(arr0)
     assert arr2.values.values.equals(arr0)
+    assert arr2.flatten(True).equals(arr0)
 
 
 @pytest.mark.parametrize('list_type', [
@@ -2776,7 +2863,9 @@ def test_list_value_parent_indices(list_type):
 @pytest.mark.parametrize(('offset_type', 'list_type'),
                          [(pa.int32(), pa.list_(pa.int32())),
                           (pa.int32(), pa.list_(pa.int32(), list_size=2)),
-                          (pa.int64(), pa.large_list(pa.int32()))])
+                          (pa.int64(), pa.large_list(pa.int32())),
+                          (pa.int32(), pa.list_view(pa.int32())),
+                          (pa.int64(), pa.large_list_view(pa.int32()))])
 def test_list_value_lengths(offset_type, list_type):
 
     # FixedSizeListArray needs fixed list sizes
@@ -2874,6 +2963,8 @@ def test_fixed_size_list_array_flatten():
     assert arr0.type.equals(typ0)
     assert arr1.flatten().equals(arr0)
     assert arr2.flatten().flatten().equals(arr0)
+    assert arr2.flatten().equals(arr1)
+    assert arr2.flatten(True).equals(arr0)
 
 
 def test_fixed_size_list_array_flatten_with_slice():
@@ -3301,6 +3392,52 @@ def test_array_from_large_pyints():
         pa.array([int(2 ** 63)])
 
 
+def test_numpy_array_protocol():
+    # test the __array__ method on pyarrow.Array
+    arr = pa.array([1, 2, 3])
+    result = np.asarray(arr)
+    expected = np.array([1, 2, 3], dtype="int64")
+    np.testing.assert_array_equal(result, expected)
+
+    # this should not raise a deprecation warning with numpy 2.0+
+    result = np.array(arr, copy=False)
+    np.testing.assert_array_equal(result, expected)
+
+    result = np.array(arr, dtype="int64", copy=False)
+    np.testing.assert_array_equal(result, expected)
+
+    # no zero-copy is possible
+    arr = pa.array([1, 2, None])
+    expected = np.array([1, 2, np.nan], dtype="float64")
+    result = np.asarray(arr)
+    np.testing.assert_array_equal(result, expected)
+
+    if Version(np.__version__) < Version("2.0.0.dev0"):
+        # copy keyword is not strict and not passed down to __array__
+        result = np.array(arr, copy=False)
+        np.testing.assert_array_equal(result, expected)
+
+        result = np.array(arr, dtype="float64", copy=False)
+        np.testing.assert_array_equal(result, expected)
+    else:
+        # starting with numpy 2.0, the copy=False keyword is assumed to be strict
+        with pytest.raises(ValueError, match="Unable to avoid a copy"):
+            np.array(arr, copy=False)
+
+        arr = pa.array([1, 2, 3])
+        with pytest.raises(ValueError):
+            np.array(arr, dtype="float64", copy=False)
+
+    # copy=True -> not yet passed by numpy, so we have to call this directly to test
+    arr = pa.array([1, 2, 3])
+    result = arr.__array__(copy=True)
+    assert result.flags.writeable
+
+    arr = pa.array([1, 2, 3])
+    result = arr.__array__(dtype=np.dtype("float64"), copy=True)
+    assert result.dtype == "float64"
+
+
 def test_array_protocol():
 
     class MyArray:
@@ -3368,24 +3505,49 @@ def __arrow_array__(self, type=None):
     assert result.equals(expected)
 
 
-def test_c_array_protocol():
-    class ArrayWrapper:
-        def __init__(self, data):
-            self.data = data
+class ArrayWrapper:
+    def __init__(self, data):
+        self.data = data
+
+    def __arrow_c_array__(self, requested_schema=None):
+        return self.data.__arrow_c_array__(requested_schema)
+
+
+class ArrayDeviceWrapper:
+    def __init__(self, data):
+        self.data = data
 
-        def __arrow_c_array__(self, requested_schema=None):
-            return self.data.__arrow_c_array__(requested_schema)
+    def __arrow_c_device_array__(self, requested_schema=None, **kwargs):
+        return self.data.__arrow_c_device_array__(requested_schema, **kwargs)
+
+
+@pytest.mark.parametrize("wrapper_class", [ArrayWrapper, ArrayDeviceWrapper])
+def test_c_array_protocol(wrapper_class):
 
     # Can roundtrip through the C array protocol
-    arr = ArrayWrapper(pa.array([1, 2, 3], type=pa.int64()))
+    arr = wrapper_class(pa.array([1, 2, 3], type=pa.int64()))
     result = pa.array(arr)
     assert result == arr.data
 
-    # Will case to requested type
+    # Will cast to requested type
     result = pa.array(arr, type=pa.int32())
     assert result == pa.array([1, 2, 3], type=pa.int32())
 
 
+def test_c_array_protocol_device_unsupported_keyword():
+    # For the device-aware version, we raise a specific error for unsupported keywords
+    arr = pa.array([1, 2, 3], type=pa.int64())
+
+    with pytest.raises(
+        NotImplementedError,
+        match=r"Received unsupported keyword argument\(s\): \['other'\]"
+    ):
+        arr.__arrow_c_device_array__(other="not-none")
+
+    # but with None value it is ignored
+    _ = arr.__arrow_c_device_array__(other=None)
+
+
 def test_concat_array():
     concatenated = pa.concat_arrays(
         [pa.array([1, 2]), pa.array([3, 4])])
@@ -3459,6 +3621,14 @@ def test_struct_array_sort():
         {"a": 5, "b": "foo"},
     ]
 
+    sorted_arr = arr.sort()
+    assert sorted_arr.to_pylist() == [
+        {"a": 5, "b": "foo"},
+        {"a": 7, "b": "bar"},
+        {"a": 7, "b": "car"},
+        {"a": 35, "b": "foobar"},
+    ]
+
     arr_with_nulls = pa.StructArray.from_arrays([
         pa.array([5, 7, 7, 35], type=pa.int64()),
         pa.array(["foo", "car", "bar", "foobar"])
@@ -3525,12 +3695,23 @@ def check_run_end_encoded_from_arrays_with_type(ree_type=None):
     check_run_end_encoded(ree_array, run_ends, values, 19, 4, 0)
 
 
+def check_run_end_encoded_from_typed_arrays(ree_type):
+    run_ends = [3, 5, 10, 19]
+    values = [1, 2, 1, 3]
+    typed_run_ends = pa.array(run_ends, ree_type.run_end_type)
+    typed_values = pa.array(values, ree_type.value_type)
+    ree_array = pa.RunEndEncodedArray.from_arrays(typed_run_ends, typed_values)
+    assert ree_array.type == ree_type
+    check_run_end_encoded(ree_array, run_ends, values, 19, 4, 0)
+
+
 def test_run_end_encoded_from_arrays():
     check_run_end_encoded_from_arrays_with_type()
     for run_end_type in [pa.int16(), pa.int32(), pa.int64()]:
         for value_type in [pa.uint32(), pa.int32(), pa.uint64(), pa.int64()]:
             ree_type = pa.run_end_encoded(run_end_type, value_type)
             check_run_end_encoded_from_arrays_with_type(ree_type)
+            check_run_end_encoded_from_typed_arrays(ree_type)
 
 
 def test_run_end_encoded_from_buffers():
@@ -3796,6 +3977,7 @@ def test_list_view_flatten(list_array_type, list_type_factory, offset_type):
     assert arr2.values.equals(arr1)
     assert arr2.flatten().flatten().equals(arr0)
     assert arr2.values.values.equals(arr0)
+    assert arr2.flatten(True).equals(arr0)
 
     # test out of order offsets
     values = [1, 2, 3, 4]
@@ -3831,3 +4013,112 @@ def test_list_view_slice(list_view_type):
     j = sliced_array.offsets[1].as_py()
 
     assert sliced_array[0].as_py() == sliced_array.values[i:j].to_pylist() == [4]
+
+
+@pytest.mark.parametrize('numpy_native_dtype', ['u2', 'i4', 'f8'])
+def test_swapped_byte_order_fails(numpy_native_dtype):
+    # ARROW-39129
+
+    numpy_swapped_dtype = np.dtype(numpy_native_dtype).newbyteorder()
+    np_arr = np.arange(10, dtype=numpy_swapped_dtype)
+
+    # Primitive type array, type is inferred from the numpy array
+    with pytest.raises(pa.ArrowNotImplementedError):
+        pa.array(np_arr)
+
+    # Primitive type array, type is explicitly provided
+    with pytest.raises(pa.ArrowNotImplementedError):
+        pa.array(np_arr, type=pa.float64())
+
+    # List type array
+    with pytest.raises(pa.ArrowNotImplementedError):
+        pa.array([np_arr])
+
+    # Struct type array
+    with pytest.raises(pa.ArrowNotImplementedError):
+        pa.StructArray.from_arrays([np_arr], names=['a'])
+
+
+def test_non_cpu_array():
+    cuda = pytest.importorskip("pyarrow.cuda")
+    ctx = cuda.Context(0)
+
+    data = np.arange(4, dtype=np.int32)
+    validity = np.array([True, False, True, False], dtype=np.bool_)
+    cuda_data_buf = ctx.buffer_from_data(data)
+    cuda_validity_buf = ctx.buffer_from_data(validity)
+    arr = pa.Array.from_buffers(pa.int32(), 4, [None, cuda_data_buf])
+    arr2 = pa.Array.from_buffers(pa.int32(), 4, [None, cuda_data_buf])
+    arr_with_nulls = pa.Array.from_buffers(
+        pa.int32(), 4, [cuda_validity_buf, cuda_data_buf])
+
+    # Supported
+    arr.validate()
+    assert arr.offset == 0
+    assert arr.buffers() == [None, cuda_data_buf]
+    assert arr.device_type == pa.DeviceAllocationType.CUDA
+    assert arr.is_cpu is False
+    assert len(arr) == 4
+    assert arr.slice(2, 2).offset == 2
+    assert repr(arr)
+    assert str(arr)
+
+    # TODO support DLPack for CUDA
+    with pytest.raises(NotImplementedError):
+        arr.__dlpack__()
+    with pytest.raises(NotImplementedError):
+        arr.__dlpack_device__()
+
+    # Not Supported
+    with pytest.raises(NotImplementedError):
+        arr.diff(arr2)
+    with pytest.raises(NotImplementedError):
+        arr.cast(pa.int64())
+    with pytest.raises(NotImplementedError):
+        arr.view(pa.int64())
+    with pytest.raises(NotImplementedError):
+        arr.sum()
+    with pytest.raises(NotImplementedError):
+        arr.unique()
+    with pytest.raises(NotImplementedError):
+        arr.dictionary_encode()
+    with pytest.raises(NotImplementedError):
+        arr.value_counts()
+    with pytest.raises(NotImplementedError):
+        arr_with_nulls.null_count
+    with pytest.raises(NotImplementedError):
+        arr.nbytes
+    with pytest.raises(NotImplementedError):
+        arr.get_total_buffer_size()
+    with pytest.raises(NotImplementedError):
+        [i for i in iter(arr)]
+    with pytest.raises(NotImplementedError):
+        arr == arr2
+    with pytest.raises(NotImplementedError):
+        arr.is_null()
+    with pytest.raises(NotImplementedError):
+        arr.is_nan()
+    with pytest.raises(NotImplementedError):
+        arr.is_valid()
+    with pytest.raises(NotImplementedError):
+        arr.fill_null(0)
+    with pytest.raises(NotImplementedError):
+        arr[0]
+    with pytest.raises(NotImplementedError):
+        arr.take([0])
+    with pytest.raises(NotImplementedError):
+        arr.drop_null()
+    with pytest.raises(NotImplementedError):
+        arr.filter([True, True, False, False])
+    with pytest.raises(NotImplementedError):
+        arr.index(0)
+    with pytest.raises(NotImplementedError):
+        arr.sort()
+    with pytest.raises(NotImplementedError):
+        arr.__array__()
+    with pytest.raises(NotImplementedError):
+        arr.to_numpy()
+    with pytest.raises(NotImplementedError):
+        arr.tolist()
+    with pytest.raises(NotImplementedError):
+        arr.validate(full=True)
diff --git a/python/pyarrow/tests/test_cffi.py b/python/pyarrow/tests/test_cffi.py
index f8b2ea15d31ad..70841eeb0619a 100644
--- a/python/pyarrow/tests/test_cffi.py
+++ b/python/pyarrow/tests/test_cffi.py
@@ -45,7 +45,7 @@
     ValueError, match="Cannot import released ArrowArray")
 
 assert_stream_released = pytest.raises(
-    ValueError, match="Cannot import released ArrowArrayStream")
+    ValueError, match="Cannot import released Arrow Stream")
 
 
 def PyCapsule_IsValid(capsule, name):
@@ -603,6 +603,48 @@ def test_roundtrip_array_capsule(arr, schema_accessor, bad_type, good_type):
     assert schema_accessor(arr_out) == good_type
 
 
+@pytest.mark.parametrize('arr,schema_accessor,bad_type,good_type', [
+    (pa.array(['a', 'b', 'c']), lambda x: x.type, pa.int32(), pa.string()),
+    (
+        pa.record_batch([pa.array(['a', 'b', 'c'])], names=['x']),
+        lambda x: x.schema,
+        pa.schema({'x': pa.int32()}),
+        pa.schema({'x': pa.string()})
+    ),
+], ids=['array', 'record_batch'])
+def test_roundtrip_device_array_capsule(arr, schema_accessor, bad_type, good_type):
+    gc.collect()  # Make sure no Arrow data dangles in a ref cycle
+    old_allocated = pa.total_allocated_bytes()
+
+    import_array = type(arr)._import_from_c_device_capsule
+
+    schema_capsule, capsule = arr.__arrow_c_device_array__()
+    assert PyCapsule_IsValid(schema_capsule, b"arrow_schema") == 1
+    assert PyCapsule_IsValid(capsule, b"arrow_device_array") == 1
+    arr_out = import_array(schema_capsule, capsule)
+    assert arr_out.equals(arr)
+
+    assert pa.total_allocated_bytes() > old_allocated
+    del arr_out
+
+    assert pa.total_allocated_bytes() == old_allocated
+
+    capsule = arr.__arrow_c_array__()
+
+    assert pa.total_allocated_bytes() > old_allocated
+    del capsule
+    assert pa.total_allocated_bytes() == old_allocated
+
+    with pytest.raises(ValueError,
+                       match=r"Could not cast.* string to requested .* int32"):
+        arr.__arrow_c_device_array__(bad_type.__arrow_c_schema__())
+
+    schema_capsule, array_capsule = arr.__arrow_c_device_array__(
+        good_type.__arrow_c_schema__())
+    arr_out = import_array(schema_capsule, array_capsule)
+    assert schema_accessor(arr_out) == good_type
+
+
 # TODO: implement requested_schema for stream
 @pytest.mark.parametrize('constructor', [
     pa.RecordBatchReader.from_batches,
@@ -692,8 +734,37 @@ def test_roundtrip_chunked_array_capsule_requested_schema():
     imported_chunked = pa.ChunkedArray._import_from_c_capsule(capsule)
     assert imported_chunked == chunked
 
-    # Casting to something else should error
+    # Casting to something else should error if not possible
     requested_type = pa.binary()
     requested_capsule = requested_type.__arrow_c_schema__()
-    with pytest.raises(NotImplementedError):
+    capsule = chunked.__arrow_c_stream__(requested_capsule)
+    imported_chunked = pa.ChunkedArray._import_from_c_capsule(capsule)
+    assert imported_chunked == chunked.cast(pa.binary())
+
+    requested_type = pa.int64()
+    requested_capsule = requested_type.__arrow_c_schema__()
+    with pytest.raises(
+        ValueError, match="Could not cast string to requested type int64"
+    ):
         chunked.__arrow_c_stream__(requested_capsule)
+
+
+def test_import_device_no_cuda():
+    try:
+        import pyarrow.cuda  # noqa
+    except ImportError:
+        pass
+    else:
+        pytest.skip("pyarrow.cuda is available")
+
+    c_array = ffi.new("struct ArrowDeviceArray*")
+    ptr_array = int(ffi.cast("uintptr_t", c_array))
+    arr = pa.array([1, 2, 3], type=pa.int64())
+    arr._export_to_c_device(ptr_array)
+
+    # patch the device type of the struct, this results in an invalid ArrowDeviceArray
+    # but this is just to test we raise am error before actually importing buffers
+    c_array.device_type = 2  # ARROW_DEVICE_CUDA
+
+    with pytest.raises(ImportError, match="Trying to import data on a CUDA device"):
+        pa.Array._import_from_c_device(ptr_array, arr.type)
diff --git a/python/pyarrow/tests/test_compute.py b/python/pyarrow/tests/test_compute.py
index 98cbd920b509b..e7d7b9769740f 100644
--- a/python/pyarrow/tests/test_compute.py
+++ b/python/pyarrow/tests/test_compute.py
@@ -152,6 +152,7 @@ def test_option_class_equality():
         pc.IndexOptions(pa.scalar(1)),
         pc.JoinOptions(),
         pc.ListSliceOptions(0, -1, 1, True),
+        pc.ListFlattenOptions(recursive=False),
         pc.MakeStructOptions(["field", "names"],
                              field_nullability=[True, True],
                              field_metadata=[pa.KeyValueMetadata({"a": "1"}),
@@ -1304,6 +1305,12 @@ def test_filter(ty, values):
     result.validate()
     assert result.equals(pa.array([values[0], values[3], None], type=ty))
 
+    # same test with different array type
+    mask = np.array([True, False, False, True, None])
+    result = arr.filter(mask, null_selection_behavior='drop')
+    result.validate()
+    assert result.equals(pa.array([values[0], values[3]], type=ty))
+
     # non-boolean dtype
     mask = pa.array([0, 1, 0, 1, 0])
     with pytest.raises(NotImplementedError):
@@ -1344,6 +1351,11 @@ def test_filter_record_batch():
     expected = pa.record_batch([pa.array(["a", "e"])], names=["a'"])
     assert result.equals(expected)
 
+    # GH-38770: mask is chunked array
+    chunked_mask = pa.chunked_array([[True, False], [None], [False, True]])
+    result = batch.filter(chunked_mask)
+    assert result.equals(expected)
+
     result = batch.filter(mask, null_selection_behavior="emit_null")
     expected = pa.record_batch([pa.array(["a", None, "e"])], names=["a'"])
     assert result.equals(expected)
@@ -3558,7 +3570,7 @@ def test_list_slice_output_fixed(start, stop, step, expected, value_type,
     if stop is None and list_type != "fixed":
         msg = ("Unable to produce FixedSizeListArray from "
                "non-FixedSizeListArray without `stop` being set.")
-        with pytest.raises(pa.ArrowNotImplementedError, match=msg):
+        with pytest.raises(pa.ArrowInvalid, match=msg):
             pc.list_slice(*args)
     else:
         result = pc.list_slice(*args)
diff --git a/python/pyarrow/tests/test_csv.py b/python/pyarrow/tests/test_csv.py
index bc1dd8a09a768..9ddb5197e9120 100644
--- a/python/pyarrow/tests/test_csv.py
+++ b/python/pyarrow/tests/test_csv.py
@@ -1470,7 +1470,7 @@ def signal_from_thread():
             pytest.fail("Failed to get an interruption during CSV reading")
 
         # Interruption should have arrived timely
-        assert last_duration <= 1.0
+        assert last_duration <= 2.0
         e = exc_info.__context__
         assert isinstance(e, pa.ArrowCancelled)
         assert e.signum == signum
diff --git a/python/pyarrow/tests/test_cuda.py b/python/pyarrow/tests/test_cuda.py
index 43cd16a3cf666..5e833d5371de2 100644
--- a/python/pyarrow/tests/test_cuda.py
+++ b/python/pyarrow/tests/test_cuda.py
@@ -792,3 +792,209 @@ def test_IPC(size):
     p.start()
     p.join()
     assert p.exitcode == 0
+
+
+def _arr_copy_to_host(carr):
+    # TODO replace below with copy to device when exposed in python
+    buffers = []
+    for cbuf in carr.buffers():
+        if cbuf is None:
+            buffers.append(None)
+        else:
+            buf = global_context.foreign_buffer(
+                cbuf.address, cbuf.size, cbuf
+            ).copy_to_host()
+            buffers.append(buf)
+
+    child = pa.Array.from_buffers(carr.type.value_type, 3, buffers[2:])
+    new = pa.Array.from_buffers(carr.type, 2, buffers[:2], children=[child])
+    return new
+
+
+def test_device_interface_array():
+    cffi = pytest.importorskip("pyarrow.cffi")
+    ffi = cffi.ffi
+
+    c_schema = ffi.new("struct ArrowSchema*")
+    ptr_schema = int(ffi.cast("uintptr_t", c_schema))
+    c_array = ffi.new("struct ArrowDeviceArray*")
+    ptr_array = int(ffi.cast("uintptr_t", c_array))
+
+    typ = pa.list_(pa.int32())
+    arr = pa.array([[1], [2, 42]], type=typ)
+
+    # TODO replace below with copy to device when exposed in python
+    cbuffers = []
+    for buf in arr.buffers():
+        if buf is None:
+            cbuffers.append(None)
+        else:
+            cbuf = global_context.new_buffer(buf.size)
+            cbuf.copy_from_host(buf, position=0, nbytes=buf.size)
+            cbuffers.append(cbuf)
+
+    carr = pa.Array.from_buffers(typ, 2, cbuffers[:2], children=[
+        pa.Array.from_buffers(typ.value_type, 3, cbuffers[2:])
+    ])
+
+    # Type is known up front
+    carr._export_to_c_device(ptr_array)
+
+    # verify exported struct
+    assert c_array.device_type == 2  # ARROW_DEVICE_CUDA 2
+    assert c_array.device_id == global_context.device_number
+    assert c_array.array.length == 2
+
+    # Delete recreate C++ object from exported pointer
+    del carr
+    carr_new = pa.Array._import_from_c_device(ptr_array, typ)
+    assert carr_new.type == pa.list_(pa.int32())
+    arr_new = _arr_copy_to_host(carr_new)
+    assert arr_new.equals(arr)
+
+    del carr_new
+    # Now released
+    with pytest.raises(ValueError, match="Cannot import released ArrowArray"):
+        pa.Array._import_from_c_device(ptr_array, typ)
+
+    # Schema is exported and imported at the same time
+    carr = pa.Array.from_buffers(typ, 2, cbuffers[:2], children=[
+        pa.Array.from_buffers(typ.value_type, 3, cbuffers[2:])
+    ])
+    carr._export_to_c_device(ptr_array, ptr_schema)
+    # Delete and recreate C++ objects from exported pointers
+    del carr
+    carr_new = pa.Array._import_from_c_device(ptr_array, ptr_schema)
+    assert carr_new.type == pa.list_(pa.int32())
+    arr_new = _arr_copy_to_host(carr_new)
+    assert arr_new.equals(arr)
+
+    del carr_new
+    # Now released
+    with pytest.raises(ValueError, match="Cannot import released ArrowSchema"):
+        pa.Array._import_from_c_device(ptr_array, ptr_schema)
+
+
+def _batch_copy_to_host(cbatch):
+    # TODO replace below with copy to device when exposed in python
+    arrs = []
+    for col in cbatch.columns:
+        buffers = [
+            global_context.foreign_buffer(buf.address, buf.size, buf).copy_to_host()
+            if buf is not None else None
+            for buf in col.buffers()
+        ]
+        new = pa.Array.from_buffers(col.type, len(col), buffers)
+        arrs.append(new)
+
+    return pa.RecordBatch.from_arrays(arrs, schema=cbatch.schema)
+
+
+def test_device_interface_batch_array():
+    cffi = pytest.importorskip("pyarrow.cffi")
+    ffi = cffi.ffi
+
+    c_schema = ffi.new("struct ArrowSchema*")
+    ptr_schema = int(ffi.cast("uintptr_t", c_schema))
+    c_array = ffi.new("struct ArrowDeviceArray*")
+    ptr_array = int(ffi.cast("uintptr_t", c_array))
+
+    batch = make_recordbatch(10)
+    schema = batch.schema
+    cbuf = cuda.serialize_record_batch(batch, global_context)
+    cbatch = cuda.read_record_batch(cbuf, schema)
+
+    # Schema is known up front
+    cbatch._export_to_c_device(ptr_array)
+
+    # verify exported struct
+    assert c_array.device_type == 2  # ARROW_DEVICE_CUDA 2
+    assert c_array.device_id == global_context.device_number
+    assert c_array.array.length == 10
+
+    # Delete recreate C++ object from exported pointer
+    del cbatch
+    cbatch_new = pa.RecordBatch._import_from_c_device(ptr_array, schema)
+    assert cbatch_new.schema == schema
+    batch_new = _batch_copy_to_host(cbatch_new)
+    assert batch_new.equals(batch)
+
+    del cbatch_new
+    # Now released
+    with pytest.raises(ValueError, match="Cannot import released ArrowArray"):
+        pa.RecordBatch._import_from_c_device(ptr_array, schema)
+
+    # Schema is exported and imported at the same time
+    cbatch = cuda.read_record_batch(cbuf, schema)
+    cbatch._export_to_c_device(ptr_array, ptr_schema)
+    # Delete and recreate C++ objects from exported pointers
+    del cbatch
+    cbatch_new = pa.RecordBatch._import_from_c_device(ptr_array, ptr_schema)
+    assert cbatch_new.schema == schema
+    batch_new = _batch_copy_to_host(cbatch_new)
+    assert batch_new.equals(batch)
+
+    del cbatch_new
+    # Now released
+    with pytest.raises(ValueError, match="Cannot import released ArrowSchema"):
+        pa.RecordBatch._import_from_c_device(ptr_array, ptr_schema)
+
+    # Not a struct type
+    pa.int32()._export_to_c(ptr_schema)
+    with pytest.raises(ValueError,
+                       match="ArrowSchema describes non-struct type"):
+        pa.RecordBatch._import_from_c_device(ptr_array, ptr_schema)
+
+
+def test_print_array():
+    batch = make_recordbatch(10)
+    cbuf = cuda.serialize_record_batch(batch, global_context)
+    cbatch = cuda.read_record_batch(cbuf, batch.schema)
+    arr = batch["f0"]
+    carr = cbatch["f0"]
+    assert str(carr) == str(arr)
+
+    batch = make_recordbatch(100)
+    cbuf = cuda.serialize_record_batch(batch, global_context)
+    cbatch = cuda.read_record_batch(cbuf, batch.schema)
+    arr = batch["f0"]
+    carr = cbatch["f0"]
+    assert str(carr) == str(arr)
+
+
+def make_chunked_array(n_elements_per_chunk, n_chunks):
+    arrs = []
+    carrs = []
+    for _ in range(n_chunks):
+        batch = make_recordbatch(n_elements_per_chunk)
+        cbuf = cuda.serialize_record_batch(batch, global_context)
+        cbatch = cuda.read_record_batch(cbuf, batch.schema)
+        arrs.append(batch["f0"])
+        carrs.append(cbatch["f0"])
+
+    return pa.chunked_array(arrs), pa.chunked_array(carrs)
+
+
+def test_print_chunked_array():
+    arr, carr = make_chunked_array(10, 3)
+    assert str(carr) == str(arr)
+
+    arr, carr = make_chunked_array(100, 20)
+    assert str(carr) == str(arr)
+
+
+def test_print_record_batch():
+    batch = make_recordbatch(10)
+    cbuf = cuda.serialize_record_batch(batch, global_context)
+    cbatch = cuda.read_record_batch(cbuf, batch.schema)
+    assert str(cbatch) == str(batch)
+
+    batch = make_recordbatch(100)
+    cbuf = cuda.serialize_record_batch(batch, global_context)
+    cbatch = cuda.read_record_batch(cbuf, batch.schema)
+    assert str(cbatch) == str(batch)
+
+
+def test_print_table():
+    _, table, _, ctable = make_table_cuda()
+    assert str(ctable) == str(table)
diff --git a/python/pyarrow/tests/test_dataset.py b/python/pyarrow/tests/test_dataset.py
index 3d77214c174c5..0b79218fb0018 100644
--- a/python/pyarrow/tests/test_dataset.py
+++ b/python/pyarrow/tests/test_dataset.py
@@ -5630,3 +5630,22 @@ def test_checksum_write_dataset_read_dataset_to_table(tempdir):
             corrupted_dir_path,
             format=pq_read_format_crc
         ).to_table()
+
+
+def test_make_write_options_error():
+    # GH-39440: calling make_write_options as a static class method
+    msg_1 = ("make_write_options() should be called on an "
+             "instance of ParquetFileFormat")
+    # GH-41043: In Cython2 all Cython methods were "regular" C extension methods
+    # see: https://github.com/cython/cython/issues/6127#issuecomment-2038153359
+    msg_2 = ("descriptor 'make_write_options' for "
+             "'pyarrow._dataset_parquet.ParquetFileFormat' objects "
+             "doesn't apply to a 'int'")
+    with pytest.raises(TypeError) as excinfo:
+        pa.dataset.ParquetFileFormat.make_write_options(43)
+    assert msg_1 in str(excinfo.value) or msg_2 in str(excinfo.value)
+
+    pformat = pa.dataset.ParquetFileFormat()
+    msg = "make_write_options\\(\\) takes exactly 0 positional arguments"
+    with pytest.raises(TypeError, match=msg):
+        pformat.make_write_options(43)
diff --git a/python/pyarrow/tests/test_dataset_encryption.py b/python/pyarrow/tests/test_dataset_encryption.py
index 2a631db9fc0fa..0d8b4a152ab9f 100644
--- a/python/pyarrow/tests/test_dataset_encryption.py
+++ b/python/pyarrow/tests/test_dataset_encryption.py
@@ -142,6 +142,18 @@ def test_dataset_encryption_decryption():
 
     assert table.equals(dataset.to_table())
 
+    # set decryption properties for parquet fragment scan options
+    decryption_properties = crypto_factory.file_decryption_properties(
+        kms_connection_config, decryption_config)
+    pq_scan_opts = ds.ParquetFragmentScanOptions(
+        decryption_properties=decryption_properties
+    )
+
+    pformat = pa.dataset.ParquetFileFormat(default_fragment_scan_options=pq_scan_opts)
+    dataset = ds.dataset("sample_dataset", format=pformat, filesystem=mockfs)
+
+    assert table.equals(dataset.to_table())
+
 
 @pytest.mark.skipif(
     not encryption_unavailable, reason="Parquet Encryption is currently enabled"
diff --git a/python/pyarrow/tests/test_device.py b/python/pyarrow/tests/test_device.py
new file mode 100644
index 0000000000000..6bdb015be1a95
--- /dev/null
+++ b/python/pyarrow/tests/test_device.py
@@ -0,0 +1,43 @@
+# 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.
+
+import pyarrow as pa
+
+
+def test_device_memory_manager():
+    mm = pa.default_cpu_memory_manager()
+    assert mm.is_cpu
+    device = mm.device
+    assert device.is_cpu
+    assert device.device_id == -1
+    assert device.device_type == pa.DeviceAllocationType.CPU
+    assert device.type_name == "arrow::CPUDevice"
+    assert device == device
+    assert repr(device) == "<pyarrow.Device: CPUDevice()>"
+    assert repr(mm) == "<pyarrow.MemoryManager device: CPUDevice()>"
+
+
+def test_buffer_device():
+    arr = pa.array([0, 1, 2])
+    buf = arr.buffers()[1]
+    assert buf.device_type == pa.DeviceAllocationType.CPU
+    assert isinstance(buf.device, pa.Device)
+    assert isinstance(buf.memory_manager, pa.MemoryManager)
+    assert buf.is_cpu
+    assert buf.device.is_cpu
+    assert buf.device == pa.default_cpu_memory_manager().device
+    assert buf.memory_manager.is_cpu
diff --git a/python/pyarrow/tests/test_extension_type.py b/python/pyarrow/tests/test_extension_type.py
index fe38bf651baae..1c4d0175a2d97 100644
--- a/python/pyarrow/tests/test_extension_type.py
+++ b/python/pyarrow/tests/test_extension_type.py
@@ -194,6 +194,21 @@ def __arrow_ext_deserialize__(cls, storage_type, serialized):
         return cls(storage_type)
 
 
+class MyFixedListType(pa.ExtensionType):
+
+    def __init__(self, storage_type):
+        assert isinstance(storage_type, pa.FixedSizeListType)
+        super().__init__(storage_type, 'pyarrow.tests.MyFixedListType')
+
+    def __arrow_ext_serialize__(self):
+        return b''
+
+    @classmethod
+    def __arrow_ext_deserialize__(cls, storage_type, serialized):
+        assert serialized == b''
+        return cls(storage_type)
+
+
 class AnnotatedType(pa.ExtensionType):
     """
     Generic extension type that can store any storage type.
@@ -251,14 +266,14 @@ def test_ext_type_repr():
     assert repr(ty) == "IntegerType(DataType(int64))"
 
 
-def test_ext_type__lifetime():
+def test_ext_type_lifetime():
     ty = UuidType()
     wr = weakref.ref(ty)
     del ty
     assert wr() is None
 
 
-def test_ext_type__storage_type():
+def test_ext_type_storage_type():
     ty = UuidType()
     assert ty.storage_type == pa.binary(16)
     assert ty.__class__ is UuidType
@@ -267,6 +282,32 @@ def test_ext_type__storage_type():
     assert ty.__class__ is ParamExtType
 
 
+def test_ext_type_byte_width():
+    # Test for fixed-size binary types
+    ty = UuidType()
+    assert ty.byte_width == 16
+    ty = ParamExtType(5)
+    assert ty.byte_width == 5
+
+    # Test for non fixed-size binary types
+    ty = LabelType()
+    with pytest.raises(ValueError, match="Non-fixed width type"):
+        _ = ty.byte_width
+
+
+def test_ext_type_bit_width():
+    # Test for fixed-size binary types
+    ty = UuidType()
+    assert ty.bit_width == 128
+    ty = ParamExtType(5)
+    assert ty.bit_width == 40
+
+    # Test for non fixed-size binary types
+    ty = LabelType()
+    with pytest.raises(ValueError, match="Non-fixed width type"):
+        _ = ty.bit_width
+
+
 def test_ext_type_as_py():
     ty = UuidType()
     expected = uuid4()
@@ -712,6 +753,36 @@ def test_casting_dict_array_to_extension_type():
                                UUID('30313233-3435-3637-3839-616263646566')]
 
 
+def test_cast_to_extension_with_nested_storage():
+    # https://github.com/apache/arrow/issues/37669
+
+    # With fixed-size list
+    array = pa.array([[1, 2], [3, 4], [5, 6]], pa.list_(pa.float64(), 2))
+    result = array.cast(MyFixedListType(pa.list_(pa.float64(), 2)))
+    expected = pa.ExtensionArray.from_storage(MyFixedListType(array.type), array)
+    assert result.equals(expected)
+
+    ext_type = MyFixedListType(pa.list_(pa.float32(), 2))
+    result = array.cast(ext_type)
+    expected = pa.ExtensionArray.from_storage(
+        ext_type, array.cast(ext_type.storage_type)
+    )
+    assert result.equals(expected)
+
+    # With variable-size list
+    array = pa.array([[1, 2], [3], [4, 5, 6]], pa.list_(pa.float64()))
+    result = array.cast(MyListType(pa.list_(pa.float64())))
+    expected = pa.ExtensionArray.from_storage(MyListType(array.type), array)
+    assert result.equals(expected)
+
+    ext_type = MyListType(pa.list_(pa.float32()))
+    result = array.cast(ext_type)
+    expected = pa.ExtensionArray.from_storage(
+        ext_type, array.cast(ext_type.storage_type)
+    )
+    assert result.equals(expected)
+
+
 def test_concat():
     arr1 = pa.array([1, 2, 3], IntegerType())
     arr2 = pa.array([4, 5, 6], IntegerType())
@@ -1474,6 +1545,21 @@ def test_tensor_type_equality():
     assert not tensor_type == tensor_type3
 
 
+def test_tensor_type_cast():
+    tensor_type = pa.fixed_shape_tensor(pa.int8(), [2, 3])
+    inner = pa.array(range(18), pa.int8())
+    storage = pa.FixedSizeListArray.from_arrays(inner, 6)
+
+    # cast storage -> extension type
+    result = storage.cast(tensor_type)
+    expected = pa.ExtensionArray.from_storage(tensor_type, storage)
+    assert result.equals(expected)
+
+    # cast extension type -> storage type
+    storage_result = result.cast(storage.type)
+    assert storage_result.equals(storage)
+
+
 @pytest.mark.pandas
 def test_extension_to_pandas_storage_type(registered_period_type):
     period_type, _ = registered_period_type
diff --git a/python/pyarrow/tests/test_fs.py b/python/pyarrow/tests/test_fs.py
index 845f1eccecc72..412daa2bd9ea1 100644
--- a/python/pyarrow/tests/test_fs.py
+++ b/python/pyarrow/tests/test_fs.py
@@ -1226,6 +1226,11 @@ def test_s3_options(pickle_module):
     assert isinstance(fs, S3FileSystem)
     assert pickle_module.loads(pickle_module.dumps(fs)) == fs
 
+    fs = S3FileSystem(allow_bucket_creation=True, allow_bucket_deletion=True,
+                      check_directory_existence_before_creation=True)
+    assert isinstance(fs, S3FileSystem)
+    assert pickle_module.loads(pickle_module.dumps(fs)) == fs
+
     fs = S3FileSystem(request_timeout=0.5, connect_timeout=0.25)
     assert isinstance(fs, S3FileSystem)
     assert pickle_module.loads(pickle_module.dumps(fs)) == fs
@@ -1445,8 +1450,8 @@ def test_azurefs_options(pickle_module):
     fs3 = AzureFileSystem(account_name='fake-account', account_key='fakeaccount',
                           blob_storage_authority='fake-blob-authority',
                           dfs_storage_authority='fake-dfs-authority',
-                          blob_storage_scheme='fake-blob-scheme',
-                          dfs_storage_scheme='fake-dfs-scheme')
+                          blob_storage_scheme='https',
+                          dfs_storage_scheme='https')
     assert isinstance(fs3, AzureFileSystem)
     assert pickle_module.loads(pickle_module.dumps(fs3)) == fs3
     assert fs3 != fs2
diff --git a/python/pyarrow/tests/test_io.py b/python/pyarrow/tests/test_io.py
index 17eab871a2575..2306014c4194a 100644
--- a/python/pyarrow/tests/test_io.py
+++ b/python/pyarrow/tests/test_io.py
@@ -669,6 +669,76 @@ def test_allocate_buffer_resizable():
     assert buf.size == 200
 
 
+def test_non_cpu_buffer(pickle_module):
+    cuda = pytest.importorskip("pyarrow.cuda")
+    ctx = cuda.Context(0)
+
+    data = np.array([b'testing'])
+    cuda_buf = ctx.buffer_from_data(data)
+    arr = pa.FixedSizeBinaryArray.from_buffers(pa.binary(7), 1, [None, cuda_buf])
+    buf_on_gpu = arr.buffers()[1]
+
+    assert buf_on_gpu.size == cuda_buf.size
+    assert buf_on_gpu.address == cuda_buf.address
+    assert buf_on_gpu.is_cpu == cuda_buf.is_cpu
+    assert buf_on_gpu.is_mutable
+
+    repr1 = "<pyarrow.Buffer address="
+    repr2 = "size=7 is_cpu=False is_mutable=True>"
+    assert repr1 in repr(buf_on_gpu)
+    assert repr2 in repr(buf_on_gpu)
+
+    buf_on_gpu_sliced = buf_on_gpu.slice(2)
+    cuda_sliced = cuda.CudaBuffer.from_buffer(buf_on_gpu_sliced)
+    assert cuda_sliced.to_pybytes() == b'sting'
+
+    buf_on_gpu_sliced = buf_on_gpu[2:4]
+    cuda_sliced = cuda.CudaBuffer.from_buffer(buf_on_gpu_sliced)
+    assert cuda_sliced.to_pybytes() == b'st'
+
+    # Sliced buffers with same address
+    assert buf_on_gpu_sliced.equals(cuda_buf[2:4])
+
+    # Buffers on different devices
+    msg_device = "Device on which the data resides differs between buffers"
+    with pytest.raises(ValueError, match=msg_device):
+        buf_on_gpu.equals(pa.py_buffer(data))
+
+    msg = "Implemented only for data on CPU device"
+    # Buffers with different addresses
+    arr_short = np.array([b'sting'])
+    cuda_buf_short = ctx.buffer_from_data(arr_short)
+    with pytest.raises(NotImplementedError, match=msg):
+        buf_on_gpu_sliced.equals(cuda_buf_short)
+    arr_short = pa.FixedSizeBinaryArray.from_buffers(
+        pa.binary(5), 1, [None, cuda_buf_short]
+    )
+    buf_on_gpu_short = arr_short.buffers()[1]
+    with pytest.raises(NotImplementedError, match=msg):
+        buf_on_gpu_sliced.equals(buf_on_gpu_short)
+
+    with pytest.raises(NotImplementedError, match=msg):
+        buf_on_gpu.hex()
+
+    with pytest.raises(NotImplementedError, match=msg):
+        cuda_buf.hex()
+
+    with pytest.raises(NotImplementedError, match=msg):
+        buf_on_gpu[1]
+
+    with pytest.raises(NotImplementedError, match=msg):
+        buf_on_gpu.to_pybytes()
+
+    with pytest.raises(NotImplementedError, match=msg):
+        pickle_module.dumps(buf_on_gpu, protocol=4)
+
+    with pytest.raises(NotImplementedError, match=msg):
+        pickle_module.dumps(cuda_buf, protocol=4)
+
+    with pytest.raises(NotImplementedError, match=msg):
+        memoryview(buf_on_gpu)
+
+
 def test_cache_options():
     opts1 = pa.CacheOptions()
     opts2 = pa.CacheOptions(hole_size_limit=1024)
diff --git a/python/pyarrow/tests/test_ipc.py b/python/pyarrow/tests/test_ipc.py
index d38f45b5feff4..d8eb6e926e4c0 100644
--- a/python/pyarrow/tests/test_ipc.py
+++ b/python/pyarrow/tests/test_ipc.py
@@ -16,6 +16,7 @@
 # under the License.
 
 from collections import UserList
+import datetime
 import io
 import pathlib
 import pytest
@@ -1272,6 +1273,15 @@ def test_record_batch_reader_cast():
     with pytest.raises(pa.lib.ArrowTypeError, match='Field 0 cannot be cast'):
         reader.cast(pa.schema([pa.field('a', pa.list_(pa.int32()))]))
 
+    # Cast to same type should always work (also for types without a T->T cast function)
+    # (https://github.com/apache/arrow/issues/41884)
+    schema_src = pa.schema([pa.field('a', pa.date32())])
+    arr = pa.array([datetime.date(2024, 6, 11)], type=pa.date32())
+    data = [pa.record_batch([arr], names=['a']), pa.record_batch([arr], names=['a'])]
+    table_src = pa.Table.from_batches(data)
+    reader = pa.RecordBatchReader.from_batches(schema_src, data)
+    assert reader.cast(schema_src).read_all() == table_src
+
 
 def test_record_batch_reader_cast_nulls():
     schema_src = pa.schema([pa.field('a', pa.int64())])
diff --git a/python/pyarrow/tests/test_misc.py b/python/pyarrow/tests/test_misc.py
index 39dac4eb81dfb..3d8ab2999e603 100644
--- a/python/pyarrow/tests/test_misc.py
+++ b/python/pyarrow/tests/test_misc.py
@@ -237,11 +237,14 @@ def test_set_timezone_db_path_non_windows():
     pa.StructScalar,
     pa.DictionaryScalar,
     pa.RunEndEncodedScalar,
+    pa.RecordBatchReader,
     pa.ipc.Message,
     pa.ipc.MessageReader,
     pa.MemoryPool,
     pa.LoggingMemoryPool,
     pa.ProxyMemoryPool,
+    pa.Device,
+    pa.MemoryManager,
 ])
 def test_extension_type_constructor_errors(klass):
     # ARROW-2638: prevent calling extension class constructors directly
diff --git a/python/pyarrow/tests/test_pandas.py b/python/pyarrow/tests/test_pandas.py
index 90b9bd8b8c453..7d74a60dcb921 100644
--- a/python/pyarrow/tests/test_pandas.py
+++ b/python/pyarrow/tests/test_pandas.py
@@ -221,6 +221,17 @@ def test_column_index_names_with_tz(self):
         )
         _check_pandas_roundtrip(df, preserve_index=True)
 
+    def test_column_index_names_with_decimal(self):
+        # GH-41503: Test valid roundtrip with decimal value in column index
+        df = pd.DataFrame(
+            [[decimal.Decimal(5), decimal.Decimal(6)]],
+            columns=pd.MultiIndex.from_product(
+                [[decimal.Decimal(1)], [decimal.Decimal(2), decimal.Decimal(3)]]
+            ),
+            index=[decimal.Decimal(4)],
+        )
+        _check_pandas_roundtrip(df, preserve_index=True)
+
     def test_range_index_shortcut(self):
         # ARROW-1639
         index_name = 'foo'
@@ -769,7 +780,7 @@ def test_integer_no_nulls(self):
             info = np.iinfo(dtype)
             values = np.random.randint(max(info.min, np.iinfo(np.int_).min),
                                        min(info.max, np.iinfo(np.int_).max),
-                                       size=num_values)
+                                       size=num_values, dtype=dtype)
             data[dtype] = values.astype(dtype)
             fields.append(pa.field(dtype, arrow_dtype))
 
@@ -2571,7 +2582,7 @@ def test_list_view_to_pandas_with_null_values(self, klass):
         )
 
         actual = arr.to_pandas()
-        expected = pd.Series([[1, None], [], None])
+        expected = pd.Series([[1, np.nan], [], None])
 
         tm.assert_series_equal(actual, expected)
 
@@ -2593,7 +2604,7 @@ def test_list_view_to_pandas_multiple_chunks(self, klass):
         arr = pa.chunked_array([arr1, arr2])
 
         actual = arr.to_pandas()
-        expected = pd.Series([[3, 4], [2, 3], [1, 2], [5, 6, 7], [6, 7, None], None])
+        expected = pd.Series([[3, 4], [2, 3], [1, 2], [5, 6, 7], [6, 7, np.nan], None])
 
         tm.assert_series_equal(actual, expected)
 
@@ -4743,6 +4754,7 @@ def make_df_with_timestamps():
             np.datetime64('2050-05-03 15:42', 'ns'),
         ],
     })
+    df['dateTimeMs'] = df['dateTimeMs'].astype('object')
     # Not part of what we're testing, just ensuring that the inputs are what we
     # expect.
     assert (df.dateTimeMs.dtype, df.dateTimeNs.dtype) == (
diff --git a/python/pyarrow/tests/test_substrait.py b/python/pyarrow/tests/test_substrait.py
index d4fbfb7406838..40700e4741321 100644
--- a/python/pyarrow/tests/test_substrait.py
+++ b/python/pyarrow/tests/test_substrait.py
@@ -944,6 +944,54 @@ def test_serializing_expressions(expr):
     assert "test_expr" in returned.expressions
 
 
+def test_arrow_specific_types():
+    fields = {
+        "time_seconds": (pa.time32("s"), 0),
+        "time_millis": (pa.time32("ms"), 0),
+        "time_nanos": (pa.time64("ns"), 0),
+        "date_millis": (pa.date64(), 0),
+        "large_string": (pa.large_string(), "test_string"),
+        "large_binary": (pa.large_binary(), b"test_string"),
+    }
+    schema = pa.schema([pa.field(name, typ) for name, (typ, _) in fields.items()])
+
+    def check_round_trip(expr):
+        buf = pa.substrait.serialize_expressions([expr], ["test_expr"], schema)
+        returned = pa.substrait.deserialize_expressions(buf)
+        assert schema == returned.schema
+
+    for name, (typ, val) in fields.items():
+        check_round_trip(pc.field(name) == pa.scalar(val, type=typ))
+
+
+def test_arrow_one_way_types():
+    schema = pa.schema(
+        [
+            pa.field("binary_view", pa.binary_view()),
+            pa.field("string_view", pa.string_view()),
+            pa.field("dictionary", pa.dictionary(pa.int32(), pa.string())),
+            pa.field("ree", pa.run_end_encoded(pa.int32(), pa.string())),
+        ]
+    )
+    alt_schema = pa.schema(
+        [
+            pa.field("binary_view", pa.binary()),
+            pa.field("string_view", pa.string()),
+            pa.field("dictionary", pa.string()),
+            pa.field("ree", pa.string())
+        ]
+    )
+
+    def check_one_way(field):
+        expr = pc.is_null(pc.field(field.name))
+        buf = pa.substrait.serialize_expressions([expr], ["test_expr"], schema)
+        returned = pa.substrait.deserialize_expressions(buf)
+        assert alt_schema == returned.schema
+
+    for field in schema:
+        check_one_way(field)
+
+
 def test_invalid_expression_ser_des():
     schema = pa.schema([
         pa.field("x", pa.int32()),
diff --git a/python/pyarrow/tests/test_table.py b/python/pyarrow/tests/test_table.py
index 8e30574188763..30c687b0d94df 100644
--- a/python/pyarrow/tests/test_table.py
+++ b/python/pyarrow/tests/test_table.py
@@ -24,6 +24,7 @@
 import pytest
 import pyarrow as pa
 import pyarrow.compute as pc
+from pyarrow.vendored.version import Version
 
 
 def test_chunked_array_basics():
@@ -493,18 +494,69 @@ def test_recordbatch_dunder_init():
         pa.RecordBatch()
 
 
-def test_recordbatch_c_array_interface():
-    class BatchWrapper:
-        def __init__(self, batch):
-            self.batch = batch
+def test_chunked_array_c_array_interface():
+    class ArrayWrapper:
+        def __init__(self, array):
+            self.array = array
 
         def __arrow_c_array__(self, requested_schema=None):
-            return self.batch.__arrow_c_array__(requested_schema)
+            return self.array.__arrow_c_array__(requested_schema)
 
+    data = pa.array([1, 2, 3], pa.int64())
+    chunked = pa.chunked_array([data])
+    wrapper = ArrayWrapper(data)
+
+    # Can roundtrip through the wrapper.
+    result = pa.chunked_array(wrapper)
+    assert result == chunked
+
+    # Can also import with a type that implementer can cast to.
+    result = pa.chunked_array(wrapper, type=pa.int16())
+    assert result == chunked.cast(pa.int16())
+
+
+def test_chunked_array_c_stream_interface():
+    class ChunkedArrayWrapper:
+        def __init__(self, chunked):
+            self.chunked = chunked
+
+        def __arrow_c_stream__(self, requested_schema=None):
+            return self.chunked.__arrow_c_stream__(requested_schema)
+
+    data = pa.chunked_array([[1, 2, 3], [4, None, 6]])
+    wrapper = ChunkedArrayWrapper(data)
+
+    # Can roundtrip through the wrapper.
+    result = pa.chunked_array(wrapper)
+    assert result == data
+
+    # Can also import with a type that implementer can cast to.
+    result = pa.chunked_array(wrapper, type=pa.int16())
+    assert result == data.cast(pa.int16())
+
+
+class BatchWrapper:
+    def __init__(self, batch):
+        self.batch = batch
+
+    def __arrow_c_array__(self, requested_schema=None):
+        return self.batch.__arrow_c_array__(requested_schema)
+
+
+class BatchDeviceWrapper:
+    def __init__(self, batch):
+        self.batch = batch
+
+    def __arrow_c_device_array__(self, requested_schema=None, **kwargs):
+        return self.batch.__arrow_c_device_array__(requested_schema, **kwargs)
+
+
+@pytest.mark.parametrize("wrapper_class", [BatchWrapper, BatchDeviceWrapper])
+def test_recordbatch_c_array_interface(wrapper_class):
     data = pa.record_batch([
         pa.array([1, 2, 3], type=pa.int64())
     ], names=['a'])
-    wrapper = BatchWrapper(data)
+    wrapper = wrapper_class(data)
 
     # Can roundtrip through the wrapper.
     result = pa.record_batch(wrapper)
@@ -521,18 +573,28 @@ def __arrow_c_array__(self, requested_schema=None):
     assert result == expected
 
 
-def test_table_c_array_interface():
-    class BatchWrapper:
-        def __init__(self, batch):
-            self.batch = batch
+def test_recordbatch_c_array_interface_device_unsupported_keyword():
+    # For the device-aware version, we raise a specific error for unsupported keywords
+    data = pa.record_batch(
+        [pa.array([1, 2, 3], type=pa.int64())], names=['a']
+    )
 
-        def __arrow_c_array__(self, requested_schema=None):
-            return self.batch.__arrow_c_array__(requested_schema)
+    with pytest.raises(
+        NotImplementedError,
+        match=r"Received unsupported keyword argument\(s\): \['other'\]"
+    ):
+        data.__arrow_c_device_array__(other="not-none")
 
+    # but with None value it is ignored
+    _ = data.__arrow_c_device_array__(other=None)
+
+
+@pytest.mark.parametrize("wrapper_class", [BatchWrapper, BatchDeviceWrapper])
+def test_table_c_array_interface(wrapper_class):
     data = pa.record_batch([
         pa.array([1, 2, 3], type=pa.int64())
     ], names=['a'])
-    wrapper = BatchWrapper(data)
+    wrapper = wrapper_class(data)
 
     # Can roundtrip through the wrapper.
     result = pa.table(wrapper)
@@ -926,36 +988,46 @@ def test_recordbatch_to_tensor_uniform_type(typ):
             pa.array(arr3, type=pa.from_numpy_dtype(typ)),
         ], ["a", "b", "c"]
     )
-    result = batch.to_tensor()
 
-    x = np.array([arr1, arr2, arr3], typ).transpose()
+    result = batch.to_tensor(row_major=False)
+    x = np.column_stack([arr1, arr2, arr3]).astype(typ, order="F")
     expected = pa.Tensor.from_numpy(x)
+    check_tensors(result, expected, pa.from_numpy_dtype(typ), 27)
 
+    result = batch.to_tensor()
+    x = np.column_stack([arr1, arr2, arr3]).astype(typ, order="C")
+    expected = pa.Tensor.from_numpy(x)
     check_tensors(result, expected, pa.from_numpy_dtype(typ), 27)
 
     # Test offset
     batch1 = batch.slice(1)
-    result = batch1.to_tensor()
-
     arr1 = [2, 3, 4, 5, 6, 7, 8, 9]
     arr2 = [20, 30, 40, 50, 60, 70, 80, 90]
     arr3 = [100, 100, 100, 100, 100, 100, 100, 100]
 
-    x = np.array([arr1, arr2, arr3], typ).transpose()
+    result = batch1.to_tensor(row_major=False)
+    x = np.column_stack([arr1, arr2, arr3]).astype(typ, order="F")
     expected = pa.Tensor.from_numpy(x)
+    check_tensors(result, expected, pa.from_numpy_dtype(typ), 24)
 
+    result = batch1.to_tensor()
+    x = np.column_stack([arr1, arr2, arr3]).astype(typ, order="C")
+    expected = pa.Tensor.from_numpy(x)
     check_tensors(result, expected, pa.from_numpy_dtype(typ), 24)
 
     batch2 = batch.slice(1, 5)
-    result = batch2.to_tensor()
-
     arr1 = [2, 3, 4, 5, 6]
     arr2 = [20, 30, 40, 50, 60]
     arr3 = [100, 100, 100, 100, 100]
 
-    x = np.array([arr1, arr2, arr3], typ).transpose()
+    result = batch2.to_tensor(row_major=False)
+    x = np.column_stack([arr1, arr2, arr3]).astype(typ, order="F")
     expected = pa.Tensor.from_numpy(x)
+    check_tensors(result, expected, pa.from_numpy_dtype(typ), 15)
 
+    result = batch2.to_tensor()
+    x = np.column_stack([arr1, arr2, arr3]).astype(typ, order="C")
+    expected = pa.Tensor.from_numpy(x)
     check_tensors(result, expected, pa.from_numpy_dtype(typ), 15)
 
 
@@ -970,11 +1042,15 @@ def test_recordbatch_to_tensor_uniform_float_16():
             pa.array(np.array(arr3, dtype=np.float16), type=pa.float16()),
         ], ["a", "b", "c"]
     )
-    result = batch.to_tensor()
 
-    x = np.array([arr1, arr2, arr3], np.float16).transpose()
+    result = batch.to_tensor(row_major=False)
+    x = np.column_stack([arr1, arr2, arr3]).astype(np.float16, order="F")
     expected = pa.Tensor.from_numpy(x)
+    check_tensors(result, expected, pa.float16(), 27)
 
+    result = batch.to_tensor()
+    x = np.column_stack([arr1, arr2, arr3]).astype(np.float16, order="C")
+    expected = pa.Tensor.from_numpy(x)
     check_tensors(result, expected, pa.float16(), 27)
 
 
@@ -989,11 +1065,15 @@ def test_recordbatch_to_tensor_mixed_type():
             pa.array(arr2, type=pa.int16()),
         ], ["a", "b"]
     )
-    result = batch.to_tensor()
 
-    x = np.array([arr1, arr2], np.int32).transpose()
+    result = batch.to_tensor(row_major=False)
+    x = np.column_stack([arr1, arr2]).astype(np.int32, order="F")
     expected = pa.Tensor.from_numpy(x)
+    check_tensors(result, expected, pa.int32(), 18)
 
+    result = batch.to_tensor()
+    x = np.column_stack([arr1, arr2]).astype(np.int32, order="C")
+    expected = pa.Tensor.from_numpy(x)
     check_tensors(result, expected, pa.int32(), 18)
 
     # uint16 + int16 + float32 = float64
@@ -1004,9 +1084,18 @@ def test_recordbatch_to_tensor_mixed_type():
             pa.array(arr3, type=pa.float32()),
         ], ["a", "b", "c"]
     )
-    result = batch.to_tensor()
+    result = batch.to_tensor(row_major=False)
+    x = np.column_stack([arr1, arr2, arr3]).astype(np.float64, order="F")
+    expected = pa.Tensor.from_numpy(x)
+
+    np.testing.assert_equal(result.to_numpy(), x)
+    assert result.size == 27
+    assert result.type == pa.float64()
+    assert result.shape == expected.shape
+    assert result.strides == expected.strides
 
-    x = np.array([arr1, arr2, arr3], np.float64).transpose()
+    result = batch.to_tensor()
+    x = np.column_stack([arr1, arr2, arr3]).astype(np.float64, order="C")
     expected = pa.Tensor.from_numpy(x)
 
     np.testing.assert_equal(result.to_numpy(), x)
@@ -1044,9 +1133,8 @@ def test_recordbatch_to_tensor_nan():
             pa.array(arr2, type=pa.float32()),
         ], ["a", "b"]
     )
-    result = batch.to_tensor()
-
-    x = np.array([arr1, arr2], np.float32).transpose()
+    result = batch.to_tensor(row_major=False)
+    x = np.column_stack([arr1, arr2]).astype(np.float32, order="F")
     expected = pa.Tensor.from_numpy(x)
 
     np.testing.assert_equal(result.to_numpy(), x)
@@ -1071,9 +1159,8 @@ def test_recordbatch_to_tensor_null():
     ):
         batch.to_tensor()
 
-    result = batch.to_tensor(null_to_nan=True)
-
-    x = np.array([arr1, arr2], np.float64).transpose()
+    result = batch.to_tensor(null_to_nan=True, row_major=False)
+    x = np.column_stack([arr1, arr2]).astype(np.float64, order="F")
     expected = pa.Tensor.from_numpy(x)
 
     np.testing.assert_equal(result.to_numpy(), x)
@@ -1090,7 +1177,7 @@ def test_recordbatch_to_tensor_null():
         ], ["a", "b"]
     )
 
-    result = batch.to_tensor(null_to_nan=True)
+    result = batch.to_tensor(null_to_nan=True, row_major=False)
 
     np.testing.assert_equal(result.to_numpy(), x)
     assert result.size == 18
@@ -1106,9 +1193,8 @@ def test_recordbatch_to_tensor_null():
         ], ["a", "b"]
     )
 
-    result = batch.to_tensor(null_to_nan=True)
-
-    x = np.array([arr1, arr2], np.float32).transpose()
+    result = batch.to_tensor(null_to_nan=True, row_major=False)
+    x = np.column_stack([arr1, arr2]).astype(np.float32, order="F")
     expected = pa.Tensor.from_numpy(x)
 
     np.testing.assert_equal(result.to_numpy(), x)
@@ -1127,7 +1213,7 @@ def test_recordbatch_to_tensor_empty():
     )
     result = batch.to_tensor()
 
-    x = np.array([[], []], np.float32).transpose()
+    x = np.column_stack([[], []]).astype(np.float32, order="F")
     expected = pa.Tensor.from_numpy(x)
 
     assert result.size == expected.size
@@ -1672,6 +1758,43 @@ def test_table_rename_columns(cls):
     expected = cls.from_arrays(data, names=['eh', 'bee', 'sea'])
     assert t2.equals(expected)
 
+    message = "names must be a list or dict not <class 'str'>"
+    with pytest.raises(TypeError, match=message):
+        table.rename_columns('not a list')
+
+
+@pytest.mark.parametrize(
+    ('cls'),
+    [
+        (pa.Table),
+        (pa.RecordBatch)
+    ]
+)
+def test_table_rename_columns_mapping(cls):
+    data = [
+        pa.array(range(5)),
+        pa.array([-10, -5, 0, 5, 10]),
+        pa.array(range(5, 10))
+    ]
+    table = cls.from_arrays(data, names=['a', 'b', 'c'])
+    assert table.column_names == ['a', 'b', 'c']
+
+    expected = cls.from_arrays(data, names=['eh', 'b', 'sea'])
+    t1 = table.rename_columns({'a': 'eh', 'c': 'sea'})
+    t1.validate()
+    assert t1 == expected
+
+    # Test renaming duplicate column names
+    table = cls.from_arrays(data, names=['a', 'a', 'c'])
+    expected = cls.from_arrays(data, names=['eh', 'eh', 'sea'])
+    t2 = table.rename_columns({'a': 'eh', 'c': 'sea'})
+    t2.validate()
+    assert t2 == expected
+
+    # Test column not found
+    with pytest.raises(KeyError, match=r"Column 'd' not found"):
+        table.rename_columns({'a': 'eh', 'd': 'sea'})
+
 
 def test_table_flatten():
     ty1 = pa.struct([pa.field('x', pa.int16()),
@@ -2856,13 +2979,29 @@ def test_table_join_collisions():
 
 
 @pytest.mark.acero
-def test_table_filter_expression():
+@pytest.mark.parametrize('cls', [(pa.Table), (pa.RecordBatch)])
+def test_table_filter_expression(cls):
+    t1 = cls.from_pydict({
+        "colA": [1, 2, 3, 6],
+        "colB": [10, 20, None, 60],
+        "colVals": ["a", "b", "c", "f"]
+    })
+
+    result = t1.filter(pc.field("colB") < 50)
+    assert result == cls.from_pydict({
+        "colA": [1, 2],
+        "colB": [10, 20],
+        "colVals": ["a", "b"]
+    })
+
+
+@pytest.mark.acero
+def test_table_filter_expression_chunks():
     t1 = pa.table({
         "colA": [1, 2, 6],
         "colB": [10, 20, 60],
         "colVals": ["a", "b", "f"]
     })
-
     t2 = pa.table({
         "colA": [99, 2, 1],
         "colB": [99, 20, 10],
@@ -3173,6 +3312,21 @@ def test_numpy_asarray(constructor):
     assert result.dtype == "int32"
 
 
+@pytest.mark.parametrize("constructor", [pa.table, pa.record_batch])
+def test_numpy_array_protocol(constructor):
+    table = constructor([[1, 2, 3], [4.0, 5.0, 6.0]], names=["a", "b"])
+    expected = np.array([[1, 4], [2, 5], [3, 6]], dtype="float64")
+
+    if Version(np.__version__) < Version("2.0.0.dev0"):
+        # copy keyword is not strict and not passed down to __array__
+        result = np.array(table, copy=False)
+        np.testing.assert_array_equal(result, expected)
+    else:
+        # starting with numpy 2.0, the copy=False keyword is assumed to be strict
+        with pytest.raises(ValueError, match="Unable to avoid a copy"):
+            np.array(table, copy=False)
+
+
 @pytest.mark.acero
 def test_invalid_non_join_column():
     NUM_ITEMS = 30
diff --git a/python/pyarrow/tests/test_types.py b/python/pyarrow/tests/test_types.py
index 21b3829803487..f7b6040f510af 100644
--- a/python/pyarrow/tests/test_types.py
+++ b/python/pyarrow/tests/test_types.py
@@ -1331,7 +1331,32 @@ def __init__(self, schema):
         def __arrow_c_schema__(self):
             return self.schema.__arrow_c_schema__()
 
-    schema = pa.schema([pa.field("field_name", pa.int32())])
+    schema = pa.schema([pa.field("field_name", pa.int32())], metadata={"a": "b"})
+    assert schema.metadata == {b"a": b"b"}
     wrapped_schema = Wrapper(schema)
 
     assert pa.schema(wrapped_schema) == schema
+    assert pa.schema(wrapped_schema).metadata == {b"a": b"b"}
+    assert pa.schema(wrapped_schema, metadata={"a": "c"}).metadata == {b"a": b"c"}
+
+
+def test_field_import_c_schema_interface():
+    class Wrapper:
+        def __init__(self, field):
+            self.field = field
+
+        def __arrow_c_schema__(self):
+            return self.field.__arrow_c_schema__()
+
+    field = pa.field("field_name", pa.int32(), metadata={"key": "value"})
+    wrapped_field = Wrapper(field)
+
+    assert pa.field(wrapped_field) == field
+
+    with pytest.raises(ValueError, match="cannot specify 'type'"):
+        pa.field(wrapped_field, type=pa.int64())
+
+    # override nullable or metadata
+    assert pa.field(wrapped_field, nullable=False).nullable is False
+    result = pa.field(wrapped_field, metadata={"other": "meta"})
+    assert result.metadata == {b"other": b"meta"}
diff --git a/python/pyarrow/types.pxi b/python/pyarrow/types.pxi
index 6cbad8eeb653c..4343d7ea300b0 100644
--- a/python/pyarrow/types.pxi
+++ b/python/pyarrow/types.pxi
@@ -1519,6 +1519,24 @@ cdef class BaseExtensionType(DataType):
         """
         return pyarrow_wrap_data_type(self.ext_type.storage_type())
 
+    @property
+    def byte_width(self):
+        """
+        The byte width of the extension type.
+        """
+        if self.ext_type.byte_width() == -1:
+            raise ValueError("Non-fixed width type")
+        return self.ext_type.byte_width()
+
+    @property
+    def bit_width(self):
+        """
+        The bit width of the extension type.
+        """
+        if self.ext_type.bit_width() == -1:
+            raise ValueError("Non-fixed width type")
+        return self.ext_type.bit_width()
+
     def wrap_array(self, storage):
         """
         Wrap the given storage array as an extension array.
@@ -3462,7 +3480,7 @@ cdef DataType primitive_type(Type type):
 # Type factory functions
 
 
-def field(name, type, bint nullable=True, metadata=None):
+def field(name, type=None, nullable=None, metadata=None):
     """
     Create a pyarrow.Field instance.
 
@@ -3470,6 +3488,8 @@ def field(name, type, bint nullable=True, metadata=None):
     ----------
     name : str or bytes
         Name of the field.
+        Alternatively, you can also pass an object that implements the Arrow
+        PyCapsule Protocol for schemas (has an ``__arrow_c_schema__`` method).
     type : pyarrow.DataType
         Arrow datatype of the field.
     nullable : bool, default True
@@ -3504,11 +3524,25 @@ def field(name, type, bint nullable=True, metadata=None):
     >>> pa.struct([field])
     StructType(struct<key: int32>)
     """
+    if hasattr(name, "__arrow_c_schema__"):
+        if type is not None:
+            raise ValueError(
+                "cannot specify 'type' when creating a Field from an ArrowSchema"
+            )
+        field = Field._import_from_c_capsule(name.__arrow_c_schema__())
+        if metadata is not None:
+            field = field.with_metadata(metadata)
+        if nullable is not None:
+            field = field.with_nullable(nullable)
+        return field
+
     cdef:
         Field result = Field.__new__(Field)
         DataType _type = ensure_type(type, allow_none=False)
         shared_ptr[const CKeyValueMetadata] c_meta
 
+    nullable = True if nullable is None else nullable
+
     metadata = ensure_metadata(metadata, allow_none=True)
     c_meta = pyarrow_unwrap_metadata(metadata)
 
@@ -4155,7 +4189,7 @@ def float16():
       32256
     ]
     >>> a.to_pylist()
-    [1.5, nan]
+    [np.float16(1.5), np.float16(nan)]
     """
     return primitive_type(_Type_HALF_FLOAT)
 
@@ -5316,7 +5350,10 @@ def schema(fields, metadata=None):
     if isinstance(fields, Mapping):
         fields = fields.items()
     elif hasattr(fields, "__arrow_c_schema__"):
-        return Schema._import_from_c_capsule(fields.__arrow_c_schema__())
+        result = Schema._import_from_c_capsule(fields.__arrow_c_schema__())
+        if metadata is not None:
+            result = result.with_metadata(metadata)
+        return result
 
     for item in fields:
         if isinstance(item, tuple):
@@ -5505,3 +5542,24 @@ cdef object alloc_c_stream(ArrowArrayStream** c_stream):
     # Ensure the capsule destructor doesn't call a random release pointer
     c_stream[0].release = NULL
     return PyCapsule_New(c_stream[0], 'arrow_array_stream', &pycapsule_stream_deleter)
+
+
+cdef void pycapsule_device_array_deleter(object array_capsule) noexcept:
+    cdef:
+        ArrowDeviceArray* device_array
+    # Do not invoke the deleter on a used/moved capsule
+    device_array = <ArrowDeviceArray*>cpython.PyCapsule_GetPointer(
+        array_capsule, 'arrow_device_array'
+    )
+    if device_array.array.release != NULL:
+        device_array.array.release(&device_array.array)
+
+    free(device_array)
+
+
+cdef object alloc_c_device_array(ArrowDeviceArray** c_array):
+    c_array[0] = <ArrowDeviceArray*> malloc(sizeof(ArrowDeviceArray))
+    # Ensure the capsule destructor doesn't call a random release pointer
+    c_array[0].array.release = NULL
+    return PyCapsule_New(
+        c_array[0], 'arrow_device_array', &pycapsule_device_array_deleter)
diff --git a/python/pyproject.toml b/python/pyproject.toml
index 1588e690a7247..86a90906d02f9 100644
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -24,7 +24,63 @@ requires = [
     # continue using oldest-support-numpy.
     "oldest-supported-numpy>=0.14; python_version<'3.9'",
     "numpy>=1.25; python_version>='3.9'",
-    "setuptools_scm",
-    "setuptools >= 40.1.0",
-    "wheel"
+    # configuring setuptools_scm in pyproject.toml requires
+    # versions released after 2022
+    "setuptools_scm[toml]>=8",
+    "setuptools>=64",
 ]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "pyarrow"
+dynamic = ["version"]
+requires-python = ">=3.8"
+dependencies = [
+    "numpy >= 1.16.6"
+]
+description = "Python library for Apache Arrow"
+readme = {file = "README.md", content-type = "text/markdown"}
+license = {text = "Apache Software License"}
+classifiers  = [
+    'License :: OSI Approved :: Apache Software License',
+    'Programming Language :: Python :: 3.8',
+    'Programming Language :: Python :: 3.9',
+    'Programming Language :: Python :: 3.10',
+    'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
+]
+maintainers = [
+    {name = "Apache Arrow Developers", email = "dev@arrow.apache.org"}
+]
+
+[project.urls]
+Homepage = "https://arrow.apache.org/"
+Documentation = "https://arrow.apache.org/docs/python"
+Repository = "https://github.com/apache/arrow"
+Issues = "https://github.com/apache/arrow/issues"
+
+[project.optional-dependencies]
+test = [
+    'pytest',
+    'hypothesis',
+    'cffi',
+    'pytz',
+    'pandas'
+]
+
+[tool.setuptools]
+zip-safe=false
+include-package-data=true
+
+[tool.setuptools.packages.find]
+where = ["."]
+
+[tool.setuptools.package-data]
+pyarrow = ["*.pxd", "*.pyx", "includes/*.pxd"]
+
+[tool.setuptools_scm]
+root = '..'
+version_file = 'pyarrow/_generated_version.py'
+version_scheme = 'guess-next-dev'
+git_describe_command = 'git describe --dirty --tags --long --match "apache-arrow-[0-9]*.*"'
+fallback_version = '17.0.0a0'
diff --git a/python/requirements-build.txt b/python/requirements-build.txt
index 87dcc148ad161..c150c842a0cc6 100644
--- a/python/requirements-build.txt
+++ b/python/requirements-build.txt
@@ -1,5 +1,5 @@
 cython>=0.29.31
 oldest-supported-numpy>=0.14; python_version<'3.9'
 numpy>=1.25; python_version>='3.9'
-setuptools_scm
-setuptools>=38.6.0
+setuptools_scm>=8
+setuptools>=64
diff --git a/python/requirements-wheel-build.txt b/python/requirements-wheel-build.txt
index 9920a38a4e288..faa078d3d7fe7 100644
--- a/python/requirements-wheel-build.txt
+++ b/python/requirements-wheel-build.txt
@@ -1,6 +1,6 @@
 cython>=0.29.31
 oldest-supported-numpy>=0.14; python_version<'3.9'
-numpy>=1.25; python_version>='3.9'
+numpy>=2.0.0; python_version>='3.9'
 setuptools_scm
 setuptools>=58
 wheel
diff --git a/python/scripts/test_leak.py b/python/scripts/test_leak.py
index f2bbe8d051bf9..86a87f5e742e8 100644
--- a/python/scripts/test_leak.py
+++ b/python/scripts/test_leak.py
@@ -98,7 +98,7 @@ def func():
 
 
 def test_ARROW_8801():
-    x = pd.to_datetime(np.random.randint(0, 2**32, size=2**20),
+    x = pd.to_datetime(np.random.randint(0, 2**32, size=2**20, dtype=np.int64),
                        unit='ms', utc=True)
     table = pa.table(pd.DataFrame({'x': x}))
 
diff --git a/python/setup.py b/python/setup.py
index ce6996dc1d439..b738b2f77290e 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -152,32 +152,20 @@ def initialize_options(self):
             if not hasattr(sys, 'gettotalrefcount'):
                 self.build_type = 'release'
 
-        self.with_azure = strtobool(
-            os.environ.get('PYARROW_WITH_AZURE', '0'))
-        self.with_gcs = strtobool(
-            os.environ.get('PYARROW_WITH_GCS', '0'))
-        self.with_s3 = strtobool(
-            os.environ.get('PYARROW_WITH_S3', '0'))
-        self.with_hdfs = strtobool(
-            os.environ.get('PYARROW_WITH_HDFS', '0'))
-        self.with_cuda = strtobool(
-            os.environ.get('PYARROW_WITH_CUDA', '0'))
-        self.with_substrait = strtobool(
-            os.environ.get('PYARROW_WITH_SUBSTRAIT', '0'))
-        self.with_flight = strtobool(
-            os.environ.get('PYARROW_WITH_FLIGHT', '0'))
-        self.with_acero = strtobool(
-            os.environ.get('PYARROW_WITH_ACERO', '0'))
-        self.with_dataset = strtobool(
-            os.environ.get('PYARROW_WITH_DATASET', '0'))
-        self.with_parquet = strtobool(
-            os.environ.get('PYARROW_WITH_PARQUET', '0'))
-        self.with_parquet_encryption = strtobool(
-            os.environ.get('PYARROW_WITH_PARQUET_ENCRYPTION', '0'))
-        self.with_orc = strtobool(
-            os.environ.get('PYARROW_WITH_ORC', '0'))
-        self.with_gandiva = strtobool(
-            os.environ.get('PYARROW_WITH_GANDIVA', '0'))
+        self.with_azure = None
+        self.with_gcs = None
+        self.with_s3 = None
+        self.with_hdfs = None
+        self.with_cuda = None
+        self.with_substrait = None
+        self.with_flight = None
+        self.with_acero = None
+        self.with_dataset = None
+        self.with_parquet = None
+        self.with_parquet_encryption = None
+        self.with_orc = None
+        self.with_gandiva = None
+
         self.generate_coverage = strtobool(
             os.environ.get('PYARROW_GENERATE_COVERAGE', '0'))
         self.bundle_arrow_cpp = strtobool(
@@ -185,15 +173,6 @@ def initialize_options(self):
         self.bundle_cython_cpp = strtobool(
             os.environ.get('PYARROW_BUNDLE_CYTHON_CPP', '0'))
 
-        self.with_parquet_encryption = (self.with_parquet_encryption and
-                                        self.with_parquet)
-
-        # enforce module dependencies
-        if self.with_substrait:
-            self.with_dataset = True
-        if self.with_dataset:
-            self.with_acero = True
-
     CYTHON_MODULE_NAMES = [
         'lib',
         '_fs',
@@ -270,23 +249,30 @@ def append_cmake_bool(value, varname):
                 cmake_options.append('-D{0}={1}'.format(
                     varname, 'on' if value else 'off'))
 
+            def append_cmake_component(flag, varname):
+                # only pass this to cmake is the user pass the --with-component
+                # flag to setup.py build_ext
+                if flag is not None:
+                    append_cmake_bool(flag, varname)
+
             if self.cmake_generator:
                 cmake_options += ['-G', self.cmake_generator]
 
-            append_cmake_bool(self.with_cuda, 'PYARROW_BUILD_CUDA')
-            append_cmake_bool(self.with_substrait, 'PYARROW_BUILD_SUBSTRAIT')
-            append_cmake_bool(self.with_flight, 'PYARROW_BUILD_FLIGHT')
-            append_cmake_bool(self.with_gandiva, 'PYARROW_BUILD_GANDIVA')
-            append_cmake_bool(self.with_acero, 'PYARROW_BUILD_ACERO')
-            append_cmake_bool(self.with_dataset, 'PYARROW_BUILD_DATASET')
-            append_cmake_bool(self.with_orc, 'PYARROW_BUILD_ORC')
-            append_cmake_bool(self.with_parquet, 'PYARROW_BUILD_PARQUET')
-            append_cmake_bool(self.with_parquet_encryption,
-                              'PYARROW_BUILD_PARQUET_ENCRYPTION')
-            append_cmake_bool(self.with_azure, 'PYARROW_BUILD_AZURE')
-            append_cmake_bool(self.with_gcs, 'PYARROW_BUILD_GCS')
-            append_cmake_bool(self.with_s3, 'PYARROW_BUILD_S3')
-            append_cmake_bool(self.with_hdfs, 'PYARROW_BUILD_HDFS')
+            append_cmake_component(self.with_cuda, 'PYARROW_CUDA')
+            append_cmake_component(self.with_substrait, 'PYARROW_SUBSTRAIT')
+            append_cmake_component(self.with_flight, 'PYARROW_FLIGHT')
+            append_cmake_component(self.with_gandiva, 'PYARROW_GANDIVA')
+            append_cmake_component(self.with_acero, 'PYARROW_ACERO')
+            append_cmake_component(self.with_dataset, 'PYARROW_DATASET')
+            append_cmake_component(self.with_orc, 'PYARROW_ORC')
+            append_cmake_component(self.with_parquet, 'PYARROW_PARQUET')
+            append_cmake_component(self.with_parquet_encryption,
+                                   'PYARROW_PARQUET_ENCRYPTION')
+            append_cmake_component(self.with_azure, 'PYARROW_AZURE')
+            append_cmake_component(self.with_gcs, 'PYARROW_GCS')
+            append_cmake_component(self.with_s3, 'PYARROW_S3')
+            append_cmake_component(self.with_hdfs, 'PYARROW_HDFS')
+
             append_cmake_bool(self.bundle_arrow_cpp,
                               'PYARROW_BUNDLE_ARROW_CPP')
             append_cmake_bool(self.bundle_cython_cpp,
@@ -329,54 +315,8 @@ def append_cmake_bool(value, varname):
             self._found_names = []
             for name in self.CYTHON_MODULE_NAMES:
                 built_path = pjoin(install_prefix, name + ext_suffix)
-                if not os.path.exists(built_path):
-                    print(f'Did not find {built_path}')
-                    if self._failure_permitted(name):
-                        print(f'Cython module {name} failure permitted')
-                        continue
-                    raise RuntimeError('PyArrow C-extension failed to build:',
-                                       os.path.abspath(built_path))
-
-                self._found_names.append(name)
-
-    def _failure_permitted(self, name):
-        if name == '_parquet' and not self.with_parquet:
-            return True
-        if name == '_parquet_encryption' and not self.with_parquet_encryption:
-            return True
-        if name == '_orc' and not self.with_orc:
-            return True
-        if name == '_flight' and not self.with_flight:
-            return True
-        if name == '_substrait' and not self.with_substrait:
-            return True
-        if name == '_azurefs' and not self.with_azure:
-            return True
-        if name == '_gcsfs' and not self.with_gcs:
-            return True
-        if name == '_s3fs' and not self.with_s3:
-            return True
-        if name == '_hdfs' and not self.with_hdfs:
-            return True
-        if name == '_dataset' and not self.with_dataset:
-            return True
-        if name == '_acero' and not self.with_acero:
-            return True
-        if name == '_exec_plan' and not self.with_acero:
-            return True
-        if name == '_dataset_orc' and not (
-                self.with_orc and self.with_dataset
-        ):
-            return True
-        if name == '_dataset_parquet' and not (
-                self.with_parquet and self.with_dataset
-        ):
-            return True
-        if name == '_cuda' and not self.with_cuda:
-            return True
-        if name == 'gandiva' and not self.with_gandiva:
-            return True
-        return False
+                if os.path.exists(built_path):
+                    self._found_names.append(name)
 
     def _get_build_dir(self):
         # Get the package directory from build_py
@@ -412,61 +352,11 @@ def get_outputs(self):
                 for name in self.get_names()]
 
 
-# If the event of not running from a git clone (e.g. from a git archive
-# or a Python sdist), see if we can set the version number ourselves
-default_version = '16.0.0-SNAPSHOT'
-if (not os.path.exists('../.git') and
-        not os.environ.get('SETUPTOOLS_SCM_PRETEND_VERSION')):
-    os.environ['SETUPTOOLS_SCM_PRETEND_VERSION'] = \
-        default_version.replace('-SNAPSHOT', 'a0')
-
-
-# See https://github.com/pypa/setuptools_scm#configuration-parameters
-scm_version_write_to_prefix = os.environ.get(
-    'SETUPTOOLS_SCM_VERSION_WRITE_TO_PREFIX', setup_dir)
-
-
-def parse_git(root, **kwargs):
-    """
-    Parse function for setuptools_scm that ignores tags for non-C++
-    subprojects, e.g. apache-arrow-js-XXX tags.
-    """
-    from setuptools_scm.git import parse
-    kwargs['describe_command'] =\
-        'git describe --dirty --tags --long --match "apache-arrow-[0-9]*.*"'
-    return parse(root, **kwargs)
-
-
-def guess_next_dev_version(version):
-    if version.exact:
-        return version.format_with('{tag}')
-    else:
-        def guess_next_version(tag_version):
-            return default_version.replace('-SNAPSHOT', '')
-        return version.format_next_version(guess_next_version)
-
-
-with open('README.md') as f:
-    long_description = f.read()
-
-
 class BinaryDistribution(Distribution):
     def has_ext_modules(foo):
         return True
 
 
-install_requires = (
-    'numpy >= 1.16.6',
-)
-
-
-# Only include pytest-runner in setup_requires if we're invoking tests
-if {'pytest', 'test', 'ptr'}.intersection(sys.argv):
-    setup_requires = ['pytest-runner']
-else:
-    setup_requires = []
-
-
 if strtobool(os.environ.get('PYARROW_INSTALL_TESTS', '1')):
     packages = find_namespace_packages(include=['pyarrow*'])
     exclude_package_data = {}
@@ -480,11 +370,7 @@ def has_ext_modules(foo):
 
 
 setup(
-    name='pyarrow',
     packages=packages,
-    zip_safe=False,
-    package_data={'pyarrow': ['*.pxd', '*.pyx', 'includes/*.pxd']},
-    include_package_data=True,
     exclude_package_data=exclude_package_data,
     distclass=BinaryDistribution,
     # Dummy extension to trigger build_ext
@@ -492,35 +378,4 @@ def has_ext_modules(foo):
     cmdclass={
         'build_ext': build_ext
     },
-    use_scm_version={
-        'root': os.path.dirname(setup_dir),
-        'parse': parse_git,
-        'write_to': os.path.join(scm_version_write_to_prefix,
-                                 'pyarrow/_generated_version.py'),
-        'version_scheme': guess_next_dev_version
-    },
-    setup_requires=['setuptools_scm', 'cython >= 0.29.31'] + setup_requires,
-    install_requires=install_requires,
-    tests_require=['pytest', 'pandas', 'hypothesis'],
-    python_requires='>=3.8',
-    description='Python library for Apache Arrow',
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    classifiers=[
-        'License :: OSI Approved :: Apache Software License',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.10',
-        'Programming Language :: Python :: 3.11',
-        'Programming Language :: Python :: 3.12',
-    ],
-    license='Apache License, Version 2.0',
-    maintainer='Apache Arrow Developers',
-    maintainer_email='dev@arrow.apache.org',
-    test_suite='pyarrow.tests',
-    url='https://arrow.apache.org/',
-    project_urls={
-        'Documentation': 'https://arrow.apache.org/docs/python',
-        'Source': 'https://github.com/apache/arrow',
-    },
 )
diff --git a/r/DESCRIPTION b/r/DESCRIPTION
index 6062a8c4f4689..bb4470e29037d 100644
--- a/r/DESCRIPTION
+++ b/r/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: arrow
 Title: Integration to 'Apache' 'Arrow'
-Version: 15.0.2.9000
+Version: 16.1.0.9000
 Authors@R: c(
     person("Neal", "Richardson", email = "neal.p.richardson@gmail.com", role = c("aut")),
     person("Ian", "Cook", email = "ianmcook@gmail.com", role = c("aut")),
@@ -21,7 +21,7 @@ Description: 'Apache' 'Arrow' <https://arrow.apache.org/> is a cross-language
     language-independent columnar memory format for flat and hierarchical data,
     organized for efficient analytic operations on modern hardware. This
     package provides an interface to the 'Arrow C++' library.
-Depends: R (>= 3.4)
+Depends: R (>= 4.0)
 License: Apache License (>= 2.0)
 URL: https://github.com/apache/arrow/, https://arrow.apache.org/docs/r/
 BugReports: https://github.com/apache/arrow/issues
@@ -43,7 +43,7 @@ Imports:
     utils,
     vctrs
 Roxygen: list(markdown = TRUE, r6 = FALSE, load = "source")
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 Config/testthat/edition: 3
 Config/build/bootstrap: TRUE
 Suggests:
@@ -107,6 +107,7 @@ Collate:
     'dplyr-distinct.R'
     'dplyr-eval.R'
     'dplyr-filter.R'
+    'dplyr-funcs-agg.R'
     'dplyr-funcs-augmented.R'
     'dplyr-funcs-conditional.R'
     'dplyr-funcs-datetime.R'
diff --git a/r/Makefile b/r/Makefile
index c3267e8cfe45b..785e9e1214d4f 100644
--- a/r/Makefile
+++ b/r/Makefile
@@ -52,11 +52,11 @@ build: doc sync-cpp
 	R CMD build ${args} .
 
 check: build
-	-export _R_CHECK_CRAN_INCOMING_REMOTE_=FALSE && export ARROW_R_DEV=$(ARROW_R_DEV) && export _R_CHECK_TESTS_NLINES_=0 && R CMD check --as-cran --run-donttest arrow_$(VERSION).tar.gz
+	-export _R_CHECK_CRAN_INCOMING_REMOTE_=FALSE && export ARROW_R_DEV=$(ARROW_R_DEV) && export _R_CHECK_TESTS_NLINES_=0 && R CMD check --as-cran arrow_$(VERSION).tar.gz
 	rm -rf arrow.Rcheck/
 
 release: build
-	-export _R_CHECK_TESTS_NLINES_=0 && R CMD check --as-cran --run-donttest arrow_$(VERSION).tar.gz
+	-export _R_CHECK_TESTS_NLINES_=0 && R CMD check --as-cran arrow_$(VERSION).tar.gz
 	rm -rf arrow.Rcheck/
 
 clean:
diff --git a/r/NEWS.md b/r/NEWS.md
index ce422c6cbdfd0..317e546a1b70f 100644
--- a/r/NEWS.md
+++ b/r/NEWS.md
@@ -17,13 +17,29 @@
   under the License.
 -->
 
-# arrow 15.0.2.9000
+# arrow 16.1.0.9000
 
-# arrow 15.0.2
+* R functions that users write that use functions that Arrow supports in dataset queries now can be used in queries too. Previously, only functions that used arithmetic operators worked. For example, `time_hours <- function(mins) mins / 60` worked, but `time_hours_rounded <- function(mins) round(mins / 60)` did not; now both work. These are automatic translations rather than true user-defined functions (UDFs); for UDFs, see `register_scalar_function()`. (#41223)
+* `summarize()` supports more complex expressions, and correctly handles cases where column names are reused in expressions. 
+* The `na_matches` argument to the `dplyr::*_join()` functions is now supported. This argument controls whether `NA` values are considered equal when joining. (#41358)
+* R metadata, stored in the Arrow schema to support round-tripping data between R and Arrow/Parquet, is now serialized and deserialized more strictly. This makes it safer to load data from files from unknown sources into R data.frames. (#41969)
 
-# arrow 15.0.1
+# arrow 16.1.0
+
+## New features
 
-# arrow 15.0.0
+* Streams can now be written to socket connections (#38897)
+* The Arrow R package now can be built with older versions of the Arrow C++ library (back to 13.0.0) (#39738)
+
+## Minor improvements and fixes
+
+* Dataset and table output printing now truncates schemas longer than 20 items long (#38916)
+* Fixed pointer conversion to Python for latest reticulate to ensure data can be passed between Arrow and PyArrow (#39969) 
+* Check on macOS if we are using GNU libtool is and ensure we use macOS libtool instead (#40259)
+* Fix an error where creating a bundled tarball with all dependencies was failing on Windows (@hutch3232, #40232)
+
+
+# arrow 15.0.1
 
 ##  New features
 
diff --git a/r/R/arrow-info.R b/r/R/arrow-info.R
index 54145b2ee1204..ddeb0f04efac1 100644
--- a/r/R/arrow-info.R
+++ b/r/R/arrow-info.R
@@ -139,7 +139,8 @@ arrow_with_json <- function() {
 some_features_are_off <- function(features) {
   # `features` is a named logical vector (as in arrow_info()$capabilities)
   # Let's exclude some less relevant ones
-  blocklist <- c("lzo", "bz2", "brotli", "substrait")
+  # jemalloc is only included because it is sometimes disabled in our build process
+  blocklist <- c("lzo", "bz2", "brotli", "substrait", "jemalloc", "gcs")
   # Return TRUE if any of the other features are FALSE
   !all(features[setdiff(names(features), blocklist)])
 }
diff --git a/r/R/arrow-package.R b/r/R/arrow-package.R
index 54e237192e080..44dfbbcd5c7e7 100644
--- a/r/R/arrow-package.R
+++ b/r/R/arrow-package.R
@@ -48,10 +48,7 @@ supported_dplyr_methods <- list(
   group_vars = NULL,
   group_by_drop_default = NULL,
   ungroup = NULL,
-  mutate = c(
-    "window functions (e.g. things that require aggregation within groups)",
-    "not currently supported"
-  ),
+  mutate = NULL,
   transmute = NULL,
   arrange = NULL,
   rename = NULL,
@@ -66,12 +63,12 @@ supported_dplyr_methods <- list(
   compute = NULL,
   collapse = NULL,
   distinct = "`.keep_all = TRUE` not supported",
-  left_join = "the `copy` and `na_matches` arguments are ignored",
-  right_join = "the `copy` and `na_matches` arguments are ignored",
-  inner_join = "the `copy` and `na_matches` arguments are ignored",
-  full_join = "the `copy` and `na_matches` arguments are ignored",
-  semi_join = "the `copy` and `na_matches` arguments are ignored",
-  anti_join = "the `copy` and `na_matches` arguments are ignored",
+  left_join = "the `copy` argument is ignored",
+  right_join = "the `copy` argument is ignored",
+  inner_join = "the `copy` argument is ignored",
+  full_join = "the `copy` argument is ignored",
+  semi_join = "the `copy` argument is ignored",
+  anti_join = "the `copy` argument is ignored",
   count = NULL,
   tally = NULL,
   rename_with = NULL,
@@ -182,37 +179,54 @@ configure_tzdb <- function() {
 .onAttach <- function(libname, pkgname) {
   # Just to be extra safe, let's wrap this in a try();
   # we don't want a failed startup message to prevent the package from loading
-  try({
-    # On macOS only, Check if we are running in under emulation, and warn this will not work
-    if (on_rosetta()) {
-      packageStartupMessage(
-        paste(
-          "Warning:",
-          "  It appears that you are running R and Arrow in emulation (i.e. you're",
-          "  running an Intel version of R on a non-Intel mac). This configuration is",
-          "  not supported by arrow, you should install a native (arm64) build of R",
-          "  and use arrow with that. See https://cran.r-project.org/bin/macosx/",
-          "",
-          sep = "\n"
+  try(
+    {
+      # On macOS only, Check if we are running in under emulation, and warn this will not work
+      if (on_rosetta()) {
+        packageStartupMessage(
+          paste(
+            "Warning:",
+            "  It appears that you are running R and Arrow in emulation (i.e. you're",
+            "  running an Intel version of R on a non-Intel mac). This configuration is",
+            "  not supported by arrow, you should install a native (arm64) build of R",
+            "  and use arrow with that. See https://cran.r-project.org/bin/macosx/",
+            "",
+            sep = "\n"
+          )
         )
-      )
-    }
+      }
 
 
-    features <- arrow_info()$capabilities
-    # That has all of the #ifdef features, plus the compression libs and the
-    # string libraries (but not the memory allocators, they're added elsewhere)
-    #
-    # Let's print a message if some are off
-    if (some_features_are_off(features)) {
-      packageStartupMessage(
-        paste(
-          "Some features are not enabled in this build of Arrow.",
-          "Run `arrow_info()` for more information."
+      features <- arrow_info()$capabilities
+      # That has all of the #ifdef features, plus the compression libs and the
+      # string libraries (but not the memory allocators, they're added elsewhere)
+      #
+      # Let's print a message if some are off
+      if (some_features_are_off(features)) {
+        packageStartupMessage(
+          paste(
+            "Some features are not enabled in this build of Arrow.",
+            "Run `arrow_info()` for more information."
+          )
         )
-      )
-    }
-  }, silent = TRUE)
+        # On macOS binaries from CRAN can be hobbled. They sometimes restrict access to our
+        # dependency source downloading even though we can build from source on their machines.
+        # They also refuse to allow libarrow binaries to be downloaded, so instead distribute
+        # hobbled arrow binaries
+        # If on macOS, and features are disabled, advise that reinstalling might help
+        if (identical(tolower(Sys.info()[["sysname"]]), "darwin")) {
+          packageStartupMessage(
+            paste0(
+              "The repository you retrieved Arrow from did not include all of Arrow's features.\n",
+              "You can install a fully-featured version by running:\n",
+              "`install.packages('arrow', repos = 'https://apache.r-universe.dev')`."
+            )
+          )
+        }
+      }
+    },
+    silent = TRUE
+  )
 }
 
 # Clean up the StopSource that was registered in .onLoad() so that if the
diff --git a/r/R/arrowExports.R b/r/R/arrowExports.R
index f4ff3ef894532..62e2182ffcd52 100644
--- a/r/R/arrowExports.R
+++ b/r/R/arrowExports.R
@@ -484,8 +484,8 @@ ExecNode_Aggregate <- function(input, options, key_names) {
   .Call(`_arrow_ExecNode_Aggregate`, input, options, key_names)
 }
 
-ExecNode_Join <- function(input, join_type, right_data, left_keys, right_keys, left_output, right_output, output_suffix_for_left, output_suffix_for_right) {
-  .Call(`_arrow_ExecNode_Join`, input, join_type, right_data, left_keys, right_keys, left_output, right_output, output_suffix_for_left, output_suffix_for_right)
+ExecNode_Join <- function(input, join_type, right_data, left_keys, right_keys, left_output, right_output, output_suffix_for_left, output_suffix_for_right, na_matches) {
+  .Call(`_arrow_ExecNode_Join`, input, join_type, right_data, left_keys, right_keys, left_output, right_output, output_suffix_for_left, output_suffix_for_right, na_matches)
 }
 
 ExecNode_Union <- function(input, right_data) {
@@ -1132,6 +1132,10 @@ compute___expr__get_field_ref_name <- function(x) {
   .Call(`_arrow_compute___expr__get_field_ref_name`, x)
 }
 
+compute___expr__field_names_in_expression <- function(x) {
+  .Call(`_arrow_compute___expr__field_names_in_expression`, x)
+}
+
 compute___expr__field_ref <- function(name) {
   .Call(`_arrow_compute___expr__field_ref`, name)
 }
@@ -1348,10 +1352,6 @@ fs___FileSystem__type_name <- function(file_system) {
   .Call(`_arrow_fs___FileSystem__type_name`, file_system)
 }
 
-fs___LocalFileSystem__create <- function() {
-  .Call(`_arrow_fs___LocalFileSystem__create`)
-}
-
 fs___SubTreeFileSystem__create <- function(base_path, base_fs) {
   .Call(`_arrow_fs___SubTreeFileSystem__create`, base_path, base_fs)
 }
diff --git a/r/R/csv.R b/r/R/csv.R
index 03540006ca0a2..733547570391d 100644
--- a/r/R/csv.R
+++ b/r/R/csv.R
@@ -78,8 +78,9 @@
 #' `col_names`, and the CSV file has a header row that would otherwise be used
 #' to identify column names, you'll need to add `skip = 1` to skip that row.
 #'
-#' @param file A character file name or URI, literal data (either a single string or a [raw] vector),
-#' an Arrow input stream, or a `FileSystem` with path (`SubTreeFileSystem`).
+#' @param file A character file name or URI, connection, literal data (either a
+#' single string or a [raw] vector), an Arrow input stream, or a `FileSystem`
+#' with path (`SubTreeFileSystem`).
 #'
 #' If a file name, a memory-mapped Arrow [InputStream] will be opened and
 #' closed when finished; compression will be detected from the file extension
@@ -894,7 +895,7 @@ readr_to_csv_convert_options <- function(na,
 #' Write CSV file to disk
 #'
 #' @param x `data.frame`, [RecordBatch], or [Table]
-#' @param sink A string file path, URI, or [OutputStream], or path in a file
+#' @param sink A string file path, connection, URI, or [OutputStream], or path in a file
 #' system (`SubTreeFileSystem`)
 #' @param file file name. Specify this or `sink`, not both.
 #' @param include_header Whether to write an initial header line with column names
diff --git a/r/R/dplyr-across.R b/r/R/dplyr-across.R
index da61353b22cdb..6aeedc18f375e 100644
--- a/r/R/dplyr-across.R
+++ b/r/R/dplyr-across.R
@@ -34,7 +34,11 @@ expand_across <- function(.data, quos_in, exclude_cols = NULL) {
       )
 
       if (!all(names(across_call[-1]) %in% c(".cols", ".fns", ".names"))) {
-        abort("`...` argument to `across()` is deprecated in dplyr and not supported in Arrow")
+        arrow_not_supported(
+          "`...` argument to `across()` is deprecated in dplyr and",
+          body = c(">" = "Convert your call into a function or formula including the arguments"),
+          call = rlang::caller_call()
+        )
       }
 
       if (!is.null(across_call[[".cols"]])) {
@@ -145,7 +149,6 @@ across_setup <- function(cols, fns, names, .caller_env, mask, inline = FALSE, ex
     fns <- call_args(fns)
   }
 
-  # ARROW-14071
   if (all(map_lgl(fns, is_call, name = "function"))) {
     abort("Anonymous functions are not yet supported in Arrow")
   }
diff --git a/r/R/dplyr-arrange.R b/r/R/dplyr-arrange.R
index e3e20f2cb3ac3..fdc69a708d15d 100644
--- a/r/R/dplyr-arrange.R
+++ b/r/R/dplyr-arrange.R
@@ -19,39 +19,46 @@
 # The following S3 methods are registered on load if dplyr is present
 
 arrange.arrow_dplyr_query <- function(.data, ..., .by_group = FALSE) {
-  call <- match.call()
-  .data <- as_adq(.data)
-  exprs <- expand_across(.data, quos(...))
+  try_arrow_dplyr({
+    .data <- as_adq(.data)
+    exprs <- expand_across(.data, quos(...))
 
-  if (.by_group) {
-    # when the data is is grouped and .by_group is TRUE, order the result by
-    # the grouping columns first
-    exprs <- c(quos(!!!dplyr::groups(.data)), exprs)
-  }
-  if (length(exprs) == 0) {
-    # Nothing to do
-    return(.data)
-  }
-  .data <- as_adq(.data)
-  # find and remove any dplyr::desc() and tidy-eval
-  # the arrange expressions inside an Arrow data_mask
-  sorts <- vector("list", length(exprs))
-  descs <- logical(0)
-  mask <- arrow_mask(.data)
-  for (i in seq_along(exprs)) {
-    x <- find_and_remove_desc(exprs[[i]])
-    exprs[[i]] <- x[["quos"]]
-    sorts[[i]] <- arrow_eval(exprs[[i]], mask)
-    names(sorts)[i] <- format_expr(exprs[[i]])
-    if (inherits(sorts[[i]], "try-error")) {
-      msg <- paste("Expression", names(sorts)[i], "not supported in Arrow")
-      return(abandon_ship(call, .data, msg))
+    if (.by_group) {
+      # when the data is grouped and .by_group is TRUE, order the result by
+      # the grouping columns first
+      exprs <- c(quos(!!!dplyr::groups(.data)), exprs)
     }
-    descs[i] <- x[["desc"]]
-  }
-  .data$arrange_vars <- c(sorts, .data$arrange_vars)
-  .data$arrange_desc <- c(descs, .data$arrange_desc)
-  .data
+    if (length(exprs) == 0) {
+      # Nothing to do
+      return(.data)
+    }
+    .data <- as_adq(.data)
+    # find and remove any dplyr::desc() and tidy-eval
+    # the arrange expressions inside an Arrow data_mask
+    sorts <- vector("list", length(exprs))
+    descs <- logical(0)
+    mask <- arrow_mask(.data)
+    for (i in seq_along(exprs)) {
+      x <- find_and_remove_desc(exprs[[i]])
+      exprs[[i]] <- x[["quos"]]
+      sorts[[i]] <- arrow_eval(exprs[[i]], mask)
+      names(sorts)[i] <- format_expr(exprs[[i]])
+      if (length(mask$.aggregations)) {
+        # dplyr lets you arrange on e.g. x < mean(x), but we haven't implemented it.
+        # But we could, the same way it works in mutate() via join, if someone asks.
+        # Until then, just error.
+        # TODO: add a test for this
+        arrow_not_supported(
+          .actual_msg = "Expression not supported in arrange() in Arrow",
+          call = expr
+        )
+      }
+      descs[i] <- x[["desc"]]
+    }
+    .data$arrange_vars <- c(sorts, .data$arrange_vars)
+    .data$arrange_desc <- c(descs, .data$arrange_desc)
+    .data
+  })
 }
 arrange.Dataset <- arrange.ArrowTabular <- arrange.RecordBatchReader <- arrange.arrow_dplyr_query
 
@@ -65,10 +72,9 @@ find_and_remove_desc <- function(quosure) {
   expr <- quo_get_expr(quosure)
   descending <- FALSE
   if (length(all.vars(expr)) < 1L) {
-    stop(
-      "Expression in arrange() does not contain any field names: ",
-      deparse(expr),
-      call. = FALSE
+    validation_error(
+      "Expression in arrange() does not contain any field names",
+      call = quosure
     )
   }
   # Use a while loop to remove any number of nested pairs of enclosing
@@ -82,7 +88,10 @@ find_and_remove_desc <- function(quosure) {
       # ensure desc() has only one argument (when an R expression is a function
       # call, length == 2 means it has exactly one argument)
       if (length(expr) > 2) {
-        stop("desc() expects only one argument", call. = FALSE)
+        validation_error(
+          "desc() expects only one argument",
+          call = expr
+        )
       }
       # remove desc() and toggle descending
       expr <- expr[[2]]
diff --git a/r/R/dplyr-datetime-helpers.R b/r/R/dplyr-datetime-helpers.R
index c153f47cbafdb..8e6a7f6185366 100644
--- a/r/R/dplyr-datetime-helpers.R
+++ b/r/R/dplyr-datetime-helpers.R
@@ -18,10 +18,10 @@
 check_time_locale <- function(locale = Sys.getlocale("LC_TIME")) {
   if (tolower(Sys.info()[["sysname"]]) == "windows" && locale != "C") {
     # MingW C++ std::locale only supports "C" and "POSIX"
-    stop(paste0(
-      "On Windows, time locales other than 'C' are not supported in Arrow. ",
-      "Consider setting `Sys.setlocale('LC_TIME', 'C')`"
-    ))
+    arrow_not_supported(
+      "On Windows, time locales other than 'C'",
+      body = c(">" = "Consider setting `Sys.setlocale('LC_TIME', 'C')`")
+    )
   }
   locale
 }
@@ -56,13 +56,15 @@ duration_from_chunks <- function(chunks) {
   matched_chunks <- accepted_chunks[pmatch(names(chunks), accepted_chunks, duplicates.ok = TRUE)]
 
   if (any(is.na(matched_chunks))) {
-    abort(
-      paste0(
-        "named `difftime` units other than: ",
-        oxford_paste(accepted_chunks, quote_symbol = "`"),
-        " not supported in Arrow. \nInvalid `difftime` parts: ",
+    arrow_not_supported(
+      paste(
+        "named `difftime` units other than:",
+        oxford_paste(accepted_chunks, quote_symbol = "`")
+      ),
+      body = c(i = paste(
+        "Invalid `difftime` parts:",
         oxford_paste(names(chunks[is.na(matched_chunks)]), quote_symbol = "`")
-      )
+      ))
     )
   }
 
@@ -114,7 +116,6 @@ binding_as_date_character <- function(x,
 }
 
 binding_as_date_numeric <- function(x, origin = "1970-01-01") {
-
   # Arrow does not support direct casting from double to date32(), but for
   # integer-like values we can go via int32()
   # TODO: revisit after ARROW-15798
@@ -442,7 +443,7 @@ parse_period_unit <- function(x) {
   unit <- as.integer(pmatch(str_unit_start, known_units)) - 1L
 
   if (any(is.na(unit))) {
-    abort(
+    validation_error(
       sprintf(
         "Invalid period name: '%s'",
         str_unit,
@@ -484,13 +485,13 @@ parse_period_unit <- function(x) {
   # more special cases: lubridate imposes sensible maximum
   # values on the number of seconds, minutes and hours
   if (unit == 3L && multiple > 60) {
-    abort("Rounding with second > 60 is not supported")
+    validation_error("Rounding with second > 60 is not supported")
   }
   if (unit == 4L && multiple > 60) {
-    abort("Rounding with minute > 60 is not supported")
+    validation_error("Rounding with minute > 60 is not supported")
   }
   if (unit == 5L && multiple > 24) {
-    abort("Rounding with hour > 24 is not supported")
+    validation_error("Rounding with hour > 24 is not supported")
   }
 
   list(unit = unit, multiple = multiple)
diff --git a/r/R/dplyr-eval.R b/r/R/dplyr-eval.R
index 08a4b62aa8f8f..1997d698c0b24 100644
--- a/r/R/dplyr-eval.R
+++ b/r/R/dplyr-eval.R
@@ -15,48 +15,124 @@
 # specific language governing permissions and limitations
 # under the License.
 
+# filter(), mutate(), etc. work by evaluating the quoted `exprs` to generate Expressions
 arrow_eval <- function(expr, mask) {
-  # filter(), mutate(), etc. work by evaluating the quoted `exprs` to generate Expressions
-  # with references to Arrays (if .data is Table/RecordBatch) or Fields (if
-  # .data is a Dataset).
+  # Look for R functions referenced in expr that are not in the mask and add
+  # them. If they call other functions in the mask, this will let them find them
+  # and just work. (If they call things not supported in Arrow, it won't work,
+  # but it wouldn't have worked anyway!)
+  # Note this is *not* true UDFs.
+  add_user_functions_to_mask(expr, mask)
 
   # This yields an Expression as long as the `exprs` are implemented in Arrow.
-  # Otherwise, it returns a try-error
+  # Otherwise, it raises a classed error, either:
+  # * arrow_not_supported: the expression is not supported in Arrow; retry with
+  #   regular dplyr may work
+  # * validation_error: the expression is known to be not valid, so don't
+  #   recommend retrying with regular dplyr
   tryCatch(eval_tidy(expr, mask), error = function(e) {
-    # Look for the cases where bad input was given, i.e. this would fail
-    # in regular dplyr anyway, and let those raise those as errors;
-    # else, for things not supported in Arrow return a "try-error",
-    # which we'll handle differently
+    # Inspect why the expression failed, and add the expr as the `call`
+    # for better error messages
     msg <- conditionMessage(e)
-    if (getOption("arrow.debug", FALSE)) print(msg)
-    patterns <- .cache$i18ized_error_pattern
-    if (is.null(patterns)) {
-      patterns <- i18ize_error_messages()
-      # Memoize it
-      .cache$i18ized_error_pattern <- patterns
-    }
-    if (grepl(patterns, msg)) {
+    arrow_debug <- getOption("arrow.debug", FALSE)
+    if (arrow_debug) print(msg)
+
+    # A few cases:
+    # 1. Evaluation raised one of our error classes. Add the expr as the call
+    #    and re-raise it.
+    if (inherits(e, c("validation_error", "arrow_not_supported"))) {
+      e$call <- expr
       stop(e)
     }
 
-    out <- structure(msg, class = "try-error", condition = e)
-    if (grepl("not supported.*Arrow|NotImplemented", msg) || getOption("arrow.debug", FALSE)) {
-      # One of ours. Mark it so that consumers can handle it differently
-      class(out) <- c("arrow-try-error", class(out))
+    # 2. Error is from assert_that: raise as validation_error
+    if (inherits(e, "assertError")) {
+      validation_error(msg, call = expr)
+    }
+
+    # 3. Check to see if this is a standard R error message (not found etc.).
+    #    Retry with dplyr won't help.
+    if (grepl(get_standard_error_messages(), msg)) {
+      # Raise the original error: it's actually helpful here
+      validation_error(msg, call = expr)
+    }
+    # 3b. Check to see if this is from match.arg. Retry with dplyr won't help.
+    if (is.language(e$call) && identical(as.character(e$call[[1]]), "match.arg")) {
+      # Raise the original error: it's actually helpful here
+      validation_error(msg, call = expr)
+    }
+
+    # 4. Check for NotImplemented error raised from Arrow C++ code.
+    #    Not sure where exactly we may raise this, but if we see it, it means
+    #    that something isn't supported in Arrow. Retry in dplyr may help?
+    if (grepl("NotImplemented", msg)) {
+      arrow_not_supported(.actual_msg = msg, call = expr)
+    }
+
+
+    # 5. Otherwise, we're not sure why this errored: it's not an error we raised
+    #    explicitly. We'll assume it's because the function it calls isn't
+    #    supported in arrow, and retry with dplyr may help.
+    if (arrow_debug) {
+      arrow_not_supported(.actual_msg = msg, call = expr)
+    } else {
+      # Don't show the original error message unless in debug mode because
+      # it's probably not helpful: like, if you've passed an Expression to a
+      # regular R function that operates on strings, the way it errors would be
+      # more confusing than just saying that the expression is not supported
+      # in arrow.
+      arrow_not_supported("Expression", call = expr)
     }
-    invisible(out)
   })
 }
 
-handle_arrow_not_supported <- function(err, lab) {
-  # Look for informative message from the Arrow function version (see above)
-  if (inherits(err, "arrow-try-error")) {
-    # Include it if found
-    paste0("In ", lab, ", ", as.character(err))
-  } else {
-    # Otherwise be opaque (the original error is probably not useful)
-    paste("Expression", lab, "not supported in Arrow")
+add_user_functions_to_mask <- function(expr, mask) {
+  # Look for the user's R functions referenced in expr that are not in the mask,
+  # see if we can add them to the mask and set their parent env to the mask
+  # so that they can reference other functions in the mask.
+  if (is_quosure(expr)) {
+    # case_when calls arrow_eval() on regular formulas not quosures, which don't
+    # have their own environment. But, we've already walked those expressions
+    # when calling arrow_eval() on the case_when expression itself, so we don't
+    # need to worry about adding them again.
+    function_env <- parent.env(parent.env(mask))
+    quo_expr <- quo_get_expr(expr)
+    funs_in_expr <- all_funs(quo_expr)
+    quo_env <- quo_get_env(expr)
+    # Enumerate the things we have bindings for, and add anything else that we
+    # explicitly want to block from trying to add to the function environment
+    known_funcs <- c(ls(function_env, all.names = TRUE), "~", "[", ":")
+    unknown <- setdiff(funs_in_expr, known_funcs)
+    for (func_name in unknown) {
+      if (exists(func_name, quo_env)) {
+        user_fun <- get(func_name, quo_env)
+        if (!is.null(environment(user_fun)) && !rlang::is_namespace(environment(user_fun))) {
+          # Primitives don't have an environment, and we can't trust that
+          # functions from packages will work in arrow. (If they could be
+          # expressed in arrow, they would be in the mask already.)
+          if (getOption("arrow.debug", FALSE)) {
+            print(paste("Adding", func_name, "to the function environment"))
+          }
+          function_env[[func_name]] <- user_fun
+          # Also set the enclosing environment to be the function environment.
+          # This allows the function to reference other functions in the env.
+          # This may have other undesired side effects(?)
+          environment(function_env[[func_name]]) <- function_env
+        }
+      }
+    }
   }
+  # Don't need to return anything because we assigned into environments,
+  # which pass by reference
+  invisible()
+}
+
+get_standard_error_messages <- function() {
+  if (is.null(.cache$i18ized_error_pattern)) {
+    # Memoize it
+    .cache$i18ized_error_pattern <- i18ize_error_messages()
+  }
+  .cache$i18ized_error_pattern
 }
 
 i18ize_error_messages <- function() {
@@ -69,34 +145,109 @@ i18ize_error_messages <- function() {
   paste(map(out, ~ sub("X_____X", ".*", .)), collapse = "|")
 }
 
-# Helper to raise a common error
-arrow_not_supported <- function(msg) {
-  # TODO: raise a classed error?
-  stop(paste(msg, "not supported in Arrow"), call. = FALSE)
+#' Helpers to raise classed errors
+#'
+#' `arrow_not_supported()` and `validation_error()` raise classed errors that
+#' allow us to distinguish between things that are not supported in Arrow and
+#' things that are just invalid input. Additional wrapping in `arrow_eval()`
+#' and `try_arrow_dplyr()` provide more context and suggestions.
+#' Importantly, if `arrow_not_supported` is raised, then retrying the same code
+#' in regular dplyr in R may work. But if `validation_error` is raised, then we
+#' shouldn't recommend retrying with regular dplyr because it will fail there
+#' too.
+#'
+#' Use these in function bindings and in the dplyr methods. Inside of function
+#' bindings, you don't need to provide the `call` argument, as it will be
+#' automatically filled in with the expression that caused the error in
+#' `arrow_eval()`. In dplyr methods, you should provide the `call` argument;
+#' `rlang::caller_call()` often is correct, but you may need to experiment to
+#' find how far up the call stack you need to look.
+#'
+#' You may provide additional information in the `body` argument, a named
+#' character vector. Use `i` for additional information about the error and `>`
+#' to indicate potential solutions or workarounds that don't require pulling the
+#' data into R. If you have an `arrow_not_supported()` error with a `>`
+#' suggestion, when the error is ultimately raised by `try_error_dplyr()`,
+#' `Call collect() first to pull data into R` won't be the only suggestion.
+#'
+#' You can still use `match.arg()` and `assert_that()` for simple input
+#' validation inside of the function bindings. `arrow_eval()` will catch their
+#' errors and re-raise them as `validation_error`.
+#'
+#' @param msg The message to show. `arrow_not_supported()` will append
+#' "not supported in Arrow" to this message.
+#' @param .actual_msg If you don't want to append "not supported in Arrow" to
+#' the message, you can provide the full message here.
+#' @param ... Additional arguments to pass to `rlang::abort()`. Useful arguments
+#' include `call` to provide the call or expression that caused the error, and
+#' `body` to provide additional context about the error.
+#' @keywords internal
+arrow_not_supported <- function(msg,
+                                .actual_msg = paste(msg, "not supported in Arrow"),
+                                ...) {
+  abort(.actual_msg, class = "arrow_not_supported", use_cli_format = TRUE, ...)
 }
 
-# Create a data mask for evaluating a dplyr expression
-arrow_mask <- function(.data, aggregation = FALSE) {
-  f_env <- new_environment(.cache$functions)
+#' @rdname arrow_not_supported
+validation_error <- function(msg, ...) {
+  abort(msg, class = "validation_error", use_cli_format = TRUE, ...)
+}
 
-  # Add functions that need to error hard and clear.
-  # Some R functions will still try to evaluate on an Expression
-  # and return NA with a warning
-  fail <- function(...) stop("Not implemented")
-  for (f in c("mean", "sd")) {
-    f_env[[f]] <- fail
-  }
+# Wrap the contents of an arrow dplyr verb function in a tryCatch block to
+# handle arrow_not_supported errors:
+# * If it errors because of arrow_not_supported, abandon ship
+# * If it's another error, just stop, retry with regular dplyr won't help
+try_arrow_dplyr <- function(expr) {
+  parent <- caller_env()
+  # Make sure that the call is available in the parent environment
+  # so that we can use it in abandon_ship, if needed
+  evalq(call <- match.call(), parent)
 
-  if (aggregation) {
-    # This should probably be done with an environment inside an environment
-    # but a first attempt at that had scoping problems (ARROW-13499)
-    for (f in names(agg_funcs)) {
-      f_env[[f]] <- agg_funcs[[f]]
-    }
+  tryCatch(
+    eval(expr, parent),
+    arrow_not_supported = function(e) abandon_ship(e, parent)
+  )
+}
+
+# Helper to handle unsupported dplyr features
+# * For Table/RecordBatch, we collect() and then call the dplyr method in R
+# * For Dataset, we error and recommend collect()
+# Requires that `env` contains `.data`
+# The Table/RB path also requires `call` to be in `env` (try_arrow_dplyr adds it)
+# and that the function being called also exists in the dplyr namespace.
+abandon_ship <- function(err, env) {
+  .data <- get(".data", envir = env)
+  if (query_on_dataset(.data)) {
+    # Add a note suggesting `collect()` to the error message.
+    # If there are other suggestions already there (with the > arrow name),
+    # collect() isn't the only suggestion, so message differently
+    msg <- ifelse(
+      ">" %in% names(err$body),
+      "Or, call collect() first to pull data into R.",
+      "Call collect() first to pull data into R."
+    )
+    err$body <- c(err$body, ">" = msg)
+    stop(err)
   }
 
-  schema <- .data$.data$schema
+  # Else, warn, collect(), and run in regular dplyr
+  call <- get("call", envir = env)
+  rlang::warn(
+    message = paste0("In ", format_expr(err$call), ": "),
+    body = c("i" = conditionMessage(err), ">" = "Pulling data into R")
+  )
+  call$.data <- dplyr::collect(.data)
+  dplyr_fun_name <- sub("^(.*?)\\..*", "\\1", as.character(call[[1]]))
+  call[[1]] <- get(dplyr_fun_name, envir = asNamespace("dplyr"))
+  eval(call, env)
+}
+
+# Create a data mask for evaluating a dplyr expression
+arrow_mask <- function(.data) {
+  f_env <- new_environment(.cache$functions)
+
   # Assign the schema to the expressions
+  schema <- .data$.data$schema
   walk(.data$selected_columns, ~ (.$schema <- schema))
 
   # Add the column references and make the mask
@@ -108,6 +259,8 @@ arrow_mask <- function(.data, aggregation = FALSE) {
   # TODO: figure out what rlang::as_data_pronoun does/why we should use it
   # (because if we do we get `Error: Can't modify the data pronoun` in mutate())
   out$.data <- .data$selected_columns
+  # Add the aggregations list to collect any that get pulled out when evaluating
+  out$.aggregations <- empty_named_list()
   out
 }
 
diff --git a/r/R/dplyr-filter.R b/r/R/dplyr-filter.R
index d85fa16af2e71..36219e411e56d 100644
--- a/r/R/dplyr-filter.R
+++ b/r/R/dplyr-filter.R
@@ -19,69 +19,45 @@
 # The following S3 methods are registered on load if dplyr is present
 
 filter.arrow_dplyr_query <- function(.data, ..., .by = NULL, .preserve = FALSE) {
-  # TODO something with the .preserve argument
-  out <- as_adq(.data)
+  try_arrow_dplyr({
+    # TODO something with the .preserve argument
+    out <- as_adq(.data)
 
-  by <- compute_by({{ .by }}, out, by_arg = ".by", data_arg = ".data")
+    by <- compute_by({{ .by }}, out, by_arg = ".by", data_arg = ".data")
 
-  if (by$from_by) {
-    out$group_by_vars <- by$names
-  }
+    if (by$from_by) {
+      out$group_by_vars <- by$names
+    }
 
-  expanded_filters <- expand_across(out, quos(...))
-  if (length(expanded_filters) == 0) {
-    # Nothing to do
-    return(as_adq(.data))
-  }
+    expanded_filters <- expand_across(out, quos(...))
+    if (length(expanded_filters) == 0) {
+      # Nothing to do
+      return(as_adq(.data))
+    }
 
-  # tidy-eval the filter expressions inside an Arrow data_mask
-  filters <- lapply(expanded_filters, arrow_eval, arrow_mask(out))
-  bad_filters <- map_lgl(filters, ~ inherits(., "try-error"))
-  if (any(bad_filters)) {
-    # This is similar to abandon_ship() except that the filter eval is
-    # vectorized, and we apply filters that _did_ work before abandoning ship
-    # with the rest
-    expr_labs <- map_chr(expanded_filters[bad_filters], format_expr)
-    if (query_on_dataset(out)) {
-      # Abort. We don't want to auto-collect if this is a Dataset because that
-      # could blow up, too big.
-      stop(
-        "Filter expression not supported for Arrow Datasets: ",
-        oxford_paste(expr_labs, quote = FALSE),
-        "\nCall collect() first to pull data into R.",
-        call. = FALSE
-      )
-    } else {
-      arrow_errors <- map2_chr(
-        filters[bad_filters], expr_labs,
-        handle_arrow_not_supported
-      )
-      if (length(arrow_errors) == 1) {
-        msg <- paste0(arrow_errors, "; ")
-      } else {
-        msg <- paste0("* ", arrow_errors, "\n", collapse = "")
+    # tidy-eval the filter expressions inside an Arrow data_mask
+    mask <- arrow_mask(out)
+    for (expr in expanded_filters) {
+      filt <- arrow_eval(expr, mask)
+      if (length(mask$.aggregations)) {
+        # dplyr lets you filter on e.g. x < mean(x), but we haven't implemented it.
+        # But we could, the same way it works in mutate() via join, if someone asks.
+        # Until then, just error.
+        # TODO: add a test for this
+        arrow_not_supported(
+          .actual_msg = "Expression not supported in filter() in Arrow",
+          call = expr
+        )
       }
-      warning(
-        msg, "pulling data into R",
-        immediate. = TRUE,
-        call. = FALSE
-      )
-      # Set any valid filters first, then collect and then apply the invalid ones in R
-      out <- dplyr::collect(set_filters(out, filters[!bad_filters]))
-      if (by$from_by) {
-        out <- dplyr::ungroup(out)
-      }
-      return(dplyr::filter(out, !!!expanded_filters[bad_filters], .by = {{ .by }}))
+      out <- set_filters(out, filt)
     }
-  }
-
-  out <- set_filters(out, filters)
 
-  if (by$from_by) {
-    out$group_by_vars <- character()
-  }
+    if (by$from_by) {
+      out$group_by_vars <- character()
+    }
 
-  out
+    out
+  })
 }
 filter.Dataset <- filter.ArrowTabular <- filter.RecordBatchReader <- filter.arrow_dplyr_query
 
diff --git a/r/R/dplyr-funcs-agg.R b/r/R/dplyr-funcs-agg.R
new file mode 100644
index 0000000000000..340ebe7adc90f
--- /dev/null
+++ b/r/R/dplyr-funcs-agg.R
@@ -0,0 +1,198 @@
+# 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.
+
+# Aggregation functions
+#
+# These all insert into an .aggregations list in the mask, a list containing:
+# @param fun string function name
+# @param data list of 0 or more Expressions
+# @param options list of function options, as passed to call_function
+# The functions return a FieldRef pointing to the result of the aggregation.
+#
+# For group-by aggregation, `hash_` gets prepended to the function name when
+# the query is executed.
+# So to see a list of available hash aggregation functions,
+# you can use list_compute_functions("^hash_")
+
+register_bindings_aggregate <- function() {
+  register_binding("base::sum", function(..., na.rm = FALSE) {
+    set_agg(
+      fun = "sum",
+      data = ensure_one_arg(list2(...), "sum"),
+      options = list(skip_nulls = na.rm, min_count = 0L)
+    )
+  })
+  register_binding("base::prod", function(..., na.rm = FALSE) {
+    set_agg(
+      fun = "product",
+      data = ensure_one_arg(list2(...), "prod"),
+      options = list(skip_nulls = na.rm, min_count = 0L)
+    )
+  })
+  register_binding("base::any", function(..., na.rm = FALSE) {
+    set_agg(
+      fun = "any",
+      data = ensure_one_arg(list2(...), "any"),
+      options = list(skip_nulls = na.rm, min_count = 0L)
+    )
+  })
+  register_binding("base::all", function(..., na.rm = FALSE) {
+    set_agg(
+      fun = "all",
+      data = ensure_one_arg(list2(...), "all"),
+      options = list(skip_nulls = na.rm, min_count = 0L)
+    )
+  })
+  register_binding("base::mean", function(x, na.rm = FALSE) {
+    set_agg(
+      fun = "mean",
+      data = list(x),
+      options = list(skip_nulls = na.rm, min_count = 0L)
+    )
+  })
+  register_binding("stats::sd", function(x, na.rm = FALSE, ddof = 1) {
+    set_agg(
+      fun = "stddev",
+      data = list(x),
+      options = list(skip_nulls = na.rm, min_count = 0L, ddof = ddof)
+    )
+  })
+  register_binding("stats::var", function(x, na.rm = FALSE, ddof = 1) {
+    set_agg(
+      fun = "variance",
+      data = list(x),
+      options = list(skip_nulls = na.rm, min_count = 0L, ddof = ddof)
+    )
+  })
+  register_binding(
+    "stats::quantile",
+    function(x, probs, na.rm = FALSE) {
+      if (length(probs) != 1) {
+        arrow_not_supported("quantile() with length(probs) != 1")
+      }
+      # TODO: Bind to the Arrow function that returns an exact quantile and remove
+      # this warning (ARROW-14021)
+      warn(
+        "quantile() currently returns an approximate quantile in Arrow",
+        .frequency = "once",
+        .frequency_id = "arrow.quantile.approximate",
+        class = "arrow.quantile.approximate"
+      )
+      set_agg(
+        fun = "tdigest",
+        data = list(x),
+        options = list(skip_nulls = na.rm, q = probs)
+      )
+    },
+    notes = c(
+      "`probs` must be length 1;",
+      "approximate quantile (t-digest) is computed"
+    )
+  )
+  register_binding(
+    "stats::median",
+    function(x, na.rm = FALSE) {
+      # TODO: Bind to the Arrow function that returns an exact median and remove
+      # this warning (ARROW-14021)
+      warn(
+        "median() currently returns an approximate median in Arrow",
+        .frequency = "once",
+        .frequency_id = "arrow.median.approximate",
+        class = "arrow.median.approximate"
+      )
+      set_agg(
+        fun = "approximate_median",
+        data = list(x),
+        options = list(skip_nulls = na.rm)
+      )
+    },
+    notes = "approximate median (t-digest) is computed"
+  )
+  register_binding("dplyr::n_distinct", function(..., na.rm = FALSE) {
+    set_agg(
+      fun = "count_distinct",
+      data = ensure_one_arg(list2(...), "n_distinct"),
+      options = list(na.rm = na.rm)
+    )
+  })
+  register_binding("dplyr::n", function() {
+    set_agg(
+      fun = "count_all",
+      data = list(),
+      options = list()
+    )
+  })
+  register_binding("base::min", function(..., na.rm = FALSE) {
+    set_agg(
+      fun = "min",
+      data = ensure_one_arg(list2(...), "min"),
+      options = list(skip_nulls = na.rm, min_count = 0L)
+    )
+  })
+  register_binding("base::max", function(..., na.rm = FALSE) {
+    set_agg(
+      fun = "max",
+      data = ensure_one_arg(list2(...), "max"),
+      options = list(skip_nulls = na.rm, min_count = 0L)
+    )
+  })
+}
+
+set_agg <- function(...) {
+  agg_data <- list2(...)
+  # Find the environment where .aggregations is stored
+  target <- find_arrow_mask()
+  aggs <- get(".aggregations", target)
+  lapply(agg_data[["data"]], function(expr) {
+    # If any of the fields referenced in the expression are in .aggregations,
+    # then we can't aggregate over them.
+    # This is mainly for combinations of dataset columns and aggregations,
+    # like sum(x - mean(x)), i.e. window functions.
+    # This will reject (sum(sum(x)) as well, but that's not a useful operation.
+    if (any(expr$field_names_in_expression() %in% names(aggs))) {
+      arrow_not_supported("aggregate within aggregate expression")
+    }
+  })
+
+  # Record the (fun, data, options) in .aggregations
+  # and return a FieldRef pointing to it
+  tmpname <- paste0("..temp", length(aggs))
+  aggs[[tmpname]] <- agg_data
+  assign(".aggregations", aggs, envir = target)
+  Expression$field_ref(tmpname)
+}
+
+find_arrow_mask <- function() {
+  # Find the arrow_mask environment by looking for .aggregations,
+  # it's in parent.env of something in the call stack
+  n <- 1
+  while (TRUE) {
+    if (exists(".aggregations", envir = caller_env(n))) {
+      return(caller_env(n))
+    }
+    n <- n + 1
+  }
+}
+
+ensure_one_arg <- function(args, fun) {
+  if (length(args) == 0) {
+    arrow_not_supported(paste0(fun, "() with 0 arguments"))
+  } else if (length(args) > 1) {
+    arrow_not_supported(paste0("Multiple arguments to ", fun, "()"))
+  }
+  args
+}
diff --git a/r/R/dplyr-funcs-conditional.R b/r/R/dplyr-funcs-conditional.R
index b9639f00295ce..3ab955aa8aee4 100644
--- a/r/R/dplyr-funcs-conditional.R
+++ b/r/R/dplyr-funcs-conditional.R
@@ -37,7 +37,7 @@ register_bindings_conditional <- function() {
   register_binding("dplyr::coalesce", function(...) {
     args <- list2(...)
     if (length(args) < 1) {
-      abort("At least one argument must be supplied to coalesce()")
+      validation_error("At least one argument must be supplied to coalesce()")
     }
 
     # Treat NaN like NA for consistency with dplyr::coalesce(), but if *all*
@@ -102,7 +102,7 @@ register_bindings_conditional <- function() {
     formulas <- list2(...)
     n <- length(formulas)
     if (n == 0) {
-      abort("No cases provided in case_when()")
+      validation_error("No cases provided")
     }
     query <- vector("list", n)
     value <- vector("list", n)
@@ -110,20 +110,17 @@ register_bindings_conditional <- function() {
     for (i in seq_len(n)) {
       f <- formulas[[i]]
       if (!inherits(f, "formula")) {
-        abort("Each argument to case_when() must be a two-sided formula")
+        validation_error("Each argument to case_when() must be a two-sided formula")
       }
       query[[i]] <- arrow_eval(f[[2]], mask)
       value[[i]] <- arrow_eval(f[[3]], mask)
       if (!call_binding("is.logical", query[[i]])) {
-        abort("Left side of each formula in case_when() must be a logical expression")
-      }
-      if (inherits(value[[i]], "try-error")) {
-        abort(handle_arrow_not_supported(value[[i]], format_expr(f[[3]])))
+        validation_error("Left side of each formula in case_when() must be a logical expression")
       }
     }
     if (!is.null(.default)) {
       if (length(.default) != 1) {
-        abort(paste0("`.default` must have size 1, not size ", length(.default), "."))
+        validation_error(paste0("`.default` must have size 1, not size ", length(.default), "."))
       }
 
       query[n + 1] <- TRUE
@@ -140,6 +137,5 @@ register_bindings_conditional <- function() {
         value
       )
     )
-  }, notes = "`.ptype` and `.size` arguments not supported"
-  )
+  }, notes = "`.ptype` and `.size` arguments not supported")
 }
diff --git a/r/R/dplyr-funcs-datetime.R b/r/R/dplyr-funcs-datetime.R
index 440210afd630c..5e6ac4a1035f8 100644
--- a/r/R/dplyr-funcs-datetime.R
+++ b/r/R/dplyr-funcs-datetime.R
@@ -121,7 +121,7 @@ register_bindings_datetime_utility <- function() {
       precision <- "ymdhms"
     }
     if (!precision %in% names(ISO8601_precision_map)) {
-      abort(
+      validation_error(
         paste(
           "`precision` must be one of the following values:",
           paste(names(ISO8601_precision_map), collapse = ", "),
@@ -325,10 +325,10 @@ register_bindings_datetime_conversion <- function() {
              origin = "1970-01-01",
              tz = "UTC") {
       if (is.null(format) && length(tryFormats) > 1) {
-        abort(
-          paste(
-            "`as.Date()` with multiple `tryFormats` is not supported in Arrow.",
-            "Consider using the lubridate specialised parsing functions `ymd()`, `ymd()`, etc."
+        arrow_not_supported(
+          "`as.Date()` with multiple `tryFormats`",
+          body = c(
+            ">" = "Consider using the lubridate specialised parsing functions `ymd()`, `ymd()`, etc."
           )
         )
       }
@@ -455,15 +455,13 @@ register_bindings_datetime_timezone <- function() {
         arrow_not_supported("`roll_dst` must be 1 or 2 items long; other lengths")
       }
 
-      nonexistent <- switch(
-        roll_dst[1],
+      nonexistent <- switch(roll_dst[1],
         "error" = 0L,
         "boundary" = 2L,
         arrow_not_supported("`roll_dst` value must be 'error' or 'boundary' for nonexistent times; other values")
       )
 
-      ambiguous <- switch(
-        roll_dst[2],
+      ambiguous <- switch(roll_dst[2],
         "error" = 0L,
         "pre" = 1L,
         "post" = 2L,
@@ -651,7 +649,7 @@ register_bindings_duration_helpers <- function() {
   register_binding(
     "lubridate::dpicoseconds",
     function(x = 1) {
-      abort("Duration in picoseconds not supported in Arrow.")
+      arrow_not_supported("Duration in picoseconds")
     },
     notes = "not supported"
   )
diff --git a/r/R/dplyr-funcs-doc.R b/r/R/dplyr-funcs-doc.R
index 2042f800142b7..7f0627c33d010 100644
--- a/r/R/dplyr-funcs-doc.R
+++ b/r/R/dplyr-funcs-doc.R
@@ -36,7 +36,7 @@
 #' which returns an `arrow` [Table], or `collect()`, which pulls the resulting
 #' Table into an R `tibble`.
 #'
-#' * [`anti_join()`][dplyr::anti_join()]: the `copy` and `na_matches` arguments are ignored
+#' * [`anti_join()`][dplyr::anti_join()]: the `copy` argument is ignored
 #' * [`arrange()`][dplyr::arrange()]
 #' * [`collapse()`][dplyr::collapse()]
 #' * [`collect()`][dplyr::collect()]
@@ -45,22 +45,22 @@
 #' * [`distinct()`][dplyr::distinct()]: `.keep_all = TRUE` not supported
 #' * [`explain()`][dplyr::explain()]
 #' * [`filter()`][dplyr::filter()]
-#' * [`full_join()`][dplyr::full_join()]: the `copy` and `na_matches` arguments are ignored
+#' * [`full_join()`][dplyr::full_join()]: the `copy` argument is ignored
 #' * [`glimpse()`][dplyr::glimpse()]
 #' * [`group_by()`][dplyr::group_by()]
 #' * [`group_by_drop_default()`][dplyr::group_by_drop_default()]
 #' * [`group_vars()`][dplyr::group_vars()]
 #' * [`groups()`][dplyr::groups()]
-#' * [`inner_join()`][dplyr::inner_join()]: the `copy` and `na_matches` arguments are ignored
-#' * [`left_join()`][dplyr::left_join()]: the `copy` and `na_matches` arguments are ignored
-#' * [`mutate()`][dplyr::mutate()]: window functions (e.g. things that require aggregation within groups) not currently supported
+#' * [`inner_join()`][dplyr::inner_join()]: the `copy` argument is ignored
+#' * [`left_join()`][dplyr::left_join()]: the `copy` argument is ignored
+#' * [`mutate()`][dplyr::mutate()]
 #' * [`pull()`][dplyr::pull()]: the `name` argument is not supported; returns an R vector by default but this behavior is deprecated and will return an Arrow [ChunkedArray] in a future release. Provide `as_vector = TRUE/FALSE` to control this behavior, or set `options(arrow.pull_as_vector)` globally.
 #' * [`relocate()`][dplyr::relocate()]
 #' * [`rename()`][dplyr::rename()]
 #' * [`rename_with()`][dplyr::rename_with()]
-#' * [`right_join()`][dplyr::right_join()]: the `copy` and `na_matches` arguments are ignored
+#' * [`right_join()`][dplyr::right_join()]: the `copy` argument is ignored
 #' * [`select()`][dplyr::select()]
-#' * [`semi_join()`][dplyr::semi_join()]: the `copy` and `na_matches` arguments are ignored
+#' * [`semi_join()`][dplyr::semi_join()]: the `copy` argument is ignored
 #' * [`show_query()`][dplyr::show_query()]
 #' * [`slice_head()`][dplyr::slice_head()]: slicing within groups not supported; Arrow datasets do not have row order, so head is non-deterministic; `prop` only supported on queries where `nrow()` is knowable without evaluating
 #' * [`slice_max()`][dplyr::slice_max()]: slicing within groups not supported; `with_ties = TRUE` (dplyr default) is not supported; `prop` only supported on queries where `nrow()` is knowable without evaluating
diff --git a/r/R/dplyr-funcs-simple.R b/r/R/dplyr-funcs-simple.R
index 308a46601a6db..4ccc2498435b3 100644
--- a/r/R/dplyr-funcs-simple.R
+++ b/r/R/dplyr-funcs-simple.R
@@ -177,7 +177,7 @@ common_type <- function(exprs) {
     # * pmin/pmax
     return(first_type)
   }
-  stop("There is no common type in these expressions")
+  validation_error("There is no common type in these expressions")
 }
 
 cast_or_parse <- function(x, type) {
diff --git a/r/R/dplyr-funcs-string.R b/r/R/dplyr-funcs-string.R
index a21ce78edd189..77e1a5405a692 100644
--- a/r/R/dplyr-funcs-string.R
+++ b/r/R/dplyr-funcs-string.R
@@ -134,9 +134,9 @@ format_string_replacement <- function(replacement, ignore.case, fixed) {
 # Arrow locale will be supported with ARROW-14126
 stop_if_locale_provided <- function(locale) {
   if (!identical(locale, "en")) {
-    stop("Providing a value for 'locale' other than the default ('en') is not supported in Arrow. ",
-      "To change locale, use 'Sys.setlocale()'",
-      call. = FALSE
+    arrow_not_supported(
+      "Providing a value for 'locale' other than the default ('en')",
+      body = c(">" = "To change locale, use 'Sys.setlocale()'")
     )
   }
 }
@@ -158,10 +158,11 @@ register_bindings_string_join <- function() {
         # handle scalar literal args, and cast all args to string for
         # consistency with base::paste(), base::paste0(), and stringr::str_c()
         if (!inherits(arg, "Expression")) {
-          assert_that(
-            length(arg) == 1,
-            msg = "Literal vectors of length != 1 not supported in string concatenation"
-          )
+          if (length(arg) != 1) {
+            arrow_not_supported(
+              "Literal vectors of length != 1 in string concatenation"
+            )
+          }
           Expression$scalar(as.character(arg))
         } else {
           call_binding("as.character", arg)
@@ -181,12 +182,11 @@ register_bindings_string_join <- function() {
   register_binding(
     "base::paste",
     function(..., sep = " ", collapse = NULL, recycle0 = FALSE) {
-      assert_that(
-        is.null(collapse),
-        msg = "paste() with the collapse argument is not yet supported in Arrow"
-      )
-      if (!inherits(sep, "Expression")) {
-        assert_that(!is.na(sep), msg = "Invalid separator")
+      if (!is.null(collapse)) {
+        arrow_not_supported("`collapse` argument")
+      }
+      if (!inherits(sep, "Expression") && is.na(sep)) {
+        validation_error("Invalid separator")
       }
       arrow_string_join_function(NullHandlingBehavior$REPLACE, "NA")(..., sep)
     },
@@ -196,10 +196,9 @@ register_bindings_string_join <- function() {
   register_binding(
     "base::paste0",
     function(..., collapse = NULL, recycle0 = FALSE) {
-      assert_that(
-        is.null(collapse),
-        msg = "paste0() with the collapse argument is not yet supported in Arrow"
-      )
+      if (!is.null(collapse)) {
+        arrow_not_supported("`collapse` argument")
+      }
       arrow_string_join_function(NullHandlingBehavior$REPLACE, "NA")(..., "")
     },
     notes = "the `collapse` argument is not yet supported"
@@ -208,12 +207,11 @@ register_bindings_string_join <- function() {
   register_binding(
     "stringr::str_c",
     function(..., sep = "", collapse = NULL) {
-      assert_that(
-        is.null(collapse),
-        msg = "str_c() with the collapse argument is not yet supported in Arrow"
-      )
-      if (!inherits(sep, "Expression")) {
-        assert_that(!is.na(sep), msg = "`sep` must be a single string, not `NA`.")
+      if (!is.null(collapse)) {
+        arrow_not_supported("`collapse` argument")
+      }
+      if (!inherits(sep, "Expression") && is.na(sep)) {
+        validation_error("`sep` must be a single string, not `NA`.")
       }
       arrow_string_join_function(NullHandlingBehavior$EMIT_NULL)(..., sep)
     },
@@ -352,10 +350,10 @@ register_bindings_string_regex <- function() {
   arrow_r_string_replace_function <- function(max_replacements) {
     function(pattern, replacement, x, ignore.case = FALSE, fixed = FALSE) {
       if (length(pattern) != 1) {
-        stop("`pattern` must be a length 1 character vector")
+        validation_error("`pattern` must be a length 1 character vector")
       }
       if (length(replacement) != 1) {
-        stop("`replacement` must be a length 1 character vector")
+        validation_error("`replacement` must be a length 1 character vector")
       }
       Expression$create(
         ifelse(fixed && !ignore.case, "replace_substring", "replace_substring_regex"),
@@ -512,14 +510,12 @@ register_bindings_string_other <- function() {
   register_binding(
     "base::substr",
     function(x, start, stop) {
-      assert_that(
-        length(start) == 1,
-        msg = "`start` must be length 1 - other lengths are not supported in Arrow"
-      )
-      assert_that(
-        length(stop) == 1,
-        msg = "`stop` must be length 1 - other lengths are not supported in Arrow"
-      )
+      if (length(start) != 1) {
+        arrow_not_supported("`start` must be length 1 - other lengths")
+      }
+      if (length(stop) != 1) {
+        arrow_not_supported("`stop` must be length 1 - other lengths")
+      }
 
       # substr treats values as if they're on a continuous number line, so values
       # 0 are effectively blank characters - set `start` to 1 here so Arrow mimics
@@ -561,14 +557,12 @@ register_bindings_string_other <- function() {
   })
 
   register_binding("stringr::str_sub", function(string, start = 1L, end = -1L) {
-    assert_that(
-      length(start) == 1,
-      msg = "`start` must be length 1 - other lengths are not supported in Arrow"
-    )
-    assert_that(
-      length(end) == 1,
-      msg = "`end` must be length 1 - other lengths are not supported in Arrow"
-    )
+    if (length(start) != 1) {
+      arrow_not_supported("`start` must be length 1 - other lengths")
+    }
+    if (length(end) != 1) {
+      arrow_not_supported("`end` must be length 1 - other lengths")
+    }
 
     # In stringr::str_sub, an `end` value of -1 means the end of the string, so
     # set it to the maximum integer to match this behavior
diff --git a/r/R/dplyr-funcs-type.R b/r/R/dplyr-funcs-type.R
index f244682737cb4..85c26ec05c8ba 100644
--- a/r/R/dplyr-funcs-type.R
+++ b/r/R/dplyr-funcs-type.R
@@ -105,7 +105,7 @@ register_bindings_type_cast <- function() {
     } else if (inherits(class2, "DataType")) {
       object$type() == as_type(class2)
     } else {
-      stop("Second argument to is() is not a string or DataType", call. = FALSE)
+      validation_error("Second argument to is() is not a string or DataType")
     }
   })
 
@@ -140,7 +140,7 @@ register_bindings_type_cast <- function() {
              fix.empty.names = TRUE,
              stringsAsFactors = FALSE) {
       # we need a specific value of stringsAsFactors because the default was
-      # TRUE in R <= 3.6
+      # TRUE in R <= 3.6 and folks might still be cargoculting to stay in the past.
       if (!identical(stringsAsFactors, FALSE)) {
         arrow_not_supported("stringsAsFactors = TRUE")
       }
@@ -219,7 +219,10 @@ register_bindings_type_inspect <- function() {
     call_binding("is.character", x)
   })
   register_binding("rlang::is_double", function(x, n = NULL, finite = NULL) {
-    assert_that(is.null(n) && is.null(finite))
+    assert_that(is.null(n))
+    if (!is.null(finite)) {
+      arrow_not_supported("`finite` argument")
+    }
     call_binding("is.double", x)
   })
   register_binding("rlang::is_integer", function(x, n = NULL) {
diff --git a/r/R/dplyr-funcs.R b/r/R/dplyr-funcs.R
index 956e31fe2bfdd..c0eb47e428b7f 100644
--- a/r/R/dplyr-funcs.R
+++ b/r/R/dplyr-funcs.R
@@ -22,8 +22,8 @@ NULL
 
 #' Register compute bindings
 #'
-#' The `register_binding()` and `register_binding_agg()` functions
-#' are used to populate a list of functions that operate on (and return)
+#' `register_binding()` is used to populate a list of functions that operate on
+#' (and return)
 #' Expressions. These are the basis for the `.data` mask inside dplyr methods.
 #'
 #' @section Writing bindings:
@@ -40,26 +40,10 @@ NULL
 #' * Inside your function, you can call any other binding with `call_binding()`.
 #'
 #' @param fun_name A string containing a function name in the form `"function"` or
-#'   `"package::function"`. The package name is currently not used but
-#'   may be used in the future to allow these types of function calls.
-#' @param fun A function or `NULL` to un-register a previous function.
+#'   `"package::function"`.
+#' @param fun A function, or `NULL` to un-register a previous function.
 #'   This function must accept `Expression` objects as arguments and return
 #'   `Expression` objects instead of regular R objects.
-#' @param agg_fun An aggregate function or `NULL` to un-register a previous
-#'   aggregate function. This function must accept `Expression` objects as
-#'   arguments and return a `list()` with components:
-#'   - `fun`: string function name
-#'   - `data`: list of 0 or more `Expression`s
-#'   - `options`: list of function options, as passed to call_function
-#' @param update_cache Update .cache$functions at the time of registration.
-#'   the default is FALSE because the majority of usage is to register
-#'   bindings at package load, after which we create the cache once. The
-#'   reason why .cache$functions is needed in addition to nse_funcs for
-#'   non-aggregate functions could be revisited...it is currently used
-#'   as the data mask in mutate, filter, and aggregate (but not
-#'   summarise) because the data mask has to be a list.
-#' @param registry An environment in which the functions should be
-#'   assigned.
 #' @param notes string for the docs: note any limitations or differences in
 #'   behavior between the Arrow version and the R function.
 #' @return The previously registered binding or `NULL` if no previously
@@ -67,12 +51,10 @@ NULL
 #' @keywords internal
 register_binding <- function(fun_name,
                              fun,
-                             registry = nse_funcs,
-                             update_cache = FALSE,
                              notes = character(0)) {
   unqualified_name <- sub("^.*?:{+}", "", fun_name)
 
-  previous_fun <- registry[[unqualified_name]]
+  previous_fun <- .cache$functions[[unqualified_name]]
 
   # if the unqualified name exists in the registry, warn
   if (!is.null(previous_fun) && !identical(fun, previous_fun)) {
@@ -87,58 +69,25 @@ register_binding <- function(fun_name,
 
   # register both as `pkg::fun` and as `fun` if `qualified_name` is prefixed
   # unqualified_name and fun_name will be the same if not prefixed
-  registry[[unqualified_name]] <- fun
-  registry[[fun_name]] <- fun
-
+  .cache$functions[[unqualified_name]] <- fun
+  .cache$functions[[fun_name]] <- fun
   .cache$docs[[fun_name]] <- notes
-
-  if (update_cache) {
-    fun_cache <- .cache$functions
-    fun_cache[[unqualified_name]] <- fun
-    fun_cache[[fun_name]] <- fun
-    .cache$functions <- fun_cache
-  }
-
   invisible(previous_fun)
 }
 
-unregister_binding <- function(fun_name, registry = nse_funcs,
-                               update_cache = FALSE) {
+unregister_binding <- function(fun_name) {
   unqualified_name <- sub("^.*?:{+}", "", fun_name)
-  previous_fun <- registry[[unqualified_name]]
-
-  rm(
-    list = unique(c(fun_name, unqualified_name)),
-    envir = registry,
-    inherits = FALSE
-  )
+  previous_fun <- .cache$functions[[unqualified_name]]
 
-  if (update_cache) {
-    fun_cache <- .cache$functions
-    fun_cache[[unqualified_name]] <- NULL
-    fun_cache[[fun_name]] <- NULL
-    .cache$functions <- fun_cache
-  }
+  .cache$functions[[unqualified_name]] <- NULL
+  .cache$functions[[fun_name]] <- NULL
 
   invisible(previous_fun)
 }
 
-#' @rdname register_binding
-#' @keywords internal
-register_binding_agg <- function(fun_name,
-                                 agg_fun,
-                                 registry = agg_funcs,
-                                 notes = character(0)) {
-  register_binding(fun_name, agg_fun, registry = registry, notes = notes)
-}
-
 # Supports functions and tests that call previously-defined bindings
 call_binding <- function(fun_name, ...) {
-  nse_funcs[[fun_name]](...)
-}
-
-call_binding_agg <- function(fun_name, ...) {
-  agg_funcs[[fun_name]](...)
+  .cache$functions[[fun_name]](...)
 }
 
 create_binding_cache <- function() {
@@ -147,7 +96,7 @@ create_binding_cache <- function() {
 
   # Register all available Arrow Compute functions, namespaced as arrow_fun.
   all_arrow_funs <- list_compute_functions()
-  arrow_funcs <- set_names(
+  .cache$functions <- set_names(
     lapply(all_arrow_funs, function(fun) {
       force(fun)
       function(...) Expression$create(fun, ...)
@@ -155,7 +104,7 @@ create_binding_cache <- function() {
     paste0("arrow_", all_arrow_funs)
   )
 
-  # Register bindings into nse_funcs and agg_funcs
+  # Register bindings into the cache
   register_bindings_array_function_map()
   register_bindings_aggregate()
   register_bindings_conditional()
@@ -165,25 +114,17 @@ create_binding_cache <- function() {
   register_bindings_type()
   register_bindings_augmented()
 
-  # We only create the cache for nse_funcs and not agg_funcs
-  .cache$functions <- c(as.list(nse_funcs), arrow_funcs)
-}
-
-# environments in the arrow namespace used in the above functions
-nse_funcs <- new.env(parent = emptyenv())
-agg_funcs <- new.env(parent = emptyenv())
-.cache <- new.env(parent = emptyenv())
+  .cache$functions[["::"]] <- function(lhs, rhs) {
+    lhs_name <- as.character(substitute(lhs))
+    rhs_name <- as.character(substitute(rhs))
 
-# we register 2 versions of the "::" binding - one for use with nse_funcs
-# (registered below) and another one for use with agg_funcs (registered in
-# dplyr-summarize.R)
-nse_funcs[["::"]] <- function(lhs, rhs) {
-  lhs_name <- as.character(substitute(lhs))
-  rhs_name <- as.character(substitute(rhs))
+    fun_name <- paste0(lhs_name, "::", rhs_name)
 
-  fun_name <- paste0(lhs_name, "::", rhs_name)
-
-  # if we do not have a binding for pkg::fun, then fall back on to the
-  # regular pkg::fun function
-  nse_funcs[[fun_name]] %||% asNamespace(lhs_name)[[rhs_name]]
+    # if we do not have a binding for pkg::fun, then fall back on to the
+    # regular pkg::fun function
+    .cache$functions[[fun_name]] %||% asNamespace(lhs_name)[[rhs_name]]
+  }
 }
+
+# environment in the arrow namespace used in the above functions
+.cache <- new.env(parent = emptyenv())
diff --git a/r/R/dplyr-join.R b/r/R/dplyr-join.R
index 39237f574bd28..e76e041a54277 100644
--- a/r/R/dplyr-join.R
+++ b/r/R/dplyr-join.R
@@ -25,14 +25,15 @@ do_join <- function(x,
                     suffix = c(".x", ".y"),
                     ...,
                     keep = FALSE,
-                    na_matches,
+                    na_matches = c("na", "never"),
                     join_type) {
   # TODO: handle `copy` arg: ignore?
-  # TODO: handle `na_matches` arg
   x <- as_adq(x)
   y <- as_adq(y)
   by <- handle_join_by(by, x, y)
 
+  na_matches <- match.arg(na_matches)
+
   # For outer joins, we need to output the join keys on both sides so we
   # can coalesce them afterwards.
   left_output <- if (!keep && join_type == "RIGHT_OUTER") {
@@ -54,7 +55,8 @@ do_join <- function(x,
     left_output = left_output,
     right_output = right_output,
     suffix = suffix,
-    keep = keep
+    keep = keep,
+    na_matches = na_matches == "na"
   )
   collapse.arrow_dplyr_query(x)
 }
diff --git a/r/R/dplyr-mutate.R b/r/R/dplyr-mutate.R
index 287532dee08a9..fcb1cedbbb168 100644
--- a/r/R/dplyr-mutate.R
+++ b/r/R/dplyr-mutate.R
@@ -24,105 +24,116 @@ mutate.arrow_dplyr_query <- function(.data,
                                      .keep = c("all", "used", "unused", "none"),
                                      .before = NULL,
                                      .after = NULL) {
-  call <- match.call()
-  out <- as_adq(.data)
+  try_arrow_dplyr({
+    out <- as_adq(.data)
 
-  by <- compute_by({{ .by }}, out, by_arg = ".by", data_arg = ".data")
+    by <- compute_by({{ .by }}, out, by_arg = ".by", data_arg = ".data")
 
-  if (by$from_by) {
-    out$group_by_vars <- by$names
-  }
-  grv <- out$group_by_vars
-  expression_list <- expand_across(out, quos(...), exclude_cols = grv)
-  exprs <- ensure_named_exprs(expression_list)
+    if (by$from_by) {
+      out$group_by_vars <- by$names
+    }
+    grv <- out$group_by_vars
+    expression_list <- expand_across(out, quos(...), exclude_cols = grv)
+    exprs <- ensure_named_exprs(expression_list)
 
-  .keep <- match.arg(.keep)
-  .before <- enquo(.before)
-  .after <- enquo(.after)
+    .keep <- match.arg(.keep)
+    .before <- enquo(.before)
+    .after <- enquo(.after)
 
-  if (.keep %in% c("all", "unused") && length(exprs) == 0) {
-    # Nothing to do
-    return(out)
-  }
+    if (.keep %in% c("all", "unused") && length(exprs) == 0) {
+      # Nothing to do
+      return(out)
+    }
 
-  # Restrict the cases we support for now
-  has_aggregations <- any(unlist(lapply(exprs, all_funs)) %in% names(agg_funcs))
-  if (has_aggregations) {
-    # ARROW-13926
-    # mutate() on a grouped dataset does calculations within groups
-    # This doesn't matter on scalar ops (arithmetic etc.) but it does
-    # for things with aggregations (e.g. subtracting the mean)
-    return(abandon_ship(call, .data, "window functions not currently supported in Arrow"))
-  }
+    # Create a mask with aggregation functions in it
+    # If there are any aggregations, we will need to compute them and
+    # and join the results back in, for "window functions" like x - mean(x)
+    mask <- arrow_mask(out)
+    # Evaluate the mutate expressions
+    results <- list()
+    for (i in seq_along(exprs)) {
+      # Iterate over the indices and not the names because names may be repeated
+      # (which overwrites the previous name)
+      new_var <- names(exprs)[i]
+      results[[new_var]] <- arrow_eval(exprs[[i]], mask)
+      if (!inherits(results[[new_var]], "Expression") &&
+        !is.null(results[[new_var]])) {
+        # We need some wrapping to handle literal values
+        if (length(results[[new_var]]) != 1) {
+          arrow_not_supported("Recycling values of length != 1", call = exprs[[i]])
+        }
+        results[[new_var]] <- Expression$scalar(results[[new_var]])
+      }
+      # Put it in the data mask too
+      mask[[new_var]] <- mask$.data[[new_var]] <- results[[new_var]]
+    }
 
-  mask <- arrow_mask(out)
-  results <- list()
-  for (i in seq_along(exprs)) {
-    # Iterate over the indices and not the names because names may be repeated
-    # (which overwrites the previous name)
-    new_var <- names(exprs)[i]
-    results[[new_var]] <- arrow_eval(exprs[[i]], mask)
-    if (inherits(results[[new_var]], "try-error")) {
-      msg <- handle_arrow_not_supported(
-        results[[new_var]],
-        format_expr(exprs[[i]])
-      )
-      return(abandon_ship(call, .data, msg))
-    } else if (!inherits(results[[new_var]], "Expression") &&
-      !is.null(results[[new_var]])) {
-      # We need some wrapping to handle literal values
-      if (length(results[[new_var]]) != 1) {
-        msg <- paste0("In ", new_var, " = ", format_expr(exprs[[i]]), ", only values of size one are recycled")
-        return(abandon_ship(call, .data, msg))
+    if (length(mask$.aggregations)) {
+      # Make a copy of .data, do the aggregations on it, and then left_join on
+      # the group_by variables.
+      agg_query <- as_adq(.data)
+      # These may be computed by .by, make sure they're set
+      agg_query$group_by_vars <- grv
+      agg_query$aggregations <- mask$.aggregations
+      agg_query <- collapse.arrow_dplyr_query(agg_query)
+      if (length(grv)) {
+        out <- left_join(out, agg_query, by = grv)
+      } else {
+        # If there are no group_by vars, add a scalar column to both and join on that
+        agg_query$selected_columns[["..tempjoin"]] <- Expression$scalar(1L)
+        out$selected_columns[["..tempjoin"]] <- Expression$scalar(1L)
+        out <- left_join(out, agg_query, by = "..tempjoin")
       }
-      results[[new_var]] <- Expression$scalar(results[[new_var]])
     }
-    # Put it in the data mask too
-    mask[[new_var]] <- mask$.data[[new_var]] <- results[[new_var]]
-  }
 
-  old_vars <- names(out$selected_columns)
-  # Note that this is names(exprs) not names(results):
-  # if results$new_var is NULL, that means we are supposed to remove it
-  new_vars <- names(exprs)
+    old_vars <- names(out$selected_columns)
+    # Note that this is names(exprs) not names(results):
+    # if results$new_var is NULL, that means we are supposed to remove it
+    new_vars <- names(exprs)
 
-  # Assign the new columns into the out$selected_columns
-  for (new_var in new_vars) {
-    out$selected_columns[[new_var]] <- results[[new_var]]
-  }
+    # Assign the new columns into the out$selected_columns
+    for (new_var in new_vars) {
+      out$selected_columns[[new_var]] <- results[[new_var]]
+    }
 
-  # Deduplicate new_vars and remove NULL columns from new_vars
-  new_vars <- intersect(union(new_vars, grv), names(out$selected_columns))
+    # Prune any ..temp columns from the result, which would have come from
+    # .aggregations
+    temps <- grepl("^\\.\\.temp", names(out$selected_columns))
+    out$selected_columns <- out$selected_columns[!temps]
 
-  # Respect .before and .after
-  if (!quo_is_null(.before) || !quo_is_null(.after)) {
-    new <- setdiff(new_vars, old_vars)
-    out <- dplyr::relocate(out, all_of(new), .before = !!.before, .after = !!.after)
-  }
+    # Deduplicate new_vars and remove NULL columns from new_vars
+    new_vars <- intersect(union(new_vars, grv), names(out$selected_columns))
 
-  # Respect .keep
-  if (.keep == "none") {
-    ## for consistency with dplyr, this appends new columns after existing columns
-    ## by specifying the order
-    new_cols_last <- c(intersect(old_vars, new_vars), setdiff(new_vars, old_vars))
-    out$selected_columns <- out$selected_columns[new_cols_last]
-  } else if (.keep != "all") {
-    # "used" or "unused"
-    used_vars <- unlist(lapply(exprs, all.vars), use.names = FALSE)
-    if (.keep == "used") {
-      out$selected_columns[setdiff(old_vars, used_vars)] <- NULL
-    } else {
-      # "unused"
-      out$selected_columns[intersect(old_vars, used_vars)] <- NULL
+    # Respect .before and .after
+    if (!quo_is_null(.before) || !quo_is_null(.after)) {
+      new <- setdiff(new_vars, old_vars)
+      out <- dplyr::relocate(out, all_of(new), .before = !!.before, .after = !!.after)
     }
-  }
 
-  if (by$from_by) {
-    out$group_by_vars <- character()
-  }
+    # Respect .keep
+    if (.keep == "none") {
+      ## for consistency with dplyr, this appends new columns after existing columns
+      ## by specifying the order
+      new_cols_last <- c(intersect(old_vars, new_vars), setdiff(new_vars, old_vars))
+      out$selected_columns <- out$selected_columns[new_cols_last]
+    } else if (.keep != "all") {
+      # "used" or "unused"
+      used_vars <- unlist(lapply(exprs, all.vars), use.names = FALSE)
+      if (.keep == "used") {
+        out$selected_columns[setdiff(old_vars, used_vars)] <- NULL
+      } else {
+        # "unused"
+        out$selected_columns[intersect(old_vars, used_vars)] <- NULL
+      }
+    }
+
+    if (by$from_by) {
+      out$group_by_vars <- character()
+    }
 
-  # Even if "none", we still keep group vars
-  ensure_group_vars(out)
+    # Even if "none", we still keep group vars
+    ensure_group_vars(out)
+  })
 }
 mutate.Dataset <- mutate.ArrowTabular <- mutate.RecordBatchReader <- mutate.arrow_dplyr_query
 
diff --git a/r/R/dplyr-slice.R b/r/R/dplyr-slice.R
index bcb6547f7c8e9..2173d897f1f9d 100644
--- a/r/R/dplyr-slice.R
+++ b/r/R/dplyr-slice.R
@@ -148,7 +148,7 @@ prop_to_n <- function(.data, prop) {
 
 validate_prop <- function(prop) {
   if (!is.numeric(prop) || length(prop) != 1 || is.na(prop) || prop < 0 || prop > 1) {
-    stop("`prop` must be a single numeric value between 0 and 1", call. = FALSE)
+    validation_error("`prop` must be a single numeric value between 0 and 1")
   }
 }
 
diff --git a/r/R/dplyr-summarize.R b/r/R/dplyr-summarize.R
index e2c70f9e89e42..f4fda0f13aabd 100644
--- a/r/R/dplyr-summarize.R
+++ b/r/R/dplyr-summarize.R
@@ -15,254 +15,103 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# Aggregation functions
-# These all return a list of:
-# @param fun string function name
-# @param data list of 0 or more Expressions
-# @param options list of function options, as passed to call_function
-# For group-by aggregation, `hash_` gets prepended to the function name.
-# So to see a list of available hash aggregation functions,
-# you can use list_compute_functions("^hash_")
-
-
-ensure_one_arg <- function(args, fun) {
-  if (length(args) == 0) {
-    arrow_not_supported(paste0(fun, "() with 0 arguments"))
-  } else if (length(args) > 1) {
-    arrow_not_supported(paste0("Multiple arguments to ", fun, "()"))
-  }
-  args
-}
-
-register_bindings_aggregate <- function() {
-  register_binding_agg("base::sum", function(..., na.rm = FALSE) {
-    list(
-      fun = "sum",
-      data = ensure_one_arg(list2(...), "sum"),
-      options = list(skip_nulls = na.rm, min_count = 0L)
-    )
-  })
-  register_binding_agg("base::prod", function(..., na.rm = FALSE) {
-    list(
-      fun = "product",
-      data = ensure_one_arg(list2(...), "prod"),
-      options = list(skip_nulls = na.rm, min_count = 0L)
-    )
-  })
-  register_binding_agg("base::any", function(..., na.rm = FALSE) {
-    list(
-      fun = "any",
-      data = ensure_one_arg(list2(...), "any"),
-      options = list(skip_nulls = na.rm, min_count = 0L)
-    )
-  })
-  register_binding_agg("base::all", function(..., na.rm = FALSE) {
-    list(
-      fun = "all",
-      data = ensure_one_arg(list2(...), "all"),
-      options = list(skip_nulls = na.rm, min_count = 0L)
-    )
-  })
-  register_binding_agg("base::mean", function(x, na.rm = FALSE) {
-    list(
-      fun = "mean",
-      data = list(x),
-      options = list(skip_nulls = na.rm, min_count = 0L)
-    )
-  })
-  register_binding_agg("stats::sd", function(x, na.rm = FALSE, ddof = 1) {
-    list(
-      fun = "stddev",
-      data = list(x),
-      options = list(skip_nulls = na.rm, min_count = 0L, ddof = ddof)
-    )
-  })
-  register_binding_agg("stats::var", function(x, na.rm = FALSE, ddof = 1) {
-    list(
-      fun = "variance",
-      data = list(x),
-      options = list(skip_nulls = na.rm, min_count = 0L, ddof = ddof)
-    )
-  })
-  register_binding_agg(
-    "stats::quantile",
-    function(x, probs, na.rm = FALSE) {
-      if (length(probs) != 1) {
-        arrow_not_supported("quantile() with length(probs) != 1")
-      }
-      # TODO: Bind to the Arrow function that returns an exact quantile and remove
-      # this warning (ARROW-14021)
-      warn(
-        "quantile() currently returns an approximate quantile in Arrow",
-        .frequency = "once",
-        .frequency_id = "arrow.quantile.approximate",
-        class = "arrow.quantile.approximate"
-      )
-      list(
-        fun = "tdigest",
-        data = list(x),
-        options = list(skip_nulls = na.rm, q = probs)
-      )
-    },
-    notes = c(
-      "`probs` must be length 1;",
-      "approximate quantile (t-digest) is computed"
-    )
-  )
-  register_binding_agg(
-    "stats::median",
-    function(x, na.rm = FALSE) {
-      # TODO: Bind to the Arrow function that returns an exact median and remove
-      # this warning (ARROW-14021)
-      warn(
-        "median() currently returns an approximate median in Arrow",
-        .frequency = "once",
-        .frequency_id = "arrow.median.approximate",
-        class = "arrow.median.approximate"
-      )
-      list(
-        fun = "approximate_median",
-        data = list(x),
-        options = list(skip_nulls = na.rm)
-      )
-    },
-    notes = "approximate median (t-digest) is computed"
-  )
-  register_binding_agg("dplyr::n_distinct", function(..., na.rm = FALSE) {
-    list(
-      fun = "count_distinct",
-      data = ensure_one_arg(list2(...), "n_distinct"),
-      options = list(na.rm = na.rm)
-    )
-  })
-  register_binding_agg("dplyr::n", function() {
-    list(
-      fun = "count_all",
-      data = list(),
-      options = list()
-    )
-  })
-  register_binding_agg("base::min", function(..., na.rm = FALSE) {
-    list(
-      fun = "min",
-      data = ensure_one_arg(list2(...), "min"),
-      options = list(skip_nulls = na.rm, min_count = 0L)
-    )
-  })
-  register_binding_agg("base::max", function(..., na.rm = FALSE) {
-    list(
-      fun = "max",
-      data = ensure_one_arg(list2(...), "max"),
-      options = list(skip_nulls = na.rm, min_count = 0L)
-    )
-  })
-}
-
-# we register 2 versions of the "::" binding - one for use with agg_funcs
-# (registered below) and another one for use with nse_funcs
-# (registered in dplyr-funcs.R)
-agg_funcs[["::"]] <- function(lhs, rhs) {
-  lhs_name <- as.character(substitute(lhs))
-  rhs_name <- as.character(substitute(rhs))
-
-  fun_name <- paste0(lhs_name, "::", rhs_name)
-
-  # if we do not have a binding for pkg::fun, then fall back on to the
-  # nse_funcs (useful when we have a regular function inside an aggregating one)
-  # and then, if searching nse_funcs fails too, fall back to the
-  # regular `pkg::fun()` function
-  agg_funcs[[fun_name]] %||% nse_funcs[[fun_name]] %||% asNamespace(lhs_name)[[rhs_name]]
-}
-
 # The following S3 methods are registered on load if dplyr is present
 
 summarise.arrow_dplyr_query <- function(.data, ..., .by = NULL, .groups = NULL) {
-  call <- match.call()
-  out <- as_adq(.data)
-
-  by <- compute_by({{ .by }}, out, by_arg = ".by", data_arg = ".data")
-
-  if (by$from_by) {
-    out$group_by_vars <- by$names
-    .groups <- "drop"
-  }
+  try_arrow_dplyr({
+    out <- as_adq(.data)
 
-  exprs <- expand_across(out, quos(...), exclude_cols = out$group_by_vars)
-
-  # Only retain the columns we need to do our aggregations
-  vars_to_keep <- unique(c(
-    unlist(lapply(exprs, all.vars)), # vars referenced in summarise
-    dplyr::group_vars(out) # vars needed for grouping
-  ))
-  # If exprs rely on the results of previous exprs
-  # (total = sum(x), mean = total / n())
-  # then not all vars will correspond to columns in the data,
-  # so don't try to select() them (use intersect() to exclude them)
-  # Note that this select() isn't useful for the Arrow summarize implementation
-  # because it will effectively project to keep what it needs anyway,
-  # but the data.frame fallback version does benefit from select here
-  out <- dplyr::select(out, intersect(vars_to_keep, names(out)))
-
-  # Try stuff, if successful return()
-  out <- try(do_arrow_summarize(out, !!!exprs, .groups = .groups), silent = TRUE)
-  if (inherits(out, "try-error")) {
-    out <- abandon_ship(call, .data, format(out))
-  }
+    by <- compute_by({{ .by }}, out, by_arg = ".by", data_arg = ".data")
+    if (by$from_by) {
+      out$group_by_vars <- by$names
+      .groups <- "drop"
+    }
 
-  out
+    exprs <- expand_across(out, quos(...), exclude_cols = out$group_by_vars)
+    do_arrow_summarize(out, !!!exprs, .groups = .groups)
+  })
 }
 summarise.Dataset <- summarise.ArrowTabular <- summarise.RecordBatchReader <- summarise.arrow_dplyr_query
 
 # This is the Arrow summarize implementation
 do_arrow_summarize <- function(.data, ..., .groups = NULL) {
   exprs <- ensure_named_exprs(quos(...))
-
-  # Create a stateful environment for recording our evaluated expressions
-  # It's more complex than other places because a single summarize() expr
-  # may result in multiple query nodes (Aggregate, Project),
-  # and we have to walk through the expressions to disentangle them.
-  ctx <- env(
-    mask = arrow_mask(.data, aggregation = TRUE),
-    aggregations = empty_named_list(),
-    post_mutate = empty_named_list()
+  # Do any pre-processing to the expressions we need
+  exprs <- map(
+    exprs,
+    adjust_summarize_expression,
+    hash = length(.data$group_by_vars) > 0
   )
+
+  # nolint start
+  # summarize() is complicated because you can do a mixture of scalar operations
+  # and aggregations, but that's not how Acero works. For example, for us to do
+  #   summarize(mean = sum(x) / n())
+  # we basically have to translate it into
+  #   summarize(..temp0 = sum(x), ..temp1 = n()) %>%
+  #   mutate(mean = ..temp0 / ..temp1) %>%
+  #   select(-starts_with("..temp"))
+  # That is, "first aggregate, then transform the result further."
+  #
+  # When we do filter() and mutate(), we just turn the user's code into a single
+  # Arrow Expression per column. But when we do summarize(), we have to pull out
+  # the aggregations, collect them in one list (that will become an Aggregate
+  # ExecNode), and in the expressions, replace them with FieldRefs so that
+  # further operations can happen (in what will become a ProjectNode that works
+  # on the result of the Aggregate).
+  # To do this, arrow_mask() includes a list called .aggregations,
+  # and the aggregation functions will pull out those terms and insert into
+  # that list.
+  # nolint end
+  mask <- arrow_mask(.data)
+
+  # We'll collect any transformations after the aggregation here.
+  # summarize_eval() returns NULL when the outer expression is an aggregation,
+  # i.e. there is no projection to do after
+  post_mutate <- empty_named_list()
   for (i in seq_along(exprs)) {
     # Iterate over the indices and not the names because names may be repeated
     # (which overwrites the previous name)
-    summarize_eval(
-      names(exprs)[i],
-      exprs[[i]],
-      ctx,
-      length(.data$group_by_vars) > 0
-    )
+    name <- names(exprs)[i]
+    post_mutate[[name]] <- summarize_eval(name, exprs[[i]], mask)
   }
 
   # Apply the results to the .data object.
   # First, the aggregations
-  .data$aggregations <- ctx$aggregations
+  .data$aggregations <- mask$.aggregations
   # Then collapse the query so that the resulting query object can have
   # additional operations applied to it
   out <- collapse.arrow_dplyr_query(.data)
-  # The expressions may have been translated into
-  # "first, aggregate, then transform the result further"
-  # nolint start
-  # For example,
-  #   summarize(mean = sum(x) / n())
-  # is effectively implemented as
-  #   summarize(..temp0 = sum(x), ..temp1 = n()) %>%
-  #   mutate(mean = ..temp0 / ..temp1) %>%
-  #   select(-starts_with("..temp"))
-  # If this is the case, there will be expressions in post_mutate
-  # nolint end
-  if (length(ctx$post_mutate)) {
-    # Append post_mutate, and make sure order is correct
-    # according to input exprs (also dropping ..temp columns)
-    out$selected_columns <- c(
-      out$selected_columns,
-      ctx$post_mutate
-    )[c(.data$group_by_vars, names(exprs))]
+
+  # Now, add the projections in post_mutate (if any)
+  for (post in names(post_mutate)) {
+    # One last check: it's possible that an expression like y - mean(y) would
+    # successfully evaluate, but it's not supported. It gets transformed to:
+    # nolint start
+    #   summarize(..temp0 = mean(y)) %>%
+    #   mutate(y - ..temp0)
+    # nolint end
+    # but y is not in the schema of the data after summarize(). To catch this
+    # in the expression evaluation step, we'd have to remove all data
+    # variables from the mask, which would be a bit tortured (even for me).
+    # So we'll check here.
+    # We can tell the expression is invalid if it references fields not in
+    # the schema of the data after summarize(). Evaulating its type will
+    # throw an error if it's invalid.
+    tryCatch(post_mutate[[post]]$type(out$.data$schema), error = function(e) {
+      arrow_not_supported(
+        "Expression is not a valid aggregation expression or is",
+        call = exprs[[post]]
+      )
+    })
+    # If it's valid, add it to the .data object
+    out$selected_columns[[post]] <- post_mutate[[post]]
   }
 
+  # Make sure column order is correct (and also drop ..temp columns)
+  col_order <- c(.data$group_by_vars, unique(names(exprs)))
+  out$selected_columns <- out$selected_columns[col_order]
+
   # If the object has .drop = FALSE and any group vars are dictionaries,
   # we can't (currently) preserve the empty rows that dplyr does,
   # so give a warning about that.
@@ -295,12 +144,18 @@ do_arrow_summarize <- function(.data, ..., .groups = NULL) {
     } else if (.groups == "keep") {
       out$group_by_vars <- .data$group_by_vars
     } else if (.groups == "rowwise") {
-      stop(arrow_not_supported('.groups = "rowwise"'))
+      arrow_not_supported(
+        '.groups = "rowwise"',
+        call = rlang::caller_call()
+      )
     } else if (.groups == "drop") {
       # collapse() preserves groups so remove them
       out <- dplyr::ungroup(out)
     } else {
-      stop(paste("Invalid .groups argument:", .groups))
+      validation_error(
+        paste("Invalid .groups argument:", .groups),
+        call = rlang::caller_call()
+      )
     }
     out$drop_empty_groups <- .data$drop_empty_groups
     if (getOption("arrow.summarise.sort", FALSE)) {
@@ -312,16 +167,6 @@ do_arrow_summarize <- function(.data, ..., .groups = NULL) {
   out
 }
 
-arrow_eval_or_stop <- function(expr, mask) {
-  # TODO: change arrow_eval error handling behavior?
-  out <- arrow_eval(expr, mask)
-  if (inherits(out, "try-error")) {
-    msg <- handle_arrow_not_supported(out, format_expr(expr))
-    stop(msg, call. = FALSE)
-  }
-  out
-}
-
 # This function returns a list of expressions which is used to project the data
 # before an aggregation. This list includes the fields used in the aggregation
 # expressions (the "targets") and the group fields. The names of the returned
@@ -390,157 +235,57 @@ format_aggregation <- function(x) {
   paste0(x$fun, "(", paste(map(x$data, ~ .$ToString()), collapse = ","), ")")
 }
 
-# This function handles each summarize expression and turns it into the
-# appropriate combination of (1) aggregations (possibly temporary) and
-# (2) post-aggregation transformations (mutate)
-# The function returns nothing: it assigns into the `ctx` environment
-summarize_eval <- function(name, quosure, ctx, hash) {
-  expr <- quo_get_expr(quosure)
-  ctx$quo_env <- quo_get_env(quosure)
-
-  funs_in_expr <- all_funs(expr)
-
-  if (length(funs_in_expr) == 0) {
-    # This branch only gets called at the top level, where expr is something
-    # that is not a function call (could be a quosure, a symbol, or atomic
-    # value). This needs to evaluate to a scalar or something that can be
-    # converted to one.
-    value <- arrow_eval_or_stop(quosure, ctx$mask)
-
-    if (!inherits(value, "Expression")) {
-      value <- Expression$scalar(value)
-    }
-
-    # We can't support a bare field reference because this is not
-    # an aggregate expression
-    if (!identical(value$field_name, "")) {
-      abort(
-        paste(
-          "Expression", format_expr(quosure),
-          "is not an aggregate expression or is not supported in Arrow"
-        )
-      )
-    }
+# This function evaluates an expression and returns the post-summarize
+# projection that results, or NULL if there is none because the top-level
+# expression was an aggregation. Any aggregations are pulled out and collected
+# in the .aggregations list outside this function.
+summarize_eval <- function(name, quosure, mask) {
+  # Add previous aggregations to the mask, so they can be referenced
+  for (n in names(mask$.aggregations)) {
+    mask[[n]] <- mask$.data[[n]] <- Expression$field_ref(n)
+  }
+  # Evaluate:
+  value <- arrow_eval(quosure, mask)
 
+  # Handle the result. There are a few different cases.
+  if (!inherits(value, "Expression")) {
+    # Must have just been a scalar? (If it's not a scalar, this will error)
     # Scalars need to be added to post_mutate because they don't need
     # to be sent to the query engine as an aggregation
-    ctx$post_mutate[[name]] <- value
-    return()
+    value <- Expression$scalar(value)
+  }
+
+  # Handle case where outer expr is ..temp field ref. This came from an
+  # aggregation at the top level. So the resulting name should be `name`.
+  # not `..tempN`. Rename the corresponding aggregation.
+  result_field_name <- value$field_name
+  if (result_field_name %in% names(mask$.aggregations)) {
+    # Do this by assigning over `name` in case something else was in `name`
+    mask$.aggregations[[name]] <- mask$.aggregations[[result_field_name]]
+    mask$.aggregations[[result_field_name]] <- NULL
+    # Return NULL because there is no post-mutate projection, it's just
+    # the aggregation
+    return(NULL)
+  } else {
+    # This is an expression that is not a ..temp fieldref, so it is some
+    # function of aggregations. Return it so it can be added to post_mutate.
+    return(value)
   }
+}
 
+adjust_summarize_expression <- function(quosure, hash) {
   # For the quantile() binding in the hash aggregation case, we need to mutate
   # the list output from the Arrow hash_tdigest kernel to flatten it into a
   # column of type float64. We do that by modifying the unevaluated expression
   # to replace quantile(...) with arrow_list_element(quantile(...), 0L)
-  if (hash && any(c("quantile", "stats::quantile") %in% funs_in_expr)) {
+  expr <- quo_get_expr(quosure)
+  if (hash && any(c("quantile", "stats::quantile") %in% all_funs(expr))) {
     expr <- wrap_hash_quantile(expr)
-    funs_in_expr <- all_funs(expr)
-  }
-
-  # Start inspecting the expr to see what aggregations it involves
-  agg_funs <- names(agg_funcs)
-  outer_agg <- funs_in_expr[1] %in% agg_funs
-  inner_agg <- funs_in_expr[-1] %in% agg_funs
-
-  # First, pull out any aggregations wrapped in other function calls
-  if (any(inner_agg)) {
-    expr <- extract_aggregations(expr, ctx)
-  }
-
-  # By this point, there are no more aggregation functions in expr
-  # except for possibly the outer function call:
-  # they've all been pulled out to ctx$aggregations, and in their place in expr
-  # there are variable names, which would correspond to field refs in the
-  # query object after aggregation and collapse() or non-field variable
-  # references. So if we want to know if there are any aggregations inside expr,
-  # we have to look for them by their new var names in ctx$aggregations.
-  inner_agg_exprs <- all_vars(expr) %in% names(ctx$aggregations)
-  inner_is_fieldref <- all_vars(expr) %in% names(ctx$mask$.data)
-
-  if (outer_agg) {
-    # This is something like agg(fun(x, y)
-    # It just works by normal arrow_eval, unless there's a mix of aggs and
-    # columns in the original data like agg(fun(x, agg(x)))
-    # (but that will have been caught in extract_aggregations())
-    ctx$aggregations[[name]] <- arrow_eval_or_stop(
-      as_quosure(expr, ctx$quo_env),
-      ctx$mask
-    )
-    return()
-  } else if (all(inner_agg_exprs | !inner_is_fieldref)) {
-    # Something like: fun(agg(x), agg(y))
-    # So based on the aggregations that have been extracted, mutate after
-    agg_field_refs <- make_field_refs(names(ctx$aggregations))
-    agg_field_types <- aggregate_types(ctx$aggregations, hash)
-
-    mutate_mask <- arrow_mask(
-      list(
-        selected_columns = agg_field_refs,
-        .data = list(
-          schema = schema(agg_field_types)
-        )
-      )
-    )
-
-    value <- arrow_eval_or_stop(
-      as_quosure(expr, ctx$quo_env),
-      mutate_mask
-    )
-
-    if (!inherits(value, "Expression")) {
-      value <- Expression$scalar(value)
-    }
-
-    ctx$post_mutate[[name]] <- value
-    return()
-  }
-
-  # Backstop for any other odd cases, like fun(x, y) (i.e. no aggregation),
-  # or aggregation functions that aren't supported in Arrow (not in agg_funcs)
-  abort(
-    paste(
-      "Expression", format_expr(quosure),
-      "is not an aggregate expression or is not supported in Arrow"
-    )
-  )
-}
-
-# This function recurses through expr, pulls out any aggregation expressions,
-# and inserts a variable name (field ref) in place of the aggregation
-extract_aggregations <- function(expr, ctx) {
-  # Keep the input in case we need to raise an error message with it
-  original_expr <- expr
-  funs <- all_funs(expr)
-  if (length(funs) == 0) {
-    return(expr)
-  } else if (length(funs) > 1) {
-    # Recurse more
-    expr[-1] <- lapply(expr[-1], extract_aggregations, ctx)
-  }
-  if (funs[1] %in% names(agg_funcs)) {
-    inner_agg_exprs <- all_vars(expr) %in% names(ctx$aggregations)
-    if (any(inner_agg_exprs)) {
-      # We can't aggregate over a combination of dataset columns and other
-      # aggregations (e.g. sum(x - mean(x)))
-      # TODO: support in ARROW-13926
-      abort(
-        paste(
-          "Aggregate within aggregate expression",
-          format_expr(original_expr),
-          "not supported in Arrow"
-        )
-      )
-    }
-
-    # We have an aggregation expression with no other aggregations inside it,
-    # so arrow_eval the expression on the data and give it a ..temp name prefix,
-    # then insert that name (symbol) back into the expression so that we can
-    # mutate() on the result of the aggregation and reference this field.
-    tmpname <- paste0("..temp", length(ctx$aggregations))
-    ctx$aggregations[[tmpname]] <- arrow_eval_or_stop(as_quosure(expr, ctx$quo_env), ctx$mask)
-    expr <- as.symbol(tmpname)
+    quo_env <- quo_get_env(quosure)
+    quosure <- as_quosure(expr, quo_env)
   }
-  expr
+  # We could add any other adjustments here, but currently quantile is the only one
+  quosure
 }
 
 # This function recurses through expr and wraps each call to quantile() with a
diff --git a/r/R/dplyr.R b/r/R/dplyr.R
index f11b88d301ef9..93fcfdef28f28 100644
--- a/r/R/dplyr.R
+++ b/r/R/dplyr.R
@@ -338,22 +338,6 @@ ensure_arrange_vars <- function(x) {
   x
 }
 
-# Helper to handle unsupported dplyr features
-# * For Table/RecordBatch, we collect() and then call the dplyr method in R
-# * For Dataset, we just error
-abandon_ship <- function(call, .data, msg) {
-  msg <- trimws(msg)
-  dplyr_fun_name <- sub("^(.*?)\\..*", "\\1", as.character(call[[1]]))
-  if (query_on_dataset(.data)) {
-    stop(msg, "\nCall collect() first to pull data into R.", call. = FALSE)
-  }
-  # else, collect and call dplyr method
-  warning(msg, "; pulling data into R", immediate. = TRUE, call. = FALSE)
-  call$.data <- dplyr::collect(.data)
-  call[[1]] <- get(dplyr_fun_name, envir = asNamespace("dplyr"))
-  eval.parent(call, 2)
-}
-
 query_on_dataset <- function(x) {
   any(map_lgl(all_sources(x), ~ inherits(., c("Dataset", "RecordBatchReader"))))
 }
diff --git a/r/R/expression.R b/r/R/expression.R
index 8f84b4b31ec33..0e823e3f697ac 100644
--- a/r/R/expression.R
+++ b/r/R/expression.R
@@ -60,6 +60,9 @@ Expression <- R6Class("Expression",
     is_field_ref = function() {
       compute___expr__is_field_ref(self)
     },
+    field_names_in_expression = function() {
+      compute___expr__field_names_in_expression(self)
+    },
     cast = function(to_type, safe = TRUE, ...) {
       opts <- cast_options(safe, ...)
       opts$to_type <- as_type(to_type)
diff --git a/r/R/extension.R b/r/R/extension.R
index 59a02121fd18c..e5b12b80ae615 100644
--- a/r/R/extension.R
+++ b/r/R/extension.R
@@ -429,7 +429,8 @@ VctrsExtensionType <- R6Class("VctrsExtensionType",
       paste0(capture.output(print(self$ptype())), collapse = "\n")
     },
     deserialize_instance = function() {
-      private$.ptype <- unserialize(self$extension_metadata())
+      private$.ptype <- safe_unserialize(self$extension_metadata())
+      attributes(private$.ptype) <- safe_r_metadata(attributes(private$.ptype))
     },
     ExtensionEquals = function(other) {
       inherits(other, "VctrsExtensionType") && identical(self$ptype(), other$ptype())
@@ -510,11 +511,13 @@ vctrs_extension_array <- function(x, ptype = vctrs::vec_ptype(x),
 vctrs_extension_type <- function(x,
                                  storage_type = infer_type(vctrs::vec_data(x))) {
   ptype <- vctrs::vec_ptype(x)
+  # Make sure there are no unsupported objects buried in there
+  attributes(ptype) <- safe_r_metadata(attributes(ptype))
 
   new_extension_type(
     storage_type = storage_type,
     extension_name = "arrow.r.vctrs",
-    extension_metadata = serialize(ptype, NULL),
+    extension_metadata = serialize(ptype, NULL, ascii = TRUE),
     type_class = VctrsExtensionType
   )
 }
diff --git a/r/R/feather.R b/r/R/feather.R
index 474fc6118e44f..aa08dfdbc96a5 100644
--- a/r/R/feather.R
+++ b/r/R/feather.R
@@ -29,7 +29,7 @@
 #' [write_ipc_file()] can only write V2 files.
 #'
 #' @param x `data.frame`, [RecordBatch], or [Table]
-#' @param sink A string file path, URI, or [OutputStream], or path in a file
+#' @param sink A string file path, connection, URI, or [OutputStream], or path in a file
 #' system (`SubTreeFileSystem`)
 #' @param version integer Feather file version, Version 1 or Version 2. Version 2 is the default.
 #' @param chunk_size For V2 files, the number of rows that each chunk of data
diff --git a/r/R/filesystem.R b/r/R/filesystem.R
index 0e4484d1b583d..0176cdf846da7 100644
--- a/r/R/filesystem.R
+++ b/r/R/filesystem.R
@@ -390,7 +390,8 @@ are_urls <- function(x) if (!is.character(x)) FALSE else grepl("://", x)
 #' @export
 LocalFileSystem <- R6Class("LocalFileSystem", inherit = FileSystem)
 LocalFileSystem$create <- function() {
-  fs___LocalFileSystem__create()
+  # from_uri needs a non-empty path, so just use a placeholder of /_
+  FileSystem$from_uri("file:///_")$fs
 }
 
 #' @usage NULL
diff --git a/r/R/install-arrow.R b/r/R/install-arrow.R
index 74d3a96454777..44b876537490c 100644
--- a/r/R/install-arrow.R
+++ b/r/R/install-arrow.R
@@ -76,22 +76,14 @@ install_arrow <- function(nightly = FALSE,
       ARROW_R_DEV = verbose,
       ARROW_USE_PKG_CONFIG = use_system
     )
-    # On the M1, we can't use the usual autobrew, which pulls Intel dependencies
-    apple_m1 <- grepl("arm-apple|aarch64.*darwin", R.Version()$platform)
-    # On Rosetta, we have to build without JEMALLOC, so we also can't autobrew
-    rosetta <- on_rosetta()
-    if (rosetta) {
+    # On Rosetta, we have to build without JEMALLOC
+    if (on_rosetta()) {
       Sys.setenv(ARROW_JEMALLOC = "OFF")
-    }
-    if (apple_m1 || rosetta) {
       Sys.setenv(FORCE_BUNDLED_BUILD = "true")
     }
 
     opts <- list()
-    if (apple_m1 || rosetta) {
-      # Skip binaries (esp. for rosetta)
-      opts$pkgType <- "source"
-    } else if (isTRUE(binary)) {
+    if (isTRUE(binary)) {
       # Unless otherwise directed, don't consider newer source packages when
       # options(pkgType) == "both" (default on win/mac)
       opts$install.packages.check.source <- "no"
diff --git a/r/R/ipc-stream.R b/r/R/ipc-stream.R
index 37ef0bbaf2126..26a61a790f936 100644
--- a/r/R/ipc-stream.R
+++ b/r/R/ipc-stream.R
@@ -82,8 +82,8 @@ write_to_raw <- function(x, format = c("stream", "file")) {
 #' a "stream" format and a "file" format, known as Feather. `read_ipc_stream()`
 #' and [read_feather()] read those formats, respectively.
 #'
-#' @param file A character file name or URI, `raw` vector, an Arrow input stream,
-#' or a `FileSystem` with path (`SubTreeFileSystem`).
+#' @param file A character file name or URI, connection, `raw` vector, an
+#' Arrow input stream, or a `FileSystem` with path (`SubTreeFileSystem`).
 #' If a file name or URI, an Arrow [InputStream] will be opened and
 #' closed when finished. If an input stream is provided, it will be left
 #' open.
diff --git a/r/R/metadata.R b/r/R/metadata.R
index 3ae2db4eaa724..ba73f0857881d 100644
--- a/r/R/metadata.R
+++ b/r/R/metadata.R
@@ -30,7 +30,7 @@
     }
   }
 
-  out <- serialize(x, NULL, ascii = TRUE)
+  out <- serialize(safe_r_metadata(x, on_save = TRUE), NULL, ascii = TRUE)
 
   # if the metadata is over 100 kB, compress
   if (option_compress_metadata() && object.size(out) > 100000) {
@@ -44,23 +44,110 @@
 }
 
 .deserialize_arrow_r_metadata <- function(x) {
-  tryCatch(
-    expr = {
-      out <- unserialize(charToRaw(x))
-
-      # if this is still raw, try decompressing
-      if (is.raw(out)) {
-        out <- unserialize(memDecompress(out, type = "gzip"))
-      }
-      out
-    },
+  tryCatch(unserialize_r_metadata(x),
     error = function(e) {
+      if (getOption("arrow.debug", FALSE)) {
+        print(conditionMessage(e))
+      }
       warning("Invalid metadata$r", call. = FALSE)
       NULL
     }
   )
 }
 
+unserialize_r_metadata <- function(x) {
+  # Check that this is ASCII serialized data (as in, what we wrote)
+  if (!identical(substr(unclass(x), 1, 1), "A")) {
+    stop("Invalid serialized data")
+  }
+  out <- safe_unserialize(charToRaw(x))
+  # If it's still raw, decompress and unserialize again
+  if (is.raw(out)) {
+    decompressed <- memDecompress(out, type = "gzip")
+    if (!identical(rawToChar(decompressed[1]), "A")) {
+      stop("Invalid serialized compressed data")
+    }
+    out <- safe_unserialize(decompressed)
+  }
+  if (!is.list(out)) {
+    stop("Invalid serialized data: must be a list")
+  }
+  safe_r_metadata(out)
+}
+
+safe_unserialize <- function(x) {
+  # By capturing the data in a list, we can inspect it for promises without
+  # triggering their evaluation.
+  out <- list(unserialize(x))
+  if (typeof(out[[1]]) == "promise") {
+    stop("Serialized data contains a promise object")
+  }
+  out[[1]]
+}
+
+safe_r_metadata <- function(metadata, on_save = FALSE) {
+  # This function recurses through the metadata list and checks that all
+  # elements are of types that are allowed in R metadata.
+  # If it finds an element that is not allowed, it removes it.
+  #
+  # This function is used both when saving and loading metadata.
+  # @param on_save: If TRUE, the function will not warn if it removes elements:
+  # we're just cleaning up the metadata for saving. If FALSE, it means we're
+  # loading the metadata, and we'll warn if we find invalid elements.
+  #
+  # When loading metadata, you can optionally keep the invalid elements by
+  # setting `options(arrow.unsafe_metadata = TRUE)`. It will still check
+  # for invalid elements and warn if any are found, though.
+
+  # This variable will be used to store the types of elements that were removed,
+  # if any, so we can give an informative warning if needed.
+  types_removed <- c()
+
+  # Internal function that we'll recursively apply,
+  # and mutate the `types_removed` variable outside of it.
+  check_r_metadata_types_recursive <- function(x) {
+    allowed_types <- c("character", "double", "integer", "logical", "complex", "list", "NULL")
+    if (is.list(x)) {
+      types <- map_chr(x, typeof)
+      x[types == "list"] <- map(x[types == "list"], check_r_metadata_types_recursive)
+      ok <- types %in% allowed_types
+      if (!all(ok)) {
+        # Record the invalid types, then remove the offending elements
+        types_removed <<- c(types_removed, setdiff(types, allowed_types))
+        x <- x[ok]
+      }
+    }
+    x
+  }
+  new <- check_r_metadata_types_recursive(metadata)
+
+  # On save: don't warn, just save the filtered metadata
+  if (on_save) {
+    return(new)
+  }
+  # On load: warn if any elements were removed
+  if (length(types_removed)) {
+    types_msg <- paste("Type:", oxford_paste(unique(types_removed)))
+    if (getOption("arrow.unsafe_metadata", FALSE)) {
+      # We've opted-in to unsafe metadata, so warn but return the original metadata
+      rlang::warn(
+        "R metadata may have unsafe or invalid elements",
+        body = c("i" = types_msg)
+      )
+      new <- metadata
+    } else {
+      rlang::warn(
+        "Potentially unsafe or invalid elements have been discarded from R metadata.",
+        body = c(
+          "i" = types_msg,
+          ">" = "If you trust the source, you can set `options(arrow.unsafe_metadata = TRUE)` to preserve them."
+        )
+      )
+    }
+  }
+  new
+}
+
 #' @importFrom rlang trace_back
 apply_arrow_r_metadata <- function(x, r_metadata) {
   if (is.null(r_metadata)) {
diff --git a/r/R/parquet.R b/r/R/parquet.R
index d92e913cb5db3..0ee6c62601c1d 100644
--- a/r/R/parquet.R
+++ b/r/R/parquet.R
@@ -90,7 +90,7 @@ read_parquet <- function(file,
 #' article} for examples of this.
 #'
 #' @param x `data.frame`, [RecordBatch], or [Table]
-#' @param sink A string file path, URI, or [OutputStream], or path in a file
+#' @param sink A string file path, connection, URI, or [OutputStream], or path in a file
 #' system (`SubTreeFileSystem`)
 #' @param chunk_size how many rows of data to write to disk at once. This
 #'    directly corresponds to how many rows will be in each row group in
diff --git a/r/R/query-engine.R b/r/R/query-engine.R
index 0f8a84f9b867e..fb48d790fd36e 100644
--- a/r/R/query-engine.R
+++ b/r/R/query-engine.R
@@ -148,7 +148,8 @@ ExecPlan <- R6Class("ExecPlan",
             left_output = .data$join$left_output,
             right_output = .data$join$right_output,
             left_suffix = .data$join$suffix[[1]],
-            right_suffix = .data$join$suffix[[2]]
+            right_suffix = .data$join$suffix[[2]],
+            na_matches = .data$join$na_matches
           )
         }
 
@@ -307,7 +308,7 @@ ExecNode <- R6Class("ExecNode",
       out$extras$source_schema$metadata[["r"]]$attributes <- NULL
       out
     },
-    Join = function(type, right_node, by, left_output, right_output, left_suffix, right_suffix) {
+    Join = function(type, right_node, by, left_output, right_output, left_suffix, right_suffix, na_matches = TRUE) {
       self$preserve_extras(
         ExecNode_Join(
           self,
@@ -318,7 +319,8 @@ ExecNode <- R6Class("ExecNode",
           left_output = left_output,
           right_output = right_output,
           output_suffix_for_left = left_suffix,
-          output_suffix_for_right = right_suffix
+          output_suffix_for_right = right_suffix,
+          na_matches = na_matches
         )
       )
     },
diff --git a/r/R/udf.R b/r/R/udf.R
index 922095cceba6a..0415fbac3c9fc 100644
--- a/r/R/udf.R
+++ b/r/R/udf.R
@@ -95,12 +95,7 @@ register_scalar_function <- function(name, fun, in_type, out_type,
   body(binding_fun) <- expr_substitute(body(binding_fun), sym("name"), name)
   environment(binding_fun) <- asNamespace("arrow")
 
-  register_binding(
-    name,
-    binding_fun,
-    update_cache = TRUE
-  )
-
+  register_binding(name, binding_fun)
   invisible(NULL)
 }
 
diff --git a/r/R/util.R b/r/R/util.R
index a7cb5b3792d29..14e4544ab1e54 100644
--- a/r/R/util.R
+++ b/r/R/util.R
@@ -15,20 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# for compatibility with R versions earlier than 4.0.0
-if (!exists("deparse1")) {
-  deparse1 <- function(expr, collapse = " ", width.cutoff = 500L, ...) {
-    paste(deparse(expr, width.cutoff, ...), collapse = collapse)
-  }
-}
-
-# for compatibility with R versions earlier than 3.6.0
-if (!exists("str2lang")) {
-  str2lang <- function(s) {
-    parse(text = s, keep.source = FALSE)[[1]]
-  }
-}
-
 oxford_paste <- function(x,
                          conjunction = "and",
                          quote = TRUE,
diff --git a/r/README.md b/r/README.md
index 710fa8e8d7cb5..c3cd5a32eaf69 100644
--- a/r/README.md
+++ b/r/README.md
@@ -12,7 +12,7 @@
 
 The R `{arrow}` package provides access to many of the features of the [Apache Arrow C++ library](https://arrow.apache.org/docs/cpp/index.html) for R users. The goal of arrow is to provide an Arrow C++ backend to `{dplyr}`, and access to the Arrow C++ library through familiar base R and tidyverse functions, or `{R6}` classes.
 
-To learn more about the Apache Arrow project, see the parent documentation of the [Arrow Project](https://arrow.apache.org/). The Arrow project provides functionality for a wide range of data analysis tasks to store, process and move data fast. See the [read/write article](articles/read_write.html) to learn about reading and writing data files, [data wrangling](articles/data_wrangling.html) to learn how to use dplyr syntax with arrow objects, and the [function documentation](reference/acero.html) for a full list of supported functions within dplyr queries.
+To learn more about the Apache Arrow project, see the parent documentation of the [Arrow Project](https://arrow.apache.org/). The Arrow project provides functionality for a wide range of data analysis tasks to store, process and move data fast. See the [read/write article](https://arrow.apache.org/docs/r/articles/read_write.html) to learn about reading and writing data files, [data wrangling](https://arrow.apache.org/docs/r/articles/data_wrangling.html) to learn how to use dplyr syntax with arrow objects, and the [function documentation](https://arrow.apache.org/docs/r/reference/acero.html) for a full list of supported functions within dplyr queries.
 
 ## Installation
 
@@ -33,11 +33,11 @@ There are some special cases to note:
 
 - On macOS, the R you use with Arrow should match the architecture of the machine you are using. If you're using an ARM (aka M1, M2, etc.) processor use R compiled for arm64. If you're using an Intel based mac, use R compiled for x86. Using R and Arrow compiled for Intel based macs on an ARM based mac will result in segfaults and crashes.
 
-- On Linux the installation process can sometimes be more involved because CRAN does not host binaries for Linux. For more information please see the [installation guide](articles/install.html).
+- On Linux the installation process can sometimes be more involved because CRAN does not host binaries for Linux. For more information please see the [installation guide](https://arrow.apache.org/docs/r/articles/install.html).
 
 - If you are compiling arrow from source, please note that as of version 10.0.0, arrow requires C++17 to build. This has implications on Windows and CentOS 7. For Windows users it means you need to be running an R version of 4.0 or later. On CentOS 7, it means you need to install a newer compiler than the default system compiler gcc. See the [installation details article](https://arrow.apache.org/docs/r/articles/developers/install_details.html) for guidance.
 
-- Development versions of arrow are released nightly. For information on how to installl nighhtly builds please see the [installing nightly builds](articles/install_nightly.html) article.
+- Development versions of arrow are released nightly. For information on how to installl nightly builds please see the [installing nightly builds](https://arrow.apache.org/docs/r/articles/install_nightly.html) article.
 
 ## What can the arrow package do?
 
diff --git a/r/_pkgdown.yml b/r/_pkgdown.yml
index 7fec4462c02da..ceb68d773bdb4 100644
--- a/r/_pkgdown.yml
+++ b/r/_pkgdown.yml
@@ -76,7 +76,7 @@ home:
           [C GLib](https://arrow.apache.org/docs/c_glib) <br>
           [C++](https://arrow.apache.org/docs/cpp) <br>
           [C#](https://github.com/apache/arrow/blob/main/csharp/README.md) <br>
-          [Go](https://pkg.go.dev/github.com/apache/arrow/go/v16) <br>
+          [Go](https://pkg.go.dev/github.com/apache/arrow/go/v17) <br>
           [Java](https://arrow.apache.org/docs/java) <br>
           [JavaScript](https://arrow.apache.org/docs/js) <br>
           [Julia](https://github.com/apache/arrow-julia/blob/main/README.md) <br>
@@ -137,7 +137,6 @@ articles:
       - developers/workflow
       - developers/debugging
       - developers/docker
-      - developers/writing_bindings
       - developers/install_details
       - developers/data_object_layout
 
diff --git a/r/inst/build_arrow_static.sh b/r/inst/build_arrow_static.sh
index d28cbcb08fbec..fc3a173294b4a 100755
--- a/r/inst/build_arrow_static.sh
+++ b/r/inst/build_arrow_static.sh
@@ -65,6 +65,7 @@ esac
 mkdir -p "${BUILD_DIR}"
 pushd "${BUILD_DIR}"
 ${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
+    -DARROW_SNAPPY_USE_SHARED=OFF \
     -DARROW_BUILD_TESTS=OFF \
     -DARROW_BUILD_SHARED=OFF \
     -DARROW_BUILD_STATIC=ON \
@@ -99,6 +100,7 @@ ${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
     -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON \
     -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON \
     -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD:-OFF} \
+    -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} \
     -Dre2_SOURCE=${re2_SOURCE:-BUNDLED} \
     -Dxsimd_SOURCE=${xsimd_SOURCE:-} \
     -Dzstd_SOURCE=${zstd_SOURCE:-} \
diff --git a/r/man/acero.Rd b/r/man/acero.Rd
index 365795d9fc65c..9ef9cd7dda6fb 100644
--- a/r/man/acero.Rd
+++ b/r/man/acero.Rd
@@ -23,7 +23,7 @@ the query on the data. To run the query, call either \code{compute()},
 which returns an \code{arrow} \link{Table}, or \code{collect()}, which pulls the resulting
 Table into an R \code{tibble}.
 \itemize{
-\item \code{\link[dplyr:filter-joins]{anti_join()}}: the \code{copy} and \code{na_matches} arguments are ignored
+\item \code{\link[dplyr:filter-joins]{anti_join()}}: the \code{copy} argument is ignored
 \item \code{\link[dplyr:arrange]{arrange()}}
 \item \code{\link[dplyr:compute]{collapse()}}
 \item \code{\link[dplyr:compute]{collect()}}
@@ -32,22 +32,22 @@ Table into an R \code{tibble}.
 \item \code{\link[dplyr:distinct]{distinct()}}: \code{.keep_all = TRUE} not supported
 \item \code{\link[dplyr:explain]{explain()}}
 \item \code{\link[dplyr:filter]{filter()}}
-\item \code{\link[dplyr:mutate-joins]{full_join()}}: the \code{copy} and \code{na_matches} arguments are ignored
+\item \code{\link[dplyr:mutate-joins]{full_join()}}: the \code{copy} argument is ignored
 \item \code{\link[dplyr:glimpse]{glimpse()}}
 \item \code{\link[dplyr:group_by]{group_by()}}
 \item \code{\link[dplyr:group_by_drop_default]{group_by_drop_default()}}
 \item \code{\link[dplyr:group_data]{group_vars()}}
 \item \code{\link[dplyr:group_data]{groups()}}
-\item \code{\link[dplyr:mutate-joins]{inner_join()}}: the \code{copy} and \code{na_matches} arguments are ignored
-\item \code{\link[dplyr:mutate-joins]{left_join()}}: the \code{copy} and \code{na_matches} arguments are ignored
-\item \code{\link[dplyr:mutate]{mutate()}}: window functions (e.g. things that require aggregation within groups) not currently supported
+\item \code{\link[dplyr:mutate-joins]{inner_join()}}: the \code{copy} argument is ignored
+\item \code{\link[dplyr:mutate-joins]{left_join()}}: the \code{copy} argument is ignored
+\item \code{\link[dplyr:mutate]{mutate()}}
 \item \code{\link[dplyr:pull]{pull()}}: the \code{name} argument is not supported; returns an R vector by default but this behavior is deprecated and will return an Arrow \link{ChunkedArray} in a future release. Provide \code{as_vector = TRUE/FALSE} to control this behavior, or set \code{options(arrow.pull_as_vector)} globally.
 \item \code{\link[dplyr:relocate]{relocate()}}
 \item \code{\link[dplyr:rename]{rename()}}
 \item \code{\link[dplyr:rename]{rename_with()}}
-\item \code{\link[dplyr:mutate-joins]{right_join()}}: the \code{copy} and \code{na_matches} arguments are ignored
+\item \code{\link[dplyr:mutate-joins]{right_join()}}: the \code{copy} argument is ignored
 \item \code{\link[dplyr:select]{select()}}
-\item \code{\link[dplyr:filter-joins]{semi_join()}}: the \code{copy} and \code{na_matches} arguments are ignored
+\item \code{\link[dplyr:filter-joins]{semi_join()}}: the \code{copy} argument is ignored
 \item \code{\link[dplyr:explain]{show_query()}}
 \item \code{\link[dplyr:slice]{slice_head()}}: slicing within groups not supported; Arrow datasets do not have row order, so head is non-deterministic; \code{prop} only supported on queries where \code{nrow()} is knowable without evaluating
 \item \code{\link[dplyr:slice]{slice_max()}}: slicing within groups not supported; \code{with_ties = TRUE} (dplyr default) is not supported; \code{prop} only supported on queries where \code{nrow()} is knowable without evaluating
diff --git a/r/man/arrow-package.Rd b/r/man/arrow-package.Rd
index 15f672a1fe949..41ec7956fe815 100644
--- a/r/man/arrow-package.Rd
+++ b/r/man/arrow-package.Rd
@@ -18,15 +18,15 @@ Useful links:
 
 }
 \author{
-\strong{Maintainer}: Nic Crane \email{thisisnic@gmail.com}
+\strong{Maintainer}: Jonathan Keane \email{jkeane@gmail.com}
 
 Authors:
 \itemize{
   \item Neal Richardson \email{neal.p.richardson@gmail.com}
   \item Ian Cook \email{ianmcook@gmail.com}
+  \item Nic Crane \email{thisisnic@gmail.com}
   \item Dewey Dunnington \email{dewey@fishandwhistle.net} (\href{https://orcid.org/0000-0002-9415-4582}{ORCID})
   \item Romain François (\href{https://orcid.org/0000-0002-2444-4226}{ORCID})
-  \item Jonathan Keane \email{jkeane@gmail.com}
   \item Dragoș Moldovan-Grünfeld \email{dragos.mold@gmail.com}
   \item Jeroen Ooms \email{jeroen@berkeley.edu}
   \item Jacob Wujciak-Jens \email{jacob@wujciak.de}
diff --git a/r/man/arrow_not_supported.Rd b/r/man/arrow_not_supported.Rd
new file mode 100644
index 0000000000000..be6a001fa1fa4
--- /dev/null
+++ b/r/man/arrow_not_supported.Rd
@@ -0,0 +1,56 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/dplyr-eval.R
+\name{arrow_not_supported}
+\alias{arrow_not_supported}
+\alias{validation_error}
+\title{Helpers to raise classed errors}
+\usage{
+arrow_not_supported(
+  msg,
+  .actual_msg = paste(msg, "not supported in Arrow"),
+  ...
+)
+
+validation_error(msg, ...)
+}
+\arguments{
+\item{msg}{The message to show. \code{arrow_not_supported()} will append
+"not supported in Arrow" to this message.}
+
+\item{.actual_msg}{If you don't want to append "not supported in Arrow" to
+the message, you can provide the full message here.}
+
+\item{...}{Additional arguments to pass to \code{rlang::abort()}. Useful arguments
+include \code{call} to provide the call or expression that caused the error, and
+\code{body} to provide additional context about the error.}
+}
+\description{
+\code{arrow_not_supported()} and \code{validation_error()} raise classed errors that
+allow us to distinguish between things that are not supported in Arrow and
+things that are just invalid input. Additional wrapping in \code{arrow_eval()}
+and \code{try_arrow_dplyr()} provide more context and suggestions.
+Importantly, if \code{arrow_not_supported} is raised, then retrying the same code
+in regular dplyr in R may work. But if \code{validation_error} is raised, then we
+shouldn't recommend retrying with regular dplyr because it will fail there
+too.
+}
+\details{
+Use these in function bindings and in the dplyr methods. Inside of function
+bindings, you don't need to provide the \code{call} argument, as it will be
+automatically filled in with the expression that caused the error in
+\code{arrow_eval()}. In dplyr methods, you should provide the \code{call} argument;
+\code{rlang::caller_call()} often is correct, but you may need to experiment to
+find how far up the call stack you need to look.
+
+You may provide additional information in the \code{body} argument, a named
+character vector. Use \code{i} for additional information about the error and \code{>}
+to indicate potential solutions or workarounds that don't require pulling the
+data into R. If you have an \code{arrow_not_supported()} error with a \code{>}
+suggestion, when the error is ultimately raised by \code{try_error_dplyr()},
+\verb{Call collect() first to pull data into R} won't be the only suggestion.
+
+You can still use \code{match.arg()} and \code{assert_that()} for simple input
+validation inside of the function bindings. \code{arrow_eval()} will catch their
+errors and re-raise them as \code{validation_error}.
+}
+\keyword{internal}
diff --git a/r/man/format_schema.Rd b/r/man/format_schema.Rd
new file mode 100644
index 0000000000000..d1c81e3fe7623
--- /dev/null
+++ b/r/man/format_schema.Rd
@@ -0,0 +1,18 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/schema.R
+\name{format_schema}
+\alias{format_schema}
+\title{Get a string representing a Dataset or RecordBatchReader object's schema}
+\usage{
+format_schema(obj)
+}
+\arguments{
+\item{obj}{a Dataset or RecordBatchReader}
+}
+\value{
+A string containing a formatted representation of the schema of \code{obj}
+}
+\description{
+Get a string representing a Dataset or RecordBatchReader object's schema
+}
+\keyword{internal}
diff --git a/r/man/read_delim_arrow.Rd b/r/man/read_delim_arrow.Rd
index b56d445c9e2e3..f946785e4a41e 100644
--- a/r/man/read_delim_arrow.Rd
+++ b/r/man/read_delim_arrow.Rd
@@ -90,8 +90,9 @@ read_tsv_arrow(
 )
 }
 \arguments{
-\item{file}{A character file name or URI, literal data (either a single string or a \link{raw} vector),
-an Arrow input stream, or a \code{FileSystem} with path (\code{SubTreeFileSystem}).
+\item{file}{A character file name or URI, connection, literal data (either a
+single string or a \link{raw} vector), an Arrow input stream, or a \code{FileSystem}
+with path (\code{SubTreeFileSystem}).
 
 If a file name, a memory-mapped Arrow \link{InputStream} will be opened and
 closed when finished; compression will be detected from the file extension
diff --git a/r/man/read_feather.Rd b/r/man/read_feather.Rd
index c3b4a54158c7f..95661d9778576 100644
--- a/r/man/read_feather.Rd
+++ b/r/man/read_feather.Rd
@@ -10,8 +10,8 @@ read_feather(file, col_select = NULL, as_data_frame = TRUE, mmap = TRUE)
 read_ipc_file(file, col_select = NULL, as_data_frame = TRUE, mmap = TRUE)
 }
 \arguments{
-\item{file}{A character file name or URI, \code{raw} vector, an Arrow input stream,
-or a \code{FileSystem} with path (\code{SubTreeFileSystem}).
+\item{file}{A character file name or URI, connection, \code{raw} vector, an
+Arrow input stream, or a \code{FileSystem} with path (\code{SubTreeFileSystem}).
 If a file name or URI, an Arrow \link{InputStream} will be opened and
 closed when finished. If an input stream is provided, it will be left
 open.}
diff --git a/r/man/read_ipc_stream.Rd b/r/man/read_ipc_stream.Rd
index db930b52bde18..49d3949bfcf22 100644
--- a/r/man/read_ipc_stream.Rd
+++ b/r/man/read_ipc_stream.Rd
@@ -7,8 +7,8 @@
 read_ipc_stream(file, as_data_frame = TRUE, ...)
 }
 \arguments{
-\item{file}{A character file name or URI, \code{raw} vector, an Arrow input stream,
-or a \code{FileSystem} with path (\code{SubTreeFileSystem}).
+\item{file}{A character file name or URI, connection, \code{raw} vector, an
+Arrow input stream, or a \code{FileSystem} with path (\code{SubTreeFileSystem}).
 If a file name or URI, an Arrow \link{InputStream} will be opened and
 closed when finished. If an input stream is provided, it will be left
 open.}
diff --git a/r/man/read_json_arrow.Rd b/r/man/read_json_arrow.Rd
index 9230a9a017495..f289d3356e559 100644
--- a/r/man/read_json_arrow.Rd
+++ b/r/man/read_json_arrow.Rd
@@ -13,8 +13,9 @@ read_json_arrow(
 )
 }
 \arguments{
-\item{file}{A character file name or URI, literal data (either a single string or a \link{raw} vector),
-an Arrow input stream, or a \code{FileSystem} with path (\code{SubTreeFileSystem}).
+\item{file}{A character file name or URI, connection, literal data (either a
+single string or a \link{raw} vector), an Arrow input stream, or a \code{FileSystem}
+with path (\code{SubTreeFileSystem}).
 
 If a file name, a memory-mapped Arrow \link{InputStream} will be opened and
 closed when finished; compression will be detected from the file extension
diff --git a/r/man/read_parquet.Rd b/r/man/read_parquet.Rd
index 4f1936529531a..95ee4ac5a8ceb 100644
--- a/r/man/read_parquet.Rd
+++ b/r/man/read_parquet.Rd
@@ -14,8 +14,8 @@ read_parquet(
 )
 }
 \arguments{
-\item{file}{A character file name or URI, \code{raw} vector, an Arrow input stream,
-or a \code{FileSystem} with path (\code{SubTreeFileSystem}).
+\item{file}{A character file name or URI, connection, \code{raw} vector, an
+Arrow input stream, or a \code{FileSystem} with path (\code{SubTreeFileSystem}).
 If a file name or URI, an Arrow \link{InputStream} will be opened and
 closed when finished. If an input stream is provided, it will be left
 open.}
diff --git a/r/man/register_binding.Rd b/r/man/register_binding.Rd
index d10cd733bbe9d..b84cde3b8993a 100644
--- a/r/man/register_binding.Rd
+++ b/r/man/register_binding.Rd
@@ -2,63 +2,28 @@
 % Please edit documentation in R/dplyr-funcs.R
 \name{register_binding}
 \alias{register_binding}
-\alias{register_binding_agg}
 \title{Register compute bindings}
 \usage{
-register_binding(
-  fun_name,
-  fun,
-  registry = nse_funcs,
-  update_cache = FALSE,
-  notes = character(0)
-)
-
-register_binding_agg(
-  fun_name,
-  agg_fun,
-  registry = agg_funcs,
-  notes = character(0)
-)
+register_binding(fun_name, fun, notes = character(0))
 }
 \arguments{
 \item{fun_name}{A string containing a function name in the form \code{"function"} or
-\code{"package::function"}. The package name is currently not used but
-may be used in the future to allow these types of function calls.}
+\code{"package::function"}.}
 
-\item{fun}{A function or \code{NULL} to un-register a previous function.
+\item{fun}{A function, or \code{NULL} to un-register a previous function.
 This function must accept \code{Expression} objects as arguments and return
 \code{Expression} objects instead of regular R objects.}
 
-\item{registry}{An environment in which the functions should be
-assigned.}
-
-\item{update_cache}{Update .cache$functions at the time of registration.
-the default is FALSE because the majority of usage is to register
-bindings at package load, after which we create the cache once. The
-reason why .cache$functions is needed in addition to nse_funcs for
-non-aggregate functions could be revisited...it is currently used
-as the data mask in mutate, filter, and aggregate (but not
-summarise) because the data mask has to be a list.}
-
 \item{notes}{string for the docs: note any limitations or differences in
 behavior between the Arrow version and the R function.}
-
-\item{agg_fun}{An aggregate function or \code{NULL} to un-register a previous
-aggregate function. This function must accept \code{Expression} objects as
-arguments and return a \code{list()} with components:
-\itemize{
-\item \code{fun}: string function name
-\item \code{data}: list of 0 or more \code{Expression}s
-\item \code{options}: list of function options, as passed to call_function
-}}
 }
 \value{
 The previously registered binding or \code{NULL} if no previously
 registered function existed.
 }
 \description{
-The \code{register_binding()} and \code{register_binding_agg()} functions
-are used to populate a list of functions that operate on (and return)
+\code{register_binding()} is used to populate a list of functions that operate on
+(and return)
 Expressions. These are the basis for the \code{.data} mask inside dplyr methods.
 }
 \section{Writing bindings}{
diff --git a/r/man/write_csv_arrow.Rd b/r/man/write_csv_arrow.Rd
index 9fcca49fadc05..9f9fde74cc996 100644
--- a/r/man/write_csv_arrow.Rd
+++ b/r/man/write_csv_arrow.Rd
@@ -19,7 +19,7 @@ write_csv_arrow(
 \arguments{
 \item{x}{\code{data.frame}, \link{RecordBatch}, or \link{Table}}
 
-\item{sink}{A string file path, URI, or \link{OutputStream}, or path in a file
+\item{sink}{A string file path, connection, URI, or \link{OutputStream}, or path in a file
 system (\code{SubTreeFileSystem})}
 
 \item{file}{file name. Specify this or \code{sink}, not both.}
diff --git a/r/man/write_feather.Rd b/r/man/write_feather.Rd
index 0d3a7da3b90b4..823bd2224eac2 100644
--- a/r/man/write_feather.Rd
+++ b/r/man/write_feather.Rd
@@ -25,7 +25,7 @@ write_ipc_file(
 \arguments{
 \item{x}{\code{data.frame}, \link{RecordBatch}, or \link{Table}}
 
-\item{sink}{A string file path, URI, or \link{OutputStream}, or path in a file
+\item{sink}{A string file path, connection, URI, or \link{OutputStream}, or path in a file
 system (\code{SubTreeFileSystem})}
 
 \item{version}{integer Feather file version, Version 1 or Version 2. Version 2 is the default.}
diff --git a/r/man/write_ipc_stream.Rd b/r/man/write_ipc_stream.Rd
index 094e3ad11a0c8..da9bb6bcacb45 100644
--- a/r/man/write_ipc_stream.Rd
+++ b/r/man/write_ipc_stream.Rd
@@ -9,7 +9,7 @@ write_ipc_stream(x, sink, ...)
 \arguments{
 \item{x}{\code{data.frame}, \link{RecordBatch}, or \link{Table}}
 
-\item{sink}{A string file path, URI, or \link{OutputStream}, or path in a file
+\item{sink}{A string file path, connection, URI, or \link{OutputStream}, or path in a file
 system (\code{SubTreeFileSystem})}
 
 \item{...}{extra parameters passed to \code{write_feather()}.}
diff --git a/r/man/write_parquet.Rd b/r/man/write_parquet.Rd
index 480abb12fcf4a..954c692dad2f1 100644
--- a/r/man/write_parquet.Rd
+++ b/r/man/write_parquet.Rd
@@ -22,7 +22,7 @@ write_parquet(
 \arguments{
 \item{x}{\code{data.frame}, \link{RecordBatch}, or \link{Table}}
 
-\item{sink}{A string file path, URI, or \link{OutputStream}, or path in a file
+\item{sink}{A string file path, connection, URI, or \link{OutputStream}, or path in a file
 system (\code{SubTreeFileSystem})}
 
 \item{chunk_size}{how many rows of data to write to disk at once. This
diff --git a/r/pkgdown/assets/versions.json b/r/pkgdown/assets/versions.json
index e4e9534a81b46..43f0b3fac62a1 100644
--- a/r/pkgdown/assets/versions.json
+++ b/r/pkgdown/assets/versions.json
@@ -1,12 +1,16 @@
 [
     {
-        "name": "15.0.2.9000 (dev)",
+        "name": "16.1.0.9000 (dev)",
         "version": "dev/"
     },
     {
-        "name": "15.0.2 (release)",
+        "name": "16.1.0 (release)",
         "version": ""
     },
+    {
+        "name": "15.0.2",
+        "version": "15.0/"
+    },
     {
         "name": "14.0.2",
         "version": "14.0/"
diff --git a/r/src/arrowExports.cpp b/r/src/arrowExports.cpp
index 75e0f27b4002e..d5aec50219e0b 100644
--- a/r/src/arrowExports.cpp
+++ b/r/src/arrowExports.cpp
@@ -1163,8 +1163,8 @@ extern "C" SEXP _arrow_ExecNode_Aggregate(SEXP input_sexp, SEXP options_sexp, SE
 
 // compute-exec.cpp
 #if defined(ARROW_R_WITH_ACERO)
-std::shared_ptr<acero::ExecNode> ExecNode_Join(const std::shared_ptr<acero::ExecNode>& input, acero::JoinType join_type, const std::shared_ptr<acero::ExecNode>& right_data, std::vector<std::string> left_keys, std::vector<std::string> right_keys, std::vector<std::string> left_output, std::vector<std::string> right_output, std::string output_suffix_for_left, std::string output_suffix_for_right);
-extern "C" SEXP _arrow_ExecNode_Join(SEXP input_sexp, SEXP join_type_sexp, SEXP right_data_sexp, SEXP left_keys_sexp, SEXP right_keys_sexp, SEXP left_output_sexp, SEXP right_output_sexp, SEXP output_suffix_for_left_sexp, SEXP output_suffix_for_right_sexp){
+std::shared_ptr<acero::ExecNode> ExecNode_Join(const std::shared_ptr<acero::ExecNode>& input, acero::JoinType join_type, const std::shared_ptr<acero::ExecNode>& right_data, std::vector<std::string> left_keys, std::vector<std::string> right_keys, std::vector<std::string> left_output, std::vector<std::string> right_output, std::string output_suffix_for_left, std::string output_suffix_for_right, bool na_matches);
+extern "C" SEXP _arrow_ExecNode_Join(SEXP input_sexp, SEXP join_type_sexp, SEXP right_data_sexp, SEXP left_keys_sexp, SEXP right_keys_sexp, SEXP left_output_sexp, SEXP right_output_sexp, SEXP output_suffix_for_left_sexp, SEXP output_suffix_for_right_sexp, SEXP na_matches_sexp){
 BEGIN_CPP11
 	arrow::r::Input<const std::shared_ptr<acero::ExecNode>&>::type input(input_sexp);
 	arrow::r::Input<acero::JoinType>::type join_type(join_type_sexp);
@@ -1175,11 +1175,12 @@ BEGIN_CPP11
 	arrow::r::Input<std::vector<std::string>>::type right_output(right_output_sexp);
 	arrow::r::Input<std::string>::type output_suffix_for_left(output_suffix_for_left_sexp);
 	arrow::r::Input<std::string>::type output_suffix_for_right(output_suffix_for_right_sexp);
-	return cpp11::as_sexp(ExecNode_Join(input, join_type, right_data, left_keys, right_keys, left_output, right_output, output_suffix_for_left, output_suffix_for_right));
+	arrow::r::Input<bool>::type na_matches(na_matches_sexp);
+	return cpp11::as_sexp(ExecNode_Join(input, join_type, right_data, left_keys, right_keys, left_output, right_output, output_suffix_for_left, output_suffix_for_right, na_matches));
 END_CPP11
 }
 #else
-extern "C" SEXP _arrow_ExecNode_Join(SEXP input_sexp, SEXP join_type_sexp, SEXP right_data_sexp, SEXP left_keys_sexp, SEXP right_keys_sexp, SEXP left_output_sexp, SEXP right_output_sexp, SEXP output_suffix_for_left_sexp, SEXP output_suffix_for_right_sexp){
+extern "C" SEXP _arrow_ExecNode_Join(SEXP input_sexp, SEXP join_type_sexp, SEXP right_data_sexp, SEXP left_keys_sexp, SEXP right_keys_sexp, SEXP left_output_sexp, SEXP right_output_sexp, SEXP output_suffix_for_left_sexp, SEXP output_suffix_for_right_sexp, SEXP na_matches_sexp){
 	Rf_error("Cannot call ExecNode_Join(). See https://arrow.apache.org/docs/r/articles/install.html for help installing Arrow C++ libraries. ");
 }
 #endif
@@ -2980,6 +2981,14 @@ BEGIN_CPP11
 END_CPP11
 }
 // expression.cpp
+std::vector<std::string> compute___expr__field_names_in_expression(const std::shared_ptr<compute::Expression>& x);
+extern "C" SEXP _arrow_compute___expr__field_names_in_expression(SEXP x_sexp){
+BEGIN_CPP11
+	arrow::r::Input<const std::shared_ptr<compute::Expression>&>::type x(x_sexp);
+	return cpp11::as_sexp(compute___expr__field_names_in_expression(x));
+END_CPP11
+}
+// expression.cpp
 std::shared_ptr<compute::Expression> compute___expr__field_ref(std::string name);
 extern "C" SEXP _arrow_compute___expr__field_ref(SEXP name_sexp){
 BEGIN_CPP11
@@ -3464,13 +3473,6 @@ BEGIN_CPP11
 END_CPP11
 }
 // filesystem.cpp
-std::shared_ptr<fs::LocalFileSystem> fs___LocalFileSystem__create();
-extern "C" SEXP _arrow_fs___LocalFileSystem__create(){
-BEGIN_CPP11
-	return cpp11::as_sexp(fs___LocalFileSystem__create());
-END_CPP11
-}
-// filesystem.cpp
 std::shared_ptr<fs::SubTreeFileSystem> fs___SubTreeFileSystem__create(const std::string& base_path, const std::shared_ptr<fs::FileSystem>& base_fs);
 extern "C" SEXP _arrow_fs___SubTreeFileSystem__create(SEXP base_path_sexp, SEXP base_fs_sexp){
 BEGIN_CPP11
@@ -5789,7 +5791,7 @@ static const R_CallMethodDef CallEntries[] = {
 		{ "_arrow_ExecNode_Filter", (DL_FUNC) &_arrow_ExecNode_Filter, 2}, 
 		{ "_arrow_ExecNode_Project", (DL_FUNC) &_arrow_ExecNode_Project, 3}, 
 		{ "_arrow_ExecNode_Aggregate", (DL_FUNC) &_arrow_ExecNode_Aggregate, 3}, 
-		{ "_arrow_ExecNode_Join", (DL_FUNC) &_arrow_ExecNode_Join, 9}, 
+		{ "_arrow_ExecNode_Join", (DL_FUNC) &_arrow_ExecNode_Join, 10}, 
 		{ "_arrow_ExecNode_Union", (DL_FUNC) &_arrow_ExecNode_Union, 2}, 
 		{ "_arrow_ExecNode_Fetch", (DL_FUNC) &_arrow_ExecNode_Fetch, 3}, 
 		{ "_arrow_ExecNode_OrderBy", (DL_FUNC) &_arrow_ExecNode_OrderBy, 2}, 
@@ -5951,6 +5953,7 @@ static const R_CallMethodDef CallEntries[] = {
 		{ "_arrow_compute___expr__call", (DL_FUNC) &_arrow_compute___expr__call, 3}, 
 		{ "_arrow_compute___expr__is_field_ref", (DL_FUNC) &_arrow_compute___expr__is_field_ref, 1}, 
 		{ "_arrow_compute___expr__get_field_ref_name", (DL_FUNC) &_arrow_compute___expr__get_field_ref_name, 1}, 
+		{ "_arrow_compute___expr__field_names_in_expression", (DL_FUNC) &_arrow_compute___expr__field_names_in_expression, 1}, 
 		{ "_arrow_compute___expr__field_ref", (DL_FUNC) &_arrow_compute___expr__field_ref, 1}, 
 		{ "_arrow_compute___expr__nested_field_ref", (DL_FUNC) &_arrow_compute___expr__nested_field_ref, 2}, 
 		{ "_arrow_compute___expr__scalar", (DL_FUNC) &_arrow_compute___expr__scalar, 1}, 
@@ -6005,7 +6008,6 @@ static const R_CallMethodDef CallEntries[] = {
 		{ "_arrow_fs___FileSystem__OpenOutputStream", (DL_FUNC) &_arrow_fs___FileSystem__OpenOutputStream, 2}, 
 		{ "_arrow_fs___FileSystem__OpenAppendStream", (DL_FUNC) &_arrow_fs___FileSystem__OpenAppendStream, 2}, 
 		{ "_arrow_fs___FileSystem__type_name", (DL_FUNC) &_arrow_fs___FileSystem__type_name, 1}, 
-		{ "_arrow_fs___LocalFileSystem__create", (DL_FUNC) &_arrow_fs___LocalFileSystem__create, 0}, 
 		{ "_arrow_fs___SubTreeFileSystem__create", (DL_FUNC) &_arrow_fs___SubTreeFileSystem__create, 2}, 
 		{ "_arrow_fs___SubTreeFileSystem__base_fs", (DL_FUNC) &_arrow_fs___SubTreeFileSystem__base_fs, 1}, 
 		{ "_arrow_fs___SubTreeFileSystem__base_path", (DL_FUNC) &_arrow_fs___SubTreeFileSystem__base_path, 1}, 
diff --git a/r/src/compute-exec.cpp b/r/src/compute-exec.cpp
index e0b3c62c47d7f..d0c50315c299f 100644
--- a/r/src/compute-exec.cpp
+++ b/r/src/compute-exec.cpp
@@ -411,10 +411,17 @@ std::shared_ptr<acero::ExecNode> ExecNode_Join(
     const std::shared_ptr<acero::ExecNode>& right_data,
     std::vector<std::string> left_keys, std::vector<std::string> right_keys,
     std::vector<std::string> left_output, std::vector<std::string> right_output,
-    std::string output_suffix_for_left, std::string output_suffix_for_right) {
+    std::string output_suffix_for_left, std::string output_suffix_for_right,
+    bool na_matches) {
   std::vector<arrow::FieldRef> left_refs, right_refs, left_out_refs, right_out_refs;
+  std::vector<acero::JoinKeyCmp> key_cmps;
   for (auto&& name : left_keys) {
     left_refs.emplace_back(std::move(name));
+    // Populate key_cmps in this loop, one for each key
+    // Note that Acero supports having different values for each key, but dplyr
+    // only supports one value for all keys, so we're only going to support that
+    // for now.
+    key_cmps.emplace_back(na_matches ? acero::JoinKeyCmp::IS : acero::JoinKeyCmp::EQ);
   }
   for (auto&& name : right_keys) {
     right_refs.emplace_back(std::move(name));
@@ -434,10 +441,11 @@ std::shared_ptr<acero::ExecNode> ExecNode_Join(
 
   return MakeExecNodeOrStop(
       "hashjoin", input->plan(), {input.get(), right_data.get()},
-      acero::HashJoinNodeOptions{
-          join_type, std::move(left_refs), std::move(right_refs),
-          std::move(left_out_refs), std::move(right_out_refs), compute::literal(true),
-          std::move(output_suffix_for_left), std::move(output_suffix_for_right)});
+      acero::HashJoinNodeOptions{join_type, std::move(left_refs), std::move(right_refs),
+                                 std::move(left_out_refs), std::move(right_out_refs),
+                                 std::move(key_cmps), compute::literal(true),
+                                 std::move(output_suffix_for_left),
+                                 std::move(output_suffix_for_right)});
 }
 
 // [[acero::export]]
diff --git a/r/src/expression.cpp b/r/src/expression.cpp
index e9d08e13affe0..cd9737f71fbc0 100644
--- a/r/src/expression.cpp
+++ b/r/src/expression.cpp
@@ -64,6 +64,23 @@ std::string compute___expr__get_field_ref_name(
   return "";
 }
 
+// [[arrow::export]]
+std::vector<std::string> compute___expr__field_names_in_expression(
+    const std::shared_ptr<compute::Expression>& x) {
+  std::vector<std::string> names;
+  for (const auto& ref : compute::FieldsInExpression(*x)) {
+    if (ref.IsNested()) {
+      // Slight hack: this isn't the field's "name", but it's good enough
+      // for my current purposes. A nested field ref doesn't have a name property.
+      // Alternatively, we could skip nested refs like in get_field_ref_name
+      names.push_back(ref.ToString());
+    } else {
+      names.push_back(*ref.name());
+    }
+  }
+  return names;
+}
+
 // [[arrow::export]]
 std::shared_ptr<compute::Expression> compute___expr__field_ref(std::string name) {
   return std::make_shared<compute::Expression>(compute::field_ref(std::move(name)));
diff --git a/r/src/extension-impl.cpp b/r/src/extension-impl.cpp
index a13b252b2832f..14c771cc98e4f 100644
--- a/r/src/extension-impl.cpp
+++ b/r/src/extension-impl.cpp
@@ -87,7 +87,9 @@ arrow::Result<std::shared_ptr<arrow::DataType>> RExtensionType::Deserialize(
   return std::shared_ptr<RExtensionType>(cloned.release());
 }
 
-std::string RExtensionType::ToString() const {
+std::string RExtensionType::ToString() const { return ToString(false); }
+
+std::string RExtensionType::ToString(bool show_metadata) const {
   arrow::Result<std::string> result = SafeCallIntoR<std::string>([&]() {
     cpp11::environment instance = r6_instance();
     cpp11::function instance_ToString(instance["ToString"]);
@@ -98,7 +100,11 @@ std::string RExtensionType::ToString() const {
   // In the event of an error (e.g., we are not on the main thread
   // and we are not inside RunWithCapturedR()), just call the default method
   if (!result.ok()) {
+#if ARROW_VERSION_MAJOR >= 16
+    return ExtensionType::ToString(show_metadata);
+#else
     return ExtensionType::ToString();
+#endif
   } else {
     return result.ValueUnsafe();
   }
diff --git a/r/src/extension.h b/r/src/extension.h
index fbd3ad484691a..6e6c6f7c29761 100644
--- a/r/src/extension.h
+++ b/r/src/extension.h
@@ -52,6 +52,8 @@ class RExtensionType : public arrow::ExtensionType {
 
   std::string Serialize() const { return extension_metadata_; }
 
+  std::string ToString(bool show_metadata = false) const;
+  // wrapper for libarrow < 16
   std::string ToString() const;
 
   cpp11::sexp Convert(const std::shared_ptr<arrow::ChunkedArray>& array) const;
diff --git a/r/src/filesystem.cpp b/r/src/filesystem.cpp
index 23bcb81e8faae..2274a3d7ff7a2 100644
--- a/r/src/filesystem.cpp
+++ b/r/src/filesystem.cpp
@@ -238,13 +238,6 @@ std::string fs___FileSystem__type_name(
   return file_system->type_name();
 }
 
-// [[arrow::export]]
-std::shared_ptr<fs::LocalFileSystem> fs___LocalFileSystem__create() {
-  // Affects OpenInputFile/OpenInputStream
-  auto io_context = MainRThread::GetInstance().CancellableIOContext();
-  return std::make_shared<fs::LocalFileSystem>(io_context);
-}
-
 // [[arrow::export]]
 std::shared_ptr<fs::SubTreeFileSystem> fs___SubTreeFileSystem__create(
     const std::string& base_path, const std::shared_ptr<fs::FileSystem>& base_fs) {
@@ -268,9 +261,10 @@ cpp11::writable::list fs___FileSystemFromUri(const std::string& path) {
   using cpp11::literals::operator"" _nm;
 
   std::string out_path;
-  return cpp11::writable::list(
-      {"fs"_nm = cpp11::to_r6(ValueOrStop(fs::FileSystemFromUri(path, &out_path))),
-       "path"_nm = out_path});
+  auto io_context = MainRThread::GetInstance().CancellableIOContext();
+  return cpp11::writable::list({"fs"_nm = cpp11::to_r6(ValueOrStop(
+                                    fs::FileSystemFromUri(path, io_context, &out_path))),
+                                "path"_nm = out_path});
 }
 
 // [[arrow::export]]
diff --git a/r/src/io.cpp b/r/src/io.cpp
index 4d5ee31794ae8..2f36d51dcd7ab 100644
--- a/r/src/io.cpp
+++ b/r/src/io.cpp
@@ -212,11 +212,16 @@ void io___BufferOutputStream__Write(
 class RConnectionFileInterface : public virtual arrow::io::FileInterface {
  public:
   explicit RConnectionFileInterface(cpp11::sexp connection_sexp)
-      : connection_sexp_(connection_sexp), closed_(false) {
+      : connection_sexp_(connection_sexp),
+        closed_(false),
+        seekable_(false),
+        bytes_written_(0),
+        bytes_read_(0) {
     check_closed();
+    seekable_ = check_seekable();
   }
 
-  arrow::Status Close() {
+  arrow::Status Close() override {
     if (closed_) {
       return arrow::Status::OK();
     }
@@ -227,11 +232,21 @@ class RConnectionFileInterface : public virtual arrow::io::FileInterface {
                              "close() on R connection");
   }
 
-  arrow::Result<int64_t> Tell() const {
+  arrow::Result<int64_t> Tell() const override {
     if (closed()) {
       return arrow::Status::IOError("R connection is closed");
     }
 
+    // R connections use seek() with no additional arguments as a tell()
+    // implementation; however, non-seekable connections will error if you
+    // do this. This heuristic allows Tell() to return a reasonable value
+    // (used by at least the IPC writer).
+    if (!seekable_ && bytes_written_ > 0) {
+      return bytes_written_;
+    } else if (!seekable_) {
+      return bytes_read_;
+    }
+
     return SafeCallIntoR<int64_t>(
         [&]() {
           cpp11::sexp result = cpp11::package("base")["seek"](connection_sexp_);
@@ -240,7 +255,7 @@ class RConnectionFileInterface : public virtual arrow::io::FileInterface {
         "tell() on R connection");
   }
 
-  bool closed() const { return closed_; }
+  bool closed() const override { return closed_; }
 
  protected:
   cpp11::sexp connection_sexp_;
@@ -261,13 +276,14 @@ class RConnectionFileInterface : public virtual arrow::io::FileInterface {
     return SafeCallIntoR<int64_t>(
         [&] {
           cpp11::function read_bin = cpp11::package("base")["readBin"];
-          cpp11::writable::raws ptype((R_xlen_t)0);
+          cpp11::writable::raws ptype(static_cast<R_xlen_t>(0));
           cpp11::integers n = cpp11::as_sexp<int>(static_cast<int>(nbytes));
 
           cpp11::sexp result = read_bin(connection_sexp_, ptype, n);
 
           int64_t result_size = cpp11::safe[Rf_xlength](result);
           memcpy(out, cpp11::safe[RAW](result), result_size);
+          bytes_read_++;
           return result_size;
         },
         "readBin() on R connection");
@@ -294,6 +310,7 @@ class RConnectionFileInterface : public virtual arrow::io::FileInterface {
 
           cpp11::function write_bin = cpp11::package("base")["writeBin"];
           write_bin(data_raw, connection_sexp_);
+          bytes_written_ += nbytes;
         },
         "writeBin() on R connection");
   }
@@ -312,6 +329,9 @@ class RConnectionFileInterface : public virtual arrow::io::FileInterface {
 
  private:
   bool closed_;
+  bool seekable_;
+  int64_t bytes_written_;
+  int64_t bytes_read_;
 
   bool check_closed() {
     if (closed_) {
@@ -333,6 +353,15 @@ class RConnectionFileInterface : public virtual arrow::io::FileInterface {
 
     return closed_;
   }
+
+  bool check_seekable() {
+    auto is_seekable_result = SafeCallIntoR<bool>([&] {
+      cpp11::sexp result = cpp11::package("base")["isSeekable"](connection_sexp_);
+      return cpp11::as_cpp<bool>(result);
+    });
+
+    return is_seekable_result.ok() && *is_seekable_result;
+  }
 };
 
 class RConnectionInputStream : public virtual arrow::io::InputStream,
@@ -341,9 +370,11 @@ class RConnectionInputStream : public virtual arrow::io::InputStream,
   explicit RConnectionInputStream(cpp11::sexp connection_sexp)
       : RConnectionFileInterface(connection_sexp) {}
 
-  arrow::Result<int64_t> Read(int64_t nbytes, void* out) { return ReadBase(nbytes, out); }
+  arrow::Result<int64_t> Read(int64_t nbytes, void* out) override {
+    return ReadBase(nbytes, out);
+  }
 
-  arrow::Result<std::shared_ptr<arrow::Buffer>> Read(int64_t nbytes) {
+  arrow::Result<std::shared_ptr<arrow::Buffer>> Read(int64_t nbytes) override {
     return ReadBase(nbytes);
   }
 };
@@ -373,13 +404,15 @@ class RConnectionRandomAccessFile : public arrow::io::RandomAccessFile,
     }
   }
 
-  arrow::Result<int64_t> GetSize() { return size_; }
+  arrow::Result<int64_t> GetSize() override { return size_; }
 
-  arrow::Status Seek(int64_t pos) { return SeekBase(pos); }
+  arrow::Status Seek(int64_t pos) override { return SeekBase(pos); }
 
-  arrow::Result<int64_t> Read(int64_t nbytes, void* out) { return ReadBase(nbytes, out); }
+  arrow::Result<int64_t> Read(int64_t nbytes, void* out) override {
+    return ReadBase(nbytes, out);
+  }
 
-  arrow::Result<std::shared_ptr<arrow::Buffer>> Read(int64_t nbytes) {
+  arrow::Result<std::shared_ptr<arrow::Buffer>> Read(int64_t nbytes) override {
     return ReadBase(nbytes);
   }
 
@@ -393,7 +426,7 @@ class RConnectionOutputStream : public arrow::io::OutputStream,
   explicit RConnectionOutputStream(cpp11::sexp connection_sexp)
       : RConnectionFileInterface(connection_sexp) {}
 
-  arrow::Status Write(const void* data, int64_t nbytes) {
+  arrow::Status Write(const void* data, int64_t nbytes) override {
     return WriteBase(data, nbytes);
   }
 };
diff --git a/r/tests/testthat/_snaps/dataset-dplyr.md b/r/tests/testthat/_snaps/dataset-dplyr.md
new file mode 100644
index 0000000000000..a2d9820a4e78a
--- /dev/null
+++ b/r/tests/testthat/_snaps/dataset-dplyr.md
@@ -0,0 +1,9 @@
+# dplyr method not implemented messages
+
+    Code
+      ds %>% filter(int > 6, dbl > max(dbl))
+    Condition
+      Error in `dbl > max(dbl)`:
+      ! Expression not supported in filter() in Arrow
+      > Call collect() first to pull data into R.
+
diff --git a/r/tests/testthat/_snaps/dplyr-across.md b/r/tests/testthat/_snaps/dplyr-across.md
new file mode 100644
index 0000000000000..47b5bd61b39ce
--- /dev/null
+++ b/r/tests/testthat/_snaps/dplyr-across.md
@@ -0,0 +1,11 @@
+# expand_across correctly expands quosures
+
+    Code
+      InMemoryDataset$create(example_data) %>% mutate(across(c(dbl, dbl2), round,
+      digits = -1))
+    Condition
+      Error in `mutate.Dataset()`:
+      ! `...` argument to `across()` is deprecated in dplyr and not supported in Arrow
+      > Convert your call into a function or formula including the arguments
+      > Or, call collect() first to pull data into R.
+
diff --git a/r/tests/testthat/_snaps/dplyr-eval.md b/r/tests/testthat/_snaps/dplyr-eval.md
new file mode 100644
index 0000000000000..0b4639f1fe7a7
--- /dev/null
+++ b/r/tests/testthat/_snaps/dplyr-eval.md
@@ -0,0 +1,27 @@
+# try_arrow_dplyr/abandon_ship adds the right message about collect()
+
+    Code
+      tester(ds, i)
+    Condition
+      Error in `validation_error()`:
+      ! arg is 0
+
+---
+
+    Code
+      tester(ds, i)
+    Condition
+      Error in `arrow_not_supported()`:
+      ! arg == 1 not supported in Arrow
+      > Call collect() first to pull data into R.
+
+---
+
+    Code
+      tester(ds, i)
+    Condition
+      Error in `arrow_not_supported()`:
+      ! arg greater than 0 not supported in Arrow
+      > Try setting arg to -1
+      > Or, call collect() first to pull data into R.
+
diff --git a/r/tests/testthat/_snaps/dplyr-funcs-datetime.md b/r/tests/testthat/_snaps/dplyr-funcs-datetime.md
new file mode 100644
index 0000000000000..036c8b49e80a0
--- /dev/null
+++ b/r/tests/testthat/_snaps/dplyr-funcs-datetime.md
@@ -0,0 +1,11 @@
+# `as.Date()` and `as_date()`
+
+    Code
+      test_df %>% InMemoryDataset$create() %>% transmute(date_char_ymd = as.Date(
+        character_ymd_var, tryFormats = c("%Y-%m-%d", "%Y/%m/%d"))) %>% collect()
+    Condition
+      Error in `as.Date()`:
+      ! `as.Date()` with multiple `tryFormats` not supported in Arrow
+      > Consider using the lubridate specialised parsing functions `ymd()`, `ymd()`, etc.
+      > Or, call collect() first to pull data into R.
+
diff --git a/r/tests/testthat/_snaps/dplyr-mutate.md b/r/tests/testthat/_snaps/dplyr-mutate.md
new file mode 100644
index 0000000000000..a5bbc0163bc4f
--- /dev/null
+++ b/r/tests/testthat/_snaps/dplyr-mutate.md
@@ -0,0 +1,25 @@
+# transmute() defuses dots arguments (ARROW-13262)
+
+    Code
+      tbl %>% Table$create() %>% transmute(a = stringr::str_c(padded_strings,
+        padded_strings), b = stringr::str_squish(a)) %>% collect()
+    Condition
+      Warning:
+      In stringr::str_squish(a): 
+      i Expression not supported in Arrow
+      > Pulling data into R
+    Output
+      # A tibble: 10 x 2
+         a                                            b    
+         <chr>                                        <chr>
+       1 " a  a "                                     a a  
+       2 "  b    b  "                                 b b  
+       3 "   c      c   "                             c c  
+       4 "    d        d    "                         d d  
+       5 "     e          e     "                     e e  
+       6 "      f            f      "                 f f  
+       7 "       g              g       "             g g  
+       8 "        h                h        "         h h  
+       9 "         i                  i         "     i i  
+      10 "          j                    j          " j j  
+
diff --git a/r/tests/testthat/_snaps/dplyr-query.md b/r/tests/testthat/_snaps/dplyr-query.md
index a9d4da26cca0b..cf5ac594acb2b 100644
--- a/r/tests/testthat/_snaps/dplyr-query.md
+++ b/r/tests/testthat/_snaps/dplyr-query.md
@@ -1,4 +1,6 @@
 # Scalars in expressions match the type of the field, if possible
 
-    Expression int == "5" not supported in Arrow; pulling data into R
+    In int == "5": 
+    i Expression not supported in Arrow
+    > Pulling data into R
 
diff --git a/r/tests/testthat/_snaps/dplyr-summarize.md b/r/tests/testthat/_snaps/dplyr-summarize.md
index bbb8e64bfe790..449a194d68fe5 100644
--- a/r/tests/testthat/_snaps/dplyr-summarize.md
+++ b/r/tests/testthat/_snaps/dplyr-summarize.md
@@ -3,11 +3,44 @@
     Code
       InMemoryDataset$create(tbl) %>% summarize(distinct = n_distinct())
     Condition
-      Error:
-      ! Error : In n_distinct(), n_distinct() with 0 arguments not supported in Arrow
-      Call collect() first to pull data into R.
+      Error in `n_distinct()`:
+      ! n_distinct() with 0 arguments not supported in Arrow
+      > Call collect() first to pull data into R.
 
 ---
 
-    Error : In n_distinct(int, lgl), Multiple arguments to n_distinct() not supported in Arrow; pulling data into R
+    In n_distinct(int, lgl): 
+    i Multiple arguments to n_distinct() not supported in Arrow
+    > Pulling data into R
+
+# Expressions on aggregations
+
+    Code
+      record_batch(tbl) %>% summarise(any(any(lgl)))
+    Condition
+      Warning:
+      In any(any(lgl)): 
+      i aggregate within aggregate expression not supported in Arrow
+      > Pulling data into R
+    Output
+      # A tibble: 1 x 1
+        `any(any(lgl))`
+        <lgl>          
+      1 TRUE           
+
+# Can use across() within summarise()
+
+    Code
+      data.frame(x = 1, y = 2) %>% arrow_table() %>% group_by(x) %>% summarise(across(
+        everything())) %>% collect()
+    Condition
+      Warning:
+      In y: 
+      i Expression is not a valid aggregation expression or is not supported in Arrow
+      > Pulling data into R
+    Output
+      # A tibble: 1 x 2
+            x     y
+        <dbl> <dbl>
+      1     1     2
 
diff --git a/r/tests/testthat/helper-expectation.R b/r/tests/testthat/helper-expectation.R
index 090ed36aa7f94..63d0163aa3129 100644
--- a/r/tests/testthat/helper-expectation.R
+++ b/r/tests/testthat/helper-expectation.R
@@ -88,7 +88,7 @@ compare_dplyr_binding <- function(expr, tbl, warning = NA, ...) {
 
   if (isTRUE(warning)) {
     # Special-case the simple warning:
-    warning <- "not supported in Arrow; pulling data into R"
+    warning <- "> Pulling data into R"
   }
 
   # Evaluate `expr` on a Table object and compare with `expected`
@@ -289,3 +289,8 @@ split_vector_as_list <- function(vec) {
 expect_across_equal <- function(across_expr, expected, tbl) {
   expect_identical(expand_across(as_adq(tbl), across_expr), new_quosures(expected))
 }
+
+expect_arrow_eval_error <- function(expr, ..., .data = example_data) {
+  mask <- arrow_mask(as_adq(.data))
+  expect_error(arrow_eval({{ expr }}, mask), ...)
+}
diff --git a/r/tests/testthat/test-Array.R b/r/tests/testthat/test-Array.R
index bb005605de318..98068bdea20d5 100644
--- a/r/tests/testthat/test-Array.R
+++ b/r/tests/testthat/test-Array.R
@@ -818,11 +818,6 @@ test_that("Handling string data with embedded nuls", {
   )
   array_with_nul <- arrow_array(raws)$cast(utf8())
 
-  # The behavior of the warnings/errors is slightly different with and without
-  # altrep. Without it (i.e. 3.5.0 and below, the error would trigger immediately
-  # on `as.vector()` where as with it, the error only happens on materialization)
-  skip_on_r_older_than("3.6")
-
   # no error on conversion, because altrep laziness
   v <- expect_error(as.vector(array_with_nul), NA)
 
diff --git a/r/tests/testthat/test-RecordBatch.R b/r/tests/testthat/test-RecordBatch.R
index f29b75dbf4095..5987f5a4b7c17 100644
--- a/r/tests/testthat/test-RecordBatch.R
+++ b/r/tests/testthat/test-RecordBatch.R
@@ -595,14 +595,10 @@ test_that("RecordBatch supports cbind", {
   )
 
   # Rejects Table and ChunkedArray arguments
-  if (getRversion() >= "4.0.0") {
-    # R 3.6 cbind dispatch rules cause cbind to fall back to default impl if
-    # there are multiple arguments with distinct cbind implementations
-    expect_error(
-      cbind(record_batch(a = 1:2), arrow_table(b = 3:4)),
-      regexp = "Cannot cbind a RecordBatch with Tables or ChunkedArrays"
-    )
-  }
+  expect_error(
+    cbind(record_batch(a = 1:2), arrow_table(b = 3:4)),
+    regexp = "Cannot cbind a RecordBatch with Tables or ChunkedArrays"
+  )
   expect_error(
     cbind(record_batch(a = 1:2), b = chunked_array(1, 2)),
     regexp = "Cannot cbind a RecordBatch with Tables or ChunkedArrays"
@@ -622,10 +618,6 @@ test_that("Handling string data with embedded nuls", {
   batch_with_nul <- record_batch(a = 1:5, b = raws)
   batch_with_nul$b <- batch_with_nul$b$cast(utf8())
 
-  # The behavior of the warnings/errors is slightly different with and without
-  # altrep. Without it (i.e. 3.5.0 and below, the error would trigger immediately
-  # on `as.vector()` where as with it, the error only happens on materialization)
-  skip_on_r_older_than("3.6")
   df <- as.data.frame(batch_with_nul)
 
   expect_error(
diff --git a/r/tests/testthat/test-Table.R b/r/tests/testthat/test-Table.R
index ce3254a158eee..f6cec3b2b7683 100644
--- a/r/tests/testthat/test-Table.R
+++ b/r/tests/testthat/test-Table.R
@@ -581,10 +581,6 @@ test_that("Table supports cbind", {
 })
 
 test_that("cbind.Table handles record batches and tables", {
-  # R 3.6 cbind dispatch rules cause cbind to fall back to default impl if
-  # there are multiple arguments with distinct cbind implementations
-  skip_if(getRversion() < "4.0.0", "R 3.6 cbind dispatch rules prevent this behavior")
-
   expect_equal(
     cbind(arrow_table(a = 1L:2L), record_batch(b = 4:5)),
     arrow_table(a = 1L:2L, b = 4:5)
diff --git a/r/tests/testthat/test-altrep.R b/r/tests/testthat/test-altrep.R
index 7a66d0e778282..50bd40988e550 100644
--- a/r/tests/testthat/test-altrep.R
+++ b/r/tests/testthat/test-altrep.R
@@ -15,8 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-skip_on_r_older_than("3.6")
-
 test_that("altrep test functions do not include base altrep", {
   expect_false(is_arrow_altrep(1:10))
   expect_identical(test_arrow_altrep_is_materialized(1:10), NA)
@@ -373,6 +371,11 @@ test_that("altrep min/max/sum identical to R versions for double", {
   expect_altrep_roundtrip(x, max)
   expect_altrep_roundtrip(x, sum)
 
+  # On valgrind the NA_real_ is sometimes transformed to NaN
+  # https://stat.ethz.ch/pipermail/r-devel/2021-April/080683.html
+  # so we skip these there to avoid complicated NA == NaN logic,
+  # and they are tested on a number of other platforms / conditions
+  skip_on_linux_devel()
   x <- c(1, 2, NA_real_)
   expect_altrep_roundtrip(x, min, na.rm = TRUE)
   expect_altrep_roundtrip(x, max, na.rm = TRUE)
diff --git a/r/tests/testthat/test-chunked-array.R b/r/tests/testthat/test-chunked-array.R
index 223f5022d3b94..bb01df427f713 100644
--- a/r/tests/testthat/test-chunked-array.R
+++ b/r/tests/testthat/test-chunked-array.R
@@ -475,11 +475,6 @@ test_that("Handling string data with embedded nuls", {
   )
   chunked_array_with_nul <- ChunkedArray$create(raws)$cast(utf8())
 
-  # The behavior of the warnings/errors is slightly different with and without
-  # altrep. Without it (i.e. 3.5.0 and below, the error would trigger immediately
-  # on `as.vector()` where as with it, the error only happens on materialization)
-  skip_on_r_older_than("3.6")
-
   v <- expect_error(as.vector(chunked_array_with_nul), NA)
 
   expect_error(
diff --git a/r/tests/testthat/test-dataset-dplyr.R b/r/tests/testthat/test-dataset-dplyr.R
index b8d93841921d7..d5c8dc9820a88 100644
--- a/r/tests/testthat/test-dataset-dplyr.R
+++ b/r/tests/testthat/test-dataset-dplyr.R
@@ -163,17 +163,6 @@ See $.data for the source Arrow object",
   )
 })
 
-test_that("mutate() features not yet implemented", {
-  ds <- open_dataset(dataset_dir, partitioning = schema(part = uint8()))
-  expect_error(
-    ds %>%
-      group_by(int) %>%
-      mutate(avg = mean(int)),
-    "window functions not currently supported in Arrow\nCall collect() first to pull data into R.",
-    fixed = TRUE
-  )
-})
-
 test_that("filter scalar validation doesn't crash (ARROW-7772)", {
   ds <- open_dataset(dataset_dir, partitioning = schema(part = uint8()))
   expect_error(
@@ -334,10 +323,9 @@ test_that("head/tail on query on dataset", {
 test_that("dplyr method not implemented messages", {
   ds <- open_dataset(dataset_dir)
   # This one is more nuanced
-  expect_error(
+  expect_snapshot(
     ds %>% filter(int > 6, dbl > max(dbl)),
-    "Filter expression not supported for Arrow Datasets: dbl > max(dbl)\nCall collect() first to pull data into R.",
-    fixed = TRUE
+    error = TRUE
   )
 })
 
diff --git a/r/tests/testthat/test-dplyr-across.R b/r/tests/testthat/test-dplyr-across.R
index eebb8a23eadf7..5396dcbe79936 100644
--- a/r/tests/testthat/test-dplyr-across.R
+++ b/r/tests/testthat/test-dplyr-across.R
@@ -18,7 +18,6 @@
 library(dplyr, warn.conflicts = FALSE)
 
 test_that("expand_across correctly expands quosures", {
-
   # single unnamed function
   expect_across_equal(
     quos(across(c(dbl, dbl2), round)),
@@ -117,16 +116,6 @@ test_that("expand_across correctly expands quosures", {
     example_data
   )
 
-  # ellipses (...) are a deprecated argument
-  expect_error(
-    expand_across(
-      as_adq(example_data),
-      quos(across(c(dbl, dbl2), round, digits = -1))
-    ),
-    regexp = "`...` argument to `across()` is deprecated in dplyr and not supported in Arrow",
-    fixed = TRUE
-  )
-
   # alternative ways of specifying .fns - as a list
   expect_across_equal(
     quos(across(1:dbl2, list(round))),
@@ -233,10 +222,18 @@ test_that("expand_across correctly expands quosures", {
     ),
     example_data
   )
+
+  skip_if_not_available("dataset")
+  # ellipses (...) are a deprecated argument
+  # abandon_ship message offers multiple suggestions
+  expect_snapshot(
+    InMemoryDataset$create(example_data) %>%
+      mutate(across(c(dbl, dbl2), round, digits = -1)),
+    error = TRUE
+  )
 })
 
 test_that("purrr-style lambda functions are supported", {
-
   # using `.x` inside lambda functions
   expect_across_equal(
     quos(across(c(dbl, dbl2), ~ round(.x, digits = 0))),
@@ -279,7 +276,17 @@ test_that("purrr-style lambda functions are supported", {
   )
 })
 
-test_that("ARROW-14071 - function(x)-style lambda functions are not supported", {
+test_that("ARROW-14071 - R functions from a user's environment", {
+  makeWhole <- function(x) round(x, digits = 0)
+  compare_dplyr_binding(
+    .input %>%
+      mutate(across(c(int, dbl), makeWhole)) %>%
+      collect(),
+    example_data
+  )
+})
+
+test_that("function(x)-style lambda functions are not supported", {
   expect_error(
     expand_across(as_adq(example_data), quos(across(.cols = c(dbl, dbl2), list(function(x) {
       head(x, 1)
@@ -301,17 +308,15 @@ test_that("ARROW-14071 - function(x)-style lambda functions are not supported",
 })
 
 test_that("if_all() and if_any() are supported", {
-
   expect_across_equal(
-    quos(if_any(everything(), ~is.na(.x))),
+    quos(if_any(everything(), ~ is.na(.x))),
     quos(is.na(int) | is.na(dbl) | is.na(dbl2) | is.na(lgl) | is.na(false) | is.na(chr) | is.na(fct)),
     example_data
   )
 
   expect_across_equal(
-    quos(if_all(everything(), ~is.na(.x))),
+    quos(if_all(everything(), ~ is.na(.x))),
     quos(is.na(int) & is.na(dbl) & is.na(dbl2) & is.na(lgl) & is.na(false) & is.na(chr) & is.na(fct)),
     example_data
   )
-
 })
diff --git a/r/tests/testthat/test-dplyr-collapse.R b/r/tests/testthat/test-dplyr-collapse.R
index a8aa5556f1e0d..f658c531e78b5 100644
--- a/r/tests/testthat/test-dplyr-collapse.R
+++ b/r/tests/testthat/test-dplyr-collapse.R
@@ -168,33 +168,10 @@ total: int64
 extra: int64 (multiply_checked(total, 5))
 
 * Sorted by lgl [asc]
-See $.data for the source Arrow object",
-    fixed = TRUE
-  )
-  expect_output(
-    print(q$.data),
-    "Table (query)
-int: int32
-lgl: bool
-
-* Aggregations:
-total: sum(int)
-* Filter: (dbl > 2)
-* Grouped by lgl
 See $.data for the source Arrow object",
     fixed = TRUE
   )
 
-  skip_if(getRversion() < "3.6.0", "TODO investigate why these aren't equal")
-  # On older R versions:
-  #  ── Failure (test-dplyr-collapse.R:172:3): Properties of collapsed query ────────
-  # head(q, 1) %>% collect() not equal to tibble::tibble(lgl = FALSE, total = 8L, extra = 40).
-  # Component "total": Mean relative difference: 0.3846154
-  # Component "extra": Mean relative difference: 0.3846154
-  # ── Failure (test-dplyr-collapse.R:176:3): Properties of collapsed query ────────
-  # tail(q, 1) %>% collect() not equal to tibble::tibble(lgl = NA, total = 25L, extra = 125).
-  # Component "total": Mean relative difference: 0.9230769
-  # Component "extra": Mean relative difference: 0.9230769
   expect_equal(
     q %>%
       arrange(lgl) %>%
diff --git a/r/tests/testthat/test-dplyr-eval.R b/r/tests/testthat/test-dplyr-eval.R
new file mode 100644
index 0000000000000..0b0b9f98f4326
--- /dev/null
+++ b/r/tests/testthat/test-dplyr-eval.R
@@ -0,0 +1,61 @@
+# 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.
+
+test_that("various paths in arrow_eval", {
+  expect_arrow_eval_error(
+    assert_is(1, "character"),
+    class = "validation_error"
+  )
+  expect_arrow_eval_error(
+    NoTaVaRiAbLe,
+    class = "validation_error"
+  )
+  expect_arrow_eval_error(
+    match.arg("z", c("a", "b")),
+    class = "validation_error"
+  )
+  expect_arrow_eval_error(
+    stop("something something NotImplementedError"),
+    class = "arrow_not_supported"
+  )
+})
+
+test_that("try_arrow_dplyr/abandon_ship adds the right message about collect()", {
+  tester <- function(.data, arg) {
+    try_arrow_dplyr({
+      if (arg == 0) {
+        # This one just stops and doesn't recommend calling collect()
+        validation_error("arg is 0")
+      } else if (arg == 1) {
+        # This one recommends calling collect()
+        arrow_not_supported("arg == 1")
+      } else {
+        # Because this one has an alternative suggested, it adds "Or, collect()"
+        arrow_not_supported(
+          "arg greater than 0",
+          body = c(">" = "Try setting arg to -1")
+        )
+      }
+    })
+  }
+
+  skip_if_not_available("dataset")
+  ds <- InMemoryDataset$create(arrow_table(x = 1))
+  for (i in 0:2) {
+    expect_snapshot(tester(ds, i), error = TRUE)
+  }
+})
diff --git a/r/tests/testthat/test-dplyr-filter.R b/r/tests/testthat/test-dplyr-filter.R
index 724b93c96609f..ba086133dcaf4 100644
--- a/r/tests/testthat/test-dplyr-filter.R
+++ b/r/tests/testthat/test-dplyr-filter.R
@@ -277,7 +277,6 @@ test_that("filter environment scope", {
     tbl
   )
   isShortString <- function(x) nchar(x) < 10
-  skip("TODO: ARROW-14071")
   compare_dplyr_binding(
     .input %>%
       select(-fct) %>%
@@ -318,20 +317,28 @@ test_that("Filtering with unsupported functions", {
       filter(int > 2, pnorm(dbl) > .99) %>%
       collect(),
     tbl,
-    warning = "Expression pnorm\\(dbl\\) > 0.99 not supported in Arrow; pulling data into R"
+    warning = paste(
+      "In pnorm\\(dbl\\) > 0.99: ",
+      "i Expression not supported in Arrow",
+      "> Pulling data into R",
+      sep = "\n"
+    )
   )
   compare_dplyr_binding(
     .input %>%
       filter(
         nchar(chr, type = "bytes", allowNA = TRUE) == 1, # bad, Arrow msg
         int > 2, # good
-        pnorm(dbl) > .99 # bad, opaque
+        pnorm(dbl) > .99 # bad, opaque, but we'll error on the first one before we get here
       ) %>%
       collect(),
     tbl,
-    warning = '\\* In nchar\\(chr, type = "bytes", allowNA = TRUE\\) == 1, allowNA = TRUE not supported in Arrow
-\\* Expression pnorm\\(dbl\\) > 0.99 not supported in Arrow
-pulling data into R'
+    warning = paste(
+      'In nchar\\(chr, type = "bytes", allowNA = TRUE\\) == 1: ',
+      "i allowNA = TRUE not supported in Arrow",
+      "> Pulling data into R",
+      sep = "\n"
+    )
   )
 })
 
@@ -468,7 +475,12 @@ test_that(".by argument", {
       filter(int > 2, pnorm(dbl) > .99, .by = chr) %>%
       collect(),
     tbl,
-    warning = "Expression pnorm\\(dbl\\) > 0.99 not supported in Arrow; pulling data into R"
+    warning = paste(
+      "In pnorm\\(dbl\\) > 0.99: ",
+      "i Expression not supported in Arrow",
+      "> Pulling data into R",
+      sep = "\n"
+    )
   )
   expect_error(
     tbl %>%
diff --git a/r/tests/testthat/test-dplyr-funcs-conditional.R b/r/tests/testthat/test-dplyr-funcs-conditional.R
index 52edc25a67f5a..d90dc827b40d5 100644
--- a/r/tests/testthat/test-dplyr-funcs-conditional.R
+++ b/r/tests/testthat/test-dplyr-funcs-conditional.R
@@ -192,6 +192,21 @@ test_that("case_when()", {
       collect(),
     tbl
   )
+
+  # Test finding R functions from the user's environment
+  isIn <- function(x, y) x %in% y
+  withr::with_options(list(arrow.debug = TRUE), {
+    expect_output(
+      compare_dplyr_binding(
+        .input %>%
+          transmute(cw = case_when(isIn(chr, letters[1:3]) ~ 1L) + 41L) %>%
+          collect(),
+        tbl
+      ),
+      "Adding isIn to the function environment"
+    )
+  })
+
   compare_dplyr_binding(
     .input %>%
       filter(case_when(
@@ -233,75 +248,50 @@ test_that("case_when()", {
       )
   )
 
-  # expected errors (which are caught by abandon_ship() and changed to warnings)
-  # TODO: Find a way to test these directly without abandon_ship() interfering
-  expect_error(
-    # no cases
-    expect_warning(
-      tbl %>%
-        Table$create() %>%
-        transmute(cw = case_when()),
-      "case_when"
-    )
+  # validation errors
+  expect_arrow_eval_error(
+    case_when(),
+    "No cases provided",
+    class = "validation_error"
   )
-  expect_error(
-    # argument not a formula
-    expect_warning(
-      tbl %>%
-        Table$create() %>%
-        transmute(cw = case_when(TRUE ~ FALSE, TRUE)),
-      "case_when"
-    )
+  expect_arrow_eval_error(
+    case_when(TRUE ~ FALSE, TRUE),
+    "Each argument to case_when\\(\\) must be a two-sided formula",
+    class = "validation_error"
   )
-  expect_error(
-    # non-logical R scalar on left side of formula
-    expect_warning(
-      tbl %>%
-        Table$create() %>%
-        transmute(cw = case_when(0L ~ FALSE, TRUE ~ FALSE)),
-      "case_when"
-    )
+  expect_arrow_eval_error(
+    case_when(0L ~ FALSE, TRUE ~ FALSE),
+    "Left side of each formula in case_when\\(\\) must be a logical expression",
+    class = "validation_error"
   )
-  expect_error(
+  expect_arrow_eval_error(
     # non-logical Arrow column reference on left side of formula
-    expect_warning(
-      tbl %>%
-        Table$create() %>%
-        transmute(cw = case_when(int ~ FALSE)),
-      "case_when"
-    )
+    case_when(int ~ FALSE),
+    "Left side of each formula in case_when\\(\\) must be a logical expression",
+    class = "validation_error"
   )
-  expect_error(
-    # non-logical Arrow expression on left side of formula
-    expect_warning(
-      tbl %>%
-        Table$create() %>%
-        transmute(cw = case_when(dbl + 3.14159 ~ TRUE)),
-      "case_when"
-    )
+  expect_arrow_eval_error(
+    # non-logical Arrow column reference on left side of formula
+    case_when(dbl + 3.14159 ~ TRUE),
+    "Left side of each formula in case_when\\(\\) must be a logical expression",
+    class = "validation_error"
   )
-
-  expect_error(
-    expect_warning(
-      tbl %>%
-        arrow_table() %>%
-        mutate(cw = case_when(int > 5 ~ 1, .default = c(0, 1)))
-    ),
-    "`.default` must have size"
+  expect_arrow_eval_error(
+    case_when(int > 5 ~ 1, .default = c(0, 1)),
+    "`.default` must have size 1, not size 2",
+    class = "validation_error"
   )
 
-  expect_warning(
-    tbl %>%
-      arrow_table() %>%
-      mutate(cw = case_when(int > 5 ~ 1, .ptype = integer())),
-    "not supported in Arrow"
+  expect_arrow_eval_error(
+    case_when(int > 5 ~ 1, .ptype = integer()),
+    "`case_when\\(\\)` with `.ptype` specified not supported in Arrow",
+    class = "arrow_not_supported"
   )
 
-  expect_warning(
-    tbl %>%
-      arrow_table() %>%
-      mutate(cw = case_when(int > 5 ~ 1, .size = 10)),
-    "not supported in Arrow"
+  expect_arrow_eval_error(
+    case_when(int > 5 ~ 1, .size = 10),
+    "`case_when\\(\\)` with `.size` specified not supported in Arrow",
+    class = "arrow_not_supported"
   )
 
   compare_dplyr_binding(
@@ -485,9 +475,9 @@ test_that("coalesce()", {
   )
 
   # no arguments
-  expect_error(
-    call_binding("coalesce"),
-    "At least one argument must be supplied to coalesce()",
-    fixed = TRUE
+  expect_arrow_eval_error(
+    coalesce(),
+    "At least one argument must be supplied to coalesce\\(\\)",
+    class = "validation_error"
   )
 })
diff --git a/r/tests/testthat/test-dplyr-funcs-datetime.R b/r/tests/testthat/test-dplyr-funcs-datetime.R
index 4d3226798d3ff..e53daf8317837 100644
--- a/r/tests/testthat/test-dplyr-funcs-datetime.R
+++ b/r/tests/testthat/test-dplyr-funcs-datetime.R
@@ -180,7 +180,7 @@ test_that("strptime", {
   )
 
   # these functions' internals use some string processing which requires the
-  # RE2 library (not available on Windows with R 3.6)
+  # RE2 library
   skip_if_not_available("re2")
 
   compare_dplyr_binding(
@@ -198,7 +198,7 @@ test_that("strptime works for individual formats", {
   skip_on_cran()
 
   # these functions' internals use some string processing which requires the
-  # RE2 library (not available on Windows with R 3.6)
+  # RE2 library
   skip_if_not_available("re2")
 
   expect_equal(
@@ -269,7 +269,7 @@ test_that("timestamp round trip correctly via strftime and strptime", {
   skip_on_cran()
 
   # these functions' internals use some string processing which requires the
-  # RE2 library (not available on Windows with R 3.6)
+  # RE2 library
   skip_if_not_available("re2")
 
   tz <- "Pacific/Marquesas"
@@ -291,7 +291,9 @@ test_that("timestamp round trip correctly via strftime and strptime", {
 
   # Some formats are not supported on Windows
   if (!tolower(Sys.info()[["sysname"]]) == "windows") {
-    formats <- c(formats, "%a", "%A", "%b", "%B", "%OS", "%I%p", "%r", "%T%z")
+    # "%r" could also be here, though it is only valid in some locales (those
+    # that use 12 hour formats, so skip for now)
+    formats <- c(formats, "%a", "%A", "%b", "%B", "%OS", "%I%p", "%T%z")
   }
 
   for (fmt in formats) {
@@ -1883,37 +1885,6 @@ test_that("`as.Date()` and `as_date()`", {
     test_df
   )
 
-  # we do not support multiple tryFormats
-  # this is not a simple warning, therefore we cannot use compare_dplyr_binding()
-  # with `warning = TRUE`
-  # arrow_table test
-  expect_warning(
-    test_df %>%
-      arrow_table() %>%
-      mutate(
-        date_char_ymd = as.Date(
-          character_ymd_var,
-          tryFormats = c("%Y-%m-%d", "%Y/%m/%d")
-        )
-      ) %>%
-      collect(),
-    regexp = "Consider using the lubridate specialised parsing functions"
-  )
-
-  # record batch test
-  expect_warning(
-    test_df %>%
-      record_batch() %>%
-      mutate(
-        date_char_ymd = as.Date(
-          character_ymd_var,
-          tryFormats = c("%Y-%m-%d", "%Y/%m/%d")
-        )
-      ) %>%
-      collect(),
-    regexp = "Consider using the lubridate specialised parsing functions"
-  )
-
   # strptime does not support a partial format - Arrow returns NA, while
   # lubridate parses correctly
   # TODO: revisit after ARROW-15813
@@ -1971,6 +1942,22 @@ test_that("`as.Date()` and `as_date()`", {
       collect(),
     test_df
   )
+
+  skip_if_not_available("dataset")
+  # we do not support multiple tryFormats
+  # Use a dataset to test the alternative suggestion message
+  expect_snapshot(
+    test_df %>%
+      InMemoryDataset$create() %>%
+      transmute(
+        date_char_ymd = as.Date(
+          character_ymd_var,
+          tryFormats = c("%Y-%m-%d", "%Y/%m/%d")
+        )
+      ) %>%
+      collect(),
+    error = TRUE
+  )
 })
 
 test_that("`as_date()` and `as.Date()` work with R objects", {
@@ -2080,7 +2067,7 @@ test_that("as_datetime() works with other functions", {
 
 test_that("parse_date_time() works with year, month, and date components", {
   # these functions' internals use some string processing which requires the
-  # RE2 library (not available on Windows with R 3.6)
+  # RE2 library
   skip_if_not_available("re2")
   compare_dplyr_binding(
     .input %>%
@@ -2139,7 +2126,7 @@ test_that("parse_date_time() works with year, month, and date components", {
 
 test_that("parse_date_time() works with a mix of formats and orders", {
   # these functions' internals use some string processing which requires the
-  # RE2 library (not available on Windows with R 3.6)
+  # RE2 library
   skip_if_not_available("re2")
   test_df <- tibble(
     string_combi = c("2021-09-1", "2/09//2021", "09.3.2021")
@@ -2169,7 +2156,7 @@ test_that("year, month, day date/time parsers", {
   )
 
   # these functions' internals use some string processing which requires the
-  # RE2 library (not available on Windows with R 3.6)
+  # RE2 library
   skip_if_not_available("re2")
   compare_dplyr_binding(
     .input %>%
@@ -2221,7 +2208,7 @@ test_that("ym, my & yq parsers", {
   )
 
   # these functions' internals use some string processing which requires the
-  # RE2 library (not available on Windows with R 3.6)
+  # RE2 library
   skip_if_not_available("re2")
   compare_dplyr_binding(
     .input %>%
@@ -2270,7 +2257,7 @@ test_that("ym, my & yq parsers", {
 
 test_that("parse_date_time's other formats", {
   # these functions' internals use some string processing which requires the
-  # RE2 library (not available on Windows with R 3.6)
+  # RE2 library
   skip_if_not_available("re2")
 
   compare_dplyr_binding(
@@ -2401,7 +2388,7 @@ test_that("lubridate's fast_strptime", {
   )
 
   # these functions' internals use some string processing which requires the
-  # RE2 library (not available on Windows with R 3.6)
+  # RE2 library
   skip_if_not_available("re2")
 
   compare_dplyr_binding(
@@ -2508,7 +2495,7 @@ test_that("parse_date_time with hours, minutes and seconds components", {
   # the unseparated strings are versions of "1987-08-22 20:13:59" (with %y)
 
   # these functions' internals use some string processing which requires the
-  # RE2 library (not available on Windows with R 3.6)
+  # RE2 library
   skip_if_not_available("re2")
 
   compare_dplyr_binding(
@@ -2638,7 +2625,7 @@ test_that("parse_date_time with month names and HMS", {
   skip_on_os("windows")
 
   # these functions' internals use some string processing which requires the
-  # RE2 library (not available on Windows with R 3.6 & the minimal nightly builds)
+  # RE2 library (not available in the minimal nightly builds)
   skip_if_not_available("re2")
 
   test_dates_times2 <- tibble(
@@ -2737,7 +2724,7 @@ test_that("parse_date_time with `quiet = FALSE` not supported", {
   # https://issues.apache.org/jira/browse/ARROW-17146
 
   # these functions' internals use some string processing which requires the
-  # RE2 library (not available on Windows with R 3.6 & the minimal nightly builds)
+  # RE2 library (not available in the minimal nightly builds)
   skip_if_not_available("re2")
 
   expect_warning(
@@ -2766,7 +2753,7 @@ test_that("parse_date_time with `quiet = FALSE` not supported", {
 
 test_that("parse_date_time with truncated formats", {
   # these functions' internals use some string processing which requires the
-  # RE2 library (not available on Windows with R 3.6)
+  # RE2 library
   skip_if_not_available("re2")
 
   test_truncation_df <- tibble(
@@ -2853,7 +2840,7 @@ test_that("parse_date_time with `exact = TRUE`, and with regular R objects", {
   )
 
   # these functions' internals use some string processing which requires the
-  # RE2 library (not available on Windows with R 3.6)
+  # RE2 library
   skip_if_not_available("re2")
   compare_dplyr_binding(
     .input %>%
@@ -3124,11 +3111,9 @@ test_that("timestamp round/floor/ceiling works for a minimal test", {
 })
 
 test_that("timestamp round/floor/ceiling accepts period unit abbreviation", {
-
   # test helper to ensure standard abbreviations of period names
   # are understood by arrow and mirror the lubridate behaviour
   check_period_abbreviation <- function(unit, synonyms) {
-
     # check arrow against lubridate
     compare_dplyr_binding(
       .input %>%
@@ -3253,7 +3238,6 @@ test_that("timestamp round/floor/ceil works for units: month/quarter/year", {
 
 # check helper invoked when we need to avoid the lubridate rounding bug
 check_date_rounding_1051_bypass <- function(data, unit, ignore_attr = TRUE, ...) {
-
   # directly compare arrow to lubridate for floor and ceiling
   compare_dplyr_binding(
     .input %>%
@@ -3286,7 +3270,6 @@ check_date_rounding_1051_bypass <- function(data, unit, ignore_attr = TRUE, ...)
 }
 
 test_that("date round/floor/ceil works for units: month/quarter/year", {
-
   # these test cases are affected by lubridate issue 1051 so we bypass
   # lubridate::round_date() for Date objects with large rounding units
   # https://github.com/tidyverse/lubridate/issues/1051
@@ -3346,7 +3329,6 @@ test_that("timestamp round/floor/ceil works for week units (non-standard week_st
 })
 
 check_date_week_rounding <- function(data, week_start, ignore_attr = TRUE, ...) {
-
   # directly compare arrow to lubridate for floor and ceiling
   compare_dplyr_binding(
     .input %>%
@@ -3393,7 +3375,6 @@ test_that("date round/floor/ceil works for week units (non-standard week_start)"
 # ceiling_date behaves identically to the lubridate version. It takes
 # unit as an argument to run tests separately for different rounding units
 check_boundary_with_unit <- function(unit, ...) {
-
   # timestamps
   compare_dplyr_binding(
     .input %>%
@@ -3462,7 +3443,6 @@ test_that("temporal round/floor/ceil period unit maxima are enforced", {
 # results. this test helper runs that test, skipping cases where lubridate
 # produces incorrect answers
 check_timezone_rounding_vs_lubridate <- function(data, unit) {
-
   # esoteric lubridate bug: on windows and macOS (not linux), lubridate returns
   # incorrect ceiling/floor for timezoned POSIXct times (syd, adl, kat zones,
   # but not mar) but not utc, and not for round, and only for these two
@@ -3700,8 +3680,8 @@ test_that("with_tz() and force_tz() works", {
       mutate(timestamps = force_tz(
         timestamps,
         "Europe/Brussels",
-        roll_dst = "post")
-      ) %>%
+        roll_dst = "post"
+      )) %>%
       collect(),
     "roll_dst` value must be 'error' or 'boundary' for nonexistent times"
   )
@@ -3710,11 +3690,10 @@ test_that("with_tz() and force_tz() works", {
     tibble::tibble(timestamps = nonexistent) %>%
       arrow_table() %>%
       mutate(timestamps = force_tz(
-          timestamps,
-          "Europe/Brussels",
-          roll_dst = c("boundary", "NA")
-        )
-      ) %>%
+        timestamps,
+        "Europe/Brussels",
+        roll_dst = c("boundary", "NA")
+      )) %>%
       collect(),
     "`roll_dst` value must be 'error', 'pre', or 'post' for nonexistent times"
   )
diff --git a/r/tests/testthat/test-dplyr-funcs-string.R b/r/tests/testthat/test-dplyr-funcs-string.R
index 039220b88ee00..cb1d4675058b6 100644
--- a/r/tests/testthat/test-dplyr-funcs-string.R
+++ b/r/tests/testthat/test-dplyr-funcs-string.R
@@ -172,27 +172,31 @@ test_that("paste, paste0, and str_c", {
   # expected errors
 
   # collapse argument not supported
-  expect_error(
-    call_binding("paste", x, y, collapse = ""),
-    "collapse"
+  expect_arrow_eval_error(
+    paste(chr, int, collapse = ""),
+    "`collapse` argument not supported in Arrow",
+    class = "arrow_not_supported"
   )
-  expect_error(
-    call_binding("paste0", x, y, collapse = ""),
-    "collapse"
+  expect_arrow_eval_error(
+    paste0(chr, int, collapse = ""),
+    "`collapse` argument not supported in Arrow",
+    class = "arrow_not_supported"
   )
-  expect_error(
-    call_binding("str_c", x, y, collapse = ""),
-    "collapse"
+  expect_arrow_eval_error(
+    str_c(chr, int, collapse = ""),
+    "`collapse` argument not supported in Arrow",
+    class = "arrow_not_supported"
   )
-
   # literal vectors of length != 1 not supported
-  expect_error(
-    call_binding("paste", x, character(0), y),
-    "Literal vectors of length != 1 not supported in string concatenation"
+  expect_arrow_eval_error(
+    paste(chr, character(0), int),
+    "Literal vectors of length != 1 in string concatenation not supported in Arrow",
+    class = "arrow_not_supported"
   )
-  expect_error(
-    call_binding("paste", x, c(",", ";"), y),
-    "Literal vectors of length != 1 not supported in string concatenation"
+  expect_arrow_eval_error(
+    paste(chr, c(",", ";"), int),
+    "Literal vectors of length != 1 in string concatenation not supported in Arrow",
+    class = "arrow_not_supported"
   )
 })
 
@@ -602,10 +606,15 @@ test_that("str_to_lower, str_to_upper, and str_to_title", {
   )
 
   # Error checking a single function because they all use the same code path.
-  expect_error(
-    call_binding("str_to_lower", "Apache Arrow", locale = "sp"),
-    "Providing a value for 'locale' other than the default ('en') is not supported in Arrow",
-    fixed = TRUE
+  expect_arrow_eval_error(
+    str_to_lower("Apache Arrow", locale = "sp"),
+    paste(
+      "Providing a value for 'locale' other than the default ('en') not supported in Arrow",
+      "> To change locale, use 'Sys.setlocale()'",
+      sep = "\n"
+    ),
+    fixed = TRUE,
+    class = "arrow_not_supported"
   )
 })
 
@@ -1041,14 +1050,15 @@ test_that("substr with string()", {
     df
   )
 
-  expect_error(
-    call_binding("substr", "Apache Arrow", c(1, 2), 3),
-    "`start` must be length 1 - other lengths are not supported in Arrow"
+  expect_arrow_eval_error(
+    substr("Apache Arrow", c(1, 2), 3),
+    "`start` must be length 1 - other lengths not supported in Arrow",
+    class = "arrow_not_supported"
   )
-
-  expect_error(
-    call_binding("substr", "Apache Arrow", 1, c(2, 3)),
-    "`stop` must be length 1 - other lengths are not supported in Arrow"
+  expect_arrow_eval_error(
+    substr("Apache Arrow", 1, c(2, 3)),
+    "`stop` must be length 1 - other lengths not supported in Arrow",
+    class = "arrow_not_supported"
   )
 })
 
@@ -1169,14 +1179,15 @@ test_that("str_sub", {
     df
   )
 
-  expect_error(
-    call_binding("str_sub", "Apache Arrow", c(1, 2), 3),
-    "`start` must be length 1 - other lengths are not supported in Arrow"
+  expect_arrow_eval_error(
+    str_sub("Apache Arrow", c(1, 2), 3),
+    "`start` must be length 1 - other lengths not supported in Arrow",
+    class = "arrow_not_supported"
   )
-
-  expect_error(
-    call_binding("str_sub", "Apache Arrow", 1, c(2, 3)),
-    "`end` must be length 1 - other lengths are not supported in Arrow"
+  expect_arrow_eval_error(
+    str_sub("Apache Arrow", 1, c(2, 3)),
+    "`end` must be length 1 - other lengths not supported in Arrow",
+    class = "arrow_not_supported"
   )
 })
 
diff --git a/r/tests/testthat/test-dplyr-funcs-type.R b/r/tests/testthat/test-dplyr-funcs-type.R
index 2624e16156bce..ecb6b3b7b45b6 100644
--- a/r/tests/testthat/test-dplyr-funcs-type.R
+++ b/r/tests/testthat/test-dplyr-funcs-type.R
@@ -754,11 +754,10 @@ test_that("structs/nested data frames/tibbles can be created", {
   )
 
   # check that data.frame is mapped too
-  # stringsAsFactors default is TRUE in R 3.6, which is still tested on CI
   compare_dplyr_binding(
     .input %>%
       transmute(
-        df_col = data.frame(regular_col1, regular_col2, stringsAsFactors = FALSE)
+        df_col = data.frame(regular_col1, regular_col2)
       ) %>%
       collect() %>%
       mutate(df_col = as.data.frame(df_col)),
diff --git a/r/tests/testthat/test-dplyr-funcs.R b/r/tests/testthat/test-dplyr-funcs.R
index 039604a85ee0c..48c5d730f8493 100644
--- a/r/tests/testthat/test-dplyr-funcs.R
+++ b/r/tests/testthat/test-dplyr-funcs.R
@@ -19,35 +19,25 @@
 skip_on_cran()
 
 test_that("register_binding()/unregister_binding() works", {
-  fake_registry <- new.env(parent = emptyenv())
   fun1 <- function() NULL
   fun2 <- function() "Hello"
 
-  expect_null(register_binding("some.pkg::some_fun", fun1, fake_registry))
-  expect_identical(fake_registry$some_fun, fun1)
-  expect_identical(fake_registry$`some.pkg::some_fun`, fun1)
+  expect_null(register_binding("some.pkg::some_fun", fun1))
+  expect_identical(.cache$functions$some_fun, fun1)
+  expect_identical(.cache$functions$`some.pkg::some_fun`, fun1)
 
-  expect_identical(unregister_binding("some.pkg::some_fun", fake_registry), fun1)
-  expect_false("some.pkg::some_fun" %in% names(fake_registry))
-  expect_false("some_fun" %in% names(fake_registry))
+  expect_identical(unregister_binding("some.pkg::some_fun"), fun1)
+  expect_false("some.pkg::some_fun" %in% names(.cache$functions))
+  expect_false("some_fun" %in% names(.cache$functions))
 
-  expect_null(register_binding("somePkg::some_fun", fun1, fake_registry))
-  expect_identical(fake_registry$some_fun, fun1)
+  expect_null(register_binding("somePkg::some_fun", fun1))
+  expect_identical(.cache$functions$some_fun, fun1)
 
   expect_warning(
-    register_binding("some.pkg2::some_fun", fun2, fake_registry),
+    register_binding("some.pkg2::some_fun", fun2),
     "A \"some_fun\" binding already exists in the registry and will be overwritten."
   )
 
   # No warning when an identical function is re-registered
-  expect_silent(register_binding("some.pkg2::some_fun", fun2, fake_registry))
-})
-
-test_that("register_binding_agg() works", {
-  fake_registry <- new.env(parent = emptyenv())
-  fun1 <- function() NULL
-
-  expect_null(register_binding_agg("somePkg::some_fun", fun1, fake_registry))
-  expect_identical(fake_registry$some_fun, fun1)
-  expect_identical(fake_registry$`somePkg::some_fun`, fun1)
+  expect_silent(register_binding("some.pkg2::some_fun", fun2))
 })
diff --git a/r/tests/testthat/test-dplyr-glimpse.R b/r/tests/testthat/test-dplyr-glimpse.R
index c93273bdeef34..d39fef9e82cca 100644
--- a/r/tests/testthat/test-dplyr-glimpse.R
+++ b/r/tests/testthat/test-dplyr-glimpse.R
@@ -15,11 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# The glimpse output for tests with `example_data` is different on R < 3.6
-# because the `lgl` column is generated with `sample()` and the RNG
-# algorithm is different in older R versions.
-skip_on_r_older_than("3.6")
-
 library(dplyr, warn.conflicts = FALSE)
 
 test_that("glimpse() Table/ChunkedArray", {
diff --git a/r/tests/testthat/test-dplyr-join.R b/r/tests/testthat/test-dplyr-join.R
index e3e1e98cfca15..9a1c8b7b80fea 100644
--- a/r/tests/testthat/test-dplyr-join.R
+++ b/r/tests/testthat/test-dplyr-join.R
@@ -441,3 +441,35 @@ test_that("full joins handle keep", {
     small_dataset_df
   )
 })
+
+left <- tibble::tibble(
+  x = c(1, NA, 3),
+)
+right <- tibble::tibble(
+  x = c(1, NA, 3),
+  y = c("a", "b", "c")
+)
+na_matches_na <- right
+na_matches_never <- tibble::tibble(
+  x = c(1, NA, 3),
+  y = c("a", NA, "c")
+)
+test_that("na_matches argument to join: na (default)", {
+  expect_equal(
+    arrow_table(left) %>%
+      left_join(right, by = "x", na_matches = "na") %>%
+      arrange(x) %>%
+      collect(),
+    na_matches_na %>% arrange(x)
+  )
+})
+
+test_that("na_matches argument to join: never", {
+  expect_equal(
+    arrow_table(left) %>%
+      left_join(right, by = "x", na_matches = "never") %>%
+      arrange(x) %>%
+      collect(),
+    na_matches_never %>% arrange(x)
+  )
+})
diff --git a/r/tests/testthat/test-dplyr-mutate.R b/r/tests/testthat/test-dplyr-mutate.R
index 0889fffedd508..fa13c151b14e3 100644
--- a/r/tests/testthat/test-dplyr-mutate.R
+++ b/r/tests/testthat/test-dplyr-mutate.R
@@ -152,16 +152,14 @@ test_that("transmute() with unsupported arguments", {
 })
 
 test_that("transmute() defuses dots arguments (ARROW-13262)", {
-  expect_warning(
+  expect_snapshot(
     tbl %>%
       Table$create() %>%
       transmute(
         a = stringr::str_c(padded_strings, padded_strings),
         b = stringr::str_squish(a)
       ) %>%
-      collect(),
-    "Expression stringr::str_squish(a) not supported in Arrow; pulling data into R",
-    fixed = TRUE
+      collect()
   )
 })
 
@@ -202,10 +200,7 @@ test_that("nchar() arguments", {
       filter(line_lengths > 15) %>%
       collect(),
     tbl,
-    warning = paste0(
-      "In nchar\\(verses, type = \"bytes\", allowNA = TRUE\\), ",
-      "allowNA = TRUE not supported in Arrow; pulling data into R"
-    )
+    warning = "allowNA = TRUE not supported in Arrow"
   )
 })
 
@@ -378,18 +373,16 @@ test_that("dplyr::mutate's examples", {
   # The mutate operation may yield different results on grouped
   # tibbles because the expressions are computed within groups.
   # The following normalises `mass` by the global average:
-  # TODO(ARROW-13926): support window functions
   compare_dplyr_binding(
     .input %>%
       select(name, mass, species) %>%
       mutate(mass_norm = mass / mean(mass, na.rm = TRUE)) %>%
       collect(),
-    starwars,
-    warning = "window function"
+    starwars
   )
 })
 
-test_that("Can mutate after group_by as long as there are no aggregations", {
+test_that("Can mutate after group_by, including with some aggregations", {
   compare_dplyr_binding(
     .input %>%
       select(int, chr) %>%
@@ -417,31 +410,31 @@ test_that("Can mutate after group_by as long as there are no aggregations", {
       collect(),
     tbl
   )
-  expect_warning(
-    tbl %>%
-      Table$create() %>%
+  compare_dplyr_binding(
+    .input %>%
       select(int, chr) %>%
       group_by(chr) %>%
       mutate(avg_int = mean(int)) %>%
+      # Because this silently does a join, the rows can get unsorted
+      arrange(chr) %>%
       collect(),
-    "window functions not currently supported in Arrow; pulling data into R",
-    fixed = TRUE
+    tbl
   )
-  expect_warning(
-    tbl %>%
-      Table$create() %>%
+  compare_dplyr_binding(
+    .input %>%
       select(mean = int, chr) %>%
       # rename `int` to `mean` and use `mean(mean)` in `mutate()` to test that
       # `all_funs()` detects `mean()` despite the collision with a column name
       group_by(chr) %>%
       mutate(avg_int = mean(mean)) %>%
+      # Because this silently does a join, the rows can get unsorted
+      arrange(chr) %>%
       collect(),
-    "window functions not currently supported in Arrow; pulling data into R",
-    fixed = TRUE
+    tbl
   )
 })
 
-test_that("Can mutate with .by argument as long as there are no aggregations", {
+test_that("Can mutate with .by argument, even with some aggregations", {
   compare_dplyr_binding(
     .input %>%
       select(int, chr) %>%
@@ -479,25 +472,25 @@ test_that("Can mutate with .by argument as long as there are no aggregations", {
       collect(),
     tbl
   )
-  expect_warning(
-    tbl %>%
-      Table$create() %>%
+  compare_dplyr_binding(
+    .input %>%
       select(int, chr) %>%
       mutate(avg_int = mean(int), .by = chr) %>%
+      # Because this silently does a join, the rows can get unsorted
+      arrange(chr) %>%
       collect(),
-    "window functions not currently supported in Arrow; pulling data into R",
-    fixed = TRUE
+    tbl
   )
-  expect_warning(
-    tbl %>%
-      Table$create() %>%
+  compare_dplyr_binding(
+    .input %>%
       select(mean = int, chr) %>%
       # rename `int` to `mean` and use `mean(mean)` in `mutate()` to test that
       # `all_funs()` detects `mean()` despite the collision with a column name
       mutate(avg_int = mean(mean), .by = chr) %>%
+      # Because this silently does a join, the rows can get unsorted
+      arrange(chr) %>%
       collect(),
-    "window functions not currently supported in Arrow; pulling data into R",
-    fixed = TRUE
+    tbl
   )
 })
 
@@ -540,7 +533,7 @@ test_that("Can't just add a vector column with mutate()", {
         mutate(again = 1:10),
       tibble::tibble(int = tbl$int, again = 1:10)
     ),
-    "In again = 1:10, only values of size one are recycled; pulling data into R"
+    "Recycling values of length != 1 not supported in Arrow"
   )
 })
 
@@ -682,7 +675,6 @@ test_that("mutate() and transmute() with namespaced functions", {
 })
 
 test_that("Can use across() within mutate()", {
-
   # expressions work in the right order
   compare_dplyr_binding(
     .input %>%
@@ -717,17 +709,15 @@ test_that("Can use across() within mutate()", {
     example_data
   )
 
-  # gives the right error with window functions
-  expect_warning(
-    arrow_table(example_data) %>%
+  compare_dplyr_binding(
+    .input %>%
       mutate(
         x = int + 2,
         across(c("int", "dbl"), list(mean = mean, sd = sd, round)),
         exp(dbl2)
       ) %>%
       collect(),
-    "window functions not currently supported in Arrow; pulling data into R",
-    fixed = TRUE
+    example_data
   )
 })
 
diff --git a/r/tests/testthat/test-dplyr-summarize.R b/r/tests/testthat/test-dplyr-summarize.R
index b2b2a9e54695d..95212407acf9d 100644
--- a/r/tests/testthat/test-dplyr-summarize.R
+++ b/r/tests/testthat/test-dplyr-summarize.R
@@ -337,20 +337,20 @@ test_that("Functions that take ... but we only accept a single arg", {
   )
 
   # Now that we've demonstrated that the whole machinery works, let's test
-  # the agg_funcs directly
-  expect_error(call_binding_agg("n_distinct"), "n_distinct() with 0 arguments", fixed = TRUE)
-  expect_error(call_binding_agg("sum"), "sum() with 0 arguments", fixed = TRUE)
-  expect_error(call_binding_agg("prod"), "prod() with 0 arguments", fixed = TRUE)
-  expect_error(call_binding_agg("any"), "any() with 0 arguments", fixed = TRUE)
-  expect_error(call_binding_agg("all"), "all() with 0 arguments", fixed = TRUE)
-  expect_error(call_binding_agg("min"), "min() with 0 arguments", fixed = TRUE)
-  expect_error(call_binding_agg("max"), "max() with 0 arguments", fixed = TRUE)
-  expect_error(call_binding_agg("n_distinct", 1, 2), "Multiple arguments to n_distinct()")
-  expect_error(call_binding_agg("sum", 1, 2), "Multiple arguments to sum")
-  expect_error(call_binding_agg("any", 1, 2), "Multiple arguments to any()")
-  expect_error(call_binding_agg("all", 1, 2), "Multiple arguments to all()")
-  expect_error(call_binding_agg("min", 1, 2), "Multiple arguments to min()")
-  expect_error(call_binding_agg("max", 1, 2), "Multiple arguments to max()")
+  # the agg funcs directly
+  expect_error(call_binding("n_distinct"), "n_distinct() with 0 arguments", fixed = TRUE)
+  expect_error(call_binding("sum"), "sum() with 0 arguments", fixed = TRUE)
+  expect_error(call_binding("prod"), "prod() with 0 arguments", fixed = TRUE)
+  expect_error(call_binding("any"), "any() with 0 arguments", fixed = TRUE)
+  expect_error(call_binding("all"), "all() with 0 arguments", fixed = TRUE)
+  expect_error(call_binding("min"), "min() with 0 arguments", fixed = TRUE)
+  expect_error(call_binding("max"), "max() with 0 arguments", fixed = TRUE)
+  expect_error(call_binding("n_distinct", 1, 2), "Multiple arguments to n_distinct()")
+  expect_error(call_binding("sum", 1, 2), "Multiple arguments to sum")
+  expect_error(call_binding("any", 1, 2), "Multiple arguments to any()")
+  expect_error(call_binding("all", 1, 2), "Multiple arguments to all()")
+  expect_error(call_binding("min", 1, 2), "Multiple arguments to min()")
+  expect_error(call_binding("max", 1, 2), "Multiple arguments to max()")
 })
 
 test_that("median()", {
@@ -792,7 +792,6 @@ test_that("Expressions on aggregations", {
         any = any(lgl),
         all = all(lgl)
       ) %>%
-      ungroup() %>% # TODO: loosen the restriction on mutate after group_by
       mutate(some = any & !all) %>%
       select(some_grouping, some) %>%
       collect(),
@@ -833,28 +832,116 @@ test_that("Expressions on aggregations", {
   )
 
   # Aggregates on aggregates are not supported
-  expect_warning(
-    record_batch(tbl) %>% summarise(any(any(lgl))),
-    paste(
-      "Aggregate within aggregate expression",
-      "any\\(any\\(lgl\\)\\) not supported in Arrow"
-    )
+  expect_snapshot(
+    record_batch(tbl) %>% summarise(any(any(lgl)))
   )
 
   # Check aggregates on aggregates with more complex calls
   expect_warning(
     record_batch(tbl) %>% summarise(any(any(!lgl))),
-    paste(
-      "Aggregate within aggregate expression",
-      "any\\(any\\(!lgl\\)\\) not supported in Arrow"
-    )
+    "aggregate within aggregate expression not supported in Arrow"
   )
   expect_warning(
     record_batch(tbl) %>% summarise(!any(any(lgl))),
-    paste(
-      "Aggregate within aggregate expression",
-      "any\\(any\\(lgl\\)\\) not supported in Arrow"
-    )
+    "aggregate within aggregate expression not supported in Arrow"
+  )
+})
+
+test_that("Re-using/overwriting column names", {
+  compare_dplyr_binding(
+    .input %>%
+      summarize(
+        # These are both aggregations
+        y = sum(int, na.rm = TRUE),
+        y = sum(dbl, na.rm = TRUE)
+      ) %>%
+      collect(),
+    tbl
+  )
+
+  compare_dplyr_binding(
+    .input %>%
+      summarize(
+        # This is just aggregation
+        y = sum(int, na.rm = TRUE),
+        # This is aggregations and a projection after
+        y = mean(int, na.rm = TRUE) * n()
+      ) %>%
+      collect(),
+    tbl
+  )
+
+  compare_dplyr_binding(
+    .input %>%
+      summarize(
+        # Same thing, but in the other order
+        y = mean(int, na.rm = TRUE) * n(),
+        y = sum(dbl, na.rm = TRUE),
+      ) %>%
+      collect(),
+    tbl
+  )
+
+  compare_dplyr_binding(
+    .input %>%
+      summarize(
+        int = sum(int, na.rm = TRUE),
+        # This needs to pick up *that* int, not the column in the data
+        y = int / n()
+      ) %>%
+      collect(),
+    tbl
+  )
+
+  compare_dplyr_binding(
+    .input %>%
+      summarize(
+        # No one should do this! But it's valid right?
+        int = sum(int, na.rm = TRUE),
+        int = int / n()
+      ) %>%
+      collect(),
+    tbl
+  )
+})
+
+test_that("Weighted mean", {
+  compare_dplyr_binding(
+    .input %>%
+      group_by(some_grouping) %>%
+      summarize(
+        weighted_mean = sum(int * dbl) / sum(dbl)
+      ) %>%
+      collect(),
+    tbl
+  )
+
+  division <- function(x, y) x / y
+  compare_dplyr_binding(
+    .input %>%
+      group_by(some_grouping) %>%
+      summarize(
+        weighted_mean = division(sum(int * dbl), sum(dbl))
+      ) %>%
+      collect(),
+    tbl
+  )
+
+  # We can also define functions that call supported aggregation functions
+  # and it just works
+  wtd_mean <- function(x, w) sum(x * w) / sum(w)
+  withr::local_options(list(arrow.debug = TRUE))
+  expect_output(
+    compare_dplyr_binding(
+      .input %>%
+        group_by(some_grouping) %>%
+        summarize(
+          weighted_mean = wtd_mean(int, dbl)
+        ) %>%
+        collect(),
+      tbl
+    ),
+    "Adding wtd_mean to the function environment"
   )
 })
 
@@ -868,8 +955,7 @@ test_that("Summarize with 0 arguments", {
   )
 })
 
-test_that("Not (yet) supported: implicit join", {
-  withr::local_options(list(arrow.debug = TRUE))
+test_that("Not supported: window functions", {
   compare_dplyr_binding(
     .input %>%
       group_by(some_grouping) %>%
@@ -878,10 +964,7 @@ test_that("Not (yet) supported: implicit join", {
       ) %>%
       collect(),
     tbl,
-    warning = paste(
-      "Aggregate within aggregate expression sum\\(\\(dbl - mean\\(dbl\\)\\)\\^2\\)",
-      "not supported in Arrow; pulling data into R"
-    )
+    warning = "aggregate within aggregate expression not supported in Arrow"
   )
   compare_dplyr_binding(
     .input %>%
@@ -891,10 +974,7 @@ test_that("Not (yet) supported: implicit join", {
       ) %>%
       collect(),
     tbl,
-    warning = paste(
-      "Aggregate within aggregate expression sum\\(dbl - mean\\(dbl\\)\\)",
-      "not supported in Arrow; pulling data into R"
-    )
+    warning = "aggregate within aggregate expression not supported in Arrow"
   )
   compare_dplyr_binding(
     .input %>%
@@ -904,10 +984,7 @@ test_that("Not (yet) supported: implicit join", {
       ) %>%
       collect(),
     tbl,
-    warning = paste(
-      "Aggregate within aggregate expression sum\\(\\(dbl - mean\\(dbl\\)\\)\\^2\\)",
-      "not supported in Arrow; pulling data into R"
-    )
+    warning = "aggregate within aggregate expression not supported in Arrow"
   )
 
   compare_dplyr_binding(
@@ -916,10 +993,7 @@ test_that("Not (yet) supported: implicit join", {
       summarize(y - mean(y)) %>%
       collect(),
     data.frame(x = 1, y = 2),
-    warning = paste(
-      "Expression y - mean\\(y\\) is not an aggregate expression",
-      "or is not supported in Arrow; pulling data into R"
-    )
+    warning = "Expression is not a valid aggregation expression or is not supported in Arrow"
   )
 
   compare_dplyr_binding(
@@ -928,10 +1002,7 @@ test_that("Not (yet) supported: implicit join", {
       summarize(y) %>%
       collect(),
     data.frame(x = 1, y = 2),
-    warning = paste(
-      "Expression y is not an aggregate expression",
-      "or is not supported in Arrow; pulling data into R"
-    )
+    warning = "Expression is not a valid aggregation expression or is not supported in Arrow"
   )
 
   # This one could possibly be supported--in mutate()
@@ -941,10 +1012,7 @@ test_that("Not (yet) supported: implicit join", {
       summarize(x - y) %>%
       collect(),
     data.frame(x = 1, y = 2, z = 3),
-    warning = paste(
-      "Expression x - y is not an aggregate expression",
-      "or is not supported in Arrow; pulling data into R"
-    )
+    warning = "Expression is not a valid aggregation expression or is not supported in Arrow"
   )
 })
 
@@ -1083,11 +1151,6 @@ test_that("summarise() can handle scalars and literal values", {
     tibble(y = 1L)
   )
 
-  expect_identical(
-    record_batch(tbl) %>% summarise(y = Expression$scalar(1L)) %>% collect(),
-    tibble(y = 1L)
-  )
-
   expect_identical(
     record_batch(tbl) %>% summarise(y = Scalar$create(1L)) %>% collect(),
     tibble(y = 1L)
@@ -1183,13 +1246,12 @@ test_that("Can use across() within summarise()", {
   )
 
   # across() doesn't work in summarise when input expressions evaluate to bare field references
-  expect_warning(
+  expect_snapshot(
     data.frame(x = 1, y = 2) %>%
       arrow_table() %>%
       group_by(x) %>%
       summarise(across(everything())) %>%
-      collect(),
-    regexp = "Expression y is not an aggregate expression or is not supported in Arrow; pulling data into R"
+      collect()
   )
 })
 
diff --git a/r/tests/testthat/test-duckdb.R b/r/tests/testthat/test-duckdb.R
index 33ab1ecc7aa4d..dd7b6dba7fde0 100644
--- a/r/tests/testthat/test-duckdb.R
+++ b/r/tests/testthat/test-duckdb.R
@@ -281,7 +281,7 @@ test_that("to_duckdb passing a connection", {
     to_duckdb(con = con_separate, auto_disconnect = FALSE)
 
   # Generates a query like SELECT * FROM arrow_xxx
-  table_four_query <- paste(show_query(table_four), collapse = "\n")
+  table_four_query <- paste(dbplyr::sql_build(table_four), collapse = "\n")
   table_four_name <- stringr::str_extract(table_four_query, "arrow_[0-9]{3}")
   expect_false(is.na(table_four_name))
 
diff --git a/r/tests/testthat/test-extension.R b/r/tests/testthat/test-extension.R
index 8b3d7d8aaa902..db26a70acb419 100644
--- a/r/tests/testthat/test-extension.R
+++ b/r/tests/testthat/test-extension.R
@@ -343,3 +343,11 @@ test_that("Dataset/arrow_dplyr_query can roundtrip extension types", {
 
   expect_identical(unclass(roundtripped$extension), roundtripped$letter)
 })
+
+test_that("Handling vctrs_rcrd type", {
+  df <- data.frame(
+    x = vctrs::new_rcrd(fields = list(special = 1:3), class = "special")
+  )
+  tab <- arrow_table(df)
+  expect_identical(as.data.frame(tab), df)
+})
diff --git a/r/tests/testthat/test-metadata.R b/r/tests/testthat/test-metadata.R
index e44cd71038008..175e7ef3b6b73 100644
--- a/r/tests/testthat/test-metadata.R
+++ b/r/tests/testthat/test-metadata.R
@@ -107,6 +107,73 @@ test_that("Garbage R metadata doesn't break things", {
     "Invalid metadata$r",
     fixed = TRUE
   )
+
+  bad <- new.env(parent = emptyenv())
+  makeActiveBinding("columns", function() stop("This should not run"), bad)
+  tab$metadata <- list(r = rawToChar(serialize(bad, NULL, ascii = TRUE)))
+  expect_warning(
+    as.data.frame(tab),
+    "Invalid metadata$r",
+    fixed = TRUE
+  )
+
+  # https://hiddenlayer.com/research/r-bitrary-code-execution/
+  tab$metadata <- list(r = "A
+3
+262913
+197888
+5
+UTF-8
+5
+252
+6
+1
+262153
+7
+message
+2
+16
+1
+262153
+32
+arbitrary\040code\040was\040just\040executed
+254
+")
+  expect_message(
+    expect_warning(
+      as.data.frame(tab),
+      "Invalid metadata$r",
+      fixed = TRUE
+    ),
+    NA
+  )
+})
+
+test_that("Complex or unsafe attributes are pruned from R metadata, if they exist", {
+  tab <- Table$create(example_data[1:6])
+  bad <- new.env()
+  makeActiveBinding("class", function() stop("This should not run"), bad)
+  tab$metadata <- list(r = rawToChar(serialize(list(attributes = bad), NULL, ascii = TRUE)))
+  expect_warning(
+    as.data.frame(tab),
+    "Potentially unsafe or invalid elements have been discarded from R metadata.
+i Type: \"environment\"
+> If you trust the source, you can set `options(arrow.unsafe_metadata = TRUE)` to preserve them.",
+    fixed = TRUE
+  )
+  # You can set an option to allow them through.
+  # It still warns, just differently, and it doesn't prune the attributes
+  withr::local_options(list("arrow.unsafe_metadata" = TRUE))
+  expect_warning(
+    expect_warning(
+      as.data.frame(tab),
+      "R metadata may have unsafe or invalid elements
+i Type: \"environment\""
+    ),
+    # This particular example ultimately fails because it's not a list
+    "Invalid metadata$r",
+    fixed = TRUE
+  )
 })
 
 test_that("Metadata serialization compression", {
@@ -254,6 +321,8 @@ test_that("Row-level metadata (does not) roundtrip in datasets", {
   skip_if_not_available("dataset")
   skip_if_not_available("parquet")
 
+  library(dplyr, warn.conflicts = FALSE)
+
   df <- tibble::tibble(
     metadata = list(
       structure(1, my_value_as_attr = 1),
diff --git a/r/tests/testthat/test-scalar.R b/r/tests/testthat/test-scalar.R
index 06f956504350e..8335dc95cd85c 100644
--- a/r/tests/testthat/test-scalar.R
+++ b/r/tests/testthat/test-scalar.R
@@ -94,10 +94,6 @@ test_that("Handling string data with embedded nuls", {
   )
   scalar_with_nul <- scalar(raws, binary())$cast(utf8())
 
-  # The behavior of the warnings/errors is slightly different with and without
-  # altrep. Without it (i.e. 3.5.0 and below, the error would trigger immediately
-  # on `as.vector()` where as with it, the error only happens on materialization)
-  skip_on_r_older_than("3.6")
   v <- expect_error(as.vector(scalar_with_nul), NA)
   expect_error(
     v[1],
diff --git a/r/tests/testthat/test-udf.R b/r/tests/testthat/test-udf.R
index 0eb75b1dde6e5..8604dc610a435 100644
--- a/r/tests/testthat/test-udf.R
+++ b/r/tests/testthat/test-udf.R
@@ -90,7 +90,7 @@ test_that("register_scalar_function() adds a compute function to the registry",
     int32(), float64(),
     auto_convert = TRUE
   )
-  on.exit(unregister_binding("times_32", update_cache = TRUE))
+  on.exit(unregister_binding("times_32"))
 
   expect_true("times_32" %in% names(asNamespace("arrow")$.cache$functions))
   expect_true("times_32" %in% list_compute_functions())
@@ -124,7 +124,7 @@ test_that("arrow_scalar_function() with bad return type errors", {
     int32(),
     float64()
   )
-  on.exit(unregister_binding("times_32_bad_return_type_array", update_cache = TRUE))
+  on.exit(unregister_binding("times_32_bad_return_type_array"))
 
   expect_error(
     call_function("times_32_bad_return_type_array", Array$create(1L)),
@@ -137,7 +137,7 @@ test_that("arrow_scalar_function() with bad return type errors", {
     int32(),
     float64()
   )
-  on.exit(unregister_binding("times_32_bad_return_type_scalar", update_cache = TRUE))
+  on.exit(unregister_binding("times_32_bad_return_type_scalar"))
 
   expect_error(
     call_function("times_32_bad_return_type_scalar", Array$create(1L)),
@@ -155,7 +155,7 @@ test_that("register_scalar_function() can register multiple kernels", {
     out_type = function(in_types) in_types[[1]],
     auto_convert = TRUE
   )
-  on.exit(unregister_binding("times_32", update_cache = TRUE))
+  on.exit(unregister_binding("times_32"))
 
   expect_equal(
     call_function("times_32", Scalar$create(1L, int32())),
@@ -238,7 +238,7 @@ test_that("user-defined functions work during multi-threaded execution", {
     float64(),
     auto_convert = TRUE
   )
-  on.exit(unregister_binding("times_32", update_cache = TRUE))
+  on.exit(unregister_binding("times_32"))
 
   # check a regular collect()
   result <- open_dataset(tf_dataset) %>%
@@ -271,7 +271,7 @@ test_that("nested exec plans can contain user-defined functions", {
     float64(),
     auto_convert = TRUE
   )
-  on.exit(unregister_binding("times_32", update_cache = TRUE))
+  on.exit(unregister_binding("times_32"))
 
   stream_plan_with_udf <- function() {
     record_batch(a = 1:1000) %>%
@@ -310,7 +310,7 @@ test_that("head() on exec plan containing user-defined functions", {
     float64(),
     auto_convert = TRUE
   )
-  on.exit(unregister_binding("times_32", update_cache = TRUE))
+  on.exit(unregister_binding("times_32"))
 
   result <- record_batch(a = 1:1000) %>%
     dplyr::mutate(b = times_32(a)) %>%
diff --git a/r/tools/nixlibs.R b/r/tools/nixlibs.R
index 0af41888b95b7..fc79e06328005 100644
--- a/r/tools/nixlibs.R
+++ b/r/tools/nixlibs.R
@@ -386,9 +386,7 @@ distro <- function() {
   out$id <- tolower(out$id)
   # debian unstable & testing lsb_release `version` don't include numbers but we can map from pretty name
   if (is.null(out$version) || out$version %in% c("testing", "unstable")) {
-    if (grepl("bullseye", out$codename)) {
-      out$short_version <- "11"
-    } else if (grepl("bookworm", out$codename)) {
+    if (grepl("bookworm", out$codename)) {
       out$short_version <- "12"
     }
   } else if (out$id == "ubuntu") {
@@ -538,7 +536,7 @@ build_libarrow <- function(src_dir, dst_dir) {
   }
   cleanup(build_dir)
 
-  env_var_list <- c(
+  env_var_list <- list(
     SOURCE_DIR = src_dir,
     BUILD_DIR = build_dir,
     DEST_DIR = dst_dir,
@@ -576,6 +574,14 @@ build_libarrow <- function(src_dir, dst_dir) {
         env_var_list <- c(env_var_list, setNames("BUNDLED", env_var))
       }
     }
+    # We also _do_ want to enable S3 and ZSTD by default
+    # so that binaries built on CRAN from source are fully featured
+    # but defer to the env vars if those are set
+    env_var_list <- c(
+      env_var_list,
+      ARROW_S3 = Sys.getenv("ARROW_S3", "ON"),
+      ARROW_WITH_ZSTD = Sys.getenv("ARROW_WITH_ZSTD", "ON")
+    )
   }
 
   env_var_list <- with_cloud_support(env_var_list)
@@ -816,8 +822,16 @@ set_thirdparty_urls <- function(env_var_list) {
   env_var_list
 }
 
-is_feature_requested <- function(env_varname, default = env_is("LIBARROW_MINIMAL", "false")) {
-  env_value <- tolower(Sys.getenv(env_varname))
+# this is generally about features that people asked for via environment variables, but
+# for some cases (like S3 when we override it in this script) we might find those in
+# env_var_list
+is_feature_requested <- function(env_varname, env_var_list, default = env_is("LIBARROW_MINIMAL", "false")) {
+  # look in the environment first, but then use the env_var_list if nothing is found
+  env_var_list_value <- env_var_list[[env_varname]]
+  if (is.null(env_var_list_value)) {
+    env_var_list_value <- ""
+  }
+  env_value <- tolower(Sys.getenv(env_varname, env_var_list_value))
   if (identical(env_value, "off")) {
     # If e.g. ARROW_MIMALLOC=OFF explicitly, override default
     requested <- FALSE
@@ -830,8 +844,8 @@ is_feature_requested <- function(env_varname, default = env_is("LIBARROW_MINIMAL
 }
 
 with_cloud_support <- function(env_var_list) {
-  arrow_s3 <- is_feature_requested("ARROW_S3")
-  arrow_gcs <- is_feature_requested("ARROW_GCS")
+  arrow_s3 <- is_feature_requested("ARROW_S3", env_var_list)
+  arrow_gcs <- is_feature_requested("ARROW_GCS", env_var_list)
 
   if (arrow_s3 || arrow_gcs) {
     # User wants S3 or GCS support.
diff --git a/r/tools/test-nixlibs.R b/r/tools/test-nixlibs.R
index ed5192d806990..02e822c3420c8 100644
--- a/r/tools/test-nixlibs.R
+++ b/r/tools/test-nixlibs.R
@@ -23,8 +23,9 @@
 TESTING <- TRUE
 # The functions use `on_macos` from the env they were sourced in, so we need tool
 # explicitly set it in that environment.
+# We capture.output for a cleaner testthat output.
 nixlibs_env <- environment()
-source("nixlibs.R", local = nixlibs_env)
+capture.output(source("nixlibs.R", local = nixlibs_env))
 
 test_that("identify_binary() based on LIBARROW_BINARY", {
   expect_null(identify_binary("FALSE"))
diff --git a/r/tools/ubsan.supp b/r/tools/ubsan.supp
index ff88cf984136b..34854e79bcbf9 100644
--- a/r/tools/ubsan.supp
+++ b/r/tools/ubsan.supp
@@ -16,3 +16,4 @@
 # under the License.
 
 vptr:include/c++/8/bits/shared_ptr_base.h
+function:cleancall.c
\ No newline at end of file
diff --git a/r/vignettes/data_wrangling.Rmd b/r/vignettes/data_wrangling.Rmd
index 305a91c156eb1..1d074ef0cfedb 100644
--- a/r/vignettes/data_wrangling.Rmd
+++ b/r/vignettes/data_wrangling.Rmd
@@ -165,33 +165,7 @@ sw2 %>%
   transmute(name, height, mass, res = residuals(lm(mass ~ height)))
 ```
 
-Because window functions are not supported, computing an aggregation like `mean()` on a grouped table or within a rowwise operation like `filter()` is not supported:
-
-```{r}
-sw %>%
-  select(1:4) %>%
-  filter(!is.na(hair_color)) %>%
-  group_by(hair_color) %>%
-  filter(height < mean(height, na.rm = TRUE))
-```
-
-This operation is sometimes referred to as a windowed aggregate and can be accomplished in Arrow by computing the aggregation separately, for example within a join operation:
-
-```{r}
-sw %>%
-  select(1:4) %>%
-  filter(!is.na(hair_color)) %>%
-  left_join(
-    sw %>%
-      group_by(hair_color) %>%
-      summarize(mean_height = mean(height, na.rm = TRUE))
-    ) %>%
-  filter(height < mean_height) %>%
-  select(!mean_height) %>%
-  collect()
-```
-
-Alternatively, [DuckDB](https:\www.duckdb.org) supports Arrow natively, so you can pass the `Table` object to DuckDB without paying a performance penalty using the helper function `to_duckdb()` and pass the object back to Arrow with `to_arrow()`:
+For some operations, you can use [DuckDB](https://www.duckdb.org). It supports Arrow natively, so you can pass the `Dataset` or query object to DuckDB without paying a performance penalty using the helper function `to_duckdb()` and pass the object back to Arrow with `to_arrow()`:
 
 ```{r}
 sw %>%
diff --git a/r/vignettes/developers/docker.Rmd b/r/vignettes/developers/docker.Rmd
index de2795cfa6bb5..13f60904c9484 100644
--- a/r/vignettes/developers/docker.Rmd
+++ b/r/vignettes/developers/docker.Rmd
@@ -5,23 +5,23 @@ description: >
 output: rmarkdown::html_vignette
 ---
 
-Arrow is compatible with a huge number of combinations of OSs, OS versions, 
-compilers, R versions, and other variables.  Sometimes these combinations of 
-variables means that behaviours are found in some environments which cannot be 
-replicated in others.  In addition, there are different ways of building Arrow, 
-for example, using environment variables to specify the building of optional 
+Arrow is compatible with a huge number of combinations of OSs, OS versions,
+compilers, R versions, and other variables.  Sometimes these combinations of
+variables means that behaviours are found in some environments which cannot be
+replicated in others.  In addition, there are different ways of building Arrow,
+for example, using environment variables to specify the building of optional
 components.
 
-What all this means is that you may need to use a different setup to the one in 
-which you are working, when diagnosing a bug or testing out a new feature which 
-you have reason to believe may be affected by these variables.  One way to do 
+What all this means is that you may need to use a different setup to the one in
+which you are working, when diagnosing a bug or testing out a new feature which
+you have reason to believe may be affected by these variables.  One way to do
 this is so spin up a Docker image containing the desired setup.
 
 This article provides a basic guide to using Docker in your R development.
 
 ## How do I run a Docker container?
 
-There are a number of images which have been created for the convenience of 
+There are a number of images which have been created for the convenience of
 Arrow devs and you can find them on [the DockerHub repo](https://hub.docker.com/r/apache/arrow-dev/tags).
 
 The code below shows an example command you could use to run a Docker container.
@@ -29,7 +29,7 @@ The code below shows an example command you could use to run a Docker container.
 This should be run in the root directory of a checkout of the arrow repo.
 
 ```shell
-docker run -it -e ARROW_DEPENDENCY_SOURCE=AUTO -v $(pwd):/arrow apache/arrow-dev:r-rhub-ubuntu-gcc-release-latest
+docker run -it -e ARROW_DEPENDENCY_SOURCE=AUTO -v $(pwd):/arrow apache/arrow-dev:r-rhub-ubuntu-release-latest
 ```
 
 Components:
@@ -39,13 +39,13 @@ Components:
 * `-e ARROW_DEPENDENCY_SOURCE=AUTO` - set the environment variable `ARROW_DEPENDENCY_SOURCE` to the value `AUTO`
 * `-v $(pwd):/arrow` - mount the current directory at `/arrow` in the container
 * `apache/arrow-dev` - the DockerHub repo to get this container from
-* `r-rhub-ubuntu-gcc-release-latest` - the image tag
+* `r-rhub-ubuntu-release-latest` - the image tag
 
-Once you run this command, if you don't have a copy of that particular image 
+Once you run this command, if you don't have a copy of that particular image
 saved locally, it will first be downloaded before a container is spun up.
 
-In the example above, mounting the directory in which the Arrow repo was stored 
-on the local machine, meant that that code could be built and tested on the 
+In the example above, mounting the directory in which the Arrow repo was stored
+on the local machine, meant that that code could be built and tested on the
 container.
 
 ## How do I exit this image?
@@ -73,29 +73,29 @@ sudo docker ps -a
 ## Running existing workflows from docker-compose.yml
 
 There are a number of workflows outlined in the file `docker-compose.yml` in the
-arrow repo root directory.  For example, you can use the workflow called `r` to 
-test building and installing the R package.  This is advantageous as you can use 
-existing utility scripts and install it onto a container which already has R on 
+arrow repo root directory.  For example, you can use the workflow called `r` to
+test building and installing the R package.  This is advantageous as you can use
+existing utility scripts and install it onto a container which already has R on
 it.
 
-These workflows are also parameterized, which means you can specify different 
+These workflows are also parameterized, which means you can specify different
 options (or just use the defaults, which can be found in `.env`)
 
 ### Example - The manual way
 
-If you wanted to run [RHub's latest `ubuntu-gcc-release` image](https://hub.docker.com/r/rhub/ubuntu-gcc-release), you could 
+If you wanted to run [RHub's latest `ubuntu-release` image](https://hub.docker.com/r/rhub/ubuntu-release), you could
 run:
 
-```shell 
-R_ORG=rhub R_IMAGE=ubuntu-gcc-release R_TAG=latest docker-compose build r
-R_ORG=rhub R_IMAGE=ubuntu-gcc-release R_TAG=latest docker-compose run r
+```shell
+R_ORG=rhub R_IMAGE=ubuntu-release R_TAG=latest docker-compose build r
+R_ORG=rhub R_IMAGE=ubuntu-release R_TAG=latest docker-compose run r
 ```
 
 ### Example - Using Archery
 
 Alternatively, you may prefer to use the [Archery tool to run docker images](https://arrow.apache.org/docs/developers/docker.html).
-This has the advantage of making it simpler to build some of the existing Arrow 
-CI jobs which have hierarchical dependencies, and so for example, you could 
+This has the advantage of making it simpler to build some of the existing Arrow
+CI jobs which have hierarchical dependencies, and so for example, you could
 build the R package on a container which already has the C++ code pre-built.
 
 This is the same tool which our CI uses - via a tool called [Crossbow](https://arrow.apache.org/docs/developers/crossbow.html).
@@ -103,5 +103,5 @@ This is the same tool which our CI uses - via a tool called [Crossbow](https://a
 If you want to run the `r` workflow discussed above, you could run:
 
 ```shell
-R_ORG=rhub R_IMAGE=ubuntu-gcc-release R_TAG=latest archery docker run r
+R_ORG=rhub R_IMAGE=ubuntu-release R_TAG=latest archery docker run r
 ```
diff --git a/r/vignettes/developers/matchsubstringoptions.png b/r/vignettes/developers/matchsubstringoptions.png
deleted file mode 100644
index 2dff3c5858e09..0000000000000
Binary files a/r/vignettes/developers/matchsubstringoptions.png and /dev/null differ
diff --git a/r/vignettes/developers/starts_with_docs.png b/r/vignettes/developers/starts_with_docs.png
deleted file mode 100644
index a55e888128fcd..0000000000000
Binary files a/r/vignettes/developers/starts_with_docs.png and /dev/null differ
diff --git a/r/vignettes/developers/startswithdocs.png b/r/vignettes/developers/startswithdocs.png
deleted file mode 100644
index 6e1f3df1b9b82..0000000000000
Binary files a/r/vignettes/developers/startswithdocs.png and /dev/null differ
diff --git a/r/vignettes/developers/writing_bindings.Rmd b/r/vignettes/developers/writing_bindings.Rmd
deleted file mode 100644
index 443211b3c2b5e..0000000000000
--- a/r/vignettes/developers/writing_bindings.Rmd
+++ /dev/null
@@ -1,254 +0,0 @@
----
-title: "Writing dplyr bindings"
-description: > 
-  Learn how to write bindings that allow arrow to mirror the behavior
-  of native R functions within dplyr pipelines
-output: rmarkdown::html_vignette
----
-
-```{r, include=FALSE}
-library(arrow, warn.conflicts = FALSE)
-library(dplyr, warn.conflicts = FALSE)
-```
-
-When writing bindings between C++ compute functions and R functions, the aim is 
-to expose the C++ functionality via the same interface as existing R functions. The syntax and
-functionality should match that of the existing R functions 
-(though there are some exceptions) so that users are able to use existing tidyverse 
-or base R syntax, whilst taking advantage of the speed and functionality of the 
-underlying arrow package.
-
-One of main ways in which users interact with arrow is via 
-[dplyr](https://dplyr.tidyverse.org/) syntax called on Arrow objects.  For 
-example, when a user calls `dplyr::mutate()` on an Arrow Tabular, 
-Dataset, or arrow data query object, the Arrow implementation of `mutate()` is 
-used and under the hood, translates the dplyr code into Arrow C++ code.
-
-When using `dplyr::mutate()` or `dplyr::filter()`, you may want to use functions
-from other packages.  The example below uses `stringr::str_detect()`.
-
-```{r}
-library(dplyr)
-library(stringr)
-starwars %>%
-  filter(str_detect(name, "Darth"))
-```
-This functionality has also been implemented in Arrow, e.g.:
-
-```{r}
-library(arrow)
-arrow_table(starwars) %>%
-  filter(str_detect(name, "Darth")) %>%
-  collect()
-```
-
-This is possible as a **binding** has been created between the call to the 
-stringr function `str_detect()` and the Arrow C++ code, here as a direct mapping
-to `match_substring_regex`.  You can see this for yourself by inspecting the 
-arrow data query object without retrieving the results via `collect()`.
-
-
-```{r}
-arrow_table(starwars) %>%
-  filter(str_detect(name, "Darth"))
-```
-
-In the following sections, we'll walk through how to create a binding between an 
-R function and an Arrow C++ function.
-
-# Walkthrough
-
-Imagine you are writing the bindings for the C++ function 
-[`starts_with()`](https://arrow.apache.org/docs/cpp/compute.html#containment-tests) 
-and want to bind it to the (base) R function `startsWith()`.
-
-First, take a look at the docs for both of those functions.
-
-## Examining the R function
-
-Here are the docs for R's `startsWith()` (also available at https://stat.ethz.ch/R-manual/R-devel/library/base/html/startsWith.html)
-
-```{r, echo=FALSE, out.width="50%"}
-knitr::include_graphics("./startswithdocs.png")
-```
-
-It takes 2 parameters; `x` - the input, and `prefix` - the characters to check 
-if `x` starts with.
-
-## Examining the C++ function
-
-Now, go to 
-[the compute function documentation](https://arrow.apache.org/docs/cpp/compute.html#containment-tests)
-and look for the Arrow C++ library's `starts_with()` function:
-
-```{r, echo=FALSE, out.width="100%"}
-knitr::include_graphics("./starts_with_docs.png")
-```
-
-The docs show that `starts_with()` is a unary function, which means that it takes a
-single data input. The data input must be a string-like class, and the returned 
-value is boolean, both of which match up to R's `startsWith()`.
-
-There is an options class associated with `starts_with()` - called [`MatchSubstringOptions`](https://arrow.apache.org/docs/cpp/api/compute.html#_CPPv4N5arrow7compute21MatchSubstringOptionsE)
-- so let's take a look at that.
-
-```{r, echo=FALSE, out.width="100%"}
-knitr::include_graphics("./matchsubstringoptions.png")
-```
-
-Options classes allow the user to control the behaviour of the function.  In 
-this case, there are two possible options which can be supplied - `pattern` and 
-`ignore_case`, which are described in the docs shown above.
-
-## Comparing the R and C++ functions
-
-What conclusions can be drawn from what you've seen so far?
-
-Base R's `startsWith()` and Arrow's `starts_with()` operate on equivalent data 
-types, return equivalent data types, and as there are no options implemented in 
-R that Arrow doesn't have, this should be fairly simple to map without a great 
-deal of extra work.  
-
-As `starts_with()` has an options class associated with it, we'll need to make 
-sure that it's linked up with this in the R code.
-
-In case you're wondering about the difference between arguments in R and options
-in Arrow, in R, arguments to functions can include the actual data to be 
-analysed as well as options governing how the function works, whereas in the 
-C++ compute functions, the arguments are the data to be analysed and the 
-options are for specifying how exactly the function works.
-
-So let's get started.
-
-## Step 1 - add unit tests
-
-We recommend a test-driven-development approach - write failing tests first, 
-then check that they fail, and then write the code needed to make them pass.
-Thinking up-front about the behavior which needs testing can make it easier to 
-reason about the code which needs writing later.
-
-Look up the R function that you want to bind the compute kernel to, and write a 
-set of unit tests that use a dplyr pipeline and `compare_dplyr_binding()` (and 
-perhaps even `compare_dplyr_error()` if necessary.  These functions compare the 
-output of the original function with the dplyr bindings and make sure they match.  
-We recommend looking at the [documentation next to the source code for these 
-functions](https://github.com/apache/arrow/blob/main/r/tests/testthat/helper-expectation.R)
-to get a better understanding of how they work.
-
-You should make sure you're testing all parameters of the R function in your 
-tests.
-
-Below is a possible example test for `startsWith()`.
-
-```{r, eval = FALSE}
-test_that("startsWith behaves identically in dplyr and Arrow", {
-  df <- tibble(x = c("Foo", "bar", "baz", "qux"))
-  compare_dplyr_binding(
-    .input %>%
-        filter(startsWith(x, "b")) %>%
-        collect(),
-    df
-  )
-
-})
-```
-
-## Step 2 - Hook up the compute function with options class if necessary
-
-If the C++ compute function can have options specified, make sure that the 
-function is linked with its options class in `make_compute_options()` in the 
-file `arrow/r/src/compute.cpp`.  You can find out if a compute function requires
-options by looking in the docs here: https://arrow.apache.org/docs/cpp/compute.html
-
-In the case of `starts_with()`, it looks something like this:
-
-```cpp
-  if (func_name == "starts_with") {
-    using Options = arrow::compute::MatchSubstringOptions;
-    bool ignore_case = false;
-    if (!Rf_isNull(options["ignore_case"])) {
-      ignore_case = cpp11::as_cpp<bool>(options["ignore_case"]);
-    }
-    return std::make_shared<Options>(cpp11::as_cpp<std::string>(options["pattern"]),
-                                     ignore_case);
-  }
-```
-
-You can usually copy and paste from a similar existing example.  In this case, 
-as the option `ignore_case` doesn't map to any parameters of `startsWith()`, we 
-give it a default value of `false` but if it's been set, use the set value 
-instead.  As the `pattern` argument maps directly to `prefix` in `startsWith()`
-we can pass it straight through.
-
-## Step 3 - Map the R function to the C++ kernel
-
-The next task is writing the code which binds the R function to the C++ kernel.
-
-### Step 3a - See if direct mapping is appropriate
-Compare the C++ function and R function.  If they are simple functions with no 
-options, it might be possible to directly map between the C++ and R in 
-`unary_function_map`, in the case of compute functions that operate on single 
-columns of data, or `binary_function_map` for those which operate on 2 columns 
-of data. 
-
-As `startsWith()` requires options, direct mapping is not appropriate.
-
-### Step 3b - If direct mapping not possible, try a modified implementation
-If the function cannot be mapped directly, some extra work may be needed to 
-ensure that calling the arrow version of the function results in the same result
-as calling the R version of the function.  In this case, the function will need 
-adding to the `nse_funcs` function registry. Here is how this might look for 
-`startsWith()`:
-
-```{r, eval = FALSE}
-register_binding("base::startsWith", function(x, prefix) {
-  Expression$create(
-    "starts_with",
-    x,
-    options = list(pattern = prefix)
-  )
-})
-```
-
-In the source files, all the `register_binding()` calls are wrapped in functions
-that are called on package load. These are separated into files based on
-subject matter (e.g., `R/dplyr-funcs-math.R`, `R/dplyr-funcs-string.R`): find the
-closest analog to the function whose binding is being defined and define the
-new binding in a similar location. For example, the binding for `startsWith()`
-is registered in `dplyr-funcs-string.R` next to the binding for `endsWith()`.
-
-Note: we use the namespace-qualified name (i.e. `"base::startsWith"`) for a 
-binding. This will register the same binding both as `startsWith()` and as 
-`base::startsWith()`, which will allow us to use the `pkg::` prefix in a call.
-
-```{r}
-arrow_table(starwars) %>%
-  filter(stringr::str_detect(name, "Darth"))
-```
-
-Hint:  you can use `call_function()` to call a compute function directly from R.
-This might be useful if you want to experiment with a compute function while 
-you're writing bindings for it, e.g.
-
-```{r}
-call_function(
-  "starts_with",
-  Array$create(c("Apache", "Arrow", "R", "package")),
-  options = list(pattern = "A")
-)
-```
-
-## Step 4 - Run (and potentially add to) your tests.
-
-In the process of implementing the function, you will need at least one test
-to make sure that your binding works and that future changes to the Arrow R
-package don't break it! Bindings are tested in files that correspond to
-the file in which they were defined (e.g., `startsWith()` is tested in
-`tests/testthat/test-dplyr-funcs-string.R`) next to the tests for `endsWith()`.
-
-You may end up implementing more tests, for example if you discover unusual 
-edge cases.  This is fine - add them  to the ones you wrote originally,
-and run them all.  If they pass, you're done and you can submit a PR. 
-If you've modified the C++ code in the 
-R package (for example, when hooking up a binding to its options class), you 
-should make sure to run `arrow/r/lint.sh` to lint the code.
diff --git a/r/vignettes/install.Rmd b/r/vignettes/install.Rmd
index df43a9de36fc2..c7b8251ccc99b 100644
--- a/r/vignettes/install.Rmd
+++ b/r/vignettes/install.Rmd
@@ -28,35 +28,6 @@ For `gcc`, this generally means version 7 or newer. Most contemporary Linux
 distributions have a new enough compiler; however, CentOS 7 is a notable
 exception, as it ships with gcc 4.8.
 
-If you are on CentOS 7, to build arrow you will need to install a newer `devtoolset`, and you'll need to update R's Makevars to define the `CXX17` variables. This script installs `devtoolset-8` and configures R to be able to use C++17:
-
-```
-#!/usr/bin/env bash
-
-yum install -y centos-release-scl
-yum install -y devtoolset-8
-# Optional: also install cloud storage dependencies, as described below
-yum install -y libcurl-devel openssl-devel
-
-source /opt/rh/devtoolset-8/enable
-
-if [ ! `R CMD config CXX17` ]; then
-  mkdir -p ~/.R
-  echo "CC = $(which gcc) -fPIC" >> ~/.R/Makevars
-  echo "CXX17 = $(which g++) -fPIC" >> ~/.R/Makevars
-  echo "CXX17STD = -std=c++17" >> ~/.R/Makevars
-  echo "CXX17FLAGS = ${CXX11FLAGS}" >> ~/.R/Makevars
-fi
-```
-
-Note that the C++17 compiler is only required at *build* time. You don't need
-to enable the devtoolset every time you load the package. What's more, if you
-install a binary package from RStudio Package Manager (see method 1a below), you
-do not need to set up any of this. Likewise, if you `R CMD INSTALL --build`
-arrow on a CentOS machine with the newer compilers, you can take the binary
-package it produces and install it on any other CentOS machine without those
-compilers.
-
 ### Libraries
 
 Optional support for reading from cloud storage--AWS S3 and
@@ -69,7 +40,7 @@ The prebuilt binaries come with S3 and GCS support enabled, so you will need to
 
 ## Install release version (easy way)
 
-On macOS and Windows, when you run `install.packages("arrow")` and install arrow from CRAN, you get an R binary package that contains a precompiled version of libarrow. Installing binaries is much easier that installing from source, but CRAN does not host binaries for Linux. This means that the default behaviour when you run `install.packages()` on Linux is to retrieve the source version of the R package and compile both the R package _and_ libarrow from source. We'll talk about this scenario in the next section (the "less easy" way), but first we'll suggest two faster alternatives that are usually much easier. 
+On macOS and Windows, when you run `install.packages("arrow")` and install arrow from CRAN, you get an R binary package that contains a precompiled version of libarrow. Installing binaries is much easier that installing from source, but CRAN does not host binaries for Linux. This means that the default behaviour when you run `install.packages()` on Linux is to retrieve the source version of the R package and compile both the R package _and_ libarrow from source. We'll talk about this scenario in the next section (the "less easy" way), but first we'll suggest two faster alternatives that are usually much easier.
 
 ### Binary R package with libarrow binary via RSPM/conda
 
@@ -154,15 +125,15 @@ knitr::include_graphics("./r_source_libarrow_source.png")
 ```
 
 The "less easy" way to install arrow is to install both the R package and the underlying Arrow C++ library (libarrow) from source. This method is somewhat more
-difficult because compiling and installing R packages with C++ dependencies 
-generally requires installing system packages, which you may not have privileges 
-to do, and/or building the C++ dependencies separately, which introduces all sorts 
+difficult because compiling and installing R packages with C++ dependencies
+generally requires installing system packages, which you may not have privileges
+to do, and/or building the C++ dependencies separately, which introduces all sorts
 of additional ways for things to go wrong.
 
-Installing from the full source build of arrow, compiling both C++ and R 
-bindings, will handle most of the dependency management for you, but it is 
-much slower than using binaries. However, if  using binaries isn't an option 
-for you,or you wish to customize your Linux installation, the instructions in 
+Installing from the full source build of arrow, compiling both C++ and R
+bindings, will handle most of the dependency management for you, but it is
+much slower than using binaries. However, if  using binaries isn't an option
+for you,or you wish to customize your Linux installation, the instructions in
 this section explain how to do that.
 
 ### Basic configuration
@@ -369,10 +340,10 @@ satisfy C++ dependencies.
 
 ## Offline installation
 
-The `install-arrow.R` file mentioned in the previous section includes a 
-function called `create_package_with_all_dependencies()`. Normally, when 
-installing on a computer with internet access, the build process will 
-download third-party dependencies as needed. This function provides a 
+The `install-arrow.R` file mentioned in the previous section includes a
+function called `create_package_with_all_dependencies()`. Normally, when
+installing on a computer with internet access, the build process will
+download third-party dependencies as needed. This function provides a
 way to download them in advance, which can be useful when installing Arrow
 on a computer without internet access. The process is as follows:
 
@@ -380,11 +351,11 @@ on a computer without internet access. The process is as follows:
 **Step 1.** Using a computer with internet access, download dependencies:
 
 * Install the arrow package **or** source the script directly using the following command:
-  
+
   ```r
   source("https://raw.githubusercontent.com/apache/arrow/main/r/R/install-arrow.R")
   ```
-  
+
 * Use the `create_package_with_all_dependencies()` function to create the installation bundle:
 
   ```r
@@ -399,27 +370,27 @@ on a computer without internet access. The process is as follows:
 
   ```r
   install.packages(
-    "my_arrow_pkg.tar.gz", 
+    "my_arrow_pkg.tar.gz",
     dependencies = c("Depends", "Imports", "LinkingTo")
    )
   ```
 
   This installation will build from source, so `cmake` must be available
-  
+
 * Run `arrow_info()` to check installed capabilities
 
 
 Notes:
 
-- arrow _can_ be installed on a computer without internet access 
-without using this function, but many useful features will be disabled, 
+- arrow _can_ be installed on a computer without internet access
+without using this function, but many useful features will be disabled,
 as they depend on third-party components. More precisely,
 `arrow::arrow_info()$capabilities()` will be `FALSE` for every
 capability.
 
 - If you are using binary packages you shouldn't need to this function. You
 can download the appropriate binary from your package repository, transfer
-that to the offline computer, and install that. 
+that to the offline computer, and install that.
 
 - If you're using RStudio Package Manager on Linux (RSPM), and you want to
 make a source bundle with this function, make sure to set the first repository
@@ -517,17 +488,13 @@ The install script should work everywhere, so if libarrow fails to compile,
 please [report an issue](https://issues.apache.org/jira/projects/ARROW/issues)
 so that we can improve the script.
 
-### Known installation issues
-
-* On CentOS, building the package requires a more modern `devtoolset` than the default system compilers. See "System dependencies" above.
-
 ## Contributing
 
-We are constantly working to make the installation process as painless as 
+We are constantly working to make the installation process as painless as
 possible. If you find ways to improve the process, please [report an issue](https://github.com/apache/arrow/issues) so that we can
 document it. Similarly, if you find that your Linux distribution
-or version is not supported, we would welcome the contribution of Docker 
-images (hosted on Docker Hub) that we can use in our continuous integration 
+or version is not supported, we would welcome the contribution of Docker
+images (hosted on Docker Hub) that we can use in our continuous integration
 and hopefully improve our coverage. If you do contribute a Docker image,
 it should be as minimal as possible, containing only R and the dependencies it
 requires. For reference, see the images that
@@ -537,19 +504,16 @@ You can test the arrow R package installation using the `docker-compose`
 setup included in the `apache/arrow` git repository. For example,
 
 ```
-R_ORG=rhub R_IMAGE=ubuntu-gcc-release R_TAG=latest docker-compose build r
-R_ORG=rhub R_IMAGE=ubuntu-gcc-release R_TAG=latest docker-compose run r
+R_ORG=rhub R_IMAGE=ubuntu-release R_TAG=latest docker-compose build r
+R_ORG=rhub R_IMAGE=ubuntu-release R_TAG=latest docker-compose run r
 ```
 
 installs the arrow R package, including libarrow, on the
-[rhub/ubuntu-gcc-release](https://hub.docker.com/r/rhub/ubuntu-gcc-release)
+[rhub/ubuntu-release](https://hub.docker.com/r/rhub/ubuntu-release)
 image.
 
 ## Further reading
 
 - To learn about installing development versions, see the article on [installing nightly builds](./install_nightly.html).
-- If you're contributing to the Arrow project, see the [Arrow R developers guide](./developing.html) for resources to help you on set up your development environment.  
+- If you're contributing to the Arrow project, see the [Arrow R developers guide](./developing.html) for resources to help you on set up your development environment.
 - Arrow developers may also wish to read a more detailed discussion of the code run during the installation process, described in the [install details article](./developers/install_details.html).
-
-
-
diff --git a/ruby/red-arrow-cuda/lib/arrow-cuda/version.rb b/ruby/red-arrow-cuda/lib/arrow-cuda/version.rb
index 816751fcba8ff..daf40583ee7d3 100644
--- a/ruby/red-arrow-cuda/lib/arrow-cuda/version.rb
+++ b/ruby/red-arrow-cuda/lib/arrow-cuda/version.rb
@@ -16,7 +16,7 @@
 # under the License.
 
 module ArrowCUDA
-  VERSION = "16.0.0-SNAPSHOT"
+  VERSION = "17.0.0-SNAPSHOT"
 
   module Version
     numbers, TAG = VERSION.split("-")
diff --git a/ruby/red-arrow-dataset/lib/arrow-dataset/version.rb b/ruby/red-arrow-dataset/lib/arrow-dataset/version.rb
index e391493e15974..5091384212023 100644
--- a/ruby/red-arrow-dataset/lib/arrow-dataset/version.rb
+++ b/ruby/red-arrow-dataset/lib/arrow-dataset/version.rb
@@ -16,7 +16,7 @@
 # under the License.
 
 module ArrowDataset
-  VERSION = "16.0.0-SNAPSHOT"
+  VERSION = "17.0.0-SNAPSHOT"
 
   module Version
     numbers, TAG = VERSION.split("-")
diff --git a/ruby/red-arrow-flight-sql/lib/arrow-flight-sql/version.rb b/ruby/red-arrow-flight-sql/lib/arrow-flight-sql/version.rb
index d90751be80cb0..042029b2c40cf 100644
--- a/ruby/red-arrow-flight-sql/lib/arrow-flight-sql/version.rb
+++ b/ruby/red-arrow-flight-sql/lib/arrow-flight-sql/version.rb
@@ -16,7 +16,7 @@
 # under the License.
 
 module ArrowFlightSQL
-  VERSION = "16.0.0-SNAPSHOT"
+  VERSION = "17.0.0-SNAPSHOT"
 
   module Version
     numbers, TAG = VERSION.split("-")
diff --git a/ruby/red-arrow-flight/lib/arrow-flight/version.rb b/ruby/red-arrow-flight/lib/arrow-flight/version.rb
index 6c2d676809f8f..8245a0f12e681 100644
--- a/ruby/red-arrow-flight/lib/arrow-flight/version.rb
+++ b/ruby/red-arrow-flight/lib/arrow-flight/version.rb
@@ -16,7 +16,7 @@
 # under the License.
 
 module ArrowFlight
-  VERSION = "16.0.0-SNAPSHOT"
+  VERSION = "17.0.0-SNAPSHOT"
 
   module Version
     numbers, TAG = VERSION.split("-")
diff --git a/ruby/red-arrow/lib/arrow/field-containable.rb b/ruby/red-arrow/lib/arrow/field-containable.rb
index e4dbf4ec26cae..103e901f5d2de 100644
--- a/ruby/red-arrow/lib/arrow/field-containable.rb
+++ b/ruby/red-arrow/lib/arrow/field-containable.rb
@@ -29,7 +29,7 @@ def find_field(name_or_index)
         return nil if index < 0 or index >= n_fields
         get_field(index)
       else
-        message = "field name or index must be String, Symbol or Integer"
+        message = +"field name or index must be String, Symbol or Integer"
         message << ": <#{name_or_index.inspect}>"
         raise ArgumentError, message
       end
diff --git a/ruby/red-arrow/lib/arrow/table-formatter.rb b/ruby/red-arrow/lib/arrow/table-formatter.rb
index d039679f9a03a..b93faf09cbd02 100644
--- a/ruby/red-arrow/lib/arrow/table-formatter.rb
+++ b/ruby/red-arrow/lib/arrow/table-formatter.rb
@@ -24,7 +24,8 @@ class ColumnFormatter
       attr_reader :head_values
       attr_reader :tail_values
       attr_reader :sample_values
-      def initialize(column, head_values, tail_values)
+      def initialize(table_formatter, column, head_values, tail_values)
+        @table_formatter = table_formatter
         @column = column
         @head_values = head_values
         @tail_values = tail_values
@@ -36,6 +37,15 @@ def data_type
         @data_type ||= @column.data_type
       end
 
+      def formatted_data_type_name
+        @formatted_data_type_name ||= "(#{data_type.name})"
+      end
+
+      def aligned_data_type_name
+        @aligned_data_type_name ||=
+          "%*s" % [aligned_name.size, formatted_data_type_name]
+      end
+
       def name
         @name ||= @column.name
       end
@@ -63,7 +73,7 @@ def format_value(value, width=0)
             formatted_value = format_value(value[field_name], field_value_width)
             "#{formatted_name}: #{formatted_value}"
           end
-          formatted = "{"
+          formatted = +"{"
           formatted << formatted_values.join(", ")
           formatted << "}"
           "%-*s" % [width, formatted]
@@ -90,9 +100,16 @@ def compute_field_value_width(field, sample_values)
       end
 
       def format_aligned_name(name, data_type, sample_values)
+        if @table_formatter.show_column_type?
+          min_width = formatted_data_type_name.size
+        else
+          min_width = 0
+        end
         case data_type
         when TimestampDataType
-          "%*s" % [::Time.now.iso8601.size, name]
+          width = ::Time.now.iso8601.size
+          width = min_width if width < min_width
+          "%*s" % [width, name]
         when IntegerDataType
           have_null = false
           have_negative = false
@@ -118,9 +135,12 @@ def format_aligned_name(name, data_type, sample_values)
           end
           width += 1 if have_negative # Need "-"
           width = [width, FORMATTED_NULL.size].max if have_null
+          width = min_width if width < min_width
           "%*s" % [width, name]
         when FloatDataType, DoubleDataType
-          "%*s" % [FLOAT_N_DIGITS, name]
+          width = FLOAT_N_DIGITS
+          width = min_width if width < min_width
+          "%*s" % [width, name]
         when StructDataType
           field_widths = data_type.fields.collect do |field|
             field_value_width = compute_field_value_width(field, sample_values)
@@ -130,9 +150,11 @@ def format_aligned_name(name, data_type, sample_values)
           if field_widths.size > 0
             width += (", ".size * (field_widths.size - 1))
           end
+          width = min_width if width < min_width
           "%*s" % [width, name]
         else
-          name
+          width = min_width
+          "%*s" % [width, name]
         end
       end
     end
@@ -143,7 +165,7 @@ def initialize(table, options={})
     end
 
     def format
-      text = ""
+      text = +""
       n_rows = @table.n_rows
       border = @options[:border] || 10
 
@@ -159,7 +181,7 @@ def format
         else
           tail_values = []
         end
-        ColumnFormatter.new(column, head_values, tail_values)
+        ColumnFormatter.new(self, column, head_values, tail_values)
       end
 
       format_header(text, column_formatters)
@@ -186,5 +208,9 @@ def format
 
       text
     end
+
+    def show_column_type?
+      @options.fetch(:show_column_type, true)
+    end
   end
 end
diff --git a/ruby/red-arrow/lib/arrow/table-list-formatter.rb b/ruby/red-arrow/lib/arrow/table-list-formatter.rb
index 4fe2934160a69..3e4d410ffbee8 100644
--- a/ruby/red-arrow/lib/arrow/table-list-formatter.rb
+++ b/ruby/red-arrow/lib/arrow/table-list-formatter.rb
@@ -27,9 +27,9 @@ def format_rows(text, column_formatters, rows, n_digits, start_offset)
         text << ("=" * 20 + " #{start_offset + nth_row} " + "=" * 20 + "\n")
         row.each_with_index do |column_value, nth_column|
           column_formatter = column_formatters[nth_column]
-          formatted_name = column_formatter.name
-          formatted_value = column_formatter.format_value(column_value)
-          text << "#{formatted_name}: #{formatted_value}\n"
+          text << column_formatter.name
+          text << "(#{column_formatter.data_type.name})" if show_column_type?
+          text << ": #{column_formatter.format_value(column_value)}\n"
         end
       end
     end
diff --git a/ruby/red-arrow/lib/arrow/table-table-formatter.rb b/ruby/red-arrow/lib/arrow/table-table-formatter.rb
index 36121e1b6f0e4..acf4aca8bb6d1 100644
--- a/ruby/red-arrow/lib/arrow/table-table-formatter.rb
+++ b/ruby/red-arrow/lib/arrow/table-table-formatter.rb
@@ -26,6 +26,13 @@ def format_header(text, column_formatters)
         text << "\t"
         text << column_formatter.aligned_name
       end
+      if show_column_type?
+        text << "\n"
+        column_formatters.each do |column_formatter|
+          text << "\t"
+          text << column_formatter.aligned_data_type_name
+        end
+      end
       text << "\n"
     end
 
diff --git a/ruby/red-arrow/lib/arrow/version.rb b/ruby/red-arrow/lib/arrow/version.rb
index 2b1c14e389116..1d41ae77dda04 100644
--- a/ruby/red-arrow/lib/arrow/version.rb
+++ b/ruby/red-arrow/lib/arrow/version.rb
@@ -16,7 +16,7 @@
 # under the License.
 
 module Arrow
-  VERSION = "16.0.0-SNAPSHOT"
+  VERSION = "17.0.0-SNAPSHOT"
 
   module Version
     numbers, TAG = VERSION.split("-")
diff --git a/ruby/red-arrow/test/test-csv-loader.rb b/ruby/red-arrow/test/test-csv-loader.rb
index 0b21f6f9b71f9..1e0445db06ef9 100644
--- a/ruby/red-arrow/test/test-csv-loader.rb
+++ b/ruby/red-arrow/test/test-csv-loader.rb
@@ -27,80 +27,88 @@ def load_csv(input)
     test("String: data: with header") do
       data = fixture_path("with-header-float.csv").read
       assert_equal(<<-TABLE, load_csv(data).to_s)
-	name	     score
-0	alice	 10.100000
-1	bob 	 29.200000
-2	chris	 -1.300000
+	  name	     score
+	(utf8)	  (double)
+0	alice 	 10.100000
+1	bob   	 29.200000
+2	chris 	 -1.300000
       TABLE
     end
 
     test("String: data: without header") do
       data = fixture_path("without-header-float.csv").read
       assert_equal(<<-TABLE, load_csv(data).to_s)
-	0	         1
-0	alice	 10.100000
-1	bob	 29.200000
-2	chris	 -1.300000
+	     0	         1
+	(utf8)	  (double)
+0	alice 	 10.100000
+1	bob   	 29.200000
+2	chris 	 -1.300000
       TABLE
     end
 
     test("String: path: with header") do
       path = fixture_path("with-header-float.csv").to_s
       assert_equal(<<-TABLE, load_csv(path).to_s)
-	name	     score
-0	alice	 10.100000
-1	bob 	 29.200000
-2	chris	 -1.300000
+	  name	     score
+	(utf8)	  (double)
+0	alice 	 10.100000
+1	bob   	 29.200000
+2	chris 	 -1.300000
       TABLE
     end
 
     test("String: path: without header") do
       path = fixture_path("without-header-float.csv").to_s
       assert_equal(<<-TABLE, load_csv(path).to_s)
-	0	         1
-0	alice	 10.100000
-1	bob	 29.200000
-2	chris	 -1.300000
+	     0	         1
+	(utf8)	  (double)
+0	alice 	 10.100000
+1	bob   	 29.200000
+2	chris 	 -1.300000
       TABLE
     end
 
     test("Pathname: with header") do
       path = fixture_path("with-header-float.csv")
       assert_equal(<<-TABLE, load_csv(path).to_s)
-	name	     score
-0	alice	 10.100000
-1	bob 	 29.200000
-2	chris	 -1.300000
+	  name	     score
+	(utf8)	  (double)
+0	alice 	 10.100000
+1	bob   	 29.200000
+2	chris 	 -1.300000
       TABLE
     end
 
     test("Pathname: without header") do
       path = fixture_path("without-header-float.csv")
       assert_equal(<<-TABLE, load_csv(path).to_s)
-	0	         1
-0	alice	 10.100000
-1	bob	 29.200000
-2	chris	 -1.300000
+	     0	         1
+	(utf8)	  (double)
+0	alice 	 10.100000
+1	bob   	 29.200000
+2	chris 	 -1.300000
       TABLE
     end
 
     test("null: with double quote") do
       path = fixture_path("null-with-double-quote.csv").to_s
       assert_equal(<<-TABLE, load_csv(path).to_s)
-	name	 score
-0	alice	    10
-1	bob 	(null)
-2	chris	    -1
+	  name	 score
+	(utf8)	(int8)
+0	alice 	    10
+1	bob   	(null)
+2	chris 	    -1
       TABLE
     end
 
     test("null: without double quote") do
       path = fixture_path("null-without-double-quote.csv").to_s
       assert_equal(<<-TABLE, load_csv(path).to_s)
-	name	 score
-0	alice	    10
-1	bob 	(null)
-2	chris	    -1
+	  name	 score
+	(utf8)	(int8)
+0	alice 	    10
+1	bob   	(null)
+2	chris 	    -1
       TABLE
     end
 
diff --git a/ruby/red-arrow/test/test-group.rb b/ruby/red-arrow/test/test-group.rb
index 68e927df69bc8..f4831289eda48 100644
--- a/ruby/red-arrow/test/test-group.rb
+++ b/ruby/red-arrow/test/test-group.rb
@@ -43,6 +43,7 @@ def setup
       table = Arrow::Table.new(raw_table)
       assert_equal(<<-TABLE, table.group(:time).count.to_s)
 	                     time	count(int)
+	              (timestamp)	   (int64)
 0	#{time_values[0].iso8601}	         1
 1	#{time_values[1].iso8601}	         1
       TABLE
@@ -53,6 +54,7 @@ def setup
     test("single") do
       assert_equal(<<-TABLE, @table.group(:group_key1).count.to_s)
 	group_key1	count(group_key2)	count(int)	count(uint)	count(float)	count(string)
+	   (uint8)	          (int64)	   (int64)	    (int64)	     (int64)	      (int64)
 0	         1	                2	         2	          1	           1	            2
 1	         2	                1	         0	          1	           1	            1
 2	         3	                3	         3	          3	           3	            2
@@ -62,6 +64,7 @@ def setup
     test("multiple") do
       assert_equal(<<-TABLE, @table.group(:group_key1, :group_key2).count.to_s)
 	group_key1	group_key2	count(int)	count(uint)	count(float)	count(string)
+	   (uint8)	   (uint8)	   (int64)	    (int64)	     (int64)	      (int64)
 0	         1	         1	         2	          1	           1	            2
 1	         2	         1	         0	          1	           1	            1
 2	         3	         1	         1	          1	           1	            0
@@ -73,6 +76,7 @@ def setup
       group = @table.group(:group_key1, :group_key2)
       assert_equal(<<-TABLE, group.count(:int, :uint).to_s)
 	group_key1	group_key2	count(int)	count(uint)
+	   (uint8)	   (uint8)	   (int64)	    (int64)
 0	         1	         1	         2	          1
 1	         2	         1	         0	          1
 2	         3	         1	         1	          1
@@ -85,6 +89,7 @@ def setup
     test("single") do
       assert_equal(<<-TABLE, @table.group(:group_key1).sum.to_s)
 	group_key1	sum(group_key2)	sum(int)	sum(uint)	sum(float)
+	   (uint8)	       (uint64)	 (int64)	 (uint64)	  (double)
 0	         1	              2	      -3	        1	  2.200000
 1	         2	              1	  (null)	        3	  3.300000
 2	         3	              5	     -15	       15	 16.500000
@@ -94,6 +99,7 @@ def setup
     test("multiple") do
       assert_equal(<<-TABLE, @table.group(:group_key1, :group_key2).sum.to_s)
 	group_key1	group_key2	sum(int)	sum(uint)	sum(float)
+	   (uint8)	   (uint8)	 (int64)	 (uint64)	  (double)
 0	         1	         1	      -3	        1	  2.200000
 1	         2	         1	  (null)	        3	  3.300000
 2	         3	         1	      -4	        4	  4.400000
@@ -106,6 +112,7 @@ def setup
     test("single") do
       assert_equal(<<-TABLE, @table.group(:group_key1).mean.to_s)
 	group_key1	mean(group_key2)	 mean(int)	mean(uint)	mean(float)
+	   (uint8)	        (double)	  (double)	  (double)	   (double)
 0	         1	        1.000000	 -1.500000	  1.000000	   2.200000
 1	         2	        1.000000	    (null)	  3.000000	   3.300000
 2	         3	        1.666667	 -5.000000	  5.000000	   5.500000
@@ -115,6 +122,7 @@ def setup
     test("multiple") do
       assert_equal(<<-TABLE, @table.group(:group_key1, :group_key2).mean.to_s)
 	group_key1	group_key2	 mean(int)	mean(uint)	mean(float)
+	   (uint8)	   (uint8)	  (double)	  (double)	   (double)
 0	         1	         1	 -1.500000	  1.000000	   2.200000
 1	         2	         1	    (null)	  3.000000	   3.300000
 2	         3	         1	 -4.000000	  4.000000	   4.400000
@@ -127,6 +135,7 @@ def setup
     test("single") do
       assert_equal(<<-TABLE, @table.group(:group_key1).min.to_s)
 	group_key1	min(group_key2)	min(int)	min(uint)	min(float)
+	   (uint8)	        (uint8)	 (int32)	 (uint32)	   (float)
 0	         1	              1	      -2	        1	  2.200000
 1	         2	              1	  (null)	        3	  3.300000
 2	         3	              1	      -6	        4	  4.400000
@@ -136,6 +145,7 @@ def setup
     test("multiple") do
       assert_equal(<<-TABLE, @table.group(:group_key1, :group_key2).min.to_s)
 	group_key1	group_key2	min(int)	min(uint)	min(float)
+	   (uint8)	   (uint8)	 (int32)	 (uint32)	   (float)
 0	         1	         1	      -2	        1	  2.200000
 1	         2	         1	  (null)	        3	  3.300000
 2	         3	         1	      -4	        4	  4.400000
@@ -148,6 +158,7 @@ def setup
     test("single") do
       assert_equal(<<-TABLE, @table.group(:group_key1).max.to_s)
 	group_key1	max(group_key2)	max(int)	max(uint)	max(float)
+	   (uint8)	        (uint8)	 (int32)	 (uint32)	   (float)
 0	         1	              1	      -1	        1	  2.200000
 1	         2	              1	  (null)	        3	  3.300000
 2	         3	              2	      -4	        6	  6.600000
@@ -157,6 +168,7 @@ def setup
     test("multiple") do
       assert_equal(<<-TABLE, @table.group(:group_key1, :group_key2).max.to_s)
 	group_key1	group_key2	max(int)	max(uint)	max(float)
+	   (uint8)	   (uint8)	 (int32)	 (uint32)	   (float)
 0	         1	         1	      -1	        1	  2.200000
 1	         2	         1	  (null)	        3	  3.300000
 2	         3	         1	      -4	        4	  4.400000
@@ -170,6 +182,7 @@ def setup
       group = @table.group(:group_key1, :group_key2)
       assert_equal(<<-TABLE, group.aggregate("count(int)", "sum(uint)").to_s)
 	group_key1	group_key2	count(int)	sum(uint)
+	   (uint8)	   (uint8)	   (int64)	 (uint64)
 0	         1	         1	         2	        1
 1	         2	         1	         0	        3
 2	         3	         1	         1	        4
diff --git a/ruby/red-arrow/test/test-schema.rb b/ruby/red-arrow/test/test-schema.rb
index 20d73b2726d6b..c4164d83903f2 100644
--- a/ruby/red-arrow/test/test-schema.rb
+++ b/ruby/red-arrow/test/test-schema.rb
@@ -95,7 +95,7 @@ def setup
 
       test("[invalid]") do
         invalid = []
-        message = "field name or index must be String, Symbol or Integer"
+        message = +"field name or index must be String, Symbol or Integer"
         message << ": <#{invalid.inspect}>"
         assert_raise(ArgumentError.new(message)) do
           @schema[invalid]
diff --git a/ruby/red-arrow/test/test-slicer.rb b/ruby/red-arrow/test/test-slicer.rb
index d33748a387c8f..89cf34b0d13f7 100644
--- a/ruby/red-arrow/test/test-slicer.rb
+++ b/ruby/red-arrow/test/test-slicer.rb
@@ -45,11 +45,12 @@ def setup
         slicer.visible
       end
       assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    1	true   
-1	    8	true   
-2	   16	true   
-3	  256	true   
+	   count	visible
+	(uint32)	 (bool)
+0	       1	true   
+1	       8	true   
+2	      16	true   
+3	     256	true   
       TABLE
     end
 
@@ -58,15 +59,16 @@ def setup
         slicer.count
       end
       assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    1	true   
-1	    2	false  
-2	    4	 (null)
-3	    8	true   
-4	   16	true   
-5	   32	false  
-6	   64	 (null)
-7	  256	true   
+	   count	visible
+	(uint32)	 (bool)
+0	       1	true   
+1	       2	false  
+2	       4	 (null)
+3	       8	true   
+4	      16	true   
+5	      32	false  
+6	      64	 (null)
+7	     256	true   
       TABLE
     end
   end
@@ -77,9 +79,10 @@ def setup
         !slicer.visible
       end
       assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    2	false  
-1	   32	false  
+	   count	visible
+	(uint32)	 (bool)
+0	       2	false  
+1	      32	false  
       TABLE
     end
 
@@ -88,8 +91,9 @@ def setup
         !slicer.count
       end
       assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    0	 (null)
+	   count	visible
+	(uint32)	 (bool)
+0	       0	 (null)
       TABLE
     end
   end
@@ -99,11 +103,12 @@ def setup
       slicer.visible.null?
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	 count	visible
-0	     0	 (null)
-1	     4	 (null)
-2	    64	 (null)
-3	(null)	 (null)
+	   count	visible
+	(uint32)	 (bool)
+0	       0	 (null)
+1	       4	 (null)
+2	      64	 (null)
+3	  (null)	 (null)
     TABLE
   end
 
@@ -112,13 +117,14 @@ def setup
       slicer.visible.valid?
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    1	true   
-1	    2	false  
-2	    8	true   
-3	   16	true   
-4	   32	false  
-5	  256	true   
+	   count	visible
+	(uint32)	 (bool)
+0	       1	true   
+1	       2	false  
+2	       8	true   
+3	      16	true   
+4	      32	false  
+5	     256	true   
     TABLE
   end
 
@@ -128,11 +134,12 @@ def setup
         slicer.visible == nil
       end
       assert_equal(<<-TABLE, sliced_table.to_s)
-	 count	visible
-0	     0	 (null)
-1	     4	 (null)
-2	    64	 (null)
-3	(null)	 (null)
+	   count	visible
+	(uint32)	 (bool)
+0	       0	 (null)
+1	       4	 (null)
+2	      64	 (null)
+3	  (null)	 (null)
       TABLE
     end
 
@@ -141,11 +148,12 @@ def setup
         slicer.visible == true
       end
       assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    1	true   
-1	    8	true   
-2	   16	true   
-3	  256	true   
+	   count	visible
+	(uint32)	 (bool)
+0	       1	true   
+1	       8	true   
+2	      16	true   
+3	     256	true   
       TABLE
     end
   end
@@ -156,13 +164,14 @@ def setup
         !(slicer.visible == nil)
       end
       assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    1	true   
-1	    2	false  
-2	    8	true   
-3	   16	true   
-4	   32	false  
-5	  256	true   
+	   count	visible
+	(uint32)	 (bool)
+0	       1	true   
+1	       2	false  
+2	       8	true   
+3	      16	true   
+4	      32	false  
+5	     256	true   
       TABLE
     end
 
@@ -171,9 +180,10 @@ def setup
         !(slicer.visible == true)
       end
       assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    2	false  
-1	   32	false  
+	   count	visible
+	(uint32)	 (bool)
+0	       2	false  
+1	      32	false  
       TABLE
     end
   end
@@ -184,13 +194,14 @@ def setup
         slicer.visible != nil
       end
       assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    1	true   
-1	    2	false  
-2	    8	true   
-3	   16	true   
-4	   32	false  
-5	  256	true   
+	   count	visible
+	(uint32)	 (bool)
+0	       1	true   
+1	       2	false  
+2	       8	true   
+3	      16	true   
+4	      32	false  
+5	     256	true   
       TABLE
     end
 
@@ -199,9 +210,10 @@ def setup
         slicer.visible != true
       end
       assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    2	false  
-1	   32	false  
+	   count	visible
+	(uint32)	 (bool)
+0	       2	false  
+1	      32	false  
       TABLE
     end
   end
@@ -211,12 +223,13 @@ def setup
       slicer.count < 16
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    0	 (null)
-1	    1	true   
-2	    2	false  
-3	    4	 (null)
-4	    8	true   
+	   count	visible
+	(uint32)	 (bool)
+0	       0	 (null)
+1	       1	true   
+2	       2	false  
+3	       4	 (null)
+4	       8	true   
     TABLE
   end
 
@@ -225,11 +238,12 @@ def setup
       !(slicer.count < 16)
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	   16	true   
-1	   32	false  
-2	   64	 (null)
-3	  256	true   
+	   count	visible
+	(uint32)	 (bool)
+0	      16	true   
+1	      32	false  
+2	      64	 (null)
+3	     256	true   
     TABLE
   end
 
@@ -238,13 +252,14 @@ def setup
       slicer.count <= 16
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    0	 (null)
-1	    1	true   
-2	    2	false  
-3	    4	 (null)
-4	    8	true   
-5	   16	true   
+	   count	visible
+	(uint32)	 (bool)
+0	       0	 (null)
+1	       1	true   
+2	       2	false  
+3	       4	 (null)
+4	       8	true   
+5	      16	true   
     TABLE
   end
 
@@ -253,10 +268,11 @@ def setup
       !(slicer.count <= 16)
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	   32	false  
-1	   64	 (null)
-2	  256	true   
+	   count	visible
+	(uint32)	 (bool)
+0	      32	false  
+1	      64	 (null)
+2	     256	true   
     TABLE
   end
 
@@ -265,10 +281,11 @@ def setup
       slicer.count > 16
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	   32	false  
-1	   64	 (null)
-2	  256	true   
+	   count	visible
+	(uint32)	 (bool)
+0	      32	false  
+1	      64	 (null)
+2	     256	true   
     TABLE
   end
 
@@ -277,13 +294,14 @@ def setup
       !(slicer.count > 16)
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    0	 (null)
-1	    1	true   
-2	    2	false  
-3	    4	 (null)
-4	    8	true   
-5	   16	true   
+	   count	visible
+	(uint32)	 (bool)
+0	       0	 (null)
+1	       1	true   
+2	       2	false  
+3	       4	 (null)
+4	       8	true   
+5	      16	true   
     TABLE
   end
 
@@ -292,11 +310,12 @@ def setup
       slicer.count >= 16
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	   16	true   
-1	   32	false  
-2	   64	 (null)
-3	  256	true   
+	   count	visible
+	(uint32)	 (bool)
+0	      16	true   
+1	      32	false  
+2	      64	 (null)
+3	     256	true   
     TABLE
   end
 
@@ -305,12 +324,13 @@ def setup
       !(slicer.count >= 16)
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    0	 (null)
-1	    1	true   
-2	    2	false  
-3	    4	 (null)
-4	    8	true   
+	   count	visible
+	(uint32)	 (bool)
+0	       0	 (null)
+1	       1	true   
+2	       2	false  
+3	       4	 (null)
+4	       8	true   
     TABLE
   end
 
@@ -319,11 +339,12 @@ def setup
       slicer.count.in?([1, 4, 16, 64])
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    1	true   
-1	    4	 (null)
-2	   16	true   
-3	   64	 (null)
+	   count	visible
+	(uint32)	 (bool)
+0	       1	true   
+1	       4	 (null)
+2	      16	true   
+3	      64	 (null)
     TABLE
   end
 
@@ -332,13 +353,14 @@ def setup
       !slicer.count.in?([1, 4, 16, 64])
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	 count	visible
-0	     0	 (null)
-1	     2	false  
-2	     8	true   
-3	    32	false  
-4	(null)	 (null)
-5	   256	true   
+	   count	visible
+	(uint32)	 (bool)
+0	       0	 (null)
+1	       2	false  
+2	       8	true   
+3	      32	false  
+4	  (null)	 (null)
+5	     256	true   
     TABLE
   end
 
@@ -347,9 +369,10 @@ def setup
       slicer.visible & (slicer.count >= 16)
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	   16	true   
-1	  256	true   
+	   count	visible
+	(uint32)	 (bool)
+0	      16	true   
+1	     256	true   
     TABLE
   end
 
@@ -358,12 +381,13 @@ def setup
       slicer.visible | (slicer.count >= 16)
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    1	true   
-1	    8	true   
-2	   16	true   
-3	   32	false  
-4	  256	true   
+	   count	visible
+	(uint32)	 (bool)
+0	       1	true   
+1	       8	true   
+2	      16	true   
+3	      32	false  
+4	     256	true   
     TABLE
   end
 
@@ -372,10 +396,11 @@ def setup
       slicer.visible ^ (slicer.count >= 16)
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    1	true   
-1	    8	true   
-2	   32	false  
+	   count	visible
+	(uint32)	 (bool)
+0	       1	true   
+1	       8	true   
+2	      32	false  
     TABLE
   end
 
@@ -386,15 +411,16 @@ def setup
       end
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	 count	visible
-0	     0	 (null)
-1	     1	true   
-2	     4	 (null)
-3	     8	true   
-4	    16	true   
-5	    64	 (null)
-6	(null)	 (null)
-7	   256	true   
+	   count	visible
+	(uint32)	 (bool)
+0	       0	 (null)
+1	       1	true   
+2	       4	 (null)
+3	       8	true   
+4	      16	true   
+5	      64	 (null)
+6	  (null)	 (null)
+7	     256	true   
     TABLE
   end
 
@@ -405,9 +431,10 @@ def setup
       end
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    2	false  
-1	   32	false  
+	   count	visible
+	(uint32)	 (bool)
+0	       2	false  
+1	      32	false  
     TABLE
   end
 
@@ -418,9 +445,10 @@ def setup
       end
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	count	visible
-0	    2	false  
-1	   32	false  
+	   count	visible
+	(uint32)	 (bool)
+0	       2	false  
+1	      32	false  
     TABLE
   end
 
@@ -431,15 +459,16 @@ def setup
       end
     end
     assert_equal(<<-TABLE, sliced_table.to_s)
-	 count	visible
-0	     0	 (null)
-1	     1	true   
-2	     4	 (null)
-3	     8	true   
-4	    16	true   
-5	    64	 (null)
-6	(null)	 (null)
-7	   256	true   
+	   count	visible
+	(uint32)	 (bool)
+0	       0	 (null)
+1	       1	true   
+2	       4	 (null)
+3	       8	true   
+4	      16	true   
+5	      64	 (null)
+6	  (null)	 (null)
+7	     256	true   
     TABLE
   end
 
@@ -456,6 +485,7 @@ def setup
       end
       assert_equal(<<~TABLE, sliced_table.to_s)
 	string
+	(utf8)
 0	Arrow 
 1	window
       TABLE
@@ -467,6 +497,7 @@ def setup
       end
       assert_equal(<<~TABLE, sliced_table.to_s)
 	string
+	(utf8)
 0	array 
 1	Arrow 
       TABLE
@@ -478,6 +509,7 @@ def setup
       end
       assert_equal(<<~TABLE, sliced_table.to_s)
 	string
+	(utf8)
 0	array 
 1	carrot
       TABLE
@@ -489,6 +521,7 @@ def setup
       end
       assert_equal(<<~TABLE, sliced_table.to_s)
 	string
+	(utf8)
 0	array 
 1	Arrow 
 2	carrot
@@ -501,6 +534,7 @@ def setup
       end
       assert_equal(<<~TABLE, sliced_table.to_s)
 	string
+	(utf8)
 0	Arrow 
 1	window
       TABLE
@@ -512,6 +546,7 @@ def setup
       end
       assert_equal(<<~TABLE, sliced_table.to_s)
 	string
+	(utf8)
 0	Arrow 
 1	window
       TABLE
@@ -523,6 +558,7 @@ def setup
       end
       assert_equal(<<~TABLE, sliced_table.to_s)
 	string
+	(utf8)
 0	array 
 1	Arrow 
 2	carrot
@@ -545,6 +581,7 @@ def setup
       end
       assert_equal(<<~TABLE, sliced_table.to_s)
 	string
+	(utf8)
 0	carrot
       TABLE
     end
diff --git a/ruby/red-arrow/test/test-struct-data-type.rb b/ruby/red-arrow/test/test-struct-data-type.rb
index d106e38b1d841..9bf9a17dd645a 100644
--- a/ruby/red-arrow/test/test-struct-data-type.rb
+++ b/ruby/red-arrow/test/test-struct-data-type.rb
@@ -101,7 +101,7 @@ def setup
 
       test("[invalid]") do
         invalid = []
-        message = "field name or index must be String, Symbol or Integer"
+        message = +"field name or index must be String, Symbol or Integer"
         message << ": <#{invalid.inspect}>"
         assert_raise(ArgumentError.new(message)) do
           @data_type[invalid]
diff --git a/ruby/red-arrow/test/test-table.rb b/ruby/red-arrow/test/test-table.rb
index 883cf70c269bb..a69e926156809 100644
--- a/ruby/red-arrow/test/test-table.rb
+++ b/ruby/red-arrow/test/test-table.rb
@@ -87,24 +87,26 @@ def array_like.to_ary
       target_rows_raw = [nil, true, true, false, true, false, true, true]
       target_rows = Arrow::BooleanArray.new(target_rows_raw)
       assert_equal(<<-TABLE, @table.slice(target_rows).to_s)
-	count	visible
-0	    2	false  
-1	    4	 (null)
-2	   16	true   
-3	   64	 (null)
-4	  128	 (null)
+	  count	visible
+	(uint8)	 (bool)
+0	      2	false  
+1	      4	 (null)
+2	     16	true   
+3	     64	 (null)
+4	    128	 (null)
       TABLE
     end
 
     test("Array: boolean") do
       target_rows_raw = [nil, true, true, false, true, false, true, true]
       assert_equal(<<-TABLE, @table.slice(target_rows_raw).to_s)
-	count	visible
-0	    2	false  
-1	    4	 (null)
-2	   16	true   
-3	   64	 (null)
-4	  128	 (null)
+	  count	visible
+	(uint8)	 (bool)
+0	      2	false  
+1	      4	 (null)
+2	     16	true   
+3	     64	 (null)
+4	    128	 (null)
       TABLE
     end
 
@@ -131,83 +133,93 @@ def array_like.to_ary
 
     test("Range: positive: include end") do
       assert_equal(<<-TABLE, @table.slice(2..4).to_s)
-	count	visible
-0	    4	 (null)
-1	    8	true   
-2	   16	true   
+	  count	visible
+	(uint8)	 (bool)
+0	      4	 (null)
+1	      8	true   
+2	     16	true   
       TABLE
     end
 
     test("Range: positive: exclude end") do
       assert_equal(<<-TABLE, @table.slice(2...4).to_s)
-	count	visible
-0	    4	 (null)
-1	    8	true   
+	  count	visible
+	(uint8)	 (bool)
+0	      4	 (null)
+1	      8	true   
       TABLE
     end
 
     test("Range: negative: include end") do
       assert_equal(<<-TABLE, @table.slice(-4..-2).to_s)
-	count	visible
-0	   16	true   
-1	   32	false  
-2	   64	 (null)
+	  count	visible
+	(uint8)	 (bool)
+0	     16	true   
+1	     32	false  
+2	     64	 (null)
       TABLE
     end
 
     test("Range: negative: exclude end") do
       assert_equal(<<-TABLE, @table.slice(-4...-2).to_s)
-	count	visible
-0	   16	true   
-1	   32	false  
+	  count	visible
+	(uint8)	 (bool)
+0	     16	true   
+1	     32	false  
       TABLE
     end
 
     test("[from, to]: positive") do
       assert_equal(<<-TABLE, @table.slice(0, 2).to_s)
-	count	visible
-0	    1	true   
-1	    2	false  
+	  count	visible
+	(uint8)	 (bool)
+0	      1	true   
+1	      2	false  
       TABLE
     end
 
     test("[from, to]: negative") do
       assert_equal(<<-TABLE, @table.slice(-4, 2).to_s)
-	count	visible
-0	   16	true   
-1	   32	false  
+	  count	visible
+	(uint8)	 (bool)
+0	     16	true   
+1	     32	false  
       TABLE
     end
 
     test("{key: Number}") do
       assert_equal(<<-TABLE, @table.slice(count: 16).to_s)
-	count	visible
-0	   16	true   
+	  count	visible
+	(uint8)	 (bool)
+0	     16	true   
       TABLE
     end
 
     test("{key: String}") do
       table = Arrow::Table.new(name: Arrow::StringArray.new(["a", "b", "c"]))
       assert_equal(<<-TABLE, table.slice(name: 'b').to_s)
-	name
-0	b   
+	  name
+	(utf8)
+0	b     
       TABLE
     end
 
     test("{key: true}") do
       assert_equal(<<-TABLE, @table.slice(visible: true).to_s)
-	count	visible
-0	    1	true   
-1	    8	true   
-2	   16	true   
+	  count	visible
+	(uint8)	 (bool)
+0	      1	true   
+1	      8	true   
+2	     16	true   
       TABLE
     end
 
     test("{key: false}") do
       assert_equal(<<-TABLE, @table.slice(visible: false).to_s)
-	count	visible
-0	    2	false  
-1	   32	false  
+	  count	visible
+	(uint8)	 (bool)
+0	      2	false  
+1	     32	false  
       TABLE
     end
 
@@ -218,11 +230,12 @@ def array_like.to_ary
         omit("beginless range isn't supported")
       end
       assert_equal(<<-TABLE, @table.slice(count: range).to_s)
-	count	visible
-0	    1	true   
-1	    2	false  
-2	    4	 (null)
-3	    8	true   
+	  count	visible
+	(uint8)	 (bool)
+0	      1	true   
+1	      2	false  
+2	      4	 (null)
+3	      8	true   
       TABLE
     end
 
@@ -233,10 +246,11 @@ def array_like.to_ary
         omit("beginless range isn't supported")
       end
       assert_equal(<<-TABLE, @table.slice(count: range).to_s)
-	count	visible
-0	    1	true   
-1	    2	false  
-2	    4	 (null)
+	  count	visible
+	(uint8)	 (bool)
+0	      1	true   
+1	      2	false  
+2	      4	 (null)
       TABLE
     end
 
@@ -247,39 +261,43 @@ def array_like.to_ary
         omit("endless range isn't supported")
       end
       assert_equal(<<-TABLE, @table.slice(count: range).to_s)
-	count	visible
-0	   16	true   
-1	   32	false  
-2	   64	 (null)
-3	  128	 (null)
+	  count	visible
+	(uint8)	 (bool)
+0	     16	true   
+1	     32	false  
+2	     64	 (null)
+3	    128	 (null)
       TABLE
     end
 
     test("{key: Range}: include end") do
       assert_equal(<<-TABLE, @table.slice(count: 1..16).to_s)
-	count	visible
-0	    1	true   
-1	    2	false  
-2	    4	 (null)
-3	    8	true   
-4	   16	true   
+	  count	visible
+	(uint8)	 (bool)
+0	      1	true   
+1	      2	false  
+2	      4	 (null)
+3	      8	true   
+4	     16	true   
       TABLE
     end
 
     test("{key: Range}: exclude end") do
       assert_equal(<<-TABLE, @table.slice(count: 1...16).to_s)
-	count	visible
-0	    1	true   
-1	    2	false  
-2	    4	 (null)
-3	    8	true   
+	  count	visible
+	(uint8)	 (bool)
+0	      1	true   
+1	      2	false  
+2	      4	 (null)
+3	      8	true   
       TABLE
     end
 
     test("{key1: Range, key2: true}") do
       assert_equal(<<-TABLE, @table.slice(count: 0..8, visible: false).to_s)
-	count	visible
-0	    2	false  
+	  count	visible
+	(uint8)	 (bool)
+0	      2	false  
       TABLE
     end
 
@@ -372,44 +390,47 @@ def setup
       test("add") do
         name_array = Arrow::StringArray.new(["a", "b", "c", "d", "e", "f", "g", "h"])
         assert_equal(<<-TABLE, @table.merge(:name => name_array).to_s)
-	count	visible	name
-0	    1	true   	a   
-1	    2	false  	b   
-2	    4	 (null)	c   
-3	    8	true   	d   
-4	   16	true   	e   
-5	   32	false  	f   
-6	   64	 (null)	g   
-7	  128	 (null)	h   
+	  count	visible	  name
+	(uint8)	 (bool)	(utf8)
+0	      1	true   	a     
+1	      2	false  	b     
+2	      4	 (null)	c     
+3	      8	true   	d     
+4	     16	true   	e     
+5	     32	false  	f     
+6	     64	 (null)	g     
+7	    128	 (null)	h     
         TABLE
       end
 
       test("remove") do
         assert_equal(<<-TABLE, @table.merge(:visible => nil).to_s)
-	count
-0	    1
-1	    2
-2	    4
-3	    8
-4	   16
-5	   32
-6	   64
-7	  128
+	  count
+	(uint8)
+0	      1
+1	      2
+2	      4
+3	      8
+4	     16
+5	     32
+6	     64
+7	    128
         TABLE
       end
 
       test("replace") do
         visible_array = Arrow::Int32Array.new([1] * @visible_array.length)
         assert_equal(<<-TABLE, @table.merge(:visible => visible_array).to_s)
-	count	visible
-0	    1	      1
-1	    2	      1
-2	    4	      1
-3	    8	      1
-4	   16	      1
-5	   32	      1
-6	   64	      1
-7	  128	      1
+	  count	visible
+	(uint8)	(int32)
+0	      1	      1
+1	      2	      1
+2	      4	      1
+3	      8	      1
+4	     16	      1
+5	     32	      1
+6	     64	      1
+7	    128	      1
         TABLE
       end
     end
@@ -419,15 +440,16 @@ def setup
         name_array = Arrow::StringArray.new(["a", "b", "c", "d", "e", "f", "g", "h"])
         table = Arrow::Table.new("name" => name_array)
         assert_equal(<<-TABLE, @table.merge(table).to_s)
-	count	visible	name
-0	    1	true   	a   
-1	    2	false  	b   
-2	    4	 (null)	c   
-3	    8	true   	d   
-4	   16	true   	e   
-5	   32	false  	f   
-6	   64	 (null)	g   
-7	  128	 (null)	h   
+	  count	visible	  name
+	(uint8)	 (bool)	(utf8)
+0	      1	true   	a     
+1	      2	false  	b     
+2	      4	 (null)	c     
+3	      8	true   	d     
+4	     16	true   	e     
+5	     32	false  	f     
+6	     64	 (null)	g     
+7	    128	 (null)	h     
         TABLE
       end
 
@@ -435,15 +457,16 @@ def setup
         visible_array = Arrow::Int32Array.new([1] * @visible_array.length)
         table = Arrow::Table.new("visible" => visible_array)
         assert_equal(<<-TABLE, @table.merge(table).to_s)
-	count	visible
-0	    1	      1
-1	    2	      1
-2	    4	      1
-3	    8	      1
-4	   16	      1
-5	   32	      1
-6	   64	      1
-7	  128	      1
+	  count	visible
+	(uint8)	(int32)
+0	      1	      1
+1	      2	      1
+2	      4	      1
+3	      8	      1
+4	     16	      1
+5	     32	      1
+6	     64	      1
+7	    128	      1
         TABLE
       end
     end
@@ -457,29 +480,31 @@ def setup
   sub_test_case("#remove_column") do
     test("String") do
       assert_equal(<<-TABLE, @table.remove_column("visible").to_s)
-	count
-0	    1
-1	    2
-2	    4
-3	    8
-4	   16
-5	   32
-6	   64
-7	  128
+	  count
+	(uint8)
+0	      1
+1	      2
+2	      4
+3	      8
+4	     16
+5	     32
+6	     64
+7	    128
       TABLE
     end
 
     test("Symbol") do
       assert_equal(<<-TABLE, @table.remove_column(:visible).to_s)
-	count
-0	    1
-1	    2
-2	    4
-3	    8
-4	   16
-5	   32
-6	   64
-7	  128
+	  count
+	(uint8)
+0	      1
+1	      2
+2	      4
+3	      8
+4	     16
+5	     32
+6	     64
+7	    128
       TABLE
     end
 
@@ -491,29 +516,31 @@ def setup
 
     test("Integer") do
       assert_equal(<<-TABLE, @table.remove_column(1).to_s)
-	count
-0	    1
-1	    2
-2	    4
-3	    8
-4	   16
-5	   32
-6	   64
-7	  128
+	  count
+	(uint8)
+0	      1
+1	      2
+2	      4
+3	      8
+4	     16
+5	     32
+6	     64
+7	    128
       TABLE
     end
 
     test("negative integer") do
       assert_equal(<<-TABLE, @table.remove_column(-1).to_s)
-	count
-0	    1
-1	    2
-2	    4
-3	    8
-4	   16
-5	   32
-6	   64
-7	  128
+	  count
+	(uint8)
+0	      1
+1	      2
+2	      4
+3	      8
+4	     16
+5	     32
+6	     64
+7	    128
       TABLE
     end
 
@@ -544,29 +571,33 @@ def setup
 
     test("names") do
       assert_equal(<<-TABLE, @table.select_columns(:c, :a).to_s)
-	c	a
-0	1	1
+	      c	      a
+	(uint8)	(uint8)
+0	      1	      1
       TABLE
     end
 
     test("range") do
       assert_equal(<<-TABLE, @table.select_columns(2...4).to_s)
-	c	d
-0	1	1
+	      c	      d
+	(uint8)	(uint8)
+0	      1	      1
       TABLE
     end
 
     test("indexes") do
       assert_equal(<<-TABLE, @table.select_columns(0, -1, 2).to_s)
-	a	e	c
-0	1	1	1
+	      a	      e	      c
+	(uint8)	(uint8)	(uint8)
+0	      1	      1	      1
       TABLE
     end
 
     test("mixed") do
       assert_equal(<<-TABLE, @table.select_columns(:a, -1, 2..3).to_s)
-	a	e	c	d
-0	1	1	1	1
+	      a	      e	      c	      d
+	(uint8)	(uint8)	(uint8)	(uint8)
+0	      1	      1	      1	      1
       TABLE
     end
 
@@ -575,8 +606,9 @@ def setup
         column.name == "a" or i.odd?
       end
       assert_equal(<<-TABLE, selected_table.to_s)
-	a	b	d
-0	1	1	1
+	      a	      b	      d
+	(uint8)	(uint8)	(uint8)
+0	      1	      1	      1
       TABLE
     end
 
@@ -585,15 +617,17 @@ def setup
         column.name == "a"
       end
       assert_equal(<<-TABLE, selected_table.to_s)
-	a
-0	1
+	      a
+	(uint8)
+0	      1
       TABLE
     end
 
     test("empty result") do
       selected_table = @table.filter([false] * @table.size).select_columns(:a)
       assert_equal(<<-TABLE, selected_table.to_s)
-	a
+	      a
+	(uint8)
       TABLE
     end
   end
@@ -682,7 +716,7 @@ def test_json
         output = create_output(".json")
         # TODO: Implement this.
         # @table.save(output, format: :json)
-        columns = ""
+        columns = +""
         @table.each_record.each do |record|
           column = {
             "count" => record.count,
@@ -789,10 +823,11 @@ def create_output(extension)
             path = fixture_path("with-header.csv")
             table = Arrow::Table.load(path, skip_lines: /^\#/)
             assert_equal(<<-TABLE, table.to_s)
-	name	score
-0	alice	   10
-1	bob 	   29
-2	chris	   -1
+	  name	 score
+	(utf8)	(int8)
+0	alice 	    10
+1	bob   	    29
+2	chris 	    -1
             TABLE
           end
 
@@ -808,10 +843,11 @@ def create_output(extension)
               CSV
             end
             assert_equal(<<-TABLE, Arrow::Table.load(file.path).to_s)
-	name	score
-0	alice	   10
-1	bob 	   29
-2	chris	   -1
+	  name	  score
+	(utf8)	(int64)
+0	alice 	     10
+1	bob   	     29
+2	chris 	     -1
             TABLE
           end
 
@@ -826,10 +862,11 @@ def create_output(extension)
             file.close
             table = Arrow::Table.load(file.path)
             assert_equal(<<-TABLE, table.to_s)
-	name	score
-0	alice	   10
-1	bob 	   29
-2	chris	   -1
+	  name	  score
+	(utf8)	(int64)
+0	alice 	     10
+1	bob   	     29
+2	chris 	     -1
             TABLE
           end
         end
@@ -881,7 +918,7 @@ def test_http(data)
                          output.data.to_s,
                          content_type) do |port|
           input = URI("http://127.0.0.1:#{port}#{path}")
-          loaded_table = Arrow::Table.load(input)
+          loaded_table = Arrow::Table.load(input, schema: @table.schema)
           assert_equal(@table.to_s, loaded_table.to_s)
         end
       end
@@ -962,15 +999,16 @@ def test_join
     packed_table = @table.pack
     column_n_chunks = packed_table.columns.collect {|c| c.data.n_chunks}
     assert_equal([[1, 1], <<-TABLE], [column_n_chunks, packed_table.to_s])
-	count	visible
-0	    1	true   
-1	    2	false  
-2	    4	 (null)
-3	    8	true   
-4	   16	true   
-5	   32	false  
-6	   64	 (null)
-7	  128	 (null)
+	  count	visible
+	(uint8)	 (bool)
+0	      1	true   
+1	      2	false  
+2	      4	 (null)
+3	      8	true   
+4	     16	true   
+5	     32	false  
+6	     64	 (null)
+7	    128	 (null)
     TABLE
   end
 
@@ -1009,19 +1047,20 @@ def setup
       test(":list") do
         assert_equal(<<-TABLE, @table.to_s(format: :list))
 ==================== 0 ====================
-count: 1
-visible: true
+count(uint8): 1
+visible(bool): true
 ==================== 1 ====================
-count: 2
-visible: false
+count(uint8): 2
+visible(bool): false
         TABLE
       end
 
       test(":table") do
         assert_equal(<<-TABLE, @table.to_s(format: :table))
-	count	visible
-0	    1	true   
-1	    2	false  
+	  count	visible
+	(uint8)	 (bool)
+0	      1	true   
+1	      2	false  
         TABLE
       end
 
@@ -1033,6 +1072,35 @@ def setup
       end
     end
 
+    sub_test_case(":show_column_type") do
+      def setup
+        columns = {
+          "count" => Arrow::UInt8Array.new([1, 2]),
+          "visible" => Arrow::BooleanArray.new([true, false]),
+        }
+        @table = Arrow::Table.new(columns)
+      end
+
+      test(":list") do
+        assert_equal(<<-TABLE, @table.to_s(format: :list, show_column_type: false))
+==================== 0 ====================
+count: 1
+visible: true
+==================== 1 ====================
+count: 2
+visible: false
+        TABLE
+      end
+
+      test(":table") do
+        assert_equal(<<-TABLE, @table.to_s(format: :table, show_column_type: false))
+	count	visible
+0	    1	true   
+1	    2	false  
+        TABLE
+      end
+    end
+
     sub_test_case("#==") do
       test("Arrow::Table") do
         assert do
@@ -1058,13 +1126,14 @@ def setup
     test("Array: boolean") do
       filter = [nil, true, true, false, true, false, true, true]
       assert_equal(<<-TABLE, @table.filter(filter, @options).to_s)
-	 count	visible
-0	(null)	 (null)
-1	     2	false  
-2	     4	 (null)
-3	    16	true   
-4	    64	 (null)
-5	   128	 (null)
+	  count	visible
+	(uint8)	 (bool)
+0	 (null)	 (null)
+1	      2	false  
+2	      4	 (null)
+3	     16	true   
+4	     64	 (null)
+5	    128	 (null)
       TABLE
     end
 
@@ -1072,13 +1141,14 @@ def setup
       array = [nil, true, true, false, true, false, true, true]
       filter = Arrow::BooleanArray.new(array)
       assert_equal(<<-TABLE, @table.filter(filter, @options).to_s)
-	 count	visible
-0	(null)	 (null)
-1	     2	false  
-2	     4	 (null)
-3	    16	true   
-4	    64	 (null)
-5	   128	 (null)
+	  count	visible
+	(uint8)	 (bool)
+0	 (null)	 (null)
+1	      2	false  
+2	      4	 (null)
+3	     16	true   
+4	     64	 (null)
+5	    128	 (null)
       TABLE
     end
 
@@ -1090,13 +1160,14 @@ def setup
       ]
       filter = Arrow::ChunkedArray.new(filter_chunks)
       assert_equal(<<-TABLE, @table.filter(filter, @options).to_s)
-	 count	visible
-0	(null)	 (null)
-1	     2	false  
-2	     4	 (null)
-3	    16	true   
-4	    64	 (null)
-5	   128	 (null)
+	  count	visible
+	(uint8)	 (bool)
+0	 (null)	 (null)
+1	      2	false  
+2	      4	 (null)
+3	     16	true   
+4	     64	 (null)
+5	    128	 (null)
       TABLE
     end
   end
@@ -1105,20 +1176,22 @@ def setup
     test("Arrow: boolean") do
       indices = [1, 0, 2]
       assert_equal(<<-TABLE, @table.take(indices).to_s)
-	count	visible
-0	    2	false  
-1	    1	true   
-2	    4	 (null)
+	  count	visible
+	(uint8)	 (bool)
+0	      2	false  
+1	      1	true   
+2	      4	 (null)
       TABLE
     end
 
     test("Arrow::Array") do
       indices = Arrow::Int16Array.new([1, 0, 2])
       assert_equal(<<-TABLE, @table.take(indices).to_s)
-	count	visible
-0	    2	false  
-1	    1	true   
-2	    4	 (null)
+	  count	visible
+	(uint8)	 (bool)
+0	      2	false  
+1	      1	true   
+2	      4	 (null)
       TABLE
     end
 
@@ -1129,10 +1202,11 @@ def setup
       ]
       indices = Arrow::ChunkedArray.new(chunks)
       assert_equal(<<-TABLE, @table.take(indices).to_s)
-	count	visible
-0	    2	false  
-1	    1	true   
-2	    4	 (null)
+	  count	visible
+	(uint8)	 (bool)
+0	      2	false  
+1	      1	true   
+2	      4	 (null)
       TABLE
     end
   end
@@ -1144,9 +1218,10 @@ def setup
       table2 = Arrow::Table.new(b: [false])
       concatenated = table1.concatenate([table2], unify_schemas: true)
       assert_equal(<<-TABLE, concatenated.to_s)
-	a	b
-0	true	false
-1	(null)	false
+	     a	     b
+	(bool)	(bool)
+0	true  	false 
+1	(null)	false 
       TABLE
     end
   end
diff --git a/ruby/red-gandiva/lib/gandiva/version.rb b/ruby/red-gandiva/lib/gandiva/version.rb
index 0a20a520194b0..3d9b4d9d87fa6 100644
--- a/ruby/red-gandiva/lib/gandiva/version.rb
+++ b/ruby/red-gandiva/lib/gandiva/version.rb
@@ -16,7 +16,7 @@
 # under the License.
 
 module Gandiva
-  VERSION = "16.0.0-SNAPSHOT"
+  VERSION = "17.0.0-SNAPSHOT"
 
   module Version
     numbers, TAG = VERSION.split("-")
diff --git a/ruby/red-parquet/lib/parquet/version.rb b/ruby/red-parquet/lib/parquet/version.rb
index cd61c772a3285..6d92829c23b31 100644
--- a/ruby/red-parquet/lib/parquet/version.rb
+++ b/ruby/red-parquet/lib/parquet/version.rb
@@ -16,7 +16,7 @@
 # under the License.
 
 module Parquet
-  VERSION = "16.0.0-SNAPSHOT"
+  VERSION = "17.0.0-SNAPSHOT"
 
   module Version
     numbers, TAG = VERSION.split("-")
diff --git a/swift/.swiftlint.yml b/swift/.swiftlint.yml
index d447bf9d5d97c..7e4da29f3741c 100644
--- a/swift/.swiftlint.yml
+++ b/swift/.swiftlint.yml
@@ -16,10 +16,14 @@
 # under the License.
 
 included:
+  - Arrow/Package.swift
   - Arrow/Sources
   - Arrow/Tests
+  - ArrowFlight/Package.swift
   - ArrowFlight/Sources
   - ArrowFlight/Tests
+  - CDataWGo/Package.swift
+  - CDataWGo/Sources/go-swift
 excluded:
   - Arrow/Sources/Arrow/File_generated.swift
   - Arrow/Sources/Arrow/Message_generated.swift
diff --git a/swift/Arrow/Package.swift b/swift/Arrow/Package.swift
index 946eb999c798a..85407ea1b96b8 100644
--- a/swift/Arrow/Package.swift
+++ b/swift/Arrow/Package.swift
@@ -26,28 +26,46 @@ let package = Package(
         .macOS(.v10_14)
     ],
     products: [
-        // Products define the executables and libraries a package produces, and make them visible to other packages.
         .library(
             name: "Arrow",
-            targets: ["Arrow"]),
+            targets: ["Arrow"])
     ],
     dependencies: [
         // The latest version of flatbuffers v23.5.26 was built in May 26, 2023
         // and therefore doesn't include the unaligned buffer swift changes.
         // This can be changed back to using the tag once a new version of
         // flatbuffers has been released.
-        .package(url: "https://github.com/google/flatbuffers.git", branch: "master")
+        .package(url: "https://github.com/google/flatbuffers.git", branch: "master"),
+        .package(
+              url: "https://github.com/apple/swift-atomics.git",
+              .upToNextMajor(from: "1.2.0") // or `.upToNextMinor
+            )
     ],
     targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages this package depends on.
+        .target(
+            name: "ArrowC",
+            path: "Sources/ArrowC",
+            swiftSettings: [
+                 // build: .unsafeFlags(["-warnings-as-errors"])
+            ]
+
+        ),
         .target(
             name: "Arrow",
-            dependencies: [
-                .product(name: "FlatBuffers", package: "flatbuffers")
-            ]),
+            dependencies: ["ArrowC",
+                .product(name: "FlatBuffers", package: "flatbuffers"),
+                .product(name: "Atomics", package: "swift-atomics")
+            ],
+            swiftSettings: [
+                 // build: .unsafeFlags(["-warnings-as-errors"])
+            ]
+        ),
         .testTarget(
             name: "ArrowTests",
-            dependencies: ["Arrow"]),
+            dependencies: ["Arrow", "ArrowC"],
+            swiftSettings: [
+                 // build: .unsafeFlags(["-warnings-as-errors"])
+            ]
+        )
     ]
 )
diff --git a/swift/Arrow/Sources/Arrow/ArrowArray.swift b/swift/Arrow/Sources/Arrow/ArrowArray.swift
index 88b43e63a92b7..32b6ba1704511 100644
--- a/swift/Arrow/Sources/Arrow/ArrowArray.swift
+++ b/swift/Arrow/Sources/Arrow/ArrowArray.swift
@@ -17,16 +17,29 @@
 
 import Foundation
 
-public class ArrowArrayHolder {
+public protocol ArrowArrayHolder {
+    var type: ArrowType {get}
+    var length: UInt {get}
+    var nullCount: UInt {get}
+    var array: Any {get}
+    var data: ArrowData {get}
+    var getBufferData: () -> [Data] {get}
+    var getBufferDataSizes: () -> [Int] {get}
+    var getArrowColumn: (ArrowField, [ArrowArrayHolder]) throws -> ArrowColumn {get}
+}
+
+public class ArrowArrayHolderImpl: ArrowArrayHolder {
+    public let array: Any
+    public let data: ArrowData
     public let type: ArrowType
     public let length: UInt
     public let nullCount: UInt
-    public let array: Any
     public let getBufferData: () -> [Data]
     public let getBufferDataSizes: () -> [Int]
-    private let getArrowColumn: (ArrowField, [ArrowArrayHolder]) throws -> ArrowColumn
+    public let getArrowColumn: (ArrowField, [ArrowArrayHolder]) throws -> ArrowColumn
     public init<T>(_ arrowArray: ArrowArray<T>) {
         self.array = arrowArray
+        self.data = arrowArray.arrowData
         self.length = arrowArray.length
         self.type = arrowArray.arrowData.type
         self.nullCount = arrowArray.nullCount
@@ -60,19 +73,9 @@ public class ArrowArrayHolder {
             return ArrowColumn(field, chunked: ChunkedArrayHolder(try ChunkedArray<T>(arrays)))
         }
     }
-
-    public static func makeArrowColumn(_ field: ArrowField,
-                                       holders: [ArrowArrayHolder]
-    ) -> Result<ArrowColumn, ArrowError> {
-        do {
-            return .success(try holders[0].getArrowColumn(field, holders))
-        } catch {
-            return .failure(.runtimeError("\(error)"))
-        }
-    }
 }
 
-public class ArrowArray<T>: AsString {
+public class ArrowArray<T>: AsString, AnyArray {
     public typealias ItemType = T
     public let arrowData: ArrowData
     public var nullCount: UInt {return self.arrowData.nullCount}
@@ -101,6 +104,14 @@ public class ArrowArray<T>: AsString {
 
         return "\(self[index]!)"
     }
+
+    public func asAny(_ index: UInt) -> Any? {
+        if self[index] == nil {
+            return nil
+        }
+
+        return self[index]!
+    }
 }
 
 public class FixedArray<T>: ArrowArray<T> {
diff --git a/swift/Arrow/Sources/Arrow/ArrowArrayBuilder.swift b/swift/Arrow/Sources/Arrow/ArrowArrayBuilder.swift
index b78f0ccd74997..dc80f52f8ebd2 100644
--- a/swift/Arrow/Sources/Arrow/ArrowArrayBuilder.swift
+++ b/swift/Arrow/Sources/Arrow/ArrowArrayBuilder.swift
@@ -17,7 +17,12 @@
 
 import Foundation
 
-public class ArrowArrayBuilder<T: ArrowBufferBuilder, U: ArrowArray<T.ItemType>> {
+public protocol ArrowArrayHolderBuilder {
+    func toHolder() throws -> ArrowArrayHolder
+    func appendAny(_ val: Any?)
+}
+
+public class ArrowArrayBuilder<T: ArrowBufferBuilder, U: ArrowArray<T.ItemType>>: ArrowArrayHolderBuilder {
     let type: ArrowType
     let bufferBuilder: T
     public var length: UInt {return self.bufferBuilder.length}
@@ -30,10 +35,26 @@ public class ArrowArrayBuilder<T: ArrowBufferBuilder, U: ArrowArray<T.ItemType>>
         self.bufferBuilder = try T()
     }
 
+    public func append(_ vals: T.ItemType?...) {
+        for val in vals {
+            self.bufferBuilder.append(val)
+        }
+    }
+
+    public func append(_ vals: [T.ItemType?]) {
+        for val in vals {
+            self.bufferBuilder.append(val)
+        }
+    }
+
     public func append(_ val: T.ItemType?) {
         self.bufferBuilder.append(val)
     }
 
+    public func appendAny(_ val: Any?) {
+        self.bufferBuilder.append(val as? T.ItemType)
+    }
+
     public func finish() throws -> ArrowArray<T.ItemType> {
         let buffers = self.bufferBuilder.finish()
         let arrowData = try ArrowData(self.type, buffers: buffers, nullCount: self.nullCount)
@@ -43,6 +64,10 @@ public class ArrowArrayBuilder<T: ArrowBufferBuilder, U: ArrowArray<T.ItemType>>
     public func getStride() -> Int {
         return self.type.getStride()
     }
+
+    public func toHolder() throws -> ArrowArrayHolder {
+        return try ArrowArrayHolderImpl(self.finish())
+    }
 }
 
 public class NumberArrayBuilder<T>: ArrowArrayBuilder<FixedBufferBuilder<T>, FixedArray<T>> {
@@ -94,6 +119,55 @@ public class Time64ArrayBuilder: ArrowArrayBuilder<FixedBufferBuilder<Time64>, T
 }
 
 public class ArrowArrayBuilders {
+    public static func loadBuilder( // swiftlint:disable:this cyclomatic_complexity
+        _ builderType: Any.Type) throws -> ArrowArrayHolderBuilder {
+        if builderType == Int8.self || builderType == Int8?.self {
+            return try ArrowArrayBuilders.loadNumberArrayBuilder() as NumberArrayBuilder<Int8>
+        } else if builderType == Int16.self || builderType == Int16?.self {
+            return try ArrowArrayBuilders.loadNumberArrayBuilder() as NumberArrayBuilder<Int16>
+        } else if builderType == Int32.self || builderType == Int32?.self {
+            return try ArrowArrayBuilders.loadNumberArrayBuilder() as NumberArrayBuilder<Int32>
+        } else if builderType == Int64.self || builderType == Int64?.self {
+            return try ArrowArrayBuilders.loadNumberArrayBuilder() as NumberArrayBuilder<Int64>
+        } else if builderType == Float.self || builderType == Float?.self {
+            return try ArrowArrayBuilders.loadNumberArrayBuilder() as NumberArrayBuilder<Float>
+        } else if builderType == UInt8.self || builderType == UInt8?.self {
+            return try ArrowArrayBuilders.loadNumberArrayBuilder() as NumberArrayBuilder<UInt8>
+        } else if builderType == UInt16.self || builderType == UInt16?.self {
+            return try ArrowArrayBuilders.loadNumberArrayBuilder() as NumberArrayBuilder<UInt16>
+        } else if builderType == UInt32.self || builderType == UInt32?.self {
+            return try ArrowArrayBuilders.loadNumberArrayBuilder() as NumberArrayBuilder<UInt32>
+        } else if builderType == UInt64.self || builderType == UInt64?.self {
+            return try ArrowArrayBuilders.loadNumberArrayBuilder() as NumberArrayBuilder<UInt64>
+        } else if builderType == Double.self || builderType == Double?.self {
+            return try ArrowArrayBuilders.loadNumberArrayBuilder() as NumberArrayBuilder<Double>
+        } else if builderType == String.self || builderType == String?.self {
+            return try ArrowArrayBuilders.loadStringArrayBuilder()
+        } else if builderType == Bool.self || builderType == Bool?.self {
+            return try ArrowArrayBuilders.loadBoolArrayBuilder()
+        } else if builderType == Date.self || builderType == Date?.self {
+            return try ArrowArrayBuilders.loadDate64ArrayBuilder()
+        } else {
+            throw ArrowError.invalid("Invalid type for builder: \(builderType)")
+        }
+    }
+
+    public static func isValidBuilderType<T>(_ type: T.Type) -> Bool {
+        return type == Int8?.self || type == Int16?.self ||
+            type == Int32?.self || type == Int64?.self ||
+            type == UInt8?.self || type == UInt16?.self ||
+            type == UInt32?.self || type == UInt64?.self ||
+            type == String?.self || type == Double?.self ||
+            type == Float?.self || type == Date?.self ||
+            type == Bool?.self || type == Bool.self ||
+            type == Int8.self || type == Int16.self ||
+            type == Int32.self || type == Int64.self ||
+            type == UInt8.self || type == UInt16.self ||
+            type == UInt32.self || type == UInt64.self ||
+            type == String.self || type == Double.self ||
+            type == Float.self || type == Date.self
+    }
+
     public static func loadNumberArrayBuilder<T>() throws -> NumberArrayBuilder<T> {
         let type = T.self
         if type == Int8.self {
diff --git a/swift/Arrow/Sources/Arrow/ArrowBuffer.swift b/swift/Arrow/Sources/Arrow/ArrowBuffer.swift
index 4ac4eb93c91db..1ff53cd7dd5d9 100644
--- a/swift/Arrow/Sources/Arrow/ArrowBuffer.swift
+++ b/swift/Arrow/Sources/Arrow/ArrowBuffer.swift
@@ -22,16 +22,20 @@ public class ArrowBuffer {
     static let maxLength = UInt.max
     fileprivate(set) var length: UInt
     let capacity: UInt
-    let rawPointer: UnsafeMutableRawPointer
+    public let rawPointer: UnsafeMutableRawPointer
+    let isMemoryOwner: Bool
 
-    init(length: UInt, capacity: UInt, rawPointer: UnsafeMutableRawPointer) {
+    init(length: UInt, capacity: UInt, rawPointer: UnsafeMutableRawPointer, isMemoryOwner: Bool = true) {
         self.length = length
         self.capacity = capacity
         self.rawPointer = rawPointer
+        self.isMemoryOwner = isMemoryOwner
     }
 
     deinit {
-        self.rawPointer.deallocate()
+        if isMemoryOwner {
+            self.rawPointer.deallocate()
+        }
     }
 
     func append(to data: inout Data) {
@@ -39,6 +43,13 @@ public class ArrowBuffer {
         data.append(ptr, count: Int(capacity))
     }
 
+    static func createEmptyBuffer() -> ArrowBuffer {
+        return ArrowBuffer(
+            length: 0,
+            capacity: 0,
+            rawPointer: UnsafeMutableRawPointer.allocate(byteCount: 0, alignment: .zero))
+    }
+
     static func createBuffer(_ data: [UInt8], length: UInt) -> ArrowBuffer {
         let byteCount = UInt(data.count)
         let capacity = alignTo64(byteCount)
diff --git a/swift/Arrow/Sources/Arrow/ArrowCExporter.swift b/swift/Arrow/Sources/Arrow/ArrowCExporter.swift
new file mode 100644
index 0000000000000..f2dd8ab56d897
--- /dev/null
+++ b/swift/Arrow/Sources/Arrow/ArrowCExporter.swift
@@ -0,0 +1,141 @@
+// 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.
+
+import Foundation
+import ArrowC
+import Atomics
+
+// The memory used by UnsafeAtomic is not automatically
+// reclaimed. Since this value is initialized once
+// and used until the program/app is closed it's
+// memory will be released on program/app exit
+let exportDataCounter: UnsafeAtomic<Int> = .create(0)
+
+public class ArrowCExporter {
+    private class ExportData {
+        let id: Int
+        init() {
+            id = exportDataCounter.loadThenWrappingIncrement(ordering: .relaxed)
+            ArrowCExporter.exportedData[id] = self
+        }
+    }
+
+    private class ExportSchema: ExportData {
+        public let arrowTypeNameCstr: UnsafePointer<CChar>
+        public let nameCstr: UnsafePointer<CChar>
+        private let arrowType: ArrowType
+        private let name: String
+        private let arrowTypeName: String
+        init(_ arrowType: ArrowType, name: String = "") throws {
+            self.arrowType = arrowType
+            // keeping the name str to ensure the cstring buffer remains valid
+            self.name = name
+            self.arrowTypeName = try arrowType.cDataFormatId
+            self.nameCstr = (self.name as NSString).utf8String!
+            self.arrowTypeNameCstr = (self.arrowTypeName as NSString).utf8String!
+            super.init()
+        }
+    }
+
+    private class ExportArray: ExportData {
+        private let arrowData: ArrowData
+        private(set) var data = [UnsafeRawPointer?]()
+        private(set) var buffers: UnsafeMutablePointer<UnsafeRawPointer?>
+        init(_ arrowData: ArrowData) {
+            // keep a reference to the ArrowData
+            // obj so the memory doesn't get
+            // deallocated
+            self.arrowData = arrowData
+            for arrowBuffer in arrowData.buffers {
+                self.data.append(arrowBuffer.rawPointer)
+            }
+
+            self.buffers = UnsafeMutablePointer<UnsafeRawPointer?>.allocate(capacity: self.data.count)
+            self.buffers.initialize(from: &self.data, count: self.data.count)
+            super.init()
+        }
+
+        deinit {
+            self.buffers.deinitialize(count: self.data.count)
+            self.buffers.deallocate()
+        }
+    }
+
+    private static var exportedData = [Int: ExportData]()
+    public init() {}
+
+    public func exportType(_ cSchema: inout ArrowC.ArrowSchema, arrowType: ArrowType, name: String = "") ->
+        Result<Bool, ArrowError> {
+        do {
+            let exportSchema = try ExportSchema(arrowType, name: name)
+            cSchema.format = exportSchema.arrowTypeNameCstr
+            cSchema.name = exportSchema.nameCstr
+            cSchema.private_data =
+                UnsafeMutableRawPointer(mutating: UnsafeRawPointer(bitPattern: exportSchema.id))
+            cSchema.release = {(data: UnsafeMutablePointer<ArrowC.ArrowSchema>?) in
+                let arraySchema = data!.pointee
+                let exportId = Int(bitPattern: arraySchema.private_data)
+                guard ArrowCExporter.exportedData[exportId] != nil else {
+                    fatalError("Export schema not found with id \(exportId)")
+                }
+
+                // the data associated with this exportSchema object
+                // which includes the C strings for the format and name
+                // be deallocated upon removal
+                ArrowCExporter.exportedData.removeValue(forKey: exportId)
+                ArrowC.ArrowSwiftClearReleaseSchema(data)
+            }
+        } catch {
+            return .failure(.unknownError("\(error)"))
+        }
+        return .success(true)
+    }
+
+    public func exportField(_ schema: inout ArrowC.ArrowSchema, field: ArrowField) ->
+        Result<Bool, ArrowError> {
+            return exportType(&schema, arrowType: field.type, name: field.name)
+    }
+
+    public func exportArray(_ cArray: inout ArrowC.ArrowArray, arrowData: ArrowData) {
+        let exportArray = ExportArray(arrowData)
+        cArray.buffers = exportArray.buffers
+        cArray.length = Int64(arrowData.length)
+        cArray.null_count = Int64(arrowData.nullCount)
+        cArray.n_buffers = Int64(arrowData.buffers.count)
+        // Swift Arrow does not currently support children or dictionaries
+        // This will need to be updated once support has been added
+        cArray.n_children = 0
+        cArray.children = nil
+        cArray.dictionary = nil
+        cArray.private_data =
+            UnsafeMutableRawPointer(mutating: UnsafeRawPointer(bitPattern: exportArray.id))
+        cArray.release = {(data: UnsafeMutablePointer<ArrowC.ArrowArray>?) in
+            let arrayData = data!.pointee
+            let exportId = Int(bitPattern: arrayData.private_data)
+            guard ArrowCExporter.exportedData[exportId] != nil else {
+                fatalError("Export data not found with id \(exportId)")
+            }
+
+            // the data associated with this exportArray object
+            // which includes the entire arrowData object
+            // and the buffers UnsafeMutablePointer[] will
+            // be deallocated upon removal
+            ArrowCExporter.exportedData.removeValue(forKey: exportId)
+            ArrowC.ArrowSwiftClearReleaseArray(data)
+        }
+    }
+}
diff --git a/swift/Arrow/Sources/Arrow/ArrowCImporter.swift b/swift/Arrow/Sources/Arrow/ArrowCImporter.swift
new file mode 100644
index 0000000000000..8a4cf47fc0b43
--- /dev/null
+++ b/swift/Arrow/Sources/Arrow/ArrowCImporter.swift
@@ -0,0 +1,179 @@
+// 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.
+
+import Foundation
+import ArrowC
+
+public class ImportArrayHolder: ArrowArrayHolder {
+    let cArrayPtr: UnsafePointer<ArrowC.ArrowArray>
+    public var type: ArrowType {self.holder.type}
+    public var length: UInt {self.holder.length}
+    public var nullCount: UInt {self.holder.nullCount}
+    public var array: Any {self.holder.array}
+    public var data: ArrowData {self.holder.data}
+    public var getBufferData: () -> [Data] {self.holder.getBufferData}
+    public var getBufferDataSizes: () -> [Int] {self.holder.getBufferDataSizes}
+    public var getArrowColumn: (ArrowField, [ArrowArrayHolder]) throws -> ArrowColumn {self.holder.getArrowColumn}
+    private let holder: ArrowArrayHolder
+    init(_ holder: ArrowArrayHolder, cArrayPtr: UnsafePointer<ArrowC.ArrowArray>) {
+        self.cArrayPtr = cArrayPtr
+        self.holder = holder
+    }
+
+    deinit {
+        if self.cArrayPtr.pointee.release != nil {
+            ArrowCImporter.release(self.cArrayPtr)
+        }
+    }
+}
+
+public class ArrowCImporter {
+    private func appendToBuffer(
+        _ cBuffer: UnsafeRawPointer?,
+        arrowBuffers: inout [ArrowBuffer],
+        length: UInt) {
+        if cBuffer == nil {
+            arrowBuffers.append(ArrowBuffer.createEmptyBuffer())
+            return
+        }
+
+        let pointer = UnsafeMutableRawPointer(mutating: cBuffer)!
+        arrowBuffers.append(
+            ArrowBuffer(length: length, capacity: length, rawPointer: pointer, isMemoryOwner: false))
+    }
+
+    public init() {}
+
+    public func importType(_ cArrow: String, name: String = "") ->
+        Result<ArrowField, ArrowError> {
+        do {
+            let type = try ArrowType.fromCDataFormatId(cArrow)
+            return .success(ArrowField(name, type: ArrowType(type.info), isNullable: true))
+        } catch {
+            return .failure(.invalid("Error occurred while attempting to import type: \(error)"))
+        }
+    }
+
+    public func importField(_ cSchema: ArrowC.ArrowSchema) ->
+        Result<ArrowField, ArrowError> {
+        if cSchema.n_children > 0 {
+            ArrowCImporter.release(cSchema)
+            return .failure(.invalid("Children currently not supported"))
+        } else if cSchema.dictionary != nil {
+            ArrowCImporter.release(cSchema)
+            return .failure(.invalid("Dictinoary types currently not supported"))
+        }
+
+        switch importType(
+            String(cString: cSchema.format), name: String(cString: cSchema.name)) {
+        case .success(let field):
+            ArrowCImporter.release(cSchema)
+            return .success(field)
+        case .failure(let err):
+            ArrowCImporter.release(cSchema)
+            return .failure(err)
+        }
+    }
+
+    public func importArray(
+        _ cArray: UnsafePointer<ArrowC.ArrowArray>,
+        arrowType: ArrowType,
+        isNullable: Bool = false
+    ) -> Result<ArrowArrayHolder, ArrowError> {
+        let arrowField = ArrowField("", type: arrowType, isNullable: isNullable)
+        return importArray(cArray, arrowField: arrowField)
+    }
+
+    public func importArray( // swiftlint:disable:this cyclomatic_complexity function_body_length
+        _ cArrayPtr: UnsafePointer<ArrowC.ArrowArray>,
+        arrowField: ArrowField
+    ) -> Result<ArrowArrayHolder, ArrowError> {
+        let cArray = cArrayPtr.pointee
+        if cArray.null_count < 0 {
+            ArrowCImporter.release(cArrayPtr)
+            return .failure(.invalid("Uncomputed null count is not supported"))
+        } else if cArray.n_children > 0 {
+            ArrowCImporter.release(cArrayPtr)
+            return .failure(.invalid("Children currently not supported"))
+        } else if cArray.dictionary != nil {
+            ArrowCImporter.release(cArrayPtr)
+            return .failure(.invalid("Dictionary types currently not supported"))
+        } else if cArray.offset != 0 {
+            ArrowCImporter.release(cArrayPtr)
+            return .failure(.invalid("Offset of 0 is required but found offset: \(cArray.offset)"))
+        }
+
+        let arrowType = arrowField.type
+        let length = UInt(cArray.length)
+        let nullCount = UInt(cArray.null_count)
+        var arrowBuffers = [ArrowBuffer]()
+
+        if cArray.n_buffers > 0 {
+            if cArray.buffers == nil {
+                ArrowCImporter.release(cArrayPtr)
+                return .failure(.invalid("C array buffers is nil"))
+            }
+
+            switch arrowType.info {
+            case .variableInfo:
+                if cArray.n_buffers != 3 {
+                    ArrowCImporter.release(cArrayPtr)
+                    return .failure(
+                        .invalid("Variable buffer count expected 3 but found \(cArray.n_buffers)"))
+                }
+
+                appendToBuffer(cArray.buffers[0], arrowBuffers: &arrowBuffers, length: UInt(ceil(Double(length) / 8)))
+                appendToBuffer(cArray.buffers[1], arrowBuffers: &arrowBuffers, length: length)
+                let lastOffsetLength = cArray.buffers[1]!
+                    .advanced(by: Int(length) * MemoryLayout<Int32>.stride)
+                    .load(as: Int32.self)
+                appendToBuffer(cArray.buffers[2], arrowBuffers: &arrowBuffers, length: UInt(lastOffsetLength))
+            default:
+                if cArray.n_buffers != 2 {
+                    ArrowCImporter.release(cArrayPtr)
+                    return .failure(.invalid("Expected buffer count 2 but found \(cArray.n_buffers)"))
+                }
+
+                appendToBuffer(cArray.buffers[0], arrowBuffers: &arrowBuffers, length: UInt(ceil(Double(length) / 8)))
+                appendToBuffer(cArray.buffers[1], arrowBuffers: &arrowBuffers, length: length)
+            }
+        }
+
+        switch makeArrayHolder(arrowField, buffers: arrowBuffers, nullCount: nullCount) {
+        case .success(let holder):
+            return .success(ImportArrayHolder(holder, cArrayPtr: cArrayPtr))
+        case .failure(let err):
+            ArrowCImporter.release(cArrayPtr)
+            return .failure(err)
+        }
+    }
+
+    public static func release(_ cArrayPtr: UnsafePointer<ArrowC.ArrowArray>) {
+        if cArrayPtr.pointee.release != nil {
+            let cSchemaMutablePtr = UnsafeMutablePointer<ArrowC.ArrowArray>(mutating: cArrayPtr)
+            cArrayPtr.pointee.release(cSchemaMutablePtr)
+        }
+    }
+
+    public static func release(_ cSchema: ArrowC.ArrowSchema) {
+        if cSchema.release != nil {
+            let cSchemaPtr = UnsafeMutablePointer<ArrowC.ArrowSchema>.allocate(capacity: 1)
+            cSchemaPtr.initialize(to: cSchema)
+            cSchema.release(cSchemaPtr)
+        }
+    }
+}
diff --git a/swift/Arrow/Sources/Arrow/ArrowData.swift b/swift/Arrow/Sources/Arrow/ArrowData.swift
index 93986b5955bd8..2728b9fc8b6fe 100644
--- a/swift/Arrow/Sources/Arrow/ArrowData.swift
+++ b/swift/Arrow/Sources/Arrow/ArrowData.swift
@@ -20,11 +20,18 @@ import Foundation
 public class ArrowData {
     public let type: ArrowType
     public let buffers: [ArrowBuffer]
+    public let children: [ArrowData]
     public let nullCount: UInt
     public let length: UInt
     public let stride: Int
 
-    init(_ arrowType: ArrowType, buffers: [ArrowBuffer], nullCount: UInt) throws {
+    convenience init(_ arrowType: ArrowType, buffers: [ArrowBuffer], nullCount: UInt) throws {
+        try self.init(arrowType, buffers: buffers,
+                      children: [ArrowData](), nullCount: nullCount,
+                      length: buffers[1].length)
+    }
+
+    init(_ arrowType: ArrowType, buffers: [ArrowBuffer], children: [ArrowData], nullCount: UInt, length: UInt) throws {
         let infoType = arrowType.info
         switch infoType {
         case let .primitiveInfo(typeId):
@@ -39,12 +46,17 @@ public class ArrowData {
             if typeId == ArrowTypeId.unknown {
                 throw ArrowError.unknownType("Unknown time type for data")
             }
+        case let .complexInfo(typeId):
+            if typeId == ArrowTypeId.unknown {
+                throw ArrowError.unknownType("Unknown complex type for data")
+            }
         }
 
         self.type = arrowType
         self.buffers = buffers
+        self.children = children
         self.nullCount = nullCount
-        self.length = buffers[1].length
+        self.length = length
         self.stride = arrowType.getStride()
     }
 
diff --git a/swift/Arrow/Sources/Arrow/ArrowDecoder.swift b/swift/Arrow/Sources/Arrow/ArrowDecoder.swift
new file mode 100644
index 0000000000000..7e684f360ac51
--- /dev/null
+++ b/swift/Arrow/Sources/Arrow/ArrowDecoder.swift
@@ -0,0 +1,384 @@
+// 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.
+
+import Foundation
+
+public class ArrowDecoder: Decoder {
+    var rbIndex: UInt = 0
+    var singleRBCol: Int = 0
+    public var codingPath: [CodingKey] = []
+    public var userInfo: [CodingUserInfoKey: Any] = [:]
+    public let rb: RecordBatch
+    public let nameToCol: [String: ArrowArrayHolder]
+    public let columns: [ArrowArrayHolder]
+    public init(_ decoder: ArrowDecoder) {
+        self.userInfo = decoder.userInfo
+        self.codingPath = decoder.codingPath
+        self.rb = decoder.rb
+        self.columns = decoder.columns
+        self.nameToCol = decoder.nameToCol
+        self.rbIndex = decoder.rbIndex
+    }
+
+    public init(_ rb: RecordBatch) {
+        self.rb = rb
+        var colMapping = [String: ArrowArrayHolder]()
+        var columns = [ArrowArrayHolder]()
+        for index in 0..<self.rb.schema.fields.count {
+            let field = self.rb.schema.fields[index]
+            columns.append(self.rb.column(index))
+            colMapping[field.name] = self.rb.column(index)
+        }
+
+        self.columns = columns
+        self.nameToCol = colMapping
+    }
+
+    public func decode<T: Decodable, U: Decodable>(_ type: [T: U].Type) throws -> [T: U] {
+        var output = [T: U]()
+        if rb.columnCount != 2 {
+            throw ArrowError.invalid("RecordBatch column count of 2 is required to decode to map")
+        }
+
+        for index in 0..<rb.length {
+            self.rbIndex = index
+            self.singleRBCol = 0
+            let key = try T.init(from: self)
+            self.singleRBCol = 1
+            let value = try U.init(from: self)
+            output[key] = value
+        }
+
+        self.singleRBCol = 0
+        return output
+    }
+
+    public func decode<T: Decodable>(_ type: T.Type) throws -> [T] {
+        var output = [T]()
+        for index in 0..<rb.length {
+            self.rbIndex = index
+            output.append(try type.init(from: self))
+        }
+
+        return output
+    }
+
+    public func container<Key>(keyedBy type: Key.Type
+    ) -> KeyedDecodingContainer<Key> where Key: CodingKey {
+        let container = ArrowKeyedDecoding<Key>(self, codingPath: codingPath)
+        return KeyedDecodingContainer(container)
+    }
+
+    public func unkeyedContainer() -> UnkeyedDecodingContainer {
+        return ArrowUnkeyedDecoding(self, codingPath: codingPath)
+    }
+
+    public func singleValueContainer() -> SingleValueDecodingContainer {
+        return ArrowSingleValueDecoding(self, codingPath: codingPath)
+    }
+
+    func getCol(_ name: String) throws -> AnyArray {
+        guard let col = self.nameToCol[name] else {
+            throw ArrowError.invalid("Column for key \"\(name)\" not found")
+        }
+
+        guard let anyArray = col.array as? AnyArray else {
+            throw ArrowError.invalid("Unable to convert array to AnyArray")
+        }
+
+        return anyArray
+    }
+
+    func getCol(_ index: Int) throws -> AnyArray {
+        if index >= self.columns.count {
+            throw ArrowError.outOfBounds(index: Int64(index))
+        }
+
+        guard let anyArray = self.columns[index].array as? AnyArray else {
+            throw ArrowError.invalid("Unable to convert array to AnyArray")
+        }
+
+        return anyArray
+    }
+
+    func doDecode<T>(_ key: CodingKey) throws -> T? {
+        let array: AnyArray = try self.getCol(key.stringValue)
+        return array.asAny(self.rbIndex) as? T
+    }
+
+    func doDecode<T>(_ col: Int) throws -> T? {
+        let array: AnyArray = try self.getCol(col)
+        return array.asAny(self.rbIndex) as? T
+    }
+
+    func isNull(_ key: CodingKey) throws -> Bool {
+        let array: AnyArray = try self.getCol(key.stringValue)
+        return array.asAny(self.rbIndex) == nil
+    }
+
+    func isNull(_ col: Int) throws -> Bool {
+        let array: AnyArray = try self.getCol(col)
+        return array.asAny(self.rbIndex) == nil
+    }
+}
+
+private struct ArrowUnkeyedDecoding: UnkeyedDecodingContainer {
+    var codingPath: [CodingKey]
+    var count: Int? = 0
+    var isAtEnd: Bool = false
+    var currentIndex: Int = 0
+    let decoder: ArrowDecoder
+
+    init(_ decoder: ArrowDecoder, codingPath: [CodingKey]) {
+        self.decoder = decoder
+        self.codingPath = codingPath
+        self.count = self.decoder.columns.count
+    }
+
+    mutating func increment() {
+        self.currentIndex += 1
+        self.isAtEnd = self.currentIndex >= self.count!
+    }
+
+    mutating func decodeNil() throws -> Bool {
+        defer {increment()}
+        return try self.decoder.isNull(self.currentIndex)
+    }
+
+    mutating func decode<T>(_ type: T.Type) throws -> T where T: Decodable {
+        if type == Int8?.self || type == Int16?.self ||
+            type == Int32?.self || type == Int64?.self ||
+            type == UInt8?.self || type == UInt16?.self ||
+            type == UInt32?.self || type == UInt64?.self ||
+            type == String?.self || type == Double?.self ||
+            type == Float?.self || type == Date?.self ||
+            type == Bool?.self || type == Bool.self ||
+            type == Int8.self || type == Int16.self ||
+            type == Int32.self || type == Int64.self ||
+            type == UInt8.self || type == UInt16.self ||
+            type == UInt32.self || type == UInt64.self ||
+            type == String.self || type == Double.self ||
+            type == Float.self || type == Date.self {
+            defer {increment()}
+            return try self.decoder.doDecode(self.currentIndex)!
+        } else {
+            throw ArrowError.invalid("Type \(type) is currently not supported")
+        }
+    }
+
+    func nestedContainer<NestedKey>(
+        keyedBy type: NestedKey.Type
+    ) throws -> KeyedDecodingContainer<NestedKey> where NestedKey: CodingKey {
+        throw ArrowError.invalid("Nested decoding is currently not supported.")
+    }
+
+    func nestedUnkeyedContainer() throws -> UnkeyedDecodingContainer {
+        throw ArrowError.invalid("Nested decoding is currently not supported.")
+    }
+
+    func superDecoder() throws -> Decoder {
+        throw ArrowError.invalid("super decoding is currently not supported.")
+    }
+}
+
+private struct ArrowKeyedDecoding<Key: CodingKey>: KeyedDecodingContainerProtocol {
+    var codingPath = [CodingKey]()
+    var allKeys = [Key]()
+    let decoder: ArrowDecoder
+
+    init(_ decoder: ArrowDecoder, codingPath: [CodingKey]) {
+        self.decoder = decoder
+        self.codingPath = codingPath
+    }
+
+    func contains(_ key: Key) -> Bool {
+        return self.decoder.nameToCol.keys.contains(key.stringValue)
+    }
+
+    func decodeNil(forKey key: Key) throws -> Bool {
+        try self.decoder.isNull(key)
+    }
+
+    func decode(_ type: Bool.Type, forKey key: Key) throws -> Bool {
+        return try self.decoder.doDecode(key)!
+    }
+
+    func decode(_ type: String.Type, forKey key: Key) throws -> String {
+        return try self.decoder.doDecode(key)!
+    }
+
+    func decode(_ type: Double.Type, forKey key: Key) throws -> Double {
+        return try self.decoder.doDecode(key)!
+    }
+
+    func decode(_ type: Float.Type, forKey key: Key) throws -> Float {
+        return try self.decoder.doDecode(key)!
+    }
+
+    func decode(_ type: Int.Type, forKey key: Key) throws -> Int {
+        throw ArrowError.invalid(
+            "Int type is not supported (please use Int8, Int16, Int32 or Int64)")
+    }
+
+    func decode(_ type: Int8.Type, forKey key: Key) throws -> Int8 {
+        return try self.decoder.doDecode(key)!
+    }
+
+    func decode(_ type: Int16.Type, forKey key: Key) throws -> Int16 {
+        return try self.decoder.doDecode(key)!
+    }
+
+    func decode(_ type: Int32.Type, forKey key: Key) throws -> Int32 {
+        return try self.decoder.doDecode(key)!
+    }
+
+    func decode(_ type: Int64.Type, forKey key: Key) throws -> Int64 {
+        return try self.decoder.doDecode(key)!
+    }
+
+    func decode(_ type: UInt.Type, forKey key: Key) throws -> UInt {
+        throw ArrowError.invalid(
+            "UInt type is not supported (please use UInt8, UInt16, UInt32 or UInt64)")
+    }
+
+    func decode(_ type: UInt8.Type, forKey key: Key) throws -> UInt8 {
+        return try self.decoder.doDecode(key)!
+    }
+
+    func decode(_ type: UInt16.Type, forKey key: Key) throws -> UInt16 {
+        return try self.decoder.doDecode(key)!
+    }
+
+    func decode(_ type: UInt32.Type, forKey key: Key) throws -> UInt32 {
+        return try self.decoder.doDecode(key)!
+    }
+
+    func decode(_ type: UInt64.Type, forKey key: Key) throws -> UInt64 {
+        return try self.decoder.doDecode(key)!
+    }
+
+    func decode<T>(_ type: T.Type, forKey key: Key) throws -> T where T: Decodable {
+        if ArrowArrayBuilders.isValidBuilderType(type) || type == Date.self {
+            return try self.decoder.doDecode(key)!
+        } else {
+            throw ArrowError.invalid("Type \(type) is currently not supported")
+        }
+    }
+
+    func nestedContainer<NestedKey>(
+        keyedBy type: NestedKey.Type,
+        forKey key: Key
+    ) throws -> KeyedDecodingContainer<NestedKey> where NestedKey: CodingKey {
+        throw ArrowError.invalid("Nested decoding is currently not supported.")
+    }
+
+    func nestedUnkeyedContainer(forKey key: Key) throws -> UnkeyedDecodingContainer {
+        throw ArrowError.invalid("Nested decoding is currently not supported.")
+    }
+
+    func superDecoder() throws -> Decoder {
+        throw ArrowError.invalid("super decoding is currently not supported.")
+    }
+
+    func superDecoder(forKey key: Key) throws -> Decoder {
+        throw ArrowError.invalid("super decoding is currently not supported.")
+    }
+}
+
+private struct ArrowSingleValueDecoding: SingleValueDecodingContainer {
+    var codingPath = [CodingKey]()
+    let decoder: ArrowDecoder
+
+    init(_ decoder: ArrowDecoder, codingPath: [CodingKey]) {
+        self.decoder = decoder
+        self.codingPath = codingPath
+    }
+
+    func decodeNil() -> Bool {
+        do {
+            return try self.decoder.isNull(self.decoder.singleRBCol)
+        } catch {
+            return false
+        }
+    }
+
+    func decode(_ type: Bool.Type) throws -> Bool {
+        return try self.decoder.doDecode(self.decoder.singleRBCol)!
+    }
+
+    func decode(_ type: String.Type) throws -> String {
+        return try self.decoder.doDecode(self.decoder.singleRBCol)!
+    }
+
+    func decode(_ type: Double.Type) throws -> Double {
+        return try self.decoder.doDecode(self.decoder.singleRBCol)!
+    }
+
+    func decode(_ type: Float.Type) throws -> Float {
+        return try self.decoder.doDecode(self.decoder.singleRBCol)!
+    }
+
+    func decode(_ type: Int.Type) throws -> Int {
+        throw ArrowError.invalid(
+            "Int type is not supported (please use Int8, Int16, Int32 or Int64)")
+    }
+
+    func decode(_ type: Int8.Type) throws -> Int8 {
+        return try self.decoder.doDecode(self.decoder.singleRBCol)!
+    }
+
+    func decode(_ type: Int16.Type) throws -> Int16 {
+        return try self.decoder.doDecode(self.decoder.singleRBCol)!
+    }
+
+    func decode(_ type: Int32.Type) throws -> Int32 {
+        return try self.decoder.doDecode(self.decoder.singleRBCol)!
+    }
+
+    func decode(_ type: Int64.Type) throws -> Int64 {
+        return try self.decoder.doDecode(self.decoder.singleRBCol)!
+    }
+
+    func decode(_ type: UInt.Type) throws -> UInt {
+        throw ArrowError.invalid(
+            "UInt type is not supported (please use UInt8, UInt16, UInt32 or UInt64)")
+    }
+
+    func decode(_ type: UInt8.Type) throws -> UInt8 {
+        return try self.decoder.doDecode(self.decoder.singleRBCol)!
+    }
+
+    func decode(_ type: UInt16.Type) throws -> UInt16 {
+        return try self.decoder.doDecode(self.decoder.singleRBCol)!
+    }
+
+    func decode(_ type: UInt32.Type) throws -> UInt32 {
+        return try self.decoder.doDecode(self.decoder.singleRBCol)!
+    }
+
+    func decode(_ type: UInt64.Type) throws -> UInt64 {
+        return try self.decoder.doDecode(self.decoder.singleRBCol)!
+    }
+
+    func decode<T>(_ type: T.Type) throws -> T where T: Decodable {
+        if ArrowArrayBuilders.isValidBuilderType(type) || type == Date.self {
+            return try self.decoder.doDecode(self.decoder.singleRBCol)!
+        } else {
+            throw ArrowError.invalid("Type \(type) is currently not supported")
+        }
+    }
+}
diff --git a/swift/Arrow/Sources/Arrow/ArrowEncoder.swift b/swift/Arrow/Sources/Arrow/ArrowEncoder.swift
new file mode 100644
index 0000000000000..8c72c0482f219
--- /dev/null
+++ b/swift/Arrow/Sources/Arrow/ArrowEncoder.swift
@@ -0,0 +1,456 @@
+// 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.
+
+import Foundation
+
+public class ArrowEncoder: Encoder {
+    public private(set) var builders = [String: ArrowArrayHolderBuilder]()
+    private var byIndex = [String]()
+    public var codingPath: [CodingKey] = []
+    public var userInfo: [CodingUserInfoKey: Any] = [:]
+    var errorMsg: String?
+    // this is used for Dictionary types.  A dictionary type
+    // will give each key and value there own index so instead
+    // of having a 2 column RecordBatch you would have
+    // 2 * length(dictionary) column RecordBatch. Which would not
+    // be the expected output.
+    var modForIndex: Int?
+
+    public init() {}
+
+    public init(_ builders: [String: ArrowArrayHolderBuilder], byIndex: [String]) {
+        self.builders = builders
+        self.byIndex = byIndex
+    }
+
+    public static func encode<T: Encodable>(_ data: T) throws -> RecordBatch {
+        let encoder = try loadEncoder(data)
+        try data.encode(to: encoder)
+        return try encoder.finish()
+    }
+
+    public static func encode<T: Encodable>(_ rows: [T]) throws -> RecordBatch? {
+        if rows.isEmpty {
+            return nil
+        }
+
+        let encoder = try loadEncoder(rows[0])
+        for row in rows {
+            try row.encode(to: encoder)
+        }
+
+        return try encoder.finish()
+    }
+
+    static func loadEncoder<T>(_ data: T) throws -> ArrowEncoder {
+        // this will check if T is a simple built in type
+        // (UInt, Int, Int8, String, Date, etc...).
+        if ArrowArrayBuilders.isValidBuilderType(T.self) {
+            let builders = ["col0": try ArrowArrayBuilders.loadBuilder(T.self)]
+            return ArrowEncoder(builders, byIndex: ["col0"])
+        } else {
+            let encoder = ArrowEncoder()
+            if data is [AnyHashable: Any] {
+                encoder.modForIndex = 2
+            }
+
+            return encoder
+        }
+    }
+
+    public func finish() throws -> RecordBatch {
+        try throwIfInvalid()
+        let batchBuilder = RecordBatch.Builder()
+        for key in byIndex {
+            batchBuilder.addColumn(key, arrowArray: try builders[key]!.toHolder())
+        }
+
+        switch batchBuilder.finish() {
+        case .success(let rb):
+            return rb
+        case .failure(let error):
+            throw error
+        }
+    }
+
+    public func container<Key>(keyedBy type: Key.Type) -> KeyedEncodingContainer<Key> where Key: CodingKey {
+        var container = ArrowKeyedEncoding<Key>(self)
+        container.codingPath = codingPath
+        return KeyedEncodingContainer(container)
+    }
+
+    public func unkeyedContainer() -> UnkeyedEncodingContainer {
+        return ArrowUnkeyedEncoding(self, codingPath: self.codingPath)
+    }
+
+    public func singleValueContainer() -> SingleValueEncodingContainer {
+        return ArrowSingleValueEncoding(self, codingPath: codingPath)
+    }
+
+    func doEncodeNil(key: CodingKey) throws {
+        try throwIfInvalid()
+        guard let builder = builders[key.stringValue] else {
+            throw ArrowError.invalid("Column not found for key: \(key)")
+        }
+
+        builder.appendAny(nil)
+    }
+
+    // This is required by the keyed and unkeyed encoders as columns are
+    // added when the first row of the data is encoded.  This is done due
+    // to limitations in the Swifts Mirror API (ex: it is unable to correctly
+    // find the type for String? in [Int: String?])
+    @discardableResult
+    func ensureColumnExists<T>(_ value: T, key: String) throws -> ArrowArrayHolderBuilder {
+        try throwIfInvalid()
+        var builder = builders[key]
+        if builder == nil {
+            builder = try ArrowArrayBuilders.loadBuilder(T.self)
+            builders[key] = builder
+            byIndex.append(key)
+        }
+
+        return builder!
+    }
+
+    func getIndex(_ index: Int) -> Int {
+        return self.modForIndex == nil ? index : index % self.modForIndex!
+    }
+
+    func doEncodeNil(_ keyIndex: Int) throws {
+        try throwIfInvalid()
+        let index = self.getIndex(keyIndex)
+        if index >= builders.count {
+            throw ArrowError.outOfBounds(index: Int64(index))
+        }
+
+        builders[byIndex[index]]!.appendAny(nil)
+    }
+
+    func doEncode<T>(_ value: T, key: CodingKey) throws {
+        try throwIfInvalid()
+        let builder = try ensureColumnExists(value, key: key.stringValue)
+        builder.appendAny(value)
+    }
+
+    func doEncode<T>(_ value: T, keyIndex: Int) throws {
+        try throwIfInvalid()
+        let index = self.getIndex(keyIndex)
+        if index >= builders.count {
+            if index == builders.count {
+                try ensureColumnExists(value, key: "col\(index)")
+            } else {
+                throw ArrowError.outOfBounds(index: Int64(index))
+            }
+        }
+
+        builders[byIndex[index]]!.appendAny(value)
+    }
+
+    func throwIfInvalid() throws {
+        if let errorMsg = self.errorMsg {
+            throw ArrowError.invalid(errorMsg)
+        }
+    }
+}
+
+private struct ArrowKeyedEncoding<Key: CodingKey>: KeyedEncodingContainerProtocol {
+    var codingPath: [CodingKey] = []
+    let encoder: ArrowEncoder
+    init(_ encoder: ArrowEncoder) {
+        self.encoder = encoder
+    }
+
+    // If this method is called on row 0 and the encoder is
+    // lazily bulding holders then this will produce an error
+    // as this method does not know what the underlying type
+    // is for the column.  This method is not called for
+    // nullable types (String?, Int32?, Date?) and the workaround
+    // for this issue would be to predefine the builders for the
+    // encoder. (I have only encoutered this issue when allowing
+    // nullable types at the encode func level which is currently
+    // not allowed)
+    mutating func encodeNil(forKey key: Key) throws {
+        try encoder.doEncodeNil(key: key)
+    }
+
+    mutating func doEncodeIf<T>(_ value: T?, forKey key: Key) throws {
+        if value == nil {
+            try encoder.ensureColumnExists(value, key: key.stringValue)
+            try encoder.doEncodeNil(key: key)
+        } else {
+            try encoder.doEncode(value, key: key)
+        }
+    }
+
+    mutating func encode(_ value: Bool, forKey key: Key) throws {
+        try encoder.doEncode(value, key: key)
+    }
+
+    mutating func encodeIfPresent(_ value: Bool?, forKey key: Key) throws {
+        try doEncodeIf(value, forKey: key)
+    }
+
+    mutating func encode(_ value: String, forKey key: Key) throws {
+        try encoder.doEncode(value, key: key)
+    }
+
+    mutating func encodeIfPresent(_ value: String?, forKey key: Key) throws {
+        try doEncodeIf(value, forKey: key)
+    }
+
+    mutating func encode(_ value: Double, forKey key: Key) throws {
+        try encoder.doEncode(value, key: key)
+    }
+
+    mutating func encodeIfPresent(_ value: Double?, forKey key: Key) throws {
+        try doEncodeIf(value, forKey: key)
+    }
+
+    mutating func encode(_ value: Float, forKey key: Key) throws {
+        try encoder.doEncode(value, key: key)
+    }
+
+    mutating func encodeIfPresent(_ value: Float?, forKey key: Key) throws {
+        try doEncodeIf(value, forKey: key)
+    }
+
+    mutating func encode(_ value: Int, forKey key: Key) throws {
+        throw ArrowError.invalid(
+            "Int type is not supported (please use Int8, Int16, Int32 or Int64)")
+    }
+
+    mutating func encodeIfPresent(_ value: Int?, forKey key: Key) throws {
+        throw ArrowError.invalid(
+            "Int type is not supported (please use Int8, Int16, Int32 or Int64)")
+    }
+
+    mutating func encode(_ value: Int8, forKey key: Key) throws {
+        try encoder.doEncode(value, key: key)
+    }
+
+    mutating func encodeIfPresent(_ value: Int8?, forKey key: Key) throws {
+        try doEncodeIf(value, forKey: key)
+    }
+
+    mutating func encode(_ value: Int16, forKey key: Key) throws {
+        try encoder.doEncode(value, key: key)
+    }
+
+    mutating func encodeIfPresent(_ value: Int16?, forKey key: Key) throws {
+        try doEncodeIf(value, forKey: key)
+    }
+
+    mutating func encode(_ value: Int32, forKey key: Key) throws {
+        try encoder.doEncode(value, key: key)
+    }
+
+    mutating func encodeIfPresent(_ value: Int32?, forKey key: Key) throws {
+        try doEncodeIf(value, forKey: key)
+    }
+
+    mutating func encode(_ value: Int64, forKey key: Key) throws {
+        try encoder.doEncode(value, key: key)
+    }
+
+    mutating func encodeIfPresent(_ value: Int64?, forKey key: Key) throws {
+        try doEncodeIf(value, forKey: key)
+    }
+
+    mutating func encode(_ value: UInt, forKey key: Key) throws {
+        throw ArrowError.invalid(
+            "UInt type is not supported (please use UInt8, UInt16, UInt32 or UInt64)")
+    }
+
+    mutating func encodeIfPresent(_ value: UInt?, forKey key: Key) throws {
+        throw ArrowError.invalid(
+            "UInt type is not supported (please use UInt8, UInt16, UInt32 or UInt64)")
+    }
+
+    mutating func encode(_ value: UInt8, forKey key: Key) throws {
+        try encoder.doEncode(value, key: key)
+    }
+
+    mutating func encodeIfPresent(_ value: UInt8?, forKey key: Key) throws {
+        try doEncodeIf(value, forKey: key)
+    }
+
+    mutating func encode(_ value: UInt16, forKey key: Key) throws {
+        try encoder.doEncode(value, key: key)
+    }
+
+    mutating func encodeIfPresent(_ value: UInt16?, forKey key: Key) throws {
+        try doEncodeIf(value, forKey: key)
+    }
+
+    mutating func encode(_ value: UInt32, forKey key: Key) throws {
+        try encoder.doEncode(value, key: key)
+    }
+
+    mutating func encodeIfPresent(_ value: UInt32?, forKey key: Key) throws {
+        try doEncodeIf(value, forKey: key)
+    }
+
+    mutating func encode(_ value: UInt64, forKey key: Key) throws {
+        try encoder.doEncode(value, key: key)
+    }
+
+    mutating func encodeIfPresent(_ value: UInt64?, forKey key: Key) throws {
+        try doEncodeIf(value, forKey: key)
+    }
+
+    mutating func encode<T: Encodable>(_ value: T, forKey key: Key) throws {
+        if ArrowArrayBuilders.isValidBuilderType(T.self) {
+            try encoder.doEncode(value, key: key)
+        } else {
+            throw ArrowError.invalid("Type \(T.self) is currently not supported")
+        }
+    }
+
+    mutating func encodeIfPresent<T>(_ value: T?, forKey key: Self.Key) throws where T: Encodable {
+        if ArrowArrayBuilders.isValidBuilderType(T?.self) {
+            try doEncodeIf(value, forKey: key)
+        } else {
+            throw ArrowError.invalid("Type \(T.self) is currently not supported")
+        }
+    }
+
+    // nested container is currently not allowed.  This method doesn't throw
+    // so setting an error mesg that will be throw by the encoder at the next
+    // method call that throws
+    mutating func nestedContainer<NestedKey: CodingKey>(
+        keyedBy keyType: NestedKey.Type,
+        forKey key: Key) -> KeyedEncodingContainer<NestedKey> {
+        self.encoder.errorMsg = "Nested decoding is currently not supported."
+        var container = ArrowKeyedEncoding<NestedKey>(self.encoder)
+        container.codingPath = codingPath
+        return KeyedEncodingContainer(container)
+    }
+
+    // nested container is currently not allowed.  This method doesn't throw
+    // so setting an error mesg that will be throw by the encoder at the next
+    // method call that throws
+    mutating func nestedUnkeyedContainer(forKey key: Key) -> UnkeyedEncodingContainer {
+        self.encoder.errorMsg = "Nested decoding is currently not supported."
+        return ArrowUnkeyedEncoding(self.encoder, codingPath: self.codingPath)
+    }
+
+    // super encoding is currently not allowed.  This method doesn't throw
+    // so setting an error mesg that will be throw by the encoder at the next
+    // method call that throws
+    mutating func superEncoder() -> Encoder {
+        self.encoder.errorMsg = "super encoding is currently not supported."
+        return self.encoder
+    }
+
+    // super encoding is currently not allowed.  This method doesn't throw
+    // so setting an error mesg that will be throw by the encoder at the next
+    // method call that throws
+    mutating func superEncoder(forKey key: Key) -> Encoder {
+        self.encoder.errorMsg = "super encoding is currently not supported."
+        return self.encoder
+    }
+}
+
+private struct ArrowUnkeyedEncoding: UnkeyedEncodingContainer {
+    public private(set) var encoder: ArrowEncoder
+    var codingPath: [CodingKey] = []
+    var currentIndex: Int
+    var count: Int = 0
+
+    init(_ encoder: ArrowEncoder, codingPath: [CodingKey], currentIndex: Int = 0) {
+        self.encoder = encoder
+        self.currentIndex = currentIndex
+    }
+
+    mutating func increment() {
+        self.currentIndex += 1
+    }
+
+    // If this method is called on row 0 and the encoder is
+    // lazily bulding holders then this will produce an error
+    // as this method does not know what the underlying type
+    // is for the column.  This method is not called for
+    // nullable types (String?, Int32?, Date?) and the workaround
+    // for this issue would be to predefine the builders for the
+    // encoder. (I have only encoutered this issue when allowing
+    // nullable types at the encode func level which is currently
+    // not allowed)
+    mutating func encodeNil() throws {
+        try encoder.doEncodeNil(self.currentIndex)
+    }
+
+    mutating func encode<T>(_ value: T) throws where T: Encodable {
+        let type = T.self
+        if ArrowArrayBuilders.isValidBuilderType(type) {
+            defer {increment()}
+            return try self.encoder.doEncode(value, keyIndex: self.currentIndex)
+        } else {
+            throw ArrowError.invalid("Type \(type) is currently not supported")
+        }
+    }
+
+    // nested container is currently not allowed.  This method doesn't throw
+    // so setting an error mesg that will be throw by the encoder at the next
+    // method call that throws
+    mutating func nestedContainer<NestedKey>(keyedBy keyType: NestedKey.Type
+    ) -> KeyedEncodingContainer<NestedKey> where NestedKey: CodingKey {
+        self.encoder.errorMsg = "Nested decoding is currently not supported."
+        var container = ArrowKeyedEncoding<NestedKey>(self.encoder)
+        container.codingPath = codingPath
+        return KeyedEncodingContainer(container)
+    }
+
+    // nested container is currently not allowed.  This method doesn't throw
+    // so setting an error mesg that will be throw by the encoder at the next
+    // method call that throws
+    mutating func nestedUnkeyedContainer() -> UnkeyedEncodingContainer {
+        self.encoder.errorMsg = "Nested decoding is currently not supported."
+        return ArrowUnkeyedEncoding(self.encoder, codingPath: self.codingPath)
+    }
+
+    // super encoding is currently not allowed.  This method doesn't throw
+    // so setting an error mesg that will be throw by the encoder at the next
+    // method call that throws
+    mutating func superEncoder() -> Encoder {
+        self.encoder.errorMsg = "super encoding is currently not supported."
+        return self.encoder
+    }
+}
+
+private struct ArrowSingleValueEncoding: SingleValueEncodingContainer {
+    public private(set) var encoder: ArrowEncoder
+    var codingPath: [CodingKey] = []
+
+    public init(_ encoder: ArrowEncoder, codingPath: [CodingKey]) {
+        self.encoder = encoder
+        self.codingPath = codingPath
+    }
+
+    mutating func encodeNil() throws {
+        return try self.encoder.doEncodeNil(0)
+    }
+
+    mutating func encode<T: Encodable>(_ value: T) throws {
+        if ArrowArrayBuilders.isValidBuilderType(T.self) {
+            return try self.encoder.doEncode(value, keyIndex: 0)
+        } else {
+            throw ArrowError.invalid("Type \(T.self) is currently not supported")
+        }
+    }
+}
+// swiftlint:disable:this file_length
diff --git a/swift/Arrow/Sources/Arrow/ArrowReaderHelper.swift b/swift/Arrow/Sources/Arrow/ArrowReaderHelper.swift
index fb4a13b766f10..c701653ecb2c9 100644
--- a/swift/Arrow/Sources/Arrow/ArrowReaderHelper.swift
+++ b/swift/Arrow/Sources/Arrow/ArrowReaderHelper.swift
@@ -23,7 +23,7 @@ private func makeBinaryHolder(_ buffers: [ArrowBuffer],
     do {
         let arrowType = ArrowType(ArrowType.ArrowBinary)
         let arrowData = try ArrowData(arrowType, buffers: buffers, nullCount: nullCount)
-        return .success(ArrowArrayHolder(BinaryArray(arrowData)))
+        return .success(ArrowArrayHolderImpl(BinaryArray(arrowData)))
     } catch let error as ArrowError {
         return .failure(error)
     } catch {
@@ -36,7 +36,7 @@ private func makeStringHolder(_ buffers: [ArrowBuffer],
     do {
         let arrowType = ArrowType(ArrowType.ArrowString)
         let arrowData = try ArrowData(arrowType, buffers: buffers, nullCount: nullCount)
-        return .success(ArrowArrayHolder(StringArray(arrowData)))
+        return .success(ArrowArrayHolderImpl(StringArray(arrowData)))
     } catch let error as ArrowError {
         return .failure(error)
     } catch {
@@ -51,11 +51,11 @@ private func makeDateHolder(_ field: ArrowField,
     do {
         if field.type.id == .date32 {
             let arrowData = try ArrowData(field.type, buffers: buffers, nullCount: nullCount)
-            return .success(ArrowArrayHolder(Date32Array(arrowData)))
+            return .success(ArrowArrayHolderImpl(Date32Array(arrowData)))
         }
 
         let arrowData = try ArrowData(field.type, buffers: buffers, nullCount: nullCount)
-        return .success(ArrowArrayHolder(Date64Array(arrowData)))
+        return .success(ArrowArrayHolderImpl(Date64Array(arrowData)))
     } catch let error as ArrowError {
         return .failure(error)
     } catch {
@@ -71,7 +71,7 @@ private func makeTimeHolder(_ field: ArrowField,
         if field.type.id == .time32 {
             if let arrowType = field.type as? ArrowTypeTime32 {
                 let arrowData = try ArrowData(arrowType, buffers: buffers, nullCount: nullCount)
-                return .success(ArrowArrayHolder(FixedArray<Time32>(arrowData)))
+                return .success(ArrowArrayHolderImpl(FixedArray<Time32>(arrowData)))
             } else {
                 return .failure(.invalid("Incorrect field type for time: \(field.type)"))
             }
@@ -79,7 +79,7 @@ private func makeTimeHolder(_ field: ArrowField,
 
         if let arrowType = field.type as? ArrowTypeTime64 {
             let arrowData = try ArrowData(arrowType, buffers: buffers, nullCount: nullCount)
-            return .success(ArrowArrayHolder(FixedArray<Time64>(arrowData)))
+            return .success(ArrowArrayHolderImpl(FixedArray<Time64>(arrowData)))
         } else {
             return .failure(.invalid("Incorrect field type for time: \(field.type)"))
         }
@@ -95,7 +95,7 @@ private func makeBoolHolder(_ buffers: [ArrowBuffer],
     do {
         let arrowType = ArrowType(ArrowType.ArrowBool)
         let arrowData = try ArrowData(arrowType, buffers: buffers, nullCount: nullCount)
-        return .success(ArrowArrayHolder(BoolArray(arrowData)))
+        return .success(ArrowArrayHolderImpl(BoolArray(arrowData)))
     } catch let error as ArrowError {
         return .failure(error)
     } catch {
@@ -109,7 +109,7 @@ private func makeFixedHolder<T>(
 ) -> Result<ArrowArrayHolder, ArrowError> {
     do {
         let arrowData = try ArrowData(field.type, buffers: buffers, nullCount: nullCount)
-        return .success(ArrowArrayHolder(FixedArray<T>(arrowData)))
+        return .success(ArrowArrayHolderImpl(FixedArray<T>(arrowData)))
     } catch let error as ArrowError {
         return .failure(error)
     } catch {
diff --git a/swift/Arrow/Sources/Arrow/ArrowSchema.swift b/swift/Arrow/Sources/Arrow/ArrowSchema.swift
index 45f13a1551c3d..65c506d51cdd6 100644
--- a/swift/Arrow/Sources/Arrow/ArrowSchema.swift
+++ b/swift/Arrow/Sources/Arrow/ArrowSchema.swift
@@ -17,9 +17,9 @@
 
 import Foundation
 public class ArrowField {
-    let type: ArrowType
-    let name: String
-    let isNullable: Bool
+    public let type: ArrowType
+    public let name: String
+    public let isNullable: Bool
 
     init(_ name: String, type: ArrowType, isNullable: Bool) {
         self.name = name
diff --git a/swift/Arrow/Sources/Arrow/ArrowTable.swift b/swift/Arrow/Sources/Arrow/ArrowTable.swift
index 7677fb4f33a19..b9d15154c4f94 100644
--- a/swift/Arrow/Sources/Arrow/ArrowTable.swift
+++ b/swift/Arrow/Sources/Arrow/ArrowTable.swift
@@ -64,7 +64,7 @@ public class ArrowTable {
 
         let builder = ArrowTable.Builder()
         for index in 0..<schema.fields.count {
-            switch ArrowArrayHolder.makeArrowColumn(schema.fields[index], holders: holders[index]) {
+            switch makeArrowColumn(schema.fields[index], holders: holders[index]) {
             case .success(let column):
                 builder.addColumn(column)
             case .failure(let error):
@@ -75,6 +75,17 @@ public class ArrowTable {
         return .success(builder.finish())
     }
 
+    private static func makeArrowColumn(
+        _ field: ArrowField,
+        holders: [ArrowArrayHolder]
+    ) -> Result<ArrowColumn, ArrowError> {
+        do {
+            return .success(try holders[0].getArrowColumn(field, holders))
+        } catch {
+            return .failure(.runtimeError("\(error)"))
+        }
+    }
+
     public class Builder {
         let schemaBuilder = ArrowSchema.Builder()
         var columns = [ArrowColumn]()
@@ -172,6 +183,11 @@ public class RecordBatch {
         return (arrayHolder.array as! ArrowArray<T>) // swiftlint:disable:this force_cast
     }
 
+    public func anyData(for columnIndex: Int) -> AnyArray {
+        let arrayHolder = column(columnIndex)
+        return (arrayHolder.array as! AnyArray) // swiftlint:disable:this force_cast
+    }
+
     public func column(_ index: Int) -> ArrowArrayHolder {
         return self.columns[index]
     }
diff --git a/swift/Arrow/Sources/Arrow/ArrowType.swift b/swift/Arrow/Sources/Arrow/ArrowType.swift
index f5a869f7cdaff..000fe21568810 100644
--- a/swift/Arrow/Sources/Arrow/ArrowType.swift
+++ b/swift/Arrow/Sources/Arrow/ArrowType.swift
@@ -90,6 +90,17 @@ public class ArrowTypeTime32: ArrowType {
         self.unit = unit
         super.init(ArrowType.ArrowTime32)
     }
+
+    public override var cDataFormatId: String {
+        get throws {
+            switch self.unit {
+            case .milliseconds:
+                return "ttm"
+            case .seconds:
+                return "tts"
+            }
+        }
+    }
 }
 
 public class ArrowTypeTime64: ArrowType {
@@ -98,6 +109,25 @@ public class ArrowTypeTime64: ArrowType {
         self.unit = unit
         super.init(ArrowType.ArrowTime64)
     }
+
+    public override var cDataFormatId: String {
+        get throws {
+            switch self.unit {
+            case .microseconds:
+                return "ttu"
+            case .nanoseconds:
+                return "ttn"
+            }
+        }
+    }
+}
+
+public class ArrowNestedType: ArrowType {
+    let fields: [ArrowField]
+    public init(_ info: ArrowType.Info, fields: [ArrowField]) {
+        self.fields = fields
+        super.init(info)
+    }
 }
 
 public class ArrowType {
@@ -120,6 +150,7 @@ public class ArrowType {
     public static let ArrowBinary = Info.variableInfo(ArrowTypeId.binary)
     public static let ArrowTime32 = Info.timeInfo(ArrowTypeId.time32)
     public static let ArrowTime64 = Info.timeInfo(ArrowTypeId.time64)
+    public static let ArrowStruct = Info.complexInfo(ArrowTypeId.strct)
 
     public init(_ info: ArrowType.Info) {
         self.info = info
@@ -133,6 +164,8 @@ public class ArrowType {
             return id
         case .variableInfo(let id):
             return id
+        case .complexInfo(let id):
+            return id
         }
     }
 
@@ -140,6 +173,42 @@ public class ArrowType {
         case primitiveInfo(ArrowTypeId)
         case variableInfo(ArrowTypeId)
         case timeInfo(ArrowTypeId)
+        case complexInfo(ArrowTypeId)
+    }
+
+    public static func infoForType( // swiftlint:disable:this cyclomatic_complexity
+        _ type: Any.Type) -> ArrowType.Info {
+        if type == String.self {
+            return ArrowType.ArrowString
+        } else if type == Date.self {
+            return ArrowType.ArrowDate64
+        } else if type == Bool.self {
+            return ArrowType.ArrowBool
+        } else if type == Data.self {
+            return ArrowType.ArrowBinary
+        } else if type == Int8.self {
+            return ArrowType.ArrowInt8
+        } else if type == Int16.self {
+            return ArrowType.ArrowInt16
+        } else if type == Int32.self {
+            return ArrowType.ArrowInt32
+        } else if type == Int64.self {
+            return ArrowType.ArrowInt64
+        } else if type == UInt8.self {
+            return ArrowType.ArrowUInt8
+        } else if type == UInt16.self {
+            return ArrowType.ArrowUInt16
+        } else if type == UInt32.self {
+            return ArrowType.ArrowUInt32
+        } else if type == UInt64.self {
+            return ArrowType.ArrowUInt64
+        } else if type == Float.self {
+            return ArrowType.ArrowFloat
+        } else if type == Double.self {
+            return ArrowType.ArrowDouble
+        } else {
+            return ArrowType.ArrowUnknown
+        }
     }
 
     public static func infoForNumericType<T>(_ type: T.Type) -> ArrowType.Info {
@@ -205,10 +274,106 @@ public class ArrowType {
             return MemoryLayout<Int8>.stride
         case .string:
             return MemoryLayout<Int8>.stride
+        case .strct:
+            return 0
         default:
             fatalError("Stride requested for unknown type: \(self)")
         }
     }
+
+    public var cDataFormatId: String {
+        get throws {
+            switch self.id {
+            case ArrowTypeId.int8:
+                return "c"
+            case ArrowTypeId.int16:
+                return "s"
+            case ArrowTypeId.int32:
+                return "i"
+            case ArrowTypeId.int64:
+                return "l"
+            case ArrowTypeId.uint8:
+                return "C"
+            case ArrowTypeId.uint16:
+                return "S"
+            case ArrowTypeId.uint32:
+                return "I"
+            case ArrowTypeId.uint64:
+                return "L"
+            case ArrowTypeId.float:
+                return "f"
+            case ArrowTypeId.double:
+                return "g"
+            case ArrowTypeId.boolean:
+                return "b"
+            case ArrowTypeId.date32:
+                return "tdD"
+            case ArrowTypeId.date64:
+                return "tdm"
+            case ArrowTypeId.time32:
+                if let time32 = self as? ArrowTypeTime32 {
+                    return try time32.cDataFormatId
+                }
+                return "tts"
+            case ArrowTypeId.time64:
+                if let time64 = self as? ArrowTypeTime64 {
+                    return try time64.cDataFormatId
+                }
+                return "ttu"
+            case ArrowTypeId.binary:
+                return "z"
+            case ArrowTypeId.string:
+                return "u"
+            default:
+                throw ArrowError.notImplemented
+            }
+        }
+    }
+
+    public static func fromCDataFormatId( // swiftlint:disable:this cyclomatic_complexity
+        _ from: String) throws -> ArrowType {
+        if from == "c" {
+            return ArrowType(ArrowType.ArrowInt8)
+        } else if from == "s" {
+            return ArrowType(ArrowType.ArrowInt16)
+        } else if from == "i" {
+            return ArrowType(ArrowType.ArrowInt32)
+        } else if  from == "l" {
+            return ArrowType(ArrowType.ArrowInt64)
+        } else if  from == "C" {
+            return ArrowType(ArrowType.ArrowUInt8)
+        } else if  from == "S" {
+            return ArrowType(ArrowType.ArrowUInt16)
+        } else if  from == "I" {
+            return ArrowType(ArrowType.ArrowUInt32)
+        } else if  from == "L" {
+            return ArrowType(ArrowType.ArrowUInt64)
+        } else if  from == "f" {
+            return ArrowType(ArrowType.ArrowFloat)
+        } else if  from == "g" {
+            return ArrowType(ArrowType.ArrowDouble)
+        } else if  from == "b" {
+            return ArrowType(ArrowType.ArrowBool)
+        } else if  from == "tdD" {
+            return ArrowType(ArrowType.ArrowDate32)
+        } else if  from == "tdm" {
+            return ArrowType(ArrowType.ArrowDate64)
+        } else if  from == "tts" {
+            return ArrowTypeTime32(.seconds)
+        } else if  from == "ttm" {
+            return ArrowTypeTime32(.milliseconds)
+        } else if  from == "ttu" {
+            return ArrowTypeTime64(.microseconds)
+        } else if  from == "ttn" {
+            return ArrowTypeTime64(.nanoseconds)
+        } else if  from == "z" {
+            return ArrowType(ArrowType.ArrowBinary)
+        } else if  from == "u" {
+            return ArrowType(ArrowType.ArrowString)
+        }
+
+        throw ArrowError.notImplemented
+    }
 }
 
 extension ArrowType.Info: Equatable {
@@ -235,3 +400,4 @@ func getBytesFor<T>(_ data: T) -> Data? {
         return nil
     }
 }
+// swiftlint:disable:this file_length
diff --git a/swift/Arrow/Sources/Arrow/ChunkedArray.swift b/swift/Arrow/Sources/Arrow/ChunkedArray.swift
index 3a06aa46550df..c5ccfe4aec0e6 100644
--- a/swift/Arrow/Sources/Arrow/ChunkedArray.swift
+++ b/swift/Arrow/Sources/Arrow/ChunkedArray.swift
@@ -17,6 +17,11 @@
 
 import Foundation
 
+public protocol AnyArray {
+    func asAny(_ index: UInt) -> Any?
+    var length: UInt {get}
+}
+
 public protocol AsString {
     func asString(_ index: UInt) -> String
 }
diff --git a/swift/Arrow/Sources/ArrowC/ArrowCData.c b/swift/Arrow/Sources/ArrowC/ArrowCData.c
new file mode 100644
index 0000000000000..fe0f80899719b
--- /dev/null
+++ b/swift/Arrow/Sources/ArrowC/ArrowCData.c
@@ -0,0 +1,31 @@
+// 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.
+
+#include <stdlib.h>
+#include "include/ArrowCData.h"
+
+void ArrowSwiftClearReleaseSchema(struct ArrowSchema* arrowSchema) {
+    if(arrowSchema) {
+        arrowSchema->release = NULL;
+    }
+}
+
+void ArrowSwiftClearReleaseArray(struct ArrowArray* arrowArray) {
+    if(arrowArray) {
+        arrowArray->release = NULL;
+    }
+}
diff --git a/swift/Arrow/Sources/ArrowC/include/ArrowCData.h b/swift/Arrow/Sources/ArrowC/include/ArrowCData.h
new file mode 100644
index 0000000000000..4b2f35efcb961
--- /dev/null
+++ b/swift/Arrow/Sources/ArrowC/include/ArrowCData.h
@@ -0,0 +1,78 @@
+// 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.
+
+#ifndef ARROW_C_DATA_INTERFACE
+#define ARROW_C_DATA_INTERFACE
+
+#define ARROW_FLAG_DICTIONARY_ORDERED 1
+#define ARROW_FLAG_NULLABLE 2
+#define ARROW_FLAG_MAP_KEYS_SORTED 4
+
+#include <stdint.h>  // For int64_t
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct ArrowSchema {
+    // Array type description
+    const char* format;
+    const char* name;
+    const char* metadata;
+    int64_t flags;
+    int64_t n_children;
+    struct ArrowSchema** children;
+    struct ArrowSchema* dictionary;
+
+    // Release callback
+    void (*release)(struct ArrowSchema*);
+    // Opaque producer-specific data
+    void* private_data;
+};
+
+struct ArrowArray {
+    // Array data description
+    int64_t length;
+    int64_t null_count;
+    int64_t offset;
+    int64_t n_buffers;
+    int64_t n_children;
+    const void** buffers;
+    struct ArrowArray** children;
+    struct ArrowArray* dictionary;
+
+    // Release callback
+    void (*release)(struct ArrowArray*);
+    // Opaque producer-specific data
+    void* private_data;
+};
+
+// Not able to set the release on the schema
+// to NULL in Swift.  nil in Swift is not
+// equivalent to NULL.
+void ArrowSwiftClearReleaseSchema(struct ArrowSchema*);
+
+// Not able to set the release on the array
+// to NULL in Swift.  nil in Swift is not 
+// equivalent to NULL.
+void ArrowSwiftClearReleaseArray(struct ArrowArray*);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // ARROW_C_DATA_INTERFACE
diff --git a/swift/Arrow/Tests/ArrowTests/ArrayBuilderTest.swift b/swift/Arrow/Tests/ArrowTests/ArrayBuilderTest.swift
new file mode 100644
index 0000000000000..42e167f01fcc9
--- /dev/null
+++ b/swift/Arrow/Tests/ArrowTests/ArrayBuilderTest.swift
@@ -0,0 +1,85 @@
+// 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.
+
+import XCTest
+@testable import Arrow
+
+final class ArrayBuilderTests: XCTestCase {
+    func testIsValidTypeForBuilder() throws {
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(UInt8.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(Int16.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(Int32.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(Int64.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(UInt8.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(UInt16.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(UInt32.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(UInt64.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(Float.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(Double.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(Date.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(Bool.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(Int8?.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(Int16?.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(Int32?.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(Int64?.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(UInt8?.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(UInt16?.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(UInt32?.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(UInt64?.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(Float?.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(Double?.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(Date?.self))
+        XCTAssertTrue(ArrowArrayBuilders.isValidBuilderType(Bool?.self))
+
+        XCTAssertFalse(ArrowArrayBuilders.isValidBuilderType(Int.self))
+        XCTAssertFalse(ArrowArrayBuilders.isValidBuilderType(UInt.self))
+        XCTAssertFalse(ArrowArrayBuilders.isValidBuilderType(Int?.self))
+        XCTAssertFalse(ArrowArrayBuilders.isValidBuilderType(UInt?.self))
+    }
+
+    func testLoadArrayBuilders() throws {
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(Int8.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(Int16.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(Int32.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(Int64.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(UInt8.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(UInt16.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(UInt32.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(UInt64.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(Float.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(Double.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(Date.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(Bool.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(Int8?.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(Int16?.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(Int32?.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(Int64?.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(UInt8?.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(UInt16?.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(UInt32?.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(UInt64?.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(Float?.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(Double?.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(Date?.self))
+        XCTAssertNotNil(try ArrowArrayBuilders.loadBuilder(Bool?.self))
+
+        XCTAssertThrowsError(try ArrowArrayBuilders.loadBuilder(Int.self))
+        XCTAssertThrowsError(try ArrowArrayBuilders.loadBuilder(UInt.self))
+        XCTAssertThrowsError(try ArrowArrayBuilders.loadBuilder(Int?.self))
+        XCTAssertThrowsError(try ArrowArrayBuilders.loadBuilder(UInt?.self))
+    }
+}
diff --git a/swift/Arrow/Tests/ArrowTests/ArrayTests.swift b/swift/Arrow/Tests/ArrowTests/ArrayTests.swift
index f5bfa0506e62f..ed0cb1148e871 100644
--- a/swift/Arrow/Tests/ArrowTests/ArrayTests.swift
+++ b/swift/Arrow/Tests/ArrowTests/ArrayTests.swift
@@ -18,7 +18,7 @@
 import XCTest
 @testable import Arrow
 
-final class ArrayTests: XCTestCase {
+final class ArrayTests: XCTestCase { // swiftlint:disable:this type_body_length
     func testPrimitiveArray() throws {
         // This is an example of a functional test case.
         // Use XCTAssert and related functions to verify your tests produce the correct
@@ -245,4 +245,66 @@ final class ArrayTests: XCTestCase {
         try checkHolderForType(ArrowType(ArrowType.ArrowBool))
         try checkHolderForType(ArrowType(ArrowType.ArrowString))
     }
+
+    func testArrowArrayHolderBuilder() throws {
+        let uint8HBuilder: ArrowArrayHolderBuilder =
+            (try ArrowArrayBuilders.loadNumberArrayBuilder() as NumberArrayBuilder<UInt8>)
+        for index in 0..<100 {
+            uint8HBuilder.appendAny(UInt8(index))
+        }
+
+        let uint8Holder = try uint8HBuilder.toHolder()
+        XCTAssertEqual(uint8Holder.nullCount, 0)
+        XCTAssertEqual(uint8Holder.length, 100)
+
+        let stringHBuilder: ArrowArrayHolderBuilder =
+            (try ArrowArrayBuilders.loadStringArrayBuilder())
+         for index in 0..<100 {
+             if index % 10 == 9 {
+                 stringHBuilder.appendAny(nil)
+             } else {
+                 stringHBuilder.appendAny("test" + String(index))
+             }
+         }
+
+        let stringHolder = try stringHBuilder.toHolder()
+        XCTAssertEqual(stringHolder.nullCount, 10)
+        XCTAssertEqual(stringHolder.length, 100)
+    }
+
+    func testAddVArgs() throws {
+        let arrayBuilder: NumberArrayBuilder<UInt8> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        arrayBuilder.append(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)
+        XCTAssertEqual(arrayBuilder.length, 10)
+        XCTAssertEqual(try arrayBuilder.finish()[2], 2)
+        let doubleBuilder: NumberArrayBuilder<Double> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        doubleBuilder.append(0, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8)
+        XCTAssertEqual(doubleBuilder.length, 9)
+        XCTAssertEqual(try doubleBuilder.finish()[4], 4.4)
+        let stringBuilder = try ArrowArrayBuilders.loadStringArrayBuilder()
+        stringBuilder.append("0", "1", "2", "3", "4", "5", "6")
+        XCTAssertEqual(stringBuilder.length, 7)
+        XCTAssertEqual(try stringBuilder.finish()[4], "4")
+        let boolBuilder = try ArrowArrayBuilders.loadBoolArrayBuilder()
+        boolBuilder.append(true, false, true, false)
+        XCTAssertEqual(try boolBuilder.finish()[2], true)
+    }
+
+    func testAddArray() throws {
+        let arrayBuilder: NumberArrayBuilder<UInt8> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        arrayBuilder.append([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
+        XCTAssertEqual(arrayBuilder.length, 10)
+        XCTAssertEqual(try arrayBuilder.finish()[2], 2)
+        let doubleBuilder: NumberArrayBuilder<Double> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        doubleBuilder.append([0, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8])
+        XCTAssertEqual(doubleBuilder.length, 9)
+        XCTAssertEqual(try doubleBuilder.finish()[4], 4.4)
+        let stringBuilder = try ArrowArrayBuilders.loadStringArrayBuilder()
+        stringBuilder.append(["0", "1", "2", "3", "4", "5", "6"])
+        XCTAssertEqual(stringBuilder.length, 7)
+        XCTAssertEqual(try stringBuilder.finish()[4], "4")
+        let boolBuilder = try ArrowArrayBuilders.loadBoolArrayBuilder()
+        boolBuilder.append([true, false, true, false])
+        XCTAssertEqual(try boolBuilder.finish()[2], true)
+    }
 }
diff --git a/swift/Arrow/Tests/ArrowTests/CDataTests.swift b/swift/Arrow/Tests/ArrowTests/CDataTests.swift
new file mode 100644
index 0000000000000..2344b234745a2
--- /dev/null
+++ b/swift/Arrow/Tests/ArrowTests/CDataTests.swift
@@ -0,0 +1,125 @@
+// 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.
+
+import Foundation
+import XCTest
+@testable import Arrow
+import ArrowC
+
+final class CDataTests: XCTestCase {
+    func makeSchema() -> Arrow.ArrowSchema {
+        let schemaBuilder = ArrowSchema.Builder()
+        return schemaBuilder
+            .addField("colBool", type: ArrowType(ArrowType.ArrowBool), isNullable: false)
+            .addField("colUInt8", type: ArrowType(ArrowType.ArrowUInt8), isNullable: true)
+            .addField("colUInt16", type: ArrowType(ArrowType.ArrowUInt16), isNullable: true)
+            .addField("colUInt32", type: ArrowType(ArrowType.ArrowUInt32), isNullable: true)
+            .addField("colUInt64", type: ArrowType(ArrowType.ArrowUInt64), isNullable: true)
+            .addField("colInt8", type: ArrowType(ArrowType.ArrowInt8), isNullable: false)
+            .addField("colInt16", type: ArrowType(ArrowType.ArrowInt16), isNullable: false)
+            .addField("colInt32", type: ArrowType(ArrowType.ArrowInt32), isNullable: false)
+            .addField("colInt64", type: ArrowType(ArrowType.ArrowInt64), isNullable: false)
+            .addField("colString", type: ArrowType(ArrowType.ArrowString), isNullable: false)
+            .addField("colBinary", type: ArrowType(ArrowType.ArrowBinary), isNullable: false)
+            .addField("colDate32", type: ArrowType(ArrowType.ArrowDate32), isNullable: false)
+            .addField("colDate64", type: ArrowType(ArrowType.ArrowDate64), isNullable: false)
+            .addField("colTime32", type: ArrowType(ArrowType.ArrowTime32), isNullable: false)
+            .addField("colTime32s", type: ArrowTypeTime32(.seconds), isNullable: false)
+            .addField("colTime32m", type: ArrowTypeTime32(.milliseconds), isNullable: false)
+            .addField("colTime64", type: ArrowType(ArrowType.ArrowTime64), isNullable: false)
+            .addField("colTime64u", type: ArrowTypeTime64(.microseconds), isNullable: false)
+            .addField("colTime64n", type: ArrowTypeTime64(.nanoseconds), isNullable: false)
+            .addField("colTime64", type: ArrowType(ArrowType.ArrowTime64), isNullable: false)
+            .addField("colFloat", type: ArrowType(ArrowType.ArrowFloat), isNullable: false)
+            .addField("colDouble", type: ArrowType(ArrowType.ArrowDouble), isNullable: false)
+            .finish()
+    }
+
+    func checkImportField(_ cSchema: ArrowC.ArrowSchema, name: String, type: ArrowType.Info) throws {
+        let importer = ArrowCImporter()
+        switch importer.importField(cSchema) {
+        case .success(let arrowField):
+            XCTAssertEqual(arrowField.type.info, type)
+            XCTAssertEqual(arrowField.name, name)
+        case .failure(let error):
+            throw error
+        }
+    }
+
+    func testImportExportSchema() throws {
+        let schema = makeSchema()
+        let exporter = ArrowCExporter()
+        for arrowField in schema.fields {
+            var cSchema = ArrowC.ArrowSchema()
+            switch exporter.exportField(&cSchema, field: arrowField) {
+            case .success:
+                try checkImportField(cSchema, name: arrowField.name, type: arrowField.type.info)
+            case .failure(let error):
+                throw error
+            }
+        }
+    }
+
+    func testImportExportArray() throws {
+        let stringBuilder = try ArrowArrayBuilders.loadStringArrayBuilder()
+        for index in 0..<100 {
+            if index % 10 == 9 {
+                stringBuilder.append(nil)
+            } else {
+                stringBuilder.append("test" + String(index))
+            }
+        }
+
+        XCTAssertEqual(stringBuilder.nullCount, 10)
+        XCTAssertEqual(stringBuilder.length, 100)
+        XCTAssertEqual(stringBuilder.capacity, 648)
+        let stringArray = try stringBuilder.finish()
+        let exporter = ArrowCExporter()
+        var cArray = ArrowC.ArrowArray()
+        exporter.exportArray(&cArray, arrowData: stringArray.arrowData)
+        let cArrayMutPtr = UnsafeMutablePointer<ArrowC.ArrowArray>.allocate(capacity: 1)
+        cArrayMutPtr.pointee = cArray
+        defer {
+            cArrayMutPtr.deallocate()
+        }
+
+        let importer = ArrowCImporter()
+        switch importer.importArray(UnsafePointer(cArrayMutPtr), arrowType: ArrowType(ArrowType.ArrowString)) {
+        case .success(let holder):
+            let builder = RecordBatch.Builder()
+            switch builder
+                .addColumn("test", arrowArray: holder)
+                .finish() {
+            case .success(let rb):
+                XCTAssertEqual(rb.columnCount, 1)
+                XCTAssertEqual(rb.length, 100)
+                let col1: Arrow.ArrowArray<String> = rb.data(for: 0)
+                for index in 0..<col1.length {
+                    if index % 10 == 9 {
+                        XCTAssertEqual(col1[index], nil)
+                    } else {
+                        XCTAssertEqual(col1[index], "test" + String(index))
+                    }
+                }
+            case .failure(let error):
+                throw error
+            }
+        case .failure(let error):
+            throw error
+        }
+    }
+}
diff --git a/swift/Arrow/Tests/ArrowTests/CodableTests.swift b/swift/Arrow/Tests/ArrowTests/CodableTests.swift
new file mode 100644
index 0000000000000..a0c4e111e4360
--- /dev/null
+++ b/swift/Arrow/Tests/ArrowTests/CodableTests.swift
@@ -0,0 +1,334 @@
+// 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.
+
+import XCTest
+@testable import Arrow
+
+final class CodableTests: XCTestCase { // swiftlint:disable:this type_body_length
+    public class TestClass: Codable {
+        public var propBool: Bool
+        public var propInt8: Int8
+        public var propInt16: Int16
+        public var propInt32: Int32
+        public var propInt64: Int64
+        public var propUInt8: UInt8
+        public var propUInt16: UInt16
+        public var propUInt32: UInt32
+        public var propUInt64: UInt64
+        public var propFloat: Float
+        public var propDouble: Double?
+        public var propString: String
+        public var propDate: Date
+
+        public required init() {
+            self.propBool = false
+            self.propInt8 = 1
+            self.propInt16 = 2
+            self.propInt32 = 3
+            self.propInt64 = 4
+            self.propUInt8 = 5
+            self.propUInt16 = 6
+            self.propUInt32 = 7
+            self.propUInt64 = 8
+            self.propFloat = 9
+            self.propDouble = 10
+            self.propString = "11"
+            self.propDate = Date.now
+        }
+    }
+
+    func testArrowKeyedDecoder() throws { // swiftlint:disable:this function_body_length
+        let date1 = Date(timeIntervalSinceReferenceDate: 86400 * 5000 + 352)
+        let boolBuilder = try ArrowArrayBuilders.loadBoolArrayBuilder()
+        let int8Builder: NumberArrayBuilder<Int8> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        let int16Builder: NumberArrayBuilder<Int16> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        let int32Builder: NumberArrayBuilder<Int32> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        let int64Builder: NumberArrayBuilder<Int64> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        let uint8Builder: NumberArrayBuilder<UInt8> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        let uint16Builder: NumberArrayBuilder<UInt16> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        let uint32Builder: NumberArrayBuilder<UInt32> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        let uint64Builder: NumberArrayBuilder<UInt64> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        let floatBuilder: NumberArrayBuilder<Float> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        let doubleBuilder: NumberArrayBuilder<Double> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        let stringBuilder = try ArrowArrayBuilders.loadStringArrayBuilder()
+        let dateBuilder = try ArrowArrayBuilders.loadDate64ArrayBuilder()
+
+        boolBuilder.append(false, true, false)
+        int8Builder.append(10, 11, 12)
+        int16Builder.append(20, 21, 22)
+        int32Builder.append(30, 31, 32)
+        int64Builder.append(40, 41, 42)
+        uint8Builder.append(50, 51, 52)
+        uint16Builder.append(60, 61, 62)
+        uint32Builder.append(70, 71, 72)
+        uint64Builder.append(80, 81, 82)
+        floatBuilder.append(90.1, 91.1, 92.1)
+        doubleBuilder.append(101.1, nil, nil)
+        stringBuilder.append("test0", "test1", "test2")
+        dateBuilder.append(date1, date1, date1)
+        let result = RecordBatch.Builder()
+            .addColumn("propBool", arrowArray: try boolBuilder.toHolder())
+            .addColumn("propInt8", arrowArray: try int8Builder.toHolder())
+            .addColumn("propInt16", arrowArray: try int16Builder.toHolder())
+            .addColumn("propInt32", arrowArray: try int32Builder.toHolder())
+            .addColumn("propInt64", arrowArray: try int64Builder.toHolder())
+            .addColumn("propUInt8", arrowArray: try uint8Builder.toHolder())
+            .addColumn("propUInt16", arrowArray: try uint16Builder.toHolder())
+            .addColumn("propUInt32", arrowArray: try uint32Builder.toHolder())
+            .addColumn("propUInt64", arrowArray: try uint64Builder.toHolder())
+            .addColumn("propFloat", arrowArray: try floatBuilder.toHolder())
+            .addColumn("propDouble", arrowArray: try doubleBuilder.toHolder())
+            .addColumn("propString", arrowArray: try stringBuilder.toHolder())
+            .addColumn("propDate", arrowArray: try dateBuilder.toHolder())
+            .finish()
+        switch result {
+        case .success(let rb):
+            let decoder = ArrowDecoder(rb)
+            let testClasses = try decoder.decode(TestClass.self)
+            for index in 0..<testClasses.count {
+                let testClass = testClasses[index]
+                XCTAssertEqual(testClass.propBool, index % 2 == 0 ? false : true)
+                XCTAssertEqual(testClass.propInt8, Int8(index + 10))
+                XCTAssertEqual(testClass.propInt16, Int16(index + 20))
+                XCTAssertEqual(testClass.propInt32, Int32(index + 30))
+                XCTAssertEqual(testClass.propInt64, Int64(index + 40))
+                XCTAssertEqual(testClass.propUInt8, UInt8(index + 50))
+                XCTAssertEqual(testClass.propUInt16, UInt16(index + 60))
+                XCTAssertEqual(testClass.propUInt32, UInt32(index + 70))
+                XCTAssertEqual(testClass.propUInt64, UInt64(index + 80))
+                XCTAssertEqual(testClass.propFloat, Float(index) + 90.1)
+                if index == 0 {
+                    XCTAssertEqual(testClass.propDouble, 101.1)
+                } else {
+                    XCTAssertEqual(testClass.propDouble, nil)
+                }
+                XCTAssertEqual(testClass.propString, "test\(index)")
+                XCTAssertEqual(testClass.propDate, date1)
+            }
+        case .failure(let err):
+            throw err
+        }
+    }
+
+    func testArrowSingleDecoderWithoutNull() throws {
+        let int8Builder: NumberArrayBuilder<Int8> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        int8Builder.append(10, 11, 12)
+        let result = RecordBatch.Builder()
+            .addColumn("propInt8", arrowArray: try int8Builder.toHolder())
+            .finish()
+        switch result {
+        case .success(let rb):
+            let decoder = ArrowDecoder(rb)
+            let testData = try decoder.decode(Int8?.self)
+            for index in 0..<testData.count {
+                let val: Int8? = testData[index]
+                XCTAssertEqual(val!, Int8(index + 10))
+            }
+        case .failure(let err):
+            throw err
+        }
+    }
+
+    func testArrowSingleDecoderWithNull() throws {
+        let int8WNilBuilder: NumberArrayBuilder<Int8> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        int8WNilBuilder.append(10, nil, 12, nil)
+        let resultWNil = RecordBatch.Builder()
+            .addColumn("propInt8", arrowArray: try int8WNilBuilder.toHolder())
+            .finish()
+        switch resultWNil {
+        case .success(let rb):
+            let decoder = ArrowDecoder(rb)
+            let testData = try decoder.decode(Int8?.self)
+            for index in 0..<testData.count {
+                let val: Int8? = testData[index]
+                if index % 2 == 1 {
+                    XCTAssertNil(val)
+                } else {
+                    XCTAssertEqual(val!, Int8(index + 10))
+                }
+            }
+        case .failure(let err):
+            throw err
+        }
+    }
+
+    func testArrowMapDecoderWithoutNull() throws {
+        let int8Builder: NumberArrayBuilder<Int8> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        let stringBuilder = try ArrowArrayBuilders.loadStringArrayBuilder()
+        int8Builder.append(10, 11, 12, 13)
+        stringBuilder.append("test10", "test11", "test12", "test13")
+        switch RecordBatch.Builder()
+            .addColumn("propInt8", arrowArray: try int8Builder.toHolder())
+            .addColumn("propString", arrowArray: try stringBuilder.toHolder())
+            .finish() {
+        case .success(let rb):
+            let decoder = ArrowDecoder(rb)
+            let testData = try decoder.decode([Int8: String].self)
+            for data in testData {
+                XCTAssertEqual("test\(data.key)", data.value)
+            }
+        case .failure(let err):
+            throw err
+        }
+
+        switch RecordBatch.Builder()
+            .addColumn("propString", arrowArray: try stringBuilder.toHolder())
+            .addColumn("propInt8", arrowArray: try int8Builder.toHolder())
+            .finish() {
+        case .success(let rb):
+            let decoder = ArrowDecoder(rb)
+            let testData = try decoder.decode([String: Int8].self)
+            for data in testData {
+                XCTAssertEqual("test\(data.value)", data.key)
+            }
+        case .failure(let err):
+            throw err
+        }
+    }
+
+    func testArrowMapDecoderWithNull() throws {
+        let int8Builder: NumberArrayBuilder<Int8> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        let stringWNilBuilder = try ArrowArrayBuilders.loadStringArrayBuilder()
+        int8Builder.append(10, 11, 12, 13)
+        stringWNilBuilder.append(nil, "test11", nil, "test13")
+        let resultWNil = RecordBatch.Builder()
+            .addColumn("propInt8", arrowArray: try int8Builder.toHolder())
+            .addColumn("propString", arrowArray: try stringWNilBuilder.toHolder())
+            .finish()
+        switch resultWNil {
+        case .success(let rb):
+            let decoder = ArrowDecoder(rb)
+            let testData = try decoder.decode([Int8: String?].self)
+            for data in testData {
+                let str = data.value
+                if data.key % 2 == 0 {
+                    XCTAssertNil(str)
+                } else {
+                    XCTAssertEqual(str, "test\(data.key)")
+                }
+            }
+        case .failure(let err):
+            throw err
+        }
+    }
+
+    func getArrayValue<T>(_ rb: RecordBatch, colIndex: Int, rowIndex: UInt) -> T? {
+        let anyArray = rb.columns[colIndex].array as! AnyArray // swiftlint:disable:this force_cast
+        return anyArray.asAny(UInt(rowIndex)) as? T
+    }
+
+    func testArrowKeyedEncoder() throws { // swiftlint:disable:this function_body_length
+        var infos = [TestClass]()
+        for index in 0..<10 {
+            let tClass = TestClass()
+            let offset = index * 12
+            tClass.propBool = index % 2 == 0
+            tClass.propInt8 = Int8(offset + 1)
+            tClass.propInt16 = Int16(offset + 2)
+            tClass.propInt32 = Int32(offset + 3)
+            tClass.propInt64 = Int64(offset + 4)
+            tClass.propUInt8 = UInt8(offset + 5)
+            tClass.propUInt16 = UInt16(offset + 6)
+            tClass.propUInt32 = UInt32(offset + 7)
+            tClass.propUInt64 = UInt64(offset + 8)
+            tClass.propFloat = Float(offset + 9)
+            tClass.propDouble = index % 2 == 0 ? Double(offset + 10) : nil
+            tClass.propString = "\(offset + 11)"
+            tClass.propDate = Date.now
+            infos.append(tClass)
+        }
+
+        let rb = try ArrowEncoder.encode(infos)!
+        XCTAssertEqual(Int(rb.length), infos.count)
+        XCTAssertEqual(rb.columns.count, 13)
+        XCTAssertEqual(rb.columns[0].type.id, ArrowTypeId.boolean)
+        XCTAssertEqual(rb.columns[1].type.id, ArrowTypeId.int8)
+        XCTAssertEqual(rb.columns[2].type.id, ArrowTypeId.int16)
+        XCTAssertEqual(rb.columns[3].type.id, ArrowTypeId.int32)
+        XCTAssertEqual(rb.columns[4].type.id, ArrowTypeId.int64)
+        XCTAssertEqual(rb.columns[5].type.id, ArrowTypeId.uint8)
+        XCTAssertEqual(rb.columns[6].type.id, ArrowTypeId.uint16)
+        XCTAssertEqual(rb.columns[7].type.id, ArrowTypeId.uint32)
+        XCTAssertEqual(rb.columns[8].type.id, ArrowTypeId.uint64)
+        XCTAssertEqual(rb.columns[9].type.id, ArrowTypeId.float)
+        XCTAssertEqual(rb.columns[10].type.id, ArrowTypeId.double)
+        XCTAssertEqual(rb.columns[11].type.id, ArrowTypeId.string)
+        XCTAssertEqual(rb.columns[12].type.id, ArrowTypeId.date64)
+        for index in 0..<10 {
+            let offset = index * 12
+            XCTAssertEqual(getArrayValue(rb, colIndex: 0, rowIndex: UInt(index)), index % 2 == 0)
+            XCTAssertEqual(getArrayValue(rb, colIndex: 1, rowIndex: UInt(index)), Int8(offset + 1))
+            XCTAssertEqual(getArrayValue(rb, colIndex: 2, rowIndex: UInt(index)), Int16(offset + 2))
+            XCTAssertEqual(getArrayValue(rb, colIndex: 3, rowIndex: UInt(index)), Int32(offset + 3))
+            XCTAssertEqual(getArrayValue(rb, colIndex: 4, rowIndex: UInt(index)), Int64(offset + 4))
+            XCTAssertEqual(getArrayValue(rb, colIndex: 5, rowIndex: UInt(index)), UInt8(offset + 5))
+            XCTAssertEqual(getArrayValue(rb, colIndex: 6, rowIndex: UInt(index)), UInt16(offset + 6))
+            XCTAssertEqual(getArrayValue(rb, colIndex: 7, rowIndex: UInt(index)), UInt32(offset + 7))
+            XCTAssertEqual(getArrayValue(rb, colIndex: 8, rowIndex: UInt(index)), UInt64(offset + 8))
+            XCTAssertEqual(getArrayValue(rb, colIndex: 9, rowIndex: UInt(index)), Float(offset + 9))
+            if index % 2 == 0 {
+                XCTAssertEqual(getArrayValue(rb, colIndex: 10, rowIndex: UInt(index)), Double(offset + 10))
+            } else {
+                XCTAssertEqual(getArrayValue(rb, colIndex: 10, rowIndex: UInt(index)), Double?(nil))
+            }
+
+            XCTAssertEqual(getArrayValue(rb, colIndex: 11, rowIndex: UInt(index)), String(offset + 11))
+        }
+    }
+
+    func testArrowUnkeyedEncoder() throws {
+        var testMap = [Int8: String?]()
+        for index in 0..<10 {
+            testMap[Int8(index)] = "test\(index)"
+        }
+
+        let rb = try ArrowEncoder.encode(testMap)
+        XCTAssertEqual(Int(rb.length), testMap.count)
+        XCTAssertEqual(rb.columns.count, 2)
+        XCTAssertEqual(rb.columns[0].type.id, ArrowTypeId.int8)
+        XCTAssertEqual(rb.columns[1].type.id, ArrowTypeId.string)
+        for index in 0..<10 {
+            let key: Int8 = getArrayValue(rb, colIndex: 0, rowIndex: UInt(index))!
+            let value: String = getArrayValue(rb, colIndex: 1, rowIndex: UInt(index))!
+            XCTAssertEqual("test\(key)", value)
+        }
+    }
+
+    func testArrowSingleEncoder() throws {
+        var intArray = [Int32?]()
+        for index in 0..<100 {
+            if index == 10 {
+                intArray.append(nil)
+            } else {
+                intArray.append(Int32(index))
+            }
+        }
+
+        let rb = try ArrowEncoder.encode(intArray)!
+        XCTAssertEqual(Int(rb.length), intArray.count)
+        XCTAssertEqual(rb.columns.count, 1)
+        XCTAssertEqual(rb.columns[0].type.id, ArrowTypeId.int32)
+        for index in 0..<100 {
+            if index == 10 {
+                let anyArray = rb.columns[0].array as! AnyArray // swiftlint:disable:this force_cast
+                XCTAssertNil(anyArray.asAny(UInt(index)))
+            } else {
+                XCTAssertEqual(getArrayValue(rb, colIndex: 0, rowIndex: UInt(index)), Int32(index))
+            }
+        }
+    }
+}
diff --git a/swift/Arrow/Tests/ArrowTests/IPCTests.swift b/swift/Arrow/Tests/ArrowTests/IPCTests.swift
index 103c3b24c7b93..311a3bb235b78 100644
--- a/swift/Arrow/Tests/ArrowTests/IPCTests.swift
+++ b/swift/Arrow/Tests/ArrowTests/IPCTests.swift
@@ -98,11 +98,11 @@ func makeRecordBatch() throws -> RecordBatch {
     floatBuilder.append(433.334)
     floatBuilder.append(544.445)
 
-    let uint8Holder = ArrowArrayHolder(try uint8Builder.finish())
-    let stringHolder = ArrowArrayHolder(try stringBuilder.finish())
-    let date32Holder = ArrowArrayHolder(try date32Builder.finish())
-    let int32Holder = ArrowArrayHolder(try int32Builder.finish())
-    let floatHolder = ArrowArrayHolder(try floatBuilder.finish())
+    let uint8Holder = ArrowArrayHolderImpl(try uint8Builder.finish())
+    let stringHolder = ArrowArrayHolderImpl(try stringBuilder.finish())
+    let date32Holder = ArrowArrayHolderImpl(try date32Builder.finish())
+    let int32Holder = ArrowArrayHolderImpl(try int32Builder.finish())
+    let floatHolder = ArrowArrayHolderImpl(try floatBuilder.finish())
     let result = RecordBatch.Builder()
         .addColumn("col1", arrowArray: uint8Holder)
         .addColumn("col2", arrowArray: stringHolder)
@@ -279,7 +279,7 @@ final class IPCFileReaderTests: XCTestCase {
         binaryBuilder.append("test33".data(using: .utf8))
         binaryBuilder.append("test44".data(using: .utf8))
 
-        let binaryHolder = ArrowArrayHolder(try binaryBuilder.finish())
+        let binaryHolder = ArrowArrayHolderImpl(try binaryBuilder.finish())
         let result = RecordBatch.Builder()
             .addColumn("binary", arrowArray: binaryHolder)
             .finish()
@@ -307,8 +307,8 @@ final class IPCFileReaderTests: XCTestCase {
         time32Builder.append(2)
         time32Builder.append(nil)
         time32Builder.append(3)
-        let time64Holder = ArrowArrayHolder(try time64Builder.finish())
-        let time32Holder = ArrowArrayHolder(try time32Builder.finish())
+        let time64Holder = ArrowArrayHolderImpl(try time64Builder.finish())
+        let time32Holder = ArrowArrayHolderImpl(try time32Builder.finish())
         let result = RecordBatch.Builder()
             .addColumn("time64", arrowArray: time64Holder)
             .addColumn("time32", arrowArray: time32Holder)
diff --git a/swift/Arrow/Tests/ArrowTests/RecordBatchTests.swift b/swift/Arrow/Tests/ArrowTests/RecordBatchTests.swift
index 8820f1cdb1a91..9961781f30833 100644
--- a/swift/Arrow/Tests/ArrowTests/RecordBatchTests.swift
+++ b/swift/Arrow/Tests/ArrowTests/RecordBatchTests.swift
@@ -29,8 +29,8 @@ final class RecordBatchTests: XCTestCase {
         stringBuilder.append("test22")
         stringBuilder.append("test33")
 
-        let intHolder = ArrowArrayHolder(try uint8Builder.finish())
-        let stringHolder = ArrowArrayHolder(try stringBuilder.finish())
+        let intHolder = ArrowArrayHolderImpl(try uint8Builder.finish())
+        let stringHolder = ArrowArrayHolderImpl(try stringBuilder.finish())
         let result = RecordBatch.Builder()
             .addColumn("col1", arrowArray: intHolder)
             .addColumn("col2", arrowArray: stringHolder)
diff --git a/swift/Arrow/Tests/ArrowTests/TableTests.swift b/swift/Arrow/Tests/ArrowTests/TableTests.swift
index a82a07979345c..8e958ccbf9f9f 100644
--- a/swift/Arrow/Tests/ArrowTests/TableTests.swift
+++ b/swift/Arrow/Tests/ArrowTests/TableTests.swift
@@ -132,8 +132,8 @@ final class TableTests: XCTestCase {
         let stringBuilder = try ArrowArrayBuilders.loadStringArrayBuilder()
         stringBuilder.append("test10")
         stringBuilder.append("test22")
-        let intHolder = ArrowArrayHolder(try uint8Builder.finish())
-        let stringHolder = ArrowArrayHolder(try stringBuilder.finish())
+        let intHolder = ArrowArrayHolderImpl(try uint8Builder.finish())
+        let stringHolder = ArrowArrayHolderImpl(try stringBuilder.finish())
         let result = RecordBatch.Builder()
             .addColumn("col1", arrowArray: intHolder)
             .addColumn("col2", arrowArray: stringHolder)
diff --git a/swift/ArrowFlight/Package.swift b/swift/ArrowFlight/Package.swift
index f3caa83486764..8366ccceb7a59 100644
--- a/swift/ArrowFlight/Package.swift
+++ b/swift/ArrowFlight/Package.swift
@@ -29,7 +29,7 @@ let package = Package(
         // Products define the executables and libraries a package produces, making them visible to other packages.
         .library(
             name: "ArrowFlight",
-            targets: ["ArrowFlight"]),
+            targets: ["ArrowFlight"])
     ],
     dependencies: [
         .package(url: "https://github.com/grpc/grpc-swift.git", from: "1.15.0"),
@@ -45,9 +45,17 @@ let package = Package(
                 .product(name: "Arrow", package: "Arrow"),
                 .product(name: "GRPC", package: "grpc-swift"),
                 .product(name: "SwiftProtobuf", package: "swift-protobuf")
-            ]),
+            ],
+            swiftSettings: [
+                // build: .unsafeFlags(["-warnings-as-errors"])
+            ]
+        ),
         .testTarget(
             name: "ArrowFlightTests",
-            dependencies: ["ArrowFlight"]),
+            dependencies: ["ArrowFlight"],
+            swiftSettings: [
+                // build: .unsafeFlags(["-warnings-as-errors"])
+            ]
+        )
     ]
 )
diff --git a/swift/ArrowFlight/Tests/ArrowFlightTests/FlightTest.swift b/swift/ArrowFlight/Tests/ArrowFlightTests/FlightTest.swift
index 8097388c7fde1..f7bc3c1ccb0c3 100644
--- a/swift/ArrowFlight/Tests/ArrowFlightTests/FlightTest.swift
+++ b/swift/ArrowFlight/Tests/ArrowFlightTests/FlightTest.swift
@@ -51,9 +51,9 @@ func makeRecordBatch() throws -> RecordBatch {
     date32Builder.append(date2)
     date32Builder.append(date1)
     date32Builder.append(date2)
-    let doubleHolder = ArrowArrayHolder(try doubleBuilder.finish())
-    let stringHolder = ArrowArrayHolder(try stringBuilder.finish())
-    let date32Holder = ArrowArrayHolder(try date32Builder.finish())
+    let doubleHolder = ArrowArrayHolderImpl(try doubleBuilder.finish())
+    let stringHolder = ArrowArrayHolderImpl(try stringBuilder.finish())
+    let date32Holder = ArrowArrayHolderImpl(try date32Builder.finish())
     let result = RecordBatch.Builder()
         .addColumn("col1", arrowArray: doubleHolder)
         .addColumn("col2", arrowArray: stringHolder)
diff --git a/swift/CDataWGo/.gitignore b/swift/CDataWGo/.gitignore
new file mode 100644
index 0000000000000..0023a53406379
--- /dev/null
+++ b/swift/CDataWGo/.gitignore
@@ -0,0 +1,8 @@
+.DS_Store
+/.build
+/Packages
+xcuserdata/
+DerivedData/
+.swiftpm/configuration/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc
diff --git a/swift/CDataWGo/Package.swift b/swift/CDataWGo/Package.swift
new file mode 100644
index 0000000000000..64d29aec6b845
--- /dev/null
+++ b/swift/CDataWGo/Package.swift
@@ -0,0 +1,43 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+// 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.
+
+import PackageDescription
+
+let package = Package(
+    name: "go-swift",
+    platforms: [
+        .macOS(.v10_14)
+    ],
+    products: [
+        .library(
+            name: "go-swift",
+            type: .static,
+            targets: ["go-swift"])
+    ],
+    dependencies: [
+        .package(path: "../Arrow")  // 👈  Reference to a Local Package
+    ],
+    targets: [
+        .target(
+            name: "go-swift",
+            dependencies: [
+                .product(name: "Arrow", package: "Arrow")
+            ])
+    ]
+)
diff --git a/swift/CDataWGo/Sources/go-swift/CDataTest.swift b/swift/CDataWGo/Sources/go-swift/CDataTest.swift
new file mode 100644
index 0000000000000..b38ca7240ab60
--- /dev/null
+++ b/swift/CDataWGo/Sources/go-swift/CDataTest.swift
@@ -0,0 +1,132 @@
+// 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.
+
+import Arrow
+import ArrowC
+
+@_cdecl("stringTypeFromSwift")
+func stringTypeFromSwift(cSchema: UnsafePointer<ArrowC.ArrowSchema>) {
+    let unsafePointer = UnsafeMutablePointer(mutating: cSchema)
+    let exporter = ArrowCExporter()
+    switch exporter.exportType(&unsafePointer.pointee, arrowType: ArrowType(ArrowType.ArrowString), name: "col1") {
+    case .success:
+        return
+    case .failure(let err):
+        fatalError("Error exporting string type from swift: \(err)")
+    }
+}
+
+@_cdecl("stringTypeToSwift")
+func stringTypeToSwift(cSchema: UnsafePointer<ArrowC.ArrowSchema>) {
+    let importer = ArrowCImporter()
+    switch importer.importField(cSchema.pointee) {
+    case .success(let field):
+        if field.name != "col1" {
+            fatalError("Field name was incorrect expected: col1 but found: \(field.name)")
+        }
+
+        if field.type.id != ArrowTypeId.string {
+            fatalError("Field type was incorrect expected: string but found: \(field.type.id)")
+        }
+    case .failure(let err):
+        fatalError("Error importing string type to swift: \(err)")
+    }
+}
+
+@_cdecl("arrayIntFromSwift")
+func arrayIntFromSwift(cArray: UnsafePointer<ArrowC.ArrowArray>) {
+    do {
+        let unsafePointer = UnsafeMutablePointer(mutating: cArray)
+        let arrayBuilder: NumberArrayBuilder<Int32> = try ArrowArrayBuilders.loadNumberArrayBuilder()
+        for index in 0..<100 {
+            arrayBuilder.append(Int32(index))
+        }
+
+        let array = try arrayBuilder.finish()
+        let exporter = ArrowCExporter()
+        exporter.exportArray(&unsafePointer.pointee, arrowData: array.arrowData)
+    } catch let err {
+        fatalError("Error exporting array from swift \(err)")
+    }
+}
+
+@_cdecl("arrayStringFromSwift")
+func arrayStringFromSwift(cArray: UnsafePointer<ArrowC.ArrowArray>) {
+    do {
+        let unsafePointer = UnsafeMutablePointer(mutating: cArray)
+        let arrayBuilder = try ArrowArrayBuilders.loadStringArrayBuilder()
+        for index in 0..<100 {
+            arrayBuilder.append("test" + String(index))
+        }
+
+        let array = try arrayBuilder.finish()
+        let exporter = ArrowCExporter()
+        exporter.exportArray(&unsafePointer.pointee, arrowData: array.arrowData)
+    } catch let err {
+        fatalError("Error exporting array from swift \(err)")
+    }
+}
+
+@_cdecl("arrayIntToSwift")
+func arrayIntToSwift(cArray: UnsafePointer<ArrowC.ArrowArray>) {
+    let importer = ArrowCImporter()
+    switch importer.importArray(cArray, arrowType: ArrowType(ArrowType.ArrowInt32)) {
+    case .success(let int32Holder):
+        let result = RecordBatch.Builder()
+            .addColumn("col1", arrowArray: int32Holder)
+            .finish()
+        switch result {
+        case .success(let recordBatch):
+            let col1: Arrow.ArrowArray<Int32> = recordBatch.data(for: 0)
+            for index in 0..<col1.length {
+                let colVal = col1[index]!
+                if colVal != index + 1 {
+                    fatalError("Data is incorrect: expected: \(index + 1) but found: \(colVal)")
+                }
+            }
+        case .failure(let err):
+            fatalError("Error makeing RecordBatch from imported array \(err)")
+        }
+    case .failure(let err):
+        fatalError("Error importing int32 array to swift: \(err)")
+    }
+}
+
+@_cdecl("arrayStringToSwift")
+func arrayStringToSwift(cArray: UnsafePointer<ArrowC.ArrowArray>) {
+    let importer = ArrowCImporter()
+    switch importer.importArray(cArray, arrowType: ArrowType(ArrowType.ArrowString)) {
+    case .success(let dataHolder):
+        let result = RecordBatch.Builder()
+            .addColumn("col1", arrowArray: dataHolder)
+            .finish()
+        switch result {
+        case .success(let recordBatch):
+            let col1: Arrow.ArrowArray<String> = recordBatch.data(for: 0)
+            for index in 0..<col1.length {
+                let colVal = col1[index]!
+                if colVal != "test\(index)" {
+                    fatalError("Data is incorrect: expected: \(index + 1) but found: \(colVal)")
+                }
+            }
+        case .failure(let err):
+            fatalError("Error makeing RecordBatch from imported array \(err)")
+        }
+    case .failure(let err):
+        fatalError("Error importing int32 array to swift: \(err)")
+    }
+}
diff --git a/swift/CDataWGo/go.mod b/swift/CDataWGo/go.mod
new file mode 100644
index 0000000000000..323b5daac2a1e
--- /dev/null
+++ b/swift/CDataWGo/go.mod
@@ -0,0 +1,35 @@
+// 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 go-swift
+
+go 1.21
+
+require github.com/apache/arrow/go/v16 v16.1.0
+
+require (
+	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/google/flatbuffers v24.3.25+incompatible // indirect
+	github.com/klauspost/compress v1.17.7 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/pierrec/lz4/v4 v4.1.21 // indirect
+	github.com/zeebo/xxh3 v1.0.2 // indirect
+	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
+	golang.org/x/mod v0.16.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/tools v0.19.0 // indirect
+	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
+)
diff --git a/swift/CDataWGo/go.sum b/swift/CDataWGo/go.sum
new file mode 100644
index 0000000000000..e0c7e6f2747c0
--- /dev/null
+++ b/swift/CDataWGo/go.sum
@@ -0,0 +1,41 @@
+github.com/apache/arrow/go/v16 v16.1.0 h1:dwgfOya6s03CzH9JrjCBx6bkVb4yPD4ma3haj9p7FXI=
+github.com/apache/arrow/go/v16 v16.1.0/go.mod h1:9wnc9mn6vEDTRIm4+27pEjQpRKuTvBaessPoEXQzxWA=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
+github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/google/flatbuffers v24.3.25+incompatible h1:CX395cjN9Kke9mmalRoL3d81AtFUxJM+yDthflgJGkI=
+github.com/google/flatbuffers v24.3.25+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
+github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
+github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
+github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
+github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
+github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
+github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
+golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
+golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
+golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
+golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
+golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
+golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
+gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ=
+gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/swift/CDataWGo/include/go_swift.h b/swift/CDataWGo/include/go_swift.h
new file mode 100644
index 0000000000000..a7b79ae85823b
--- /dev/null
+++ b/swift/CDataWGo/include/go_swift.h
@@ -0,0 +1,30 @@
+// 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.
+
+#include "../../Arrow/Sources/ArrowC/include/ArrowCData.h"
+
+void stringTypeFromSwift(struct ArrowSchema*);
+
+void stringTypeToSwift(struct ArrowSchema*);
+
+void arrayIntFromSwift(struct ArrowArray*);
+
+void arrayStringFromSwift(struct ArrowArray*);
+
+void arrayIntToSwift(struct ArrowArray* array);
+
+void arrayStringToSwift(struct ArrowArray* array);
\ No newline at end of file
diff --git a/swift/CDataWGo/main.go b/swift/CDataWGo/main.go
new file mode 100644
index 0000000000000..45d1979e7e46d
--- /dev/null
+++ b/swift/CDataWGo/main.go
@@ -0,0 +1,127 @@
+// 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.
+package main
+
+/*
+#cgo CFLAGS: -I./include
+#cgo LDFLAGS: -L. libgo-swift.a -L/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx
+#cgo LDFLAGS: -L/usr/lib/swift/linux
+#include <stdlib.h>
+#include "go_swift.h"
+*/
+import "C"
+import (
+	"strconv"
+	"unsafe"
+
+	"github.com/apache/arrow/go/v16/arrow"
+	"github.com/apache/arrow/go/v16/arrow/array"
+	"github.com/apache/arrow/go/v16/arrow/cdata"
+	"github.com/apache/arrow/go/v16/arrow/memory"
+)
+
+func stringTypeFromSwift() {
+	arrowSchema := &cdata.CArrowSchema{}
+	swSchema := (*C.struct_ArrowSchema)(unsafe.Pointer(arrowSchema))
+	C.stringTypeFromSwift(swSchema)
+	gofield, _ := cdata.ImportCArrowField(arrowSchema)
+	if gofield.Name != "col1" {
+		panic("Imported type has incorrect name")
+	}
+}
+
+func stringTypeToSwift() {
+	arrowSchema := &cdata.CArrowSchema{}
+	swSchema := (*C.struct_ArrowSchema)(unsafe.Pointer(arrowSchema))
+	C.stringTypeFromSwift(swSchema)
+	gofield, _ := cdata.ImportCArrowField(arrowSchema)
+	if gofield.Name != "col1" {
+		panic("Imported type has incorrect name")
+	}
+}
+
+func arrayStringFromSwift() {
+	arrowArray := &cdata.CArrowArray{}
+	swarray := (*C.struct_ArrowArray)(unsafe.Pointer(arrowArray))
+	C.arrayStringFromSwift(swarray)
+	arr, _ := cdata.ImportCArrayWithType(arrowArray, arrow.BinaryTypes.String)
+	if arr.Len() != 100 {
+		panic("Array length is incorrect")
+	}
+
+	for i := 0; i < 100; i++ {
+		if arr.ValueStr(i) != ("test" + strconv.Itoa(i)) {
+			panic("Array value is incorrect")
+		}
+	}
+}
+
+func arrayIntFromSwift() {
+	arrowArray := &cdata.CArrowArray{}
+	swarray := (*C.struct_ArrowArray)(unsafe.Pointer(arrowArray))
+	C.arrayIntFromSwift(swarray)
+	arr, _ := cdata.ImportCArrayWithType(arrowArray, arrow.PrimitiveTypes.Int32)
+	if arr.Len() != 100 {
+		panic("Array length is incorrect")
+	}
+
+	vals := arr.(*array.Int32).Int32Values()
+	// and that the values are correct
+	for i, v := range vals {
+		if v != int32(i) {
+			panic("Array value is incorrect")
+		}
+	}
+}
+
+func arrayIntToSwift() {
+	bld := array.NewUint32Builder(memory.DefaultAllocator)
+	defer bld.Release()
+	bld.AppendValues([]uint32{1, 2, 3, 4}, []bool{true, true, true, true})
+	goarray := bld.NewUint32Array()
+	var carray cdata.CArrowArray
+	cdata.ExportArrowArray(goarray, &carray, nil)
+	swarray := (*C.struct_ArrowArray)(unsafe.Pointer(&carray))
+	C.arrayIntToSwift(swarray)
+
+	if swarray.release != nil {
+		panic("Release was not called by swift to deallocate C array")
+	}
+}
+
+func arrayStringToSwift() {
+	bld := array.NewStringBuilder(memory.DefaultAllocator)
+	defer bld.Release()
+	bld.AppendValues([]string{"test0", "test1", "test2", "test3"}, []bool{true, true, true, true})
+	goarray := bld.NewStringArray()
+	var carray cdata.CArrowArray
+	cdata.ExportArrowArray(goarray, &carray, nil)
+	swarray := (*C.struct_ArrowArray)(unsafe.Pointer(&carray))
+	C.arrayStringToSwift(swarray)
+
+	if swarray.release != nil {
+		panic("Release was not called by swift to deallocate C array")
+	}
+}
+
+func main() {
+	stringTypeFromSwift()
+	stringTypeToSwift()
+	arrayStringFromSwift()
+	arrayIntFromSwift()
+	arrayIntToSwift()
+	arrayStringToSwift()
+}
diff --git a/swift/data-generator/swift-datagen/main.go b/swift/data-generator/swift-datagen/main.go
index a60fb562932fe..2f2e244ab5891 100644
--- a/swift/data-generator/swift-datagen/main.go
+++ b/swift/data-generator/swift-datagen/main.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/apache/arrow/go/v12/arrow"
 	"github.com/apache/arrow/go/v12/arrow/array"
-	"github.com/apache/arrow/go/v12/arrow/memory"
 	"github.com/apache/arrow/go/v12/arrow/ipc"
+	"github.com/apache/arrow/go/v12/arrow/memory"
 )
 
 func writeBytes(rec arrow.Record, file_name string) {
@@ -42,7 +42,6 @@ func writeBytes(rec arrow.Record, file_name string) {
 	rr.Close()
 }
 
-
 func writeBoolData() {
 	alloc := memory.NewGoAllocator()
 	schema := arrow.NewSchema([]arrow.Field{
@@ -53,14 +52,13 @@ func writeBoolData() {
 	b := array.NewRecordBuilder(alloc, schema)
 	defer b.Release()
 
-	b.Field(0).(*array.BooleanBuilder).AppendValues([]bool{true, false,}, nil)
+	b.Field(0).(*array.BooleanBuilder).AppendValues([]bool{true, false}, nil)
 	b.Field(0).(*array.BooleanBuilder).AppendNull()
-	b.Field(0).(*array.BooleanBuilder).AppendValues([]bool{false, true,}, nil)
+	b.Field(0).(*array.BooleanBuilder).AppendValues([]bool{false, true}, nil)
 	b.Field(1).(*array.StringBuilder).AppendValues([]string{"zero", "one", "two", "three", "four"}, nil)
 	rec := b.NewRecord()
 	defer rec.Release()
 
-
 	writeBytes(rec, "testdata_bool.arrow")
 }
 
@@ -81,11 +79,10 @@ func writeDoubleData() {
 	rec := b.NewRecord()
 	defer rec.Release()
 
-
 	writeBytes(rec, "testdata_double.arrow")
 }
 
 func main() {
-	writeBoolData();
-	writeDoubleData();
+	writeBoolData()
+	writeDoubleData()
 }
diff --git a/testing b/testing
index 25d16511e8d42..735ae7128d571 160000
--- a/testing
+++ b/testing
@@ -1 +1 @@
-Subproject commit 25d16511e8d42c2744a1d94d90169e3a36e92631
+Subproject commit 735ae7128d571398dd798d7ff004adebeb342883